wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

Andrew Eikum : advapi32: Attempt to open WOW64 key before the lowest level key, too.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 151c003c22d28cc809d4e1d4b2d3bb437769dad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=151c003c22d28cc809d4e1d4b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 4 09:44:21 2013 -0500 advapi32: Attempt to open WOW64 key before the lowest level key, too. Without this, we'll fail to open the correct key for e.g. <Machine\Software\Classes> with KEY_WOW64_32KEY, which should resolve to <Machine\Software\Wow6432Node\Classes>. (cherry picked from commit 8cb7f877d7406065074183ae8541355f0090e6db) --- dlls/advapi32/registry.c | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index c01e125..9012254 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -140,10 +140,9 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES if (i == len && !force_wow32) return status; attrs = attr->Attributes; - attr->Attributes &= ~OBJ_OPENLINK; attr->ObjectName = &str; - while (i < len) + for (;;) { str.Buffer = buffer + pos; str.Length = (i - pos) * sizeof(WCHAR); @@ -157,20 +156,25 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES force_wow32 = FALSE; } } - status = NtCreateKey( &subkey, access, attr, 0, class, - options & ~REG_OPTION_CREATE_LINK, dispos ); + if (i == len) + { + attr->Attributes = attrs; + status = NtCreateKey( (PHANDLE)retkey, access, attr, 0, class, options, dispos ); + } + else + { + attr->Attributes = attrs & ~OBJ_OPENLINK; + status = NtCreateKey( &subkey, access, attr, 0, class, + options & ~REG_OPTION_CREATE_LINK, dispos ); + } if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); if (status) return status; + if (i == len) break; attr->RootDirectory = subkey; while (i < len && buffer[i] == '\\') i++; pos = i; while (i < len && buffer[i] != '\\') i++; } - str.Buffer = buffer + pos; - str.Length = (i - pos) * sizeof(WCHAR); - attr->Attributes = attrs; - status = NtCreateKey( (PHANDLE)retkey, access, attr, 0, class, options, dispos ); - if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); } return status; } @@ -190,10 +194,9 @@ static NTSTATUS open_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *a if (len && buffer[0] == '\\') return STATUS_OBJECT_PATH_INVALID; while (i < len && buffer[i] != '\\') i++; attrs = attr->Attributes; - attr->Attributes &= ~OBJ_OPENLINK; attr->ObjectName = &str; - while (i < len) + for (;;) { str.Buffer = buffer + pos; str.Length = (i - pos) * sizeof(WCHAR); @@ -207,21 +210,25 @@ static NTSTATUS open_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *a force_wow32 = FALSE; } } - status = NtOpenKey( &subkey, access, attr ); + if (i == len) + { + attr->Attributes = attrs; + status = NtOpenKey( (PHANDLE)retkey, access, attr ); + } + else + { + attr->Attributes = attrs & ~OBJ_OPENLINK; + status = NtOpenKey( &subkey, access, attr ); + } if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); if (status) return status; + if (i == len) break; attr->RootDirectory = subkey; while (i < len && buffer[i] == '\\') i++; pos = i; while (i < len && buffer[i] != '\\') i++; } - str.Buffer = buffer + pos; - str.Length = (i - pos) * sizeof(WCHAR); - attr->Attributes = attrs; - status = NtOpenKey( (PHANDLE)retkey, access, attr ); - if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); return status; - } /* create one of the HKEY_* special root keys */

1 0

Nikolay Sivov : kernel32: Added support for GET_MODULE_HANDLE_EX_FLAG_PIN.
by Alexandre Julliard 10 Jan '14

10 Jan '14

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

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

10 Jan '14

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

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

10 Jan '14

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

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

10 Jan '14

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

Hans Leidekker : advapi32: PP_USE_HARDWARE_RNG is a parameter, not a flag.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 2722c451732f83f4569d603fd8cf71bc65be54f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2722c451732f83f4569d603fd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 10 16:50:40 2014 +0100 advapi32: PP_USE_HARDWARE_RNG is a parameter, not a flag. --- dlls/advapi32/crypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index d6454ea..2c5e411 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -2172,7 +2172,7 @@ BOOL WINAPI CryptSetProvParam (HCRYPTPROV hProv, DWORD dwParam, const BYTE *pbDa SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - if (dwFlags & PP_USE_HARDWARE_RNG) + if (dwParam == PP_USE_HARDWARE_RNG) { FIXME("PP_USE_HARDWARE_RNG: What do I do with this?\n"); FIXME("\tLetting the CSP decide.\n");

1 0

Jacek Caban : mshtml: Added more traces to nsDocumentObserver_BindToDocument.
by Alexandre Julliard 10 Jan '14

10 Jan '14

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

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

10 Jan '14

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

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

10 Jan '14

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

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

10 Jan '14

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

← Newer
1
...
51
52
53
54
55
56
57
...
82
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 January 2014