January 2009 - Wine-commits

Alexandre Julliard : wineps.drv: Use INT_MAX instead of LONG_MAX to initialize a LONG value.
by Alexandre Julliard 09 Jan '09

09 Jan '09

Module: wine Branch: master Commit: f45874ae28547d21dad4daf27d0ba2ef9f177550 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f45874ae28547d21dad4daf27… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 17:29:14 2009 +0100 wineps.drv: Use INT_MAX instead of LONG_MAX to initialize a LONG value. --- dlls/wineps.drv/type1afm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/type1afm.c b/dlls/wineps.drv/type1afm.c index 85aca42..4feee71 100644 --- a/dlls/wineps.drv/type1afm.c +++ b/dlls/wineps.drv/type1afm.c @@ -746,7 +746,7 @@ static BOOL ParseN(LPSTR sz, OLD_AFMMETRICS *metrics) static const OLD_AFMMETRICS badmetrics = { INT_MAX, /* C */ - LONG_MAX, /* UV */ + INT_MAX, /* UV */ FLT_MAX, /* WX */ NULL, /* N */ { FLT_MAX, FLT_MAX, FLT_MAX, FLT_MAX }, /* B */

1 0

Alexandre Julliard : wininet: Fix handle cast warnings on 64-bit.
by Alexandre Julliard 09 Jan '09

09 Jan '09

Module: wine Branch: master Commit: bb8883dda04a94b55f9dc67a64083997a98ac60a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb8883dda04a94b55f9dc67a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 17:28:21 2009 +0100 wininet: Fix handle cast warnings on 64-bit. --- dlls/wininet/ftp.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index d5bf13b..21ce434 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -858,13 +858,13 @@ lend: if (hFindNext) { - iar.dwResult = (DWORD)hFindNext; + iar.dwResult = (DWORD_PTR)hFindNext; iar.dwError = ERROR_SUCCESS; SendAsyncCallback(&lpwfs->hdr, lpwfs->hdr.dwContext, INTERNET_STATUS_HANDLE_CREATED, &iar, sizeof(INTERNET_ASYNC_RESULT)); } - iar.dwResult = (DWORD)hFindNext; + iar.dwResult = (DWORD_PTR)hFindNext; iar.dwError = hFindNext ? ERROR_SUCCESS : INTERNET_GetLastError(); SendAsyncCallback(&lpwfs->hdr, lpwfs->hdr.dwContext, INTERNET_STATUS_REQUEST_COMPLETE, &iar, sizeof(INTERNET_ASYNC_RESULT)); @@ -1343,13 +1343,13 @@ HINTERNET FTP_FtpOpenFileW(LPWININETFTPSESSIONW lpwfs, if (lpwh) { - iar.dwResult = (DWORD)handle; + iar.dwResult = (DWORD_PTR)handle; iar.dwError = ERROR_SUCCESS; SendAsyncCallback(&lpwfs->hdr, lpwfs->hdr.dwContext, INTERNET_STATUS_HANDLE_CREATED, &iar, sizeof(INTERNET_ASYNC_RESULT)); } - iar.dwResult = (DWORD)bSuccess; + iar.dwResult = bSuccess; iar.dwError = bSuccess ? ERROR_SUCCESS : INTERNET_GetLastError(); SendAsyncCallback(&lpwfs->hdr, lpwfs->hdr.dwContext, INTERNET_STATUS_REQUEST_COMPLETE, &iar, sizeof(INTERNET_ASYNC_RESULT)); @@ -2340,7 +2340,7 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, { INTERNET_ASYNC_RESULT iar; - iar.dwResult = (DWORD)handle; + iar.dwResult = (DWORD_PTR)handle; iar.dwError = ERROR_SUCCESS; SendAsyncCallback(&hIC->hdr, dwContext,

1 0

Alexandre Julliard : ntdll: Fix pointer cast warnings on 64-bit.
by Alexandre Julliard 09 Jan '09

09 Jan '09

Module: wine Branch: master Commit: 6b07ac545329a84a8216e647e1ed77ac1cf5a70a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b07ac545329a84a8216e647e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 17:28:45 2009 +0100 ntdll: Fix pointer cast warnings on 64-bit. --- dlls/ntdll/virtual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d2610e9..59fc491 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -123,7 +123,7 @@ static void *user_space_limit = (void *)0x7fff0000; /* top of the user addre static void *working_set_limit = (void *)0x7fff0000; /* top of the current working set */ #else static UINT page_shift; -static UINT page_size; +static UINT_PTR page_size; static UINT_PTR page_mask; static void *address_space_limit; static void *user_space_limit;

1 0

Alexandre Julliard : shdocvw: Fix a pointer cast warning on 64-bit.
by Alexandre Julliard 09 Jan '09

09 Jan '09

Module: wine Branch: master Commit: 53bc99855a012db46ac171bd4851c9f6b7f950c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53bc99855a012db46ac171bd4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 17:27:49 2009 +0100 shdocvw: Fix a pointer cast warning on 64-bit. --- dlls/shdocvw/shdocvw_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 8640600..a065aa5 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -205,7 +205,7 @@ void WINAPI OpenURL(HWND hWnd, HINSTANCE hInst, LPCSTR lpcstrUrl, int nShowCmd) * Some forwards (by ordinal) to SHLWAPI */ -static void* fetch_shlwapi_ordinal(unsigned ord) +static void* fetch_shlwapi_ordinal(UINT_PTR ord) { static const WCHAR shlwapiW[] = {'s','h','l','w','a','p','i','.','d','l','l','\0'}; static HANDLE h;

1 0

Alexandre Julliard : urlmon: Fix pointer cast warnings on 64-bit.
by Alexandre Julliard 09 Jan '09

09 Jan '09

Module: wine Branch: master Commit: e2e4da97329ed7a4afe62d4c8dbab8275434f529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2e4da97329ed7a4afe62d4c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 17:27:58 2009 +0100 urlmon: Fix pointer cast warnings on 64-bit. --- dlls/urlmon/http.c | 4 ++-- dlls/urlmon/umon.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 99321ef..20e90ed 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -397,7 +397,7 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl InternetSetStatusCallbackW(This->internet, HTTPPROTOCOL_InternetStatusCallback); This->connect = InternetConnectW(This->internet, host, url.nPort, user, - pass, INTERNET_SERVICE_HTTP, 0, (DWORD)This); + pass, INTERNET_SERVICE_HTTP, 0, (DWORD_PTR)This); if (!This->connect) { WARN("InternetConnect failed: %d\n", GetLastError()); @@ -425,7 +425,7 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl wszBindVerb[This->bind_info.dwBindVerb] : This->bind_info.szCustomVerb, path, NULL, NULL, (LPCWSTR *)accept_mimes, - request_flags, (DWORD)This); + request_flags, (DWORD_PTR)This); if (!This->request) { WARN("HttpOpenRequest failed: %d\n", GetLastError()); diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 860c386..01266dd 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -606,7 +606,7 @@ static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName, IBindCtx* pbc, } bind->hconnect = InternetConnectW(bind->hinternet, host, url.nPort, user, pass, - dwService, 0, (DWORD)bind); + dwService, 0, (DWORD_PTR)bind); if (!bind->hconnect) { hres = HRESULT_FROM_WIN32(GetLastError()); @@ -650,7 +650,7 @@ static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName, IBindCtx* pbc, break; case INTERNET_SERVICE_HTTP: - bind->hrequest = HttpOpenRequestW(bind->hconnect, NULL, path, NULL, NULL, NULL, 0, (DWORD)bind); + bind->hrequest = HttpOpenRequestW(bind->hconnect, NULL, path, NULL, NULL, NULL, 0, (DWORD_PTR)bind); if (!bind->hrequest) { hres = HRESULT_FROM_WIN32(GetLastError());

1 0

Alexandre Julliard : user32: Fix pointer cast warnings on 64-bit.
by Alexandre Julliard 09 Jan '09

09 Jan '09

Module: wine Branch: master Commit: d1613f60c281c8fef10310794470f546a4495422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1613f60c281c8fef10310794… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 17:28:04 2009 +0100 user32: Fix pointer cast warnings on 64-bit. --- dlls/user32/sysparams.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 92dc912..8ecfed4 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2394,7 +2394,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, SPI_SETFONTSMOOTHINGTYPE_VALNAME, (LPBYTE)&pvParam, sizeof(UINT), REG_DWORD, fWinIni )) { - font_smoothing_type = (UINT)pvParam; + font_smoothing_type = PtrToUlong(pvParam); spi_loaded[spi_idx] = TRUE; } else @@ -2424,7 +2424,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, SPI_SETFONTSMOOTHINGCONTRAST_VALNAME, (LPBYTE)&pvParam, sizeof(UINT), REG_DWORD, fWinIni )) { - font_smoothing_contrast = (UINT)pvParam; + font_smoothing_contrast = PtrToUlong(pvParam); spi_loaded[spi_idx] = TRUE; } else @@ -2458,7 +2458,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, SPI_SETFONTSMOOTHINGORIENTATION_VALNAME, (LPBYTE)&pvParam, sizeof(UINT), REG_DWORD, fWinIni )) { - font_smoothing_orientation = (UINT)pvParam; + font_smoothing_orientation = PtrToUlong(pvParam); spi_loaded[spi_idx] = TRUE; } else

