October 2015 - Wine-Commits

Bruno Jesus : avifil32: Implement AVISave[A|W] by forwarding to AVISaveV.
by Alexandre Julliard Oct. 26, 2015

Oct. 26, 2015

Module: wine Branch: master Commit: a9522d52fe8c37e0aec54934a03e8341bbb10d9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9522d52fe8c37e0aec54934a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 23 04:12:53 2015 +0800 avifil32: Implement AVISave[A|W] by forwarding to AVISaveV. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/api.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 72 insertions(+), 4 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 20985cd..4612611 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -2278,17 +2278,85 @@ HRESULT WINAPI AVIPutFileOnClipboard(PAVIFILE pfile) HRESULT WINAPIV AVISaveA(LPCSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK lpfnCallback, int nStreams, PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...) { - FIXME("(%s,%p,%p,0x%08x,%p,%p), stub!\n", debugstr_a(szFile), pclsidHandler, lpfnCallback, + va_list vl; + int i; + HRESULT ret; + PAVISTREAM *streams; + LPAVICOMPRESSOPTIONS *options; + + TRACE("(%s,%p,%p,%d,%p,%p)\n", debugstr_a(szFile), pclsidHandler, lpfnCallback, nStreams, pavi, lpOptions); - return AVIERR_UNSUPPORTED; + if (nStreams <= 0) return AVIERR_BADPARAM; + + streams = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(void *)); + options = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(void *)); + if (!streams || !options) + { + ret = AVIERR_MEMORY; + goto error; + } + + streams[0] = pavi; + options[0] = lpOptions; + + va_start(vl, lpOptions); + for (i = 1; i < nStreams; i++) + { + streams[i] = va_arg(vl, void *); + options[i] = va_arg(vl, void *); + } + va_end(vl); + + for (i = 0; i < nStreams; i++) + TRACE("Pair[%d] - Stream = %p, Options = %p\n", i, streams[i], options[i]); + + ret = AVISaveVA(szFile, pclsidHandler, lpfnCallback, nStreams, streams, options); +error: + HeapFree(GetProcessHeap(), 0, streams); + HeapFree(GetProcessHeap(), 0, options); + return ret; } HRESULT WINAPIV AVISaveW(LPCWSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK lpfnCallback, int nStreams, PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...) { - FIXME("(%s,%p,%p,0x%08x,%p,%p), stub!\n", debugstr_w(szFile), pclsidHandler, lpfnCallback, + va_list vl; + int i; + HRESULT ret; + PAVISTREAM *streams; + LPAVICOMPRESSOPTIONS *options; + + TRACE("(%s,%p,%p,%d,%p,%p)\n", debugstr_w(szFile), pclsidHandler, lpfnCallback, nStreams, pavi, lpOptions); - return AVIERR_UNSUPPORTED; + if (nStreams <= 0) return AVIERR_BADPARAM; + + streams = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(void *)); + options = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(void *)); + if (!streams || !options) + { + ret = AVIERR_MEMORY; + goto error; + } + + streams[0] = pavi; + options[0] = lpOptions; + + va_start(vl, lpOptions); + for (i = 1; i < nStreams; i++) + { + streams[i] = va_arg(vl, void *); + options[i] = va_arg(vl, void *); + } + va_end(vl); + + for (i = 0; i < nStreams; i++) + TRACE("Pair[%d] - Stream = %p, Options = %p\n", i, streams[i], options[i]); + + ret = AVISaveVW(szFile, pclsidHandler, lpfnCallback, nStreams, streams, options); +error: + HeapFree(GetProcessHeap(), 0, streams); + HeapFree(GetProcessHeap(), 0, options); + return ret; }

1 0

Dmitry Timoshkov : widl: Add support for unions to the typelib generator.
by Alexandre Julliard Oct. 26, 2015

Oct. 26, 2015

