wine-commits July 2007

wine-commits@winehq.org

3 participants
957 discussions

Paul Vriens : msi/registry: Use the return value of squash_guid.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 5e7b31b51da7bcbf9d1672887ac12348b7339195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e7b31b51da7bcbf9d1672887… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Jul 30 20:13:04 2007 +0200 msi/registry: Use the return value of squash_guid. --- dlls/msi/registry.c | 53 ++++++++++++++++++++++++++++++++++---------------- 1 files changed, 36 insertions(+), 17 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index b9c0af4..013d152 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -233,6 +233,8 @@ BOOL squash_guid(LPCWSTR in, LPWSTR out) DWORD i,n=1; GUID guid; + out[0] = 0; + if (FAILED(CLSIDFromString((LPOLESTR)in, &guid))) return FALSE; @@ -474,7 +476,8 @@ UINT MSIREG_OpenUserProductsKey(LPCWSTR szProduct, HKEY* key, BOOL create) WCHAR keypath[0x200]; TRACE("%s\n",debugstr_w(szProduct)); - squash_guid(szProduct,squished_pc); + if (!squash_guid(szProduct,squished_pc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); sprintfW(keypath,szUserProduct_fmt,squished_pc); @@ -493,7 +496,8 @@ UINT MSIREG_DeleteUserProductKey(LPCWSTR szProduct) WCHAR keypath[0x200]; TRACE("%s\n",debugstr_w(szProduct)); - squash_guid(szProduct,squished_pc); + if (!squash_guid(szProduct,squished_pc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); sprintfW(keypath,szUserProduct_fmt,squished_pc); @@ -508,7 +512,8 @@ UINT MSIREG_OpenUserPatchesKey(LPCWSTR szPatch, HKEY* key, BOOL create) WCHAR keypath[0x200]; TRACE("%s\n",debugstr_w(szPatch)); - squash_guid(szPatch,squished_pc); + if (!squash_guid(szPatch,squished_pc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); sprintfW(keypath,szUserPatch_fmt,squished_pc); @@ -528,7 +533,8 @@ UINT MSIREG_OpenUserFeaturesKey(LPCWSTR szProduct, HKEY* key, BOOL create) WCHAR keypath[0x200]; TRACE("%s\n",debugstr_w(szProduct)); - squash_guid(szProduct,squished_pc); + if (!squash_guid(szProduct,squished_pc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); sprintfW(keypath,szUserFeatures_fmt,squished_pc); @@ -553,7 +559,8 @@ UINT MSIREG_OpenFeaturesKey(LPCWSTR szProduct, HKEY* key, BOOL create) WCHAR keypath[0x200]; TRACE("%s\n",debugstr_w(szProduct)); - squash_guid(szProduct,squished_pc); + if (!squash_guid(szProduct,squished_pc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); sprintfW(keypath,szInstaller_Features_fmt,squished_pc); @@ -574,7 +581,8 @@ UINT MSIREG_OpenUserDataFeaturesKey(LPCWSTR szProduct, HKEY *key, BOOL create) LPWSTR usersid; TRACE("%s\n", debugstr_w(szProduct)); - squash_guid(szProduct, squished_pc); + if (!squash_guid(szProduct, squished_pc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); rc = get_user_sid(&usersid); @@ -607,7 +615,8 @@ UINT MSIREG_OpenComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create) WCHAR keypath[0x200]; TRACE("%s\n",debugstr_w(szComponent)); - squash_guid(szComponent,squished_cc); + if (!squash_guid(szComponent,squished_cc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_cc)); sprintfW(keypath,szInstaller_Components_fmt,squished_cc); @@ -627,7 +636,8 @@ UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create) WCHAR keypath[0x200]; TRACE("%s\n",debugstr_w(szComponent)); - squash_guid(szComponent,squished_cc); + if (!squash_guid(szComponent,squished_cc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_cc)); sprintfW(keypath,szUser_Components_fmt,squished_cc); @@ -648,7 +658,8 @@ UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, HKEY *key, BOOL create LPWSTR usersid; TRACE("%s\n", debugstr_w(szComponent)); - squash_guid(szComponent, comp); + if (!squash_guid(szComponent, comp)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(comp)); rc = get_user_sid(&usersid); @@ -677,7 +688,8 @@ UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, HKEY *key, BOOL create) LPWSTR usersid; TRACE("%s\n", debugstr_w(szProduct)); - squash_guid(szProduct, squished_pc); + if (!squash_guid(szProduct, squished_pc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); rc = get_user_sid(&usersid); @@ -706,7 +718,8 @@ UINT MSIREG_OpenInstallPropertiesKey(LPCWSTR szProduct, HKEY *key, BOOL create) LPWSTR usersid; TRACE("%s\n", debugstr_w(szProduct)); - squash_guid(szProduct, squished_pc); + if (!squash_guid(szProduct, squished_pc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); rc = get_user_sid(&usersid); @@ -735,7 +748,8 @@ UINT MSIREG_DeleteUserDataProductKey(LPCWSTR szProduct) LPWSTR usersid; TRACE("%s\n", debugstr_w(szProduct)); - squash_guid(szProduct, squished_pc); + if (!squash_guid(szProduct, squished_pc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); rc = get_user_sid(&usersid); @@ -763,7 +777,8 @@ UINT MSIREG_OpenProductsKey(LPCWSTR szProduct, HKEY* key, BOOL create) WCHAR keypath[0x200]; TRACE("%s\n",debugstr_w(szProduct)); - squash_guid(szProduct,squished_pc); + if (!squash_guid(szProduct,squished_pc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); sprintfW(keypath,szInstaller_Products_fmt,squished_pc); @@ -782,7 +797,8 @@ UINT MSIREG_DeleteProductKey(LPCWSTR szProduct) WCHAR keypath[0x200]; TRACE("%s\n", debugstr_w(szProduct)); - squash_guid(szProduct, squished_pc); + if (!squash_guid(szProduct, squished_pc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); sprintfW(keypath, szInstaller_Products_fmt, squished_pc); @@ -797,7 +813,8 @@ UINT MSIREG_OpenPatchesKey(LPCWSTR szPatch, HKEY* key, BOOL create) WCHAR keypath[0x200]; TRACE("%s\n",debugstr_w(szPatch)); - squash_guid(szPatch,squished_pc); + if (!squash_guid(szPatch,squished_pc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); sprintfW(keypath,szInstaller_Patches_fmt,squished_pc); @@ -817,7 +834,8 @@ UINT MSIREG_OpenUpgradeCodesKey(LPCWSTR szUpgradeCode, HKEY* key, BOOL create) WCHAR keypath[0x200]; TRACE("%s\n",debugstr_w(szUpgradeCode)); - squash_guid(szUpgradeCode,squished_pc); + if (!squash_guid(szUpgradeCode,squished_pc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); sprintfW(keypath,szInstaller_UpgradeCodes_fmt,squished_pc); @@ -837,7 +855,8 @@ UINT MSIREG_OpenUserUpgradeCodesKey(LPCWSTR szUpgradeCode, HKEY* key, BOOL creat WCHAR keypath[0x200]; TRACE("%s\n",debugstr_w(szUpgradeCode)); - squash_guid(szUpgradeCode,squished_pc); + if (!squash_guid(szUpgradeCode,squished_pc)) + return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); sprintfW(keypath,szInstaller_UserUpgradeCodes_fmt,squished_pc);

1 0

Paul Vriens : include/pdhmsg.h: Add some defines.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: a5be9a8822dffc7be7368a61395c0b31929410f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5be9a8822dffc7be7368a613… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Jul 30 16:36:43 2007 +0200 include/pdhmsg.h: Add some defines. --- include/pdhmsg.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/pdhmsg.h b/include/pdhmsg.h index 81af032..00563a0 100644 --- a/include/pdhmsg.h +++ b/include/pdhmsg.h @@ -25,10 +25,12 @@ #define PDH_CSTATUS_NO_MACHINE 0x800007d0 #define PDH_MORE_DATA 0x800007d2 #define PDH_NO_DATA 0x800007d5 +#define PDH_CSTATUS_NO_OBJECT 0xc0000bb8 #define PDH_CSTATUS_NO_COUNTER 0xc0000bb9 #define PDH_MEMORY_ALLOCATION_FAILURE 0xc0000bbb #define PDH_INVALID_HANDLE 0xc0000bbc #define PDH_INVALID_ARGUMENT 0xc0000bbd +#define PDH_INSUFFICIENT_BUFFER 0xc0000bc2 #define PDH_INVALID_DATA 0xc0000bc6 #define PDH_STRING_NOT_FOUND 0xc0000bd4

1 0

Detlef Riekenberg : winspool: Add a TRACE when wine_dlopen for SONAME_LIBCUPS failed.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: f976fc8eadf140719559f8fb248789c98b430e7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f976fc8eadf140719559f8fb2… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jul 30 19:41:03 2007 +0200 winspool: Add a TRACE when wine_dlopen for SONAME_LIBCUPS failed. --- dlls/winspool.drv/info.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 2d892a3..7ac322d 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -428,11 +428,14 @@ static BOOL CUPS_LoadPrinters(void) PRINTER_INFO_2A pinfo2a; char *port,*devline; HKEY hkeyPrinter, hkeyPrinters, hkey; + char loaderror[256]; - cupshandle = wine_dlopen(SONAME_LIBCUPS, RTLD_NOW, NULL, 0); - if (!cupshandle) - return FALSE; - TRACE("loaded %s\n", SONAME_LIBCUPS); + cupshandle = wine_dlopen(SONAME_LIBCUPS, RTLD_NOW, loaderror, sizeof(loaderror)); + if (!cupshandle) { + TRACE("%s\n", loaderror); + return FALSE; + } + TRACE("%p: %s loaded\n", cupshandle, SONAME_LIBCUPS); #define DYNCUPS(x) \ p##x = wine_dlsym(cupshandle, #x, NULL,0); \

1 0

Stefan Dösinger : ddraw: Table fog may be unsupported.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 17f1c294570150de3b45802224778914371a92de URL: http://source.winehq.org/git/wine.git/?a=commit;h=17f1c294570150de3b4580222… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 24 16:20:45 2007 +0200 ddraw: Table fog may be unsupported. --- dlls/ddraw/tests/visual.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index dcdcec5..930f3d5 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -364,6 +364,7 @@ static void fog_test(IDirect3DDevice7 *device) HRESULT hr; DWORD color; float start = 0.0, end = 1.0; + D3DDEVICEDESC7 caps; /* Gets full z based fog with linear fog, no fog with specular color */ struct sVertex unstransformed_1[] = { @@ -396,6 +397,9 @@ static void fog_test(IDirect3DDevice7 *device) }; WORD Indices[] = {0, 1, 2, 2, 3, 0}; + memset(&caps, 0, sizeof(caps)); + hr = IDirect3DDevice7_GetCaps(device, &caps); + ok(hr == D3D_OK, "IDirect3DDevice7_GetCaps returned %08x\n", hr); hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice7_Clear returned %08x\n", hr); @@ -466,8 +470,20 @@ static void fog_test(IDirect3DDevice7 *device) ok(color == 0x0000FF00, "Untransformed vertex with linear vertex fog has color %08x\n", color); color = getPixelColor(device, 480, 120); ok(color == 0x00FFFF00, "Transformed vertex with linear vertex fog has color %08x\n", color); - color = getPixelColor(device, 480, 360); - ok(color == 0x0000FF00, "Transformed vertex with linear table fog has color %08x\n", color); + if(caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_FOGTABLE) + { + color = getPixelColor(device, 480, 360); + ok(color == 0x0000FF00, "Transformed vertex with linear table fog has color %08x\n", color); + } + else + { + /* Without fog table support the vertex fog is still applied, even though table fog is turned on. + * The settings above result in no fogging with vertex fog + */ + color = getPixelColor(device, 480, 120); + ok(color == 0x00FFFF00, "Transformed vertex with linear vertex fog has color %08x\n", color); + trace("Info: Table fog not supported by this device\n"); + } /* Turn off the fog master switch to avoid confusing other tests */ hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGENABLE, FALSE);

1 0

Stefan Dösinger : d3d8: Only test pixel shaders if they are supported.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: e70adcd8b65e506a970fbf41e2089560843edf0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e70adcd8b65e506a970fbf41e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 24 15:43:23 2007 +0200 d3d8: Only test pixel shaders if they are supported. --- dlls/d3d8/tests/device.c | 113 +++++++++++++++++++++++++--------------------- 1 files changed, 61 insertions(+), 52 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 3f04db3..c32eedd 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -854,6 +854,7 @@ static void test_shader(void) DWORD hPixelShader = 0, hVertexShader = 0; DWORD hPixelShader2 = 0, hVertexShader2 = 0; DWORD hTempHandle; + D3DCAPS8 caps; DWORD data_size; void *data; @@ -886,6 +887,7 @@ static void test_shader(void) D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); ok(hr == D3D_OK, "IDirect3D8_CreateDevice failed with %s\n", DXGetErrorString8(hr)); if(!pDevice) goto cleanup; + IDirect3DDevice8_GetDeviceCaps(pDevice, &caps); /* First create a vertex shader */ hr = IDirect3DDevice8_CreateVertexShader(pDevice, dwVertexDecl, simple_vs, &hVertexShader, 0); @@ -940,42 +942,65 @@ static void test_shader(void) ok(hr == D3D_OK, "IDirect3DDevice8_GetVertexShader returned %s\n", DXGetErrorString8(hr)); ok(hTempHandle == 0, "Vertex Shader %d is set, expected shader %d\n", hTempHandle, 0); - /* The same with a pixel shader */ - hr = IDirect3DDevice8_CreatePixelShader(pDevice, simple_ps, &hPixelShader); - ok(hr == D3D_OK, "IDirect3DDevice8_CreatePixelShader returned %s\n", DXGetErrorString8(hr)); - /* Msdn says that the new pixel shader is set immediately. This is wrong, apparently */ - hr = IDirect3DDevice8_GetPixelShader(pDevice, &hTempHandle); - ok(hr == D3D_OK, "IDirect3DDevice8_GetPixelShader returned %s\n", DXGetErrorString8(hr)); - ok(hTempHandle == 0, "Pixel Shader %d is set, expected shader %d\n", hTempHandle, 0); - /* Assign the shader, then verify that GetPixelShader works */ - hr = IDirect3DDevice8_SetPixelShader(pDevice, hPixelShader); - ok(hr == D3D_OK, "IDirect3DDevice8_SetPixelShader returned %s\n", DXGetErrorString8(hr)); - hr = IDirect3DDevice8_GetPixelShader(pDevice, &hTempHandle); - ok(hr == D3D_OK, "IDirect3DDevice8_GetPixelShader returned %s\n", DXGetErrorString8(hr)); - ok(hTempHandle == hPixelShader, "Pixel Shader %d is set, expected shader %d\n", hTempHandle, hPixelShader); - /* Verify that we can retrieve the shader function */ - hr = IDirect3DDevice8_GetPixelShaderFunction(pDevice, hPixelShader, NULL, &data_size); - ok(hr == D3D_OK, "IDirect3DDevice8_GetPixelShaderFucntion returned %s\n", DXGetErrorString8(hr)); - ok(data_size == simple_ps_size, "Got data_size %u, expected %u\n", data_size, simple_ps_size); - data = HeapAlloc(GetProcessHeap(), 0, simple_ps_size); - data_size = 1; - hr = IDirect3DDevice8_GetPixelShaderFunction(pDevice, hPixelShader, data, &data_size); - ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_GetPixelShaderFunction returned %s (0x%#x), " - "expected D3DERR_INVALIDCALL\n", DXGetErrorString8(hr), hr); - ok(data_size == 1, "Got data_size %u, expected 1\n", data_size); - data_size = simple_ps_size; - hr = IDirect3DDevice8_GetPixelShaderFunction(pDevice, hPixelShader, data, &data_size); - ok(hr == D3D_OK, "IDirect3DDevice8_GetPixelShaderFunction returned %s\n", DXGetErrorString8(hr)); - ok(data_size == simple_ps_size, "Got data_size %u, expected %u\n", data_size, simple_ps_size); - ok(!memcmp(data, simple_ps, simple_ps_size), "data not equal to shader function\n"); - HeapFree(GetProcessHeap(), 0, data); - /* Delete the assigned shader. This is supposed to work */ - hr = IDirect3DDevice8_DeletePixelShader(pDevice, hPixelShader); - ok(hr == D3D_OK, "IDirect3DDevice8_DeletePixelShader returned %s\n", DXGetErrorString8(hr)); - /* The shader should be unset now */ - hr = IDirect3DDevice8_GetPixelShader(pDevice, &hTempHandle); - ok(hr == D3D_OK, "IDirect3DDevice8_GetPixelShader returned %s\n", DXGetErrorString8(hr)); - ok(hTempHandle == 0, "Pixel Shader %d is set, expected shader %d\n", hTempHandle, 0); + if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 0)) + { + /* The same with a pixel shader */ + hr = IDirect3DDevice8_CreatePixelShader(pDevice, simple_ps, &hPixelShader); + ok(hr == D3D_OK, "IDirect3DDevice8_CreatePixelShader returned %s\n", DXGetErrorString8(hr)); + /* Msdn says that the new pixel shader is set immediately. This is wrong, apparently */ + hr = IDirect3DDevice8_GetPixelShader(pDevice, &hTempHandle); + ok(hr == D3D_OK, "IDirect3DDevice8_GetPixelShader returned %s\n", DXGetErrorString8(hr)); + ok(hTempHandle == 0, "Pixel Shader %d is set, expected shader %d\n", hTempHandle, 0); + /* Assign the shader, then verify that GetPixelShader works */ + hr = IDirect3DDevice8_SetPixelShader(pDevice, hPixelShader); + ok(hr == D3D_OK, "IDirect3DDevice8_SetPixelShader returned %s\n", DXGetErrorString8(hr)); + hr = IDirect3DDevice8_GetPixelShader(pDevice, &hTempHandle); + ok(hr == D3D_OK, "IDirect3DDevice8_GetPixelShader returned %s\n", DXGetErrorString8(hr)); + ok(hTempHandle == hPixelShader, "Pixel Shader %d is set, expected shader %d\n", hTempHandle, hPixelShader); + /* Verify that we can retrieve the shader function */ + hr = IDirect3DDevice8_GetPixelShaderFunction(pDevice, hPixelShader, NULL, &data_size); + ok(hr == D3D_OK, "IDirect3DDevice8_GetPixelShaderFucntion returned %s\n", DXGetErrorString8(hr)); + ok(data_size == simple_ps_size, "Got data_size %u, expected %u\n", data_size, simple_ps_size); + data = HeapAlloc(GetProcessHeap(), 0, simple_ps_size); + data_size = 1; + hr = IDirect3DDevice8_GetPixelShaderFunction(pDevice, hPixelShader, data, &data_size); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_GetPixelShaderFunction returned %s (0x%#x), " + "expected D3DERR_INVALIDCALL\n", DXGetErrorString8(hr), hr); + ok(data_size == 1, "Got data_size %u, expected 1\n", data_size); + data_size = simple_ps_size; + hr = IDirect3DDevice8_GetPixelShaderFunction(pDevice, hPixelShader, data, &data_size); + ok(hr == D3D_OK, "IDirect3DDevice8_GetPixelShaderFunction returned %s\n", DXGetErrorString8(hr)); + ok(data_size == simple_ps_size, "Got data_size %u, expected %u\n", data_size, simple_ps_size); + ok(!memcmp(data, simple_ps, simple_ps_size), "data not equal to shader function\n"); + HeapFree(GetProcessHeap(), 0, data); + /* Delete the assigned shader. This is supposed to work */ + hr = IDirect3DDevice8_DeletePixelShader(pDevice, hPixelShader); + ok(hr == D3D_OK, "IDirect3DDevice8_DeletePixelShader returned %s\n", DXGetErrorString8(hr)); + /* The shader should be unset now */ + hr = IDirect3DDevice8_GetPixelShader(pDevice, &hTempHandle); + ok(hr == D3D_OK, "IDirect3DDevice8_GetPixelShader returned %s\n", DXGetErrorString8(hr)); + ok(hTempHandle == 0, "Pixel Shader %d is set, expected shader %d\n", hTempHandle, 0); + + /* What happens if a non-bound shader is deleted? */ + hr = IDirect3DDevice8_CreatePixelShader(pDevice, simple_ps, &hPixelShader); + ok(hr == D3D_OK, "IDirect3DDevice8_CreatePixelShader returned %s\n", DXGetErrorString8(hr)); + hr = IDirect3DDevice8_CreatePixelShader(pDevice, simple_ps, &hPixelShader2); + ok(hr == D3D_OK, "IDirect3DDevice8_CreatePixelShader returned %s\n", DXGetErrorString8(hr)); + + hr = IDirect3DDevice8_SetPixelShader(pDevice, hPixelShader); + ok(hr == D3D_OK, "IDirect3DDevice8_SetPixelShader returned %s\n", DXGetErrorString8(hr)); + hr = IDirect3DDevice8_DeletePixelShader(pDevice, hPixelShader2); + ok(hr == D3D_OK, "IDirect3DDevice8_DeletePixelShader returned %s\n", DXGetErrorString8(hr)); + hr = IDirect3DDevice8_GetPixelShader(pDevice, &hTempHandle); + ok(hr == D3D_OK, "IDirect3DDevice8_GetPixelShader returned %s\n", DXGetErrorString8(hr)); + ok(hTempHandle == hPixelShader, "Pixel Shader %d is set, expected shader %d\n", hTempHandle, hPixelShader); + hr = IDirect3DDevice8_DeletePixelShader(pDevice, hPixelShader); + ok(hr == D3D_OK, "IDirect3DDevice8_DeletePixelShader returned %s\n", DXGetErrorString8(hr)); + } + else + { + skip("Pixel shaders not supported\n"); + } /* What happens if a non-bound shader is deleted? */ hr = IDirect3DDevice8_CreateVertexShader(pDevice, dwVertexDecl, NULL, &hVertexShader, 0); @@ -993,22 +1018,6 @@ static void test_shader(void) hr = IDirect3DDevice8_DeleteVertexShader(pDevice, hVertexShader); ok(hr == D3D_OK, "IDirect3DDevice8_DeleteVertexShader returned %s\n", DXGetErrorString8(hr)); - /* Now for pixel shaders */ - hr = IDirect3DDevice8_CreatePixelShader(pDevice, simple_ps, &hPixelShader); - ok(hr == D3D_OK, "IDirect3DDevice8_CreatePixelShader returned %s\n", DXGetErrorString8(hr)); - hr = IDirect3DDevice8_CreatePixelShader(pDevice, simple_ps, &hPixelShader2); - ok(hr == D3D_OK, "IDirect3DDevice8_CreatePixelShader returned %s\n", DXGetErrorString8(hr)); - - hr = IDirect3DDevice8_SetPixelShader(pDevice, hPixelShader); - ok(hr == D3D_OK, "IDirect3DDevice8_SetPixelShader returned %s\n", DXGetErrorString8(hr)); - hr = IDirect3DDevice8_DeletePixelShader(pDevice, hPixelShader2); - ok(hr == D3D_OK, "IDirect3DDevice8_DeletePixelShader returned %s\n", DXGetErrorString8(hr)); - hr = IDirect3DDevice8_GetPixelShader(pDevice, &hTempHandle); - ok(hr == D3D_OK, "IDirect3DDevice8_GetPixelShader returned %s\n", DXGetErrorString8(hr)); - ok(hTempHandle == hPixelShader, "Pixel Shader %d is set, expected shader %d\n", hTempHandle, hPixelShader); - hr = IDirect3DDevice8_DeletePixelShader(pDevice, hPixelShader); - ok(hr == D3D_OK, "IDirect3DDevice8_DeletePixelShader returned %s\n", DXGetErrorString8(hr)); - cleanup: if(pD3d) IDirect3D8_Release(pD3d); if(pDevice) IDirect3D8_Release(pDevice);

1 0

Stefan Dösinger : d3d8: Use a less demanding format for the depth stencil test.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 19c574b7e51ce80572c471ea413b15f0eff343c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19c574b7e51ce80572c471ea4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 24 15:38:17 2007 +0200 d3d8: Use a less demanding format for the depth stencil test. --- dlls/d3d8/tests/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b0d4137..3f04db3 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -513,7 +513,7 @@ static void test_refcount(void) } } /* Surfaces */ - hr = IDirect3DDevice8_CreateDepthStencilSurface( pDevice, 32, 32, D3DFMT_D24S8, D3DMULTISAMPLE_NONE, &pStencilSurface ); + hr = IDirect3DDevice8_CreateDepthStencilSurface( pDevice, 32, 32, D3DFMT_D16, D3DMULTISAMPLE_NONE, &pStencilSurface ); CHECK_CALL( hr, "CreateDepthStencilSurface", pDevice, ++refcount ); CHECK_REFCOUNT( pStencilSurface, 1); hr = IDirect3DDevice8_CreateImageSurface( pDevice, 32, 32, D3DFMT_X8R8G8B8, &pImageSurface );

1 0

Stefan Dösinger : d3d8: Only test volume textures if they are supported.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 9a06fd000b8b597298ccb3ae76d7f480df81aad5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a06fd000b8b597298ccb3ae7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 24 15:36:15 2007 +0200 d3d8: Only test volume textures if they are supported. --- dlls/d3d8/tests/device.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index e5c8997..b0d4137 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -481,8 +481,16 @@ static void test_refcount(void) { skip("Cube textures not supported\n"); } - hr = IDirect3DDevice8_CreateVolumeTexture( pDevice, 32, 32, 2, 0, 0, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &pVolumeTexture ); - CHECK_CALL( hr, "CreateVolumeTexture", pDevice, ++refcount ); + if(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP) + { + hr = IDirect3DDevice8_CreateVolumeTexture( pDevice, 32, 32, 2, 0, 0, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &pVolumeTexture ); + CHECK_CALL( hr, "CreateVolumeTexture", pDevice, ++refcount ); + } + else + { + skip("Volume textures not supported\n"); + } + if (pVolumeTexture) { tmp = get_refcount( (IUnknown *)pVolumeTexture );

1 0

Stefan Dösinger : d3d8: Only test cube textures if they are supported.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 6ff16b9f2e9f8a649941e1b0aceb28bf4f257862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ff16b9f2e9f8a649941e1b0a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 24 15:35:08 2007 +0200 d3d8: Only test cube textures if they are supported. --- dlls/d3d8/tests/device.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index bc9c804..e5c8997 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -472,8 +472,15 @@ static void test_refcount(void) CHECK_REFCOUNT ( pTextureLevel, tmp ); } } - hr = IDirect3DDevice8_CreateCubeTexture( pDevice, 32, 0, 0, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &pCubeTexture ); - CHECK_CALL( hr, "CreateCubeTexture", pDevice, ++refcount ); + if(caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP) + { + hr = IDirect3DDevice8_CreateCubeTexture( pDevice, 32, 0, 0, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &pCubeTexture ); + CHECK_CALL( hr, "CreateCubeTexture", pDevice, ++refcount ); + } + else + { + skip("Cube textures not supported\n"); + } hr = IDirect3DDevice8_CreateVolumeTexture( pDevice, 32, 32, 2, 0, 0, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &pVolumeTexture ); CHECK_CALL( hr, "CreateVolumeTexture", pDevice, ++refcount ); if (pVolumeTexture)

1 0

Paul Vriens : advapi32/service: Cater for domain in the test.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: def4466fd17f0506539671ec61226daaed408375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=def4466fd17f0506539671ec6… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Jul 30 15:20:49 2007 +0200 advapi32/service: Cater for domain in the test. --- dlls/advapi32/tests/service.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index a4eae98..ae4698b 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" @@ -139,8 +140,8 @@ static void test_open_svc(void) static void test_create_delete_svc(void) { SC_HANDLE scm_handle, svc_handle1; - CHAR username[UNLEN + 1]; - DWORD user_size = UNLEN + 1; + CHAR username[UNLEN + 1], *domain; + DWORD user_size = UNLEN + 1, domain_size = 0; CHAR account[UNLEN + 3]; static const CHAR servicename [] = "Winetest"; static const CHAR pathname [] = "we_dont_care.exe"; @@ -153,8 +154,15 @@ static void test_create_delete_svc(void) /* Get the username and turn it into an account to be used in some tests */ GetUserNameA(username, &user_size); - lstrcpy(account, ".\\"); - lstrcat(account, username); + /* Get the domainname to cater for that situation */ + GetComputerNameEx(ComputerNameDnsDomain, NULL, &domain_size); + domain = HeapAlloc(GetProcessHeap(), 0, domain_size); + GetComputerNameEx(ComputerNameDnsDomain, domain, &domain_size); + if (domain_size > 1) + sprintf(account, "%s\\%s", domain, username); + else + sprintf(account, ".\\%s", username); + HeapFree(GetProcessHeap(), 0, domain); /* All NULL */ SetLastError(0xdeadbeef);

1 0

Paul Vriens : advapi32/tests: Use skip when we don't have enough rights.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 02e160179f9b9f1b1de668ff66737011c2ce705f URL: http://source.winehq.org/git/wine.git/?a=commit;h=02e160179f9b9f1b1de668ff6… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Jul 30 12:55:56 2007 +0200 advapi32/tests: Use skip when we don't have enough rights. --- dlls/advapi32/tests/crypt.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index fd827d3..a8db384 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -748,7 +748,13 @@ static void test_set_provider_ex(void) ERROR_INVALID_PARAMETER, GetLastError()); /* remove the default provider and then set it to MS_DEF_PROV/PROV_RSA_FULL */ + SetLastError(0xdeadbeef); result = pCryptSetProviderExA(MS_DEF_PROV, PROV_RSA_FULL, NULL, CRYPT_MACHINE_DEFAULT | CRYPT_DELETE_DEFAULT); + if (!result && (GetLastError() == ERROR_ACCESS_DENIED)) + { + skip("Not enough rights to remove the default provider\n"); + return; + } ok(result, "%d\n", GetLastError()); result = pCryptSetProviderExA(MS_DEF_PROV, PROV_RSA_FULL, NULL, CRYPT_MACHINE_DEFAULT);

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
96
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 July 2007