January 2014 - Wine-Commits

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

Bruno Jesus : ws2_32/tests: Add missing closesocket calls (Coverity).
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 84d91bb93d97a79b63d7f81ebc828e9eeb66efd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84d91bb93d97a79b63d7f81eb… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jan 18 19:07:52 2014 -0200 ws2_32/tests: Add missing closesocket calls (Coverity). --- dlls/ws2_32/tests/sock.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 0abf732..8cee632 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1061,6 +1061,9 @@ static void test_WithWSAStartup(void) ok(error == WSAENOTSOCK, "expected 10038, got %d\n", error); } + closesocket(src); + closesocket(dst); + WSACleanup(); }

1 0

Sebastian Lackner : kernel32/tests: Add tests for SleepConditionVariableSRW.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 2ff6bd271bca5110d4531f03f32337d820715a8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ff6bd271bca5110d4531f03f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jan 26 01:29:04 2014 +0100 kernel32/tests: Add tests for SleepConditionVariableSRW. --- dlls/kernel32/tests/sync.c | 91 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 89 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 61dd7e1..74f1a84 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -44,6 +44,7 @@ static BOOL (WINAPI *pInitOnceComplete)(PINIT_ONCE,DWORD,LPVOID); static VOID (WINAPI *pInitializeConditionVariable)(PCONDITION_VARIABLE); static BOOL (WINAPI *pSleepConditionVariableCS)(PCONDITION_VARIABLE,PCRITICAL_SECTION,DWORD); +static BOOL (WINAPI *pSleepConditionVariableSRW)(PCONDITION_VARIABLE,PSRWLOCK,DWORD,ULONG); static VOID (WINAPI *pWakeAllConditionVariable)(PCONDITION_VARIABLE); static VOID (WINAPI *pWakeConditionVariable)(PCONDITION_VARIABLE); @@ -1547,6 +1548,7 @@ static void test_condvars_consumer_producer(void) static DWORD condvar_seq = 0; static CONDITION_VARIABLE condvar_base = CONDITION_VARIABLE_INIT; static CRITICAL_SECTION condvar_crit; +static SRWLOCK condvar_srwlock; /* Sequence of wake/sleep to check boundary conditions: * 0: init @@ -1558,7 +1560,14 @@ static CRITICAL_SECTION condvar_crit; * 6: a wakeall is handed to a SleepConditionVariableCS * 7: sleep after above should timeout * 8: wake with crit section locked into the sleep timeout - * 9: end + * + * the following tests will only be executed if InitializeSRWLock is available + * + * 9: producer (exclusive) wakes up consumer (exclusive) + * 10: producer (exclusive) wakes up consumer (shared) + * 11: producer (shared) wakes up consumer (exclusive) + * 12: producer (shared) wakes up consumer (shared) + * 13: end */ static DWORD WINAPI condvar_base_producer(LPVOID x) { while (condvar_seq < 1) Sleep(1); @@ -1585,6 +1594,31 @@ static DWORD WINAPI condvar_base_producer(LPVOID x) { Sleep(50); LeaveCriticalSection (&condvar_crit); + /* skip over remaining tests if InitializeSRWLock is not available */ + if (!pInitializeSRWLock) + return 0; + + while (condvar_seq < 9) Sleep(1); + pAcquireSRWLockExclusive(&condvar_srwlock); + pWakeConditionVariable(&condvar_base); + pReleaseSRWLockExclusive(&condvar_srwlock); + + while (condvar_seq < 10) Sleep(1); + pAcquireSRWLockExclusive(&condvar_srwlock); + pWakeConditionVariable(&condvar_base); + pReleaseSRWLockExclusive(&condvar_srwlock); + + while (condvar_seq < 11) Sleep(1); + pAcquireSRWLockShared(&condvar_srwlock); + pWakeConditionVariable(&condvar_base); + pReleaseSRWLockShared(&condvar_srwlock); + + while (condvar_seq < 12) Sleep(1); + Sleep(50); /* ensure that consumer waits for cond variable */ + pAcquireSRWLockShared(&condvar_srwlock); + pWakeConditionVariable(&condvar_base); + pReleaseSRWLockShared(&condvar_srwlock); + return 0; } @@ -1634,8 +1668,40 @@ static DWORD WINAPI condvar_base_consumer(LPVOID x) { ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 20); LeaveCriticalSection (&condvar_crit); ok (ret, "SleepConditionVariableCS should still return TRUE on crit unlock delay\n"); - condvar_seq = 9; + /* skip over remaining tests if InitializeSRWLock is not available */ + if (!pInitializeSRWLock) + { + win_skip("no srw lock support.\n"); + condvar_seq = 13; /* end */ + return 0; + } + + pAcquireSRWLockExclusive(&condvar_srwlock); + condvar_seq = 9; + ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, 0); + pReleaseSRWLockExclusive(&condvar_srwlock); + ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); + + pAcquireSRWLockShared(&condvar_srwlock); + condvar_seq = 10; + ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, CONDITION_VARIABLE_LOCKMODE_SHARED); + pReleaseSRWLockShared(&condvar_srwlock); + ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); + + pAcquireSRWLockExclusive(&condvar_srwlock); + condvar_seq = 11; + ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, 0); + pReleaseSRWLockExclusive(&condvar_srwlock); + ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); + + pAcquireSRWLockShared(&condvar_srwlock); + condvar_seq = 12; + ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, CONDITION_VARIABLE_LOCKMODE_SHARED); + pReleaseSRWLockShared(&condvar_srwlock); + ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); + + condvar_seq = 13; return 0; } @@ -1653,6 +1719,9 @@ static void test_condvars_base(void) { InitializeCriticalSection (&condvar_crit); + if (pInitializeSRWLock) + pInitializeSRWLock(&condvar_srwlock); + EnterCriticalSection (&condvar_crit); ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); LeaveCriticalSection (&condvar_crit); @@ -1660,6 +1729,23 @@ static void test_condvars_base(void) { ok (!ret, "SleepConditionVariableCS should return FALSE on untriggered condvar\n"); ok (GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableCS should return ERROR_TIMEOUT on untriggered condvar, not %d\n", GetLastError()); + if (pInitializeSRWLock) + { + pAcquireSRWLockExclusive(&condvar_srwlock); + ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 10, 0); + pReleaseSRWLockExclusive(&condvar_srwlock); + + ok(!ret, "SleepConditionVariableSRW should return FALSE on untriggered condvar\n"); + ok(GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableSRW should return ERROR_TIMEOUT on untriggered condvar, not %d\n", GetLastError()); + + pAcquireSRWLockShared(&condvar_srwlock); + ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 10, CONDITION_VARIABLE_LOCKMODE_SHARED); + pReleaseSRWLockShared(&condvar_srwlock); + + ok(!ret, "SleepConditionVariableSRW should return FALSE on untriggered condvar\n"); + ok(GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableSRW should return ERROR_TIMEOUT on untriggered condvar, not %d\n", GetLastError()); + } + hp = CreateThread(NULL, 0, condvar_base_producer, NULL, 0, &dummy); hc = CreateThread(NULL, 0, condvar_base_consumer, NULL, 0, &dummy); @@ -2216,6 +2302,7 @@ START_TEST(sync) pInitOnceComplete = (void *)GetProcAddress(hdll, "InitOnceComplete"); pInitializeConditionVariable = (void *)GetProcAddress(hdll, "InitializeConditionVariable"); pSleepConditionVariableCS = (void *)GetProcAddress(hdll, "SleepConditionVariableCS"); + pSleepConditionVariableSRW = (void *)GetProcAddress(hdll, "SleepConditionVariableSRW"); pWakeAllConditionVariable = (void *)GetProcAddress(hdll, "WakeAllConditionVariable"); pWakeConditionVariable = (void *)GetProcAddress(hdll, "WakeConditionVariable"); pInitializeSRWLock = (void *)GetProcAddress(hdll, "InitializeSRWLock");

1 0

Sebastian Lackner : ntdll: Implement RtlSleepConditionVariableSRW.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: fad29fc5d997cfc13d75c0a5b5563c85188ba2f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad29fc5d997cfc13d75c0a5b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jan 22 01:05:15 2014 +0100 ntdll: Implement RtlSleepConditionVariableSRW. --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/sync.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 1 + 3 files changed, 46 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4140ff9..3c751ea 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -869,6 +869,7 @@ @ stub RtlSetUserValueHeap @ stdcall RtlSizeHeap(long long ptr) @ stdcall RtlSleepConditionVariableCS(ptr ptr ptr) +@ stdcall RtlSleepConditionVariableSRW(ptr ptr ptr long) @ stub RtlSplay @ stub RtlStartRXact # @ stub RtlStatMemoryStream diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 6404ac5..8ef16cc 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1696,3 +1696,47 @@ NTSTATUS WINAPI RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, R RtlEnterCriticalSection( crit ); return status; } + +/*********************************************************************** + * RtlSleepConditionVariableSRW (NTDLL.@) + * + * Atomically releases the SRWLock and suspends the thread, + * waiting for a Wake(All)ConditionVariable event. Afterwards it enters + * the SRWLock again with the same access rights and returns. + * + * PARAMS + * variable [I/O] condition variable + * lock [I/O] SRWLock to leave temporarily + * timeout [I] timeout + * flags [I] type of the current lock (exclusive / shared) + * + * RETURNS + * see NtWaitForKeyedEvent for all possible return values. + * + * NOTES + * the behaviour is undefined if the thread doesn't own the lock. + */ +NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, RTL_SRWLOCK *lock, + const LARGE_INTEGER *timeout, ULONG flags ) +{ + NTSTATUS status; + interlocked_xchg_add( (int *)&variable->Ptr, 1 ); + + if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) + RtlReleaseSRWLockShared( lock ); + else + RtlReleaseSRWLockExclusive( lock ); + + status = NtWaitForKeyedEvent( keyed_event, &variable->Ptr, FALSE, timeout ); + if (status != STATUS_SUCCESS) + { + if (!interlocked_dec_if_nonzero( (int *)&variable->Ptr )) + status = NtWaitForKeyedEvent( keyed_event, &variable->Ptr, FALSE, NULL ); + } + + if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) + RtlAcquireSRWLockShared( lock ); + else + RtlAcquireSRWLockExclusive( lock ); + return status; +} diff --git a/include/winternl.h b/include/winternl.h index d3a02bf..22ee8e8 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2503,6 +2503,7 @@ NTSYSAPI NTSTATUS WINAPI RtlSetThreadErrorMode(DWORD,LPDWORD); NTSYSAPI NTSTATUS WINAPI RtlSetTimeZoneInformation(const RTL_TIME_ZONE_INFORMATION*); NTSYSAPI SIZE_T WINAPI RtlSizeHeap(HANDLE,ULONG,const void*); NTSYSAPI NTSTATUS WINAPI RtlSleepConditionVariableCS(RTL_CONDITION_VARIABLE*,RTL_CRITICAL_SECTION*,const LARGE_INTEGER*); +NTSYSAPI NTSTATUS WINAPI RtlSleepConditionVariableSRW(RTL_CONDITION_VARIABLE*,RTL_SRWLOCK*,const LARGE_INTEGER*,ULONG); NTSYSAPI NTSTATUS WINAPI RtlStringFromGUID(REFGUID,PUNICODE_STRING); NTSYSAPI LPDWORD WINAPI RtlSubAuthoritySid(PSID,DWORD); NTSYSAPI LPBYTE WINAPI RtlSubAuthorityCountSid(PSID);

1 0

Jacek Caban : wmp: Added WindowsMediaPlayer object stub implementation.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: dcdfb7d8a0fa86cc408785e3ee7c3725921b3c07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcdfb7d8a0fa86cc408785e3e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jan 25 18:22:08 2014 +0100 wmp: Added WindowsMediaPlayer object stub implementation. --- dlls/wmp/Makefile.in | 1 + dlls/wmp/oleobj.c | 272 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wmp/wmp_main.c | 13 +-- dlls/wmp/wmp_private.h | 35 +++++++ 4 files changed, 309 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dcdfb7d8a0fa86cc40878…

1 0

Dmitry Timoshkov : taskschd: Implement ITaskFolder::CreateFolder.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: d6f6b6b798c51119f91a815b8720033ae3e99a01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f6b6b798c51119f91a815b8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 20 16:07:46 2014 +0900 taskschd: Implement ITaskFolder::CreateFolder. --- dlls/taskschd/folder.c | 72 ++++++++++++++++++++++++++++++++------ dlls/taskschd/task.c | 2 +- dlls/taskschd/taskschd_private.h | 2 +- dlls/taskschd/tests/scheduler.c | 15 ++------ 4 files changed, 65 insertions(+), 26 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index 6871138..4eb7b8a 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -134,6 +134,30 @@ static HRESULT WINAPI TaskFolder_get_Name(ITaskFolder *iface, BSTR *name) return S_OK; } +static HRESULT reg_create_folder(const WCHAR *path, HKEY *hfolder) +{ + HKEY hroot; + DWORD ret, disposition; + + ret = RegCreateKeyA(HKEY_LOCAL_MACHINE, root, &hroot); + if (ret) return HRESULT_FROM_WIN32(ret); + + while (*path == '\\') path++; + ret = RegCreateKeyExW(hroot, path, 0, NULL, 0, KEY_ALL_ACCESS, NULL, hfolder, &disposition); + if (ret == ERROR_FILE_NOT_FOUND) + ret = ERROR_PATH_NOT_FOUND; + + if (ret == ERROR_SUCCESS && disposition == REG_OPENED_EXISTING_KEY) + { + RegCloseKey(*hfolder); + ret = ERROR_ALREADY_EXISTS; + } + + RegCloseKey(hroot); + + return HRESULT_FROM_WIN32(ret); +} + static HRESULT reg_open_folder(const WCHAR *path, HKEY *hfolder) { HKEY hroot; @@ -203,7 +227,7 @@ static HRESULT WINAPI TaskFolder_GetFolder(ITaskFolder *iface, BSTR path, ITaskF if (!path) return E_INVALIDARG; if (!new_folder) return E_POINTER; - return TaskFolder_create(folder->path, path, new_folder); + return TaskFolder_create(folder->path, path, new_folder, FALSE); } static HRESULT WINAPI TaskFolder_GetFolders(ITaskFolder *iface, LONG flags, ITaskFolderCollection **folders) @@ -212,10 +236,32 @@ static HRESULT WINAPI TaskFolder_GetFolders(ITaskFolder *iface, LONG flags, ITas return E_NOTIMPL; } -static HRESULT WINAPI TaskFolder_CreateFolder(ITaskFolder *iface, BSTR name, VARIANT sddl, ITaskFolder **folder) +static inline BOOL is_variant_null(const VARIANT *var) { - FIXME("%p,%s,%s,%p: stub\n", iface, debugstr_w(name), debugstr_variant(&sddl), folder); - return E_NOTIMPL; + return V_VT(var) == VT_EMPTY || V_VT(var) == VT_NULL || + (V_VT(var) == VT_BSTR && (V_BSTR(var) == NULL || !*V_BSTR(var))); +} + +static HRESULT WINAPI TaskFolder_CreateFolder(ITaskFolder *iface, BSTR path, VARIANT sddl, ITaskFolder **new_folder) +{ + TaskFolder *folder = impl_from_ITaskFolder(iface); + ITaskFolder *tmp_folder = NULL; + HRESULT hr; + + TRACE("%p,%s,%s,%p\n", iface, debugstr_w(path), debugstr_variant(&sddl), folder); + + if (!path) return E_INVALIDARG; + + if (!new_folder) new_folder = &tmp_folder; + + if (!is_variant_null(&sddl)) + FIXME("security descriptor %s is ignored\n", debugstr_variant(&sddl)); + + hr = TaskFolder_create(folder->path, path, new_folder, TRUE); + if (tmp_folder) + ITaskFolder_Release(tmp_folder); + + return hr; } static HRESULT WINAPI TaskFolder_DeleteFolder(ITaskFolder *iface, BSTR name, LONG flags) @@ -302,7 +348,7 @@ static const ITaskFolderVtbl TaskFolder_vtbl = TaskFolder_SetSecurityDescriptor }; -HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj) +HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj, BOOL create) { static const WCHAR bslash[] = { '\\', 0 }; TaskFolder *folder; @@ -328,17 +374,21 @@ HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder ** if (parent) strcpyW(folder_path, parent); - len = strlenW(folder_path); - if (!len || folder_path[len - 1] != '\\') - strcatW(folder_path, bslash); - - if (path) + if (path && *path) { + len = strlenW(folder_path); + if (!len || folder_path[len - 1] != '\\') + strcatW(folder_path, bslash); + while (*path == '\\') path++; strcatW(folder_path, path); } - hr = reg_open_folder(folder_path, &hfolder); + len = strlenW(folder_path); + if (!len) + strcatW(folder_path, bslash); + + hr = create ? reg_create_folder(folder_path, &hfolder) : reg_open_folder(folder_path, &hfolder); if (hr) { HeapFree(GetProcessHeap(), 0, folder_path); diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 632cabb..a13a968 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -117,7 +117,7 @@ static HRESULT WINAPI TaskService_GetFolder(ITaskService *iface, BSTR path, ITas if (!folder) return E_POINTER; - return TaskFolder_create(path, NULL, folder); + return TaskFolder_create(path, NULL, folder, FALSE); } static HRESULT WINAPI TaskService_GetRunningTasks(ITaskService *iface, LONG flags, IRunningTaskCollection **tasks) diff --git a/dlls/taskschd/taskschd_private.h b/dlls/taskschd/taskschd_private.h index deebc41..4ef348f 100644 --- a/dlls/taskschd/taskschd_private.h +++ b/dlls/taskschd/taskschd_private.h @@ -17,6 +17,6 @@ */ HRESULT TaskService_create(void **obj) DECLSPEC_HIDDEN; -HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj) DECLSPEC_HIDDEN; +HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj, BOOL create) DECLSPEC_HIDDEN; const char *debugstr_variant(const VARIANT *v) DECLSPEC_HIDDEN; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index a976de2..61e4a04 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -185,7 +185,6 @@ todo_wine SysFreeString(bstr); hr = ITaskFolder_CreateFolder(folder, NULL, v_null, &subfolder); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); /* Just in case something was left from previous runs */ @@ -205,20 +204,14 @@ todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = ITaskFolder_CreateFolder(folder, Wine_Folder1_Folder2, v_null, &subfolder); -todo_wine ok(hr == S_OK, "CreateFolder error %#x\n", hr); - if (hr != S_OK) - { - ITaskFolder_Release(folder); - ITaskService_Release(service); - return; - } ITaskFolder_Release(subfolder); hr = ITaskFolder_CreateFolder(folder, Wine, v_null, NULL); ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); hr = ITaskFolder_CreateFolder(folder, Wine_Folder1_, v_null, &subfolder); +todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); hr = ITaskFolder_CreateFolder(folder, Wine, v_null, &subfolder); @@ -239,11 +232,6 @@ todo_wine hr = ITaskService_GetFolder(service, Wine_Folder1_Folder2, &subfolder); ok(hr == S_OK, "GetFolder error %#x\n", hr); - if (hr != S_OK) - { - ITaskService_Release(service); - return; - } hr = ITaskFolder_get_Name(subfolder, &bstr); ok (hr == S_OK, "get_Name error %#x\n", hr); @@ -303,6 +291,7 @@ todo_wine SysFreeString(bstr); hr = ITaskFolder_GetFolder(subfolder, bslash, &subfolder2); +todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); hr = ITaskFolder_GetFolder(subfolder, NULL, &subfolder2);

