September 2009 - Wine-commits

Davide Pizzetti : winecfg: Italian translation update.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 3c7c46f6cd3184d9228429037fc92894543b17c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c7c46f6cd3184d9228429037… Author: Davide Pizzetti <erpizzo(a)alice.it> Date: Tue Sep 8 14:06:10 2009 +0200 winecfg: Italian translation update. --- programs/winecfg/It.rc | 54 ++++++++++++++++++++++++------------------------ 1 files changed, 27 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c7c46f6cd3184d922842…

1 0

Davide Pizzetti : start: Italian translation update.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 1e150672e9980fdaf91fbc75d7311f679a13babe URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e150672e9980fdaf91fbc75d… Author: Davide Pizzetti <erpizzo(a)alice.it> Date: Tue Sep 8 15:41:55 2009 +0200 start: Italian translation update. --- programs/start/It.rc | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/programs/start/It.rc b/programs/start/It.rc index 2ba5417..e550ac5 100644 --- a/programs/start/It.rc +++ b/programs/start/It.rc @@ -47,24 +47,24 @@ sotto alcune condizioni; eseguire 'start' con l'opzione /L per ulteriori infomaz " STRING_LICENSE, "start.exe versione 0.2 Copyright (C) 2003, Dan Kegel\n\ -This program is free software; you can redistribute it and/or\n\ -modify it under the terms of the GNU Lesser Public License\n\ -as published by the Free Software Foundation; either version 2.1\n\ -of the License, or (at your option) any later version.\n\ +Questo programma � software libero; puoi redistribuirlo e/o\n\ +modificarlo sotto i termini della GNU Lesser Public License\n\ +cos� come pubblicata dalla Free Software Foundation; sia la versione 2.1\n\ +della Licenza, o (a tua scelta) ogni altra versione successiva.\n\ \n\ -This program is distributed in the hope that it will be useful,\n\ -but WITHOUT ANY WARRANTY; without even the implied warranty of\n\ -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\ -GNU Lesser Public License for more details.\n\ +Questo programma � distribuito nella speranza che sia utile,\n\ +ma SENZA ALCUNA GARANZIA; senza neppure la garanzia implicita di\n\ +COMMERCIABILIT� o IDONEIT� PER UN PARTICOLARE SCOPO. Consulta la\n\ +GNU Lesser Public License per ulteriori dettagli.\n\ \n\ -You should have received a copy of the GNU Lesser Public License\n\ -along with this program; if not, write to the Free Software\n\ +Dovresti aver ricevuto una copia della GNU Lesser Public License\n\ +assieme a questo programma; se no, scrivi a Free Software\n\ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.\n\ \n\ -Vedere il file COPYING.LIB per informazioni sulla licenza.\n\ +Consulta il file COPYING.LIB per informazioni sulla licenza.\n\ " STRING_EXECFAIL "Non � stato possibile eseguire l'applicazione, o nessuna applicazione � associata con il file specificato.\nShellExecuteEx fallito" -STRING_UNIXFAIL "Could not translate the specified Unix filename to a DOS filename." +STRING_UNIXFAIL "Non � stato possibile tradurre il nome file Unix in un nome file DOS." }

1 0

Ilya Shpigor : gdi32/tests: Add test for SelectClipRgn in metafile.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: dad99e2aa943bf63e06b0c1be089411131fdd864 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dad99e2aa943bf63e06b0c1be… Author: Ilya Shpigor <shpigor(a)etersoft.ru> Date: Mon Sep 7 10:57:55 2009 +0400 gdi32/tests: Add test for SelectClipRgn in metafile. --- dlls/gdi32/tests/metafile.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 15a2c63..a186608 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1908,6 +1908,7 @@ static void test_emf_clipping(void) HENHMETAFILE hemf; HRGN hrgn; INT ret; + RECT rc_res, rc_sclip; SetLastError(0xdeadbeef); hdc = CreateEnhMetaFileA(0, NULL, NULL, NULL); @@ -1946,6 +1947,22 @@ static void test_emf_clipping(void) DeleteEnhMetaFile(hemf); ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); + + hdc = CreateEnhMetaFileA(0, NULL, NULL, NULL); + + SetRect(&rc_sclip, 100, 100, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); + hrgn = CreateRectRgn(rc_sclip.left, rc_sclip.top, rc_sclip.right, rc_sclip.bottom); + SelectClipRgn(hdc, hrgn); + GetClipBox(hdc, &rc_res); + todo_wine ok(EqualRect(&rc_res, &rc_sclip), + "expected rc_res (%d, %d) - (%d, %d), got (%d, %d) - (%d, %d)\n", + rc_sclip.left, rc_sclip.top, rc_sclip.right, rc_sclip.bottom, + rc_res.left, rc_res.top, rc_res.right, rc_res.bottom); + + hemf = CloseEnhMetaFile(hdc); + DeleteEnhMetaFile(hemf); + DeleteObject(hrgn); + DeleteDC(hdc); } static INT CALLBACK EmfEnumProc(HDC hdc, HANDLETABLE *lpHTable, const ENHMETARECORD *lpEMFR, INT nObj, LPARAM lpData)

