July 2009 - Wine-commits - list.winehq.org

Michael Stefaniuc : msacm32: Build language resource files separately.
by Alexandre Julliard 03 Jul '09

03 Jul '09

Module: wine Branch: master Commit: 9bb0f9c723a00703ab29ea9c015e1ffa354548da URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bb0f9c723a00703ab29ea9c0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 01:38:29 2009 +0200 msacm32: Build language resource files separately. Do not include them from an other rc file. --- dlls/msacm32/Makefile.in | 23 ++++++++++++++++++++++- dlls/msacm32/msacm.rc | 46 ---------------------------------------------- dlls/msacm32/msacm_Cs.rc | 2 ++ dlls/msacm32/msacm_Da.rc | 2 ++ dlls/msacm32/msacm_De.rc | 2 ++ dlls/msacm32/msacm_En.rc | 2 ++ dlls/msacm32/msacm_Es.rc | 2 ++ dlls/msacm32/msacm_Fr.rc | 2 ++ dlls/msacm32/msacm_Hu.rc | 2 ++ dlls/msacm32/msacm_It.rc | 2 ++ dlls/msacm32/msacm_Ja.rc | 4 ++-- dlls/msacm32/msacm_Ko.rc | 2 ++ dlls/msacm32/msacm_Lt.rc | 4 ++-- dlls/msacm32/msacm_Nl.rc | 2 ++ dlls/msacm32/msacm_No.rc | 2 ++ dlls/msacm32/msacm_Pl.rc | 3 +++ dlls/msacm32/msacm_Pt.rc | 2 ++ dlls/msacm32/msacm_Ro.rc | 4 ++-- dlls/msacm32/msacm_Ru.rc | 2 ++ dlls/msacm32/msacm_Si.rc | 4 ++-- dlls/msacm32/msacm_Sv.rc | 2 ++ dlls/msacm32/msacm_Tr.rc | 2 ++ dlls/msacm32/msacm_Zh.rc | 4 ++-- dlls/msacm32/wineacm.h | 3 +++ 24 files changed, 68 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9bb0f9c723a00703ab29e…

1 0

Michael Stefaniuc : wininet: Build language resource files separately.
by Alexandre Julliard 03 Jul '09

03 Jul '09

Module: wine Branch: master Commit: d66c0921086f454be4343f32108bc8f94294981e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d66c0921086f454be4343f321… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 01:38:15 2009 +0200 wininet: Build language resource files separately. Do not include them from an other rc file. --- dlls/wininet/Makefile.in | 28 +++++++++++++++++- dlls/wininet/resource.h | 3 ++ dlls/wininet/rsrc.rc | 67 -------------------------------------------- dlls/wininet/wininet_Bg.rc | 2 + dlls/wininet/wininet_Cs.rc | 2 + dlls/wininet/wininet_Da.rc | 2 + dlls/wininet/wininet_De.rc | 2 + dlls/wininet/wininet_En.rc | 2 + dlls/wininet/wininet_Eo.rc | 2 + dlls/wininet/wininet_Es.rc | 2 + dlls/wininet/wininet_Fi.rc | 2 + dlls/wininet/wininet_Fr.rc | 2 + dlls/wininet/wininet_Hu.rc | 2 + dlls/wininet/wininet_It.rc | 2 + dlls/wininet/wininet_Ja.rc | 4 +- dlls/wininet/wininet_Ko.rc | 2 + dlls/wininet/wininet_Lt.rc | 4 +- dlls/wininet/wininet_Nl.rc | 2 + dlls/wininet/wininet_No.rc | 2 + dlls/wininet/wininet_Pl.rc | 2 + dlls/wininet/wininet_Pt.rc | 2 + dlls/wininet/wininet_Ro.rc | 4 +- dlls/wininet/wininet_Ru.rc | 2 + dlls/wininet/wininet_Si.rc | 4 +- dlls/wininet/wininet_Sv.rc | 2 + dlls/wininet/wininet_Tr.rc | 2 + dlls/wininet/wininet_Uk.rc | 2 + dlls/wininet/wininet_Zh.rc | 4 +- 28 files changed, 79 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d66c0921086f454be4343…

1 0

Henri Verbeet : wined3d: Use a proper structure for storing initial GL context information.
by Alexandre Julliard 03 Jul '09

03 Jul '09

