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

Alexandre Julliard : wineconsole: Remove duplicate line feeds.
by Alexandre Julliard May 17, 2017

May 17, 2017

Module: wine Branch: master Commit: 03e438dbf5e8f1ac9da5bf31ff3a356ff9acf899 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03e438dbf5e8f1ac9da5bf31f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 17 22:20:51 2017 +0200 wineconsole: Remove duplicate line feeds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/user.c | 2 +- programs/wineconsole/wineconsole.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index fe1cf46..03d0ea1 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -559,7 +559,7 @@ static void WCUSER_SetFontPmt(struct inner_data* data, const WCHAR* font, EnumFontFamiliesW(PRIVATE(data)->hMemDC, NULL, get_first_font_enum, (LPARAM)&fc); if (fc.done) return; } - WINECON_Fatal("Couldn't find a decent font, aborting\n"); + WINECON_Fatal("Couldn't find a decent font, aborting"); } /****************************************************************** diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index d1d38be..9e3afb1 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -340,7 +340,7 @@ void WINECON_GrabChanges(struct inner_data* data) data->cells = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, data->cells, data->curcfg.sb_width * data->curcfg.sb_height * sizeof(CHAR_INFO)); - if (!data->cells) WINECON_Fatal("OOM\n"); + if (!data->cells) WINECON_Fatal("OOM"); data->fnResizeScreenBuffer(data); data->fnComputePositions(data); }

1 0

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

May 17, 2017

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

Hugh McMaster : regedit/tests: Test whether blank lines affect multi-line concatenation.
by Alexandre Julliard May 17, 2017

May 17, 2017

Module: wine Branch: master Commit: 00a65cd507edca7a0c5bd77d3936d13cb3e2b972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00a65cd507edca7a0c5bd77d3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 17 12:23:48 2017 +0000 regedit/tests: Test whether blank lines affect multi-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 db388b7..b49d9ea 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -771,6 +771,15 @@ static void test_comments(void) " 65,6e,61,74,69,6f,6e,00,00\n\n"); verify_reg_nonexist(hkey, "Multi-Line5"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line6\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,\\;comment\n" + " 63,61,74,\\\n\n" + " 65,6e,\\;comment\n\n" + " 61,74,69,6f,6e,00,00\n\n"); + todo_wine verify_reg(hkey, "Multi-Line6", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

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

May 17, 2017

Module: wine Branch: master Commit: 5aea192a5a0b23ec355d792f0107e95fb92bf564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aea192a5a0b23ec355d792f0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 17 12:24:09 2017 +0000 regedit/tests: Add tests for importing REG_EXPAND_SZ 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 | 62 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 3 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index b42f50e..d75a131 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -168,7 +168,7 @@ static void r_verify_reg_nonexist(unsigned line, HKEY key, const char *value_nam static void test_basic_import(void) { HKEY hkey, subkey; - DWORD dword = 0x17; + DWORD dword = 0x17, type, size; char exp_binary[] = {0xAA,0xBB,0xCC,0x11}; WCHAR wide_test[] = {0xFEFF,'W','i','n','d','o','w','s',' ','R','e','g', 'i','s','t','r','y',' ','E','d','i','t','o','r',' ','V','e','r','s', @@ -188,6 +188,7 @@ static void test_basic_import(void) 'l','u','e','"','\r',0}; WCHAR wide_exp[] = {0x3041,'V','a','l','u','e',0}; LONG lr; + char buffer[8]; lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, @@ -317,7 +318,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 */ + /* Test hex data concatenation for REG_NONE and REG_EXPAND_SZ */ 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" @@ -338,6 +339,39 @@ static void test_basic_import(void) 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); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine11a\"=hex(2):25,50,41,54,48,25,00\n" + "\"Wine11b\"=hex(2):25,50,41,\\\n" + " 54,48,25,00\n" + "\"Wine11c\"=hex(2):25,50,41,\\;comment\n" + " 54,48,\\\n" + " 25,00\n" + "\"Wine11d\"=hex(2):25,50,41,\\;comment\n" + " 54,48,\n" + " 25,00\n" + "\"Wine11e\"=hex(2):25,50,41,\\;comment\n" + " 54,48,;comment\n" + " 25,00\n"); + verify_reg(hkey, "Wine11a", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg(hkey, "Wine11b", REG_EXPAND_SZ, "%PATH%", 7, 0); + todo_wine verify_reg(hkey, "Wine11c", REG_EXPAND_SZ, "%PATH%", 7, 0); + /* Wine11d */ + size = sizeof(buffer); + lr = RegQueryValueExA(hkey, "Wine11d", NULL, &type, (BYTE *)&buffer, &size); + todo_wine ok(lr == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", lr); + todo_wine ok(type == REG_EXPAND_SZ, "got wrong type %u, expected %u\n", type, REG_EXPAND_SZ); + 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"); + /* Wine11e */ + size = sizeof(buffer); + memset(buffer, '-', size); + lr = RegQueryValueExA(hkey, "Wine11e", NULL, &type, (BYTE *)&buffer, &size); + todo_wine ok(lr == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", lr); + todo_wine ok(type == REG_EXPAND_SZ, "got wrong type %u, expected %u\n", type, REG_EXPAND_SZ); + 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"); + /* Test import with subkeys */ exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey\"1]\n" @@ -629,7 +663,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 */ + /* Test hex data concatenation for REG_NONE and REG_EXPAND_SZ */ exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test19a\"=hex(0):56,00,61,00,6c,00\\\n" @@ -652,6 +686,28 @@ static void test_invalid_import(void) todo_wine verify_reg_nonexist(hkey, "Test19e"); verify_reg_nonexist(hkey, "Test19f"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test20a\"=hex(2):25,50,41\\\n" + ",54,48,25,00\n" + "\"Test20b\"=hex(2):25,50,41\\\n" + " ,54,48,25,00\n" + "\"Test20c\"=hex(2):25,50,41\\\n" + " 54,48,25,00\n" + "\"Test20d\"=hex(2):25,50,4\\\n" + "1,54,48,25,00\n" + "\"Test20e\"=hex(2):25,50,4\\\n" + " 1,54,48,25,00\n" + "\"Test20f\"=hex(2):25,50,41,\\;comment\n" + " 54,48,\\#comment\n" + " 25,00\n\n"); + todo_wine verify_reg_nonexist(hkey, "Test20a"); + todo_wine verify_reg_nonexist(hkey, "Test20b"); + verify_reg_nonexist(hkey, "Test20c"); + todo_wine verify_reg_nonexist(hkey, "Test20d"); + todo_wine verify_reg_nonexist(hkey, "Test20e"); + verify_reg_nonexist(hkey, "Test20f"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

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

May 17, 2017

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

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

May 17, 2017

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

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

May 17, 2017

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

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

May 17, 2017

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

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

May 17, 2017

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

Akihiro Sagawa : wininet: Use isspaceW() instead of isspace() for WCHARs.
by Alexandre Julliard May 17, 2017

May 17, 2017

Module: wine Branch: master Commit: 05c23c95f83dcf271f13286e4b2ea595bbace2e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05c23c95f83dcf271f13286e4… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 17 21:35:47 2017 +0900 wininet: Use isspaceW() instead of 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> --- dlls/wininet/http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 321d569..2172f5f 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4295,7 +4295,7 @@ static BOOL HTTP_ParseDateAsAsctime(LPCWSTR value, FILETIME *ft) while (isspaceW(*ptr)) ptr++; - for (monthPtr = month; !isspace(*ptr) && + for (monthPtr = month; !isspaceW(*ptr) && monthPtr - month < sizeof(month) / sizeof(month[0]) - 1; monthPtr++, ptr++) *monthPtr = *ptr; @@ -4392,7 +4392,7 @@ static BOOL HTTP_ParseRfc1123Date(LPCWSTR value, FILETIME *ft) while (isspaceW(*ptr)) ptr++; - for (monthPtr = month; !isspace(*ptr) && + for (monthPtr = month; !isspaceW(*ptr) && monthPtr - month < sizeof(month) / sizeof(month[0]) - 1; monthPtr++, ptr++) *monthPtr = *ptr;

1 0