wine-commits June 2010

wine-commits@winehq.org

3 participants
663 discussions

Alexandre Julliard : kernel32: Add the TlsAlloc/FreeInternal entry points.
by Alexandre Julliard 22 Jun '10

22 Jun '10

Module: wine Branch: master Commit: 79b6351c9c886e563a0ac6c6575bb0203f4c24c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79b6351c9c886e563a0ac6c65… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 22 16:58:02 2010 +0200 kernel32: Add the TlsAlloc/FreeInternal entry points. --- dlls/kernel32/kernel32.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f08e752..dbcb179 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1095,9 +1095,9 @@ @ stdcall Thread32Next(long ptr) @ stdcall -i386 -private ThunkConnect32(ptr str str str ptr ptr) krnl386.exe16.ThunkConnect32 @ stdcall TlsAlloc() -@ stub TlsAllocInternal +@ stdcall TlsAllocInternal() TlsAlloc @ stdcall TlsFree(long) -@ stub TlsFreeInternal +@ stdcall TlsFreeInternal(long) TlsFree @ stdcall TlsGetValue(long) @ stdcall TlsSetValue(long ptr) @ stdcall Toolhelp32ReadProcessMemory(long ptr ptr long ptr)

1 0

Henri Verbeet : wined3d: read_from_framebuffer_texture() isn' t suitable for readback of onscreen surfaces.
by Alexandre Julliard 22 Jun '10

22 Jun '10

