wine-commits May 2017

wine-commits@winehq.org

2 participants
640 discussions

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

18 May '17

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

1 0

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

18 May '17

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

1 0

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

18 May '17

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

1 0

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

18 May '17

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

1 0

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

18 May '17

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

1 0

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

18 May '17

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

1 0

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

18 May '17

Module: wine Branch: master Commit: 8ef6091c8ce98a20e03955bb7234d4bbba54cfbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ef6091c8ce98a20e03955bb7… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 17 08:13:20 2017 +0000 reg/tests: Add tests for importing REG_NONE data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index b2afe8b..abccc6d 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1428,6 +1428,47 @@ static void test_import(void) todo_wine verify_reg(hkey, "Wine42b", REG_SZ, "Value 2", 8, 0); todo_wine verify_reg_nonexist(hkey, "Wine42c"); + /* Test hex data concatenation for REG_NONE */ + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine43a\"=hex(0):56,00,61,00,6c,00,75,00,65,00,00,00\n" + "\"Wine43b\"=hex(0):56,00,61,00,6c,00,\\\n" + " 75,00,65,00,00,00\n" + "\"Wine43c\"=hex(0):56,00,61,00,6c,00\\\n" + ",75,00,65,00,00,00\n" + "\"Wine43d\"=hex(0):56,00,61,00,6c,00\\\n" + " ,75,00,65,00,00,00\n" + "\"Wine43e\"=hex(0):56,00,61,00,6c,00\\\n" + " 75,00,65,00,00,00\n" + "\"Wine43f\"=hex(0):56,00,61,00,6c,00,7\\\n" + "5,00,65,00,00,00\n" + "\"Wine43g\"=hex(0):56,00,61,00,6c,00,7\\\n" + " 5,00,65,00,00,00\\\n" + "\"Wine43h\"=hex(0):56,00,61,00,\\;comment\n" + " 6c,00,75,00,\\\n" + " 65,00,00,00\n" + "\"Wine43i\"=hex(0):56,00,61,00,\\;comment\n" + " 6c,00,75,00,\n" + " 65,00,00,00\n" + "\"Wine43j\"=hex(0):56,00,61,00,\\;comment\n" + " 6c,00,75,00,;comment\n" + " 65,00,00,00\n" + "\"Wine43k\"=hex(0):56,00,61,00,\\;comment\n" + " 6c,00,75,00,\\#comment\n" + " 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, "Wine43a", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + todo_wine verify_reg(hkey, "Wine43b", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + todo_wine verify_reg_nonexist(hkey, "Wine43c"); + todo_wine verify_reg_nonexist(hkey, "Wine43d"); + todo_wine verify_reg_nonexist(hkey, "Wine43e"); + todo_wine verify_reg_nonexist(hkey, "Wine43f"); + todo_wine verify_reg_nonexist(hkey, "Wine43g"); + todo_wine verify_reg(hkey, "Wine43h", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + todo_wine verify_reg(hkey, "Wine43i", REG_NONE, "V\0a\0l\0u\0e\0\0", 8, 0); + todo_wine verify_reg(hkey, "Wine43j", REG_NONE, "V\0a\0l\0u\0e\0\0", 8, 0); + todo_wine verify_reg_nonexist(hkey, "Wine43k"); + /* Test import with subkeys */ test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey\"1]\n" @@ -2075,6 +2116,47 @@ static void test_import(void) todo_wine verify_reg(hkey, "Wine42b", REG_SZ, "Value 2", 8, 0); todo_wine verify_reg_nonexist(hkey, "Wine42c"); + /* Test hex data concatenation for REG_NONE */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine43a\"=hex(0):56,00,61,00,6c,00,75,00,65,00,00,00\n" + "\"Wine43b\"=hex(0):56,00,61,00,6c,00,\\\n" + " 75,00,65,00,00,00\n" + "\"Wine43c\"=hex(0):56,00,61,00,6c,00\\\n" + ",75,00,65,00,00,00\n" + "\"Wine43d\"=hex(0):56,00,61,00,6c,00\\\n" + " ,75,00,65,00,00,00\n" + "\"Wine43e\"=hex(0):56,00,61,00,6c,00\\\n" + " 75,00,65,00,00,00\n" + "\"Wine43f\"=hex(0):56,00,61,00,6c,00,7\\\n" + "5,00,65,00,00,00\n" + "\"Wine43g\"=hex(0):56,00,61,00,6c,00,7\\\n" + " 5,00,65,00,00,00\\\n" + "\"Wine43h\"=hex(0):56,00,61,00,\\;comment\n" + " 6c,00,75,00,\\\n" + " 65,00,00,00\n" + "\"Wine43i\"=hex(0):56,00,61,00,\\;comment\n" + " 6c,00,75,00,\n" + " 65,00,00,00\n" + "\"Wine43j\"=hex(0):56,00,61,00,\\;comment\n" + " 6c,00,75,00,;comment\n" + " 65,00,00,00\n" + "\"Wine43k\"=hex(0):56,00,61,00,\\;comment\n" + " 6c,00,75,00,\\#comment\n" + " 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, "Wine43a", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + todo_wine verify_reg(hkey, "Wine43b", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + todo_wine verify_reg_nonexist(hkey, "Wine43c"); + todo_wine verify_reg_nonexist(hkey, "Wine43d"); + todo_wine verify_reg_nonexist(hkey, "Wine43e"); + todo_wine verify_reg_nonexist(hkey, "Wine43f"); + todo_wine verify_reg_nonexist(hkey, "Wine43g"); + todo_wine verify_reg(hkey, "Wine43h", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + todo_wine verify_reg(hkey, "Wine43i", REG_NONE, "V\0a\0l\0u\0e\0\0", 8, 0); + todo_wine verify_reg(hkey, "Wine43j", REG_NONE, "V\0a\0l\0u\0e\0\0", 8, 0); + todo_wine verify_reg_nonexist(hkey, "Wine43k"); + /* Test import with subkeys */ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey\"1]\n"

