April 2013 - Wine-commits - list.winehq.org

Ken Thomases : winemac: Refactor WineApplication class to separate most logic into a controller class .
by Alexandre Julliard 16 Apr '13

16 Apr '13

Module: wine Branch: master Commit: e7d5f329e5c0df157485b697ebd246e46200d490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7d5f329e5c0df157485b697e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Apr 16 00:38:01 2013 -0500 winemac: Refactor WineApplication class to separate most logic into a controller class. --- dlls/winemac.drv/cocoa_app.h | 18 +++- dlls/winemac.drv/cocoa_app.m | 214 ++++++++++++++++++++++++--------------- dlls/winemac.drv/cocoa_event.m | 8 +- dlls/winemac.drv/cocoa_main.m | 28 ++++- dlls/winemac.drv/cocoa_window.m | 80 ++++++++------- 5 files changed, 218 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7d5f329e5c0df157485b…

1 0

Jacek Caban : ieframe: Added DISPID_WINDOWCLOSING tests.
by Alexandre Julliard 16 Apr '13

16 Apr '13

Module: wine Branch: master Commit: e5147a51614cd9671aff4a9700f35a0ede73a2d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5147a51614cd9671aff4a970… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 16 12:01:17 2013 +0200 ieframe: Added DISPID_WINDOWCLOSING tests. --- dlls/ieframe/tests/webbrowser.c | 41 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 40 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 47d0fbc..1eb6119 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -109,6 +109,7 @@ DEFINE_EXPECT(Invoke_TITLECHANGE); DEFINE_EXPECT(Invoke_NAVIGATECOMPLETE2); DEFINE_EXPECT(Invoke_PROGRESSCHANGE); DEFINE_EXPECT(Invoke_DOCUMENTCOMPLETE); +DEFINE_EXPECT(Invoke_WINDOWCLOSING); DEFINE_EXPECT(Invoke_282); DEFINE_EXPECT(EnableModeless_TRUE); DEFINE_EXPECT(EnableModeless_FALSE); @@ -658,7 +659,7 @@ static HRESULT WINAPI WebBrowserEvents2_QueryInterface(IDispatch *iface, REFIID { *ppv = NULL; - if(IsEqualGUID(&DIID_DWebBrowserEvents2, riid)) { + if(IsEqualGUID(&DIID_DWebBrowserEvents2, riid) || IsEqualGUID(&IID_IDispatch, riid)) { *ppv = iface; return S_OK; } @@ -951,6 +952,21 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe test_documentcomplete(pDispParams); break; + case DISPID_WINDOWCLOSING: { + VARIANT *is_child = pDispParams->rgvarg+1, *cancel = pDispParams->rgvarg; + + CHECK_EXPECT(Invoke_WINDOWCLOSING); + + ok(pDispParams->cArgs == 2, "pdp->cArgs = %d\n", pDispParams->cArgs); + ok(V_VT(is_child) == VT_BOOL, "V_VT(is_child) = %d\n", V_VT(is_child)); + ok(!V_BOOL(is_child), "V_BOOL(is_child) = %x\n", V_BOOL(is_child)); + ok(V_VT(cancel) == (VT_BYREF|VT_BOOL), "V_VT(cancel) = %d\n", V_VT(cancel)); + ok(!*V_BOOLREF(cancel), "*V_BOOLREF(cancel) = %x\n", *V_BOOLREF(cancel)); + + *V_BOOLREF(cancel) = VARIANT_TRUE; + return S_OK; + } + case 282: /* FIXME */ CHECK_EXPECT2(Invoke_282); break; @@ -3085,6 +3101,28 @@ static void test_external(IWebBrowser2 *unk) IDocHostUIHandler2_Release(dochost); } +static void test_htmlwindow_close(IWebBrowser2 *wb) +{ + IHTMLWindow2 *window; + IHTMLDocument2 *doc; + HRESULT hres; + + doc = get_document(wb); + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + IHTMLDocument2_Release(doc); + + SET_EXPECT(Invoke_WINDOWCLOSING); + + hres = IHTMLWindow2_close(window); + ok(hres == S_OK, "close failed: %08x\n", hres); + + CHECK_CALLED(Invoke_WINDOWCLOSING); + + IHTMLWindow2_Release(window); +} + static void test_TranslateAccelerator(IWebBrowser2 *unk) { IOleClientSite *doc_clientsite; @@ -3404,6 +3442,7 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) } test_external(webbrowser); + test_htmlwindow_close(webbrowser); if(do_close) test_Close(webbrowser, do_download);

1 0

Henri Verbeet : wined3d: Simplify DISCARD / READONLY handling in wined3d_buffer_map() a bit.
by Alexandre Julliard 16 Apr '13

16 Apr '13

Module: wine Branch: master Commit: 00cc81dc69c0f61107d5d2b9f27b946221794020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00cc81dc69c0f61107d5d2b9f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 16 08:13:42 2013 +0200 wined3d: Simplify DISCARD / READONLY handling in wined3d_buffer_map() a bit. --- dlls/wined3d/buffer.c | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index dc5b4d2..9110bbd 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -986,22 +986,19 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN TRACE("buffer %p, offset %u, size %u, data %p, flags %#x\n", buffer, offset, size, data, flags); flags = buffer_sanitize_flags(buffer, flags); - if (!(flags & WINED3D_MAP_READONLY)) + if (flags & WINED3D_MAP_DISCARD) { - if (flags & WINED3D_MAP_DISCARD) - { - /* DISCARD invalidates the entire buffer, regardless of the - * specified offset and size. Some applications also depend on the - * entire buffer being uploaded in that case. Two such - * applications are Port Royale and Darkstar One. */ - if (!buffer_add_dirty_area(buffer, 0, 0)) - return E_OUTOFMEMORY; - } - else - { - if (!buffer_add_dirty_area(buffer, offset, size)) - return E_OUTOFMEMORY; - } + /* DISCARD invalidates the entire buffer, regardless of the specified + * offset and size. Some applications also depend on the entire buffer + * being uploaded in that case. Two such applications are Port Royale + * and Darkstar One. */ + if (!buffer_add_dirty_area(buffer, 0, 0)) + return E_OUTOFMEMORY; + } + else if (!(flags & WINED3D_MAP_READONLY)) + { + if (!buffer_add_dirty_area(buffer, offset, size)) + return E_OUTOFMEMORY; } count = ++buffer->resource.map_count;

1 0

Henri Verbeet : wined3d: Constants in constants_set should always have a valid location in shader_glsl_load_constantsB ().
by Alexandre Julliard 16 Apr '13

16 Apr '13

Module: wine Branch: master Commit: 302ad29742b11d911d8a337122d220f92b3f4bd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=302ad29742b11d911d8a33712… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 16 08:13:43 2013 +0200 wined3d: Constants in constants_set should always have a valid location in shader_glsl_load_constantsB(). --- dlls/wined3d/glsl_shader.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c84d73b..057763f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -650,12 +650,8 @@ static void shader_glsl_load_constantsB(const struct wined3d_shader *shader, con * locations of the constants to avoid looking up each time */ snprintf(tmp_name, sizeof(tmp_name), "%s_b[%i]", prefix, i); tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, tmp_name)); - if (tmp_loc != -1) - { - /* We found this uniform name in the program - go ahead and send the data */ - GL_EXTCALL(glUniform1ivARB(tmp_loc, 1, &constants[i])); - checkGLcall("glUniform1ivARB"); - } + GL_EXTCALL(glUniform1ivARB(tmp_loc, 1, &constants[i])); + checkGLcall("glUniform1ivARB"); } /* Load immediate constants */

