September 2008 - Wine-commits

Alexandre Julliard : winex11: Force the X11 size of zero-sized window to always be 1x1.
by Alexandre Julliard 18 Sep '08

18 Sep '08

Module: wine Branch: master Commit: 308476ef2f74d33126ecc51e0ea8d313b276b6a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=308476ef2f74d33126ecc51e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 17 21:11:47 2008 +0200 winex11: Force the X11 size of zero-sized window to always be 1x1. --- dlls/winex11.drv/window.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index bd370f6..fb64299 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1216,8 +1216,10 @@ static void sync_window_position( Display *display, struct x11drv_win_data *data /* resizing a managed maximized window is not allowed */ if (!(style & WS_MAXIMIZE) || !data->managed) { - if ((changes.width = data->whole_rect.right - data->whole_rect.left) <= 0) changes.width = 1; - if ((changes.height = data->whole_rect.bottom - data->whole_rect.top) <= 0) changes.height = 1; + changes.width = data->whole_rect.right - data->whole_rect.left; + changes.height = data->whole_rect.bottom - data->whole_rect.top; + /* if window rect is empty force size to 1x1 */ + if (changes.width <= 0 || changes.height <= 0) changes.width = changes.height = 1; mask |= CWWidth | CWHeight; }

1 0

Henri Verbeet : wined3d: Make the debug channels more consistent.
by Alexandre Julliard 18 Sep '08

18 Sep '08

Module: wine Branch: master Commit: 9e955d3a2843b0782b474903f6f192fa4cdc9954 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e955d3a2843b0782b474903f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 17 17:51:44 2008 +0200 wined3d: Make the debug channels more consistent. --- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/volume.c | 2 +- dlls/wined3d/volumetexture.c | 2 +- dlls/wined3d/wined3d_main.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 435deab..d84dcbc 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -24,7 +24,7 @@ #include "config.h" #include "wined3d_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3d); +WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); #define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info static const GLenum cube_targets[6] = { diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 5a15512..36f0495 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -23,7 +23,7 @@ #include "config.h" #include "wined3d_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3d); +WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); #define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info static void volume_bind_and_dirtify(IWineD3DVolume *iface) { diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index abaac67..035cf90 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -23,7 +23,7 @@ #include "config.h" #include "wined3d_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3d); +WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); #define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info /* ******************************************* diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index b75fdf3..6ae0e80 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -26,7 +26,7 @@ #include "initguid.h" #include "wined3d_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(wine_d3d); +WINE_DEFAULT_DEBUG_CHANNEL(d3d); int num_lock = 0; void (*wine_tsx11_lock_ptr)(void) = NULL;

1 0

Henri Verbeet : wined3d: Don't needlessly bind the texture in PreLoad().
by Alexandre Julliard 18 Sep '08

18 Sep '08

Module: wine Branch: master Commit: 728932f2eb18d5d3490ddecc7e5e6b480cb9fc17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=728932f2eb18d5d3490ddecc7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 17 17:51:42 2008 +0200 wined3d: Don't needlessly bind the texture in PreLoad(). --- dlls/wined3d/cubetexture.c | 1 - dlls/wined3d/texture.c | 2 -- dlls/wined3d/volumetexture.c | 2 -- 3 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index b823022..435deab 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -123,7 +123,6 @@ static void WINAPI IWineD3DCubeTextureImpl_PreLoad(IWineD3DCubeTexture *iface) { srgb_was_toggled = (This->baseTexture.is_srgb != srgb_mode); This->baseTexture.is_srgb = srgb_mode; } - IWineD3DCubeTexture_BindTexture(iface); if (This->resource.format == WINED3DFMT_P8 || This->resource.format == WINED3DFMT_A8P8) { for (i = 0; i < This->baseTexture.levels; i++) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4a4893e..f138437 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -114,8 +114,6 @@ static void WINAPI IWineD3DTextureImpl_PreLoad(IWineD3DTexture *iface) { This->baseTexture.is_srgb = srgb_mode; } - IWineD3DTexture_BindTexture(iface); - if (This->resource.format == WINED3DFMT_P8 || This->resource.format == WINED3DFMT_A8P8) { for (i = 0; i < This->baseTexture.levels; i++) { if(palette9_changed((IWineD3DSurfaceImpl *)This->surfaces[i])) { diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 2a0356d..abaac67 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -100,8 +100,6 @@ static void WINAPI IWineD3DVolumeTextureImpl_PreLoad(IWineD3DVolumeTexture *ifac TRACE("(%p) : About to load texture\n", This); - IWineD3DVolumeTexture_BindTexture(iface); - if(!device->isInDraw) { ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); } else if (GL_SUPPORT(EXT_TEXTURE_SRGB) && This->baseTexture.bindCount > 0) {

1 0

Henri Verbeet : wined3d: Remove some assumptions that PreLoad() will always bind the texture.
by Alexandre Julliard 18 Sep '08

18 Sep '08

Module: wine Branch: master Commit: 99981f260479cb72a414181bc2e97038fe5eeb42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99981f260479cb72a414181bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 17 14:50:49 2008 +0200 wined3d: Remove some assumptions that PreLoad() will always bind the texture. --- dlls/wined3d/basetexture.c | 2 +- dlls/wined3d/device.c | 1 + dlls/wined3d/state.c | 1 + dlls/wined3d/surface.c | 1 + 4 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 26940f4..ffc01e8 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -389,7 +389,7 @@ void WINAPI IWineD3DBaseTextureImpl_ApplyStateChanges(IWineD3DBaseTexture *iface GLint textureDimensions = IWineD3DBaseTexture_GetTextureDimensions(iface); BOOL cond_np2 = IWineD3DBaseTexture_IsCondNP2(iface); - IWineD3DBaseTexture_PreLoad(iface); + /* ApplyStateChanges relies on the correct texture being bound and loaded. */ if(samplerStates[WINED3DSAMP_ADDRESSU] != This->baseTexture.states[WINED3DTEXSTA_ADDRESSU]) { state = samplerStates[WINED3DSAMP_ADDRESSU]; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9e0cf4f..1c05dc9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5875,6 +5875,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, /* Make sure the surface is loaded and up to date */ IWineD3DSurface_PreLoad(pDestinationSurface); + IWineD3DSurface_BindTexture(pDestinationSurface); IWineD3DSurface_GetGlDesc(pDestinationSurface, &glDescription); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 358ad14..355996b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3487,6 +3487,7 @@ static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCont if(stateblock->textures[sampler]) { IWineD3DBaseTexture_PreLoad(stateblock->textures[sampler]); + IWineD3DBaseTexture_BindTexture(stateblock->textures[sampler]); IWineD3DBaseTexture_ApplyStateChanges(stateblock->textures[sampler], stateblock->textureState[sampler], stateblock->samplerState[sampler]); if (GL_SUPPORT(EXT_TEXTURE_LOD_BIAS)) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 49e5c12..7b522f8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2452,6 +2452,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, const ch } else { /* bind the real texture, and make sure it up to date */ IWineD3DSurface_PreLoad(iface); + surface_bind_and_dirtify(This); } allocatedMemory = HeapAlloc(GetProcessHeap(), 0, width * height * 4); ENTER_GL();

1 0

Henri Verbeet : wined3d: Don' t assume the texture is bound in IWineD3DVolumeImpl_LoadTexture().
by Alexandre Julliard 18 Sep '08

18 Sep '08

Module: wine Branch: master Commit: 17330c03de82b5070c30711152ef458b15a5b564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17330c03de82b5070c3071115… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 17 17:50:40 2008 +0200 wined3d: Don't assume the texture is bound in IWineD3DVolumeImpl_LoadTexture(). --- dlls/wined3d/volume.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 2b8b246..5a15512 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -26,6 +26,44 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info +static void volume_bind_and_dirtify(IWineD3DVolume *iface) { + IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; + IWineD3DVolumeTexture *texture; + int active_sampler; + + /* We don't need a specific texture unit, but after binding the texture the current unit is dirty. + * Read the unit back instead of switching to 0, this avoids messing around with the state manager's + * gl states. The current texture unit should always be a valid one. + * + * To be more specific, this is tricky because we can implicitly be called + * from sampler() in state.c. This means we can't touch anything other than + * whatever happens to be the currently active texture, or we would risk + * marking already applied sampler states dirty again. + * + * TODO: Track the current active texture per GL context instead of using glGet + */ + if (GL_SUPPORT(ARB_MULTITEXTURE)) { + GLint active_texture; + ENTER_GL(); + glGetIntegerv(GL_ACTIVE_TEXTURE, &active_texture); + LEAVE_GL(); + active_sampler = This->resource.wineD3DDevice->rev_tex_unit_map[active_texture - GL_TEXTURE0_ARB]; + } else { + active_sampler = 0; + } + + if (active_sampler != -1) { + IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_SAMPLER(active_sampler)); + } + + if (SUCCEEDED(IWineD3DSurface_GetContainer(iface, &IID_IWineD3DVolumeTexture, (void **)&texture))) { + IWineD3DVolumeTexture_BindTexture(texture); + IWineD3DVolumeTexture_Release(texture); + } else { + ERR("Volume should be part of a volume texture\n"); + } +} + /* ******************************************* IWineD3DVolume IUnknown parts follow ******************************************* */ @@ -277,6 +315,8 @@ static HRESULT WINAPI IWineD3DVolumeImpl_LoadTexture(IWineD3DVolume *iface, int TRACE("(%p) : level %u, format %s (0x%08x)\n", This, gl_level, debug_d3dformat(format), format); + volume_bind_and_dirtify(iface); + TRACE("Calling glTexImage3D %x level=%d, intfmt=%x, w=%d, h=%d,d=%d, 0=%d, glFmt=%x, glType=%x, Mem=%p\n", GL_TEXTURE_3D, gl_level,

1 0

Paul Chitescu : user32: Stub for LockWorkStation.
by Alexandre Julliard 18 Sep '08

18 Sep '08

Module: wine Branch: master Commit: da012ed8e7e3df5ce12b06ce4440a093b333e9fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=da012ed8e7e3df5ce12b06ce4… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Sep 17 18:12:20 2008 +0300 user32: Stub for LockWorkStation. --- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index c9da8ae..f19178d 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -475,7 +475,7 @@ @ stdcall LockSetForegroundWindow (long) @ stub LockWindowStation @ stdcall LockWindowUpdate(long) -@ stub LockWorkStation +@ stdcall LockWorkStation() @ stdcall LookupIconIdFromDirectory(ptr long) @ stdcall LookupIconIdFromDirectoryEx(ptr long long long long) @ stub MBToWCSEx diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 1d9e193..7b7b885 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -391,6 +391,16 @@ BOOL WINAPI ExitWindowsEx( UINT flags, DWORD reason ) } /*********************************************************************** + * LockWorkStation (USER32.@) + */ +BOOL WINAPI LockWorkStation(void) +{ + TRACE(": stub\n"); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/*********************************************************************** * RegisterServicesProcess (USER32.@) */ int WINAPI RegisterServicesProcess(DWORD ServicesProcessId)

1 0

Paul Chitescu : explorer: WM_SYSCOMMAND SC_SCREENSAVE to desktop triggers screen saver.
by Alexandre Julliard 18 Sep '08

18 Sep '08

Module: wine Branch: master Commit: ac865ad9318618d9f93bd18c94643c2beab99003 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac865ad9318618d9f93bd18c9… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Sep 17 18:12:28 2008 +0300 explorer: WM_SYSCOMMAND SC_SCREENSAVE to desktop triggers screen saver. --- programs/explorer/desktop.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 8c6259d..a74c621 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" #include <stdio.h> #include "wine/unicode.h" @@ -34,6 +36,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(explorer); static BOOL using_root; +/* screen saver handler */ +static BOOL start_screensaver( void ) +{ + if (using_root) + { + const char *argv[3] = { "xdg-screensaver", "activate", NULL }; + int pid = spawnvp( _P_NOWAIT, argv[0], argv ); + if (pid > 0) + { + WINE_TRACE( "started process %d\n", pid ); + return TRUE; + } + } + return FALSE; +} + /* window procedure for the desktop window */ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPARAM lp ) { @@ -42,7 +60,14 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR switch(message) { case WM_SYSCOMMAND: - if ((wp & 0xfff0) == SC_CLOSE) ExitWindows( 0, 0 ); + switch(wp & 0xfff0) + { + case SC_CLOSE: + ExitWindows( 0, 0 ); + break; + case SC_SCREENSAVE: + return start_screensaver(); + } return 0; case WM_CLOSE:

1 0

Henri Verbeet : wined3d: Clarify a comment.
by Alexandre Julliard 18 Sep '08

18 Sep '08

Module: wine Branch: master Commit: 53a7951230bdb2f084bf354d74608c144352047c URL: http://source.winehq.org/git/wine.git/?a=commit;h=53a7951230bdb2f084bf354d7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 17 14:50:49 2008 +0200 wined3d: Clarify a comment. --- dlls/wined3d/surface.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5f4aef3..49e5c12 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -46,6 +46,11 @@ static void surface_bind_and_dirtify(IWineD3DSurfaceImpl *This) { * Read the unit back instead of switching to 0, this avoids messing around with the state manager's * gl states. The current texture unit should always be a valid one. * + * To be more specific, this is tricky because we can implicitly be called + * from sampler() in state.c. This means we can't touch anything other than + * whatever happens to be the currently active texture, or we would risk + * marking already applied sampler states dirty again. + * * TODO: Track the current active texture per GL context instead of using glGet */ if (GL_SUPPORT(ARB_MULTITEXTURE)) {

1 0

Alexandre Julliard : mstask/tests: Fix test failures on XP.
by Alexandre Julliard 18 Sep '08

18 Sep '08

Module: wine Branch: master Commit: 0e894c3444043b8c7b67f2de9be264b1bd52694c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e894c3444043b8c7b67f2de9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 17 16:23:08 2008 +0200 mstask/tests: Fix test failures on XP. --- dlls/mstask/tests/task.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 88a4fdf..328dd76 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -164,9 +164,13 @@ static void test_SetApplicationName_GetApplicationName(void) ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); if (hres == S_OK) { - full_name = path_resolve_name(notepad); - ok(!lstrcmpiW(stored_name, full_name), "Got %s, expected %s\n", - dbgstr_w(stored_name), dbgstr_w(full_name)); + full_name = path_resolve_name(notepad_exe); /* XP SP1 appends .exe */ + if (lstrcmpiW(stored_name, full_name) != 0) + { + full_name = path_resolve_name(notepad); + ok(!lstrcmpiW(stored_name, full_name), "Got %s, expected %s\n", + dbgstr_w(stored_name), dbgstr_w(full_name)); + } CoTaskMemFree(stored_name); } @@ -467,7 +471,8 @@ static void test_SetAccountInformation_GetAccountInformation(void) "Failed setting dummy account with no password: %08x\n", hres); hres = ITask_GetAccountInformation(test_task, &account_name); ok(hres == S_OK || - broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)), + broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || + hres == SCHED_E_CANNOT_OPEN_TASK), "GetAccountInformation failed: %08x\n", hres); if (hres == S_OK) { @@ -485,7 +490,8 @@ static void test_SetAccountInformation_GetAccountInformation(void) "Failed setting dummy account with password: %08x\n", hres); hres = ITask_GetAccountInformation(test_task, &account_name); ok(hres == S_OK || - broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)), + broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || + hres == SCHED_E_CANNOT_OPEN_TASK), "GetAccountInformation failed: %08x\n", hres); if (hres == S_OK) { @@ -500,7 +506,8 @@ static void test_SetAccountInformation_GetAccountInformation(void) ok(hres == S_OK, "Failed setting system account: %08x\n", hres); hres = ITask_GetAccountInformation(test_task, &account_name); ok(hres == S_OK || - broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)), + broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || + hres == SCHED_E_CANNOT_OPEN_TASK), "GetAccountInformation failed: %08x\n", hres); if (hres == S_OK) {

1 0

Alexandre Julliard : shlwapi/tests: SHLWAPI. 23 apparently returns an HRESULT on Vista.
by Alexandre Julliard 18 Sep '08

18 Sep '08

Module: wine Branch: master Commit: a3dd2967cabac273275755d1535e493428c482a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3dd2967cabac273275755d15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 17 16:23:19 2008 +0200 shlwapi/tests: SHLWAPI.23 apparently returns an HRESULT on Vista. --- dlls/shlwapi/tests/clsid.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/tests/clsid.c b/dlls/shlwapi/tests/clsid.c index 917df22..98a8c6d 100644 --- a/dlls/shlwapi/tests/clsid.c +++ b/dlls/shlwapi/tests/clsid.c @@ -107,6 +107,7 @@ static void test_ClassIDs(void) DWORD dwLen; BOOL bRet; int i = 0; + int is_vista = 0; if (!pSHLWAPI_269 || !pSHLWAPI_23) return; @@ -114,7 +115,8 @@ static void test_ClassIDs(void) while (*guids) { dwLen = pSHLWAPI_23(*guids, szBuff, 256); - ok(dwLen == 39, "wrong size for id %d\n", i); + if (!i && dwLen == S_OK) is_vista = 1; /* seems to return an HRESULT on vista */ + ok(dwLen == (is_vista ? S_OK : 39), "wrong size %u for id %d\n", dwLen, i); bRet = pSHLWAPI_269(szBuff, &guid); ok(bRet != FALSE, "created invalid string '%s'\n", szBuff); @@ -128,7 +130,7 @@ static void test_ClassIDs(void) /* Test endianess */ dwLen = pSHLWAPI_23(&IID_Endianess, szBuff, 256); - ok(dwLen == 39, "wrong size for IID_Endianess\n"); + ok(dwLen == (is_vista ? S_OK : 39), "wrong size %u for IID_Endianess\n", dwLen); ok(!strcmp(szBuff, "{01020304-0506-0708-090A-0B0C0D0E0F0A}"), "Endianess Broken, got '%s'\n", szBuff); @@ -136,17 +138,17 @@ static void test_ClassIDs(void) /* test lengths */ szBuff[0] = ':'; dwLen = pSHLWAPI_23(&IID_Endianess, szBuff, 0); - ok(dwLen == 0, "accepted bad length\n"); + ok(dwLen == (is_vista ? E_FAIL : 0), "accepted bad length\n"); ok(szBuff[0] == ':', "wrote to buffer with no length\n"); szBuff[0] = ':'; dwLen = pSHLWAPI_23(&IID_Endianess, szBuff, 38); - ok(dwLen == 0, "accepted bad length\n"); + ok(dwLen == (is_vista ? E_FAIL : 0), "accepted bad length\n"); ok(szBuff[0] == ':', "wrote to buffer with no length\n"); szBuff[0] = ':'; dwLen = pSHLWAPI_23(&IID_Endianess, szBuff, 39); - ok(dwLen == 39, "rejected ok length\n"); + ok(dwLen == (is_vista ? S_OK : 39), "rejected ok length\n"); ok(szBuff[0] == '{', "Didn't write to buffer with ok length\n"); /* Test string */ @@ -155,7 +157,7 @@ static void test_ClassIDs(void) ok(bRet == FALSE, "accepted invalid string\n"); dwLen = pSHLWAPI_23(&IID_Endianess, szBuff, 39); - ok(dwLen == 39, "rejected ok length\n"); + ok(dwLen == (is_vista ? S_OK : 39), "rejected ok length\n"); ok(szBuff[0] == '{', "Didn't write to buffer with ok length\n"); }

1 0