September 2010 - Wine-Commits

Jörg Höhle : winmm: Correctly parse the MCI Sysinfo command.
by Alexandre Julliard Sept. 3, 2010

Sept. 3, 2010

Module: wine Branch: master Commit: 565c56c61f1afa6c56734034f53333b748d83656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=565c56c61f1afa6c56734034f… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Fri Sep 3 06:33:52 2010 +0200 winmm: Correctly parse the MCI Sysinfo command. --- dlls/winmm/mci.c | 79 ++++++++++++++++++++++++++++++++++------------- dlls/winmm/tests/mci.c | 23 +++++++++++++- 2 files changed, 78 insertions(+), 24 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 7a3cd8f..b7799c8 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -544,6 +544,23 @@ static DWORD MCI_GetDevTypeFromFileName(LPCWSTR fileName, LPWSTR buf, UINT len) return MCIERR_EXTENSION_NOT_FOUND; } +/************************************************************************** + * MCI_GetDevTypeFromResource [internal] + */ +static UINT MCI_GetDevTypeFromResource(LPCWSTR lpstrName) +{ + WCHAR buf[32]; + UINT uDevType; + for (uDevType = MCI_DEVTYPE_FIRST; uDevType <= MCI_DEVTYPE_LAST; uDevType++) { + if (LoadStringW(hWinMM32Instance, uDevType, buf, sizeof(buf) / sizeof(WCHAR))) { + /* FIXME: ignore digits suffix */ + if (!strcmpiW(buf, lpstrName)) + return uDevType; + } + } + return 0; +} + #define MAX_MCICMDTABLE 20 #define MCI_COMMAND_TABLE_NOT_LOADED 0xFFFE @@ -1319,21 +1336,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, HeapFree(GetProcessHeap(), 0, devType); if (dwRet) goto errCleanUp; - } else if (!strcmpW(verb, wszSysinfo)) { - /* System commands are not subject to auto-open. */ - /* It's too early to handle Sysinfo here because the - * requirements on dev depend on the flags: - * alias with INSTALLNAME, name like "waveaudio" - * with QUANTITY and NAME. */ - data[4] = MCI_ALL_DEVICE_ID; - if (MCI_ALL_DEVICE_ID != uDevID) { - /* FIXME: Map device name like waveaudio to MCI_DEVTYPE_xyz */ - uDevID = mciGetDeviceIDW(dev); - wmd = MCI_GetDriver(uDevID); - if (wmd) - data[4] = wmd->wType; - } - } else if (!strcmpW(verb, wszSound) || !strcmpW(verb, wszBreak)) { + } else if (!strcmpW(verb, wszSysinfo) || !strcmpW(verb, wszSound) || !strcmpW(verb, wszBreak)) { /* Prevent auto-open for system commands. */ } else if ((MCI_ALL_DEVICE_ID != uDevID) && !(wmd = MCI_GetDriver(mciGetDeviceIDW(dev)))) { /* auto open */ @@ -1409,11 +1412,32 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, data[0] = (DWORD_PTR)hwndCallback; } - if (wMsg == MCI_OPEN && strcmpW(verb, wszOpen)) { - ERR("Cannot open with command %s\n", debugstr_w(verb)); - dwRet = MCIERR_INTERNAL; - wMsg = 0; - goto errCleanUp; + switch (wMsg) { + case MCI_OPEN: + if (strcmpW(verb, wszOpen)) { + FIXME("Cannot open with command %s\n", debugstr_w(verb)); + dwRet = MCIERR_INTERNAL; + wMsg = 0; + goto errCleanUp; + } + break; + case MCI_SYSINFO: + /* Requirements on dev depend on the flags: + * alias with INSTALLNAME, name like "digitalvideo" + * with QUANTITY and NAME. */ + { + LPMCI_SYSINFO_PARMSW lpParms = (LPMCI_SYSINFO_PARMSW)data; + lpParms->wDeviceType = MCI_ALL_DEVICE_ID; + if (uDevID != MCI_ALL_DEVICE_ID) { + if (dwFlags & MCI_SYSINFO_INSTALLNAME) + wmd = MCI_GetDriver(mciGetDeviceIDW(dev)); + else if (!(lpParms->wDeviceType = MCI_GetDevTypeFromResource(dev))) { + dwRet = MCIERR_DEVICE_TYPE_REQUIRED; + goto errCleanUp; + } + } + } + break; } TRACE("[%d, %s, %08x, %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx]\n", @@ -1799,7 +1823,17 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm } else { TRACE("MCI_SYSINFO_QUANTITY: # of installed MCI drivers of type %d\n", lpParms->wDeviceType); FIXME("Don't know how to get # of MCI devices of a given type\n"); - cnt = 1; + /* name = LoadStringW(hWinMM32Instance, LOWORD(lpParms->wDeviceType)) + * then lookup registry and/or system.ini for name, ignoring digits suffix */ + switch (LOWORD(lpParms->wDeviceType)) { + case MCI_DEVTYPE_CD_AUDIO: + case MCI_DEVTYPE_WAVEFORM_AUDIO: + case MCI_DEVTYPE_SEQUENCER: + cnt = 1; + break; + default: /* "digitalvideo" gets 0 because it's not in the registry */ + cnt = 0; + } } } *(DWORD*)lpParms->lpstrReturn = cnt; @@ -1814,7 +1848,8 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm wmd->lpstrDeviceType); } else { *lpParms->lpstrReturn = 0; - ret = MCIERR_INVALID_DEVICE_ID; + ret = (uDevID == MCI_ALL_DEVICE_ID) + ? MCIERR_CANNOT_USE_ALL : MCIERR_INVALID_DEVICE_NAME; } TRACE("(%d) => %s\n", lpParms->dwNumber, debugstr_w(lpParms->lpstrReturn)); break; diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 382ff6a..8adc46b 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -263,6 +263,19 @@ static void test_mciParser(HWND hwnd) err = mciSendString("open all", buf, sizeof(buf), NULL); todo_wine ok(err==MCIERR_CANNOT_USE_ALL,"open all: %s\n", dbg_mcierr(err)); + /* avivideo is not a known MCI_DEVTYPE resource name */ + err = mciSendString("sysinfo avivideo quantity", buf, sizeof(buf), hwnd); + ok(err==MCIERR_DEVICE_TYPE_REQUIRED,"sysinfo sequencer quantity: %s\n", dbg_mcierr(err)); + + err = mciSendString("sysinfo digitalvideo quantity", buf, sizeof(buf), hwnd); + ok(!err,"sysinfo digitalvideo quantity: %s\n", dbg_mcierr(err)); + if(!err) ok(!strcmp(buf,"0"), "sysinfo digitalvideo quantity returned %s\n", buf); + + /* quantity 0 yet open 1 (via type "avivideo"), fun */ + err = mciSendString("sysinfo digitalvideo quantity open", buf, sizeof(buf), hwnd); + ok(!err,"sysinfo digitalvideo quantity open: %s\n", dbg_mcierr(err)); + if(!err) ok(!strcmp(buf,"1"), "sysinfo digitalvideo quantity open returned %s\n", buf); + err = mciSendString("put a window at 0 0", buf, sizeof(buf), NULL); todo_wine ok(err==MCIERR_BAD_INTEGER,"put incomplete rect: %s\n", dbg_mcierr(err)); @@ -425,10 +438,16 @@ static void test_openCloseWAVE(HWND hwnd) if(!err) ok(!strcmp(buf,"mysound"), "sysinfo short name returned %s\n", buf); err = mciSendString("sysinfo mysound quantity open", buf, sizeof(buf), hwnd); - todo_wine ok(err==MCIERR_DEVICE_TYPE_REQUIRED,"sysinfo alias quantity returned %s\n", dbg_mcierr(err)); + ok(err==MCIERR_DEVICE_TYPE_REQUIRED,"sysinfo alias quantity: %s\n", dbg_mcierr(err)); err = mciSendString("sysinfo nosuchalias quantity open", buf, sizeof(buf), hwnd); - todo_wine ok(err==MCIERR_DEVICE_TYPE_REQUIRED,"sysinfo unknown quantity open returned %s\n", dbg_mcierr(err)); + ok(err==MCIERR_DEVICE_TYPE_REQUIRED,"sysinfo unknown quantity open: %s\n", dbg_mcierr(err)); + + err = mciSendString("sysinfo all installname", buf, sizeof(buf), hwnd); + ok(err==MCIERR_CANNOT_USE_ALL,"sysinfo all installname: %s\n", dbg_mcierr(err)); + + err = mciSendString("sysinfo nodev installname", buf, sizeof(buf), hwnd); + ok(err==MCIERR_INVALID_DEVICE_NAME,"sysinfo nodev installname: %s\n", dbg_mcierr(err)); err = mciGetDeviceID("all"); ok(MCI_ALL_DEVICE_ID==err || /* Win9x */(UINT16)MCI_ALL_DEVICE_ID==err,"mciGetDeviceID all returned %u, expected %d\n", err, MCI_ALL_DEVICE_ID);