1 0

Alexandre Julliard : setupapi: Fix pointer cast warnings on 64-bit.
by Alexandre Julliard 09 Jan '09

09 Jan '09

Module: wine Branch: master Commit: 41533fa51690616005d2002a8458da62baf3e8fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=41533fa51690616005d2002a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 17:27:27 2009 +0100 setupapi: Fix pointer cast warnings on 64-bit. --- dlls/setupapi/setupcab.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index a2a7a5f..765f416 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -307,7 +307,7 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p ci.DiskName = pfdin->psz2; ci.SetId = pfdin->setID; ci.CabinetNumber = pfdin->iCabinet; - phsc->msghandler(phsc->context, SPFILENOTIFY_CABINETINFO, (UINT) &ci, 0); + phsc->msghandler(phsc->context, SPFILENOTIFY_CABINETINFO, (UINT_PTR) &ci, 0); return 0; case fdintPARTIAL_FILE: TRACE("Partial file notification\n"); @@ -328,7 +328,7 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p fici.DosAttribs = pfdin->attribs; memset(&(fici.FullTargetName[0]), 0, MAX_PATH); err = phsc->msghandler(phsc->context, SPFILENOTIFY_FILEINCABINET, - (UINT) &fici, (UINT) pfdin->psz1); + (UINT_PTR)&fici, (UINT_PTR)pfdin->psz1); if (err == FILEOP_DOIT) { TRACE(" Callback specified filename: %s\n", debugstr_a(&(fici.FullTargetName[0]))); if (!fici.FullTargetName[0]) { @@ -352,7 +352,7 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p fp.Flags = 0; /* the following should be a fixme -- but it occurs too many times */ WARN("Should set file date/time/attribs (and execute files?)\n"); - err = phsc->msghandler(phsc->context, SPFILENOTIFY_FILEEXTRACTED, (UINT) &fp, 0); + err = phsc->msghandler(phsc->context, SPFILENOTIFY_FILEEXTRACTED, (UINT_PTR)&fp, 0); if (sc_cb_close(pfdin->hf)) WARN("_close failed.\n"); if (err) { @@ -374,7 +374,7 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p ci.CabinetNumber = pfdin->iCabinet; /* remember the new cabinet name */ strcpy(&(phsc->most_recent_cabinet_name[0]), pfdin->psz1); - err = phsc->msghandler(phsc->context, SPFILENOTIFY_NEEDNEWCABINET, (UINT) &ci, (UINT) &(mysterio[0])); + err = phsc->msghandler(phsc->context, SPFILENOTIFY_NEEDNEWCABINET, (UINT_PTR)&ci, (UINT_PTR)mysterio); if (err) { SetLastError(err); return -1; @@ -438,7 +438,7 @@ static INT_PTR CDECL sc_FNNOTIFY_W(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p ci.DiskName = &(buf2[0]); ci.SetId = pfdin->setID; ci.CabinetNumber = pfdin->iCabinet; - phsc->msghandler(phsc->context, SPFILENOTIFY_CABINETINFO, (UINT) &ci, 0); + phsc->msghandler(phsc->context, SPFILENOTIFY_CABINETINFO, (UINT_PTR)&ci, 0); return 0; case fdintPARTIAL_FILE: TRACE("Partial file notification\n"); @@ -462,7 +462,7 @@ static INT_PTR CDECL sc_FNNOTIFY_W(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p fici.DosAttribs = pfdin->attribs; memset(&(fici.FullTargetName[0]), 0, MAX_PATH * sizeof(WCHAR)); err = phsc->msghandler(phsc->context, SPFILENOTIFY_FILEINCABINET, - (UINT) &fici, (UINT) pfdin->psz1); + (UINT_PTR)&fici, (UINT_PTR)pfdin->psz1); if (err == FILEOP_DOIT) { TRACE(" Callback specified filename: %s\n", debugstr_w(&(fici.FullTargetName[0]))); if (fici.FullTargetName[0]) { @@ -495,7 +495,7 @@ static INT_PTR CDECL sc_FNNOTIFY_W(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p fp.Flags = 0; /* a valid fixme -- but occurs too many times */ /* FIXME("Should set file date/time/attribs (and execute files?)\n"); */ - err = phsc->msghandler(phsc->context, SPFILENOTIFY_FILEEXTRACTED, (UINT) &fp, 0); + err = phsc->msghandler(phsc->context, SPFILENOTIFY_FILEEXTRACTED, (UINT_PTR)&fp, 0); if (sc_cb_close(pfdin->hf)) WARN("_close failed.\n"); if (err) { @@ -525,7 +525,7 @@ static INT_PTR CDECL sc_FNNOTIFY_W(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p ci.DiskName = &(buf2[0]); ci.SetId = pfdin->setID; ci.CabinetNumber = pfdin->iCabinet; - err = phsc->msghandler(phsc->context, SPFILENOTIFY_NEEDNEWCABINET, (UINT) &ci, (UINT) &(mysterio[0])); + err = phsc->msghandler(phsc->context, SPFILENOTIFY_NEEDNEWCABINET, (UINT_PTR)&ci, (UINT_PTR)mysterio); if (err) { SetLastError(err); return -1;

1 0

Alexandre Julliard : shell32: Fix a pointer cast warning on 64-bit.
by Alexandre Julliard 09 Jan '09

09 Jan '09

Module: wine Branch: master Commit: e65c2d9a0d07895475519b53a5d2d553cb6ee318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e65c2d9a0d07895475519b53a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 17:27:41 2009 +0100 shell32: Fix a pointer cast warning on 64-bit. --- dlls/shell32/control.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 464b9d1..fc012a9 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -300,7 +300,7 @@ static void Control_WndProc_Create(HWND hWnd, const CREATESTRUCTW* cs) mii.dwTypeData = applet->info[i].szName; mii.cch = sizeof(applet->info[i].szName) / sizeof(applet->info[i].szName[0]); mii.wID = IDM_CPANEL_APPLET_BASE + menucount; - mii.dwItemData = (DWORD) item; + mii.dwItemData = (ULONG_PTR)item; if (InsertMenuItemW(hSubMenu, menucount, TRUE, &mii)) { /* add the list view item */

1 0

Alexandre Julliard : ntoskrnl.exe: Fix handle cast warnings on 64-bit.
by Alexandre Julliard 09 Jan '09

09 Jan '09

Module: wine Branch: master Commit: 469f0b4757c522a5f5a4026e3cfb028dee9fec57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=469f0b4757c522a5f5a4026e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 17:26:56 2009 +0100 ntoskrnl.exe: Fix handle cast warnings on 64-bit. --- dlls/ntoskrnl.exe/ntoskrnl.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d27014f..81c4f33 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -118,12 +118,12 @@ static HANDLE get_device_manager(void) static LONG CALLBACK vectored_handler( EXCEPTION_POINTERS *ptrs ) { EXCEPTION_RECORD *record = ptrs->ExceptionRecord; - CONTEXT *context = ptrs->ContextRecord; if (record->ExceptionCode == EXCEPTION_ACCESS_VIOLATION || record->ExceptionCode == EXCEPTION_PRIV_INSTRUCTION) { #ifdef __i386__ + CONTEXT *context = ptrs->ContextRecord; extern DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ); if (__wine_emulate_instruction( record, context ) == ExceptionContinueExecution) @@ -1068,7 +1068,7 @@ NTSTATUS WINAPI PsCreateSystemThread(PHANDLE ThreadHandle, ULONG DesiredAccess, */ HANDLE WINAPI PsGetCurrentProcessId(void) { - return (HANDLE)GetCurrentProcessId(); /* FIXME: not quite right... */ + return UlongToHandle(GetCurrentProcessId()); /* FIXME: not quite right... */ } @@ -1077,7 +1077,7 @@ HANDLE WINAPI PsGetCurrentProcessId(void) */ HANDLE WINAPI PsGetCurrentThreadId(void) { - return (HANDLE)GetCurrentThreadId(); /* FIXME: not quite right... */ + return UlongToHandle(GetCurrentThreadId()); /* FIXME: not quite right... */ }

1 0

Alexandre Julliard : oleaut32: Fix handle cast warnings on 64-bit.
by Alexandre Julliard 09 Jan '09

09 Jan '09

Module: wine Branch: master Commit: 99132baebd2584af0a3ff75b9c4f9226e8942aff URL: http://source.winehq.org/git/wine.git/?a=commit;h=99132baebd2584af0a3ff75b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 17:27:14 2009 +0100 oleaut32: Fix handle cast warnings on 64-bit. --- dlls/oleaut32/olepicture.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index a0f1855..c80f357 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -529,16 +529,16 @@ static HRESULT WINAPI OLEPictureImpl_get_Handle(IPicture *iface, *phandle = 0; break; case PICTYPE_BITMAP: - *phandle = (OLE_HANDLE)This->desc.u.bmp.hbitmap; + *phandle = HandleToUlong(This->desc.u.bmp.hbitmap); break; case PICTYPE_METAFILE: - *phandle = (OLE_HANDLE)This->desc.u.wmf.hmeta; + *phandle = HandleToUlong(This->desc.u.wmf.hmeta); break; case PICTYPE_ICON: - *phandle = (OLE_HANDLE)This->desc.u.icon.hicon; + *phandle = HandleToUlong(This->desc.u.icon.hicon); break; case PICTYPE_ENHMETAFILE: - *phandle = (OLE_HANDLE)This->desc.u.emf.hemf; + *phandle = HandleToUlong(This->desc.u.emf.hemf); break; default: FIXME("Unimplemented type %d\n", This->desc.picType); @@ -568,7 +568,7 @@ static HRESULT WINAPI OLEPictureImpl_get_hPal(IPicture *iface, hres = S_FALSE; break; case PICTYPE_BITMAP: - *phandle = (OLE_HANDLE)This->desc.u.bmp.hpal; + *phandle = HandleToUlong(This->desc.u.bmp.hpal); hres = S_OK; break; case PICTYPE_METAFILE: @@ -782,7 +782,7 @@ static HRESULT WINAPI OLEPictureImpl_SelectPicture(IPicture *iface, *phdcOut = This->hDCCur; This->hDCCur = hdcIn; if (phbmpOut) - *phbmpOut = (OLE_HANDLE)This->desc.u.bmp.hbitmap; + *phbmpOut = HandleToUlong(This->desc.u.bmp.hbitmap); return S_OK; } else { FIXME("Don't know how to select picture type %d\n",This->desc.picType);

1 0