November 2006 - Wine-commits

Detlef Riekenberg : winspool: Implement ConfigurePortW.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: a44e0ac6e39d6cc5c8c294d5e47245b26d0418c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a44e0ac6e39d6cc5c8c294d5e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Nov 9 00:04:08 2006 +0100 winspool: Implement ConfigurePortW. --- dlls/winspool.drv/info.c | 112 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 106 insertions(+), 6 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index cb2a818..47f7b81 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -171,7 +171,7 @@ static const WCHAR PrintersW[] = {'S','y 'P','r','i','n','t','\\', 'P','r','i','n','t','e','r','s',0}; -static const WCHAR LocalPortW[] = {'L','o','c','a','l',' ','P','o','r','t',0}; +static WCHAR LocalPortW[] = {'L','o','c','a','l',' ','P','o','r','t',0}; static const WCHAR user_default_reg_key[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -185,6 +185,12 @@ static const WCHAR user_printers_reg_key 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'D','e','v','i','c','e','s',0}; +static const WCHAR WinNT_CV_PortsW[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'P','o','r','t','s',0}; + static const WCHAR DefaultEnvironmentW[] = {'W','i','n','e',0}; static const WCHAR envname_win40W[] = {'W','i','n','d','o','w','s',' ','4','.','0',0}; static const WCHAR envname_x86W[] = {'W','i','n','d','o','w','s',' ','N','T',' ','x','8','6',0}; @@ -212,6 +218,7 @@ static const WCHAR MonitorW[] = {'M','o' static const WCHAR NameW[] = {'N','a','m','e',0}; static const WCHAR ParametersW[] = {'P','a','r','a','m','e','t','e','r','s',0}; static const WCHAR PortW[] = {'P','o','r','t',0}; +static const WCHAR bs_Ports_bsW[] = {'\\','P','o','r','t','s','\\',0}; static const WCHAR Print_ProcessorW[] = {'P','r','i','n','t',' ','P','r','o','c','e', 's','s','o','r',0}; static const WCHAR Printer_DriverW[] = {'P','r','i','n','t','e','r',' ','D','r','i', @@ -876,6 +883,7 @@ static DWORD get_local_monitors(DWORD le */ static void monitor_unload(monitor_t * pm) { + if (pm == NULL) return; TRACE("%p (refcount: %d) %s\n", pm, pm->refcount, debugstr_w(pm->name)); EnterCriticalSection(&monitor_handles_cs); @@ -1100,6 +1108,65 @@ static DWORD monitor_loadall(void) } /****************************************************************** + * monitor_load_by_port [internal] + * + * load a printmonitor for a given port + * + * On failure, NULL is returned + */ + +static monitor_t * monitor_load_by_port(LPWSTR portname) +{ + HKEY hroot; + HKEY hport; + LPWSTR buffer; + monitor_t * pm = NULL; + DWORD registered = 0; + DWORD id = 0; + DWORD len; + + TRACE("(%s)\n", debugstr_w(portname)); + + /* Try the Local Monitor first */ + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, WinNT_CV_PortsW, &hroot) == ERROR_SUCCESS) { + if (RegQueryValueExW(hroot, portname, NULL, NULL, NULL, &len) == ERROR_SUCCESS) { + /* found the portname */ + RegCloseKey(hroot); + return monitor_load(LocalPortW, NULL); + } + RegCloseKey(hroot); + } + + len = MAX_PATH + lstrlenW(bs_Ports_bsW) + lstrlenW(portname) + 1; + buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (buffer == NULL) return NULL; + + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, MonitorsW, &hroot) == ERROR_SUCCESS) { + EnterCriticalSection(&monitor_handles_cs); + RegQueryInfoKeyW(hroot, NULL, NULL, NULL, &registered, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + + while ((pm == NULL) && (id < registered)) { + buffer[0] = '\0'; + RegEnumKeyW(hroot, id, buffer, MAX_PATH); + TRACE("testing %s\n", debugstr_w(buffer)); + len = lstrlenW(buffer); + lstrcatW(buffer, bs_Ports_bsW); + lstrcatW(buffer, portname); + if (RegOpenKeyW(hroot, buffer, &hport) == ERROR_SUCCESS) { + RegCloseKey(hport); + buffer[len] = '\0'; /* use only the Monitor-Name */ + pm = monitor_load(buffer, NULL); + } + id++; + } + LeaveCriticalSection(&monitor_handles_cs); + RegCloseKey(hroot); + } + HeapFree(GetProcessHeap(), 0, buffer); + return pm; +} + +/****************************************************************** * enumerate the local Ports from all loaded monitors (internal) * * returns the needed size (in bytes) for pPorts @@ -5739,14 +5806,47 @@ BOOL WINAPI ConfigurePortA(LPSTR pName, * Success: TRUE * Failure: FALSE * - * BUGS - * only a Stub - * */ BOOL WINAPI ConfigurePortW(LPWSTR pName, HWND hWnd, LPWSTR pPortName) { - FIXME("%s %p %s\n", debugstr_w(pName), hWnd, debugstr_w(pPortName)); - return FALSE; + monitor_t * pm; + DWORD res = ROUTER_UNKNOWN; + + TRACE("(%s, %p, %s)\n", debugstr_w(pName), hWnd, debugstr_w(pPortName)); + + if (pName && pName[0]) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!pPortName) { + SetLastError(RPC_X_NULL_REF_POINTER); + return FALSE; + } + + /* an empty Portname is Invalid, but can popup a Dialog */ + if (!pPortName[0]) goto cleanup; + + + pm = monitor_load_by_port(pPortName); + if (pm && pm->monitor) { + if (pm->monitor->pfnConfigurePort != NULL) { + TRACE("Using %s for %s:\n", debugstr_w(pm->name), debugstr_w(pPortName)); + res = pm->monitor->pfnConfigurePort(pName, hWnd, pPortName); + TRACE("got %d with %d\n", res, GetLastError()); + } + else + { + FIXME("XcvOpenPort not implemented (dwMonitorSize: %d)\n", pm->dwMonitorSize); + } + } + monitor_unload(pm); + +cleanup: + /* XP: ERROR_NOT_SUPPORTED, NT351,9x: ERROR_INVALID_PARAMETER */ + if (res == ROUTER_UNKNOWN) SetLastError(ERROR_NOT_SUPPORTED); + TRACE("returning %d with %d\n", (res == ROUTER_SUCCESS), GetLastError()); + return (res == ROUTER_SUCCESS); } /******************************************************************************

1 0

Markus Amsler : d3d8: Backport volume tests.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: 7cbf2a38cbeed21da2ccaf6010b76ee70c15b1c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cbf2a38cbeed21da2ccaf601… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Thu Nov 9 02:38:47 2006 +0100 d3d8: Backport volume tests. --- dlls/d3d8/tests/Makefile.in | 3 +- dlls/d3d8/tests/volume.c | 135 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 137 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/Makefile.in b/dlls/d3d8/tests/Makefile.in index 725ba7c..00ac6ad 100644 --- a/dlls/d3d8/tests/Makefile.in +++ b/dlls/d3d8/tests/Makefile.in @@ -10,7 +10,8 @@ CTESTS = \ d3d8_main.c \ device.c \ surface.c \ - texture.c + texture.c \ + volume.c @MAKE_TEST_RULES@ diff --git a/dlls/d3d8/tests/volume.c b/dlls/d3d8/tests/volume.c new file mode 100644 index 0000000..d05ec86 --- /dev/null +++ b/dlls/d3d8/tests/volume.c @@ -0,0 +1,135 @@ +/* + * Copyright (C) 2006 Henri Verbeet + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#define COBJMACROS +#include <d3d8.h> +#include "wine/test.h" + +static HWND create_window(void) +{ + WNDCLASS wc = {0}; + wc.lpfnWndProc = &DefWindowProc; + wc.lpszClassName = "d3d8_test_wc"; + RegisterClass(&wc); + + return CreateWindow("d3d8_test_wc", "d3d8_test", + 0, 0, 0, 0, 0, 0, 0, 0, 0); +} + +static IDirect3DDevice8 *init_d3d8(HMODULE d3d8_handle) +{ + IDirect3D8 * (__stdcall * d3d8_create)(UINT SDKVersion) = 0; + IDirect3D8 *d3d8_ptr = 0; + IDirect3DDevice8 *device_ptr = 0; + D3DPRESENT_PARAMETERS present_parameters; + D3DDISPLAYMODE d3ddm; + HRESULT hr; + + d3d8_create = (void *)GetProcAddress(d3d8_handle, "Direct3DCreate8"); + ok(d3d8_create != NULL, "Failed to get address of Direct3DCreate8\n"); + if (!d3d8_create) return NULL; + + d3d8_ptr = d3d8_create(D3D_SDK_VERSION); + ok(d3d8_ptr != NULL, "Failed to create IDirect3D8 object\n"); + if (!d3d8_ptr) return NULL; + + IDirect3D8_GetAdapterDisplayMode(d3d8_ptr, D3DADAPTER_DEFAULT, &d3ddm ); + ZeroMemory(&present_parameters, sizeof(present_parameters)); + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = create_window(); + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.BackBufferFormat = d3ddm.Format; + + hr = IDirect3D8_CreateDevice(d3d8_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + NULL, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); + ok(SUCCEEDED(hr), "IDirect3D_CreateDevice returned %#x\n", hr); + + return device_ptr; +} + +static void test_volume_get_container(IDirect3DDevice8 *device_ptr) +{ + IDirect3DVolumeTexture8 *texture_ptr = 0; + IDirect3DVolume8 *volume_ptr = 0; + void *container_ptr; + HRESULT hr; + + hr = IDirect3DDevice8_CreateVolumeTexture(device_ptr, 128, 128, 128, 1, 0, + D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &texture_ptr); + ok(SUCCEEDED(hr) && texture_ptr != NULL, "CreateVolumeTexture returned: hr %#x, texture_ptr %p. " + "Expected hr %#x, texture_ptr != %p\n", hr, texture_ptr, D3D_OK, NULL); + if (!texture_ptr || FAILED(hr)) goto cleanup; + + hr = IDirect3DVolumeTexture8_GetVolumeLevel(texture_ptr, 0, &volume_ptr); + ok(SUCCEEDED(hr) && volume_ptr != NULL, "GetVolumeLevel returned: hr %#x, volume_ptr %p. " + "Expected hr %#x, volume_ptr != %p\n", hr, volume_ptr, D3D_OK, NULL); + if (!volume_ptr || FAILED(hr)) goto cleanup; + + /* These should work... */ + container_ptr = (void *)0x1337c0d3; + hr = IDirect3DVolume8_GetContainer(volume_ptr, &IID_IUnknown, &container_ptr); + ok(SUCCEEDED(hr) && container_ptr == texture_ptr, "GetContainer returned: hr %#x, container_ptr %p. " + "Expected hr %#x, container_ptr %p\n", hr, container_ptr, S_OK, texture_ptr); + if (container_ptr && container_ptr != (void *)0x1337c0d3) IUnknown_Release((IUnknown *)container_ptr); + + container_ptr = (void *)0x1337c0d3; + hr = IDirect3DVolume8_GetContainer(volume_ptr, &IID_IDirect3DResource8, &container_ptr); + ok(SUCCEEDED(hr) && container_ptr == texture_ptr, "GetContainer returned: hr %#x, container_ptr %p. " + "Expected hr %#x, container_ptr %p\n", hr, container_ptr, S_OK, texture_ptr); + if (container_ptr && container_ptr != (void *)0x1337c0d3) IUnknown_Release((IUnknown *)container_ptr); + + container_ptr = (void *)0x1337c0d3; + hr = IDirect3DVolume8_GetContainer(volume_ptr, &IID_IDirect3DBaseTexture8, &container_ptr); + ok(SUCCEEDED(hr) && container_ptr == texture_ptr, "GetContainer returned: hr %#x, container_ptr %p. " + "Expected hr %#x, container_ptr %p\n", hr, container_ptr, S_OK, texture_ptr); + if (container_ptr && container_ptr != (void *)0x1337c0d3) IUnknown_Release((IUnknown *)container_ptr); + + container_ptr = (void *)0x1337c0d3; + hr = IDirect3DVolume8_GetContainer(volume_ptr, &IID_IDirect3DVolumeTexture8, &container_ptr); + ok(SUCCEEDED(hr) && container_ptr == texture_ptr, "GetContainer returned: hr %#x, container_ptr %p. " + "Expected hr %#x, container_ptr %p\n", hr, container_ptr, S_OK, texture_ptr); + if (container_ptr && container_ptr != (void *)0x1337c0d3) IUnknown_Release((IUnknown *)container_ptr); + + /* ...and this one shouldn't. This should return E_NOINTERFACE and set container_ptr to NULL */ + container_ptr = (void *)0x1337c0d3; + hr = IDirect3DVolume8_GetContainer(volume_ptr, &IID_IDirect3DVolume8, &container_ptr); + ok(hr == E_NOINTERFACE && container_ptr == NULL, "GetContainer returned: hr %#x, container_ptr %p. " + "Expected hr %#x, container_ptr %p\n", hr, container_ptr, E_NOINTERFACE, NULL); + if (container_ptr && container_ptr != (void *)0x1337c0d3) IUnknown_Release((IUnknown *)container_ptr); + +cleanup: + if (texture_ptr) IDirect3DVolumeTexture8_Release(texture_ptr); + if (volume_ptr) IDirect3DVolume8_Release(volume_ptr); +} + +START_TEST(volume) +{ + HMODULE d3d8_handle; + IDirect3DDevice8 *device_ptr; + + d3d8_handle = LoadLibraryA("d3d8.dll"); + if (!d3d8_handle) + { + trace("Could not load d3d8.dll, skipping tests\n"); + return; + } + + device_ptr = init_d3d8(d3d8_handle); + if (!device_ptr) return; + + test_volume_get_container(device_ptr); +}

