← Back to branch summary

~ubuntu-branches/ubuntu/maverick/vice/maverick

« back to all changes in this revision

Viewing changes to src/arch/win32/uiplus4mem.c

  • Committer: Bazaar Package Importer
  • Author(s): Zed Pobre
  • Date: 2005-02-01 11:30:26 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20050201113026-3eyakzsmmheclvjg
Tags: 1.16-1
http://bugs.debian.org/287640
http://bugs.debian.org/286767
http://bugs.debian.org/152952
http://bugs.debian.org/207942
* New upstream version
* Fixes crash on 64-bit architectures (closes: #287640)
* x128 working again (closes: #286767)
* Works fine with /dev/dsp in use (not in the main changelog, but tested
  on my local machine as working).  Presumably, this also takes care of
  the issue with dsp being held.  I'm not sure if this is because I'm
  testing it on a 2.6 kernel now -- if you are still having problems
  with /dev/dsp, please reopen the bugs. (closes: #152952, #207942)
* Don't kill Makefile.in on clean

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/arch/win32/uiplus4mem.c
31
31
#include "res.h"
32
32
#include "resources.h"
33
33
#include "system.h"
34
 
#include "ui.h"
35
34
#include "uilib.h"
36
35
#include "winmain.h"
37
36
 
61
60
                     n);
62
61
}
63
62
 
 
63
static void end_dialog(void)
 
64
{
 
65
    if (orig_ramsize != set_ramsize) {
 
66
        resources_set_value("RamSize", (resource_value_t)set_ramsize);
 
67
    }
 
68
}
 
69
 
64
70
static BOOL CALLBACK dialog_proc(HWND hwnd, UINT msg,
65
71
                                 WPARAM wparam, LPARAM lparam)
66
72
{
84
90
            set_ramsize=64;
85
91
            break;
86
92
          case IDOK:
87
 
            if (orig_ramsize != set_ramsize) {
88
 
                resources_set_value("RamSize",(resource_value_t)set_ramsize);
89
 
            }
 
93
            end_dialog();
90
94
          case IDCANCEL:
91
95
            EndDialog(hwnd,0);
92
96
            return TRUE;