January 2013 - Wine-commits

Jacek Caban : atl100: Added stubs for AtlAxDialogBox[AW].
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 59881c142ed990f1dcba15cc366b144d1f992cd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59881c142ed990f1dcba15cc3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 16 12:50:06 2013 +0100 atl100: Added stubs for AtlAxDialogBox[AW]. --- dlls/atl/atl.spec | 4 ++-- dlls/atl100/atl100.spec | 4 ++-- dlls/atl100/atl_ax.c | 22 ++++++++++++++++++++++ dlls/atl80/atl80.spec | 4 ++-- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index 7b36397..1a167a7 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -26,8 +26,8 @@ 31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface 34 stdcall AtlGetVersion(ptr) -35 stub AtlAxDialogBoxW -36 stub AtlAxDialogBoxA +35 stdcall AtlAxDialogBoxW(long wstr long ptr long) atl100.AtlAxDialogBoxW +36 stdcall AtlAxDialogBoxA(long str long ptr long) atl100.AtlAxDialogBoxA 37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl100.AtlAxCreateDialogW 38 stdcall AtlAxCreateDialogA(long str long ptr long) atl100.AtlAxCreateDialogA 39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl100.AtlAxCreateControl diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index 2de1102..1732052 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -18,8 +18,8 @@ 31 stdcall AtlComQIPtrAssign(ptr ptr ptr) 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) 34 stdcall AtlGetVersion(ptr) -35 stub AtlAxDialogBoxW -36 stub AtlAxDialogBoxA +35 stdcall AtlAxDialogBoxW(long wstr long ptr long) +36 stdcall AtlAxDialogBoxA(long str long ptr long) 37 stdcall AtlAxCreateDialogW(long wstr long ptr long) 38 stdcall AtlAxCreateDialogA(long str long ptr long) 39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) diff --git a/dlls/atl100/atl_ax.c b/dlls/atl100/atl_ax.c index bd0881f..4874d39 100644 --- a/dlls/atl100/atl_ax.c +++ b/dlls/atl100/atl_ax.c @@ -1350,3 +1350,25 @@ HRESULT WINAPI AtlAxGetControl(HWND hWnd, IUnknown **pUnk) return IOleObject_QueryInterface( This->control, &IID_IUnknown, (void**) pUnk ); } + +/*********************************************************************** + * AtlAxDialogBoxW [atl100.35] + * + */ +INT_PTR WINAPI AtlAxDialogBoxW(HINSTANCE hInstance, LPCWSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogProc, + LPARAM dwInitParam) +{ + FIXME("(%p %s %p %p %lx)\n", hInstance, debugstr_w(lpTemplateName), hWndParent, lpDialogProc, dwInitParam); + return 0; +} + +/*********************************************************************** + * AtlAxDialogBoxA [atl100.36] + * + */ +INT_PTR WINAPI AtlAxDialogBoxA(HINSTANCE hInstance, LPCSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogProc, + LPARAM dwInitParam) +{ + FIXME("(%p %s %p %p %lx)\n", hInstance, debugstr_a(lpTemplateName), hWndParent, lpDialogProc, dwInitParam); + return 0; +} diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index 620c719..dfc9c43 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -20,8 +20,8 @@ 31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface 34 stdcall AtlGetVersion(ptr) -35 stub AtlAxDialogBoxW -36 stub AtlAxDialogBoxA +35 stdcall AtlAxDialogBoxW(long wstr long ptr long) atl100.AtlAxDialogBoxW +36 stdcall AtlAxDialogBoxA(long str long ptr long) atl100.AtlAxDialogBoxA 37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl100.AtlAxCreateDialogW 38 stdcall AtlAxCreateDialogA(long str long ptr long) atl100.AtlAxCreateDialogA 39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl100.AtlAxCreateControl

1 0

