February 2019 - Wine-commits

Alexandre Julliard : ntdll: Store extended FPU context in NtGetContextThread().
by Alexandre Julliard 14 Feb '19

14 Feb '19

Module: wine Branch: master Commit: edbdec441b80dbc06f3878b7e4d823735f2888ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=edbdec441b80dbc06f3878b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 14 19:46:16 2019 +0100 ntdll: Store extended FPU context in NtGetContextThread(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 1b3b10f..3ce10d3 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -427,8 +427,6 @@ static size_t signal_stack_size; static wine_signal_handler handlers[256]; -static BOOL fpux_support; /* whether the CPU supports extended fpu context */ - enum i386_trap_code { TRAP_x86_UNKNOWN = -1, /* Unknown fault (TRAP_sig not defined) */ @@ -559,6 +557,15 @@ static inline void *get_signal_stack(void) /*********************************************************************** + * has_fpux + */ +static inline int has_fpux(void) +{ + return (cpu_info.FeatureSet & CPU_FEATURE_FXSR); +} + + +/*********************************************************************** * get_current_teb * * Get the current teb based on the stack pointer. @@ -860,6 +867,26 @@ static inline void save_fpu( CONTEXT *context ) /*********************************************************************** + * save_fpux + * + * Save the thread FPU extended context. + */ +static inline void save_fpux( CONTEXT *context ) +{ +#ifdef __GNUC__ + /* we have to enforce alignment by hand */ + char buffer[sizeof(XMM_SAVE_AREA32) + 16]; + XMM_SAVE_AREA32 *state = (XMM_SAVE_AREA32 *)(((ULONG_PTR)buffer + 15) & ~15); + + if (!has_fpux()) return; + context->ContextFlags |= CONTEXT_EXTENDED_REGISTERS; + __asm__ __volatile__( "fxsave %0" : "=m" (*state) ); + memcpy( context->ExtendedRegisters, state, sizeof(*state) ); +#endif +} + + +/*********************************************************************** * restore_fpu * * Restore the FPU context to a sigcontext. @@ -985,7 +1012,6 @@ static inline void save_context( CONTEXT *context, const ucontext_t *sigcontext, { context->ContextFlags |= CONTEXT_FLOATING_POINT | CONTEXT_EXTENDED_REGISTERS; memcpy( context->ExtendedRegisters, fpux, sizeof(*fpux) ); - fpux_support = TRUE; if (!fpu) fpux_to_fpu( &context->FloatSave, fpux ); } if (!fpu && !fpux) save_fpu( context ); @@ -1137,7 +1163,7 @@ void DECLSPEC_HIDDEN set_cpu_context( const CONTEXT *context ) { DWORD flags = context->ContextFlags & ~CONTEXT_i386; - if ((flags & CONTEXT_EXTENDED_REGISTERS) && fpux_support) restore_fpux( context ); + if ((flags & CONTEXT_EXTENDED_REGISTERS) && has_fpux()) restore_fpux( context ); else if (flags & CONTEXT_FLOATING_POINT) restore_fpu( context ); if (flags & CONTEXT_DEBUG_REGISTERS) @@ -1419,7 +1445,8 @@ NTSTATUS CDECL DECLSPEC_HIDDEN __regs_NtGetContextThread( DWORD edi, DWORD esi, context->ContextFlags |= CONTEXT_SEGMENTS; } if (needed_flags & CONTEXT_FLOATING_POINT) save_fpu( context ); - /* FIXME: extended floating point */ + if (needed_flags & CONTEXT_EXTENDED_REGISTERS) save_fpux( context ); + /* FIXME: xstate */ /* update the cached version of the debug registers */ if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_i386)) {

1 0

Alexandre Julliard : ntdll: Store extended FPU state and debug registers in RtlRaiseException().
by Alexandre Julliard 14 Feb '19

14 Feb '19

Module: wine Branch: master Commit: 20a2cc9751d1f32e610704a9bd58d2b99eaf0534 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20a2cc9751d1f32e610704a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 14 19:51:35 2019 +0100 ntdll: Store extended FPU state and debug registers in RtlRaiseException(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 11 ++++++++++- dlls/ntdll/tests/exception.c | 3 +++ include/winnt.h | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 3ce10d3..0274a7d 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2534,7 +2534,16 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL void raise_exception_full_context( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance ) { save_fpu( context ); - /* FIXME: extended registers, debug registers */ + save_fpux( context ); + /* FIXME: xstate */ + context->Dr0 = x86_thread_data()->dr0; + context->Dr1 = x86_thread_data()->dr1; + context->Dr2 = x86_thread_data()->dr2; + context->Dr3 = x86_thread_data()->dr3; + context->Dr6 = x86_thread_data()->dr6; + context->Dr7 = x86_thread_data()->dr7; + context->ContextFlags |= CONTEXT_DEBUG_REGISTERS; + RtlRaiseStatus( NtRaiseException( rec, context, first_chance )); } diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index f7b8f21..b8bd186 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -400,6 +400,9 @@ static DWORD rtlraiseexception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR ok(rec->ExceptionAddress == (char *)code_mem + 0xb, "ExceptionAddress at %p instead of %p\n", rec->ExceptionAddress, (char *)code_mem + 0xb); + ok( context->ContextFlags == CONTEXT_ALL || context->ContextFlags == (CONTEXT_ALL | CONTEXT_XSTATE), + "wrong context flags %x\n", context->ContextFlags ); + /* check that context.Eip is fixed up only for EXCEPTION_BREAKPOINT * even if raised by RtlRaiseException */ diff --git a/include/winnt.h b/include/winnt.h index 2b48938..5694ad7 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -969,6 +969,7 @@ typedef struct _CONTEXT #define CONTEXT_FLOATING_POINT (CONTEXT_i386 | 0x0008) /* 387 state */ #define CONTEXT_DEBUG_REGISTERS (CONTEXT_i386 | 0x0010) /* DB 0-3,6,7 */ #define CONTEXT_EXTENDED_REGISTERS (CONTEXT_i386 | 0x0020) +#define CONTEXT_XSTATE (CONTEXT_i386 | 0x0040) #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS) #define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | \ CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS | CONTEXT_EXTENDED_REGISTERS) @@ -1014,6 +1015,7 @@ typedef struct _LDT_ENTRY { #define CONTEXT_SEGMENTS (CONTEXT_AMD64 | 0x0004) #define CONTEXT_FLOATING_POINT (CONTEXT_AMD64 | 0x0008) #define CONTEXT_DEBUG_REGISTERS (CONTEXT_AMD64 | 0x0010) +#define CONTEXT_XSTATE (CONTEXT_AMD64 | 0x0040) #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT) #define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS) @@ -2130,6 +2132,7 @@ NTSYSAPI void WINAPI RtlCaptureContext(CONTEXT*); #define WOW64_CONTEXT_FLOATING_POINT (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000008)) #define WOW64_CONTEXT_DEBUG_REGISTERS (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000010)) #define WOW64_CONTEXT_EXTENDED_REGISTERS (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000020)) +#define WOW64_CONTEXT_XSTATE (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000040)) #define WOW64_CONTEXT_FULL (WOW64_CONTEXT_CONTROL | WOW64_CONTEXT_INTEGER | WOW64_CONTEXT_SEGMENTS) #define WOW64_CONTEXT_ALL (WOW64_CONTEXT_CONTROL | WOW64_CONTEXT_INTEGER | \ WOW64_CONTEXT_SEGMENTS | WOW64_CONTEXT_FLOATING_POINT | \

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 14 Feb '19

14 Feb '19

Module: wine Branch: master Commit: d596f3a22bc900bd9bbffe025768fb932bcb124f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d596f3a22bc900bd9bbffe02… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Feb 14 09:09:01 2019 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/lt.po b/po/lt.po index dcbb1ad..3476414 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,11 +1,11 @@ # Lithuanian translations for Wine -# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018. +# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-12-14 21:07+0300\n" +"PO-Revision-Date: 2019-02-14 09:08+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -14783,7 +14783,7 @@ msgstr "Įprastinė metafailų žiūryklė" #: view.rc:50 msgid "Metafiles (*.wmf, *.emf)" -msgstr "" +msgstr "Metafailai (*.wmf, *.emf)" #: wineboot.rc:31 msgid "Waiting for Program"

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 14 Feb '19

14 Feb '19

Module: wine Branch: master Commit: 8dd8479fc96d7155f0ba0bf0a30260b50d952cbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=8dd8479fc96d7155f0ba0bf0… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Feb 14 15:54:27 2019 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fi.po b/po/fi.po index d087619..a13ed5b 100644 --- a/po/fi.po +++ b/po/fi.po @@ -14742,11 +14742,11 @@ msgstr "&Oikea" #: view.rc:49 msgid "Regular Metafile Viewer" -msgstr "Tavallisten metatiedostojen katselin" +msgstr "Tavallisten Metafile-tiedostojen katselin" #: view.rc:50 msgid "Metafiles (*.wmf, *.emf)" -msgstr "" +msgstr "Metafile-tiedostot (*.wmf, *.emf)" #: wineboot.rc:31 msgid "Waiting for Program"

1 0

Isira Seneviratne : po: Update Sinhala translation.
by Alexandre Julliard 14 Feb '19

14 Feb '19

Module: wine Branch: master Commit: bb4d919faf40ddd52bc03db57e38a28927efba01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb4d919faf40ddd52bc03db5… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Thu Feb 14 16:23:28 2019 +0530 po: Update Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/si.po | 134 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 68 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bb4d919faf40ddd52bc0…

1 0

Jactry Zeng : propsys: Implement PSCreateMemoryPropertyStore().
by Alexandre Julliard 14 Feb '19

14 Feb '19

Module: wine Branch: master Commit: 906f91db323effed0bf52712fa5794368b145ed4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=906f91db323effed0bf52712… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Feb 7 16:31:59 2019 +0800 propsys: Implement PSCreateMemoryPropertyStore(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propsys_main.c | 7 ++++++ dlls/propsys/tests/propstore.c | 54 ++++++++++++++++++++++++++++++++++++++++++ include/propsys.idl | 1 + 4 files changed, 63 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index bbc7165..19c5a24 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -65,7 +65,7 @@ @ stub PSCoerceToCanonicalValue @ stub PSCreateAdapterFromPropertyStore @ stub PSCreateDelayedMultiplexPropertyStore -@ stub PSCreateMemoryPropertyStore +@ stdcall PSCreateMemoryPropertyStore(ptr ptr) @ stub PSCreateMultiplexPropertyStore @ stub PSCreatePropertyChangeArray @ stub PSCreatePropertyStoreFromObject diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 1dbaee4..65d157d 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -509,3 +509,10 @@ HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR pszString, PROPERTYKEY *pkey) return S_OK; } + +HRESULT WINAPI PSCreateMemoryPropertyStore(REFIID riid, void **ppv) +{ + TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); + + return PropertyStore_CreateInstance(NULL, riid, ppv); +} diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c index 3fe8613..132f5ff 100644 --- a/dlls/propsys/tests/propstore.c +++ b/dlls/propsys/tests/propstore.c @@ -35,6 +35,15 @@ DEFINE_GUID(PKEY_WineTest, 0x7b317433, 0xdfa3, 0x4c44, 0xad, 0x3e, 0x2f, 0x80, 0x4b, 0x90, 0xdb, 0xf4); +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown *)obj, ref, __LINE__) +static void _expect_ref(IUnknown *obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); +} + static void test_inmemorystore(void) { IPropertyStoreCache *propcache; @@ -249,12 +258,57 @@ static void test_persistserialized(void) IPersistSerializedPropStorage_Release(serialized); } +static void test_PSCreateMemoryPropertyStore(void) +{ + IPropertyStore *propstore, *propstore1; + IPersistSerializedPropStorage *serialized; + IPropertyStoreCache *propstorecache; + HRESULT hr; + + /* PSCreateMemoryPropertyStore(&IID_IPropertyStore, NULL); crashes */ + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstore != NULL, "got %p.\n", propstore); + EXPECT_REF(propstore, 1); + + hr = PSCreateMemoryPropertyStore(&IID_IPersistSerializedPropStorage, (void **)&serialized); + todo_wine ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + todo_wine ok(serialized != NULL, "got %p.\n", serialized); + EXPECT_REF(propstore, 1); + if(serialized) + { + EXPECT_REF(serialized, 1); + IPersistSerializedPropStorage_Release(serialized); + } + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStoreCache, (void **)&propstorecache); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstorecache != NULL, "got %p.\n", propstore); + ok(propstorecache != (IPropertyStoreCache *)propstore, "pointer are equal: %p, %p.\n", propstorecache, propstore); + EXPECT_REF(propstore, 1); + EXPECT_REF(propstorecache, 1); + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore1); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstore1 != NULL, "got %p.\n", propstore); + ok(propstore1 != propstore, "pointer are equal: %p, %p.\n", propstore1, propstore); + EXPECT_REF(propstore, 1); + EXPECT_REF(propstore1, 1); + EXPECT_REF(propstorecache, 1); + + IPropertyStore_Release(propstore1); + IPropertyStore_Release(propstore); + IPropertyStoreCache_Release(propstorecache); +} + START_TEST(propstore) { CoInitialize(NULL); test_inmemorystore(); test_persistserialized(); + test_PSCreateMemoryPropertyStore(); CoUninitialize(); } diff --git a/include/propsys.idl b/include/propsys.idl index 04d3fbf..bdd67fa 100644 --- a/include/propsys.idl +++ b/include/propsys.idl @@ -799,6 +799,7 @@ cpp_quote("#define PKEY_PIDSTR_MAX 10") cpp_quote("#define GUIDSTRING_MAX 39") cpp_quote("#define PKEYSTR_MAX (GUIDSTRING_MAX + 1 + PKEY_PIDSTR_MAX)") +cpp_quote("HRESULT WINAPI PSCreateMemoryPropertyStore(REFIID,void **);") cpp_quote("HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY,LPWSTR,UINT);") cpp_quote("HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR,PROPERTYKEY*);") cpp_quote("HRESULT WINAPI PSGetPropertyDescription(REFPROPERTYKEY,REFIID,void **);")