1 0

Markus Amsler : d3d8: Backport IDirect3DVolume9Impl_GetContainer.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: ede4b064435fc3bf07004a633c5f9bfdf158393e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ede4b064435fc3bf07004a633… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Thu Nov 9 02:38:41 2006 +0100 d3d8: Backport IDirect3DVolume9Impl_GetContainer. --- dlls/d3d8/volume.c | 34 +++++++++++++++++++++++++++------- 1 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 4e3350b..9619b35 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -115,18 +115,38 @@ static HRESULT WINAPI IDirect3DVolume8Im static HRESULT WINAPI IDirect3DVolume8Impl_GetContainer(LPDIRECT3DVOLUME8 iface, REFIID riid, void **ppContainer) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; + IWineD3DBase *wineD3DContainer = NULL; + IUnknown *wineD3DContainerParent = NULL; HRESULT res; - IUnknown *IWineContainer = NULL; - TRACE("(%p) Relay\n", This); - res = IWineD3DVolume_GetContainer(This->wineD3DVolume, riid, (void **)&IWineContainer); + TRACE("(This %p, riid %s, ppContainer %p)\n", This, debugstr_guid(riid), ppContainer); - /* If this works, the only valid container is a child of resource (volumetexture) */ - if (res == D3D_OK && NULL != ppContainer) { - IWineD3DResource_GetParent((IWineD3DResource *)IWineContainer, (IUnknown **)ppContainer); - IWineD3DResource_Release((IWineD3DResource *)IWineContainer); + if (!ppContainer) { + ERR("Called without a valid ppContainer.\n"); } + /* Get the WineD3D container. */ + res = IWineD3DVolume_GetContainer(This->wineD3DVolume, &IID_IWineD3DBase, (void **)&wineD3DContainer); + if (res != D3D_OK) return res; + + if (!wineD3DContainer) { + ERR("IWineD3DSurface_GetContainer should never return NULL\n"); + } + + /* Get the parent */ + IWineD3DBase_GetParent(wineD3DContainer, &wineD3DContainerParent); + IUnknown_Release(wineD3DContainer); + + if (!wineD3DContainerParent) { + ERR("IWineD3DBase_GetParent should never return NULL\n"); + } + + /* Now, query the interface of the parent for the riid */ + res = IUnknown_QueryInterface(wineD3DContainerParent, riid, ppContainer); + IUnknown_Release(wineD3DContainerParent); + + TRACE("Returning ppContainer %p, *ppContainer %p\n", ppContainer, *ppContainer); + return res; }

