August 2007 - Wine-Commits - list.winehq.org

Luis C. Busquets Pérez : ntdll: Update Nt stdcalls for stubs of Zw.
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: 09a1227f0821a842f4f39f10e5e372c4b21e54a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09a1227f0821a842f4f39f10e… Author: Luis C. Busquets Pérez <luis.busquets(a)ilidium.com> Date: Fri Aug 3 16:20:12 2007 +0200 ntdll: Update Nt stdcalls for stubs of Zw. --- dlls/ntdll/ntdll.spec | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d12123a..9af0d13 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1026,7 +1026,7 @@ @ stub ZwImpersonateClientOfPort @ stub ZwImpersonateThread @ stub ZwInitializeRegistry -# @ stub ZwInitiatePowerAction +@ stdcall ZwInitiatePowerAction(long long long long) NtInitiatePowerAction # @ stub ZwIsProcessInJob # @ stub ZwIsSystemResumeAutomatic @ stdcall ZwListenPort(ptr ptr) NtListenPort @@ -1067,7 +1067,7 @@ # @ stub ZwOpenThreadTokenEx @ stdcall ZwOpenTimer(ptr long ptr) NtOpenTimer @ stub ZwPlugPlayControl -# @ stub ZwPowerInformation +@ stdcall ZwPowerInformation(long ptr long ptr long) NtPowerInformation @ stdcall ZwPrivilegeCheck(ptr ptr ptr) NtPrivilegeCheck @ stub ZwPrivilegeObjectAuditAlarm @ stub ZwPrivilegedServiceAuditAlarm @@ -1083,7 +1083,7 @@ @ stdcall ZwQueryDirectoryObject(long ptr long long long ptr ptr) NtQueryDirectoryObject @ stub ZwQueryEaFile @ stdcall ZwQueryEvent(long long ptr long ptr) NtQueryEvent -# @ stub ZwQueryFullAttributesFile +@ stdcall ZwQueryFullAttributesFile(ptr ptr) NtQueryFullAttributesFile @ stdcall ZwQueryInformationAtom(long long ptr long ptr) NtQueryInformationAtom @ stdcall ZwQueryInformationFile(long ptr ptr long long) NtQueryInformationFile # @ stub ZwQueryInformationJobObject @@ -1095,7 +1095,7 @@ @ stub ZwQueryIntervalProfile @ stdcall ZwQueryIoCompletion(long long ptr long ptr) NtQueryIoCompletion @ stdcall ZwQueryKey(long long ptr long ptr) NtQueryKey -# @ stub ZwQueryMultipleValueKey +@ stdcall ZwQueryMultipleValueKey(long ptr long ptr long ptr) NtQueryMultipleValueKey @ stdcall ZwQueryMutant(long long ptr long ptr) NtQueryMutant @ stdcall ZwQueryObject(long long long long long) NtQueryObject @ stub ZwQueryOpenSubKeys @@ -1115,7 +1115,7 @@ @ stdcall ZwQueryValueKey(long ptr long ptr long ptr) NtQueryValueKey @ stdcall ZwQueryVirtualMemory(long ptr long ptr long ptr) NtQueryVirtualMemory @ stdcall ZwQueryVolumeInformationFile(long ptr ptr long long) NtQueryVolumeInformationFile -# @ stub ZwQueueApcThread +@ stdcall ZwQueueApcThread(long ptr long long long) NtQueueApcThread @ stdcall ZwRaiseException(ptr ptr long) NtRaiseException @ stub ZwRaiseHardError @ stdcall ZwReadFile(long long long long long long long long long) NtReadFile @@ -1190,7 +1190,7 @@ @ stdcall ZwSetValueKey(long long long long long long) NtSetValueKey @ stdcall ZwSetVolumeInformationFile(long ptr ptr long long) NtSetVolumeInformationFile @ stdcall ZwShutdownSystem(long) NtShutdownSystem -# @ stub ZwSignalAndWaitForSingleObject +@ stdcall ZwSignalAndWaitForSingleObject(long long long ptr) NtSignalAndWaitForSingleObject @ stub ZwStartProfile @ stub ZwStopProfile # @ stub ZwSuspendProcess

1 0

