wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

Ken Thomases : winemac: Restore app cursor settings when cursor moves back into an app window.
by Alexandre Julliard 18 Oct '13

18 Oct '13

Module: wine Branch: master Commit: 1c049e5031ff6ca3dc2ee874493aa6e685e8e9c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c049e5031ff6ca3dc2ee8744… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 17 23:45:52 2013 -0500 winemac: Restore app cursor settings when cursor moves back into an app window. The code had previously set the cursor back to the standard arrow and unhid it when it left all app windows. Now it restores the cursor image that the app set and re-hides it if necessary when it moves back over any app window. --- dlls/winemac.drv/cocoa_app.h | 3 ++ dlls/winemac.drv/cocoa_app.m | 80 ++++++++++++++++++++++++++++++++--------- 2 files changed, 65 insertions(+), 18 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index a398bf1..07a4bc8 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -73,7 +73,10 @@ enum { NSArray* cursorFrames; int cursorFrame; NSTimer* cursorTimer; + NSCursor* cursor; + BOOL cursorIsCurrent; BOOL cursorHidden; + BOOL clientWantsCursorHidden; BOOL clippingCursor; CGRect cursorClipRect; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 92e16ff..e888a50 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -80,6 +80,7 @@ int macdrv_err_on; @property (readwrite, copy, nonatomic) NSEvent* lastFlagsChanged; @property (copy, nonatomic) NSArray* cursorFrames; @property (retain, nonatomic) NSTimer* cursorTimer; +@property (retain, nonatomic) NSCursor* cursor; @property (retain, nonatomic) NSImage* applicationIcon; @property (readonly, nonatomic) BOOL inputSourceIsInputMethod; @property (retain, nonatomic) WineWindow* mouseCaptureWindow; @@ -96,7 +97,7 @@ int macdrv_err_on; @synthesize keyboardType, lastFlagsChanged; @synthesize applicationIcon; - @synthesize cursorFrames, cursorTimer; + @synthesize cursorFrames, cursorTimer, cursor; @synthesize mouseCaptureWindow; + (void) initialize @@ -172,6 +173,7 @@ int macdrv_err_on; - (void) dealloc { + [cursor release]; [screenFrameCGRects release]; [applicationIcon release]; [warpRecords release]; @@ -785,21 +787,69 @@ int macdrv_err_on; return ([originalDisplayModes count] > 0 || displaysCapturedForFullscreen); } + - (void) updateCursor + { + if (lastTargetWindow) + { + if (clientWantsCursorHidden && !cursorHidden) + { + [NSCursor hide]; + cursorHidden = TRUE; + } + + if (!cursorIsCurrent) + { + [cursor set]; + cursorIsCurrent = TRUE; + } + + if (!clientWantsCursorHidden && cursorHidden) + { + [NSCursor unhide]; + cursorHidden = FALSE; + } + } + else + { + if (cursorIsCurrent) + { + [[NSCursor arrowCursor] set]; + cursorIsCurrent = FALSE; + } + if (cursorHidden) + { + [NSCursor unhide]; + cursorHidden = FALSE; + } + } + } + - (void) hideCursor { - if (!cursorHidden) + if (!clientWantsCursorHidden) { - [NSCursor hide]; - cursorHidden = TRUE; + clientWantsCursorHidden = TRUE; + [self updateCursor]; } } - (void) unhideCursor { - if (cursorHidden) + if (clientWantsCursorHidden) { - [NSCursor unhide]; - cursorHidden = FALSE; + clientWantsCursorHidden = FALSE; + [self updateCursor]; + } + } + + - (void) setCursor:(NSCursor*)newCursor + { + if (newCursor != cursor) + { + [cursor release]; + cursor = [newCursor retain]; + cursorIsCurrent = FALSE; + [self updateCursor]; } } @@ -810,15 +860,12 @@ int macdrv_err_on; NSImage* image = [[NSImage alloc] initWithCGImage:cgimage size:NSZeroSize]; CFDictionaryRef hotSpotDict = (CFDictionaryRef)[frame objectForKey:@"hotSpot"]; CGPoint hotSpot; - NSCursor* cursor; if (!CGPointMakeWithDictionaryRepresentation(hotSpotDict, &hotSpot)) hotSpot = CGPointZero; - cursor = [[NSCursor alloc] initWithImage:image hotSpot:NSPointFromCGPoint(hotSpot)]; + self.cursor = [[[NSCursor alloc] initWithImage:image hotSpot:NSPointFromCGPoint(hotSpot)] autorelease]; [image release]; - [cursor set]; [self unhideCursor]; - [cursor release]; } - (void) nextCursorFrame:(NSTimer*)theTimer @@ -1466,12 +1513,10 @@ int macdrv_err_on; lastTargetWindow = targetWindow; } - else if (lastTargetWindow) - { - [[NSCursor arrowCursor] set]; - [self unhideCursor]; + else lastTargetWindow = nil; - } + + [self updateCursor]; } - (void) handleMouseButton:(NSEvent*)theEvent @@ -2247,9 +2292,8 @@ void macdrv_set_cursor(CFStringRef name, CFArrayRef frames) { OnMainThreadAsync(^{ WineApplicationController* controller = [WineApplicationController sharedController]; - NSCursor* cursor = [NSCursor performSelector:sel]; [controller setCursorWithFrames:nil]; - [cursor set]; + controller.cursor = [NSCursor performSelector:sel]; [controller unhideCursor]; }); }

