wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

Stefan Dösinger : wined3d: Set buffer-> map_ptr to NULL on unmap.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 9f72f784310320ec219401fde54815ab05564aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f72f784310320ec219401fde… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 27 14:41:47 2014 +0100 wined3d: Set buffer->map_ptr to NULL on unmap. --- dlls/wined3d/buffer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b857119..c53021b 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1117,6 +1117,7 @@ void CDECL wined3d_buffer_unmap(struct wined3d_buffer *buffer) context_release(context); buffer_clear_dirty_areas(buffer); + buffer->map_ptr = NULL; } else if (buffer->flags & WINED3D_BUFFER_HASDESC) {

1 0

Michael Stefaniuc : dmusic: Use the defines for the FOURCC codes.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 2973dbb856c142812e0679c09a7bb786965cdaa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2973dbb856c142812e0679c09… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 27 14:48:31 2014 +0100 dmusic: Use the defines for the FOURCC codes. --- dlls/dmusic/collection.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 20380fe..90a7918 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -289,7 +289,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescrip TRACE_(dmfile)(": RIFF chunk of type %s", debugstr_fourcc(chunk.fccID)); StreamSize = chunk.dwSize - sizeof(FOURCC); - if (chunk.fccID != mmioFOURCC('D','L','S',' ')) { + if (chunk.fccID != FOURCC_DLS) { TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); liMove.QuadPart = StreamSize; IStream_Seek(stream, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */ @@ -339,7 +339,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescrip ListCount[0] = 0; switch (chunk.fccID) { /* pure INFO list, such can be found in dls collections */ - case mmioFOURCC('I','N','F','O'): + case DMUS_FOURCC_INFO_LIST: TRACE_(dmfile)(": INFO list\n"); do { hr = read_from_stream(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD)); @@ -558,7 +558,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST ListSize[0] = chunk.dwSize - sizeof(FOURCC); ListCount[0] = 0; switch (chunk.fccID) { - case mmioFOURCC('I','N','F','O'): { + case DMUS_FOURCC_INFO_LIST: { TRACE_(dmfile)(": INFO list\n"); do { IStream_Read(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD), NULL);

1 0

Henri Verbeet : d3d10core/tests: Use D3D10CreateDevice() to create a device.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 80ce3b319a0b62016e91abc438d577b866154f83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80ce3b319a0b62016e91abc43… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 27 10:07:55 2014 +0100 d3d10core/tests: Use D3D10CreateDevice() to create a device. --- dlls/d3d10core/tests/Makefile.in | 2 +- dlls/d3d10core/tests/device.c | 55 ++++++-------------------------------- 2 files changed, 9 insertions(+), 48 deletions(-) diff --git a/dlls/d3d10core/tests/Makefile.in b/dlls/d3d10core/tests/Makefile.in index 0dfec79..ca96a25 100644 --- a/dlls/d3d10core/tests/Makefile.in +++ b/dlls/d3d10core/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d3d10core.dll -IMPORTS = d3d10core dxgi +IMPORTS = d3d10 C_SRCS = \ device.c diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 63b65bc..8278afc 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -21,57 +21,18 @@ #include "d3d10.h" #include "wine/test.h" -HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, - UINT flags, void *unknown0, ID3D10Device **device); - static ID3D10Device *create_device(void) { - IDXGIFactory *factory = NULL; - IDXGIAdapter *adapter = NULL; - ID3D10Device *device = NULL; - HRESULT hr; - - hr = CreateDXGIFactory(&IID_IDXGIFactory, (void *)&factory); - if (FAILED(hr)) goto cleanup; - - hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); - ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_FOUND, /* Some VMware and VirtualBox */ - "EnumAdapters failed, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - hr = D3D10CoreCreateDevice(factory, adapter, 0, NULL, &device); - } - - if (FAILED(hr)) - { - HMODULE d3d10ref; - - trace("Failed to create a HW device, trying REF\n"); - if (adapter) IDXGIAdapter_Release(adapter); - adapter = NULL; - - d3d10ref = LoadLibraryA("d3d10ref.dll"); - if (!d3d10ref) - { - trace("d3d10ref.dll not available, unable to create a REF device\n"); - goto cleanup; - } - - hr = IDXGIFactory_CreateSoftwareAdapter(factory, d3d10ref, &adapter); - FreeLibrary(d3d10ref); - ok(SUCCEEDED(hr), "CreateSoftwareAdapter failed, hr %#x\n", hr); - if (FAILED(hr)) goto cleanup; - - hr = D3D10CoreCreateDevice(factory, adapter, 0, NULL, &device); - ok(SUCCEEDED(hr), "Failed to create a REF device, hr %#x\n", hr); - if (FAILED(hr)) goto cleanup; - } + ID3D10Device *device; -cleanup: - if (adapter) IDXGIAdapter_Release(adapter); - if (factory) IDXGIFactory_Release(factory); + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device))) + return device; + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_WARP, NULL, 0, D3D10_SDK_VERSION, &device))) + return device; + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, D3D10_SDK_VERSION, &device))) + return device; - return device; + return NULL; } static void test_device_interfaces(void)

1 0

Henri Verbeet : d3d10: Add D3D10_DRIVER_TYPE_WARP.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 2d06703dc752e00b05710125d8bc3fb505ca4beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d06703dc752e00b05710125d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 27 10:07:53 2014 +0100 d3d10: Add D3D10_DRIVER_TYPE_WARP. --- dlls/d3d10/d3d10_main.c | 5 +++++ dlls/d3d10/utils.c | 1 + include/d3d10misc.h | 1 + 3 files changed, 7 insertions(+) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 01fefba..6d4d626 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -121,6 +121,11 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver } break; } + + default: + FIXME("Unhandled driver type %#x.\n", driver_type); + IDXGIFactory_Release(factory); + return E_FAIL; } } diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c index 6bb7d05..9ffff13 100644 --- a/dlls/d3d10/utils.c +++ b/dlls/d3d10/utils.c @@ -34,6 +34,7 @@ const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type) WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_REFERENCE); WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_NULL); WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_SOFTWARE); + WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_WARP); default: FIXME("Unrecognized D3D10_DRIVER_TYPE %#x\n", driver_type); return "unrecognized"; diff --git a/include/d3d10misc.h b/include/d3d10misc.h index 9f7f8e9..f8f5617 100644 --- a/include/d3d10misc.h +++ b/include/d3d10misc.h @@ -30,6 +30,7 @@ typedef enum D3D10_DRIVER_TYPE { D3D10_DRIVER_TYPE_REFERENCE = 1, D3D10_DRIVER_TYPE_NULL = 2, D3D10_DRIVER_TYPE_SOFTWARE = 3, + D3D10_DRIVER_TYPE_WARP = 5, } D3D10_DRIVER_TYPE; HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type,