Andrew Talbot : oleaut32: Constify some variables.
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: 6eb90d87fbb1d0d4f224b4fa1cc8ec266f4cdd60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eb90d87fbb1d0d4f224b4fa1… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Aug 3 21:13:05 2007 +0100 oleaut32: Constify some variables. --- dlls/oleaut32/vartype.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index f3da281..8231038 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -4153,7 +4153,7 @@ typedef struct DECIMAL_internal static HRESULT VARIANT_DI_FromR4(float source, VARIANT_DI * dest); static HRESULT VARIANT_DI_FromR8(double source, VARIANT_DI * dest); static void VARIANT_DIFromDec(const DECIMAL * from, VARIANT_DI * to); -static void VARIANT_DecFromDI(VARIANT_DI * from, DECIMAL * to); +static void VARIANT_DecFromDI(const VARIANT_DI * from, DECIMAL * to); /************************************************************************ * VarDecFromR4 (OLEAUT32.193) @@ -4623,7 +4623,7 @@ static void VARIANT_DIFromDec(const DECIMAL * from, VARIANT_DI * to) to->bitsnum[2] = DEC_HI32(from); } -static void VARIANT_DecFromDI(VARIANT_DI * from, DECIMAL * to) +static void VARIANT_DecFromDI(const VARIANT_DI * from, DECIMAL * to) { if (from->sign) { DEC_SIGNSCALE(to) = SIGNSCALE(DECIMAL_NEG, from->scale); @@ -4672,7 +4672,7 @@ static unsigned char VARIANT_int_divbychar(DWORD * p, unsigned int n, unsigned c } /* check to test if encoded number is a zero. Returns 1 if zero, 0 for nonzero */ -static int VARIANT_int_iszero(DWORD * p, unsigned int n) +static int VARIANT_int_iszero(const DWORD * p, unsigned int n) { for (; n > 0; n--) if (*p++ != 0) return 0; return 1; @@ -4683,7 +4683,7 @@ static int VARIANT_int_iszero(DWORD * p, unsigned int n) digits when scale > 0 in order to fit an overflowing result. Final overflow flag is returned. */ -static int VARIANT_DI_mul(VARIANT_DI * a, VARIANT_DI * b, VARIANT_DI * result) +static int VARIANT_DI_mul(const VARIANT_DI * a, const VARIANT_DI * b, VARIANT_DI * result) { int r_overflow = 0; DWORD running[6]; @@ -4779,7 +4779,7 @@ static int VARIANT_DI_mul(VARIANT_DI * a, VARIANT_DI * b, VARIANT_DI * result) hardcoded (period for decimal separator, dash as negative sign). Returns 0 for success, nonzero if insufficient space in output buffer. */ -static int VARIANT_DI_tostringW(VARIANT_DI * a, WCHAR * s, unsigned int n) +static int VARIANT_DI_tostringW(const VARIANT_DI * a, WCHAR * s, unsigned int n) { int overflow = 0; DWORD quotient[3]; @@ -4886,7 +4886,7 @@ static void VARIANT_int_shiftleft(DWORD * p, unsigned int n, unsigned int shift) Value at v is incremented by the value at p. Any size is supported, provided that v is not shorter than p. Any unapplied carry is returned as a result. */ -static unsigned char VARIANT_int_add(DWORD * v, unsigned int nv, DWORD * p, +static unsigned char VARIANT_int_add(DWORD * v, unsigned int nv, const DWORD * p, unsigned int np) { unsigned char carry = 0; @@ -4925,7 +4925,7 @@ static unsigned char VARIANT_int_add(DWORD * v, unsigned int nv, DWORD * p, was then heavily modified by me (Alex Villacis Lasso) in order to handle variably-scaled integers such as the MS DECIMAL representation. */ -static void VARIANT_int_div(DWORD * p, unsigned int n, DWORD * divisor, +static void VARIANT_int_div(DWORD * p, unsigned int n, const DWORD * divisor, unsigned int dn) { unsigned int i; @@ -5126,7 +5126,8 @@ static int VARIANT_int_addlossy( 0 if the division was completed (even if quotient is set to 0), or nonzero in case of quotient overflow. */ -static HRESULT VARIANT_DI_div(VARIANT_DI * dividend, VARIANT_DI * divisor, VARIANT_DI * quotient) +static HRESULT VARIANT_DI_div(const VARIANT_DI * dividend, const VARIANT_DI * divisor, + VARIANT_DI * quotient) { HRESULT r_overflow = S_OK; @@ -6342,7 +6343,7 @@ HRESULT WINAPI VarBstrFromI4(LONG lIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) return VARIANT_BstrFromUInt(ul64, lcid, dwFlags, pbstrOut); } -static BSTR VARIANT_BstrReplaceDecimal(WCHAR * buff, LCID lcid, ULONG dwFlags) +static BSTR VARIANT_BstrReplaceDecimal(const WCHAR * buff, LCID lcid, ULONG dwFlags) { BSTR bstrOut; WCHAR lpDecimalSep[16];

1 0

Chris Robinson : wgl: WGL_COLOR_BITS_ARB does include alpha.
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: 3fc8ac554629c794b75faa69c8b08333ddc808fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fc8ac554629c794b75faa69c… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Thu Aug 2 19:03:12 2007 -0700 wgl: WGL_COLOR_BITS_ARB does include alpha. --- dlls/opengl32/tests/opengl.c | 38 +++++++++++++++++++++++++++++++ dlls/winex11.drv/opengl.c | 51 ++++------------------------------------- 2 files changed, 43 insertions(+), 46 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index efb1cd6..6ef1d25 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -30,7 +30,13 @@ static const char* (WINAPI *pwglGetExtensionsStringARB)(HDC); static int (WINAPI *pwglReleasePbufferDCARB)(HPBUFFERARB, HDC); /* WGL_ARB_pixel_format */ +#define WGL_COLOR_BITS_ARB 0x2014 +#define WGL_RED_BITS_ARB 0x2015 +#define WGL_GREEN_BITS_ARB 0x2017 +#define WGL_BLUE_BITS_ARB 0x2019 +#define WGL_ALPHA_BITS_ARB 0x201B static BOOL (WINAPI *pwglChoosePixelFormatARB)(HDC, const int *, const FLOAT *, UINT, int *, UINT *); +static BOOL (WINAPI *pwglGetPixelFormatAttribivARB)(HDC, int, int, UINT, const int *, int *); /* WGL_ARB_pbuffer */ #define WGL_DRAW_TO_PBUFFER_ARB 0x202D @@ -46,6 +52,7 @@ static void init_functions(void) /* WGL_ARB_pixel_format */ pwglChoosePixelFormatARB = (void*)wglGetProcAddress("wglChoosePixelFormatARB"); + pwglGetPixelFormatAttribivARB = (void*)wglGetProcAddress("wglGetPixelFormatAttribivARB"); /* WGL_ARB_pbuffer */ pwglCreatePbufferARB = (void*)wglGetProcAddress("wglCreatePbufferARB"); @@ -188,6 +195,36 @@ static void test_setpixelformat(void) ok(res == 0, "SetPixelFormat on main device context should fail\n"); } +static void test_colorbits(HDC hdc) +{ + const int iAttribList[] = { WGL_COLOR_BITS_ARB, WGL_RED_BITS_ARB, WGL_GREEN_BITS_ARB, + WGL_BLUE_BITS_ARB, WGL_ALPHA_BITS_ARB }; + int iAttribRet[sizeof(iAttribList)/sizeof(iAttribList[0])]; + const int iAttribs[] = { WGL_ALPHA_BITS_ARB, 1, 0 }; + unsigned int nFormats; + int res; + int iPixelFormat = 0; + + /* We need a pixel format with at least one bit of alpha */ + res = pwglChoosePixelFormatARB(hdc, iAttribs, NULL, 1, &iPixelFormat, &nFormats); + if(res == FALSE || nFormats == 0) + { + skip("No suitable pixel formats found\n"); + return; + } + + res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, + sizeof(iAttribList)/sizeof(iAttribList[0]), iAttribList, iAttribRet); + if(res == FALSE) + { + skip("wglGetPixelFormatAttribivARB failed\n"); + return; + } + iAttribRet[1] += iAttribRet[2]+iAttribRet[3]+iAttribRet[4]; + ok(iAttribRet[0] == iAttribRet[1], "WGL_COLOR_BITS_ARB (%d) does not equal R+G+B+A (%d)!\n", + iAttribRet[0], iAttribRet[1]); +} + START_TEST(opengl) { HWND hwnd; @@ -236,6 +273,7 @@ START_TEST(opengl) init_functions(); test_setpixelformat(); + test_colorbits(hdc); wgl_extensions = pwglGetExtensionsStringARB(hdc); if(wgl_extensions == NULL) skip("Skipping opengl32 tests because this OpenGL implementation doesn't support WGL extensions!\n"); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 44a543e..806f7e9 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -619,9 +619,6 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf int drawattrib = 0; int nvfloatattrib = GLX_DONT_CARE; int pixelattrib = 0; - int isColor = 0; - int wantColorBits = 0; - int sz_alpha = 0; /* The list of WGL attributes is allowed to be NULL. We don't return here for NULL * because we need to do fixups for GLX_DRAWABLE_TYPE/GLX_RENDER_TYPE/GLX_FLOAT_COMPONENTS_NV. */ @@ -631,7 +628,8 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf switch (iWGLAttr[cur]) { case WGL_COLOR_BITS_ARB: pop = iWGLAttr[++cur]; - wantColorBits = pop; /** see end */ + PUSH2(oGLXAttr, GLX_BUFFER_SIZE, pop); + TRACE("pAttr[%d] = GLX_BUFFER_SIZE: %d\n", cur, pop); break; case WGL_BLUE_BITS_ARB: pop = iWGLAttr[++cur]; @@ -650,7 +648,6 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf break; case WGL_ALPHA_BITS_ARB: pop = iWGLAttr[++cur]; - sz_alpha = pop; PUSH2(oGLXAttr, GLX_ALPHA_SIZE, pop); TRACE("pAttr[%d] = GLX_ALPHA_SIZE: %d\n", cur, pop); break; @@ -674,7 +671,7 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf pop = iWGLAttr[++cur]; TRACE("pAttr[%d] = WGL_PIXEL_TYPE_ARB: %d\n", cur, pop); switch (pop) { - case WGL_TYPE_COLORINDEX_ARB: pixelattrib = GLX_COLOR_INDEX_BIT; isColor = 1; break ; + case WGL_TYPE_COLORINDEX_ARB: pixelattrib = GLX_COLOR_INDEX_BIT; break ; case WGL_TYPE_RGBA_ARB: pixelattrib = GLX_RGBA_BIT; break ; /* This is the same as WGL_TYPE_RGBA_FLOAT_ATI but the GLX constants differ, only the ARB GLX one is widely supported so use that */ case WGL_TYPE_RGBA_FLOAT_ATI: pixelattrib = GLX_RGBA_FLOAT_BIT; break ; @@ -787,36 +784,6 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf ++cur; } - /** - * Trick as WGL_COLOR_BITS_ARB != GLX_BUFFER_SIZE - * WGL_COLOR_BITS_ARB + WGL_ALPHA_BITS_ARB == GLX_BUFFER_SIZE - * - * WGL_COLOR_BITS_ARB - * The number of color bitplanes in each color buffer. For RGBA - * pixel types, it is the size of the color buffer, excluding the - * alpha bitplanes. For color-index pixels, it is the size of the - * color index buffer. - * - * GLX_BUFFER_SIZE - * This attribute defines the number of bits per color buffer. - * For GLX FBConfigs that correspond to a PseudoColor or StaticColor visual, - * this is equal to the depth value reported in the X11 visual. - * For GLX FBConfigs that correspond to TrueColor or DirectColor visual, - * this is the sum of GLX_RED_SIZE, GLX_GREEN_SIZE, GLX_BLUE_SIZE, and GLX_ALPHA_SIZE. - * - */ - if (0 < wantColorBits) { - if (!isColor) { - wantColorBits += sz_alpha; - } - if (32 < wantColorBits) { - ERR("buggy %d GLX_BUFFER_SIZE default to 32\n", wantColorBits); - wantColorBits = 32; - } - PUSH2(oGLXAttr, GLX_BUFFER_SIZE, wantColorBits); - TRACE("pAttr[%d] = WGL_COLOR_BITS_ARB: %d\n", cur, wantColorBits); - } - /* Apply the OR'd drawable type bitmask now EVEN when WGL_DRAW_TO* is unset. * It is needed in all cases because GLX_DRAWABLE_TYPE default to GLX_WINDOW_BIT. */ PUSH2(oGLXAttr, GLX_DRAWABLE_TYPE, drawattrib); @@ -2595,16 +2562,8 @@ static GLboolean WINAPI X11DRV_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelF continue; case WGL_COLOR_BITS_ARB: - /** see ConvertAttribWGLtoGLX for explain */ - if (!fmt) goto pix_error; - hTest = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_BUFFER_SIZE, piValues + i); - if (hTest) goto get_error; - TRACE("WGL_COLOR_BITS_ARB: GLX_BUFFER_SIZE = %d\n", piValues[i]); - hTest = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_ALPHA_SIZE, &tmp); - if (hTest) goto get_error; - TRACE("WGL_COLOR_BITS_ARB: GLX_ALPHA_SIZE = %d\n", tmp); - piValues[i] = piValues[i] - tmp; - continue; + curGLXAttr = GLX_BUFFER_SIZE; + break; case WGL_BIND_TO_TEXTURE_RGB_ARB: if (use_render_texture_ati) {

1 0

Stefan Dösinger : d3d9: Do not fail if d3d9 is not available.
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: 9ae22f1a765e2d9ffc8dd4eccafe4210c2ea5750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ae22f1a765e2d9ffc8dd4ecc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 24 21:29:19 2007 +0200 d3d9: Do not fail if d3d9 is not available. --- dlls/d3d9/tests/device.c | 26 +++++++++++++++++++------- dlls/d3d9/tests/query.c | 8 ++++++-- dlls/d3d9/tests/shader.c | 2 +- dlls/d3d9/tests/surface.c | 2 +- dlls/d3d9/tests/texture.c | 2 +- dlls/d3d9/tests/visual.c | 8 ++++++-- 6 files changed, 34 insertions(+), 14 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index ec54ea4..c2012fc 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -739,7 +739,7 @@ static void test_reset(void) if(FAILED(hr)) { - trace("could not create device, IDirect3D9_CreateDevice returned %#x\n", hr); + skip("could not create device, IDirect3D9_CreateDevice returned %#x\n", hr); goto cleanup; } @@ -975,8 +975,12 @@ static void test_scene(void) hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(hr == D3D_OK, "IDirect3D9_CreateDevice failed with %s\n", DXGetErrorString9(hr)); - if(!pDevice) goto cleanup; + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D9_CreateDevice failed with %s\n", DXGetErrorString9(hr)); + if(!pDevice) + { + skip("Failed to create a d3d device\n"); + goto cleanup; + } /* Get the caps, they will be needed to tell if an operation is supposed to be valid */ memset(&caps, 0, sizeof(caps)); @@ -1124,8 +1128,12 @@ static void test_limits(void) hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(hr == D3D_OK, "IDirect3D9_CreateDevice failed with %s\n", DXGetErrorString9(hr)); - if(!pDevice) goto cleanup; + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D9_CreateDevice failed with %s\n", DXGetErrorString9(hr)); + if(!pDevice) + { + skip("Failed to create a d3d device\n"); + goto cleanup; + } hr = IDirect3DDevice9_CreateTexture(pDevice, 16, 16, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &pTexture, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed with %s\n", DXGetErrorString9(hr)); @@ -1187,8 +1195,12 @@ static void test_depthstenciltest(void) hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(hr == D3D_OK, "IDirect3D9_CreateDevice failed with %s\n", DXGetErrorString9(hr)); - if(!pDevice) goto cleanup; + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D9_CreateDevice failed with %s\n", DXGetErrorString9(hr)); + if(!pDevice) + { + skip("Failed to create a d3d device\n"); + goto cleanup; + } hr = IDirect3DDevice9_GetDepthStencilSurface(pDevice, &pDepthStencil); ok(hr == D3D_OK && pDepthStencil != NULL, "IDirect3DDevice9_GetDepthStencilSurface failed with %s\n", DXGetErrorString9(hr)); diff --git a/dlls/d3d9/tests/query.c b/dlls/d3d9/tests/query.c index 72e1018..9f2b5b3 100644 --- a/dlls/d3d9/tests/query.c +++ b/dlls/d3d9/tests/query.c @@ -96,8 +96,12 @@ static void test_query_support(IDirect3D9 *pD3d, HWND hwnd) hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(SUCCEEDED(hr), "Failed to create IDirect3D9Device (%s)\n", DXGetErrorString9(hr)); - if (FAILED(hr)) goto cleanup; + ok(SUCCEEDED(hr) || hr == D3DERR_NOTAVAILABLE, "Failed to create IDirect3D9Device (%s)\n", DXGetErrorString9(hr)); + if (FAILED(hr)) + { + skip("Failed to create a d3d device\n"); + goto cleanup; + } for(i = 0; i < sizeof(queries) / sizeof(queries[0]); i++) { diff --git a/dlls/d3d9/tests/shader.c b/dlls/d3d9/tests/shader.c index 9c34043..0465cee 100644 --- a/dlls/d3d9/tests/shader.c +++ b/dlls/d3d9/tests/shader.c @@ -58,7 +58,7 @@ static IDirect3DDevice9 *init_d3d9(void) if(FAILED(hres)) { - trace("could not create device, IDirect3D9_CreateDevice returned %#x\n", hres); + skip("could not create device, IDirect3D9_CreateDevice returned %#x\n", hres); return NULL; } diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index b209115..c84e933 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -57,7 +57,7 @@ static IDirect3DDevice9 *init_d3d9(HMODULE d3d9_handle) if(FAILED(hr)) { - trace("could not create device, IDirect3D9_CreateDevice returned %#x\n", hr); + skip("could not create device, IDirect3D9_CreateDevice returned %#x\n", hr); return NULL; } diff --git a/dlls/d3d9/tests/texture.c b/dlls/d3d9/tests/texture.c index 79d855d..cb7b781 100644 --- a/dlls/d3d9/tests/texture.c +++ b/dlls/d3d9/tests/texture.c @@ -56,7 +56,7 @@ static IDirect3DDevice9 *init_d3d9(HMODULE d3d9_handle) if(FAILED(hr)) { - trace("could not create device, IDirect3D9_CreateDevice returned %#x\n", hr); + skip("could not create device, IDirect3D9_CreateDevice returned %#x\n", hr); return NULL; } diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 1d92d22..65e33bb 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -120,7 +120,7 @@ static IDirect3DDevice9 *init_d3d9(void) present_parameters.AutoDepthStencilFormat = D3DFMT_D16; hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); - ok(hr == D3D_OK, "IDirect3D_CreateDevice returned: %s\n", DXGetErrorString9(hr)); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D_CreateDevice returned: %s\n", DXGetErrorString9(hr)); return device_ptr; } @@ -1199,7 +1199,11 @@ START_TEST(visual) } device_ptr = init_d3d9(); - if (!device_ptr) return; + if (!device_ptr) + { + skip("Creating the device failed\n"); + return; + } IDirect3DDevice9_GetDeviceCaps(device_ptr, &caps);

1 0

Stefan Dösinger : d3d9: Deal with failing surface creation.
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: 39a8f1b2a434e14142d90600cc820609d7531b21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39a8f1b2a434e14142d90600c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 24 21:15:55 2007 +0200 d3d9: Deal with failing surface creation. --- dlls/d3d9/tests/surface.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index 8c82323..b209115 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -150,8 +150,11 @@ static void test_surface_alignment(IDirect3DDevice9 *device_ptr) hr = IDirect3DDevice9_CreateTexture(device_ptr, 64, 64, 0, 0, MAKEFOURCC('D', 'X', 'T', '1'+i), D3DPOOL_MANAGED, &pTexture, NULL); - ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateTexture: %s\n", DXGetErrorString9(hr)); - if (FAILED(hr)) continue; + ok(SUCCEEDED(hr) || hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_CreateTexture: %s\n", DXGetErrorString9(hr)); + if (FAILED(hr)) { + skip("DXT%d surfaces are not supported\n", i + 1); + continue; + } for (j = IDirect3DBaseTexture9_GetLevelCount(pTexture) - 1; j >= 0; j--) {

1 0

Stefan Dösinger : wined3d: WINED3DSAMP_MAXMIPLEVEL fixes.
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: dbd338c018cd2eae3dcbe20373482163c0783733 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbd338c018cd2eae3dcbe2037… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 25 18:49:03 2007 +0200 wined3d: WINED3DSAMP_MAXMIPLEVEL fixes. --- dlls/d3d9/tests/visual.c | 188 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/basetexture.c | 22 ++++-- 2 files changed, 203 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dbd338c018cd2eae3dcbe…

1 0

Stefan Dösinger : d3d8: Skip tests if d3d is not supported.
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: 573db35bf65117f3560ece24c13ce637c1610e84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=573db35bf65117f3560ece24c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 24 21:56:03 2007 +0200 d3d8: Skip tests if d3d is not supported. --- dlls/d3d8/tests/device.c | 38 ++++++++++++++++++++++++++------------ dlls/d3d8/tests/surface.c | 2 +- dlls/d3d8/tests/texture.c | 2 +- dlls/d3d8/tests/visual.c | 8 ++++++-- dlls/d3d8/tests/volume.c | 2 +- 5 files changed, 35 insertions(+), 17 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index c32eedd..fb9d5da 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -136,7 +136,7 @@ static void test_mipmap_levels(void) D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); if(FAILED(hr)) { - trace("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr); + skip("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr); goto cleanup; } @@ -181,7 +181,7 @@ static void test_swapchain(void) D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); if(FAILED(hr)) { - trace("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr); + skip("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr); goto cleanup; } @@ -324,7 +324,7 @@ static void test_refcount(void) D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); if(FAILED(hr)) { - trace("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr); + skip("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr); goto cleanup; } IDirect3DDevice8_GetDeviceCaps(pDevice, &caps); @@ -638,7 +638,7 @@ static void test_cursor(void) D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); if(FAILED(hr)) { - trace("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr); + skip("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr); goto cleanup; } @@ -717,7 +717,7 @@ static void test_states(void) D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); if(FAILED(hr)) { - trace("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr); + skip("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr); goto cleanup; } @@ -741,10 +741,12 @@ static void test_shader_versions(void) ok(pD3d != NULL, "Failed to create IDirect3D8 object\n"); if (pD3d != NULL) { hr = IDirect3D8_GetDeviceCaps(pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, &d3dcaps); - ok(SUCCEEDED(hr), "Failed to get D3D8 caps (%s)\n", DXGetErrorString8(hr)); + ok(SUCCEEDED(hr) || hr == D3DERR_NOTAVAILABLE, "Failed to get D3D8 caps (%08x)\n", hr); if (SUCCEEDED(hr)) { ok(d3dcaps.VertexShaderVersion <= D3DVS_VERSION(1,1), "Unexpected VertexShaderVersion (%#x > %#x)\n", d3dcaps.VertexShaderVersion, D3DVS_VERSION(1,1)); ok(d3dcaps.PixelShaderVersion <= D3DPS_VERSION(1,4), "Unexpected PixelShaderVersion (%#x > %#x)\n", d3dcaps.PixelShaderVersion, D3DPS_VERSION(1,4)); + } else { + skip("No Direct3D support\n"); } IDirect3D8_Release(pD3d); } @@ -805,8 +807,12 @@ static void test_scene(void) hr = IDirect3D8_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(hr == D3D_OK, "IDirect3D8_CreateDevice failed with %s\n", DXGetErrorString8(hr)); - if(!pDevice) goto cleanup; + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "IDirect3D8_CreateDevice failed with %08x\n", hr); + if(!pDevice) + { + skip("could not create device, IDirect3D8_CreateDevice returned %08x\n", hr); + goto cleanup; + } /* Test an EndScene without beginscene. Should return an error */ hr = IDirect3DDevice8_EndScene(pDevice); @@ -885,8 +891,12 @@ static void test_shader(void) hr = IDirect3D8_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(hr == D3D_OK, "IDirect3D8_CreateDevice failed with %s\n", DXGetErrorString8(hr)); - if(!pDevice) goto cleanup; + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "IDirect3D8_CreateDevice failed with %08x\n", hr); + if(!pDevice) + { + skip("could not create device, IDirect3D8_CreateDevice returned %08x\n", hr); + goto cleanup; + } IDirect3DDevice8_GetDeviceCaps(pDevice, &caps); /* First create a vertex shader */ @@ -1053,8 +1063,12 @@ static void test_limits(void) hr = IDirect3D8_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(hr == D3D_OK, "IDirect3D8_CreateDevice failed with %s\n", DXGetErrorString8(hr)); - if(!pDevice) goto cleanup; + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "IDirect3D8_CreateDevice failed with %08x\n", hr); + if(!pDevice) + { + skip("could not create device, IDirect3D8_CreateDevice returned %08x\n", hr); + goto cleanup; + } hr = IDirect3DDevice8_CreateTexture(pDevice, 16, 16, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &pTexture); ok(hr == D3D_OK, "IDirect3DDevice8_CreateTexture failed with %s\n", DXGetErrorString8(hr)); diff --git a/dlls/d3d8/tests/surface.c b/dlls/d3d8/tests/surface.c index 1503581..71dce2f 100644 --- a/dlls/d3d8/tests/surface.c +++ b/dlls/d3d8/tests/surface.c @@ -59,7 +59,7 @@ static IDirect3DDevice8 *init_d3d8(HMODULE d3d8_handle) if(FAILED(hr)) { - trace("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr); + skip("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr); return NULL; } diff --git a/dlls/d3d8/tests/texture.c b/dlls/d3d8/tests/texture.c index df7da8b..5c92271 100644 --- a/dlls/d3d8/tests/texture.c +++ b/dlls/d3d8/tests/texture.c @@ -59,7 +59,7 @@ static IDirect3DDevice8 *init_d3d8(HMODULE d3d8_handle) if(FAILED(hr)) { - trace("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr); + skip("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr); return NULL; } diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index a23c322..d2c8327 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -120,7 +120,7 @@ static IDirect3DDevice8 *init_d3d8(void) present_parameters.AutoDepthStencilFormat = D3DFMT_D16; hr = IDirect3D8_CreateDevice(d3d8_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); - ok(hr == D3D_OK, "IDirect3D_CreateDevice returned: %s\n", DXGetErrorString8(hr)); + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "IDirect3D_CreateDevice returned: %s\n", DXGetErrorString8(hr)); return device_ptr; } @@ -625,7 +625,11 @@ START_TEST(visual) } device_ptr = init_d3d8(); - if (!device_ptr) return; + if (!device_ptr) + { + skip("Could not initialize direct3d\n"); + return; + } IDirect3DDevice8_GetDeviceCaps(device_ptr, &caps); diff --git a/dlls/d3d8/tests/volume.c b/dlls/d3d8/tests/volume.c index 09767c2..66f5a3c 100644 --- a/dlls/d3d8/tests/volume.c +++ b/dlls/d3d8/tests/volume.c @@ -59,7 +59,7 @@ static IDirect3DDevice8 *init_d3d8(HMODULE d3d8_handle) if(FAILED(hr)) { - trace("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr); + skip("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr); return NULL; }