1 0

Markus Amsler : d3d8: Backport texture tests.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: 019bf2eabde426ba8d0687ec2f88d675d1cc1496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=019bf2eabde426ba8d0687ec2… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Thu Nov 9 02:38:36 2006 +0100 d3d8: Backport texture tests. --- dlls/d3d8/tests/Makefile.in | 3 +- dlls/d3d8/tests/texture.c | 118 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/Makefile.in b/dlls/d3d8/tests/Makefile.in index 7dfbf1a..725ba7c 100644 --- a/dlls/d3d8/tests/Makefile.in +++ b/dlls/d3d8/tests/Makefile.in @@ -9,7 +9,8 @@ EXTRALIBS = -ldxerr8 -luuid -ldxguid CTESTS = \ d3d8_main.c \ device.c \ - surface.c + surface.c \ + texture.c @MAKE_TEST_RULES@ diff --git a/dlls/d3d8/tests/texture.c b/dlls/d3d8/tests/texture.c new file mode 100644 index 0000000..5da7619 --- /dev/null +++ b/dlls/d3d8/tests/texture.c @@ -0,0 +1,118 @@ +/* + * Copyright (C) 2006 Henri Verbeet + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#define COBJMACROS +#include <d3d8.h> +#include "wine/test.h" + +static HWND create_window(void) +{ + WNDCLASS wc = {0}; + wc.lpfnWndProc = &DefWindowProc; + wc.lpszClassName = "d3d8_test_wc"; + RegisterClass(&wc); + + return CreateWindow("d3d8_test_wc", "d3d8_test", + 0, 0, 0, 0, 0, 0, 0, 0, 0); +} + +static IDirect3DDevice8 *init_d3d8(HMODULE d3d8_handle) +{ + IDirect3D8 * (__stdcall * d3d8_create)(UINT SDKVersion) = 0; + IDirect3D8 *d3d8_ptr = 0; + IDirect3DDevice8 *device_ptr = 0; + D3DPRESENT_PARAMETERS present_parameters; + D3DDISPLAYMODE d3ddm; + HRESULT hr; + + d3d8_create = (void *)GetProcAddress(d3d8_handle, "Direct3DCreate8"); + ok(d3d8_create != NULL, "Failed to get address of Direct3DCreate8\n"); + if (!d3d8_create) return NULL; + + d3d8_ptr = d3d8_create(D3D_SDK_VERSION); + ok(d3d8_ptr != NULL, "Failed to create IDirect3D8 object\n"); + if (!d3d8_ptr) return NULL; + + IDirect3D8_GetAdapterDisplayMode(d3d8_ptr, D3DADAPTER_DEFAULT, &d3ddm ); + ZeroMemory(&present_parameters, sizeof(present_parameters)); + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = create_window(); + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.BackBufferFormat = d3ddm.Format; + + hr = IDirect3D8_CreateDevice(d3d8_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + NULL, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); + ok(SUCCEEDED(hr), "IDirect3D_CreateDevice returned %#x\n", hr); + + return device_ptr; +} + +static void test_texture_stage_state(IDirect3DDevice8 *device_ptr, DWORD stage, D3DTEXTURESTAGESTATETYPE type, DWORD expected) +{ + DWORD value; + + HRESULT hr = IDirect3DDevice8_GetTextureStageState(device_ptr, stage, type, &value); + ok(SUCCEEDED(hr) && value == expected, "GetTextureStageState (stage %#x, type %#x) returned: hr %#x, value %#x. " + "Expected hr %#x, value %#x\n", stage, type, hr, value, D3D_OK, expected); +} + +/* Test the default texture stage state values */ +static void test_texture_stage_states(IDirect3DDevice8 *device_ptr, int num_stages) +{ + int i; + for (i = 0; i < num_stages; ++i) + { + test_texture_stage_state(device_ptr, i, D3DTSS_COLOROP, i ? D3DTOP_DISABLE : D3DTOP_MODULATE); + test_texture_stage_state(device_ptr, i, D3DTSS_COLORARG1, D3DTA_TEXTURE); + test_texture_stage_state(device_ptr, i, D3DTSS_COLORARG2, D3DTA_CURRENT); + test_texture_stage_state(device_ptr, i, D3DTSS_ALPHAOP, i ? D3DTOP_DISABLE : D3DTOP_SELECTARG1); + test_texture_stage_state(device_ptr, i, D3DTSS_ALPHAARG1, D3DTA_TEXTURE); + test_texture_stage_state(device_ptr, i, D3DTSS_ALPHAARG2, D3DTA_CURRENT); + test_texture_stage_state(device_ptr, i, D3DTSS_BUMPENVMAT00, 0); + test_texture_stage_state(device_ptr, i, D3DTSS_BUMPENVMAT01, 0); + test_texture_stage_state(device_ptr, i, D3DTSS_BUMPENVMAT10, 0); + test_texture_stage_state(device_ptr, i, D3DTSS_BUMPENVMAT11, 0); + test_texture_stage_state(device_ptr, i, D3DTSS_TEXCOORDINDEX, i); + test_texture_stage_state(device_ptr, i, D3DTSS_BUMPENVLSCALE, 0); + test_texture_stage_state(device_ptr, i, D3DTSS_BUMPENVLOFFSET, 0); + test_texture_stage_state(device_ptr, i, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE); + test_texture_stage_state(device_ptr, i, D3DTSS_COLORARG0, D3DTA_CURRENT); + test_texture_stage_state(device_ptr, i, D3DTSS_ALPHAARG0, D3DTA_CURRENT); + test_texture_stage_state(device_ptr, i, D3DTSS_RESULTARG, D3DTA_CURRENT); + } +} + +START_TEST(texture) +{ + D3DCAPS8 caps; + HMODULE d3d8_handle; + IDirect3DDevice8 *device_ptr; + + d3d8_handle = LoadLibraryA("d3d8.dll"); + if (!d3d8_handle) + { + trace("Could not load d3d8.dll, skipping tests\n"); + return; + } + + device_ptr = init_d3d8(d3d8_handle); + if (!device_ptr) return; + + IDirect3DDevice8_GetDeviceCaps(device_ptr, &caps); + + test_texture_stage_states(device_ptr, caps.MaxTextureBlendStages); +}