1 0

Mariusz Pluciński : gameux/tests: Verify registry values created by GameExplorer.
by Alexandre Julliard Sept. 3, 2010

Sept. 3, 2010

Module: wine Branch: master Commit: 2f398b8c2530b1d26ef041caf395844b32b98b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f398b8c2530b1d26ef041caf… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Fri Sep 3 11:24:48 2010 +0200 gameux/tests: Verify registry values created by GameExplorer. --- dlls/gameux/tests/gameexplorer.c | 172 +++++++++++++++++++++++++++++++++++++- dlls/gameux/tests/rsrc.rc | 2 + dlls/gameux/tests/test.gdf.xml | 1 + 3 files changed, 171 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f398b8c2530b1d26ef04…

1 0

Oldřich Jedlička : ddraw/tests: New tests for CreateSurface for 3D DDSCAPS_BACKBUFFER.
by Alexandre Julliard Sept. 3, 2010

Sept. 3, 2010

Module: wine Branch: master Commit: 51332b7a032a6f17dcec9252eefdbd821ca62585 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51332b7a032a6f17dcec9252e… Author: Oldřich Jedlička <oldium.pro(a)seznam.cz> Date: Thu Sep 2 22:00:35 2010 +0200 ddraw/tests: New tests for CreateSurface for 3D DDSCAPS_BACKBUFFER. --- dlls/ddraw/tests/d3d.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 93 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 2f0f3c4..3427563 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3526,6 +3526,98 @@ static void FindDevice(void) "Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", hr); } +static void BackBuffer3DCreateSurfaceTest(void) +{ + DDSURFACEDESC ddsd; + DDSURFACEDESC created_ddsd; + DDSURFACEDESC2 ddsd2; + IDirectDrawSurface *surf; + IDirectDrawSurface4 *surf4; + IDirectDrawSurface7 *surf7; + HRESULT hr; + IDirectDraw2 *dd2; + IDirectDraw4 *dd4; + IDirectDraw7 *dd7; + DDCAPS ddcaps; + IDirect3DDevice *d3dhal; + + const DWORD caps = DDSCAPS_BACKBUFFER | DDSCAPS_3DDEVICE; + const DWORD expected_caps = DDSCAPS_BACKBUFFER | DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM; + + memset(&ddcaps, 0, sizeof(ddcaps)); + ddcaps.dwSize = sizeof(DDCAPS); + hr = IDirectDraw_GetCaps(DirectDraw1, &ddcaps, NULL); + if (!(ddcaps.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) + { + skip("DDraw reported no VIDEOMEMORY cap. Broken video driver? Skipping surface caps tests.\n"); + return ; + } + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.dwWidth = 64; + ddsd.dwHeight = 64; + ddsd.ddsCaps.dwCaps = caps; + memset(&ddsd2, 0, sizeof(ddsd2)); + ddsd2.dwSize = sizeof(ddsd2); + ddsd2.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd2.dwWidth = 64; + ddsd2.dwHeight = 64; + ddsd2.ddsCaps.dwCaps = caps; + memset(&created_ddsd, 0, sizeof(created_ddsd)); + created_ddsd.dwSize = sizeof(DDSURFACEDESC); + + hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &surf, NULL); + todo_wine ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface failed: 0x%08x\n", hr); + if (surf != NULL) + { + hr = IDirectDrawSurface_GetSurfaceDesc(surf, &created_ddsd); + ok(SUCCEEDED(hr), "IDirectDraw_GetSurfaceDesc failed: 0x%08x\n", hr); + todo_wine ok(created_ddsd.ddsCaps.dwCaps == expected_caps, + "GetSurfaceDesc returned caps %x, expected %x\n", created_ddsd.ddsCaps.dwCaps, + expected_caps); + + hr = IDirectDrawSurface_QueryInterface(surf, &IID_IDirect3DHALDevice, (void **)&d3dhal); + /* Currently Wine only supports the creation of one Direct3D device + for a given DirectDraw instance. It has been created already + in D3D1_createObjects() - IID_IDirect3DRGBDevice */ + todo_wine ok(SUCCEEDED(hr), "Expected IDirectDrawSurface::QueryInterface to succeed, got 0x%08x\n", hr); + + if (SUCCEEDED(hr)) + IDirect3DDevice_Release(d3dhal); + + IDirectDrawSurface_Release(surf); + } + + hr = IDirectDraw_QueryInterface(DirectDraw1, &IID_IDirectDraw2, (void **) &dd2); + ok(SUCCEEDED(hr), "IDirectDraw_QueryInterface failed: 0x%08x\n", hr); + + hr = IDirectDraw2_CreateSurface(dd2, &ddsd, &surf, NULL); + ok(hr == DDERR_INVALIDCAPS, "IDirectDraw2_CreateSurface didn't return %x08x, but %x08x\n", + DDERR_INVALIDCAPS, hr); + + IDirectDraw2_Release(dd2); + + hr = IDirectDraw_QueryInterface(DirectDraw1, &IID_IDirectDraw4, (void **) &dd4); + ok(SUCCEEDED(hr), "IDirectDraw_QueryInterface failed: 0x%08x\n", hr); + + hr = IDirectDraw4_CreateSurface(dd4, &ddsd2, &surf4, NULL); + ok(hr == DDERR_INVALIDCAPS, "IDirectDraw4_CreateSurface didn't return %x08x, but %x08x\n", + DDERR_INVALIDCAPS, hr); + + IDirectDraw4_Release(dd4); + + hr = IDirectDraw_QueryInterface(DirectDraw1, &IID_IDirectDraw7, (void **) &dd7); + ok(SUCCEEDED(hr), "IDirectDraw_QueryInterface failed: 0x%08x\n", hr); + + hr = IDirectDraw7_CreateSurface(dd7, &ddsd2, &surf7, NULL); + ok(hr == DDERR_INVALIDCAPS, "IDirectDraw7_CreateSurface didn't return %x08x, but %x08x\n", + DDERR_INVALIDCAPS, hr); + + IDirectDraw7_Release(dd7); +} + START_TEST(d3d) { init_function_pointers(); @@ -3561,6 +3653,7 @@ START_TEST(d3d) TextureLoadTest(); ViewportTest(); FindDevice(); + BackBuffer3DCreateSurfaceTest(); D3D1_releaseObjects(); }

1 0

Henri Verbeet : wined3d: Add a handler for WINED3DRS_SRGBWRITEENABLE to the atifs fragment pipe.
by Alexandre Julliard Sept. 3, 2010

Sept. 3, 2010

Module: wine Branch: master Commit: fa3a72c63a4435e015baa706cc7150a8224c2997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa3a72c63a4435e015baa706c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 2 19:25:03 2010 +0200 wined3d: Add a handler for WINED3DRS_SRGBWRITEENABLE to the atifs fragment pipe. --- dlls/wined3d/ati_fragment_shader.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 993ece0..5aaac3b 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -912,6 +912,12 @@ static void atifs_apply_pixelshader(DWORD state, IWineD3DStateBlockImpl *statebl } } +static void atifs_srgbwriteenable(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) +{ + if (stateblock->renderState[WINED3DRS_SRGBWRITEENABLE]) + WARN("sRGB writes are not supported by this fragment pipe.\n"); +} + static const struct StateEntryTemplate atifs_fragmentstate_template[] = { {STATE_RENDER(WINED3DRS_TEXTUREFACTOR), { STATE_RENDER(WINED3DRS_TEXTUREFACTOR), state_texfactor_atifs }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3DRS_FOGCOLOR), { STATE_RENDER(WINED3DRS_FOGCOLOR), state_fogcolor }, WINED3D_GL_EXT_NONE }, @@ -921,6 +927,7 @@ static const struct StateEntryTemplate atifs_fragmentstate_template[] = { {STATE_RENDER(WINED3DRS_FOGVERTEXMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3DRS_FOGSTART), { STATE_RENDER(WINED3DRS_FOGSTART), state_fogstartend }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3DRS_FOGEND), { STATE_RENDER(WINED3DRS_FOGSTART), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_RENDER(WINED3DRS_SRGBWRITEENABLE), { STATE_RENDER(WINED3DRS_SRGBWRITEENABLE), atifs_srgbwriteenable }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), { STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), set_tex_op_atifs }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0, WINED3DTSS_COLORARG1), { STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0, WINED3DTSS_COLORARG2), { STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), NULL }, WINED3D_GL_EXT_NONE },

