September 2013 - Wine-commits

Hans Leidekker : wininet: Fix calculation of content length from chunk size .
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: daa0acdbcf37d5e8ef5f200620a5eefbcbe83e0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=daa0acdbcf37d5e8ef5f20062… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 3 14:18:52 2013 +0200 wininet: Fix calculation of content length from chunk size. --- dlls/wininet/http.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 954c98b..1832b4f 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2762,7 +2762,8 @@ static DWORD start_next_chunk(chunked_stream_t *stream, http_request_t *req) { TRACE( "reading %u byte chunk\n", chunk_size ); stream->chunk_size = chunk_size; - req->contentLength += chunk_size; + if (req->contentLength == ~0u) req->contentLength = chunk_size; + else req->contentLength += chunk_size; return discard_chunked_eol(stream, req); } remove_chunked_data(stream, 1);

1 0

Nikolay Sivov : shell32: Consistently return interface pointer instead of implementation pointer.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: 0de2514f3971206bbe0bcdfcf998bacf6d138ab2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0de2514f3971206bbe0bcdfcf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 3 17:09:07 2013 +0400 shell32: Consistently return interface pointer instead of implementation pointer. --- dlls/shell32/assoc.c | 4 +- dlls/shell32/autocomplete.c | 8 +++--- dlls/shell32/cpanelfolder.c | 5 ++- dlls/shell32/dataobject.c | 46 +++++++++++++++++----------------------- dlls/shell32/dragdrophelper.c | 4 +- dlls/shell32/ebrowser.c | 2 +- dlls/shell32/enumidlist.c | 9 +++---- dlls/shell32/recyclebin.c | 14 ++++++------ dlls/shell32/shelldispatch.c | 12 +++++----- dlls/shell32/shellitem.c | 29 ++++++++----------------- 10 files changed, 58 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0de2514f3971206bbe0bc…

1 0

