October 2013 - Wine-commits

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

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: 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: 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; +(a)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

Jacek Caban : crypt32: Always return TRUE from CertFreeCertificateContext.
by Alexandre Julliard 18 Oct '13

18 Oct '13

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

Jacek Caban : crypt32: Always return TRUE from CertFreeCRLContext.
by Alexandre Julliard 18 Oct '13

18 Oct '13

Module: wine Branch: master Commit: 351314145f946dc0913a9fb35ea0de4ef5cba82d URL: http://source.winehq.org/git/wine.git/?a=commit;h=351314145f946dc0913a9fb35… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 10:50:12 2013 +0200 crypt32: Always return TRUE from CertFreeCRLContext. --- dlls/crypt32/crl.c | 6 ++---- dlls/crypt32/tests/crl.c | 12 ++++++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 1fa8aa9..967231b 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -363,13 +363,11 @@ PCCRL_CONTEXT WINAPI CertDuplicateCRLContext(PCCRL_CONTEXT pCrlContext) BOOL WINAPI CertFreeCRLContext(PCCRL_CONTEXT pCrlContext) { - BOOL ret = TRUE; - TRACE("(%p)\n", pCrlContext); if (pCrlContext) - ret = Context_Release(&crl_from_ptr(pCrlContext)->base); - return ret; + Context_Release(&crl_from_ptr(pCrlContext)->base); + return TRUE; } DWORD WINAPI CertEnumCRLContextProperties(PCCRL_CONTEXT pCRLContext, diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index 313ebb3..f39d02e 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -120,6 +120,7 @@ static void testCreateCRL(void) static void testDupCRL(void) { PCCRL_CONTEXT context, dupContext; + BOOL res; context = CertDuplicateCRLContext(NULL); ok(context == NULL, "expected NULL\n"); @@ -128,8 +129,15 @@ static void testDupCRL(void) dupContext = CertDuplicateCRLContext(context); ok(dupContext != NULL, "expected a context\n"); ok(dupContext == context, "expected identical context addresses\n"); - CertFreeCRLContext(dupContext); - CertFreeCRLContext(context); + + res = CertFreeCRLContext(dupContext); + ok(res, "CertFreeCRLContext failed\n"); + + res = CertFreeCRLContext(context); + ok(res, "CertFreeCRLContext failed\n"); + + res = CertFreeCRLContext(NULL); + ok(res, "CertFreeCRLContext failed\n"); } static void testAddCRL(void)

1 0

Jacek Caban : crypt32: Always return TRUE from CertFreeCTLContext.
by Alexandre Julliard 18 Oct '13

18 Oct '13

Module: wine Branch: master Commit: 610c863e7531569771fdb3dfcbdd4d3057063451 URL: http://source.winehq.org/git/wine.git/?a=commit;h=610c863e7531569771fdb3dfc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 10:50:23 2013 +0200 crypt32: Always return TRUE from CertFreeCTLContext. --- dlls/crypt32/context.c | 6 +----- dlls/crypt32/crypt32_private.h | 4 +--- dlls/crypt32/ctl.c | 6 ++---- dlls/crypt32/tests/ctl.c | 12 ++++++++++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index 4809eea..d836b6f 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -74,14 +74,11 @@ void Context_AddRef(context_t *context) TRACE("(%p) ref=%d\n", context, context->ref); } -BOOL Context_Release(context_t *context) +void Context_Release(context_t *context) { - BOOL ret = TRUE; - if (context->ref <= 0) { ERR("%p's ref count is %d\n", context, context->ref); - return FALSE; } if (InterlockedDecrement(&context->ref) == 0) { @@ -97,7 +94,6 @@ BOOL Context_Release(context_t *context) } else TRACE("%p's ref count is %d\n", context, context->ref); - return ret; } void Context_CopyProperties(const void *to, const void *from) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index dbb9ee5..50eb9e6 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -403,10 +403,8 @@ void Context_AddRef(context_t*) DECLSPEC_HIDDEN; /* Decrements context's ref count. If context is a link context, releases its * linked context as well. - * If a data context has its ref count reach 0, calls dataContextFree on it. - * Returns FALSE if the reference count is <= 0 when called. */ -BOOL Context_Release(context_t *context) DECLSPEC_HIDDEN; +void Context_Release(context_t *context) DECLSPEC_HIDDEN; /** * Context property list functions diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index 3717b7d..1f95fdf 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -500,13 +500,11 @@ PCCTL_CONTEXT WINAPI CertDuplicateCTLContext(PCCTL_CONTEXT pCtlContext) BOOL WINAPI CertFreeCTLContext(PCCTL_CONTEXT pCTLContext) { - BOOL ret = TRUE; - TRACE("(%p)\n", pCTLContext); if (pCTLContext) - ret = Context_Release(&ctl_from_ptr(pCTLContext)->base); - return ret; + Context_Release(&ctl_from_ptr(pCTLContext)->base); + return TRUE; } DWORD WINAPI CertEnumCTLContextProperties(PCCTL_CONTEXT pCTLContext, diff --git a/dlls/crypt32/tests/ctl.c b/dlls/crypt32/tests/ctl.c index f292a4c..55bbc6e 100644 --- a/dlls/crypt32/tests/ctl.c +++ b/dlls/crypt32/tests/ctl.c @@ -190,6 +190,7 @@ static void testCreateCTL(void) static void testDupCTL(void) { PCCTL_CONTEXT context, dupContext; + BOOL res; context = CertDuplicateCTLContext(NULL); ok(context == NULL, "expected NULL\n"); @@ -198,8 +199,15 @@ static void testDupCTL(void) dupContext = CertDuplicateCTLContext(context); ok(dupContext != NULL, "expected a context\n"); ok(dupContext == context, "expected identical context addresses\n"); - CertFreeCTLContext(dupContext); - CertFreeCTLContext(context); + + res = CertFreeCTLContext(dupContext); + ok(res, "CertFreeCTLContext failed\n"); + + res = CertFreeCTLContext(context); + ok(res, "CertFreeCTLContext failed\n"); + + res = CertFreeCTLContext(NULL); + ok(res, "CertFreeCTLContext failed\n"); } static void checkHash(const BYTE *data, DWORD dataLen, ALG_ID algID,