1 0

Markus Amsler : d3d8: Backport missing device tests.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: 75d6d6203bb7eb2e536bf11b1773d8b1eb819cde URL: http://source.winehq.org/git/wine.git/?a=commit;h=75d6d6203bb7eb2e536bf11b1… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Thu Nov 9 02:38:29 2006 +0100 d3d8: Backport missing device tests. --- dlls/d3d8/tests/device.c | 169 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 168 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index e735502..4fe835b 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -45,6 +45,63 @@ #define CHECK_RELEASE(obj,d,rc) \ ok(tmp1 == rc_new, "Invalid refcount. Expected %d got %d\n", rc_new, tmp1); \ } +static void check_mipmap_levels( + IDirect3DDevice8* device, + int width, int height, int count) +{ + + IDirect3DBaseTexture8* texture = NULL; + HRESULT hr = IDirect3DDevice8_CreateTexture( device, width, height, 0, 0, + D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, (IDirect3DTexture8**) &texture ); + + if (SUCCEEDED(hr)) { + DWORD levels = IDirect3DBaseTexture8_GetLevelCount(texture); + ok(levels == count, "Invalid level count. Expected %d got %u\n", count, levels); + } else + trace("CreateTexture failed: %s\n", DXGetErrorString8(hr)); + + if (texture) IUnknown_Release( texture ); +} + +static void test_mipmap_levels(void) +{ + + HRESULT hr; + HWND hwnd = NULL; + + IDirect3D8 *pD3d = NULL; + IDirect3DDevice8 *pDevice = NULL; + D3DPRESENT_PARAMETERS d3dpp; + D3DDISPLAYMODE d3ddm; + + pD3d = pDirect3DCreate8( D3D_SDK_VERSION ); + ok(pD3d != NULL, "Failed to create IDirect3D8 object\n"); + hwnd = CreateWindow( "static", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + ok(hwnd != NULL, "Failed to create window\n"); + if (!pD3d || !hwnd) goto cleanup; + + IDirect3D8_GetAdapterDisplayMode( pD3d, D3DADAPTER_DEFAULT, &d3ddm ); + ZeroMemory( &d3dpp, sizeof(d3dpp) ); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.BackBufferFormat = d3ddm.Format; + + hr = IDirect3D8_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); + ok(SUCCEEDED(hr), "Failed to create IDirect3D8Device (%s)\n", DXGetErrorString8(hr)); + if (FAILED(hr)) goto cleanup; + + check_mipmap_levels(pDevice, 32, 32, 6); + check_mipmap_levels(pDevice, 256, 1, 9); + check_mipmap_levels(pDevice, 1, 256, 9); + check_mipmap_levels(pDevice, 1, 1, 1); + + cleanup: + if (pD3d) IUnknown_Release( pD3d ); + if (pDevice) IUnknown_Release( pDevice ); + DestroyWindow( hwnd ); +} + static void test_swapchain(void) { HRESULT hr; @@ -229,8 +286,27 @@ static void test_refcount(void) /* Buffers */ hr = IDirect3DDevice8_CreateIndexBuffer( pDevice, 16, 0, D3DFMT_INDEX32, D3DPOOL_DEFAULT, &pIndexBuffer ); CHECK_CALL( hr, "CreateIndexBuffer", pDevice, ++refcount ); + if(pIndexBuffer) + { + tmp = get_refcount( (IUnknown *)pIndexBuffer ); + + hr = IDirect3DDevice8_SetIndices(pDevice, pIndexBuffer, 0); + CHECK_CALL( hr, "SetIndices", pIndexBuffer, tmp); + hr = IDirect3DDevice8_SetIndices(pDevice, NULL, 0); + CHECK_CALL( hr, "SetIndices", pIndexBuffer, tmp); + } + hr = IDirect3DDevice8_CreateVertexBuffer( pDevice, 16, 0, D3DFVF_XYZ, D3DPOOL_DEFAULT, &pVertexBuffer ); CHECK_CALL( hr, "CreateVertexBuffer", pDevice, ++refcount ); + if(pVertexBuffer) + { + tmp = get_refcount( (IUnknown *)pVertexBuffer ); + + hr = IDirect3DDevice8_SetStreamSource(pDevice, 0, pVertexBuffer, 3 * sizeof(float)); + CHECK_CALL( hr, "SetStreamSource", pVertexBuffer, tmp); + hr = IDirect3DDevice8_SetStreamSource(pDevice, 0, NULL, 0); + CHECK_CALL( hr, "SetStreamSource", pVertexBuffer, tmp); + } /* Shaders */ hr = IDirect3DDevice8_CreateVertexShader( pDevice, decl, simple_vs, &dVertexShader, 0 ); CHECK_CALL( hr, "CreateVertexShader", pDevice, refcount ); @@ -242,6 +318,13 @@ static void test_refcount(void) if (pTexture) { tmp = get_refcount( (IUnknown *)pTexture ); + + /* SetTexture should not increase refcounts */ + hr = IDirect3DDevice8_SetTexture(pDevice, 0, (IDirect3DBaseTexture8 *) pTexture); + CHECK_CALL( hr, "SetTexture", pTexture, tmp); + hr = IDirect3DDevice8_SetTexture(pDevice, 0, NULL); + CHECK_CALL( hr, "SetTexture", pTexture, tmp); + /* This should not increment device refcount */ hr = IDirect3DTexture8_GetSurfaceLevel( pTexture, 1, &pTextureLevel ); CHECK_CALL( hr, "GetSurfaceLevel", pDevice, refcount ); @@ -308,6 +391,88 @@ cleanup: DestroyWindow( hwnd ); } +static void test_cursor(void) +{ + HRESULT hr; + HWND hwnd = NULL; + IDirect3D8 *pD3d = NULL; + IDirect3DDevice8 *pDevice = NULL; + D3DPRESENT_PARAMETERS d3dpp; + D3DDISPLAYMODE d3ddm; + CURSORINFO info; + IDirect3DSurface8 *cursor = NULL; + HCURSOR cur; + + memset(&info, 0, sizeof(info)); + info.cbSize = sizeof(info); + hr = GetCursorInfo(&info); + cur = info.hCursor; + + pD3d = pDirect3DCreate8( D3D_SDK_VERSION ); + ok(pD3d != NULL, "Failed to create IDirect3D8 object\n"); + hwnd = CreateWindow( "static", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + ok(hwnd != NULL, "Failed to create window\n"); + if (!pD3d || !hwnd) goto cleanup; + + IDirect3D8_GetAdapterDisplayMode( pD3d, D3DADAPTER_DEFAULT, &d3ddm ); + ZeroMemory( &d3dpp, sizeof(d3dpp) ); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.BackBufferFormat = d3ddm.Format; + + hr = IDirect3D8_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); + ok(SUCCEEDED(hr), "Failed to create IDirect3D8Device (%s)\n", DXGetErrorString8(hr)); + if (FAILED(hr)) goto cleanup; + + IDirect3DDevice8_CreateImageSurface(pDevice, 32, 32, D3DFMT_A8R8G8B8, &cursor); + ok(cursor != NULL, "IDirect3DDevice8_CreateOffscreenPlainSurface failed with %08x\n", hr); + + /* Initially hidden */ + hr = IDirect3DDevice8_ShowCursor(pDevice, TRUE); + ok(hr == FALSE, "IDirect3DDevice8_ShowCursor returned %08x\n", hr); + + /* Not enabled without a surface*/ + hr = IDirect3DDevice8_ShowCursor(pDevice, TRUE); + ok(hr == FALSE, "IDirect3DDevice8_ShowCursor returned %08x\n", hr); + + /* Fails */ + hr = IDirect3DDevice8_SetCursorProperties(pDevice, 0, 0, NULL); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_SetCursorProperties returned %08x\n", hr); + + hr = IDirect3DDevice8_SetCursorProperties(pDevice, 0, 0, cursor); + ok(hr == D3D_OK, "IDirect3DDevice8_SetCursorProperties returned %08x\n", hr); + + IDirect3DSurface8_Release(cursor); + + memset(&info, 0, sizeof(info)); + info.cbSize = sizeof(info); + hr = GetCursorInfo(&info); + ok(hr != 0, "GetCursorInfo returned %08x\n", hr); + ok(info.flags & CURSOR_SHOWING, "The gdi cursor is hidden (%08x)\n", info.flags); + ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */ + + /* Still hidden */ + hr = IDirect3DDevice8_ShowCursor(pDevice, TRUE); + ok(hr == FALSE, "IDirect3DDevice8_ShowCursor returned %08x\n", hr); + + /* Enabled now*/ + hr = IDirect3DDevice8_ShowCursor(pDevice, TRUE); + ok(hr == TRUE, "IDirect3DDevice8_ShowCursor returned %08x\n", hr); + + /* GDI cursor unchanged */ + memset(&info, 0, sizeof(info)); + info.cbSize = sizeof(info); + hr = GetCursorInfo(&info); + ok(hr != 0, "GetCursorInfo returned %08x\n", hr); + ok(info.flags & CURSOR_SHOWING, "The gdi cursor is hidden (%08x)\n", info.flags); + ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */ + +cleanup: + if(pD3d) IDirect3D8_Release(pD3d); + if(pDevice) IDirect3D8_Release(pDevice); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -315,7 +480,9 @@ START_TEST(device) pDirect3DCreate8 = (void *)GetProcAddress( d3d8_handle, "Direct3DCreate8" ); if (pDirect3DCreate8) { - test_refcount(); test_swapchain(); + test_refcount(); + test_mipmap_levels(); + test_cursor(); } }

