May 2021 - Wine-commits - list.winehq.org

Damjan Jovanovic : shell32: Implement some of the missing shellview IContextMenu command verbs.
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: 566454b9dcc89069b66b8634f685d175e528f26b URL: https://source.winehq.org/git/wine.git/?a=commit;h=566454b9dcc89069b66b8634… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon May 3 03:12:43 2021 +0200 shell32: Implement some of the missing shellview IContextMenu command verbs. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview_cmenu.c | 83 +++++++++++++++++++++++++++++++++--------- dlls/shell32/tests/shlfolder.c | 1 - 2 files changed, 65 insertions(+), 19 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index e7c1cf16e10..bd58a448d17 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -828,6 +828,10 @@ static HRESULT WINAPI ItemMenu_InvokeCommand( TRACE("Verb is %s\n",debugstr_a(lpcmi->lpVerb)); if (strcmp(lpcmi->lpVerb,"delete")==0) DoDelete(This); + else if (strcmp(lpcmi->lpVerb,"copy")==0) + DoCopyOrCut(This, lpcmi->hwnd, FALSE); + else if (strcmp(lpcmi->lpVerb,"cut")==0) + DoCopyOrCut(This, lpcmi->hwnd, TRUE); else if (strcmp(lpcmi->lpVerb,"properties")==0) DoOpenProperties(This, lpcmi->hwnd); else { @@ -1256,6 +1260,10 @@ static HRESULT WINAPI BackgroundMenu_InvokeCommand( { if (hWnd) SendMessageA(hWnd, WM_COMMAND, MAKEWPARAM(FCIDM_SHVIEW_REPORTVIEW, 0), 0); } + else if (!strcmp(lpcmi->lpVerb, "paste")) + { + DoPaste(This); + } else { FIXME("please report: unknown verb %s\n", debugstr_a(lpcmi->lpVerb)); @@ -1306,27 +1314,66 @@ static HRESULT WINAPI BackgroundMenu_GetCommandString( LPSTR lpszName, UINT uMaxNameLen) { - ContextMenu *This = impl_from_IContextMenu3(iface); + static const WCHAR pasteW[] = {'p','a','s','t','e',0}; + static const WCHAR propertiesW[] = {'p','r','o','p','e','r','t','i','e','s',0}; + ContextMenu *This = impl_from_IContextMenu3(iface); + const WCHAR *cmdW = NULL; + HRESULT hr = E_FAIL; - TRACE("(%p)->(idcom=%lx flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); + TRACE("(%p)->(idcom=%lx flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); - /* test the existence of the menu items, the file dialog enables - the buttons according to this */ - if (uFlags == GCS_VALIDATEA) - { - if(HIWORD(idCommand)) - { - if (!strcmp((LPSTR)idCommand, CMDSTR_VIEWLISTA) || - !strcmp((LPSTR)idCommand, CMDSTR_VIEWDETAILSA) || - !strcmp((LPSTR)idCommand, CMDSTR_NEWFOLDERA)) - { - return S_OK; - } - } - } + switch (uFlags) + { + case GCS_HELPTEXTA: + case GCS_HELPTEXTW: + hr = E_NOTIMPL; + break; + + case GCS_VERBA: + case GCS_VERBW: + switch (idCommand + FCIDM_BASE) + { + case FCIDM_SHVIEW_INSERT: + cmdW = pasteW; + break; + case FCIDM_SHVIEW_PROPERTIES: + cmdW = propertiesW; + break; + } + + if (!cmdW) + { + hr = E_INVALIDARG; + break; + } - FIXME("unknown command string\n"); - return E_FAIL; + if (uFlags == GCS_VERBA) + WideCharToMultiByte(CP_ACP, 0, cmdW, -1, lpszName, uMaxNameLen, NULL, NULL); + else + lstrcpynW((WCHAR *)lpszName, cmdW, uMaxNameLen); + TRACE("name %s\n", uFlags == GCS_VERBA ? debugstr_a(lpszName) : debugstr_w((WCHAR *)lpszName)); + hr = S_OK; + break; + + case GCS_VALIDATEA: + case GCS_VALIDATEW: + /* test the existence of the menu items, the file dialog enables + the buttons according to this */ + if (HIWORD(idCommand)) + { + if (!strcmp((LPSTR)idCommand, CMDSTR_VIEWLISTA) || + !strcmp((LPSTR)idCommand, CMDSTR_VIEWDETAILSA) || + !strcmp((LPSTR)idCommand, CMDSTR_NEWFOLDERA)) + hr = S_OK; + else + { + FIXME("unknown command string %s\n", uFlags == GCS_VALIDATEA ? debugstr_a((LPSTR)idCommand) : debugstr_w((WCHAR*)idCommand)); + hr = E_FAIL; + } + } + break; + } + return hr; } static const IContextMenu3Vtbl BackgroundContextMenuVtbl = diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index cb238c959cd..51776f050ae 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4381,7 +4381,6 @@ static void test_contextmenu(IContextMenu *menu, BOOL background) ok(mii.wID >= 64 && mii.wID <= 64 + max_id, "Expected between 64 and %d, got %d.\n", 64 + max_id, mii.wID); hr = IContextMenu_GetCommandString(menu, mii.wID - 64, GCS_VERBA, 0, buf, sizeof(buf)); - todo_wine_if(background) ok(hr == S_OK || hr == E_NOTIMPL || hr == E_INVALIDARG, "Got unexpected hr %#x for ID %d, string %s.\n", hr, mii.wID, debugstr_a(mii.dwTypeData)); if (hr == S_OK)