Module: wine Branch: master Commit: 4cacf2e08ff40bfd114e269825d96f3aadbb0462 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cacf2e08ff40bfd114e26982… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 3 09:39:18 2009 +0200 wined3d: Use a proper structure for storing initial GL context information. --- dlls/wined3d/directx.c | 109 +++++++++++++++++++++--------------------------- 1 files changed, 47 insertions(+), 62 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 87f6e89..513fbfe 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -197,9 +197,12 @@ glMultiTexCoordFunc multi_texcoord_funcs[WINED3D_FFP_EMIT_COUNT]; * function query some info from GL. */ -static BOOL wined3d_fake_gl_context_available = FALSE; -static HDC wined3d_fake_gl_context_hdc = NULL; -static HWND wined3d_fake_gl_context_hwnd = NULL; +struct wined3d_fake_gl_ctx +{ + HDC dc; + HWND wnd; + HGLRC gl_ctx; +}; static CRITICAL_SECTION wined3d_fake_gl_context_cs; static CRITICAL_SECTION_DEBUG wined3d_fake_gl_context_cs_debug = @@ -211,41 +214,27 @@ static CRITICAL_SECTION_DEBUG wined3d_fake_gl_context_cs_debug = }; static CRITICAL_SECTION wined3d_fake_gl_context_cs = { &wined3d_fake_gl_context_cs_debug, -1, 0, 0, 0, 0 }; -static void WineD3D_ReleaseFakeGLContext(void) { - HGLRC glCtx; - +static void WineD3D_ReleaseFakeGLContext(struct wined3d_fake_gl_ctx *ctx) +{ EnterCriticalSection(&wined3d_fake_gl_context_cs); - if(!wined3d_fake_gl_context_available) { - TRACE_(d3d_caps)("context not available\n"); - LeaveCriticalSection(&wined3d_fake_gl_context_cs); - return; - } + TRACE_(d3d_caps)("Destroying fake GL context.\n"); - glCtx = pwglGetCurrentContext(); - if (glCtx) + if (!pwglMakeCurrent(NULL, NULL)) { - TRACE_(d3d_caps)("destroying fake GL context\n"); - if (!pwglMakeCurrent(NULL, NULL)) - { - ERR("Failed to disable fake GL context.\n"); - } - pwglDeleteContext(glCtx); + ERR_(d3d_caps)("Failed to disable fake GL context.\n"); } - if (wined3d_fake_gl_context_hdc) - ReleaseDC(wined3d_fake_gl_context_hwnd, wined3d_fake_gl_context_hdc); - wined3d_fake_gl_context_hdc = NULL; /* Make sure we don't think that it is still around */ - if (wined3d_fake_gl_context_hwnd) - DestroyWindow(wined3d_fake_gl_context_hwnd); - wined3d_fake_gl_context_hwnd = NULL; - wined3d_fake_gl_context_available = FALSE; + + pwglDeleteContext(ctx->gl_ctx); + ReleaseDC(ctx->wnd, ctx->dc); + DestroyWindow(ctx->wnd); LeaveCriticalSection(&wined3d_fake_gl_context_cs); } -static BOOL WineD3D_CreateFakeGLContext(void) { +static BOOL WineD3D_CreateFakeGLContext(struct wined3d_fake_gl_ctx *ctx) +{ PIXELFORMATDESCRIPTOR pfd; - HGLRC glCtx = NULL; int iPixelFormat; EnterCriticalSection(&wined3d_fake_gl_context_cs); @@ -253,18 +242,18 @@ static BOOL WineD3D_CreateFakeGLContext(void) { TRACE("getting context...\n"); /* We need a fake window as a hdc retrieved using GetDC(0) can't be used for much GL purposes. */ - wined3d_fake_gl_context_hwnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", + ctx->wnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", WS_OVERLAPPEDWINDOW, 10, 10, 10, 10, NULL, NULL, NULL, NULL); - if (!wined3d_fake_gl_context_hwnd) + if (!ctx->wnd) { - ERR("HWND creation failed!\n"); + ERR_(d3d_caps)("Failed to create a window.\n"); goto fail; } - wined3d_fake_gl_context_hdc = GetDC(wined3d_fake_gl_context_hwnd); - if (!wined3d_fake_gl_context_hdc) + ctx->dc = GetDC(ctx->wnd); + if (!ctx->dc) { - ERR("GetDC failed!\n"); + ERR_(d3d_caps)("Failed to get a DC.\n"); goto fail; } @@ -277,43 +266,43 @@ static BOOL WineD3D_CreateFakeGLContext(void) { pfd.cColorBits = 32; pfd.iLayerType = PFD_MAIN_PLANE; - iPixelFormat = ChoosePixelFormat(wined3d_fake_gl_context_hdc, &pfd); + iPixelFormat = ChoosePixelFormat(ctx->dc, &pfd); if (!iPixelFormat) { /* If this happens something is very wrong as ChoosePixelFormat barely fails. */ - ERR("Can't find a suitable iPixelFormat.\n"); + ERR_(d3d_caps)("Can't find a suitable iPixelFormat.\n"); goto fail; } - DescribePixelFormat(wined3d_fake_gl_context_hdc, iPixelFormat, sizeof(pfd), &pfd); - SetPixelFormat(wined3d_fake_gl_context_hdc, iPixelFormat, &pfd); + DescribePixelFormat(ctx->dc, iPixelFormat, sizeof(pfd), &pfd); + SetPixelFormat(ctx->dc, iPixelFormat, &pfd); /* Create a GL context. */ - glCtx = pwglCreateContext(wined3d_fake_gl_context_hdc); - if (!glCtx) + ctx->gl_ctx = pwglCreateContext(ctx->dc); + if (!ctx->gl_ctx) { WARN_(d3d_caps)("Error creating default context for capabilities initialization.\n"); goto fail; } /* Make it the current GL context. */ - if (!pwglMakeCurrent(wined3d_fake_gl_context_hdc, glCtx)) + if (!pwglMakeCurrent(ctx->dc, ctx->gl_ctx)) { ERR_(d3d_caps)("Failed to make fake GL context current.\n"); goto fail; } context_set_last_device(NULL); - wined3d_fake_gl_context_available = TRUE; LeaveCriticalSection(&wined3d_fake_gl_context_cs); return TRUE; - fail: - if(wined3d_fake_gl_context_hdc) - ReleaseDC(wined3d_fake_gl_context_hwnd, wined3d_fake_gl_context_hdc); - wined3d_fake_gl_context_hdc = NULL; - if(wined3d_fake_gl_context_hwnd) - DestroyWindow(wined3d_fake_gl_context_hwnd); - wined3d_fake_gl_context_hwnd = NULL; - if(glCtx) pwglDeleteContext(glCtx); + +fail: + if (ctx->gl_ctx) pwglDeleteContext(ctx->gl_ctx); + ctx->gl_ctx = NULL; + if (ctx->dc) ReleaseDC(ctx->wnd, ctx->dc); + ctx->dc = NULL; + if (ctx->wnd) DestroyWindow(ctx->wnd); + ctx->wnd = NULL; + LeaveCriticalSection(&wined3d_fake_gl_context_cs); return FALSE; } @@ -4518,6 +4507,7 @@ BOOL InitAdapters(IWineD3DImpl *This) { struct WineD3DAdapter *adapter = &This->adapters[0]; const WineD3D_GL_Info *gl_info = &adapter->gl_info; + struct wined3d_fake_gl_ctx fake_gl_ctx = {0}; int iPixelFormat; int res; int i; @@ -4530,31 +4520,26 @@ BOOL InitAdapters(IWineD3DImpl *This) adapter->monitorPoint.x = -1; adapter->monitorPoint.y = -1; - if (!WineD3D_CreateFakeGLContext()) { + if (!WineD3D_CreateFakeGLContext(&fake_gl_ctx)) + { ERR("Failed to get a gl context for default adapter\n"); - WineD3D_ReleaseFakeGLContext(); goto nogl_adapter; } ret = IWineD3DImpl_FillGLCaps(&adapter->gl_info); if(!ret) { ERR("Failed to initialize gl caps for default adapter\n"); - WineD3D_ReleaseFakeGLContext(); + WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); goto nogl_adapter; } ret = initPixelFormats(&adapter->gl_info); if(!ret) { ERR("Failed to init gl formats\n"); - WineD3D_ReleaseFakeGLContext(); + WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); goto nogl_adapter; } - hdc = pwglGetCurrentDC(); - if(!hdc) { - ERR("Failed to get gl HDC\n"); - WineD3D_ReleaseFakeGLContext(); - goto nogl_adapter; - } + hdc = fake_gl_ctx.dc; adapter->driver = "Display"; adapter->description = "Direct3D HAL"; @@ -4691,7 +4676,7 @@ BOOL InitAdapters(IWineD3DImpl *This) { ERR("Disabling Direct3D because no hardware accelerated pixel formats have been found!\n"); - WineD3D_ReleaseFakeGLContext(); + WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); HeapFree(GetProcessHeap(), 0, adapter->cfgs); goto nogl_adapter; } @@ -4719,7 +4704,7 @@ BOOL InitAdapters(IWineD3DImpl *This) fixup_extensions(&adapter->gl_info); add_gl_compat_wrappers(&adapter->gl_info); - WineD3D_ReleaseFakeGLContext(); + WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); select_shader_mode(&adapter->gl_info, WINED3DDEVTYPE_HAL, &ps_selected_mode, &vs_selected_mode); select_shader_max_constants(ps_selected_mode, vs_selected_mode, &adapter->gl_info);

1 0

Henri Verbeet : wined3d: Get rid of wined3d_fake_gl_context_cs.
by Alexandre Julliard 03 Jul '09

03 Jul '09

Module: wine Branch: master Commit: 23ce9d72b8b29525828b1270a8361ea02f4f9858 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23ce9d72b8b29525828b1270a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 3 09:39:19 2009 +0200 wined3d: Get rid of wined3d_fake_gl_context_cs. --- dlls/wined3d/directx.c | 18 ------------------ 1 files changed, 0 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 513fbfe..b8534a6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -204,20 +204,8 @@ struct wined3d_fake_gl_ctx HGLRC gl_ctx; }; -static CRITICAL_SECTION wined3d_fake_gl_context_cs; -static CRITICAL_SECTION_DEBUG wined3d_fake_gl_context_cs_debug = -{ - 0, 0, &wined3d_fake_gl_context_cs, - { &wined3d_fake_gl_context_cs_debug.ProcessLocksList, - &wined3d_fake_gl_context_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": wined3d_fake_gl_context_cs") } -}; -static CRITICAL_SECTION wined3d_fake_gl_context_cs = { &wined3d_fake_gl_context_cs_debug, -1, 0, 0, 0, 0 }; - static void WineD3D_ReleaseFakeGLContext(struct wined3d_fake_gl_ctx *ctx) { - EnterCriticalSection(&wined3d_fake_gl_context_cs); - TRACE_(d3d_caps)("Destroying fake GL context.\n"); if (!pwglMakeCurrent(NULL, NULL)) @@ -228,8 +216,6 @@ static void WineD3D_ReleaseFakeGLContext(struct wined3d_fake_gl_ctx *ctx) pwglDeleteContext(ctx->gl_ctx); ReleaseDC(ctx->wnd, ctx->dc); DestroyWindow(ctx->wnd); - - LeaveCriticalSection(&wined3d_fake_gl_context_cs); } static BOOL WineD3D_CreateFakeGLContext(struct wined3d_fake_gl_ctx *ctx) @@ -237,8 +223,6 @@ static BOOL WineD3D_CreateFakeGLContext(struct wined3d_fake_gl_ctx *ctx) PIXELFORMATDESCRIPTOR pfd; int iPixelFormat; - EnterCriticalSection(&wined3d_fake_gl_context_cs); - TRACE("getting context...\n"); /* We need a fake window as a hdc retrieved using GetDC(0) can't be used for much GL purposes. */ @@ -292,7 +276,6 @@ static BOOL WineD3D_CreateFakeGLContext(struct wined3d_fake_gl_ctx *ctx) } context_set_last_device(NULL); - LeaveCriticalSection(&wined3d_fake_gl_context_cs); return TRUE; fail: @@ -303,7 +286,6 @@ fail: if (ctx->wnd) DestroyWindow(ctx->wnd); ctx->wnd = NULL; - LeaveCriticalSection(&wined3d_fake_gl_context_cs); return FALSE; }

