June 2017 - wine-commits

Zebediah Figura : msacm32: Add more invalid parameter checks for acmFormatEnum().
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: c984aa5fc94e8f64c6b924fea942b9fef8f8f5af URL: http://source.winehq.org/git/wine.git/?a=commit;h=c984aa5fc94e8f64c6b924fea… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 7 16:07:50 2017 -0500 msacm32: Add more invalid parameter checks for acmFormatEnum(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/format.c | 21 +++++++++++++++++++++ dlls/msacm32/tests/msacm.c | 36 ++++++++++++++++++++++++++++++++---- 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index 3f3ee54..902807c 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -492,6 +492,9 @@ MMRESULT WINAPI acmFormatEnumA(HACMDRIVER had, PACMFORMATDETAILSA pafda, if (!pafda) return MMSYSERR_INVALPARAM; + if (!fnCallback) + return MMSYSERR_INVALPARAM; + if (pafda->cbStruct < sizeof(*pafda)) return MMSYSERR_INVALPARAM; @@ -499,6 +502,7 @@ MMRESULT WINAPI acmFormatEnumA(HACMDRIVER had, PACMFORMATDETAILSA pafda, afdw.cbStruct = sizeof(afdw); afdw.dwFormatIndex = pafda->dwFormatIndex; afdw.dwFormatTag = pafda->dwFormatTag; + afdw.fdwSupport = pafda->fdwSupport; afdw.pwfx = pafda->pwfx; afdw.cbwfx = pafda->cbwfx; @@ -613,6 +617,8 @@ MMRESULT WINAPI acmFormatEnumW(HACMDRIVER had, PACMFORMATDETAILSW pafd, PWINE_ACMDRIVERID padid; WAVEFORMATEX wfxRef; BOOL ret; + DWORD cbwfxMax; + MMRESULT mmr; TRACE("(%p, %p, %p, %ld, %d)\n", had, pafd, fnCallback, dwInstance, fdwEnum); @@ -620,9 +626,18 @@ MMRESULT WINAPI acmFormatEnumW(HACMDRIVER had, PACMFORMATDETAILSW pafd, if (!pafd) return MMSYSERR_INVALPARAM; + if (!fnCallback) + return MMSYSERR_INVALPARAM; + if (pafd->cbStruct < sizeof(*pafd)) return MMSYSERR_INVALPARAM; + if (pafd->fdwSupport) + return MMSYSERR_INVALPARAM; + + if (!pafd->pwfx) + return MMSYSERR_INVALPARAM; + if (fdwEnum & (ACM_FORMATENUMF_WFORMATTAG|ACM_FORMATENUMF_NCHANNELS| ACM_FORMATENUMF_NSAMPLESPERSEC|ACM_FORMATENUMF_WBITSPERSAMPLE| ACM_FORMATENUMF_CONVERT|ACM_FORMATENUMF_SUGGEST)) @@ -639,6 +654,12 @@ MMRESULT WINAPI acmFormatEnumW(HACMDRIVER had, PACMFORMATDETAILSW pafd, if (fdwEnum & (ACM_FORMATENUMF_CONVERT|ACM_FORMATENUMF_INPUT|ACM_FORMATENUMF_OUTPUT)) FIXME("Unsupported fdwEnum values %08x\n", fdwEnum); + mmr = acmMetrics((HACMOBJ)had, ACM_METRIC_MAX_SIZE_FORMAT, &cbwfxMax); + if (mmr != MMSYSERR_NOERROR) + return mmr; + if (pafd->cbwfx < cbwfxMax) + return MMSYSERR_INVALPARAM; + if (had) { HACMDRIVERID hadid; diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 6e79f46..f5ab168 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -330,12 +330,10 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, "acmFormatEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); - if (dwSize < sizeof(WAVEFORMATEX)) - dwSize = sizeof(WAVEFORMATEX); - pwfx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwSize); - pwfx->cbSize = LOWORD(dwSize) - sizeof(WAVEFORMATEX); + if (dwSize >= sizeof(WAVEFORMATEX)) + pwfx->cbSize = LOWORD(dwSize) - sizeof(WAVEFORMATEX); pwfx->wFormatTag = WAVE_FORMAT_UNKNOWN; fd.cbStruct = sizeof(fd); @@ -343,6 +341,36 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, fd.cbwfx = dwSize; fd.dwFormatTag = WAVE_FORMAT_UNKNOWN; + /* try bad callback */ + rc = acmFormatEnumA(had, &fd, NULL, 0, 0); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatEnumA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + /* try bad pwfx */ + fd.pwfx = NULL; + rc = acmFormatEnumA(had, &fd, FormatEnumProc, 0, 0); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatEnumA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.pwfx = pwfx; + + /* fdwSupport must be zero */ + fd.fdwSupport = 0xdeadbeef; + rc = acmFormatEnumA(had, &fd, FormatEnumProc, 0, 0); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatEnumA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.fdwSupport = 0; + + /* try bad pwfx structure size */ + fd.cbwfx = dwSize-1; + rc = acmFormatEnumA(had, &fd, FormatEnumProc, 0, 0); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatEnumA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.cbwfx = dwSize; + /* try valid parameters */ rc = acmFormatEnumA(had, &fd, FormatEnumProc, 0, 0); ok(rc == MMSYSERR_NOERROR,

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 27f82b46ada927124d20f4ccd551f4d5d1f33595 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27f82b46ada927124d20f4ccd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 8 13:26:46 2017 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/ru.po b/po/ru.po index 9e99cba..f176a29 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-06-02 09:06+0300\n" +"PO-Revision-Date: 2017-06-08 13:21+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -11768,8 +11768,6 @@ msgid "Expand" msgstr "Развернуть" #: regedit.rc:134 regedit.rc:232 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." msgstr "Изменить &двоичные данные..."

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 65305a474e2c14cd0efdcdfd4936d20f527e636f URL: http://source.winehq.org/git/wine.git/?a=commit;h=65305a474e2c14cd0efdcdfd4… Author: Kim Malmo <berencamlost(a)msn.com> Date: Thu Jun 8 09:08:11 2017 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 479385b..e478435 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -11762,10 +11762,8 @@ msgid "Expand" msgstr "Utvid" #: regedit.rc:134 regedit.rc:232 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." -msgstr "Endre binærdata..." +msgstr "Endre &binærdata..." #: regedit.rc:266 msgid "Export registry" @@ -11864,10 +11862,6 @@ msgid "Contains commands for accessing frequently used keys" msgstr "Inneholder kommandoer for å få tilgang til nøkler som brukes ofte" #: regedit.rc:163 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" msgstr "" @@ -12115,8 +12109,6 @@ msgid "regedit: The line contains invalid syntax.\n" msgstr "regedit: Linjen inneholder ugyldig syntaks.\n" #: regedit.rc:187 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" msgstr "Avslutter Registerredigering" @@ -12133,8 +12125,6 @@ msgid "Shows or hides the status bar" msgstr "Viser eller skjuler statuslinjen" #: regedit.rc:191 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" msgstr "Endrer posisjonen til delingslinjen mellom to ruter" @@ -12179,10 +12169,8 @@ msgid "Adds a new binary value" msgstr "Legger til en ny binærverdis" #: regedit.rc:174 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "Legger til en ny binærverdis" +msgstr "Legger til en ny 32-bit verdi" #: regedit.rc:177 msgid "Imports a text file into the registry" @@ -12197,10 +12185,8 @@ msgid "Prints all or part of the registry" msgstr "Skriver ut hele eller deler av registeret" #: regedit.rc:181 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "Registerredigering" +msgstr "Åpner register-redigeringshjelp" #: regedit.rc:182 msgid "Displays program information, version number and copyright" @@ -12243,26 +12229,20 @@ msgid "Unable to query the registry key '%1'." msgstr "Kan ikke forespørre registernøkkelen \"%1\"." #: regedit.rc:170 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "Endrer verdiens data" +msgstr "Endrer verdiens data i binær form" #: regedit.rc:175 msgid "Adds a new multi-string value" msgstr "Legger til en ny flerstrengverdi" #: regedit.rc:198 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" msgstr "Eksporterer den valgte greinen av registeret til en tekstfil" #: regedit.rc:176 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "Legger til en ny strengverdi" +msgstr "Legger til en ny utvidbar strengverdi" #: regedit.rc:211 msgid "Confirm Key Delete"

1 0

Hugh McMaster : regedit: Do not use REG_NONE as the default data type if strtoulW() fails.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: afde1624cacc9b391805d0cec7889052b77315da URL: http://source.winehq.org/git/wine.git/?a=commit;h=afde1624cacc9b391805d0cec… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 8 13:13:39 2017 +0000 regedit: Do not use REG_NONE as the default data type if strtoulW() fails. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.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 7bac6dc..ac72b94 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -239,7 +239,7 @@ static DWORD getDataType(LPWSTR *lpValue, DWORD* parse_type) /* "hex(xx):" is special */ type = (int)strtoulW( *lpValue , &end, 16 ); if (**lpValue=='\0' || *end!=')' || *(end+1)!=':') { - type=REG_NONE; + type = REG_UNKNOWN_TYPE; } else { *lpValue = end + 2; }

1 0

Hugh McMaster : regedit: Do not create registry keys that end without a closing bracket.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 5669282e1d7c45a59d69fb1214a776f3eabd29cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5669282e1d7c45a59d69fb121… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 8 09:04:36 2017 +0000 regedit: Do not create registry keys that end without a closing bracket. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 1 + programs/regedit/tests/regedit.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index d5be72f..7bac6dc 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -568,6 +568,7 @@ static void processRegEntry(WCHAR* stdInput, BOOL isUnicode) keyEnd = strrchrW(stdInput, ']'); if (keyEnd) *keyEnd='\0'; + else return; /* delete the key if we encounter '-' at the start of reg key */ if (stdInput[0] == '-') diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 6f56191..550c22b 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1155,7 +1155,7 @@ static void test_key_creation_and_deletion(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\No_Closing_Bracket\n"); - todo_wine verify_key_nonexist(hkey, "No_Closing_Bracket"); + verify_key_nonexist(hkey, "No_Closing_Bracket"); exec_import_str("REGEDIT4\n\n" "[ HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1a]\n"); @@ -1210,7 +1210,7 @@ static void test_key_creation_and_deletion(void) ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); + ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); } static void test_value_deletion(void) @@ -1262,7 +1262,7 @@ static void test_value_deletion(void) ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); + ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); } START_TEST(regedit)

1 0

Hugh McMaster : regedit/tests: Add tests for value deletion.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: eca563e9ce02c54b4e1a2fbe42f07e11f0e2b690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eca563e9ce02c54b4e1a2fbe4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 8 09:04:28 2017 +0000 regedit/tests: Add tests for value deletion. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 53 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 28e5c1d..6f56191 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1213,6 +1213,58 @@ static void test_key_creation_and_deletion(void) todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); } +static void test_value_deletion(void) +{ + HKEY hkey; + LONG lr; + DWORD dword = 0x8; + BYTE hex[4] = {0x11, 0x22, 0x33, 0x44}; + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n"); + + lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: got %d, expected 0\n", lr); + + /* Test value deletion. We start by creating some registry values. */ + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine46a\"=\"Test Value\"\n" + "\"Wine46b\"=dword:00000008\n" + "\"Wine46c\"=hex:11,22,33,44\n" + "\"Wine46d\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine46e\"=hex(2):25,50,41,54,48,25,00\n" + "\"Wine46f\"=hex(0):56,00,61,00,6c,00,75,00,65,00,00,00\n\n"); + verify_reg(hkey, "Wine46a", REG_SZ, "Test Value", 11, 0); + verify_reg(hkey, "Wine46b", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine46c", REG_BINARY, hex, 4, 0); + verify_reg(hkey, "Wine46d", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "Wine46e", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine46a\"=-\n" + "\"Wine46b\"= -\n" + "\"Wine46c\"= \t-\t \n" + "\"Wine46d\"=-\"Test\"\n" + "\"Wine46e\"=- ;comment\n" + "\"Wine46f\"=- #comment\n\n"); + verify_reg_nonexist(hkey, "Wine46a"); + verify_reg_nonexist(hkey, "Wine46b"); + verify_reg_nonexist(hkey, "Wine46c"); + verify_reg(hkey, "Wine46d", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + todo_wine verify_reg_nonexist(hkey, "Wine46e"); + verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + + lr = RegCloseKey(hkey); + ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); + + lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); +} + START_TEST(regedit) { WCHAR wchar_test[] = {0xFEFF,'W','i','n','d','o','w','s',' ','R','e','g', @@ -1233,4 +1285,5 @@ START_TEST(regedit) test_comments(); test_import_with_whitespace(); test_key_creation_and_deletion(); + test_value_deletion(); }

1 0

Hugh McMaster : regedit/tests: Add tests for key creation and key deletion.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 247e611de553e6e8cf9fc64aff731dd048846fe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=247e611de553e6e8cf9fc64af… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 8 09:04:20 2017 +0000 regedit/tests: Add tests for key creation and key deletion. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 104 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index d145f0b..28e5c1d 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -163,6 +163,33 @@ static void r_verify_reg_nonexist(unsigned line, HKEY key, const char *value_nam value_name); } +#define verify_key_exist(k,s) verify_key_exist_(__LINE__,k,s) +static void verify_key_exist_(unsigned line, HKEY key_base, const char *subkey) +{ + HKEY hkey; + LONG lr; + + lr = RegOpenKeyExA(key_base, subkey, 0, KEY_READ, &hkey); + lok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: got %d\n", lr); + + if (hkey) + RegCloseKey(hkey); +} + +#define verify_key_nonexist(k,s) verify_key_nonexist_(__LINE__,k,s) +static void verify_key_nonexist_(unsigned line, HKEY key_base, const char *subkey) +{ + HKEY hkey; + LONG lr; + + lr = RegOpenKeyExA(key_base, subkey, 0, KEY_READ, &hkey); + lok(lr == ERROR_FILE_NOT_FOUND, "registry key '%s' shouldn't exist; got %d, expected 2\n", + subkey, lr); + + if (hkey) + RegCloseKey(hkey); +} + #define KEY_BASE "Software\\Wine\\regedit_test" static void test_basic_import(void) @@ -1110,6 +1137,82 @@ static void test_import_with_whitespace(void) ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); } +static void test_key_creation_and_deletion(void) +{ + HKEY hkey; + LONG lr; + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n"); + + lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: got %d, expected 0\n", lr); + + /* Test key creation */ + exec_import_str("REGEDIT4\n\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\No_Opening_Bracket]\n"); + verify_key_nonexist(hkey, "No_Opening_Bracket"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\No_Closing_Bracket\n"); + todo_wine verify_key_nonexist(hkey, "No_Closing_Bracket"); + + exec_import_str("REGEDIT4\n\n" + "[ HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1a]\n"); + verify_key_nonexist(hkey, "Subkey1a"); + + exec_import_str("REGEDIT4\n\n" + "[\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1b]\n"); + verify_key_nonexist(hkey, "Subkey1b"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1c ]\n"); + verify_key_exist(hkey, "Subkey1c "); + lr = RegDeleteKeyA(hkey, "Subkey1c "); + ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1d\t]\n"); + verify_key_exist(hkey, "Subkey1d\t"); + lr = RegDeleteKeyA(hkey, "Subkey1d\t"); + ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); + + /* Test key deletion. We start by creating some registry keys. */ + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n\n"); + verify_key_exist(hkey, "Subkey2a"); + verify_key_exist(hkey, "Subkey2b"); + + exec_import_str("REGEDIT4\n\n" + "[ -HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n"); + verify_key_exist(hkey, "Subkey2a"); + + exec_import_str("REGEDIT4\n\n" + "[\t-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n"); + verify_key_exist(hkey, "Subkey2b"); + + exec_import_str("REGEDIT4\n\n" + "[- HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n"); + verify_key_exist(hkey, "Subkey2a"); + + exec_import_str("REGEDIT4\n\n" + "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b\t]\n"); + verify_key_exist(hkey, "Subkey2b"); + + exec_import_str("REGEDIT4\n\n" + "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" + "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n\n"); + verify_key_nonexist(hkey, "Subkey2a"); + verify_key_nonexist(hkey, "Subkey2b"); + + lr = RegCloseKey(hkey); + ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); + + lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); +} + START_TEST(regedit) { WCHAR wchar_test[] = {0xFEFF,'W','i','n','d','o','w','s',' ','R','e','g', @@ -1129,4 +1232,5 @@ START_TEST(regedit) test_invalid_import_31(); test_comments(); test_import_with_whitespace(); + test_key_creation_and_deletion(); }

1 0

Hugh McMaster : reg/tests: Add tests for deleting registry values during the import operation.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 80d248c5f989f9ce3319ffbab4ac8d2d1e016fb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d248c5f989f9ce3319ffbab… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 8 09:04:12 2017 +0000 reg/tests: Add tests for deleting registry values during the import operation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 4dd8817..58e003a 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1687,6 +1687,40 @@ static void test_import(void) todo_wine verify_key_nonexist(hkey, "Subkey2a"); todo_wine verify_key_nonexist(hkey, "Subkey2b"); + /* Test value deletion. We start by creating some registry values. */ + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine46a\"=\"Test Value\"\n" + "\"Wine46b\"=dword:00000008\n" + "\"Wine46c\"=hex:11,22,33,44\n" + "\"Wine46d\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine46e\"=hex(2):25,50,41,54,48,25,00\n" + "\"Wine46f\"=hex(0):56,00,61,00,6c,00,75,00,65,00,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine46a", REG_SZ, "Test Value", 11, 0); + todo_wine verify_reg(hkey, "Wine46b", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg(hkey, "Wine46c", REG_BINARY, hex, 4, 0); + todo_wine verify_reg(hkey, "Wine46d", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + todo_wine verify_reg(hkey, "Wine46e", REG_EXPAND_SZ, "%PATH%", 7, 0); + todo_wine verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine46a\"=-\n" + "\"Wine46b\"= -\n" + "\"Wine46c\"= \t-\t \n" + "\"Wine46d\"=-\"Test\"\n" + "\"Wine46e\"=- ;comment\n" + "\"Wine46f\"=- #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, "Wine46a"); + todo_wine verify_reg_nonexist(hkey, "Wine46b"); + todo_wine verify_reg_nonexist(hkey, "Wine46c"); + todo_wine verify_reg(hkey, "Wine46d", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + todo_wine verify_reg_nonexist(hkey, "Wine46e"); + todo_wine verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -2541,6 +2575,41 @@ static void test_import(void) todo_wine verify_key_nonexist(hkey, "Subkey2a"); todo_wine verify_key_nonexist(hkey, "Subkey2b"); + /* Test value deletion. We start by creating some registry values. */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine46a\"=\"Test Value\"\n" + "\"Wine46b\"=dword:00000008\n" + "\"Wine46c\"=hex:11,22,33,44\n" + "\"Wine46d\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" + " 63,00,6f,00,6e,00,63,00,61,00,74,00,\\\n" + " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n" + "\"Wine46e\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine46f\"=hex(0):56,00,61,00,6c,00,75,00,65,00,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine46a", REG_SZ, "Test Value", 11, 0); + todo_wine verify_reg(hkey, "Wine46b", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg(hkey, "Wine46c", REG_BINARY, hex, 4, 0); + todo_wine verify_reg(hkey, "Wine46d", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + todo_wine verify_reg(hkey, "Wine46e", REG_EXPAND_SZ, "%PATH%", 7, 0); + todo_wine verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine46a\"=-\n" + "\"Wine46b\"= -\n" + "\"Wine46c\"= \t-\t \n" + "\"Wine46d\"=-\"Test\"\n" + "\"Wine46e\"=- ;comment\n" + "\"Wine46f\"=- #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, "Wine46a"); + todo_wine verify_reg_nonexist(hkey, "Wine46b"); + todo_wine verify_reg_nonexist(hkey, "Wine46c"); + todo_wine verify_reg(hkey, "Wine46d", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + todo_wine verify_reg_nonexist(hkey, "Wine46e"); + todo_wine verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 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 key creation and deletion.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: c36eeee605041431e9836f3aaeb3c7acd90fbefd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c36eeee605041431e9836f3aa… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 8 09:04:04 2017 +0000 reg/tests: Add tests for key creation and deletion. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 167 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 167 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 393e23b..4dd8817 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -91,6 +91,33 @@ static void verify_reg_nonexist_(unsigned line, HKEY hkey, const char *value) value, err); } +#define verify_key_exist(k,s) verify_key_exist_(__LINE__,k,s) +static void verify_key_exist_(unsigned line, HKEY key_base, const char *subkey) +{ + HKEY hkey; + LONG err; + + err = RegOpenKeyExA(key_base, subkey, 0, KEY_READ, &hkey); + lok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %d\n", err); + + if (hkey) + RegCloseKey(hkey); +} + +#define verify_key_nonexist(k,s) verify_key_nonexist_(__LINE__,k,s) +static void verify_key_nonexist_(unsigned line, HKEY key_base, const char *subkey) +{ + HKEY hkey; + LONG err; + + err = RegOpenKeyExA(key_base, subkey, 0, KEY_READ, &hkey); + lok(err == ERROR_FILE_NOT_FOUND, "registry key '%s' shouldn't exist; got %d, expected 2\n", + subkey, err); + + if (hkey) + RegCloseKey(hkey); +} + static void test_add(void) { HKEY hkey, subkey; @@ -1590,6 +1617,76 @@ static void test_import(void) err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\Subkey/2"); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + /* Test key creation */ + test_import_str("REGEDIT4\n\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\No_Opening_Bracket]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_nonexist(hkey, "No_Opening_Bracket"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\No_Closing_Bracket\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_nonexist(hkey, "No_Closing_Bracket"); + + test_import_str("REGEDIT4\n\n" + "[ HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1a]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_nonexist(hkey, "Subkey1a"); + + test_import_str("REGEDIT4\n\n" + "[\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1b]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_nonexist(hkey, "Subkey1b"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1c ]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_exist(hkey, "Subkey1c "); + err = RegDeleteKeyA(hkey, "Subkey1c "); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1d\t]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_exist(hkey, "Subkey1d\t"); + err = RegDeleteKeyA(hkey, "Subkey1d\t"); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + /* Test key deletion. We start by creating some registry keys. */ + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_exist(hkey, "Subkey2a"); + todo_wine verify_key_exist(hkey, "Subkey2b"); + + test_import_str("REGEDIT4\n\n" + "[ -HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_exist(hkey, "Subkey2a"); + + test_import_str("REGEDIT4\n\n" + "[\t-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_exist(hkey, "Subkey2b"); + + test_import_str("REGEDIT4\n\n" + "[- HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_exist(hkey, "Subkey2a"); + + test_import_str("REGEDIT4\n\n" + "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b\t]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_exist(hkey, "Subkey2b"); + + test_import_str("REGEDIT4\n\n" + "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" + "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_nonexist(hkey, "Subkey2a"); + todo_wine verify_key_nonexist(hkey, "Subkey2b"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -2374,6 +2471,76 @@ static void test_import(void) err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\Subkey/2"); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + /* Test key creation */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\No_Opening_Bracket]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_nonexist(hkey, "No_Opening_Bracket"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\No_Closing_Bracket\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_nonexist(hkey, "No_Closing_Bracket"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[ HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1a]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_nonexist(hkey, "Subkey1a"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1b]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_nonexist(hkey, "Subkey1b"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1c ]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_exist(hkey, "Subkey1c "); + todo_wine err = RegDeleteKeyA(hkey, "Subkey1c "); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1d\t]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_exist(hkey, "Subkey1d\t"); + todo_wine err = RegDeleteKeyA(hkey, "Subkey1d\t"); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + /* Test key deletion. We start by creating some registry keys. */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_exist(hkey, "Subkey2a"); + todo_wine verify_key_exist(hkey, "Subkey2b"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[ -HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_exist(hkey, "Subkey2a"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[\t-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_exist(hkey, "Subkey2b"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[- HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_exist(hkey, "Subkey2a"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b\t]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_exist(hkey, "Subkey2b"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" + "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_nonexist(hkey, "Subkey2a"); + todo_wine verify_key_nonexist(hkey, "Subkey2b"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Alexandre Julliard : wineandroid: Implement ToUnicodeEx.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 6f4149d8423b975717fd587dfa421e4b65c4b70f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f4149d8423b975717fd587df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 8 16:44:43 2017 +0200 wineandroid: Implement ToUnicodeEx. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/keyboard.c | 95 +++++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 2 files changed, 96 insertions(+) diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index d9a8326..b3ac76f 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -32,6 +32,7 @@ #include "config.h" #include "android.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(keyboard); @@ -554,3 +555,97 @@ jboolean keyboard_event( JNIEnv *env, jobject obj, jint win, jint action, jint k send_event( &data ); return JNI_TRUE; } + + +/*********************************************************************** + * ANDROID_ToUnicodeEx + */ +INT CDECL ANDROID_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, + LPWSTR buf, int size, UINT flags, HKL hkl ) +{ + WCHAR buffer[2]; + BOOL shift = (state[VK_SHIFT] & 0x80) || (state[VK_CAPITAL] & 0x01); + BOOL ctrl = state[VK_CONTROL] & 0x80; + BOOL numlock = state[VK_NUMLOCK] & 0x01; + + buffer[0] = buffer[1] = 0; + + if (scan & 0x8000) return 0; /* key up */ + + /* FIXME: hardcoded layout */ + + if (!ctrl) + { + switch (virt) + { + case VK_BACK: buffer[0] = '\b'; break; + case VK_OEM_1: buffer[0] = shift ? ':' : ';'; break; + case VK_OEM_2: buffer[0] = shift ? '?' : '/'; break; + case VK_OEM_3: buffer[0] = shift ? '~' : '`'; break; + case VK_OEM_4: buffer[0] = shift ? '{' : '['; break; + case VK_OEM_5: buffer[0] = shift ? '|' : '\\'; break; + case VK_OEM_6: buffer[0] = shift ? '}' : ']'; break; + case VK_OEM_7: buffer[0] = shift ? '"' : '\''; break; + case VK_OEM_COMMA: buffer[0] = shift ? '<' : ','; break; + case VK_OEM_MINUS: buffer[0] = shift ? '_' : '-'; break; + case VK_OEM_PERIOD: buffer[0] = shift ? '>' : '.'; break; + case VK_OEM_PLUS: buffer[0] = shift ? '+' : '='; break; + case VK_RETURN: buffer[0] = '\r'; break; + case VK_SPACE: buffer[0] = ' '; break; + case VK_TAB: buffer[0] = '\t'; break; + case VK_MULTIPLY: buffer[0] = '*'; break; + case VK_ADD: buffer[0] = '+'; break; + case VK_SUBTRACT: buffer[0] = '-'; break; + case VK_DIVIDE: buffer[0] = '/'; break; + default: + if (virt >= '0' && virt <= '9') + { + buffer[0] = shift ? ")!@#$%^&*("[virt - '0'] : virt; + break; + } + if (virt >= 'A' && virt <= 'Z') + { + buffer[0] = shift ? virt : virt + 'a' - 'A'; + break; + } + if (virt >= VK_NUMPAD0 && virt <= VK_NUMPAD9 && numlock && !shift) + { + buffer[0] = '0' + virt - VK_NUMPAD0; + break; + } + if (virt == VK_DECIMAL && numlock && !shift) + { + buffer[0] = '.'; + break; + } + break; + } + } + else /* Control codes */ + { + if (virt >= 'A' && virt <= 'Z') + buffer[0] = virt - 'A' + 1; + else + { + switch (virt) + { + case VK_OEM_4: + buffer[0] = 0x1b; + break; + case VK_OEM_5: + buffer[0] = 0x1c; + break; + case VK_OEM_6: + buffer[0] = 0x1d; + break; + case VK_SUBTRACT: + buffer[0] = 0x1e; + break; + } + } + } + + lstrcpynW( buf, buffer, size ); + TRACE( "returning %d / %s\n", strlenW( buffer ), debugstr_wn(buf, strlenW( buffer ))); + return strlenW( buffer ); +} diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index f893299..1a74624 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -4,6 +4,7 @@ # USER driver +@ cdecl ToUnicodeEx(long long ptr ptr long long long) ANDROID_ToUnicodeEx @ cdecl EnumDisplayMonitors(long ptr ptr long) ANDROID_EnumDisplayMonitors @ cdecl GetMonitorInfo(long ptr) ANDROID_GetMonitorInfo @ cdecl CreateWindow(long) ANDROID_CreateWindow

1 0

Alexandre Julliard : wineandroid: Add support for keyboard events.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 8dc11a3ab31b5d5ef84a21750110438c21d53145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dc11a3ab31b5d5ef84a21750… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 8 16:44:20 2017 +0200 wineandroid: Add support for keyboard events. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/Makefile.in | 1 + dlls/wineandroid.drv/WineActivity.java | 15 + dlls/wineandroid.drv/android.h | 9 + dlls/wineandroid.drv/init.c | 1 + dlls/wineandroid.drv/keyboard.c | 556 +++++++++++++++++++++++++++++++++ dlls/wineandroid.drv/window.c | 15 + 6 files changed, 597 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8dc11a3ab31b5d5ef84a2…

1 0

Alexandre Julliard : wineandroid: Add support for mouse events.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: db742a49c9efdaecbb44bc3d4bdf5e78757f30f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db742a49c9efdaecbb44bc3d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 8 10:16:41 2017 +0200 wineandroid: Add support for mouse events. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 39 +++++++++++ dlls/wineandroid.drv/android.h | 10 +++ dlls/wineandroid.drv/init.c | 1 + dlls/wineandroid.drv/window.c | 115 +++++++++++++++++++++++++++++++++ 4 files changed, 165 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db742a49c9efdaecbb44b…

1 0

Alexandre Julliard : wineandroid: Implement SetCapture and store the capture window in the desktop process for global captures.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: b0690b13da5d4d8f120241068338e259e48cb913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0690b13da5d4d8f120241068… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 8 10:08:40 2017 +0200 wineandroid: Implement SetCapture and store the capture window in the desktop process for global captures. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/android.h | 2 ++ dlls/wineandroid.drv/device.c | 37 +++++++++++++++++++++++++++++++ dlls/wineandroid.drv/window.c | 10 +++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 4 files changed, 50 insertions(+) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index f3dd019..3d1a676 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -61,6 +61,7 @@ extern int ioctl_window_pos_changed( HWND hwnd, const RECT *window_rect, const R const RECT *visible_rect, UINT style, UINT flags, HWND after, HWND owner ) DECLSPEC_HIDDEN; extern int ioctl_set_window_parent( HWND hwnd, HWND parent ) DECLSPEC_HIDDEN; +extern int ioctl_set_capture( HWND hwnd ) DECLSPEC_HIDDEN; /************************************************************************** @@ -77,6 +78,7 @@ enum android_window_messages WM_ANDROID_REFRESH = 0x80001000, }; +extern HWND get_capture_window(void) DECLSPEC_HIDDEN; extern void init_monitors( int width, int height ) DECLSPEC_HIDDEN; /* JNI entry points */ diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index eafaf04..3829e69 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -52,6 +52,7 @@ extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ); static HANDLE stop_event; static HANDLE thread; static JNIEnv *jni_env; +static HWND capture_window; #define ANDROIDCONTROLTYPE ((ULONG)'A') #define ANDROID_IOCTL(n) CTL_CODE(ANDROIDCONTROLTYPE, n, METHOD_BUFFERED, FILE_READ_ACCESS) @@ -68,6 +69,7 @@ enum android_ioctl IOCTL_QUERY, IOCTL_PERFORM, IOCTL_SET_SWAP_INT, + IOCTL_SET_CAPTURE, NB_IOCTLS }; @@ -195,6 +197,11 @@ struct ioctl_android_set_window_parent int parent; }; +struct ioctl_android_set_capture +{ + struct ioctl_header hdr; +}; + static inline BOOL is_in_desktop_process(void) { return thread != NULL; @@ -407,6 +414,7 @@ static void free_native_win_data( struct native_win_data *data ) { unsigned int idx = data_map_idx( data->hwnd ); + InterlockedCompareExchangePointer( (void **)&capture_window, 0, data->hwnd ); release_native_window( data ); HeapFree( GetProcessHeap(), 0, data ); data_map[idx] = NULL; @@ -465,6 +473,12 @@ void register_native_window( HWND hwnd, struct ANativeWindow *win ) NtQueueApcThread( thread, register_native_window_callback, (ULONG_PTR)hwnd, (ULONG_PTR)win, 0 ); } +/* get the capture window stored in the desktop process */ +HWND get_capture_window(void) +{ + return capture_window; +} + static NTSTATUS android_error_to_status( int err ) { switch (err) @@ -861,6 +875,20 @@ static NTSTATUS setWindowParent_ioctl( void *data, DWORD in_size, DWORD out_size return STATUS_SUCCESS; } +static NTSTATUS setCapture_ioctl( void *data, DWORD in_size, DWORD out_size, ULONG_PTR *ret_size ) +{ + struct ioctl_android_set_capture *res = data; + + if (in_size < sizeof(*res)) return STATUS_INVALID_PARAMETER; + + if (res->hdr.hwnd && !get_ioctl_native_win_data( &res->hdr )) return STATUS_INVALID_HANDLE; + + TRACE( "hwnd %08x\n", res->hdr.hwnd ); + + InterlockedExchangePointer( (void **)&capture_window, LongToHandle( res->hdr.hwnd )); + return STATUS_SUCCESS; +} + typedef NTSTATUS (*ioctl_func)( void *in, DWORD in_size, DWORD out_size, ULONG_PTR *ret_size ); static const ioctl_func ioctl_funcs[] = { @@ -874,6 +902,7 @@ static const ioctl_func ioctl_funcs[] = query_ioctl, /* IOCTL_QUERY */ perform_ioctl, /* IOCTL_PERFORM */ setSwapInterval_ioctl, /* IOCTL_SET_SWAP_INT */ + setCapture_ioctl, /* IOCTL_SET_CAPTURE */ }; static NTSTATUS WINAPI ioctl_callback( DEVICE_OBJECT *device, IRP *irp ) @@ -1395,3 +1424,11 @@ int ioctl_set_window_parent( HWND hwnd, HWND parent ) req.parent = parent == GetDesktopWindow() ? 0 : HandleToLong( parent ); return android_ioctl( IOCTL_SET_WINDOW_PARENT, &req, sizeof(req), NULL, NULL ); } + +int ioctl_set_capture( HWND hwnd ) +{ + struct ioctl_android_set_capture req; + + req.hdr.hwnd = HandleToLong( hwnd ); + return android_ioctl( IOCTL_SET_CAPTURE, &req, sizeof(req), NULL, NULL ); +} diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index a663505..a8a1623 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -1034,6 +1034,16 @@ void CDECL ANDROID_SetParent( HWND hwnd, HWND parent, HWND old_parent ) /*********************************************************************** + * ANDROID_SetCapture + */ +void CDECL ANDROID_SetCapture( HWND hwnd, UINT flags ) +{ + if (!(flags & (GUI_INMOVESIZE | GUI_INMENUMODE))) return; + ioctl_set_capture( hwnd ); +} + + +/*********************************************************************** * ANDROID_SetWindowStyle */ void CDECL ANDROID_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 3605241..f893299 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -9,6 +9,7 @@ @ cdecl CreateWindow(long) ANDROID_CreateWindow @ cdecl DestroyWindow(long) ANDROID_DestroyWindow @ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) ANDROID_MsgWaitForMultipleObjectsEx +@ cdecl SetCapture(long long) ANDROID_SetCapture @ cdecl SetLayeredWindowAttributes(long long long long) ANDROID_SetLayeredWindowAttributes @ cdecl SetParent(long long long) ANDROID_SetParent @ cdecl SetWindowRgn(long long long) ANDROID_SetWindowRgn

