June 2012 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Reset render target bindings in wined3d_device_reset().
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: befdbbd90f3be5e044d11be8af049410e7628f00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=befdbbd90f3be5e044d11be8a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 18 17:19:39 2012 +0200 wined3d: Reset render target bindings in wined3d_device_reset(). --- dlls/wined3d/device.c | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c934ced..b4ff8c8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5249,11 +5249,26 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, struct wined3d_display_mode mode; BOOL DisplayModeChanged = FALSE; BOOL update_desc = FALSE; + unsigned int i; HRESULT hr; TRACE("device %p, swapchain_desc %p.\n", device, swapchain_desc); + if (FAILED(hr = wined3d_device_get_swapchain(device, 0, &swapchain))) + { + ERR("Failed to get the first implicit swapchain.\n"); + return hr; + } + stateblock_unbind_resources(device->stateBlock); + if (swapchain->back_buffers && swapchain->back_buffers[0]) + wined3d_device_set_render_target(device, 0, swapchain->back_buffers[0], FALSE); + else + wined3d_device_set_render_target(device, 0, swapchain->front_buffer, FALSE); + for (i = 1; i < device->adapter->gl_info.limits.buffers; ++i) + { + wined3d_device_set_render_target(device, i, NULL, FALSE); + } wined3d_device_set_depth_stencil(device, NULL); if (device->onscreen_depth_stencil) @@ -5266,14 +5281,10 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, { TRACE("Enumerating resource %p.\n", resource); if (FAILED(hr = callback(resource))) + { + wined3d_swapchain_decref(swapchain); return hr; - } - - hr = wined3d_device_get_swapchain(device, 0, &swapchain); - if (FAILED(hr)) - { - ERR("Failed to get the first implicit swapchain\n"); - return hr; + } } if (!is_display_mode_supported(device, swapchain_desc))

1 0

Henri Verbeet : d3d9/tests: Add a test for resource bindings after reset.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: d74a587b1bced369c5dea08bbb97467ceba614dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d74a587b1bced369c5dea08bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 18 17:19:40 2012 +0200 d3d9/tests: Add a test for resource bindings after reset. --- dlls/d3d9/tests/device.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 607eced..7994a2a 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3425,6 +3425,85 @@ done: UnregisterClassA("d3d9_test_wndproc_wc", GetModuleHandleA(NULL)); } +static void test_reset_resources(void) +{ + IDirect3DSurface9 *surface, *rt; + IDirect3DTexture9 *texture; + IDirect3DDevice9 *device; + IDirect3D9 *d3d9; + unsigned int i; + D3DCAPS9 caps; + HWND window; + HRESULT hr; + ULONG ref; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D9 object, skipping tests.\n"); + DestroyWindow(window); + return; + } + + if (!(device = create_device(d3d9, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, D3DUSAGE_DEPTHSTENCIL, + D3DFMT_D24S8, D3DPOOL_DEFAULT, &texture, NULL); + ok(SUCCEEDED(hr), "Failed to create depth/stencil texture, hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr); + IDirect3DTexture9_Release(texture); + hr = IDirect3DDevice9_SetDepthStencilSurface(device, surface); + ok(SUCCEEDED(hr), "Failed to set depth/stencil surface, hr %#x.\n", hr); + IDirect3DSurface9_Release(surface); + + for (i = 0; i < caps.NumSimultaneousRTs; ++i) + { + hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, + D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &texture, NULL); + ok(SUCCEEDED(hr), "Failed to create render target texture %u, hr %#x.\n", i, hr); + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get surface %u, hr %#x.\n", i, hr); + IDirect3DTexture9_Release(texture); + hr = IDirect3DDevice9_SetRenderTarget(device, i, surface); + ok(SUCCEEDED(hr), "Failed to set render target surface %u, hr %#x.\n", i, hr); + IDirect3DSurface9_Release(surface); + } + + hr = reset_device(device, device_window, TRUE); + ok(SUCCEEDED(hr), "Failed to reset device.\n"); + + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &rt); + ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get render target surface, hr %#x.\n", hr); + ok(surface == rt, "Got unexpected surface %p for render target.\n", surface); + IDirect3DSurface9_Release(surface); + IDirect3DSurface9_Release(rt); + + for (i = 1; i < caps.NumSimultaneousRTs; ++i) + { + hr = IDirect3DDevice9_GetRenderTarget(device, i, &surface); + ok(hr == D3DERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + } + + ref = IDirect3DDevice9_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + +done: + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -3481,6 +3560,7 @@ START_TEST(device) test_window_style(); test_mode_change(); test_device_window_reset(); + test_reset_resources(); } out:

1 0

Henri Verbeet : d3d8/tests: Add a test for resource bindings after reset.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: 60ff5906ae44ca0e7606596de07f06bf4673fda6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60ff5906ae44ca0e7606596de… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 18 17:19:41 2012 +0200 d3d8/tests: Add a test for resource bindings after reset. --- dlls/d3d8/tests/device.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a34ba47..ddb72c6 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3163,6 +3163,70 @@ done: if (hwnd) DestroyWindow(hwnd); } +static void test_reset_resources(void) +{ + IDirect3DSurface8 *surface, *rt; + IDirect3DTexture8 *texture; + IDirect3DDevice8 *device; + IDirect3D8 *d3d8; + HWND window; + HRESULT hr; + ULONG ref; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D8 object, skipping tests.\n"); + DestroyWindow(window); + return; + } + + if (!(device = create_device(d3d8, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice8_CreateTexture(device, 128, 128, 1, D3DUSAGE_DEPTHSTENCIL, + D3DFMT_D24S8, D3DPOOL_DEFAULT, &texture); + ok(SUCCEEDED(hr), "Failed to create depth/stencil texture, hr %#x.\n", hr); + hr = IDirect3DTexture8_GetSurfaceLevel(texture, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr); + IDirect3DTexture8_Release(texture); + + hr = IDirect3DDevice8_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, + D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &texture); + ok(SUCCEEDED(hr), "Failed to create render target texture, hr %#x.\n", hr); + hr = IDirect3DTexture8_GetSurfaceLevel(texture, 0, &rt); + ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr); + IDirect3DTexture8_Release(texture); + + hr = IDirect3DDevice8_SetRenderTarget(device, rt, surface); + ok(SUCCEEDED(hr), "Failed to set render target surface, hr %#x.\n", hr); + IDirect3DSurface8_Release(rt); + IDirect3DSurface8_Release(surface); + + hr = reset_device(device, device_window, TRUE); + ok(SUCCEEDED(hr), "Failed to reset device.\n"); + + hr = IDirect3DDevice8_GetBackBuffer(device, 0, D3DBACKBUFFER_TYPE_MONO, &rt); + ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + hr = IDirect3DDevice8_GetRenderTarget(device, &surface); + ok(SUCCEEDED(hr), "Failed to get render target surface, hr %#x.\n", hr); + ok(surface == rt, "Got unexpected surface %p for render target.\n", surface); + IDirect3DSurface8_Release(surface); + IDirect3DSurface8_Release(rt); + + ref = IDirect3DDevice8_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + +done: + IDirect3D8_Release(d3d8); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -3217,6 +3281,7 @@ START_TEST(device) test_wrong_shader(); test_mode_change(); test_device_window_reset(); + test_reset_resources(); depth_blit_test(); } UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL));

1 0

Henri Verbeet : wined3d: Rename WINED3DLOCK_* to WINED3D_MAP_*.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: a6ffab3bf57b36cd67434feff646f12ccfac5bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6ffab3bf57b36cd67434feff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 18 17:19:42 2012 +0200 wined3d: Rename WINED3DLOCK_* to WINED3D_MAP_*. --- dlls/ddraw/vertexbuffer.c | 8 +++--- dlls/wined3d/buffer.c | 56 +++++++++++++++++++++++++-------------------- dlls/wined3d/device.c | 11 ++++----- dlls/wined3d/surface.c | 14 +++++------ dlls/wined3d/volume.c | 2 +- include/wine/wined3d.h | 12 +++++----- 6 files changed, 53 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a6ffab3bf57b36cd67434…

1 0

Jacek Caban : wininet: Added support for more certificate error types.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: e2a9511b30e5b68eb328c08ffecf56dcc91bce0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2a9511b30e5b68eb328c08ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 18 17:42:18 2012 +0200 wininet: Added support for more certificate error types. --- dlls/wininet/netconnection.c | 143 ++++++++++++++++++++++++------------------ 1 files changed, 82 insertions(+), 61 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index a705cce..c944ff3 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -245,76 +245,97 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR errors = chain->TrustStatus.dwErrorStatus; - if (chain->TrustStatus.dwErrorStatus & ~supportedErrors) { - WARN("error status %x\n", chain->TrustStatus.dwErrorStatus & ~supportedErrors); - if(conn->mask_errors) - WARN("CERT_TRUST_IS_NOT_TIME_VALID, unknown error flags\n"); - err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_INVALID_CERT; - errors &= supportedErrors; - } + do { + /* This seems strange, but that's what tests show */ + if(errors & (CERT_TRUST_IS_PARTIAL_CHAIN|CERT_TRUST_IS_OFFLINE_REVOCATION)) { + WARN("ERROR_INTERNET_SEC_CERT_REV_FAILED\n"); + err = ERROR_INTERNET_SEC_CERT_REV_FAILED; + if(conn->mask_errors) + conn->security_flags |= _SECURITY_FLAG_CERT_REV_FAILED; + if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) + break; + } - if(errors & CERT_TRUST_IS_NOT_TIME_VALID) { - WARN("CERT_TRUST_IS_NOT_TIME_VALID\n"); - if(conn->mask_errors) - conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_DATE; - if(!(conn->security_flags & SECURITY_FLAG_IGNORE_CERT_DATE_INVALID)) - err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_DATE_INVALID; - errors &= ~CERT_TRUST_IS_NOT_TIME_VALID; - } + if (chain->TrustStatus.dwErrorStatus & ~supportedErrors) { + WARN("error status %x\n", chain->TrustStatus.dwErrorStatus & ~supportedErrors); + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_INVALID_CERT; + errors &= supportedErrors; + if(!conn->mask_errors) + break; + WARN("unknown error flags\n"); + } - if(errors & CERT_TRUST_IS_UNTRUSTED_ROOT) { - WARN("CERT_TRUST_IS_UNTRUSTED_ROOT\n"); - if(conn->mask_errors) - WARN("CERT_TRUST_IS_UNTRUSTED_ROOT, unknown flags\n"); - if(!(conn->security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) - err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_INVALID_CA; - errors &= ~CERT_TRUST_IS_UNTRUSTED_ROOT; - } + if(errors & CERT_TRUST_IS_NOT_TIME_VALID) { + WARN("CERT_TRUST_IS_NOT_TIME_VALID\n"); + if(!(conn->security_flags & SECURITY_FLAG_IGNORE_CERT_DATE_INVALID)) { + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_DATE_INVALID; + if(!conn->mask_errors) + break; + conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_DATE; + } + errors &= ~CERT_TRUST_IS_NOT_TIME_VALID; + } - /* This seems strange, but that's what tests show */ - if(errors & CERT_TRUST_IS_PARTIAL_CHAIN) { - WARN("CERT_TRUST_IS_PARTIAL_CHAIN\n"); - if(!(conn->security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) { - if(!(conn->security_flags & _SECURITY_FLAG_CERT_REV_FAILED)) - err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_REV_FAILED; - else - err = conn->mask_errors ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_INVALID_CA; + if(errors & CERT_TRUST_IS_UNTRUSTED_ROOT) { + WARN("CERT_TRUST_IS_UNTRUSTED_ROOT\n"); + if(!(conn->security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) { + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_INVALID_CA; + if(!conn->mask_errors) + break; + conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CA; + } + errors &= ~CERT_TRUST_IS_UNTRUSTED_ROOT; } - if(conn->mask_errors) { - if(!(conn->security_flags & _SECURITY_FLAG_CERT_REV_FAILED)) - conn->security_flags |= _SECURITY_FLAG_CERT_REV_FAILED; - else + + if(errors & CERT_TRUST_IS_PARTIAL_CHAIN) { + WARN("CERT_TRUST_IS_PARTIAL_CHAIN\n"); + if(!(conn->security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) { + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_INVALID_CA; + if(!conn->mask_errors) + break; conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CA; + } + errors &= ~CERT_TRUST_IS_PARTIAL_CHAIN; } - errors &= ~CERT_TRUST_IS_PARTIAL_CHAIN; - } - if(errors & (CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN)) { - WARN("CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN\n"); - if(conn->mask_errors) - WARN("TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN, unknown error flags\n"); - if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) - err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_NO_REV; - errors &= ~(CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN); - } + if(errors & (CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN)) { + WARN("CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN\n"); + if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) { + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_NO_REV; + if(!conn->mask_errors) + break; + conn->security_flags |= _SECURITY_FLAG_CERT_REV_FAILED; + } + errors &= ~(CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN); + } - if(errors & CERT_TRUST_IS_REVOKED) { - WARN("CERT_TRUST_IS_REVOKED\n"); - if(conn->mask_errors) - WARN("TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN, unknown error flags\n"); - if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) - err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_REVOKED; - errors &= ~CERT_TRUST_IS_REVOKED; - } + if(errors & CERT_TRUST_IS_REVOKED) { + WARN("CERT_TRUST_IS_REVOKED\n"); + if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) { + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_REVOKED; + if(!conn->mask_errors) + break; + WARN("TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN, unknown error flags\n"); + } + errors &= ~CERT_TRUST_IS_REVOKED; + } - if(errors & CERT_TRUST_IS_NOT_VALID_FOR_USAGE) { - WARN("CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); - if(conn->mask_errors) - WARN("CERT_TRUST_IS_NOT_VALID_FOR_USAGE, unknown error flags\n"); - if(!(conn->security_flags & SECURITY_FLAG_IGNORE_WRONG_USAGE)) - err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_INVALID_CERT; - errors &= ~CERT_TRUST_IS_NOT_VALID_FOR_USAGE; - } + if(errors & CERT_TRUST_IS_NOT_VALID_FOR_USAGE) { + WARN("CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); + if(!(conn->security_flags & SECURITY_FLAG_IGNORE_WRONG_USAGE)) { + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_INVALID_CERT; + if(!conn->mask_errors) + break; + WARN("CERT_TRUST_IS_NOT_VALID_FOR_USAGE, unknown error flags\n"); + } + errors &= ~CERT_TRUST_IS_NOT_VALID_FOR_USAGE; + } + + if(err == ERROR_INTERNET_SEC_CERT_REV_FAILED) { + assert(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION); + err = ERROR_SUCCESS; + } + }while(0); if(!err || conn->mask_errors) { CERT_CHAIN_POLICY_PARA policyPara;

1 0

Jacek Caban : mshtml: Return true in IOmNavigator::javaEnabled.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: d0012f8fc6c8f708f8ab07ec64828973083f5344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0012f8fc6c8f708f8ab07ec6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 18 17:52:01 2012 +0200 mshtml: Return true in IOmNavigator::javaEnabled. --- dlls/mshtml/omnavigator.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index ff64a63..73bb0bb 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -689,7 +689,7 @@ static HRESULT WINAPI OmNavigator_javaEnabled(IOmNavigator *iface, VARIANT_BOOL FIXME("(%p)->(%p) semi-stub\n", This, enabled); - *enabled = VARIANT_FALSE; + *enabled = VARIANT_TRUE; return S_OK; }

1 0

Akihiro Sagawa : gdi32: Fix East-Asian font parameters.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: 2bb416baa88c28f57bb0f65aa9af9fff603ba60d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bb416baa88c28f57bb0f65aa… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jun 16 23:15:53 2012 +0900 gdi32: Fix East-Asian font parameters. --- dlls/gdi32/gdiobj.c | 18 +++++++++--------- dlls/gdi32/tests/font.c | 7 ------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index d87515f..6514cab 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -328,12 +328,12 @@ static const struct DefaultFontInfo default_fonts[] = }, { SHIFTJIS_CHARSET, { /* System */ - 16, 7, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, SHIFTJIS_CHARSET, + 18, 8, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, SHIFTJIS_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, {'S','y','s','t','e','m','\0'} }, { /* Device Default */ - 16, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, SHIFTJIS_CHARSET, + 18, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, SHIFTJIS_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, {'S','y','s','t','e','m','\0'} }, @@ -343,7 +343,7 @@ static const struct DefaultFontInfo default_fonts[] = {'C','o','u','r','i','e','r','\0'} }, { /* DefaultGuiFont */ - -11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, SHIFTJIS_CHARSET, + -12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, SHIFTJIS_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'} }, @@ -365,19 +365,19 @@ static const struct DefaultFontInfo default_fonts[] = {'C','o','u','r','i','e','r','\0'} }, { /* DefaultGuiFont */ - -11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, GB2312_CHARSET, + -12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, GB2312_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'} }, }, { HANGEUL_CHARSET, { /* System */ - 16, 7, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, HANGEUL_CHARSET, + 16, 8, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, HANGEUL_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, {'S','y','s','t','e','m','\0'} }, { /* Device Default */ - 16, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, HANGEUL_CHARSET, + 16, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, HANGEUL_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, {'S','y','s','t','e','m','\0'} }, @@ -387,7 +387,7 @@ static const struct DefaultFontInfo default_fonts[] = {'C','o','u','r','i','e','r','\0'} }, { /* DefaultGuiFont */ - -11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, HANGEUL_CHARSET, + -12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, HANGEUL_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'} }, @@ -409,7 +409,7 @@ static const struct DefaultFontInfo default_fonts[] = {'C','o','u','r','i','e','r','\0'} }, { /* DefaultGuiFont */ - -11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, CHINESEBIG5_CHARSET, + -12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, CHINESEBIG5_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'} }, @@ -431,7 +431,7 @@ static const struct DefaultFontInfo default_fonts[] = {'C','o','u','r','i','e','r','\0'} }, { /* DefaultGuiFont */ - -11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, JOHAB_CHARSET, + -12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, JOHAB_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'} }, diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 218b980..d14160b 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4460,14 +4460,7 @@ static void test_stock_fonts(void) continue; } - if ((font[i] == DEVICE_DEFAULT_FONT || font[i] == SYSTEM_FONT) && td[i][j].charset != DEFAULT_CHARSET) - todo_wine ok(td[i][j].weight == lf.lfWeight, "%d(%d): expected lfWeight %d, got %d\n", i, j, td[i][j].weight, lf.lfWeight); - else ok(td[i][j].weight == lf.lfWeight, "%d(%d): expected lfWeight %d, got %d\n", i, j, td[i][j].weight, lf.lfWeight); - if ((font[i] == DEFAULT_GUI_FONT && td[i][j].charset != DEFAULT_CHARSET) || - ((font[i] == DEVICE_DEFAULT_FONT || font[i] == SYSTEM_FONT) && td[i][j].charset == SHIFTJIS_CHARSET)) - todo_wine ok(td[i][j].height == lf.lfHeight, "%d(%d): expected lfHeight %d, got %d\n", i, j, td[i][j].height, lf.lfHeight); - else ok(td[i][j].height == lf.lfHeight, "%d(%d): expected lfHeight %d, got %d\n", i, j, td[i][j].height, lf.lfHeight); if (td[i][j].face_name[0] == '?') {

1 0

Akihiro Sagawa : gdi32: Remove an outdated comment in struct DefaultFontInfo.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: f503afd86ff9df9467eb1351cffd904ab3674285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f503afd86ff9df9467eb1351c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jun 16 23:15:55 2012 +0900 gdi32: Remove an outdated comment in struct DefaultFontInfo. --- dlls/gdi32/gdiobj.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 6514cab..14ac692 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -123,7 +123,7 @@ struct DefaultFontInfo LOGFONTW SystemFont; LOGFONTW DeviceDefaultFont; LOGFONTW SystemFixedFont; - LOGFONTW DefaultGuiFont; /* Note for this font the lfHeight member should be the point size */ + LOGFONTW DefaultGuiFont; }; static const struct DefaultFontInfo default_fonts[] =