1 0

Henri Verbeet : ddraw: Allow attaching surfaces other than depth buffers in ddraw_surface4_AddAttachedSurface ().
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 7c6ca2077ffef55a69f1605bb819d2595fc802da URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c6ca2077ffef55a69f1605bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 27 10:07:52 2014 +0100 ddraw: Allow attaching surfaces other than depth buffers in ddraw_surface4_AddAttachedSurface(). --- dlls/ddraw/surface.c | 84 +++++++++++++++++++-------------------------- dlls/ddraw/tests/ddraw4.c | 14 ++++---- 2 files changed, 43 insertions(+), 55 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index f569ae8..c503992 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1670,106 +1670,94 @@ static HRESULT WINAPI ddraw_surface7_AddAttachedSurface(IDirectDrawSurface7 *ifa static HRESULT WINAPI ddraw_surface4_AddAttachedSurface(IDirectDrawSurface4 *iface, IDirectDrawSurface4 *attachment) { - struct ddraw_surface *This = impl_from_IDirectDrawSurface4(iface); + struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface); struct ddraw_surface *attachment_impl = unsafe_impl_from_IDirectDrawSurface4(attachment); HRESULT hr; TRACE("iface %p, attachment %p.\n", iface, attachment); - hr = ddraw_surface7_AddAttachedSurface(&This->IDirectDrawSurface7_iface, - attachment_impl ? &attachment_impl->IDirectDrawSurface7_iface : NULL); - if (FAILED(hr)) - { - return hr; - } - attachment_impl->attached_iface = (IUnknown *)attachment; - IUnknown_AddRef(attachment_impl->attached_iface); - ddraw_surface7_Release(&attachment_impl->IDirectDrawSurface7_iface); - return hr; -} -static HRESULT WINAPI ddraw_surface3_AddAttachedSurface(IDirectDrawSurface3 *iface, IDirectDrawSurface3 *attachment) -{ - struct ddraw_surface *This = impl_from_IDirectDrawSurface3(iface); - struct ddraw_surface *attachment_impl = unsafe_impl_from_IDirectDrawSurface3(attachment); - HRESULT hr; - - TRACE("iface %p, attachment %p.\n", iface, attachment); - /* Tests suggest that * -> offscreen plain surfaces can be attached to other offscreen plain surfaces * -> offscreen plain surfaces can be attached to primaries * -> primaries can be attached to offscreen plain surfaces * -> z buffers can be attached to primaries */ - if (This->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_OFFSCREENPLAIN) + if (surface->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_OFFSCREENPLAIN) && attachment_impl->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_OFFSCREENPLAIN)) { /* Sizes have to match */ - if (attachment_impl->surface_desc.dwWidth != This->surface_desc.dwWidth - || attachment_impl->surface_desc.dwHeight != This->surface_desc.dwHeight) + if (attachment_impl->surface_desc.dwWidth != surface->surface_desc.dwWidth + || attachment_impl->surface_desc.dwHeight != surface->surface_desc.dwHeight) { WARN("Surface sizes do not match.\n"); return DDERR_CANNOTATTACHSURFACE; } - /* OK */ } - else if (This->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE) - && attachment_impl->surface_desc.ddsCaps.dwCaps & (DDSCAPS_ZBUFFER)) - { - /* OK */ - } - else + else if (!(surface->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE)) + || !(attachment_impl->surface_desc.ddsCaps.dwCaps & (DDSCAPS_ZBUFFER))) { WARN("Invalid attachment combination.\n"); return DDERR_CANNOTATTACHSURFACE; } - hr = ddraw_surface_attach_surface(This, attachment_impl); - if (FAILED(hr)) - { + if (FAILED(hr = ddraw_surface_attach_surface(surface, attachment_impl))) return hr; - } + attachment_impl->attached_iface = (IUnknown *)attachment; IUnknown_AddRef(attachment_impl->attached_iface); return hr; } +static HRESULT WINAPI ddraw_surface3_AddAttachedSurface(IDirectDrawSurface3 *iface, IDirectDrawSurface3 *attachment) +{ + struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface); + struct ddraw_surface *attachment_impl = unsafe_impl_from_IDirectDrawSurface3(attachment); + HRESULT hr; + + TRACE("iface %p, attachment %p.\n", iface, attachment); + + if (FAILED(hr = ddraw_surface4_AddAttachedSurface(&surface->IDirectDrawSurface4_iface, + attachment_impl ? &attachment_impl->IDirectDrawSurface4_iface : NULL))) + return hr; + + attachment_impl->attached_iface = (IUnknown *)attachment; + IUnknown_AddRef(attachment_impl->attached_iface); + ddraw_surface4_Release(&attachment_impl->IDirectDrawSurface4_iface); + return hr; +} + static HRESULT WINAPI ddraw_surface2_AddAttachedSurface(IDirectDrawSurface2 *iface, IDirectDrawSurface2 *attachment) { - struct ddraw_surface *This = impl_from_IDirectDrawSurface2(iface); + struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface); struct ddraw_surface *attachment_impl = unsafe_impl_from_IDirectDrawSurface2(attachment); HRESULT hr; TRACE("iface %p, attachment %p.\n", iface, attachment); - hr = ddraw_surface3_AddAttachedSurface(&This->IDirectDrawSurface3_iface, - attachment_impl ? &attachment_impl->IDirectDrawSurface3_iface : NULL); - if (FAILED(hr)) - { + if (FAILED(hr = ddraw_surface4_AddAttachedSurface(&surface->IDirectDrawSurface4_iface, + attachment_impl ? &attachment_impl->IDirectDrawSurface4_iface : NULL))) return hr; - } + attachment_impl->attached_iface = (IUnknown *)attachment; IUnknown_AddRef(attachment_impl->attached_iface); - ddraw_surface3_Release(&attachment_impl->IDirectDrawSurface3_iface); + ddraw_surface4_Release(&attachment_impl->IDirectDrawSurface4_iface); return hr; } static HRESULT WINAPI ddraw_surface1_AddAttachedSurface(IDirectDrawSurface *iface, IDirectDrawSurface *attachment) { - struct ddraw_surface *This = impl_from_IDirectDrawSurface(iface); + struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface); struct ddraw_surface *attachment_impl = unsafe_impl_from_IDirectDrawSurface(attachment); HRESULT hr; TRACE("iface %p, attachment %p.\n", iface, attachment); - hr = ddraw_surface3_AddAttachedSurface(&This->IDirectDrawSurface3_iface, - attachment_impl ? &attachment_impl->IDirectDrawSurface3_iface : NULL); - if (FAILED(hr)) - { + if (FAILED(hr = ddraw_surface4_AddAttachedSurface(&surface->IDirectDrawSurface4_iface, + attachment_impl ? &attachment_impl->IDirectDrawSurface4_iface : NULL))) return hr; - } + attachment_impl->attached_iface = (IUnknown *)attachment; IUnknown_AddRef(attachment_impl->attached_iface); - ddraw_surface3_Release(&attachment_impl->IDirectDrawSurface3_iface); + ddraw_surface4_Release(&attachment_impl->IDirectDrawSurface4_iface); return hr; } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 939a9b6..04d5049 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -6005,25 +6005,25 @@ static void test_surface_attachment(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); hr = IDirectDrawSurface4_AddAttachedSurface(surface1, surface2); - todo_wine ok(SUCCEEDED(hr), "Failed to attach surface, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to attach surface, hr %#x.\n", hr); /* Try the reverse without detaching first. */ hr = IDirectDrawSurface4_AddAttachedSurface(surface2, surface1); - todo_wine ok(hr == DDERR_SURFACEALREADYATTACHED, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_SURFACEALREADYATTACHED, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface2); - todo_wine ok(SUCCEEDED(hr), "Failed to detach surface, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to detach surface, hr %#x.\n", hr); hr = IDirectDrawSurface4_AddAttachedSurface(surface2, surface1); - todo_wine ok(SUCCEEDED(hr), "Failed to attach surface, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to attach surface, hr %#x.\n", hr); /* Try to detach reversed. */ hr = IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface2); ok(hr == DDERR_CANNOTDETACHSURFACE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_DeleteAttachedSurface(surface2, 0, surface1); - todo_wine ok(SUCCEEDED(hr), "Failed to detach surface, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to detach surface, hr %#x.\n", hr); hr = IDirectDrawSurface4_AddAttachedSurface(surface2, surface3); - todo_wine ok(SUCCEEDED(hr), "Failed to attach surface, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to attach surface, hr %#x.\n", hr); hr = IDirectDrawSurface4_DeleteAttachedSurface(surface2, 0, surface3); - todo_wine ok(SUCCEEDED(hr), "Failed to detach surface, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to detach surface, hr %#x.\n", hr); hr = IDirectDrawSurface4_AddAttachedSurface(surface1, surface4); ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr);