1 0

Alexandre Julliard : wineandroid: Properly clean up windows that aren' t destroyed explicitly.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: c339d7214c2a86592c01a3b4932d498acb237417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c339d7214c2a86592c01a3b49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 8 10:08:15 2017 +0200 wineandroid: Properly clean up windows that aren't destroyed explicitly. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 2 ++ dlls/wineandroid.drv/window.c | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index f12de98..428e79c 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -314,7 +314,9 @@ public class WineActivity extends Activity public void destroy() { Log.i( LOGTAG, String.format( "destroy hwnd %08x", hwnd )); + if (visible && window_view != null) top_view.removeView( window_view ); visible = false; + window_view = null; win_map.remove( this ); } diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index e3fd865..a663505 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -828,8 +828,6 @@ BOOL CDECL ANDROID_CreateWindow( HWND hwnd ) init_event_queue(); start_android_device(); - desktop_orig_wndproc = (WNDPROC)SetWindowLongPtrW( hwnd, GWLP_WNDPROC, - (LONG_PTR)desktop_wndproc_wrapper ); if (!(data = alloc_win_data( hwnd ))) return FALSE; release_win_data( data ); } @@ -1214,6 +1212,9 @@ LRESULT CDECL ANDROID_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) */ BOOL CDECL ANDROID_create_desktop( UINT width, UINT height ) { + desktop_orig_wndproc = (WNDPROC)SetWindowLongPtrW( GetDesktopWindow(), GWLP_WNDPROC, + (LONG_PTR)desktop_wndproc_wrapper ); + /* wait until we receive the surface changed event */ while (!screen_width) {

1 0

Alexandre Julliard : explorer: Allow the driver to override the desktop winproc at creation time.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: e6fdea726a2016ce712d335e2b3d90eb3327dc48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6fdea726a2016ce712d335e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 8 10:08:04 2017 +0200 explorer: Allow the driver to override the desktop winproc at creation time. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/desktop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 4088dd4..a2d9e1a 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -978,8 +978,8 @@ void manage_desktop( WCHAR *arg ) CreateWindowExW( 0, messageW, NULL, WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 100, 100, 0, 0, 0, NULL ); - using_root = !desktop || !create_desktop( graphics_driver, name, width, height ); SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); + using_root = !desktop || !create_desktop( graphics_driver, name, width, height ); SendMessageW( hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW( 0, MAKEINTRESOURCEW(OIC_WINLOGO))); if (name) set_desktop_window_title( hwnd, name ); SetWindowPos( hwnd, 0, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN),

1 0

Alexandre Julliard : Revert "winetest: Get the work directory directly from the web server."
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: tools Branch: master Commit: 02c466dd9c3f8cefdbf7f03cfca1f2fce99e4eae URL: http://source.winehq.org/git/tools.git/?a=commit;h=02c466dd9c3f8cefdbf7f03c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 8 16:18:01 2017 +0200 Revert "winetest: Get the work directory directly from the web server." This reverts commit 0708ab216e005ae740a5346ca6ae1bb308cbe6a5. It doesn't work with the Apache configuration on the WineHQ server. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/vhost_winetest.conf | 1 - winetest/winetest.cgi | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/winetest/vhost_winetest.conf b/winetest/vhost_winetest.conf index 6d72ccc..797aac3 100644 --- a/winetest/vhost_winetest.conf +++ b/winetest/vhost_winetest.conf @@ -17,7 +17,6 @@ BEGIN { unshift @INC, "/home/wine/tools/winetest"; - $::workdir = "/home/winehq/sites/winetest"; } </Perl> diff --git a/winetest/winetest.cgi b/winetest/winetest.cgi index a2aebef..9a4ad71 100755 --- a/winetest/winetest.cgi +++ b/winetest/winetest.cgi @@ -18,7 +18,7 @@ use strict; use warnings; -use vars qw/$maxfilesize/; +use vars qw/$workdir $maxfilesize/; BEGIN { require "winetest.conf"; @@ -29,7 +29,7 @@ use File::Temp qw(tempdir); use CGI qw(:standard); # Cater for some overhead $CGI::POST_MAX = $maxfilesize + 1024; -$ENV{TMPDIR} = "$::workdir/queue"; +$ENV{TMPDIR} = "$workdir/queue"; my $name = param ("reportfile"); my $error = cgi_error (); @@ -47,7 +47,7 @@ sub move_file($) { my ($filename) = @_; my $orig = tmpFileName($filename); - my $tmpdir = tempdir ("repXXXXX", DIR => "$::workdir/queue"); + my $tmpdir = tempdir ("repXXXXX", DIR => "$workdir/queue"); chmod 0777, $tmpdir; chmod 0666&~umask, $orig; my $size = -s $orig;

1 0

Alexandre Julliard : Revert "winetest: Let the scripts autodetect the work directory."
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: tools Branch: master Commit: 80227edd9887f6ca1bde397ec9199298ec41bcaf URL: http://source.winehq.org/git/tools.git/?a=commit;h=80227edd9887f6ca1bde397e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 8 16:17:34 2017 +0200 Revert "winetest: Let the scripts autodetect the work directory." This reverts commit c9170c8554a3837712b40f529c56165bbbc9f347. It doesn't work with the Apache configuration on the WineHQ server. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/INSTALL.txt | 1 + winetest/build-errors | 10 ++-------- winetest/build-index | 13 +++---------- winetest/dissect | 13 +++---------- winetest/gather | 14 ++++---------- winetest/winetest.conf | 2 ++ 6 files changed, 15 insertions(+), 38 deletions(-) diff --git a/winetest/INSTALL.txt b/winetest/INSTALL.txt index b10788c..d13d1cf 100644 --- a/winetest/INSTALL.txt +++ b/winetest/INSTALL.txt @@ -32,6 +32,7 @@ Read-only source code account: should be available as $HOME/tools/winetest/INSTALL.txt). git clone git://source.winehq.org/git/tools.git - Edit $HOME/tools/winetest/winetest.conf to set: + $workdir = "/home/winehq/sites/winetest"; $gitdir = "/home/wine/wine.git"; Web site account: diff --git a/winetest/build-errors b/winetest/build-errors index f41824f..2d25ae3 100755 --- a/winetest/build-errors +++ b/winetest/build-errors @@ -33,7 +33,8 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } - +use vars qw/$workdir/; +require "winetest.conf"; my $name0=$0; $name0 =~ s+^.*/++; @@ -62,13 +63,6 @@ sub long_date($) # Generate a table of the errors encountered during processing # -require Cwd; -my $workdir = Cwd::cwd(); -if (!-f "$workdir/report.css") -{ - error("'$workdir' is not a valid work directory\n"); - exit 2; -} chdir($workdir) or die "could not chdir to the work directory: $!"; my @errors; diff --git a/winetest/build-index b/winetest/build-index index dc413cd..dcd9795 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -34,7 +34,7 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } -use vars qw/$gitdir $gitweb/; +use vars qw/$workdir $gitdir $gitweb/; require "winetest.conf"; my $name0=$0; @@ -62,11 +62,11 @@ sub get_build_info($) { ($date, $subject) = ($1, $2); # Make sure the directory's mtime matches the commit time - utime $date, $date, "data/$build"; + utime $date, $date, "$workdir/data/$build"; } else { - $date = (stat "data/$build")[9]; + $date = (stat "$workdir/data/$build")[9]; $subject = ""; } return ($date, $subject); @@ -113,13 +113,6 @@ my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \% # Grab the build list and archive the old results # -require Cwd; -my $workdir = Cwd::cwd(); -if (!-f "$workdir/report.css") -{ - error("'$workdir' is not a valid work directory\n"); - exit 2; -} chdir($workdir) or die "could not chdir to the work directory: $!"; my @builds; diff --git a/winetest/dissect b/winetest/dissect index 1e4a5fe..99e50fb 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -48,7 +48,7 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } -use vars qw/$gitdir $gitweb $maxmult $maxuserskips $maxfailedtests $maxfilesize $acceptprediluvianwin/; +use vars qw/$workdir $gitdir $gitweb $maxmult $maxuserskips $maxfailedtests $maxfilesize $acceptprediluvianwin/; require "winetest.conf"; my $name0=$0; @@ -81,11 +81,11 @@ sub get_build_info($) { ($date, $subject) = ($1, $2); # Make sure the directory's mtime matches the commit time - utime $date, $date, "data/$build"; + utime $date, $date, "$workdir/data/$build"; } else { - $date = (stat "data/$build")[9]; + $date = (stat "$workdir/data/$build")[9]; $subject = ""; } return ($date, $subject); @@ -105,13 +105,6 @@ sub short_date($) # Command line processing # -require Cwd; -my $workdir = Cwd::cwd(); -if (!-f "$workdir/report.css") -{ - error("'$workdir' is not a valid work directory\n"); - exit 2; -} chdir($workdir) or die "could not chdir to the work directory: $!"; my ($update, $report); diff --git a/winetest/gather b/winetest/gather index 28227a3..94f3541 100755 --- a/winetest/gather +++ b/winetest/gather @@ -45,7 +45,7 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } -use vars qw/$gitdir $gitweb/; +use vars qw/$workdir $gitdir $gitweb/; require "winetest.conf"; my $name0=$0; @@ -76,11 +76,11 @@ sub get_build_info($) { ($date, $subject) = ($1, $2); # Make sure the directory's mtime matches the commit time - utime $date, $date, "data/$build"; + utime $date, $date, "$workdir/data/$build"; } else { - $date = (stat "data/$build")[9]; + $date = (stat "$workdir/data/$build")[9]; $subject = ""; } return ($date, $subject); @@ -175,13 +175,7 @@ my %idmap = (95=>\%w95, 98=>\%w98, me=>\%me, nt3=>\%nt3, nt4=>\%nt4, 2000=>\%w2k # Pick a build to work on # -require Cwd; -my $workdir = Cwd::cwd(); -if (!-f "$workdir/report.css") -{ - error("'$workdir' is not a valid work directory\n"); - exit 2; -} + chdir($workdir) or die "could not chdir to the work directory: $!"; my ($outdated,undef) = glob "data/*/outdated"; diff --git a/winetest/winetest.conf b/winetest/winetest.conf index 0d35d11..ba15514 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -1,5 +1,7 @@ # Hey Emacs! This is a -*-cperl-*- file! +$workdir = "/home/winehq/opt/winetest"; + $gitdir = "/home/winehq/opt/source/git/wine.git"; $gitweb = "//source.winehq.org/git/wine.git";

1 0

Henri Verbeet : wined3d: Use WINED3D_CS_QUEUE_MAP for WINED3D_CS_OP_UPDATE_SUB_RESOURCE.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: e0e4f9bbcda1243b9317dbfbeeff84a18b4e855c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0e4f9bbcda1243b9317dbfbe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 7 21:31:54 2017 +0200 wined3d: Use WINED3D_CS_QUEUE_MAP for WINED3D_CS_OP_UPDATE_SUB_RESOURCE. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 6 +++--- dlls/wined3d/device.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 1e1d69e..c7df670 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2146,7 +2146,7 @@ void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_r { struct wined3d_cs_update_sub_resource *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_MAP); op->opcode = WINED3D_CS_OP_UPDATE_SUB_RESOURCE; op->resource = resource; op->sub_resource_idx = sub_resource_idx; @@ -2157,10 +2157,10 @@ void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_r wined3d_resource_acquire(resource); - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + cs->ops->submit(cs, WINED3D_CS_QUEUE_MAP); /* The data pointer may go away, so we need to wait until it is read. * Copying the data may be faster if it's small. */ - cs->ops->finish(cs, WINED3D_CS_QUEUE_DEFAULT); + cs->ops->finish(cs, WINED3D_CS_QUEUE_MAP); } static void wined3d_cs_exec_add_dirty_texture_region(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e07d07c..ded4af6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4216,6 +4216,8 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str return; } + wined3d_resource_wait_idle(resource); + wined3d_cs_emit_update_sub_resource(device->cs, resource, sub_resource_idx, box, data, row_pitch, depth_pitch); }

1 0

Henri Verbeet : d2d1: Fix the segment count for open figures.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: 4dcdc80ad58673f3aba48130d975c8b8d171d01b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dcdc80ad58673f3aba48130d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 7 21:31:53 2017 +0200 d2d1: Fix the segment count for open figures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 2 +- dlls/d2d1/tests/d2d1.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 0a60561..31a3eda 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2105,7 +2105,6 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_BeginFigure(ID2D1GeometrySink *i } geometry->u.path.state = D2D_GEOMETRY_STATE_FIGURE; - ++geometry->u.path.segment_count; } static void STDMETHODCALLTYPE d2d_geometry_sink_AddLines(ID2D1GeometrySink *iface, @@ -2196,6 +2195,7 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_EndFigure(ID2D1GeometrySink *ifa figure->vertex_types[figure->vertex_count - 1] = D2D_VERTEX_TYPE_LINE; if (figure_end == D2D1_FIGURE_END_CLOSED) { + ++geometry->u.path.segment_count; figure->flags |= D2D_FIGURE_FLAG_CLOSED; if (!memcmp(&figure->vertices[0], &figure->vertices[figure->vertex_count - 1], sizeof(*figure->vertices))) --figure->vertex_count; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d1f8398..0adeef4 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -2528,6 +2528,9 @@ static void test_path_geometry(void) hr = ID2D1GeometrySink_Close(sink); ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr); ID2D1GeometrySink_Release(sink); + hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count); + ok(SUCCEEDED(hr), "Failed to get segment count, hr %#x.\n", hr); + ok(count == 2, "Got unexpected segment count %u.\n", count); geometry_sink_init(&simplify_sink); hr = ID2D1PathGeometry_Simplify(geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES,

1 0

Henri Verbeet : d2d1: Implement d2d_path_geometry_Simplify().
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: 09ff685aa009a80af552ea7113d8b21e4d3c89ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=09ff685aa009a80af552ea711… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 7 21:31:52 2017 +0200 d2d1: Implement d2d_path_geometry_Simplify(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 165 +++++++++++++- dlls/d2d1/tests/d2d1.c | 577 ++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 660 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=09ff685aa009a80af552e…

1 0

Henri Verbeet : d2d1: Implement d2d_transformed_geometry_Simplify().
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: 208eb09e3c850cd63d719c2a23765b650fd306b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=208eb09e3c850cd63d719c2a2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 7 21:31:51 2017 +0200 d2d1: Implement d2d_transformed_geometry_Simplify(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 11 +++++++++-- dlls/d2d1/tests/d2d1.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index ab1d3ba..2d0cd1f 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -3159,10 +3159,17 @@ static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_Simplify(ID2D1Transfor D2D1_GEOMETRY_SIMPLIFICATION_OPTION option, const D2D1_MATRIX_3X2_F *transform, float tolerance, ID2D1SimplifiedGeometrySink *sink) { - FIXME("iface %p, option %#x, transform %p, tolerance %.8e, sink %p stub!\n", + struct d2d_geometry *geometry = impl_from_ID2D1TransformedGeometry(iface); + D2D1_MATRIX_3X2_F g; + + TRACE("iface %p, option %#x, transform %p, tolerance %.8e, sink %p.\n", iface, option, transform, tolerance, sink); - return E_NOTIMPL; + g = geometry->transform; + if (transform) + d2d_matrix_multiply(&g, transform); + + return ID2D1Geometry_Simplify(geometry->u.transformed.src_geometry, option, &g, tolerance, sink); } static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_Tessellate(ID2D1TransformedGeometry *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 7ad4d34..768f8e7 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -2154,6 +2154,22 @@ static void test_rectangle_geometry(void) {SEGMENT_LINE, {{{35.0f, 45.0f}}}}, {SEGMENT_LINE, {{{35.0f, 45.0f}}}}, {SEGMENT_LINE, {{{30.0f, 45.0f}}}}, + /* Figure 4. */ + {SEGMENT_LINE, {{{ 1.07179585e+01f, 2.23205078e+02f}}}}, + {SEGMENT_LINE, {{{-5.85640755e+01f, 2.73205078e+02f}}}}, + {SEGMENT_LINE, {{{-7.85640717e+01f, 2.29903809e+02f}}}}, + /* Figure 5. */ + {SEGMENT_LINE, {{{40.0f, 20.0f}}}}, + {SEGMENT_LINE, {{{40.0f, 40.0f}}}}, + {SEGMENT_LINE, {{{30.0f, 40.0f}}}}, + /* Figure 6. */ + {SEGMENT_LINE, {{{ 2.14359169e+01f, 0.0f}}}}, + {SEGMENT_LINE, {{{-1.17128151e+02f, 0.0f}}}}, + {SEGMENT_LINE, {{{-1.57128143e+02f, 0.0f}}}}, + /* Figure 7. */ + {SEGMENT_LINE, {{{0.0f, 1.11602539e+02f}}}}, + {SEGMENT_LINE, {{{0.0f, 1.36602539e+02f}}}}, + {SEGMENT_LINE, {{{0.0f, 1.14951904e+02f}}}}, }; static const struct expected_geometry_figure expected_figures[] = { @@ -2161,6 +2177,11 @@ static void test_rectangle_geometry(void) {D2D1_FIGURE_BEGIN_FILLED, D2D1_FIGURE_END_CLOSED, {20.0f, 30.0f}, 3, &expected_segments[3]}, {D2D1_FIGURE_BEGIN_FILLED, D2D1_FIGURE_END_CLOSED, {25.0f, 15.0f}, 3, &expected_segments[6]}, {D2D1_FIGURE_BEGIN_FILLED, D2D1_FIGURE_END_CLOSED, {30.0f, 45.0f}, 3, &expected_segments[9]}, + {D2D1_FIGURE_BEGIN_FILLED, D2D1_FIGURE_END_CLOSED, {-9.28203964e+00f, 1.79903809e+02f}, + 3, &expected_segments[12]}, + {D2D1_FIGURE_BEGIN_FILLED, D2D1_FIGURE_END_CLOSED, {30.0f, 20.0f}, 3, &expected_segments[15]}, + {D2D1_FIGURE_BEGIN_FILLED, D2D1_FIGURE_END_CLOSED, {-1.85640793e+01f, 0.0f}, 3, &expected_segments[18]}, + {D2D1_FIGURE_BEGIN_FILLED, D2D1_FIGURE_END_CLOSED, {0.0f, 8.99519043e+01f}, 3, &expected_segments[21]}, }; hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); @@ -2322,6 +2343,18 @@ static void test_rectangle_geometry(void) match = compare_rect(&rect, -7.85640717e+01f, 1.79903809e+02f, 1.07179594e+01f, 2.73205078e+02f, 1); ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", rect.left, rect.top, rect.right, rect.bottom); + geometry_sink_init(&sink); + hr = ID2D1TransformedGeometry_Simplify(transformed_geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES, + NULL, 0.0f, &sink.ID2D1SimplifiedGeometrySink_iface); + ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr); + geometry_sink_check(&sink, D2D1_FILL_MODE_ALTERNATE, 1, &expected_figures[4], 1); + geometry_sink_cleanup(&sink); + geometry_sink_init(&sink); + hr = ID2D1TransformedGeometry_Simplify(transformed_geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES, + NULL, 0.0f, &sink.ID2D1SimplifiedGeometrySink_iface); + ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr); + geometry_sink_check(&sink, D2D1_FILL_MODE_ALTERNATE, 1, &expected_figures[4], 1); + geometry_sink_cleanup(&sink); set_matrix_identity(&matrix); rotate_matrix(&matrix, M_PI / -3.0f); @@ -2331,6 +2364,12 @@ static void test_rectangle_geometry(void) match = compare_rect(&rect, 30.0f, 20.0f, 40.0f, 40.0f, 2); ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", rect.left, rect.top, rect.right, rect.bottom); + geometry_sink_init(&sink); + hr = ID2D1TransformedGeometry_Simplify(transformed_geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES, + &matrix, 0.0f, &sink.ID2D1SimplifiedGeometrySink_iface); + ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr); + geometry_sink_check(&sink, D2D1_FILL_MODE_ALTERNATE, 1, &expected_figures[5], 4); + geometry_sink_cleanup(&sink); set_matrix_identity(&matrix); scale_matrix(&matrix, 2.0f, 0.0f); @@ -2339,6 +2378,12 @@ static void test_rectangle_geometry(void) match = compare_rect(&rect, -1.57128143e+02f, 0.00000000e+00f, 2.14359188e+01f, 0.00000000e+00f, 1); ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", rect.left, rect.top, rect.right, rect.bottom); + geometry_sink_init(&sink); + hr = ID2D1TransformedGeometry_Simplify(transformed_geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES, + &matrix, 0.0f, &sink.ID2D1SimplifiedGeometrySink_iface); + ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr); + geometry_sink_check(&sink, D2D1_FILL_MODE_ALTERNATE, 1, &expected_figures[6], 1); + geometry_sink_cleanup(&sink); set_matrix_identity(&matrix); scale_matrix(&matrix, 0.0f, 0.5f); @@ -2347,6 +2392,12 @@ static void test_rectangle_geometry(void) match = compare_rect(&rect, 0.00000000e+00f, 8.99519043e+01f, 0.00000000e+00, 1.36602539e+02f, 1); ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", rect.left, rect.top, rect.right, rect.bottom); + geometry_sink_init(&sink); + hr = ID2D1TransformedGeometry_Simplify(transformed_geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES, + &matrix, 0.0f, &sink.ID2D1SimplifiedGeometrySink_iface); + ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr); + geometry_sink_check(&sink, D2D1_FILL_MODE_ALTERNATE, 1, &expected_figures[7], 1); + geometry_sink_cleanup(&sink); ID2D1TransformedGeometry_Release(transformed_geometry); ID2D1RectangleGeometry_Release(geometry);

1 0

Owen Rudge : include: Add IWSDUdpMessageParameters interface declaration.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: 9b44e8b37a5401a6bb96d7c504db22ee00c46af2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b44e8b37a5401a6bb96d7c50… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Jun 6 20:55:33 2017 +0100 include: Add IWSDUdpMessageParameters interface declaration. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wsdbase.idl | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/wsdbase.idl b/include/wsdbase.idl index 099dc87..6391ae8 100644 --- a/include/wsdbase.idl +++ b/include/wsdbase.idl @@ -99,3 +99,24 @@ interface IWSDMessageParameters : IUnknown HRESULT SetRemoteAddress([in] IWSDAddress* pAddress); HRESULT GetLowerParameters([out] IWSDMessageParameters** ppTxParams); } + +cpp_quote("HRESULT WINAPI WSDCreateUdpMessageParameters(IWSDUdpMessageParameters **ppTxParams);") + +typedef struct _WSDUdpRetransmitParams +{ + ULONG ulSendDelay; + ULONG ulRepeat; + ULONG ulRepeatMinDelay; + ULONG ulRepeatMaxDelay; + ULONG ulRepeatUpperDelay; +} WSDUdpRetransmitParams; + +[ +uuid(9934149f-8f0c-447b-aa0b-73124b0ca7f0), +object +] +interface IWSDUdpMessageParameters : IWSDMessageParameters +{ + HRESULT SetRetransmitParams([in] const WSDUdpRetransmitParams *pParams); + HRESULT GetRetransmitParams([out] WSDUdpRetransmitParams *pParams); +}

1 0

Huw Davies : wineandroid: Tell git diff about java files.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: 745aed5700aae36cddc05c73c9670ff3b31f6894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=745aed5700aae36cddc05c73c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 7 16:13:16 2017 +0100 wineandroid: Tell git diff about java files. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/.gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineandroid.drv/.gitattributes b/dlls/wineandroid.drv/.gitattributes new file mode 100644 index 0000000..f57840b --- /dev/null +++ b/dlls/wineandroid.drv/.gitattributes @@ -0,0 +1 @@ +*.java diff=java

1 0

Huw Davies : wineandroid: The event list may have been altered by a recursive call, so restart the loop from the beginning.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: eb04665281481688478206ef87b801ef394d5bc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb04665281481688478206ef8… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 7 16:09:14 2017 +0100 wineandroid: The event list may have been altered by a recursive call, so restart the loop from the beginning. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 7dff297..e3fd865 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -360,6 +360,8 @@ static int process_events( DWORD mask ) } HeapFree( GetProcessHeap(), 0, event ); count++; + /* next may have been removed by a recursive call, so reset it to the beginning of the list */ + next = LIST_ENTRY( event_queue.next, struct java_event, entry ); } current_event = previous; return count;

1 0

