June 2006 - Wine-Commits - list.winehq.org

Robert Shearman : rpcrt4: Add functions for generating and parsing the upper floors in endpoint-mapper towers for different transports .
by Alexandre Julliard June 2, 2006

June 2, 2006

Module: wine Branch: refs/heads/master Commit: 37364b836f63cb7f38b1ed5b42bf66cee59b190c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=37364b836f63cb7f38b1ed5… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Jun 1 20:25:06 2006 +0100 rpcrt4: Add functions for generating and parsing the upper floors in endpoint-mapper towers for different transports. --- dlls/rpcrt4/epm_towers.h | 89 ++++++++++ dlls/rpcrt4/rpc_binding.h | 9 + dlls/rpcrt4/rpc_transport.c | 384 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 481 insertions(+), 1 deletions(-) create mode 100644 dlls/rpcrt4/epm_towers.h Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=37364b836f63cb7f38b…

1 0

Robert Shearman : rpcrt4: Implement I_RpcAllocate and I_RpcFree.
by Alexandre Julliard June 2, 2006

June 2, 2006

Module: wine Branch: refs/heads/master Commit: 84ab2e78a4accd4b0783d0de380bea8858b7fb7a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=84ab2e78a4accd4b0783d0d… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Jun 1 20:24:52 2006 +0100 rpcrt4: Implement I_RpcAllocate and I_RpcFree. --- dlls/rpcrt4/rpcrt4.spec | 4 ++-- dlls/rpcrt4/rpcrt4_main.c | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 84433f1..16a2bfe 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -19,7 +19,7 @@ @ stdcall IUnknown_QueryInterface_Proxy(ptr ptr ptr) @ stdcall IUnknown_Release_Proxy(ptr) @ stub I_RpcAbortAsyncCall -@ stub I_RpcAllocate +@ stdcall I_RpcAllocate(long) @ stub I_RpcAsyncAbortCall @ stub I_RpcAsyncSendReceive # NT4 @ stub I_RpcAsyncSetHandle @@ -45,7 +45,7 @@ # 9x version of I_RpcBindingSetAsync has @ stub I_RpcDeleteMutex @ stub I_RpcEnableWmiTrace # wxp @ stub I_RpcExceptionFilter # wxp -@ stub I_RpcFree +@ stdcall I_RpcFree(ptr) @ stdcall I_RpcFreeBuffer(ptr) @ stub I_RpcFreePipeBuffer @ stub I_RpcGetAssociationContext diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index 69e4d6f..092354a 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -800,3 +800,19 @@ RPC_STATUS RPC_ENTRY DceErrorInqTextA (R } return status; } + +/****************************************************************************** + * I_RpcAllocate (rpcrt4.@) + */ +void * WINAPI I_RpcAllocate(unsigned int Size) +{ + return HeapAlloc(GetProcessHeap(), 0, Size); +} + +/****************************************************************************** + * I_RpcFree (rpcrt4.@) + */ +void WINAPI I_RpcFree(void *Object) +{ + HeapFree(GetProcessHeap(), 0, Object); +}

1 0

Robert Shearman : rpcrt4: Don' t send the unused part of the allocated buffer.
by Alexandre Julliard June 2, 2006

June 2, 2006

Module: wine Branch: refs/heads/master Commit: cc9baf364edb7c8def73c8a6bd33cbd632660cfc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cc9baf364edb7c8def73c8a… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Jun 1 20:24:42 2006 +0100 rpcrt4: Don't send the unused part of the allocated buffer. --- dlls/rpcrt4/ndr_midl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_midl.c b/dlls/rpcrt4/ndr_midl.c index 3ac0aed..90f8b5e 100644 --- a/dlls/rpcrt4/ndr_midl.c +++ b/dlls/rpcrt4/ndr_midl.c @@ -309,6 +309,7 @@ unsigned char *WINAPI NdrSendReceive( MI return NULL; } + stubmsg->RpcMsg->BufferLength = buffer - (unsigned char *)stubmsg->RpcMsg->Buffer; status = I_RpcSendReceive(stubmsg->RpcMsg); if (status != RPC_S_OK) RpcRaiseException(status);

