December 2016 - Wine-Commits

Julian Rüger : German translation for release 1.9.22
by Jeremy Newman Dec. 8, 2016

Dec. 8, 2016

Module: website Branch: master Commit: 3ff05e9fdcbf5ac270b46463b249c7f9a919c9d5 URL: http://source.winehq.org/git/website.git/?a=commit;h=3ff05e9fdcbf5ac270b464… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Dec 8 15:55:41 2016 +0100 German translation for release 1.9.22 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016102801.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2016102801.xml b/news/de/2016102801.xml new file mode 100644 index 0000000..e0d57c0 --- /dev/null +++ b/news/de/2016102801.xml @@ -0,0 +1,16 @@ +<news> +<date>28. Oktober 2016</date> +<title>Wine 1.9.22 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.22 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.22">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Clipboard-Unterstützung unter MacOS an das neue Design angepasst.</li> + <li>Erste Implementierung von Bitmap-Rendering in Direct2D.</li> + <li>Weitere Implementierung von WebServices.</li> + <li>Weitere Fortschritte in Richtung HID-Unterstützung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.22.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Aric Stewart : hid: Initialize outgoing usages in HidP_GetUsages.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: 78a547a11ce0b15e8dde7b1b50900c36c2adf1ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=78a547a11ce0b15e8dde7b1b5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 7 08:32:20 2016 -0600 hid: Initialize outgoing usages in HidP_GetUsages. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index cac9d4e..56616b4 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -278,6 +278,8 @@ NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USH TRACE("(%i, %x, %i, %p, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, UsageList, UsageLength, PreparsedData, Report, ReportLength); + *UsageLength = 0; + if (data->magic != HID_MAGIC) return HIDP_STATUS_INVALID_PREPARSED_DATA;

1 0

Bruno Jesus : xinput1_3/tests: Explain an important test and fix remaining style issues.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: 547d9491af58a8626fafb18da9e4942911bf9155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=547d9491af58a8626fafb18da… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Dec 6 12:52:34 2016 -0200 xinput1_3/tests: Explain an important test and fix remaining style issues. It's important to explain why the test is done like that so in the future nobody changes it without knowing the impacts. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/xinput.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index f08acff..eb0bab3 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -50,7 +50,7 @@ static void test_set_state(void) DWORD controllerNum; DWORD result; - for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + for(controllerNum = 0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { ZeroMemory(&vibrator, sizeof(XINPUT_VIBRATION)); @@ -59,6 +59,9 @@ static void test_set_state(void) result = pXInputSetState(controllerNum, &vibrator); ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputSetState failed with (%d)\n", result); + /* Disabling XInput here, queueing a vibration and then re-enabling XInput + * is used to prove that vibrations are auto enabled when resuming XInput. + * If XInputEnable is removed the vibration will never play. */ if (pXInputEnable) pXInputEnable(0); vibrator.wLeftMotorSpeed = 65535; @@ -133,7 +136,7 @@ static void test_get_keystroke(void) DWORD controllerNum; DWORD result; - for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + for(controllerNum = 0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { ZeroMemory(&keystroke, sizeof(XINPUT_KEYSTROKE)); @@ -158,7 +161,7 @@ static void test_get_capabilities(void) DWORD controllerNum; DWORD result; - for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + for(controllerNum = 0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { ZeroMemory(&capabilities, sizeof(XINPUT_CAPABILITIES)); @@ -188,7 +191,7 @@ static void test_get_dsoundaudiodevice(void) GUID testGuid = {0xFFFFFFFF, 0xFFFF, 0xFFFF, {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}}; GUID emptyGuid = {0x0, 0x0, 0x0, {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0}}; - for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + for(controllerNum = 0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { soundRender = soundCapture = testGuid; result = pXInputGetDSoundAudioDeviceGuids(controllerNum, &soundRender, &soundCapture); @@ -221,7 +224,7 @@ static void test_get_batteryinformation(void) DWORD result; XINPUT_BATTERY_INFORMATION batteryInfo; - for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + for(controllerNum = 0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { ZeroMemory(&batteryInfo, sizeof(XINPUT_BATTERY_INFORMATION));