1 0

Owen Rudge : shlwapi: Implement stub for UrlFixupW.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: 5f28a6a2d5ec5064144d260ac2e65095b5c48098 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f28a6a2d5ec5064144d260ac… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Sep 2 16:38:12 2009 +0100 shlwapi: Implement stub for UrlFixupW. --- dlls/shlwapi/shlwapi.spec | 2 +- dlls/shlwapi/url.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 158d5e3..4acda49 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -459,7 +459,7 @@ 459 stdcall -noname SHExpandEnvironmentStringsA(str ptr long) kernel32.ExpandEnvironmentStringsA 460 stdcall -noname SHExpandEnvironmentStringsW(wstr ptr long) kernel32.ExpandEnvironmentStringsW 461 stdcall -noname SHGetAppCompatFlags(long) -462 stub -noname UrlFixupW +462 stdcall -noname UrlFixupW(wstr wstr long) 463 stub -noname SHExpandEnvironmentStringsForUserA 464 stub -noname SHExpandEnvironmentStringsForUserW 465 stub -noname PathUnExpandEnvStringsForUserA diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 6498862..f031297 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -2382,3 +2382,35 @@ HRESULT WINAPI MLBuildResURLW(LPCWSTR lpszLibName, HMODULE hMod, DWORD dwFlags, } return hRet; } + +/*********************************************************************** + * UrlFixupW [SHLWAPI.462] + * + * Checks the scheme part of a URL and attempts to correct misspellings. + * + * PARAMS + * lpszUrl [I] Pointer to the URL to be corrected + * lpszTranslatedUrl [O] Pointer to a buffer to store corrected URL + * dwMaxChars [I] Maximum size of corrected URL + * + * RETURNS + * success: S_OK if URL corrected or already correct + * failure: S_FALSE if unable to correct / COM error code if other error + * + */ +HRESULT WINAPI UrlFixupW(LPCWSTR url, LPWSTR translatedUrl, DWORD maxChars) +{ + DWORD srcLen; + + FIXME("(%s,%p,%d) STUB\n", debugstr_w(url), translatedUrl, maxChars); + + if (!url) + return E_FAIL; + + srcLen = lstrlenW(url); + + /* For now just copy the URL directly */ + lstrcpynW(translatedUrl, url, (maxChars < srcLen) ? maxChars : srcLen); + + return S_OK; +}

1 0

