May 2017 - Wine-Commits - list.winehq.org

Hugh McMaster : reg/tests: Add tests for key name and value name concatenation.
by Alexandre Julliard May 18, 2017

May 18, 2017

Module: wine Branch: master Commit: c5f0de7748df03bc391fd7a8f2d078aa655789f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5f0de7748df03bc391fd7a8f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 17 08:12:48 2017 +0000 reg/tests: Add tests for key name and value name concatenation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index c26a8c1..86ff7b5 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1381,6 +1381,34 @@ static void test_import(void) dword = 0x00000008; todo_wine verify_reg(hkey, "single'quote", REG_DWORD, &dword, sizeof(dword), 0); + /* Test key name and value name concatenation */ + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\\n" + "Subkey1]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegOpenKeyExA(hkey, "Subkey1", 0, KEY_READ, &subkey); + todo_wine ok(err == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", err); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\n" + "\\Subkey2]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegOpenKeyExA(hkey, "Subkey2", 0, KEY_READ, &subkey); + todo_wine ok(err == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", err); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine\\\n" + "42a\"=\"Value 1\"\n" + "\"Wine42b\"=\"Value 2\"\n" + "\"Wine\n" + "\\42c\"=\"Value 3\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine42a"); + todo_wine verify_reg(hkey, "Wine42b", REG_SZ, "Value 2", 8, 0); + todo_wine verify_reg_nonexist(hkey, "Wine42c"); + + /* Test import with subkeys */ test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey\"1]\n" "\"Wine\\\\31\"=\"Test value\"\n\n", &r); @@ -1980,6 +2008,34 @@ static void test_import(void) dword = 0x00000008; todo_wine verify_reg(hkey, "single'quote", REG_DWORD, &dword, sizeof(dword), 0); + /* Test key name and value name concatenation */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\\n" + "Subkey1]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegOpenKeyExA(hkey, "Subkey1", 0, KEY_READ, &subkey); + todo_wine ok(err == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", err); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\n" + "\\Subkey2]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegOpenKeyExA(hkey, "Subkey2", 0, KEY_READ, &subkey); + todo_wine ok(err == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", err); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine\\\n" + "42a\"=\"Value 1\"\n" + "\"Wine42b\"=\"Value 2\"\n" + "\"Wine\n" + "\\42c\"=\"Value 3\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine42a"); + todo_wine verify_reg(hkey, "Wine42b", REG_SZ, "Value 2", 8, 0); + todo_wine verify_reg_nonexist(hkey, "Wine42c"); + + /* Test import with subkeys */ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey\"1]\n" "\"Wine\\\\31\"=\"Test value\"\n\n", &r);

1 0

Francois Gouget : testbot/WineRunReconfig: Don' t update the TestList if the Reconfig failed.
by Alexandre Julliard May 18, 2017

May 18, 2017

Module: tools Branch: master Commit: 049ee751f8e742f2488de2b1a2bed438d47500c9 URL: http://source.winehq.org/git/tools.git/?a=commit;h=049ee751f8e742f2488de2b1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 18 06:58:29 2017 +0200 testbot/WineRunReconfig: Don't update the TestList if the Reconfig failed. If we failed to update/rebuild Wine then we will stick with the old Wine and we should still use the old test list. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 1337320..c99c1ab 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -373,15 +373,18 @@ elsif (!defined $TAError) $TAError = "An error occurred while retrieving the reconfig log: ". $TA->GetLastError(); } -Debug(Elapsed($Start), " Retrieving the updated test list '$TaskDir/testlist.txt'\n"); -if ($TA->GetFile("testlist.txt", "$TaskDir/testlist.txt")) +if ($NewStatus eq "completed") { use File::Copy; - copy "$TaskDir/testlist.txt", "$DataDir/latest/testlist.txt"; -} -elsif (!defined $TAError) -{ - $TAError = "An error occurred while retrieving the test list: ". $TA->GetLastError(); + Debug(Elapsed($Start), " Retrieving the updated test list '$TaskDir/testlist.txt'\n"); + if ($TA->GetFile("testlist.txt", "$TaskDir/testlist.txt")) + { + copy "$TaskDir/testlist.txt", "$DataDir/latest/testlist.txt"; + } + elsif (!defined $TAError) + { + $TAError = "An error occurred while retrieving the test list: ". $TA->GetLastError(); + } } $TA->Disconnect();