Module: wine Branch: master Commit: e6e7055c0b8c27c4584bf1afb6a952ef37d718b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6e7055c0b8c27c4584bf1afb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 15 20:46:28 2015 +0800 widl: Add support for unions to the typelib generator. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index a39e986..fc0eae7 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -745,6 +745,7 @@ static importinfo_t *find_importinfo(msft_typelib_t *typelib, const char *name) static void add_structure_typeinfo(msft_typelib_t *typelib, type_t *structure); static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface); static void add_enum_typeinfo(msft_typelib_t *typelib, type_t *enumeration); +static void add_union_typeinfo(msft_typelib_t *typelib, type_t *tunion); static void add_coclass_typeinfo(msft_typelib_t *typelib, type_t *cls); static void add_dispinterface_typeinfo(msft_typelib_t *typelib, type_t *dispinterface); @@ -993,6 +994,9 @@ static int encode_type( case TYPE_ENUM: add_enum_typeinfo(typelib, type); break; + case TYPE_UNION: + add_union_typeinfo(typelib, type); + break; case TYPE_COCLASS: add_coclass_typeinfo(typelib, type); break; @@ -1752,6 +1756,10 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) typedata[4] = typeinfo->datawidth; typeinfo->datawidth += var_datawidth; break; + case TKIND_UNION: + typedata[4] = typeinfo->datawidth; + typeinfo->datawidth = max(typeinfo->datawidth, var_datawidth); + break; case TKIND_DISPATCH: var_kind = 3; /* VAR_DISPATCH */ typeinfo->datawidth = pointer_size; @@ -2141,6 +2149,24 @@ static void add_enum_typeinfo(msft_typelib_t *typelib, type_t *enumeration) add_var_desc(msft_typeinfo, idx++, cur); } +static void add_union_typeinfo(msft_typelib_t *typelib, type_t *tunion) +{ + int idx = 0; + var_t *cur; + msft_typeinfo_t *msft_typeinfo; + + if (-1 < tunion->typelib_idx) + return; + + tunion->typelib_idx = typelib->typelib_header.nrtypeinfos; + msft_typeinfo = create_msft_typeinfo(typelib, TKIND_UNION, tunion->name, tunion->attrs); + msft_typeinfo->typeinfo->size = 0; + + if (type_union_get_cases(tunion)) + LIST_FOR_EACH_ENTRY(cur, type_union_get_cases(tunion), var_t, entry) + add_var_desc(msft_typeinfo, idx++, cur); +} + static void add_typedef_typeinfo(msft_typelib_t *typelib, type_t *tdef) { msft_typeinfo_t *msft_typeinfo = NULL; @@ -2288,6 +2314,9 @@ static void add_type_typeinfo(msft_typelib_t *typelib, type_t *type) case TYPE_ENUM: add_enum_typeinfo(typelib, type); break; + case TYPE_UNION: + add_union_typeinfo(typelib, type); + break; case TYPE_COCLASS: add_coclass_typeinfo(typelib, type); break;

1 0

Sebastian Lackner : combase/tests: Add tests for WindowsSubstringWithSpecifiedLength.
by Alexandre Julliard Oct. 26, 2015

Oct. 26, 2015

Module: wine Branch: master Commit: bc7809c258053256ed1376168273401430d1f0f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc7809c258053256ed1376168… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Oct 25 15:32:45 2015 +0100 combase/tests: Add tests for WindowsSubstringWithSpecifiedLength. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/tests/string.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/combase/tests/string.c b/dlls/combase/tests/string.c index a6b02c6..5a59b50 100644 --- a/dlls/combase/tests/string.c +++ b/dlls/combase/tests/string.c @@ -39,6 +39,7 @@ static HRESULT (WINAPI *pWindowsPreallocateStringBuffer)(UINT32, WCHAR **, HSTRI static HRESULT (WINAPI *pWindowsPromoteStringBuffer)(HSTRING_BUFFER, HSTRING *); static HRESULT (WINAPI *pWindowsStringHasEmbeddedNull)(HSTRING, BOOL *); static HRESULT (WINAPI *pWindowsSubstring)(HSTRING, UINT32, HSTRING *); +static HRESULT (WINAPI *pWindowsSubstringWithSpecifiedLength)(HSTRING, UINT32, UINT32, HSTRING *); #define SET(x) p##x = (void*)GetProcAddress(hmod, #x) @@ -62,6 +63,7 @@ static BOOL init_functions(void) SET(WindowsPromoteStringBuffer); SET(WindowsStringHasEmbeddedNull); SET(WindowsSubstring); + SET(WindowsSubstringWithSpecifiedLength); return TRUE; } @@ -249,6 +251,9 @@ static void test_substring(void) ok(pWindowsSubstring(str, 2, &substr) == S_OK, "Failed to create substring\n"); check_string(substr, output_substring, 4, FALSE); ok(pWindowsDeleteString(substr) == S_OK, "Failed to delete string\n"); + ok(pWindowsSubstringWithSpecifiedLength(str, 2, 3, &substr) == S_OK, "Failed to create substring\n"); + check_string(substr, output_substring, 3, FALSE); + ok(pWindowsDeleteString(substr) == S_OK, "Failed to delete string\n"); ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); /* Test duplication of string using substring */ @@ -257,6 +262,10 @@ static void test_substring(void) ok(str != substr, "Duplicated string didn't create new string\n"); check_string(substr, input_string, 6, FALSE); ok(pWindowsDeleteString(substr) == S_OK, "Failed to delete string\n"); + ok(pWindowsSubstringWithSpecifiedLength(str, 0, 6, &substr) == S_OK, "Failed to create substring\n"); + ok(str != substr, "Duplicated string didn't create new string\n"); + check_string(substr, input_string, 6, FALSE); + ok(pWindowsDeleteString(substr) == S_OK, "Failed to delete string\n"); ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); /* Test substring of string reference */ @@ -264,6 +273,9 @@ static void test_substring(void) ok(pWindowsSubstring(str, 2, &substr) == S_OK, "Failed to create substring of string ref\n"); check_string(substr, output_substring, 4, FALSE); ok(pWindowsDeleteString(substr) == S_OK, "Failed to delete string\n"); + ok(pWindowsSubstringWithSpecifiedLength(str, 2, 3, &substr) == S_OK, "Failed to create substring of string ref\n"); + check_string(substr, output_substring, 3, FALSE); + ok(pWindowsDeleteString(substr) == S_OK, "Failed to delete string\n"); ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string ref\n"); /* Test duplication of string reference using substring */ @@ -272,26 +284,38 @@ static void test_substring(void) ok(str != substr, "Duplicated string ref didn't create new string\n"); check_string(substr, input_string, 6, FALSE); ok(pWindowsDeleteString(substr) == S_OK, "Failed to delete string\n"); - ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); + ok(pWindowsSubstringWithSpecifiedLength(str, 0, 6, &substr) == S_OK, "Failed to create substring of string ref\n"); + ok(str != substr, "Duplicated string ref didn't create new string\n"); + check_string(substr, input_string, 6, FALSE); + ok(pWindowsDeleteString(substr) == S_OK, "Failed to delete string\n"); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string ref\n"); /* Test get substring of empty string */ ok(pWindowsSubstring(NULL, 0, &substr) == S_OK, "Failed to duplicate NULL string\n"); ok(substr == NULL, "Substring created new string\n"); + ok(pWindowsSubstringWithSpecifiedLength(NULL, 0, 0, &substr) == S_OK, "Failed to duplicate NULL string\n"); + ok(substr == NULL, "Substring created new string\n"); /* Test get empty substring of string */ ok(pWindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n"); ok(pWindowsSubstring(str, 6, &substr) == S_OK, "Failed to create substring\n"); ok(substr == NULL, "Substring created new string\n"); + ok(pWindowsSubstringWithSpecifiedLength(str, 6, 0, &substr) == S_OK, "Failed to create substring\n"); + ok(substr == NULL, "Substring created new string\n"); ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); - /* Test handling of using too high start index */ + /* Test handling of using too high start index or length */ ok(pWindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n"); ok(pWindowsSubstring(str, 7, &substr) == E_BOUNDS, "Incorrect error handling\n"); + ok(pWindowsSubstringWithSpecifiedLength(str, 7, 0, &substr) == E_BOUNDS, "Incorrect error handling\n"); + ok(pWindowsSubstringWithSpecifiedLength(str, 6, 1, &substr) == E_BOUNDS, "Incorrect error handling\n"); + ok(pWindowsSubstringWithSpecifiedLength(str, 7, ~0U, &substr) == E_BOUNDS, "Incorrect error handling\n"); ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); /* Test handling of a NULL string */ ok(pWindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n"); ok(pWindowsSubstring(str, 7, NULL) == E_INVALIDARG, "Incorrect error handling\n"); + ok(pWindowsSubstringWithSpecifiedLength(str, 7, 0, NULL) == E_INVALIDARG, "Incorrect error handling\n"); ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); }

1 0

Gerald Pfeifer : d3d9: Change #define D3DSTREAMSOURCE_INSTANCEDATA to avoid shift overflow.
by Alexandre Julliard Oct. 26, 2015

Oct. 26, 2015

Module: wine Branch: master Commit: f6788b91862bfe89ebe6f402260040d169db4eac URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6788b91862bfe89ebe6f4022… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Oct 24 23:33:52 2015 +0200 d3d9: Change #define D3DSTREAMSOURCE_INSTANCEDATA to avoid shift overflow. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d9types.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3d9types.h b/include/d3d9types.h index 3afcf89..111d242 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -178,8 +178,8 @@ #define D3DPV_DONOTCOPYDATA (1 << 0) -#define D3DSTREAMSOURCE_INDEXEDDATA (1 << 30) -#define D3DSTREAMSOURCE_INSTANCEDATA (2 << 30) +#define D3DSTREAMSOURCE_INDEXEDDATA (1u << 30) +#define D3DSTREAMSOURCE_INSTANCEDATA (2u << 30) #define D3D_MAX_SIMULTANEOUS_RENDERTARGETS 4

1 0

Sebastian Lackner : combase: Simplify NULL pointer check in WindowsCreateString[Reference].
by Alexandre Julliard Oct. 26, 2015

Oct. 26, 2015

Module: wine Branch: master Commit: 8a870d4965aececa9e85f17c6a475f8d15fe0cc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a870d4965aececa9e85f17c6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Oct 25 15:32:26 2015 +0100 combase: Simplify NULL pointer check in WindowsCreateString[Reference]. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/string.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/combase/string.c b/dlls/combase/string.c index 53a32c9..2146d61 100644 --- a/dlls/combase/string.c +++ b/dlls/combase/string.c @@ -79,13 +79,13 @@ HRESULT WINAPI WindowsCreateString(LPCWSTR ptr, UINT32 len, if (out == NULL) return E_INVALIDARG; - if (ptr == NULL && len > 0) - return E_POINTER; if (len == 0) { *out = NULL; return S_OK; } + if (ptr == NULL) + return E_POINTER; if (!alloc_string(len, out)) return E_OUTOFMEMORY; priv = impl_from_HSTRING(*out); @@ -105,13 +105,13 @@ HRESULT WINAPI WindowsCreateStringReference(LPCWSTR ptr, UINT32 len, if (out == NULL || header == NULL) return E_INVALIDARG; - if (ptr == NULL && len > 0) - return E_POINTER; if (len == 0) { *out = NULL; return S_OK; } + if (ptr == NULL) + return E_POINTER; if (ptr[len] != '\0') return E_INVALIDARG; priv->buffer = (LPWSTR)ptr;

1 0

Alexandre Julliard : ntdll: Remove some redundant shifts.
by Alexandre Julliard Oct. 26, 2015

Oct. 26, 2015

Module: wine Branch: master Commit: e01dbac2bb4efcd3e93590f9b107cca38623713f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e01dbac2bb4efcd3e93590f9b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 26 17:57:50 2015 +0900 ntdll: Remove some redundant shifts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 2acaa83..0bcc8b0 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -971,15 +971,15 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) if(regs2[3] & (1 << 26)) info->FeatureSet |= CPU_FEATURE_SSE2; user_shared_data->ProcessorFeatures[PF_FLOATING_POINT_EMULATED] = !(regs2[3] & 1); - user_shared_data->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] = (regs2[3] & (1 << 4 )) >> 4; - user_shared_data->ProcessorFeatures[PF_PAE_ENABLED] = (regs2[3] & (1 << 6 )) >> 6; - user_shared_data->ProcessorFeatures[PF_COMPARE_EXCHANGE_DOUBLE] = (regs2[3] & (1 << 8 )) >> 8; - user_shared_data->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] = (regs2[3] & (1 << 23)) >> 23; - user_shared_data->ProcessorFeatures[PF_XMMI_INSTRUCTIONS_AVAILABLE] = (regs2[3] & (1 << 25)) >> 25; - user_shared_data->ProcessorFeatures[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = (regs2[3] & (1 << 26)) >> 26; + user_shared_data->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] = (regs2[3] >> 4) & 1; + user_shared_data->ProcessorFeatures[PF_PAE_ENABLED] = (regs2[3] >> 6) & 1; + user_shared_data->ProcessorFeatures[PF_COMPARE_EXCHANGE_DOUBLE] = (regs2[3] >> 8) & 1; + user_shared_data->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] = (regs2[3] >> 23) & 1; + user_shared_data->ProcessorFeatures[PF_XMMI_INSTRUCTIONS_AVAILABLE] = (regs2[3] >> 25) & 1; + user_shared_data->ProcessorFeatures[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = (regs2[3] >> 26) & 1; user_shared_data->ProcessorFeatures[PF_SSE3_INSTRUCTIONS_AVAILABLE] = regs2[2] & 1; - user_shared_data->ProcessorFeatures[PF_XSAVE_ENABLED] = (regs2[2] & (1 << 27)) >> 27; - user_shared_data->ProcessorFeatures[PF_COMPARE_EXCHANGE128] = (regs2[2] & (1 << 13)) >> 13; + user_shared_data->ProcessorFeatures[PF_XSAVE_ENABLED] = (regs2[2] >> 27) & 1; + user_shared_data->ProcessorFeatures[PF_COMPARE_EXCHANGE128] = (regs2[2] >> 13) & 1; if((regs2[3] & (1 << 26)) && (regs2[3] & (1 << 24))) /* has SSE2 and FXSAVE/FXRSTOR */ user_shared_data->ProcessorFeatures[PF_SSE_DAZ_MODE_AVAILABLE] = have_sse_daz_mode(); @@ -999,9 +999,9 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) if (regs[0] >= 0x80000001) { do_cpuid(0x80000001, regs2); /* get vendor features */ - user_shared_data->ProcessorFeatures[PF_VIRT_FIRMWARE_ENABLED] = (regs2[2] & (1 << 2 )) >> 2; - user_shared_data->ProcessorFeatures[PF_NX_ENABLED] = (regs2[3] & (1 << 20 )) >> 20; - user_shared_data->ProcessorFeatures[PF_3DNOW_INSTRUCTIONS_AVAILABLE] = (regs2[3] & (1 << 31 )) >> 31; + user_shared_data->ProcessorFeatures[PF_VIRT_FIRMWARE_ENABLED] = (regs2[2] >> 2) & 1; + user_shared_data->ProcessorFeatures[PF_NX_ENABLED] = (regs2[3] >> 20) & 1; + user_shared_data->ProcessorFeatures[PF_3DNOW_INSTRUCTIONS_AVAILABLE] = (regs2[3] >> 31) & 1; if(regs2[3] & (1 << 31)) info->FeatureSet |= CPU_FEATURE_3DNOW; } } @@ -1016,13 +1016,13 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) info->Revision |= regs2[0] & 0xf; /* stepping */ if(regs2[3] & (1 << 21)) info->FeatureSet |= CPU_FEATURE_DS; - user_shared_data->ProcessorFeatures[PF_VIRT_FIRMWARE_ENABLED] = (regs2[2] & (1 << 5 )) >> 5; + user_shared_data->ProcessorFeatures[PF_VIRT_FIRMWARE_ENABLED] = (regs2[2] >> 5) & 1; do_cpuid(0x80000000, regs); /* get vendor cpuid level */ if (regs[0] >= 0x80000001) { do_cpuid(0x80000001, regs2); /* get vendor features */ - user_shared_data->ProcessorFeatures[PF_NX_ENABLED] = (regs2[3] & (1 << 20 )) >> 20; + user_shared_data->ProcessorFeatures[PF_NX_ENABLED] = (regs2[3] >> 20) & 1; } } else