1 0

André Hentschel : d3drm: Implement IDirect3DRMX_CreateMesh.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: ac5b932363ecc954dcfb49c24a027ac14f47e88b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac5b932363ecc954dcfb49c24… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 17 15:35:18 2012 +0200 d3drm: Implement IDirect3DRMX_CreateMesh. --- dlls/d3drm/d3drm.c | 12 ++++++------ dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/meshbuilder.c | 4 +--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 923a05c..3c1c20d 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -150,9 +150,9 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateMesh(IDirect3DRM* iface, LPDIRECT3DR { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - FIXME("(%p/%p)->(%p): stub\n", iface, This, ppMesh); + TRACE("(%p/%p)->(%p)\n", iface, This, ppMesh); - return E_NOTIMPL; + return IDirect3DRM3_CreateMesh(&This->IDirect3DRM3_iface, ppMesh); } static HRESULT WINAPI IDirect3DRMImpl_CreateMeshBuilder(IDirect3DRM* iface, LPDIRECT3DRMMESHBUILDER * ppMeshBuilder) @@ -518,9 +518,9 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateMesh(IDirect3DRM2* iface, LPDIRECT3 { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - FIXME("(%p/%p)->(%p): stub\n", iface, This, ppMesh); + TRACE("(%p/%p)->(%p)\n", iface, This, ppMesh); - return E_NOTIMPL; + return IDirect3DRM3_CreateMesh(&This->IDirect3DRM3_iface, ppMesh); } static HRESULT WINAPI IDirect3DRM2Impl_CreateMeshBuilder(IDirect3DRM2* iface, @@ -943,9 +943,9 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateMesh(IDirect3DRM3* iface, LPDIRECT3 { IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - FIXME("(%p/%p)->(%p): stub\n", iface, This, Mesh); + TRACE("(%p/%p)->(%p)\n", iface, This, Mesh); - return E_NOTIMPL; + return Direct3DRMMesh_create(Mesh); } static HRESULT WINAPI IDirect3DRM3Impl_CreateMeshBuilder(IDirect3DRM3* iface, diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 939304c..95eca5f 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -30,6 +30,7 @@ HRESULT Direct3DRM_create(IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMDevice_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent_frame, IUnknown** ret_iface) DECLSPEC_HIDDEN; HRESULT Direct3DRMLight_create(IUnknown** ppObj) DECLSPEC_HIDDEN; +HRESULT Direct3DRMMesh_create(IDirect3DRMMesh** obj) DECLSPEC_HIDDEN; HRESULT Direct3DRMMeshBuilder_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMViewport_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMMaterial_create(IDirect3DRMMaterial2** ret_iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index a05c597..589ebc7 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -34,8 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); -static HRESULT Direct3DRMMesh_create(IDirect3DRMMesh** obj); - typedef struct { unsigned nb_vertices; D3DRMVERTEX* vertices; @@ -2983,7 +2981,7 @@ static const struct IDirect3DRMMeshVtbl Direct3DRMMesh_Vtbl = IDirect3DRMMeshImpl_GetGroupTexture }; -static HRESULT Direct3DRMMesh_create(IDirect3DRMMesh** obj) +HRESULT Direct3DRMMesh_create(IDirect3DRMMesh** obj) { IDirect3DRMMeshImpl* object;

1 0

André Hentschel : d3drm: Implement IDirect3DRMMesh_GetClassName.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: 00773feafd73006b1f2b4d958413f13075f6f417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00773feafd73006b1f2b4d958… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 17 15:36:14 2012 +0200 d3drm: Implement IDirect3DRMMesh_GetClassName. --- dlls/d3drm/meshbuilder.c | 12 +++++++++--- dlls/d3drm/tests/d3drm.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 589ebc7..455bb32 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2584,13 +2584,19 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_GetName(IDirect3DRMMesh* iface, } static HRESULT WINAPI IDirect3DRMMeshImpl_GetClassName(IDirect3DRMMesh* iface, - LPDWORD lpdwSize, LPSTR lpName) + LPDWORD size, LPSTR name) { IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); - FIXME("(%p)->(%p,%p): stub\n", This, lpdwSize, lpName); + TRACE("(%p)->(%p, %p)\n", This, size, name); - return E_NOTIMPL; + if (!size || *size < strlen("Mesh") || !name) + return E_INVALIDARG; + + strcpy(name, "Mesh"); + *size = sizeof("Mesh"); + + return D3DRM_OK; } /*** IDirect3DRMMesh methods ***/ diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 2766098..5a66d54 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -553,6 +553,38 @@ static void test_MeshBuilder3(void) IDirect3DRM_Release(pD3DRM); } +static void test_Mesh(void) +{ + HRESULT hr; + LPDIRECT3DRM pD3DRM; + LPDIRECT3DRMMESH pMesh; + DWORD size; + CHAR cname[64] = {0}; + + hr = pDirect3DRMCreate(&pD3DRM); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + hr = IDirect3DRM_CreateMesh(pD3DRM, &pMesh); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMesh interface (hr = %x)\n", hr); + + hr = IDirect3DRMMesh_GetClassName(pMesh, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMMesh_GetClassName(pMesh, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = 1; + hr = IDirect3DRMMesh_GetClassName(pMesh, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = sizeof(cname); + hr = IDirect3DRMMesh_GetClassName(pMesh, &size, cname); + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(size == sizeof("Mesh"), "wrong size: %u\n", size); + ok(!strcmp(cname, "Mesh"), "Expected cname to be \"Mesh\", but got \"%s\"\n", cname); + + IDirect3DRMMesh_Release(pMesh); + + IDirect3DRM_Release(pD3DRM); +} + static void test_Frame(void) { HRESULT hr; @@ -991,6 +1023,7 @@ START_TEST(d3drm) test_MeshBuilder(); test_MeshBuilder3(); + test_Mesh(); test_Frame(); test_Light(); test_frame_transform();

1 0