March 2007 - Wine-commits - list.winehq.org

Francois Gouget : setupapi: Fix InstallCatalog()'s calling convention.
by Alexandre Julliard 28 Mar '07

28 Mar '07

Module: wine Branch: master Commit: 61db3be294dd65341dfdfcdc6ab21dce4402aebd URL: http://source.winehq.org/git/wine.git/?a=commit;h=61db3be294dd65341dfdfcdc6… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 28 09:59:43 2007 +0200 setupapi: Fix InstallCatalog()'s calling convention. --- dlls/setupapi/misc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 677a0ea..f00cd2d 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -978,7 +978,7 @@ BOOL WINAPI SetupCopyOEMInfW( PCWSTR source, PCWSTR location, /*********************************************************************** * InstallCatalog (SETUPAPI.@) */ -DWORD InstallCatalog( LPCSTR catalog, LPCSTR basename, LPSTR fullname ) +DWORD WINAPI InstallCatalog( LPCSTR catalog, LPCSTR basename, LPSTR fullname ) { FIXME("%s, %s, %p\n", debugstr_a(catalog), debugstr_a(basename), fullname); return 0;

1 0

Dmitry Timoshkov : include: Add some API prototypes to appropriate header files, fix some prototypes.
by Alexandre Julliard 28 Mar '07

28 Mar '07

