October 2013 - Wine-Commits

Michael Stefaniuc : twain_32/tests: Compile with -D__WINESRC__.
by Alexandre Julliard Oct. 18, 2013

Oct. 18, 2013

Module: wine Branch: master Commit: f67893bd8267f3ee0345d1a9e828714f1e9955b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f67893bd8267f3ee0345d1a9e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 17 23:12:58 2013 +0200 twain_32/tests: Compile with -D__WINESRC__. --- dlls/twain_32/tests/Makefile.in | 1 - dlls/twain_32/tests/dsm.c | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/twain_32/tests/Makefile.in b/dlls/twain_32/tests/Makefile.in index 4a1727f..060b20e 100644 --- a/dlls/twain_32/tests/Makefile.in +++ b/dlls/twain_32/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = twain_32.dll IMPORTS = user32 gdi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ dsm.c diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index 96381e6..b8f1c9e 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -36,12 +36,12 @@ static BOOL dsm_RegisterWindowClasses(void) BOOL rc; cls.style = 0; - cls.lpfnWndProc = DefWindowProc; + cls.lpfnWndProc = DefWindowProcA; cls.cbClsExtra = 0; cls.cbWndExtra = 0; cls.hInstance = GetModuleHandleA(0); cls.hIcon = 0; - cls.hCursor = LoadCursorA(0, IDC_ARROW); + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "TWAIN_dsm_class"; @@ -861,9 +861,8 @@ START_TEST(dsm) appid.ProtocolMinor = TWON_PROTOCOLMINOR; appid.SupportedGroups = DG_CONTROL | DG_IMAGE; - hwnd = CreateWindow("TWAIN_dsm_class", "Twain Test", 0, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - NULL, NULL, GetModuleHandleA(0), NULL); + hwnd = CreateWindowA("TWAIN_dsm_class", "Twain Test", 0, CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, GetModuleHandleA(NULL), NULL); rc = pDSM_Entry(&appid, NULL, DG_CONTROL, DAT_PARENT, MSG_OPENDSM, (TW_MEMREF) &hwnd); ok(rc == TWRC_SUCCESS, "MSG_OPENDSM returned %d\n", rc);

1 0

Nikolay Sivov : rsaenh: Fail on unsupported flag values only in CryptHashData().
by Alexandre Julliard Oct. 18, 2013

Oct. 18, 2013

