July 2010 - Wine-Commits - list.winehq.org

Piotr Caban : atl: Improved AtlInternalQueryInterface implementation.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: 1dc86ebb9b4aca5aa8c9de6e12a940c872792574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dc86ebb9b4aca5aa8c9de6e1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 22 18:37:12 2010 +0200 atl: Improved AtlInternalQueryInterface implementation. --- dlls/atl/atl_main.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 7780b41..88795c9 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -259,7 +259,7 @@ HRESULT WINAPI AtlInternalQueryInterface(void* this, const _ATL_INTMAP_ENTRY* pE TRACE("Trying entry %i (%s %i %p)\n",i,debugstr_guid(pEntries[i].piid), pEntries[i].dw, pEntries[i].pFunc); - if (pEntries[i].piid && IsEqualGUID(iid,pEntries[i].piid)) + if (!pEntries[i].piid || IsEqualGUID(iid,pEntries[i].piid)) { TRACE("MATCH\n"); if (pEntries[i].pFunc == (_ATL_CREATORARGFUNC*)1) @@ -267,14 +267,15 @@ HRESULT WINAPI AtlInternalQueryInterface(void* this, const _ATL_INTMAP_ENTRY* pE TRACE("Offset\n"); *ppvObject = ((LPSTR)this+pEntries[i].dw); IUnknown_AddRef((IUnknown*)*ppvObject); - rc = S_OK; + return S_OK; } else { TRACE("Function\n"); rc = pEntries[i].pFunc(this, iid, ppvObject, pEntries[i].dw); + if(rc==S_OK || pEntries[i].piid) + return rc; } - break; } i++; }

1 0

André Hentschel : krnl386.exe16: Add an error code.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: 4291823ff2ce693b87353a629bb4f52e44b35be6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4291823ff2ce693b87353a629… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jul 22 19:08:02 2010 +0200 krnl386.exe16: Add an error code. --- dlls/krnl386.exe16/int21.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index 4f7ae02..39e195a 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -3587,6 +3587,8 @@ static void INT21_GetExtendedError( CONTEXT86 *context ) locus = EL_Disk; break; case ERROR_FILE_NOT_FOUND: + case ERROR_PATH_NOT_FOUND: + case ERROR_INVALID_NAME: class = EC_NotFound; action = SA_Abort; locus = EL_Disk; @@ -3626,11 +3628,6 @@ static void INT21_GetExtendedError( CONTEXT86 *context ) action = SA_Abort; locus = EL_Memory; break; - case ERROR_PATH_NOT_FOUND: - class = EC_NotFound; - action = SA_Abort; - locus = EL_Disk; - break; case ERROR_SEEK: class = EC_NotFound; action = SA_Ignore;

1 0

