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

Rosanne DiMesio : Improve maintainerView
by Jeremy Newman 19 May '17

19 May '17

Module: appdb Branch: master Commit: 9182149367270c198deddae128cd9302d1bbdfb6 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9182149367270c198deddae1… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Fri May 19 13:10:34 2017 -0500 Improve maintainerView The table (available only to admins) now displays entries sorted by maintainer name rather than userid and adds columns for the maintainer's login id and last time connected. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/maintainerView.php | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/include/maintainerView.php b/include/maintainerView.php index 7fe1462..8c88c3d 100644 --- a/include/maintainerView.php +++ b/include/maintainerView.php @@ -42,12 +42,14 @@ class maintainerView public function objectGetHeader() { $oTableRow = new TableRow(); - $oTableRow->AddTextCell('Submission date'); $oTableRow->AddTextCell('Maintainer'); + $oTableRow->AddTextCell('Login'); + $oTableRow->AddTextCell('Submission date'); + $oTableRow->AddTextCell('Last connected'); $oTableRow->AddTextCell('Application'); $oTableRow->AddTextCell('Version'); $oTableRow->AddTextCell('Action'); - $oTableRow->SetClass('color4'); + $oTableRow->SetClass('color3'); $oTableRow->SetStyle('color: white;'); return $oTableRow; @@ -87,6 +89,7 @@ class maintainerView $oTable->SetCellPadding(3); $oTable->SetCellSpacing(0); + $oTable->SetWidth('100%'); $oHeader = $this->objectGetHeader(); $oTable->AddRow($oHeader); @@ -106,8 +109,16 @@ class maintainerView $oCell->SetStyle($sStyle.' border-left: thin solid;'); $oTableRow->AddCell($oCell); - $oCell = new TableCell($oUser->objectMakeLink()); - $oCell->SetStyle($sStyle); + $oCell = new TableCell(''); + $oCell->SetStyle($sStyle.' border-left: thin solid;'); + $oTableRow->AddCell($oCell); + + $oCell = new TableCell(''); + $oCell->SetStyle($sStyle.' border-left: thin solid;'); + $oTableRow->AddCell($oCell); + + $oCell = new TableCell(''); + $oCell->SetStyle($sStyle.' border-left: thin solid;'); $oTableRow->AddCell($oCell); $iMaintainedApps = maintainer::GetMaintainerCountForUserId($iUserId, true); @@ -128,8 +139,8 @@ class maintainerView $oTableRow->SetClass('color4'); $oTable->AddRow($oTableRow); - - /* Show all apps/versions that the user maintainers */ + + /* Show all apps/versions that the user maintains */ $hAppResult = query_parameters("SELECT * FROM appMaintainers WHERE userId = '?'", $oMaintainerView->iUserId); for($i = 0; $oAppRow = query_fetch_object($hAppResult); $i++) { @@ -149,19 +160,22 @@ class maintainerView $sVersionText = $oVersion->sName; } - $oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($oMaintainer->aSubmitTime))); $oTableRow->AddTextCell($oUser->objectMakeLink()); + $oTableRow->AddTextCell($oUser->sEmail); + $oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($oMaintainer->aSubmitTime))); + $oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($oUser->sStamp))); $oTableRow->AddTextCell($oApp->objectMakeLink()); $oTableRow->AddTextCelL($sVersionText); - $oTableRow->AddTextCell('[<a href="'.$oNewOM->makeUrl('delete', $oMaintainer->objectGetId()).'">delete</a>]'); + $oTableRow->AddTextCell('<a href="'.$oNewOM->makeUrl('delete', $oMaintainer->objectGetId()).' + "class="btn btn-default btn-sm"><i class="fa fa-trash"></i> delete</a>'); $oTable->AddRow($oTableRow); } } - echo $oTable->GetString(); - } + echo $oTable->GetString(); + } function objectGetItemsPerPage($sState = 'accepted') { @@ -177,8 +191,10 @@ class maintainerView $sLimit = objectManager::getSqlLimitClause($iRows, $iStart, 'maintainerView'); - $sQuery = "SELECT DISTINCT(userId) FROM appMaintainers WHERE state = '?'$sLimit"; - $hResult = query_parameters($sQuery, $sState); + // get available maintainers + $sQuery = "SELECT * FROM appMaintainers, user_list WHERE appMaintainers.userId = user_list.userid"; + $sQuery.= " AND state='accepted' GROUP BY appMaintainers.userid ORDER BY realname, email;"; + $hResult = query_parameters($sQuery); return $hResult; }

1 0

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

18 May '17