Module: wine Branch: master Commit: bfd2c533beef454a61b24f92790f91099e607365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfd2c533beef454a61b24f927… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 17 22:36:36 2013 +0400 rsaenh: Fail on unsupported flag values only in CryptHashData(). --- dlls/rsaenh/rsaenh.c | 2 +- dlls/rsaenh/tests/rsaenh.c | 12 +++++++++--- include/wincrypt.h | 2 ++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 7d4cdb9..b5ab7a9 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -4114,7 +4114,7 @@ BOOL WINAPI RSAENH_CPHashData(HCRYPTPROV hProv, HCRYPTHASH hHash, const BYTE *pb TRACE("(hProv=%08lx, hHash=%08lx, pbData=%p, dwDataLen=%d, dwFlags=%08x)\n", hProv, hHash, pbData, dwDataLen, dwFlags); - if (dwFlags) + if (dwFlags & ~CRYPT_USERDATA) { SetLastError(NTE_BAD_FLAGS); return FALSE; diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index f43a4e4..84505f8 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -446,7 +446,10 @@ static void test_hashes(void) result = CryptCreateHash(hProv, CALG_MD4, 0, 0, &hHash); ok(result, "%08x\n", GetLastError()); - result = CryptHashData(hHash, pbData, sizeof(pbData), 0); + result = CryptHashData(hHash, pbData, sizeof(pbData), ~0); + ok(!result && GetLastError() == NTE_BAD_FLAGS, "%08x\n", GetLastError()); + + result = CryptHashData(hHash, pbData, sizeof(pbData), CRYPT_USERDATA); ok(result, "%08x\n", GetLastError()); len = sizeof(DWORD); @@ -470,7 +473,10 @@ static void test_hashes(void) result = CryptGetHashParam(hHash, HP_HASHSIZE, (BYTE*)&hashlen, &len, 0); ok(result && (hashlen == 16), "%08x, hashlen: %d\n", GetLastError(), hashlen); - result = CryptHashData(hHash, pbData, sizeof(pbData), 0); + result = CryptHashData(hHash, pbData, sizeof(pbData), ~0); + ok(!result && GetLastError() == NTE_BAD_FLAGS, "%08x\n", GetLastError()); + + result = CryptHashData(hHash, pbData, sizeof(pbData), CRYPT_USERDATA); ok(result, "%08x\n", GetLastError()); len = 16; @@ -519,7 +525,7 @@ static void test_hashes(void) result = CryptCreateHash(hProv, CALG_SHA, 0, 0, &hHash); ok(result, "%08x\n", GetLastError()); - result = CryptHashData(hHash, pbData, 5, 0); + result = CryptHashData(hHash, pbData, 5, CRYPT_USERDATA); ok(result, "%08x\n", GetLastError()); if(pCryptDuplicateHash) { diff --git a/include/wincrypt.h b/include/wincrypt.h index 64c932c..324007d 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3890,6 +3890,8 @@ typedef BOOL (WINAPI *PFN_CMSG_IMPORT_KEY_TRANS)( #define EXPORT_PRIVATE_KEYS 0x00000004 #define PKCS12_EXPORT_RESERVED_MASK 0xffff0000 +#define CRYPT_USERDATA 0x00000001 + /* function declarations */ /* advapi32.dll */ WINADVAPI BOOL WINAPI CryptAcquireContextA(HCRYPTPROV *, LPCSTR, LPCSTR, DWORD, DWORD);

1 0

Ken Thomases : winemac: Treat mouse moves in a window title bar as outside the window.
by Alexandre Julliard Oct. 18, 2013

Oct. 18, 2013

Module: wine Branch: master Commit: 8747df094d7470afac80a43c7e63adfc595b4252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8747df094d7470afac80a43c7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 17 23:44:43 2013 -0500 winemac: Treat mouse moves in a window title bar as outside the window. Don't queue mouse-moved events. Reset the cursor. --- dlls/winemac.drv/cocoa_app.m | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 6e74327..92e16ff 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1352,6 +1352,8 @@ int macdrv_err_on; windowUnderNumber = [NSWindow windowNumberAtPoint:point belowWindowWithWindowNumber:0]; targetWindow = (WineWindow*)[NSApp windowWithWindowNumber:windowUnderNumber]; + if (!NSMouseInRect(point, [targetWindow contentRectForFrameRect:[targetWindow frame]], NO)) + targetWindow = nil; } if ([targetWindow isKindOfClass:[WineWindow class]])

1 0

Ken Thomases : winemac: Don' t coalesce events which might be in multiple queues.
by Alexandre Julliard Oct. 18, 2013

Oct. 18, 2013

Module: wine Branch: master Commit: 9deb00bfdcb827510dc99fa640b2fefef066733e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9deb00bfdcb827510dc99fa64… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 17 23:43:31 2013 -0500 winemac: Don't coalesce events which might be in multiple queues. --- dlls/winemac.drv/cocoa_event.m | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index ff9ac6c..faeb033 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -177,9 +177,11 @@ static const OSType WineHotKeySignature = 'Wine'; if ((event->event->type == MOUSE_MOVED || event->event->type == MOUSE_MOVED_ABSOLUTE) && + event->event->deliver == INT_MAX && (lastEvent = [events lastObject]) && (lastEvent->event->type == MOUSE_MOVED || lastEvent->event->type == MOUSE_MOVED_ABSOLUTE) && + lastEvent->event->deliver == INT_MAX && lastEvent->event->window == event->event->window && lastEvent->event->mouse_moved.drag == event->event->mouse_moved.drag) {

1 0

Michael Stefaniuc : wintrust/tests: Compile with -D__WINESRC__.
by Alexandre Julliard Oct. 18, 2013

Oct. 18, 2013

Module: wine Branch: master Commit: 640dd17acfe10d41aa55423ec520163e55545613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=640dd17acfe10d41aa55423ec… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 17 23:10:47 2013 +0200 wintrust/tests: Compile with -D__WINESRC__. --- dlls/wintrust/tests/Makefile.in | 1 - dlls/wintrust/tests/crypt.c | 15 ++++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wintrust/tests/Makefile.in b/dlls/wintrust/tests/Makefile.in index 3a875b2..b40817c 100644 --- a/dlls/wintrust/tests/Makefile.in +++ b/dlls/wintrust/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = wintrust.dll IMPORTS = wintrust crypt32 advapi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ asn.c \ diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 8534ce1..cb5818e 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -23,6 +23,7 @@ #include <stdio.h> #include "windows.h" +#include "wincrypt.h" #include "mscat.h" #include "wine/test.h" @@ -251,23 +252,23 @@ static void test_context(void) } ok(hca != NULL, "Expected a context handle, got NULL\n"); - attrs = GetFileAttributes(catroot); + attrs = GetFileAttributesA(catroot); ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected the CatRoot directory to exist\n"); /* Windows creates the GUID directory in capitals */ lstrcpyA(dummydir, catroot); lstrcatA(dummydir, "\\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF}"); - attrs = GetFileAttributes(dummydir); + attrs = GetFileAttributesA(dummydir); ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected CatRoot\\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF} directory to exist\n"); /* Only present on XP or higher. */ - attrs = GetFileAttributes(catroot2); + attrs = GetFileAttributesA(catroot2); if (attrs != INVALID_FILE_ATTRIBUTES) { lstrcpyA(dummydir, catroot2); lstrcatA(dummydir, "\\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF}"); - attrs = GetFileAttributes(dummydir); + attrs = GetFileAttributesA(dummydir); ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected CatRoot2\\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF} directory to exist\n"); } @@ -589,7 +590,7 @@ static void test_CryptCATAdminAddRemoveCatalog(void) lstrcpyA(catfilepath, catroot); lstrcatA(catfilepath, "\\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF}\\winetest.cat"); - attrs = GetFileAttributes(catfilepath); + attrs = GetFileAttributesA(catfilepath); ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected %s to exist\n", catfilepath); todo_wine ok(attrs == FILE_ATTRIBUTE_SYSTEM || @@ -617,12 +618,12 @@ static void test_CryptCATAdminAddRemoveCatalog(void) ret = pCryptCATAdminRemoveCatalog(hcatadmin, info.wszCatalogFile, 0); ok(ret, "CryptCATAdminRemoveCatalog failed %u\n", GetLastError()); /* The call succeeded with the full path but the file is not removed */ - attrs = GetFileAttributes(catfilepath); + attrs = GetFileAttributesA(catfilepath); ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected %s to exist\n", catfilepath); /* Given only the filename the file is removed */ ret = pCryptCATAdminRemoveCatalog(hcatadmin, basenameW, 0); ok(ret, "CryptCATAdminRemoveCatalog failed %u\n", GetLastError()); - attrs = GetFileAttributes(catfilepath); + attrs = GetFileAttributesA(catfilepath); ok(attrs == INVALID_FILE_ATTRIBUTES, "Expected %s to be removed\n", catfilepath); cleanup:

1 0

Michael Stefaniuc : crypt32/tests: Compile with -D__WINESRC__.
by Alexandre Julliard Oct. 18, 2013

Oct. 18, 2013

Module: wine Branch: master Commit: df62b94c258055d532036f4dea9e7bec98418b4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=df62b94c258055d532036f4de… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 17 22:58:35 2013 +0200 crypt32/tests: Compile with -D__WINESRC__. --- dlls/crypt32/tests/Makefile.in | 1 - dlls/crypt32/tests/encode.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/Makefile.in b/dlls/crypt32/tests/Makefile.in index 8fdc7ab..1b8842b 100644 --- a/dlls/crypt32/tests/Makefile.in +++ b/dlls/crypt32/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = crypt32.dll IMPORTS = crypt32 advapi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ base64.c \ diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 5d9e76b..5d1b10d 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -8054,9 +8054,9 @@ static void testPortPublicKeyInfo(void) PCERT_PUBLIC_KEY_INFO info = NULL; /* Just in case a previous run failed, delete this thing */ - CryptAcquireContextA(&csp, cspName, MS_DEF_PROV, PROV_RSA_FULL, + CryptAcquireContextA(&csp, cspName, MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_DELETEKEYSET); - ret = CryptAcquireContextA(&csp, cspName, MS_DEF_PROV, PROV_RSA_FULL, + ret = CryptAcquireContextA(&csp, cspName, MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_NEWKEYSET); ok(ret,"CryptAcquireContextA failed\n"); @@ -8065,7 +8065,7 @@ static void testPortPublicKeyInfo(void) HeapFree(GetProcessHeap(), 0, info); CryptReleaseContext(csp, 0); - ret = CryptAcquireContextA(&csp, cspName, MS_DEF_PROV, PROV_RSA_FULL, + ret = CryptAcquireContextA(&csp, cspName, MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_DELETEKEYSET); ok(ret,"CryptAcquireContextA failed\n"); }

1 0

Jacek Caban : crypt32: Keep reference to store in contexts.
by Alexandre Julliard Oct. 18, 2013

Oct. 18, 2013

Module: wine Branch: master Commit: 9fb1e4d675043bd078552a7c0de8eec317473cd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fb1e4d675043bd078552a7c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 10:50:43 2013 +0200 crypt32: Keep reference to store in contexts. --- dlls/crypt32/cert.c | 12 ++--- dlls/crypt32/collectionstore.c | 22 +++++----- dlls/crypt32/context.c | 68 ++++++++++++++++++++---------- dlls/crypt32/crl.c | 4 +- dlls/crypt32/crypt32_private.h | 11 ++--- dlls/crypt32/ctl.c | 4 +- dlls/crypt32/provstore.c | 11 +++++ dlls/crypt32/store.c | 30 ++++++++++---- dlls/crypt32/tests/store.c | 88 ++++++++++++++++++++++++++++++++++++++++ 9 files changed, 190 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9fb1e4d675043bd078552…

1 0

Michael Stefaniuc : dssenh/tests: Compile with -D__WINESRC__.
by Alexandre Julliard Oct. 18, 2013

Oct. 18, 2013

Module: wine Branch: master Commit: f561f8a2be17d09834771f07b4dd957a459fc198 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f561f8a2be17d09834771f07b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 17 23:13:57 2013 +0200 dssenh/tests: Compile with -D__WINESRC__. --- dlls/dssenh/tests/Makefile.in | 1 - dlls/dssenh/tests/dssenh.c | 60 ++++++++++++++++++++-------------------- 2 files changed, 30 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f561f8a2be17d09834771…

1 0

Jacek Caban : crypt32: Always return TRUE from CertFreeCertificateContext.
by Alexandre Julliard Oct. 18, 2013

Oct. 18, 2013

Module: wine Branch: master Commit: f329de4df44d028d544e6d758a9f4a49066ccbb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f329de4df44d028d544e6d758… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 10:50:03 2013 +0200 crypt32: Always return TRUE from CertFreeCertificateContext. --- dlls/crypt32/cert.c | 6 ++---- dlls/crypt32/tests/cert.c | 9 +++++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 2b60041..2a68544 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -370,13 +370,11 @@ PCCERT_CONTEXT WINAPI CertDuplicateCertificateContext(PCCERT_CONTEXT pCertContex BOOL WINAPI CertFreeCertificateContext(PCCERT_CONTEXT pCertContext) { - BOOL ret = TRUE; - TRACE("(%p)\n", pCertContext); if (pCertContext) - ret = Context_Release(&cert_from_ptr(pCertContext)->base); - return ret; + Context_Release(&cert_from_ptr(pCertContext)->base); + return TRUE; } DWORD WINAPI CertEnumCertificateContextProperties(PCCERT_CONTEXT pCertContext, diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index a96a75f..a117332 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -725,7 +725,8 @@ static void testDupCert(void) dupContext = CertDuplicateCertificateContext(context); ok(dupContext == context, "context != dupContext\n"); - CertFreeCertificateContext(dupContext); + ret = CertFreeCertificateContext(dupContext); + ok(ret, "CertFreeCertificateContext failed\n"); store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); ok(store != NULL, "CertOpenStore failed: %d\n", GetLastError()); @@ -760,7 +761,8 @@ static void testDupCert(void) ok(context2->hCertStore == context->hCertStore, "Unexpected hCertStore\n"); CertFreeCertificateContext(context2); - CertFreeCertificateContext(context); + ret = CertFreeCertificateContext(context); + ok(ret, "CertFreeCertificateContext failed\n"); CertCloseStore(store, 0); CertCloseStore(store2, 0); @@ -768,6 +770,9 @@ static void testDupCert(void) SetLastError(0xdeadbeef); context = CertDuplicateCertificateContext(NULL); ok(context == NULL, "Expected context to be NULL\n"); + + ret = CertFreeCertificateContext(NULL); + ok(ret, "CertFreeCertificateContext failed\n"); } static void testLinkCert(void)

1 0

Dmitry Timoshkov : kernel32/tests: Fix PE loader tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

Module: wine Branch: master Commit: ddb66321553e41baafb39e8b93fd1059de7297b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddb66321553e41baafb39e8b9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 17 11:45:23 2013 +0900 kernel32/tests: Fix PE loader tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/loader.c | 127 +++++++++++++++++++++--------------------- 1 files changed, 64 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ddb66321553e41baafb39…

1 0