November 2013 - Wine-commits

Henri Verbeet : wined3d: Introduce a function for safely releasing a DC.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 3ad89896148d7d7a0a5f3a1eb99d637ca1791bd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ad89896148d7d7a0a5f3a1eb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 4 10:02:43 2013 +0100 wined3d: Introduce a function for safely releasing a DC. --- dlls/wined3d/context.c | 24 ++++-------------------- dlls/wined3d/directx.c | 2 +- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/utils.c | 14 ++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f3566cf..a604088 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -844,25 +844,9 @@ static void context_update_window(struct wined3d_context *context) context, context->win_handle, context->swapchain->win_handle); if (context->valid) - { - /* You'd figure ReleaseDC() would fail if the DC doesn't match the - * window. However, that's not what actually happens, and there are - * user32 tests that confirm ReleaseDC() with the wrong window is - * supposed to succeed. So explicitly check that the DC belongs to - * the window, since we want to avoid releasing a DC that belongs to - * some other window if the original window was already destroyed. */ - if (WindowFromDC(context->hdc) != context->win_handle) - { - WARN("DC %p does not belong to window %p.\n", - context->hdc, context->win_handle); - } - else if (!ReleaseDC(context->win_handle, context->hdc)) - { - ERR("Failed to release device context %p, last error %#x.\n", - context->hdc, GetLastError()); - } - } - else context->valid = 1; + wined3d_release_dc(context->win_handle, context->hdc); + else + context->valid = 1; context->win_handle = context->swapchain->win_handle; @@ -987,7 +971,7 @@ static void context_destroy_gl_resources(struct wined3d_context *context) ERR("Failed to disable GL context.\n"); } - ReleaseDC(context->win_handle, context->hdc); + wined3d_release_dc(context->win_handle, context->hdc); if (!wglDeleteContext(context->glCtx)) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7d4f859..31ff52a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -277,7 +277,7 @@ static void wined3d_caps_gl_ctx_destroy(const struct wined3d_caps_gl_ctx *ctx) ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx->gl_ctx, err); } - ReleaseDC(ctx->wnd, ctx->dc); + wined3d_release_dc(ctx->wnd, ctx->dc); DestroyWindow(ctx->wnd); if (ctx->restore_gl_ctx && !wglMakeCurrent(ctx->restore_dc, ctx->restore_gl_ctx)) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 73243a9..7a383fd 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -83,7 +83,7 @@ static void swapchain_cleanup(struct wined3d_swapchain *swapchain) { TRACE("Destroying backup wined3d window %p, dc %p.\n", swapchain->backup_wnd, swapchain->backup_dc); - ReleaseDC(swapchain->backup_wnd, swapchain->backup_dc); + wined3d_release_dc(swapchain->backup_wnd, swapchain->backup_dc); DestroyWindow(swapchain->backup_wnd); } } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 3fb6090..f6d3a44 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3852,3 +3852,17 @@ void wined3d_ftoa(float value, char *s) sprintf(s, "%s%d.%08de%+03d", sign, x, frac, exponent); } + +void wined3d_release_dc(HWND window, HDC dc) +{ + /* You'd figure ReleaseDC() would fail if the DC doesn't match the window. + * However, that's not what actually happens, and there are user32 tests + * that confirm ReleaseDC() with the wrong window is supposed to succeed. + * So explicitly check that the DC belongs to the window, since we want to + * avoid releasing a DC that belongs to some other window if the original + * window was already destroyed. */ + if (WindowFromDC(dc) != window) + WARN("DC %p does not belong to window %p.\n", dc, window); + else if (!ReleaseDC(window, dc)) + ERR("Failed to release device context %p, last error %#x.\n", dc, GetLastError()); +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fc92e53..e4ce84d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2742,6 +2742,8 @@ void multiply_matrix(struct wined3d_matrix *dest, const struct wined3d_matrix *s UINT wined3d_log2i(UINT32 x) DECLSPEC_HIDDEN; unsigned int count_bits(unsigned int mask) DECLSPEC_HIDDEN; +void wined3d_release_dc(HWND window, HDC dc) DECLSPEC_HIDDEN; + struct wined3d_shader_lconst { struct list entry;

1 0

Henri Verbeet : wined3d: Mark the context valid if making it current on the "backup" window worked.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: f4aab54ca15d0447e1336cea7844fdabbb975339 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4aab54ca15d0447e1336cea7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 4 10:02:44 2013 +0100 wined3d: Mark the context valid if making it current on the "backup" window worked. --- dlls/wined3d/context.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a604088..07f81e5 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -814,6 +814,8 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) context_set_current(NULL); return FALSE; } + + ctx->valid = 1; } return TRUE; }

1 0