Owen Rudge : shlwapi: Implement stub for ZoneCheckUrlExW.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: e6f2ec4766d03aba2ceecf26969d90e49a0afa15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f2ec4766d03aba2ceecf269… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Sep 2 16:38:08 2009 +0100 shlwapi: Implement stub for ZoneCheckUrlExW. --- dlls/shlwapi/ordinal.c | 25 +++++++++++++++++++++++++ dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 43b46a8..0ecbab8 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4672,3 +4672,28 @@ INT WINAPI SHFormatDateTimeA(const FILETIME UNALIGNED *fileTime, DWORD *flags, HeapFree(GetProcessHeap(), 0, bufW); return retval; } + +/*********************************************************************** + * ZoneCheckUrlExW [SHLWAPI.231] + * + * Checks the details of the security zone for the supplied site. (?) + * + * PARAMS + * + * szURL [I] Pointer to the URL to check + * + * Other parameters currently unknown. + * + * RETURNS + * unknown + */ + +INT WINAPI ZoneCheckUrlExW(LPWSTR szURL, PVOID pUnknown, DWORD dwUnknown2, + DWORD dwUnknown3, DWORD dwUnknown4, DWORD dwUnknown5, DWORD dwUnknown6, + DWORD dwUnknown7) +{ + FIXME("(%s,%p,%x,%x,%x,%x,%x,%x) STUB\n", debugstr_w(szURL), pUnknown, dwUnknown2, + dwUnknown3, dwUnknown4, dwUnknown5, dwUnknown6, dwUnknown7); + + return 0; +} diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 7f37e73..158d5e3 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -228,7 +228,7 @@ 228 stub -noname ZoneCheckUrlA 229 stub -noname ZoneCheckUrlW 230 stub -noname ZoneCheckUrlExA -231 stub -noname ZoneCheckUrlExW +231 stdcall -noname ZoneCheckUrlExW(wstr ptr long long long long long long) 232 stub -noname ZoneCheckUrlExCacheA 233 stub -noname ZoneCheckUrlExCacheW 234 stub -noname ZoneCheckHost

1 0

Owen Rudge : shlwapi: Implement stubs for SHFormatDateTimeA/W.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: 79d671b7ec58943e76df42472789f9f24424daf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79d671b7ec58943e76df42472… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Sep 2 16:38:02 2009 +0100 shlwapi: Implement stubs for SHFormatDateTimeA/W. --- dlls/shlwapi/ordinal.c | 50 +++++++++++++++++++++++++++++++++++++++++++++ dlls/shlwapi/shlwapi.spec | 4 +- 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 5b00500..43b46a8 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4622,3 +4622,53 @@ HRESULT WINAPI SHGetViewStatePropertyBag(LPCITEMIDLIST pidl, LPWSTR bag_name, return E_NOTIMPL; } + +/*********************************************************************** + * SHFormatDateTimeW [SHLWAPI.354] + * + * Produces a string representation of a time. + * + * PARAMS + * fileTime [I] Pointer to FILETIME structure specifying the time + * flags [I] Flags specifying the desired output + * buf [O] Pointer to buffer for output + * bufSize [I] Number of characters that can be contained in buffer + * + * RETURNS + * success: number of characters written to the buffer + * failure: 0 + * + */ +INT WINAPI SHFormatDateTimeW(const FILETIME UNALIGNED *fileTime, DWORD *flags, + LPWSTR buf, UINT bufSize) +{ + FIXME("%p %p %s %d STUB\n", fileTime, flags, debugstr_w(buf), bufSize); + return 0; +} + +/*********************************************************************** + * SHFormatDateTimeA [SHLWAPI.353] + * + * See SHFormatDateTimeW. + * + */ +INT WINAPI SHFormatDateTimeA(const FILETIME UNALIGNED *fileTime, DWORD *flags, + LPCSTR buf, UINT bufSize) +{ + WCHAR *bufW; + DWORD buflenW, convlen; + INT retval; + + if (!buf || !bufSize) + return 0; + + buflenW = bufSize; + bufW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * buflenW); + retval = SHFormatDateTimeW(fileTime, flags, bufW, buflenW); + + if (retval != 0) + convlen = WideCharToMultiByte(CP_ACP, 0, bufW, -1, (LPSTR) buf, bufSize, NULL, NULL); + + HeapFree(GetProcessHeap(), 0, bufW); + return retval; +} diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 87fba40..7f37e73 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -350,8 +350,8 @@ 350 stdcall -noname GetFileVersionInfoSizeWrapW(wstr ptr) 351 stdcall -noname GetFileVersionInfoWrapW(wstr long long ptr) 352 stdcall -noname VerQueryValueWrapW(ptr wstr ptr ptr) -353 stub -noname SHFormatDateTimeA -354 stub -noname SHFormatDateTimeW +353 stdcall -noname SHFormatDateTimeA(ptr ptr str long) +354 stdcall -noname SHFormatDateTimeW(ptr ptr wstr long) 355 stdcall -noname IUnknown_EnableModeless(ptr long) 356 stdcall -noname CreateAllAccessSecurityAttributes(ptr ptr long) 357 stdcall -noname SHGetNewLinkInfoWrapW(wstr wstr wstr long long)

