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

Nikolay Sivov : shell32: Add IPersist support for desktop IShellFolder.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: 53ae4e2ba06ae30e3b4fd90cfc44a0a44c418703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53ae4e2ba06ae30e3b4fd90cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 21 18:44:44 2010 +0300 shell32: Add IPersist support for desktop IShellFolder. --- dlls/shell32/shfldr_desktop.c | 49 +++++++++++++++++++++++++++++++++++++++- dlls/shell32/tests/shlfolder.c | 31 +++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index d6ccb72..e744fd3 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -65,6 +65,7 @@ extern HRESULT WINAPI IEParseDisplayNameWithBCW(DWORD codepage, LPCWSTR lpszDisp typedef struct { const IShellFolder2Vtbl *lpVtbl; + const IPersistVtbl *lpVtblIPersist; LONG ref; /* both paths are parsible from the desktop */ @@ -78,6 +79,11 @@ typedef struct { #define _IUnknown_(This) (IShellFolder*)&(This->lpVtbl) #define _IShellFolder_(This) (IShellFolder*)&(This->lpVtbl) +static inline IGenericSFImpl *impl_from_IPersist( IPersist *iface ) +{ + return (IGenericSFImpl *)((char*)iface - FIELD_OFFSET(IGenericSFImpl, lpVtblIPersist)); +} + static const shvheader DesktopSFHeader[] = { {IDS_SHV_COLUMN1, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, {IDS_SHV_COLUMN2, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}, @@ -91,7 +97,7 @@ static const shvheader DesktopSFHeader[] = { /************************************************************************** * ISF_Desktop_fnQueryInterface * - * NOTES supports not IPersist/IPersistFolder + * NOTES supports not IPersistFolder */ static HRESULT WINAPI ISF_Desktop_fnQueryInterface( IShellFolder2 * iface, REFIID riid, LPVOID * ppvObj) @@ -108,6 +114,10 @@ static HRESULT WINAPI ISF_Desktop_fnQueryInterface( { *ppvObj = This; } + else if (IsEqualIID (riid, &IID_IPersist)) + { + *ppvObj = &This->lpVtblIPersist; + } if (*ppvObj) { @@ -862,6 +872,42 @@ static const IShellFolder2Vtbl vt_MCFldr_ShellFolder2 = }; /************************************************************************** + * IPersist + */ +static HRESULT WINAPI ISF_Desktop_IPersist_fnQueryInterface( + IPersist *iface, REFIID riid, LPVOID *ppvObj) +{ + IGenericSFImpl *This = impl_from_IPersist( iface ); + return IShellFolder2_QueryInterface((IShellFolder2*)This, riid, ppvObj); +} + +static ULONG WINAPI ISF_Desktop_IPersist_fnAddRef(IPersist *iface) +{ + IGenericSFImpl *This = impl_from_IPersist( iface ); + return IShellFolder2_AddRef((IShellFolder2*)This); +} + +static ULONG WINAPI ISF_Desktop_IPersist_fnRelease(IPersist *iface) +{ + IGenericSFImpl *This = impl_from_IPersist( iface ); + return IShellFolder2_Release((IShellFolder2*)This); +} + +static HRESULT WINAPI ISF_Desktop_IPersist_fnGetClassID(IPersist *iface, CLSID *clsid) +{ + *clsid = CLSID_ShellDesktop; + return S_OK; +} + +static const IPersistVtbl vt_IPersist = +{ + ISF_Desktop_IPersist_fnQueryInterface, + ISF_Desktop_IPersist_fnAddRef, + ISF_Desktop_IPersist_fnRelease, + ISF_Desktop_IPersist_fnGetClassID +}; + +/************************************************************************** * ISF_Desktop_Constructor */ HRESULT WINAPI ISF_Desktop_Constructor ( @@ -890,6 +936,7 @@ HRESULT WINAPI ISF_Desktop_Constructor ( sf->ref = 1; sf->lpVtbl = &vt_MCFldr_ShellFolder2; + sf->lpVtblIPersist = &vt_IPersist; sf->pidlRoot = _ILCreateDesktop(); /* my qualified pidl */ sf->sPathTarget = SHAlloc( (lstrlenW(szMyPath) + 1)*sizeof(WCHAR) ); lstrcpyW( sf->sPathTarget, szMyPath ); diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index bce7c3e..560033b 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -2044,6 +2044,36 @@ if (0) IShellFolder_Release(desktop); } +static void test_desktop_IPersist(void) +{ + IShellFolder *desktop; + IPersist *persist; + CLSID clsid; + HRESULT hr; + + hr = SHGetDesktopFolder(&desktop); + ok(hr == S_OK, "failed %08x\n", hr); + + hr = IShellFolder_QueryInterface(desktop, &IID_IPersist, (void**)&persist); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* NT4, W9X */, "failed %08x\n", hr); + + if (hr == S_OK) + { + if (0) + { + /* crashes on native */ + hr = IPersist_GetClassID(persist, NULL); + } + memset(&clsid, 0, sizeof(clsid)); + hr = IPersist_GetClassID(persist, &clsid); + ok(hr == S_OK, "failed %08x\n", hr); + ok(IsEqualIID(&CLSID_ShellDesktop, &clsid), "Expected CLSID_ShellDesktop\n"); + IPersist_Release(persist); + } + + IShellFolder_Release(desktop); +} + START_TEST(shlfolder) { init_function_pointers(); @@ -2064,6 +2094,7 @@ START_TEST(shlfolder) test_SHGetFolderPathAndSubDirA(); test_LocalizedNames(); test_SHCreateShellItem(); + test_desktop_IPersist(); OleUninitialize(); }

1 0

Nikolay Sivov : shell32: Remove a useless debug switch, fix prototype.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: 9e80570a3bde8db80412579279b6c27aabb0316a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e80570a3bde8db8041257927… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 21 20:08:33 2010 +0300 shell32: Remove a useless debug switch, fix prototype. --- dlls/shell32/dialogs.c | 2 +- dlls/shell32/shell32_main.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index 0d8dbac..fb43390 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -60,7 +60,7 @@ static void FillList (HWND, char *, BOOL) ; * PickIconDlg [SHELL32.62] * */ -BOOL WINAPI PickIconDlg( +INT WINAPI PickIconDlg( HWND hwndOwner, LPSTR lpstrFile, DWORD nMaxFile, diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index db63e16..dc71022 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -52,7 +52,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); extern const char * const SHELL_Authors[]; -#define MORE_DEBUG 1 /************************************************************************* * CommandLineToArgvW [SHELL32.@] * @@ -607,7 +606,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, GetSystemMetrics( SM_CXICON), GetSystemMetrics( SM_CYICON), &psfi->hIcon, 0, 1, 0); - if (ret != 0 && ret != 0xFFFFFFFF) + if (ret != 0 && ret != (UINT)-1) { IconNotYetLoaded=FALSE; psfi->iIcon = icon_idx; @@ -653,11 +652,9 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, SHFree(pidlLast); -#ifdef MORE_DEBUG TRACE ("icon=%p index=0x%08x attr=0x%08x name=%s type=%s ret=0x%08lx\n", psfi->hIcon, psfi->iIcon, psfi->dwAttributes, debugstr_w(psfi->szDisplayName), debugstr_w(psfi->szTypeName), ret); -#endif return ret; } @@ -777,17 +774,17 @@ HICON WINAPI ExtractIconW(HINSTANCE hInstance, LPCWSTR lpszFile, UINT nIconIndex TRACE("%p %s %d\n", hInstance, debugstr_w(lpszFile), nIconIndex); - if (nIconIndex == 0xFFFFFFFF) + if (nIconIndex == (UINT)-1) { ret = PrivateExtractIconsW(lpszFile, 0, cx, cy, NULL, NULL, 0, LR_DEFAULTCOLOR); - if (ret != 0xFFFFFFFF && ret) + if (ret != (UINT)-1 && ret) return (HICON)(UINT_PTR)ret; return NULL; } else ret = PrivateExtractIconsW(lpszFile, nIconIndex, cx, cy, &hIcon, NULL, 1, LR_DEFAULTCOLOR); - if (ret == 0xFFFFFFFF) + if (ret == (UINT)-1) return (HICON)1; else if (ret > 0 && hIcon) return hIcon;

1 0

Nikolay Sivov : shell32: Some debug tracing improvements.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: 0f794f9510c039b4363b679ef4e85c03dad639ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f794f9510c039b4363b679ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 21 04:42:59 2010 +0300 shell32: Some debug tracing improvements. --- dlls/shell32/classes.c | 2 +- dlls/shell32/debughlp.c | 21 +++++++++------------ dlls/shell32/shellole.c | 10 ++++++---- dlls/shell32/shlfolder.c | 17 +++++++++-------- dlls/shell32/shlview.c | 12 ++++++------ 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c index 0556f97..9fbdf0e 100644 --- a/dlls/shell32/classes.c +++ b/dlls/shell32/classes.c @@ -386,7 +386,7 @@ BOOL HCR_GetClassNameA(REFIID riid, LPSTR szDest, DWORD len) } } - TRACE("-- %s\n", szDest); + TRACE("-- (%s)\n", szDest); return ret; } diff --git a/dlls/shell32/debughlp.c b/dlls/shell32/debughlp.c index 98d7899..3cab8bb 100644 --- a/dlls/shell32/debughlp.c +++ b/dlls/shell32/debughlp.c @@ -422,16 +422,13 @@ const char * shdebugstr_guid( const struct _GUID *id ) if (!id) return "(null)"; - for (i=0;InterfaceDesc[i].riid && !name;i++) { - if (IsEqualIID(InterfaceDesc[i].riid, id)) name = InterfaceDesc[i].name; - } - if (!name) { - if (HCR_GetClassNameA(id, clsidbuf, 100)) - name = clsidbuf; - } - - return wine_dbg_sprintf( "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x} (%s)", - id->Data1, id->Data2, id->Data3, - id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], - id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7], name ? name : "unknown" ); + for (i = 0; InterfaceDesc[i].riid && !name; i++) { + if (IsEqualIID(InterfaceDesc[i].riid, id)) name = InterfaceDesc[i].name; + } + if (!name) { + if (HCR_GetClassNameA(id, clsidbuf, 100)) + name = clsidbuf; + } + + return wine_dbg_sprintf( "%s (%s)", debugstr_guid(id), name ? name : "unknown" ); } diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 4bb7ee4..8d09d9c 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -330,14 +330,16 @@ void WINAPI SHFree(LPVOID pv) */ HRESULT WINAPI SHGetDesktopFolder(IShellFolder **psf) { - HRESULT hres = S_OK; - TRACE("\n"); + HRESULT hres; + + TRACE("(%p)\n", psf); if(!psf) return E_INVALIDARG; + *psf = NULL; - hres = ISF_Desktop_Constructor(NULL, &IID_IShellFolder,(LPVOID*)psf); + hres = ISF_Desktop_Constructor(NULL, &IID_IShellFolder, (LPVOID*)psf); - TRACE("-- %p->(%p)\n",psf, *psf); + TRACE("-- %p->(%p) 0x%08x\n", psf, *psf, hres); return hres; } /************************************************************************** diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 19ab6e1..894fc56 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -125,9 +125,9 @@ LPCWSTR GetNextElementW (LPCWSTR pszNext, LPWSTR pszOut, DWORD dwOut) LPCWSTR pszTail = pszNext; DWORD dwCopy; - TRACE ("(%s %p 0x%08x)\n", debugstr_w (pszNext), pszOut, dwOut); + TRACE ("(%s %p 0x%08x)\n", debugstr_w(pszNext), pszOut, dwOut); - *pszOut = 0x0000; + *pszOut = 0; if (!pszNext || !*pszNext) return NULL; @@ -150,10 +150,9 @@ LPCWSTR GetNextElementW (LPCWSTR pszNext, LPWSTR pszOut, DWORD dwOut) HRESULT SHELL32_ParseNextElement (IShellFolder2 * psf, HWND hwndOwner, LPBC pbc, LPITEMIDLIST * pidlInOut, LPOLESTR szNext, DWORD * pEaten, DWORD * pdwAttributes) { - HRESULT hr = E_INVALIDARG; - LPITEMIDLIST pidlOut = NULL, - pidlTemp = NULL; + LPITEMIDLIST pidlOut = NULL, pidlTemp = NULL; IShellFolder *psfChild; + HRESULT hr; TRACE ("(%p, %p, %p, %s)\n", psf, pbc, pidlInOut ? *pidlInOut : NULL, debugstr_w (szNext)); @@ -197,7 +196,7 @@ static HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot, { HRESULT hr; - TRACE ("%p %s %p\n", pidlRoot, debugstr_w(pathRoot), pidlChild); + TRACE ("(%p %s %p %s %p)\n", pidlRoot, debugstr_w(pathRoot), pidlChild, debugstr_guid(clsid), ppvOut); hr = SHCoCreateInstance(NULL, clsid, NULL, &IID_IShellFolder, ppvOut); if (SUCCEEDED (hr)) @@ -268,6 +267,8 @@ HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, HRESULT hr; LPITEMIDLIST pidlChild; + TRACE("(%p %s %p %s %p)\n", pidlRoot, debugstr_w(pathRoot), pidlComplete, debugstr_guid(riid), ppvOut); + if (!pidlRoot || !ppvOut || !pidlComplete || !pidlComplete->mkid.cb) return E_INVALIDARG; @@ -312,7 +313,7 @@ HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, IShellFolder_Release (pSF); } - TRACE ("-- returning (%p) %08x\n", *ppvOut, hr); + TRACE ("-- returning (%p) 0x%08x\n", *ppvOut, hr); return hr; } @@ -335,7 +336,7 @@ HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf, LPCITEMIDLIST pidl, DWORD dwFlags, LPWSTR szOut, DWORD dwOutLen) { LPITEMIDLIST pidlFirst; - HRESULT hr = E_INVALIDARG; + HRESULT hr; TRACE ("(%p)->(pidl=%p 0x%08x %p 0x%08x)\n", psf, pidl, dwFlags, szOut, dwOutLen); pdump (pidl); diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index bf8f979..633d767 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -2218,16 +2218,16 @@ static ULONG WINAPI ISVOleCmdTarget_Release( */ static HRESULT WINAPI ISVOleCmdTarget_QueryStatus( IOleCommandTarget *iface, - const GUID* pguidCmdGroup, + const GUID *pguidCmdGroup, ULONG cCmds, - OLECMD * prgCmds, - OLECMDTEXT* pCmdText) + OLECMD *prgCmds, + OLECMDTEXT *pCmdText) { - UINT i; IShellViewImpl *This = impl_from_IOleCommandTarget(iface); + UINT i; - FIXME("(%p)->(%p(%s) 0x%08x %p %p\n", - This, pguidCmdGroup, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, pCmdText); + FIXME("(%p)->(%s %d %p %p)\n", + This, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, pCmdText); if (!prgCmds) return E_POINTER;

1 0

Detlef Riekenberg : msvcr90/tests: Add tests for _initterm_e.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: 73e669c6bcc45148abb43e906468acc3487f371d URL: http://source.winehq.org/git/wine.git/?a=commit;h=73e669c6bcc45148abb43e906… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Mar 20 00:32:17 2010 +0100 msvcr90/tests: Add tests for _initterm_e. --- configure | 1 + configure.ac | 1 + dlls/msvcr90/tests/Makefile.in | 17 ++++ dlls/msvcr90/tests/msvcr90.c | 150 +++++++++++++++++++++++++++++++++++ dlls/msvcr90/tests/msvcr90.manifest | 22 +++++ dlls/msvcr90/tests/msvcr90.rc | 22 +++++ 6 files changed, 213 insertions(+), 0 deletions(-) diff --git a/configure b/configure index bc90577..8cdd421 100755 --- a/configure +++ b/configure @@ -14359,6 +14359,7 @@ wine_fn_config_dll msvcr70 enable_msvcr70 msvcr70 wine_fn_config_dll msvcr71 enable_msvcr71 msvcr71 wine_fn_config_dll msvcr80 enable_msvcr80 msvcr80 wine_fn_config_dll msvcr90 enable_msvcr90 msvcr90 +wine_fn_config_test dlls/msvcr90/tests msvcr90_test wine_fn_config_dll msvcrt enable_msvcrt msvcrt wine_fn_config_test dlls/msvcrt/tests msvcrt_test wine_fn_config_dll msvcrt20 enable_msvcrt20 msvcrt20 diff --git a/configure.ac b/configure.ac index 8a8bba4..bf66934 100644 --- a/configure.ac +++ b/configure.ac @@ -2401,6 +2401,7 @@ WINE_CONFIG_DLL(msvcr70,,[msvcr70]) WINE_CONFIG_DLL(msvcr71,,[msvcr71]) WINE_CONFIG_DLL(msvcr80,,[msvcr80]) WINE_CONFIG_DLL(msvcr90,,[msvcr90]) +WINE_CONFIG_TEST(dlls/msvcr90/tests) WINE_CONFIG_DLL(msvcrt,,[msvcrt]) WINE_CONFIG_TEST(dlls/msvcrt/tests) WINE_CONFIG_DLL(msvcrt20,,[msvcrt20]) diff --git a/dlls/msvcr90/tests/Makefile.in b/dlls/msvcr90/tests/Makefile.in new file mode 100644 index 0000000..39fb4c3 --- /dev/null +++ b/dlls/msvcr90/tests/Makefile.in @@ -0,0 +1,17 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = msvcr90.dll +APPMODE = -mno-cygwin +IMPORTS = kernel32 +MODCFLAGS = @BUILTINFLAG@ +EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt + +C_SRCS = \ + msvcr90.c + +RC_SRCS = \ + msvcr90.rc + +(a)MAKE_TEST_RULES@ diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c new file mode 100644 index 0000000..ddfd781 --- /dev/null +++ b/dlls/msvcr90/tests/msvcr90.c @@ -0,0 +1,150 @@ +/* + * Copyright 2010 Detlef Riekenberg + * + * 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 + */ + +#include <stdarg.h> +#include <stdlib.h> +#include <stdio.h> + +#include <windef.h> +#include <winbase.h> +#include <errno.h> +#include "wine/test.h" + +typedef int (__cdecl *_INITTERM_E_FN)(void); +static int (__cdecl *p_initterm_e)(_INITTERM_E_FN *table, _INITTERM_E_FN *end); +int cb_called[4]; + +/* ########## */ + +static int initterm_cb0(void) +{ + cb_called[0]++; + return 0; +} + +static int initterm_cb1(void) +{ + cb_called[1]++; + return 1; +} + +static int initterm_cb2(void) +{ + cb_called[2]++; + return 2; +} + + +static void test__initterm_e(void) +{ + _INITTERM_E_FN table[4]; + int res; + + if (!p_initterm_e) { + skip("_initterm_e not found\n"); + return; + } + + memset(table, 0, sizeof(table)); + + memset(cb_called, 0, sizeof(cb_called)); + errno = 0xdeadbeef; + res = p_initterm_e(table, table); + ok( !res && !cb_called[0] && !cb_called[1] && !cb_called[2], + "got %d with 0x%x {%d, %d, %d}\n", + res, errno, cb_called[0], cb_called[1], cb_called[2]); + + memset(cb_called, 0, sizeof(cb_called)); + errno = 0xdeadbeef; + res = p_initterm_e(table, NULL); + ok( !res && !cb_called[0] && !cb_called[1] && !cb_called[2], + "got %d with 0x%x {%d, %d, %d}\n", + res, errno, cb_called[0], cb_called[1], cb_called[2]); + + if (0) { + /* this crash on Windows */ + errno = 0xdeadbeef; + res = p_initterm_e(NULL, table); + trace("got %d with 0x%x\n", res, errno); + } + + table[0] = initterm_cb0; + memset(cb_called, 0, sizeof(cb_called)); + errno = 0xdeadbeef; + res = p_initterm_e(table, &table[1]); + ok( !res && (cb_called[0] == 1) && !cb_called[1] && !cb_called[2], + "got %d with 0x%x {%d, %d, %d}\n", + res, errno, cb_called[0], cb_called[1], cb_called[2]); + + + /* init-function returning failure */ + table[1] = initterm_cb1; + memset(cb_called, 0, sizeof(cb_called)); + errno = 0xdeadbeef; + res = p_initterm_e(table, &table[3]); + ok( (res == 1) && (cb_called[0] == 1) && (cb_called[1] == 1) && !cb_called[2], + "got %d with 0x%x {%d, %d, %d}\n", + res, errno, cb_called[0], cb_called[1], cb_called[2]); + + /* init-function not called, when end < start */ + memset(cb_called, 0, sizeof(cb_called)); + errno = 0xdeadbeef; + res = p_initterm_e(&table[3], table); + ok( !res && !cb_called[0] && !cb_called[1] && !cb_called[2], + "got %d with 0x%x {%d, %d, %d}\n", + res, errno, cb_called[0], cb_called[1], cb_called[2]); + + /* initialization stop after first non-zero result */ + table[2] = initterm_cb0; + memset(cb_called, 0, sizeof(cb_called)); + errno = 0xdeadbeef; + res = p_initterm_e(table, &table[3]); + ok( (res == 1) && (cb_called[0] == 1) && (cb_called[1] == 1) && !cb_called[2], + "got %d with 0x%x {%d, %d, %d}\n", + res, errno, cb_called[0], cb_called[1], cb_called[2]); + + /* NULL pointer in the array are skipped */ + table[1] = NULL; + table[2] = initterm_cb2; + memset(cb_called, 0, sizeof(cb_called)); + errno = 0xdeadbeef; + res = p_initterm_e(table, &table[3]); + ok( (res == 2) && (cb_called[0] == 1) && !cb_called[1] && (cb_called[2] == 1), + "got %d with 0x%x {%d, %d, %d}\n", + res, errno, cb_called[0], cb_called[1], cb_called[2]); + +} + +/* ########## */ + +START_TEST(msvcr90) +{ + HMODULE hcrt; + + SetLastError(0xdeadbeef); + hcrt = LoadLibraryA("msvcr90.dll"); + if (!hcrt) { + win_skip("msvcr90.dll not installed (got %d)\n", GetLastError()); + return; + } + + p_initterm_e = (void *) GetProcAddress(hcrt, "_initterm_e"); + + test__initterm_e(); + +} diff --git a/dlls/msvcr90/tests/msvcr90.manifest b/dlls/msvcr90/tests/msvcr90.manifest new file mode 100644 index 0000000..ff7566d --- /dev/null +++ b/dlls/msvcr90/tests/msvcr90.manifest @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + type="win32" + name="Wine.msvcr90.Test" + version="1.0.0.0" + processorArchitecture="*" + /> +<description>Wine msvcr90 test suite</description> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="microsoft.vc90.crt" + version="9.0.20718.0" + processorArchitecture="*" + publicKeyToken="1fc8b3b9a1e18e3b" + language="*" + /> +</dependentAssembly> +</dependency> +</assembly> diff --git a/dlls/msvcr90/tests/msvcr90.rc b/dlls/msvcr90/tests/msvcr90.rc new file mode 100644 index 0000000..056767d --- /dev/null +++ b/dlls/msvcr90/tests/msvcr90.rc @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2010 Detlef Riekenberg + * + * 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 + */ + +#include "winuser.h" + +/* @makedep: msvcr90.manifest */ +1 RT_MANIFEST msvcr90.manifest

1 0

André Hentschel : ntdll: Update error code mapping.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: 877a4e61364a1b9c4cc0f2b21f6bdd2c5a38ef0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=877a4e61364a1b9c4cc0f2b21… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 21 22:42:55 2010 +0100 ntdll: Update error code mapping. --- dlls/ntdll/error.c | 8 ++++---- dlls/ntdll/tests/error.c | 8 +++++--- include/winerror.h | 1 + 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/error.c b/dlls/ntdll/error.c index 6d29329..86b7492 100644 --- a/dlls/ntdll/error.c +++ b/dlls/ntdll/error.c @@ -241,7 +241,7 @@ static const DWORD table_80000001[39] = 0, /* 80000007 (STATUS_WAKE_SYSTEM_DEBUGGER) */ 0, /* 80000008 */ 0, /* 80000009 */ - 0, /* 8000000a (STATUS_HANDLES_CLOSED) */ + ERROR_HANDLES_CLOSED, /* 8000000a (STATUS_HANDLES_CLOSED) */ ERROR_NO_INHERITANCE, /* 8000000b (STATUS_NO_INHERITANCE) */ 0, /* 8000000c (STATUS_GUID_SUBSTITUTION_MADE) */ ERROR_PARTIAL_COPY, /* 8000000d (STATUS_PARTIAL_COPY) */ @@ -834,8 +834,8 @@ static const DWORD table_c0000202[396] = 0, /* c0000227 (STATUS_RECOVERY_FAILURE) */ 0, /* c0000228 (STATUS_STACK_OVERFLOW_READ) */ ERROR_INVALID_PARAMETER, /* c0000229 (STATUS_FAIL_CHECK) */ - STATUS_DUPLICATE_OBJECTID, /* c000022a (STATUS_DUPLICATE_OBJECTID) */ - STATUS_OBJECTID_EXISTS, /* c000022b (STATUS_OBJECTID_EXISTS) */ + ERROR_OBJECT_ALREADY_EXISTS, /* c000022a (STATUS_DUPLICATE_OBJECTID) */ + ERROR_OBJECT_ALREADY_EXISTS, /* c000022b (STATUS_OBJECTID_EXISTS) */ 0, /* c000022c (STATUS_CONVERT_TO_LARGE) */ ERROR_RETRY, /* c000022d (STATUS_RETRY) */ 0, /* c000022e (STATUS_FOUND_OUT_OF_SCOPE) */ @@ -875,7 +875,7 @@ static const DWORD table_c0000202[396] = 0, /* c0000250 (STATUS_INSUFFICIENT_LOGON_INFO) */ 0, /* c0000251 (STATUS_BAD_DLL_ENTRYPOINT) */ 0, /* c0000252 (STATUS_BAD_SERVICE_ENTRYPOINT) */ - ERROR_INTERNAL_ERROR, /* c0000253 (STATUS_LPC_REPLY_LOST) */ + ERROR_CONNECTION_ABORTED, /* c0000253 (STATUS_LPC_REPLY_LOST) */ 0, /* c0000254 (STATUS_IP_ADDRESS_CONFLICT1) */ 0, /* c0000255 (STATUS_IP_ADDRESS_CONFLICT2) */ 0, /* c0000256 (STATUS_REGISTRY_QUOTA_LIMIT) */ diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index 0f52ecb..01c165d 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/ntdll/tests/error.c @@ -33,15 +33,16 @@ #include "winternl.h" /* FIXME!!! this test checks only mappings, defined by MSDN - * It is necessary to add other mappings and to test them up to Windows XP. + * It is necessary to add other mappings and to test them + * up to the latest Windows platform. * * Some Windows platforms don't know about all the mappings, and in such * cases they return somewhat strange results (Win98) or a generic error * like ERROR_MR_MID_NOT_FOUND (NT4). Our tests have to know about these to * not fail, but we would very much prefer Wine not to return such garbage. - * To you can pass the 'strict' option to this test to force it to only check + * So you can pass the 'strict' option to this test to force it to only check * results against the first listed value. This test should pass in strict - * mode on the latest Windows platform (currently XP) and in Wine. + * mode on the latest Windows platform and in Wine. * (of course older Windows platforms will fail to pass the strict mode) */ @@ -167,6 +168,7 @@ static void run_error_tests(void) cmp(STATUS_INTEGER_OVERFLOW, ERROR_ARITHMETIC_OVERFLOW); cmp(STATUS_BUFFER_OVERFLOW, ERROR_MORE_DATA); cmp(STATUS_NO_MORE_FILES, ERROR_NO_MORE_FILES); + cmp2(STATUS_HANDLES_CLOSED, ERROR_HANDLES_CLOSED); cmp(STATUS_NO_INHERITANCE, ERROR_NO_INHERITANCE); cmp(STATUS_NO_MORE_EAS, ERROR_NO_MORE_ITEMS); cmp(STATUS_NO_MORE_ENTRIES, ERROR_NO_MORE_ITEMS); diff --git a/include/winerror.h b/include/winerror.h index 6a56f74..f6c7b0f 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -306,6 +306,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_ARITHMETIC_OVERFLOW 534 #define ERROR_PIPE_CONNECTED 535 #define ERROR_PIPE_LISTENING 536 +#define ERROR_HANDLES_CLOSED 676 #define ERROR_EA_ACCESS_DENIED 994 #define ERROR_OPERATION_ABORTED 995 #define ERROR_IO_INCOMPLETE 996

1 0

André Hentschel : ntdll: Fix error strict mode tests on vista+.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: 8a6d1df8632336add305d51368f16430c5e498a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a6d1df8632336add305d5136… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 21 22:42:43 2010 +0100 ntdll: Fix error strict mode tests on vista+. --- dlls/ntdll/tests/error.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index ee8b9b2..0f52ecb 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/ntdll/tests/error.c @@ -189,7 +189,7 @@ static void run_error_tests(void) cmp(STATUS_HANDLE_NOT_CLOSABLE, ERROR_INVALID_HANDLE); cmp(STATUS_NOT_COMMITTED, ERROR_INVALID_ADDRESS); cmp(STATUS_PARTIAL_COPY, ERROR_PARTIAL_COPY); - cmp3(STATUS_LPC_REPLY_LOST, ERROR_INTERNAL_ERROR, ERROR_CONNECTION_ABORTED); + cmp3(STATUS_LPC_REPLY_LOST, ERROR_CONNECTION_ABORTED, ERROR_INTERNAL_ERROR); cmp(STATUS_INVALID_PARAMETER, ERROR_INVALID_PARAMETER); cmp(STATUS_INVALID_PARAMETER_1, ERROR_INVALID_PARAMETER); cmp(STATUS_INVALID_PARAMETER_2, ERROR_INVALID_PARAMETER); @@ -738,8 +738,8 @@ static void run_error_tests(void) cmp(STATUS_LOGIN_WKSTA_RESTRICTION, ERROR_LOGIN_WKSTA_RESTRICTION); cmp(STATUS_LICENSE_QUOTA_EXCEEDED, ERROR_LICENSE_QUOTA_EXCEEDED); cmp(STATUS_RESOURCE_NOT_OWNED, ERROR_NOT_OWNER); - cmp3(STATUS_DUPLICATE_OBJECTID, STATUS_DUPLICATE_OBJECTID, ERROR_OBJECT_ALREADY_EXISTS); - cmp3(STATUS_OBJECTID_EXISTS, STATUS_OBJECTID_EXISTS, ERROR_OBJECT_ALREADY_EXISTS); + cmp3(STATUS_DUPLICATE_OBJECTID, ERROR_OBJECT_ALREADY_EXISTS, STATUS_DUPLICATE_OBJECTID); + cmp3(STATUS_OBJECTID_EXISTS, ERROR_OBJECT_ALREADY_EXISTS, STATUS_OBJECTID_EXISTS); cmp2(STATUS_OBJECTID_NOT_FOUND, ERROR_FILE_NOT_FOUND); cmp2(STATUS_MFT_TOO_FRAGMENTED, ERROR_DISK_TOO_FRAGMENTED); cmp(SEC_E_INSUFFICIENT_MEMORY, ERROR_NO_SYSTEM_RESOURCES);

1 0

Christian Costa : d3dx9_36: Add stubbed interface for ID3DXEffect.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: 4082920c3a319b64779d746a6a899db30c346fde URL: http://source.winehq.org/git/wine.git/?a=commit;h=4082920c3a319b64779d746a6… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 22 09:27:37 2010 +0100 d3dx9_36: Add stubbed interface for ID3DXEffect. --- dlls/d3dx9_36/effect.c | 850 ++++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/tests/Makefile.in | 1 + dlls/d3dx9_36/tests/effect.c | 86 ++++ 3 files changed, 935 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4082920c3a319b64779d7…

1 0

William Waghorn : dsound: Ensure device name and description buffers are NUL terminated.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: 594de90ccd870d148d4679ebae18f5bca0f07fb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=594de90ccd870d148d4679eba… Author: William Waghorn <willw(a)litany.me.uk> Date: Sat Mar 20 14:37:26 2010 -0700 dsound: Ensure device name and description buffers are NUL terminated. --- dlls/dsound/dsound_main.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index ee1d43b..8e264c7 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -378,8 +378,12 @@ HRESULT WINAPI DirectSoundEnumerateW( debugstr_guid(&DSOUND_renderer_guids[wod]),desc.szDesc,desc.szDrvname,lpContext); MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, wDesc, sizeof(wDesc)/sizeof(WCHAR) ); + wDesc[(sizeof(wDesc)/sizeof(WCHAR)) - 1] = '\0'; + MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, wName, sizeof(wName)/sizeof(WCHAR) ); + wName[(sizeof(wName)/sizeof(WCHAR)) - 1] = '\0'; + if (lpDSEnumCallback(&DSOUND_renderer_guids[wod], wDesc, wName, lpContext) == FALSE) return DS_OK; } @@ -462,6 +466,8 @@ DirectSoundCaptureEnumerateW( wDesc, sizeof(wDesc)/sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, wName, sizeof(wName)/sizeof(WCHAR) ); + wName[(sizeof(wName)/sizeof(WCHAR)) - 1] = '\0'; + if (lpDSEnumCallback(NULL, wDesc, wName, lpContext) == FALSE) return DS_OK; } @@ -477,8 +483,12 @@ DirectSoundCaptureEnumerateW( debugstr_guid(&DSOUND_capture_guids[wid]),desc.szDesc,desc.szDrvname,lpContext); MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, wDesc, sizeof(wDesc)/sizeof(WCHAR) ); + wDesc[(sizeof(wDesc)/sizeof(WCHAR)) - 1] = '\0'; + MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, wName, sizeof(wName)/sizeof(WCHAR) ); + wName[(sizeof(wName)/sizeof(WCHAR)) - 1] = '\0'; + if (lpDSEnumCallback(&DSOUND_capture_guids[wid], wDesc, wName, lpContext) == FALSE) return DS_OK; }