Module: wine Branch: master Commit: 9cd75938b4db18cf8133b9edf13e393ad3cbfa17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cd75938b4db18cf8133b9edf… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 17 08:13:31 2017 +0000 reg/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/reg/tests/reg.c | 119 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 113 insertions(+), 6 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index abccc6d..cc648ca 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -770,10 +770,9 @@ static BOOL test_import_wstr_(unsigned line, const char *file_contents, DWORD *r static void test_import(void) { - DWORD r, dword = 0x123; - char test1_reg[MAX_PATH], test2_reg[MAX_PATH]; - char cmdline[MAX_PATH]; - char test_string[] = "Test string"; + DWORD r, dword = 0x123, type, size; + char test1_reg[MAX_PATH], test2_reg[MAX_PATH], cmdline[MAX_PATH]; + char test_string[] = "Test string", buffer[8]; HKEY hkey, subkey; LONG err; @@ -1428,7 +1427,7 @@ 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 hex data concatenation for REG_NONE and REG_EXPAND_SZ */ 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" @@ -1469,6 +1468,60 @@ static void test_import(void) 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_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine44a\"=hex(2):25,50,41,54,48,25,00\n" + "\"Wine44b\"=hex(2):25,50,41,\\\n" + " 54,48,25,00\n" + "\"Wine44c\"=hex(2):25,50,41\\\n" + ",54,48,25,00\n" + "\"Wine44d\"=hex(2):25,50,41\\\n" + " ,54,48,25,00\n" + "\"Wine44e\"=hex(2):25,50,41\\\n" + " 54,48,25,00\n" + "\"Wine44f\"=hex(2):25,50,4\\\n" + "1,54,48,25,00\n" + "\"Wine44g\"=hex(2):25,50,4\\\n" + " 1,54,48,25,00\n" + "\"Wine44h\"=hex(2):25,50,41,\\;comment\n" + " 54,48,\\\n" + " 25,00\n" + "\"Wine44i\"=hex(2):25,50,41,\\;comment\n" + " 54,48,\n" + " 25,00\n" + "\"Wine44j\"=hex(2):25,50,41,\\;comment\n" + " 54,48,;comment\n" + " 25,00\n" + "\"Wine44k\"=hex(2):25,50,41,\\;comment\n" + " 54,48,\\#comment\n" + " 25,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine44a", REG_EXPAND_SZ, "%PATH%", 7, 0); + todo_wine verify_reg(hkey, "Wine44b", REG_EXPAND_SZ, "%PATH%", 7, 0); + todo_wine verify_reg_nonexist(hkey, "Wine44c"); + todo_wine verify_reg_nonexist(hkey, "Wine44d"); + todo_wine verify_reg_nonexist(hkey, "Wine44e"); + todo_wine verify_reg_nonexist(hkey, "Wine44f"); + todo_wine verify_reg_nonexist(hkey, "Wine44g"); + todo_wine verify_reg(hkey, "Wine44h", REG_EXPAND_SZ, "%PATH%", 7, 0); + /* Wine44i */ + size = sizeof(buffer); + err = RegQueryValueExA(hkey, "Wine44i", NULL, &type, (BYTE *)&buffer, &size); + todo_wine ok(err == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", err); + 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"); + /* Wine44j */ + size = sizeof(buffer); + memset(buffer, '-', size); + err = RegQueryValueExA(hkey, "Wine44j", NULL, &type, (BYTE *)&buffer, &size); + todo_wine ok(err == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", err); + 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"); + /* Wine44k */ + todo_wine verify_reg_nonexist(hkey, "Wine44k"); + /* Test import with subkeys */ test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey\"1]\n" @@ -2116,7 +2169,7 @@ 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 hex data concatenation for REG_NONE and REG_EXPAND_SZ */ 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" @@ -2157,6 +2210,60 @@ static void test_import(void) 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_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine44a\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine44b\"=hex(2):25,00,50,00,41,00,\\\n" + " 54,00,48,00,25,00,00,00\n" + "\"Wine44c\"=hex(2):25,00,50,00,41,00\\\n" + ",54,00,48,00,25,00,00,00\n" + "\"Wine44d\"=hex(2):25,00,50,00,41,00\\\n" + " ,54,00,48,00,25,00,00,00\n" + "\"Wine44e\"=hex(2):25,00,50,00,41,00\\\n" + " 54,00,48,00,25,00,00,00\n" + "\"Wine44f\"=hex(2):25,00,50,00,4\\\n" + "1,00,54,00,48,00,25,00,00,00\n" + "\"Wine44g\"=hex(2):25,00,50,00,4\\\n" + " 1,00,54,00,48,00,25,00,00,00\n" + "\"Wine44h\"=hex(2):25,00,50,00,41,00,\\;comment\n" + " 54,00,48,00,\\\n" + " 25,00,00,00\n" + "\"Wine44i\"=hex(2):25,00,50,00,41,00,\\;comment\n" + " 54,00,48,00\n" + " 25,00,00,00\n" + "\"Wine44j\"=hex(2):25,00,50,00,41,00,\\;comment\n" + " 54,00,48,00;comment\n" + " 25,00,00,00\n" + "\"Wine44k\"=hex(2):25,00,50,00,41,00,\\;comment\n" + " 54,00,48,00,\\#comment\n" + " 25,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, "Wine44a", REG_EXPAND_SZ, "%PATH%", 7, 0); + todo_wine verify_reg(hkey, "Wine44b", REG_EXPAND_SZ, "%PATH%", 7, 0); + todo_wine verify_reg_nonexist(hkey, "Wine44c"); + todo_wine verify_reg_nonexist(hkey, "Wine44d"); + todo_wine verify_reg_nonexist(hkey, "Wine44e"); + todo_wine verify_reg_nonexist(hkey, "Wine44f"); + todo_wine verify_reg_nonexist(hkey, "Wine44g"); + todo_wine verify_reg(hkey, "Wine44h", REG_EXPAND_SZ, "%PATH%", 7, 0); + /* Wine44i */ + size = sizeof(buffer); + err = RegQueryValueExA(hkey, "Wine44i", NULL, &type, (BYTE *)&buffer, &size); + todo_wine ok(err == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", err); + 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"); + /* Wine44j */ + size = sizeof(buffer); + memset(buffer, '-', size); + err = RegQueryValueExA(hkey, "Wine44j", NULL, &type, (BYTE *)&buffer, &size); + todo_wine ok(err == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", err); + 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"); + /* Wine44k */ + todo_wine verify_reg_nonexist(hkey, "Wine44k"); + /* 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

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