Henri Verbeet : d3d9/tests: Get rid of the "data2" vertex data array in pretransformed_varying_test().
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: ceb4d2595b39846d7b84a029d214eefe3f82d106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceb4d2595b39846d7b84a029d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 4 10:02:45 2013 +0100 d3d9/tests: Get rid of the "data2" vertex data array in pretransformed_varying_test(). --- dlls/d3d9/tests/visual.c | 129 ++++++++++++++++++++++------------------------ 1 files changed, 62 insertions(+), 67 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f134067..8d6fe02 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6295,20 +6295,6 @@ static void nested_loop_test(IDirect3DDevice9 *device) IDirect3DVertexShader9_Release(vshader); } -struct hugeVertex -{ - float pos_x, pos_y, pos_z, rhw; - float weight_1, weight_2, weight_3, weight_4; - float index_1, index_2, index_3, index_4; - float normal_1, normal_2, normal_3, normal_4; - float fog_1, fog_2, fog_3, fog_4; - float texcoord_1, texcoord_2, texcoord_3, texcoord_4; - float tangent_1, tangent_2, tangent_3, tangent_4; - float binormal_1, binormal_2, binormal_3, binormal_4; - float depth_1, depth_2, depth_3, depth_4; - DWORD diffuse, specular; -}; - static void pretransformed_varying_test(IDirect3DDevice9 *device) { /* dcl_position: fails to compile */ @@ -6422,72 +6408,81 @@ static void pretransformed_varying_test(IDirect3DDevice9 *device) {0, 148, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 1}, D3DDECL_END() }; - struct hugeVertex data[4] = { + + static const struct + { + float pos_x, pos_y, pos_z, rhw; + float weight_1, weight_2, weight_3, weight_4; + float index_1, index_2, index_3, index_4; + float normal_1, normal_2, normal_3, normal_4; + float fog_1, fog_2, fog_3, fog_4; + float texcoord_1, texcoord_2, texcoord_3, texcoord_4; + float tangent_1, tangent_2, tangent_3, tangent_4; + float binormal_1, binormal_2, binormal_3, binormal_4; + float depth_1, depth_2, depth_3, depth_4; + D3DCOLOR diffuse; + D3DCOLOR specular; + } + data[] = + { { - -1.0, -1.0, 0.1, 1.0, - 0.1, 0.1, 0.1, 0.1, - 0.2, 0.2, 0.2, 0.2, - 0.3, 0.3, 0.3, 0.3, - 0.4, 0.4, 0.4, 0.4, - 0.50, 0.55, 0.55, 0.55, - 0.6, 0.6, 0.6, 0.7, - 0.7, 0.7, 0.7, 0.6, - 0.8, 0.8, 0.8, 0.8, - 0xe6e6e6e6, /* 0.9 * 256 */ - 0x224488ff /* Nothing special */ + 0.0f, 0.0f, 0.1f, 1.0f, + 0.1f, 0.1f, 0.1f, 0.1f, + 0.2f, 0.2f, 0.2f, 0.2f, + 0.3f, 0.3f, 0.3f, 0.3f, + 0.4f, 0.4f, 0.4f, 0.4f, + 0.5f, 0.55f, 0.55f, 0.55f, + 0.6f, 0.6f, 0.6f, 0.7f, + 0.7f, 0.7f, 0.7f, 0.6f, + 0.8f, 0.8f, 0.8f, 0.8f, + 0xe6e6e6e6, /* 0.9 * 256 */ + 0x224488ff, /* Nothing special */ }, { - 1.0, -1.0, 0.1, 1.0, - 0.1, 0.1, 0.1, 0.1, - 0.2, 0.2, 0.2, 0.2, - 0.3, 0.3, 0.3, 0.3, - 0.4, 0.4, 0.4, 0.4, - 0.50, 0.55, 0.55, 0.55, - 0.6, 0.6, 0.6, 0.7, - 0.7, 0.7, 0.7, 0.6, - 0.8, 0.8, 0.8, 0.8, - 0xe6e6e6e6, /* 0.9 * 256 */ - 0x224488ff /* Nothing special */ + 640.0f, 0.0f, 0.1f, 1.0f, + 0.1f, 0.1f, 0.1f, 0.1f, + 0.2f, 0.2f, 0.2f, 0.2f, + 0.3f, 0.3f, 0.3f, 0.3f, + 0.4f, 0.4f, 0.4f, 0.4f, + 0.5f, 0.55f, 0.55f, 0.55f, + 0.6f, 0.6f, 0.6f, 0.7f, + 0.7f, 0.7f, 0.7f, 0.6f, + 0.8f, 0.8f, 0.8f, 0.8f, + 0xe6e6e6e6, /* 0.9 * 256 */ + 0x224488ff, /* Nothing special */ }, { - -1.0, 1.0, 0.1, 1.0, - 0.1, 0.1, 0.1, 0.1, - 0.2, 0.2, 0.2, 0.2, - 0.3, 0.3, 0.3, 0.3, - 0.4, 0.4, 0.4, 0.4, - 0.50, 0.55, 0.55, 0.55, - 0.6, 0.6, 0.6, 0.7, - 0.7, 0.7, 0.7, 0.6, - 0.8, 0.8, 0.8, 0.8, - 0xe6e6e6e6, /* 0.9 * 256 */ - 0x224488ff /* Nothing special */ + 0.0f, 480.0f, 0.1f, 1.0f, + 0.1f, 0.1f, 0.1f, 0.1f, + 0.2f, 0.2f, 0.2f, 0.2f, + 0.3f, 0.3f, 0.3f, 0.3f, + 0.4f, 0.4f, 0.4f, 0.4f, + 0.5f, 0.55f, 0.55f, 0.55f, + 0.6f, 0.6f, 0.6f, 0.7f, + 0.7f, 0.7f, 0.7f, 0.6f, + 0.8f, 0.8f, 0.8f, 0.8f, + 0xe6e6e6e6, /* 0.9 * 256 */ + 0x224488ff, /* Nothing special */ }, { - 1.0, 1.0, 0.1, 1.0, - 0.1, 0.1, 0.1, 0.1, - 0.2, 0.2, 0.2, 0.2, - 0.3, 0.3, 0.3, 0.3, - 0.4, 0.4, 0.4, 0.4, - 0.50, 0.55, 0.55, 0.55, - 0.6, 0.6, 0.6, 0.7, - 0.7, 0.7, 0.7, 0.6, - 0.8, 0.8, 0.8, 0.8, - 0xe6e6e6e6, /* 0.9 * 256 */ - 0x224488ff /* Nothing special */ + 640.0f, 480.0f, 0.1f, 1.0f, + 0.1f, 0.1f, 0.1f, 0.1f, + 0.2f, 0.2f, 0.2f, 0.2f, + 0.3f, 0.3f, 0.3f, 0.3f, + 0.4f, 0.4f, 0.4f, 0.4f, + 0.5f, 0.55f, 0.55f, 0.55f, + 0.6f, 0.6f, 0.6f, 0.7f, + 0.7f, 0.7f, 0.7f, 0.6f, + 0.8f, 0.8f, 0.8f, 0.8f, + 0xe6e6e6e6, /* 0.9 * 256 */ + 0x224488ff, /* Nothing special */ }, }; - struct hugeVertex data2[4]; IDirect3DVertexDeclaration9 *decl; HRESULT hr; unsigned int i; DWORD color; - memcpy(data2, data, sizeof(data2)); - data2[0].pos_x = 0; data2[0].pos_y = 0; - data2[1].pos_x = 640; data2[1].pos_y = 0; - data2[2].pos_x = 0; data2[2].pos_y = 480; - data2[3].pos_x = 640; data2[3].pos_y = 480; - hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &decl); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexDeclaration returned %08x\n", hr); hr = IDirect3DDevice9_SetVertexDeclaration(device, decl); @@ -6512,7 +6507,7 @@ static void pretransformed_varying_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene returned %08x\n", hr); if(SUCCEEDED(hr)) { - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, data2, sizeof(data2[0])); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, data, sizeof(*data)); ok(hr == D3D_OK, "DrawPrimitiveUP failed (%08x)\n", hr); hr = IDirect3DDevice9_EndScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned %08x\n", hr);

