September 2012 - Wine-Commits

Ričardas Barkauskas : dxgi: Partially implement IDXGISwapChain_GetDesc.
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: d9ce33bfb0e443bef2e0c6a9557362b8ff4f3af3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ce33bfb0e443bef2e0c6a95… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Sep 24 21:01:29 2012 +0300 dxgi: Partially implement IDXGISwapChain_GetDesc. --- dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/swapchain.c | 39 +++++++++++++++++- dlls/dxgi/utils.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 137 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 4c426ba..1ae997c 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -72,6 +72,7 @@ struct dxgi_device_layer /* TRACE helper functions */ const char *debug_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; +DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; /* IDXGIFactory */ diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index a5b517b..7b903a6 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -192,9 +192,44 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetFullscreenState(IDXGISwapChai static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc(IDXGISwapChain *iface, DXGI_SWAP_CHAIN_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct dxgi_swapchain *swapchain = impl_from_IDXGISwapChain(iface); + struct wined3d_swapchain_desc wined3d_desc; + HRESULT hr; - return E_NOTIMPL; + FIXME("iface %p, desc %p partial stub!\n", iface, desc); + + if (desc == NULL) + return E_INVALIDARG; + + EnterCriticalSection(&dxgi_cs); + + hr = wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); + if (FAILED(hr)) + { + LeaveCriticalSection(&dxgi_cs); + return hr; + } + + LeaveCriticalSection(&dxgi_cs); + + FIXME("Ignoring ScanlineOrdering, Scaling, SwapEffect and Flags\n"); + + desc->BufferDesc.Width = wined3d_desc.backbuffer_width; + desc->BufferDesc.Height = wined3d_desc.backbuffer_height; + desc->BufferDesc.RefreshRate.Numerator = wined3d_desc.refresh_rate; + desc->BufferDesc.RefreshRate.Denominator = 1; + desc->BufferDesc.Format = dxgi_format_from_wined3dformat(wined3d_desc.backbuffer_format); + desc->BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + desc->BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + desc->SampleDesc.Count = wined3d_desc.multisample_type; + desc->SampleDesc.Quality = wined3d_desc.multisample_quality; + desc->BufferCount = wined3d_desc.backbuffer_count; + desc->OutputWindow = wined3d_desc.device_window; + desc->Windowed = wined3d_desc.windowed; + desc->SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + desc->Flags = 0; + + return hr; } static HRESULT STDMETHODCALLTYPE dxgi_swapchain_ResizeBuffers(IDXGISwapChain *iface, diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index 1d3e320..979c972 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -127,6 +127,105 @@ const char *debug_dxgi_format(DXGI_FORMAT format) #undef WINE_DXGI_TO_STR +DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) +{ + switch(format) + { + case WINED3DFMT_UNKNOWN: return DXGI_FORMAT_UNKNOWN; + case WINED3DFMT_R32G32B32A32_TYPELESS: return DXGI_FORMAT_R32G32B32A32_TYPELESS; + case WINED3DFMT_R32G32B32A32_FLOAT: return DXGI_FORMAT_R32G32B32A32_FLOAT; + case WINED3DFMT_R32G32B32A32_UINT: return DXGI_FORMAT_R32G32B32A32_UINT; + case WINED3DFMT_R32G32B32A32_SINT: return DXGI_FORMAT_R32G32B32A32_SINT; + case WINED3DFMT_R32G32B32_TYPELESS: return DXGI_FORMAT_R32G32B32_TYPELESS; + case WINED3DFMT_R32G32B32_FLOAT: return DXGI_FORMAT_R32G32B32_FLOAT; + case WINED3DFMT_R32G32B32_UINT: return DXGI_FORMAT_R32G32B32_UINT; + case WINED3DFMT_R32G32B32_SINT: return DXGI_FORMAT_R32G32B32_SINT; + case WINED3DFMT_R16G16B16A16_TYPELESS: return DXGI_FORMAT_R16G16B16A16_TYPELESS; + case WINED3DFMT_R16G16B16A16_FLOAT: return DXGI_FORMAT_R16G16B16A16_FLOAT; + case WINED3DFMT_R16G16B16A16_UNORM: return DXGI_FORMAT_R16G16B16A16_UNORM; + case WINED3DFMT_R16G16B16A16_UINT: return DXGI_FORMAT_R16G16B16A16_UINT; + case WINED3DFMT_R16G16B16A16_SNORM: return DXGI_FORMAT_R16G16B16A16_SNORM; + case WINED3DFMT_R16G16B16A16_SINT: return DXGI_FORMAT_R16G16B16A16_SINT; + case WINED3DFMT_R32G32_TYPELESS: return DXGI_FORMAT_R32G32_TYPELESS; + case WINED3DFMT_R32G32_FLOAT: return DXGI_FORMAT_R32G32_FLOAT; + case WINED3DFMT_R32G32_UINT: return DXGI_FORMAT_R32G32_UINT; + case WINED3DFMT_R32G32_SINT: return DXGI_FORMAT_R32G32_SINT; + case WINED3DFMT_R32G8X24_TYPELESS: return DXGI_FORMAT_R32G8X24_TYPELESS; + case WINED3DFMT_D32_FLOAT_S8X24_UINT: return DXGI_FORMAT_D32_FLOAT_S8X24_UINT; + case WINED3DFMT_R32_FLOAT_X8X24_TYPELESS: return DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS; + case WINED3DFMT_X32_TYPELESS_G8X24_UINT: return DXGI_FORMAT_X32_TYPELESS_G8X24_UINT; + case WINED3DFMT_R10G10B10A2_TYPELESS: return DXGI_FORMAT_R10G10B10A2_TYPELESS; + case WINED3DFMT_R10G10B10A2_UNORM: return DXGI_FORMAT_R10G10B10A2_UNORM; + case WINED3DFMT_R10G10B10A2_UINT: return DXGI_FORMAT_R10G10B10A2_UINT; + case WINED3DFMT_R11G11B10_FLOAT: return DXGI_FORMAT_R11G11B10_FLOAT; + case WINED3DFMT_R8G8B8A8_TYPELESS: return DXGI_FORMAT_R8G8B8A8_TYPELESS; + case WINED3DFMT_R8G8B8A8_UNORM: return DXGI_FORMAT_R8G8B8A8_UNORM; + case WINED3DFMT_R8G8B8A8_UNORM_SRGB: return DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; + case WINED3DFMT_R8G8B8A8_UINT: return DXGI_FORMAT_R8G8B8A8_UINT; + case WINED3DFMT_R8G8B8A8_SNORM: return DXGI_FORMAT_R8G8B8A8_SNORM; + case WINED3DFMT_R8G8B8A8_SINT: return DXGI_FORMAT_R8G8B8A8_SINT; + case WINED3DFMT_R16G16_TYPELESS: return DXGI_FORMAT_R16G16_TYPELESS; + case WINED3DFMT_R16G16_FLOAT: return DXGI_FORMAT_R16G16_FLOAT; + case WINED3DFMT_R16G16_UNORM: return DXGI_FORMAT_R16G16_UNORM; + case WINED3DFMT_R16G16_UINT: return DXGI_FORMAT_R16G16_UINT; + case WINED3DFMT_R16G16_SNORM: return DXGI_FORMAT_R16G16_SNORM; + case WINED3DFMT_R16G16_SINT: return DXGI_FORMAT_R16G16_SINT; + case WINED3DFMT_R32_TYPELESS: return DXGI_FORMAT_R32_TYPELESS; + case WINED3DFMT_D32_FLOAT: return DXGI_FORMAT_D32_FLOAT; + case WINED3DFMT_R32_FLOAT: return DXGI_FORMAT_R32_FLOAT; + case WINED3DFMT_R32_UINT: return DXGI_FORMAT_R32_UINT; + case WINED3DFMT_R32_SINT: return DXGI_FORMAT_R32_SINT; + case WINED3DFMT_R24G8_TYPELESS: return DXGI_FORMAT_R24G8_TYPELESS; + case WINED3DFMT_D24_UNORM_S8_UINT: return DXGI_FORMAT_D24_UNORM_S8_UINT; + case WINED3DFMT_R24_UNORM_X8_TYPELESS: return DXGI_FORMAT_R24_UNORM_X8_TYPELESS; + case WINED3DFMT_X24_TYPELESS_G8_UINT: return DXGI_FORMAT_X24_TYPELESS_G8_UINT; + case WINED3DFMT_R8G8_TYPELESS: return DXGI_FORMAT_R8G8_TYPELESS; + case WINED3DFMT_R8G8_UNORM: return DXGI_FORMAT_R8G8_UNORM; + case WINED3DFMT_R8G8_UINT: return DXGI_FORMAT_R8G8_UINT; + case WINED3DFMT_R8G8_SNORM: return DXGI_FORMAT_R8G8_SNORM; + case WINED3DFMT_R8G8_SINT: return DXGI_FORMAT_R8G8_SINT; + case WINED3DFMT_R16_TYPELESS: return DXGI_FORMAT_R16_TYPELESS; + case WINED3DFMT_R16_FLOAT: return DXGI_FORMAT_R16_FLOAT; + case WINED3DFMT_D16_UNORM: return DXGI_FORMAT_D16_UNORM; + case WINED3DFMT_R16_UNORM: return DXGI_FORMAT_R16_UNORM; + case WINED3DFMT_R16_UINT: return DXGI_FORMAT_R16_UINT; + case WINED3DFMT_R16_SNORM: return DXGI_FORMAT_R16_SNORM; + case WINED3DFMT_R16_SINT: return DXGI_FORMAT_R16_SINT; + case WINED3DFMT_R8_TYPELESS: return DXGI_FORMAT_R8_TYPELESS; + case WINED3DFMT_R8_UNORM: return DXGI_FORMAT_R8_UNORM; + case WINED3DFMT_R8_UINT: return DXGI_FORMAT_R8_UINT; + case WINED3DFMT_R8_SNORM: return DXGI_FORMAT_R8_SNORM; + case WINED3DFMT_R8_SINT: return DXGI_FORMAT_R8_SINT; + case WINED3DFMT_A8_UNORM: return DXGI_FORMAT_A8_UNORM; + case WINED3DFMT_R1_UNORM: return DXGI_FORMAT_R1_UNORM; + case WINED3DFMT_R9G9B9E5_SHAREDEXP: return DXGI_FORMAT_R9G9B9E5_SHAREDEXP; + case WINED3DFMT_R8G8_B8G8_UNORM: return DXGI_FORMAT_R8G8_B8G8_UNORM; + case WINED3DFMT_G8R8_G8B8_UNORM: return DXGI_FORMAT_G8R8_G8B8_UNORM; + case WINED3DFMT_BC1_TYPELESS: return DXGI_FORMAT_BC1_TYPELESS; + case WINED3DFMT_BC1_UNORM: return DXGI_FORMAT_BC1_UNORM; + case WINED3DFMT_BC1_UNORM_SRGB: return DXGI_FORMAT_BC1_UNORM_SRGB; + case WINED3DFMT_BC2_TYPELESS: return DXGI_FORMAT_BC2_TYPELESS; + case WINED3DFMT_BC2_UNORM: return DXGI_FORMAT_BC2_UNORM; + case WINED3DFMT_BC2_UNORM_SRGB: return DXGI_FORMAT_BC2_UNORM_SRGB; + case WINED3DFMT_BC3_TYPELESS: return DXGI_FORMAT_BC3_TYPELESS; + case WINED3DFMT_BC3_UNORM: return DXGI_FORMAT_BC3_UNORM; + case WINED3DFMT_BC3_UNORM_SRGB: return DXGI_FORMAT_BC3_UNORM_SRGB; + case WINED3DFMT_BC4_TYPELESS: return DXGI_FORMAT_BC4_TYPELESS; + case WINED3DFMT_BC4_UNORM: return DXGI_FORMAT_BC4_UNORM; + case WINED3DFMT_BC4_SNORM: return DXGI_FORMAT_BC4_SNORM; + case WINED3DFMT_BC5_TYPELESS: return DXGI_FORMAT_BC5_TYPELESS; + case WINED3DFMT_BC5_UNORM: return DXGI_FORMAT_BC5_UNORM; + case WINED3DFMT_BC5_SNORM: return DXGI_FORMAT_BC5_SNORM; + case WINED3DFMT_B5G6R5_UNORM: return DXGI_FORMAT_B5G6R5_UNORM; + case WINED3DFMT_B5G5R5A1_UNORM: return DXGI_FORMAT_B5G5R5A1_UNORM; + case WINED3DFMT_B8G8R8A8_UNORM: return DXGI_FORMAT_B8G8R8A8_UNORM; + case WINED3DFMT_B8G8R8X8_UNORM: return DXGI_FORMAT_B8G8R8X8_UNORM; + default: + FIXME("Unhandled wined3d format %#x.\n", format); + return DXGI_FORMAT_UNKNOWN; + } +} + enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) { switch(format)

1 0

André Hentschel : crypt32/tests: Improve test output.
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: f98c896e8aacafcfc163938e84242f17d9aa2c20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f98c896e8aacafcfc163938e8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 25 00:47:54 2012 +0200 crypt32/tests: Improve test output. --- dlls/crypt32/tests/sip.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index 8d9af75..f63afc7 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -101,7 +101,7 @@ static void test_AddRemoveProvider(void) skip("Need admin rights\n"); return; } - ok ( ret, "CryptSIPAddProvider should have succeeded\n"); + ok ( ret, "CryptSIPAddProvider should have succeeded, last error %d\n", GetLastError()); /* Dummy provider will be deleted, but the function still fails because * pwszIsFunctionName and pwszIsFunctionNameFmt2 are not present in the @@ -132,12 +132,12 @@ static void test_AddRemoveProvider(void) newprov.pwszIsFunctionName = dummyfunction; SetLastError(0xdeadbeef); ret = CryptSIPAddProvider(&newprov); - ok ( ret, "CryptSIPAddProvider should have succeeded\n"); + ok ( ret, "CryptSIPAddProvider should have succeeded, last error %d\n", GetLastError()); /* Dummy provider should be deleted */ SetLastError(0xdeadbeef); ret = CryptSIPRemoveProvider(&actionid); - ok ( ret, "CryptSIPRemoveProvider should have succeeded\n"); + ok ( ret, "CryptSIPRemoveProvider should have succeeded, last error %d\n", GetLastError()); } static const BYTE cabFileData[] = {

1 0

Ričardas Barkauskas : wined3d: Don' t leave leftover textures when destroying and creating dxgi swapchains.
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: 06a8cbcc352a8ad92413a30e8a3f00e2c76110a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06a8cbcc352a8ad92413a30e8… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Sep 24 21:01:18 2012 +0300 wined3d: Don't leave leftover textures when destroying and creating dxgi swapchains. --- dlls/wined3d/swapchain.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c4fc409..6be89af 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -42,7 +42,8 @@ static void swapchain_cleanup(struct wined3d_swapchain *swapchain) * is the last buffer to be destroyed, FindContext() depends on that. */ if (swapchain->front_buffer) { - surface_set_container(swapchain->front_buffer, WINED3D_CONTAINER_NONE, NULL); + if (swapchain->front_buffer->container.type == WINED3D_CONTAINER_SWAPCHAIN) + surface_set_container(swapchain->front_buffer, WINED3D_CONTAINER_NONE, NULL); if (wined3d_surface_decref(swapchain->front_buffer)) WARN("Something's still holding the front buffer (%p).\n", swapchain->front_buffer); swapchain->front_buffer = NULL; @@ -54,7 +55,8 @@ static void swapchain_cleanup(struct wined3d_swapchain *swapchain) while (i--) { - surface_set_container(swapchain->back_buffers[i], WINED3D_CONTAINER_NONE, NULL); + if (swapchain->back_buffers[i]->container.type == WINED3D_CONTAINER_SWAPCHAIN) + surface_set_container(swapchain->back_buffers[i], WINED3D_CONTAINER_NONE, NULL); if (wined3d_surface_decref(swapchain->back_buffers[i])) WARN("Something's still holding back buffer %u (%p).\n", i, swapchain->back_buffers[i]); } @@ -917,7 +919,8 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, enum wined3d_ goto err; } - surface_set_container(swapchain->front_buffer, WINED3D_CONTAINER_SWAPCHAIN, swapchain); + if (swapchain->front_buffer->container.type == WINED3D_CONTAINER_NONE) + surface_set_container(swapchain->front_buffer, WINED3D_CONTAINER_SWAPCHAIN, swapchain); if (surface_type == WINED3D_SURFACE_TYPE_OPENGL) surface_modify_location(swapchain->front_buffer, SFLAG_INDRAWABLE, TRUE); @@ -1025,8 +1028,8 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, enum wined3d_ WARN("Failed to create back buffer %u, hr %#x.\n", i, hr); goto err; } - - surface_set_container(swapchain->back_buffers[i], WINED3D_CONTAINER_SWAPCHAIN, swapchain); + if (swapchain->back_buffers[i]->container.type == WINED3D_CONTAINER_NONE) + surface_set_container(swapchain->back_buffers[i], WINED3D_CONTAINER_SWAPCHAIN, swapchain); } }

1 0

Ričardas Barkauskas : dxgi: Avoid division by zero.
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: 342ce213e6d00949bef65a66b32c131dd3cac3bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=342ce213e6d00949bef65a66b… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Sep 24 21:01:44 2012 +0300 dxgi: Avoid division by zero. Based on patch by Eduard - Gabriel Munteanu. --- dlls/dxgi/factory.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index b339d0f..72927c5 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -161,6 +161,14 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_GetWindowAssociation(IWineDXGIFact return E_NOTIMPL; } +static UINT dxgi_rational_to_uint(const DXGI_RATIONAL *rational) +{ + if (rational->Denominator) + return rational->Numerator / rational->Denominator; + else + return rational->Numerator; +} + static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IWineDXGIFactory *iface, IUnknown *device, DXGI_SWAP_CHAIN_DESC *desc, IDXGISwapChain **swapchain) { @@ -218,7 +226,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IWineDXGIFactory * wined3d_desc.enable_auto_depth_stencil = FALSE; wined3d_desc.auto_depth_stencil_format = 0; wined3d_desc.flags = 0; /* WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL? */ - wined3d_desc.refresh_rate = desc->BufferDesc.RefreshRate.Numerator / desc->BufferDesc.RefreshRate.Denominator; + wined3d_desc.refresh_rate = dxgi_rational_to_uint(&desc->BufferDesc.RefreshRate); wined3d_desc.swap_interval = WINED3DPRESENT_INTERVAL_DEFAULT; hr = wined3d_device_init_3d(wined3d_device, &wined3d_desc);

1 0

Dmitry Timoshkov : gdiplus: Remove GIF properties test from generic tests, they are tested separately.
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: a0424f33c0b7beb2581c8775c7960544332d6b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0424f33c0b7beb2581c8775c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 25 12:50:36 2012 +0900 gdiplus: Remove GIF properties test from generic tests, they are tested separately. --- dlls/gdiplus/tests/image.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index b792ebe..9313f2c 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2788,7 +2788,6 @@ static void test_image_properties(void) td[] = { { pngimage, sizeof(pngimage), ImageTypeBitmap, 4, ~0, 1, 20, 0x5110, 0x132 }, - { gifimage, sizeof(gifimage), ImageTypeBitmap, 1, 4, 4, 0, 0x5100, 0 }, { jpgimage, sizeof(jpgimage), ImageTypeBitmap, 2, ~0, 128, 0, 0x5090, 0x5091 }, { tiffimage, sizeof(tiffimage), ImageTypeBitmap, 16, 0, 4, 0, 0xfe, 0 }, { bmpimage, sizeof(bmpimage), ImageTypeBitmap, 0, 0, 0, 0, 0, 0 }, @@ -2821,8 +2820,7 @@ static void test_image_properties(void) status = GdipGetPropertyCount(image, &prop_count); ok(status == Ok, "%u: GdipGetPropertyCount error %d\n", i, status); - if (td[i].image_data == pngimage || td[i].image_data == gifimage || - td[i].image_data == jpgimage) + if (td[i].image_data == pngimage || td[i].image_data == jpgimage) todo_wine ok(td[i].prop_count == prop_count || td[i].prop_count2 == prop_count, " %u: expected property count %u or %u, got %u\n",

1 0

Henri Verbeet : wined3d: Just return the shader from wined3d_device_get_pixel_shader().
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: 6e4c40689cf72fe5a7e3e38f5367b1152e756387 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4c40689cf72fe5a7e3e38f5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 25 10:34:43 2012 +0200 wined3d: Just return the shader from wined3d_device_get_pixel_shader(). --- dlls/d3d8/device.c | 10 ++-------- dlls/d3d9/device.c | 4 +--- dlls/wined3d/device.c | 9 +-------- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index a313654..4a96c2f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2463,7 +2463,6 @@ static HRESULT WINAPI d3d8_device_GetPixelShader(IDirect3DDevice8 *iface, DWORD { struct d3d8_pixel_shader *d3d8_shader; d3d8_shader = wined3d_shader_get_parent(object); - wined3d_shader_decref(object); *shader = d3d8_shader->handle; } else @@ -2481,7 +2480,6 @@ static HRESULT WINAPI d3d8_device_DeletePixelShader(IDirect3DDevice8 *iface, DWO { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct d3d8_pixel_shader *shader_impl; - struct wined3d_shader *cur; TRACE("iface %p, shader %#x.\n", iface, shader); @@ -2494,12 +2492,8 @@ static HRESULT WINAPI d3d8_device_DeletePixelShader(IDirect3DDevice8 *iface, DWO return D3DERR_INVALIDCALL; } - if ((cur = wined3d_device_get_pixel_shader(device->wined3d_device))) - { - if (cur == shader_impl->wined3d_shader) - IDirect3DDevice8_SetPixelShader(iface, 0); - wined3d_shader_decref(cur); - } + if (wined3d_device_get_pixel_shader(device->wined3d_device) == shader_impl->wined3d_shader) + IDirect3DDevice8_SetPixelShader(iface, 0); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index c166ad4..d194642 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2586,13 +2586,11 @@ static HRESULT WINAPI d3d9_device_GetPixelShader(IDirect3DDevice9Ex *iface, IDir if (!shader) return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - wined3d_shader = wined3d_device_get_pixel_shader(device->wined3d_device); - if (wined3d_shader) + if ((wined3d_shader = wined3d_device_get_pixel_shader(device->wined3d_device))) { shader_impl = wined3d_shader_get_parent(wined3d_shader); *shader = &shader_impl->IDirect3DPixelShader9_iface; IDirect3DPixelShader9_AddRef(*shader); - wined3d_shader_decref(wined3d_shader); } else { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 19e21a0..0d78257 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2862,16 +2862,9 @@ void CDECL wined3d_device_set_pixel_shader(struct wined3d_device *device, struct struct wined3d_shader * CDECL wined3d_device_get_pixel_shader(const struct wined3d_device *device) { - struct wined3d_shader *shader; - TRACE("device %p.\n", device); - shader = device->stateBlock->state.pixel_shader; - if (shader) - wined3d_shader_incref(shader); - - TRACE("Returning %p.\n", shader); - return shader; + return device->stateBlock->state.pixel_shader; } HRESULT CDECL wined3d_device_set_ps_consts_b(struct wined3d_device *device,

1 0

Nikolay Sivov : mlang: Forward GetNumberOfCodePageInfo() to IMultiLanguage3 implementation.
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: db1cd7eba8692bb3a06d182cd75bf68d572d1737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db1cd7eba8692bb3a06d182cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 25 11:48:38 2012 +0400 mlang: Forward GetNumberOfCodePageInfo() to IMultiLanguage3 implementation. --- dlls/mlang/mlang.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 31d9985..6a58b1f 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2064,16 +2064,11 @@ static ULONG WINAPI fnIMultiLanguage_Release( IMultiLanguage* iface ) static HRESULT WINAPI fnIMultiLanguage_GetNumberOfCodePageInfo( IMultiLanguage* iface, - UINT* pcCodePage) + UINT* cp) { MLang_impl *This = impl_from_IMultiLanguage( iface ); - - TRACE("(%p, %p)\n", This, pcCodePage); - - if (!pcCodePage) return E_INVALIDARG; - - *pcCodePage = This->total_cp; - return S_OK; + TRACE("(%p, %p)\n", This, cp); + return IMultiLanguage3_GetNumberOfCodePageInfo(&This->IMultiLanguage3_iface, cp); } static HRESULT WINAPI fnIMultiLanguage_GetCodePageInfo(

1 0

André Hentschel : ntdll/tests: Fix test failure on win8.
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: 0da26cfc4c9856f8c65e0a7951be5beac468b480 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0da26cfc4c9856f8c65e0a795… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 25 00:47:27 2012 +0200 ntdll/tests: Fix test failure on win8. --- dlls/ntdll/tests/om.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index ac37761..1ff0f0c 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -143,7 +143,8 @@ static void test_namespace_pipe(void) status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN); ok(status == STATUS_OBJECT_PATH_NOT_FOUND || status == STATUS_PIPE_NOT_AVAILABLE || - status == STATUS_OBJECT_NAME_INVALID, /* vista */ + status == STATUS_OBJECT_NAME_INVALID || /* vista */ + status == STATUS_OBJECT_NAME_NOT_FOUND, /* win8 */ "NtOpenFile should have failed with STATUS_OBJECT_PATH_NOT_FOUND got(%08x)\n", status); pRtlInitUnicodeString(&str, buffer4);

1 0

Marcus Meissner : shlwapi: Fixed incorrect buffer size.
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: 73dfc3d46222be6a788e5fd4439773e786e1325b URL: http://source.winehq.org/git/wine.git/?a=commit;h=73dfc3d46222be6a788e5fd44… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Sep 25 08:13:02 2012 +0200 shlwapi: Fixed incorrect buffer size. --- dlls/shlwapi/tests/url.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index ee3adf6..b24a277 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -1062,7 +1062,7 @@ static void test_UrlCanonicalizeW(void) BOOL choped; int pos; - MultiByteToWideChar(CP_ACP, 0, "http://www.winehq.org/X", -1, szUrl, sizeof(szUrl)); + MultiByteToWideChar(CP_ACP, 0, "http://www.winehq.org/X", -1, szUrl, sizeof(szUrl)/sizeof(szUrl[0])); pos = lstrlenW(szUrl) - 1; szUrl[pos] = i; urllen = INTERNET_MAX_URL_LENGTH;

1 0

Nikolay Sivov : mlang: Implemented IMLangConvertCharset_DoConversionToUnicode.
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: 406c4311098721ae1d2beeeb527ca76aeebe115f URL: http://source.winehq.org/git/wine.git/?a=commit;h=406c4311098721ae1d2beeeb5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 25 11:42:59 2012 +0400 mlang: Implemented IMLangConvertCharset_DoConversionToUnicode. --- dlls/mlang/mlang.c | 6 +++- dlls/mlang/tests/mlang.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index caae2c2..37102a3 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3635,6 +3635,7 @@ static HRESULT WINAPI MLangConvertCharset_GetSourceCodePage(IMLangConvertCharset TRACE("(%p)->(%p)\n", This, src_cp); + if (!src_cp) return E_INVALIDARG; *src_cp = This->src_cp; return S_OK; } @@ -3645,6 +3646,7 @@ static HRESULT WINAPI MLangConvertCharset_GetDestinationCodePage(IMLangConvertCh TRACE("(%p)->(%p)\n", This, dst_cp); + if (!dst_cp) return E_INVALIDARG; *dst_cp = This->dst_cp; return S_OK; } @@ -3668,8 +3670,8 @@ static HRESULT WINAPI MLangConvertCharset_DoConversionToUnicode(IMLangConvertCha UINT *src_size, WCHAR *dest, UINT *dest_size) { struct convert_charset *This = impl_from_IMLangConvertCharset(iface); - FIXME("(%p)->(%p %p %p %p): stub\n", This, src, src_size, dest, dest_size); - return E_NOTIMPL; + TRACE("(%p)->(%p %p %p %p)\n", This, src, src_size, dest, dest_size); + return ConvertINetMultiByteToUnicode(NULL, This->src_cp, src, (INT*)src_size, dest, (INT*)dest_size); } static HRESULT WINAPI MLangConvertCharset_DoConversionFromUnicode(IMLangConvertCharset *iface, diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 91463f9..fb37e27 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1914,6 +1914,68 @@ todo_wine { } } +static void test_IMLangConvertCharset(IMultiLanguage *ml) +{ + IMLangConvertCharset *convert; + WCHAR strW[] = {'a','b','c','d',0}; + UINT cp, src_size, dst_size; + char strA[] = "abcd"; + WCHAR buffW[20]; + HRESULT hr; + + hr = IMultiLanguage_CreateConvertCharset(ml, CP_ACP, CP_UTF8, 0, &convert); +todo_wine + ok(hr == S_FALSE, "expected S_FALSE got 0x%08x\n", hr); + + hr = IMLangConvertCharset_GetSourceCodePage(convert, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + cp = CP_UTF8; + hr = IMLangConvertCharset_GetSourceCodePage(convert, &cp); + ok(hr == S_OK, "expected S_OK got 0x%08x\n", hr); + ok(cp == CP_ACP, "got %d\n", cp); + + hr = IMLangConvertCharset_GetDestinationCodePage(convert, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + cp = CP_ACP; + hr = IMLangConvertCharset_GetDestinationCodePage(convert, &cp); + ok(hr == S_OK, "expected S_OK got 0x%08x\n", hr); + ok(cp == CP_UTF8, "got %d\n", cp); + + /* DoConversionToUnicode */ + hr = IMLangConvertCharset_Initialize(convert, CP_UTF8, CP_UNICODE, 0); + ok(hr == S_OK, "expected S_OK got 0x%08x\n", hr); + + hr = IMLangConvertCharset_DoConversionToUnicode(convert, NULL, NULL, NULL, NULL); + ok(hr == E_FAIL || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); + + src_size = -1; + dst_size = 20; + buffW[0] = 0; + buffW[4] = 4; + hr = IMLangConvertCharset_DoConversionToUnicode(convert, strA, &src_size, buffW, &dst_size); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!memcmp(buffW, strW, 4*sizeof(WCHAR)), "got converted string %s\n", wine_dbgstr_wn(buffW, dst_size)); + ok(dst_size == 4, "got %d\n", dst_size); + ok(buffW[4] == 4, "got %d\n", buffW[4]); + ok(src_size == 4, "got %d\n", src_size); + + src_size = -1; + dst_size = 0; + buffW[0] = 1; + hr = IMLangConvertCharset_DoConversionToUnicode(convert, strA, &src_size, buffW, &dst_size); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(buffW[0] == 1, "got %d\n", buffW[0]); + ok(dst_size == 4, "got %d\n", dst_size); + ok(src_size == 4, "got %d\n", src_size); + + hr = IMLangConvertCharset_Initialize(convert, CP_UNICODE, CP_UNICODE, 0); + ok(hr == S_OK, "expected S_OK got 0x%08x\n", hr); + + IMLangConvertCharset_Release(convert); +} + START_TEST(mlang) { IMultiLanguage *iML = NULL; @@ -1940,6 +2002,7 @@ START_TEST(mlang) if (ret != S_OK || !iML) return; test_GetNumberOfCodePageInfo((IMultiLanguage2 *)iML); + test_IMLangConvertCharset(iML); IMultiLanguage_Release(iML);

1 0