18 May '17

Module: wine Branch: master Commit: 56c0b38dfa140678e762d582e2d0dfccdc47536a URL: http://source.winehq.org/git/wine.git/?a=commit;h=56c0b38dfa140678e762d582e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 17 08:13:42 2017 +0000 reg/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/reg/tests/reg.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 87 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index cc648ca..9b19ab4 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -775,6 +775,7 @@ static void test_import(void) char test_string[] = "Test string", buffer[8]; HKEY hkey, subkey; LONG err; + BYTE hex[8]; run_reg_exe("reg import", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -1427,7 +1428,7 @@ 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 and REG_EXPAND_SZ */ + /* Test hex data concatenation for REG_NONE, REG_EXPAND_SZ and REG_BINARY */ 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" @@ -1522,6 +1523,48 @@ static void test_import(void) /* Wine44k */ todo_wine verify_reg_nonexist(hkey, "Wine44k"); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine45a\"=hex:11,22,33,44,55,66,77,88\n" + "\"Wine45b\"=hex:11,22,33,44,\\\n" + " 55,66,77,88\n" + "\"Wine45c\"=hex:11,22,33,44\\\n" + ",55,66,77,88\n" + "\"Wine45d\"=hex:11,22,33,44\\\n" + " ,55,66,77,88\n" + "\"Wine45e\"=hex:11,22,33,44\\\n" + " 55,66,77,88\n" + "\"Wine45f\"=hex:11,22,33,4\\\n" + "4,55,66,77,88\n" + "\"Wine45g\"=hex:11,22,33,4\\\n" + " 4,55,66,77,88\n" + "\"Wine45h\"=hex:11,22,33,44,\\;comment\n" + " 55,66,\\\n" + " 77,88\n" + "\"Wine45i\"=hex:11,22,33,44,\\;comment\n" + " 55,66,\n" + " 77,88\n" + "\"Wine45j\"=hex:11,22,33,44,\\;comment\n" + " 55,66,;comment\n" + " 77,88\n" + "\"Wine45k\"=hex:11,22,33,\\;comment\n" + " 44,55,66,\\#comment\n" + " 77,88\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + hex[0] = 0x11; hex[1] = 0x22; hex[2] = 0x33; hex[3] = 0x44; + hex[4] = 0x55; hex[5] = 0x66; hex[6] = 0x77; hex[7] = 0x88; + todo_wine verify_reg(hkey, "Wine45a", REG_BINARY, hex, sizeof(hex), 0); + todo_wine verify_reg(hkey, "Wine45b", REG_BINARY, hex, sizeof(hex), 0); + todo_wine verify_reg_nonexist(hkey, "Wine45c"); + todo_wine verify_reg_nonexist(hkey, "Wine45d"); + todo_wine verify_reg_nonexist(hkey, "Wine45e"); + todo_wine verify_reg_nonexist(hkey, "Wine45f"); + todo_wine verify_reg_nonexist(hkey, "Wine45g"); + todo_wine verify_reg(hkey, "Wine45h", REG_BINARY, hex, sizeof(hex), 0); + todo_wine verify_reg(hkey, "Wine45i", REG_BINARY, hex, 6, 0); + todo_wine verify_reg(hkey, "Wine45j", REG_BINARY, hex, 6, 0); + todo_wine verify_reg_nonexist(hkey, "Wine45k"); + /* Test import with subkeys */ test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey\"1]\n" @@ -2169,7 +2212,7 @@ 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 and REG_EXPAND_SZ */ + /* Test hex data concatenation for REG_NONE, REG_EXPAND_SZ and REG_BINARY */ 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" @@ -2264,6 +2307,48 @@ static void test_import(void) /* Wine44k */ todo_wine verify_reg_nonexist(hkey, "Wine44k"); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine45a\"=hex:11,22,33,44,55,66,77,88\n" + "\"Wine45b\"=hex:11,22,33,44,\\\n" + " 55,66,77,88\n" + "\"Wine45c\"=hex:11,22,33,44\\\n" + ",55,66,77,88\n" + "\"Wine45d\"=hex:11,22,33,44\\\n" + " ,55,66,77,88\n" + "\"Wine45e\"=hex:11,22,33,44\\\n" + " 55,66,77,88\n" + "\"Wine45f\"=hex:11,22,33,4\\\n" + "4,55,66,77,88\n" + "\"Wine45g\"=hex:11,22,33,4\\\n" + " 4,55,66,77,88\n" + "\"Wine45h\"=hex:11,22,33,44,\\;comment\n" + " 55,66,\\\n" + " 77,88\n" + "\"Wine45i\"=hex:11,22,33,44,\\;comment\n" + " 55,66,\n" + " 77,88\n" + "\"Wine45j\"=hex:11,22,33,44,\\;comment\n" + " 55,66,;comment\n" + " 77,88\n" + "\"Wine45k\"=hex:11,22,33,\\;comment\n" + " 44,55,66,\\#comment\n" + " 77,88\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + hex[0] = 0x11; hex[1] = 0x22; hex[2] = 0x33; hex[3] = 0x44; + hex[4] = 0x55; hex[5] = 0x66; hex[6] = 0x77; hex[7] = 0x88; + todo_wine verify_reg(hkey, "Wine45a", REG_BINARY, hex, sizeof(hex), 0); + todo_wine verify_reg(hkey, "Wine45b", REG_BINARY, hex, sizeof(hex), 0); + todo_wine verify_reg_nonexist(hkey, "Wine45c"); + todo_wine verify_reg_nonexist(hkey, "Wine45d"); + todo_wine verify_reg_nonexist(hkey, "Wine45e"); + todo_wine verify_reg_nonexist(hkey, "Wine45f"); + todo_wine verify_reg_nonexist(hkey, "Wine45g"); + todo_wine verify_reg(hkey, "Wine45h", REG_BINARY, hex, sizeof(hex), 0); + todo_wine verify_reg(hkey, "Wine45i", REG_BINARY, hex, 6, 0); + todo_wine verify_reg(hkey, "Wine45j", REG_BINARY, hex, 6, 0); + todo_wine verify_reg_nonexist(hkey, "Wine45k"); + /* 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

