September 2006 - Wine-commits

Ivan Gyurdiev : wined3d: Allow null streams in the vertex declaration.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: b421b60874f003239ffebb757fc57f351c3fb24e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b421b60874f003239ffebb7… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sun Sep 17 16:26:18 2006 -0400 wined3d: Allow null streams in the vertex declaration. --- dlls/wined3d/drawprim.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 9078aee..2c31eb9 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -441,7 +441,12 @@ void primitiveDeclarationConvertToStride unsigned int idx; element = vertexDeclaration->pDeclarationWine + i; - TRACE("%p Elements %p %d or %d\n", vertexDeclaration->pDeclarationWine, element, i, vertexDeclaration->declarationWNumElements); + TRACE("%p Element %p (%d of %d)\n", vertexDeclaration->pDeclarationWine, + element, i + 1, vertexDeclaration->declarationWNumElements - 1); + + if (This->stateBlock->streamSource[element->Stream] == NULL) + continue; + if (This->stateBlock->streamIsUP) { TRACE("Stream is up %d, %p\n", element->Stream, This->stateBlock->streamSource[element->Stream]); streamVBO = 0;

1 0

Alexandre Julliard : user: Fix handling of high bits of resource id in LoadString, reported by Andrey Turkin.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: dea8c6a9ceba97b646eb1621b8b6d0a396a20b0e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dea8c6a9ceba97b646eb162… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 21 20:47:20 2006 +0200 user: Fix handling of high bits of resource id in LoadString, reported by Andrey Turkin. --- dlls/user/resource.c | 10 ++-------- dlls/user/tests/resource.c | 15 +++++++++++++++ dlls/user/tests/resource.rc | 2 ++ 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/user/resource.c b/dlls/user/resource.c index 29ce970..8c66431 100644 --- a/dlls/user/resource.c +++ b/dlls/user/resource.c @@ -364,14 +364,11 @@ INT WINAPI LoadStringW( HINSTANCE instan int string_num; int i; - if (HIWORD(resource_id)==0xFFFF) /* netscape 3 passes this */ - resource_id = (UINT)(-((INT)resource_id)); TRACE("instance = %p, id = %04x, buffer = %p, length = %d\n", instance, resource_id, buffer, buflen); - /* Use bits 4 - 19 (incremented by 1) as resourceid, mask out - * 20 - 31. */ - hrsrc = FindResourceW( instance, MAKEINTRESOURCEW(((resource_id>>4)&0xffff)+1), + /* Use loword (incremented by 1) as resourceid */ + hrsrc = FindResourceW( instance, MAKEINTRESOURCEW((LOWORD(resource_id) >> 4) + 1), (LPWSTR)RT_STRING ); if (!hrsrc) return 0; hmem = LoadResource( instance, hrsrc ); @@ -394,9 +391,6 @@ INT WINAPI LoadStringW( HINSTANCE instan buffer[0] = (WCHAR) 0; return 0; } -#if 0 - WARN("Don't know why caller gave buflen=%d *p=%d trying to obtain string '%s'\n", buflen, *p, p + 1); -#endif } TRACE("%s loaded !\n", debugstr_w(buffer)); diff --git a/dlls/user/tests/resource.c b/dlls/user/tests/resource.c index dc87931..30ee4af 100644 --- a/dlls/user/tests/resource.c +++ b/dlls/user/tests/resource.c @@ -46,6 +46,7 @@ static void test_LoadStringA (void) {sizeof str, sizeof str - 1}, {sizeof str - 1, sizeof str - 2}}; unsigned int i; + int ret; assert (sizeof str < sizeof buf); for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { @@ -61,6 +62,20 @@ static void test_LoadStringA (void) ok (buf[len] == 0, "bufsiz=%d: NUL termination missing\n", bufsiz); } + + ret = LoadStringA(hInst, 1, buf, sizeof(buf) ); + ok( ret > 0, "LoadString failed: ret %d err %ld\n", ret, GetLastError()); + ok( LoadStringA( hInst, MAKELONG( 1, 0x8000 ), buf, sizeof(buf)) == ret, + "LoadString failed: ret %d err %ld\n", ret, GetLastError()); + ok( LoadStringA( hInst, MAKELONG( 1, 0xffff ), buf, sizeof(buf)) == ret, + "LoadString failed: ret %d err %ld\n", ret, GetLastError()); + + ret = LoadStringA(hInst, 65534, buf, sizeof(buf) ); + ok( ret > 0, "LoadString failed: ret %d err %ld\n", ret, GetLastError()); + ok( LoadStringA( hInst, MAKELONG( 65534, 0x8000 ), buf, sizeof(buf)) == ret, + "LoadString failed: ret %d err %ld\n", ret, GetLastError()); + ok( LoadStringA( hInst, MAKELONG( 65534, 0xffff ), buf, sizeof(buf)) == ret, + "LoadString failed: ret %d err %ld\n", ret, GetLastError()); } static void test_accel1(void) diff --git a/dlls/user/tests/resource.rc b/dlls/user/tests/resource.rc index 305b06a..e882728 100644 --- a/dlls/user/tests/resource.rc +++ b/dlls/user/tests/resource.rc @@ -40,6 +40,8 @@ #include "winuser.h" STRINGTABLE { 0 "String resource" + 1 "Another string resource" + 65534 "Test high id" } TEST_DIALOG DIALOG DISCARDABLE 0, 0, 60, 30

1 0

Kai Blin : secur32: Tell the user if ntlm_auth is not found or outdated.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 6ae83720dd80088d175572ff28ef7298bdd2bc81 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6ae83720dd80088d175572f… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sun Sep 17 11:27:03 2006 +0200 secur32: Tell the user if ntlm_auth is not found or outdated. --- dlls/secur32/ntlm.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 930c41b..2783a35 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1619,5 +1619,10 @@ void SECUR32_initNTLMSP(void) SecureProvider *provider = SECUR32_addProvider(&ntlmTableA, &ntlmTableW, NULL); SECUR32_addPackages(provider, 1L, &infoA, &infoW); } + else + { + ERR("ntlm_auth was not found or is outdated. " + "Make sure that ntlm_auth >= 3.x is in your path.\n"); + } cleanup_helper(helper); }

1 0

Alex Villacís Lasso : msacm: acmDriverPriority() compares dwPriority against negative values.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: b897ad1774b71e747a74726ea6c280cbd42633c3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b897ad1774b71e747a74726… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sat Sep 16 12:26:06 2006 -0500 msacm: acmDriverPriority() compares dwPriority against negative values. This issue was spotted by Andrew Talbot. --- dlls/msacm32/driver.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index e537bc4..37dc929 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -671,9 +671,9 @@ MMRESULT WINAPI acmDriverPriority(HACMDR if (padid->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_LOCAL) { return MMSYSERR_NOTSUPPORTED; } - if (dwPriority != 1 && dwPriority != -1) { + if (dwPriority != 1 && dwPriority != (DWORD)-1) { FIXME("unexpected priority %ld, using sign only\n", dwPriority); - if (dwPriority < 0) dwPriority = -1; + if ((signed)dwPriority < 0) dwPriority = (DWORD)-1; if (dwPriority > 0) dwPriority = 1; } @@ -681,7 +681,7 @@ MMRESULT WINAPI acmDriverPriority(HACMDR (padid->pPrevACMDriverID->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_LOCAL))) { /* do nothing - driver is first of list, or first after last local driver */ - } else if (dwPriority == -1 && padid->pNextACMDriverID == NULL) { + } else if (dwPriority == (DWORD)-1 && padid->pNextACMDriverID == NULL) { /* do nothing - driver is last of list */ } else { MSACM_RePositionDriver(padid, dwPriority);

1 0

Benjamin Arai : nddeapi: Implement stub dll for nddeapi.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 0b4eafada9e1b484c19ea99e64aeb57fea405478 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0b4eafada9e1b484c19ea99… Author: Benjamin Arai <me(a)benjaminarai.com> Date: Fri Sep 15 16:00:53 2006 -0700 nddeapi: Implement stub dll for nddeapi. --- Makefile.in | 2 ++ configure | 3 ++- configure.ac | 1 + dlls/.gitignore | 1 + dlls/Makefile.in | 5 +++++ dlls/nddeapi/Makefile.in | 14 +++++++++++++ dlls/nddeapi/nddeapi.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ dlls/nddeapi/nddeapi.spec | 28 ++++++++++++++++++++++++++ 8 files changed, 102 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=0b4eafada9e1b484c19…

1 0

Byeong-Sik Jeon : comdlg32: Show better font style information in fontdlg.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: e1c630847c7fc5a02aa6d579985bc8f4a038fdb5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e1c630847c7fc5a02aa6d57… Author: Byeong-Sik Jeon <wjsqudtlr(a)gmail.com> Date: Thu Sep 14 21:10:19 2006 +0900 comdlg32: Show better font style information in fontdlg. --- dlls/comdlg32/fontdlg.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 4db8d22..9d4c27b 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -386,13 +386,14 @@ #define FSTYLES 4 hf=SelectObject(hdc,hf); DeleteObject(hf); /* font successful created ? */ - if (tm.tmWeight==fontstyles[i].weight && + if (((fontstyles[i].weight == FW_NORMAL && tm.tmWeight <= FW_MEDIUM) || + (fontstyles[i].weight == FW_BOLD && tm.tmWeight > FW_MEDIUM)) && ((tm.tmItalic != 0)==fontstyles[i].italic)) { j=SendMessageW(hwnd,CB_ADDSTRING,0,(LPARAM)fontstyles[i].stname ); if (j==CB_ERR) return 1; j=SendMessageW(hwnd, CB_SETITEMDATA, j, - MAKELONG(fontstyles[i].weight,fontstyles[i].italic)); + MAKELONG(tm.tmWeight,fontstyles[i].italic)); if (j==CB_ERR) return 1; } }

1 0

James Hawkins : wintrust: Move the Crypt* functions to crypt.c.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 8082477d6c0cdc3a413ad97515679cbb8aa53ad4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8082477d6c0cdc3a413ad97… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Sep 13 17:12:39 2006 -0700 wintrust: Move the Crypt* functions to crypt.c. --- dlls/wintrust/crypt.c | 70 +++++++++++++++++++++++++++++++++++++++++ dlls/wintrust/wintrust_main.c | 69 ---------------------------------------- 2 files changed, 70 insertions(+), 69 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 0e91263..bdbbda4 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -23,12 +23,82 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" #include "wintrust.h" +#include "mscat.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wintrust); /*********************************************************************** + * CryptCATAdminAcquireContext (WINTRUST.@) + * + * Get a catalog administrator context handle. + * + * PARAMS + * catAdmin [O] Pointer to the context handle. + * sysSystem [I] Pointer to a GUID for the needed subsystem. + * dwFlags [I] Reserved. + * + * RETURNS + * Success: TRUE. catAdmin contains the context handle. + * Failure: FAIL. + * + */ +BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN* catAdmin, + const GUID *sysSystem, DWORD dwFlags ) +{ + FIXME("%p %s %lx\n", catAdmin, debugstr_guid(sysSystem), dwFlags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** + * CryptCATAdminCalcHashFromFileHandle (WINTRUST.@) + */ +BOOL WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE hFile, DWORD* pcbHash, + BYTE* pbHash, DWORD dwFlags ) +{ + FIXME("%p %p %p %lx\n", hFile, pcbHash, pbHash, dwFlags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** + * CryptCATAdminEnumCatalogFromHash (WINTRUST.@) + */ +HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN hCatAdmin, + BYTE* pbHash, + DWORD cbHash, + DWORD dwFlags, + HCATINFO* phPrevCatInfo ) +{ + FIXME("%p %p %ld %ld %p\n", hCatAdmin, pbHash, cbHash, dwFlags, phPrevCatInfo); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + +/*********************************************************************** + * CryptCATAdminReleaseContext (WINTRUST.@) + * + * Release a catalog administrator context handle. + * + * PARAMS + * catAdmin [I] Pointer to the context handle. + * dwFlags [I] Reserved. + * + * RETURNS + * Success: TRUE. + * Failure: FAIL. + * + */ +BOOL WINAPI CryptCATAdminReleaseContext(HCATADMIN hCatAdmin, DWORD dwFlags ) +{ + FIXME("%p %lx\n", hCatAdmin, dwFlags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * CryptCATOpen (WINTRUST.@) */ HANDLE WINAPI CryptCATOpen(LPWSTR pwszFileName, DWORD fdwOpenFlags, HCRYPTPROV hProv, diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 0636aed..e3f9906 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -51,75 +51,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWO } /*********************************************************************** - * CryptCATAdminAcquireContext (WINTRUST.@) - * - * Get a catalog administrator context handle. - * - * PARAMS - * catAdmin [O] Pointer to the context handle. - * sysSystem [I] Pointer to a GUID for the needed subsystem. - * dwFlags [I] Reserved. - * - * RETURNS - * Success: TRUE. catAdmin contains the context handle. - * Failure: FAIL. - * - */ -BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN* catAdmin, - const GUID *sysSystem, DWORD dwFlags ) -{ - FIXME("%p %s %lx\n", catAdmin, debugstr_guid(sysSystem), dwFlags); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/*********************************************************************** - * CryptCATAdminCalcHashFromFileHandle (WINTRUST.@) - */ -BOOL WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE hFile, DWORD* pcbHash, - BYTE* pbHash, DWORD dwFlags ) -{ - FIXME("%p %p %p %lx\n", hFile, pcbHash, pbHash, dwFlags); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/*********************************************************************** - * CryptCATAdminEnumCatalogFromHash (WINTRUST.@) - */ -HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN hCatAdmin, - BYTE* pbHash, - DWORD cbHash, - DWORD dwFlags, - HCATINFO* phPrevCatInfo ) -{ - FIXME("%p %p %ld %ld %p\n", hCatAdmin, pbHash, cbHash, dwFlags, phPrevCatInfo); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return NULL; -} - -/*********************************************************************** - * CryptCATAdminReleaseContext (WINTRUST.@) - * - * Release a catalog administrator context handle. - * - * PARAMS - * catAdmin [I] Pointer to the context handle. - * dwFlags [I] Reserved. - * - * RETURNS - * Success: TRUE. - * Failure: FAIL. - * - */ -BOOL WINAPI CryptCATAdminReleaseContext(HCATADMIN hCatAdmin, DWORD dwFlags ) -{ - FIXME("%p %lx\n", hCatAdmin, dwFlags); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/*********************************************************************** * TrustIsCertificateSelfSigned (WINTRUST.@) */ BOOL WINAPI TrustIsCertificateSelfSigned( PCCERT_CONTEXT cert )

1 0

James Hawkins : wintrust: Add a stub implementation of CryptCATEnumerateMember.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: ab5494e83ecde54f37ec02cf9fd20219d12baab1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ab5494e83ecde54f37ec02c… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Sep 13 17:15:00 2006 -0700 wintrust: Add a stub implementation of CryptCATEnumerateMember. --- dlls/wintrust/crypt.c | 9 +++++++++ dlls/wintrust/wintrust.spec | 2 +- include/mscat.h | 14 ++++++++++++++ 3 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index bdbbda4..692501f 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -99,6 +99,15 @@ BOOL WINAPI CryptCATAdminReleaseContext( } /*********************************************************************** + * CryptCATEnumerateMember (WINTRUST.@) + */ +CRYPTCATMEMBER *WINAPI CryptCATEnumerateMember(HANDLE hCatalog, CRYPTCATMEMBER* pPrevMember) +{ + FIXME("(%p, %p) stub\n", hCatalog, pPrevMember); + return NULL; +} + +/*********************************************************************** * CryptCATOpen (WINTRUST.@) */ HANDLE WINAPI CryptCATOpen(LPWSTR pwszFileName, DWORD fdwOpenFlags, HCRYPTPROV hProv, diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index eb3c9bb..bd47e73 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -21,7 +21,7 @@ @ stub CryptCATClose @ stub CryptCATEnumerateAttr @ stub CryptCATEnumerateCatAttr -@ stub CryptCATEnumerateMember +@ stdcall CryptCATEnumerateMember(long ptr) @ stub CryptCATGetAttrInfo @ stub CryptCATGetCatAttrInfo @ stub CryptCATGetMemberInfo diff --git a/include/mscat.h b/include/mscat.h index ad3eca0..7e95155 100644 --- a/include/mscat.h +++ b/include/mscat.h @@ -26,6 +26,20 @@ #ifdef __cplusplus extern "C" { #endif +typedef struct CRYPTCATMEMBER_ { + DWORD cbStruct; + LPWSTR pwszReferenceTag; + LPWSTR pwszFileName; + GUID gSubjectType; + DWORD fdwMemberFlags; + struct SIP_INDIRECT_DATA_* pIndirectData; + DWORD dwCertVersion; + DWORD dwReserved; + HANDLE hReserved; + CRYPT_ATTR_BLOB sEncodedIndirectData; + CRYPT_ATTR_BLOB sEncodedMemberInfo; +} CRYPTCATMEMBER; + BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN*,const GUID*,DWORD); BOOL WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE,DWORD*,BYTE*,DWORD); HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN,BYTE*,DWORD,DWORD,HCATINFO*);

1 0

James Hawkins : wintrust: Add a stub implementation of CryptCATClose.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 15b7934f3da0ccb2afc0976248a504fad2ca36d2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=15b7934f3da0ccb2afc0976… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Sep 13 17:15:56 2006 -0700 wintrust: Add a stub implementation of CryptCATClose. --- dlls/wintrust/crypt.c | 9 +++++++++ dlls/wintrust/wintrust.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 692501f..019d5e5 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -99,6 +99,15 @@ BOOL WINAPI CryptCATAdminReleaseContext( } /*********************************************************************** + * CryptCATClose (WINTRUST.@) + */ +BOOL WINAPI CryptCATClose(HANDLE hCatalog) +{ + FIXME("(%p) stub\n", hCatalog); + return TRUE; +} + +/*********************************************************************** * CryptCATEnumerateMember (WINTRUST.@) */ CRYPTCATMEMBER *WINAPI CryptCATEnumerateMember(HANDLE hCatalog, CRYPTCATMEMBER* pPrevMember) diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index bd47e73..97f26a2 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -18,7 +18,7 @@ @ stub CryptCATCDFEnumMembersByCDFTagEx @ stub CryptCATCDFOpen @ stub CryptCATCatalogInfoFromContext -@ stub CryptCATClose +@ stdcall CryptCATClose(long) @ stub CryptCATEnumerateAttr @ stub CryptCATEnumerateCatAttr @ stdcall CryptCATEnumerateMember(long ptr)

1 0

Mikołaj Zalewski : comctl32: toolbar: Fix IDB_STD_VIEW_* icons count (with testcase).
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 9e390091db366826da0e87643e62d2e7f0d773aa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9e390091db366826da0e876… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Sep 20 17:46:08 2006 +0200 comctl32: toolbar: Fix IDB_STD_VIEW_* icons count (with testcase). --- dlls/comctl32/tests/toolbar.c | 31 +++++++++++++++++++++++++++++++ dlls/comctl32/toolbar.c | 2 +- 2 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index bfcbd67..7c8bade 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -149,6 +149,7 @@ static void test_add_bitmap(void) TBADDBITMAP bmp128; TBADDBITMAP bmp80; TBADDBITMAP stdsmall; + TBADDBITMAP addbmp; INT ret; /* empty 128x15 bitmap */ @@ -240,6 +241,36 @@ static void test_add_bitmap(void) UpdateWindow(hToolbar); CHECK_IMAGELIST_TODO_COUNT_SIZE(28, 16, 15); + /* check standard bitmaps */ + addbmp.hInst = HINST_COMMCTRL; + addbmp.nID = IDB_STD_SMALL_COLOR; + rebuild_toolbar(&hToolbar); + ok(SendMessageA(hToolbar, TB_ADDBITMAP, 1, (LPARAM)&addbmp) == 0, "TB_ADDBITMAP - unexpected return\n"); + CHECK_IMAGELIST(15, 16, 15); + addbmp.nID = IDB_STD_LARGE_COLOR; + rebuild_toolbar(&hToolbar); + ok(SendMessageA(hToolbar, TB_ADDBITMAP, 1, (LPARAM)&addbmp) == 0, "TB_ADDBITMAP - unexpected return\n"); + CHECK_IMAGELIST(15, 24, 24); + + addbmp.nID = IDB_VIEW_SMALL_COLOR; + rebuild_toolbar(&hToolbar); + ok(SendMessageA(hToolbar, TB_ADDBITMAP, 1, (LPARAM)&addbmp) == 0, "TB_ADDBITMAP - unexpected return\n"); + CHECK_IMAGELIST(12, 16, 15); + addbmp.nID = IDB_VIEW_LARGE_COLOR; + rebuild_toolbar(&hToolbar); + ok(SendMessageA(hToolbar, TB_ADDBITMAP, 1, (LPARAM)&addbmp) == 0, "TB_ADDBITMAP - unexpected return\n"); + CHECK_IMAGELIST(12, 24, 24); + + addbmp.nID = IDB_HIST_SMALL_COLOR; + rebuild_toolbar(&hToolbar); + ok(SendMessageA(hToolbar, TB_ADDBITMAP, 1, (LPARAM)&addbmp) == 0, "TB_ADDBITMAP - unexpected return\n"); + CHECK_IMAGELIST(5, 16, 15); + addbmp.nID = IDB_HIST_LARGE_COLOR; + rebuild_toolbar(&hToolbar); + ok(SendMessageA(hToolbar, TB_ADDBITMAP, 1, (LPARAM)&addbmp) == 0, "TB_ADDBITMAP - unexpected return\n"); + CHECK_IMAGELIST(5, 24, 24); + + DestroyWindow(hToolbar); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 840a08a..b6b82cd 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -2591,7 +2591,7 @@ TOOLBAR_AddBitmap (HWND hwnd, WPARAM wPa if ((lpAddBmp->nID & ~1) == IDB_STD_SMALL_COLOR) nButtons = 15; else if ((lpAddBmp->nID & ~1) == IDB_VIEW_SMALL_COLOR) - nButtons = 13; + nButtons = 12; else if ((lpAddBmp->nID & ~1) == IDB_HIST_SMALL_COLOR) nButtons = 5; else

1 0