1 0

Alexandre Julliard : makefiles: Fix expansion of '$$' in make variables.
by Alexandre Julliard Oct. 26, 2015

Oct. 26, 2015

Module: wine Branch: master Commit: 581be47a45b2c566083e543d28609708b26002e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=581be47a45b2c566083e543d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 26 14:39:06 2015 +0900 makefiles: Fix expansion of '$$' in make variables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index c81a57e..3c30a0c 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1518,23 +1518,21 @@ static char *get_expanded_make_variable( struct makefile *make, const char *name var = get_make_variable( make, p + 2 ); tmp = replace_substr( expand, p, end - p, var ? var : "" ); free( var ); + /* switch to the new string */ + p = tmp + (p - expand); + free( expand ); + expand = tmp; } else if (p[1] == '{') /* don't expand ${} variables */ { if (!(end = strchr( p + 2, '}' ))) fatal_error( "syntax error in '%s'\n", expand ); p = end + 1; - continue; } else if (p[1] == '$') { - tmp = replace_substr( expand, p, 2, "$" ); + p += 2; } else fatal_error( "syntax error in '%s'\n", expand ); - - /* switch to the new string */ - p = tmp + (p - expand); - free( expand ); - expand = tmp; } /* consider empty variables undefined */

1 0

Józef Kucia : dxgi/tests: Add test for maximum frame latency.
by Alexandre Julliard Oct. 26, 2015

