May 2012 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : oleaut32: Add a test for saving bitmap data into a stream.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: ab816a3a2f82ec9d309e57bc2d7c155b52af1f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab816a3a2f82ec9d309e57bc2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 17 18:30:44 2012 +0900 oleaut32: Add a test for saving bitmap data into a stream. --- dlls/oleaut32/tests/olepicture.c | 54 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 8be8b82..a70f0b7 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -953,6 +953,59 @@ static void test_himetric(void) DeleteDC(hdc); } +static void test_load_save_bmp(void) +{ + IPicture *pic; + PICTDESC desc; + short type; + OLE_HANDLE handle; + HGLOBAL hmem; + DWORD *mem; + IPersistStream *src_stream; + IStream *dst_stream; + HRESULT hr; + + desc.cbSizeofstruct = sizeof(desc); + desc.picType = PICTYPE_BITMAP; + desc.u.bmp.hpal = 0; + desc.u.bmp.hbitmap = CreateBitmap(1, 1, 1, 1, NULL); + hr = OleCreatePictureIndirect(&desc, &IID_IPicture, FALSE, (void**)&pic); + ok(hr == S_OK, "OleCreatePictureIndirect error %#x\n", hr); + + type = -1; + hr = IPicture_get_Type(pic, &type); + ok(hr == S_OK,"get_Type error %#8x\n", hr); + ok(type == PICTYPE_BITMAP,"expected picture type PICTYPE_BITMAP, got %d\n", type); + + hr = IPicture_get_Handle(pic, &handle); + ok(hr == S_OK,"get_Handle error %#8x\n", hr); + ok(UIntToPtr(handle) == desc.u.bmp.hbitmap, "get_Handle returned wrong handle %#x\n", handle); + + hmem = GlobalAlloc(GMEM_ZEROINIT, 4096); + hr = CreateStreamOnHGlobal(hmem, FALSE, &dst_stream); + ok(hr == S_OK, "createstreamonhglobal error %#x\n", hr); + + hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + hr = IPersistStream_Save(src_stream, dst_stream, TRUE); + ok(hr == S_OK, "Save error %#x\n", hr); + + IPersistStream_Release(src_stream); + IStream_Release(dst_stream); + + mem = GlobalLock(hmem); + ok(!memcmp(mem, "lt\0\0", 4), "got wrong stream header %04x\n", mem[0]); + ok(mem[1] == 66, "expected stream size 66, got %u\n", mem[1]); + ok(!memcmp(&mem[2], "BM", 2), "got wrong bmp header %04x\n", mem[2]); + + GlobalUnlock(hmem); + GlobalFree(hmem); + + DeleteObject(desc.u.bmp.hbitmap); + IPicture_Release(pic); +} + START_TEST(olepicture) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -989,6 +1042,7 @@ START_TEST(olepicture) test_get_Type(); test_OleLoadPicturePath(); test_himetric(); + test_load_save_bmp(); }

1 0

Alexandre Julliard : tools: Remove the fnt2bdf tool, we no longer use X11 fonts.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: 57f97fd6a250dfcad9cffad4ffba984548a60562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57f97fd6a250dfcad9cffad4f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 17 17:40:57 2012 +0200 tools: Remove the fnt2bdf tool, we no longer use X11 fonts. --- .gitignore | 1 - tools/Makefile.in | 5 - tools/fnt2bdf.c | 778 ------------------------------------------------- tools/font_convert.sh | 134 --------- 4 files changed, 0 insertions(+), 918 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=57f97fd6a250dfcad9cff…

1 0

André Hentschel : wmvcore: Add stub for WMCreateSyncReader.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: e44c0459cde722c2123cfd70b088c8245e249443 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e44c0459cde722c2123cfd70b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 17 15:56:32 2012 +0200 wmvcore: Add stub for WMCreateSyncReader. --- .gitignore | 2 + dlls/wmvcore/wmvcore.spec | 2 +- dlls/wmvcore/wmvcore_main.c | 7 + include/Makefile.in | 2 + include/wmsbuffer.idl | 43 ++++++ include/wmsdkidl.idl | 331 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 386 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e44c0459cde722c2123cf…

1 0