Austin English : advapi32: Sort specfile.
by Alexandre Julliard 18 May '17

18 May '17

Module: wine Branch: master Commit: 56d3830493ccd3006415f07feffabe67178a7a5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=56d3830493ccd3006415f07fe… Author: Austin English <austinenglish(a)gmail.com> Date: Wed May 17 22:14:39 2017 -0500 advapi32: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index ff56343..d550349 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -1,3 +1,4 @@ +# 1000 stub ADVAPI32_1000 @ stdcall A_SHAFinal(ptr ptr) @ stdcall A_SHAInit(ptr) @ stdcall A_SHAUpdate(ptr ptr long) @@ -30,7 +31,6 @@ # @ stub AddUsersToEncryptedFileEx @ stdcall AdjustTokenGroups(long long ptr long ptr ptr) @ stdcall AdjustTokenPrivileges(long long ptr long ptr ptr) -# @ stub ADVAPI32_1000 @ stdcall AllocateAndInitializeSid(ptr long long long long long long long long long ptr) @ stdcall AllocateLocallyUniqueId(ptr) @ stdcall AreAllAccessesGranted(long long) @@ -318,6 +318,7 @@ @ stdcall GetAuditedPermissionsFromAclW(ptr ptr ptr ptr) @ stdcall GetCurrentHwProfileA(ptr) @ stdcall GetCurrentHwProfileW(ptr) +# @ stub GetDynamicTimeZoneInformationEffectiveYears @ stdcall GetEffectiveRightsFromAclA(ptr ptr ptr) @ stdcall GetEffectiveRightsFromAclW(ptr ptr ptr) # @ stub GetEncryptedFileMetadata @@ -359,7 +360,6 @@ @ stdcall GetSecurityInfo (long long long ptr ptr ptr ptr ptr) @ stdcall GetSecurityInfoExA (long long long str str ptr ptr ptr ptr) @ stdcall GetSecurityInfoExW (long long long wstr wstr ptr ptr ptr ptr) -# @ stub GetDynamicTimeZoneInformationEffectiveYears @ stdcall GetServiceDisplayNameA(ptr str ptr ptr) @ stdcall GetServiceDisplayNameW(ptr wstr ptr ptr) @ stdcall GetServiceKeyNameA(long str ptr ptr)

1 0

Austin English : advpack: Sort specfile.
by Alexandre Julliard 18 May '17

18 May '17