1 0

Piotr Caban : msvcp110: Fix sprintf argument size in num_put:: do_put_double.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: e7c9e32d7d3c6ae235a52f811e0ce753ecc54e0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7c9e32d7d3c6ae235a52f811… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 21 15:18:34 2014 +0100 msvcp110: Fix sprintf argument size in num_put::do_put_double. --- dlls/msvcp90/locale.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 2cdd002..606d6ca 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -7350,9 +7350,12 @@ ostreambuf_iterator_char* __thiscall num_put_char_put_ulong(const num_put *this, return call_num_put_char_do_put_ulong(this, ret, dest, base, fill, v); } -static inline streamsize get_precision(const ios_base *base) +static inline unsigned get_precision(const ios_base *base) { - return base->prec <= 0 && !(base->fmtfl & FMTFLAG_fixed) ? 6 : base->prec; + streamsize ret = base->prec <= 0 && !(base->fmtfl & FMTFLAG_fixed) ? 6 : base->prec; + if(ret > UINT_MAX) + ret = UINT_MAX; + return ret; } /* ?do_put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DN(a)Z */ @@ -7385,7 +7388,7 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *t char *tmp; char fmt[8]; /* strlen("%+#.*lg")+1 */ int size; - streamsize prec; + unsigned prec; TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v); @@ -8304,7 +8307,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_wchar_do_put_double(const num_put char *tmp; char fmt[8]; /* strlen("%+#.*lg")+1 */ int size; - streamsize prec; + unsigned prec; TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v); @@ -8339,7 +8342,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_double(const num_put char *tmp; char fmt[8]; /* strlen("%+#.*lg")+1 */ int size; - streamsize prec; + unsigned prec; TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v);

