wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Paul Gofman : kernel32/tests: Fix test_GlobalMemoryStatus() for Win up to 8.1 and RAM size above 4GB.
by Alexandre Julliard 30 Apr '21

30 Apr '21

Module: wine Branch: master Commit: 35fa94e068e3ed19f51c9a0765717433eb28aee6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35fa94e068e3ed19f51c9a07… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Apr 30 21:29:04 2021 +0300 kernel32/tests: Fix test_GlobalMemoryStatus() for Win up to 8.1 and RAM size above 4GB. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 0a4e3367f60..8558bd7f1b3 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1223,9 +1223,9 @@ static BOOL compare_ulong64(ULONG64 v1, ULONG64 v2, ULONG64 max_diff) static void test_GlobalMemoryStatus(void) { static const ULONG64 max_diff = 0x200000; + SIZE_T size, size_broken; MEMORYSTATUSEX memex; MEMORYSTATUS mem; - SIZE_T size; mem.dwLength = sizeof(mem); GlobalMemoryStatus(&mem); @@ -1236,10 +1236,16 @@ static void test_GlobalMemoryStatus(void) * GlobalMemoryStatus() and GlobalMemoryStatusEx() calls. */ size = min(memex.ullTotalPhys, ~(SIZE_T)0 >> 1); - ok(compare_ulong64(mem.dwTotalPhys, size, max_diff), "Got unexpected dwTotalPhys %s, size %s.\n", + size_broken = min(memex.ullTotalPhys, ~(SIZE_T)0); + ok(compare_ulong64(mem.dwTotalPhys, size, max_diff) + || broken(compare_ulong64(mem.dwTotalPhys, size_broken, max_diff)) /* Win <= 8.1 with RAM size > 4GB */, + "Got unexpected dwTotalPhys %s, size %s.\n", wine_dbgstr_longlong(mem.dwTotalPhys), wine_dbgstr_longlong(size)); size = min(memex.ullAvailPhys, ~(SIZE_T)0 >> 1); - ok(compare_ulong64(mem.dwAvailPhys, size, max_diff), "Got unexpected dwAvailPhys %s, size %s.\n", + size_broken = min(memex.ullAvailPhys, ~(SIZE_T)0); + ok(compare_ulong64(mem.dwAvailPhys, size, max_diff) + || broken(compare_ulong64(mem.dwAvailPhys, size_broken, max_diff)) /* Win <= 8.1 with RAM size > 4GB */, + "Got unexpected dwAvailPhys %s, size %s.\n", wine_dbgstr_longlong(mem.dwAvailPhys), wine_dbgstr_longlong(size)); size = min(memex.ullTotalPageFile, ~(SIZE_T)0);

1 0

Gijs Vermeulen : msvcirt: No longer prefer native.
by Alexandre Julliard 30 Apr '21

30 Apr '21

Module: wine Branch: master Commit: 93a8798914b33dc24899bb55164c02fe1a6763b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93a8798914b33dc24899bb55… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Apr 30 15:34:22 2021 +0200 msvcirt: No longer prefer native. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcirt/Makefile.in b/dlls/msvcirt/Makefile.in index 1dee2b24c02..619a3dd66dd 100644 --- a/dlls/msvcirt/Makefile.in +++ b/dlls/msvcirt/Makefile.in @@ -3,7 +3,7 @@ EXTRADEFS = -D_MSVCIRT PARENTSRC = ../msvcp90 IMPORTS = msvcrt -EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native +EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ exception.c \

1 0

Hans Leidekker : secur32: Get rid of builtin NTLM support.
by Alexandre Julliard 30 Apr '21

30 Apr '21

Module: wine Branch: master Commit: 1565a12a5574f47fc0676fc6c71c65a016d19528 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1565a12a5574f47fc0676fc6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 30 16:42:21 2021 +0200 secur32: Get rid of builtin NTLM support. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/Makefile.in | 7 +- dlls/secur32/base64_codec.c | 192 ---- dlls/secur32/dispatcher.c | 335 ------- dlls/secur32/hmac_md5.c | 77 -- dlls/secur32/hmac_md5.h | 48 - dlls/secur32/negotiate.c | 13 +- dlls/secur32/ntlm.c | 2029 ------------------------------------------- dlls/secur32/secur32_priv.h | 108 --- dlls/secur32/util.c | 187 ---- 9 files changed, 13 insertions(+), 2983 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1565a12a5574f47fc067…

1 0

Hans Leidekker : secur32: Load the MSV1_0 provider instead of using builtin support for NTLM.
by Alexandre Julliard 30 Apr '21

30 Apr '21

Module: wine Branch: master Commit: 8a9c3b1e54513dd16791e853b149b2caa459ba11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a9c3b1e54513dd16791e853… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 30 16:42:20 2021 +0200 secur32: Load the MSV1_0 provider instead of using builtin support for NTLM. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/secur32.c | 1 - loader/wine.inf.in | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 8288286c615..4382ec55174 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -563,7 +563,6 @@ static void SECUR32_initializeProviders(void) TRACE("\n"); /* First load built-in providers */ SECUR32_initSchannelSP(); - SECUR32_initNTLMSP(); /* Load SSP/AP packages (Kerberos and others) */ load_auth_packages(); /* Load the Negotiate provider last so apps stumble over the working NTLM diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 6ae4e96e37f..a20efbcce3e 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -750,6 +750,7 @@ HKLM,Software\Registered Applications,,16 HKLM,System\CurrentControlSet\Control\hivelist,,16 HKLM,System\CurrentControlSet\Control\Lsa,"Security Packages",0x10002,kerberos,schannel HKLM,System\CurrentControlSet\Control\Lsa\Kerberos,,16 +HKLM,System\CurrentControlSet\Control\Lsa\MSV1_0,,16 HKLM,System\CurrentControlSet\Control\SecurityProviders\Schannel\Protocols\SSL 2.0\Client,"DisabledByDefault",0x10003,1 HKLM,System\CurrentControlSet\Control\ServiceGroupOrder,"List",0x00010000,"TDI" HKLM,System\CurrentControlSet\Control\TimeZoneInformation,"StandardName",2,""

1 0

Alistair Leslie-Hughes : msado15: Use Recordset_Open in Connection_Execute.
by Alexandre Julliard 30 Apr '21

30 Apr '21

Module: wine Branch: master Commit: 1b9c6227f3dc0746743f5f4e9865d6a18caa3976 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b9c6227f3dc0746743f5f4e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 30 20:52:06 2021 +1000 msado15: Use Recordset_Open in Connection_Execute. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 78 +++++++++--------------------------------- dlls/msado15/msado15_private.h | 2 -- dlls/msado15/recordset.c | 42 +++++++++++++++++++++++ 3 files changed, 59 insertions(+), 63 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index a3c9a450be6..ce7750fef66 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -292,98 +292,54 @@ static HRESULT WINAPI connection_Close( _Connection *iface ) return S_OK; } -HRESULT create_command_text(IUnknown *session, BSTR command, ICommandText **cmd_text) -{ - HRESULT hr; - IOpenRowset *openrowset; - ICommandText *command_text; - ICommand *cmd; - IDBCreateCommand *create_command; - - hr = IUnknown_QueryInterface(session, &IID_IOpenRowset, (void**)&openrowset); - if (FAILED(hr)) - return hr; - - hr = IOpenRowset_QueryInterface(openrowset, &IID_IDBCreateCommand, (void**)&create_command); - IOpenRowset_Release(openrowset); - if (FAILED(hr)) - return hr; - - hr = IDBCreateCommand_CreateCommand(create_command, NULL, &IID_IUnknown, (IUnknown **)&cmd); - IDBCreateCommand_Release(create_command); - if (FAILED(hr)) - return hr; - - hr = ICommand_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); - ICommand_Release(cmd); - if (FAILED(hr)) - { - FIXME("Currently only ICommandText interface is support\n"); - return hr; - } - - hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, command); - if (FAILED(hr)) - { - ICommandText_Release(command_text); - return hr; - } - - *cmd_text = command_text; - - return S_OK; -} - static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARIANT *records_affected, LONG options, _Recordset **record_set ) { struct connection *connection = impl_from_Connection( iface ); HRESULT hr; - ICommandText *command_text; - DBROWCOUNT affected; - IUnknown *rowset; _Recordset *recordset; - ADORecordsetConstruction *construct; + VARIANT source, active; + IDispatch *dispatch; FIXME( "%p, %s, %p, 0x%08x, %p Semi-stub\n", iface, debugstr_w(command), records_affected, options, record_set ); if (connection->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); - hr = create_command_text(connection->session, command, &command_text); + hr = Recordset_create( (void**)&recordset); if (FAILED(hr)) + { return hr; + } - hr = ICommandText_Execute(command_text, NULL, &IID_IUnknown, NULL, &affected, &rowset); - ICommandText_Release(command_text); - if (FAILED(hr)) - return hr; + _Recordset_put_CursorLocation(recordset, connection->location); - hr = Recordset_create( (void**)&recordset); + V_VT(&source) = VT_BSTR; + V_BSTR(&source) = command; + + hr = _Connection_QueryInterface(&connection->Connection_iface, &IID_IDispatch, (void**)&dispatch); if (FAILED(hr)) { - IUnknown_Release(rowset); + _Recordset_Release(recordset); return hr; } - hr = _Recordset_QueryInterface(recordset, &IID_ADORecordsetConstruction, (void**)&construct); + V_VT(&active) = VT_DISPATCH; + V_DISPATCH(&active) = dispatch; + + hr = _Recordset_Open(recordset, source, active, adOpenDynamic, adLockPessimistic, 0); + VariantClear(&active); if (FAILED(hr)) { - IUnknown_Release(rowset); _Recordset_Release(recordset); return hr; } - ADORecordsetConstruction_put_Rowset(construct, rowset); - ADORecordsetConstruction_Release(construct); - IUnknown_Release(rowset); - if (records_affected) { V_VT(records_affected) = VT_I4; - V_I4(records_affected) = affected; + _Recordset_get_RecordCount(recordset, &V_I4(records_affected)); } - _Recordset_put_CursorLocation(recordset, connection->location); *record_set = recordset; return hr; diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index 600dcb90a97..bb55eaaa3aa 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -26,8 +26,6 @@ HRESULT Connection_create( void ** ) DECLSPEC_HIDDEN; HRESULT Recordset_create( void ** ) DECLSPEC_HIDDEN; HRESULT Stream_create( void ** ) DECLSPEC_HIDDEN; -HRESULT create_command_text(IUnknown *session, BSTR command, ICommandText **cmd_text) DECLSPEC_HIDDEN; - static inline void *heap_realloc_zero( void *mem, SIZE_T len ) { if (!mem) return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index d71904193c9..2b32dc6cf94 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1417,6 +1417,48 @@ static HRESULT WINAPI recordset_MoveLast( _Recordset *iface ) return S_OK; } +static HRESULT create_command_text(IUnknown *session, BSTR command, ICommandText **cmd_text) +{ + HRESULT hr; + IOpenRowset *openrowset; + ICommandText *command_text; + ICommand *cmd; + IDBCreateCommand *create_command; + + hr = IUnknown_QueryInterface(session, &IID_IOpenRowset, (void**)&openrowset); + if (FAILED(hr)) + return hr; + + hr = IOpenRowset_QueryInterface(openrowset, &IID_IDBCreateCommand, (void**)&create_command); + IOpenRowset_Release(openrowset); + if (FAILED(hr)) + return hr; + + hr = IDBCreateCommand_CreateCommand(create_command, NULL, &IID_IUnknown, (IUnknown **)&cmd); + IDBCreateCommand_Release(create_command); + if (FAILED(hr)) + return hr; + + hr = ICommand_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); + ICommand_Release(cmd); + if (FAILED(hr)) + { + FIXME("Currently only ICommandText interface is support\n"); + return hr; + } + + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, command); + if (FAILED(hr)) + { + ICommandText_Release(command_text); + return hr; + } + + *cmd_text = command_text; + + return S_OK; +} + static HRESULT WINAPI recordset_Open( _Recordset *iface, VARIANT source, VARIANT active_connection, CursorTypeEnum cursor_type, LockTypeEnum lock_type, LONG options ) {

1 0

Hugh McMaster : reg: Replace the 'reg_count' variable name with context-specific names.
by Alexandre Julliard 30 Apr '21

30 Apr '21

Module: wine Branch: master Commit: 2c73949a46c2dda10b544cef44c0f6c3623cc74e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c73949a46c2dda10b544cef… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Apr 30 22:39:49 2021 +1000 reg: Replace the 'reg_count' variable name with context-specific names. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/add.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/programs/reg/add.c b/programs/reg/add.c index db909167f30..c3dec2d5b7f 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -48,11 +48,12 @@ static inline BYTE hexchar_to_byte(WCHAR ch) return -1; } -static LPBYTE get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DWORD *reg_count) +static BYTE *get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DWORD *size_bytes) { static const WCHAR empty; LPBYTE out_data = NULL; - *reg_count = 0; + + *size_bytes = 0; if (!data) data = ∅ @@ -62,8 +63,8 @@ static LPBYTE get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DW case REG_SZ: case REG_EXPAND_SZ: { - *reg_count = (lstrlenW(data) + 1) * sizeof(WCHAR); - out_data = malloc(*reg_count); + *size_bytes = (lstrlenW(data) + 1) * sizeof(WCHAR); + out_data = malloc(*size_bytes); lstrcpyW((LPWSTR)out_data,data); break; } @@ -78,8 +79,8 @@ static LPBYTE get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DW output_message(STRING_MISSING_INTEGER); break; } - *reg_count = sizeof(DWORD); - out_data = malloc(*reg_count); + *size_bytes = sizeof(DWORD); + out_data = malloc(*size_bytes); ((LPDWORD)out_data)[0] = val; break; } @@ -87,8 +88,8 @@ static LPBYTE get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DW { BYTE hex0, hex1; int i = 0, destByteIndex = 0, datalen = lstrlenW(data); - *reg_count = ((datalen + datalen % 2) / 2) * sizeof(BYTE); - out_data = malloc(*reg_count); + *size_bytes = ((datalen + datalen % 2) / 2) * sizeof(BYTE); + out_data = malloc(*size_bytes); if(datalen % 2) { hex1 = hexchar_to_byte(data[i++]); @@ -139,7 +140,7 @@ static LPBYTE get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DW buffer[destindex] = 0; if (destindex && buffer[destindex - 1]) buffer[++destindex] = 0; - *reg_count = (destindex + 1) * sizeof(WCHAR); + *size_bytes = (destindex + 1) * sizeof(WCHAR); return (BYTE *)buffer; } default: @@ -164,7 +165,7 @@ static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, if (value_name || value_empty || data) { DWORD reg_type; - DWORD reg_count = 0; + DWORD data_size = 0; BYTE* reg_data = NULL; if (!force) @@ -194,13 +195,13 @@ static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, return 1; } - if (!(reg_data = get_regdata(data, reg_type, separator, &reg_count))) + if (!(reg_data = get_regdata(data, reg_type, separator, &data_size))) { RegCloseKey(hkey); return 1; } - RegSetValueExW(hkey, value_name, 0, reg_type, reg_data, reg_count); + RegSetValueExW(hkey, value_name, 0, reg_type, reg_data, data_size); free(reg_data); }

1 0

Hugh McMaster : reg/tests: Update error messages.
by Alexandre Julliard 30 Apr '21

30 Apr '21

Module: wine Branch: master Commit: 08786274e25461dc1af3684f0e46c896201b28cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=08786274e25461dc1af3684f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Apr 30 22:39:48 2021 +1000 reg/tests: Update error messages. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 78519565b22..23d0115fd64 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -57,18 +57,18 @@ void verify_reg_(const char *file, unsigned line, HKEY hkey, const char *value, size = sizeof(data); memset(data, 0xdd, size); err = RegQueryValueExA(hkey, value, NULL, &type, data, &size); - lok(err == ERROR_SUCCESS, "RegQueryValueEx failed: got %d\n", err); + lok(err == ERROR_SUCCESS, "RegQueryValueEx failed: got error %d\n", err); if (err != ERROR_SUCCESS) return; todo_wine_if (todo & TODO_REG_TYPE) - lok(type == exp_type, "got wrong type %d, expected %d\n", type, exp_type); + lok(type == exp_type, "got registry type %d, expected %d\n", type, exp_type); todo_wine_if (todo & TODO_REG_SIZE) - lok(size == exp_size, "got wrong size %d, expected %d\n", size, exp_size); + lok(size == exp_size, "got data size %d, expected %d\n", size, exp_size); if (exp_data) { todo_wine_if (todo & TODO_REG_DATA) - lok(memcmp(data, exp_data, size) == 0, "got wrong data\n"); + lok(memcmp(data, exp_data, size) == 0, "registry data does not match\n"); } } @@ -87,7 +87,7 @@ void open_key_(const char *file, unsigned line, const HKEY base, const char *pat LONG err; err = RegOpenKeyExA(base, path, 0, KEY_READ|sam, hkey); - lok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", err); + lok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got error %d\n", err); } void close_key_(const char *file, unsigned line, HKEY hkey) @@ -95,7 +95,7 @@ void close_key_(const char *file, unsigned line, HKEY hkey) LONG err; err = RegCloseKey(hkey); - lok(err == ERROR_SUCCESS, "RegCloseKey failed: %d\n", err); + lok(err == ERROR_SUCCESS, "RegCloseKey failed: got error %d\n", err); } void verify_key_(const char *file, unsigned line, HKEY key_base, const char *subkey) @@ -104,7 +104,7 @@ void verify_key_(const char *file, unsigned line, HKEY key_base, const char *sub LONG err; err = RegOpenKeyExA(key_base, subkey, 0, KEY_READ, &hkey); - lok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %d\n", err); + lok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got error %d\n", err); if (hkey) RegCloseKey(hkey); @@ -130,7 +130,7 @@ void add_key_(const char *file, unsigned line, const HKEY hkey, const char *path err = RegCreateKeyExA(hkey, path, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE, NULL, &new_key, NULL); - lok(err == ERROR_SUCCESS, "RegCreateKeyExA failed: %d\n", err); + lok(err == ERROR_SUCCESS, "RegCreateKeyExA failed: got error %d\n", err); if (subkey) *subkey = new_key; @@ -145,7 +145,7 @@ void delete_key_(const char *file, unsigned line, const HKEY hkey, const char *p LONG err; err = RegDeleteKeyA(hkey, path); - lok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", err); + lok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got error %d\n", err); } } @@ -197,7 +197,7 @@ void add_value_(const char *file, unsigned line, HKEY hkey, const char *name, LONG err; err = RegSetValueExA(hkey, name, 0, type, (const BYTE *)data, size); - lok(err == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", err); + lok(err == ERROR_SUCCESS, "RegSetValueExA failed: got error %d\n", err); } void delete_value_(const char *file, unsigned line, const HKEY hkey, const char *name) @@ -205,7 +205,7 @@ void delete_value_(const char *file, unsigned line, const HKEY hkey, const char LONG err; err = RegDeleteValueA(hkey, name); - lok(err == ERROR_SUCCESS, "RegDeleteValueA failed: %d\n", err); + lok(err == ERROR_SUCCESS, "RegDeleteValueA failed: got error %d\n", err); } /* Unit tests */

1 0

Hugh McMaster : reg/tests: Add two REG_DWORD tests.
by Alexandre Julliard 30 Apr '21

30 Apr '21

Module: wine Branch: master Commit: 357601a01b894ecdd0e26f5493914192d7ccae6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=357601a01b894ecdd0e26f54… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Apr 30 22:39:47 2021 +1000 reg/tests: Add two REG_DWORD tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 6090b587f92..78519565b22 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -692,6 +692,16 @@ static void test_reg_dword(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword15 /t REG_DWORD /d 4294967296 /f", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u, expected 1\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword16 /t REG_DWORD /d 456 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 456; + verify_reg(hkey, "dword16", REG_DWORD, &dword, sizeof(dword), 0); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword17 /t REG_DWORD /d 0x456 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 0x456; + verify_reg(hkey, "dword17", REG_DWORD, &dword, sizeof(dword), 0); + /* REG_DWORD_LITTLE_ENDIAN */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_LE /t REG_DWORD_LITTLE_ENDIAN /d 456 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0

Hugh McMaster : reg/tests: Fix a typo in a REG_DWORD test.
by Alexandre Julliard 30 Apr '21

30 Apr '21

Module: wine Branch: master Commit: a8e961ecacb845b3fc613401431ae9ca37bf9d4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8e961ecacb845b3fc613401… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Apr 30 22:39:46 2021 +1000 reg/tests: Fix a typo in a REG_DWORD test. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index f6a4a7fe576..6090b587f92 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -673,7 +673,7 @@ static void test_reg_dword(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /v dword10 /f /d -0x1", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u, expected 1\n", r); - run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword8 /t REG_dword /d 0x01ffffffff /f", &r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword11 /t REG_dword /d 0x01ffffffff /f", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword12 /t REG_DWORD /d 0xffffffff /f", &r);

1 0

Hugh McMaster : reg/tests: Split the REG_DWORD_BIG_ENDIAN tests from the REG_DWORD tests.
by Alexandre Julliard 30 Apr '21

30 Apr '21

Module: wine Branch: master Commit: 94b582b1a68cd07676618144537465bdf21d1847 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94b582b1a68cd07676618144… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Apr 30 22:39:45 2021 +1000 reg/tests: Split the REG_DWORD_BIG_ENDIAN tests from the REG_DWORD tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 43 ++++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index d2d09e79ce6..f6a4a7fe576 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -698,22 +698,38 @@ static void test_reg_dword(void) dword = 456; verify_reg(hkey, "DWORD_LE", REG_DWORD_LITTLE_ENDIAN, &dword, sizeof(dword), 0); - /* REG_DWORD_BIG_ENDIAN */ - run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_BE /t REG_DWORD_BIG_ENDIAN /d 456 /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - dword = 456; - verify_reg(hkey, "DWORD_BE", REG_DWORD_BIG_ENDIAN, &dword, sizeof(dword), 0); - /* REG_DWORD_BIG_ENDIAN is broken in every version of windows. It behaves like - * an ordinary REG_DWORD - that is little endian. GG */ - - run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_BE2 /t REG_DWORD_BIG_ENDIAN /f /d", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + close_key(hkey); + delete_key(HKEY_CURRENT_USER, KEY_BASE); +} - run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_BE3 /t REG_DWORD_BIG_ENDIAN /f", &r); - ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u, expected 1\n", r); +/* REG_DWORD_BIG_ENDIAN is broken in every version of Windows. It behaves + * like an ordinary REG_DWORD, which is little endian. + */ +static void test_reg_dword_big_endian(void) +{ + HKEY hkey; + DWORD r, dword; run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_DWORD_BIG_ENDIAN /f", &r); - ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u, expected 1\n", r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %d, expected 1\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v Test1 /t REG_DWORD_BIG_ENDIAN /f /d", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v Test2 /t REG_DWORD_BIG_ENDIAN /f", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %d, expected 1\n", r); + + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v Test3 /t REG_DWORD_BIG_ENDIAN /d 456 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 456; + verify_reg(hkey, "Test3", REG_DWORD_BIG_ENDIAN, &dword, sizeof(dword), 0); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v Test4 /t REG_DWORD_BIG_ENDIAN /d 0x456 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 0x456; + verify_reg(hkey, "Test4", REG_DWORD_BIG_ENDIAN, &dword, sizeof(dword), 0); close_key(hkey); delete_key(HKEY_CURRENT_USER, KEY_BASE); @@ -835,5 +851,6 @@ START_TEST(add) test_reg_expand_sz(); test_reg_binary(); test_reg_dword(); + test_reg_dword_big_endian(); test_reg_multi_sz(); }

1 0

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 April 2021