1 0

Paul Vriens : comctl32/header: Check Null before accessing struct member.
by Alexandre Julliard June 2, 2006

June 2, 2006

Module: wine Branch: refs/heads/master Commit: ddf0049e9c51581a78ad5ae11c7dd4c47dd11d77 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ddf0049e9c51581a78ad5ae… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Jun 2 10:38:22 2006 +0200 comctl32/header: Check Null before accessing struct member. --- dlls/comctl32/header.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 493df6f..41c4071 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1141,15 +1141,17 @@ HEADER_GetItemT (HWND hwnd, INT nItem, L { HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); HEADER_ITEM *lpItem; - UINT mask = phdi->mask; + UINT mask; if (!phdi) return FALSE; TRACE("[nItem=%d]\n", nItem); + mask = phdi->mask; if (mask == 0) return TRUE; + if ((nItem < 0) || (nItem >= (INT)infoPtr->uNumItem)) return FALSE;

1 0

Robert Shearman : rpcrt4: NdrClientInitializeNew shouldn' t clear all of the stub message, only selected fields.
by Alexandre Julliard June 2, 2006

June 2, 2006

Module: wine Branch: refs/heads/master Commit: 11da87d09820044ec3ca2242b840cb694f4ba6fd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=11da87d09820044ec3ca224… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Jun 1 20:24:34 2006 +0100 rpcrt4: NdrClientInitializeNew shouldn't clear all of the stub message, only selected fields. --- dlls/rpcrt4/ndr_midl.c | 46 ++++++++++++++++---- dlls/rpcrt4/tests/ndr_marshall.c | 87 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/ndr_midl.c b/dlls/rpcrt4/ndr_midl.c index b6665f6..3ac0aed 100644 --- a/dlls/rpcrt4/ndr_midl.c +++ b/dlls/rpcrt4/ndr_midl.c @@ -188,21 +188,47 @@ void WINAPI NdrClientInitializeNew( PRPC assert( pRpcMessage && pStubMsg && pStubDesc ); - memset(pRpcMessage, 0, sizeof(RPC_MESSAGE)); + pRpcMessage->Handle = NULL; + pRpcMessage->ProcNum = ProcNum; + pRpcMessage->RpcInterfaceInformation = pStubDesc->RpcInterfaceInformation; + pRpcMessage->RpcFlags = 0; pRpcMessage->DataRepresentation = NDR_LOCAL_DATA_REPRESENTATION; - /* not everyone allocates stack space for w2kReserved */ - memset(pStubMsg, 0, FIELD_OFFSET(MIDL_STUB_MESSAGE,pCSInfo)); - - pStubMsg->ReuseBuffer = FALSE; + pStubMsg->RpcMsg = pRpcMessage; + pStubMsg->BufferStart = NULL; + pStubMsg->BufferEnd = NULL; + pStubMsg->BufferLength = 0; pStubMsg->IsClient = TRUE; - pStubMsg->StubDesc = pStubDesc; + pStubMsg->ReuseBuffer = FALSE; + pStubMsg->pAllocAllNodesContext = NULL; + pStubMsg->pPointerQueueState = NULL; + pStubMsg->IgnoreEmbeddedPointers = 0; + pStubMsg->PointerBufferMark = NULL; + pStubMsg->fBufferValid = 0; + pStubMsg->uFlags = 0; pStubMsg->pfnAllocate = pStubDesc->pfnAllocate; pStubMsg->pfnFree = pStubDesc->pfnFree; - pStubMsg->RpcMsg = pRpcMessage; - - pRpcMessage->ProcNum = ProcNum; - pRpcMessage->RpcInterfaceInformation = pStubDesc->RpcInterfaceInformation; + pStubMsg->StackTop = NULL; + pStubMsg->StubDesc = pStubDesc; + pStubMsg->FullPtrRefId = 0; + pStubMsg->PointerLength = 0; + pStubMsg->fInDontFree = 0; + pStubMsg->fDontCallFreeInst = 0; + pStubMsg->fInOnlyParam = 0; + pStubMsg->fHasReturn = 0; + pStubMsg->fHasExtensions = 0; + pStubMsg->fHasNewCorrDesc = 0; + pStubMsg->fUnused = 0; + pStubMsg->dwDestContext = MSHCTX_DIFFERENTMACHINE; + pStubMsg->pvDestContext = NULL; + pStubMsg->pRpcChannelBuffer = NULL; + pStubMsg->pArrayInfo = NULL; + pStubMsg->dwStubPhase = 0; + /* FIXME: LowStackMark */ + pStubMsg->pAsyncMsg = NULL; + pStubMsg->pCorrInfo = NULL; + pStubMsg->pCorrMemory = NULL; + pStubMsg->pMemoryList = NULL; } /*********************************************************************** diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 0a70b9a..ca9f5fd 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -815,9 +815,96 @@ static void test_fullpointer_xlat(void) NdrFullPointerXlatFree(pXlatTables); } +static void test_client_init(void) +{ + MIDL_STUB_MESSAGE stubMsg; + RPC_MESSAGE rpcMsg; + + memset(&stubMsg, 0xcc, sizeof(stubMsg)); + + NdrClientInitializeNew(&rpcMsg, &stubMsg, &Object_StubDesc, 1); + +#define TEST_ZERO(field, fmt) ok(stubMsg.field == 0, #field " should have be set to zero instead of " fmt "\n", stubMsg.field) +#define TEST_POINTER_UNSET(field) ok(stubMsg.field == (void *)0xcccccccc, #field " should have be unset instead of %p\n", stubMsg.field) +#define TEST_ULONG_UNSET(field) ok(stubMsg.field == 0xcccccccc, #field " should have be unset instead of 0x%lx\n", stubMsg.field) + + ok(stubMsg.RpcMsg == &rpcMsg, "stubMsg.RpcMsg should have been %p instead of %p\n", &rpcMsg, stubMsg.RpcMsg); + TEST_POINTER_UNSET(Buffer); + TEST_ZERO(BufferStart, "%p"); + TEST_ZERO(BufferEnd, "%p"); + TEST_POINTER_UNSET(BufferMark); + TEST_ZERO(BufferLength, "%ld"); + TEST_ULONG_UNSET(MemorySize); + TEST_POINTER_UNSET(Memory); + ok(stubMsg.IsClient == 1, "stubMsg.IsClient should have been 1 instead of %u\n", stubMsg.IsClient); + TEST_ZERO(ReuseBuffer, "%d"); + TEST_ZERO(pAllocAllNodesContext, "%p"); + TEST_ZERO(pPointerQueueState, "%p"); + TEST_ZERO(IgnoreEmbeddedPointers, "%d"); + TEST_ZERO(PointerBufferMark, "%p"); + TEST_ZERO(fBufferValid, "%d"); + TEST_ZERO(uFlags, "%d"); + /* FIXME: UniquePtrCount */ + TEST_ULONG_UNSET(MaxCount); + TEST_ULONG_UNSET(Offset); + TEST_ULONG_UNSET(ActualCount); + ok(stubMsg.pfnAllocate == my_alloc, "stubMsg.pfnAllocate should have been %p instead of %p\n", my_alloc, stubMsg.pfnAllocate); + ok(stubMsg.pfnFree == my_free, "stubMsg.pfnFree should have been %p instead of %p\n", my_free, stubMsg.pfnFree); + TEST_ZERO(StackTop, "%p"); + TEST_POINTER_UNSET(pPresentedType); + TEST_POINTER_UNSET(pTransmitType); + TEST_POINTER_UNSET(SavedHandle); + ok(stubMsg.StubDesc == &Object_StubDesc, "stubMsg.StubDesc should have been %p instead of %p\n", &Object_StubDesc, stubMsg.StubDesc); + TEST_POINTER_UNSET(FullPtrXlatTables); + TEST_ZERO(FullPtrRefId, "%ld"); + TEST_ZERO(PointerLength, "%ld"); + TEST_ZERO(fInDontFree, "%d"); + TEST_ZERO(fDontCallFreeInst, "%d"); + TEST_ZERO(fInOnlyParam, "%d"); + TEST_ZERO(fHasReturn, "%d"); + TEST_ZERO(fHasExtensions, "%d"); + TEST_ZERO(fHasNewCorrDesc, "%d"); + TEST_ZERO(fUnused, "%d"); + ok(stubMsg.fUnused2 == 0xffffcccc, "stubMsg.fUnused2 should have been 0xcccc instead of 0x%x\n", stubMsg.fUnused2); + ok(stubMsg.dwDestContext == MSHCTX_DIFFERENTMACHINE, "stubMsg.dwDestContext should have been MSHCTX_DIFFERENTMACHINE instead of %ld\n", stubMsg.dwDestContext); + TEST_ZERO(pvDestContext, "%p"); + TEST_POINTER_UNSET(SavedContextHandles); + TEST_ULONG_UNSET(ParamNumber); + TEST_ZERO(pRpcChannelBuffer, "%p"); + TEST_ZERO(pArrayInfo, "%p"); + TEST_POINTER_UNSET(SizePtrCountArray); + TEST_POINTER_UNSET(SizePtrOffsetArray); + TEST_POINTER_UNSET(SizePtrLengthArray); + TEST_POINTER_UNSET(pArgQueue); + TEST_ZERO(dwStubPhase, "%ld"); + /* FIXME: where does this value come from? */ + trace("LowStackMark is %p\n", stubMsg.LowStackMark); + TEST_ZERO(pAsyncMsg, "%p"); + TEST_ZERO(pCorrInfo, "%p"); + TEST_ZERO(pCorrMemory, "%p"); + TEST_ZERO(pMemoryList, "%p"); + TEST_POINTER_UNSET(pCSInfo); + TEST_POINTER_UNSET(ConformanceMark); + TEST_POINTER_UNSET(VarianceMark); + ok(stubMsg.Unused == 0xcccccccc, "Unused should have be unset instead of 0x%x\n", stubMsg.Unused); + TEST_POINTER_UNSET(pContext); +#if 0 + TEST_ULONG_UNSET(Reserved51_1); + TEST_ULONG_UNSET(Reserved51_2); + TEST_ULONG_UNSET(Reserved51_3); + TEST_ULONG_UNSET(Reserved51_4); + TEST_ULONG_UNSET(Reserved51_5); +#endif +#undef TEST_ULONG_UNSET +#undef TEST_POINTER_UNSET +#undef TEST_ZERO + +} + START_TEST( ndr_marshall ) { test_simple_types(); test_simple_struct(); test_fullpointer_xlat(); + test_client_init(); }

1 0

Kai Blin : secur32: Add EncryptMessage and DecryptMessage stubs.
by Alexandre Julliard June 2, 2006

June 2, 2006

Module: wine Branch: refs/heads/master Commit: f21983cf119b7cf50d1e9509a60b96ac7438e443 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f21983cf119b7cf50d1e950… Author: Kai Blin <kai.blin(a)gmail.com> Date: Thu Jun 1 22:50:32 2006 +0000 secur32: Add EncryptMessage and DecryptMessage stubs. --- dlls/secur32/ntlm.c | 36 ++++++++++++++++++++++++++++++++---- 1 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 5cb44d2..0caf504 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1065,6 +1065,34 @@ static SECURITY_STATUS SEC_ENTRY ntlm_Fr return ret; } +/*********************************************************************** + * EncryptMessage + */ +static SECURITY_STATUS SEC_ENTRY ntlm_EncryptMessage(PCtxtHandle phContext, + ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo) +{ + TRACE("%p %ld %p %ld stub\n", phContext, fQOP, pMessage, MessageSeqNo); + + if(!phContext) + return SEC_E_INVALID_HANDLE; + + return SEC_E_UNSUPPORTED_FUNCTION; +} + +/*********************************************************************** + * DecryptMessage + */ +static SECURITY_STATUS SEC_ENTRY ntlm_DecryptMessage(PCtxtHandle phContext, + PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP) +{ + TRACE("%p %p %ld %p stub\n", phContext, pMessage, MessageSeqNo, pfQOP); + + if(!phContext) + return SEC_E_INVALID_HANDLE; + + return SEC_E_UNSUPPORTED_FUNCTION; +} + static SecurityFunctionTableA ntlmTableA = { 1, NULL, /* EnumerateSecurityPackagesA */ @@ -1091,8 +1119,8 @@ static SecurityFunctionTableA ntlmTableA NULL, /* AddCredentialsA */ NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ - NULL, /* EncryptMessage */ - NULL, /* DecryptMessage */ + ntlm_EncryptMessage, /* EncryptMessage */ + ntlm_DecryptMessage, /* DecryptMessage */ NULL, /* SetContextAttributesA */ }; @@ -1122,8 +1150,8 @@ static SecurityFunctionTableW ntlmTableW NULL, /* AddCredentialsW */ NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ - NULL, /* EncryptMessage */ - NULL, /* DecryptMessage */ + ntlm_EncryptMessage, /* EncryptMessage */ + ntlm_DecryptMessage, /* DecryptMessage */ NULL, /* SetContextAttributesW */ };

