January 2014 - Wine-commits

Alexandre Julliard : user32: Fix tick counter wrap-around handling.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 65f93d20e8fbff642ba3e68fd799246442e977d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65f93d20e8fbff642ba3e68fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 14:48:01 2013 +0200 user32: Fix tick counter wrap-around handling. (cherry picked from commit 7b2eafbc8a7073cb70c4eb4d19691ef5c25807b0) --- dlls/user32/dde_client.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 91e1549..7a30ed2 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -1017,22 +1017,20 @@ static WDML_QUEUE_STATE WDML_HandleReply(WDML_CONV* pConv, MSG* msg, HDDEDATA* h */ static HDDEDATA WDML_SyncWaitTransactionReply(HCONV hConv, DWORD dwTimeout, const WDML_XACT* pXAct, DWORD *ack) { - DWORD dwTime; + DWORD start, elapsed; DWORD err; WDML_CONV* pConv; TRACE("Starting wait for a timeout of %d ms\n", dwTimeout); - /* FIXME: time 32 bit wrap around */ - dwTimeout += GetCurrentTime(); - - while ((dwTime = GetCurrentTime()) < dwTimeout) + start = GetTickCount(); + while ((elapsed = GetTickCount() - start) < dwTimeout) { /* we cannot be in the crit sect all the time because when client and server run in a * single process they need to share the access to the internal data */ if (MsgWaitForMultipleObjects(0, NULL, FALSE, - dwTimeout - dwTime, QS_POSTMESSAGE) == WAIT_OBJECT_0) + dwTimeout - elapsed, QS_POSTMESSAGE) == WAIT_OBJECT_0) { MSG msg;

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

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

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

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

10 Jan '14

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

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

10 Jan '14

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

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

10 Jan '14

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: Load surfaces into map binding memory on unload.
by Alexandre Julliard 10 Jan '14

10 Jan '14

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 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

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