1 0

Henri Verbeet : d3d9/tests: Add a small test for having multiple device active at the same time.
by Alexandre Julliard 03 Jul '09

03 Jul '09

Module: wine Branch: master Commit: 17c0e991065033eec1e14f5e985e418a555bc81e URL: http://source.winehq.org/git/wine.git/?a=commit;h=17c0e991065033eec1e14f5e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 3 09:39:20 2009 +0200 d3d9/tests: Add a small test for having multiple device active at the same time. This is essentially the situation that caused problems with reusing the initial GL context. --- dlls/d3d9/tests/device.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 279c065..66f53b9 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2312,6 +2312,70 @@ err_out: return; } +static void test_multi_device(void) +{ + IDirect3DDevice9 *device1 = NULL, *device2 = NULL; + D3DPRESENT_PARAMETERS present_parameters; + HWND hwnd1 = NULL, hwnd2 = NULL; + IDirect3D9 *d3d9; + ULONG refcount; + HRESULT hr; + + d3d9 = pDirect3DCreate9(D3D_SDK_VERSION); + ok(d3d9 != NULL, "Failed to create a d3d9 object.\n"); + if (!d3d9) goto fail; + + hwnd1 = CreateWindow("static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL); + ok(hwnd1 != NULL, "Failed to create a window.\n"); + if (!hwnd1) goto fail; + + memset(&present_parameters, 0, sizeof(present_parameters)); + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = hwnd1; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + + hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd1, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device1); + ok(SUCCEEDED(hr), "Failed to create a device, hr %#x\n", hr); + IDirect3D9_Release(d3d9); + d3d9 = NULL; + if (FAILED(hr)) goto fail; + + d3d9 = pDirect3DCreate9(D3D_SDK_VERSION); + ok(d3d9 != NULL, "Failed to create a d3d9 object.\n"); + if (!d3d9) goto fail; + + hwnd2 = CreateWindow("static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL); + ok(hwnd2 != NULL, "Failed to create a window.\n"); + if (!hwnd2) goto fail; + + memset(&present_parameters, 0, sizeof(present_parameters)); + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = hwnd2; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + + hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd2, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device2); + ok(SUCCEEDED(hr), "Failed to create a device, hr %#x\n", hr); + IDirect3D9_Release(d3d9); + d3d9 = NULL; + if (FAILED(hr)) goto fail; + +fail: + if (d3d9) IDirect3D9_Release(d3d9); + if (device1) + { + refcount = IDirect3DDevice9_Release(device1); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (device2) + { + refcount = IDirect3DDevice9_Release(device2); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (hwnd1) DestroyWindow(hwnd1); + if (hwnd2) DestroyWindow(hwnd2); +} START_TEST(device) { @@ -2334,6 +2398,7 @@ START_TEST(device) } IDirect3D9_Release(d3d9); + test_multi_device(); test_display_formats(); test_display_modes(); test_swapchain();