1 0

Dmitry Timoshkov : taskschd: Implement ITaskFolder::GetFolder.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: efced588616da1ac8153b3d7da40a3dd6dd14bf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efced588616da1ac8153b3d7d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 20 16:06:28 2014 +0900 taskschd: Implement ITaskFolder::GetFolder. --- dlls/taskschd/folder.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index 6d69002..6871138 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -194,10 +194,16 @@ static HRESULT WINAPI TaskFolder_get_Path(ITaskFolder *iface, BSTR *path) return S_OK; } -static HRESULT WINAPI TaskFolder_GetFolder(ITaskFolder *iface, BSTR path, ITaskFolder **folder) +static HRESULT WINAPI TaskFolder_GetFolder(ITaskFolder *iface, BSTR path, ITaskFolder **new_folder) { - FIXME("%p,%s,%p: stub\n", iface, debugstr_w(path), folder); - return E_NOTIMPL; + TaskFolder *folder = impl_from_ITaskFolder(iface); + + TRACE("%p,%s,%p\n", iface, debugstr_w(path), folder); + + if (!path) return E_INVALIDARG; + if (!new_folder) return E_POINTER; + + return TaskFolder_create(folder->path, path, new_folder); } static HRESULT WINAPI TaskFolder_GetFolders(ITaskFolder *iface, LONG flags, ITaskFolderCollection **folders)

1 0