1 0

Aric Stewart : hidclass.sys: Some descriptor values should be unsigned.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: b5646efe398712e0295e85ec1173822d678521b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5646efe398712e0295e85ec1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Dec 6 13:11:49 2016 -0600 hidclass.sys: Some descriptor values should be unsigned. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 44 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 9805511..c20e51d 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -383,7 +383,7 @@ static void debug_print_preparsed(WINE_HIDP_PREPARSED_DATA *data) } } -static int getValue(int bsize, int source) +static int getValue(int bsize, int source, BOOL allow_negative) { int mask = 0xff; int negative = 0x80; @@ -401,7 +401,7 @@ static int getValue(int bsize, int source) outofrange = (outofrange<<8); } value = (source&mask); - if (value&negative) + if (allow_negative && value&negative) value = -1 * (outofrange - value); return value; } @@ -566,34 +566,34 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l switch(bTag) { case TAG_GLOBAL_USAGE_PAGE: - caps->UsagePage = getValue(bSize, itemVal); + caps->UsagePage = getValue(bSize, itemVal, FALSE); break; case TAG_GLOBAL_LOGICAL_MINIMUM: - caps->LogicalMin = getValue(bSize, itemVal); + caps->LogicalMin = getValue(bSize, itemVal, TRUE); break; case TAG_GLOBAL_LOGICAL_MAXIMUM: - caps->LogicalMax = getValue(bSize, itemVal); + caps->LogicalMax = getValue(bSize, itemVal, TRUE); break; case TAG_GLOBAL_PHYSICAL_MINIMUM: - caps->PhysicalMin = getValue(bSize, itemVal); + caps->PhysicalMin = getValue(bSize, itemVal, TRUE); break; case TAG_GLOBAL_PHYSICAL_MAXIMUM: - caps->PhysicalMax = getValue(bSize, itemVal); + caps->PhysicalMax = getValue(bSize, itemVal, TRUE); break; case TAG_GLOBAL_UNIT_EXPONENT: - caps->UnitsExp = getValue(bSize, itemVal); + caps->UnitsExp = getValue(bSize, itemVal, TRUE); break; case TAG_GLOBAL_UNIT: - caps->Units = getValue(bSize, itemVal); + caps->Units = getValue(bSize, itemVal, TRUE); break; case TAG_GLOBAL_REPORT_SIZE: - caps->BitSize = getValue(bSize, itemVal); + caps->BitSize = getValue(bSize, itemVal, FALSE); break; case TAG_GLOBAL_REPORT_ID: - caps->ReportID = getValue(bSize, itemVal); + caps->ReportID = getValue(bSize, itemVal, FALSE); break; case TAG_GLOBAL_REPORT_COUNT: - caps->ReportCount = getValue(bSize, itemVal); + caps->ReportCount = getValue(bSize, itemVal, FALSE); break; case TAG_GLOBAL_PUSH: { @@ -633,46 +633,46 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l FIXME("More than %i individual usages defined\n",USAGE_MAX); else { - caps->u.NotRange.Usage[caps->usage_count++] = getValue(bSize, itemVal); + caps->u.NotRange.Usage[caps->usage_count++] = getValue(bSize, itemVal, FALSE); caps->IsRange = FALSE; } break; case TAG_LOCAL_USAGE_MINIMUM: caps->usage_count = 1; - caps->u.Range.UsageMin = getValue(bSize, itemVal); + caps->u.Range.UsageMin = getValue(bSize, itemVal, FALSE); caps->IsRange = TRUE; break; case TAG_LOCAL_USAGE_MAXIMUM: caps->usage_count = 1; - caps->u.Range.UsageMax = getValue(bSize, itemVal); + caps->u.Range.UsageMax = getValue(bSize, itemVal, FALSE); caps->IsRange = TRUE; break; case TAG_LOCAL_DESIGNATOR_INDEX: - caps->u.NotRange.DesignatorIndex = getValue(bSize, itemVal); + caps->u.NotRange.DesignatorIndex = getValue(bSize, itemVal, FALSE); caps->IsDesignatorRange = FALSE; break; case TAG_LOCAL_DESIGNATOR_MINIMUM: - caps->u.Range.DesignatorMin = getValue(bSize, itemVal); + caps->u.Range.DesignatorMin = getValue(bSize, itemVal, FALSE); caps->IsDesignatorRange = TRUE; break; case TAG_LOCAL_DESIGNATOR_MAXIMUM: - caps->u.Range.DesignatorMax = getValue(bSize, itemVal); + caps->u.Range.DesignatorMax = getValue(bSize, itemVal, FALSE); caps->IsDesignatorRange = TRUE; break; case TAG_LOCAL_STRING_INDEX: - caps->u.NotRange.StringIndex = getValue(bSize, itemVal); + caps->u.NotRange.StringIndex = getValue(bSize, itemVal, FALSE); caps->IsStringRange = FALSE; break; case TAG_LOCAL_STRING_MINIMUM: - caps->u.Range.StringMin = getValue(bSize, itemVal); + caps->u.Range.StringMin = getValue(bSize, itemVal, FALSE); caps->IsStringRange = TRUE; break; case TAG_LOCAL_STRING_MAXIMUM: - caps->u.Range.StringMax = getValue(bSize, itemVal); + caps->u.Range.StringMax = getValue(bSize, itemVal, FALSE); caps->IsStringRange = TRUE; break; case TAG_LOCAL_DELIMITER: - caps->Delim = getValue(bSize, itemVal); + caps->Delim = getValue(bSize, itemVal, FALSE); break; default: ERR("Unknown (bTag: 0x%x, bType: 0x%x)\n", bTag, bType);

1 0

Bruno Jesus : explorer: Ensure launchers_per_row is at least 1 as it is used in divisions.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: 3eaf58614921cafd5e1413d1bec388ae57d25183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eaf58614921cafd5e1413d1b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Dec 6 21:32:27 2016 -0200 explorer: Ensure launchers_per_row is at least 1 as it is used in divisions. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/desktop.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index d306bb9..7a8252f 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -555,6 +555,7 @@ static void initialize_launchers( HWND hwnd ) title_offset_cy = BORDER_SIZE + icon_size + PADDING_SIZE; desktop_width = GetSystemMetrics( SM_CXSCREEN ); launchers_per_row = desktop_width / launcher_size; + if (!launchers_per_row) launchers_per_row = 1; hr = SHGetKnownFolderPath( &FOLDERID_Desktop, KF_FLAG_CREATE, NULL, &desktop_folder ); if (FAILED( hr ))

1 0

Hugh McMaster : reg/tests: Add Unicode tests for comment parsing.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: 896c5205d96c7f4b62e507ebeb974cd7d5f372e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=896c5205d96c7f4b62e507ebe… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Dec 7 08:48:22 2016 +0000 reg/tests: Add Unicode tests for comment parsing. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index b9d446d..f19f6f7 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1246,6 +1246,82 @@ static void test_import(void) todo_wine verify_reg(hkey, "Wine8", REG_SZ, "Line 1", 7, 0); todo_wine verify_reg(hkey, "Wine9", REG_SZ, "Line 2", 7, 0); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine10\"=\"Value 1\"#comment\n" + "\"Wine11\"=\"Value 2\";comment\n" + "\"Wine12\"=dword:01020304 #comment\n" + "\"Wine13\"=dword:02040608 ;comment\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine10"); + todo_wine verify_reg(hkey, "Wine11", REG_SZ, "Value 2", 8, 0); + todo_wine verify_reg_nonexist(hkey, "Wine12"); + dword = 0x2040608; + todo_wine verify_reg(hkey, "Wine13", REG_DWORD, &dword, sizeof(dword), 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine14\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,63,00,6f,00,6e,00,63,00,\\\n" + " #comment\n" + " 61,00,74,00,65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n" + "\"Wine15\"=\"A valid line\"\n" + "\"Wine16\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,63,00,6f,00,6e,00,63,00,\\\n" + " ;comment\n" + " 61,00,74,00,65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n" + "\"Wine17\"=\"Another valid line\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine14"); + todo_wine verify_reg(hkey, "Wine15", REG_SZ, "A valid line", 13, 0); + todo_wine verify_reg(hkey, "Wine16", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + todo_wine verify_reg(hkey, "Wine17", REG_SZ, "Another valid line", 19, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "#\"Comment1\"=\"Value 1\"\n" + ";\"Comment2\"=\"Value 2\"\n" + " #\"Comment3\"=\"Value 3\"\n" + " ;\"Comment4\"=\"Value 4\"\n" + "\"Wine18\"=\"Value 6\"#\"Comment5\"=\"Value 5\"\n" + "\"Wine19\"=\"Value 7\";\"Comment6\"=\"Value 6\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Comment1"); + todo_wine verify_reg_nonexist(hkey, "Comment2"); + todo_wine verify_reg_nonexist(hkey, "Comment3"); + todo_wine verify_reg_nonexist(hkey, "Comment4"); + todo_wine verify_reg_nonexist(hkey, "Wine18"); + todo_wine verify_reg_nonexist(hkey, "Comment5"); + todo_wine verify_reg(hkey, "Wine19", REG_SZ, "Value 7", 8, TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg_nonexist(hkey, "Comment6"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine20\"=#\"Value 8\"\n" + "\"Wine21\"=;\"Value 9\"\n" + "\"Wine22\"=\"#comment1\"\n" + "\"Wine23\"=\";comment2\"\n" + "\"Wine24\"=\"Value#comment3\"\n" + "\"Wine25\"=\"Value;comment4\"\n" + "\"Wine26\"=\"Value #comment5\"\n" + "\"Wine27\"=\"Value ;comment6\"\n" + "\"Wine28\"=#dword:00000001\n" + "\"Wine29\"=;dword:00000002\n" + "\"Wine30\"=dword:00000003#comment\n" + "\"Wine31\"=dword:00000004;comment\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine20"); + todo_wine verify_reg_nonexist(hkey, "Wine21"); + todo_wine verify_reg(hkey, "Wine22", REG_SZ, "#comment1", 10, 0); + todo_wine verify_reg(hkey, "Wine23", REG_SZ, ";comment2", 10, 0); + todo_wine verify_reg(hkey, "Wine24", REG_SZ, "Value#comment3", 15, 0); + todo_wine verify_reg(hkey, "Wine25", REG_SZ, "Value;comment4", 15, 0); + todo_wine verify_reg(hkey, "Wine26", REG_SZ, "Value #comment5", 16, 0); + todo_wine verify_reg(hkey, "Wine27", REG_SZ, "Value ;comment6", 16, 0); + todo_wine verify_reg_nonexist(hkey, "Wine28"); + todo_wine verify_reg_nonexist(hkey, "Wine29"); + todo_wine verify_reg_nonexist(hkey, "Wine30"); + dword = 0x00000004; + todo_wine verify_reg(hkey, "Wine31", REG_DWORD, &dword, sizeof(dword), 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : reg/tests: Add tests for parsing comments.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: 0a827326b03c87d3542528cc3c70b1ee178c9c3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a827326b03c87d3542528cc3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Dec 7 08:48:10 2016 +0000 reg/tests: Add tests for parsing comments. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index cbd4149..b9d446d 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -988,6 +988,82 @@ static void test_import(void) todo_wine verify_reg(hkey, "Wine8", REG_SZ, "Line 1", 7, 0); todo_wine verify_reg(hkey, "Wine9", REG_SZ, "Line 2", 7, 0); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine10\"=\"Value 1\"#comment\n" + "\"Wine11\"=\"Value 2\";comment\n" + "\"Wine12\"=dword:01020304 #comment\n" + "\"Wine13\"=dword:02040608 ;comment\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine10"); + todo_wine verify_reg(hkey, "Wine11", REG_SZ, "Value 2", 8, 0); + todo_wine verify_reg_nonexist(hkey, "Wine12"); + dword = 0x2040608; + todo_wine verify_reg(hkey, "Wine13", REG_DWORD, &dword, sizeof(dword), 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine14\"=hex(7):4c,69,6e,65,20,\\\n" + " #comment\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine15\"=\"A valid line\"\n" + "\"Wine16\"=hex(7):4c,69,6e,65,20,\\\n" + " ;comment\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine17\"=\"Another valid line\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine14"); + todo_wine verify_reg(hkey, "Wine15", REG_SZ, "A valid line", 13, 0); + todo_wine verify_reg(hkey, "Wine16", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + todo_wine verify_reg(hkey, "Wine17", REG_SZ, "Another valid line", 19, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "#\"Comment1\"=\"Value 1\"\n" + ";\"Comment2\"=\"Value 2\"\n" + " #\"Comment3\"=\"Value 3\"\n" + " ;\"Comment4\"=\"Value 4\"\n" + "\"Wine18\"=\"Value 6\"#\"Comment5\"=\"Value 5\"\n" + "\"Wine19\"=\"Value 7\";\"Comment6\"=\"Value 6\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Comment1"); + todo_wine verify_reg_nonexist(hkey, "Comment2"); + todo_wine verify_reg_nonexist(hkey, "Comment3"); + todo_wine verify_reg_nonexist(hkey, "Comment4"); + todo_wine verify_reg_nonexist(hkey, "Wine18"); + todo_wine verify_reg_nonexist(hkey, "Comment5"); + todo_wine verify_reg(hkey, "Wine19", REG_SZ, "Value 7", 8, TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg_nonexist(hkey, "Comment6"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine20\"=#\"Value 8\"\n" + "\"Wine21\"=;\"Value 9\"\n" + "\"Wine22\"=\"#comment1\"\n" + "\"Wine23\"=\";comment2\"\n" + "\"Wine24\"=\"Value#comment3\"\n" + "\"Wine25\"=\"Value;comment4\"\n" + "\"Wine26\"=\"Value #comment5\"\n" + "\"Wine27\"=\"Value ;comment6\"\n" + "\"Wine28\"=#dword:00000001\n" + "\"Wine29\"=;dword:00000002\n" + "\"Wine30\"=dword:00000003#comment\n" + "\"Wine31\"=dword:00000004;comment\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine20"); + todo_wine verify_reg_nonexist(hkey, "Wine21"); + todo_wine verify_reg(hkey, "Wine22", REG_SZ, "#comment1", 10, 0); + todo_wine verify_reg(hkey, "Wine23", REG_SZ, ";comment2", 10, 0); + todo_wine verify_reg(hkey, "Wine24", REG_SZ, "Value#comment3", 15, 0); + todo_wine verify_reg(hkey, "Wine25", REG_SZ, "Value;comment4", 15, 0); + todo_wine verify_reg(hkey, "Wine26", REG_SZ, "Value #comment5", 16, 0); + todo_wine verify_reg(hkey, "Wine27", REG_SZ, "Value ;comment6", 16, 0); + todo_wine verify_reg_nonexist(hkey, "Wine28"); + todo_wine verify_reg_nonexist(hkey, "Wine29"); + todo_wine verify_reg_nonexist(hkey, "Wine30"); + dword = 0x00000004; + todo_wine verify_reg(hkey, "Wine31", REG_DWORD, &dword, sizeof(dword), 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Nikolay Sivov : scrrun: Added IProvideClassInfo support for filesystem objects.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: eda5d61c543522c637682a40bb461fab44c9c0ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=eda5d61c543522c637682a40b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 7 13:33:59 2016 +0300 scrrun: Added IProvideClassInfo support for filesystem objects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/filesystem.c | 110 ++++++++++++++++++++++++++++++++--------- dlls/scrrun/tests/filesystem.c | 36 ++++++++++++++ 2 files changed, 122 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eda5d61c543522c637682…

1 0

Nikolay Sivov : dwrite: Use system default locale when filling LOGFONT.lfFaceName.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: bf23b8a529f5081a278c7beffc92648d6b63c87b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf23b8a529f5081a278c7beff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 7 16:46:38 2016 +0300 dwrite: Use system default locale when filling LOGFONT.lfFaceName. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 2 +- dlls/dwrite/tests/font.c | 2 +- include/winnls.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 4a6d62c..c666275 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1645,7 +1645,7 @@ HRESULT opentype_get_font_facename(struct file_stream_desc *stream_desc, WCHAR * BOOL exists; exists = FALSE; - if (GetUserDefaultLocaleName(localeW, sizeof(localeW)/sizeof(WCHAR))) + if (GetSystemDefaultLocaleName(localeW, sizeof(localeW)/sizeof(WCHAR))) IDWriteLocalizedStrings_FindLocaleName(lfnames, localeW, &index, &exists); if (!exists) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 987eac9..ce4145e 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3544,7 +3544,7 @@ static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont) /* Fallback to en-us if there's no string for user locale. */ exists = FALSE; - if (GetUserDefaultLocaleName(localeW, sizeof(localeW)/sizeof(WCHAR))) + if (GetSystemDefaultLocaleName(localeW, sizeof(localeW)/sizeof(WCHAR))) IDWriteLocalizedStrings_FindLocaleName(names, localeW, &index, &exists); if (!exists) diff --git a/include/winnls.h b/include/winnls.h index 35521fd..96f60de 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -915,6 +915,7 @@ WINBASEAPI BOOL WINAPI GetStringTypeExA(LCID,DWORD,LPCSTR,INT,LPWORD); WINBASEAPI BOOL WINAPI GetStringTypeExW(LCID,DWORD,LPCWSTR,INT,LPWORD); #define GetStringTypeEx WINELIB_NAME_AW(GetStringTypeEx) WINBASEAPI LANGID WINAPI GetSystemDefaultLangID(void); +WINBASEAPI INT WINAPI GetSystemDefaultLocaleName(LPWSTR,int); WINBASEAPI LCID WINAPI GetSystemDefaultLCID(void); WINBASEAPI LANGID WINAPI GetSystemDefaultUILanguage(void); WINBASEAPI BOOL WINAPI GetSystemPreferredUILanguages(DWORD,ULONG*,WCHAR*,ULONG*);

1 0

Bruno Jesus : xinput1_3/tests: Test the GUIDs returned from XInputGetDSoundAudioDeviceGuids.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: ea4edbe1799ef1a4ebb416cf2fed392e4196880d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea4edbe1799ef1a4ebb416cf2… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Dec 6 12:52:32 2016 -0200 xinput1_3/tests: Test the GUIDs returned from XInputGetDSoundAudioDeviceGuids. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/xinput.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index 17884e1..25126be 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -175,18 +175,31 @@ static void test_get_dsoundaudiodevice(void) { DWORD controllerNum; DWORD result; - GUID soundRender; - GUID soundCapture; + GUID soundRender, soundCapture; + GUID testGuid = {0xFFFFFFFF, 0xFFFF, 0xFFFF, {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}}; + GUID emptyGuid = {0x0, 0x0, 0x0, {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0}}; for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { + soundRender = soundCapture = testGuid; result = pXInputGetDSoundAudioDeviceGuids(controllerNum, &soundRender, &soundCapture); ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputGetDSoundAudioDeviceGuids failed with (%d)\n", result); if (ERROR_DEVICE_NOT_CONNECTED == result) { skip("Controller %d is not connected\n", controllerNum); + continue; } + + if (!IsEqualGUID(&soundRender, &emptyGuid)) + ok(!IsEqualGUID(&soundRender, &testGuid), "Broken GUID returned for sound render device\n"); + else + trace("Headset phone not attached\n"); + + if (!IsEqualGUID(&soundCapture, &emptyGuid)) + ok(!IsEqualGUID(&soundCapture, &testGuid), "Broken GUID returned for sound capture device\n"); + else + trace("Headset microphone not attached\n"); } result = pXInputGetDSoundAudioDeviceGuids(XUSER_MAX_COUNT+1, &soundRender, &soundCapture);

1 0