January 2014 - Wine-Commits

Piotr Caban : comctl32: Fix UDM_SETPOS behavior on out of range values.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 6b8ecd8fd51672e5366700b4193e0cf6c167e758 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b8ecd8fd51672e5366700b41… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 16 16:34:39 2013 +0200 comctl32: Fix UDM_SETPOS behavior on out of range values. (cherry picked from commit ac31df438acf325fa10ab0cc6e2683e16f81d5ae) --- dlls/comctl32/updown.c | 49 +++++++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index a42b40f..2373031 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -482,6 +482,32 @@ static LRESULT UPDOWN_KeyPressed(UPDOWN_INFO *infoPtr, int key) return 0; } +static int UPDOWN_SetPos(UPDOWN_INFO *infoPtr, int pos) +{ + int ret = infoPtr->CurVal; + + if(!UPDOWN_InBounds(infoPtr, pos)) { + if((infoPtr->MinVal < infoPtr->MaxVal && pos < infoPtr->MinVal) + || (infoPtr->MinVal > infoPtr->MaxVal && pos > infoPtr->MinVal)) + pos = infoPtr->MinVal; + else + pos = infoPtr->MaxVal; + } + + infoPtr->CurVal = pos; + UPDOWN_SetBuddyInt(infoPtr); + + if(!UPDOWN_InBounds(infoPtr, ret)) { + if((infoPtr->MinVal < infoPtr->MaxVal && ret < infoPtr->MinVal) + || (infoPtr->MinVal > infoPtr->MaxVal && ret > infoPtr->MinVal)) + ret = infoPtr->MinVal; + else + ret = infoPtr->MaxVal; + } + return ret; +} + + /*********************************************************************** * UPDOWN_SetRange * @@ -1069,17 +1095,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L } case UDM_SETPOS: { - int temp = (short)LOWORD(lParam); - - TRACE("UpDown Ctrl new value(%d), hwnd=%p\n", temp, hwnd); - if(!UPDOWN_InBounds(infoPtr, temp)) { - if(temp < infoPtr->MinVal) temp = infoPtr->MinVal; - if(temp > infoPtr->MaxVal) temp = infoPtr->MaxVal; - } - wParam = infoPtr->CurVal; - infoPtr->CurVal = temp; - UPDOWN_SetBuddyInt (infoPtr); - return wParam; /* return prev value */ + return UPDOWN_SetPos(infoPtr, (short)LOWORD(lParam)); } case UDM_GETRANGE: return MAKELONG(infoPtr->MaxVal, infoPtr->MinVal); @@ -1109,16 +1125,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L } case UDM_SETPOS32: { - int temp; - - if(!UPDOWN_InBounds(infoPtr, (int)lParam)) { - if((int)lParam < infoPtr->MinVal) lParam = infoPtr->MinVal; - if((int)lParam > infoPtr->MaxVal) lParam = infoPtr->MaxVal; - } - temp = infoPtr->CurVal; /* save prev value */ - infoPtr->CurVal = (int)lParam; /* set the new value */ - UPDOWN_SetBuddyInt (infoPtr); - return temp; /* return prev value */ + return UPDOWN_SetPos(infoPtr, (int)lParam); } case UDM_GETUNICODEFORMAT: /* we lie a bit here, we're always using Unicode internally */

1 0

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

Jan. 10, 2014

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

