December 2013 - Wine-commits

Alexandre Julliard : msvcp: Add macros to switch the string type used in the locale information structure .
by Alexandre Julliard 19 Dec '13

19 Dec '13

Module: wine Branch: master Commit: a8202d0e11da260329a693f444f8e9cf1a94c9d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8202d0e11da260329a693f44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 19 11:51:07 2013 +0100 msvcp: Add macros to switch the string type used in the locale information structure. --- dlls/msvcp100/locale.c | 113 ++++++++++++++++++++++++-------------------- dlls/msvcp90/locale.c | 123 ++++++++++++++++++++++++++---------------------- 2 files changed, 129 insertions(+), 107 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8202d0e11da260329a69…

1 0

Alexandre Julliard : msvcp90: Set the thiscall parameter count according to the size of the stream size and offset types .
by Alexandre Julliard 19 Dec '13

19 Dec '13

Module: wine Branch: master Commit: 40a64912ae0998d4f093a1cece8600c705081af2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40a64912ae0998d4f093a1cec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 19 16:19:33 2013 +0100 msvcp90: Set the thiscall parameter count according to the size of the stream size and offset types. --- dlls/msvcp90/ios.c | 248 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 2 + 2 files changed, 250 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40a64912ae0998d4f093a…

1 0

Alexandre Julliard : msvcp100: Share the source code with msvcp90.
by Alexandre Julliard 19 Dec '13

19 Dec '13

Module: wine Branch: master Commit: 6d30d6be78a49e1add6d8c7886484a2ceb950c71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d30d6be78a49e1add6d8c788… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 19 17:02:11 2013 +0100 msvcp100: Share the source code with msvcp90. --- dlls/msvcp100/Makefile.in | 4 +- dlls/msvcp100/cxx.h | 448 --- dlls/msvcp100/exception.c | 602 --- dlls/msvcp100/ios.c | 8386 ------------------------------------------ dlls/msvcp100/locale.c | 8936 --------------------------------------------- dlls/msvcp100/math.c | 803 ---- dlls/msvcp100/memory.c | 63 - dlls/msvcp100/misc.c | 345 -- dlls/msvcp100/msvcp.h | 474 --- dlls/msvcp100/msvcp100.c | 111 - dlls/msvcp100/string.c | 789 ---- dlls/msvcp90/exception.c | 39 + dlls/msvcp90/ios.c | 312 +- dlls/msvcp90/locale.c | 104 +- dlls/msvcp90/misc.c | 114 + dlls/msvcp90/msvcp90.h | 26 + dlls/msvcp90/string.c | 109 + 17 files changed, 544 insertions(+), 21121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d30d6be78a49e1add6d8…

1 0

Frédéric Delanoy : wer: Constify a character string.
by Alexandre Julliard 19 Dec '13

19 Dec '13