1 0

Jactry Zeng : propsys/tests: Add tests of IPropertyStore interface.
by Alexandre Julliard 14 Feb '19

14 Feb '19

Module: wine Branch: master Commit: 2e2fc55009d1c168a7af41bfc31a6b9a1c9acf99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e2fc55009d1c168a7af41bf… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Feb 7 16:32:38 2019 +0800 propsys/tests: Add tests of IPropertyStore interface. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/tests/propstore.c | 60 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c index 132f5ff..5aeb562 100644 --- a/dlls/propsys/tests/propstore.c +++ b/dlls/propsys/tests/propstore.c @@ -34,6 +34,7 @@ #include "initguid.h" DEFINE_GUID(PKEY_WineTest, 0x7b317433, 0xdfa3, 0x4c44, 0xad, 0x3e, 0x2f, 0x80, 0x4b, 0x90, 0xdb, 0xf4); +DEFINE_GUID(DUMMY_GUID1, 0x12345678, 0x1234,0x1234, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19); #define EXPECT_REF(obj,ref) _expect_ref((IUnknown *)obj, ref, __LINE__) static void _expect_ref(IUnknown *obj, ULONG ref, int line) @@ -302,6 +303,64 @@ static void test_PSCreateMemoryPropertyStore(void) IPropertyStoreCache_Release(propstorecache); } +static void test_propertystore(void) +{ + IPropertyStore *propstore; + HRESULT hr; + PROPVARIANT propvar, ret_propvar; + PROPERTYKEY propkey; + DWORD count = 0; + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstore != NULL, "got %p.\n", propstore); + + hr = IPropertyStore_GetCount(propstore, &count); + ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); + ok(!count, "got wrong property count: %d, expected 0.\n", count); + + PropVariantInit(&propvar); + propvar.vt = VT_I4; + U(propvar).lVal = 123; + propkey.fmtid = DUMMY_GUID1; + propkey.pid = PID_FIRST_USABLE; + hr = IPropertyStore_SetValue(propstore, &propkey, &propvar); + ok(hr == S_OK, "IPropertyStore_SetValue failed: 0x%08x.\n", hr); + hr = IPropertyStore_Commit(propstore); + ok(hr == S_OK, "IPropertyStore_Commit failed: 0x%08x.\n", hr); + hr = IPropertyStore_GetCount(propstore, &count); + ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); + ok(count == 1, "got wrong property count: %d, expected 1.\n", count); + PropVariantInit(&ret_propvar); + ret_propvar.vt = VT_I4; + hr = IPropertyStore_GetValue(propstore, &propkey, &ret_propvar); + ok(hr == S_OK, "IPropertyStore_GetValue failed: 0x%08x.\n", hr); + ok(ret_propvar.vt == VT_I4, "got wrong property type: %x.\n", ret_propvar.vt); + ok(U(ret_propvar).lVal == 123, "got wrong value: %d, expected 123.\n", U(ret_propvar).lVal); + PropVariantClear(&propvar); + PropVariantClear(&ret_propvar); + + PropVariantInit(&propvar); + propkey.fmtid = DUMMY_GUID1; + propkey.pid = PID_FIRST_USABLE; + hr = IPropertyStore_SetValue(propstore, &propkey, &propvar); + ok(hr == S_OK, "IPropertyStore_SetValue failed: 0x%08x.\n", hr); + hr = IPropertyStore_Commit(propstore); + ok(hr == S_OK, "IPropertyStore_Commit failed: 0x%08x.\n", hr); + hr = IPropertyStore_GetCount(propstore, &count); + ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); + ok(count == 1, "got wrong property count: %d, expected 1.\n", count); + PropVariantInit(&ret_propvar); + hr = IPropertyStore_GetValue(propstore, &propkey, &ret_propvar); + ok(hr == S_OK, "IPropertyStore_GetValue failed: 0x%08x.\n", hr); + ok(ret_propvar.vt == VT_EMPTY, "got wrong property type: %x.\n", ret_propvar.vt); + ok(!U(ret_propvar).lVal, "got wrong value: %d, expected 0.\n", U(ret_propvar).lVal); + PropVariantClear(&propvar); + PropVariantClear(&ret_propvar); + + IPropertyStore_Release(propstore); +} + START_TEST(propstore) { CoInitialize(NULL); @@ -309,6 +368,7 @@ START_TEST(propstore) test_inmemorystore(); test_persistserialized(); test_PSCreateMemoryPropertyStore(); + test_propertystore(); CoUninitialize(); }

