ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed a couple of HWND type mismatches.

This commit is contained in:
Alexandre Julliard 2001-09-19 20:34:17 +00:00
parent 2938242bb6
commit 629aab1768
5 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/setupapi/setupx_main.c
View File

@ -285,7 +285,6 @@ static LPSTR SETUPX_GetSectionEntries(LPCSTR filename, LPCSTR section)
* *
* nCmdShow = nCmdShow of CreateProcess * nCmdShow = nCmdShow of CreateProcess
*/ */
typedef INT WINAPI (*MSGBOX_PROC)( HWND, LPCSTR, LPCSTR, UINT );
RETERR16 WINAPI InstallHinfSection16( HWND16 hwnd, HINSTANCE16 hinst, LPCSTR lpszCmdLine, INT16 nCmdShow) RETERR16 WINAPI InstallHinfSection16( HWND16 hwnd, HINSTANCE16 hinst, LPCSTR lpszCmdLine, INT16 nCmdShow)
{ {
LPSTR *pSub; LPSTR *pSub;
@ -294,8 +293,6 @@ RETERR16 WINAPI InstallHinfSection16( HWND16 hwnd, HINSTANCE16 hinst, LPCSTR lps
RETERR16 res = OK, tmp; RETERR16 res = OK, tmp;
WORD wFlags; WORD wFlags;
BOOL reboot = FALSE; BOOL reboot = FALSE;
HMODULE hMod;
MSGBOX_PROC pMessageBoxA;
TRACE("(%04x, %04x, %s, %d);\n", hwnd, hinst, lpszCmdLine, nCmdShow); TRACE("(%04x, %04x, %s, %d);\n", hwnd, hinst, lpszCmdLine, nCmdShow);
@ -322,15 +319,8 @@ RETERR16 WINAPI InstallHinfSection16( HWND16 hwnd, HINSTANCE16 hinst, LPCSTR lps
break; break;
case HOW_ALWAYS_PROMPT_REBOOT: case HOW_ALWAYS_PROMPT_REBOOT:
case HOW_PROMPT_REBOOT: case HOW_PROMPT_REBOOT:
if ((hMod = GetModuleHandleA("user32.dll"))) 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;
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;
}
}
break; break;
default: default:
ERR("invalid flags %d !\n", wFlags); ERR("invalid flags %d !\n", wFlags);

4
dlls/shell32/shell32_main.c
View File

@ -520,7 +520,9 @@ UINT WINAPI SHAppBarMessage(DWORD msg, PAPPBARDATA data)
GetWindowRect(data->hWnd, &(data->rc)); GetWindowRect(data->hWnd, &(data->rc));
return TRUE; return TRUE;
case ABM_REMOVE: 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; return TRUE;
case ABM_SETAUTOHIDEBAR: case ABM_SETAUTOHIDEBAR:
SetWindowPos(data->hWnd,HWND_TOP,rec.left+1000,rec.top, SetWindowPos(data->hWnd,HWND_TOP,rec.left+1000,rec.top,

2
dlls/shlwapi/ordinal.c
View File

@ -590,7 +590,7 @@ DWORD WINAPI SHLWAPI_276 ()
* @ [SHLWAPI.278] * @ [SHLWAPI.278]
* *
*/ */
DWORD WINAPI SHLWAPI_278 ( HWND WINAPI SHLWAPI_278 (
LONG wndProc, LONG wndProc,
HWND hWndParent, HWND hWndParent,
DWORD dwExStyle, DWORD dwExStyle,

2
windows/x11drv/clipboard.c
View File

@ -615,7 +615,7 @@ static BOOL X11DRV_CLIPBOARD_ReadSelection(UINT wFormat, Window w, Atom prop, At
/* For CF_DIB requests we must return an HGLOBAL storing a packed DIB */ /* For CF_DIB requests we must return an HGLOBAL storing a packed DIB */
hTargetImage = X11DRV_DIB_CreateDIBFromPixmap(*pPixmap, hdc, TRUE); hTargetImage = X11DRV_DIB_CreateDIBFromPixmap(*pPixmap, hdc, TRUE);
ReleaseDC(hdc, hwnd); ReleaseDC(hwnd, hdc);
} }
if (!hTargetImage) if (!hTargetImage)

4
windows/x11drv/event.c
View File

@ -829,7 +829,7 @@ static Atom EVENT_SelectionRequest_PIXMAP( Display *display, Window requestor,
/* For convert from packed DIB to Pixmap */ /* For convert from packed DIB to Pixmap */
pixmap = X11DRV_DIB_CreatePixmapFromDIB(hClipData, hdc); pixmap = X11DRV_DIB_CreatePixmapFromDIB(hClipData, hdc);
ReleaseDC(hdc, hwnd); ReleaseDC(hwnd, hdc);
} }
else if (wFormat == CF_BITMAP) else if (wFormat == CF_BITMAP)
{ {
@ -838,7 +838,7 @@ static Atom EVENT_SelectionRequest_PIXMAP( Display *display, Window requestor,
pixmap = X11DRV_BITMAP_CreatePixmapFromBitmap(hClipData, hdc); pixmap = X11DRV_BITMAP_CreatePixmapFromBitmap(hClipData, hdc);
ReleaseDC(hdc, hwnd); ReleaseDC(hwnd, hdc);
} }
else else
{ {