1 0

Henri Verbeet : ddrawex: Get rid of the IClassFactoryImpl typedef.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: ec37ac6f206bedc19a437083f613ff74a0e6c0dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec37ac6f206bedc19a437083f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 4 10:02:46 2013 +0100 ddrawex: Get rid of the IClassFactoryImpl typedef. --- dlls/ddrawex/main.c | 106 ++++++++++++++++++-------------------------------- 1 files changed, 38 insertions(+), 68 deletions(-) diff --git a/dlls/ddrawex/main.c b/dlls/ddrawex/main.c index be989ef..36894b2 100644 --- a/dlls/ddrawex/main.c +++ b/dlls/ddrawex/main.c @@ -36,114 +36,84 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddrawex); static HINSTANCE instance; -/****************************************************************************** - * DirectDraw ClassFactory implementation - ******************************************************************************/ -typedef struct +struct ddrawex_class_factory { IClassFactory IClassFactory_iface; LONG ref; HRESULT (*pfnCreateInstance)(IUnknown *outer, REFIID iid, void **out); -} IClassFactoryImpl; +}; -static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +static inline struct ddrawex_class_factory *impl_from_IClassFactory(IClassFactory *iface) { - return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); + return CONTAINING_RECORD(iface, struct ddrawex_class_factory, IClassFactory_iface); } -/******************************************************************************* - * IDirectDrawClassFactory::QueryInterface - * - *******************************************************************************/ -static HRESULT WINAPI IDirectDrawClassFactoryImpl_QueryInterface(IClassFactory *iface, REFIID riid, - void **obj) +static HRESULT WINAPI ddrawex_class_factory_QueryInterface(IClassFactory *iface, REFIID riid, void **out) { - TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(riid), obj); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IClassFactory)) + if (IsEqualGUID(riid, &IID_IClassFactory) + || IsEqualGUID(riid, &IID_IUnknown)) { IClassFactory_AddRef(iface); - *obj = iface; + *out = iface; return S_OK; } WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - *obj = NULL; + *out = NULL; return E_NOINTERFACE; } -/******************************************************************************* - * IDirectDrawClassFactory::AddRef - * - *******************************************************************************/ -static ULONG WINAPI IDirectDrawClassFactoryImpl_AddRef(IClassFactory *iface) +static ULONG WINAPI ddrawex_class_factory_AddRef(IClassFactory *iface) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - ULONG ref = InterlockedIncrement(&This->ref); + struct ddrawex_class_factory *factory = impl_from_IClassFactory(iface); + ULONG refcount = InterlockedIncrement(&factory->ref); - TRACE("(%p)->() incrementing from %d.\n", This, ref - 1); + TRACE("%p increasing refcount to %u.\n", iface, refcount); - return ref; + return refcount; } -/******************************************************************************* - * IDirectDrawClassFactory::Release - * - *******************************************************************************/ -static ULONG WINAPI IDirectDrawClassFactoryImpl_Release(IClassFactory *iface) +static ULONG WINAPI ddrawex_class_factory_Release(IClassFactory *iface) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct ddrawex_class_factory *factory = impl_from_IClassFactory(iface); + ULONG refcount = InterlockedDecrement(&factory->ref); - TRACE("(%p)->() decrementing from %d.\n", This, ref+1); + TRACE("%p decreasing refcount to %u.\n", iface, refcount); - if (ref == 0) - HeapFree(GetProcessHeap(), 0, This); + if (!refcount) + HeapFree(GetProcessHeap(), 0, factory); - return ref; + return refcount; } - -/******************************************************************************* - * IDirectDrawClassFactory::CreateInstance - * - *******************************************************************************/ -static HRESULT WINAPI IDirectDrawClassFactoryImpl_CreateInstance(IClassFactory *iface, - IUnknown *UnkOuter, REFIID riid, void **obj) +static HRESULT WINAPI ddrawex_class_factory_CreateInstance(IClassFactory *iface, + IUnknown *outer_unknown, REFIID riid, void **out) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); + struct ddrawex_class_factory *factory = impl_from_IClassFactory(iface); - TRACE("(%p)->(%p,%s,%p)\n",This,UnkOuter,debugstr_guid(riid),obj); + TRACE("iface %p, outer_unknown %p, riid %s, out %p.\n", + iface, outer_unknown, debugstr_guid(riid), out); - return This->pfnCreateInstance(UnkOuter, riid, obj); + return factory->pfnCreateInstance(outer_unknown, riid, out); } -/******************************************************************************* - * IDirectDrawClassFactory::LockServer - * - *******************************************************************************/ -static HRESULT WINAPI IDirectDrawClassFactoryImpl_LockServer(IClassFactory *iface,BOOL dolock) +static HRESULT WINAPI ddrawex_class_factory_LockServer(IClassFactory *iface, BOOL dolock) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - - FIXME("(%p)->(%d),stub!\n",This,dolock); + FIXME("iface %p, dolock %#x stub!\n", iface, dolock); return S_OK; } - -/******************************************************************************* - * The class factory VTable - *******************************************************************************/ -static const IClassFactoryVtbl IClassFactory_Vtbl = +static const IClassFactoryVtbl ddrawex_class_factory_vtbl = { - IDirectDrawClassFactoryImpl_QueryInterface, - IDirectDrawClassFactoryImpl_AddRef, - IDirectDrawClassFactoryImpl_Release, - IDirectDrawClassFactoryImpl_CreateInstance, - IDirectDrawClassFactoryImpl_LockServer + ddrawex_class_factory_QueryInterface, + ddrawex_class_factory_AddRef, + ddrawex_class_factory_Release, + ddrawex_class_factory_CreateInstance, + ddrawex_class_factory_LockServer, }; @@ -283,7 +253,7 @@ HRESULT WINAPI DllCanUnloadNow(void) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **out) { - IClassFactoryImpl *factory; + struct ddrawex_class_factory *factory; TRACE("rclsid %s, riid %s, out %p.\n", debugstr_guid(rclsid), debugstr_guid(riid), out); @@ -300,7 +270,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **out) factory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*factory)); if (factory == NULL) return E_OUTOFMEMORY; - factory->IClassFactory_iface.lpVtbl = &IClassFactory_Vtbl; + factory->IClassFactory_iface.lpVtbl = &ddrawex_class_factory_vtbl; factory->ref = 1; factory->pfnCreateInstance = CreateDirectDrawFactory;