Oct. 26, 2015

Module: wine Branch: master Commit: 718d35dcd6ef30818cf2bbc20ac2195fc6906c54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=718d35dcd6ef30818cf2bbc20… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 26 02:30:24 2015 +0100 dxgi/tests: Add test for maximum frame latency. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 9e676b9..8a4b3f3 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -21,6 +21,12 @@ #include "d3d11.h" #include "wine/test.h" +enum frame_latency +{ + DEFAULT_FRAME_LATENCY = 3, + MAX_FRAME_LATENCY = 16, +}; + static DEVMODEW registry_mode; static HRESULT (WINAPI *pCreateDXGIFactory1)(REFIID iid, void **factory); @@ -1214,6 +1220,57 @@ static void test_swapchain_parameters(void) DestroyWindow(window); } +static void test_maximum_frame_latency(void) +{ + IDXGIDevice1 *device1; + IDXGIDevice *device; + UINT max_latency; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + if (SUCCEEDED(IDXGIDevice_QueryInterface(device, &IID_IDXGIDevice1, (void **)&device1))) + { + hr = IDXGIDevice1_GetMaximumFrameLatency(device1, &max_latency); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(max_latency == DEFAULT_FRAME_LATENCY, "Got unexpected maximum frame latency %u.\n", max_latency); + + hr = IDXGIDevice1_SetMaximumFrameLatency(device1, MAX_FRAME_LATENCY); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGIDevice1_GetMaximumFrameLatency(device1, &max_latency); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(max_latency == MAX_FRAME_LATENCY, "Got unexpected maximum frame latency %u.\n", max_latency); + + hr = IDXGIDevice1_SetMaximumFrameLatency(device1, MAX_FRAME_LATENCY + 1); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIDevice1_GetMaximumFrameLatency(device1, &max_latency); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(max_latency == MAX_FRAME_LATENCY, "Got unexpected maximum frame latency %u.\n", max_latency); + + hr = IDXGIDevice1_SetMaximumFrameLatency(device1, 0); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGIDevice1_GetMaximumFrameLatency(device1, &max_latency); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + /* 0 does not reset to the default frame latency on all Windows versions. */ + ok(max_latency == DEFAULT_FRAME_LATENCY || broken(!max_latency), + "Got unexpected maximum frame latency %u.\n", max_latency); + + IDXGIDevice1_Release(device1); + } + else + { + win_skip("IDXGIDevice1 is not implemented.\n"); + } + + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { pCreateDXGIFactory1 = (void *)GetProcAddress(GetModuleHandleA("dxgi.dll"), "CreateDXGIFactory1"); @@ -1231,4 +1288,5 @@ START_TEST(device) test_private_data(); test_swapchain_resize(); test_swapchain_parameters(); + test_maximum_frame_latency(); }