1 0

Henri Verbeet : wined3d: Don' t abuse blending to disable color writes in surface_depth_blt().
by Alexandre Julliard 03 Jul '09

03 Jul '09

Module: wine Branch: master Commit: 532b99078e5e04faf97a9e24138243a65393f6b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=532b99078e5e04faf97a9e241… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 3 09:39:21 2009 +0200 wined3d: Don't abuse blending to disable color writes in surface_depth_blt(). --- dlls/wined3d/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3e0413e..454a86f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4334,14 +4334,14 @@ static void surface_depth_blt(IWineD3DSurfaceImpl *This, GLuint texture, GLsizei glPushAttrib(GL_ENABLE_BIT | GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_VIEWPORT_BIT); glDisable(GL_CULL_FACE); - glEnable(GL_BLEND); + glDisable(GL_BLEND); glDisable(GL_ALPHA_TEST); glDisable(GL_SCISSOR_TEST); glDisable(GL_STENCIL_TEST); glEnable(GL_DEPTH_TEST); glDepthFunc(GL_ALWAYS); glDepthMask(GL_TRUE); - glBlendFunc(GL_ZERO, GL_ONE); + glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); glViewport(0, 0, w, h); surface_get_depth_blt_info(target, w, h, &info);

1 0

Huw Davies : gdi32/tests: Fix tests on win9x and winMe.
by Alexandre Julliard 03 Jul '09