Module: wine Branch: master Commit: a05969604600ddbcd003d5487bf153c0abdf38c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a05969604600ddbcd003d5487… Author: Austin English <austinenglish(a)gmail.com> Date: Wed May 17 22:14:40 2017 -0500 advpack: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advpack/advpack.spec | 62 +++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index 6e02f4f..2f4698a 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -1,82 +1,82 @@ +@ stdcall AddDelBackupEntry(str str str long) AddDelBackupEntryA @ stdcall AddDelBackupEntryA(str str str long) @ stdcall AddDelBackupEntryW(wstr wstr wstr long) -@ stdcall AddDelBackupEntry(str str str long) AddDelBackupEntryA +@ stdcall AdvInstallFile(long str str str str long long) AdvInstallFileA @ stdcall AdvInstallFileA(long str str str str long long) @ stdcall AdvInstallFileW(long wstr wstr wstr wstr long long) -@ stdcall AdvInstallFile(long str str str str long long) AdvInstallFileA @ stdcall CloseINFEngine(long) -@ stdcall DelNodeA(str long) -@ stdcall DelNodeW(wstr long) @ stdcall DelNode(str long) DelNodeA +@ stdcall DelNodeA(str long) +@ stdcall DelNodeRunDLL32(ptr ptr str long) DelNodeRunDLL32A @ stdcall DelNodeRunDLL32A(ptr ptr str long) @ stdcall DelNodeRunDLL32W(ptr ptr wstr long) -@ stdcall DelNodeRunDLL32(ptr ptr str long) DelNodeRunDLL32A +@ stdcall DelNodeW(wstr long) @ stdcall -private DllMain(long long ptr) @ stdcall DoInfInstall(ptr) +@ stdcall ExecuteCab(ptr ptr ptr) ExecuteCabA @ stdcall ExecuteCabA(ptr ptr ptr) @ stdcall ExecuteCabW(ptr ptr ptr) -@ stdcall ExecuteCab(ptr ptr ptr) ExecuteCabA +@ stdcall ExtractFiles(str str long str ptr long) ExtractFilesA @ stdcall ExtractFilesA(str str long str ptr long) @ stdcall ExtractFilesW(wstr wstr long wstr ptr long) -@ stdcall ExtractFiles(str str long str ptr long) ExtractFilesA +@ stdcall FileSaveMarkNotExist(str str str) FileSaveMarkNotExistA @ stdcall FileSaveMarkNotExistA(str str str) @ stdcall FileSaveMarkNotExistW(wstr wstr wstr) -@ stdcall FileSaveMarkNotExist(str str str) FileSaveMarkNotExistA -@ stdcall FileSaveRestoreA(ptr str str str long) -@ stdcall FileSaveRestoreW(ptr wstr wstr wstr long) @ stdcall FileSaveRestore(ptr str str str long) FileSaveRestoreA +@ stdcall FileSaveRestoreA(ptr str str str long) +@ stdcall FileSaveRestoreOnINF(ptr str str str str str long) FileSaveRestoreOnINFA @ stdcall FileSaveRestoreOnINFA(ptr str str str str str long) @ stdcall FileSaveRestoreOnINFW(ptr wstr wstr wstr wstr wstr long) -@ stdcall FileSaveRestoreOnINF(ptr str str str str str long) FileSaveRestoreOnINFA -@ stdcall GetVersionFromFileA(str ptr ptr long) -@ stdcall GetVersionFromFileW(wstr ptr ptr long) +@ stdcall FileSaveRestoreW(ptr wstr wstr wstr long) @ stdcall GetVersionFromFile(str ptr ptr long) GetVersionFromFileA +@ stdcall GetVersionFromFileA(str ptr ptr long) +@ stdcall GetVersionFromFileEx(str ptr ptr long) GetVersionFromFileExA @ stdcall GetVersionFromFileExA(str ptr ptr long) @ stdcall GetVersionFromFileExW(wstr ptr ptr long) -@ stdcall GetVersionFromFileEx(str ptr ptr long) GetVersionFromFileExA +@ stdcall GetVersionFromFileW(wstr ptr ptr long) @ stdcall IsNTAdmin(long ptr) -@ stdcall LaunchINFSectionA(ptr ptr str long) -@ stdcall LaunchINFSectionW(ptr ptr wstr long) @ stdcall LaunchINFSection(ptr ptr str long) LaunchINFSectionA +@ stdcall LaunchINFSectionA(ptr ptr str long) +@ stdcall LaunchINFSectionEx(ptr ptr str long) LaunchINFSectionExA @ stdcall LaunchINFSectionExA(ptr ptr str long) @ stdcall LaunchINFSectionExW(ptr ptr wstr long) -@ stdcall LaunchINFSectionEx(ptr ptr str long) LaunchINFSectionExA +@ stdcall LaunchINFSectionW(ptr ptr wstr long) @ stdcall NeedReboot(long) @ stdcall NeedRebootInit() +@ stdcall OpenINFEngine(str str long ptr ptr) OpenINFEngineA @ stdcall OpenINFEngineA(str str long ptr ptr) @ stdcall OpenINFEngineW(wstr wstr long ptr ptr) -@ stdcall OpenINFEngine(str str long ptr ptr) OpenINFEngineA +@ stdcall RebootCheckOnInstall(long str str long) RebootCheckOnInstallA @ stdcall RebootCheckOnInstallA(long str str long) @ stdcall RebootCheckOnInstallW(long wstr wstr long) -@ stdcall RebootCheckOnInstall(long str str long) RebootCheckOnInstallA +@ stdcall RegInstall(ptr str ptr) RegInstallA @ stdcall RegInstallA(ptr str ptr) @ stdcall RegInstallW(ptr wstr ptr) -@ stdcall RegInstall(ptr str ptr) RegInstallA +@ stdcall RegRestoreAll(ptr str long) RegRestoreAllA @ stdcall RegRestoreAllA(ptr str long) @ stdcall RegRestoreAllW(ptr wstr long) -@ stdcall RegRestoreAll(ptr str long) RegRestoreAllA -@ stdcall RegSaveRestoreA(ptr str long str str str long) -@ stdcall RegSaveRestoreW(ptr wstr long wstr wstr wstr long) @ stdcall RegSaveRestore(ptr str long str str str long) RegSaveRestoreA +@ stdcall RegSaveRestoreA(ptr str long str str str long) +@ stdcall RegSaveRestoreOnINF(ptr str str str long long long) RegSaveRestoreOnINFA @ stdcall RegSaveRestoreOnINFA(ptr str str str long long long) @ stdcall RegSaveRestoreOnINFW(ptr wstr wstr wstr long long long) -@ stdcall RegSaveRestoreOnINF(ptr str str str long long long) RegSaveRestoreOnINFA +@ stdcall RegSaveRestoreW(ptr wstr long wstr wstr wstr long) @ stdcall RegisterOCX(ptr ptr str long) +@ stdcall RunSetupCommand(long str str str str ptr long ptr) RunSetupCommandA @ stdcall RunSetupCommandA(long str str str str ptr long ptr) @ stdcall RunSetupCommandW(long wstr wstr wstr wstr ptr long ptr) -@ stdcall RunSetupCommand(long str str str str ptr long ptr) RunSetupCommandA +@ stdcall SetPerUserSecValues(ptr) SetPerUserSecValuesA @ stdcall SetPerUserSecValuesA(ptr) @ stdcall SetPerUserSecValuesW(ptr) -@ stdcall SetPerUserSecValues(ptr) SetPerUserSecValuesA -@ stdcall TranslateInfStringA(str str str str ptr long ptr ptr) -@ stdcall TranslateInfStringW(wstr wstr wstr wstr ptr long ptr ptr) @ stdcall TranslateInfString(str str str str ptr long ptr ptr) TranslateInfStringA +@ stdcall TranslateInfStringA(str str str str ptr long ptr ptr) +@ stdcall TranslateInfStringEx(long str str str str long ptr ptr) TranslateInfStringExA @ stdcall TranslateInfStringExA(long str str str str long ptr ptr) @ stdcall TranslateInfStringExW(long wstr wstr wstr wstr long ptr ptr) -@ stdcall TranslateInfStringEx(long str str str str long ptr ptr) TranslateInfStringExA +@ stdcall TranslateInfStringW(wstr wstr wstr wstr ptr long ptr ptr) +@ stdcall UserInstStubWrapper(long long str long) UserInstStubWrapperA @ stdcall UserInstStubWrapperA(long long str long) @ stdcall UserInstStubWrapperW(long long wstr long) -@ stdcall UserInstStubWrapper(long long str long) UserInstStubWrapperA +@ stdcall UserUnInstStubWrapper(long long str long) UserUnInstStubWrapperA @ stdcall UserUnInstStubWrapperA(long long str long) @ stdcall UserUnInstStubWrapperW(long long wstr long) -@ stdcall UserUnInstStubWrapper(long long str long) UserUnInstStubWrapperA