1 0

Jactry Zeng : propsys: Implement PropVariantToDouble().
by Alexandre Julliard 14 Feb '19

14 Feb '19

Module: wine Branch: master Commit: 3fc1180623b9a0c9fc9e16abf358b179f2eff49b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fc1180623b9a0c9fc9e16ab… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Feb 7 16:33:14 2019 +0800 propsys: Implement PropVariantToDouble(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 18 ++++++++++++++ dlls/propsys/tests/propsys.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ include/propvarutil.h | 1 + 4 files changed, 77 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 19c5a24..9193f36 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -112,7 +112,7 @@ @ stub PropVariantToBooleanVectorAlloc @ stub PropVariantToBooleanWithDefault @ stub PropVariantToBuffer -@ stub PropVariantToDouble +@ stdcall PropVariantToDouble(ptr ptr) @ stub PropVariantToDoubleVector @ stub PropVariantToDoubleVectorAlloc @ stub PropVariantToDoubleWithDefault diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index ae96e4e..0edf462 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -129,6 +129,12 @@ static HRESULT PROPVAR_ConvertNumber(REFPROPVARIANT pv, int dest_bits, src_signed = *res < 0; break; } + case VT_R8: + { + src_signed = TRUE; + *res = pv->u.dblVal; + break; + } default: FIXME("unhandled vt %d\n", pv->vt); return E_NOTIMPL; @@ -155,6 +161,18 @@ static HRESULT PROPVAR_ConvertNumber(REFPROPVARIANT pv, int dest_bits, return S_OK; } +HRESULT WINAPI PropVariantToDouble(REFPROPVARIANT propvarIn, double *ret) +{ + LONGLONG res; + HRESULT hr; + + TRACE("(%p, %p)\n", propvarIn, ret); + + hr = PROPVAR_ConvertNumber(propvarIn, 64, TRUE, &res); + if (SUCCEEDED(hr)) *ret = (double)res; + return hr; +} + HRESULT WINAPI PropVariantToInt16(REFPROPVARIANT propvarIn, SHORT *ret) { LONGLONG res; diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 34c51b3..a9c0a77 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -1248,6 +1248,62 @@ static void test_InitPropVariantFromCLSID(void) PropVariantClear(&propvar); } +static void test_PropVariantToDouble(void) +{ + PROPVARIANT propvar; + double value; + HRESULT hr; + + PropVariantInit(&propvar); + propvar.vt = VT_R8; + propvar.u.dblVal = 15.0; + hr = PropVariantToDouble(&propvar, &value); + ok(hr == S_OK, "PropVariantToDouble failed: 0x%08x.\n", hr); + ok(value == 15.0, "Unexpected value: %f.\n", value); + + PropVariantClear(&propvar); + propvar.vt = VT_I4; + propvar.u.lVal = 123; + hr = PropVariantToDouble(&propvar, &value); + ok(hr == S_OK, "PropVariantToDouble failed: 0x%08x.\n", hr); + ok(value == 123.0, "Unexpected value: %f.\n", value); + + PropVariantClear(&propvar); + propvar.vt = VT_I4; + propvar.u.lVal = -256; + hr = PropVariantToDouble(&propvar, &value); + ok(hr == S_OK, "PropVariantToDouble failed: 0x%08x.\n", hr); + ok(value == -256, "Unexpected value: %f\n", value); + + PropVariantClear(&propvar); + propvar.vt = VT_I8; + propvar.u.lVal = 65536; + hr = PropVariantToDouble(&propvar, &value); + ok(hr == S_OK, "PropVariantToDouble failed: 0x%08x.\n", hr); + ok(value == 65536.0, "Unexpected value: %f.\n", value); + + PropVariantClear(&propvar); + propvar.vt = VT_I8; + propvar.u.lVal = -321; + hr = PropVariantToDouble(&propvar, &value); + ok(hr == S_OK, "PropVariantToDouble failed: 0x%08x.\n", hr); + ok(value == 4294966975.0, "Unexpected value: %f.\n", value); + + PropVariantClear(&propvar); + propvar.vt = VT_UI4; + propvar.u.ulVal = 6; + hr = PropVariantToDouble(&propvar, &value); + ok(hr == S_OK, "PropVariantToDouble failed: 0x%08x.\n", hr); + ok(value == 6.0, "Unexpected value: %f.\n", value); + + PropVariantClear(&propvar); + propvar.vt = VT_UI8; + propvar.u.uhVal.QuadPart = 8; + hr = PropVariantToDouble(&propvar, &value); + ok(hr == S_OK, "PropVariantToDouble failed: 0x%08x.\n", hr); + ok(value == 8.0, "Unexpected value: %f.\n", value); +} + START_TEST(propsys) { test_PSStringFromPropertyKey(); @@ -1263,4 +1319,5 @@ START_TEST(propsys) test_PropVariantToBoolean(); test_PropVariantToStringWithDefault(); test_InitPropVariantFromCLSID(); + test_PropVariantToDouble(); } diff --git a/include/propvarutil.h b/include/propvarutil.h index 0285caf..80f081c 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -71,6 +71,7 @@ HRESULT WINAPI VariantToGUID(const VARIANT *pvar, GUID *guid); INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2, PROPVAR_COMPARE_UNIT uint, PROPVAR_COMPARE_FLAGS flags); +HRESULT WINAPI PropVariantToDouble(REFPROPVARIANT propvarIn, double *ret); HRESULT WINAPI PropVariantToInt16(REFPROPVARIANT propvarIn, SHORT *ret); HRESULT WINAPI PropVariantToInt32(REFPROPVARIANT propvarIn, LONG *ret); HRESULT WINAPI PropVariantToInt64(REFPROPVARIANT propvarIn, LONGLONG *ret);