1 0

Alistair Leslie-Hughes : rpcrt4: Added stub function CreateStubFromTypeInfo .
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: 9d056eb8e24f7c6789b255e21ca3978ae6dd1d78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d056eb8e24f7c6789b255e21… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 22 20:27:22 2010 +1100 rpcrt4: Added stub function CreateStubFromTypeInfo. --- dlls/rpcrt4/cproxy.c | 21 +++++++++++++++++++++ dlls/rpcrt4/rpcrt4.spec | 2 +- 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 9ce555f..59ec80d 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -483,3 +483,24 @@ CreateProxyFromTypeInfo( LPTYPEINFO pTypeInfo, LPUNKNOWN pUnkOuter, REFIID riid, } return E_NOTIMPL; } + +HRESULT WINAPI +CreateStubFromTypeInfo(ITypeInfo *pTypeInfo, REFIID riid, IUnknown *pUnkServer, + IRpcStubBuffer **ppStub ) +{ + typedef INT (WINAPI *MessageBoxA)(HWND,LPCSTR,LPCSTR,UINT); + HMODULE hUser32 = LoadLibraryA("user32"); + MessageBoxA pMessageBoxA = (void *)GetProcAddress(hUser32, "MessageBoxA"); + + FIXME("%p %s %p %p\n", pTypeInfo, debugstr_guid(riid), pUnkServer, ppStub); + if (pMessageBoxA) + { + pMessageBoxA(NULL, + "The native implementation of OLEAUT32.DLL cannot be used " + "with Wine's RPCRT4.DLL. Remove OLEAUT32.DLL and try again.\n", + "Wine: Unimplemented CreateProxyFromTypeInfo", + 0x10); + ExitProcess(1); + } + return E_NOTIMPL; +} diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 6ce9401..477b3f0 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -1,5 +1,5 @@ @ stdcall CreateProxyFromTypeInfo(ptr ptr ptr ptr ptr) -@ stub CreateStubFromTypeInfo +@ stdcall CreateStubFromTypeInfo(ptr ptr ptr ptr) @ stdcall CStdStubBuffer_AddRef(ptr) @ stdcall CStdStubBuffer_Connect(ptr ptr) @ stdcall CStdStubBuffer_CountRefs(ptr)

1 0

Ilya Basin : msvcmaker: Extract wine_test_dsp_files from C_SRCS variable.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: bfe47feea0cf19f86dca113df3f40ea4d0b6e0c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe47feea0cf19f86dca113df… Author: Ilya Basin <basinilya(a)gmail.com> Date: Mon Mar 22 12:49:41 2010 +0300 msvcmaker: Extract wine_test_dsp_files from C_SRCS variable. --- tools/winapi/msvcmaker | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index 957e232..d03ce3f 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -202,7 +202,7 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { push @imports, $; } elsif (/^EXTRALIBS\s*=\s*/) { push @imports, map { /^-l(dxerr8|dxerr9|dxguid|strmiids|uuid)$/ ? $1 : () } split /\s+/s, $'; - } elsif (/^CTESTS\s*=\s*/) { + } elsif (/^CTESTS\s*=\s*/ || ( ($makefile_in_file =~ /\/tests\/Makefile\.in$/) && /^C_SRCS\s*=\s*/ ) ) { my @files = split /\s+/s, $'; my $dir = $makefile_in_file;

1 0