1 0

Hugh McMaster : kernel32/tests: Add tests for the FALSE pathway of GetCurrentConsoleFont.
by Alexandre Julliard Oct. 26, 2015

Oct. 26, 2015

Module: wine Branch: master Commit: 0ad7a0df890a176d3b0b0e59365a010b32875578 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ad7a0df890a176d3b0b0e593… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Oct 26 17:42:14 2015 +1100 kernel32/tests: Add tests for the FALSE pathway of GetCurrentConsoleFont. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5928e8c..454f963 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2588,6 +2588,45 @@ static void test_ReadConsole(void) ok(bytes == 0xdeadbeef, "expected 0xdeadbeef, got %#x\n", bytes); } +static void test_GetCurrentConsoleFont(HANDLE std_output) +{ + BOOL ret; + CONSOLE_FONT_INFO cfi; + CONSOLE_SCREEN_BUFFER_INFO csbi; + short int width, height; + COORD c; + + memset(&cfi, 0, sizeof(CONSOLE_FONT_INFO)); + SetLastError(0xdeadbeef); + ret = GetCurrentConsoleFont(NULL, FALSE, &cfi); + ok(!ret, "got %d, expected 0\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(!cfi.dwFontSize.X, "got %d, expected 0\n", cfi.dwFontSize.X); + ok(!cfi.dwFontSize.Y, "got %d, expected 0\n", cfi.dwFontSize.Y); + + memset(&cfi, 0, sizeof(CONSOLE_FONT_INFO)); + SetLastError(0xdeadbeef); + ret = GetCurrentConsoleFont(GetStdHandle(STD_INPUT_HANDLE), FALSE, &cfi); + ok(!ret, "got %d, expected 0\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(!cfi.dwFontSize.X, "got %d, expected 0\n", cfi.dwFontSize.X); + ok(!cfi.dwFontSize.Y, "got %d, expected 0\n", cfi.dwFontSize.Y); + + memset(&cfi, 0, sizeof(CONSOLE_FONT_INFO)); + SetLastError(0xdeadbeef); + ret = GetCurrentConsoleFont(std_output, FALSE, &cfi); + ok(ret, "got %d, expected non-zero\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + GetConsoleScreenBufferInfo(std_output, &csbi); + width = csbi.srWindow.Right - csbi.srWindow.Left + 1; + height = csbi.srWindow.Bottom - csbi.srWindow.Top + 1; + c = GetConsoleFontSize(std_output, cfi.nFont); + ok(cfi.dwFontSize.X == width || cfi.dwFontSize.X == c.X /* Vista and higher */, + "got %d, expected %d\n", cfi.dwFontSize.X, width); + ok(cfi.dwFontSize.Y == height || cfi.dwFontSize.Y == c.Y /* Vista and higher */, + "got %d, expected %d\n", cfi.dwFontSize.Y, height); +} + START_TEST(console) { static const char font_name[] = "Lucida Console"; @@ -2720,4 +2759,5 @@ START_TEST(console) test_ReadConsoleOutputCharacterA(hConOut); test_ReadConsoleOutputCharacterW(hConOut); test_ReadConsoleOutputAttribute(hConOut); + test_GetCurrentConsoleFont(hConOut); }

1 0

Sebastian Lackner : combase: Implement WindowsSubstringWithSpecifiedLength.
by Alexandre Julliard Oct. 26, 2015

Oct. 26, 2015

Module: wine Branch: master Commit: 7d0dccd23421f09cab0e3ba5f96e9a932ff53cb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d0dccd23421f09cab0e3ba5f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Oct 25 15:32:37 2015 +0100 combase: Implement WindowsSubstringWithSpecifiedLength. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-winrt-string-l1-1-0.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/string.c | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec b/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec index f629bcf..dc67deb 100644 --- a/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec @@ -22,6 +22,6 @@ @ stub WindowsReplaceString @ stdcall WindowsStringHasEmbeddedNull(ptr ptr) combase.WindowsStringHasEmbeddedNull @ stdcall WindowsSubstring(ptr long ptr) combase.WindowsSubstring -@ stub WindowsSubstringWithSpecifiedLength +@ stdcall WindowsSubstringWithSpecifiedLength(ptr long long ptr) combase.WindowsSubstringWithSpecifiedLength @ stub WindowsTrimStringEnd @ stub WindowsTrimStringStart diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index e7c8866..fcd5947 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -303,6 +303,6 @@ @ stub WindowsReplaceString @ stdcall WindowsStringHasEmbeddedNull(ptr ptr) @ stdcall WindowsSubstring(ptr long ptr) -@ stub WindowsSubstringWithSpecifiedLength +@ stdcall WindowsSubstringWithSpecifiedLength(ptr long long ptr) @ stub WindowsTrimStringEnd @ stub WindowsTrimStringStart diff --git a/dlls/combase/string.c b/dlls/combase/string.c index 2146d61..49d7695 100644 --- a/dlls/combase/string.c +++ b/dlls/combase/string.c @@ -308,6 +308,28 @@ HRESULT WINAPI WindowsSubstring(HSTRING str, UINT32 start, HSTRING *out) } /*********************************************************************** + * WindowsSubstringWithSpecifiedLength (combase.@) + */ +HRESULT WINAPI WindowsSubstringWithSpecifiedLength(HSTRING str, UINT32 start, UINT32 len, HSTRING *out) +{ + struct hstring_private *priv = impl_from_HSTRING(str); + + TRACE("(%p, %u, %u, %p)\n", str, start, len, out); + + if (out == NULL) + return E_INVALIDARG; + if (start + len < start || + start + len > WindowsGetStringLen(str)) + return E_BOUNDS; + if (len == 0) + { + *out = NULL; + return S_OK; + } + return WindowsCreateString(&priv->buffer[start], len, out); +} + +/*********************************************************************** * WindowsIsStringEmpty (combase.@) */ BOOL WINAPI WindowsIsStringEmpty(HSTRING str)

1 0