1 0

Zebediah Figura : wined3d: Correct indices for contained states in wined3d_stateblock_apply().
by Alexandre Julliard 14 Feb '19

14 Feb '19

Module: wine Branch: master Commit: 1ae12240d4f1110f948b045bdbfe273e5cd7aa29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ae12240d4f1110f948b045b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 12 20:00:08 2019 -0600 wined3d: Correct indices for contained states in wined3d_stateblock_apply(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46602 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 49 +++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 65f953f..cd57e6c 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1040,21 +1040,24 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) /* Vertex Shader Constants. */ for (i = 0; i < stateblock->num_contained_vs_consts_f; ++i) { - state->vs_consts_f[i] = stateblock->stateblock_state.vs_consts_f[i]; - wined3d_device_set_vs_consts_f(device, stateblock->contained_vs_consts_f[i], - 1, &stateblock->stateblock_state.vs_consts_f[stateblock->contained_vs_consts_f[i]]); + unsigned int idx = stateblock->contained_vs_consts_f[i]; + + state->vs_consts_f[idx] = stateblock->stateblock_state.vs_consts_f[idx]; + wined3d_device_set_vs_consts_f(device, idx, 1, &stateblock->stateblock_state.vs_consts_f[idx]); } for (i = 0; i < stateblock->num_contained_vs_consts_i; ++i) { - state->vs_consts_i[i] = stateblock->stateblock_state.vs_consts_i[i]; - wined3d_device_set_vs_consts_i(device, stateblock->contained_vs_consts_i[i], - 1, &stateblock->stateblock_state.vs_consts_i[stateblock->contained_vs_consts_i[i]]); + unsigned int idx = stateblock->contained_vs_consts_i[i]; + + state->vs_consts_i[idx] = stateblock->stateblock_state.vs_consts_i[idx]; + wined3d_device_set_vs_consts_i(device, idx, 1, &stateblock->stateblock_state.vs_consts_i[idx]); } for (i = 0; i < stateblock->num_contained_vs_consts_b; ++i) { - state->vs_consts_b[i] = stateblock->stateblock_state.vs_consts_b[i]; - wined3d_device_set_vs_consts_b(device, stateblock->contained_vs_consts_b[i], - 1, &stateblock->stateblock_state.vs_consts_b[stateblock->contained_vs_consts_b[i]]); + unsigned int idx = stateblock->contained_vs_consts_b[i]; + + state->vs_consts_b[idx] = stateblock->stateblock_state.vs_consts_b[idx]; + wined3d_device_set_vs_consts_b(device, idx, 1, &stateblock->stateblock_state.vs_consts_b[idx]); } for (i = 0; i < ARRAY_SIZE(stateblock->stateblock_state.light_state.light_map); ++i) @@ -1087,29 +1090,33 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) /* Pixel Shader Constants. */ for (i = 0; i < stateblock->num_contained_ps_consts_f; ++i) { - state->ps_consts_f[i] = stateblock->stateblock_state.ps_consts_f[i]; - wined3d_device_set_ps_consts_f(device, stateblock->contained_ps_consts_f[i], - 1, &stateblock->stateblock_state.ps_consts_f[stateblock->contained_ps_consts_f[i]]); + unsigned int idx = stateblock->contained_ps_consts_f[i]; + + state->ps_consts_f[idx] = stateblock->stateblock_state.ps_consts_f[idx]; + wined3d_device_set_ps_consts_f(device, idx, 1, &stateblock->stateblock_state.ps_consts_f[idx]); } for (i = 0; i < stateblock->num_contained_ps_consts_i; ++i) { - state->ps_consts_i[i] = stateblock->stateblock_state.ps_consts_i[i]; - wined3d_device_set_ps_consts_i(device, stateblock->contained_ps_consts_i[i], - 1, &stateblock->stateblock_state.ps_consts_i[stateblock->contained_ps_consts_i[i]]); + unsigned int idx = stateblock->contained_ps_consts_i[i]; + + state->ps_consts_i[idx] = stateblock->stateblock_state.ps_consts_i[idx]; + wined3d_device_set_ps_consts_i(device, idx, 1, &stateblock->stateblock_state.ps_consts_i[idx]); } for (i = 0; i < stateblock->num_contained_ps_consts_b; ++i) { - state->ps_consts_b[i] = stateblock->stateblock_state.ps_consts_b[i]; - wined3d_device_set_ps_consts_b(device, stateblock->contained_ps_consts_b[i], - 1, &stateblock->stateblock_state.ps_consts_b[stateblock->contained_ps_consts_b[i]]); + unsigned int idx = stateblock->contained_ps_consts_b[i]; + + state->ps_consts_b[idx] = stateblock->stateblock_state.ps_consts_b[idx]; + wined3d_device_set_ps_consts_b(device, idx, 1, &stateblock->stateblock_state.ps_consts_b[idx]); } /* Render states. */ for (i = 0; i < stateblock->num_contained_render_states; ++i) { - state->rs[i] = stateblock->stateblock_state.rs[i]; - wined3d_device_set_render_state(device, stateblock->contained_render_states[i], - stateblock->stateblock_state.rs[stateblock->contained_render_states[i]]); + enum wined3d_render_state rs = stateblock->contained_render_states[i]; + + state->rs[rs] = stateblock->stateblock_state.rs[rs]; + wined3d_device_set_render_state(device, rs, stateblock->stateblock_state.rs[rs]); } /* Texture states. */