1 0

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

18 May '17

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

1 0

Hugh McMaster : reg/tests: Test if REG_SZ and REG_DWORD support line concatenation.
by Alexandre Julliard 18 May '17

18 May '17

Module: wine Branch: master Commit: 051cb39d61b426987145ec5b40218cb517e8e1c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=051cb39d61b426987145ec5b4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 17 08:12:59 2017 +0000 reg/tests: Test if REG_SZ and REG_DWORD support line concatenation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 86ff7b5..1784a06 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1374,6 +1374,16 @@ static void test_import(void) test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine41a\"=dword:1234\\\n" + "5678\n" + "\"Wine41b\"=\"Test \\\n" + "Value\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine41a"); + todo_wine verify_reg_nonexist(hkey, "Wine41b"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"double\\\"quote\"=\"valid \\\"or\\\" not\"\n" "\"single'quote\"=dword:00000008\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -2001,6 +2011,16 @@ static void test_import(void) test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine41a\"=dword:1234\\\n" + "5678\n" + "\"Wine41b\"=\"Test \\\n" + "Value\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine41a"); + todo_wine verify_reg_nonexist(hkey, "Wine41b"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"double\\\"quote\"=\"valid \\\"or\\\" not\"\n" "\"single'quote\"=dword:00000008\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0

Hugh McMaster : reg/tests: Add tests for key name and value name concatenation.
by Alexandre Julliard 18 May '17

18 May '17

Module: wine Branch: master Commit: c5f0de7748df03bc391fd7a8f2d078aa655789f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5f0de7748df03bc391fd7a8f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 17 08:12:48 2017 +0000 reg/tests: Add tests for key name and value name concatenation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index c26a8c1..86ff7b5 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1381,6 +1381,34 @@ static void test_import(void) dword = 0x00000008; todo_wine verify_reg(hkey, "single'quote", REG_DWORD, &dword, sizeof(dword), 0); + /* Test key name and value name concatenation */ + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\\n" + "Subkey1]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegOpenKeyExA(hkey, "Subkey1", 0, KEY_READ, &subkey); + todo_wine ok(err == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", err); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\n" + "\\Subkey2]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegOpenKeyExA(hkey, "Subkey2", 0, KEY_READ, &subkey); + todo_wine ok(err == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", err); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine\\\n" + "42a\"=\"Value 1\"\n" + "\"Wine42b\"=\"Value 2\"\n" + "\"Wine\n" + "\\42c\"=\"Value 3\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine42a"); + todo_wine verify_reg(hkey, "Wine42b", REG_SZ, "Value 2", 8, 0); + todo_wine verify_reg_nonexist(hkey, "Wine42c"); + + /* Test import with subkeys */ test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey\"1]\n" "\"Wine\\\\31\"=\"Test value\"\n\n", &r); @@ -1980,6 +2008,34 @@ static void test_import(void) dword = 0x00000008; todo_wine verify_reg(hkey, "single'quote", REG_DWORD, &dword, sizeof(dword), 0); + /* Test key name and value name concatenation */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\\n" + "Subkey1]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegOpenKeyExA(hkey, "Subkey1", 0, KEY_READ, &subkey); + todo_wine ok(err == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", err); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\n" + "\\Subkey2]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegOpenKeyExA(hkey, "Subkey2", 0, KEY_READ, &subkey); + todo_wine ok(err == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", err); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine\\\n" + "42a\"=\"Value 1\"\n" + "\"Wine42b\"=\"Value 2\"\n" + "\"Wine\n" + "\\42c\"=\"Value 3\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine42a"); + todo_wine verify_reg(hkey, "Wine42b", REG_SZ, "Value 2", 8, 0); + todo_wine verify_reg_nonexist(hkey, "Wine42c"); + + /* Test import with subkeys */ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey\"1]\n" "\"Wine\\\\31\"=\"Test value\"\n\n", &r);

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
64
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 May 2017