1 0

Damjan Jovanovic : shell32: Fix pasting from the shellview context menu.
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: 19379007e517a7e55857e1841cca0bea505d19d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19379007e517a7e55857e184… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon May 3 03:13:28 2021 +0200 shell32: Fix pasting from the shellview context menu. Pasting from the shellview context menu is completely broken, as the desktop folder's BindToObject() always fails since the CIDA parent folder PIDL is an empty PIDL. The desktop shell folder doesn't support the ISFHelper interface either. Rather bind to each item's immediate parent, and copy each item individually. Also try get error handling to work a little better. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview_cmenu.c | 65 ++++++++++++++++++++++++++++---------------- 1 file changed, 42 insertions(+), 23 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index bd58a448d17..67f5ac80d84 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -1136,7 +1136,7 @@ static void DoNewFolder(ContextMenu *This, IShellView *view) static BOOL DoPaste(ContextMenu *This) { - BOOL bSuccess = FALSE; + BOOL bSuccess = TRUE; IDataObject * pda; TRACE("\n"); @@ -1157,38 +1157,53 @@ static BOOL DoPaste(ContextMenu *This) LPITEMIDLIST * apidl; LPITEMIDLIST pidl; IShellFolder *psfFrom = NULL, *psfDesktop; + int i; LPIDA lpcida = GlobalLock(medium.u.hGlobal); TRACE("cida=%p\n", lpcida); apidl = _ILCopyCidaToaPidl(&pidl, lpcida); - /* bind to the source shellfolder */ - SHGetDesktopFolder(&psfDesktop); - if(psfDesktop) - { - IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (LPVOID*)&psfFrom); - IShellFolder_Release(psfDesktop); - } + for (i = 0; bSuccess && i < lpcida->cidl; i++) { + ITEMIDLIST *apidl_dir = NULL; + ITEMIDLIST *apidl_item; - if (psfFrom) - { - /* get source and destination shellfolder */ - ISFHelper *psfhlpdst, *psfhlpsrc; - IShellFolder_QueryInterface(This->parent, &IID_ISFHelper, (void**)&psfhlpdst); - IShellFolder_QueryInterface(psfFrom, &IID_ISFHelper, (void**)&psfhlpsrc); + psfFrom = NULL; + /* bind to the source shellfolder */ + SHGetDesktopFolder(&psfDesktop); + if(psfDesktop) + { + apidl_dir = ILClone(apidl[i]); + ILRemoveLastID(apidl_dir); + apidl_item = ILFindLastID(apidl[i]); + IShellFolder_BindToObject(psfDesktop, apidl_dir, NULL, &IID_IShellFolder, (LPVOID*)&psfFrom); + IShellFolder_Release(psfDesktop); + } - /* do the copy/move */ - if (psfhlpdst && psfhlpsrc) + if (psfFrom) { - ISFHelper_CopyItems(psfhlpdst, psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl); - /* FIXME handle move - ISFHelper_DeleteItems(psfhlpsrc, lpcida->cidl, apidl); - */ + /* get source and destination shellfolder */ + ISFHelper *psfhlpdst, *psfhlpsrc; + IShellFolder_QueryInterface(This->parent, &IID_ISFHelper, (void**)&psfhlpdst); + IShellFolder_QueryInterface(psfFrom, &IID_ISFHelper, (void**)&psfhlpsrc); + + /* do the copy/move */ + if (psfhlpdst && psfhlpsrc) + { + HRESULT hr = ISFHelper_CopyItems(psfhlpdst, psfFrom, 1, (LPCITEMIDLIST*)&apidl_item); + if (FAILED(hr)) + bSuccess = FALSE; + /* FIXME handle move + ISFHelper_DeleteItems(psfhlpsrc, 1, &apidl_item); + */ + } + if(psfhlpdst) ISFHelper_Release(psfhlpdst); + if(psfhlpsrc) ISFHelper_Release(psfhlpsrc); + IShellFolder_Release(psfFrom); } - if(psfhlpdst) ISFHelper_Release(psfhlpdst); - if(psfhlpsrc) ISFHelper_Release(psfhlpsrc); - IShellFolder_Release(psfFrom); + else + bSuccess = FALSE; + SHFree(apidl_dir); } _ILFreeaPidl(apidl, lpcida->cidl); @@ -1197,8 +1212,12 @@ static BOOL DoPaste(ContextMenu *This) /* release the medium*/ ReleaseStgMedium(&medium); } + else + bSuccess = FALSE; IDataObject_Release(pda); } + else + bSuccess = FALSE; #if 0 HGLOBAL hMem;

