September 2013 - Wine-Commits

Nikolay Sivov : kernel32: Forward ZombifyActCtx() to ntdll.
by Alexandre Julliard Sept. 3, 2013

Sept. 3, 2013

Module: wine Branch: master Commit: 045682a4da707a1a93766221a223466388a52e36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=045682a4da707a1a93766221a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 2 14:30:50 2013 +0400 kernel32: Forward ZombifyActCtx() to ntdll. --- dlls/kernel32/actctx.c | 17 +++++++++-------- dlls/ntdll/actctx.c | 10 ++++++++++ dlls/ntdll/ntdll.spec | 2 +- include/winternl.h | 1 + 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/actctx.c b/dlls/kernel32/actctx.c index 86752b3..bcf95ec 100644 --- a/dlls/kernel32/actctx.c +++ b/dlls/kernel32/actctx.c @@ -33,9 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(actctx); - -#define ACTCTX_FAKE_HANDLE ((HANDLE) 0xf00baa) - /*********************************************************************** * CreateActCtxA (KERNEL32.@) * @@ -200,14 +197,18 @@ void WINAPI ReleaseActCtx(HANDLE hActCtx) /*********************************************************************** * ZombifyActCtx (KERNEL32.@) * - * Release a reference to an activation context. + * Deactivate context without releasing it. */ BOOL WINAPI ZombifyActCtx(HANDLE hActCtx) { - FIXME("%p\n", hActCtx); - if (hActCtx != ACTCTX_FAKE_HANDLE) - return FALSE; - return TRUE; + NTSTATUS status; + + if ((status = RtlZombifyActivationContext(hActCtx))) + { + SetLastError(RtlNtStatusToDosError(status)); + return FALSE; + } + return TRUE; } /*********************************************************************** diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 369e928..f652c18 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -4138,6 +4138,16 @@ void WINAPI RtlReleaseActivationContext( HANDLE handle ) if ((actctx = check_actctx( handle ))) actctx_release( actctx ); } +/****************************************************************** + * RtlZombifyActivationContext (NTDLL.@) + * + * FIXME: function prototype might be wrong + */ +NTSTATUS WINAPI RtlZombifyActivationContext( HANDLE handle ) +{ + FIXME("%p: stub\n", handle); + return STATUS_NOT_IMPLEMENTED; +} /****************************************************************** * RtlActivateActivationContext (NTDLL.@) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index dbef513..cb120da 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -934,7 +934,7 @@ @ stdcall RtlWriteRegistryValue(long ptr ptr long ptr long) @ stub RtlZeroHeap @ stdcall RtlZeroMemory(ptr long) -# @ stub RtlZombifyActivationContext +@ stdcall RtlZombifyActivationContext(ptr) # @ stub RtlpApplyLengthFunction # @ stub RtlpEnsureBufferSize # @ stub RtlpNotOwnerCriticalSection diff --git a/include/winternl.h b/include/winternl.h index 41ba0a0..bb7a381 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2540,6 +2540,7 @@ NTSYSAPI NTSTATUS WINAPI RtlWalkHeap(HANDLE,PVOID); NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirection(BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx(ULONG,ULONG*); NTSYSAPI NTSTATUS WINAPI RtlWriteRegistryValue(ULONG,PCWSTR,PCWSTR,ULONG,PVOID,ULONG); +NTSYSAPI NTSTATUS WINAPI RtlZombifyActivationContext(HANDLE); NTSYSAPI NTSTATUS WINAPI RtlpNtCreateKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG,const UNICODE_STRING*,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI RtlpNtEnumerateSubKey(HANDLE,UNICODE_STRING *, ULONG); NTSYSAPI NTSTATUS WINAPI RtlpWaitForCriticalSection(RTL_CRITICAL_SECTION *);

1 0

Nikolay Sivov : kernel32/tests: Some tests for clrClass data.
by Alexandre Julliard Sept. 3, 2013

Sept. 3, 2013