1 0

Michael Kaufmann : user32: Popup menu position fixes.
by Alexandre Julliard June 2, 2006

June 2, 2006

Module: wine Branch: refs/heads/master Commit: 6a74137d70608b8c9677c9bcf626f40d04519117 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6a74137d70608b8c9677c9b… Author: Michael Kaufmann <hallo(a)michael-kaufmann.ch> Date: Fri Jun 2 00:07:37 2006 +0200 user32: Popup menu position fixes. - Open large popup menus on the other side only if there's enough space - Open popup menus such that the y position of the first item in the popup menu is the same as the y position of the focused menu item. --- dlls/user/menu.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/user/menu.c b/dlls/user/menu.c index a9cd87e..4b10e7f 100644 --- a/dlls/user/menu.c +++ b/dlls/user/menu.c @@ -1796,8 +1796,9 @@ static BOOL MENU_ShowPopup( HWND hwndOwn if( x + width > GetSystemMetrics(SM_CXSCREEN )) { - if( xanchor ) + if( xanchor && x >= width - xanchor ) x -= width - xanchor; + if( x + width > GetSystemMetrics(SM_CXSCREEN)) x = GetSystemMetrics(SM_CXSCREEN) - width; } @@ -1805,8 +1806,9 @@ static BOOL MENU_ShowPopup( HWND hwndOwn if( y + height > GetSystemMetrics(SM_CYSCREEN )) { - if( yanchor ) + if( yanchor && y >= height + yanchor ) y -= height + yanchor; + if( y + height > GetSystemMetrics(SM_CYSCREEN )) y = GetSystemMetrics(SM_CYSCREEN) - height; } @@ -2339,10 +2341,14 @@ static HMENU MENU_ShowSubPopup( HWND hwn RECT rc = item->rect; MENU_AdjustMenuItemRect(menu, &rc); + + /* The first item in the popup menu has to be at the + same y position as the focused menu item */ rect.left += rc.right - GetSystemMetrics(SM_CXBORDER); - rect.top += rc.top; + rect.top += rc.top - MENU_TOP_MARGIN; rect.right = rc.left - rc.right + GetSystemMetrics(SM_CXBORDER); - rect.bottom = rc.top - rc.bottom; + rect.bottom = rc.top - rc.bottom - MENU_TOP_MARGIN + - MENU_BOTTOM_MARGIN - GetSystemMetrics(SM_CYBORDER); } else {