1 0

Owen Rudge : shlwapi: Implement stub for SHGetViewStatePropertyBag.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: 9e7c8e064b5c7e4ac20d7d7a0e6adc465b1041c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e7c8e064b5c7e4ac20d7d7a0… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Sep 2 16:37:57 2009 +0100 shlwapi: Implement stub for SHGetViewStatePropertyBag. --- dlls/shlwapi/ordinal.c | 27 +++++++++++++++++++++++++++ dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index b51bc5e..5b00500 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4595,3 +4595,30 @@ HRESULT WINAPI SHCreatePropertyBagOnRegKey (HKEY hKey, LPCWSTR subkey, return E_NOTIMPL; } + +/*********************************************************************** + * SHGetViewStatePropertyBag [SHLWAPI.515] + * + * Retrieves a property bag in which the view state information of a folder + * can be stored. + * + * PARAMS + * pidl [I] PIDL of the folder requested + * bag_name [I] Name of the property bag requested + * flags [I] Optional flags + * riid [I] IID of requested property bag interface + * ppv [O] Address to receive pointer to the new interface + * + * RETURNS + * success: S_OK + * failure: error code + * + */ +HRESULT WINAPI SHGetViewStatePropertyBag(LPCITEMIDLIST pidl, LPWSTR bag_name, + DWORD flags, REFIID riid, void **ppv) +{ + FIXME("%p %s %d %s %p STUB\n", pidl, debugstr_w(bag_name), flags, + debugstr_guid(riid), ppv); + + return E_NOTIMPL; +} diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 2c3b51a..87fba40 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -508,7 +508,7 @@ 512 stub -noname IStream_ReadPidl 513 stub -noname IStream_WritePidl 514 stdcall -noname IUnknown_ProfferService(ptr ptr ptr ptr) -515 stub -noname SHGetViewStatePropertyBag +515 stdcall -noname SHGetViewStatePropertyBag(ptr wstr long ptr ptr) 516 stdcall -noname SKGetValueW(long wstr wstr long long long) 517 stub -noname SKSetValueW 518 stub -noname SKDeleteValueW

1 0

Owen Rudge : shlwapi: Implement stub for SHCreatePropertyBagOnRegKey.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: 3006cba5bd7a29ceecf32e21a441bc8e84707cc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3006cba5bd7a29ceecf32e21a… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Sep 2 16:37:53 2009 +0100 shlwapi: Implement stub for SHCreatePropertyBagOnRegKey. --- dlls/shlwapi/ordinal.c | 26 ++++++++++++++++++++++++++ dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index d4fa0de..b51bc5e 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4569,3 +4569,29 @@ free_sids: return psd; } + +/*********************************************************************** + * SHCreatePropertyBagOnRegKey [SHLWAPI.471] + * + * Creates a property bag from a registry key + * + * PARAMS + * hKey [I] Handle to the desired registry key + * subkey [I] Name of desired subkey, or NULL to open hKey directly + * grfMode [I] Optional flags + * riid [I] IID of requested property bag interface + * ppv [O] Address to receive pointer to the new interface + * + * RETURNS + * success: 0 + * failure: error code + * + */ +HRESULT WINAPI SHCreatePropertyBagOnRegKey (HKEY hKey, LPCWSTR subkey, + DWORD grfMode, REFIID riid, void **ppv) +{ + FIXME("%p %s %d %s %p STUB\n", hKey, debugstr_w(subkey), grfMode, + debugstr_guid(riid), ppv); + + return E_NOTIMPL; +} diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 073d257..2c3b51a 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -468,7 +468,7 @@ 468 stub -noname RunIndirectRegCommand 469 stub -noname RunRegCommand 470 stub -noname IUnknown_ProfferServiceOld -471 stub -noname SHCreatePropertyBagOnRegKey +471 stdcall -noname SHCreatePropertyBagOnRegKey(long wstr long ptr ptr) 472 stub -noname SHCreatePropertyBagOnProfileSelection 473 stub -noname SHGetIniStringUTF7W 474 stub -noname SHSetIniStringUTF7W

1 0