Module: wine Branch: master Commit: b769c912cc457cc4de2bfbb739c3284de1668320 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b769c912cc457cc4de2bfbb73… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 22 12:49:07 2010 +0200 wined3d: read_from_framebuffer_texture() isn't suitable for readback of onscreen surfaces. --- dlls/wined3d/surface.c | 58 +++++++++++++++--------------------------------- 1 files changed, 18 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 73c5aff..08835a8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1495,6 +1495,15 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) struct wined3d_context *context; GLint prevRead; + if (!surface_is_offscreen(This)) + { + /* We would need to flip onscreen surfaces, but there's no efficient + * way to do that here. It makes more sense for the caller to + * explicitly go through sysmem. */ + ERR("Not supported for onscreen targets.\n"); + return; + } + /* Activate the surface to read from. In some situations it isn't the currently active target(e.g. backbuffer * locking during offscreen rendering). RESOURCELOAD is ok because glCopyTexSubImage2D isn't affected by any * states in the stateblock, and no driver was found yet that had bugs in that regard. @@ -1505,42 +1514,13 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) surface_prepare_texture(This, gl_info, srgb); surface_bind_and_dirtify(This, srgb); - ENTER_GL(); - glGetIntegerv(GL_READ_BUFFER, &prevRead); - LEAVE_GL(); - - /* Select the correct read buffer, and give some debug output. - * There is no need to keep track of the current read buffer or reset it, every part of the code - * that reads sets the read buffer as desired. - */ - if (!surface_is_offscreen(This)) - { - GLenum buffer = surface_get_gl_buffer(This); - TRACE("Locking %#x buffer\n", buffer); - - ENTER_GL(); - glReadBuffer(buffer); - checkGLcall("glReadBuffer"); - LEAVE_GL(); - } - else - { - /* Locking the primary render target which is not on a swapchain(=offscreen render target). - * Read from the back buffer - */ - TRACE("Locking offscreen render target\n"); - ENTER_GL(); - glReadBuffer(device->offscreenBuffer); - checkGLcall("glReadBuffer"); - LEAVE_GL(); - } + TRACE("Reading back offscreen render target %p.\n", This); ENTER_GL(); - /* If !SrcIsUpsideDown we should flip the surface. - * This can be done using glCopyTexSubImage2D but this - * is VERY slow, so don't do that. We should prevent - * this code from getting called in such cases or perhaps - * we can use FBOs */ + + glGetIntegerv(GL_READ_BUFFER, &prevRead); + glReadBuffer(device->offscreenBuffer); + checkGLcall("glReadBuffer"); glCopyTexSubImage2D(This->texture_target, This->texture_level, 0, 0, 0, 0, This->currentDesc.Width, This->currentDesc.Height); @@ -1552,8 +1532,6 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) LEAVE_GL(); context_release(context); - - TRACE("Updated target %d\n", This->texture_target); } /* Context activation is done by the caller. */ @@ -4239,11 +4217,11 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; IWineD3DDeviceImpl *device = This->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + BOOL drawable_read_ok = surface_is_offscreen(This); struct wined3d_format_desc desc; CONVERT_TYPES convert; int width, pitch, outpitch; BYTE *mem; - BOOL drawable_read_ok = TRUE; BOOL in_fbo = FALSE; if (This->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) @@ -4402,9 +4380,9 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D IWineD3DSurfaceImpl_LoadLocation(iface, SFLAG_INSYSMEM, rect); } } - if(!(This->Flags & SFLAG_INSYSMEM)) { - /* Should not happen */ - ERR("Trying to load a texture from sysmem, but SFLAG_INSYSMEM is not set\n"); + if (!(This->Flags & SFLAG_INSYSMEM)) + { + WARN("Trying to load a texture from sysmem, but SFLAG_INSYSMEM is not set.\n"); /* Lets hope we get it from somewhere... */ IWineD3DSurfaceImpl_LoadLocation(iface, SFLAG_INSYSMEM, rect); }

1 0

Piotr Caban : msvcrt: Added __crtLCMapStringW partial implementation.
by Alexandre Julliard 22 Jun '10

22 Jun '10

Module: wine Branch: master Commit: c0637edda20fe5206db534fd50e783996a4ad463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0637edda20fe5206db534fd5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 22 12:26:23 2010 +0200 msvcrt: Added __crtLCMapStringW partial implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/locale.c | 12 ++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 7 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 0d05c28..99730e5 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -344,7 +344,7 @@ @ cdecl __crtCompareStringA(long long str long str long) msvcrt.__crtCompareStringA @ cdecl __crtCompareStringW(long long wstr long wstr long) msvcrt.__crtCompareStringW @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA -@ stub __crtLCMapStringW +@ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW @ stub __daylight @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit @ cdecl __doserrno() msvcrt.__doserrno diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 7c84705..97783fb 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -110,7 +110,7 @@ @ cdecl __crtGetLocaleInfoW(long long ptr long) msvcrt.__crtGetLocaleInfoW @ cdecl __crtGetStringTypeW(long long wstr long ptr) msvcrt.__crtGetStringTypeW @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA -@ stub __crtLCMapStringW +@ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit @ cdecl __doserrno() msvcrt.__doserrno @ cdecl __fpecode() msvcrt.__fpecode diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 8599efa..dfa04f8 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -105,7 +105,7 @@ @ cdecl __crtGetLocaleInfoW(long long ptr long) @ cdecl __crtGetStringTypeW(long long wstr long ptr) msvcrt.__crtGetStringTypeW @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA -@ stub __crtLCMapStringW +@ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit @ cdecl __doserrno() msvcrt.__doserrno @ cdecl __fpecode() msvcrt.__fpecode diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b4c168a..8f3769e 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -150,7 +150,7 @@ @ cdecl __crtGetLocaleInfoW(long long ptr long) msvcrt.__crtGetLocaleInfoW @ cdecl __crtGetStringTypeW(long long wstr long ptr) msvcrt.__crtGetStringTypeW @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA -@ stub __crtLCMapStringW +@ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW @ stub __daylight @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit @ cdecl __doserrno() msvcrt.__doserrno diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index a2bed36..e00a331 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -147,7 +147,7 @@ @ cdecl __crtGetLocaleInfoW(long long ptr long) msvcrt.__crtGetLocaleInfoW @ cdecl __crtGetStringTypeW(long long wstr long ptr) msvcrt.__crtGetStringTypeW @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA -@ stub __crtLCMapStringW +@ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW @ stub __daylight @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit @ cdecl __doserrno() msvcrt.__doserrno diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 5a27de0..393a23d 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -466,6 +466,18 @@ int CDECL __crtLCMapStringA( } /********************************************************************* + * __crtLCMapStringW (MSVCRT.@) + */ +int CDECL __crtLCMapStringW(LCID lcid, DWORD mapflags, const MSVCRT_wchar_t *src, + int srclen, MSVCRT_wchar_t *dst, int dstlen, unsigned int codepage, int xflag) +{ + FIXME("(lcid %x, flags %x, %s(%d), %p(%d), %x, %d), partial stub!\n", + lcid, mapflags, debugstr_w(src), srclen, dst, dstlen, codepage, xflag); + + return LCMapStringW(lcid, mapflags, src, srclen, dst, dstlen); +} + +/********************************************************************* * __crtCompareStringA (MSVCRT.@) */ int CDECL __crtCompareStringA( LCID lcid, DWORD flags, const char *src1, int len1, diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index bba06d6..e39253e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -140,7 +140,7 @@ @ cdecl __crtGetLocaleInfoW(long long ptr long) @ cdecl __crtGetStringTypeW(long long wstr long ptr) @ cdecl __crtLCMapStringA(long long str long ptr long long long) -# stub __crtLCMapStringW +@ cdecl __crtLCMapStringW(long long wstr long ptr long long long) # stub __daylight @ cdecl __dllonexit(ptr ptr ptr) @ cdecl __doserrno() MSVCRT___doserrno

1 0

Alexandre Julliard : ntdll/tests: Fix some exception tests for Wow64.
by Alexandre Julliard 22 Jun '10

22 Jun '10

Module: wine Branch: master Commit: 0fdcab06ac5872637e57f2c5b6e1bf61ddf573c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fdcab06ac5872637e57f2c5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 22 13:51:18 2010 +0200 ntdll/tests: Fix some exception tests for Wow64. --- dlls/ntdll/tests/exception.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 154a7c7..598544e 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -143,9 +143,9 @@ static const struct exception /* 20 */ /* test overlong instruction (limit is 15 bytes, 5 on Win7) */ { { 0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0xfa,0xc3 }, - 0, 16, FALSE, STATUS_ILLEGAL_INSTRUCTION, 0 }, + 0, 16, TRUE, STATUS_ILLEGAL_INSTRUCTION, 0 }, { { 0x64,0x64,0x64,0x64,0xfa,0xc3 }, - 0, 5, FALSE, STATUS_PRIVILEGED_INSTRUCTION, 0 }, + 0, 5, TRUE, STATUS_PRIVILEGED_INSTRUCTION, 0 }, /* test invalid interrupt */ { { 0xcd, 0xff, 0xc3 }, /* 21: int $0xff; ret */ @@ -246,7 +246,9 @@ static LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *Exce rec->ExceptionAddress, (char *)code_mem + 0xb); if (pNtCurrentTeb()->Peb->BeingDebugged) - ok((void *)context->Eax == pRtlRaiseException, "debugger managed to modify Eax to %x should be %p\n", + ok((void *)context->Eax == pRtlRaiseException || + broken( is_wow64 && context->Eax == 0xf00f00f1 ), /* broken on vista */ + "debugger managed to modify Eax to %x should be %p\n", context->Eax, pRtlRaiseException); /* check that context.Eip is fixed up only for EXCEPTION_BREAKPOINT @@ -773,7 +775,9 @@ static void test_debugger(void) /* ctx.Eip is the same value the exception handler got */ if (de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT) { - ok((char *)ctx.Eip == (char *)code_mem_address + 0xa, "Eip at 0x%x instead of %p\n", + ok((char *)ctx.Eip == (char *)code_mem_address + 0xa || + broken(is_wow64 && (char *)ctx.Eip == (char *)code_mem_address + 0xb), + "Eip at 0x%x instead of %p\n", ctx.Eip, (char *)code_mem_address + 0xa); /* need to fixup Eip for debuggee */ if ((char *)ctx.Eip == (char *)code_mem_address + 0xa) @@ -824,7 +828,8 @@ static DWORD simd_fault_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_R ok( rec->ExceptionCode == STATUS_FLOAT_MULTIPLE_TRAPS, "exception code: %#x, should be %#x\n", rec->ExceptionCode, STATUS_FLOAT_MULTIPLE_TRAPS); - ok( rec->NumberParameters == 1, "# of params: %i, should be 1\n", + ok( rec->NumberParameters == 1 || broken(is_wow64 && rec->NumberParameters == 2), + "# of params: %i, should be 1\n", rec->NumberParameters); if( rec->NumberParameters == 1 ) ok( rec->ExceptionInformation[0] == 0, "param #1: %lx, should be 0\n", rec->ExceptionInformation[0]);

1 0

Alexandre Julliard : psapi/tests: Fix the working set tests for Wow64.
by Alexandre Julliard 22 Jun '10

22 Jun '10

Module: wine Branch: master Commit: 6cf16d723af29e37819e1f6c4b4a646ff404447b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cf16d723af29e37819e1f6c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 22 12:55:23 2010 +0200 psapi/tests: Fix the working set tests for Wow64. --- dlls/psapi/tests/psapi_main.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 21a3d1a..55eb937 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -275,23 +275,36 @@ static void test_ws_functions(void) ULONG_PTR pages[4096]; char *addr; unsigned int i; - + BOOL ret; + todo_wine w32_err(pEmptyWorkingSet(NULL), ERROR_INVALID_HANDLE); todo_wine w32_err(pEmptyWorkingSet(hpSR), ERROR_ACCESS_DENIED); w32_suc(pEmptyWorkingSet(hpAA)); - - todo_wine w32_err(pInitializeProcessForWsWatch(NULL), ERROR_INVALID_HANDLE); + + SetLastError( 0xdeadbeef ); + ret = pInitializeProcessForWsWatch( NULL ); + todo_wine ok( !ret, "InitializeProcessForWsWatch succeeded\n" ); + if (!ret) + { + if (GetLastError() == ERROR_INVALID_FUNCTION) /* not supported on xp in wow64 mode */ + { + trace( "InitializeProcessForWsWatch not supported\n" ); + return; + } + ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() ); + } w32_suc(pInitializeProcessForWsWatch(hpAA)); if(!w32_suc(addr = VirtualAlloc(NULL, 1, MEM_COMMIT, PAGE_READWRITE))) return; + *addr = 0; /* make sure it's paged in (needed on wow64) */ if(!VirtualLock(addr, 1)) { trace("locking failed (error=%d) - skipping test\n", GetLastError()); goto free_page; } - + todo_wine if(w32_suc(pQueryWorkingSet(hpQI, pages, 4096 * sizeof(ULONG_PTR)))) { for(i = 0; i < pages[0]; i++)

1 0

Alexandre Julliard : jscript/tests: Fix a test that fails because of the reduced FPU precision.
by Alexandre Julliard 22 Jun '10

22 Jun '10

Module: wine Branch: master Commit: b4d21efd127aa6164e25613118117be72f5d7592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4d21efd127aa6164e2561311… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 22 12:52:03 2010 +0200 jscript/tests: Fix a test that fails because of the reduced FPU precision. --- dlls/jscript/tests/lang.js | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 495762e..36a75f5 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -263,7 +263,9 @@ ok(tmp === 7, "2*3.5 !== 7"); ok(getVT(tmp) === "VT_I4", "getVT(2*3.5) !== VT_I4"); tmp = 2.5*3.5; -ok(tmp === 8.75, "2.5*3.5 !== 8.75"); +/* FIXME: the parser loses precision */ +/* ok(tmp === 8.75, "2.5*3.5 !== 8.75"); */ +ok(tmp > 8.749999 && tmp < 8.750001, "2.5*3.5 !== 8.75"); ok(getVT(tmp) === "VT_R8", "getVT(2.5*3.5) !== VT_R8"); tmp = 4/2;

1 0

André Hentschel : krnl386.exe16: Update a comment.
by Alexandre Julliard 22 Jun '10

22 Jun '10

Module: wine Branch: master Commit: 8f0a0c23fa07f8360547db275146778ab45b4900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f0a0c23fa07f8360547db275… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 21 17:46:57 2010 +0200 krnl386.exe16: Update a comment. --- dlls/krnl386.exe16/ioports.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/krnl386.exe16/ioports.c b/dlls/krnl386.exe16/ioports.c index 9ceb3ae..d802ab9 100644 --- a/dlls/krnl386.exe16/ioports.c +++ b/dlls/krnl386.exe16/ioports.c @@ -463,7 +463,7 @@ static int IO_pp_sort(const void *p1,const void *p2) /* IO_pp_init * - * Read the ppdev entries from wine.conf, open the device and check + * Read the ppdev entries from registry, open the device and check * for necessary IOCTRL * Report verbose about possible errors */

1 0

Andrew Nguyen : ddraw/tests: Add an observation regarding device color model criteria for IDirect3D3:: FindDevice.
by Alexandre Julliard 22 Jun '10

22 Jun '10

Module: wine Branch: master Commit: bdc29f83bc6fcd3c550fdb710d634e48c9b1739b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc29f83bc6fcd3c550fdb710… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jun 21 10:15:18 2010 -0500 ddraw/tests: Add an observation regarding device color model criteria for IDirect3D3::FindDevice. --- dlls/ddraw/tests/d3d.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 7f47d20..069bc96 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3487,6 +3487,17 @@ static void FindDevice(void) "[%d] Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", i, hr); } } + + /* Curiously the color model criteria seem to be ignored. */ + search.dwSize = sizeof(search); + search.dwFlags = D3DFDS_COLORMODEL; + search.dcmColorModel = 0xdeadbeef; + result.dwSize = sizeof(result); + + hr = IDirect3D_FindDevice(Direct3D1, &search, &result); + todo_wine + ok(hr == D3D_OK, + "Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", hr); } START_TEST(d3d)