1 0

Henri Verbeet : ddrawex: Get rid of the IDirectDrawFactoryImpl typedef.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: b9e1bcb7f696d31ee86a672c5881fda461622f58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9e1bcb7f696d31ee86a672c5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 4 10:02:47 2013 +0100 ddrawex: Get rid of the IDirectDrawFactoryImpl typedef. --- dlls/ddrawex/ddraw.c | 13 +---- dlls/ddrawex/ddrawex_private.h | 6 +- dlls/ddrawex/main.c | 113 ++++++++++++++-------------------------- 3 files changed, 45 insertions(+), 87 deletions(-) diff --git a/dlls/ddrawex/ddraw.c b/dlls/ddrawex/ddraw.c index 6d2e400..49ea5e2 100644 --- a/dlls/ddrawex/ddraw.c +++ b/dlls/ddrawex/ddraw.c @@ -1276,17 +1276,8 @@ static const IDirectDraw4Vtbl IDirectDraw4_Vtbl = IDirectDraw4Impl_GetDeviceIdentifier }; -/******************************************************************************* - * IDirectDrawFactoryImpl_CreateDirectDraw - *******************************************************************************/ -HRESULT WINAPI -IDirectDrawFactoryImpl_CreateDirectDraw(IDirectDrawFactory* iface, - GUID * pGUID, - HWND hWnd, - DWORD dwCoopLevelFlags, - DWORD dwReserved, - IUnknown *pUnkOuter, - IDirectDraw **ppDirectDraw) +HRESULT WINAPI ddrawex_factory_CreateDirectDraw(IDirectDrawFactory *iface, GUID * pGUID, HWND hWnd, + DWORD dwCoopLevelFlags, DWORD dwReserved, IUnknown *pUnkOuter, IDirectDraw **ppDirectDraw) { HRESULT hr; IDirectDrawImpl *object = NULL; diff --git a/dlls/ddrawex/ddrawex_private.h b/dlls/ddrawex/ddrawex_private.h index be602b5..033f7d4 100644 --- a/dlls/ddrawex/ddrawex_private.h +++ b/dlls/ddrawex/ddrawex_private.h @@ -44,9 +44,9 @@ DECLARE_INTERFACE_(IDirectDrawFactory, IUnknown) #endif -HRESULT WINAPI IDirectDrawFactoryImpl_CreateDirectDraw(IDirectDrawFactory* iface, - GUID * pGUID, HWND hWnd, DWORD dwCoopLevelFlags, DWORD dwReserved, IUnknown *pUnkOuter, - IDirectDraw **ppDirectDraw) DECLSPEC_HIDDEN; +HRESULT WINAPI ddrawex_factory_CreateDirectDraw(IDirectDrawFactory *iface, + GUID *guid, HWND window, DWORD coop_level, DWORD reserved, IUnknown *outer_unknown, + IDirectDraw **ddraw) DECLSPEC_HIDDEN; void DDSD_to_DDSD2(const DDSURFACEDESC *in, DDSURFACEDESC2 *out) DECLSPEC_HIDDEN; void DDSD2_to_DDSD(const DDSURFACEDESC2 *in, DDSURFACEDESC *out) DECLSPEC_HIDDEN; diff --git a/dlls/ddrawex/main.c b/dlls/ddrawex/main.c index 36894b2..855b6d7 100644 --- a/dlls/ddrawex/main.c +++ b/dlls/ddrawex/main.c @@ -116,129 +116,96 @@ static const IClassFactoryVtbl ddrawex_class_factory_vtbl = ddrawex_class_factory_LockServer, }; - -/****************************************************************************** - * DirectDrawFactory implementation - ******************************************************************************/ -typedef struct +struct ddrawex_factory { IDirectDrawFactory IDirectDrawFactory_iface; LONG ref; -} IDirectDrawFactoryImpl; +}; -static inline IDirectDrawFactoryImpl *impl_from_IDirectDrawFactory(IDirectDrawFactory *iface) +static inline struct ddrawex_factory *impl_from_IDirectDrawFactory(IDirectDrawFactory *iface) { - return CONTAINING_RECORD(iface, IDirectDrawFactoryImpl, IDirectDrawFactory_iface); + return CONTAINING_RECORD(iface, struct ddrawex_factory, IDirectDrawFactory_iface); } -/******************************************************************************* - * IDirectDrawFactory::QueryInterface - * - *******************************************************************************/ -static HRESULT WINAPI IDirectDrawFactoryImpl_QueryInterface(IDirectDrawFactory *iface, REFIID riid, - void **obj) +static HRESULT WINAPI ddrawex_factory_QueryInterface(IDirectDrawFactory *iface, REFIID riid, void **out) { - TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(riid), obj); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirectDrawFactory)) + if (IsEqualGUID(riid, &IID_IDirectDrawFactory) + || IsEqualGUID(riid, &IID_IUnknown)) { IDirectDrawFactory_AddRef(iface); - *obj = iface; + *out = iface; return S_OK; } WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - *obj = NULL; + *out = NULL; return E_NOINTERFACE; } -/******************************************************************************* - * IDirectDrawFactory::AddRef - * - *******************************************************************************/ -static ULONG WINAPI IDirectDrawFactoryImpl_AddRef(IDirectDrawFactory *iface) +static ULONG WINAPI ddrawex_factory_AddRef(IDirectDrawFactory *iface) { - IDirectDrawFactoryImpl *This = impl_from_IDirectDrawFactory(iface); - ULONG ref = InterlockedIncrement(&This->ref); + struct ddrawex_factory *factory = impl_from_IDirectDrawFactory(iface); + ULONG refcount = InterlockedIncrement(&factory->ref); - TRACE("(%p)->() incrementing from %d.\n", This, ref - 1); + TRACE("%p increasing refcount to %u.\n", iface, refcount); - return ref; + return refcount; } -/******************************************************************************* - * IDirectDrawFactory::Release - * - *******************************************************************************/ -static ULONG WINAPI IDirectDrawFactoryImpl_Release(IDirectDrawFactory *iface) +static ULONG WINAPI ddrawex_factory_Release(IDirectDrawFactory *iface) { - IDirectDrawFactoryImpl *This = impl_from_IDirectDrawFactory(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct ddrawex_factory *factory = impl_from_IDirectDrawFactory(iface); + ULONG refcount = InterlockedDecrement(&factory->ref); - TRACE("(%p)->() decrementing from %d.\n", This, ref+1); + TRACE("%p decreasing refcount to %u.\n", iface, refcount); - if (ref == 0) - HeapFree(GetProcessHeap(), 0, This); + if (!refcount) + HeapFree(GetProcessHeap(), 0, factory); - return ref; + return refcount; } -static HRESULT WINAPI IDirectDrawFactoryImpl_DirectDrawEnumerate(IDirectDrawFactory *iface, +static HRESULT WINAPI ddrawex_factory_DirectDrawEnumerate(IDirectDrawFactory *iface, LPDDENUMCALLBACKW cb, void *ctx) { - FIXME("Stub!\n"); + FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + return E_FAIL; } - -/******************************************************************************* - * Direct Draw Factory VTable - *******************************************************************************/ -static const IDirectDrawFactoryVtbl IDirectDrawFactory_Vtbl = +static const IDirectDrawFactoryVtbl ddrawex_factory_vtbl = { - IDirectDrawFactoryImpl_QueryInterface, - IDirectDrawFactoryImpl_AddRef, - IDirectDrawFactoryImpl_Release, - IDirectDrawFactoryImpl_CreateDirectDraw, - IDirectDrawFactoryImpl_DirectDrawEnumerate, + ddrawex_factory_QueryInterface, + ddrawex_factory_AddRef, + ddrawex_factory_Release, + ddrawex_factory_CreateDirectDraw, + ddrawex_factory_DirectDrawEnumerate, }; -/*********************************************************************** - * CreateDirectDrawFactory - * - ***********************************************************************/ -static HRESULT -CreateDirectDrawFactory(IUnknown* UnkOuter, REFIID iid, void **obj) +static HRESULT ddrawex_factory_create(IUnknown *outer_unknown, REFIID riid, void **out) { + struct ddrawex_factory *factory; HRESULT hr; - IDirectDrawFactoryImpl *This = NULL; - TRACE("(%p,%s,%p)\n", UnkOuter, debugstr_guid(iid), obj); + TRACE("outer_unknown %p, riid %s, out %p.\n", outer_unknown, debugstr_guid(riid), out); - if (UnkOuter != NULL) + if (outer_unknown) return CLASS_E_NOAGGREGATION; - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectDrawFactoryImpl)); - - if(!This) - { - ERR("Out of memory when creating DirectDraw\n"); + if (!(factory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*factory)))) return E_OUTOFMEMORY; - } - This->IDirectDrawFactory_iface.lpVtbl = &IDirectDrawFactory_Vtbl; + factory->IDirectDrawFactory_iface.lpVtbl = &ddrawex_factory_vtbl; - hr = IDirectDrawFactory_QueryInterface(&This->IDirectDrawFactory_iface, iid, obj); - - if (FAILED(hr)) - HeapFree(GetProcessHeap(), 0, This); + if (FAILED(hr = ddrawex_factory_QueryInterface(&factory->IDirectDrawFactory_iface, riid, out))) + HeapFree(GetProcessHeap(), 0, factory); return hr; } - /******************************************************************************* * DllCanUnloadNow [DDRAWEX.@] Determines whether the DLL is in use. */ @@ -273,7 +240,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **out) factory->IClassFactory_iface.lpVtbl = &ddrawex_class_factory_vtbl; factory->ref = 1; - factory->pfnCreateInstance = CreateDirectDrawFactory; + factory->pfnCreateInstance = ddrawex_factory_create; *out = factory;

1 0

Nikolay Sivov : urlmon/tests: Preparation for -D__WINESRC__.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: e50dc73b86f2111db663de330fc03f6b25aa0d51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e50dc73b86f2111db663de330… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 4 13:37:46 2013 +0400 urlmon/tests: Preparation for -D__WINESRC__. --- dlls/urlmon/tests/misc.c | 4 ++-- dlls/urlmon/tests/protocol.c | 10 +++++----- dlls/urlmon/tests/sec_mgr.c | 8 ++++---- dlls/urlmon/tests/url.c | 18 +++++++++--------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index aa5e365..f0455ee 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1783,7 +1783,7 @@ static void test_internet_features_registry(void) { RegCloseKey(feature); RegDeleteKeyA(feature_control, szFeatureBehaviorsKey); } else { - RegDeleteValue(feature, name); + RegDeleteValueA(feature, name); RegCloseKey(feature); } @@ -1905,7 +1905,7 @@ START_TEST(misc) { HMODULE hurlmon; - hurlmon = GetModuleHandle("urlmon.dll"); + hurlmon = GetModuleHandleA("urlmon.dll"); pCoInternetCompareUrl = (void *) GetProcAddress(hurlmon, "CoInternetCompareUrl"); pCoInternetGetSecurityUrl = (void*) GetProcAddress(hurlmon, "CoInternetGetSecurityUrl"); pCoInternetGetSession = (void*) GetProcAddress(hurlmon, "CoInternetGetSession"); diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index b4b8f19..4728f3c 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -3722,7 +3722,7 @@ START_TEST(protocol) { HMODULE hurlmon; - hurlmon = GetModuleHandle("urlmon.dll"); + hurlmon = GetModuleHandleA("urlmon.dll"); pCoInternetGetSession = (void*) GetProcAddress(hurlmon, "CoInternetGetSession"); pReleaseBindInfo = (void*) GetProcAddress(hurlmon, "ReleaseBindInfo"); pCreateUri = (void*) GetProcAddress(hurlmon, "CreateUri"); @@ -3737,10 +3737,10 @@ START_TEST(protocol) OleInitialize(NULL); - event_complete = CreateEvent(NULL, FALSE, FALSE, NULL); - event_complete2 = CreateEvent(NULL, FALSE, FALSE, NULL); - event_continue = CreateEvent(NULL, FALSE, FALSE, NULL); - event_continue_done = CreateEvent(NULL, FALSE, FALSE, NULL); + event_complete = CreateEventW(NULL, FALSE, FALSE, NULL); + event_complete2 = CreateEventW(NULL, FALSE, FALSE, NULL); + event_continue = CreateEventW(NULL, FALSE, FALSE, NULL); + event_continue_done = CreateEventW(NULL, FALSE, FALSE, NULL); thread_id = GetCurrentThreadId(); test_file_protocol(); diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index d0e89ce..2eaddb9 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -514,7 +514,7 @@ static void test_url_action(IInternetSecurityManager *secmgr, IInternetZoneManag return; } - wsprintf(buf, "%X", action); + wsprintfA(buf, "%X", action); size = sizeof(DWORD); res = RegQueryValueExA(hkey, buf, NULL, NULL, (BYTE*)&reg_policy, &size); RegCloseKey(hkey); @@ -843,7 +843,7 @@ static void run_child_process(void) char path[MAX_PATH]; char **argv; PROCESS_INFORMATION pi; - STARTUPINFO si = { 0 }; + STARTUPINFOA si = { 0 }; BOOL ret; GetModuleFileNameA(NULL, path, MAX_PATH); @@ -851,7 +851,7 @@ static void run_child_process(void) si.cb = sizeof(si); winetest_get_mainargs(&argv); sprintf(cmdline, "\"%s\" %s domain_tests", argv[0], argv[1]); - ret = CreateProcess(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "Failed to spawn child process: %u\n", GetLastError()); winetest_wait_child_process(pi.hProcess); CloseHandle(pi.hThread); @@ -1991,7 +1991,7 @@ START_TEST(sec_mgr) int argc; char **argv; - hurlmon = GetModuleHandle("urlmon.dll"); + hurlmon = GetModuleHandleA("urlmon.dll"); pCoInternetCreateSecurityManager = (void*) GetProcAddress(hurlmon, "CoInternetCreateSecurityManager"); pCoInternetCreateZoneManager = (void*) GetProcAddress(hurlmon, "CoInternetCreateZoneManager"); pCoInternetGetSecurityUrl = (void*) GetProcAddress(hurlmon, "CoInternetGetSecurityUrl"); diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index fcc4be6..7bfa75f 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1977,9 +1977,9 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW if (mime_type[0]) { INT ret; clipfmt[0] = 0; - ret = GetClipboardFormatName(pformatetc->cfFormat, clipfmt, sizeof(clipfmt)-1); + ret = GetClipboardFormatNameA(pformatetc->cfFormat, clipfmt, sizeof(clipfmt)-1); ok(ret, "GetClipboardFormatName failed, error %d\n", GetLastError()); - ok(!lstrcmp(clipfmt, mime_type), "clipformat %x != mime_type, \"%s\" != \"%s\"\n", + ok(!strcmp(clipfmt, mime_type), "clipformat %x != mime_type, \"%s\" != \"%s\"\n", pformatetc->cfFormat, clipfmt, mime_type); } else { ok(pformatetc->cfFormat == 0, "clipformat=%x\n", pformatetc->cfFormat); @@ -3053,9 +3053,9 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) return; if((bindf & BINDF_ASYNCHRONOUS) && !no_callback) { - while(!stopped_binding && GetMessage(&msg,NULL,0,0)) { + while(!stopped_binding && GetMessageA(&msg,NULL,0,0)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageA(&msg); } } @@ -3323,9 +3323,9 @@ static void test_BindToObject(int protocol, DWORD flags, HRESULT exhres) IUnknown_Release(unk); while((bindf & BINDF_ASYNCHRONOUS) && - !((!emulate_protocol || stopped_binding) && stopped_obj_binding) && GetMessage(&msg,NULL,0,0)) { + !((!emulate_protocol || stopped_binding) && stopped_obj_binding) && GetMessageA(&msg,NULL,0,0)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageA(&msg); } CLEAR_CALLED(QueryInterface_IBindStatusCallbackEx); @@ -3835,7 +3835,7 @@ START_TEST(url) { HMODULE hurlmon; - hurlmon = GetModuleHandle("urlmon.dll"); + hurlmon = GetModuleHandleA("urlmon.dll"); pCreateAsyncBindCtxEx = (void*) GetProcAddress(hurlmon, "CreateAsyncBindCtxEx"); if(!GetProcAddress(hurlmon, "CompareSecurityIds")) { @@ -3847,8 +3847,8 @@ START_TEST(url) if(!pCreateUri) win_skip("IUri not supported\n"); - complete_event = CreateEvent(NULL, FALSE, FALSE, NULL); - complete_event2 = CreateEvent(NULL, FALSE, FALSE, NULL); + complete_event = CreateEventW(NULL, FALSE, FALSE, NULL); + complete_event2 = CreateEventW(NULL, FALSE, FALSE, NULL); thread_id = GetCurrentThreadId(); create_html_file(); create_cache_file();

1 0

Aric Stewart : usp10: Rewrite resolveExplicit for Unicode 6.3.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 2531d40b51ce3fbb9a73e5043affd3684e106f1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2531d40b51ce3fbb9a73e5043… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Nov 1 12:00:24 2013 -0500 usp10: Rewrite resolveExplicit for Unicode 6.3. --- dlls/usp10/bidi.c | 338 ++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 254 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2531d40b51ce3fbb9a73e…

1 0

Aric Stewart : usp10: Rewrite resolveWeak for Unicode 6.3.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: c7677336317560d5b91e22c3d345672e19887ffc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7677336317560d5b91e22c3d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Nov 1 12:00:37 2013 -0500 usp10: Rewrite resolveWeak for Unicode 6.3. --- dlls/usp10/bidi.c | 515 ++++++++++++++++++++++++++++++++--------------------- 1 files changed, 309 insertions(+), 206 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c7677336317560d5b91e2…

1 0

Aric Stewart : usp10: Rewrite resolveNeutral and resolveImplicit for Unicode 6.3.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: de5dc96f85449ed3a9d58957e9401ea37bbf7613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de5dc96f85449ed3a9d58957e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Nov 1 12:00:54 2013 -0500 usp10: Rewrite resolveNeutral and resolveImplicit for Unicode 6.3. --- dlls/usp10/bidi.c | 269 ++++++++++++++++++----------------------------------- 1 files changed, 91 insertions(+), 178 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de5dc96f85449ed3a9d58…

1 0

Aric Stewart : usp10: Implement resolveResolved (L1) for Unicode 6.3.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 9ccfebd6155af026572beaabb172345793aadc37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ccfebd6155af026572beaabb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Nov 1 12:01:05 2013 -0500 usp10: Implement resolveResolved (L1) for Unicode 6.3. --- dlls/usp10/bidi.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 242ad91..ceb498e 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -793,6 +793,37 @@ static void resolveImplicit(const WORD * pcls, WORD *plevel, int sos, int eos) } } +static void resolveResolved(unsigned baselevel, const WORD * pcls, WORD *plevel, int sos, int eos) +{ + int i; + + /* L1 */ + for (i = sos; i <= eos; i++) + { + if (pcls[i] == B || pcls[i] == S) + { + int j = i -1; + while (i > sos && j >= sos && + (pcls[j] == WS || pcls[j] == FSI || pcls[j] == LRI || pcls[j] == RLI || + pcls[j] == PDI || pcls[j] == LRE || pcls[j] == RLE || pcls[j] == LRO || + pcls[j] == RLO || pcls[j] == PDF || pcls[j] == BN)) + plevel[j--] = baselevel; + plevel[i] = baselevel; + } + if (i == eos && + (pcls[i] == WS || pcls[i] == FSI || pcls[i] == LRI || pcls[i] == RLI || + pcls[i] == PDI || pcls[i] == LRE || pcls[i] == RLE || pcls[i] == LRO || + pcls[i] == RLO || pcls[i] == PDF || pcls[i] == BN )) + { + int j = i; + while (j >= sos && (pcls[j] == WS || pcls[j] == FSI || pcls[j] == LRI || pcls[j] == RLI || + pcls[j] == PDI || pcls[j] == LRE || pcls[j] == RLE || pcls[j] == LRO || + pcls[j] == RLO || pcls[j] == PDF || pcls[j] == BN)) + plevel[j--] = baselevel; + } + } +} + static void computeIsolatingRunsSet(unsigned baselevel, WORD *pcls, WORD *pLevel, int uCount, struct list *set) { int run_start, run_end, i; @@ -972,6 +1003,10 @@ BOOL BIDI_DetermineLevels( /* resolveImplicit */ resolveImplicit(chartype, lpOutLevels, 0, uCount-1); + /* resolveResolvedLevels*/ + classify(lpString, chartype, uCount, c); + resolveResolved(baselevel, chartype, lpOutLevels, 0, uCount-1); + HeapFree(GetProcessHeap(), 0, chartype); return TRUE; }

1 0