1 0

Henri Verbeet : ddraw: Handle D3DRENDERSTATE_TEXTUREHANDLE and D3DRENDERSTATE_TEXTUREMAPBLEND in d3d7 .
by Alexandre Julliard Sept. 3, 2010

Sept. 3, 2010

Module: wine Branch: master Commit: 83ff5b504185910ebf277e142c8d1392024583f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83ff5b504185910ebf277e142… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 2 19:25:04 2010 +0200 ddraw: Handle D3DRENDERSTATE_TEXTUREHANDLE and D3DRENDERSTATE_TEXTUREMAPBLEND in d3d7. --- dlls/ddraw/device.c | 12 ++++++++++++ dlls/ddraw/tests/d3d.c | 30 ++++++++++-------------------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e632151..9632bd5 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2492,6 +2492,12 @@ IDirect3DDeviceImpl_7_GetRenderState(IDirect3DDevice7 *iface, hr = E_NOTIMPL; break; + case D3DRENDERSTATE_TEXTUREHANDLE: + case D3DRENDERSTATE_TEXTUREMAPBLEND: + WARN("Render state %#x is invalid in d3d7.\n", RenderStateType); + hr = DDERR_INVALIDPARAMS; + break; + default: if (RenderStateType >= D3DRENDERSTATE_STIPPLEPATTERN00 && RenderStateType <= D3DRENDERSTATE_STIPPLEPATTERN31) @@ -2802,6 +2808,12 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface, hr = E_NOTIMPL; break; + case D3DRENDERSTATE_TEXTUREHANDLE: + case D3DRENDERSTATE_TEXTUREMAPBLEND: + WARN("Render state %#x is invalid in d3d7.\n", RenderStateType); + hr = DDERR_INVALIDPARAMS; + break; + default: if (RenderStateType >= D3DRENDERSTATE_STIPPLEPATTERN00 && RenderStateType <= D3DRENDERSTATE_STIPPLEPATTERN31) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 53ef04b..2f0f3c4 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1818,28 +1818,18 @@ out: static void D3D7_OldRenderStateTest(void) { - HRESULT rc; + HRESULT hr; DWORD val; - /* Test reaction to some deprecated states in D3D7. - - * IDirect3DDevice7 in Wine currently relays such states to wined3d where they are do-nothing and return 0, instead - * of INVALIDPARAMS. Unless an app is found which cares this is probably ok. What this test shows is that these states - * need not to be handled in D3D7. - */ - todo_wine { - rc = IDirect3DDevice7_SetRenderState(lpD3DDevice, D3DRENDERSTATE_TEXTUREHANDLE, 0); - ok(rc == DDERR_INVALIDPARAMS, "IDirect3DDevice7_SetRenderState returned %08x\n", rc); - - rc = IDirect3DDevice7_GetRenderState(lpD3DDevice, D3DRENDERSTATE_TEXTUREHANDLE, &val); - ok(rc == DDERR_INVALIDPARAMS, "IDirect3DDevice7_GetRenderState returned %08x\n", rc); - - rc = IDirect3DDevice7_SetRenderState(lpD3DDevice, D3DRENDERSTATE_TEXTUREMAPBLEND, D3DTBLEND_MODULATE); - ok(rc == DDERR_INVALIDPARAMS, "IDirect3DDevice7_SetRenderState returned %08x\n", rc); - - rc = IDirect3DDevice7_GetRenderState(lpD3DDevice, D3DRENDERSTATE_TEXTUREMAPBLEND, &val); - ok(rc == DDERR_INVALIDPARAMS, "IDirect3DDevice7_GetRenderState returned %08x\n", rc); - } + /* Test reaction to some deprecated states in D3D7. */ + hr = IDirect3DDevice7_SetRenderState(lpD3DDevice, D3DRENDERSTATE_TEXTUREHANDLE, 0); + ok(hr == DDERR_INVALIDPARAMS, "IDirect3DDevice7_SetRenderState returned %#x.\n", hr); + hr = IDirect3DDevice7_GetRenderState(lpD3DDevice, D3DRENDERSTATE_TEXTUREHANDLE, &val); + ok(hr == DDERR_INVALIDPARAMS, "IDirect3DDevice7_GetRenderState returned %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(lpD3DDevice, D3DRENDERSTATE_TEXTUREMAPBLEND, D3DTBLEND_MODULATE); + ok(hr == DDERR_INVALIDPARAMS, "IDirect3DDevice7_SetRenderState returned %#x.\n", hr); + hr = IDirect3DDevice7_GetRenderState(lpD3DDevice, D3DRENDERSTATE_TEXTUREMAPBLEND, &val); + ok(hr == DDERR_INVALIDPARAMS, "IDirect3DDevice7_GetRenderState returned %#x.\n", hr); } #define IS_VALUE_NEAR(a, b) ( ((a) == (b)) || ((a) == (b) - 1) || ((a) == (b) + 1) )

1 0

Alexandre Goujon : msxml3/tests: Be more verbose when get_text fails.
by Alexandre Julliard Sept. 3, 2010

Sept. 3, 2010

Module: wine Branch: master Commit: 8aa6ed97c826feaebb6550ee1909317129a5e119 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aa6ed97c826feaebb6550ee1… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Thu Sep 2 14:21:30 2010 +0200 msxml3/tests: Be more verbose when get_text fails. --- dlls/msxml3/tests/domdoc.c | 82 ++++++++++++++++++++++---------------------- 1 files changed, 41 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8aa6ed97c826feaebb655…

1 0

Nikolay Sivov : msxml3: Implement IXMLDOMNamedNodeMap::getQualifiedItem().
by Alexandre Julliard Sept. 3, 2010

Sept. 3, 2010

Module: wine Branch: master Commit: 0330332aefb4f9a89c6ec2d4054f9421b5800591 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0330332aefb4f9a89c6ec2d40… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 3 12:13:29 2010 +0400 msxml3: Implement IXMLDOMNamedNodeMap::getQualifiedItem(). --- dlls/msxml3/nodemap.c | 83 ++++++++++++++++++++++++------------------- dlls/msxml3/tests/domdoc.c | 66 ++++++++++++++++++++++++++++++++++- 2 files changed, 111 insertions(+), 38 deletions(-) diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index 3f2ee47..791a771 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -127,13 +127,8 @@ static HRESULT WINAPI xmlnodemap_GetTypeInfo( ITypeInfo** ppTInfo ) { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - HRESULT hr; - TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - - hr = get_typeinfo(IXMLDOMNamedNodeMap_tid, ppTInfo); - - return hr; + return get_typeinfo(IXMLDOMNamedNodeMap_tid, ppTInfo); } static HRESULT WINAPI xmlnodemap_GetIDsOfNames( @@ -203,32 +198,8 @@ static HRESULT WINAPI xmlnodemap_getNamedItem( IXMLDOMNode** namedItem) { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - xmlChar *element_name; - xmlAttrPtr attr; - xmlNodePtr node; - TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), namedItem ); - - if ( !namedItem ) - return E_INVALIDARG; - - node = xmlNodePtr_from_domnode( This->node, 0 ); - if ( !node ) - return E_FAIL; - - element_name = xmlChar_from_wchar( name ); - attr = xmlHasNsProp( node, element_name, NULL ); - heap_free( element_name ); - - if ( !attr ) - { - *namedItem = NULL; - return S_FALSE; - } - - *namedItem = create_node( (xmlNodePtr) attr ); - - return S_OK; + return IXMLDOMNamedNodeMap_getQualifiedItem(iface, name, NULL, namedItem); } static HRESULT WINAPI xmlnodemap_setNamedItem( @@ -237,7 +208,6 @@ static HRESULT WINAPI xmlnodemap_setNamedItem( IXMLDOMNode** namedItem) { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - xmlnode *ThisNew = NULL; xmlNodePtr nodeNew; IXMLDOMNode *pAttr = NULL; xmlNodePtr node; @@ -254,10 +224,10 @@ static HRESULT WINAPI xmlnodemap_setNamedItem( return E_FAIL; /* Must be an Attribute */ - IUnknown_QueryInterface(newItem, &IID_IXMLDOMNode, (LPVOID*)&pAttr); + IUnknown_QueryInterface(newItem, &IID_IXMLDOMNode, (void**)&pAttr); if(pAttr) { - ThisNew = impl_from_IXMLDOMNode( pAttr ); + xmlnode *ThisNew = impl_from_IXMLDOMNode( pAttr ); if(ThisNew->node->type != XML_ATTRIBUTE_NODE) { @@ -387,7 +357,7 @@ static HRESULT WINAPI xmlnodemap_get_length( curr = first; attrCount = 1; - while (curr->next != NULL) { + while (curr->next) { attrCount++; curr = curr->next; } @@ -403,8 +373,47 @@ static HRESULT WINAPI xmlnodemap_getQualifiedItem( IXMLDOMNode** qualifiedItem) { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - FIXME("(%p)->(%s %s %p)\n", This, debugstr_w(baseName), debugstr_w(namespaceURI), qualifiedItem); - return E_NOTIMPL; + xmlAttrPtr attr; + xmlNodePtr node; + xmlChar *href; + xmlChar *name; + + TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(baseName), debugstr_w(namespaceURI), qualifiedItem); + + if (!baseName || !qualifiedItem) return E_INVALIDARG; + + node = xmlNodePtr_from_domnode(This->node, XML_ELEMENT_NODE); + if ( !node ) + return E_FAIL; + + if (namespaceURI && *namespaceURI) + { + href = xmlChar_from_wchar(namespaceURI); + if (!href) return E_OUTOFMEMORY; + } + else + href = NULL; + + name = xmlChar_from_wchar(baseName); + if (!name) + { + heap_free(href); + return E_OUTOFMEMORY; + } + + attr = xmlHasNsProp(node, name, href); + if (!attr) + { + *qualifiedItem = NULL; + return S_FALSE; + } + + *qualifiedItem = create_node((xmlNodePtr)attr); + + heap_free(name); + heap_free(href); + + return S_OK; } static HRESULT WINAPI xmlnodemap_removeQualifiedItem( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index a9c5c3c..a1d27bb 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1321,7 +1321,7 @@ static void test_domnode( void ) type = NODE_INVALID; r = IXMLDOMNode_get_nodeType( element, &type); - ok( r == S_OK, "getNamedItem returned wrong code\n"); + ok( r == S_OK, "got %08x\n", r); ok( type == NODE_ELEMENT, "node not an element\n"); str = NULL; @@ -5796,6 +5796,69 @@ static void test_splitText(void) free_bstrs(); } +static void test_getQualifiedItem(void) +{ + IXMLDOMDocument *doc; + IXMLDOMElement *element; + IXMLDOMNode *pr_node, *node; + IXMLDOMNodeList *root_list; + IXMLDOMNamedNodeMap *map; + VARIANT_BOOL b; + BSTR str; + LONG len; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_DOMDocument, NULL, + CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&doc ); + ok( hr == S_OK, "ret 0x%08x\n", hr); + if( hr != S_OK ) + return; + + str = SysAllocString( szComplete4 ); + hr = IXMLDOMDocument_loadXML( doc, str, &b ); + ok( hr == S_OK, "loadXML failed\n"); + ok( b == VARIANT_TRUE, "failed to load XML string\n"); + SysFreeString( str ); + + hr = IXMLDOMDocument_get_documentElement(doc, &element); + ok( hr == S_OK, "ret %08x\n", hr); + + hr = IXMLDOMElement_get_childNodes(element, &root_list); + ok( hr == S_OK, "ret %08x\n", hr); + + hr = IXMLDOMNodeList_get_item(root_list, 1, &pr_node); + ok( hr == S_OK, "ret %08x\n", hr); + IXMLDOMNodeList_Release(root_list); + + hr = IXMLDOMNode_get_attributes(pr_node, &map); + ok( hr == S_OK, "ret %08x\n", hr); + IXMLDOMNode_Release(pr_node); + + hr = IXMLDOMNamedNodeMap_get_length(map, &len); + ok( hr == S_OK, "ret %08x\n", hr); + ok( len == 3, "length %d\n", len); + + hr = IXMLDOMNamedNodeMap_getQualifiedItem(map, NULL, NULL, NULL); + ok( hr == E_INVALIDARG, "ret %08x\n", hr); + + node = (void*)0xdeadbeef; + hr = IXMLDOMNamedNodeMap_getQualifiedItem(map, NULL, NULL, &node); + ok( hr == E_INVALIDARG, "ret %08x\n", hr); + ok( node == (void*)0xdeadbeef, "got %p\n", node); + + hr = IXMLDOMNamedNodeMap_getQualifiedItem(map, _bstr_("id"), NULL, NULL); + ok( hr == E_INVALIDARG, "ret %08x\n", hr); + + hr = IXMLDOMNamedNodeMap_getQualifiedItem(map, _bstr_("id"), NULL, &node); + ok( hr == S_OK, "ret %08x\n", hr); + IXMLDOMNode_Release(node); + + IXMLDOMNamedNodeMap_Release( map ); + IXMLDOMElement_Release( element ); + IXMLDOMDocument_Release( doc ); + free_bstrs(); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -5846,6 +5909,7 @@ START_TEST(domdoc) test_put_nodeValue(); test_document_IObjectSafety(); test_splitText(); + test_getQualifiedItem(); CoUninitialize(); }

1 0

Nikolay Sivov : msxml3: Fix invalid parameter handling for IXMLDOMElement:: getElementsByTagName().
by Alexandre Julliard Sept. 3, 2010

Sept. 3, 2010

Module: wine Branch: master Commit: c9b8f5d2ae59345d1c55fce5956b8648c346d296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9b8f5d2ae59345d1c55fce59… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 2 22:49:56 2010 +0400 msxml3: Fix invalid parameter handling for IXMLDOMElement::getElementsByTagName(). --- dlls/msxml3/domdoc.c | 9 ++----- dlls/msxml3/element.c | 51 +++++++++++++++++++++++++------------------ dlls/msxml3/tests/domdoc.c | 35 ++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 27 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 9a50366..98045a0 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1049,9 +1049,8 @@ static HRESULT WINAPI domdoc_get_documentElement( IXMLDOMElement** DOMElement ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - xmlDocPtr xmldoc = NULL; - xmlNodePtr root = NULL; IXMLDOMNode *element_node; + xmlNodePtr root; HRESULT hr; TRACE("(%p)->(%p)\n", This, DOMElement); @@ -1061,16 +1060,14 @@ static HRESULT WINAPI domdoc_get_documentElement( *DOMElement = NULL; - xmldoc = get_doc( This ); - - root = xmlDocGetRootElement( xmldoc ); + root = xmlDocGetRootElement( get_doc(This) ); if ( !root ) return S_FALSE; element_node = create_node( root ); if(!element_node) return S_FALSE; - hr = IXMLDOMNode_QueryInterface(element_node, &IID_IXMLDOMElement, (LPVOID*)DOMElement); + hr = IXMLDOMNode_QueryInterface(element_node, &IID_IXMLDOMElement, (void**)DOMElement); IXMLDOMNode_Release(element_node); return hr; diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 4c4101e..4c557ef 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -669,38 +669,47 @@ static HRESULT WINAPI domelem_removeAttributeNode( static HRESULT WINAPI domelem_getElementsByTagName( IXMLDOMElement *iface, - BSTR bstrName, IXMLDOMNodeList** resultList) + BSTR tagName, IXMLDOMNodeList** resultList) { - static const WCHAR xpathformat[] = - { '.','/','/','*','[','l','o','c','a','l','-','n','a','m','e','(',')','=','\'','%','s','\'',']',0 }; domelem *This = impl_from_IXMLDOMElement( iface ); - LPWSTR szPattern; xmlNodePtr element; HRESULT hr; - TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrName), resultList); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(tagName), resultList); - if (bstrName[0] == '*' && bstrName[1] == 0) + if (!tagName || !resultList) return E_INVALIDARG; + if (!(element = get_element(This))) return E_FAIL; + + if (tagName[0] == '*' && tagName[1] == 0) { - szPattern = heap_alloc(sizeof(WCHAR)*5); - szPattern[0] = '.'; - szPattern[1] = szPattern[2] = '/'; - szPattern[3] = '*'; - szPattern[4] = 0; + static const WCHAR formatallW[] = {'/','/','*',0}; + hr = queryresult_create(element, formatallW, resultList); } else { - szPattern = heap_alloc(sizeof(WCHAR)*(21+lstrlenW(bstrName)+1)); - wsprintfW(szPattern, xpathformat, bstrName); - } - TRACE("%s\n", debugstr_w(szPattern)); + static const WCHAR xpathformat[] = + { '/','/','*','[','l','o','c','a','l','-','n','a','m','e','(',')','=','\'' }; + static const WCHAR closeW[] = { '\'',']',0 }; - element = get_element(This); - if (!element) - hr = E_FAIL; - else - hr = queryresult_create(element, szPattern, resultList); - heap_free(szPattern); + LPWSTR pattern; + WCHAR *ptr; + INT length; + + length = lstrlenW(tagName); + + /* without two WCHARs from format specifier */ + ptr = pattern = heap_alloc(sizeof(xpathformat) + length*sizeof(WCHAR) + sizeof(closeW)); + + memcpy(ptr, xpathformat, sizeof(xpathformat)); + ptr += sizeof(xpathformat)/sizeof(WCHAR); + memcpy(ptr, tagName, length*sizeof(WCHAR)); + ptr += length; + memcpy(ptr, closeW, sizeof(closeW)); + + TRACE("%s\n", debugstr_w(pattern)); + hr = queryresult_create(element, pattern, resultList); + heap_free(pattern); + } return hr; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 7a7f4cd..a9c5c3c 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2271,6 +2271,7 @@ static void test_getElementsByTagName(void) { IXMLDOMNodeList *node_list; IXMLDOMDocument *doc; + IXMLDOMElement *elem; WCHAR buff[100]; VARIANT_BOOL b; HRESULT r; @@ -2346,6 +2347,40 @@ static void test_getElementsByTagName(void) IXMLDOMNodeList_Release( node_list ); SysFreeString( str ); + /* test for element */ + r = IXMLDOMDocument_get_documentElement(doc, &elem); + ok( r == S_OK, "ret %08x\n", r ); + + str = SysAllocString( szstar ); + + /* null arguments cases */ + r = IXMLDOMElement_getElementsByTagName(elem, NULL, &node_list); + ok( r == E_INVALIDARG, "ret %08x\n", r ); + r = IXMLDOMElement_getElementsByTagName(elem, str, NULL); + ok( r == E_INVALIDARG, "ret %08x\n", r ); + + r = IXMLDOMElement_getElementsByTagName(elem, str, &node_list); + ok( r == S_OK, "ret %08x\n", r ); + r = IXMLDOMNodeList_get_length( node_list, &len ); + ok( r == S_OK, "ret %08x\n", r ); + todo_wine ok( len == 5, "len %d\n", len ); + + IXMLDOMNodeList_Release( node_list ); + SysFreeString( str ); + + /* broken query BSTR */ + memcpy(&buff[2], szstar, sizeof(szstar)); + /* just a big length */ + *(DWORD*)buff = 0xf0f0; + r = IXMLDOMElement_getElementsByTagName(elem, &buff[2], &node_list); + ok( r == S_OK, "ret %08x\n", r ); + r = IXMLDOMNodeList_get_length( node_list, &len ); + ok( r == S_OK, "ret %08x\n", r ); + todo_wine ok( len == 5, "len %d\n", len ); + IXMLDOMNodeList_Release( node_list ); + + IXMLDOMElement_Release(elem); + IXMLDOMDocument_Release( doc ); }

1 0

Henri Verbeet : wined3d: Do not preload buffers while under the GL lock in process_vertices_strided ().
by Alexandre Julliard Sept. 3, 2010

Sept. 3, 2010

Module: wine Branch: master Commit: 5a7091b8f7de60878e01fbdf4643ea67b9dc0e65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a7091b8f7de60878e01fbdf4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 2 19:25:01 2010 +0200 wined3d: Do not preload buffers while under the GL lock in process_vertices_strided(). --- dlls/wined3d/device.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 01e3e90..517e873 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3760,6 +3760,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetPixelShaderConstantF( } /* Context activation is done by the caller. */ +/* Do not call while under the GL lock. */ #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) static HRESULT process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCount, const struct wined3d_stream_info *stream_info, struct wined3d_buffer *dest, DWORD dwFlags, @@ -3784,9 +3785,6 @@ static HRESULT process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIn return WINED3DERR_INVALIDCALL; } - /* We might access VBOs from this code, so hold the lock */ - ENTER_GL(); - if (!dest->resource.allocatedMemory) buffer_get_sysmem(dest, gl_info); @@ -4089,22 +4087,27 @@ static HRESULT process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIn } } - if(dest_conv) { + if (dest_conv) + { + ENTER_GL(); + GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, dest->buffer_object)); checkGLcall("glBindBufferARB(GL_ARRAY_BUFFER_ARB)"); GL_EXTCALL(glBufferSubDataARB(GL_ARRAY_BUFFER_ARB, dwDestIndex * get_flexible_vertex_size(DestFVF), dwCount * get_flexible_vertex_size(DestFVF), dest_conv_addr)); checkGLcall("glBufferSubDataARB(GL_ARRAY_BUFFER_ARB)"); + + LEAVE_GL(); + HeapFree(GetProcessHeap(), 0, dest_conv_addr); } - LEAVE_GL(); - return WINED3D_OK; } #undef copy_and_next +/* Do not call while under the GL lock. */ static HRESULT WINAPI IWineD3DDeviceImpl_ProcessVertices(IWineD3DDevice *iface, UINT SrcStartIndex, UINT DestIndex, UINT VertexCount, IWineD3DBuffer *pDestBuffer, IWineD3DVertexDeclaration *pVertexDecl, DWORD Flags, DWORD DestFVF)

1 0

Jerome Leclanche : winedbg: Escape args in a WINE_FIXME.
by Alexandre Julliard Sept. 3, 2010

Sept. 3, 2010

Module: wine Branch: master Commit: fffa4881f6f330dcce915ac013d286a6f5c7ef6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fffa4881f6f330dcce915ac01… Author: Jerome Leclanche <adys.wh(a)gmail.com> Date: Thu Sep 2 20:32:05 2010 +0100 winedbg: Escape args in a WINE_FIXME. --- programs/winedbg/tgt_active.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index c0c12dd..5434624 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -778,7 +778,7 @@ void dbg_run_debuggee(const char* args) { if (args) { - WINE_FIXME("Re-running current program with %s as args is broken\n", args); + WINE_FIXME("Re-running current program with %s as args is broken\n", wine_dbgstr_a(args)); return; } else

1 0