Kohei Takahashi : msi: Return -1 on open failure in FDI callbacks.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 96501bd4bc1a8906ce98a033b1c074a1edddfbc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96501bd4bc1a8906ce98a033b… Author: Kohei Takahashi <flast(a)flast.jp> Date: Wed Oct 16 01:08:38 2013 +0900 msi: Return -1 on open failure in FDI callbacks. (cherry picked from commit 953359c73f5c609132e6d7caea0947d164a3d4b4) --- dlls/msi/media.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index d97f4bd..8646069 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -137,7 +137,6 @@ static void CDECL cabinet_free(void *pv) static INT_PTR CDECL cabinet_open(char *pszFile, int oflag, int pmode) { - HANDLE handle; DWORD dwAccess = 0; DWORD dwShareMode = 0; DWORD dwCreateDisposition = OPEN_EXISTING; @@ -163,12 +162,8 @@ static INT_PTR CDECL cabinet_open(char *pszFile, int oflag, int pmode) else if (oflag & _O_CREAT) dwCreateDisposition = CREATE_ALWAYS; - handle = CreateFileA(pszFile, dwAccess, dwShareMode, NULL, - dwCreateDisposition, 0, NULL); - if (handle == INVALID_HANDLE_VALUE) - return 0; - - return (INT_PTR)handle; + return (INT_PTR)CreateFileA(pszFile, dwAccess, dwShareMode, NULL, + dwCreateDisposition, 0, NULL); } static UINT CDECL cabinet_read(INT_PTR hf, void *pv, UINT cb) @@ -225,12 +220,12 @@ static INT_PTR CDECL cabinet_open_stream( char *pszFile, int oflag, int pmode ) if (!cab) { WARN("failed to get cabinet stream\n"); - return 0; + return -1; } if (!cab->stream[0] || !(encoded = encode_streamname( FALSE, cab->stream + 1 ))) { WARN("failed to encode stream name\n"); - return 0; + return -1; } if (msi_clone_open_stream( package_disk.package->db, cab->storage, encoded, &stream ) != ERROR_SUCCESS) { @@ -239,7 +234,7 @@ static INT_PTR CDECL cabinet_open_stream( char *pszFile, int oflag, int pmode ) { WARN("failed to open stream 0x%08x\n", hr); msi_free( encoded ); - return 0; + return -1; } } msi_free( encoded );

1 0