Hans Leidekker : msi: Use the correct function pointer in msi_init_assembly_caches.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: d6105eaa1f9ffeca229e6bcb584636692ce097e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6105eaa1f9ffeca229e6bcb5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 17 10:17:29 2012 +0200 msi: Use the correct function pointer in msi_init_assembly_caches. --- dlls/msi/assembly.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index c188d55..b8fabb7 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -87,7 +87,7 @@ BOOL msi_init_assembly_caches( MSIPACKAGE *package ) package->cache_net[CLR_VERSION_V20]) return TRUE; if (pCreateAssemblyCacheSxs( &package->cache_sxs, 0 ) != S_OK) return FALSE; - if (pCreateAssemblyCacheNet10) pCreateAssemblyCacheNet11( &package->cache_net[CLR_VERSION_V10], 0 ); + if (pCreateAssemblyCacheNet10) pCreateAssemblyCacheNet10( &package->cache_net[CLR_VERSION_V10], 0 ); if (pCreateAssemblyCacheNet11) pCreateAssemblyCacheNet11( &package->cache_net[CLR_VERSION_V11], 0 ); if (pCreateAssemblyCacheNet20) pCreateAssemblyCacheNet20( &package->cache_net[CLR_VERSION_V20], 0 );

1 0

Vincent Povirk : windowscodecs: Add wrapper functions for IWICStream methods.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: 73a4309234f4b2beedf866fb0dc12d66fa1fbabd URL: http://source.winehq.org/git/wine.git/?a=commit;h=73a4309234f4b2beedf866fb0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 12:50:58 2012 -0500 windowscodecs: Add wrapper functions for IWICStream methods. --- dlls/windowscodecs/proxy.c | 12 ++++++++++++ dlls/windowscodecs/windowscodecs.spec | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index 1b298db..216bf19 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -608,6 +608,18 @@ HRESULT WINAPI IWICPalette_HasAlpha_Proxy_W(IWICPalette *iface, return IWICPalette_HasAlpha(iface, pfHasAlpha); } +HRESULT WINAPI IWICStream_InitializeFromIStream_Proxy_W(IWICStream *iface, + IStream *pIStream) +{ + return IWICStream_InitializeFromIStream(iface, pIStream); +} + +HRESULT WINAPI IWICStream_InitializeFromMemory_Proxy_W(IWICStream *iface, + BYTE *pbBuffer, DWORD cbBufferSize) +{ + return IWICStream_InitializeFromMemory(iface, pbBuffer, cbBufferSize); +} + HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT SDKVersion, IWICImagingFactory **ppIImagingFactory) { TRACE("%x, %p\n", SDKVersion, ppIImagingFactory); diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index bd5b94c..453a84e 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -102,8 +102,8 @@ @ stub IWICPixelFormatInfo_GetBitsPerPixel_Proxy @ stub IWICPixelFormatInfo_GetChannelCount_Proxy @ stub IWICPixelFormatInfo_GetChannelMask_Proxy -@ stub IWICStream_InitializeFromIStream_Proxy -@ stub IWICStream_InitializeFromMemory_Proxy +@ stdcall IWICStream_InitializeFromIStream_Proxy(ptr ptr) IWICStream_InitializeFromIStream_Proxy_W +@ stdcall IWICStream_InitializeFromMemory_Proxy(ptr ptr long) IWICStream_InitializeFromMemory_Proxy_W @ stdcall WICConvertBitmapSource(ptr ptr ptr) @ stub WICCreateBitmapFromSection @ stub WICCreateColorContext_Proxy

1 0

Huw Davies : localspl: Calling AddPrinterDriver on an existing driver should succeed.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: 25bb808cf104ee853173aefa6e1e685f62d28e5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=25bb808cf104ee853173aefa6… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 17 13:12:03 2012 +0100 localspl: Calling AddPrinterDriver on an existing driver should succeed. --- dlls/localspl/provider.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 392b8ed..a599113 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1361,13 +1361,6 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo } RegCloseKey(hroot); - if (disposition == REG_OPENED_EXISTING_KEY) { - TRACE("driver %s already installed\n", debugstr_w(di.pName)); - RegCloseKey(hdrv); - SetLastError(ERROR_PRINTER_DRIVER_ALREADY_INSTALLED); - return FALSE; - } - /* Verified with the Adobe PS Driver, that w2k does not use di.Version */ RegSetValueExW(hdrv, versionW, 0, REG_DWORD, (const BYTE*) &env->driverversion, sizeof(DWORD));