Stefan Dösinger : d3d9/tests: Create a plain DS surface in test_reset_resources.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: ab36ab7d11f7fcafe1cea7c1cd7135a0472ffdb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab36ab7d11f7fcafe1cea7c1c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 16 12:44:15 2013 +0100 d3d9/tests: Create a plain DS surface in test_reset_resources. r200 does not support depth textures. --- dlls/d3d9/tests/device.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index a0997d6..cabdec5 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3523,12 +3523,9 @@ static void test_reset_resources(void) 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_CreateDepthStencilSurface(device, 128, 128, + D3DFMT_D24S8, D3DMULTISAMPLE_NONE, 0, TRUE, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create depth/stencil surface, hr %#x.\n", hr); hr = IDirect3DDevice9_SetDepthStencilSurface(device, surface); ok(SUCCEEDED(hr), "Failed to set depth/stencil surface, hr %#x.\n", hr); IDirect3DSurface9_Release(surface);

1 0

Stefan Dösinger : d3d8/tests: Create a plain DS surface in test_reset_resources.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: ce31e40f242353c45e1e60081ad4e5a6655325ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce31e40f242353c45e1e60081… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 16 12:44:16 2013 +0100 d3d8/tests: Create a plain DS surface in test_reset_resources. --- dlls/d3d8/tests/device.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 87d3f9e..ca34b81 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3252,12 +3252,9 @@ static void test_reset_resources(void) 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_CreateDepthStencilSurface(device, 128, 128, D3DFMT_D24S8, + D3DMULTISAMPLE_NONE, &surface); + ok(SUCCEEDED(hr), "Failed to create depth/stencil surface, hr %#x.\n", hr); hr = IDirect3DDevice8_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &texture);

1 0

