January 2014 - Wine-Commits

Andrew Eikum : oleaut32: Improve ITypeLib::FindName.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 57895e5a8ca237c105d543eef1bf6ffbcc0314b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57895e5a8ca237c105d543eef… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 20 08:38:31 2014 -0600 oleaut32: Improve ITypeLib::FindName. --- dlls/oleaut32/tests/typelib.c | 99 +++++++++++++++++++++++++++++++++++++++-- dlls/oleaut32/typelib.c | 20 +++++---- 2 files changed, 107 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 20e53fb..d3980f8 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1554,8 +1554,10 @@ static void test_CreateTypeLib(SYSKIND sys) { ICreateTypeInfo2 *createti2; ITypeLib *tl, *stdole; ITypeInfo *interface1, *interface2, *dual, *unknown, *dispatch, *ti; + ITypeInfo *tinfos[2]; ITypeInfo2 *ti2; ITypeComp *tcomp; + MEMBERID memids[2]; FUNCDESC funcdesc, *pfuncdesc; ELEMDESC elemdesc[5], *edesc; PARAMDESCEX paramdescex; @@ -1567,6 +1569,7 @@ static void test_CreateTypeLib(SYSKIND sys) { DWORD helpcontext, ptr_size, alignment; int impltypeflags; unsigned int cnames; + USHORT found; VARIANT cust_data; HRESULT hres; TYPEKIND kind; @@ -2665,6 +2668,46 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(libattr->wLibFlags == LIBFLAG_FHASDISKIMAGE, "wLibFlags = %d\n", libattr->wLibFlags); ITypeLib_ReleaseTLibAttr(tl, libattr); + found = 2; + memset(tinfos, 0, sizeof(tinfos)); + memids[0] = 0xdeadbeef; + memids[1] = 0xdeadbeef; + hres = ITypeLib_FindName(tl, param1W, 0, tinfos, memids, &found); + ok(hres == S_OK, "got: %08x\n", hres); + ok(found == 0, "got wrong count: %u\n", found); + ok(tinfos[0] == NULL, "got invalid typeinfo[0]\n"); + ok(tinfos[1] == NULL, "got invalid typeinfo[1]\n"); + ok(memids[0] == 0xdeadbeef, "got invalid memid[0]\n"); + ok(memids[1] == 0xdeadbeef, "got invalid memid[1]\n"); + + found = 2; + memset(tinfos, 0, sizeof(tinfos)); + memids[0] = 0xdeadbeef; + memids[1] = 0xdeadbeef; + hres = ITypeLib_FindName(tl, func1W, 0, tinfos, memids, &found); + ok(hres == S_OK, "got: %08x\n", hres); + ok(found == 1, "got wrong count: %u\n", found); + ok(tinfos[0] != NULL, "got invalid typeinfo[0]\n"); + ok(tinfos[1] == NULL, "got invalid typeinfo[1]\n"); + ok(memids[0] == 0, "got invalid memid[0]\n"); + ok(memids[1] == 0xdeadbeef, "got invalid memid[1]\n"); + if(tinfos[0]) + ITypeInfo_Release(tinfos[0]); + + found = 2; + memset(tinfos, 0, sizeof(tinfos)); + memids[0] = 0xdeadbeef; + memids[1] = 0xdeadbeef; + hres = ITypeLib_FindName(tl, interface1W, 0, tinfos, memids, &found); + ok(hres == S_OK, "got: %08x\n", hres); + ok(found == 1, "got wrong count: %u\n", found); + ok(tinfos[0] != NULL, "got invalid typeinfo[0]\n"); + ok(tinfos[1] == NULL, "got invalid typeinfo[1]\n"); + ok(memids[0] == MEMBERID_NIL, "got invalid memid[0]: %x\n", memids[0]); + ok(memids[1] == 0xdeadbeef, "got invalid memid[1]\n"); + if(tinfos[0]) + ITypeInfo_Release(tinfos[0]); + hres = ITypeLib_GetDocumentation(tl, -1, &name, &docstring, &helpcontext, &helpfile); ok(hres == S_OK, "got %08x\n", hres); ok(memcmp(typelibW, name, sizeof(typelibW)) == 0, "got wrong typelib name: %s\n", @@ -4272,6 +4315,7 @@ static void test_SetVarHelpContext(void) static void test_SetFuncAndParamNames(void) { static OLECHAR nameW[] = {'n','a','m','e',0}; + static OLECHAR name2W[] = {'n','a','m','e','2',0}; static OLECHAR prop[] = {'p','r','o','p',0}; static OLECHAR *propW[] = {prop}; static OLECHAR func[] = {'f','u','n','c',0}; @@ -4280,9 +4324,13 @@ static void test_SetFuncAndParamNames(void) WCHAR filenameW[MAX_PATH]; ICreateTypeLib2 *ctl; ICreateTypeInfo *cti; + ITypeLib *tl; + ITypeInfo *infos[3]; + MEMBERID memids[3]; FUNCDESC funcdesc; ELEMDESC edesc; HRESULT hr; + USHORT found; GetTempFileNameA(".", "tlb", 0, filenameA); MultiByteToWideChar(CP_ACP, 0, filenameA, -1, filenameW, MAX_PATH); @@ -4352,6 +4400,50 @@ static void test_SetFuncAndParamNames(void) ok(hr == S_OK, "got 0x%08x\n", hr); ICreateTypeInfo_Release(cti); + + hr = ICreateTypeLib2_CreateTypeInfo(ctl, name2W, TKIND_INTERFACE, &cti); + ok(hr == S_OK, "got %08x\n", hr); + + funcdesc.funckind = FUNC_PUREVIRTUAL; + funcdesc.invkind = INVOKE_FUNC; + funcdesc.cParams = 0; + funcdesc.lprgelemdescParam = NULL; + hr = ICreateTypeInfo_AddFuncDesc(cti, 0, &funcdesc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ICreateTypeInfo_SetFuncAndParamNames(cti, 0, funcW, 1); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ICreateTypeInfo_Release(cti); + + hr = ICreateTypeLib2_QueryInterface(ctl, &IID_ITypeLib, (void**)&tl); + ok(hr == S_OK, "got %08x\n", hr); + + found = 1; + memset(infos, 0, sizeof(infos)); + memids[0] = 0xdeadbeef; + memids[1] = 0xdeadbeef; + memids[2] = 0xdeadbeef; + hr = ITypeLib_FindName(tl, func, 0, infos, memids, &found); + ok(hr == S_OK, "got %08x\n", hr); + ok(found == 1, "got wrong count: %u\n", found); + ok(infos[0] && !infos[1] && !infos[2], "got wrong typeinfo\n"); + ok(memids[0] == 0, "got wrong memid[0]\n"); + ok(memids[1] == 0xdeadbeef && memids[2] == 0xdeadbeef, "got wrong memids\n"); + + found = 3; + memset(infos, 0, sizeof(infos)); + memids[0] = 0xdeadbeef; + memids[1] = 0xdeadbeef; + memids[2] = 0xdeadbeef; + hr = ITypeLib_FindName(tl, func, 0, infos, memids, &found); + ok(hr == S_OK, "got %08x\n", hr); + ok(found == 2, "got wrong count: %u\n", found); + ok(infos[0] && infos[1] && infos[0] != infos[1], "got same typeinfo\n"); + ok(memids[0] == 0, "got wrong memid[0]\n"); + ok(memids[1] == 0, "got wrong memid[1]\n"); + + ITypeLib_Release(tl); ICreateTypeLib2_Release(ctl); DeleteFileA(filenameA); } @@ -4543,8 +4635,7 @@ static void test_FindName(void) ti = (void*)0xdeadbeef; hr = ITypeLib_FindName(tl, buffW, 0, &ti, &memid, &c); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine - ok(memid == -1, "got %d\n", memid); + ok(memid == MEMBERID_NIL, "got %d\n", memid); ok(!lstrcmpW(buffW, wszGUID), "got %s\n", wine_dbgstr_w(buffW)); ok(c == 1, "got %d\n", c); ITypeInfo_Release(ti); @@ -4556,7 +4647,7 @@ todo_wine hr = ITypeLib_FindName(tl, buffW, 0, &ti, &memid, &c); ok(hr == S_OK, "got 0x%08x\n", hr); todo_wine { - ok(memid == -1, "got %d\n", memid); + ok(memid == MEMBERID_NIL, "got %d\n", memid); ok(!lstrcmpW(buffW, wszGUID), "got %s\n", wine_dbgstr_w(buffW)); ok(c == 1, "got %d\n", c); } @@ -4569,7 +4660,7 @@ todo_wine { ti = (void*)0xdeadbeef; hr = ITypeLib_FindName(tl, buffW, 0, &ti, &memid, &c); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(memid == -1, "got %d\n", memid); + ok(memid == MEMBERID_NIL, "got %d\n", memid); ok(!lstrcmpW(buffW, invalidW), "got %s\n", wine_dbgstr_w(buffW)); ok(c == 0, "got %d\n", c); ok(ti == (void*)0xdeadbeef, "got %p\n", ti); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index d94abe7..e5a99e8 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5176,26 +5176,30 @@ static HRESULT WINAPI ITypeLib2_fnFindName( return E_INVALIDARG; len = (lstrlenW(name) + 1)*sizeof(WCHAR); - for(tic = 0; tic < This->TypeInfoCount; ++tic) { + for(tic = 0; count < *found && tic < This->TypeInfoCount; ++tic) { ITypeInfoImpl *pTInfo = This->typeinfos[tic]; TLBVarDesc *var; UINT fdc; - if(!TLB_str_memcmp(name, pTInfo->Name, len)) goto ITypeLib2_fnFindName_exit; + if(!TLB_str_memcmp(name, pTInfo->Name, len)) { + memid[count] = MEMBERID_NIL; + goto ITypeLib2_fnFindName_exit; + } + for(fdc = 0; fdc < pTInfo->cFuncs; ++fdc) { TLBFuncDesc *func = &pTInfo->funcdescs[fdc]; - int pc; - if(!TLB_str_memcmp(name, func->Name, len)) goto ITypeLib2_fnFindName_exit; - for(pc = 0; pc < func->funcdesc.cParams; pc++) { - if(!TLB_str_memcmp(name, func->pParamDesc[pc].Name, len)) - goto ITypeLib2_fnFindName_exit; + if(!TLB_str_memcmp(name, func->Name, len)) { + memid[count] = func->funcdesc.memid; + goto ITypeLib2_fnFindName_exit; } } var = TLB_get_vardesc_by_name(pTInfo->vardescs, pTInfo->cVars, name); - if (var) + if (var) { + memid[count] = var->vardesc.memid; goto ITypeLib2_fnFindName_exit; + } continue; ITypeLib2_fnFindName_exit:

1 0

Nikolay Sivov : oleaut32: Use CoTaskMem* when dealing with CUSTDATA.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 1abafbffda7a1db8ba76a73a31569413c14c6440 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1abafbffda7a1db8ba76a73a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 27 00:12:11 2014 +0400 oleaut32: Use CoTaskMem* when dealing with CUSTDATA. --- dlls/oleaut32/typelib.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 812612a..d94abe7 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5343,7 +5343,7 @@ static HRESULT TLB_copy_all_custdata(struct list *custdata_list, CUSTDATA *pCust ct = list_count(custdata_list); - pCustData->prgCustData = heap_alloc_zero(ct * sizeof(CUSTDATAITEM)); + pCustData->prgCustData = CoTaskMemAlloc(ct * sizeof(CUSTDATAITEM)); if(!pCustData->prgCustData) return E_OUTOFMEMORY; @@ -11230,8 +11230,7 @@ void WINAPI ClearCustData(CUSTDATA *lpCust) for (i = 0; i < lpCust->cCustData; i++) VariantClear(&lpCust->prgCustData[i].varValue); - /* FIXME - Should be using a per-thread IMalloc */ - heap_free(lpCust->prgCustData); + CoTaskMemFree(lpCust->prgCustData); lpCust->prgCustData = NULL; } lpCust->cCustData = 0;

1 0

Sebastian Lackner : kernel32: Forward TryAcquireSRWLockShared/ Exclusive to ntdll.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 60c0637f62812456c35f227ebca40a50a5c35c4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=60c0637f62812456c35f227eb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jan 22 00:36:20 2014 +0100 kernel32: Forward TryAcquireSRWLockShared/Exclusive to ntdll. --- dlls/kernel32/kernel32.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 02b1bdb..3bb4255 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1219,6 +1219,8 @@ @ stdcall TransactNamedPipe(long ptr long ptr long ptr ptr) @ stdcall TransmitCommChar(long long) @ stub TrimVirtualBuffer +@ stdcall TryAcquireSRWLockExclusive(ptr) ntdll.RtlTryAcquireSRWLockExclusive +@ stdcall TryAcquireSRWLockShared(ptr) ntdll.RtlTryAcquireSRWLockShared @ stdcall TryEnterCriticalSection(ptr) ntdll.RtlTryEnterCriticalSection @ stdcall TzSpecificLocalTimeToSystemTime(ptr ptr ptr) @ stdcall -i386 -private UTRegister(long str str str ptr ptr ptr) krnl386.exe16.UTRegister

1 0

Sebastian Lackner : kernel32: Forward SleepConditionVariableSRW to ntdll.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 72cf5d6f12daafc69c4b50f7803613d5fd6ba65d URL: http://source.winehq.org/git/wine.git/?a=commit;h=72cf5d6f12daafc69c4b50f78… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jan 22 01:09:49 2014 +0100 kernel32: Forward SleepConditionVariableSRW to ntdll. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/sync.c | 18 ++++++++++++++++++ include/winbase.h | 1 + 3 files changed, 20 insertions(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 3bb4255..f7f3320 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1196,6 +1196,7 @@ @ stdcall SizeofResource(long long) @ stdcall Sleep(long) @ stdcall SleepConditionVariableCS(ptr ptr long) +@ stdcall SleepConditionVariableSRW(ptr ptr long long) @ stdcall SleepEx(long long) @ stdcall SuspendThread(long) @ stdcall SwitchToFiber(ptr) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 2b7f4b0..f77637c 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -2339,3 +2339,21 @@ BOOL WINAPI SleepConditionVariableCS( CONDITION_VARIABLE *variable, CRITICAL_SEC } return TRUE; } + +/*********************************************************************** + * SleepConditionVariableSRW (KERNEL32.@) + */ +BOOL WINAPI SleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, RTL_SRWLOCK *lock, DWORD timeout, ULONG flags ) +{ + NTSTATUS status; + LARGE_INTEGER time; + + status = RtlSleepConditionVariableSRW( variable, lock, get_nt_timeout( &time, timeout ), flags ); + + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + return TRUE; +} diff --git a/include/winbase.h b/include/winbase.h index 3c620e4..2d01c45 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2363,6 +2363,7 @@ WINBASEAPI DWORD WINAPI SignalObjectAndWait(HANDLE,HANDLE,DWORD,BOOL); WINBASEAPI DWORD WINAPI SizeofResource(HMODULE,HRSRC); WINBASEAPI VOID WINAPI Sleep(DWORD); WINBASEAPI BOOL WINAPI SleepConditionVariableCS(PCONDITION_VARIABLE,PCRITICAL_SECTION,DWORD); +WINBASEAPI BOOL WINAPI SleepConditionVariableSRW(PCONDITION_VARIABLE,PSRWLOCK,DWORD,ULONG); WINBASEAPI DWORD WINAPI SleepEx(DWORD,BOOL); WINBASEAPI DWORD WINAPI SuspendThread(HANDLE); WINBASEAPI void WINAPI SwitchToFiber(LPVOID);

1 0

Bruno Jesus : user32: Cope with null LPMENUITEMINFO in SetMenuItemInfo.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 06a6b189f6c9712e64f3f7da908403f410295785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06a6b189f6c9712e64f3f7da9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jan 18 12:59:01 2014 -0200 user32: Cope with null LPMENUITEMINFO in SetMenuItemInfo. --- dlls/user32/menu.c | 4 ++-- dlls/user32/tests/menu.c | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 50545ee..bbaa5f3 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4795,8 +4795,8 @@ static BOOL MENU_NormalizeMenuItemInfoStruct( const MENUITEMINFOW *pmii_in, MENUITEMINFOW *pmii_out ) { /* do we recognize the size? */ - if( pmii_in->cbSize != sizeof( MENUITEMINFOW) && - pmii_in->cbSize != sizeof( MENUITEMINFOW) - sizeof( pmii_in->hbmpItem)) { + if( !pmii_in || (pmii_in->cbSize != sizeof( MENUITEMINFOW) && + pmii_in->cbSize != sizeof( MENUITEMINFOW) - sizeof( pmii_in->hbmpItem)) ) { SetLastError( ERROR_INVALID_PARAMETER); return FALSE; } diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 20126d4..d02eb91 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -948,6 +948,19 @@ static void test_menu_add_string( void ) ok (!lstrcmpW( strbackW, expectedString ), "Menu text from Unicode version incorrect\n"); } + /* Just try some invalid parameter tests */ + SetLastError(0xdeadbeef); + rc = SetMenuItemInfoA( hmenu, 0, TRUE, NULL ); + ret = GetLastError(); + ok (!rc, "SetMenuItemInfoA succeeded unexpectedly\n"); + ok (ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + + SetLastError(0xdeadbeef); + rc = SetMenuItemInfoA( hmenu, 0, FALSE, NULL ); + ret = GetLastError(); + ok (!rc, "SetMenuItemInfoA succeeded unexpectedly\n"); + ok (ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + /* Just change ftype to string and see what text is stored */ memset(&info, 0x00, sizeof(info)); info.cbSize= sizeof(MENUITEMINFOA);

1 0

Bruno Jesus : ws2_32: Return the correct address family in WSAStringToAddressA.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 4c6e04050f7c996506edab79518f43ce9ae4ce96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6e04050f7c996506edab795… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jan 18 19:03:27 2014 -0200 ws2_32: Return the correct address family in WSAStringToAddressA. --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a855285..0ae0c4f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6861,7 +6861,7 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, *lpAddressLength = sizeof(SOCKADDR_IN); memset(lpAddress, 0, sizeof(SOCKADDR_IN)); - ((LPSOCKADDR_IN)lpAddress)->sin_family = AF_INET; + ((LPSOCKADDR_IN)lpAddress)->sin_family = WS_AF_INET; ptrPort = strchr(workBuffer, ':'); if(ptrPort)

1 0

Dmitry Timoshkov : kernel32/tests: Don' t forget to delete temporary manifest files.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 9703bee560152cf82ff4f44c63a02feb7a077031 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9703bee560152cf82ff4f44c6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 21 17:50:58 2014 +0900 kernel32/tests: Don't forget to delete temporary manifest files. --- dlls/kernel32/tests/actctx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 5795e18..46b6a44 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2133,8 +2133,9 @@ todo_wine { } if (handle != INVALID_HANDLE_VALUE) pReleaseActCtx(handle); - delete_manifest_file("main.manifest"); + delete_manifest_file("main_wndcls.manifest"); delete_manifest_file("testdep1.manifest"); + delete_manifest_file("testdep2.manifest"); /* ACTCTX_FLAG_HMODULE_VALID but hModule is not set */ memset(&actctx, 0, sizeof(ACTCTXA));

1 0

Sebastian Lackner : ntdll: Implement RtlTryAcquireSRWLockShared/ Exclusive commands.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 899fc8d4eeb2f442eeed4ea122ac92f78208a994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=899fc8d4eeb2f442eeed4ea12… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Jan 21 22:18:10 2014 +0100 ntdll: Implement RtlTryAcquireSRWLockShared/Exclusive commands. --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/sync.c | 33 +++++++++++++++++++++++++++++++++ include/winternl.h | 2 ++ 3 files changed, 37 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 2e507bb..4140ff9 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -891,6 +891,8 @@ # @ stub RtlTraceDatabaseLock # @ stub RtlTraceDatabaseUnlock # @ stub RtlTraceDatabaseValidate +@ stdcall RtlTryAcquireSRWLockExclusive(ptr) +@ stdcall RtlTryAcquireSRWLockShared(ptr) @ stdcall RtlTryEnterCriticalSection(ptr) @ cdecl -i386 -norelay RtlUlongByteSwap() NTDLL_RtlUlongByteSwap @ cdecl -ret64 RtlUlonglongByteSwap(int64) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 7d18d20..6404ac5 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1535,6 +1535,10 @@ void WINAPI RtlAcquireSRWLockExclusive( RTL_SRWLOCK *lock ) /*********************************************************************** * RtlAcquireSRWLockShared (NTDLL.@) + * + * NOTES + * Do not call this function recursively - it will only succeed when + * there are no threads waiting for an exclusive lock! */ void WINAPI RtlAcquireSRWLockShared( RTL_SRWLOCK *lock ) { @@ -1583,6 +1587,35 @@ void WINAPI RtlReleaseSRWLockShared( RTL_SRWLOCK *lock ) } /*********************************************************************** + * RtlTryAcquireSRWLockExclusive (NTDLL.@) + * + * NOTES + * Similar to AcquireSRWLockExclusive recusive calls are not allowed + * and will fail with return value FALSE. + */ +BOOLEAN WINAPI RtlTryAcquireSRWLockExclusive( RTL_SRWLOCK *lock ) +{ + return interlocked_cmpxchg( (int *)&lock->Ptr, SRWLOCK_MASK_IN_EXCLUSIVE | + SRWLOCK_RES_EXCLUSIVE, 0 ) == 0; +} + +/*********************************************************************** + * RtlTryAcquireSRWLockShared (NTDLL.@) + */ +BOOLEAN WINAPI RtlTryAcquireSRWLockShared( RTL_SRWLOCK *lock ) +{ + unsigned int val, tmp; + for (val = *(unsigned int *)&lock->Ptr;; val = tmp) + { + if (val & SRWLOCK_MASK_EXCLUSIVE_QUEUE) + return FALSE; + if ((tmp = interlocked_cmpxchg( (int *)&lock->Ptr, val + SRWLOCK_RES_SHARED, val )) == val) + break; + } + return TRUE; +} + +/*********************************************************************** * RtlInitializeConditionVariable (NTDLL.@) * * Initializes the condition variable with NULL. diff --git a/include/winternl.h b/include/winternl.h index c840732..d3a02bf 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2512,6 +2512,8 @@ NTSYSAPI BOOLEAN WINAPI RtlTimeFieldsToTime(PTIME_FIELDS,PLARGE_INTEGER); NTSYSAPI void WINAPI RtlTimeToElapsedTimeFields(const LARGE_INTEGER *,PTIME_FIELDS); NTSYSAPI BOOLEAN WINAPI RtlTimeToSecondsSince1970(const LARGE_INTEGER *,LPDWORD); NTSYSAPI BOOLEAN WINAPI RtlTimeToSecondsSince1980(const LARGE_INTEGER *,LPDWORD); +NTSYSAPI BOOLEAN WINAPI RtlTryAcquireSRWLockExclusive(RTL_SRWLOCK *); +NTSYSAPI BOOLEAN WINAPI RtlTryAcquireSRWLockShared(RTL_SRWLOCK *); NTSYSAPI BOOL WINAPI RtlTryEnterCriticalSection(RTL_CRITICAL_SECTION *); NTSYSAPI ULONGLONG __cdecl RtlUlonglongByteSwap(ULONGLONG); NTSYSAPI DWORD WINAPI RtlUnicodeStringToAnsiSize(const UNICODE_STRING*);

1 0

Sebastian Lackner : ntdll: Throw STATUS_RESOURCE_NOT_OWNED when it' s impossible to acquire/release the SRWLock.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 8ca96a9de0686431294030a7607de916d8ace9f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca96a9de0686431294030a76… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Jan 21 22:04:20 2014 +0100 ntdll: Throw STATUS_RESOURCE_NOT_OWNED when it's impossible to acquire/release the SRWLock. --- dlls/ntdll/sync.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 9e0395d..7d18d20 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1435,6 +1435,14 @@ DWORD WINAPI RtlRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_INIT_FN fu #define srwlock_key_shared(lock) (&lock->Ptr) #endif +static inline void srwlock_check_invalid( unsigned int val ) +{ + /* Throw exception if it's impossible to acquire/release this lock. */ + if ((val & SRWLOCK_MASK_EXCLUSIVE_QUEUE) == SRWLOCK_MASK_EXCLUSIVE_QUEUE || + (val & SRWLOCK_MASK_SHARED_QUEUE) == SRWLOCK_MASK_SHARED_QUEUE) + RtlRaiseStatus(STATUS_RESOURCE_NOT_OWNED); +} + static inline unsigned int srwlock_lock_exclusive( unsigned int *dest, int incr ) { unsigned int val, tmp; @@ -1445,6 +1453,7 @@ static inline unsigned int srwlock_lock_exclusive( unsigned int *dest, int incr for (val = *dest;; val = tmp) { tmp = val + incr; + srwlock_check_invalid( tmp ); if ((tmp & SRWLOCK_MASK_EXCLUSIVE_QUEUE) && !(tmp & SRWLOCK_MASK_SHARED_QUEUE)) tmp |= SRWLOCK_MASK_IN_EXCLUSIVE; if ((tmp = interlocked_cmpxchg( (int *)dest, tmp, val )) == val) @@ -1463,6 +1472,7 @@ static inline unsigned int srwlock_unlock_exclusive( unsigned int *dest, int inc for (val = *dest;; val = tmp) { tmp = val + incr; + srwlock_check_invalid( tmp ); if (!(tmp & SRWLOCK_MASK_EXCLUSIVE_QUEUE)) tmp &= SRWLOCK_MASK_SHARED_QUEUE; if ((tmp = interlocked_cmpxchg( (int *)dest, tmp, val )) == val)

1 0

Nikolay Sivov : widl: Fix pointer size for SYS_WIN64 typelibs.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: c46debeeebfcaa7a158dd7cdd8a67b05d74f02c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c46debeeebfcaa7a158dd7cdd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 19 20:45:02 2014 +0400 widl: Fix pointer size for SYS_WIN64 typelibs. The fact that test data was wrong was hidden by broken widl typelib, and same test typelib was used on windows so we never get proper test results. Standard IUnknown/IDispatch that live in system stdole2.tlb are also tested now. --- dlls/oleaut32/tests/typelib.c | 26 +++++++++++++++++++++----- dlls/oleaut32/typelib.c | 4 ++-- tools/widl/write_msft.c | 28 +++++++++++++--------------- 3 files changed, 36 insertions(+), 22 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index d3980f8..2ceebc5 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -651,7 +651,7 @@ static const char *create_test_typelib(int res_no) static void test_TypeInfo(void) { ITypeLib *pTypeLib; - ITypeInfo *pTypeInfo; + ITypeInfo *pTypeInfo, *ti; ITypeInfo2 *pTypeInfo2; HRESULT hr; static WCHAR wszBogus[] = { 'b','o','g','u','s',0 }; @@ -668,6 +668,7 @@ static void test_TypeInfo(void) TYPEKIND kind; const char *filenameA; WCHAR filename[MAX_PATH]; + TYPEATTR *attr; hr = LoadTypeLib(wszStdOle2, &pTypeLib); ok_ole_success(hr, LoadTypeLib); @@ -765,8 +766,6 @@ static void test_TypeInfo(void) ITypeInfo_Release(pTypeInfo); - - hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, &IID_IDispatch, &pTypeInfo); ok_ole_success(hr, ITypeLib_GetTypeInfoOfGuid); @@ -792,6 +791,23 @@ static void test_TypeInfo(void) VariantClear(&var); } + /* Check instance size for IDispatch, typelib is loaded using system SYS_WIN* kind so it always matches + system bitness. */ + hr = ITypeInfo_GetTypeAttr(pTypeInfo, &attr); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(attr->cbSizeInstance == sizeof(void*), "got size %d\n", attr->cbSizeInstance); + ok(attr->typekind == TKIND_INTERFACE, "got typekind %d\n", attr->typekind); + ITypeInfo_ReleaseTypeAttr(pTypeInfo, attr); + + /* same size check with some general interface */ + hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, &IID_IEnumVARIANT, &ti); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = ITypeInfo_GetTypeAttr(ti, &attr); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(attr->cbSizeInstance == sizeof(void*), "got size %d\n", attr->cbSizeInstance); + ITypeInfo_ReleaseTypeAttr(ti, attr); + ITypeInfo_Release(ti); + /* test invoking a method with a [restricted] keyword */ /* correct member id -- wrong flags -- cNamedArgs not bigger than cArgs */ @@ -3757,7 +3773,7 @@ static const interface_info info[] = { /* interfaces count: 2 */ { "IDualIface", - /*kind*/ TKIND_DISPATCH, /*flags*/ 0x1040, /*align*/ 4, /*size*/ 4, + /*kind*/ TKIND_DISPATCH, /*flags*/ 0x1040, /*align*/ 4, /*size*/ sizeof(void*), /*#vtbl*/ 7, /*#func*/ 8, { { @@ -3898,7 +3914,7 @@ static const interface_info info[] = { }, { "ISimpleIface", - /*kind*/ TKIND_INTERFACE, /*flags*/ 0x1000, /*align*/ 4, /*size*/ 4, + /*kind*/ TKIND_INTERFACE, /*flags*/ 0x1000, /*align*/ 4, /*size*/ sizeof(void*), /*#vtbl*/ 8, /*#func*/ 1, { { diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index e5a99e8..4213ae6 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3545,7 +3545,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) cx.length = dwTLBLength; /* read header */ - MSFT_ReadLEDWords((void*)&tlbHeader, sizeof(tlbHeader), &cx, 0); + MSFT_ReadLEDWords(&tlbHeader, sizeof(tlbHeader), &cx, 0); TRACE_(typelib)("header:\n"); TRACE_(typelib)("\tmagic1=0x%08x ,magic2=0x%08x\n",tlbHeader.magic1,tlbHeader.magic2 ); if (tlbHeader.magic1 != MSFT_SIGNATURE) { @@ -9645,7 +9645,7 @@ static DWORD WMSFT_compile_typeinfo(ITypeInfoImpl *info, INT16 index, WMSFT_TLBF size = sizeof(MSFT_TypeInfoBase); if(data){ - MSFT_TypeInfoBase *base = (void*)data; + MSFT_TypeInfoBase *base = (MSFT_TypeInfoBase*)data; if(info->wTypeFlags & TYPEFLAG_FDUAL) base->typekind = TKIND_DISPATCH; else diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 6eb229a..cc039dc 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -174,7 +174,7 @@ static void ctl2_init_segdir( segdir = &typelib->typelib_segdir[MSFT_SEG_TYPEINFO]; - for (i = 0; i < 15; i++) { + for (i = 0; i < MSFT_SEG_MAX; i++) { segdir[i].offset = -1; segdir[i].length = 0; segdir[i].res08 = -1; @@ -827,7 +827,6 @@ static int encode_type( case VT_UI4: case VT_R4: case VT_ERROR: - case VT_BSTR: case VT_HRESULT: *encoded_type = default_type; *width = 4; @@ -863,8 +862,9 @@ static int encode_type( case VT_UNKNOWN: case VT_DISPATCH: + case VT_BSTR: *encoded_type = default_type; - *width = 4; + *width = pointer_size; *alignment = 4; break; @@ -875,7 +875,7 @@ static int encode_type( case VT_LPSTR: case VT_LPWSTR: *encoded_type = 0xfffe0000 | vt; - *width = 4; + *width = pointer_size; *alignment = 4; break; @@ -898,7 +898,7 @@ static int encode_type( if(next_vt == VT_DISPATCH || next_vt == VT_UNKNOWN) { chat("encode_type: skipping ptr\n"); *encoded_type = target_type; - *width = 4; + *width = pointer_size; *alignment = 4; *decoded_size = child_size; break; @@ -928,13 +928,12 @@ static int encode_type( *encoded_type = typeoffset; - *width = 4; + *width = pointer_size; *alignment = 4; *decoded_size = 8 /*sizeof(TYPEDESC)*/ + child_size; break; } - case VT_SAFEARRAY: { type_t *element_type = type_alias_get_aliasee(type_array_get_element(type)); @@ -966,13 +965,12 @@ static int encode_type( *encoded_type = typeoffset; - *width = 4; + *width = pointer_size; *alignment = 4; *decoded_size = 8 /*sizeof(TYPEDESC)*/ + child_size; break; } - case VT_USERDEFINED: { int typeinfo_offset; @@ -1119,7 +1117,7 @@ static int encode_var( chat("encode_var: skipping ptr\n"); *encoded_type = target_type; *decoded_size = child_size; - *width = 4; + *width = pointer_size; *alignment = 4; return 0; } @@ -1148,7 +1146,7 @@ static int encode_var( *encoded_type = typeoffset; - *width = 4; + *width = pointer_size; *alignment = 4; *decoded_size = 8 /*sizeof(TYPEDESC)*/ + child_size; return 0; @@ -1728,7 +1726,7 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) break; case TKIND_DISPATCH: var_kind = 3; /* VAR_DISPATCH */ - typeinfo->datawidth = 4; + typeinfo->datawidth = pointer_size; var_alignment = 4; break; default: @@ -1981,7 +1979,7 @@ static void add_dispinterface_typeinfo(msft_typelib_t *typelib, type_t *dispinte msft_typeinfo = create_msft_typeinfo(typelib, TKIND_DISPATCH, dispinterface->name, dispinterface->attrs); - msft_typeinfo->typeinfo->size = 4; + msft_typeinfo->typeinfo->size = pointer_size; msft_typeinfo->typeinfo->typekind |= 0x2100; msft_typeinfo->typeinfo->flags |= 0x1000; /* TYPEFLAG_FDISPATCHABLE */ @@ -2046,7 +2044,7 @@ static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface) interface->typelib_idx = typelib->typelib_header.nrtypeinfos; msft_typeinfo = create_msft_typeinfo(typelib, TKIND_INTERFACE, interface->name, interface->attrs); - msft_typeinfo->typeinfo->size = 4; + msft_typeinfo->typeinfo->size = pointer_size; msft_typeinfo->typeinfo->typekind |= 0x2200; for (derived = inherit; derived; derived = type_iface_get_inherit(derived)) @@ -2210,7 +2208,7 @@ static void add_coclass_typeinfo(msft_typelib_t *typelib, type_t *cls) first_source->flags |= 0x1; msft_typeinfo->typeinfo->cImplTypes = num_ifaces; - msft_typeinfo->typeinfo->size = 4; + msft_typeinfo->typeinfo->size = pointer_size; msft_typeinfo->typeinfo->typekind |= 0x2200; }

1 0