1 0

Markus Amsler : d3d8: Backport null pointer check in SetCursorProperties.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: bef60f1dfc4f9531f9197abf855262315f1defe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bef60f1dfc4f9531f9197abf8… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Thu Nov 9 02:38:22 2006 +0100 d3d8: Backport null pointer check in SetCursorProperties. --- dlls/d3d8/device.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 8b20920..68b0dff 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -185,6 +185,10 @@ static HRESULT WINAPI IDirect3DDevice8Im IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; IDirect3DSurface8Impl *pSurface = (IDirect3DSurface8Impl*)pCursorBitmap; TRACE("(%p) Relay\n", This); + if(!pCursorBitmap) { + WARN("No cursor bitmap, returning WINED3DERR_INVALIDCALL\n"); + return WINED3DERR_INVALIDCALL; + } return IWineD3DDevice_SetCursorProperties(This->WineD3DDevice,XHotSpot,YHotSpot,(IWineD3DSurface*)pSurface->wineD3DSurface); }

1 0

Eric Pouech : ole32: Don' t use PropVariantClear to setup an unitialized variant.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: 3026d8844c6439d7e590d54bc96d6a185045b944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3026d8844c6439d7e590d54bc… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Nov 8 21:47:18 2006 +0100 ole32: Don't use PropVariantClear to setup an unitialized variant. --- dlls/ole32/tests/stg_prop.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/stg_prop.c b/dlls/ole32/tests/stg_prop.c index 59cae8e..b25ebd5 100644 --- a/dlls/ole32/tests/stg_prop.c +++ b/dlls/ole32/tests/stg_prop.c @@ -90,7 +90,6 @@ static void testProps(void) /* test setting one that I can't set */ spec.ulKind = PRSPEC_PROPID; U(spec).propid = PID_DICTIONARY; - PropVariantClear(&var); var.vt = VT_I4; U(var).lVal = 1; hr = IPropertyStorage_WriteMultiple(propertyStorage, 1, &spec, &var, 0);