1 0

Henri Verbeet : wined3d: Immediate constants should always have a valid location in shader_glsl_load_constantsB ().
by Alexandre Julliard 16 Apr '13

16 Apr '13

Module: wine Branch: master Commit: 1a551fe5f91c3ed0c56418a25228244e43eee510 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a551fe5f91c3ed0c56418a25… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 16 08:13:44 2013 +0200 wined3d: Immediate constants should always have a valid location in shader_glsl_load_constantsB(). --- dlls/wined3d/glsl_shader.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 057763f..3493ff2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -651,7 +651,6 @@ static void shader_glsl_load_constantsB(const struct wined3d_shader *shader, con snprintf(tmp_name, sizeof(tmp_name), "%s_b[%i]", prefix, i); tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, tmp_name)); GL_EXTCALL(glUniform1ivARB(tmp_loc, 1, &constants[i])); - checkGLcall("glUniform1ivARB"); } /* Load immediate constants */ @@ -666,13 +665,11 @@ static void shader_glsl_load_constantsB(const struct wined3d_shader *shader, con snprintf(tmp_name, sizeof(tmp_name), "%s_b[%i]", prefix, idx); tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, tmp_name)); - if (tmp_loc != -1) { - /* We found this uniform name in the program - go ahead and send the data */ - GL_EXTCALL(glUniform1ivARB(tmp_loc, 1, values)); - checkGLcall("glUniform1ivARB"); - } + GL_EXTCALL(glUniform1ivARB(tmp_loc, 1, values)); ptr = list_next(&shader->constantsB, ptr); } + + checkGLcall("shader_glsl_load_constantsB()"); } static void reset_program_constant_version(struct wine_rb_entry *entry, void *context)

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRM.
by Alexandre Julliard 16 Apr '13

