Fixed a couple of HWND type mismatches.
diff --git a/dlls/setupapi/setupx_main.c b/dlls/setupapi/setupx_main.c
index d1a87fe..ddc0db8 100644
--- a/dlls/setupapi/setupx_main.c
+++ b/dlls/setupapi/setupx_main.c
@@ -285,7 +285,6 @@
*
* nCmdShow = nCmdShow of CreateProcess
*/
-typedef INT WINAPI (*MSGBOX_PROC)( HWND, LPCSTR, LPCSTR, UINT );
RETERR16 WINAPI InstallHinfSection16( HWND16 hwnd, HINSTANCE16 hinst, LPCSTR lpszCmdLine, INT16 nCmdShow)
{
LPSTR *pSub;
@@ -294,8 +293,6 @@
RETERR16 res = OK, tmp;
WORD wFlags;
BOOL reboot = FALSE;
- HMODULE hMod;
- MSGBOX_PROC pMessageBoxA;
TRACE("(%04x, %04x, %s, %d);\n", hwnd, hinst, lpszCmdLine, nCmdShow);
@@ -322,15 +319,8 @@
break;
case HOW_ALWAYS_PROMPT_REBOOT:
case HOW_PROMPT_REBOOT:
- if ((hMod = GetModuleHandleA("user32.dll")))
- {
- if ((pMessageBoxA = (MSGBOX_PROC)GetProcAddress( hMod, "MessageBoxA" )))
- {
-
- if (pMessageBoxA(hwnd, "You must restart Wine before the new settings will take effect.\n\nDo you want to exit Wine now ?", "Systems Settings Change", MB_YESNO|MB_ICONQUESTION) == IDYES)
- reboot = TRUE;
- }
- }
+ if (MessageBoxA(hwnd, "You must restart Wine before the new settings will take effect.\n\nDo you want to exit Wine now ?", "Systems Settings Change", MB_YESNO|MB_ICONQUESTION) == IDYES)
+ reboot = TRUE;
break;
default:
ERR("invalid flags %d !\n", wFlags);
diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c
index ecb4c55..2778fc0 100644
--- a/dlls/shell32/shell32_main.c
+++ b/dlls/shell32/shell32_main.c
@@ -520,7 +520,9 @@
GetWindowRect(data->hWnd, &(data->rc));
return TRUE;
case ABM_REMOVE:
- CloseHandle(data->hWnd);
+ FIXME("ABM_REMOVE broken\n");
+ /* FIXME: this is wrong; should it be DestroyWindow instead? */
+ /*CloseHandle(data->hWnd);*/
return TRUE;
case ABM_SETAUTOHIDEBAR:
SetWindowPos(data->hWnd,HWND_TOP,rec.left+1000,rec.top,
diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c
index db1c619..c0492b7 100644
--- a/dlls/shlwapi/ordinal.c
+++ b/dlls/shlwapi/ordinal.c
@@ -590,7 +590,7 @@
* @ [SHLWAPI.278]
*
*/
-DWORD WINAPI SHLWAPI_278 (
+HWND WINAPI SHLWAPI_278 (
LONG wndProc,
HWND hWndParent,
DWORD dwExStyle,
diff --git a/windows/x11drv/clipboard.c b/windows/x11drv/clipboard.c
index 83e7205..43d4de8 100644
--- a/windows/x11drv/clipboard.c
+++ b/windows/x11drv/clipboard.c
@@ -615,7 +615,7 @@
/* For CF_DIB requests we must return an HGLOBAL storing a packed DIB */
hTargetImage = X11DRV_DIB_CreateDIBFromPixmap(*pPixmap, hdc, TRUE);
- ReleaseDC(hdc, hwnd);
+ ReleaseDC(hwnd, hdc);
}
if (!hTargetImage)
diff --git a/windows/x11drv/event.c b/windows/x11drv/event.c
index 3071d99..01ce586 100644
--- a/windows/x11drv/event.c
+++ b/windows/x11drv/event.c
@@ -829,7 +829,7 @@
/* For convert from packed DIB to Pixmap */
pixmap = X11DRV_DIB_CreatePixmapFromDIB(hClipData, hdc);
- ReleaseDC(hdc, hwnd);
+ ReleaseDC(hwnd, hdc);
}
else if (wFormat == CF_BITMAP)
{
@@ -838,7 +838,7 @@
pixmap = X11DRV_BITMAP_CreatePixmapFromBitmap(hClipData, hdc);
- ReleaseDC(hdc, hwnd);
+ ReleaseDC(hwnd, hdc);
}
else
{