03 Jul '09

Module: wine Branch: master Commit: 395436d2e9eec57d84cfdc4e27d4dcc7a30d2358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=395436d2e9eec57d84cfdc4e2… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 2 17:08:31 2009 +0100 gdi32/tests: Fix tests on win9x and winMe. --- dlls/gdi32/tests/metafile.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index a85c608..d1966da 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2429,7 +2429,9 @@ static void getwinmetafilebits(UINT mode, int scale) default: pt.x = pt.y = 0; } - ok((short)rec->rdParm[0] == pt.y, "got %d expect %d\n", (short)rec->rdParm[0], pt.y); + ok((short)rec->rdParm[0] == pt.y || + broken(mode >= MM_LOMETRIC && mode <= MM_TWIPS && (short)rec->rdParm[0] == pt.y - 1), /* win9x, winme */ + "got %d expect %d\n", (short)rec->rdParm[0], pt.y); ok((short)rec->rdParm[1] == pt.x, "got %d expect %d\n", (short)rec->rdParm[1], pt.x); } if(rec_num == mfcomment_chunks + 2)

1 0

Jacek Caban : urlmon: Added IBindStatusCallbackEx tests ( also fixes some IE8 failures).
by Alexandre Julliard 03 Jul '09

03 Jul '09

Module: wine Branch: master Commit: 288eefc7f181a34fa93a750abba9638ea7e84903 URL: http://source.winehq.org/git/wine.git/?a=commit;h=288eefc7f181a34fa93a750ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 2 23:21:08 2009 +0200 urlmon: Added IBindStatusCallbackEx tests (also fixes some IE8 failures). --- dlls/urlmon/tests/url.c | 144 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 114 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=288eefc7f181a34fa93a7…

