August 2011 - Wine-commits - list.winehq.org

Francois Gouget : ntdll/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 209acc5c896584b05e8132a44a0641cd502aa389 URL: http://source.winehq.org/git/wine.git/?a=commit;h=209acc5c896584b05e8132a44… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 30 14:18:54 2011 +0200 ntdll/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ntdll/tests/pipe.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index a0ce1b7..cad92a7 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -210,7 +210,7 @@ static void test_overlapped(void) hClient = CreateFileW(testpipe, GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, 0, 0); ok(hClient != INVALID_HANDLE_VALUE, "can't open pipe, GetLastError: %x\n", GetLastError()); - ok(iosb.Status == 0, "Wrong iostatus %x\n", iosb.Status); + ok(U(iosb).Status == 0, "Wrong iostatus %x\n", U(iosb).Status); ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n"); ok(!ioapc_called, "IOAPC ran too early\n"); @@ -281,7 +281,7 @@ static void test_alertable(void) todo_wine ok(res == STATUS_CANCELLED, "NtFsControlFile returned %x\n", res); todo_wine ok(userapc_called, "user apc didn't run\n"); - ok(iosb.Status == 0x55555555, "iosb.Status got changed to %x\n", iosb.Status); + ok(U(iosb).Status == 0x55555555, "iosb.Status got changed to %x\n", U(iosb).Status); todo_wine ok(WaitForSingleObjectEx(hEvent, 0, TRUE) == WAIT_TIMEOUT, "hEvent signaled\n"); ok(!ioapc_called, "IOAPC ran\n"); @@ -295,7 +295,7 @@ static void test_alertable(void) todo_wine ok(res == STATUS_CANCELLED, "NtFsControlFile returned %x\n", res); ok(userapc_called, "user apc didn't run\n"); - todo_wine ok(iosb.Status == 0x55555555, "iosb.Status got changed to %x\n", iosb.Status); + todo_wine ok(U(iosb).Status == 0x55555555, "iosb.Status got changed to %x\n", U(iosb).Status); ok(WaitForSingleObjectEx(hEvent, 0, TRUE) == WAIT_TIMEOUT, "hEvent signaled\n"); ok(!ioapc_called, "IOAPC ran\n"); @@ -316,7 +316,7 @@ static void test_alertable(void) todo_wine ok(!res, "NtFsControlFile returned %x\n", res); ok(open_succeded, "couldn't open client side pipe\n"); - ok(!iosb.Status, "Wrong iostatus %x\n", iosb.Status); + ok(!U(iosb).Status, "Wrong iostatus %x\n", U(iosb).Status); todo_wine ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n"); WaitForSingleObject(hThread, INFINITE); @@ -351,7 +351,7 @@ static void test_nonalertable(void) todo_wine ok(!res, "NtFsControlFile returned %x\n", res); ok(open_succeded, "couldn't open client side pipe\n"); - todo_wine ok(!iosb.Status, "Wrong iostatus %x\n", iosb.Status); + todo_wine ok(!U(iosb).Status, "Wrong iostatus %x\n", U(iosb).Status); todo_wine ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n"); ok(!ioapc_called, "IOAPC ran too early\n"); @@ -391,7 +391,7 @@ static void test_cancelio(void) todo_wine ok(!res, "NtCancelIoFile returned %x\n", res); todo_wine { - ok(iosb.Status == STATUS_CANCELLED, "Wrong iostatus %x\n", iosb.Status); + ok(U(iosb).Status == STATUS_CANCELLED, "Wrong iostatus %x\n", U(iosb).Status); ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n"); }

1 0