1 0

Austin English : apphelp: Sort specfile.
by Alexandre Julliard 18 May '17

18 May '17

Module: wine Branch: master Commit: 581fe7d74c5b40806dd152cea6b327abf7b0780d URL: http://source.winehq.org/git/wine.git/?a=commit;h=581fe7d74c5b40806dd152cea… Author: Austin English <austinenglish(a)gmail.com> Date: Wed May 17 22:14:41 2017 -0500 apphelp: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/apphelp/apphelp.spec | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/apphelp/apphelp.spec b/dlls/apphelp/apphelp.spec index 2b0e0c6..43a1abf 100644 --- a/dlls/apphelp/apphelp.spec +++ b/dlls/apphelp/apphelp.spec @@ -17,6 +17,17 @@ @ stub ApphelpQueryModuleDataEx @ stub ApphelpUpdateCacheEntry @ stub GetPermLayers +@ stub SE_DllLoaded +@ stub SE_DllUnloaded +@ stub SE_GetHookAPIs +@ stub SE_GetMaxShimCount +@ stub SE_GetProcAddressLoad +@ stub SE_GetShimCount +@ stub SE_InstallAfterInit +@ stub SE_InstallBeforeInit +@ stub SE_IsShimDll +@ stub SE_LdrEntryRemoved +@ stub SE_ProcessDying @ stub SdbAddLayerTagRefToQuery @ stub SdbApphelpNotify @ stub SdbApphelpNotifyExSdbApphelpNotifyEx @@ -48,6 +59,8 @@ @ stub SdbFreeDatabaseInformation @ stub SdbFreeFileInfo @ stub SdbFreeFlagInfo +@ stub SdbGUIDFromString +@ stub SdbGUIDToString @ stub SdbGetAppCompatDataSize @ stdcall SdbGetAppPatchDir(long ptr long) @ stub SdbGetBinaryTagData @@ -81,8 +94,6 @@ @ stub SdbGetTagFromTagID @ stub SdbGrabMatchingInfo @ stub SdbGrabMatchingInfoEx -@ stub SdbGUIDFromString -@ stub SdbGUIDToString @ stdcall SdbInitDatabase(long wstr) @ stub SdbInitDatabaseEx @ stub SdbIsNullGUID @@ -111,8 +122,8 @@ @ stub SdbQueryReinstallUpgrade @ stub SdbReadApphelpData @ stub SdbReadApphelpDetailsData -@ stub SdbReadBinaryTag @ stub SdbReadBYTETag +@ stub SdbReadBinaryTag @ stub SdbReadDWORDTagRef @ stub SdbReadEntryInformation @ stub SdbReadMsiTransformInfo @@ -140,9 +151,9 @@ @ stub SdbTagIDToTagRef @ stub SdbTagToString @ stub SdbUnregisterDatabase +@ stub SdbWriteBYTETag @ stub SdbWriteBinaryTag @ stub SdbWriteBinaryTagFromFile -@ stub SdbWriteBYTETag @ stub SdbWriteDWORDTag @ stub SdbWriteNULLTag @ stub SdbWriteQWORDTag @@ -150,17 +161,6 @@ @ stub SdbWriteStringTag @ stub SdbWriteStringTagDirect @ stub SdbWriteWORDTag -@ stub SE_DllLoaded -@ stub SE_DllUnloaded -@ stub SE_GetHookAPIs -@ stub SE_GetMaxShimCount -@ stub SE_GetProcAddressLoad -@ stub SE_GetShimCount -@ stub SE_InstallAfterInit -@ stub SE_InstallBeforeInit -@ stub SE_IsShimDll -@ stub SE_LdrEntryRemoved -@ stub SE_ProcessDying @ stub SetPermLayers @ stub ShimDbgPrint @ stub ShimDumpCache