1 0

Henri Verbeet : ddraw/tests: Rewrite AttachmentTest() and AttachmentTest7( ).
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: fffaf03c0d722aa4e9036ec69e77c2d9b2c60ed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fffaf03c0d722aa4e9036ec69… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 27 10:07:51 2014 +0100 ddraw/tests: Rewrite AttachmentTest() and AttachmentTest7(). --- dlls/ddraw/tests/ddraw1.c | 247 ++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 247 ++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 273 ++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 255 +++++++++++++++++++ dlls/ddraw/tests/dsurface.c | 583 ------------------------------------------- 5 files changed, 1022 insertions(+), 583 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fffaf03c0d722aa4e9036…

1 0

André Hentschel : shlwapi/tests: Avoid preprocessor check to ensure it compiles.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: e98844e5c92e47a5a8d15e70007ff8f06982cb42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e98844e5c92e47a5a8d15e700… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 24 23:07:39 2014 +0100 shlwapi/tests: Avoid preprocessor check to ensure it compiles. --- dlls/shlwapi/tests/istream.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index bacd0e6..95485b9 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -283,10 +283,11 @@ static void test_SHCreateStreamOnFileA(DWORD mode, DWORD stgm) "or HRESULT_FROM_WIN32(ERROR_BAD_PATHNAME), got 0x%08x\n", ret); ok(stream == NULL, "SHCreateStreamOnFileA: expected a NULL IStream object, got %p\n", stream); -#if 0 /* This test crashes on WinXP SP2 */ +if (0) /* This test crashes on WinXP SP2 */ +{ ret = (*pSHCreateStreamOnFileA)(test_file, mode | stgm, NULL); ok(ret == E_INVALIDARG, "SHCreateStreamOnFileA: expected E_INVALIDARG, got 0x%08x\n", ret); -#endif +} stream = NULL; ret = (*pSHCreateStreamOnFileA)(test_file, mode | STGM_CONVERT | stgm, &stream);

