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

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

May 18, 2017

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

Paul Gofman : d3dx9: Loop through input parameters in is_const_tab_input_dirty().
by Alexandre Julliard May 18, 2017

May 18, 2017

Module: wine Branch: master Commit: 53bf72e266532f2f0533a0dfd7e90a25d7b6d901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53bf72e266532f2f0533a0dfd… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu May 18 19:23:20 2017 +0200 d3dx9: Loop through input parameters in is_const_tab_input_dirty(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 49eeb22..8d1d1b4 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1323,9 +1323,10 @@ static BOOL is_const_tab_input_dirty(struct d3dx_const_tab *ctab, ULONG64 update if (update_version == ULONG64_MAX) update_version = ctab->update_version; - for (i = 0; i < ctab->const_set_count; ++i) + for (i = 0; i < ctab->input_count; ++i) { - if (is_param_dirty(ctab->const_set[i].param, update_version)) + if (ctab->inputs_param[i] + && is_param_dirty(ctab->inputs_param[i], update_version)) return TRUE; } return FALSE;

1 0

Nikolay Sivov : appwiz.cpl: Make list selection always visible, enable full row selection mode.
by Alexandre Julliard May 18, 2017

May 18, 2017

Module: wine Branch: master Commit: a100d6a7a588967bdb9427a2a0a71a83996fe41a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a100d6a7a588967bdb9427a2a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 18 15:19:34 2017 +0300 appwiz.cpl: Make list selection always visible, enable full row selection mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/appwiz.c | 3 +++ dlls/appwiz.cpl/appwiz.rc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 8119d07..3807555 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -831,6 +831,9 @@ static INT_PTR CALLBACK MainDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM l switch(msg) { case WM_INITDIALOG: + SendDlgItemMessageW(hWnd, IDL_PROGRAMS, LVM_SETEXTENDEDLISTVIEWSTYLE, + LVS_EX_FULLROWSELECT, LVS_EX_FULLROWSELECT); + hImageList = ResetApplicationList(TRUE, hWnd, hImageList); if (!hImageList) diff --git a/dlls/appwiz.cpl/appwiz.rc b/dlls/appwiz.cpl/appwiz.rc index 9709ca9..049e1d8 100644 --- a/dlls/appwiz.cpl/appwiz.rc +++ b/dlls/appwiz.cpl/appwiz.rc @@ -62,7 +62,7 @@ FONT 8, "MS Shell Dlg" CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 CONTROL "The following software can be automatically removed. To remove a program or to modify its installed components, select it from the list and click Modify/Remove.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 54, 275, 34 - CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 + CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 CONTROL "&Support Information", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 34, 198, 90, 14 CONTROL "&Modify...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 128, 198, 90, 14 CONTROL "&Remove", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 222, 198, 90, 14

1 0

Austin English : crypt32: Sort specfile.
by Alexandre Julliard May 18, 2017

May 18, 2017

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

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

May 18, 2017

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

Paul Gofman : d3dx9: Use versioned parameter updates instead of 'dirty' flags.
by Alexandre Julliard May 18, 2017

May 18, 2017

Module: wine Branch: master Commit: a1795848442022885ce1be127644d5eb1b95b914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1795848442022885ce1be127… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 16 19:49:17 2017 +0300 d3dx9: Use versioned parameter updates instead of 'dirty' flags. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 37 +++++++++++++++++----- dlls/d3dx9_36/effect.c | 72 +++++++++++++++++++++++-------------------- dlls/d3dx9_36/preshader.c | 29 +++++++++++------ 3 files changed, 86 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1795848442022885ce1b…

1 0

Huw Davies : ole32: Fix up the dib's resolution on loading.
by Alexandre Julliard May 18, 2017

May 18, 2017

Module: wine Branch: master Commit: 1d2860e54c26592e44f3f3c463f692aa3882f497 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d2860e54c26592e44f3f3c46… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 18 11:07:07 2017 +0100 ole32: Fix up the dib's resolution on loading. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 13 +++++++++++++ dlls/ole32/tests/ole2.c | 21 ++++++++++++++++++--- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 0db5551..40d4ab8 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -635,6 +635,7 @@ static HRESULT load_dib( DataCacheEntry *cache_entry, IStream *stm ) HGLOBAL hglobal; ULONG read, info_size, bi_size; BITMAPFILEHEADER file; + BITMAPINFOHEADER *info; if (cache_entry->stream_type != contents_stream) { @@ -685,6 +686,18 @@ static HRESULT load_dib( DataCacheEntry *cache_entry, IStream *stm ) hr = IStream_Read( stm, (char *)dib + info_size, stat.cbSize.u.LowPart, &read ); if (hr != S_OK || read != stat.cbSize.QuadPart) goto fail; + if (bi_size >= sizeof(*info)) + { + info = (BITMAPINFOHEADER *)dib; + if (info->biXPelsPerMeter == 0 || info->biYPelsPerMeter == 0) + { + HDC hdc = GetDC( 0 ); + info->biXPelsPerMeter = MulDiv( GetDeviceCaps( hdc, LOGPIXELSX ), 10000, 254 ); + info->biYPelsPerMeter = MulDiv( GetDeviceCaps( hdc, LOGPIXELSY ), 10000, 254 ); + ReleaseDC( 0, hdc ); + } + } + GlobalUnlock( hglobal ); cache_entry->data_cf = cache_entry->fmtetc.cfFormat; diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index afff6ba..65abb3e 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1972,6 +1972,8 @@ static void test_data_cache_dib_contents_stream(int num) STGMEDIUM med; CLSID cls; SIZEL sz; + BYTE *ptr; + BITMAPINFOHEADER expect_info; hr = CreateDataCache( NULL, &CLSID_Picture_Metafile, &IID_IUnknown, (void **)&unk ); ok( SUCCEEDED(hr), "got %08x\n", hr ); @@ -1994,11 +1996,24 @@ static void test_data_cache_dib_contents_stream(int num) hr = IDataObject_GetData( data, &fmt, &med ); ok( SUCCEEDED(hr), "got %08x\n", hr ); - if (SUCCEEDED(hr)) + ok( med.tymed == TYMED_HGLOBAL, "got %x\n", med.tymed ); + ok( GlobalSize( U(med).hGlobal ) >= sizeof(dib) - sizeof(BITMAPFILEHEADER), + "got %lu\n", GlobalSize( U(med).hGlobal ) ); + ptr = GlobalLock( U(med).hGlobal ); + + expect_info = *(BITMAPINFOHEADER *)(dib + sizeof(BITMAPFILEHEADER)); + if (expect_info.biXPelsPerMeter == 0 || expect_info.biYPelsPerMeter == 0) { - ok( med.tymed == TYMED_HGLOBAL, "got %x\n", med.tymed ); - ReleaseStgMedium( &med ); + HDC hdc = GetDC( 0 ); + expect_info.biXPelsPerMeter = MulDiv( GetDeviceCaps( hdc, LOGPIXELSX ), 10000, 254 ); + expect_info.biYPelsPerMeter = MulDiv( GetDeviceCaps( hdc, LOGPIXELSY ), 10000, 254 ); + ReleaseDC( 0, hdc ); } + ok( !memcmp( ptr, &expect_info, sizeof(expect_info) ), "mismatch\n" ); + ok( !memcmp( ptr + sizeof(expect_info), dib + sizeof(BITMAPFILEHEADER) + sizeof(expect_info), + sizeof(dib) - sizeof(BITMAPFILEHEADER) - sizeof(expect_info) ), "mismatch\n" ); + GlobalUnlock( U(med).hGlobal ); + ReleaseStgMedium( &med ); hr = IViewObject2_GetExtent( view, DVASPECT_CONTENT, -1, NULL, &sz ); ok( SUCCEEDED(hr), "got %08x\n", hr );

1 0

Huw Davies : ole32: Use the helper function to copy the clipboard' s FORMATETC.
by Alexandre Julliard May 18, 2017

May 18, 2017

Module: wine Branch: master Commit: 77d1eba7fa6a39ce391f136247da53beb4a0eb28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77d1eba7fa6a39ce391f13624… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 18 11:07:04 2017 +0100 ole32: Use the helper function to copy the clipboard's FORMATETC. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index d48ea79..b3c7665 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -330,14 +330,8 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Next for(i = 0; i < cfetch; i++) { - rgelt[i] = This->data->entries[This->pos++].fmtetc; - if(rgelt[i].ptd) - { - DVTARGETDEVICE *target = rgelt[i].ptd; - rgelt[i].ptd = CoTaskMemAlloc(target->tdSize); - if(!rgelt[i].ptd) return E_OUTOFMEMORY; - memcpy(rgelt[i].ptd, target, target->tdSize); - } + hres = copy_formatetc(rgelt + i, &This->data->entries[This->pos++].fmtetc); + if(FAILED(hres)) return hres; } } else

1 0

Huw Davies : ole32: Add a helper to copy FORMATETC structures.
by Alexandre Julliard May 18, 2017

May 18, 2017

Module: wine Branch: master Commit: 11db49190bb531796ac3e8e86c2f67b5f60d39dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=11db49190bb531796ac3e8e86… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 18 11:07:02 2017 +0100 ole32: Add a helper to copy FORMATETC structures. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj_private.h | 12 ++++++++++++ dlls/ole32/oleobj.c | 16 ++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 6488287..8bab819 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -334,4 +334,16 @@ static inline BOOL heap_free(void *mem) return HeapFree(GetProcessHeap(), 0, mem); } +static inline HRESULT copy_formatetc(FORMATETC *dst, const FORMATETC *src) +{ + *dst = *src; + if (src->ptd) + { + dst->ptd = CoTaskMemAlloc( src->ptd->tdSize ); + if (!dst->ptd) return E_OUTOFMEMORY; + memcpy( dst->ptd, src->ptd, src->ptd->tdSize ); + } + return S_OK; +} + #endif /* __WINE_OLE_COMPOBJ_H */ diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index edbef55..17ab8d0 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -56,14 +56,14 @@ static void release_statdata(STATDATA *data) static HRESULT copy_statdata(STATDATA *dst, const STATDATA *src) { - *dst = *src; - if(src->formatetc.ptd) - { - dst->formatetc.ptd = CoTaskMemAlloc(src->formatetc.ptd->tdSize); - if(!dst->formatetc.ptd) return E_OUTOFMEMORY; - memcpy(dst->formatetc.ptd, src->formatetc.ptd, src->formatetc.ptd->tdSize); - } - if(dst->pAdvSink) IAdviseSink_AddRef(dst->pAdvSink); + HRESULT hr; + + hr = copy_formatetc( &dst->formatetc, &src->formatetc ); + if (FAILED(hr)) return hr; + dst->advf = src->advf; + dst->pAdvSink = src->pAdvSink; + if (dst->pAdvSink) IAdviseSink_AddRef( dst->pAdvSink ); + dst->dwConnection = src->dwConnection; return S_OK; }

1 0

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

May 18, 2017

Module: wine Branch: master Commit: 0760cd012c9bd5425922e5d7b5a26a5cdadd00be URL: http://source.winehq.org/git/wine.git/?a=commit;h=0760cd012c9bd5425922e5d7b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 17 08:13:09 2017 +0000 reg/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/reg/tests/reg.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 1784a06..b2afe8b 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1220,6 +1220,16 @@ static void test_import(void) test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line10\"=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", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Multi-Line10", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine32a\"=dword:1\n" "\"Wine32b\"=dword:4444\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -2011,6 +2021,16 @@ static void test_import(void) test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line10\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" + " 63,00,6f,00,6e,00,\\;comment\n" + " 63,00,61,00,74,00,\\\n\n" + " 65,00,6e,00,\\;comment\n\n" + " 61,00,74,00,69,00,6f,00,6e,00,00,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, "Multi-Line10", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine41a\"=dword:1234\\\n" "5678\n" "\"Wine41b\"=\"Test \\\n"

1 0