Vincent Povirk : wineboot: Query windows from all desktops when --end-session --kill is used.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: 4f30ff875bfc556a2a69bf45218129cd196e5105 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f30ff875bfc556a2a69bf452… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 18 13:36:36 2010 -0500 wineboot: Query windows from all desktops when --end-session --kill is used. --- programs/wineboot/shutdown.c | 39 +++++++++++++++++++++++++++++++++++++++ programs/wineboot/wineboot.c | 7 ++++++- 2 files changed, 45 insertions(+), 1 deletions(-) diff --git a/programs/wineboot/shutdown.c b/programs/wineboot/shutdown.c index ed80bf0..cebe16b 100644 --- a/programs/wineboot/shutdown.c +++ b/programs/wineboot/shutdown.c @@ -322,6 +322,45 @@ BOOL shutdown_close_windows( BOOL force ) return (result != 0); } +static BOOL CALLBACK shutdown_one_desktop( LPWSTR name, LPARAM force ) +{ + HDESK hdesk; + + WINE_TRACE("Shutting down desktop %s\n", wine_dbgstr_w(name)); + + hdesk = OpenDesktopW( name, 0, FALSE, GENERIC_ALL ); + if (hdesk == NULL) + { + WINE_ERR("Cannot open desktop %s, err=%i\n", wine_dbgstr_w(name), GetLastError()); + return 0; + } + + if (!SetThreadDesktop( hdesk )) + { + CloseDesktop( hdesk ); + WINE_ERR("Cannot set thread desktop %s, err=%i\n", wine_dbgstr_w(name), GetLastError()); + return 0; + } + + CloseDesktop( hdesk ); + + return shutdown_close_windows( force ); +} + +BOOL shutdown_all_desktops( BOOL force ) +{ + BOOL ret; + HDESK prev_desktop; + + prev_desktop = GetThreadDesktop(GetCurrentThreadId()); + + ret = EnumDesktopsW( NULL, shutdown_one_desktop, (LPARAM)force ); + + SetThreadDesktop(prev_desktop); + + return ret; +} + /* forcibly kill all processes without any cleanup */ void kill_processes( BOOL kill_desktop ) { diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 32ac3ac..02d3746 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -88,6 +88,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wineboot); #define MAX_LINE_LENGTH (2*MAX_PATH+2) extern BOOL shutdown_close_windows( BOOL force ); +extern BOOL shutdown_all_desktops( BOOL force ); extern void kill_processes( BOOL kill_desktop ); static WCHAR windowsdir[MAX_PATH]; @@ -1142,7 +1143,11 @@ int main( int argc, char *argv[] ) if (end_session) { - if (!shutdown_close_windows( force )) return 1; + if (kill) + { + if (!shutdown_all_desktops( force )) return 1; + } + else if (!shutdown_close_windows( force )) return 1; } if (kill) kill_processes( shutdown );

1 0

Frédéric Delanoy : Update French homepage translation
by Jeremy Newman July 23, 2010

July 23, 2010

Module: website Branch: master Commit: 9a7318f299f6c600a8e88274d9e4fb9503854df6 URL: http://source.winehq.org/git/website.git/?a=commit;h=9a7318f299f6c600a8e882… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 23 11:19:05 2010 +0200 Update French homepage translation >From 1185affa1222e87e551db3421a69e2762449487d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delanoy?= <frederic.delanoy(a)gmail.com> Date: Fri, 23 Jul 2010 11:17:13 +0200 Subject: Update French homepage translation --- templates/fr/home.template | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/fr/home.template b/templates/fr/home.template index 1688032..2765775 100644 --- a/templates/fr/home.template +++ b/templates/fr/home.template @@ -12,8 +12,8 @@ <div class="info" onClick="document.location='{$root}/about/';"> <div class="icon"></div> <div class="text"> - <div class="title"><a href="{$root}/about/">Informations</a></div> - <div class="subtitle">Aperçu des fonctionnalités de Wine.</div> + <div class="title"><a href="{$root}/about/">À propos</a></div> + <div class="subtitle">Apprenez-en plus sur le projet Wine.</div> </div> </div> @@ -21,15 +21,15 @@ <div class="icon"></div> <div class="text"> <div class="title"><a href="{$root}/download/">Téléchargement</a></div> - <div class="subtitle">Recevez Wine maintenant !</div> + <div class="subtitle">Installez la dernière version de Wine.</div> </div> </div> <div class="help" onClick="document.location='{$root}/help/';"> <div class="icon"></div> <div class="text"> - <div class="title"><a href="{$root}/help/">Aide</a></div> - <div class="subtitle">Documentation, support et Wiki.</div> + <div class="title"><a href="{$root}/help/">Support</a></div> + <div class="subtitle">Obtenez de l'aide sur Wine.</div> </div> </div> @@ -37,7 +37,7 @@ <div class="icon"></div> <div class="text"> <div class="title"><a href="{$root}/devel/">Développement</a></div> - <div class="subtitle">Sources de Wine, suivi des anomalies, etc.</div> + <div class="subtitle">Devenez un développeur Wine.</div> </div> </div> @@ -50,7 +50,7 @@ <div class="icon"></div> <div class="text"> <div class="title"><a href="javascript:document.donateForm.submit();">Dons</a></div> - <div class="subtitle">Faire un don à Wine.</div> + <div class="subtitle">Faites un don au projet Wine.</div> </div> </div>