16 Apr '13

Module: wine Branch: master Commit: 5e3b4c8751d719f899842ceb3eb9ea1b4923eace URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e3b4c8751d719f899842ceb3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 16 08:13:45 2013 +0200 d3drm: Avoid LPDIRECT3DRM. --- dlls/d3drm/tests/d3drm.c | 105 +++++++++++++++++++++++----------------------- include/d3drm.h | 2 +- include/d3drmobj.h | 2 +- 3 files changed, 54 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5e3b4c8751d719f899842…

1 0

Henri Verbeet : d3drm/tests: Avoid LPDIRECT3DRM3.
by Alexandre Julliard 16 Apr '13

16 Apr '13

Module: wine Branch: master Commit: 1ce059d6929810b22aeb4e1177fac5afc58d93ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ce059d6929810b22aeb4e117… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 16 08:13:46 2013 +0200 d3drm/tests: Avoid LPDIRECT3DRM3. --- dlls/d3drm/tests/d3drm.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 1f90119..9110efa 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -527,7 +527,7 @@ static void test_MeshBuilder3(void) { HRESULT hr; IDirect3DRM *d3drm; - LPDIRECT3DRM3 pD3DRM3; + IDirect3DRM3 *d3drm3; LPDIRECT3DRMMESHBUILDER3 pMeshBuilder3; D3DRMLOADMEMORY info; int val; @@ -539,14 +539,14 @@ static void test_MeshBuilder3(void) hr = pDirect3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); - if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&pD3DRM3))) + if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3))) { win_skip("Cannot get IDirect3DRM3 interface (hr = %x), skipping tests\n", hr); IDirect3DRM_Release(d3drm); return; } - hr = IDirect3DRM3_CreateMeshBuilder(pD3DRM3, &pMeshBuilder3); + hr = IDirect3DRM3_CreateMeshBuilder(d3drm3, &pMeshBuilder3); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder3 interface (hr = %x)\n", hr); hr = IDirect3DRMMeshBuilder3_GetClassName(pMeshBuilder3, NULL, cname); @@ -630,7 +630,7 @@ static void test_MeshBuilder3(void) ok(valv == 3.21f, "Wrong coordinate %f (must be 3.21)\n", valv); IDirect3DRMMeshBuilder3_Release(pMeshBuilder3); - IDirect3DRM3_Release(pD3DRM3); + IDirect3DRM3_Release(d3drm3); IDirect3DRM_Release(d3drm); } @@ -1118,7 +1118,7 @@ static void test_Material2(void) { HRESULT hr; IDirect3DRM *d3drm; - LPDIRECT3DRM3 pD3DRM3; + IDirect3DRM3 *d3drm3; LPDIRECT3DRMMATERIAL2 pMaterial2; D3DVALUE r, g, b; DWORD size; @@ -1127,14 +1127,14 @@ static void test_Material2(void) hr = pDirect3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); - if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&pD3DRM3))) + if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3))) { win_skip("Cannot get IDirect3DRM3 interface (hr = %x), skipping tests\n", hr); IDirect3DRM_Release(d3drm); return; } - hr = IDirect3DRM3_CreateMaterial(pD3DRM3, 18.5f, &pMaterial2); + hr = IDirect3DRM3_CreateMaterial(d3drm3, 18.5f, &pMaterial2); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMaterial2 interface (hr = %x)\n", hr); hr = IDirect3DRMMaterial2_GetClassName(pMaterial2, NULL, cname); @@ -1190,7 +1190,7 @@ static void test_Material2(void) IDirect3DRMMaterial2_Release(pMaterial2); - IDirect3DRM3_Release(pD3DRM3); + IDirect3DRM3_Release(d3drm3); IDirect3DRM_Release(d3drm); }

