January 2010 - Wine-commits

Maarten Lankhorst : mmdevapi: Constify IMMDeviceEnumeratorVtbl.
by Alexandre Julliard 05 Jan '10

05 Jan '10

Module: wine Branch: master Commit: 056588abbc3e73d7d46be64bf0749f2ba07bcdd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=056588abbc3e73d7d46be64bf… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Jan 4 22:38:04 2010 +0100 mmdevapi: Constify IMMDeviceEnumeratorVtbl. --- dlls/mmdevapi/devenum.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 90347b1..f6992df 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -35,12 +35,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); typedef struct MMDevEnumImpl { - IMMDeviceEnumeratorVtbl *lpVtbl; + const IMMDeviceEnumeratorVtbl *lpVtbl; LONG ref; } MMDevEnumImpl; static MMDevEnumImpl *MMDevEnumerator; -static IMMDeviceEnumeratorVtbl MMDevEnumVtbl; +static const IMMDeviceEnumeratorVtbl MMDevEnumVtbl; HRESULT MMDevEnum_Create(REFIID riid, void **ppv) { @@ -147,7 +147,7 @@ static HRESULT WINAPI MMDevEnum_UnregisterEndpointNotificationCallback(IMMDevice return E_NOTIMPL; } -static IMMDeviceEnumeratorVtbl MMDevEnumVtbl = +static const IMMDeviceEnumeratorVtbl MMDevEnumVtbl = { MMDevEnum_QueryInterface, MMDevEnum_AddRef,

1 0

Maarten Lankhorst : mmdevapi: Add an empty IMMDeviceCollection implementation.
by Alexandre Julliard 05 Jan '10

05 Jan '10

Module: wine Branch: master Commit: 5e9ec19217026aff9c508222d9df7860f57a91c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e9ec19217026aff9c508222d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Dec 14 18:03:56 2009 +0100 mmdevapi: Add an empty IMMDeviceCollection implementation. --- dlls/mmdevapi/devenum.c | 98 ++++++++++++++++++++++++++++++++++++++- dlls/mmdevapi/tests/mmdevenum.c | 5 ++- 2 files changed, 100 insertions(+), 3 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index f6992df..40e296e 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -42,6 +42,101 @@ typedef struct MMDevEnumImpl static MMDevEnumImpl *MMDevEnumerator; static const IMMDeviceEnumeratorVtbl MMDevEnumVtbl; +typedef struct MMDevColImpl +{ + const IMMDeviceCollectionVtbl *lpVtbl; + LONG ref; + MMDevEnumImpl *parent; + EDataFlow flow; + DWORD state; +} MMDevColImpl; +static const IMMDeviceCollectionVtbl MMDevColVtbl; + +static HRESULT MMDevCol_Create(IMMDeviceCollection **ppv, MMDevEnumImpl *parent, EDataFlow flow, DWORD state) +{ + MMDevColImpl *This; + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + *ppv = NULL; + if (!This) + return E_OUTOFMEMORY; + This->lpVtbl = &MMDevColVtbl; + This->ref = 1; + This->parent = parent; + This->flow = flow; + This->state = state; + *ppv = (IMMDeviceCollection*)This; + return S_OK; +} + +static void MMDevCol_Destroy(MMDevColImpl *This) +{ + HeapFree(GetProcessHeap(), 0, This); +} + +static HRESULT WINAPI MMDevCol_QueryInterface(IMMDeviceCollection *iface, REFIID riid, void **ppv) +{ + MMDevColImpl *This = (MMDevColImpl*)iface; + + if (!ppv) + return E_POINTER; + if (IsEqualIID(riid, &IID_IUnknown) + || IsEqualIID(riid, &IID_IMMDeviceCollection)) + *ppv = This; + else + *ppv = NULL; + if (!*ppv) + return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI MMDevCol_AddRef(IMMDeviceCollection *iface) +{ + MMDevColImpl *This = (MMDevColImpl*)iface; + LONG ref = InterlockedIncrement(&This->ref); + TRACE("Refcount now %i\n", ref); + return ref; +} + +static ULONG WINAPI MMDevCol_Release(IMMDeviceCollection *iface) +{ + MMDevColImpl *This = (MMDevColImpl*)iface; + LONG ref = InterlockedDecrement(&This->ref); + TRACE("Refcount now %i\n", ref); + if (!ref) + MMDevCol_Destroy(This); + return ref; +} + +static HRESULT WINAPI MMDevCol_GetCount(IMMDeviceCollection *iface, UINT *numdevs) +{ + MMDevColImpl *This = (MMDevColImpl*)iface; + TRACE("(%p)->(%p)\n", This, numdevs); + if (!numdevs) + return E_POINTER; + *numdevs = 0; + return S_OK; +} + +static HRESULT WINAPI MMDevCol_Item(IMMDeviceCollection *iface, UINT i, IMMDevice **dev) +{ + MMDevColImpl *This = (MMDevColImpl*)iface; + TRACE("(%p)->(%u, %p)\n", This, i, dev); + if (!dev) + return E_POINTER; + *dev = NULL; + return E_INVALIDARG; +} + +static const IMMDeviceCollectionVtbl MMDevColVtbl = +{ + MMDevCol_QueryInterface, + MMDevCol_AddRef, + MMDevCol_Release, + MMDevCol_GetCount, + MMDevCol_Item +}; + HRESULT MMDevEnum_Create(REFIID riid, void **ppv) { MMDevEnumImpl *This = MMDevEnumerator; @@ -111,8 +206,7 @@ static HRESULT WINAPI MMDevEnum_EnumAudioEndpoints(IMMDeviceEnumerator *iface, E return E_INVALIDARG; if (mask & ~DEVICE_STATEMASK_ALL) return E_INVALIDARG; - FIXME("stub\n"); - return E_NOTFOUND; + return MMDevCol_Create(devices, This, flow, mask); } static HRESULT WINAPI MMDevEnum_GetDefaultAudioEndpoint(IMMDeviceEnumerator *iface, EDataFlow flow, ERole role, IMMDevice **device) diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c index 06c106f..cff72a0 100644 --- a/dlls/mmdevapi/tests/mmdevenum.c +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -45,6 +45,9 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) IUnknown_Release(col); ok(ref == 2, "Invalid reference count %u on collection\n", ref); + hr = IUnknown_QueryInterface(col, &IID_IUnknown, NULL); + ok(hr == E_POINTER, "Null ppv returns %08x\n", hr); + hr = IUnknown_QueryInterface(col, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "Cannot query for IID_IUnknown: 0x%08x\n", hr); if (hr == S_OK) @@ -137,7 +140,7 @@ START_TEST(mmdevenum) ok(hr == E_POINTER, "Invalid pointer returned: 0x%08x\n", hr); hr = IMMDeviceEnumerator_EnumAudioEndpoints(mme, eAll, DEVICE_STATEMASK_ALL, &col); - todo_wine ok(hr == S_OK, "Valid EnumAudioEndpoints returned 0x%08x\n", hr); + ok(hr == S_OK, "Valid EnumAudioEndpoints returned 0x%08x\n", hr); if (hr == S_OK) { ok(!!col, "Returned null pointer\n");

1 0

Maarten Lankhorst : mmdevapi: Add test showing collection doesn' t keep ref on parent.
by Alexandre Julliard 05 Jan '10

05 Jan '10

Module: wine Branch: master Commit: f10d56088e546c76a8aec2abe4b742c80bf779f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f10d56088e546c76a8aec2abe… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Dec 14 18:16:40 2009 +0100 mmdevapi: Add test showing collection doesn't keep ref on parent. --- dlls/mmdevapi/tests/mmdevenum.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c index cff72a0..9e8e55c 100644 --- a/dlls/mmdevapi/tests/mmdevenum.c +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -41,6 +41,11 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) UINT numdev; IMMDevice *dev; + /* collection doesn't keep a ref on parent */ + IUnknown_AddRef(mme); + ref = IUnknown_Release(mme); + ok(ref == 2, "Reference count on parent is %u\n", ref); + ref = IUnknown_AddRef(col); IUnknown_Release(col); ok(ref == 2, "Invalid reference count %u on collection\n", ref);

1 0

James Hawkins : user32: Don't try to free a handle with a value of 1, which is the dde handle value for asynchronous operations.
by Alexandre Julliard 05 Jan '10

05 Jan '10

Module: wine Branch: master Commit: 289047c7351e6fb3fa15e23824fcb65238b4854a URL: http://source.winehq.org/git/wine.git/?a=commit;h=289047c7351e6fb3fa15e2382… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jan 4 17:47:02 2010 -0800 user32: Don't try to free a handle with a value of 1, which is the dde handle value for asynchronous operations. --- dlls/user32/dde_misc.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c index ae1df40..ac4657e 100644 --- a/dlls/user32/dde_misc.c +++ b/dlls/user32/dde_misc.c @@ -1468,6 +1468,11 @@ BOOL WINAPI DdeUnaccessData(HDDEDATA hData) BOOL WINAPI DdeFreeDataHandle(HDDEDATA hData) { TRACE("(%p)\n", hData); + + /* 1 is the handle value returned by an asynchronous operation. */ + if (hData == (HDDEDATA)1) + return TRUE; + return GlobalFree(hData) == 0; }

1 0

Alexandre Julliard : winex11: Don' t process ConfigureNotify events that have been superseded by a later configure request .
by Alexandre Julliard 05 Jan '10

05 Jan '10

Module: wine Branch: master Commit: 00b06dac85c096f20f7beed8898553166f07e6ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=00b06dac85c096f20f7beed88… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 4 17:56:32 2010 +0100 winex11: Don't process ConfigureNotify events that have been superseded by a later configure request. --- dlls/winex11.drv/event.c | 11 +++++++++-- dlls/winex11.drv/window.c | 12 +++++++----- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 32eb64a..63fb5c1 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -308,8 +308,8 @@ static inline void call_event_handler( Display *display, XEvent *event ) hwnd = 0; /* not for a registered window */ if (!hwnd && event->xany.window == root_window) hwnd = GetDesktopWindow(); - TRACE( "%s for hwnd/window %p/%lx\n", - dbgstr_event( event->type ), hwnd, event->xany.window ); + TRACE( "%lu %s for hwnd/window %p/%lx\n", + event->xany.serial, dbgstr_event( event->type ), hwnd, event->xany.window ); wine_tsx11_unlock(); thread_data = x11drv_thread_data(); prev = thread_data->current_event; @@ -829,6 +829,13 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) if (!hwnd) return; if (!(data = X11DRV_get_win_data( hwnd ))) return; if (!data->mapped || data->iconic || !data->managed) return; + if (data->configure_serial && (long)(data->configure_serial - event->serial) > 0) + { + TRACE( "win %p/%lx event %d,%d,%dx%d ignoring old serial %lu/%lu\n", + hwnd, data->whole_window, event->x, event->y, event->width, event->height, + event->serial, data->configure_serial ); + return; + } /* Get geometry */ diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 5df7df2..ec7f6dd 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1321,16 +1321,18 @@ static void sync_window_position( Display *display, struct x11drv_win_data *data /* and Above with a sibling doesn't work so well either, so we ignore it */ } - TRACE( "setting win %p/%lx pos %d,%d,%dx%d after %lx changes=%x\n", - data->hwnd, data->whole_window, data->whole_rect.left, data->whole_rect.top, - data->whole_rect.right - data->whole_rect.left, - data->whole_rect.bottom - data->whole_rect.top, changes.sibling, mask ); - wine_tsx11_lock(); set_size_hints( display, data, style ); + data->configure_serial = NextRequest( display ); XReconfigureWMWindow( display, data->whole_window, DefaultScreen(display), mask, &changes ); wine_tsx11_unlock(); + + TRACE( "win %p/%lx pos %d,%d,%dx%d after %lx changes=%x serial=%lu\n", + data->hwnd, data->whole_window, data->whole_rect.left, data->whole_rect.top, + data->whole_rect.right - data->whole_rect.left, + data->whole_rect.bottom - data->whole_rect.top, + changes.sibling, mask, data->configure_serial ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 62e275d..9be93c6 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -741,6 +741,7 @@ struct x11drv_win_data BOOL shaped : 1; /* is window using a custom region shape? */ int wm_state; /* current value of the WM_STATE property */ DWORD net_wm_state; /* bit mask of active x11drv_net_wm_state values */ + unsigned long configure_serial; /* serial number of last configure request */ HBITMAP hWMIconBitmap; HBITMAP hWMIconMask; };

1 0

Alexandre Julliard : winedos: Link to DirectDrawCreate through delayed imports instead of doing it by hand .
by Alexandre Julliard 05 Jan '10

05 Jan '10

Module: wine Branch: master Commit: 0a8573a226e644cc292e75fc91217c83dbc79f14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a8573a226e644cc292e75fc9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 4 17:57:55 2010 +0100 winedos: Link to DirectDrawCreate through delayed imports instead of doing it by hand. --- dlls/winedos/Makefile.in | 1 + dlls/winedos/vga.c | 14 +------------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/winedos/Makefile.in b/dlls/winedos/Makefile.in index 8cf3db8..632815c 100644 --- a/dlls/winedos/Makefile.in +++ b/dlls/winedos/Makefile.in @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winedos.dll IMPORTS = user32 kernel32 kernel ntdll +DELAYIMPORTS = ddraw C_SRCS = \ devices.c \ diff --git a/dlls/winedos/vga.c b/dlls/winedos/vga.c index 86737bc..3c904be 100644 --- a/dlls/winedos/vga.c +++ b/dlls/winedos/vga.c @@ -231,9 +231,6 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION vga_lock = { &critsect_debug, -1, 0, 0, 0, 0 }; -typedef HRESULT (WINAPI *DirectDrawCreateProc)(LPGUID,LPDIRECTDRAW *,LPUNKNOWN); -static DirectDrawCreateProc pDirectDrawCreate; - static void CALLBACK VGA_Poll( LPVOID arg, DWORD low, DWORD high ); static HWND vga_hwnd = NULL; @@ -787,16 +784,7 @@ static void WINAPI VGA_DoSetMode(ULONG_PTR arg) if (lpddraw) VGA_DoExit(0); if (!lpddraw) { - if (!pDirectDrawCreate) - { - HMODULE hmod = LoadLibraryA( "ddraw.dll" ); - if (hmod) pDirectDrawCreate = (DirectDrawCreateProc)GetProcAddress( hmod, "DirectDrawCreate" ); - if (!pDirectDrawCreate) { - ERR("Can't lookup DirectDrawCreate from ddraw.dll.\n"); - return; - } - } - res = pDirectDrawCreate(NULL,&lpddraw,NULL); + res = DirectDrawCreate(NULL,&lpddraw,NULL); if (!lpddraw) { ERR("DirectDraw is not available (res = 0x%x)\n",res); return;

1 0

Alexandre Julliard : winedos: Link to DirectSoundCreate through delayed imports instead of doing it by hand .
by Alexandre Julliard 05 Jan '10

05 Jan '10

Module: wine Branch: master Commit: 81085498048d9bcdc4eb82de95d97f53a7da32d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81085498048d9bcdc4eb82de9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 4 17:58:25 2010 +0100 winedos: Link to DirectSoundCreate through delayed imports instead of doing it by hand. --- dlls/winedos/Makefile.in | 2 +- dlls/winedos/soundblaster.c | 16 +--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/winedos/Makefile.in b/dlls/winedos/Makefile.in index 632815c..3c16053 100644 --- a/dlls/winedos/Makefile.in +++ b/dlls/winedos/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winedos.dll IMPORTS = user32 kernel32 kernel ntdll -DELAYIMPORTS = ddraw +DELAYIMPORTS = ddraw dsound C_SRCS = \ devices.c \ diff --git a/dlls/winedos/soundblaster.c b/dlls/winedos/soundblaster.c index e48095f..52eb7ba 100644 --- a/dlls/winedos/soundblaster.c +++ b/dlls/winedos/soundblaster.c @@ -61,9 +61,6 @@ static BYTE dma_buffer[DMATRFSIZE*2]; #define DSBUFLEN 4096 /* FIXME: Only this value seems to work */ /* Direct Sound playback stuff */ -static HMODULE hmodule; -typedef HRESULT (WINAPI* fnDirectSoundCreate) (LPGUID,LPDIRECTSOUND*,LPUNKNOWN); -static fnDirectSoundCreate lpDirectSoundCreate; static LPDIRECTSOUND lpdsound; static LPDIRECTSOUNDBUFFER lpdsbuf; static DSBUFFERDESC buf_desc; @@ -126,18 +123,7 @@ static BOOL SB_Init(void) HRESULT result; if (!lpdsound) { - hmodule = LoadLibraryA("dsound.dll"); - if (!hmodule) { - ERR("Can't load dsound.dll !\n"); - return 0; - } - lpDirectSoundCreate = (fnDirectSoundCreate)GetProcAddress(hmodule,"DirectSoundCreate"); - if (!lpDirectSoundCreate) { - /* CloseHandle(hmodule); */ - ERR("Can't find DirectSoundCreate function !\n"); - return 0; - } - result = (*lpDirectSoundCreate)(NULL,&lpdsound,NULL); + result = DirectSoundCreate(NULL,&lpdsound,NULL); if (result != DS_OK) { ERR("Unable to initialize Sound Subsystem err = %x !\n",result); return 0;

1 0

Alexandre Julliard : shell: Convert the about icon to 32-bit explicitly instead of casting the handle.
by Alexandre Julliard 05 Jan '10

05 Jan '10

Module: wine Branch: master Commit: 67e1ac9a936a96647b0b9e1c53a59abd144c0397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67e1ac9a936a96647b0b9e1c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 4 20:20:15 2010 +0100 shell: Convert the about icon to 32-bit explicitly instead of casting the handle. --- dlls/shell.dll16/shell.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/shell.dll16/shell.c b/dlls/shell.dll16/shell.c index b33d3cc..b8d99fd 100644 --- a/dlls/shell.dll16/shell.c +++ b/dlls/shell.dll16/shell.c @@ -42,6 +42,7 @@ #include "shlwapi.h" #include "wine/winbase16.h" +#include "wine/winuser16.h" #include "wine/debug.h" @@ -52,7 +53,6 @@ extern HINSTANCE WINAPI WOWShellExecute(HWND hWnd, LPCSTR lpOperation,LPCSTR lpF INT iShowCmd, void *callback); #define HICON_16(h32) (LOWORD(h32)) -#define HICON_32(h16) ((HICON)(ULONG_PTR)(h16)) #define HINSTANCE_32(h16) ((HINSTANCE)(ULONG_PTR)(h16)) #define HINSTANCE_16(h32) (LOWORD(h32)) @@ -73,6 +73,17 @@ static UINT uMsgWndCreated = 0; static UINT uMsgWndDestroyed = 0; static UINT uMsgShellActivate = 0; +static HICON convert_icon_to_32( HICON16 icon16 ) +{ + CURSORICONINFO *info = GlobalLock16( icon16 ); + void *and_bits = info + 1; + void *xor_bits = (BYTE *)and_bits + info->nHeight * 2 * ((info->nWidth + 15) / 16); + HICON ret = CreateIcon( 0, info->nWidth, info->nHeight, info->bPlanes, info->bBitsPerPixel, + and_bits, xor_bits ); + GlobalUnlock16( icon16 ); + return ret; +} + /*********************************************************************** * DllEntryPoint [SHELL.101] * @@ -183,9 +194,12 @@ BOOL16 WINAPI AboutDlgProc16( HWND16 hWnd, UINT16 msg, WPARAM16 wParam, /************************************************************************* * ShellAbout (SHELL.22) */ -BOOL16 WINAPI ShellAbout16( HWND16 hWnd, LPCSTR szApp, LPCSTR szOtherStuff, - HICON16 hIcon ) -{ return ShellAboutA( HWND_32(hWnd), szApp, szOtherStuff, HICON_32(hIcon) ); +BOOL16 WINAPI ShellAbout16( HWND16 hWnd, LPCSTR szApp, LPCSTR szOtherStuff, HICON16 icon16 ) +{ + HICON icon = convert_icon_to_32( icon16 ); + BOOL ret = ShellAboutA( HWND_32(hWnd), szApp, szOtherStuff, icon ); + DestroyIcon( icon ); + return ret; } /*************************************************************************

1 0

Alexandre Julliard : ole2: Convert the icon for OleMetafilePictFromIconAndLabel to 32-bit explicitly instead of casting the handle .
by Alexandre Julliard 05 Jan '10

05 Jan '10

Module: wine Branch: master Commit: 25c2236a91e889e3f50513048e51bb94894c6d8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=25c2236a91e889e3f50513048… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 4 20:26:54 2010 +0100 ole2: Convert the icon for OleMetafilePictFromIconAndLabel to 32-bit explicitly instead of casting the handle. --- dlls/ole2.dll16/ole2.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/ole2.dll16/ole2.c b/dlls/ole2.dll16/ole2.c index d3880c6..c158949 100644 --- a/dlls/ole2.dll16/ole2.c +++ b/dlls/ole2.dll16/ole2.c @@ -48,8 +48,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -#define HICON_16(h32) (LOWORD(h32)) -#define HICON_32(h16) ((HICON)(ULONG_PTR)(h16)) + +static HICON convert_icon_to_32( HICON16 icon16 ) +{ + CURSORICONINFO *info = GlobalLock16( icon16 ); + void *and_bits = info + 1; + void *xor_bits = (BYTE *)and_bits + info->nHeight * 2 * ((info->nWidth + 15) / 16); + HICON ret = CreateIcon( 0, info->nWidth, info->nHeight, info->bPlanes, info->bBitsPerPixel, + and_bits, xor_bits ); + GlobalUnlock16( icon16 ); + return ret; +} /****************************************************************************** * OleBuildVersion (OLE2.1) @@ -124,7 +133,7 @@ HRESULT WINAPI RevokeDragDrop16( * This code might be wrong at some places. */ HGLOBAL16 WINAPI OleMetafilePictFromIconAndLabel16( - HICON16 hIcon, + HICON16 icon16, LPCOLESTR16 lpszLabel, LPCOLESTR16 lpszSourceFile, UINT16 iIconIndex @@ -134,6 +143,7 @@ HGLOBAL16 WINAPI OleMetafilePictFromIconAndLabel16( HGLOBAL16 hmf16; LPWSTR label = NULL, source = NULL; DWORD len; + HICON icon = convert_icon_to_32( icon16 ); if (lpszLabel) { @@ -147,9 +157,10 @@ HGLOBAL16 WINAPI OleMetafilePictFromIconAndLabel16( source = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, lpszSourceFile, -1, source, len ); } - hmf = OleMetafilePictFromIconAndLabel( HICON_32(hIcon), label, source, iIconIndex ); + hmf = OleMetafilePictFromIconAndLabel( icon, label, source, iIconIndex ); HeapFree( GetProcessHeap(), 0, label ); HeapFree( GetProcessHeap(), 0, source ); + DestroyIcon( icon ); if (!hmf) return 0; pict = GlobalLock( hmf );

1 0

Jacek Caban : urlmon: Fixed accept_mimes freeing.
by Alexandre Julliard 05 Jan '10

05 Jan '10

Module: wine Branch: master Commit: 367cca6a9f6a34c78c8a3bd1401c64bc6a5fa862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=367cca6a9f6a34c78c8a3bd14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 4 19:16:20 2010 +0100 urlmon: Fixed accept_mimes freeing. --- dlls/urlmon/http.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 15344e2..fc0b8c4 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -79,7 +79,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, LPCWSTR url, DWORD requ URL_COMPONENTSW url_comp; BYTE security_id[512]; DWORD len = 0; - ULONG num = 0; + ULONG num; BOOL res, b; HRESULT hres; @@ -132,8 +132,8 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, LPCWSTR url, DWORD requ ? wszBindVerb[This->base.bind_info.dwBindVerb] : This->base.bind_info.szCustomVerb, path, NULL, NULL, (LPCWSTR *)accept_mimes, request_flags, (DWORD_PTR)&This->base); heap_free(path); - while (num<sizeof(accept_mimes)/sizeof(accept_mimes[0]) && accept_mimes[num]) - CoTaskMemFree(accept_mimes[num++]); + while(num--) + CoTaskMemFree(accept_mimes[num]); if (!This->base.request) { WARN("HttpOpenRequest failed: %d\n", GetLastError()); return INET_E_RESOURCE_NOT_FOUND;

1 0