Module: wine Branch: master Commit: 674ce99320223f8737c2646b56227b7b0ea32c19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=674ce99320223f8737c2646b5… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Mar 28 15:51:46 2007 +0900 include: Add some API prototypes to appropriate header files, fix some prototypes. --- dlls/mpr/wnet.c | 4 ++-- dlls/shell32/shellord.c | 2 +- include/shlobj.h | 1 + include/winnetwk.h | 6 ++++++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 79ddd22..8999b74 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1489,7 +1489,7 @@ DWORD WINAPI WNetCancelConnection2W( LPCWSTR lpName, DWORD dwFlags, BOOL fForce /***************************************************************** * WNetRestoreConnectionA [MPR.@] */ -DWORD WINAPI WNetRestoreConnectionA( HWND hwndOwner, LPSTR lpszDevice ) +DWORD WINAPI WNetRestoreConnectionA( HWND hwndOwner, LPCSTR lpszDevice ) { FIXME( "(%p, %s), stub\n", hwndOwner, debugstr_a(lpszDevice) ); @@ -1500,7 +1500,7 @@ DWORD WINAPI WNetRestoreConnectionA( HWND hwndOwner, LPSTR lpszDevice ) /***************************************************************** * WNetRestoreConnectionW [MPR.@] */ -DWORD WINAPI WNetRestoreConnectionW( HWND hwndOwner, LPWSTR lpszDevice ) +DWORD WINAPI WNetRestoreConnectionW( HWND hwndOwner, LPCWSTR lpszDevice ) { FIXME( "(%p, %s), stub\n", hwndOwner, debugstr_w(lpszDevice) ); diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 4719c77..f2f72dc 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1063,7 +1063,7 @@ VOID WINAPI SHSetInstanceExplorer (LPUNKNOWN lpUnknown) * NOTES * gets the interface pointer of the explorer and a reference */ -HRESULT WINAPI SHGetInstanceExplorer (LPUNKNOWN * lpUnknown) +HRESULT WINAPI SHGetInstanceExplorer (IUnknown **lpUnknown) { TRACE("%p\n", lpUnknown); *lpUnknown = SHELL32_IExplorerInterface; diff --git a/include/shlobj.h b/include/shlobj.h index d92e4cb..84d7845 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -52,6 +52,7 @@ BOOL WINAPI SHFindFiles(LPCITEMIDLIST,LPCITEMIDLIST); DWORD WINAPI SHFormatDrive(HWND,UINT,UINT,UINT); void WINAPI SHFree(LPVOID); BOOL WINAPI GetFileNameFromBrowse(HWND,LPSTR,DWORD,LPCSTR,LPCSTR,LPCSTR,LPCSTR); +HRESULT WINAPI SHGetInstanceExplorer(IUnknown**); BOOL WINAPI SHGetPathFromIDListA(LPCITEMIDLIST,LPSTR); BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST,LPWSTR); #define SHGetPathFromIDList WINELIB_NAME_AW(SHGetPathFromIDList) diff --git a/include/winnetwk.h b/include/winnetwk.h index 4b6a27f..e0b8ab8 100644 --- a/include/winnetwk.h +++ b/include/winnetwk.h @@ -142,6 +142,12 @@ DWORD WINAPI WNetCancelConnection2W(LPCWSTR,DWORD,BOOL); DWORD WINAPI WNetGetConnectionA(LPCSTR,LPSTR,LPDWORD); DWORD WINAPI WNetGetConnectionW(LPCWSTR,LPWSTR,LPDWORD); #define WNetGetConnection WINELIB_NAME_AW(WNetGetConnection) +DWORD WINAPI WNetGetLastErrorA(LPDWORD,LPSTR,DWORD,LPSTR,DWORD); +DWORD WINAPI WNetGetLastErrorW(LPDWORD,LPWSTR,DWORD,LPWSTR,DWORD); +#define WNetGetLastError WINELIB_NAME_AW(WNetGetLastError) +DWORD WINAPI WNetRestoreConnectionA(HWND,LPCSTR); +DWORD WINAPI WNetRestoreConnectionW(HWND,LPCWSTR); +#define WNetRestoreConnection WINELIB_NAME_AW(WNetRestoreConnection) DWORD WINAPI WNetUseConnectionA(HWND,LPNETRESOURCEA,LPCSTR,LPCSTR,DWORD,LPSTR,LPDWORD,LPDWORD); DWORD WINAPI WNetUseConnectionW(HWND,LPNETRESOURCEW,LPCWSTR,LPCWSTR,DWORD,LPWSTR,LPDWORD,LPDWORD); #define WNetUseConnection WINELIB_NAME_AW(WNetUseConnection)

1 0

Rob Shearman : ole32: Implement MkParseDisplayName.
by Alexandre Julliard 28 Mar '07

28 Mar '07

Module: wine Branch: master Commit: f8789122aa7b6ed3894c61b4e74784650abfd0f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8789122aa7b6ed3894c61b4e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Mar 27 18:21:23 2007 +0100 ole32: Implement MkParseDisplayName. --- dlls/ole32/classmoniker.c | 83 ++++++++++++++++++++++++++++++- dlls/ole32/compobj.c | 2 + dlls/ole32/filemoniker.c | 100 +++++++++++++++++++++++++++++++++++++ dlls/ole32/moniker.c | 119 ++++++++++++++++++++++++++++++++++++++++++- dlls/ole32/moniker.h | 5 ++ dlls/ole32/tests/moniker.c | 18 +++--- 6 files changed, 314 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f8789122aa7b6ed3894c6…

1 0

Rob Shearman : rpcrt4: Fixing the using of the auth_len values the wrong way round - PKT_PRIVACY implies the packet will be encrypted , not just signed.
by Alexandre Julliard 28 Mar '07

28 Mar '07

Module: wine Branch: master Commit: 173590a6647f94bb3d7843c46b194a157fcd696f URL: http://source.winehq.org/git/wine.git/?a=commit;h=173590a6647f94bb3d7843c46… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 28 08:57:49 2007 +0100 rpcrt4: Fixing the using of the auth_len values the wrong way round - PKT_PRIVACY implies the packet will be encrypted, not just signed. --- dlls/rpcrt4/rpc_message.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 53d191b..1086602 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -381,9 +381,9 @@ static RPC_STATUS RPCRT4_SendAuth(RpcConnection *Connection, RpcPktHdr *Header, else if (Connection->AuthInfo && packet_has_auth_verifier(Header)) { if ((Connection->AuthInfo->AuthnLevel == RPC_C_AUTHN_LEVEL_PKT_PRIVACY) && packet_has_body(Header)) - Header->common.auth_len = Connection->signature_auth_len; - else Header->common.auth_len = Connection->encryption_auth_len; + else + Header->common.auth_len = Connection->signature_auth_len; } else Header->common.auth_len = 0;

1 0

Rob Shearman : ole32: Add some more tests for MkParseDisplayName.
by Alexandre Julliard 28 Mar '07

28 Mar '07

Module: wine Branch: master Commit: 87a4516bd9f5914133522288a9bf8cf8ff510dfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=87a4516bd9f5914133522288a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Mar 27 18:20:29 2007 +0100 ole32: Add some more tests for MkParseDisplayName. --- dlls/ole32/tests/moniker.c | 151 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 150 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 06c5698..d71cb26 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -29,6 +29,7 @@ #include "winbase.h" #include "objbase.h" #include "comcat.h" +#include "olectl.h" #include "wine/test.h" @@ -666,6 +667,55 @@ static void test_ROT(void) IRunningObjectTable_Release(pROT); } +static HRESULT WINAPI ParseDisplayName_QueryInterface(IParseDisplayName *iface, REFIID riid, void **ppv) +{ + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IParseDisplayName)) + { + *ppv = iface; + IUnknown_AddRef(iface); + return S_OK; + } + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI ParseDisplayName_AddRef(IParseDisplayName *iface) +{ + return 2; +} + +static ULONG WINAPI ParseDisplayName_Release(IParseDisplayName *iface) +{ + return 1; +} + +static LPCWSTR expected_display_name; + +static HRESULT WINAPI ParseDisplayName_ParseDisplayName(IParseDisplayName *iface, + IBindCtx *pbc, + LPOLESTR pszDisplayName, + ULONG *pchEaten, + IMoniker **ppmkOut) +{ + char display_nameA[256]; + WideCharToMultiByte(CP_ACP, 0, pszDisplayName, -1, display_nameA, sizeof(display_nameA), NULL, NULL); + ok(!lstrcmpW(pszDisplayName, expected_display_name), "unexpected display name \"%s\"\n", display_nameA); + ok(pszDisplayName == expected_display_name, "pszDisplayName should be the same pointer as passed into MkParseDisplayName\n"); + *pchEaten = lstrlenW(pszDisplayName); + return CreateAntiMoniker(ppmkOut); +} + +static const IParseDisplayNameVtbl ParseDisplayName_Vtbl = +{ + ParseDisplayName_QueryInterface, + ParseDisplayName_AddRef, + ParseDisplayName_Release, + ParseDisplayName_ParseDisplayName +}; + +static IParseDisplayName ParseDisplayName = { &ParseDisplayName_Vtbl }; + static int count_moniker_matches(IBindCtx * pbc, IEnumMoniker * spEM) { IMoniker * spMoniker; @@ -708,19 +758,118 @@ static void test_MkParseDisplayName(void) DWORD pdwReg1=0; DWORD grflags=0; DWORD pdwReg2=0; + DWORD moniker_type; IRunningObjectTable * pprot=NULL; /* CLSID of My Computer */ static const WCHAR wszDisplayName[] = {'c','l','s','i','d',':', '2','0','D','0','4','F','E','0','-','3','A','E','A','-','1','0','6','9','-','A','2','D','8','-','0','8','0','0','2','B','3','0','3','0','9','D',':',0}; + static const WCHAR wszDisplayNameClsid[] = {'c','l','s','i','d',':',0}; + static const WCHAR wszNonExistantProgId[] = {'N','o','n','E','x','i','s','t','a','n','t','P','r','o','g','I','d',':',0}; + static const WCHAR wszDisplayNameRunning[] = {'W','i','n','e','T','e','s','t','R','u','n','n','i','n','g',0}; + static const WCHAR wszDisplayNameProgId1[] = {'S','t','d','F','o','n','t',':',0}; + static const WCHAR wszDisplayNameProgId2[] = {'@','S','t','d','F','o','n','t',0}; + static const WCHAR wszDisplayNameProgIdFail[] = {'S','t','d','F','o','n','t',0}; + char szDisplayNameFile[256]; + WCHAR wszDisplayNameFile[256]; hr = CreateBindCtx(0, &pbc); ok_ole_success(hr, CreateBindCtx); + hr = MkParseDisplayName(pbc, wszNonExistantProgId, &eaten, &pmk); + todo_wine { ok(hr == MK_E_CANTOPENFILE, "MkParseDisplayName should have failed with MK_E_CANTOPENFILE instead of 0x%08x\n", hr); } + + /* no special handling of "clsid:" without the string form of the clsid + * following */ + hr = MkParseDisplayName(pbc, wszDisplayNameClsid, &eaten, &pmk); + todo_wine { ok(hr == MK_E_CANTOPENFILE, "MkParseDisplayName should have failed with MK_E_CANTOPENFILE instead of 0x%08x\n", hr); } + + /* shows clsid has higher precedence than a running object */ + hr = CreateFileMoniker(wszDisplayName, &pmk); + ok_ole_success(hr, CreateFileMoniker); + hr = IBindCtx_GetRunningObjectTable(pbc, &pprot); + ok_ole_success(hr, IBindCtx_GetRunningObjectTable); + hr = IRunningObjectTable_Register(pprot, 0, (IUnknown *)&Test_ClassFactory, pmk, &pdwReg1); + ok_ole_success(hr, IRunningObjectTable_Register); + IMoniker_Release(pmk); + pmk = NULL; + hr = MkParseDisplayName(pbc, wszDisplayName, &eaten, &pmk); + todo_wine { ok_ole_success(hr, MkParseDisplayName); } + if (pmk) + { + IMoniker_IsSystemMoniker(pmk, &moniker_type); + ok(moniker_type == MKSYS_CLASSMONIKER, "moniker_type was %d instead of MKSYS_CLASSMONIKER\n", moniker_type); + IMoniker_Release(pmk); + } + hr = IRunningObjectTable_Revoke(pprot, pdwReg1); + ok_ole_success(hr, IRunningObjectTable_Revoke); + IRunningObjectTable_Release(pprot); + + hr = CreateFileMoniker(wszDisplayNameRunning, &pmk); + ok_ole_success(hr, CreateFileMoniker); + hr = IBindCtx_GetRunningObjectTable(pbc, &pprot); + ok_ole_success(hr, IBindCtx_GetRunningObjectTable); + hr = IRunningObjectTable_Register(pprot, 0, (IUnknown *)&Test_ClassFactory, pmk, &pdwReg1); + ok_ole_success(hr, IRunningObjectTable_Register); + IMoniker_Release(pmk); + pmk = NULL; + hr = MkParseDisplayName(pbc, wszDisplayNameRunning, &eaten, &pmk); + todo_wine { ok_ole_success(hr, MkParseDisplayName); } + if (pmk) + { + IMoniker_IsSystemMoniker(pmk, &moniker_type); + ok(moniker_type == MKSYS_FILEMONIKER, "moniker_type was %d instead of MKSYS_FILEMONIKER\n", moniker_type); + IMoniker_Release(pmk); + } + hr = IRunningObjectTable_Revoke(pprot, pdwReg1); + ok_ole_success(hr, IRunningObjectTable_Revoke); + IRunningObjectTable_Release(pprot); + + hr = CoRegisterClassObject(&CLSID_StdFont, (IUnknown *)&ParseDisplayName, CLSCTX_INPROC_SERVER, REGCLS_MULTI_SEPARATE, &pdwReg1); + ok_ole_success(hr, CoRegisterClassObject); + + expected_display_name = wszDisplayNameProgId1; + hr = MkParseDisplayName(pbc, wszDisplayNameProgId1, &eaten, &pmk); + todo_wine { ok_ole_success(hr, MkParseDisplayName); } + if (pmk) + { + IMoniker_IsSystemMoniker(pmk, &moniker_type); + ok(moniker_type == MKSYS_ANTIMONIKER, "moniker_type was %d instead of MKSYS_ANTIMONIKER\n", moniker_type); + IMoniker_Release(pmk); + } + + expected_display_name = wszDisplayNameProgId2; + hr = MkParseDisplayName(pbc, wszDisplayNameProgId2, &eaten, &pmk); + todo_wine { ok_ole_success(hr, MkParseDisplayName); } + if (pmk) + { + IMoniker_IsSystemMoniker(pmk, &moniker_type); + ok(moniker_type == MKSYS_ANTIMONIKER, "moniker_type was %d instead of MKSYS_ANTIMONIKER\n", moniker_type); + IMoniker_Release(pmk); + } + + hr = MkParseDisplayName(pbc, wszDisplayNameProgIdFail, &eaten, &pmk); + todo_wine { ok(hr == MK_E_CANTOPENFILE, "MkParseDisplayName with ProgId without marker should fail with MK_E_CANTOPENFILE instead of 0x%08x\n", hr); } + + hr = CoRevokeClassObject(pdwReg1); + ok_ole_success(hr, CoRevokeClassObject); + + GetSystemDirectoryA(szDisplayNameFile, sizeof(szDisplayNameFile)); + strcat(szDisplayNameFile, "\\kernel32.dll"); + MultiByteToWideChar(CP_ACP, 0, szDisplayNameFile, -1, wszDisplayNameFile, sizeof(wszDisplayNameFile)/sizeof(wszDisplayNameFile[0])); + hr = MkParseDisplayName(pbc, wszDisplayNameFile, &eaten, &pmk); + todo_wine { ok_ole_success(hr, MkParseDisplayName); } + if (pmk) + { + IMoniker_IsSystemMoniker(pmk, &moniker_type); + ok(moniker_type == MKSYS_FILEMONIKER, "moniker_type was %d instead of MKSYS_FILEMONIKER\n", moniker_type); + IMoniker_Release(pmk); + } + hr = MkParseDisplayName(pbc, wszDisplayName, &eaten, &pmk); todo_wine { ok_ole_success(hr, MkParseDisplayName); } - if (object) + if (pmk) { hr = IMoniker_BindToObject(pmk, pbc, NULL, &IID_IUnknown, (LPVOID*)&object); ok_ole_success(hr, IMoniker_BindToObject);

1 0

Rob Shearman : ole32: Display the testname for the test for display name in test_moniker.
by Alexandre Julliard 28 Mar '07

28 Mar '07

Module: wine Branch: master Commit: 32dc3989762ec5ec1c84eae67cd71242d5cb7c13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32dc3989762ec5ec1c84eae67… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Mar 27 18:19:51 2007 +0100 ole32: Display the testname for the test for display name in test_moniker. --- dlls/ole32/tests/moniker.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 513bb94..06c5698 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -961,7 +961,7 @@ static void test_moniker( hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &display_name); ok_ole_success(hr, IMoniker_GetDisplayName); - ok(!lstrcmpW(display_name, expected_display_name), "display name wasn't what was expected\n"); + ok(!lstrcmpW(display_name, expected_display_name), "%s: display name wasn't what was expected\n", testname); CoTaskMemFree(display_name); IBindCtx_Release(bindctx);

1 0

Rob Shearman : ole32: Do a case-insensitive comparison in the count_moniker_matches in the moniker tests as Win9x marshals an all upper-case file name for file monikers .
by Alexandre Julliard 28 Mar '07

28 Mar '07

Module: wine Branch: master Commit: 4ce58cb531776233115d4788c7936834b7b32520 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ce58cb531776233115d4788c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Mar 27 18:18:38 2007 +0100 ole32: Do a case-insensitive comparison in the count_moniker_matches in the moniker tests as Win9x marshals an all upper-case file name for file monikers. --- dlls/ole32/tests/moniker.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index aa7c30f..513bb94 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -679,7 +679,7 @@ static int count_moniker_matches(IBindCtx * pbc, IEnumMoniker * spEM) hr=IMoniker_GetDisplayName(spMoniker, pbc, NULL, &szDisplayn); if (SUCCEEDED(hr)) { - if (!lstrcmpW(szDisplayn, wszFileName1) || !lstrcmpW(szDisplayn, wszFileName2)) + if (!lstrcmpiW(szDisplayn, wszFileName1) || !lstrcmpiW(szDisplayn, wszFileName2)) matchCnt++; CoTaskMemFree(szDisplayn); }

1 0

Rob Shearman : ole32: Add tests for the standard marshaler' s implementation of IClientSecurity.
by Alexandre Julliard 28 Mar '07

28 Mar '07

Module: wine Branch: master Commit: 1f70fc50c617c9b540d25e6ebb0022e9fb3e36c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f70fc50c617c9b540d25e6eb… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Mar 27 18:18:05 2007 +0100 ole32: Add tests for the standard marshaler's implementation of IClientSecurity. --- dlls/ole32/tests/marshal.c | 106 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 105 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index c174429..41a2aec 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -48,6 +48,14 @@ static const IID IID_IWineTest = {0xa1, 0xa2, 0x5d, 0x5a, 0x36, 0x54, 0xd3, 0xbd} }; /* 5201163f-8164-4fd0-a1a2-5d5a3654d3bd */ +static const IID IID_IRemUnknown = +{ + 0x00000131, + 0x0000, + 0x0000, + {0xc0,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} +}; + #define EXTENTID_WineTest IID_IWineTest #define CLSID_WineTest IID_IWineTest @@ -141,7 +149,9 @@ static HRESULT WINAPI Test_IClassFactory_QueryInterface( if (ppvObj == NULL) return E_POINTER; if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IClassFactory)) + IsEqualGUID(riid, &IID_IClassFactory) || + /* the only other interface Wine is currently able to marshal (for testing two proxies) */ + IsEqualGUID(riid, &IID_IRemUnknown)) { *ppvObj = (LPVOID)iface; IClassFactory_AddRef(iface); @@ -2110,6 +2120,99 @@ static void test_handler_marshaling(void) } +static void test_client_security(void) +{ + HRESULT hr; + IStream *pStream = NULL; + IClassFactory *pProxy = NULL; + IUnknown *pProxy2 = NULL; + IUnknown *pUnknown1 = NULL; + IUnknown *pUnknown2 = NULL; + IClientSecurity *pCliSec = NULL; + IMarshal *pMarshal; + DWORD tid; + HANDLE thread; + static const LARGE_INTEGER ullZero; + DWORD dwAuthnSvc; + DWORD dwAuthzSvc; + OLECHAR *pServerPrincName; + DWORD dwAuthnLevel; + DWORD dwImpLevel; + void *pAuthInfo; + DWORD dwCapabilities; + void *pv; + + cLocks = 0; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); + ok_ole_success(hr, "CreateStreamOnHGlobal"); + tid = start_host_object(pStream, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHLFLAGS_NORMAL, &thread); + + IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(pStream, &IID_IClassFactory, (void **)&pProxy); + ok_ole_success(hr, "CoUnmarshalInterface"); + IStream_Release(pStream); + + hr = IUnknown_QueryInterface(pProxy, &IID_IUnknown, (LPVOID*)&pUnknown1); + ok_ole_success(hr, "IUnknown_QueryInterface IID_IUnknown"); + + hr = IUnknown_QueryInterface(pProxy, &IID_IRemUnknown, (LPVOID*)&pProxy2); + ok_ole_success(hr, "IUnknown_QueryInterface IID_IStream"); + + hr = IUnknown_QueryInterface(pProxy2, &IID_IUnknown, (LPVOID*)&pUnknown2); + ok_ole_success(hr, "IUnknown_QueryInterface IID_IUnknown"); + + ok(pUnknown1 == pUnknown2, "both proxy's IUnknowns should be the same - %p, %p\n", pUnknown1, pUnknown2); + + hr = IUnknown_QueryInterface(pProxy, &IID_IMarshal, (LPVOID*)&pMarshal); + ok_ole_success(hr, "IUnknown_QueryInterface IID_IMarshal"); + + hr = IUnknown_QueryInterface(pProxy, &IID_IClientSecurity, (LPVOID*)&pCliSec); + ok_ole_success(hr, "IUnknown_QueryInterface IID_IClientSecurity"); + + hr = IClientSecurity_QueryBlanket(pCliSec, (IUnknown *)pProxy, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + todo_wine ok_ole_success(hr, "IClientSecurity_QueryBlanket (all NULLs)"); + + hr = IClientSecurity_QueryBlanket(pCliSec, (IUnknown *)pMarshal, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + todo_wine ok(hr == E_NOINTERFACE, "IClientSecurity_QueryBlanket with local interface should have returned E_NOINTERFACE instead of 0x%08x\n", hr); + + hr = IClientSecurity_QueryBlanket(pCliSec, (IUnknown *)pProxy, &dwAuthnSvc, &dwAuthzSvc, &pServerPrincName, &dwAuthnLevel, &dwImpLevel, &pAuthInfo, &dwCapabilities); + todo_wine ok_ole_success(hr, "IClientSecurity_QueryBlanket"); + + hr = IClientSecurity_SetBlanket(pCliSec, (IUnknown *)pProxy, dwAuthnSvc, dwAuthzSvc, pServerPrincName, dwAuthnLevel, RPC_C_IMP_LEVEL_IMPERSONATE, pAuthInfo, dwCapabilities); + todo_wine ok_ole_success(hr, "IClientSecurity_SetBlanket"); + + hr = IClassFactory_CreateInstance(pProxy, NULL, &IID_IWineTest, &pv); + ok(hr == E_NOINTERFACE, "COM call should have succeeded instead of returning 0x%08x\n", hr); + + hr = IClientSecurity_SetBlanket(pCliSec, (IUnknown *)pMarshal, dwAuthnSvc, dwAuthzSvc, pServerPrincName, dwAuthnLevel, dwImpLevel, pAuthInfo, dwCapabilities); + todo_wine ok(hr == E_NOINTERFACE, "IClientSecurity_SetBlanket with local interface should have returned E_NOINTERFACE instead of 0x%08x\n", hr); + + hr = IClientSecurity_SetBlanket(pCliSec, (IUnknown *)pProxy, 0xdeadbeef, dwAuthzSvc, pServerPrincName, dwAuthnLevel, dwImpLevel, pAuthInfo, dwCapabilities); + todo_wine ok(hr == E_INVALIDARG, "IClientSecurity_SetBlanke with invalid dwAuthnSvc should have returned E_INVALIDARG instead of 0x%08x\n", hr); + + CoTaskMemFree(pServerPrincName); + + hr = IClientSecurity_QueryBlanket(pCliSec, (IUnknown *)pUnknown1, &dwAuthnSvc, &dwAuthzSvc, &pServerPrincName, &dwAuthnLevel, &dwImpLevel, &pAuthInfo, &dwCapabilities); + todo_wine ok_ole_success(hr, "IClientSecurity_QueryBlanket(IUnknown)"); + + CoTaskMemFree(pServerPrincName); + + IClassFactory_Release(pProxy); +#if 0 + /* FIXME: fix stub manager to not depend on the IID of the interface to + * determine whether it is really the rem unknown for the object before + * re-enabling this line */ + IUnknown_Release(pProxy2); +#endif + IUnknown_Release(pUnknown1); + IUnknown_Release(pUnknown2); + IMarshal_Release(pMarshal); + IClientSecurity_Release(pCliSec); + + end_host_object(tid, thread); +} + static HANDLE heventShutdown; static void LockModuleOOP(void) @@ -2678,6 +2781,7 @@ START_TEST(marshal) test_freethreadedmarshaler(); test_inproc_handler(); test_handler_marshaling(); + test_client_security(); test_local_server();

1 0

Rob Shearman : ole32: Pass the OXID info to RPC_CreateClientChannel and use this to pass the server process ID to channel hooks .
by Alexandre Julliard 28 Mar '07

28 Mar '07

Module: wine Branch: master Commit: d6a435fc5653b890dadb3a0a8bf44a83d51f9b48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6a435fc5653b890dadb3a0a8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Mar 27 18:15:41 2007 +0100 ole32: Pass the OXID info to RPC_CreateClientChannel and use this to pass the server process ID to channel hooks. --- dlls/ole32/compobj_private.h | 1 + dlls/ole32/marshal.c | 1 + dlls/ole32/rpc.c | 11 +++++++++-- dlls/ole32/tests/marshal.c | 6 +----- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index ec51944..d99f41c 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -218,6 +218,7 @@ struct dispatch_params; void RPC_StartRemoting(struct apartment *apt); HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, + const OXID_INFO *oxid_info, DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan); HRESULT RPC_CreateServerChannel(IRpcChannelBuffer **chan); diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 0475ba5..120361a 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1206,6 +1206,7 @@ static HRESULT unmarshal_object(const STDOBJREF *stdobjref, APARTMENT *apt, { IRpcChannelBuffer *chanbuf; hr = RPC_CreateClientChannel(&stdobjref->oxid, &stdobjref->ipid, + &proxy_manager->oxid_info, proxy_manager->dest_context, proxy_manager->dest_context_data, &chanbuf); diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 60bd0d3..c7604b7 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -104,6 +104,7 @@ typedef struct RPC_BINDING_HANDLE bind; /* handle to the remote server */ OXID oxid; /* apartment in which the channel is valid */ + DWORD server_pid; /* id of server process */ DWORD dest_context; /* returned from GetDestCtx */ LPVOID dest_context_data; /* returned from GetDestCtx */ HANDLE event; /* cached event handle */ @@ -596,7 +597,7 @@ static HRESULT WINAPI ClientRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, message_state->channel_hook_info.iid = *riid; message_state->channel_hook_info.cbSize = sizeof(message_state->channel_hook_info); message_state->channel_hook_info.uCausality = COM_CurrentCausalityId(); - message_state->channel_hook_info.dwServerPid = 0; /* FIXME */ + message_state->channel_hook_info.dwServerPid = This->server_pid; message_state->channel_hook_info.iMethod = msg->ProcNum; message_state->channel_hook_info.pObject = NULL; /* only present on server-side */ @@ -998,6 +999,7 @@ static const IRpcChannelBufferVtbl ServerRpcChannelBufferVtbl = /* returns a channel buffer for proxies */ HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, + const OXID_INFO *oxid_info, DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan) { @@ -1007,7 +1009,7 @@ HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, RPC_STATUS status; LPWSTR string_binding; - /* connect to the apartment listener thread */ + /* FIXME: get the endpoint from oxid_info->psa instead */ get_rpc_endpoint(endpoint, oxid); TRACE("proxy pipe: connecting to endpoint: %s\n", debugstr_w(endpoint)); @@ -1052,6 +1054,7 @@ HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, This->super.refs = 1; This->bind = bind; apartment_getoxid(COM_CurrentApt(), &This->oxid); + This->server_pid = oxid_info->dwPid; This->dest_context = dest_context; This->dest_context_data = dest_context_data; This->event = NULL; @@ -1488,8 +1491,12 @@ void RPC_UnregisterInterface(REFIID riid) LeaveCriticalSection(&csRegIf); } +/* get the info for an OXID, including the IPID for the rem unknown interface + * and the string binding */ HRESULT RPC_ResolveOxid(OXID oxid, OXID_INFO *oxid_info) { + TRACE("%s\n", wine_dbgstr_longlong(oxid)); + oxid_info->dwTid = 0; oxid_info->dwPid = 0; oxid_info->dwAuthnHint = RPC_C_AUTHN_LEVEL_NONE; diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 0e588ba..c174429 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2460,9 +2460,7 @@ static void WINAPI TestChannelHook_ClientGetSize( trace("\t%s method %d\n", debugstr_iid(riid), info->iMethod); trace("\tcid: %s\n", debugstr_iid(&info->uCausality)); ok(info->cbSize == sizeof(*info), "info->cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); - todo_wine { ok(info->dwServerPid == GetCurrentProcessId(), "info->dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); - } ok(!info->pObject, "info->pObject should be NULL\n"); ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n"); @@ -2479,9 +2477,7 @@ static void WINAPI TestChannelHook_ClientFillBuffer( SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; trace("TestChannelHook_ClientFillBuffer\n"); ok(info->cbSize == sizeof(*info), "info->cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); - todo_wine { ok(info->dwServerPid == GetCurrentProcessId(), "info->dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); - } ok(!info->pObject, "info->pObject should be NULL\n"); ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n"); @@ -2501,8 +2497,8 @@ static void WINAPI TestChannelHook_ClientNotify( SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; trace("TestChannelHook_ClientNotify hrFault = 0x%08x\n", hrFault); ok(info->cbSize == sizeof(*info), "info->cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); - todo_wine { ok(info->dwServerPid == GetCurrentProcessId(), "info->dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); + todo_wine { ok(info->pObject != NULL, "info->pObject shouldn't be NULL\n"); } ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n");

1 0

Paul Vriens : kernel32/profile: Some parameter tests for GetPrivateProfileSectionA.
by Alexandre Julliard 28 Mar '07

28 Mar '07

Module: wine Branch: master Commit: 5de163f9d440dcc992bb41c753f1ff4f85d6aa6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5de163f9d440dcc992bb41c75… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Mar 27 22:08:20 2007 +0200 kernel32/profile: Some parameter tests for GetPrivateProfileSectionA. --- dlls/kernel32/tests/profile.c | 35 ++++++++++++++++++++++++++++++++--- 1 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 0893c1c..628a40b 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -135,7 +135,7 @@ static void test_profile_sections(void) DWORD count; char buf[100]; char *p; - static const char content[]="[s]\r\nname1=val1\r\nname2=\r\nname3\r\nname4=val4\r\n"; + static const char content[]="[section1]\r\nname1=val1\r\nname2=\r\nname3\r\nname4=val4\r\n[section2]\r\n"; static const char testfile4[]=".\\testwine4.ini"; DeleteFileA( testfile4 ); @@ -145,12 +145,41 @@ static void test_profile_sections(void) WriteFile( h, content, sizeof(content), &count, NULL); CloseHandle( h); - ret=GetPrivateProfileSectionA("s", buf, sizeof(buf), testfile4); + /* Some parameter checking */ + SetLastError(0xdeadbeef); + ret = GetPrivateProfileSectionA( NULL, NULL, 0, NULL ); + ok( ret == 0, "expected return size 0, got %d\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetPrivateProfileSectionA( NULL, NULL, 0, testfile4 ); + ok( ret == 0, "expected return size 0, got %d\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetPrivateProfileSectionA( "section1", NULL, 0, testfile4 ); + ok( ret == 0, "expected return size 0, got %d\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetPrivateProfileSectionA( NULL, buf, sizeof(buf), testfile4 ); + ok( ret == 0, "expected return size 0, got %d\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetPrivateProfileSectionA( "section1", buf, sizeof(buf), NULL ); + ok( ret == 0, "expected return size 0, got %d\n", ret ); + todo_wine + ok( GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + + /* And a real one */ + ret=GetPrivateProfileSectionA("section1", buf, sizeof(buf), testfile4); for( p = buf + strlen(buf) + 1; *p;p += strlen(p)+1) p[-1] = ','; - /* and test */ ok( ret == 35 && !strcmp( buf, "name1=val1,name2=,name3,name4=val4"), "wrong section returned(%d): %s\n", ret, buf); + ok( buf[ret-1] == 0 && buf[ret] == 0, "returned buffer not terminated with double-null\n" ); + ok( GetLastError() == S_OK, "expected S_OK, got %d\n", GetLastError()); DeleteFileA( testfile4 ); }

1 0