Vincent Povirk : gdiplus: Add test for page transform in metafiles.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 3f8864ea822117a8dfb6a1f73ac554931febf13e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f8864ea822117a8dfb6a1f73… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jan 16 14:58:50 2014 -0600 gdiplus: Add test for page transform in metafiles. --- dlls/gdiplus/tests/metafile.c | 203 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 203 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index d4d7adb..16c440b 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -18,11 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <math.h> + #include "objbase.h" #include "gdiplus.h" #include "wine/test.h" #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) +#define expectf(expected, got) ok(fabs((expected) - (got)) < 0.0001, "Expected %f, got %f\n", (expected), (got)) typedef struct emfplus_record { @@ -709,6 +712,205 @@ static void test_fillrect(void) expect(Ok, stat); } +static const emfplus_record pagetransform_records[] = { + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeSetPageTransform}, + {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeSetPageTransform}, + {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeSetPageTransform}, + {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeSetPageTransform}, + {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, + {0} +}; + +static void test_pagetransform(void) +{ + GpStatus stat; + GpMetafile *metafile; + GpGraphics *graphics; + HDC hdc; + static const GpRectF frame = {0.0, 0.0, 5.0, 5.0}; + static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + GpBitmap *bitmap; + ARGB color; + GpBrush *brush; + GpUnit unit; + REAL scale, dpix, dpiy; + UINT width, height; + + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitInch, description, &metafile); + expect(Ok, stat); + + DeleteDC(hdc); + + if (stat != Ok) + return; + + stat = GdipGetImageHorizontalResolution((GpImage*)metafile, &dpix); + todo_wine expect(InvalidParameter, stat); + + stat = GdipGetImageVerticalResolution((GpImage*)metafile, &dpiy); + todo_wine expect(InvalidParameter, stat); + + stat = GdipGetImageWidth((GpImage*)metafile, &width); + todo_wine expect(InvalidParameter, stat); + + stat = GdipGetImageHeight((GpImage*)metafile, &height); + todo_wine expect(InvalidParameter, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + /* initial scale */ + stat = GdipGetPageUnit(graphics, &unit); + expect(Ok, stat); + expect(UnitDisplay, unit); + + stat = GdipGetPageScale(graphics, &scale); + expect(Ok, stat); + expectf(1.0, scale); + + stat = GdipGetDpiX(graphics, &dpix); + expect(Ok, stat); + expectf(96.0, dpix); + + stat = GdipGetDpiY(graphics, &dpiy); + expect(Ok, stat); + expectf(96.0, dpiy); + + stat = GdipCreateSolidFill((ARGB)0xff0000ff, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangleI(graphics, brush, 1, 2, 1, 1); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + /* page unit = pixels */ + stat = GdipSetPageUnit(graphics, UnitPixel); + expect(Ok, stat); + + stat = GdipGetPageUnit(graphics, &unit); + expect(Ok, stat); + expect(UnitPixel, unit); + + stat = GdipCreateSolidFill((ARGB)0xff00ff00, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangleI(graphics, brush, 0, 1, 1, 1); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + /* page scale = 3, unit = pixels */ + stat = GdipSetPageScale(graphics, 3.0); + expect(Ok, stat); + + stat = GdipGetPageScale(graphics, &scale); + expect(Ok, stat); + expectf(3.0, scale); + + stat = GdipCreateSolidFill((ARGB)0xff00ffff, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangleI(graphics, brush, 0, 1, 2, 2); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + /* page scale = 3, unit = inches */ + stat = GdipSetPageUnit(graphics, UnitInch); + expect(Ok, stat); + + stat = GdipGetPageUnit(graphics, &unit); + expect(Ok, stat); + expect(UnitInch, unit); + + stat = GdipCreateSolidFill((ARGB)0xffff0000, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangle(graphics, brush, 1.0/96.0, 0, 1, 1); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + /* page scale = 3, unit = display */ + stat = GdipSetPageUnit(graphics, UnitDisplay); + expect(Ok, stat); + + stat = GdipGetPageUnit(graphics, &unit); + expect(Ok, stat); + expect(UnitDisplay, unit); + + stat = GdipCreateSolidFill((ARGB)0xffff00ff, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangle(graphics, brush, 3, 3, 2, 2); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + check_metafile(metafile, pagetransform_records, "pagetransform metafile", dst_points, &frame, UnitPixel); + + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + play_metafile(metafile, graphics, pagetransform_records, "pagetransform playback", dst_points, &frame, UnitPixel); + + stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipBitmapGetPixel(bitmap, 30, 50, &color); + expect(Ok, stat); + expect(0xff0000ff, color); + + stat = GdipBitmapGetPixel(bitmap, 10, 30, &color); + expect(Ok, stat); + expect(0xff00ff00, color); + + stat = GdipBitmapGetPixel(bitmap, 20, 80, &color); + expect(Ok, stat); + expect(0xff00ffff, color); + + stat = GdipBitmapGetPixel(bitmap, 80, 20, &color); + expect(Ok, stat); + expect(0xffff0000, color); + + stat = GdipBitmapGetPixel(bitmap, 80, 80, &color); + expect(Ok, stat); + expect(0xffff00ff, color); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -725,6 +927,7 @@ START_TEST(metafile) test_getdc(); test_emfonly(); test_fillrect(); + test_pagetransform(); GdiplusShutdown(gdiplusToken); }

1 0