1 0

Alexandre Julliard : include: Use gcc atomic builtins to implement interlocked inlines on non-i386.
by Alexandre Julliard 16 Apr '13

16 Apr '13

Module: wine Branch: master Commit: bfaf23bf8f6eabe03ecb0fa532730db304be8251 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfaf23bf8f6eabe03ecb0fa53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 16 13:23:49 2013 +0200 include: Use gcc atomic builtins to implement interlocked inlines on non-i386. --- include/winbase.h | 155 ++++++++++++++++++++--------------------------------- 1 files changed, 59 insertions(+), 96 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 902af92..ad51af3 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2501,146 +2501,109 @@ static FORCEINLINE PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest WINBASEAPI LONGLONG WINAPI InterlockedCompareExchange64(LONGLONG volatile*,LONGLONG,LONGLONG); -#else /* __i386__ */ +#elif defined(_MSC_VER) -#if defined(__x86_64__) && defined(_MSC_VER) #pragma intrinsic(_InterlockedCompareExchange) -#endif +#pragma intrinsic(_InterlockedCompareExchangePointer) +#pragma intrinsic(_InterlockedCompareExchange64) +#pragma intrinsic(_InterlockedExchange) +#pragma intrinsic(_InterlockedExchangePointer) +#pragma intrinsic(_InterlockedExchangeAdd) +#pragma intrinsic(_InterlockedIncrement) +#pragma intrinsic(_InterlockedDecrement) static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) { -#if defined(__x86_64__) && defined(__GNUC__) - LONG ret; - __asm__ __volatile__( "lock; cmpxchgl %2,(%1)" - : "=a" (ret) : "r" (dest), "r" (xchg), "0" (compare) : "memory" ); - return ret; -#elif defined(__x86_64__) && defined(_MSC_VER) return _InterlockedCompareExchange( dest, xchg, compare ); -#else - extern int interlocked_cmpxchg( int *dest, int xchg, int compare ); - return interlocked_cmpxchg( (int *)dest, xchg, compare ); -#endif } -#if defined(__x86_64__) && defined(_MSC_VER) -#pragma intrinsic(_InterlockedCompareExchangePointer) -#endif - static FORCEINLINE PVOID WINAPI InterlockedCompareExchangePointer( PVOID volatile *dest, PVOID xchg, PVOID compare ) { -#if defined(__x86_64__) && defined(__GNUC__) - PVOID ret; - __asm__ __volatile__( "lock; cmpxchgq %2,(%1)" - : "=a" (ret) : "r" (dest), "r" (xchg), "0" (compare) : "memory" ); - return ret; -#elif defined(__x86_64__) && defined(_MSC_VER) return _InterlockedCompareExchangePointer( dest, xchg, compare ); -#else - extern void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare ); - return interlocked_cmpxchg_ptr( (void **)dest, xchg, compare ); -#endif } -#if defined(__x86_64__) && defined(_MSC_VER) -#pragma intrinsic(_InterlockedCompareExchange64) -#endif - static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) { -#if defined(__x86_64__) && defined(__GNUC__) - LONGLONG ret; - __asm__ __volatile__( "lock; cmpxchgq %2,(%1)" - : "=a" (ret) : "r" (dest), "r" (xchg), "0" (compare) : "memory" ); - return ret; -#elif defined(__x86_64__) && defined(_MSC_VER) return _InterlockedCompareExchange64( dest, xchg, compare ); -#else - extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ); - return interlocked_cmpxchg64( (__int64 *)dest, xchg, compare ); -#endif } -#if defined(__x86_64__) && defined(_MSC_VER) -#pragma intrinsic(_InterlockedExchange) -#endif - static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) { -#if defined(__x86_64__) && defined(__GNUC__) - LONG ret; - __asm__ __volatile__( "lock; xchgl %0,(%1)" - : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); - return ret; -#elif defined(__x86_64__) && defined(_MSC_VER) return _InterlockedExchange( dest, val ); -#else - extern int interlocked_xchg( int *dest, int val ); - return interlocked_xchg( (int *)dest, val ); -#endif } -#if defined(__x86_64__) && defined(_MSC_VER) -#pragma intrinsic(_InterlockedExchangePointer) -#endif - static FORCEINLINE PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest, PVOID val ) { -#if defined(__x86_64__) && defined(__GNUC__) - PVOID ret; - __asm__ __volatile__( "lock; xchgq %0,(%1)" - : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); - return ret; -#elif defined(__x86_64__) && defined(_MSC_VER) return _InterlockedExchangePointer( dest, val ); -#else - extern void *interlocked_xchg_ptr( void **dest, void *val ); - return interlocked_xchg_ptr( (void **)dest, val ); -#endif } -#if defined(__x86_64__) && defined(_MSC_VER) -#pragma intrinsic(_InterlockedExchangeAdd) -#endif - static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) { -#if defined(__x86_64__) && defined(__GNUC__) - LONG ret; - __asm__ __volatile__( "lock; xaddl %0,(%1)" - : "=r" (ret) : "r" (dest), "0" (incr) : "memory" ); - return ret; -#elif defined(__x86_64__) && defined(_MSC_VER) return _InterlockedExchangeAdd( dest, incr ); -#else - extern int interlocked_xchg_add( int *dest, int incr ); - return interlocked_xchg_add( (int *)dest, incr ); -#endif } -#if defined(__x86_64__) && defined(_MSC_VER) -#pragma intrinsic(_InterlockedIncrement) -#endif - static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) { -#if defined(__x86_64__) && defined(_MSC_VER) return _InterlockedIncrement( dest ); +} + +static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) +{ + return _InterlockedDecrement( dest ); +} + +#elif defined(__GNUC__) + +static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) +{ + return __sync_val_compare_and_swap( dest, compare, xchg ); +} + +static FORCEINLINE PVOID WINAPI InterlockedCompareExchangePointer( PVOID volatile *dest, PVOID xchg, PVOID compare ) +{ + return __sync_val_compare_and_swap( dest, compare, xchg ); +} + +static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) +{ + return __sync_val_compare_and_swap( dest, compare, xchg ); +} + +static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) +{ + LONG ret; +#ifdef __x86_64__ + __asm__ __volatile__( "lock; xchgl %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); #else - return InterlockedExchangeAdd( dest, 1 ) + 1; + do ret = *dest; while (!__sync_bool_compare_and_swap( dest, ret, val )); #endif + return ret; } -#if defined(__x86_64__) && defined(_MSC_VER) -#pragma intrinsic(_InterlockedDecrement) +static FORCEINLINE PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest, PVOID val ) +{ + PVOID ret; +#ifdef __x86_64__ + __asm__ __volatile__( "lock; xchgq %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); +#else + do ret = *dest; while (!__sync_bool_compare_and_swap( dest, ret, val )); #endif + return ret; +} + +static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) +{ + return __sync_fetch_and_add( dest, incr ); +} + +static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) +{ + return __sync_add_and_fetch( dest, 1 ); +} static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) { -#if defined(__x86_64__) && defined(_MSC_VER) - return _InterlockedDecrement( dest ); -#else - return InterlockedExchangeAdd( dest, -1 ) - 1; -#endif + return __sync_add_and_fetch( dest, -1 ); } #endif /* __i386__ */

