← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/arch/win32/uidrivec64vic20.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/uidrivec64vic20.c
28
28
 
29
29
#include "vice.h"
30
30
 
 
31
#include <stdio.h>
31
32
#include <windows.h>
32
33
#include <prsht.h>
33
34
 
34
 
#ifdef HAVE_SHLOBJ_H
35
 
#include <shlobj.h>
36
 
#endif
37
 
 
38
35
#ifndef DUMMYUNIONNAME
39
36
#define DUMMYUNIONNAME  u1
40
37
#endif
43
40
#include "res.h"
44
41
#include "resources.h"
45
42
#include "system.h"
46
 
#include "ui.h"
47
43
#include "uidrivec64vic20.h"
48
44
#include "uilib.h"
49
45
#include "winmain.h"
50
46
 
 
47
 
51
48
static void enable_controls_for_drive_settings(HWND hwnd, int type)
52
49
{
53
50
    int drive_type = 0;
204
201
        break;
205
202
    }
206
203
 
207
 
    if( !enabled )
208
 
      n = IDC_SELECT_DRIVE_TYPE_NONE;
 
204
    if (!enabled)
 
205
        n = IDC_SELECT_DRIVE_TYPE_NONE;
209
206
 
210
207
    CheckRadioButton(hwnd, IDC_SELECT_DRIVE_TYPE_1541,
211
208
                     IDC_SELECT_DRIVE_TYPE_NONE, n);
432
429
        psp[i].dwFlags = PSP_USETITLE /*| PSP_HASHELP*/ ;
433
430
        psp[i].hInstance = winmain_instance;
434
431
#ifdef _ANONYMOUS_UNION
435
 
        psp[i].pszTemplate = MAKEINTRESOURCE(IDD_DRIVE_SETTINGS_DIALOG);
 
432
        psp[i].pszTemplate
 
433
            = MAKEINTRESOURCE(IDD_DRIVE_SETTINGS_DIALOG_C64VIC20);
436
434
        psp[i].pszIcon = NULL;
437
435
#else
438
 
        psp[i].DUMMYUNIONNAME.pszTemplate = MAKEINTRESOURCE(IDD_DRIVE_SETTINGS_DIALOG);
 
436
        psp[i].DUMMYUNIONNAME.pszTemplate
 
437
            = MAKEINTRESOURCE(IDD_DRIVE_SETTINGS_DIALOG_C64VIC20);
439
438
        psp[i].u2.pszIcon = NULL;
440
439
#endif
441
440
        psp[i].lParam = 0;