Module: wine Branch: master Commit: f2b0ed061183ba4ed4ecee01a3f47bcb4a8273a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b0ed061183ba4ed4ecee01a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 18 23:14:13 2013 +0100 wer: Constify a character string. --- dlls/wer/main.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index 9b1d6a0..da44aa7 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -50,10 +50,11 @@ static CRITICAL_SECTION report_table_cs = { &report_table_cs_debug, -1, 0, 0, 0, static struct list report_table = LIST_INIT(report_table); -static WCHAR regpath_exclude[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','E','r','r','o','r',' ','R','e','p','o','r','t','i','n','g','\\', - 'E','x','c','l','u','d','e','d','A','p','p','l','i','c','a','t','i','o','n','s',0}; +static const WCHAR regpath_exclude[] = + {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','E','r','r','o','r',' ','R','e','p','o','r','t','i','n','g','\\', + 'E','x','c','l','u','d','e','d','A','p','p','l','i','c','a','t','i','o','n','s',0}; /*********************************************************************** * Memory allocation helper

1 0

Frédéric Delanoy : winemac.drv: Constify a character string.
by Alexandre Julliard 19 Dec '13

19 Dec '13

Module: wine Branch: master Commit: f2e1589b3491ac9dad4fd12d367424bbdaebb77d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2e1589b3491ac9dad4fd12d3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 18 23:14:14 2013 +0100 winemac.drv: Constify a character string. --- dlls/winemac.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 4766bd4..ad520fa 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1192,7 +1192,7 @@ static const pixel_format *get_pixel_format(int format, BOOL allow_nondisplayabl static BOOL init_gl_info(void) { - static char legacy_extensions[] = " WGL_EXT_extensions_string"; + static const char legacy_extensions[] = " WGL_EXT_extensions_string"; static const char legacy_ext_swap_control[] = " WGL_EXT_swap_control"; CGDirectDisplayID display = CGMainDisplayID();

1 0

Frédéric Delanoy : wininet: Constify some character strings.
by Alexandre Julliard 19 Dec '13

19 Dec '13

Module: wine Branch: master Commit: 43d6a45c4e977edd82d934044d0d777714997ee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43d6a45c4e977edd82d934044… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 18 23:14:15 2013 +0100 wininet: Constify some character strings. --- dlls/wininet/http.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 817fea1..0186975 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4058,8 +4058,8 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) WCHAR userName[INTERNET_MAX_USER_NAME_LENGTH]; BOOL custom_port = FALSE; - static WCHAR httpW[] = {'h','t','t','p',0}; - static WCHAR httpsW[] = {'h','t','t','p','s',0}; + static const WCHAR httpW[] = {'h','t','t','p',0}; + static const WCHAR httpsW[] = {'h','t','t','p','s',0}; userName[0] = 0; hostName[0] = 0;

1 0

Stefan Leichter : setupapi: Support signature $Windows NT$ in SetupDiGetINFClassA/W too.
by Alexandre Julliard 18 Dec '13

18 Dec '13

Module: wine Branch: master Commit: 6aace3014d355d355e802299d62a34e8865951ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aace3014d355d355e802299d… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Dec 17 21:42:00 2013 +0100 setupapi: Support signature $Windows NT$ in SetupDiGetINFClassA/W too. --- dlls/setupapi/devinst.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index b1d6be0..5eaffd6 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -58,6 +58,7 @@ static const WCHAR NtPlatformExtension[] = {'.','N','T','x','8','6',0}; static const WCHAR Signature[] = {'S','i','g','n','a','t','u','r','e',0}; static const WCHAR Version[] = {'V','e','r','s','i','o','n',0}; static const WCHAR WinExtension[] = {'.','W','i','n',0}; +static const WCHAR WindowsNT[] = {'$','W','i','n','d','o','w','s',' ','N','T','$',0}; /* Registry key and value names */ static const WCHAR ControlClass[] = {'S','y','s','t','e','m','\\', @@ -4073,7 +4074,7 @@ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, if (!GetPrivateProfileStringW(Version, Signature, NULL, buffer, MAX_PATH, inf)) return FALSE; - if (lstrcmpiW(buffer, Chicago)) + if (lstrcmpiW(buffer, Chicago) && lstrcmpiW(buffer, WindowsNT)) return FALSE; buffer[0] = '\0';

1 0

Stefan Leichter : setupapi/tests: Test signature $Windows NT$ in SetupDiGetINFClassA too.
by Alexandre Julliard 18 Dec '13

18 Dec '13

Module: wine Branch: master Commit: adbc691d209ffcb198f8f2d3b7d04f83f97d91e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adbc691d209ffcb198f8f2d3b… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Dec 17 21:42:11 2013 +0100 setupapi/tests: Test signature $Windows NT$ in SetupDiGetINFClassA too. --- dlls/setupapi/tests/devinst.c | 154 +++++++++++++++++++++-------------------- 1 files changed, 80 insertions(+), 74 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index ccb6b68..319bb31 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1370,6 +1370,7 @@ static void testSetupDiGetINFClassA(void) { static const char inffile[] = "winetest.inf"; static const char content[] = "[Version]\r\n\r\n"; + static const char* signatures[] = {"\"$CHICAGO$\"", "\"$Windows NT$\""}; char cn[MAX_PATH]; char filename[MAX_PATH]; @@ -1377,6 +1378,7 @@ static void testSetupDiGetINFClassA(void) BOOL retval; GUID guid; HANDLE h; + int i; if(!pSetupDiGetINFClassA) { @@ -1444,96 +1446,100 @@ static void testSetupDiGetINFClassA(void) retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL, NULL); - if(h == INVALID_HANDLE_VALUE) + for(i=0; i < sizeof(signatures)/sizeof(char*); i++) { - win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); - return; - } - WriteFile( h, content, sizeof(content), &count, NULL); - CloseHandle( h); - - retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - - WritePrivateProfileStringA("Version", "Signature", "\"$CHICAGO$\"", filename); + trace("testing signarture %s\n", signatures[i]); + h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + if(h == INVALID_HANDLE_VALUE) + { + win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); + return; + } + WriteFile( h, content, sizeof(content), &count, NULL); + CloseHandle( h); - retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - WritePrivateProfileStringA("Version", "Class", "WINE", filename); + WritePrivateProfileStringA("Version", "Signature", signatures[i], filename); - count = 0xdeadbeef; - retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); - ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); - ok(count == 5, "expected count==5, got %u\n", count); + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - count = 0xdeadbeef; - retval = SetupDiGetINFClassA(filename, &guid, cn, 5, &count); - ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); - ok(count == 5, "expected count==5, got %u\n", count); + WritePrivateProfileStringA("Version", "Class", "WINE", filename); - count = 0xdeadbeef; - SetLastError(0xdeadbeef); - retval = SetupDiGetINFClassA(filename, &guid, cn, 4, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), - "expected error ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); - ok(count == 5, "expected count==5, got %u\n", count); + count = 0xdeadbeef; + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); + ok(count == 5, "expected count==5, got %u\n", count); - /* invalid parameter */ - SetLastError(0xdeadbeef); - retval = SetupDiGetINFClassA(NULL, &guid, cn, MAX_PATH, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(ERROR_INVALID_PARAMETER == GetLastError(), - "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + count = 0xdeadbeef; + retval = SetupDiGetINFClassA(filename, &guid, cn, 5, &count); + ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); + ok(count == 5, "expected count==5, got %u\n", count); - SetLastError(0xdeadbeef); - retval = SetupDiGetINFClassA(filename, NULL, cn, MAX_PATH, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(ERROR_INVALID_PARAMETER == GetLastError(), - "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + count = 0xdeadbeef; + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, 4, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), + "expected error ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); + ok(count == 5, "expected count==5, got %u\n", count); - SetLastError(0xdeadbeef); - retval = SetupDiGetINFClassA(filename, &guid, NULL, MAX_PATH, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(ERROR_INVALID_PARAMETER == GetLastError(), - "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + /* invalid parameter */ + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(NULL, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); - SetLastError(0xdeadbeef); - retval = SetupDiGetINFClassA(filename, &guid, cn, 0, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(ERROR_INSUFFICIENT_BUFFER == GetLastError() || - ERROR_INVALID_PARAMETER == GetLastError(), - "expected error ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER, " - "got %u\n", GetLastError()); + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, NULL, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); - DeleteFileA(filename); + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, NULL, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); - WritePrivateProfileStringA("Version", "Signature", "\"$CHICAGO$\"", filename); - WritePrivateProfileStringA("Version", "ClassGUID", "WINE", filename); + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, 0, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError() || + ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER, " + "got %u\n", GetLastError()); - SetLastError(0xdeadbeef); - retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(RPC_S_INVALID_STRING_UUID == GetLastError() || - ERROR_INVALID_PARAMETER == GetLastError(), - "expected error RPC_S_INVALID_STRING_UUID or ERROR_INVALID_PARAMETER, " - "got %u\n", GetLastError()); + DeleteFileA(filename); - /* network adapter guid */ - WritePrivateProfileStringA("Version", "ClassGUID", - "{4d36e972-e325-11ce-bfc1-08002be10318}", filename); + WritePrivateProfileStringA("Version", "Signature", signatures[i], filename); + WritePrivateProfileStringA("Version", "ClassGUID", "WINE", filename); - /* this test succeeds only if the guid is known to the system */ - count = 0xdeadbeef; - retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); - ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); - todo_wine - ok(count == 4, "expected count==4, got %u(%s)\n", count, cn); + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(RPC_S_INVALID_STRING_UUID == GetLastError() || + ERROR_INVALID_PARAMETER == GetLastError(), + "expected error RPC_S_INVALID_STRING_UUID or ERROR_INVALID_PARAMETER, " + "got %u\n", GetLastError()); + + /* network adapter guid */ + WritePrivateProfileStringA("Version", "ClassGUID", + "{4d36e972-e325-11ce-bfc1-08002be10318}", filename); + + /* this test succeeds only if the guid is known to the system */ + count = 0xdeadbeef; + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); + todo_wine + ok(count == 4, "expected count==4, got %u(%s)\n", count, cn); - DeleteFileA(filename); + DeleteFileA(filename); + } } START_TEST(devinst)

1 0

Frédéric Delanoy : msi: Constify a character string.
by Alexandre Julliard 18 Dec '13

18 Dec '13

Module: wine Branch: master Commit: 198344894230ae982911824af54db4023b64c84c URL: http://source.winehq.org/git/wine.git/?a=commit;h=198344894230ae982911824af… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 17 22:17:37 2013 +0100 msi: Constify a character string. --- dlls/msi/msi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index c1f4fcc..f8a1874 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -359,7 +359,7 @@ static UINT MSI_ApplyPatchW(LPCWSTR szPatchPackage, LPCWSTR szProductCode, LPCWS BOOL succeeded = FALSE; static const WCHAR fmt[] = {'%','s',' ','P','A','T','C','H','=','"','%','s','"',0}; - static WCHAR empty[] = {0}; + static const WCHAR empty[] = {0}; if (!szPatchPackage || !szPatchPackage[0]) return ERROR_INVALID_PARAMETER;

1 0

Frédéric Delanoy : msxml3: Constify a character string.
by Alexandre Julliard 18 Dec '13

18 Dec '13

Module: wine Branch: master Commit: 1c972c598716cd06b6ff3d18af6505a3214379db URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c972c598716cd06b6ff3d18a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 17 22:17:39 2013 +0100 msxml3: Constify a character string. --- dlls/msxml3/text.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index fd8e33a..411f6eb 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -616,7 +616,7 @@ static HRESULT WINAPI domtext_put_data( BSTR data) { domtext *This = impl_from_IXMLDOMText( iface ); - static WCHAR rnW[] = {'\r','\n',0}; + static const WCHAR rnW[] = {'\r','\n',0}; TRACE("(%p)->(%s)\n", This, debugstr_w(data));

1 0