1 0

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

18 Oct '13

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

Jacek Caban : crypt32: Use empty_store for new CRL contexts.
by Alexandre Julliard 18 Oct '13

18 Oct '13

Module: wine Branch: master Commit: c01a7084248ca1f71f2b6d1f0e235f115bf927f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c01a7084248ca1f71f2b6d1f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 10:50:53 2013 +0200 crypt32: Use empty_store for new CRL contexts. --- dlls/crypt32/crl.c | 2 +- dlls/crypt32/tests/store.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index bf67a6b..4686e11 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -97,7 +97,7 @@ PCCRL_CONTEXT WINAPI CertCreateCRLContext(DWORD dwCertEncodingType, crl->pbCrlEncoded = data; crl->cbCrlEncoded = cbCrlEncoded; crl->pCrlInfo = crlInfo; - crl->hCertStore = 0; + crl->hCertStore = &empty_store; } end: diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 5e99503..ea85dbf 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -2530,6 +2530,7 @@ static DWORD countCRLsInStore(HCERTSTORE store) static void testEmptyStore(void) { const CERT_CONTEXT *cert, *cert2, *cert3; + const CRL_CONTEXT *crl; HCERTSTORE store; BOOL res; @@ -2586,6 +2587,13 @@ static void testEmptyStore(void) ok(!res && GetLastError() == E_UNEXPECTED, "CertCloseStore returned: %x(%x)\n", res, GetLastError()); CertFreeCertificateContext(cert2); + + crl = CertCreateCRLContext(X509_ASN_ENCODING, signedCRL, sizeof(signedCRL)); + ok(crl != NULL, "CertCreateCRLContext failed\n"); + ok(crl->hCertStore == cert->hCertStore, "unexpected hCertStore\n"); + + CertFreeCRLContext(crl); + CertFreeCertificateContext(cert); }

1 0

Dmitry Timoshkov : kernel32/tests: Fix process tests compilation with __WINESRC__ defined.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: 6774accd026c3221b50da02e3579b1914b2d3a28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6774accd026c3221b50da02e3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 17 11:45:27 2013 +0900 kernel32/tests: Fix process tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/process.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index b35481e..f5c5ecf 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1665,7 +1665,7 @@ static void test_GetProcessImageFileNameA(void) length = sizeof(image); expect_eq_d(TRUE, pQueryFullProcessImageNameA(GetCurrentProcess(), PROCESS_NAME_NATIVE, image, &length)); expect_eq_d(length, lstrlenA(image)); - ok(lstrcmpi(process, image) == 0, "expected '%s' to be equal to '%s'\n", process, image); + ok(lstrcmpiA(process, image) == 0, "expected '%s' to be equal to '%s'\n", process, image); } } @@ -1691,7 +1691,7 @@ static void test_QueryFullProcessImageNameA(void) expect_eq_d(TRUE, pQueryFullProcessImageNameA(GetCurrentProcess(), 0, buf, &length)); expect_eq_d(length, lstrlenA(buf)); ok((buf[0] == '\\' && buf[1] == '\\') || - lstrcmpi(buf, module) == 0, "expected %s to match %s\n", buf, module); + lstrcmpiA(buf, module) == 0, "expected %s to match %s\n", buf, module); /* when the buffer is too small * - function fail with error ERROR_INSUFFICIENT_BUFFER @@ -1930,14 +1930,14 @@ static void test_TerminateProcess(void) { static char cmdline[] = "winver.exe"; PROCESS_INFORMATION pi; - STARTUPINFO si; + STARTUPINFOA si; DWORD ret; HANDLE dummy, thread; memset(&si, 0, sizeof(si)); si.cb = sizeof(si); SetLastError(0xdeadbeef); - ret = CreateProcess(NULL, cmdline, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi); + ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi); ok(ret, "CreateProcess error %u\n", GetLastError()); SetLastError(0xdeadbeef); @@ -1990,9 +1990,9 @@ static void test_DuplicateHandle(void) ok(out != GetCurrentProcess(), "out = GetCurrentProcess()\n"); CloseHandle(out); - GetTempPath(MAX_PATH, path); - GetTempFileName(path, "wt", 0, file_name); - f = CreateFile(file_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + GetTempPathA(MAX_PATH, path); + GetTempFileNameA(path, "wt", 0, file_name); + f = CreateFileA(file_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); if (f == INVALID_HANDLE_VALUE) { ok(0, "could not create %s\n", file_name); @@ -2043,9 +2043,9 @@ static void test_DuplicateHandle(void) ok(r, "DuplicateHandle error %u\n", GetLastError()); ok(f == out, "f != out\n"); CloseHandle(out); - DeleteFile(file_name); + DeleteFileA(file_name); - f = CreateFile("CONIN$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + f = CreateFileA("CONIN$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); if (!is_console(f)) { skip("DuplicateHandle on console handle\n");

1 0