1 0

Gabriel Ivăncescu : comctl32/listbox: Resize the entire item array at once in SetCount.
by Alexandre Julliard 14 Feb '19

14 Feb '19

Module: wine Branch: master Commit: eed36af54bfcfec5603c88956cc42059b05ea433 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eed36af54bfcfec5603c8895… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 13 16:36:12 2019 +0200 comctl32/listbox: Resize the entire item array at once in SetCount. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 43 ++++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index c92c2a2..db7d474 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -144,6 +144,12 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size) descr->items_size = items_size; descr->items = items; } + + if ((descr->style & LBS_NODATA) && items_size > descr->nb_items) + { + memset(&descr->items[descr->nb_items], 0, + (items_size - descr->nb_items) * sizeof(LB_ITEMDATA)); + } return TRUE; } @@ -1742,25 +1748,36 @@ static void LISTBOX_ResetContent( LB_DESCR *descr ) /*********************************************************************** * LISTBOX_SetCount */ -static LRESULT LISTBOX_SetCount( LB_DESCR *descr, INT count ) +static LRESULT LISTBOX_SetCount( LB_DESCR *descr, UINT count ) { - LRESULT ret; + UINT orig_num = descr->nb_items; if (!(descr->style & LBS_NODATA)) return LB_ERR; - /* FIXME: this is far from optimal... */ - if (count > descr->nb_items) - { - while (count > descr->nb_items) - if ((ret = LISTBOX_InsertString( descr, -1, 0 )) < 0) - return ret; - } - else if (count < descr->nb_items) + if (!resize_storage(descr, count)) + return LB_ERRSPACE; + descr->nb_items = count; + + if (count) { - while (count < descr->nb_items) - if ((ret = LISTBOX_RemoveItem( descr, (descr->nb_items - 1) )) < 0) - return ret; + LISTBOX_UpdateScroll(descr); + if (count < orig_num) + { + descr->anchor_item = min(descr->anchor_item, count - 1); + if (descr->selected_item >= count) + descr->selected_item = -1; + + /* If we removed the scrollbar, reset the top of the list */ + if (count <= descr->page_size && orig_num > descr->page_size) + LISTBOX_SetTopItem(descr, 0, TRUE); + + descr->focus_item = min(descr->focus_item, count - 1); + } + + /* If it was empty before growing, set focus to the first item */ + else if (orig_num == 0) LISTBOX_SetCaretIndex(descr, 0, FALSE); } + else SendMessageW(descr->self, LB_RESETCONTENT, 0, 0); InvalidateRect( descr->self, NULL, TRUE ); return LB_OKAY;

1 0