Sebastian Lackner : winex11: Catch invalid values from broken QX11EmbedContainer implementations.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: f3568a5e1222ce2a85a05efeb417c141fceb0d78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3568a5e1222ce2a85a05efeb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jan 23 20:19:41 2014 +0100 winex11: Catch invalid values from broken QX11EmbedContainer implementations. --- dlls/winex11.drv/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index f60e845..ea24471 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1662,7 +1662,7 @@ static void handle_xembed_protocol( HWND hwnd, XClientMessageEvent *event ) data->embedder = event->data.l[3]; /* window has been marked as embedded before (e.g. systray) */ - if (data->embedded) + if (data->embedded || !data->embedder /* broken QX11EmbedContainer implementation */) { release_win_data( data ); break;

1 0

Piotr Caban : msvcrt: Fix wcs*coll functions behavior in C locale.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 965d3acc6d0147b1cf1465ef814f4134031cf978 URL: http://source.winehq.org/git/wine.git/?a=commit;h=965d3acc6d0147b1cf1465ef8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 23 15:10:30 2014 +0100 msvcrt: Fix wcs*coll functions behavior in C locale. --- dlls/msvcrt/wcs.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 12458a8..1b00b41 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -105,6 +105,8 @@ int CDECL MSVCRT__wcsicoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* s else locinfo = locale->locinfo; + if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) + return strcmpiW(str1, str2); return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE, str1, -1, str2, -1)-CSTR_EQUAL; } @@ -130,6 +132,8 @@ int CDECL MSVCRT__wcsnicoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* else locinfo = locale->locinfo; + if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) + return strncmpiW(str1, str2, count); return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE, str1, count, str2, count)-CSTR_EQUAL; } @@ -258,6 +262,8 @@ int CDECL MSVCRT__wcsncoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* s else locinfo = locale->locinfo; + if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) + return strncmpW(str1, str2, count); return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, str1, count, str2, count)-CSTR_EQUAL; } @@ -1182,6 +1188,8 @@ int CDECL MSVCRT__wcscoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* st else locinfo = locale->locinfo; + if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) + return strcmpW(str1, str2); return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, str1, -1, str2, -1)-CSTR_EQUAL; }

1 0

Jacek Caban : wmp: Added WindowsMediaPlayer class factory.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 068a9daec7a27ec10478468297939f01e2404605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=068a9daec7a27ec1047846829… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jan 25 18:21:57 2014 +0100 wmp: Added WindowsMediaPlayer class factory. --- dlls/wmp/wmp_main.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/wmp/wmp_main.c b/dlls/wmp/wmp_main.c index c0933f2..ebce0a5 100644 --- a/dlls/wmp/wmp_main.c +++ b/dlls/wmp/wmp_main.c @@ -16,9 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + +#include "initguid.h" #include "windows.h" #include "ole2.h" #include "rpcproxy.h" +#include "wmp.h" #include "wine/debug.h" @@ -26,6 +30,62 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmp); static HINSTANCE wmp_instance; +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + *ppv = iface; + }else if(IsEqualGUID(&IID_IClassFactory, riid)) { + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + *ppv = iface; + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 1; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + TRACE("(%p)->(%x)\n", iface, fLock); + return S_OK; +} + +static HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, + REFIID riid, void **ppv) +{ + FIXME("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static const IClassFactoryVtbl WMPFactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + WMPFactory_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory WMPFactory = { &WMPFactoryVtbl }; + /****************************************************************** * DllMain (wmp.@) */ @@ -50,7 +110,12 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { - FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + if(IsEqualGUID(&CLSID_WindowsMediaPlayer, rclsid)) { + TRACE("(CLSID_WindowsMediaPlayer %s %p)\n", debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&WMPFactory, riid, ppv); + } + + FIXME("Unknown object %s\n", debugstr_guid(rclsid)); return CLASS_E_CLASSNOTAVAILABLE; }

1 0

Jacek Caban : wmp: Added typelib.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 6f95257b8bfdbee1d077f3d7245049168857316c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f95257b8bfdbee1d077f3d72… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jan 25 18:21:44 2014 +0100 wmp: Added typelib. --- configure | 2 +- configure.ac | 2 +- dlls/wmp/Makefile.in | 2 ++ dlls/wmp/wmp_typelib.idl | 21 +++++++++++++++++++++ 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/configure b/configure index e3b45e2..312c19f 100755 --- a/configure +++ b/configure @@ -17103,7 +17103,7 @@ wine_fn_config_test dlls/wldap32/tests wldap32_test wine_fn_config_dll wmi enable_wmi wine_fn_config_dll wmiutils enable_wmiutils clean wine_fn_config_test dlls/wmiutils/tests wmiutils_test -wine_fn_config_dll wmp enable_wmp +wine_fn_config_dll wmp enable_wmp clean wine_fn_config_dll wmvcore enable_wmvcore wine_fn_config_dll wnaspi32 enable_wnaspi32 implib wine_fn_config_dll wow32 enable_win16 implib diff --git a/configure.ac b/configure.ac index 7744044..fbfbb5c 100644 --- a/configure.ac +++ b/configure.ac @@ -3226,7 +3226,7 @@ WINE_CONFIG_TEST(dlls/wldap32/tests) WINE_CONFIG_DLL(wmi) WINE_CONFIG_DLL(wmiutils,,[clean]) WINE_CONFIG_TEST(dlls/wmiutils/tests) -WINE_CONFIG_DLL(wmp) +WINE_CONFIG_DLL(wmp,,[clean]) WINE_CONFIG_DLL(wmvcore) WINE_CONFIG_DLL(wnaspi32,,[implib]) WINE_CONFIG_DLL(wow32,enable_win16,[implib]) diff --git a/dlls/wmp/Makefile.in b/dlls/wmp/Makefile.in index 7d34324..36b78ed 100644 --- a/dlls/wmp/Makefile.in +++ b/dlls/wmp/Makefile.in @@ -2,3 +2,5 @@ MODULE = wmp.dll C_SRCS = \ wmp_main.c + +IDL_SRCS = wmp_typelib.idl diff --git a/dlls/wmp/wmp_typelib.idl b/dlls/wmp/wmp_typelib.idl new file mode 100644 index 0000000..2c40b68 --- /dev/null +++ b/dlls/wmp/wmp_typelib.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2014 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep regtypelib + +#include "wmp.idl"

1 0

Jacek Caban : atl90: Share atl_ax.c with atl100.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 1a130126053105d9022f7a83fc95587bdb415ff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a130126053105d9022f7a83f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 20 14:46:56 2014 +0100 atl90: Share atl_ax.c with atl100. --- dlls/atl100/atl_ax.c | 17 ++++++++++++---- dlls/atl90/Makefile.in | 7 +++++-- dlls/atl90/atl90.c | 53 ------------------------------------------------ dlls/atl90/atl90.spec | 18 ++++++++-------- 4 files changed, 27 insertions(+), 68 deletions(-) diff --git a/dlls/atl100/atl_ax.c b/dlls/atl100/atl_ax.c index 50ebe3b..0f0f3c6 100644 --- a/dlls/atl100/atl_ax.c +++ b/dlls/atl100/atl_ax.c @@ -86,8 +86,17 @@ static LRESULT CALLBACK AtlAxWin_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, L BOOL WINAPI AtlAxWinInit(void) { WNDCLASSEXW wcex; - const WCHAR AtlAxWin100[] = {'A','t','l','A','x','W','i','n','1','0','0',0}; - const WCHAR AtlAxWinLic100[] = {'A','t','l','A','x','W','i','n','L','i','c','1','0','0',0}; + +#if _ATL_VER == _ATL_VER_90 +#define ATL_NAME_SUFFIX '9','0',0 +#elif _ATL_VER == _ATL_VER_100 +#define ATL_NAME_SUFFIX '1','0','0',0 +#else +#error Unsupported version +#endif + + const WCHAR AtlAxWinW[] = {'A','t','l','A','x','W','i','n',ATL_NAME_SUFFIX}; + const WCHAR AtlAxWinLicW[] = {'A','t','l','A','x','W','i','n','L','i','c',ATL_NAME_SUFFIX}; FIXME("version %04x semi-stub\n", _ATL_VER); @@ -106,11 +115,11 @@ BOOL WINAPI AtlAxWinInit(void) wcex.hIconSm = 0; wcex.lpfnWndProc = AtlAxWin_wndproc; - wcex.lpszClassName = AtlAxWin100; + wcex.lpszClassName = AtlAxWinW; if ( !RegisterClassExW( &wcex ) ) return FALSE; - wcex.lpszClassName = AtlAxWinLic100; + wcex.lpszClassName = AtlAxWinLicW; if ( !RegisterClassExW( &wcex ) ) return FALSE; diff --git a/dlls/atl90/Makefile.in b/dlls/atl90/Makefile.in index f52b7d5..677aaae 100644 --- a/dlls/atl90/Makefile.in +++ b/dlls/atl90/Makefile.in @@ -1,7 +1,10 @@ MODULE = atl90.dll -IMPORTS = atl100 oleaut32 user32 ole32 +IMPORTS = atl100 oleaut32 user32 ole32 uuid EXTRADEFS = -D_ATL_VER=_ATL_VER_90 +PARENTSRC = ../atl100 -C_SRCS = atl90.c +C_SRCS = \ + atl90.c \ + atl_ax.c RC_SRCS = atl90.rc diff --git a/dlls/atl90/atl90.c b/dlls/atl90/atl90.c index 06e8066..9dd0b70 100644 --- a/dlls/atl90/atl90.c +++ b/dlls/atl90/atl90.c @@ -40,56 +40,3 @@ DWORD WINAPI AtlGetVersion(void *reserved) TRACE("version %04x (%p)\n", _ATL_VER, reserved); return _ATL_VER; } - -/********************************************************************** - * AtlAxWin class window procedure - */ -static LRESULT CALLBACK AtlAxWin_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) -{ - if ( msg == WM_CREATE ) - { - DWORD len = GetWindowTextLengthW( hwnd ) + 1; - WCHAR *ptr = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); - if (!ptr) - return 1; - GetWindowTextW( hwnd, ptr, len ); - AtlAxCreateControlEx( ptr, hwnd, NULL, NULL, NULL, NULL, NULL ); - HeapFree( GetProcessHeap(), 0, ptr ); - return 0; - } - return DefWindowProcW( hwnd, msg, wparam, lparam ); -} - -BOOL WINAPI AtlAxWinInit(void) -{ - WNDCLASSEXW wcex; - const WCHAR AtlAxWin90[] = {'A','t','l','A','x','W','i','n','9','0',0}; - const WCHAR AtlAxWinLic90[] = {'A','t','l','A','x','W','i','n','L','i','c','9','0',0}; - - FIXME("version %04x semi-stub\n", _ATL_VER); - - if ( FAILED( OleInitialize(NULL) ) ) - return FALSE; - - wcex.cbSize = sizeof(wcex); - wcex.style = CS_GLOBALCLASS | CS_DBLCLKS; - wcex.cbClsExtra = 0; - wcex.cbWndExtra = 0; - wcex.hInstance = GetModuleHandleW( NULL ); - wcex.hIcon = NULL; - wcex.hCursor = NULL; - wcex.hbrBackground = NULL; - wcex.lpszMenuName = NULL; - wcex.hIconSm = 0; - - wcex.lpfnWndProc = AtlAxWin_wndproc; - wcex.lpszClassName = AtlAxWin90; - if ( !RegisterClassExW( &wcex ) ) - return FALSE; - - wcex.lpszClassName = AtlAxWinLic90; - if ( !RegisterClassExW( &wcex ) ) - return FALSE; - - return TRUE; -} diff --git a/dlls/atl90/atl90.spec b/dlls/atl90/atl90.spec index 045969e..35facf8 100644 --- a/dlls/atl90/atl90.spec +++ b/dlls/atl90/atl90.spec @@ -18,20 +18,20 @@ 31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface 34 stdcall AtlGetVersion(ptr) -35 stdcall AtlAxDialogBoxW(long wstr long ptr long) atl100.AtlAxDialogBoxW -36 stdcall AtlAxDialogBoxA(long str long ptr long) atl100.AtlAxDialogBoxA -37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl100.AtlAxCreateDialogW -38 stdcall AtlAxCreateDialogA(long str long ptr long) atl100.AtlAxCreateDialogA -39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl100.AtlAxCreateControl -40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl100.AtlAxCreateControlEx -41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl +35 stdcall AtlAxDialogBoxW(long wstr long ptr long) +36 stdcall AtlAxDialogBoxA(long str long ptr long) +37 stdcall AtlAxCreateDialogW(long wstr long ptr long) +38 stdcall AtlAxCreateDialogA(long str long ptr long) +39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) +40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) +41 stdcall AtlAxAttachControl(ptr ptr ptr) 42 stdcall AtlAxWinInit() 43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) atl100.AtlWinModuleAddCreateWndData 44 stdcall AtlWinModuleExtractCreateWndData(ptr) atl100.AtlWinModuleExtractCreateWndData 45 stub AtlWinModuleRegisterWndClassInfoW 46 stub AtlWinModuleRegisterWndClassInfoA -47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl -48 stdcall AtlAxGetHost(long ptr) atl100.AtlAxGetHost +47 stdcall AtlAxGetControl(long ptr) +48 stdcall AtlAxGetHost(long ptr) 49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save

1 0

Piotr Caban : msvcrt: Fix str*coll functions behavior in C locale.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 619944cf58ae738ed984b9ab7dfb42ae1653edd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=619944cf58ae738ed984b9ab7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 23 15:10:14 2014 +0100 msvcrt: Fix str*coll functions behavior in C locale. --- dlls/msvcrt/string.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 10fb35f..446c119 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -489,6 +489,8 @@ int CDECL MSVCRT_strcoll_l( const char* str1, const char* str2, MSVCRT__locale_t else locinfo = locale->locinfo; + if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) + return strcmp(str1, str2); return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, str1, -1, str2, -1)-CSTR_EQUAL; } @@ -512,6 +514,8 @@ int CDECL MSVCRT__stricoll_l( const char* str1, const char* str2, MSVCRT__locale else locinfo = locale->locinfo; + if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) + return strcasecmp(str1, str2); return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE, str1, -1, str2, -1)-CSTR_EQUAL; } @@ -536,6 +540,8 @@ int CDECL MSVCRT__strncoll_l( const char* str1, const char* str2, MSVCRT_size_t else locinfo = locale->locinfo; + if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) + return strncmp(str1, str2, count); return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, str1, count, str2, count)-CSTR_EQUAL; } @@ -559,6 +565,8 @@ int CDECL MSVCRT__strnicoll_l( const char* str1, const char* str2, MSVCRT_size_t else locinfo = locale->locinfo; + if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) + return strncasecmp(str1, str2, count); return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE, str1, count, str2, count)-CSTR_EQUAL; }