Stefan Dösinger : ddraw/tests: Add basic tests for DrawIndexedPrimitiveStrided.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: a8469a458f2503e7683f45be02ab09af701e36ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8469a458f2503e7683f45be0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 16 12:44:17 2013 +0100 ddraw/tests: Add basic tests for DrawIndexedPrimitiveStrided. --- dlls/ddraw/tests/ddraw4.c | 73 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 68 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 140 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 3d81d1d..76ed55d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1,5 +1,6 @@ /* * Copyright 2011-2012 Henri Verbeet for CodeWeavers + * Copyright 2012-2013 Stefan Dösinger for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -2965,6 +2966,77 @@ static void test_coop_level_multi_window(void) DestroyWindow(window1); } +static void test_draw_strided(void) +{ + static struct vec3 position[] = + { + {-1.0, -1.0, 0.0}, + {-1.0, 1.0, 0.0}, + { 1.0, 1.0, 0.0}, + { 1.0, -1.0, 0.0}, + }; + static DWORD diffuse[] = + { + 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, + }; + static WORD indices[] = + { + 0, 1, 2, 2, 3, 0 + }; + + IDirectDrawSurface4 *rt; + IDirect3DDevice3 *device; + D3DCOLOR color; + HWND window; + HRESULT hr; + D3DDRAWPRIMITIVESTRIDEDDATA strided; + IDirect3DViewport3 *viewport; + static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create D3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice3_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + viewport = create_viewport(device, 0, 0, 640, 480); + hr = IDirect3DDevice3_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to activate the viewport, hr %#x.\n", hr); + hr = IDirect3DViewport3_Clear2(viewport, 1, &clear_rect, D3DCLEAR_TARGET, 0x00000000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear the viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + hr = IDirect3DDevice3_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + + memset(&strided, 0x55, sizeof(strided)); + strided.position.lpvData = position; + strided.position.dwStride = sizeof(*position); + strided.diffuse.lpvData = diffuse; + strided.diffuse.dwStride = sizeof(*diffuse); + hr = IDirect3DDevice3_DrawIndexedPrimitiveStrided(device, D3DPT_TRIANGLELIST, D3DFVF_XYZ | D3DFVF_DIFFUSE, + &strided, 4, indices, 6, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + + hr = IDirect3DDevice3_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + + IDirect3DViewport3_Release(viewport); + IDirectDrawSurface4_Release(rt); + IDirect3DDevice3_Release(device); + DestroyWindow(window); +} + START_TEST(ddraw4) { test_process_vertices(); @@ -2990,4 +3062,5 @@ START_TEST(ddraw4) test_coop_level_surf_create(); test_vb_discard(); test_coop_level_multi_window(); + test_draw_strided(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 5668dc7..6b6f6d6 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1,5 +1,5 @@ /* - * Copyright 2006 Stefan Dösinger for CodeWeavers + * Copyright 2006, 2012-2013 Stefan Dösinger for CodeWeavers * Copyright 2011 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -2774,6 +2774,71 @@ static void test_coop_level_multi_window(void) DestroyWindow(window1); } +static void test_draw_strided(void) +{ + static struct vec3 position[] = + { + {-1.0, -1.0, 0.0}, + {-1.0, 1.0, 0.0}, + { 1.0, 1.0, 0.0}, + { 1.0, -1.0, 0.0}, + }; + static DWORD diffuse[] = + { + 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, + }; + static WORD indices[] = + { + 0, 1, 2, 2, 3, 0 + }; + + IDirectDrawSurface7 *rt; + IDirect3DDevice7 *device; + D3DCOLOR color; + HWND window; + HRESULT hr; + D3DDRAWPRIMITIVESTRIDEDDATA strided; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create D3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00000000, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + hr = IDirect3DDevice7_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + + memset(&strided, 0x55, sizeof(strided)); + strided.position.lpvData = position; + strided.position.dwStride = sizeof(*position); + strided.diffuse.lpvData = diffuse; + strided.diffuse.dwStride = sizeof(*diffuse); + hr = IDirect3DDevice7_DrawIndexedPrimitiveStrided(device, D3DPT_TRIANGLELIST, D3DFVF_XYZ | D3DFVF_DIFFUSE, + &strided, 4, indices, 6, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + + hr = IDirect3DDevice7_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + + IDirectDrawSurface7_Release(rt); + IDirect3DDevice7_Release(device); + DestroyWindow(window); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -2806,4 +2871,5 @@ START_TEST(ddraw7) test_coop_level_surf_create(); test_vb_discard(); test_coop_level_multi_window(); + test_draw_strided(); }

1 0

Rico Schüller : d3dx9: Add support for D3DFMT_A32B32G32R32F.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 25ce3a42204ab43850ee92fab133ea42f288f1b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25ce3a42204ab43850ee92fab… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jan 15 19:25:26 2013 +0100 d3dx9: Add support for D3DFMT_A32B32G32R32F. --- dlls/d3dx9_36/d3dx9_36_private.h | 1 + dlls/d3dx9_36/tests/texture.c | 4 ++-- dlls/d3dx9_36/texture.c | 8 +++++--- dlls/d3dx9_36/util.c | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 01bfbbe..85f0871 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -48,6 +48,7 @@ struct volume enum format_type { FORMAT_ARGB, /* unsigned */ FORMAT_ARGBF16,/* float 16 */ + FORMAT_ARGBF, /* float */ FORMAT_DXT, FORMAT_UNKNOWN }; diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 968a8db..28fb47e 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1101,7 +1101,7 @@ static void test_D3DXFillTexture(IDirect3DDevice9 *device) if (SUCCEEDED(hr)) { hr = D3DXFillTexture(tex, fillfunc, NULL); - todo_wine ok(hr == D3D_OK, "D3DXFillTexture returned %#x, expected %#x\n", hr, D3D_OK); + ok(hr == D3D_OK, "D3DXFillTexture returned %#x, expected %#x\n", hr, D3D_OK); hr = IDirect3DTexture9_LockRect(tex, 0, &lock_rect, NULL, D3DLOCK_READONLY); if (SUCCEEDED(hr)) @@ -1124,7 +1124,7 @@ static void test_D3DXFillTexture(IDirect3DDevice9 *device) expected.z = 1.0f / 4.0f; expected.w = 1.0f; - todo_wine expect_vec4(&expected, &got); + expect_vec4(&expected, &got); } } diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 7323852..9e45506 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1236,6 +1236,8 @@ static inline void fill_texture(const struct pixel_format_desc *format, BYTE *po if (format->type == FORMAT_ARGBF16) v = float_32_to_16(comp_value); + else if (format->type == FORMAT_ARGBF) + v = *(DWORD *)&comp_value; else if (format->type == FORMAT_ARGB) v = comp_value * ((1 << format->bits[c]) - 1) + 0.5f; else @@ -1282,7 +1284,7 @@ HRESULT WINAPI D3DXFillTexture(struct IDirect3DTexture9 *texture, LPD3DXFILL2D f return D3DERR_INVALIDCALL; format = get_format_info(desc.Format); - if (format->type != FORMAT_ARGB && format->type != FORMAT_ARGBF16) + if (format->type != FORMAT_ARGB && format->type != FORMAT_ARGBF16 && format->type != FORMAT_ARGBF) { FIXME("Unsupported texture format %#x\n", desc.Format); return D3DERR_INVALIDCALL; @@ -1649,7 +1651,7 @@ HRESULT WINAPI D3DXFillCubeTexture(struct IDirect3DCubeTexture9 *texture, LPD3DX return D3DERR_INVALIDCALL; format = get_format_info(desc.Format); - if (format->type != FORMAT_ARGB && format->type != FORMAT_ARGBF16) + if (format->type != FORMAT_ARGB && format->type != FORMAT_ARGBF16 && format->type != FORMAT_ARGBF) { FIXME("Unsupported texture format %#x\n", desc.Format); return D3DERR_INVALIDCALL; @@ -1708,7 +1710,7 @@ HRESULT WINAPI D3DXFillVolumeTexture(struct IDirect3DVolumeTexture9 *texture, LP return D3DERR_INVALIDCALL; format = get_format_info(desc.Format); - if (format->type != FORMAT_ARGB && format->type != FORMAT_ARGBF16) + if (format->type != FORMAT_ARGB && format->type != FORMAT_ARGBF16 && format->type != FORMAT_ARGBF) { FIXME("Unsupported texture format %#x\n", desc.Format); return D3DERR_INVALIDCALL; diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 264581c..6d8d152 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -71,6 +71,7 @@ static const struct pixel_format_desc formats[] = {D3DFMT_DXT4, { 0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_DXT, NULL, NULL }, {D3DFMT_DXT5, { 0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_DXT, NULL, NULL }, {D3DFMT_A16B16G16R16F, {16, 16, 16, 16}, {48, 0, 16, 32}, 8, 1, 1, 8, FORMAT_ARGBF16, NULL, NULL }, + {D3DFMT_A32B32G32R32F, {32, 32, 32, 32}, {96, 0, 32, 64}, 16, 1, 1, 16, FORMAT_ARGBF, NULL, NULL }, /* marks last element */ {D3DFMT_UNKNOWN, { 0, 0, 0, 0}, { 0, 0, 0, 0}, 0, 1, 1, 0, FORMAT_UNKNOWN, NULL, NULL }, };

1 0

Rico Schüller : d3dx9: Add support for D3DFMT_A16B16G16R16.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 7c5517da6f8cc4a81b6760c5bce91eeed20e6ba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c5517da6f8cc4a81b6760c5b… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jan 15 19:25:45 2013 +0100 d3dx9: Add support for D3DFMT_A16B16G16R16. --- dlls/d3dx9_36/util.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 6d8d152..9ba54e2 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -59,6 +59,7 @@ static const struct pixel_format_desc formats[] = {D3DFMT_X4R4G4B4, { 0, 4, 4, 4}, { 0, 8, 4, 0}, 2, 1, 1, 2, FORMAT_ARGB, NULL, NULL }, {D3DFMT_A2R10G10B10, { 2, 10, 10, 10}, {30, 20, 10, 0}, 4, 1, 1, 4, FORMAT_ARGB, NULL, NULL }, {D3DFMT_A2B10G10R10, { 2, 10, 10, 10}, {30, 0, 10, 20}, 4, 1, 1, 4, FORMAT_ARGB, NULL, NULL }, + {D3DFMT_A16B16G16R16, {16, 16, 16, 16}, {48, 0, 16, 32}, 8, 1, 1, 8, FORMAT_ARGB, NULL, NULL }, {D3DFMT_G16R16, { 0, 16, 16, 0}, { 0, 0, 16, 0}, 4, 1, 1, 4, FORMAT_ARGB, NULL, NULL }, {D3DFMT_A8, { 8, 0, 0, 0}, { 0, 0, 0, 0}, 1, 1, 1, 1, FORMAT_ARGB, NULL, NULL }, {D3DFMT_A8L8, { 8, 8, 0, 0}, { 8, 0, 0, 0}, 2, 1, 1, 2, FORMAT_ARGB, la_from_rgba, la_to_rgba},

1 0

Andrew Talbot : dsound: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 7805ff3291d19e1b4edd27ed113f913b6cb07c56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7805ff3291d19e1b4edd27ed1… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jan 15 22:27:02 2013 +0000 dsound: Avoid signed-unsigned integer comparisons. --- dlls/dsound/primary.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index dd810fd..0bfd5667 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -262,7 +262,7 @@ HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) { IDirectSoundBufferImpl** dsb = device->buffers; LPBYTE newbuf; - DWORD i; + int i; TRACE("(%p)\n", device);

1 0

Andrew Talbot : dmusic: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 00f85d7fc335a748360299f585b412164ac69bc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00f85d7fc335a748360299f58… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jan 15 22:26:59 2013 +0000 dmusic: Avoid signed-unsigned integer comparisons. --- dlls/dmusic/dmusic.c | 2 +- dlls/dmusic/port.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index bdefe3a..0c2584f 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -316,7 +316,7 @@ static void create_system_ports_list(IDirectMusic8Impl* object) MIDIINCAPSW caps_in; IDirectMusicSynth8* synth; HRESULT hr; - int i; + ULONG i; TRACE("(%p)\n", object); diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 55d0dad..459fdb8 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -251,7 +251,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_DownloadInstrument(LPDIRECT ULONG offset; ULONG nb_regions; ULONG size; - int i; + ULONG i; TRACE("(%p/%p)->(%p, %p, %p, %d)\n", iface, This, instrument, downloaded_instrument, note_ranges, num_note_ranges); @@ -684,7 +684,7 @@ HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkou { SynthPortImpl *obj; HRESULT hr = E_FAIL; - UINT i; + int i; TRACE("(%p,%p,%p,%p,%p%d)\n", guid, object, unkouter, port_params, port_caps, device);

1 0

Andrew Talbot : dmstyle: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 9d037fa95be17eddd9d2a22cee9ee6c6832ea2ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d037fa95be17eddd9d2a22ce… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jan 15 22:26:56 2013 +0000 dmstyle: Avoid signed-unsigned integer comparisons. --- dlls/dmstyle/commandtrack.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dmstyle/commandtrack.c b/dlls/dmstyle/commandtrack.c index 17dc8f8..9fe0057 100644 --- a/dlls/dmstyle/commandtrack.c +++ b/dlls/dmstyle/commandtrack.c @@ -263,7 +263,7 @@ static HRESULT WINAPI IDirectMusicCommandTrack_IPersistStream_Load (LPPERSISTSTR TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (chunkID), chunkSize); switch (chunkID) { case DMUS_FOURCC_COMMANDTRACK_CHUNK: { - int count; + DWORD count; TRACE_(dmfile)(": command track chunk\n"); IStream_Read (pStm, &dwSizeOfStruct, sizeof(DWORD), NULL); if (dwSizeOfStruct != sizeof(DMUS_IO_COMMAND)) {

1 0

Nikolay Sivov : xmllite: Initial implementation of DTD external id parsing.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: e7c58fca12e23071a26f32837e7ef8e92e366eaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7c58fca12e23071a26f32837… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 15 23:54:14 2013 +0400 xmllite: Initial implementation of DTD external id parsing. --- dlls/xmllite/reader.c | 198 ++++++++++++++++++++++++++++++++++++++++--- dlls/xmllite/tests/reader.c | 87 +++++++++++++++++++ 2 files changed, 272 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7c58fca12e23071a26f3…

1 0