November 2008 - Wine-Commits

Jérôme Gardou : d3dx8: Implement D3DXMatrixStack_RotateAxis.
by Alexandre Julliard Nov. 28, 2008

Nov. 28, 2008

Module: wine Branch: master Commit: 896e30761a284a2a4b5efe9d6647f66cd294a02c URL: http://source.winehq.org/git/wine.git/?a=commit;h=896e30761a284a2a4b5efe9d6… Author: Jérôme Gardou <jerome.gardou(a)gmail.com> Date: Wed Nov 12 08:52:56 2008 +0100 d3dx8: Implement D3DXMatrixStack_RotateAxis. --- dlls/d3dx8/math.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 87c0f7a..e264fff 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -764,9 +764,16 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_Push(ID3DXMatrixStack *iface) static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxis(ID3DXMatrixStack *iface, CONST D3DXVECTOR3 *pv, FLOAT angle) { + D3DXMATRIX temp; ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; - FIXME("(%p) : stub\n",This); - return E_NOTIMPL; + + TRACE("iface %p\n", iface); + + if (!pv) return D3DERR_INVALIDCALL; + D3DXMatrixRotationAxis(&temp, pv, angle); + D3DXMatrixMultiply(&This->stack[This->current], &This->stack[This->current], &temp); + + return D3D_OK; } static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxisLocal(ID3DXMatrixStack *iface, CONST D3DXVECTOR3 *pv, FLOAT angle)

1 0

Hans Leidekker : setupapi: Implement SetupInstallFile{A, W}.
by Alexandre Julliard Nov. 28, 2008

Nov. 28, 2008