1 0

Francois Gouget : testbot/build: Use $:: RootDir instead of assuming where $BinDir is.
by Alexandre Julliard May 18, 2017

May 18, 2017

Module: tools Branch: master Commit: 6fbad4329c260471a498448ebe01cb1d7279e543 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6fbad4329c260471a498448e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 18 06:57:24 2017 +0200 testbot/build: Use $::RootDir instead of assuming where $BinDir is. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Reconfig.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index ec7f05f..e522e94 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -93,7 +93,7 @@ sub BuildTestAgentd() # so don't rebuild it. if (! -x "$BinDir/build/testagentd") { - system("( cd $BinDir/../src/testagentd && set -x && " . + system("( cd $::RootDir/src/testagentd && set -x && " . " time make -j$ncpus build " . ") >>$LogDir/Reconfig.log 2>&1"); if ($? != 0) @@ -103,7 +103,7 @@ sub BuildTestAgentd() } } - system("( cd $BinDir/../src/testagentd && set -x && " . + system("( cd $::RootDir/src/testagentd && set -x && " . " time make -j$ncpus iso " . ") >>$LogDir/Reconfig.log 2>&1"); if ($? != 0)

1 0

Hugh McMaster : regedit/tests: Add tests for importing REG_BINARY data.
by Alexandre Julliard May 17, 2017

May 17, 2017