1 0

Stefan Dösinger : wined3d: Present requires the swapchain's context.
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: 38c7e9356e12a075edc06946d1234b70224970bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=38c7e9356e12a075edc06946d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jul 26 19:13:11 2007 +0200 wined3d: Present requires the swapchain's context. --- dlls/wined3d/swapchain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 059120d..1557e4d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -153,7 +153,7 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO ENTER_GL(); - ActivateContext(This->wineD3DDevice, This->wineD3DDevice->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + ActivateContext(This->wineD3DDevice, This->backBuffer[0], CTXUSAGE_RESOURCELOAD); /* Render the cursor onto the back buffer, using our nifty directdraw blitting code :-) */ if(This->wineD3DDevice->bCursorVisible && This->wineD3DDevice->cursorTexture) {

1 0

Paul Vriens : winetest: Skip tests for which the dll is missing.
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: ceaf4f40bef2d365f637ddc2a27983fc4d62e045 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceaf4f40bef2d365f637ddc2a… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Aug 3 12:59:36 2007 +0200 winetest: Skip tests for which the dll is missing. --- programs/winetest/main.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index f743ffc..f433584 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -60,6 +60,7 @@ static struct wine_test *wine_tests; static int nr_of_files, nr_of_tests; static struct rev_info *rev_infos = NULL; static const char whitespace[] = " \t\r\n"; +static const char testexe[] = "_test.exe"; static int running_under_wine (void) { @@ -245,9 +246,8 @@ extract_test (struct wine_test *test, const char *dir, LPTSTR res_name) if (!code) report (R_FATAL, "Can't find test resource %s: %d", res_name, GetLastError ()); test->name = xstrdup( res_name ); - CharLowerA( test->name ); test->exename = strmake (NULL, "%s/%s", dir, test->name); - exepos = strstr (test->name, "_test.exe"); + exepos = strstr (test->name, testexe); if (!exepos) report (R_FATAL, "Not an .exe file: %s", test->name); *exepos = 0; test->name = xrealloc (test->name, exepos - test->name + 1); @@ -433,6 +433,23 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, LPTSTR lpszName, LONG_PTR lParam) { const char *tempdir = (const char *)lParam; + char dllname[MAX_PATH]; + HMODULE dll; + + /* Check if the main dll is present on this system */ + CharLowerA(lpszName); + strcpy(dllname, lpszName); + *strstr(dllname, testexe) = 0; + + dll = LoadLibraryExA(dllname, NULL, LOAD_LIBRARY_AS_DATAFILE); + if (!dll) { + xprintf ("%s:%s_dll_missing start 0 0\n", dllname, dllname); + xprintf ("%s_dll_missing: -1 tests executed (-1 marked as todo, -1 failures), -1 skipped.\n", dllname); + xprintf ("%s:%s_dll_missing done (0)\n", dllname, dllname); + return TRUE; + } + FreeLibrary(dll); + get_subtests( tempdir, &wine_tests[nr_of_files], lpszName ); nr_of_tests += wine_tests[nr_of_files].subtest_count; nr_of_files++;

1 0

Maarten Lankhorst : winealsa: wavein has LPWAVEINCAPSW not LPWAVEOUTCAPSW.
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: 181ae2eba082acfc2e5982c07422b11695ec36f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=181ae2eba082acfc2e5982c07… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Aug 3 15:14:37 2007 +0200 winealsa: wavein has LPWAVEINCAPSW not LPWAVEOUTCAPSW. --- dlls/winealsa.drv/wavein.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index 412edd2..085d6ac 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -93,7 +93,7 @@ static DWORD widNotifyClient(WINE_WAVEDEV* wwi, WORD wMsg, DWORD dwParam1, DWORD /************************************************************************** * widGetDevCaps [internal] */ -static DWORD widGetDevCaps(WORD wDevID, LPWAVEOUTCAPSW lpCaps, DWORD dwSize) +static DWORD widGetDevCaps(WORD wDevID, LPWAVEINCAPSW lpCaps, DWORD dwSize) { TRACE("(%u, %p, %u);\n", wDevID, lpCaps, dwSize); @@ -861,7 +861,7 @@ DWORD WINAPI ALSA_widMessage(UINT wDevID, UINT wMsg, DWORD dwUser, case WIDM_ADDBUFFER: return widAddBuffer (wDevID, (LPWAVEHDR)dwParam1, dwParam2); case WIDM_PREPARE: return MMSYSERR_NOTSUPPORTED; case WIDM_UNPREPARE: return MMSYSERR_NOTSUPPORTED; - case WIDM_GETDEVCAPS: return widGetDevCaps (wDevID, (LPWAVEOUTCAPSW)dwParam1, dwParam2); + case WIDM_GETDEVCAPS: return widGetDevCaps (wDevID, (LPWAVEINCAPSW)dwParam1, dwParam2); case WIDM_GETNUMDEVS: return widGetNumDevs (); case WIDM_GETPOS: return widGetPosition (wDevID, (LPMMTIME)dwParam1, dwParam2); case WIDM_RESET: return widReset (wDevID);

1 0