Module: wine Branch: master Commit: 19764fcf4c7c05d5badbef54be64170c2ebadd83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19764fcf4c7c05d5badbef54b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 28 10:50:54 2008 +0100 setupapi: Implement SetupInstallFile{A, W}. --- dlls/setupapi/queue.c | 107 +++++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/setupapi.spec | 4 +- 2 files changed, 109 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index 7605bc1..da20e6c 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -1063,6 +1063,113 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style, } /*********************************************************************** + * SetupInstallFileA (SETUPAPI.@) + */ +BOOL WINAPI SetupInstallFileA( HINF hinf, PINFCONTEXT inf_context, PCSTR source, PCSTR root, + PCSTR dest, DWORD style, PSP_FILE_CALLBACK_A handler, PVOID context ) +{ + BOOL ret = FALSE; + struct callback_WtoA_context ctx; + UNICODE_STRING sourceW, rootW, destW; + + TRACE("%p %p %s %s %s %x %p %p\n", hinf, inf_context, debugstr_a(source), debugstr_a(root), + debugstr_a(dest), style, handler, context); + + sourceW.Buffer = rootW.Buffer = destW.Buffer = NULL; + if (source && !RtlCreateUnicodeStringFromAsciiz( &sourceW, source )) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + if (root && !RtlCreateUnicodeStringFromAsciiz( &rootW, root )) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + goto exit; + } + if (dest && !RtlCreateUnicodeStringFromAsciiz( &destW, dest )) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + goto exit; + } + + ctx.orig_context = context; + ctx.orig_handler = handler; + + ret = SetupInstallFileW( hinf, inf_context, sourceW.Buffer, rootW.Buffer, destW.Buffer, style, QUEUE_callback_WtoA, &ctx ); + +exit: + RtlFreeUnicodeString( &sourceW ); + RtlFreeUnicodeString( &rootW ); + RtlFreeUnicodeString( &destW ); + return ret; +} + +/*********************************************************************** + * SetupInstallFileW (SETUPAPI.@) + */ +BOOL WINAPI SetupInstallFileW( HINF hinf, PINFCONTEXT inf_context, PCWSTR source, PCWSTR root, + PCWSTR dest, DWORD style, PSP_FILE_CALLBACK_W handler, PVOID context ) +{ + static const WCHAR CopyFiles[] = {'C','o','p','y','F','i','l','e','s',0}; + + BOOL ret, absolute = (root && *root && !(style & SP_COPY_SOURCE_ABSOLUTE)); + WCHAR *buffer, *p, *inf_source = NULL; + unsigned int len; + + TRACE("%p %p %s %s %s %x %p %p\n", hinf, inf_context, debugstr_w(source), debugstr_w(root), + debugstr_w(dest), style, handler, context); + + if (hinf) + { + INFCONTEXT ctx; + + if (!inf_context) + { + inf_context = &ctx; + if (!SetupFindFirstLineW( hinf, CopyFiles, NULL, inf_context )) return FALSE; + } + if (!SetupGetStringFieldW( inf_context, 1, NULL, 0, &len )) return FALSE; + if (!(inf_source = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + if (!SetupGetStringFieldW( inf_context, 1, inf_source, len, NULL )) return FALSE; + source = inf_source; + } + else if (!source) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + len = strlenW( source ) + 1; + if (absolute) len += strlenW( root ) + 1; + + if (!(p = buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + { + HeapFree( GetProcessHeap(), 0, inf_source ); + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + + if (absolute) + { + strcpyW( buffer, root ); + p += strlenW( buffer ); + if (p[-1] != '\\') *p++ = '\\'; + } + while (*source == '\\') source++; + strcpyW( p, source ); + + ret = do_file_copyW( buffer, dest, style, handler, context ); + + HeapFree( GetProcessHeap(), 0, inf_source ); + HeapFree( GetProcessHeap(), 0, buffer ); + return ret; +} + +/*********************************************************************** * SetupCommitFileQueueW (SETUPAPI.@) */ BOOL WINAPI SetupCommitFileQueueW( HWND owner, HSPFILEQ handle, PSP_FILE_CALLBACK_W handler, diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 5f31721..ca37474 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -434,10 +434,10 @@ @ stdcall SetupInitDefaultQueueCallbackEx(long long long long ptr) @ stdcall SetupInitializeFileLogA (str long) @ stdcall SetupInitializeFileLogW (wstr long) -@ stub SetupInstallFileA +@ stdcall SetupInstallFileA(ptr ptr str str str long ptr ptr) @ stub SetupInstallFileExA @ stub SetupInstallFileExW -@ stub SetupInstallFileW +@ stdcall SetupInstallFileW(ptr ptr wstr wstr wstr long ptr ptr) @ stdcall SetupInstallFilesFromInfSectionA(long long long str str long) @ stdcall SetupInstallFilesFromInfSectionW(long long long wstr wstr long) @ stdcall SetupInstallFromInfSectionA(long long str long long str long ptr ptr long ptr)

1 0

Vitaly Perov : mlang/tests: Add tests for fnIMLangFontLink_GetCharCodePages .
by Alexandre Julliard Nov. 28, 2008

Nov. 28, 2008

Module: wine Branch: master Commit: d2a9bcd199fae41996c94320e50b5a7b0625e329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2a9bcd199fae41996c94320e… Author: Vitaly Perov <vitperov(a)etersoft.ru> Date: Wed Oct 29 17:30:27 2008 +0300 mlang/tests: Add tests for fnIMLangFontLink_GetCharCodePages. --- dlls/mlang/tests/mlang.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 0cec2c7..fe1edf9 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -647,6 +647,7 @@ static void test_EnumScripts(IMultiLanguage2 *iML2, DWORD flags) static void IMLangFontLink_Test(IMLangFontLink* iMLFL) { DWORD dwCodePages, dwManyCodePages; + DWORD dwCmpCodePages; UINT CodePage; HRESULT ret; @@ -685,6 +686,28 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) ret = IMLangFontLink_CodePagesToCodePage(iMLFL, dwManyCodePages, 936, &CodePage); ok(ret == S_OK, "IMLangFontLink_CodePagesToCodePage error %x\n", ret); ok(CodePage == 1252, "Incorrect CodePage Returned (%i)\n",CodePage); + + /* Tests for GetCharCodePages */ + + /* Latin 1 */ + dwCmpCodePages = FS_LATIN1 | FS_LATIN2 | FS_CYRILLIC | FS_GREEK | FS_TURKISH + | FS_HEBREW | FS_ARABIC | FS_BALTIC | FS_VIETNAMESE | FS_THAI + | FS_JISJAPAN | FS_CHINESESIMP | FS_WANSUNG | FS_CHINESETRAD; + ok(IMLangFontLink_GetCharCodePages(iMLFL, 'd', &dwCodePages) == S_OK, + "IMLangFontLink_GetCharCodePages failed\n"); + ok(dwCodePages == dwCmpCodePages, "Incorrect CodePages returned (%i)\n", dwCodePages); + + /* Cyrillic */ + dwCmpCodePages = FS_CYRILLIC | FS_JISJAPAN | FS_CHINESESIMP | FS_WANSUNG; + ok(IMLangFontLink_GetCharCodePages(iMLFL, 0x0436, &dwCodePages) == S_OK, + "IMLangFontLink_GetCharCodePages failed\n"); + ok(dwCodePages == dwCmpCodePages, "Incorrect CodePages returned (%i)\n", dwCodePages); + + /* Japanese */ + dwCmpCodePages = FS_JISJAPAN; + ok(IMLangFontLink_GetCharCodePages(iMLFL, 0xff90, &dwCodePages) == S_OK, + "IMLangFontLink_GetCharCodePages failed\n"); + ok(dwCodePages == dwCmpCodePages, "Incorrect CodePages returned (%i)\n", dwCodePages); } /* copied from libs/wine/string.c */

1 0

Vitaly Perov : mlang: Add implementation of fnIMLangFontLink_GetCharCodePages.
by Alexandre Julliard Nov. 28, 2008

Nov. 28, 2008

Module: wine Branch: master Commit: 4398c51f1eca9055d6b88d35bdafcbe9d9a5c789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4398c51f1eca9055d6b88d35b… Author: Vitaly Perov <vitperov(a)etersoft.ru> Date: Thu Nov 27 21:28:49 2008 +0300 mlang: Add implementation of fnIMLangFontLink_GetCharCodePages. --- dlls/mlang/mlang.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 36ecea0..2365b09 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1853,8 +1853,27 @@ static HRESULT WINAPI fnIMLangFontLink_GetCharCodePages( WCHAR chSrc, DWORD* pdwCodePages) { - FIXME("\n"); - return E_NOTIMPL; + int i; + CHAR buf; + BOOL used_dc; + DWORD codePages; + + *pdwCodePages = 0; + + for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + { + WideCharToMultiByte(mlang_data[i].family_codepage, WC_NO_BEST_FIT_CHARS, + &chSrc, 1, &buf, 1, NULL, &used_dc); + + /* If default char is not used, current codepage include the given symbol */ + if (!used_dc) + { + IMLangFontLink_CodePageToCodePages(iface, + mlang_data[i].family_codepage, &codePages); + *pdwCodePages |= codePages; + } + } + return S_OK; } static HRESULT WINAPI fnIMLangFontLink_GetStrCodePages(

1 0

Stefan Dösinger : d3d9: Document a Microsoft header bug.
by Alexandre Julliard Nov. 28, 2008

Nov. 28, 2008

Module: wine Branch: master Commit: a1c460f8ae5080e03ed2ab16fd7e5b21d9850c38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1c460f8ae5080e03ed2ab16f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 21 17:41:27 2008 +0100 d3d9: Document a Microsoft header bug. --- include/d3d9.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/d3d9.h b/include/d3d9.h index 11f1cd3..dfd2acc 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -241,7 +241,15 @@ DECLARE_INTERFACE_(IDirect3D9Ex,IDirect3D9) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3D9 methods ***/ + + /* Note: Microsoft's d3d9.h does not declare IDirect3D9Ex::RegisterSoftwareDevice . This would mean that + * the offsets of the other methods in the Vtable change too. This is wrong. In Microsoft's + * d3d9.dll, the offsets for the other functions are still compatible with IDirect3D9. + * This is probably because even in MS's header IDirect3D9Ex inherits from IDirect3D9, which makes the + * C++ inferface compatible, and nobody uses the C interface in Windows world. + */ STDMETHOD(RegisterSoftwareDevice)(THIS_ void* pInitializeFunction) PURE; + STDMETHOD_(UINT, GetAdapterCount)(THIS) PURE; STDMETHOD(GetAdapterIdentifier)(THIS_ UINT Adapter, DWORD Flags, D3DADAPTER_IDENTIFIER9* pIdentifier) PURE; STDMETHOD_(UINT, GetAdapterModeCount)(THIS_ UINT Adapter, D3DFORMAT Format) PURE;

1 0

Alistair Leslie-Hughes : mshtml: Add a test case.
by Alexandre Julliard Nov. 28, 2008

Nov. 28, 2008

Module: wine Branch: master Commit: c6855480569cb7015a77af8d7d2517cd268b99d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6855480569cb7015a77af8d7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Nov 27 21:46:29 2008 +1100 mshtml: Add a test case. --- dlls/mshtml/tests/dom.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 78e5c7b..49b21ad 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -40,13 +40,13 @@ static const char range_test2_str[] = "<html><body>abc<hr />123<br /><hr />def</body></html>"; static const char elem_test_str[] = "<html><head><title>test</title><style>.body { margin-right: 0px; }</style>" - "<body>text test" + "<body onload=\"Testing()\">text test" "<a href=\"http://test\" name=\"x\">link</a>" "<input id=\"in\" class=\"testclass\" tabIndex=\"2\" title=\"test title\" />" "<select id=\"s\"><option id=\"x\" value=\"val1\">opt1</option><option id=\"y\">opt2</option></select>" "<textarea id=\"X\">text text</textarea>" "<table id=\"tbl\"><tbody><tr></tr><tr id=\"row2\"><td>td1 text</td><td>td2 text</td></tr></tbody></table>" - "<script id=\"sc\" type=\"text/javascript\"></script>" + "<script id=\"sc\" type=\"text/javascript\">\n</script>" "<test />" "<img id=\"imgid\"/>" "<iframe src=\"about:blank\" id=\"ifr\"></iframe>" @@ -3459,6 +3459,27 @@ static void test_elems(IHTMLDocument2 *doc) test_doc_title(doc, "test"); test_doc_set_title(doc, "test title"); test_doc_title(doc, "test title"); + + disp = NULL; + hres = IHTMLDocument2_get_Script(doc, &disp); + ok(hres == S_OK, "get_Script failed: %08x\n", hres); + if(hres == S_OK) + { + IDispatchEx *dispex; + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "IDispatch_QueryInterface failed: %08x\n", hres); + if(hres == S_OK) + { + DISPID pid = -1; + BSTR str = a2bstr("Testing"); + hres = IDispatchEx_GetDispID(dispex, str, 1, &pid); + todo_wine ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + todo_wine ok(pid != -1, "pid == -1\n"); + SysFreeString(str); + IDispatchEx_Release(dispex); + } + } + IDispatch_Release(disp); } static void test_create_elems(IHTMLDocument2 *doc)

1 0

Lei Zhang : msi: Set DllVersion registry key for CLSID_IMsiServerMessage.
by Alexandre Julliard Nov. 28, 2008

Nov. 28, 2008

Module: wine Branch: master Commit: 4153fc190414bfd025032d96cb739c1880d61646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4153fc190414bfd025032d96c… Author: Lei Zhang <thestig(a)google.com> Date: Wed Nov 26 11:52:16 2008 -0800 msi: Set DllVersion registry key for CLSID_IMsiServerMessage. --- dlls/msi/regsvr.c | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/msi/regsvr.c b/dlls/msi/regsvr.c index df8955a..15fc126 100644 --- a/dlls/msi/regsvr.c +++ b/dlls/msi/regsvr.c @@ -79,6 +79,7 @@ struct regsvr_coclass { LPCSTR progid; /* can be NULL to omit */ LPCSTR viprogid; /* can be NULL to omit */ LPCSTR progid_extra; /* can be NULL to omit */ + LPCSTR dllversion; /* can be NULL to omit */ }; /* flags for regsvr_coclass.flags */ @@ -122,6 +123,8 @@ static WCHAR const viprogid_keyname[25] = { 'V', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 't', 'P', 'r', 'o', 'g', 'I', 'D', 0 }; +static WCHAR const dllversion_keyname[11] = { + 'D', 'l', 'l', 'V', 'e', 'r', 's', 'i', 'o', 'n', 0 }; static char const tmodel_valuename[] = "ThreadingModel"; /*********************************************************************** @@ -318,6 +321,22 @@ static HRESULT register_coclasses(struct regsvr_coclass const *list) { if (res != ERROR_SUCCESS) goto error_close_clsid_key; } + if (list->dllversion) { + HKEY dllver_key; + + res = RegCreateKeyExW(clsid_key, dllversion_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &dllver_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = RegSetValueExA(dllver_key, NULL, 0, REG_SZ, + (CONST BYTE*)list->dllversion, + lstrlenA(list->dllversion) + 1); + RegCloseKey(dllver_key); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + error_close_clsid_key: RegCloseKey(clsid_key); } @@ -477,6 +496,8 @@ static struct regsvr_coclass const coclass_list[] = { "Apartment", PROGID_CLSID, "IMsiServer", + NULL, + NULL, NULL }, { @@ -488,7 +509,9 @@ static struct regsvr_coclass const coclass_list[] = { NULL, PROGID_CLSID, "WindowsInstaller.Message", - NULL + NULL, + NULL, + "3.1.4000" }, { &CLSID_IMsiServerX1, @@ -499,6 +522,8 @@ static struct regsvr_coclass const coclass_list[] = { "Apartment", 0, "WindowsInstaller.Installer", + NULL, + NULL, NULL }, { @@ -510,6 +535,8 @@ static struct regsvr_coclass const coclass_list[] = { "Apartment", PROGID_CLSID, "WindowsInstaller.Installer", + NULL, + NULL, NULL }, { @@ -521,6 +548,8 @@ static struct regsvr_coclass const coclass_list[] = { "Apartment", 0, "WindowsInstaller.Installer", + NULL, + NULL, NULL }, { NULL } /* list terminator */

1 0

Paul Vriens : shell32/tests: Skip some tests on Win9x and WinMe.
by Alexandre Julliard Nov. 28, 2008

Nov. 28, 2008

Module: wine Branch: master Commit: 78a90f1f3163f03ac24bc0bbba275b31f2e346c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78a90f1f3163f03ac24bc0bbb… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Nov 28 11:40:19 2008 +0100 shell32/tests: Skip some tests on Win9x and WinMe. --- dlls/shell32/tests/shlfileop.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 85a58a4..efe6507 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -309,6 +309,11 @@ static void test_get_file_info_iconlist(void) hSysImageList = (HIMAGELIST) pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_SYSICONINDEX | SHGFI_SMALLICON | SHGFI_PIDL); + if (!hSysImageList) + { + win_skip("SHGetFileInfoW is not implemented\n"); + return; + } ok(hSysImageList != INVALID_HANDLE_VALUE, "Can't get handle for CSIDL_DESKTOP imagelist\n"); todo_wine ok(shInfow.hIcon == 0, "SHGetFileInfoW(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) did not clear hIcon\n"); ok(shInfow.szTypeName[0] == 0, "SHGetFileInfoW(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) did not clear szTypeName[0]\n");

1 0

Paul Vriens : shell32/tests: Fix a few test failures on Win9x and NT4.
by Alexandre Julliard Nov. 28, 2008

Nov. 28, 2008

Module: wine Branch: master Commit: cfdfbeaf1bd403b419898af40f9aa438b242d7a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfdfbeaf1bd403b419898af40… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Nov 27 14:08:13 2008 +0100 shell32/tests: Fix a few test failures on Win9x and NT4. --- dlls/shell32/tests/shlfileop.c | 41 +++++++++++++++++++++++---------------- 1 files changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 81f893c..85a58a4 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -32,6 +32,13 @@ #define FOF_NORECURSION 0x1000 #endif +/* Error codes could be pre-Win32 */ +#define DE_OPCANCELLED 0x75 +#define expect_retval(ret, ret_prewin32)\ + ok(retval == ret ||\ + broken(retval == ret_prewin32),\ + "Expected %d, got %d\n", ret, retval) + static CHAR CURR_DIR[MAX_PATH]; static const WCHAR UNICODE_PATH[] = {'c',':','\\',0x00c4,'\0','\0'}; /* "c:\Ä", or "c:\A" with diaeresis */ @@ -659,7 +666,7 @@ static void test_rename(void) shfo.pFrom = "test1.txt\0"; shfo.pTo = "\0"; retval = SHFileOperationA(&shfo); - ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %d\n", retval); + expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x */); ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); /* pFrom is empty */ @@ -802,7 +809,7 @@ static void test_copy(void) set_curr_dir_path(from, "test1.txt\0test2.txt\0"); set_curr_dir_path(to, "test3.txt\0"); retval = SHFileOperation(&shfo); - ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %d\n", retval); + expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); ok(shfo.fAnyOperationsAborted, "Expected aborted operations\n"); ok(!file_exists("test3.txt\\test2.txt"), "Expected test3.txt\\test2.txt to not exist\n"); @@ -822,7 +829,7 @@ static void test_copy(void) shfo.pTo = "testdir2\\a.txt\0testdir2\\b.txt\0testdir2\\c.txt\0testdir2\\d.txt\0"; shfo.fFlags |= FOF_NOERRORUI | FOF_MULTIDESTFILES; retval = SHFileOperation(&shfo); - ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %d\n", retval); + expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); ok(shfo.fAnyOperationsAborted, "Expected aborted operations\n"); ok(!file_exists("testdir2\\a.txt"), "Expected testdir2\\a.txt to not exist\n"); @@ -831,7 +838,7 @@ static void test_copy(void) shfo.pTo = "e.txt\0f.txt\0"; shfo.fAnyOperationsAborted = FALSE; retval = SHFileOperation(&shfo); - ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %d\n", retval); + expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); ok(shfo.fAnyOperationsAborted, "Expected aborted operations\n"); ok(!file_exists("e.txt"), "Expected e.txt to not exist\n"); @@ -851,7 +858,7 @@ static void test_copy(void) shfo.fAnyOperationsAborted = FALSE; shfo.fFlags &= ~FOF_MULTIDESTFILES; retval = SHFileOperation(&shfo); - ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %d\n", retval); + expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); ok(!file_exists("a.txt"), "Expected a.txt to not exist\n"); /* try a glob */ @@ -881,7 +888,7 @@ static void test_copy(void) shfo.fFlags &= ~FOF_FILESONLY; shfo.fFlags |= FOF_MULTIDESTFILES; retval = SHFileOperation(&shfo); - ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %d\n", retval); + expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); ok(shfo.fAnyOperationsAborted, "Expected aborted operations\n"); ok(!file_exists("testdir2\\a.txt"), "Expected testdir2\\test1.txt to not exist\n"); ok(!RemoveDirectory("b.txt"), "b.txt should not exist\n"); @@ -901,7 +908,7 @@ static void test_copy(void) shfo.pFrom = "test1.txt\0test2.txt\0"; shfo.pTo = "b.txt\0c.txt\0d.txt\0"; retval = SHFileOperation(&shfo); - ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %d\n", retval); + expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); ok(shfo.fAnyOperationsAborted, "Expected operations to be aborted\n"); ok(!DeleteFile("b.txt"), "Expected b.txt to not exist\n"); @@ -910,7 +917,7 @@ static void test_copy(void) shfo.pTo = "b.txt\0c.txt\0d.txt\0"; shfo.fAnyOperationsAborted = FALSE; retval = SHFileOperation(&shfo); - ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %d\n", retval); + expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); ok(shfo.fAnyOperationsAborted, "Expected operations to be aborted\n"); ok(!DeleteFile("b.txt"), "Expected b.txt to not exist\n"); ok(!DeleteFile("c.txt"), "Expected c.txt to not exist\n"); @@ -939,7 +946,7 @@ static void test_copy(void) shfo.pFrom = "test4.txt\\a.txt\0test4.txt\0"; shfo.pTo = "nonexistent\0"; retval = SHFileOperation(&shfo); - ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %d\n", retval); + expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); ok(shfo.fAnyOperationsAborted, "Expected operations to be aborted\n"); ok(!file_exists("nonexistent\\test4.txt"), "Expected nonexistent\\test4.txt to not exist\n"); DeleteFile("test4.txt\\a.txt"); @@ -995,7 +1002,7 @@ static void test_copy(void) shfo.pTo = "test4.txt\\a.txt\0"; shfo.fAnyOperationsAborted = FALSE; retval = SHFileOperation(&shfo); - ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %d\n", retval); + expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); ok(!file_exists("test4.txt\\a.txt"), "Expected test4.txt\\a.txt to not exist\n"); /* copy a nonexistent file to a nonexistent directory */ @@ -1135,7 +1142,7 @@ static void test_copy(void) shfo.pTo = to; shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; retval = SHFileOperation(&shfo); - ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %d\n", retval); + expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); ok(!DeleteFileA("threedir\\one.txt"), "Expected file to not exist\n"); ok(!DeleteFileA("threedir\\two.txt"), "Expected file to not exist\n"); ok(DeleteFileA("one.txt"), "Expected file to exist\n"); @@ -1237,7 +1244,7 @@ static void test_copy(void) shfo.fFlags = FOF_MULTIDESTFILES | FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; retval = SHFileOperation(&shfo); - ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %d\n", retval); + expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); ok(!DeleteFileA("threedir\\one.txt"), "Expected file to not exist\n"); ok(!DeleteFileA("threedir\\two.txt"), "Expected file to not exist\n"); ok(DeleteFileA("one.txt"), "Expected file to exist\n"); @@ -1391,8 +1398,8 @@ static void test_move(void) shfo.pFrom = "test2.txt\0test3.txt\0"; shfo.pTo = "test1.txt\0"; retval = SHFileOperationA(&shfo); - ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %d\n", retval); - ok(!file_exists("test1.txt"), "Expected test1.txt to not exist\n"); + expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); + ok(!file_exists("test1.txt"), "Expected test1.txt to not exist\n"); ok(file_exists("test2.txt"), "Expected test2.txt to exist\n"); ok(file_exists("test3.txt"), "Expected test3.txt to exist\n"); @@ -1408,7 +1415,7 @@ static void test_move(void) shfo.pFrom = "test2.txt\0test3.txt\0"; shfo.pTo = "d.txt\0e.txt\0"; retval = SHFileOperationA(&shfo); - ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %d\n", retval); + expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); ok(!DeleteFile("d.txt"), "Expected d.txt to not exist\n"); ok(!DeleteFile("e.txt"), "Expected e.txt to not exist\n"); @@ -1416,14 +1423,14 @@ static void test_move(void) shfo.pTo = "d.txt\0"; shfo.fFlags |= FOF_MULTIDESTFILES; retval = SHFileOperationA(&shfo); - ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %d\n", retval); + expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); ok(!DeleteFile("d.txt"), "Expected d.txt to not exist\n"); /* FO_MOVE does not create dest directories */ shfo.pFrom = "test2.txt\0"; shfo.pTo = "dir1\\dir2\\test2.txt\0"; retval = SHFileOperationA(&shfo); - ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %d\n", retval); + expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); ok(!file_exists("dir1"), "Expected dir1 to not exist\n"); /* try to overwrite an existing file */

1 0

Christian Costa : dmime: Make stub returns a error to avoid crashing.
by Alexandre Julliard Nov. 28, 2008

Nov. 28, 2008

Module: wine Branch: master Commit: 12f5a308333745f89d461cc66b9e5d70debbc7ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=12f5a308333745f89d461cc66… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Nov 27 22:26:57 2008 +0100 dmime: Make stub returns a error to avoid crashing. --- dlls/dmime/performance.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 66b1a02..0523cd7 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -787,7 +787,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_PlaySegmentEx (LPDIRECTMUSICP IDirectMusicPerformance8Impl *This = (IDirectMusicPerformance8Impl *)iface; FIXME("(%p, %p, %p, %p, %d, 0x%s, %p, %p, %p): stub\n", This, pSource, pwzSegmentName, pTransition, dwFlags, wine_dbgstr_longlong(i64StartTime), ppSegmentState, pFrom, pAudioPath); - return S_OK; + return DMUS_E_SEGMENT_INIT_FAILED; } static HRESULT WINAPI IDirectMusicPerformance8Impl_StopEx (LPDIRECTMUSICPERFORMANCE8 iface, IUnknown* pObjectToStop, __int64 i64StopTime, DWORD dwFlags) {

1 0