Andrew Eikum : oleaut32: For 64-bit, fallback on the win32 key if win64 key is empty for typelibs.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 00b459a9e5a3c292f422b24a4804948b942d2bb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00b459a9e5a3c292f422b24a4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 16 08:21:13 2013 -0500 oleaut32: For 64-bit, fallback on the win32 key if win64 key is empty for typelibs. (cherry picked from commit a8ebda980122423008e47d728a776bb408536f1c) --- dlls/oleaut32/tmarshal.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 2324fbb..3856f32 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -303,8 +303,16 @@ _get_typeinfo_for_iid(REFIID riid, ITypeInfo**ti) { sprintf(typelibkey,"Typelib\\%s\\%s\\0\\win%u",tlguid,ver,(sizeof(void*) == 8) ? 64 : 32); tlfnlen = sizeof(tlfn); if (RegQueryValueA(HKEY_CLASSES_ROOT,typelibkey,tlfn,&tlfnlen)) { - ERR("Could not get typelib fn?\n"); - return E_FAIL; +#ifdef _WIN64 + sprintf(typelibkey,"Typelib\\%s\\%s\\0\\win32",tlguid,ver); + tlfnlen = sizeof(tlfn); + if (RegQueryValueA(HKEY_CLASSES_ROOT,typelibkey,tlfn,&tlfnlen)) { +#endif + ERR("Could not get typelib fn?\n"); + return E_FAIL; +#ifdef _WIN64 + } +#endif } MultiByteToWideChar(CP_ACP, 0, tlfn, -1, tlfnW, sizeof(tlfnW) / sizeof(tlfnW[0])); hres = LoadTypeLib(tlfnW,&tl);

1 0

Piotr Caban : comctl32: Set updown control value to min or max in out of range case.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 57a8e345fc0d629410ab159089ae65ffdbb1e92b URL: http://source.winehq.org/git/wine.git/?a=commit;h=57a8e345fc0d629410ab15908… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 16 16:34:19 2013 +0200 comctl32: Set updown control value to min or max in out of range case. (cherry picked from commit e6fce2de4ad783cf21318128f950eae2f28a6914) --- dlls/comctl32/updown.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 390f829..a42b40f 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -150,11 +150,16 @@ static BOOL UPDOWN_OffsetVal(UPDOWN_INFO *infoPtr, int delta) (infoPtr->MaxVal < infoPtr->MinVal ? -1 : 1) * (infoPtr->MinVal - infoPtr->MaxVal) + (delta < 0 ? 1 : -1); - } else return FALSE; + } if ((infoPtr->MaxVal > infoPtr->MinVal && infoPtr->CurVal+delta > infoPtr->MaxVal) + || (infoPtr->MaxVal < infoPtr->MinVal && infoPtr->CurVal+delta < infoPtr->MaxVal)) { + delta = infoPtr->MaxVal - infoPtr->CurVal; + } else { + delta = infoPtr->MinVal - infoPtr->CurVal; + } } infoPtr->CurVal += delta; - return TRUE; + return delta != 0; } /***********************************************************************

1 0

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

Stefan Dösinger : wined3d: Move location flag updating out of surface_init_sysmem.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: 18bf8b49b38709e39d4ccd4d60bbb98c49adc083 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18bf8b49b38709e39d4ccd4d6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 10 12:40:45 2014 +0100 wined3d: Move location flag updating out of surface_init_sysmem. --- dlls/wined3d/surface.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ee07e19..6e15c00 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1341,9 +1341,6 @@ static BOOL surface_init_sysmem(struct wined3d_surface *surface) surface->resource.allocatedMemory = surface->resource.heap_memory; } - surface_validate_location(surface, SFLAG_INSYSMEM); - surface_invalidate_location(surface, ~SFLAG_INSYSMEM); - return TRUE; } @@ -1370,7 +1367,10 @@ static void surface_unload(struct wined3d_resource *resource) * and all flags get lost */ if (!(surface->flags & SFLAG_PBO)) + { surface_init_sysmem(surface); + surface_validate_location(surface, SFLAG_INSYSMEM); + } /* 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 * an implicit surface. We have to mark it lost so that the @@ -2784,11 +2784,12 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, return hr; } surface->resource.allocatedMemory = surface->dib.bitmap_data; - surface->flags |= SFLAG_INSYSMEM; } else if (!surface_init_sysmem(surface)) return E_OUTOFMEMORY; + surface_validate_location(surface, SFLAG_INSYSMEM); + return WINED3D_OK; }

1 0

Stefan Dösinger : wined3d: Mark the map binding up to date in texture2d_sub_resource_add_dirty_region.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: c770d3f5732880f1f3c7adabb939487451e5e608 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c770d3f5732880f1f3c7adabb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 10 12:40:44 2014 +0100 wined3d: Mark the map binding up to date in texture2d_sub_resource_add_dirty_region. --- dlls/wined3d/texture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0d6b974..f06db6d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -735,8 +735,8 @@ static void texture2d_sub_resource_add_dirty_region(struct wined3d_resource *sub { struct wined3d_surface *surface = surface_from_resource(sub_resource); - surface_load_location(surface, SFLAG_INSYSMEM); - surface_invalidate_location(surface, ~SFLAG_INSYSMEM); + surface_load_location(surface, surface->map_binding); + surface_invalidate_location(surface, ~surface->map_binding); } static void texture2d_sub_resource_cleanup(struct wined3d_resource *sub_resource)

1 0

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

Jan. 10, 2014

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

Stefan Dösinger : wined3d: Use the map binding for RGB<->sRGB loads.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: 1b561e815ef3eec2f6b131d11fd96d8f5f73510a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b561e815ef3eec2f6b131d11… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 10 12:40:43 2014 +0100 wined3d: Use the map binding for RGB<->sRGB loads. --- dlls/wined3d/surface.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 45c3663..ee07e19 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5003,20 +5003,20 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, if (srgb) { - if ((surface->flags & (SFLAG_INTEXTURE | SFLAG_INSYSMEM)) == SFLAG_INTEXTURE) + if ((surface->flags & (SFLAG_INTEXTURE | surface->map_binding)) == SFLAG_INTEXTURE) { /* Performance warning... */ FIXME("Downloading RGB surface %p to reload it as sRGB.\n", surface); - surface_load_location(surface, SFLAG_INSYSMEM); + surface_load_location(surface, surface->map_binding); } } else { - if ((surface->flags & (SFLAG_INSRGBTEX | SFLAG_INSYSMEM)) == SFLAG_INSRGBTEX) + if ((surface->flags & (SFLAG_INSRGBTEX | surface->map_binding)) == SFLAG_INSRGBTEX) { /* Performance warning... */ FIXME("Downloading sRGB surface %p to reload it as RGB.\n", surface); - surface_load_location(surface, SFLAG_INSYSMEM); + surface_load_location(surface, surface->map_binding); } }

1 0