1 0

Henri Verbeet : d3drm: Avoid LPD3DRMPMESHLOADSTATUS.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: a6a38bb2591865248a2240cb0bb01c3b35227b4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6a38bb2591865248a2240cb0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 15 08:14:54 2013 +0200 d3drm: Avoid LPD3DRMPMESHLOADSTATUS. --- include/d3drmobj.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 47e4d48..ea09186 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -2021,7 +2021,7 @@ DECLARE_INTERFACE_(IDirect3DRMProgressiveMesh,IDirect3DRMVisual) /*** IDirect3DRMProgressiveMesh methods ***/ STDMETHOD(Load) (THIS_ LPVOID pObjLocation, LPVOID pObjId, D3DRMLOADOPTIONS dloLoadflags, D3DRMLOADTEXTURECALLBACK pCallback, LPVOID lpArg) PURE; - STDMETHOD(GetLoadStatus) (THIS_ LPD3DRMPMESHLOADSTATUS pStatus) PURE; + STDMETHOD(GetLoadStatus) (THIS_ D3DRMPMESHLOADSTATUS *status) PURE; STDMETHOD(SetMinRenderDetail) (THIS_ D3DVALUE d3dVal) PURE; STDMETHOD(Abort) (THIS_ DWORD flags) PURE; STDMETHOD(GetFaceDetail) (THIS_ LPDWORD pCount) PURE;