1 0

Austin English : cfgmgr32: Sort specfile.
by Alexandre Julliard 18 May '17

18 May '17

Module: wine Branch: master Commit: 1aac54c44528cca544f4b36c6d2a5c874b573f76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aac54c44528cca544f4b36c6… Author: Austin English <austinenglish(a)gmail.com> Date: Wed May 17 22:14:43 2017 -0500 cfgmgr32: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cfgmgr32/cfgmgr32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 2ccd29b..2438083d 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -1,3 +1,4 @@ +@ stdcall CMP_WaitNoPendingInstallEvents(long) setupapi.CMP_WaitNoPendingInstallEvents @ stub CM_Add_Empty_Log_Conf @ stub CM_Add_Empty_Log_Conf_Ex @ stub CM_Add_IDA @@ -181,4 +182,3 @@ @ stub CM_Unregister_Device_InterfaceW @ stub CM_Unregister_Device_Interface_ExA @ stub CM_Unregister_Device_Interface_ExW -@ stdcall CMP_WaitNoPendingInstallEvents(long) setupapi.CMP_WaitNoPendingInstallEvents

1 0

Austin English : crypt32: Sort specfile.
by Alexandre Julliard 18 May '17

18 May '17

Module: wine Branch: master Commit: 148ece3a8f424c8872cd093839a4c6d006e7f0b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=148ece3a8f424c8872cd09383… Author: Austin English <austinenglish(a)gmail.com> Date: Wed May 17 22:14:46 2017 -0500 crypt32: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/crypt32.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index b5ce48c..00a2d62 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -40,11 +40,11 @@ @ stdcall CertEnumPhysicalStore(ptr long ptr ptr) @ stdcall CertEnumSystemStore(long ptr ptr ptr) @ stdcall CertFindAttribute(str long ptr) -@ stdcall CertFindChainInStore(ptr long long long ptr ptr) @ stdcall CertFindCRLInStore(ptr long long long ptr ptr) @ stdcall CertFindCTLInStore(ptr long long long ptr ptr) -@ stdcall CertFindCertificateInStore(ptr long long long ptr ptr) @ stdcall CertFindCertificateInCRL(ptr ptr long ptr ptr) +@ stdcall CertFindCertificateInStore(ptr long long long ptr ptr) +@ stdcall CertFindChainInStore(ptr long long long ptr ptr) @ stdcall CertFindExtension(str long ptr) @ stdcall CertFindRDNAttr(str ptr) @ stub CertFindSubjectInCTL @@ -92,21 +92,20 @@ @ stdcall CertSetStoreProperty(ptr long long ptr) @ stdcall CertStrToNameA(long str long ptr ptr ptr ptr) @ stdcall CertStrToNameW(long wstr long ptr ptr ptr ptr) -@ stdcall CertVerifyCertificateChainPolicy(str ptr ptr ptr) +@ stdcall CertUnregisterSystemStore(ptr long) @ stdcall CertVerifyCRLRevocation(long ptr long ptr) @ stdcall CertVerifyCRLTimeValidity(ptr ptr) @ stdcall CertVerifyCTLUsage(long long ptr ptr long ptr ptr) +@ stdcall CertVerifyCertificateChainPolicy(str ptr ptr ptr) @ stdcall CertVerifyRevocation(long long long ptr long ptr ptr) @ stdcall CertVerifySubjectCertificateContext(ptr ptr ptr) @ stdcall CertVerifyTimeValidity(ptr ptr) @ stdcall CertVerifyValidityNesting(ptr ptr) @ stdcall CreateFileU(wstr long long ptr long long ptr) kernel32.CreateFileW +@ stdcall CryptAcquireCertificatePrivateKey(ptr long ptr ptr ptr ptr) +@ stdcall CryptAcquireContextU(ptr wstr wstr long long) advapi32.CryptAcquireContextW @ stdcall CryptBinaryToStringA(ptr long long ptr ptr) @ stdcall CryptBinaryToStringW(ptr long long ptr ptr) -@ stdcall CryptStringToBinaryA(str long long ptr ptr ptr ptr) -@ stdcall CryptStringToBinaryW (wstr long long ptr ptr ptr ptr) -@ stdcall CryptAcquireContextU(ptr wstr wstr long long) advapi32.CryptAcquireContextW -@ stdcall CryptAcquireCertificatePrivateKey(ptr long ptr ptr ptr ptr) @ stub CryptCloseAsyncHandle @ stub CryptCreateAsyncHandle @ stub CryptDecodeMessage @@ -187,11 +186,12 @@ @ stub CryptSignHashU @ stdcall CryptSignMessage(ptr long long ptr ptr ptr ptr) @ stub CryptSignMessageWithKey +@ stdcall CryptStringToBinaryA(str long long ptr ptr ptr ptr) +@ stdcall CryptStringToBinaryW (wstr long long ptr ptr ptr ptr) @ stdcall CryptUnprotectData(ptr ptr ptr ptr ptr long ptr) @ stdcall CryptUnprotectMemory(ptr long long) @ stdcall CryptUnregisterDefaultOIDFunction(long str wstr) @ stdcall CryptUnregisterOIDFunction(long str str) -@ stdcall CertUnregisterSystemStore(ptr long) @ stub CryptUnregisterOIDInfo @ stdcall CryptVerifyCertificateSignature(long long ptr long ptr) @ stdcall CryptVerifyCertificateSignatureEx(long long long ptr long ptr long ptr)

