February 2016 - Wine-commits

Pierre Schweitzer : mpr: Partially implement WNetUseConnectionW().
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: d070c263adf840cc14dde84eb8e73b04490d1900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d070c263adf840cc14dde84eb… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Fri Feb 12 14:03:44 2016 +0300 mpr: Partially implement WNetUseConnectionW(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 71 insertions(+), 9 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 834a826..62e1479 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1582,17 +1582,79 @@ DWORD WINAPI WNetUseConnectionA( HWND hwndOwner, LPNETRESOURCEA lpNetResource, /***************************************************************** * WNetUseConnectionW [MPR.@] */ -DWORD WINAPI WNetUseConnectionW( HWND hwndOwner, LPNETRESOURCEW lpNetResource, - LPCWSTR lpPassword, LPCWSTR lpUserID, DWORD dwFlags, - LPWSTR lpAccessName, LPDWORD lpBufferSize, - LPDWORD lpResult ) +DWORD WINAPI WNetUseConnectionW( HWND hwndOwner, NETRESOURCEW *resource, LPCWSTR password, + LPCWSTR userid, DWORD flags, LPWSTR accessname, DWORD *buffer_size, DWORD *result ) { - FIXME( "(%p, %p, %p, %s, 0x%08X, %s, %p, %p), stub\n", - hwndOwner, lpNetResource, lpPassword, debugstr_w(lpUserID), dwFlags, - debugstr_w(lpAccessName), lpBufferSize, lpResult ); + WNetProvider *provider; + DWORD index, ret, caps; - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + TRACE( "(%p, %p, %p, %s, 0x%08X, %p, %p, %p)\n", + hwndOwner, resource, password, debugstr_w(userid), flags, + accessname, buffer_size, result ); + + if (!providerTable || providerTable->numProviders == 0) + return WN_NO_NETWORK; + + if (!resource) + return ERROR_INVALID_PARAMETER; + + if (!resource->lpProvider) + { + FIXME("Networking provider selection is not implemented.\n"); + return WN_NO_NETWORK; + } + + if (!resource->lpLocalName && (flags & CONNECT_REDIRECT)) + { + FIXME("Locale device selection is not implemented.\n"); + return WN_NO_NETWORK; + } + + if (flags & CONNECT_INTERACTIVE) + return ERROR_BAD_NET_NAME; + + index = _findProviderIndexW(resource->lpProvider); + if (index == BAD_PROVIDER_INDEX) + return ERROR_BAD_PROVIDER; + + provider = &providerTable->table[index]; + caps = provider->getCaps(WNNC_CONNECTION); + if (!(caps & (WNNC_CON_ADDCONNECTION | WNNC_CON_ADDCONNECTION3))) + return ERROR_BAD_PROVIDER; + + if (accessname && buffer_size && *buffer_size) + { + DWORD len; + + if (resource->lpLocalName) + len = strlenW(resource->lpLocalName); + else + len = strlenW(resource->lpRemoteName); + + if (++len > *buffer_size) + { + *buffer_size = len; + return ERROR_MORE_DATA; + } + } + else + accessname = NULL; + + ret = WN_ACCESS_DENIED; + if ((caps & WNNC_CON_ADDCONNECTION3) && provider->addConnection3) + ret = provider->addConnection3(hwndOwner, resource, (LPWSTR)password, (LPWSTR)userid, flags); + else if ((caps & WNNC_CON_ADDCONNECTION) && provider->addConnection) + ret = provider->addConnection(resource, (LPWSTR)password, (LPWSTR)userid); + + if (ret == WN_SUCCESS && accessname) + { + if (resource->lpLocalName) + strcpyW(accessname, resource->lpLocalName); + else + strcpyW(accessname, resource->lpRemoteName); + } + + return ret; } /*********************************************************************

1 0

Louis Lenders : uxtheme: Fix CloseThemeData with invalid handle value.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 997e2046df8368ab23f87bfa7fa3cb2372a4e000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=997e2046df8368ab23f87bfa7… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Feb 12 10:51:42 2016 +0100 uxtheme: Fix CloseThemeData with invalid handle value. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/system.c | 2 +- dlls/uxtheme/tests/system.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 8947587..7d07680 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -746,7 +746,7 @@ void WINAPI SetThemeAppProperties(DWORD dwFlags) HRESULT WINAPI CloseThemeData(HTHEME hTheme) { TRACE("(%p)\n", hTheme); - if(!hTheme) + if(!hTheme || hTheme == INVALID_HANDLE_VALUE) return E_HANDLE; return MSSTYLES_CloseThemeClass(hTheme); } diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 49eba64..4aeedbc 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -541,6 +541,8 @@ static void test_CloseThemeData(void) hRes = pCloseThemeData(NULL); ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); + hRes = pCloseThemeData(INVALID_HANDLE_VALUE); + ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); } START_TEST(system)

1 0

Stefan Leichter : kernel32: Return a dummy value in GetSystemPreferredUILanguages.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 9cd67d2a5e7a7ad441287e803c166523814e2bcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cd67d2a5e7a7ad441287e803… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Wed Feb 10 22:46:38 2016 +0100 kernel32: Return a dummy value in GetSystemPreferredUILanguages. Signed-off-by: Stefan Leichter <Stefan.Leichter(a)camLine.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 43 ++++++++++++++++++++++++++++++++++++++++--- dlls/kernel32/tests/locale.c | 10 ---------- 2 files changed, 40 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index d7619db..b499aa5 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1053,6 +1053,8 @@ INT WINAPI GetSystemDefaultLocaleName(LPWSTR localename, INT len) */ BOOL WINAPI GetSystemPreferredUILanguages(DWORD flags, ULONG* count, WCHAR* buffer, ULONG* size) { + LCTYPE type; + int lsize; if (flags & ~(MUI_LANGUAGE_NAME | MUI_LANGUAGE_ID | MUI_MACHINE_LANGUAGE_SETTINGS)) { SetLastError(ERROR_INVALID_PARAMETER); @@ -1069,9 +1071,44 @@ BOOL WINAPI GetSystemPreferredUILanguages(DWORD flags, ULONG* count, WCHAR* buff return FALSE; } - FIXME("(0x%x %p %p %p) stub\n", flags, count, buffer, size); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + FIXME("(0x%x %p %p %p) returning a dummy value (current locale)\n", flags, count, buffer, size); + + if (flags & MUI_LANGUAGE_ID) + type = LOCALE_ILANGUAGE; + else + type = LOCALE_SNAME; + + lsize = GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, type, NULL, 0); + if (!lsize) + { + /* keep last error from callee */ + return FALSE; + } + lsize++; + if (!*size) + { + *size = lsize; + *count = 1; + return TRUE; + } + + if (lsize > *size) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + if (!GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, type, buffer, *size)) + { + /* keep last error from callee */ + return FALSE; + } + + buffer[lsize-1] = 0; + *size = lsize; + *count = 1; + TRACE("returned variable content: %d, \"%s\", %d\n", *count, debugstr_w(buffer), *size); + return TRUE; } /*********************************************************************** diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 6726fb9..d49e0d6 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4623,10 +4623,8 @@ static void test_GetSystemPreferredUILanguages(void) size = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(0, &count, NULL, &size); - todo_wine ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); ok(count, "Expected count > 0\n"); - todo_wine ok(size % 6 == 1, "Expected size (%d) %% 6 == 1\n", size); count = 0xdeadbeef; @@ -4657,20 +4655,16 @@ static void test_GetSystemPreferredUILanguages(void) size = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID | MUI_MACHINE_LANGUAGE_SETTINGS, &count, NULL, &size); - todo_wine ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); ok(count, "Expected count > 0\n"); - todo_wine ok(size % 5 == 1, "Expected size (%d) %% 5 == 1\n", size); count = 0xdeadbeef; size = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_NAME | MUI_MACHINE_LANGUAGE_SETTINGS, &count, NULL, &size); - todo_wine ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); ok(count, "Expected count > 0\n"); - todo_wine ok(size % 6 == 1, "Expected size (%d) %% 6 == 1\n", size); /* second parameter @@ -4696,20 +4690,16 @@ static void test_GetSystemPreferredUILanguages(void) size_id = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, NULL, &size_id); - todo_wine ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); ok(count, "Expected count > 0\n"); - todo_wine ok(size_id % 5 == 1, "Expected size (%d) %% 5 == 1\n", size_id); count = 0xdeadbeef; size_name = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_NAME, &count, NULL, &size_name); - todo_wine ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); ok(count, "Expected count > 0\n"); - todo_wine ok(size_name % 6 == 1, "Expected size (%d) %% 6 == 1\n", size_name); size_buffer = max(size_id, size_name);

1 0

Henri Verbeet : ddraw: Disable WINED3D_SRGB_READ_WRITE_CONTROL.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: c6a72849245bdb9b824b8336a8c46bd1444488a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a72849245bdb9b824b8336a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 12 18:52:23 2016 +0100 ddraw: Disable WINED3D_SRGB_READ_WRITE_CONTROL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 2e7624b..26bc242 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -60,8 +60,7 @@ struct FvfToDecl #define DDRAW_STRIDE_ALIGNMENT 8 #define DDRAW_WINED3D_FLAGS (WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING \ - | WINED3D_RESTORE_MODE_ON_ACTIVATE | WINED3D_FOCUS_MESSAGES | WINED3D_PIXEL_CENTER_INTEGER \ - | WINED3D_SRGB_READ_WRITE_CONTROL) + | WINED3D_RESTORE_MODE_ON_ACTIVATE | WINED3D_FOCUS_MESSAGES | WINED3D_PIXEL_CENTER_INTEGER) enum ddraw_device_state {

1 0

Aric Stewart : usp10: Handle GSUB SubType 7: Extension Substitution.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 12fb74ac565fc2b8f7f79c3706106b560197e0ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=12fb74ac565fc2b8f7f79c370… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Feb 12 11:24:05 2016 -0600 usp10: Handle GSUB SubType 7: Extension Substitution. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 73 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 58 insertions(+), 15 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index e7f2dfd..5b39663 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -277,6 +277,12 @@ typedef struct{ WORD Alternate[1]; } GSUB_AlternateSet; +typedef struct { + WORD SubstFormat; + WORD ExtensionLookupType; + DWORD ExtensionOffset; +} GSUB_ExtensionPosFormat1; + /* These are all structures needed for the GPOS table */ typedef struct { @@ -725,6 +731,25 @@ static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) return -1; } +static const BYTE *GSUB_get_subtable(const OT_LookupTable *look, int index) +{ + int offset = GET_BE_WORD(look->SubTable[index]); + + if (GET_BE_WORD(look->LookupType) == 7) + { + const GSUB_ExtensionPosFormat1 *ext = (const GSUB_ExtensionPosFormat1 *)((const BYTE *)look + offset); + if (GET_BE_WORD(ext->SubstFormat) == 1) + { + offset += GET_BE_DWORD(ext->ExtensionOffset); + } + else + { + FIXME("Unhandled Extension Substitution Format %i\n",GET_BE_WORD(ext->SubstFormat)); + } + } + return (const BYTE *)look + offset; +} + static INT GSUB_apply_SingleSubst(const OT_LookupTable *look, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) { int j; @@ -732,10 +757,7 @@ static INT GSUB_apply_SingleSubst(const OT_LookupTable *look, WORD *glyphs, INT for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { - int offset; - const GSUB_SingleSubstFormat1 *ssf1; - offset = GET_BE_WORD(look->SubTable[j]); - ssf1 = (const GSUB_SingleSubstFormat1*)((const BYTE*)look+offset); + const GSUB_SingleSubstFormat1 *ssf1 = (const GSUB_SingleSubstFormat1*)GSUB_get_subtable(look, j); if (GET_BE_WORD(ssf1->SubstFormat) == 1) { int offset = GET_BE_WORD(ssf1->Coverage); @@ -783,8 +805,7 @@ static INT GSUB_apply_MultipleSubst(const OT_LookupTable *look, WORD *glyphs, IN { int offset, index; const GSUB_MultipleSubstFormat1 *msf1; - offset = GET_BE_WORD(look->SubTable[j]); - msf1 = (const GSUB_MultipleSubstFormat1*)((const BYTE*)look+offset); + msf1 = (const GSUB_MultipleSubstFormat1*)GSUB_get_subtable(look, j); offset = GET_BE_WORD(msf1->Coverage); index = GSUB_is_glyph_covered((const BYTE*)msf1+offset, glyphs[glyph_index]); @@ -833,8 +854,7 @@ static INT GSUB_apply_AlternateSubst(const OT_LookupTable *look, WORD *glyphs, I const GSUB_AlternateSubstFormat1 *asf1; INT index; - offset = GET_BE_WORD(look->SubTable[j]); - asf1 = (const GSUB_AlternateSubstFormat1*)((const BYTE*)look+offset); + asf1 = (const GSUB_AlternateSubstFormat1*)GSUB_get_subtable(look, j); offset = GET_BE_WORD(asf1->Coverage); index = GSUB_is_glyph_covered((const BYTE*)asf1+offset, glyphs[glyph_index]); @@ -866,8 +886,7 @@ static INT GSUB_apply_LigatureSubst(const OT_LookupTable *look, WORD *glyphs, IN const GSUB_LigatureSubstFormat1 *lsf1; int offset,index; - offset = GET_BE_WORD(look->SubTable[j]); - lsf1 = (const GSUB_LigatureSubstFormat1*)((const BYTE*)look+offset); + lsf1 = (const GSUB_LigatureSubstFormat1*)GSUB_get_subtable(look, j); offset = GET_BE_WORD(lsf1->Coverage); index = GSUB_is_glyph_covered((const BYTE*)lsf1+offset, glyphs[glyph_index]); TRACE(" Coverage index %i\n",index); @@ -933,8 +952,7 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo int dirLookahead = write_dir; int dirBacktrack = -1 * write_dir; - offset = GET_BE_WORD(look->SubTable[j]); - ccsf1 = (const GSUB_ChainContextSubstFormat1*)((const BYTE*)look+offset); + ccsf1 = (const GSUB_ChainContextSubstFormat1*)GSUB_get_subtable(look, j); if (GET_BE_WORD(ccsf1->SubstFormat) == 1) { static int once; @@ -1029,12 +1047,34 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo static INT GSUB_apply_lookup(const OT_LookupList* lookup, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) { int offset; + int type; const OT_LookupTable *look; offset = GET_BE_WORD(lookup->Lookup[lookup_index]); look = (const OT_LookupTable*)((const BYTE*)lookup + offset); - TRACE("type %i, flag %x, subtables %i\n",GET_BE_WORD(look->LookupType),GET_BE_WORD(look->LookupFlag),GET_BE_WORD(look->SubTableCount)); - switch(GET_BE_WORD(look->LookupType)) + type = GET_BE_WORD(look->LookupType); + TRACE("type %i, flag %x, subtables %i\n",type,GET_BE_WORD(look->LookupFlag),GET_BE_WORD(look->SubTableCount)); + if (type == 7) + { + if (GET_BE_WORD(look->SubTableCount)) + { + const GSUB_ExtensionPosFormat1 *ext = (const GSUB_ExtensionPosFormat1 *)((const BYTE *)look + GET_BE_WORD(look->SubTable[0])); + if (GET_BE_WORD(ext->SubstFormat) == 1) + { + type = GET_BE_WORD(ext->ExtensionLookupType); + TRACE("extension type %i\n",type); + } + else + { + FIXME("Unhandled Extension Substitution Format %i\n",GET_BE_WORD(ext->SubstFormat)); + } + } + else + { + WARN("lookup type is Extension Substitution but no extension subtable exists\n"); + } + } + switch(type) { case 1: return GSUB_apply_SingleSubst(look, glyphs, glyph_index, write_dir, glyph_count); @@ -1046,8 +1086,11 @@ static INT GSUB_apply_lookup(const OT_LookupList* lookup, INT lookup_index, WORD return GSUB_apply_LigatureSubst(look, glyphs, glyph_index, write_dir, glyph_count); case 6: return GSUB_apply_ChainContextSubst(lookup, look, glyphs, glyph_index, write_dir, glyph_count); + case 7: + FIXME("Extension Substitution types not valid here\n"); + break; default: - FIXME("We do not handle SubType %i\n",GET_BE_WORD(look->LookupType)); + FIXME("We do not handle SubType %i\n",type); } return GSUB_E_NOGLYPH; }

1 0

Sebastian Lackner : opengl32: Ensure extension tables generated by make_opengl contain earliest GL_VERSION for each function.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 68867e30b2ff33ea04d1b6150b4cc76a72976916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68867e30b2ff33ea04d1b6150… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 13 00:21:03 2016 +0100 opengl32: Ensure extension tables generated by make_opengl contain earliest GL_VERSION for each function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 2b15f58..ec782ed 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -692,12 +692,14 @@ sub parse_file($$) } # generate extension functions from norm functions, if they are newer than the category - while (my ($k, $v) = each(%{$data->{feature}})) { + my %features = %{$data->{feature}}; + foreach (sort keys %features) { + my ($k, $v) = %features{$_}; if (!$norm_categories{$k} && $v->{api} =~ /^gl(\||$)/) { for my $req (@{$v->{require}}) { for (keys %{$req->{command}}) { - if (!$norm_functions{$_}) { + if (!$ext_functions{$_} && !$norm_functions{$_}) { $ext_functions{$_} = [ $functions{$_}[0], $functions{$_}[1], [ $k ] ]; } }

1 0

Alexandre Julliard : opengl32: Update to the current OpenGL spec.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 26d0a0a081ae71048b5932c3972bd62d7149af1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=26d0a0a081ae71048b5932c39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 13 13:32:28 2016 +0900 opengl32: Update to the current OpenGL spec. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 1 + dlls/opengl32/opengl_ext.c | 325 +- dlls/opengl32/opengl_norm.c | 92 +- include/wine/wgl.h | 11118 +++++++++++++++++++++--------------------- include/wine/wgl_driver.h | 49 +- 5 files changed, 6063 insertions(+), 5522 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=26d0a0a081ae71048b593…

1 0

Sebastian Lackner : kernel32/tests: Add test to show that CompareStringW aborts on first non-matching character.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 1bebee9c1b119d727991aee50451e36e0865f927 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bebee9c1b119d727991aee50… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 13 22:24:06 2016 +0100 kernel32/tests: Add test to show that CompareStringW aborts on first non-matching character. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 4a9e540..6726fb9 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1798,6 +1798,36 @@ static void test_CompareStringA(void) "ret %d, error %d, expected value %d\n", ret, GetLastError(), CSTR_EQUAL); } +static void test_CompareStringW(void) +{ + WCHAR *str1, *str2; + SYSTEM_INFO si; + DWORD old_prot; + BOOL success; + char *buf; + int ret; + + GetSystemInfo(&si); + buf = VirtualAlloc(NULL, si.dwPageSize * 4, MEM_COMMIT, PAGE_READWRITE); + ok(buf != NULL, "VirtualAlloc failed with %u\n", GetLastError()); + success = VirtualProtect(buf + si.dwPageSize, si.dwPageSize, PAGE_NOACCESS, &old_prot); + ok(success, "VirtualProtect failed with %u\n", GetLastError()); + success = VirtualProtect(buf + 3 * si.dwPageSize, si.dwPageSize, PAGE_NOACCESS, &old_prot); + ok(success, "VirtualProtect failed with %u\n", GetLastError()); + + str1 = (WCHAR *)(buf + si.dwPageSize - sizeof(WCHAR)); + str2 = (WCHAR *)(buf + 3 * si.dwPageSize - sizeof(WCHAR)); + *str1 = 'A'; + *str2 = 'B'; + + /* CompareStringW should abort on the first non-matching character */ + ret = CompareStringW(CP_ACP, 0, str1, 100, str2, 100); + ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); + + success = VirtualFree(buf, 0, MEM_RELEASE); + ok(success, "VirtualFree failed with %u\n", GetLastError()); +} + struct comparestringex_test { const char *locale; DWORD flags; @@ -4791,6 +4821,7 @@ START_TEST(locale) test_GetCurrencyFormatA(); /* Also tests the W version */ test_GetNumberFormatA(); /* Also tests the W version */ test_CompareStringA(); + test_CompareStringW(); test_CompareStringEx(); test_LCMapStringA(); test_LCMapStringW();

1 0

Sebastian Lackner : kernel32/tests: Add a test to show that VirtualFree fails with type MEM_FREE.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 24641d8e44b3816709436b360d18f81164b8ff26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24641d8e44b3816709436b360… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 13 22:24:30 2016 +0100 kernel32/tests: Add a test to show that VirtualFree fails with type MEM_FREE. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index e614bde..f47a54c 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -369,6 +369,11 @@ static void test_VirtualAlloc(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %d, expected ERROR_INVALID_PARAMETER\n", GetLastError()); + SetLastError(0xdeadbeef); + ok(!VirtualFree(addr1, 0, MEM_FREE), "VirtualFree should fail with type MEM_FREE\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "got %d, expected ERROR_INVALID_PARAMETER\n", GetLastError()); + ok(VirtualFree(addr1, 0x10000, MEM_DECOMMIT), "VirtualFree failed\n"); /* if the type is MEM_RELEASE, size must be 0 */

1 0

Sebastian Lackner : kernel32/tests: Ensure VirtualAlloc tests do not depend on previous memory allocations.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 1e624c5aaa7d66438d297965576e2046b6e71b78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e624c5aaa7d66438d2979655… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 13 22:25:48 2016 +0100 kernel32/tests: Ensure VirtualAlloc tests do not depend on previous memory allocations. Following tests try to allocate memory at (char *)addr1 + 0x1000. We expect that no memory is mapped at this location. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index f47a54c..c35f4db 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -383,9 +383,13 @@ static void test_VirtualAlloc(void) ok(VirtualFree(addr1, 0, MEM_RELEASE), "VirtualFree failed\n"); - addr1 = VirtualAlloc(0, 0x1000, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + /* memory returned by VirtualAlloc should be aligned to 64k */ + addr1 = VirtualAlloc(0, 0x2000, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); ok(addr1 != NULL, "VirtualAlloc failed\n"); ok(!((ULONG_PTR)addr1 & 0xffff), "returned memory %p is not aligned to 64k\n", addr1); + ok(VirtualFree(addr1, 0, MEM_RELEASE), "VirtualFree failed\n"); + addr2 = VirtualAlloc(addr1, 0x1000, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + ok(addr2 == addr1, "VirtualAlloc returned %p, expected %p\n", addr2, addr1); /* allocation conflicts because of 64k align */ size = 0x1000;

1 0