1 0

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

18 Oct '13

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: Clean up fully-delivered events in queues which aren't being drained.
by Alexandre Julliard 18 Oct '13

18 Oct '13

Module: wine Branch: master Commit: 761092a2fec5dea6dcbceff5d8dd022f8b1925d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=761092a2fec5dea6dcbceff5d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 17 23:43:49 2013 -0500 winemac: Clean up fully-delivered events in queues which aren't being drained. Some events get queued for all GUI-connected threads but are only processed by the first to dequeue them. Other threads which tend their event queue discard such already-processed events. However, some threads may be connected to the GUI but never tend their event queue. To prevent such threads from accumulating zombie events, the zombies are cleared each time a new event is queued. --- dlls/winemac.drv/cocoa_event.m | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index faeb033..3b35576 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -171,10 +171,16 @@ static const OSType WineHotKeySignature = 'Wine'; - (void) postEventObject:(MacDrvEvent*)event { + NSIndexSet* indexes; MacDrvEvent* lastEvent; [eventsLock lock]; + indexes = [events indexesOfObjectsPassingTest:^BOOL(id obj, NSUInteger idx, BOOL *stop){ + return ((MacDrvEvent*)obj)->event->deliver <= 0; + }]; + [events removeObjectsAtIndexes:indexes]; + if ((event->event->type == MOUSE_MOVED || event->event->type == MOUSE_MOVED_ABSOLUTE) && event->event->deliver == INT_MAX &&

1 0

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

18 Oct '13

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 : dssenh/tests: Compile with -D__WINESRC__.
by Alexandre Julliard 18 Oct '13

18 Oct '13

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

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

18 Oct '13

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

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

18 Oct '13

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 18 Oct '13

18 Oct '13

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

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

18 Oct '13

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

