wine-commits June 2017

wine-commits@winehq.org

2 participants
595 discussions

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

← Newer
1
...
38
39
40
41
42
43
44
...
60
Older →

Jump to page:

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