1 0

Alex Henrie : kernel32: Correct WideCharToMultiByte and MultiByteToWideChar error codes and conditions .
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: 8ccf747d6a7c05f64559949705548e2158b85eea URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ccf747d6a7c05f6455994970… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed May 16 19:24:03 2012 -0600 kernel32: Correct WideCharToMultiByte and MultiByteToWideChar error codes and conditions. --- dlls/kernel32/locale.c | 38 ++++++++++++++++++--- dlls/kernel32/tests/codepage.c | 69 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 380c616..2970856 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1878,7 +1878,7 @@ INT WINAPI MultiByteToWideChar( UINT page, DWORD flags, LPCSTR src, INT srclen, const union cptable *table; int ret; - if (!src || (!dst && dstlen)) + if (!src || !srclen || (!dst && dstlen)) { SetLastError( ERROR_INVALID_PARAMETER ); return 0; @@ -1889,14 +1889,19 @@ INT WINAPI MultiByteToWideChar( UINT page, DWORD flags, LPCSTR src, INT srclen, switch(page) { case CP_SYMBOL: - if( flags) + if (flags) { - SetLastError( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_FLAGS ); return 0; } ret = wine_cpsymbol_mbstowcs( src, srclen, dst, dstlen ); break; case CP_UTF7: + if (flags) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } FIXME("UTF-7 not supported\n"); SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return 0; @@ -1969,7 +1974,7 @@ INT WINAPI WideCharToMultiByte( UINT page, DWORD flags, LPCWSTR src, INT srclen, const union cptable *table; int ret, used_tmp; - if (!src || (!dst && dstlen)) + if (!src || !srclen || (!dst && dstlen)) { SetLastError( ERROR_INVALID_PARAMETER ); return 0; @@ -1980,7 +1985,13 @@ INT WINAPI WideCharToMultiByte( UINT page, DWORD flags, LPCWSTR src, INT srclen, switch(page) { case CP_SYMBOL: - if( flags || defchar || used) + /* when using CP_SYMBOL, ERROR_INVALID_FLAGS takes precedence */ + if (flags) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } + if (defchar || used) { SetLastError( ERROR_INVALID_PARAMETER ); return 0; @@ -1988,6 +1999,17 @@ INT WINAPI WideCharToMultiByte( UINT page, DWORD flags, LPCWSTR src, INT srclen, ret = wine_cpsymbol_wcstombs( src, srclen, dst, dstlen ); break; case CP_UTF7: + /* when using CP_UTF7, ERROR_INVALID_PARAMETER takes precedence */ + if (defchar || used) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + if (flags) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } FIXME("UTF-7 not supported\n"); SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return 0; @@ -2000,7 +2022,11 @@ INT WINAPI WideCharToMultiByte( UINT page, DWORD flags, LPCWSTR src, INT srclen, } /* fall through */ case CP_UTF8: - if (used) *used = FALSE; /* all chars are valid for UTF-8 */ + if (defchar || used) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } ret = wine_utf8_wcstombs( flags, src, srclen, dst, dstlen ); break; default: diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 61bcf54..c980348 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -189,6 +189,74 @@ static void test_negative_dest_length(void) } +static void test_other_invalid_parameters(void) +{ + char c_string[] = "Hello World"; + size_t c_string_len = sizeof(c_string); + WCHAR w_string[] = {'H','e','l','l','o',' ','W','o','r','l','d',0}; + size_t w_string_len = sizeof(w_string) / sizeof(WCHAR); + BOOL used; + INT len; + + /* srclen=0 => ERROR_INVALID_PARAMETER */ + SetLastError(0xdeadbeef); + len = WideCharToMultiByte(CP_ACP, 0, w_string, 0, c_string, c_string_len, NULL, NULL); + ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError()); + + SetLastError(0xdeadbeef); + len = MultiByteToWideChar(CP_ACP, 0, c_string, 0, w_string, w_string_len); + ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError()); + + + /* dst=NULL but dstlen not 0 => ERROR_INVALID_PARAMETER */ + SetLastError(0xdeadbeef); + len = WideCharToMultiByte(CP_ACP, 0, w_string, w_string_len, NULL, c_string_len, NULL, NULL); + ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError()); + + SetLastError(0xdeadbeef); + len = MultiByteToWideChar(CP_ACP, 0, c_string, c_string_len, NULL, w_string_len); + ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError()); + + + /* CP_UTF7, CP_UTF8, or CP_SYMBOL and defchar not NULL => ERROR_INVALID_PARAMETER */ + /* CP_SYMBOL's behavior here is undocumented */ + SetLastError(0xdeadbeef); + len = WideCharToMultiByte(CP_UTF7, 0, w_string, w_string_len, c_string, c_string_len, c_string, NULL); + ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError()); + + SetLastError(0xdeadbeef); + len = WideCharToMultiByte(CP_UTF8, 0, w_string, w_string_len, c_string, c_string_len, c_string, NULL); + ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError()); + + SetLastError(0xdeadbeef); + len = WideCharToMultiByte(CP_SYMBOL, 0, w_string, w_string_len, c_string, c_string_len, c_string, NULL); + ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError()); + + + /* CP_UTF7, CP_UTF8, or CP_SYMBOL and used not NULL => ERROR_INVALID_PARAMETER */ + /* CP_SYMBOL's behavior here is undocumented */ + SetLastError(0xdeadbeef); + len = WideCharToMultiByte(CP_UTF7, 0, w_string, w_string_len, c_string, c_string_len, NULL, &used); + ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError()); + + SetLastError(0xdeadbeef); + len = WideCharToMultiByte(CP_UTF8, 0, w_string, w_string_len, c_string, c_string_len, NULL, &used); + ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError()); + + SetLastError(0xdeadbeef); + len = WideCharToMultiByte(CP_SYMBOL, 0, w_string, w_string_len, c_string, c_string_len, NULL, &used); + ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError()); + + + /* CP_UTF7, flags not 0 and used not NULL => ERROR_INVALID_PARAMETER */ + /* (tests precedence of ERROR_INVALID_PARAMETER over ERROR_INVALID_FLAGS) */ + /* The same test with CP_SYMBOL instead of CP_UTF7 gives ERROR_INVALID_FLAGS + instead except on Windows NT4 */ + SetLastError(0xdeadbeef); + len = WideCharToMultiByte(CP_UTF7, 1, w_string, w_string_len, c_string, c_string_len, NULL, &used); + ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError()); +} + static void test_overlapped_buffers(void) { static const WCHAR strW[] = {'j','u','s','t',' ','a',' ','t','e','s','t',0}; @@ -402,6 +470,7 @@ START_TEST(codepage) test_null_source(); test_negative_source_length(); test_negative_dest_length(); + test_other_invalid_parameters(); test_overlapped_buffers(); /* WideCharToMultiByte has two code paths, test both here */

1 0

Józef Kucia : d3dx9/tests: Fix messed up parameters.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: 091a4269ef682b90df77603681ba56168b7546f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=091a4269ef682b90df7760368… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu May 17 16:51:23 2012 +0200 d3dx9/tests: Fix messed up parameters. --- dlls/d3dx9_36/tests/texture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 143d45b..5663bfa 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -473,7 +473,7 @@ static void test_D3DXCreateTexture(IDirect3DDevice9 *device) IDirect3DDevice9_GetDeviceCaps(device, &caps); - hr = D3DXCreateTexture(NULL, 0, 0, 0, 0, D3DX_DEFAULT, 0, D3DPOOL_DEFAULT); + hr = D3DXCreateTexture(NULL, 0, 0, 0, 0, D3DX_DEFAULT, D3DPOOL_DEFAULT, NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXCreateTexture returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); /* width and height tests */

1 0

Józef Kucia : d3dx9/tests: Do not release a cube texture if it wasn't created.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: 5ab8c2fdf8af0589bc9b2ffed152ebd6e0d0a5a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ab8c2fdf8af0589bc9b2ffed… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu May 17 16:51:22 2012 +0200 d3dx9/tests: Do not release a cube texture if it wasn't created. --- dlls/d3dx9_36/tests/texture.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 1314fa2..143d45b 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -734,11 +734,10 @@ static void test_D3DXFilterTexture(IDirect3DDevice9 *device) hr = D3DXFilterTexture((IDirect3DBaseTexture9*) cubetex, NULL, 5, D3DX_FILTER_NONE); /* Invalid miplevel */ ok(hr == D3DERR_INVALIDCALL, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + IDirect3DCubeTexture9_Release(cubetex); } else skip("Failed to create texture\n"); - - IDirect3DCubeTexture9_Release(cubetex); } static BOOL color_match(const DWORD *value, const DWORD *expected)

