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

Mariusz Pluciński : shell32/tests: Basic tests of IKnownFolderManager.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: ab23dca7e9546a5e0f0e14a3fade6cd9ac93e3a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab23dca7e9546a5e0f0e14a3f… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Jun 9 10:40:02 2011 +0200 shell32/tests: Basic tests of IKnownFolderManager. --- dlls/shell32/tests/shellpath.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index d81ce80..7e77b25 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -883,6 +883,37 @@ if (0) { /* crashes */ ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); } +static void test_knownFolders(void) +{ + HRESULT hr; + IKnownFolderManager *mgr = NULL; + KNOWNFOLDERID folderId; + int csidl; + + CoInitialize(NULL); + + hr = CoCreateInstance(&CLSID_KnownFolderManager, NULL, CLSCTX_INPROC_SERVER, + &IID_IKnownFolderManager, (LPVOID*)&mgr); + if(hr == REGDB_E_CLASSNOTREG) + win_skip("IKnownFolderManager unavailable\n"); + else + { + ok(hr == S_OK, "failed to create KnownFolderManager instance: 0x%08x\n", hr); + + hr = IKnownFolderManager_FolderIdFromCsidl(mgr, CSIDL_WINDOWS, &folderId); + ok(hr == S_OK, "failed to convert CSIDL to KNOWNFOLDERID: 0x%08x\n", hr); + ok(IsEqualGUID(&folderId, &FOLDERID_Windows)==TRUE, "invalid KNOWNFOLDERID returned\n"); + + hr = IKnownFolderManager_FolderIdToCsidl(mgr, &FOLDERID_Windows, &csidl); + ok(hr == S_OK, "failed to convert CSIDL to KNOWNFOLDERID: 0x%08x\n", hr); + ok(csidl == CSIDL_WINDOWS, "invalid CSIDL returned\n"); + + hr = IKnownFolderManager_Release(mgr); + ok(hr == S_OK, "failed to release KnownFolderManager instance: 0x%08x\n", hr); + } + CoUninitialize(); +} + START_TEST(shellpath) { if (!init()) return; @@ -909,5 +940,6 @@ START_TEST(shellpath) testSystemDir(); test_NonExistentPath(); test_SHGetFolderPathEx(); + test_knownFolders(); } }

1 0