1 0

Alexandre Julliard : include: Make sure wine/port. h and msvcrt headers are not used together.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: 8f1ea6eeb1bbe95733d57e05f1b3da8c1a715408 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f1ea6eeb1bbe95733d57e05f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 22 17:40:55 2010 +0200 include: Make sure wine/port.h and msvcrt headers are not used together. --- include/msvcrt/crtdefs.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/msvcrt/crtdefs.h b/include/msvcrt/crtdefs.h index 1f51937..0e43dd5 100644 --- a/include/msvcrt/crtdefs.h +++ b/include/msvcrt/crtdefs.h @@ -22,6 +22,10 @@ #define __WINE_USE_MSVCRT #endif +#ifdef __WINE_WINE_PORT_H +# error You cannot use both wine/port.h and msvcrt headers +#endif + #if defined(__x86_64__) && !defined(_WIN64) #define _WIN64 #endif

1 0

Owen Rudge : d3dx9/tests: Add beginning of general tests for texture functions.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: 79690ab1ea6fa73d86bf44753ecacced042f4af1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79690ab1ea6fa73d86bf44753… Author: Owen Rudge <owen(a)owenrudge.net> Date: Wed Jul 21 15:06:09 2010 +0100 d3dx9/tests: Add beginning of general tests for texture functions. --- dlls/d3dx9_36/tests/Makefile.in | 3 +- dlls/d3dx9_36/tests/texture.c | 81 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/Makefile.in b/dlls/d3dx9_36/tests/Makefile.in index 02f48c1..4a7aa28 100644 --- a/dlls/d3dx9_36/tests/Makefile.in +++ b/dlls/d3dx9_36/tests/Makefile.in @@ -13,7 +13,8 @@ C_SRCS = \ math.c \ mesh.c \ shader.c \ - surface.c + surface.c \ + texture.c RC_SRCS = rsrc.rc diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c new file mode 100644 index 0000000..de7ccf4 --- /dev/null +++ b/dlls/d3dx9_36/tests/texture.c @@ -0,0 +1,81 @@ +/* + * Tests for the D3DX9 texture functions + * + * Copyright 2009 Tony Wasserka + * Copyright 2010 Owen Rudge for CodeWeavers + * + * 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 "wine/test.h" +#include "d3dx9tex.h" + +static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) +{ + HRESULT hr; + + todo_wine { + + /* general tests */ + hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + + hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, D3DX_DEFAULT, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + + hr = D3DXCheckTextureRequirements(NULL, NULL, NULL, NULL, D3DX_DEFAULT, NULL, D3DPOOL_DEFAULT); + ok(hr == D3DERR_INVALIDCALL, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + } /* todo_wine */ +} + +START_TEST(texture) +{ + HWND wnd; + IDirect3D9 *d3d; + IDirect3DDevice9 *device; + D3DPRESENT_PARAMETERS d3dpp; + HRESULT hr; + + wnd = CreateWindow("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL); + if (!wnd) { + skip("Couldn't create application window\n"); + return; + } + d3d = Direct3DCreate9(D3D_SDK_VERSION); + if (!d3d) { + skip("Couldn't create IDirect3D9 object\n"); + DestroyWindow(wnd); + return; + } + + ZeroMemory(&d3dpp, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + if (FAILED(hr)) { + skip("Failed to create IDirect3DDevice9 object %#x\n", hr); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); + return; + } + + test_D3DXCheckTextureRequirements(device); + + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); +}

1 0

Piotr Caban : msvcp90: Added allocator<char> implementation.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: e79af2f0d9c9e8db1551e1155ab74a9b774e10e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e79af2f0d9c9e8db1551e1155… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 22 09:40:19 2010 +0200 msvcp90: Added allocator<char> implementation. --- dlls/msvcp90/Makefile.in | 1 + dlls/msvcp90/memory.c | 107 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 21 ++++++++ dlls/msvcp90/msvcp90.spec | 22 ++++---- dlls/msvcp90/msvcp90_main.c | 19 ++++++++ 5 files changed, 159 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e79af2f0d9c9e8db1551e…

1 0

Alexandre Julliard : msvcrt: Use the appropriate mangled names for operator new/delete on 64-bit.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: c27aa289b7e51ee98f6a3cfca485e784c5ef9071 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c27aa289b7e51ee98f6a3cfca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 22 16:55:35 2010 +0200 msvcrt: Use the appropriate mangled names for operator new/delete on 64-bit. --- dlls/crtdll/crtdll.spec | 6 ++++-- dlls/msvcr100/msvcr100.spec | 18 ++++++++++++------ dlls/msvcr70/msvcr70.spec | 12 ++++++++---- dlls/msvcr71/msvcr71.spec | 12 ++++++++---- dlls/msvcr80/msvcr80.spec | 18 ++++++++++++------ dlls/msvcr90/msvcr90.spec | 18 ++++++++++++------ dlls/msvcrt/msvcrt.spec | 18 ++++++++++++------ dlls/msvcrt/tests/cpp.c | 14 +++++++++++--- dlls/msvcrt20/msvcrt20.spec | 6 ++++-- dlls/msvcrt40/msvcrt40.spec | 6 ++++-- dlls/msvcrtd/msvcrtd.spec | 9 ++++++--- dlls/msvcrtd/tests/debug.c | 8 ++++++-- 12 files changed, 99 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c27aa289b7e51ee98f6a3…

1 0

Huw Davies : ole32/tests: Relax the reference counting tests a bit. We only care whether references are held or not.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: a2e1dd29dcbc98ee1d6417af10b84a9768f4c653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2e1dd29dcbc98ee1d6417af1… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 22 12:16:17 2010 +0100 ole32/tests: Relax the reference counting tests a bit. We only care whether references are held or not. --- dlls/ole32/tests/dragdrop.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index 55a5167..18674dd 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -31,8 +31,7 @@ #include "wine/test.h" -static int droptarget_addref_called; -static int droptarget_release_called; +static int droptarget_refs; /* helper macros to make tests a bit leaner */ #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) @@ -54,14 +53,14 @@ static HRESULT WINAPI DropTarget_QueryInterface(IDropTarget* iface, REFIID riid, static ULONG WINAPI DropTarget_AddRef(IDropTarget* iface) { - droptarget_addref_called++; - return 2; + droptarget_refs++; + return droptarget_refs; } static ULONG WINAPI DropTarget_Release(IDropTarget* iface) { - droptarget_release_called++; - return 1; + droptarget_refs--; + return droptarget_refs; } static HRESULT WINAPI DropTarget_DragEnter(IDropTarget* iface, @@ -314,10 +313,10 @@ static void test_Register_Revoke(void) hr = RegisterDragDrop((HWND)0xdeadbeef, &DropTarget); ok(hr == DRAGDROP_E_INVALIDHWND, "RegisterDragDrop with garbage hwnd should return DRAGDROP_E_INVALIDHWND instead of 0x%08x\n", hr); - ok(droptarget_addref_called == 0, "DropTarget_AddRef shouldn't have been called\n"); + ok(droptarget_refs == 0, "DropTarget refs should be zero not %d\n", droptarget_refs); hr = RegisterDragDrop(hwnd, &DropTarget); ok_ole_success(hr, "RegisterDragDrop"); - ok(droptarget_addref_called == 1, "DropTarget_AddRef should have been called once, not %d times\n", droptarget_addref_called); + ok(droptarget_refs >= 1, "DropTarget refs should be at least one\n"); prop = GetPropA(hwnd, "OleDropTargetInterface"); ok(prop == &DropTarget, "expected IDropTarget pointer %p, got %p\n", &DropTarget, prop); @@ -325,15 +324,15 @@ static void test_Register_Revoke(void) hr = RegisterDragDrop(hwnd, &DropTarget); ok(hr == DRAGDROP_E_ALREADYREGISTERED, "RegisterDragDrop with already registered hwnd should return DRAGDROP_E_ALREADYREGISTERED instead of 0x%08x\n", hr); - ok(droptarget_release_called == 0, "DropTarget_Release shouldn't have been called\n"); + ok(droptarget_refs >= 1, "DropTarget refs should be at least one\n"); OleUninitialize(); - ok(droptarget_release_called == 0, "DropTarget_Release shouldn't have been called\n"); + ok(droptarget_refs >= 1, "DropTarget refs should be at least one\n"); hr = RevokeDragDrop(hwnd); ok_ole_success(hr, "RevokeDragDrop"); - ok(droptarget_release_called == 1 || - broken(droptarget_release_called == 0), /* NT4 */ - "DropTarget_Release should have been called once, not %d times\n", droptarget_release_called); + ok(droptarget_refs == 0 || + broken(droptarget_refs == 1), /* NT4 */ + "DropTarget refs should be zero not %d\n", droptarget_refs); hr = RevokeDragDrop(NULL); ok(hr == DRAGDROP_E_INVALIDHWND, "RevokeDragDrop with NULL hwnd should return DRAGDROP_E_INVALIDHWND instead of 0x%08x\n", hr);

1 0

Paul Vriens : shlwapi/tests: Load shell32 explicitly.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: eaa6376e64f1de887153b9d23ac3bdd922763cfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa6376e64f1de887153b9d23… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 22 15:13:06 2010 +0200 shlwapi/tests: Load shell32 explicitly. --- dlls/shlwapi/tests/Makefile.in | 2 +- dlls/shlwapi/tests/ordinal.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/Makefile.in b/dlls/shlwapi/tests/Makefile.in index a810f84..e3f9b94 100644 --- a/dlls/shlwapi/tests/Makefile.in +++ b/dlls/shlwapi/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = shlwapi.dll -IMPORTS = shell32 shlwapi user32 ole32 oleaut32 advapi32 +IMPORTS = shlwapi user32 ole32 oleaut32 advapi32 C_SRCS = \ assoc.c \ diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 88165ef..d60effd 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -64,6 +64,9 @@ static BOOL (WINAPI *pSHSetIniStringW)(LPCWSTR, LPCWSTR, LPCWSTR, LPCWSTR); static HMODULE hmlang; static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT); +static HMODULE hshell32; +static HRESULT (WINAPI *pSHGetDesktopFolder)(IShellFolder**); + static const CHAR ie_international[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -2514,7 +2517,7 @@ static void test_SHIShellFolder_EnumObjects(void) ok(enm == (IEnumIDList*)0xcafebabe, "Didn't get expected enumerator location, instead: %p\n", enm); /* SHIShellFolder_EnumObjects isn't strict about the IShellFolder object */ - hres = SHGetDesktopFolder(&folder); + hres = pSHGetDesktopFolder(&folder); ok(hres == S_OK, "SHGetDesktopFolder failed: 0x%08x\n", hres); enm = NULL; @@ -2696,6 +2699,9 @@ START_TEST(ordinal) hmlang = LoadLibraryA("mlang.dll"); pLcidToRfc1766A = (void *)GetProcAddress(hmlang, "LcidToRfc1766A"); + hshell32 = LoadLibraryA("shell32.dll"); + pSHGetDesktopFolder = (void *)GetProcAddress(hshell32, "SHGetDesktopFolder"); + test_GetAcceptLanguagesA(); test_SHSearchMapInt(); test_alloc_shared(); @@ -2714,4 +2720,7 @@ START_TEST(ordinal) test_SHIShellFolder_EnumObjects(); test_SHGetIniString(); test_SHSetIniString(); + + FreeLibrary(hshell32); + FreeLibrary(hmlang); }

1 0