1 0

Eric Pouech : winmm: Plug a memory leak.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: d1737cc24b2cd904cddc659ed647eedd5039d22c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1737cc24b2cd904cddc659ed… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Nov 8 21:47:22 2006 +0100 winmm: Plug a memory leak. --- dlls/winmm/lolvldrv.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index 6331752..a21e32b 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -834,4 +834,10 @@ #endif MMDRV_ExitPerType(&MMDrvs[i], MMDRV_WAVEOUT); CloseDriver(MMDrvs[i].hDriver, 0, 0); } + HeapFree(GetProcessHeap(), 0, llTypes[MMDRV_AUX].lpMlds - 1); + HeapFree(GetProcessHeap(), 0, llTypes[MMDRV_MIXER].lpMlds - 1); + HeapFree(GetProcessHeap(), 0, llTypes[MMDRV_MIDIIN].lpMlds - 1); + HeapFree(GetProcessHeap(), 0, llTypes[MMDRV_MIDIOUT].lpMlds - 1); + HeapFree(GetProcessHeap(), 0, llTypes[MMDRV_WAVEIN].lpMlds - 1); + HeapFree(GetProcessHeap(), 0, llTypes[MMDRV_WAVEOUT].lpMlds - 1); }

1 0

Eric Pouech : msi: Don't call PropVariantClear on uninitialized variants.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: 8f2b4794610be864d841b8a357e5eecccac4b010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f2b4794610be864d841b8a35… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Nov 8 21:47:09 2006 +0100 msi: Don't call PropVariantClear on uninitialized variants. --- dlls/msi/tests/suminfo.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/msi/tests/suminfo.c b/dlls/msi/tests/suminfo.c index 0122936..869495d 100644 --- a/dlls/msi/tests/suminfo.c +++ b/dlls/msi/tests/suminfo.c @@ -299,50 +299,42 @@ static void test_create_database_binary( r = IPropertyStorage_SetClass( ps, &FMTID_SummaryInformation ); ok( r == S_OK, "failed to set class\n"); - PropVariantClear( &propvar[0] ); propspec[0].ulKind = PRSPEC_PROPID; U(propspec[0]).propid = PID_TITLE; propvar[0].vt = VT_LPSTR; U(propvar[0]).pszVal = LOSE_CONST("test title"); - PropVariantClear( &propvar[1] ); propspec[1].ulKind = PRSPEC_PROPID; U(propspec[1]).propid = PID_SUBJECT; propvar[1].vt = VT_LPSTR; U(propvar[1]).pszVal = LOSE_CONST("msi suminfo / property storage test"); - PropVariantClear( &propvar[2] ); propspec[2].ulKind = PRSPEC_PROPID; U(propspec[2]).propid = PID_AUTHOR; propvar[2].vt = VT_LPSTR; U(propvar[2]).pszVal = LOSE_CONST("mike_m"); - PropVariantClear( &propvar[3] ); propspec[3].ulKind = PRSPEC_PROPID; U(propspec[3]).propid = PID_TEMPLATE; propvar[3].vt = VT_LPSTR; U(propvar[3]).pszVal = LOSE_CONST(";1033"); /* actually the string table's codepage */ - PropVariantClear( &propvar[4] ); propspec[4].ulKind = PRSPEC_PROPID; U(propspec[4]).propid = PID_REVNUMBER; propvar[4].vt = VT_LPSTR; U(propvar[4]).pszVal = LOSE_CONST("{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}"); - PropVariantClear( &propvar[5] ); propspec[5].ulKind = PRSPEC_PROPID; U(propspec[5]).propid = PID_PAGECOUNT; propvar[5].vt = VT_I4; U(propvar[5]).lVal = 100; - PropVariantClear( &propvar[6] ); propspec[6].ulKind = PRSPEC_PROPID; U(propspec[6]).propid = PID_WORDCOUNT; propvar[6].vt = VT_I4; U(propvar[6]).lVal = 0; /* MSDN says that PID_LASTPRINTED should be a VT_FILETIME... */ - PropVariantClear( &propvar[7] ); propspec[7].ulKind = PRSPEC_PROPID; U(propspec[7]).propid = PID_LASTPRINTED; propvar[7].vt = VT_LPSTR;

1 0

Eric Pouech : kernel32: Changed encoding for Divehi ( which has a 639-1 enconding).
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: ab9fd793ce65f1f86e9b5d32aa12d7ae1c29a53b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab9fd793ce65f1f86e9b5d32a… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Nov 8 21:46:54 2006 +0100 kernel32: Changed encoding for Divehi (which has a 639-1 enconding). --- dlls/kernel32/nls/div.nls | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/nls/div.nls b/dlls/kernel32/nls/div.nls index e081c48..43eb7d0 100644 --- a/dlls/kernel32/nls/div.nls +++ b/dlls/kernel32/nls/div.nls @@ -101,7 +101,7 @@ STRINGTABLE LANGUAGE LANG_DIVEHI, SUBLAN LOCALE_SGROUPING L"3;0" LOCALE_SINTLSYMBOL L"MVR" LOCALE_SISO3166CTRYNAME L"MV" - LOCALE_SISO639LANGNAME L"div" + LOCALE_SISO639LANGNAME L"dv" LOCALE_SLANGUAGE L"Divehi" LOCALE_SLIST L"\x060c" LOCALE_SLONGDATE L"dd MMMM yyyy"

1 0