Mariusz Pluciński : shell32/tests: Basic tests of IKnownFolder.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 17aeb550bf8c59fb7e68dda4ee1181fe3fe0b1f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17aeb550bf8c59fb7e68dda4e… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Jun 9 10:40:44 2011 +0200 shell32/tests: Basic tests of IKnownFolder. --- 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 7e77b25..2a1c436 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -887,8 +887,15 @@ static void test_knownFolders(void) { HRESULT hr; IKnownFolderManager *mgr = NULL; + IKnownFolder *folder = NULL; KNOWNFOLDERID folderId; + KF_CATEGORY cat = 0; int csidl; + LPWSTR folderPath; + KF_REDIRECTION_CAPABILITIES redirectionCapabilities = 1; + WCHAR sWinDir[MAX_PATH]; + + GetWindowsDirectoryW( sWinDir, MAX_PATH ); CoInitialize(NULL); @@ -908,6 +915,38 @@ static void test_knownFolders(void) ok(hr == S_OK, "failed to convert CSIDL to KNOWNFOLDERID: 0x%08x\n", hr); ok(csidl == CSIDL_WINDOWS, "invalid CSIDL returned\n"); + hr = IKnownFolderManager_GetFolder(mgr, &FOLDERID_Windows, &folder); + ok(hr == S_OK, "failed to get known folder: 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + hr = IKnownFolder_GetCategory(folder, &cat); + todo_wine + ok(hr == S_OK, "failed to get folder category: 0x%08x\n", hr); + todo_wine + ok(cat==KF_CATEGORY_FIXED, "invalid folder category: %d\n", cat); + + hr = IKnownFolder_GetId(folder, &folderId); + ok(hr == S_OK, "failed to get folder id: 0x%08x\n", hr); + ok(IsEqualGUID(&folderId, &FOLDERID_Windows)==TRUE, "invalid KNOWNFOLDERID returned\n"); + + hr = IKnownFolder_GetPath(folder, 0, &folderPath); + ok(lstrcmpiW(sWinDir, folderPath)==0, "invalid path returned: \"%s\", expected: \"%s\"\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sWinDir)); + CoTaskMemFree(folderPath); + + hr = IKnownFolder_GetRedirectionCapabilities(folder, &redirectionCapabilities); + todo_wine + ok(hr == S_OK, "failed to get redirection capabilities: 0x%08x\n", hr); + todo_wine + ok(redirectionCapabilities==0, "invalid redirection capabilities returned: %d\n", redirectionCapabilities); + + hr = IKnownFolder_SetPath(folder, 0, sWinDir); + todo_wine + ok(hr == E_INVALIDARG, "unexpected value from SetPath: 0x%08x\n", hr); + + hr = IKnownFolder_Release(folder); + ok(hr == S_OK, "failed to release KnownFolder instance: 0x%08x\n", hr); + } + hr = IKnownFolderManager_Release(mgr); ok(hr == S_OK, "failed to release KnownFolderManager instance: 0x%08x\n", hr); }

1 0

Mariusz Pluciński : include: Add definition of inline function FreeKnownFolderDefinitionFields.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 3ea1fa170c28803449570c7ce8b4bbe1e5398608 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea1fa170c28803449570c7ce… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Jun 9 10:40:55 2011 +0200 include: Add definition of inline function FreeKnownFolderDefinitionFields. --- include/shobjidl.idl | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index c4eac65..86f5ecb 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3058,6 +3058,19 @@ interface IKnownFolderManager : IUnknown [out, string] LPWSTR *ppszError); } +/* function for releasing structure returned from IKnownFolder::GetFolderDefinition */ +cpp_quote("static inline void FreeKnownFolderDefinitionFields(KNOWNFOLDER_DEFINITION *pKFD)") +cpp_quote("{") +cpp_quote(" CoTaskMemFree(pKFD->pszName);") +cpp_quote(" CoTaskMemFree(pKFD->pszDescription);") +cpp_quote(" CoTaskMemFree(pKFD->pszRelativePath);") +cpp_quote(" CoTaskMemFree(pKFD->pszParsingName);") +cpp_quote(" CoTaskMemFree(pKFD->pszTooltip);") +cpp_quote(" CoTaskMemFree(pKFD->pszLocalizedName);") +cpp_quote(" CoTaskMemFree(pKFD->pszIcon);") +cpp_quote(" CoTaskMemFree(pKFD->pszSecurity);") +cpp_quote("}") + /***************************************************************************** * ShellObjects typelibrary */

1 0