1 0

Andrew Nguyen : ddraw: Allow the ddraw RGB device to be enumerated in IDirect3D3::FindDevice.
by Alexandre Julliard 22 Jun '10

22 Jun '10

Module: wine Branch: master Commit: eb9227015ad639a1fbdb15eeb212d25c0bdc083c URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb9227015ad639a1fbdb15eeb… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jun 21 10:15:05 2010 -0500 ddraw: Allow the ddraw RGB device to be enumerated in IDirect3D3::FindDevice. Partially based on a patch by David Adam. --- dlls/ddraw/direct3d.c | 5 ++- dlls/ddraw/tests/d3d.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index f919860..edbcc28 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -684,10 +684,11 @@ IDirect3DImpl_3_FindDevice(IDirect3D3 *iface, TRACE(" trying to match guid %s.\n", debugstr_guid(&(D3DDFS->guid))); if ((IsEqualGUID(&IID_D3DDEVICE_WineD3D, &(D3DDFS->guid)) == 0) && (IsEqualGUID(&IID_IDirect3DHALDevice, &(D3DDFS->guid)) == 0) && - (IsEqualGUID(&IID_IDirect3DRefDevice, &(D3DDFS->guid)) == 0)) + (IsEqualGUID(&IID_IDirect3DRefDevice, &(D3DDFS->guid)) == 0) && + (IsEqualGUID(&IID_IDirect3DRGBDevice, &(D3DDFS->guid)) == 0)) { TRACE(" no match for this GUID.\n"); - return DDERR_INVALIDPARAMS; + return DDERR_NOTFOUND; } } diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index e74fb79..7f47d20 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3393,9 +3393,20 @@ static void VertexBufferLockRest(void) static void FindDevice(void) { + static const struct + { + const GUID *guid; + int todo; + } deviceGUIDs[] = + { + {&IID_IDirect3DRampDevice, 1}, + {&IID_IDirect3DRGBDevice}, + }; + D3DFINDDEVICESEARCH search = {0}; D3DFINDDEVICERESULT result = {0}; HRESULT hr; + int i; /* Test invalid parameters. */ hr = IDirect3D_FindDevice(Direct3D1, NULL, NULL); @@ -3423,6 +3434,59 @@ static void FindDevice(void) hr = IDirect3D_FindDevice(Direct3D1, &search, &result); ok(hr == DDERR_INVALIDPARAMS, "Expected IDirect3D1::FindDevice to return DDERR_INVALIDPARAMS, got 0x%08x\n", hr); + + /* Specifying no flags is permitted. */ + search.dwSize = sizeof(search); + search.dwFlags = 0; + result.dwSize = sizeof(result); + + hr = IDirect3D_FindDevice(Direct3D1, &search, &result); + ok(hr == D3D_OK, + "Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", hr); + + /* Try an arbitrary non-device GUID. */ + search.dwSize = sizeof(search); + search.dwFlags = D3DFDS_GUID; + search.guid = IID_IDirect3D; + result.dwSize = sizeof(result); + + hr = IDirect3D_FindDevice(Direct3D1, &search, &result); + ok(hr == DDERR_NOTFOUND, + "Expected IDirect3D1::FindDevice to return DDERR_NOTFOUND, got 0x%08x\n", hr); + + /* The reference device GUID can't be enumerated. */ + search.dwSize = sizeof(search); + search.dwFlags = D3DFDS_GUID; + search.guid = IID_IDirect3DRefDevice; + result.dwSize = sizeof(result); + + hr = IDirect3D_FindDevice(Direct3D1, &search, &result); + todo_wine + ok(hr == DDERR_NOTFOUND, + "Expected IDirect3D1::FindDevice to return DDERR_NOTFOUND, got 0x%08x\n", hr); + + /* These GUIDs appear to be always present. */ + for (i = 0; i < sizeof(deviceGUIDs)/sizeof(deviceGUIDs[0]); i++) + { + search.dwSize = sizeof(search); + search.dwFlags = D3DFDS_GUID; + search.guid = *deviceGUIDs[i].guid; + result.dwSize = sizeof(result); + + hr = IDirect3D_FindDevice(Direct3D1, &search, &result); + + if (deviceGUIDs[i].todo) + { + todo_wine + ok(hr == D3D_OK, + "[%d] Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", i, hr); + } + else + { + ok(hr == D3D_OK, + "[%d] Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", i, hr); + } + } } START_TEST(d3d)