1 0

Piotr Caban : comctl32: Return if point is over a button in TOOLBAR_InternalHitTest.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: 2d75a2425e401e5b7781f3484298ae8ebca01bb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d75a2425e401e5b7781f3484… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 17 12:22:32 2012 +0200 comctl32: Return if point is over a button in TOOLBAR_InternalHitTest. --- dlls/comctl32/toolbar.c | 50 ++++++++++++++++++++++++++++------------------ 1 files changed, 30 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index fbabc1d..9807745 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1775,11 +1775,14 @@ TOOLBAR_LayoutToolbar(TOOLBAR_INFO *infoPtr) static INT -TOOLBAR_InternalHitTest (const TOOLBAR_INFO *infoPtr, const POINT *lpPt) +TOOLBAR_InternalHitTest (const TOOLBAR_INFO *infoPtr, const POINT *lpPt, BOOL *button) { TBUTTON_INFO *btnPtr; INT i; + if (button) + *button = FALSE; + btnPtr = infoPtr->buttons; for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++) { if (btnPtr->fsState & TBSTATE_HIDDEN) @@ -1794,6 +1797,8 @@ TOOLBAR_InternalHitTest (const TOOLBAR_INFO *infoPtr, const POINT *lpPt) else { if (PtInRect (&btnPtr->rect, *lpPt)) { TRACE(" ON BUTTON %d!\n", i); + if (button) + *button = TRUE; return i; } } @@ -3664,7 +3669,7 @@ TOOLBAR_HideButton (TOOLBAR_INFO *infoPtr, INT Id, BOOL fHide) static inline LRESULT TOOLBAR_HitTest (const TOOLBAR_INFO *infoPtr, const POINT* lpPt) { - return TOOLBAR_InternalHitTest (infoPtr, lpPt); + return TOOLBAR_InternalHitTest (infoPtr, lpPt, NULL); } @@ -5376,13 +5381,13 @@ static LRESULT TOOLBAR_LButtonDblClk (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { POINT pt; - INT nHit; + BOOL button; pt.x = (short)LOWORD(lParam); pt.y = (short)HIWORD(lParam); - nHit = TOOLBAR_InternalHitTest (infoPtr, &pt); + TOOLBAR_InternalHitTest (infoPtr, &pt, &button); - if (nHit >= 0) + if (button) TOOLBAR_LButtonDown (infoPtr, wParam, lParam); else if (infoPtr->dwStyle & CCS_ADJUSTABLE) TOOLBAR_Customize (infoPtr); @@ -5400,6 +5405,7 @@ TOOLBAR_LButtonDown (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) NMTOOLBARA nmtb; NMMOUSE nmmouse; BOOL bDragKeyPressed; + BOOL button; TRACE("\n"); @@ -5414,11 +5420,12 @@ TOOLBAR_LButtonDown (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) pt.x = (short)LOWORD(lParam); pt.y = (short)HIWORD(lParam); - nHit = TOOLBAR_InternalHitTest (infoPtr, &pt); + nHit = TOOLBAR_InternalHitTest (infoPtr, &pt, &button); - btnPtr = &infoPtr->buttons[nHit]; + if (button) + btnPtr = &infoPtr->buttons[nHit]; - if ((nHit >= 0) && bDragKeyPressed && (infoPtr->dwStyle & CCS_ADJUSTABLE)) + if (button && bDragKeyPressed && (infoPtr->dwStyle & CCS_ADJUSTABLE)) { infoPtr->nButtonDrag = nHit; SetCapture (infoPtr->hwndSelf); @@ -5429,7 +5436,7 @@ TOOLBAR_LButtonDown (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) hCursorDrag = LoadCursorW(COMCTL32_hModule, (LPCWSTR)IDC_MOVEBUTTON); SetCursor(hCursorDrag); } - else if (nHit >= 0) + else if (button) { RECT arrowRect; infoPtr->nOldHit = nHit; @@ -5476,8 +5483,8 @@ TOOLBAR_LButtonDown (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) * NOTE: native doesn't do this, but that is a bug */ GetCursorPos(&pt); ScreenToClient(infoPtr->hwndSelf, &pt); - nHit = TOOLBAR_InternalHitTest(infoPtr, &pt); - if (!infoPtr->bAnchor || (nHit >= 0)) + nHit = TOOLBAR_InternalHitTest(infoPtr, &pt, &button); + if (!infoPtr->bAnchor || button) TOOLBAR_SetHotItemEx(infoPtr, nHit, HICF_MOUSE | HICF_LMOUSE); /* remove any left mouse button down or double-click messages @@ -5504,7 +5511,7 @@ TOOLBAR_LButtonDown (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) SetCapture (infoPtr->hwndSelf); } - if (nHit >=0) + if (button) { memset(&nmtb, 0, sizeof(nmtb)); nmtb.iItem = btnPtr->idCommand; @@ -5514,7 +5521,7 @@ TOOLBAR_LButtonDown (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) nmmouse.dwHitInfo = nHit; /* !!! Undocumented - sends NM_LDOWN with the NMMOUSE structure. */ - if (nHit < 0) + if (!button) nmmouse.dwItemSpec = -1; else { @@ -5541,6 +5548,7 @@ TOOLBAR_LButtonUp (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) NMHDR hdr; NMMOUSE nmmouse; NMTOOLBARA nmtb; + BOOL button; if (infoPtr->hwndToolTip) TOOLBAR_RelayEvent (infoPtr->hwndToolTip, infoPtr->hwndSelf, @@ -5548,9 +5556,9 @@ TOOLBAR_LButtonUp (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) pt.x = (short)LOWORD(lParam); pt.y = (short)HIWORD(lParam); - nHit = TOOLBAR_InternalHitTest (infoPtr, &pt); + nHit = TOOLBAR_InternalHitTest (infoPtr, &pt, &button); - if (!infoPtr->bAnchor || (nHit >= 0)) + if (!infoPtr->bAnchor || button) TOOLBAR_SetHotItemEx(infoPtr, nHit, HICF_MOUSE | HICF_LMOUSE); if (infoPtr->nButtonDrag >= 0) { @@ -5676,7 +5684,7 @@ TOOLBAR_LButtonUp (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) * NM_CLICK with the NMMOUSE structure. */ nmmouse.dwHitInfo = nHit; - if (nHit < 0) + if (!button) nmmouse.dwItemSpec = -1; else { @@ -5699,14 +5707,15 @@ TOOLBAR_RButtonUp(TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) INT nHit; NMMOUSE nmmouse; POINT pt; + BOOL button; pt.x = (short)LOWORD(lParam); pt.y = (short)HIWORD(lParam); - nHit = TOOLBAR_InternalHitTest(infoPtr, &pt); + nHit = TOOLBAR_InternalHitTest(infoPtr, &pt, &button); nmmouse.dwHitInfo = nHit; - if (nHit < 0) { + if (!button) { nmmouse.dwItemSpec = -1; } else { nmmouse.dwItemSpec = infoPtr->buttons[nmmouse.dwHitInfo].idCommand; @@ -5805,6 +5814,7 @@ TOOLBAR_MouseMove (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) TRACKMOUSEEVENT trackinfo; INT nHit; TBUTTON_INFO *btnPtr; + BOOL button; if ((infoPtr->dwStyle & TBSTYLE_TOOLTIPS) && (infoPtr->hwndToolTip == NULL)) TOOLBAR_TooltipCreateControl(infoPtr); @@ -5835,10 +5845,10 @@ TOOLBAR_MouseMove (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) pt.x = (short)LOWORD(lParam); pt.y = (short)HIWORD(lParam); - nHit = TOOLBAR_InternalHitTest (infoPtr, &pt); + nHit = TOOLBAR_InternalHitTest (infoPtr, &pt, &button); if (((infoPtr->dwStyle & TBSTYLE_FLAT) || GetWindowTheme (infoPtr->hwndSelf)) - && (!infoPtr->bAnchor || (nHit >= 0))) + && (!infoPtr->bAnchor || button)) TOOLBAR_SetHotItemEx(infoPtr, nHit, HICF_MOUSE); if (infoPtr->nOldHit != nHit)

1 0