Mariusz Pluciński : shell32/tests: Test of IKnownFolder::GetFolderDefinition.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: bc38d5cd921c75972df6e05020f9593380770e8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc38d5cd921c75972df6e0502… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Jun 9 10:41:04 2011 +0200 shell32/tests: Test of IKnownFolder::GetFolderDefinition. --- dlls/shell32/tests/shellpath.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 2a1c436..2d710dc 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -885,11 +885,13 @@ if (0) { /* crashes */ static void test_knownFolders(void) { + static const WCHAR sWindows[] = {'W','i','n','d','o','w','s',0}; HRESULT hr; IKnownFolderManager *mgr = NULL; IKnownFolder *folder = NULL; KNOWNFOLDERID folderId; KF_CATEGORY cat = 0; + KNOWNFOLDER_DEFINITION kfDefinition; int csidl; LPWSTR folderPath; KF_REDIRECTION_CAPABILITIES redirectionCapabilities = 1; @@ -943,6 +945,20 @@ static void test_knownFolders(void) todo_wine ok(hr == E_INVALIDARG, "unexpected value from SetPath: 0x%08x\n", hr); + hr = IKnownFolder_GetFolderDefinition(folder, &kfDefinition); + todo_wine + ok(hr == S_OK, "failed to get folder definition: 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + todo_wine + ok(kfDefinition.category==KF_CATEGORY_FIXED, "invalid folder category: 0x%08x\n", kfDefinition.category); + todo_wine + ok(lstrcmpW(kfDefinition.pszName, sWindows)==0, "invalid folder name: %s\n", wine_dbgstr_w(kfDefinition.pszName)); + todo_wine + ok(kfDefinition.dwAttributes==0, "invalid folder attributes: %d\n", kfDefinition.dwAttributes); + FreeKnownFolderDefinitionFields(&kfDefinition); + } + hr = IKnownFolder_Release(folder); ok(hr == S_OK, "failed to release KnownFolder instance: 0x%08x\n", hr); }

1 0

Alexandre Julliard : rpcrt4: Don' t marshall out-only parameters in the old-style stubless marshaller.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 0941644db7ef0f8340ad8204c10d45d4e7335a79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0941644db7ef0f8340ad8204c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 7 20:38:50 2011 +0200 rpcrt4: Don't marshall out-only parameters in the old-style stubless marshaller. --- dlls/rpcrt4/ndr_stubless.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 171d74d..45cfc94 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -522,12 +522,12 @@ void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, { case PROXY_CALCSIZE: if (pParam->param_direction == RPC_FC_IN_PARAM || - pParam->param_direction & RPC_FC_IN_OUT_PARAM) + pParam->param_direction == RPC_FC_IN_OUT_PARAM) call_buffer_sizer(pStubMsg, *(unsigned char **)pArg, pTypeFormat); break; case PROXY_MARSHAL: if (pParam->param_direction == RPC_FC_IN_PARAM || - pParam->param_direction & RPC_FC_IN_OUT_PARAM) + pParam->param_direction == RPC_FC_IN_OUT_PARAM) call_marshaller(pStubMsg, *(unsigned char **)pArg, pTypeFormat); break; case PROXY_UNMARSHAL:

1 0

Alexandre Julliard : rpcrt4: Fix handling of arguments passed by value in the old-style stubless marshaller .
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 5d7e4da81ab403b034e97b6c5fc4307fcef9217c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d7e4da81ab403b034e97b6c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 7 20:41:17 2011 +0200 rpcrt4: Fix handling of arguments passed by value in the old-style stubless marshaller. --- dlls/rpcrt4/ndr_stubless.c | 69 +++++++++++++++++++++++++++++++++++--------- 1 files changed, 55 insertions(+), 14 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 45cfc94..64b5f12 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -438,6 +438,23 @@ static unsigned int type_stack_size(unsigned char fc) } } +static BOOL is_by_value( PFORMAT_STRING format ) +{ + switch (*format) + { + case RPC_FC_USER_MARSHAL: + case RPC_FC_STRUCT: + case RPC_FC_PSTRUCT: + case RPC_FC_CSTRUCT: + case RPC_FC_CPSTRUCT: + case RPC_FC_CVSTRUCT: + case RPC_FC_BOGUS_STRUCT: + return TRUE; + default: + return FALSE; + } +} + void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, int phase, unsigned char *args, unsigned short stack_size, @@ -510,11 +527,9 @@ void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, } else { - const NDR_PARAM_OI_OTHER *pParamOther = - (const NDR_PARAM_OI_OTHER *)&pFormat[current_offset]; - - const unsigned char *pTypeFormat = - &pStubMsg->StubDesc->pFormatTypes[pParamOther->type_offset]; + const NDR_PARAM_OI_OTHER *pParamOther = (const NDR_PARAM_OI_OTHER *)&pFormat[current_offset]; + const unsigned char *pTypeFormat = &pStubMsg->StubDesc->pFormatTypes[pParamOther->type_offset]; + const BOOL by_value = is_by_value( pTypeFormat ); TRACE("\tcomplex type 0x%02x\n", *pTypeFormat); @@ -523,17 +538,28 @@ void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, case PROXY_CALCSIZE: if (pParam->param_direction == RPC_FC_IN_PARAM || pParam->param_direction == RPC_FC_IN_OUT_PARAM) - call_buffer_sizer(pStubMsg, *(unsigned char **)pArg, pTypeFormat); + { + if (!by_value) pArg = *(unsigned char **)pArg; + call_buffer_sizer(pStubMsg, pArg, pTypeFormat); + } break; case PROXY_MARSHAL: if (pParam->param_direction == RPC_FC_IN_PARAM || pParam->param_direction == RPC_FC_IN_OUT_PARAM) - call_marshaller(pStubMsg, *(unsigned char **)pArg, pTypeFormat); + { + if (!by_value) pArg = *(unsigned char **)pArg; + call_marshaller(pStubMsg, pArg, pTypeFormat); + } break; case PROXY_UNMARSHAL: if (pParam->param_direction == RPC_FC_IN_OUT_PARAM || pParam->param_direction == RPC_FC_OUT_PARAM) - call_unmarshaller(pStubMsg, (unsigned char **)pArg, pTypeFormat, 0); + { + if (by_value) + call_unmarshaller(pStubMsg, &pArg, pTypeFormat, 0); + else + call_unmarshaller(pStubMsg, (unsigned char **)pArg, pTypeFormat, 0); + } else if (pParam->param_direction == RPC_FC_RETURN_PARAM) call_unmarshaller(pStubMsg, (unsigned char **)pRetVal, pTypeFormat, 0); break; @@ -1283,6 +1309,7 @@ static LONG_PTR *stub_do_old_args(MIDL_STUB_MESSAGE *pStubMsg, const unsigned char * pTypeFormat = &pStubMsg->StubDesc->pFormatTypes[pParamOther->type_offset]; + const BOOL by_value = is_by_value( pTypeFormat ); TRACE("\tcomplex type 0x%02x\n", *pTypeFormat); @@ -1295,17 +1322,23 @@ static LONG_PTR *stub_do_old_args(MIDL_STUB_MESSAGE *pStubMsg, if (pParam->param_direction == RPC_FC_OUT_PARAM || pParam->param_direction == RPC_FC_IN_OUT_PARAM || pParam->param_direction == RPC_FC_RETURN_PARAM) - call_marshaller(pStubMsg, *(unsigned char **)pArg, pTypeFormat); + { + if (!by_value) pArg = *(unsigned char **)pArg; + call_marshaller(pStubMsg, pArg, pTypeFormat); + } break; case STUBLESS_FREE: if (pParam->param_direction == RPC_FC_IN_OUT_PARAM || pParam->param_direction == RPC_FC_IN_PARAM) - call_freer(pStubMsg, *(unsigned char **)pArg, pTypeFormat); - else if (pParam->param_direction == RPC_FC_OUT_PARAM) + { + if (!by_value) pArg = *(unsigned char **)pArg; + call_freer(pStubMsg, pArg, pTypeFormat); + } + else if (pParam->param_direction == RPC_FC_OUT_PARAM && !by_value) pStubMsg->pfnFree(*(void **)pArg); break; case STUBLESS_INITOUT: - if (pParam->param_direction == RPC_FC_OUT_PARAM) + if (pParam->param_direction == RPC_FC_OUT_PARAM && !by_value) { DWORD size = calc_arg_size(pStubMsg, pTypeFormat); @@ -1319,13 +1352,21 @@ static LONG_PTR *stub_do_old_args(MIDL_STUB_MESSAGE *pStubMsg, case STUBLESS_UNMARSHAL: if (pParam->param_direction == RPC_FC_IN_OUT_PARAM || pParam->param_direction == RPC_FC_IN_PARAM) - call_unmarshaller(pStubMsg, (unsigned char **)pArg, pTypeFormat, 0); + { + if (by_value) + call_unmarshaller(pStubMsg, &pArg, pTypeFormat, 0); + else + call_unmarshaller(pStubMsg, (unsigned char **)pArg, pTypeFormat, 0); + } break; case STUBLESS_CALCSIZE: if (pParam->param_direction == RPC_FC_OUT_PARAM || pParam->param_direction == RPC_FC_IN_OUT_PARAM || pParam->param_direction == RPC_FC_RETURN_PARAM) - call_buffer_sizer(pStubMsg, *(unsigned char **)pArg, pTypeFormat); + { + if (!by_value) pArg = *(unsigned char **)pArg; + call_buffer_sizer(pStubMsg, pArg, pTypeFormat); + } break; default: RpcRaiseException(RPC_S_INTERNAL_ERROR);

1 0

Alexandre Julliard : rpcrt4: Fix parameter stack size computation in the old-style stubless marshaller.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 87cf6ec75d5a2822d1f0af7fd7f3037262a3406b URL: http://source.winehq.org/git/wine.git/?a=commit;h=87cf6ec75d5a2822d1f0af7fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 7 20:44:16 2011 +0200 rpcrt4: Fix parameter stack size computation in the old-style stubless marshaller. --- dlls/rpcrt4/ndr_stubless.c | 42 +++++++++++++++--------------------------- 1 files changed, 15 insertions(+), 27 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 64b5f12..173ff61 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -412,26 +412,23 @@ static unsigned int type_stack_size(unsigned char fc) case RPC_FC_CHAR: case RPC_FC_SMALL: case RPC_FC_USMALL: - return sizeof(char); case RPC_FC_WCHAR: case RPC_FC_SHORT: case RPC_FC_USHORT: - return sizeof(short); case RPC_FC_LONG: case RPC_FC_ULONG: + case RPC_FC_INT3264: + case RPC_FC_UINT3264: case RPC_FC_ENUM16: case RPC_FC_ENUM32: - return sizeof(int); case RPC_FC_FLOAT: - return sizeof(float); + case RPC_FC_ERROR_STATUS_T: + case RPC_FC_IGNORE: + return sizeof(void *); case RPC_FC_DOUBLE: return sizeof(double); case RPC_FC_HYPER: return sizeof(ULONGLONG); - case RPC_FC_ERROR_STATUS_T: - return sizeof(error_status_t); - case RPC_FC_IGNORE: - return sizeof(void *); default: ERR("invalid base type 0x%x\n", fc); RpcRaiseException(RPC_S_INTERNAL_ERROR); @@ -463,7 +460,7 @@ void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, /* current format string offset */ int current_offset = 0; /* current stack offset */ - unsigned short current_stack_offset = 0; + unsigned short current_stack_offset = object_proc ? sizeof(void *) : 0; /* counter */ unsigned short i; @@ -475,19 +472,15 @@ void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, { const NDR_PARAM_OI_BASETYPE *pParam = (const NDR_PARAM_OI_BASETYPE *)&pFormat[current_offset]; - /* note: current_stack_offset starts after the This pointer - * if present, so adjust this */ - unsigned short current_stack_offset_adjusted = current_stack_offset + - (object_proc ? sizeof(void *) : 0); - unsigned char * pArg = ARG_FROM_OFFSET(args, current_stack_offset_adjusted); + unsigned char * pArg = ARG_FROM_OFFSET(args, current_stack_offset); /* no more parameters; exit loop */ - if (current_stack_offset_adjusted >= stack_size) + if (current_stack_offset >= stack_size) break; TRACE("param[%d]: old format\n", i); TRACE("\tparam_direction: 0x%x\n", pParam->param_direction); - TRACE("\tstack_offset: 0x%x\n", current_stack_offset_adjusted); + TRACE("\tstack_offset: 0x%x\n", current_stack_offset); TRACE("\tmemory addr (before): %p\n", pArg); if (pParam->param_direction == RPC_FC_IN_PARAM_BASETYPE || @@ -567,10 +560,9 @@ void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, RpcRaiseException(RPC_S_INTERNAL_ERROR); } - current_stack_offset += pParamOther->stack_size * sizeof(INT); + current_stack_offset += pParamOther->stack_size * sizeof(void *); current_offset += sizeof(NDR_PARAM_OI_OTHER); } - TRACE("\tmemory addr (after): %p\n", pArg); } } @@ -1242,7 +1234,7 @@ static LONG_PTR *stub_do_old_args(MIDL_STUB_MESSAGE *pStubMsg, /* current format string offset */ int current_offset = 0; /* current stack offset */ - unsigned short current_stack_offset = 0; + unsigned short current_stack_offset = object ? sizeof(void *) : 0; /* location to put retval into */ LONG_PTR *retval_ptr = NULL; @@ -1250,19 +1242,15 @@ static LONG_PTR *stub_do_old_args(MIDL_STUB_MESSAGE *pStubMsg, { const NDR_PARAM_OI_BASETYPE *pParam = (const NDR_PARAM_OI_BASETYPE *)&pFormat[current_offset]; - /* note: current_stack_offset starts after the This pointer - * if present, so adjust this */ - unsigned short current_stack_offset_adjusted = current_stack_offset + - (object ? sizeof(void *) : 0); - unsigned char *pArg = args + current_stack_offset_adjusted; + unsigned char *pArg = args + current_stack_offset; /* no more parameters; exit loop */ - if (current_stack_offset_adjusted >= stack_size) + if (current_stack_offset >= stack_size) break; TRACE("param[%d]: old format\n", i); TRACE("\tparam_direction: 0x%x\n", pParam->param_direction); - TRACE("\tstack_offset: 0x%x\n", current_stack_offset_adjusted); + TRACE("\tstack_offset: 0x%x\n", current_stack_offset); if (pParam->param_direction == RPC_FC_IN_PARAM_BASETYPE || pParam->param_direction == RPC_FC_RETURN_PARAM_BASETYPE) @@ -1372,7 +1360,7 @@ static LONG_PTR *stub_do_old_args(MIDL_STUB_MESSAGE *pStubMsg, RpcRaiseException(RPC_S_INTERNAL_ERROR); } - current_stack_offset += pParamOther->stack_size * sizeof(INT); + current_stack_offset += pParamOther->stack_size * sizeof(void *); current_offset += sizeof(NDR_PARAM_OI_OTHER); } }

1 0

Alexandre Julliard : rpcrt4: Add support for the argument size of varying arrays.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: c8d787dba864f4311f385a6121a072cbb4e2d471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8d787dba864f4311f385a612… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 7 20:45:33 2011 +0200 rpcrt4: Add support for the argument size of varying arrays. --- dlls/rpcrt4/ndr_stubless.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 173ff61..f7bd670 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1001,14 +1001,17 @@ static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) FIXME("Unhandled conformant description\n"); break; case RPC_FC_CARRAY: + case RPC_FC_CVARRAY: size = *(const WORD*)(pFormat + 2); ComputeConformance(pStubMsg, NULL, pFormat + 4, 0); size *= pStubMsg->MaxCount; break; case RPC_FC_SMFARRAY: + case RPC_FC_SMVARRAY: size = *(const WORD*)(pFormat + 2); break; case RPC_FC_LGFARRAY: + case RPC_FC_LGVARRAY: size = *(const DWORD*)(pFormat + 2); break; case RPC_FC_BOGUS_ARRAY:

1 0

Alexandre Julliard : rpcrt4: Don't try to bind to a null handle.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: cdf457774d4310c6af65af69472a5090fbcd93d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdf457774d4310c6af65af694… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 9 17:45:14 2011 +0200 rpcrt4: Don't try to bind to a null handle. --- dlls/rpcrt4/ndr_stubless.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index f7bd670..0f54211 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -191,14 +191,14 @@ static PFORMAT_STRING client_get_handle( } else context_handle = *(NDR_CCONTEXT *)ARG_FROM_OFFSET(pStubMsg->StackTop, pDesc->offset); - if ((pDesc->flags & NDR_CONTEXT_HANDLE_CANNOT_BE_NULL) && - !context_handle) + + if (context_handle) *phBinding = NDRCContextBinding(context_handle); + else if (pDesc->flags & NDR_CONTEXT_HANDLE_CANNOT_BE_NULL) { ERR("null context handle isn't allowed\n"); RpcRaiseException(RPC_X_SS_IN_NULL_CONTEXT); return NULL; } - *phBinding = NDRCContextBinding(context_handle); /* FIXME: should we store this structure in stubMsg.pContext? */ return pFormat + sizeof(NDR_EHD_CONTEXT); }

1 0

Louis Lenders : netapi32: Improve stubbed NetGetJoinInformation function.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: ed28cab62488d58a8e2d6d4c675b548512f1f230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed28cab62488d58a8e2d6d4c6… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Jun 10 11:06:53 2011 +0200 netapi32: Improve stubbed NetGetJoinInformation function. --- dlls/netapi32/wksta.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/netapi32/wksta.c b/dlls/netapi32/wksta.c index ad8d87e..ba2f628 100644 --- a/dlls/netapi32/wksta.c +++ b/dlls/netapi32/wksta.c @@ -584,10 +584,16 @@ NET_API_STATUS NET_API_FUNCTION NetGetJoinInformation( LPWSTR *Name, PNETSETUP_JOIN_STATUS type) { - FIXME("Stub %s %p %p\n", wine_dbgstr_w(Server), Name, type); + static const WCHAR workgroupW[] = {'W','o','r','k','g','r','o','u','p',0}; - *Name = NULL; - *type = NetSetupUnknownStatus; + FIXME("Semi-stub %s %p %p\n", wine_dbgstr_w(Server), Name, type); + + if (!Name || !type) + return ERROR_INVALID_PARAMETER; + + NetApiBufferAllocate(sizeof(workgroupW), (LPVOID *)Name); + lstrcpyW(*Name, workgroupW); + *type = NetSetupWorkgroupName; return NERR_Success; }

1 0