Dmitry Timoshkov : advapi32/tests: Add access tests for a process.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: 615319ebd025cb2c09fefe321b522c458bf2dd91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=615319ebd025cb2c09fefe321… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 10 18:26:20 2014 +0900 advapi32/tests: Add access tests for a process. --- dlls/advapi32/tests/security.c | 79 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 034cf23..2efe80e 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -35,8 +35,13 @@ #include "wine/test.h" +#ifndef PROCESS_QUERY_LIMITED_INFORMATION +#define PROCESS_QUERY_LIMITED_INFORMATION 0x1000 +#endif + /* PROCESS_ALL_ACCESS in Vista+ PSDKs is incompatible with older Windows versions */ #define PROCESS_ALL_ACCESS_NT4 (PROCESS_ALL_ACCESS & ~0xf000) +#define PROCESS_ALL_ACCESS_VISTA (PROCESS_ALL_ACCESS | 0xf000) #ifndef EVENT_QUERY_STATE #define EVENT_QUERY_STATE 0x0001 @@ -5022,6 +5027,79 @@ todo_wine CloseHandle(thread); } +static void test_process_access(void) +{ + DWORD ret, i, access; + HANDLE process, dup; + STARTUPINFOA sti; + PROCESS_INFORMATION pi; + char cmdline[] = "winver.exe"; + static const struct + { + int generic, mapped; + } map[] = + { + { 0, 0 }, + { GENERIC_READ, STANDARD_RIGHTS_READ | PROCESS_QUERY_INFORMATION | PROCESS_VM_READ }, + { GENERIC_WRITE, STANDARD_RIGHTS_WRITE | PROCESS_SET_QUOTA | PROCESS_SET_INFORMATION | PROCESS_SUSPEND_RESUME | + PROCESS_VM_WRITE | PROCESS_DUP_HANDLE | PROCESS_CREATE_PROCESS | PROCESS_CREATE_THREAD | PROCESS_VM_OPERATION }, + { GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE }, + { GENERIC_ALL, PROCESS_ALL_ACCESS_NT4 } + }; + + memset(&sti, 0, sizeof(sti)); + sti.cb = sizeof(sti); + SetLastError(0xdeadbeef); + ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &sti, &pi); + ok(ret, "CreateProcess() error %d\n", GetLastError()); + + CloseHandle(pi.hThread); + process = pi.hProcess; + + access = get_obj_access(process); + ok(access == PROCESS_ALL_ACCESS_NT4 || access == PROCESS_ALL_ACCESS_VISTA, "expected PROCESS_ALL_ACCESS, got %#x\n", access); + + for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) + { + SetLastError( 0xdeadbeef ); + ret = DuplicateHandle(GetCurrentProcess(), process, GetCurrentProcess(), &dup, + map[i].generic, FALSE, 0); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + + access = get_obj_access(dup); + switch (map[i].generic) + { + case GENERIC_READ: +todo_wine + ok(access == map[i].mapped || access == (map[i].mapped | PROCESS_QUERY_LIMITED_INFORMATION) /* Vista+ */, + "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + case GENERIC_WRITE: +todo_wine + ok(access == map[i].mapped || access == (map[i].mapped | PROCESS_TERMINATE) /* before Vista */, + "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + case GENERIC_EXECUTE: +todo_wine + ok(access == map[i].mapped || access == (map[i].mapped | PROCESS_QUERY_LIMITED_INFORMATION | PROCESS_TERMINATE) /* Vista+ */, + "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + case GENERIC_ALL: + ok(access == map[i].mapped || access == PROCESS_ALL_ACCESS_VISTA, + "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + default: + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + } + + CloseHandle(dup); + } + + TerminateProcess(process, 0); + CloseHandle(process); +} + static BOOL validate_impersonation_token(HANDLE token, DWORD *token_type) { DWORD ret, needed; @@ -5099,6 +5177,7 @@ static void test_kernel_objects_security(void) test_file_security(token); test_filemap_security(); test_thread_security(); + test_process_access(); /* FIXME: test other kernel object types */ CloseHandle(process_token);

1 0

Jacek Caban : mshtml: Fixed double release in NPP_New.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: 519166a4482e22a6bbe584b2acb8c488cd3b22e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=519166a4482e22a6bbe584b2a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 10 16:22:17 2014 +0100 mshtml: Fixed double release in NPP_New. --- dlls/mshtml/npplugin.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index e681568..57bb772 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -671,7 +671,6 @@ static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, I HRESULT hres; hres = create_plugin_host(window->doc, nselem, obj, &clsid, &host); - nsIDOMElement_Release(nselem); IUnknown_Release(obj); if(SUCCEEDED(hres)) instance->pdata = host;

1 0