Module: wine Branch: master Commit: d0deaaa8ce7e1bd7044371350ed228e36d12741c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0deaaa8ce7e1bd7044371350… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 2 11:08:09 2013 +0400 kernel32/tests: Some tests for clrClass data. --- dlls/kernel32/tests/actctx.c | 81 +++++++++++++++++++++++++++++++++++++---- dlls/ntdll/actctx.c | 7 ++-- 2 files changed, 77 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d0deaaa8ce7e1bd704437…

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 Sept. 3, 2013

Sept. 3, 2013

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

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 Sept. 3, 2013

Sept. 3, 2013

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: Basic COM cleanup for the IAVIStream iface.
by Alexandre Julliard Sept. 3, 2013

Sept. 3, 2013

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

André Hentschel : winedev: Use autoconf to update the configure script.
by Alexandre Julliard Sept. 3, 2013

Sept. 3, 2013

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: Minor updates to the windowing chapter.
by Alexandre Julliard Sept. 3, 2013

Sept. 3, 2013

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 Sept. 3, 2013

Sept. 3, 2013

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

André Hentschel : winelib: Add some notes about the interactive mode in winemaker.
by Alexandre Julliard Sept. 3, 2013

Sept. 3, 2013

Module: docs Branch: master Commit: 1c8d317d4478d0965e694cece2da795b58c15003 URL: http://source.winehq.org/git/docs.git/?a=commit;h=1c8d317d4478d0965e694cece… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Sep 2 22:13:53 2013 +0200 winelib: Add some notes about the interactive mode in winemaker. --- en/winelib-toolkit.sgml | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/en/winelib-toolkit.sgml b/en/winelib-toolkit.sgml index 040f243..8180d49 100644 --- a/en/winelib-toolkit.sgml +++ b/en/winelib-toolkit.sgml @@ -202,10 +202,16 @@ <sect2 id="interactive"> <title id="interactive.title">The interactive mode</title> <para> - what is it, - when to use it, - how to use it + The interactive mode will ask you to confirm or change options + while winemaker analyzes your code. This might be useful when + compiling MFC or in case you need different settings for each + project / target. You should consider adding more options to + the following example: </para> + <screen> + <prompt>$ </prompt><userinput>winemaker --interactive .</userinput> + <prompt>$ </prompt><userinput>make</userinput> + </screen> </sect2> <sect2 id="Makefile">

1 0

Frédéric Delanoy : winedev: Use 'wpid' where appropriate.
by Alexandre Julliard Sept. 3, 2013

Sept. 3, 2013

Module: docs Branch: master Commit: 6f1ef46bb486aedaad33ebf6e49bd302c909cbd4 URL: http://source.winehq.org/git/docs.git/?a=commit;h=6f1ef46bb486aedaad33ebf6e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Sep 2 14:18:04 2013 +0200 winedev: Use 'wpid' where appropriate. --- en/winedev-debugger.sgml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/en/winedev-debugger.sgml b/en/winedev-debugger.sgml index f73d473..e62bcab 100644 --- a/en/winedev-debugger.sgml +++ b/en/winedev-debugger.sgml @@ -2214,7 +2214,7 @@ set $BreakAllThreadsStartup = 1 <entry><command>info map</command> <replaceable>N</replaceable></entry> <entry> lists all virtual mappings used by the program of - pid <replaceable>N</replaceable> + wpid <replaceable>N</replaceable> </entry> </row> <row> @@ -2512,10 +2512,10 @@ kdbg -r localhost:12345 wine <command>gdb</command>, repeat for all Wine processes: </para> <screen> -<prompt>(gdb) </prompt><userinput>attach <replaceable>PID</replaceable></userinput> +<prompt>(gdb) </prompt><userinput>attach <replaceable>wpid</replaceable></userinput> </screen> <para> - with <replaceable>PID</replaceable> being the process ID of one of + with <replaceable>wpid</replaceable> being the process ID of one of the Wine processes. Use </para> <screen>

1 0