diff --git a/dlls/ddraw/dsurface/user.c b/dlls/ddraw/dsurface/user.c index 90a0cea65d3..fa5b1162fd6 100644 --- a/dlls/ddraw/dsurface/user.c +++ b/dlls/ddraw/dsurface/user.c @@ -49,7 +49,6 @@ static void User_destroy_own_window(IDirectDrawSurfaceImpl* This); static DWORD CALLBACK User_update_thread(LPVOID); #endif static void User_copy_to_screen(IDirectDrawSurfaceImpl* This, LPCRECT rc); -static void User_copy_from_screen(IDirectDrawSurfaceImpl* This, LPCRECT rc); static HWND get_display_window(IDirectDrawSurfaceImpl* This, LPPOINT pt); @@ -597,6 +596,7 @@ static void User_copy_to_screen(IDirectDrawSurfaceImpl* This, LPCRECT rc) } } +#if 0 static void User_copy_from_screen(IDirectDrawSurfaceImpl* This, LPCRECT rc) { if (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) @@ -623,6 +623,7 @@ static void User_copy_from_screen(IDirectDrawSurfaceImpl* This, LPCRECT rc) ReleaseDC(hDisplayWnd, hDisplayDC); } } +#endif static ICOM_VTABLE(IDirectDrawSurface7) User_IDirectDrawSurface7_VTable = { diff --git a/dlls/winmm/winenas/audio.c b/dlls/winmm/winenas/audio.c index 526e0fa1945..7196349da48 100644 --- a/dlls/winmm/winenas/audio.c +++ b/dlls/winmm/winenas/audio.c @@ -212,16 +212,6 @@ static const char *wodPlayerCmdString[] = { "WINE_WM_CLOSING", }; -static char *nas_event_types[] = { - "Undefined", - "Undefined", - "ElementNotify", - "GrabNotify", - "MonitorNotify", - "BucketNotify", - "DeviceNotify" -}; - static char *nas_elementnotify_kinds[] = { "LowWater", "HighWater", @@ -259,11 +249,24 @@ static char* nas_elementnotify_kind(unsigned int kind) } -static char* nas_event_type(unsigned int type) +#if 0 +static const char* nas_event_type(unsigned int type) { + static const char * const nas_event_types[] = + { + "Undefined", + "Undefined", + "ElementNotify", + "GrabNotify", + "MonitorNotify", + "BucketNotify", + "DeviceNotify" + }; + if (type > 6) type = 0; return nas_event_types[type]; } +#endif static char* nas_state(unsigned int state) diff --git a/programs/progman/grpfile.c b/programs/progman/grpfile.c index 88c2d857e22..d825596bbc7 100644 --- a/programs/progman/grpfile.c +++ b/programs/progman/grpfile.c @@ -641,6 +641,7 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) } /* Icons */ +#if 0 /* FIXME: this is broken anyway */ hProgram = group->hPrograms; while(hProgram) { @@ -649,7 +650,6 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) LPVOID XorBits, AndBits; INT sizeXor = iconinfo->nHeight * iconinfo->nWidthBytes; INT sizeAnd = iconinfo->nHeight * ((iconinfo->nWidth + 15) / 16 * 2); - /* FIXME: this is broken anyway */ /* DumpIcon16(LocalLock(program->hIcon), 0, &XorBits, &AndBits);*/ PUT_SHORT(buffer, 0, iconinfo->ptHotSpot.x); @@ -666,6 +666,7 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) hProgram = program->hNext; } +#endif if (need_extension) {