Owen Rudge : shlwapi: Implement IUnknown_UIActivateIO.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: dbac3f17119865b7583dbd35e65ef4edcd1d0cbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbac3f17119865b7583dbd35e… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Sep 2 16:37:49 2009 +0100 shlwapi: Implement IUnknown_UIActivateIO. --- dlls/shlwapi/ordinal.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 38 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index c18d1ea..d4fa0de 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -1475,6 +1475,43 @@ HRESULT WINAPI IUnknown_QueryService(IUnknown* lpUnknown, REFGUID sid, REFIID ri } /************************************************************************* + * @ [SHLWAPI.479] + * + * Call an object's UIActivateIO method. + * + * PARAMS + * unknown [I] Object to call the UIActivateIO method on + * activate [I] Parameter for UIActivateIO call + * msg [I] Parameter for UIActivateIO call + * + * RETURNS + * Success: Value of UI_ActivateIO call + * Failure: An HRESULT error code + * + * NOTES + * unknown is expected to support the IInputObject interface. + */ +HRESULT WINAPI IUnknown_UIActivateIO(IUnknown *unknown, BOOL activate, LPMSG msg) +{ + IInputObject* object = NULL; + HRESULT ret; + + if (!unknown) + return E_FAIL; + + /* Get an IInputObject interface from the object */ + ret = IUnknown_QueryInterface(unknown, &IID_IInputObject, (LPVOID*) &object); + + if (ret == S_OK) + { + ret = IInputObject_UIActivateIO(object, activate, msg); + IUnknown_Release(object); + } + + return ret; +} + +/************************************************************************* * @ [SHLWAPI.177] * * Loads a popup menu. diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index b6426e7..073d257 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -476,7 +476,7 @@ 476 stub -noname SHGetObjectCompatFlags 477 stub -noname SHCreatePropertyBagOnMemory 478 stdcall -noname IUnknown_TranslateAcceleratorIO(ptr ptr) -479 stub -noname IUnknown_UIActivateIO +479 stdcall -noname IUnknown_UIActivateIO(ptr long ptr) 480 stdcall -noname UrlCrackW(wstr long long ptr) wininet.InternetCrackUrlW 481 stdcall -noname IUnknown_HasFocusIO(ptr) 482 stub -noname SHMessageBoxHelpA

1 0

Huw Davies : ole32: The server principal name can be the constant COLE_DEFAULT_PRINCIPAL.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: 9b38ffe6c6124f9ca3c07415b97f9ffce0a5d761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b38ffe6c6124f9ca3c07415b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 2 15:16:33 2009 +0100 ole32: The server principal name can be the constant COLE_DEFAULT_PRINCIPAL. --- dlls/ole32/marshal.c | 6 +++--- dlls/ole32/ole32.spec | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 3703de9..a5c4d11 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -553,9 +553,9 @@ static HRESULT WINAPI ProxyCliSec_SetBlanket(IClientSecurity *iface, void *pAuthInfo, DWORD Capabilities) { - FIXME("(%p, %d, %d, %s, %d, %d, %p, 0x%x): stub\n", pProxy, AuthnSvc, - AuthzSvc, debugstr_w(pServerPrincName), AuthnLevel, ImpLevel, - pAuthInfo, Capabilities); + FIXME("(%p, %d, %d, %s, %d, %d, %p, 0x%x): stub\n", pProxy, AuthnSvc, AuthzSvc, + pServerPrincName == (OLECHAR*)COLE_DEFAULT_PRINCIPAL ? "<default principal>" : debugstr_w(pServerPrincName), + AuthnLevel, ImpLevel, pAuthInfo, Capabilities); return E_NOTIMPL; } diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 79e7686..273ddba 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -70,7 +70,7 @@ @ stdcall CoRevokeClassObject(long) @ stdcall CoRevokeInitializeSpy(double) @ stdcall CoRevokeMallocSpy() -@ stdcall CoSetProxyBlanket(ptr long long wstr long long ptr long) +@ stdcall CoSetProxyBlanket(ptr long long ptr long long ptr long) @ stdcall CoSetState(ptr) @ stdcall CoSuspendClassObjects() @ stdcall CoSwitchCallContext(ptr ptr)

1 0