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

Hugh McMaster : reg/tests: Add tests for importing REG_NONE data.
by Alexandre Julliard 18 May '17

18 May '17

Module: wine Branch: master Commit: 8ef6091c8ce98a20e03955bb7234d4bbba54cfbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ef6091c8ce98a20e03955bb7… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 17 08:13:20 2017 +0000 reg/tests: Add tests for importing REG_NONE data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index b2afe8b..abccc6d 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1428,6 +1428,47 @@ static void test_import(void) todo_wine verify_reg(hkey, "Wine42b", REG_SZ, "Value 2", 8, 0); todo_wine verify_reg_nonexist(hkey, "Wine42c"); + /* Test hex data concatenation for REG_NONE */ + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine43a\"=hex(0):56,00,61,00,6c,00,75,00,65,00,00,00\n" + "\"Wine43b\"=hex(0):56,00,61,00,6c,00,\\\n" + " 75,00,65,00,00,00\n" + "\"Wine43c\"=hex(0):56,00,61,00,6c,00\\\n" + ",75,00,65,00,00,00\n" + "\"Wine43d\"=hex(0):56,00,61,00,6c,00\\\n" + " ,75,00,65,00,00,00\n" + "\"Wine43e\"=hex(0):56,00,61,00,6c,00\\\n" + " 75,00,65,00,00,00\n" + "\"Wine43f\"=hex(0):56,00,61,00,6c,00,7\\\n" + "5,00,65,00,00,00\n" + "\"Wine43g\"=hex(0):56,00,61,00,6c,00,7\\\n" + " 5,00,65,00,00,00\\\n" + "\"Wine43h\"=hex(0):56,00,61,00,\\;comment\n" + " 6c,00,75,00,\\\n" + " 65,00,00,00\n" + "\"Wine43i\"=hex(0):56,00,61,00,\\;comment\n" + " 6c,00,75,00,\n" + " 65,00,00,00\n" + "\"Wine43j\"=hex(0):56,00,61,00,\\;comment\n" + " 6c,00,75,00,;comment\n" + " 65,00,00,00\n" + "\"Wine43k\"=hex(0):56,00,61,00,\\;comment\n" + " 6c,00,75,00,\\#comment\n" + " 65,00,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine43a", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + todo_wine verify_reg(hkey, "Wine43b", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + todo_wine verify_reg_nonexist(hkey, "Wine43c"); + todo_wine verify_reg_nonexist(hkey, "Wine43d"); + todo_wine verify_reg_nonexist(hkey, "Wine43e"); + todo_wine verify_reg_nonexist(hkey, "Wine43f"); + todo_wine verify_reg_nonexist(hkey, "Wine43g"); + todo_wine verify_reg(hkey, "Wine43h", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + todo_wine verify_reg(hkey, "Wine43i", REG_NONE, "V\0a\0l\0u\0e\0\0", 8, 0); + todo_wine verify_reg(hkey, "Wine43j", REG_NONE, "V\0a\0l\0u\0e\0\0", 8, 0); + todo_wine verify_reg_nonexist(hkey, "Wine43k"); + /* Test import with subkeys */ test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey\"1]\n" @@ -2075,6 +2116,47 @@ static void test_import(void) todo_wine verify_reg(hkey, "Wine42b", REG_SZ, "Value 2", 8, 0); todo_wine verify_reg_nonexist(hkey, "Wine42c"); + /* Test hex data concatenation for REG_NONE */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine43a\"=hex(0):56,00,61,00,6c,00,75,00,65,00,00,00\n" + "\"Wine43b\"=hex(0):56,00,61,00,6c,00,\\\n" + " 75,00,65,00,00,00\n" + "\"Wine43c\"=hex(0):56,00,61,00,6c,00\\\n" + ",75,00,65,00,00,00\n" + "\"Wine43d\"=hex(0):56,00,61,00,6c,00\\\n" + " ,75,00,65,00,00,00\n" + "\"Wine43e\"=hex(0):56,00,61,00,6c,00\\\n" + " 75,00,65,00,00,00\n" + "\"Wine43f\"=hex(0):56,00,61,00,6c,00,7\\\n" + "5,00,65,00,00,00\n" + "\"Wine43g\"=hex(0):56,00,61,00,6c,00,7\\\n" + " 5,00,65,00,00,00\\\n" + "\"Wine43h\"=hex(0):56,00,61,00,\\;comment\n" + " 6c,00,75,00,\\\n" + " 65,00,00,00\n" + "\"Wine43i\"=hex(0):56,00,61,00,\\;comment\n" + " 6c,00,75,00,\n" + " 65,00,00,00\n" + "\"Wine43j\"=hex(0):56,00,61,00,\\;comment\n" + " 6c,00,75,00,;comment\n" + " 65,00,00,00\n" + "\"Wine43k\"=hex(0):56,00,61,00,\\;comment\n" + " 6c,00,75,00,\\#comment\n" + " 65,00,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine43a", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + todo_wine verify_reg(hkey, "Wine43b", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + todo_wine verify_reg_nonexist(hkey, "Wine43c"); + todo_wine verify_reg_nonexist(hkey, "Wine43d"); + todo_wine verify_reg_nonexist(hkey, "Wine43e"); + todo_wine verify_reg_nonexist(hkey, "Wine43f"); + todo_wine verify_reg_nonexist(hkey, "Wine43g"); + todo_wine verify_reg(hkey, "Wine43h", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + todo_wine verify_reg(hkey, "Wine43i", REG_NONE, "V\0a\0l\0u\0e\0\0", 8, 0); + todo_wine verify_reg(hkey, "Wine43j", REG_NONE, "V\0a\0l\0u\0e\0\0", 8, 0); + todo_wine verify_reg_nonexist(hkey, "Wine43k"); + /* 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"

1 0

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

18 May '17

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

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

18 May '17

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

Hugh McMaster : regedit/tests: Test if REG_SZ and REG_DWORD support line concatenation.
by Alexandre Julliard 17 May '17

17 May '17

Module: wine Branch: master Commit: 3ce4beb0a74e60826e69435cf18cb39d04bbe90b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ce4beb0a74e60826e69435cf… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 17 12:23:36 2017 +0000 regedit/tests: Test if REG_SZ and REG_DWORD support line concatenation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index b49ef05..db388b7 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -598,6 +598,15 @@ static void test_invalid_import(void) verify_reg(hkey, "Test17b", REG_SZ, "Value 2", 8, 0); verify_reg_nonexist(hkey, "Test17c"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test18a\"=dword:1234\\\n" + "5678\n" + "\"Test18b\"=\"Test \\\n" + "Value\"\n\n"); + todo_wine verify_reg_nonexist(hkey, "Test18a"); + todo_wine verify_reg_nonexist(hkey, "Test18b"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Austin English : user32: Add GetPhysicalCursorPos/ SetPhysicalCursorPos stubs.
by Alexandre Julliard 17 May '17

17 May '17

Module: wine Branch: master Commit: 2e9ca4626e2bedb5b8a0123a1c70d591f5e9d57c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e9ca4626e2bedb5b8a0123a1… Author: Austin English <austinenglish(a)gmail.com> Date: Mon May 15 21:07:44 2017 -0500 user32: Add GetPhysicalCursorPos/SetPhysicalCursorPos stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 19 +++++++++++++++++++ dlls/user32/user32.spec | 2 ++ 2 files changed, 21 insertions(+) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 44b7e70..c475b19 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -285,6 +285,16 @@ BOOL WINAPI GetCursorInfo( PCURSORINFO pci ) /*********************************************************************** + * GetPhysicalCursorPos (USER32.@) +*/ + +BOOL WINAPI GetPhysicalCursorPos(POINT *point) +{ + FIXME("(%p) semi-stub: forwarding to GetCursorPos\n", point); + return GetCursorPos(point); +} + +/*********************************************************************** * SetCursorPos (USER32.@) */ BOOL WINAPI DECLSPEC_HOTPATCH SetCursorPos( INT x, INT y ) @@ -310,6 +320,15 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetCursorPos( INT x, INT y ) return ret; } +/*********************************************************************** + * SetPhysicalCursorPos (USER32.@) +*/ + +BOOL WINAPI SetPhysicalCursorPos(INT x, INT y) +{ + FIXME("(%u %u) semi-stub: forwarding to SetCursorPos\n", x, y); + return SetCursorPos(x, y); +} /********************************************************************** * SetCapture (USER32.@) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index b79a6b0..1d492e4 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -344,6 +344,7 @@ # @ stub GetNextQueueWindow @ stdcall GetOpenClipboardWindow() @ stdcall GetParent(long) +@ stdcall GetPhysicalCursorPos(ptr) @ stdcall GetPriorityClipboardFormat(ptr long) @ stdcall GetProcessDefaultLayout(ptr) @ stdcall GetProcessWindowStation() @@ -658,6 +659,7 @@ @ stdcall SetMessageExtraInfo(long) @ stdcall SetMessageQueue(long) @ stdcall SetParent(long long) +@ stdcall SetPhysicalCursorPos(long long) @ stdcall SetProcessDefaultLayout(long) @ stdcall SetProcessDPIAware() @ stdcall SetProcessWindowStation(long)

1 0

Hugh McMaster : regedit/tests: Add tests for importing REG_NONE data.
by Alexandre Julliard 17 May '17

17 May '17

Module: wine Branch: master Commit: 2060e426a654f8112cb641140b36a7dcf9243ab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2060e426a654f8112cb641140… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 17 12:23:59 2017 +0000 regedit/tests: Add tests for importing REG_NONE 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 | 45 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index b49d9ea..b42f50e 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -317,6 +317,28 @@ 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 */ + 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" + "\"Wine10b\"=hex(0):56,00,61,00,6c,00,\\\n" + " 75,00,65,00,00,00\n" + "\"Wine10h\"=hex(0):56,00,61,00,\\;comment\n" + " 6c,00,75,00,\\\n" + " 65,00,00,00\n" + "\"Wine10i\"=hex(0):56,00,61,00,\\;comment\n" + " 6c,00,75,00,\n" + " 65,00,00,00\n" + "\"Wine10j\"=hex(0):56,00,61,00,\\;comment\n" + " 6c,00,75,00,;comment\n" + " 65,00,00,00\n"); + verify_reg(hkey, "Wine10a", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + verify_reg(hkey, "Wine10b", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + todo_wine verify_reg(hkey, "Wine10h", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + todo_wine verify_reg(hkey, "Wine10i", REG_NONE, "V\0a\0l\0u\0e\0\0", 8, 0); + todo_wine verify_reg(hkey, "Wine10j", REG_NONE, "V\0a\0l\0u\0e\0\0", 8, 0); + + /* Test import with subkeys */ exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey\"1]\n" "\"Wine\\\\31\"=\"Test value\"\n\n"); @@ -607,6 +629,29 @@ 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 */ + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test19a\"=hex(0):56,00,61,00,6c,00\\\n" + ",75,00,65,00,00,00\n" + "\"Test19b\"=hex(0):56,00,61,00,6c,00\\\n" + " ,75,00,65,00,00,00\n" + "\"Test19c\"=hex(0):56,00,61,00,6c,00\\\n" + " 75,00,65,00,00,00\n" + "\"Test19d\"=hex(0):56,00,61,00,6c,00,7\\\n" + "5,00,65,00,00,00\n" + "\"Test19e\"=hex(0):56,00,61,00,6c,00,7\\\n" + " 5,00,65,00,00,00\n" + "\"Test19f\"=hex(0):56,00,61,00,\\;comment\n" + " 6c,00,75,00,\\#comment\n" + " 65,00,00,00\n\n"); + todo_wine verify_reg_nonexist(hkey, "Test19a"); + todo_wine verify_reg_nonexist(hkey, "Test19b"); + todo_wine verify_reg_nonexist(hkey, "Test19c"); + todo_wine verify_reg_nonexist(hkey, "Test19d"); + todo_wine verify_reg_nonexist(hkey, "Test19e"); + verify_reg_nonexist(hkey, "Test19f"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Alex Henrie : ntdll/tests: Dump entire VM_COUNTERS structure.
by Alexandre Julliard 17 May '17

17 May '17

Module: wine Branch: master Commit: d6dfe19794cc521a8c009c258d3e9591e2fc06e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6dfe19794cc521a8c009c258… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue May 16 20:32:43 2017 -0600 ntdll/tests: Dump entire VM_COUNTERS structure. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index f8759fe..9fda2d5 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1046,6 +1046,22 @@ static void test_query_process_basic(void) ok( pbi.UniqueProcessId > 0, "Expected a ProcessID > 0, got 0\n"); } +static void dump_vm_counters(const char *header, const VM_COUNTERS *pvi) +{ + trace("%s:\n", header); + trace("PeakVirtualSize : %lu\n", pvi->PeakVirtualSize); + trace("VirtualSize : %lu\n", pvi->VirtualSize); + trace("PageFaultCount : %u\n", pvi->PageFaultCount); + trace("PeakWorkingSetSize : %lu\n", pvi->PeakWorkingSetSize); + trace("WorkingSetSize : %lu\n", pvi->WorkingSetSize); + trace("QuotaPeakPagedPoolUsage : %lu\n", pvi->QuotaPeakPagedPoolUsage); + trace("QuotaPagedPoolUsage : %lu\n", pvi->QuotaPagedPoolUsage); + trace("QuotaPeakNonPagePoolUsage : %lu\n", pvi->QuotaPeakNonPagedPoolUsage); + trace("QuotaNonPagePoolUsage : %lu\n", pvi->QuotaNonPagedPoolUsage); + trace("PagefileUsage : %lu\n", pvi->PagefileUsage); + trace("PeakPagefileUsage : %lu\n", pvi->PeakPagefileUsage); +} + static void test_query_process_vm(void) { NTSTATUS status; @@ -1078,7 +1094,7 @@ static void test_query_process_vm(void) ok( ReturnLength == old_size || ReturnLength == sizeof(pvi), "Inconsistent length %d\n", ReturnLength); /* Check if we have some return values */ - trace("WorkingSetSize : %ld\n", pvi.WorkingSetSize); + dump_vm_counters("VM counters for GetCurrentProcess", &pvi); ok( pvi.WorkingSetSize > 0, "Expected a WorkingSetSize > 0\n"); process = OpenProcess(PROCESS_VM_READ, FALSE, GetCurrentProcessId()); @@ -1097,7 +1113,7 @@ static void test_query_process_vm(void) ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); /* Check if we have some return values */ - trace("WorkingSetSize : %ld\n", pvi.WorkingSetSize); + dump_vm_counters("VM counters for GetCurrentProcessId", &pvi); ok( pvi.WorkingSetSize > 0, "Expected a WorkingSetSize > 0\n"); CloseHandle(process);

1 0

Akihiro Sagawa : xcopy: Avoid using isdigit() for WCHARs.
by Alexandre Julliard 17 May '17

17 May '17

Module: wine Branch: master Commit: 373604f2534adba65f75387c4f8b55053341d86f URL: http://source.winehq.org/git/wine.git/?a=commit;h=373604f2534adba65f75387c4… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 17 21:35:52 2017 +0900 xcopy: Avoid using isdigit() 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/xcopy/xcopy.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 486e5b1..5c2f7ca 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -643,7 +643,7 @@ cleanup: /* ========================================================================= XCOPY_ParseCommandLine - Parses the command line ========================================================================= */ -static BOOL is_whitespace(WCHAR c) +static inline BOOL is_whitespace(WCHAR c) { return c == ' ' || c == '\t'; } @@ -654,6 +654,11 @@ static WCHAR *skip_whitespace(WCHAR *p) return p; } +static inline BOOL is_digit(WCHAR c) +{ + return c >= '0' && c <= '9'; +} + /* Windows XCOPY uses a simplified command line parsing algorithm that lacks the escaped-quote logic of build_argv(), because literal double quotes are illegal in any of its arguments. @@ -770,7 +775,7 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, break; /* D can be /D or /D: */ - case 'D': if (word[2]==':' && isdigit(word[3])) { + case 'D': if (word[2]==':' && is_digit(word[3])) { SYSTEMTIME st; WCHAR *pos = &word[3]; BOOL isError = FALSE; @@ -781,18 +786,18 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, * It is hardcoded to month-day-year. */ st.wMonth = _wtol(pos); - while (*pos && isdigit(*pos)) pos++; + while (*pos && is_digit(*pos)) pos++; if (*pos++ != '-') isError = TRUE; if (!isError) { st.wDay = _wtol(pos); - while (*pos && isdigit(*pos)) pos++; + while (*pos && is_digit(*pos)) pos++; if (*pos++ != '-') isError = TRUE; } if (!isError) { st.wYear = _wtol(pos); - while (*pos && isdigit(*pos)) pos++; + while (*pos && is_digit(*pos)) pos++; if (st.wYear < 100) st.wYear+=2000; }

1 0

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

17 May '17

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

Hugh McMaster : regedit/tests: Add tests for key name and value name concatenation.
by Alexandre Julliard 17 May '17

17 May '17

Module: wine Branch: master Commit: a0f5a2cc12e5c009c5e544f918f3146f3965bdf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0f5a2cc12e5c009c5e544f91… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 17 12:23:19 2017 +0000 regedit/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/regedit/tests/regedit.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index b060e92..b49ef05 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -403,7 +403,7 @@ static void test_basic_import_31(void) static void test_invalid_import(void) { LONG lr; - HKEY hkey; + HKEY hkey, subkey; lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); @@ -574,6 +574,30 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Test16c"); verify_reg_nonexist(hkey, "Test16d"); + /* Test key name and value name concatenation */ + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\\n" + "Subkey1]\n"); + lr = RegOpenKeyExA(hkey, "Subkey1", 0, KEY_READ, &subkey); + ok(lr == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", lr); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\n" + "\\Subkey2]\n"); + lr = RegOpenKeyExA(hkey, "Subkey2", 0, KEY_READ, &subkey); + ok(lr == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", lr); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test\\\n" + "17a\"=\"Value 1\"\n" + "\"Test17b\"=\"Value 2\"\n" + "\"Test\n" + "\\17c\"=\"Value 3\"\n\n"); + todo_wine verify_reg_nonexist(hkey, "Test17a"); + verify_reg(hkey, "Test17b", REG_SZ, "Value 2", 8, 0); + verify_reg_nonexist(hkey, "Test17c"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0