wine-commits September 2013

wine-commits@winehq.org

2 participants
645 discussions

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

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

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

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

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

André Hentschel : winedev: Don' t recommend a preprocessor check to comment out code.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: docs Branch: master Commit: 81555011154280813636d684211e515547f07440 URL: http://source.winehq.org/git/docs.git/?a=commit;h=81555011154280813636d6842… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 3 00:12:20 2013 +0200 winedev: Don't recommend a preprocessor check to comment out code. --- en/winedev-coding.sgml | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/en/winedev-coding.sgml b/en/winedev-coding.sgml index abc7447..dc865b1 100644 --- a/en/winedev-coding.sgml +++ b/en/winedev-coding.sgml @@ -100,21 +100,20 @@ <listitem> <para> Commenting out a block of code is usually done by - enclosing it in <command>#if 0 ... #endif</command> - statements. For example. + using <command>if (0)</command>. For example: </para> <screen> /* note about reason for commenting block */ -#if 0 +if (0) { code code /* comments */ code -#endif +} </screen> <para> The reason for using this method is that it does not require that you edit comments that may be inside the - block of code. + block of code and it makes sure the code gets maintained. </para> </listitem> <listitem>

1 0

André Hentschel : winedev: Use autoconf to update the configure script.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: docs Branch: master Commit: 9f04b7eb676ecbba66648d128b81f7c553b79073 URL: http://source.winehq.org/git/docs.git/?a=commit;h=9f04b7eb676ecbba66648d128… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 3 00:11:54 2013 +0200 winedev: Use autoconf to update the configure script. --- en/winedev-coding.sgml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/en/winedev-coding.sgml b/en/winedev-coding.sgml index a805d24..abc7447 100644 --- a/en/winedev-coding.sgml +++ b/en/winedev-coding.sgml @@ -347,7 +347,7 @@ AC_CHECK_HEADER(foo.h, AC_DEFINE(HAVE_FOO_H)) (etc.) to <filename>include/config.h.in</filename>. </para> <para> - Finish up with <command>make configure</command> and + Finish up with <command>autoconf</command> and <command>./configure</command>. </para> </sect2> @@ -432,7 +432,7 @@ AC_CHECK_HEADER(foo.h, AC_DEFINE(HAVE_FOO_H)) </varlistentry> </variablelist> <para> - Finish up with <command>make configure</command> and + Finish up with <command>autoconf</command> and <command>./configure</command>. </para> </sect2>

1 0

André Hentschel : winedev: Leave instructions up to the howto.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: docs Branch: master Commit: bf8123ff496696c7312424f693791a80cf2430f5 URL: http://source.winehq.org/git/docs.git/?a=commit;h=bf8123ff496696c7312424f69… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Sep 2 22:14:37 2013 +0200 winedev: Leave instructions up to the howto. --- en/winedev-testing.sgml | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/en/winedev-testing.sgml b/en/winedev-testing.sgml index f0643b2..9350f00 100644 --- a/en/winedev-testing.sgml +++ b/en/winedev-testing.sgml @@ -389,9 +389,8 @@ Kit</ulink>. </para></listitem> <listitem><para> If you want to use the Microsoft C++ Toolkit under Wine, - install it under Windows, then copy it to your fake C drive; - it'll work fine there. See <ulink url="http://kegel.com/wine/cl-howto.html">CL Howto</ulink> - for some tips on making it easy to use from the Linux command line. + see <ulink url="http://kegel.com/wine/cl-howto.html">CL Howto</ulink> + for some tips on making it easy to use it from the Linux command line. </para></listitem> </itemizedlist> </para>

1 0