Detlef Riekenberg : scrrun/tests: Ignore case in path names.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: 25bca2ede4372ab7987423e15aade048f2f63c68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25bca2ede4372ab7987423e15… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Sep 3 19:03:25 2013 +0200 scrrun/tests: Ignore case in path names. --- dlls/scrrun/tests/filesystem.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index e231f9a..6016049 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -411,7 +411,7 @@ static void test_GetAbsolutePathName(void) hr = IFileSystem3_GetAbsolutePathName(fs3, NULL, &result); ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); GetFullPathNameW(cur_dir, MAX_PATH, buf, NULL); - ok(!lstrcmpW(buf, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); + ok(!lstrcmpiW(buf, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); SysFreeString(result); find = FindFirstFileW(dir_match2, &fdata); @@ -425,26 +425,26 @@ static void test_GetAbsolutePathName(void) hr = IFileSystem3_GetAbsolutePathName(fs3, path, &result); ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); GetFullPathNameW(dir_match1, MAX_PATH, buf2, NULL); - ok(!lstrcmpW(buf2, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf2)); + ok(!lstrcmpiW(buf2, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf2)); SysFreeString(result); ok(CreateDirectoryW(dir1, NULL), "CreateDirectory(%s) failed\n", wine_dbgstr_w(dir1)); hr = IFileSystem3_GetAbsolutePathName(fs3, path, &result); ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); GetFullPathNameW(dir1, MAX_PATH, buf, NULL); - ok(!lstrcmpW(buf, result) || broken(!lstrcmpW(buf2, result)), "result = %s, expected %s\n", + ok(!lstrcmpiW(buf, result) || broken(!lstrcmpiW(buf2, result)), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); SysFreeString(result); ok(CreateDirectoryW(dir2, NULL), "CreateDirectory(%s) failed\n", wine_dbgstr_w(dir2)); hr = IFileSystem3_GetAbsolutePathName(fs3, path, &result); ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); - if(!lstrcmpW(buf, result) || !lstrcmpW(buf2, result)) { - ok(!lstrcmpW(buf, result) || broken(!lstrcmpW(buf2, result)), "result = %s, expected %s\n", + if(!lstrcmpiW(buf, result) || !lstrcmpiW(buf2, result)) { + ok(!lstrcmpiW(buf, result) || broken(!lstrcmpiW(buf2, result)), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); }else { GetFullPathNameW(dir2, MAX_PATH, buf, NULL); - ok(!lstrcmpW(buf, result), "result = %s, expected %s\n", + ok(!lstrcmpiW(buf, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); } SysFreeString(result); @@ -454,7 +454,7 @@ static void test_GetAbsolutePathName(void) hr = IFileSystem3_GetAbsolutePathName(fs3, path, &result); ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); GetFullPathNameW(dir_match2, MAX_PATH, buf, NULL); - ok(!lstrcmpW(buf, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); + ok(!lstrcmpiW(buf, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); SysFreeString(result); SysFreeString(path);

1 0

Dmitry Timoshkov : kernel32/tests: Add a test to show that WaitCommEvent should succeed after SetCommMask( EV_TXEMPTY)+WriteFile+FlushFileBuffers.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: 663dbd9f1c4ce1c26f07e52749a2a697fa403a05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=663dbd9f1c4ce1c26f07e5274… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 2 18:25:31 2013 +0900 kernel32/tests: Add a test to show that WaitCommEvent should succeed after SetCommMask(EV_TXEMPTY)+WriteFile+FlushFileBuffers. --- dlls/kernel32/tests/comm.c | 97 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 95 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 6970cf9..882b652 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -780,10 +780,11 @@ static void test_waittxempty(void) DCB dcb; COMMTIMEOUTS timeouts; char tbuf[]="test_waittxempty"; - DWORD before, after, bytes, timediff, evtmask; + DWORD before, after, bytes, timediff, evtmask, errors, i; BOOL res; DWORD baud = SLOWBAUD; OVERLAPPED ovl_write, ovl_wait; + COMSTAT stat; hcom = test_OpenComm(TRUE); if (hcom == INVALID_HANDLE_VALUE) return; @@ -855,7 +856,19 @@ todo_wine ok(bytes == sizeof(evtmask), "expected %u, written %u\n", (UINT)sizeof(evtmask), bytes); res = TRUE; } - else res = FALSE; + else + { + /* unblock pending wait */ + trace("recovering after WAIT_TIMEOUT...\n"); + /* FIXME: Wine fails to unblock with new mask being equal to the old one */ + res = SetCommMask(hcom, 0); + ok(res, "SetCommMask error %d\n", GetLastError()); + + res = WaitForSingleObject(ovl_wait.hEvent, TIMEOUT); + ok(res == WAIT_OBJECT_0, "WaitCommEvent failed with a timeout\n"); + + res = FALSE; + } after = GetTickCount(); todo_wine ok(res, "WaitCommEvent error %d\n", GetLastError()); @@ -876,6 +889,86 @@ todo_wine CloseHandle(ovl_write.hEvent); CloseHandle(hcom); + + for (i = 0; i < 2; i++) + { + hcom = test_OpenComm(TRUE); + if (hcom == INVALID_HANDLE_VALUE) return; + + res = SetCommMask(hcom, EV_TXEMPTY); + ok(res, "SetCommMask error %d\n", GetLastError()); + + if (i == 0) + { + S(U(ovl_write)).Offset = 0; + S(U(ovl_write)).OffsetHigh = 0; + ovl_write.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + before = GetTickCount(); + SetLastError(0xdeadbeef); + res = WriteFile(hcom, tbuf, sizeof(tbuf), &bytes, &ovl_write); +todo_wine + ok(!res && GetLastError() == ERROR_IO_PENDING, "WriteFile returned %d, error %d\n", res, GetLastError()); +todo_wine + ok(!bytes, "expected 0, got %u\n", bytes); + + ClearCommError(hcom, &errors, &stat); + ok(stat.cbInQue == 0, "InQueue should be empty, got %d bytes\n", stat.cbInQue); + ok(stat.cbOutQue != 0 || broken(stat.cbOutQue == 0) /* VM */, "OutQueue should not be empty\n"); + ok(errors == 0, "ClearCommErrors: Unexpected error 0x%08x\n", errors); + + res = GetOverlappedResult(hcom, &ovl_write, &bytes, TRUE); + ok(res, "GetOverlappedResult reported error %d\n", GetLastError()); + ok(bytes == sizeof(tbuf), "expected %u, written %u\n", (UINT)sizeof(tbuf), bytes); + CloseHandle(ovl_write.hEvent); + + res = FlushFileBuffers(hcom); + ok(res, "FlushFileBuffers error %d\n", GetLastError()); + } + + ClearCommError(hcom, &errors, &stat); + ok(stat.cbInQue == 0, "InQueue should be empty, got %d bytes\n", stat.cbInQue); + ok(stat.cbOutQue == 0, "OutQueue should be empty, got %d bytes\n", stat.cbOutQue); + ok(errors == 0, "ClearCommErrors: Unexpected error 0x%08x\n", errors); + + S(U(ovl_wait)).Offset = 0; + S(U(ovl_wait)).OffsetHigh = 0; + ovl_wait.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + evtmask = 0; + SetLastError(0xdeadbeef); + res = WaitCommEvent(hcom, &evtmask, &ovl_wait); + ok(!res && GetLastError() == ERROR_IO_PENDING, "%d: WaitCommEvent error %d\n", i, GetLastError()); + + res = WaitForSingleObject(ovl_wait.hEvent, TIMEOUT); + if (i == 0) +todo_wine + ok(res == WAIT_OBJECT_0, "WaitCommEvent failed with a timeout\n"); + else + ok(res == WAIT_TIMEOUT, "WaitCommEvent should fail with a timeout\n"); + if (res == WAIT_OBJECT_0) + { + res = GetOverlappedResult(hcom, &ovl_wait, &bytes, FALSE); + ok(res, "GetOverlappedResult reported error %d\n", GetLastError()); + ok(bytes == sizeof(evtmask), "expected %u, written %u\n", (UINT)sizeof(evtmask), bytes); + ok(res, "WaitCommEvent error %d\n", GetLastError()); + ok(evtmask & EV_TXEMPTY, "WaitCommEvent: expected EV_TXEMPTY, got %#x\n", evtmask); + } + else + { + ok(!evtmask, "WaitCommEvent: expected 0, got %#x\n", evtmask); + + /* unblock pending wait */ + trace("recovering after WAIT_TIMEOUT...\n"); + /* FIXME: Wine fails to unblock with new mask being equal to the old one */ + res = SetCommMask(hcom, 0); + ok(res, "SetCommMask error %d\n", GetLastError()); + + res = WaitForSingleObject(ovl_wait.hEvent, TIMEOUT); + ok(res == WAIT_OBJECT_0, "WaitCommEvent failed with a timeout\n"); + CloseHandle(ovl_wait.hEvent); + } + + CloseHandle(hcom); + } } /* A new open handle should not return error or have bytes in the Queues */

1 0

Dmitry Timoshkov : kernel32/tests: Add a test to show that WaitCommEvent should fail if there is a pending wait .
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: 4135900235c58859fffe39290c9089151eeaf666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4135900235c58859fffe39290… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 2 18:27:01 2013 +0900 kernel32/tests: Add a test to show that WaitCommEvent should fail if there is a pending wait. --- dlls/kernel32/tests/comm.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 882b652..e54be7a 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -783,7 +783,7 @@ static void test_waittxempty(void) DWORD before, after, bytes, timediff, evtmask, errors, i; BOOL res; DWORD baud = SLOWBAUD; - OVERLAPPED ovl_write, ovl_wait; + OVERLAPPED ovl_write, ovl_wait, ovl_wait2; COMSTAT stat; hcom = test_OpenComm(TRUE); @@ -956,6 +956,16 @@ todo_wine { ok(!evtmask, "WaitCommEvent: expected 0, got %#x\n", evtmask); + S(U(ovl_wait2)).Offset = 0; + S(U(ovl_wait2)).OffsetHigh = 0; + ovl_wait2.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + SetLastError(0xdeadbeef); + res = WaitCommEvent(hcom, &evtmask, &ovl_wait2); + ok(!res, "WaitCommEvent should fail if there is a pending wait\n"); +todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + CloseHandle(ovl_wait2.hEvent); + /* unblock pending wait */ trace("recovering after WAIT_TIMEOUT...\n"); /* FIXME: Wine fails to unblock with new mask being equal to the old one */

1 0

Michael Stefaniuc : avifil32: Basic COM cleanup for the IAVIStream iface.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: 555fbc985c29a268e6280bb00768184ce11872eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=555fbc985c29a268e6280bb00… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Sep 2 22:20:01 2013 +0200 avifil32: Basic COM cleanup for the IAVIStream iface. --- dlls/avifil32/avifile.c | 127 ++++++++++++++++++++++------------------------- 1 files changed, 59 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=555fbc985c29a268e6280…

1 0

Michael Stefaniuc : avifil32: Move the IAVIStream vtbl to avoid forward declarations.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: 11b21f70ab9032dd9990227f413292cadb39189d URL: http://source.winehq.org/git/wine.git/?a=commit;h=11b21f70ab9032dd9990227f4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Sep 2 22:22:50 2013 +0200 avifil32: Move the IAVIStream vtbl to avoid forward declarations. --- dlls/avifil32/avifile.c | 50 ++++++++++++++++------------------------------- 1 files changed, 17 insertions(+), 33 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 854d490..2711ba4 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -55,38 +55,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(avifile); #define IDX_PER_BLOCK 2730 #endif -static HRESULT WINAPI IAVIStream_fnQueryInterface(IAVIStream*iface,REFIID refiid,LPVOID *obj); -static ULONG WINAPI IAVIStream_fnAddRef(IAVIStream*iface); -static ULONG WINAPI IAVIStream_fnRelease(IAVIStream* iface); -static HRESULT WINAPI IAVIStream_fnCreate(IAVIStream*iface,LPARAM lParam1,LPARAM lParam2); -static HRESULT WINAPI IAVIStream_fnInfo(IAVIStream*iface,AVISTREAMINFOW *psi,LONG size); -static LONG WINAPI IAVIStream_fnFindSample(IAVIStream*iface,LONG pos,LONG flags); -static HRESULT WINAPI IAVIStream_fnReadFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG *formatsize); -static HRESULT WINAPI IAVIStream_fnSetFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG formatsize); -static HRESULT WINAPI IAVIStream_fnRead(IAVIStream*iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,LONG *bytesread,LONG *samplesread); -static HRESULT WINAPI IAVIStream_fnWrite(IAVIStream*iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,DWORD flags,LONG *sampwritten,LONG *byteswritten); -static HRESULT WINAPI IAVIStream_fnDelete(IAVIStream*iface,LONG start,LONG samples); -static HRESULT WINAPI IAVIStream_fnReadData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG *lpread); -static HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG size); -static HRESULT WINAPI IAVIStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen); - -static const struct IAVIStreamVtbl avist_vt = { - IAVIStream_fnQueryInterface, - IAVIStream_fnAddRef, - IAVIStream_fnRelease, - IAVIStream_fnCreate, - IAVIStream_fnInfo, - IAVIStream_fnFindSample, - IAVIStream_fnReadFormat, - IAVIStream_fnSetFormat, - IAVIStream_fnRead, - IAVIStream_fnWrite, - IAVIStream_fnDelete, - IAVIStream_fnReadData, - IAVIStream_fnWriteData, - IAVIStream_fnSetInfo -}; - typedef struct _IAVIFileImpl IAVIFileImpl; typedef struct _IAVIStreamImpl { @@ -1346,7 +1314,23 @@ static HRESULT WINAPI IAVIStream_fnSetInfo(IAVIStream *iface, AVISTREAMINFOW *in return E_FAIL; } -/***********************************************************************/ +static const struct IAVIStreamVtbl avist_vt = { + IAVIStream_fnQueryInterface, + IAVIStream_fnAddRef, + IAVIStream_fnRelease, + IAVIStream_fnCreate, + IAVIStream_fnInfo, + IAVIStream_fnFindSample, + IAVIStream_fnReadFormat, + IAVIStream_fnSetFormat, + IAVIStream_fnRead, + IAVIStream_fnWrite, + IAVIStream_fnDelete, + IAVIStream_fnReadData, + IAVIStream_fnWriteData, + IAVIStream_fnSetInfo +}; + static HRESULT AVIFILE_AddFrame(IAVIStreamImpl *This, DWORD ckid, DWORD size, DWORD offset, DWORD flags) {

1 0

Ken Thomases : winemac: Don' t use Cocoa parent-child relationship when topmost state is enough to keep owned in front of owner .
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: 987309e528832cfcf3f77fc123bbe00d90017628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=987309e528832cfcf3f77fc12… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Sep 2 22:48:59 2013 -0500 winemac: Don't use Cocoa parent-child relationship when topmost state is enough to keep owned in front of owner. The Cocoa parent-child relationship has undesirable side effects and bugs. In the general case, it's the only way to maintain the z-order of owned windows relative to their owner. But when the owner is non-topmost and an owned window is topmost, the Cocoa window level will enforce that and we don't need it. --- dlls/winemac.drv/cocoa_window.m | 58 +++++++++++++++++++++++++++++++------- 1 files changed, 47 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index b71d31e..7553cfc 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -160,6 +160,9 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void) updateColorSpace; + - (BOOL) becameEligibleParentOrChild; + - (void) becameIneligibleChild; + @end @@ -626,6 +629,31 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if (self.floating != state->floating) { self.floating = state->floating; + if (state->floating) + { + // Became floating. If child of non-floating window, make that + // relationship latent. + WineWindow* parent = (WineWindow*)[self parentWindow]; + if (parent && !parent.floating) + [self becameIneligibleChild]; + } + else + { + // Became non-floating. If parent of floating children, make that + // relationship latent. + WineWindow* child; + for (child in [[[self childWindows] copy] autorelease]) + { + if (child.floating) + [child becameIneligibleChild]; + } + } + + // Check our latent relationships. If floating status was the only + // reason they were latent, then make them active. + if ([self isVisible]) + [self becameEligibleParentOrChild]; + [[WineApplicationController sharedController] adjustWindowLevels]; } @@ -675,7 +703,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) { BOOL reordered = FALSE; - if ([self isVisible] && (assumeVisible || [child isVisible])) + if ([self isVisible] && (assumeVisible || [child isVisible]) && (self.floating || !child.floating)) { if ([self level] > [child level]) [child setLevel:[self level]]; @@ -714,12 +742,15 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) BOOL reordered = FALSE; NSUInteger count; - // If we aren't visible currently, we assume that we should be and soon - // will be. So, if the latent parent is visible that's enough to assume - // we can establish the parent-child relationship in Cocoa. That will - // actually make us visible, which is fine. - if ([latentParentWindow addChildWineWindow:self assumeVisible:TRUE]) - reordered = TRUE; + if (latentParentWindow.floating || !self.floating) + { + // If we aren't visible currently, we assume that we should be and soon + // will be. So, if the latent parent is visible that's enough to assume + // we can establish the parent-child relationship in Cocoa. That will + // actually make us visible, which is fine. + if ([latentParentWindow addChildWineWindow:self assumeVisible:TRUE]) + reordered = TRUE; + } // Here, though, we may not actually be visible yet and adding a child // won't make us visible. The caller will have to call this method @@ -732,7 +763,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) for (i = 0; i < count; i++) { WineWindow* child = [latentChildWindows objectAtIndex:i]; - if ([child isVisible]) + if ([child isVisible] && (self.floating || !child.floating)) { if (child.latentParentWindow == self) { @@ -754,11 +785,9 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) return reordered; } - - (void) becameIneligibleParentOrChild + - (void) becameIneligibleChild { WineWindow* parent = (WineWindow*)[self parentWindow]; - NSArray* childWindows = [self childWindows]; - if (parent) { if (!parent->latentChildWindows) @@ -767,6 +796,13 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) self.latentParentWindow = parent; [parent removeChildWindow:self]; } + } + + - (void) becameIneligibleParentOrChild + { + NSArray* childWindows = [self childWindows]; + + [self becameIneligibleChild]; if ([childWindows count]) {

1 0

Ken Thomases : winemac: When ordering sibling child windows, don' t remove and re-add ones already in the right order.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: 675b052572ee195b784581bf8d7bb399b9081c59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=675b052572ee195b784581bf8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Sep 2 22:49:05 2013 -0500 winemac: When ordering sibling child windows, don't remove and re-add ones already in the right order. --- dlls/winemac.drv/cocoa_window.m | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 7553cfc..2ad406f 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -875,7 +875,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) { NSMutableArray* windowNumbers; NSNumber* childWindowNumber; - NSUInteger otherIndex; + NSUInteger otherIndex, limit; + NSArray* origChildren; NSMutableArray* children; // Get the z-order from the window server and modify it to reflect the @@ -888,7 +889,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) // Get our child windows and sort them in the reverse of the desired // z-order (back-to-front). - children = [[[self childWindows] mutableCopy] autorelease]; + origChildren = [self childWindows]; + children = [[origChildren mutableCopy] autorelease]; [children sortWithOptions:NSSortStable usingComparator:^NSComparisonResult(id obj1, id obj2){ NSNumber* window1Number = [NSNumber numberWithInteger:[obj1 windowNumber]]; @@ -912,6 +914,16 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) return NSOrderedSame; }]; + // If the current and desired children arrays match up to a point, leave + // those matching children alone. + limit = MIN([origChildren count], [children count]); + for (otherIndex = 0; otherIndex < limit; otherIndex++) + { + if ([origChildren objectAtIndex:otherIndex] != [children objectAtIndex:otherIndex]) + break; + } + [children removeObjectsInRange:NSMakeRange(0, otherIndex)]; + // Remove all of the child windows and re-add them back-to-front so they // are in the desired order. for (other in children)

1 0

Nikolay Sivov : ntdll: For typelib and COM class sections point global data to module names.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: 44d8f6a35a1e559315b606007c162b15322477ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=44d8f6a35a1e559315b606007… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 2 11:03:19 2013 +0400 ntdll: For typelib and COM class sections point global data to module names. --- dlls/kernel32/tests/actctx.c | 13 +++++++++---- dlls/ntdll/actctx.c | 8 ++++---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 213674a..def61da 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -1148,6 +1148,7 @@ static void test_find_com_redirection(HANDLE handle, const GUID *clsid, const GU { struct comclassredirect_data *comclass, *comclass2; ACTCTX_SECTION_KEYED_DATA data, data2; + struct guidsection_header *header; BOOL ret; memset(&data, 0xfe, sizeof(data)); @@ -1207,11 +1208,11 @@ static void test_find_com_redirection(HANDLE handle, const GUID *clsid, const GU ok_(__FILE__, line)(comclass->miscstatusdocprint != 0, "got miscstatusdocprint 0x%08x\n", comclass->miscstatusdocprint); } } -todo_wine { - ok_(__FILE__, line)(data.lpSectionGlobalData != NULL, "data.lpSectionGlobalData == NULL\n"); - ok_(__FILE__, line)(data.ulSectionGlobalDataLength > 0, "data.ulSectionGlobalDataLength=%u\n", + + header = (struct guidsection_header*)data.lpSectionBase; + ok_(__FILE__, line)(data.lpSectionGlobalData == ((BYTE*)header + header->names_offset), "data.lpSectionGlobalData == NULL\n"); + ok_(__FILE__, line)(data.ulSectionGlobalDataLength == header->names_len, "data.ulSectionGlobalDataLength=%u\n", data.ulSectionGlobalDataLength); -} ok_(__FILE__, line)(data.lpSectionBase != NULL, "data.lpSectionBase == NULL\n"); ok_(__FILE__, line)(data.ulSectionTotalLength > 0, "data.ulSectionTotalLength=%u\n", data.ulSectionTotalLength); @@ -1474,6 +1475,10 @@ static void test_typelib_section(void) ok(data.ulSectionTotalLength == data2.ulSectionTotalLength, "got %u, %u\n", data.ulSectionTotalLength, data2.ulSectionTotalLength); + ok(data.lpSectionGlobalData == ((BYTE*)section + section->names_offset), "data.lpSectionGlobalData == NULL\n"); + ok(data.ulSectionGlobalDataLength == section->names_len, "data.ulSectionGlobalDataLength=%u\n", + data.ulSectionGlobalDataLength); + /* test some actual data */ tlib = (struct tlibredirect_data*)data.lpData; ok(tlib->size == sizeof(*tlib), "got %d\n", tlib->size); diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index a172d59..6458b06 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -3294,8 +3294,8 @@ static NTSTATUS find_tlib_redirection(ACTIVATION_CONTEXT* actctx, const GUID *gu data->lpData = tlib; /* full length includes string length with nulls */ data->ulLength = tlib->size + tlib->help_len + sizeof(WCHAR); - data->lpSectionGlobalData = NULL; - data->ulSectionGlobalDataLength = 0; + data->lpSectionGlobalData = (BYTE*)actctx->tlib_section + actctx->tlib_section->names_offset; + data->ulSectionGlobalDataLength = actctx->tlib_section->names_len; data->lpSectionBase = actctx->tlib_section; data->ulSectionTotalLength = RtlSizeHeap( GetProcessHeap(), 0, actctx->tlib_section ); data->hActCtx = NULL; @@ -3517,8 +3517,8 @@ static NTSTATUS find_comserver_redirection(ACTIVATION_CONTEXT* actctx, const GUI data->lpData = comclass; /* full length includes string length with nulls */ data->ulLength = comclass->size + comclass->progid_len + sizeof(WCHAR); - data->lpSectionGlobalData = NULL; - data->ulSectionGlobalDataLength = 0; + data->lpSectionGlobalData = (BYTE*)actctx->comserver_section + actctx->comserver_section->names_offset; + data->ulSectionGlobalDataLength = actctx->comserver_section->names_len; data->lpSectionBase = actctx->comserver_section; data->ulSectionTotalLength = RtlSizeHeap( GetProcessHeap(), 0, actctx->comserver_section ); data->hActCtx = NULL;

1 0