1 0

Jacek Caban : d3d9.h: Added __uuidof() support to interfaces.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 34a4789900c284906afae11ced74ee3494269463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34a4789900c284906afae11ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 22 11:49:19 2014 +0100 d3d9.h: Added __uuidof() support to interfaces. --- include/d3d9.h | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/include/d3d9.h b/include/d3d9.h index 098fc9a..20625b0 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -203,6 +203,10 @@ DECLARE_INTERFACE_(IDirect3D9,IUnknown) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3D9, 0x81BDCBCA, 0x64D4, 0x426D, 0xAE, 0x8D, 0xAD, 0x1, 0x47, 0xF4, 0x27, 0x5C); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3D9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -288,6 +292,10 @@ DECLARE_INTERFACE_(IDirect3D9Ex,IDirect3D9) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3D9Ex, 0x02177241, 0x69FC, 0x400C, 0x8F, 0xF1, 0x93, 0xA4, 0x4D, 0xF6, 0x86, 0x1D); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3D9Ex_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -358,6 +366,10 @@ DECLARE_INTERFACE_(IDirect3DVolume9,IUnknown) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DVolume9, 0x24f416e6, 0x1f67, 0x4aa7, 0xb8, 0x8e, 0xd3, 0x3f, 0x6f, 0x31, 0x28, 0xa1); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DVolume9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -410,6 +422,10 @@ DECLARE_INTERFACE_(IDirect3DSwapChain9,IUnknown) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DSwapChain9, 0x794950f2, 0xadfc, 0x458a, 0x90, 0x5e, 0x10, 0xa1, 0xb, 0xb, 0x50, 0x3b); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DSwapChain9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -464,6 +480,10 @@ DECLARE_INTERFACE_(IDirect3DSwapChain9Ex,IDirect3DSwapChain9) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DSwapChain9Ex, 0x91886caf, 0x1c3d, 0x4d2e, 0xa0, 0xab, 0x3e, 0x4c, 0x7d, 0x8d, 0x33, 0x3); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DSwapChain9Ex_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -522,6 +542,10 @@ DECLARE_INTERFACE_(IDirect3DResource9,IUnknown) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DResource9, 0x5eec05d, 0x8f7d, 0x4362, 0xb9, 0x99, 0xd1, 0xba, 0xf3, 0x57, 0xc7, 0x4); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DResource9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -581,6 +605,10 @@ DECLARE_INTERFACE_(IDirect3DSurface9,IDirect3DResource9) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DSurface9, 0xcfbaf3a, 0x9ff6, 0x429a, 0x99, 0xb3, 0xa2, 0x79, 0x6a, 0xf8, 0xb8, 0x9b); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DSurface9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -651,6 +679,10 @@ DECLARE_INTERFACE_(IDirect3DVertexBuffer9,IDirect3DResource9) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DVertexBuffer9, 0xb64bb1b5, 0xfd70, 0x4df6, 0xbf, 0x91, 0x19, 0xd0, 0xa1, 0x24, 0x55, 0xe3); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DVertexBuffer9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -715,6 +747,10 @@ DECLARE_INTERFACE_(IDirect3DIndexBuffer9,IDirect3DResource9) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DIndexBuffer9, 0x7c9dd65e, 0xd3f7, 0x4529, 0xac, 0xee, 0x78, 0x58, 0x30, 0xac, 0xde, 0x35); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DIndexBuffer9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -782,6 +818,10 @@ DECLARE_INTERFACE_(IDirect3DBaseTexture9,IDirect3DResource9) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DBaseTexture9, 0x580ca87e, 0x1d3c, 0x4d54, 0x99, 0x1d, 0xb7, 0xd3, 0xe3, 0xc2, 0x98, 0xce); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DBaseTexture9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -862,6 +902,10 @@ DECLARE_INTERFACE_(IDirect3DCubeTexture9,IDirect3DBaseTexture9) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DCubeTexture9, 0xfff32f81, 0xd953, 0x473a, 0x92, 0x23, 0x93, 0xd6, 0x52, 0xab, 0xa9, 0x3f); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DCubeTexture9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -953,6 +997,10 @@ DECLARE_INTERFACE_(IDirect3DTexture9,IDirect3DBaseTexture9) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DTexture9, 0x85c31227, 0x3de5, 0x4f00, 0x9b, 0x3a, 0xf1, 0x1a, 0xc3, 0x8c, 0x18, 0xb5); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DTexture9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -1044,6 +1092,10 @@ DECLARE_INTERFACE_(IDirect3DVolumeTexture9,IDirect3DBaseTexture9) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DVolumeTexture9, 0x2518526c, 0xe789, 0x4111, 0xa7, 0xb9, 0x47, 0xef, 0x32, 0x8d, 0x13, 0xe6); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DVolumeTexture9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -1116,6 +1168,10 @@ DECLARE_INTERFACE_(IDirect3DVertexDeclaration9,IUnknown) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DVertexDeclaration9, 0xdd13c59c, 0x36fa, 0x4098, 0xa8, 0xfb, 0xc7, 0xed, 0x39, 0xdc, 0x85, 0x46); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DVertexDeclaration9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -1150,6 +1206,10 @@ DECLARE_INTERFACE_(IDirect3DVertexShader9,IUnknown) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DVertexShader9, 0xefc5557e, 0x6265, 0x4613, 0x8a, 0x94, 0x43, 0x85, 0x78, 0x89, 0xeb, 0x36); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DVertexShader9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -1184,6 +1244,10 @@ DECLARE_INTERFACE_(IDirect3DPixelShader9,IUnknown) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DPixelShader9, 0x6d3bdbdc, 0x5b02, 0x4415, 0xb8, 0x52, 0xce, 0x5e, 0x8b, 0xcc, 0xb2, 0x89); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DPixelShader9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -1219,6 +1283,10 @@ DECLARE_INTERFACE_(IDirect3DStateBlock9,IUnknown) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DStateBlock9, 0xb07c4fe5, 0x310d, 0x4ba8, 0xa2, 0x3c, 0x4f, 0xf, 0x20, 0x6f, 0x21, 0x8b); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DStateBlock9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -1258,6 +1326,10 @@ DECLARE_INTERFACE_(IDirect3DQuery9,IUnknown) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DQuery9, 0xd9771460, 0xa695, 0x4f26, 0xbb, 0xd3, 0x27, 0xb8, 0x40, 0xb5, 0x41, 0xcc); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DQuery9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -1419,6 +1491,10 @@ DECLARE_INTERFACE_(IDirect3DDevice9,IUnknown) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DDevice9, 0xd0223b96, 0xbf7a, 0x43fd, 0x92, 0xbd, 0xa4, 0x3b, 0xd, 0x82, 0xb9, 0xeb); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DDevice9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -1824,6 +1900,10 @@ DECLARE_INTERFACE_(IDirect3DDevice9Ex,IDirect3DDevice9) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DDevice9Ex, 0xb18b10ce, 0x2649, 0x405a, 0x87, 0xf, 0x95, 0xf7, 0x77, 0xd4, 0x31, 0x3a); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DDevice9Ex_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)