1 0

André Hentschel : shell32/tests: Avoid preprocessor check to ensure it compiles.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 9d1fdf1165e81116d7401a8dc4a65d78a053efd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d1fdf1165e81116d7401a8dc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 22 22:32:31 2014 +0100 shell32/tests: Avoid preprocessor check to ensure it compiles. --- dlls/shell32/tests/string.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/string.c b/dlls/shell32/tests/string.c index 1d55ecf..81f4754 100644 --- a/dlls/shell32/tests/string.c +++ b/dlls/shell32/tests/string.c @@ -87,13 +87,14 @@ static void test_StrRetToStringNW(void) "STRRET_OFFSET: dup failed, ret=%d\n", ret); /* The next test crashes on W2K, WinXP and W2K3, so we don't test. */ -#if 0 +if (0) +{ /* Invalid dest - should return FALSE, except NT4 does not, so we don't check. */ strret.uType = STRRET_WSTR; U(strret).pOleStr = CoDupStrW("Test"); pStrRetToStrNAW(NULL, sizeof(buff)/sizeof(WCHAR), &strret, NULL); trace("NULL dest: ret=%d\n", ret); -#endif +} } START_TEST(string)

1 0

André Hentschel : d3dx9_36/tests: Avoid preprocessor checks to ensure it compiles.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 28b9e1b947ae362825b5e3745bc67388f62d11db URL: http://source.winehq.org/git/wine.git/?a=commit;h=28b9e1b947ae362825b5e3745… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 22 22:32:21 2014 +0100 d3dx9_36/tests: Avoid preprocessor checks to ensure it compiles. --- dlls/d3dx9_36/tests/mesh.c | 7 ++++--- dlls/d3dx9_36/tests/shader.c | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 2eb2146..1c3748f 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -4070,14 +4070,15 @@ static void D3DXCreateTextTest(void) d3dxmesh->lpVtbl->GetNumVertices(d3dxmesh), number_of_faces); if (SUCCEEDED(hr) && d3dxmesh) d3dxmesh->lpVtbl->Release(d3dxmesh); -#if 0 +if (0) +{ /* too much detail requested, so will appear to hang */ trace("Waiting for D3DXCreateText to finish with deviation = FLT_MIN ...\n"); - hr = D3DXCreateText(device, hdc, "wine", FLT_MIN, 0.4f, &d3dxmesh, NULL, NULL); + hr = D3DXCreateTextA(device, hdc, "wine", FLT_MIN, 0.4f, &d3dxmesh, NULL, NULL); ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); if (SUCCEEDED(hr) && d3dxmesh) d3dxmesh->lpVtbl->Release(d3dxmesh); trace("D3DXCreateText finish with deviation = FLT_MIN\n"); -#endif +} hr = D3DXCreateTextA(device, hdc, "wine", 0.001f, 0.4f, &d3dxmesh, NULL, NULL); ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index c0d5f00..4406cd1 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -1564,11 +1564,12 @@ static void test_get_shader_samplers(void) UINT count = 2; HRESULT hr; -#if 0 +if (0) +{ /* crashes if bytecode is NULL */ hr = D3DXGetShaderSamplers(NULL, NULL, &count); ok(hr == D3D_OK, "D3DXGetShaderSamplers failed, got %x, expected %x\n", hr, D3D_OK); -#endif +} hr = D3DXGetShaderSamplers(get_shader_samplers_blob, NULL, NULL); ok(hr == D3D_OK, "D3DXGetShaderSamplers failed, got %x, expected %x\n", hr, D3D_OK);

1 0

André Hentschel : d3dxof/tests: Avoid preprocessor check to ensure it compiles.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 81ea0cd86f67474056660f97bfce3c2eb1dd9df5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81ea0cd86f67474056660f97b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 22 22:32:33 2014 +0100 d3dxof/tests: Avoid preprocessor check to ensure it compiles. --- dlls/d3dxof/tests/d3dxof.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index f4ab68a..67baac0 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -1184,12 +1184,13 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int level) for (i = 0; i < level; i++) printf(" "); printf("Found Data Reference (%d)\n", j); -#if 0 +if (0) +{ hr = IDirectXFileDataReference_GetId(lpDirectXFileData, &clsid); ok(hr == DXFILE_OK, "IDirectXFileData_GetId: %x\n", hr); hr = IDirectXFileDataReference_GetName(lpDirectXFileData, name, &len); ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); -#endif +} IDirectXFileDataReference_Resolve(p2, &pfdo); process_data(pfdo, level); IDirectXFileData_Release(pfdo);

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2014