November 2007 - Wine-commits

Juan Lang : crypt32: Get rid of an unneeded variable.
by Alexandre Julliard 02 Nov '07

02 Nov '07

Module: wine Branch: master Commit: 9c672fea4188f9a9424296bb0a7b72b46de4ac4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c672fea4188f9a9424296bb0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 1 07:48:50 2007 -0700 crypt32: Get rid of an unneeded variable. --- dlls/crypt32/decode.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 6297251..db2a3b3 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -617,15 +617,12 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, for (ptr = pbEncoded + 1 + lenBytes; ret && !doneDecoding; ) { - DWORD itemLenBytes; - - itemLenBytes = GET_LEN_BYTES(ptr[1]); if (dataLen == CMSG_INDEFINITE_LENGTH) { if (ptr[0] == 0) { doneDecoding = TRUE; - if (itemLenBytes != 1 || ptr[1] != 0) + if (ptr[1] != 0) { SetLastError(CRYPT_E_ASN1_CORRUPT); ret = FALSE; @@ -649,7 +646,8 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, if (itemDataLen == CMSG_INDEFINITE_LENGTH) itemEncoded = cbEncoded - (ptr - pbEncoded); else - itemEncoded = 1 + itemLenBytes + itemDataLen; + itemEncoded = 1 + GET_LEN_BYTES(ptr[1]) + + itemDataLen; } if (ret) ret = arrayDesc->decodeFunc(ptr, itemEncoded,

1 0

Juan Lang : crypt32: Set size when calling CryptDecodeObjectEx without CRYPT_DECODE_ALLOC_FLAG set .
by Alexandre Julliard 02 Nov '07

02 Nov '07

Module: wine Branch: master Commit: 4690a9c800e95e389e81d3a0ee2b3fc187257c1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4690a9c800e95e389e81d3a0e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 1 07:57:09 2007 -0700 crypt32: Set size when calling CryptDecodeObjectEx without CRYPT_DECODE_ALLOC_FLAG set. --- dlls/crypt32/cert.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 844b054..5b45358 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -251,7 +251,7 @@ static BOOL WINAPI CertContext_GetProperty(void *context, DWORD dwPropId, if (ext) { CRYPT_DATA_BLOB value; - DWORD size; + DWORD size = sizeof(value); ret = CryptDecodeObjectEx(X509_ASN_ENCODING, szOID_SUBJECT_KEY_IDENTIFIER, ext->Value.pbData,

1 0

Juan Lang : crypt32: Fix a leak during chain creation.
by Alexandre Julliard 02 Nov '07

02 Nov '07

Module: wine Branch: master Commit: fc14728efcc631838956ddb9c4e5014065eccc91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc14728efcc631838956ddb9c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 1 09:30:26 2007 -0700 crypt32: Fix a leak during chain creation. --- dlls/crypt32/chain.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 068e039..53588f8 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -913,6 +913,10 @@ static BOOL CRYPT_BuildSimpleChain(PCertificateChainEngine engine, if (issuer) { ret = CRYPT_AddCertToSimpleChain(engine, chain, issuer, infoStatus); + /* CRYPT_AddCertToSimpleChain add-ref's the issuer, so free it to + * close the enumeration that found it + */ + CertFreeCertificateContext(issuer); cert = issuer; } else

1 0

Gerald Pfeifer : oleaut32: Use -0.0 directly in test_VarBstrFromR4().
by Alexandre Julliard 02 Nov '07

02 Nov '07

Module: wine Branch: master Commit: 16f021a22e162ddd3f044e70bce435e491666783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16f021a22e162ddd3f044e70b… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Nov 1 15:02:08 2007 +0100 oleaut32: Use -0.0 directly in test_VarBstrFromR4(). --- dlls/oleaut32/tests/vartype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 4558d82..b0335aa 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4747,7 +4747,7 @@ static void test_VarBstrFromR4(void) } } - f = -1e-400; /* deliberately cause underflow */ + f = -0.0; hres = pVarBstrFromR4(f, lcid, 0, &bstr); ok(hres == S_OK, "got hres 0x%08x\n", hres); if (bstr)

1 0

Gerald Pfeifer : shell32: Remove useless comparison >= 0 for unsigned variables.
by Alexandre Julliard 02 Nov '07

02 Nov '07

Module: wine Branch: master Commit: ff307d96c1cadefb62857ffdb400abee186a424d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff307d96c1cadefb62857ffdb… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Nov 1 15:30:55 2007 +0100 shell32: Remove useless comparison >= 0 for unsigned variables. --- dlls/shell32/tests/shelllink.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 091522b..7983aa0 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -527,7 +527,7 @@ static void test_load_save(void) check_lnk(lnkfile, &desc, 0x0); r=GetModuleFileName(NULL, mypath, sizeof(mypath)); - ok(r>=0 && r<sizeof(mypath), "GetModuleFileName failed (%d)\n", r); + ok(r<sizeof(mypath), "GetModuleFileName failed (%d)\n", r); strcpy(mydir, mypath); p=strrchr(mydir, '\\'); if (p) @@ -564,9 +564,9 @@ static void test_load_save(void) /* Create a temporary non-executable file */ r=GetTempPath(sizeof(mypath), mypath); - ok(r>=0 && r<sizeof(mypath), "GetTempPath failed (%d), err %d\n", r, GetLastError()); + ok(r<sizeof(mypath), "GetTempPath failed (%d), err %d\n", r, GetLastError()); r=pGetLongPathNameA(mypath, mydir, sizeof(mydir)); - ok(r>=0 && r<sizeof(mydir), "GetLongPathName failed (%d), err %d\n", r, GetLastError()); + ok(r<sizeof(mydir), "GetLongPathName failed (%d), err %d\n", r, GetLastError()); p=strrchr(mydir, '\\'); if (p) *p='\0';

1 0

Gerald Pfeifer : comctl32: Make parameters of expect_band_content() match the corresponding types of REBARBANDINFO and fix one format string.
by Alexandre Julliard 02 Nov '07

02 Nov '07

Module: wine Branch: master Commit: aac8194c74f31883d77ef995a527e01eaf3165bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=aac8194c74f31883d77ef995a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Nov 1 15:52:21 2007 +0100 comctl32: Make parameters of expect_band_content() match the corresponding types of REBARBANDINFO and fix one format string. --- dlls/comctl32/tests/rebar.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 3d8bd70..79da16e 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -693,11 +693,11 @@ static void resize_test(void) } } -static void expect_band_content(UINT uBand, UINT fStyle, COLORREF clrFore, +static void expect_band_content(UINT uBand, INT fStyle, COLORREF clrFore, COLORREF clrBack, LPCSTR lpText, int iImage, HWND hwndChild, - UINT cxMinChild, UINT cyMinChild, UINT cx, HBITMAP hbmBack, UINT wID, - UINT cyChild, UINT cyMaxChild, UINT cyIntegral, UINT cxIdeal, LPARAM lParam, - UINT cxHeader) + INT cxMinChild, INT cyMinChild, INT cx, HBITMAP hbmBack, INT wID, + INT cyChild, INT cyMaxChild, INT cyIntegral, INT cxIdeal, LPARAM lParam, + INT cxHeader) { CHAR buf[MAX_PATH] = "abc"; REBARBANDINFO rb; @@ -712,7 +712,7 @@ static void expect_band_content(UINT uBand, UINT fStyle, COLORREF clrFore, ok(SendMessageA(hRebar, RB_GETBANDINFOA, uBand, (LPARAM)&rb), "RB_GETBANDINFO failed\n"); expect_eq(rb.fStyle, fStyle, int, "%x"); todo_wine expect_eq(rb.clrFore, clrFore, COLORREF, "%x"); - todo_wine expect_eq(rb.clrBack, clrBack, int, "%x"); + todo_wine expect_eq(rb.clrBack, clrBack, unsigned, "%x"); expect_eq(strcmp(rb.lpText, lpText), 0, int, "%d"); expect_eq(rb.iImage, iImage, int, "%x"); expect_eq(rb.hwndChild, hwndChild, HWND, "%p");

1 0

Juan Lang : crypt32: Fix a leak in the tests.
by Alexandre Julliard 02 Nov '07

02 Nov '07

Module: wine Branch: master Commit: 9429504c70f9b5bfbe88270575d30f0428303054 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9429504c70f9b5bfbe8827057… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 1 07:33:56 2007 -0700 crypt32: Fix a leak in the tests. --- dlls/crypt32/tests/cert.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 14549eb..8e4bc5d 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2786,6 +2786,7 @@ static void testAcquireCertPrivateKey(void) &keyContext, &size); ok(ret, "CertGetCertificateContextProperty failed: %08x\n", GetLastError()); + CryptReleaseContext(certCSP, 0); CryptDestroyKey(key); }

1 0

Juan Lang : crypt32: Fix another leak in the tests.
by Alexandre Julliard 02 Nov '07

02 Nov '07

Module: wine Branch: master Commit: 373e9f626ae79ee4cb6c2013a58198b8941eddbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=373e9f626ae79ee4cb6c2013a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 1 07:42:12 2007 -0700 crypt32: Fix another leak in the tests. --- dlls/crypt32/tests/chain.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 9d6950d..0257c3e 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1833,6 +1833,7 @@ static void testVerifyCertChainPolicy(void) "Expected both indexes 0, got %d, %d\n", policyStatus.lChainIndex, policyStatus.lElementIndex); CertFreeCertificateChain(chain); + CertFreeCertificateContext(cert); for (i = 0; i < sizeof(basePolicyCheck) / sizeof(basePolicyCheck[0]); i++)

1 0

Alexandre Julliard : server: Support using a name to destroy a window class too.
by Alexandre Julliard 02 Nov '07

02 Nov '07

Module: wine Branch: master Commit: b9b940fab97e0afe906f37936b5cafe2f8b7b92d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9b940fab97e0afe906f37936… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 1 15:28:30 2007 +0100 server: Support using a name to destroy a window class too. --- dlls/user32/class.c | 23 ++++++++++++----------- include/wine/server_protocol.h | 3 ++- server/class.c | 8 ++++++-- server/protocol.def | 1 + server/trace.c | 4 +++- 5 files changed, 24 insertions(+), 15 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 5d97823..dec82b5 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -573,8 +573,15 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) */ BOOL WINAPI UnregisterClassA( LPCSTR className, HINSTANCE hInstance ) { - ATOM atom = HIWORD(className) ? GlobalFindAtomA( className ) : LOWORD(className); - return UnregisterClassW( (LPCWSTR)MAKEINTATOM(atom), hInstance ); + if (!IS_INTRESOURCE(className)) + { + WCHAR name[MAX_ATOM_LEN + 1]; + + if (!MultiByteToWideChar( CP_ACP, 0, className, -1, name, MAX_ATOM_LEN + 1 )) + return FALSE; + return UnregisterClassW( name, hInstance ); + } + return UnregisterClassW( (LPCWSTR)className, hInstance ); } /*********************************************************************** @@ -583,20 +590,14 @@ BOOL WINAPI UnregisterClassA( LPCSTR className, HINSTANCE hInstance ) BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance ) { CLASS *classPtr = NULL; - ATOM atom = HIWORD(className) ? GlobalFindAtomW( className ) : LOWORD(className); - - TRACE("%s %p %x\n",debugstr_w(className), hInstance, atom); - if (!atom) - { - SetLastError( ERROR_CLASS_DOES_NOT_EXIST ); - return FALSE; - } + TRACE("%s %p\n",debugstr_w(className), hInstance); SERVER_START_REQ( destroy_class ) { - req->atom = atom; req->instance = hInstance; + if (IS_INTRESOURCE(className)) req->atom = LOWORD(className); + else wine_server_add_data( req, className, strlenW(className)*sizeof(WCHAR) ); if (!wine_server_call_err( req )) classPtr = reply->client_ptr; } SERVER_END_REQ; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index da3c45b..8d1485e 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3609,6 +3609,7 @@ struct destroy_class_request struct request_header __header; atom_t atom; void* instance; + /* VARARG(name,unicode_str); */ }; struct destroy_class_reply { @@ -4882,6 +4883,6 @@ union generic_reply struct set_completion_info_reply set_completion_info_reply; }; -#define SERVER_PROTOCOL_VERSION 325 +#define SERVER_PROTOCOL_VERSION 326 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/class.c b/server/class.c index ff39dc0..334542e 100644 --- a/server/class.c +++ b/server/class.c @@ -186,9 +186,13 @@ DECL_HANDLER(create_class) /* destroy a window class */ DECL_HANDLER(destroy_class) { - struct window_class *class = find_class( current->process, req->atom, req->instance ); + struct window_class *class; + atom_t atom = req->atom; + + if (get_req_data_size()) + atom = find_global_atom( NULL, get_req_data(), get_req_data_size() / sizeof(WCHAR) ); - if (!class) + if (!(class = find_class( current->process, atom, req->instance ))) set_win32_error( ERROR_CLASS_DOES_NOT_EXIST ); else if (class->count) set_win32_error( ERROR_CLASS_HAS_WINDOWS ); diff --git a/server/protocol.def b/server/protocol.def index aa06bd5..f2e33ef 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2610,6 +2610,7 @@ enum message_type @REQ(destroy_class) atom_t atom; /* class atom */ void* instance; /* module instance */ + VARARG(name,unicode_str); /* class name */ @REPLY void* client_ptr; /* pointer to class in client address space */ @END diff --git a/server/trace.c b/server/trace.c index 3d5a3c5..a6d3ee5 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3205,7 +3205,9 @@ static void dump_create_class_reply( const struct create_class_reply *req ) static void dump_destroy_class_request( const struct destroy_class_request *req ) { fprintf( stderr, " atom=%04x,", req->atom ); - fprintf( stderr, " instance=%p", req->instance ); + fprintf( stderr, " instance=%p,", req->instance ); + fprintf( stderr, " name=" ); + dump_varargs_unicode_str( cur_size ); } static void dump_destroy_class_reply( const struct destroy_class_reply *req )

1 0

Alexandre Julliard : user32: Properly handle integer atoms specified as strings in class names.
by Alexandre Julliard 02 Nov '07

02 Nov '07

Module: wine Branch: master Commit: 1ee62a8d7240b6b738f989c1c370ece7a9a882e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ee62a8d7240b6b738f989c1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 2 11:42:53 2007 +0100 user32: Properly handle integer atoms specified as strings in class names. --- dlls/user32/class.c | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index dec82b5..e3a2951 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -97,6 +97,25 @@ static inline void release_class_ptr( CLASS *ptr ) /*********************************************************************** + * get_int_atom_value + */ +static ATOM get_int_atom_value( LPCWSTR name ) +{ + UINT ret = 0; + + if (IS_INTRESOURCE(name)) return LOWORD(name); + if (*name++ != '#') return 0; + while (*name) + { + if (*name < '0' || *name > '9') return 0; + ret = ret * 10 + *name++ - '0'; + if (ret > 0xffff) return 0; + } + return ret; +} + + +/*********************************************************************** * set_server_info * * Set class info with the wine server. @@ -328,8 +347,8 @@ static CLASS *CLASS_RegisterClass( LPCWSTR name, HINSTANCE hInstance, BOOL local req->extra = classExtra; req->win_extra = winExtra; req->client_ptr = classPtr; - if (IS_INTRESOURCE(name)) req->atom = LOWORD(name); - else wine_server_add_data( req, name, strlenW(name) * sizeof(WCHAR) ); + if (!(req->atom = get_int_atom_value(name)) && name) + wine_server_add_data( req, name, strlenW(name) * sizeof(WCHAR) ); ret = !wine_server_call_err( req ); classPtr->atomName = reply->atom; } @@ -596,8 +615,8 @@ BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance ) SERVER_START_REQ( destroy_class ) { req->instance = hInstance; - if (IS_INTRESOURCE(className)) req->atom = LOWORD(className); - else wine_server_add_data( req, className, strlenW(className)*sizeof(WCHAR) ); + if (!(req->atom = get_int_atom_value(className)) && className) + wine_server_add_data( req, className, strlenW(className) * sizeof(WCHAR) ); if (!wine_server_call_err( req )) classPtr = reply->client_ptr; } SERVER_END_REQ;

1 0