Jacek Caban : mshtml: Added DOCHOSTUIFLAG_ENABLE_REDIRECT_NOTIFICATION flag support.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: 11d4969baa773d9ef7742cfe56b8a590d3abd711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11d4969baa773d9ef7742cfe5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 7 16:10:51 2017 +0200 mshtml: Added DOCHOSTUIFLAG_ENABLE_REDIRECT_NOTIFICATION flag support. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/binding.h | 1 + dlls/mshtml/navigate.c | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index f5b85e9..71c477a 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -82,6 +82,7 @@ struct BSCallback { request_data_t request_data; ULONG readed; DWORD bindf; + DWORD bindinfo_options; BOOL bindinfo_ready; binding_bom_t bom; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index d036364..9dec64d 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -390,7 +390,7 @@ static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface, pbindinfo->cbstgmedData = This->request_data.post_data_len; pbindinfo->dwCodePage = CP_UTF8; - pbindinfo->dwOptions = 0x80000; + pbindinfo->dwOptions = This->bindinfo_options; if(This->request_data.post_data_len) { pbindinfo->dwBindVerb = BINDVERB_POST; @@ -674,6 +674,7 @@ void init_bscallback(BSCallback *This, const BSCallbackVtbl *vtbl, IMoniker *mon This->vtbl = vtbl; This->ref = 1; This->bindf = bindf; + This->bindinfo_options = BINDINFO_OPTIONS_USE_IE_ENCODING; This->bom = BOM_NONE; list_init(&This->entry); @@ -1312,8 +1313,15 @@ static HRESULT nsChannelBSC_init_bindinfo(BSCallback *bsc) { nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); nsChannel *nschannel = This->nschannel; + HTMLDocumentObj *doc_obj; HRESULT hres; + if(This->is_doc_channel && This->bsc.window && This->bsc.window->base.outer_window + && (doc_obj = This->bsc.window->base.outer_window->doc_obj)) { + if(doc_obj->hostinfo.dwFlags & DOCHOSTUIFLAG_ENABLE_REDIRECT_NOTIFICATION) + This->bsc.bindinfo_options |= BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS; + } + if(nschannel && nschannel->post_data_stream) { hres = read_post_data_stream(nschannel->post_data_stream, nschannel->post_data_contains_headers, &nschannel->request_headers, &This->bsc.request_data);

1 0

Jacek Caban : mshtml: Added IBindCallbackRedirect implementation.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: a8a050e975346b0e344bb45011dd63e30a163a6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8a050e975346b0e344bb4501… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 7 16:10:49 2017 +0200 mshtml: Added IBindCallbackRedirect implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/binding.h | 9 ++++--- dlls/mshtml/navigate.c | 61 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/htmldoc.c | 11 ++++++++ 3 files changed, 77 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 3a4e06b..f5b85e9 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -69,10 +69,11 @@ typedef struct { typedef struct BSCallbackVtbl BSCallbackVtbl; struct BSCallback { - IBindStatusCallback IBindStatusCallback_iface; - IServiceProvider IServiceProvider_iface; - IHttpNegotiate2 IHttpNegotiate2_iface; - IInternetBindInfo IInternetBindInfo_iface; + IBindStatusCallback IBindStatusCallback_iface; + IServiceProvider IServiceProvider_iface; + IHttpNegotiate2 IHttpNegotiate2_iface; + IInternetBindInfo IInternetBindInfo_iface; + IBindCallbackRedirect IBindCallbackRedirect_iface; const BSCallbackVtbl *vtbl; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index cfa3753..d036364 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -248,6 +248,9 @@ static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *ifa }else if(IsEqualGUID(&IID_IInternetBindInfo, riid)) { TRACE("(%p)->(IID_IInternetBindInfo %p)\n", This, ppv); *ppv = &This->IInternetBindInfo_iface; + }else if(IsEqualGUID(&IID_IBindCallbackRedirect, riid)) { + TRACE("(%p)->(IID_IBindCallbackRedirect %p)\n", This, ppv); + *ppv = &This->IBindCallbackRedirect_iface; } if(*ppv) { @@ -561,6 +564,63 @@ static const IInternetBindInfoVtbl InternetBindInfoVtbl = { InternetBindInfo_GetBindString }; +static inline BSCallback *impl_from_IBindCallbackRedirect(IBindCallbackRedirect *iface) +{ + return CONTAINING_RECORD(iface, BSCallback, IBindCallbackRedirect_iface); +} + +static HRESULT WINAPI BindCallbackRedirect_QueryInterface(IBindCallbackRedirect *iface, REFIID riid, void **ppv) +{ + BSCallback *This = impl_from_IBindCallbackRedirect(iface); + return IBindStatusCallback_QueryInterface(&This->IBindStatusCallback_iface, riid, ppv); +} + +static ULONG WINAPI BindCallbackRedirect_AddRef(IBindCallbackRedirect *iface) +{ + BSCallback *This = impl_from_IBindCallbackRedirect(iface); + return IBindStatusCallback_AddRef(&This->IBindStatusCallback_iface); +} + +static ULONG WINAPI BindCallbackRedirect_Release(IBindCallbackRedirect *iface) +{ + BSCallback *This = impl_from_IBindCallbackRedirect(iface); + return IBindStatusCallback_Release(&This->IBindStatusCallback_iface); +} + +static HRESULT WINAPI BindCallbackRedirect_Redirect(IBindCallbackRedirect *iface, const WCHAR *url, VARIANT_BOOL *vbCancel) +{ + BSCallback *This = impl_from_IBindCallbackRedirect(iface); + HTMLDocumentObj *doc_obj; + BOOL cancel = FALSE; + BSTR frame_name = NULL; + HRESULT hres = S_OK; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(url), vbCancel); + + if(This->window && This->window->base.outer_window && (doc_obj = This->window->base.outer_window->doc_obj) + && doc_obj->doc_object_service) { + if(This->window->base.outer_window != doc_obj->basedoc.window) { + hres = IHTMLWindow2_get_name(&This->window->base.IHTMLWindow2_iface, &frame_name); + if(FAILED(hres)) + return hres; + } + + hres = IDocObjectService_FireBeforeNavigate2(doc_obj->doc_object_service, NULL, url, 0x40, + frame_name, NULL, 0, NULL, TRUE, &cancel); + SysFreeString(frame_name); + } + + *vbCancel = cancel ? VARIANT_TRUE : VARIANT_FALSE; + return hres; +} + +static const IBindCallbackRedirectVtbl BindCallbackRedirectVtbl = { + BindCallbackRedirect_QueryInterface, + BindCallbackRedirect_AddRef, + BindCallbackRedirect_Release, + BindCallbackRedirect_Redirect +}; + static inline BSCallback *impl_from_IServiceProvider(IServiceProvider *iface) { return CONTAINING_RECORD(iface, BSCallback, IServiceProvider_iface); @@ -610,6 +670,7 @@ void init_bscallback(BSCallback *This, const BSCallbackVtbl *vtbl, IMoniker *mon This->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl; This->IHttpNegotiate2_iface.lpVtbl = &HttpNegotiate2Vtbl; This->IInternetBindInfo_iface.lpVtbl = &InternetBindInfoVtbl; + This->IBindCallbackRedirect_iface.lpVtbl = &BindCallbackRedirectVtbl; This->vtbl = vtbl; This->ref = 1; This->bindf = bindf; diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index dafc109..6964f6e 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -1469,6 +1469,8 @@ static HRESULT WINAPI Moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, IMon REFIID riid, void **ppv) { IBindStatusCallback *callback = NULL; + IBindCallbackRedirect *redirect_callback; + IServiceProvider *service_provider; BINDINFO bindinfo; DWORD bindf; HRESULT hres; @@ -1511,6 +1513,15 @@ static HRESULT WINAPI Moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, IMon ok(bindinfo.pUnk == NULL, "bindinfo.pUnk=%p\n", bindinfo.pUnk); ok(bindinfo.dwReserved == 0, "bindinfo.dwReserved=%d\n", bindinfo.dwReserved); + hres = IBindStatusCallback_QueryInterface(callback, &IID_IServiceProvider, (void**)&service_provider); + ok(hres == S_OK, "Could not get IServiceProvider iface: %08x\n", hres); + + hres = IServiceProvider_QueryService(service_provider, &IID_IBindCallbackRedirect, &IID_IBindCallbackRedirect, (void**)&redirect_callback); + ok(hres == S_OK, "QueryService(IID_IBindCallbackRedirect) returned %08x\n", hres); + + IBindCallbackRedirect_Release(redirect_callback); + IServiceProvider_Release(service_provider); + hres = IBindStatusCallback_OnStartBinding(callback, 0, &Binding); ok(hres == S_OK, "OnStartBinding failed: %08x\n", hres);

1 0

Jacek Caban : urlmon/tests: Added BindProtocol redirection handling tests.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: 86f7c4c8f87003b26fb9a741a36af4b5aa88931f URL: http://source.winehq.org/git/wine.git/?a=commit;h=86f7c4c8f87003b26fb9a741a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 7 13:31:39 2017 +0200 urlmon/tests: Added BindProtocol redirection handling tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/protocol.c | 157 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 154 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=86f7c4c8f87003b26fb9a…

1 0

Alexandre Julliard : wineandroid: Implement SetParent and forward it to Java.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: be285af54fc5dcbd8a3f47fa5f60240451a88692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be285af54fc5dcbd8a3f47fa5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 7 11:27:54 2017 +0200 wineandroid: Implement SetParent and forward it to Java. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 26 +++++++++++++++++++++ dlls/wineandroid.drv/android.h | 1 + dlls/wineandroid.drv/device.c | 39 +++++++++++++++++++++++++++++++ dlls/wineandroid.drv/window.c | 18 ++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 5 files changed, 85 insertions(+) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 50ff0bf..f12de98 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -337,6 +337,20 @@ public class WineActivity extends Activity visible = (style & WS_VISIBLE) != 0; } + public void set_parent( WineWindow new_parent ) + { + Log.i( LOGTAG, String.format( "set parent hwnd %08x parent %08x -> %08x", + hwnd, parent == null ? 0 : parent.hwnd, + new_parent == null ? 0 : new_parent.hwnd )); + parent = new_parent; + if (new_parent == null) + { + window_view = new WineView( WineActivity.this, this ); + window_view.layout( 0, 0, 1, 1 ); // make sure the surface gets created + } + else window_view = null; + } + public int get_hwnd() { return hwnd; @@ -452,6 +466,13 @@ public class WineActivity extends Activity if (win != null) win.destroy(); } + public void set_window_parent( int hwnd, int parent, int pid ) + { + WineWindow win = get_window( hwnd ); + if (win == null) return; + win.set_parent( get_window( parent )); + } + public void window_pos_changed( int hwnd, int flags, int insert_after, int owner, int style, Rect window_rect, Rect client_rect, Rect visible_rect ) { @@ -475,6 +496,11 @@ public class WineActivity extends Activity runOnUiThread( new Runnable() { public void run() { destroy_window( hwnd ); }} ); } + public void setParent( final int hwnd, final int parent, final int pid ) + { + runOnUiThread( new Runnable() { public void run() { set_window_parent( hwnd, parent, pid ); }} ); + } + public void windowPosChanged( final int hwnd, final int flags, final int insert_after, final int owner, final int style, final int window_left, final int window_top, diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index 3c2500e..f3dd019 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -60,6 +60,7 @@ extern void destroy_ioctl_window( HWND hwnd ) DECLSPEC_HIDDEN; extern int ioctl_window_pos_changed( HWND hwnd, const RECT *window_rect, const RECT *client_rect, const RECT *visible_rect, UINT style, UINT flags, HWND after, HWND owner ) DECLSPEC_HIDDEN; +extern int ioctl_set_window_parent( HWND hwnd, HWND parent ) DECLSPEC_HIDDEN; /************************************************************************** diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 1af59be..eafaf04 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -61,6 +61,7 @@ enum android_ioctl IOCTL_CREATE_WINDOW, IOCTL_DESTROY_WINDOW, IOCTL_WINDOW_POS_CHANGED, + IOCTL_SET_WINDOW_PARENT, IOCTL_DEQUEUE_BUFFER, IOCTL_QUEUE_BUFFER, IOCTL_CANCEL_BUFFER, @@ -188,6 +189,12 @@ struct ioctl_android_set_swap_interval int interval; }; +struct ioctl_android_set_window_parent +{ + struct ioctl_header hdr; + int parent; +}; + static inline BOOL is_in_desktop_process(void) { return thread != NULL; @@ -832,12 +839,35 @@ static NTSTATUS setSwapInterval_ioctl( void *data, DWORD in_size, DWORD out_size return android_error_to_status( ret ); } +static NTSTATUS setWindowParent_ioctl( void *data, DWORD in_size, DWORD out_size, ULONG_PTR *ret_size ) +{ + static jmethodID method; + jobject object; + struct ioctl_android_set_window_parent *res = data; + struct native_win_data *win_data; + DWORD pid = current_client_id(); + + if (in_size < sizeof(*res)) return STATUS_INVALID_PARAMETER; + + if (!(win_data = get_ioctl_native_win_data( &res->hdr ))) return STATUS_INVALID_HANDLE; + + TRACE( "hwnd %08x parent %08x\n", res->hdr.hwnd, res->parent ); + + if (!(object = load_java_method( &method, "setParent", "(III)V" ))) return STATUS_NOT_SUPPORTED; + + wrap_java_call(); + (*jni_env)->CallVoidMethod( jni_env, object, method, res->hdr.hwnd, res->parent, pid ); + unwrap_java_call(); + return STATUS_SUCCESS; +} + typedef NTSTATUS (*ioctl_func)( void *in, DWORD in_size, DWORD out_size, ULONG_PTR *ret_size ); static const ioctl_func ioctl_funcs[] = { createWindow_ioctl, /* IOCTL_CREATE_WINDOW */ destroyWindow_ioctl, /* IOCTL_DESTROY_WINDOW */ windowPosChanged_ioctl, /* IOCTL_WINDOW_POS_CHANGED */ + setWindowParent_ioctl, /* IOCTL_SET_WINDOW_PARENT */ dequeueBuffer_ioctl, /* IOCTL_DEQUEUE_BUFFER */ queueBuffer_ioctl, /* IOCTL_QUEUE_BUFFER */ cancelBuffer_ioctl, /* IOCTL_CANCEL_BUFFER */ @@ -1356,3 +1386,12 @@ int ioctl_window_pos_changed( HWND hwnd, const RECT *window_rect, const RECT *cl req.owner = HandleToLong( owner ); return android_ioctl( IOCTL_WINDOW_POS_CHANGED, &req, sizeof(req), NULL, NULL ); } + +int ioctl_set_window_parent( HWND hwnd, HWND parent ) +{ + struct ioctl_android_set_window_parent req; + + req.hdr.hwnd = HandleToLong( hwnd ); + req.parent = parent == GetDesktopWindow() ? 0 : HandleToLong( parent ); + return android_ioctl( IOCTL_SET_WINDOW_PARENT, &req, sizeof(req), NULL, NULL ); +} diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 94f23e0..7dff297 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -1015,6 +1015,24 @@ UINT CDECL ANDROID_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) } +/***************************************************************** + * ANDROID_SetParent + */ +void CDECL ANDROID_SetParent( HWND hwnd, HWND parent, HWND old_parent ) +{ + struct android_win_data *data; + + if (parent == old_parent) return; + if (!(data = get_win_data( hwnd ))) return; + + TRACE( "win %p parent %p -> %p\n", hwnd, old_parent, parent ); + + data->parent = (parent == GetDesktopWindow()) ? 0 : parent; + ioctl_set_window_parent( hwnd, parent ); + release_win_data( data ); +} + + /*********************************************************************** * ANDROID_SetWindowStyle */ diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index ed3138a..3605241 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -10,6 +10,7 @@ @ cdecl DestroyWindow(long) ANDROID_DestroyWindow @ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) ANDROID_MsgWaitForMultipleObjectsEx @ cdecl SetLayeredWindowAttributes(long long long long) ANDROID_SetLayeredWindowAttributes +@ cdecl SetParent(long long long) ANDROID_SetParent @ cdecl SetWindowRgn(long long long) ANDROID_SetWindowRgn @ cdecl SetWindowStyle(ptr long ptr) ANDROID_SetWindowStyle @ cdecl ShowWindow(long long ptr long) ANDROID_ShowWindow

1 0

Alexandre Julliard : wineandroid: Implement ShowWindow to put icons off-screen.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: b6a00bc0eb595aeec9c9b4f044ce8c259e5cc8bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6a00bc0eb595aeec9c9b4f04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 7 11:27:16 2017 +0200 wineandroid: Implement ShowWindow to put icons off-screen. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 17 +++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 2 files changed, 18 insertions(+) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index f5d2e4f..94f23e0 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -999,6 +999,23 @@ void CDECL ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flag /*********************************************************************** + * ANDROID_ShowWindow + */ +UINT CDECL ANDROID_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) +{ + if (IsRectEmpty( rect )) return swp; + if (!IsIconic( hwnd )) return swp; + /* always hide icons off-screen */ + if (rect->left != -32000 || rect->top != -32000) + { + OffsetRect( rect, -32000 - rect->left, -32000 - rect->top ); + swp &= ~(SWP_NOMOVE | SWP_NOCLIENTMOVE); + } + return swp; +} + + +/*********************************************************************** * ANDROID_SetWindowStyle */ void CDECL ANDROID_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 6445bab..ed3138a 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -12,6 +12,7 @@ @ cdecl SetLayeredWindowAttributes(long long long long) ANDROID_SetLayeredWindowAttributes @ cdecl SetWindowRgn(long long long) ANDROID_SetWindowRgn @ cdecl SetWindowStyle(ptr long ptr) ANDROID_SetWindowStyle +@ cdecl ShowWindow(long long ptr long) ANDROID_ShowWindow @ cdecl UpdateLayeredWindow(long ptr ptr) ANDROID_UpdateLayeredWindow @ cdecl WindowMessage(long long long long) ANDROID_WindowMessage @ cdecl WindowPosChanging(long long long ptr ptr ptr ptr) ANDROID_WindowPosChanging

1 0

Alexandre Julliard : wineandroid: Implement UpdateLayeredWindow.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: d1b5f7594601abe577ef162c2352266c8a0a87bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1b5f7594601abe577ef162c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 7 11:26:57 2017 +0200 wineandroid: Implement UpdateLayeredWindow. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 86 +++++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 2 files changed, 87 insertions(+) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index ef849f8..f5d2e4f 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -1056,6 +1056,92 @@ void CDECL ANDROID_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alp } +/***************************************************************************** + * ANDROID_UpdateLayeredWindow + */ +BOOL CDECL ANDROID_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, + const RECT *window_rect ) +{ + struct window_surface *surface; + struct android_win_data *data; + BLENDFUNCTION blend = { AC_SRC_OVER, 0, 255, 0 }; + COLORREF color_key = (info->dwFlags & ULW_COLORKEY) ? info->crKey : CLR_INVALID; + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *bmi = (BITMAPINFO *)buffer; + void *src_bits, *dst_bits; + RECT rect; + HDC hdc = 0; + HBITMAP dib; + BOOL ret = FALSE; + + if (!(data = get_win_data( hwnd ))) return FALSE; + + rect = *window_rect; + OffsetRect( &rect, -window_rect->left, -window_rect->top ); + + surface = data->surface; + if (!is_argb_surface( surface )) + { + if (surface) window_surface_release( surface ); + surface = NULL; + } + + if (!surface || memcmp( &surface->rect, &rect, sizeof(RECT) )) + { + data->surface = create_surface( data->hwnd, &rect, 255, color_key, TRUE ); + if (surface) window_surface_release( surface ); + surface = data->surface; + } + else set_surface_layered( surface, 255, color_key ); + + if (surface) window_surface_add_ref( surface ); + release_win_data( data ); + + if (!surface) return FALSE; + if (!info->hdcSrc) + { + window_surface_release( surface ); + return TRUE; + } + + dst_bits = surface->funcs->get_info( surface, bmi ); + + if (!(dib = CreateDIBSection( info->hdcDst, bmi, DIB_RGB_COLORS, &src_bits, NULL, 0 ))) goto done; + if (!(hdc = CreateCompatibleDC( 0 ))) goto done; + + SelectObject( hdc, dib ); + + surface->funcs->lock( surface ); + + if (info->prcDirty) + { + IntersectRect( &rect, &rect, info->prcDirty ); + memcpy( src_bits, dst_bits, bmi->bmiHeader.biSizeImage ); + PatBlt( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS ); + } + ret = GdiAlphaBlend( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, + info->hdcSrc, + rect.left + (info->pptSrc ? info->pptSrc->x : 0), + rect.top + (info->pptSrc ? info->pptSrc->y : 0), + rect.right - rect.left, rect.bottom - rect.top, + (info->dwFlags & ULW_ALPHA) ? *info->pblend : blend ); + if (ret) + { + memcpy( dst_bits, src_bits, bmi->bmiHeader.biSizeImage ); + add_bounds_rect( surface->funcs->get_bounds( surface ), &rect ); + } + + surface->funcs->unlock( surface ); + surface->funcs->flush( surface ); + +done: + window_surface_release( surface ); + if (hdc) DeleteDC( hdc ); + if (dib) DeleteObject( dib ); + return ret; +} + + /********************************************************************** * ANDROID_WindowMessage */ diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 8a6e72d..6445bab 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -12,6 +12,7 @@ @ cdecl SetLayeredWindowAttributes(long long long long) ANDROID_SetLayeredWindowAttributes @ cdecl SetWindowRgn(long long long) ANDROID_SetWindowRgn @ cdecl SetWindowStyle(ptr long ptr) ANDROID_SetWindowStyle +@ cdecl UpdateLayeredWindow(long ptr ptr) ANDROID_UpdateLayeredWindow @ cdecl WindowMessage(long long long long) ANDROID_WindowMessage @ cdecl WindowPosChanging(long long long ptr ptr ptr ptr) ANDROID_WindowPosChanging @ cdecl WindowPosChanged(long long long ptr ptr ptr ptr ptr) ANDROID_WindowPosChanged

1 0

Alexandre Julliard : wineandroid: Implement SetLayeredWindowAttributes.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: 52f53fe82e7cf4bd4b621c9dace8b34d0595a5e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52f53fe82e7cf4bd4b621c9da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 7 11:26:37 2017 +0200 wineandroid: Implement SetLayeredWindowAttributes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 63 +++++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 2 + 2 files changed, 65 insertions(+) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 78ce952..ef849f8 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -761,6 +761,27 @@ failed: return NULL; } +/*********************************************************************** + * set_surface_layered + */ +static void set_surface_layered( struct window_surface *window_surface, BYTE alpha, COLORREF color_key ) +{ + struct android_window_surface *surface = get_android_surface( window_surface ); + COLORREF prev_key; + BYTE prev_alpha; + + if (window_surface->funcs != &android_surface_funcs) return; /* we may get the null surface */ + + window_surface->funcs->lock( window_surface ); + prev_key = surface->color_key; + prev_alpha = surface->alpha; + surface->alpha = alpha; + set_color_key( surface, color_key ); + if (alpha != prev_alpha || surface->color_key != prev_key) /* refresh */ + *window_surface->funcs->get_bounds( window_surface ) = surface->header.rect; + window_surface->funcs->unlock( window_surface ); +} + static WNDPROC desktop_orig_wndproc; @@ -978,6 +999,30 @@ void CDECL ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flag /*********************************************************************** + * ANDROID_SetWindowStyle + */ +void CDECL ANDROID_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) +{ + struct android_win_data *data; + DWORD changed = style->styleNew ^ style->styleOld; + + if (hwnd == GetDesktopWindow()) return; + if (!(data = get_win_data( hwnd ))) return; + + if (offset == GWL_EXSTYLE && (changed & WS_EX_LAYERED)) /* changing WS_EX_LAYERED resets attributes */ + { + if (is_argb_surface( data->surface )) + { + if (data->surface) window_surface_release( data->surface ); + data->surface = NULL; + } + else if (data->surface) set_surface_layered( data->surface, 255, CLR_INVALID ); + } + release_win_data( data ); +} + + +/*********************************************************************** * ANDROID_SetWindowRgn */ void CDECL ANDROID_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) @@ -993,6 +1038,24 @@ void CDECL ANDROID_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) } +/*********************************************************************** + * ANDROID_SetLayeredWindowAttributes + */ +void CDECL ANDROID_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWORD flags ) +{ + struct android_win_data *data; + + if (!(flags & LWA_ALPHA)) alpha = 255; + if (!(flags & LWA_COLORKEY)) key = CLR_INVALID; + + if ((data = get_win_data( hwnd ))) + { + if (data->surface) set_surface_layered( data->surface, alpha, key ); + release_win_data( data ); + } +} + + /********************************************************************** * ANDROID_WindowMessage */ diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 766cc2c..8a6e72d 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -9,7 +9,9 @@ @ cdecl CreateWindow(long) ANDROID_CreateWindow @ cdecl DestroyWindow(long) ANDROID_DestroyWindow @ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) ANDROID_MsgWaitForMultipleObjectsEx +@ cdecl SetLayeredWindowAttributes(long long long long) ANDROID_SetLayeredWindowAttributes @ cdecl SetWindowRgn(long long long) ANDROID_SetWindowRgn +@ cdecl SetWindowStyle(ptr long ptr) ANDROID_SetWindowStyle @ cdecl WindowMessage(long long long long) ANDROID_WindowMessage @ cdecl WindowPosChanging(long long long ptr ptr ptr ptr) ANDROID_WindowPosChanging @ cdecl WindowPosChanged(long long long ptr ptr ptr ptr ptr) ANDROID_WindowPosChanged

1 0

Alexandre Julliard : wineandroid: Implement SetWindowRgn.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: d61bcb9a2f5cb33bee16eb5b44e020359c72b03f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d61bcb9a2f5cb33bee16eb5b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 7 11:25:48 2017 +0200 wineandroid: Implement SetWindowRgn. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 16 ++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 2 files changed, 17 insertions(+) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 203492a..78ce952 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -977,6 +977,22 @@ void CDECL ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flag } +/*********************************************************************** + * ANDROID_SetWindowRgn + */ +void CDECL ANDROID_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) +{ + struct android_win_data *data; + + if ((data = get_win_data( hwnd ))) + { + if (data->surface) set_surface_region( data->surface, hrgn ); + release_win_data( data ); + } + else FIXME( "not supported on other process window %p\n", hwnd ); +} + + /********************************************************************** * ANDROID_WindowMessage */ diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 7379458..766cc2c 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -9,6 +9,7 @@ @ cdecl CreateWindow(long) ANDROID_CreateWindow @ cdecl DestroyWindow(long) ANDROID_DestroyWindow @ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) ANDROID_MsgWaitForMultipleObjectsEx +@ cdecl SetWindowRgn(long long long) ANDROID_SetWindowRgn @ cdecl WindowMessage(long long long long) ANDROID_WindowMessage @ cdecl WindowPosChanging(long long long ptr ptr ptr ptr) ANDROID_WindowPosChanging @ cdecl WindowPosChanged(long long long ptr ptr ptr ptr ptr) ANDROID_WindowPosChanged

1 0

Nikolay Sivov : oleaut32/tests: Basic test for invalid arguments in LoadTypeLib/LoadTypeLibEx.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: 19b944d49c28d1d8bb285621dc923cc5e7aef707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19b944d49c28d1d8bb285621d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 7 00:29:38 2017 +0300 oleaut32/tests: Basic test for invalid arguments in LoadTypeLib/LoadTypeLibEx. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 6d0585a..d8ff310 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4996,6 +4996,22 @@ static void test_LoadTypeLib(void) hres = LoadTypeLib(kernel32_dllW, &tl); ok(hres == TYPE_E_CANTLOADLIBRARY, "LoadTypeLib returned: %08x, expected TYPE_E_CANTLOADLIBRARY\n", hres); + + hres = LoadTypeLib(NULL, NULL); + ok(hres == E_INVALIDARG, "Got %#x.\n", hres); + + tl = (void *)0xdeadbeef; + hres = LoadTypeLib(NULL, &tl); + ok(hres == E_INVALIDARG, "Got %#x.\n", hres); + ok(tl == (void *)0xdeadbeef, "Got %p.\n", tl); + + hres = LoadTypeLibEx(NULL, REGKIND_NONE, NULL); + ok(hres == E_INVALIDARG, "Got %#x.\n", hres); + + tl = (void *)0xdeadbeef; + hres = LoadTypeLibEx(NULL, REGKIND_NONE, &tl); + ok(hres == E_INVALIDARG, "Got %#x.\n", hres); + ok(tl == (void *)0xdeadbeef, "Got %p.\n", tl); } static void test_SetVarHelpContext(void)

1 0

Dmitry Timoshkov : oleaut32: Add an arguments check to LoadTypeLibEx.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: cf45f3bcc81337ad6642a2856521e8294282c711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf45f3bcc81337ad6642a2856… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 7 00:29:37 2017 +0300 oleaut32: Add an arguments check to LoadTypeLibEx. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 1c00d71..b88e663 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -472,6 +472,9 @@ HRESULT WINAPI LoadTypeLibEx( TRACE("(%s,%d,%p)\n",debugstr_w(szFile), regkind, pptLib); + if (!szFile || !pptLib) + return E_INVALIDARG; + *pptLib = NULL; res = TLB_ReadTypeLib(szFile, szPath, MAX_PATH + 1, (ITypeLib2**)pptLib);

1 0

Nikolay Sivov : mpr/tests: Remove NT4 version check.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: 7569f6c62e46bd58f084974ac2068a56e19bac58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7569f6c62e46bd58f084974ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 7 00:27:12 2017 +0300 mpr/tests: Remove NT4 version check. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/tests/mpr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c index 085ecda..364ac2c 100644 --- a/dlls/mpr/tests/mpr.c +++ b/dlls/mpr/tests/mpr.c @@ -127,13 +127,13 @@ static void test_WNetGetRemoteName(void) ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, NULL, &info_size); - todo_wine{ - if(((GetVersion() & 0x8000ffff) == 0x00000004) || /* NT40 */ - (drive_type == DRIVE_REMOTE)) + todo_wine { + if(drive_type == DRIVE_REMOTE) ok(ret == WN_BAD_POINTER, "WNetGetUniversalNameA failed: %08x\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_BAD_VALUE, - "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); } + "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); + } fail_size = sizeof(driveA) / sizeof(char) - 1; ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL,

1 0

Rosanne DiMesio : Return 0 for empty wine-staging checkbox.
by Jeremy Newman 07 Jun '17

07 Jun '17

Module: appdb Branch: master Commit: 638563248caa9eef00f212f2a9eb9ab520d5b6ec URL: http://source.winehq.org/git/appdb.git/?a=commit;h=638563248caa9eef00f212f2… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Jun 7 11:53:17 2017 -0500 Return 0 for empty wine-staging checkbox. Based on a patch by Jeremy Newman. Fixes bug 43145. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/include/testData.php b/include/testData.php index 6a375ba..61b23a0 100644 --- a/include/testData.php +++ b/include/testData.php @@ -970,10 +970,14 @@ class testData{ // Ask for confirmation if changing the tested Wine versions, becase we want users // to submit new reports instead of updating existing ones when testing new Wines $oOldTest = new testData($this->iTestingId); - if($this->iTestingId && $oOldTest->sTestedRelease != getInput('sTestedRelease', $aValues) && - getInput('bConfirmTestedVersionChange', $aValues) != 'true' - || $this->iTestingId && $oOldTest->iStaging != getInput('iStaging', $aValues) && - getInput('bConfirmTestedVersionChange', $aValues) != 'true') + if ( + $this->iTestingId + && (getInput('bConfirmTestedVersionChange', $aValues) != 'true') + && ( + $oOldTest->sTestedRelease != getInput('sTestedRelease', $aValues) + || $oOldTest->iStaging != intval(getInput('iStaging', $aValues)) + ) + ) { $errors .= '<li>Are you sure you want to change the Wine version of the report? Please submit a new '. 'test report for every Wine version you test; this is useful for tracking Wine\'s progress. '. @@ -1029,7 +1033,7 @@ class testData{ $this->sTestedDate = $aValues['sTestedDate']; $this->iDistributionId = $aValues['iDistributionId']; $this->sTestedRelease = $aValues['sTestedRelease']; - $this->iStaging = $aValues['iStaging']; + $this->iStaging = intval($aValues['iStaging']); $this->sInstalls = $aValues['sInstalls']; $this->sRuns = $aValues['sRuns']; $this->sTestedRating = $aValues['sTestedRating'];

1 0

Francois Gouget : winetest: Improve quoting in the winetest.cron script.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: tools Branch: master Commit: d8888cc30f0ec1b224ecb13c34e5282dd8817f43 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d8888cc30f0ec1b224ecb13c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 7 11:09:17 2017 +0200 winetest: Improve quoting in the winetest.cron script. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/winetest.cron | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/winetest/winetest.cron b/winetest/winetest.cron index 6b59f4f..7418f9e 100755 --- a/winetest/winetest.cron +++ b/winetest/winetest.cron @@ -30,20 +30,21 @@ then echo "$name0:error: you must specify the work directory as the first parameter" >&2 exit 1 fi -lock=/tmp/winetest.lock +lock="/tmp/winetest.lock" # expiration age (in days) before results get archived expire=120 -if [ ! -f $lock ]; then - touch $lock - cd $workdir +if [ ! -f "$lock" ] +then + touch "$lock" + cd "$workdir" refresh_index="" refresh_errors="" while true do - $tools/dissect + "$tools/dissect" case $? in 0) refresh_index=1 ;; 1) refresh_errors=1 ;; @@ -52,7 +53,7 @@ if [ ! -f $lock ]; then done if [ -n "$refresh_index" ] then - while $tools/gather; do true; done + while "$tools/gather"; do true; done fi if [ ! -d data/tests -o ! -d old-data ] then @@ -60,18 +61,18 @@ if [ ! -f $lock ]; then refresh_index=1 refresh_errors=1 fi - [ -n "$refresh_index" ] && $tools/build-index - [ -n "$refresh_errors" ] && $tools/build-errors + [ -n "$refresh_index" ] && "$tools/build-index" + [ -n "$refresh_errors" ] && "$tools/build-errors" # archive old results ( set -e cd old-data - dir=`find . -maxdepth 1 -mtime +$expire -type d -print -quit` + dir=`find . -maxdepth 1 -mtime "+$expire" -type d -print -quit` test -n "$dir" - tar cfj $dir.tar.bz2 $dir - touch -r $dir $dir.tar.bz2 - rm -rf $dir + tar cfj "$dir.tar.bz2" "$dir" + touch -r "$dir" "$dir.tar.bz2" + rm -rf "$dir" ) # remove old test builds @@ -79,13 +80,13 @@ if [ ! -f $lock ]; then set -e mkdir -p builds cd builds - find . -mtime +$expire -name winetest\*.exe -print0 | \ + find . -mtime "+$expire" -name "winetest*.exe" -print0 | \ xargs -0 rm -f ) # remove old queue files - find queue -maxdepth 1 -mtime +30 -name err\* -print0 | xargs -0 rm -rf - find queue -maxdepth 1 -mtime +30 -name CGI\* -print0 | xargs -0 rm -f + find queue -maxdepth 1 -mtime +30 -name "err*" -print0 | xargs -0 rm -rf + find queue -maxdepth 1 -mtime +30 -name "CGI*" -print0 | xargs -0 rm -f - rm $lock + rm "$lock" fi

1 0

Francois Gouget : winetest: Let the scripts autodetect the work directory.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: tools Branch: master Commit: c9170c8554a3837712b40f529c56165bbbc9f347 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c9170c8554a3837712b40f52… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 7 11:07:29 2017 +0200 winetest: Let the scripts autodetect the work directory. The scripts now automatically recognize the work directory if it is the current directory as is the case when invoked from the cron script. This makes winetest.conf's $workdir setting unnecessary. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/INSTALL.txt | 1 - winetest/build-errors | 10 ++++++++-- winetest/build-index | 13 ++++++++++--- winetest/dissect | 13 ++++++++++--- winetest/gather | 14 ++++++++++---- winetest/winetest.conf | 2 -- 6 files changed, 38 insertions(+), 15 deletions(-) diff --git a/winetest/INSTALL.txt b/winetest/INSTALL.txt index d13d1cf..b10788c 100644 --- a/winetest/INSTALL.txt +++ b/winetest/INSTALL.txt @@ -32,7 +32,6 @@ Read-only source code account: should be available as $HOME/tools/winetest/INSTALL.txt). git clone git://source.winehq.org/git/tools.git - Edit $HOME/tools/winetest/winetest.conf to set: - $workdir = "/home/winehq/sites/winetest"; $gitdir = "/home/wine/wine.git"; Web site account: diff --git a/winetest/build-errors b/winetest/build-errors index 2d25ae3..f41824f 100755 --- a/winetest/build-errors +++ b/winetest/build-errors @@ -33,8 +33,7 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } -use vars qw/$workdir/; -require "winetest.conf"; + my $name0=$0; $name0 =~ s+^.*/++; @@ -63,6 +62,13 @@ sub long_date($) # Generate a table of the errors encountered during processing # +require Cwd; +my $workdir = Cwd::cwd(); +if (!-f "$workdir/report.css") +{ + error("'$workdir' is not a valid work directory\n"); + exit 2; +} chdir($workdir) or die "could not chdir to the work directory: $!"; my @errors; diff --git a/winetest/build-index b/winetest/build-index index dcd9795..dc413cd 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -34,7 +34,7 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } -use vars qw/$workdir $gitdir $gitweb/; +use vars qw/$gitdir $gitweb/; require "winetest.conf"; my $name0=$0; @@ -62,11 +62,11 @@ sub get_build_info($) { ($date, $subject) = ($1, $2); # Make sure the directory's mtime matches the commit time - utime $date, $date, "$workdir/data/$build"; + utime $date, $date, "data/$build"; } else { - $date = (stat "$workdir/data/$build")[9]; + $date = (stat "data/$build")[9]; $subject = ""; } return ($date, $subject); @@ -113,6 +113,13 @@ my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \% # Grab the build list and archive the old results # +require Cwd; +my $workdir = Cwd::cwd(); +if (!-f "$workdir/report.css") +{ + error("'$workdir' is not a valid work directory\n"); + exit 2; +} chdir($workdir) or die "could not chdir to the work directory: $!"; my @builds; diff --git a/winetest/dissect b/winetest/dissect index 99e50fb..1e4a5fe 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -48,7 +48,7 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } -use vars qw/$workdir $gitdir $gitweb $maxmult $maxuserskips $maxfailedtests $maxfilesize $acceptprediluvianwin/; +use vars qw/$gitdir $gitweb $maxmult $maxuserskips $maxfailedtests $maxfilesize $acceptprediluvianwin/; require "winetest.conf"; my $name0=$0; @@ -81,11 +81,11 @@ sub get_build_info($) { ($date, $subject) = ($1, $2); # Make sure the directory's mtime matches the commit time - utime $date, $date, "$workdir/data/$build"; + utime $date, $date, "data/$build"; } else { - $date = (stat "$workdir/data/$build")[9]; + $date = (stat "data/$build")[9]; $subject = ""; } return ($date, $subject); @@ -105,6 +105,13 @@ sub short_date($) # Command line processing # +require Cwd; +my $workdir = Cwd::cwd(); +if (!-f "$workdir/report.css") +{ + error("'$workdir' is not a valid work directory\n"); + exit 2; +} chdir($workdir) or die "could not chdir to the work directory: $!"; my ($update, $report); diff --git a/winetest/gather b/winetest/gather index 94f3541..28227a3 100755 --- a/winetest/gather +++ b/winetest/gather @@ -45,7 +45,7 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } -use vars qw/$workdir $gitdir $gitweb/; +use vars qw/$gitdir $gitweb/; require "winetest.conf"; my $name0=$0; @@ -76,11 +76,11 @@ sub get_build_info($) { ($date, $subject) = ($1, $2); # Make sure the directory's mtime matches the commit time - utime $date, $date, "$workdir/data/$build"; + utime $date, $date, "data/$build"; } else { - $date = (stat "$workdir/data/$build")[9]; + $date = (stat "data/$build")[9]; $subject = ""; } return ($date, $subject); @@ -175,7 +175,13 @@ my %idmap = (95=>\%w95, 98=>\%w98, me=>\%me, nt3=>\%nt3, nt4=>\%nt4, 2000=>\%w2k # Pick a build to work on # - +require Cwd; +my $workdir = Cwd::cwd(); +if (!-f "$workdir/report.css") +{ + error("'$workdir' is not a valid work directory\n"); + exit 2; +} chdir($workdir) or die "could not chdir to the work directory: $!"; my ($outdated,undef) = glob "data/*/outdated"; diff --git a/winetest/winetest.conf b/winetest/winetest.conf index ba15514..0d35d11 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -1,7 +1,5 @@ # Hey Emacs! This is a -*-cperl-*- file! -$workdir = "/home/winehq/opt/winetest"; - $gitdir = "/home/winehq/opt/source/git/wine.git"; $gitweb = "//source.winehq.org/git/wine.git";