1 0

Henri Verbeet : d3drm: Avoid LPD3DRMANIMATIONKEY.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: cbf57825456815a0b3ac5e8a49a88aa810d517dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf57825456815a0b3ac5e8a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 15 08:14:55 2013 +0200 d3drm: Avoid LPD3DRMANIMATIONKEY. --- include/d3drmobj.h | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/d3drmobj.h b/include/d3drmobj.h index ea09186..cd30911 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -3879,11 +3879,9 @@ DECLARE_INTERFACE_(IDirect3DRMAnimation2, IDirect3DRMObject) STDMETHOD_(D3DRMANIMATIONOPTIONS, GetOptions)(THIS) PURE; STDMETHOD(GetFrame)(THIS_ LPDIRECT3DRMFRAME3 *lpD3DFrame) PURE; STDMETHOD(DeleteKeyByID)(THIS_ DWORD dwID) PURE; - STDMETHOD(AddKey)(THIS_ LPD3DRMANIMATIONKEY lpKey) PURE; - STDMETHOD(ModifyKey)(THIS_ LPD3DRMANIMATIONKEY lpKey) PURE; - STDMETHOD(GetKeys)(THIS_ D3DVALUE dvTimeMin, - D3DVALUE dvTimeMax, LPDWORD lpdwNumKeys, - LPD3DRMANIMATIONKEY lpKey); + STDMETHOD(AddKey)(THIS_ D3DRMANIMATIONKEY *key) PURE; + STDMETHOD(ModifyKey)(THIS_ D3DRMANIMATIONKEY *key) PURE; + STDMETHOD(GetKeys)(THIS_ D3DVALUE time_min, D3DVALUE time_max, DWORD *key_count, D3DRMANIMATIONKEY *keys); }; #undef INTERFACE

1 0