André Hentschel : winedev: Minor updates to the windowing chapter.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: docs Branch: master Commit: 75e9f01f05ea8c2bb2aecac46d0c41c6773ce645 URL: http://source.winehq.org/git/docs.git/?a=commit;h=75e9f01f05ea8c2bb2aecac46… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Sep 2 22:15:18 2013 +0200 winedev: Minor updates to the windowing chapter. --- en/winedev-windowing.sgml | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/en/winedev-windowing.sgml b/en/winedev-windowing.sgml index 6effe48..71738bc 100644 --- a/en/winedev-windowing.sgml +++ b/en/winedev-windowing.sgml @@ -1,22 +1,21 @@ <chapter> <title>Windowing system</title> <sect1> - <title>USER Module</title> + <title>USER32 Module</title> <para> - USER implements windowing and messaging subsystems. It also + USER32 implements windowing and messaging subsystems. It also contains code for common controls and for other miscellaneous stuff (rectangles, clipboard, WNet, etc). - Wine USER code is located in <filename class="directory">windows/</filename>, - <filename class="directory">controls/</filename>, and - <filename class="directory">misc/</filename> directories. + Wine USER32 code is located in the + <filename class="directory">dlls/user32/</filename> directory. </para> <sect2> <title>Windowing subsystem</title> - <para><filename>windows/win.c</filename></para> - <para><filename>windows/winpos.c</filename></para> + <para><filename>dlls/user32/win.c</filename></para> + <para><filename>dlls/user32/winpos.c</filename></para> <para> Windows are arranged into parent/child hierarchy with one common ancestor for all windows (desktop window). Each @@ -74,7 +73,7 @@ child1->popup->child2->child3->wnd1->child4->wnd2->desktop. </para> <para> All these issues are dealt with (or supposed to be) in - <filename>windows/winpos.c</filename> with + <filename>dlls/user32/winpos.c</filename> with <function>SetWindowPos()</function> being the primary interface to the window manager. </para> @@ -91,11 +90,10 @@ child1->popup->child2->child3->wnd1->child4->wnd2->desktop. <sect3> <title>Visible region, clipping region and update region</title> - - <para><filename>windows/dce.c</filename></para> - <para><filename>windows/winpos.c</filename></para> - <para><filename>windows/painting.c</filename></para> - + + <para><filename>dlls/user32/winpos.c</filename></para> + <para><filename>dlls/user32/painting.c</filename></para> + <screen> ________________________ |_________ | A and B are child windows of C @@ -199,8 +197,7 @@ child1->popup->child2->child3->wnd1->child4->wnd2->desktop. <sect2> <title>Messaging subsystem</title> - <para><filename>windows/queue.c</filename></para> - <para><filename>windows/message.c</filename></para> + <para><filename>dlls/user32/message.c</filename></para> <para> Each Windows task/thread has its own message queue - this @@ -238,7 +235,7 @@ child1->popup->child2->child3->wnd1->child4->wnd2->desktop. messages, then for hardware messages, then it checks if the queue has the <quote>dirty window</quote> bit set, and, finally, it checks for expired timers. See - <filename>windows/message.c</filename>. + <filename>dlls/user32/message.c</filename>. </para> <para> From all these different types of messages, only posted

1 0

André Hentschel : winedev: Recommend MinGW-w64.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: docs Branch: master Commit: affa3314584cbdc9010a770168810df7cfac19a3 URL: http://source.winehq.org/git/docs.git/?a=commit;h=affa3314584cbdc9010a77016… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Sep 2 22:14:14 2013 +0200 winedev: Recommend MinGW-w64. --- en/winedev-testing.sgml | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/en/winedev-testing.sgml b/en/winedev-testing.sgml index c6e00ab..f0643b2 100644 --- a/en/winedev-testing.sgml +++ b/en/winedev-testing.sgml @@ -181,11 +181,11 @@ <sect1 id="cross-compiling-tests"> - <title>Cross-compiling the tests with MinGW</title> + <title>Cross-compiling the tests with MinGW-w64</title> <sect2> - <title>Setup of the MinGW cross-compiling environment</title> + <title>Setup of the MinGW-w64 cross-compiling environment</title> <para> - Here are some instructions to setup MinGW on different Linux + Here are some instructions to setup MinGW-w64 on different Linux distributions and *BSD. </para> <sect3> @@ -195,7 +195,7 @@ The following step should probably work on any deb based system. </para> <para> - Run <userinput>apt-get install mingw32</userinput>. + Run <userinput>apt-get install mingw-w64</userinput>. </para> </sect3> <sect3> @@ -206,13 +206,13 @@ The following step should probably work on any rpm based system. </para> <para> - Run <userinput>yum install mingw32-gcc</userinput>. + Run <userinput>yum install mingw64-gcc</userinput>. </para> </sect3> <sect3> <title>*BSD</title> <para> - The *BSD systems have in their ports collection a port for the + The *BSD systems have in their ports collection only a port for the MinGW cross-compiling environment. Please see the documentation of your system about how to build and install a port. </para> @@ -341,13 +341,13 @@ Kit</ulink>. </itemizedlist> </sect2> <sect2> - <title>With MinGW</title> + <title>With MinGW-w64</title> <para> - Wine build system already has support for building tests with a MinGW - cross-compiler. See the section above called <quote>Setup of the MinGW + Wine build system already has support for building tests with a MinGW-w64 + cross-compiler. See the section above called <quote>Setup of the MinGW-w64 cross-compiling environment</quote> for instructions on how to set things up. - When you have a MinGW environment installed all you need to do is rerun - configure and it should detect the MinGW compiler and tools. Then run + When you have a MinGW-w64 environment installed all you need to do is rerun + configure and it should detect the MinGW-w64 compiler and tools. Then run <command>make crosstest</command> to start building the tests. </para> </sect2>

1 0

← Newer
1
...
58
59
60
61
62
63
64
65
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 September 2013