1 0

Jacek Caban : mshtml: Added more refcnt tests.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 2350597df284f99a7605d077b37d5b834fc64351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2350597df284f99a7605d077b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 21 15:54:57 2014 +0100 mshtml: Added more refcnt tests. --- dlls/mshtml/tests/activex.c | 56 ++++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 147c9a7..10db835 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -119,6 +119,7 @@ static ITypeInfo *actxtest_typeinfo, *class_typeinfo; static HWND container_hwnd, plugin_hwnd; static int plugin_behavior; static BOOL no_quickact; +static LONG activex_refcnt; #define TESTACTIVEX_CLSID "{178fc163-f585-4e24-9c13-4bb7f6680746}" @@ -398,12 +399,12 @@ static HRESULT WINAPI OleControl_QueryInterface(IOleControl *iface, REFIID riid, static ULONG WINAPI OleControl_AddRef(IOleControl *iface) { - return 2; + return ++activex_refcnt; } static ULONG WINAPI OleControl_Release(IOleControl *iface) { - return 1; + return --activex_refcnt; } static HRESULT WINAPI OleControl_GetControlInfo(IOleControl *iface, CONTROLINFO *pCI) @@ -459,12 +460,12 @@ static HRESULT WINAPI QuickActivate_QueryInterface(IQuickActivate *iface, REFIID static ULONG WINAPI QuickActivate_AddRef(IQuickActivate *iface) { - return 2; + return ++activex_refcnt; } static ULONG WINAPI QuickActivate_Release(IQuickActivate *iface) { - return 1; + return --activex_refcnt; } static HRESULT WINAPI QuickActivate_QuickActivate(IQuickActivate *iface, QACONTAINER *container, QACONTROL *control) @@ -547,12 +548,12 @@ static HRESULT WINAPI PersistPropertyBag_QueryInterface(IPersistPropertyBag *ifa static ULONG WINAPI PersistPropertyBag_AddRef(IPersistPropertyBag *iface) { - return 2; + return ++activex_refcnt; } static ULONG WINAPI PersistPropertyBag_Release(IPersistPropertyBag *iface) { - return 1; + return --activex_refcnt; } static HRESULT WINAPI PersistPropertyBag_GetClassID(IPersistPropertyBag *face, CLSID *pClassID) @@ -689,12 +690,12 @@ static HRESULT WINAPI Dispatch_QueryInterface(IDispatch *iface, REFIID riid, voi static ULONG WINAPI Dispatch_AddRef(IDispatch *iface) { - return 2; + return ++activex_refcnt; } static ULONG WINAPI Dispatch_Release(IDispatch *iface) { - return 1; + return --activex_refcnt; } static HRESULT WINAPI Dispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) @@ -832,12 +833,12 @@ static HRESULT WINAPI ProvideClassInfo_QueryInterface(IProvideClassInfo *iface, static ULONG WINAPI ProvideClassInfo_AddRef(IProvideClassInfo *iface) { - return 2; + return ++activex_refcnt; } static ULONG WINAPI ProvideClassInfo_Release(IProvideClassInfo *iface) { - return 1; + return --activex_refcnt; } static HRESULT WINAPI ProvideClassInfo_GetClassInfo(IProvideClassInfo *iface, ITypeInfo **ppTI) @@ -865,12 +866,12 @@ static HRESULT WINAPI ConnectionPointContainer_QueryInterface(IConnectionPointCo static ULONG WINAPI ConnectionPointContainer_AddRef(IConnectionPointContainer *iface) { - return 2; + return ++activex_refcnt; } static ULONG WINAPI ConnectionPointContainer_Release(IConnectionPointContainer *iface) { - return 1; + return --activex_refcnt; } static HRESULT WINAPI ConnectionPointContainer_EnumConnectionPoints(IConnectionPointContainer *iface, @@ -892,6 +893,7 @@ static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPo CHECK_EXPECT(FindConnectionPoint); ok(IsEqualGUID(riid, &DIID_DispActiveXTest), "riid = %s\n", debugstr_guid(riid)); + IConnectionPoint_AddRef(&ConnectionPoint); *ppCP = &ConnectionPoint; return S_OK; } @@ -913,12 +915,12 @@ static HRESULT WINAPI ViewObjectEx_QueryInterface(IViewObjectEx *iface, REFIID r static ULONG WINAPI ViewObjectEx_AddRef(IViewObjectEx *iface) { - return 2; + return ++activex_refcnt; } static ULONG WINAPI ViewObjectEx_Release(IViewObjectEx *iface) { - return 1; + return --activex_refcnt; } static HRESULT WINAPI ViewObjectEx_Draw(IViewObjectEx *iface, DWORD dwDrawAspect, LONG lindex, void *pvAspect, DVTARGETDEVICE *ptd, @@ -1032,12 +1034,12 @@ static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, v static ULONG WINAPI OleObject_AddRef(IOleObject *iface) { - return 2; + return ++activex_refcnt; } static ULONG WINAPI OleObject_Release(IOleObject *iface) { - return 1; + return --activex_refcnt; } static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite *pClientSite) @@ -1291,12 +1293,12 @@ static HRESULT WINAPI OleInPlaceObject_QueryInterface(IOleInPlaceObjectWindowles static ULONG WINAPI OleInPlaceObject_AddRef(IOleInPlaceObjectWindowless *iface) { - return 2; + return ++activex_refcnt; } static ULONG WINAPI OleInPlaceObject_Release(IOleInPlaceObjectWindowless *iface) { - return 1; + return --activex_refcnt; } static HRESULT WINAPI OleInPlaceObject_GetWindow(IOleInPlaceObjectWindowless *iface, @@ -1456,6 +1458,7 @@ static HRESULT ax_qi(REFIID riid, void **ppv) }else if(IsEqualGUID(riid, &IID_ITestActiveX)) { CHECK_EXPECT(QI_ITestActiveX); *ppv = &wrapped_iface; + return S_OK; }else if(IsEqualGUID(riid, &IID_IOleWindow) || IsEqualGUID(riid, &IID_IOleInPlaceObject) || IsEqualGUID(&IID_IOleInPlaceObjectWindowless, riid)) { *ppv = plugin_behavior == TEST_DISPONLY ? NULL : &OleInPlaceObjectWindowless; @@ -1464,7 +1467,11 @@ static HRESULT ax_qi(REFIID riid, void **ppv) *ppv = NULL; } - return *ppv ? S_OK : E_NOINTERFACE; + if(!*ppv) + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) @@ -1504,6 +1511,7 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown ok(!outer, "outer = %p\n", outer); ok(IsEqualGUID(riid, &IID_IUnknown), "riid = %s\n", debugstr_guid(riid)); + activex_refcnt++; *ppv = &OleControl; return S_OK; } @@ -1739,6 +1747,7 @@ static void test_container(IHTMLDocument2 *doc_obj) ok(hres == S_OK, "QueryService(CLSID_TestActiveX) failed: %08x\n", hres); ok(unk == (IUnknown*)&OleObject, "unexpected unk %p\n", unk); CHECK_CALLED(QueryService_TestActiveX); + IUnknown_Release(unk); IServiceProvider_Release(serv_prov); @@ -2359,12 +2368,15 @@ static void release_doc(IHTMLDocument2 *doc) DestroyWindow(plugin_hwnd); plugin_hwnd = NULL; } + + ok(!activex_refcnt, "activex_refcnt = %d\n", activex_refcnt); } static void init_test(int behavior) { plugin_behavior = behavior; + activex_refcnt = 0; no_quickact = behavior == TEST_NOQUICKACT || behavior == TEST_DISPONLY; } @@ -2399,6 +2411,7 @@ static void test_event_call(void) static void test_flash_ax(void) { IHTMLDocument2 *doc; + IOleClientSite *cs; init_test(TEST_FLASH); @@ -2440,6 +2453,9 @@ static void test_flash_ax(void) test_container(notif_doc); test_object_elem(notif_doc); + IOleClientSite_AddRef(client_site); + cs = client_site; + SET_EXPECT(UIDeactivate); SET_EXPECT(Invoke_ENABLED); SET_EXPECT(Invoke_VALID); @@ -2454,6 +2470,8 @@ static void test_flash_ax(void) CHECK_CALLED(InPlaceDeactivate); CHECK_CALLED(Close); CHECK_CALLED(SetClientSite_NULL); + + IOleClientSite_Release(cs); } static void test_noquickact_ax(void)