1 0

Alistair Leslie-Hughes : oleaut32: Remove dead code.
by Alexandre Julliard 18 May '17

18 May '17

Module: wine Branch: master Commit: c260de0faaf42021a592f3f750623e21b2c3f3a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c260de0faaf42021a592f3f75… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 18 02:12:49 2017 +0000 oleaut32: Remove dead code. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/variant.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 17f753a..188e393 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -2617,17 +2617,6 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) if (hres != S_OK) { VariantClear(&bstrvar_left); VariantClear(&bstrvar_right); - if (leftvt == VT_NULL && (rightvt == VT_EMPTY || - rightvt == VT_NULL || rightvt == VT_I2 || - rightvt == VT_I4 || rightvt == VT_R4 || - rightvt == VT_R8 || rightvt == VT_CY || - rightvt == VT_DATE || rightvt == VT_BSTR || - rightvt == VT_BOOL || rightvt == VT_DECIMAL || - rightvt == VT_I1 || rightvt == VT_UI1 || - rightvt == VT_UI2 || rightvt == VT_UI4 || - rightvt == VT_I8 || rightvt == VT_UI8 || - rightvt == VT_INT || rightvt == VT_UINT)) - return DISP_E_BADVARTYPE; return hres; } } @@ -2657,17 +2646,6 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) if (hres != S_OK) { VariantClear(&bstrvar_left); VariantClear(&bstrvar_right); - if (rightvt == VT_NULL && (leftvt == VT_EMPTY || - leftvt == VT_NULL || leftvt == VT_I2 || - leftvt == VT_I4 || leftvt == VT_R4 || - leftvt == VT_R8 || leftvt == VT_CY || - leftvt == VT_DATE || leftvt == VT_BSTR || - leftvt == VT_BOOL || leftvt == VT_DECIMAL || - leftvt == VT_I1 || leftvt == VT_UI1 || - leftvt == VT_UI2 || leftvt == VT_UI4 || - leftvt == VT_I8 || leftvt == VT_UI8 || - leftvt == VT_INT || leftvt == VT_UINT)) - return DISP_E_BADVARTYPE; return hres; } }

1 0

Nikolay Sivov : regedit: Fix a crash when exporting from top level key.
by Alexandre Julliard 18 May '17

18 May '17

Module: wine Branch: master Commit: 02b178e79134298d10daa17e1e9185d5d270a832 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02b178e79134298d10daa17e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 18 17:08:56 2017 +0300 regedit: Fix a crash when exporting from top level key. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 01c9c76..10b4a38 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1232,7 +1232,7 @@ BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format) output_message(STRING_INCORRECT_REG_CLASS, reg_key_name); exit(1); } - if (!branch_name[0]) { + if (!branch_name || !*branch_name) { /* no branch - registry class is specified */ file = REGPROC_open_export_file(file_name, unicode); export_hkey(file, reg_key_class,

1 0