Module: wine Branch: master Commit: d37a49f362ac7feffa98ca6e117a0fc37dc7e546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d37a49f362ac7feffa98ca6e1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 17 12:24:22 2017 +0000 regedit/tests: Add tests for importing REG_BINARY data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 49 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index d75a131..d5c6524 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -189,6 +189,7 @@ static void test_basic_import(void) WCHAR wide_exp[] = {0x3041,'V','a','l','u','e',0}; LONG lr; char buffer[8]; + BYTE hex[8]; lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, @@ -318,7 +319,7 @@ static void test_basic_import(void) dword = 0x00000008; verify_reg(hkey, "single'quote", REG_DWORD, &dword, sizeof(dword), 0); - /* Test hex data concatenation for REG_NONE and REG_EXPAND_SZ */ + /* Test hex data concatenation for REG_NONE, REG_EXPAND_SZ and REG_BINARY */ exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine10a\"=hex(0):56,00,61,00,6c,00,75,00,65,00,00,00\n" @@ -372,6 +373,28 @@ static void test_basic_import(void) todo_wine ok(size == 6 || broken(size == 5) /* WinXP */, "got wrong size %u, expected 6\n", size); todo_wine ok(memcmp(buffer, "%PATH", size) == 0, "got wrong data\n"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine12a\"=hex:11,22,33,44,55,66,77,88\n" + "\"Wine12b\"=hex:11,22,33,44,\\\n" + " 55,66,77,88\n" + "\"Wine12c\"=hex:11,22,33,44,\\;comment\n" + " 55,66,\\\n" + " 77,88\n" + "\"Wine12d\"=hex:11,22,33,44,\\;comment\n" + " 55,66,\n" + " 77,88\n" + "\"Wine12e\"=hex:11,22,33,44,\\;comment\n" + " 55,66,;comment\n" + " 77,88\n"); + hex[0] = 0x11; hex[1] = 0x22; hex[2] = 0x33; hex[3] = 0x44; + hex[4] = 0x55; hex[5] = 0x66; hex[6] = 0x77; hex[7] = 0x88; + verify_reg(hkey, "Wine12a", REG_BINARY, hex, sizeof(hex), 0); + verify_reg(hkey, "Wine12b", REG_BINARY, hex, sizeof(hex), 0); + todo_wine verify_reg(hkey, "Wine12c", REG_BINARY, hex, sizeof(hex), 0); + todo_wine verify_reg(hkey, "Wine12d", REG_BINARY, hex, 6, 0); + todo_wine verify_reg(hkey, "Wine12e", REG_BINARY, hex, 6, 0); + /* Test import with subkeys */ exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey\"1]\n" @@ -663,7 +686,7 @@ static void test_invalid_import(void) todo_wine verify_reg_nonexist(hkey, "Test18a"); todo_wine verify_reg_nonexist(hkey, "Test18b"); - /* Test hex data concatenation for REG_NONE and REG_EXPAND_SZ */ + /* Test hex data concatenation for REG_NONE, REG_EXPAND_SZ and REG_BINARY */ exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test19a\"=hex(0):56,00,61,00,6c,00\\\n" @@ -708,6 +731,28 @@ static void test_invalid_import(void) todo_wine verify_reg_nonexist(hkey, "Test20e"); verify_reg_nonexist(hkey, "Test20f"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test21a\"=hex:11,22,33,44\\\n" + ",55,66,77,88\n" + "\"Test21b\"=hex:11,22,33,44\\\n" + " ,55,66,77,88\n" + "\"Test21c\"=hex:11,22,33,44\\\n" + " 55,66,77,88\n" + "\"Test21d\"=hex:11,22,33,4\\\n" + "4,55,66,77,88\n" + "\"Test21e\"=hex:11,22,33,4\\\n" + " 4,55,66,77,88\n" + "\"Test21f\"=hex:11,22,33,\\;comment\n" + " 44,55,66,\\#comment\n" + " 77,88\n\n"); + todo_wine verify_reg_nonexist(hkey, "Test21a"); + todo_wine verify_reg_nonexist(hkey, "Test21b"); + verify_reg_nonexist(hkey, "Test21c"); + todo_wine verify_reg_nonexist(hkey, "Test21d"); + todo_wine verify_reg_nonexist(hkey, "Test21e"); + verify_reg_nonexist(hkey, "Test21f"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Bas Weelinck : cmd: Detect and handle start console title.
by Alexandre Julliard May 17, 2017

May 17, 2017

Module: wine Branch: master Commit: 9baceabb88e2aeb90a32bb5f6923107904ed58ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=9baceabb88e2aeb90a32bb5f6… Author: Bas Weelinck <bas.weelinck(a)gmail.com> Date: Mon May 8 18:28:28 2017 +0200 cmd: Detect and handle start console title. Signed-off-by: Bas Weelinck <bas.weelinck(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++-- programs/cmd/wcmd.h | 2 +- 2 files changed, 89 insertions(+), 4 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 7301f54..1da1f67 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4311,10 +4311,15 @@ void WCMD_shift (const WCHAR *args) { /**************************************************************************** * WCMD_start */ -void WCMD_start(const WCHAR *args) +void WCMD_start(WCHAR *args) { static const WCHAR exeW[] = {'\\','c','o','m','m','a','n','d', '\\','s','t','a','r','t','.','e','x','e',0}; + static const WCHAR startDelims[] = { ' ', '\t', '/', '\0' }; + static const WCHAR prefixQuote[] = {'"','\\','"','\0'}; + static const WCHAR postfixQuote[] = {'\\','"','"','\0'}; + int argno; + int have_title; WCHAR file[MAX_PATH]; WCHAR *cmdline; STARTUPINFOW st; @@ -4322,10 +4327,90 @@ void WCMD_start(const WCHAR *args) GetWindowsDirectoryW( file, MAX_PATH ); strcatW( file, exeW ); - cmdline = heap_alloc( (strlenW(file) + strlenW(args) + 2) * sizeof(WCHAR) ); + cmdline = heap_alloc( (strlenW(file) + strlenW(args) + 8) * sizeof(WCHAR) ); strcpyW( cmdline, file ); strcatW( cmdline, spaceW ); - strcatW( cmdline, args ); + + /* The start built-in has some special command-line parsing properties + * which will be outlined here. + * + * both '\t' and ' ' are argument separators + * '/' has a special double role as both separator and switch prefix, e.g. + * + * > start /low/i + * or + * > start "title"/i + * + * are valid ways to pass multiple options to start. In the latter case + * '/i' is not a part of the title but parsed as a switch. + * + * However, '=', ';' and ',' are not separators: + * > start "deus"=ex,machina + * + * will in fact open a console titled 'deus=ex,machina' + * + * The title argument parsing code is only interested in quotes themselves, + * it does not respect escaping of any kind and all quotes are dropped + * from the resulting title, therefore: + * + * > start "\"" hello"/low + * + * actually opens a console titled '\ hello' with low priorities. + * + * To not break compatibility with wine programs relying on + * wine's separate 'start.exe', this program's peculiar console + * title parsing is actually implemented in 'cmd.exe' which is the + * application native Windows programs will use to invoke 'start'. + * + * WCMD_parameter_with_delims will take care of everything for us. + */ + have_title = FALSE; + for (argno=0; ; argno++) { + WCHAR *thisArg, *argN; + + argN = NULL; + thisArg = WCMD_parameter_with_delims(args, argno, &argN, FALSE, FALSE, startDelims); + + /* No more parameters */ + if (!argN) + break; + + /* Found the title */ + if (argN[0] == '"') { + TRACE("detected console title: %s\n", wine_dbgstr_w(thisArg)); + have_title = TRUE; + + /* Copy all of the cmdline processed */ + memcpy(cmdline, args, sizeof(WCHAR) * (argN - args)); + cmdline[argN - args] = '\0'; + + /* Add quoted title */ + strcatW(cmdline, prefixQuote); + strcatW(cmdline, thisArg); + strcatW(cmdline, postfixQuote); + + /* Concatenate remaining command-line */ + thisArg = WCMD_parameter_with_delims(args, argno, &argN, TRUE, FALSE, startDelims); + strcatW(cmdline, argN + strlenW(thisArg)); + + break; + } + + /* Skipping a regular argument? */ + else if (argN != args && argN[-1] == '/') { + continue; + + /* Not an argument nor the title, start of program arguments, + * stop looking for title. + */ + } else + break; + } + + /* build command-line if not built yet */ + if (!have_title) { + strcatW( cmdline, args ); + } memset( &st, 0, sizeof(STARTUPINFOW) ); st.cb = sizeof(STARTUPINFOW); diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index c135621..1180251 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -95,7 +95,7 @@ void WCMD_setshow_path (const WCHAR *args); void WCMD_setshow_prompt (void); void WCMD_setshow_time (void); void WCMD_shift (const WCHAR *args); -void WCMD_start (const WCHAR *args); +void WCMD_start (WCHAR *args); void WCMD_title (const WCHAR *); void WCMD_type (WCHAR *); void WCMD_verify (const WCHAR *args);

1 0

Akihiro Sagawa : mscoree: Avoid using isdigit() for WCHARs.
by Alexandre Julliard May 17, 2017

May 17, 2017

Module: wine Branch: master Commit: 83aca41eb5cfcf0a0cbf94859d2bca33a8a45a0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=83aca41eb5cfcf0a0cbf94859… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 17 00:00:13 2017 +0900 mscoree: Avoid using isdigit() for WCHARs. Found with Coccinelle. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 30b9739..a99880d 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -818,6 +818,11 @@ static ULONG WINAPI CLRMetaHost_Release(ICLRMetaHost* iface) return 1; } +static inline BOOL isDigit(WCHAR c) +{ + return c >= '0' && c <= '9'; +} + static BOOL parse_runtime_version(LPCWSTR version, DWORD *major, DWORD *minor, DWORD *build) { *major = 0; @@ -827,28 +832,28 @@ static BOOL parse_runtime_version(LPCWSTR version, DWORD *major, DWORD *minor, D if (version[0] == 'v' || version[0] == 'V') { version++; - if (!isdigit(*version)) + if (!isDigit(*version)) return FALSE; - while (isdigit(*version)) + while (isDigit(*version)) *major = *major * 10 + (*version++ - '0'); if (*version == 0) return TRUE; - if (*version++ != '.' || !isdigit(*version)) + if (*version++ != '.' || !isDigit(*version)) return FALSE; - while (isdigit(*version)) + while (isDigit(*version)) *minor = *minor * 10 + (*version++ - '0'); if (*version == 0) return TRUE; - if (*version++ != '.' || !isdigit(*version)) + if (*version++ != '.' || !isDigit(*version)) return FALSE; - while (isdigit(*version)) + while (isDigit(*version)) *build = *build * 10 + (*version++ - '0'); return *version == 0;

1 0

Alexandre Julliard : wineconsole: Avoid some fatal errors.
by Alexandre Julliard May 17, 2017

May 17, 2017

Module: wine Branch: master Commit: 9032849d068a8a0a026c12b62a1a25c3cff53d63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9032849d068a8a0a026c12b62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 17 22:20:40 2017 +0200 wineconsole: Avoid some fatal errors. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/registry.c | 2 +- programs/wineconsole/user.c | 5 ++--- programs/wineconsole/wineconsole.c | 8 ++------ 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/programs/wineconsole/registry.c b/programs/wineconsole/registry.c index e537a86..080431a 100644 --- a/programs/wineconsole/registry.c +++ b/programs/wineconsole/registry.c @@ -76,7 +76,7 @@ static LPWSTR WINECON_CreateKeyName(LPCWSTR kn) LPWSTR ret = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(kn) + 1) * sizeof(WCHAR)); LPWSTR ptr = ret; - if (!ptr) WINECON_Fatal("OOM"); + if (!ret) return NULL; do { diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 316c011..fe1cf46 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -56,8 +56,7 @@ static void WCUSER_FillMemDC(const struct inner_data* data, int upd_tp, int upd_ /* FIXME: could set up a mechanism to reuse the line between different * calls to this function */ - if (!(line = HeapAlloc(GetProcessHeap(), 0, data->curcfg.sb_width * sizeof(WCHAR)))) - WINECON_Fatal("OOM\n"); + if (!(line = HeapAlloc(GetProcessHeap(), 0, data->curcfg.sb_width * sizeof(WCHAR)))) return; dx = HeapAlloc( GetProcessHeap(), 0, data->curcfg.sb_width * sizeof(*dx) ); hOldFont = SelectObject(PRIVATE(data)->hMemDC, PRIVATE(data)->hFont); @@ -169,7 +168,7 @@ static void WCUSER_ShapeCursor(struct inner_data* data, int size, int vis, BOOL w16b = ((data->curcfg.cell_width + 15) & ~15) / 8; ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, w16b * data->curcfg.cell_height); - if (!ptr) WINECON_Fatal("OOM"); + if (!ptr) return; nbl = max((data->curcfg.cell_height * size) / 100, 1); for (j = data->curcfg.cell_height - nbl; j < data->curcfg.cell_height; j++) { diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index d6efa2f..d1d38be 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -655,11 +655,7 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna GetStartupInfoW(&si); - if (pid == 0) - { - if (!si.lpTitle) WINECON_Fatal("Should have a title set"); - appname = si.lpTitle; - } + if (pid == 0) appname = si.lpTitle; data->nCmdShow = nCmdShow; /* load settings */ @@ -729,7 +725,7 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna WINECON_GetServerConfig(data); data->cells = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, data->curcfg.sb_width * data->curcfg.sb_height * sizeof(CHAR_INFO)); - if (!data->cells) WINECON_Fatal("OOM\n"); + if (!data->cells) goto error; data->fnResizeScreenBuffer(data); data->fnComputePositions(data); WINECON_SetConfig(data, &cfg);

1 0

Alexandre Julliard : d3dx9: Check for missing log2 function.
by Alexandre Julliard May 17, 2017

May 17, 2017

Module: wine Branch: master Commit: d321cdcd28ad63aec9c7ce04adbf4a25a24ae003 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d321cdcd28ad63aec9c7ce04a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 17 20:20:09 2017 +0200 d3dx9: Check for missing log2 function. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index fbd99ac..bd934af 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -104,7 +104,11 @@ static double pres_log(double *args, int n) if (v == 0.0) return 0.0; else +#ifdef HAVE_LOG2 return log2(v); +#else + return log(v) / log(2); +#endif } #define PRES_OPCODE_MASK 0x7ff00000

1 0

Akihiro Sagawa : explorer: Avoid using isspace() for WCHARs.
by Alexandre Julliard May 17, 2017

May 17, 2017

Module: wine Branch: master Commit: 505be073a1871152dcad9365c8adca0839441081 URL: http://source.winehq.org/git/wine.git/?a=commit;h=505be073a1871152dcad9365c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 17 21:35:49 2017 +0900 explorer: Avoid using isspace() for WCHARs. Found with Coccinelle. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/desktop.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 7a8252f..4088dd4 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -903,6 +903,11 @@ static void set_desktop_window_title( HWND hwnd, const WCHAR *name ) HeapFree( GetProcessHeap(), 0, window_titleW ); } +static inline BOOL is_whitespace(WCHAR c) +{ + return c == ' ' || c == '\t'; +} + /* main desktop management function */ void manage_desktop( WCHAR *arg ) { @@ -919,11 +924,11 @@ void manage_desktop( WCHAR *arg ) BOOL enable_shell = FALSE; /* get the rest of the command line (if any) */ - while (*p && !isspace(*p)) p++; + while (*p && !is_whitespace(*p)) p++; if (*p) { *p++ = 0; - while (*p && isspace(*p)) p++; + while (*p && is_whitespace(*p)) p++; if (*p) cmdline = p; }

1 0

Alex Henrie : ntdll: Always fill PagefileUsage counter with a nonzero value on Linux.
by Alexandre Julliard May 17, 2017

May 17, 2017

Module: wine Branch: master Commit: 146cf041d96b4b0d9050e4e59c965e67c407e19e URL: http://source.winehq.org/git/wine.git/?a=commit;h=146cf041d96b4b0d9050e4e59… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue May 16 20:32:44 2017 -0600 ntdll: Always fill PagefileUsage counter with a nonzero value on Linux. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 5 ++++- dlls/ntdll/tests/info.c | 2 ++ server/process.c | 5 ++++- server/protocol.def | 4 ++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 8d66030..f615ce2 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -152,9 +152,12 @@ static void fill_VM_COUNTERS(VM_COUNTERS* pvmi) pvmi->PeakWorkingSetSize = (ULONG64)value * 1024; else if (sscanf(line, "VmRSS: %lu", &value)) pvmi->WorkingSetSize = (ULONG64)value * 1024; + else if (sscanf(line, "RssAnon: %lu", &value)) + pvmi->PagefileUsage += (ULONG64)value * 1024; else if (sscanf(line, "VmSwap: %lu", &value)) - pvmi->PeakPagefileUsage = pvmi->PagefileUsage = (ULONG64)value * 1024; + pvmi->PagefileUsage += (ULONG64)value * 1024; } + pvmi->PeakPagefileUsage = pvmi->PagefileUsage; fclose(f); } diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 9fda2d5..f1de206 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1096,6 +1096,7 @@ static void test_query_process_vm(void) /* Check if we have some return values */ dump_vm_counters("VM counters for GetCurrentProcess", &pvi); ok( pvi.WorkingSetSize > 0, "Expected a WorkingSetSize > 0\n"); + ok( pvi.PagefileUsage > 0, "Expected a PagefileUsage > 0\n"); process = OpenProcess(PROCESS_VM_READ, FALSE, GetCurrentProcessId()); status = pNtQueryInformationProcess(process, ProcessVmCounters, &pvi, sizeof(pvi), NULL); @@ -1115,6 +1116,7 @@ static void test_query_process_vm(void) /* Check if we have some return values */ dump_vm_counters("VM counters for GetCurrentProcessId", &pvi); ok( pvi.WorkingSetSize > 0, "Expected a WorkingSetSize > 0\n"); + ok( pvi.PagefileUsage > 0, "Expected a PagefileUsage > 0\n"); CloseHandle(process); } diff --git a/server/process.c b/server/process.c index 3e40c9e..5eabbbe 100644 --- a/server/process.c +++ b/server/process.c @@ -1397,9 +1397,12 @@ DECL_HANDLER(get_process_vm_counters) reply->peak_working_set_size = (mem_size_t)value * 1024; else if (sscanf( line, "VmRSS: %lu", &value )) reply->working_set_size = (mem_size_t)value * 1024; + else if (sscanf( line, "RssAnon: %lu", &value )) + reply->pagefile_usage += (mem_size_t)value * 1024; else if (sscanf( line, "VmSwap: %lu", &value )) - reply->peak_pagefile_usage = reply->pagefile_usage = (mem_size_t)value * 1024; + reply->pagefile_usage += (mem_size_t)value * 1024; } + reply->peak_pagefile_usage = reply->pagefile_usage; fclose( f ); } else set_error( STATUS_ACCESS_DENIED ); diff --git a/server/protocol.def b/server/protocol.def index 0a9d258..6cafa70 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -853,8 +853,8 @@ struct rawinput_device mem_size_t virtual_size; /* virtual memory in bytes */ mem_size_t peak_working_set_size; /* peak real memory in bytes */ mem_size_t working_set_size; /* real memory in bytes */ - mem_size_t pagefile_usage; /* swapped-out memory in bytes */ - mem_size_t peak_pagefile_usage; /* peak swapped-out memory in bytes */ + mem_size_t pagefile_usage; /* commit charge in bytes */ + mem_size_t peak_pagefile_usage; /* peak commit charge in bytes */ @END

1 0