January 2014 - Wine-Commits

Kevin Eaves : winemac: Restore the window title when the window style is changed.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 4a5f5e54b39086f711511c8917830ab90c9bc37a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a5f5e54b39086f711511c891… Author: Kevin Eaves <sevae(a)roadrunner.com> Date: Thu Oct 17 01:54:00 2013 -0700 winemac: Restore the window title when the window style is changed. (cherry picked from commit 771fcd894a62f53cb3862a9d97f28d2ce7c46a30) --- dlls/winemac.drv/cocoa_window.m | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 2afa223..f4926e2 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -639,6 +639,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif if (newStyle != currentStyle) { + NSString* title = [[[self title] copy] autorelease]; BOOL showingButtons = (currentStyle & (NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask)) != 0; BOOL shouldShowButtons = (newStyle & (NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask)) != 0; if (shouldShowButtons != showingButtons && !((newStyle ^ currentStyle) & NSClosableWindowMask)) @@ -652,6 +653,9 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif } [self setStyleMask:newStyle]; [self adjustFullScreenBehavior:[self collectionBehavior]]; + + if ([[self title] length] == 0 && [title length] > 0) + [self setTitle:title]; } [self adjustFeaturesForState];

1 0

Nikolay Sivov : kernel32: Added support for GET_MODULE_HANDLE_EX_FLAG_PIN.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: c4335b398a7e08998407aa6434c5ad3ce9821b3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4335b398a7e08998407aa643… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 15 10:20:31 2013 +0400 kernel32: Added support for GET_MODULE_HANDLE_EX_FLAG_PIN. (cherry picked from commit 9a6567d1a6161f331ae4e07f3bd2697875af3d74) --- dlls/kernel32/module.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 9913f1b..babc756 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -507,6 +507,7 @@ BOOL WINAPI GetModuleHandleExW( DWORD flags, LPCWSTR name, HMODULE *module ) NTSTATUS status = STATUS_SUCCESS; HMODULE ret; ULONG magic; + BOOL lock; if (!module) { @@ -515,8 +516,8 @@ BOOL WINAPI GetModuleHandleExW( DWORD flags, LPCWSTR name, HMODULE *module ) } /* if we are messing with the refcount, grab the loader lock */ - if ((flags & GET_MODULE_HANDLE_EX_FLAG_PIN) || - !(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) + lock = (flags & GET_MODULE_HANDLE_EX_FLAG_PIN) || !(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT); + if (lock) LdrLockLoaderLock( 0, NULL, &magic ); if (!name) @@ -538,14 +539,13 @@ BOOL WINAPI GetModuleHandleExW( DWORD flags, LPCWSTR name, HMODULE *module ) if (status == STATUS_SUCCESS) { if (flags & GET_MODULE_HANDLE_EX_FLAG_PIN) - FIXME( "should pin refcount for %p\n", ret ); + LdrAddRefDll( LDR_ADDREF_DLL_PIN, ret ); else if (!(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) LdrAddRefDll( 0, ret ); } else SetLastError( RtlNtStatusToDosError( status ) ); - if ((flags & GET_MODULE_HANDLE_EX_FLAG_PIN) || - !(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) + if (lock) LdrUnlockLoaderLock( 0, magic ); if (status == STATUS_SUCCESS) *module = ret;

1 0

Hans Leidekker : dnsapi: Perform a wide character string comparison if the character set is unknown.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 1a417c3c3c2c031d25588076cd784aae334a2d2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a417c3c3c2c031d25588076c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 14 15:56:30 2013 +0200 dnsapi: Perform a wide character string comparison if the character set is unknown. (cherry picked from commit 98c64a4be3350b977ae63ee72d54b5528940c9cc) --- dlls/dnsapi/record.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 3316f05..7882b22 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -131,12 +131,15 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) TRACE( "(%p,%p)\n", r1, r2 ); - if (r1->wType != r2->wType || - r1->wDataLength != r2->wDataLength || - r1->Flags.DW != r2->Flags.DW || - r1->dwReserved != r2->dwReserved) return FALSE; - - wide = r1->Flags.S.CharSet == DnsCharSetUnicode; + if (r1->wType != r2->wType || + r1->wDataLength != r2->wDataLength || + r1->Flags.S.Section != r2->Flags.S.Section || + r1->Flags.S.Delete != r2->Flags.S.Delete || + r1->Flags.S.Unused != r2->Flags.S.Unused || + r1->Flags.S.Reserved != r2->Flags.S.Reserved || + r1->dwReserved != r2->dwReserved) return FALSE; + + wide = (r1->Flags.S.CharSet == DnsCharSetUnicode || r1->Flags.S.CharSet == DnsCharSetUnknown); if (dns_strcmpX( r1->pName, r2->pName, wide )) return FALSE; switch (r1->wType)

1 0

Nikolay Sivov : ntdll: Support pinning module refcount with LdrAddRefDll() .
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: b11f882ec24f2a17f278ccb65669c927138739b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b11f882ec24f2a17f278ccb65… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 14 08:07:58 2013 +0400 ntdll: Support pinning module refcount with LdrAddRefDll(). (cherry picked from commit 146ff49161fb35095ae9ac6f4c40281cd8f748f4) --- dlls/ntdll/loader.c | 7 +++++-- include/winternl.h | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 9642f62..5c4121f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2130,13 +2130,16 @@ NTSTATUS WINAPI LdrAddRefDll( ULONG flags, HMODULE module ) NTSTATUS ret = STATUS_SUCCESS; WINE_MODREF *wm; - if (flags) FIXME( "%p flags %x not implemented\n", module, flags ); + if (flags & ~LDR_ADDREF_DLL_PIN) FIXME( "%p flags %x not implemented\n", module, flags ); RtlEnterCriticalSection( &loader_section ); if ((wm = get_modref( module ))) { - if (wm->ldr.LoadCount != -1) wm->ldr.LoadCount++; + if (flags & LDR_ADDREF_DLL_PIN) + wm->ldr.LoadCount = -1; + else + if (wm->ldr.LoadCount != -1) wm->ldr.LoadCount++; TRACE( "(%s) ldr.LoadCount: %d\n", debugstr_w(wm->ldr.BaseDllName.Buffer), wm->ldr.LoadCount ); } else ret = STATUS_INVALID_PARAMETER; diff --git a/include/winternl.h b/include/winternl.h index 2a0537c..85aec65 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1970,6 +1970,9 @@ typedef struct _LDR_MODULE #define LDR_DONT_RESOLVE_REFS 0x40000000 #define LDR_WINE_INTERNAL 0x80000000 +/* flag for LdrAddRefDll */ +#define LDR_ADDREF_DLL_PIN 0x00000001 + /* FIXME: to be checked */ #define MAXIMUM_FILENAME_LENGTH 256

1 0

Jacek Caban : mshtml: Added more traces to nsDocumentObserver_BindToDocument.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: c345023efe0c7e7927bee00f6dcbdde711cad4d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c345023efe0c7e7927bee00f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 10 16:27:58 2014 +0100 mshtml: Added more traces to nsDocumentObserver_BindToDocument. --- dlls/mshtml/mutation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 7eb53d3..23b37b5 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -642,7 +642,7 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, nsIDOMElement *nselem; nsresult nsres; - TRACE("(%p)\n", This); + TRACE("(%p)->(%p %p)\n", This, aDocument, aContent); nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMElement, (void**)&nselem); if(NS_SUCCEEDED(nsres)) {

1 0

Hans Leidekker : advapi32: Don' t shadow keychain_item in mac_write_credential.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: 8953c74e349928a5c81d3cea9ffe264c81c3ab65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8953c74e349928a5c81d3cea9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 10 16:51:24 2014 +0100 advapi32: Don't shadow keychain_item in mac_write_credential. --- dlls/advapi32/cred.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 218c84f..b806019 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -580,8 +580,6 @@ static DWORD mac_write_credential(const CREDENTIALW *credential, BOOL preserve_b ERR("SecKeychainAddInternetPassword returned %ld\n", status); if (status == errSecDuplicateItem) { - SecKeychainItemRef keychain_item; - status = SecKeychainFindInternetPassword(NULL, strlen(servername), servername, domain ? strlen(domain) : 0, domain, strlen(username), username,

1 0

Stefan Dösinger : wined3d: Load surfaces into map binding memory on unload.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: badf3d8db77aa3db21d2bd41b05b730dd31c65ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=badf3d8db77aa3db21d2bd41b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 10 12:40:46 2014 +0100 wined3d: Load surfaces into map binding memory on unload. A surface can stay in DIB or user memory just fine. When buffers get their own location an exception for them has to be added. --- dlls/wined3d/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6e15c00..19ae138 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1369,7 +1369,7 @@ static void surface_unload(struct wined3d_resource *resource) if (!(surface->flags & SFLAG_PBO)) { surface_init_sysmem(surface); - surface_validate_location(surface, SFLAG_INSYSMEM); + surface_validate_location(surface, surface->map_binding); } /* We also get here when the ddraw swapchain is destroyed, for example * for a mode switch. In this case this surface won't necessarily be @@ -1379,9 +1379,9 @@ static void surface_unload(struct wined3d_resource *resource) } else { - surface_load_location(surface, SFLAG_INSYSMEM); + surface_load_location(surface, surface->map_binding); } - surface_invalidate_location(surface, ~SFLAG_INSYSMEM); + surface_invalidate_location(surface, ~surface->map_binding); surface->flags &= ~(SFLAG_ALLOCATED | SFLAG_SRGBALLOCATED); context = context_acquire(device, NULL);

1 0

Stefan Dösinger : wined3d: Give user memory its own location.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: 965d00f4b69ddeb7b36a82e0ea402c40247da182 URL: http://source.winehq.org/git/wine.git/?a=commit;h=965d00f4b69ddeb7b36a82e0e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 10 12:40:47 2014 +0100 wined3d: Give user memory its own location. --- dlls/wined3d/surface.c | 64 +++++++++++++++++++++++++--------------- dlls/wined3d/utils.c | 3 +- dlls/wined3d/wined3d_private.h | 14 +++++---- 3 files changed, 50 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=965d00f4b69ddeb7b36a8…

1 0

Francois Gouget : d3dx9_36/tests: Fix compilation on systems that don' t have NAN (Solaris).
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: d3cf4ff56976222d98cde7d4d736186a218cd8bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3cf4ff56976222d98cde7d4d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 10 15:33:06 2014 +0100 d3dx9_36/tests: Fix compilation on systems that don't have NAN (Solaris). --- dlls/d3dx9_36/tests/mesh.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 21c3b41..47a1b1f 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -26,6 +26,16 @@ #include "wine/test.h" #include "d3dx9.h" +#ifndef NAN +/* From wine/port.h */ +static inline float __port_nan(void) +{ + static const unsigned __nan_bytes = 0x7fc00000; + return *(const float *)&__nan_bytes; +} +#define NAN __port_nan() +#endif + /* Set the WINETEST_DEBUG environment variable to be greater than 1 for verbose * function call traces of ID3DXAllocateHierarchy callbacks. */ #define TRACECALLBACK if(winetest_debug > 1) trace

1 0

Francois Gouget : ws2_32/tests: Add a trailing '\n' to a win_skip() call.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: e8e97f165dec4aef18190e3be67111d387f78203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8e97f165dec4aef18190e3be… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 10 15:18:48 2014 +0100 ws2_32/tests: Add a trailing '\n' to a win_skip() call. --- dlls/ws2_32/tests/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f8dc5a5..0abf732 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7356,7 +7356,7 @@ static void test_WSALookupService(void) if (!pWSALookupServiceBeginW || !pWSALookupServiceEnd || !pWSALookupServiceNextW) { - win_skip("WSALookupServiceBeginW or WSALookupServiceEnd or WSALookupServiceNextW not found"); + win_skip("WSALookupServiceBeginW or WSALookupServiceEnd or WSALookupServiceNextW not found\n"); return; }

1 0