1 0

Jacek Caban : urlmon: Use GetBinfInfoEx in GetBindInfo implementation if possible.
by Alexandre Julliard 03 Jul '09

03 Jul '09

Module: wine Branch: master Commit: b6259956c18ca00eb80362c6781b9e6399f946b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6259956c18ca00eb80362c67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 2 23:21:37 2009 +0200 urlmon: Use GetBinfInfoEx in GetBindInfo implementation if possible. --- dlls/urlmon/bindctx.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index fe80456..1a89482 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -178,10 +178,22 @@ static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface, DWORD *grfBINDF, BINDINFO *pbindinfo) { BindStatusCallback *This = STATUSCLB_THIS(iface); + IBindStatusCallbackEx *bscex; + HRESULT hres; TRACE("(%p)->(%p %p)\n", This, grfBINDF, pbindinfo); - return IBindStatusCallback_GetBindInfo(This->callback, grfBINDF, pbindinfo); + hres = IBindStatusCallback_QueryInterface(This->callback, &IID_IBindStatusCallbackEx, (void**)&bscex); + if(SUCCEEDED(hres)) { + DWORD bindf2 = 0, reserv = 0; + + hres = IBindStatusCallbackEx_GetBindInfoEx(bscex, grfBINDF, pbindinfo, &bindf2, &reserv); + IBindStatusCallbackEx_Release(bscex); + }else { + hres = IBindStatusCallback_GetBindInfo(This->callback, grfBINDF, pbindinfo); + } + + return hres; } static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *iface,

1 0

Jacek Caban : urlmon: Added IBindStatusCallbackEx implementation.
by Alexandre Julliard 03 Jul '09

03 Jul '09