Dmitry Timoshkov : advapi32/tests: Add more file access tests, add access tests for a directory.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: fa0b745d3fef0e2962d84e256a68c9022e072d05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa0b745d3fef0e2962d84e256… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 10 18:26:06 2014 +0900 advapi32/tests: Add more file access tests, add access tests for a directory. --- dlls/advapi32/tests/security.c | 81 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 80 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index df02d85..274aee7 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4776,7 +4776,7 @@ todo_wine static void test_file_security(HANDLE token) { - DWORD ret, i, access; + DWORD ret, i, access, bytes; HANDLE file, dup; static const struct { @@ -4791,10 +4791,12 @@ static void test_file_security(HANDLE token) }; char temp_path[MAX_PATH]; char file_name[MAX_PATH]; + char buf[16]; GetTempPathA(MAX_PATH, temp_path); GetTempFileNameA(temp_path, "tmp", 0, file_name); + /* file */ SetLastError(0xdeadbeef); file = CreateFileA(file_name, GENERIC_ALL, 0, NULL, CREATE_ALWAYS, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); @@ -4816,7 +4818,84 @@ static void test_file_security(HANDLE token) } CloseHandle(file); + + SetLastError(0xdeadbeef); + file = CreateFileA(file_name, 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + + access = get_obj_access(file); +todo_wine + ok(access == (FILE_READ_ATTRIBUTES | SYNCHRONIZE), "expected FILE_READ_ATTRIBUTES | SYNCHRONIZE, got %#x\n", access); + + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(file, buf, sizeof(buf), &bytes, NULL); + ok(!ret, "ReadFile should fail\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + ok(bytes == 0, "expected 0, got %u\n", bytes); + + CloseHandle(file); + + SetLastError(0xdeadbeef); + file = CreateFileA(file_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + + access = get_obj_access(file); +todo_wine + ok(access == (FILE_GENERIC_WRITE | FILE_READ_ATTRIBUTES), "expected FILE_GENERIC_WRITE | FILE_READ_ATTRIBUTES, got %#x\n", access); + + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(file, buf, sizeof(buf), &bytes, NULL); + ok(!ret, "ReadFile should fail\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + ok(bytes == 0, "expected 0, got %u\n", bytes); + + CloseHandle(file); DeleteFileA(file_name); + + /* directory */ + SetLastError(0xdeadbeef); + file = CreateFileA(temp_path, GENERIC_ALL, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + + access = get_obj_access(file); + ok(access == FILE_ALL_ACCESS, "expected FILE_ALL_ACCESS, got %#x\n", access); + + for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) + { + SetLastError( 0xdeadbeef ); + ret = DuplicateHandle(GetCurrentProcess(), file, GetCurrentProcess(), &dup, + map[i].generic, FALSE, 0); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + + access = get_obj_access(dup); + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + + CloseHandle(dup); + } + + CloseHandle(file); + + SetLastError(0xdeadbeef); + file = CreateFileA(temp_path, 0, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + + access = get_obj_access(file); +todo_wine + ok(access == (FILE_READ_ATTRIBUTES | SYNCHRONIZE), "expected FILE_READ_ATTRIBUTES | SYNCHRONIZE, got %#x\n", access); + + CloseHandle(file); + + SetLastError(0xdeadbeef); + file = CreateFileA(temp_path, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + + access = get_obj_access(file); +todo_wine + ok(access == (FILE_GENERIC_WRITE | FILE_READ_ATTRIBUTES), "expected FILE_GENERIC_WRITE | FILE_READ_ATTRIBUTES, got %#x\n", access); + + CloseHandle(file); } static BOOL validate_impersonation_token(HANDLE token, DWORD *token_type)

1 0

Dmitry Timoshkov : advapi32/tests: Add access tests for a thread.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: eb96f7a5a3752843f5ad4308c741e2f518979768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb96f7a5a3752843f5ad4308c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 10 18:26:16 2014 +0900 advapi32/tests: Add access tests for a thread. --- dlls/advapi32/tests/security.c | 73 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index e6ae638..034cf23 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -46,6 +46,14 @@ #define SEMAPHORE_QUERY_STATE 0x0001 #endif +#ifndef THREAD_SET_LIMITED_INFORMATION +#define THREAD_SET_LIMITED_INFORMATION 0x0400 +#define THREAD_QUERY_LIMITED_INFORMATION 0x0800 +#endif + +#define THREAD_ALL_ACCESS_NT4 (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x3ff) +#define THREAD_ALL_ACCESS_VISTA (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0xffff) + /* copied from Wine winternl.h - not included in the Windows SDK */ typedef enum _OBJECT_INFORMATION_CLASS { ObjectBasicInformation, @@ -4950,6 +4958,70 @@ todo_wine CloseHandle(mapping); } +static void test_thread_security(void) +{ + DWORD ret, i, access; + HANDLE thread, dup; + static const struct + { + int generic, mapped; + } map[] = + { + { 0, 0 }, + { GENERIC_READ, STANDARD_RIGHTS_READ | THREAD_QUERY_INFORMATION | THREAD_GET_CONTEXT }, + { GENERIC_WRITE, STANDARD_RIGHTS_WRITE | THREAD_SET_INFORMATION | THREAD_SET_CONTEXT | THREAD_TERMINATE | THREAD_SUSPEND_RESUME | 0x4 }, + { GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE }, + { GENERIC_ALL, THREAD_ALL_ACCESS_NT4 } + }; + + SetLastError(0xdeadbeef); + thread = CreateThread(NULL, 0, (void *)0xdeadbeef, NULL, CREATE_SUSPENDED, &ret); + ok(thread != 0, "CreateThread error %d\n", GetLastError()); + + access = get_obj_access(thread); + ok(access == THREAD_ALL_ACCESS_NT4 || access == THREAD_ALL_ACCESS_VISTA, "expected THREAD_ALL_ACCESS, got %#x\n", access); + + for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) + { + SetLastError( 0xdeadbeef ); + ret = DuplicateHandle(GetCurrentProcess(), thread, GetCurrentProcess(), &dup, + map[i].generic, FALSE, 0); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + + access = get_obj_access(dup); + switch (map[i].generic) + { + case GENERIC_READ: +todo_wine + ok(access == map[i].mapped || access == (map[i].mapped | THREAD_QUERY_LIMITED_INFORMATION) /* Vista+ */, + "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + case GENERIC_WRITE: +todo_wine + ok(access == map[i].mapped || access == (map[i].mapped | THREAD_SET_LIMITED_INFORMATION) /* Vista+ */, + "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + case GENERIC_EXECUTE: +todo_wine + ok(access == map[i].mapped || access == (map[i].mapped | THREAD_QUERY_LIMITED_INFORMATION) /* Vista+ */, + "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + case GENERIC_ALL: + ok(access == map[i].mapped || access == THREAD_ALL_ACCESS_VISTA, + "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + default: + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + } + + CloseHandle(dup); + } + + TerminateThread(thread, 0); + CloseHandle(thread); +} + static BOOL validate_impersonation_token(HANDLE token, DWORD *token_type) { DWORD ret, needed; @@ -5026,6 +5098,7 @@ static void test_kernel_objects_security(void) test_semaphore_security(token); test_file_security(token); test_filemap_security(); + test_thread_security(); /* FIXME: test other kernel object types */ CloseHandle(process_token);

1 0

Stefan Dösinger : wined3d: Use the map binding to reload surfaces on palette changes.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: 5479ccea20ef8d03f7d1b29482cf2f63bd6e94fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5479ccea20ef8d03f7d1b2948… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 10 12:40:41 2014 +0100 wined3d: Use the map binding to reload surfaces on palette changes. --- 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 b6dcb95..9cc8a71 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -755,12 +755,12 @@ static void surface_realize_palette(struct wined3d_surface *surface) } else { - if (!(surface->flags & SFLAG_INSYSMEM)) + if (!(surface->flags & surface->map_binding)) { TRACE("Palette changed with surface that does not have an up to date system memory copy.\n"); - 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); } }

1 0

Stefan Dösinger : wined3d: Use the map binding to reload surfaces on color key changes.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: 5c1df19b16151dc9f0d3454c0a002c55652b1400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1df19b16151dc9f0d3454c0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 10 12:40:42 2014 +0100 wined3d: Use the map binding to reload surfaces on color key changes. --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9cc8a71..45c3663 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2308,8 +2308,8 @@ void surface_load(struct wined3d_surface *surface, BOOL srgb) /* To perform the color key conversion we need a sysmem copy of * the surface. Make sure we have it. */ - surface_load_location(surface, SFLAG_INSYSMEM); - surface_invalidate_location(surface, ~SFLAG_INSYSMEM); + surface_load_location(surface, surface->map_binding); + surface_invalidate_location(surface, ~surface->map_binding); /* Switching color keying on / off may change the internal format. */ if (ck_changed) surface_force_reload(surface);

1 0