André Hentschel : rpcrt4/tests: Only free string when function succeeded.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: f98369f21c8b3682e29ed1baaef639669704f392 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f98369f21c8b3682e29ed1baa… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jul 30 16:55:29 2011 +0200 rpcrt4/tests: Only free string when function succeeded. --- dlls/rpcrt4/tests/rpc.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 4d62f30..83e387b 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -283,8 +283,7 @@ todo_wine { ok(level == RPC_C_AUTHN_LEVEL_PKT_PRIVACY, "expected RPC_C_AUTHN_LEVEL_PKT_PRIVACY, got %d\n", level); ok(authnsvc == RPC_C_AUTHN_WINNT, "expected RPC_C_AUTHN_WINNT, got %d\n", authnsvc); todo_wine ok(authzsvc == RPC_C_AUTHZ_NAME, "expected RPC_C_AUTHZ_NAME, got %d\n", authzsvc); - - RpcStringFree(&principal); + if (status == RPC_S_OK) RpcStringFree(&principal); status = RpcMgmtStopServerListening(NULL); ok(status == RPC_S_OK, "RpcMgmtStopServerListening failed (%u)\n",

1 0

André Hentschel : oleaut32/tests: Only use interface if we succeeded in recreating it.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 862cc73fb4cd8e6c8d454ab822a70a5072cb5dda URL: http://source.winehq.org/git/wine.git/?a=commit;h=862cc73fb4cd8e6c8d454ab82… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jul 30 16:58:58 2011 +0200 oleaut32/tests: Only use interface if we succeeded in recreating it. --- dlls/oleaut32/tests/tmarshal.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index c64c68a..2897c1f 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -995,10 +995,13 @@ static void test_typelibmarshal(void) ok_ole_success(hr, CoUnmarshalInterface); IStream_Release(pStream); - hr = IKindaEnumWidget_Next(pKEW, &pWidget); - ok_ole_success(hr, IKindaEnumWidget_Next); + if (hr == S_OK) + { + hr = IKindaEnumWidget_Next(pKEW, &pWidget); + ok_ole_success(hr, IKindaEnumWidget_Next); - IKindaEnumWidget_Release(pKEW); + IKindaEnumWidget_Release(pKEW); + } hr = IWidget_QueryInterface(pWidget, &IID_IDispatch, (void **)&pDispatch); ok_ole_success(hr, IWidget_QueryInterface);

1 0

Eric Pouech : winhlp32: Better protect macros against not finding a help file.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: d3fd3d73be8c9da238fba091f381104d49aa5a46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3fd3d73be8c9da238fba091f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jul 31 08:53:34 2011 +0200 winhlp32: Better protect macros against not finding a help file. --- programs/winhlp32/macro.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c index 7f3328f..0a1642c 100644 --- a/programs/winhlp32/macro.c +++ b/programs/winhlp32/macro.c @@ -575,11 +575,11 @@ void CALLBACK MACRO_JumpContext(LPCSTR lpszPath, LPCSTR lpszWindow, LONG context HLPFILE* hlpfile; WINE_TRACE("(\"%s\", \"%s\", %d)\n", lpszPath, lpszWindow, context); - hlpfile = WINHELP_LookupHelpFile(lpszPath); - /* Some madness: what user calls 'context', hlpfile calls 'map' */ - WINHELP_OpenHelpWindow(HLPFILE_PageByMap, hlpfile, context, - WINHELP_GetWindowInfo(hlpfile, lpszWindow), - SW_NORMAL); + if ((hlpfile = WINHELP_LookupHelpFile(lpszPath))) + /* Some madness: what user calls 'context', hlpfile calls 'map' */ + WINHELP_OpenHelpWindow(HLPFILE_PageByMap, hlpfile, context, + WINHELP_GetWindowInfo(hlpfile, lpszWindow), + SW_NORMAL); } void CALLBACK MACRO_JumpHash(LPCSTR lpszPath, LPCSTR lpszWindow, LONG lHash) @@ -591,9 +591,10 @@ void CALLBACK MACRO_JumpHash(LPCSTR lpszPath, LPCSTR lpszWindow, LONG lHash) hlpfile = MACRO_CurrentWindow()->page->file; else hlpfile = WINHELP_LookupHelpFile(lpszPath); - WINHELP_OpenHelpWindow(HLPFILE_PageByHash, hlpfile, lHash, - WINHELP_GetWindowInfo(hlpfile, lpszWindow), - SW_NORMAL); + if (hlpfile) + WINHELP_OpenHelpWindow(HLPFILE_PageByHash, hlpfile, lHash, + WINHELP_GetWindowInfo(hlpfile, lpszWindow), + SW_NORMAL); } static void CALLBACK MACRO_JumpHelpOn(void)

1 0

Jacek Caban : shell32: Moved MruLongList registration to shell32, where it belongs.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: d6548692b9dea76c325beb9dd61349839ebcb6bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6548692b9dea76c325beb9dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 31 13:23:08 2011 +0200 shell32: Moved MruLongList registration to shell32, where it belongs. --- dlls/shdocvw/shdocvw_v1.idl | 5 ----- dlls/shell32/shell32_classes.idl | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shdocvw/shdocvw_v1.idl b/dlls/shdocvw/shdocvw_v1.idl index e725782..94ef4cd 100644 --- a/dlls/shdocvw/shdocvw_v1.idl +++ b/dlls/shdocvw/shdocvw_v1.idl @@ -19,11 +19,6 @@ #include "exdisp.idl" [ - threading(apartment), - uuid(53bd6b4e-3780-4693-afc3-7161c2f3ee9c) -] coclass MruLongList { } - -[ helpstring("Microsoft Browser Architecture"), threading(apartment), uuid(a5e46e3a-8849-11d1-9d8c-00c04fc99d61) diff --git a/dlls/shell32/shell32_classes.idl b/dlls/shell32/shell32_classes.idl index 11f695b..ae3e619 100644 --- a/dlls/shell32/shell32_classes.idl +++ b/dlls/shell32/shell32_classes.idl @@ -135,3 +135,8 @@ coclass KnownFolderManager { interface IKnownFolderManager; } threading(apartment), uuid(21ec2020-3aea-1069-a2dd-08002b30309d) ] coclass ControlPanel { interface IShellFolder2; } + +[ + threading(apartment), + uuid(53bd6b4e-3780-4693-afc3-7161c2f3ee9c) +] coclass MruLongList { }

1 0

Jacek Caban : shdocvw: Get rid of MicrosoftBrowserArchitecture registration .
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 60f65e331fff487c24a55b6b4a5ec6b95ee3a90a URL: http://source.winehq.org/git/wine.git/?a=commit;h=60f65e331fff487c24a55b6b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 31 13:23:50 2011 +0200 shdocvw: Get rid of MicrosoftBrowserArchitecture registration. --- dlls/shdocvw/shdocvw_v1.idl | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/shdocvw/shdocvw_v1.idl b/dlls/shdocvw/shdocvw_v1.idl index 94ef4cd..ad6b72b 100644 --- a/dlls/shdocvw/shdocvw_v1.idl +++ b/dlls/shdocvw/shdocvw_v1.idl @@ -19,12 +19,6 @@ #include "exdisp.idl" [ - helpstring("Microsoft Browser Architecture"), - threading(apartment), - uuid(a5e46e3a-8849-11d1-9d8c-00c04fc99d61) -] coclass MicrosoftBrowserArchitecture { } - -[ threading(apartment), uuid(871c5380-42a0-1069-a2ea-08002b30309d) ] coclass Internet { }

1 0

Alexandre Julliard : gdi32: Fix the blend function handling for the AlphaBlend enhanced metafile record .
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 2116493653658d7b3cb8347b51f6e9ba88605b72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2116493653658d7b3cb8347b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 29 20:08:53 2011 +0200 gdi32: Fix the blend function handling for the AlphaBlend enhanced metafile record. --- dlls/gdi32/enhmetafile.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index b8863fd..62faa89 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1903,7 +1903,6 @@ BOOL WINAPI PlayEnhMetaFileRecord( HDC hdcSrc = CreateCompatibleDC(hdc); HBITMAP hBmp = 0, hBmpOld = 0; const BITMAPINFO *pbi = (const BITMAPINFO *)((const BYTE *)mr + pAlphaBlend->offBmiSrc); - BLENDFUNCTION blendfn; void *bits; SetWorldTransform(hdcSrc, &pAlphaBlend->xformSrc); @@ -1912,14 +1911,9 @@ BOOL WINAPI PlayEnhMetaFileRecord( memcpy(bits, (const BYTE *)mr + pAlphaBlend->offBitsSrc, pAlphaBlend->cbBitsSrc); hBmpOld = SelectObject(hdcSrc, hBmp); - blendfn.BlendOp = (pAlphaBlend->dwRop >> 24) & 0xff; - blendfn.BlendFlags = (pAlphaBlend->dwRop >> 16) & 0xff; - blendfn.SourceConstantAlpha = (pAlphaBlend->dwRop >> 8) & 0xff; - blendfn.AlphaFormat = (pAlphaBlend->dwRop) & 0xff; - GdiAlphaBlend(hdc, pAlphaBlend->xDest, pAlphaBlend->yDest, pAlphaBlend->cxDest, pAlphaBlend->cyDest, hdcSrc, pAlphaBlend->xSrc, pAlphaBlend->ySrc, pAlphaBlend->cxSrc, pAlphaBlend->cySrc, - blendfn); + *(BLENDFUNCTION *)&pAlphaBlend->dwRop); SelectObject(hdcSrc, hBmpOld); DeleteObject(hBmp);

1 0

Mariusz Pluciński : shell32/tests: Add verification of known folders relative paths.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 9b98b1ef758e0fdb9389d06715e574afa8bb3e37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b98b1ef758e0fdb9389d0671… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Fri Jul 29 19:06:09 2011 +0200 shell32/tests: Add verification of known folders relative paths. --- dlls/shell32/tests/shellpath.c | 220 +++++++++++++++++++++------------------- 1 files changed, 117 insertions(+), 103 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b98b1ef758e0fdb9389d…

1 0

Mariusz Pluciński : shell32/tests: Add notification about unknown known folders.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: e09f4ed0e84b6f35ba9545dea0c8504db4b62e0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e09f4ed0e84b6f35ba9545dea… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Fri Jul 29 19:07:49 2011 +0200 shell32/tests: Add notification about unknown known folders. --- dlls/shell32/tests/shellpath.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index a7d92d4..bcdf45e 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1021,11 +1021,14 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId WCHAR sName[1024], sRelativePath[MAX_PATH]; BOOL validPath; char sParentGuid[39]; + BOOL found = FALSE; while(known_folder->folderId != NULL) { if(IsEqualGUID(known_folder->folderId, folderId)) { + found = TRUE; + /* verify CSIDL */ if(known_folder->csidl != NO_CSIDL) { @@ -1082,6 +1085,42 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId } known_folder++; } + + if(!found) + { + printGUID(folderId, sParentGuid); + trace("unknown known folder found: %s\n", sParentGuid); + + hr = IKnownFolderManager_GetFolder(mgr, folderId, &folder); + ok(hr == S_OK, "cannot get known folder for %s\n", sParentGuid); + if(SUCCEEDED(hr)) + { + hr = IKnownFolder_GetFolderDefinition(folder, &kfd); + todo_wine + ok(hr == S_OK, "cannot get known folder definition for %s\n", sParentGuid); + if(SUCCEEDED(hr)) + { + trace(" category: %d\n", kfd.category); + trace(" name: %s\n", wine_dbgstr_w(kfd.pszName)); + trace(" description: %s\n", wine_dbgstr_w(kfd.pszDescription)); + printGUID(&kfd.fidParent, sParentGuid); + trace(" parent: %s\n", sParentGuid); + trace(" relative path: %s\n", wine_dbgstr_w(kfd.pszRelativePath)); + trace(" parsing name: %s\n", wine_dbgstr_w(kfd.pszParsingName)); + trace(" tooltip: %s\n", wine_dbgstr_w(kfd.pszTooltip)); + trace(" localized name: %s\n", wine_dbgstr_w(kfd.pszLocalizedName)); + trace(" icon: %s\n", wine_dbgstr_w(kfd.pszIcon)); + trace(" security: %s\n", wine_dbgstr_w(kfd.pszSecurity)); + trace(" attributes: 0x%08x\n", kfd.dwAttributes); + trace(" flags: 0x%08x\n", kfd.kfdFlags); + printGUID(&kfd.ftidType, sParentGuid); + trace(" type: %s\n", sParentGuid); + FreeKnownFolderDefinitionFields(&kfd); + } + + IKnownFolder_Release(folder); + } + } } #undef NO_CSIDL #undef CSIDL_TODO_WINE

1 0

Mariusz Pluciński : shell32/tests: Add notification when expected known folder does not exists.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 82ac4ae36e00df89f15f1968071ee0275a6635cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=82ac4ae36e00df89f15f19680… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Fri Jul 29 19:07:55 2011 +0200 shell32/tests: Add notification when expected known folder does not exists. --- dlls/shell32/tests/shellpath.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index bcdf45e..b2d16f5 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1010,6 +1010,7 @@ static const struct knownFolderDef known_folders[] = { { NULL, NULL, 0, NULL, NULL, 0, 0 } }; #undef KNOWN_FOLDER +BOOL known_folder_found[sizeof(known_folders)/sizeof(known_folders[0])-1]; static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId) { @@ -1021,14 +1022,15 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId WCHAR sName[1024], sRelativePath[MAX_PATH]; BOOL validPath; char sParentGuid[39]; + BOOL *current_known_folder_found = &known_folder_found[0]; BOOL found = FALSE; while(known_folder->folderId != NULL) { if(IsEqualGUID(known_folder->folderId, folderId)) { + *current_known_folder_found = TRUE; found = TRUE; - /* verify CSIDL */ if(known_folder->csidl != NO_CSIDL) { @@ -1084,6 +1086,7 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId break; } known_folder++; + current_known_folder_found++; } if(!found) @@ -1241,11 +1244,18 @@ static void test_knownFolders(void) ok(hr == S_OK, "failed to release KnownFolder instance: 0x%08x\n", hr); } + for(i=0; i<sizeof(known_folder_found)/sizeof(known_folder_found[0]); ++i) + known_folder_found[i] = FALSE; + hr = IKnownFolderManager_GetFolderIds(mgr, &folders, &nCount); ok(hr == S_OK, "failed to get known folders: 0x%08x\n", hr); for(i=0;i<nCount;++i) check_known_folder(mgr, &folders[i]); + for(i=0; i<sizeof(known_folder_found)/sizeof(known_folder_found[0]); ++i) + if(!known_folder_found[i]) + trace("Known folder %s not found on current platform\n", known_folders[i].sFolderId); + CoTaskMemFree(folders); /* test of registering new known folders */

1 0