1 0

Andrew Nguyen : ddraw: Validate structure pointers and sizes in IDirect3D3: :FindDevice.
by Alexandre Julliard 22 Jun '10

22 Jun '10

Module: wine Branch: master Commit: 10a076ad8d653db5d626310464033c9c1a6929e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10a076ad8d653db5d62631046… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jun 21 10:14:51 2010 -0500 ddraw: Validate structure pointers and sizes in IDirect3D3::FindDevice. --- dlls/ddraw/direct3d.c | 7 +++++++ dlls/ddraw/tests/d3d.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index 3f2410f..f919860 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -666,6 +666,13 @@ IDirect3DImpl_3_FindDevice(IDirect3D3 *iface, TRACE("(%p)->(%p,%p)\n", This, D3DDFS, D3DFDR); + if (!D3DDFS || !D3DFDR) + return DDERR_INVALIDPARAMS; + + if (D3DDFS->dwSize != sizeof(D3DFINDDEVICESEARCH) || + D3DFDR->dwSize != sizeof(D3DFINDDEVICERESULT)) + return DDERR_INVALIDPARAMS; + if ((D3DDFS->dwFlags & D3DFDS_COLORMODEL) && (D3DDFS->dcmColorModel != D3DCOLOR_RGB)) { diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 26dc1cf..e74fb79 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3391,6 +3391,40 @@ static void VertexBufferLockRest(void) IDirect3DVertexBuffer7_Release(buffer); } +static void FindDevice(void) +{ + D3DFINDDEVICESEARCH search = {0}; + D3DFINDDEVICERESULT result = {0}; + HRESULT hr; + + /* Test invalid parameters. */ + hr = IDirect3D_FindDevice(Direct3D1, NULL, NULL); + ok(hr == DDERR_INVALIDPARAMS, + "Expected IDirect3D1::FindDevice to return DDERR_INVALIDPARAMS, got 0x%08x\n", hr); + + hr = IDirect3D_FindDevice(Direct3D1, NULL, &result); + ok(hr == DDERR_INVALIDPARAMS, + "Expected IDirect3D1::FindDevice to return DDERR_INVALIDPARAMS, got 0x%08x\n", hr); + + hr = IDirect3D_FindDevice(Direct3D1, &search, NULL); + ok(hr == DDERR_INVALIDPARAMS, + "Expected IDirect3D1::FindDevice to return DDERR_INVALIDPARAMS, got 0x%08x\n", hr); + + search.dwSize = 0; + result.dwSize = 0; + + hr = IDirect3D_FindDevice(Direct3D1, &search, &result); + ok(hr == DDERR_INVALIDPARAMS, + "Expected IDirect3D1::FindDevice to return DDERR_INVALIDPARAMS, got 0x%08x\n", hr); + + search.dwSize = sizeof(search) + 1; + result.dwSize = sizeof(result) + 1; + + hr = IDirect3D_FindDevice(Direct3D1, &search, &result); + ok(hr == DDERR_INVALIDPARAMS, + "Expected IDirect3D1::FindDevice to return DDERR_INVALIDPARAMS, got 0x%08x\n", hr); +} + START_TEST(d3d) { init_function_pointers(); @@ -3425,6 +3459,7 @@ START_TEST(d3d) Direct3D1Test(); TextureLoadTest(); ViewportTest(); + FindDevice(); D3D1_releaseObjects(); }

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
67
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 June 2010