Nikolay Sivov : msxml3: Set referrer header to container url.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: 13aac41b062642732ee912b9078e2b1060c54bed URL: http://source.winehq.org/git/wine.git/?a=commit;h=13aac41b062642732ee912b90… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 17 12:12:31 2013 +0400 msxml3: Set referrer header to container url. --- dlls/msxml3/httprequest.c | 25 ++++++++++++++++++- dlls/msxml3/tests/httpreq.c | 56 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 74 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index e2ede0e..c90cc51 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -458,9 +458,11 @@ static HRESULT WINAPI BSCHttpNegotiate_BeginningTransaction(IHttpNegotiate *ifac { static const WCHAR content_type_utf8W[] = {'C','o','n','t','e','n','t','-','T','y','p','e',':',' ', 't','e','x','t','/','p','l','a','i','n',';','c','h','a','r','s','e','t','=','u','t','f','-','8','\r','\n',0}; + static const WCHAR refererW[] = {'R','e','f','e','r','e','r',':',' ',0}; BindStatusCallback *This = impl_from_IHttpNegotiate(iface); const struct httpheader *entry; + BSTR base_uri = NULL; WCHAR *buff, *ptr; int size = 0; @@ -476,8 +478,18 @@ static HRESULT WINAPI BSCHttpNegotiate_BeginningTransaction(IHttpNegotiate *ifac if (!size) return S_OK; + if (This->request->base_uri) + { + IUri_GetRawUri(This->request->base_uri, &base_uri); + size += SysStringLen(base_uri)*sizeof(WCHAR) + sizeof(refererW) + sizeof(crlfW); + } + buff = CoTaskMemAlloc(size); - if (!buff) return E_OUTOFMEMORY; + if (!buff) + { + SysFreeString(base_uri); + return E_OUTOFMEMORY; + } ptr = buff; if (This->request->use_utf8_content) @@ -486,6 +498,15 @@ static HRESULT WINAPI BSCHttpNegotiate_BeginningTransaction(IHttpNegotiate *ifac ptr += sizeof(content_type_utf8W)/sizeof(WCHAR)-1; } + if (base_uri) + { + strcpyW(ptr, refererW); + strcatW(ptr, base_uri); + strcatW(ptr, crlfW); + ptr += strlenW(refererW) + SysStringLen(base_uri) + strlenW(crlfW); + SysFreeString(base_uri); + } + /* user headers */ LIST_FOR_EACH_ENTRY(entry, &This->request->reqheaders, struct httpheader, entry) { @@ -1571,6 +1592,8 @@ static void get_base_uri(httprequest *This) return; hr = IServiceProvider_QueryService(provider, &SID_SContainerDispatch, &IID_IHTMLDocument2, (void**)&doc); + if(FAILED(hr)) + hr = IServiceProvider_QueryService(provider, &SID_SInternetHostSecurityManager, &IID_IHTMLDocument2, (void**)&doc); IServiceProvider_Release(provider); if(FAILED(hr)) return; diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 0aaf7d4..58abec9 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -51,6 +51,8 @@ static void _expect_ref(IUnknown* obj, ULONG ref, int line) DEFINE_GUID(SID_SContainerDispatch, 0xb722be00, 0x4e68, 0x101b, 0xa2, 0xbc, 0x00, 0xaa, 0x00, 0x40, 0x47, 0x70); DEFINE_GUID(SID_UnknownSID, 0x75dd09cb, 0x6c40, 0x11d5, 0x85, 0x43, 0x00, 0xc0, 0x4f, 0xa0, 0xfb, 0xa3); +static BOOL g_enablecallchecks; + #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -59,7 +61,8 @@ DEFINE_GUID(SID_UnknownSID, 0x75dd09cb, 0x6c40, 0x11d5, 0x85, 0x43, 0x00, 0xc0, #define CHECK_EXPECT2(func) \ do { \ - ok(expect_ ##func, "unexpected call " #func "\n"); \ + if (g_enablecallchecks) \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ called_ ## func = TRUE; \ }while(0) @@ -1147,6 +1150,18 @@ static HRESULT WINAPI sp_QueryService(IServiceProvider *iface, REFGUID service, { /* FIXME: unidentified service id */ } + else if (IsEqualGUID(service, &IID_IInternetProtocol) && + IsEqualGUID(riid, &IID_IInternetProtocol)) + { + } + else if (IsEqualGUID(service, &IID_IHttpNegotiate2) && + IsEqualGUID(riid, &IID_IHttpNegotiate2)) + { + } + else if (IsEqualGUID(service, &IID_IGetBindHandle) && + IsEqualGUID(riid, &IID_IGetBindHandle)) + { + } else ok(0, "unexpected request: sid %s, riid %s\n", debugstr_guid(service), debugstr_guid(riid)); @@ -1365,6 +1380,8 @@ static void set_xhr_site(IXMLHttpRequest *xhr) hr = IXMLHttpRequest_QueryInterface(xhr, &IID_IObjectWithSite, (void**)&obj_site); ok(hr == S_OK, "Could not get IObjectWithSite iface: %08x\n", hr); + g_enablecallchecks = TRUE; + SET_EXPECT(site_qi_IServiceProvider); SET_EXPECT(sp_queryservice_SID_SBindHost); SET_EXPECT(sp_queryservice_SID_SContainerDispatch_htmldoc2); @@ -1387,20 +1404,24 @@ static void set_xhr_site(IXMLHttpRequest *xhr) todo_wine CHECK_CALLED(sp_queryservice_SID_SBindHost); CHECK_CALLED(sp_queryservice_SID_SContainerDispatch_htmldoc2); -todo_wine { CHECK_CALLED(sp_queryservice_SID_secmgr_htmldoc2); +todo_wine CHECK_CALLED(sp_queryservice_SID_secmgr_xmldomdoc); /* this one isn't very reliable CHECK_CALLED(sp_queryservice_SID_secmgr_secmgr); */ - +todo_wine { CHECK_CALLED(htmldoc2_get_all); CHECK_CALLED(collection_get_length); +} CHECK_CALLED(htmldoc2_get_url); +todo_wine { CHECK_CALLED(site_qi_IXMLDOMDocument); CHECK_CALLED(site_qi_IOleClientSite); } + g_enablecallchecks = FALSE; + IObjectWithSite_Release(obj_site); } @@ -1423,8 +1444,10 @@ static void test_XMLHTTP(void) static const char bodyA[] = "mode=Test"; static const char urlA[] = "http://crossover.codeweavers.com/posttest.php"; static const char xmltestA[] = "http://crossover.codeweavers.com/xmltest.xml"; + static const char referertesturl[] = "http://test.winehq.org/tests/referer.php"; static const WCHAR wszExpectedResponse[] = {'F','A','I','L','E','D',0}; static const CHAR xmltestbodyA[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<a>TEST</a>\n"; + static const WCHAR norefererW[] = {'n','o',' ','r','e','f','e','r','e','r',' ','s','e','t',0}; IXMLHttpRequest *xhr; IObjectWithSite *obj_site, *obj_site2; @@ -1686,6 +1709,17 @@ static void test_XMLHTTP(void) IDispatch_Release(event); + /* test if referrer header is sent */ + test_open(xhr, "GET", referertesturl, S_OK); + + V_VT(&varbody) = VT_EMPTY; + hr = IXMLHttpRequest_send(xhr, varbody); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLHttpRequest_get_responseText(xhr, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, norefererW), "got response text %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + /* interaction with object site */ hr = IXMLHttpRequest_QueryInterface(xhr, &IID_IObjectWithSite, (void**)&obj_site); EXPECT_HR(hr, S_OK); @@ -1700,10 +1734,20 @@ static void test_XMLHTTP(void) set_xhr_site(xhr); - /* try to set site another time */ - SET_EXPECT(site_qi_IServiceProvider); - SET_EXPECT(sp_queryservice_SID_SContainerDispatch_htmldoc2); + test_open(xhr, "GET", "tests/referer.php", S_OK); + str1 = a2bstr("http://test.winehq.org/"); + V_VT(&varbody) = VT_EMPTY; + hr = IXMLHttpRequest_send(xhr, varbody); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLHttpRequest_get_responseText(xhr, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, str1), "got response text %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(str1)); + SysFreeString(str); + SysFreeString(str1); + + /* try to set site another time */ hr = IObjectWithSite_SetSite(obj_site, &testsite); EXPECT_HR(hr, S_OK);

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2013