1 0

Francois Gouget : winetest: Get the work directory directly from the web server.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: tools Branch: master Commit: 0708ab216e005ae740a5346ca6ae1bb308cbe6a5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0708ab216e005ae740a5346c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 7 11:07:22 2017 +0200 winetest: Get the work directory directly from the web server. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/vhost_winetest.conf | 1 + winetest/winetest.cgi | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/winetest/vhost_winetest.conf b/winetest/vhost_winetest.conf index 797aac3..6d72ccc 100644 --- a/winetest/vhost_winetest.conf +++ b/winetest/vhost_winetest.conf @@ -17,6 +17,7 @@ BEGIN { unshift @INC, "/home/wine/tools/winetest"; + $::workdir = "/home/winehq/sites/winetest"; } </Perl> diff --git a/winetest/winetest.cgi b/winetest/winetest.cgi index 9a4ad71..a2aebef 100755 --- a/winetest/winetest.cgi +++ b/winetest/winetest.cgi @@ -18,7 +18,7 @@ use strict; use warnings; -use vars qw/$workdir $maxfilesize/; +use vars qw/$maxfilesize/; BEGIN { require "winetest.conf"; @@ -29,7 +29,7 @@ use File::Temp qw(tempdir); use CGI qw(:standard); # Cater for some overhead $CGI::POST_MAX = $maxfilesize + 1024; -$ENV{TMPDIR} = "$workdir/queue"; +$ENV{TMPDIR} = "$::workdir/queue"; my $name = param ("reportfile"); my $error = cgi_error (); @@ -47,7 +47,7 @@ sub move_file($) { my ($filename) = @_; my $orig = tmpFileName($filename); - my $tmpdir = tempdir ("repXXXXX", DIR => "$workdir/queue"); + my $tmpdir = tempdir ("repXXXXX", DIR => "$::workdir/queue"); chmod 0777, $tmpdir; chmod 0666&~umask, $orig; my $size = -s $orig;

1 0

Francois Gouget : winetest/build-errors: Fix updating the errors.html file.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: tools Branch: master Commit: c42fe965c4cc18f562c51c24adc43fbd60e8eefc URL: http://source.winehq.org/git/tools.git/?a=commit;h=c42fe965c4cc18f562c51c24… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 7 10:53:17 2017 +0200 winetest/build-errors: Fix updating the errors.html file. build-errors expects the $filename variable to be set so it can use it to move the new file into place. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-errors | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/winetest/build-errors b/winetest/build-errors index f9ac4aa..2d25ae3 100755 --- a/winetest/build-errors +++ b/winetest/build-errors @@ -80,7 +80,8 @@ foreach my $dir (readdir DIR) } closedir DIR; -open OUT, ">data/errors.html.new" or die "cannot create 'data/errors.html.new'"; +my $filename = "data/errors.html"; +open OUT, ">$filename.new" or die "cannot create 'data/$filename.new'"; print OUT start_html( -title => "Errors caught during Wine test report processing", -style => {src => "/summary.css"},

1 0

Jacek Caban : urlmon: Support BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS in BindProtocol object.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: acb1f030c4f2a90d54b5ecef5d2a620e65969b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acb1f030c4f2a90d54b5ecef5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 6 17:15:55 2017 +0200 urlmon: Support BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS in BindProtocol object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/bindprot.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 1e9dd5c..1493023 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -732,6 +732,11 @@ static HRESULT WINAPI ProtocolHandler_Terminate(IInternetProtocol *iface, DWORD This->bind_info = NULL; } + if(This->redirect_callback) { + IBindCallbackRedirect_Release(This->redirect_callback); + This->redirect_callback = NULL; + } + IInternetProtocolEx_Release(&This->IInternetProtocolEx_iface); return S_OK; } @@ -994,6 +999,29 @@ static HRESULT WINAPI ProtocolSinkHandler_ReportData(IInternetProtocolSink *ifac return IInternetProtocolSink_ReportData(This->protocol_sink, bscf, progress, progress_max); } +static HRESULT handle_redirect(BindProtocol *This, const WCHAR *url) +{ + HRESULT hres; + + if(This->redirect_callback) { + VARIANT_BOOL cancel = VARIANT_FALSE; + IBindCallbackRedirect_Redirect(This->redirect_callback, url, &cancel); + if(cancel) + return INET_E_REDIRECT_FAILED; + } + + if(This->protocol_sink) { + hres = IInternetProtocolSink_ReportProgress(This->protocol_sink, BINDSTATUS_REDIRECTING, url); + if(FAILED(hres)) + return hres; + } + + IInternetProtocol_Terminate(This->protocol, 0); /* should this be done in StartEx? */ + release_protocol_handler(This); + + return IInternetProtocolEx_Start(&This->IInternetProtocolEx_iface, url, This->protocol_sink, This->bind_info, This->pi, 0); +} + static HRESULT WINAPI ProtocolSinkHandler_ReportResult(IInternetProtocolSink *iface, HRESULT hrResult, DWORD dwError, LPCWSTR szResult) { @@ -1001,6 +1029,13 @@ static HRESULT WINAPI ProtocolSinkHandler_ReportResult(IInternetProtocolSink *if TRACE("(%p)->(%08x %d %s)\n", This, hrResult, dwError, debugstr_w(szResult)); + if(hrResult == INET_E_REDIRECT_FAILED) { + hrResult = handle_redirect(This, szResult); + if(hrResult == S_OK) + return S_OK; + szResult = NULL; + } + if(This->protocol_sink) return IInternetProtocolSink_ReportResult(This->protocol_sink, hrResult, dwError, szResult); return S_OK; @@ -1054,6 +1089,17 @@ static HRESULT WINAPI BindInfo_GetBindInfo(IInternetBindInfo *iface, return hres; } + if((pbindinfo->dwOptions & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS) && !This->redirect_callback) { + IServiceProvider *service_provider; + + hres = IInternetProtocolSink_QueryInterface(This->protocol_sink, &IID_IServiceProvider, (void**)&service_provider); + if(SUCCEEDED(hres)) { + hres = IServiceProvider_QueryService(service_provider, &IID_IBindCallbackRedirect, &IID_IBindCallbackRedirect, + (void**)&This->redirect_callback); + IServiceProvider_Release(service_provider); + } + } + *grfBINDF |= BINDF_FROMURLMON; return hres; }

1 0

Jacek Caban : urlmon: Added a helper function for releasing protocol handler.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: ccc5ba29ca1fd3a0334f06355de24ae237b676a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccc5ba29ca1fd3a0334f06355… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 6 17:15:40 2017 +0200 urlmon: Added a helper function for releasing protocol handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/bindprot.c | 39 ++++++++++++++++++++++++++++----------- dlls/urlmon/urlmon_main.h | 6 ++++-- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index a4399ab..1e9dd5c 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -328,6 +328,31 @@ static ULONG WINAPI BindProtocol_AddRef(IInternetProtocolEx *iface) return ref; } +static void release_protocol_handler(BindProtocol *This) +{ + if(This->wininet_info) { + IWinInetInfo_Release(This->wininet_info); + This->wininet_info = NULL; + } + if(This->wininet_http_info) { + IWinInetHttpInfo_Release(This->wininet_http_info); + This->wininet_http_info = NULL; + } + if(This->protocol) { + IInternetProtocol_Release(This->protocol); + This->protocol = NULL; + } + if(This->protocol_handler && This->protocol_handler != &This->default_protocol_handler.IInternetProtocol_iface) { + IInternetProtocol_Release(This->protocol_handler); + This->protocol_handler = &This->default_protocol_handler.IInternetProtocol_iface; + } + if(This->protocol_sink_handler && + This->protocol_sink_handler != &This->default_protocol_handler.IInternetProtocolSink_iface) { + IInternetProtocolSink_Release(This->protocol_sink_handler); + This->protocol_sink_handler = &This->default_protocol_handler.IInternetProtocolSink_iface; + } +} + static ULONG WINAPI BindProtocol_Release(IInternetProtocolEx *iface) { BindProtocol *This = impl_from_IInternetProtocolEx(iface); @@ -336,19 +361,11 @@ static ULONG WINAPI BindProtocol_Release(IInternetProtocolEx *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { - if(This->wininet_info) - IWinInetInfo_Release(This->wininet_info); - if(This->wininet_http_info) - IWinInetHttpInfo_Release(This->wininet_http_info); - if(This->protocol) - IInternetProtocol_Release(This->protocol); + release_protocol_handler(This); + if(This->redirect_callback) + IBindCallbackRedirect_Release(This->redirect_callback); if(This->bind_info) IInternetBindInfo_Release(This->bind_info); - if(This->protocol_handler && This->protocol_handler != &This->default_protocol_handler.IInternetProtocol_iface) - IInternetProtocol_Release(This->protocol_handler); - if(This->protocol_sink_handler && - This->protocol_sink_handler != &This->default_protocol_handler.IInternetProtocolSink_iface) - IInternetProtocolSink_Release(This->protocol_sink_handler); if(This->uri) IUri_Release(This->uri); SysFreeString(This->display_uri); diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 5de1afe..ee26bed 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -176,11 +176,13 @@ typedef struct { LONG ref; IInternetProtocol *protocol; + IWinInetInfo *wininet_info; + IWinInetHttpInfo *wininet_http_info; + IInternetBindInfo *bind_info; IInternetProtocolSink *protocol_sink; IServiceProvider *service_provider; - IWinInetInfo *wininet_info; - IWinInetHttpInfo *wininet_http_info; + IBindCallbackRedirect *redirect_callback; struct { IInternetProtocol IInternetProtocol_iface;

1 0

Jacek Caban : urlmon: Release previously set URI in BindProtocol::StartEx.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: cded0779e4e5cd1ef0a87fe5247b48768ed7a465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cded0779e4e5cd1ef0a87fe52… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 6 17:15:32 2017 +0200 urlmon: Release previously set URI in BindProtocol::StartEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/bindprot.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 1efb74c..a4399ab 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -492,6 +492,11 @@ static HRESULT WINAPI BindProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr This->pi = grfPI; + if(This->uri) { + if(This->display_uri) + SysFreeString(This->display_uri); + IUri_Release(This->uri); + } IUri_AddRef(pUri); This->uri = pUri;

1 0

Jacek Caban : urlmon/tests: Added test of hanling BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS by http protocol provider.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 09b78c21e5e23efba8983421329d674d24b89df0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09b78c21e5e23efba89834213… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 6 17:15:11 2017 +0200 urlmon/tests: Added test of hanling BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS by http protocol provider. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/protocol.c | 46 +++++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 1e6fa36..ee4d763 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -142,7 +142,7 @@ static LPCWSTR file_name, http_url, expect_wsz; static IInternetProtocol *async_protocol = NULL; static BOOL first_data_notif, http_is_first, test_redirect; static int prot_state, read_report_data, post_stream_read; -static DWORD bindf, ex_priority , pi; +static DWORD bindf, ex_priority , pi, bindinfo_options; static IInternetProtocol *binding_protocol, *filtered_protocol; static IInternetBindInfo *prot_bind_info; static IInternetProtocolSink *binding_sink, *filtered_sink; @@ -595,7 +595,7 @@ static void call_continue(PROTOCOLDATA *protocol_data) todo_wine CHECK_CALLED(ReportProgress_SENDINGREQUEST); else if (tested_protocol != HTTPS_TEST) CHECK_CALLED(ReportProgress_SENDINGREQUEST); - if(test_redirect) + if(test_redirect && !(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS)) CHECK_CALLED(ReportProgress_REDIRECTING); state = test_async_req ? STATE_SENDINGREQUEST : STATE_STARTDOWNLOADING; } @@ -606,7 +606,8 @@ static void call_continue(PROTOCOLDATA *protocol_data) SET_EXPECT(ReportProgress_SENDINGREQUEST); break; case STATE_STARTDOWNLOADING: - if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) { + if((tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) + && (!test_redirect || !(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS))) { SET_EXPECT(OnResponse); if(tested_protocol == HTTPS_TEST || test_redirect || test_abort || empty_file) SET_EXPECT(ReportProgress_ACCEPTRANGES); @@ -619,13 +620,13 @@ static void call_continue(PROTOCOLDATA *protocol_data) break; } - if(state != STATE_SENDINGREQUEST) + if(state != STATE_SENDINGREQUEST && (!test_redirect || !(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS))) SET_EXPECT(ReportData); hres = IInternetProtocol_Continue(async_protocol, protocol_data); ok(hres == S_OK, "Continue failed: %08x\n", hres); if(tested_protocol == FTP_TEST || security_problem) CLEAR_CALLED(ReportData); - else if(state != STATE_SENDINGREQUEST) + else if(state != STATE_SENDINGREQUEST && (!test_redirect || !(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS))) CHECK_CALLED(ReportData); switch(state) { @@ -635,10 +636,10 @@ static void call_continue(PROTOCOLDATA *protocol_data) state = STATE_STARTDOWNLOADING; break; case STATE_STARTDOWNLOADING: - if (! security_problem) - { + if(!security_problem) { state = STATE_DOWNLOADING; - if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) { + if((tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) + && (!test_redirect || !(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS))) { CHECK_CALLED(OnResponse); if(tested_protocol == HTTPS_TEST || empty_file) CHECK_CALLED(ReportProgress_ACCEPTRANGES); @@ -1082,13 +1083,17 @@ static HRESULT WINAPI ProtocolSink_ReportResult(IInternetProtocolSink *iface, HR else ok(hrResult == expect_hrResult, "hrResult = %08x, expected: %08x\n", hrResult, expect_hrResult); - if(SUCCEEDED(hrResult) || tested_protocol == FTP_TEST || test_abort) + if(SUCCEEDED(hrResult) || tested_protocol == FTP_TEST || test_abort || hrResult == INET_E_REDIRECT_FAILED) ok(dwError == ERROR_SUCCESS, "dwError = %d, expected ERROR_SUCCESS\n", dwError); else ok(dwError != ERROR_SUCCESS || broken(tested_protocol == MK_TEST), /* WinME and NT4 */ "dwError == ERROR_SUCCESS\n"); - ok(!szResult, "szResult != NULL\n"); + + if(hrResult == INET_E_REDIRECT_FAILED) + ok(!strcmp_wa(szResult, "http://test.winehq.org/tests/hello.html"), "szResult = %s\n", wine_dbgstr_w(szResult)); + else + ok(!szResult, "szResult = %s\n", wine_dbgstr_w(szResult)); if(direct_read) SET_EXPECT(ReportData); /* checked after main loop */ @@ -1317,6 +1322,7 @@ static HRESULT WINAPI BindInfo_GetBindInfo(IInternetBindInfo *iface, DWORD *grfB cbSize = pbindinfo->cbSize; memset(pbindinfo, 0, cbSize); pbindinfo->cbSize = cbSize; + pbindinfo->dwOptions = bindinfo_options; if(http_post_test) { @@ -2338,6 +2344,7 @@ static IClassFactory mimefilter_cf = { &MimeFilterCFVtbl }; #define TEST_EMPTY 0x1000 #define TEST_NOMIME 0x2000 #define TEST_FROMCACHE 0x4000 +#define TEST_DISABLEAUTOREDIRECT 0x8000 static void register_filter(BOOL do_register) { @@ -2396,6 +2403,10 @@ static void init_test(int prot, DWORD flags) bind_from_cache = (flags & TEST_FROMCACHE) != 0; file_with_hash = FALSE; + bindinfo_options = 0; + if(flags & TEST_DISABLEAUTOREDIRECT) + bindinfo_options |= BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS; + register_filter(mimefilter_test); } @@ -2996,7 +3007,6 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym init_test(prot, flags); http_url = url; http_post_test = tymed; - if(flags & TEST_FROMCACHE) create_cache_entry(url); @@ -3034,7 +3044,7 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym SET_EXPECT(ReportProgress_CONNECTING); } SET_EXPECT(ReportProgress_SENDINGREQUEST); - if(test_redirect) + if(test_redirect && !(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS)) SET_EXPECT(ReportProgress_REDIRECTING); SET_EXPECT(ReportProgress_PROXYDETECTING); if(prot == HTTP_TEST) @@ -3057,7 +3067,13 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym if(!direct_read && !test_abort && !bind_from_cache) SET_EXPECT(ReportResult); - expect_hrResult = test_abort ? E_ABORT : S_OK; + + if(flags & TEST_DISABLEAUTOREDIRECT) + expect_hrResult = INET_E_REDIRECT_FAILED; + else if(test_abort) + expect_hrResult = E_ABORT; + else + expect_hrResult = S_OK; if(direct_read) { SET_EXPECT(Switch); @@ -3208,6 +3224,10 @@ static void test_http_protocol(void) bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NOWRITECACHE; test_http_protocol_url(redirect_url, HTTP_TEST, TEST_REDIRECT, TYMED_NULL); + trace("Testing http protocol (redirected, disable auto redirect)...\n"); + bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NOWRITECACHE; + test_http_protocol_url(redirect_url, HTTP_TEST, TEST_REDIRECT | TEST_DISABLEAUTOREDIRECT, TYMED_NULL); + trace("Testing http protocol empty file...\n"); bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NOWRITECACHE; test_http_protocol_url(empty_url, HTTP_TEST, TEST_EMPTY, TYMED_NULL);

1 0

Jacek Caban : urlmon: Added support for BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS in http protocol handler.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 9e92254d6315179054444ab820e26265d6bfb828 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e92254d6315179054444ab82… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 6 17:14:49 2017 +0200 urlmon: Added support for BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS in http protocol handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/http.c | 28 +++++++++++++++++++++++++++- dlls/urlmon/protocol.c | 4 ++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index b0c7d2a..2fd9be6 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -485,6 +485,18 @@ static HRESULT HttpProtocol_end_request(Protocol *protocol) return S_OK; } +static BOOL is_redirect_response(DWORD status_code) +{ + switch(status_code) { + case HTTP_STATUS_REDIRECT: + case HTTP_STATUS_MOVED: + case HTTP_STATUS_REDIRECT_KEEP_VERB: + case HTTP_STATUS_REDIRECT_METHOD: + return TRUE; + } + return FALSE; +} + static HRESULT HttpProtocol_start_downloading(Protocol *prot) { HttpProtocol *This = impl_from_Protocol(prot); @@ -505,7 +517,21 @@ static HRESULT HttpProtocol_start_downloading(Protocol *prot) res = HttpQueryInfoW(This->base.request, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status_code, &len, NULL); if(res) { - LPWSTR response_headers = query_http_info(This, HTTP_QUERY_RAW_HEADERS_CRLF); + WCHAR *response_headers; + + if((This->base.bind_info.dwOptions & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS) && is_redirect_response(status_code)) { + WCHAR *location; + + TRACE("Got redirect with disabled auto redirects\n"); + + location = query_http_info(This, HTTP_QUERY_LOCATION); + This->base.flags |= FLAG_RESULT_REPORTED | FLAG_LAST_DATA_REPORTED; + IInternetProtocolSink_ReportResult(This->base.protocol_sink, INET_E_REDIRECT_FAILED, 0, location); + heap_free(location); + return INET_E_REDIRECT_FAILED; + } + + response_headers = query_http_info(This, HTTP_QUERY_RAW_HEADERS_CRLF); if(response_headers) { hres = IHttpNegotiate_OnResponse(This->http_negotiate, status_code, response_headers, NULL, NULL); diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index abe8668..a6ccf83 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -76,6 +76,8 @@ static HRESULT start_downloading(Protocol *protocol) hres = protocol->vtbl->start_downloading(protocol); if(FAILED(hres)) { + if(hres == INET_E_REDIRECT_FAILED) + return S_OK; protocol_close_connection(protocol); report_result(protocol, hres); return hres; @@ -338,6 +340,8 @@ HRESULT protocol_start(Protocol *protocol, IInternetProtocol *prot, IUri *uri, request_flags |= INTERNET_FLAG_NO_CACHE_WRITE; if(protocol->bindf & BINDF_NEEDFILE) request_flags |= INTERNET_FLAG_NEED_FILE; + if(protocol->bind_info.dwOptions & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS) + request_flags |= INTERNET_FLAG_NO_AUTO_REDIRECT; hres = protocol->vtbl->open_request(protocol, uri, request_flags, internet_session, bind_info); if(FAILED(hres)) {

1 0

Alistair Leslie-Hughes : dplayx/tests: Remove some wine_todo.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 9e37dd32294d4700b67ef4976a9a269d8ae2a065 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e37dd32294d4700b67ef4976… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 6 05:42:06 2017 +0000 dplayx/tests: Remove some wine_todo. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/tests/dplayx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 015585d..0786d16 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -1262,7 +1262,7 @@ static void test_Open(void) /* Regular operation */ hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE ); - checkHR( DP_OK, hr ); + todo_wine checkHR( DP_OK, hr ); /* Opening twice */ hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE ); @@ -1288,15 +1288,15 @@ static void test_Open(void) /* - Checking how strict dplay is with sizes */ dpsd.dwSize = 0; hr = IDirectPlayX_Open( pDP, &dpsd, DPOPEN_JOIN ); - todo_wine checkHR( DPERR_INVALIDPARAMS, hr ); + checkHR( DPERR_INVALIDPARAMS, hr ); dpsd.dwSize = sizeof(DPSESSIONDESC2)-1; hr = IDirectPlayX_Open( pDP, &dpsd, DPOPEN_JOIN ); - todo_wine checkHR( DPERR_INVALIDPARAMS, hr ); + checkHR( DPERR_INVALIDPARAMS, hr ); dpsd.dwSize = sizeof(DPSESSIONDESC2)+1; hr = IDirectPlayX_Open( pDP, &dpsd, DPOPEN_JOIN ); - todo_wine checkHR( DPERR_INVALIDPARAMS, hr ); + checkHR( DPERR_INVALIDPARAMS, hr ); dpsd.dwSize = sizeof(DPSESSIONDESC2); hr = IDirectPlayX_Open( pDP, &dpsd, DPOPEN_JOIN ); @@ -1331,7 +1331,7 @@ static void test_Open(void) dpsd_server.dwSize = 0; hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE ); - todo_wine checkHR( DPERR_INVALIDPARAMS, hr ); + checkHR( DPERR_INVALIDPARAMS, hr ); dpsd_server.dwSize = sizeof(DPSESSIONDESC2);

1 0

Alistair Leslie-Hughes : dplayx: First name server address may be null.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 4f4b3be50c5db68ddec3125bf0d7b99cfd8a1d1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f4b3be50c5db68ddec3125bf… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 6 05:41:55 2017 +0000 dplayx: First name server address may be null. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/name_server.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c index 7b04bcd..7ca1500 100644 --- a/dlls/dplayx/name_server.c +++ b/dlls/dplayx/name_server.c @@ -163,7 +163,10 @@ LPVOID NS_GetNSAddr( LPVOID lpNSInfo ) * in place. */ #if 1 - return lpCache->first.lpQHFirst->lpNSAddrHdr; + if ( lpCache->first.lpQHFirst ) + return lpCache->first.lpQHFirst->lpNSAddrHdr; + + return NULL; #else /* FIXME: Should convert over to this */ return lpCache->bNsIsLocal ? lpCache->lpLocalAddrHdr

1 0

Nikolay Sivov : d3drm/tests: Added a helper to create test window.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: e3595a21deea2d6170f90ad08e0a25df79fc1d8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3595a21deea2d6170f90ad08… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 6 14:10:35 2017 +0300 d3drm/tests: Added a helper to create test window. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 39dfcc7..da5656e 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -52,6 +52,16 @@ static D3DRMMATRIX4D identity = { { 0.0f, 0.0f, 0.0f, 1.0f } }; +static HWND create_window(void) +{ + RECT r = {0, 0, 640, 480}; + + AdjustWindowRect(&r, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE); + + return CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + CW_USEDEFAULT, CW_USEDEFAULT, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL); +} + #define test_class_name(a, b) test_class_name_(__LINE__, a, b) static void test_class_name_(unsigned int line, IDirect3DRMObject *object, const char *name) { @@ -1513,7 +1523,7 @@ static void test_Viewport(void) DWORD data, ref1, ref2, ref3, ref4; DWORD initial_ref1, initial_ref2, initial_ref3, device_ref, frame_ref, frame_ref2, viewport_ref; - window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); + window = create_window(); GetClientRect(window, &rc); hr = Direct3DRMCreate(&d3drm1); @@ -2506,7 +2516,7 @@ static void test_Device(void) HWND window; RECT rc; - window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); + window = create_window(); GetClientRect(window, &rc); hr = Direct3DRMCreate(&d3drm); @@ -3069,7 +3079,7 @@ static void test_device_qi(void) GUID driver; RECT rc; - window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); + window = create_window(); GetClientRect(window, &rc); hr = DirectDrawCreateClipper(0, &clipper, NULL); ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x)\n", hr); @@ -3148,7 +3158,7 @@ static void test_create_device_from_clipper1(void) ULONG ref1, ref2, cref1, cref2; RECT rc; - window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 500, 400, 0, 0, 0, 0); + window = create_window(); GetClientRect(window, &rc); hr = DirectDrawCreateClipper(0, &clipper, NULL); ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x).\n", hr); @@ -3319,7 +3329,7 @@ static void test_create_device_from_clipper2(void) ULONG ref1, ref2, ref3, cref1, cref2; RECT rc; - window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 500, 400, 0, 0, 0, 0); + window = create_window(); GetClientRect(window, &rc); hr = DirectDrawCreateClipper(0, &clipper, NULL); ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x).\n", hr); @@ -3497,7 +3507,7 @@ static void test_create_device_from_clipper3(void) ULONG ref1, ref2, ref3, cref1, cref2; RECT rc; - window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 500, 400, 0, 0, 0, 0); + window = create_window(); GetClientRect(window, &rc); hr = DirectDrawCreateClipper(0, &clipper, NULL); ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x).\n", hr); @@ -3675,7 +3685,7 @@ static void test_create_device_from_surface1(void) hr = DirectDrawCreate(NULL, &ddraw, NULL); ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr); - window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); + window = create_window(); GetClientRect(window, &rc); hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); @@ -3847,7 +3857,7 @@ static void test_create_device_from_surface2(void) hr = DirectDrawCreate(NULL, &ddraw, NULL); ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr); - window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); + window = create_window(); GetClientRect(window, &rc); hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); @@ -4029,7 +4039,7 @@ static void test_create_device_from_surface3(void) hr = DirectDrawCreate(NULL, &ddraw, NULL); ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr); - window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); + window = create_window(); GetClientRect(window, &rc); hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); @@ -4326,7 +4336,7 @@ static void test_create_device_from_d3d1(void) hr = DirectDrawCreate(NULL, &ddraw1, NULL); ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr); - window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); + window = create_window(); GetClientRect(window, &rc); hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D, (void **)&d3d1); @@ -4663,7 +4673,7 @@ static void test_create_device_from_d3d2(void) hr = DirectDrawCreate(NULL, &ddraw1, NULL); ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr); - window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); + window = create_window(); GetClientRect(window, &rc); hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D2, (void **)&d3d2); @@ -4946,7 +4956,7 @@ static void test_create_device_from_d3d3(void) hr = DirectDrawCreate(NULL, &ddraw1, NULL); ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr); - window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); + window = create_window(); GetClientRect(window, &rc); hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D2, (void **)&d3d2); @@ -6026,7 +6036,7 @@ static void test_viewport_clear1(void) D3DCOLOR ret_color; RECT rc; - window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); GetClientRect(window, &rc); hr = DirectDrawCreate(NULL, &ddraw, NULL); @@ -6228,7 +6238,7 @@ static void test_viewport_clear2(void) D3DCOLOR ret_color; RECT rc; - window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); GetClientRect(window, &rc); hr = DirectDrawCreate(NULL, &ddraw1, NULL); @@ -6446,7 +6456,7 @@ static void test_create_texture_from_surface(void) hr = DirectDrawCreate(NULL, &ddraw, NULL); ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr); - window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); + window = create_window(); GetClientRect(window, &rc); hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);

1 0

Nikolay Sivov : d3drm: Consolidate GetClassName() implementation, reduce tests duplication.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 12967d88e5b5b45f4c3b350cd132990f66f6483c URL: http://source.winehq.org/git/wine.git/?a=commit;h=12967d88e5b5b45f4c3b350cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 6 14:10:34 2017 +0300 d3drm: Consolidate GetClassName() implementation, reduce tests duplication. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_main.c | 22 +++- dlls/d3drm/d3drm_private.h | 5 +- dlls/d3drm/device.c | 13 +-- dlls/d3drm/face.c | 14 +-- dlls/d3drm/frame.c | 13 +-- dlls/d3drm/light.c | 14 +-- dlls/d3drm/material.c | 14 +-- dlls/d3drm/meshbuilder.c | 28 ++--- dlls/d3drm/tests/d3drm.c | 273 ++++++++++----------------------------------- dlls/d3drm/texture.c | 13 +-- dlls/d3drm/viewport.c | 13 +-- 11 files changed, 138 insertions(+), 284 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=12967d88e5b5b45f4c3b3…

1 0

Huw Davies : ole32/tests: Add tests for InitNew().
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 292f8266b951e8daef0067acb1ad3e98f218420d URL: http://source.winehq.org/git/wine.git/?a=commit;h=292f8266b951e8daef0067acb… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 6 11:46:54 2017 +0100 ole32/tests: Add tests for InitNew(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 2db6de9..b30f63b 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -2300,6 +2300,120 @@ static void test_data_cache_init(void) } } +static void test_data_cache_initnew(void) +{ + HRESULT hr; + IOleCache2 *cache; + IPersistStorage *persist; + IStorage *stg_dib, *stg_mf, *stg_wine; + CLSID clsid; + static const STATDATA initnew_expect[] = + { + {{ CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, 0, NULL, 1 }, + {{ CF_BITMAP, 0, DVASPECT_CONTENT, -1, TYMED_GDI }, 0, NULL, 1 }, + }; + static const STATDATA initnew2_expect[] = + { + {{ CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, 0, NULL, 1 }, + {{ CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, 0, NULL, 2 }, + {{ CF_BITMAP, 0, DVASPECT_CONTENT, -1, TYMED_GDI }, 0, NULL, 2 }, + }; + static const STATDATA initnew3_expect[] = + { + {{ CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, 0, NULL, 1 }, + {{ CF_BITMAP, 0, DVASPECT_CONTENT, -1, TYMED_GDI }, 0, NULL, 1 }, + {{ CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, 0, NULL, 2 }, + {{ CF_BITMAP, 0, DVASPECT_CONTENT, -1, TYMED_GDI }, 0, NULL, 2 }, + {{ CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, 0, NULL, 3 }, + }; + static const STATDATA initnew4_expect[] = + { + {{ CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, 0, NULL, 2 }, + {{ CF_BITMAP, 0, DVASPECT_CONTENT, -1, TYMED_GDI }, 0, NULL, 2 }, + {{ CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, 0, NULL, 3 }, + {{ CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, 0, NULL, 4 }, + {{ CF_BITMAP, 0, DVASPECT_CONTENT, -1, TYMED_GDI }, 0, NULL, 4 }, + }; + + hr = StgCreateDocfile( NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE | STGM_DELETEONRELEASE, 0, &stg_dib ); + ok( hr == S_OK, "got %08x\n", hr); + hr = IStorage_SetClass( stg_dib, &CLSID_Picture_Dib ); + ok( hr == S_OK, "got %08x\n", hr); + + hr = StgCreateDocfile( NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE | STGM_DELETEONRELEASE, 0, &stg_mf ); + ok( hr == S_OK, "got %08x\n", hr); + hr = IStorage_SetClass( stg_mf, &CLSID_Picture_Metafile ); + ok( hr == S_OK, "got %08x\n", hr); + + hr = StgCreateDocfile( NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE | STGM_DELETEONRELEASE, 0, &stg_wine ); + ok( hr == S_OK, "got %08x\n", hr); + hr = IStorage_SetClass( stg_wine, &CLSID_WineTestOld ); + ok( hr == S_OK, "got %08x\n", hr); + + hr = CreateDataCache( NULL, &CLSID_WineTestOld, &IID_IOleCache2, (void **)&cache ); + ok( hr == S_OK, "got %08x\n", hr ); + IOleCache2_QueryInterface( cache, &IID_IPersistStorage, (void **) &persist ); + + hr = IPersistStorage_InitNew( persist, stg_dib ); + ok( hr == S_OK, "got %08x\n", hr); + + hr = IPersistStorage_GetClassID( persist, &clsid ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( IsEqualCLSID( &clsid, &CLSID_Picture_Dib ), "got %s\n", wine_dbgstr_guid( &clsid ) ); + + check_enum_cache( cache, initnew_expect, 2 ); + + hr = IPersistStorage_InitNew( persist, stg_mf ); + ok( hr == CO_E_ALREADYINITIALIZED, "got %08x\n", hr); + + hr = IPersistStorage_HandsOffStorage( persist ); + ok( hr == S_OK, "got %08x\n", hr); + + hr = IPersistStorage_GetClassID( persist, &clsid ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( IsEqualCLSID( &clsid, &CLSID_Picture_Dib ), "got %s\n", wine_dbgstr_guid( &clsid ) ); + + hr = IPersistStorage_InitNew( persist, stg_mf ); + ok( hr == S_OK, "got %08x\n", hr); + + hr = IPersistStorage_GetClassID( persist, &clsid ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( IsEqualCLSID( &clsid, &CLSID_Picture_Metafile ), "got %s\n", wine_dbgstr_guid( &clsid ) ); + + check_enum_cache( cache, initnew2_expect, 3 ); + + hr = IPersistStorage_HandsOffStorage( persist ); + ok( hr == S_OK, "got %08x\n", hr); + + hr = IPersistStorage_InitNew( persist, stg_dib ); + ok( hr == S_OK, "got %08x\n", hr); + + hr = IPersistStorage_GetClassID( persist, &clsid ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( IsEqualCLSID( &clsid, &CLSID_Picture_Dib ), "got %s\n", wine_dbgstr_guid( &clsid ) ); + + check_enum_cache( cache, initnew3_expect, 5 ); + + hr = IPersistStorage_HandsOffStorage( persist ); + ok( hr == S_OK, "got %08x\n", hr); + + hr = IPersistStorage_InitNew( persist, stg_wine ); + ok( hr == S_OK, "got %08x\n", hr); + + hr = IPersistStorage_GetClassID( persist, &clsid ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( IsEqualCLSID( &clsid, &CLSID_WineTestOld ), "got %s\n", wine_dbgstr_guid( &clsid ) ); + + check_enum_cache( cache, initnew4_expect, 5 ); + + IStorage_Release( stg_wine ); + IStorage_Release( stg_mf ); + IStorage_Release( stg_dib ); + + IPersistStorage_Release( persist ); + IOleCache2_Release( cache ); +} + static void test_default_handler(void) { HRESULT hr; @@ -3054,6 +3168,7 @@ START_TEST(ole2) test_data_cache_dib_contents_stream( 1 ); test_data_cache_bitmap(); test_data_cache_init(); + test_data_cache_initnew(); test_default_handler(); test_runnable(); test_OleRun();

1 0

Huw Davies : ole32: InitNew() should fail if there is a current storage.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 33a720b7d7af2eace8a8b3844a5c63dd1042e2cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=33a720b7d7af2eace8a8b3844… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 6 11:46:53 2017 +0100 ole32: InitNew() should fail if there is a current storage. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 9809c7a..ecae89d 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1464,7 +1464,7 @@ static HRESULT WINAPI DataCache_InitNew( TRACE("(%p, %p)\n", iface, pStg); if (This->presentationStorage != NULL) - IStorage_Release(This->presentationStorage); + return CO_E_ALREADYINITIALIZED; This->presentationStorage = pStg;

1 0

Huw Davies : ole32/tests: Add tests for automatic cache entry creation.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 51cca0b118bb113c21b0b09d0cc186a4025ca28b URL: http://source.winehq.org/git/wine.git/?a=commit;h=51cca0b118bb113c21b0b09d0… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 6 11:46:52 2017 +0100 ole32/tests: Add tests for automatic cache entry creation. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 6c6bea8..2db6de9 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -36,6 +36,7 @@ DEFINE_GUID(CLSID_Picture_Metafile,0x315,0,0,0xc0,0,0,0,0,0,0,0x46); DEFINE_GUID(CLSID_Picture_Dib,0x316,0,0,0xc0,0,0,0,0,0,0,0x46); +DEFINE_GUID(CLSID_Picture_EnhMetafile,0x319,0,0,0xc0,0,0,0,0,0,0,0x46); #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) @@ -1520,7 +1521,7 @@ static const IUnknownVtbl UnknownVtbl = static IUnknown unknown = { &UnknownVtbl }; -static void check_enum_cache(IOleCache2 *cache, STATDATA *expect, int num) +static void check_enum_cache(IOleCache2 *cache, const STATDATA *expect, int num) { IEnumSTATDATA *enum_stat; STATDATA stat; @@ -2253,6 +2254,52 @@ static void test_data_cache_bitmap(void) IOleCache2_Release( cache ); } +/* The CLSID_Picture_ classes automatically create appropriate cache entries */ +static void test_data_cache_init(void) +{ + HRESULT hr; + IOleCache2 *cache; + IPersistStorage *persist; + int i; + CLSID clsid; + static const STATDATA enum_expect[] = + { + {{ CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, 0, NULL, 1 }, + {{ CF_BITMAP, 0, DVASPECT_CONTENT, -1, TYMED_GDI }, 0, NULL, 1 }, + {{ CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, 0, NULL, 1 }, + {{ CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, 0, NULL, 1 } + }; + static const struct + { + const CLSID *clsid; + int enum_start, enum_num; + } data[] = + { + { &CLSID_NULL, 0, 0 }, + { &CLSID_WineTestOld, 0, 0 }, + { &CLSID_Picture_Dib, 0, 2 }, + { &CLSID_Picture_Metafile, 2, 1 }, + { &CLSID_Picture_EnhMetafile, 3, 1 } + }; + + for (i = 0; i < sizeof(data) / sizeof(data[0]); i++) + { + hr = CreateDataCache( NULL, data[i].clsid, &IID_IOleCache2, (void **)&cache ); + ok( hr == S_OK, "got %08x\n", hr ); + + check_enum_cache( cache, enum_expect + data[i].enum_start , data[i].enum_num ); + + IOleCache2_QueryInterface( cache, &IID_IPersistStorage, (void **) &persist ); + hr = IPersistStorage_GetClassID( persist, &clsid ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( IsEqualCLSID( &clsid, data[i].clsid ), "class id mismatch %s %s\n", wine_dbgstr_guid( &clsid ), + wine_dbgstr_guid( data[i].clsid ) ); + + IPersistStorage_Release( persist ); + IOleCache2_Release( cache ); + } +} + static void test_default_handler(void) { HRESULT hr; @@ -3006,6 +3053,7 @@ START_TEST(ole2) test_data_cache_dib_contents_stream( 0 ); test_data_cache_dib_contents_stream( 1 ); test_data_cache_bitmap(); + test_data_cache_init(); test_default_handler(); test_runnable(); test_OleRun();

1 0

Huw Davies : ole32: Create initial cache entries for the CLSID_Picture_ classes.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 966e8a2c241fa4f5dc06a9c95246883f978cd6e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=966e8a2c241fa4f5dc06a9c95… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 6 11:46:51 2017 +0100 ole32: Create initial cache entries for the CLSID_Picture_ classes. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 113 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 91 insertions(+), 22 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index d97e288..9809c7a 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -160,7 +160,9 @@ struct DataCache */ DWORD sinkAspects; DWORD sinkAdviseFlag; - IAdviseSink* sinkInterface; + IAdviseSink *sinkInterface; + + CLSID clsid; IStorage *presentationStorage; /* list of cache entries */ @@ -360,9 +362,10 @@ static BOOL init_cache_entry(DataCacheEntry *entry, const FORMATETC *fmt, DWORD } static HRESULT DataCache_CreateEntry(DataCache *This, const FORMATETC *formatetc, DWORD advf, - DataCacheEntry **cache_entry) + BOOL automatic, DataCacheEntry **cache_entry) { HRESULT hr; + DWORD id = automatic ? 1 : This->last_cache_id; DataCacheEntry *entry; hr = check_valid_clipformat_and_tymed(formatetc->cfFormat, formatetc->tymed); @@ -375,11 +378,16 @@ static HRESULT DataCache_CreateEntry(DataCache *This, const FORMATETC *formatetc if (!entry) return E_OUTOFMEMORY; - if (!init_cache_entry(entry, formatetc, advf, This->last_cache_id)) + if (!init_cache_entry(entry, formatetc, advf, id)) goto fail; - list_add_tail(&This->cache_list, &entry->entry); - This->last_cache_id++; + if (automatic) + list_add_head(&This->cache_list, &entry->entry); + else + { + list_add_tail(&This->cache_list, &entry->entry); + This->last_cache_id++; + } if (cache_entry) *cache_entry = entry; return hr; @@ -1042,6 +1050,54 @@ static inline DWORD tymed_from_cf( DWORD cf ) } } +/**************************************************************** + * create_automatic_entry + * + * Creates an appropriate cache entry for one of the CLSID_Picture_ + * classes. The connection id of the entry is one. Any pre-existing + * automatic entry is re-assigned a new connection id, and moved to + * the end of the list. + */ +static HRESULT create_automatic_entry(DataCache *cache, const CLSID *clsid) +{ + static const struct data + { + const CLSID *clsid; + FORMATETC fmt; + } data[] = + { + { &CLSID_Picture_Dib, { CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, + { &CLSID_Picture_Metafile, { CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT } }, + { &CLSID_Picture_EnhMetafile, { CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF } }, + { NULL } + }; + const struct data *ptr = data; + struct list *head; + DataCacheEntry *entry; + + if (IsEqualCLSID( &cache->clsid, clsid )) return S_OK; + + /* move and reassign any pre-existing automatic entry */ + if ((head = list_head( &cache->cache_list ))) + { + entry = LIST_ENTRY( head, DataCacheEntry, entry ); + if (entry->id == 1) + { + list_remove( &entry->entry ); + entry->id = cache->last_cache_id++; + list_add_tail( &cache->cache_list, &entry->entry ); + } + } + + while (ptr->clsid) + { + if (IsEqualCLSID( clsid, ptr->clsid )) + return DataCache_CreateEntry( cache, &ptr->fmt, 0, TRUE, NULL ); + ptr++; + } + return S_OK; +} + /********************************************************* * Method implementation for the non delegating IUnknown * part of the DataCache class. @@ -1363,22 +1419,9 @@ static ULONG WINAPI DataCache_IPersistStorage_Release( static HRESULT WINAPI DataCache_GetClassID(IPersistStorage *iface, CLSID *clsid) { DataCache *This = impl_from_IPersistStorage( iface ); - HRESULT hr; - STATSTG statstg; - - TRACE( "(%p, %p)\n", iface, clsid ); - - if (This->presentationStorage) - { - hr = IStorage_Stat( This->presentationStorage, &statstg, STATFLAG_NONAME ); - if (SUCCEEDED(hr)) - { - *clsid = statstg.clsid; - return S_OK; - } - } - *clsid = CLSID_NULL; + TRACE( "(%p, %p) returning %s\n", iface, clsid, debugstr_guid(&This->clsid) ); + *clsid = This->clsid; return S_OK; } @@ -1415,6 +1458,8 @@ static HRESULT WINAPI DataCache_InitNew( IStorage* pStg) { DataCache *This = impl_from_IPersistStorage(iface); + CLSID clsid; + HRESULT hr; TRACE("(%p, %p)\n", iface, pStg); @@ -1425,6 +1470,15 @@ static HRESULT WINAPI DataCache_InitNew( IStorage_AddRef(This->presentationStorage); This->dirty = TRUE; + ReadClassStg( pStg, &clsid ); + hr = create_automatic_entry( This, &clsid ); + if (FAILED(hr)) + { + IStorage_Release( pStg ); + This->presentationStorage = NULL; + return hr; + } + This->clsid = clsid; return S_OK; } @@ -1440,7 +1494,7 @@ static HRESULT add_cache_entry( DataCache *This, const FORMATETC *fmt, DWORD adv cache_entry = DataCache_GetEntryForFormatEtc( This, fmt ); if (!cache_entry) - hr = DataCache_CreateEntry( This, fmt, advf, &cache_entry ); + hr = DataCache_CreateEntry( This, fmt, advf, FALSE, &cache_entry ); if (SUCCEEDED( hr )) { DataCacheEntry_DiscardData( cache_entry ); @@ -1537,11 +1591,22 @@ static HRESULT WINAPI DataCache_Load( IPersistStorage *iface, IStorage *pStg ) DataCache *This = impl_from_IPersistStorage(iface); HRESULT hr; IStream *stm; + CLSID clsid; + DataCacheEntry *entry, *cursor2; TRACE("(%p, %p)\n", iface, pStg); IPersistStorage_HandsOffStorage( iface ); + LIST_FOR_EACH_ENTRY_SAFE( entry, cursor2, &This->cache_list, DataCacheEntry, entry ) + DataCacheEntry_Destroy( This, entry ); + + ReadClassStg( pStg, &clsid ); + hr = create_automatic_entry( This, &clsid ); + if (FAILED( hr )) return hr; + + This->clsid = clsid; + hr = IStorage_OpenStream( pStg, CONTENTS, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm ); if (SUCCEEDED( hr )) @@ -2191,7 +2256,7 @@ static HRESULT WINAPI DataCache_Cache( return CACHE_S_SAMECACHE; } - hr = DataCache_CreateEntry(This, &fmt_cpy, advf, &cache_entry); + hr = DataCache_CreateEntry(This, &fmt_cpy, advf, FALSE, &cache_entry); if (SUCCEEDED(hr)) { @@ -2622,12 +2687,16 @@ static DataCache* DataCache_Construct( newObject->sinkAspects = 0; newObject->sinkAdviseFlag = 0; newObject->sinkInterface = 0; + newObject->clsid = CLSID_NULL; newObject->presentationStorage = NULL; list_init(&newObject->cache_list); newObject->last_cache_id = 2; newObject->dirty = FALSE; newObject->running_object = NULL; + create_automatic_entry( newObject, clsid ); + newObject->clsid = *clsid; + return newObject; }

1 0

Huw Davies : ole32: Add the ability to create an entry without returning it.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 111b72fc85b19820a71accc037e6904638c4380a URL: http://source.winehq.org/git/wine.git/?a=commit;h=111b72fc85b19820a71accc03… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 6 11:46:50 2017 +0100 ole32: Add the ability to create an entry without returning it. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index c9ab200..d97e288 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -363,6 +363,7 @@ static HRESULT DataCache_CreateEntry(DataCache *This, const FORMATETC *formatetc DataCacheEntry **cache_entry) { HRESULT hr; + DataCacheEntry *entry; hr = check_valid_clipformat_and_tymed(formatetc->cfFormat, formatetc->tymed); if (FAILED(hr)) @@ -370,20 +371,21 @@ static HRESULT DataCache_CreateEntry(DataCache *This, const FORMATETC *formatetc if (hr == CACHE_S_FORMATETC_NOTSUPPORTED) TRACE("creating unsupported format %d\n", formatetc->cfFormat); - *cache_entry = HeapAlloc(GetProcessHeap(), 0, sizeof(**cache_entry)); - if (!*cache_entry) + entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry)); + if (!entry) return E_OUTOFMEMORY; - if (!init_cache_entry(*cache_entry, formatetc, advf, This->last_cache_id)) + if (!init_cache_entry(entry, formatetc, advf, This->last_cache_id)) goto fail; - list_add_tail(&This->cache_list, &(*cache_entry)->entry); + list_add_tail(&This->cache_list, &entry->entry); This->last_cache_id++; + if (cache_entry) *cache_entry = entry; return hr; fail: - HeapFree(GetProcessHeap(), 0, *cache_entry); + HeapFree(GetProcessHeap(), 0, entry); return E_OUTOFMEMORY; }

1 0

Huw Davies : ole32: Start allocating regular cache entries with id of 2.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 705ccd748812566bd5bc33ff75705bde5ef62236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=705ccd748812566bd5bc33ff7… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 6 11:46:49 2017 +0100 ole32: Start allocating regular cache entries with id of 2. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 2 +- dlls/ole32/tests/ole2.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index d921603..c9ab200 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -2622,7 +2622,7 @@ static DataCache* DataCache_Construct( newObject->sinkInterface = 0; newObject->presentationStorage = NULL; list_init(&newObject->cache_list); - newObject->last_cache_id = 1; + newObject->last_cache_id = 2; newObject->dirty = FALSE; newObject->running_object = NULL; diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 37e89da..6c6bea8 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -2140,6 +2140,7 @@ static void test_data_cache_bitmap(void) hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); ok( hr == S_OK, "got %08x\n", hr ); + ok( conn == 2, "got %d\n", conn ); expect[0].dwConnection = conn; expect[1].dwConnection = conn; @@ -2158,6 +2159,7 @@ static void test_data_cache_bitmap(void) hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); ok( hr == S_OK, "got %08x\n", hr ); + ok( conn == 3, "got %d\n", conn ); expect[2].dwConnection = conn; check_enum_cache( cache, expect, 3); @@ -2168,6 +2170,7 @@ static void test_data_cache_bitmap(void) hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); ok( hr == S_OK, "got %08x\n", hr ); + ok( conn == 4, "got %d\n", conn ); expect[3].dwConnection = conn; check_enum_cache( cache, expect, 4 );

1 0

Huw Davies : ole32: Fix incorrectly assigned member in the presentation stream.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 026756482aee72fc3c0fd5eecd257fdd8ebf5d2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=026756482aee72fc3c0fd5eec… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 6 11:46:48 2017 +0100 ole32: Fix incorrectly assigned member in the presentation stream. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 36 ++++++++++++++++++++++++------------ dlls/ole32/tests/ole2.c | 16 +++++++--------- 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index b6c227e..d921603 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -82,7 +82,7 @@ typedef struct PresentationDataHeader DWORD unknown3; /* 4, possibly TYMED_ISTREAM */ DVASPECT dvAspect; DWORD lindex; - DWORD tymed; + DWORD advf; DWORD unknown7; /* 0 */ DWORD dwObjectExtentX; DWORD dwObjectExtentY; @@ -320,10 +320,10 @@ static DataCacheEntry *DataCache_GetEntryForFormatEtc(DataCache *This, const FOR /* checks that the clipformat and tymed are valid and returns an error if they * aren't and CACHE_S_NOTSUPPORTED if they are valid, but can't be rendered by * DataCache_Draw */ -static HRESULT check_valid_clipformat_and_tymed(CLIPFORMAT cfFormat, DWORD tymed, BOOL load) +static HRESULT check_valid_clipformat_and_tymed(CLIPFORMAT cfFormat, DWORD tymed) { if (!cfFormat || !tymed || - (cfFormat == CF_METAFILEPICT && (tymed == TYMED_MFPICT || load)) || + (cfFormat == CF_METAFILEPICT && tymed == TYMED_MFPICT) || (cfFormat == CF_BITMAP && tymed == TYMED_GDI) || (cfFormat == CF_DIB && tymed == TYMED_HGLOBAL) || (cfFormat == CF_ENHMETAFILE && tymed == TYMED_ENHMF)) @@ -360,11 +360,11 @@ static BOOL init_cache_entry(DataCacheEntry *entry, const FORMATETC *fmt, DWORD } static HRESULT DataCache_CreateEntry(DataCache *This, const FORMATETC *formatetc, DWORD advf, - DataCacheEntry **cache_entry, BOOL load) + DataCacheEntry **cache_entry) { HRESULT hr; - hr = check_valid_clipformat_and_tymed(formatetc->cfFormat, formatetc->tymed, load); + hr = check_valid_clipformat_and_tymed(formatetc->cfFormat, formatetc->tymed); if (FAILED(hr)) return hr; if (hr == CACHE_S_FORMATETC_NOTSUPPORTED) @@ -798,7 +798,7 @@ static HRESULT DataCacheEntry_Save(DataCacheEntry *cache_entry, IStorage *storag header.unknown3 = 4; header.dvAspect = cache_entry->fmtetc.dwAspect; header.lindex = cache_entry->fmtetc.lindex; - header.tymed = cache_entry->stgmedium.tymed; + header.advf = cache_entry->advise_flags; header.unknown7 = 0; header.dwObjectExtentX = 0; header.dwObjectExtentY = 0; @@ -1028,6 +1028,18 @@ static inline void DataCacheEntry_HandsOffStorage(DataCacheEntry *cache_entry) } } +static inline DWORD tymed_from_cf( DWORD cf ) +{ + switch( cf ) + { + case CF_BITMAP: return TYMED_GDI; + case CF_METAFILEPICT: return TYMED_MFPICT; + case CF_ENHMETAFILE: return TYMED_ENHMF; + case CF_DIB: + default: return TYMED_HGLOBAL; + } +} + /********************************************************* * Method implementation for the non delegating IUnknown * part of the DataCache class. @@ -1416,7 +1428,7 @@ static HRESULT WINAPI DataCache_InitNew( } -static HRESULT add_cache_entry( DataCache *This, const FORMATETC *fmt, IStream *stm, +static HRESULT add_cache_entry( DataCache *This, const FORMATETC *fmt, DWORD advf, IStream *stm, enum stream_type type ) { DataCacheEntry *cache_entry; @@ -1426,7 +1438,7 @@ static HRESULT add_cache_entry( DataCache *This, const FORMATETC *fmt, IStream * cache_entry = DataCache_GetEntryForFormatEtc( This, fmt ); if (!cache_entry) - hr = DataCache_CreateEntry( This, fmt, 0, &cache_entry, TRUE ); + hr = DataCache_CreateEntry( This, fmt, advf, &cache_entry ); if (SUCCEEDED( hr )) { DataCacheEntry_DiscardData( cache_entry ); @@ -1472,9 +1484,9 @@ static HRESULT parse_pres_streams( DataCache *This, IStorage *stg ) fmtetc.ptd = NULL; /* FIXME */ fmtetc.dwAspect = header.dvAspect; fmtetc.lindex = header.lindex; - fmtetc.tymed = header.tymed; + fmtetc.tymed = tymed_from_cf( clipformat ); - add_cache_entry( This, &fmtetc, stm, pres_stream ); + add_cache_entry( This, &fmtetc, header.advf, stm, pres_stream ); } IStream_Release( stm ); } @@ -1505,7 +1517,7 @@ static HRESULT parse_contents_stream( DataCache *This, IStorage *stg, IStream *s return E_FAIL; } - return add_cache_entry( This, fmt, stm, contents_stream ); + return add_cache_entry( This, fmt, 0, stm, contents_stream ); } static const WCHAR CONTENTS[] = {'C','O','N','T','E','N','T','S',0}; @@ -2177,7 +2189,7 @@ static HRESULT WINAPI DataCache_Cache( return CACHE_S_SAMECACHE; } - hr = DataCache_CreateEntry(This, &fmt_cpy, advf, &cache_entry, FALSE); + hr = DataCache_CreateEntry(This, &fmt_cpy, advf, &cache_entry); if (SUCCEEDED(hr)) { diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 394371b..37e89da 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -135,7 +135,7 @@ typedef struct PresentationDataHeader DWORD unknown3; /* 4, possibly TYMED_ISTREAM */ DVASPECT dvAspect; DWORD lindex; - DWORD tymed; + DWORD advf; DWORD unknown7; /* 0 */ DWORD dwObjectExtentX; DWORD dwObjectExtentY; @@ -1173,7 +1173,7 @@ static void test_OleLoad(IStorage *pStorage) IStorage *stg; IStream *stream; IUnknown *obj; - DWORD data, i, tymed, data_size; + DWORD data, i, data_size; PresentationDataHeader header; HDC hdc; HGDIOBJ hobj; @@ -1222,12 +1222,10 @@ static void test_OleLoad(IStorage *pStorage) break; } - tymed = 1 << i; - header.unknown3 = 4; header.dvAspect = DVASPECT_CONTENT; header.lindex = -1; - header.tymed = tymed; + header.advf = 1 << i; header.unknown7 = 0; header.dwObjectExtentX = 1; header.dwObjectExtentY = 1; @@ -1247,19 +1245,19 @@ static void test_OleLoad(IStorage *pStorage) IStorage_Release(stg); continue; } - ok(hr == S_OK, "OleLoad error %#x: cfFormat = %u, tymed = %u\n", hr, fmt, tymed); + ok(hr == S_OK, "OleLoad error %#x: cfFormat = %u, advf = %#x\n", hr, fmt, header.advf); hdc = CreateCompatibleDC(0); SetRect(&rc, 0, 0, 100, 100); hr = OleDraw(obj, DVASPECT_CONTENT, hdc, &rc); DeleteDC(hdc); if (fmt == CF_METAFILEPICT) - ok(hr == S_OK, "OleDraw error %#x: cfFormat = %u, tymed = %u\n", hr, fmt, tymed); + ok(hr == S_OK, "OleDraw error %#x: cfFormat = %u, advf = %#x\n", hr, fmt, header.advf); else if (fmt == CF_ENHMETAFILE) todo_wine - ok(hr == S_OK, "OleDraw error %#x: cfFormat = %u, tymed = %u\n", hr, fmt, tymed); + ok(hr == S_OK, "OleDraw error %#x: cfFormat = %u, advf = %#x\n", hr, fmt, header.advf); else - ok(hr == OLE_E_BLANK || hr == OLE_E_NOTRUNNING || hr == E_FAIL, "OleDraw should fail: %#x, cfFormat = %u, tymed = %u\n", hr, fmt, header.tymed); + ok(hr == OLE_E_BLANK || hr == OLE_E_NOTRUNNING || hr == E_FAIL, "OleDraw should fail: %#x, cfFormat = %u, advf = %#x\n", hr, fmt, header.advf); IUnknown_Release(obj); IStorage_Release(stg);

1 0

Piotr Caban : msvcrt: Translate SEH exception on each call to __CxxFrameHandler (i386).
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: c7a51dfdcb58f96125f832eda67665e7eef657b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7a51dfdcb58f96125f832eda… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 6 12:10:41 2017 +0200 msvcrt: Translate SEH exception on each call to __CxxFrameHandler (i386). Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_i386.c | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 963bd58..f777ba6 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -96,6 +96,13 @@ typedef struct __cxx_function_descr UINT flags; /* flags when magic >= VC8 */ } cxx_function_descr; +typedef struct +{ + cxx_exception_frame *frame; + const cxx_function_descr *descr; + EXCEPTION_REGISTRATION_RECORD *nested_frame; +} se_translator_ctx; + typedef struct _SCOPETABLE { int previousTryLevel; @@ -532,6 +539,26 @@ int CDECL __CxxExceptionFilter( PEXCEPTION_POINTERS ptrs, return EXCEPTION_EXECUTE_HANDLER; } +static LONG CALLBACK se_translation_filter( EXCEPTION_POINTERS *ep, void *c ) +{ + se_translator_ctx *ctx = (se_translator_ctx *)c; + EXCEPTION_RECORD *rec = ep->ExceptionRecord; + cxx_exception_type *exc_type; + + if (rec->ExceptionCode != CXX_EXCEPTION) + { + TRACE( "non-c++ exception thrown in SEH handler: %x\n", rec->ExceptionCode ); + MSVCRT_terminate(); + } + + exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; + call_catch_block( rec, ctx->frame, ctx->descr, + ctx->frame->trylevel, ctx->nested_frame, exc_type ); + + __DestructExceptionObject( rec ); + return ExceptionContinueSearch; +} + /********************************************************************* * cxx_frame_handler * @@ -604,10 +631,21 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame if (data->se_translator) { EXCEPTION_POINTERS except_ptrs; + se_translator_ctx ctx; - except_ptrs.ExceptionRecord = rec; - except_ptrs.ContextRecord = context; - data->se_translator(rec->ExceptionCode, &except_ptrs); + ctx.frame = frame; + ctx.descr = descr; + ctx.nested_frame = nested_frame; + __TRY + { + except_ptrs.ExceptionRecord = rec; + except_ptrs.ContextRecord = context; + data->se_translator( rec->ExceptionCode, &except_ptrs ); + } + __EXCEPT_CTX(se_translation_filter, &ctx) + { + } + __ENDTRY } }

1 0

Francois Gouget : jscript: A spelling fix in a comment.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 5c8c4d92f6e09ea2ba0c17da5a3d3fea75a13513 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8c4d92f6e09ea2ba0c17da5… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jun 4 11:39:35 2017 +0200 jscript: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 61c4077..cbc360f 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1743,7 +1743,7 @@ static HRESULT compile_try_statement(compiler_ctx_t *ctx, try_statement_t *stat) if(stat->finally_statement) { /* * finally block expects two elements on the stack, which may be: - * - (true, return_addr) set by OP_pop_except, OP_end_finally jumps back to passed addres + * - (true, return_addr) set by OP_pop_except, OP_end_finally jumps back to passed address * - (false, exception_value) set when unwinding an exception, which OP_end_finally rethrows */ finally_off = ctx->code_off;

1 0

Francois Gouget : wbemdisp: Add a trailing newline to a TRACE() message.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 82527f8a00531b89a1c68c6e1624544d2dfbb123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82527f8a00531b89a1c68c6e1… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jun 4 11:40:44 2017 +0200 wbemdisp: Add a trailing newline to a TRACE() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 6fdd608..d1be48f 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -421,7 +421,7 @@ static HRESULT WINAPI propertyset_Item( ISWbemPropertySet *iface, BSTR name, HRESULT hr; VARIANT var; - TRACE( "%p, %s, %08x, %p", propertyset, debugstr_w(name), flags, prop ); + TRACE( "%p, %s, %08x, %p\n", propertyset, debugstr_w(name), flags, prop ); hr = IWbemClassObject_Get( propertyset->object, name, 0, &var, NULL, NULL ); if (SUCCEEDED(hr))

1 0

Francois Gouget : ole32: Make bitmap_info_size() static.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 85a130958cf3d5138ee9711dbede1ff44098bf60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85a130958cf3d5138ee9711db… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jun 4 11:38:56 2017 +0200 ole32: Make bitmap_info_size() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 420711a..b6c227e 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -229,7 +229,7 @@ const char *debugstr_formatetc(const FORMATETC *formatetc) * * Return the size of the bitmap info structure including color table. */ -int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) +static int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) { unsigned int colors, size, masks = 0;

1 0

Hugh McMaster : regedit: Use shared code to add favourite key items to the 'Remove' listbox.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 75fed2d5a1360d7769f42122b95c8d4087cd0889 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75fed2d5a1360d7769f42122b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 6 08:01:07 2017 +0000 regedit: Use shared code to add favourite key items to the 'Remove' listbox. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 46 ++++++++++++++------------------------------- 1 file changed, 14 insertions(+), 32 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 9853810..0503dc8 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -215,15 +215,15 @@ static void add_remove_modify_menu_items(HMENU hMenu) } } -static void add_favourite_key_menu_items(HMENU hMenu) +static int add_favourite_key_items(HMENU hMenu, HWND hList) { HKEY hkey; LONG rc; - DWORD num_values, max_value_len, value_len, type, i; + DWORD num_values, max_value_len, value_len, type, i = 0; WCHAR *value_name; rc = RegOpenKeyExW(HKEY_CURRENT_USER, favoritesKey, 0, KEY_READ, &hkey); - if (rc != ERROR_SUCCESS) return; + if (rc != ERROR_SUCCESS) return 0; rc = RegQueryInfoKeyW(hkey, NULL, NULL, NULL, NULL, NULL, NULL, &num_values, &max_value_len, NULL, NULL, NULL); @@ -239,19 +239,25 @@ static void add_favourite_key_menu_items(HMENU hMenu) value_name = HeapAlloc(GetProcessHeap(), 0, max_value_len * sizeof(WCHAR)); CHECK_ENOUGH_MEMORY(value_name); - AppendMenuW(hMenu, MF_SEPARATOR, 0, 0); + if (hMenu) AppendMenuW(hMenu, MF_SEPARATOR, 0, 0); for (i = 0; i < num_values; i++) { value_len = max_value_len; rc = RegEnumValueW(hkey, i, value_name, &value_len, NULL, &type, NULL, NULL); if (rc == ERROR_SUCCESS && type == REG_SZ) - AppendMenuW(hMenu, MF_ENABLED | MF_STRING, ID_FAVORITE_FIRST + i, value_name); + { + if (hMenu) + AppendMenuW(hMenu, MF_ENABLED | MF_STRING, ID_FAVORITE_FIRST + i, value_name); + else if (hList) + SendMessageW(hList, LB_ADDSTRING, 0, (LPARAM)value_name); + } } HeapFree(GetProcessHeap(), 0, value_name); exit: RegCloseKey(hkey); + return i; } static void OnInitMenuPopup(HWND hWnd, HMENU hMenu) @@ -263,7 +269,7 @@ static void OnInitMenuPopup(HWND hWnd, HMENU hMenu) while (GetMenuItemCount(hMenu) > 2) DeleteMenu(hMenu, 2, MF_BYPOSITION); - add_favourite_key_menu_items(hMenu); + add_favourite_key_items(hMenu, NULL); } UpdateMenuItems(hMenu); @@ -710,35 +716,11 @@ static INT_PTR CALLBACK removefavorite_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM w HWND hwndList = GetDlgItem(hwndDlg, IDC_NAME_LIST); switch(uMsg) { - case WM_INITDIALOG: { - HKEY hKey; - int i = 0; - EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE); - if (RegOpenKeyExW(HKEY_CURRENT_USER, favoritesKey, - 0, KEY_READ, &hKey) == ERROR_SUCCESS) { - WCHAR namebuf[KEY_MAX_LEN]; - BYTE valuebuf[4096]; - DWORD ksize, vsize, type; - LONG error; - do { - ksize = KEY_MAX_LEN; - vsize = sizeof(valuebuf); - error = RegEnumValueW(hKey, i, namebuf, &ksize, NULL, &type, valuebuf, &vsize); - if (error != ERROR_SUCCESS) - break; - if (type == REG_SZ) { - SendMessageW(hwndList, LB_ADDSTRING, 0, (LPARAM)namebuf); - } - i++; - } while(error == ERROR_SUCCESS); - RegCloseKey(hKey); - } - else + case WM_INITDIALOG: + if (!add_favourite_key_items(NULL, hwndList)) return FALSE; - EnableWindow(GetDlgItem(hwndDlg, IDOK), i != 0); SendMessageW(hwndList, LB_SETCURSEL, 0, 0); return TRUE; - } case WM_COMMAND: switch(LOWORD(wParam)) { case IDC_NAME_LIST:

1 0

Hans Leidekker : webservices: Pass AI_PASSIVE when resolving the hostname for a listener socket.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 1fb0e25cfb32438aa0b1439a410e195af0e2fde3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fb0e25cfb32438aa0b1439a4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 6 09:56:01 2017 +0200 webservices: Pass AI_PASSIVE when resolving the hostname for a listener socket. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 4 ++-- dlls/webservices/listener.c | 14 +++++++++----- dlls/webservices/sock.h | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 9fb1944..1fa96a9 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -637,7 +637,7 @@ static HRESULT connect_channel_tcp( struct channel *channel ) winsock_init(); - hr = resolve_hostname( host, port, addr, &addr_len ); + hr = resolve_hostname( host, port, addr, &addr_len, 0 ); heap_free( host ); if (hr != S_OK) return hr; @@ -675,7 +675,7 @@ static HRESULT connect_channel_udp( struct channel *channel ) winsock_init(); - hr = resolve_hostname( host, port, addr, &addr_len ); + hr = resolve_hostname( host, port, addr, &addr_len, 0 ); heap_free( host ); if (hr != S_OK) return hr; diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index 764e002..a658ee7 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -256,16 +256,20 @@ void WINAPI WsFreeListener( WS_LISTENER *handle ) free_listener( listener ); } -HRESULT resolve_hostname( const WCHAR *host, USHORT port, struct sockaddr *addr, int *addr_len ) +HRESULT resolve_hostname( const WCHAR *host, USHORT port, struct sockaddr *addr, int *addr_len, int flags ) { static const WCHAR fmtW[] = {'%','u',0}; WCHAR service[6]; - ADDRINFOW *res, *info; + ADDRINFOW hints, *res, *info; HRESULT hr = WS_E_ADDRESS_NOT_AVAILABLE; + memset( &hints, 0, sizeof(hints) ); + hints.ai_flags = flags; + hints.ai_family = AF_INET; + *addr_len = 0; sprintfW( service, fmtW, port ); - if (GetAddrInfoW( host, service, NULL, &res )) return HRESULT_FROM_WIN32( WSAGetLastError() ); + if (GetAddrInfoW( host, service, &hints, &res )) return HRESULT_FROM_WIN32( WSAGetLastError() ); info = res; while (info && info->ai_family != AF_INET) info = info->ai_next; @@ -330,7 +334,7 @@ static HRESULT open_listener_tcp( struct listener *listener, const WS_STRING *ur winsock_init(); - hr = resolve_hostname( host, port, addr, &addr_len ); + hr = resolve_hostname( host, port, addr, &addr_len, AI_PASSIVE ); heap_free( host ); if (hr != S_OK) return hr; @@ -381,7 +385,7 @@ static HRESULT open_listener_udp( struct listener *listener, const WS_STRING *ur winsock_init(); - hr = resolve_hostname( host, port, addr, &addr_len ); + hr = resolve_hostname( host, port, addr, &addr_len, AI_PASSIVE ); heap_free( host ); if (hr != S_OK) return hr; diff --git a/dlls/webservices/sock.h b/dlls/webservices/sock.h index e03b91e..282a777 100644 --- a/dlls/webservices/sock.h +++ b/dlls/webservices/sock.h @@ -19,6 +19,6 @@ #include "ws2tcpip.h" void winsock_init(void) DECLSPEC_HIDDEN; -HRESULT resolve_hostname( const WCHAR *, USHORT, struct sockaddr *, int * ) DECLSPEC_HIDDEN; +HRESULT resolve_hostname( const WCHAR *, USHORT, struct sockaddr *, int *, int ) DECLSPEC_HIDDEN; HRESULT channel_accept_tcp( SOCKET, HANDLE, HANDLE, WS_CHANNEL * ) DECLSPEC_HIDDEN; HRESULT channel_accept_udp( SOCKET, HANDLE, HANDLE, WS_CHANNEL * ) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : webservices: Restrict connections to IPv4 for now.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: b45879986379c39c3f8d382e01347d0151304540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b45879986379c39c3f8d382e0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 6 09:56:00 2017 +0200 webservices: Restrict connections to IPv4 for now. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/listener.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index af39783..764e002 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -268,7 +268,7 @@ HRESULT resolve_hostname( const WCHAR *host, USHORT port, struct sockaddr *addr, if (GetAddrInfoW( host, service, NULL, &res )) return HRESULT_FROM_WIN32( WSAGetLastError() ); info = res; - while (info && info->ai_family != AF_INET && info->ai_family != AF_INET6) info = info->ai_next; + while (info && info->ai_family != AF_INET) info = info->ai_next; if (info) { memcpy( addr, info->ai_addr, info->ai_addrlen );

1 0

Hans Leidekker : webservices: Set SO_REUSEADDR on listener sockets.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: cb1882f72e8c6e2cfab123e48c5ae2a05bcbd0ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb1882f72e8c6e2cfab123e48… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 6 09:55:59 2017 +0200 webservices: Set SO_REUSEADDR on listener sockets. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/listener.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index 5d6d1a8..af39783 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -315,7 +315,7 @@ static HRESULT open_listener_tcp( struct listener *listener, const WS_STRING *ur { struct sockaddr_storage storage; struct sockaddr *addr = (struct sockaddr *)&storage; - int addr_len; + int addr_len, on = 1; WS_URL_SCHEME_TYPE scheme; WCHAR *host; USHORT port; @@ -337,6 +337,13 @@ static HRESULT open_listener_tcp( struct listener *listener, const WS_STRING *ur if ((listener->u.tcp.socket = socket( addr->sa_family, SOCK_STREAM, 0 )) == -1) return HRESULT_FROM_WIN32( WSAGetLastError() ); + if (setsockopt( listener->u.tcp.socket, SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof(on) ) < 0) + { + closesocket( listener->u.tcp.socket ); + listener->u.tcp.socket = -1; + return HRESULT_FROM_WIN32( WSAGetLastError() ); + } + if (bind( listener->u.tcp.socket, addr, addr_len ) < 0) { closesocket( listener->u.tcp.socket );

1 0

Hans Leidekker : webservices: Support more text record types in the reader.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 06f6346df329babf3bf9d3defefdec6fb6e047ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=06f6346df329babf3bf9d3def… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 6 09:55:58 2017 +0200 webservices: Support more text record types in the reader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 131 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 107 insertions(+), 24 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 7c0a2eb..d781023 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1477,6 +1477,8 @@ static HRESULT read_dict_string( struct reader *reader, WS_XML_STRING **str ) static HRESULT read_attribute_value_bin( struct reader *reader, WS_XML_ATTRIBUTE *attr ) { + static const unsigned char zero[] = {'0'}, one[] = {'1'}; + static const unsigned char false[] = {'f','a','l','s','e'}, true[] = {'t','r','u','e'}; WS_XML_UTF8_TEXT *utf8 = NULL; unsigned char type; HRESULT hr; @@ -1487,6 +1489,22 @@ static HRESULT read_attribute_value_bin( struct reader *reader, WS_XML_ATTRIBUTE switch (type) { + case RECORD_ZERO_TEXT: + if (!(utf8 = alloc_utf8_text( zero, sizeof(zero) ))) return E_OUTOFMEMORY; + break; + + case RECORD_ONE_TEXT: + if (!(utf8 = alloc_utf8_text( one, sizeof(one) ))) return E_OUTOFMEMORY; + break; + + case RECORD_FALSE_TEXT: + if (!(utf8 = alloc_utf8_text( false, sizeof(false) ))) return E_OUTOFMEMORY; + break; + + case RECORD_TRUE_TEXT: + if (!(utf8 = alloc_utf8_text( true, sizeof(true) ))) return E_OUTOFMEMORY; + break; + case RECORD_CHARS8_TEXT: { unsigned char len8; @@ -1494,17 +1512,34 @@ static HRESULT read_attribute_value_bin( struct reader *reader, WS_XML_ATTRIBUTE len = len8; break; } + case RECORD_EMPTY_TEXT: + len = 0; + break; + + case RECORD_DICTIONARY_TEXT: + { + ULONG id; + if ((hr = read_int31( reader, &id )) != S_OK) return hr; + if (!reader->dict || (id >>= 1) >= reader->dict->stringCount) return WS_E_INVALID_FORMAT; + if (!(utf8 = alloc_utf8_text( reader->dict->strings[id].bytes, reader->dict->strings[id].length ))) + return E_OUTOFMEMORY; + break; + } + default: ERR( "unhandled record type %02x\n", type ); return WS_E_NOT_SUPPORTED; } - if (!(utf8 = alloc_utf8_text( NULL, len ))) return E_OUTOFMEMORY; - if (!len) utf8->value.bytes = (BYTE *)(utf8 + 1); /* quirk */ - if ((hr = read_bytes( reader, utf8->value.bytes, len )) != S_OK) + if (!utf8) { - heap_free( utf8 ); - return hr; + if (!(utf8 = alloc_utf8_text( NULL, len ))) return E_OUTOFMEMORY; + if (!len) utf8->value.bytes = (BYTE *)(utf8 + 1); /* quirk */ + if ((hr = read_bytes( reader, utf8->value.bytes, len )) != S_OK) + { + heap_free( utf8 ); + return hr; + } } attr->value = &utf8->text; @@ -1967,20 +2002,59 @@ static HRESULT read_text_text( struct reader *reader ) return S_OK; } -static HRESULT read_text_bin( struct reader *reader ) +static struct node *alloc_text_node( const unsigned char *data, ULONG len, unsigned char **ptr ) { - unsigned char type; - struct node *node, *parent; - WS_XML_TEXT_NODE *text; + struct node *node; WS_XML_UTF8_TEXT *utf8; + WS_XML_TEXT_NODE *text; + + if (!(node = alloc_node( WS_XML_NODE_TYPE_TEXT ))) return NULL; + text = (WS_XML_TEXT_NODE *)node; + if (!(utf8 = alloc_utf8_text( data, len ))) + { + heap_free( node ); + return NULL; + } + text->text = &utf8->text; + if (ptr) *ptr = utf8->value.bytes; + return node; +} + +static HRESULT read_text_bin( struct reader *reader ) +{ + static const unsigned char zero[] = {'0'}, one[] = {'1'}; + static const unsigned char false[] = {'f','a','l','s','e'}, true[] = {'t','r','u','e'}; + unsigned char type, *ptr; + struct node *node = NULL, *parent; ULONG len; HRESULT hr; if ((hr = read_byte( reader, &type )) != S_OK) return hr; - if (!is_text_type( type )) return WS_E_INVALID_FORMAT; + if (!is_text_type( type ) || !(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; switch (type) { + case RECORD_ZERO_TEXT: + case RECORD_ZERO_TEXT_WITH_ENDELEMENT: + if (!(node = alloc_text_node( zero, sizeof(zero), NULL ))) return E_OUTOFMEMORY; + break; + + case RECORD_ONE_TEXT: + case RECORD_ONE_TEXT_WITH_ENDELEMENT: + if (!(node = alloc_text_node( one, sizeof(one), NULL ))) return E_OUTOFMEMORY; + break; + + case RECORD_FALSE_TEXT: + case RECORD_FALSE_TEXT_WITH_ENDELEMENT: + if (!(node = alloc_text_node( false, sizeof(false), NULL ))) return E_OUTOFMEMORY; + break; + + case RECORD_TRUE_TEXT: + case RECORD_TRUE_TEXT_WITH_ENDELEMENT: + if (!(node = alloc_text_node( true, sizeof(true), NULL ))) return E_OUTOFMEMORY; + break; + + case RECORD_CHARS8_TEXT: case RECORD_CHARS8_TEXT_WITH_ENDELEMENT: { unsigned char len8; @@ -1988,27 +2062,36 @@ static HRESULT read_text_bin( struct reader *reader ) len = len8; break; } + + case RECORD_EMPTY_TEXT: + case RECORD_EMPTY_TEXT_WITH_ENDELEMENT: + len = 0; + break; + + case RECORD_DICTIONARY_TEXT: + case RECORD_DICTIONARY_TEXT_WITH_ENDELEMENT: + { + ULONG id; + if ((hr = read_int31( reader, &id )) != S_OK) return hr; + if (!reader->dict || (id >>= 1) >= reader->dict->stringCount) return WS_E_INVALID_FORMAT; + if (!(node = alloc_text_node( reader->dict->strings[id].bytes, reader->dict->strings[id].length, NULL ))) + return E_OUTOFMEMORY; + break; + } default: ERR( "unhandled record type %02x\n", type ); return WS_E_NOT_SUPPORTED; } - if (!(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; - - if (!(node = alloc_node( WS_XML_NODE_TYPE_TEXT ))) return E_OUTOFMEMORY; - text = (WS_XML_TEXT_NODE *)node; - if (!(utf8 = alloc_utf8_text( NULL, len ))) - { - heap_free( node ); - return E_OUTOFMEMORY; - } - if ((hr = read_bytes( reader, utf8->value.bytes, len )) != S_OK) + if (!node) { - heap_free( utf8 ); - heap_free( node ); - return hr; + if (!(node = alloc_text_node( NULL, len, &ptr ))) return E_OUTOFMEMORY; + if ((hr = read_bytes( reader, ptr, len )) != S_OK) + { + free_node( node ); + return hr; + } } - text->text = &utf8->text; read_insert_node( reader, parent, node ); reader->state = READER_STATE_TEXT;

1 0

Hans Leidekker : webservices: Implement WsGetCustomHeader.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 03a63781fa47d50a05e29c907d32817aba5e40df URL: http://source.winehq.org/git/wine.git/?a=commit;h=03a63781fa47d50a05e29c907… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 6 09:55:57 2017 +0200 webservices: Implement WsGetCustomHeader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 91 ++++++++++++++++++++++++++++++++++----- dlls/webservices/tests/msg.c | 68 +++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 149 insertions(+), 12 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 6d61aa0..74c6fd1 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -1081,23 +1081,16 @@ done: return hr; } -static HRESULT get_standard_header( struct msg *msg, WS_HEADER_TYPE type, WS_TYPE value_type, - WS_READ_OPTION option, WS_HEAP *heap, void *value, ULONG size ) +static HRESULT find_header( WS_XML_READER *reader, const WS_XML_STRING *localname, const WS_XML_STRING *ns ) { - const WS_XML_STRING *localname = get_header_name( type ); - const WS_XML_STRING *ns = get_addr_namespace( msg->version_addr ); - const WS_XML_ELEMENT_NODE *elem; const WS_XML_NODE *node; + const WS_XML_ELEMENT_NODE *elem; HRESULT hr; - if (!heap) heap = msg->heap; - if (!msg->reader && (hr = WsCreateReader( NULL, 0, &msg->reader, NULL )) != S_OK) return hr; - if ((hr = WsSetInputToBuffer( msg->reader, msg->buf, NULL, 0, NULL )) != S_OK) return hr; - for (;;) { - if ((hr = WsReadNode( msg->reader, NULL )) != S_OK) return hr; - if ((hr = WsGetReaderNode( msg->reader, &node, NULL )) != S_OK) return hr; + if ((hr = WsReadNode( reader, NULL )) != S_OK) return hr; + if ((hr = WsGetReaderNode( reader, &node, NULL )) != S_OK) return hr; if (node->nodeType == WS_XML_NODE_TYPE_EOF) return WS_E_INVALID_FORMAT; if (node->nodeType != WS_XML_NODE_TYPE_ELEMENT) continue; @@ -1106,6 +1099,21 @@ static HRESULT get_standard_header( struct msg *msg, WS_HEADER_TYPE type, WS_TYP WsXmlStringEquals( elem->ns, ns, NULL ) == S_OK) break; } + return S_OK; +} + +static HRESULT get_standard_header( struct msg *msg, WS_HEADER_TYPE type, WS_TYPE value_type, + WS_READ_OPTION option, WS_HEAP *heap, void *value, ULONG size ) +{ + const WS_XML_STRING *localname = get_header_name( type ); + const WS_XML_STRING *ns = get_addr_namespace( msg->version_addr ); + HRESULT hr; + + if (!heap) heap = msg->heap; + if (!msg->reader && (hr = WsCreateReader( NULL, 0, &msg->reader, NULL )) != S_OK) return hr; + if ((hr = WsSetInputToBuffer( msg->reader, msg->buf, NULL, 0, NULL )) != S_OK) return hr; + + if ((hr = find_header( msg->reader, localname, ns )) != S_OK) return hr; return read_header( msg->reader, localname, ns, value_type, NULL, option, heap, value, size ); } @@ -1463,6 +1471,67 @@ done: return hr; } +static HRESULT get_custom_header( struct msg *msg, const WS_ELEMENT_DESCRIPTION *desc, WS_READ_OPTION option, + WS_HEAP *heap, void *value, ULONG size ) +{ + HRESULT hr; + if (!heap) heap = msg->heap; + if (!msg->reader && (hr = WsCreateReader( NULL, 0, &msg->reader, NULL )) != S_OK) return hr; + if ((hr = WsSetInputToBuffer( msg->reader, msg->buf, NULL, 0, NULL )) != S_OK) return hr; + + if ((hr = find_header( msg->reader, desc->elementLocalName, desc->elementNs )) != S_OK) return hr; + return read_header( msg->reader, desc->elementLocalName, desc->elementNs, desc->type, desc->typeDescription, + option, heap, value, size ); +} + +/************************************************************************** + * WsGetCustomHeader [webservices.@] + */ +HRESULT WINAPI WsGetCustomHeader( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *desc, + WS_REPEATING_HEADER_OPTION repeat_option, ULONG index, WS_READ_OPTION option, + WS_HEAP *heap, void *value, ULONG size, ULONG *attrs, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + HRESULT hr; + + TRACE( "%p %p %08x %u %08x %p %p %u %p %p\n", handle, desc, repeat_option, index, option, heap, value, + size, attrs, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!msg || !desc || repeat_option < WS_REPEATING_HEADER || repeat_option > WS_SINGLETON_HEADER || + (repeat_option == WS_SINGLETON_HEADER && index)) return E_INVALIDARG; + + if (repeat_option == WS_REPEATING_HEADER) + { + FIXME( "repeating header not supported\n" ); + return E_NOTIMPL; + } + if (attrs) + { + FIXME( "attributes not supported\n" ); + return E_NOTIMPL; + } + + EnterCriticalSection( &msg->cs ); + + if (msg->magic != MSG_MAGIC) + { + LeaveCriticalSection( &msg->cs ); + return E_INVALIDARG; + } + + if (msg->state < WS_MESSAGE_STATE_INITIALIZED) + { + LeaveCriticalSection( &msg->cs ); + return WS_E_INVALID_OPERATION; + } + + hr = get_custom_header( msg, desc, option, heap, value, size ); + + LeaveCriticalSection( &msg->cs ); + return hr; +} + /************************************************************************** * WsRemoveCustomHeader [webservices.@] */ diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index 4b33b55..d26293b 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -1268,6 +1268,73 @@ static void test_WsGetHeader(void) WsFreeMessage( msg ); } +static void test_WsGetCustomHeader(void) +{ + static char expected[] = + "<Envelope><Header><Custom xmlns=\"ns\">value</Custom></Header><Body/></Envelope>"; + static WS_XML_STRING custom = {6, (BYTE *)"Custom"}, ns = {2, (BYTE *)"ns"}; + static WCHAR valueW[] = {'v','a','l','u','e',0}; + WS_ELEMENT_DESCRIPTION desc; + WS_STRUCT_DESCRIPTION s; + WS_FIELD_DESCRIPTION f, *fields[1]; + WS_MESSAGE *msg; + HRESULT hr; + struct header + { + const WCHAR *value; + } test; + + hr = WsGetCustomHeader( NULL, NULL, 0, 0, 0, NULL, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateMessage( WS_ENVELOPE_VERSION_NONE, WS_ADDRESSING_VERSION_TRANSPORT, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetCustomHeader( msg, NULL, 0, 0, 0, NULL, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_TEXT_FIELD_MAPPING; + f.type = WS_WSZ_TYPE; + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct header); + s.alignment = TYPE_ALIGNMENT(struct header); + s.fields = fields; + s.fieldCount = 1; + + desc.elementLocalName = &custom; + desc.elementNs = &ns; + desc.type = WS_STRUCT_TYPE; + desc.typeDescription = &s; + + test.value = valueW; + hr = WsAddCustomHeader( msg, &desc, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_header( msg, expected, -1, 0, 0, __LINE__ ); + + hr = WsGetCustomHeader( msg, &desc, 0, 0, 0, NULL, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsGetCustomHeader( msg, &desc, WS_SINGLETON_HEADER, 1, 0, NULL, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsGetCustomHeader( msg, &desc, WS_SINGLETON_HEADER, 0, WS_READ_REQUIRED_VALUE, NULL, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + memset( &test, 0, sizeof(test) ); + hr = WsGetCustomHeader( msg, &desc, WS_SINGLETON_HEADER, 0, WS_READ_REQUIRED_VALUE, NULL, &test, sizeof(test), + NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( test.value != NULL, "value not set\n" ); + ok( !memcmp( test.value, valueW, sizeof(valueW) ), "wrong value\n" ); + WsFreeMessage( msg ); +} + START_TEST(msg) { test_WsCreateMessage(); @@ -1288,4 +1355,5 @@ START_TEST(msg) test_WsReadBody(); test_WsResetMessage(); test_WsGetHeader(); + test_WsGetCustomHeader(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index b6f246c..3e77436 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -60,7 +60,7 @@ @ stdcall WsFreeServiceProxy(ptr) @ stdcall WsFreeWriter(ptr) @ stdcall WsGetChannelProperty(ptr long ptr long ptr) -@ stub WsGetCustomHeader +@ stdcall WsGetCustomHeader(ptr ptr long long long ptr ptr long ptr ptr) @ stdcall WsGetDictionary(long ptr ptr) @ stdcall WsGetErrorProperty(ptr long ptr long) @ stdcall WsGetErrorString(ptr long ptr)

1 0

Hans Leidekker : webservices: Implement WsGetHeader.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 64d029a8110c750523dc67e341d14dff655c0181 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64d029a8110c750523dc67e34… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 6 09:55:56 2017 +0200 webservices: Implement WsGetHeader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 63 ++++++++++++++++++++ dlls/webservices/reader.c | 22 +++++++ dlls/webservices/tests/msg.c | 105 +++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/webservices_private.h | 2 + 5 files changed, 193 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64d029a8110c750523dc6…

1 0

Hans Leidekker : webservices: Write correct envelope headers for WS_ENVELOPE_VERSION_NONE.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: cd83b80acca5d635de8877242a4c3262d0f67188 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd83b80acca5d635de8877242… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 6 09:55:55 2017 +0200 webservices: Write correct envelope headers for WS_ENVELOPE_VERSION_NONE. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 175 ++++++++++++++++++++----------------------- dlls/webservices/tests/msg.c | 23 ++++++ 2 files changed, 105 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd83b80acca5d635de887…

1 0

Hans Leidekker : include: Add missing Web Services declarations.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: be0f451e4e584551d388da2c3243719aac327c9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=be0f451e4e584551d388da2c3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 6 09:55:54 2017 +0200 include: Add missing Web Services declarations. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/webservices.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/webservices.h b/include/webservices.h index fc259c1..aa5fdf4 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -1041,6 +1041,11 @@ typedef enum { } WS_HEADER_TYPE; typedef enum { + WS_REPEATING_HEADER = 1, + WS_SINGLETON_HEADER = 2 +} WS_REPEATING_HEADER_OPTION; + +typedef enum { WS_DNS_ENDPOINT_IDENTITY_TYPE = 1, WS_UPN_ENDPOINT_IDENTITY_TYPE = 2, WS_SPN_ENDPOINT_IDENTITY_TYPE = 3, @@ -1584,11 +1589,17 @@ void WINAPI WsFreeReader(WS_XML_READER*); void WINAPI WsFreeServiceProxy(WS_SERVICE_PROXY*); void WINAPI WsFreeWriter(WS_XML_WRITER*); HRESULT WINAPI WsGetChannelProperty(WS_CHANNEL*, WS_CHANNEL_PROPERTY_ID, void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsGetCustomHeader(WS_MESSAGE*, const WS_ELEMENT_DESCRIPTION*, WS_REPEATING_HEADER_OPTION, + ULONG, WS_READ_OPTION, WS_HEAP*, void*, ULONG, ULONG*, WS_ERROR*); HRESULT WINAPI WsGetDictionary(WS_ENCODING, WS_XML_DICTIONARY**, WS_ERROR*); HRESULT WINAPI WsGetErrorProperty(WS_ERROR*, WS_ERROR_PROPERTY_ID, void*, ULONG); HRESULT WINAPI WsGetErrorString(WS_ERROR*, ULONG, WS_STRING*); +HRESULT WINAPI WsGetHeader(WS_MESSAGE*, WS_HEADER_TYPE, WS_TYPE, WS_READ_OPTION, WS_HEAP*, void*, + ULONG, WS_ERROR*); HRESULT WINAPI WsGetHeapProperty(WS_HEAP*, WS_HEAP_PROPERTY_ID, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsGetListenerProperty(WS_LISTENER*, WS_LISTENER_PROPERTY_ID, void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsGetMappedHeader(WS_MESSAGE*, const WS_XML_STRING*, WS_REPEATING_HEADER_OPTION, + ULONG, WS_TYPE, WS_READ_OPTION, WS_HEAP*, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsGetMessageProperty(WS_MESSAGE*, WS_MESSAGE_PROPERTY_ID, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsGetNamespaceFromPrefix(WS_XML_READER*, const WS_XML_STRING*, BOOL, const WS_XML_STRING**, WS_ERROR*);

1 0

Hans Leidekker : msiexec: Fix parsing of command lines where quoted strings and properties are not separated by whitespace.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: d73c38fe9ab18900eb7f1e1a30570a3139501466 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d73c38fe9ab18900eb7f1e1a3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 6 09:20:16 2017 +0200 msiexec: Fix parsing of command lines where quoted strings and properties are not separated by whitespace. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msiexec/msiexec.c | 169 +++++++++++++++++++++++---------------------- 1 file changed, 87 insertions(+), 82 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index b7999d1..8dcd216 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -216,14 +216,6 @@ static DWORD msi_atou(LPCWSTR str) return ret; } -static LPWSTR msi_strdup(LPCWSTR str) -{ - DWORD len = lstrlenW(str)+1; - LPWSTR ret = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); - lstrcpyW(ret, str); - return ret; -} - /* str1 is the same as str2, ignoring case */ static BOOL msi_strequal(LPCWSTR str1, LPCSTR str2) { @@ -413,90 +405,103 @@ static INT DoEmbedding( LPWSTR key ) enum chomp_state { - cs_whitespace, - cs_token, - cs_quote + CS_WHITESPACE, + CS_TOKEN, + CS_QUOTE }; -static int chomp( WCHAR *str ) +static int chomp( const WCHAR *in, WCHAR *out ) { - enum chomp_state state = cs_token; - WCHAR *p, *out; - int count = 1; - BOOL ignore; - - for( p = str, out = str; *p; p++ ) - { - ignore = TRUE; - switch( state ) - { - case cs_whitespace: - switch( *p ) - { - case ' ': - break; - case '"': - state = cs_quote; - count++; - break; - default: - count++; - ignore = FALSE; - state = cs_token; - } - break; - - case cs_token: - switch( *p ) - { - case '"': - state = cs_quote; - break; - case ' ': - state = cs_whitespace; - *out++ = 0; - break; - default: - ignore = FALSE; - } - break; - - case cs_quote: - switch( *p ) - { - case '"': - state = cs_token; - break; - default: - ignore = FALSE; - } - break; - } - if( !ignore ) - *out++ = *p; - } - - *out = 0; + enum chomp_state state = CS_TOKEN; + const WCHAR *p; + int count = 1; + BOOL ignore; - return count; + for (p = in; *p; p++) + { + ignore = TRUE; + switch (state) + { + case CS_WHITESPACE: + switch (*p) + { + case ' ': + break; + case '"': + state = CS_QUOTE; + count++; + break; + default: + count++; + ignore = FALSE; + state = CS_TOKEN; + } + break; + + case CS_TOKEN: + switch (*p) + { + case '"': + state = CS_QUOTE; + break; + case ' ': + state = CS_WHITESPACE; + if (out) *out++ = 0; + break; + default: + if (p > in && p[-1] == '"') + { + if (out) *out++ = 0; + count++; + } + ignore = FALSE; + } + break; + + case CS_QUOTE: + switch (*p) + { + case '"': + state = CS_TOKEN; + break; + default: + ignore = FALSE; + } + break; + } + if (!ignore && out) *out++ = *p; + } + if (out) *out = 0; + return count; } static void process_args( WCHAR *cmdline, int *pargc, WCHAR ***pargv ) { - WCHAR **argv, *p = msi_strdup(cmdline); - int i, n; + WCHAR **argv, *p; + int i, count; - n = chomp( p ); - argv = HeapAlloc(GetProcessHeap(), 0, sizeof (WCHAR*)*(n+1)); - for( i=0; i<n; i++ ) - { - argv[i] = p; - p += lstrlenW(p) + 1; - } - argv[i] = NULL; + *pargc = 0; + *pargv = NULL; + + count = chomp( cmdline, NULL ); + if (!(p = HeapAlloc( GetProcessHeap(), 0, (lstrlenW(cmdline) + count + 1) * sizeof(WCHAR) ))) + return; + + count = chomp( cmdline, p ); + if (!(argv = HeapAlloc( GetProcessHeap(), 0, (count + 1) * sizeof(WCHAR *) ))) + { + HeapFree( GetProcessHeap(), 0, p ); + return; + } + for (i = 0; i < count; i++) + { + argv[i] = p; + p += lstrlenW( p ) + 1; + } + argv[i] = NULL; - *pargc = n; - *pargv = argv; + *pargc = count; + *pargv = argv; } static BOOL process_args_from_reg( const WCHAR *ident, int *pargc, WCHAR ***pargv )

1 0

Alexandre Julliard : wineandroid: Update the contents when we receive a new surface from Java.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 20c627d58cb8f08aad0e086dd73760ecad987986 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20c627d58cb8f08aad0e086dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 6 08:33:09 2017 +0200 wineandroid: Update the contents when we receive a new surface from Java. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/android.h | 5 +++++ dlls/wineandroid.drv/device.c | 2 ++ dlls/wineandroid.drv/window.c | 30 ++++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 4 files changed, 38 insertions(+) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index bfdd697..3c2500e 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -71,6 +71,11 @@ extern unsigned int screen_height DECLSPEC_HIDDEN; extern RECT virtual_screen_rect DECLSPEC_HIDDEN; extern MONITORINFOEXW default_monitor DECLSPEC_HIDDEN; +enum android_window_messages +{ + WM_ANDROID_REFRESH = 0x80001000, +}; + extern void init_monitors( int width, int height ) DECLSPEC_HIDDEN; /* JNI entry points */ diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index fdcf24a..1af59be 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -433,6 +433,7 @@ static void CALLBACK register_native_window_callback( ULONG_PTR arg1, ULONG_PTR if (!data || data->parent == win) { if (win) pANativeWindow_release( win ); + if (data && win) PostMessageW( hwnd, WM_ANDROID_REFRESH, 0, 0 ); TRACE( "%p -> %p win %p (unchanged)\n", hwnd, data, win ); return; } @@ -446,6 +447,7 @@ static void CALLBACK register_native_window_callback( ULONG_PTR arg1, ULONG_PTR win->perform( win, NATIVE_WINDOW_SET_BUFFERS_FORMAT, data->buffer_format ); win->setSwapInterval( win, data->swap_interval ); unwrap_java_call(); + PostMessageW( hwnd, WM_ANDROID_REFRESH, 0, 0 ); } TRACE( "%p -> %p win %p\n", hwnd, data, win ); } diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 64333cb..203492a 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -977,6 +977,36 @@ void CDECL ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flag } +/********************************************************************** + * ANDROID_WindowMessage + */ +LRESULT CDECL ANDROID_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + struct android_win_data *data; + + switch (msg) + { + case WM_ANDROID_REFRESH: + if ((data = get_win_data( hwnd ))) + { + struct window_surface *surface = data->surface; + if (surface) + { + surface->funcs->lock( surface ); + *surface->funcs->get_bounds( surface ) = surface->rect; + surface->funcs->unlock( surface ); + if (is_argb_surface( surface )) surface->funcs->flush( surface ); + } + release_win_data( data ); + } + return 0; + default: + FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp ); + return 0; + } +} + + /*********************************************************************** * ANDROID_create_desktop */ diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 84ed7fd..7379458 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -9,6 +9,7 @@ @ cdecl CreateWindow(long) ANDROID_CreateWindow @ cdecl DestroyWindow(long) ANDROID_DestroyWindow @ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) ANDROID_MsgWaitForMultipleObjectsEx +@ cdecl WindowMessage(long long long long) ANDROID_WindowMessage @ cdecl WindowPosChanging(long long long ptr ptr ptr ptr) ANDROID_WindowPosChanging @ cdecl WindowPosChanged(long long long ptr ptr ptr ptr ptr) ANDROID_WindowPosChanged

1 0

Alexandre Julliard : wineandroid: Implement window surfaces.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 7f92cbf520aa97a0dad34a6e70a811b7db6a8901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f92cbf520aa97a0dad34a6e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 6 08:32:37 2017 +0200 wineandroid: Implement window surfaces. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 468 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 468 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f92cbf520aa97a0dad34…

1 0

Alexandre Julliard : wineandroid: Implement LOCK/UNLOCK perform() functions on top of the buffer management calls.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 1e46722c675f73e64009726ecdf857644416ba60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e46722c675f73e64009726ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 6 08:31:38 2017 +0200 wineandroid: Implement LOCK/UNLOCK perform() functions on top of the buffer management calls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/device.c | 51 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 9212562..fdcf24a 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -1210,7 +1210,58 @@ static int perform( ANativeWindow *window, int operation, ... ) break; } case NATIVE_WINDOW_LOCK: + { + struct ANativeWindowBuffer *buffer; + struct ANativeWindow_Buffer *buffer_ret = va_arg( args, ANativeWindow_Buffer * ); + ARect *bounds = va_arg( args, ARect * ); + int ret = window->dequeueBuffer_DEPRECATED( window, &buffer ); + if (!ret) + { + if (gralloc_module) + { + if ((ret = gralloc_module->lock( gralloc_module, buffer->handle, + GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_SW_WRITE_OFTEN, + 0, 0, buffer->width, buffer->height, &buffer_ret->bits ))) + { + WARN( "gralloc->lock %p failed %d %s\n", win->hwnd, ret, strerror(-ret) ); + window->cancelBuffer( window, buffer, -1 ); + } + } + else + buffer_ret->bits = ((struct native_buffer_wrapper *)buffer)->bits; + } + if (!ret) + { + buffer_ret->width = buffer->width; + buffer_ret->height = buffer->height; + buffer_ret->stride = buffer->stride; + buffer_ret->format = buffer->format; + win->locked_buffer = buffer; + if (bounds) + { + bounds->left = 0; + bounds->top = 0; + bounds->right = buffer->width; + bounds->bottom = buffer->height; + } + } + va_end( args ); + TRACE( "hwnd %p %s bits %p ret %d %s\n", win->hwnd, names[operation], buffer_ret->bits, ret, strerror(-ret) ); + return ret; + } case NATIVE_WINDOW_UNLOCK_AND_POST: + { + int ret = -EINVAL; + if (win->locked_buffer) + { + if (gralloc_module) gralloc_module->unlock( gralloc_module, win->locked_buffer->handle ); + ret = window->queueBuffer( window, win->locked_buffer, -1 ); + win->locked_buffer = NULL; + } + va_end( args ); + TRACE( "hwnd %p %s ret %d\n", win->hwnd, names[operation], ret ); + return ret; + } case NATIVE_WINDOW_CONNECT: case NATIVE_WINDOW_DISCONNECT: TRACE( "hwnd %p %s\n", win->hwnd, names[operation] );

1 0

Alexandre Julliard : wineandroid: Forward native window buffer management calls to the desktop process.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: f856e102f283ff6f55d338a0b69620b2c5b681b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f856e102f283ff6f55d338a0b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 6 08:31:29 2017 +0200 wineandroid: Forward native window buffer management calls to the desktop process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/device.c | 443 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 437 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f856e102f283ff6f55d33…

1 0

Alexandre Julliard : wineandroid: Load the gralloc module in all processes.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 6396f9f5229466230747e03b64ab711176e17d77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6396f9f5229466230747e03b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 6 08:30:23 2017 +0200 wineandroid: Load the gralloc module in all processes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/android.h | 2 ++ dlls/wineandroid.drv/init.c | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index 3d9ac5a..bfdd697 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -107,4 +107,6 @@ int send_event( const union event_data *data ); extern JavaVM *wine_get_java_vm(void); extern jobject wine_get_java_object(void); +extern struct gralloc_module_t *gralloc_module; + #endif /* __WINE_ANDROID_H */ diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index ecf32ad..45117bc 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -402,6 +402,31 @@ static const JNINativeMethod methods[] = DECL_FUNCPTR( __android_log_print ); DECL_FUNCPTR( ANativeWindow_fromSurface ); DECL_FUNCPTR( ANativeWindow_release ); +DECL_FUNCPTR( hw_get_module ); + +struct gralloc_module_t *gralloc_module = NULL; + +static void load_hardware_libs(void) +{ + const struct hw_module_t *module; + void *libhardware; + char error[256]; + + if ((libhardware = wine_dlopen( "libhardware.so", RTLD_GLOBAL, error, sizeof(error) ))) + { + LOAD_FUNCPTR( libhardware, hw_get_module ); + } + else + { + ERR( "failed to load libhardware: %s\n", error ); + return; + } + + if (phw_get_module( GRALLOC_HARDWARE_MODULE_ID, &module ) == 0) + gralloc_module = (struct gralloc_module_t *)module; + else + ERR( "failed to load gralloc module\n" ); +} static void load_android_libs(void) { @@ -433,6 +458,8 @@ static BOOL process_attach(void) JNIEnv *jni_env; JavaVM *java_vm; + load_hardware_libs(); + if ((java_vm = wine_get_java_vm())) /* running under Java */ { #ifdef __i386__

1 0

Nikolay Sivov : inetcomm/tests: Return interface pointer for test stream.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: aca1636f2c837f7146f932c4da50f02e79e1b913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aca1636f2c837f7146f932c4d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 6 08:47:23 2017 +0300 inetcomm/tests: Return interface pointer for test stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 956a5b7..13b7aba 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -445,14 +445,14 @@ static const IStreamVtbl StreamVtbl = { Stream_Clone }; -static TestStream *create_test_stream(void) +static IStream *create_test_stream(void) { TestStream *stream; stream = HeapAlloc(GetProcessHeap(), 0, sizeof(*stream)); stream->IStream_iface.lpVtbl = &StreamVtbl; stream->ref = 1; stream->pos = 0; - return stream; + return &stream->IStream_iface; } #define test_stream_read(a,b,c,d) _test_stream_read(__LINE__,a,b,c,d) @@ -474,8 +474,7 @@ static void _test_stream_read(unsigned line, IStream *stream, HRESULT exhres, co static void test_SetData(void) { - IStream *stream, *stream2; - TestStream *test_stream; + IStream *stream, *stream2, *test_stream; IMimeBody *body; HRESULT hr; @@ -492,7 +491,7 @@ static void test_SetData(void) IStream_Release(stream); test_stream = create_test_stream(); - hr = IMimeBody_SetData(body, IET_BINARY, "text", "plain", &IID_IStream, &test_stream->IStream_iface); + hr = IMimeBody_SetData(body, IET_BINARY, "text", "plain", &IID_IStream, test_stream); ok(hr == S_OK, "ret %08x\n", hr); hr = IMimeBody_IsContentType(body, "text", "plain"); @@ -507,7 +506,7 @@ static void test_SetData(void) CHECK_CALLED(Stream_Stat); CHECK_CALLED(Stream_Seek_END); ok(hr == S_OK, "GetData failed %08x\n", hr); - ok(stream != &test_stream->IStream_iface, "unexpected stream\n"); + ok(stream != test_stream, "unexpected stream\n"); SET_EXPECT(Stream_Seek); SET_EXPECT(Stream_Read); @@ -538,7 +537,7 @@ static void test_SetData(void) IStream_Release(stream); IStream_Release(stream2); - IStream_Release(&test_stream->IStream_iface); + IStream_Release(test_stream); stream = create_stream_from_string(" \t\r\n|}~YWJj ZGV|}~mZw== \t"); /* "abcdefg" in base64 obscured by invalid chars */ hr = IMimeBody_SetData(body, IET_BASE64, "text", "plain", &IID_IStream, stream);

1 0

Nikolay Sivov : inetcomm: Implemented IMimeBody::GetClassID().
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: fe6367aed7dcd1e0122ef2f1a9ec7e83a9db4262 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe6367aed7dcd1e0122ef2f1a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 6 08:47:25 2017 +0300 inetcomm: Implemented IMimeBody::GetClassID(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 11 ++++++++--- dlls/inetcomm/tests/mimeole.c | 8 ++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index e27c5c6..f0e186c 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -971,10 +971,15 @@ static HRESULT WINAPI MimeBody_GetClassID( CLSID* pClassID) { MimeBody *This = impl_from_IMimeBody(iface); - FIXME("(%p)->(%p) stub\n", This, pClassID); - return E_NOTIMPL; -} + TRACE("(%p)->(%p)\n", This, pClassID); + + if(!pClassID) + return E_INVALIDARG; + + *pClassID = IID_IMimeBody; + return S_OK; +} static HRESULT WINAPI MimeBody_IsDirty( IMimeBody* iface) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 13b7aba..4915f99 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -197,10 +197,18 @@ static void test_CreateBody(void) MIMEPARAMINFO *param_info; IMimeAllocator *alloc; BODYOFFSETS offsets; + CLSID clsid; hr = CoCreateInstance(&CLSID_IMimeBody, NULL, CLSCTX_INPROC_SERVER, &IID_IMimeBody, (void**)&body); ok(hr == S_OK, "ret %08x\n", hr); + hr = IMimeBody_GetClassID(body, NULL); + ok(hr == E_INVALIDARG, "ret %08x\n", hr); + + hr = IMimeBody_GetClassID(body, &clsid); + ok(hr == S_OK, "ret %08x\n", hr); + ok(IsEqualGUID(&clsid, &IID_IMimeBody), "got %s\n", wine_dbgstr_guid(&clsid)); + hr = IMimeBody_GetHandle(body, &handle); ok(hr == MIME_E_NO_DATA, "ret %08x\n", hr); ok(handle == NULL, "handle %p\n", handle);

1 0

Nikolay Sivov : inetcomm: Release previously set data (Valgrind).
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 5557081956bb698cf92bdfbabb1b9b44de61f617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5557081956bb698cf92bdfbab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 6 08:47:24 2017 +0300 inetcomm: Release previously set data (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 0ed7cef..e27c5c6 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1755,7 +1755,7 @@ static HRESULT WINAPI MimeBody_SetData( } if(This->data) - FIXME("release old data\n"); + release_data(&This->data_iid, This->data); This->data_iid = *riid; This->data = pvObject;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 1561aa35279309a083a3e725198d9d73500e1572 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1561aa35279309a083a3e7251… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Jun 6 08:52:03 2017 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index d61f36d..30c06c4 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-06-03 07:42+0300\n" +"PO-Revision-Date: 2017-06-06 08:51+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -11771,10 +11771,8 @@ msgid "Expand" msgstr "Išskleisti" #: regedit.rc:134 regedit.rc:232 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." -msgstr "Modifikuoti dvejetainius duomenis..." +msgstr "Modifikuoti &dvejetainius duomenis..." #: regedit.rc:266 msgid "Export registry"

1 0

Piotr Caban : msvcrt: Use temp directory when creating file in tmpfile.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: e4c9a2ec81b8029876d588e09587db40ab65ee69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4c9a2ec81b8029876d588e09… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 5 18:15:30 2017 +0200 msvcrt: Use temp directory when creating file in tmpfile. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c31ce77..7c8a0b5 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4970,7 +4970,7 @@ MSVCRT_wchar_t * CDECL MSVCRT__wtmpnam(MSVCRT_wchar_t *s) */ MSVCRT_FILE* CDECL MSVCRT_tmpfile(void) { - char *filename = MSVCRT_tmpnam(NULL); + char *filename = MSVCRT__tempnam(",", "t"); int fd; MSVCRT_FILE* file = NULL;

1 0

Huw Davies : user32: End the tracking on a system menu double-click.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 022e4b824396a869512df39e93247b8a8847e512 URL: http://source.winehq.org/git/wine.git/?a=commit;h=022e4b824396a869512df39e9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 5 13:05:15 2017 +0100 user32: End the tracking on a system menu double-click. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 00abcc9..5866383 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -2575,7 +2575,7 @@ static void MENU_SwitchTracking( MTRACKER* pmt, HMENU hPtMenu, UINT id, UINT wFl * * Return TRUE if we can go on with menu tracking. */ -static BOOL MENU_ButtonDown( MTRACKER* pmt, HMENU hPtMenu, UINT wFlags ) +static BOOL MENU_ButtonDown( MTRACKER* pmt, UINT message, HMENU hPtMenu, UINT wFlags ) { TRACE("%p hPtMenu=%p\n", pmt, hPtMenu); @@ -2586,7 +2586,10 @@ static BOOL MENU_ButtonDown( MTRACKER* pmt, HMENU hPtMenu, UINT wFlags ) enum hittest ht = ht_item; if( IS_SYSTEM_MENU(ptmenu) ) + { + if (message == WM_LBUTTONDBLCLK) return FALSE; pos = 0; + } else ht = MENU_FindItemByCoords( ptmenu, pmt->pt, &pos ); @@ -3045,7 +3048,7 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, if (wFlags & TPM_BUTTONDOWN) { /* Get the result in order to start the tracking or not */ - fRemove = MENU_ButtonDown( &mt, hmenu, wFlags ); + fRemove = MENU_ButtonDown( &mt, WM_LBUTTONDOWN, hmenu, wFlags ); fEndMenu = !fRemove; } @@ -3131,7 +3134,7 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, case WM_LBUTTONDOWN: /* If the message belongs to the menu, removes it from the queue */ /* Else, end menu tracking */ - fRemove = MENU_ButtonDown( &mt, hmenu, wFlags ); + fRemove = MENU_ButtonDown( &mt, msg.message, hmenu, wFlags ); fEndMenu = !fRemove; break;

1 0

Huw Davies : user32: Use the original message' s wparam during the double-click comparison.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 8d10b5ceccf074390a8f267a774b7ed615dc0284 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d10b5ceccf074390a8f267a7… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 5 13:05:14 2017 +0100 user32: Use the original message's wparam during the double-click comparison. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 5 +++- dlls/user32/tests/win.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index d13a9b0..61a1543 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2490,6 +2490,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H GUITHREADINFO info; MOUSEHOOKSTRUCTEX hook; BOOL eatMsg; + WPARAM wparam; /* find the window to dispatch this mouse message to */ @@ -2523,13 +2524,14 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H pt = msg->pt; message = msg->message; + wparam = msg->wParam; /* Note: windows has no concept of a non-client wheel message */ if (message != WM_MOUSEWHEEL) { if (hittest != HTCLIENT) { message += WM_NCMOUSEMOVE - WM_MOUSEMOVE; - msg->wParam = hittest; + wparam = hittest; } else { @@ -2581,6 +2583,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H { if (message < first || message > last) return FALSE; } + msg->wParam = wparam; /* message is accepted now (but may still get dropped) */ diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 460ae93..2399228 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3759,7 +3759,7 @@ static void test_mouse_input(HWND hwnd) RECT rc; POINT pt; int x, y; - HWND popup; + HWND popup, child = NULL; MSG msg; BOOL ret; LRESULT res; @@ -3948,10 +3948,72 @@ static void test_mouse_input(HWND hwnd) TEST_MOUSEACTIVATE(HTCLOSE,MA_ACTIVATE); TEST_MOUSEACTIVATE(HTHELP,MA_ACTIVATE); + ShowWindow(popup, SW_HIDE); + + /* Test sending double click to the non-client area, while capturing the window after + the first click has been processed. Use a child window to ensure that Wine's graphics + driver isn't managing the non-client area. */ + + GetWindowRect(hwnd, &rc); + child = CreateWindowExA(0, "MainWindowClass", NULL, WS_CHILD | WS_CAPTION | WS_SYSMENU | WS_VISIBLE, + rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, + hwnd, 0, 0, NULL); + GetWindowRect(child, &rc); + + UpdateWindow(child); + SetCursorPos( rc.left + 5, rc.top + 5 ); + flush_events( TRUE ); + + mouse_event(MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0); + mouse_event(MOUSEEVENTF_LEFTUP, 0, 0, 0, 0); + mouse_event(MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0); + mouse_event(MOUSEEVENTF_LEFTUP, 0, 0, 0, 0); + + ret = wait_for_message( &msg ); + ok(ret, "no message available\n"); +todo_wine + ok(msg.hwnd == child && msg.message == WM_NCMOUSEMOVE, "hwnd %p/%p message %04x\n", + msg.hwnd, child, msg.message); + + if (msg.message == WM_NCMOUSEMOVE) + ret = wait_for_message( &msg ); + ok(ret, "no message available\n"); + ok(msg.hwnd == child && msg.message == WM_NCLBUTTONDOWN, "hwnd %p/%p message %04x\n", + msg.hwnd, child, msg.message); + ok(msg.wParam == HTSYSMENU, "wparam %ld\n", msg.wParam); + + ret = wait_for_message( &msg ); + ok(ret, "no message available\n"); + ok(msg.hwnd == child && msg.message == WM_NCLBUTTONUP, "hwnd %p/%p message %04x\n", + msg.hwnd, child, msg.message); + + SetCapture( child ); + + ret = wait_for_message( &msg ); + ok(ret, "no message available\n"); + ok(msg.hwnd == child && msg.message == WM_LBUTTONDBLCLK, "hwnd %p/%p message %04x\n", + msg.hwnd, child, msg.message); + ok(msg.wParam == MK_LBUTTON, "wparam %ld\n", msg.wParam); + + ret = wait_for_message( &msg ); + ok(ret, "no message available\n"); +todo_wine + ok(msg.hwnd == child && (msg.message == WM_NCMOUSELEAVE || broken(msg.message == WM_LBUTTONUP)), + "hwnd %p/%p message %04x\n", msg.hwnd, child, msg.message); + + if (msg.message == WM_NCMOUSELEAVE) + ret = wait_for_message( &msg ); + ok(ret, "no message available\n"); + ok(msg.hwnd == child && msg.message == WM_LBUTTONUP, "hwnd %p/%p message %04x\n", + msg.hwnd, child, msg.message); + + ret = peek_message(&msg); + ok(!ret, "message %04x available\n", msg.message); + done: - /* Clear any messages left behind by WM_MOUSEACTIVATE tests */ flush_events( TRUE ); + if (child) DestroyWindow(child); DestroyWindow(popup); }

1 0

Huw Davies : user32: A button-up in the menu-bar, but not on an item, should stop the tracking.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: e60bc27dd2b15c9dbd09712219fc7259e6c2e595 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e60bc27dd2b15c9dbd0971221… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 5 13:05:13 2017 +0100 user32: A button-up in the menu-bar, but not on an item, should stop the tracking. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 95e4ef6..00abcc9 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -2647,7 +2647,10 @@ static INT MENU_ButtonUp( MTRACKER* pmt, HMENU hPtMenu, UINT wFlags) return 0; } if( GetMenu(ptmenu->hWnd) == hPtMenu || IS_SYSTEM_MENU(ptmenu) ) + { + if (pos == NO_SELECTED_ITEM) return 0; pmt->trackFlags |= TF_RCVD_BTN_UP; + } } return -1; }

1 0

Huw Davies : user32: A second button-up on the system menu should end the tracking.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 580915040edfdd6308aad7b98ccfa675a912e0ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=580915040edfdd6308aad7b98… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 5 13:05:12 2017 +0100 user32: A second button-up on the system menu should end the tracking. This isn't quite how Windows behaves. Windows doesn't follow the tracking between the menu-bar and the system menu, while Wine does. Since the system menu of top-level windows is likely to be hidden by Wine's graphics driver, this seems like useful behaviour to keep and thus this patch makes things behave sensibly. Even without Wine's special tracking behaviour, this patch is an improvement. The tracking state has no reason to be stored in the menu structure. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index d198ddf..95e4ef6 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -94,7 +94,6 @@ typedef struct { MENUITEM *items; /* Array of menu items */ UINT FocusedItem; /* Currently focused item */ HWND hwndOwner; /* window receiving the messages for ownerdraw */ - BOOL bTimeToHide; /* Request hiding when receiving a second click in the top-level menu item */ BOOL bScrolling; /* Scroll arrows are active */ UINT nScrollPos; /* Current scroll position */ UINT nTotalHeight; /* Total height of menu items inside menu */ @@ -114,6 +113,7 @@ typedef struct { #define TF_ENDMENU 0x10000 #define TF_SUSPENDPOPUP 0x20000 #define TF_SKIPREMOVE 0x40000 +#define TF_RCVD_BTN_UP 0x80000 typedef struct { @@ -2643,11 +2643,11 @@ static INT MENU_ButtonUp( MTRACKER* pmt, HMENU hPtMenu, UINT wFlags) /* If we are dealing with the menu bar */ /* and this is a click on an already "popped" item: */ /* Stop the menu tracking and close the opened submenus */ - if((pmt->hTopMenu == hPtMenu) && ptmenu->bTimeToHide) + if(((pmt->hTopMenu == hPtMenu) || IS_SYSTEM_MENU(ptmenu)) && (pmt->trackFlags & TF_RCVD_BTN_UP)) return 0; } - if( GetMenu(ptmenu->hWnd) == hPtMenu ) - ptmenu->bTimeToHide = TRUE; + if( GetMenu(ptmenu->hWnd) == hPtMenu || IS_SYSTEM_MENU(ptmenu) ) + pmt->trackFlags |= TF_RCVD_BTN_UP; } return -1; } @@ -3303,9 +3303,6 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, MENU_SelectItem( mt.hOwnerWnd, mt.hTopMenu, NO_SELECTED_ITEM, FALSE, 0 ); SendMessageW( mt.hOwnerWnd, WM_MENUSELECT, MAKEWPARAM(0,0xffff), 0 ); } - - /* Reset the variable for hiding menu */ - if( menu ) menu->bTimeToHide = FALSE; } SetLastError( ERROR_SUCCESS ); @@ -4073,7 +4070,6 @@ HMENU WINAPI CreatePopupMenu(void) if (!(hmenu = CreateMenu())) return 0; menu = MENU_GetMenu( hmenu ); menu->wFlags |= MF_POPUP; - menu->bTimeToHide = FALSE; return hmenu; } @@ -4122,7 +4118,6 @@ HMENU WINAPI CreateMenu(void) if (!(menu = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*menu) ))) return 0; menu->FocusedItem = NO_SELECTED_ITEM; - menu->bTimeToHide = FALSE; if (!(hMenu = alloc_user_handle( &menu->obj, USER_MENU ))) HeapFree( GetProcessHeap(), 0, menu );

1 0

Huw Davies : user32: Allow button-down events on the system menu to continue tracking.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 77026e244cb70cc3131be45c4c2fb9931b3d3a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=77026e244cb70cc3131be45c4… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 5 13:05:11 2017 +0100 user32: Allow button-down events on the system menu to continue tracking. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index a65f01e..d198ddf 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -2583,7 +2583,7 @@ static BOOL MENU_ButtonDown( MTRACKER* pmt, HMENU hPtMenu, UINT wFlags ) { UINT pos; POPUPMENU *ptmenu = MENU_GetMenu( hPtMenu ); - enum hittest ht = ht_nowhere; + enum hittest ht = ht_item; if( IS_SYSTEM_MENU(ptmenu) ) pos = 0;

1 0

Huw Davies : riched20: The background colour is set using \highlight.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 17b7cde00ee4fb8750fd21500b2ede69af167fe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17b7cde00ee4fb8750fd21500… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 5 14:18:40 2017 +0100 riched20: The background colour is set using \highlight. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/reader.c | 2 +- dlls/riched20/tests/editor.c | 20 ++++++++++++++++++-- dlls/riched20/writer.c | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index a05b7fc..0310109 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -1377,7 +1377,7 @@ static RTFKey rtfKey[] = { rtfCharAttr, rtfSuperScrShrink, "super", 0 }, { rtfCharAttr, rtfInvisible, "v", 0 }, { rtfCharAttr, rtfForeColor, "cf", 0 }, - { rtfCharAttr, rtfBackColor, "cb", 0 }, + { rtfCharAttr, rtfBackColor, "highlight", 0 }, { rtfCharAttr, rtfRTLChar, "rtlch", 0 }, { rtfCharAttr, rtfLTRChar, "ltrch", 0 }, { rtfCharAttr, rtfCharStyleNum, "cs", 0 }, diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index ef53c56..20189c6 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8537,19 +8537,23 @@ static void test_WM_GETTEXTLENGTH(void) DestroyWindow(hwndRichEdit); } -static void test_rtf_specials(void) +static void test_rtf(void) { const char *specials = "{\\rtf1\\emspace\\enspace\\bullet\\lquote" "\\rquote\\ldblquote\\rdblquote\\ltrmark\\rtlmark\\zwj\\zwnj}"; const WCHAR expect_specials[] = {' ',' ',0x2022,0x2018,0x2019,0x201c, 0x201d,0x200e,0x200f,0x200d,0x200c}; const char *pard = "{\\rtf1 ABC\\rtlpar\\par DEF\\par HIJ\\pard\\par}"; + const char *highlight = "{\\rtf1{\\colortbl;\\red0\\green0\\blue0;\\red128\\green128\\blue128;\\red192\\green192\\blue192;}\\cf2\\highlight3 foo\\par}"; + HWND edit = new_richeditW( NULL ); EDITSTREAM es; WCHAR buf[80]; LRESULT result; PARAFORMAT2 fmt; + CHARFORMAT2W cf; + /* Test rtf specials */ es.dwCookie = (DWORD_PTR)&specials; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback; @@ -8580,6 +8584,18 @@ static void test_rtf_specials(void) ok( fmt.dwMask & PFM_RTLPARA, "rtl para mask not set\n" ); ok( !(fmt.wEffects & PFE_RTLPARA), "rtl para set\n" ); + /* Test \highlight */ + es.dwCookie = (DWORD_PTR)&highlight; + result = SendMessageA( edit, EM_STREAMIN, SF_RTF, (LPARAM)&es ); + ok( result == 3, "got %ld\n", result ); + SendMessageW( edit, EM_SETSEL, 1, 1 ); + memset( &cf, 0, sizeof(cf) ); + cf.cbSize = sizeof(cf); + SendMessageW( edit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf ); + ok( (cf.dwEffects & (CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR)) == 0, "got %08x\n", cf.dwEffects ); + ok( cf.crTextColor == RGB(128,128,128), "got %08x\n", cf.crTextColor ); + ok( cf.crBackColor == RGB(192,192,192), "got %08x\n", cf.crBackColor ); + DestroyWindow( edit ); } @@ -8769,7 +8785,7 @@ START_TEST( editor ) test_EM_SETREADONLY(); test_EM_SETFONTSIZE(); test_alignment_style(); - test_rtf_specials(); + test_rtf(); test_background(); test_eop_char_fmt(); test_para_numbering(); diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 1cd293c..5494afe 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -775,7 +775,7 @@ ME_StreamOutRTFCharProps(ME_OutStream *pStream, CHARFORMAT2W *fmt) { if (fmt->dwEffects & CFE_AUTOBACKCOLOR) i = 0; else find_color_in_colortbl( pStream, fmt->crBackColor, &i ); - sprintf(props + strlen(props), "\\cb%u", i); + sprintf(props + strlen(props), "\\highlight%u", i); } if ((old_fmt->dwEffects ^ fmt->dwEffects) & CFE_AUTOCOLOR || (!(fmt->dwEffects & CFE_AUTOCOLOR) && old_fmt->crTextColor != fmt->crTextColor))

1 0

Sebastian Lackner : ntdll: Do not cast unaligned pointer to M128A in set_context_reg.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: d2ec61105d47543ae5bddf393d384b5165795ab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2ec61105d47543ae5bddf393… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jun 5 14:50:48 2017 +0200 ntdll: Do not cast unaligned pointer to M128A in set_context_reg. GCC 7.x will assume 'val' is properly aligned when using a cast. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 48 +++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 61bb2dd..86034c0 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1154,30 +1154,30 @@ static void set_context_reg( CONTEXT *context, ULONG_PTR dw_reg, void *val ) case 14: context->R14 = *(ULONG64 *)val; break; case 15: context->R15 = *(ULONG64 *)val; break; case 16: context->Rip = *(ULONG64 *)val; break; - case 17: context->u.s.Xmm0 = *(M128A *)val; break; - case 18: context->u.s.Xmm1 = *(M128A *)val; break; - case 19: context->u.s.Xmm2 = *(M128A *)val; break; - case 20: context->u.s.Xmm3 = *(M128A *)val; break; - case 21: context->u.s.Xmm4 = *(M128A *)val; break; - case 22: context->u.s.Xmm5 = *(M128A *)val; break; - case 23: context->u.s.Xmm6 = *(M128A *)val; break; - case 24: context->u.s.Xmm7 = *(M128A *)val; break; - case 25: context->u.s.Xmm8 = *(M128A *)val; break; - case 26: context->u.s.Xmm9 = *(M128A *)val; break; - case 27: context->u.s.Xmm10 = *(M128A *)val; break; - case 28: context->u.s.Xmm11 = *(M128A *)val; break; - case 29: context->u.s.Xmm12 = *(M128A *)val; break; - case 30: context->u.s.Xmm13 = *(M128A *)val; break; - case 31: context->u.s.Xmm14 = *(M128A *)val; break; - case 32: context->u.s.Xmm15 = *(M128A *)val; break; - case 33: context->u.s.Legacy[0] = *(M128A *)val; break; - case 34: context->u.s.Legacy[1] = *(M128A *)val; break; - case 35: context->u.s.Legacy[2] = *(M128A *)val; break; - case 36: context->u.s.Legacy[3] = *(M128A *)val; break; - case 37: context->u.s.Legacy[4] = *(M128A *)val; break; - case 38: context->u.s.Legacy[5] = *(M128A *)val; break; - case 39: context->u.s.Legacy[6] = *(M128A *)val; break; - case 40: context->u.s.Legacy[7] = *(M128A *)val; break; + case 17: memcpy( &context->u.s.Xmm0, val, sizeof(M128A) ); break; + case 18: memcpy( &context->u.s.Xmm1, val, sizeof(M128A) ); break; + case 19: memcpy( &context->u.s.Xmm2, val, sizeof(M128A) ); break; + case 20: memcpy( &context->u.s.Xmm3, val, sizeof(M128A) ); break; + case 21: memcpy( &context->u.s.Xmm4, val, sizeof(M128A) ); break; + case 22: memcpy( &context->u.s.Xmm5, val, sizeof(M128A) ); break; + case 23: memcpy( &context->u.s.Xmm6, val, sizeof(M128A) ); break; + case 24: memcpy( &context->u.s.Xmm7, val, sizeof(M128A) ); break; + case 25: memcpy( &context->u.s.Xmm8, val, sizeof(M128A) ); break; + case 26: memcpy( &context->u.s.Xmm9, val, sizeof(M128A) ); break; + case 27: memcpy( &context->u.s.Xmm10, val, sizeof(M128A) ); break; + case 28: memcpy( &context->u.s.Xmm11, val, sizeof(M128A) ); break; + case 29: memcpy( &context->u.s.Xmm12, val, sizeof(M128A) ); break; + case 30: memcpy( &context->u.s.Xmm13, val, sizeof(M128A) ); break; + case 31: memcpy( &context->u.s.Xmm14, val, sizeof(M128A) ); break; + case 32: memcpy( &context->u.s.Xmm15, val, sizeof(M128A) ); break; + case 33: memcpy( &context->u.s.Legacy[0], val, sizeof(M128A) ); break; + case 34: memcpy( &context->u.s.Legacy[1], val, sizeof(M128A) ); break; + case 35: memcpy( &context->u.s.Legacy[2], val, sizeof(M128A) ); break; + case 36: memcpy( &context->u.s.Legacy[3], val, sizeof(M128A) ); break; + case 37: memcpy( &context->u.s.Legacy[4], val, sizeof(M128A) ); break; + case 38: memcpy( &context->u.s.Legacy[5], val, sizeof(M128A) ); break; + case 39: memcpy( &context->u.s.Legacy[6], val, sizeof(M128A) ); break; + case 40: memcpy( &context->u.s.Legacy[7], val, sizeof(M128A) ); break; } }

1 0

Francois Gouget : d3dx9_36: Add a trailing '\n' to a FIXME() message.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: aacf28d701b08d8dae75af0d5fbcd6e791038bfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=aacf28d701b08d8dae75af0d5… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jun 4 11:41:23 2017 +0200 d3dx9_36: Add a trailing '\n' to a FIXME() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index a6320f9..522d484 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -868,7 +868,7 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u } if (reg_idx >= pres->regs.table_sizes[table]) { - FIXME("Out of bounds register index, i %u, j %u, table %u, reg_idx %u.", + FIXME("Out of bounds register index, i %u, j %u, table %u, reg_idx %u.\n", i, j, table, reg_idx); return D3DXERR_INVALIDDATA; }

1 0

Paul Gofman : d3dx9: Remove redundant FIXME in set_constants().
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 68e6691a5b1b6b08f7fc8e92ad2ee17e7147e847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68e6691a5b1b6b08f7fc8e92a… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Jun 2 12:58:12 2017 +0300 d3dx9: Remove redundant FIXME in set_constants(). 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, 5 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index cc103f5..a6320f9 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1072,12 +1072,7 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const offset = i * info.major_stride + j; if (get_reg_offset(table, offset) >= const_set->register_count) - { - if (table != PRES_REGTAB_OBCONST) - FIXME("Output offset exceeds regiser count, name %s, component %u.\n", - debugstr_a(param->name), i); break; - } offset += start_offset; if (info.transpose) param_offset = i + j * info.major;

1 0

Paul Gofman : d3dx9/tests: Add tests for updating boolean matrices on CommitChanges.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 8bc783ef3011de1404f5fcc418cdcd54deae8dd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bc783ef3011de1404f5fcc41… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Jun 2 12:58:11 2017 +0300 d3dx9/tests: Add tests for updating boolean matrices on CommitChanges. 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/tests/effect.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 966f1bd..6ec07a2 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -5128,6 +5128,17 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) {"arr2", {0x60000000, 0x00000000}}, {"ts3", {0x00000fc0, 0x00000000}}, }; + static const struct + { + const char *param_name; + const unsigned int const_updated_mask[(ARRAY_SIZE(test_effect_preshader_bconsts) + + TEST_EFFECT_BITMASK_BLOCK_SIZE - 1) / TEST_EFFECT_BITMASK_BLOCK_SIZE]; + } + check_bconsts_parameters[] = + { + {"mb2x3row", {0x0000001f}}, + {"mb2x3column", {0x00000060}}, + }; static const unsigned int const_no_update_mask[(ARRAY_SIZE(test_effect_preshader_fvect_v) + TEST_EFFECT_BITMASK_BLOCK_SIZE - 1) / TEST_EFFECT_BITMASK_BLOCK_SIZE]; static const D3DLIGHT9 light_filler = {D3DLIGHT_POINT}; @@ -5139,6 +5150,8 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) int ivect[4]; D3DXVECTOR4 fvect; IDirect3DVertexShader9 *vshader; + unsigned char buffer[256]; + hr = D3DXCreateEffect(device, test_effect_preshader_effect_blob, sizeof(test_effect_preshader_effect_blob), NULL, NULL, 0, NULL, &effect, NULL); @@ -5180,8 +5193,6 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) for (i = 0; i < ARRAY_SIZE(check_vconsts_parameters); ++i) { - unsigned char buffer[256]; - test_effect_preshader_clear_vconsts(device); param = effect->lpVtbl->GetParameterByName(effect, NULL, check_vconsts_parameters[i].param_name); ok(!!param, "GetParameterByName failed.\n"); @@ -5196,6 +5207,22 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) check_vconsts_parameters[i].param_name); } + for (i = 0; i < ARRAY_SIZE(check_bconsts_parameters); ++i) + { + test_effect_preshader_clear_pbool_consts(device); + param = effect->lpVtbl->GetParameterByName(effect, NULL, check_bconsts_parameters[i].param_name); + ok(!!param, "GetParameterByName failed.\n"); + hr = effect->lpVtbl->GetValue(effect, param, buffer, sizeof(buffer)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->SetValue(effect, param, buffer, sizeof(buffer)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->CommitChanges(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + test_effect_preshader_compare_pbool_consts(device, check_bconsts_parameters[i].const_updated_mask, + check_bconsts_parameters[i].param_name); + } + test_effect_preshader_clear_vconsts(device); param = effect->lpVtbl->GetParameterByName(effect, NULL, "g_Selector"); ok(!!param, "GetParameterByName failed.\n");

1 0

Paul Gofman : d3dx9/tests: Initialize boolean constants with the inverse of expected result.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 6930679a906d2539ea3f3249896ccd85cf773789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6930679a906d2539ea3f32498… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Jun 2 12:58:10 2017 +0300 d3dx9/tests: Initialize boolean constants with the inverse of expected result. 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/tests/effect.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index eaf1647..966f1bd 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4312,12 +4312,13 @@ static const BOOL test_effect_preshader_bconsts[] = static void test_effect_preshader_clear_pbool_consts(IDirect3DDevice9 *device) { - BOOL bval = FALSE; + BOOL bval; unsigned int i; HRESULT hr; for (i = 0; i < 16; ++i) { + bval = i < ARRAY_SIZE(test_effect_preshader_bconsts) ? !test_effect_preshader_bconsts[i] : FALSE; hr = IDirect3DDevice9_SetPixelShaderConstantB(device, i, &bval, 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); } @@ -4357,7 +4358,7 @@ static void test_effect_preshader_compare_pbool_consts_(unsigned int line, IDire } else { - ok_(__FILE__, line)(!bdata[i], + ok_(__FILE__, line)(bdata[i] == !test_effect_preshader_bconsts[i], "Pixel shader boolean constants updated unexpectedly, parameter %s.\n", updated_param); } }

1 0

Paul Gofman : d3dx9/tests: Factor out test_effect_preshader_compare_pbool_consts() function.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: eea701cca0e305745036c26c57f44f40e29178dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=eea701cca0e305745036c26c5… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Jun 2 12:58:09 2017 +0300 d3dx9/tests: Factor out test_effect_preshader_compare_pbool_consts() function. 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/tests/effect.c | 79 ++++++++++++++++++++++++++++++++------------ 1 file changed, 57 insertions(+), 22 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index ad9c553..eaf1647 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4254,7 +4254,7 @@ static const D3DXVECTOR4 test_effect_preshader_fvect_v[] = {91.0f, 0.0f, 0.0f, 0.0f}, {4.0f, 5.0f, 6.0f, 7.0f}, }; -#define TEST_EFFECT_FVECT_BITMASK_BLOCK_SIZE (sizeof(unsigned int) * 8) +#define TEST_EFFECT_BITMASK_BLOCK_SIZE (sizeof(unsigned int) * 8) #define test_effect_preshader_compare_vconsts(a, b, c) \ test_effect_preshader_compare_vconsts_(__LINE__, a, b, c) @@ -4278,8 +4278,8 @@ static void test_effect_preshader_compare_vconsts_(unsigned int line, IDirect3DD { for (i = 0; i < ARRAY_SIZE(test_effect_preshader_fvect_v); ++i) { - if (const_updated_mask[i / TEST_EFFECT_FVECT_BITMASK_BLOCK_SIZE] - & (1u << (i % TEST_EFFECT_FVECT_BITMASK_BLOCK_SIZE))) + if (const_updated_mask[i / TEST_EFFECT_BITMASK_BLOCK_SIZE] + & (1u << (i % TEST_EFFECT_BITMASK_BLOCK_SIZE))) { ok_(__FILE__, line)(!memcmp(&fdata[i], &test_effect_preshader_fvect_v[i], sizeof(fdata[i])), "Vertex shader float constants do not match, expected (%g, %g, %g, %g), \ @@ -4305,6 +4305,11 @@ got (%g, %g, %g, %g), parameter %s.\n", } } +static const BOOL test_effect_preshader_bconsts[] = +{ + TRUE, FALSE, TRUE, FALSE, TRUE, TRUE, FALSE +}; + static void test_effect_preshader_clear_pbool_consts(IDirect3DDevice9 *device) { BOOL bval = FALSE; @@ -4318,6 +4323,52 @@ static void test_effect_preshader_clear_pbool_consts(IDirect3DDevice9 *device) } } +#define test_effect_preshader_compare_pbool_consts(a, b, c) \ + test_effect_preshader_compare_pbool_consts_(__LINE__, a, b, c) +static void test_effect_preshader_compare_pbool_consts_(unsigned int line, IDirect3DDevice9 *device, + const unsigned int *const_updated_mask, const char *updated_param) +{ + unsigned int i; + BOOL bdata[16]; + HRESULT hr; + + hr = IDirect3DDevice9_GetPixelShaderConstantB(device, 0, bdata, ARRAY_SIZE(bdata)); + ok_(__FILE__, line)(hr == D3D_OK, "Got result %#x.\n", hr); + + if (!const_updated_mask) + { + for (i = 0; i < ARRAY_SIZE(test_effect_preshader_bconsts); ++i) + { + ok_(__FILE__, line)(!bdata[i] == !test_effect_preshader_bconsts[i], + "Pixel shader boolean constants do not match, expected %#x, got %#x, i %u.\n", + test_effect_preshader_bconsts[i], bdata[i], i); + } + } + else + { + for (i = 0; i < ARRAY_SIZE(test_effect_preshader_bconsts); ++i) + { + if (const_updated_mask[i / TEST_EFFECT_BITMASK_BLOCK_SIZE] + & (1u << (i % TEST_EFFECT_BITMASK_BLOCK_SIZE))) + { + ok_(__FILE__, line)(!bdata[i] == !test_effect_preshader_bconsts[i], + "Pixel shader boolean constants do not match, expected %#x, got %#x, i %u, parameter %s.\n", + test_effect_preshader_bconsts[i], bdata[i], i, updated_param); + } + else + { + ok_(__FILE__, line)(!bdata[i], + "Pixel shader boolean constants updated unexpectedly, parameter %s.\n", updated_param); + } + } + } + + for (; i < 16; ++i) + { + ok_(__FILE__, line)(!bdata[i], "Got result %#x, boolean register value %u.\n", hr, bdata[i]); + } +} + static void test_effect_preshader(IDirect3DDevice9 *device) { static const D3DXVECTOR4 test_effect_preshader_fvect_p[] = @@ -4337,10 +4388,6 @@ static void test_effect_preshader(IDirect3DDevice9 *device) {11.0f, 21.0f, 31.0f, 0.0f}, {12.0f, 22.0f, 32.0f, 0.0f} }; - static const BOOL test_effect_preshader_bconsts[] = - { - TRUE, FALSE, TRUE, FALSE, TRUE, TRUE, FALSE - }; static const int test_effect_preshader_iconsts[][4] = { {4, 3, 2, 1} @@ -4353,10 +4400,8 @@ static void test_effect_preshader(IDirect3DDevice9 *device) D3DXHANDLE par; unsigned int npasses; DWORD value; - BOOL bval; D3DXVECTOR4 fdata[ARRAY_SIZE(test_effect_preshader_fvect_p)]; int idata[ARRAY_SIZE(test_effect_preshader_iconsts)][4]; - BOOL bdata[ARRAY_SIZE(test_effect_preshader_bconsts)]; IDirect3DVertexShader9 *vshader; unsigned int i; D3DCAPS9 caps; @@ -4435,17 +4480,7 @@ static void test_effect_preshader(IDirect3DDevice9 *device) "Pixel shader integer constants do not match.\n"); } - hr = IDirect3DDevice9_GetPixelShaderConstantB(device, 0, bdata, - ARRAY_SIZE(test_effect_preshader_bconsts)); - ok(hr == D3D_OK, "Got result %#x.\n", hr); - for (i = 0; i < ARRAY_SIZE(test_effect_preshader_bconsts); ++i) - ok(!bdata[i] == !test_effect_preshader_bconsts[i], - "Pixel shader boolean constants do not match.\n"); - for (; i < 16; ++i) - { - hr = IDirect3DDevice9_GetPixelShaderConstantB(device, i, &bval, 1); - ok(hr == D3D_OK && !bval, "Got result %#x, boolean register value %u.\n", hr, bval); - } + test_effect_preshader_compare_pbool_consts(device, NULL, NULL); test_effect_preshader_op_results(device, NULL, NULL); @@ -5075,7 +5110,7 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) { const char *param_name; const unsigned int const_updated_mask[(ARRAY_SIZE(test_effect_preshader_fvect_v) - + TEST_EFFECT_FVECT_BITMASK_BLOCK_SIZE - 1) / TEST_EFFECT_FVECT_BITMASK_BLOCK_SIZE]; + + TEST_EFFECT_BITMASK_BLOCK_SIZE - 1) / TEST_EFFECT_BITMASK_BLOCK_SIZE]; } check_vconsts_parameters[] = { @@ -5093,7 +5128,7 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) {"ts3", {0x00000fc0, 0x00000000}}, }; static const unsigned int const_no_update_mask[(ARRAY_SIZE(test_effect_preshader_fvect_v) - + TEST_EFFECT_FVECT_BITMASK_BLOCK_SIZE - 1) / TEST_EFFECT_FVECT_BITMASK_BLOCK_SIZE]; + + TEST_EFFECT_BITMASK_BLOCK_SIZE - 1) / TEST_EFFECT_BITMASK_BLOCK_SIZE]; static const D3DLIGHT9 light_filler = {D3DLIGHT_POINT}; ID3DXEffect *effect;

1 0

Paul Gofman : d3dx9/tests: Factor out test_effect_preshader_clear_pbool_consts() function.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 2a3ad1d2098a2b0e462a362e4f689de11868da90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a3ad1d2098a2b0e462a362e4… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Jun 2 12:58:08 2017 +0300 d3dx9/tests: Factor out test_effect_preshader_clear_pbool_consts() function. 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/tests/effect.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index bcb526e..ad9c553 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4305,6 +4305,19 @@ got (%g, %g, %g, %g), parameter %s.\n", } } +static void test_effect_preshader_clear_pbool_consts(IDirect3DDevice9 *device) +{ + BOOL bval = FALSE; + unsigned int i; + HRESULT hr; + + for (i = 0; i < 16; ++i) + { + hr = IDirect3DDevice9_SetPixelShaderConstantB(device, i, &bval, 1); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + } +} + static void test_effect_preshader(IDirect3DDevice9 *device) { static const D3DXVECTOR4 test_effect_preshader_fvect_p[] = @@ -4368,12 +4381,9 @@ static void test_effect_preshader(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetPixelShaderConstantF(device, i, &fvect_filler.x, 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); } - bval = FALSE; - for (i = 0; i < 16; ++i) - { - hr = IDirect3DDevice9_SetPixelShaderConstantB(device, i, &bval, 1); - ok(hr == D3D_OK, "Got result %#x.\n", hr); - } + + test_effect_preshader_clear_pbool_consts(device); + for (i = 0; i < 16; ++i) { hr = IDirect3DDevice9_SetPixelShaderConstantI(device, i, ivect_empty, 1);

1 0

Paul Gofman : d3dx9/tests: Extend test for boolean matrix constant setting.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 7178c167423241e7ccbaf3b3f1c0d41aae2b5861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7178c167423241e7ccbaf3b3f… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Jun 2 12:58:07 2017 +0300 d3dx9/tests: Extend test for boolean matrix constant setting. 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/tests/effect.c | 1010 ++++++++++++++++++++++-------------------- 1 file changed, 520 insertions(+), 490 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7178c167423241e7ccbaf…

1 0

Paul Gofman : d3dx9/tests: Remove a leftover todo_wine_if in test_effect_preshader().
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: b45db52d983e2a78bd7dc2eee555c86f128ffb75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b45db52d983e2a78bd7dc2eee… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Jun 2 12:58:06 2017 +0300 d3dx9/tests: Remove a leftover todo_wine_if in test_effect_preshader(). 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/tests/effect.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 86ea0dd..4315dd1 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4399,7 +4399,6 @@ static void test_effect_preshader(IDirect3DDevice9 *device) ARRAY_SIZE(test_effect_preshader_bconsts)); ok(hr == D3D_OK, "Got result %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(test_effect_preshader_bconsts); ++i) - todo_wine_if(!bdata[i] != !test_effect_preshader_bconsts[i]) ok(!bdata[i] == !test_effect_preshader_bconsts[i], "Pixel shader boolean constants do not match.\n"); for (; i < 16; ++i)

1 0

Paul Gofman : d3dx9: Limit constant size by register count instead of table size.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: ef22e6f0da81fef00a63cd80079804a51029ff99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef22e6f0da81fef00a63cd800… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Jun 2 12:58:05 2017 +0300 d3dx9: Limit constant size by register count instead of table size. 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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index aaf3961..cc103f5 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1070,14 +1070,15 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const unsigned int *in; unsigned int offset; - offset = start_offset + i * info.major_stride + j; - if (get_reg_offset(table, offset) >= rs->table_sizes[table]) + offset = i * info.major_stride + j; + if (get_reg_offset(table, offset) >= const_set->register_count) { if (table != PRES_REGTAB_OBCONST) - FIXME("Output offset exceeds table size, name %s, component %u.\n", + FIXME("Output offset exceeds regiser count, name %s, component %u.\n", debugstr_a(param->name), i); break; } + offset += start_offset; if (info.transpose) param_offset = i + j * info.major; else

1 0

Nikolay Sivov : d3drm: Fix IDirect3DRMMeshBuilder:: QueryInterface to support IDirect3DRMObject and IDirect3DRMVisual.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 99e0442acc123a32139cb0a2a3c365a87b33b577 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99e0442acc123a32139cb0a2a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 5 02:07:32 2017 +0300 d3drm: Fix IDirect3DRMMeshBuilder::QueryInterface to support IDirect3DRMObject and IDirect3DRMVisual. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/meshbuilder.c | 2 ++ dlls/d3drm/tests/d3drm.c | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 82f809e..e53457d 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -361,6 +361,8 @@ static HRESULT WINAPI d3drm_mesh_builder2_QueryInterface(IDirect3DRMMeshBuilder2 if (IsEqualGUID(riid, &IID_IDirect3DRMMeshBuilder2) || IsEqualGUID(riid, &IID_IDirect3DRMMeshBuilder) + || IsEqualGUID(riid, &IID_IDirect3DRMVisual) + || IsEqualGUID(riid, &IID_IDirect3DRMObject) || IsEqualGUID(riid, &IID_IUnknown)) { *out = &mesh_builder->IDirect3DRMMeshBuilder2_iface; diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 9985d03..e1091be 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -203,6 +203,7 @@ static void test_MeshBuilder(void) HRESULT hr; IDirect3DRM *d3drm; IDirect3DRMMeshBuilder *pMeshBuilder; + IDirect3DRMMeshBuilder3 *meshbuilder3; IDirect3DRMMesh *mesh; D3DRMLOADMEMORY info; int val; @@ -215,6 +216,7 @@ static void test_MeshBuilder(void) DWORD size; D3DCOLOR color; CHAR cname[64] = {0}; + IUnknown *unk; hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); @@ -222,6 +224,31 @@ static void test_MeshBuilder(void) hr = IDirect3DRM_CreateMeshBuilder(d3drm, &pMeshBuilder); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr); + hr = IDirect3DRMMeshBuilder_QueryInterface(pMeshBuilder, &IID_IDirect3DRMObject, (void **)&unk); + ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr); + ok(unk == (IUnknown *)pMeshBuilder, "Unexpected interface pointer.\n"); + IUnknown_Release(unk); + + hr = IDirect3DRMMeshBuilder_QueryInterface(pMeshBuilder, &IID_IDirect3DRMVisual, (void **)&unk); + ok(SUCCEEDED(hr), "Failed to get IDirect3DRMVisual, %#x.\n", hr); + ok(unk == (IUnknown *)pMeshBuilder, "Unexpected interface pointer.\n"); + IUnknown_Release(unk); + + hr = IDirect3DRMMeshBuilder_QueryInterface(pMeshBuilder, &IID_IDirect3DRMMeshBuilder3, (void **)&meshbuilder3); + ok(SUCCEEDED(hr), "Failed to get IDirect3DRMMeshBuilder3, %#x.\n", hr); + + hr = IDirect3DRMMeshBuilder3_QueryInterface(meshbuilder3, &IID_IDirect3DRMObject, (void **)&unk); + ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr); + ok(unk == (IUnknown *)pMeshBuilder, "Unexpected interface pointer.\n"); + IUnknown_Release(unk); + + hr = IDirect3DRMMeshBuilder3_QueryInterface(meshbuilder3, &IID_IDirect3DRMVisual, (void **)&unk); + ok(SUCCEEDED(hr), "Failed to get IDirect3DRMVisual, %#x.\n", hr); + ok(unk == (IUnknown *)pMeshBuilder, "Unexpected interface pointer.\n"); + IUnknown_Release(unk); + + IDirect3DRMMeshBuilder3_Release(meshbuilder3); + hr = IDirect3DRMMeshBuilder_GetClassName(pMeshBuilder, NULL, cname); ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); hr = IDirect3DRMMeshBuilder_GetClassName(pMeshBuilder, NULL, NULL);

1 0

Nikolay Sivov : d3drm: Fix IDirect3DRMMesh:: QueryInterface to support IDirect3DRMObject and IDirect3DRMVisual.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: c75c8e7f537af8fe1711d9c4594d6794d2d3a8af URL: http://source.winehq.org/git/wine.git/?a=commit;h=c75c8e7f537af8fe1711d9c45… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 5 02:07:31 2017 +0300 d3drm: Fix IDirect3DRMMesh::QueryInterface to support IDirect3DRMObject and IDirect3DRMVisual. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/meshbuilder.c | 2 ++ dlls/d3drm/tests/d3drm.c | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 4d5a2a7..82f809e 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2322,6 +2322,8 @@ static HRESULT WINAPI d3drm_mesh_QueryInterface(IDirect3DRMMesh *iface, REFIID r TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); if (IsEqualGUID(riid, &IID_IDirect3DRMMesh) + || IsEqualGUID(riid, &IID_IDirect3DRMVisual) + || IsEqualGUID(riid, &IID_IDirect3DRMObject) || IsEqualGUID(riid, &IID_IUnknown)) { IDirect3DRMMesh_AddRef(iface); diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 411cd83..9985d03 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -615,6 +615,7 @@ static void test_Mesh(void) IDirect3DRMMesh *mesh; DWORD size; CHAR cname[64] = {0}; + IUnknown *unk; hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); @@ -635,6 +636,14 @@ static void test_Mesh(void) ok(size == sizeof("Mesh"), "wrong size: %u\n", size); ok(!strcmp(cname, "Mesh"), "Expected cname to be \"Mesh\", but got \"%s\"\n", cname); + hr = IDirect3DRMMesh_QueryInterface(mesh, &IID_IDirect3DRMObject, (void **)&unk); + ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr); + IUnknown_Release(unk); + + hr = IDirect3DRMMesh_QueryInterface(mesh, &IID_IDirect3DRMVisual, (void **)&unk); + ok(SUCCEEDED(hr), "Failed to get IDirect3DRMVisual, %#x.\n", hr); + IUnknown_Release(unk); + IDirect3DRMMesh_Release(mesh); IDirect3DRM_Release(d3drm);

1 0

Nikolay Sivov : d3drm: Implement CreateTextureFromSurface() and related methods.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: d3e47919bc0dde7b66fe86679bb4b4a85d2866f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3e47919bc0dde7b66fe86679… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 5 02:07:30 2017 +0300 d3drm: Implement CreateTextureFromSurface() and related methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 63 +++++++++++++++++++++++++++++++++++++++++----- dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/tests/d3drm.c | 33 ++++++++---------------- dlls/d3drm/texture.c | 53 ++++++++++++++++++++++++++++++-------- 4 files changed, 111 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d3e47919bc0dde7b66fe8…

1 0

Nikolay Sivov : d3drm/tests: Some tests for creating texture from ddraw surface.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 824c46207dd538cd81e905072e8094cd5e1ede4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=824c46207dd538cd81e905072… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 5 02:07:29 2017 +0300 d3drm/tests: Some tests for creating texture from ddraw surface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 188 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 188 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 85af6d2..90820a2 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2192,6 +2192,7 @@ static void test_Texture(void) IDirect3DRMTexture *texture1; IDirect3DRMTexture2 *texture2; IDirect3DRMTexture3 *texture3; + IDirectDrawSurface *surface; D3DRMIMAGE initimg = { @@ -2340,6 +2341,11 @@ static void test_Texture(void) ref4 = get_refcount((IUnknown *)d3drm3); ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4); + /* Created from image, GetSurface() does not work. */ + hr = IDirect3DRMTexture3_GetSurface(texture3, 0, &surface); +todo_wine + ok(hr == D3DRMERR_NOTCREATEDFROMDDS, "GetSurface() expected to fail, %#x\n", hr); + /* Test all failures together */ hr = IDirect3DRMTexture_GetClassName(texture1, NULL, cname); ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); @@ -6535,6 +6541,187 @@ cleanup: DestroyWindow(window); } +static void test_create_texture_from_surface(void) +{ + D3DRMIMAGE testimg = + { + 0, 0, 0, 0, 0, + TRUE, 0, (void *)0xcafebabe, NULL, + 0x000000ff, 0x0000ff00, 0x00ff0000, 0, 0, NULL + }; + IDirectDrawSurface *surface = NULL, *surface2 = NULL, *ds = NULL; + IDirect3DRMTexture *texture1; + IDirect3DRMTexture2 *texture2; + IDirect3DRMTexture3 *texture3; + IDirectDraw *ddraw = NULL; + IDirect3DRM *d3drm1 = NULL; + IDirect3DRM2 *d3drm2 = NULL; + IDirect3DRM3 *d3drm3 = NULL; + ULONG ref1, ref2, ref3; + D3DRMIMAGE *image; + DDSURFACEDESC desc; + HWND window; + HRESULT hr; + RECT rc; + + hr = DirectDrawCreate(NULL, &ddraw, NULL); + ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr); + + window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); + GetClientRect(window, &rc); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + hr = Direct3DRMCreate(&d3drm1); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr); + + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr); + + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr); + + /* Create a surface and use it to create a texture. */ + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + desc.dwWidth = rc.right; + desc.dwHeight = rc.bottom; + + hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface2, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + /* Test NULL params */ + texture1 = (IDirect3DRMTexture *)0xdeadbeef; + hr = IDirect3DRM_CreateTextureFromSurface(d3drm1, NULL, &texture1); +todo_wine { + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!texture1, "Expected texture returned == NULL, got %p.\n", texture1); +} + hr = IDirect3DRM_CreateTextureFromSurface(d3drm1, NULL, NULL); +todo_wine + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + + texture2 = (IDirect3DRMTexture2 *)0xdeadbeef; + hr = IDirect3DRM2_CreateTextureFromSurface(d3drm2, NULL, &texture2); +todo_wine { + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!texture2, "Expected texture returned == NULL, got %p.\n", texture2); +} + hr = IDirect3DRM2_CreateTextureFromSurface(d3drm2, NULL, NULL); +todo_wine + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + + texture3 = (IDirect3DRMTexture3 *)0xdeadbeef; + hr = IDirect3DRM3_CreateTextureFromSurface(d3drm3, NULL, &texture3); +todo_wine { + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!texture3, "Expected texture returned == NULL, got %p.\n", texture3); +} + hr = IDirect3DRM3_CreateTextureFromSurface(d3drm3, NULL, NULL); +todo_wine + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + + ok(get_refcount((IUnknown *)surface) == 1, "Unexpected surface refcount.\n"); + hr = IDirect3DRM_CreateTextureFromSurface(d3drm1, surface, &texture1); +todo_wine + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); +if (SUCCEEDED(hr)) +{ + ok(get_refcount((IUnknown *)surface) == 2, "Unexpected surface refcount.\n"); + image = IDirect3DRMTexture_GetImage(texture1); + ok(image == NULL, "Unexpected image, %p.\n", image); + hr = IDirect3DRMTexture_InitFromSurface(texture1, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + IDirect3DRMTexture_Release(texture1); +} + ok(get_refcount((IUnknown *)surface) == 1, "Unexpected surface refcount.\n"); + hr = IDirect3DRM2_CreateTextureFromSurface(d3drm2, surface, &texture2); +todo_wine + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); +if (SUCCEEDED(hr)) +{ + ok(get_refcount((IUnknown *)surface) == 2, "Unexpected surface refcount.\n"); + image = IDirect3DRMTexture2_GetImage(texture2); + ok(image == NULL, "Unexpected image, %p.\n", image); + hr = IDirect3DRMTexture2_InitFromSurface(texture2, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + IDirect3DRMTexture_Release(texture2); +} + ok(get_refcount((IUnknown *)surface) == 1, "Unexpected surface refcount.\n"); + hr = IDirect3DRM3_CreateTextureFromSurface(d3drm3, surface, &texture3); +todo_wine + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); +if (SUCCEEDED(hr)) +{ + ok(get_refcount((IUnknown *)surface) == 2, "Unexpected surface refcount.\n"); + image = IDirect3DRMTexture3_GetImage(texture3); + ok(image == NULL, "Unexpected image, %p.\n", image); + hr = IDirect3DRMTexture3_InitFromSurface(texture3, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + hr = IDirect3DRMTexture3_GetSurface(texture3, 0, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + hr = IDirect3DRMTexture3_GetSurface(texture3, 0, &ds); + ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr); + ok(ds == surface, "Expected same surface back.\n"); + IDirectDrawSurface_Release(ds); + + /* Init already initialized texture with same surface. */ + hr = IDirect3DRMTexture3_InitFromSurface(texture3, surface); + ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr); + + /* Init already initialized texture with different surface. */ + hr = IDirect3DRMTexture3_InitFromSurface(texture3, surface2); + ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr); + + hr = IDirect3DRMTexture3_GetSurface(texture3, 0, &ds); + ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr); + ok(ds == surface, "Expected same surface back.\n"); + IDirectDrawSurface_Release(ds); + + ref1 = get_refcount((IUnknown *)d3drm1); + ref2 = get_refcount((IUnknown *)d3drm2); + ref3 = get_refcount((IUnknown *)d3drm3); + hr = IDirect3DRMTexture3_InitFromImage(texture3, &testimg); + ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr); + ok(ref1 < get_refcount((IUnknown *)d3drm1), "Expected d3drm1 reference taken.\n"); + ok(ref2 == get_refcount((IUnknown *)d3drm2), "Expected d3drm2 reference unchanged.\n"); + ok(ref3 == get_refcount((IUnknown *)d3drm3), "Expected d3drm3 reference unchanged.\n"); + /* Release leaked reference to d3drm1 */ + IDirect3DRM_Release(d3drm1); + + IDirect3DRMTexture_Release(texture3); + + /* Create from image, initialize from surface. */ + hr = IDirect3DRM3_CreateTexture(d3drm3, &testimg, &texture3); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr); + + ref1 = get_refcount((IUnknown *)d3drm1); + ref2 = get_refcount((IUnknown *)d3drm2); + ref3 = get_refcount((IUnknown *)d3drm3); + hr = IDirect3DRMTexture3_InitFromSurface(texture3, surface); + ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr); + ok(ref1 < get_refcount((IUnknown *)d3drm1), "Expected d3drm1 reference taken.\n"); + ok(ref2 == get_refcount((IUnknown *)d3drm2), "Expected d3drm2 reference unchanged.\n"); + ok(ref3 == get_refcount((IUnknown *)d3drm3), "Expected d3drm3 reference unchanged.\n"); + /* Release leaked reference to d3drm1 */ + IDirect3DRM_Release(d3drm1); + + IDirect3DRMTexture3_Release(texture3); +} + IDirectDrawSurface_Release(surface2); + IDirectDrawSurface_Release(surface); + IDirect3DRM3_Release(d3drm3); + IDirect3DRM2_Release(d3drm2); + IDirect3DRM_Release(d3drm1); + IDirectDraw_Release(ddraw); +} + START_TEST(d3drm) { test_MeshBuilder(); @@ -6568,4 +6755,5 @@ START_TEST(d3drm) test_viewport_qi(); test_viewport_clear1(); test_viewport_clear2(); + test_create_texture_from_surface(); }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2017