1 0

Emmanuel Maillard : winecfg: Add CoreAudio to audio drivers list.
by Alexandre Julliard June 2, 2006

June 2, 2006

Module: wine Branch: refs/heads/master Commit: 81b5450cff40086d5ba65bcf472afd6bcb9fdafb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=81b5450cff40086d5ba65bc… Author: Emmanuel Maillard <mahanuu(a)opendarwin.org> Date: Thu Jun 1 18:20:09 2006 +0200 winecfg: Add CoreAudio to audio drivers list. --- programs/winecfg/audio.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 7685ded..4997f85 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -84,6 +84,7 @@ static const AUDIO_DRIVER sAudioDrivers[ {"JACK", "jack"}, {"NAS", "nas"}, {"Audio IO(Solaris)", "audioio"}, + {"CoreAudio", "coreaudio"}, {"Disable sound", ""}, {"", ""} };

1 0

Juan Lang : crypt32: Make base64 tests loadable on win9x.
by Alexandre Julliard June 2, 2006

June 2, 2006

Module: wine Branch: refs/heads/master Commit: 3174806f864bc66155b4e731ec0b0cb157962086 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3174806f864bc66155b4e73… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Jun 1 09:14:58 2006 -0700 crypt32: Make base64 tests loadable on win9x. --- dlls/crypt32/tests/base64.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 9f948c1..998ea60 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -132,6 +132,8 @@ static void testBinaryToStringA(void) BOOL ret; DWORD strLen = 0, i; + if (!pCryptBinaryToStringA) return; + ret = pCryptBinaryToStringA(NULL, 0, 0, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); @@ -318,6 +320,8 @@ static void testStringToBinaryA(void) BOOL ret; DWORD bufLen = 0, i; + if (!pCryptStringToBinaryA) return; + ret = pCryptStringToBinaryA(NULL, 0, 0, NULL, NULL, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError());