1 0

Akihiro Sagawa : gdi32: Fix regression due to sub-pixel shift calculations fixes.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: e06d2dbc6772bf4f038847f2c7825ecdefcf4b90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e06d2dbc6772bf4f038847f2c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jan 24 01:47:54 2014 +0900 gdi32: Fix regression due to sub-pixel shift calculations fixes. --- dlls/gdi32/freetype.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 722a211..5f4a570 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6744,11 +6744,13 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, { gm.gmBlackBoxX += 2; gm.gmptGlyphOrigin.x -= 1; + left -= (1 << 6); } else { gm.gmBlackBoxY += 2; gm.gmptGlyphOrigin.y += 1; + top += (1 << 6); } }

1 0

Piotr Caban : msvcp60: Add std::_Fpz export.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 76db3b0debb9489b54650bf36379c246ed702f90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76db3b0debb9489b54650bf36… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 20 18:18:50 2014 +0100 msvcp60: Add std::_Fpz export. --- dlls/msvcp60/main.c | 3 +++ dlls/msvcp60/msvcp60.spec | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp60/main.c b/dlls/msvcp60/main.c index e9c6975..3c5e36f 100644 --- a/dlls/msvcp60/main.c +++ b/dlls/msvcp60/main.c @@ -54,6 +54,9 @@ DEFINE_VTBL_WRAPPER(48); #endif +/* ?_Fpz(a)std@@3_JB */ +const __int64 std_Fpz = 0; + void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); void (__cdecl *MSVCRT_operator_delete)(void*); diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 648be15..dd553da 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2077,7 +2077,7 @@ @ stub -arch=win64 ?_Fput@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@KA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AEAVios_base(a)2@DPEBD_K3(a)Z @ stub -arch=win32 ?_Fput@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@KA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AAVios_base(a)2@GPBDII(a)Z @ stub -arch=win64 ?_Fput@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@KA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AEAVios_base(a)2@GPEBD_K3(a)Z -@ stub ?_Fpz(a)std@@3_JB +@ extern ?_Fpz(a)std@@3_JB std_Fpz @ thiscall -arch=win32 ?_Freeze@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AAEXXZ(ptr) basic_string_char__Freeze @ cdecl -arch=win64 ?_Freeze@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AEAAXXZ(ptr) basic_string_char__Freeze @ thiscall -arch=win32 ?_Freeze@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@AAEXXZ(ptr) basic_string_wchar__Freeze

1 0

Piotr Caban : msvcp90: Fix ios_base_setf implementation.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 47f4e08a93eac8acbcf1ca307b30d5e531a8dbc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47f4e08a93eac8acbcf1ca307… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 20 15:08:45 2014 +0100 msvcp90: Fix ios_base_setf implementation. --- dlls/msvcp60/ios.c | 7 ++++++- dlls/msvcp90/ios.c | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index a853f6d..b223d10 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -4494,7 +4494,12 @@ IOSB_fmtflags __thiscall ios_base_setf_mask(ios_base *this, IOSB_fmtflags flags, DEFINE_THISCALL_WRAPPER(ios_base_setf, 8) IOSB_fmtflags __thiscall ios_base_setf(ios_base *this, IOSB_fmtflags flags) { - return ios_base_setf_mask(this, flags, ~0); + IOSB_fmtflags ret = this->fmtfl; + + TRACE("(%p %x)\n", this, flags); + + this->fmtfl |= flags & FMTFLAG_mask; + return ret; } /* ?setstate(a)ios_base@std@@QAEXH_N(a)Z */ diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index c4ef9a0..98d1696 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -5165,7 +5165,12 @@ IOSB_fmtflags __thiscall ios_base_setf_mask(ios_base *this, IOSB_fmtflags flags, DEFINE_THISCALL_WRAPPER(ios_base_setf, 8) IOSB_fmtflags __thiscall ios_base_setf(ios_base *this, IOSB_fmtflags flags) { - return ios_base_setf_mask(this, flags, ~0); + IOSB_fmtflags ret = this->fmtfl; + + TRACE("(%p %x)\n", this, flags); + + this->fmtfl |= flags & FMTFLAG_mask; + return ret; } /* ?setstate(a)ios_base@std@@QAEXH_N(a)Z */

1 0

Piotr Caban : msvcp90: Fix basic_istream<wchar>::read implementation.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 75bcbece56e5158f19c1f9d0dfee50102417bc40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75bcbece56e5158f19c1f9d0d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 20 15:08:13 2014 +0100 msvcp90: Fix basic_istream<wchar>::read implementation. --- dlls/msvcp60/ios.c | 4 ++-- dlls/msvcp90/ios.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 693c376..a853f6d 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -7156,7 +7156,7 @@ static basic_istream_char* basic_istream_char__Read_s(basic_istream_char *this, DEFINE_THISCALL_WRAPPER(basic_istream_char_read, 12) basic_istream_char* __thiscall basic_istream_char_read(basic_istream_char *this, char *str, streamsize count) { - return basic_istream_char__Read_s(this, str, count, count); + return basic_istream_char__Read_s(this, str, -1, count); } /* ?_Readsome_s@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEHPADIH(a)Z */ @@ -8397,7 +8397,7 @@ static basic_istream_wchar* basic_istream_wchar__Read_s(basic_istream_wchar *thi DEFINE_THISCALL_WRAPPER(basic_istream_wchar_read, 12) basic_istream_wchar* __thiscall basic_istream_wchar_read(basic_istream_wchar *this, wchar_t *str, streamsize count) { - return basic_istream_wchar__Read_s(this, str, count, count); + return basic_istream_wchar__Read_s(this, str, -1, count); } /* ?_Readsome_s@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QAEHPA_WIH(a)Z */ diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a89352e..c4ef9a0 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -8111,7 +8111,7 @@ DEFINE_THISCALL_WRAPPER(basic_istream_char_read, 12) #endif basic_istream_char* __thiscall basic_istream_char_read(basic_istream_char *this, char *str, streamsize count) { - return basic_istream_char__Read_s(this, str, count, count); + return basic_istream_char__Read_s(this, str, -1, count); } /* ?_Readsome_s@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEHPADIH(a)Z */ @@ -9418,7 +9418,7 @@ DEFINE_THISCALL_WRAPPER(basic_istream_wchar_read, 12) #endif basic_istream_wchar* __thiscall basic_istream_wchar_read(basic_istream_wchar *this, wchar_t *str, streamsize count) { - return basic_istream_wchar__Read_s(this, str, count, count); + return basic_istream_wchar__Read_s(this, str, -1, count); } /* ?_Readsome_s@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QAEHPA_WIH(a)Z */

1 0