1 0

Louis Lenders : ntdll: Stub RtlQueryProcessPlaceholderCompatibilityMode().
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: 1a02b3f1c6dbe1cb342f7e9066116eba9bcf6c85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a02b3f1c6dbe1cb342f7e90… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sat May 1 18:49:40 2021 -0500 ntdll: Stub RtlQueryProcessPlaceholderCompatibilityMode(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50026 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/rtl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/ntifs.h | 10 ++++++++++ 4 files changed, 22 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4da9ea5a0b1..94ebca02f35 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -898,6 +898,7 @@ @ stdcall RtlQueryProcessDebugInformation(long long ptr) @ stub RtlQueryProcessHeapInformation @ stub RtlQueryProcessLockInformation +@ stdcall RtlQueryProcessPlaceholderCompatibilityMode() @ stub RtlQueryProperties @ stub RtlQueryPropertyNames @ stub RtlQueryPropertySet diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index cf21c980a45..d7740a7a044 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -37,6 +37,7 @@ #include "ntdll_misc.h" #include "in6addr.h" #include "ddk/ntddk.h" +#include "ddk/ntifs.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); WINE_DECLARE_DEBUG_CHANNEL(debugstr); @@ -2165,3 +2166,12 @@ NTSTATUS WINAPI RtlQueryPackageIdentity(HANDLE token, WCHAR *fullname, SIZE_T *f FIXME("(%p, %p, %p, %p, %p, %p): stub\n", token, fullname, fullname_size, appid, appid_size, packaged); return STATUS_NOT_FOUND; } + +/********************************************************************* + * RtlQueryProcessPlaceholderCompatibilityMode [NTDLL.@] + */ +char WINAPI RtlQueryProcessPlaceholderCompatibilityMode(void) +{ + FIXME("stub\n"); + return PHCM_APPLICATION_DEFAULT; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 2e5e2e6e11b..3505a58b9d6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1212,6 +1212,7 @@ @ stdcall RtlQueryDynamicTimeZoneInformation(ptr) @ stdcall RtlQueryInformationAcl(ptr ptr long long) @ stdcall RtlQueryPackageIdentity(long ptr ptr ptr ptr ptr) +@ stdcall RtlQueryProcessPlaceholderCompatibilityMode() @ stdcall RtlQueryRegistryValues(long ptr ptr ptr ptr) @ stdcall RtlQueryRegistryValuesEx(long ptr ptr ptr ptr) RtlQueryRegistryValues @ stdcall RtlQueryTimeZoneInformation(ptr) diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index 73d602595c4..bd4bd58be26 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -21,6 +21,15 @@ #include "ntddk.h" +#define PHCM_ERROR_INVALID_PARAMETER ((char)-1) +#define PHCM_ERROR_NO_TEB ((char)-2) +#define PHCM_ERROR_NO_PEB ((char)-3) +#define PHCM_APPLICATION_DEFAULT ((char)0) +#define PHCM_DISGUISE_PLACEHOLDERS ((char)1) +#define PHCM_EXPOSE_PLACEHOLDERS ((char)2) +#define PHCM_DISGUISE_FULL_PLACEHOLDERS ((char)3) +#define PHCM_MAX ((char)3) + typedef struct _EX_PUSH_LOCK EX_PUSH_LOCK, *PEX_PUSH_LOCK; typedef enum _FS_FILTER_SECTION_SYNC_TYPE @@ -140,5 +149,6 @@ BOOLEAN WINAPI PsIsSystemThread(PETHREAD); NTSTATUS WINAPI PsLookupProcessByProcessId(HANDLE,PEPROCESS*); NTSTATUS WINAPI PsLookupThreadByThreadId(HANDLE,PETHREAD*); void WINAPI PsRevertToSelf(void); +char WINAPI RtlQueryProcessPlaceholderCompatibilityMode(void); #endif

1 0

Paul Gofman : winex11.drv: Handle Vulkan surface creation with NULL hwnd.
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: 011fabb2c43d13402ea18b6ea7be3669b5e6c7a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=011fabb2c43d13402ea18b6e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 3 13:26:27 2021 +0300 winex11.drv: Handle Vulkan surface creation with NULL hwnd. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/tests/vulkan.c | 112 +++++++++++++++++++++++++++++++++++++++++-- dlls/winex11.drv/vulkan.c | 38 +++++++++++---- dlls/winex11.drv/window.c | 18 +++++++ dlls/winex11.drv/x11drv.h | 1 + 4 files changed, 158 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=011fabb2c43d13402ea1…

1 0

Serge Gautherie : winbase.h: Add CREATE_IGNORE_SYSTEM_DEFAULT.
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: e19ad98564295354e36df473c278167b4ef72d54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e19ad98564295354e36df473… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Mon May 3 13:29:39 2021 +0200 winbase.h: Add CREATE_IGNORE_SYSTEM_DEFAULT. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winbase.h b/include/winbase.h index 11a92fa84d9..5e35c31a3b7 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -679,6 +679,7 @@ typedef struct _PROCESS_INFORMATION{ #define PROFILE_USER 0x10000000 #define PROFILE_KERNEL 0x20000000 #define PROFILE_SERVER 0x40000000 +#define CREATE_IGNORE_SYSTEM_DEFAULT 0x80000000 #define STACK_SIZE_PARAM_IS_A_RESERVATION 0x00010000

1 0

Piotr Caban : msvcrt: Fix round implementation when 24-bit precision is used.
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: df9c11ffa8ddc3b4dbb22f6e304cba8cfcda8ada URL: https://source.winehq.org/git/wine.git/?a=commit;h=df9c11ffa8ddc3b4dbb22f6e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 3 14:01:57 2021 +0200 msvcrt: Fix round implementation when 24-bit precision is used. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index a29ed5786e2..1da6a0162da 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -87,14 +87,6 @@ static inline float fp_barrierf(float x) return y; } -#if _MSVCR_VER>=120 -static inline double fp_barrier(double x) -{ - volatile double y = x; - return y; -} -#endif - static inline double CDECL ret_nan( BOOL update_sw ) { double x = 1.0; @@ -4330,32 +4322,26 @@ short CDECL _dclass(double x) /********************************************************************* * round (MSVCR120.@) * - * Copied from musl: src/math/round.c + * Based on musl implementation: src/math/round.c */ double CDECL round(double x) { - static const double toint = 1 / DBL_EPSILON; + ULONGLONG llx = *(ULONGLONG*)&x, tmp; + int e = (llx >> 52 & 0x7ff) - 0x3ff; - ULONGLONG llx = *(ULONGLONG*)&x; - int e = llx >> 52 & 0x7ff; - double y; + if (e >= 52) + return x; + if (e < -1) + return 0 * x; + else if (e == -1) + return signbit(x) ? -1 : 1; - if (e >= 0x3ff + 52) + tmp = 0x000fffffffffffffULL >> e; + if (!(llx & tmp)) return x; - if (llx >> 63) - x = -x; - if (e < 0x3ff - 1) - return 0 * *(double*)&llx; - y = fp_barrier(x + toint) - toint - x; - if (y > 0.5) - y = y + x - 1; - else if (y <= -0.5) - y = y + x + 1; - else - y = y + x; - if (llx >> 63) - y = -y; - return y; + llx += 0x0008000000000000ULL >> e; + llx &= ~tmp; + return *(double*)&llx; } /*********************************************************************

1 0

Hugh McMaster : reg: Add or modify the (Default) registry value if [/v] is not specified.
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: a0dc4d7ce37fa8cc515cd4c908245d12fc07cfae URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0dc4d7ce37fa8cc515cd4c9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 3 23:20:35 2021 +1000 reg: Add or modify the (Default) registry value if [/v] is not specified. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/add.c | 63 +++++++++++++++++++++++------------------------- programs/reg/tests/add.c | 30 +++++++++++------------ 2 files changed, 45 insertions(+), 48 deletions(-) diff --git a/programs/reg/add.c b/programs/reg/add.c index c3dec2d5b7f..897c6f60621 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -154,6 +154,8 @@ static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, WCHAR *type, WCHAR separator, WCHAR *data, BOOL force) { HKEY hkey; + DWORD data_type, data_size; + BYTE *reg_data = NULL; if (RegCreateKeyExW(root, path, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE, NULL, &hkey, NULL)) @@ -162,49 +164,44 @@ static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, return 1; } - if (value_name || value_empty || data) + if (!force) { - DWORD reg_type; - DWORD data_size = 0; - BYTE* reg_data = NULL; - - if (!force) + if (RegQueryValueExW(hkey, value_name, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { - if (RegQueryValueExW(hkey, value_name, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + if (!ask_confirm(STRING_OVERWRITE_VALUE, value_name)) { - if (!ask_confirm(STRING_OVERWRITE_VALUE, value_name)) - { - RegCloseKey(hkey); - output_message(STRING_CANCELLED); - return 0; - } + RegCloseKey(hkey); + output_message(STRING_CANCELLED); + return 0; } } + } - reg_type = wchar_get_type(type); - if (reg_type == ~0u) - { - RegCloseKey(hkey); - output_message(STRING_UNSUPPORTED_TYPE, type); - return 1; - } - if ((reg_type == REG_DWORD || reg_type == REG_DWORD_BIG_ENDIAN) && !data) - { - RegCloseKey(hkey); - output_message(STRING_INVALID_CMDLINE); - return 1; - } + data_type = wchar_get_type(type); - if (!(reg_data = get_regdata(data, reg_type, separator, &data_size))) - { - RegCloseKey(hkey); - return 1; - } + if (data_type == ~0u) + { + RegCloseKey(hkey); + output_message(STRING_UNSUPPORTED_TYPE, type); + return 1; + } - RegSetValueExW(hkey, value_name, 0, reg_type, reg_data, data_size); - free(reg_data); + if ((data_type == REG_DWORD || data_type == REG_DWORD_BIG_ENDIAN) && !data) + { + RegCloseKey(hkey); + output_message(STRING_INVALID_CMDLINE); + return 1; } + if (!(reg_data = get_regdata(data, data_type, separator, &data_size))) + { + RegCloseKey(hkey); + return 1; + } + + RegSetValueExW(hkey, value_name, 0, data_type, reg_data, data_size); + free(reg_data); + RegCloseKey(hkey); output_message(STRING_SUCCESS); diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 23d0115fd64..7fad8333ed5 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -330,8 +330,8 @@ static void test_add(void) open_key(HKEY_CURRENT_USER, KEY_BASE, KEY_WRITE, &hkey); /* The Default value is initialized if no parameters are specified */ - todo_wine verify_reg(hkey, NULL, REG_SZ, "", 1, 0); - todo_wine delete_value(hkey, NULL); + verify_reg(hkey, NULL, REG_SZ, "", 1, 0); + delete_value(hkey, NULL); /* This also occurs when specifying a registry type and passing data */ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /d 0x5 /f", &r); @@ -342,7 +342,7 @@ static void test_add(void) /* The Default value can also be overwritten as an empty string */ run_reg_exe("reg add HKCU\\" KEY_BASE " /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg(hkey, NULL, REG_SZ, "", 1, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + verify_reg(hkey, NULL, REG_SZ, "", 1, 0); close_key(hkey); delete_key(HKEY_CURRENT_USER, KEY_BASE); @@ -366,8 +366,8 @@ static void test_add(void) /* ... but we can add it without passing [/f] to reg.exe */ run_reg_exe("reg add HKCU\\" KEY_BASE, &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, NULL, REG_SZ, "", 1, 0); - todo_wine delete_value(hkey, NULL); + verify_reg(hkey, NULL, REG_SZ, "", 1, 0); + delete_value(hkey, NULL); /* Test whether overwriting a registry key modifies existing keys and values */ add_key(hkey, "Subkey", NULL); @@ -382,7 +382,7 @@ static void test_add(void) verify_key(hkey, "Subkey"); verify_reg(hkey, "Test1", REG_SZ, "Value1", 7, 0); verify_reg(hkey, "Test2", REG_DWORD, &dword, sizeof(dword), 0); - todo_wine verify_reg(hkey, NULL, REG_SZ, "", 1, 0); + verify_reg(hkey, NULL, REG_SZ, "", 1, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_NONE /d Test /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -406,9 +406,9 @@ static void test_reg_none(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_NONE /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, NULL, REG_NONE, "\0", 2, 0); + verify_reg(hkey, NULL, REG_NONE, "\0", 2, 0); - todo_wine delete_value(hkey, NULL); + delete_value(hkey, NULL); run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_NONE /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); @@ -435,7 +435,7 @@ static void test_reg_sz(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_SZ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, NULL, REG_SZ, "", 1, 0); + verify_reg(hkey, NULL, REG_SZ, "", 1, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /d WineTest /f", &r); ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), @@ -513,9 +513,9 @@ static void test_reg_expand_sz(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_EXPAND_SZ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, NULL, REG_EXPAND_SZ, "", 1, 0); + verify_reg(hkey, NULL, REG_EXPAND_SZ, "", 1, 0); - todo_wine delete_value(hkey, NULL); + delete_value(hkey, NULL); run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_EXPAND_SZ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); @@ -556,9 +556,9 @@ static void test_reg_binary(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, NULL, REG_BINARY, buffer, 0, 0); + verify_reg(hkey, NULL, REG_BINARY, buffer, 0, 0); - todo_wine delete_value(hkey, NULL); + delete_value(hkey, NULL); run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_BINARY /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); @@ -754,9 +754,9 @@ static void test_reg_multi_sz(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, NULL, REG_MULTI_SZ, "", 1, 0); + verify_reg(hkey, NULL, REG_MULTI_SZ, "", 1, 0); - todo_wine delete_value(hkey, NULL); + delete_value(hkey, NULL); run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_MULTI_SZ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r);

1 0

Hugh McMaster : reg: Fail if access is denied when adding registry data.
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: d433d1f122a85b7902b48bae1930eef503a239a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d433d1f122a85b7902b48bae… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 3 23:20:36 2021 +1000 reg: Fail if access is denied when adding registry data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/add.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/programs/reg/add.c b/programs/reg/add.c index 897c6f60621..258e3e8cb25 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -156,6 +156,7 @@ static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, HKEY hkey; DWORD data_type, data_size; BYTE *reg_data = NULL; + LONG rc; if (RegCreateKeyExW(root, path, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE, NULL, &hkey, NULL)) @@ -199,10 +200,17 @@ static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, return 1; } - RegSetValueExW(hkey, value_name, 0, data_type, reg_data, data_size); - free(reg_data); + rc = RegSetValueExW(hkey, value_name, 0, data_type, reg_data, data_size); + free(reg_data); RegCloseKey(hkey); + + if (rc) + { + output_message(STRING_ACCESS_DENIED); + return 1; + } + output_message(STRING_SUCCESS); return 0;

1 0

Hugh McMaster : reg: Only prompt the user to overwrite registry data if the given key already exists and [/f] is not supplied.
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: cf1e6d3f3fcb726062b957a973bb0a78b7e00eab URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf1e6d3f3fcb726062b957a9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 3 23:20:37 2021 +1000 reg: Only prompt the user to overwrite registry data if the given key already exists and [/f] is not supplied. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/add.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/reg/add.c b/programs/reg/add.c index 258e3e8cb25..9aaa3fc1acc 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -154,18 +154,18 @@ static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, WCHAR *type, WCHAR separator, WCHAR *data, BOOL force) { HKEY hkey; - DWORD data_type, data_size; + DWORD dispos, data_type, data_size; BYTE *reg_data = NULL; LONG rc; if (RegCreateKeyExW(root, path, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_READ|KEY_WRITE, NULL, &hkey, NULL)) + KEY_READ|KEY_WRITE, NULL, &hkey, &dispos)) { output_message(STRING_ACCESS_DENIED); return 1; } - if (!force) + if (!force && dispos == REG_OPENED_EXISTING_KEY) { if (RegQueryValueExW(hkey, value_name, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) {

1 0

Zebediah Figura : ws2_32: Move getaddrinfo() and related functions to a separate file.
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: e30b16d738d90d2e9da44ff8557396ad78042174 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e30b16d738d90d2e9da44ff8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 30 19:09:58 2021 -0500 ws2_32: Move getaddrinfo() and related functions to a separate file. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/Makefile.in | 1 + dlls/ws2_32/protocol.c | 812 +++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/socket.c | 890 +------------------------------------------ dlls/ws2_32/ws2_32_private.h | 167 ++++++++ 4 files changed, 988 insertions(+), 882 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e30b16d738d90d2e9da4…

1 0