1 0

Vitaliy Margolen : shell32: Add Fonts to user's shell folders list.
by Alexandre Julliard June 2, 2006

June 2, 2006

Module: wine Branch: refs/heads/master Commit: a3aa7cf0338194e6058df5362d8d04b0b94ee7d9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a3aa7cf0338194e6058df53… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Thu Jun 1 09:30:48 2006 -0600 shell32: Add Fonts to user's shell folders list. --- dlls/shell32/shellpath.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 9c8dda3..a0d8152 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -932,7 +932,7 @@ static const CSIDL_DATA CSIDL_Data[] = }, { /* 0x14 - CSIDL_FONTS */ CSIDL_Type_WindowsPath, - NULL, + FontsW, FontsW }, { /* 0x15 - CSIDL_TEMPLATES */ @@ -1818,6 +1818,8 @@ static HRESULT _SHRegisterFolders(HKEY h path); else if (CSIDL_Data[folders[i]].type == CSIDL_Type_AllUsers) _SHGetAllUsersProfilePath(SHGFP_TYPE_DEFAULT, folders[i], path); + else if (CSIDL_Data[folders[i]].type == CSIDL_Type_WindowsPath) + GetWindowsDirectoryW(path, MAX_PATH); else hr = E_FAIL; if (*path) @@ -1870,7 +1872,8 @@ static HRESULT _SHRegisterUserShellFolde CSIDL_INTERNET_CACHE, CSIDL_COOKIES, CSIDL_HISTORY, - CSIDL_MYPICTURES + CSIDL_MYPICTURES, + CSIDL_FONTS }; WCHAR userShellFolderPath[MAX_PATH], shellFolderPath[MAX_PATH]; LPCWSTR pUserShellFolderPath, pShellFolderPath;

1 0