Module: wine Branch: master Commit: df826fe82fab3416eb194c7e361d6fa8d72bfb69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df826fe82fab3416eb194c7e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 2 23:22:13 2009 +0200 urlmon: Added IBindStatusCallbackEx implementation. --- dlls/urlmon/bindctx.c | 65 ++++++++++++++++++++++++++++++++-------------- dlls/urlmon/tests/url.c | 1 - 2 files changed, 45 insertions(+), 21 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index 1a89482..0b3efa6 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -28,10 +28,10 @@ static WCHAR BSCBHolder[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_ extern IID IID_IBindStatusCallbackHolder; typedef struct { - const IBindStatusCallbackVtbl *lpBindStatusCallbackVtbl; - const IServiceProviderVtbl *lpServiceProviderVtbl; - const IHttpNegotiate2Vtbl *lpHttpNegotiate2Vtbl; - const IAuthenticateVtbl *lpAuthenticateVtbl; + const IBindStatusCallbackExVtbl *lpBindStatusCallbackExVtbl; + const IServiceProviderVtbl *lpServiceProviderVtbl; + const IHttpNegotiate2Vtbl *lpHttpNegotiate2Vtbl; + const IAuthenticateVtbl *lpAuthenticateVtbl; LONG ref; @@ -39,7 +39,8 @@ typedef struct { IServiceProvider *serv_prov; } BindStatusCallback; -#define STATUSCLB(x) ((IBindStatusCallback*) &(x)->lpBindStatusCallbackVtbl) +#define STATUSCLB(x) ((IBindStatusCallback*) &(x)->lpBindStatusCallbackExVtbl) +#define STATUSCLBEX(x) ((IBindStatusCallbackEx*)&(x)->lpBindStatusCallbackExVtbl) #define SERVPROV(x) ((IServiceProvider*) &(x)->lpServiceProviderVtbl) #define HTTPNEG2(x) ((IHttpNegotiate2*) &(x)->lpHttpNegotiate2Vtbl) #define AUTHENTICATE(x) ((IAuthenticate*) &(x)->lpAuthenticateVtbl) @@ -56,9 +57,9 @@ static void *get_callback_iface(BindStatusCallback *This, REFIID riid) return SUCCEEDED(hres) ? ret : NULL; } -#define STATUSCLB_THIS(iface) DEFINE_THIS(BindStatusCallback, BindStatusCallback, iface) +#define STATUSCLB_THIS(iface) DEFINE_THIS(BindStatusCallback, BindStatusCallbackEx, iface) -static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *iface, +static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallbackEx *iface, REFIID riid, void **ppv) { BindStatusCallback *This = STATUSCLB_THIS(iface); @@ -71,6 +72,9 @@ static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *ifa }else if(IsEqualGUID(&IID_IBindStatusCallback, riid)) { TRACE("(%p)->(IID_IBindStatusCallback, %p)\n", This, ppv); *ppv = STATUSCLB(This); + }else if(IsEqualGUID(&IID_IBindStatusCallbackEx, riid)) { + TRACE("(%p)->(IID_IBindStatusCallback, %p)\n", This, ppv); + *ppv = STATUSCLBEX(This); }else if(IsEqualGUID(&IID_IBindStatusCallbackHolder, riid)) { TRACE("(%p)->(IID_IBindStatusCallbackHolder, %p)\n", This, ppv); *ppv = This; @@ -97,7 +101,7 @@ static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *ifa return E_NOINTERFACE; } -static ULONG WINAPI BindStatusCallback_AddRef(IBindStatusCallback *iface) +static ULONG WINAPI BindStatusCallback_AddRef(IBindStatusCallbackEx *iface) { BindStatusCallback *This = STATUSCLB_THIS(iface); LONG ref = InterlockedIncrement(&This->ref); @@ -107,7 +111,7 @@ static ULONG WINAPI BindStatusCallback_AddRef(IBindStatusCallback *iface) return ref; } -static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface) +static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallbackEx *iface) { BindStatusCallback *This = STATUSCLB_THIS(iface); LONG ref = InterlockedDecrement(&This->ref); @@ -124,7 +128,7 @@ static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface) return ref; } -static HRESULT WINAPI BindStatusCallback_OnStartBinding(IBindStatusCallback *iface, +static HRESULT WINAPI BindStatusCallback_OnStartBinding(IBindStatusCallbackEx *iface, DWORD dwReserved, IBinding *pbind) { BindStatusCallback *This = STATUSCLB_THIS(iface); @@ -134,7 +138,7 @@ static HRESULT WINAPI BindStatusCallback_OnStartBinding(IBindStatusCallback *ifa return IBindStatusCallback_OnStartBinding(This->callback, 0xff, pbind); } -static HRESULT WINAPI BindStatusCallback_GetPriority(IBindStatusCallback *iface, LONG *pnPriority) +static HRESULT WINAPI BindStatusCallback_GetPriority(IBindStatusCallbackEx *iface, LONG *pnPriority) { BindStatusCallback *This = STATUSCLB_THIS(iface); @@ -143,7 +147,7 @@ static HRESULT WINAPI BindStatusCallback_GetPriority(IBindStatusCallback *iface, return IBindStatusCallback_GetPriority(This->callback, pnPriority); } -static HRESULT WINAPI BindStatusCallback_OnLowResource(IBindStatusCallback *iface, DWORD reserved) +static HRESULT WINAPI BindStatusCallback_OnLowResource(IBindStatusCallbackEx *iface, DWORD reserved) { BindStatusCallback *This = STATUSCLB_THIS(iface); @@ -152,7 +156,7 @@ static HRESULT WINAPI BindStatusCallback_OnLowResource(IBindStatusCallback *ifac return IBindStatusCallback_OnLowResource(This->callback, reserved); } -static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface, ULONG ulProgress, +static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallbackEx *iface, ULONG ulProgress, ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText) { BindStatusCallback *This = STATUSCLB_THIS(iface); @@ -164,7 +168,7 @@ static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface, ulProgressMax, ulStatusCode, szStatusText); } -static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *iface, +static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallbackEx *iface, HRESULT hresult, LPCWSTR szError) { BindStatusCallback *This = STATUSCLB_THIS(iface); @@ -174,7 +178,7 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac return IBindStatusCallback_OnStopBinding(This->callback, hresult, szError); } -static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface, +static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallbackEx *iface, DWORD *grfBINDF, BINDINFO *pbindinfo) { BindStatusCallback *This = STATUSCLB_THIS(iface); @@ -196,7 +200,7 @@ static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface, return hres; } -static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *iface, +static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallbackEx *iface, DWORD grfBSCF, DWORD dwSize, FORMATETC *pformatetc, STGMEDIUM *pstgmed) { BindStatusCallback *This = STATUSCLB_THIS(iface); @@ -206,7 +210,7 @@ static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *if return IBindStatusCallback_OnDataAvailable(This->callback, grfBSCF, dwSize, pformatetc, pstgmed); } -static HRESULT WINAPI BindStatusCallback_OnObjectAvailable(IBindStatusCallback *iface, +static HRESULT WINAPI BindStatusCallback_OnObjectAvailable(IBindStatusCallbackEx *iface, REFIID riid, IUnknown *punk) { BindStatusCallback *This = STATUSCLB_THIS(iface); @@ -216,9 +220,29 @@ static HRESULT WINAPI BindStatusCallback_OnObjectAvailable(IBindStatusCallback * return IBindStatusCallback_OnObjectAvailable(This->callback, riid, punk); } +static HRESULT WINAPI BindStatusCallback_GetBindInfoEx(IBindStatusCallbackEx *iface, DWORD *grfBINDF, + BINDINFO *pbindinfo, DWORD *grfBINDF2, DWORD *pdwReserved) +{ + BindStatusCallback *This = STATUSCLB_THIS(iface); + IBindStatusCallbackEx *bscex; + HRESULT hres; + + TRACE("(%p)->(%p %p %p %p)\n", This, grfBINDF, pbindinfo, grfBINDF2, pdwReserved); + + hres = IBindStatusCallback_QueryInterface(This->callback, &IID_IBindStatusCallbackEx, (void**)&bscex); + if(SUCCEEDED(hres)) { + hres = IBindStatusCallbackEx_GetBindInfoEx(bscex, grfBINDF, pbindinfo, grfBINDF2, pdwReserved); + IBindStatusCallbackEx_Release(bscex); + }else { + hres = IBindStatusCallback_GetBindInfo(This->callback, grfBINDF, pbindinfo); + } + + return hres; +} + #undef STATUSCLB_THIS -static const IBindStatusCallbackVtbl BindStatusCallbackVtbl = { +static const IBindStatusCallbackExVtbl BindStatusCallbackExVtbl = { BindStatusCallback_QueryInterface, BindStatusCallback_AddRef, BindStatusCallback_Release, @@ -229,7 +253,8 @@ static const IBindStatusCallbackVtbl BindStatusCallbackVtbl = { BindStatusCallback_OnStopBinding, BindStatusCallback_GetBindInfo, BindStatusCallback_OnDataAvailable, - BindStatusCallback_OnObjectAvailable + BindStatusCallback_OnObjectAvailable, + BindStatusCallback_GetBindInfoEx }; #define SERVPROV_THIS(iface) DEFINE_THIS(BindStatusCallback, ServiceProvider, iface) @@ -439,7 +464,7 @@ static IBindStatusCallback *create_bsc(IBindStatusCallback *bsc) { BindStatusCallback *ret = heap_alloc_zero(sizeof(BindStatusCallback)); - ret->lpBindStatusCallbackVtbl = &BindStatusCallbackVtbl; + ret->lpBindStatusCallbackExVtbl = &BindStatusCallbackExVtbl; ret->lpServiceProviderVtbl = &BSCServiceProviderVtbl; ret->lpHttpNegotiate2Vtbl = &BSCHttpNegotiateVtbl; ret->lpAuthenticateVtbl = &BSCAuthenticateVtbl; diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 473c6ab..b5bf79c 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1941,7 +1941,6 @@ static void test_GetBindInfoEx(IBindStatusCallback *holder) hres = IBindStatusCallback_QueryInterface(holder, &IID_IBindStatusCallbackEx, (void**)&bscex); if(FAILED(hres)) { - todo_wine win_skip("IBindStatusCallbackEx not supported\n"); return; }

1 0