- wine-devel - winehq.org

[PATCH v2 5/6] win32u: Move NtUserPeekMessage implementation from user32.
by Jacek Caban 31 Mar '22

31 Mar '22

2 1

[PATCH v2 3/6] user32: Move unpack_message call to User32CallWindowProc.
by Jacek Caban 31 Mar '22

31 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Move even more logic to winproc.c. While this requires exposing more details to PE side (all those packed_* structs), it should make 32on64 easier later. It also fixes WM_COPYDATA (unrelated to above). dlls/user32/message.c | 412 +++-------------------------------- dlls/user32/winproc.c | 486 +++++++++++++++++++++++++++++++++++++++++- dlls/win32u/message.c | 2 + include/ntuser.h | 1 + 4 files changed, 511 insertions(+), 390 deletions(-)

2 1

[PATCH v2 2/6] win32u: Move reply_message_result implementation from user32.
by Jacek Caban 31 Mar '22

31 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 181 +----------------------- dlls/win32u/message.c | 264 +++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 9 ++ dlls/win32u/sysparams.c | 2 + dlls/win32u/win32u_private.h | 1 + include/ntuser.h | 153 ++++++++++++++++++++ 6 files changed, 431 insertions(+), 179 deletions(-)

2 1

[PATCH v2 1/6] user32: Introduce reply_message_result helper.
by Jacek Caban 31 Mar '22

31 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-)

2 1

[PATCH 5/5] wineoss: Move get_endpoint_ids to the unixlib.
by Huw Davies 31 Mar '22

31 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 251 ++++++++++-------------------------- dlls/wineoss.drv/oss.c | 206 +++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 19 +++ 3 files changed, 293 insertions(+), 183 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index e5206627528..fd35a439c5a 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -53,6 +53,7 @@ #include "wine/debug.h" #include "wine/list.h" +#include "wine/unicode.h" #include "wine/unixlib.h" #include "unixlib.h" @@ -147,11 +148,10 @@ typedef struct _SessionMgr { } SessionMgr; typedef struct _OSSDevice { + struct list entry; EDataFlow flow; - char devnode[OSS_DEVNODE_SIZE]; GUID guid; - - struct list entry; + char devnode[0]; } OSSDevice; static struct list g_devices = LIST_INIT(g_devices); @@ -346,25 +346,6 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) RegCloseKey(key); } -/* dst must be large enough to hold devnode */ -static void oss_clean_devnode(char *dest, const char *devnode) -{ - const char *dot, *slash; - size_t len; - - strcpy(dest, devnode); - dot = strrchr(dest, '.'); - if(!dot) - return; - - slash = strrchr(dest, '/'); - if(slash && dot < slash) - return; - - len = dot - dest; - dest[len] = '\0'; -} - static int open_device(const char *device, EDataFlow flow) { int flags = ((flow == eRender) ? O_WRONLY : O_RDONLY) | O_NONBLOCK; @@ -372,44 +353,6 @@ static int open_device(const char *device, EDataFlow flow) return open(device, flags, 0); } -static UINT get_default_index(EDataFlow flow) -{ - int fd = -1, err; - UINT i; - oss_audioinfo ai; - char devnode[OSS_DEVNODE_SIZE]; - OSSDevice *dev_item; - - fd = open_device("/dev/dsp", flow); - if(fd < 0){ - WARN("Couldn't open default device!\n"); - return 0; - } - - ai.dev = -1; - if((err = ioctl(fd, SNDCTL_ENGINEINFO, &ai)) < 0){ - WARN("SNDCTL_ENGINEINFO failed: %d (%s)\n", err, strerror(errno)); - close(fd); - return 0; - } - - close(fd); - - TRACE("Default devnode: %s\n", ai.devnode); - oss_clean_devnode(devnode, ai.devnode); - i = 0; - LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry){ - if(dev_item->flow == flow){ - if(!strcmp(devnode, dev_item->devnode)) - return i; - ++i; - } - } - - WARN("Couldn't find default device! Choosing first.\n"); - return 0; -} - static const OSSDevice *get_ossdevice_from_guid(const GUID *guid) { OSSDevice *dev_item; @@ -419,138 +362,80 @@ static const OSSDevice *get_ossdevice_from_guid(const GUID *guid) return NULL; } -HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, - UINT *num, UINT *def_index) +static void device_add(OSSDevice *oss_dev) { - int i, mixer_fd; - oss_sysinfo sysinfo; - static int print_once = 0; + if(get_ossdevice_from_guid(&oss_dev->guid)) /* already in list */ + HeapFree(GetProcessHeap(), 0, oss_dev); + else + list_add_tail(&g_devices, &oss_dev->entry); +} - static const WCHAR outW[] = {'O','u','t',':',' ',0}; - static const WCHAR inW[] = {'I','n',':',' ',0}; +HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out, + UINT *num, UINT *def_index) +{ + struct get_endpoint_ids_params params; + GUID *guids = NULL; + WCHAR **ids = NULL; + unsigned int i; TRACE("%d %p %p %p %p\n", flow, ids, guids, num, def_index); - mixer_fd = open("/dev/mixer", O_RDONLY, 0); - if(mixer_fd < 0){ - ERR("OSS /dev/mixer doesn't seem to exist\n"); - return AUDCLNT_E_SERVICE_NOT_RUNNING; - } - - if(ioctl(mixer_fd, SNDCTL_SYSINFO, &sysinfo) < 0){ - close(mixer_fd); - - if(errno == EINVAL){ - ERR("OSS version too old, need at least OSSv4\n"); - return AUDCLNT_E_SERVICE_NOT_RUNNING; - } - - ERR("Error getting SNDCTL_SYSINFO: %d (%s)\n", errno, strerror(errno)); - return E_FAIL; - } - - if(!print_once){ - TRACE("OSS sysinfo:\n"); - TRACE("product: %s\n", sysinfo.product); - TRACE("version: %s\n", sysinfo.version); - TRACE("versionnum: %x\n", sysinfo.versionnum); - TRACE("numaudios: %d\n", sysinfo.numaudios); - TRACE("nummixers: %d\n", sysinfo.nummixers); - TRACE("numcards: %d\n", sysinfo.numcards); - TRACE("numaudioengines: %d\n", sysinfo.numaudioengines); - print_once = 1; - } - - if(sysinfo.numaudios <= 0){ - WARN("No audio devices!\n"); - close(mixer_fd); - return AUDCLNT_E_SERVICE_NOT_RUNNING; - } - - *ids = HeapAlloc(GetProcessHeap(), 0, sysinfo.numaudios * sizeof(WCHAR *)); - *guids = HeapAlloc(GetProcessHeap(), 0, sysinfo.numaudios * sizeof(GUID)); - - *num = 0; - for(i = 0; i < sysinfo.numaudios; ++i){ - oss_audioinfo ai = {0}; - char devnode[OSS_DEVNODE_SIZE]; - OSSDevice *dev_item; - int fd; - - ai.dev = i; - if(ioctl(mixer_fd, SNDCTL_AUDIOINFO, &ai) < 0){ - WARN("Error getting AUDIOINFO for dev %d: %d (%s)\n", i, errno, - strerror(errno)); - continue; - } - - oss_clean_devnode(devnode, ai.devnode); - - /* check for duplicates */ - LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry){ - if(dev_item->flow == flow && !strcmp(devnode, dev_item->devnode)) - break; + params.flow = flow; + params.size = 1000; + params.endpoints = NULL; + do{ + HeapFree(GetProcessHeap(), 0, params.endpoints); + params.endpoints = HeapAlloc(GetProcessHeap(), 0, params.size); + OSS_CALL(get_endpoint_ids, &params); + }while(params.result == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)); + + if(FAILED(params.result)) goto end; + + ids = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, params.num * sizeof(*ids)); + guids = HeapAlloc(GetProcessHeap(), 0, params.num * sizeof(*guids)); + if(!ids || !guids){ + params.result = E_OUTOFMEMORY; + goto end; + } + + for(i = 0; i < params.num; i++){ + unsigned int name_size = (strlenW(params.endpoints[i].name) + 1) * sizeof(WCHAR); + unsigned int dev_size = strlen(params.endpoints[i].device) + 1; + OSSDevice *oss_dev; + + ids[i] = HeapAlloc(GetProcessHeap(), 0, name_size); + oss_dev = HeapAlloc(GetProcessHeap(), 0, offsetof(OSSDevice, devnode[dev_size])); + if(!ids[i] || !oss_dev){ + HeapFree(GetProcessHeap, 0, oss_dev); + params.result = E_OUTOFMEMORY; + goto end; } - if(&dev_item->entry != &g_devices) - continue; - - fd = open_device(devnode, flow); - if(fd < 0){ - WARN("Opening device \"%s\" failed, pretending it doesn't exist: %d (%s)\n", - devnode, errno, strerror(errno)); - continue; - } - close(fd); - - if((flow == eCapture && (ai.caps & PCM_CAP_INPUT)) || - (flow == eRender && (ai.caps & PCM_CAP_OUTPUT))){ - size_t len, prefix_len; - const WCHAR *prefix; - - dev_item = HeapAlloc(GetProcessHeap(), 0, sizeof(*dev_item)); - - dev_item->flow = flow; - get_device_guid(flow, devnode, &dev_item->guid); - strcpy(dev_item->devnode, devnode); - - (*guids)[*num] = dev_item->guid; - - len = MultiByteToWideChar(CP_UNIXCP, 0, ai.name, -1, NULL, 0); - if(flow == eRender){ - prefix = outW; - prefix_len = ARRAY_SIZE(outW) - 1; - len += prefix_len; - }else{ - prefix = inW; - prefix_len = ARRAY_SIZE(inW) - 1; - len += prefix_len; - } - (*ids)[*num] = HeapAlloc(GetProcessHeap(), 0, - len * sizeof(WCHAR)); - if(!(*ids)[*num]){ - for(i = 0; i < *num; ++i) - HeapFree(GetProcessHeap(), 0, (*ids)[i]); - HeapFree(GetProcessHeap(), 0, *ids); - HeapFree(GetProcessHeap(), 0, *guids); - HeapFree(GetProcessHeap(), 0, dev_item); - close(mixer_fd); - return E_OUTOFMEMORY; - } - memcpy((*ids)[*num], prefix, prefix_len * sizeof(WCHAR)); - MultiByteToWideChar(CP_UNIXCP, 0, ai.name, -1, - (*ids)[*num] + prefix_len, len - prefix_len); - - list_add_tail(&g_devices, &dev_item->entry); - - (*num)++; + memcpy(ids[i], params.endpoints[i].name, name_size); + get_device_guid(flow, params.endpoints[i].device, guids + i); + + oss_dev->flow = flow; + oss_dev->guid = guids[i]; + memcpy(oss_dev->devnode, params.endpoints[i].device, dev_size); + device_add(oss_dev); + } + *def_index = params.default_idx; + +end: + HeapFree(GetProcessHeap(), 0, params.endpoints); + if(FAILED(params.result)){ + HeapFree(GetProcessHeap(), 0, guids); + if(ids){ + for(i = 0; i < params.num; i++) + HeapFree(GetProcessHeap(), 0, ids[i]); + HeapFree(GetProcessHeap(), 0, ids); } + }else{ + *ids_out = ids; + *guids_out = guids; + *num = params.num; } - close(mixer_fd); - - *def_index = get_default_index(flow); - - return S_OK; + return params.result; } HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 9c1de25acb5..ae4e4981d2d 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -29,11 +29,13 @@ #include <sys/ioctl.h> #include <fcntl.h> #include <unistd.h> +#include <errno.h> #include <sys/soundcard.h> #include "ntstatus.h" #define WIN32_NO_STATUS #include "winternl.h" +#include "audioclient.h" #include "wine/debug.h" #include "wine/unixlib.h" @@ -88,7 +90,211 @@ static NTSTATUS test_connect(void *args) return STATUS_SUCCESS; } +/* dst must be large enough to hold devnode */ +static void oss_clean_devnode(char *dest, const char *devnode) +{ + const char *dot, *slash; + size_t len; + + strcpy(dest, devnode); + dot = strrchr(dest, '.'); + if(!dot) + return; + + slash = strrchr(dest, '/'); + if(slash && dot < slash) + return; + + len = dot - dest; + dest[len] = '\0'; +} + +static int open_device(const char *device, EDataFlow flow) +{ + int flags = ((flow == eRender) ? O_WRONLY : O_RDONLY) | O_NONBLOCK; + + return open(device, flags, 0); +} + +static void get_default_device(EDataFlow flow, char device[OSS_DEVNODE_SIZE]) +{ + int fd, err; + oss_audioinfo ai; + + device[0] = '\0'; + fd = open_device("/dev/dsp", flow); + if(fd < 0){ + WARN("Couldn't open default device!\n"); + return; + } + + ai.dev = -1; + if((err = ioctl(fd, SNDCTL_ENGINEINFO, &ai)) < 0){ + WARN("SNDCTL_ENGINEINFO failed: %d (%s)\n", err, strerror(errno)); + close(fd); + return; + } + close(fd); + + TRACE("Default devnode: %s\n", ai.devnode); + oss_clean_devnode(device, ai.devnode); + return; +} + +static NTSTATUS get_endpoint_ids(void *args) +{ + struct get_endpoint_ids_params *params = args; + oss_sysinfo sysinfo; + static int print_once = 0; + static const WCHAR outW[] = {'O','u','t',':',' ',0}; + static const WCHAR inW[] = {'I','n',':',' ',0}; + struct endpoint_info + { + WCHAR name[OSS_DEVNAME_SIZE + ARRAY_SIZE(outW)]; + char device[OSS_DEVNODE_SIZE]; + } *info; + unsigned int i, j, num, needed, name_len, device_len, default_idx = 0; + char default_device[OSS_DEVNODE_SIZE]; + struct endpoint *endpoint; + int mixer_fd; + char *ptr; + + mixer_fd = open("/dev/mixer", O_RDONLY, 0); + if(mixer_fd < 0){ + ERR("OSS /dev/mixer doesn't seem to exist\n"); + params->result = AUDCLNT_E_SERVICE_NOT_RUNNING; + return STATUS_SUCCESS; + } + + if(ioctl(mixer_fd, SNDCTL_SYSINFO, &sysinfo) < 0){ + close(mixer_fd); + if(errno == EINVAL){ + ERR("OSS version too old, need at least OSSv4\n"); + params->result = AUDCLNT_E_SERVICE_NOT_RUNNING; + return STATUS_SUCCESS; + } + + ERR("Error getting SNDCTL_SYSINFO: %d (%s)\n", errno, strerror(errno)); + params->result = E_FAIL; + return STATUS_SUCCESS; + } + + if(!print_once){ + TRACE("OSS sysinfo:\n"); + TRACE("product: %s\n", sysinfo.product); + TRACE("version: %s\n", sysinfo.version); + TRACE("versionnum: %x\n", sysinfo.versionnum); + TRACE("numaudios: %d\n", sysinfo.numaudios); + TRACE("nummixers: %d\n", sysinfo.nummixers); + TRACE("numcards: %d\n", sysinfo.numcards); + TRACE("numaudioengines: %d\n", sysinfo.numaudioengines); + print_once = 1; + } + + if(sysinfo.numaudios <= 0){ + WARN("No audio devices!\n"); + close(mixer_fd); + params->result = AUDCLNT_E_SERVICE_NOT_RUNNING; + return STATUS_SUCCESS; + } + + info = malloc(sysinfo.numaudios * sizeof(*info)); + if(!info){ + close(mixer_fd); + params->result = E_OUTOFMEMORY; + return STATUS_SUCCESS; + } + + get_default_device(params->flow, default_device); + + num = 0; + for(i = 0; i < sysinfo.numaudios; ++i){ + oss_audioinfo ai = {0}; + char devnode[OSS_DEVNODE_SIZE]; + int fd, prefix_len; + const WCHAR *prefix; + + ai.dev = i; + if(ioctl(mixer_fd, SNDCTL_AUDIOINFO, &ai) < 0){ + WARN("Error getting AUDIOINFO for dev %d: %d (%s)\n", i, errno, + strerror(errno)); + continue; + } + + oss_clean_devnode(devnode, ai.devnode); + + /* check for duplicates */ + for(j = 0; j < num; j++) + if(!strcmp(devnode, info[j].device)) + break; + if(j < num) + continue; + + fd = open_device(devnode, params->flow); + if(fd < 0){ + WARN("Opening device \"%s\" failed, pretending it doesn't exist: %d (%s)\n", + devnode, errno, strerror(errno)); + continue; + } + close(fd); + + if((params->flow == eCapture && !(ai.caps & PCM_CAP_INPUT)) || + (params->flow == eRender && !(ai.caps & PCM_CAP_OUTPUT))) + continue; + + strcpy(info[num].device, devnode); + + if(params->flow == eRender){ + prefix = outW; + prefix_len = ARRAY_SIZE(outW) - 1; + }else{ + prefix = inW; + prefix_len = ARRAY_SIZE(inW) - 1; + } + memcpy(info[num].name, prefix, prefix_len * sizeof(WCHAR)); + ntdll_umbstowcs(ai.name, strlen(ai.name) + 1, info[num].name + prefix_len, + ARRAY_SIZE(info[num].name) - prefix_len); + if(!strcmp(default_device, info[num].device)) + default_idx = num; + num++; + } + close(mixer_fd); + + needed = num * sizeof(*params->endpoints); + endpoint = params->endpoints; + ptr = (char *)(endpoint + num); + + for(i = 0; i < num; i++){ + name_len = wcslen(info[i].name) + 1; + device_len = strlen(info[i].device) + 1; + needed += name_len * sizeof(WCHAR) + ((device_len + 1) & ~1); + + if(needed <= params->size){ + endpoint->name = (WCHAR *)ptr; + memcpy(endpoint->name, info[i].name, name_len * sizeof(WCHAR)); + ptr += name_len * sizeof(WCHAR); + endpoint->device = ptr; + memcpy(endpoint->device, info[i].device, device_len); + ptr += (device_len + 1) & ~1; + endpoint++; + } + } + free(info); + + params->num = num; + params->default_idx = default_idx; + + if(needed > params->size){ + params->size = needed; + params->result = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } else + params->result = S_OK; + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { test_connect, + get_endpoint_ids, }; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index d4fb5db3102..1a80794f150 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mmdeviceapi.h" + /* From <dlls/mmdevapi/mmdevapi.h> */ enum DriverPriority { @@ -30,9 +32,26 @@ struct test_connect_params enum DriverPriority priority; }; +struct endpoint +{ + WCHAR *name; + char *device; +}; + +struct get_endpoint_ids_params +{ + EDataFlow flow; + struct endpoint *endpoints; + unsigned int size; + HRESULT result; + unsigned int num; + unsigned int default_idx; +}; + enum oss_funcs { oss_test_connect, + oss_get_endpoint_ids, }; extern unixlib_handle_t oss_handle; -- 2.25.1

1 1

[PATCH v9 1/7] include: Add wdscore.h file.
by Mohamad Al-Jaf 31 Mar '22

31 Mar '22

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- The functions CurrentIP and ConstructPartialMsgV[A/W] are used by other Windows libraries including kernelbase. --- include/Makefile.in | 1 + include/wdscore.h | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 include/wdscore.h diff --git a/include/Makefile.in b/include/Makefile.in index 189b4676091..5b77d5b47c5 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -755,6 +755,7 @@ SOURCES = \ wbemdisp.idl \ wbemprov.idl \ wct.h \ + wdscore.h \ weakreference.idl \ webservices.h \ werapi.h \ diff --git a/include/wdscore.h b/include/wdscore.h new file mode 100644 index 00000000000..8888247e347 --- /dev/null +++ b/include/wdscore.h @@ -0,0 +1,32 @@ +/* + * Copyright 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WDSCORE__ +#define __WDSCORE__ + +#ifdef __cplusplus +extern "C" { +#endif + +LPVOID CurrentIP(void); + +#ifdef __cplusplus +} +#endif + +#endif /* __WDSCORE__ */ -- 2.35.1

1 7

[PATCH v3] winex11.drv: call XIMReset on CPS_COMPLETE
by Alex Kwak 31 Mar '22

31 Mar '22

The composition on the IME message is end, but the XIM string is in-composition state, and the same string remains on the XIM afterwards. so, call X11DRV_ForceXIMReset and finish composition state in the XIM. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52754 Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- v2: When XmbResetIC is called and KeyEvent occurs, it is a problem with some IME (i.e., ibus-hangul). v3: implement X11DRV_FindXIC(..) for getting exists XIC. --- dlls/winex11.drv/ime.c | 2 ++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xim.c | 31 +++++++++++++++++++++++++++++-- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index c1584930861..2fe78234671 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -753,6 +753,8 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) myPrivate->bInComposition = FALSE; ImmUnlockIMCC(lpIMC->hPrivate); + X11DRV_ForceXIMReset(lpIMC->hWnd); + bRet = TRUE; } break; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f389f3e0836..de882a532f3 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -827,6 +827,7 @@ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; extern XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) DECLSPEC_HIDDEN; extern void X11DRV_SetupXIM(void) DECLSPEC_HIDDEN; extern void X11DRV_XIMLookupChars( const char *str, DWORD count ) DECLSPEC_HIDDEN; +XIC X11DRV_FindXIC(HWND hwnd) DECLSPEC_HIDDEN; extern void X11DRV_ForceXIMReset(HWND hwnd) DECLSPEC_HIDDEN; extern void X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 3994c2106cc..7a4ec432bbf 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -249,9 +249,36 @@ static void XIMPreEditCaretCallback(XIC ic, XPointer client_data, TRACE("Finished\n"); } +/** + * X11DRV_FindXIC + * + * This function finds the already created XIC in itself and parents. + * If only the specified handle is get via X11DRV_get_ic, the XIC can be exists + * in the parents and cannot be get. + */ +XIC X11DRV_FindXIC(HWND hwnd) +{ + HWND hwndParent = hwnd; + XIC ic; + if (!hwndParent) + return NULL; + for (;;) + { + ic = get_win_data( hwndParent )->xic; + if (ic) + break; + else + hwndParent = GetParent(hwnd); + + if (!hwndParent) + return NULL; + } + return ic; +} + void X11DRV_ForceXIMReset(HWND hwnd) { - XIC ic = X11DRV_get_ic(hwnd); + XIC ic = X11DRV_FindXIC(hwnd); if (ic) { char* leftover; @@ -267,7 +294,7 @@ void X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen) XIMPreeditState state; XVaNestedList attr; - ic = X11DRV_get_ic(hwnd); + ic = X11DRV_FindXIC(hwnd); if (!ic) return; -- 2.32.0

1 0

[PATCH v2] winex11.drv: call XIMReset on CPS_COMPLETE
by Alex Kwak 31 Mar '22

31 Mar '22

The composition on the IME message is end, but the XIM string is in-composition state, and the same string remains on the XIM afterwards. so, call X11DRV_ForceXIMReset and finish composition state in the XIM. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52754 Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- v2: When XmbResetIC is called and KeyEvent occurs, it is a problem with some IME (i.e., ibus-hangul). --- dlls/winex11.drv/ime.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index c1584930861..f44b50550ec 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -704,6 +704,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) { case CPS_COMPLETE: { + HWND hwnd; HIMCC newCompStr; DWORD cplen = 0; LPWSTR cpstr; @@ -753,6 +754,12 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) myPrivate->bInComposition = FALSE; ImmUnlockIMCC(lpIMC->hPrivate); + hwnd = GetActiveWindow(); + if (hwnd) + { + X11DRV_ForceXIMReset(hwnd); + } + bRet = TRUE; } break; -- 2.32.0

1 0

[PATCH v2] riched20: Send CPS_COMPLETE from mouse click event.
by Alex Kwak 31 Mar '22

31 Mar '22

When IME is in the Composition state and trying to move cursor, the composition string in the IME is inserted wrong places in next keyboard event. so, notify IME that composition has been completed and handle events related to click buttons after completing IME operations. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52754 Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- v2: Initialize imeStartIndex with -1 on ME_MakeEditor. --- dlls/riched20/editor.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a8cf3175591..ff6edfc145f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -243,6 +243,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); static BOOL ME_UpdateLinkAttribute(ME_TextEditor *editor, ME_Cursor *start, int nChars); +static BOOL ME_NotifyIMECPSComplete(ME_TextEditor *editor); HINSTANCE dll_instance = NULL; BOOL me_debug = FALSE; @@ -3045,6 +3046,8 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->back_style = TXTBACK_OPAQUE; ITextHost_TxGetBackStyle( ed->texthost, &ed->back_style ); + ed->imeStartIndex = -1; + list_init( &ed->reobj_list ); OleInitialize(NULL); @@ -3888,6 +3891,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_LBUTTONDOWN: { ME_CommitUndo(editor); /* End coalesced undos for typed characters */ + ME_NotifyIMECPSComplete(editor); ITextHost_TxSetFocus(editor->texthost); ME_LButtonDown(editor, (short)LOWORD(lParam), (short)HIWORD(lParam), ME_CalculateClickCount(editor, msg, wParam, lParam)); @@ -3918,6 +3922,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_RBUTTONDOWN: case WM_RBUTTONDBLCLK: ME_CommitUndo(editor); /* End coalesced undos for typed characters */ + ME_NotifyIMECPSComplete(editor); link_notify( editor, msg, wParam, lParam ); goto do_default; case WM_CONTEXTMENU: @@ -4549,3 +4554,20 @@ static BOOL ME_UpdateLinkAttribute(ME_TextEditor *editor, ME_Cursor *start, int } while (nChars > 0); return modified; } + +static BOOL ME_NotifyIMECPSComplete(ME_TextEditor *editor) +{ + if (editor->imeStartIndex >= 0) + { + HIMC hIMC = ITextHost_TxImmGetContext(editor->texthost); + if (hIMC) + { + ME_DeleteSelection(editor); + editor->imeStartIndex = ME_GetCursorOfs(&editor->pCursors[0]); + ImmNotifyIME(hIMC, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); + ITextHost_TxImmReleaseContext(editor->texthost, hIMC); + return TRUE; + } + } + return FALSE; +} -- 2.32.0

1 0

[PATCH] winex11.drv: call XIMReset on CPS_COMPLETE
by Alex Kwak 31 Mar '22

31 Mar '22

The composition on the IME message is end, but the XIM string is in-composition state, and the same string remains on the XIM afterwards. so, call X11DRV_ForceXIMReset and finish composition state in the XIM. When XmbResetIC is performed in the composition state, a KeyEvent is generated to empty the existing buffer. However, Wine directly manages the Composition state, so the following strings are unnecessary. so, ignore it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52754 Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- dlls/winex11.drv/ime.c | 1 + dlls/winex11.drv/xim.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index c1584930861..69ab2e4e850 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -752,6 +752,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) myPrivate->bInComposition = FALSE; ImmUnlockIMCC(lpIMC->hPrivate); + X11DRV_ForceXIMReset(lpIMC->hWnd); bRet = TRUE; } diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 3994c2106cc..098a520e629 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -44,6 +44,7 @@ BOOL ximInComposeMode=FALSE; static DWORD dwCompStringLength = 0; static LPBYTE CompositionString = NULL; static DWORD dwCompStringSize = 0; +static BOOL ignoreNextLookupChars = FALSE; #define STYLE_OFFTHESPOT (XIMPreeditArea | XIMStatusArea) #define STYLE_OVERTHESPOT (XIMPreeditPosition | XIMStatusNothing) @@ -106,6 +107,12 @@ void X11DRV_XIMLookupChars( const char *str, DWORD count ) TRACE("%p %u\n", str, count); + if (ignoreNextLookupChars) + { + ignoreNextLookupChars = FALSE; + return; + } + dwOutput = MultiByteToWideChar(CP_UNIXCP, 0, str, count, NULL, 0); wcOutput = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * dwOutput); if (wcOutput == NULL) @@ -255,8 +262,20 @@ void X11DRV_ForceXIMReset(HWND hwnd) if (ic) { char* leftover; + BOOL bInCompose = ximInComposeMode; + TRACE("Forcing Reset %p\n",ic); leftover = XmbResetIC(ic); + + /* + * When Reset is performed in the composition state, a KeyEvent is + * generated to empty the existing buffer. + * + * However, Wine directly manages the Composition state, so the + * following strings are unnecessary. + */ + ignoreNextLookupChars = bInCompose && leftover; + XFree(leftover); } } -- 2.32.0

1 0

[PATCH] riched20: Send CPS_COMPLETE from mouse click event.
by Alex Kwak 31 Mar '22

31 Mar '22

When IME is in the Composition state and trying to move cursor, the composition string in the IME is inserted wrong places in next keyboard event. so, notify IME that composition has been completed and handle events related to click buttons after completing IME operations. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52754 Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- dlls/riched20/editor.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a8cf3175591..f8b28bfaef0 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -243,6 +243,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); static BOOL ME_UpdateLinkAttribute(ME_TextEditor *editor, ME_Cursor *start, int nChars); +static BOOL ME_NotifyIMECPSComplete(ME_TextEditor *editor); HINSTANCE dll_instance = NULL; BOOL me_debug = FALSE; @@ -3888,6 +3889,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_LBUTTONDOWN: { ME_CommitUndo(editor); /* End coalesced undos for typed characters */ + ME_NotifyIMECPSComplete(editor); ITextHost_TxSetFocus(editor->texthost); ME_LButtonDown(editor, (short)LOWORD(lParam), (short)HIWORD(lParam), ME_CalculateClickCount(editor, msg, wParam, lParam)); @@ -3918,6 +3920,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_RBUTTONDOWN: case WM_RBUTTONDBLCLK: ME_CommitUndo(editor); /* End coalesced undos for typed characters */ + ME_NotifyIMECPSComplete(editor); link_notify( editor, msg, wParam, lParam ); goto do_default; case WM_CONTEXTMENU: @@ -4549,3 +4552,20 @@ static BOOL ME_UpdateLinkAttribute(ME_TextEditor *editor, ME_Cursor *start, int } while (nChars > 0); return modified; } + +static BOOL ME_NotifyIMECPSComplete(ME_TextEditor *editor) +{ + if (editor->imeStartIndex >= 0) + { + HIMC hIMC = ITextHost_TxImmGetContext(editor->texthost); + if (hIMC) + { + ME_DeleteSelection(editor); + editor->imeStartIndex = ME_GetCursorOfs(&editor->pCursors[0]); + ImmNotifyIME(hIMC, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); + ITextHost_TxImmReleaseContext(editor->texthost, hIMC); + return TRUE; + } + } + return FALSE; +} -- 2.32.0

2 1

[PATCH] include: Add more URL_* flags.
by Zebediah Figura 30 Mar '22

30 Mar '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/shlwapi.h | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/include/shlwapi.h b/include/shlwapi.h index a282ae6d993..6149c7081a3 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -648,28 +648,34 @@ typedef enum { /* The following are used by UrlEscape..., UrlUnEscape..., * UrlCanonicalize..., and UrlCombine... routines */ -#define URL_WININET_COMPATIBILITY 0x80000000 -#define URL_PLUGGABLE_PROTOCOL 0x40000000 -#define URL_ESCAPE_UNSAFE 0x20000000 -#define URL_UNESCAPE 0x10000000 +#define URL_WININET_COMPATIBILITY 0x80000000 +#define URL_PLUGGABLE_PROTOCOL 0x40000000 +#define URL_ESCAPE_UNSAFE 0x20000000 +#define URL_UNESCAPE 0x10000000 -#define URL_DONT_SIMPLIFY 0x08000000 -#define URL_NO_META URL_DONT_SIMPLIFY -#define URL_ESCAPE_SPACES_ONLY 0x04000000 -#define URL_DONT_ESCAPE_EXTRA_INFO 0x02000000 -#define URL_DONT_UNESCAPE_EXTRA_INFO URL_DONT_ESCAPE_EXTRA_INFO -#define URL_BROWSER_MODE URL_DONT_ESCAPE_EXTRA_INFO +#define URL_DONT_SIMPLIFY 0x08000000 +#define URL_ESCAPE_SPACES_ONLY 0x04000000 +#define URL_DONT_ESCAPE_EXTRA_INFO 0x02000000 -#define URL_INTERNAL_PATH 0x00800000 /* Will escape #'s in paths */ -#define URL_UNESCAPE_HIGH_ANSI_ONLY 0x00400000 -#define URL_CONVERT_IF_DOSPATH 0x00200000 -#define URL_UNESCAPE_INPLACE 0x00100000 +#define URL_INTERNAL_PATH 0x00800000 +#define URL_UNESCAPE_HIGH_ANSI_ONLY 0x00400000 +#define URL_CONVERT_IF_DOSPATH 0x00200000 +#define URL_UNESCAPE_INPLACE 0x00100000 -#define URL_FILE_USE_PATHURL 0x00010000 -#define URL_ESCAPE_AS_UTF8 0x00040000 +#define URL_ESCAPE_ASCII_URI_COMPONENT 0x00080000 +#define URL_ESCAPE_AS_UTF8 0x00040000 +#define URL_DONT_UNESCAPE 0x00020000 +#define URL_FILE_USE_PATHURL 0x00010000 -#define URL_ESCAPE_SEGMENT_ONLY 0x00002000 -#define URL_ESCAPE_PERCENT 0x00001000 +#define URL_ESCAPE_SEGMENT_ONLY 0x00002000 +#define URL_ESCAPE_PERCENT 0x00001000 + +#define URL_BROWSER_MODE URL_DONT_ESCAPE_EXTRA_INFO +#define URL_DONT_UNESCAPE_EXTRA_INFO URL_DONT_ESCAPE_EXTRA_INFO +#define URL_ESCAPE_URI_COMPONENT (URL_ESCAPE_ASCII_URI_COMPONENT | URL_ESCAPE_AS_UTF8) +#define URL_NO_META URL_DONT_SIMPLIFY +#define URL_UNESCAPE_AS_UTF8 URL_ESCAPE_AS_UTF8 +#define URL_UNESCAPE_URI_COMPONENT URL_UNESCAPE_AS_UTF8 HRESULT WINAPI UrlApplySchemeA(LPCSTR,LPSTR,LPDWORD,DWORD); HRESULT WINAPI UrlApplySchemeW(LPCWSTR,LPWSTR,LPDWORD,DWORD); -- 2.34.1

1 0

[PATCH v2 1/5] windows.media.speech: Add IVector<Inspectable*>.
by Bernhard Kölbl 30 Mar '22

30 Mar '22

And use it in recognizer. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- v2: Add C asserts for flexible arrays. --- dlls/windows.media.speech/private.h | 6 + dlls/windows.media.speech/recognizer.c | 21 +- dlls/windows.media.speech/vector.c | 279 +++++++++++++++++++++++++ 3 files changed, 305 insertions(+), 1 deletion(-) diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h index 3c8371ccdbe..348c060c1c6 100644 --- a/dlls/windows.media.speech/private.h +++ b/dlls/windows.media.speech/private.h @@ -61,6 +61,11 @@ extern IActivationFactory *synthesizer_factory; +struct vector_iids +{ + const GUID *vector; +}; + HRESULT typed_event_handlers_append( struct list *list, ITypedEventHandler_IInspectable_IInspectable *handler, EventRegistrationToken *token ); HRESULT typed_event_handlers_remove( struct list *list, EventRegistrationToken *token ); HRESULT typed_event_handlers_notify( struct list *list, IInspectable *sender, IInspectable *args ); @@ -68,6 +73,7 @@ HRESULT typed_event_handlers_clear( struct list* list ); HRESULT vector_hstring_create( IVector_HSTRING **out ); HRESULT vector_hstring_create_copy( IIterable_HSTRING *iterable, IVector_HSTRING **out ); +HRESULT vector_inspectable_create( const struct vector_iids *iids, IVector_IInspectable **out ); #define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ static inline impl_type *impl_from( iface_type *iface ) \ diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index da219d6bd0a..e552779937b 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -233,6 +233,7 @@ struct recognizer LONG ref; ISpeechContinuousRecognitionSession *session; + IVector_ISpeechRecognitionConstraint *constraints; }; /* @@ -296,6 +297,7 @@ static ULONG WINAPI recognizer_Release( ISpeechRecognizer *iface ) if (!ref) { ISpeechContinuousRecognitionSession_Release(impl->session); + IVector_ISpeechRecognitionConstraint_Release(impl->constraints); free(impl); } @@ -637,13 +639,22 @@ static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface { struct recognizer *impl; struct session *session; + struct vector_iids constraints_iids = + { + .vector = &IID_IVector_ISpeechRecognitionConstraint, + }; + HRESULT hr; TRACE("iface %p, language %p, speechrecognizer %p.\n", iface, language, speechrecognizer); *speechrecognizer = NULL; if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; - if (!(session = calloc(1, sizeof(*session)))) return E_OUTOFMEMORY; + if (!(session = calloc(1, sizeof(*session)))) + { + hr = E_OUTOFMEMORY; + goto error; + } if (language) FIXME("language parameter unused. Stub!\n"); @@ -658,11 +669,19 @@ static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface impl->ISpeechRecognizer2_iface.lpVtbl = &speech_recognizer2_vtbl; impl->session = &session->ISpeechContinuousRecognitionSession_iface; impl->ref = 1; + if (FAILED(hr = vector_inspectable_create(&constraints_iids, (IVector_IInspectable**)&impl->constraints))) + goto error; TRACE("created SpeechRecognizer %p.\n", impl); *speechrecognizer = &impl->ISpeechRecognizer_iface; return S_OK; + +error: + free(session); + free(impl); + + return hr; } static const struct ISpeechRecognizerFactoryVtbl speech_recognizer_factory_vtbl = diff --git a/dlls/windows.media.speech/vector.c b/dlls/windows.media.speech/vector.c index fcb7f483e03..e3a802fc020 100644 --- a/dlls/windows.media.speech/vector.c +++ b/dlls/windows.media.speech/vector.c @@ -771,3 +771,282 @@ error: IVector_HSTRING_Release(*out); return hr; } + +/* + * + * IVector<Inspectable*> + * + */ + +struct vector_inspectable +{ + IVector_IInspectable IVector_IInspectable_iface; + struct vector_iids iids; + LONG ref; + + UINT32 size; + UINT32 capacity; + IInspectable **elements; +}; + +static inline struct vector_inspectable *impl_from_IVector_IInspectable( IVector_IInspectable *iface ) +{ + return CONTAINING_RECORD(iface, struct vector_inspectable, IVector_IInspectable_iface); +} + +static HRESULT WINAPI vector_inspectable_QueryInterface( IVector_IInspectable *iface, REFIID iid, void **out ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, impl->iids.vector)) + { + IInspectable_AddRef((*out = &impl->IVector_IInspectable_iface)); + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI vector_inspectable_AddRef( IVector_IInspectable *iface ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p increasing refcount to %lu.\n", iface, ref); + return ref; +} + +static ULONG WINAPI vector_inspectable_Release( IVector_IInspectable *iface ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + + TRACE("iface %p decreasing refcount to %lu.\n", iface, ref); + + if (!ref) + { + IVector_IInspectable_Clear(iface); + free(impl); + } + + return ref; +} + +static HRESULT WINAPI vector_inspectable_GetIids( IVector_IInspectable *iface, ULONG *iid_count, IID **iids ) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_inspectable_GetRuntimeClassName( IVector_IInspectable *iface, HSTRING *class_name ) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_inspectable_GetTrustLevel( IVector_IInspectable *iface, TrustLevel *trust_level ) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_inspectable_GetAt( IVector_IInspectable *iface, UINT32 index, IInspectable **value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, index %u, value %p.\n", iface, index, value); + + *value = NULL; + if (index >= impl->size) return E_BOUNDS; + + IInspectable_AddRef((*value = impl->elements[index])); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_get_Size( IVector_IInspectable *iface, UINT32 *value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + TRACE("iface %p, value %p.\n", iface, value); + *value = impl->size; + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_GetView( IVector_IInspectable *iface, IVectorView_IInspectable **value ) +{ + FIXME("iface %p, value %p stub!\n", iface, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_inspectable_IndexOf( IVector_IInspectable *iface, + IInspectable *element, UINT32 *index, BOOLEAN *found ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + ULONG i; + + TRACE("iface %p, element %p, index %p, found %p.\n", iface, element, index, found); + + for (i = 0; i < impl->size; ++i) if (impl->elements[i] == element) break; + if ((*found = (i < impl->size))) *index = i; + else *index = 0; + + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_SetAt( IVector_IInspectable *iface, UINT32 index, IInspectable *value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, index %u, value %p.\n", iface, index, value); + + if (index >= impl->size) return E_BOUNDS; + IInspectable_Release(impl->elements[index]); + IInspectable_AddRef((impl->elements[index] = value)); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_InsertAt( IVector_IInspectable *iface, UINT32 index, IInspectable *value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + IInspectable **tmp = impl->elements; + + TRACE("iface %p, index %u, value %p.\n", iface, index, value); + + if (impl->size == impl->capacity) + { + impl->capacity = max(32, impl->capacity * 3 / 2); + if (!(impl->elements = realloc(impl->elements, impl->capacity * sizeof(*impl->elements)))) + { + impl->elements = tmp; + return E_OUTOFMEMORY; + } + } + + memmove(impl->elements + index + 1, impl->elements + index, (impl->size++ - index) * sizeof(*impl->elements)); + IInspectable_AddRef((impl->elements[index] = value)); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_RemoveAt( IVector_IInspectable *iface, UINT32 index ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, index %u.\n", iface, index); + + if (index >= impl->size) return E_BOUNDS; + IInspectable_Release(impl->elements[index]); + memmove(impl->elements + index, impl->elements + index + 1, (--impl->size - index) * sizeof(*impl->elements)); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_Append( IVector_IInspectable *iface, IInspectable *value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, value %p.\n", iface, value); + + return IVector_IInspectable_InsertAt(iface, impl->size, value); +} + +static HRESULT WINAPI vector_inspectable_RemoveAtEnd( IVector_IInspectable *iface ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p.\n", iface); + + if (impl->size) IInspectable_Release(impl->elements[--impl->size]); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_Clear( IVector_IInspectable *iface ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p.\n", iface); + + while (impl->size) IVector_IInspectable_RemoveAtEnd(iface); + free(impl->elements); + impl->capacity = 0; + impl->elements = NULL; + + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_GetMany( IVector_IInspectable *iface, UINT32 start_index, + UINT32 items_size, IInspectable **items, UINT *count ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + UINT32 i; + + TRACE("iface %p, start_index %u, items_size %u, items %p, count %p.\n", + iface, start_index, items_size, items, count); + + if (start_index >= impl->size) return E_BOUNDS; + + for (i = start_index; i < impl->size; ++i) + { + if (i - start_index >= items_size) break; + IInspectable_AddRef((items[i - start_index] = impl->elements[i])); + } + *count = i - start_index; + + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_ReplaceAll( IVector_IInspectable *iface, UINT32 count, IInspectable **items ) +{ + HRESULT hr; + ULONG i; + + TRACE("iface %p, count %u, items %p.\n", iface, count, items); + + hr = IVector_IInspectable_Clear(iface); + for (i = 0; i < count && SUCCEEDED(hr); ++i) hr = IVector_IInspectable_Append(iface, items[i]); + return hr; +} + +static const struct IVector_IInspectableVtbl vector_inspectable_vtbl = +{ + /* IUnknown methods */ + vector_inspectable_QueryInterface, + vector_inspectable_AddRef, + vector_inspectable_Release, + /* IInspectable methods */ + vector_inspectable_GetIids, + vector_inspectable_GetRuntimeClassName, + vector_inspectable_GetTrustLevel, + /* IVector<IInspectable*> methods */ + vector_inspectable_GetAt, + vector_inspectable_get_Size, + vector_inspectable_GetView, + vector_inspectable_IndexOf, + vector_inspectable_SetAt, + vector_inspectable_InsertAt, + vector_inspectable_RemoveAt, + vector_inspectable_Append, + vector_inspectable_RemoveAtEnd, + vector_inspectable_Clear, + vector_inspectable_GetMany, + vector_inspectable_ReplaceAll +}; + +HRESULT vector_inspectable_create( const struct vector_iids *iids, IVector_IInspectable **out ) +{ + struct vector_inspectable *impl; + + TRACE("iid %s, out %p.\n", debugstr_guid(iids->vector), out); + + if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; + impl->IVector_IInspectable_iface.lpVtbl = &vector_inspectable_vtbl; + impl->iids = *iids; + impl->ref = 1; + + *out = &impl->IVector_IInspectable_iface; + TRACE("created %p\n", *out); + return S_OK; +} -- 2.35.1

2 9

[PATCH 1/2] hid: Implement HidD_GetPhysicalDescriptor.
by Rémi Bernon 30 Mar '22

30 Mar '22

From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> The game INVERSUS Deluxe calls upon this function and crashes without it. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidd.c | 6 ++++++ include/ddk/hidsdi.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 37dfdbce307..67c4473129d 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -9,7 +9,7 @@ @ stdcall HidD_GetManufacturerString(long ptr long) @ stub HidD_GetMsGenreDescriptor @ stdcall HidD_GetNumInputBuffers(long ptr) -@ stub HidD_GetPhysicalDescriptor +@ stdcall HidD_GetPhysicalDescriptor(long ptr long) @ stdcall HidD_GetPreparsedData(ptr ptr) @ stdcall HidD_GetProductString(long ptr long) @ stdcall HidD_GetSerialNumberString(long ptr long) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 3b2e5a9fe4e..af024b456b4 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -121,6 +121,12 @@ BOOLEAN WINAPI HidD_SetNumInputBuffers( HANDLE file, ULONG num_buffer ) return sync_ioctl( file, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &num_buffer, sizeof(num_buffer), NULL, 0 ); } +BOOLEAN WINAPI HidD_GetPhysicalDescriptor( HANDLE file, void *buffer, ULONG buffer_len ) +{ + TRACE( "file %p, buffer %p, buffer_len %lu.\n", file, buffer, buffer_len ); + return sync_ioctl( file, IOCTL_GET_PHYSICAL_DESCRIPTOR, NULL, 0, buffer, buffer_len ); +} + BOOLEAN WINAPI HidD_GetProductString( HANDLE file, void *buffer, ULONG buffer_len ) { TRACE( "file %p, buffer %p, buffer_len %lu.\n", file, buffer, buffer_len ); diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index 22f64e687e7..72470079a79 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -41,6 +41,7 @@ BOOLEAN WINAPI HidD_GetIndexedString(HANDLE file, ULONG index, void *buffer, ULO BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetNumInputBuffers(HANDLE HidDeviceObject, ULONG *NumberBuffers); +BOOLEAN WINAPI HidD_GetPhysicalDescriptor(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetSerialNumberString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); -- 2.35.1

2 2

[tools 1/3] testbot/web: Document the Fcntl usage.
by Francois Gouget 30 Mar '22

30 Mar '22

Use Fcntl qw(O_RDONLY) for simple cases. This is better than adding a comment which may get out-of-date if more constants are needed. But still use a comment to avoid too much duplication in more complex cases. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 2 +- testbot/lib/WineTestBot/Utils.pm | 2 +- testbot/web/GetFile.pl | 2 +- testbot/web/GetTaskFile.pl | 2 +- testbot/web/Screenshot.pl | 2 +- testbot/web/Submit.pl | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index db9d82d30..7880b8e80 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -37,7 +37,7 @@ sub BEGIN } use Errno qw(EAGAIN); -use Fcntl; +use Fcntl; # For O_XXX and FD_XXX use MIME::Parser; use POSIX ":sys_wait_h"; use Socket; diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 27b222fd2..5315c75d4 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -33,7 +33,7 @@ our @EXPORT = qw(SecureConnection MakeSecureURL GetTaskURL GenerateRandomString BuildTag SanitizeTag LocaleName NotifyAdministrator BatchQuote ShQuote ShArgv2Cmd); -use Fcntl; +use Fcntl qw(O_CREAT O_EXCL O_WRONLY); use WineTestBot::Config; diff --git a/testbot/web/GetFile.pl b/testbot/web/GetFile.pl index a8699497b..59602bf19 100644 --- a/testbot/web/GetFile.pl +++ b/testbot/web/GetFile.pl @@ -21,7 +21,7 @@ use strict; use Apache2::Const -compile => qw(REDIRECT); use CGI; -use Fcntl; # For O_XXX +use Fcntl qw(O_RDONLY); use WineTestBot::Jobs; diff --git a/testbot/web/GetTaskFile.pl b/testbot/web/GetTaskFile.pl index 41111197d..0b7f167d2 100644 --- a/testbot/web/GetTaskFile.pl +++ b/testbot/web/GetTaskFile.pl @@ -22,7 +22,7 @@ use strict; use Apache2::Const -compile => qw(REDIRECT); use CGI; -use Fcntl; # for O_READONLY +use Fcntl qw(O_RDONLY); use WineTestBot::Config; diff --git a/testbot/web/Screenshot.pl b/testbot/web/Screenshot.pl index a8a3d88ed..685c4a45c 100644 --- a/testbot/web/Screenshot.pl +++ b/testbot/web/Screenshot.pl @@ -22,7 +22,7 @@ use strict; use Apache2::Const -compile => qw(REDIRECT); use CGI; use CGI::Cookie; -use Fcntl; +use Fcntl qw(O_RDONLY); use WineTestBot::Config; use WineTestBot::CGI::Sessions; use WineTestBot::Engine::Notify; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 472622dd5..e2173d898 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -26,7 +26,7 @@ use ObjectModel::CGI::FreeFormPage; our @ISA = qw(ObjectModel::CGI::FreeFormPage); use CGI qw(:standard); -use Fcntl; # For O_XXX +use Fcntl qw(O_RDONLY); use IO::Handle; use POSIX qw(:fcntl_h); # For SEEK_XXX use File::Basename; -- 2.30.2

1 2

[tools] testbot/web: Add an Apache module import for the Munin redirects.
by Francois Gouget 30 Mar '22

30 Mar '22

Fortunately it is only needed in the error case. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Munin.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/web/Munin.pl b/testbot/web/Munin.pl index c2464d055..513c6901b 100644 --- a/testbot/web/Munin.pl +++ b/testbot/web/Munin.pl @@ -19,6 +19,7 @@ use strict; +use Apache2::Const -compile => qw(REDIRECT); use WineTestBot::Config; use WineTestBot::Activity; use WineTestBot::VMs; -- 2.30.2

1 0

[tools] testbot/cgi: Improve the title for multi-word collection / item class names.
by Francois Gouget 30 Mar '22

30 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This will make the titles nicer for the future FailureBlacklist pages. --- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 4 +++- testbot/lib/ObjectModel/CGI/ItemPage.pm | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionPage.pm b/testbot/lib/ObjectModel/CGI/CollectionPage.pm index d59310be5..ddbbd663e 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionPage.pm @@ -137,7 +137,9 @@ sub GetTitle($) { my ($self) = @_; - return ucfirst($self->{Collection}->GetCollectionName()); + my $Title = ucfirst($self->{Collection}->GetCollectionName()); + $Title =~ s/([a-z])([A-Z])/$1 $2/g; + return $Title; } sub GenerateTitle($) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 66fcab755..567a489fc 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -94,8 +94,11 @@ sub GetTitle($) { my ($self) = @_; - return $self->GetParam("Key") ? $self->GetParam("Key") : - "Add " . $self->{Collection}->GetItemName(); + return $self->GetParam("Key") if ($self->GetParam("Key")); + + my $Title = $self->{Collection}->GetItemName(); + $Title =~ s/([a-z])([A-Z])/$1 $2/g; + return "Add $Title"; } sub GenerateFormStart($) -- 2.30.2

1 0

[tools] testbot/web: The VMsList page deals with VMs so rename the $Item parameter.
by Francois Gouget 30 Mar '22

30 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/admin/VMsList.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index 283c54263..0ed0b0d0b 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -54,16 +54,16 @@ sub SortKeys($$$) sub OnItemAction($$$$) { - my ($self, $CollectionBlock, $Item, $Action) = @_; + my ($self, $CollectionBlock, $VM, $Action) = @_; if ($Action eq "Delete") { - $Item->Role("deleted"); - (my $ErrProperty, $self->{ErrMessage}) = $Item->Save(); + $VM->Role("deleted"); + (my $ErrProperty, $self->{ErrMessage}) = $VM->Save(); return !defined $self->{ErrMessage}; } - return $self->SUPER::OnItemAction($CollectionBlock, $Item, $Action); + return $self->SUPER::OnItemAction($CollectionBlock, $VM, $Action); } -- 2.30.2

1 0

[tools] testbot/web: The UsersList page deals with users so rename the $Item parameter.
by Francois Gouget 30 Mar '22

30 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/admin/UsersList.pl | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index 3621702a4..019bc6328 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -58,12 +58,12 @@ sub DisplayProperty($$$) sub GenerateDataCell($$$$$) { - my ($self, $CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage) = @_; + my ($self, $CollectionBlock, $User, $PropertyDescriptor, $DetailsPage) = @_; my $PropertyName = $PropertyDescriptor->GetName(); if ($PropertyName eq "Status") { - my $Status = $Item->Status; + my $Status = $User->Status; my ($Class, $Label); if ($Status eq "disabled") { @@ -73,19 +73,19 @@ sub GenerateDataCell($$$$$) { ($Class, $Label) = ('userdeleted', 'deleted'); } - elsif ($Item->WaitingForApproval()) + elsif ($User->WaitingForApproval()) { ($Class, $Label) = ('userrequest', 'request'); } - elsif (!$Item->Activated()) + elsif (!$User->Activated()) { ($Class, $Label) = ('userapproved', 'approved'); } - elsif ($Item->HasRole("admin")) + elsif ($User->HasRole("admin")) { ($Class, $Label) = ('useradmin', 'admin'); } - elsif ($Item->HasRole("wine-devel")) + elsif ($User->HasRole("wine-devel")) { ($Class, $Label) = ('userdevel', 'wine-devel'); } @@ -93,12 +93,12 @@ sub GenerateDataCell($$$$$) { ($Class, $Label) = ('usernone', 'none'); } - print "<td><a href='/admin/UserDetails.pl?Key=", uri_escape($Item->GetKey()), + print "<td><a href='/admin/UserDetails.pl?Key=", uri_escape($User->GetKey()), "'><span class='$Class'>$Label</span></a></td>"; } else { - $self->SUPER::GenerateDataCell($CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage); + $self->SUPER::GenerateDataCell($CollectionBlock, $User, $PropertyDescriptor, $DetailsPage); } } @@ -112,20 +112,20 @@ sub GetItemActions($$) sub OnItemAction($$$$) { - my ($self, $CollectionBlock, $Item, $Action) = @_; + my ($self, $CollectionBlock, $User, $Action) = @_; if ($Action eq "Delete") { - $Item->Status('deleted'); - (my $ErrProperty, $self->{ErrMessage}) = $Item->Save(); + $User->Status('deleted'); + (my $ErrProperty, $self->{ErrMessage}) = $User->Save(); return 0 if (defined $self->{ErrMessage}); # Forcefully log out that user by deleting the web sessions - DeleteSessions($Item); + DeleteSessions($User); return 1; } - return $self->SUPER::OnItemAction($CollectionBlock, $Item, $Action); + return $self->SUPER::OnItemAction($CollectionBlock, $User, $Action); } -- 2.30.2

1 0

[tools] testbot/web: The main page deals with jobs so rename the $Item parameter.
by Francois Gouget 30 Mar '22

30 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/index.pl | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 1f362fc32..94421536d 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -91,27 +91,27 @@ sub GenerateHeaderCell($$$) sub GetDisplayValue($$$) { - my ($self, $Item, $PropertyDescriptor) = @_; + my ($self, $Job, $PropertyDescriptor) = @_; if ($PropertyDescriptor->GetName() eq "User" && - defined($Item->Patch) && - $Item->User->GetKey() eq GetBatchUser()->GetKey() && - defined($Item->Patch->FromName)) + defined($Job->Patch) && + $Job->User->GetKey() eq GetBatchUser()->GetKey() && + defined($Job->Patch->FromName)) { - return $Item->Patch->FromName; + return $Job->Patch->FromName; } - return $self->SUPER::GetDisplayValue($Item, $PropertyDescriptor); + return $self->SUPER::GetDisplayValue($Job, $PropertyDescriptor); } sub GenerateDataCell($$$$) { - my ($self, $Item, $PropertyDescriptor, $DetailsPage) = @_; + my ($self, $Job, $PropertyDescriptor, $DetailsPage) = @_; my $PropertyName = $PropertyDescriptor->GetName(); if ($PropertyName eq "Status") { - my $EscapedKey = uri_escape($Item->GetKey()); + my $EscapedKey = uri_escape($Job->GetKey()); print "<td id='job$EscapedKey'><a href='/JobDetails.pl?Key=$EscapedKey'>"; my %HTMLChunks = ("queued" => "<span class='queued'>queued</span>", @@ -122,11 +122,11 @@ sub GenerateDataCell($$$$) "boterror" => "<span class='boterror'>TestBot error</span>", "canceled" => "<span class='canceled'>canceled</span>", ); - my $Status = $Item->Status; + my $Status = $Job->Status; my $HTMLStatus = $HTMLChunks{$Status} || $Status; if ($Status eq "completed" || $Status eq "running" || $Status eq "boterror" || $Status eq "canceled") { - my $JobInfo = $self->{JobsInfo}->{$Item->Id}; + my $JobInfo = $self->{JobsInfo}->{$Job->Id}; my $FailuresPrefix; if ($Status eq "completed") @@ -170,15 +170,15 @@ sub GenerateDataCell($$$$) } elsif ($PropertyName eq "Ended") { - if (defined $Item->Ended) + if (defined $Job->Ended) { - my $Duration = $Item->Ended - $Item->Submitted; - my $TagId = "E". $Item->Id; + my $Duration = $Job->Ended - $Job->Submitted; + my $TagId = "E". $Job->Id; print "<td><a id='$TagId' class='title' title='", - strftime("%Y-%m-%d %H:%M:%S", localtime($Item->Ended)), + strftime("%Y-%m-%d %H:%M:%S", localtime($Job->Ended)), "'>", DurationToString($Duration), "</a>\n"; print "<script type='text/javascript'></script>\n"; print "</td>\n"; } @@ -189,7 +189,7 @@ sub GenerateDataCell($$$$) } else { - $self->SUPER::GenerateDataCell($Item, $PropertyDescriptor, $DetailsPage); + $self->SUPER::GenerateDataCell($Job, $PropertyDescriptor, $DetailsPage); } } -- 2.30.2

1 0

[tools] testbot/web: The Activity page does not need URI::Escape.
by Francois Gouget 30 Mar '22

30 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Activity.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index cbe3f8721..1771e7ca3 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -25,7 +25,6 @@ use ObjectModel::CGI::FreeFormPage; our @ISA = qw(ObjectModel::CGI::FreeFormPage); use POSIX qw(strftime); -use URI::Escape; use ObjectModel::BasicPropertyDescriptor; use WineTestBot::Config; -- 2.30.2

1 0

[tools] testbot/cgi: Automatically use https for the Wine Wiki.
by Francois Gouget 30 Mar '22

30 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Presumably at some point it was an http-only site but nowadays it's available over https just like all the others. --- testbot/lib/WineTestBot/CGI/PageBase.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 58102d397..a54b0e206 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -423,7 +423,7 @@ ${ProjectName} Test Bot <div id='tabs'> <ul> <li><a href='//www.winehq.org/'>WineHQ</a></li> - <li><a href='http://wiki.winehq.org'>Wiki</a></li> + <li><a href='//wiki.winehq.org'>Wiki</a></li> <li><a href='//appdb.winehq.org/'>AppDB</a></li> <li><a href='//bugs.winehq.org/'>Bugzilla</a></li> <li class='s'><a href='//${WebHostName}/'>TestBot</a></li> -- 2.30.2

1 0

[tools] testbot/cgi: Use SameSite=Lax on our session cookies.
by Francois Gouget 30 Mar '22

30 Mar '22

So far we were not specifying SameSite which means it defaulted to None in older browsers which potentially allowed some cross-site attacks. Newer browser would now default to Lax so explicitly use that. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- My understanding of SameSite=Strict is that one would not be logged in after following a link found in one of the TestBot's emails. That does not seem very practical so SameSite=Lax seems like a better choice. It implies that the TestBot should not allow sensitive changes through the Get method... On the one hand I don't think the TestBot makes a distinction between Get and Post. But on the other hand I don't think one can do anything sensitive with the TestBot (at least for non-admin users). This latter part probably requires some more investigation independently from this patch. --- testbot/lib/WineTestBot/CGI/PageBase.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index a54b0e206..4837b9f54 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -137,6 +137,7 @@ sub UnsetCookies($) -Expires => "Sun, 25 Jul 1997 05:00:00 GMT", -Domain => $ENV{"HTTP_HOST"}, -Path => "/", + -SameSite => "Lax", -Secure => $UseSSL); $Request->err_headers_out->add("Set-Cookie", $Cookie); } @@ -147,6 +148,7 @@ sub UnsetCookies($) -Expires => "Sun, 25 Jul 1997 05:00:00 GMT", -Domain => $ENV{"HTTP_HOST"}, -Path => "/", + -SameSite => "Lax", -Secure => !1); $Request->err_headers_out->add("Set-Cookie", $Cookie); } @@ -178,6 +180,7 @@ sub SetCookies($) $Cookie = CGI::Cookie->new(-Name => "SessionId", -Value => $Session->Id, -Expires => $Expire, + -SameSite => "Lax", -Secure => $UseSSL, -HttpOnly => 1); $Request->err_headers_out->add("Set-Cookie", $Cookie); @@ -199,6 +202,7 @@ sub SetCookies($) $Cookie = CGI::Cookie->new(-Name => "SessionActive", -Value => $SessionPermanent, -Expires => $Expire, + -SameSite => "Lax", -Secure => !1, -HttpOnly => 1); $Request->err_headers_out->add("Set-Cookie", $Cookie); -- 2.30.2

1 0

[tools] testbot/web: Document why ErrField is not set when failing to delete an item.
by Francois Gouget 30 Mar '22

30 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/admin/UsersList.pl | 3 ++- testbot/web/admin/VMsList.pl | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index 019bc6328..ae514e901 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -117,7 +117,8 @@ sub OnItemAction($$$$) if ($Action eq "Delete") { $User->Status('deleted'); - (my $ErrProperty, $self->{ErrMessage}) = $User->Save(); + # Setting $self->{ErrField} is only useful on form pages + (my $_ErrProperty, $self->{ErrMessage}) = $User->Save(); return 0 if (defined $self->{ErrMessage}); # Forcefully log out that user by deleting the web sessions diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index 0ed0b0d0b..18952253f 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -59,7 +59,8 @@ sub OnItemAction($$$$) if ($Action eq "Delete") { $VM->Role("deleted"); - (my $ErrProperty, $self->{ErrMessage}) = $VM->Save(); + # Setting $self->{ErrField} is only useful on form pages + (my $_ErrProperty, $self->{ErrMessage}) = $VM->Save(); return !defined $self->{ErrMessage}; } -- 2.30.2

1 0

[PATCH 1/4] riched20: draw OLE object in richedit with OleDraw
by Dongwan Kim 30 Mar '22

30 Mar '22

When OLE object provides IViewObject::Draw, Richedit can draw it even though the OLE object does not support CF_BITMAP nor CF_ENHMETAFILE. Signed-off-by: Dongwan Kim <kdw6485(a)gmail.com> --- dlls/riched20/richole.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 03572511ff7..1a62f0b9f36 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5653,6 +5653,7 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) STGMEDIUM stgm; DIBSECTION dibsect; ENHMETAHEADER emh; + int pixs; assert(run->nFlags & MERF_GRAPHICS); assert(run->reobj); @@ -5691,8 +5692,13 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) fmt.tymed = TYMED_ENHMF; if (IDataObject_GetData(ido, &fmt, &stgm) != S_OK) { - FIXME("unsupported format\n"); - pSize->cx = pSize->cy = 0; + if( IOleObject_GetExtent(run->reobj->obj.poleobj, DVASPECT_CONTENT, pSize) != S_OK){ + FIXME("unsupported format\n"); + pSize->cx = pSize->cy = 0; + } + pixs = GetDeviceCaps(c->hDC, LOGPIXELSX); + pSize->cx = MulDiv(pSize->cx, pixs , 2540); + pSize->cy = MulDiv(pSize->cy, pixs , 2540); IDataObject_Release(ido); return; } @@ -5735,6 +5741,8 @@ void draw_ole( ME_Context *c, int x, int y, ME_Run *run, BOOL selected ) BOOL has_size; HBITMAP old_bm; RECT rc; + HRESULT hr; + int pixs; assert(run->nFlags & MERF_GRAPHICS); assert(run->reobj); @@ -5755,7 +5763,17 @@ void draw_ole( ME_Context *c, int x, int y, ME_Run *run, BOOL selected ) fmt.tymed = TYMED_ENHMF; if (IDataObject_GetData(ido, &fmt, &stgm) != S_OK) { - FIXME("Couldn't get storage medium\n"); + IOleObject_GetExtent(run->reobj->obj.poleobj, DVASPECT_CONTENT, &sz); + pixs = GetDeviceCaps(c->hDC, LOGPIXELSX); + rc.left = x; + rc.top = y - MulDiv(sz.cy, pixs, 2540); + rc.right = x + MulDiv(sz.cx, pixs, 2540); + rc.bottom = y ; + hr = OleDraw(run->reobj->obj.poleobj, DVASPECT_CONTENT, c->hDC, &rc); + if (FAILED(hr)) + { + FIXME("Couldn't draw ole object\n"); + } IDataObject_Release(ido); return; } -- 2.30.2

3 8

[PATCH 1/5] windows.media.speech: Add IVector<Inspectable*>.
by Bernhard Kölbl 30 Mar '22

30 Mar '22

And use it in recognizer. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/private.h | 6 + dlls/windows.media.speech/recognizer.c | 21 +- dlls/windows.media.speech/vector.c | 279 +++++++++++++++++++++++++ 3 files changed, 305 insertions(+), 1 deletion(-) diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h index 3c8371ccdbe..348c060c1c6 100644 --- a/dlls/windows.media.speech/private.h +++ b/dlls/windows.media.speech/private.h @@ -61,6 +61,11 @@ extern IActivationFactory *synthesizer_factory; +struct vector_iids +{ + const GUID *vector; +}; + HRESULT typed_event_handlers_append( struct list *list, ITypedEventHandler_IInspectable_IInspectable *handler, EventRegistrationToken *token ); HRESULT typed_event_handlers_remove( struct list *list, EventRegistrationToken *token ); HRESULT typed_event_handlers_notify( struct list *list, IInspectable *sender, IInspectable *args ); @@ -68,6 +73,7 @@ HRESULT typed_event_handlers_clear( struct list* list ); HRESULT vector_hstring_create( IVector_HSTRING **out ); HRESULT vector_hstring_create_copy( IIterable_HSTRING *iterable, IVector_HSTRING **out ); +HRESULT vector_inspectable_create( const struct vector_iids *iids, IVector_IInspectable **out ); #define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ static inline impl_type *impl_from( iface_type *iface ) \ diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index da219d6bd0a..5f88331c703 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -233,6 +233,7 @@ struct recognizer LONG ref; ISpeechContinuousRecognitionSession *session; + IVector_ISpeechRecognitionConstraint *constraints; }; /* @@ -296,6 +297,7 @@ static ULONG WINAPI recognizer_Release( ISpeechRecognizer *iface ) if (!ref) { ISpeechContinuousRecognitionSession_Release(impl->session); + IVector_ISpeechRecognitionConstraint_Release(impl->constraints); free(impl); } @@ -637,13 +639,22 @@ static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface { struct recognizer *impl; struct session *session; + struct vector_iids constraints_iids = + { + .vector = &IID_IVector_ISpeechRecognitionConstraint, + }; + HRESULT hr; TRACE("iface %p, language %p, speechrecognizer %p.\n", iface, language, speechrecognizer); *speechrecognizer = NULL; if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; - if (!(session = calloc(1, sizeof(*session)))) return E_OUTOFMEMORY; + if (!(session = calloc(1, sizeof(*session)))) + { + hr = E_OUTOFMEMORY; + goto error; + } if (language) FIXME("language parameter unused. Stub!\n"); @@ -658,11 +669,19 @@ static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface impl->ISpeechRecognizer2_iface.lpVtbl = &speech_recognizer2_vtbl; impl->session = &session->ISpeechContinuousRecognitionSession_iface; impl->ref = 1; + if (FAILED(hr = vector_inspectable_create(&constraints_iids, (IVector_IInspectable**)&impl->constraints))) + goto error; TRACE("created SpeechRecognizer %p.\n", impl); *speechrecognizer = &impl->ISpeechRecognizer_iface; return S_OK; + +error: + if (session) free(session); + if (impl) free(impl); + + return hr; } static const struct ISpeechRecognizerFactoryVtbl speech_recognizer_factory_vtbl = diff --git a/dlls/windows.media.speech/vector.c b/dlls/windows.media.speech/vector.c index fcb7f483e03..e3a802fc020 100644 --- a/dlls/windows.media.speech/vector.c +++ b/dlls/windows.media.speech/vector.c @@ -771,3 +771,282 @@ error: IVector_HSTRING_Release(*out); return hr; } + +/* + * + * IVector<Inspectable*> + * + */ + +struct vector_inspectable +{ + IVector_IInspectable IVector_IInspectable_iface; + struct vector_iids iids; + LONG ref; + + UINT32 size; + UINT32 capacity; + IInspectable **elements; +}; + +static inline struct vector_inspectable *impl_from_IVector_IInspectable( IVector_IInspectable *iface ) +{ + return CONTAINING_RECORD(iface, struct vector_inspectable, IVector_IInspectable_iface); +} + +static HRESULT WINAPI vector_inspectable_QueryInterface( IVector_IInspectable *iface, REFIID iid, void **out ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, impl->iids.vector)) + { + IInspectable_AddRef((*out = &impl->IVector_IInspectable_iface)); + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI vector_inspectable_AddRef( IVector_IInspectable *iface ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p increasing refcount to %lu.\n", iface, ref); + return ref; +} + +static ULONG WINAPI vector_inspectable_Release( IVector_IInspectable *iface ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + + TRACE("iface %p decreasing refcount to %lu.\n", iface, ref); + + if (!ref) + { + IVector_IInspectable_Clear(iface); + free(impl); + } + + return ref; +} + +static HRESULT WINAPI vector_inspectable_GetIids( IVector_IInspectable *iface, ULONG *iid_count, IID **iids ) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_inspectable_GetRuntimeClassName( IVector_IInspectable *iface, HSTRING *class_name ) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_inspectable_GetTrustLevel( IVector_IInspectable *iface, TrustLevel *trust_level ) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_inspectable_GetAt( IVector_IInspectable *iface, UINT32 index, IInspectable **value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, index %u, value %p.\n", iface, index, value); + + *value = NULL; + if (index >= impl->size) return E_BOUNDS; + + IInspectable_AddRef((*value = impl->elements[index])); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_get_Size( IVector_IInspectable *iface, UINT32 *value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + TRACE("iface %p, value %p.\n", iface, value); + *value = impl->size; + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_GetView( IVector_IInspectable *iface, IVectorView_IInspectable **value ) +{ + FIXME("iface %p, value %p stub!\n", iface, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_inspectable_IndexOf( IVector_IInspectable *iface, + IInspectable *element, UINT32 *index, BOOLEAN *found ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + ULONG i; + + TRACE("iface %p, element %p, index %p, found %p.\n", iface, element, index, found); + + for (i = 0; i < impl->size; ++i) if (impl->elements[i] == element) break; + if ((*found = (i < impl->size))) *index = i; + else *index = 0; + + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_SetAt( IVector_IInspectable *iface, UINT32 index, IInspectable *value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, index %u, value %p.\n", iface, index, value); + + if (index >= impl->size) return E_BOUNDS; + IInspectable_Release(impl->elements[index]); + IInspectable_AddRef((impl->elements[index] = value)); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_InsertAt( IVector_IInspectable *iface, UINT32 index, IInspectable *value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + IInspectable **tmp = impl->elements; + + TRACE("iface %p, index %u, value %p.\n", iface, index, value); + + if (impl->size == impl->capacity) + { + impl->capacity = max(32, impl->capacity * 3 / 2); + if (!(impl->elements = realloc(impl->elements, impl->capacity * sizeof(*impl->elements)))) + { + impl->elements = tmp; + return E_OUTOFMEMORY; + } + } + + memmove(impl->elements + index + 1, impl->elements + index, (impl->size++ - index) * sizeof(*impl->elements)); + IInspectable_AddRef((impl->elements[index] = value)); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_RemoveAt( IVector_IInspectable *iface, UINT32 index ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, index %u.\n", iface, index); + + if (index >= impl->size) return E_BOUNDS; + IInspectable_Release(impl->elements[index]); + memmove(impl->elements + index, impl->elements + index + 1, (--impl->size - index) * sizeof(*impl->elements)); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_Append( IVector_IInspectable *iface, IInspectable *value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, value %p.\n", iface, value); + + return IVector_IInspectable_InsertAt(iface, impl->size, value); +} + +static HRESULT WINAPI vector_inspectable_RemoveAtEnd( IVector_IInspectable *iface ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p.\n", iface); + + if (impl->size) IInspectable_Release(impl->elements[--impl->size]); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_Clear( IVector_IInspectable *iface ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p.\n", iface); + + while (impl->size) IVector_IInspectable_RemoveAtEnd(iface); + free(impl->elements); + impl->capacity = 0; + impl->elements = NULL; + + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_GetMany( IVector_IInspectable *iface, UINT32 start_index, + UINT32 items_size, IInspectable **items, UINT *count ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + UINT32 i; + + TRACE("iface %p, start_index %u, items_size %u, items %p, count %p.\n", + iface, start_index, items_size, items, count); + + if (start_index >= impl->size) return E_BOUNDS; + + for (i = start_index; i < impl->size; ++i) + { + if (i - start_index >= items_size) break; + IInspectable_AddRef((items[i - start_index] = impl->elements[i])); + } + *count = i - start_index; + + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_ReplaceAll( IVector_IInspectable *iface, UINT32 count, IInspectable **items ) +{ + HRESULT hr; + ULONG i; + + TRACE("iface %p, count %u, items %p.\n", iface, count, items); + + hr = IVector_IInspectable_Clear(iface); + for (i = 0; i < count && SUCCEEDED(hr); ++i) hr = IVector_IInspectable_Append(iface, items[i]); + return hr; +} + +static const struct IVector_IInspectableVtbl vector_inspectable_vtbl = +{ + /* IUnknown methods */ + vector_inspectable_QueryInterface, + vector_inspectable_AddRef, + vector_inspectable_Release, + /* IInspectable methods */ + vector_inspectable_GetIids, + vector_inspectable_GetRuntimeClassName, + vector_inspectable_GetTrustLevel, + /* IVector<IInspectable*> methods */ + vector_inspectable_GetAt, + vector_inspectable_get_Size, + vector_inspectable_GetView, + vector_inspectable_IndexOf, + vector_inspectable_SetAt, + vector_inspectable_InsertAt, + vector_inspectable_RemoveAt, + vector_inspectable_Append, + vector_inspectable_RemoveAtEnd, + vector_inspectable_Clear, + vector_inspectable_GetMany, + vector_inspectable_ReplaceAll +}; + +HRESULT vector_inspectable_create( const struct vector_iids *iids, IVector_IInspectable **out ) +{ + struct vector_inspectable *impl; + + TRACE("iid %s, out %p.\n", debugstr_guid(iids->vector), out); + + if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; + impl->IVector_IInspectable_iface.lpVtbl = &vector_inspectable_vtbl; + impl->iids = *iids; + impl->ref = 1; + + *out = &impl->IVector_IInspectable_iface; + TRACE("created %p\n", *out); + return S_OK; +} -- 2.35.1

2 8

[PATCH] testbot/TestLauncher: Create processes with DETACHED_PROCESS flag.
by Rémi Bernon 30 Mar '22

30 Mar '22

So that it doesn't automatically create a console window when there is not one already. Fixing a Wine regression from f034084d49b354811096524d472ae5172ac1cebf. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I'm not completely sure what DETACHED_PROCESS implies, and hopefully this won't cause more trouble, but forcing the flag like in https://testbot.winehq.org/JobDetails.pl?Key=111584 seems to fix the regression. testbot/src/TestLauncher/TestLauncher.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 41fb904..17da4da 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -236,7 +236,7 @@ DWORD RunTest(char *TestExeFileName, char* CommandLine, DWORD TimeOut, DWORD *Pi * whether there are missing dependencies as it could modify the test * results... */ - if (! CreateProcessA(NULL, CommandLine, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE, NULL, NULL, &StartupInfo, &ProcessInformation)) + if (! CreateProcessA(NULL, CommandLine, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE|DETACHED_PROCESS, NULL, NULL, &StartupInfo, &ProcessInformation)) { *Pid = 0; if (GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX) -- 2.35.1

2 1

[PATCH] wined3d: Add GPU information for NVIDIA Tesla T4.
by Henri Verbeet 30 Mar '22

30 Mar '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 4464bf3ecc2..5f3e3538950 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1310,6 +1310,7 @@ static const struct wined3d_renderer_table cards_nvidia_binary[] = { /* Direct 3D 11 */ + {"Tesla T4", CARD_NVIDIA_TESLA_T4}, {"RTX 2080 Ti", CARD_NVIDIA_GEFORCE_RTX2080TI}, /* GeForce 2000 - highend */ {"RTX 2080", CARD_NVIDIA_GEFORCE_RTX2080}, /* GeForce 2000 - highend */ {"RTX 2070", CARD_NVIDIA_GEFORCE_RTX2070}, /* GeForce 2000 - highend */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d7e78e40b39..4d105a57237 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -463,6 +463,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2070, "NVIDIA GeForce RTX 2070", DRIVER_NVIDIA_KEPLER, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2080, "NVIDIA GeForce RTX 2080", DRIVER_NVIDIA_KEPLER, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2080TI, "NVIDIA GeForce RTX 2080 Ti", DRIVER_NVIDIA_KEPLER, 11264}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_TESLA_T4, "NVIDIA Tesla T4", DRIVER_NVIDIA_KEPLER, 16384}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5b3eb0136b0..8d9b41c8a90 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3087,6 +3087,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_RTX2070 = 0x1f07, CARD_NVIDIA_GEFORCE_RTX2080 = 0x1e87, CARD_NVIDIA_GEFORCE_RTX2080TI = 0x1e07, + CARD_NVIDIA_TESLA_T4 = 0x1eb8, CARD_REDHAT_VIRGL = 0x1010, -- 2.30.2

1 0

[PATCH] wined3d: Increase the CS queue size.
by Jan Sikorski 30 Mar '22

30 Mar '22

Final Fantasy XIV routinely runs out of space in the queue, which affects the frame rates. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- On my particular testing set up the change is from ~85 fps to ~100 fps. --- dlls/wined3d/wined3d_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5b3eb0136b0..d53eb3985fa 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4892,7 +4892,7 @@ enum wined3d_push_constants }; #define WINED3D_CS_QUERY_POLL_INTERVAL 10u -#define WINED3D_CS_QUEUE_SIZE 0x100000u +#define WINED3D_CS_QUEUE_SIZE 0x400000u #define WINED3D_CS_SPIN_COUNT 10000000u #define WINED3D_CS_QUEUE_MASK (WINED3D_CS_QUEUE_SIZE - 1) -- 2.32.0

4 3

[PATCH 1/5] include: Add defines for ID2D1ImageSourceFromWic.
by Ziqing Hui 30 Mar '22

30 Mar '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- include/d2d1_3.idl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl index a33292882df..643212e1a27 100644 --- a/include/d2d1_3.idl +++ b/include/d2d1_3.idl @@ -166,3 +166,21 @@ interface ID2D1ImageSource : ID2D1Image [out] BOOL *resources_discarded ); }; + +[ + object, + uuid(77395441-1c8f-4555-8683-f50dab0fe792), + local, +] +interface ID2D1ImageSourceFromWic : ID2D1ImageSource +{ + HRESULT EnsureCached( + [in, optional] const D2D1_RECT_U *rect_to_fill + ); + HRESULT TrimCache( + [in, optional] const D2D1_RECT_U *rect_to_preserve + ); + void GetSource( + [out] IWICBitmapSource **source + ); +}; -- 2.25.1

3 7

[PATCH] wined3d: Use hashes of graphics pipeline keys for the pipeline cache.
by Jan Sikorski 30 Mar '22

30 Mar '22

Avoid doing full comparisons, which are expensive. There's some possible improvements that can be made if necessary: - Select a better hash function. Murmur64A was picked mainly because it's small and simple. - Don't always hash the entire pipeline key, hash incrementally. - Use an actual hash table instead of a tree, or at least allocate the nodes more contiguously. Note that it is assumed that no hash collision will happen. The probability of one is low (under an assumption that the hash function is good), but we could reasonably use a 128 bit hash to make it even less probable. Hash function implementation based on the one published in SMHasher. https://github.com/aappleby/smhasher/blob/master/src/MurmurHash2.cpp Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 128 ++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 64 insertions(+), 66 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 436973fe76f..e853bd568e2 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1844,82 +1844,78 @@ static int wined3d_pipeline_layout_vk_compare(const void *key, const struct wine return memcmp(a->bindings, b->bindings, a->binding_count * sizeof(*a->bindings)); } -static int wined3d_graphics_pipeline_vk_compare(const void *key, const struct wine_rb_entry *entry) +uint64_t hash_murmur64a(const void *key, int length, uint64_t seed) { - const struct wined3d_graphics_pipeline_key_vk *a = key; - const struct wined3d_graphics_pipeline_key_vk *b = &WINE_RB_ENTRY_VALUE(entry, - const struct wined3d_graphics_pipeline_vk, entry)->key; - unsigned int i; - int ret; + const uint64_t *qwords = (const uint64_t *)key; + const uint64_t factor = 0xc6a4a7935bd1e995LLU; + const uint64_t *qend = &qwords[length >> 3]; + const uint8_t *bytes = (const uint8_t *)qend; + uint64_t hash = seed ^ (length * factor); + const int shift = 47; - if ((ret = wined3d_uint32_compare(a->pipeline_desc.stageCount, b->pipeline_desc.stageCount))) - return ret; - for (i = 0; i < a->pipeline_desc.stageCount; ++i) + while (qwords != qend) { - if ((ret = wined3d_uint64_compare(a->stages[i].module, b->stages[i].module))) - return ret; - } + uint64_t value = *qwords++; - if ((ret = wined3d_uint32_compare(a->divisor_desc.vertexBindingDivisorCount, - b->divisor_desc.vertexBindingDivisorCount))) - return ret; - if ((ret = memcmp(a->divisors, b->divisors, - a->divisor_desc.vertexBindingDivisorCount * sizeof(*a->divisors)))) - return ret; + value *= factor; + value ^= value >> shift; + value *= factor; - if ((ret = wined3d_uint32_compare(a->input_desc.vertexAttributeDescriptionCount, - b->input_desc.vertexAttributeDescriptionCount))) - return ret; - if ((ret = memcmp(a->attributes, b->attributes, - a->input_desc.vertexAttributeDescriptionCount * sizeof(*a->attributes)))) - return ret; - if ((ret = wined3d_uint32_compare(a->input_desc.vertexBindingDescriptionCount, - b->input_desc.vertexBindingDescriptionCount))) - return ret; - if ((ret = memcmp(a->bindings, b->bindings, - a->input_desc.vertexBindingDescriptionCount * sizeof(*a->bindings)))) - return ret; - - if ((ret = wined3d_uint32_compare(a->ia_desc.topology, b->ia_desc.topology))) - return ret; - if ((ret = wined3d_uint32_compare(a->ia_desc.primitiveRestartEnable, b->ia_desc.primitiveRestartEnable))) - return ret; - - if ((ret = wined3d_uint32_compare(a->ts_desc.patchControlPoints, b->ts_desc.patchControlPoints))) - return ret; + hash ^= value; + hash *= factor; + } - if ((ret = memcmp(&a->viewport, &b->viewport, sizeof(a->viewport)))) - return ret; + switch (length & 7) + { + case 7: hash ^= (uint64_t)(bytes[6]) << 48; + case 6: hash ^= (uint64_t)(bytes[5]) << 40; + case 5: hash ^= (uint64_t)(bytes[4]) << 32; + case 4: hash ^= (uint64_t)(bytes[3]) << 24; + case 3: hash ^= (uint64_t)(bytes[2]) << 16; + case 2: hash ^= (uint64_t)(bytes[1]) << 8; + case 1: hash ^= (uint64_t)(bytes[0]); - if ((ret = memcmp(&a->scissor, &b->scissor, sizeof(a->scissor)))) - return ret; + hash *= factor; + }; - if ((ret = memcmp(&a->rs_desc, &b->rs_desc, sizeof(a->rs_desc)))) - return ret; + hash ^= hash >> shift; + hash *= factor; + hash ^= hash >> shift; - if ((ret = wined3d_uint32_compare(a->ms_desc.rasterizationSamples, b->ms_desc.rasterizationSamples))) - return ret; - if ((ret = wined3d_uint32_compare(a->ms_desc.alphaToCoverageEnable, b->ms_desc.alphaToCoverageEnable))) - return ret; - if ((ret = wined3d_uint32_compare(a->sample_mask, b->sample_mask))) - return ret; + return hash; +} - if ((ret = memcmp(&a->ds_desc, &b->ds_desc, sizeof(a->ds_desc)))) - return ret; +static uint64_t wined3d_graphics_pipeline_vk_key_hash(struct wined3d_graphics_pipeline_key_vk *key) +{ + uint64_t result = 0, i; - if ((ret = wined3d_uint32_compare(a->blend_desc.attachmentCount, b->blend_desc.attachmentCount))) - return ret; - if ((ret = memcmp(a->blend_attachments, b->blend_attachments, - a->blend_desc.attachmentCount * sizeof(*a->blend_attachments)))) - return ret; + for (i = 0; i < key->pipeline_desc.stageCount; ++i) + result = hash_murmur64a(&key->stages[i].module, sizeof(key->stages[i].module), result); - if ((ret = wined3d_uint64_compare(a->pipeline_desc.layout, b->pipeline_desc.layout))) - return ret; + result = hash_murmur64a(key->divisors, key->divisor_desc.vertexBindingDivisorCount * sizeof(*key->divisors), result); + result = hash_murmur64a(key->attributes, key->input_desc.vertexAttributeDescriptionCount * sizeof(*key->attributes), result); + result = hash_murmur64a(key->bindings, key->input_desc.vertexBindingDescriptionCount * sizeof(*key->bindings), result); + result = hash_murmur64a(&key->viewport, sizeof(key->viewport), result); + result = hash_murmur64a(&key->scissor, sizeof(key->scissor), result); + result = hash_murmur64a(&key->sample_mask, sizeof(key->sample_mask), result); + result = hash_murmur64a(key->blend_attachments, key->blend_desc.attachmentCount * sizeof(*key->blend_attachments), result); + result = hash_murmur64a(&key->ia_desc.topology, sizeof(key->ia_desc.topology), result); + result = hash_murmur64a(&key->ia_desc.primitiveRestartEnable, sizeof(key->ia_desc.primitiveRestartEnable), result); + result = hash_murmur64a(&key->ts_desc.patchControlPoints, sizeof(key->ts_desc.patchControlPoints), result); + result = hash_murmur64a(&key->rs_desc, sizeof(key->rs_desc), result); + result = hash_murmur64a(&key->ms_desc.rasterizationSamples, sizeof(key->ms_desc.rasterizationSamples), result); + result = hash_murmur64a(&key->ms_desc.alphaToCoverageEnable, sizeof(key->ms_desc.alphaToCoverageEnable), result); + result = hash_murmur64a(&key->ds_desc, sizeof(key->ds_desc), result); + result = hash_murmur64a(&key->pipeline_desc.layout, sizeof(key->pipeline_desc.layout), result); + result = hash_murmur64a(&key->pipeline_desc.renderPass, sizeof(key->pipeline_desc.renderPass), result); - if ((ret = wined3d_uint64_compare(a->pipeline_desc.renderPass, b->pipeline_desc.renderPass))) - return ret; + return result; +} - return 0; +static int wined3d_graphics_pipeline_vk_compare(const void *hash, const struct wine_rb_entry *entry) +{ + return wined3d_uint64_compare(*(uint64_t *)hash, + WINE_RB_ENTRY_VALUE(entry, const struct wined3d_graphics_pipeline_vk, entry)->hash); } static int wined3d_bo_slab_vk_compare(const void *key, const struct wine_rb_entry *entry) @@ -3120,15 +3116,17 @@ static VkPipeline wined3d_context_vk_get_graphics_pipeline(struct wined3d_contex struct wined3d_graphics_pipeline_vk *pipeline_vk; struct wined3d_graphics_pipeline_key_vk *key; struct wine_rb_entry *entry; + uint64_t hash; VkResult vr; key = &context_vk->graphics.pipeline_key_vk; - if ((entry = wine_rb_get(&context_vk->graphics_pipelines, key))) + hash = wined3d_graphics_pipeline_vk_key_hash(key); + if ((entry = wine_rb_get(&context_vk->graphics_pipelines, &hash))) return WINE_RB_ENTRY_VALUE(entry, struct wined3d_graphics_pipeline_vk, entry)->vk_pipeline; if (!(pipeline_vk = heap_alloc(sizeof(*pipeline_vk)))) return VK_NULL_HANDLE; - pipeline_vk->key = *key; + pipeline_vk->hash = hash; if ((vr = VK_CALL(vkCreateGraphicsPipelines(device_vk->vk_device, VK_NULL_HANDLE, 1, &key->pipeline_desc, NULL, &pipeline_vk->vk_pipeline))) < 0) @@ -3138,7 +3136,7 @@ static VkPipeline wined3d_context_vk_get_graphics_pipeline(struct wined3d_contex return VK_NULL_HANDLE; } - if (wine_rb_put(&context_vk->graphics_pipelines, &pipeline_vk->key, &pipeline_vk->entry) == -1) + if (wine_rb_put(&context_vk->graphics_pipelines, &pipeline_vk->hash, &pipeline_vk->entry) == -1) ERR("Failed to insert pipeline.\n"); return pipeline_vk->vk_pipeline; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5b3eb0136b0..34b7c9eab29 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2521,7 +2521,7 @@ struct wined3d_graphics_pipeline_key_vk struct wined3d_graphics_pipeline_vk { struct wine_rb_entry entry; - struct wined3d_graphics_pipeline_key_vk key; + uint64_t hash; VkPipeline vk_pipeline; }; -- 2.32.0

2 3

[v2 PATCH] user32: Add suspend-resume notification API stubs.
by Nikolay Sivov 30 Mar '22

30 Mar '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: add unregister stub as well. dlls/user32/misc.c | 18 ++++++++++++++++++ dlls/user32/user32.spec | 2 ++ include/winuser.h | 2 ++ 3 files changed, 22 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 25d0b676667..04ba0a8810c 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -443,6 +443,24 @@ BOOL WINAPI UnregisterPowerSettingNotification(HPOWERNOTIFY handle) return TRUE; } +/********************************************************************** + * RegisterSuspendResumeNotification (USER32.@) + */ +HPOWERNOTIFY WINAPI RegisterSuspendResumeNotification(HANDLE recipient, DWORD flags) +{ + FIXME("%p, %#x: stub.\n", recipient, flags); + return (HPOWERNOTIFY)0xdeadbeef; +} + +/********************************************************************** + * UnregisterSuspendResumeNotification (USER32.@) + */ +BOOL WINAPI UnregisterSuspendResumeNotification(HPOWERNOTIFY handle) +{ + FIXME("%p: stub.\n", handle); + return TRUE; +} + /***************************************************************************** * GetGestureConfig (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index aae124ebdcc..5d0c6746a51 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -608,6 +608,7 @@ @ stdcall RegisterRawInputDevices(ptr long long) @ stdcall RegisterServicesProcess(long) @ stdcall RegisterShellHookWindow (long) +@ stdcall RegisterSuspendResumeNotification(long long) @ stdcall RegisterSystemThread(long long) @ stdcall RegisterTasklist (long) @ stdcall RegisterTouchHitTestingWindow(long long) @@ -783,6 +784,7 @@ @ stdcall UnregisterHotKey(long long) NtUserUnregisterHotKey # @ stub UnregisterMessagePumpHook @ stdcall UnregisterPowerSettingNotification(ptr) +@ stdcall UnregisterSuspendResumeNotification(ptr) @ stdcall UnregisterTouchWindow(long) @ stdcall UnregisterUserApiHook() @ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) diff --git a/include/winuser.h b/include/winuser.h index 898c9034e33..bb585efd16d 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4128,6 +4128,7 @@ WINUSERAPI BOOL WINAPI RegisterPointerDeviceNotifications(HWND,BOOL); WINUSERAPI HPOWERNOTIFY WINAPI RegisterPowerSettingNotification(HANDLE,LPCGUID,DWORD); WINUSERAPI BOOL WINAPI RegisterRawInputDevices(PRAWINPUTDEVICE,UINT,UINT); WINUSERAPI BOOL WINAPI RegisterShellHookWindow(HWND); +WINUSERAPI HPOWERNOTIFY WINAPI RegisterSuspendResumeNotification(HANDLE,DWORD); WINUSERAPI BOOL WINAPI RegisterTouchWindow(HWND,ULONG); WINUSERAPI UINT WINAPI RegisterWindowMessageA(LPCSTR); WINUSERAPI UINT WINAPI RegisterWindowMessageW(LPCWSTR); @@ -4300,6 +4301,7 @@ WINUSERAPI BOOL WINAPI UnregisterClassW(LPCWSTR,HINSTANCE); WINUSERAPI BOOL WINAPI UnregisterDeviceNotification(HDEVNOTIFY); WINUSERAPI BOOL WINAPI UnregisterHotKey(HWND,INT); WINUSERAPI BOOL WINAPI UnregisterPowerSettingNotification(HPOWERNOTIFY); +WINUSERAPI BOOL WINAPI UnregisterSuspendResumeNotification(HPOWERNOTIFY); WINUSERAPI BOOL WINAPI UnregisterTouchWindow(HWND); WINUSERAPI BOOL WINAPI UpdateWindow(HWND); WINUSERAPI BOOL WINAPI UserHandleGrantAccess(HANDLE,HANDLE,BOOL); -- 2.35.1

2 1

[PATCH] hid: Implement HidD_GetPhysicalDescriptor.
by Mohamad Al-Jaf 30 Mar '22

30 Mar '22

The game INVERSUS Deluxe calls upon this function and crashes without it. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- Proton-Issue: https://github.com/ValveSoftware/Proton/issues/5710 --- dlls/hid/hid.spec | 2 +- dlls/hid/hidd.c | 6 ++++++ include/ddk/hidsdi.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 37dfdbce307..67c4473129d 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -9,7 +9,7 @@ @ stdcall HidD_GetManufacturerString(long ptr long) @ stub HidD_GetMsGenreDescriptor @ stdcall HidD_GetNumInputBuffers(long ptr) -@ stub HidD_GetPhysicalDescriptor +@ stdcall HidD_GetPhysicalDescriptor(long ptr long) @ stdcall HidD_GetPreparsedData(ptr ptr) @ stdcall HidD_GetProductString(long ptr long) @ stdcall HidD_GetSerialNumberString(long ptr long) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index a82ba8392a1..e01ab2a35e7 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -121,6 +121,12 @@ BOOLEAN WINAPI HidD_SetNumInputBuffers( HANDLE file, ULONG num_buffer ) return sync_ioctl( file, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &num_buffer, sizeof(num_buffer), NULL, 0 ); } +BOOLEAN WINAPI HidD_GetPhysicalDescriptor( HANDLE file, void *buffer, ULONG buffer_len ) +{ + TRACE( "file %p, buffer %p, buffer_len %lu.\n", file, buffer, buffer_len ); + return sync_ioctl( file, IOCTL_GET_PHYSICAL_DESCRIPTOR, NULL, 0, buffer, buffer_len ); +} + BOOLEAN WINAPI HidD_GetProductString( HANDLE file, void *buffer, ULONG buffer_len ) { TRACE( "file %p, buffer %p, buffer_len %lu.\n", file, buffer, buffer_len ); diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index 22f64e687e7..72470079a79 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -41,6 +41,7 @@ BOOLEAN WINAPI HidD_GetIndexedString(HANDLE file, ULONG index, void *buffer, ULO BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetNumInputBuffers(HANDLE HidDeviceObject, ULONG *NumberBuffers); +BOOLEAN WINAPI HidD_GetPhysicalDescriptor(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetSerialNumberString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); -- 2.35.1

1 0

[PATCH 3/3] crypt32: Use CRT allocation functions.
by Hans Leidekker 30 Mar '22

30 Mar '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index cce90125bc0..4a94bed9b6b 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -18,6 +18,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include <stdio.h> #include "windef.h" @@ -136,17 +137,17 @@ HLRUCACHE WINAPI I_CryptFreeLruCache(HLRUCACHE h, DWORD unk0, DWORD unk1) LPVOID WINAPI CryptMemAlloc(ULONG cbSize) { - return HeapAlloc(GetProcessHeap(), 0, cbSize); + return malloc(cbSize); } LPVOID WINAPI CryptMemRealloc(LPVOID pv, ULONG cbSize) { - return HeapReAlloc(GetProcessHeap(), 0, pv, cbSize); + return realloc(pv, cbSize); } VOID WINAPI CryptMemFree(LPVOID pv) { - HeapFree(GetProcessHeap(), 0, pv); + free(pv); } DWORD WINAPI I_CryptAllocTls(void) -- 2.30.2

1 0

[PATCH 2/3] crypt32: Consistently use CryptMemAlloc/Free().
by Hans Leidekker 30 Mar '22

30 Mar '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/cert.c | 12 ++++++------ dlls/crypt32/chain.c | 4 ++-- dlls/crypt32/msg.c | 4 ++-- dlls/crypt32/pfx.c | 12 +++++------- dlls/crypt32/rootstore.c | 9 ++++----- dlls/crypt32/serialize.c | 4 ++-- 6 files changed, 21 insertions(+), 24 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index b7789fd6fcd..ad39b7d18c7 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -677,7 +677,7 @@ static BOOL CertContext_SetKeyProvInfoProperty(CONTEXT_PROPERTY_LIST *properties for (i = 0; i < info->cProvParam; i++) size += sizeof(CRYPT_KEY_PROV_PARAM) + info->rgProvParam[i].cbData; - prop = HeapAlloc(GetProcessHeap(), 0, size); + prop = CryptMemAlloc(size); if (!prop) { SetLastError(ERROR_OUTOFMEMORY); @@ -687,7 +687,7 @@ static BOOL CertContext_SetKeyProvInfoProperty(CONTEXT_PROPERTY_LIST *properties copy_KeyProvInfoProperty(info, prop); ret = ContextPropertyList_SetProperty(properties, CERT_KEY_PROV_INFO_PROP_ID, (const BYTE *)prop, size); - HeapFree(GetProcessHeap(), 0, prop); + CryptMemFree(prop); return ret; } @@ -865,7 +865,7 @@ static BOOL CRYPT_AcquirePrivateKeyFromProvInfo(PCCERT_CONTEXT pCert, DWORD dwFl CERT_KEY_PROV_INFO_PROP_ID, 0, &size); if (ret) { - info = HeapAlloc(GetProcessHeap(), 0, size); + info = CryptMemAlloc(size); if (info) { ret = CertGetCertificateContextProperty(pCert, @@ -901,7 +901,7 @@ static BOOL CRYPT_AcquirePrivateKeyFromProvInfo(PCCERT_CONTEXT pCert, DWORD dwFl SetLastError(CRYPT_E_NO_KEY_PROPERTY); } if (allocated) - HeapFree(GetProcessHeap(), 0, info); + CryptMemFree(info); return ret; } @@ -953,7 +953,7 @@ BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert, if (ret) { - info = HeapAlloc(GetProcessHeap(), 0, size); + info = CryptMemAlloc(size); ret = CertGetCertificateContextProperty(pCert, CERT_KEY_PROV_INFO_PROP_ID, info, &size); if (ret) @@ -1003,7 +1003,7 @@ BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert, } } } - HeapFree(GetProcessHeap(), 0, info); + CryptMemFree(info); if (cert_in_store) CertFreeCertificateContext(cert_in_store); return ret; diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 3e9bdb66e0a..cf244f2ac6c 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2007,7 +2007,7 @@ static PCCERT_CONTEXT CRYPT_FindIssuer(const CertificateChainEngine *engine, con if(!res) return NULL; - urls = HeapAlloc(GetProcessHeap(), 0, size); + urls = CryptMemAlloc(size); if(!urls) return NULL; @@ -2045,7 +2045,7 @@ static PCCERT_CONTEXT CRYPT_FindIssuer(const CertificateChainEngine *engine, con } } - HeapFree(GetProcessHeap(), 0, urls); + CryptMemFree(urls); return issuer; } diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 6087f423f8c..63884d0c275 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1666,12 +1666,12 @@ static BOOL CRYPT_ExportEncryptedKey(CMSG_CONTENT_ENCRYPT_INFO *info, DWORD i, static LPVOID WINAPI mem_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, size); + return CryptMemAlloc(size); } static VOID WINAPI mem_free(LPVOID pv) { - HeapFree(GetProcessHeap(), 0, pv); + CryptMemFree(pv); } diff --git a/dlls/crypt32/pfx.c b/dlls/crypt32/pfx.c index fbcc7c72c89..54eb7f25e1b 100644 --- a/dlls/crypt32/pfx.c +++ b/dlls/crypt32/pfx.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <stdlib.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -28,7 +27,6 @@ #include "crypt32_private.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); @@ -55,17 +53,17 @@ static HCRYPTPROV import_key( cert_store_data_t data, DWORD flags ) } } - params.buf = key = malloc( size ); + params.buf = key = CryptMemAlloc( size ); if (CRYPT32_CALL( import_store_key, &params ) || !CryptImportKey( prov, key, size, 0, flags & CRYPT_EXPORTABLE, &cryptkey )) { WARN( "CryptImportKey failed %08lx\n", GetLastError() ); CryptReleaseContext( prov, 0 ); - free( key ); + CryptMemFree( key ); return 0; } CryptDestroyKey( cryptkey ); - free( key ); + CryptMemFree( key ); return prov; } @@ -177,10 +175,10 @@ HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *passwor struct import_store_cert_params import_params = { data, i, NULL, &size }; if (CRYPT32_CALL( import_store_cert, &import_params ) != STATUS_BUFFER_TOO_SMALL) break; - import_params.buf = cert = malloc( size ); + import_params.buf = cert = CryptMemAlloc( size ); if (!CRYPT32_CALL( import_store_cert, &import_params )) ctx = CertCreateContext( CERT_STORE_CERTIFICATE_CONTEXT, X509_ASN_ENCODING, cert, size, 0, NULL ); - free( cert ); + CryptMemFree( cert ); if (!ctx) { WARN( "CertCreateContext failed %08lx\n", GetLastError() ); diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 43256c71039..ab3a396b651 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -18,7 +18,6 @@ #include <stdarg.h> #include <stdio.h> -#include <stdlib.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -622,19 +621,19 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store) if (from) { - params.buffer = malloc( params.size ); + params.buffer = CryptMemAlloc( params.size ); while (!CRYPT32_CALL( enum_root_certs, &params )) { if (needed > params.size) { - free( params.buffer ); - params.buffer = malloc( needed ); + CryptMemFree( params.buffer ); + params.buffer = CryptMemAlloc( needed ); params.size = needed; } else CertAddEncodedCertificateToStore( from, X509_ASN_ENCODING, params.buffer, needed, CERT_STORE_ADD_NEW, NULL ); } - free( params.buffer ); + CryptMemFree( params.buffer ); check_and_store_certs(from, store); } CertCloseStore(from, 0); diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index e1e2593169d..47ab834bf48 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -72,7 +72,7 @@ static DWORD serialize_KeyProvInfoProperty(const CRYPT_KEY_PROV_INFO *info, stru if (!ret) return size; - store = HeapAlloc(GetProcessHeap(), 0, size); + store = CryptMemAlloc(size); if (!store) return 0; param = (struct store_CRYPT_KEY_PROV_PARAM *)(store + 1); @@ -331,7 +331,7 @@ static DWORD read_serialized_KeyProvInfoProperty(const struct store_CRYPT_KEY_PR for (i = 0; i < store->cProvParam; i++) size += sizeof(CRYPT_KEY_PROV_PARAM) + param[i].cbData; - info = HeapAlloc(GetProcessHeap(), 0, size); + info = CryptMemAlloc(size); if (!info) { SetLastError(ERROR_OUTOFMEMORY); -- 2.30.2

1 0

[PATCH 1/3] crypt32: Correctly free memory in CNG_ImportRSAPubKey().
by Hans Leidekker 30 Mar '22

30 Mar '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/cert.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 33811dfadc1..b7789fd6fcd 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2720,7 +2720,7 @@ static BOOL CNG_ImportRSAPubKey(CERT_PUBLIC_KEY_INFO *info, BCRYPT_KEY_HANDLE *k else { FIXME("Unsupported RSA algorithm: %#x\n", hdr->aiKeyAlg); - CryptMemFree(hdr); + LocalFree(hdr); SetLastError(NTE_BAD_ALGID); return FALSE; } @@ -2762,7 +2762,7 @@ static BOOL CNG_ImportRSAPubKey(CERT_PUBLIC_KEY_INFO *info, BCRYPT_KEY_HANDLE *k CryptMemFree(rsakey); done: - CryptMemFree(hdr); + LocalFree(hdr); if (alg) BCryptCloseAlgorithmProvider(alg, 0); if (status) SetLastError(RtlNtStatusToDosError(status)); return !status; @@ -2773,7 +2773,6 @@ BOOL CNG_ImportPubKey(CERT_PUBLIC_KEY_INFO *pubKeyInfo, BCRYPT_KEY_HANDLE *key) if (!strcmp(pubKeyInfo->Algorithm.pszObjId, szOID_ECC_PUBLIC_KEY)) return CNG_ImportECCPubKey(pubKeyInfo, key); - if (!strcmp(pubKeyInfo->Algorithm.pszObjId, szOID_RSA_RSA)) return CNG_ImportRSAPubKey(pubKeyInfo, key); -- 2.30.2

1 0

[PATCH] user32: Add RegisterSuspendResumeNotification() stub.
by Nikolay Sivov 30 Mar '22

30 Mar '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- The Legend of Heroes: Zero no Kiseki Kai game crashes on it. dlls/user32/misc.c | 9 +++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 25d0b676667..2e9ea897502 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -443,6 +443,15 @@ BOOL WINAPI UnregisterPowerSettingNotification(HPOWERNOTIFY handle) return TRUE; } +/********************************************************************** + * RegisterSuspendResumeNotification (USER32.@) + */ +HPOWERNOTIFY WINAPI RegisterSuspendResumeNotification(HANDLE recipient, DWORD flags) +{ + FIXME("%p, %#x: stub.\n", recipient, flags); + return (HPOWERNOTIFY)0xdeadbeef; +} + /***************************************************************************** * GetGestureConfig (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index aae124ebdcc..53a1cefc451 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -608,6 +608,7 @@ @ stdcall RegisterRawInputDevices(ptr long long) @ stdcall RegisterServicesProcess(long) @ stdcall RegisterShellHookWindow (long) +@ stdcall RegisterSuspendResumeNotification(long long) @ stdcall RegisterSystemThread(long long) @ stdcall RegisterTasklist (long) @ stdcall RegisterTouchHitTestingWindow(long long) diff --git a/include/winuser.h b/include/winuser.h index 898c9034e33..9a28d1436b9 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4128,6 +4128,7 @@ WINUSERAPI BOOL WINAPI RegisterPointerDeviceNotifications(HWND,BOOL); WINUSERAPI HPOWERNOTIFY WINAPI RegisterPowerSettingNotification(HANDLE,LPCGUID,DWORD); WINUSERAPI BOOL WINAPI RegisterRawInputDevices(PRAWINPUTDEVICE,UINT,UINT); WINUSERAPI BOOL WINAPI RegisterShellHookWindow(HWND); +WINUSERAPI HPOWERNOTIFY WINAPI RegisterSuspendResumeNotification(HANDLE,DWORD); WINUSERAPI BOOL WINAPI RegisterTouchWindow(HWND,ULONG); WINUSERAPI UINT WINAPI RegisterWindowMessageA(LPCSTR); WINUSERAPI UINT WINAPI RegisterWindowMessageW(LPCWSTR); -- 2.35.1

2 1

[PATCH 1/4] kernelbase: Check handle validity in unsafe_mem_from_HLOCAL.
by Rémi Bernon 30 Mar '22

30 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernelbase/memory.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 3cb596e5814..765d5dea3d8 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -598,9 +598,11 @@ struct mem_entry * the output jpeg's > 1 MB if not */ #define HLOCAL_STORAGE (sizeof(HLOCAL) * 2) -static inline struct mem_entry *mem_from_HLOCAL( HLOCAL handle ) +static inline struct mem_entry *unsafe_mem_from_HLOCAL( HLOCAL handle ) { - return (struct mem_entry *)((char *)handle - 2); + struct mem_entry *mem = CONTAINING_RECORD( handle, struct mem_entry, ptr ); + if (mem->magic != MAGIC_LOCAL_USED) return NULL; + return mem; } static inline HLOCAL HLOCAL_from_mem( struct mem_entry *mem ) @@ -709,8 +711,7 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalFree( HLOCAL handle ) } else /* HANDLE */ { - mem = mem_from_HLOCAL( handle ); - if (mem->magic == MAGIC_LOCAL_USED) + if ((mem = unsafe_mem_from_HLOCAL( handle ))) { mem->magic = 0xdead; if (mem->ptr) @@ -745,6 +746,7 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalFree( HLOCAL handle ) */ LPVOID WINAPI DECLSPEC_HOTPATCH LocalLock( HLOCAL handle ) { + struct mem_entry *mem; void *ret = NULL; TRACE_(globalmem)( "handle %p\n", handle ); @@ -767,8 +769,7 @@ LPVOID WINAPI DECLSPEC_HOTPATCH LocalLock( HLOCAL handle ) RtlLockHeap( GetProcessHeap() ); __TRY { - struct mem_entry *mem = mem_from_HLOCAL( handle ); - if (mem->magic == MAGIC_LOCAL_USED) + if ((mem = unsafe_mem_from_HLOCAL( handle ))) { ret = mem->ptr; if (!mem->ptr) SetLastError( ERROR_DISCARDED ); @@ -826,10 +827,9 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalReAlloc( HLOCAL handle, SIZE_T size, UINT f LocalFree( handle ); } } - else if (!is_pointer( handle ) && (flags & LMEM_DISCARDABLE)) + else if ((mem = unsafe_mem_from_HLOCAL( handle )) && (flags & LMEM_DISCARDABLE)) { /* change the flags to make our block "discardable" */ - mem = mem_from_HLOCAL( handle ); mem->flags |= LMEM_DISCARDABLE >> 8; ret = handle; } @@ -843,10 +843,9 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalReAlloc( HLOCAL handle, SIZE_T size, UINT f if (!(flags & LMEM_MOVEABLE)) heap_flags |= HEAP_REALLOC_IN_PLACE_ONLY; ret = HeapReAlloc( GetProcessHeap(), heap_flags, handle, size ); } - else + else if ((mem = unsafe_mem_from_HLOCAL( handle ))) { /* reallocate a moveable block */ - mem = mem_from_HLOCAL( handle ); if (size != 0) { if (size <= INT_MAX - HLOCAL_STORAGE) @@ -886,6 +885,7 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalReAlloc( HLOCAL handle, SIZE_T size, UINT f else WARN_(globalmem)( "not freeing memory associated with locked handle\n" ); } } + else SetLastError( ERROR_INVALID_HANDLE ); } RtlUnlockHeap( GetProcessHeap() ); return ret; @@ -897,6 +897,7 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalReAlloc( HLOCAL handle, SIZE_T size, UINT f */ BOOL WINAPI DECLSPEC_HOTPATCH LocalUnlock( HLOCAL handle ) { + struct mem_entry *mem; BOOL ret = FALSE; TRACE_(globalmem)( "handle %p\n", handle ); @@ -910,8 +911,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH LocalUnlock( HLOCAL handle ) RtlLockHeap( GetProcessHeap() ); __TRY { - struct mem_entry *mem = mem_from_HLOCAL( handle ); - if (mem->magic == MAGIC_LOCAL_USED) + if ((mem = unsafe_mem_from_HLOCAL( handle ))) { if (mem->lock) { -- 2.35.1

1 3

[PATCH 1/2] api-ms-win-core-privateprofile-l1-1-0: Add dll.
by Mohamad Al-Jaf 30 Mar '22

30 Mar '22

Needed for native mfc42u.dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51850 Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- The bug report does not mention that the tool cannot run without mfc42u.dll, which requires this API set. --- configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-core-privateprofile-l1-1-0.spec | 14 ++++++++++++++ 3 files changed, 16 insertions(+) create mode 100644 dlls/api-ms-win-core-privateprofile-l1-1-0/Makefile.in create mode 100644 dlls/api-ms-win-core-privateprofile-l1-1-0/api-ms-win-core-privateprofile-l1-1-0.spec diff --git a/configure.ac b/configure.ac index 9b2c111119f..9630405bfcd 100644 --- a/configure.ac +++ b/configure.ac @@ -2416,6 +2416,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-namedpipe-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-namespace-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-normalization-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-path-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-privateprofile-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-privateprofile-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processenvironment-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processenvironment-l1-2-0) diff --git a/dlls/api-ms-win-core-privateprofile-l1-1-0/Makefile.in b/dlls/api-ms-win-core-privateprofile-l1-1-0/Makefile.in new file mode 100644 index 00000000000..c8b8ef84aef --- /dev/null +++ b/dlls/api-ms-win-core-privateprofile-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-privateprofile-l1-1-0.dll diff --git a/dlls/api-ms-win-core-privateprofile-l1-1-0/api-ms-win-core-privateprofile-l1-1-0.spec b/dlls/api-ms-win-core-privateprofile-l1-1-0/api-ms-win-core-privateprofile-l1-1-0.spec new file mode 100644 index 00000000000..c8153c3a296 --- /dev/null +++ b/dlls/api-ms-win-core-privateprofile-l1-1-0/api-ms-win-core-privateprofile-l1-1-0.spec @@ -0,0 +1,14 @@ +@ stdcall GetPrivateProfileIntA(str str long str) kernel32.GetPrivateProfileIntA +@ stdcall GetPrivateProfileIntW(wstr wstr long wstr) kernel32.GetPrivateProfileIntW +@ stdcall GetPrivateProfileSectionW(wstr ptr long wstr) kernel32.GetPrivateProfileSectionW +@ stdcall GetPrivateProfileStringA(str str str ptr long str) kernel32.GetPrivateProfileStringA +@ stdcall GetPrivateProfileStringW(wstr wstr wstr ptr long wstr) kernel32.GetPrivateProfileStringW +@ stdcall GetProfileIntA(str str long) kernel32.GetProfileIntA +@ stdcall GetProfileIntW(wstr wstr long) kernel32.GetProfileIntW +@ stdcall GetProfileSectionA(str ptr long) kernel32.GetProfileSectionA +@ stdcall GetProfileSectionW(wstr ptr long) kernel32.GetProfileSectionW +@ stdcall GetProfileStringA(str str str ptr long) kernel32.GetProfileStringA +@ stdcall GetProfileStringW(wstr wstr wstr ptr long) kernel32.GetProfileStringW +@ stdcall WritePrivateProfileSectionA(str str str) kernel32.WritePrivateProfileSectionA +@ stdcall WritePrivateProfileStringA(str str str str) kernel32.WritePrivateProfileStringA +@ stdcall WritePrivateProfileStringW(wstr wstr wstr wstr) kernel32.WritePrivateProfileStringW -- 2.34.1

5 15

[PATCH v2] chakra: Add stub dll.
by Mohamad Al-Jaf 30 Mar '22

30 Mar '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52741 Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: - Remove duplicate wine-bug link. - Remove unnecessary -mno-cygwin flag (copy paste mistake). --- configure.ac | 1 + dlls/chakra/Makefile.in | 5 ++ dlls/chakra/chakra.spec | 160 ++++++++++++++++++++++++++++++++++++++++ dlls/chakra/version.rc | 26 +++++++ 4 files changed, 192 insertions(+) create mode 100644 dlls/chakra/Makefile.in create mode 100644 dlls/chakra/chakra.spec create mode 100644 dlls/chakra/version.rc diff --git a/configure.ac b/configure.ac index e509b232d11..f9ac5e45ed4 100644 --- a/configure.ac +++ b/configure.ac @@ -2372,6 +2372,7 @@ WINE_CONFIG_MAKEFILE(dlls/capi2032) WINE_CONFIG_MAKEFILE(dlls/cards) WINE_CONFIG_MAKEFILE(dlls/cdosys) WINE_CONFIG_MAKEFILE(dlls/cfgmgr32) +WINE_CONFIG_MAKEFILE(dlls/chakra) WINE_CONFIG_MAKEFILE(dlls/clusapi) WINE_CONFIG_MAKEFILE(dlls/cng.sys) WINE_CONFIG_MAKEFILE(dlls/combase) diff --git a/dlls/chakra/Makefile.in b/dlls/chakra/Makefile.in new file mode 100644 index 00000000000..7ca3e00c6d7 --- /dev/null +++ b/dlls/chakra/Makefile.in @@ -0,0 +1,5 @@ +MODULE = chakra.dll + +EXTRADLLFLAGS = -Wb,--prefer-native + +RC_SRCS = version.rc diff --git a/dlls/chakra/chakra.spec b/dlls/chakra/chakra.spec new file mode 100644 index 00000000000..4116c40850c --- /dev/null +++ b/dlls/chakra/chakra.spec @@ -0,0 +1,160 @@ +@ stub JsProjectWinRTNamespace +@ stub JsSetProjectionEnqueueCallback +@ stub CreateChakraEngine +@ stub DumpDiagInfo +@ stub JsDiscardBackgroundParse +@ stub JsInitializeJITServer +@ stub JsQueueBackgroundParse +@ stub MemProtectHeapAddRootSection +@ stub MemProtectHeapCollect +@ stub MemProtectHeapCreate +@ stub MemProtectHeapDestroy +@ stub MemProtectHeapDisableCollection +@ stub MemProtectHeapIsValidObject +@ stub MemProtectHeapMemSize +@ stub MemProtectHeapNotifyCurrentThreadDetach +@ stub MemProtectHeapProtectCurrentThread +@ stub MemProtectHeapRemoveRootSection +@ stub MemProtectHeapReportHeapSize +@ stub MemProtectHeapRootAlloc +@ stub MemProtectHeapRootAllocLeaf +@ stub MemProtectHeapRootRealloc +@ stub MemProtectHeapRootReallocLeaf +@ stub MemProtectHeapSynchronizeWithCollector +@ stub MemProtectHeapUnprotectCurrentThread +@ stub MemProtectHeapUnrootAndZero +@ stub RecyclerNativeHeapAddExternalMemoryUsage +@ stub RecyclerNativeHeapAllocLeaf +@ stub RecyclerNativeHeapAllocLeafFinalized +@ stub RecyclerNativeHeapAllocTraced +@ stub RecyclerNativeHeapAllocTracedFinalized +@ stub RecyclerNativeHeapCollectGarbageInThread +@ stub RecyclerNativeHeapCreateWeakReference +@ stub RecyclerNativeHeapGetRealAddressFromInterior +@ stub RecyclerNativeHeapGetStrongReference +@ stub RecyclerNativeHeapHasWeakReferenceCleanupOccurred +@ stub RecyclerNativeHeapRootAddRef +@ stub RecyclerNativeHeapRootRelease +@ stdcall -private DllCanUnloadNow() +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stub JsAddRef +@ stub JsBoolToBoolean +@ stub JsBooleanToBool +@ stub JsCallFunction +@ stub JsCollectGarbage +@ stub JsConstructObject +@ stub JsConvertValueToBoolean +@ stub JsConvertValueToNumber +@ stub JsConvertValueToObject +@ stub JsConvertValueToString +@ stub JsCreateArray +@ stub JsCreateArrayBuffer +@ stub JsCreateContext +@ stub JsCreateDataView +@ stub JsCreateError +@ stub JsCreateExternalArrayBuffer +@ stub JsCreateExternalObject +@ stub JsCreateFunction +@ stub JsCreateNamedFunction +@ stub JsCreateObject +@ stub JsCreateRangeError +@ stub JsCreateReferenceError +@ stub JsCreateRuntime +@ stub JsCreateSymbol +@ stub JsCreateSyntaxError +@ stub JsCreateThreadService +@ stub JsCreateTypeError +@ stub JsCreateTypedArray +@ stub JsCreateURIError +@ stub JsDefineProperty +@ stub JsDeleteIndexedProperty +@ stub JsDeleteProperty +@ stub JsDisableRuntimeExecution +@ stub JsDisposeRuntime +@ stub JsDoubleToNumber +@ stub JsEnableRuntimeExecution +@ stub JsEnumerateHeap +@ stub JsEquals +@ stub JsGetAndClearException +@ stub JsGetArrayBufferStorage +@ stub JsGetContextData +@ stub JsGetContextOfObject +@ stub JsGetCurrentContext +@ stub JsGetDataViewStorage +@ stub JsGetExtensionAllowed +@ stub JsGetExternalData +@ stub JsGetFalseValue +@ stub JsGetGlobalObject +@ stub JsGetIndexedPropertiesExternalData +@ stub JsGetIndexedProperty +@ stub JsGetNullValue +@ stub JsGetOwnPropertyDescriptor +@ stub JsGetOwnPropertyNames +@ stub JsGetOwnPropertySymbols +@ stub JsGetProperty +@ stub JsGetPropertyIdFromName +@ stub JsGetPropertyIdFromSymbol +@ stub JsGetPropertyIdType +@ stub JsGetPropertyNameFromId +@ stub JsGetPrototype +@ stub JsGetRuntime +@ stub JsGetRuntimeMemoryLimit +@ stub JsGetRuntimeMemoryUsage +@ stub JsGetStringLength +@ stub JsGetSymbolFromPropertyId +@ stub JsGetTrueValue +@ stub JsGetTypedArrayInfo +@ stub JsGetTypedArrayStorage +@ stub JsGetUndefinedValue +@ stub JsGetValueType +@ stub JsHasException +@ stub JsHasExternalData +@ stub JsHasIndexedPropertiesExternalData +@ stub JsHasIndexedProperty +@ stub JsHasProperty +@ stub JsIdle +@ stub JsInspectableToObject +@ stub JsInstanceOf +@ stub JsIntToNumber +@ stub JsIsEnumeratingHeap +@ stub JsIsRuntimeExecutionDisabled +@ stub JsNumberToDouble +@ stub JsNumberToInt +@ stub JsObjectToInspectable +@ stub JsParseScript +@ stub JsParseScriptWithAttributes +@ stub JsParseSerializedScript +@ stub JsParseSerializedScriptWithCallback +@ stub JsPointerToString +@ stub JsPreventExtension +@ stub JsRelease +@ stub JsRunScript +@ stub JsRunSerializedScript +@ stub JsRunSerializedScriptWithCallback +@ stub JsSerializeScript +@ stub JsSetContextData +@ stub JsSetCurrentContext +@ stub JsSetException +@ stub JsSetExternalData +@ stub JsSetIndexedPropertiesToExternalData +@ stub JsSetIndexedProperty +@ stub JsSetObjectBeforeCollectCallback +@ stub JsSetPromiseContinuationCallback +@ stub JsSetProperty +@ stub JsSetPrototype +@ stub JsSetRuntimeBeforeCollectCallback +@ stub JsSetRuntimeMemoryAllocationCallback +@ stub JsSetRuntimeMemoryLimit +@ stub JsStartDebugging +@ stub JsStartProfiling +@ stub JsStopProfiling +@ stub JsStrictEquals +@ stub JsStringToPointer +@ stub JsValueToVariant +@ stub JsVarAddRef +@ stub JsVarRelease +@ stub JsVarToExtension +@ stub JsVarToScriptDirect +@ stub JsVariantToValue diff --git a/dlls/chakra/version.rc b/dlls/chakra/version.rc new file mode 100644 index 00000000000..a73bf2bc5ad --- /dev/null +++ b/dlls/chakra/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine chakra" +#define WINE_FILENAME_STR "chakra.dll" +#define WINE_FILEVERSION 11,0,22000,348 +#define WINE_FILEVERSION_STR "11.0.22000.348" +#define WINE_PRODUCTVERSION 11,00,22000,348 +#define WINE_PRODUCTVERSION_STR "11.00.22000.348" + +#include "wine/wine_common_ver.rc" -- 2.35.1

1 0

[PATCH] setupapi: Return CR_SUCCESS for CM_Get_DevNode_Status{_Ex}.
by Zhiyi Zhang 30 Mar '22

30 Mar '22

One Piece: Pirate Warriors 4 relies on CM_Get_DevNode_Status() to return CR_SUCCESS. Otherwise, it shows a graphics driver error dialog and exits. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/stubs.c | 5 ++--- include/cfgmgr32.h | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 4b1585c8df6..75185de047c 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -455,8 +455,7 @@ CONFIGRET WINAPI CM_Get_DevNode_Registry_PropertyW(DEVINST dev, ULONG prop, PULO CONFIGRET WINAPI CM_Get_DevNode_Status(ULONG *status, ULONG *problem, DEVINST dev, ULONG flags) { - FIXME("%p %p 0x%08lx 0x%08lx: stub\n", status, problem, dev, flags); - return CR_FAILURE; + return CM_Get_DevNode_Status_Ex(status, problem, dev, flags, NULL); } /*********************************************************************** @@ -466,7 +465,7 @@ CONFIGRET WINAPI CM_Get_DevNode_Status_Ex(ULONG *status, ULONG *problem, DEVINST ULONG flags, HMACHINE machine) { FIXME("%p %p 0x%08lx 0x%08lx %p: stub\n", status, problem, dev, flags, machine); - return CR_FAILURE; + return CR_SUCCESS; } /*********************************************************************** diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index 7c4f4714126..d300c4babaa 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -234,6 +234,8 @@ CMAPI CONFIGRET WINAPI CM_Get_Device_ID_List_ExW(PCWSTR,PWCHAR,ULONG,ULONG,HMACH #define CM_Get_Device_ID_List_Ex WINELIB_NAME_AW(CM_Get_Device_ID_List_Ex) CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size(PULONG,DEVINST,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex(PULONG,DEVINST,ULONG,HMACHINE); +CMAPI CONFIGRET WINAPI CM_Get_DevNode_Status(PULONG,PULONG,DEVINST,ULONG); +CMAPI CONFIGRET WINAPI CM_Get_DevNode_Status_Ex(PULONG,PULONG,DEVINST,ULONG,HMACHINE); CMAPI CONFIGRET WINAPI CM_Get_Sibling(PDEVINST,DEVINST,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Sibling_Ex(PDEVINST pdnDevInst, DEVINST DevInst, ULONG ulFlags, HMACHINE hMachine); CMAPI WORD WINAPI CM_Get_Version(void); -- 2.32.0

1 0

[PATCH] sxs: Use CRT memory allocation functions.
by Nikolay Sivov 30 Mar '22

30 Mar '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/sxs/cache.c | 76 +++++++++++++++++++++--------------------- dlls/sxs/name.c | 34 +++++++++---------- dlls/sxs/sxs.c | 6 ++-- dlls/sxs/sxs_private.h | 10 ------ 4 files changed, 58 insertions(+), 68 deletions(-) diff --git a/dlls/sxs/cache.c b/dlls/sxs/cache.c index 02403501231..a924a359700 100644 --- a/dlls/sxs/cache.c +++ b/dlls/sxs/cache.c @@ -89,7 +89,7 @@ static ULONG WINAPI cache_Release( IAssemblyCache *iface ) { TRACE("destroying %p\n", cache); CloseHandle( cache->lock ); - HeapFree( GetProcessHeap(), 0, cache ); + free( cache ); } return refs; } @@ -115,7 +115,7 @@ static WCHAR *build_assembly_name( const WCHAR *arch, const WCHAR *name, const W buflen += lstrlenW( name ); buflen += lstrlenW( token ); buflen += lstrlenW( version ); - if (!(ret = HeapAlloc( GetProcessHeap(), 0, buflen * sizeof(WCHAR) ))) return NULL; + if (!(ret = malloc( buflen * sizeof(WCHAR) ))) return NULL; *len = swprintf( ret, buflen, fmtW, arch, name, token, version ); return wcslwr( ret ); } @@ -128,15 +128,15 @@ static WCHAR *build_dll_path( const WCHAR *arch, const WCHAR *name, const WCHAR if (!(path = build_assembly_name( arch, name, token, version, &len ))) return NULL; len += build_sxs_path( sxsdir ) + 2; - if (!(ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + if (!(ret = malloc( len * sizeof(WCHAR) ))) { - HeapFree( GetProcessHeap(), 0, path ); + free( path ); return NULL; } lstrcpyW( ret, sxsdir ); lstrcatW( ret, path ); lstrcatW( ret, L"\\" ); - HeapFree( GetProcessHeap(), 0, path ); + free( path ); return ret; } @@ -151,7 +151,7 @@ static WCHAR *build_policy_name( const WCHAR *arch, const WCHAR *name, const WCH buflen += lstrlenW( arch ); buflen += lstrlenW( name ); buflen += lstrlenW( token ); - if (!(ret = HeapAlloc( GetProcessHeap(), 0, buflen * sizeof(WCHAR) ))) return NULL; + if (!(ret = malloc( buflen * sizeof(WCHAR) ))) return NULL; *len = swprintf( ret, buflen, fmtW, arch, name, token ); return wcslwr( ret ); } @@ -168,13 +168,13 @@ static WCHAR *build_policy_path( const WCHAR *arch, const WCHAR *name, const WCH len += ARRAY_SIZE(fmtW); len += build_sxs_path( sxsdir ); len += lstrlenW( version ); - if (!(ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + if (!(ret = malloc( len * sizeof(WCHAR) ))) { - HeapFree( GetProcessHeap(), 0, path ); + free( path ); return NULL; } swprintf( ret, len, fmtW, sxsdir, path, version ); - HeapFree( GetProcessHeap(), 0, path ); + free( path ); return ret; } @@ -259,7 +259,7 @@ static HRESULT WINAPI cache_QueryAssemblyInfo( } done: - HeapFree( GetProcessHeap(), 0, path ); + free( path ); IAssemblyName_Release( name_obj ); cache_unlock( cache ); return hr; @@ -339,9 +339,9 @@ static void free_assembly( struct assembly *assembly ) struct file *file = LIST_ENTRY( item, struct file, entry ); list_remove( &file->entry ); SysFreeString( file->name ); - HeapFree( GetProcessHeap(), 0, file ); + free( file ); } - HeapFree( GetProcessHeap(), 0, assembly ); + free( assembly ); } static HRESULT parse_files( IXMLDOMDocument *doc, struct assembly *assembly ) @@ -386,7 +386,7 @@ static HRESULT parse_files( IXMLDOMDocument *doc, struct assembly *assembly ) if (hr != S_OK) goto done; - if (!(f = HeapAlloc( GetProcessHeap(), 0, sizeof(struct file) ))) + if (!(f = malloc( sizeof(*f) ))) { IXMLDOMNamedNodeMap_Release( attrs ); hr = E_OUTOFMEMORY; @@ -397,7 +397,7 @@ static HRESULT parse_files( IXMLDOMDocument *doc, struct assembly *assembly ) IXMLDOMNamedNodeMap_Release( attrs ); if (!f->name) { - HeapFree( GetProcessHeap(), 0, f ); + free( f ); hr = ERROR_SXS_MANIFEST_FORMAT_ERROR; goto done; } @@ -450,7 +450,7 @@ static HRESULT parse_assembly( IXMLDOMDocument *doc, struct assembly **assembly hr = ERROR_SXS_MANIFEST_FORMAT_ERROR; goto done; } - if (!(a = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct assembly) ))) + if (!(a = calloc(1, sizeof(*a) ))) { hr = E_OUTOFMEMORY; goto done; @@ -497,9 +497,9 @@ static WCHAR *build_policy_filename( const WCHAR *arch, const WCHAR *name, const len += ARRAY_SIZE(policiesW) - 1; len += lstrlenW( version ); len += ARRAY_SIZE(suffixW) - 1; - if (!(ret = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) + if (!(ret = malloc( (len + 1) * sizeof(WCHAR) ))) { - HeapFree( GetProcessHeap(), 0, fullname ); + free( fullname ); return NULL; } lstrcpyW( ret, sxsdir ); @@ -511,7 +511,7 @@ static WCHAR *build_policy_filename( const WCHAR *arch, const WCHAR *name, const lstrcatW( ret, version ); lstrcatW( ret, suffixW ); - HeapFree( GetProcessHeap(), 0, fullname ); + free( fullname ); return ret; } @@ -526,7 +526,7 @@ static HRESULT install_policy( const WCHAR *manifest, struct assembly *assembly if (!dst) return E_OUTOFMEMORY; ret = CopyFileW( manifest, dst, FALSE ); - HeapFree( GetProcessHeap(), 0, dst ); + free( dst ); if (!ret) { HRESULT hr = HRESULT_FROM_WIN32( GetLastError() ); @@ -544,10 +544,10 @@ static WCHAR *build_source_filename( const WCHAR *manifest, struct file *file ) p = wcsrchr( manifest, '\\' ); if (!p) p = wcsrchr( manifest, '/' ); - if (!p) return strdupW( manifest ); + if (!p) return wcsdup( manifest ); len = p - manifest + 1; - if (!(src = HeapAlloc( GetProcessHeap(), 0, (len + lstrlenW( file->name ) + 1) * sizeof(WCHAR) ))) + if (!(src = malloc( (len + lstrlenW( file->name ) + 1) * sizeof(WCHAR) ))) return NULL; memcpy( src, manifest, len * sizeof(WCHAR) ); @@ -567,9 +567,9 @@ static WCHAR *build_manifest_filename( const WCHAR *arch, const WCHAR *name, con len += build_sxs_path( sxsdir ); len += ARRAY_SIZE(manifestsW) - 1; len += ARRAY_SIZE(suffixW) - 1; - if (!(ret = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) + if (!(ret = malloc( (len + 1) * sizeof(WCHAR) ))) { - HeapFree( GetProcessHeap(), 0, fullname ); + free( fullname ); return NULL; } lstrcpyW( ret, sxsdir ); @@ -577,7 +577,7 @@ static WCHAR *build_manifest_filename( const WCHAR *arch, const WCHAR *name, con lstrcatW( ret, fullname ); lstrcatW( ret, suffixW ); - HeapFree( GetProcessHeap(), 0, fullname ); + free( fullname ); return ret; } @@ -615,7 +615,7 @@ static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembl if (!dst) return E_OUTOFMEMORY; ret = CopyFileW( manifest, dst, FALSE ); - HeapFree( GetProcessHeap(), 0, dst ); + free( dst ); if (!ret) { hr = HRESULT_FROM_WIN32( GetLastError() ); @@ -633,9 +633,9 @@ static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembl if (!(src = build_source_filename( manifest, file ))) goto done; len = len_sxsdir + len_name + lstrlenW( file->name ); - if (!(dst = HeapAlloc( GetProcessHeap(), 0, (len + 2) * sizeof(WCHAR) ))) + if (!(dst = malloc( (len + 2) * sizeof(WCHAR) ))) { - HeapFree( GetProcessHeap(), 0, src ); + free( src ); goto done; } lstrcpyW( dst, sxsdir ); @@ -647,8 +647,8 @@ static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembl for (p = dst; *p; p++) *p = towlower( *p ); ret = CopyFileW( src, dst, FALSE ); - HeapFree( GetProcessHeap(), 0, src ); - HeapFree( GetProcessHeap(), 0, dst ); + free( src ); + free( dst ); if (!ret) { hr = HRESULT_FROM_WIN32( GetLastError() ); @@ -659,7 +659,7 @@ static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembl hr = S_OK; done: - HeapFree( GetProcessHeap(), 0, name ); + free( name ); return hr; } @@ -711,7 +711,7 @@ static HRESULT uninstall_assembly( struct assembly *assembly ) name = build_assembly_name( assembly->arch, assembly->name, assembly->token, assembly->version, &len_name ); if (!name) return E_OUTOFMEMORY; - if (!(dirname = HeapAlloc( GetProcessHeap(), 0, (len_sxsdir + len_name + 1) * sizeof(WCHAR) ))) + if (!(dirname = malloc( (len_sxsdir + len_name + 1) * sizeof(WCHAR) ))) goto done; lstrcpyW( dirname, sxsdir ); lstrcpyW( dirname + len_sxsdir, name ); @@ -719,20 +719,20 @@ static HRESULT uninstall_assembly( struct assembly *assembly ) LIST_FOR_EACH_ENTRY( file, &assembly->files, struct file, entry ) { len = len_sxsdir + len_name + 1 + lstrlenW( file->name ); - if (!(filename = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) goto done; + if (!(filename = malloc( (len + 1) * sizeof(WCHAR) ))) goto done; lstrcpyW( filename, dirname ); lstrcatW( filename, backslashW ); lstrcatW( filename, file->name ); if (!DeleteFileW( filename )) WARN( "failed to delete file %lu\n", GetLastError() ); - HeapFree( GetProcessHeap(), 0, filename ); + free( filename ); } RemoveDirectoryW( dirname ); hr = S_OK; done: - HeapFree( GetProcessHeap(), 0, dirname ); - HeapFree( GetProcessHeap(), 0, name ); + free( dirname ); + free( name ); return hr; } @@ -800,7 +800,7 @@ static HRESULT WINAPI cache_UninstallAssembly( done: if (name_obj) IAssemblyName_Release( name_obj ); - HeapFree( GetProcessHeap(), 0, path ); + free( path ); free_assembly( assembly ); if (doc) IXMLDOMDocument_Release( doc ); if (SUCCEEDED(init)) CoUninitialize(); @@ -834,7 +834,7 @@ HRESULT WINAPI CreateAssemblyCache( IAssemblyCache **obj, DWORD reserved ) *obj = NULL; - cache = HeapAlloc( GetProcessHeap(), 0, sizeof(struct cache) ); + cache = malloc( sizeof(*cache) ); if (!cache) return E_OUTOFMEMORY; @@ -843,7 +843,7 @@ HRESULT WINAPI CreateAssemblyCache( IAssemblyCache **obj, DWORD reserved ) cache->lock = CreateMutexW( NULL, FALSE, cache_mutex_nameW ); if (!cache->lock) { - HeapFree( GetProcessHeap(), 0, cache ); + free( cache ); return HRESULT_FROM_WIN32( GetLastError() ); } *obj = &cache->IAssemblyCache_iface; diff --git a/dlls/sxs/name.c b/dlls/sxs/name.c index 29368b6d788..4772c7317c5 100644 --- a/dlls/sxs/name.c +++ b/dlls/sxs/name.c @@ -88,12 +88,12 @@ static ULONG WINAPI name_Release( IAssemblyName *iface ) if (!refs) { TRACE("destroying %p\n", name); - HeapFree( GetProcessHeap(), 0, name->name ); - HeapFree( GetProcessHeap(), 0, name->arch ); - HeapFree( GetProcessHeap(), 0, name->token ); - HeapFree( GetProcessHeap(), 0, name->type ); - HeapFree( GetProcessHeap(), 0, name->version ); - HeapFree( GetProcessHeap(), 0, name ); + free( name->name ); + free( name->arch ); + free( name->token ); + free( name->type ); + free( name->version ); + free( name ); } return refs; } @@ -251,9 +251,9 @@ static HRESULT WINAPI name_GetVersion( TRACE("%p, %p, %p\n", iface, high, low); if (!name->version) return HRESULT_FROM_WIN32( ERROR_NOT_FOUND ); - if (!(version = strdupW( name->version ))) return E_OUTOFMEMORY; + if (!(version = wcsdup( name->version ))) return E_OUTOFMEMORY; hr = parse_version( version, high, low ); - HeapFree( GetProcessHeap(), 0, version ); + free( version ); return hr; } @@ -300,7 +300,7 @@ static WCHAR *parse_value( const WCHAR *str, unsigned int *len ) if (!*p) return NULL; *len = p - str; - if (!(ret = HeapAlloc( GetProcessHeap(), 0, *len * sizeof(WCHAR) ))) return NULL; + if (!(ret = malloc( *len * sizeof(WCHAR) ))) return NULL; memcpy( ret, str + 1, (*len - 1) * sizeof(WCHAR) ); ret[*len - 1] = 0; return ret; @@ -314,7 +314,7 @@ static HRESULT parse_displayname( struct name *name, const WCHAR *displayname ) p = q = displayname; while (*q && *q != ',') q++; len = q - p; - if (!(name->name = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + if (!(name->name = malloc( (len + 1) * sizeof(WCHAR) ))) return E_OUTOFMEMORY; memcpy( name->name, p, len * sizeof(WCHAR) ); name->name[len] = 0; if (!*q) return S_OK; @@ -376,7 +376,7 @@ HRESULT WINAPI CreateAssemblyNameObject( if (!assembly || !assembly[0] || flags != CANOF_PARSE_DISPLAY_NAME) return E_INVALIDARG; - if (!(name = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*name) ))) + if (!(name = calloc(1, sizeof(*name) ))) return E_OUTOFMEMORY; name->IAssemblyName_iface.lpVtbl = &name_vtbl; @@ -385,12 +385,12 @@ HRESULT WINAPI CreateAssemblyNameObject( hr = parse_displayname( name, assembly ); if (hr != S_OK) { - HeapFree( GetProcessHeap(), 0, name->name ); - HeapFree( GetProcessHeap(), 0, name->arch ); - HeapFree( GetProcessHeap(), 0, name->token ); - HeapFree( GetProcessHeap(), 0, name->type ); - HeapFree( GetProcessHeap(), 0, name->version ); - HeapFree( GetProcessHeap(), 0, name ); + free( name->name ); + free( name->arch ); + free( name->token ); + free( name->type ); + free( name->version ); + free( name ); return hr; } *obj = &name->IAssemblyName_iface; diff --git a/dlls/sxs/sxs.c b/dlls/sxs/sxs.c index 934aa9345c8..150a49a322f 100644 --- a/dlls/sxs/sxs.c +++ b/dlls/sxs/sxs.c @@ -19,11 +19,11 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" -#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(sxs); @@ -147,7 +147,7 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff goto out; } - assembly_info = heap_alloc(bytes_assembly_info); + assembly_info = malloc(bytes_assembly_info); if (!(retval = QueryActCtxW(0, guid_info.hActCtx, &guid_info.ulAssemblyRosterIndex, AssemblyDetailedInformationInActivationContext, assembly_info, bytes_assembly_info, &bytes_assembly_info))) @@ -219,6 +219,6 @@ out: if (flags & SXS_LOOKUP_CLR_GUID_USE_ACTCTX) DeactivateActCtx(0, cookie); - heap_free(assembly_info); + free(assembly_info); return retval; } diff --git a/dlls/sxs/sxs_private.h b/dlls/sxs/sxs_private.h index c03e6db566e..4ae6bb8e2fc 100644 --- a/dlls/sxs/sxs_private.h +++ b/dlls/sxs/sxs_private.h @@ -26,13 +26,3 @@ enum name_attr_id }; const WCHAR *get_name_attribute( IAssemblyName *, enum name_attr_id ) DECLSPEC_HIDDEN; - -static inline WCHAR *strdupW( const WCHAR *src ) -{ - WCHAR *dst; - - if (!src) return NULL; - dst = HeapAlloc( GetProcessHeap(), 0, (lstrlenW( src ) + 1) * sizeof(WCHAR) ); - if (dst) lstrcpyW( dst, src ); - return dst; -} -- 2.35.1

1 0

[PATCH] fusion: Use CRT memory allocation functions.
by Nikolay Sivov 30 Mar '22

30 Mar '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/fusion/asmcache.c | 44 +++++++++++++++++++------------------- dlls/fusion/asmenum.c | 14 ++++++------ dlls/fusion/asmname.c | 46 +++++++++++++++++++--------------------- dlls/fusion/assembly.c | 26 +++++++++++------------ dlls/fusion/fusionpriv.h | 14 ------------ 5 files changed, 64 insertions(+), 80 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index b9cb505de86..88805bb354b 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -62,7 +62,7 @@ static BOOL create_full_path(LPCWSTR path) BOOL ret = TRUE; int len; - if (!(new_path = heap_alloc((lstrlenW(path) + 1) * sizeof(WCHAR)))) return FALSE; + if (!(new_path = malloc((lstrlenW(path) + 1) * sizeof(WCHAR)))) return FALSE; lstrcpyW(new_path, path); @@ -100,7 +100,7 @@ static BOOL create_full_path(LPCWSTR path) new_path[len] = '\\'; } - heap_free(new_path); + free(new_path); return ret; } @@ -197,7 +197,7 @@ static ULONG WINAPI IAssemblyCacheImpl_Release(IAssemblyCache *iface) if (!refCount) { CloseHandle( cache->lock ); - heap_free( cache ); + free( cache ); } return refCount; } @@ -255,7 +255,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_UninstallAssembly(IAssemblyCache *iface if (hr != HRESULT_FROM_WIN32( ERROR_INSUFFICIENT_BUFFER )) goto done; - if (!(path = heap_alloc( len * sizeof(WCHAR) ))) + if (!(path = malloc( len * sizeof(WCHAR) ))) { hr = E_OUTOFMEMORY; goto done; @@ -290,7 +290,7 @@ done: IAssemblyName_Release( asmname ); if (next) IAssemblyName_Release( next ); if (asmenum) IAssemblyEnum_Release( asmenum ); - heap_free( path ); + free( path ); cache_unlock( cache ); return hr; } @@ -372,7 +372,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_CreateAssemblyCacheItem(IAssemblyCache *ppAsmItem = NULL; - if (!(item = heap_alloc(sizeof(*item)))) return E_OUTOFMEMORY; + if (!(item = malloc(sizeof(*item)))) return E_OUTOFMEMORY; item->IAssemblyCacheItem_iface.lpVtbl = &AssemblyCacheItemVtbl; item->ref = 1; @@ -395,22 +395,22 @@ static HRESULT copy_file( const WCHAR *src_dir, DWORD src_len, const WCHAR *dst_ DWORD len = lstrlenW( filename ); HRESULT hr = S_OK; - if (!(src_file = heap_alloc( (src_len + len + 1) * sizeof(WCHAR) ))) + if (!(src_file = malloc( (src_len + len + 1) * sizeof(WCHAR) ))) return E_OUTOFMEMORY; memcpy( src_file, src_dir, src_len * sizeof(WCHAR) ); lstrcpyW( src_file + src_len, filename ); - if (!(dst_file = heap_alloc( (dst_len + len + 1) * sizeof(WCHAR) ))) + if (!(dst_file = malloc( (dst_len + len + 1) * sizeof(WCHAR) ))) { - heap_free( src_file ); + free( src_file ); return E_OUTOFMEMORY; } memcpy( dst_file, dst_dir, dst_len * sizeof(WCHAR) ); lstrcpyW( dst_file + dst_len, filename ); if (!CopyFileW( src_file, dst_file, FALSE )) hr = HRESULT_FROM_WIN32( GetLastError() ); - heap_free( src_file ); - heap_free( dst_file ); + free( src_file ); + free( dst_file ); return hr; } @@ -483,7 +483,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, get_assembly_directory(asmdir, MAX_PATH, clr_version, architecture); dst_len += lstrlenW(asmdir) + lstrlenW(name) + lstrlenW(version) + lstrlenW(token); - if (!(dst_dir = heap_alloc(dst_len * sizeof(WCHAR)))) + if (!(dst_dir = malloc(dst_len * sizeof(WCHAR)))) { hr = E_OUTOFMEMORY; goto done; @@ -523,13 +523,13 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, } done: - heap_free(name); - heap_free(token); - heap_free(version); - heap_free(asmpath); - heap_free(dst_dir); - for (i = 0; i < count; i++) heap_free(external_files[i]); - heap_free(external_files); + free(name); + free(token); + free(version); + free(asmpath); + free(dst_dir); + for (i = 0; i < count; i++) free(external_files[i]); + free(external_files); assembly_release(assembly); cache_unlock( cache ); return hr; @@ -560,14 +560,14 @@ HRESULT WINAPI CreateAssemblyCache(IAssemblyCache **ppAsmCache, DWORD dwReserved *ppAsmCache = NULL; - if (!(cache = heap_alloc(sizeof(*cache)))) return E_OUTOFMEMORY; + if (!(cache = malloc(sizeof(*cache)))) return E_OUTOFMEMORY; cache->IAssemblyCache_iface.lpVtbl = &AssemblyCacheVtbl; cache->ref = 1; cache->lock = CreateMutexW( NULL, FALSE, cache_mutex_nameW ); if (!cache->lock) { - heap_free( cache ); + free( cache ); return HRESULT_FROM_WIN32( GetLastError() ); } *ppAsmCache = &cache->IAssemblyCache_iface; @@ -620,7 +620,7 @@ static ULONG WINAPI IAssemblyCacheItemImpl_Release(IAssemblyCacheItem *iface) TRACE("(%p)->(ref before = %lu)\n", This, refCount + 1); if (!refCount) - heap_free(This); + free(This); return refCount; } diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index d545e2533b5..8a35951accc 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -105,10 +105,10 @@ static ULONG WINAPI IAssemblyEnumImpl_Release(IAssemblyEnum *iface) list_remove(&asmname->entry); IAssemblyName_Release(asmname->name); - heap_free(asmname); + free(asmname); } - heap_free(This); + free(This); } return refCount; @@ -354,7 +354,7 @@ static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, } swprintf(disp, ARRAY_SIZE(disp), name_fmt, parent, version, token); - if (!(asmname = heap_alloc(sizeof(*asmname)))) + if (!(asmname = malloc(sizeof(*asmname)))) { hr = E_OUTOFMEMORY; break; @@ -364,7 +364,7 @@ static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, CANOF_PARSE_DISPLAY_NAME, NULL); if (FAILED(hr)) { - heap_free(asmname); + free(asmname); break; } @@ -372,7 +372,7 @@ static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, if (FAILED(hr)) { IAssemblyName_Release(asmname->name); - heap_free(asmname); + free(asmname); break; } @@ -475,7 +475,7 @@ HRESULT WINAPI CreateAssemblyEnum(IAssemblyEnum **pEnum, IUnknown *pUnkReserved, if (dwFlags == 0 || dwFlags == ASM_CACHE_ROOT) return E_INVALIDARG; - if (!(asmenum = heap_alloc(sizeof(*asmenum)))) return E_OUTOFMEMORY; + if (!(asmenum = malloc(sizeof(*asmenum)))) return E_OUTOFMEMORY; asmenum->IAssemblyEnum_iface.lpVtbl = &AssemblyEnumVtbl; asmenum->ref = 1; @@ -486,7 +486,7 @@ HRESULT WINAPI CreateAssemblyEnum(IAssemblyEnum **pEnum, IUnknown *pUnkReserved, hr = enumerate_gac(asmenum, pName); if (FAILED(hr)) { - heap_free(asmenum); + free(asmenum); return hr; } } diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index 8a6531df0b8..1d4d588762d 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -114,12 +114,12 @@ static ULONG WINAPI IAssemblyNameImpl_Release(IAssemblyName *iface) if (!refCount) { - heap_free(This->path); - heap_free(This->displayname); - heap_free(This->name); - heap_free(This->culture); - heap_free(This->procarch); - heap_free(This); + free(This->path); + free(This->displayname); + free(This->name); + free(This->culture); + free(This->procarch); + free(This); } return refCount; @@ -521,7 +521,7 @@ HRESULT IAssemblyName_SetPath(IAssemblyName *iface, LPCWSTR path) { IAssemblyNameImpl *name = unsafe_impl_from_IAssemblyName(iface); - name->path = strdupW(path); + name->path = wcsdup(path); if (!name->path) return E_OUTOFMEMORY; @@ -576,12 +576,10 @@ static HRESULT parse_version(IAssemblyNameImpl *name, LPWSTR version) static HRESULT parse_culture(IAssemblyNameImpl *name, LPCWSTR culture) { - static const WCHAR empty[] = {0}; - if (lstrlenW(culture) == 2) - name->culture = strdupW(culture); + name->culture = wcsdup(culture); else - name->culture = strdupW(empty); + name->culture = wcsdup(L""); return S_OK; } @@ -662,7 +660,7 @@ static WCHAR *parse_value( const WCHAR *str, unsigned int len ) BOOL quoted = FALSE; unsigned int i = 0; - if (!(ret = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return NULL; + if (!(ret = malloc( (len + 1) * sizeof(WCHAR) ))) return NULL; if (*p == '\"') { quoted = TRUE; @@ -671,7 +669,7 @@ static WCHAR *parse_value( const WCHAR *str, unsigned int len ) while (*p && *p != '\"') ret[i++] = *p++; if ((quoted && *p != '\"') || (!quoted && *p == '\"')) { - heap_free( ret ); + free( ret ); return NULL; } ret[i] = 0; @@ -687,11 +685,11 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam if (!szAssemblyName) return S_OK; - name->displayname = strdupW(szAssemblyName); + name->displayname = wcsdup(szAssemblyName); if (!name->displayname) return E_OUTOFMEMORY; - str = strdupW(szAssemblyName); + str = wcsdup(szAssemblyName); save = str; if (!str) { @@ -709,7 +707,7 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam goto done; } - name->name = strdupW(str); + name->name = wcsdup(str); if (!name->name) { hr = E_OUTOFMEMORY; @@ -768,7 +766,7 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam hr = parse_procarch( name, name->procarch ); } - heap_free( value ); + free( value ); if (FAILED(hr)) goto done; @@ -777,13 +775,13 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam } done: - heap_free(save); + free(save); if (FAILED(hr)) { - heap_free(name->displayname); - heap_free(name->name); - heap_free(name->culture); - heap_free(name->procarch); + free(name->displayname); + free(name->name); + free(name->culture); + free(name->procarch); } return hr; } @@ -808,7 +806,7 @@ HRESULT WINAPI CreateAssemblyNameObject(IAssemblyName **ppAssemblyNameObj, (!szAssemblyName || !*szAssemblyName)) return E_INVALIDARG; - if (!(name = heap_alloc_zero(sizeof(*name)))) return E_OUTOFMEMORY; + if (!(name = calloc(1, sizeof(*name)))) return E_OUTOFMEMORY; name->IAssemblyName_iface.lpVtbl = &AssemblyNameVtbl; name->ref = 1; @@ -816,7 +814,7 @@ HRESULT WINAPI CreateAssemblyNameObject(IAssemblyName **ppAssemblyNameObj, hr = parse_display_name(name, szAssemblyName); if (FAILED(hr)) { - heap_free(name); + free(name); return hr; } diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index 83f08888f8a..48d5308dd4b 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -540,7 +540,7 @@ static HRESULT parse_metadata_header(ASSEMBLY *assembly, DWORD *hdrsz) metadatahdr = (METADATAHDR *)ptr; - if (!(assembly->metadatahdr = heap_alloc(sizeof(*assembly->metadatahdr)))) return E_OUTOFMEMORY; + if (!(assembly->metadatahdr = malloc(sizeof(*assembly->metadatahdr)))) return E_OUTOFMEMORY; size = FIELD_OFFSET(METADATAHDR, Version); memcpy(assembly->metadatahdr, metadatahdr, size); @@ -645,9 +645,9 @@ HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) *out = NULL; - if (!(assembly = heap_alloc_zero(sizeof(*assembly)))) return E_OUTOFMEMORY; + if (!(assembly = calloc(1, sizeof(*assembly)))) return E_OUTOFMEMORY; - assembly->path = strdupW(file); + assembly->path = wcsdup(file); if (!assembly->path) { hr = E_OUTOFMEMORY; @@ -696,12 +696,12 @@ HRESULT assembly_release(ASSEMBLY *assembly) if (!assembly) return S_OK; - heap_free(assembly->metadatahdr); - heap_free(assembly->path); + free(assembly->metadatahdr); + free(assembly->path); UnmapViewOfFile(assembly->data); CloseHandle(assembly->hmap); CloseHandle(assembly->hfile); - heap_free(assembly); + free(assembly); return S_OK; } @@ -714,7 +714,7 @@ static LPWSTR assembly_dup_str(const ASSEMBLY *assembly, DWORD index) len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - if ((cpy = heap_alloc(len * sizeof(WCHAR)))) + if ((cpy = malloc(len * sizeof(WCHAR)))) MultiByteToWideChar(CP_ACP, 0, str, -1, cpy, len); return cpy; @@ -749,7 +749,7 @@ HRESULT assembly_get_name(ASSEMBLY *assembly, LPWSTR *name) HRESULT assembly_get_path(const ASSEMBLY *assembly, LPWSTR *path) { - WCHAR *cpy = heap_alloc((lstrlenW(assembly->path) + 1) * sizeof(WCHAR)); + WCHAR *cpy = malloc((lstrlenW(assembly->path) + 1) * sizeof(WCHAR)); *path = cpy; if (cpy) lstrcpyW(cpy, assembly->path); @@ -776,7 +776,7 @@ HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version) if (!asmtbl) return E_FAIL; - if (!(*version = heap_alloc(24 * sizeof(WCHAR)))) + if (!(*version = malloc(24 * sizeof(WCHAR)))) return E_OUTOFMEMORY; swprintf(*version, 24, format, asmtbl->MajorVersion, asmtbl->MinorVersion, @@ -846,7 +846,7 @@ HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) for (i = size - 1; i >= size - 8; i--) tokbytes[size - i - 1] = hashdata[i]; - if (!(tok = heap_alloc((TOKEN_LENGTH + 1) * sizeof(WCHAR)))) + if (!(tok = malloc((TOKEN_LENGTH + 1) * sizeof(WCHAR)))) { hr = E_OUTOFMEMORY; goto done; @@ -890,7 +890,7 @@ HRESULT assembly_get_external_files(ASSEMBLY *assembly, LPWSTR **files, DWORD *c if (num_rows <= 0) return S_OK; - if (!(ret = heap_alloc(num_rows * sizeof(WCHAR *)))) return E_OUTOFMEMORY; + if (!(ret = malloc(num_rows * sizeof(WCHAR *)))) return E_OUTOFMEMORY; for (i = 0; i < num_rows; i++) { @@ -903,8 +903,8 @@ HRESULT assembly_get_external_files(ASSEMBLY *assembly, LPWSTR **files, DWORD *c ret[i] = assembly_dup_str(assembly, idx); if (!ret[i]) { - for (; i >= 0; i--) heap_free(ret[i]); - heap_free(ret); + for (; i >= 0; i--) free(ret[i]); + free(ret); return E_OUTOFMEMORY; } ptr += assembly->stringsz; /* skip Name field */ diff --git a/dlls/fusion/fusionpriv.h b/dlls/fusion/fusionpriv.h index 22de4ca7846..66ef7b9ff08 100644 --- a/dlls/fusion/fusionpriv.h +++ b/dlls/fusion/fusionpriv.h @@ -27,7 +27,6 @@ #include "winbase.h" #include "winuser.h" #include "winver.h" -#include "wine/heap.h" #include <pshpack1.h> @@ -442,19 +441,6 @@ HRESULT assembly_get_external_files(ASSEMBLY *assembly, LPWSTR **files, DWORD *c extern HRESULT IAssemblyName_SetPath(IAssemblyName *iface, LPCWSTR path) DECLSPEC_HIDDEN; extern HRESULT IAssemblyName_GetPath(IAssemblyName *iface, LPWSTR buf, ULONG *len) DECLSPEC_HIDDEN; -static inline LPWSTR strdupW(LPCWSTR src) -{ - LPWSTR dest; - - if (!src) - return NULL; - - if ((dest = heap_alloc((lstrlenW(src) + 1) * sizeof(WCHAR)))) - lstrcpyW(dest, src); - - return dest; -} - #define BYTES_PER_TOKEN 8 #define CHARS_PER_BYTE 2 #define TOKEN_LENGTH (BYTES_PER_TOKEN * CHARS_PER_BYTE + 1) -- 2.35.1

1 0

[v2 PATCH 1/3] scrobj: Use CRT allocation functions.
by Nikolay Sivov 30 Mar '22

30 Mar '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: missed some Heap* calls. dlls/scrobj/scrobj.c | 92 ++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 50 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 0df6be1cd44..b01fa60d6a4 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -34,7 +34,6 @@ #include "xmllite.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(scrobj); @@ -243,15 +242,6 @@ static void release_typelib(void) ITypeLib_Release(typelib); } -static WCHAR *heap_strdupW(const WCHAR *str) -{ - WCHAR *ret; - size_t size = (wcslen(str) + 1) * sizeof(WCHAR); - if (!(ret = heap_alloc(size))) return NULL; - memcpy(ret, str, size); - return ret; -} - static inline struct scriptlet_global *global_from_IDispatchEx(IDispatchEx *iface) { return CONTAINING_RECORD(iface, struct scriptlet_global, IDispatchEx_iface); @@ -304,7 +294,8 @@ static ULONG WINAPI global_Release(IDispatchEx *iface) TRACE("(%p) ref=%ld\n", This, ref); - if (!ref) heap_free(This); + if (!ref) free(This); + return ref; } @@ -495,8 +486,8 @@ static ULONG WINAPI ActiveScriptSite_Release(IActiveScriptSite *iface) TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { - heap_free(This->language); - heap_free(This); + free(This->language); + free(This); } return ref; @@ -758,7 +749,8 @@ static HRESULT lookup_object_properties(struct scriptlet_instance *object, struc if (!member_cnt) return S_OK; - if (!(object->members = heap_alloc_zero(member_cnt * sizeof(*object->members)))) return E_OUTOFMEMORY; + if (!(object->members = calloc(member_cnt, sizeof(*object->members)))) + return E_OUTOFMEMORY; object->member_cnt = member_cnt; LIST_FOR_EACH_ENTRY(member, &factory->members, struct scriptlet_member, entry) @@ -858,7 +850,8 @@ static HRESULT create_script_host(const WCHAR *language, IActiveScript *origin_s struct script_host *host; HRESULT hres; - if (!(host = heap_alloc_zero(sizeof(*host)))) return E_OUTOFMEMORY; + if (!(host = calloc(1, sizeof(*host)))) + return E_OUTOFMEMORY; host->IActiveScriptSite_iface.lpVtbl = &ActiveScriptSiteVtbl; host->IActiveScriptSiteWindow_iface.lpVtbl = &ActiveScriptSiteWindowVtbl; @@ -866,7 +859,7 @@ static HRESULT create_script_host(const WCHAR *language, IActiveScript *origin_s host->ref = 1; host->state = SCRIPTSTATE_CLOSED; - if (!(host->language = heap_strdupW(language))) + if (!(host->language = wcsdup(language))) { IActiveScriptSite_Release(&host->IActiveScriptSite_iface); return E_OUTOFMEMORY; @@ -990,10 +983,10 @@ static ULONG WINAPI scriptlet_Release(IDispatchEx *iface) unsigned i; for (i = 0; i < This->member_cnt; i++) SysFreeString(This->members[i].name); - heap_free(This->members); + free(This->members); detach_script_hosts(&This->hosts); if (This->global) IDispatchEx_Release(&This->global->IDispatchEx_iface); - heap_free(This); + free(This); } return ref; } @@ -1197,13 +1190,14 @@ static HRESULT create_scriptlet_instance(struct scriptlet_factory *factory, IDis IDispatch *script_dispatch; HRESULT hres; - if (!(obj = heap_alloc_zero(sizeof(*obj)))) return E_OUTOFMEMORY; + if (!(obj = calloc(1, sizeof(*obj)))) + return E_OUTOFMEMORY; obj->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; obj->ref = 1; list_init(&obj->hosts); - if (!(obj->global = heap_alloc(sizeof(*obj->global)))) + if (!(obj->global = malloc(sizeof(*obj->global)))) { IDispatchEx_Release(&obj->IDispatchEx_iface); return E_OUTOFMEMORY; @@ -1325,7 +1319,7 @@ static HRESULT read_xml_value(struct scriptlet_factory *factory, WCHAR **ret) HRESULT hres; hres = IXmlReader_GetValue(factory->xml_reader, &str, &len); if (FAILED(hres)) return hres; - if (!(*ret = heap_alloc((len + 1) * sizeof(WCHAR)))) return E_OUTOFMEMORY; + if (!(*ret = malloc((len + 1) * sizeof(WCHAR)))) return E_OUTOFMEMORY; memcpy(*ret, str, len * sizeof(WCHAR)); (*ret)[len] = 0; return S_OK; @@ -1414,7 +1408,7 @@ static HRESULT parse_scriptlet_registration(struct scriptlet_factory *factory) size_t progid_len = wcslen(factory->progid); size_t version_len = wcslen(factory->version); - if (!(factory->versioned_progid = heap_alloc((progid_len + version_len + 2) * sizeof(WCHAR)))) + if (!(factory->versioned_progid = malloc((progid_len + version_len + 2) * sizeof(WCHAR)))) return E_OUTOFMEMORY; memcpy(factory->versioned_progid, factory->progid, (progid_len + 1) * sizeof(WCHAR)); @@ -1476,13 +1470,13 @@ static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) return E_FAIL; } - if (!(member = heap_alloc(sizeof(*member)))) return E_OUTOFMEMORY; + if (!(member = malloc(sizeof(*member)))) return E_OUTOFMEMORY; member->type = member_type; hres = read_xml_value(factory, &member->name); if (FAILED(hres)) { - heap_free(member); + free(member); return hres; } @@ -1491,7 +1485,7 @@ static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) if (!wcsicmp(member_iter->name, member->name)) { FIXME("Duplicated member %s\n", debugstr_w(member->name)); - heap_free(member); + free(member); return E_FAIL; } } @@ -1530,7 +1524,7 @@ static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) return E_FAIL; } - if (!(parameter = heap_alloc_zero(sizeof(*parameter)))) return E_OUTOFMEMORY; + if (!(parameter = calloc(1, sizeof(*parameter)))) return E_OUTOFMEMORY; list_add_tail(&member->u.parameters, &parameter->entry); hres = read_xml_value(factory, &parameter->name); @@ -1639,7 +1633,7 @@ static HRESULT parse_scriptlet_script(struct scriptlet_factory *factory, struct return E_FAIL; } - if (!(script->body = heap_alloc((buf_size = 1024) * sizeof(WCHAR)))) return E_OUTOFMEMORY; + if (!(script->body = malloc((buf_size = 1024) * sizeof(WCHAR)))) return E_OUTOFMEMORY; size = 0; for (;;) @@ -1651,12 +1645,12 @@ static HRESULT parse_scriptlet_script(struct scriptlet_factory *factory, struct if (hres == S_FALSE) break; if (size + 1 == buf_size) { - if (!(new_body = heap_realloc(script->body, (buf_size *= 2) * sizeof(WCHAR)))) return E_OUTOFMEMORY; + if (!(new_body = realloc(script->body, (buf_size *= 2) * sizeof(WCHAR)))) return E_OUTOFMEMORY; script->body = new_body; } } script->body[size++] = 0; - if (size != buf_size) script->body = heap_realloc(script->body, size * sizeof(WCHAR)); + if (size != buf_size) script->body = realloc(script->body, size * sizeof(WCHAR)); TRACE("body %s\n", debugstr_w(script->body)); return expect_end_element(factory); @@ -1725,7 +1719,7 @@ static HRESULT parse_scriptlet_file(struct scriptlet_factory *factory, const WCH else if (is_xml_name(factory, L"script")) { struct scriptlet_script *script; - if (!(script = heap_alloc_zero(sizeof(*script)))) return E_OUTOFMEMORY; + if (!(script = calloc(1, sizeof(*script)))) return E_OUTOFMEMORY; list_add_tail(&factory->scripts, &script->entry); hres = parse_scriptlet_script(factory, script); if (FAILED(hres)) return hres; @@ -1803,33 +1797,33 @@ static ULONG WINAPI scriptlet_factory_Release(IClassFactory *iface) { struct scriptlet_member *member = LIST_ENTRY(list_head(&This->members), struct scriptlet_member, entry); list_remove(&member->entry); - heap_free(member->name); + free(member->name); if (member->type == MEMBER_METHOD) { while (!list_empty(&member->u.parameters)) { struct method_parameter *parameter = LIST_ENTRY(list_head(&member->u.parameters), struct method_parameter, entry); list_remove(&parameter->entry); - heap_free(parameter->name); - heap_free(parameter); + free(parameter->name); + free(parameter); } } - heap_free(member); + free(member); } while (!list_empty(&This->scripts)) { struct scriptlet_script *script = LIST_ENTRY(list_head(&This->scripts), struct scriptlet_script, entry); list_remove(&script->entry); - heap_free(script->language); - heap_free(script->body); - heap_free(script); + free(script->language); + free(script->body); + free(script); } - heap_free(This->classid_str); - heap_free(This->description); - heap_free(This->versioned_progid); - heap_free(This->progid); - heap_free(This->version); - heap_free(This); + free(This->classid_str); + free(This->description); + free(This->versioned_progid); + free(This->progid); + free(This->version); + free(This); } return ref; } @@ -1888,7 +1882,7 @@ static HRESULT create_scriptlet_factory(const WCHAR *url, struct scriptlet_facto TRACE("%s\n", debugstr_w(url)); - if (!(factory = heap_alloc_zero(sizeof(*factory)))) + if (!(factory = calloc(1, sizeof(*factory)))) { IClassFactory_Release(&factory->IClassFactory_iface); return E_OUTOFMEMORY; @@ -2106,7 +2100,7 @@ static ULONG WINAPI scriptlet_typelib_Release(IGenScriptletTLib *iface) if (!ref) { SysFreeString(This->guid); - HeapFree(GetProcessHeap(), 0, This); + free(This); } return ref; @@ -2424,13 +2418,11 @@ static HRESULT WINAPI scriptlet_typelib_CreateInstance(IClassFactory *factory, I *obj = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); - if (!This) + if (!(This = calloc(1, sizeof(*This)))) return E_OUTOFMEMORY; This->IGenScriptletTLib_iface.lpVtbl = &scriptlet_typelib_vtbl; This->ref = 1; - This->guid = NULL; hr = IGenScriptletTLib_QueryInterface(&This->IGenScriptletTLib_iface, riid, obj); IGenScriptletTLib_Release(&This->IGenScriptletTLib_iface); @@ -2517,11 +2509,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) WCHAR *url; HRESULT hres; - if (!(url = heap_alloc(size * sizeof(WCHAR)))) return E_OUTOFMEMORY; + if (!(url = malloc(size * sizeof(WCHAR)))) return E_OUTOFMEMORY; status = RegQueryValueW(HKEY_CLASSES_ROOT, key_name, url, &size); hres = create_scriptlet_factory(url, &factory); - heap_free(url); + free(url); if (FAILED(hres)) return hres; hres = IClassFactory_QueryInterface(&factory->IClassFactory_iface, riid, ppv); -- 2.35.1

1 2

[PATCH] winex11: Check for invalid format in get_tile_pict
by Alex Henrie 30 Mar '22

30 Mar '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52747 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/winex11.drv/xrender.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 5ede97fb026..1cb7e67a477 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1230,6 +1230,8 @@ static Picture get_tile_pict( enum wxr_format wxr_format, const XRenderColor *co XRenderColor current_color; } tiles[WXR_NB_FORMATS], *tile; + if (wxr_format == WXR_INVALID_FORMAT) return 0; + tile = &tiles[wxr_format]; if(!tile->xpm) -- 2.35.1

1 0

[PATCH 1/3] scrobj: Use CRT allocation functions.
by Nikolay Sivov 30 Mar '22

30 Mar '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/scrobj/scrobj.c | 86 +++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 46 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 0df6be1cd44..7f93c146b96 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -34,7 +34,6 @@ #include "xmllite.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(scrobj); @@ -243,15 +242,6 @@ static void release_typelib(void) ITypeLib_Release(typelib); } -static WCHAR *heap_strdupW(const WCHAR *str) -{ - WCHAR *ret; - size_t size = (wcslen(str) + 1) * sizeof(WCHAR); - if (!(ret = heap_alloc(size))) return NULL; - memcpy(ret, str, size); - return ret; -} - static inline struct scriptlet_global *global_from_IDispatchEx(IDispatchEx *iface) { return CONTAINING_RECORD(iface, struct scriptlet_global, IDispatchEx_iface); @@ -304,7 +294,8 @@ static ULONG WINAPI global_Release(IDispatchEx *iface) TRACE("(%p) ref=%ld\n", This, ref); - if (!ref) heap_free(This); + if (!ref) free(This); + return ref; } @@ -495,8 +486,8 @@ static ULONG WINAPI ActiveScriptSite_Release(IActiveScriptSite *iface) TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { - heap_free(This->language); - heap_free(This); + free(This->language); + free(This); } return ref; @@ -758,7 +749,8 @@ static HRESULT lookup_object_properties(struct scriptlet_instance *object, struc if (!member_cnt) return S_OK; - if (!(object->members = heap_alloc_zero(member_cnt * sizeof(*object->members)))) return E_OUTOFMEMORY; + if (!(object->members = calloc(member_cnt, sizeof(*object->members)))) + return E_OUTOFMEMORY; object->member_cnt = member_cnt; LIST_FOR_EACH_ENTRY(member, &factory->members, struct scriptlet_member, entry) @@ -858,7 +850,8 @@ static HRESULT create_script_host(const WCHAR *language, IActiveScript *origin_s struct script_host *host; HRESULT hres; - if (!(host = heap_alloc_zero(sizeof(*host)))) return E_OUTOFMEMORY; + if (!(host = calloc(1, sizeof(*host)))) + return E_OUTOFMEMORY; host->IActiveScriptSite_iface.lpVtbl = &ActiveScriptSiteVtbl; host->IActiveScriptSiteWindow_iface.lpVtbl = &ActiveScriptSiteWindowVtbl; @@ -866,7 +859,7 @@ static HRESULT create_script_host(const WCHAR *language, IActiveScript *origin_s host->ref = 1; host->state = SCRIPTSTATE_CLOSED; - if (!(host->language = heap_strdupW(language))) + if (!(host->language = wcsdup(language))) { IActiveScriptSite_Release(&host->IActiveScriptSite_iface); return E_OUTOFMEMORY; @@ -990,10 +983,10 @@ static ULONG WINAPI scriptlet_Release(IDispatchEx *iface) unsigned i; for (i = 0; i < This->member_cnt; i++) SysFreeString(This->members[i].name); - heap_free(This->members); + free(This->members); detach_script_hosts(&This->hosts); if (This->global) IDispatchEx_Release(&This->global->IDispatchEx_iface); - heap_free(This); + free(This); } return ref; } @@ -1197,13 +1190,14 @@ static HRESULT create_scriptlet_instance(struct scriptlet_factory *factory, IDis IDispatch *script_dispatch; HRESULT hres; - if (!(obj = heap_alloc_zero(sizeof(*obj)))) return E_OUTOFMEMORY; + if (!(obj = calloc(1, sizeof(*obj)))) + return E_OUTOFMEMORY; obj->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; obj->ref = 1; list_init(&obj->hosts); - if (!(obj->global = heap_alloc(sizeof(*obj->global)))) + if (!(obj->global = malloc(sizeof(*obj->global)))) { IDispatchEx_Release(&obj->IDispatchEx_iface); return E_OUTOFMEMORY; @@ -1325,7 +1319,7 @@ static HRESULT read_xml_value(struct scriptlet_factory *factory, WCHAR **ret) HRESULT hres; hres = IXmlReader_GetValue(factory->xml_reader, &str, &len); if (FAILED(hres)) return hres; - if (!(*ret = heap_alloc((len + 1) * sizeof(WCHAR)))) return E_OUTOFMEMORY; + if (!(*ret = malloc((len + 1) * sizeof(WCHAR)))) return E_OUTOFMEMORY; memcpy(*ret, str, len * sizeof(WCHAR)); (*ret)[len] = 0; return S_OK; @@ -1414,7 +1408,7 @@ static HRESULT parse_scriptlet_registration(struct scriptlet_factory *factory) size_t progid_len = wcslen(factory->progid); size_t version_len = wcslen(factory->version); - if (!(factory->versioned_progid = heap_alloc((progid_len + version_len + 2) * sizeof(WCHAR)))) + if (!(factory->versioned_progid = malloc((progid_len + version_len + 2) * sizeof(WCHAR)))) return E_OUTOFMEMORY; memcpy(factory->versioned_progid, factory->progid, (progid_len + 1) * sizeof(WCHAR)); @@ -1476,13 +1470,13 @@ static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) return E_FAIL; } - if (!(member = heap_alloc(sizeof(*member)))) return E_OUTOFMEMORY; + if (!(member = malloc(sizeof(*member)))) return E_OUTOFMEMORY; member->type = member_type; hres = read_xml_value(factory, &member->name); if (FAILED(hres)) { - heap_free(member); + free(member); return hres; } @@ -1491,7 +1485,7 @@ static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) if (!wcsicmp(member_iter->name, member->name)) { FIXME("Duplicated member %s\n", debugstr_w(member->name)); - heap_free(member); + free(member); return E_FAIL; } } @@ -1530,7 +1524,7 @@ static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) return E_FAIL; } - if (!(parameter = heap_alloc_zero(sizeof(*parameter)))) return E_OUTOFMEMORY; + if (!(parameter = calloc(1, sizeof(*parameter)))) return E_OUTOFMEMORY; list_add_tail(&member->u.parameters, &parameter->entry); hres = read_xml_value(factory, &parameter->name); @@ -1639,7 +1633,7 @@ static HRESULT parse_scriptlet_script(struct scriptlet_factory *factory, struct return E_FAIL; } - if (!(script->body = heap_alloc((buf_size = 1024) * sizeof(WCHAR)))) return E_OUTOFMEMORY; + if (!(script->body = malloc((buf_size = 1024) * sizeof(WCHAR)))) return E_OUTOFMEMORY; size = 0; for (;;) @@ -1651,12 +1645,12 @@ static HRESULT parse_scriptlet_script(struct scriptlet_factory *factory, struct if (hres == S_FALSE) break; if (size + 1 == buf_size) { - if (!(new_body = heap_realloc(script->body, (buf_size *= 2) * sizeof(WCHAR)))) return E_OUTOFMEMORY; + if (!(new_body = realloc(script->body, (buf_size *= 2) * sizeof(WCHAR)))) return E_OUTOFMEMORY; script->body = new_body; } } script->body[size++] = 0; - if (size != buf_size) script->body = heap_realloc(script->body, size * sizeof(WCHAR)); + if (size != buf_size) script->body = realloc(script->body, size * sizeof(WCHAR)); TRACE("body %s\n", debugstr_w(script->body)); return expect_end_element(factory); @@ -1725,7 +1719,7 @@ static HRESULT parse_scriptlet_file(struct scriptlet_factory *factory, const WCH else if (is_xml_name(factory, L"script")) { struct scriptlet_script *script; - if (!(script = heap_alloc_zero(sizeof(*script)))) return E_OUTOFMEMORY; + if (!(script = calloc(1, sizeof(*script)))) return E_OUTOFMEMORY; list_add_tail(&factory->scripts, &script->entry); hres = parse_scriptlet_script(factory, script); if (FAILED(hres)) return hres; @@ -1803,33 +1797,33 @@ static ULONG WINAPI scriptlet_factory_Release(IClassFactory *iface) { struct scriptlet_member *member = LIST_ENTRY(list_head(&This->members), struct scriptlet_member, entry); list_remove(&member->entry); - heap_free(member->name); + free(member->name); if (member->type == MEMBER_METHOD) { while (!list_empty(&member->u.parameters)) { struct method_parameter *parameter = LIST_ENTRY(list_head(&member->u.parameters), struct method_parameter, entry); list_remove(&parameter->entry); - heap_free(parameter->name); - heap_free(parameter); + free(parameter->name); + free(parameter); } } - heap_free(member); + free(member); } while (!list_empty(&This->scripts)) { struct scriptlet_script *script = LIST_ENTRY(list_head(&This->scripts), struct scriptlet_script, entry); list_remove(&script->entry); - heap_free(script->language); - heap_free(script->body); - heap_free(script); + free(script->language); + free(script->body); + free(script); } - heap_free(This->classid_str); - heap_free(This->description); - heap_free(This->versioned_progid); - heap_free(This->progid); - heap_free(This->version); - heap_free(This); + free(This->classid_str); + free(This->description); + free(This->versioned_progid); + free(This->progid); + free(This->version); + free(This); } return ref; } @@ -1888,7 +1882,7 @@ static HRESULT create_scriptlet_factory(const WCHAR *url, struct scriptlet_facto TRACE("%s\n", debugstr_w(url)); - if (!(factory = heap_alloc_zero(sizeof(*factory)))) + if (!(factory = calloc(1, sizeof(*factory)))) { IClassFactory_Release(&factory->IClassFactory_iface); return E_OUTOFMEMORY; @@ -2517,11 +2511,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) WCHAR *url; HRESULT hres; - if (!(url = heap_alloc(size * sizeof(WCHAR)))) return E_OUTOFMEMORY; + if (!(url = malloc(size * sizeof(WCHAR)))) return E_OUTOFMEMORY; status = RegQueryValueW(HKEY_CLASSES_ROOT, key_name, url, &size); hres = create_scriptlet_factory(url, &factory); - heap_free(url); + free(url); if (FAILED(hres)) return hres; hres = IClassFactory_QueryInterface(&factory->IClassFactory_iface, riid, ppv); -- 2.35.1

1 2

[PATCH] ntoskrnl.exe: Make USD pointers volatile to silent a warning.
by Rémi Bernon 29 Mar '22

29 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntoskrnl.exe/instr.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 8f1aa4d45a3..05976c38b27 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -497,8 +497,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(int); #define SIB_BASE( sib, rex ) (((sib) & 7) | (((rex) & REX_B) ? 8 : 0)) /* keep in sync with dlls/ntdll/thread.c:thread_init */ -static const BYTE *wine_user_shared_data = (BYTE *)0x7ffe0000; -static const BYTE *user_shared_data = (BYTE *)0xfffff78000000000; +static const volatile BYTE *const volatile wine_user_shared_data = (BYTE *)0x7ffe0000; +static const volatile BYTE *const volatile user_shared_data = (BYTE *)0xfffff78000000000; static inline DWORD64 *get_int_reg( CONTEXT *context, int index ) { @@ -843,7 +843,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) ULONGLONG temp = 0; TRACE("USD offset %#x at %p.\n", (unsigned int)offset, (void *)context->Rip); - memcpy( &temp, wine_user_shared_data + offset, data_size ); + memcpy( &temp, (BYTE *)wine_user_shared_data + offset, data_size ); store_reg_word( context, instr[2], (BYTE *)&temp, long_op, rex, INSTR_OP_MOV ); context->Rip += prefixlen + len + 2; return ExceptionContinueExecution; @@ -869,19 +869,19 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) switch (*instr) { case 0x8a: - store_reg_byte( context, instr[1], wine_user_shared_data + offset, + store_reg_byte( context, instr[1], (BYTE *)wine_user_shared_data + offset, rex, INSTR_OP_MOV ); break; case 0x8b: - store_reg_word( context, instr[1], wine_user_shared_data + offset, + store_reg_word( context, instr[1], (BYTE *)wine_user_shared_data + offset, long_op, rex, INSTR_OP_MOV ); break; case 0x0b: - store_reg_word( context, instr[1], wine_user_shared_data + offset, + store_reg_word( context, instr[1], (BYTE *)wine_user_shared_data + offset, long_op, rex, INSTR_OP_OR ); break; case 0x33: - store_reg_word( context, instr[1], wine_user_shared_data + offset, + store_reg_word( context, instr[1], (BYTE *)wine_user_shared_data + offset, long_op, rex, INSTR_OP_XOR ); break; } @@ -902,7 +902,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) if (offset <= KSHARED_USER_DATA_PAGE_SIZE - data_size) { TRACE("USD offset %#x at %p.\n", (unsigned int)offset, (void *)context->Rip); - memcpy( &context->Rax, wine_user_shared_data + offset, data_size ); + memcpy( &context->Rax, (BYTE *)wine_user_shared_data + offset, data_size ); context->Rip += prefixlen + len + 1; return ExceptionContinueExecution; } -- 2.35.1

2 4

[PATCH] dlls/{mciwave, winmm}: properly handle mmioRead/mmioWrite in case of errors
by Eric Pouech 29 Mar '22

29 Mar '22

In C, an inequality comparison between a signed and an unsigned integer ends up with an unsigned comparison. So, force signed comparison to catch both case of errors and partial read operation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52628 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mciwave/mciwave.c | 3 ++- dlls/winmm/mmio.c | 8 +++----- dlls/winmm/playsound.c | 3 ++- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 1d9abce84a3..3bb271f66ec 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -291,7 +291,8 @@ static DWORD WAVE_mciReadFmt(WINE_MCIWAVE* wmw, const MMCKINFO* pckMainRIFF) if (!pwfx) return MCIERR_OUT_OF_MEMORY; r = mmioRead(wmw->hFile, (HPSTR)pwfx, mmckInfo.cksize); - if (r < sizeof(PCMWAVEFORMAT)) { + /* forcing signed comparison to catch errors (negative value) as well */ + if (r < (LONG)sizeof(PCMWAVEFORMAT)) { HeapFree(GetProcessHeap(), 0, pwfx); return MCIERR_INVALID_FILE; } diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 352da62a215..3bcde1fe34b 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -1231,10 +1231,8 @@ MMRESULT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck, while (TRUE) { - LONG ix; - - ix = mmioRead(hmmio, (LPSTR)lpck, 3 * sizeof(DWORD)); - if (ix < 2*sizeof(DWORD)) + /* forcing signed comparison to catch errors as well */ + if (mmioRead(hmmio, (LPSTR)lpck, 3 * sizeof(DWORD)) < (LONG)(2*sizeof(DWORD))) { mmioSeek(hmmio, dwOldPos, SEEK_SET); WARN("return ChunkNotFound\n"); @@ -1336,7 +1334,7 @@ MMRESULT WINAPI mmioCreateChunk(HMMIO hmmio, MMCKINFO* lpck, UINT uFlags) ix = mmioWrite(hmmio, (LPSTR)lpck, size); TRACE("after mmioWrite ix = %ld req = %ld, errno = %d\n", ix, size, errno); - if (ix < size) { + if (ix != size) { mmioSeek(hmmio, dwOldPos, SEEK_SET); WARN("return CannotWrite\n"); return MMIOERR_CANNOTWRITE; diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 0858f958583..95131bddce6 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -361,7 +361,8 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) lpWaveFormat = HeapAlloc(GetProcessHeap(), 0, mmckInfo.cksize); if (!lpWaveFormat) goto errCleanUp; - if (mmioRead(hmmio, (HPSTR)lpWaveFormat, mmckInfo.cksize) < sizeof(PCMWAVEFORMAT)) + /* forcing signed comparison to catch errors as well */ + if (mmioRead(hmmio, (HPSTR)lpWaveFormat, mmckInfo.cksize) < (LONG)sizeof(PCMWAVEFORMAT)) goto errCleanUp; TRACE("wFormatTag=%04X !\n", lpWaveFormat->wFormatTag);

2 1

[PATCH] mciseq: Print data only when successfully read.
by Rémi Bernon 29 Mar '22

29 Mar '22

This may lead to a uninitialized use of twd otherwise. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mciseq/mcimidi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 4211ed5ca4a..2d3c4975296 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -937,8 +937,8 @@ static DWORD MIDI_player(WINE_MCIMIDI* wmm, DWORD dwFlags) if (TRACE_ON(mcimidi)) { WORD twd; - MIDI_mciReadWord(wmm, &twd); /* == 0 */ - TRACE("Got sequence number %u\n", twd); + if (MIDI_mciReadWord(wmm, &twd)) WARN("Failed to read word\n"); + else TRACE("Got sequence number %u\n", twd); } break; case 0x01: /* any text */ -- 2.35.1

1 0

[PATCH] kernelbase/tests: Initialize input buffer to silent a warning.
by Rémi Bernon 29 Mar '22

29 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- FWIW the issue here is the same as in the other patches sent earlier, where GCC warns about an non-initialized buffer being passed as a pointer to const, probably assuming that it is then an input parameter and that uninitialized data might be read from it. dlls/kernelbase/tests/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 1c0c8a2318b..dc0d3cc1184 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -1189,7 +1189,7 @@ static void test_PathCchCanonicalize(void) static void test_PathCchCanonicalizeEx(void) { - WCHAR path_inW[PATHCCH_MAX_CCH + 1], path_outW[PATHCCH_MAX_CCH]; + WCHAR path_inW[PATHCCH_MAX_CCH + 1] = {0}, path_outW[PATHCCH_MAX_CCH]; CHAR path_outA[4096]; BOOL skip_new_flags = TRUE; HRESULT hr; -- 2.35.1

1 0

[PATCH] user.exe16: Initialize RECT to silent a warning.
by Rémi Bernon 29 Mar '22

29 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user.exe16/message.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 915585267d6..ef34ee5906a 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -1385,7 +1385,7 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT case LB_GETSELITEMS: { INT *items32 = (INT *)lParam; - INT16 *items, buffer[512]; + INT16 *items, buffer[512] = {0}; unsigned int i; wParam = min( wParam, 0x7f80 ); /* Must be < 64K */ @@ -1451,7 +1451,7 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT case CB_GETDROPPEDCONTROLRECT: { RECT *r32 = (RECT *)lParam; - RECT16 rect; + RECT16 rect = {0}; lParam = MapLS( &rect ); ret = callback( HWND_16(hwnd), (msg == LB_GETITEMRECT) ? LB_GETITEMRECT16 : CB_GETDROPPEDCONTROLRECT16, -- 2.35.1

1 0

[PATCH] shlwapi/tests: Initialize input buffer to silent a warning.
by Rémi Bernon 29 Mar '22

29 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/shlwapi/tests/clist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/tests/clist.c b/dlls/shlwapi/tests/clist.c index 5f88e92a5a6..54bff21ae8d 100644 --- a/dlls/shlwapi/tests/clist.c +++ b/dlls/shlwapi/tests/clist.c @@ -567,7 +567,7 @@ static void test_IStream_Read(void) static void test_IStream_Write(void) { struct dummystream streamobj; - char buff[256]; + char buff[256] = {0}; HRESULT hRet; if (!pIStream_Write) -- 2.35.1

1 0

[PATCH v4 1/5] windows.media.speech: Add IVector<HSTRING>.
by Rémi Bernon 29 Mar '22

29 Mar '22

From: Bernhard Kölbl <besentv(a)gmail.com> And use it in listconstraint. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v4: Add missing call to impl_from_IIterator_HSTRING. dlls/windows.media.speech/Makefile.in | 3 +- dlls/windows.media.speech/listconstraint.c | 11 +- dlls/windows.media.speech/private.h | 2 + dlls/windows.media.speech/vector.c | 313 +++++++++++++++++++++ 4 files changed, 326 insertions(+), 3 deletions(-) create mode 100644 dlls/windows.media.speech/vector.c diff --git a/dlls/windows.media.speech/Makefile.in b/dlls/windows.media.speech/Makefile.in index 5dbdb03cf2f..5a8291ba6f0 100644 --- a/dlls/windows.media.speech/Makefile.in +++ b/dlls/windows.media.speech/Makefile.in @@ -6,6 +6,7 @@ C_SRCS = \ listconstraint.c \ main.c \ recognizer.c \ - synthesizer.c + synthesizer.c \ + vector.c IDL_SRCS = classes.idl diff --git a/dlls/windows.media.speech/listconstraint.c b/dlls/windows.media.speech/listconstraint.c index d641902f4bc..0c486a415a7 100644 --- a/dlls/windows.media.speech/listconstraint.c +++ b/dlls/windows.media.speech/listconstraint.c @@ -36,6 +36,7 @@ struct list_constraint LONG ref; BOOLEAN enabled; + IVector_HSTRING *commands; }; /* @@ -91,7 +92,10 @@ static ULONG WINAPI list_constraint_Release( ISpeechRecognitionListConstraint *i TRACE("iface %p, ref %lu.\n", iface, ref); if (!ref) + { + IVector_HSTRING_Release(impl->commands); free(impl); + } return ref; } @@ -337,12 +341,15 @@ static HRESULT WINAPI constraint_factory_CreateWithTag( ISpeechRecognitionListCo TRACE("iface %p, commands %p, tag %p, listconstraint %p.\n", iface, commands, tag, listconstraint); + *listconstraint = NULL; + if (!commands) return E_POINTER; - if (!(impl = calloc(1, sizeof(*impl)))) + if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; + if (FAILED(vector_hstring_create(&impl->commands))) { - *listconstraint = NULL; + free(impl); return E_OUTOFMEMORY; } diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h index 3e2fa9aed38..a09b5f5ef7e 100644 --- a/dlls/windows.media.speech/private.h +++ b/dlls/windows.media.speech/private.h @@ -66,6 +66,8 @@ HRESULT typed_event_handlers_remove( struct list *list, EventRegistrationToken * HRESULT typed_event_handlers_notify( struct list *list, IInspectable *sender, IInspectable *args ); HRESULT typed_event_handlers_clear( struct list* list ); +HRESULT vector_hstring_create( IVector_HSTRING **out ); + #define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ static inline impl_type *impl_from( iface_type *iface ) \ { \ diff --git a/dlls/windows.media.speech/vector.c b/dlls/windows.media.speech/vector.c new file mode 100644 index 00000000000..13a36499a46 --- /dev/null +++ b/dlls/windows.media.speech/vector.c @@ -0,0 +1,313 @@ +/* WinRT Windows.Media.Speech implementation + * + * Copyright 2022 Bernhard Kölbl for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(speech); + +/* + * + * IVector<HSTRING> + * + */ + +struct vector_hstring +{ + IVector_HSTRING IVector_HSTRING_iface; + LONG ref; + + UINT32 size; + UINT32 capacity; + HSTRING *elements; +}; + +static inline struct vector_hstring *impl_from_IVector_HSTRING( IVector_HSTRING *iface ) +{ + return CONTAINING_RECORD(iface, struct vector_hstring, IVector_HSTRING_iface); +} + +static HRESULT WINAPI vector_hstring_QueryInterface( IVector_HSTRING *iface, REFIID iid, void **out ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, &IID_IVector_HSTRING)) + { + IInspectable_AddRef((*out = &impl->IVector_HSTRING_iface)); + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI vector_hstring_AddRef( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %lu.\n", iface, ref); + return ref; +} + +static ULONG WINAPI vector_hstring_Release( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + + TRACE("iface %p, ref %lu.\n", iface, ref); + + if (!ref) + { + IVector_HSTRING_Clear(iface); + free(impl); + } + + return ref; +} + +static HRESULT WINAPI vector_hstring_GetIids( IVector_HSTRING *iface, ULONG *iid_count, IID **iids ) +{ + FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_GetRuntimeClassName( IVector_HSTRING *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_GetTrustLevel( IVector_HSTRING *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_GetAt( IVector_HSTRING *iface, UINT32 index, HSTRING *value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + *value = NULL; + if (index >= impl->size) return E_BOUNDS; + + return WindowsDuplicateString(impl->elements[index], value); +} + +static HRESULT WINAPI vector_hstring_get_Size( IVector_HSTRING *iface, UINT32 *value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + TRACE( "iface %p, value %p.\n", iface, value ); + *value = impl->size; + return S_OK; +} + +static HRESULT WINAPI vector_hstring_GetView( IVector_HSTRING *iface, IVectorView_HSTRING **value ) +{ + FIXME("iface %p, value %p stub!\n", iface, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_IndexOf( IVector_HSTRING *iface, HSTRING element, UINT32 *index, BOOLEAN *found ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + ULONG i; + + TRACE("iface %p, element %p, index %p, found %p.\n", iface, element, index, found); + + for (i = 0; i < impl->size; ++i) if (impl->elements[i] == element) break; + if ((*found = (i < impl->size))) *index = i; + else *index = 0; + + return S_OK; +} + +static HRESULT WINAPI vector_hstring_SetAt( IVector_HSTRING *iface, UINT32 index, HSTRING value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + HSTRING tmp; + HRESULT hr; + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + if (index >= impl->size) return E_BOUNDS; + + if (FAILED(hr = WindowsDuplicateString(value, &tmp))) return hr; + + WindowsDeleteString(impl->elements[index]); + impl->elements[index] = tmp; + return S_OK; +} + +static HRESULT WINAPI vector_hstring_InsertAt( IVector_HSTRING *iface, UINT32 index, HSTRING value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + HSTRING tmp, *tmp2 = impl->elements; + HRESULT hr; + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + if (FAILED(hr = WindowsDuplicateString(value, &tmp))) return hr; + + if (impl->size == impl->capacity) + { + impl->capacity = max(32, impl->capacity * 3 / 2); + if (!(impl->elements = realloc(impl->elements, impl->capacity * sizeof(*impl->elements)))) + { + impl->elements = tmp2; + return E_OUTOFMEMORY; + } + } + + memmove(impl->elements + index + 1, impl->elements + index, (impl->size++ - index) * sizeof(*impl->elements)); + impl->elements[index] = tmp; + return S_OK; +} + +static HRESULT WINAPI vector_hstring_RemoveAt( IVector_HSTRING *iface, UINT32 index ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p, index %u.\n", iface, index); + + if (index >= impl->size) return E_BOUNDS; + + WindowsDeleteString(impl->elements[index]); + memmove(impl->elements + index, impl->elements + index + 1, (--impl->size - index) * sizeof(*impl->elements)); + return S_OK; +} + +static HRESULT WINAPI vector_hstring_Append( IVector_HSTRING *iface, HSTRING value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p, value %p.\n", iface, value); + + return IVector_HSTRING_InsertAt(iface, impl->size, value); +} + +static HRESULT WINAPI vector_hstring_RemoveAtEnd( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p.\n", iface); + + if (impl->size) WindowsDeleteString(impl->elements[--impl->size]); + return S_OK; +} + +static HRESULT WINAPI vector_hstring_Clear( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p.\n", iface); + + while (impl->size) IVector_HSTRING_RemoveAtEnd(iface); + free(impl->elements); + impl->capacity = 0; + impl->elements = NULL; + + return S_OK; +} + +static HRESULT WINAPI vector_hstring_GetMany( IVector_HSTRING *iface, UINT32 start_index, + UINT32 items_size, HSTRING *items, UINT32 *count ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + HRESULT hr; + UINT32 i; + + TRACE("iface %p, start_index %u, items_size %u, items %p, count %p.\n", iface, start_index, items_size, items, count); + + if (start_index >= impl->size) return E_BOUNDS; + + for (i = start_index; i < impl->size; ++i) + { + if (i - start_index >= items_size) break; + if (FAILED(hr = WindowsDuplicateString(impl->elements[i], &items[i-start_index]))) goto error; + } + *count = i - start_index; + + return S_OK; + +error: + *count = 0; + while (i-- > start_index) WindowsDeleteString(items[i-start_index]); + return hr; +} + +static HRESULT WINAPI vector_hstring_ReplaceAll( IVector_HSTRING *iface, UINT32 count, HSTRING *items ) +{ + HRESULT hr; + ULONG i; + + TRACE("iface %p, count %u, items %p.\n", iface, count, items); + + hr = IVector_HSTRING_Clear(iface); + for (i = 0; i < count && SUCCEEDED(hr); ++i) hr = IVector_HSTRING_Append(iface, items[i]); + return hr; +} + +static const struct IVector_HSTRINGVtbl vector_hstring_vtbl = +{ + /* IUnknown methods */ + vector_hstring_QueryInterface, + vector_hstring_AddRef, + vector_hstring_Release, + /* IInspectable methods */ + vector_hstring_GetIids, + vector_hstring_GetRuntimeClassName, + vector_hstring_GetTrustLevel, + /* IVector<HSTRING> methods */ + vector_hstring_GetAt, + vector_hstring_get_Size, + vector_hstring_GetView, + vector_hstring_IndexOf, + vector_hstring_SetAt, + vector_hstring_InsertAt, + vector_hstring_RemoveAt, + vector_hstring_Append, + vector_hstring_RemoveAtEnd, + vector_hstring_Clear, + vector_hstring_GetMany, + vector_hstring_ReplaceAll, +}; + +HRESULT vector_hstring_create( IVector_HSTRING **out ) +{ + struct vector_hstring *impl; + + TRACE("out %p.\n", out); + + if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; + impl->IVector_HSTRING_iface.lpVtbl = &vector_hstring_vtbl; + impl->ref = 1; + + *out = &impl->IVector_HSTRING_iface; + TRACE("created %p\n", *out); + return S_OK; +} -- 2.35.1

1 4

[PATCH v3 1/5] windows.media.speech: Add IVector<HSTRING>.
by Rémi Bernon 29 Mar '22

29 Mar '22

From: Bernhard Kölbl <besentv(a)gmail.com> And use it in listconstraint. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Handle allocation failures. v3: Add a missing check and fix size handling in error path in PATCH 5. dlls/windows.media.speech/Makefile.in | 3 +- dlls/windows.media.speech/listconstraint.c | 11 +- dlls/windows.media.speech/private.h | 2 + dlls/windows.media.speech/vector.c | 313 +++++++++++++++++++++ 4 files changed, 326 insertions(+), 3 deletions(-) create mode 100644 dlls/windows.media.speech/vector.c diff --git a/dlls/windows.media.speech/Makefile.in b/dlls/windows.media.speech/Makefile.in index 5dbdb03cf2f..5a8291ba6f0 100644 --- a/dlls/windows.media.speech/Makefile.in +++ b/dlls/windows.media.speech/Makefile.in @@ -6,6 +6,7 @@ C_SRCS = \ listconstraint.c \ main.c \ recognizer.c \ - synthesizer.c + synthesizer.c \ + vector.c IDL_SRCS = classes.idl diff --git a/dlls/windows.media.speech/listconstraint.c b/dlls/windows.media.speech/listconstraint.c index d641902f4bc..0c486a415a7 100644 --- a/dlls/windows.media.speech/listconstraint.c +++ b/dlls/windows.media.speech/listconstraint.c @@ -36,6 +36,7 @@ struct list_constraint LONG ref; BOOLEAN enabled; + IVector_HSTRING *commands; }; /* @@ -91,7 +92,10 @@ static ULONG WINAPI list_constraint_Release( ISpeechRecognitionListConstraint *i TRACE("iface %p, ref %lu.\n", iface, ref); if (!ref) + { + IVector_HSTRING_Release(impl->commands); free(impl); + } return ref; } @@ -337,12 +341,15 @@ static HRESULT WINAPI constraint_factory_CreateWithTag( ISpeechRecognitionListCo TRACE("iface %p, commands %p, tag %p, listconstraint %p.\n", iface, commands, tag, listconstraint); + *listconstraint = NULL; + if (!commands) return E_POINTER; - if (!(impl = calloc(1, sizeof(*impl)))) + if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; + if (FAILED(vector_hstring_create(&impl->commands))) { - *listconstraint = NULL; + free(impl); return E_OUTOFMEMORY; } diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h index 3e2fa9aed38..a09b5f5ef7e 100644 --- a/dlls/windows.media.speech/private.h +++ b/dlls/windows.media.speech/private.h @@ -66,6 +66,8 @@ HRESULT typed_event_handlers_remove( struct list *list, EventRegistrationToken * HRESULT typed_event_handlers_notify( struct list *list, IInspectable *sender, IInspectable *args ); HRESULT typed_event_handlers_clear( struct list* list ); +HRESULT vector_hstring_create( IVector_HSTRING **out ); + #define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ static inline impl_type *impl_from( iface_type *iface ) \ { \ diff --git a/dlls/windows.media.speech/vector.c b/dlls/windows.media.speech/vector.c new file mode 100644 index 00000000000..13a36499a46 --- /dev/null +++ b/dlls/windows.media.speech/vector.c @@ -0,0 +1,313 @@ +/* WinRT Windows.Media.Speech implementation + * + * Copyright 2022 Bernhard Kölbl for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(speech); + +/* + * + * IVector<HSTRING> + * + */ + +struct vector_hstring +{ + IVector_HSTRING IVector_HSTRING_iface; + LONG ref; + + UINT32 size; + UINT32 capacity; + HSTRING *elements; +}; + +static inline struct vector_hstring *impl_from_IVector_HSTRING( IVector_HSTRING *iface ) +{ + return CONTAINING_RECORD(iface, struct vector_hstring, IVector_HSTRING_iface); +} + +static HRESULT WINAPI vector_hstring_QueryInterface( IVector_HSTRING *iface, REFIID iid, void **out ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, &IID_IVector_HSTRING)) + { + IInspectable_AddRef((*out = &impl->IVector_HSTRING_iface)); + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI vector_hstring_AddRef( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %lu.\n", iface, ref); + return ref; +} + +static ULONG WINAPI vector_hstring_Release( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + + TRACE("iface %p, ref %lu.\n", iface, ref); + + if (!ref) + { + IVector_HSTRING_Clear(iface); + free(impl); + } + + return ref; +} + +static HRESULT WINAPI vector_hstring_GetIids( IVector_HSTRING *iface, ULONG *iid_count, IID **iids ) +{ + FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_GetRuntimeClassName( IVector_HSTRING *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_GetTrustLevel( IVector_HSTRING *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_GetAt( IVector_HSTRING *iface, UINT32 index, HSTRING *value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + *value = NULL; + if (index >= impl->size) return E_BOUNDS; + + return WindowsDuplicateString(impl->elements[index], value); +} + +static HRESULT WINAPI vector_hstring_get_Size( IVector_HSTRING *iface, UINT32 *value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + TRACE( "iface %p, value %p.\n", iface, value ); + *value = impl->size; + return S_OK; +} + +static HRESULT WINAPI vector_hstring_GetView( IVector_HSTRING *iface, IVectorView_HSTRING **value ) +{ + FIXME("iface %p, value %p stub!\n", iface, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_IndexOf( IVector_HSTRING *iface, HSTRING element, UINT32 *index, BOOLEAN *found ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + ULONG i; + + TRACE("iface %p, element %p, index %p, found %p.\n", iface, element, index, found); + + for (i = 0; i < impl->size; ++i) if (impl->elements[i] == element) break; + if ((*found = (i < impl->size))) *index = i; + else *index = 0; + + return S_OK; +} + +static HRESULT WINAPI vector_hstring_SetAt( IVector_HSTRING *iface, UINT32 index, HSTRING value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + HSTRING tmp; + HRESULT hr; + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + if (index >= impl->size) return E_BOUNDS; + + if (FAILED(hr = WindowsDuplicateString(value, &tmp))) return hr; + + WindowsDeleteString(impl->elements[index]); + impl->elements[index] = tmp; + return S_OK; +} + +static HRESULT WINAPI vector_hstring_InsertAt( IVector_HSTRING *iface, UINT32 index, HSTRING value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + HSTRING tmp, *tmp2 = impl->elements; + HRESULT hr; + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + if (FAILED(hr = WindowsDuplicateString(value, &tmp))) return hr; + + if (impl->size == impl->capacity) + { + impl->capacity = max(32, impl->capacity * 3 / 2); + if (!(impl->elements = realloc(impl->elements, impl->capacity * sizeof(*impl->elements)))) + { + impl->elements = tmp2; + return E_OUTOFMEMORY; + } + } + + memmove(impl->elements + index + 1, impl->elements + index, (impl->size++ - index) * sizeof(*impl->elements)); + impl->elements[index] = tmp; + return S_OK; +} + +static HRESULT WINAPI vector_hstring_RemoveAt( IVector_HSTRING *iface, UINT32 index ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p, index %u.\n", iface, index); + + if (index >= impl->size) return E_BOUNDS; + + WindowsDeleteString(impl->elements[index]); + memmove(impl->elements + index, impl->elements + index + 1, (--impl->size - index) * sizeof(*impl->elements)); + return S_OK; +} + +static HRESULT WINAPI vector_hstring_Append( IVector_HSTRING *iface, HSTRING value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p, value %p.\n", iface, value); + + return IVector_HSTRING_InsertAt(iface, impl->size, value); +} + +static HRESULT WINAPI vector_hstring_RemoveAtEnd( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p.\n", iface); + + if (impl->size) WindowsDeleteString(impl->elements[--impl->size]); + return S_OK; +} + +static HRESULT WINAPI vector_hstring_Clear( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p.\n", iface); + + while (impl->size) IVector_HSTRING_RemoveAtEnd(iface); + free(impl->elements); + impl->capacity = 0; + impl->elements = NULL; + + return S_OK; +} + +static HRESULT WINAPI vector_hstring_GetMany( IVector_HSTRING *iface, UINT32 start_index, + UINT32 items_size, HSTRING *items, UINT32 *count ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + HRESULT hr; + UINT32 i; + + TRACE("iface %p, start_index %u, items_size %u, items %p, count %p.\n", iface, start_index, items_size, items, count); + + if (start_index >= impl->size) return E_BOUNDS; + + for (i = start_index; i < impl->size; ++i) + { + if (i - start_index >= items_size) break; + if (FAILED(hr = WindowsDuplicateString(impl->elements[i], &items[i-start_index]))) goto error; + } + *count = i - start_index; + + return S_OK; + +error: + *count = 0; + while (i-- > start_index) WindowsDeleteString(items[i-start_index]); + return hr; +} + +static HRESULT WINAPI vector_hstring_ReplaceAll( IVector_HSTRING *iface, UINT32 count, HSTRING *items ) +{ + HRESULT hr; + ULONG i; + + TRACE("iface %p, count %u, items %p.\n", iface, count, items); + + hr = IVector_HSTRING_Clear(iface); + for (i = 0; i < count && SUCCEEDED(hr); ++i) hr = IVector_HSTRING_Append(iface, items[i]); + return hr; +} + +static const struct IVector_HSTRINGVtbl vector_hstring_vtbl = +{ + /* IUnknown methods */ + vector_hstring_QueryInterface, + vector_hstring_AddRef, + vector_hstring_Release, + /* IInspectable methods */ + vector_hstring_GetIids, + vector_hstring_GetRuntimeClassName, + vector_hstring_GetTrustLevel, + /* IVector<HSTRING> methods */ + vector_hstring_GetAt, + vector_hstring_get_Size, + vector_hstring_GetView, + vector_hstring_IndexOf, + vector_hstring_SetAt, + vector_hstring_InsertAt, + vector_hstring_RemoveAt, + vector_hstring_Append, + vector_hstring_RemoveAtEnd, + vector_hstring_Clear, + vector_hstring_GetMany, + vector_hstring_ReplaceAll, +}; + +HRESULT vector_hstring_create( IVector_HSTRING **out ) +{ + struct vector_hstring *impl; + + TRACE("out %p.\n", out); + + if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; + impl->IVector_HSTRING_iface.lpVtbl = &vector_hstring_vtbl; + impl->ref = 1; + + *out = &impl->IVector_HSTRING_iface; + TRACE("created %p\n", *out); + return S_OK; +} -- 2.35.1

3 7

[PATCH] winevulkan: Update to VK spec version 1.3.210.
by Georg Lehmann 29 Mar '22

29 Mar '22

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 2a3129bacfe..505aaa81c60 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.3.208" +VK_XML_VERSION = "1.3.210" WINE_VK_VERSION = (1, 3) # Filenames to create. -- 2.35.1

1 0

[tools 1/2] testbot/cgi: Add an API to set the page refresh interval.
by Francois Gouget 29 Mar '22

29 Mar '22

It can be called early, removing the need to override GeneratePage() just for that purpose. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/Page.pm | 19 +++++++++++++++++++ testbot/lib/WineTestBot/CGI/PageBase.pm | 15 ++++++++++++++- testbot/web/Activity.pl | 8 ++++---- testbot/web/JobDetails.pl | 16 ++++------------ testbot/web/PatchesList.pl | 10 +--------- testbot/web/index.pl | 15 ++++----------- 6 files changed, 46 insertions(+), 37 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index d5874129a..6197e4e38 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -141,6 +141,25 @@ sub escapeHTML($$) return $self->{CGIObj}->escapeHTML($String); } +=pod +=over 12 + +=head1 C<SetRefreshInterval()> + +Sets the page refresh interval in seconds. + +This can be called at any point before GenerateHttpHeaders(). + +=back +=cut + +sub SetRefreshInterval($$) +{ + my ($self, $Seconds) = @_; + + $self->{PageBase}->SetRefreshInterval($Seconds); +} + # # CGI parameters support diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 6eba0e0eb..5ce070189 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -81,7 +81,8 @@ sub new($$$$@) my ($Page, $Request, $RequiredRole) = @_; my $self = {Request => $Request, - Session => undef}; + Session => undef, + Refresh => undef}; $self = bless $self, $class; if (defined($RequiredRole) && $RequiredRole ne "") @@ -111,6 +112,13 @@ sub CreatePageBase($$$@) return WineTestBot::CGI::PageBase->new(@_); } +sub SetRefreshInterval($$) +{ + my ($self, $Seconds) = @_; + + $self->{Refresh} = $Seconds; +} + # # Session management @@ -363,6 +371,11 @@ sub GenerateHttpHeaders($) # HTTP/1.0 $Request->headers_out->add("Pragma", "no-cache"); + if ($self->{Refresh}) + { + $self->{Request}->headers_out->add("Refresh", $self->{Refresh}); + } + # Force char set $Request->content_type("text/html; charset=UTF-8"); diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index d98f50a6c..cbe3f8721 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -56,6 +56,10 @@ sub _initialize($$$) # either). $self->SetParam("Hours", $HOURS_DEFAULT); } + if ($self->GetParam("Hours") <= $HOURS_DEFAULT) + { + $self->SetRefreshInterval(60); + } } sub GetPageTitle($$) @@ -69,10 +73,6 @@ sub GeneratePage($) { my ($self) = @_; - if ($self->GetParam("Hours") <= $HOURS_DEFAULT) - { - $self->{Request}->headers_out->add("Refresh", "60"); - } $self->SUPER::GeneratePage(); } diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 8d93957ce..5e302c098 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -57,6 +57,10 @@ sub _initialize($$$) $self->{JobId} = $JobId; $self->SUPER::_initialize($Request, $RequiredRole, CreateStepsTasks(undef, $self->{Job})); + if ($self->{Job}->Status =~ /^(?:queued|running)$/) + { + $self->SetRefreshInterval(30); + } } sub GetPageTitle($) @@ -241,18 +245,6 @@ sub SortKeys($$$) return \@SortedKeys; } -sub GeneratePage($) -{ - my ($self) = @_; - - if ($self->{Job}->Status =~ /^(queued|running)$/) - { - $self->{Request}->headers_out->add("Refresh", "30"); - } - - $self->SUPER::GeneratePage(); -} - sub InitMoreInfo($) { my ($self) = @_; diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index 6728a285f..04ca0208c 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -33,6 +33,7 @@ sub _initialize($$$) my ($self, $Request, $RequiredRole) = @_; $self->SUPER::_initialize($Request, $RequiredRole, CreatePatches()); + $self->SetRefreshInterval(60); } sub SortKeys($$$) @@ -65,15 +66,6 @@ sub GetActions($$) return []; } -sub GeneratePage($) -{ - my ($self) = @_; - - $self->{Request}->headers_out->add("Refresh", "60"); - - $self->SUPER::GeneratePage(); -} - sub GenerateDataCell($$$$$) { my ($self, $CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage) = @_; diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 451258ec6..1f362fc32 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -268,6 +268,10 @@ sub _initialize($$$) # Replace with the default value so the cutoff can be calculated $self->SetParam("Days", $DAYS_DEFAULT); } + if (!$self->GetErrMessage() and $self->GetParam("Days") <= $DAYS_DEFAULT) + { + $self->SetRefreshInterval(60); + } # The action is a no-op so unset it to not need to redefine OnAction() $self->SetParam("Action", undef); } @@ -280,17 +284,6 @@ sub OutputDot($$) "width='20' height='20' />"; } -sub GeneratePage($) -{ - my ($self) = @_; - - if (!$self->GetErrMessage() and $self->GetParam("Days") <= $DAYS_DEFAULT) - { - $self->{Request}->headers_out->add("Refresh", "60"); - } - $self->SUPER::GeneratePage(); -} - sub GenerateBody($) { my ($self) = @_; -- 2.30.2

1 1

[tools] testbot/cgi: Add Page::SetError().
by Francois Gouget 29 Mar '22

29 Mar '22

This provides a proper API to set the page error, particularly for non-child classes. Use it in CollectionBlock. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 8 ++++++-- testbot/lib/ObjectModel/CGI/Page.pm | 8 ++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 053b22545..58ece69f3 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -617,8 +617,12 @@ sub OnItemAction($$$) if ($Action eq "Delete") { my $ErrMessage = $self->{Collection}->DeleteItem($Item); - $self->{EnclosingPage}->{ErrMessage} = $ErrMessage; - return ! defined($ErrMessage); + if (defined $ErrMessage) + { + $self->{EnclosingPage}->SetError(undef, $ErrMessage); + return 0; + } + return 1; } $self->{EnclosingPage}->SetError(undef, "No per-Item action defined for $Action"); diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index f7e3c93b8..a79155950 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -309,6 +309,14 @@ sub GetErrMessage($) return $self->{ErrMessage}; } +sub SetError($$$) +{ + my ($self, $ErrField, $ErrMessage) = @_; + + $self->{ErrField} = $ErrField; + $self->{ErrMessage} = $ErrMessage; +} + sub GenerateErrorDiv($) { my ($self) = @_; -- 2.30.2

1 0

[tools] testbot/cgi: Document and tweak the action error handling.
by Francois Gouget 29 Mar '22

29 Mar '22

Fix OnAction() so it returns an error when OnItemAction() fails to apply an action to a selected item. OnItemAction() should not return success on unknown item actions. Also the action is a user-supplied parameter so a proper error message shoulf be displayed when it is invalid instead of having OnAction() and OnItemAction() just die. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 16 ++++++++++++---- testbot/lib/ObjectModel/CGI/FormPage.pm | 6 +++++- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 6f5c4d5fa..58bf927ca 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -603,6 +603,10 @@ This method is called to apply $Action to each selected item. Note that it is the responsibility of this method to validate the property values by calling Validate() before performing the action. +Returns true on success. In case an error occurs while performing the action on +any of the selected items, the enclosing page's error message is set and +false is returned. + =back =cut @@ -617,7 +621,8 @@ sub OnItemAction($$$) return ! defined($ErrMessage); } - return 1; + $self->{EnclosingPage}->SetError(undef, "No per-Item action defined for $Action"); + return 0; } @@ -668,6 +673,9 @@ Implements the "Add" and per-item actions. Note that it is the responsibility of this method to validate the property values by calling Validate() before performing the action. +Returns true on success. Otherwise the enclosing page's error message is set +and false is returned. + =back =cut @@ -692,15 +700,15 @@ sub OnAction($$) exit($self->{EnclosingPage}->Redirect($Target)); } - my $Ok = 1; foreach my $Key (@{$self->{Collection}->GetKeys()}) { - if (defined $self->{EnclosingPage}->GetParam($self->SelName($Key)) && $Ok) + if (defined $self->{EnclosingPage}->GetParam($self->SelName($Key))) { my $Item = $self->{Collection}->GetItem($Key); - $Ok = $self->CallOnItemAction($Item, $Action); + return 0 if (!$self->CallOnItemAction($Item, $Action)); } } + return 1; } 1; diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 83b078b24..0f4c5cd0e 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -596,6 +596,9 @@ actions. Note that it is the responsibility of this method to validate the property values by calling Validate() before performing the action. +Returns true on success. Otherwise sets the page's error message and returns +false. + =back =cut @@ -603,7 +606,8 @@ sub OnAction($$) { my ($self, $Action) = @_; - die "No action defined for $Action"; + $self->{EnclosingPage}->SetError(undef, "No action defined for $Action"); + return 0; } 1; -- 2.30.2

1 0

[tools] testbot/cgi: Simplify the default CollectionBlock::GetAction() implementation.
by Francois Gouget 29 Mar '22

29 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 58bf927ca..053b22545 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -654,13 +654,9 @@ sub GetActions($) { my ($self) = @_; - my @Actions; - if ($self->CallGetDetailsPage()) - { - $Actions[0] = "Add " . $self->{Collection}->GetItemName(); - } - - return \@Actions; + return $self->CallGetDetailsPage() ? + ["Add ". $self->{Collection}->GetItemName()] : + []; } =pod -- 2.30.2

1 0

[tools] testbot/cgi: Fix handling of '0' in text fields.
by Francois Gouget 29 Mar '22

29 Mar '22

'0' should be set as the field's initial value even though it evaluates to false. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 0f4c5cd0e..b85ccb297 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -300,7 +300,7 @@ sub GenerateField($$$) print "50' rows='", int(($MaxLength + 49) / 50); } print "'>"; - if ($Value) + if (defined $Value) { print $self->CGI->escapeHTML($Value), "'"; } @@ -313,7 +313,7 @@ sub GenerateField($$$) $Size=45 if ($Size > 45); print "<input type='$InputType' name='", $PropertyDescriptor->GetName(), "' maxlength='", $PropertyDescriptor->GetMaxLength(), "' size='$Size'"; - if ($Value && $InputType ne "password") + if (defined $Value && $InputType ne "password") { print " value='", $self->CGI->escapeHTML($Value), "'"; } -- 2.30.2

1 0

[PATCH v2] crypt32: CryptAcquireCertificatePrivateKey() should reset last error code on success.
by Dmitry Timoshkov 29 Mar '22

29 Mar '22

One of Chrome crypto plugins depends on this. v2: Rebased. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 1 + dlls/crypt32/tests/cert.c | 59 ++++++++++++++------------------------- 2 files changed, 22 insertions(+), 38 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 33811dfadc1..81ebb59d27c 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1006,6 +1006,7 @@ BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert, HeapFree(GetProcessHeap(), 0, info); if (cert_in_store) CertFreeCertificateContext(cert_in_store); + if (ret) SetLastError(0); return ret; } diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 608d2c8c1b7..3f164e6d606 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -3906,55 +3906,42 @@ static void testAcquireCertPrivateKey(void) CERT_KEY_CONTEXT keyContext; /* Don't cache provider */ + SetLastError(0xdeadbeef); ret = pCryptAcquireCertificatePrivateKey(cert, 0, NULL, &certCSP, &keySpec, &callerFree); - ok(ret || - broken(!ret), /* win95 */ - "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); - if (ret) - { - ok(callerFree, "Expected callerFree to be TRUE\n"); - CryptReleaseContext(certCSP, 0); - } + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); + ok(callerFree, "Expected callerFree to be TRUE\n"); + CryptReleaseContext(certCSP, 0); + SetLastError(0xdeadbeef); ret = pCryptAcquireCertificatePrivateKey(cert, 0, NULL, &certCSP, NULL, NULL); - ok(ret || - broken(!ret), /* win95 */ - "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); CryptReleaseContext(certCSP, 0); /* Use the key prov info's caching (there shouldn't be any) */ + SetLastError(0xdeadbeef); ret = pCryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_USE_PROV_INFO_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret || - broken(!ret), /* win95 */ - "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); - if (ret) - { - ok(callerFree, "Expected callerFree to be TRUE\n"); - CryptReleaseContext(certCSP, 0); - } + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); + ok(callerFree, "Expected callerFree to be TRUE\n"); + CryptReleaseContext(certCSP, 0); /* Cache it (and check that it's cached) */ + SetLastError(0xdeadbeef); ret = pCryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_CACHE_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret || - broken(!ret), /* win95 */ - "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); ok(!callerFree, "Expected callerFree to be FALSE\n"); size = sizeof(keyContext); ret = CertGetCertificateContextProperty(cert, CERT_KEY_CONTEXT_PROP_ID, &keyContext, &size); - ok(ret || - broken(!ret), /* win95 */ - "CertGetCertificateContextProperty failed: %08lx\n", - GetLastError()); + ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", GetLastError()); /* Remove the cached provider */ CryptReleaseContext(keyContext.hCryptProv, 0); @@ -3965,21 +3952,17 @@ static void testAcquireCertPrivateKey(void) CertSetCertificateContextProperty(cert, CERT_KEY_PROV_INFO_PROP_ID, 0, &keyProvInfo); /* Now use the key prov info's caching */ + SetLastError(0xdeadbeef); ret = pCryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_USE_PROV_INFO_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret || - broken(!ret), /* win95 */ - "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); ok(!callerFree, "Expected callerFree to be FALSE\n"); size = sizeof(keyContext); ret = CertGetCertificateContextProperty(cert, CERT_KEY_CONTEXT_PROP_ID, &keyContext, &size); - ok(ret || - broken(!ret), /* win95 */ - "CertGetCertificateContextProperty failed: %08lx\n", - GetLastError()); + ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", GetLastError()); CryptReleaseContext(certCSP, 0); CryptDestroyKey(key); -- 2.35.1

1 0

[PATCH v2 3/3] fonts: Add Segoe UI Symbol font replacement.
by Dmitry Timoshkov 29 Mar '22

29 Mar '22

Segoe UI Symbol font is used by many WPF .Net applications. This patch adds the font with just single glyph 0x25d4 (which is part of the Geometric Shapes unicode block), created by modifying glyph 'one in the circle' from the OpenSymbol font. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- fonts/Makefile.in | 1 + fonts/seguisym.sfd | 99 +++++++++++++++++++++++++++++++++++++++++++++ fonts/seguisym.ttf | Bin 0 -> 1688 bytes 3 files changed, 100 insertions(+) create mode 100644 fonts/seguisym.sfd create mode 100644 fonts/seguisym.ttf diff --git a/fonts/Makefile.in b/fonts/Makefile.in index b8021851987..afce01fdb8d 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -4,6 +4,7 @@ FONT_SRCS = \ fixedsys_jp.sfd \ marlett.sfd \ ms_sans_serif.sfd \ + seguisym.sfd \ small_fonts.sfd \ small_fonts_jp.sfd \ symbol.sfd \ diff --git a/fonts/seguisym.sfd b/fonts/seguisym.sfd new file mode 100644 index 00000000000..476969b3fc1 --- /dev/null +++ b/fonts/seguisym.sfd @@ -0,0 +1,99 @@ +SplineFontDB: 3.0 +FontName: WineSegoeUISymbol +FullName: Segoe UI Symbol +FamilyName: Segoe UI Symbol +Weight: Regular +Copyright: Copyright (C) 2022 Dmitry Timoshkov +UComments: "#pragma makedep install" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -119 +UnderlineWidth: 119 +Ascent: 1638 +Descent: 410 +LayerCount: 2 +Layer: 0 1 "Back" 1 +Layer: 1 1 "Fore" 0 +XUID: [1021 135 1692684408 1110823] +FSType: 0 +OS2Version: 2 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 1 +PfmFamily: 17 +TTFWeight: 400 +TTFWidth: 5 +LineGap: 0 +VLineGap: 0 +Panose: 2 11 5 2 4 2 4 2 2 3 +OS2TypoAscent: 1491 +OS2TypoAOffset: 0 +OS2TypoDescent: -431 +OS2TypoDOffset: 0 +OS2TypoLinegap: 269 +OS2WinAscent: 2210 +OS2WinAOffset: 0 +OS2WinDescent: 514 +OS2WinDOffset: 0 +HheadAscent: 2210 +HheadAOffset: 0 +HheadDescent: -514 +HheadDOffset: 0 +OS2SubXSize: 1434 +OS2SubYSize: 1331 +OS2SubXOff: 0 +OS2SubYOff: 283 +OS2SupXSize: 1434 +OS2SupYSize: 1331 +OS2SupXOff: 0 +OS2SupYOff: 977 +OS2StrikeYSize: 102 +OS2StrikeYPos: 530 +OS2FamilyClass: 2053 +OS2Vendor: 'Wine' +OS2CodePages: 00000001.40000000 +OS2UnicodeRanges: 8000006f.1200fbef.0064c000.00000002 +DEI: 91125 +Encoding: Custom +UnicodeInterp: none +NameList: Adobe Glyph List +DisplaySize: -48 +AntiAlias: 1 +FitToEm: 1 +WinInfo: 0 38 14 +Grid +-2048 741 m 0 + 4096 741 l 0 +918 2662 m 0 + 918 -1434 l 0 +EndSplineSet +BeginChars: 256 1 + +StartChar: uni25D4 +Encoding: 255 9684 0 +Width: 1764 +Flags: WO +LayerCount: 2 +Fore +SplineSet +882.5 731 m 24,0,-1 + 882 1372 l 0,1,2 + 586.611 1347.2 586.611 1347.2 426 1184 c 0,3,4 + 240 995 240 995 240 730 c 0,5,6 + 240 459.078 240 459.078 426 276 c 0,7,8 + 617 88 617 88 882 88 c 0,9,10 + 1142.95 88 1142.95 88 1334 276 c 0,11,12 + 1534.8 473.599 1534.8 473.599 1522 730 c 0,13,-1 + 882.5 731 l 24,0,-1 +140 730 m 0,14,15 + 140 1036 140 1036 358 1254 c 0,16,17 + 574 1470 574 1470 882 1470 c 0,18,19 + 1188 1470 1188 1470 1404 1254 c 0,20,21 + 1620 1035 1620 1035 1620 730 c 0,22,23 + 1620 421 1620 421 1404 208 c 0,24,25 + 1189 -10 1189 -10 882 -10 c 0,26,27 + 573 -10 573 -10 358 208 c 0,28,29 + 140 420 140 420 140 730 c 0,14,15 +EndSplineSet +EndChar +EndChars +EndSplineFont diff --git a/fonts/seguisym.ttf b/fonts/seguisym.ttf new file mode 100644 index 0000000000000000000000000000000000000000..9dc577f45388d30d2049fb18bb1d8493c9e897c0 GIT binary patch literal 1688 zcmds1U1(cn7=FI<m(1BF8Dm4N`b8UELE5v^+DZvhY>4(kr){zc12t{aBrM4Z$?3Mp zz<R%nUFsCX>D`9dASh!xuVgZYij~D|mjkbc2=j-jr#|1wsj~=zw|<BBd!P5`d*AoG z-wy<U0jxpCbJ=X}8A{YxC&-5mEQ~qcd#@CzdV%uGOSM7+v5{9PUm`uZbkvi`m<d3? zn|7mAXf-xB83~q0Ia;c=R~FxvPtiU^`BJ%9SbkAEyH0$aG+Cx%@K@t|#@bDJxLos& z?>>jGD1S^jUUioWI0fd`<CO2J6^=LXG!D@IIAvKc)QYh;=1tmf0NUY(+wwZMriYn- zhIU8&iK4^f6H_n6(m!EmlnUTP>VvhvcxLlwD`$R6ISNf_Ik+Zz<`1877?*P{h@{}w zFanK%`@=PAr3iF07!8~>>xMW5)@GhI$7#H`&-JgdqV0;B+D=n5_-XnY;O@e2KVbPY zwNN`$sTVPm+DL7f-}ujqf#?}6h(4pN{UIS(Sw;z}Lefb>_C27Xu-Y^w)qx=xkmLqG z%Bc<RQ84$$LQjSZewt3?Dx0Fe4;APCKZ3K2M}u#fzpJSpYs+Syos3{~U0^KTi5R%) ztXt;wbVt_+v92q%snnf_C4NtL*utC6cp{ldB@@YvCjDXYx?eW)x6fvbD?!|o;i((I zee8I`h**jE-aSb<HK`}#Q<F)#cTXZ7v6AwUhxMla-8<*cUlcopdGU*Z+oyY7F(I68 zw|mvU;$Obn)2?Z+-Sh4z{xANIA6>ZcIgg>!>vpgCU;3B7?e#W-Z5zb<TYHU%c!&D? zDG=ky>0^z5crL^`9>A>-8;FUC5SxgLl@MD<h&R;<Gj=dTmej|BccL0%4TE?q#5$h9 zhau*@;f?S6n~)+CVhaz7W0-}D2HI$%f)dK`AhD0y5poAM$sx+1M!QF^Hl-YKjq6(U zKSF*Km~|WNW~Eg2<i6Pv>DZ1VGqsA>Y|C7w=C;a5TskeF$Q&+bi9F^wFECyWi_}$V zE|%P)%+JY%c5Tt6Vm|O+rLDlsm@k%As|A8A{p+ko@g^gxcn)6zn|wNm`mcGiZr#he z%~DZ1qqdxu|H%7a>paK`n(Rg;s7taA8~cNL6q3NfVzX6o>(aLOkJ`3P%^^D1x$I6V z)sSuNP)}1(T7GV;AzLrS=Ce4)GayLYhe1(56Ix`oUU44FOax}ZHz;`3wmaXE{sj6$ B2nYZG literal 0 HcmV?d00001 -- 2.35.1

1 0

[PATCH v2 2/3] dwrite: Add Segoe UI Symbol fallback range for the Geometric Shapes unicode block.
by Dmitry Timoshkov 29 Mar '22

29 Mar '22

As discussed on wine-devel with just Geometric Shapes unicode block. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/dwrite/analyzer.c | 8 ++++++++ dlls/dwrite/tests/layout.c | 5 ++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 7ffcfa8070c..0087c126322 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -220,6 +220,13 @@ static const DWRITE_UNICODE_RANGE cjk_ranges[] = { 0x4e00, 0x9fff }, /* CJK Unified Ideographs */ }; +static const WCHAR *SegoeUI_Symbol_families[] = { L"Segoe UI Symbol" }; + +static const DWRITE_UNICODE_RANGE SegoeUI_Symbol_ranges[] = +{ + { 0x25a0, 0x25ff }, /* Geometric Shapes */ +}; + struct fallback_mapping { DWRITE_UNICODE_RANGE *ranges; UINT32 ranges_count; @@ -236,6 +243,7 @@ static const struct fallback_mapping fontfallback_neutral_data[] = { (WCHAR **)families, ARRAY_SIZE(families) } MAPPING_RANGE(cjk_ranges, cjk_families), + MAPPING_RANGE(SegoeUI_Symbol_ranges, SegoeUI_Symbol_families), #undef MAPPING_RANGE }; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 42274a95611..420d236fe22 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -6602,19 +6602,18 @@ todo_wine { hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, collection, families[i], DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); -todo_wine_if(families[i] == NULL) ok(hr == S_OK, "%u: %s - got %#x\n", i, wine_dbgstr_w(families[i]), hr); if (hr != S_OK) continue; ok(mappedlength == 1, "got %u\n", mappedlength); ok(scale == 1.0f, "got %f\n", scale); get_font_name(font, name, ARRAY_SIZE(name)); -todo_wine +todo_wine_if(families[i] != NULL) ok(!wcscmp(name, L"Segoe UI Symbol"), "got %s\n", wine_dbgstr_w(name)); hr = IDWriteFont_HasCharacter(font, 0x25d4, &exists); ok(hr == S_OK, "got %#x\n", hr); -todo_wine +todo_wine_if(families[i] != NULL) ok(exists, "%s should have character 0x25d4\n", wine_dbgstr_w(name)); IDWriteFont_Release(font); -- 2.35.1

1 0

[PATCH v2 1/3] dwrite/tests: Add some tests for Segoe UI font family.
by Dmitry Timoshkov 29 Mar '22

29 Mar '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/dwrite/tests/layout.c | 139 +++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c77c6ff2034..42274a95611 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -6487,6 +6487,144 @@ if (SUCCEEDED(hr)) IDWriteFactory_Release(factory); } +#define get_font_name(a, b, c) get_font_name_(a, b, c, __LINE__) +static void get_font_name_(IDWriteFont *font, WCHAR *name, UINT32 size, int line) +{ + HRESULT hr; + IDWriteFontFamily *family; + IDWriteLocalizedStrings *names; + UINT32 index; + BOOL exists; + + hr = IDWriteFont_GetFontFamily(font, &family); + ok_(__FILE__, line)(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok_(__FILE__, line)(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteLocalizedStrings_FindLocaleName(names, L"en-us", &index, &exists); + ok_(__FILE__, line)(hr == S_OK, "got %#x\n", hr); + ok_(__FILE__, line)(index != UINT_MAX && exists, "name was not found\n"); + hr = IDWriteLocalizedStrings_GetString(names, index, name, size); + ok_(__FILE__, line)(hr == S_OK, "got %#x\n", hr); + + IDWriteLocalizedStrings_Release(names); + IDWriteFontFamily_Release(family); +} + +static void test_SegoeUI(void) +{ + static const WCHAR *families[] = { L"Tahoma", L"Segoe UI", NULL }; + static const WCHAR text[] = { 0x25d4, 0 }; + HRESULT hr; + IDWriteFactory2 *factory; + IDWriteFontCollection *collection; + IDWriteFontFamily *family; + IDWriteFont *font; + IDWriteFontFallback *fallback; + UINT32 index, count, i, mappedlength; + WCHAR name[256]; + BOOL exists, found; + FLOAT scale; + + hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, &IID_IDWriteFactory2, (IUnknown **)&factory); + if (hr != S_OK) + { + win_skip("IDWriteFactory2 is not supported\n"); + return; + } + + hr = IDWriteFactory2_GetSystemFontCollection(factory, &collection, FALSE); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteFontCollection_FindFamilyName(collection, L"Segoe UI", &index, &exists); + ok(hr == S_OK, "got %#x\n", hr); + if (!exists) + { + skip("Segoe UI is not installed\n"); + IDWriteFontCollection_Release(collection); + IDWriteFactory2_Release(factory); + return; + } + ok(index != UINT_MAX && exists, "Segoe UI was not found\n"); + + hr = IDWriteFontCollection_GetFontFamily(collection, index, &family); + ok(hr == S_OK, "got %#x\n", hr); + + count = IDWriteFontFamily_GetFontCount(family); + trace("family Segoe UI has %u fonts\n", count); + + found = FALSE; + + for (i = 0; i < count; i++) + { + hr = IDWriteFontFamily_GetFont(family, i, &font); + ok(hr == S_OK, "got %#x\n", hr); + + get_font_name(font, name, ARRAY_SIZE(name)); + if (!wcscmp(name, L"Segoe UI Symbol")) + found = TRUE; + + hr = IDWriteFont_HasCharacter(font, 0x25d4, &exists); + ok(hr == S_OK, "got %#x\n", hr); + ok(!exists, "%u: %s has character 0x25d4\n", i, wine_dbgstr_w(name)); + + IDWriteFont_Release(font); + } + + ok(!found, "Segoe UI Symbol should not be part of Segoe UI family\n"); + + IDWriteFontFamily_Release(family); + + hr = IDWriteFactory2_GetSystemFontFallback(factory, &fallback); + ok(hr == S_OK, "got %#x\n", hr); + + g_source = text; + + hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, collection, L"Segoe UI", DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); + ok(hr == S_OK, "got %#x\n", hr); + ok(mappedlength == 1, "got %u\n", mappedlength); + ok(scale == 1.0f, "got %f\n", scale); + + get_font_name(font, name, ARRAY_SIZE(name)); +todo_wine + ok(!wcscmp(name, L"Segoe UI Symbol"), "got %s\n", wine_dbgstr_w(name)); + + hr = IDWriteFont_HasCharacter(font, 0x25d4, &exists); + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(exists, "%s should have character 0x25d4\n", wine_dbgstr_w(name)); + + IDWriteFont_Release(font); + + for (i = 0; i < ARRAY_SIZE(families); i++) + { + hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, collection, families[i], DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); +todo_wine_if(families[i] == NULL) + ok(hr == S_OK, "%u: %s - got %#x\n", i, wine_dbgstr_w(families[i]), hr); + if (hr != S_OK) continue; + ok(mappedlength == 1, "got %u\n", mappedlength); + ok(scale == 1.0f, "got %f\n", scale); + + get_font_name(font, name, ARRAY_SIZE(name)); +todo_wine + ok(!wcscmp(name, L"Segoe UI Symbol"), "got %s\n", wine_dbgstr_w(name)); + + hr = IDWriteFont_HasCharacter(font, 0x25d4, &exists); + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(exists, "%s should have character 0x25d4\n", wine_dbgstr_w(name)); + + IDWriteFont_Release(font); + } + + IDWriteFontFallback_Release(fallback); + IDWriteFontCollection_Release(collection); + IDWriteFactory2_Release(factory); +} + START_TEST(layout) { IDWriteFactory *factory; @@ -6542,6 +6680,7 @@ START_TEST(layout) test_text_format_axes(); test_layout_range_length(); test_HitTestTextRange(); + test_SegoeUI(); IDWriteFactory_Release(factory); } -- 2.35.1

1 0

[PATCH] wined3d: Avoid calling _strnicmp() with limit -1.
by Dmitry Timoshkov 29 Mar '22

29 Mar '22

It's considered invalid by native ucrtbase (installed with winetricks). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wined3d/shader.c | 2 +- dlls/wined3d/shader_sm4.c | 2 +- dlls/wined3d/wined3d_main.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 6282883ed04..a296e34bc9f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3736,7 +3736,7 @@ static struct wined3d_shader_signature_element *shader_find_signature_element(co for (i = 0; i < s->element_count; ++i) { if (e[i].stream_idx == stream_idx - && !_strnicmp(e[i].semantic_name, semantic_name, -1) + && !stricmp(e[i].semantic_name, semantic_name) && e[i].semantic_idx == semantic_idx) return &e[i]; } diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 868d9b3cc64..266b54d1d15 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -1319,7 +1319,7 @@ static void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, struct wined3d_shader_signature_element *e = &output_signature->elements[i]; if (priv->shader_version.type == WINED3D_SHADER_TYPE_PIXEL - && _strnicmp(e->semantic_name, "SV_TARGET", -1)) + && stricmp(e->semantic_name, "SV_TARGET")) continue; if (e->register_idx >= ARRAY_SIZE(priv->output_map)) { diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 4f50e8aeb7d..35973e210b0 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -329,17 +329,17 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) } if (!get_config_key(hkey, appkey, env, "shader_backend", buffer, size)) { - if (!_strnicmp(buffer, "glsl", -1)) + if (!stricmp(buffer, "glsl")) { ERR_(winediag)("Using the GLSL shader backend.\n"); wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_GLSL; } - else if (!_strnicmp(buffer, "arb", -1)) + else if (!stricmp(buffer, "arb")) { ERR_(winediag)("Using the ARB shader backend.\n"); wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_ARB; } - else if (!_strnicmp(buffer, "none", -1)) + else if (!stricmp(buffer, "none")) { ERR_(winediag)("Disabling shader backends.\n"); wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_NONE; -- 2.35.1

3 2

[PATCH 1/4] kernel32: Fix indentation of Global* functions.
by Rémi Bernon 29 Mar '22

29 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- My intent is to cleanup these functions to then re-implement them using a static handle table, shared between kernelbase and kernel32 through KernelBaseGetGlobalData(), as native does it (although we don't need the global data structure to be necessarily compatible). The idea, is ultimately to have these functions a bit more robust, less dependent on exception handlers and heap pointers validation, and less dependent on the heap implementation itself. Native doesn't seem to be actually catching exceptions and it's possible to get crashes with bad pointer values. dlls/kernel32/heap.c | 163 +++++++++++++++++++++---------------------- 1 file changed, 81 insertions(+), 82 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 8e767d03211..7e366eb991e 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -231,11 +231,10 @@ BOOL WINAPI GlobalUnlock(HGLOBAL hmem) * Handle: Success * NULL: Failure */ -HGLOBAL WINAPI GlobalHandle( - LPCVOID pmem /* [in] Pointer to global memory block */ -) { +HGLOBAL WINAPI GlobalHandle( LPCVOID pmem ) +{ HGLOBAL handle; - PGLOBAL32_INTERN maybe_intern; + PGLOBAL32_INTERN maybe_intern; LPCVOID test; if (!pmem) @@ -244,7 +243,7 @@ HGLOBAL WINAPI GlobalHandle( return 0; } - RtlLockHeap(GetProcessHeap()); + RtlLockHeap( GetProcessHeap() ); __TRY { handle = 0; @@ -252,22 +251,25 @@ HGLOBAL WINAPI GlobalHandle( /* note that if pmem is a pointer to a block allocated by */ /* GlobalAlloc with GMEM_MOVEABLE then magic test in HeapValidate */ /* will fail. */ - if (ISPOINTER(pmem)) { - if (HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, pmem )) { - handle = (HGLOBAL)pmem; /* valid fixed block */ + if (ISPOINTER( pmem )) + { + if (HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, pmem )) + { + handle = (HGLOBAL)pmem; /* valid fixed block */ break; } - handle = POINTER_TO_HANDLE(pmem); - } else - handle = (HGLOBAL)pmem; + handle = POINTER_TO_HANDLE( pmem ); + } + else handle = (HGLOBAL)pmem; /* Now test handle either passed in or retrieved from pointer */ maybe_intern = HANDLE_TO_INTERN( handle ); - if (maybe_intern->Magic == MAGIC_GLOBAL_USED) { + if (maybe_intern->Magic == MAGIC_GLOBAL_USED) + { test = maybe_intern->Pointer; if (HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, (const char *)test - HGLOBAL_STORAGE ) && /* obj(-handle) valid arena? */ - HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, maybe_intern )) /* intern valid arena? */ - break; /* valid moveable block */ + HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, maybe_intern )) /* intern valid arena? */ + break; /* valid moveable block */ } handle = 0; SetLastError( ERROR_INVALID_HANDLE ); @@ -278,12 +280,11 @@ HGLOBAL WINAPI GlobalHandle( handle = 0; } __ENDTRY - RtlUnlockHeap(GetProcessHeap()); + RtlUnlockHeap( GetProcessHeap() ); return handle; } - /*********************************************************************** * GlobalReAlloc (KERNEL32.@) * @@ -317,50 +318,49 @@ HGLOBAL WINAPI GlobalReAlloc( HGLOBAL hmem, SIZE_T size, UINT flags ) */ SIZE_T WINAPI GlobalSize(HGLOBAL hmem) { - SIZE_T retval; - PGLOBAL32_INTERN pintern; + SIZE_T retval; + PGLOBAL32_INTERN pintern; - if (!((ULONG_PTR)hmem >> 16)) - { - SetLastError(ERROR_INVALID_HANDLE); - return 0; - } + if (!((ULONG_PTR)hmem >> 16)) + { + SetLastError( ERROR_INVALID_HANDLE ); + return 0; + } - if(ISPOINTER(hmem)) - { - retval=HeapSize(GetProcessHeap(), 0, hmem); + if (ISPOINTER( hmem )) + { + retval = HeapSize( GetProcessHeap(), 0, hmem ); + if (retval == ~(SIZE_T)0) /* It might be a GMEM_MOVEABLE data pointer */ + { + retval = HeapSize( GetProcessHeap(), 0, (char *)hmem - HGLOBAL_STORAGE ); + if (retval != ~(SIZE_T)0) retval -= HGLOBAL_STORAGE; + } + } + else + { + RtlLockHeap( GetProcessHeap() ); + pintern = HANDLE_TO_INTERN( hmem ); - if (retval == ~(SIZE_T)0) /* It might be a GMEM_MOVEABLE data pointer */ - { - retval = HeapSize(GetProcessHeap(), 0, (char*)hmem - HGLOBAL_STORAGE); - if (retval != ~(SIZE_T)0) retval -= HGLOBAL_STORAGE; - } - } - else - { - RtlLockHeap(GetProcessHeap()); - pintern=HANDLE_TO_INTERN(hmem); - - if(pintern->Magic==MAGIC_GLOBAL_USED) - { - if (!pintern->Pointer) /* handle case of GlobalAlloc( ??,0) */ - retval = 0; - else - { - retval = HeapSize(GetProcessHeap(), 0, (char *)pintern->Pointer - HGLOBAL_STORAGE ); - if (retval != ~(SIZE_T)0) retval -= HGLOBAL_STORAGE; - } - } - else - { - WARN("invalid handle %p (Magic: 0x%04x)\n", hmem, pintern->Magic); - SetLastError(ERROR_INVALID_HANDLE); - retval=0; - } - RtlUnlockHeap(GetProcessHeap()); - } - if (retval == ~(SIZE_T)0) retval = 0; - return retval; + if (pintern->Magic == MAGIC_GLOBAL_USED) + { + if (!pintern->Pointer) /* handle case of GlobalAlloc( ??,0) */ + retval = 0; + else + { + retval = HeapSize( GetProcessHeap(), 0, (char *)pintern->Pointer - HGLOBAL_STORAGE ); + if (retval != ~(SIZE_T)0) retval -= HGLOBAL_STORAGE; + } + } + else + { + WARN( "invalid handle %p (Magic: 0x%04x)\n", hmem, pintern->Magic ); + SetLastError( ERROR_INVALID_HANDLE ); + retval = 0; + } + RtlUnlockHeap( GetProcessHeap() ); + } + if (retval == ~(SIZE_T)0) retval = 0; + return retval; } @@ -415,32 +415,31 @@ VOID WINAPI GlobalUnfix(HGLOBAL hmem) */ UINT WINAPI GlobalFlags(HGLOBAL hmem) { - DWORD retval; - PGLOBAL32_INTERN pintern; + DWORD retval; + PGLOBAL32_INTERN pintern; - if(ISPOINTER(hmem)) - { - retval=0; - } - else - { - RtlLockHeap(GetProcessHeap()); - pintern=HANDLE_TO_INTERN(hmem); - if(pintern->Magic==MAGIC_GLOBAL_USED) - { - retval=pintern->LockCount + (pintern->Flags<<8); - if(pintern->Pointer==0) - retval|= GMEM_DISCARDED; - } - else - { - WARN("invalid handle %p (Magic: 0x%04x)\n", hmem, pintern->Magic); - SetLastError(ERROR_INVALID_HANDLE); - retval = GMEM_INVALID_HANDLE; - } - RtlUnlockHeap(GetProcessHeap()); - } - return retval; + if (ISPOINTER( hmem )) + { + retval = 0; + } + else + { + RtlLockHeap( GetProcessHeap() ); + pintern = HANDLE_TO_INTERN( hmem ); + if (pintern->Magic == MAGIC_GLOBAL_USED) + { + retval = pintern->LockCount + (pintern->Flags << 8); + if (pintern->Pointer == 0) retval |= GMEM_DISCARDED; + } + else + { + WARN( "invalid handle %p (Magic: 0x%04x)\n", hmem, pintern->Magic ); + SetLastError( ERROR_INVALID_HANDLE ); + retval = GMEM_INVALID_HANDLE; + } + RtlUnlockHeap( GetProcessHeap() ); + } + return retval; } -- 2.35.1

1 3

[PATCH 1/5] d2d1: Fix a typo.
by Ziqing Hui 29 Mar '22

29 Mar '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/factory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 737864df69c..3d3393e5f0c 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -597,7 +597,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_GetEffectProperties(ID2D1Factory2 * return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_ID2D1Factory1_CreateDevice(ID2D1Factory2 *iface, IDXGIDevice *dxgi_device, +static HRESULT STDMETHODCALLTYPE d2d_factory_ID2D1Factory2_CreateDevice(ID2D1Factory2 *iface, IDXGIDevice *dxgi_device, ID2D1Device1 **device) { FIXME("iface %p, dxgi_device %p, device %p stub!\n", iface, dxgi_device, device); @@ -634,7 +634,7 @@ static const struct ID2D1Factory2Vtbl d2d_factory_vtbl = d2d_factory_UnregisterEffect, d2d_factory_GetRegisteredEffects, d2d_factory_GetEffectProperties, - d2d_factory_ID2D1Factory1_CreateDevice, + d2d_factory_ID2D1Factory2_CreateDevice, }; static HRESULT STDMETHODCALLTYPE d2d_factory_mt_QueryInterface(ID2D1Multithread *iface, REFIID iid, void **out) -- 2.25.1

2 9

[PATCH v2 1/5] windows.media.speech: Add IVector<HSTRING>.
by Bernhard Kölbl 29 Mar '22

29 Mar '22

And use it in listconstraint. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> -- v2: Handle allocation failures. --- dlls/windows.media.speech/Makefile.in | 3 +- dlls/windows.media.speech/listconstraint.c | 11 +- dlls/windows.media.speech/private.h | 2 + dlls/windows.media.speech/vector.c | 313 +++++++++++++++++++++ 4 files changed, 326 insertions(+), 3 deletions(-) create mode 100644 dlls/windows.media.speech/vector.c diff --git a/dlls/windows.media.speech/Makefile.in b/dlls/windows.media.speech/Makefile.in index 5dbdb03cf2f..5a8291ba6f0 100644 --- a/dlls/windows.media.speech/Makefile.in +++ b/dlls/windows.media.speech/Makefile.in @@ -6,6 +6,7 @@ C_SRCS = \ listconstraint.c \ main.c \ recognizer.c \ - synthesizer.c + synthesizer.c \ + vector.c IDL_SRCS = classes.idl diff --git a/dlls/windows.media.speech/listconstraint.c b/dlls/windows.media.speech/listconstraint.c index d641902f4bc..0c486a415a7 100644 --- a/dlls/windows.media.speech/listconstraint.c +++ b/dlls/windows.media.speech/listconstraint.c @@ -36,6 +36,7 @@ struct list_constraint LONG ref; BOOLEAN enabled; + IVector_HSTRING *commands; }; /* @@ -91,7 +92,10 @@ static ULONG WINAPI list_constraint_Release( ISpeechRecognitionListConstraint *i TRACE("iface %p, ref %lu.\n", iface, ref); if (!ref) + { + IVector_HSTRING_Release(impl->commands); free(impl); + } return ref; } @@ -337,12 +341,15 @@ static HRESULT WINAPI constraint_factory_CreateWithTag( ISpeechRecognitionListCo TRACE("iface %p, commands %p, tag %p, listconstraint %p.\n", iface, commands, tag, listconstraint); + *listconstraint = NULL; + if (!commands) return E_POINTER; - if (!(impl = calloc(1, sizeof(*impl)))) + if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; + if (FAILED(vector_hstring_create(&impl->commands))) { - *listconstraint = NULL; + free(impl); return E_OUTOFMEMORY; } diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h index 3e2fa9aed38..a09b5f5ef7e 100644 --- a/dlls/windows.media.speech/private.h +++ b/dlls/windows.media.speech/private.h @@ -66,6 +66,8 @@ HRESULT typed_event_handlers_remove( struct list *list, EventRegistrationToken * HRESULT typed_event_handlers_notify( struct list *list, IInspectable *sender, IInspectable *args ); HRESULT typed_event_handlers_clear( struct list* list ); +HRESULT vector_hstring_create( IVector_HSTRING **out ); + #define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ static inline impl_type *impl_from( iface_type *iface ) \ { \ diff --git a/dlls/windows.media.speech/vector.c b/dlls/windows.media.speech/vector.c new file mode 100644 index 00000000000..13a36499a46 --- /dev/null +++ b/dlls/windows.media.speech/vector.c @@ -0,0 +1,313 @@ +/* WinRT Windows.Media.Speech implementation + * + * Copyright 2022 Bernhard Kölbl for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(speech); + +/* + * + * IVector<HSTRING> + * + */ + +struct vector_hstring +{ + IVector_HSTRING IVector_HSTRING_iface; + LONG ref; + + UINT32 size; + UINT32 capacity; + HSTRING *elements; +}; + +static inline struct vector_hstring *impl_from_IVector_HSTRING( IVector_HSTRING *iface ) +{ + return CONTAINING_RECORD(iface, struct vector_hstring, IVector_HSTRING_iface); +} + +static HRESULT WINAPI vector_hstring_QueryInterface( IVector_HSTRING *iface, REFIID iid, void **out ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, &IID_IVector_HSTRING)) + { + IInspectable_AddRef((*out = &impl->IVector_HSTRING_iface)); + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI vector_hstring_AddRef( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %lu.\n", iface, ref); + return ref; +} + +static ULONG WINAPI vector_hstring_Release( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + + TRACE("iface %p, ref %lu.\n", iface, ref); + + if (!ref) + { + IVector_HSTRING_Clear(iface); + free(impl); + } + + return ref; +} + +static HRESULT WINAPI vector_hstring_GetIids( IVector_HSTRING *iface, ULONG *iid_count, IID **iids ) +{ + FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_GetRuntimeClassName( IVector_HSTRING *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_GetTrustLevel( IVector_HSTRING *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_GetAt( IVector_HSTRING *iface, UINT32 index, HSTRING *value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + *value = NULL; + if (index >= impl->size) return E_BOUNDS; + + return WindowsDuplicateString(impl->elements[index], value); +} + +static HRESULT WINAPI vector_hstring_get_Size( IVector_HSTRING *iface, UINT32 *value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + TRACE( "iface %p, value %p.\n", iface, value ); + *value = impl->size; + return S_OK; +} + +static HRESULT WINAPI vector_hstring_GetView( IVector_HSTRING *iface, IVectorView_HSTRING **value ) +{ + FIXME("iface %p, value %p stub!\n", iface, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_IndexOf( IVector_HSTRING *iface, HSTRING element, UINT32 *index, BOOLEAN *found ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + ULONG i; + + TRACE("iface %p, element %p, index %p, found %p.\n", iface, element, index, found); + + for (i = 0; i < impl->size; ++i) if (impl->elements[i] == element) break; + if ((*found = (i < impl->size))) *index = i; + else *index = 0; + + return S_OK; +} + +static HRESULT WINAPI vector_hstring_SetAt( IVector_HSTRING *iface, UINT32 index, HSTRING value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + HSTRING tmp; + HRESULT hr; + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + if (index >= impl->size) return E_BOUNDS; + + if (FAILED(hr = WindowsDuplicateString(value, &tmp))) return hr; + + WindowsDeleteString(impl->elements[index]); + impl->elements[index] = tmp; + return S_OK; +} + +static HRESULT WINAPI vector_hstring_InsertAt( IVector_HSTRING *iface, UINT32 index, HSTRING value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + HSTRING tmp, *tmp2 = impl->elements; + HRESULT hr; + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + if (FAILED(hr = WindowsDuplicateString(value, &tmp))) return hr; + + if (impl->size == impl->capacity) + { + impl->capacity = max(32, impl->capacity * 3 / 2); + if (!(impl->elements = realloc(impl->elements, impl->capacity * sizeof(*impl->elements)))) + { + impl->elements = tmp2; + return E_OUTOFMEMORY; + } + } + + memmove(impl->elements + index + 1, impl->elements + index, (impl->size++ - index) * sizeof(*impl->elements)); + impl->elements[index] = tmp; + return S_OK; +} + +static HRESULT WINAPI vector_hstring_RemoveAt( IVector_HSTRING *iface, UINT32 index ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p, index %u.\n", iface, index); + + if (index >= impl->size) return E_BOUNDS; + + WindowsDeleteString(impl->elements[index]); + memmove(impl->elements + index, impl->elements + index + 1, (--impl->size - index) * sizeof(*impl->elements)); + return S_OK; +} + +static HRESULT WINAPI vector_hstring_Append( IVector_HSTRING *iface, HSTRING value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p, value %p.\n", iface, value); + + return IVector_HSTRING_InsertAt(iface, impl->size, value); +} + +static HRESULT WINAPI vector_hstring_RemoveAtEnd( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p.\n", iface); + + if (impl->size) WindowsDeleteString(impl->elements[--impl->size]); + return S_OK; +} + +static HRESULT WINAPI vector_hstring_Clear( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p.\n", iface); + + while (impl->size) IVector_HSTRING_RemoveAtEnd(iface); + free(impl->elements); + impl->capacity = 0; + impl->elements = NULL; + + return S_OK; +} + +static HRESULT WINAPI vector_hstring_GetMany( IVector_HSTRING *iface, UINT32 start_index, + UINT32 items_size, HSTRING *items, UINT32 *count ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + HRESULT hr; + UINT32 i; + + TRACE("iface %p, start_index %u, items_size %u, items %p, count %p.\n", iface, start_index, items_size, items, count); + + if (start_index >= impl->size) return E_BOUNDS; + + for (i = start_index; i < impl->size; ++i) + { + if (i - start_index >= items_size) break; + if (FAILED(hr = WindowsDuplicateString(impl->elements[i], &items[i-start_index]))) goto error; + } + *count = i - start_index; + + return S_OK; + +error: + *count = 0; + while (i-- > start_index) WindowsDeleteString(items[i-start_index]); + return hr; +} + +static HRESULT WINAPI vector_hstring_ReplaceAll( IVector_HSTRING *iface, UINT32 count, HSTRING *items ) +{ + HRESULT hr; + ULONG i; + + TRACE("iface %p, count %u, items %p.\n", iface, count, items); + + hr = IVector_HSTRING_Clear(iface); + for (i = 0; i < count && SUCCEEDED(hr); ++i) hr = IVector_HSTRING_Append(iface, items[i]); + return hr; +} + +static const struct IVector_HSTRINGVtbl vector_hstring_vtbl = +{ + /* IUnknown methods */ + vector_hstring_QueryInterface, + vector_hstring_AddRef, + vector_hstring_Release, + /* IInspectable methods */ + vector_hstring_GetIids, + vector_hstring_GetRuntimeClassName, + vector_hstring_GetTrustLevel, + /* IVector<HSTRING> methods */ + vector_hstring_GetAt, + vector_hstring_get_Size, + vector_hstring_GetView, + vector_hstring_IndexOf, + vector_hstring_SetAt, + vector_hstring_InsertAt, + vector_hstring_RemoveAt, + vector_hstring_Append, + vector_hstring_RemoveAtEnd, + vector_hstring_Clear, + vector_hstring_GetMany, + vector_hstring_ReplaceAll, +}; + +HRESULT vector_hstring_create( IVector_HSTRING **out ) +{ + struct vector_hstring *impl; + + TRACE("out %p.\n", out); + + if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; + impl->IVector_HSTRING_iface.lpVtbl = &vector_hstring_vtbl; + impl->ref = 1; + + *out = &impl->IVector_HSTRING_iface; + TRACE("created %p\n", *out); + return S_OK; +} -- 2.35.1

1 4

[PATCH] wer: Use CRT memory allocation functions.
by Nikolay Sivov 29 Mar '22

29 Mar '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wer/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index 44c6718f310..b0f18b0568d 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -18,12 +18,12 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" #include "winreg.h" #include "werapi.h" -#include "wine/heap.h" #include "wine/list.h" #include "wine/debug.h" @@ -219,7 +219,7 @@ HRESULT WINAPI WerReportCloseHandle(HREPORT hreport) if (!found) return E_INVALIDARG; - heap_free(report); + free(report); return S_OK; } @@ -259,7 +259,7 @@ HRESULT WINAPI WerReportCreate(PCWSTR eventtype, WER_REPORT_TYPE reporttype, PWE return E_INVALIDARG; } - report = heap_alloc_zero(FIELD_OFFSET(report_t, eventtype[lstrlenW(eventtype) + 1])); + report = calloc(1, FIELD_OFFSET(report_t, eventtype[lstrlenW(eventtype) + 1])); if (!report) return __HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY); -- 2.35.1

1 0

[PATCH] crypt32: Support CERT_QUERY_OBJECT_BLOB in CRYPT_QueryEmbeddedMessageObject().
by Paul Gofman 29 Mar '22

29 Mar '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Test blob is copied from wintrust tests. dlls/crypt32/object.c | 40 +++++++++-- dlls/crypt32/tests/object.c | 128 ++++++++++++++++++++++++++++++++++++ 2 files changed, 163 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 6fbd3d25496..8123ed73351 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -629,15 +629,45 @@ static BOOL CRYPT_QueryEmbeddedMessageObject(DWORD dwObjectType, TRACE("%s\n", debugstr_w(pvObject)); - if (dwObjectType != CERT_QUERY_OBJECT_FILE) + if (dwObjectType == CERT_QUERY_OBJECT_BLOB) { - WARN("don't know what to do for type %ld embedded signed messages\n", - dwObjectType); + WCHAR temp_path[MAX_PATH], temp_name[MAX_PATH]; + const CERT_BLOB *b = pvObject; + + TRACE("cbData %lu, pbData %p.\n", b->cbData, b->pbData); + + if (!GetTempPathW(MAX_PATH, temp_path) || !GetTempFileNameW(temp_path, L"blb", 0, temp_name)) + { + ERR("Failed getting temp file name.\n"); + return FALSE; + } + file = CreateFileW(temp_name, GENERIC_READ | GENERIC_WRITE, 0, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, NULL); + if (file == INVALID_HANDLE_VALUE) + { + ERR("Could not create temp file.\n"); + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + if (!WriteFile(file, b->pbData, b->cbData, NULL, NULL)) + { + CloseHandle(file); + ERR("Could not write temp file.\n"); + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + } + else if (dwObjectType == CERT_QUERY_OBJECT_FILE) + { + file = CreateFileW(pvObject, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + } + else + { + WARN("Unknown dwObjectType %lu.\n", dwObjectType); SetLastError(E_INVALIDARG); return FALSE; } - file = CreateFileW(pvObject, GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (file != INVALID_HANDLE_VALUE) { ret = CryptSIPRetrieveSubjectGuid(pvObject, file, &subject); diff --git a/dlls/crypt32/tests/object.c b/dlls/crypt32/tests/object.c index 8e77709b970..75ec5e56c5d 100644 --- a/dlls/crypt32/tests/object.c +++ b/dlls/crypt32/tests/object.c @@ -124,10 +124,129 @@ static WCHAR signedWithCertWithValidPubKeyContentBase64W[] = { 'k','u','8','u','/','F','c','p','p','K','/','g','7','p','M','Z','O','V','H','k', 'R','L','g','L','K','P','S','o','D','Q','=','=',0 }; +/* Self-signed .exe, built with tcc, signed with signtool + * (and a certificate generated on a self-signed CA). + * + * small.c: + * int _start() + * { + * return 0; + * } + * + * tcc -nostdlib small.c + * signtool sign /v /f codesign.pfx small.exe + */ +static const BYTE signed_pe_blob[] = +{ + 0x4D,0x5A,0x90,0x00,0x03,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0xFF,0xFF,0x00,0x00,0xB8,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x0E,0x1F,0xBA,0x0E,0x00,0xB4,0x09,0xCD, + 0x21,0xB8,0x01,0x4C,0xCD,0x21,0x54,0x68,0x69,0x73,0x20,0x70,0x72,0x6F,0x67,0x72,0x61,0x6D,0x20,0x63,0x61,0x6E,0x6E,0x6F, + 0x74,0x20,0x62,0x65,0x20,0x72,0x75,0x6E,0x20,0x69,0x6E,0x20,0x44,0x4F,0x53,0x20,0x6D,0x6F,0x64,0x65,0x2E,0x0D,0x0D,0x0A, + 0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x50,0x45,0x00,0x00,0x4C,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0xE0,0x00,0x0F,0x03,0x0B,0x01,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x10,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,0x10,0x00,0x00,0x00,0x02,0x00,0x00, + 0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x02,0x00,0x00, + 0xE7,0x0C,0x00,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00, + 0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x68,0x05,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x2E,0x74,0x65,0x78,0x74,0x00,0x00,0x00, + 0x18,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x55,0x89,0xE5,0x81,0xEC,0x00,0x00,0x00,0x00,0x90,0xB8,0x00,0x00,0x00,0x00,0xE9, + 0x00,0x00,0x00,0x00,0xC9,0xC3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x68,0x05,0x00,0x00,0x00,0x02,0x02,0x00, + /* Start of the signature overlay */ + 0x30,0x82,0x05,0x5A,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x02,0xA0,0x82,0x05,0x4B,0x30,0x82,0x05,0x47,0x02, + 0x01,0x01,0x31,0x0B,0x30,0x09,0x06,0x05,0x2B,0x0E,0x03,0x02,0x1A,0x05,0x00,0x30,0x4C,0x06,0x0A,0x2B,0x06,0x01,0x04,0x01, + 0x82,0x37,0x02,0x01,0x04,0xA0,0x3E,0x30,0x3C,0x30,0x17,0x06,0x0A,0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x02,0x01,0x0F,0x30, + 0x09,0x03,0x01,0x00,0xA0,0x04,0xA2,0x02,0x80,0x00,0x30,0x21,0x30,0x09,0x06,0x05,0x2B,0x0E,0x03,0x02,0x1A,0x05,0x00,0x04, + 0x14,0xA0,0x95,0xDE,0xBD,0x1A,0xB7,0x86,0xAF,0x50,0x63,0xD8,0x8F,0x90,0xD5,0x49,0x96,0x4E,0x44,0xF0,0x71,0xA0,0x82,0x03, + 0x1D,0x30,0x82,0x03,0x19,0x30,0x82,0x02,0x01,0xA0,0x03,0x02,0x01,0x02,0x02,0x10,0x96,0x53,0x2C,0xC9,0x23,0x56,0x8A,0x87, + 0x42,0x30,0x3E,0xD5,0x8D,0x72,0xD5,0x25,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0B,0x05,0x00,0x30, + 0x17,0x31,0x15,0x30,0x13,0x06,0x03,0x55,0x04,0x03,0x13,0x0C,0x54,0x65,0x73,0x74,0x20,0x43,0x41,0x20,0x52,0x6F,0x6F,0x74, + 0x30,0x1E,0x17,0x0D,0x31,0x36,0x30,0x33,0x30,0x33,0x32,0x30,0x32,0x37,0x30,0x37,0x5A,0x17,0x0D,0x34,0x39,0x31,0x32,0x33, + 0x31,0x32,0x33,0x30,0x30,0x30,0x30,0x5A,0x30,0x17,0x31,0x15,0x30,0x13,0x06,0x03,0x55,0x04,0x03,0x13,0x0C,0x43,0x6F,0x64, + 0x65,0x53,0x69,0x67,0x6E,0x54,0x65,0x73,0x74,0x30,0x82,0x01,0x22,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01, + 0x01,0x01,0x05,0x00,0x03,0x82,0x01,0x0F,0x00,0x30,0x82,0x01,0x0A,0x02,0x82,0x01,0x01,0x00,0xB2,0xC9,0x91,0x98,0x8C,0xDC, + 0x80,0xBC,0x16,0xBF,0xC1,0x04,0x77,0x90,0xC0,0xFD,0x8C,0xBA,0x68,0x26,0xAC,0xB7,0x20,0x68,0x41,0xED,0xC3,0x9C,0x47,0x7C, + 0x36,0xC2,0x7B,0xE1,0x5E,0xFD,0xA9,0x99,0xF4,0x29,0x36,0x86,0x93,0x40,0x55,0x53,0x65,0x79,0xBC,0x9F,0x8F,0x6E,0x2B,0x05, + 0x84,0xE1,0xFD,0xD2,0xEF,0xEA,0x89,0x8C,0xEC,0xF9,0x55,0xF0,0x2C,0xE5,0xA7,0x29,0xF9,0x7E,0x50,0xDC,0x9C,0xA1,0x23,0xA5, + 0xD9,0x78,0xA1,0xE7,0x7C,0xD7,0x04,0x4F,0x11,0xAC,0x9F,0x4A,0x47,0xA1,0x1E,0xD5,0x9E,0xE7,0x5B,0xB5,0x8C,0x9C,0x67,0x7A, + 0xD0,0xF8,0x54,0xD1,0x64,0x7F,0x39,0x48,0xB6,0xCF,0x2F,0x26,0x7D,0x7B,0x13,0x2B,0xC2,0x8F,0xA6,0x3F,0x42,0x71,0x95,0x3E, + 0x59,0x0F,0x12,0xFA,0xC2,0x70,0x89,0xB7,0xB6,0x10,0x49,0xE0,0x7D,0x4D,0xFC,0x80,0x61,0x53,0x50,0x72,0xFD,0x46,0x35,0x51, + 0x36,0xE6,0x06,0xA9,0x4C,0x0D,0x82,0x15,0xF6,0x5D,0xDE,0xD4,0xDB,0xE7,0x82,0x10,0x40,0xA1,0x47,0x68,0x88,0x0C,0x0A,0x80, + 0xD1,0xE5,0x9A,0x35,0x28,0x82,0x1F,0x0F,0x80,0x5A,0x6E,0x1D,0x22,0x22,0xB3,0xA7,0xA2,0x9E,0x82,0x2D,0xC0,0x7F,0x5A,0xD0, + 0xBA,0xB2,0xCA,0x20,0xE2,0x97,0xE9,0x72,0x41,0xB7,0xD6,0x1A,0x93,0x23,0x97,0xF0,0xA9,0x61,0xD2,0x91,0xBD,0xB6,0x6B,0x95, + 0x12,0x67,0x16,0xAC,0x0A,0xB7,0x55,0x02,0x0D,0xA5,0xAD,0x17,0x95,0x77,0xF9,0x96,0x03,0x41,0xD3,0xE1,0x61,0x68,0xBB,0x0A, + 0xB5,0xC4,0xEE,0x70,0x40,0x08,0x05,0xC4,0xF1,0x5D,0x02,0x03,0x01,0x00,0x01,0xA3,0x61,0x30,0x5F,0x30,0x13,0x06,0x03,0x55, + 0x1D,0x25,0x04,0x0C,0x30,0x0A,0x06,0x08,0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x03,0x30,0x48,0x06,0x03,0x55,0x1D,0x01,0x04, + 0x41,0x30,0x3F,0x80,0x10,0x35,0x40,0x67,0x8F,0x7D,0x03,0x1B,0x76,0x52,0x62,0x2D,0xF5,0x21,0xF6,0x7C,0xBC,0xA1,0x19,0x30, + 0x17,0x31,0x15,0x30,0x13,0x06,0x03,0x55,0x04,0x03,0x13,0x0C,0x54,0x65,0x73,0x74,0x20,0x43,0x41,0x20,0x52,0x6F,0x6F,0x74, + 0x82,0x10,0xA0,0x4B,0xEB,0xAC,0xFA,0x08,0xF2,0x8B,0x47,0xD2,0xB3,0x54,0x60,0x6C,0xE6,0x29,0x30,0x0D,0x06,0x09,0x2A,0x86, + 0x48,0x86,0xF7,0x0D,0x01,0x01,0x0B,0x05,0x00,0x03,0x82,0x01,0x01,0x00,0x5F,0x8C,0x7F,0xDA,0x1D,0x21,0x7A,0x15,0xD8,0x20, + 0x04,0x53,0x7F,0x44,0x6D,0x7B,0x57,0xBE,0x7F,0x86,0x77,0x58,0xC4,0xD4,0x80,0xC7,0x2E,0x64,0x9B,0x44,0xC5,0x2D,0x6D,0xDB, + 0x35,0x5A,0xFE,0xA4,0xD8,0x66,0x9B,0xF7,0x6E,0xFC,0xEF,0x52,0x7B,0xC5,0x16,0xE6,0xA3,0x7D,0x59,0xB7,0x31,0x28,0xEB,0xB5, + 0x45,0xC9,0xB1,0xD1,0x08,0x67,0xC6,0x37,0xE7,0xD7,0x2A,0xE6,0x1F,0xD9,0x6A,0xE5,0x04,0xDF,0x6A,0x9D,0x91,0xFA,0x41,0xBD, + 0x2A,0x50,0xEA,0x99,0x24,0xA9,0x0F,0x2B,0x50,0x51,0x5F,0xD9,0x0B,0x89,0x1B,0xCB,0xDB,0x88,0xE8,0xEC,0x87,0xB0,0x16,0xCC, + 0x43,0xEE,0x5A,0xBD,0x57,0xE2,0x46,0xA7,0x56,0x54,0x23,0x32,0x8A,0xFB,0x25,0x51,0x39,0x38,0xE6,0x87,0xF5,0x73,0x63,0xD0, + 0x5B,0xC7,0x3F,0xFD,0x04,0x75,0x74,0x4C,0x3D,0xB5,0x31,0x22,0x7D,0xF1,0x8D,0xB4,0xE0,0xAA,0xE1,0xFF,0x8F,0xDD,0xB8,0x04, + 0x6A,0x31,0xEE,0x30,0x2D,0x6E,0x74,0x0F,0x37,0x71,0x77,0x2B,0xB8,0x9E,0x62,0x47,0x00,0x9C,0xA5,0x82,0x2B,0x9F,0x24,0x67, + 0x50,0x86,0x8B,0xC9,0x36,0x81,0xEB,0x44,0xC2,0xF1,0x91,0xA6,0x84,0x75,0x15,0x8F,0x22,0xDE,0xAC,0xB5,0x16,0xE3,0x96,0x74, + 0x72,0x2F,0x15,0xD5,0xFB,0x01,0x22,0xC4,0x24,0xEE,0x3D,0xDF,0x9E,0xA9,0x0A,0x5B,0x16,0x21,0xE8,0x4A,0x8C,0x7E,0x3A,0x9C, + 0x22,0xA0,0x49,0x60,0x97,0x1B,0x3E,0x2D,0x80,0x91,0xDB,0xF7,0x78,0x38,0x76,0x78,0x0C,0xE3,0xD4,0x27,0x77,0x69,0x96,0xE6, + 0x41,0xC7,0x2E,0xE9,0x61,0xD6,0x31,0x82,0x01,0xC4,0x30,0x82,0x01,0xC0,0x02,0x01,0x01,0x30,0x2B,0x30,0x17,0x31,0x15,0x30, + 0x13,0x06,0x03,0x55,0x04,0x03,0x13,0x0C,0x54,0x65,0x73,0x74,0x20,0x43,0x41,0x20,0x52,0x6F,0x6F,0x74,0x02,0x10,0x96,0x53, + 0x2C,0xC9,0x23,0x56,0x8A,0x87,0x42,0x30,0x3E,0xD5,0x8D,0x72,0xD5,0x25,0x30,0x09,0x06,0x05,0x2B,0x0E,0x03,0x02,0x1A,0x05, + 0x00,0xA0,0x70,0x30,0x10,0x06,0x0A,0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x02,0x01,0x0C,0x31,0x02,0x30,0x00,0x30,0x19,0x06, + 0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x03,0x31,0x0C,0x06,0x0A,0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x02,0x01,0x04, + 0x30,0x1C,0x06,0x0A,0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x02,0x01,0x0B,0x31,0x0E,0x30,0x0C,0x06,0x0A,0x2B,0x06,0x01,0x04, + 0x01,0x82,0x37,0x02,0x01,0x15,0x30,0x23,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x04,0x31,0x16,0x04,0x14,0x3D, + 0x08,0xC8,0xA3,0xEE,0x05,0x1A,0x61,0xD9,0xFE,0x1A,0x63,0xC0,0x8A,0x6E,0x9D,0xF9,0xC3,0x13,0x98,0x30,0x0D,0x06,0x09,0x2A, + 0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x01,0x05,0x00,0x04,0x82,0x01,0x00,0x90,0xF9,0xC0,0x7F,0x1D,0x70,0x8C,0x04,0x22,0x82, + 0xB6,0x2D,0x48,0xBF,0x30,0x51,0x29,0xF8,0xE3,0x11,0x39,0xE0,0x64,0x23,0x72,0xE2,0x4C,0x09,0x9F,0x39,0xF2,0x6F,0xDD,0xB9, + 0x5A,0x3D,0xEF,0xEB,0xBE,0xEC,0x3B,0xE6,0x58,0x4C,0xC9,0x4F,0xED,0xCB,0x6E,0x9D,0x67,0x8E,0x89,0x92,0x40,0x39,0xA2,0x5F, + 0xF9,0xEF,0xD3,0xF5,0x24,0x27,0x8D,0xF7,0x3C,0x92,0x66,0x56,0xC8,0x2B,0xEA,0x04,0xA1,0x0E,0xDA,0x89,0x30,0xA7,0x01,0xD8, + 0x0B,0xF8,0xFD,0x99,0xB6,0xC0,0x38,0xB0,0x21,0x50,0x3A,0x86,0x01,0xD0,0xF3,0x86,0x72,0xE3,0x5A,0xBB,0x2A,0x6E,0xBD,0xFB, + 0x22,0xF9,0x42,0xD3,0x04,0xFE,0x8D,0xD8,0x79,0xD1,0xEE,0x61,0xC6,0x48,0x04,0x99,0x9A,0xA2,0x73,0xE5,0xFB,0x24,0x10,0xD5, + 0x6B,0x71,0x80,0x0E,0x09,0xEA,0x85,0x9A,0xBD,0xBB,0xDE,0x99,0x5D,0xA3,0x18,0x4D,0xED,0x20,0x73,0x3E,0x32,0xEF,0x2C,0xAC, + 0x5A,0x83,0x87,0x1F,0x7F,0x19,0x61,0x35,0x53,0xC1,0xAA,0x89,0x97,0xB3,0xDD,0x8D,0xA8,0x67,0x5B,0xC2,0xE2,0x09,0xB7,0xDD, + 0x6A,0xCB,0xD5,0xBF,0xD6,0x08,0xE2,0x23,0x1A,0x41,0x9D,0xD5,0x6A,0x6B,0x8D,0x3C,0x29,0x1B,0xF1,0x3F,0x4E,0x4A,0x8F,0x29, + 0x33,0xF9,0x1C,0x60,0xA0,0x92,0x7E,0x4F,0x35,0xB8,0xDD,0xEB,0xD1,0x68,0x1A,0x9D,0xA2,0xA6,0x97,0x1F,0x5F,0xC6,0x2C,0xFB, + 0xCA,0xDF,0xF7,0x95,0x33,0x95,0xD4,0x79,0x5C,0x73,0x87,0x49,0x1F,0x8C,0x6E,0xCE,0x3E,0x6D,0x3D,0x2B,0x6B,0xD7,0x66,0xE9, + 0x88,0x6F,0xF2,0x83,0xB9,0x9B,0x00,0x00 +}; + static void test_query_object(void) { BOOL ret; CRYPT_DATA_BLOB blob; + DWORD content_type; /* Test the usual invalid arguments */ SetLastError(0xdeadbeef); @@ -217,6 +336,15 @@ static void test_query_object(void) CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_BASE64_ENCODED, 0, NULL, NULL, NULL, NULL, NULL, NULL); ok(ret, "CryptQueryObject failed: %08lx\n", GetLastError()); + + blob.pbData = (BYTE *)signed_pe_blob; + blob.cbData = sizeof(signed_pe_blob); + ret = pCryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, &content_type, + NULL, NULL, NULL, NULL); + ok(ret, "CryptQueryObject failed: %08lx\n", GetLastError()); + ok(content_type == CERT_QUERY_CONTENT_PKCS7_SIGNED_EMBED, + "Got unexpected content_type %#lx.\n", content_type); } START_TEST(object) -- 2.35.1

2 2

[PATCH v2 1/5] mf/tests: Fix incorrect array index when formatting blob value.
by Rémi Bernon 29 Mar '22

29 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Fix PATCH 2 compilation error with static const initializers. dlls/mf/tests/mf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 0df524b4e16..b2d2880bea6 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -147,7 +147,7 @@ static void check_attributes_(int line, IMFAttributes *attributes, const struct case VT_VECTOR | VT_UI1: buf += sprintf(buf, "size %lu, data {", value.caub.cElems); for (j = 0; j < 16 && j < value.caub.cElems; ++j) - buf += sprintf(buf, "0x%02x,", value.caub.pElems[i + j]); + buf += sprintf(buf, "0x%02x,", value.caub.pElems[j]); if (value.caub.cElems > 16) buf += sprintf(buf, "...}"); else -- 2.35.1

2 8

[PATCH v2] riched20: Handle GCS_COMPSTR, GCS_CURSORPOS on WM_IME_COMPOSITION.
by Alex Kwak 29 Mar '22

29 Mar '22

previously, doesn't handle GCS_RESULTSTR message. Therefore, it makes start index of IME have wrong position. as a result, Some IME have problems inserting characters in the wrong place. GCS_CURSORPOS is an event that location of the caret in IME, but WM_IME_COMPOSITION always calls DeleteSelection and attempts to adjust the location, causing the caret to be misplaced. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52700 Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- v2: fix c++ style comment to c style comment --- dlls/riched20/editor.c | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a8cf3175591..2816381a77e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4097,40 +4097,57 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, return 0; case WM_IME_STARTCOMPOSITION: { - editor->imeStartIndex=ME_GetCursorOfs(&editor->pCursors[0]); ME_DeleteSelection(editor); + editor->imeStartIndex = ME_GetCursorOfs(&editor->pCursors[0]); ME_CommitUndo(editor); ME_UpdateRepaint(editor, FALSE); return 0; } case WM_IME_COMPOSITION: { - HIMC hIMC; - - ME_Style *style = style_get_insert_style( editor, editor->pCursors ); - hIMC = ITextHost_TxImmGetContext(editor->texthost); - ME_DeleteSelection(editor); - ME_SaveTempStyle(editor, style); if (lParam & (GCS_RESULTSTR|GCS_COMPSTR)) { + HIMC hIMC = ITextHost_TxImmGetContext(editor->texthost); + ME_Style *style = style_get_insert_style( editor, editor->pCursors ); LPWSTR lpCompStr = NULL; DWORD dwBufLen; DWORD dwIndex = lParam & GCS_RESULTSTR; + DWORD dwBufStrLen; if (!dwIndex) dwIndex = GCS_COMPSTR; + ME_DeleteSelection(editor); + ME_SaveTempStyle(editor, style); + dwBufLen = ImmGetCompositionStringW(hIMC, dwIndex, NULL, 0); - lpCompStr = HeapAlloc(GetProcessHeap(),0,dwBufLen + sizeof(WCHAR)); + dwBufStrLen = dwBufLen / sizeof(WCHAR); + lpCompStr = HeapAlloc(GetProcessHeap(), 0, dwBufLen + sizeof(WCHAR)); ImmGetCompositionStringW(hIMC, dwIndex, lpCompStr, dwBufLen); - lpCompStr[dwBufLen/sizeof(WCHAR)] = 0; - ME_InsertTextFromCursor(editor,0,lpCompStr,dwBufLen/sizeof(WCHAR),style); + lpCompStr[dwBufStrLen] = 0; + ME_InsertTextFromCursor(editor, 0, lpCompStr, dwBufStrLen, style); HeapFree(GetProcessHeap(), 0, lpCompStr); if (dwIndex == GCS_COMPSTR) + { set_selection_cursors(editor,editor->imeStartIndex, - editor->imeStartIndex + dwBufLen/sizeof(WCHAR)); + editor->imeStartIndex + dwBufStrLen); + } + else + { + /* + * During Composition, change the start position if the completed + * characters are reflected. + */ + editor->imeStartIndex += dwBufStrLen; + } + ME_ReleaseStyle(style); } - ME_ReleaseStyle(style); + else if (lParam & GCS_CURSORPOS) + { + set_selection_cursors(editor, editor->imeStartIndex, + editor->imeStartIndex + (DWORD) wParam); + } + ME_CommitUndo(editor); ME_UpdateRepaint(editor, FALSE); return 0; -- 2.32.0

1 0

[PATCH] riched20: Handle GCS_COMPSTR, GCS_CURSORPOS on WM_IME_COMPOSITION.
by Alex Kwak 29 Mar '22

29 Mar '22

previously, doesn't handle GCS_RESULTSTR message. Therefore, it makes start index of IME have wrong position. as a result, Some IME have problems inserting characters in the wrong place. GCS_CURSORPOS is an event that location of the caret in IME, but WM_IME_COMPOSITION always calls DeleteSelection and attempts to adjust the location, causing the caret to be misplaced. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52700 Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- v2: fix c++ style comment to c style comment --- dlls/riched20/editor.c | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a8cf3175591..2816381a77e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4097,40 +4097,57 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, return 0; case WM_IME_STARTCOMPOSITION: { - editor->imeStartIndex=ME_GetCursorOfs(&editor->pCursors[0]); ME_DeleteSelection(editor); + editor->imeStartIndex = ME_GetCursorOfs(&editor->pCursors[0]); ME_CommitUndo(editor); ME_UpdateRepaint(editor, FALSE); return 0; } case WM_IME_COMPOSITION: { - HIMC hIMC; - - ME_Style *style = style_get_insert_style( editor, editor->pCursors ); - hIMC = ITextHost_TxImmGetContext(editor->texthost); - ME_DeleteSelection(editor); - ME_SaveTempStyle(editor, style); if (lParam & (GCS_RESULTSTR|GCS_COMPSTR)) { + HIMC hIMC = ITextHost_TxImmGetContext(editor->texthost); + ME_Style *style = style_get_insert_style( editor, editor->pCursors ); LPWSTR lpCompStr = NULL; DWORD dwBufLen; DWORD dwIndex = lParam & GCS_RESULTSTR; + DWORD dwBufStrLen; if (!dwIndex) dwIndex = GCS_COMPSTR; + ME_DeleteSelection(editor); + ME_SaveTempStyle(editor, style); + dwBufLen = ImmGetCompositionStringW(hIMC, dwIndex, NULL, 0); - lpCompStr = HeapAlloc(GetProcessHeap(),0,dwBufLen + sizeof(WCHAR)); + dwBufStrLen = dwBufLen / sizeof(WCHAR); + lpCompStr = HeapAlloc(GetProcessHeap(), 0, dwBufLen + sizeof(WCHAR)); ImmGetCompositionStringW(hIMC, dwIndex, lpCompStr, dwBufLen); - lpCompStr[dwBufLen/sizeof(WCHAR)] = 0; - ME_InsertTextFromCursor(editor,0,lpCompStr,dwBufLen/sizeof(WCHAR),style); + lpCompStr[dwBufStrLen] = 0; + ME_InsertTextFromCursor(editor, 0, lpCompStr, dwBufStrLen, style); HeapFree(GetProcessHeap(), 0, lpCompStr); if (dwIndex == GCS_COMPSTR) + { set_selection_cursors(editor,editor->imeStartIndex, - editor->imeStartIndex + dwBufLen/sizeof(WCHAR)); + editor->imeStartIndex + dwBufStrLen); + } + else + { + /* + * During Composition, change the start position if the completed + * characters are reflected. + */ + editor->imeStartIndex += dwBufStrLen; + } + ME_ReleaseStyle(style); } - ME_ReleaseStyle(style); + else if (lParam & GCS_CURSORPOS) + { + set_selection_cursors(editor, editor->imeStartIndex, + editor->imeStartIndex + (DWORD) wParam); + } + ME_CommitUndo(editor); ME_UpdateRepaint(editor, FALSE); return 0; -- 2.32.0

1 0

Re: TestBot job 111453 results: [PATCH] kernel32/tests: Cleanup and add more heap layout tests.
by Rémi Bernon 29 Mar '22

29 Mar '22

Nvm, I'll handle the global mem todos first. -- Rémi Bernon <rbernon(a)codeweavers.com>

1 0

[PATCH 1/5] mf/tests: Fix incorrect array index when formatting blob value.
by Rémi Bernon 29 Mar '22

29 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 0df524b4e16..b2d2880bea6 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -147,7 +147,7 @@ static void check_attributes_(int line, IMFAttributes *attributes, const struct case VT_VECTOR | VT_UI1: buf += sprintf(buf, "size %lu, data {", value.caub.cElems); for (j = 0; j < 16 && j < value.caub.cElems; ++j) - buf += sprintf(buf, "0x%02x,", value.caub.pElems[i + j]); + buf += sprintf(buf, "0x%02x,", value.caub.pElems[j]); if (value.caub.cElems > 16) buf += sprintf(buf, "...}"); else -- 2.35.1

2 7

[PATCH 1/1] winex11.drv: Call ImeSetCompositionString after IME_SetResultString
by Alex Kwak 29 Mar '22

29 Mar '22

IME_SetResultString function overwrite composition strings. so, next composition is not display on GUI. but, still have an xim. Therefore, there was a string that seemed to have disappeared in the middle of the input. Therefore, change it as follows. When calling IME_SetResultString, if in a Composition state, no longer generate WM_IME_ENDCOMPOSITION and call back the previous Composition to recover the overwritten Composition. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52700 Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- dlls/winex11.drv/ime.c | 11 +++++++++-- dlls/winex11.drv/x11drv.h | 3 ++- dlls/winex11.drv/xim.c | 3 ++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index c1584930861..f01c839b833 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -1015,7 +1015,8 @@ BOOL IME_SetCompositionString(DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, lpRead, dwReadLen); } -void IME_SetResultString(LPWSTR lpResult, DWORD dwResultLen) +void IME_SetResultString(LPWSTR lpResult, DWORD dwResultLen, LPCVOID compStr, + DWORD compStrLen) { HIMC imc; LPINPUTCONTEXT lpIMC; @@ -1048,10 +1049,16 @@ void IME_SetResultString(LPWSTR lpResult, DWORD dwResultLen) GenerateIMEMessage(imc, WM_IME_COMPOSITION, 0, GCS_COMPSTR); GenerateIMEMessage(imc, WM_IME_COMPOSITION, lpResult[0], GCS_RESULTSTR|GCS_RESULTCLAUSE); - GenerateIMEMessage(imc, WM_IME_ENDCOMPOSITION, 0, 0); if (!inComp) + { + GenerateIMEMessage(imc, WM_IME_ENDCOMPOSITION, 0, 0); ImmSetOpenStatus(imc, FALSE); + } + else + { + ImeSetCompositionString(imc, SCS_SETSTR, compStr, compStrLen, NULL, 0); + } ImmUnlockIMC(imc); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f389f3e0836..ca077caa45c 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -290,7 +290,8 @@ extern void IME_UpdateAssociation(HWND focus) DECLSPEC_HIDDEN; extern BOOL IME_SetCompositionString(DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, LPCVOID lpRead, DWORD dwReadLen) DECLSPEC_HIDDEN; -extern void IME_SetResultString(LPWSTR lpResult, DWORD dwResultlen) DECLSPEC_HIDDEN; +extern void IME_SetResultString(LPWSTR lpResult, DWORD dwResultLen, + LPCVOID compStr, DWORD compStrLen) DECLSPEC_HIDDEN; extern void X11DRV_XDND_EnterEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; extern void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 3994c2106cc..3b762d45b3c 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -115,7 +115,8 @@ void X11DRV_XIMLookupChars( const char *str, DWORD count ) if ((focus = GetFocus())) IME_UpdateAssociation(focus); - IME_SetResultString(wcOutput, dwOutput); + IME_SetResultString(wcOutput, dwOutput, CompositionString, + dwCompStringLength); HeapFree(GetProcessHeap(), 0, wcOutput); } -- 2.32.0

1 0

[PATCH] kernel32/tests: Cleanup and add more heap layout tests.
by Rémi Bernon 29 Mar '22

29 Mar '22

Updating the tests to check the new, post-vista, layout. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/heap.c | 142 +++++++++++++++++++++++++------------ 1 file changed, 96 insertions(+), 46 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index f6fb95cdddd..9785a26ac59 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -31,6 +31,7 @@ #include "wine/test.h" /* some undocumented flags (names are made up) */ +#define HEAP_PRIVATE 0x00001000 #define HEAP_PAGE_ALLOCS 0x01000000 #define HEAP_VALIDATE 0x10000000 #define HEAP_VALIDATE_ALL 0x20000000 @@ -43,12 +44,16 @@ static BOOL (WINAPI *pHeapQueryInformation)(HANDLE, HEAP_INFORMATION_CLASS, PVOI static BOOL (WINAPI *pGetPhysicallyInstalledSystemMemory)(ULONGLONG *); static ULONG (WINAPI *pRtlGetNtGlobalFlags)(void); -struct heap_layout +struct heap { - DWORD_PTR unknown[2]; - DWORD pattern; - DWORD flags; - DWORD force_flags; + UINT_PTR unknown1[2]; + UINT ffeeffee; + UINT auto_flags; + UINT_PTR unknown2[7]; + UINT unknown3[2]; + UINT_PTR unknown4[3]; + UINT flags; + UINT force_flags; }; static SIZE_T resize_9x(SIZE_T size) @@ -1159,7 +1164,6 @@ static void test_heap_checks( DWORD flags ) SIZE_T i, size, large_size = 3000 * 1024 + 37; if (flags & HEAP_PAGE_ALLOCS) return; /* no tests for that case yet */ - trace( "testing heap flags %08lx\n", flags ); p = pHeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 17 ); ok( p != NULL, "HeapAlloc failed\n" ); @@ -1380,68 +1384,114 @@ static DWORD heap_flags_from_global_flag( DWORD flag ) if (flag & FLG_HEAP_ENABLE_FREE_CHECK) ret |= HEAP_FREE_CHECKING_ENABLED; if (flag & FLG_HEAP_VALIDATE_PARAMETERS) - ret |= HEAP_VALIDATE_PARAMS | HEAP_VALIDATE | HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED; + ret |= HEAP_VALIDATE_PARAMS | HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED; if (flag & FLG_HEAP_VALIDATE_ALL) - ret |= HEAP_VALIDATE_ALL | HEAP_VALIDATE | HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED; + ret |= HEAP_VALIDATE_ALL | HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED; if (flag & FLG_HEAP_DISABLE_COALESCING) ret |= HEAP_DISABLE_COALESCE_ON_FREE; if (flag & FLG_HEAP_PAGE_ALLOCS) - ret |= HEAP_PAGE_ALLOCS | HEAP_GROWABLE; + ret |= HEAP_PAGE_ALLOCS; return ret; } +static void test_heap_layout( HANDLE handle, DWORD global_flag, DWORD heap_flags ) +{ + DWORD force_flags = heap_flags & ~(HEAP_SHARED|HEAP_DISABLE_COALESCE_ON_FREE); + struct heap *heap = handle; + + if (global_flag & FLG_HEAP_ENABLE_TAGGING) heap_flags |= HEAP_SHARED; + if (!(global_flag & FLG_HEAP_PAGE_ALLOCS)) force_flags &= ~(HEAP_GROWABLE|HEAP_PRIVATE); + + todo_wine_if( force_flags & (HEAP_PRIVATE|HEAP_NO_SERIALIZE) ) + ok( heap->force_flags == force_flags, "got force_flags %#x\n", heap->force_flags ); + todo_wine_if( heap_flags & (HEAP_VALIDATE_ALL|HEAP_VALIDATE_PARAMS|HEAP_SHARED|HEAP_PRIVATE) ) + ok( heap->flags == heap_flags, "got flags %#x\n", heap->flags ); + + if (heap->flags & HEAP_PAGE_ALLOCS) + { + struct heap expect_heap; + memset( &expect_heap, 0xee, sizeof(expect_heap) ); + expect_heap.force_flags = heap->force_flags; + expect_heap.flags = heap->flags; + todo_wine + ok( !memcmp( heap, &expect_heap, sizeof(expect_heap) ), "got unexpected data\n" ); + } + else + { + todo_wine + ok( heap->ffeeffee == 0xffeeffee, "got ffeeffee %#x\n", heap->ffeeffee ); + ok( heap->auto_flags == (heap_flags & HEAP_GROWABLE) || !heap->auto_flags, + "got auto_flags %#x\n", heap->auto_flags ); + } +} + static void test_child_heap( const char *arg ) { - struct heap_layout *heap = GetProcessHeap(); - DWORD expected = strtoul( arg, 0, 16 ); - DWORD expect_heap; + char buffer[32]; + DWORD global_flags = strtoul( arg, 0, 16 ), type, size = sizeof(buffer); + DWORD heap_flags; + HANDLE heap; + HKEY hkey; + BOOL ret; - if (expected == 0xdeadbeef) /* expected value comes from Session Manager global flags */ + if (global_flags == 0xdeadbeef) /* global_flags value comes from Session Manager global flags */ { - HKEY hkey; - expected = 0; - if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Control\\Session Manager", &hkey )) + ret = RegOpenKeyA( HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Control\\Session Manager", &hkey ); + if (!ret) { - char buffer[32]; - DWORD type, size = sizeof(buffer); - - if (!RegQueryValueExA( hkey, "GlobalFlag", 0, &type, (BYTE *)buffer, &size )) - { - if (type == REG_DWORD) expected = *(DWORD *)buffer; - else if (type == REG_SZ) expected = strtoul( buffer, 0, 16 ); - } - RegCloseKey( hkey ); + skip( "Session Manager flags not set\n" ); + return; } + + ret = RegQueryValueExA( hkey, "GlobalFlag", 0, &type, (BYTE *)buffer, &size ); + ok( ret, "RegQueryValueExA failed, error %lu\n", GetLastError() ); + + if (type == REG_DWORD) global_flags = *(DWORD *)buffer; + else if (type == REG_SZ) global_flags = strtoul( buffer, 0, 16 ); + + ret = RegCloseKey( hkey ); + ok( ret, "RegCloseKey failed, error %lu\n", GetLastError() ); } - if (expected && !pRtlGetNtGlobalFlags()) /* not working on NT4 */ + if (global_flags && !pRtlGetNtGlobalFlags()) /* not working on NT4 */ { win_skip( "global flags not set\n" ); return; } - ok( pRtlGetNtGlobalFlags() == expected, - "%s: got global flags %08lx expected %08lx\n", arg, pRtlGetNtGlobalFlags(), expected ); + heap_flags = heap_flags_from_global_flag( global_flags ); + winetest_push_context( "%#lx %#lx", global_flags, heap_flags ); - expect_heap = heap_flags_from_global_flag( expected ); + ok( pRtlGetNtGlobalFlags() == global_flags, "got global flags %#lx\n", pRtlGetNtGlobalFlags() ); - if (!(heap->flags & HEAP_GROWABLE) || heap->pattern == 0xffeeffee) /* vista layout */ - { - ok( (heap->flags & ~HEAP_GROWABLE) == 0, "%s: got heap flags %08lx\n", arg, heap->flags ); - } - else if (heap->pattern == 0xeeeeeeee && heap->flags == 0xeeeeeeee) - { - ok( expected & FLG_HEAP_PAGE_ALLOCS, "%s: got heap flags 0xeeeeeeee without page alloc\n", arg ); - } - else - { - ok( heap->flags == (expect_heap | HEAP_GROWABLE), - "%s: got heap flags %08lx expected %08lx\n", arg, heap->flags, expect_heap ); - ok( heap->force_flags == (expect_heap & ~0x18000080), - "%s: got heap force flags %08lx expected %08lx\n", arg, heap->force_flags, expect_heap ); - expect_heap = heap->flags; - } + test_heap_layout( GetProcessHeap(), global_flags, heap_flags|HEAP_GROWABLE ); - test_heap_checks( expect_heap ); + heap = HeapCreate( 0, 0, 0 ); + ok( heap != GetProcessHeap(), "got unexpected heap\n" ); + test_heap_layout( heap, global_flags, heap_flags|HEAP_GROWABLE|HEAP_PRIVATE ); + ret = HeapDestroy( heap ); + ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); + + heap = HeapCreate( HEAP_NO_SERIALIZE, 0, 0 ); + ok( heap != GetProcessHeap(), "got unexpected heap\n" ); + test_heap_layout( heap, global_flags, heap_flags|HEAP_NO_SERIALIZE|HEAP_GROWABLE|HEAP_PRIVATE ); + ret = HeapDestroy( heap ); + ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); + + heap = HeapCreate( 0, 0x1000, 0x10000 ); + ok( heap != GetProcessHeap(), "got unexpected heap\n" ); + test_heap_layout( heap, global_flags, heap_flags|HEAP_PRIVATE ); + ret = HeapDestroy( heap ); + ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); + + heap = HeapCreate( HEAP_SHARED, 0, 0 ); + ok( heap != GetProcessHeap(), "got unexpected heap\n" ); + test_heap_layout( heap, global_flags, heap_flags|HEAP_GROWABLE|HEAP_PRIVATE ); + ret = HeapDestroy( heap ); + ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); + + test_heap_checks( heap_flags ); + + winetest_pop_context(); } static void test_GetPhysicallyInstalledSystemMemory(void) -- 2.35.1

2 1

[PATCH] riched20: Handle GCS_COMPSTR, GCS_CURSORPOS on WM_IME_COMPOSITION.
by Alex Kwak 29 Mar '22

29 Mar '22

previously, doesn't handle GCS_RESULTSTR message. Therefore, it makes start index of IME have wrong position. as a result, Some IME have problems inserting characters in the wrong place. GCS_CURSORPOS is an event that location of the caret in IME, but WM_IME_COMPOSITION always calls DeleteSelection and attempts to adjust the location, causing the caret to be misplaced. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52700 Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- dlls/riched20/editor.c | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a8cf3175591..85f20359617 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4097,40 +4097,55 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, return 0; case WM_IME_STARTCOMPOSITION: { - editor->imeStartIndex=ME_GetCursorOfs(&editor->pCursors[0]); ME_DeleteSelection(editor); + editor->imeStartIndex = ME_GetCursorOfs(&editor->pCursors[0]); ME_CommitUndo(editor); ME_UpdateRepaint(editor, FALSE); return 0; } case WM_IME_COMPOSITION: { - HIMC hIMC; - - ME_Style *style = style_get_insert_style( editor, editor->pCursors ); - hIMC = ITextHost_TxImmGetContext(editor->texthost); - ME_DeleteSelection(editor); - ME_SaveTempStyle(editor, style); if (lParam & (GCS_RESULTSTR|GCS_COMPSTR)) { + HIMC hIMC = ITextHost_TxImmGetContext(editor->texthost); + ME_Style *style = style_get_insert_style( editor, editor->pCursors ); LPWSTR lpCompStr = NULL; DWORD dwBufLen; DWORD dwIndex = lParam & GCS_RESULTSTR; + DWORD dwBufStrLen; if (!dwIndex) dwIndex = GCS_COMPSTR; + ME_DeleteSelection(editor); + ME_SaveTempStyle(editor, style); + dwBufLen = ImmGetCompositionStringW(hIMC, dwIndex, NULL, 0); - lpCompStr = HeapAlloc(GetProcessHeap(),0,dwBufLen + sizeof(WCHAR)); + dwBufStrLen = dwBufLen / sizeof(WCHAR); + lpCompStr = HeapAlloc(GetProcessHeap(), 0, dwBufLen + sizeof(WCHAR)); ImmGetCompositionStringW(hIMC, dwIndex, lpCompStr, dwBufLen); - lpCompStr[dwBufLen/sizeof(WCHAR)] = 0; - ME_InsertTextFromCursor(editor,0,lpCompStr,dwBufLen/sizeof(WCHAR),style); + lpCompStr[dwBufStrLen] = 0; + ME_InsertTextFromCursor(editor, 0, lpCompStr, dwBufStrLen, style); HeapFree(GetProcessHeap(), 0, lpCompStr); if (dwIndex == GCS_COMPSTR) + { set_selection_cursors(editor,editor->imeStartIndex, - editor->imeStartIndex + dwBufLen/sizeof(WCHAR)); + editor->imeStartIndex + dwBufStrLen); + } + else + { + // During Composition, change the start position if the completed + // characters are reflected. + editor->imeStartIndex += dwBufStrLen; + } + ME_ReleaseStyle(style); } - ME_ReleaseStyle(style); + else if (lParam & GCS_CURSORPOS) + { + set_selection_cursors(editor, editor->imeStartIndex, + editor->imeStartIndex + (DWORD) wParam); + } + ME_CommitUndo(editor); ME_UpdateRepaint(editor, FALSE); return 0; -- 2.32.0

1 0

[PATCH 1/2] xmllite: Use CRT allocation functions.
by Nikolay Sivov 29 Mar '22

29 Mar '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/xmllite/reader.c | 16 ++++------------ dlls/xmllite/writer.c | 21 +++++---------------- dlls/xmllite/xmllite_private.h | 8 +++----- 3 files changed, 12 insertions(+), 33 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index ccdc1ae2c1b..8d893b51f04 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -3632,11 +3632,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), obj, imalloc); - if (imalloc) - reader = IMalloc_Alloc(imalloc, sizeof(*reader)); - else - reader = heap_alloc(sizeof(*reader)); - if (!reader) + if (!(reader = m_alloc(imalloc, sizeof(*reader)))) return E_OUTOFMEMORY; memset(reader, 0, sizeof(*reader)); @@ -3682,21 +3678,17 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, if (!stream || !ppInput) return E_INVALIDARG; - if (imalloc) - readerinput = IMalloc_Alloc(imalloc, sizeof(*readerinput)); - else - readerinput = heap_alloc(sizeof(*readerinput)); - if(!readerinput) return E_OUTOFMEMORY; + if (!(readerinput = m_alloc(imalloc, sizeof(*readerinput)))) + return E_OUTOFMEMORY; + memset(readerinput, 0, sizeof(*readerinput)); readerinput->IXmlReaderInput_iface.lpVtbl = &xmlreaderinputvtbl; readerinput->ref = 1; readerinput->imalloc = imalloc; - readerinput->stream = NULL; if (imalloc) IMalloc_AddRef(imalloc); readerinput->encoding = parse_encoding_name(encoding, -1); readerinput->hint = hint; readerinput->baseuri = readerinput_strdupW(readerinput, base_uri); - readerinput->pending = 0; hr = alloc_input_buffer(readerinput); if (hr != S_OK) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index ac02bd4c200..58d9edea059 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -1865,13 +1865,8 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), obj, imalloc); - if (imalloc) - writer = IMalloc_Alloc(imalloc, sizeof(*writer)); - else - writer = heap_alloc(sizeof(*writer)); - if (!writer) + if (!(writer = m_alloc(imalloc, sizeof(*writer)))) return E_OUTOFMEMORY; - memset(writer, 0, sizeof(*writer)); writer->IXmlWriter_iface.lpVtbl = &xmlwriter_vtbl; @@ -1899,12 +1894,9 @@ static HRESULT create_writer_output(IUnknown *stream, IMalloc *imalloc, xml_enco *out = NULL; - if (imalloc) - writeroutput = IMalloc_Alloc(imalloc, sizeof(*writeroutput)); - else - writeroutput = heap_alloc(sizeof(*writeroutput)); - if (!writeroutput) + if (!(writeroutput = m_alloc(imalloc, sizeof(*writeroutput)))) return E_OUTOFMEMORY; + memset(writeroutput, 0, sizeof(*writeroutput)); writeroutput->IXmlWriterOutput_iface.lpVtbl = &xmlwriteroutputvtbl; writeroutput->ref = 1; @@ -1912,21 +1904,18 @@ static HRESULT create_writer_output(IUnknown *stream, IMalloc *imalloc, xml_enco if (imalloc) IMalloc_AddRef(imalloc); writeroutput->encoding = encoding; - writeroutput->stream = NULL; hr = init_output_buffer(writeroutput); if (FAILED(hr)) { IUnknown_Release(&writeroutput->IXmlWriterOutput_iface); return hr; } - if (encoding_name) { + if (encoding_name) + { unsigned int size = (lstrlenW(encoding_name) + 1) * sizeof(WCHAR); writeroutput->encoding_name = writeroutput_alloc(writeroutput, size); memcpy(writeroutput->encoding_name, encoding_name, size); } - else - writeroutput->encoding_name = NULL; - writeroutput->written = 0; IUnknown_QueryInterface(stream, &IID_IUnknown, (void**)&writeroutput->output); diff --git a/dlls/xmllite/xmllite_private.h b/dlls/xmllite/xmllite_private.h index 10f43760b41..03653bbe371 100644 --- a/dlls/xmllite/xmllite_private.h +++ b/dlls/xmllite/xmllite_private.h @@ -21,14 +21,12 @@ #ifndef __XMLLITE_PRIVATE__ #define __XMLLITE_PRIVATE__ -#include "wine/heap.h" - static inline void *m_alloc(IMalloc *imalloc, size_t len) { if (imalloc) return IMalloc_Alloc(imalloc, len); else - return heap_alloc(len); + return malloc(len); } static inline void *m_realloc(IMalloc *imalloc, void *mem, size_t len) @@ -36,7 +34,7 @@ static inline void *m_realloc(IMalloc *imalloc, void *mem, size_t len) if (imalloc) return IMalloc_Realloc(imalloc, mem, len); else - return heap_realloc(mem, len); + return realloc(mem, len); } static inline void m_free(IMalloc *imalloc, void *mem) @@ -44,7 +42,7 @@ static inline void m_free(IMalloc *imalloc, void *mem) if (imalloc) IMalloc_Free(imalloc, mem); else - heap_free(mem); + free(mem); } typedef enum -- 2.35.1

1 1

[PATCH 1/2] opcservices: Use CRT allocation functions.
by Nikolay Sivov 29 Mar '22

29 Mar '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/opcservices/compress.c | 19 ++++++------ dlls/opcservices/factory.c | 6 ++-- dlls/opcservices/opc_private.h | 3 +- dlls/opcservices/package.c | 54 +++++++++++++++++----------------- dlls/opcservices/uri.c | 20 ++++++------- 5 files changed, 50 insertions(+), 52 deletions(-) diff --git a/dlls/opcservices/compress.c b/dlls/opcservices/compress.c index cb4fabcc477..37a90716a74 100644 --- a/dlls/opcservices/compress.c +++ b/dlls/opcservices/compress.c @@ -28,7 +28,6 @@ #include "opc_private.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(msopc); @@ -120,7 +119,7 @@ HRESULT compress_create_archive(IStream *output, struct zip_archive **out) WORD date, time; FILETIME ft; - if (!(archive = heap_alloc(sizeof(*archive)))) + if (!(archive = malloc(sizeof(*archive)))) return E_OUTOFMEMORY; archive->files = NULL; @@ -180,9 +179,9 @@ void compress_finalize_archive(struct zip_archive *archive) IStream_Release(archive->output); for (i = 0; i < archive->file_count; i++) - heap_free(archive->files[i]); - heap_free(archive->files); - heap_free(archive); + free(archive->files[i]); + free(archive->files); + free(archive); } static void compress_write_content(struct zip_archive *archive, IStream *content, @@ -270,7 +269,7 @@ HRESULT compress_add_file(struct zip_archive *archive, const WCHAR *path, DWORD len; len = WideCharToMultiByte(CP_ACP, 0, path, -1, NULL, 0, NULL, NULL); - if (!(name = heap_alloc(len))) + if (!(name = malloc(len))) return E_OUTOFMEMORY; WideCharToMultiByte(CP_ACP, 0, path, -1, name, len, NULL, NULL); @@ -302,9 +301,9 @@ HRESULT compress_add_file(struct zip_archive *archive, const WCHAR *path, return archive->write_result; /* Set directory entry */ - if (!(entry = heap_alloc_zero(sizeof(*entry) + local_header.name_length))) + if (!(entry = calloc(1, sizeof(*entry) + local_header.name_length))) { - heap_free(name); + free(name); return E_OUTOFMEMORY; } @@ -320,12 +319,12 @@ HRESULT compress_add_file(struct zip_archive *archive, const WCHAR *path, entry->name_length = local_header.name_length; entry->local_file_offset = local_header_pos; memcpy(entry + 1, name, entry->name_length); - heap_free(name); + free(name); if (!opc_array_reserve((void **)&archive->files, &archive->file_size, archive->file_count + 1, sizeof(*archive->files))) { - heap_free(entry); + free(entry); return E_OUTOFMEMORY; } diff --git a/dlls/opcservices/factory.c b/dlls/opcservices/factory.c index 4c465f653f8..fcebb977c1d 100644 --- a/dlls/opcservices/factory.c +++ b/dlls/opcservices/factory.c @@ -85,7 +85,7 @@ static ULONG WINAPI opc_filestream_Release(IStream *iface) if (!refcount) { CloseHandle(stream->hfile); - heap_free(stream); + free(stream); } return refcount; @@ -263,14 +263,14 @@ static HRESULT opc_filestream_create(const WCHAR *filename, OPC_STREAM_IO_MODE i return E_INVALIDARG; } - if (!(stream = heap_alloc_zero(sizeof(*stream)))) + if (!(stream = calloc(1, sizeof(*stream)))) return E_OUTOFMEMORY; stream->hfile = CreateFileW(filename, access, 0, sa, creation, flags, NULL); if (stream->hfile == INVALID_HANDLE_VALUE) { HRESULT hr = HRESULT_FROM_WIN32(GetLastError()); - heap_free(stream); + free(stream); return hr; } diff --git a/dlls/opcservices/opc_private.h b/dlls/opcservices/opc_private.h index c7b1d0cab3d..b1163fe1215 100644 --- a/dlls/opcservices/opc_private.h +++ b/dlls/opcservices/opc_private.h @@ -17,7 +17,6 @@ */ #include "msopc.h" -#include "wine/heap.h" static inline BOOL opc_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { @@ -37,7 +36,7 @@ static inline BOOL opc_array_reserve(void **elements, size_t *capacity, size_t c if (new_capacity < count) new_capacity = max_capacity; - if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + if (!(new_elements = realloc(*elements, new_capacity * size))) return FALSE; *elements = new_elements; diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 64d34d4b853..e080b386c61 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -170,8 +170,8 @@ static void opc_content_release(struct opc_content *content) if (!refcount) { - heap_free(content->data); - heap_free(content); + free(content->data); + free(content); } } @@ -214,7 +214,7 @@ static ULONG WINAPI opc_part_enum_Release(IOpcPartEnumerator *iface) if (!refcount) { IOpcPartSet_Release(&part_enum->part_set->IOpcPartSet_iface); - heap_free(part_enum); + free(part_enum); } return refcount; @@ -321,7 +321,7 @@ static HRESULT opc_part_enum_create(struct opc_part_set *part_set, IOpcPartEnume { struct opc_part_enum *part_enum; - if (!(part_enum = heap_alloc_zero(sizeof(*part_enum)))) + if (!(part_enum = calloc(1, sizeof(*part_enum)))) return E_OUTOFMEMORY; part_enum->IOpcPartEnumerator_iface.lpVtbl = &opc_part_enum_vtbl; @@ -375,7 +375,7 @@ static ULONG WINAPI opc_rel_enum_Release(IOpcRelationshipEnumerator *iface) if (!refcount) { IOpcRelationshipSet_Release(&rel_enum->rel_set->IOpcRelationshipSet_iface); - heap_free(rel_enum); + free(rel_enum); } return refcount; @@ -482,7 +482,7 @@ static HRESULT opc_rel_enum_create(struct opc_relationship_set *rel_set, IOpcRel { struct opc_rel_enum *rel_enum; - if (!(rel_enum = heap_alloc_zero(sizeof(*rel_enum)))) + if (!(rel_enum = calloc(1, sizeof(*rel_enum)))) return E_OUTOFMEMORY; rel_enum->IOpcRelationshipEnumerator_iface.lpVtbl = &opc_rel_enum_vtbl; @@ -535,7 +535,7 @@ static ULONG WINAPI opc_content_stream_Release(IStream *iface) if (!refcount) { opc_content_release(stream->content); - heap_free(stream); + free(stream); } return refcount; @@ -578,7 +578,7 @@ static HRESULT WINAPI opc_content_stream_Write(IStream *iface, const void *data, if (size > stream->content->size.QuadPart - stream->pos.QuadPart) { - void *ptr = heap_realloc(stream->content->data, stream->pos.QuadPart + size); + void *ptr = realloc(stream->content->data, stream->pos.QuadPart + size); if (!ptr) return E_OUTOFMEMORY; stream->content->data = ptr; @@ -707,7 +707,7 @@ static HRESULT opc_content_stream_create(struct opc_content *content, IStream ** { struct opc_content_stream *stream; - if (!(stream = heap_alloc_zero(sizeof(*stream)))) + if (!(stream = calloc(1, sizeof(*stream)))) return E_OUTOFMEMORY; stream->IStream_iface.lpVtbl = &opc_content_stream_vtbl; @@ -780,7 +780,7 @@ static ULONG WINAPI opc_part_Release(IOpcPart *iface) IOpcPartUri_Release(part->name); CoTaskMemFree(part->content_type); opc_content_release(part->content); - heap_free(part); + free(part); } return refcount; @@ -866,7 +866,7 @@ static HRESULT opc_part_create(struct opc_part_set *set, IOpcPartUri *name, cons if (!opc_array_reserve((void **)&set->parts, &set->size, set->count + 1, sizeof(*set->parts))) return E_OUTOFMEMORY; - if (!(part = heap_alloc_zero(sizeof(*part)))) + if (!(part = calloc(1, sizeof(*part)))) return E_OUTOFMEMORY; part->IOpcPart_iface.lpVtbl = &opc_part_vtbl; @@ -880,7 +880,7 @@ static HRESULT opc_part_create(struct opc_part_set *set, IOpcPartUri *name, cons return E_OUTOFMEMORY; } - part->content = heap_alloc_zero(sizeof(*part->content)); + part->content = calloc(1, sizeof(*part->content)); if (!part->content) { IOpcPart_Release(&part->IOpcPart_iface); @@ -951,8 +951,8 @@ static ULONG WINAPI opc_part_set_Release(IOpcPartSet *iface) for (i = 0; i < part_set->count; ++i) IOpcPart_Release(&part_set->parts[i]->IOpcPart_iface); - heap_free(part_set->parts); - heap_free(part_set); + free(part_set->parts); + free(part_set); } return refcount; @@ -1088,7 +1088,7 @@ static ULONG WINAPI opc_relationship_Release(IOpcRelationship *iface) CoTaskMemFree(relationship->type); IOpcUri_Release(relationship->source_uri); IUri_Release(relationship->target); - heap_free(relationship); + free(relationship); } return refcount; @@ -1183,7 +1183,7 @@ static HRESULT opc_relationship_create(struct opc_relationship_set *set, const W if (!opc_array_reserve((void **)&set->relationships, &set->size, set->count + 1, sizeof(*set->relationships))) return E_OUTOFMEMORY; - if (!(relationship = heap_alloc_zero(sizeof(*relationship)))) + if (!(relationship = calloc(1, sizeof(*relationship)))) return E_OUTOFMEMORY; relationship->IOpcRelationship_iface.lpVtbl = &opc_relationship_vtbl; @@ -1272,8 +1272,8 @@ static ULONG WINAPI opc_relationship_set_Release(IOpcRelationshipSet *iface) for (i = 0; i < relationship_set->count; ++i) IOpcRelationship_Release(&relationship_set->relationships[i]->IOpcRelationship_iface); IOpcUri_Release(relationship_set->source_uri); - heap_free(relationship_set->relationships); - heap_free(relationship_set); + free(relationship_set->relationships); + free(relationship_set); } return refcount; @@ -1398,7 +1398,7 @@ static HRESULT opc_relationship_set_create(IOpcUri *source_uri, IOpcRelationship { struct opc_relationship_set *relationship_set; - if (!(relationship_set = heap_alloc_zero(sizeof(*relationship_set)))) + if (!(relationship_set = calloc(1, sizeof(*relationship_set)))) return E_OUTOFMEMORY; relationship_set->IOpcRelationshipSet_iface.lpVtbl = &opc_relationship_set_vtbl; @@ -1452,7 +1452,7 @@ static ULONG WINAPI opc_package_Release(IOpcPackage *iface) IOpcRelationshipSet_Release(package->relationship_set); if (package->source_uri) IOpcUri_Release(package->source_uri); - heap_free(package); + free(package); } return refcount; @@ -1466,7 +1466,7 @@ static HRESULT WINAPI opc_package_GetPartSet(IOpcPackage *iface, IOpcPartSet **p if (!package->part_set) { - struct opc_part_set *part_set = heap_alloc_zero(sizeof(*part_set)); + struct opc_part_set *part_set = calloc(1, sizeof(*part_set)); if (!part_set) return E_OUTOFMEMORY; @@ -1515,7 +1515,7 @@ HRESULT opc_package_create(IOpcFactory *factory, IOpcPackage **out) struct opc_package *package; HRESULT hr; - if (!(package = heap_alloc_zero(sizeof(*package)))) + if (!(package = calloc(1, sizeof(*package)))) return E_OUTOFMEMORY; package->IOpcPackage_iface.lpVtbl = &opc_package_vtbl; @@ -1523,7 +1523,7 @@ HRESULT opc_package_create(IOpcFactory *factory, IOpcPackage **out) if (FAILED(hr = IOpcFactory_CreatePackageRootUri(factory, &package->source_uri))) { - heap_free(package); + free(package); return hr; } @@ -1566,7 +1566,7 @@ static HRESULT opc_package_add_override_content_type(struct content_types *types { struct content_type *type; - if (!(type = heap_alloc(sizeof(*type)))) + if (!(type = malloc(sizeof(*type)))) return E_OUTOFMEMORY; type->element = CONTENT_TYPE_OVERRIDE; @@ -1583,7 +1583,7 @@ static HRESULT opc_package_add_default_content_type(struct content_types *types, { struct content_type *type; - if (!(type = heap_alloc(sizeof(*type)))) + if (!(type = malloc(sizeof(*type)))) return E_OUTOFMEMORY; type->element = CONTENT_TYPE_DEFAULT; @@ -1593,7 +1593,7 @@ static HRESULT opc_package_add_default_content_type(struct content_types *types, { CoTaskMemFree(type->u.def.ext); CoTaskMemFree(type->u.def.type); - heap_free(type); + free(type); return E_OUTOFMEMORY; } @@ -1810,7 +1810,7 @@ static HRESULT opc_package_write_contenttypes(IOpcPackage *package, struct zip_a hr = IXmlWriter_WriteEndElement(writer); list_remove(&content_type->entry); - heap_free(content_type); + free(content_type); } if (SUCCEEDED(hr)) diff --git a/dlls/opcservices/uri.c b/dlls/opcservices/uri.c index 0a7e2ef3660..556aaae354d 100644 --- a/dlls/opcservices/uri.c +++ b/dlls/opcservices/uri.c @@ -79,7 +79,7 @@ static ULONG WINAPI opc_uri_Release(IOpcPartUri *iface) if (uri->source_uri) IOpcPartUri_Release(&uri->source_uri->IOpcPartUri_iface); IUri_Release(uri->uri); - heap_free(uri); + free(uri); } return refcount; @@ -485,7 +485,7 @@ static IUri *opc_part_uri_get_rels_uri(IUri *uri) } } - ret = heap_alloc((len + ARRAY_SIZE(relsextW) + ARRAY_SIZE(relsdirW)) * sizeof(WCHAR)); + ret = malloc((len + ARRAY_SIZE(relsextW) + ARRAY_SIZE(relsdirW)) * sizeof(WCHAR)); if (!ret) { SysFreeString(path); @@ -505,7 +505,7 @@ static IUri *opc_part_uri_get_rels_uri(IUri *uri) if (FAILED(hr = CreateUri(ret, Uri_CREATE_ALLOW_RELATIVE, 0, &rels_uri))) WARN("Failed to create rels uri, hr %#lx.\n", hr); - heap_free(ret); + free(ret); SysFreeString(path); return rels_uri; @@ -539,13 +539,13 @@ static HRESULT opc_source_uri_create(struct opc_uri *uri, IOpcUri **out) if (!uri->source_uri) return OPC_E_RELATIONSHIP_URI_REQUIRED; - if (!(obj = heap_alloc_zero(sizeof(*obj)))) + if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY; if (FAILED(hr = opc_part_uri_init(obj, NULL, uri->source_uri->is_part_uri, uri->source_uri->uri))) { WARN("Failed to init part uri, hr %#lx.\n", hr); - heap_free(obj); + free(obj); return hr; } @@ -561,13 +561,13 @@ HRESULT opc_part_uri_create(IUri *uri, struct opc_uri *source_uri, IOpcPartUri * struct opc_uri *obj; HRESULT hr; - if (!(obj = heap_alloc_zero(sizeof(*obj)))) + if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY; if (FAILED(hr = opc_part_uri_init(obj, source_uri, TRUE, uri))) { WARN("Failed to init part uri, hr %#lx.\n", hr); - heap_free(obj); + free(obj); return hr; } @@ -584,13 +584,13 @@ HRESULT opc_root_uri_create(IOpcUri **out) *out = NULL; - if (!(obj = heap_alloc_zero(sizeof(*obj)))) + if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY; if (FAILED(hr = CreateUri(L"/", Uri_CREATE_ALLOW_RELATIVE, 0, &uri))) { WARN("Failed to create rels uri, hr %#lx.\n", hr); - heap_free(obj); + free(obj); return hr; } @@ -599,7 +599,7 @@ HRESULT opc_root_uri_create(IOpcUri **out) if (FAILED(hr)) { WARN("Failed to init uri, hr %#lx.\n", hr); - heap_free(uri); + free(uri); return hr; } -- 2.35.1

1 1

[PATCH] winex11: Always call XInstallColormap after XCreateColormap
by Alex Henrie 29 Mar '22

29 Mar '22

Unless XInstallColormap is called, Xephyr does not use the new color map, even if it is associated to a window. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52742 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This also helps with bug 46666, but there are still a lot of graphics problems with that game and it's not clear to me whether or not they're related to the color palette. --- dlls/winex11.drv/desktop.c | 5 +++++ dlls/winex11.drv/opengl.c | 3 +++ dlls/winex11.drv/palette.c | 1 + dlls/winex11.drv/window.c | 4 ++++ dlls/winex11.drv/x11drv_main.c | 1 + 5 files changed, 14 insertions(+) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 0ac538d06ed..b563487e801 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -349,10 +349,15 @@ BOOL CDECL X11DRV_create_desktop( UINT width, UINT height ) win_attr.cursor = XCreateFontCursor( display, XC_top_left_arrow ); if (default_visual.visual != DefaultVisual( display, DefaultScreen(display) )) + { win_attr.colormap = XCreateColormap( display, DefaultRootWindow(display), default_visual.visual, AllocNone ); + XInstallColormap( display, win_attr.colormap ); + } else + { win_attr.colormap = None; + } win = XCreateWindow( display, DefaultRootWindow(display), 0, 0, width, height, 0, default_visual.depth, InputOutput, default_visual.visual, diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 567205f742c..2756ed5fe92 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -458,7 +458,10 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) root = RootWindow( gdi_display, vis->screen ); if (vis->visual != DefaultVisual( gdi_display, vis->screen )) + { attr.colormap = XCreateColormap( gdi_display, root, vis->visual, AllocNone ); + XInstallColormap( gdi_display, attr.colormap ); + } if ((win = XCreateWindow( gdi_display, root, -1, -1, 1, 1, 0, vis->depth, InputOutput, vis->visual, CWBorderPixel | CWOverrideRedirect | CWColormap, &attr ))) XMapWindow( gdi_display, win ); diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index 8fbd7820c95..845f01902fc 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -304,6 +304,7 @@ int X11DRV_PALETTE_Init(void) XFreeColormap( gdi_display, default_colormap ); default_colormap = XCreateColormap( gdi_display, root_window, default_visual.visual, AllocAll ); + XInstallColormap( gdi_display, default_colormap ); if (default_colormap) { X11DRV_PALETTE_PaletteFlags |= X11DRV_PALETTE_PRIVATE; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 36fb41ac710..818310d5461 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1520,6 +1520,7 @@ Window create_client_window( HWND hwnd, const XVisualInfo *visual ) (visual->class == PseudoColor || visual->class == GrayScale || visual->class == DirectColor) ? AllocAll : AllocNone ); + XInstallColormap( gdi_display, data->client_colormap ); attr.colormap = data->client_colormap; attr.bit_gravity = NorthWestGravity; attr.win_gravity = NorthWestGravity; @@ -1579,7 +1580,10 @@ static void create_whole_window( struct x11drv_win_data *data ) data->shaped = (win_rgn != 0); if (data->vis.visualid != default_visual.visualid) + { data->whole_colormap = XCreateColormap( data->display, root_window, data->vis.visual, AllocNone ); + XInstallColormap( data->display, data->whole_colormap ); + } mask = get_window_attributes( data, &attr ); diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 32beb84a009..8de464aa8bd 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -558,6 +558,7 @@ static void init_visuals( Display *display, int screen ) default_visual.bits_per_rgb = default_visual.visual->bits_per_rgb; } default_colormap = XCreateColormap( display, root_window, default_visual.visual, AllocNone ); + XInstallColormap( display, default_colormap ); TRACE( "default visual %lx class %u argb %lx\n", default_visual.visualid, default_visual.class, argb_visual.visualid ); -- 2.35.1

2 2

[PATCH] chakra: Add stub dll.
by Mohamad Al-Jaf 29 Mar '22

29 Mar '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52741 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52746 Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- Confirmed that Minecraft Windows Bedrock server runs with this patch. --- configure.ac | 1 + dlls/chakra/Makefile.in | 5 ++ dlls/chakra/chakra.spec | 160 ++++++++++++++++++++++++++++++++++++++++ dlls/chakra/version.rc | 26 +++++++ 4 files changed, 192 insertions(+) create mode 100644 dlls/chakra/Makefile.in create mode 100644 dlls/chakra/chakra.spec create mode 100644 dlls/chakra/version.rc diff --git a/configure.ac b/configure.ac index e509b232d11..f9ac5e45ed4 100644 --- a/configure.ac +++ b/configure.ac @@ -2372,6 +2372,7 @@ WINE_CONFIG_MAKEFILE(dlls/capi2032) WINE_CONFIG_MAKEFILE(dlls/cards) WINE_CONFIG_MAKEFILE(dlls/cdosys) WINE_CONFIG_MAKEFILE(dlls/cfgmgr32) +WINE_CONFIG_MAKEFILE(dlls/chakra) WINE_CONFIG_MAKEFILE(dlls/clusapi) WINE_CONFIG_MAKEFILE(dlls/cng.sys) WINE_CONFIG_MAKEFILE(dlls/combase) diff --git a/dlls/chakra/Makefile.in b/dlls/chakra/Makefile.in new file mode 100644 index 00000000000..5b3429d844f --- /dev/null +++ b/dlls/chakra/Makefile.in @@ -0,0 +1,5 @@ +MODULE = chakra.dll + +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native + +RC_SRCS = version.rc diff --git a/dlls/chakra/chakra.spec b/dlls/chakra/chakra.spec new file mode 100644 index 00000000000..4116c40850c --- /dev/null +++ b/dlls/chakra/chakra.spec @@ -0,0 +1,160 @@ +@ stub JsProjectWinRTNamespace +@ stub JsSetProjectionEnqueueCallback +@ stub CreateChakraEngine +@ stub DumpDiagInfo +@ stub JsDiscardBackgroundParse +@ stub JsInitializeJITServer +@ stub JsQueueBackgroundParse +@ stub MemProtectHeapAddRootSection +@ stub MemProtectHeapCollect +@ stub MemProtectHeapCreate +@ stub MemProtectHeapDestroy +@ stub MemProtectHeapDisableCollection +@ stub MemProtectHeapIsValidObject +@ stub MemProtectHeapMemSize +@ stub MemProtectHeapNotifyCurrentThreadDetach +@ stub MemProtectHeapProtectCurrentThread +@ stub MemProtectHeapRemoveRootSection +@ stub MemProtectHeapReportHeapSize +@ stub MemProtectHeapRootAlloc +@ stub MemProtectHeapRootAllocLeaf +@ stub MemProtectHeapRootRealloc +@ stub MemProtectHeapRootReallocLeaf +@ stub MemProtectHeapSynchronizeWithCollector +@ stub MemProtectHeapUnprotectCurrentThread +@ stub MemProtectHeapUnrootAndZero +@ stub RecyclerNativeHeapAddExternalMemoryUsage +@ stub RecyclerNativeHeapAllocLeaf +@ stub RecyclerNativeHeapAllocLeafFinalized +@ stub RecyclerNativeHeapAllocTraced +@ stub RecyclerNativeHeapAllocTracedFinalized +@ stub RecyclerNativeHeapCollectGarbageInThread +@ stub RecyclerNativeHeapCreateWeakReference +@ stub RecyclerNativeHeapGetRealAddressFromInterior +@ stub RecyclerNativeHeapGetStrongReference +@ stub RecyclerNativeHeapHasWeakReferenceCleanupOccurred +@ stub RecyclerNativeHeapRootAddRef +@ stub RecyclerNativeHeapRootRelease +@ stdcall -private DllCanUnloadNow() +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stub JsAddRef +@ stub JsBoolToBoolean +@ stub JsBooleanToBool +@ stub JsCallFunction +@ stub JsCollectGarbage +@ stub JsConstructObject +@ stub JsConvertValueToBoolean +@ stub JsConvertValueToNumber +@ stub JsConvertValueToObject +@ stub JsConvertValueToString +@ stub JsCreateArray +@ stub JsCreateArrayBuffer +@ stub JsCreateContext +@ stub JsCreateDataView +@ stub JsCreateError +@ stub JsCreateExternalArrayBuffer +@ stub JsCreateExternalObject +@ stub JsCreateFunction +@ stub JsCreateNamedFunction +@ stub JsCreateObject +@ stub JsCreateRangeError +@ stub JsCreateReferenceError +@ stub JsCreateRuntime +@ stub JsCreateSymbol +@ stub JsCreateSyntaxError +@ stub JsCreateThreadService +@ stub JsCreateTypeError +@ stub JsCreateTypedArray +@ stub JsCreateURIError +@ stub JsDefineProperty +@ stub JsDeleteIndexedProperty +@ stub JsDeleteProperty +@ stub JsDisableRuntimeExecution +@ stub JsDisposeRuntime +@ stub JsDoubleToNumber +@ stub JsEnableRuntimeExecution +@ stub JsEnumerateHeap +@ stub JsEquals +@ stub JsGetAndClearException +@ stub JsGetArrayBufferStorage +@ stub JsGetContextData +@ stub JsGetContextOfObject +@ stub JsGetCurrentContext +@ stub JsGetDataViewStorage +@ stub JsGetExtensionAllowed +@ stub JsGetExternalData +@ stub JsGetFalseValue +@ stub JsGetGlobalObject +@ stub JsGetIndexedPropertiesExternalData +@ stub JsGetIndexedProperty +@ stub JsGetNullValue +@ stub JsGetOwnPropertyDescriptor +@ stub JsGetOwnPropertyNames +@ stub JsGetOwnPropertySymbols +@ stub JsGetProperty +@ stub JsGetPropertyIdFromName +@ stub JsGetPropertyIdFromSymbol +@ stub JsGetPropertyIdType +@ stub JsGetPropertyNameFromId +@ stub JsGetPrototype +@ stub JsGetRuntime +@ stub JsGetRuntimeMemoryLimit +@ stub JsGetRuntimeMemoryUsage +@ stub JsGetStringLength +@ stub JsGetSymbolFromPropertyId +@ stub JsGetTrueValue +@ stub JsGetTypedArrayInfo +@ stub JsGetTypedArrayStorage +@ stub JsGetUndefinedValue +@ stub JsGetValueType +@ stub JsHasException +@ stub JsHasExternalData +@ stub JsHasIndexedPropertiesExternalData +@ stub JsHasIndexedProperty +@ stub JsHasProperty +@ stub JsIdle +@ stub JsInspectableToObject +@ stub JsInstanceOf +@ stub JsIntToNumber +@ stub JsIsEnumeratingHeap +@ stub JsIsRuntimeExecutionDisabled +@ stub JsNumberToDouble +@ stub JsNumberToInt +@ stub JsObjectToInspectable +@ stub JsParseScript +@ stub JsParseScriptWithAttributes +@ stub JsParseSerializedScript +@ stub JsParseSerializedScriptWithCallback +@ stub JsPointerToString +@ stub JsPreventExtension +@ stub JsRelease +@ stub JsRunScript +@ stub JsRunSerializedScript +@ stub JsRunSerializedScriptWithCallback +@ stub JsSerializeScript +@ stub JsSetContextData +@ stub JsSetCurrentContext +@ stub JsSetException +@ stub JsSetExternalData +@ stub JsSetIndexedPropertiesToExternalData +@ stub JsSetIndexedProperty +@ stub JsSetObjectBeforeCollectCallback +@ stub JsSetPromiseContinuationCallback +@ stub JsSetProperty +@ stub JsSetPrototype +@ stub JsSetRuntimeBeforeCollectCallback +@ stub JsSetRuntimeMemoryAllocationCallback +@ stub JsSetRuntimeMemoryLimit +@ stub JsStartDebugging +@ stub JsStartProfiling +@ stub JsStopProfiling +@ stub JsStrictEquals +@ stub JsStringToPointer +@ stub JsValueToVariant +@ stub JsVarAddRef +@ stub JsVarRelease +@ stub JsVarToExtension +@ stub JsVarToScriptDirect +@ stub JsVariantToValue diff --git a/dlls/chakra/version.rc b/dlls/chakra/version.rc new file mode 100644 index 00000000000..a73bf2bc5ad --- /dev/null +++ b/dlls/chakra/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine chakra" +#define WINE_FILENAME_STR "chakra.dll" +#define WINE_FILEVERSION 11,0,22000,348 +#define WINE_FILEVERSION_STR "11.0.22000.348" +#define WINE_PRODUCTVERSION 11,00,22000,348 +#define WINE_PRODUCTVERSION_STR "11.00.22000.348" + +#include "wine/wine_common_ver.rc" -- 2.35.1

1 0

[PATCH 1/5] windows.media.speech: Add IVector<HSTRING>.
by Bernhard Kölbl 28 Mar '22

28 Mar '22

And use it in listconstraint. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/Makefile.in | 3 +- dlls/windows.media.speech/listconstraint.c | 11 +- dlls/windows.media.speech/private.h | 2 + dlls/windows.media.speech/vector.c | 299 +++++++++++++++++++++ 4 files changed, 312 insertions(+), 3 deletions(-) create mode 100644 dlls/windows.media.speech/vector.c diff --git a/dlls/windows.media.speech/Makefile.in b/dlls/windows.media.speech/Makefile.in index 5dbdb03cf2f..5a8291ba6f0 100644 --- a/dlls/windows.media.speech/Makefile.in +++ b/dlls/windows.media.speech/Makefile.in @@ -6,6 +6,7 @@ C_SRCS = \ listconstraint.c \ main.c \ recognizer.c \ - synthesizer.c + synthesizer.c \ + vector.c IDL_SRCS = classes.idl diff --git a/dlls/windows.media.speech/listconstraint.c b/dlls/windows.media.speech/listconstraint.c index d641902f4bc..0c486a415a7 100644 --- a/dlls/windows.media.speech/listconstraint.c +++ b/dlls/windows.media.speech/listconstraint.c @@ -36,6 +36,7 @@ struct list_constraint LONG ref; BOOLEAN enabled; + IVector_HSTRING *commands; }; /* @@ -91,7 +92,10 @@ static ULONG WINAPI list_constraint_Release( ISpeechRecognitionListConstraint *i TRACE("iface %p, ref %lu.\n", iface, ref); if (!ref) + { + IVector_HSTRING_Release(impl->commands); free(impl); + } return ref; } @@ -337,12 +341,15 @@ static HRESULT WINAPI constraint_factory_CreateWithTag( ISpeechRecognitionListCo TRACE("iface %p, commands %p, tag %p, listconstraint %p.\n", iface, commands, tag, listconstraint); + *listconstraint = NULL; + if (!commands) return E_POINTER; - if (!(impl = calloc(1, sizeof(*impl)))) + if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; + if (FAILED(vector_hstring_create(&impl->commands))) { - *listconstraint = NULL; + free(impl); return E_OUTOFMEMORY; } diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h index 3e2fa9aed38..a09b5f5ef7e 100644 --- a/dlls/windows.media.speech/private.h +++ b/dlls/windows.media.speech/private.h @@ -66,6 +66,8 @@ HRESULT typed_event_handlers_remove( struct list *list, EventRegistrationToken * HRESULT typed_event_handlers_notify( struct list *list, IInspectable *sender, IInspectable *args ); HRESULT typed_event_handlers_clear( struct list* list ); +HRESULT vector_hstring_create( IVector_HSTRING **out ); + #define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ static inline impl_type *impl_from( iface_type *iface ) \ { \ diff --git a/dlls/windows.media.speech/vector.c b/dlls/windows.media.speech/vector.c new file mode 100644 index 00000000000..e151ec31b49 --- /dev/null +++ b/dlls/windows.media.speech/vector.c @@ -0,0 +1,299 @@ +/* WinRT Windows.Media.Speech implementation + * + * Copyright 2022 Bernhard Kölbl for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(speech); + +/* + * + * IVector<HSTRING> + * + */ + +struct vector_hstring +{ + IVector_HSTRING IVector_HSTRING_iface; + LONG ref; + + UINT32 size; + UINT32 capacity; + HSTRING *elements; +}; + +static inline struct vector_hstring *impl_from_IVector_HSTRING( IVector_HSTRING *iface ) +{ + return CONTAINING_RECORD(iface, struct vector_hstring, IVector_HSTRING_iface); +} + +static HRESULT WINAPI vector_hstring_QueryInterface( IVector_HSTRING *iface, REFIID iid, void **out ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, &IID_IVector_HSTRING)) + { + IInspectable_AddRef((*out = &impl->IVector_HSTRING_iface)); + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI vector_hstring_AddRef( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %lu.\n", iface, ref); + return ref; +} + +static ULONG WINAPI vector_hstring_Release( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + + TRACE("iface %p, ref %lu.\n", iface, ref); + + if (!ref) + { + IVector_HSTRING_Clear(iface); + free(impl); + } + + return ref; +} + +static HRESULT WINAPI vector_hstring_GetIids( IVector_HSTRING *iface, ULONG *iid_count, IID **iids ) +{ + FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_GetRuntimeClassName( IVector_HSTRING *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_GetTrustLevel( IVector_HSTRING *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_GetAt( IVector_HSTRING *iface, UINT32 index, HSTRING *value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + *value = NULL; + if (index >= impl->size) return E_BOUNDS; + + return WindowsDuplicateString(impl->elements[index], value); +} + +static HRESULT WINAPI vector_hstring_get_Size( IVector_HSTRING *iface, UINT32 *value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + TRACE( "iface %p, value %p.\n", iface, value ); + *value = impl->size; + return S_OK; +} + +static HRESULT WINAPI vector_hstring_GetView( IVector_HSTRING *iface, IVectorView_HSTRING **value ) +{ + FIXME("iface %p, value %p stub!\n", iface, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_IndexOf( IVector_HSTRING *iface, HSTRING element, UINT32 *index, BOOLEAN *found ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + ULONG i; + + TRACE("iface %p, element %p, index %p, found %p.\n", iface, element, index, found); + + for (i = 0; i < impl->size; ++i) if (impl->elements[i] == element) break; + if ((*found = (i < impl->size))) *index = i; + else *index = 0; + + return S_OK; +} + +static HRESULT WINAPI vector_hstring_SetAt( IVector_HSTRING *iface, UINT32 index, HSTRING value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + if (index >= impl->size) return E_BOUNDS; + WindowsDeleteString(impl->elements[index]); + WindowsDuplicateString(value, &impl->elements[index]); + return S_OK; +} + +static HRESULT WINAPI vector_hstring_InsertAt( IVector_HSTRING *iface, UINT32 index, HSTRING value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + HSTRING *tmp = impl->elements; + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + if (impl->size == impl->capacity) + { + impl->capacity = max(32, impl->capacity * 3 / 2); + if (!(impl->elements = realloc(impl->elements, impl->capacity * sizeof(*impl->elements)))) + { + impl->elements = tmp; + return E_OUTOFMEMORY; + } + } + + memmove(impl->elements + index + 1, impl->elements + index, (impl->size++ - index) * sizeof(*impl->elements)); + WindowsDuplicateString(value, &impl->elements[index]); + return S_OK; +} + +static HRESULT WINAPI vector_hstring_RemoveAt( IVector_HSTRING *iface, UINT32 index ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p, index %u.\n", iface, index); + + if (index >= impl->size) return E_BOUNDS; + + WindowsDeleteString(impl->elements[index]); + memmove(impl->elements + index, impl->elements + index + 1, (--impl->size - index) * sizeof(*impl->elements)); + return S_OK; +} + +static HRESULT WINAPI vector_hstring_Append( IVector_HSTRING *iface, HSTRING value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p, value %p.\n", iface, value); + + return IVector_HSTRING_InsertAt(iface, impl->size, value); +} + +static HRESULT WINAPI vector_hstring_RemoveAtEnd( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p.\n", iface); + + if (impl->size) WindowsDeleteString(impl->elements[--impl->size]); + return S_OK; +} + +static HRESULT WINAPI vector_hstring_Clear( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p.\n", iface); + + while (impl->size) IVector_HSTRING_RemoveAtEnd(iface); + free(impl->elements); + impl->capacity = 0; + impl->elements = NULL; + + return S_OK; +} + +static HRESULT WINAPI vector_hstring_GetMany( IVector_HSTRING *iface, UINT32 start_index, + UINT32 items_size, HSTRING *items, UINT *count ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + UINT32 i; + + TRACE("iface %p, start_index %u, items_size %u, items %p, count %p.\n", iface, start_index, items_size, items, count); + + if (start_index >= impl->size) return E_BOUNDS; + + for (i = start_index; i < impl->size; ++i) + { + if (i - start_index >= items_size) break; + WindowsDuplicateString(impl->elements[i], &items[i-start_index]); + } + *count = i - start_index; + + return S_OK; +} + +static HRESULT WINAPI vector_hstring_ReplaceAll( IVector_HSTRING *iface, UINT32 count, HSTRING *items ) +{ + HRESULT hr; + ULONG i; + + TRACE("iface %p, count %u, items %p.\n", iface, count, items); + + hr = IVector_HSTRING_Clear(iface); + for (i = 0; i < count && SUCCEEDED(hr); ++i) hr = IVector_HSTRING_Append(iface, items[i]); + return hr; +} + +static const struct IVector_HSTRINGVtbl vector_hstring_vtbl = +{ + /* IUnknown methods */ + vector_hstring_QueryInterface, + vector_hstring_AddRef, + vector_hstring_Release, + /* IInspectable methods */ + vector_hstring_GetIids, + vector_hstring_GetRuntimeClassName, + vector_hstring_GetTrustLevel, + /* IVector<HSTRING> methods */ + vector_hstring_GetAt, + vector_hstring_get_Size, + vector_hstring_GetView, + vector_hstring_IndexOf, + vector_hstring_SetAt, + vector_hstring_InsertAt, + vector_hstring_RemoveAt, + vector_hstring_Append, + vector_hstring_RemoveAtEnd, + vector_hstring_Clear, + vector_hstring_GetMany, + vector_hstring_ReplaceAll, +}; + +HRESULT vector_hstring_create( IVector_HSTRING **out ) +{ + struct vector_hstring *impl; + + TRACE("out %p.\n", out); + + if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; + impl->IVector_HSTRING_iface.lpVtbl = &vector_hstring_vtbl; + impl->ref = 1; + + *out = &impl->IVector_HSTRING_iface; + TRACE("created %p\n", *out); + return S_OK; +} -- 2.35.1

2 10

[PATCH v2 1/2] propsys: Implement VariantToStringWithDefault.
by Mohamad Al-Jaf 28 Mar '22

28 Mar '22

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: - Support byref BSTR. - Support nested VARIANT including byref BSTR. --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 46 +++++++++++++++++++++++++++++++++++++++ include/propvarutil.h | 6 +++++ 3 files changed, 53 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 15749952e95..7391cf4aaa2 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -194,7 +194,7 @@ @ stub VariantToStringAlloc @ stub VariantToStringArray @ stub VariantToStringArrayAlloc -@ stub VariantToStringWithDefault +@ stdcall VariantToStringWithDefault(ptr wstr) @ stub VariantToUInt16 @ stub VariantToUInt16Array @ stub VariantToUInt16ArrayAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 8f6c52f7aa7..09f9a8aa892 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -416,6 +416,52 @@ PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR p return pszDefault; } +/****************************************************************** + * VariantToStringWithDefault (PROPSYS.@) + */ +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault) +{ + TRACE("(%p, %s)\n", pvar, debugstr_w(pszDefault)); + + switch(V_VT(pvar)) + { + case VT_BSTR: + { + if (V_BSTR(pvar) == NULL) + return L""; + + return V_BSTR(pvar); + } + case VT_BYREF | VT_BSTR: + { + if (*V_BSTRREF(pvar) == NULL) + return L""; + + return *V_BSTRREF(pvar); + } + case VT_BYREF | VT_VARIANT: + { + if (V_VT(V_VARIANTREF(pvar)) == VT_BSTR) + { + if (V_BSTR(V_VARIANTREF(pvar)) == NULL) + return L""; + + return V_BSTR(V_VARIANTREF(pvar)); + } + + if (V_VT(V_VARIANTREF(pvar)) == (VT_BYREF | VT_BSTR)) + { + if (*V_BSTRREF(V_VARIANTREF(pvar)) == NULL) + return L""; + + return *V_BSTRREF(V_VARIANTREF(pvar)); + } + } + } + + return pszDefault; +} + /****************************************************************** * PropVariantChangeType (PROPSYS.@) diff --git a/include/propvarutil.h b/include/propvarutil.h index 36a670f56e6..2515d71b3b6 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -93,6 +93,7 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); HRESULT WINAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb); HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret); @@ -201,6 +202,11 @@ inline BOOL IsPropVariantString(REFPROPVARIANT propvar) return (PropVariantToStringWithDefault(propvar, NULL) != NULL); } +inline BOOL IsVariantString(const VARIANT *pvar) +{ + return (VariantToStringWithDefault(pvar, NULL) != NULL); +} + #endif /* NO_PROPVAR_INLINES */ #endif /* __cplusplus */ -- 2.35.1

2 8

[PATCH v3 1/2] propsys: Implement VariantToStringWithDefault.
by Mohamad Al-Jaf 28 Mar '22

28 Mar '22

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: - Support byref BSTR. - Support nested VARIANT including byref BSTR. v3: - Consolidate code. --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 22 ++++++++++++++++++++++ include/propvarutil.h | 6 ++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 15749952e95..7391cf4aaa2 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -194,7 +194,7 @@ @ stub VariantToStringAlloc @ stub VariantToStringArray @ stub VariantToStringArrayAlloc -@ stub VariantToStringWithDefault +@ stdcall VariantToStringWithDefault(ptr wstr) @ stub VariantToUInt16 @ stub VariantToUInt16Array @ stub VariantToUInt16ArrayAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 8f6c52f7aa7..a1dfba78cce 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -416,6 +416,28 @@ PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR p return pszDefault; } +/****************************************************************** + * VariantToStringWithDefault (PROPSYS.@) + */ +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault) +{ + VARIANT var = *pvar; + + TRACE("(%p, %s)\n", pvar, debugstr_w(pszDefault)); + + if (V_VT(&var) == (VT_BYREF | VT_VARIANT)) var = *V_VARIANTREF(pvar); + if (V_VT(&var) == (VT_BYREF | VT_BSTR) || V_VT(&var) == VT_BSTR) + { + PCWSTR str; + str = V_ISBYREF(&var) ? *V_BSTRREF(&var) : V_BSTR(&var); + + if (!str) return L""; + return str; + } + + return pszDefault; +} + /****************************************************************** * PropVariantChangeType (PROPSYS.@) diff --git a/include/propvarutil.h b/include/propvarutil.h index 36a670f56e6..2515d71b3b6 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -93,6 +93,7 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); HRESULT WINAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb); HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret); @@ -201,6 +202,11 @@ inline BOOL IsPropVariantString(REFPROPVARIANT propvar) return (PropVariantToStringWithDefault(propvar, NULL) != NULL); } +inline BOOL IsVariantString(const VARIANT *pvar) +{ + return (VariantToStringWithDefault(pvar, NULL) != NULL); +} + #endif /* NO_PROPVAR_INLINES */ #endif /* __cplusplus */ -- 2.35.1

1 1

[PATCH] maintainers: Update the path to strmbase.
by Zebediah Figura 28 Mar '22

28 Mar '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 9ceae9e80bf..14fe2e0cb9b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -109,8 +109,8 @@ F: dlls/qcap/ F: dlls/qdvd/ F: dlls/qedit/ F: dlls/quartz/ -F: dlls/strmbase/ F: dlls/winegstreamer/quartz_parser.c +F: libs/strmbase/ DirectWrite M: Nikolay Sivov <nsivov(a)codeweavers.com> -- 2.35.1

1 0

[PATCH 1/5] d3dcompiler: Initialize initial_filename in D3DCompile2().
by Matteo Bruni 28 Mar '22

28 Mar '22

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dcompiler_43/compiler.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 4d2642f17e3..ba7789f45a8 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -891,6 +891,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen preprocess_info.pfn_open_include = open_include; preprocess_info.pfn_close_include = close_include; preprocess_info.include_context = include; + initial_filename = filename ? filename : ""; hlsl_info.type = VKD3D_SHADER_STRUCTURE_TYPE_HLSL_SOURCE_INFO; hlsl_info.next = NULL; -- 2.34.1

4 13

[PATCH 1/6] strmbase: Add a separate id for pins.
by Rémi Bernon 28 Mar '22

28 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/wine/strmbase.h | 1 + libs/strmbase/filter.c | 2 +- libs/strmbase/pin.c | 6 ++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 3e92136b7f7..1b4cc3f7657 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -36,6 +36,7 @@ struct strmbase_pin struct strmbase_filter *filter; PIN_DIRECTION dir; WCHAR name[128]; + WCHAR id[128]; IPin *peer; AM_MEDIA_TYPE mt; diff --git a/libs/strmbase/filter.c b/libs/strmbase/filter.c index 92b4f1cb4b6..ee41611a198 100644 --- a/libs/strmbase/filter.c +++ b/libs/strmbase/filter.c @@ -436,7 +436,7 @@ static HRESULT WINAPI filter_FindPin(IBaseFilter *iface, const WCHAR *id, IPin * for (i = 0; (pin = filter->ops->filter_get_pin(filter, i)); ++i) { - if (!lstrcmpW(id, pin->name)) + if (!lstrcmpW(id, pin->id)) { IPin_AddRef(*ret = &pin->IPin_iface); return S_OK; diff --git a/libs/strmbase/pin.c b/libs/strmbase/pin.c index 1aecb7a8c98..03330837477 100644 --- a/libs/strmbase/pin.c +++ b/libs/strmbase/pin.c @@ -383,10 +383,10 @@ static HRESULT WINAPI pin_QueryId(IPin *iface, WCHAR **id) TRACE("pin %p %s:%s, id %p.\n", pin, debugstr_w(pin->filter->name), debugstr_w(pin->name), id); - if (!(*id = CoTaskMemAlloc((lstrlenW(pin->name) + 1) * sizeof(WCHAR)))) + if (!(*id = CoTaskMemAlloc((lstrlenW(pin->id) + 1) * sizeof(WCHAR)))) return E_OUTOFMEMORY; - lstrcpyW(*id, pin->name); + lstrcpyW(*id, pin->id); return S_OK; } @@ -770,6 +770,7 @@ void strmbase_source_init(struct strmbase_source *pin, struct strmbase_filter *f pin->pin.filter = filter; pin->pin.dir = PINDIR_OUTPUT; lstrcpyW(pin->pin.name, name); + lstrcpyW(pin->pin.id, name); pin->pin.ops = &func_table->base; pin->pFuncsTable = func_table; } @@ -1172,6 +1173,7 @@ void strmbase_sink_init(struct strmbase_sink *pin, struct strmbase_filter *filte pin->pin.filter = filter; pin->pin.dir = PINDIR_INPUT; lstrcpyW(pin->pin.name, name); + lstrcpyW(pin->pin.id, name); pin->pin.ops = &func_table->base; pin->pFuncsTable = func_table; pin->pAllocator = pin->preferred_allocator = allocator; -- 2.35.1

3 12

[PATCH v3 resend 1/4] winegstreamer: Implement H264 decoder GetInputStreamInfo.
by Rémi Bernon 28 Mar '22

28 Mar '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Resending with the sign-offs but without PATCH 5 which will require some changes. Supersedes: 230378-230382 dlls/mf/tests/mf.c | 6 ------ dlls/winegstreamer/h264_decoder.c | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index e58d8278b82..6563ca81b29 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6790,17 +6790,11 @@ static void test_h264_decoder(void) flags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE; memset(&input_info, 0xcd, sizeof(input_info)); hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); - todo_wine ok(hr == S_OK, "GetInputStreamInfo returned %#lx\n", hr); - todo_wine ok(input_info.hnsMaxLatency == 0, "got hnsMaxLatency %s\n", wine_dbgstr_longlong(input_info.hnsMaxLatency)); - todo_wine ok(input_info.dwFlags == flags, "got dwFlags %#lx\n", input_info.dwFlags); - todo_wine ok(input_info.cbSize == 0x1000, "got cbSize %lu\n", input_info.cbSize); - todo_wine ok(input_info.cbMaxLookahead == 0, "got cbMaxLookahead %#lx\n", input_info.cbMaxLookahead); - todo_wine ok(input_info.cbAlignment == 0, "got cbAlignment %#lx\n", input_info.cbAlignment); flags = MFT_OUTPUT_STREAM_WHOLE_SAMPLES | MFT_OUTPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE; diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 2f4b42ed101..f24b07ef496 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -217,8 +217,20 @@ static HRESULT WINAPI transform_GetStreamIDs(IMFTransform *iface, DWORD input_si static HRESULT WINAPI transform_GetInputStreamInfo(IMFTransform *iface, DWORD id, MFT_INPUT_STREAM_INFO *info) { - FIXME("iface %p, id %#lx, info %p stub!\n", iface, id, info); - return E_NOTIMPL; + struct h264_decoder *decoder = impl_from_IMFTransform(iface); + + TRACE("iface %p, id %#lx, info %p.\n", iface, id, info); + + if (!decoder->input_type) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + info->hnsMaxLatency = 0; + info->dwFlags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE; + info->cbSize = 0x1000; + info->cbMaxLookahead = 0; + info->cbAlignment = 0; + + return S_OK; } static HRESULT WINAPI transform_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info) -- 2.35.1

1 3

[tools 1/2] testbot/cgi: Add support for nameless actions.
by Francois Gouget 28 Mar '22

28 Mar '22

Action names starting with a dot will not be sent to the form page. This can be useful to get a clean 'get' URL. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 2565c077b..83b078b24 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -555,6 +555,11 @@ Returns a list of actions that can be applied after completing or reading this form. Each action is a string which is used as the label of a button at the bottom of the form. +If an action name starts with a dot, the button label omits the dot and the +corresponding <input> field gets no name attribute. Note that this means the +action name is not sent to the form so it probably does not make sense to have +more than one such action per form. + By default there is no action. =back @@ -573,7 +578,9 @@ sub GenerateActions($) print "<div class='ItemActions'>\n"; foreach my $Action (@{$self->GetActions()}) { - print "<input type='submit' name='Action' value='$Action'/>\n"; + print "<input type='submit' "; + print "name='Action' " if ($Action !~ s/^\.//); + print "value='$Action'/>\n"; } print "</div>\n"; } -- 2.30.2

1 1

[tools 1/2] testbot/web: Use the property descriptors in the Activity page.
by Francois Gouget 28 Mar '22

28 Mar '22

The whole point is to pass them to _initialize() so FormPage::Validate() can then do its job. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Activity.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 272215f95..d98f50a6c 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -45,7 +45,7 @@ sub _initialize($$$) my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Hours", "Hours", !1, 1, "N", 3), ); - $self->SUPER::_initialize($Request, $RequiredRole); + $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); $self->{Method} = "get"; if (!$self->GetParam("Hours") or !$self->Validate() or -- 2.30.2

1 1

[tools] testbot/cgi: Remove the PageBase::SetCurrentSession() $Page parameter.
by Francois Gouget 28 Mar '22

28 Mar '22

It is unused and there is no indication it may be needed one day. With that change none of the 'session management' methods take a $Page parameter. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/Page.pm | 2 +- testbot/lib/WineTestBot/CGI/PageBase.pm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 014324f60..d5874129a 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -241,7 +241,7 @@ sub SetCurrentSession($$) { my ($self, $Session) = @_; - $self->{PageBase}->SetCurrentSession($self, $Session); + $self->{PageBase}->SetCurrentSession($Session); } sub Redirect($$) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index aa90245cf..6eba0e0eb 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -224,9 +224,9 @@ sub GetCurrentSession($) return $self->{Session}; } -sub SetCurrentSession($$$) +sub SetCurrentSession($$) { - my ($self, $Page, $Session) = @_; + my ($self, $Session) = @_; $self->{Session} = $Session; if (! defined($Session)) -- 2.30.2

1 0

[tools] testbot/cgi: PageBase::*Cookies() do not take a $Page parameter.
by Francois Gouget 28 Mar '22

28 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/Page.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 85e94b379..014324f60 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -220,14 +220,14 @@ sub UnsetCookies($) { my ($self) = @_; - $self->{PageBase}->UnsetCookies($self); + $self->{PageBase}->UnsetCookies(); } sub SetCookies($) { my ($self) = @_; - $self->{PageBase}->SetCookies($self); + $self->{PageBase}->SetCookies(); } sub GetCurrentSession($) -- 2.30.2

1 0

[tools] testbot/cgi: Remove the Page parameter from PageBase's Redirect().
by Francois Gouget 28 Mar '22

28 Mar '22

PageBase::Redirect() does not use the Page parameter and there is no reason for it to need that parameter since it has $self->{Request} and thus can already get any relevant HTTP request information. CheckSecurePage() only has a $Page parameter in order to pass it to Redirect() and the CheckSecurePage() callers never provide the $Page parameter anyway. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/Page.pm | 2 +- testbot/lib/WineTestBot/CGI/PageBase.pm | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index d5988803c..85e94b379 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -248,7 +248,7 @@ sub Redirect($$) { my ($self, $Location) = @_; - return $self->{PageBase}->Redirect($self, $Location); + return $self->{PageBase}->Redirect($Location); } diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 6d94ae967..aa90245cf 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -92,7 +92,7 @@ sub new($$$$@) ! $Session->User->HasRole($RequiredRole)) { my $LoginURL = "/Login.pl?Target=" . uri_escape($ENV{"REQUEST_URI"}); - exit($self->Redirect($Page, MakeSecureURL($LoginURL))); + exit($self->Redirect(MakeSecureURL($LoginURL))); } } @@ -253,9 +253,9 @@ sub SessionActive($) return !1; } -sub Redirect($$$) +sub Redirect($$) { - my ($self, $Page, $Location) = @_; + my ($self, $Location) = @_; $self->SetCookies(); if (substr($Location, 0, 4) ne "http") @@ -278,13 +278,13 @@ sub Redirect($$$) return 0; # a suitable exit code } -sub CheckSecurePage($$) +sub CheckSecurePage($) { - my ($self, $Page) = @_; + my ($self) = @_; if ($UseSSL && ! SecureConnection()) { - exit($self->Redirect($Page, MakeSecureURL($ENV{"REQUEST_URI"}))); + exit($self->Redirect(MakeSecureURL($ENV{"REQUEST_URI"}))); } } -- 2.30.2

1 0

[PATCH] wined3d: Return the correct length from config_list_get_value().
by Henri Verbeet 28 Mar '22

28 Mar '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/wined3d_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 524dc7508f9..4f50e8aeb7d 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -171,7 +171,7 @@ static const char *config_list_get_value(const char *string, const char *key, si if (is_option_separator(prev_char) && *p == '=') { if ((end = strpbrk(p + 1, ",;"))) - *len = end - p + 1; + *len = end - (p + 1); else *len = strlen(p + 1); return p + 1; -- 2.30.2

1 0

[PATCH] mf/session: Trace seek position in Start().
by Nikolay Sivov 28 Mar '22

28 Mar '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/mf_private.h | 34 ++++++++++++++++++++++++++++++++++ dlls/mf/session.c | 2 +- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h index db6f101cd6d..6f28c93aea3 100644 --- a/dlls/mf/mf_private.h +++ b/dlls/mf/mf_private.h @@ -79,6 +79,40 @@ static inline const char *debugstr_time(LONGLONG time) return wine_dbg_sprintf("%s", rev); } +static inline const char *debugstr_propvar(const PROPVARIANT *v) +{ + if (!v) + return "(null)"; + + switch (v->vt) + { + case VT_EMPTY: + return wine_dbg_sprintf("%p {VT_EMPTY}", v); + case VT_NULL: + return wine_dbg_sprintf("%p {VT_NULL}", v); + case VT_UI4: + return wine_dbg_sprintf("%p {VT_UI4: %ld}", v, v->ulVal); + case VT_UI8: + return wine_dbg_sprintf("%p {VT_UI8: %s}", v, wine_dbgstr_longlong(v->uhVal.QuadPart)); + case VT_I8: + return wine_dbg_sprintf("%p {VT_I8: %s}", v, wine_dbgstr_longlong(v->hVal.QuadPart)); + case VT_R4: + return wine_dbg_sprintf("%p {VT_R4: %.8e}", v, v->fltVal); + case VT_R8: + return wine_dbg_sprintf("%p {VT_R8: %lf}", v, v->dblVal); + case VT_CLSID: + return wine_dbg_sprintf("%p {VT_CLSID: %s}", v, wine_dbgstr_guid(v->puuid)); + case VT_LPWSTR: + return wine_dbg_sprintf("%p {VT_LPWSTR: %s}", v, wine_dbgstr_w(v->pwszVal)); + case VT_VECTOR | VT_UI1: + return wine_dbg_sprintf("%p {VT_VECTOR|VT_UI1: %p}", v, v->caub.pElems); + case VT_UNKNOWN: + return wine_dbg_sprintf("%p {VT_UNKNOWN: %p}", v, v->punkVal); + default: + return wine_dbg_sprintf("%p {vt %#x}", v, v->vt); + } +} + extern BOOL mf_is_sample_copier_transform(IMFTransform *transform) DECLSPEC_HIDDEN; extern BOOL mf_is_sar_sink(IMFMediaSink *sink) DECLSPEC_HIDDEN; extern HRESULT topology_node_get_object(IMFTopologyNode *node, REFIID riid, void **obj) DECLSPEC_HIDDEN; diff --git a/dlls/mf/session.c b/dlls/mf/session.c index e4a54b1c6de..1ef84f5d272 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2011,7 +2011,7 @@ static HRESULT WINAPI mfsession_Start(IMFMediaSession *iface, const GUID *format struct session_op *op; HRESULT hr; - TRACE("%p, %s, %p.\n", iface, debugstr_guid(format), start_position); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(format), debugstr_propvar(start_position)); if (!start_position) return E_POINTER; -- 2.35.1

1 0

[PATCH] dbgeng: Use CRT allocation functions.
by Nikolay Sivov 28 Mar '22

28 Mar '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dbgeng/dbgeng.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index 880b6f03b43..1439cedfeb3 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -31,7 +31,6 @@ #include "dbgeng.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(dbgeng); @@ -149,12 +148,12 @@ static HRESULT debug_target_init_modules_info(struct target_process *target) count = needed / sizeof(HMODULE); - if (!(modules = heap_alloc(count * sizeof(*modules)))) + if (!(modules = calloc(count, sizeof(*modules)))) return E_OUTOFMEMORY; - if (!(target->modules.info = heap_alloc_zero(count * sizeof(*target->modules.info)))) + if (!(target->modules.info = calloc(count, sizeof(*target->modules.info)))) { - heap_free(modules); + free(modules); return E_OUTOFMEMORY; } @@ -179,7 +178,7 @@ static HRESULT debug_target_init_modules_info(struct target_process *target) target->cpu_type = debug_target_get_module_machine(target, modules[0]); - heap_free(modules); + free(modules); target->modules.loaded = count; target->modules.unloaded = 0; /* FIXME */ @@ -331,8 +330,8 @@ static ULONG STDMETHODCALLTYPE debugclient_AddRef(IDebugClient7 *iface) static void debug_target_free(struct target_process *target) { - heap_free(target->modules.info); - heap_free(target); + free(target->modules.info); + free(target); } static ULONG STDMETHODCALLTYPE debugclient_Release(IDebugClient7 *iface) @@ -353,7 +352,7 @@ static ULONG STDMETHODCALLTYPE debugclient_Release(IDebugClient7 *iface) } if (debug_client->event_callbacks) debug_client->event_callbacks->lpVtbl->Release(debug_client->event_callbacks); - heap_free(debug_client); + free(debug_client); } return refcount; @@ -443,7 +442,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_AttachProcess(IDebugClient7 *iface, return E_NOTIMPL; } - if (!(process = heap_alloc_zero(sizeof(*process)))) + if (!(process = calloc(1, sizeof(*process)))) return E_OUTOFMEMORY; process->pid = pid; @@ -1900,7 +1899,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleVersionInformation(IDebug if (!(size = GetFileVersionInfoSizeA(info->image_name, &handle))) return E_FAIL; - if (!(version_info = heap_alloc(size))) + if (!(version_info = malloc(size))) return E_OUTOFMEMORY; if (GetFileVersionInfoA(info->image_name, handle, size, version_info)) @@ -1921,7 +1920,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleVersionInformation(IDebug } } - heap_free(version_info); + free(version_info); return hr; } @@ -4033,8 +4032,7 @@ HRESULT WINAPI DebugCreate(REFIID riid, void **obj) TRACE("%s, %p.\n", debugstr_guid(riid), obj); - debug_client = heap_alloc_zero(sizeof(*debug_client)); - if (!debug_client) + if (!(debug_client = calloc(1, sizeof(*debug_client)))) return E_OUTOFMEMORY; debug_client->IDebugClient_iface.lpVtbl = &debugclientvtbl; -- 2.35.1

1 0

[PATCH 1/2] browseui: Use CRT memory allocation functions.
by Nikolay Sivov 28 Mar '22

28 Mar '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/browseui/aclmulti.c | 30 ++++++++++------------- dlls/browseui/aclsource.c | 13 ++-------- dlls/browseui/browseui_main.c | 5 ++-- dlls/browseui/compcatcachedaemon.c | 7 ++---- dlls/browseui/progressdlg.c | 38 ++++++++++-------------------- 5 files changed, 31 insertions(+), 62 deletions(-) diff --git a/dlls/browseui/aclmulti.c b/dlls/browseui/aclmulti.c index a41cb810369..47547cdd1e1 100644 --- a/dlls/browseui/aclmulti.c +++ b/dlls/browseui/aclmulti.c @@ -34,8 +34,6 @@ #include "shlguid.h" #include "shlobj.h" -#include "wine/heap.h" - #include "browseui.h" WINE_DEFAULT_DEBUG_CHANNEL(browseui); @@ -80,17 +78,6 @@ static void release_obj(struct ACLMultiSublist *obj) IACList_Release(obj->pACL); } -static void ACLMulti_Destructor(ACLMulti *This) -{ - int i; - TRACE("destroying %p\n", This); - for (i = 0; i < This->nObjs; i++) - release_obj(&This->objs[i]); - heap_free(This->objs); - heap_free(This); - BROWSEUI_refCount--; -} - static HRESULT WINAPI ACLMulti_QueryInterface(IEnumString *iface, REFIID iid, LPVOID *ppvOut) { ACLMulti *This = impl_from_IEnumString(iface); @@ -129,10 +116,18 @@ static ULONG WINAPI ACLMulti_Release(IEnumString *iface) { ACLMulti *This = impl_from_IEnumString(iface); ULONG ret; + int i; ret = InterlockedDecrement(&This->refCount); if (ret == 0) - ACLMulti_Destructor(This); + { + for (i = 0; i < This->nObjs; i++) + release_obj(&This->objs[i]); + free(This->objs); + free(This); + BROWSEUI_refCount--; + } + return ret; } @@ -224,7 +219,7 @@ static HRESULT WINAPI ACLMulti_Append(IObjMgr *iface, IUnknown *obj) if (obj == NULL) return E_FAIL; - This->objs = heap_realloc(This->objs, sizeof(This->objs[0]) * (This->nObjs+1)); + This->objs = realloc(This->objs, sizeof(This->objs[0]) * (This->nObjs+1)); This->objs[This->nObjs].punk = obj; IUnknown_AddRef(obj); if (FAILED(IUnknown_QueryInterface(obj, &IID_IEnumString, (LPVOID *)&This->objs[This->nObjs].pEnum))) @@ -247,7 +242,7 @@ static HRESULT WINAPI ACLMulti_Remove(IObjMgr *iface, IUnknown *obj) release_obj(&This->objs[i]); memmove(&This->objs[i], &This->objs[i+1], (This->nObjs-i-1)*sizeof(struct ACLMultiSublist)); This->nObjs--; - This->objs = heap_realloc(This->objs, sizeof(This->objs[0]) * This->nObjs); + This->objs = realloc(This->objs, sizeof(This->objs[0]) * This->nObjs); return S_OK; } @@ -313,8 +308,7 @@ HRESULT ACLMulti_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) if (pUnkOuter) return CLASS_E_NOAGGREGATION; - This = heap_alloc_zero(sizeof(ACLMulti)); - if (This == NULL) + if (!(This = calloc(1, sizeof(ACLMulti)))) return E_OUTOFMEMORY; This->IEnumString_iface.lpVtbl = &ACLMultiVtbl; diff --git a/dlls/browseui/aclsource.c b/dlls/browseui/aclsource.c index 4412ca38003..72bf323c62e 100644 --- a/dlls/browseui/aclsource.c +++ b/dlls/browseui/aclsource.c @@ -34,8 +34,6 @@ #include "shlguid.h" #include "shlobj.h" -#include "wine/heap.h" - #include "browseui.h" WINE_DEFAULT_DEBUG_CHANNEL(browseui); @@ -57,12 +55,6 @@ static inline ACLShellSource *impl_from_IEnumString(IEnumString *iface) return CONTAINING_RECORD(iface, ACLShellSource, IEnumString_iface); } -static void ACLShellSource_Destructor(ACLShellSource *This) -{ - TRACE("destroying %p\n", This); - heap_free(This); -} - static HRESULT WINAPI ACLShellSource_QueryInterface(IEnumString *iface, REFIID iid, LPVOID *ppvOut) { ACLShellSource *This = impl_from_IEnumString(iface); @@ -106,7 +98,7 @@ static ULONG WINAPI ACLShellSource_Release(IEnumString *iface) TRACE("(%p)->(%lu)\n", This, ref); if (ref == 0) - ACLShellSource_Destructor(This); + free(This); return ref; } @@ -205,8 +197,7 @@ HRESULT ACLShellSource_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) if (pUnkOuter) return CLASS_E_NOAGGREGATION; - This = heap_alloc_zero(sizeof(ACLShellSource)); - if (This == NULL) + if (!(This = calloc(1, sizeof(*This)))) return E_OUTOFMEMORY; This->IEnumString_iface.lpVtbl = &ACLShellSourceVtbl; diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c index b6962b30f26..6d089725d3c 100644 --- a/dlls/browseui/browseui_main.c +++ b/dlls/browseui/browseui_main.c @@ -32,7 +32,6 @@ #include "shlguid.h" #include "rpcproxy.h" -#include "wine/heap.h" #include "browseui.h" #include "initguid.h" @@ -72,7 +71,7 @@ static inline ClassFactory *impl_from_IClassFactory(IClassFactory *iface) static void ClassFactory_Destructor(ClassFactory *This) { TRACE("Destroying class factory %p\n", This); - heap_free(This); + free(This); InterlockedDecrement(&BROWSEUI_refCount); } @@ -147,7 +146,7 @@ static const IClassFactoryVtbl ClassFactoryVtbl = { static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut) { - ClassFactory *This = heap_alloc(sizeof(ClassFactory)); + ClassFactory *This = malloc(sizeof(*This)); This->IClassFactory_iface.lpVtbl = &ClassFactoryVtbl; This->ref = 1; This->ctor = ctor; diff --git a/dlls/browseui/compcatcachedaemon.c b/dlls/browseui/compcatcachedaemon.c index 6de0d87ef38..f7a5e4b449f 100644 --- a/dlls/browseui/compcatcachedaemon.c +++ b/dlls/browseui/compcatcachedaemon.c @@ -34,8 +34,6 @@ #include "shlguid.h" #include "shlobj.h" -#include "wine/heap.h" - #include "browseui.h" #include "resids.h" @@ -57,7 +55,7 @@ static void CompCatCacheDaemon_Destructor(CompCatCacheDaemon *This) TRACE("destroying %p\n", This); This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); - heap_free(This); + free(This); InterlockedDecrement(&BROWSEUI_refCount); } @@ -146,8 +144,7 @@ HRESULT CompCatCacheDaemon_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) if (pUnkOuter) return CLASS_E_NOAGGREGATION; - This = heap_alloc(sizeof(CompCatCacheDaemon)); - if (This == NULL) + if (!(This = calloc(1, sizeof(*This)))) return E_OUTOFMEMORY; This->IRunnableTask_iface.lpVtbl = &CompCatCacheDaemonVtbl; diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index dc0fe813f68..11a973034fa 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -34,8 +34,6 @@ #include "shlguid.h" #include "shlobj.h" -#include "wine/heap.h" - #include "browseui.h" #include "resids.h" @@ -88,17 +86,8 @@ static inline ProgressDialog *impl_from_IOleWindow(IOleWindow *iface) static void set_buffer(LPWSTR *buffer, LPCWSTR string) { - IMalloc *malloc; - ULONG cb; - - if (string == NULL) - string = L""; - CoGetMalloc(MEMCTX_TASK, &malloc); - - cb = (lstrlenW(string) + 1)*sizeof(WCHAR); - if (*buffer == NULL || cb > IMalloc_GetSize(malloc, *buffer)) - *buffer = IMalloc_Realloc(malloc, *buffer, cb); - memcpy(*buffer, string, cb); + free(*buffer); + *buffer = wcsdup(string ? string : L""); } struct create_params @@ -114,7 +103,7 @@ static LPWSTR load_string(HINSTANCE hInstance, UINT uiResourceId) LPWSTR ret; LoadStringW(hInstance, uiResourceId, string, ARRAY_SIZE(string)); - ret = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(string) + 1) * sizeof(WCHAR)); + ret = malloc((lstrlenW(string) + 1) * sizeof(WCHAR)); lstrcpyW(ret, string); return ret; } @@ -277,17 +266,17 @@ static void ProgressDialog_Destructor(ProgressDialog *This) TRACE("destroying %p\n", This); if (This->hwnd) end_dialog(This); - for (i = 0; i < 3; i++) - heap_free(This->lines[i]); - heap_free(This->cancelMsg); - heap_free(This->title); - for (i = 0; i < 2; i++) - heap_free(This->remainingMsg[i]); - for (i = 0; i < 3; i++) - heap_free(This->timeMsg[i]); + for (i = 0; i < ARRAY_SIZE(This->lines); i++) + free(This->lines[i]); + free(This->cancelMsg); + free(This->title); + for (i = 0; i < ARRAY_SIZE(This->remainingMsg); i++) + free(This->remainingMsg[i]); + for (i = 0; i < ARRAY_SIZE(This->timeMsg); i++) + free(This->timeMsg[i]); This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); - heap_free(This); + free(This); InterlockedDecrement(&BROWSEUI_refCount); } @@ -635,8 +624,7 @@ HRESULT ProgressDialog_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) if (pUnkOuter) return CLASS_E_NOAGGREGATION; - This = heap_alloc_zero(sizeof(ProgressDialog)); - if (This == NULL) + if (!(This = calloc(1, sizeof(*This)))) return E_OUTOFMEMORY; This->IProgressDialog_iface.lpVtbl = &ProgressDialogVtbl; -- 2.35.1

1 1

[PATCH] kernel32/tests: Remove GlobalMemoryStatus loop and relax the checks.
by Rémi Bernon 28 Mar '22

28 Mar '22

The test is a bit too strict in some case on Windows, relaxing it like it was initially is probably fine now that the counters are correct. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/heap.c | 41 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index f3a64dbab0b..f6fb95cdddd 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1495,21 +1495,17 @@ static void test_GlobalMemoryStatus(void) GlobalMemoryStatus( &mem ); ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); - do - { - status = NtQuerySystemInformation( SystemBasicInformation, &basic_info, sizeof(basic_info), NULL ); - ok( !status, "NtQuerySystemInformation returned %#lx\n", status ); - status = NtQuerySystemInformation( SystemPerformanceInformation, perf_info, sizeof(buffer), NULL ); - ok( !status, "NtQuerySystemInformation returned %#lx\n", status ); - status = NtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &vmc, sizeof(vmc), NULL ); - ok( !status, "NtQueryInformationProcess returned %#lx\n", status ); - mem.dwLength = sizeof(MEMORYSTATUS); - GlobalMemoryStatus( &mem ); - memex.dwLength = sizeof(MEMORYSTATUSEX); - ret = GlobalMemoryStatusEx( &memex ); - ok( ret, "GlobalMemoryStatusEx succeeded\n" ); - } while (memex.ullAvailPhys != (ULONGLONG)perf_info->AvailablePages * basic_info.PageSize || - mem.dwAvailPhys != min( ~(SIZE_T)0 >> 1, memex.ullAvailPhys )); + status = NtQuerySystemInformation( SystemBasicInformation, &basic_info, sizeof(basic_info), NULL ); + ok( !status, "NtQuerySystemInformation returned %#lx\n", status ); + status = NtQuerySystemInformation( SystemPerformanceInformation, perf_info, sizeof(buffer), NULL ); + ok( !status, "NtQuerySystemInformation returned %#lx\n", status ); + status = NtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &vmc, sizeof(vmc), NULL ); + ok( !status, "NtQueryInformationProcess returned %#lx\n", status ); + mem.dwLength = sizeof(MEMORYSTATUS); + GlobalMemoryStatus( &mem ); + memex.dwLength = sizeof(MEMORYSTATUSEX); + ret = GlobalMemoryStatusEx( &memex ); + ok( ret, "GlobalMemoryStatusEx succeeded\n" ); ok( basic_info.PageSize, "got 0 PageSize\n" ); ok( basic_info.MmNumberOfPhysicalPages, "got 0 MmNumberOfPhysicalPages\n" ); @@ -1528,27 +1524,30 @@ static void test_GlobalMemoryStatus(void) expect.ullAvailVirtual = expect.ullTotalVirtual - (ULONGLONG)vmc.WorkingSetSize /* approximate */; expect.ullAvailExtendedVirtual = 0; +/* allow some variability, info sources are not always in sync */ +#define IS_WITHIN_RANGE(a, b) (((a) - (b) + (256 * basic_info.PageSize)) <= (512 * basic_info.PageSize)) + ok( memex.dwMemoryLoad == expect.dwMemoryLoad, "got dwMemoryLoad %lu\n", memex.dwMemoryLoad ); ok( memex.ullTotalPhys == expect.ullTotalPhys, "got ullTotalPhys %#I64x\n", memex.ullTotalPhys ); - ok( memex.ullAvailPhys == expect.ullAvailPhys, "got ullAvailPhys %#I64x\n", memex.ullAvailPhys ); + ok( IS_WITHIN_RANGE( memex.ullAvailPhys, expect.ullAvailPhys ), "got ullAvailPhys %#I64x\n", memex.ullAvailPhys ); ok( memex.ullTotalPageFile == expect.ullTotalPageFile, "got ullTotalPageFile %#I64x\n", memex.ullTotalPageFile ); - /* allow some variability, page file is not always in sync on Windows */ - ok( memex.ullAvailPageFile - expect.ullAvailPageFile + 32 * basic_info.PageSize <= 64 * basic_info.PageSize, - "got ullAvailPageFile %#I64x\n", memex.ullAvailPageFile ); + ok( IS_WITHIN_RANGE( memex.ullAvailPageFile, expect.ullAvailPageFile ), "got ullAvailPageFile %#I64x\n", memex.ullAvailPageFile ); ok( memex.ullTotalVirtual == expect.ullTotalVirtual, "got ullTotalVirtual %#I64x\n", memex.ullTotalVirtual ); ok( memex.ullAvailVirtual <= expect.ullAvailVirtual, "got ullAvailVirtual %#I64x\n", memex.ullAvailVirtual ); ok( memex.ullAvailExtendedVirtual == 0, "got ullAvailExtendedVirtual %#I64x\n", memex.ullAvailExtendedVirtual ); ok( mem.dwMemoryLoad == memex.dwMemoryLoad, "got dwMemoryLoad %lu\n", mem.dwMemoryLoad ); ok( mem.dwTotalPhys == min( ~(SIZE_T)0 >> 1, memex.ullTotalPhys ), "got dwTotalPhys %#Ix\n", mem.dwTotalPhys ); - ok( mem.dwAvailPhys == min( ~(SIZE_T)0 >> 1, memex.ullAvailPhys ), "got dwAvailPhys %#Ix\n", mem.dwAvailPhys ); + ok( IS_WITHIN_RANGE( mem.dwAvailPhys, min( ~(SIZE_T)0 >> 1, memex.ullAvailPhys ) ), "got dwAvailPhys %#Ix\n", mem.dwAvailPhys ); #ifndef _WIN64 todo_wine_if(memex.ullTotalPageFile > 0xfff7ffff) #endif ok( mem.dwTotalPageFile == min( ~(SIZE_T)0, memex.ullTotalPageFile ), "got dwTotalPageFile %#Ix\n", mem.dwTotalPageFile ); - ok( mem.dwAvailPageFile == min( ~(SIZE_T)0, memex.ullAvailPageFile ), "got dwAvailPageFile %#Ix\n", mem.dwAvailPageFile ); + ok( IS_WITHIN_RANGE( mem.dwAvailPageFile, min( ~(SIZE_T)0, memex.ullAvailPageFile ) ), "got dwAvailPageFile %#Ix\n", mem.dwAvailPageFile ); ok( mem.dwTotalVirtual == memex.ullTotalVirtual, "got dwTotalVirtual %#Ix\n", mem.dwTotalVirtual ); ok( mem.dwAvailVirtual == memex.ullAvailVirtual, "got dwAvailVirtual %#Ix\n", mem.dwAvailVirtual ); + +#undef IS_WITHIN_RANGE } START_TEST(heap) -- 2.35.1

1 0

[PATCH v3 1/5] winegstreamer: Implement H264 decoder GetInputStreamInfo.
by Rémi Bernon 28 Mar '22

28 Mar '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: * Retitle PATCH 3, clear format struct, avoid unnecessary cast, use enum values. * Add a comment to PATCH 4. dlls/mf/tests/mf.c | 6 ------ dlls/winegstreamer/h264_decoder.c | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index e58d8278b82..6563ca81b29 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6790,17 +6790,11 @@ static void test_h264_decoder(void) flags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE; memset(&input_info, 0xcd, sizeof(input_info)); hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); - todo_wine ok(hr == S_OK, "GetInputStreamInfo returned %#lx\n", hr); - todo_wine ok(input_info.hnsMaxLatency == 0, "got hnsMaxLatency %s\n", wine_dbgstr_longlong(input_info.hnsMaxLatency)); - todo_wine ok(input_info.dwFlags == flags, "got dwFlags %#lx\n", input_info.dwFlags); - todo_wine ok(input_info.cbSize == 0x1000, "got cbSize %lu\n", input_info.cbSize); - todo_wine ok(input_info.cbMaxLookahead == 0, "got cbMaxLookahead %#lx\n", input_info.cbMaxLookahead); - todo_wine ok(input_info.cbAlignment == 0, "got cbAlignment %#lx\n", input_info.cbAlignment); flags = MFT_OUTPUT_STREAM_WHOLE_SAMPLES | MFT_OUTPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE; diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 2f4b42ed101..f24b07ef496 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -217,8 +217,20 @@ static HRESULT WINAPI transform_GetStreamIDs(IMFTransform *iface, DWORD input_si static HRESULT WINAPI transform_GetInputStreamInfo(IMFTransform *iface, DWORD id, MFT_INPUT_STREAM_INFO *info) { - FIXME("iface %p, id %#lx, info %p stub!\n", iface, id, info); - return E_NOTIMPL; + struct h264_decoder *decoder = impl_from_IMFTransform(iface); + + TRACE("iface %p, id %#lx, info %p.\n", iface, id, info); + + if (!decoder->input_type) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + info->hnsMaxLatency = 0; + info->dwFlags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE; + info->cbSize = 0x1000; + info->cbMaxLookahead = 0; + info->cbAlignment = 0; + + return S_OK; } static HRESULT WINAPI transform_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info) -- 2.35.1

3 12

[PATCH v2 1/5] kernel32/tests: Use 0xdeadbeef directly instead of a custom define.
by Rémi Bernon 28 Mar '22

28 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Add the broken results to the right patches. dlls/kernel32/tests/heap.c | 110 ++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 6efe4da4634..a95e863486d 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -30,8 +30,6 @@ #include "winternl.h" #include "wine/test.h" -#define MAGIC_DEAD 0xdeadbeef - /* some undocumented flags (names are made up) */ #define HEAP_PAGE_ALLOCS 0x01000000 #define HEAP_VALIDATE 0x10000000 @@ -160,83 +158,84 @@ static void test_heap(void) /* GlobalLock / GlobalUnlock with a valid handle */ gbl = GlobalAlloc(GMEM_MOVEABLE, 256); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); mem = GlobalLock(gbl); /* #1 */ ok(mem != NULL, "returned %p with %ld (expected '!= NULL')\n", mem, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); flags = GlobalFlags(gbl); ok( flags == 1, "returned 0x%04x with %ld (expected '0x0001')\n", flags, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); msecond = GlobalLock(gbl); /* #2 */ ok( msecond == mem, "returned %p with %ld (expected '%p')\n", msecond, GetLastError(), mem); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); flags = GlobalFlags(gbl); ok( flags == 2, "returned 0x%04x with %ld (expected '0x0002')\n", flags, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); res = GlobalUnlock(gbl); /* #1 */ ok(res, "returned %ld with %ld (expected '!= 0')\n", res, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); flags = GlobalFlags(gbl); ok( flags , "returned 0x%04x with %ld (expected '!= 0')\n", flags, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); res = GlobalUnlock(gbl); /* #0 */ /* NT: ERROR_SUCCESS (documented on MSDN), 9x: untouched */ - ok(!res && ((GetLastError() == ERROR_SUCCESS) || (GetLastError() == MAGIC_DEAD)), + ok( !res && ((GetLastError() == ERROR_SUCCESS) || (GetLastError() == 0xdeadbeef)), "returned %ld with %ld (expected '0' with: ERROR_SUCCESS or " - "MAGIC_DEAD)\n", res, GetLastError()); - SetLastError(MAGIC_DEAD); + "0xdeadbeef)\n", + res, GetLastError() ); + SetLastError( 0xdeadbeef ); flags = GlobalFlags(gbl); ok( !flags , "returned 0x%04x with %ld (expected '0')\n", flags, GetLastError()); /* Unlock an already unlocked Handle */ - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); res = GlobalUnlock(gbl); /* NT: ERROR_NOT_LOCKED, 9x: untouched */ - ok( !res && - ((GetLastError() == ERROR_NOT_LOCKED) || (GetLastError() == MAGIC_DEAD)), + ok( !res && ((GetLastError() == ERROR_NOT_LOCKED) || (GetLastError() == 0xdeadbeef)), "returned %ld with %ld (expected '0' with: ERROR_NOT_LOCKED or " - "MAGIC_DEAD)\n", res, GetLastError()); + "0xdeadbeef)\n", + res, GetLastError() ); GlobalFree(gbl); /* invalid handles are caught in windows: */ - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); hsecond = GlobalFree(gbl); /* invalid handle: free memory twice */ ok( (hsecond == gbl) && (GetLastError() == ERROR_INVALID_HANDLE), "returned %p with 0x%08lx (expected %p with ERROR_INVALID_HANDLE)\n", hsecond, GetLastError(), gbl); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); hsecond = GlobalFree(LongToHandle(0xdeadbeef)); /* bogus handle */ ok( (hsecond == LongToHandle(0xdeadbeef)) && (GetLastError() == ERROR_INVALID_HANDLE), "returned %p with 0x%08lx (expected %p with ERROR_INVALID_HANDLE)\n", hsecond, GetLastError(), LongToHandle(0xdeadbeef)); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); hsecond = GlobalFree(LongToHandle(0xdeadbee0)); /* bogus pointer */ ok( (hsecond == LongToHandle(0xdeadbee0)) && ((GetLastError() == ERROR_INVALID_HANDLE) || broken(GetLastError() == ERROR_NOACCESS) /* wvista+ */), "returned %p with 0x%08lx (expected %p with ERROR_NOACCESS)\n", hsecond, GetLastError(), LongToHandle(0xdeadbee0)); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); flags = GlobalFlags(gbl); ok( (flags == GMEM_INVALID_HANDLE) && (GetLastError() == ERROR_INVALID_HANDLE), "returned 0x%04x with 0x%08lx (expected GMEM_INVALID_HANDLE with " "ERROR_INVALID_HANDLE)\n", flags, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); size = GlobalSize(gbl); ok( (size == 0) && (GetLastError() == ERROR_INVALID_HANDLE), "returned %Id with 0x%08lx (expected '0' with ERROR_INVALID_HANDLE)\n", size, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); mem = GlobalLock(gbl); ok( (mem == NULL) && (GetLastError() == ERROR_INVALID_HANDLE), "returned %p with 0x%08lx (expected NULL with ERROR_INVALID_HANDLE)\n", @@ -246,7 +245,7 @@ static void test_heap(void) Win9x and wine return FALSE with ERROR_INVALID_HANDLE, but on NT 3.51 and XPsp2, TRUE with ERROR_INVALID_HANDLE is returned. The similar Test for LocalUnlock() works on all Systems */ - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); res = GlobalUnlock(gbl); ok(GetLastError() == ERROR_INVALID_HANDLE, "returned %ld with %ld (expected ERROR_INVALID_HANDLE)\n", @@ -261,7 +260,7 @@ static void test_heap(void) /* invalid free */ if (sizeof(void *) != 8) /* crashes on 64-bit */ { - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); mem = GlobalFree(gbl); ok(mem == gbl || broken(mem == NULL) /* nt4 */, "Expected gbl, got %p\n", mem); if (mem == gbl) @@ -273,7 +272,7 @@ static void test_heap(void) /* GMEM_FIXED block expands in place only without flags */ for (size = 1; size <= max_size; size <<= 1) { gbl = GlobalAlloc(GMEM_FIXED, init_size); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); hsecond = GlobalReAlloc(gbl, size + init_size, 0); ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), "got %p with %lx (expected %p or NULL) @%Id\n", hsecond, GetLastError(), gbl, size); @@ -283,7 +282,7 @@ static void test_heap(void) /* GMEM_FIXED block can be relocated with GMEM_MOVEABLE */ for (size = 1; size <= max_size; size <<= 1) { gbl = GlobalAlloc(GMEM_FIXED, init_size); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); hsecond = GlobalReAlloc(gbl, size + init_size, GMEM_MOVEABLE); ok(hsecond != NULL, "got %p with %lx (expected non-NULL) @%Id\n", hsecond, GetLastError(), size); @@ -320,7 +319,7 @@ static void test_heap(void) /* GlobalSize on an invalid handle */ if (sizeof(void *) != 8) /* crashes on 64-bit Vista */ { - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); size = GlobalSize((HGLOBAL)0xc042); ok(size == 0, "Expected 0, got %Id\n", size); ok(GetLastError() == ERROR_INVALID_HANDLE || @@ -358,78 +357,79 @@ static void test_heap(void) /* LocalLock / LocalUnlock with a valid handle */ gbl = LocalAlloc(LMEM_MOVEABLE, 256); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); mem = LocalLock(gbl); /* #1 */ ok(mem != NULL, "returned %p with %ld (expected '!= NULL')\n", mem, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); flags = LocalFlags(gbl); ok( flags == 1, "returned 0x%04x with %ld (expected '0x0001')\n", flags, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); msecond = LocalLock(gbl); /* #2 */ ok( msecond == mem, "returned %p with %ld (expected '%p')\n", msecond, GetLastError(), mem); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); flags = LocalFlags(gbl); ok( flags == 2, "returned 0x%04x with %ld (expected '0x0002')\n", flags, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); res = LocalUnlock(gbl); /* #1 */ ok(res, "returned %ld with %ld (expected '!= 0')\n", res, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); flags = LocalFlags(gbl); ok( flags , "returned 0x%04x with %ld (expected '!= 0')\n", flags, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); res = LocalUnlock(gbl); /* #0 */ /* NT: ERROR_SUCCESS (documented on MSDN), 9x: untouched */ - ok(!res && ((GetLastError() == ERROR_SUCCESS) || (GetLastError() == MAGIC_DEAD)), + ok( !res && ((GetLastError() == ERROR_SUCCESS) || (GetLastError() == 0xdeadbeef)), "returned %ld with %ld (expected '0' with: ERROR_SUCCESS or " - "MAGIC_DEAD)\n", res, GetLastError()); - SetLastError(MAGIC_DEAD); + "0xdeadbeef)\n", + res, GetLastError() ); + SetLastError( 0xdeadbeef ); flags = LocalFlags(gbl); ok( !flags , "returned 0x%04x with %ld (expected '0')\n", flags, GetLastError()); /* Unlock an already unlocked Handle */ - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); res = LocalUnlock(gbl); /* NT: ERROR_NOT_LOCKED, 9x: untouched */ - ok( !res && - ((GetLastError() == ERROR_NOT_LOCKED) || (GetLastError() == MAGIC_DEAD)), + ok( !res && ((GetLastError() == ERROR_NOT_LOCKED) || (GetLastError() == 0xdeadbeef)), "returned %ld with %ld (expected '0' with: ERROR_NOT_LOCKED or " - "MAGIC_DEAD)\n", res, GetLastError()); + "0xdeadbeef)\n", + res, GetLastError() ); LocalFree(gbl); /* invalid handles are caught in windows: */ - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); hsecond = LocalFree(gbl); /* invalid handle: free memory twice */ ok( (hsecond == gbl) && (GetLastError() == ERROR_INVALID_HANDLE), "returned %p with 0x%08lx (expected %p with ERROR_INVALID_HANDLE)\n", hsecond, GetLastError(), gbl); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); flags = LocalFlags(gbl); ok( (flags == LMEM_INVALID_HANDLE) && (GetLastError() == ERROR_INVALID_HANDLE), "returned 0x%04x with 0x%08lx (expected LMEM_INVALID_HANDLE with " "ERROR_INVALID_HANDLE)\n", flags, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); size = LocalSize(gbl); ok( (size == 0) && (GetLastError() == ERROR_INVALID_HANDLE), "returned %Id with 0x%08lx (expected '0' with ERROR_INVALID_HANDLE)\n", size, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); mem = LocalLock(gbl); ok( (mem == NULL) && (GetLastError() == ERROR_INVALID_HANDLE), "returned %p with 0x%08lx (expected NULL with ERROR_INVALID_HANDLE)\n", mem, GetLastError()); /* This Test works the same on all Systems (GlobalUnlock() is different) */ - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); res = LocalUnlock(gbl); ok(!res && (GetLastError() == ERROR_INVALID_HANDLE), "returned %ld with %ld (expected '0' with ERROR_INVALID_HANDLE)\n", @@ -438,7 +438,7 @@ static void test_heap(void) /* LMEM_FIXED block expands in place only without flags */ for (size = 1; size <= max_size; size <<= 1) { gbl = LocalAlloc(LMEM_FIXED, init_size); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); hsecond = LocalReAlloc(gbl, size + init_size, 0); ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), "got %p with %lx (expected %p or NULL) @%Id\n", hsecond, GetLastError(), gbl, size); @@ -448,7 +448,7 @@ static void test_heap(void) /* LMEM_FIXED memory can be relocated with LMEM_MOVEABLE */ for (size = 1; size <= max_size; size <<= 1) { gbl = LocalAlloc(LMEM_FIXED, init_size); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); hsecond = LocalReAlloc(gbl, size + init_size, LMEM_MOVEABLE); ok(hsecond != NULL, "got %p with %lx (expected non-NULL) @%Id\n", hsecond, GetLastError(), size); @@ -476,13 +476,13 @@ static void test_heap(void) /* trying to lock empty memory should give an error */ gbl = GlobalAlloc(GMEM_MOVEABLE|GMEM_ZEROINIT,0); ok(gbl != NULL, "returned NULL\n"); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); mem = GlobalLock(gbl); /* NT: ERROR_DISCARDED, 9x: untouched */ - ok( (mem == NULL) && - ((GetLastError() == ERROR_DISCARDED) || (GetLastError() == MAGIC_DEAD)), + ok( (mem == NULL) && ((GetLastError() == ERROR_DISCARDED) || (GetLastError() == 0xdeadbeef)), "returned %p with 0x%lx/%ld (expected 'NULL' with: ERROR_DISCARDED or " - "MAGIC_DEAD)\n", mem, GetLastError(), GetLastError()); + "0xdeadbeef)\n", + mem, GetLastError(), GetLastError() ); GlobalFree(gbl); @@ -825,7 +825,7 @@ static void test_obsolete_flags(void) gbl = GlobalAlloc(test_global_flags[i].flags, 4); ok(gbl != NULL, "GlobalAlloc failed\n"); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); resultflags = pGlobalFlags(gbl); ok( resultflags == test_global_flags[i].globalflags || -- 2.35.1

2 7

[PATCH v2 2/2] ncrypt: Implement NCryptVerifySignature.
by Hans Leidekker 28 Mar '22

28 Mar '22

From: Santino Mazza <mazzasantino1206(a)gmail.com> v2: Accept any asymmetric key. Formatting. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/main.c | 25 +++++++++++++++++++++---- dlls/ncrypt/tests/ncrypt.c | 8 +++----- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index f8fb3135f56..cc979a539d2 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -36,8 +36,11 @@ static SECURITY_STATUS map_ntstatus(NTSTATUS status) { switch (status) { - case STATUS_INVALID_HANDLE: return NTE_INVALID_HANDLE; - case NTE_BAD_DATA: return NTE_BAD_DATA; + case STATUS_INVALID_HANDLE: return NTE_INVALID_HANDLE; + case STATUS_INVALID_SIGNATURE: return NTE_BAD_SIGNATURE; + case STATUS_SUCCESS: return ERROR_SUCCESS; + case STATUS_INVALID_PARAMETER: return NTE_INVALID_PARAMETER; + case NTE_BAD_DATA: return NTE_BAD_DATA; default: FIXME("unhandled status %#lx\n", status); return NTE_INTERNAL_ERROR; @@ -458,7 +461,21 @@ SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE handle, const WCHAR *name SECURITY_STATUS WINAPI NCryptVerifySignature(NCRYPT_KEY_HANDLE handle, void *padding, BYTE *hash, DWORD hash_size, BYTE *signature, DWORD signature_size, DWORD flags) { - FIXME("(%#Ix, %p, %p, %lu, %p, %lu, %#lx): stub\n", handle, padding, hash, hash_size, signature, + struct object *key_object = (struct object *)handle; + + TRACE("(%#Ix, %p, %p, %lu, %p, %lu, %#lx)\n", handle, padding, hash, hash_size, signature, signature_size, flags); - return ERROR_SUCCESS; + + if (!hash_size || !signature_size) return NTE_INVALID_PARAMETER; + if (!hash || !signature) return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER); + if (!handle || key_object->type != KEY) return NTE_INVALID_HANDLE; + + if (key_object->key.algid < RSA) + { + FIXME("Symmetric keys not supported.\n"); + return NTE_NOT_SUPPORTED; + } + + return map_ntstatus(BCryptVerifySignature(key_object->key.bcrypt_key, padding, hash, hash_size, signature, + signature_size, flags)); } diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index e8de441876b..7fb8b2cb4c5 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -428,7 +428,6 @@ static void test_verify_signature(void) sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); - todo_wine { ret = NCryptVerifySignature(key, &padinfo, sha256_hash, sizeof(sha256_hash), invalid_signature, sizeof(invalid_signature), NCRYPT_PAD_PKCS1_FLAG); ok(ret == NTE_BAD_SIGNATURE, "got %#lx\n", ret); @@ -447,7 +446,7 @@ static void test_verify_signature(void) ret = NCryptVerifySignature(key, &padinfo, sha256_hash, 4, signature_pkcs1_sha256, sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); - ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); + todo_wine ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); ret = NCryptVerifySignature(key, &padinfo, sha256_hash, sizeof(sha256_hash), NULL, sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); @@ -455,13 +454,12 @@ static void test_verify_signature(void) ret = NCryptVerifySignature(key, &padinfo, sha256_hash, sizeof(sha256_hash), signature_pkcs1_sha256, 4, NCRYPT_PAD_PKCS1_FLAG); - ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); + todo_wine ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); invalid_padinfo.pszAlgId = BCRYPT_MD5_ALGORITHM; ret = NCryptVerifySignature(key, &invalid_padinfo, sha256_hash, sizeof(sha256_hash), signature_pkcs1_sha256, sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); - ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); - } + todo_wine ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); NCryptFreeObject(key); NCryptFreeObject(prov); -- 2.30.2

1 0

[PATCH v2 1/2] ncrypt/tests: Test for NCryptVerifySignature.
by Hans Leidekker 28 Mar '22

28 Mar '22

From: Santino Mazza <mazzasantino1206(a)gmail.com> v2: Formatting. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/tests/ncrypt.c | 138 +++++++++++++++++++++++++++++++++++++ include/ncrypt.h | 6 ++ 2 files changed, 144 insertions(+) diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index fc951fef80a..e8de441876b 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -330,6 +330,143 @@ static void test_finalize_key(void) NCryptFreeObject(key); } +static UCHAR signature_pubkey_blob[] = { + 0x52, 0x53, 0x41, 0x31, 0x00, 0x08, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x01, 0xb4, 0xdb, 0x15, 0x24, 0xd0, 0x9a, 0xf4, 0xa3, 0x22, + 0x04, 0xbe, 0xbd, 0xda, 0xb4, 0x3b, 0x1f, 0x9d, 0x5f, 0x2a, 0x3e, 0xe7, + 0x42, 0xd7, 0xfa, 0xbc, 0xeb, 0x4e, 0xba, 0xcf, 0x92, 0x5d, 0x42, 0x0e, + 0xc0, 0xb0, 0x0f, 0xcc, 0xc3, 0x03, 0x69, 0x23, 0xb9, 0xc2, 0x07, 0xf7, + 0xf5, 0x19, 0xef, 0x9f, 0xb6, 0xd4, 0x6d, 0x35, 0x0d, 0x4c, 0x3a, 0x2b, + 0x37, 0x9d, 0x4d, 0x61, 0xce, 0x30, 0x33, 0x27, 0xe4, 0x9a, 0xca, 0x23, + 0xd6, 0x8f, 0x90, 0x33, 0xba, 0x5b, 0x16, 0xab, 0xa6, 0xda, 0x7a, 0x16, + 0x8e, 0xae, 0xf9, 0x6f, 0x29, 0xe2, 0xf1, 0x3d, 0xf0, 0xb6, 0xb4, 0x70, + 0xc0, 0x6d, 0xfc, 0x73, 0xf1, 0x3e, 0xdf, 0x02, 0x2c, 0xab, 0x24, 0x7a, + 0xd8, 0x8b, 0xcf, 0x63, 0xd0, 0x1a, 0x76, 0xb3, 0x11, 0x22, 0x5d, 0xf6, + 0x72, 0xb5, 0xd1, 0x6b, 0x83, 0xcd, 0x63, 0x5d, 0x3d, 0x03, 0xa2, 0xe0, + 0x36, 0xe8, 0x54, 0xe9, 0x6f, 0x04, 0xb3, 0x1a, 0xdf, 0x35, 0xd7, 0x01, + 0x57, 0xc7, 0x8d, 0x81, 0x4b, 0x39, 0x0c, 0x92, 0x71, 0x0b, 0x7d, 0x05, + 0xb4, 0xa4, 0xb4, 0xd4, 0x73, 0x55, 0x85, 0x19, 0xd5, 0x37, 0x7f, 0xcd, + 0x81, 0xd3, 0xf2, 0x62, 0x60, 0xfb, 0x6a, 0x1a, 0xda, 0xb4, 0x83, 0xfa, + 0x87, 0xac, 0x51, 0x3a, 0xb4, 0xc2, 0x03, 0xd3, 0xc6, 0xf0, 0x20, 0xca, + 0x10, 0xfd, 0xeb, 0xd8, 0x85, 0xb9, 0x74, 0x29, 0x83, 0xda, 0xa2, 0xee, + 0xcc, 0xf4, 0xf6, 0x18, 0xbc, 0x84, 0x92, 0xf5, 0xdb, 0x71, 0x14, 0xb9, + 0x62, 0x54, 0x4b, 0x64, 0x58, 0x95, 0xbc, 0x69, 0xc1, 0xcd, 0xac, 0x4b, + 0x7c, 0x1d, 0xc4, 0xe7, 0x6c, 0x44, 0x80, 0x5e, 0x88, 0x3a, 0x9c, 0xbd, + 0xd5, 0xa5, 0x2f, 0xa6, 0x73, 0x65, 0x48, 0x00, 0x5e, 0xfd, 0xe9, 0x4e, + 0xd7, 0x6c, 0x59, 0x47, 0x9b, 0xd1, 0x9d}; + +static UCHAR signature_pkcs1_sha256[] = { + 0xad, 0x3d, 0x2f, 0x31, 0x87, 0xba, 0x5b, 0xdc, 0x84, 0x95, 0x77, 0x68, + 0xf9, 0x9c, 0xd2, 0x38, 0x5b, 0x9f, 0x09, 0xc3, 0x8e, 0x9e, 0x8e, 0x8d, + 0x49, 0x56, 0x31, 0x09, 0x55, 0xc6, 0xd2, 0x1a, 0xb3, 0x00, 0x71, 0x60, + 0x84, 0x38, 0xf7, 0x1b, 0xc0, 0x43, 0x87, 0x31, 0x2d, 0xcc, 0xf2, 0x49, + 0x5f, 0x21, 0x8e, 0x77, 0x16, 0x57, 0xd7, 0xe9, 0x37, 0x3a, 0xe9, 0x91, + 0x5b, 0xc5, 0xea, 0x34, 0xb5, 0xf7, 0x4d, 0xaa, 0x65, 0x06, 0xef, 0xc6, + 0x14, 0xfa, 0xa7, 0x1e, 0xe5, 0xc6, 0x18, 0xfe, 0x06, 0x64, 0xe7, 0x6e, + 0x11, 0x83, 0x03, 0x4c, 0x91, 0x47, 0x60, 0x88, 0x12, 0x0c, 0x5e, 0xcc, + 0x3a, 0x93, 0x2f, 0x5c, 0x57, 0x5b, 0x66, 0x55, 0xa3, 0xe5, 0xf4, 0x3c, + 0x6f, 0xe9, 0xd8, 0xfd, 0xcc, 0x19, 0xc8, 0xf8, 0x13, 0x21, 0x3d, 0x29, + 0xee, 0x3c, 0xb2, 0xb4, 0x3f, 0x36, 0xd8, 0x82, 0xb1, 0xa9, 0x34, 0x89, + 0x2a, 0x7a, 0x42, 0x4a, 0x13, 0x0a, 0x0b, 0x50, 0xbe, 0x43, 0xa8, 0x2c, + 0x5a, 0x86, 0x65, 0x9f, 0xab, 0x86, 0x25, 0x44, 0xbb, 0x6b, 0xca, 0x04, + 0xca, 0xa5, 0xe7, 0x8e, 0xe2, 0x1d, 0xa8, 0x31, 0x90, 0x85, 0x6a, 0xd9, + 0xaf, 0x67, 0x8c, 0x1a, 0x13, 0xea, 0xa8, 0xfd, 0x3d, 0xc0, 0xb0, 0x3f, + 0xde, 0x6a, 0xc9, 0x65, 0xeb, 0x0a, 0xa6, 0x9b, 0xfc, 0x97, 0x0a, 0x72, + 0xaf, 0x04, 0xde, 0x3f, 0xcb, 0xac, 0x97, 0x6e, 0xfa, 0xbb, 0xd8, 0x6e, + 0xad, 0x0d, 0x10, 0xc6, 0x34, 0x18, 0x50, 0xb9, 0x12, 0xd4, 0x6b, 0xd5, + 0x3d, 0x9d, 0xfb, 0x31, 0x8d, 0x96, 0x39, 0x4d, 0x20, 0x91, 0x40, 0x06, + 0xca, 0xe6, 0x33, 0x73, 0x76, 0x2a, 0xe3, 0xab, 0xaf, 0x9d, 0xe9, 0x4e, + 0xb7, 0xe0, 0x4b, 0x45, 0x23, 0x07, 0xe9, 0xe2, 0xab, 0xdc, 0x9f, 0x5a, + 0xed, 0xbe, 0x76, 0x27}; + +static UCHAR invalid_signature[] = { + 0x4f, 0x8f, 0x88, 0x43, 0xed, 0x9e, 0xe8, 0x75, 0x0f, 0xe7, 0x32, 0xab, + 0x07, 0xcc, 0x6c, 0x8d, 0x56, 0xaa, 0x78, 0xf8, 0x43, 0x62, 0x4c, 0x0c, + 0xd5, 0x45, 0x2c, 0x3d, 0x28, 0x6f, 0xbc, 0x8b, 0xc1, 0x9f, 0xfe, 0x33, + 0x50, 0x4e, 0xd0, 0x6a, 0x83, 0xf8, 0x0e, 0xc8, 0x19, 0x59, 0xde, 0x25, + 0xf0, 0x7b, 0x4e, 0x3d, 0x9d, 0xc7, 0xbf, 0x72, 0xc3, 0x26, 0x48, 0xb6, + 0x19, 0x08, 0x3f, 0x05, 0xe8, 0x76, 0x2c, 0x11, 0x49, 0xfb, 0xa1, 0xc0, + 0xae, 0x6e, 0x30, 0xf8, 0x10, 0x61, 0x9f, 0x53, 0xc6, 0xeb, 0x7c, 0x7c, + 0x94, 0x5f, 0xca, 0xe5, 0x41, 0x40, 0xd6, 0x83, 0xa8, 0x4a, 0x45, 0x5c, + 0x77, 0x69, 0xf2, 0x89, 0xe9, 0xf7, 0x81, 0xa1, 0xae, 0x77, 0xf5, 0xec, + 0x41, 0x4b, 0xfc, 0x82, 0x7f, 0xee, 0x4e, 0x5b, 0x43, 0xdd, 0xcc, 0xe8, + 0x90, 0x12, 0xf0, 0x9a, 0xd0, 0xbc, 0x56, 0xd8, 0xeb, 0xd6, 0xfc, 0x80, + 0x48, 0x26, 0x8c, 0x63, 0x5c, 0x55, 0xd9, 0x6c, 0xb5, 0x10, 0xc1, 0xab, + 0x98, 0x3c, 0xe1, 0x25, 0x13, 0x4e, 0xc2, 0xdc, 0xd5, 0x4a, 0x25, 0xe5, + 0xc7, 0x9f, 0xfc, 0xf8, 0x53, 0x53, 0x12, 0x4c, 0xc1, 0x6c, 0x67, 0xa9, + 0x9e, 0x6e, 0x88, 0x2e, 0x93, 0xa3, 0x3f, 0x2d, 0xd3, 0xc5, 0xf4, 0x25, + 0xe2, 0x0f, 0x8f, 0xc0, 0x2b, 0x30, 0x94, 0x9d, 0xc0, 0x09, 0x31, 0x6c, + 0x19, 0xf7, 0x2e, 0x72, 0x6b, 0xb3, 0xf6, 0x78, 0x91, 0xca, 0x95, 0x28, + 0x9f, 0xf6, 0xd0, 0x77, 0x1c, 0x73, 0xff, 0x30, 0xe7, 0x02, 0xc3, 0xc8, + 0x0e, 0x95, 0x4f, 0x02, 0x96, 0xc5, 0xa9, 0x02, 0xb8, 0xaa, 0x97, 0xac, + 0x37, 0x47, 0xa9, 0x6d, 0xcb, 0x25, 0xb3, 0x8d, 0x20, 0xc5, 0xb6, 0x49, + 0xd8, 0xaf, 0x1a, 0xad, 0x62, 0x8c, 0x79, 0x60, 0x73, 0x8d, 0x46, 0x1e, + 0xe5, 0x23, 0x39, 0x44}; + +static UCHAR sha256_hash[] = { + 0x27, 0x51, 0x8b, 0xa9, 0x68, 0x30, 0x11, 0xf6, 0xb3, 0x96, 0x07, 0x2c, + 0x05, 0xf6, 0x65, 0x6d, 0x04, 0xf5, 0xfb, 0xc3, 0x78, 0x7c, 0xf9, 0x24, + 0x90, 0xec, 0x60, 0x6e, 0x50, 0x92, 0xe3, 0x26}; + +static void test_verify_signature(void) +{ + NCRYPT_PROV_HANDLE prov; + NCRYPT_KEY_HANDLE key; + BCRYPT_PKCS1_PADDING_INFO padinfo, invalid_padinfo; + SECURITY_STATUS ret; + + ret = NCryptOpenStorageProvider(&prov, NULL, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + ret = NCryptImportKey(prov, 0, BCRYPT_PUBLIC_KEY_BLOB, NULL, &key, signature_pubkey_blob, + sizeof(signature_pubkey_blob), 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + padinfo.pszAlgId = BCRYPT_SHA256_ALGORITHM; + ret = NCryptVerifySignature(key, &padinfo, sha256_hash, sizeof(sha256_hash), signature_pkcs1_sha256, + sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + todo_wine { + ret = NCryptVerifySignature(key, &padinfo, sha256_hash, sizeof(sha256_hash), invalid_signature, + sizeof(invalid_signature), NCRYPT_PAD_PKCS1_FLAG); + ok(ret == NTE_BAD_SIGNATURE, "got %#lx\n", ret); + + ret = NCryptVerifySignature(key, NULL, sha256_hash, sizeof(sha256_hash), signature_pkcs1_sha256, + sizeof(signature_pkcs1_sha256), 0); + ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); + + ret = NCryptVerifySignature(0, &padinfo, sha256_hash, sizeof(sha256_hash), signature_pkcs1_sha256, + sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); + ok(ret == NTE_INVALID_HANDLE, "got %#lx\n", ret); + + ret = NCryptVerifySignature(key, &padinfo, NULL, sizeof(sha256_hash), signature_pkcs1_sha256, + sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); + ok(ret == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER) || broken(ret == NTE_FAIL) /* win7 */, "got %#lx\n", ret); + + ret = NCryptVerifySignature(key, &padinfo, sha256_hash, 4, signature_pkcs1_sha256, + sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); + ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); + + ret = NCryptVerifySignature(key, &padinfo, sha256_hash, sizeof(sha256_hash), NULL, + sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); + ok(ret == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER) || broken(ret == NTE_FAIL) /* win7 */, "got %#lx\n", ret); + + ret = NCryptVerifySignature(key, &padinfo, sha256_hash, sizeof(sha256_hash), signature_pkcs1_sha256, 4, + NCRYPT_PAD_PKCS1_FLAG); + ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); + + invalid_padinfo.pszAlgId = BCRYPT_MD5_ALGORITHM; + ret = NCryptVerifySignature(key, &invalid_padinfo, sha256_hash, sizeof(sha256_hash), signature_pkcs1_sha256, + sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); + ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); + } + + NCryptFreeObject(key); + NCryptFreeObject(prov); +} + START_TEST(ncrypt) { test_key_import_rsa(); @@ -338,4 +475,5 @@ START_TEST(ncrypt) test_set_property(); test_create_persisted_key(); test_finalize_key(); + test_verify_signature(); } diff --git a/include/ncrypt.h b/include/ncrypt.h index f7372b30621..c09a1ec8676 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -71,6 +71,11 @@ typedef ULONG_PTR NCRYPT_SECRET_HANDLE; #define NCRYPT_SILENT_FLAG 0x00000040 +#define NCRYPT_NO_PADDING_FLAG 0x00000001 +#define NCRYPT_PAD_PKCS1_FLAG 0x00000002 +#define NCRYPT_PAD_OAEP_FLAG 0x00000004 +#define NCRYPT_PAD_PSS_FLAG 0x00000008 + #define NCRYPT_NAME_PROPERTY L"Name" #define NCRYPT_UNIQUE_NAME_PROPERTY L"Unique Name" #define NCRYPT_ALGORITHM_PROPERTY L"Algorithm Name" @@ -116,6 +121,7 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE, co SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE *, const WCHAR *, DWORD, DWORD); SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *, const WCHAR *, DWORD); SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE, const WCHAR *, BYTE *, DWORD, DWORD); +SECURITY_STATUS WINAPI NCryptVerifySignature(NCRYPT_KEY_HANDLE, void *, BYTE *, DWORD, BYTE *, DWORD, DWORD); #ifdef __cplusplus } -- 2.30.2

1 0

[PATCH 4/5] wineoss: Move get_ossdevice_from_guid() earlier in the file.
by Huw Davies 28 Mar '22

28 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 8a0011ff9eb..e5206627528 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -410,6 +410,15 @@ static UINT get_default_index(EDataFlow flow) return 0; } +static const OSSDevice *get_ossdevice_from_guid(const GUID *guid) +{ + OSSDevice *dev_item; + LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry) + if(IsEqualGUID(guid, &dev_item->guid)) + return dev_item; + return NULL; +} + HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num, UINT *def_index) { @@ -544,15 +553,6 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, return S_OK; } -static const OSSDevice *get_ossdevice_from_guid(const GUID *guid) -{ - OSSDevice *dev_item; - LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry) - if(IsEqualGUID(guid, &dev_item->guid)) - return dev_item; - return NULL; -} - HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient **out) { -- 2.25.1

1 0

[PATCH 3/5] wineoss: Add a helper to open the device.
by Huw Davies 28 Mar '22

28 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index c72f29b5540..8a0011ff9eb 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -365,6 +365,13 @@ static void oss_clean_devnode(char *dest, const char *devnode) dest[len] = '\0'; } +static int open_device(const char *device, EDataFlow flow) +{ + int flags = ((flow == eRender) ? O_WRONLY : O_RDONLY) | O_NONBLOCK; + + return open(device, flags, 0); +} + static UINT get_default_index(EDataFlow flow) { int fd = -1, err; @@ -373,11 +380,7 @@ static UINT get_default_index(EDataFlow flow) char devnode[OSS_DEVNODE_SIZE]; OSSDevice *dev_item; - if(flow == eRender) - fd = open("/dev/dsp", O_WRONLY | O_NONBLOCK); - else - fd = open("/dev/dsp", O_RDONLY | O_NONBLOCK); - + fd = open_device("/dev/dsp", flow); if(fd < 0){ WARN("Couldn't open default device!\n"); return 0; @@ -482,10 +485,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, if(&dev_item->entry != &g_devices) continue; - if(flow == eRender) - fd = open(devnode, O_WRONLY | O_NONBLOCK, 0); - else - fd = open(devnode, O_RDONLY | O_NONBLOCK, 0); + fd = open_device(devnode, flow); if(fd < 0){ WARN("Opening device \"%s\" failed, pretending it doesn't exist: %d (%s)\n", devnode, errno, strerror(errno)); @@ -578,14 +578,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, return hr; } - if(oss_dev->flow == eRender) - This->fd = open(oss_dev->devnode, O_WRONLY | O_NONBLOCK, 0); - else if(oss_dev->flow == eCapture) - This->fd = open(oss_dev->devnode, O_RDONLY | O_NONBLOCK, 0); - else{ - HeapFree(GetProcessHeap(), 0, This); - return E_INVALIDARG; - } + This->fd = open_device(oss_dev->devnode, oss_dev->flow); if(This->fd < 0){ WARN("Unable to open device %s: %d (%s)\n", oss_dev->devnode, errno, strerror(errno)); @@ -1236,11 +1229,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, outpwfx = NULL; } - if(This->dataflow == eRender) - fd = open(This->devnode, O_WRONLY | O_NONBLOCK, 0); - else if(This->dataflow == eCapture) - fd = open(This->devnode, O_RDONLY | O_NONBLOCK, 0); - + fd = open_device(This->devnode, This->dataflow); if(fd < 0){ WARN("Unable to open device %s: %d (%s)\n", This->devnode, errno, strerror(errno)); -- 2.25.1

1 0

[PATCH 2/5] wineoss: Pass a buffer to oss_clean_devnode().
by Huw Davies 28 Mar '22

28 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 0269f0fa536..c72f29b5540 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -346,27 +346,23 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) RegCloseKey(key); } -static const char *oss_clean_devnode(const char *devnode) +/* dst must be large enough to hold devnode */ +static void oss_clean_devnode(char *dest, const char *devnode) { - static char ret[OSS_DEVNODE_SIZE]; - const char *dot, *slash; size_t len; - dot = strrchr(devnode, '.'); + strcpy(dest, devnode); + dot = strrchr(dest, '.'); if(!dot) - return devnode; + return; - slash = strrchr(devnode, '/'); + slash = strrchr(dest, '/'); if(slash && dot < slash) - return devnode; - - len = dot - devnode; - - memcpy(ret, devnode, len); - ret[len] = '\0'; + return; - return ret; + len = dot - dest; + dest[len] = '\0'; } static UINT get_default_index(EDataFlow flow) @@ -374,7 +370,7 @@ static UINT get_default_index(EDataFlow flow) int fd = -1, err; UINT i; oss_audioinfo ai; - const char *devnode; + char devnode[OSS_DEVNODE_SIZE]; OSSDevice *dev_item; if(flow == eRender) @@ -397,7 +393,7 @@ static UINT get_default_index(EDataFlow flow) close(fd); TRACE("Default devnode: %s\n", ai.devnode); - devnode = oss_clean_devnode(ai.devnode); + oss_clean_devnode(devnode, ai.devnode); i = 0; LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry){ if(dev_item->flow == flow){ @@ -465,7 +461,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, *num = 0; for(i = 0; i < sysinfo.numaudios; ++i){ oss_audioinfo ai = {0}; - const char *devnode; + char devnode[OSS_DEVNODE_SIZE]; OSSDevice *dev_item; int fd; @@ -476,7 +472,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, continue; } - devnode = oss_clean_devnode(ai.devnode); + oss_clean_devnode(devnode, ai.devnode); /* check for duplicates */ LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry){ -- 2.25.1

1 0

[PATCH 1/5] wineoss: Introduce a test_connect syscall.
by Huw Davies 28 Mar '22

28 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/Makefile.in | 4 +- dlls/wineoss.drv/mmdevdrv.c | 60 ++++++----------------- dlls/wineoss.drv/oss.c | 94 ++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 40 +++++++++++++++ 4 files changed, 153 insertions(+), 45 deletions(-) create mode 100644 dlls/wineoss.drv/oss.c create mode 100644 dlls/wineoss.drv/unixlib.h diff --git a/dlls/wineoss.drv/Makefile.in b/dlls/wineoss.drv/Makefile.in index ce96ca73bf4..d48db94b929 100644 --- a/dlls/wineoss.drv/Makefile.in +++ b/dlls/wineoss.drv/Makefile.in @@ -1,5 +1,6 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wineoss.drv +UNIXLIB = wineoss.so IMPORTS = uuid ole32 user32 advapi32 DELAYIMPORTS = winmm EXTRALIBS = $(OSS4_LIBS) @@ -11,4 +12,5 @@ C_SRCS = \ midi.c \ midipatch.c \ mmaux.c \ - mmdevdrv.c + mmdevdrv.c \ + oss.c diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index b340db00c3c..0269f0fa536 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1,5 +1,6 @@ /* * Copyright 2011 Andrew Eikum for CodeWeavers + * 2022 Huw Davies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -35,10 +36,9 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "winnls.h" #include "winreg.h" -#include "wine/debug.h" -#include "wine/list.h" #include "ole2.h" #include "mmdeviceapi.h" @@ -51,10 +51,18 @@ #include "audiopolicy.h" #include "audioclient.h" +#include "wine/debug.h" +#include "wine/list.h" +#include "wine/unixlib.h" + +#include "unixlib.h" + WINE_DEFAULT_DEBUG_CHANNEL(oss); #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) +unixlib_handle_t oss_handle = 0; + static const REFERENCE_TIME DefaultPeriod = 100000; static const REFERENCE_TIME MinimumPeriod = 50000; @@ -233,6 +241,9 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) switch (reason) { case DLL_PROCESS_ATTACH: + if(NtQueryVirtualMemory(GetCurrentProcess(), dll, MemoryWineUnixFuncs, + &oss_handle, sizeof(oss_handle), NULL)) + return FALSE; g_timer_q = CreateTimerQueue(); if(!g_timer_q) return FALSE; @@ -254,52 +265,13 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) return TRUE; } -/* From <dlls/mmdevapi/mmdevapi.h> */ -enum DriverPriority { - Priority_Unavailable = 0, - Priority_Low, - Priority_Neutral, - Priority_Preferred -}; - int WINAPI AUDDRV_GetPriority(void) { - int mixer_fd; - oss_sysinfo sysinfo; - - /* Attempt to determine if we are running on OSS or ALSA's OSS - * compatibility layer. There is no official way to do that, so just check - * for validity as best as possible, without rejecting valid OSS - * implementations. */ - - mixer_fd = open("/dev/mixer", O_RDONLY, 0); - if(mixer_fd < 0){ - TRACE("Priority_Unavailable: open failed\n"); - return Priority_Unavailable; - } - - sysinfo.version[0] = 0xFF; - sysinfo.versionnum = ~0; - if(ioctl(mixer_fd, SNDCTL_SYSINFO, &sysinfo) < 0){ - TRACE("Priority_Unavailable: ioctl failed\n"); - close(mixer_fd); - return Priority_Unavailable; - } - - close(mixer_fd); - - if(sysinfo.version[0] < '4' || sysinfo.version[0] > '9'){ - TRACE("Priority_Low: sysinfo.version[0]: %x\n", sysinfo.version[0]); - return Priority_Low; - } - if(sysinfo.versionnum & 0x80000000){ - TRACE("Priority_Low: sysinfo.versionnum: %x\n", sysinfo.versionnum); - return Priority_Low; - } + struct test_connect_params params; - TRACE("Priority_Preferred: Seems like valid OSS!\n"); + OSS_CALL(test_connect, &params); - return Priority_Preferred; + return params.priority; } static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c new file mode 100644 index 00000000000..9c1de25acb5 --- /dev/null +++ b/dlls/wineoss.drv/oss.c @@ -0,0 +1,94 @@ +/* + * OSS driver (unixlib) + * + * Copyright 2011 Andrew Eikum for CodeWeavers + * 2022 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep unix +#endif + +#include <stdarg.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <sys/ioctl.h> +#include <fcntl.h> +#include <unistd.h> +#include <sys/soundcard.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "winternl.h" + +#include "wine/debug.h" +#include "wine/unixlib.h" + +#include "unixlib.h" + +WINE_DEFAULT_DEBUG_CHANNEL(oss); + +static NTSTATUS test_connect(void *args) +{ + struct test_connect_params *params = args; + int mixer_fd; + oss_sysinfo sysinfo; + + /* Attempt to determine if we are running on OSS or ALSA's OSS + * compatibility layer. There is no official way to do that, so just check + * for validity as best as possible, without rejecting valid OSS + * implementations. */ + + mixer_fd = open("/dev/mixer", O_RDONLY, 0); + if(mixer_fd < 0){ + TRACE("Priority_Unavailable: open failed\n"); + params->priority = Priority_Unavailable; + return STATUS_SUCCESS; + } + + sysinfo.version[0] = 0xFF; + sysinfo.versionnum = ~0; + if(ioctl(mixer_fd, SNDCTL_SYSINFO, &sysinfo) < 0){ + TRACE("Priority_Unavailable: ioctl failed\n"); + close(mixer_fd); + params->priority = Priority_Unavailable; + return STATUS_SUCCESS; + } + + close(mixer_fd); + + if(sysinfo.version[0] < '4' || sysinfo.version[0] > '9'){ + TRACE("Priority_Low: sysinfo.version[0]: %x\n", sysinfo.version[0]); + params->priority = Priority_Low; + return STATUS_SUCCESS; + } + if(sysinfo.versionnum & 0x80000000){ + TRACE("Priority_Low: sysinfo.versionnum: %x\n", sysinfo.versionnum); + params->priority = Priority_Low; + return STATUS_SUCCESS; + } + + TRACE("Priority_Preferred: Seems like valid OSS!\n"); + + params->priority = Priority_Preferred; + return STATUS_SUCCESS; +} + +unixlib_entry_t __wine_unix_call_funcs[] = +{ + test_connect, +}; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h new file mode 100644 index 00000000000..d4fb5db3102 --- /dev/null +++ b/dlls/wineoss.drv/unixlib.h @@ -0,0 +1,40 @@ +/* + * Copyright 2022 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* From <dlls/mmdevapi/mmdevapi.h> */ +enum DriverPriority +{ + Priority_Unavailable = 0, + Priority_Low, + Priority_Neutral, + Priority_Preferred +}; + +struct test_connect_params +{ + enum DriverPriority priority; +}; + +enum oss_funcs +{ + oss_test_connect, +}; + +extern unixlib_handle_t oss_handle; + +#define OSS_CALL(func, params) __wine_unix_call(oss_handle, oss_ ## func, params) -- 2.25.1

1 0

[PATCH 1/5] kernel32/tests: Use 0xdeadbeef directly instead of a custom define.
by Rémi Bernon 28 Mar '22

28 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/heap.c | 110 ++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 6efe4da4634..a95e863486d 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -30,8 +30,6 @@ #include "winternl.h" #include "wine/test.h" -#define MAGIC_DEAD 0xdeadbeef - /* some undocumented flags (names are made up) */ #define HEAP_PAGE_ALLOCS 0x01000000 #define HEAP_VALIDATE 0x10000000 @@ -160,83 +158,84 @@ static void test_heap(void) /* GlobalLock / GlobalUnlock with a valid handle */ gbl = GlobalAlloc(GMEM_MOVEABLE, 256); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); mem = GlobalLock(gbl); /* #1 */ ok(mem != NULL, "returned %p with %ld (expected '!= NULL')\n", mem, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); flags = GlobalFlags(gbl); ok( flags == 1, "returned 0x%04x with %ld (expected '0x0001')\n", flags, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); msecond = GlobalLock(gbl); /* #2 */ ok( msecond == mem, "returned %p with %ld (expected '%p')\n", msecond, GetLastError(), mem); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); flags = GlobalFlags(gbl); ok( flags == 2, "returned 0x%04x with %ld (expected '0x0002')\n", flags, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); res = GlobalUnlock(gbl); /* #1 */ ok(res, "returned %ld with %ld (expected '!= 0')\n", res, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); flags = GlobalFlags(gbl); ok( flags , "returned 0x%04x with %ld (expected '!= 0')\n", flags, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); res = GlobalUnlock(gbl); /* #0 */ /* NT: ERROR_SUCCESS (documented on MSDN), 9x: untouched */ - ok(!res && ((GetLastError() == ERROR_SUCCESS) || (GetLastError() == MAGIC_DEAD)), + ok( !res && ((GetLastError() == ERROR_SUCCESS) || (GetLastError() == 0xdeadbeef)), "returned %ld with %ld (expected '0' with: ERROR_SUCCESS or " - "MAGIC_DEAD)\n", res, GetLastError()); - SetLastError(MAGIC_DEAD); + "0xdeadbeef)\n", + res, GetLastError() ); + SetLastError( 0xdeadbeef ); flags = GlobalFlags(gbl); ok( !flags , "returned 0x%04x with %ld (expected '0')\n", flags, GetLastError()); /* Unlock an already unlocked Handle */ - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); res = GlobalUnlock(gbl); /* NT: ERROR_NOT_LOCKED, 9x: untouched */ - ok( !res && - ((GetLastError() == ERROR_NOT_LOCKED) || (GetLastError() == MAGIC_DEAD)), + ok( !res && ((GetLastError() == ERROR_NOT_LOCKED) || (GetLastError() == 0xdeadbeef)), "returned %ld with %ld (expected '0' with: ERROR_NOT_LOCKED or " - "MAGIC_DEAD)\n", res, GetLastError()); + "0xdeadbeef)\n", + res, GetLastError() ); GlobalFree(gbl); /* invalid handles are caught in windows: */ - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); hsecond = GlobalFree(gbl); /* invalid handle: free memory twice */ ok( (hsecond == gbl) && (GetLastError() == ERROR_INVALID_HANDLE), "returned %p with 0x%08lx (expected %p with ERROR_INVALID_HANDLE)\n", hsecond, GetLastError(), gbl); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); hsecond = GlobalFree(LongToHandle(0xdeadbeef)); /* bogus handle */ ok( (hsecond == LongToHandle(0xdeadbeef)) && (GetLastError() == ERROR_INVALID_HANDLE), "returned %p with 0x%08lx (expected %p with ERROR_INVALID_HANDLE)\n", hsecond, GetLastError(), LongToHandle(0xdeadbeef)); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); hsecond = GlobalFree(LongToHandle(0xdeadbee0)); /* bogus pointer */ ok( (hsecond == LongToHandle(0xdeadbee0)) && ((GetLastError() == ERROR_INVALID_HANDLE) || broken(GetLastError() == ERROR_NOACCESS) /* wvista+ */), "returned %p with 0x%08lx (expected %p with ERROR_NOACCESS)\n", hsecond, GetLastError(), LongToHandle(0xdeadbee0)); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); flags = GlobalFlags(gbl); ok( (flags == GMEM_INVALID_HANDLE) && (GetLastError() == ERROR_INVALID_HANDLE), "returned 0x%04x with 0x%08lx (expected GMEM_INVALID_HANDLE with " "ERROR_INVALID_HANDLE)\n", flags, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); size = GlobalSize(gbl); ok( (size == 0) && (GetLastError() == ERROR_INVALID_HANDLE), "returned %Id with 0x%08lx (expected '0' with ERROR_INVALID_HANDLE)\n", size, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); mem = GlobalLock(gbl); ok( (mem == NULL) && (GetLastError() == ERROR_INVALID_HANDLE), "returned %p with 0x%08lx (expected NULL with ERROR_INVALID_HANDLE)\n", @@ -246,7 +245,7 @@ static void test_heap(void) Win9x and wine return FALSE with ERROR_INVALID_HANDLE, but on NT 3.51 and XPsp2, TRUE with ERROR_INVALID_HANDLE is returned. The similar Test for LocalUnlock() works on all Systems */ - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); res = GlobalUnlock(gbl); ok(GetLastError() == ERROR_INVALID_HANDLE, "returned %ld with %ld (expected ERROR_INVALID_HANDLE)\n", @@ -261,7 +260,7 @@ static void test_heap(void) /* invalid free */ if (sizeof(void *) != 8) /* crashes on 64-bit */ { - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); mem = GlobalFree(gbl); ok(mem == gbl || broken(mem == NULL) /* nt4 */, "Expected gbl, got %p\n", mem); if (mem == gbl) @@ -273,7 +272,7 @@ static void test_heap(void) /* GMEM_FIXED block expands in place only without flags */ for (size = 1; size <= max_size; size <<= 1) { gbl = GlobalAlloc(GMEM_FIXED, init_size); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); hsecond = GlobalReAlloc(gbl, size + init_size, 0); ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), "got %p with %lx (expected %p or NULL) @%Id\n", hsecond, GetLastError(), gbl, size); @@ -283,7 +282,7 @@ static void test_heap(void) /* GMEM_FIXED block can be relocated with GMEM_MOVEABLE */ for (size = 1; size <= max_size; size <<= 1) { gbl = GlobalAlloc(GMEM_FIXED, init_size); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); hsecond = GlobalReAlloc(gbl, size + init_size, GMEM_MOVEABLE); ok(hsecond != NULL, "got %p with %lx (expected non-NULL) @%Id\n", hsecond, GetLastError(), size); @@ -320,7 +319,7 @@ static void test_heap(void) /* GlobalSize on an invalid handle */ if (sizeof(void *) != 8) /* crashes on 64-bit Vista */ { - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); size = GlobalSize((HGLOBAL)0xc042); ok(size == 0, "Expected 0, got %Id\n", size); ok(GetLastError() == ERROR_INVALID_HANDLE || @@ -358,78 +357,79 @@ static void test_heap(void) /* LocalLock / LocalUnlock with a valid handle */ gbl = LocalAlloc(LMEM_MOVEABLE, 256); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); mem = LocalLock(gbl); /* #1 */ ok(mem != NULL, "returned %p with %ld (expected '!= NULL')\n", mem, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); flags = LocalFlags(gbl); ok( flags == 1, "returned 0x%04x with %ld (expected '0x0001')\n", flags, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); msecond = LocalLock(gbl); /* #2 */ ok( msecond == mem, "returned %p with %ld (expected '%p')\n", msecond, GetLastError(), mem); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); flags = LocalFlags(gbl); ok( flags == 2, "returned 0x%04x with %ld (expected '0x0002')\n", flags, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); res = LocalUnlock(gbl); /* #1 */ ok(res, "returned %ld with %ld (expected '!= 0')\n", res, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); flags = LocalFlags(gbl); ok( flags , "returned 0x%04x with %ld (expected '!= 0')\n", flags, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); res = LocalUnlock(gbl); /* #0 */ /* NT: ERROR_SUCCESS (documented on MSDN), 9x: untouched */ - ok(!res && ((GetLastError() == ERROR_SUCCESS) || (GetLastError() == MAGIC_DEAD)), + ok( !res && ((GetLastError() == ERROR_SUCCESS) || (GetLastError() == 0xdeadbeef)), "returned %ld with %ld (expected '0' with: ERROR_SUCCESS or " - "MAGIC_DEAD)\n", res, GetLastError()); - SetLastError(MAGIC_DEAD); + "0xdeadbeef)\n", + res, GetLastError() ); + SetLastError( 0xdeadbeef ); flags = LocalFlags(gbl); ok( !flags , "returned 0x%04x with %ld (expected '0')\n", flags, GetLastError()); /* Unlock an already unlocked Handle */ - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); res = LocalUnlock(gbl); /* NT: ERROR_NOT_LOCKED, 9x: untouched */ - ok( !res && - ((GetLastError() == ERROR_NOT_LOCKED) || (GetLastError() == MAGIC_DEAD)), + ok( !res && ((GetLastError() == ERROR_NOT_LOCKED) || (GetLastError() == 0xdeadbeef)), "returned %ld with %ld (expected '0' with: ERROR_NOT_LOCKED or " - "MAGIC_DEAD)\n", res, GetLastError()); + "0xdeadbeef)\n", + res, GetLastError() ); LocalFree(gbl); /* invalid handles are caught in windows: */ - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); hsecond = LocalFree(gbl); /* invalid handle: free memory twice */ ok( (hsecond == gbl) && (GetLastError() == ERROR_INVALID_HANDLE), "returned %p with 0x%08lx (expected %p with ERROR_INVALID_HANDLE)\n", hsecond, GetLastError(), gbl); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); flags = LocalFlags(gbl); ok( (flags == LMEM_INVALID_HANDLE) && (GetLastError() == ERROR_INVALID_HANDLE), "returned 0x%04x with 0x%08lx (expected LMEM_INVALID_HANDLE with " "ERROR_INVALID_HANDLE)\n", flags, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); size = LocalSize(gbl); ok( (size == 0) && (GetLastError() == ERROR_INVALID_HANDLE), "returned %Id with 0x%08lx (expected '0' with ERROR_INVALID_HANDLE)\n", size, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); mem = LocalLock(gbl); ok( (mem == NULL) && (GetLastError() == ERROR_INVALID_HANDLE), "returned %p with 0x%08lx (expected NULL with ERROR_INVALID_HANDLE)\n", mem, GetLastError()); /* This Test works the same on all Systems (GlobalUnlock() is different) */ - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); res = LocalUnlock(gbl); ok(!res && (GetLastError() == ERROR_INVALID_HANDLE), "returned %ld with %ld (expected '0' with ERROR_INVALID_HANDLE)\n", @@ -438,7 +438,7 @@ static void test_heap(void) /* LMEM_FIXED block expands in place only without flags */ for (size = 1; size <= max_size; size <<= 1) { gbl = LocalAlloc(LMEM_FIXED, init_size); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); hsecond = LocalReAlloc(gbl, size + init_size, 0); ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), "got %p with %lx (expected %p or NULL) @%Id\n", hsecond, GetLastError(), gbl, size); @@ -448,7 +448,7 @@ static void test_heap(void) /* LMEM_FIXED memory can be relocated with LMEM_MOVEABLE */ for (size = 1; size <= max_size; size <<= 1) { gbl = LocalAlloc(LMEM_FIXED, init_size); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); hsecond = LocalReAlloc(gbl, size + init_size, LMEM_MOVEABLE); ok(hsecond != NULL, "got %p with %lx (expected non-NULL) @%Id\n", hsecond, GetLastError(), size); @@ -476,13 +476,13 @@ static void test_heap(void) /* trying to lock empty memory should give an error */ gbl = GlobalAlloc(GMEM_MOVEABLE|GMEM_ZEROINIT,0); ok(gbl != NULL, "returned NULL\n"); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); mem = GlobalLock(gbl); /* NT: ERROR_DISCARDED, 9x: untouched */ - ok( (mem == NULL) && - ((GetLastError() == ERROR_DISCARDED) || (GetLastError() == MAGIC_DEAD)), + ok( (mem == NULL) && ((GetLastError() == ERROR_DISCARDED) || (GetLastError() == 0xdeadbeef)), "returned %p with 0x%lx/%ld (expected 'NULL' with: ERROR_DISCARDED or " - "MAGIC_DEAD)\n", mem, GetLastError(), GetLastError()); + "0xdeadbeef)\n", + mem, GetLastError(), GetLastError() ); GlobalFree(gbl); @@ -825,7 +825,7 @@ static void test_obsolete_flags(void) gbl = GlobalAlloc(test_global_flags[i].flags, 4); ok(gbl != NULL, "GlobalAlloc failed\n"); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); resultflags = pGlobalFlags(gbl); ok( resultflags == test_global_flags[i].globalflags || -- 2.35.1

2 6

[PATCH 1/2] riched20: Generalise ME_GetTextW to accept GT_* flags instead of bCRLF.
by Jinoh Kang 28 Mar '22

28 Mar '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/riched20/clipboard.c | 2 +- dlls/riched20/editor.c | 20 ++++++++++---------- dlls/riched20/editor.h | 2 +- dlls/riched20/richole.c | 6 +++--- dlls/riched20/txtsrv.c | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/clipboard.c b/dlls/riched20/clipboard.c index 3a8440ffcd6..51c00ca0dbb 100644 --- a/dlls/riched20/clipboard.c +++ b/dlls/riched20/clipboard.c @@ -354,7 +354,7 @@ static HGLOBAL get_unicode_text(ME_TextEditor *editor, const ME_Cursor *start, i ret = GlobalAlloc(GMEM_MOVEABLE, sizeof(WCHAR) * (nChars + pars + 1)); data = GlobalLock(ret); - ME_GetTextW(editor, data, nChars + pars, start, nChars, TRUE, FALSE); + ME_GetTextW(editor, data, nChars + pars, start, nChars, GT_USECRLF, FALSE); GlobalUnlock(ret); return ret; } diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a8cf3175591..3d2d49af047 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1750,7 +1750,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre set_selection_cursors(editor, newto, newto); ME_MoveCursorChars(editor, &linebreakCursor, -linebreakSize, FALSE); - ME_GetTextW(editor, lastchar, 2, &linebreakCursor, linebreakSize, FALSE, FALSE); + ME_GetTextW(editor, lastchar, 2, &linebreakCursor, linebreakSize, GT_DEFAULT, FALSE); if (lastchar[0] == '\r' && (lastchar[1] == '\n' || lastchar[1] == '\0')) { ME_InternalDeleteText(editor, &linebreakCursor, linebreakSize, FALSE); } @@ -2101,7 +2101,7 @@ static int ME_GetTextEx(ME_TextEditor *editor, GETTEXTEX *ex, LPARAM pText) if (ex->codepage == CP_UNICODE) { return ME_GetTextW(editor, (LPWSTR)pText, ex->cb / sizeof(WCHAR) - 1, - &start, nChars, ex->flags & GT_USECRLF, FALSE); + &start, nChars, ex->flags, FALSE); } else { @@ -2118,7 +2118,7 @@ static int ME_GetTextEx(ME_TextEditor *editor, GETTEXTEX *ex, LPARAM pText) buflen = min(crlfmul * nChars, ex->cb - 1); buffer = heap_alloc((buflen + 1) * sizeof(WCHAR)); - nChars = ME_GetTextW(editor, buffer, buflen, &start, nChars, ex->flags & GT_USECRLF, FALSE); + nChars = ME_GetTextW(editor, buffer, buflen, &start, nChars, ex->flags, FALSE); rc = WideCharToMultiByte(ex->codepage, 0, buffer, nChars + 1, (LPSTR)pText, ex->cb, ex->lpDefaultChar, ex->lpUsedDefChar); if (rc) rc--; /* do not count 0 terminator */ @@ -2132,7 +2132,7 @@ static int get_text_range( ME_TextEditor *editor, WCHAR *buffer, const ME_Cursor *start, int len ) { if (!buffer) return 0; - return ME_GetTextW( editor, buffer, INT_MAX, start, len, FALSE, FALSE ); + return ME_GetTextW( editor, buffer, INT_MAX, start, len, GT_DEFAULT, FALSE ); } int set_selection( ME_TextEditor *editor, int to, int from ) @@ -4235,14 +4235,14 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, * buflen: length of buffer in characters excluding the NULL terminator. * start: start of editor text to copy into buffer. * srcChars: Number of characters to use from the editor text. - * bCRLF: if true, replaces all end of lines with \r\n pairs. + * flags: GT_* flags * * returns the number of characters written excluding the NULL terminator. * * The written text is always NULL terminated. */ int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int buflen, - const ME_Cursor *start, int srcChars, BOOL bCRLF, + const ME_Cursor *start, int srcChars, DWORD flags, BOOL bEOP) { ME_Run *run, *next_run; @@ -4250,8 +4250,8 @@ int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int buflen, const WCHAR *str; int nLen; - /* bCRLF flag is only honored in 2.0 and up. 1.0 must always return text verbatim */ - if (editor->bEmulateVersion10) bCRLF = FALSE; + /* GT_USECRLF flag is only honored in 2.0 and up. 1.0 must always return text verbatim */ + if (editor->bEmulateVersion10) flags &= ~GT_USECRLF; run = start->run; next_run = run_next_all_paras( run ); @@ -4261,7 +4261,7 @@ int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int buflen, while (srcChars && buflen && next_run) { - if (bCRLF && run->nFlags & MERF_ENDPARA && ~run->nFlags & MERF_ENDCELL) + if (flags & GT_USECRLF && run->nFlags & MERF_ENDPARA && ~run->nFlags & MERF_ENDCELL) { if (buflen == 1) break; /* FIXME: native fails to reduce srcChars here for WM_GETTEXT or @@ -4450,7 +4450,7 @@ static BOOL ME_IsCandidateAnURL(ME_TextEditor *editor, const ME_Cursor *start, i WCHAR bufferW[MAX_PREFIX_LEN + 1]; unsigned int i; - ME_GetTextW(editor, bufferW, MAX_PREFIX_LEN, start, nChars, FALSE, FALSE); + ME_GetTextW(editor, bufferW, MAX_PREFIX_LEN, start, nChars, GT_DEFAULT, FALSE); for (i = 0; i < ARRAY_SIZE(prefixes); i++) { if (nChars < prefixes[i].length) continue; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e0df63ae92d..78be79659bc 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -276,7 +276,7 @@ void ME_DestroyEditor(ME_TextEditor *editor) DECLSPEC_HIDDEN; LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam, HRESULT* phresult ) DECLSPEC_HIDDEN; int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int buflen, - const ME_Cursor *start, int srcChars, BOOL bCRLF, BOOL bEOP) DECLSPEC_HIDDEN; + const ME_Cursor *start, int srcChars, DWORD flags, BOOL bEOP) DECLSPEC_HIDDEN; void ME_RTFCharAttrHook(struct _RTF_Info *info) DECLSPEC_HIDDEN; void ME_RTFParAttrHook(struct _RTF_Info *info) DECLSPEC_HIDDEN; void ME_RTFTblAttrHook(struct _RTF_Info *info) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index a23f4c82730..2bf2139e089 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1565,7 +1565,7 @@ static HRESULT WINAPI ITextRange_fnGetText(ITextRange *me, BSTR *str) return E_OUTOFMEMORY; bEOP = (!para_next( para_next( end.para )) && This->end > ME_GetTextLength(editor)); - ME_GetTextW(editor, *str, length, &start, length, FALSE, bEOP); + ME_GetTextW(editor, *str, length, &start, length, GT_DEFAULT, bEOP); return S_OK; } @@ -1619,7 +1619,7 @@ static HRESULT range_GetChar(ME_TextEditor *editor, ME_Cursor *cursor, LONG *pch { WCHAR wch[2]; - ME_GetTextW(editor, wch, 1, cursor, 1, FALSE, !para_next( para_next( cursor->para ) )); + ME_GetTextW(editor, wch, 1, cursor, 1, GT_DEFAULT, !para_next( para_next( cursor->para ) )); *pch = wch[0]; return S_OK; @@ -4653,7 +4653,7 @@ static HRESULT WINAPI ITextSelection_fnGetText(ITextSelection *me, BSTR *pbstr) return E_OUTOFMEMORY; bEOP = (!para_next( para_next( end->para ) ) && endOfs > ME_GetTextLength(This->services->editor)); - ME_GetTextW(This->services->editor, *pbstr, nChars, start, nChars, FALSE, bEOP); + ME_GetTextW(This->services->editor, *pbstr, nChars, start, nChars, GT_DEFAULT, bEOP); TRACE("%s\n", wine_dbgstr_w(*pbstr)); return S_OK; diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 809bb5ac3ae..d79276afc84 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -312,7 +312,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetText( ITextServices *iface, BS if (bstr == NULL) return E_OUTOFMEMORY; cursor_from_char_ofs( services->editor, 0, &start ); - ME_GetTextW( services->editor, bstr, length, &start, INT_MAX, FALSE, FALSE ); + ME_GetTextW( services->editor, bstr, length, &start, INT_MAX, GT_DEFAULT, FALSE ); *text = bstr; } else *text = NULL; -- 2.34.1

3 3

[PATCH] winealsa.drv: fix error with missed uint64_t
by Vitaly Lipatov 27 Mar '22

27 Mar '22

Signed-off-by: Vitaly Lipatov <lav(a)etersoft.ru> --- dlls/winealsa.drv/alsamidi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 476ea383a25..60065240251 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -32,6 +32,7 @@ #include <stdio.h> #include <pthread.h> #include <time.h> +#include <stdint.h> #include <alsa/asoundlib.h> #include "ntstatus.h" -- 2.33.0

1 0

[PATCH 1/2] ncrypt/tests: Test for NCryptVerifySignature.
by Santino Mazza 27 Mar '22

27 Mar '22

Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/ncrypt/tests/ncrypt.c | 131 +++++++++++++++++++++++++++++++++++++ include/ncrypt.h | 6 ++ 2 files changed, 137 insertions(+) diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index fc951fef80a..0967c5a1084 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -330,6 +330,136 @@ static void test_finalize_key(void) NCryptFreeObject(key); } +static UCHAR signature_pubkey_blob[] = { + 0x52, 0x53, 0x41, 0x31, 0x00, 0x08, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x01, 0xb4, 0xdb, 0x15, 0x24, 0xd0, 0x9a, 0xf4, 0xa3, 0x22, + 0x04, 0xbe, 0xbd, 0xda, 0xb4, 0x3b, 0x1f, 0x9d, 0x5f, 0x2a, 0x3e, 0xe7, + 0x42, 0xd7, 0xfa, 0xbc, 0xeb, 0x4e, 0xba, 0xcf, 0x92, 0x5d, 0x42, 0x0e, + 0xc0, 0xb0, 0x0f, 0xcc, 0xc3, 0x03, 0x69, 0x23, 0xb9, 0xc2, 0x07, 0xf7, + 0xf5, 0x19, 0xef, 0x9f, 0xb6, 0xd4, 0x6d, 0x35, 0x0d, 0x4c, 0x3a, 0x2b, + 0x37, 0x9d, 0x4d, 0x61, 0xce, 0x30, 0x33, 0x27, 0xe4, 0x9a, 0xca, 0x23, + 0xd6, 0x8f, 0x90, 0x33, 0xba, 0x5b, 0x16, 0xab, 0xa6, 0xda, 0x7a, 0x16, + 0x8e, 0xae, 0xf9, 0x6f, 0x29, 0xe2, 0xf1, 0x3d, 0xf0, 0xb6, 0xb4, 0x70, + 0xc0, 0x6d, 0xfc, 0x73, 0xf1, 0x3e, 0xdf, 0x02, 0x2c, 0xab, 0x24, 0x7a, + 0xd8, 0x8b, 0xcf, 0x63, 0xd0, 0x1a, 0x76, 0xb3, 0x11, 0x22, 0x5d, 0xf6, + 0x72, 0xb5, 0xd1, 0x6b, 0x83, 0xcd, 0x63, 0x5d, 0x3d, 0x03, 0xa2, 0xe0, + 0x36, 0xe8, 0x54, 0xe9, 0x6f, 0x04, 0xb3, 0x1a, 0xdf, 0x35, 0xd7, 0x01, + 0x57, 0xc7, 0x8d, 0x81, 0x4b, 0x39, 0x0c, 0x92, 0x71, 0x0b, 0x7d, 0x05, + 0xb4, 0xa4, 0xb4, 0xd4, 0x73, 0x55, 0x85, 0x19, 0xd5, 0x37, 0x7f, 0xcd, + 0x81, 0xd3, 0xf2, 0x62, 0x60, 0xfb, 0x6a, 0x1a, 0xda, 0xb4, 0x83, 0xfa, + 0x87, 0xac, 0x51, 0x3a, 0xb4, 0xc2, 0x03, 0xd3, 0xc6, 0xf0, 0x20, 0xca, + 0x10, 0xfd, 0xeb, 0xd8, 0x85, 0xb9, 0x74, 0x29, 0x83, 0xda, 0xa2, 0xee, + 0xcc, 0xf4, 0xf6, 0x18, 0xbc, 0x84, 0x92, 0xf5, 0xdb, 0x71, 0x14, 0xb9, + 0x62, 0x54, 0x4b, 0x64, 0x58, 0x95, 0xbc, 0x69, 0xc1, 0xcd, 0xac, 0x4b, + 0x7c, 0x1d, 0xc4, 0xe7, 0x6c, 0x44, 0x80, 0x5e, 0x88, 0x3a, 0x9c, 0xbd, + 0xd5, 0xa5, 0x2f, 0xa6, 0x73, 0x65, 0x48, 0x00, 0x5e, 0xfd, 0xe9, 0x4e, + 0xd7, 0x6c, 0x59, 0x47, 0x9b, 0xd1, 0x9d}; + +static UCHAR signature_pkcs1_sha256[] = { + 0xad, 0x3d, 0x2f, 0x31, 0x87, 0xba, 0x5b, 0xdc, 0x84, 0x95, 0x77, 0x68, + 0xf9, 0x9c, 0xd2, 0x38, 0x5b, 0x9f, 0x09, 0xc3, 0x8e, 0x9e, 0x8e, 0x8d, + 0x49, 0x56, 0x31, 0x09, 0x55, 0xc6, 0xd2, 0x1a, 0xb3, 0x00, 0x71, 0x60, + 0x84, 0x38, 0xf7, 0x1b, 0xc0, 0x43, 0x87, 0x31, 0x2d, 0xcc, 0xf2, 0x49, + 0x5f, 0x21, 0x8e, 0x77, 0x16, 0x57, 0xd7, 0xe9, 0x37, 0x3a, 0xe9, 0x91, + 0x5b, 0xc5, 0xea, 0x34, 0xb5, 0xf7, 0x4d, 0xaa, 0x65, 0x06, 0xef, 0xc6, + 0x14, 0xfa, 0xa7, 0x1e, 0xe5, 0xc6, 0x18, 0xfe, 0x06, 0x64, 0xe7, 0x6e, + 0x11, 0x83, 0x03, 0x4c, 0x91, 0x47, 0x60, 0x88, 0x12, 0x0c, 0x5e, 0xcc, + 0x3a, 0x93, 0x2f, 0x5c, 0x57, 0x5b, 0x66, 0x55, 0xa3, 0xe5, 0xf4, 0x3c, + 0x6f, 0xe9, 0xd8, 0xfd, 0xcc, 0x19, 0xc8, 0xf8, 0x13, 0x21, 0x3d, 0x29, + 0xee, 0x3c, 0xb2, 0xb4, 0x3f, 0x36, 0xd8, 0x82, 0xb1, 0xa9, 0x34, 0x89, + 0x2a, 0x7a, 0x42, 0x4a, 0x13, 0x0a, 0x0b, 0x50, 0xbe, 0x43, 0xa8, 0x2c, + 0x5a, 0x86, 0x65, 0x9f, 0xab, 0x86, 0x25, 0x44, 0xbb, 0x6b, 0xca, 0x04, + 0xca, 0xa5, 0xe7, 0x8e, 0xe2, 0x1d, 0xa8, 0x31, 0x90, 0x85, 0x6a, 0xd9, + 0xaf, 0x67, 0x8c, 0x1a, 0x13, 0xea, 0xa8, 0xfd, 0x3d, 0xc0, 0xb0, 0x3f, + 0xde, 0x6a, 0xc9, 0x65, 0xeb, 0x0a, 0xa6, 0x9b, 0xfc, 0x97, 0x0a, 0x72, + 0xaf, 0x04, 0xde, 0x3f, 0xcb, 0xac, 0x97, 0x6e, 0xfa, 0xbb, 0xd8, 0x6e, + 0xad, 0x0d, 0x10, 0xc6, 0x34, 0x18, 0x50, 0xb9, 0x12, 0xd4, 0x6b, 0xd5, + 0x3d, 0x9d, 0xfb, 0x31, 0x8d, 0x96, 0x39, 0x4d, 0x20, 0x91, 0x40, 0x06, + 0xca, 0xe6, 0x33, 0x73, 0x76, 0x2a, 0xe3, 0xab, 0xaf, 0x9d, 0xe9, 0x4e, + 0xb7, 0xe0, 0x4b, 0x45, 0x23, 0x07, 0xe9, 0xe2, 0xab, 0xdc, 0x9f, 0x5a, + 0xed, 0xbe, 0x76, 0x27}; + +static UCHAR invalid_signature[] = { + 0x4f, 0x8f, 0x88, 0x43, 0xed, 0x9e, 0xe8, 0x75, 0x0f, 0xe7, 0x32, 0xab, + 0x07, 0xcc, 0x6c, 0x8d, 0x56, 0xaa, 0x78, 0xf8, 0x43, 0x62, 0x4c, 0x0c, + 0xd5, 0x45, 0x2c, 0x3d, 0x28, 0x6f, 0xbc, 0x8b, 0xc1, 0x9f, 0xfe, 0x33, + 0x50, 0x4e, 0xd0, 0x6a, 0x83, 0xf8, 0x0e, 0xc8, 0x19, 0x59, 0xde, 0x25, + 0xf0, 0x7b, 0x4e, 0x3d, 0x9d, 0xc7, 0xbf, 0x72, 0xc3, 0x26, 0x48, 0xb6, + 0x19, 0x08, 0x3f, 0x05, 0xe8, 0x76, 0x2c, 0x11, 0x49, 0xfb, 0xa1, 0xc0, + 0xae, 0x6e, 0x30, 0xf8, 0x10, 0x61, 0x9f, 0x53, 0xc6, 0xeb, 0x7c, 0x7c, + 0x94, 0x5f, 0xca, 0xe5, 0x41, 0x40, 0xd6, 0x83, 0xa8, 0x4a, 0x45, 0x5c, + 0x77, 0x69, 0xf2, 0x89, 0xe9, 0xf7, 0x81, 0xa1, 0xae, 0x77, 0xf5, 0xec, + 0x41, 0x4b, 0xfc, 0x82, 0x7f, 0xee, 0x4e, 0x5b, 0x43, 0xdd, 0xcc, 0xe8, + 0x90, 0x12, 0xf0, 0x9a, 0xd0, 0xbc, 0x56, 0xd8, 0xeb, 0xd6, 0xfc, 0x80, + 0x48, 0x26, 0x8c, 0x63, 0x5c, 0x55, 0xd9, 0x6c, 0xb5, 0x10, 0xc1, 0xab, + 0x98, 0x3c, 0xe1, 0x25, 0x13, 0x4e, 0xc2, 0xdc, 0xd5, 0x4a, 0x25, 0xe5, + 0xc7, 0x9f, 0xfc, 0xf8, 0x53, 0x53, 0x12, 0x4c, 0xc1, 0x6c, 0x67, 0xa9, + 0x9e, 0x6e, 0x88, 0x2e, 0x93, 0xa3, 0x3f, 0x2d, 0xd3, 0xc5, 0xf4, 0x25, + 0xe2, 0x0f, 0x8f, 0xc0, 0x2b, 0x30, 0x94, 0x9d, 0xc0, 0x09, 0x31, 0x6c, + 0x19, 0xf7, 0x2e, 0x72, 0x6b, 0xb3, 0xf6, 0x78, 0x91, 0xca, 0x95, 0x28, + 0x9f, 0xf6, 0xd0, 0x77, 0x1c, 0x73, 0xff, 0x30, 0xe7, 0x02, 0xc3, 0xc8, + 0x0e, 0x95, 0x4f, 0x02, 0x96, 0xc5, 0xa9, 0x02, 0xb8, 0xaa, 0x97, 0xac, + 0x37, 0x47, 0xa9, 0x6d, 0xcb, 0x25, 0xb3, 0x8d, 0x20, 0xc5, 0xb6, 0x49, + 0xd8, 0xaf, 0x1a, 0xad, 0x62, 0x8c, 0x79, 0x60, 0x73, 0x8d, 0x46, 0x1e, + 0xe5, 0x23, 0x39, 0x44}; + +static UCHAR sha256_hash[] = { + 0x27, 0x51, 0x8b, 0xa9, 0x68, 0x30, 0x11, 0xf6, 0xb3, 0x96, 0x07, 0x2c, + 0x05, 0xf6, 0x65, 0x6d, 0x04, 0xf5, 0xfb, 0xc3, 0x78, 0x7c, 0xf9, 0x24, + 0x90, 0xec, 0x60, 0x6e, 0x50, 0x92, 0xe3, 0x26}; + +static void test_verify_signature(void) +{ + NCRYPT_PROV_HANDLE prov; + NCRYPT_KEY_HANDLE key; + BCRYPT_PKCS1_PADDING_INFO padinfo; + BCRYPT_PKCS1_PADDING_INFO invalid_padinfo; + SECURITY_STATUS ret; + padinfo.pszAlgId = BCRYPT_SHA256_ALGORITHM; + invalid_padinfo.pszAlgId = BCRYPT_MD5_ALGORITHM; + + + ret = NCryptOpenStorageProvider(&prov, NULL, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + ret = NCryptImportKey(prov, 0, BCRYPT_PUBLIC_KEY_BLOB, NULL, &key, signature_pubkey_blob, sizeof(signature_pubkey_blob), 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + ret = NCryptVerifySignature(key, &padinfo, sha256_hash, sizeof(sha256_hash), signature_pkcs1_sha256, sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + todo_wine + { + ret = NCryptVerifySignature(key, &padinfo, sha256_hash, sizeof(sha256_hash), invalid_signature, sizeof(invalid_signature), NCRYPT_PAD_PKCS1_FLAG); + ok(ret == NTE_BAD_SIGNATURE, "got %#lx\n", ret); + + ret = NCryptVerifySignature(key, NULL, sha256_hash, sizeof(sha256_hash), signature_pkcs1_sha256, sizeof(signature_pkcs1_sha256), 0); + ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); + + ret = NCryptVerifySignature(0, &padinfo, sha256_hash, sizeof(sha256_hash), signature_pkcs1_sha256, sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); + ok(ret == NTE_INVALID_HANDLE, "got %#lx\n", ret); + + ret = NCryptVerifySignature(key, &padinfo, NULL, sizeof(sha256_hash), signature_pkcs1_sha256, sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); + ok(ret == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER) || broken(ret == NTE_FAIL) /* win7 */, "got %#lx\n", ret); + + ret = NCryptVerifySignature(key, &padinfo, sha256_hash, 4, signature_pkcs1_sha256, sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); + ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); + + ret = NCryptVerifySignature(key, &padinfo, sha256_hash, sizeof(sha256_hash), NULL, sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); + ok(ret == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER) || broken(ret == NTE_FAIL) /* win7 */, "got %#lx\n", ret); + + ret = NCryptVerifySignature(key, &padinfo, sha256_hash, sizeof(sha256_hash), signature_pkcs1_sha256, 4, NCRYPT_PAD_PKCS1_FLAG); + ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); + + ret = NCryptVerifySignature(key, &invalid_padinfo, sha256_hash, sizeof(sha256_hash), signature_pkcs1_sha256, sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); + ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); + } + + NCryptFreeObject(key); + NCryptFreeObject(prov); +} + START_TEST(ncrypt) { test_key_import_rsa(); @@ -338,4 +468,5 @@ START_TEST(ncrypt) test_set_property(); test_create_persisted_key(); test_finalize_key(); + test_verify_signature(); } diff --git a/include/ncrypt.h b/include/ncrypt.h index f7372b30621..c09a1ec8676 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -71,6 +71,11 @@ typedef ULONG_PTR NCRYPT_SECRET_HANDLE; #define NCRYPT_SILENT_FLAG 0x00000040 +#define NCRYPT_NO_PADDING_FLAG 0x00000001 +#define NCRYPT_PAD_PKCS1_FLAG 0x00000002 +#define NCRYPT_PAD_OAEP_FLAG 0x00000004 +#define NCRYPT_PAD_PSS_FLAG 0x00000008 + #define NCRYPT_NAME_PROPERTY L"Name" #define NCRYPT_UNIQUE_NAME_PROPERTY L"Unique Name" #define NCRYPT_ALGORITHM_PROPERTY L"Algorithm Name" @@ -116,6 +121,7 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE, co SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE *, const WCHAR *, DWORD, DWORD); SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *, const WCHAR *, DWORD); SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE, const WCHAR *, BYTE *, DWORD, DWORD); +SECURITY_STATUS WINAPI NCryptVerifySignature(NCRYPT_KEY_HANDLE, void *, BYTE *, DWORD, BYTE *, DWORD, DWORD); #ifdef __cplusplus } -- 2.35.1

1 1

[PATCH] win32u: Return client menu name from NtUserUnregisterClass.
by Jacek Caban 27 Mar '22

27 Mar '22

Spotted by Esme Povirk. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/class.c | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH] setupapi: Add SetupQueryInfVersionInformationA/W stub.
by Gijs Vermeulen 27 Mar '22

27 Mar '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52616 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 06d423373b8e..7578fb25c9c7 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -492,8 +492,8 @@ @ stdcall SetupQueryInfFileInformationW(ptr long wstr long ptr) @ stdcall SetupQueryInfOriginalFileInformationA(ptr long ptr ptr) @ stdcall SetupQueryInfOriginalFileInformationW(ptr long ptr ptr) -@ stub SetupQueryInfVersionInformationA -@ stub SetupQueryInfVersionInformationW +@ stdcall SetupQueryInfVersionInformationA(ptr long str ptr long ptr) +@ stdcall SetupQueryInfVersionInformationW(ptr long wstr ptr long ptr) @ stub SetupQuerySourceListA @ stub SetupQuerySourceListW @ stdcall SetupQuerySpaceRequiredOnDriveA(long str ptr ptr long) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 4b1585c8df64..693030f4a21e 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -676,3 +676,21 @@ BOOL WINAPI SetupDiGetClassRegistryPropertyW(const GUID *class, DWORD prop, DWOR SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +BOOL WINAPI SetupQueryInfVersionInformationA(SP_INF_INFORMATION *info, UINT index, const char *key, char *buff, + DWORD size, DWORD *req_size) +{ + FIXME("info %p, index %d, key %s, buff %p, size %ld, req_size %p stub!\n", info, index, debugstr_a(key), buff, + size, req_size); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SetupQueryInfVersionInformationW(SP_INF_INFORMATION *info, UINT index, const WCHAR *key, WCHAR *buff, + DWORD size, DWORD *req_size) +{ + FIXME("info %p, index %d, key %s, buff %p, size %ld, req_size %p stub!\n", info, index, debugstr_w(key), buff, + size, req_size); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} -- 2.35.1

1 0

[PATCH] win32u: Return client menu name from NtUserUnregisterClass.
by Jacek Caban 27 Mar '22

27 Mar '22

Spotted by Esme Povirk. --- dlls/win32u/class.c | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH] oleacc/tests: Fix crash when current thread is not in foreground state.
by Piotr Caban 27 Mar '22

27 Mar '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52079 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/tests/main.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)

2 1

[PATCH 1/2] propsys: Implement VariantToStringWithDefault.
by Mohamad Al-Jaf 27 Mar '22

27 Mar '22

IE8 runtime calls upon this function and crashes without it. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- Kept the same naming convention as the other functions for consistency. --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 17 +++++++++++++++++ include/propvarutil.h | 6 ++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 15749952e95..7391cf4aaa2 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -194,7 +194,7 @@ @ stub VariantToStringAlloc @ stub VariantToStringArray @ stub VariantToStringArrayAlloc -@ stub VariantToStringWithDefault +@ stdcall VariantToStringWithDefault(ptr wstr) @ stub VariantToUInt16 @ stub VariantToUInt16Array @ stub VariantToUInt16ArrayAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 8f6c52f7aa7..18953cf381e 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -416,6 +416,23 @@ PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR p return pszDefault; } +/****************************************************************** + * VariantToStringWithDefault (PROPSYS.@) + */ +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault) +{ + TRACE("(%p, %s)\n", pvar, debugstr_w(pszDefault)); + + if (V_VT(pvar) == VT_BSTR) + { + if (V_BSTR(pvar) == NULL) + return L""; + + return V_BSTR(pvar); + } + + return pszDefault; +} /****************************************************************** * PropVariantChangeType (PROPSYS.@) diff --git a/include/propvarutil.h b/include/propvarutil.h index 36a670f56e6..c8c9bae31e0 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -93,6 +93,7 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); HRESULT WINAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb); HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret); @@ -201,6 +202,11 @@ inline BOOL IsPropVariantString(REFPROPVARIANT propvar) return (PropVariantToStringWithDefault(propvar, NULL) != NULL); } +inline BOOL IsVariantString(const VARIANT *var) +{ + return (VariantToStringWithDefault(var, NULL) != NULL); +} + #endif /* NO_PROPVAR_INLINES */ #endif /* __cplusplus */ -- 2.35.1

2 4

[PATCH 1/2] user32: Remove redundant #ifdef around #undef.
by Zebediah Figura 27 Mar '22

27 Mar '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/user32/class.c | 11 ----------- dlls/user32/win.c | 11 ----------- 2 files changed, 22 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index e2eb60d8bbf..cc342cf507b 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -765,21 +765,10 @@ BOOL16 WINAPI ClassNext16( CLASSENTRY *pClassEntry ) /* 64bit versions */ -#ifdef GetClassLongPtrA #undef GetClassLongPtrA -#endif - -#ifdef GetClassLongPtrW #undef GetClassLongPtrW -#endif - -#ifdef SetClassLongPtrA #undef SetClassLongPtrA -#endif - -#ifdef SetClassLongPtrW #undef SetClassLongPtrW -#endif /*********************************************************************** * GetClassLongPtrA (USER32.@) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index b49afec9bd1..619bbba1dfe 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1831,21 +1831,10 @@ BOOL WINAPI SetProcessDefaultLayout( DWORD layout ) /* 64bit versions */ -#ifdef GetWindowLongPtrW #undef GetWindowLongPtrW -#endif - -#ifdef GetWindowLongPtrA #undef GetWindowLongPtrA -#endif - -#ifdef SetWindowLongPtrW #undef SetWindowLongPtrW -#endif - -#ifdef SetWindowLongPtrA #undef SetWindowLongPtrA -#endif /***************************************************************************** * GetWindowLongPtrW (USER32.@) -- 2.34.1

2 3

[PATCH] amstream: Use CRT memory allocators.
by Zebediah Figura 27 Mar '22

27 Mar '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/amstream/amstream_private.h | 1 - dlls/amstream/audiodata.c | 22 +++++++++------------- dlls/amstream/audiostream.c | 24 +++++++++++------------- dlls/amstream/ddrawstream.c | 16 +++++++--------- dlls/amstream/filter.c | 24 ++++++++++++------------ dlls/amstream/main.c | 6 +++--- dlls/amstream/multimedia.c | 6 +++--- 7 files changed, 45 insertions(+), 54 deletions(-) diff --git a/dlls/amstream/amstream_private.h b/dlls/amstream/amstream_private.h index e71563cb115..999081db754 100644 --- a/dlls/amstream/amstream_private.h +++ b/dlls/amstream/amstream_private.h @@ -32,7 +32,6 @@ #include "mmstream.h" #include "austream.h" #include "amstream.h" -#include "wine/heap.h" HRESULT multimedia_stream_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN; HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; diff --git a/dlls/amstream/audiodata.c b/dlls/amstream/audiodata.c index 1f8c0c44064..752651b1afe 100644 --- a/dlls/amstream/audiodata.c +++ b/dlls/amstream/audiodata.c @@ -71,19 +71,16 @@ static ULONG WINAPI IAudioDataImpl_AddRef(IAudioData* iface) static ULONG WINAPI IAudioDataImpl_Release(IAudioData* iface) { - AMAudioDataImpl *This = impl_from_IAudioData(iface); - ULONG ref = InterlockedDecrement(&This->ref); + AMAudioDataImpl *audiodata = impl_from_IAudioData(iface); + ULONG ref = InterlockedDecrement(&audiodata->ref); - TRACE("(%p)->(): new ref = %lu\n", iface, This->ref); + TRACE("%p decreasing refcount to %lu.\n", audiodata, ref); if (!ref) { - if (This->data_owned) - { - CoTaskMemFree(This->data); - } - - HeapFree(GetProcessHeap(), 0, This); + if (audiodata->data_owned) + free(audiodata->data); + free(audiodata); } return ref; @@ -103,7 +100,7 @@ static HRESULT WINAPI IAudioDataImpl_SetBuffer(IAudioData* iface, DWORD size, BY if (This->data_owned) { - CoTaskMemFree(This->data); + free(This->data); This->data_owned = FALSE; } @@ -112,7 +109,7 @@ static HRESULT WINAPI IAudioDataImpl_SetBuffer(IAudioData* iface, DWORD size, BY if (!This->data) { - This->data = CoTaskMemAlloc(This->size); + This->data = malloc(This->size); This->data_owned = TRUE; if (!This->data) { @@ -228,8 +225,7 @@ HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) if (pUnkOuter) return CLASS_E_NOAGGREGATION; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(AMAudioDataImpl)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IAudioData_iface.lpVtbl = &AudioData_Vtbl; diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index a043390f5b1..d76156cb682 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -202,7 +202,7 @@ static ULONG WINAPI audio_sample_Release(IAudioStreamSample *iface) IAMMediaStream_Release(&sample->parent->IAMMediaStream_iface); IAudioData_Release(sample->audio_data); CloseHandle(sample->update_event); - HeapFree(GetProcessHeap(), 0, sample); + free(sample); } return refcount; } @@ -383,8 +383,7 @@ static HRESULT audiostreamsample_create(struct audio_stream *parent, IAudioData TRACE("(%p)\n", audio_stream_sample); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IAudioStreamSample_iface.lpVtbl = &AudioStreamSample_Vtbl; @@ -456,15 +455,15 @@ static ULONG WINAPI audio_IAMMediaStream_AddRef(IAMMediaStream *iface) static ULONG WINAPI audio_IAMMediaStream_Release(IAMMediaStream *iface) { - struct audio_stream *This = impl_from_IAMMediaStream(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct audio_stream *stream = impl_from_IAMMediaStream(iface); + ULONG ref = InterlockedDecrement(&stream->ref); - TRACE("(%p/%p)->(): new ref = %lu\n", iface, This, ref); + TRACE("%p decreasing refcount to %lu.\n", stream, ref); if (!ref) { - DeleteCriticalSection(&This->cs); - HeapFree(GetProcessHeap(), 0, This); + DeleteCriticalSection(&stream->cs); + free(stream); } return ref; @@ -830,7 +829,7 @@ static ULONG WINAPI enum_media_types_Release(IEnumMediaTypes *iface) ULONG refcount = InterlockedDecrement(&enum_media_types->refcount); TRACE("%p decreasing refcount to %lu.\n", enum_media_types, refcount); if (!refcount) - heap_free(enum_media_types); + free(enum_media_types); return refcount; } @@ -904,7 +903,7 @@ static HRESULT WINAPI enum_media_types_Clone(IEnumMediaTypes *iface, IEnumMediaT TRACE("iface %p, out %p.\n", iface, out); - if (!(object = heap_alloc(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IEnumMediaTypes_iface.lpVtbl = &enum_media_types_vtbl; @@ -1121,7 +1120,7 @@ static HRESULT WINAPI audio_sink_EnumMediaTypes(IPin *iface, IEnumMediaTypes **e if (!enum_media_types) return E_POINTER; - if (!(object = heap_alloc(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IEnumMediaTypes_iface.lpVtbl = &enum_media_types_vtbl; @@ -1394,8 +1393,7 @@ HRESULT audio_stream_create(IUnknown *outer, void **out) if (outer) return CLASS_E_NOAGGREGATION; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IAMMediaStream_iface.lpVtbl = &audio_IAMMediaStream_vtbl; diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 7b0c92c5f61..e31e0d106d3 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -229,7 +229,7 @@ static ULONG WINAPI ddraw_IAMMediaStream_Release(IAMMediaStream *iface) DeleteCriticalSection(&stream->cs); if (stream->ddraw) IDirectDraw_Release(stream->ddraw); - HeapFree(GetProcessHeap(), 0, stream); + free(stream); } return ref; @@ -815,7 +815,7 @@ static ULONG WINAPI enum_media_types_Release(IEnumMediaTypes *iface) ULONG refcount = InterlockedDecrement(&enum_media_types->refcount); TRACE("%p decreasing refcount to %lu.\n", enum_media_types, refcount); if (!refcount) - heap_free(enum_media_types); + free(enum_media_types); return refcount; } @@ -873,7 +873,7 @@ static HRESULT WINAPI enum_media_types_Clone(IEnumMediaTypes *iface, IEnumMediaT TRACE("iface %p, out %p.\n", iface, out); - if (!(object = heap_alloc(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IEnumMediaTypes_iface.lpVtbl = &enum_media_types_vtbl; @@ -1148,7 +1148,7 @@ static HRESULT WINAPI ddraw_sink_EnumMediaTypes(IPin *iface, IEnumMediaTypes **e if (!enum_media_types) return E_POINTER; - if (!(object = heap_alloc(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IEnumMediaTypes_iface.lpVtbl = &enum_media_types_vtbl; @@ -1460,8 +1460,7 @@ HRESULT ddraw_stream_create(IUnknown *outer, void **out) if (outer) return CLASS_E_NOAGGREGATION; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IAMMediaStream_iface.lpVtbl = &ddraw_IAMMediaStream_vtbl; @@ -1539,7 +1538,7 @@ static ULONG WINAPI ddraw_sample_Release(IDirectDrawStreamSample *iface) if (sample->surface) IDirectDrawSurface_Release(sample->surface); - HeapFree(GetProcessHeap(), 0, sample); + free(sample); } return ref; @@ -1736,8 +1735,7 @@ static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDraw TRACE("(%p)\n", ddraw_stream_sample); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IDirectDrawStreamSample_iface.lpVtbl = &DirectDrawStreamSample_Vtbl; diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index f5a855d6a96..c1c97630bb9 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -76,8 +76,8 @@ static ULONG WINAPI enum_pins_Release(IEnumPins *iface) { for (i = 0; i < enum_pins->count; ++i) IPin_Release(enum_pins->pins[i]); - heap_free(enum_pins->pins); - heap_free(enum_pins); + free(enum_pins->pins); + free(enum_pins); } return refcount; } @@ -131,16 +131,16 @@ static HRESULT WINAPI enum_pins_Clone(IEnumPins *iface, IEnumPins **out) TRACE("iface %p, out %p.\n", iface, out); - if (!(object = heap_alloc(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IEnumPins_iface.lpVtbl = &enum_pins_vtbl; object->refcount = 1; object->count = enum_pins->count; object->index = enum_pins->index; - if (!(object->pins = heap_alloc(enum_pins->count * sizeof(*object->pins)))) + if (!(object->pins = malloc(enum_pins->count * sizeof(*object->pins)))) { - heap_free(object); + free(object); return E_OUTOFMEMORY; } for (i = 0; i < enum_pins->count; ++i) @@ -251,11 +251,11 @@ static ULONG WINAPI filter_Release(IMediaStreamFilter *iface) IAMMediaStream_JoinFilter(filter->streams[i], NULL); IAMMediaStream_Release(filter->streams[i]); } - heap_free(filter->streams); + free(filter->streams); if (filter->clock) IReferenceClock_Release(filter->clock); DeleteCriticalSection(&filter->cs); - heap_free(filter); + free(filter); } return refcount; @@ -424,7 +424,7 @@ static HRESULT WINAPI filter_EnumPins(IMediaStreamFilter *iface, IEnumPins **enu if (!enum_pins) return E_POINTER; - if (!(object = heap_alloc(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; EnterCriticalSection(&filter->cs); @@ -433,9 +433,9 @@ static HRESULT WINAPI filter_EnumPins(IMediaStreamFilter *iface, IEnumPins **enu object->refcount = 1; object->count = filter->nb_streams; object->index = 0; - if (!(object->pins = heap_alloc(filter->nb_streams * sizeof(*object->pins)))) + if (!(object->pins = malloc(filter->nb_streams * sizeof(*object->pins)))) { - heap_free(object); + free(object); LeaveCriticalSection(&filter->cs); return E_OUTOFMEMORY; } @@ -543,7 +543,7 @@ static HRESULT WINAPI filter_AddMediaStream(IMediaStreamFilter *iface, IAMMediaS TRACE("(%p)->(%p)\n", iface, pAMMediaStream); - streams = CoTaskMemRealloc(This->streams, (This->nb_streams + 1) * sizeof(IAMMediaStream*)); + streams = realloc(This->streams, (This->nb_streams + 1) * sizeof(*streams)); if (!streams) return E_OUTOFMEMORY; This->streams = streams; @@ -1092,7 +1092,7 @@ HRESULT filter_create(IUnknown *outer, void **out) if (outer) return CLASS_E_NOAGGREGATION; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMediaStreamFilter_iface.lpVtbl = &filter_vtbl; diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c index 3d091135257..a78377d0b7e 100644 --- a/dlls/amstream/main.c +++ b/dlls/amstream/main.c @@ -93,7 +93,7 @@ static ULONG WINAPI AMCF_Release(IClassFactory *iface) ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) - HeapFree(GetProcessHeap(), 0, This); + free(This); return ref; } @@ -173,8 +173,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return CLASS_E_CLASSNOTAVAILABLE; } - factory = HeapAlloc(GetProcessHeap(), 0, sizeof(*factory)); - if (factory == NULL) return E_OUTOFMEMORY; + if (!(factory = calloc(1, sizeof(*factory)))) + return E_OUTOFMEMORY; factory->IClassFactory_iface.lpVtbl = &DSCF_Vtbl; factory->ref = 1; diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 70c0210840f..dc855901c77 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -100,7 +100,7 @@ static ULONG WINAPI multimedia_stream_Release(IAMMultiMediaStream *iface) IMediaControl_Release(This->media_control); if (This->graph) IGraphBuilder_Release(This->graph); - HeapFree(GetProcessHeap(), 0, This); + free(This); } return ref; @@ -562,7 +562,7 @@ HRESULT multimedia_stream_create(IUnknown *outer, void **out) if (outer) return CLASS_E_NOAGGREGATION; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IAMMultiMediaStream_iface.lpVtbl = &multimedia_stream_vtbl; @@ -572,7 +572,7 @@ HRESULT multimedia_stream_create(IUnknown *outer, void **out) CLSCTX_INPROC_SERVER, &IID_IMediaStreamFilter, (void **)&object->filter))) { ERR("Failed to create stream filter, hr %#lx.\n", hr); - heap_free(object); + free(object); return hr; } -- 2.34.1

1 0

[PATCH] shell32: Use COM wrappers for IShellPropSheetExt and IShellExtInit.
by Zebediah Figura 27 Mar '22

27 Mar '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/shell32/shellord.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 55b02d4188f..66e5caf08da 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1674,7 +1674,7 @@ UINT WINAPI SHAddFromPropSheetExtArray(HPSXA hpsxa, LPFNADDPROPSHEETPAGE lpfnAdd /* Call the AddPage method of all registered IShellPropSheetExt interfaces */ for (i = 0; i != psxa->uiCount; i++) { - psxa->pspsx[i]->lpVtbl->AddPages(psxa->pspsx[i], PsxaCall, (LPARAM)&Call); + IShellPropSheetExt_AddPages(psxa->pspsx[i], PsxaCall, (LPARAM)&Call); } return Call.uiCount; @@ -1764,21 +1764,21 @@ HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY hKey, LPCWSTR pszSubKey, UINT max_ Then call IShellExtInit's Initialize method. */ if (SUCCEEDED(CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER/* | CLSCTX_NO_CODE_DOWNLOAD */, &IID_IShellPropSheetExt, (LPVOID *)&pspsx))) { - if (SUCCEEDED(pspsx->lpVtbl->QueryInterface(pspsx, &IID_IShellExtInit, (PVOID *)&psxi))) + if (SUCCEEDED(IShellPropSheetExt_QueryInterface(pspsx, &IID_IShellExtInit, (PVOID *)&psxi))) { - if (SUCCEEDED(psxi->lpVtbl->Initialize(psxi, NULL, pDataObj, hKey))) + if (SUCCEEDED(IShellExtInit_Initialize(psxi, NULL, pDataObj, hKey))) { /* Add the IShellPropSheetExt instance to the array */ psxa->pspsx[psxa->uiCount++] = pspsx; } else { - psxi->lpVtbl->Release(psxi); - pspsx->lpVtbl->Release(pspsx); + IShellExtInit_Release(psxi); + IShellPropSheetExt_Release(pspsx); } } else - pspsx->lpVtbl->Release(pspsx); + IShellPropSheetExt_Release(pspsx); } } @@ -1821,7 +1821,7 @@ UINT WINAPI SHReplaceFromPropSheetExtArray(HPSXA hpsxa, UINT uPageID, LPFNADDPRO for (i = 0; i != psxa->uiCount; i++) { Call.bCalled = FALSE; - psxa->pspsx[i]->lpVtbl->ReplacePage(psxa->pspsx[i], uPageID, PsxaCall, (LPARAM)&Call); + IShellPropSheetExt_ReplacePage(psxa->pspsx[i], uPageID, PsxaCall, (LPARAM)&Call); } return Call.uiCount; @@ -1844,7 +1844,7 @@ void WINAPI SHDestroyPropSheetExtArray(HPSXA hpsxa) { for (i = 0; i != psxa->uiCount; i++) { - psxa->pspsx[i]->lpVtbl->Release(psxa->pspsx[i]); + IShellPropSheetExt_Release(psxa->pspsx[i]); } LocalFree(psxa); -- 2.34.1

1 0

[PATCH] winealsa: Add missing includes.
by Huw Davies 26 Mar '22

26 Mar '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52728 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsamidi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 476ea383a25..4f3f5538891 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -30,6 +30,8 @@ #include <stdarg.h> #include <stdio.h> +#include <stdint.h> +#include <unistd.h> #include <pthread.h> #include <time.h> #include <alsa/asoundlib.h> -- 2.25.1

1 0

[PATCH resend 7/7] comctl32/tests: remove now unused TODO_COUNT in static control tests
by Rafał Harabień 26 Mar '22

26 Mar '22

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/comctl32/tests/static.c | 42 +++++++++++++++--------------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index a07dbcc26bf..473f126c04a 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -32,8 +32,6 @@ #include "v6util.h" -#define TODO_COUNT 1 - #define CTRL_ID 1995 static HWND hMainWnd; @@ -79,7 +77,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara return DefWindowProcA(hwnd, msg, wparam, lparam); } -static void test_updates(int style, int flags) +static void test_updates(int style) { HWND hStatic = create_static(style); RECT r1 = {5, 5, 30, 30}, rcClient; @@ -130,13 +128,7 @@ static void test_updates(int style, int flags) else exp = 2; /* SS_ETCHEDHORZ/SS_ETCHEDVERT have empty client rect so WM_CTLCOLORSTATIC is sent only when parent window is invalidated */ - if (flags & TODO_COUNT) - todo_wine - ok(g_nReceivedColorStatic == exp, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); - else if ((style & SS_TYPEMASK) == SS_ICON || (style & SS_TYPEMASK) == SS_BITMAP) - ok(g_nReceivedColorStatic == exp, "Unexpected %u got %u\n", exp, g_nReceivedColorStatic); - else - ok(g_nReceivedColorStatic == exp, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + ok(g_nReceivedColorStatic == exp, "expected %u, got %u\n", exp, g_nReceivedColorStatic); DestroyWindow(hStatic); } @@ -424,21 +416,21 @@ START_TEST(static) GetModuleHandleA(NULL), NULL); ShowWindow(hMainWnd, SW_SHOW); - test_updates(0, 0); - test_updates(SS_ICON, 0); - test_updates(SS_BLACKRECT, 0); - test_updates(SS_WHITERECT, 0); - test_updates(SS_BLACKFRAME, 0); - test_updates(SS_WHITEFRAME, 0); - test_updates(SS_USERITEM, 0); - test_updates(SS_SIMPLE, 0); - test_updates(SS_OWNERDRAW, 0); - test_updates(SS_BITMAP, 0); - test_updates(SS_BITMAP | SS_CENTERIMAGE, 0); - test_updates(SS_ETCHEDHORZ, 0); - test_updates(SS_ETCHEDVERT, 0); - test_updates(SS_ETCHEDFRAME, 0); - test_updates(SS_SUNKEN, 0); + test_updates(0); + test_updates(SS_ICON); + test_updates(SS_BLACKRECT); + test_updates(SS_WHITERECT); + test_updates(SS_BLACKFRAME); + test_updates(SS_WHITEFRAME); + test_updates(SS_USERITEM); + test_updates(SS_SIMPLE); + test_updates(SS_OWNERDRAW); + test_updates(SS_BITMAP); + test_updates(SS_BITMAP | SS_CENTERIMAGE); + test_updates(SS_ETCHEDHORZ); + test_updates(SS_ETCHEDVERT); + test_updates(SS_ETCHEDFRAME); + test_updates(SS_SUNKEN); test_set_text(); test_set_image(); test_STM_SETIMAGE(); -- 2.25.1

2 1

[PATCH resend 6/7] comctl32/tests: fix invalidation in static control tests
by Rafał Harabień 26 Mar '22

26 Mar '22

Rectangle used for invalidation was outside of windows rect of static controls with SS_ETCHEDHORZ/SS_ETCHEDVERT style because they resize after creation. Improve test by changing the invalidated rect and add more details in comment about SS_ETCHEDHORZ/SS_ETCHEDVERT styles. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/comctl32/tests/static.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 324301212dc..a07dbcc26bf 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -82,7 +82,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara static void test_updates(int style, int flags) { HWND hStatic = create_static(style); - RECT r1 = {20, 20, 30, 30}, rcClient; + RECT r1 = {5, 5, 30, 30}, rcClient; int exp; LONG exstyle; @@ -128,7 +128,7 @@ static void test_updates(int style, int flags) if (style != SS_ETCHEDHORZ && style != SS_ETCHEDVERT) exp = 4; else - exp = 1; /* SS_ETCHED* seems to send WM_CTLCOLORSTATIC only sometimes */ + exp = 2; /* SS_ETCHEDHORZ/SS_ETCHEDVERT have empty client rect so WM_CTLCOLORSTATIC is sent only when parent window is invalidated */ if (flags & TODO_COUNT) todo_wine -- 2.25.1

2 1

[PATCH resend 5/7] comctl32: send WM_CTLCOLORSTATIC for all static control types
by Rafał Harabień 26 Mar '22

26 Mar '22

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/comctl32/static.c | 134 ++++++++++++++++------------------- dlls/comctl32/tests/static.c | 16 ++--- 2 files changed, 69 insertions(+), 81 deletions(-) diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index 1b5d1ade291..2fb914b3fb2 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -44,13 +44,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(static); -static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintBitmapfn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintEnhMetafn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ); +static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintBitmapfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintEnhMetafn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); struct static_extra_info { @@ -64,7 +64,7 @@ struct static_extra_info BOOL image_has_alpha; }; -typedef void (*pfPaint)( HWND hwnd, HDC hdc, DWORD style ); +typedef void (*pfPaint)( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); static const pfPaint staticPaintFunc[SS_TYPEMASK+1] = { @@ -360,6 +360,22 @@ static HICON STATIC_LoadIconW( HINSTANCE hInstance, LPCWSTR name, DWORD style ) return hicon; } +static HBRUSH STATIC_SendWmCtlColorStatic(HWND hwnd, HDC hdc) +{ + HBRUSH hBrush; + HWND parent = GetParent(hwnd); + + if (!parent) parent = hwnd; + hBrush = (HBRUSH) SendMessageW( parent, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); + if (!hBrush) /* did the app forget to call DefWindowProc ? */ + { + /* FIXME: DefWindowProc should return different colors if a + manifest is present */ + hBrush = (HBRUSH)DefWindowProcW( parent, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd); + } + return hBrush; +} + /*********************************************************************** * STATIC_TryPaintFcn * @@ -367,40 +383,26 @@ static HICON STATIC_LoadIconW( HINSTANCE hInstance, LPCWSTR name, DWORD style ) */ static VOID STATIC_TryPaintFcn(HWND hwnd, LONG full_style) { - LONG style = full_style & SS_TYPEMASK; - RECT rc; - - GetClientRect( hwnd, &rc ); - if (!IsRectEmpty(&rc) && IsWindowVisible(hwnd) && staticPaintFunc[style]) + if (IsWindowVisible(hwnd)) { + RECT rc; HDC hdc; HRGN hrgn; + HBRUSH hbrush; + LONG style = full_style & SS_TYPEMASK; + GetClientRect( hwnd, &rc ); hdc = GetDC( hwnd ); hrgn = set_control_clipping( hdc, &rc ); - (staticPaintFunc[style])( hwnd, hdc, full_style ); + hbrush = STATIC_SendWmCtlColorStatic( hwnd, hdc ); + if (staticPaintFunc[style]) + (staticPaintFunc[style])( hwnd, hdc, hbrush, full_style ); SelectClipRgn( hdc, hrgn ); if (hrgn) DeleteObject( hrgn ); ReleaseDC( hwnd, hdc ); } } -static HBRUSH STATIC_SendWmCtlColorStatic(HWND hwnd, HDC hdc) -{ - HBRUSH hBrush; - HWND parent = GetParent(hwnd); - - if (!parent) parent = hwnd; - hBrush = (HBRUSH) SendMessageW( parent, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); - if (!hBrush) /* did the app forget to call DefWindowProc ? */ - { - /* FIXME: DefWindowProc should return different colors if a - manifest is present */ - hBrush = (HBRUSH)DefWindowProcW( parent, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd); - } - return hBrush; -} - /*********************************************************************** * hasTextStyle * @@ -481,14 +483,16 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, PAINTSTRUCT ps; RECT rect; HDC hdc = wParam ? (HDC)wParam : BeginPaint(hwnd, &ps); + HRGN hrgn; + HBRUSH hbrush; + GetClientRect( hwnd, &rect ); + hrgn = set_control_clipping( hdc, &rect ); + hbrush = STATIC_SendWmCtlColorStatic( hwnd, hdc ); if (staticPaintFunc[style]) - { - HRGN hrgn = set_control_clipping( hdc, &rect ); - (staticPaintFunc[style])( hwnd, hdc, full_style ); - SelectClipRgn( hdc, hrgn ); - if (hrgn) DeleteObject( hrgn ); - } + (staticPaintFunc[style])( hwnd, hdc, hbrush, full_style ); + SelectClipRgn( hdc, hrgn ); + if (hrgn) DeleteObject( hrgn ); if (!wParam) EndPaint(hwnd, &ps); } break; @@ -642,7 +646,7 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, return lResult; } -static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { DRAWITEMSTRUCT dis; HFONT font, oldFont = NULL; @@ -660,15 +664,13 @@ static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style ) font = STATIC_GetFont( hwnd ); if (font) oldFont = SelectObject( hdc, font ); - SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); SendMessageW( GetParent(hwnd), WM_DRAWITEM, id, (LPARAM)&dis ); if (font) SelectObject( hdc, oldFont ); } -static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { RECT rc; - HBRUSH hBrush; HFONT hFont, hOldFont = NULL; UINT format; INT len, buf_size; @@ -725,13 +727,9 @@ static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style ) if ((hFont = STATIC_GetFont( hwnd ))) hOldFont = SelectObject( hdc, hFont ); - /* SS_SIMPLE controls: WM_CTLCOLORSTATIC is sent, but the returned - brush is not used */ - hBrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); - if ((style & SS_TYPEMASK) != SS_SIMPLE) { - FillRect( hdc, &rc, hBrush ); + FillRect( hdc, &rc, hbrush ); if (!IsWindowEnabled(hwnd)) SetTextColor(hdc, GetSysColor(COLOR_GRAYTEXT)); } @@ -768,56 +766,52 @@ no_TextOut: SelectObject( hdc, hOldFont ); } -static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { RECT rc; - HBRUSH hBrush; GetClientRect( hwnd, &rc); - /* FIXME: send WM_CTLCOLORSTATIC */ switch (style & SS_TYPEMASK) { case SS_BLACKRECT: - hBrush = CreateSolidBrush(comctl32_color.clr3dDkShadow); - FillRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dDkShadow); + FillRect( hdc, &rc, hbrush ); break; case SS_GRAYRECT: - hBrush = CreateSolidBrush(comctl32_color.clr3dShadow); - FillRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dShadow); + FillRect( hdc, &rc, hbrush ); break; case SS_WHITERECT: - hBrush = CreateSolidBrush(comctl32_color.clr3dHilight); - FillRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dHilight); + FillRect( hdc, &rc, hbrush ); break; case SS_BLACKFRAME: - hBrush = CreateSolidBrush(comctl32_color.clr3dDkShadow); - FrameRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dDkShadow); + FrameRect( hdc, &rc, hbrush ); break; case SS_GRAYFRAME: - hBrush = CreateSolidBrush(comctl32_color.clr3dShadow); - FrameRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dShadow); + FrameRect( hdc, &rc, hbrush ); break; case SS_WHITEFRAME: - hBrush = CreateSolidBrush(comctl32_color.clr3dHilight); - FrameRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dHilight); + FrameRect( hdc, &rc, hbrush ); break; default: return; } - DeleteObject( hBrush ); + DeleteObject( hbrush ); } -static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { RECT rc, iconRect; - HBRUSH hbrush; HICON hIcon; SIZE size; GetClientRect( hwnd, &rc ); - hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); hIcon = STATIC_GetImage( hwnd, IMAGE_ICON, style ); if (!hIcon || !get_icon_size( hIcon, &size )) { @@ -840,13 +834,10 @@ static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ) } } -static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { HDC hMemDC; HBITMAP hBitmap, oldbitmap; - HBRUSH hbrush; - - hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); if ((hBitmap = STATIC_GetImage( hwnd, IMAGE_BITMAP, style )) && (GetObjectType(hBitmap) == OBJ_BITMAP) @@ -891,14 +882,12 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) } } -static void STATIC_PaintEnhMetafn(HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintEnhMetafn(HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { HENHMETAFILE hEnhMetaFile; RECT rc; - HBRUSH hbrush; GetClientRect(hwnd, &rc); - hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); FillRect(hdc, &rc, hbrush); if ((hEnhMetaFile = STATIC_GetImage( hwnd, IMAGE_ENHMETAFILE, style ))) { @@ -909,11 +898,10 @@ static void STATIC_PaintEnhMetafn(HWND hwnd, HDC hdc, DWORD style ) } } -static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { RECT rc; - /* FIXME: sometimes (not always) sends WM_CTLCOLORSTATIC */ GetClientRect( hwnd, &rc ); DrawEdge(hdc, &rc, EDGE_ETCHED, BF_RECT); } diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 7206e19c070..324301212dc 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -426,18 +426,18 @@ START_TEST(static) test_updates(0, 0); test_updates(SS_ICON, 0); - test_updates(SS_BLACKRECT, TODO_COUNT); - test_updates(SS_WHITERECT, TODO_COUNT); - test_updates(SS_BLACKFRAME, TODO_COUNT); - test_updates(SS_WHITEFRAME, TODO_COUNT); - test_updates(SS_USERITEM, TODO_COUNT); + test_updates(SS_BLACKRECT, 0); + test_updates(SS_WHITERECT, 0); + test_updates(SS_BLACKFRAME, 0); + test_updates(SS_WHITEFRAME, 0); + test_updates(SS_USERITEM, 0); test_updates(SS_SIMPLE, 0); test_updates(SS_OWNERDRAW, 0); test_updates(SS_BITMAP, 0); test_updates(SS_BITMAP | SS_CENTERIMAGE, 0); - test_updates(SS_ETCHEDHORZ, TODO_COUNT); - test_updates(SS_ETCHEDVERT, TODO_COUNT); - test_updates(SS_ETCHEDFRAME, TODO_COUNT); + test_updates(SS_ETCHEDHORZ, 0); + test_updates(SS_ETCHEDVERT, 0); + test_updates(SS_ETCHEDFRAME, 0); test_updates(SS_SUNKEN, 0); test_set_text(); test_set_image(); -- 2.25.1

2 1

[PATCH resend 4/7] comctl32: fix handling of SS_ETCHEDHORZ/SS_ETCHEDVERT static control styles
by Rafał Harabień 26 Mar '22

26 Mar '22

Instead of drawing the frame in WM_PAINT use WS_EX_STATICEDGE style that adds the frame outside of the client rect and change control size after creation to make it look like a line. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/comctl32/static.c | 30 +++++++++++++++--------------- dlls/comctl32/tests/static.c | 6 +++--- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index 7a3ac958111..1b5d1ade291 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -84,8 +84,8 @@ static const pfPaint staticPaintFunc[SS_TYPEMASK+1] = STATIC_PaintOwnerDrawfn, /* SS_OWNERDRAW */ STATIC_PaintBitmapfn, /* SS_BITMAP */ STATIC_PaintEnhMetafn, /* SS_ENHMETAFILE */ - STATIC_PaintEtchedfn, /* SS_ETCHEDHORZ */ - STATIC_PaintEtchedfn, /* SS_ETCHEDVERT */ + NULL, /* SS_ETCHEDHORZ */ + NULL, /* SS_ETCHEDVERT */ STATIC_PaintEtchedfn, /* SS_ETCHEDFRAME */ }; @@ -519,10 +519,21 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, { CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam; - if (full_style & SS_SUNKEN) + if (full_style & SS_SUNKEN || style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT) SetWindowLongW( hwnd, GWL_EXSTYLE, GetWindowLongW( hwnd, GWL_EXSTYLE ) | WS_EX_STATICEDGE ); + if (style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT) { + RECT rc; + GetClientRect(hwnd, &rc); + if (style == SS_ETCHEDHORZ) + rc.bottom = rc.top; + else + rc.right = rc.left; + AdjustWindowRectEx(&rc, full_style, FALSE, GetWindowLongW(hwnd, GWL_EXSTYLE)); + SetWindowPos(hwnd, NULL, 0, 0, rc.right - rc.left, rc.bottom - rc.top, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER); + } + switch (style) { case SS_ICON: @@ -904,18 +915,7 @@ static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ) /* FIXME: sometimes (not always) sends WM_CTLCOLORSTATIC */ GetClientRect( hwnd, &rc ); - switch (style & SS_TYPEMASK) - { - case SS_ETCHEDHORZ: - DrawEdge(hdc, &rc, EDGE_ETCHED, BF_TOP | BF_BOTTOM); - break; - case SS_ETCHEDVERT: - DrawEdge(hdc, &rc, EDGE_ETCHED, BF_LEFT | BF_RIGHT); - break; - case SS_ETCHEDFRAME: - DrawEdge(hdc, &rc, EDGE_ETCHED, BF_RECT); - break; - } + DrawEdge(hdc, &rc, EDGE_ETCHED, BF_RECT); } void STATIC_Register(void) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index d1573b84d64..7206e19c070 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -91,17 +91,17 @@ static void test_updates(int style, int flags) exstyle = GetWindowLongW(hStatic, GWL_EXSTYLE); if (style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT || style == SS_SUNKEN) - todo_wine_if(style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT) ok(exstyle == WS_EX_STATICEDGE, "expected WS_EX_STATICEDGE, got %d\n", exstyle); + ok(exstyle == WS_EX_STATICEDGE, "expected WS_EX_STATICEDGE, got %d\n", exstyle); else ok(exstyle == 0, "expected 0, got %d\n", exstyle); GetClientRect(hStatic, &rcClient); if (style == SS_ETCHEDVERT) - todo_wine ok(rcClient.right == 0, "expected zero width, got %d\n", rcClient.right); + ok(rcClient.right == 0, "expected zero width, got %d\n", rcClient.right); else ok(rcClient.right > 0, "expected non-zero width, got %d\n", rcClient.right); if (style == SS_ETCHEDHORZ) - todo_wine ok(rcClient.bottom == 0, "expected zero height, got %d\n", rcClient.bottom); + ok(rcClient.bottom == 0, "expected zero height, got %d\n", rcClient.bottom); else ok(rcClient.bottom > 0, "expected non-zero height, got %d\n", rcClient.bottom); -- 2.25.1

2 1

[PATCH resend 3/7] comctl32/tests: add more static control tests
by Rafał Harabień 26 Mar '22

26 Mar '22

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/comctl32/tests/static.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index b8f43142d6b..d1573b84d64 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -82,10 +82,29 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara static void test_updates(int style, int flags) { HWND hStatic = create_static(style); - RECT r1 = {20, 20, 30, 30}; + RECT r1 = {20, 20, 30, 30}, rcClient; int exp; + LONG exstyle; flush_events(); + trace("Testing style 0x%x\n", style); + + exstyle = GetWindowLongW(hStatic, GWL_EXSTYLE); + if (style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT || style == SS_SUNKEN) + todo_wine_if(style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT) ok(exstyle == WS_EX_STATICEDGE, "expected WS_EX_STATICEDGE, got %d\n", exstyle); + else + ok(exstyle == 0, "expected 0, got %d\n", exstyle); + + GetClientRect(hStatic, &rcClient); + if (style == SS_ETCHEDVERT) + todo_wine ok(rcClient.right == 0, "expected zero width, got %d\n", rcClient.right); + else + ok(rcClient.right > 0, "expected non-zero width, got %d\n", rcClient.right); + if (style == SS_ETCHEDHORZ) + todo_wine ok(rcClient.bottom == 0, "expected zero height, got %d\n", rcClient.bottom); + else + ok(rcClient.bottom > 0, "expected non-zero height, got %d\n", rcClient.bottom); + g_nReceivedColorStatic = 0; /* during each update parent WndProc will test the WM_CTLCOLORSTATIC message */ InvalidateRect(hMainWnd, NULL, FALSE); @@ -406,14 +425,20 @@ START_TEST(static) ShowWindow(hMainWnd, SW_SHOW); test_updates(0, 0); - test_updates(SS_SIMPLE, 0); test_updates(SS_ICON, 0); - test_updates(SS_BITMAP, 0); - test_updates(SS_BITMAP | SS_CENTERIMAGE, 0); test_updates(SS_BLACKRECT, TODO_COUNT); test_updates(SS_WHITERECT, TODO_COUNT); + test_updates(SS_BLACKFRAME, TODO_COUNT); + test_updates(SS_WHITEFRAME, TODO_COUNT); + test_updates(SS_USERITEM, TODO_COUNT); + test_updates(SS_SIMPLE, 0); + test_updates(SS_OWNERDRAW, 0); + test_updates(SS_BITMAP, 0); + test_updates(SS_BITMAP | SS_CENTERIMAGE, 0); test_updates(SS_ETCHEDHORZ, TODO_COUNT); test_updates(SS_ETCHEDVERT, TODO_COUNT); + test_updates(SS_ETCHEDFRAME, TODO_COUNT); + test_updates(SS_SUNKEN, 0); test_set_text(); test_set_image(); test_STM_SETIMAGE(); -- 2.25.1

2 1

[PATCH resend 2/7] user32: use SWP_NOACTIVATE flag when resizing etched static control
by Rafał Harabień 26 Mar '22

26 Mar '22

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/user32/static.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index d19df22dcb9..dc9a210862a 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -425,7 +425,7 @@ LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam else rc.right = rc.left; AdjustWindowRectEx(&rc, full_style, FALSE, GetWindowLongW(hwnd, GWL_EXSTYLE)); - SetWindowPos(hwnd, NULL, 0, 0, rc.right - rc.left, rc.bottom - rc.top, SWP_NOMOVE | SWP_NOZORDER); + SetWindowPos(hwnd, NULL, 0, 0, rc.right - rc.left, rc.bottom - rc.top, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER); } switch (style) { -- 2.25.1

2 1

[PATCH resend 1/7] user32/tests: remove redundant SS_*RECT static control tests
by Rafał Harabień 26 Mar '22

26 Mar '22

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/user32/tests/static.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index 0899f4c6187..999ff2a8d76 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -344,8 +344,6 @@ START_TEST(static) test_updates(SS_OWNERDRAW); test_updates(SS_BITMAP); test_updates(SS_BITMAP | SS_CENTERIMAGE); - test_updates(SS_BLACKRECT); - test_updates(SS_WHITERECT); test_updates(SS_ETCHEDHORZ); test_updates(SS_ETCHEDVERT); test_updates(SS_ETCHEDFRAME); -- 2.25.1

1 0

[PATCH 0/2] wmd speedup
by Eric Pouech 26 Mar '22

26 Mar '22

The following series drastically improves cmd performance by caching label resolution when executing a batch file. Testbot is hitting a timeout when running the tests. See https://bugs.winehq.org/show_bug.cgi?id=52720 Local tests show a reduction of test duration of 90%! Don't always expect those numbers; in some extreme cases, the patchset will even slightly increase execution time. Note: the reason why testbot started timing out is still unknown. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- Eric Pouech (2): programs/cmd: introduce structure BATCH_FILE to hold information about a .cmd file programs/cmd: add label => file offset lookup in BATCH_FILE programs/cmd/batch.c | 153 ++++++++++++++++++++++++++++++++++++++-- programs/cmd/builtins.c | 63 +++-------------- programs/cmd/wcmd.h | 19 ++++- 3 files changed, 172 insertions(+), 63 deletions(-)

1 2

Wine staging 7.5 release
by Alistair Leslie-Hughes 26 Mar '22

26 Mar '22

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 7.5 (561 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * None Updated: * Various patches to remove the long warnings. Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 1/5 v2] cmd/tests: Add tests for the magic environment variables.
by Francois Gouget 25 Mar '22

25 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: - Some locales add the day-of-week before the date. Adjust the tests accordingly. - Add more for %cd%, %errorlevel%, defined, tests. - Compare date /t with %date%, and time /t with %time%. - Modify the tests so they work with @todo_wine@. --- programs/cmd/tests/test_builtins.cmd | 39 +++++++++++++++++++++++- programs/cmd/tests/test_builtins.cmd.exp | 15 ++++++++- 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 3f410e55166..f9e26da34b6 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -585,7 +585,6 @@ cd dummydir echo %~dp0 cd .. rmdir dummydir -echo CD value %CD% echo %% echo P% echo %P @@ -1789,6 +1788,44 @@ set /a WINE_foo=5 set /a WINE_bar=WINE_foo=6 call :checkenvvars WINE_foo 6 WINE_bar 6 +echo --- Magic environment variables +if defined cd (echo Has %%cd%%) else (echo Not defined) +echo CD value %CD% + +rem Some locales include the day-of-week either before or after the +rem day-month-year part. This makes it impossible to check the content of %date% +if defined date (echo Has %%date%%) else (echo Not defined) +set WINE_foo=%date:~9,1% +if defined WINE_foo (echo Good %%date%%) else (echo Too short) + +set WINE_before=%date% +for /f "usebackq tokens=*" %%i in (`date /t`) do set WINE_foo=%%i +set WINE_after=%date% +rem Use extra parentheses to work around a Wine bug +if not "%WINE_foo%"=="%WINE_before% " (if not "%WINE_foo%"=="%WINE_after% " (echo date /t != %%date%%) else (echo Match)) else (echo Match) + +if defined errorlevel (echo Has %%errorlevel%%) else (echo Not defined) + +if defined time (echo Has %%time%%) else (echo Not defined) +set WINE_foo=%time:~7,1% +if defined WINE_foo (echo %%time%% has seconds) else (echo Too short) +set WINE_foo=%time:~10,1% +if defined WINE_foo (echo %%time%% has 1/100s) else (echo Too short) +set WINE_foo=%time:~11,1% +if not defined WINE_foo (echo End of %%time%%) else (echo Too long) + +rem %time% has a leading space instead of a zero so ignore the first character +set WINE_before=%time:~1,4% +for /f "usebackq tokens=*" %%i in (`time /t`) do set WINE_foo=%%i +set WINE_after=%time:~1,4% +set WINE_foo=%WINE_foo:~1,99% +rem Use extra parentheses to work around a Wine bug +if not "%WINE_foo%"=="%WINE_before%" (if not "%WINE_foo%"=="%WINE_after%" (echo time /t != %%time:~1,4%%) else (echo Match)) else (echo Match) + +if defined random (echo Has %%random%%) else (echo Not defined) +set WINE_foo=%random% +if %WINE_foo% neq %random% (echo %%random%% looks random) else (echo Constant?) + echo --- for /F mkdir foobar & cd foobar echo ------ string argument diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 8b6e0914112..15fda131a5c 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -500,7 +500,6 @@ I'm here!@space@ ~dp0 should be directory containing batch file @drive@@path@ @drive@@path@ -CD value @pwd@@or_broken@CD value@space@ % P P @@ -1216,6 +1215,20 @@ WINE_foo correctly 7 WINE_foo correctly 8@or_broken@ERROR: WINE_foo incorrectly 4 [8] WINE_foo correctly 6@or_broken@ERROR: WINE_foo incorrectly 5 [6] WINE_bar correctly 6@or_broken@ERROR: WINE_bar incorrectly 5 [6] +--- Magic environment variables +@todo_wine@Has %cd% +CD value @pwd@@or_broken@CD value@space@ +@todo_wine@Has %date% +@todo_wine@Good %date% +@todo_wine@Match +@todo_wine@Has %errorlevel% +@todo_wine@Has %time% +@todo_wine@%time% has seconds +@todo_wine@%time% has 1/100s +End of %time% +@todo_wine@Match +@todo_wine@Has %random% +%random% looks random --- for /F ------ string argument a -- 2.30.2

2 9

[PATCH v8 0/7] Fix sock_send reordering issue (#52401)
by Jinoh Kang 25 Mar '22

25 Mar '22

This fixes the send part of the issue #52401 [1]: "Improper synchronization in sock_recv/sock_send leads to arbitrary reordering of completion of I/O requests", which was initially reported (outside Bugzilla) by Dongwan Kim [2]. Changelog: v1 -> v2: - drop patch "server: Compact struct set_async_direct_result_reply." - add async and fd arguments to async_initial_status_callback - recv_socket_initial_callback: pass OOB flag via private instead of implementing two separate functions for OOB and non-OOB - detect short write in send_socket_initial_callback - preserve the behaviour of returning success if we had a short write and the socket is nonblocking and force_async is unset v2 -> v3: - fix typo in comment v3 -> v4: - fix typo in commit message - address feedback - drop patch "server: Defer postprocessing until after setting initial status in recv_socket handler." v4 -> v5: - drop patch "server: Add async_initial_status_callback." - drop patch "server: Defer postprocessing until after setting initial status in send_socket handler." - add patch "server: Ensure completion_callback is called before async is destroyed." - add patch "ws2_32/tests: Continue sending remaining data on short write in test_write_events." - add patch "server: Defer clearing events until async is either pending or completed in send_socket handler." - add patch "server: Ensure datagram sockets are bound in send_socket." v5 -> v6: - centralise status code computation in one place, even for bind errno translation - fix erroneous subject (s/either pending or completed/completed/) v6 -> v7: - drop patch "server: Ensure completion_callback is called before async is destroyed." - add patch "server: Ensure async completion callback is called on synchronous failure." - add patch "server: Allow async completion callback to retrieve status on synchronous failure." v7 -> v8: - drop committed patches - edit commit message of "server: Ensure completion_callback is called before async is destroyed." as per feedback (thanks zf) - move a sock_reselect() into the prior if block (thanks zf) Supersedes 227636 - 227644. Supersedes 228988 - 228998. Supersedes 230282 - 230293 (sans already committed patches). [1] https://bugs.winehq.org/show_bug.cgi?id=52401 [2] https://www.winehq.org/pipermail/wine-devel/2021-May/186454.html Jinoh Kang (7): server: Generalise async completion callback to be called on synchronous failure. server: Allow async completion callback to retrieve status on synchronous failure. server: Defer clearing events until async is completed in send_socket handler. server: Attempt to complete I/O request immediately in send_socket. server: Ensure datagram sockets are bound in send_socket. ntdll: Don't call try_send before server call in sock_send. server: Replace redundant send_socket status fields with force_async boolean field. dlls/ntdll/unix/socket.c | 89 +++++++++++++++------- dlls/ws2_32/tests/sock.c | 14 ++-- server/async.c | 14 +++- server/protocol.def | 4 +- server/sock.c | 161 +++++++++++++++++++++++++++------------ 5 files changed, 195 insertions(+), 87 deletions(-) -- 2.34.1

3 15

[PATCH] user32: Avoid pointer truncation in free_user_handle.
by Rémi Bernon 25 Mar '22

25 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 77dfc131928..fac534a7c87 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -72,7 +72,7 @@ void release_user_handle_ptr( void *ptr ) */ void *free_user_handle( HANDLE handle, unsigned int type ) { - return UlongToHandle( NtUserCallTwoParam( HandleToUlong(handle), type, NtUserFreeHandle )); + return (void *)NtUserCallTwoParam( HandleToUlong(handle), type, NtUserFreeHandle ); } -- 2.35.1

3 4

[PATCH 3/6] user32: Split client and kernel parts of unpack_message.
by Jacek Caban 25 Mar '22

25 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 133 +++++++++-------------- dlls/user32/winproc.c | 247 +++++++++++++++++++++++++++++++++++++++++- dlls/win32u/message.c | 2 + include/ntuser.h | 1 + 4 files changed, 297 insertions(+), 86 deletions(-)

4 4

[PATCH 0/3] Implementing filename completion in cmd
by Eric Pouech 25 Mar '22

25 Mar '22

The following series implements filename completion in cmd, à la Windows (tab (resp. shift-tab) rotates in alphabetical order (resp. backwards alpha order) the available filenames starting with a given prefix). It requires two fixes in programs/conhost. Notes to Jacek - for the second patch, I tried to pick most of the APIs requiring cursor positionning. I wonder if SetConsoleCursorPosition (when y is outside a given interval) shouldn't be part of it (no concrete example at sight, just wild thinking) (something like deltay < -5 || deltay > 0) (This can be done later on anyway) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- Eric Pouech (3): programs/conhost: correctly recompute start of edit line on ReadConsole programs/conhost: support relative cursor positionning programs/cmd: implement filename completion programs/cmd/batch.c | 279 ++++++++++++++++++++++++++++++++++++- programs/conhost/conhost.c | 22 ++- programs/conhost/conhost.h | 1 + 3 files changed, 294 insertions(+), 8 deletions(-)

3 7

[PATCH vkd3d v7 6/6] vkd3d-shader/hlsl: Treat all braceless initializers as assignments.
by Francisco Casas 25 Mar '22

25 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v7: - No changes from v5. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 91 +++++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 43 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 1b47187e..9e09054b 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1603,61 +1603,66 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (v->initializer.args_count) { - unsigned int size = initializer_size(&v->initializer); - struct hlsl_ir_load *load; - - if (type->type <= HLSL_CLASS_LAST_NUMERIC && v->initializer.braces - && type->dimx * type->dimy != size) + if (v->initializer.braces) { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in numeric initializer, but got %u.", - type->dimx * type->dimy, v->initializer.args_count); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + unsigned int size = initializer_size(&v->initializer); - if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) - && hlsl_type_component_count(type) != size) - { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), size); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + if (type->type <= HLSL_CLASS_LAST_NUMERIC && type->dimx * type->dimy != size) + { + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in numeric initializer, but got %u.", + type->dimx * type->dimy, v->initializer.args_count); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } - if (type->type > HLSL_CLASS_LAST_NUMERIC && type->type != HLSL_CLASS_STRUCT) - { - FIXME("Initializers for non scalar/struct variables not supported yet.\n"); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) + && hlsl_type_component_count(type) != size) + { + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), size); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } - if (type->type == HLSL_CLASS_STRUCT) - { - struct_var_initializer(ctx, statements_list, var, &v->initializer); - vkd3d_free(v); - continue; + if (type->type > HLSL_CLASS_LAST_NUMERIC && type->type != HLSL_CLASS_STRUCT) + { + FIXME("Initializers for non scalar/struct variables not supported yet.\n"); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } + + if (type->type == HLSL_CLASS_STRUCT) + { + struct_var_initializer(ctx, statements_list, var, &v->initializer); + vkd3d_free(v); + continue; + } + else + { + hlsl_fixme(ctx, &v->loc, "Complex initializer."); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } } - if (v->initializer.args_count > 1) + else { - hlsl_fixme(ctx, &v->loc, "Complex initializer."); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + struct hlsl_ir_load *load = hlsl_new_var_load(ctx, var, var->loc); - load = hlsl_new_var_load(ctx, var, var->loc); - list_add_tail(v->initializer.instrs, &load->node.entry); - add_assignment(ctx, v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); - vkd3d_free(v->initializer.args); + assert(v->initializer.args_count == 1); + list_add_tail(v->initializer.instrs, &load->node.entry); + add_assignment(ctx, v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); + } if (modifiers & HLSL_STORAGE_STATIC) list_move_tail(&ctx->static_initializers, v->initializer.instrs); else list_move_tail(statements_list, v->initializer.instrs); + vkd3d_free(v->initializer.args); vkd3d_free(v->initializer.instrs); } vkd3d_free(v); -- 2.25.1

1 0

[PATCH vkd3d v7 5/6] vkd3d-shader/hlsl: Don't check exact number of components for braceless initialization of numeric types.
by Francisco Casas 25 Mar '22

25 Mar '22

The implicit conversion in add_assignment() takes responsability now. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v7: - No changes from v5. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 98602f71..1b47187e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1606,19 +1606,17 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t unsigned int size = initializer_size(&v->initializer); struct hlsl_ir_load *load; - if (type->type <= HLSL_CLASS_LAST_NUMERIC - && type->dimx * type->dimy != size && size != 1) + if (type->type <= HLSL_CLASS_LAST_NUMERIC && v->initializer.braces + && type->dimx * type->dimy != size) { - if (size < type->dimx * type->dimy) - { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in numeric initializer, but got %u.", - type->dimx * type->dimy, size); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in numeric initializer, but got %u.", + type->dimx * type->dimy, v->initializer.args_count); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; } + if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) && hlsl_type_component_count(type) != size) { -- 2.25.1

1 0

[PATCH vkd3d v7 4/6] vkd3d-shader/hlsl: Properly free parse_variable_def memory.
by Francisco Casas 25 Mar '22

25 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v7: - No changes from v6. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 42 +++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c84003fd..98602f71 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -668,6 +668,15 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_ return new_type; } +static void free_parse_variable_def(struct parse_variable_def *v) +{ + free_parse_initializer(&v->initializer); + vkd3d_free(v->arrays.sizes); + vkd3d_free(v->name); + vkd3d_free((void *)v->semantic.name); + vkd3d_free(v); +} + static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *type, struct list *fields) { struct parse_variable_def *v, *v_next; @@ -685,13 +694,14 @@ static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *ty if (!(field = hlsl_alloc(ctx, sizeof(*field)))) { - vkd3d_free(v); - return list; + free_parse_variable_def(v); + continue; } field->type = type; for (i = 0; i < v->arrays.count; ++i) field->type = hlsl_new_array_type(ctx, field->type, v->arrays.sizes[i]); + vkd3d_free(v->arrays.sizes); field->loc = v->loc; field->name = v->name; field->semantic = v->semantic; @@ -719,18 +729,29 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type if (!v->arrays.count) { if (!(type = hlsl_type_clone(ctx, orig_type, 0, modifiers))) - return false; + { + free_parse_variable_def(v); + continue; + } } else { type = orig_type; } + ret = true; for (i = 0; i < v->arrays.count; ++i) { if (!(type = hlsl_new_array_type(ctx, type, v->arrays.sizes[i]))) - return false; + { + free_parse_variable_def(v); + ret = false; + break; + } } + if (!ret) + continue; + vkd3d_free(v->arrays.sizes); vkd3d_free((void *)type->name); type->name = v->name; @@ -747,6 +768,7 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type if (!ret) hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, "Type '%s' is already defined.", v->name); + free_parse_initializer(&v->initializer); vkd3d_free(v); } vkd3d_free(list); @@ -1470,15 +1492,6 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru vkd3d_free(initializer->args); } -static void free_parse_variable_def(struct parse_variable_def *v) -{ - free_parse_initializer(&v->initializer); - vkd3d_free(v->arrays.sizes); - vkd3d_free(v->name); - vkd3d_free((void *)v->semantic.name); - vkd3d_free(v); -} - static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_type, DWORD modifiers, struct list *var_list) { @@ -1510,6 +1523,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t type = basic_type; for (i = 0; i < v->arrays.count; ++i) type = hlsl_new_array_type(ctx, type, v->arrays.sizes[i]); + vkd3d_free(v->arrays.sizes); if (type->type != HLSL_CLASS_MATRIX) check_invalid_matrix_modifiers(ctx, modifiers, v->loc); @@ -1569,6 +1583,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_INITIALIZER, "Const variable \"%s\" is missing an initializer.", var->name); hlsl_free_var(var); + free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } @@ -1581,6 +1596,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t "Variable \"%s\" was already declared in this scope.", var->name); hlsl_note(ctx, &old->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" was previously declared here.", old->name); hlsl_free_var(var); + free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } -- 2.25.1

1 0

[PATCH vkd3d v7 3/6] vkd3d-shader/hlsl: Add 'braces' flag to parse initializers.
by Francisco Casas 25 Mar '22

25 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v7: - No changes from v5. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index cc0c2e26..c84003fd 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -48,6 +48,7 @@ struct parse_initializer struct hlsl_ir_node **args; unsigned int args_count; struct list *instrs; + bool braces; }; struct parse_array_sizes @@ -3215,14 +3216,17 @@ complex_initializer: } $$.args[0] = node_from_list($1); $$.instrs = $1; + $$.braces = false; } | '{' complex_initializer_list '}' { $$ = $2; + $$.braces = true; } | '{' complex_initializer_list ',' '}' { $$ = $2; + $$.braces = true; } complex_initializer_list: @@ -3257,6 +3261,7 @@ initializer_expr_list: YYABORT; $$.args[0] = node_from_list($1); $$.instrs = $1; + $$.braces = false; } | initializer_expr_list ',' initializer_expr { @@ -3393,6 +3398,7 @@ func_arguments: $$.args_count = 0; if (!($$.instrs = make_empty_list(ctx))) YYABORT; + $$.braces = false; } | initializer_expr_list -- 2.25.1

1 0

[PATCH vkd3d v7 2/6] vkd3d-shader/hlsl: Concatenate nested initializers.
by Francisco Casas 25 Mar '22

25 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v7: - No changes from v6. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2b26d0b0..cc0c2e26 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2408,6 +2408,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl %type <function> func_prototype %type <initializer> complex_initializer +%type <initializer> complex_initializer_list %type <initializer> func_arguments %type <initializer> initializer_expr_list @@ -3215,15 +3216,36 @@ complex_initializer: $$.args[0] = node_from_list($1); $$.instrs = $1; } - | '{' initializer_expr_list '}' + | '{' complex_initializer_list '}' { $$ = $2; } - | '{' initializer_expr_list ',' '}' + | '{' complex_initializer_list ',' '}' { $$ = $2; } +complex_initializer_list: + complex_initializer + | complex_initializer_list ',' complex_initializer + { + struct hlsl_ir_node **new_args; + unsigned int i; + + $$ = $1; + if (!(new_args = hlsl_realloc(ctx, $$.args, ($$.args_count + $3.args_count) * sizeof(*$$.args)))) + { + free_parse_initializer(&$$); + free_parse_initializer(&$3); + YYABORT; + } + $$.args = new_args; + for (i = 0; i < $3.args_count; i++) + $$.args[$$.args_count++] = $3.args[i]; + list_move_tail($$.instrs, $3.instrs); + free_parse_initializer(&$3); + } + initializer_expr: assignment_expr -- 2.25.1

1 0

[PATCH vkd3d v7 1/6] vkd3d-shader/hlsl: Avoid leaks on memory allocation failures when parsing initializers.
by Francisco Casas 25 Mar '22

25 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v7: - No changes from v5. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 1ab56fba..2b26d0b0 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3208,7 +3208,10 @@ complex_initializer: { $$.args_count = 1; if (!($$.args = hlsl_alloc(ctx, sizeof(*$$.args)))) + { + destroy_instr_list($1); YYABORT; + } $$.args[0] = node_from_list($1); $$.instrs = $1; } @@ -3235,9 +3238,16 @@ initializer_expr_list: } | initializer_expr_list ',' initializer_expr { + struct hlsl_ir_node **new_args; + $$ = $1; - if (!($$.args = hlsl_realloc(ctx, $$.args, ($$.args_count + 1) * sizeof(*$$.args)))) + if (!(new_args = hlsl_realloc(ctx, $$.args, ($$.args_count + 1) * sizeof(*$$.args)))) + { + free_parse_initializer(&$$); + destroy_instr_list($3); YYABORT; + } + $$.args = new_args; $$.args[$$.args_count++] = node_from_list($3); list_move_tail($$.instrs, $3); vkd3d_free($3); -- 2.25.1

1 0

[PATCH] kernel32/tests: Add a test to show that services.exe is supposed to run in the session 0.
by Dmitry Timoshkov 25 Mar '22

25 Mar '22

IsWindowsService() from Microsoft.Extensions.Hosting.WindowsServices (.Net 4.6, 4.8, 5.0) depends on this. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/tests/process.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index e9e8555c32e..8f18a0d37a7 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -4959,6 +4959,40 @@ static void test_job_list_attribute(HANDLE parent_job) ok(ret, "SetInformationJobObject error %lu\n", GetLastError()); } +static void test_services_exe(void) +{ + NTSTATUS status; + ULONG size, offset; + char *buf; + SYSTEM_PROCESS_INFORMATION *spi; + ULONG services_pid = 0, services_session_id = ~0; + + status = NtQuerySystemInformation(SystemProcessInformation, NULL, 0, &size); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#lx\n", status); + + buf = malloc(size); + status = NtQuerySystemInformation(SystemProcessInformation, buf, size, &size); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); + + spi = (SYSTEM_PROCESS_INFORMATION *)buf; + offset = 0; + + do + { + spi = (SYSTEM_PROCESS_INFORMATION *)(buf + offset); + if (!wcsnicmp(spi->ProcessName.Buffer, L"services.exe", spi->ProcessName.Length/sizeof(WCHAR))) + { + services_pid = HandleToUlong(spi->UniqueProcessId); + services_session_id = spi->SessionId; + } + offset += spi->NextEntryOffset; + } while (spi->NextEntryOffset != 0); + + ok(services_pid != 0, "services.exe not found\n"); + todo_wine + ok(services_session_id == 0, "got services.exe SessionId %lu\n", services_session_id); +} + START_TEST(process) { HANDLE job, hproc, h, h2; @@ -5088,6 +5122,7 @@ START_TEST(process) test_parent_process_attribute(0, NULL); test_handle_list_attribute(FALSE, NULL, NULL); test_dead_process(); + test_services_exe(); /* things that can be tested: * lookup: check the way program to be executed is searched -- 2.35.1

1 0

[PATCH] bcrypt: Use GNUTLS_DIG_UNKNOWN for an unknown digest.
by Huw Davies 25 Mar '22

25 Mar '22

Mainly to avoid a clang warning. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/bcrypt/gnutls.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index ba251c72fa1..b38bf4ba8ff 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1552,7 +1552,7 @@ static gnutls_digest_algorithm_t get_digest_from_id( const WCHAR *alg_id ) if (!wcscmp( alg_id, BCRYPT_SHA512_ALGORITHM )) return GNUTLS_DIG_SHA512; if (!wcscmp( alg_id, BCRYPT_MD2_ALGORITHM )) return GNUTLS_DIG_MD2; if (!wcscmp( alg_id, BCRYPT_MD5_ALGORITHM )) return GNUTLS_DIG_MD5; - return -1; + return GNUTLS_DIG_UNKNOWN; } static NTSTATUS key_asymmetric_verify( void *args ) @@ -1596,7 +1596,7 @@ static NTSTATUS key_asymmetric_verify( void *args ) if (!(flags & BCRYPT_PAD_PKCS1) || !info) return STATUS_INVALID_PARAMETER; if (!info->pszAlgId) return STATUS_INVALID_SIGNATURE; - if ((hash_alg = get_digest_from_id(info->pszAlgId)) == -1) + if ((hash_alg = get_digest_from_id(info->pszAlgId)) == GNUTLS_DIG_UNKNOWN) { FIXME( "hash algorithm %s not supported\n", debugstr_w(info->pszAlgId) ); return STATUS_NOT_SUPPORTED; @@ -1751,7 +1751,7 @@ static NTSTATUS key_asymmetric_sign( void *args ) return STATUS_INVALID_PARAMETER; } - if ((hash_alg = get_digest_from_id( pad->pszAlgId )) == -1) + if ((hash_alg = get_digest_from_id( pad->pszAlgId )) == GNUTLS_DIG_UNKNOWN) { FIXME( "hash algorithm %s not recognized\n", debugstr_w(pad->pszAlgId) ); return STATUS_NOT_SUPPORTED; -- 2.23.0

2 1

[PATCH vkd3d v6 3/8] vkd3d-shader/hlsl: Concatenate nested initializers.
by Francisco Casas 25 Mar '22

25 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v6: - Declaration of "unsigned int i" moved out of the 'for' initialization clause. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index aca246f6..c40957c2 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2411,6 +2411,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl %type <function> func_prototype %type <initializer> complex_initializer +%type <initializer> complex_initializer_list %type <initializer> func_arguments %type <initializer> initializer_expr_list @@ -3218,15 +3219,36 @@ complex_initializer: $$.args[0] = node_from_list($1); $$.instrs = $1; } - | '{' initializer_expr_list '}' + | '{' complex_initializer_list '}' { $$ = $2; } - | '{' initializer_expr_list ',' '}' + | '{' complex_initializer_list ',' '}' { $$ = $2; } +complex_initializer_list: + complex_initializer + | complex_initializer_list ',' complex_initializer + { + struct hlsl_ir_node **new_args; + unsigned int i; + + $$ = $1; + if (!(new_args = hlsl_realloc(ctx, $$.args, ($$.args_count + $3.args_count) * sizeof(*$$.args)))) + { + free_parse_initializer(&$$); + free_parse_initializer(&$3); + YYABORT; + } + $$.args = new_args; + for (i = 0; i < $3.args_count; i++) + $$.args[$$.args_count++] = $3.args[i]; + list_move_tail($$.instrs, $3.instrs); + free_parse_initializer(&$3); + } + initializer_expr: assignment_expr -- 2.25.1

1 1

[PATCH] win32u: Move menu handle management from user32.
by Jacek Caban 25 Mar '22

25 Mar '22

4 4

[PATCH 1/2] user32/tests: Test a recursive activation loop on WM_ACTIVATE.
by Rémi Bernon 25 Mar '22

25 Mar '22

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Windows only sends the activation messages and hooks once, until the SetActiveWindow completes for that window. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46274 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- AFAICS these two patches help with the recent user32 tests failures on the testbot. Although I believe the patches are correct, I'm not sure the failure root cause is that windows are now activated recursively. Instead, I think that some change caused window procs to now be always called recursively when they weren't before. dlls/user32/tests/msg.c | 91 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a2adf56565d..adb167bdad3 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -10203,6 +10203,40 @@ static LRESULT WINAPI ShowWindowProcA(HWND hwnd, UINT message, WPARAM wParam, LP return ret; } +static LRESULT WINAPI SetActiveWindowProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static LONG defwndproc_counter = 0; + struct recvd_message msg; + LRESULT ret; + + switch (message) + { + /* log only specific messages we are interested in */ + case WM_NCACTIVATE: + case WM_ACTIVATE: + case WM_SETFOCUS: + case WM_KILLFOCUS: + break; + default: + return DefWindowProcA(hwnd, message, wParam, lParam); + } + + msg.hwnd = hwnd; + msg.message = message; + msg.flags = sent|wparam|lparam; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + msg.descr = "activation"; + add_message(&msg); + + defwndproc_counter++; + ret = DefWindowProcA(hwnd, message, wParam, lParam); + defwndproc_counter--; + + return ret; +} + static LRESULT WINAPI PaintLoopProcA(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) @@ -10300,6 +10334,10 @@ static BOOL RegisterWindowClasses(void) cls.lpszClassName = "ShowWindowClass"; if(!RegisterClassA(&cls)) return FALSE; + cls.lpfnWndProc = SetActiveWindowProcA; + cls.lpszClassName = "SetActiveWindowClass"; + if(!RegisterClassA(&cls)) return FALSE; + cls.lpfnWndProc = PopupMsgCheckProcA; cls.lpszClassName = "TestPopupClass"; if(!RegisterClassA(&cls)) return FALSE; @@ -10355,6 +10393,7 @@ static BOOL is_our_logged_class(HWND hwnd) { if (!lstrcmpiA(buf, "TestWindowClass") || !lstrcmpiA(buf, "ShowWindowClass") || + !lstrcmpiA(buf, "SetActiveWindowClass") || !lstrcmpiA(buf, "TestParentClass") || !lstrcmpiA(buf, "TestPopupClass") || !lstrcmpiA(buf, "SimpleWindowClass") || @@ -14758,10 +14797,46 @@ static const struct message SetActiveWindowSeq4[] = { 0 } }; +static LRESULT WINAPI test_recursive_set_active_window_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) +{ + if (message == WM_ACTIVATE && LOWORD(wparam) != WA_INACTIVE) + { + SetActiveWindow((HWND)lparam); + SetActiveWindow(hwnd); + return 0; + } + + return DefWindowProcA(hwnd, message, wparam, lparam); +} + +static void test_set_active_window_recursive(HWND hwnd, HWND hwnd2) +{ + const struct message RecursiveActivationSeq[] = + { + { HCBT_ACTIVATE, hook|wparam, (WPARAM)hwnd }, + { WM_NCACTIVATE, sent|wparam|lparam, FALSE, (LPARAM)hwnd }, + { WM_ACTIVATE, sent|wparam|lparam, WA_INACTIVE, (LPARAM)hwnd }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { HCBT_ACTIVATE, hook|wparam, (WPARAM)hwnd2 }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { WM_NCACTIVATE, sent|wparam|lparam, FALSE, (LPARAM)hwnd }, + { WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, (LPARAM)hwnd }, + { 0 } + }; + SetActiveWindow(hwnd2); + + flush_sequence(); + SetActiveWindow(hwnd); + ok_sequence(RecursiveActivationSeq, "recursive activation", TRUE); + + DestroyWindow(hwnd2); + DestroyWindow(hwnd); + flush_sequence(); +} static void test_SetActiveWindow(void) { - HWND hwnd, popup, ret; + HWND hwnd, hwnd2, popup, ret; hwnd = CreateWindowExA(0, "TestWindowClass", "Test SetActiveWindow", WS_OVERLAPPEDWINDOW | WS_VISIBLE, @@ -14812,6 +14887,20 @@ static void test_SetActiveWindow(void) trace("done\n"); DestroyWindow(hwnd); + + hwnd = CreateWindowExA(0, "SimpleWindowClass", NULL, WS_OVERLAPPED|WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(hwnd != 0, "Failed to create simple window\n"); + SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)test_recursive_set_active_window_proc); + + hwnd2 = CreateWindowExA(0, "SetActiveWindowClass", NULL, WS_OVERLAPPED|WS_VISIBLE, + 10, 10, 50, 50, hwnd, 0, 0, NULL); + ok(hwnd2 != 0, "Failed to create recursive activation window\n"); + + test_set_active_window_recursive(hwnd, hwnd2); + + DestroyWindow(hwnd2); + DestroyWindow(hwnd); } static const struct message SetForegroundWindowSeq[] = -- 2.35.1

3 5

[PATCH 6/6] winealsa: Build with msvcrt.
by Huw Davies 25 Mar '22

25 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/Makefile.in | 2 -- dlls/winealsa.drv/midi.c | 9 --------- dlls/winealsa.drv/mmdevdrv.c | 17 ++++++----------- 3 files changed, 6 insertions(+), 22 deletions(-) diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in index 2113594fbe3..1349f6f9dab 100644 --- a/dlls/winealsa.drv/Makefile.in +++ b/dlls/winealsa.drv/Makefile.in @@ -5,8 +5,6 @@ IMPORTS = uuid ole32 advapi32 DELAYIMPORTS = winmm EXTRALIBS = $(ALSA_LIBS) $(PTHREAD_LIBS) -EXTRADLLFLAGS = -mcygwin - C_SRCS = \ alsa.c \ alsamidi.c \ diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 4db38537dd0..fc2205de6f6 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -22,17 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <string.h> #include <stdarg.h> -#include <stdio.h> -#include <unistd.h> -#include <fcntl.h> -#include <errno.h> -#include "ntstatus.h" -#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 389c40b47de..7dc01940dc9 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -18,23 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION #define COBJMACROS -#include "config.h" #include <stdarg.h> -#include <stdio.h> -#include <math.h> #include "windef.h" #include "winbase.h" #include "winnls.h" #include "winreg.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "wine/list.h" -#include "wine/unixlib.h" - +#include "winternl.h" #include "propsys.h" #include "initguid.h" #include "ole2.h" @@ -44,11 +36,14 @@ #include "mmsystem.h" #include "dsound.h" -#include "initguid.h" #include "endpointvolume.h" #include "audioclient.h" #include "audiopolicy.h" +#include "wine/debug.h" +#include "wine/list.h" +#include "wine/unixlib.h" + #include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(alsa); @@ -371,7 +366,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **gu } for(i = 0; i < params.num; i++){ - unsigned int size = (strlenW(params.endpoints[i].name) + 1) * sizeof(WCHAR); + unsigned int size = (wcslen(params.endpoints[i].name) + 1) * sizeof(WCHAR); ids[i] = HeapAlloc(GetProcessHeap(), 0, size); if(!ids[i]){ params.result = E_OUTOFMEMORY; -- 2.25.1

2 1

[PATCH 5/6] winealsa: Move DRVM_INIT to the unixlib.
by Huw Davies 25 Mar '22

25 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 1 - dlls/winealsa.drv/alsamidi.c | 25 ++++++++++++------------- dlls/winealsa.drv/midi.c | 27 --------------------------- dlls/winealsa.drv/unixlib.h | 7 ------- 4 files changed, 12 insertions(+), 48 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index e068f6608f3..e5f755b69ed 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2444,7 +2444,6 @@ unixlib_entry_t __wine_unix_call_funcs[] = set_event_handle, is_started, get_prop_value, - midi_init, midi_release, midi_out_message, midi_in_message, diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 8ec646281d2..476ea383a25 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -400,27 +400,22 @@ static void port_add(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* pinfo, u } } -NTSTATUS midi_init(void *args) +static UINT midi_init(void) { - struct midi_init_params *params = args; static BOOL init_done; snd_seq_client_info_t *cinfo; snd_seq_port_info_t *pinfo; snd_seq_t *seq; - if (init_done) { - *params->err = ERROR_ALREADY_INITIALIZED; - return STATUS_SUCCESS; - } + if (init_done) + return ERROR_ALREADY_INITIALIZED; TRACE("Initializing the MIDI variables.\n"); init_done = TRUE; /* try to open device */ - if (!(seq = seq_open(NULL))) { - *params->err = ERROR_OPEN_FAILED; - return STATUS_SUCCESS; - } + if (!(seq = seq_open(NULL))) + return ERROR_OPEN_FAILED; cinfo = calloc( 1, snd_seq_client_info_sizeof() ); pinfo = calloc( 1, snd_seq_port_info_sizeof() ); @@ -454,11 +449,9 @@ NTSTATUS midi_init(void *args) free( cinfo ); free( pinfo ); - *params->err = NOERROR; - TRACE("End\n"); - return STATUS_SUCCESS; + return NOERROR; } NTSTATUS midi_release(void *args) @@ -1369,6 +1362,9 @@ NTSTATUS midi_out_message(void *args) switch (params->msg) { + case DRVM_INIT: + *params->err = midi_init(); + break; case DRVM_EXIT: case DRVM_ENABLE: case DRVM_DISABLE: @@ -1424,6 +1420,9 @@ NTSTATUS midi_in_message(void *args) switch (params->msg) { + case DRVM_INIT: + *params->err = midi_init(); + break; case DRVM_EXIT: case DRVM_ENABLE: case DRVM_DISABLE: diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index b768517e655..4db38537dd0 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -59,22 +59,6 @@ static void notify_client(struct notify_context *notify) * MIDI entry points * *======================================================================*/ -/************************************************************************** - * ALSA_MidiInit [internal] - * - * Initializes the MIDI devices information variables - */ -static BOOL ALSA_MidiInit(void) -{ - struct midi_init_params params; - UINT err; - - params.err = &err; - ALSA_CALL(midi_init, &params); - - return TRUE; -} - /************************************************************************** * midMessage (WINEALSA.@) */ @@ -87,11 +71,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - switch (wMsg) { - case DRVM_INIT: - ALSA_MidiInit(); - return 0; - } params.dev_id = wDevID; params.msg = wMsg; @@ -123,12 +102,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - switch (wMsg) { - case DRVM_INIT: - ALSA_MidiInit(); - return 0; - } - params.dev_id = wDevID; params.msg = wMsg; params.user = dwUser; diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index ad8865a0988..7d7be1e140d 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -207,11 +207,6 @@ struct get_prop_value_params unsigned int *buffer_size; }; -struct midi_init_params -{ - UINT *err; -}; - struct notify_context { BOOL send_notify; @@ -278,14 +273,12 @@ enum alsa_funcs alsa_set_event_handle, alsa_is_started, alsa_get_prop_value, - alsa_midi_init, alsa_midi_release, alsa_midi_out_message, alsa_midi_in_message, alsa_midi_notify_wait, }; -NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_release(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_out_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_in_message(void *args) DECLSPEC_HIDDEN; -- 2.25.1

2 1

[PATCH 4/6] winealsa: Move MIDM_OPEN and MIDM_CLOSE to the unixlib.
by Huw Davies 25 Mar '22

25 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/Makefile.in | 2 +- dlls/winealsa.drv/alsa.c | 4 - dlls/winealsa.drv/alsamidi.c | 231 ++++++++++++++++++++++++--- dlls/winealsa.drv/midi.c | 287 ---------------------------------- dlls/winealsa.drv/unixlib.h | 33 ---- 5 files changed, 206 insertions(+), 351 deletions(-) diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in index 41be57d8b83..2113594fbe3 100644 --- a/dlls/winealsa.drv/Makefile.in +++ b/dlls/winealsa.drv/Makefile.in @@ -3,7 +3,7 @@ MODULE = winealsa.drv UNIXLIB = winealsa.so IMPORTS = uuid ole32 advapi32 DELAYIMPORTS = winmm -EXTRALIBS = $(ALSA_LIBS) +EXTRALIBS = $(ALSA_LIBS) $(PTHREAD_LIBS) EXTRADLLFLAGS = -mcygwin diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index b18588ab1c0..e068f6608f3 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2449,8 +2449,4 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_out_message, midi_in_message, midi_notify_wait, - - midi_seq_lock, /* temporary */ - midi_seq_open, - midi_handle_event, }; diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 1633268b533..8ec646281d2 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -60,6 +60,19 @@ struct midi_dest int port_out; }; +struct midi_src +{ + int state; /* -1 disabled, 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */ + MIDIOPENDESC midiDesc; + WORD wFlags; + MIDIHDR *lpQueueHdr; + UINT startTime; + MIDIINCAPSW caps; + snd_seq_t *seq; + snd_seq_addr_t addr; + int port_in; +}; + static pthread_mutex_t seq_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t in_buffer_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -70,6 +83,10 @@ static snd_seq_t *midi_seq; static unsigned int seq_refs; static int port_in = -1; +static unsigned int num_midi_in_started; +static int rec_cancel_pipe[2]; +static pthread_t rec_thread_id; + static pthread_mutex_t notify_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_cond_t notify_cond = PTHREAD_COND_INITIALIZER; static BOOL notify_quit; @@ -87,14 +104,6 @@ static void seq_unlock(void) pthread_mutex_unlock(&seq_mutex); } -NTSTATUS midi_seq_lock(void *args) -{ - if (args) seq_lock(); - else seq_unlock(); - - return STATUS_SUCCESS; -} - static void in_buffer_lock(void) { pthread_mutex_lock(&in_buffer_mutex); @@ -233,18 +242,6 @@ static void seq_close(void) seq_unlock(); } -NTSTATUS midi_seq_open(void *args) -{ - struct midi_seq_open_params *params = args; - - if (!params->close) - params->seq = seq_open(params->port_in); - else - seq_close(); - - return STATUS_SUCCESS; -} - static int alsa_to_win_device_type(unsigned int type) { /* MOD_MIDIPORT output port @@ -458,8 +455,6 @@ NTSTATUS midi_init(void *args) free( pinfo ); *params->err = NOERROR; - params->num_srcs = num_srcs; - params->srcs = srcs; TRACE("End\n"); @@ -1033,9 +1028,8 @@ static void handle_regular_event(struct midi_src *src, snd_seq_event_t *ev) } } -NTSTATUS midi_handle_event(void *args) +static void midi_handle_event(snd_seq_event_t *ev) { - snd_seq_event_t *ev = args; struct midi_src *src; /* Find the target device */ @@ -1043,14 +1037,193 @@ NTSTATUS midi_handle_event(void *args) if ((ev->source.client == src->addr.client) && (ev->source.port == src->addr.port)) break; if ((src == srcs + num_srcs) || (src->state != 1)) - return STATUS_SUCCESS; + return; if (ev->type == SND_SEQ_EVENT_SYSEX) handle_sysex_event(src, ev->data.ext.ptr, ev->data.ext.len); else handle_regular_event(src, ev); +} - return STATUS_SUCCESS; +static void *rec_thread_proc(void *arg) +{ + snd_seq_t *midi_seq = (snd_seq_t *)arg; + int num_fds; + struct pollfd *pollfd; + int ret; + + /* Add on one for the read end of the cancel pipe */ + num_fds = snd_seq_poll_descriptors_count(midi_seq, POLLIN) + 1; + pollfd = malloc(num_fds * sizeof(struct pollfd)); + + while(1) + { + pollfd[0].fd = rec_cancel_pipe[0]; + pollfd[0].events = POLLIN; + + seq_lock(); + snd_seq_poll_descriptors(midi_seq, pollfd + 1, num_fds - 1, POLLIN); + seq_unlock(); + + /* Check if an event is present */ + if (poll(pollfd, num_fds, -1) <= 0) + continue; + + if (pollfd[0].revents & POLLIN) /* cancelled */ + break; + + do + { + snd_seq_event_t *ev; + + seq_lock(); + snd_seq_event_input(midi_seq, &ev); + seq_unlock(); + + if (ev) + { + midi_handle_event(ev); + snd_seq_free_event(ev); + } + + seq_lock(); + ret = snd_seq_event_input_pending(midi_seq, 0); + seq_unlock(); + } while(ret > 0); + } + + free(pollfd); + return 0; +} + +static UINT midi_in_open(WORD dev_id, MIDIOPENDESC *desc, UINT flags, struct notify_context *notify) +{ + struct midi_src *src; + int ret = 0, port_in; + snd_seq_t *midi_seq; + + TRACE("(%04X, %p, %08X);\n", dev_id, desc, flags); + + if (!desc) + { + WARN("Invalid Parameter !\n"); + return MMSYSERR_INVALPARAM; + } + + /* FIXME: check that contents of desc are correct */ + + if (dev_id >= num_srcs) + { + WARN("dev_id too large (%u) !\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + src = srcs + dev_id; + + if (src->state == -1) + { + WARN("device disabled\n"); + return MIDIERR_NODEVICE; + } + if (src->midiDesc.hMidi) + { + WARN("device already open !\n"); + return MMSYSERR_ALLOCATED; + } + if (flags & MIDI_IO_STATUS) + { + WARN("No support for MIDI_IO_STATUS in flags yet, ignoring it\n"); + flags &= ~MIDI_IO_STATUS; + } + if (flags & ~CALLBACK_TYPEMASK) + { + FIXME("Bad flags %08X\n", flags); + return MMSYSERR_INVALFLAG; + } + + if (!(midi_seq = seq_open(&port_in))) + return MMSYSERR_ERROR; + + src->wFlags = HIWORD(flags & CALLBACK_TYPEMASK); + + src->lpQueueHdr = NULL; + src->midiDesc = *desc; + src->state = 0; + src->startTime = 0; + src->seq = midi_seq; + src->port_in = port_in; + + /* Connect our app port to the device port */ + seq_lock(); + ret = snd_seq_connect_from(midi_seq, port_in, src->addr.client, src->addr.port); + seq_unlock(); + if (ret < 0) + return MMSYSERR_NOTENABLED; + + TRACE("Input port :%d connected %d:%d\n", port_in, src->addr.client, src->addr.port); + + if (num_midi_in_started++ == 0) + { + pipe(rec_cancel_pipe); + if (pthread_create(&rec_thread_id, NULL, rec_thread_proc, midi_seq)) + { + close(rec_cancel_pipe[0]); + close(rec_cancel_pipe[1]); + num_midi_in_started = 0; + WARN("Couldn't create thread for midi-in\n"); + seq_close(); + return MMSYSERR_ERROR; + } + } + + set_in_notify(notify, src, dev_id, MIM_OPEN, 0, 0); + return MMSYSERR_NOERROR; +} + +static UINT midi_in_close(WORD dev_id, struct notify_context *notify) +{ + struct midi_src *src; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_srcs) + { + WARN("dev_id too big (%u) !\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + src = srcs + dev_id; + if (!src->midiDesc.hMidi) + { + WARN("device not opened !\n"); + return MMSYSERR_ERROR; + } + if (src->lpQueueHdr) + return MIDIERR_STILLPLAYING; + + if (src->seq == NULL) + { + WARN("ooops !\n"); + return MMSYSERR_ERROR; + } + if (--num_midi_in_started == 0) + { + TRACE("Stopping thread for midi-in\n"); + write(rec_cancel_pipe[1], "x", 1); + pthread_join(rec_thread_id, NULL); + close(rec_cancel_pipe[0]); + close(rec_cancel_pipe[1]); + TRACE("Stopped thread for midi-in\n"); + } + + seq_lock(); + snd_seq_disconnect_from(src->seq, src->port_in, src->addr.client, src->addr.port); + seq_unlock(); + seq_close(); + + set_in_notify(notify, src, dev_id, MIM_CLOSE, 0, 0); + src->midiDesc.hMidi = 0; + src->seq = NULL; + + return MMSYSERR_NOERROR; } static UINT midi_in_add_buffer(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) @@ -1257,6 +1430,12 @@ NTSTATUS midi_in_message(void *args) /* FIXME: Pretend this is supported */ *params->err = MMSYSERR_NOERROR; break; + case MIDM_OPEN: + *params->err = midi_in_open(params->dev_id, (MIDIOPENDESC *)params->param_1, params->param_2, params->notify); + break; + case MIDM_CLOSE: + *params->err = midi_in_close(params->dev_id, params->notify); + break; case MIDM_ADDBUFFER: *params->err = midi_in_add_buffer(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); break; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 327d4b7b200..b768517e655 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -47,26 +47,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); -static WINE_MIDIIN *MidiInDev; - -/* this is the total number of MIDI out devices found */ -static int MIDM_NumDevs = 0; - -static int numStartedMidiIn = 0; - -static int rec_cancel_pipe[2]; -static HANDLE hThread; - -static void seq_lock(void) -{ - ALSA_CALL(midi_seq_lock, (void *)(UINT_PTR)1); -} - -static void seq_unlock(void) -{ - ALSA_CALL(midi_seq_lock, (void *)(UINT_PTR)0); -} - static void notify_client(struct notify_context *notify) { TRACE("dev_id = %d msg = %d param1 = %04lX param2 = %04lX\n", notify->dev_id, notify->msg, notify->param_1, notify->param_2); @@ -75,264 +55,6 @@ static void notify_client(struct notify_context *notify) notify->instance, notify->param_1, notify->param_2); } -/*======================================================================* - * Low level MIDI implementation * - *======================================================================*/ - -#if 0 /* Debug Purpose */ -static void error_handler(const char* file, int line, const char* function, int err, const char* fmt, ...) -{ - va_list arg; - if (err == ENOENT) - return; - va_start(arg, fmt); - fprintf(stderr, "ALSA lib %s:%i:(%s) ", file, line, function); - vfprintf(stderr, fmt, arg); - if (err) - fprintf(stderr, ": %s", snd_strerror(err)); - putc('\n', stderr); - va_end(arg); -} -#endif - -/************************************************************************** - * MIDI_NotifyClient [internal] - */ -static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, - DWORD_PTR dwParam1, DWORD_PTR dwParam2) -{ - DWORD_PTR dwCallBack; - UINT uFlags; - HANDLE hDev; - DWORD_PTR dwInstance; - - TRACE("wDevID = %04X wMsg = %d dwParm1 = %04lX dwParam2 = %04lX\n", - wDevID, wMsg, dwParam1, dwParam2); - - switch (wMsg) { - case MIM_OPEN: - case MIM_CLOSE: - if (wDevID > MIDM_NumDevs) return; - - dwCallBack = MidiInDev[wDevID].midiDesc.dwCallback; - uFlags = MidiInDev[wDevID].wFlags; - hDev = MidiInDev[wDevID].midiDesc.hMidi; - dwInstance = MidiInDev[wDevID].midiDesc.dwInstance; - break; - default: - ERR("Unsupported MSW-MIDI message %u\n", wMsg); - return; - } - - DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); -} - -/************************************************************************** - * midiOpenSeq [internal] - */ -static snd_seq_t *midiOpenSeq(int *port_in_ret) -{ - struct midi_seq_open_params params; - - params.port_in = port_in_ret; - params.close = 0; - ALSA_CALL(midi_seq_open, &params); - - return params.seq; -} - -/************************************************************************** - * midiCloseSeq [internal] - */ -static int midiCloseSeq(void) -{ - struct midi_seq_open_params params; - - params.port_in = NULL; - params.close = 1; - ALSA_CALL(midi_seq_open, &params); - - return 0; -} - -static DWORD WINAPI midRecThread(void *arg) -{ - snd_seq_t *midi_seq = arg; - int num_fds; - struct pollfd *pollfd; - int ret; - - /* Add on one for the read end of the cancel pipe */ - num_fds = snd_seq_poll_descriptors_count(midi_seq, POLLIN) + 1; - pollfd = malloc(num_fds * sizeof(struct pollfd)); - - while(1) { - pollfd[0].fd = rec_cancel_pipe[0]; - pollfd[0].events = POLLIN; - - seq_lock(); - snd_seq_poll_descriptors(midi_seq, pollfd + 1, num_fds - 1, POLLIN); - seq_unlock(); - - /* Check if an event is present */ - if (poll(pollfd, num_fds, -1) <= 0) - continue; - - if (pollfd[0].revents & POLLIN) /* cancelled */ - break; - - do { - snd_seq_event_t *ev; - - seq_lock(); - snd_seq_event_input(midi_seq, &ev); - seq_unlock(); - - if (ev) { - ALSA_CALL(midi_handle_event, ev); - snd_seq_free_event(ev); - } - - seq_lock(); - ret = snd_seq_event_input_pending(midi_seq, 0); - seq_unlock(); - } while(ret > 0); - } - - free(pollfd); - return 0; -} - -/************************************************************************** - * midOpen [internal] - */ -static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) -{ - int ret = 0, port_in; - snd_seq_t *midi_seq; - - TRACE("(%04X, %p, %08X);\n", wDevID, lpDesc, dwFlags); - - if (lpDesc == NULL) { - WARN("Invalid Parameter !\n"); - return MMSYSERR_INVALPARAM; - } - - /* FIXME : - * how to check that content of lpDesc is correct ? - */ - if (wDevID >= MIDM_NumDevs) { - WARN("wDevID too large (%u) !\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - if (MidiInDev[wDevID].state == -1) { - WARN("device disabled\n"); - return MIDIERR_NODEVICE; - } - if (MidiInDev[wDevID].midiDesc.hMidi != 0) { - WARN("device already open !\n"); - return MMSYSERR_ALLOCATED; - } - if ((dwFlags & MIDI_IO_STATUS) != 0) { - WARN("No support for MIDI_IO_STATUS in dwFlags yet, ignoring it\n"); - dwFlags &= ~MIDI_IO_STATUS; - } - if ((dwFlags & ~CALLBACK_TYPEMASK) != 0) { - FIXME("Bad dwFlags\n"); - return MMSYSERR_INVALFLAG; - } - - if (!(midi_seq = midiOpenSeq(&port_in))) { - return MMSYSERR_ERROR; - } - - MidiInDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); - - MidiInDev[wDevID].lpQueueHdr = NULL; - MidiInDev[wDevID].midiDesc = *lpDesc; - MidiInDev[wDevID].state = 0; - MidiInDev[wDevID].startTime = 0; - MidiInDev[wDevID].seq = midi_seq; - MidiInDev[wDevID].port_in = port_in; - - /* Connect our app port to the device port */ - seq_lock(); - ret = snd_seq_connect_from(midi_seq, port_in, MidiInDev[wDevID].addr.client, - MidiInDev[wDevID].addr.port); - seq_unlock(); - if (ret < 0) - return MMSYSERR_NOTENABLED; - - TRACE("Input port :%d connected %d:%d\n",port_in,MidiInDev[wDevID].addr.client,MidiInDev[wDevID].addr.port); - - if (numStartedMidiIn++ == 0) { - pipe(rec_cancel_pipe); - hThread = CreateThread(NULL, 0, midRecThread, midi_seq, 0, NULL); - if (!hThread) { - close(rec_cancel_pipe[0]); - close(rec_cancel_pipe[1]); - numStartedMidiIn = 0; - WARN("Couldn't create thread for midi-in\n"); - midiCloseSeq(); - return MMSYSERR_ERROR; - } - SetThreadPriority(hThread, THREAD_PRIORITY_TIME_CRITICAL); - TRACE("Created thread for midi-in\n"); - } - - MIDI_NotifyClient(wDevID, MIM_OPEN, 0L, 0L); - return MMSYSERR_NOERROR; -} - -/************************************************************************** - * midClose [internal] - */ -static DWORD midClose(WORD wDevID) -{ - int ret = MMSYSERR_NOERROR; - - TRACE("(%04X);\n", wDevID); - - if (wDevID >= MIDM_NumDevs) { - WARN("wDevID too big (%u) !\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - if (MidiInDev[wDevID].midiDesc.hMidi == 0) { - WARN("device not opened !\n"); - return MMSYSERR_ERROR; - } - if (MidiInDev[wDevID].lpQueueHdr != 0) { - return MIDIERR_STILLPLAYING; - } - - if (MidiInDev[wDevID].seq == NULL) { - WARN("ooops !\n"); - return MMSYSERR_ERROR; - } - if (--numStartedMidiIn == 0) { - TRACE("Stopping thread for midi-in\n"); - write(rec_cancel_pipe[1], "x", 1); - if (WaitForSingleObject(hThread, 5000) != WAIT_OBJECT_0) { - WARN("Thread end not signaled, force termination\n"); - TerminateThread(hThread, 0); - } - close(rec_cancel_pipe[0]); - close(rec_cancel_pipe[1]); - TRACE("Stopped thread for midi-in\n"); - } - - seq_lock(); - snd_seq_disconnect_from(MidiInDev[wDevID].seq, MidiInDev[wDevID].port_in, MidiInDev[wDevID].addr.client, MidiInDev[wDevID].addr.port); - seq_unlock(); - midiCloseSeq(); - - MIDI_NotifyClient(wDevID, MIM_CLOSE, 0L, 0L); - MidiInDev[wDevID].midiDesc.hMidi = 0; - MidiInDev[wDevID].seq = NULL; - - return ret; -} - /*======================================================================* * MIDI entry points * *======================================================================*/ @@ -350,11 +72,6 @@ static BOOL ALSA_MidiInit(void) params.err = &err; ALSA_CALL(midi_init, &params); - if (!err) - { - MIDM_NumDevs = params.num_srcs; - MidiInDev = params.srcs; - } return TRUE; } @@ -374,10 +91,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case DRVM_INIT: ALSA_MidiInit(); return 0; - case MIDM_OPEN: - return midOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); - case MIDM_CLOSE: - return midClose(wDevID); } params.dev_id = wDevID; diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 46f256a1c6a..ad8865a0988 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -207,27 +207,9 @@ struct get_prop_value_params unsigned int *buffer_size; }; -#include <alsa/asoundlib.h> -#include "mmddk.h" - -typedef struct midi_src -{ - int state; /* -1 disabled, 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */ - MIDIOPENDESC midiDesc; - WORD wFlags; - MIDIHDR *lpQueueHdr; - UINT startTime; - MIDIINCAPSW caps; - snd_seq_t *seq; - snd_seq_addr_t addr; - int port_in; -} WINE_MIDIIN; - struct midi_init_params { UINT *err; - unsigned int num_srcs; - void *srcs; }; struct notify_context @@ -271,13 +253,6 @@ struct midi_notify_wait_params struct notify_context *notify; }; -struct midi_seq_open_params -{ - int close; - snd_seq_t *seq; - int *port_in; -}; - enum alsa_funcs { alsa_get_endpoint_ids, @@ -308,10 +283,6 @@ enum alsa_funcs alsa_midi_out_message, alsa_midi_in_message, alsa_midi_notify_wait, - - alsa_midi_seq_lock, /* temporary */ - alsa_midi_seq_open, - alsa_midi_handle_event, }; NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; @@ -320,10 +291,6 @@ NTSTATUS midi_out_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_in_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_notify_wait(void *args) DECLSPEC_HIDDEN; -NTSTATUS midi_seq_lock(void *args) DECLSPEC_HIDDEN; -NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN; -NTSTATUS midi_handle_event(void *args) DECLSPEC_HIDDEN; - extern unixlib_handle_t alsa_handle; #define ALSA_CALL(func, params) __wine_unix_call(alsa_handle, alsa_ ## func, params) -- 2.25.1

2 1

[PATCH 3/6] winealsa: Use a pipe to signal the end of the record thread.
by Huw Davies 25 Mar '22

25 Mar '22

This means the thread doesn't have to wake every 250ms to test "end_thread". Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/midi.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 4cc906b03ca..327d4b7b200 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -54,7 +54,7 @@ static int MIDM_NumDevs = 0; static int numStartedMidiIn = 0; -static int end_thread; +static int rec_cancel_pipe[2]; static HANDLE hThread; static void seq_lock(void) @@ -162,18 +162,25 @@ static DWORD WINAPI midRecThread(void *arg) struct pollfd *pollfd; int ret; - num_fds = snd_seq_poll_descriptors_count(midi_seq, POLLIN); + /* Add on one for the read end of the cancel pipe */ + num_fds = snd_seq_poll_descriptors_count(midi_seq, POLLIN) + 1; pollfd = malloc(num_fds * sizeof(struct pollfd)); - while(!end_thread) { + while(1) { + pollfd[0].fd = rec_cancel_pipe[0]; + pollfd[0].events = POLLIN; + seq_lock(); - snd_seq_poll_descriptors(midi_seq, pollfd, num_fds, POLLIN); + snd_seq_poll_descriptors(midi_seq, pollfd + 1, num_fds - 1, POLLIN); seq_unlock(); /* Check if an event is present */ - if (poll(pollfd, num_fds, 250) <= 0) + if (poll(pollfd, num_fds, -1) <= 0) continue; + if (pollfd[0].revents & POLLIN) /* cancelled */ + break; + do { snd_seq_event_t *ev; @@ -259,9 +266,11 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) TRACE("Input port :%d connected %d:%d\n",port_in,MidiInDev[wDevID].addr.client,MidiInDev[wDevID].addr.port); if (numStartedMidiIn++ == 0) { - end_thread = 0; + pipe(rec_cancel_pipe); hThread = CreateThread(NULL, 0, midRecThread, midi_seq, 0, NULL); if (!hThread) { + close(rec_cancel_pipe[0]); + close(rec_cancel_pipe[1]); numStartedMidiIn = 0; WARN("Couldn't create thread for midi-in\n"); midiCloseSeq(); @@ -302,11 +311,13 @@ static DWORD midClose(WORD wDevID) } if (--numStartedMidiIn == 0) { TRACE("Stopping thread for midi-in\n"); - end_thread = 1; + write(rec_cancel_pipe[1], "x", 1); if (WaitForSingleObject(hThread, 5000) != WAIT_OBJECT_0) { WARN("Thread end not signaled, force termination\n"); TerminateThread(hThread, 0); } + close(rec_cancel_pipe[0]); + close(rec_cancel_pipe[1]); TRACE("Stopped thread for midi-in\n"); } -- 2.25.1

2 1

[PATCH 2/6] winealsa: Allocate the pollfd array at the start.
by Huw Davies 25 Mar '22

25 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/midi.c | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 8009b23ce3d..4cc906b03ca 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -158,33 +158,21 @@ static int midiCloseSeq(void) static DWORD WINAPI midRecThread(void *arg) { snd_seq_t *midi_seq = arg; - int npfd; - struct pollfd *pfd; + int num_fds; + struct pollfd *pollfd; int ret; - TRACE("Thread startup\n"); + num_fds = snd_seq_poll_descriptors_count(midi_seq, POLLIN); + pollfd = malloc(num_fds * sizeof(struct pollfd)); while(!end_thread) { - TRACE("Thread loop\n"); seq_lock(); - npfd = snd_seq_poll_descriptors_count(midi_seq, POLLIN); - pfd = HeapAlloc(GetProcessHeap(), 0, npfd * sizeof(struct pollfd)); - snd_seq_poll_descriptors(midi_seq, pfd, npfd, POLLIN); + snd_seq_poll_descriptors(midi_seq, pollfd, num_fds, POLLIN); seq_unlock(); /* Check if an event is present */ - if (poll(pfd, npfd, 250) <= 0) { - HeapFree(GetProcessHeap(), 0, pfd); - continue; - } - - /* Note: This definitely does not work. - * while(snd_seq_event_input_pending(midi_seq, 0) > 0) { - snd_seq_event_t* ev; - snd_seq_event_input(midi_seq, &ev); - .................... - snd_seq_free_event(ev); - }*/ + if (poll(pollfd, num_fds, 250) <= 0) + continue; do { snd_seq_event_t *ev; @@ -202,9 +190,9 @@ static DWORD WINAPI midRecThread(void *arg) ret = snd_seq_event_input_pending(midi_seq, 0); seq_unlock(); } while(ret > 0); - - HeapFree(GetProcessHeap(), 0, pfd); } + + free(pollfd); return 0; } -- 2.25.1

2 1

[PATCH 1/6] winealsa: Introduce a helper to retrieve the time.
by Huw Davies 25 Mar '22

25 Mar '22

The motivation is that this will need to be called from a non-Win32 thread and so shouldn't use the Win32 API. An added benefit is that it will eliminate the 16ms jitter associated with GetTickCount(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsamidi.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 30c46eee64d..1633268b533 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -31,6 +31,7 @@ #include <stdarg.h> #include <stdio.h> #include <pthread.h> +#include <time.h> #include <alsa/asoundlib.h> #include "ntstatus.h" @@ -104,6 +105,18 @@ static void in_buffer_unlock(void) pthread_mutex_unlock(&in_buffer_mutex); } +static uint64_t get_time_msec(void) +{ + struct timespec now = {0, 0}; + +#ifdef CLOCK_MONOTONIC_RAW + if (!clock_gettime(CLOCK_MONOTONIC_RAW, &now)) + return (uint64_t)now.tv_sec * 1000 + now.tv_nsec / 1000000; +#endif + clock_gettime(CLOCK_MONOTONIC, &now); + return (uint64_t)now.tv_sec * 1000 + now.tv_nsec / 1000000; +} + static void set_in_notify(struct notify_context *notify, struct midi_src *src, WORD dev_id, WORD msg, UINT_PTR param_1, UINT_PTR param_2) { @@ -924,7 +937,7 @@ static UINT midi_out_reset(WORD dev_id) static void handle_sysex_event(struct midi_src *src, BYTE *data, UINT len) { - UINT pos = 0, copy_len, current_time = NtGetTickCount() - src->startTime; + UINT pos = 0, copy_len, current_time = get_time_msec() - src->startTime; struct notify_context notify; MIDIHDR *hdr; @@ -957,7 +970,7 @@ static void handle_sysex_event(struct midi_src *src, BYTE *data, UINT len) static void handle_regular_event(struct midi_src *src, snd_seq_event_t *ev) { - UINT data = 0, value, current_time = NtGetTickCount() - src->startTime; + UINT data = 0, value, current_time = get_time_msec() - src->startTime; struct notify_context notify; switch (ev->type) @@ -1127,7 +1140,7 @@ static UINT midi_in_start(WORD dev_id) if (src->state == -1) return MIDIERR_NODEVICE; src->state = 1; - src->startTime = NtGetTickCount(); + src->startTime = get_time_msec(); return MMSYSERR_NOERROR; } @@ -1147,7 +1160,7 @@ static UINT midi_in_stop(WORD dev_id) static DWORD midi_in_reset(WORD dev_id, struct notify_context *notify) { - UINT cur_time = NtGetTickCount(); + UINT cur_time = get_time_msec(); UINT err = MMSYSERR_NOERROR; struct midi_src *src; MIDIHDR *hdr; -- 2.25.1

2 1

[PATCH v2] wined3d: Add full dirty region at texture creation.
by Paul Gofman 25 Mar '22

25 Mar '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - dirtify all layers. dlls/d3d8/tests/visual.c | 20 +++++++++++++++++--- dlls/d3d9/tests/visual.c | 20 +++++++++++++++++--- dlls/wined3d/texture.c | 12 ++++++++---- 3 files changed, 42 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index b7f6dd62e9c..41fc0cbf16a 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5531,9 +5531,6 @@ static void add_dirty_rect_test(void) hr = IDirect3DTexture8_GetSurfaceLevel(tex_dynamic, 0, &surface_dynamic); ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); - fill_surface(surface_src_red, 0x00ff0000, 0); - fill_surface(surface_src_green, 0x0000ff00, 0); - hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_TEX1); ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); @@ -5543,6 +5540,23 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MIPFILTER, D3DTEXF_POINT); ok(SUCCEEDED(hr), "Failed to set mip filter, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)tex_dst2); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)tex_src_red, + (IDirect3DBaseTexture8 *)tex_dst2); + fill_surface(surface_src_green, 0x00000080, D3DLOCK_NO_DIRTY_UPDATE); + hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)tex_src_green, + (IDirect3DBaseTexture8 *)tex_dst2); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x00000080, 1), "Unexpected colour 0x%08x.\n", color); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + + fill_surface(surface_src_red, 0x00ff0000, 0); + fill_surface(surface_src_green, 0x0000ff00, 0); + hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)tex_src_green, (IDirect3DBaseTexture8 *)tex_dst1); ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 89f9e9cf2c6..9f9055483b1 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19394,9 +19394,6 @@ static void add_dirty_rect_test(void) hr = IDirect3DTexture9_GetSurfaceLevel(tex_dynamic, 0, &surface_dynamic); ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); - fill_surface(surface_src_red, 0x00ff0000, 0); - fill_surface(surface_src_green, 0x0000ff00, 0); - hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); @@ -19406,6 +19403,23 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_POINT); ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)tex_dst2); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)tex_src_red, + (IDirect3DBaseTexture9 *)tex_dst2); + fill_surface(surface_src_green, 0x00000080, D3DLOCK_NO_DIRTY_UPDATE); + hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)tex_src_green, + (IDirect3DBaseTexture9 *)tex_dst2); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x00000080, 1), "Unexpected colour 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + + fill_surface(surface_src_red, 0x00ff0000, 0); + fill_surface(surface_src_green, 0x0000ff00, 0); + hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)tex_src_green, (IDirect3DBaseTexture9 *)tex_dst1); ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ebe770af0d2..c495de171d5 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3895,11 +3895,15 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->flags |= WINED3D_TEXTURE_GENERATE_MIPMAPS; } - if (flags & WINED3D_TEXTURE_CREATE_RECORD_DIRTY_REGIONS - && !(texture->dirty_regions = heap_calloc(texture->layer_count, sizeof(*texture->dirty_regions)))) + if (flags & WINED3D_TEXTURE_CREATE_RECORD_DIRTY_REGIONS) { - wined3d_texture_cleanup_sync(texture); - return E_OUTOFMEMORY; + if (!(texture->dirty_regions = heap_calloc(texture->layer_count, sizeof(*texture->dirty_regions)))) + { + wined3d_texture_cleanup_sync(texture); + return E_OUTOFMEMORY; + } + for (i = 0; i < texture->layer_count; ++i) + wined3d_texture_dirty_region_add(texture, i, NULL); } /* Precalculated scaling for 'faked' non power of two texture coords. */ -- 2.35.1

2 1

[PATCH v2] wined3d: Reuse deferred uploads heaps.
by Jan Sikorski 25 Mar '22

25 Mar '22

Avoids needing to fault-in the memory on each recording. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- The HeapFree loop over uploads in a command list is still a little concerning. If it turns out to be an issue, we could allocate larger buffers based on previous usage and fit multiple uploads in it. v2: Fixed heap_alloc size. --- dlls/wined3d/cs.c | 55 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 63d6ed4c123..cf7debe4256 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -49,13 +49,15 @@ struct wined3d_command_list SIZE_T data_size; void *data; - HANDLE upload_heap; SIZE_T resource_count; struct wined3d_resource **resources; SIZE_T upload_count; struct wined3d_deferred_upload *uploads; + HANDLE upload_heap; + LONG *upload_heap_refcount; + /* List of command lists queued for execution on this command list. We might * be the only thing holding a pointer to another command list, so we need * to hold a reference here (and in wined3d_deferred_context) as well. */ @@ -3960,7 +3962,6 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) struct wined3d_deferred_context { struct wined3d_device_context c; - HANDLE upload_heap; SIZE_T data_size, data_capacity; void *data; @@ -3971,6 +3972,9 @@ struct wined3d_deferred_context SIZE_T upload_count, uploads_capacity; struct wined3d_deferred_upload *uploads; + HANDLE upload_heap; + LONG *upload_heap_refcount; + /* List of command lists queued for execution on this context. A command * list can be the only thing holding a pointer to another command list, so * we need to hold a reference here and in wined3d_command_list as well. */ @@ -4090,12 +4094,22 @@ static bool wined3d_deferred_context_map_upload_bo(struct wined3d_device_context deferred->upload_count + 1, sizeof(*deferred->uploads))) return false; - if (!deferred->upload_heap) - deferred->upload_heap = HeapCreate(HEAP_NO_SERIALIZE, 0, 0); if (!deferred->upload_heap) { - ERR("Failed to create upload heap.\n"); - return false; + if (!(deferred->upload_heap = HeapCreate(0, 0, 0))) + { + ERR("Failed to create upload heap.\n"); + return false; + } + + if (!(deferred->upload_heap_refcount = heap_alloc(sizeof(*deferred->upload_heap_refcount)))) + { + HeapDestroy(deferred->upload_heap); + deferred->upload_heap = 0; + return false; + } + + *deferred->upload_heap_refcount = 1; } if (!(sysmem = HeapAlloc(deferred->upload_heap, 0, size + RESOURCE_ALIGNMENT - 1))) @@ -4243,9 +4257,20 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte heap_free(deferred->resources); for (i = 0; i < deferred->upload_count; ++i) + { wined3d_resource_decref(deferred->uploads[i].resource); + HeapFree(deferred->upload_heap, 0, deferred->uploads[i].resource); + } + if (deferred->upload_heap) - HeapDestroy(deferred->upload_heap); + { + if (!InterlockedDecrement(deferred->upload_heap_refcount)) + { + HeapDestroy(deferred->upload_heap); + heap_free(deferred->upload_heap_refcount); + } + } + heap_free(deferred->uploads); for (i = 0; i < deferred->command_list_count; ++i) @@ -4331,7 +4356,8 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->query_count = 0; object->upload_heap = deferred->upload_heap; - deferred->upload_heap = 0; + if ((object->upload_heap_refcount = deferred->upload_heap_refcount)) + InterlockedIncrement(object->upload_heap_refcount); /* This is in fact recorded into a subsequent command list. */ if (restore) @@ -4349,11 +4375,22 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device static void wined3d_command_list_destroy_object(void *object) { struct wined3d_command_list *list = object; + unsigned int i; TRACE("list %p.\n", list); + for (i = 0; i < list->upload_count; ++i) + HeapFree(list->upload_heap, 0, list->uploads[i].sysmem); + if (list->upload_heap) - HeapDestroy(list->upload_heap); + { + if (!InterlockedDecrement(list->upload_heap_refcount)) + { + HeapDestroy(list->upload_heap); + heap_free(list->upload_heap_refcount); + } + } + heap_free(list); } -- 2.32.0

2 1

[PATCH] crypt32: Add partial support for decoding OCSP_BASIC_RESPONSE_INFO structures.
by Hans Leidekker 25 Mar '22

25 Mar '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/decode.c | 243 ++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 58 +++++++++ 2 files changed, 301 insertions(+) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index be36d3ef7b8..762d1b54661 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -6287,6 +6287,246 @@ static BOOL WINAPI CRYPT_AsnDecodeOCSPBasicSignedResponse(DWORD dwCertEncodingTy return ret; } +static BOOL CRYPT_AsnDecodeOCSPHashAlgorithm(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + DWORD dataLen; + BOOL ret; + + if (!cbEncoded) + { + SetLastError(CRYPT_E_ASN1_EOD); + return FALSE; + } + if (pbEncoded[0] != ASN_SEQUENCEOF) + { + SetLastError(CRYPT_E_ASN1_BADTAG); + return FALSE; + } + + if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) + { + BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); + DWORD bytesDecoded; + if (dataLen) + { + ret = CRYPT_AsnDecodeAlgorithmId(pbEncoded + 1 + lenBytes, cbEncoded - 1 - lenBytes, dwFlags, + pvStructInfo, pcbStructInfo, &bytesDecoded); + if (ret) *pcbDecoded = bytesDecoded + lenBytes + 1; + } + } + return ret; +} + +static BOOL CRYPT_AsnDecodeOCSPNextUpdate(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + DWORD dataLen; + BOOL ret; + + if (!cbEncoded) + { + SetLastError(CRYPT_E_ASN1_EOD); + return FALSE; + } + if (pbEncoded[0] != (ASN_CONTEXT | ASN_CONSTRUCTOR)) + { + SetLastError(CRYPT_E_ASN1_BADTAG); + return FALSE; + } + + if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) + { + BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); + DWORD bytesDecoded; + if (dataLen) + { + ret = CRYPT_AsnDecodeGeneralizedTime(pbEncoded + 1 + lenBytes, cbEncoded - 1 - lenBytes, dwFlags, + pvStructInfo, pcbStructInfo, &bytesDecoded); + if (ret) *pcbDecoded = bytesDecoded + lenBytes + 1; + } + } + return ret; +} + +static BOOL CRYPT_AsnDecodeOCSPBasicResponseEntry(const BYTE *pbEncoded, DWORD cbEncoded, + DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) +{ + struct AsnDecodeSequenceItem items[] = { + { ASN_SEQUENCEOF, offsetof(OCSP_BASIC_RESPONSE_ENTRY, CertId.HashAlgorithm.pszObjId), + CRYPT_AsnDecodeOCSPHashAlgorithm, sizeof(CRYPT_ALGORITHM_IDENTIFIER), FALSE, TRUE, + offsetof(OCSP_BASIC_RESPONSE_ENTRY, CertId.HashAlgorithm.pszObjId), 0 }, + { ASN_OCTETSTRING, offsetof(OCSP_BASIC_RESPONSE_ENTRY, CertId.IssuerNameHash), + CRYPT_AsnDecodeOctets, sizeof(CRYPT_HASH_BLOB), FALSE, TRUE, + offsetof(OCSP_BASIC_RESPONSE_ENTRY, CertId.IssuerNameHash.pbData), 0 }, + { ASN_OCTETSTRING, offsetof(OCSP_BASIC_RESPONSE_ENTRY, CertId.IssuerKeyHash), + CRYPT_AsnDecodeOctets, sizeof(CRYPT_HASH_BLOB), FALSE, TRUE, + offsetof(OCSP_BASIC_RESPONSE_ENTRY, CertId.IssuerKeyHash.pbData), 0 }, + { ASN_INTEGER, offsetof(OCSP_BASIC_RESPONSE_ENTRY, CertId.SerialNumber), + CRYPT_AsnDecodeIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), FALSE, TRUE, + offsetof(OCSP_BASIC_RESPONSE_ENTRY, CertId.SerialNumber.pbData), 0 }, + { ASN_CONTEXT, offsetof(OCSP_BASIC_RESPONSE_ENTRY, dwCertStatus), + CRYPT_AsnDecodeIntInternal, sizeof(DWORD), FALSE, FALSE, + 0, 0 }, + /* FIXME: pRevokedInfo */ + { ASN_GENERALTIME, offsetof(OCSP_BASIC_RESPONSE_ENTRY, ThisUpdate), + CRYPT_AsnDecodeGeneralizedTime, sizeof(FILETIME), FALSE, FALSE, + 0, 0 }, + { ASN_CONTEXT | ASN_CONSTRUCTOR, offsetof(OCSP_BASIC_RESPONSE_ENTRY, NextUpdate), + CRYPT_AsnDecodeOCSPNextUpdate, sizeof(FILETIME), TRUE, FALSE, + 0, 0 }, + { ASN_CONTEXT | ASN_CONSTRUCTOR /* FIXME */, offsetof(OCSP_BASIC_RESPONSE_ENTRY, cExtension), + CRYPT_AsnDecodeCertExtensions, FINALMEMBERSIZE(OCSP_BASIC_RESPONSE_ENTRY, cExtension), + TRUE, TRUE, offsetof(OCSP_BASIC_RESPONSE_ENTRY, rgExtension), 0 }, + }; + + return CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), + pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, + pcbStructInfo, pcbDecoded, NULL); +} + +static BOOL CRYPT_AsnDecodeOCSPBasicResponseEntriesArray(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + struct AsnArrayDescriptor arrayDesc = { ASN_SEQUENCEOF, + offsetof(OCSP_BASIC_RESPONSE_INFO, cResponseEntry), offsetof(OCSP_BASIC_RESPONSE_INFO, rgResponseEntry), + MEMBERSIZE(OCSP_BASIC_RESPONSE_INFO, cResponseEntry, cExtension), + CRYPT_AsnDecodeOCSPBasicResponseEntry, sizeof(OCSP_BASIC_RESPONSE_ENTRY), + FALSE, 0 }; + + return CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, + dwFlags, NULL, pvStructInfo, pcbStructInfo, pcbDecoded); +} + +static BOOL CRYPT_AsnDecodeResponderID(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + OCSP_BASIC_RESPONSE_INFO *info = pvStructInfo; + BYTE tag = pbEncoded[0] & ~3, choice = pbEncoded[0] & 3; + DWORD decodedLen, dataLen, lenBytes, bytesNeeded = sizeof(*info), len; + CERT_NAME_BLOB *blob; + + if (tag != (ASN_CONTEXT | ASN_CONSTRUCTOR)) + { + WARN("Unexpected tag %02x\n", tag); + SetLastError(CRYPT_E_ASN1_BADTAG); + return FALSE; + } + if (choice > 2) + { + WARN("Unexpected choice %02x\n", choice); + SetLastError(CRYPT_E_ASN1_CORRUPT); + return FALSE; + } + + if (pvStructInfo && *pcbStructInfo >= bytesNeeded) + info->dwResponderIdChoice = choice; + + if (!CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen)) + return FALSE; + lenBytes = GET_LEN_BYTES(pbEncoded[1]); + cbEncoded -= 1 + lenBytes; + decodedLen = 1 + lenBytes; + + if (dataLen > cbEncoded) + { + SetLastError(CRYPT_E_ASN1_EOD); + return FALSE; + } + pbEncoded += 1 + lenBytes; + if (pbEncoded[0] != ASN_OCTETSTRING) + { + WARN("Unexpected tag %02x\n", pbEncoded[0]); + SetLastError(CRYPT_E_ASN1_BADTAG); + return FALSE; + } + + if (!CRYPT_GetLen(pbEncoded, cbEncoded, &len)) + return FALSE; + lenBytes = GET_LEN_BYTES(pbEncoded[1]); + decodedLen += 1 + lenBytes + len; + cbEncoded -= 1 + lenBytes; + + if (len > cbEncoded) + { + SetLastError(CRYPT_E_ASN1_EOD); + return FALSE; + } + pbEncoded += 1 + lenBytes; + + if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) bytesNeeded += len; + if (pvStructInfo && *pcbStructInfo >= bytesNeeded) + { + blob = &info->u.ByNameResponderId; + blob->cbData = len; + if (dwFlags & CRYPT_DECODE_NOCOPY_FLAG) + blob->pbData = (BYTE *)pbEncoded; + else if (blob->cbData) + { + blob->pbData = (BYTE *)(info + 1); + memcpy(blob->pbData, pbEncoded, blob->cbData); + } + } + + if (pcbDecoded) + *pcbDecoded = decodedLen; + + if (!pvStructInfo) + { + *pcbStructInfo = bytesNeeded; + return TRUE; + } + + if (*pcbStructInfo < bytesNeeded) + { + SetLastError(ERROR_MORE_DATA); + *pcbStructInfo = bytesNeeded; + return FALSE; + } + + *pcbStructInfo = bytesNeeded; + return TRUE; +} + +static BOOL WINAPI CRYPT_AsnDecodeOCSPBasicResponse(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + CRYPT_DECODE_PARA *pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) +{ + struct AsnDecodeSequenceItem items[] = { + { 0, 0, + CRYPT_AsnDecodeResponderID, offsetof(OCSP_BASIC_RESPONSE_INFO, ProducedAt), FALSE, TRUE, + offsetof(OCSP_BASIC_RESPONSE_INFO, u.ByNameResponderId.pbData), 0 }, + { ASN_GENERALTIME, offsetof(OCSP_BASIC_RESPONSE_INFO, ProducedAt), + CRYPT_AsnDecodeGeneralizedTime, sizeof(FILETIME), FALSE, FALSE, + 0, 0 }, + { ASN_SEQUENCEOF, offsetof(OCSP_BASIC_RESPONSE_INFO, cResponseEntry), + CRYPT_AsnDecodeOCSPBasicResponseEntriesArray, MEMBERSIZE(OCSP_BASIC_RESPONSE_INFO, cResponseEntry, cExtension), + TRUE, TRUE, offsetof(OCSP_BASIC_RESPONSE_INFO, rgResponseEntry) }, + { ASN_CONTEXT | ASN_CONSTRUCTOR, offsetof(OCSP_BASIC_RESPONSE_INFO, cExtension), + CRYPT_AsnDecodeCertExtensions, FINALMEMBERSIZE(OCSP_BASIC_RESPONSE_INFO, cExtension), + TRUE, TRUE, offsetof(OCSP_BASIC_RESPONSE_INFO, rgExtension), 0 }, + }; + BOOL ret; + + __TRY + { + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), + pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, + pcbStructInfo, NULL, NULL); + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; +} + static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, LPCSTR lpszStructType) { @@ -6441,6 +6681,9 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, case LOWORD(OCSP_BASIC_SIGNED_RESPONSE): decodeFunc = CRYPT_AsnDecodeOCSPBasicSignedResponse; break; + case LOWORD(OCSP_BASIC_RESPONSE): + decodeFunc = CRYPT_AsnDecodeOCSPBasicResponse; + break; default: FIXME("Unimplemented decoder for lpszStructType OID %d\n", LOWORD(lpszStructType)); } diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index c4417a27e2c..b6325efd518 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -8948,6 +8948,63 @@ static void test_decodeOCSPBasicSignedResponseInfo(DWORD dwEncoding) LocalFree(info); } +static void test_decodeOCSPBasicResponseInfo(DWORD dwEncoding) +{ + static const BYTE resp_id[] = { + 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, + 0x95, 0x76, 0xb9, 0xf4}; + static const BYTE name_hash[] = { + 0xe4, 0xe3, 0x95, 0xa2, 0x29, 0xd3, 0xd4, 0xc1, 0xc3, 0x1f, 0xf0, 0x98, 0x0c, 0x0b, 0x4e, 0xc0, + 0x09, 0x8a, 0xab, 0xd8}; + static const BYTE key_hash[] = { + 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, + 0x95, 0x76, 0xb9, 0xf4}; + static const BYTE serial[] = { + 0xb1, 0xc1, 0x87, 0x54, 0x54, 0xac, 0x1e, 0x55, 0x40, 0xfb, 0xef, 0xd9, 0x6d, 0x8f, 0x49, 0x08}; + OCSP_BASIC_RESPONSE_INFO *info; + OCSP_BASIC_RESPONSE_ENTRY *entry; + DWORD size; + BOOL ret; + + size = 0; + ret = pCryptDecodeObjectEx(dwEncoding, OCSP_BASIC_RESPONSE, ocsp_to_be_signed, + sizeof(ocsp_to_be_signed), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); + ok(ret, "got %08lx\n", GetLastError()); + + ok(!info->dwVersion, "got %lu\n", info->dwVersion); + ok(info->dwResponderIdChoice == 2, "got %lu\n", info->dwResponderIdChoice); + ok(info->ByKeyResponderId.cbData == sizeof(resp_id), "got %lu\n", info->ByKeyResponderId.cbData); + ok(!memcmp(info->ByKeyResponderId.pbData, resp_id, sizeof(resp_id)), "wrong data\n"); + ok(info->ProducedAt.dwLowDateTime == 3438583808, "got %lu\n", info->ProducedAt.dwLowDateTime); + ok(info->ProducedAt.dwHighDateTime == 30946477, "got %lu\n", info->ProducedAt.dwHighDateTime); + ok(info->cResponseEntry == 1, "got %lu\n", info->cResponseEntry); + ok(info->rgResponseEntry != NULL, "got %p\n", info->rgResponseEntry); + + entry = info->rgResponseEntry; + ok(!strcmp(entry->CertId.HashAlgorithm.pszObjId, szOID_OIWSEC_sha1), "got '%s'\n", entry->CertId.HashAlgorithm.pszObjId); + ok(entry->CertId.HashAlgorithm.Parameters.cbData == 2, "got %lu\n", entry->CertId.HashAlgorithm.Parameters.cbData); + ok(entry->CertId.HashAlgorithm.Parameters.pbData[0] == 5, "got 0x%02x\n", entry->CertId.HashAlgorithm.Parameters.pbData[0]); + ok(!entry->CertId.HashAlgorithm.Parameters.pbData[1], "got 0x%02x\n", entry->CertId.HashAlgorithm.Parameters.pbData[1]); + ok(entry->CertId.IssuerNameHash.cbData == 20, "got %lu\n", entry->CertId.IssuerNameHash.cbData); + ok(!memcmp(entry->CertId.IssuerNameHash.pbData, name_hash, sizeof(name_hash)), "wrong data\n"); + ok(entry->CertId.IssuerKeyHash.cbData == 20, "got %lu\n", entry->CertId.IssuerKeyHash.cbData); + ok(!memcmp(entry->CertId.IssuerKeyHash.pbData, key_hash, sizeof(key_hash)), "wrong data\n"); + ok(entry->CertId.SerialNumber.cbData == 16, "got %lu\n", entry->CertId.SerialNumber.cbData); + ok(!memcmp(entry->CertId.SerialNumber.pbData, serial, sizeof(serial)), "wrong data\n"); + ok(entry->dwCertStatus == 0, "got %lu\n", entry->dwCertStatus); + ok(entry->pRevokedInfo == NULL, "got %p\n", entry->pRevokedInfo); + ok(entry->ThisUpdate.dwLowDateTime == 2558518400, "got %lu\n", entry->ThisUpdate.dwLowDateTime); + ok(entry->ThisUpdate.dwHighDateTime == 30946475, "got %lu\n", entry->ThisUpdate.dwHighDateTime); + ok(entry->NextUpdate.dwLowDateTime == 2014369408, "got %lu\n", entry->NextUpdate.dwLowDateTime); + ok(entry->NextUpdate.dwHighDateTime == 30947877, "got %lu\n", entry->NextUpdate.dwHighDateTime); + ok(!entry->cExtension, "got %lu\n", entry->cExtension); + ok(entry->rgExtension == NULL, "got %p\n", entry->rgExtension); + + ok(!info->cExtension, "got %lu\n", info->cExtension); + ok(info->rgExtension == NULL, "got %p\n", info->rgExtension); + LocalFree(info); +} + START_TEST(encode) { static const DWORD encodings[] = { X509_ASN_ENCODING, PKCS_7_ASN_ENCODING, @@ -9044,6 +9101,7 @@ START_TEST(encode) test_encodeOCSPRequestInfo(encodings[i]); test_decodeOCSPResponseInfo(encodings[i]); test_decodeOCSPBasicSignedResponseInfo(encodings[i]); + test_decodeOCSPBasicResponseInfo(encodings[i]); } testPortPublicKeyInfo(); } -- 2.30.2

1 0

[PATCH] kernel32/tests: Use HeapAlloc function pointer to silent a warning.
by Rémi Bernon 25 Mar '22

25 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index bc573050d16..c597ff9590b 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -898,7 +898,7 @@ static void test_heap_checks( DWORD flags ) if (flags & HEAP_PAGE_ALLOCS) return; /* no tests for that case yet */ trace( "testing heap flags %08lx\n", flags ); - p = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 17 ); + p = pHeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 17 ); ok( p != NULL, "HeapAlloc failed\n" ); ret = HeapValidate( GetProcessHeap(), 0, p ); -- 2.35.1

1 0

[PATCH] mountmgr: Fix long type warnings on macOS.
by Huw Davies 25 Mar '22

25 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/mountmgr.sys/diskarb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 50a32bef079..462ff82c691 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -229,7 +229,7 @@ void run_diskarbitration_loop(void) #if defined(HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H) && defined(HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H) -static UInt8 map_option( ULONG option ) +static UInt8 map_option( unsigned int option ) { switch (option) { @@ -314,7 +314,7 @@ NTSTATUS dhcp_request( void *args ) case OPTION_ROUTER_ADDRESS: case OPTION_BROADCAST_ADDRESS: { - DWORD *ptr = (DWORD *)(params->buffer + params->offset); + unsigned int *ptr = (unsigned int *)(params->buffer + params->offset); if (len == sizeof(*ptr) && params->size >= sizeof(*ptr)) { CFDataGetBytes( value, CFRangeMake(0, len), (UInt8 *)ptr ); @@ -341,7 +341,7 @@ NTSTATUS dhcp_request( void *args ) break; } default: - FIXME( "option %u not supported\n", params->req->id ); + FIXME( "option %u not supported\n", (unsigned int)params->req->id ); break; } -- 2.23.0

1 0

[PATCH] wined3d: Add full dirty region at texture creation.
by Paul Gofman 25 Mar '22

25 Mar '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Fixes rendering in Guilty Gear Isuka which (d3d8 game) which regressed with commit 513d3e1376761889a792719d4dccaf41bc6d2829. dlls/d3d8/tests/visual.c | 20 +++++++++++++++++--- dlls/d3d9/tests/visual.c | 20 +++++++++++++++++--- dlls/wined3d/texture.c | 11 +++++++---- 3 files changed, 41 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index b7f6dd62e9c..41fc0cbf16a 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5531,9 +5531,6 @@ static void add_dirty_rect_test(void) hr = IDirect3DTexture8_GetSurfaceLevel(tex_dynamic, 0, &surface_dynamic); ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); - fill_surface(surface_src_red, 0x00ff0000, 0); - fill_surface(surface_src_green, 0x0000ff00, 0); - hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_TEX1); ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); @@ -5543,6 +5540,23 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MIPFILTER, D3DTEXF_POINT); ok(SUCCEEDED(hr), "Failed to set mip filter, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)tex_dst2); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)tex_src_red, + (IDirect3DBaseTexture8 *)tex_dst2); + fill_surface(surface_src_green, 0x00000080, D3DLOCK_NO_DIRTY_UPDATE); + hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)tex_src_green, + (IDirect3DBaseTexture8 *)tex_dst2); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x00000080, 1), "Unexpected colour 0x%08x.\n", color); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + + fill_surface(surface_src_red, 0x00ff0000, 0); + fill_surface(surface_src_green, 0x0000ff00, 0); + hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)tex_src_green, (IDirect3DBaseTexture8 *)tex_dst1); ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 89f9e9cf2c6..9f9055483b1 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19394,9 +19394,6 @@ static void add_dirty_rect_test(void) hr = IDirect3DTexture9_GetSurfaceLevel(tex_dynamic, 0, &surface_dynamic); ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); - fill_surface(surface_src_red, 0x00ff0000, 0); - fill_surface(surface_src_green, 0x0000ff00, 0); - hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); @@ -19406,6 +19403,23 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_POINT); ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)tex_dst2); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)tex_src_red, + (IDirect3DBaseTexture9 *)tex_dst2); + fill_surface(surface_src_green, 0x00000080, D3DLOCK_NO_DIRTY_UPDATE); + hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)tex_src_green, + (IDirect3DBaseTexture9 *)tex_dst2); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x00000080, 1), "Unexpected colour 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + + fill_surface(surface_src_red, 0x00ff0000, 0); + fill_surface(surface_src_green, 0x0000ff00, 0); + hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)tex_src_green, (IDirect3DBaseTexture9 *)tex_dst1); ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index fdd2c70c667..94a1b848a2a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3895,11 +3895,14 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->flags |= WINED3D_TEXTURE_GENERATE_MIPMAPS; } - if (flags & WINED3D_TEXTURE_CREATE_RECORD_DIRTY_REGIONS - && !(texture->dirty_regions = heap_calloc(texture->layer_count, sizeof(*texture->dirty_regions)))) + if (flags & WINED3D_TEXTURE_CREATE_RECORD_DIRTY_REGIONS) { - wined3d_texture_cleanup_sync(texture); - return E_OUTOFMEMORY; + if (!(texture->dirty_regions = heap_calloc(texture->layer_count, sizeof(*texture->dirty_regions)))) + { + wined3d_texture_cleanup_sync(texture); + return E_OUTOFMEMORY; + } + wined3d_texture_dirty_region_add(texture, 0, NULL); } /* Precalculated scaling for 'faked' non power of two texture coords. */ -- 2.35.1

2 2

[PATCH] win32u: Make some functions static.
by Francois Gouget 25 Mar '22

25 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/win32u/sysparams.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 6e6300c502b..f22f6604454 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1347,7 +1347,7 @@ static void unlock_display_devices(void) pthread_mutex_unlock( &display_lock ); } -HDC get_display_dc(void) +static HDC get_display_dc(void) { pthread_mutex_lock( &display_dc_lock ); if (!display_dc) @@ -1365,7 +1365,7 @@ HDC get_display_dc(void) return display_dc; } -void release_display_dc( HDC hdc ) +static void release_display_dc( HDC hdc ) { pthread_mutex_unlock( &display_dc_lock ); } -- 2.30.2

2 1

[PATCH] wined3d: Reuse deferred uploads heaps.
by Jan Sikorski 25 Mar '22

25 Mar '22

Avoids needing to fault-in the memory on each recording. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- The HeapFree loop over uploads in a command list is still a little concerning. If it turns out to be an issue, we could allocate larger buffers based on previous usage and fit multiple uploads in it. --- dlls/wined3d/cs.c | 55 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 63d6ed4c123..87d7b60bc15 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -49,13 +49,15 @@ struct wined3d_command_list SIZE_T data_size; void *data; - HANDLE upload_heap; SIZE_T resource_count; struct wined3d_resource **resources; SIZE_T upload_count; struct wined3d_deferred_upload *uploads; + HANDLE upload_heap; + LONG *upload_heap_refcount; + /* List of command lists queued for execution on this command list. We might * be the only thing holding a pointer to another command list, so we need * to hold a reference here (and in wined3d_deferred_context) as well. */ @@ -3960,7 +3962,6 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) struct wined3d_deferred_context { struct wined3d_device_context c; - HANDLE upload_heap; SIZE_T data_size, data_capacity; void *data; @@ -3971,6 +3972,9 @@ struct wined3d_deferred_context SIZE_T upload_count, uploads_capacity; struct wined3d_deferred_upload *uploads; + HANDLE upload_heap; + LONG *upload_heap_refcount; + /* List of command lists queued for execution on this context. A command * list can be the only thing holding a pointer to another command list, so * we need to hold a reference here and in wined3d_command_list as well. */ @@ -4090,12 +4094,22 @@ static bool wined3d_deferred_context_map_upload_bo(struct wined3d_device_context deferred->upload_count + 1, sizeof(*deferred->uploads))) return false; - if (!deferred->upload_heap) - deferred->upload_heap = HeapCreate(HEAP_NO_SERIALIZE, 0, 0); if (!deferred->upload_heap) { - ERR("Failed to create upload heap.\n"); - return false; + if (!(deferred->upload_heap = HeapCreate(0, 0, 0))) + { + ERR("Failed to create upload heap.\n"); + return false; + } + + if (!(deferred->upload_heap_refcount = heap_alloc(sizeof(deferred->upload_heap_refcount)))) + { + HeapDestroy(deferred->upload_heap); + deferred->upload_heap = 0; + return false; + } + + *deferred->upload_heap_refcount = 1; } if (!(sysmem = HeapAlloc(deferred->upload_heap, 0, size + RESOURCE_ALIGNMENT - 1))) @@ -4243,9 +4257,20 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte heap_free(deferred->resources); for (i = 0; i < deferred->upload_count; ++i) + { wined3d_resource_decref(deferred->uploads[i].resource); + HeapFree(deferred->upload_heap, 0, deferred->uploads[i].resource); + } + if (deferred->upload_heap) - HeapDestroy(deferred->upload_heap); + { + if (!InterlockedDecrement(deferred->upload_heap_refcount)) + { + HeapDestroy(deferred->upload_heap); + heap_free(deferred->upload_heap_refcount); + } + } + heap_free(deferred->uploads); for (i = 0; i < deferred->command_list_count; ++i) @@ -4331,7 +4356,8 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->query_count = 0; object->upload_heap = deferred->upload_heap; - deferred->upload_heap = 0; + if ((object->upload_heap_refcount = deferred->upload_heap_refcount)) + InterlockedIncrement(object->upload_heap_refcount); /* This is in fact recorded into a subsequent command list. */ if (restore) @@ -4349,11 +4375,22 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device static void wined3d_command_list_destroy_object(void *object) { struct wined3d_command_list *list = object; + unsigned int i; TRACE("list %p.\n", list); + for (i = 0; i < list->upload_count; ++i) + HeapFree(list->upload_heap, 0, list->uploads[i].sysmem); + if (list->upload_heap) - HeapDestroy(list->upload_heap); + { + if (!InterlockedDecrement(list->upload_heap_refcount)) + { + HeapDestroy(list->upload_heap); + heap_free(list->upload_heap_refcount); + } + } + heap_free(list); } -- 2.32.0

2 1

[PATCH] DO NOT COMMIT
by Eric Pouech 25 Mar '22

25 Mar '22

not to be committed (looking out for timeouts cause in cmd tests) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- Eric Pouech (1): programs/cmd: don't recurse into paths longer than MAX_PATH programs/cmd/builtins.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-)

1 1

[tools] testbot/web: Provide a property list for the special jobs page.
by Francois Gouget 25 Mar '22

25 Mar '22

The property descriptors list can be empty, but it must not be left undefined forever. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The patch reordering the FormPage methods contained a change it shouldn't have which broke the special jobs page. At least that's much less of an issue than breaking the submit page (see previous patch). It would probably be even better to provide a list of EnumPropertyDescriptor()s instead of having the page roll its own. But then this page should be rewritten to use checkboxes similar to the ones of the Submit page. Which also means this type of VM selection code should be shared. And further extended to allow choosing between 32- and 64-bit for each VM. That will all have to wait though. --- testbot/web/admin/SpecialJobs.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/admin/SpecialJobs.pl b/testbot/web/admin/SpecialJobs.pl index 02d9f8ea9..79160e42f 100644 --- a/testbot/web/admin/SpecialJobs.pl +++ b/testbot/web/admin/SpecialJobs.pl @@ -90,7 +90,7 @@ sub _initialize($$$) $JobTemplate->{VMKey} ||= "*No"; } - $self->SUPER::_initialize($Request, $RequiredRole, undef); + $self->SUPER::_initialize($Request, $RequiredRole, []); } -- 2.30.2

1 0

[tools] testbot/web: The Submit page should always provide a property list.
by Francois Gouget 25 Mar '22

25 Mar '22

FormPage expects to be provided with a property list when it calls GetPropertyDescriptors() at the very latest. So while that method may return an empty list, returning undef is not allowed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The patch reordering the FormPage methods contained a change it shouldn't have which broke the submit job page. The FormPage methods were inconsistent about whether they would correctly deal with $self->GetPropertyDescriptors() returning undef (this specific issue is in the most used method, GenerateFields()). Now they don't accept it and so the subclasses should make sure to always provide a property list. This updates the Submit page accordingly. --- testbot/web/Submit.pl | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 79d1c8772..472622dd5 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -665,16 +665,23 @@ sub GetPropertyDescriptors($) my ($self) = @_; # Note that this may be called for different pages. For instance first to - # validate the properties of the page 1, then again to generate the form - # fields of page 2. See _SetPage(). - if ($self->{Page} == 1) + # validate the page 1 properties, then again to generate the page 2 form + # fields. See _SetPage(). + if ($self->{PropertyDescriptors}) { - $self->{PropertyDescriptors} ||= [ + # The property descriptors list is already set for $self->{Page} + } + elsif ($self->{Page} == 1) + { + $self->{PropertyDescriptors} = [ CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128), ]; } - elsif (($self->{Page} == 3 or $self->{Page} == 4) and - !$self->{PropertyDescriptors}) + elsif ($self->{Page} == 2) + { + $self->{PropertyDescriptors} = []; # no fields, only a collection block + } + elsif ($self->{Page} == 3 or $self->{Page} == 4) { if ($self->{Page} == 4) { @@ -960,9 +967,12 @@ sub _SetPage($$) { my ($self, $Page) = @_; - $self->{Page} = $Page; - # Changing the page also changes the fields of the HTML form - delete $self->{PropertyDescriptors}; + if ($self->{Page} != $Page) + { + $self->{Page} = $Page; + # Changing the page also changes the fields of the HTML form + $self->{PropertyDescriptors} = undef; + } } sub OnUnset($) -- 2.30.2

1 0

[PATH] shell32: Fix a behavior of shfileoperationw
by Ming Shao 25 Mar '22

25 Mar '22

From: shaoming <shaoming(a)uniontech.com> Signed-off-by: shaoming <shaoming(a)uniontech.com> --- dlls/shell32/shlfileop.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 17a8e7046c7..aa69c7a3232 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1519,6 +1519,14 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp) ZeroMemory(&flFrom, sizeof(FILE_LIST)); ZeroMemory(&flTo, sizeof(FILE_LIST)); + //windows look likes select first path when lpFileOp->pTo have more then one paths + if(lpFileOp->wFunc == FO_RENAME) + { + LPWSTR lpRefTo = lpFileOp->pTo; + while(*lpRefTo++); + if(*lpRefTo) *lpRefTo = '\0'; + } + if ((ret = parse_file_list(&flFrom, lpFileOp->pFrom))) return ret; -- 2.20.1

1 0

[PATCH v2 01/12] wintab32: Standardize location of WTPACKET definition.
by Elaine Lefler 25 Mar '22

25 Mar '22

Signed-off-by: Elaine Lefler <elaineclefler(a)gmail.com> --- v2: Splitting into smaller patches as per feedback. This structure was being defined redundantly in multiple places. It has been moved to a public header where everyone can access it. pktdef.h, which was never used at all, has been removed. --- dlls/winex11.drv/wintab.c | 17 --- dlls/wintab32/wintab_internal.h | 17 --- include/Makefile.in | 1 - include/pktdef.h | 248 -------------------------------- include/wintab.h | 19 ++- 5 files changed, 17 insertions(+), 285 deletions(-) delete mode 100644 include/pktdef.h diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 331601c3325..ef9bbc6be45 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -233,23 +233,6 @@ typedef struct tagWTI_DEVICES_INFO * linux wacom lists all the known values and this isn't one of them */ #define CSR_TYPE_OTHER 0x000 -typedef struct tagWTPACKET { - HCTX pkContext; - UINT pkStatus; - LONG pkTime; - WTPKT pkChanged; - UINT pkSerialNumber; - UINT pkCursor; - DWORD pkButtons; - DWORD pkX; - DWORD pkY; - DWORD pkZ; - UINT pkNormalPressure; - UINT pkTangentPressure; - ORIENTATION pkOrientation; - ROTATION pkRotation; /* 1.1 */ -} WTPACKET, *LPWTPACKET; - #ifdef SONAME_LIBXI diff --git a/dlls/wintab32/wintab_internal.h b/dlls/wintab32/wintab_internal.h index 18c64bfe700..3b31d021f66 100644 --- a/dlls/wintab32/wintab_internal.h +++ b/dlls/wintab32/wintab_internal.h @@ -116,23 +116,6 @@ typedef struct tagWTI_EXTENSIONS_INFO */ } WTI_EXTENSIONS_INFO, *LPWTI_EXTENSIONS_INFO; -typedef struct tagWTPACKET { - HCTX pkContext; - UINT pkStatus; - LONG pkTime; - WTPKT pkChanged; - UINT pkSerialNumber; - UINT pkCursor; - DWORD pkButtons; - DWORD pkX; - DWORD pkY; - DWORD pkZ; - UINT pkNormalPressure; - UINT pkTangentPressure; - ORIENTATION pkOrientation; - ROTATION pkRotation; /* 1.1 */ -} WTPACKET, *LPWTPACKET; - typedef struct tagOPENCONTEXT { HCTX handle; diff --git a/include/Makefile.in b/include/Makefile.in index 9578c557af7..b9d2f8416fa 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -590,7 +590,6 @@ SOURCES = \ perflib.h \ perhist.idl \ physicalmonitorenumerationapi.h \ - pktdef.h \ poppack.h \ powrprof.h \ prntvpt.h \ diff --git a/include/pktdef.h b/include/pktdef.h deleted file mode 100644 index a1622062658..00000000000 --- a/include/pktdef.h +++ /dev/null @@ -1,248 +0,0 @@ -/* - * Copyright (C) 1991-1998 by LCS/Telegraphics - * Copyright (C) 2002 Patrik Stridvall - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_PKTDEF_H -#define __WINE_PKTDEF_H - -/*********************************************************************** - * How to use pktdef.h: - * - * 1. Include wintab.h - * 2. if using just one packet format: - * a. Define PACKETDATA and PACKETMODE as or'ed combinations of WTPKT bits - * (use the PK_* identifiers). - * b. Include pktdef.h. - * c. The generated structure typedef will be called PACKET. Use PACKETDATA - * and PACKETMODE to fill in the LOGCONTEXT structure. - * 3. If using multiple packet formats, for each one: - * a. Define PACKETNAME. Its text value will be a prefix for this packet's - * parameters and names. - * b. Define <PACKETNAME>PACKETDATA and <PACKETNAME>PACKETMODE similar to - * 2.a. above. - * c. Include pktdef.h. - * d. The generated structure typedef will be called - * <PACKETNAME>PACKET. Compare with 2.c. above and example #2 below. - * 4. If using extension packet data, do the following additional steps - * for each extension: - * a. Before including pktdef.h, define <PACKETNAME>PACKET<EXTENSION> - * as either PKEXT_ABSOLUTE or PKEXT_RELATIVE. - * b. The generated structure typedef will contain a field for the - * extension data. - * c. Scan the WTI_EXTENSION categories to find the extension's - * packet mask bit. - * d. OR the packet mask bit with <PACKETNAME>PACKETDATA and use the - * result in the lcPktData field of the LOGCONTEXT structure. - * e. If <PACKETNAME>PACKET<EXTENSION> was PKEXT_RELATIVE, OR the - * packet mask bit with <PACKETNAME>PACKETMODE and use the result - * in the lcPktMode field of the LOGCONTEXT structure. - * - * - * Example #1. -- single packet format - * - * #include <wintab.h> - * #define PACKETDATA PK_X | PK_Y | PK_BUTTONS /@ x, y, buttons @/ - * #define PACKETMODE PK_BUTTONS /@ buttons relative mode @/ - * #include <pktdef.h> - * ... - * lc.lcPktData = PACKETDATA; - * lc.lcPktMode = PACKETMODE; - * - * Example #2. -- multiple formats - * - * #include <wintab.h> - * #define PACKETNAME MOE - * #define MOEPACKETDATA PK_X | PK_Y | PK_BUTTONS /@ x, y, buttons @/ - * #define MOEPACKETMODE PK_BUTTONS /@ buttons relative mode @/ - * #include <pktdef.h> - * #define PACKETNAME LARRY - * #define LARRYPACKETDATA PK_Y | PK_Z | PK_BUTTONS /@ y, z, buttons @/ - * #define LARRYPACKETMODE PK_BUTTONS /@ buttons relative mode @/ - * #include <pktdef.h> - * #define PACKETNAME CURLY - * #define CURLYPACKETDATA PK_X | PK_Z | PK_BUTTONS /@ x, z, buttons @/ - * #define CURLYPACKETMODE PK_BUTTONS /@ buttons relative mode @/ - * #include <pktdef.h> - * ... - * lcMOE.lcPktData = MOEPACKETDATA; - * lcMOE.lcPktMode = MOEPACKETMODE; - * ... - * lcLARRY.lcPktData = LARRYPACKETDATA; - * lcLARRY.lcPktMode = LARRYPACKETMODE; - * ... - * lcCURLY.lcPktData = CURLYPACKETDATA; - * lcCURLY.lcPktMode = CURLYPACKETMODE; - * - * Example #3. -- extension packet data "XFOO". - * - * #include <wintab.h> - * #define PACKETDATA PK_X | PK_Y | PK_BUTTONS /@ x, y, buttons @/ - * #define PACKETMODE PK_BUTTONS /@ buttons relative mode @/ - * #define PACKETXFOO PKEXT_ABSOLUTE /@ XFOO absolute mode @/ - * #include <pktdef.h> - * ... - * UINT ScanExts(UINT wTag) - * { - * UINT i; - * UINT wScanTag; - * - * /@ scan for wTag's info category. @/ - * for (i = 0; WTInfo(WTI_EXTENSIONS + i, EXT_TAG, &wScanTag); i++) { - * if (wTag == wScanTag) { - * /@ return category offset from WTI_EXTENSIONS. @/ - * return i; - * } - * } - * /@ return error code. @/ - * return 0xFFFF; - * } - * ... - * lc.lcPktData = PACKETDATA; - * lc.lcPktMode = PACKETMODE; - * #ifdef PACKETXFOO - * categoryXFOO = ScanExts(WTX_XFOO); - * WTInfo(WTI_EXTENSIONS + categoryXFOO, EXT_MASK, &maskXFOO); - * lc.lcPktData |= maskXFOO; - * #if PACKETXFOO == PKEXT_RELATIVE - * lc.lcPktMode |= maskXFOO; - * #endif - * #endif - * WTOpen(hWnd, &lc, TRUE); - */ - -#ifdef __cplusplus -extern "C" { -#endif /* defined(__cplusplus) */ - -#ifndef PACKETNAME -/* if no packet name prefix */ -# define __PFX(x) x -# define __IFX(x,y) x ## y -#else -/* add prefixes and infixes to packet format names */ -# define __PFX(x) __PFX2(PACKETNAME,x) -# define __PFX2(p,x) __PFX3(p,x) -# define __PFX3(p,x) p ## x -# define __IFX(x,y) __IFX2(x,PACKETNAME,y) -# define __IFX2(x,i,y) __IFX3(x,i,y) -# define __IFX3(x,i,y) x ## i ## y -#endif - -#define __SFX2(x,s) __SFX3(x,s) -#define __SFX3(x,s) x ## s - -#define __TAG __IFX(tag,PACKET) -#define __TYPES \ - __PFX(PACKET), * __IFX(P,PACKET), \ - * __IFX(NP,PACKET), * __IFX(LP,PACKET) - -#define __DATA (__PFX(PACKETDATA)) -#define __MODE (__PFX(PACKETMODE)) -#define __EXT(x) __SFX2(__PFX(PACKET),x) - -typedef struct __TAG { -#if (__DATA & PK_CONTEXT) - HCTX pkContext; -#endif -#if (__DATA & PK_STATUS) - UINT pkStatus; -#endif -#if (__DATA & PK_TIME) - DWORD pkTime; -#endif -#if (__DATA & PK_CHANGED) - WTPKT pkChanged; -#endif -#if (__DATA & PK_SERIAL_NUMBER) - UINT pkSerialNumber; -#endif -#if (__DATA & PK_CURSOR) - UINT pkCursor; -#endif -#if (__DATA & PK_BUTTONS) - DWORD pkButtons; -#endif -#if (__DATA & PK_X) - LONG pkX; -#endif -#if (__DATA & PK_Y) - LONG pkY; -#endif -#if (__DATA & PK_Z) - LONG pkZ; -#endif -#if (__DATA & PK_NORMAL_PRESSURE) -# if (__MODE & PK_NORMAL_PRESSURE) - /* relative */ - int pkNormalPressure; -# else - /* absolute */ - UINT pkNormalPressure; -# endif -#endif -#if (__DATA & PK_TANGENT_PRESSURE) -# if (__MODE & PK_TANGENT_PRESSURE) - /* relative */ - int pkTangentPressure; -# else - /* absolute */ - UINT pkTangentPressure; -# endif -#endif -#if (__DATA & PK_ORIENTATION) - ORIENTATION pkOrientation; -#endif -#if (__DATA & PK_ROTATION) - ROTATION pkRotation; /* 1.1 */ -#endif - -#ifndef NOWTEXTENSIONS - /* extensions begin here. */ - -#if (__EXT(FKEYS) == PKEXT_RELATIVE) || (__EXT(FKEYS) == PKEXT_ABSOLUTE) - UINT pkFKeys; -#endif -#if (__EXT(TILT) == PKEXT_RELATIVE) || (__EXT(TILT) == PKEXT_ABSOLUTE) - TILT pkTilt; -#endif - -#endif - -} __TYPES; - -#undef PACKETNAME -#undef __TAG -#undef __TAG2 -#undef __TYPES -#undef __TYPES2 -#undef __DATA -#undef __MODE -#undef __PFX -#undef __PFX2 -#undef __PFX3 -#undef __IFX -#undef __IFX2 -#undef __IFX3 -#undef __SFX2 -#undef __SFX3 - -#ifdef __cplusplus -} /* extern "C" */ -#endif /* defined(__cplusplus) */ - -#endif /* defined(__WINE_PKTDEF_H */ diff --git a/include/wintab.h b/include/wintab.h index d10371b0217..9f607bbe7ef 100644 --- a/include/wintab.h +++ b/include/wintab.h @@ -462,8 +462,6 @@ DECL_WINELIB_TYPE_AW(LPLOGCONTEXT) * EVENT DATA DEFS */ -/* For packet structure definition, see pktdef.h */ - /* packet status values */ #define TPS_PROXIMITY 0x0001 #define TPS_QUEUE_ERR 0x0002 @@ -493,6 +491,23 @@ typedef struct tagROTATION { /* 1.1 */ #define TBN_UP 1 #define TBN_DOWN 2 +typedef struct tagWTPACKET { + HCTX pkContext; + UINT pkStatus; + LONG pkTime; + WTPKT pkChanged; + UINT pkSerialNumber; + UINT pkCursor; + DWORD pkButtons; + DWORD pkX; + DWORD pkY; + DWORD pkZ; + UINT pkNormalPressure; + UINT pkTangentPressure; + ORIENTATION pkOrientation; + ROTATION pkRotation; /* 1.1 */ +} WTPACKET, *LPWTPACKET; + /*********************************************************************** * DEVICE CONFIG CONSTANTS */ -- 2.32.0 (Apple Git-132)

1 11

[PATCH v4 resend 1/2] ntdll/tests: Add more tests for \Device\NamedPipe\ root directory.
by Jinoh Kang 24 Mar '22

24 Mar '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: v2 -> v3: move some tests from om.c to pipe.c v3 -> v4: fix and simplify STATUS_PENDING testing dlls/ntdll/tests/om.c | 9 +++++ dlls/ntdll/tests/pipe.c | 90 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 98 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 946f54523b3..0f9b97a8a02 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1872,6 +1872,15 @@ static void test_query_object(void) pNtClose( handle ); + handle = CreateFileA( "\\\\.\\pipe\\", 0, 0, NULL, OPEN_EXISTING, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); + + test_object_name( handle, L"\\Device\\NamedPipe\\", TRUE ); + test_object_type( handle, L"File" ); + test_file_info( handle ); + + pNtClose( handle ); + RtlInitUnicodeString( &path, L"\\REGISTRY\\Machine" ); status = pNtCreateKey( &handle, KEY_READ, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed status %lx\n", status ); diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 38d1d92b4a9..67be9522c66 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -52,6 +52,13 @@ typedef struct { ULONG NamedPipeEnd; } FILE_PIPE_LOCAL_INFORMATION; +typedef struct _FILE_PIPE_WAIT_FOR_BUFFER { + LARGE_INTEGER Timeout; + ULONG NameLength; + BOOLEAN TimeoutSpecified; + WCHAR Name[1]; +} FILE_PIPE_WAIT_FOR_BUFFER, *PFILE_PIPE_WAIT_FOR_BUFFER; + #ifndef FILE_SYNCHRONOUS_IO_ALERT #define FILE_SYNCHRONOUS_IO_ALERT 0x10 #endif @@ -63,6 +70,10 @@ typedef struct { #ifndef FSCTL_PIPE_LISTEN #define FSCTL_PIPE_LISTEN CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) #endif + +#ifndef FSCTL_PIPE_WAIT +#define FSCTL_PIPE_WAIT CTL_CODE(FILE_DEVICE_NAMED_PIPE, 6, METHOD_BUFFERED, FILE_ANY_ACCESS) +#endif #endif static NTSTATUS (WINAPI *pNtFsControlFile) (HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, PVOID apc_context, PIO_STATUS_BLOCK io, ULONG code, PVOID in_buffer, ULONG in_size, PVOID out_buffer, ULONG out_size); @@ -178,6 +189,48 @@ static NTSTATUS listen_pipe(HANDLE hPipe, HANDLE hEvent, PIO_STATUS_BLOCK iosb, return pNtFsControlFile(hPipe, hEvent, use_apc ? &ioapc: NULL, use_apc ? &dummy: NULL, iosb, FSCTL_PIPE_LISTEN, 0, 0, 0, 0); } +static NTSTATUS wait_pipe(HANDLE handle, PUNICODE_STRING name, const LARGE_INTEGER* timeout) +{ + HANDLE event; + NTSTATUS status; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK iosb; + FILE_PIPE_WAIT_FOR_BUFFER *pipe_wait; + ULONG pipe_wait_size; + + pipe_wait_size = offsetof(FILE_PIPE_WAIT_FOR_BUFFER, Name[0]) + name->Length; + pipe_wait = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, pipe_wait_size); + if (!pipe_wait) return STATUS_NO_MEMORY; + + pipe_wait->TimeoutSpecified = !!timeout; + pipe_wait->NameLength = name->Length; + if (timeout) pipe_wait->Timeout = *timeout; + memcpy(pipe_wait->Name, name->Buffer, name->Length); + + InitializeObjectAttributes(&attr, NULL, 0, 0, NULL); + status = NtCreateEvent(&event, GENERIC_ALL, &attr, NotificationEvent, FALSE); + if (status != STATUS_SUCCESS) + { + ok(0, "NtCreateEvent failure: %08x\n", status); + HeapFree(GetProcessHeap(), 0, pipe_wait); + return status; + } + + memset(&iosb, 0, sizeof(iosb)); + iosb.Status = STATUS_PENDING; + status = pNtFsControlFile(handle, event, NULL, NULL, &iosb, FSCTL_PIPE_WAIT, + pipe_wait, pipe_wait_size, NULL, 0); + if (status == STATUS_PENDING) + { + WaitForSingleObject(event, INFINITE); + status = iosb.Status; + } + + NtClose(event); + HeapFree(GetProcessHeap(), 0, pipe_wait); + return status; +} + static void test_create_invalid(void) { IO_STATUS_BLOCK iosb; @@ -2421,6 +2474,7 @@ static void test_security_info(void) static void test_empty_name(void) { + static const LARGE_INTEGER zero_timeout = {{ 0 }}; HANDLE hdirectory, hpipe, hpipe2, hwrite, hwrite2, handle; OBJECT_TYPE_INFORMATION *type_info; OBJECT_NAME_INFORMATION *name_info; @@ -2451,6 +2505,10 @@ static void test_empty_name(void) FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0 ); ok(!status, "Got unexpected status %#lx.\n", status); + pRtlInitUnicodeString(&name, L"nonexistent_pipe"); + status = wait_pipe(hdirectory, &name, &zero_timeout); + todo_wine ok(status == STATUS_ILLEGAL_FUNCTION, "unexpected status for FSCTL_PIPE_WAIT on \\Device\\NamedPipe: %08x\n", status); + name.Buffer = NULL; name.Length = 0; name.MaximumLength = 0; @@ -2463,6 +2521,17 @@ static void test_empty_name(void) todo_wine ok(status == STATUS_OBJECT_NAME_INVALID, "Got unexpected status %#lx.\n", status); if (!status) CloseHandle(hpipe); + + pRtlInitUnicodeString(&name, L"test3\\pipe"); + attr.RootDirectory = hdirectory; + attr.ObjectName = &name; + timeout.QuadPart = -(LONG64)10000000; + status = pNtCreateNamedPipeFile(&hpipe, GENERIC_READ|GENERIC_WRITE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout); + ok(status == STATUS_OBJECT_NAME_INVALID, "unexpected status from NtCreateNamedPipeFile: %08x\n", status); + if (!status) + CloseHandle(hpipe); + CloseHandle(hdirectory); pRtlInitUnicodeString(&name, L"\\Device\\NamedPipe\\"); @@ -2476,6 +2545,10 @@ static void test_empty_name(void) FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0 ); ok(!status, "Got unexpected status %#lx.\n", status); + pRtlInitUnicodeString(&name, L"nonexistent_pipe"); + status = wait_pipe(hdirectory, &name, &zero_timeout); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "unexpected status for FSCTL_PIPE_WAIT on \\Device\\NamedPipe\\: %08x\n", status); + name.Buffer = NULL; name.Length = 0; name.MaximumLength = 0; @@ -2566,9 +2639,24 @@ static void test_empty_name(void) CloseHandle(hwrite); CloseHandle(hpipe); - CloseHandle(hdirectory); CloseHandle(hpipe2); CloseHandle(hwrite2); + + pRtlInitUnicodeString(&name, L"test3\\pipe"); + attr.RootDirectory = hdirectory; + attr.ObjectName = &name; + timeout.QuadPart = -(LONG64)10000000; + status = pNtCreateNamedPipeFile(&hpipe, GENERIC_READ|GENERIC_WRITE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout); + todo_wine ok(!status, "unexpected failure from NtCreateNamedPipeFile: %08x\n", status); + + handle = CreateFileA("\\\\.\\pipe\\test3\\pipe", GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, 0 ); + todo_wine ok(handle != INVALID_HANDLE_VALUE, "Failed to open NamedPipe (%u)\n", GetLastError()); + + CloseHandle(handle); + CloseHandle(hpipe); + CloseHandle(hdirectory); } START_TEST(pipe) -- 2.34.1

2 2

[PATCH v2 1/8] jscript: Store NULL disps as a different type of jsval_null.
by Gabriel Ivăncescu 24 Mar '22

24 Mar '22

This makes sure that object instances are always non-NULL and gets rid of all such checks. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Hopefully, I handled all cases and objects now can never be NULL. I tested this with a bunch of test apps (some also needing the mshtml proxy object patches), no difference in behavior or crashes were observed, so I think it should cover all cases. dlls/jscript/array.c | 13 +++++----- dlls/jscript/dispex.c | 8 +++---- dlls/jscript/engine.c | 31 ++++++++---------------- dlls/jscript/function.c | 13 ++++++---- dlls/jscript/json.c | 11 +++++---- dlls/jscript/jsutils.c | 49 ++++++++++++++++---------------------- dlls/jscript/jsval.h | 13 ++++++++-- dlls/jscript/object.c | 25 +++++++++++-------- dlls/jscript/set.c | 2 +- dlls/jscript/tests/api.js | 8 +++++++ dlls/jscript/tests/lang.js | 2 ++ 11 files changed, 93 insertions(+), 82 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 9b97ef2..dcabc0d 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -704,7 +704,8 @@ static HRESULT Array_sort(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned hres = JS_E_JSCRIPT_EXPECTED; goto done; } - }else if(ctx->version >= SCRIPTLANGUAGEVERSION_ES5 ? !is_undefined(argv[0]) : !is_null(argv[0])) { + }else if(ctx->version >= SCRIPTLANGUAGEVERSION_ES5 ? !is_undefined(argv[0]) : + (!is_null(argv[0]) || is_null_disp(argv[0]))) { WARN("invalid arg %s\n", debugstr_jsval(argv[0])); hres = JS_E_JSCRIPT_EXPECTED; goto done; @@ -972,7 +973,7 @@ static HRESULT Array_forEach(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsig return hres; /* Fixme check IsCallable */ - if(!argc || !is_object_instance(argv[0]) || !get_object(argv[0])) { + if(!argc || !is_object_instance(argv[0])) { FIXME("Invalid arg %s\n", debugstr_jsval(argc ? argv[0] : jsval_undefined())); hres = E_INVALIDARG; goto done; @@ -980,7 +981,7 @@ static HRESULT Array_forEach(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsig callback = get_object(argv[0]); if(argc > 1 && !is_undefined(argv[1])) { - if(!is_object_instance(argv[1]) || !get_object(argv[1])) { + if(!is_object_instance(argv[1])) { FIXME("Unsupported context this %s\n", debugstr_jsval(argv[1])); hres = E_NOTIMPL; goto done; @@ -1087,7 +1088,7 @@ static HRESULT Array_map(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned } /* FIXME: check IsCallable */ - if(!argc || !is_object_instance(argv[0]) || !get_object(argv[0])) { + if(!argc || !is_object_instance(argv[0])) { FIXME("Invalid arg %s\n", debugstr_jsval(argc ? argv[0] : jsval_undefined())); hres = E_INVALIDARG; goto done; @@ -1095,7 +1096,7 @@ static HRESULT Array_map(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned callback = get_object(argv[0]); if(argc > 1) { - if(is_object_instance(argv[1]) && get_object(argv[1])) { + if(is_object_instance(argv[1])) { context_this = get_object(argv[1]); }else if(!is_undefined(argv[1])) { FIXME("Unsupported context this %s\n", debugstr_jsval(argv[1])); @@ -1154,7 +1155,7 @@ static HRESULT Array_reduce(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsign } /* Fixme check IsCallable */ - if(!argc || !is_object_instance(argv[0]) || !get_object(argv[0])) { + if(!argc || !is_object_instance(argv[0])) { FIXME("Invalid arg %s\n", debugstr_jsval(argc ? argv[0] : jsval_undefined())); hres = E_INVALIDARG; goto done; diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index df2f65f..ef13e29 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -574,7 +574,7 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t return invoke_prop_func(This->prototype, jsthis ? jsthis : (IDispatch *)&This->IDispatchEx_iface, This->prototype->props+prop->u.ref, flags, argc, argv, r, caller); case PROP_JSVAL: { - if(!is_object_instance(prop->u.val) || !get_object(prop->u.val)) { + if(!is_object_instance(prop->u.val)) { FIXME("invoke %s\n", debugstr_jsval(prop->u.val)); return E_FAIL; } @@ -593,7 +593,7 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t if(FAILED(hres)) return hres; - if(is_object_instance(val) && get_object(val)) { + if(is_object_instance(val)) { hres = disp_call_value(This->ctx, get_object(val), jsthis ? jsthis : (IDispatch*)&This->IDispatchEx_iface, flags, argc, argv, r); @@ -1927,7 +1927,7 @@ HRESULT init_dispex_from_constr(jsdisp_t *dispex, script_ctx_t *ctx, const built return hres; } - if(is_object_instance(val) && get_object(val)) + if(is_object_instance(val)) prot = iface_to_jsdisp(get_object(val)); else prot = jsdisp_addref(ctx->object_prototype); @@ -1987,7 +1987,7 @@ HRESULT jsdisp_call_value(jsdisp_t *jsfunc, IDispatch *jsthis, WORD flags, unsig } flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; - hres = jsfunc->builtin_info->call(jsfunc->ctx, jsval_disp(jsthis), flags, argc, argv, r); + hres = jsfunc->builtin_info->call(jsfunc->ctx, jsthis ? jsval_disp(jsthis) : jsval_null(), flags, argc, argv, r); } return hres; } diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index d894fbc..c483f2a 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -131,8 +131,6 @@ static HRESULT stack_pop_object(script_ctx_t *ctx, IDispatch **r) v = stack_pop(ctx); if(is_object_instance(v)) { - if(!get_object(v)) - return JS_E_OBJECT_REQUIRED; *r = get_object(v); return S_OK; } @@ -539,10 +537,7 @@ HRESULT jsval_strict_equal(jsval_t lval, jsval_t rval, BOOL *ret) TRACE("\n"); if(type != jsval_type(rval)) { - if(is_null_instance(lval)) - *ret = is_null_instance(rval); - else - *ret = FALSE; + *ret = FALSE; return S_OK; } @@ -1034,7 +1029,7 @@ static void set_error_value(script_ctx_t *ctx, jsval_t value) ei->valid_value = TRUE; ei->value = value; - if(is_object_instance(value) && get_object(value) && (obj = to_jsdisp(get_object(value)))) { + if(is_object_instance(value) && (obj = to_jsdisp(get_object(value)))) { UINT32 number; jsstr_t *str; jsval_t v; @@ -1360,11 +1355,9 @@ static HRESULT interp_new(script_ctx_t *ctx) /* NOTE: Should use to_object here */ if(is_null(constr)) - return JS_E_OBJECT_EXPECTED; - else if(!is_object_instance(constr)) + return is_null_disp(constr) ? JS_E_INVALID_PROPERTY : JS_E_OBJECT_EXPECTED; + if(!is_object_instance(constr)) return JS_E_INVALID_ACTION; - else if(!get_object(constr)) - return JS_E_INVALID_PROPERTY; clear_acc(ctx); return disp_call_value(ctx, get_object(constr), NULL, DISPATCH_CONSTRUCT | DISPATCH_JSCRIPT_CALLEREXECSSOURCE, @@ -1807,7 +1800,7 @@ static HRESULT interp_instanceof(script_ctx_t *ctx) HRESULT hres; v = stack_pop(ctx); - if(!is_object_instance(v) || !get_object(v)) { + if(!is_object_instance(v)) { jsval_release(v); return JS_E_FUNCTION_EXPECTED; } @@ -1830,7 +1823,9 @@ static HRESULT interp_instanceof(script_ctx_t *ctx) v = stack_pop(ctx); - if(is_object_instance(prot)) { + if(is_null_disp(v)) + hres = JS_E_OBJECT_EXPECTED; + else if(is_object_instance(prot)) { if(is_object_instance(v)) tmp = iface_to_jsdisp(get_object(v)); for(iter = tmp; !ret && iter; iter = iter->prototype) { @@ -1867,7 +1862,7 @@ static HRESULT interp_in(script_ctx_t *ctx) TRACE("\n"); obj = stack_pop(ctx); - if(!is_object_instance(obj) || !get_object(obj)) { + if(!is_object_instance(obj)) { jsval_release(obj); return JS_E_OBJECT_EXPECTED; } @@ -2126,7 +2121,7 @@ static HRESULT typeof_string(jsval_t v, const WCHAR **ret) case JSV_OBJECT: { jsdisp_t *dispex; - if(get_object(v) && (dispex = iface_to_jsdisp(get_object(v)))) { + if((dispex = iface_to_jsdisp(get_object(v)))) { *ret = is_class(dispex, JSCLASS_FUNCTION) ? L"function" : L"object"; jsdisp_release(dispex); }else { @@ -2326,12 +2321,6 @@ static HRESULT equal_values(script_ctx_t *ctx, jsval_t lval, jsval_t rval, BOOL if(jsval_type(lval) == jsval_type(rval) || (is_number(lval) && is_number(rval))) return jsval_strict_equal(lval, rval, ret); - /* FIXME: NULL disps should be handled in more general way */ - if(is_object_instance(lval) && !get_object(lval)) - return equal_values(ctx, jsval_null(), rval, ret); - if(is_object_instance(rval) && !get_object(rval)) - return equal_values(ctx, lval, jsval_null(), ret); - if((is_null(lval) && is_undefined(rval)) || (is_undefined(lval) && is_null(rval))) { *ret = TRUE; return S_OK; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index fc8a85c..03c541c 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -256,7 +256,7 @@ HRESULT Function_invoke(jsdisp_t *func_this, IDispatch *jsthis, WORD flags, unsi assert(is_class(func_this, JSCLASS_FUNCTION)); function = function_from_jsdisp(func_this); - return function->vtbl->call(function->dispex.ctx, function, jsval_disp(jsthis), flags, argc, argv, r); + return function->vtbl->call(function->dispex.ctx, function, jsthis ? jsval_disp(jsthis) : jsval_null(), flags, argc, argv, r); } static HRESULT Function_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) @@ -336,6 +336,8 @@ static HRESULT Function_apply(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsi TRACE("\n"); + if(is_null_disp(vthis)) + return JS_E_OBJECT_REQUIRED; if(!is_object_instance(vthis) || (!(function = function_this(vthis)) && to_jsdisp(get_object(vthis)))) return JS_E_FUNCTION_EXPECTED; @@ -407,6 +409,8 @@ static HRESULT Function_call(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsig TRACE("\n"); + if(is_null_disp(vthis)) + return JS_E_OBJECT_REQUIRED; if(!(function = function_this(vthis))) return JS_E_FUNCTION_EXPECTED; @@ -663,7 +667,7 @@ HRESULT create_builtin_function(script_ctx_t *ctx, builtin_invoke_t value_proc, hres = jsdisp_define_data_property(&function->function.dispex, L"length", 0, jsval_number(function->function.length)); if(SUCCEEDED(hres)) - hres = jsdisp_define_data_property(&function->function.dispex, L"prototype", 0, jsval_obj(prototype)); + hres = jsdisp_define_data_property(&function->function.dispex, L"prototype", 0, prototype ? jsval_obj(prototype) : jsval_null()); if(FAILED(hres)) { jsdisp_release(&function->function.dispex); return hres; @@ -725,8 +729,7 @@ static HRESULT InterpretedFunction_call(script_ctx_t *ctx, FunctionInstance *fun this_obj = to_disp(new_obj); }else if(is_object_instance(vthis)) { this_obj = get_object(vthis); - if(this_obj) - IDispatch_AddRef(this_obj); + IDispatch_AddRef(this_obj); }else if(ctx->version >= SCRIPTLANGUAGEVERSION_ES5 && !is_undefined(vthis) && !is_null(vthis)) { hres = to_object(ctx, vthis, &this_obj); if(FAILED(hres)) @@ -836,7 +839,7 @@ static HRESULT BindFunction_call(script_ctx_t *ctx, FunctionInstance *func, jsva memcpy(call_args + function->argc, argv, argc * sizeof(*call_args)); } - hres = function->target->vtbl->call(ctx, function->target, jsval_disp(function->this), + hres = function->target->vtbl->call(ctx, function->target, function->this ? jsval_disp(function->this) : jsval_null(), flags, call_argc, call_args, r); heap_free(call_args); diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index e0867eb..dfcc39d 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -404,7 +404,7 @@ static HRESULT maybe_to_primitive(script_ctx_t *ctx, jsval_t val, jsval_t *r) jsdisp_t *obj; HRESULT hres; - if(!is_object_instance(val) || !get_object(val) || !(obj = iface_to_jsdisp(get_object(val)))) + if(!is_object_instance(val) || !(obj = iface_to_jsdisp(get_object(val)))) return jsval_copy(val, r); if(is_class(obj, JSCLASS_NUMBER)) { @@ -640,7 +640,7 @@ static HRESULT stringify(stringify_ctx_t *ctx, jsdisp_t *object, const WCHAR *na if(FAILED(hres)) return hres == DISP_E_UNKNOWNNAME ? S_FALSE : hres; - if(is_object_instance(value) && get_object(value)) { + if(is_object_instance(value)) { jsdisp_t *obj; DISPID id; @@ -681,7 +681,9 @@ static HRESULT stringify(stringify_ctx_t *ctx, jsdisp_t *object, const WCHAR *na switch(jsval_type(value)) { case JSV_NULL: - if(!append_string(ctx, L"null")) + if(is_null_disp(value)) + hres = S_FALSE; + else if(!append_string(ctx, L"null")) hres = E_OUTOFMEMORY; break; case JSV_BOOL: @@ -763,8 +765,7 @@ static HRESULT JSON_stringify(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsi return S_OK; } - if(argc >= 2 && is_object_instance(argv[1]) && get_object(argv[1]) && - (replacer = to_jsdisp(get_object(argv[1])))) { + if(argc >= 2 && is_object_instance(argv[1]) && (replacer = to_jsdisp(get_object(argv[1])))) { if(is_callable(replacer)) { stringify_ctx.replacer = jsdisp_addref(replacer); }else if(is_class(replacer, JSCLASS_ARRAY)) { diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 6bc34da..7debf07 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -183,8 +183,7 @@ void jsval_release(jsval_t val) { switch(jsval_type(val)) { case JSV_OBJECT: - if(get_object(val)) - IDispatch_Release(get_object(val)); + IDispatch_Release(get_object(val)); break; case JSV_STRING: jsstr_release(get_string(val)); @@ -229,8 +228,7 @@ HRESULT jsval_copy(jsval_t v, jsval_t *r) *r = v; return S_OK; case JSV_OBJECT: - if(get_object(v)) - IDispatch_AddRef(get_object(v)); + IDispatch_AddRef(get_object(v)); *r = v; return S_OK; case JSV_STRING: { @@ -282,8 +280,11 @@ HRESULT variant_to_jsval(VARIANT *var, jsval_t *r) return S_OK; } case VT_DISPATCH: { - if(V_DISPATCH(var)) - IDispatch_AddRef(V_DISPATCH(var)); + if(!V_DISPATCH(var)) { + *r = jsval_null_disp(); + return S_OK; + } + IDispatch_AddRef(V_DISPATCH(var)); *r = jsval_disp(V_DISPATCH(var)); return S_OK; } @@ -332,7 +333,7 @@ HRESULT variant_to_jsval(VARIANT *var, jsval_t *r) return S_OK; } }else { - *r = jsval_disp(NULL); + *r = jsval_null_disp(); return S_OK; } /* fall through */ @@ -348,13 +349,17 @@ HRESULT jsval_to_variant(jsval_t val, VARIANT *retv) V_VT(retv) = VT_EMPTY; return S_OK; case JSV_NULL: + if(get_bool(val)) { + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = NULL; + return S_OK; + } V_VT(retv) = VT_NULL; return S_OK; case JSV_OBJECT: V_VT(retv) = VT_DISPATCH; - if(get_object(val)) - IDispatch_AddRef(get_object(val)); V_DISPATCH(retv) = get_object(val); + IDispatch_AddRef(get_object(val)); return S_OK; case JSV_STRING: V_VT(retv) = VT_BSTR; @@ -394,11 +399,6 @@ HRESULT to_primitive(script_ctx_t *ctx, jsval_t val, jsval_t *ret, hint_t hint) DISPID id; HRESULT hres; - if(!get_object(val)) { - *ret = jsval_null(); - return S_OK; - } - jsdisp = iface_to_jsdisp(get_object(val)); if(!jsdisp) return disp_propget(ctx, get_object(val), DISPID_VALUE, ret); @@ -459,7 +459,7 @@ HRESULT to_boolean(jsval_t val, BOOL *ret) *ret = FALSE; return S_OK; case JSV_OBJECT: - *ret = get_object(val) != NULL; + *ret = TRUE; return S_OK; case JSV_STRING: *ret = jsstr_length(get_string(val)) != 0; @@ -839,18 +839,8 @@ HRESULT to_object(script_ctx_t *ctx, jsval_t val, IDispatch **disp) *disp = to_disp(dispex); break; case JSV_OBJECT: - if(get_object(val)) { - *disp = get_object(val); - IDispatch_AddRef(*disp); - }else { - jsdisp_t *obj; - - hres = create_object(ctx, NULL, &obj); - if(FAILED(hres)) - return hres; - - *disp = to_disp(obj); - } + *disp = get_object(val); + IDispatch_AddRef(*disp); break; case JSV_BOOL: hres = create_bool(ctx, get_bool(val), &dispex); @@ -859,8 +849,11 @@ HRESULT to_object(script_ctx_t *ctx, jsval_t val, IDispatch **disp) *disp = to_disp(dispex); break; - case JSV_UNDEFINED: case JSV_NULL: + if(is_null_disp(val)) + return JS_E_OBJECT_REQUIRED; + /* fall through */ + case JSV_UNDEFINED: WARN("object expected\n"); return JS_E_OBJECT_EXPECTED; case JSV_VARIANT: diff --git a/dlls/jscript/jsval.h b/dlls/jscript/jsval.h index 9f451b1..4e00d08 100644 --- a/dlls/jscript/jsval.h +++ b/dlls/jscript/jsval.h @@ -131,6 +131,15 @@ static inline jsval_t jsval_null(void) { jsval_t ret; __JSVAL_TYPE(ret) = JSV_NULL; + __JSVAL_BOOL(ret) = FALSE; + return ret; +} + +static inline jsval_t jsval_null_disp(void) +{ + jsval_t ret; + __JSVAL_TYPE(ret) = JSV_NULL; + __JSVAL_BOOL(ret) = TRUE; return ret; } @@ -178,9 +187,9 @@ static inline BOOL is_null(jsval_t v) return __JSVAL_TYPE(v) == JSV_NULL; } -static inline BOOL is_null_instance(jsval_t v) +static inline BOOL is_null_disp(jsval_t v) { - return is_null(v) || (is_object_instance(v) && !__JSVAL_OBJ(v)); + return is_null(v) && __JSVAL_BOOL(v); } static inline BOOL is_string(jsval_t v) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index f8f1407..9d4a747 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -127,6 +127,11 @@ static HRESULT Object_valueOf(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsi TRACE("\n"); + if(is_null_disp(vthis)) { + if(r) *r = jsval_null_disp(); + return S_OK; + } + hres = to_object(ctx, vthis, &disp); if(FAILED(hres)) return hres; @@ -554,7 +559,7 @@ static HRESULT jsdisp_define_properties(script_ctx_t *ctx, jsdisp_t *obj, jsval_ if(FAILED(hres)) break; - if(!is_object_instance(desc_val) || !get_object(desc_val) || !(desc_obj = to_jsdisp(get_object(desc_val)))) { + if(!is_object_instance(desc_val) || !(desc_obj = to_jsdisp(get_object(desc_val)))) { jsval_release(desc_val); break; } @@ -631,7 +636,7 @@ static HRESULT Object_defineProperties(script_ctx_t *ctx, jsval_t vthis, WORD fl jsdisp_t *obj; HRESULT hres; - if(argc < 1 || !is_object_instance(argv[0]) || !get_object(argv[0]) || !(obj = to_jsdisp(get_object(argv[0])))) { + if(argc < 1 || !is_object_instance(argv[0]) || !(obj = to_jsdisp(get_object(argv[0])))) { FIXME("not an object\n"); return E_NOTIMPL; } @@ -779,7 +784,7 @@ static HRESULT object_keys(script_ctx_t *ctx, jsval_t arg, enum jsdisp_enum_type jsstr_t *key; HRESULT hres; - if(!is_object_instance(arg) || !get_object(arg)) { + if(!is_object_instance(arg)) { FIXME("invalid arguments %s\n", debugstr_jsval(arg)); return E_NOTIMPL; } @@ -838,7 +843,7 @@ static HRESULT Object_preventExtensions(script_ctx_t *ctx, jsval_t vthis, WORD f { jsdisp_t *obj; - if(!argc || !is_object_instance(argv[0]) || !get_object(argv[0])) { + if(!argc || !is_object_instance(argv[0])) { FIXME("invalid arguments\n"); return E_NOTIMPL; } @@ -861,7 +866,7 @@ static HRESULT Object_freeze(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsig { jsdisp_t *obj; - if(!argc || !is_object_instance(argv[0]) || !get_object(argv[0])) { + if(!argc || !is_object_instance(argv[0])) { WARN("argument is not an object\n"); return JS_E_OBJECT_EXPECTED; } @@ -884,7 +889,7 @@ static HRESULT Object_seal(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigne { jsdisp_t *obj; - if(!argc || !is_object_instance(argv[0]) || !get_object(argv[0])) { + if(!argc || !is_object_instance(argv[0])) { WARN("argument is not an object\n"); return JS_E_OBJECT_EXPECTED; } @@ -906,7 +911,7 @@ static HRESULT Object_isExtensible(script_ctx_t *ctx, jsval_t vthis, WORD flags, { jsdisp_t *obj; - if(!argc || !is_object_instance(argv[0]) || !get_object(argv[0])) { + if(!argc || !is_object_instance(argv[0])) { WARN("argument is not an object\n"); return JS_E_OBJECT_EXPECTED; } @@ -928,7 +933,7 @@ static HRESULT Object_isFrozen(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns { jsdisp_t *obj; - if(!argc || !is_object_instance(argv[0]) || !get_object(argv[0])) { + if(!argc || !is_object_instance(argv[0])) { WARN("argument is not an object\n"); return JS_E_OBJECT_EXPECTED; } @@ -950,7 +955,7 @@ static HRESULT Object_isSealed(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns { jsdisp_t *obj; - if(!argc || !is_object_instance(argv[0]) || !get_object(argv[0])) { + if(!argc || !is_object_instance(argv[0])) { WARN("argument is not an object\n"); return JS_E_OBJECT_EXPECTED; } @@ -1005,7 +1010,7 @@ static HRESULT ObjectConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, jsdisp_t *obj; if(argc) { - if(!is_undefined(argv[0]) && !is_null(argv[0]) && (!is_object_instance(argv[0]) || get_object(argv[0]))) { + if(!is_undefined(argv[0]) && !is_null(argv[0])) { IDispatch *disp; hres = to_object(ctx, argv[0], &disp); diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 35edcf8..7973d42 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -274,7 +274,7 @@ static HRESULT Map_forEach(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigne TRACE("%p (%s)\n", map, debugstr_jsval(argc >= 1 ? argv[0] : jsval_undefined())); - if(!is_object_instance(callback) || !get_object(callback)) { + if(!is_object_instance(callback)) { FIXME("invalid callback %s\n", debugstr_jsval(callback)); return E_FAIL; } diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 8e2b0d6..9eaeddd 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1926,6 +1926,7 @@ ok(isNaN(tmp), "Math.tan(-Infinity) is not NaN"); [[true], "true"], [[false], "false"], [[null], "null"], + [[nullDisp], undefined], [[1], "1"], [["test"], "\"test\""], [["test\"\\\b\f\n\r\t\u0002 !"], "\"test\\\"\\\\\\b\\f\\n\\r\\t\\u0002 !\""], @@ -2367,6 +2368,9 @@ ok(bool.toString() === "true", "bool.toString() = " + bool.toString()); ok(bool.valueOf() === Boolean(1), "bool.valueOf() = " + bool.valueOf()); ok(bool.toLocaleString() === bool.toString(), "bool.toLocaleString() = " + bool.toLocaleString()); +tmp = Object.prototype.valueOf.call(nullDisp); +ok(tmp === nullDisp, "nullDisp.valueOf != nullDisp"); + ok(ActiveXObject instanceof Function, "ActiveXObject is not instance of Function"); ok(ActiveXObject.prototype instanceof Object, "ActiveXObject.prototype is not instance of Object"); @@ -2574,6 +2578,7 @@ testException(function() {createArray().getItem(3);}, "E_SUBSCRIPT_OUT_OF_RANGE" testException(function() {date.setTime();}, "E_ARG_NOT_OPT"); testException(function() {date.setYear();}, "E_ARG_NOT_OPT"); testException(function() {arr.test();}, "E_NO_PROPERTY"); +testException(function() {[1,2,3].sort(nullDisp);}, "E_JSCRIPT_EXPECTED"); testException(function() {Number.prototype.toString.call(arr);}, "E_NOT_NUM"); testException(function() {Number.prototype.toFixed.call(arr);}, "E_NOT_NUM"); testException(function() {(new Number(3)).toString(1);}, "E_INVALID_CALL_ARG"); @@ -2587,6 +2592,9 @@ testException(function() {eval("nonexistingfunc()")}, "E_OBJECT_EXPECTED"); testException(function() {(new Object()) instanceof 3;}, "E_NOT_FUNC"); testException(function() {(new Object()) instanceof null;}, "E_NOT_FUNC"); testException(function() {(new Object()) instanceof nullDisp;}, "E_NOT_FUNC"); +testException(function() {nullDisp instanceof Object;}, "E_OBJECT_EXPECTED"); +testException(function() {Function.prototype.apply.call(nullDisp, Object, []);}, "E_OBJECT_REQUIRED"); +testException(function() {Function.prototype.call.call(nullDisp, Object);}, "E_OBJECT_REQUIRED"); testException(function() {"test" in 3;}, "E_OBJECT_EXPECTED"); testException(function() {"test" in null;}, "E_OBJECT_EXPECTED"); testException(function() {"test" in nullDisp;}, "E_OBJECT_EXPECTED"); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 23c9c79..cf08423 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1906,6 +1906,8 @@ ok(getVT(true && nullDisp) === "VT_DISPATCH", "getVT(0 && nullDisp) = " + getVT(true && nullDisp)); ok(!nullDisp === true, "!nullDisp = " + !nullDisp); ok(String(nullDisp) === "null", "String(nullDisp) = " + String(nullDisp)); +ok(+nullDisp === 0, "+nullDisp !== 0"); +ok(''+nullDisp === "null", "''+nullDisp !== null"); ok(nullDisp != new Object(), "nullDisp == new Object()"); ok(new Object() != nullDisp, "new Object() == nullDisp"); ok((typeof Object(nullDisp)) === "object", "typeof Object(nullDisp) !== 'object'"); -- 2.34.1

3 14

[PATCH 6/6] winealsa: Move the midi event handlers to the unixlib.
by Huw Davies 24 Mar '22

24 Mar '22

The MIM_DATA and MIM_LONGDATA notifications are sent via the notification thread. The midi_handle_event syscall is temporary. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 2 +- dlls/winealsa.drv/alsamidi.c | 172 +++++++++++++++++++++++++++++++++-- dlls/winealsa.drv/midi.c | 129 +------------------------- dlls/winealsa.drv/unixlib.h | 4 +- 4 files changed, 167 insertions(+), 140 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 5b592986c06..b18588ab1c0 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2451,6 +2451,6 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_notify_wait, midi_seq_lock, /* temporary */ - midi_in_lock, midi_seq_open, + midi_handle_event, }; diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index e10779f63a1..30c46eee64d 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -72,6 +72,9 @@ static int port_in = -1; static pthread_mutex_t notify_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_cond_t notify_cond = PTHREAD_COND_INITIALIZER; static BOOL notify_quit; +#define NOTIFY_BUFFER_SIZE 64 + 1 /* + 1 for the sentinel */ +static struct notify_context notify_buffer[NOTIFY_BUFFER_SIZE]; +static struct notify_context *notify_read = notify_buffer, *notify_write = notify_buffer; static void seq_lock(void) { @@ -101,14 +104,6 @@ static void in_buffer_unlock(void) pthread_mutex_unlock(&in_buffer_mutex); } -NTSTATUS midi_in_lock(void *args) -{ - if (args) in_buffer_lock(); - else in_buffer_unlock(); - - return STATUS_SUCCESS; -} - static void set_in_notify(struct notify_context *notify, struct midi_src *src, WORD dev_id, WORD msg, UINT_PTR param_1, UINT_PTR param_2) { @@ -123,11 +118,49 @@ static void set_in_notify(struct notify_context *notify, struct midi_src *src, W notify->instance = src->midiDesc.dwInstance; } +/* + * notify buffer: The notification ring buffer is implemented so that + * there is always at least one unused sentinel before the current + * read position in order to allow detection of the full vs empty + * state. + */ +static struct notify_context *notify_buffer_next(struct notify_context *notify) +{ + if (++notify >= notify_buffer + ARRAY_SIZE(notify_buffer)) + notify = notify_buffer; + + return notify; +} + +static void notify_buffer_add(struct notify_context *notify) +{ + struct notify_context *next = notify_buffer_next(notify_write); + + if (next == notify_read) /* buffer is full - we can't issue a WARN() in a non-Win32 thread */ + notify_read = notify_buffer_next(notify_read); /* drop the oldest notification */ + *notify_write = *notify; + notify_write = next; +} + +static BOOL notify_buffer_empty(void) +{ + return notify_read == notify_write; +} + +static BOOL notify_buffer_remove(struct notify_context *notify) +{ + if (notify_buffer_empty()) return FALSE; + + *notify = *notify_read; + notify_read = notify_buffer_next(notify_read); + return TRUE; +} + static void notify_post(struct notify_context *notify) { pthread_mutex_lock(&notify_mutex); - if (notify) FIXME("Not yet handled\n"); + if (notify) notify_buffer_add(notify); else notify_quit = TRUE; pthread_cond_signal(&notify_cond); @@ -889,6 +922,124 @@ static UINT midi_out_reset(WORD dev_id) return MMSYSERR_NOERROR; } +static void handle_sysex_event(struct midi_src *src, BYTE *data, UINT len) +{ + UINT pos = 0, copy_len, current_time = NtGetTickCount() - src->startTime; + struct notify_context notify; + MIDIHDR *hdr; + + in_buffer_lock(); + + while (len) + { + hdr = src->lpQueueHdr; + if (!hdr) break; + + copy_len = min(len, hdr->dwBufferLength - hdr->dwBytesRecorded); + memcpy(hdr->lpData + hdr->dwBytesRecorded, data + pos, copy_len); + hdr->dwBytesRecorded += copy_len; + len -= copy_len; + pos += copy_len; + + if ((hdr->dwBytesRecorded == hdr->dwBufferLength) || + (*(BYTE*)(hdr->lpData + hdr->dwBytesRecorded - 1) == 0xF7)) + { /* buffer full or end of sysex message */ + src->lpQueueHdr = hdr->lpNext; + hdr->dwFlags &= ~MHDR_INQUEUE; + hdr->dwFlags |= MHDR_DONE; + set_in_notify(&notify, src, src - srcs, MIM_LONGDATA, (DWORD_PTR)hdr, current_time); + notify_post(&notify); + } + } + + in_buffer_unlock(); +} + +static void handle_regular_event(struct midi_src *src, snd_seq_event_t *ev) +{ + UINT data = 0, value, current_time = NtGetTickCount() - src->startTime; + struct notify_context notify; + + switch (ev->type) + { + case SND_SEQ_EVENT_NOTEOFF: + data = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_OFF | ev->data.control.channel; + break; + case SND_SEQ_EVENT_NOTEON: + data = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_ON | ev->data.control.channel; + break; + case SND_SEQ_EVENT_KEYPRESS: + data = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_PRESSURE | ev->data.control.channel; + break; + case SND_SEQ_EVENT_CONTROLLER: + data = (ev->data.control.value << 16) | (ev->data.control.param << 8) | MIDI_CMD_CONTROL | ev->data.control.channel; + break; + case SND_SEQ_EVENT_PITCHBEND: + value = ev->data.control.value + 0x2000; + data = (((value >> 7) & 0x7f) << 16) | ((value & 0x7f) << 8) | MIDI_CMD_BENDER | ev->data.control.channel; + break; + case SND_SEQ_EVENT_PGMCHANGE: + data = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_PGM_CHANGE | ev->data.control.channel; + break; + case SND_SEQ_EVENT_CHANPRESS: + data = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_CHANNEL_PRESSURE | ev->data.control.channel; + break; + case SND_SEQ_EVENT_CLOCK: + data = 0xF8; + break; + case SND_SEQ_EVENT_START: + data = 0xFA; + break; + case SND_SEQ_EVENT_CONTINUE: + data = 0xFB; + break; + case SND_SEQ_EVENT_STOP: + data = 0xFC; + break; + case SND_SEQ_EVENT_SONGPOS: + data = (((ev->data.control.value >> 7) & 0x7f) << 16) | ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_SONG_POS; + break; + case SND_SEQ_EVENT_SONGSEL: + data = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_SONG_SELECT; + break; + case SND_SEQ_EVENT_RESET: + data = 0xFF; + break; + case SND_SEQ_EVENT_QFRAME: + data = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_MTC_QUARTER; + break; + case SND_SEQ_EVENT_SENSING: + /* Noting to do */ + break; + } + + if (data != 0) + { + set_in_notify(&notify, src, src - srcs, MIM_DATA, data, current_time); + notify_post(&notify); + } +} + +NTSTATUS midi_handle_event(void *args) +{ + snd_seq_event_t *ev = args; + struct midi_src *src; + + /* Find the target device */ + for (src = srcs; src < srcs + num_srcs; src++) + if ((ev->source.client == src->addr.client) && (ev->source.port == src->addr.port)) + break; + if ((src == srcs + num_srcs) || (src->state != 1)) + return STATUS_SUCCESS; + + if (ev->type == SND_SEQ_EVENT_SYSEX) + handle_sysex_event(src, ev->data.ext.ptr, ev->data.ext.len); + else + handle_regular_event(src, ev); + + return STATUS_SUCCESS; +} + static UINT midi_in_add_buffer(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) { struct midi_src *src; @@ -1131,10 +1282,11 @@ NTSTATUS midi_notify_wait(void *args) pthread_mutex_lock(&notify_mutex); - while (!notify_quit) + while (!notify_quit && notify_buffer_empty()) pthread_cond_wait(&notify_cond, &notify_mutex); *params->quit = notify_quit; + if (!notify_quit) notify_buffer_remove(params->notify); pthread_mutex_unlock(&notify_mutex); diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 77ab9720bcc..8009b23ce3d 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -67,16 +67,6 @@ static void seq_unlock(void) ALSA_CALL(midi_seq_lock, (void *)(UINT_PTR)0); } -static void in_buffer_lock(void) -{ - ALSA_CALL(midi_in_lock, (void *)(UINT_PTR)1); -} - -static void in_buffer_unlock(void) -{ - ALSA_CALL(midi_in_lock, (void *)(UINT_PTR)0); -} - static void notify_client(struct notify_context *notify) { TRACE("dev_id = %d msg = %d param1 = %04lX param2 = %04lX\n", notify->dev_id, notify->msg, notify->param_1, notify->param_2); @@ -122,11 +112,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, switch (wMsg) { case MIM_OPEN: case MIM_CLOSE: - case MIM_DATA: - case MIM_LONGDATA: - case MIM_ERROR: - case MIM_LONGERROR: - case MIM_MOREDATA: if (wDevID > MIDM_NumDevs) return; dwCallBack = MidiInDev[wDevID].midiDesc.dwCallback; @@ -170,117 +155,6 @@ static int midiCloseSeq(void) return 0; } -static void handle_sysex_event(struct midi_src *src, BYTE *data, UINT len) -{ - UINT pos = 0, copy_len, current_time = NtGetTickCount() - src->startTime; - MIDIHDR *hdr; - - in_buffer_lock(); - - while (len) - { - hdr = src->lpQueueHdr; - if (!hdr) break; - - copy_len = min(len, hdr->dwBufferLength - hdr->dwBytesRecorded); - memcpy(hdr->lpData + hdr->dwBytesRecorded, data + pos, copy_len); - hdr->dwBytesRecorded += copy_len; - len -= copy_len; - pos += copy_len; - - if ((hdr->dwBytesRecorded == hdr->dwBufferLength) || - (*(BYTE*)(hdr->lpData + hdr->dwBytesRecorded - 1) == 0xF7)) - { /* buffer full or end of sysex message */ - src->lpQueueHdr = hdr->lpNext; - hdr->dwFlags &= ~MHDR_INQUEUE; - hdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(src - MidiInDev, MIM_LONGDATA, (DWORD_PTR)hdr, current_time); - } - } - - in_buffer_unlock(); -} - -static void handle_regular_event(struct midi_src *src, snd_seq_event_t *ev) -{ - UINT data = 0, value, current_time = NtGetTickCount() - src->startTime; - - switch (ev->type) - { - case SND_SEQ_EVENT_NOTEOFF: - data = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_OFF | ev->data.control.channel; - break; - case SND_SEQ_EVENT_NOTEON: - data = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_ON | ev->data.control.channel; - break; - case SND_SEQ_EVENT_KEYPRESS: - data = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_PRESSURE | ev->data.control.channel; - break; - case SND_SEQ_EVENT_CONTROLLER: - data = (ev->data.control.value << 16) | (ev->data.control.param << 8) | MIDI_CMD_CONTROL | ev->data.control.channel; - break; - case SND_SEQ_EVENT_PITCHBEND: - value = ev->data.control.value + 0x2000; - data = (((value >> 7) & 0x7f) << 16) | ((value & 0x7f) << 8) | MIDI_CMD_BENDER | ev->data.control.channel; - break; - case SND_SEQ_EVENT_PGMCHANGE: - data = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_PGM_CHANGE | ev->data.control.channel; - break; - case SND_SEQ_EVENT_CHANPRESS: - data = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_CHANNEL_PRESSURE | ev->data.control.channel; - break; - case SND_SEQ_EVENT_CLOCK: - data = 0xF8; - break; - case SND_SEQ_EVENT_START: - data = 0xFA; - break; - case SND_SEQ_EVENT_CONTINUE: - data = 0xFB; - break; - case SND_SEQ_EVENT_STOP: - data = 0xFC; - break; - case SND_SEQ_EVENT_SONGPOS: - data = (((ev->data.control.value >> 7) & 0x7f) << 16) | ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_SONG_POS; - break; - case SND_SEQ_EVENT_SONGSEL: - data = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_SONG_SELECT; - break; - case SND_SEQ_EVENT_RESET: - data = 0xFF; - break; - case SND_SEQ_EVENT_QFRAME: - data = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_MTC_QUARTER; - break; - case SND_SEQ_EVENT_SENSING: - /* Noting to do */ - break; - } - - if (data != 0) - { - MIDI_NotifyClient(src - MidiInDev, MIM_DATA, data, current_time); - } -} - -static void handle_midi_event(snd_seq_event_t *ev) -{ - struct midi_src *src; - - /* Find the target device */ - for (src = MidiInDev; src < MidiInDev + MIDM_NumDevs; src++) - if ((ev->source.client == src->addr.client) && (ev->source.port == src->addr.port)) - break; - if ((src == MidiInDev + MIDM_NumDevs) || (src->state != 1)) - return; - - if (ev->type == SND_SEQ_EVENT_SYSEX) - handle_sysex_event(src, ev->data.ext.ptr, ev->data.ext.len); - else - handle_regular_event(src, ev); -} - static DWORD WINAPI midRecThread(void *arg) { snd_seq_t *midi_seq = arg; @@ -320,7 +194,7 @@ static DWORD WINAPI midRecThread(void *arg) seq_unlock(); if (ev) { - handle_midi_event(ev); + ALSA_CALL(midi_handle_event, ev); snd_seq_free_event(ev); } @@ -571,6 +445,7 @@ static DWORD WINAPI notify_thread(void *p) { ALSA_CALL(midi_notify_wait, &params); if (quit) break; + if (notify.send_notify) notify_client(&notify); } return 0; } diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 68ab650d2f6..46f256a1c6a 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -310,8 +310,8 @@ enum alsa_funcs alsa_midi_notify_wait, alsa_midi_seq_lock, /* temporary */ - alsa_midi_in_lock, alsa_midi_seq_open, + alsa_midi_handle_event, }; NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; @@ -321,8 +321,8 @@ NTSTATUS midi_in_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_notify_wait(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_lock(void *args) DECLSPEC_HIDDEN; -NTSTATUS midi_in_lock(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN; +NTSTATUS midi_handle_event(void *args) DECLSPEC_HIDDEN; extern unixlib_handle_t alsa_handle; -- 2.25.1

2 1

[PATCH 5/6] winealsa: Add helpers to handle regular and sysex events.
by Huw Davies 24 Mar '22

24 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/midi.c | 207 ++++++++++++++++++++------------------- 1 file changed, 104 insertions(+), 103 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index ca31def8d16..77ab9720bcc 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -170,114 +170,115 @@ static int midiCloseSeq(void) return 0; } +static void handle_sysex_event(struct midi_src *src, BYTE *data, UINT len) +{ + UINT pos = 0, copy_len, current_time = NtGetTickCount() - src->startTime; + MIDIHDR *hdr; + + in_buffer_lock(); + + while (len) + { + hdr = src->lpQueueHdr; + if (!hdr) break; + + copy_len = min(len, hdr->dwBufferLength - hdr->dwBytesRecorded); + memcpy(hdr->lpData + hdr->dwBytesRecorded, data + pos, copy_len); + hdr->dwBytesRecorded += copy_len; + len -= copy_len; + pos += copy_len; + + if ((hdr->dwBytesRecorded == hdr->dwBufferLength) || + (*(BYTE*)(hdr->lpData + hdr->dwBytesRecorded - 1) == 0xF7)) + { /* buffer full or end of sysex message */ + src->lpQueueHdr = hdr->lpNext; + hdr->dwFlags &= ~MHDR_INQUEUE; + hdr->dwFlags |= MHDR_DONE; + MIDI_NotifyClient(src - MidiInDev, MIM_LONGDATA, (DWORD_PTR)hdr, current_time); + } + } + + in_buffer_unlock(); +} + +static void handle_regular_event(struct midi_src *src, snd_seq_event_t *ev) +{ + UINT data = 0, value, current_time = NtGetTickCount() - src->startTime; + + switch (ev->type) + { + case SND_SEQ_EVENT_NOTEOFF: + data = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_OFF | ev->data.control.channel; + break; + case SND_SEQ_EVENT_NOTEON: + data = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_ON | ev->data.control.channel; + break; + case SND_SEQ_EVENT_KEYPRESS: + data = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_PRESSURE | ev->data.control.channel; + break; + case SND_SEQ_EVENT_CONTROLLER: + data = (ev->data.control.value << 16) | (ev->data.control.param << 8) | MIDI_CMD_CONTROL | ev->data.control.channel; + break; + case SND_SEQ_EVENT_PITCHBEND: + value = ev->data.control.value + 0x2000; + data = (((value >> 7) & 0x7f) << 16) | ((value & 0x7f) << 8) | MIDI_CMD_BENDER | ev->data.control.channel; + break; + case SND_SEQ_EVENT_PGMCHANGE: + data = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_PGM_CHANGE | ev->data.control.channel; + break; + case SND_SEQ_EVENT_CHANPRESS: + data = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_CHANNEL_PRESSURE | ev->data.control.channel; + break; + case SND_SEQ_EVENT_CLOCK: + data = 0xF8; + break; + case SND_SEQ_EVENT_START: + data = 0xFA; + break; + case SND_SEQ_EVENT_CONTINUE: + data = 0xFB; + break; + case SND_SEQ_EVENT_STOP: + data = 0xFC; + break; + case SND_SEQ_EVENT_SONGPOS: + data = (((ev->data.control.value >> 7) & 0x7f) << 16) | ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_SONG_POS; + break; + case SND_SEQ_EVENT_SONGSEL: + data = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_SONG_SELECT; + break; + case SND_SEQ_EVENT_RESET: + data = 0xFF; + break; + case SND_SEQ_EVENT_QFRAME: + data = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_MTC_QUARTER; + break; + case SND_SEQ_EVENT_SENSING: + /* Noting to do */ + break; + } + + if (data != 0) + { + MIDI_NotifyClient(src - MidiInDev, MIM_DATA, data, current_time); + } +} + static void handle_midi_event(snd_seq_event_t *ev) { - WORD wDevID; + struct midi_src *src; /* Find the target device */ - for (wDevID = 0; wDevID < MIDM_NumDevs; wDevID++) - if ( (ev->source.client == MidiInDev[wDevID].addr.client) && (ev->source.port == MidiInDev[wDevID].addr.port) ) - break; - if ((wDevID == MIDM_NumDevs) || (MidiInDev[wDevID].state != 1)) - FIXME("Unexpected event received, type = %x from %d:%d\n", ev->type, ev->source.client, ev->source.port); - else { - DWORD dwTime, toSend = 0; - int value = 0; - /* FIXME: Should use ev->time instead for better accuracy */ - dwTime = GetTickCount() - MidiInDev[wDevID].startTime; - TRACE("Event received, type = %x, device = %d\n", ev->type, wDevID); - switch(ev->type) - { - case SND_SEQ_EVENT_NOTEOFF: - toSend = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_OFF | ev->data.control.channel; - break; - case SND_SEQ_EVENT_NOTEON: - toSend = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_ON | ev->data.control.channel; - break; - case SND_SEQ_EVENT_KEYPRESS: - toSend = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_PRESSURE | ev->data.control.channel; + for (src = MidiInDev; src < MidiInDev + MIDM_NumDevs; src++) + if ((ev->source.client == src->addr.client) && (ev->source.port == src->addr.port)) break; - case SND_SEQ_EVENT_CONTROLLER: - toSend = (ev->data.control.value << 16) | (ev->data.control.param << 8) | MIDI_CMD_CONTROL | ev->data.control.channel; - break; - case SND_SEQ_EVENT_PITCHBEND: - value = ev->data.control.value + 0x2000; - toSend = (((value >> 7) & 0x7f) << 16) | ((value & 0x7f) << 8) | MIDI_CMD_BENDER | ev->data.control.channel; - break; - case SND_SEQ_EVENT_PGMCHANGE: - toSend = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_PGM_CHANGE | ev->data.control.channel; - break; - case SND_SEQ_EVENT_CHANPRESS: - toSend = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_CHANNEL_PRESSURE | ev->data.control.channel; - break; - case SND_SEQ_EVENT_CLOCK: - toSend = 0xF8; - break; - case SND_SEQ_EVENT_START: - toSend = 0xFA; - break; - case SND_SEQ_EVENT_CONTINUE: - toSend = 0xFB; - break; - case SND_SEQ_EVENT_STOP: - toSend = 0xFC; - break; - case SND_SEQ_EVENT_SONGPOS: - toSend = (((ev->data.control.value >> 7) & 0x7f) << 16) | ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_SONG_POS; - break; - case SND_SEQ_EVENT_SONGSEL: - toSend = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_SONG_SELECT; - break; - case SND_SEQ_EVENT_RESET: - toSend = 0xFF; - break; - case SND_SEQ_EVENT_QFRAME: - toSend = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_MTC_QUARTER; - break; - case SND_SEQ_EVENT_SYSEX: - { - int pos = 0; - int len = ev->data.ext.len; - LPBYTE ptr = ev->data.ext.ptr; - LPMIDIHDR lpMidiHdr; - - in_buffer_lock(); - while (len) { - if ((lpMidiHdr = MidiInDev[wDevID].lpQueueHdr) != NULL) { - int copylen = min(len, lpMidiHdr->dwBufferLength - lpMidiHdr->dwBytesRecorded); - memcpy(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded, ptr + pos, copylen); - lpMidiHdr->dwBytesRecorded += copylen; - len -= copylen; - pos += copylen; - /* We check if we reach the end of buffer or the end of sysex before notifying - * to handle the case where ALSA split the sysex into several events */ - if ((lpMidiHdr->dwBytesRecorded == lpMidiHdr->dwBufferLength) || - (*(BYTE*)(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded - 1) == 0xF7)) { - MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; - lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; - lpMidiHdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); - } - } else { - FIXME("Sysex data received but no buffer to store it!\n"); - break; - } - } - in_buffer_unlock(); - } - break; - case SND_SEQ_EVENT_SENSING: - /* Noting to do */ - break; - default: - FIXME("Unhandled event received, type = %x\n", ev->type); - break; - } - if (toSend != 0) { - TRACE("Received event %08x from %d:%d\n", toSend, ev->source.client, ev->source.port); - MIDI_NotifyClient(wDevID, MIM_DATA, toSend, dwTime); - } - } + if ((src == MidiInDev + MIDM_NumDevs) || (src->state != 1)) + return; + + if (ev->type == SND_SEQ_EVENT_SYSEX) + handle_sysex_event(src, ev->data.ext.ptr, ev->data.ext.len); + else + handle_regular_event(src, ev); } static DWORD WINAPI midRecThread(void *arg) -- 2.25.1

2 1

[PATCH 4/6] winealsa: Introduce a notification thread.
by Huw Davies 24 Mar '22

24 Mar '22

Currently the thread just blocks until told to quit by midi_release. Eventually this thread will dispatch the MIM_DATA and MIM_LONGDATA notifications. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 2 ++ dlls/winealsa.drv/alsamidi.c | 39 ++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/midi.c | 24 +++++++++++++++++++--- dlls/winealsa.drv/unixlib.h | 10 +++++++++ 4 files changed, 72 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index eb16203dbf9..5b592986c06 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2445,8 +2445,10 @@ unixlib_entry_t __wine_unix_call_funcs[] = is_started, get_prop_value, midi_init, + midi_release, midi_out_message, midi_in_message, + midi_notify_wait, midi_seq_lock, /* temporary */ midi_in_lock, diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index ccdb35731d1..e10779f63a1 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -69,6 +69,10 @@ static snd_seq_t *midi_seq; static unsigned int seq_refs; static int port_in = -1; +static pthread_mutex_t notify_mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_cond_t notify_cond = PTHREAD_COND_INITIALIZER; +static BOOL notify_quit; + static void seq_lock(void) { pthread_mutex_lock(&seq_mutex); @@ -119,6 +123,17 @@ static void set_in_notify(struct notify_context *notify, struct midi_src *src, W notify->instance = src->midiDesc.dwInstance; } +static void notify_post(struct notify_context *notify) +{ + pthread_mutex_lock(&notify_mutex); + + if (notify) FIXME("Not yet handled\n"); + else notify_quit = TRUE; + pthread_cond_signal(&notify_cond); + + pthread_mutex_unlock(&notify_mutex); +} + static snd_seq_t *seq_open(int *port_in_ret) { static int midi_warn; @@ -405,6 +420,14 @@ NTSTATUS midi_init(void *args) return STATUS_SUCCESS; } +NTSTATUS midi_release(void *args) +{ + /* stop the notify_wait thread */ + notify_post(NULL); + + return STATUS_SUCCESS; +} + static void set_out_notify(struct notify_context *notify, struct midi_dest *dest, WORD dev_id, WORD msg, UINT_PTR param_1, UINT_PTR param_2) { @@ -1101,3 +1124,19 @@ NTSTATUS midi_in_message(void *args) return STATUS_SUCCESS; } + +NTSTATUS midi_notify_wait(void *args) +{ + struct midi_notify_wait_params *params = args; + + pthread_mutex_lock(&notify_mutex); + + while (!notify_quit) + pthread_cond_wait(&notify_cond, &notify_mutex); + + *params->quit = notify_quit; + + pthread_mutex_unlock(&notify_mutex); + + return STATUS_SUCCESS; +} diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 35678588549..ca31def8d16 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -557,18 +557,36 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return err; } +static DWORD WINAPI notify_thread(void *p) +{ + struct midi_notify_wait_params params; + struct notify_context notify; + BOOL quit; + + params.notify = &notify; + params.quit = &quit; + + while (1) + { + ALSA_CALL(midi_notify_wait, &params); + if (quit) break; + } + return 0; +} + /************************************************************************** * DriverProc (WINEALSA.@) */ LRESULT CALLBACK ALSA_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LPARAM dwParam1, LPARAM dwParam2) { -/* EPP TRACE("(%08lX, %04X, %08lX, %08lX, %08lX)\n", */ -/* EPP dwDevID, hDriv, wMsg, dwParam1, dwParam2); */ - switch(wMsg) { case DRV_LOAD: + CloseHandle(CreateThread(NULL, 0, notify_thread, NULL, 0, NULL)); + return 1; case DRV_FREE: + ALSA_CALL(midi_release, NULL); + return 1; case DRV_OPEN: case DRV_CLOSE: case DRV_ENABLE: diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 6d5bcb64cf0..68ab650d2f6 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -265,6 +265,12 @@ struct midi_in_message_params struct notify_context *notify; }; +struct midi_notify_wait_params +{ + BOOL *quit; + struct notify_context *notify; +}; + struct midi_seq_open_params { int close; @@ -298,8 +304,10 @@ enum alsa_funcs alsa_is_started, alsa_get_prop_value, alsa_midi_init, + alsa_midi_release, alsa_midi_out_message, alsa_midi_in_message, + alsa_midi_notify_wait, alsa_midi_seq_lock, /* temporary */ alsa_midi_in_lock, @@ -307,8 +315,10 @@ enum alsa_funcs }; NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; +NTSTATUS midi_release(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_out_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_in_message(void *args) DECLSPEC_HIDDEN; +NTSTATUS midi_notify_wait(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_lock(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_in_lock(void *args) DECLSPEC_HIDDEN; -- 2.25.1

2 1

[PATCH 3/6] winealsa: Move MIDM_STOP to the unixlib.
by Huw Davies 24 Mar '22

24 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsamidi.c | 17 +++++++++++++++++ dlls/winealsa.drv/midi.c | 16 ---------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index d647ba79a9e..ccdb35731d1 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -957,6 +957,20 @@ static UINT midi_in_start(WORD dev_id) return MMSYSERR_NOERROR; } +static UINT midi_in_stop(WORD dev_id) +{ + struct midi_src *src; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_srcs) return MMSYSERR_BADDEVICEID; + src = srcs + dev_id; + if (src->state == -1) return MIDIERR_NODEVICE; + + src->state = 0; + return MMSYSERR_NOERROR; +} + static DWORD midi_in_reset(WORD dev_id, struct notify_context *notify) { UINT cur_time = NtGetTickCount(); @@ -1074,6 +1088,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_START: *params->err = midi_in_start(params->dev_id); break; + case MIDM_STOP: + *params->err = midi_in_stop(params->dev_id); + break; case MIDM_RESET: *params->err = midi_in_reset(params->dev_id, params->notify); break; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 88b23f52ec1..35678588549 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -459,20 +459,6 @@ static DWORD midClose(WORD wDevID) return ret; } -/************************************************************************** - * midStop [internal] - */ -static DWORD midStop(WORD wDevID) -{ - TRACE("(%04X);\n", wDevID); - - if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID; - if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE; - - MidiInDev[wDevID].state = 0; - return MMSYSERR_NOERROR; -} - /*======================================================================* * MIDI entry points * *======================================================================*/ @@ -518,8 +504,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); case MIDM_CLOSE: return midClose(wDevID); - case MIDM_STOP: - return midStop(wDevID); } params.dev_id = wDevID; -- 2.25.1

2 1

[PATCH 2/6] winealsa: Move MIDM_START to the unixlib.
by Huw Davies 24 Mar '22

24 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsamidi.c | 18 ++++++++++++++++++ dlls/winealsa.drv/midi.c | 17 ----------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 535699a4059..d647ba79a9e 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -942,6 +942,21 @@ static UINT midi_in_get_devcaps(WORD dev_id, MIDIINCAPSW *caps, UINT size) return MMSYSERR_NOERROR; } +static UINT midi_in_start(WORD dev_id) +{ + struct midi_src *src; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_srcs) return MMSYSERR_BADDEVICEID; + src = srcs + dev_id; + if (src->state == -1) return MIDIERR_NODEVICE; + + src->state = 1; + src->startTime = NtGetTickCount(); + return MMSYSERR_NOERROR; +} + static DWORD midi_in_reset(WORD dev_id, struct notify_context *notify) { UINT cur_time = NtGetTickCount(); @@ -1056,6 +1071,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_GETNUMDEVS: *params->err = num_srcs; break; + case MIDM_START: + *params->err = midi_in_start(params->dev_id); + break; case MIDM_RESET: *params->err = midi_in_reset(params->dev_id, params->notify); break; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 5639bf67369..88b23f52ec1 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -459,21 +459,6 @@ static DWORD midClose(WORD wDevID) return ret; } -/************************************************************************** - * midStart [internal] - */ -static DWORD midStart(WORD wDevID) -{ - TRACE("(%04X);\n", wDevID); - - if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID; - if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE; - - MidiInDev[wDevID].state = 1; - MidiInDev[wDevID].startTime = GetTickCount(); - return MMSYSERR_NOERROR; -} - /************************************************************************** * midStop [internal] */ @@ -533,8 +518,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); case MIDM_CLOSE: return midClose(wDevID); - case MIDM_START: - return midStart(wDevID); case MIDM_STOP: return midStop(wDevID); } -- 2.25.1

2 1

[PATCH 1/6] winealsa: Move MIDM_RESET to the unixlib.
by Huw Davies 24 Mar '22

24 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsamidi.c | 49 ++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/midi.c | 35 ++++++-------------------- dlls/winealsa.drv/unixlib.h | 1 + 3 files changed, 57 insertions(+), 28 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 80e677b3064..535699a4059 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -105,6 +105,20 @@ NTSTATUS midi_in_lock(void *args) return STATUS_SUCCESS; } +static void set_in_notify(struct notify_context *notify, struct midi_src *src, WORD dev_id, WORD msg, + UINT_PTR param_1, UINT_PTR param_2) +{ + notify->send_notify = TRUE; + notify->dev_id = dev_id; + notify->msg = msg; + notify->param_1 = param_1; + notify->param_2 = param_2; + notify->callback = src->midiDesc.dwCallback; + notify->flags = src->wFlags; + notify->device = src->midiDesc.hMidi; + notify->instance = src->midiDesc.dwInstance; +} + static snd_seq_t *seq_open(int *port_in_ret) { static int midi_warn; @@ -928,6 +942,36 @@ static UINT midi_in_get_devcaps(WORD dev_id, MIDIINCAPSW *caps, UINT size) return MMSYSERR_NOERROR; } +static DWORD midi_in_reset(WORD dev_id, struct notify_context *notify) +{ + UINT cur_time = NtGetTickCount(); + UINT err = MMSYSERR_NOERROR; + struct midi_src *src; + MIDIHDR *hdr; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_srcs) return MMSYSERR_BADDEVICEID; + src = srcs + dev_id; + if (src->state == -1) return MIDIERR_NODEVICE; + + in_buffer_lock(); + + if (src->lpQueueHdr) + { + hdr = src->lpQueueHdr; + src->lpQueueHdr = hdr->lpNext; + hdr->dwFlags &= ~MHDR_INQUEUE; + hdr->dwFlags |= MHDR_DONE; + set_in_notify(notify, src, dev_id, MIM_LONGDATA, (DWORD_PTR)hdr, cur_time - src->startTime); + if (src->lpQueueHdr) err = ERROR_RETRY; /* ask the client to call again */ + } + + in_buffer_unlock(); + + return err; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -987,6 +1031,8 @@ NTSTATUS midi_in_message(void *args) { struct midi_in_message_params *params = args; + params->notify->send_notify = FALSE; + switch (params->msg) { case DRVM_EXIT: @@ -1010,6 +1056,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_GETNUMDEVS: *params->err = num_srcs; break; + case MIDM_RESET: + *params->err = midi_in_reset(params->dev_id, params->notify); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 72649eca89c..5639bf67369 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -459,31 +459,6 @@ static DWORD midClose(WORD wDevID) return ret; } -/************************************************************************** - * midReset [internal] - */ -static DWORD midReset(WORD wDevID) -{ - DWORD dwTime = GetTickCount(); - - TRACE("(%04X);\n", wDevID); - - if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID; - if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE; - - in_buffer_lock(); - while (MidiInDev[wDevID].lpQueueHdr) { - LPMIDIHDR lpMidiHdr = MidiInDev[wDevID].lpQueueHdr; - MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; - lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; - lpMidiHdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime - MidiInDev[wDevID].startTime); - } - in_buffer_unlock(); - - return MMSYSERR_NOERROR; -} - /************************************************************************** * midStart [internal] */ @@ -545,6 +520,7 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { struct midi_in_message_params params; + struct notify_context notify; UINT err; TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", @@ -557,8 +533,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); case MIDM_CLOSE: return midClose(wDevID); - case MIDM_RESET: - return midReset(wDevID); case MIDM_START: return midStart(wDevID); case MIDM_STOP: @@ -571,8 +545,13 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, params.param_1 = dwParam1; params.param_2 = dwParam2; params.err = &err; + params.notify = &notify; - ALSA_CALL(midi_in_message, &params); + do + { + ALSA_CALL(midi_in_message, &params); + if ((!err || err == ERROR_RETRY) && notify.send_notify) notify_client(&notify); + } while (err == ERROR_RETRY); return err; } diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 263e83eda57..6d5bcb64cf0 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -262,6 +262,7 @@ struct midi_in_message_params UINT_PTR param_1; UINT_PTR param_2; UINT *err; + struct notify_context *notify; }; struct midi_seq_open_params -- 2.25.1

2 1

[PATCH 6/6] win32u: Move NtUserGetMessage implementation from user32.
by Jacek Caban 24 Mar '22

24 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 856 +---------------------------------- dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 103 ++++- dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 + include/ntuser.h | 1 + 7 files changed, 112 insertions(+), 858 deletions(-)

3 2

[PATCH 5/6] win32u: Move NtUserPeekMessage implementation from user32.
by Jacek Caban 24 Mar '22

24 Mar '22

3 2

[PATCH 4/6] win32u: Move process_sent_messages implementation from user32.
by Jacek Caban 24 Mar '22

24 Mar '22

3 2

[PATCH 2/6] win32u: Move reply_message_result implementation from user32.
by Jacek Caban 24 Mar '22

24 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 29 +-- dlls/win32u/message.c | 416 +++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 9 + dlls/win32u/sysparams.c | 2 + dlls/win32u/win32u_private.h | 1 + include/ntuser.h | 1 + 6 files changed, 431 insertions(+), 27 deletions(-)

3 2

[PATCH 1/6] user32: Introduce reply_message_result helper.
by Jacek Caban 24 Mar '22

24 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-)

3 2

[tools 1/2] testbot/cgi: Group related CGI framework methods together.
by Francois Gouget 24 Mar '22

24 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This should not make any difference to the way the website works but it really makes it easier to understand how the classes work. It also simplifies documenting them. --- .../lib/ObjectModel/CGI/CollectionBlock.pm | 668 +++++++++--------- .../ObjectModel/CGI/CollectionBlockForPage.pm | 87 ++- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 152 ++-- testbot/lib/ObjectModel/CGI/FormPage.pm | 331 +++++---- testbot/lib/ObjectModel/CGI/ItemPage.pm | 136 ++-- testbot/lib/ObjectModel/CGI/Page.pm | 156 ++-- testbot/lib/WineTestBot/CGI/PageBase.pm | 355 +++++----- 7 files changed, 1024 insertions(+), 861 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 9027b8775..13bbc4c3f 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -51,6 +51,20 @@ sub _initialize($$$) #my ($self, $Collection, $EnclosingPage) = @_; } +sub CallGetDetailsPage($) +{ + my ($self) = @_; + + return $self->GetDetailsPage(); +} + +sub GetDetailsPage($) +{ + my ($self) = @_; + + return $self->{Collection}->GetItemName() . "Details.pl"; +} + sub escapeHTML($$) { my ($self, $String) = @_; @@ -58,126 +72,213 @@ sub escapeHTML($$) return $self->{EnclosingPage}->escapeHTML($String); } -sub GenerateList($) + +# +# Error handling framework +# + +sub CallGenerateErrorDiv($) { my ($self) = @_; - my $Collection = $self->{Collection}; - my $PropertyDescriptors = $Collection->GetPropertyDescriptors(); - my $HasDT = !1; - foreach my $PropertyDescriptor (@{$PropertyDescriptors}) + $self->{EnclosingPage}->GenerateErrorDiv(); +} + +sub CallGenerateErrorPopup($) +{ + my ($self) = @_; + + $self->{EnclosingPage}->GenerateErrorPopup(); +} + + +# +# Individual item property support +# + +sub CallDisplayProperty($$) +{ + my ($self, $PropertyDescriptor) = @_; + + return $self->DisplayProperty($PropertyDescriptor); +} + +sub DisplayProperty($$) +{ + my ($self, $PropertyDescriptor) = @_; + + return $PropertyDescriptor->GetClass ne "Detailref"; +} + +sub CallSortKeys($$) +{ + my ($self, $Keys) = @_; + + return $self->SortKeys($Keys); +} + +sub SortKeys($$) +{ + my ($self, $Keys) = @_; + + return $Keys; +} + +sub CallGetDisplayValue($$$) +{ + my ($self, $Item, $PropertyDescriptor) = @_; + + return $self->GetDisplayValue($Item, $PropertyDescriptor); +} + +sub GetDisplayValue($$$) +{ + my ($self, $Item, $PropertyDescriptor) = @_; + + my $PropertyName = $PropertyDescriptor->GetName(); + my $Value = $Item->$PropertyName; + + if ($PropertyDescriptor->GetClass() eq "Itemref") { - if ($PropertyDescriptor->GetClass() eq "Basic" && - $PropertyDescriptor->GetType() eq "DT") + if (defined($Value)) { - $HasDT = 1; + foreach $PropertyDescriptor (@{$Value->GetPropertyDescriptors()}) + { + if ($PropertyDescriptor->GetIsKey()) + { + $PropertyName = $PropertyDescriptor->GetName(); + $Value = $Value->$PropertyName; + last; + } + } } } - if ($HasDT) + + if ($PropertyDescriptor->GetClass() eq "Basic") { - print <<"EOF"; -<script type='text/javascript'></script>\n"; + } + } + } + + return $Value; +} + +sub CallGetEscapedDisplayValue($$$) { - return n < 10 ? '0' + n : n; + my ($self, $Item, $PropertyDescriptor) = @_; + + return $self->GetEscapedDisplayValue($Item, $PropertyDescriptor); } -function ShowDateTime(Sec1970, Id, Attr) +sub GetEscapedDisplayValue($$$) { - var Dt = new Date(Sec1970 * 1000); - var Pretty = Dt.getFullYear() + '-' + Pad2(Dt.getMonth() + 1) + '-' + - Pad2(Dt.getDate()) + ' ' + Pad2(Dt.getHours()) + ':' + - Pad2(Dt.getMinutes()) + ':' + Pad2(Dt.getSeconds()) - if (Id != null) + my ($self, $Item, $PropertyDescriptor) = @_; + + my $PropertyName = $PropertyDescriptor->GetName(); + my $Value = $Item->$PropertyName; + + if ($PropertyDescriptor->GetClass() eq "Basic" && + $PropertyDescriptor->GetType() eq "DT") { - document.getElementById(Id).setAttribute(Attr || "title", Pretty); + if (defined($Value)) + { + $Value = "<script type='text/javascript'></script><noscript><div>" . + strftime("%Y-%m-%d %H:%M:%S", localtime($Value)) . + "</div></noscript>\n"; + } } else { - document.write(Pretty); + $Value = $self->escapeHTML($self->CallGetDisplayValue($Item, + $PropertyDescriptor)); } + + return $Value; } -//--></script> -EOF - } - print "<div class='CollectionBlock'>\n"; - $self->CallGenerateFormStart(); - $self->CallGenerateErrorDiv(); - print "<table border='0' cellpadding='5' cellspacing='0' summary='" . - "Overview of " . $Collection->GetCollectionName() . "'>\n"; - print "<thead>\n"; - my $ItemActions = $self->CallGetItemActions(); - $self->CallGenerateHeaderRow($PropertyDescriptors, $ItemActions); - print "</thead>\n"; +# +# Item cell generation +# - print "<tbody>\n"; - my $DetailsPage = $self->CallGetDetailsPage(); - my $Row = 0; - my $Keys = $self->CallSortKeys($self->{Collection}->GetKeys()); - foreach my $Key (@$Keys) - { - my $Class = ($Row % 2) == 0 ? "even" : "odd"; - my $Item = $self->{Collection}->GetItem($Key); - $self->CallGenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, - $Class, $ItemActions); - $Row++; - } - if (@$Keys == 0) - { - print "<tr class='even'><td colspan='0'>No entries</td></tr>\n"; - } +sub CallGenerateHeaderCell($$) +{ + my ($self, $PropertyDescriptor) = @_; - print "</tbody>\n"; - print "</table>\n"; + return $self->GenerateHeaderCell($PropertyDescriptor); +} - if (@$ItemActions != 0 && @$Keys != 0) - { - print <<EOF; -<div class='CollectionBlockActions'> -<script type='text/javascript'> - -</script> -EOF - print "For selected ", $self->{Collection}->GetCollectionName() . ":"; - foreach my $Action (@$ItemActions) - { - print " <input type='submit' name='Action' value='" . - $self->escapeHTML($Action) . "' />"; - } - print "\n"; - print "</div>\n"; - } +sub CallGenerateDataCell($$$$) +{ + my ($self, $Item, $PropertyDescriptor, $DetailsPage) = @_; - my $Actions = $self->CallGetActions(); - if (@$Actions != 0) + return $self->GenerateDataCell($Item, $PropertyDescriptor, $DetailsPage); +} + +sub GenerateDataCell($$$$) +{ + my ($self, $Item, $PropertyDescriptor, $DetailsPage) = @_; + + print "<td>"; + my $NeedLink; + if ($PropertyDescriptor->GetIsKey() && $DetailsPage) { - print "<div class='CollectionBlockActions'>\n"; - foreach my $Action (@$Actions) + $NeedLink = 1; + } + else + { + $NeedLink = !1; + } + if ($NeedLink) + { + my $Query = "$DetailsPage?Key=" . uri_escape($Item->GetKey()); + my ($MasterColNames, $MasterColValues) = $Item->GetMasterCols(); + if (defined($MasterColNames)) { - print "<input type='submit' name='Action' value='$Action' />\n"; + foreach my $ColIndex (0 .. @$MasterColNames - 1) + { + $Query .= "&" . $MasterColNames->[$ColIndex] . "=" . + uri_escape($MasterColValues->[$ColIndex]); + } } - print "</div>\n"; + print "<a href='", $self->escapeHTML($Query), "'>"; } - - $self->CallGenerateErrorPopup(undef); - $self->CallGenerateFormEnd(); - print "</div>\n"; + print $self->CallGetEscapedDisplayValue($Item, $PropertyDescriptor); + if ($NeedLink) + { + print "</a>"; + } + print "</td>\n"; } + +# +# Collection table generation +# + sub CallGenerateFormStart($) { my ($self) = @_; @@ -202,33 +303,6 @@ sub GenerateFormStart($) } } -sub CallGenerateErrorDiv($) -{ - my ($self) = @_; - - $self->{EnclosingPage}->GenerateErrorDiv(); -} - -sub CallGenerateErrorPopup($) -{ - my ($self) = @_; - - $self->{EnclosingPage}->GenerateErrorPopup(); -} - -sub CallGenerateFormEnd($) -{ - my ($self) = @_; - - $self->GenerateFormEnd(); -} - -sub GenerateFormEnd($) -{ - #my ($self) = @_; - print "</form>\n"; -} - sub CallGenerateHeaderRow($$$) { my ($self, $PropertyDescriptors, $ItemActions) = @_; @@ -256,18 +330,12 @@ sub GenerateHeaderRow($$$) print "</tr>\n"; } -sub CallGenerateHeaderCell($$) +sub SelName($$) { - my ($self, $PropertyDescriptor) = @_; - - return $self->GenerateHeaderCell($PropertyDescriptor); -} + my ($self, $Key) = @_; -sub GenerateHeaderCell($$) -{ - my ($self, $PropertyDescriptor) = @_; - print "<th>", $self->escapeHTML($PropertyDescriptor->GetDisplayName()), - "</th>\n"; + $Key =~ s/[^0-9a-zA-Z]+/_/g; + return "sel_" . $Key; } sub CallGenerateDataRow($$$$$$) @@ -277,14 +345,6 @@ sub CallGenerateDataRow($$$$$$) $self->GenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions); } -sub SelName($$) -{ - my ($self, $Key) = @_; - - $Key =~ s/[^0-9a-zA-Z]+/_/g; - return "sel_" . $Key; -} - sub GenerateDataRow($$$$$$) { my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions) = @_; @@ -295,72 +355,153 @@ sub GenerateDataRow($$$$$$) print "<td><input name='", $self->SelName($Item->GetKey()), "' type='checkbox' /></td>\n"; } - foreach my $PropertyDescriptor (@$PropertyDescriptors) + foreach my $PropertyDescriptor (@$PropertyDescriptors) + { + if ($self->CallDisplayProperty($PropertyDescriptor)) + { + $self->CallGenerateDataCell($Item, $PropertyDescriptor, $DetailsPage); + } + } + print "</tr>\n"; +} + +sub CallGenerateFormEnd($) +{ + my ($self) = @_; + + $self->GenerateFormEnd(); +} + +sub GenerateFormEnd($) +{ + #my ($self) = @_; + print "</form>\n"; +} + +sub GenerateList($) +{ + my ($self) = @_; + + my $Collection = $self->{Collection}; + my $PropertyDescriptors = $Collection->GetPropertyDescriptors(); + my $HasDT = !1; + foreach my $PropertyDescriptor (@{$PropertyDescriptors}) + { + if ($PropertyDescriptor->GetClass() eq "Basic" && + $PropertyDescriptor->GetType() eq "DT") + { + $HasDT = 1; + } + } + if ($HasDT) + { + print <<"EOF"; +<script type='text/javascript'></script> +EOF + } + + print "<div class='CollectionBlock'>\n"; + $self->CallGenerateFormStart(); + $self->CallGenerateErrorDiv(); + + print "<table border='0' cellpadding='5' cellspacing='0' summary='" . + "Overview of " . $Collection->GetCollectionName() . "'>\n"; + print "<thead>\n"; + my $ItemActions = $self->CallGetItemActions(); + $self->CallGenerateHeaderRow($PropertyDescriptors, $ItemActions); + print "</thead>\n"; + + print "<tbody>\n"; + my $DetailsPage = $self->CallGetDetailsPage(); + my $Row = 0; + my $Keys = $self->CallSortKeys($self->{Collection}->GetKeys()); + foreach my $Key (@$Keys) + { + my $Class = ($Row % 2) == 0 ? "even" : "odd"; + my $Item = $self->{Collection}->GetItem($Key); + $self->CallGenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, + $Class, $ItemActions); + $Row++; + } + if (@$Keys == 0) { - if ($self->CallDisplayProperty($PropertyDescriptor)) - { - $self->CallGenerateDataCell($Item, $PropertyDescriptor, $DetailsPage); - } + print "<tr class='even'><td colspan='0'>No entries</td></tr>\n"; } - print "</tr>\n"; -} - -sub CallGenerateDataCell($$$$) -{ - my ($self, $Item, $PropertyDescriptor, $DetailsPage) = @_; - return $self->GenerateDataCell($Item, $PropertyDescriptor, $DetailsPage); -} - -sub GenerateDataCell($$$$) -{ - my ($self, $Item, $PropertyDescriptor, $DetailsPage) = @_; + print "</tbody>\n"; + print "</table>\n"; - print "<td>"; - my $NeedLink; - if ($PropertyDescriptor->GetIsKey() && $DetailsPage) + if (@$ItemActions != 0 && @$Keys != 0) { - $NeedLink = 1; - } - else + print <<EOF; +<div class='CollectionBlockActions'> +<script type='text/javascript'> + +</script> +EOF + print "For selected ", $self->{Collection}->GetCollectionName() . ":"; + foreach my $Action (@$ItemActions) { - foreach my $ColIndex (0 .. @$MasterColNames - 1) - { - $Query .= "&" . $MasterColNames->[$ColIndex] . "=" . - uri_escape($MasterColValues->[$ColIndex]); - } + print " <input type='submit' name='Action' value='" . + $self->escapeHTML($Action) . "' />"; } - print "<a href='", $self->escapeHTML($Query), "'>"; + print "\n"; + print "</div>\n"; } - print $self->CallGetEscapedDisplayValue($Item, $PropertyDescriptor); - if ($NeedLink) + + my $Actions = $self->CallGetActions(); + if (@$Actions != 0) { - print "</a>"; + print "<div class='CollectionBlockActions'>\n"; + foreach my $Action (@$Actions) + { + print "<input type='submit' name='Action' value='$Action' />\n"; + } + print "</div>\n"; } - print "</td>\n"; -} - -sub CallGetDetailsPage($) -{ - my ($self) = @_; - return $self->GetDetailsPage(); + $self->CallGenerateErrorPopup(undef); + $self->CallGenerateFormEnd(); + print "</div>\n"; } -sub GetDetailsPage($) -{ - my ($self) = @_; - return $self->{Collection}->GetItemName() . "Details.pl"; -} +# +# Per-item actions handling +# sub CallGetItemActions($) { @@ -388,6 +529,32 @@ sub GetItemActions($) return ["Delete"]; } +sub CallOnItemAction($$$) +{ + my ($self, $Item, $Action) = @_; + + return $self->OnItemAction($Item, $Action); +} + +sub OnItemAction($$$) +{ + my ($self, $Item, $Action) = @_; + + if ($Action eq "Delete") + { + my $ErrMessage = $self->{Collection}->DeleteItem($Item); + $self->{EnclosingPage}->{ErrMessage} = $ErrMessage; + return ! defined($ErrMessage); + } + + return 1; +} + + +# +# Actions handling +# + sub CallGetActions($) { my ($self) = @_; @@ -421,108 +588,6 @@ sub GetActions($) return \@Actions; } -sub CallDisplayProperty($$) -{ - my ($self, $PropertyDescriptor) = @_; - - return $self->DisplayProperty($PropertyDescriptor); -} - -sub DisplayProperty($$) -{ - my ($self, $PropertyDescriptor) = @_; - - return $PropertyDescriptor->GetClass ne "Detailref"; -} - -sub CallGetDisplayValue($$$) -{ - my ($self, $Item, $PropertyDescriptor) = @_; - - return $self->GetDisplayValue($Item, $PropertyDescriptor); -} - -sub GetDisplayValue($$$) -{ - my ($self, $Item, $PropertyDescriptor) = @_; - - my $PropertyName = $PropertyDescriptor->GetName(); - my $Value = $Item->$PropertyName; - - if ($PropertyDescriptor->GetClass() eq "Itemref") - { - if (defined($Value)) - { - foreach $PropertyDescriptor (@{$Value->GetPropertyDescriptors()}) - { - if ($PropertyDescriptor->GetIsKey()) - { - $PropertyName = $PropertyDescriptor->GetName(); - $Value = $Value->$PropertyName; - last; - } - } - } - } - - if ($PropertyDescriptor->GetClass() eq "Basic") - { - if ($PropertyDescriptor->GetType() eq "B") - { - $Value = ($Value ? "Yes" : "No"); - } - elsif ($PropertyDescriptor->GetType() eq "DT") - { - if (defined($Value)) - { - $Value = - "<noscript><div>" . - strftime("%Y-%m-%d %H:%M:%S", localtime($Value)) . "</div></noscript>\n" . -"<script type='text/javascript'></script>\n"; - } - } - } - - return $Value; -} - -sub CallGetEscapedDisplayValue($$$) -{ - my ($self, $Item, $PropertyDescriptor) = @_; - - return $self->GetEscapedDisplayValue($Item, $PropertyDescriptor); -} - -sub GetEscapedDisplayValue($$$) -{ - my ($self, $Item, $PropertyDescriptor) = @_; - - my $PropertyName = $PropertyDescriptor->GetName(); - my $Value = $Item->$PropertyName; - - if ($PropertyDescriptor->GetClass() eq "Basic" && - $PropertyDescriptor->GetType() eq "DT") - { - if (defined($Value)) - { - $Value = "<script type='text/javascript'></script><noscript><div>" . - strftime("%Y-%m-%d %H:%M:%S", localtime($Value)) . - "</div></noscript>\n"; - } - } - else - { - $Value = $self->escapeHTML($self->CallGetDisplayValue($Item, - $PropertyDescriptor)); - } - - return $Value; -} - sub OnAction($$) { my ($self, $Action) = @_; @@ -553,39 +618,4 @@ sub OnAction($$) } } -sub CallOnItemAction($$$) -{ - my ($self, $Item, $Action) = @_; - - return $self->OnItemAction($Item, $Action); -} - -sub OnItemAction($$$) -{ - my ($self, $Item, $Action) = @_; - - if ($Action eq "Delete") - { - my $ErrMessage = $self->{Collection}->DeleteItem($Item); - $self->{EnclosingPage}->{ErrMessage} = $ErrMessage; - return ! defined($ErrMessage); - } - - return 1; -} - -sub CallSortKeys($$) -{ - my ($self, $Keys) = @_; - - return $self->SortKeys($Keys); -} - -sub SortKeys($$) -{ - my ($self, $Keys) = @_; - - return $Keys; -} - 1; diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm index 13ad5a875..94d5f8672 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm @@ -31,39 +31,49 @@ use ObjectModel::CGI::CollectionBlock; our @ISA = qw(ObjectModel::CGI::CollectionBlock); -sub CallGenerateFormStart($) +sub CallGetDetailsPage($) { my ($self) = @_; - $self->{EnclosingPage}->GenerateFormStart($self); + return $self->{EnclosingPage}->GetDetailsPage($self); } -sub CallGenerateFormEnd($) + +# +# Item properties support +# + +sub CallDisplayProperty($$) { - my ($self) = @_; + my ($self, $PropertyDescriptor) = @_; - $self->{EnclosingPage}->GenerateFormEnd($self); + return $self->{EnclosingPage}->DisplayProperty($self, $PropertyDescriptor); } -sub CallGenerateHeaderCell($$) +sub CallSortKeys($$) { - my ($self, $PropertyDescriptor) = @_; + my ($self, $Keys) = @_; - return $self->{EnclosingPage}->GenerateHeaderCell($self, $PropertyDescriptor); + return $self->{EnclosingPage}->SortKeys($self, $Keys); } -sub CallGenerateHeaderRow($$$) +sub CallGetDisplayValue($$$) { - my ($self, $PropertyDescriptors, $ItemActions) = @_; + my ($self, $Item, $PropertyDescriptor) = @_; - $self->{EnclosingPage}->GenerateHeaderRow($self, $PropertyDescriptors, $ItemActions); + return $self->{EnclosingPage}->GetDisplayValue($self, $Item, $PropertyDescriptor); } -sub CallGenerateDataRow($$$$$$) + +# +# Item cell generation +# + +sub CallGenerateHeaderCell($$) { - my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions) = @_; + my ($self, $PropertyDescriptor) = @_; - $self->{EnclosingPage}->GenerateDataRow($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions); + return $self->{EnclosingPage}->GenerateHeaderCell($self, $PropertyDescriptor); } sub CallGenerateDataCell($$$$) @@ -73,39 +83,49 @@ sub CallGenerateDataCell($$$$) return $self->{EnclosingPage}->GenerateDataCell($self, $Item, $PropertyDescriptor, $DetailsPage); } -sub CallGetDetailsPage($) + +# +# Collection table generation +# + +sub CallGenerateFormStart($) { my ($self) = @_; - return $self->{EnclosingPage}->GetDetailsPage($self); + $self->{EnclosingPage}->GenerateFormStart($self); } -sub CallGetItemActions($) +sub CallGenerateHeaderRow($$$) { - my ($self) = @_; + my ($self, $PropertyDescriptors, $ItemActions) = @_; - return $self->{EnclosingPage}->GetItemActions($self); + $self->{EnclosingPage}->GenerateHeaderRow($self, $PropertyDescriptors, $ItemActions); } -sub CallGetActions($) +sub CallGenerateDataRow($$$$$$) { - my ($self) = @_; + my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions) = @_; - return $self->{EnclosingPage}->GetActions($self); + $self->{EnclosingPage}->GenerateDataRow($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions); } -sub CallDisplayProperty($$) +sub CallGenerateFormEnd($) { - my ($self, $PropertyDescriptor) = @_; + my ($self) = @_; - return $self->{EnclosingPage}->DisplayProperty($self, $PropertyDescriptor); + $self->{EnclosingPage}->GenerateFormEnd($self); } -sub CallGetDisplayValue($$$) + +# +# Per-item actions handling +# + +sub CallGetItemActions($) { - my ($self, $Item, $PropertyDescriptor) = @_; + my ($self) = @_; - return $self->{EnclosingPage}->GetDisplayValue($self, $Item, $PropertyDescriptor); + return $self->{EnclosingPage}->GetItemActions($self); } sub CallOnItemAction($$$) @@ -115,11 +135,16 @@ sub CallOnItemAction($$$) return $self->{EnclosingPage}->OnItemAction($self, $Item, $Action); } -sub CallSortKeys($$) + +# +# Actions handling +# + +sub CallGetActions($) { - my ($self, $Keys) = @_; + my ($self) = @_; - return $self->{EnclosingPage}->SortKeys($self, $Keys); + return $self->{EnclosingPage}->GetActions($self); } 1; diff --git a/testbot/lib/ObjectModel/CGI/CollectionPage.pm b/testbot/lib/ObjectModel/CGI/CollectionPage.pm index 72bba1bc4..993f18685 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionPage.pm @@ -42,58 +42,51 @@ sub _initialize($$$$) $self->SUPER::_initialize($Request, $RequiredRole); } -sub GeneratePage($) +sub CreateCollectionBlock($$) { - my ($self) = @_; - - if ($self->GetParam("Action")) - { - my $CollectionBlock = $self->CreateCollectionBlock($self->{Collection}); - $self->{ActionPerformed} = $self->OnAction($CollectionBlock, - $self->GetParam("Action")); - } + my ($self, $Collection) = @_; - $self->SUPER::GeneratePage(); + return ObjectModel::CGI::CollectionBlockForPage->new($Collection, $self); } -sub GenerateTitle($) +sub GetDetailsPage($$) { - my ($self) = @_; + my ($self, $CollectionBlock) = @_; - my $Title = $self->GetTitle(); - if ($Title) - { - print "<h1 id='PageTitle'>", $self->escapeHTML($Title), "</h1>\n"; - } + return $CollectionBlock->GetDetailsPage(); } -sub GenerateBody($) + +# +# Item properties support +# + +sub DisplayProperty($$$) { - my ($self) = @_; + my ($self, $CollectionBlock, $PropertyDescriptor) = @_; - print "<div class='CollectionPageBody'>\n"; - $self->GenerateTitle(); - print "<div class='Content'>\n"; - my $CollectionBlock = $self->CreateCollectionBlock($self->{Collection}); - $CollectionBlock->GenerateList(); - print "</div>\n"; - print "</div>\n"; + return $CollectionBlock->DisplayProperty($PropertyDescriptor); } -sub GenerateFormStart($$) +sub SortKeys($$$) { - my ($self, $CollectionBlock) = @_; + my ($self, $CollectionBlock, $Keys) = @_; - $CollectionBlock->GenerateFormStart(); + return $CollectionBlock->SortKeys($Keys); } -sub GenerateFormEnd($$) +sub GetDisplayValue($$$$) { - my ($self, $CollectionBlock) = @_; + my ($self, $CollectionBlock, $Item, $PropertyDescriptor) = @_; - $CollectionBlock->GenerateFormEnd(); + return $CollectionBlock->GetDisplayValue($Item, $PropertyDescriptor); } + +# +# Item cell generation +# + sub GenerateHeaderCell($$$) { my ($self, $CollectionBlock, $PropertyDescriptor) = @_; @@ -101,6 +94,18 @@ sub GenerateHeaderCell($$$) $CollectionBlock->GenerateHeaderCell($PropertyDescriptor); } +sub GenerateDataCell($$$$$) +{ + my ($self, $CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage) = @_; + + $CollectionBlock->GenerateDataCell($Item, $PropertyDescriptor, $DetailsPage); +} + + +# +# Collection table generation +# + sub GenerateHeaderRow($$$$) { my ($self, $CollectionBlock, $PropertyDescriptors, $ItemActions) = @_; @@ -115,60 +120,80 @@ sub GenerateDataRow($$$$$$$) $CollectionBlock->GenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions); } -sub GenerateDataCell($$$$$) + +# +# HTML page generation +# + +sub GetTitle($) { - my ($self, $CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage) = @_; + my ($self) = @_; - $CollectionBlock->GenerateDataCell($Item, $PropertyDescriptor, $DetailsPage); + return ucfirst($self->{Collection}->GetCollectionName()); } -sub CreateCollectionBlock($$) +sub GenerateTitle($) { - my ($self, $Collection) = @_; + my ($self) = @_; - return ObjectModel::CGI::CollectionBlockForPage->new($Collection, $self); + my $Title = $self->GetTitle(); + if ($Title) + { + print "<h1 id='PageTitle'>", $self->escapeHTML($Title), "</h1>\n"; + } } -sub GetDetailsPage($$) +sub GenerateFormStart($$) { my ($self, $CollectionBlock) = @_; - return $CollectionBlock->GetDetailsPage(); + $CollectionBlock->GenerateFormStart(); } -sub GetTitle($) +sub GenerateBody($) { my ($self) = @_; - return ucfirst($self->{Collection}->GetCollectionName()); + print "<div class='CollectionPageBody'>\n"; + $self->GenerateTitle(); + print "<div class='Content'>\n"; + my $CollectionBlock = $self->CreateCollectionBlock($self->{Collection}); + $CollectionBlock->GenerateList(); + print "</div>\n"; + print "</div>\n"; } -sub GetItemActions($$) +sub GenerateFormEnd($$) { my ($self, $CollectionBlock) = @_; - return $CollectionBlock->GetItemActions(); + $CollectionBlock->GenerateFormEnd(); } -sub GetActions($$) +sub GeneratePage($) { - my ($self, $CollectionBlock) = @_; + my ($self) = @_; - return $CollectionBlock->GetActions(); + if ($self->GetParam("Action")) + { + my $CollectionBlock = $self->CreateCollectionBlock($self->{Collection}); + $self->{ActionPerformed} = $self->OnAction($CollectionBlock, + $self->GetParam("Action")); + } + + $self->SUPER::GeneratePage(); } -sub DisplayProperty($$$) -{ - my ($self, $CollectionBlock, $PropertyDescriptor) = @_; - return $CollectionBlock->DisplayProperty($PropertyDescriptor); -} +# +# Per-item actions handling +# -sub OnAction($$$) +sub GetItemActions($$) { - my ($self, $CollectionBlock, $Action) = @_; + my ($self, $CollectionBlock) = @_; - $CollectionBlock->OnAction($Action); + return $CollectionBlock->GetItemActions(); } sub OnItemAction($$$$) @@ -178,18 +203,23 @@ sub OnItemAction($$$$) return $CollectionBlock->OnItemAction($Item, $Action); } -sub GetDisplayValue($$$$) + +# +# Actions handling +# + +sub GetActions($$) { - my ($self, $CollectionBlock, $Item, $PropertyDescriptor) = @_; + my ($self, $CollectionBlock) = @_; - return $CollectionBlock->GetDisplayValue($Item, $PropertyDescriptor); + return $CollectionBlock->GetActions(); } -sub SortKeys($$$) +sub OnAction($$$) { - my ($self, $CollectionBlock, $Keys) = @_; + my ($self, $CollectionBlock, $Action) = @_; - return $CollectionBlock->SortKeys($Keys); + $CollectionBlock->OnAction($Action); } 1; diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index bc8ce478c..588ea55b7 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -44,6 +44,11 @@ sub _initialize($$$$) $self->{Method} = "post"; } + +# +# Property handling +# + sub GetPropertyDescriptors($) { my ($self) = @_; @@ -67,121 +72,42 @@ sub GetPropertyDescriptorByName($$) return undef; } -sub GeneratePage($) -{ - my ($self) = @_; - - if ($self->GetParam("Action")) - { - $self->{ActionPerformed} = $self->OnAction($self->GetParam("Action")); - } - - $self->SUPER::GeneratePage(); -} - -sub GenerateTitle($) -{ - my ($self) = @_; - - my $Title = $self->GetTitle(); - if ($Title) - { - print "<h1 id='PageTitle'>", $self->CGI->escapeHTML($Title), "</h1>\n"; - } -} - -sub GenerateBody($) -{ - my ($self) = @_; - - print "<div class='ItemBody'>\n"; - $self->GenerateTitle(); - print "<div class='Content'>\n"; - my $Text = $self->GetHeaderText(); - if ($Text) - { - print "<p>$Text</p>\n"; - } - $self->GenerateFormStart(); - $self->GenerateErrorDiv(); - - $self->GenerateFields(); - $self->GenerateRequiredLegend(); - - if (defined $self->{ErrMessage}) - { - if (defined $self->{ErrField}) - { - my $PropertyDescriptor = $self->GetPropertyDescriptorByName($self->{ErrField}); - if ($PropertyDescriptor and !$self->DisplayProperty($PropertyDescriptor)) - { - $self->{ErrMessage} = "Internal error?\n$self->{ErrMessage}"; - } - } - $self->GenerateErrorPopup(); - } - $self->GenerateActions(); - $self->GenerateFormEnd(); - $Text = $self->GetFooterText(); - if ($Text) - { - print "<p>$Text</p>\n"; - } - print "</div>\n"; - print "</div>\n"; -} - -sub GenerateFormStart($) -{ - my ($self) = @_; - print "<form action='" . $ENV{"SCRIPT_NAME"} . - "' method='$self->{Method}' enctype='multipart/form-data'>\n"; -} - -sub GenerateFields($) +sub DisplayProperty($$) { - my ($self) = @_; + my ($self, $PropertyDescriptor) = @_; - my $PropertyDescriptors = $self->GetPropertyDescriptors(); - foreach my $PropertyDescriptor (@{$PropertyDescriptors}) - { - my $Display = $self->DisplayProperty($PropertyDescriptor); - $self->GenerateField($PropertyDescriptor, $Display) if ($Display); - } + return # Detailref fields point to a Collection of objects matching the + # primary key of this form data. As such they can neither be shown + # nor edited. + $PropertyDescriptor->GetClass() eq "Detailref" ? "" : + # Itemref fields are keys identifying other objects and thus would + # require careful validation if edited. Requiring users to manually + # type the appropriate key value would also be cumbersome so this is + # currently not supported. But they can be displayed. + $PropertyDescriptor->GetClass() eq "Itemref" ? "ro" : + # All other properties can be edited... + $PropertyDescriptor->GetClass() ne "Basic" ? "rw" : + $PropertyDescriptor->GetType() ne "S" ? "rw" : + # ...except autoincrement ones (shown as <unset> if undefined) + "ro"; } -sub GenerateRequiredLegend($) +sub GetPropertyValue($$) { - my ($self) = @_; - - if ($self->{HasRequired}) - { - print "<div class='ItemProperty'><label><span class='Required'>*</span></label>Required field</div>\n"; - } + #my ($self, $PropertyDescriptor) = @_; + return undef; } -sub GenerateActions($) -{ - my ($self) = @_; - print "<div class='ItemActions'>\n"; - foreach my $Action (@{$self->GetActions()}) - { - print "<input type='submit' name='Action' value='$Action'/>\n"; - } - print "</div>\n"; -} +# +# Form field support +# -sub GenerateFormEnd($) +sub GetDisplayName($$) { - #my ($self) = @_; - print "</form>\n"; -} + my ($self, $PropertyDescriptor) = @_; -sub GetPropertyValue($$) -{ - #my ($self, $PropertyDescriptor) = @_; - return undef; + return $PropertyDescriptor->GetDisplayName(); } sub GetDisplayValue($$) @@ -197,13 +123,6 @@ sub GetDisplayValue($$) return $Value; } -sub GetDisplayName($$) -{ - my ($self, $PropertyDescriptor) = @_; - - return $PropertyDescriptor->GetDisplayName(); -} - sub GetInputType($$) { my ($self, $PropertyDescriptor) = @_; @@ -216,6 +135,17 @@ sub GetInputType($$) "text"; } +sub GenerateRequired($$) +{ + my ($self, $PropertyDescriptor) = @_; + + if ($PropertyDescriptor->GetIsRequired()) + { + $self->{HasRequired} = 1; + print " <a class='Required' title='Required field'>*</a>"; + } +} + sub GenerateField($$$) { my ($self, $PropertyDescriptor, $Display) = @_; @@ -300,27 +230,66 @@ sub GenerateField($$$) print "</div>\n"; } -sub GenerateRequired($$) + +# +# HTML form page generation +# + +sub GetTitle($) { - my ($self, $PropertyDescriptor) = @_; + #my ($self) = @_; + return undef; +} - if ($PropertyDescriptor->GetIsRequired()) +sub GenerateTitle($) +{ + my ($self) = @_; + + my $Title = $self->GetTitle(); + if ($Title) { - $self->{HasRequired} = 1; - print " <a class='Required' title='Required field'>*</a>"; + print "<h1 id='PageTitle'>", $self->CGI->escapeHTML($Title), "</h1>\n"; } } -sub GetTitle($) +sub GetHeaderText($) { #my ($self) = @_; return undef; } -sub GetHeaderText($) +sub GenerateFormStart($) +{ + my ($self) = @_; + print "<form action='" . $ENV{"SCRIPT_NAME"} . + "' method='$self->{Method}' enctype='multipart/form-data'>\n"; +} + +sub GenerateFields($) +{ + my ($self) = @_; + + foreach my $PropertyDescriptor (@{$self->GetPropertyDescriptors()}) + { + my $Display = $self->DisplayProperty($PropertyDescriptor); + $self->GenerateField($PropertyDescriptor, $Display) if ($Display); + } +} + +sub GenerateRequiredLegend($) +{ + my ($self) = @_; + + if ($self->{HasRequired}) + { + print "<div class='ItemProperty'><label><span class='Required'>*</span></label>Required field</div>\n"; + } +} + +sub GenerateFormEnd($) { #my ($self) = @_; - return undef; + print "</form>\n"; } sub GetFooterText($) @@ -329,30 +298,81 @@ sub GetFooterText($) return undef; } -sub DisplayProperty($$) +sub GenerateBody($) { - my ($self, $PropertyDescriptor) = @_; + my ($self) = @_; - return # Detailref fields point to a Collection of objects matching the - # primary key of this form data. As such they can neither be shown - # nor edited. - $PropertyDescriptor->GetClass() eq "Detailref" ? "" : - # Itemref fields are keys identifying other objects and thus would - # require careful validation if edited. Requiring users to manually - # type the appropriate key value would also be cumbersome so this is - # currently not supported. But they can be displayed. - $PropertyDescriptor->GetClass() eq "Itemref" ? "ro" : - # All other properties can be edited... - $PropertyDescriptor->GetClass() ne "Basic" ? "rw" : - $PropertyDescriptor->GetType() ne "S" ? "rw" : - # ...except autoincrement ones (shown as <unset> if undefined) - "ro"; + print "<div class='ItemBody'>\n"; + $self->GenerateTitle(); + print "<div class='Content'>\n"; + my $Text = $self->GetHeaderText(); + if ($Text) + { + print "<p>$Text</p>\n"; + } + $self->GenerateFormStart(); + $self->GenerateErrorDiv(); + + $self->GenerateFields(); + $self->GenerateRequiredLegend(); + + if (defined $self->{ErrMessage}) + { + if (defined $self->{ErrField}) + { + my $PropertyDescriptor = $self->GetPropertyDescriptorByName($self->{ErrField}); + if ($PropertyDescriptor and !$self->DisplayProperty($PropertyDescriptor)) + { + $self->{ErrMessage} = "Internal error?\n$self->{ErrMessage}"; + } + } + $self->GenerateErrorPopup(); + } + $self->GenerateActions(); + $self->GenerateFormEnd(); + $Text = $self->GetFooterText(); + if ($Text) + { + print "<p>$Text</p>\n"; + } + print "</div>\n"; + print "</div>\n"; } -sub GetActions($) +sub GeneratePage($) { - #my ($self) = @_; - return []; + my ($self) = @_; + + if ($self->GetParam("Action")) + { + $self->{ActionPerformed} = $self->OnAction($self->GetParam("Action")); + } + + $self->SUPER::GeneratePage(); +} + + +# +# Validating and saving the form content +# + +sub Validate($) +{ + my ($self) = @_; + + foreach my $PropertyDescriptor (@{$self->GetPropertyDescriptors()}) + { + my $Value = $self->GetParam($PropertyDescriptor->GetName()); + my $ErrMessage = $PropertyDescriptor->ValidateValue($Value, 1); + if ($ErrMessage) + { + $self->{ErrMessage} = $ErrMessage; + $self->{ErrField} = $PropertyDescriptor->GetName(); + return !1; + } + } + + return 1; } sub SaveProperty($$$) @@ -394,31 +414,34 @@ sub Save($) return 1; } -sub OnAction($$) -{ - my ($self, $Action) = @_; - die "No action defined for $Action"; +# +# Actions handling +# + +sub GetActions($) +{ + #my ($self) = @_; + return []; } -sub Validate($) +sub GenerateActions($) { my ($self) = @_; - my $PropertyDescriptors = $self->GetPropertyDescriptors(); - foreach my $PropertyDescriptor (@{$PropertyDescriptors}) + print "<div class='ItemActions'>\n"; + foreach my $Action (@{$self->GetActions()}) { - my $Value = $self->GetParam($PropertyDescriptor->GetName()); - my $ErrMessage = $PropertyDescriptor->ValidateValue($Value, 1); - if ($ErrMessage) - { - $self->{ErrMessage} = $ErrMessage; - $self->{ErrField} = $PropertyDescriptor->GetName(); - return !1; - } + print "<input type='submit' name='Action' value='$Action'/>\n"; } + print "</div>\n"; +} - return 1; +sub OnAction($$) +{ + my ($self, $Action) = @_; + + die "No action defined for $Action"; } 1; diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 09dfc0496..c0105f7d6 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -55,28 +55,10 @@ sub _initialize($$$$) } } -sub GenerateFormStart($) -{ - my ($self) = @_; - - $self->SUPER::GenerateFormStart(); - my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); - if (defined($MasterColNames)) - { - foreach my $ColIndex (0 .. @$MasterColNames) - { - print "<div><input type='hidden' name='", $MasterColNames->[$ColIndex], - "' value='", $self->escapeHTML($MasterColValues->[$ColIndex]), - "' /></div>\n"; - } - } - if (! $self->{Item}->GetIsNew()) - { - print "<div><input type='hidden' name='Key' value='", - $self->escapeHTML($self->{Item}->GetKey()), "' /></div>\n"; - } -} +# +# Property handling +# sub GetPropertyValue($$) { @@ -86,14 +68,6 @@ sub GetPropertyValue($$) return $self->{Item}->$PropertyName; } -sub GetTitle($) -{ - my ($self) = @_; - - return $self->GetParam("Key") ? $self->GetParam("Key") : - "Add " . $self->{Collection}->GetItemName(); -} - sub DisplayProperty($$) { my ($self, $PropertyDescriptor) = @_; @@ -111,40 +85,72 @@ sub DisplayProperty($$) $Display; } -sub GetActions($) + +# +# Form page generation +# + +sub GetTitle($) { my ($self) = @_; - my @Actions = @{$self->SUPER::GetActions()}; - push @Actions, "Save", "Cancel"; - - return \@Actions; + return $self->GetParam("Key") ? $self->GetParam("Key") : + "Add " . $self->{Collection}->GetItemName(); } -sub SaveProperty($$$) +sub GenerateFormStart($) { - my ($self, $PropertyDescriptor, $Value) = @_; + my ($self) = @_; - if ($PropertyDescriptor->GetClass() eq "Basic" && - $PropertyDescriptor->GetType() eq "B" && $Value) + $self->SUPER::GenerateFormStart(); + + my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); + if (defined($MasterColNames)) { - $Value = 1; + foreach my $ColIndex (0 .. @$MasterColNames) + { + print "<div><input type='hidden' name='", $MasterColNames->[$ColIndex], + "' value='", $self->escapeHTML($MasterColValues->[$ColIndex]), + "' /></div>\n"; + } + } + if (! $self->{Item}->GetIsNew()) + { + print "<div><input type='hidden' name='Key' value='", + $self->escapeHTML($self->{Item}->GetKey()), "' /></div>\n"; } +} - my $PropertyName = $PropertyDescriptor->GetName(); - $self->{Item}->$PropertyName($Value); - return 1; -} +# +# Actions handling +# -sub Save($) +sub GetActions($) { my ($self) = @_; - return !1 if (!$self->SUPER::Save()); + my @Actions = @{$self->SUPER::GetActions()}; + push @Actions, "Save", "Cancel"; - (my $_ErrKey, $self->{ErrField}, $self->{ErrMessage}) = $self->{Collection}->Save(); - return !defined $self->{ErrMessage}; + return \@Actions; +} + +sub RedirectToList($) +{ + my ($self) = @_; + + my $Target = $self->{Collection}->GetCollectionName() . "List.pl"; + my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); + if (defined($MasterColNames)) + { + foreach my $ColIndex (0 .. @$MasterColNames - 1) + { + $Target .= ($ColIndex == 0 ? "?" : "&") . $MasterColNames->[$ColIndex] . + "=" . url_escape($MasterColValues->[$ColIndex]); + } + } + return $self->Redirect($Target); } sub OnAction($$) @@ -164,21 +170,35 @@ sub OnAction($$) return $self->SUPER::OnAction($Action); } -sub RedirectToList($) + +# +# Validating and saving the form content +# + +sub SaveProperty($$$) { - my ($self) = @_; + my ($self, $PropertyDescriptor, $Value) = @_; - my $Target = $self->{Collection}->GetCollectionName() . "List.pl"; - my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); - if (defined($MasterColNames)) + if ($PropertyDescriptor->GetClass() eq "Basic" && + $PropertyDescriptor->GetType() eq "B" && $Value) { - foreach my $ColIndex (0 .. @$MasterColNames - 1) - { - $Target .= ($ColIndex == 0 ? "?" : "&") . $MasterColNames->[$ColIndex] . - "=" . url_escape($MasterColValues->[$ColIndex]); - } + $Value = 1; } - return $self->Redirect($Target); + + my $PropertyName = $PropertyDescriptor->GetName(); + $self->{Item}->$PropertyName($Value); + + return 1; +} + +sub Save($) +{ + my ($self) = @_; + + return !1 if (!$self->SUPER::Save()); + + (my $_ErrKey, $self->{ErrField}, $self->{ErrMessage}) = $self->{Collection}->Save(); + return !defined $self->{ErrMessage}; } 1; diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index b0450d0e7..1e8f55d31 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -55,6 +55,37 @@ sub _initialize($$$) #my ($self, $Request, $RequiredRole) = @_; } +sub SetPageBaseCreator($) +{ + ($PageBaseCreator) = @_; +} + +sub GetPageBase($) +{ + my ($self) = @_; + + return $self->{PageBase}; +} + +sub CGI($) +{ + my ($self) = @_; + + return $self->{CGIObj}; +} + +sub escapeHTML($$) +{ + my ($self, $String) = @_; + + return $self->{CGIObj}->escapeHTML($String); +} + + +# +# CGI parameters support +# + =pod =over 12 @@ -120,48 +151,84 @@ sub SetParam($$$) } } -sub CGI($) + +# +# Session support +# + +sub UnsetCookies($) { my ($self) = @_; - return $self->{CGIObj}; + $self->{PageBase}->UnsetCookies($self); } -sub escapeHTML($$) +sub SetCookies($) { - my ($self, $String) = @_; + my ($self) = @_; - return $self->{CGIObj}->escapeHTML($String); + $self->{PageBase}->SetCookies($self); } -sub GetPageBase($) +sub GetCurrentSession($) { my ($self) = @_; - return $self->{PageBase}; + return $self->{PageBase}->GetCurrentSession(); } -sub GenerateHttpHeaders($) +sub SetCurrentSession($$) +{ + my ($self, $Session) = @_; + + $self->{PageBase}->SetCurrentSession($self, $Session); +} + +sub Redirect($$) +{ + my ($self, $Location) = @_; + + return $self->{PageBase}->Redirect($self, $Location); +} + + +# +# Error handling framework +# + +sub GetErrField($) { my ($self) = @_; - $self->{PageBase}->GenerateHttpHeaders($self); + return $self->{ErrField}; } -sub UnsetCookies($) +sub GetErrMessage($) { my ($self) = @_; - $self->{PageBase}->UnsetCookies($self); + return $self->{ErrMessage}; } -sub SetCookies($) +sub GenerateErrorDiv($) { my ($self) = @_; - $self->{PageBase}->SetCookies($self); + $self->{PageBase}->GenerateErrorDiv($self); +} + +sub GenerateErrorPopup($) +{ + my ($self) = @_; + + $self->{PageBase}->GenerateErrorPopup($self); } + +# +# HTML page generation +# + =pod =over 12 @@ -197,39 +264,32 @@ sub GetTitle($) return undef; } -sub GenerateHeader($) -{ - my ($self) = @_; - - $self->{PageBase}->GenerateHeader($self); -} - -sub GenerateFooter($) +sub GenerateHttpHeaders($) { my ($self) = @_; - $self->{PageBase}->GenerateFooter($self); + $self->{PageBase}->GenerateHttpHeaders($self); } -sub GenerateErrorDiv($) +sub GenerateHeader($) { my ($self) = @_; - $self->{PageBase}->GenerateErrorDiv($self); + $self->{PageBase}->GenerateHeader($self); } -sub GenerateErrorPopup($) +sub GenerateBody($) { my ($self) = @_; - $self->{PageBase}->GenerateErrorPopup($self); + die "Pure virtual function " . ref($self) . "::GenerateBody called"; } -sub GenerateBody($) +sub GenerateFooter($) { my ($self) = @_; - die "Pure virtual function " . ref($self) . "::GenerateBody called"; + $self->{PageBase}->GenerateFooter($self); } sub GeneratePage($) @@ -242,44 +302,4 @@ sub GeneratePage($) $self->GenerateFooter(); } -sub Redirect($$) -{ - my ($self, $Location) = @_; - - return $self->{PageBase}->Redirect($self, $Location); -} - -sub GetCurrentSession($) -{ - my ($self) = @_; - - return $self->{PageBase}->GetCurrentSession(); -} - -sub SetCurrentSession($$) -{ - my ($self, $Session) = @_; - - $self->{PageBase}->SetCurrentSession($self, $Session); -} - -sub GetErrMessage($) -{ - my ($self) = @_; - - return $self->{ErrMessage}; -} - -sub GetErrField($) -{ - my ($self) = @_; - - return $self->{ErrField}; -} - -sub SetPageBaseCreator($) -{ - ($PageBaseCreator) = @_; -} - 1; diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index b7edd8fca..b36b28d9a 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -69,40 +69,16 @@ sub _initialize($$$$) #my ($self, $Page, $Request, $RequiredRole) = @_; } -sub CheckSecurePage($$) +sub CreatePageBase($$$@) { - my ($self, $Page) = @_; - - if ($UseSSL && ! SecureConnection()) - { - exit($self->Redirect($Page, MakeSecureURL($ENV{"REQUEST_URI"}))); - } + #my ($Page, $Request, $RequiredRole) = @_; + return WineTestBot::CGI::PageBase->new(@_); } -sub GenerateHttpHeaders($) -{ - my ($self) = @_; - - my $Request = $self->{Request}; - - # Date in the past - $Request->headers_out->add("Expires", "Sun, 25 Jul 1997 05:00:00 GMT"); - - # always modified - $Request->headers_out->add("Last-Modified", (scalar gmtime) . " GMT"); - - # HTTP/1.1 - $Request->headers_out->add("Cache-Control", "no-cache, must-revalidate, " . - "post-check=0, pre-check=0"); - - # HTTP/1.0 - $Request->headers_out->add("Pragma", "no-cache"); - # Force char set - $Request->content_type("text/html; charset=UTF-8"); - - $self->SetCookies(); -} +# +# Session support +# sub UnsetCookies($) { @@ -175,7 +151,7 @@ sub SetCookies($) $Expire = undef; } } - + $Cookie = CGI::Cookie->new(-Name => "SessionActive", -Value => $SessionPermanent, -Expires => $Expire, @@ -189,6 +165,139 @@ sub SetCookies($) } } +sub GetCurrentSession($) +{ + my ($self) = @_; + + if ($UseSSL && ! SecureConnection()) + { + return undef; + } + + if (! defined($self->{Session})) + { + my %Cookies = CGI::Cookie->fetch($self->{Request}); + if (defined($Cookies{"SessionId"})) + { + my $SessionId = $Cookies{"SessionId"}->value; + my $Sessions = CreateSessions(); + $self->{Session} = $Sessions->GetItem($SessionId); + } + } + + return $self->{Session}; +} + +sub SetCurrentSession($$$) +{ + my ($self, $Page, $Session) = @_; + + $self->{Session} = $Session; + if (! defined($Session)) + { + $self->UnsetCookies(); + } +} + +sub SessionActive($) +{ + my ($self) = @_; + + if (defined($self->GetCurrentSession())) + { + return 1; + } + + my %Cookies = CGI::Cookie->fetch($self->{Request}); + if ($UseSSL && ! SecureConnection() && defined($Cookies{"SessionActive"})) + { + return 1; + } + + return !1; +} + +sub Redirect($$$) +{ + my ($self, $Page, $Location) = @_; + + $self->SetCookies(); + if (substr($Location, 0, 4) ne "http") + { + # Use the same protocol as for the current page. To force switching to + # https the caller should use MakeSecureURL(). + my $Protocol = SecureConnection() ? "https://" : "http://"; + if (substr($Location, 0, 1) ne "/") + { + # Despite its name, Request->uri only contains the path portion of the + # URI, excluding the protocol, hostname and parameters! + my $URI = $self->{Request}->uri; + $URI =~ s=^(.*)/[^/]*$=$1/$Location=; + $Location = $URI; + } + $Location = $Protocol . $ENV{"HTTP_HOST"} . $Location; + } + $self->{Request}->headers_out->set("Location", $Location); + $self->{Request}->status(Apache2::Const::REDIRECT); + return 0; # a suitable exit code +} + +sub CheckSecurePage($$) +{ + my ($self, $Page) = @_; + + if ($UseSSL && ! SecureConnection()) + { + exit($self->Redirect($Page, MakeSecureURL($ENV{"REQUEST_URI"}))); + } +} + + +# +# Error handling framework +# + +sub GenerateErrorDiv($$) +{ + my ($self, $Page) = @_; + + my $ErrMessage = $Page->GetErrMessage(); + if ($ErrMessage) + { + print "<noscript>\n"; + print "<div id='errormessage'>", $Page->CGI->escapeHTML($ErrMessage), "</div>\n"; + print "</noscript>\n"; + } +} + +sub GenerateErrorPopup($$) +{ + my ($self, $Page) = @_; + + my $ErrMessage = $Page->GetErrMessage(); + if ($ErrMessage) + { + print "<script type='text/javascript'>\n"; + print "\n"; + print "</script>\n"; + } +} + + +# +# HTML page generation +# + sub GetPageTitle($$) { my ($self, $Page) = @_; @@ -199,6 +308,43 @@ sub GetPageTitle($$) return $Title; } +sub GenerateHttpHeaders($) +{ + my ($self) = @_; + + my $Request = $self->{Request}; + + # Date in the past + $Request->headers_out->add("Expires", "Sun, 25 Jul 1997 05:00:00 GMT"); + + # always modified + $Request->headers_out->add("Last-Modified", (scalar gmtime) . " GMT"); + + # HTTP/1.1 + $Request->headers_out->add("Cache-Control", "no-cache, must-revalidate, " . + "post-check=0, pre-check=0"); + + # HTTP/1.0 + $Request->headers_out->add("Pragma", "no-cache"); + + # Force char set + $Request->content_type("text/html; charset=UTF-8"); + + $self->SetCookies(); +} + +sub GetOnLoadJavascriptFunction($$) +{ + my ($self, $Page) = @_; + + if ($Page->GetErrMessage()) + { + return "ShowError()"; + } + + return undef; +} + sub GenerateHeader($$) { my ($self, $Page) = @_; @@ -213,7 +359,7 @@ sub GenerateHeader($$) <link rel='stylesheet' href='/${ProjectName}TestBot.css' type='text/css' media='screen'> </head> EOF - + print "<body"; my $OnLoadJavascriptFunction = $self->GetOnLoadJavascriptFunction($Page); if ($OnLoadJavascriptFunction) @@ -323,6 +469,13 @@ EOF EOF } +sub GenerateBody($) +{ + my ($self) = @_; + + die "Pure virtual function " . ref($self) . "::GenerateBody called"; +} + sub GenerateFooter($) { my ($self) = @_; @@ -338,142 +491,4 @@ sub GenerateFooter($) EOF } -sub GenerateErrorDiv($$) -{ - my ($self, $Page) = @_; - - my $ErrMessage = $Page->GetErrMessage(); - if ($ErrMessage) - { - print "<noscript>\n"; - print "<div id='errormessage'>", $Page->CGI->escapeHTML($ErrMessage), "</div>\n"; - print "</noscript>\n"; - } -} - -sub GenerateErrorPopup($$) -{ - my ($self, $Page) = @_; - - my $ErrMessage = $Page->GetErrMessage(); - if ($ErrMessage) - { - print "<script type='text/javascript'>\n"; - print "\n"; - print "</script>\n"; - } -} - -sub GenerateBody($) -{ - my ($self) = @_; - - die "Pure virtual function " . ref($self) . "::GenerateBody called"; -} - -sub GetOnLoadJavascriptFunction($$) -{ - my ($self, $Page) = @_; - - if ($Page->GetErrMessage()) - { - return "ShowError()"; - } - - return undef; -} - -sub Redirect($$$) -{ - my ($self, $Page, $Location) = @_; - - $self->SetCookies(); - if (substr($Location, 0, 4) ne "http") - { - # Use the same protocol as for the current page. To force switching to - # https the caller should use MakeSecureURL(). - my $Protocol = SecureConnection() ? "https://" : "http://"; - if (substr($Location, 0, 1) ne "/") - { - # Despite its name, Request->uri only contains the path portion of the - # URI, excluding the protocol, hostname and parameters! - my $URI = $self->{Request}->uri; - $URI =~ s=^(.*)/[^/]*$=$1/$Location=; - $Location = $URI; - } - $Location = $Protocol . $ENV{"HTTP_HOST"} . $Location; - } - $self->{Request}->headers_out->set("Location", $Location); - $self->{Request}->status(Apache2::Const::REDIRECT); - return 0; # a suitable exit code -} - -sub GetCurrentSession($) -{ - my ($self) = @_; - - if ($UseSSL && ! SecureConnection()) - { - return undef; - } - - if (! defined($self->{Session})) - { - my %Cookies = CGI::Cookie->fetch($self->{Request}); - if (defined($Cookies{"SessionId"})) - { - my $SessionId = $Cookies{"SessionId"}->value; - my $Sessions = CreateSessions(); - $self->{Session} = $Sessions->GetItem($SessionId); - } - } - - return $self->{Session}; -} - -sub SetCurrentSession($$$) -{ - my ($self, $Page, $Session) = @_; - - $self->{Session} = $Session; - if (! defined($Session)) - { - $self->UnsetCookies(); - } -} - -sub SessionActive($) -{ - my ($self) = @_; - - if (defined($self->GetCurrentSession())) - { - return 1; - } - - my %Cookies = CGI::Cookie->fetch($self->{Request}); - if ($UseSSL && ! SecureConnection() && defined($Cookies{"SessionActive"})) - { - return 1; - } - - return !1; -} - -sub CreatePageBase($$$@) -{ - #my ($Page, $Request, $RequiredRole) = @_; - return WineTestBot::CGI::PageBase->new(@_); -} - 1; -- 2.30.2

1 1

[tools] testbot: Tweak the Collection formatting.
by Francois Gouget 24 Mar '22

24 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This is really just cosmetic and should not make any difference to how the website works. --- testbot/lib/ObjectModel/Collection.pm | 68 +++++---------------------- 1 file changed, 13 insertions(+), 55 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 782f32c23..dd0be12d5 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -195,7 +195,6 @@ sub Load($) my ($self) = @_; $self->GetBackEnd()->LoadCollection($self); - $self->{Loaded} = 1; } @@ -252,11 +251,7 @@ sub GetKeys($) { my ($self) = @_; - if (! $self->{Loaded}) - { - $self->Load(); - } - + $self->Load() if (!$self->{Loaded}); return $self->GetKeysNoLoad(); } @@ -370,16 +365,9 @@ sub ItemExists($$) { my ($self, $Key) = @_; - if (! defined($Key)) - { - return !1; - } - - if (! $self->{Loaded}) - { - $self->Load(); - } + return !1 if (!defined $Key); + $self->Load() if (!$self->{Loaded}); return exists($self->{Items}{$Key}); } @@ -399,11 +387,7 @@ sub GetItems($) { my ($self) = @_; - if (! $self->{Loaded}) - { - $self->Load(); - } - + $self->Load() if (!$self->{Loaded}); my @Items = values %{$self->{Items}}; return \@Items; } @@ -422,11 +406,7 @@ sub GetItemsCount($) { my ($self) = @_; - if (! $self->{Loaded}) - { - $self->Load(); - } - + $self->Load() if (!$self->{Loaded}); return scalar(keys %{$self->{Items}}); } @@ -444,10 +424,7 @@ sub IsEmpty($) { my ($self) = @_; - if (! $self->{Loaded}) - { - $self->Load(); - } + $self->Load() if (!$self->{Loaded}); # Even though scalar(hash) does not return the number of items in Perl 5.20 # (and cannot generally be compared to numbers), it evaluates to true for @@ -468,7 +445,6 @@ sub SplitKey($$) my ($self, $CombinedKey) = @_; my @KeyComponents = split /#@#/, $CombinedKey; - return @KeyComponents; } @@ -564,11 +540,7 @@ sub Save($) my ($self) = @_; my ($ErrKey, $ErrProperty, $ErrMessage) = $self->Validate(); - if (! defined($ErrMessage)) - { - $self->SaveNoValidate(); - } - + $self->SaveNoValidate() if (!defined $ErrMessage); return ($ErrKey, $ErrProperty, $ErrMessage); } @@ -637,16 +609,11 @@ sub DeleteItem($$) my ($self, $Item) = @_; my $ErrMessage = $Item->OnDelete(); - if (defined($ErrMessage)) - { - return $ErrMessage; - } + return $ErrMessage if (defined $ErrMessage); + my $Key = $Item->GetKey(); $ErrMessage = $self->GetBackEnd()->DeleteItem($Item); - if (defined($ErrMessage)) - { - return $ErrMessage; - } + return $ErrMessage if (defined $ErrMessage); my $FullKey = $self->GetFullKey($Key); if (defined $FullKey) @@ -663,24 +630,15 @@ sub DeleteAll($) { my ($self) = @_; - if (! $self->{Loaded}) - { - $self->Load(); - } + $self->Load() if (!$self->{Loaded}); foreach my $Item (values %{$self->{Items}}) { my $ErrMessage = $Item->OnDelete(); - if (defined($ErrMessage)) - { - return $ErrMessage; - } + return $ErrMessage if (defined $ErrMessage); } my $ErrMessage = $self->GetBackEnd()->DeleteAll($self); - if (defined($ErrMessage)) - { - return $ErrMessage; - } + return $ErrMessage if (defined $ErrMessage); my $ScopeItems = $self->{AllScopeItems}->{ref($self)}; foreach my $Key (keys %{$self->{Items}}) -- 2.30.2

1 0

[PATCH vkd3d 2/2] tests: Test signalling a fence to a lower value after a GPU wait.
by Henri Verbeet 24 Mar '22

24 Mar '22

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Ensures the new fence implementation using timeline semaphores handles this correctly. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 230634. v2: Unmodified. tests/d3d12.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 2059b182..486c0093 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -33373,6 +33373,12 @@ static void test_queue_wait(void) check_readback_data_uint(&rb, NULL, 0xffff0000, 0); release_resource_readback(&rb); + /* signal to a lower value after a GPU wait was used (test timeline semaphore replacement) */ + hr = ID3D12Fence_Signal(fence, 0); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + value = ID3D12Fence_GetCompletedValue(fence); + ok(value == 0, "Got unexpected value %"PRIu64".\n", value); + hr = ID3D12Fence_Signal(fence, 6); ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); update_buffer_data(cb, 0, sizeof(green), &green); -- 2.20.1

1 0

[PATCH vkd3d v2 1/2] vkd3d: Use Vulkan null descriptors if EXT_robustness2 is available.
by Conor McCarthy 24 Mar '22

24 Mar '22

This implements all remaining unsupported image view dimensions and saves a small amount of resources because null buffers and images are no longer needed. It matches the D3D12 requirement that all reads return zero, which is not strictly true of the existing implementation using resources of small but non-zero size. Warnings on null view creation are silenced because there should no longer be a difference from D3D12 behaviour. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- README | 2 +- configure.ac | 2 +- libs/vkd3d/device.c | 8 ++++ libs/vkd3d/resource.c | 76 +++++++++++++++++++++++++------------- libs/vkd3d/vkd3d_private.h | 1 + 5 files changed, 61 insertions(+), 28 deletions(-) diff --git a/README b/README index 066a24bc..465d5f91 100644 --- a/README +++ b/README @@ -9,7 +9,7 @@ similar, but not identical, to Direct3D 12. Building vkd3d ============== -Vkd3d depends on SPIRV-Headers and Vulkan-Headers (>= 1.1.113). +Vkd3d depends on SPIRV-Headers and Vulkan-Headers (>= 1.2.139). Vkd3d generates some of its headers from IDL files. If you are using the release tarballs, then these headers are pre-generated and are included. If diff --git a/configure.ac b/configure.ac index 53029d2c..308bdda1 100644 --- a/configure.ac +++ b/configure.ac @@ -81,7 +81,7 @@ AS_IF([test "x$ac_cv_header_spirv_unified1_GLSL_std_450_h" != "xyes" \ -a "x$ac_cv_header_vulkan_GLSL_std_450_h" != "xyes"], [AC_MSG_ERROR([GLSL.std.450.h not found.])]) -VKD3D_CHECK_VULKAN_HEADER_VERSION([113], [AC_MSG_ERROR([Vulkan headers are too old, 1.1.113 is required.])]) +VKD3D_CHECK_VULKAN_HEADER_VERSION([139], [AC_MSG_ERROR([Vulkan headers are too old, 1.2.139 is required.])]) AC_CHECK_DECL([SpvCapabilityDemoteToHelperInvocationEXT],, [AC_MSG_ERROR([SPIR-V headers are too old.])], [ #ifdef HAVE_SPIRV_UNIFIED1_SPIRV_H diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index d1629284..eb470c12 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -135,6 +135,7 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = VK_EXTENSION(EXT_DEBUG_MARKER, EXT_debug_marker), VK_EXTENSION(EXT_DEPTH_CLIP_ENABLE, EXT_depth_clip_enable), VK_EXTENSION(EXT_DESCRIPTOR_INDEXING, EXT_descriptor_indexing), + VK_EXTENSION(EXT_ROBUSTNESS_2, EXT_robustness2), VK_EXTENSION(EXT_SHADER_DEMOTE_TO_HELPER_INVOCATION, EXT_shader_demote_to_helper_invocation), VK_EXTENSION(EXT_SHADER_STENCIL_EXPORT, EXT_shader_stencil_export), VK_EXTENSION(EXT_TEXEL_BUFFER_ALIGNMENT, EXT_texel_buffer_alignment), @@ -797,6 +798,7 @@ struct vkd3d_physical_device_info VkPhysicalDeviceConditionalRenderingFeaturesEXT conditional_rendering_features; VkPhysicalDeviceDepthClipEnableFeaturesEXT depth_clip_features; VkPhysicalDeviceDescriptorIndexingFeaturesEXT descriptor_indexing_features; + VkPhysicalDeviceRobustness2FeaturesEXT robustness2_features; VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT demote_features; VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT texel_buffer_alignment_features; VkPhysicalDeviceTransformFeedbackFeaturesEXT xfb_features; @@ -813,6 +815,7 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT *vertex_divisor_properties; VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT *buffer_alignment_properties; VkPhysicalDeviceDescriptorIndexingFeaturesEXT *descriptor_indexing_features; + VkPhysicalDeviceRobustness2FeaturesEXT *robustness2_features; VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *vertex_divisor_features; VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT *buffer_alignment_features; VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT *demote_features; @@ -827,6 +830,7 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i conditional_rendering_features = &info->conditional_rendering_features; depth_clip_features = &info->depth_clip_features; descriptor_indexing_features = &info->descriptor_indexing_features; + robustness2_features = &info->robustness2_features; descriptor_indexing_properties = &info->descriptor_indexing_properties; maintenance3_properties = &info->maintenance3_properties; demote_features = &info->demote_features; @@ -845,6 +849,8 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i vk_prepend_struct(&info->features2, depth_clip_features); descriptor_indexing_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT; vk_prepend_struct(&info->features2, descriptor_indexing_features); + robustness2_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT; + vk_prepend_struct(&info->features2, robustness2_features); demote_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES_EXT; vk_prepend_struct(&info->features2, demote_features); buffer_alignment_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_FEATURES_EXT; @@ -1577,6 +1583,8 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vulkan_info->EXT_conditional_rendering = false; if (!physical_device_info->depth_clip_features.depthClipEnable) vulkan_info->EXT_depth_clip_enable = false; + if (!physical_device_info->robustness2_features.nullDescriptor) + vulkan_info->EXT_robustness2 = false; if (!physical_device_info->demote_features.shaderDemoteToHelperInvocation) vulkan_info->EXT_shader_demote_to_helper_invocation = false; if (!physical_device_info->texel_buffer_alignment_features.texelBufferAlignment) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index cbbd4170..3c4aa53d 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2423,10 +2423,10 @@ bool vkd3d_create_buffer_view(struct d3d12_device *device, VkBuffer vk_buffer, c VkDeviceSize offset, VkDeviceSize size, struct vkd3d_view **view) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + VkBufferView vk_view = VK_NULL_HANDLE; struct vkd3d_view *object; - VkBufferView vk_view; - if (!vkd3d_create_vk_buffer_view(device, vk_buffer, format, offset, size, &vk_view)) + if (vk_buffer && !vkd3d_create_vk_buffer_view(device, vk_buffer, format, offset, size, &vk_view)) return false; if (!(object = vkd3d_view_create(VKD3D_VIEW_TYPE_BUFFER))) @@ -2711,28 +2711,31 @@ bool vkd3d_create_texture_view(struct d3d12_device *device, VkImage vk_image, const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; const struct vkd3d_format *format = desc->format; struct VkImageViewCreateInfo view_desc; + VkImageView vk_view = VK_NULL_HANDLE; struct vkd3d_view *object; - VkImageView vk_view; VkResult vr; - view_desc.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO; - view_desc.pNext = NULL; - view_desc.flags = 0; - view_desc.image = vk_image; - view_desc.viewType = desc->view_type; - view_desc.format = format->vk_format; - vkd3d_set_view_swizzle_for_format(&view_desc.components, format, desc->allowed_swizzle); - if (desc->allowed_swizzle) - vk_component_mapping_compose(&view_desc.components, &desc->components); - view_desc.subresourceRange.aspectMask = desc->vk_image_aspect; - view_desc.subresourceRange.baseMipLevel = desc->miplevel_idx; - view_desc.subresourceRange.levelCount = desc->miplevel_count; - view_desc.subresourceRange.baseArrayLayer = desc->layer_idx; - view_desc.subresourceRange.layerCount = desc->layer_count; - if ((vr = VK_CALL(vkCreateImageView(device->vk_device, &view_desc, NULL, &vk_view))) < 0) - { - WARN("Failed to create Vulkan image view, vr %d.\n", vr); - return false; + if (vk_image) + { + view_desc.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO; + view_desc.pNext = NULL; + view_desc.flags = 0; + view_desc.image = vk_image; + view_desc.viewType = desc->view_type; + view_desc.format = format->vk_format; + vkd3d_set_view_swizzle_for_format(&view_desc.components, format, desc->allowed_swizzle); + if (desc->allowed_swizzle) + vk_component_mapping_compose(&view_desc.components, &desc->components); + view_desc.subresourceRange.aspectMask = desc->vk_image_aspect; + view_desc.subresourceRange.baseMipLevel = desc->miplevel_idx; + view_desc.subresourceRange.levelCount = desc->miplevel_count; + view_desc.subresourceRange.baseArrayLayer = desc->layer_idx; + view_desc.subresourceRange.layerCount = desc->layer_count; + if ((vr = VK_CALL(vkCreateImageView(device->vk_device, &view_desc, NULL, &vk_view))) < 0) + { + WARN("Failed to create Vulkan image view, vr %d.\n", vr); + return false; + } } if (!(object = vkd3d_view_create(VKD3D_VIEW_TYPE_IMAGE))) @@ -2782,7 +2785,7 @@ void d3d12_desc_create_cbv(struct d3d12_desc *descriptor, /* NULL descriptor */ buffer_info->buffer = device->null_resources.vk_buffer; buffer_info->offset = 0; - buffer_info->range = VKD3D_NULL_BUFFER_SIZE; + buffer_info->range = VK_WHOLE_SIZE; } descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_CBV; @@ -2815,7 +2818,8 @@ static void vkd3d_create_null_srv(struct d3d12_desc *descriptor, switch (desc->ViewDimension) { case D3D12_SRV_DIMENSION_BUFFER: - WARN("Creating NULL buffer SRV %#x.\n", desc->Format); + if (!device->vk_info.EXT_robustness2) + WARN("Creating NULL buffer SRV %#x.\n", desc->Format); if (vkd3d_create_buffer_view(device, null_resources->vk_buffer, vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false), @@ -2838,11 +2842,19 @@ static void vkd3d_create_null_srv(struct d3d12_desc *descriptor, break; default: + if (device->vk_info.EXT_robustness2) + { + vk_image = VK_NULL_HANDLE; + /* view_type is not used for Vulkan null descriptors, but make it valid. */ + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; + break; + } FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); return; } - WARN("Creating NULL SRV %#x.\n", desc->ViewDimension); + if (!device->vk_info.EXT_robustness2) + WARN("Creating NULL SRV %#x.\n", desc->ViewDimension); vkd3d_desc.format = vkd3d_get_format(device, VKD3D_NULL_VIEW_FORMAT, false); vkd3d_desc.miplevel_idx = 0; @@ -3052,7 +3064,8 @@ static void vkd3d_create_null_uav(struct d3d12_desc *descriptor, switch (desc->ViewDimension) { case D3D12_UAV_DIMENSION_BUFFER: - WARN("Creating NULL buffer UAV %#x.\n", desc->Format); + if (!device->vk_info.EXT_robustness2) + WARN("Creating NULL buffer UAV %#x.\n", desc->Format); if (vkd3d_create_buffer_view(device, null_resources->vk_storage_buffer, vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false), @@ -3075,11 +3088,19 @@ static void vkd3d_create_null_uav(struct d3d12_desc *descriptor, break; default: + if (device->vk_info.EXT_robustness2) + { + vk_image = VK_NULL_HANDLE; + /* view_type is not used for Vulkan null descriptors, but make it valid. */ + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; + break; + } FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); return; } - WARN("Creating NULL UAV %#x.\n", desc->ViewDimension); + if (!device->vk_info.EXT_robustness2) + WARN("Creating NULL UAV %#x.\n", desc->ViewDimension); vkd3d_desc.format = vkd3d_get_format(device, VKD3D_NULL_VIEW_FORMAT, false); vkd3d_desc.miplevel_idx = 0; @@ -4421,6 +4442,9 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, memset(null_resources, 0, sizeof(*null_resources)); + if (device->vk_info.EXT_robustness2) + return S_OK; + memset(&heap_properties, 0, sizeof(heap_properties)); heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index c28eb234..796dfefd 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -131,6 +131,7 @@ struct vkd3d_vulkan_info bool EXT_debug_marker; bool EXT_depth_clip_enable; bool EXT_descriptor_indexing; + bool EXT_robustness2; bool EXT_shader_demote_to_helper_invocation; bool EXT_shader_stencil_export; bool EXT_texel_buffer_alignment; -- 2.34.1

3 4

[PATCH 1/2] wined3d: Flush on texture download to avoid stalling on readout.
by Jan Sikorski 24 Mar '22

24 Mar '22

Fixes a stall during a map operation in The Evil Within. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/texture.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index fdd2c70c667..ebe770af0d2 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5163,6 +5163,8 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, bo_stage_flags, 0, 0, NULL, 1, &vk_barrier, 0, NULL)); + /* Start the download so we don't stall waiting for the result. */ + wined3d_context_vk_submit_command_buffer(context_vk, 0, NULL, NULL, 0, NULL); } } -- 2.32.0

2 3

[PATCH] dlls/windows.globalization: don't allocate a partial structure
by Eric Pouech 24 Mar '22

24 Mar '22

GCC 11 complains about accessing struct hstring_vector (-Warray-bounds) when the allocation is made for a 0-sized vector so ensure that we always allocate a memory block to fit a whole structure Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/windows.globalization/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/windows.globalization/main.c b/dlls/windows.globalization/main.c index 3e5a59bde14..363e0150af1 100644 --- a/dlls/windows.globalization/main.c +++ b/dlls/windows.globalization/main.c @@ -213,8 +213,10 @@ static const struct IVectorView_HSTRINGVtbl hstring_vector_vtbl = static HRESULT hstring_vector_create(HSTRING *values, SIZE_T count, IVectorView_HSTRING **out) { struct hstring_vector *impl; - - if (!(impl = malloc(offsetof(struct hstring_vector, values[count])))) return E_OUTOFMEMORY; + /* always allocate at least the full structure to avoid GCC11 warnings */ + if (!(impl = malloc(max(offsetof(struct hstring_vector, values[count]), + sizeof(struct hstring_vector))))) + return E_OUTOFMEMORY; impl->ref = 1; impl->IVectorView_HSTRING_iface.lpVtbl = &hstring_vector_vtbl;

6 11

[PATCH 1/3] programs/cmd: %time% should have 1/100s resolution.
by Francois Gouget 24 Mar '22

24 Mar '22

Stub out the subsecond decimals. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52719 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- GetTimeFormatEx() does not support formatting fractions of a second. So just stub out that until there is a need for it. At least now echo %time% can be used to see where a batch file spends its time. --- programs/cmd/tests/test_builtins.cmd | 9 +++++++++ programs/cmd/tests/test_builtins.cmd.exp | 2 ++ programs/cmd/wcmdmain.c | 5 ++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 3f410e55166..8133268d2dd 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1789,6 +1789,15 @@ set /a WINE_foo=5 set /a WINE_bar=WINE_foo=6 call :checkenvvars WINE_foo 6 WINE_bar 6 +echo --- Magic environment variables +echo Century=%date:~6,2% + +set WINE_foo=%time:~7,1% +if not defined WINE_foo echo "No seconds in %%time%%" + +set WINE_foo=%random% +if %WINE_foo% equ %random% echo "%%random%% is not random" + echo --- for /F mkdir foobar & cd foobar echo ------ string argument diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 8b6e0914112..e95fa0256b1 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1216,6 +1216,8 @@ WINE_foo correctly 7 WINE_foo correctly 8@or_broken@ERROR: WINE_foo incorrectly 4 [8] WINE_foo correctly 6@or_broken@ERROR: WINE_foo incorrectly 5 [6] WINE_bar correctly 6@or_broken@ERROR: WINE_bar incorrectly 5 [6] +--- Magic environment variables +Century=20 --- for /F ------ string argument a diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index af54b209d83..cd083449ffe 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -621,8 +621,11 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR startchar) NULL, thisVarContents, MAXSTRING); len = lstrlenW(thisVarContents); } else if (WCMD_is_magic_envvar(thisVar, L"TIME")) { - GetTimeFormatW(LOCALE_USER_DEFAULT, TIME_NOSECONDS, NULL, + GetTimeFormatW(LOCALE_USER_DEFAULT, 0, NULL, NULL, thisVarContents, MAXSTRING); + /* FIXME This should have 1/100s precision as well as a localized + * decimal separator */ + lstrcatW(thisVarContents, L".00"); len = lstrlenW(thisVarContents); } else if (WCMD_is_magic_envvar(thisVar, L"CD")) { GetCurrentDirectoryW(MAXSTRING, thisVarContents); -- 2.30.2

2 6

[PATCH] dwrite.idl [out] parameters
by Thomas Linder Puls 24 Mar '22

24 Mar '22

2 1

[PATCH] light.msstyles: Add Menu stub class.
by Zhiyi Zhang 24 Mar '22

24 Mar '22

Fix DTS Master Audio Suite save file button can not be clicked. The application queries for Vista+ Menu class because Wine's default system version is set to Windows 7. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52667 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/light.rc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index fc6d196ad0c..5073ad935b4 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -398,6 +398,10 @@ BLUE_INI TEXTFILE "FillColor = 255 255 255\r\n" "BorderColor = 174 174 174\r\n" +"\r\n; Menu\r\n" +"[Menu]\r\n" +"BgType = None\r\n" + "\r\n; Progress\r\n" "[Progress]\r\n" "ProgressChunkSize = 1\r\n" -- 2.32.0

1 0

[PATCH 3/3] bcrypt: Also duplicate the public key handle in key_asymmetric_duplicate().
by Hans Leidekker 24 Mar '22

24 Mar '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/gnutls.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 0d2661f9a83..ba251c72fa1 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1806,11 +1806,13 @@ static NTSTATUS key_asymmetric_duplicate( void *args ) const struct key_asymmetric_duplicate_params *params = args; struct key *key_orig = params->key_orig; struct key *key_copy = params->key_copy; + gnutls_privkey_t privkey; + gnutls_pubkey_t pubkey; int ret; if (!key_data(key_orig)->a.privkey) return STATUS_SUCCESS; - if ((ret = pgnutls_privkey_init( &key_data(key_copy)->a.privkey ))) + if ((ret = pgnutls_privkey_init( &privkey ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -1827,7 +1829,7 @@ static NTSTATUS key_asymmetric_duplicate( void *args ) pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; } - ret = pgnutls_privkey_import_rsa_raw( key_data(key_copy)->a.privkey, &m, &e, &d, &p, &q, &u, &e1, &e2 ); + ret = pgnutls_privkey_import_rsa_raw( privkey, &m, &e, &d, &p, &q, &u, &e1, &e2 ); free( m.data ); free( e.data ); free( d.data ); free( p.data ); free( q.data ); free( u.data ); free( e1.data ); free( e2.data ); if (ret) @@ -1845,13 +1847,14 @@ static NTSTATUS key_asymmetric_duplicate( void *args ) pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; } - ret = pgnutls_privkey_import_dsa_raw( key_data(key_copy)->a.privkey, &p, &q, &g, &y, &x ); + ret = pgnutls_privkey_import_dsa_raw( privkey, &p, &q, &g, &y, &x ); free( p.data ); free( q.data ); free( g.data ); free( y.data ); free( x.data ); if (ret) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; } + key_copy->u.a.dss_seed = key_orig->u.a.dss_seed; break; } case ALG_ID_ECDH_P256: @@ -1865,7 +1868,7 @@ static NTSTATUS key_asymmetric_duplicate( void *args ) pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; } - ret = pgnutls_privkey_import_ecc_raw( key_data(key_copy)->a.privkey, curve, &x, &y, &k ); + ret = pgnutls_privkey_import_ecc_raw( privkey, curve, &x, &y, &k ); free( x.data ); free( y.data ); free( k.data ); if (ret) { @@ -1879,6 +1882,25 @@ static NTSTATUS key_asymmetric_duplicate( void *args ) return STATUS_INTERNAL_ERROR; } + if (key_data(key_orig)->a.pubkey) + { + if ((ret = pgnutls_pubkey_init( &pubkey ))) + { + pgnutls_perror( ret ); + pgnutls_privkey_deinit( privkey ); + return STATUS_INTERNAL_ERROR; + } + if ((ret = pgnutls_pubkey_import_privkey( pubkey, key_data(key_orig)->a.privkey, 0, 0 ))) + { + pgnutls_perror( ret ); + pgnutls_pubkey_deinit( pubkey ); + pgnutls_privkey_deinit( privkey ); + return STATUS_INTERNAL_ERROR; + } + key_data(key_copy)->a.pubkey = pubkey; + } + + key_data(key_copy)->a.privkey = privkey; return STATUS_SUCCESS; } -- 2.30.2

1 0

[PATCH 2/3] bcrypt: Fix DSA public key export when we don't have a private key handle.
by Hans Leidekker 24 Mar '22

24 Mar '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/gnutls.c | 29 +++++++++++++++++++++++++++-- dlls/bcrypt/tests/bcrypt.c | 13 ++++++++++++- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index eea84cf3aa9..0d2661f9a83 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -107,6 +107,8 @@ static int (*pgnutls_pubkey_import_dsa_raw)(gnutls_pubkey_t, const gnutls_datum_ static int (*pgnutls_pubkey_import_privkey)(gnutls_pubkey_t, gnutls_privkey_t, unsigned int, unsigned int); /* Not present in gnutls version < 3.3.0 */ +static int (*pgnutls_pubkey_export_dsa_raw)(gnutls_pubkey_t, gnutls_datum_t *, gnutls_datum_t *, gnutls_datum_t *, + gnutls_datum_t *); static int (*pgnutls_pubkey_export_rsa_raw)(gnutls_pubkey_t, gnutls_datum_t *, gnutls_datum_t *); static int (*pgnutls_privkey_export_ecc_raw)(gnutls_privkey_t, gnutls_ecc_curve_t *, gnutls_datum_t *, gnutls_datum_t *, gnutls_datum_t *); @@ -167,6 +169,12 @@ static int compat_gnutls_pubkey_export_ecc_raw(gnutls_pubkey_t key, gnutls_ecc_c return GNUTLS_E_UNKNOWN_PK_ALGORITHM; } +static int compat_gnutls_pubkey_export_dsa_raw(gnutls_pubkey_t key, gnutls_datum_t *p, gnutls_datum_t *q, + gnutls_datum_t *g, gnutls_datum_t *y) +{ + return GNUTLS_E_UNKNOWN_PK_ALGORITHM; +} + static int compat_gnutls_pubkey_export_rsa_raw(gnutls_pubkey_t key, gnutls_datum_t *m, gnutls_datum_t *e) { return GNUTLS_E_UNKNOWN_PK_ALGORITHM; @@ -305,6 +313,7 @@ static NTSTATUS gnutls_process_attach( void *args ) LOAD_FUNCPTR_OPT(gnutls_cipher_tag) LOAD_FUNCPTR_OPT(gnutls_cipher_add_auth) + LOAD_FUNCPTR_OPT(gnutls_pubkey_export_dsa_raw) LOAD_FUNCPTR_OPT(gnutls_pubkey_export_ecc_raw) LOAD_FUNCPTR_OPT(gnutls_pubkey_export_rsa_raw) LOAD_FUNCPTR_OPT(gnutls_pubkey_import_ecc_raw) @@ -740,7 +749,14 @@ static NTSTATUS key_export_dsa_public( struct key *key, UCHAR *buf, ULONG len, U UCHAR *dst; int ret; - if ((ret = pgnutls_privkey_export_dsa_raw( key_data(key)->a.privkey, &p, &q, &g, &y, NULL ))) + if (key_data(key)->a.pubkey) + ret = pgnutls_pubkey_export_dsa_raw( key_data(key)->a.pubkey, &p, &q, &g, &y ); + else if (key_data(key)->a.privkey) + ret = pgnutls_privkey_export_dsa_raw( key_data(key)->a.privkey, &p, &q, &g, &y, NULL ); + else + return STATUS_INVALID_PARAMETER; + + if (ret) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -805,7 +821,14 @@ static NTSTATUS key_export_dsa_capi_public( struct key *key, UCHAR *buf, ULONG l return STATUS_NOT_IMPLEMENTED; } - if ((ret = pgnutls_privkey_export_dsa_raw( key_data(key)->a.privkey, &p, &q, &g, &y, NULL ))) + if (key_data(key)->a.pubkey) + ret = pgnutls_pubkey_export_dsa_raw( key_data(key)->a.pubkey, &p, &q, &g, &y ); + else if (key_data(key)->a.privkey) + ret = pgnutls_privkey_export_dsa_raw( key_data(key)->a.privkey, &p, &q, &g, &y, NULL ); + else + return STATUS_INVALID_PARAMETER; + + if (ret) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -1123,6 +1146,8 @@ static NTSTATUS key_export_dsa_capi( struct key *key, UCHAR *buf, ULONG len, ULO UCHAR *dst; int ret, size; + if (!key_data(key)->a.privkey) return STATUS_INVALID_PARAMETER; + if ((ret = pgnutls_privkey_export_dsa_raw( key_data(key)->a.privkey, &p, &q, &g, &y, &x ))) { pgnutls_perror( ret ); diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 03a37f31d31..df650379cfb 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2902,7 +2902,7 @@ static void test_DSA(void) UCHAR sig[40], schemes; ULONG len, size; NTSTATUS ret; - BYTE *buf; + BYTE *buf, buf2[sizeof(BCRYPT_DSA_KEY_BLOB) + sizeof(dsaPublicBlob)]; ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_DSA_ALGORITHM, NULL, 0); ok(!ret, "got %#lx\n", ret); @@ -2917,6 +2917,17 @@ static void test_DSA(void) ret = BCryptImportKeyPair(alg, NULL, BCRYPT_DSA_PUBLIC_BLOB, &key, dsaPublicBlob, sizeof(dsaPublicBlob), 0); ok(!ret, "got %#lx\n", ret); + memset(buf2, 0xcc, sizeof(buf2)); + ret = BCryptExportKey(key, NULL, BCRYPT_DSA_PUBLIC_BLOB, buf2, sizeof(buf2), &size, 0); + ok(!ret, "got %#lx\n", ret); + dsablob = (BCRYPT_DSA_KEY_BLOB *)buf2; + ok(dsablob->dwMagic == BCRYPT_DSA_PUBLIC_MAGIC, "got %#lx\n", dsablob->dwMagic); + ok(dsablob->cbKey == 64, "got %lu\n", dsablob->cbKey); + ok(size == sizeof(*dsablob) + dsablob->cbKey * 3, "got %lu\n", size); + + ret = BCryptExportKey(key, NULL, BCRYPT_DSA_PRIVATE_BLOB, buf2, sizeof(buf2), &size, 0); + todo_wine ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); + ret = BCryptVerifySignature(key, NULL, dsaHash, sizeof(dsaHash), dsaSignature, sizeof(dsaSignature), 0); ok(!ret, "got %#lx\n", ret); -- 2.30.2

1 0

[PATCH 1/3] bcrypt: Fix RSA public key export when we don't have a private key handle.
by Hans Leidekker 24 Mar '22

24 Mar '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/gnutls.c | 20 ++++++++++++++++++-- dlls/bcrypt/tests/bcrypt.c | 18 +++++++++++++++++- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 9de126c2bfe..eea84cf3aa9 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -107,6 +107,7 @@ static int (*pgnutls_pubkey_import_dsa_raw)(gnutls_pubkey_t, const gnutls_datum_ static int (*pgnutls_pubkey_import_privkey)(gnutls_pubkey_t, gnutls_privkey_t, unsigned int, unsigned int); /* Not present in gnutls version < 3.3.0 */ +static int (*pgnutls_pubkey_export_rsa_raw)(gnutls_pubkey_t, gnutls_datum_t *, gnutls_datum_t *); static int (*pgnutls_privkey_export_ecc_raw)(gnutls_privkey_t, gnutls_ecc_curve_t *, gnutls_datum_t *, gnutls_datum_t *, gnutls_datum_t *); static int (*pgnutls_privkey_export_rsa_raw)(gnutls_privkey_t, gnutls_datum_t *, gnutls_datum_t *, gnutls_datum_t *, @@ -166,6 +167,11 @@ static int compat_gnutls_pubkey_export_ecc_raw(gnutls_pubkey_t key, gnutls_ecc_c return GNUTLS_E_UNKNOWN_PK_ALGORITHM; } +static int compat_gnutls_pubkey_export_rsa_raw(gnutls_pubkey_t key, gnutls_datum_t *m, gnutls_datum_t *e) +{ + return GNUTLS_E_UNKNOWN_PK_ALGORITHM; +} + static int compat_gnutls_privkey_export_rsa_raw(gnutls_privkey_t key, gnutls_datum_t *m, gnutls_datum_t *e, gnutls_datum_t *d, gnutls_datum_t *p, gnutls_datum_t *q, gnutls_datum_t *u, gnutls_datum_t *e1, gnutls_datum_t *e2) @@ -299,8 +305,9 @@ static NTSTATUS gnutls_process_attach( void *args ) LOAD_FUNCPTR_OPT(gnutls_cipher_tag) LOAD_FUNCPTR_OPT(gnutls_cipher_add_auth) - LOAD_FUNCPTR_OPT(gnutls_pubkey_import_ecc_raw) LOAD_FUNCPTR_OPT(gnutls_pubkey_export_ecc_raw) + LOAD_FUNCPTR_OPT(gnutls_pubkey_export_rsa_raw) + LOAD_FUNCPTR_OPT(gnutls_pubkey_import_ecc_raw) LOAD_FUNCPTR_OPT(gnutls_privkey_export_rsa_raw) LOAD_FUNCPTR_OPT(gnutls_privkey_export_ecc_raw) LOAD_FUNCPTR_OPT(gnutls_privkey_import_ecc_raw) @@ -633,7 +640,14 @@ static NTSTATUS key_export_rsa_public( struct key *key, UCHAR *buf, ULONG len, U UCHAR *dst; int ret; - if ((ret = pgnutls_privkey_export_rsa_raw( key_data(key)->a.privkey, &m, &e, NULL, NULL, NULL, NULL, NULL, NULL ))) + if (key_data(key)->a.pubkey) + ret = pgnutls_pubkey_export_rsa_raw( key_data(key)->a.pubkey, &m, &e ); + else if (key_data(key)->a.privkey) + ret = pgnutls_privkey_export_rsa_raw( key_data(key)->a.privkey, &m, &e, NULL, NULL, NULL, NULL, NULL, NULL ); + else + return STATUS_INVALID_PARAMETER; + + if (ret) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -1017,6 +1031,8 @@ static NTSTATUS key_export_rsa( struct key *key, ULONG flags, UCHAR *buf, ULONG UCHAR *dst; int ret; + if (!key_data(key)->a.privkey) return STATUS_INVALID_PARAMETER; + if ((ret = pgnutls_privkey_export_rsa_raw( key_data(key)->a.privkey, &m, &e, &d, &p, &q, &u, &e1, &e2 ))) { pgnutls_perror( ret ); diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 5d8e81cc522..03a37f31d31 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2212,7 +2212,7 @@ static void test_RSA_SIGN(void) BCRYPT_RSAKEY_BLOB *rsablob; NTSTATUS ret; ULONG size, size2; - BYTE *buf; + BYTE *buf, buf2[sizeof(BCRYPT_RSAKEY_BLOB) + sizeof(rsaPublicBlob)]; ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_RSA_SIGN_ALGORITHM, NULL, 0); if (ret) @@ -2224,6 +2224,22 @@ static void test_RSA_SIGN(void) ret = BCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, rsaPublicBlob, sizeof(rsaPublicBlob), 0); ok(!ret, "BCryptImportKeyPair failed: %#lx\n", ret); + memset(buf2, 0xcc, sizeof(buf2)); + ret = BCryptExportKey(key, NULL, BCRYPT_RSAPUBLIC_BLOB, buf2, sizeof(buf2), &size, 0); + ok(!ret, "got %#lx\n", ret); + rsablob = (BCRYPT_RSAKEY_BLOB *)buf2; + ok(rsablob->Magic == BCRYPT_RSAPUBLIC_MAGIC, "got %#lx\n", rsablob->Magic); + ok(rsablob->BitLength == 2048, "got %lu\n", rsablob->BitLength); + ok(rsablob->cbPublicExp == 3, "got %lu\n", rsablob->cbPublicExp); + ok(rsablob->cbModulus == 256, "got %lu\n", rsablob->cbModulus); + ok(rsablob->cbPrime1 == 0, "got %lu\n", rsablob->cbPrime1); + ok(rsablob->cbPrime2 == 0, "got %lu\n", rsablob->cbPrime2); + size2 = sizeof(*rsablob) + rsablob->cbPublicExp + rsablob->cbModulus + rsablob->cbPrime1 + rsablob->cbPrime2; + ok(size == size2, "got %lu expected %lu\n", size2, size); + + ret = BCryptExportKey(key, NULL, BCRYPT_RSAPRIVATE_BLOB, buf2, sizeof(buf2), &size, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); + pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; ret = BCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); ok(!ret, "BCryptVerifySignature failed: %#lx\n", ret); -- 2.30.2

1 0

[PATCH] dlls/shell32: always allocate a whole ITEMIDLIST structure
by Eric Pouech 24 Mar '22

24 Mar '22

Partially allocating a structure generates -Warray-bounds warnings with GCC11 In this specific case, given the rounding in memory allocators, would even not increase the effective allocated size Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/shell32/pidl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 4c66a14c700..f9c91a79132 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1574,7 +1574,7 @@ LPITEMIDLIST _ILCreateDesktop(void) LPITEMIDLIST ret; TRACE("()\n"); - ret = SHAlloc(2); + ret = SHAlloc(sizeof(*ret)); if (ret) ret->mkid.cb = 0; return ret;

1 0

[PATCH 4/4] uxtheme: Remove a redundant condition check.
by Zhiyi Zhang 24 Mar '22

24 Mar '22

The sizingtype check is redundant because it can only be ST_TRUESIZE, ST_STRETCH or ST_TILE and the check is already in the not ST_TRUESIZE branch. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/draw.c | 109 ++++++++++++++++++++++---------------------- 1 file changed, 54 insertions(+), 55 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index d503fad3fea..3ddb9b3bf4d 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -710,6 +710,7 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, RECT *pRect, const DTBGOPTS *pOptions) { + int destCenterWidth, srcCenterWidth, destCenterHeight, srcCenterHeight; HRESULT hr = S_OK; HBITMAP bmpSrc; HGDIOBJ oldSrc; @@ -825,68 +826,66 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, goto draw_error; } - if ((sizingtype == ST_STRETCH) || (sizingtype == ST_TILE)) { - int destCenterWidth = dstSize.x - (sm.cxLeftWidth + sm.cxRightWidth); - int srcCenterWidth = srcSize.x - (sm.cxLeftWidth + sm.cxRightWidth); - int destCenterHeight = dstSize.y - (sm.cyTopHeight + sm.cyBottomHeight); - int srcCenterHeight = srcSize.y - (sm.cyTopHeight + sm.cyBottomHeight); + destCenterWidth = dstSize.x - (sm.cxLeftWidth + sm.cxRightWidth); + srcCenterWidth = srcSize.x - (sm.cxLeftWidth + sm.cxRightWidth); + destCenterHeight = dstSize.y - (sm.cyTopHeight + sm.cyBottomHeight); + srcCenterHeight = srcSize.y - (sm.cyTopHeight + sm.cyBottomHeight); - if(destCenterWidth > 0) { - /* Center top */ - if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, 0, - destCenterWidth, sm.cyTopHeight, - hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.top, - srcCenterWidth, sm.cyTopHeight, - sizingtype, transparent, transparentcolor)) { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto draw_error; - } - /* Center bottom */ - if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, dstSize.y-sm.cyBottomHeight, - destCenterWidth, sm.cyBottomHeight, - hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.bottom-sm.cyBottomHeight, - srcCenterWidth, sm.cyBottomHeight, - sizingtype, transparent, transparentcolor)) { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto draw_error; - } + if(destCenterWidth > 0) { + /* Center top */ + if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, 0, + destCenterWidth, sm.cyTopHeight, + hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.top, + srcCenterWidth, sm.cyTopHeight, + sizingtype, transparent, transparentcolor)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; } - if(destCenterHeight > 0) { - /* Left center */ - if(!UXTHEME_SizedBlt (hdcDst, 0, sm.cyTopHeight, - sm.cxLeftWidth, destCenterHeight, - hdcSrc, rcSrc.left, rcSrc.top+sm.cyTopHeight, - sm.cxLeftWidth, srcCenterHeight, - sizingtype, - transparent, transparentcolor)) { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto draw_error; - } - /* Right center */ - if(!UXTHEME_SizedBlt (hdcDst, dstSize.x-sm.cxRightWidth, sm.cyTopHeight, - sm.cxRightWidth, destCenterHeight, - hdcSrc, rcSrc.right-sm.cxRightWidth, rcSrc.top+sm.cyTopHeight, - sm.cxRightWidth, srcCenterHeight, + /* Center bottom */ + if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, dstSize.y-sm.cyBottomHeight, + destCenterWidth, sm.cyBottomHeight, + hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.bottom-sm.cyBottomHeight, + srcCenterWidth, sm.cyBottomHeight, + sizingtype, transparent, transparentcolor)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; + } + } + if(destCenterHeight > 0) { + /* Left center */ + if(!UXTHEME_SizedBlt (hdcDst, 0, sm.cyTopHeight, + sm.cxLeftWidth, destCenterHeight, + hdcSrc, rcSrc.left, rcSrc.top+sm.cyTopHeight, + sm.cxLeftWidth, srcCenterHeight, + sizingtype, + transparent, transparentcolor)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; + } + /* Right center */ + if(!UXTHEME_SizedBlt (hdcDst, dstSize.x-sm.cxRightWidth, sm.cyTopHeight, + sm.cxRightWidth, destCenterHeight, + hdcSrc, rcSrc.right-sm.cxRightWidth, rcSrc.top+sm.cyTopHeight, + sm.cxRightWidth, srcCenterHeight, + sizingtype, transparent, transparentcolor)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; + } + } + if(destCenterHeight > 0 && destCenterWidth > 0) { + BOOL borderonly = FALSE; + GetThemeBool(hTheme, iPartId, iStateId, TMT_BORDERONLY, &borderonly); + if(!borderonly) { + /* Center */ + if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, sm.cyTopHeight, + destCenterWidth, destCenterHeight, + hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.top+sm.cyTopHeight, + srcCenterWidth, srcCenterHeight, sizingtype, transparent, transparentcolor)) { hr = HRESULT_FROM_WIN32(GetLastError()); goto draw_error; } } - if(destCenterHeight > 0 && destCenterWidth > 0) { - BOOL borderonly = FALSE; - GetThemeBool(hTheme, iPartId, iStateId, TMT_BORDERONLY, &borderonly); - if(!borderonly) { - /* Center */ - if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, sm.cyTopHeight, - destCenterWidth, destCenterHeight, - hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.top+sm.cyTopHeight, - srcCenterWidth, srcCenterHeight, - sizingtype, transparent, transparentcolor)) { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto draw_error; - } - } - } } draw_error: -- 2.32.0

1 0

[PATCH 3/4] uxtheme: Return correct WM_ERASEBKGND result from custom dialog procedures.
by Zhiyi Zhang 24 Mar '22

24 Mar '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/dialog.c | 3 ++- dlls/uxtheme/tests/system.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c index 706d170936e..13943d753bb 100644 --- a/dlls/uxtheme/dialog.c +++ b/dlls/uxtheme/dialog.c @@ -129,9 +129,10 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, BOO case WM_ERASEBKGND: { dlgproc = (WNDPROC)GetWindowLongPtrW(hwnd, DWLP_DLGPROC); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, 0); lr = LOWORD(CallWindowProcW(dlgproc, hwnd, msg, wp, lp)); if (lr) - return lr; + return GetWindowLongPtrW(hwnd, DWLP_MSGRESULT); brush = get_dialog_background_brush(hwnd, TRUE); if (!brush) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 1308d54264b..2dc1975961c 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1889,7 +1889,6 @@ static void test_EnableThemeDialogTexture(void) /* Test that the dialog procedure should take precedence over DefDlgProc() for WM_ERASEBKGND */ handle_WM_ERASEBKGND = TRUE; lr = SendMessageW(dialog, WM_ERASEBKGND, (WPARAM)child_hdc, 0); - todo_wine ok(lr == 0, "Expected 0, got %#lx.\n", lr); handle_WM_ERASEBKGND = FALSE; -- 2.32.0

1 0

[PATCH 2/4] uxtheme/tests: Test WM_ERASEBKGND return value from custom dialog procedures.
by Zhiyi Zhang 24 Mar '22

24 Mar '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/tests/system.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 93b6f1aa8f7..1308d54264b 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1614,6 +1614,7 @@ static const struct message empty_seq[] = static HWND dialog_child; static DWORD dialog_init_flag; +static BOOL handle_WM_ERASEBKGND; static BOOL handle_WM_CTLCOLORSTATIC; static INT_PTR CALLBACK test_EnableThemeDialogTexture_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) @@ -1639,6 +1640,15 @@ static INT_PTR CALLBACK test_EnableThemeDialogTexture_proc(HWND hwnd, UINT msg, EnableThemeDialogTexture(hwnd, dialog_init_flag); return TRUE; + case WM_ERASEBKGND: + { + if (!handle_WM_ERASEBKGND) + return FALSE; + + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, 0); + return TRUE; + } + case WM_CTLCOLORSTATIC: return (INT_PTR)(handle_WM_CTLCOLORSTATIC ? GetSysColorBrush(COLOR_MENU) : 0); @@ -1876,6 +1886,13 @@ static void test_EnableThemeDialogTexture(void) GetSysColorBrush(COLOR_MENU), brush); handle_WM_CTLCOLORSTATIC = FALSE; + /* Test that the dialog procedure should take precedence over DefDlgProc() for WM_ERASEBKGND */ + handle_WM_ERASEBKGND = TRUE; + lr = SendMessageW(dialog, WM_ERASEBKGND, (WPARAM)child_hdc, 0); + todo_wine + ok(lr == 0, "Expected 0, got %#lx.\n", lr); + handle_WM_ERASEBKGND = FALSE; + /* Test that dialog doesn't have theme handle opened for itself */ ok(GetWindowTheme(dialog) == NULL, "Expected NULL theme handle.\n"); -- 2.32.0

1 0

[PATCH 1/4] uxtheme: Check only the lower 16 bits of the return value of WM_ERASEBKGND.
by Zhiyi Zhang 24 Mar '22

24 Mar '22

call_dialog_proc16() truncates the return values from 16-bit application window procedures to 16 bits. Since WINPROC_CallDlgProcA() is not available in uxtheme, CallWindowProcW() is used instead and the higher bits should be ignored as well. Wine-Bug-Id: https://bugs.winehq.org/show_bug.cgi?id=52713 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c index b91e20f0f33..706d170936e 100644 --- a/dlls/uxtheme/dialog.c +++ b/dlls/uxtheme/dialog.c @@ -129,7 +129,7 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, BOO case WM_ERASEBKGND: { dlgproc = (WNDPROC)GetWindowLongPtrW(hwnd, DWLP_DLGPROC); - lr = CallWindowProcW(dlgproc, hwnd, msg, wp, lp); + lr = LOWORD(CallWindowProcW(dlgproc, hwnd, msg, wp, lp)); if (lr) return lr; -- 2.32.0

1 0

[PATCH] dlls/windows.globalization: use a flexible array member for hstring_vector
by Eric Pouech 24 Mar '22

24 Mar '22

GCC 11 complains about accessing struct hstring_vector (-Warray-bounds) when the allocation is made for a 0-sized vector using a C99 flexible array member gets rid of the warnings Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/windows.globalization/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/windows.globalization/main.c b/dlls/windows.globalization/main.c index 3e5a59bde14..21ea2908679 100644 --- a/dlls/windows.globalization/main.c +++ b/dlls/windows.globalization/main.c @@ -54,9 +54,11 @@ struct hstring_vector LONG ref; ULONG count; - HSTRING values[1]; + HSTRING values[]; }; +C_ASSERT(sizeof(struct hstring_vector) == offsetof(struct hstring_vector, values[0])); + static inline struct hstring_vector *impl_from_IVectorView_HSTRING(IVectorView_HSTRING *iface) { return CONTAINING_RECORD(iface, struct hstring_vector, IVectorView_HSTRING_iface);

2 1

[PATCH vkd3d 1/2] vkd3d: Do not enable Vulkan-backed descriptor heaps if required update-after-bind features are missing.
by Conor McCarthy 24 Mar '22

24 Mar '22

descriptorBindingUniformBufferUpdateAfterBind is false for Intel Skylake (and maybe others). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/device.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index bd471a72..459aa615 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1657,7 +1657,12 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, * use only enough descriptors for the descriptor tables of the currently bound * root signature, and don't require a 32-bit push constant for each table. */ device->use_vk_heaps = vulkan_info->EXT_descriptor_indexing - && !(device->vkd3d_instance->config_flags & VKD3D_CONFIG_FLAG_VIRTUAL_HEAPS); + && !(device->vkd3d_instance->config_flags & VKD3D_CONFIG_FLAG_VIRTUAL_HEAPS) + && descriptor_indexing->descriptorBindingUniformBufferUpdateAfterBind + && descriptor_indexing->descriptorBindingSampledImageUpdateAfterBind + && descriptor_indexing->descriptorBindingStorageImageUpdateAfterBind + && descriptor_indexing->descriptorBindingUniformTexelBufferUpdateAfterBind + && descriptor_indexing->descriptorBindingStorageTexelBufferUpdateAfterBind; if (device->use_vk_heaps) vkd3d_device_vk_heaps_descriptor_limits_init(&vulkan_info->descriptor_limits, -- 2.34.1

4 6

[PATCH] dlls/ntdll/tests/threadpool.c: enable compilation with long types
by Eric Pouech 24 Mar '22

24 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/tests/threadpool.c | 749 +++++++++++++++++++++-------------------- 1 file changed, 375 insertions(+), 374 deletions(-) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 6c28d0642d7..80a36fc71cf 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #define NONAMELESSSTRUCT #define NONAMELESSUNION @@ -130,32 +131,32 @@ static void test_RtlQueueWorkItem(void) DWORD result; semaphore = CreateSemaphoreA(NULL, 0, 1, NULL); - ok(semaphore != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); + ok(semaphore != NULL, "CreateSemaphoreA failed %lu\n", GetLastError()); status = RtlQueueWorkItem(rtl_work_cb, semaphore, WT_EXECUTEDEFAULT); - ok(!status, "RtlQueueWorkItem failed with status %x\n", status); + ok(!status, "RtlQueueWorkItem failed with status %lx\n", status); result = WaitForSingleObject(semaphore, 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); status = RtlQueueWorkItem(rtl_work_cb, semaphore, WT_EXECUTEINIOTHREAD); - ok(!status, "RtlQueueWorkItem failed with status %x\n", status); + ok(!status, "RtlQueueWorkItem failed with status %lx\n", status); result = WaitForSingleObject(semaphore, 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); status = RtlQueueWorkItem(rtl_work_cb, semaphore, WT_EXECUTEINPERSISTENTTHREAD); - ok(!status, "RtlQueueWorkItem failed with status %x\n", status); + ok(!status, "RtlQueueWorkItem failed with status %lx\n", status); result = WaitForSingleObject(semaphore, 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); status = RtlQueueWorkItem(rtl_work_cb, semaphore, WT_EXECUTELONGFUNCTION); - ok(!status, "RtlQueueWorkItem failed with status %x\n", status); + ok(!status, "RtlQueueWorkItem failed with status %lx\n", status); result = WaitForSingleObject(semaphore, 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); status = RtlQueueWorkItem(rtl_work_cb, semaphore, WT_TRANSFER_IMPERSONATION); - ok(!status, "RtlQueueWorkItem failed with status %x\n", status); + ok(!status, "RtlQueueWorkItem failed with status %lx\n", status); result = WaitForSingleObject(semaphore, 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); CloseHandle(semaphore); } @@ -184,7 +185,7 @@ static void CALLBACK rtl_wait_cb(void *userdata, BOOLEAN timeout) if (info->semaphore2) { result = WaitForSingleObject(info->semaphore2, 200); - ok(result == info->wait_result, "expected %u, got %u\n", info->wait_result, result); + ok(result == info->wait_result, "expected %lu, got %lu\n", info->wait_result, result); ReleaseSemaphore(info->semaphore1, 1, NULL); } } @@ -219,257 +220,257 @@ static void test_RtlRegisterWait(void) wait1 = NULL; info.userdata = 0; status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, INFINITE, WT_EXECUTEDEFAULT); - ok(!status, "RtlRegisterWait failed with status %x\n", status); + ok(!status, "RtlRegisterWait failed with status %lx\n", status); ok(wait1 != NULL, "expected wait1 != NULL\n"); status = RtlDeregisterWait(wait1); - ok(!status, "RtlDeregisterWait failed with status %x\n", status); - ok(info.userdata == 0, "expected info.userdata = 0, got %u\n", info.userdata); + ok(!status, "RtlDeregisterWait failed with status %lx\n", status); + ok(info.userdata == 0, "expected info.userdata = 0, got %lu\n", info.userdata); /* infinite timeout, signal the semaphore two times */ info.userdata = 0; status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, INFINITE, WT_EXECUTEDEFAULT); - ok(!status, "RtlRegisterWait failed with status %x\n", status); + ok(!status, "RtlRegisterWait failed with status %lx\n", status); ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 1, "expected info.userdata = 1, got %u\n", info.userdata); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 1, "expected info.userdata = 1, got %lu\n", info.userdata); ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 2, "expected info.userdata = 2, got %u\n", info.userdata); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 2, "expected info.userdata = 2, got %lu\n", info.userdata); result = WaitForSingleObject(semaphores[1], 0); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); Sleep(50); status = RtlDeregisterWait(wait1); - ok(!status, "RtlDeregisterWait failed with status %x\n", status); + ok(!status, "RtlDeregisterWait failed with status %lx\n", status); /* repeat test with WT_EXECUTEONLYONCE */ info.userdata = 0; status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, INFINITE, WT_EXECUTEONLYONCE); - ok(!status, "RtlRegisterWait failed with status %x\n", status); + ok(!status, "RtlRegisterWait failed with status %lx\n", status); ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 1, "expected info.userdata = 1, got %u\n", info.userdata); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 1, "expected info.userdata = 1, got %lu\n", info.userdata); ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 1, "expected info.userdata = 1, got %u\n", info.userdata); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 1, "expected info.userdata = 1, got %lu\n", info.userdata); result = WaitForSingleObject(semaphores[1], 0); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); Sleep(50); status = RtlDeregisterWait(wait1); - ok(!status, "RtlDeregisterWait failed with status %x\n", status); + ok(!status, "RtlDeregisterWait failed with status %lx\n", status); /* finite timeout, no event */ info.userdata = 0; status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, 200, WT_EXECUTEDEFAULT); - ok(!status, "RtlRegisterWait failed with status %x\n", status); + ok(!status, "RtlRegisterWait failed with status %lx\n", status); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 0, "expected info.userdata = 0, got %u\n", info.userdata); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 0, "expected info.userdata = 0, got %lu\n", info.userdata); result = WaitForSingleObject(semaphores[0], 200); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %u\n", info.userdata); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %lu\n", info.userdata); result = WaitForSingleObject(semaphores[1], 0); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); Sleep(50); status = RtlDeregisterWait(wait1); - ok(!status, "RtlDeregisterWait failed with status %x\n", status); + ok(!status, "RtlDeregisterWait failed with status %lx\n", status); /* finite timeout, with event */ info.userdata = 0; status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, 200, WT_EXECUTEDEFAULT); - ok(!status, "RtlRegisterWait failed with status %x\n", status); + ok(!status, "RtlRegisterWait failed with status %lx\n", status); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 0, "expected info.userdata = 0, got %u\n", info.userdata); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 0, "expected info.userdata = 0, got %lu\n", info.userdata); ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 1, "expected info.userdata = 1, got %u\n", info.userdata); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 1, "expected info.userdata = 1, got %lu\n", info.userdata); result = WaitForSingleObject(semaphores[1], 0); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); Sleep(50); status = RtlDeregisterWait(wait1); - ok(!status, "RtlDeregisterWait failed with status %x\n", status); + ok(!status, "RtlDeregisterWait failed with status %lx\n", status); /* test RtlRegisterWait WT_EXECUTEINWAITTHREAD flag */ info.userdata = 0; info.threadid = 0; status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, 200, WT_EXECUTEINWAITTHREAD|WT_EXECUTEONLYONCE); - ok(!status, "RtlRegisterWait failed with status %x\n", status); + ok(!status, "RtlRegisterWait failed with status %lx\n", status); ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(semaphores[0], 200); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 1, "expected info.userdata = 1, got %u\n", info.userdata); - ok(info.threadid && info.threadid != GetCurrentThreadId(), "unexpected wait thread id %x\n", info.threadid); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 1, "expected info.userdata = 1, got %lu\n", info.userdata); + ok(info.threadid && info.threadid != GetCurrentThreadId(), "unexpected wait thread id %lx\n", info.threadid); threadid = info.threadid; result = WaitForSingleObject(semaphores[1], 0); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); Sleep(50); status = RtlDeregisterWait(wait1); - ok(!status, "RtlDeregisterWait failed with status %x\n", status); + ok(!status, "RtlDeregisterWait failed with status %lx\n", status); info.userdata = 0; info.threadid = 0; status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, 200, WT_EXECUTEINWAITTHREAD|WT_EXECUTEONLYONCE); - ok(!status, "RtlRegisterWait failed with status %x\n", status); + ok(!status, "RtlRegisterWait failed with status %lx\n", status); ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(semaphores[0], 200); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 1, "expected info.userdata = 1, got %u\n", info.userdata); - ok(info.threadid == threadid, "unexpected different wait thread id %x\n", info.threadid); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 1, "expected info.userdata = 1, got %lu\n", info.userdata); + ok(info.threadid == threadid, "unexpected different wait thread id %lx\n", info.threadid); result = WaitForSingleObject(semaphores[1], 0); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); Sleep(50); status = RtlDeregisterWait(wait1); - ok(!status, "RtlDeregisterWait failed with status %x\n", status); + ok(!status, "RtlDeregisterWait failed with status %lx\n", status); /* test RtlRegisterWait WT_EXECUTEINWAITTHREAD flag with 0 timeout */ info.userdata = 0; info.threadid = 0; status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, 0, WT_EXECUTEINWAITTHREAD|WT_EXECUTEONLYONCE); - ok(!status, "RtlRegisterWait failed with status %x\n", status); + ok(!status, "RtlRegisterWait failed with status %lx\n", status); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %u\n", info.userdata); - ok(info.threadid == threadid, "unexpected different wait thread id %x\n", info.threadid); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %lu\n", info.userdata); + ok(info.threadid == threadid, "unexpected different wait thread id %lx\n", info.threadid); result = WaitForSingleObject(semaphores[1], 0); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); Sleep(50); status = RtlDeregisterWait(wait1); - ok(!status, "RtlDeregisterWait failed with status %x\n", status); + ok(!status, "RtlDeregisterWait failed with status %lx\n", status); /* test RtlRegisterWait WT_EXECUTEINWAITTHREAD flag with already signaled event */ info.userdata = 0; info.threadid = 0; ReleaseSemaphore(semaphores[1], 1, NULL); status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, 200, WT_EXECUTEINWAITTHREAD|WT_EXECUTEONLYONCE); - ok(!status, "RtlRegisterWait failed with status %x\n", status); + ok(!status, "RtlRegisterWait failed with status %lx\n", status); result = WaitForSingleObject(semaphores[0], 200); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 1, "expected info.userdata = 1, got %u\n", info.userdata); - ok(info.threadid == threadid, "unexpected different wait thread id %x\n", info.threadid); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 1, "expected info.userdata = 1, got %lu\n", info.userdata); + ok(info.threadid == threadid, "unexpected different wait thread id %lx\n", info.threadid); result = WaitForSingleObject(semaphores[1], 0); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); Sleep(50); status = RtlDeregisterWait(wait1); - ok(!status, "RtlDeregisterWait failed with status %x\n", status); + ok(!status, "RtlDeregisterWait failed with status %lx\n", status); /* test for IO threads */ info.userdata = 0; info.threadid = 0; status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, INFINITE, WT_EXECUTEINIOTHREAD); - ok(!status, "RtlRegisterWait failed with status %x\n", status); + ok(!status, "RtlRegisterWait failed with status %lx\n", status); ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 1, "expected info.userdata = 1, got %u\n", info.userdata); - ok(info.threadid != 0, "expected info.threadid != 0, got %u\n", info.threadid); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 1, "expected info.userdata = 1, got %lu\n", info.userdata); + ok(info.threadid != 0, "expected info.threadid != 0, got %lu\n", info.threadid); thread = OpenThread(THREAD_SET_CONTEXT, FALSE, info.threadid); - ok(thread != NULL, "OpenThread failed with %u\n", GetLastError()); + ok(thread != NULL, "OpenThread failed with %lu\n", GetLastError()); rtl_wait_apc_semaphore = semaphores[0]; result = QueueUserAPC(rtl_wait_apc_cb, thread, 0); - ok(result != 0, "QueueUserAPC failed with %u\n", GetLastError()); + ok(result != 0, "QueueUserAPC failed with %lu\n", GetLastError()); result = WaitForSingleObject(semaphores[0], 200); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); rtl_wait_apc_semaphore = 0; CloseHandle(thread); ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 2, "expected info.userdata = 2, got %u\n", info.userdata); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 2, "expected info.userdata = 2, got %lu\n", info.userdata); Sleep(50); status = RtlDeregisterWait(wait1); - ok(!status, "RtlDeregisterWait failed with status %x\n", status); + ok(!status, "RtlDeregisterWait failed with status %lx\n", status); info.userdata = 0; info.threadid = 0; status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, INFINITE, WT_EXECUTEDEFAULT); - ok(!status, "RtlRegisterWait failed with status %x\n", status); + ok(!status, "RtlRegisterWait failed with status %lx\n", status); ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 1, "expected info.userdata = 1, got %u\n", info.userdata); - ok(info.threadid != 0, "expected info.threadid != 0, got %u\n", info.threadid); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 1, "expected info.userdata = 1, got %lu\n", info.userdata); + ok(info.threadid != 0, "expected info.threadid != 0, got %lu\n", info.threadid); thread = OpenThread(THREAD_SET_CONTEXT, FALSE, info.threadid); - ok(thread != NULL, "OpenThread failed with %u\n", GetLastError()); + ok(thread != NULL, "OpenThread failed with %lu\n", GetLastError()); rtl_wait_apc_semaphore = semaphores[0]; result = QueueUserAPC(rtl_wait_apc_cb, thread, 0); - ok(result != 0, "QueueUserAPC failed with %u\n", GetLastError()); + ok(result != 0, "QueueUserAPC failed with %lu\n", GetLastError()); result = WaitForSingleObject(semaphores[0], 200); ok(result == WAIT_TIMEOUT || broken(result == WAIT_OBJECT_0) /* >= Win Vista */, - "WaitForSingleObject returned %u\n", result); + "WaitForSingleObject returned %lu\n", result); rtl_wait_apc_semaphore = 0; CloseHandle(thread); ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 2, "expected info.userdata = 2, got %u\n", info.userdata); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 2, "expected info.userdata = 2, got %lu\n", info.userdata); Sleep(50); status = RtlDeregisterWait(wait1); - ok(!status, "RtlDeregisterWait failed with status %x\n", status); + ok(!status, "RtlDeregisterWait failed with status %lx\n", status); /* test RtlDeregisterWaitEx before wait expired */ info.userdata = 0; status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, INFINITE, WT_EXECUTEDEFAULT); - ok(!status, "RtlRegisterWait failed with status %x\n", status); + ok(!status, "RtlRegisterWait failed with status %lx\n", status); status = RtlDeregisterWaitEx(wait1, NULL); - ok(!status, "RtlDeregisterWaitEx failed with status %x\n", status); - ok(info.userdata == 0, "expected info.userdata = 0, got %u\n", info.userdata); + ok(!status, "RtlDeregisterWaitEx failed with status %lx\n", status); + ok(info.userdata == 0, "expected info.userdata = 0, got %lu\n", info.userdata); info.userdata = 0; status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, INFINITE, WT_EXECUTEDEFAULT); - ok(!status, "RtlRegisterWait failed with status %x\n", status); + ok(!status, "RtlRegisterWait failed with status %lx\n", status); status = RtlDeregisterWaitEx(wait1, INVALID_HANDLE_VALUE); - ok(!status, "RtlDeregisterWaitEx failed with status %x\n", status); - ok(info.userdata == 0, "expected info.userdata = 0, got %u\n", info.userdata); + ok(!status, "RtlDeregisterWaitEx failed with status %lx\n", status); + ok(info.userdata == 0, "expected info.userdata = 0, got %lu\n", info.userdata); info.userdata = 0; status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, INFINITE, WT_EXECUTEDEFAULT); - ok(!status, "RtlRegisterWait failed with status %x\n", status); + ok(!status, "RtlRegisterWait failed with status %lx\n", status); status = RtlDeregisterWaitEx(wait1, event); - ok(!status, "RtlDeregisterWaitEx failed with status %x\n", status); - ok(info.userdata == 0, "expected info.userdata = 0, got %u\n", info.userdata); + ok(!status, "RtlDeregisterWaitEx failed with status %lx\n", status); + ok(info.userdata == 0, "expected info.userdata = 0, got %lu\n", info.userdata); result = WaitForSingleObject(event, 200); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); /* test RtlDeregisterWaitEx after wait expired */ info.userdata = 0; status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, 0, WT_EXECUTEONLYONCE); - ok(!status, "RtlRegisterWait failed with status %x\n", status); + ok(!status, "RtlRegisterWait failed with status %lx\n", status); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %u\n", info.userdata); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %lu\n", info.userdata); Sleep(50); status = RtlDeregisterWaitEx(wait1, NULL); - ok(!status, "RtlDeregisterWaitEx failed with status %x\n", status); - ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %u\n", info.userdata); + ok(!status, "RtlDeregisterWaitEx failed with status %lx\n", status); + ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %lu\n", info.userdata); info.userdata = 0; status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, 0, WT_EXECUTEONLYONCE); - ok(!status, "RtlRegisterWait failed with status %x\n", status); + ok(!status, "RtlRegisterWait failed with status %lx\n", status); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %u\n", info.userdata); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %lu\n", info.userdata); Sleep(50); status = RtlDeregisterWaitEx(wait1, INVALID_HANDLE_VALUE); - ok(!status, "RtlDeregisterWaitEx failed with status %x\n", status); - ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %u\n", info.userdata); + ok(!status, "RtlDeregisterWaitEx failed with status %lx\n", status); + ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %lu\n", info.userdata); info.userdata = 0; status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, 0, WT_EXECUTEONLYONCE); - ok(!status, "RtlRegisterWait failed with status %x\n", status); + ok(!status, "RtlRegisterWait failed with status %lx\n", status); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %u\n", info.userdata); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %lu\n", info.userdata); Sleep(50); status = RtlDeregisterWaitEx(wait1, event); - ok(!status, "RtlDeregisterWaitEx failed with status %x\n", status); - ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %u\n", info.userdata); + ok(!status, "RtlDeregisterWaitEx failed with status %lx\n", status); + ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %lu\n", info.userdata); result = WaitForSingleObject(event, 200); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); /* test RtlDeregisterWaitEx while callback is running */ info.semaphore2 = semaphores[1]; @@ -477,84 +478,84 @@ static void test_RtlRegisterWait(void) info.userdata = 0; status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, INFINITE, WT_EXECUTEONLYONCE); - ok(!status, "RtlRegisterWait failed with status %x\n", status); + ok(!status, "RtlRegisterWait failed with status %lx\n", status); ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(semaphores[0], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 1, "expected info.userdata = 1, got %u\n", info.userdata); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 1, "expected info.userdata = 1, got %lu\n", info.userdata); status = RtlDeregisterWait(wait1); - ok(status == STATUS_PENDING, "expected STATUS_PENDING, got %x\n", status); + ok(status == STATUS_PENDING, "expected STATUS_PENDING, got %lx\n", status); ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(semaphores[0], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); info.userdata = 0; status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, INFINITE, WT_EXECUTEINWAITTHREAD|WT_EXECUTEONLYONCE); - ok(!status, "RtlRegisterWait failed with status %x\n", status); + ok(!status, "RtlRegisterWait failed with status %lx\n", status); ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(semaphores[0], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 1, "expected info.userdata = 1, got %u\n", info.userdata); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 1, "expected info.userdata = 1, got %lu\n", info.userdata); status = RtlDeregisterWait(wait1); - ok(status == STATUS_PENDING, "expected STATUS_PENDING, got %x\n", status); + ok(status == STATUS_PENDING, "expected STATUS_PENDING, got %lx\n", status); ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(semaphores[0], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); info.userdata = 0; status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, INFINITE, WT_EXECUTEONLYONCE); - ok(!status, "RtlRegisterWait failed with status %x\n", status); + ok(!status, "RtlRegisterWait failed with status %lx\n", status); ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(semaphores[0], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 1, "expected info.userdata = 1, got %u\n", info.userdata); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 1, "expected info.userdata = 1, got %lu\n", info.userdata); status = RtlDeregisterWaitEx(wait1, NULL); - ok(status == STATUS_PENDING, "expected STATUS_PENDING, got %x\n", status); + ok(status == STATUS_PENDING, "expected STATUS_PENDING, got %lx\n", status); ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(semaphores[0], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); info.wait_result = WAIT_TIMEOUT; info.userdata = 0; status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, INFINITE, WT_EXECUTEONLYONCE); - ok(!status, "RtlRegisterWait failed with status %x\n", status); + ok(!status, "RtlRegisterWait failed with status %lx\n", status); ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(semaphores[0], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 1, "expected info.userdata = 1, got %u\n", info.userdata); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 1, "expected info.userdata = 1, got %lu\n", info.userdata); status = RtlDeregisterWaitEx(wait1, INVALID_HANDLE_VALUE); - ok(!status, "RtlDeregisterWaitEx failed with status %x\n", status); + ok(!status, "RtlDeregisterWaitEx failed with status %lx\n", status); result = WaitForSingleObject(semaphores[0], 0); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); info.wait_result = WAIT_TIMEOUT; info.userdata = 0; status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, INFINITE, WT_EXECUTEINWAITTHREAD|WT_EXECUTEONLYONCE); - ok(!status, "RtlRegisterWait failed with status %x\n", status); + ok(!status, "RtlRegisterWait failed with status %lx\n", status); ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(semaphores[0], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 1, "expected info.userdata = 1, got %u\n", info.userdata); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 1, "expected info.userdata = 1, got %lu\n", info.userdata); status = RtlDeregisterWaitEx(wait1, INVALID_HANDLE_VALUE); - ok(!status, "RtlDeregisterWaitEx failed with status %x\n", status); + ok(!status, "RtlDeregisterWaitEx failed with status %lx\n", status); result = WaitForSingleObject(semaphores[0], 0); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); info.wait_result = WAIT_OBJECT_0; info.userdata = 0; status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, INFINITE, WT_EXECUTEONLYONCE); - ok(!status, "RtlRegisterWait failed with status %x\n", status); + ok(!status, "RtlRegisterWait failed with status %lx\n", status); ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(semaphores[0], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 1, "expected info.userdata = 1, got %u\n", info.userdata); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 1, "expected info.userdata = 1, got %lu\n", info.userdata); status = RtlDeregisterWaitEx(wait1, event); - ok(status == STATUS_PENDING, "expected STATUS_PENDING, got %x\n", status); + ok(status == STATUS_PENDING, "expected STATUS_PENDING, got %lx\n", status); ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(event, 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); result = WaitForSingleObject(semaphores[0], 0); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); CloseHandle(semaphores[0]); CloseHandle(semaphores[1]); @@ -586,21 +587,21 @@ static void test_tp_simple(void) int i; semaphore = CreateSemaphoreA(NULL, 0, 1, NULL); - ok(semaphore != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); + ok(semaphore != NULL, "CreateSemaphoreA failed %lu\n", GetLastError()); /* post the callback using the default threadpool */ memset(&environment, 0, sizeof(environment)); environment.Version = 1; environment.Pool = NULL; status = pTpSimpleTryPost(simple_cb, semaphore, &environment); - ok(!status, "TpSimpleTryPost failed with status %x\n", status); + ok(!status, "TpSimpleTryPost failed with status %lx\n", status); result = WaitForSingleObject(semaphore, 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); /* allocate new threadpool */ pool = NULL; status = pTpAllocPool(&pool, NULL); - ok(!status, "TpAllocPool failed with status %x\n", status); + ok(!status, "TpAllocPool failed with status %lx\n", status); ok(pool != NULL, "expected pool != NULL\n"); /* post the callback using the new threadpool */ @@ -608,9 +609,9 @@ static void test_tp_simple(void) environment.Version = 1; environment.Pool = pool; status = pTpSimpleTryPost(simple_cb, semaphore, &environment); - ok(!status, "TpSimpleTryPost failed with status %x\n", status); + ok(!status, "TpSimpleTryPost failed with status %lx\n", status); result = WaitForSingleObject(semaphore, 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); /* test with environment version 3 */ memset(&environment3, 0, sizeof(environment3)); @@ -622,15 +623,15 @@ static void test_tp_simple(void) { environment3.CallbackPriority = TP_CALLBACK_PRIORITY_HIGH + i; status = pTpSimpleTryPost(simple_cb, semaphore, (TP_CALLBACK_ENVIRON *)&environment3); - ok(!status, "TpSimpleTryPost failed with status %x\n", status); + ok(!status, "TpSimpleTryPost failed with status %lx\n", status); result = WaitForSingleObject(semaphore, 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); } environment3.CallbackPriority = 10; status = pTpSimpleTryPost(simple_cb, semaphore, (TP_CALLBACK_ENVIRON *)&environment3); ok(status == STATUS_INVALID_PARAMETER || broken(!status) /* Vista does not support priorities */, - "TpSimpleTryPost failed with status %x\n", status); + "TpSimpleTryPost failed with status %lx\n", status); /* test with invalid version number */ memset(&environment, 0, sizeof(environment)); @@ -639,17 +640,17 @@ static void test_tp_simple(void) status = pTpSimpleTryPost(simple_cb, semaphore, &environment); todo_wine ok(status == STATUS_INVALID_PARAMETER || broken(!status) /* Vista/2008 */, - "TpSimpleTryPost unexpectedly returned status %x\n", status); + "TpSimpleTryPost unexpectedly returned status %lx\n", status); if (!status) { result = WaitForSingleObject(semaphore, 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); } /* allocate a cleanup group for synchronization */ group = NULL; status = pTpAllocCleanupGroup(&group); - ok(!status, "TpAllocCleanupGroup failed with status %x\n", status); + ok(!status, "TpAllocCleanupGroup failed with status %lx\n", status); ok(group != NULL, "expected pool != NULL\n"); /* use cleanup group to wait for a simple callback */ @@ -659,9 +660,9 @@ static void test_tp_simple(void) environment.Pool = pool; environment.CleanupGroup = group; status = pTpSimpleTryPost(simple2_cb, &userdata, &environment); - ok(!status, "TpSimpleTryPost failed with status %x\n", status); + ok(!status, "TpSimpleTryPost failed with status %lx\n", status); pTpReleaseCleanupGroupMembers(group, FALSE, NULL); - ok(userdata == 1, "expected userdata = 1, got %u\n", userdata); + ok(userdata == 1, "expected userdata = 1, got %lu\n", userdata); /* test cancellation of pending simple callbacks */ userdata = 0; @@ -673,10 +674,10 @@ static void test_tp_simple(void) for (i = 0; i < 100; i++) { status = pTpSimpleTryPost(simple2_cb, &userdata, &environment); - ok(!status, "TpSimpleTryPost failed with status %x\n", status); + ok(!status, "TpSimpleTryPost failed with status %lx\n", status); } pTpReleaseCleanupGroupMembers(group, TRUE, NULL); - ok(userdata < 100, "expected userdata < 100, got %u\n", userdata); + ok(userdata < 100, "expected userdata < 100, got %lu\n", userdata); /* cleanup */ pTpReleaseCleanupGroup(group); @@ -708,7 +709,7 @@ static void test_tp_work(void) /* allocate new threadpool with only one thread */ pool = NULL; status = pTpAllocPool(&pool, NULL); - ok(!status, "TpAllocPool failed with status %x\n", status); + ok(!status, "TpAllocPool failed with status %lx\n", status); ok(pool != NULL, "expected pool != NULL\n"); pTpSetPoolMaxThreads(pool, 1); @@ -718,7 +719,7 @@ static void test_tp_work(void) environment.Version = 1; environment.Pool = pool; status = pTpAllocWork(&work, work_cb, &userdata, &environment); - ok(!status, "TpAllocWork failed with status %x\n", status); + ok(!status, "TpAllocWork failed with status %lx\n", status); ok(work != NULL, "expected work != NULL\n"); /* post 5 identical work items at once */ @@ -726,14 +727,14 @@ static void test_tp_work(void) for (i = 0; i < 5; i++) pTpPostWork(work); pTpWaitForWork(work, FALSE); - ok(userdata == 5, "expected userdata = 5, got %u\n", userdata); + ok(userdata == 5, "expected userdata = 5, got %lu\n", userdata); /* add more tasks and cancel them immediately */ userdata = 0; for (i = 0; i < 10; i++) pTpPostWork(work); pTpWaitForWork(work, TRUE); - ok(userdata < 10, "expected userdata < 10, got %u\n", userdata); + ok(userdata < 10, "expected userdata < 10, got %lu\n", userdata); /* cleanup */ pTpReleaseWork(work); @@ -753,14 +754,14 @@ static void test_tp_work_scheduler(void) /* allocate new threadpool with only one thread */ pool = NULL; status = pTpAllocPool(&pool, NULL); - ok(!status, "TpAllocPool failed with status %x\n", status); + ok(!status, "TpAllocPool failed with status %lx\n", status); ok(pool != NULL, "expected pool != NULL\n"); pTpSetPoolMaxThreads(pool, 1); /* create a cleanup group */ group = NULL; status = pTpAllocCleanupGroup(&group); - ok(!status, "TpAllocCleanupGroup failed with status %x\n", status); + ok(!status, "TpAllocCleanupGroup failed with status %lx\n", status); ok(group != NULL, "expected pool != NULL\n"); /* the first work item has no cleanup group associated */ @@ -769,7 +770,7 @@ static void test_tp_work_scheduler(void) environment.Version = 1; environment.Pool = pool; status = pTpAllocWork(&work, work_cb, &userdata, &environment); - ok(!status, "TpAllocWork failed with status %x\n", status); + ok(!status, "TpAllocWork failed with status %lx\n", status); ok(work != NULL, "expected work != NULL\n"); /* allocate a second work item with a cleanup group */ @@ -779,7 +780,7 @@ static void test_tp_work_scheduler(void) environment.Pool = pool; environment.CleanupGroup = group; status = pTpAllocWork(&work2, work2_cb, &userdata, &environment); - ok(!status, "TpAllocWork failed with status %x\n", status); + ok(!status, "TpAllocWork failed with status %lx\n", status); ok(work2 != NULL, "expected work2 != NULL\n"); /* the 'work' callbacks are not blocking execution of 'work2' callbacks */ @@ -791,8 +792,8 @@ static void test_tp_work_scheduler(void) Sleep(500); pTpWaitForWork(work, TRUE); pTpWaitForWork(work2, TRUE); - ok(userdata & 0xffff, "expected userdata & 0xffff != 0, got %u\n", userdata & 0xffff); - ok(userdata >> 16, "expected userdata >> 16 != 0, got %u\n", userdata >> 16); + ok(userdata & 0xffff, "expected userdata & 0xffff != 0, got %lu\n", userdata & 0xffff); + ok(userdata >> 16, "expected userdata >> 16 != 0, got %lu\n", userdata >> 16); /* test TpReleaseCleanupGroupMembers on a work item */ userdata = 0; @@ -802,8 +803,8 @@ static void test_tp_work_scheduler(void) pTpPostWork(work2); pTpReleaseCleanupGroupMembers(group, FALSE, NULL); pTpWaitForWork(work, TRUE); - ok((userdata & 0xffff) < 10, "expected userdata & 0xffff < 10, got %u\n", userdata & 0xffff); - ok((userdata >> 16) == 3, "expected userdata >> 16 == 3, got %u\n", userdata >> 16); + ok((userdata & 0xffff) < 10, "expected userdata & 0xffff < 10, got %lu\n", userdata & 0xffff); + ok((userdata >> 16) == 3, "expected userdata >> 16 == 3, got %lu\n", userdata >> 16); /* cleanup */ pTpReleaseWork(work); @@ -857,18 +858,18 @@ static void test_tp_group_wait(void) DWORD result; semaphore = CreateSemaphoreA(NULL, 0, 1, NULL); - ok(semaphore != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); + ok(semaphore != NULL, "CreateSemaphoreA failed %lu\n", GetLastError()); /* allocate new threadpool */ pool = NULL; status = pTpAllocPool(&pool, NULL); - ok(!status, "TpAllocPool failed with status %x\n", status); + ok(!status, "TpAllocPool failed with status %lx\n", status); ok(pool != NULL, "expected pool != NULL\n"); /* allocate a cleanup group */ group = NULL; status = pTpAllocCleanupGroup(&group); - ok(!status, "TpAllocCleanupGroup failed with status %x\n", status); + ok(!status, "TpAllocCleanupGroup failed with status %lx\n", status); ok(group != NULL, "expected pool != NULL\n"); /* release work object during TpReleaseCleanupGroupMembers */ @@ -878,11 +879,11 @@ static void test_tp_group_wait(void) environment.Pool = pool; environment.CleanupGroup = group; status = pTpAllocWork(&work, work_release_cb, semaphore, &environment); - ok(!status, "TpAllocWork failed with status %x\n", status); + ok(!status, "TpAllocWork failed with status %lx\n", status); ok(work != NULL, "expected work != NULL\n"); pTpPostWork(work); result = WaitForSingleObject(semaphore, 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); pTpReleaseCleanupGroupMembers(group, FALSE, NULL); /* release timer object during TpReleaseCleanupGroupMembers */ @@ -892,12 +893,12 @@ static void test_tp_group_wait(void) environment.Pool = pool; environment.CleanupGroup = group; status = pTpAllocTimer(&timer, timer_release_cb, semaphore, &environment); - ok(!status, "TpAllocTimer failed with status %x\n", status); + ok(!status, "TpAllocTimer failed with status %lx\n", status); ok(timer != NULL, "expected timer != NULL\n"); when.QuadPart = 0; pTpSetTimer(timer, &when, 0, 0); result = WaitForSingleObject(semaphore, 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); pTpReleaseCleanupGroupMembers(group, FALSE, NULL); /* release wait object during TpReleaseCleanupGroupMembers */ @@ -907,12 +908,12 @@ static void test_tp_group_wait(void) environment.Pool = pool; environment.CleanupGroup = group; status = pTpAllocWait(&wait, wait_release_cb, semaphore, &environment); - ok(!status, "TpAllocWait failed with status %x\n", status); + ok(!status, "TpAllocWait failed with status %lx\n", status); ok(wait != NULL, "expected wait != NULL\n"); when.QuadPart = 0; pTpSetWait(wait, INVALID_HANDLE_VALUE, &when); result = WaitForSingleObject(semaphore, 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); pTpReleaseCleanupGroupMembers(group, FALSE, NULL); /* cleanup */ @@ -932,13 +933,13 @@ static void CALLBACK simple_group_cancel_cb(TP_CALLBACK_INSTANCE *instance, void status = pTpCallbackMayRunLong(instance); ok(status == STATUS_TOO_MANY_THREADS || broken(status == 1) /* Win Vista / 2008 */, - "expected STATUS_TOO_MANY_THREADS, got %08x\n", status); + "expected STATUS_TOO_MANY_THREADS, got %08lx\n", status); ReleaseSemaphore(semaphores[1], 1, NULL); for (i = 0; i < 4; i++) { result = WaitForSingleObject(semaphores[0], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); } ReleaseSemaphore(semaphores[1], 1, NULL); } @@ -950,7 +951,7 @@ static void CALLBACK work_group_cancel_cb(TP_CALLBACK_INSTANCE *instance, void * ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(semaphores[0], 200); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); } static void CALLBACK group_cancel_cleanup_release_cb(void *object, void *userdata) @@ -1016,21 +1017,21 @@ static void test_tp_group_cancel(void) int i; semaphores[0] = CreateSemaphoreA(NULL, 0, 4, NULL); - ok(semaphores[0] != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); + ok(semaphores[0] != NULL, "CreateSemaphoreA failed %lu\n", GetLastError()); semaphores[1] = CreateSemaphoreA(NULL, 0, 1, NULL); - ok(semaphores[1] != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); + ok(semaphores[1] != NULL, "CreateSemaphoreA failed %lu\n", GetLastError()); /* allocate new threadpool with only one thread */ pool = NULL; status = pTpAllocPool(&pool, NULL); - ok(!status, "TpAllocPool failed with status %x\n", status); + ok(!status, "TpAllocPool failed with status %lx\n", status); ok(pool != NULL, "expected pool != NULL\n"); pTpSetPoolMaxThreads(pool, 1); /* allocate a cleanup group */ group = NULL; status = pTpAllocCleanupGroup(&group); - ok(!status, "TpAllocCleanupGroup failed with status %x\n", status); + ok(!status, "TpAllocCleanupGroup failed with status %lx\n", status); ok(group != NULL, "expected pool != NULL\n"); /* test execution of cancellation callback */ @@ -1038,9 +1039,9 @@ static void test_tp_group_cancel(void) environment.Version = 1; environment.Pool = pool; status = pTpSimpleTryPost(simple_group_cancel_cb, semaphores, &environment); - ok(!status, "TpSimpleTryPost failed with status %x\n", status); + ok(!status, "TpSimpleTryPost failed with status %lx\n", status); result = WaitForSingleObject(semaphores[1], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); memset(&environment, 0, sizeof(environment)); environment.Version = 1; @@ -1048,28 +1049,28 @@ static void test_tp_group_cancel(void) environment.CleanupGroup = group; environment.CleanupGroupCancelCallback = group_cancel_cleanup_release_cb; status = pTpSimpleTryPost(unexpected_simple_cb, (void *)0xdeadbeef, &environment); - ok(!status, "TpSimpleTryPost failed with status %x\n", status); + ok(!status, "TpSimpleTryPost failed with status %lx\n", status); work = NULL; status = pTpAllocWork(&work, unexpected_work_cb, (void *)0xdeadbeef, &environment); - ok(!status, "TpAllocWork failed with status %x\n", status); + ok(!status, "TpAllocWork failed with status %lx\n", status); ok(work != NULL, "expected work != NULL\n"); timer = NULL; status = pTpAllocTimer(&timer, unexpected_timer_cb, (void *)0xdeadbeef, &environment); - ok(!status, "TpAllocTimer failed with status %x\n", status); + ok(!status, "TpAllocTimer failed with status %lx\n", status); ok(timer != NULL, "expected timer != NULL\n"); wait = NULL; status = pTpAllocWait(&wait, unexpected_wait_cb, (void *)0xdeadbeef, &environment); - ok(!status, "TpAllocWait failed with status %x\n", status); + ok(!status, "TpAllocWait failed with status %lx\n", status); ok(wait != NULL, "expected wait != NULL\n"); group_cancel_tid = 0xdeadbeef; pTpReleaseCleanupGroupMembers(group, TRUE, semaphores); result = WaitForSingleObject(semaphores[1], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(group_cancel_tid == GetCurrentThreadId(), "expected tid %x, got %x\n", + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(group_cancel_tid == GetCurrentThreadId(), "expected tid %lx, got %lx\n", GetCurrentThreadId(), group_cancel_tid); /* test if cancellation callbacks are executed before or after wait */ @@ -1080,19 +1081,19 @@ static void test_tp_group_cancel(void) environment.CleanupGroup = group; environment.CleanupGroupCancelCallback = group_cancel_cleanup_release2_cb; status = pTpAllocWork(&work, work_group_cancel_cb, semaphores, &environment); - ok(!status, "TpAllocWork failed with status %x\n", status); + ok(!status, "TpAllocWork failed with status %lx\n", status); ok(work != NULL, "expected work != NULL\n"); pTpPostWork(work); pTpPostWork(work); result = WaitForSingleObject(semaphores[1], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); group_cancel_tid = 0xdeadbeef; pTpReleaseCleanupGroupMembers(group, TRUE, semaphores); result = WaitForSingleObject(semaphores[0], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(group_cancel_tid == GetCurrentThreadId(), "expected tid %x, got %x\n", + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(group_cancel_tid == GetCurrentThreadId(), "expected tid %lx, got %lx\n", GetCurrentThreadId(), group_cancel_tid); /* group cancel callback is not executed if object is destroyed while waiting */ @@ -1103,12 +1104,12 @@ static void test_tp_group_cancel(void) environment.CleanupGroup = group; environment.CleanupGroupCancelCallback = unexpected_group_cancel_cleanup_cb; status = pTpAllocWork(&work, work_release_cb, semaphores[1], &environment); - ok(!status, "TpAllocWork failed with status %x\n", status); + ok(!status, "TpAllocWork failed with status %lx\n", status); ok(work != NULL, "expected work != NULL\n"); pTpPostWork(work); result = WaitForSingleObject(semaphores[1], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); pTpReleaseCleanupGroupMembers(group, TRUE, NULL); /* terminated simple callbacks should not trigger the group cancel callback */ @@ -1118,9 +1119,9 @@ static void test_tp_group_cancel(void) environment.CleanupGroup = group; environment.CleanupGroupCancelCallback = unexpected_group_cancel_cleanup_cb; status = pTpSimpleTryPost(simple_release_cb, semaphores[1], &environment); - ok(!status, "TpSimpleTryPost failed with status %x\n", status); + ok(!status, "TpSimpleTryPost failed with status %lx\n", status); result = WaitForSingleObject(semaphores[1], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); pTpReleaseCleanupGroupMembers(group, TRUE, semaphores); /* test cancellation callback for objects with multiple instances */ @@ -1131,7 +1132,7 @@ static void test_tp_group_cancel(void) environment.CleanupGroup = group; environment.CleanupGroupCancelCallback = group_cancel_cleanup_increment_cb; status = pTpAllocWork(&work, work_cb, &userdata, &environment); - ok(!status, "TpAllocWork failed with status %x\n", status); + ok(!status, "TpAllocWork failed with status %lx\n", status); ok(work != NULL, "expected work != NULL\n"); /* post 10 identical work items at once */ @@ -1142,9 +1143,9 @@ static void test_tp_group_cancel(void) /* check if we get multiple cancellation callbacks */ group_cancel_tid = 0xdeadbeef; pTpReleaseCleanupGroupMembers(group, TRUE, &userdata2); - ok(userdata <= 5, "expected userdata <= 5, got %u\n", userdata); - ok(userdata2 == 1, "expected only one cancellation callback, got %u\n", userdata2); - ok(group_cancel_tid == GetCurrentThreadId(), "expected tid %x, got %x\n", + ok(userdata <= 5, "expected userdata <= 5, got %lu\n", userdata); + ok(userdata2 == 1, "expected only one cancellation callback, got %lu\n", userdata2); + ok(group_cancel_tid == GetCurrentThreadId(), "expected tid %lx, got %lx\n", GetCurrentThreadId(), group_cancel_tid); /* cleanup */ @@ -1167,7 +1168,7 @@ static void CALLBACK instance_finalization_cb(TP_CALLBACK_INSTANCE *instance, vo Sleep(50); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); ReleaseSemaphore(semaphores[1], 1, NULL); } @@ -1187,7 +1188,7 @@ static void test_tp_instance(void) /* allocate new threadpool */ pool = NULL; status = pTpAllocPool(&pool, NULL); - ok(!status, "TpAllocPool failed with status %x\n", status); + ok(!status, "TpAllocPool failed with status %lx\n", status); ok(pool != NULL, "expected pool != NULL\n"); /* test for TpCallbackReleaseSemaphoreOnCompletion */ @@ -1195,9 +1196,9 @@ static void test_tp_instance(void) environment.Version = 1; environment.Pool = pool; status = pTpSimpleTryPost(instance_semaphore_completion_cb, semaphores, &environment); - ok(!status, "TpSimpleTryPost failed with status %x\n", status); + ok(!status, "TpSimpleTryPost failed with status %lx\n", status); result = WaitForSingleObject(semaphores[0], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); /* test for finalization callback */ memset(&environment, 0, sizeof(environment)); @@ -1205,11 +1206,11 @@ static void test_tp_instance(void) environment.Pool = pool; environment.FinalizationCallback = instance_finalization_cb; status = pTpSimpleTryPost(instance_semaphore_completion_cb, semaphores, &environment); - ok(!status, "TpSimpleTryPost failed with status %x\n", status); + ok(!status, "TpSimpleTryPost failed with status %lx\n", status); result = WaitForSingleObject(semaphores[0], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); result = WaitForSingleObject(semaphores[1], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); /* cleanup */ pTpReleasePool(pool); @@ -1224,7 +1225,7 @@ static void CALLBACK disassociate_cb(TP_CALLBACK_INSTANCE *instance, void *userd pTpDisassociateCallback(instance); result = WaitForSingleObject(semaphores[0], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); ReleaseSemaphore(semaphores[1], 1, NULL); } @@ -1235,7 +1236,7 @@ static void CALLBACK disassociate2_cb(TP_CALLBACK_INSTANCE *instance, void *user pTpDisassociateCallback(instance); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); ReleaseSemaphore(semaphores[1], 1, NULL); } @@ -1246,7 +1247,7 @@ static void CALLBACK disassociate3_cb(TP_CALLBACK_INSTANCE *instance, void *user pTpDisassociateCallback(instance); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); ReleaseSemaphore(semaphores[1], 1, NULL); } @@ -1268,12 +1269,12 @@ static void test_tp_disassociate(void) /* allocate new threadpool and cleanup group */ pool = NULL; status = pTpAllocPool(&pool, NULL); - ok(!status, "TpAllocPool failed with status %x\n", status); + ok(!status, "TpAllocPool failed with status %lx\n", status); ok(pool != NULL, "expected pool != NULL\n"); group = NULL; status = pTpAllocCleanupGroup(&group); - ok(!status, "TpAllocCleanupGroup failed with status %x\n", status); + ok(!status, "TpAllocCleanupGroup failed with status %lx\n", status); ok(group != NULL, "expected pool != NULL\n"); /* test TpDisassociateCallback on work objects without group */ @@ -1282,17 +1283,17 @@ static void test_tp_disassociate(void) environment.Version = 1; environment.Pool = pool; status = pTpAllocWork(&work, disassociate_cb, semaphores, &environment); - ok(!status, "TpAllocWork failed with status %x\n", status); + ok(!status, "TpAllocWork failed with status %lx\n", status); ok(work != NULL, "expected work != NULL\n"); pTpPostWork(work); pTpWaitForWork(work, FALSE); result = WaitForSingleObject(semaphores[1], 100); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); ReleaseSemaphore(semaphores[0], 1, NULL); result = WaitForSingleObject(semaphores[1], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); pTpReleaseWork(work); /* test TpDisassociateCallback on work objects with group (1) */ @@ -1302,17 +1303,17 @@ static void test_tp_disassociate(void) environment.Pool = pool; environment.CleanupGroup = group; status = pTpAllocWork(&work, disassociate_cb, semaphores, &environment); - ok(!status, "TpAllocWork failed with status %x\n", status); + ok(!status, "TpAllocWork failed with status %lx\n", status); ok(work != NULL, "expected work != NULL\n"); pTpPostWork(work); pTpWaitForWork(work, FALSE); result = WaitForSingleObject(semaphores[1], 100); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); ReleaseSemaphore(semaphores[0], 1, NULL); result = WaitForSingleObject(semaphores[1], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); pTpReleaseCleanupGroupMembers(group, FALSE, NULL); /* test TpDisassociateCallback on work objects with group (2) */ @@ -1322,7 +1323,7 @@ static void test_tp_disassociate(void) environment.Pool = pool; environment.CleanupGroup = group; status = pTpAllocWork(&work, disassociate2_cb, semaphores, &environment); - ok(!status, "TpAllocWork failed with status %x\n", status); + ok(!status, "TpAllocWork failed with status %lx\n", status); ok(work != NULL, "expected work != NULL\n"); pTpPostWork(work); @@ -1330,9 +1331,9 @@ static void test_tp_disassociate(void) ReleaseSemaphore(semaphores[0], 1, NULL); result = WaitForSingleObject(semaphores[1], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); result = WaitForSingleObject(semaphores[0], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); /* test TpDisassociateCallback on simple callbacks */ memset(&environment, 0, sizeof(environment)); @@ -1340,15 +1341,15 @@ static void test_tp_disassociate(void) environment.Pool = pool; environment.CleanupGroup = group; status = pTpSimpleTryPost(disassociate3_cb, semaphores, &environment); - ok(!status, "TpSimpleTryPost failed with status %x\n", status); + ok(!status, "TpSimpleTryPost failed with status %lx\n", status); pTpReleaseCleanupGroupMembers(group, FALSE, NULL); ReleaseSemaphore(semaphores[0], 1, NULL); result = WaitForSingleObject(semaphores[1], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); result = WaitForSingleObject(semaphores[0], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); /* cleanup */ pTpReleaseCleanupGroup(group); @@ -1376,12 +1377,12 @@ static void test_tp_timer(void) int i; semaphore = CreateSemaphoreA(NULL, 0, 1, NULL); - ok(semaphore != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); + ok(semaphore != NULL, "CreateSemaphoreA failed %lu\n", GetLastError()); /* allocate new threadpool */ pool = NULL; status = pTpAllocPool(&pool, NULL); - ok(!status, "TpAllocPool failed with status %x\n", status); + ok(!status, "TpAllocPool failed with status %lx\n", status); ok(pool != NULL, "expected pool != NULL\n"); /* allocate new timer */ @@ -1390,7 +1391,7 @@ static void test_tp_timer(void) environment.Version = 1; environment.Pool = pool; status = pTpAllocTimer(&timer, timer_cb, semaphore, &environment); - ok(!status, "TpAllocTimer failed with status %x\n", status); + ok(!status, "TpAllocTimer failed with status %lx\n", status); ok(timer != NULL, "expected timer != NULL\n"); success = pTpIsTimerSet(timer); @@ -1405,9 +1406,9 @@ static void test_tp_timer(void) pTpWaitForTimer(timer, FALSE); result = WaitForSingleObject(semaphore, 100); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); result = WaitForSingleObject(semaphore, 200); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); success = pTpIsTimerSet(timer); ok(success, "TpIsTimerSet returned FALSE\n"); @@ -1421,9 +1422,9 @@ static void test_tp_timer(void) pTpWaitForTimer(timer, FALSE); result = WaitForSingleObject(semaphore, 100); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); result = WaitForSingleObject(semaphore, 200); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); success = pTpIsTimerSet(timer); ok(success, "TpIsTimerSet returned FALSE\n"); @@ -1436,7 +1437,7 @@ static void test_tp_timer(void) pTpWaitForTimer(timer, FALSE); result = WaitForSingleObject(semaphore, 50); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); success = pTpIsTimerSet(timer); ok(success, "TpIsTimerSet returned FALSE\n"); @@ -1450,7 +1451,7 @@ static void test_tp_timer(void) CloseHandle(semaphore); semaphore = CreateSemaphoreA(NULL, 0, 3, NULL); - ok(semaphore != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); + ok(semaphore != NULL, "CreateSemaphoreA failed %lu\n", GetLastError()); /* allocate a new timer */ timer = NULL; @@ -1458,7 +1459,7 @@ static void test_tp_timer(void) environment.Version = 1; environment.Pool = pool; status = pTpAllocTimer(&timer, timer_cb, semaphore, &environment); - ok(!status, "TpAllocTimer failed with status %x\n", status); + ok(!status, "TpAllocTimer failed with status %lx\n", status); ok(timer != NULL, "expected timer != NULL\n"); /* test a relative timeout repeated periodically */ @@ -1472,11 +1473,11 @@ static void test_tp_timer(void) for (i = 0; i < 3; i++) { result = WaitForSingleObject(semaphore, 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); } ticks = GetTickCount() - ticks; ok(ticks >= 500 && (ticks <= 700 || broken(ticks <= 750)) /* Win 7 */, - "expected approximately 600 ticks, got %u\n", ticks); + "expected approximately 600 ticks, got %lu\n", ticks); /* unset the timer */ pTpSetTimer(timer, NULL, 0, 0); @@ -1516,12 +1517,12 @@ static void test_tp_window_length(void) BOOL merged; semaphore = CreateSemaphoreA(NULL, 0, 2, NULL); - ok(semaphore != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); + ok(semaphore != NULL, "CreateSemaphoreA failed %lu\n", GetLastError()); /* allocate new threadpool */ pool = NULL; status = pTpAllocPool(&pool, NULL); - ok(!status, "TpAllocPool failed with status %x\n", status); + ok(!status, "TpAllocPool failed with status %lx\n", status); ok(pool != NULL, "expected pool != NULL\n"); /* allocate two identical timers */ @@ -1532,13 +1533,13 @@ static void test_tp_window_length(void) timer1 = NULL; info1.semaphore = semaphore; status = pTpAllocTimer(&timer1, window_length_cb, &info1, &environment); - ok(!status, "TpAllocTimer failed with status %x\n", status); + ok(!status, "TpAllocTimer failed with status %lx\n", status); ok(timer1 != NULL, "expected timer1 != NULL\n"); timer2 = NULL; info2.semaphore = semaphore; status = pTpAllocTimer(&timer2, window_length_cb, &info2, &environment); - ok(!status, "TpAllocTimer failed with status %x\n", status); + ok(!status, "TpAllocTimer failed with status %lx\n", status); ok(timer2 != NULL, "expected timer2 != NULL\n"); /* choose parameters so that timers are not merged */ @@ -1553,9 +1554,9 @@ static void test_tp_window_length(void) pTpSetTimer(timer1, &when, 0, 75); result = WaitForSingleObject(semaphore, 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); result = WaitForSingleObject(semaphore, 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); ok(info1.ticks != 0 && info2.ticks != 0, "expected that ticks are nonzero\n"); ok(info2.ticks >= info1.ticks + 75 || broken(info2.ticks < info1.ticks + 75) /* Win 2008 */, "expected that timers are not merged\n"); @@ -1572,9 +1573,9 @@ static void test_tp_window_length(void) pTpSetTimer(timer1, &when, 0, 200); result = WaitForSingleObject(semaphore, 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); result = WaitForSingleObject(semaphore, 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); ok(info1.ticks != 0 && info2.ticks != 0, "expected that ticks are nonzero\n"); merged = info2.ticks >= info1.ticks - 50 && info2.ticks <= info1.ticks + 50; ok(merged || broken(!merged) /* Win 10 */, "expected that timers are merged\n"); @@ -1591,9 +1592,9 @@ static void test_tp_window_length(void) pTpSetTimer(timer2, &when, 0, 0); result = WaitForSingleObject(semaphore, 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); result = WaitForSingleObject(semaphore, 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); ok(info1.ticks != 0 && info2.ticks != 0, "expected that ticks are nonzero\n"); merged = info2.ticks >= info1.ticks - 50 && info2.ticks <= info1.ticks + 50; todo_wine @@ -1621,7 +1622,7 @@ static void CALLBACK wait_cb(TP_CALLBACK_INSTANCE *instance, void *userdata, else if (result == WAIT_TIMEOUT) InterlockedExchangeAdd(&info->userdata, 0x10000); else - ok(0, "unexpected result %u\n", result); + ok(0, "unexpected result %lu\n", result); ReleaseSemaphore(info->semaphore, 1, NULL); } @@ -1645,7 +1646,7 @@ static void test_tp_wait(void) /* allocate new threadpool */ pool = NULL; status = pTpAllocPool(&pool, NULL); - ok(!status, "TpAllocPool failed with status %x\n", status); + ok(!status, "TpAllocPool failed with status %lx\n", status); ok(pool != NULL, "expected pool != NULL\n"); /* allocate new wait items */ @@ -1655,12 +1656,12 @@ static void test_tp_wait(void) wait1 = NULL; status = pTpAllocWait(&wait1, wait_cb, &info, &environment); - ok(!status, "TpAllocWait failed with status %x\n", status); + ok(!status, "TpAllocWait failed with status %lx\n", status); ok(wait1 != NULL, "expected wait1 != NULL\n"); wait2 = NULL; status = pTpAllocWait(&wait2, wait_cb, &info, &environment); - ok(!status, "TpAllocWait failed with status %x\n", status); + ok(!status, "TpAllocWait failed with status %lx\n", status); ok(wait2 != NULL, "expected wait2 != NULL\n"); /* infinite timeout, signal the semaphore immediately */ @@ -1668,79 +1669,79 @@ static void test_tp_wait(void) pTpSetWait(wait1, semaphores[1], NULL); ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 1, "expected info.userdata = 1, got %u\n", info.userdata); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 1, "expected info.userdata = 1, got %lu\n", info.userdata); result = WaitForSingleObject(semaphores[1], 0); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); /* relative timeout, no event */ info.userdata = 0; when.QuadPart = (ULONGLONG)200 * -10000; pTpSetWait(wait1, semaphores[1], &when); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 0, "expected info.userdata = 0, got %u\n", info.userdata); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 0, "expected info.userdata = 0, got %lu\n", info.userdata); result = WaitForSingleObject(semaphores[0], 200); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %u\n", info.userdata); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %lu\n", info.userdata); result = WaitForSingleObject(semaphores[1], 0); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); /* repeat test with call to TpWaitForWait(..., TRUE) */ info.userdata = 0; when.QuadPart = (ULONGLONG)200 * -10000; pTpSetWait(wait1, semaphores[1], &when); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); pTpWaitForWait(wait1, TRUE); - ok(info.userdata == 0, "expected info.userdata = 0, got %u\n", info.userdata); + ok(info.userdata == 0, "expected info.userdata = 0, got %lu\n", info.userdata); result = WaitForSingleObject(semaphores[0], 200); ok(result == WAIT_OBJECT_0 || broken(result == WAIT_TIMEOUT) /* Win 8 */, - "WaitForSingleObject returned %u\n", result); + "WaitForSingleObject returned %lu\n", result); if (result == WAIT_OBJECT_0) - ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %u\n", info.userdata); + ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %lu\n", info.userdata); else - ok(info.userdata == 0, "expected info.userdata = 0, got %u\n", info.userdata); + ok(info.userdata == 0, "expected info.userdata = 0, got %lu\n", info.userdata); result = WaitForSingleObject(semaphores[1], 0); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); /* relative timeout, with event */ info.userdata = 0; when.QuadPart = (ULONGLONG)200 * -10000; pTpSetWait(wait1, semaphores[1], &when); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 0, "expected info.userdata = 0, got %u\n", info.userdata); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 0, "expected info.userdata = 0, got %lu\n", info.userdata); ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 1, "expected info.userdata = 1, got %u\n", info.userdata); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 1, "expected info.userdata = 1, got %lu\n", info.userdata); result = WaitForSingleObject(semaphores[1], 0); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); /* repeat test with call to TpWaitForWait(..., TRUE) */ info.userdata = 0; when.QuadPart = (ULONGLONG)200 * -10000; pTpSetWait(wait1, semaphores[1], &when); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); pTpWaitForWait(wait1, TRUE); - ok(info.userdata == 0, "expected info.userdata = 0, got %u\n", info.userdata); + ok(info.userdata == 0, "expected info.userdata = 0, got %lu\n", info.userdata); ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(semaphores[0], 100); ok(result == WAIT_OBJECT_0 || broken(result == WAIT_TIMEOUT) /* Win 8 */, - "WaitForSingleObject returned %u\n", result); + "WaitForSingleObject returned %lu\n", result); if (result == WAIT_OBJECT_0) { - ok(info.userdata == 1, "expected info.userdata = 1, got %u\n", info.userdata); + ok(info.userdata == 1, "expected info.userdata = 1, got %lu\n", info.userdata); result = WaitForSingleObject(semaphores[1], 0); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); } else { - ok(info.userdata == 0, "expected info.userdata = 0, got %u\n", info.userdata); + ok(info.userdata == 0, "expected info.userdata = 0, got %lu\n", info.userdata); result = WaitForSingleObject(semaphores[1], 0); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); } /* absolute timeout, no event */ @@ -1749,13 +1750,13 @@ static void test_tp_wait(void) when.QuadPart += (ULONGLONG)200 * 10000; pTpSetWait(wait1, semaphores[1], &when); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 0, "expected info.userdata = 0, got %u\n", info.userdata); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 0, "expected info.userdata = 0, got %lu\n", info.userdata); result = WaitForSingleObject(semaphores[0], 200); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %u\n", info.userdata); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %lu\n", info.userdata); result = WaitForSingleObject(semaphores[1], 0); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); /* absolute timeout, with event */ info.userdata = 0; @@ -1763,63 +1764,63 @@ static void test_tp_wait(void) when.QuadPart += (ULONGLONG)200 * 10000; pTpSetWait(wait1, semaphores[1], &when); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 0, "expected info.userdata = 0, got %u\n", info.userdata); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 0, "expected info.userdata = 0, got %lu\n", info.userdata); ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 1, "expected info.userdata = 1, got %u\n", info.userdata); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 1, "expected info.userdata = 1, got %lu\n", info.userdata); result = WaitForSingleObject(semaphores[1], 0); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); /* test timeout of zero */ info.userdata = 0; when.QuadPart = 0; pTpSetWait(wait1, semaphores[1], &when); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %u\n", info.userdata); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %lu\n", info.userdata); result = WaitForSingleObject(semaphores[1], 0); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); /* cancel a pending wait */ info.userdata = 0; when.QuadPart = (ULONGLONG)250 * -10000; pTpSetWait(wait1, semaphores[1], &when); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); pTpSetWait(wait1, NULL, (void *)0xdeadbeef); Sleep(50); ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 0, "expected info.userdata = 0, got %u\n", info.userdata); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 0, "expected info.userdata = 0, got %lu\n", info.userdata); result = WaitForSingleObject(semaphores[1], 0); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); /* test with INVALID_HANDLE_VALUE */ info.userdata = 0; when.QuadPart = 0; pTpSetWait(wait1, INVALID_HANDLE_VALUE, &when); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %u\n", info.userdata); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %lu\n", info.userdata); /* cancel a pending wait with INVALID_HANDLE_VALUE */ info.userdata = 0; when.QuadPart = (ULONGLONG)250 * -10000; pTpSetWait(wait1, semaphores[1], &when); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); when.QuadPart = 0; pTpSetWait(wait1, INVALID_HANDLE_VALUE, &when); Sleep(50); ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %u\n", info.userdata); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %lu\n", info.userdata); result = WaitForSingleObject(semaphores[1], 0); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); CloseHandle(semaphores[1]); semaphores[1] = CreateSemaphoreW(NULL, 0, 2, NULL); @@ -1832,12 +1833,12 @@ static void test_tp_wait(void) Sleep(50); ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 1, "expected info.userdata = 1, got %u\n", info.userdata); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 1, "expected info.userdata = 1, got %lu\n", info.userdata); result = WaitForSingleObject(semaphores[1], 0); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); /* repeat test above with release count 2 */ info.userdata = 0; @@ -1846,12 +1847,12 @@ static void test_tp_wait(void) Sleep(50); result = ReleaseSemaphore(semaphores[1], 2, NULL); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(info.userdata == 2, "expected info.userdata = 2, got %u\n", info.userdata); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(info.userdata == 2, "expected info.userdata = 2, got %lu\n", info.userdata); result = WaitForSingleObject(semaphores[1], 0); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); /* cleanup */ pTpReleaseWait(wait1); @@ -1876,7 +1877,7 @@ static void CALLBACK multi_wait_cb(TP_CALLBACK_INSTANCE *instance, void *userdat else if (result == WAIT_TIMEOUT) multi_wait_info.result = 0x10000 | index; else - ok(0, "unexpected result %u\n", result); + ok(0, "unexpected result %lu\n", result); ReleaseSemaphore(multi_wait_info.semaphore, 1, NULL); } @@ -1899,7 +1900,7 @@ static void test_tp_multi_wait(void) /* allocate new threadpool */ pool = NULL; status = pTpAllocPool(&pool, NULL); - ok(!status, "TpAllocPool failed with status %x\n", status); + ok(!status, "TpAllocPool failed with status %lx\n", status); ok(pool != NULL, "expected pool != NULL\n"); memset(&environment, 0, sizeof(environment)); @@ -1914,7 +1915,7 @@ static void test_tp_multi_wait(void) waits[i] = NULL; status = pTpAllocWait(&waits[i], multi_wait_cb, (void *)(DWORD_PTR)i, &environment); - ok(!status, "TpAllocWait failed with status %x\n", status); + ok(!status, "TpAllocWait failed with status %lx\n", status); ok(waits[i] != NULL, "expected waits[%d] != NULL\n", i); pTpSetWait(waits[i], semaphores[i], NULL); @@ -1927,8 +1928,8 @@ static void test_tp_multi_wait(void) ReleaseSemaphore(semaphores[i], 1, NULL); result = WaitForSingleObject(semaphore, 100); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(multi_wait_info.result == i, "expected result %d, got %u\n", i, multi_wait_info.result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(multi_wait_info.result == i, "expected result %d, got %lu\n", i, multi_wait_info.result); pTpSetWait(waits[i], semaphores[i], NULL); } @@ -1940,8 +1941,8 @@ static void test_tp_multi_wait(void) ReleaseSemaphore(semaphores[i], 1, NULL); result = WaitForSingleObject(semaphore, 100); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - ok(multi_wait_info.result == i, "expected result %d, got %u\n", i, multi_wait_info.result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); + ok(multi_wait_info.result == i, "expected result %d, got %lu\n", i, multi_wait_info.result); pTpSetWait(waits[i], semaphores[i], NULL); } @@ -1957,7 +1958,7 @@ static void test_tp_multi_wait(void) for (i = 0; i < ARRAY_SIZE(semaphores); i++) { result = WaitForSingleObject(semaphore, 150); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); } ok(multi_wait_info.result >> 16, "expected multi_wait_info.result >> 16 != 0\n"); @@ -2024,19 +2025,19 @@ static void test_tp_io(void) ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); status = pTpAllocPool(&pool, NULL); - ok(!status, "failed to allocate pool, status %#x\n", status); + ok(!status, "failed to allocate pool, status %#lx\n", status); server = CreateNamedPipeA("\\\\.\\pipe\\wine_tp_test", PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, 0, 1, 1024, 1024, 0, NULL); - ok(server != INVALID_HANDLE_VALUE, "Failed to create server pipe, error %u.\n", GetLastError()); + ok(server != INVALID_HANDLE_VALUE, "Failed to create server pipe, error %lu.\n", GetLastError()); client = CreateFileA("\\\\.\\pipe\\wine_tp_test", GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); - ok(client != INVALID_HANDLE_VALUE, "Failed to create client pipe, error %u.\n", GetLastError()); + ok(client != INVALID_HANDLE_VALUE, "Failed to create client pipe, error %lu.\n", GetLastError()); environment.Pool = pool; io = NULL; status = pTpAllocIoCompletion(&io, server, io_cb, &userdata, &environment); - ok(!status, "got %#x\n", status); + ok(!status, "got %#lx\n", status); ok(!!io, "expected non-NULL TP_IO\n"); pTpWaitForIoCompletion(io, FALSE); @@ -2049,16 +2050,16 @@ static void test_tp_io(void) ret = ReadFile(server, in, sizeof(in), NULL, &ovl); ok(!ret, "wrong ret %d\n", ret); - ok(GetLastError() == ERROR_IO_PENDING, "wrong error %u\n", GetLastError()); + ok(GetLastError() == ERROR_IO_PENDING, "wrong error %lu\n", GetLastError()); ret = WriteFile(client, out, sizeof(out), &ret_size, NULL); - ok(ret, "WriteFile() failed, error %u\n", GetLastError()); + ok(ret, "WriteFile() failed, error %lu\n", GetLastError()); pTpWaitForIoCompletion(io, FALSE); ok(userdata.count == 1, "callback ran %u times\n", userdata.count); ok(userdata.ovl == &ovl, "expected %p, got %p\n", &ovl, userdata.ovl); - ok(userdata.ret == STATUS_SUCCESS, "got status %#x\n", userdata.ret); - ok(userdata.length == 1, "got length %lu\n", userdata.length); + ok(userdata.ret == STATUS_SUCCESS, "got status %#lx\n", userdata.ret); + ok(userdata.length == 1, "got length %Iu\n", userdata.length); ok(userdata.io == io, "expected %p, got %p\n", io, userdata.io); ok(!WaitForSingleObject(thread, 1000), "wait timed out\n"); @@ -2070,20 +2071,20 @@ static void test_tp_io(void) ret = ReadFile(server, in, sizeof(in), NULL, &ovl); ok(!ret, "wrong ret %d\n", ret); - ok(GetLastError() == ERROR_IO_PENDING, "wrong error %u\n", GetLastError()); + ok(GetLastError() == ERROR_IO_PENDING, "wrong error %lu\n", GetLastError()); ret = ReadFile(server, in2, sizeof(in2), NULL, &ovl2); ok(!ret, "wrong ret %d\n", ret); - ok(GetLastError() == ERROR_IO_PENDING, "wrong error %u\n", GetLastError()); + ok(GetLastError() == ERROR_IO_PENDING, "wrong error %lu\n", GetLastError()); ret = WriteFile(client, out, sizeof(out), &ret_size, NULL); - ok(ret, "WriteFile() failed, error %u\n", GetLastError()); + ok(ret, "WriteFile() failed, error %lu\n", GetLastError()); ret = WriteFile(client, out, sizeof(out), &ret_size, NULL); - ok(ret, "WriteFile() failed, error %u\n", GetLastError()); + ok(ret, "WriteFile() failed, error %lu\n", GetLastError()); pTpWaitForIoCompletion(io, FALSE); ok(userdata.count == 2, "callback ran %u times\n", userdata.count); - ok(userdata.ret == STATUS_SUCCESS, "got status %#x\n", userdata.ret); - ok(userdata.length == 1, "got length %lu\n", userdata.length); + ok(userdata.ret == STATUS_SUCCESS, "got status %#lx\n", userdata.ret); + ok(userdata.length == 1, "got length %Iu\n", userdata.length); ok(userdata.io == io, "expected %p, got %p\n", io, userdata.io); /* The documentation is a bit unclear about passing TRUE to @@ -2100,7 +2101,7 @@ static void test_tp_io(void) pTpStartAsyncIoOperation(io); ret = WriteFile(client, out, sizeof(out), &ret_size, NULL); - ok(ret, "WriteFile() failed, error %u\n", GetLastError()); + ok(ret, "WriteFile() failed, error %lu\n", GetLastError()); ret = ReadFile(server, in, sizeof(in), NULL, &ovl); ok(ret, "wrong ret %d\n", ret); @@ -2108,8 +2109,8 @@ static void test_tp_io(void) pTpWaitForIoCompletion(io, FALSE); ok(userdata.count == 1, "callback ran %u times\n", userdata.count); ok(userdata.ovl == &ovl, "expected %p, got %p\n", &ovl, userdata.ovl); - ok(userdata.ret == STATUS_SUCCESS, "got status %#x\n", userdata.ret); - ok(userdata.length == 1, "got length %lu\n", userdata.length); + ok(userdata.ret == STATUS_SUCCESS, "got status %#lx\n", userdata.ret); + ok(userdata.length == 1, "got length %Iu\n", userdata.length); ok(userdata.io == io, "expected %p, got %p\n", io, userdata.io); userdata.count = 0; @@ -2117,7 +2118,7 @@ static void test_tp_io(void) ret = ReadFile(server, NULL, 1, NULL, &ovl); ok(!ret, "wrong ret %d\n", ret); - ok(GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError()); + ok(GetLastError() == ERROR_NOACCESS, "wrong error %lu\n", GetLastError()); pTpCancelAsyncIoOperation(io); pTpWaitForIoCompletion(io, FALSE); @@ -2128,15 +2129,15 @@ static void test_tp_io(void) ret = ReadFile(server, in, sizeof(in), NULL, &ovl); ok(!ret, "wrong ret %d\n", ret); - ok(GetLastError() == ERROR_IO_PENDING, "wrong error %u\n", GetLastError()); + ok(GetLastError() == ERROR_IO_PENDING, "wrong error %lu\n", GetLastError()); ret = CancelIo(server); - ok(ret, "CancelIo() failed, error %u\n", GetLastError()); + ok(ret, "CancelIo() failed, error %lu\n", GetLastError()); pTpWaitForIoCompletion(io, FALSE); ok(userdata.count == 1, "callback ran %u times\n", userdata.count); ok(userdata.ovl == &ovl, "expected %p, got %p\n", &ovl, userdata.ovl); - ok(userdata.ret == STATUS_CANCELLED, "got status %#x\n", userdata.ret); - ok(!userdata.length, "got length %lu\n", userdata.length); + ok(userdata.ret == STATUS_CANCELLED, "got status %#lx\n", userdata.ret); + ok(!userdata.length, "got length %Iu\n", userdata.length); ok(userdata.io == io, "expected %p, got %p\n", io, userdata.io); userdata.count = 0; @@ -2145,8 +2146,8 @@ static void test_tp_io(void) ret = ReadFile(server, in, sizeof(in), NULL, &ovl); ok(!ret, "wrong ret %d\n", ret); ret = WriteFile(client, out, sizeof(out), &ret_size, NULL); - ok(ret, "WriteFile() failed, error %u\n", GetLastError()); - ok(GetLastError() == ERROR_IO_PENDING, "wrong error %u\n", GetLastError()); + ok(ret, "WriteFile() failed, error %lu\n", GetLastError()); + ok(GetLastError() == ERROR_IO_PENDING, "wrong error %lu\n", GetLastError()); pTpWaitForIoCompletion(io, FALSE); if (0) @@ -2163,10 +2164,10 @@ static void test_tp_io(void) /* Test TPIO object destruction. */ server = CreateNamedPipeA("\\\\.\\pipe\\wine_tp_test", PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, 0, 1, 1024, 1024, 0, NULL); - ok(server != INVALID_HANDLE_VALUE, "Failed to create server pipe, error %u.\n", GetLastError()); + ok(server != INVALID_HANDLE_VALUE, "Failed to create server pipe, error %lu.\n", GetLastError()); io = NULL; status = pTpAllocIoCompletion(&io, server, io_cb, &userdata, &environment); - ok(!status, "got %#x\n", status); + ok(!status, "got %#lx\n", status); ret = HeapValidate(GetProcessHeap(), 0, io); ok(ret, "Got unexpected ret %#x.\n", ret); @@ -2178,14 +2179,14 @@ static void test_tp_io(void) server = CreateNamedPipeA("\\\\.\\pipe\\wine_tp_test", PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, 0, 1, 1024, 1024, 0, NULL); - ok(server != INVALID_HANDLE_VALUE, "Failed to create server pipe, error %u.\n", GetLastError()); + ok(server != INVALID_HANDLE_VALUE, "Failed to create server pipe, error %lu.\n", GetLastError()); client = CreateFileA("\\\\.\\pipe\\wine_tp_test", GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); - ok(client != INVALID_HANDLE_VALUE, "Failed to create client pipe, error %u.\n", GetLastError()); + ok(client != INVALID_HANDLE_VALUE, "Failed to create client pipe, error %lu.\n", GetLastError()); io = NULL; status = pTpAllocIoCompletion(&io, server, io_cb, &userdata, &environment); - ok(!status, "got %#x\n", status); + ok(!status, "got %#lx\n", status); pTpStartAsyncIoOperation(io); pTpWaitForIoCompletion(io, TRUE); ret = HeapValidate(GetProcessHeap(), 0, io); @@ -2204,7 +2205,7 @@ static void test_tp_io(void) ret = ReadFile(server, in, sizeof(in), NULL, &ovl); ok(!ret, "wrong ret %d\n", ret); ret = WriteFile(client, out, sizeof(out), &ret_size, NULL); - ok(ret, "WriteFile() failed, error %u\n", GetLastError()); + ok(ret, "WriteFile() failed, error %lu\n", GetLastError()); Sleep(2000); ret = HeapValidate(GetProcessHeap(), 0, io); ok(!ret, "Got unexpected ret %#x.\n", ret); @@ -2244,14 +2245,14 @@ static void test_kernel32_tp_io(void) ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); status = pTpAllocPool(&pool, NULL); - ok(!status, "failed to allocate pool, status %#x\n", status); + ok(!status, "failed to allocate pool, status %#lx\n", status); server = CreateNamedPipeA("\\\\.\\pipe\\wine_tp_test", PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, 0, 1, 1024, 1024, 0, NULL); - ok(server != INVALID_HANDLE_VALUE, "Failed to create server pipe, error %u.\n", GetLastError()); + ok(server != INVALID_HANDLE_VALUE, "Failed to create server pipe, error %lu.\n", GetLastError()); client = CreateFileA("\\\\.\\pipe\\wine_tp_test", GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); - ok(client != INVALID_HANDLE_VALUE, "Failed to create client pipe, error %u.\n", GetLastError()); + ok(client != INVALID_HANDLE_VALUE, "Failed to create client pipe, error %lu.\n", GetLastError()); environment.Pool = pool; io = NULL; @@ -2268,16 +2269,16 @@ static void test_kernel32_tp_io(void) ret = ReadFile(server, in, sizeof(in), NULL, &ovl); ok(!ret, "wrong ret %d\n", ret); - ok(GetLastError() == ERROR_IO_PENDING, "wrong error %u\n", GetLastError()); + ok(GetLastError() == ERROR_IO_PENDING, "wrong error %lu\n", GetLastError()); ret = WriteFile(client, out, sizeof(out), &ret_size, NULL); - ok(ret, "WriteFile() failed, error %u\n", GetLastError()); + ok(ret, "WriteFile() failed, error %lu\n", GetLastError()); pWaitForThreadpoolIoCallbacks(io, FALSE); ok(userdata.count == 1, "callback ran %u times\n", userdata.count); ok(userdata.ovl == &ovl, "expected %p, got %p\n", &ovl, userdata.ovl); - ok(userdata.ret == ERROR_SUCCESS, "got status %#x\n", userdata.ret); - ok(userdata.length == 1, "got length %lu\n", userdata.length); + ok(userdata.ret == ERROR_SUCCESS, "got status %#lx\n", userdata.ret); + ok(userdata.length == 1, "got length %Iu\n", userdata.length); ok(userdata.io == io, "expected %p, got %p\n", io, userdata.io); ok(!WaitForSingleObject(thread, 1000), "wait timed out\n"); @@ -2289,20 +2290,20 @@ static void test_kernel32_tp_io(void) ret = ReadFile(server, in, sizeof(in), NULL, &ovl); ok(!ret, "wrong ret %d\n", ret); - ok(GetLastError() == ERROR_IO_PENDING, "wrong error %u\n", GetLastError()); + ok(GetLastError() == ERROR_IO_PENDING, "wrong error %lu\n", GetLastError()); ret = ReadFile(server, in2, sizeof(in2), NULL, &ovl2); ok(!ret, "wrong ret %d\n", ret); - ok(GetLastError() == ERROR_IO_PENDING, "wrong error %u\n", GetLastError()); + ok(GetLastError() == ERROR_IO_PENDING, "wrong error %lu\n", GetLastError()); ret = WriteFile(client, out, sizeof(out), &ret_size, NULL); - ok(ret, "WriteFile() failed, error %u\n", GetLastError()); + ok(ret, "WriteFile() failed, error %lu\n", GetLastError()); ret = WriteFile(client, out, sizeof(out), &ret_size, NULL); - ok(ret, "WriteFile() failed, error %u\n", GetLastError()); + ok(ret, "WriteFile() failed, error %lu\n", GetLastError()); pWaitForThreadpoolIoCallbacks(io, FALSE); ok(userdata.count == 2, "callback ran %u times\n", userdata.count); - ok(userdata.ret == STATUS_SUCCESS, "got status %#x\n", userdata.ret); - ok(userdata.length == 1, "got length %lu\n", userdata.length); + ok(userdata.ret == STATUS_SUCCESS, "got status %#lx\n", userdata.ret); + ok(userdata.length == 1, "got length %Iu\n", userdata.length); ok(userdata.io == io, "expected %p, got %p\n", io, userdata.io); userdata.count = 0; @@ -2313,7 +2314,7 @@ static void test_kernel32_tp_io(void) pStartThreadpoolIo(io); ret = WriteFile(client, out, sizeof(out), &ret_size, NULL); - ok(ret, "WriteFile() failed, error %u\n", GetLastError()); + ok(ret, "WriteFile() failed, error %lu\n", GetLastError()); ret = ReadFile(server, in, sizeof(in), NULL, &ovl); ok(ret, "wrong ret %d\n", ret); @@ -2321,8 +2322,8 @@ static void test_kernel32_tp_io(void) pWaitForThreadpoolIoCallbacks(io, FALSE); ok(userdata.count == 1, "callback ran %u times\n", userdata.count); ok(userdata.ovl == &ovl, "expected %p, got %p\n", &ovl, userdata.ovl); - ok(userdata.ret == ERROR_SUCCESS, "got status %#x\n", userdata.ret); - ok(userdata.length == 1, "got length %lu\n", userdata.length); + ok(userdata.ret == ERROR_SUCCESS, "got status %#lx\n", userdata.ret); + ok(userdata.length == 1, "got length %Iu\n", userdata.length); ok(userdata.io == io, "expected %p, got %p\n", io, userdata.io); userdata.count = 0; @@ -2330,7 +2331,7 @@ static void test_kernel32_tp_io(void) ret = ReadFile(server, NULL, 1, NULL, &ovl); ok(!ret, "wrong ret %d\n", ret); - ok(GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError()); + ok(GetLastError() == ERROR_NOACCESS, "wrong error %lu\n", GetLastError()); pCancelThreadpoolIo(io); pWaitForThreadpoolIoCallbacks(io, FALSE); @@ -2341,15 +2342,15 @@ static void test_kernel32_tp_io(void) ret = ReadFile(server, in, sizeof(in), NULL, &ovl); ok(!ret, "wrong ret %d\n", ret); - ok(GetLastError() == ERROR_IO_PENDING, "wrong error %u\n", GetLastError()); + ok(GetLastError() == ERROR_IO_PENDING, "wrong error %lu\n", GetLastError()); ret = CancelIo(server); - ok(ret, "CancelIo() failed, error %u\n", GetLastError()); + ok(ret, "CancelIo() failed, error %lu\n", GetLastError()); pWaitForThreadpoolIoCallbacks(io, FALSE); ok(userdata.count == 1, "callback ran %u times\n", userdata.count); ok(userdata.ovl == &ovl, "expected %p, got %p\n", &ovl, userdata.ovl); - ok(userdata.ret == ERROR_OPERATION_ABORTED, "got status %#x\n", userdata.ret); - ok(!userdata.length, "got length %lu\n", userdata.length); + ok(userdata.ret == ERROR_OPERATION_ABORTED, "got status %#lx\n", userdata.ret); + ok(!userdata.length, "got length %Iu\n", userdata.length); ok(userdata.io == io, "expected %p, got %p\n", io, userdata.io); CloseHandle(ovl.hEvent);

2 1

[PATCH 1/3] macdrv: Add wintab32 implementation.
by Elaine Lefler 24 Mar '22

24 Mar '22

Allow use of graphics tablets with applications that support them. Update the existing wintab code for the sake of correctness and to reduce code duplication. Based on behavior observed from a Wacom Intuos tablet on Windows 10. Signed-off-by: Elaine Lefler <elaineclefler(a)gmail.com> --- This is an effort to get PaintTool SAI working on macOS. I've split up the macdrv changes to make them easier to read, but all three are needed for the app to work. I'm separately submitting ntdll changes which are useful but not strictly necessary. Tablet support: SaiV2 works out of the box. Tested with Intuos tablet as well as Apple iPad in Sidecar mode. SaiV1 works in theory, but is 32-bit only and I don't know how to compile that on a modern Mac. WTPACKET has been renamed to PACKET for consistency with Wacom's headers. Also, pktdef.h was included in Wine but never used, so it's been deleted. The X11 code remains functionally unchanged, except for TABLET_CopyPacketData incorrectly inserting values of SM_CXSCREEN and SM_CYSCREEN when the X11 driver was trying to report the correct values of SM_CXVIRTUALSCREEN and SM_CYVIRTUALSCREEN, so this should fix multimonitor support. The other changes to wintab32.dll are just for minor edge cases. --- dlls/winemac.drv/Makefile.in | 6 +- dlls/winemac.drv/cocoa_wintab.h | 64 +++ dlls/winemac.drv/cocoa_wintab.m | 219 +++++++++++ dlls/winemac.drv/event.c | 3 + dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 11 + dlls/winemac.drv/winemac.drv.spec | 6 + dlls/winemac.drv/wintab.c | 631 ++++++++++++++++++++++++++++++ dlls/winex11.drv/wintab.c | 242 +++++------- dlls/wintab32/context.c | 215 ++++++---- dlls/wintab32/wintab32.c | 18 +- dlls/wintab32/wintab_internal.h | 26 +- include/Makefile.in | 1 - include/pktdef.h | 248 ------------ include/wintab.h | 91 ++++- tools/winapi/win32.api | 2 +- 16 files changed, 1279 insertions(+), 505 deletions(-) create mode 100644 dlls/winemac.drv/cocoa_wintab.h create mode 100644 dlls/winemac.drv/cocoa_wintab.m create mode 100644 dlls/winemac.drv/wintab.c delete mode 100644 include/pktdef.h diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in index da2e5eaf4c4..5fc8f4152fe 100644 --- a/dlls/winemac.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -21,7 +21,8 @@ C_SRCS = \ surface.c \ systray.c \ vulkan.c \ - window.c + window.c \ + wintab.c OBJC_SRCS = \ cocoa_app.m \ @@ -32,6 +33,7 @@ OBJC_SRCS = \ cocoa_main.m \ cocoa_opengl.m \ cocoa_status_item.m \ - cocoa_window.m + cocoa_window.m \ + cocoa_wintab.m RC_SRCS = winemac.rc diff --git a/dlls/winemac.drv/cocoa_wintab.h b/dlls/winemac.drv/cocoa_wintab.h new file mode 100644 index 00000000000..8db44422d02 --- /dev/null +++ b/dlls/winemac.drv/cocoa_wintab.h @@ -0,0 +1,64 @@ +/* + * MACDRV Cocoa wintab declarations + * + * Copyright 2022 Elaine Lefler + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_MACDRV_COCOA_WINTAB_H +#define __WINE_MACDRV_COCOA_WINTAB_H + +#include <math.h> + +#ifdef __OBJC__ +/* Necessary hack because this header must be included on both the Wine side + * and from Objective-C */ +typedef BOOL OBJC_BOOL; +#define BOOL WIN_BOOL +#endif + +#include "windef.h" +#include "wintab.h" + +/* Extents that shouldn't cause math problems */ +#define TABLET_WIDTH 0x40000000 +#define TABLET_HEIGHT 0x40000000 +/* Largest reportable pressure value */ +#define MAX_PRESSURE 0x7fff +/* Wacom's demo app teaches developers to assume 1/10th degree. + * Best stick to that. */ +#define ANGLE_SCALE 10 +/* Largest reportable angle (360 is included, due to rounding) */ +#define MAX_ANGLE (360 * ANGLE_SCALE) + +#define MAKE_ANGLE_DEG(degrees) ((degrees) * ANGLE_SCALE) +#define MAKE_ANGLE_RAD(radians) ((radians) * MAKE_ANGLE_DEG(180) / M_PI) + +/* Cursor indices */ +#define MACDRV_CURSOR_PEN 0 +#define MACDRV_CURSOR_ERASER 1 +#define MACDRV_CURSOR_CURSOR 2 + +/* Shared device context */ +extern LOGCONTEXTW macdrv_tablet_ctx DECLSPEC_HIDDEN; + +/* Window to which tablet events are delivered */ +extern void* macdrv_tablet_window DECLSPEC_HIDDEN; + +/* Objective-C function to start tablet events */ +void CDECL macdrv_start_tablet_monitor(void) DECLSPEC_HIDDEN; + +#endif // !defined(__WINE_MACDRV_COCOA_WINTAB_H) diff --git a/dlls/winemac.drv/cocoa_wintab.m b/dlls/winemac.drv/cocoa_wintab.m new file mode 100644 index 00000000000..48878eaf078 --- /dev/null +++ b/dlls/winemac.drv/cocoa_wintab.m @@ -0,0 +1,219 @@ +/* + * MACDRV Cocoa wintab implementations + * + * Copyright 2022 Elaine Lefler + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include "cocoa_app.h" +#include "cocoa_event.h" +#include "cocoa_window.h" +#include "cocoa_wintab.h" + +static UINT packet_id = 0; +static UINT current_cursor = MACDRV_CURSOR_CURSOR; + +static CFMachPortRef event_tap; + +static const CGEventMask MOUSE_DOWN_EVENTS = + CGEventMaskBit(kCGEventLeftMouseDown) + | CGEventMaskBit(kCGEventRightMouseDown) + | CGEventMaskBit(kCGEventOtherMouseDown); +static const CGEventMask MOUSE_UP_EVENTS = + CGEventMaskBit(kCGEventLeftMouseUp) + | CGEventMaskBit(kCGEventRightMouseUp) + | CGEventMaskBit(kCGEventOtherMouseUp); +static const CGEventMask MOUSE_DRAG_EVENTS = + CGEventMaskBit(kCGEventLeftMouseDragged) + | CGEventMaskBit(kCGEventRightMouseDragged) + | CGEventMaskBit(kCGEventOtherMouseDragged); + +static const CGEventMask MOUSE_EVENTS = + CGEventMaskBit(kCGEventMouseMoved) + | MOUSE_DOWN_EVENTS | MOUSE_UP_EVENTS | MOUSE_DRAG_EVENTS; + +static const CGEventMask TABLET_EVENTS = + CGEventMaskBit(kCGEventTabletPointer) + | CGEventMaskBit(kCGEventTabletProximity); + +static UINT cursor_from_nx(NSPointingDeviceType device_type) +{ + switch(device_type) + { + case NX_TABLET_POINTER_PEN: + return MACDRV_CURSOR_PEN; + case NX_TABLET_POINTER_ERASER: + return MACDRV_CURSOR_ERASER; + default: + /* Squash Unknown into Cursor */ + return MACDRV_CURSOR_CURSOR; + } +} + +static void packet_from_cgevent(PACKET* pkt, CGEventRef event) +{ + static const double ALTI_VECTOR_SCALE = 0.89879404629916700; /* cos(26) */ + static const double IN_VECTOR_ANGLE_SCALE = .073519026192766368; /* (cos(19) / cos(26) - 1) * sqrt(2) */ + + double azimuth, altitude; + double angle_scale, max_length, length; + + CGPoint location = CGEventGetUnflippedLocation(event); + double tilt_x = CGEventGetDoubleValueField(event, kCGTabletEventTiltX); + double tilt_y = CGEventGetDoubleValueField(event, kCGTabletEventTiltY); + uint64_t time_ns = CGEventGetTimestamp(event); + pkt->pkStatus = (current_cursor == MACDRV_CURSOR_ERASER ? TPS_INVERT : 0); + pkt->pkTime = [[WineApplicationController sharedController] ticksForEventTime:time_ns / (double)NSEC_PER_SEC]; + pkt->pkSerialNumber = ++packet_id; + + pkt->pkCursor = current_cursor; + pkt->pkButtons = CGEventGetIntegerValueField(event, kCGTabletEventPointButtons); + + location = cgpoint_win_from_mac(location); + + /* y should be y-1 because of the way "unflipped" location is calculated. + * We don't -1 the extents because macOS doesn't map the tablet that way. */ + pkt->pkX = (location.x - (double)macdrv_tablet_ctx.lcSysOrgX) / macdrv_tablet_ctx.lcSysExtX * TABLET_WIDTH; + pkt->pkY = (location.y - 1 - (double)macdrv_tablet_ctx.lcSysOrgY) / macdrv_tablet_ctx.lcSysExtY * TABLET_HEIGHT; + pkt->pkZ = CGEventGetIntegerValueField(event, kCGTabletEventPointZ); + + pkt->pkNormalPressure = CGEventGetDoubleValueField(event, kCGTabletEventPointPressure) * MAX_PRESSURE; + pkt->pkTangentPressure = CGEventGetDoubleValueField(event, kCGTabletEventTangentialPressure) * MAX_PRESSURE; + + /* Find the angle around the Z axis. Note that 0 is up and angles move + * clockwise. Swapping x and y gives the correct angle. */ + azimuth = atan2(tilt_x, tilt_y); + /* Adjust to 0..360 range */ + if (azimuth < 0.) + azimuth += 2 * M_PI; + + /* With the pen resting on its barrel and oriented horizontally or + * vertically, a real tablet reads an altitude of 26. This corresponds to a + * tilt of 1. Spinning it to a 45 degree angle allows reading a little bit + * lower, down to 19. However, the X/Y tilt appears to report values that + * are out of range for wintab. Cap the vector at a value that smoothly + * transitions between 1 and the maximum length based on the azimuth. */ + angle_scale = fmin(fabs(cos(azimuth)), fabs(sin(azimuth))); + max_length = 1. + IN_VECTOR_ANGLE_SCALE * angle_scale; + + /* Since the pen moves in a circular path we can calculate the altitude as + * the arccosine of the X/Y vector. Multiply it by cos(26) such that a + * vector of length 1 maps to 26 degrees. */ + length = fmin(max_length, sqrt(tilt_x * tilt_x + tilt_y * tilt_y)); + altitude = acos(length * ALTI_VECTOR_SCALE); + + pkt->pkOrientation.orAzimuth = MAKE_ANGLE_RAD(azimuth); + /* Altitude is negative on the eraser */ + pkt->pkOrientation.orAltitude = MAKE_ANGLE_RAD(!(pkt->pkStatus & TPS_INVERT) ? altitude : -altitude); + /* Rotation is the same as twist */ + pkt->pkOrientation.orTwist = MAKE_ANGLE_DEG(CGEventGetDoubleValueField(event, kCGTabletEventRotation)); +} + +static CGEventRef tablet_event_cb(CGEventTapProxy proxy, CGEventType type, CGEventRef event, void* refcon) +{ + CGEventMask type_mask; + BOOL is_proximity; + + macdrv_event* out_event; + + /* Tap can be disabled for various reasons, make sure it comes back */ + if (type == kCGEventTapDisabledByTimeout + || type == kCGEventTapDisabledByUserInput) + { + CGEventTapEnable(event_tap, YES); + return event; + } + + type_mask = CGEventMaskBit(type); + is_proximity = (type == kCGEventTabletProximity); + + if (!(type_mask & TABLET_EVENTS)) + { + int64_t subtype = CGEventGetIntegerValueField(event, kCGMouseEventSubtype); + if (subtype == kCGEventMouseSubtypeTabletProximity) + is_proximity = YES; + else if (subtype != kCGEventMouseSubtypeTabletPoint) + /* Not a tablet event */ + return event; + } + + /*NSLog(@"%@", [NSEvent eventWithCGEvent:event]);*/ + out_event = macdrv_create_event(TABLET_EVENT, (WineWindow*)macdrv_tablet_window); + + if (is_proximity) + { + /* Cursor type only appears during proximity events */ + current_cursor = cursor_from_nx(CGEventGetIntegerValueField(event, kCGTabletProximityEventPointerType)); + + if (CGEventGetIntegerValueField(event, kCGTabletProximityEventEnterProximity) != 0) + out_event->tablet_event.type = TABLET_EVENT_PROXIMITY_ENTER; + else + out_event->tablet_event.type = TABLET_EVENT_PROXIMITY_LEAVE; + } + else + { + PACKET* event_packet = calloc(1, sizeof(PACKET)); + packet_from_cgevent(event_packet, event); + out_event->tablet_event.type = TABLET_EVENT_POINT; + out_event->tablet_event.packet = event_packet; + } + + [[(WineWindow*)macdrv_tablet_window queue] postEvent:out_event]; + macdrv_release_event(out_event); + return event; +} + +static void* macdrv_tablet_main(void* _) +{ + CFRunLoopSourceRef source; + event_tap = CGEventTapCreate(kCGAnnotatedSessionEventTap, kCGHeadInsertEventTap, + kCGEventTapOptionListenOnly, MOUSE_EVENTS | TABLET_EVENTS, tablet_event_cb, NULL); + + if (!event_tap) + return NULL; + + source = CFMachPortCreateRunLoopSource(NULL, event_tap, 0); + if (!source) + { + CFRelease(event_tap); + return NULL; + } + + CFRunLoopAddSource(CFRunLoopGetCurrent(), source, kCFRunLoopCommonModes); + CFRelease(source); + + CFRunLoopRun(); + + CFRelease(event_tap); + return NULL; +} + +void CDECL macdrv_start_tablet_monitor(void) +{ + /* Install a global monitor for relevant events. This ensures we can deliver + * the full device area and event frequency that the tablet offers. It's + * essential to run the monitor in its own thread, because CoreGraphics + * blocks event handling until it's done. Scheduling on a busy thread would + * cause the mouse to lag. */ + static pthread_t thread; + if (!thread) + { + if (pthread_create(&thread, NULL, macdrv_tablet_main, NULL) == 0) + pthread_detach(thread); + } +} diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index f197af0808e..22caf0cf2a7 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -308,6 +308,9 @@ void macdrv_handle_event(const macdrv_event *event) case WINDOW_RESTORE_REQUESTED: macdrv_window_restore_requested(hwnd, event); break; + case TABLET_EVENT: + macdrv_tablet_event(event); + break; default: TRACE(" ignoring\n"); break; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 4e4524722af..3eecb26a01e 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -232,6 +232,7 @@ extern DWORD CDECL macdrv_MsgWaitForMultipleObjectsEx(DWORD count, const HANDLE extern void macdrv_window_drag_begin(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_window_drag_end(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_reassert_window_position(HWND hwnd) DECLSPEC_HIDDEN; +extern void macdrv_tablet_event(const macdrv_event *event) DECLSPEC_HIDDEN; extern BOOL query_resize_size(HWND hwnd, macdrv_query *query) DECLSPEC_HIDDEN; extern BOOL query_resize_start(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL query_min_max_info(HWND hwnd) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 94f9fbcfa17..c7f87888fdc 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -351,6 +351,7 @@ extern int macdrv_set_display_mode(const struct macdrv_display* display, WINDOW_MINIMIZE_REQUESTED, WINDOW_RESIZE_ENDED, WINDOW_RESTORE_REQUESTED, + TABLET_EVENT, NUM_EVENT_TYPES }; @@ -361,6 +362,12 @@ extern int macdrv_set_display_mode(const struct macdrv_display* display, QUIT_REASON_SHUTDOWN, }; +enum { + TABLET_EVENT_POINT, + TABLET_EVENT_PROXIMITY_ENTER, + TABLET_EVENT_PROXIMITY_LEAVE, +}; + typedef uint64_t macdrv_event_mask; typedef struct macdrv_event { @@ -455,6 +462,10 @@ extern int macdrv_set_display_mode(const struct macdrv_display* display, int keep_frame; CGRect frame; } window_restore_requested; + struct { + int type; + void *packet; + } tablet_event; }; } macdrv_event; diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index b060d1cc2a6..13f5522242c 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -18,3 +18,9 @@ @ stdcall ImeToAsciiEx(long long ptr ptr long long) @ stdcall ImeUnregisterWord(wstr long wstr) @ stdcall NotifyIME(long long long long) + +# WinTab32 +@ cdecl AttachEventQueueToTablet(long) macdrv_AttachEventQueueToTablet +@ cdecl GetCurrentPacket(ptr) macdrv_GetCurrentPacket +@ cdecl LoadTabletInfo(long) macdrv_LoadTabletInfo +@ cdecl WTInfoW(long long ptr) macdrv_WTInfoW diff --git a/dlls/winemac.drv/wintab.c b/dlls/winemac.drv/wintab.c new file mode 100644 index 00000000000..1dcd14eb179 --- /dev/null +++ b/dlls/winemac.drv/wintab.c @@ -0,0 +1,631 @@ +/* + * MACDRV Wintab implementations + * + * Copyright 2022 Elaine Lefler + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include "macdrv.h" +#include "macdrv_cocoa.h" + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "wine/unicode.h" +#include "wine/debug.h" + +#include "cocoa_wintab.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wintab32); + +LOGCONTEXTW macdrv_tablet_ctx; +static LOGCONTEXTW macdrv_system_ctx; + +void* macdrv_tablet_window; +static HWND macdrv_tablet_hwnd; +static PACKET current_packet; +static int last_event_type = -1; + +static size_t registered_hwnd_count = 0; +static size_t registered_hwnd_cap = 0; +static HWND* registered_hwnd = NULL; + +static const WCHAR CURSOR_NAME_PEN[] = {'P','r','e','s','s','u','r','e',' ','S','t','y','l','u','s',0}; +static const WCHAR CURSOR_NAME_ERASER[] = {'E','r','a','s','e','r',0}; +static const WCHAR CURSOR_NAME_CURSOR[] = {'P','u','c','k',0}; + +static const UINT CURSOR_COUNT = 3; +static const WCHAR* const CURSOR_NAMES[CURSOR_COUNT] = { + CURSOR_NAME_PEN, + CURSOR_NAME_ERASER, + CURSOR_NAME_CURSOR +}; + +static const UINT CURSOR_TYPES[CURSOR_COUNT] = { + CSR_TYPE_PEN, + CSR_TYPE_ERASER, + CSR_TYPE_MOUSE_2D +}; + +static const UINT CURSOR_CAPABILITIES[CURSOR_COUNT] = { + CRC_MULTIMODE | CRC_AGGREGATE, + CRC_MULTIMODE | CRC_AGGREGATE | CRC_INVERT, + CRC_AGGREGATE +}; + +static const BYTE BUTTON_COUNT = 16; + +BOOL CDECL macdrv_LoadTabletInfo(HWND tablet_hwnd){ + static const WCHAR tablet_name[] = {'M','a','c','d','r','v',' ','T','a','b','l','e','t',' ','C','o','n','t','e','x','t',0}; + static const WCHAR sys_name[] = {'M','a','c','d','r','v',' ','S','y','s','t','e','m',' ','C','o','n','t','e','x','t',0}; + struct macdrv_win_data* tablet_win_data; + + macdrv_tablet_hwnd = tablet_hwnd; + TRACE("%p\n", macdrv_tablet_hwnd); + + tablet_win_data = get_win_data(macdrv_tablet_hwnd); + macdrv_tablet_window = tablet_win_data->cocoa_window; + release_win_data(tablet_win_data); + + /* TODO?: It is possible to query the Wacom driver for real values, but it + * doesn't report all of these fields anyway and adds a lot of complexity. + * The quick'n'dirty solution is to make a fake tablet with the greatest + * possible capabilities. */ + macdrv_tablet_ctx.lcOptions = CXO_SYSTEM; + macdrv_tablet_ctx.lcLocks = CXL_INSIZE | CXL_INASPECT | CXL_MARGIN + | CXL_SENSITIVITY | CXL_SYSOUT; + macdrv_tablet_ctx.lcStatus = CXS_ONTOP; + macdrv_tablet_ctx.lcMsgBase = WT_DEFBASE; + macdrv_tablet_ctx.lcDevice = 0; + macdrv_tablet_ctx.lcPktRate = 0; /* not supported */ + macdrv_tablet_ctx.lcPktData = PK_CONTEXT | PK_STATUS | PK_TIME | PK_CHANGED + | PK_SERIAL_NUMBER | PK_CURSOR | PK_BUTTONS | PK_X | PK_Y | PK_Z + | PK_NORMAL_PRESSURE | PK_TANGENT_PRESSURE | PK_ORIENTATION; + macdrv_tablet_ctx.lcPktMode = 0; /* all absolute */ + macdrv_tablet_ctx.lcMoveMask = PK_BUTTONS | PK_X | PK_Y | PK_Z + | PK_NORMAL_PRESSURE | PK_TANGENT_PRESSURE | PK_ORIENTATION; + macdrv_tablet_ctx.lcBtnDnMask = (1 << BUTTON_COUNT) - 1; + macdrv_tablet_ctx.lcBtnUpMask = (1 << BUTTON_COUNT) - 1; + + macdrv_tablet_ctx.lcInOrgX = 0; + macdrv_tablet_ctx.lcInOrgY = 0; + /* NSEvent reports floating point coordinates. The actual precision is not + * known, so we convert them to really big values. */ + macdrv_tablet_ctx.lcInExtX = TABLET_WIDTH; + macdrv_tablet_ctx.lcInExtY = TABLET_HEIGHT; + /* These values are correct for Intuos tablets. Wacom's Mac driver doesn't + * reveal them. */ + macdrv_tablet_ctx.lcInOrgZ = -1023; + macdrv_tablet_ctx.lcInExtZ = 2047; + + macdrv_tablet_ctx.lcOutOrgZ = macdrv_tablet_ctx.lcInOrgZ; + macdrv_tablet_ctx.lcOutExtZ = macdrv_tablet_ctx.lcInExtZ; + macdrv_tablet_ctx.lcSensX = 65536; + macdrv_tablet_ctx.lcSensY = 65536; + macdrv_tablet_ctx.lcSensZ = 65536; + + macdrv_tablet_ctx.lcSysMode = 0; /* absolute */ + macdrv_tablet_ctx.lcSysOrgX = GetSystemMetrics(SM_XVIRTUALSCREEN); + macdrv_tablet_ctx.lcSysOrgY = GetSystemMetrics(SM_YVIRTUALSCREEN); + macdrv_tablet_ctx.lcSysExtX = GetSystemMetrics(SM_CXVIRTUALSCREEN); + macdrv_tablet_ctx.lcSysExtY = GetSystemMetrics(SM_CYVIRTUALSCREEN); + macdrv_tablet_ctx.lcSysSensX = 65536; + macdrv_tablet_ctx.lcSysSensY = 65536; + + /* "device" and "system" context are identical, except that "system" + * translates tablet coords to screen coords */ + macdrv_system_ctx = macdrv_tablet_ctx; + strcpyW(macdrv_tablet_ctx.lcName, tablet_name); + strcpyW(macdrv_system_ctx.lcName, sys_name); + + macdrv_tablet_ctx.lcOutOrgX = macdrv_tablet_ctx.lcInOrgX; + macdrv_tablet_ctx.lcOutOrgY = macdrv_tablet_ctx.lcInOrgY; + macdrv_tablet_ctx.lcOutExtX = macdrv_tablet_ctx.lcInExtX; + macdrv_tablet_ctx.lcOutExtY = macdrv_tablet_ctx.lcInExtY; + + macdrv_system_ctx.lcOutOrgX = macdrv_system_ctx.lcSysOrgX; + macdrv_system_ctx.lcOutOrgY = macdrv_system_ctx.lcSysOrgY; + macdrv_system_ctx.lcOutExtX = macdrv_system_ctx.lcSysExtX; + macdrv_system_ctx.lcOutExtY = macdrv_system_ctx.lcSysExtY; + + return TRUE; +} + +UINT CDECL macdrv_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) +{ + TRACE("(%u, %u, %p)\n", wCategory, nIndex, lpOutput); + + if (IS_WTI_EXTENSIONS_TYPE(wCategory)) + { + FIXME("WTI_EXTENSIONS unimplemented"); + return 0; + } + else if (IS_WTI_CURSORS_TYPE(wCategory)) + { + INT cursor_idx = wCategory - WTI_CURSORS; + if (cursor_idx < 0) + cursor_idx += CURSOR_COUNT; + if (cursor_idx < 0 || cursor_idx >= CURSOR_COUNT) + return 0; + switch(nIndex){ + case CSR_NAME: + return TABLET_CopyData(lpOutput, CURSOR_NAMES[cursor_idx], (strlenW(CURSOR_NAMES[cursor_idx]) + 1) * sizeof(WCHAR)); + case CSR_ACTIVE: + { + BOOL active = 1; + return TABLET_CopyData(lpOutput, &active, sizeof(active)); + } + case CSR_PKTDATA: + return TABLET_CopyData(lpOutput, &macdrv_tablet_ctx.lcPktData, sizeof(macdrv_tablet_ctx.lcPktData)); + case CSR_BUTTONS: + case CSR_BUTTONBITS: + return TABLET_CopyData(lpOutput, &BUTTON_COUNT, sizeof(BUTTON_COUNT)); + case CSR_BTNNAMES: + { + static const char* const fmt = "button %d"; + static char buffer[10]; + int out_size = 0; + PWCHAR out_char = lpOutput; + int button; + + /* Each button name is \0-terminated, with an extra \0 at the + * end. */ + for (button = 0; button < BUTTON_COUNT; button++) + { + int name_len; + + snprintf(buffer, sizeof(buffer), fmt, button); + name_len = strlen(buffer); + + out_size += name_len + 1; + if(out_char != NULL) + { + int c; + for(c = 0; c <= name_len; c++) + *(out_char++) = buffer[c]; + } + } + if(out_char != NULL) + *out_char = 0; + return (out_size + 1) * sizeof(WCHAR); + } + case CSR_BUTTONMAP: + case CSR_SYSBTNMAP: + { + PBYTE out_byte = lpOutput; + int b; + + if (out_byte != NULL) + { + /* Always use 1:1 mapping */ + for (b = 0; b < BUTTON_COUNT; b++) + out_byte[b] = b; + } + return BUTTON_COUNT * sizeof(BYTE); + } + case CSR_NPBUTTON: + case CSR_TPBUTTON: + { + BYTE button = 0; + return TABLET_CopyData(lpOutput, &button, sizeof(button)); + } + case CSR_NPBTNMARKS: + case CSR_TPBTNMARKS: + { + static const UINT marks[] = {0, 1}; + return TABLET_CopyData(lpOutput, &marks, sizeof(marks)); + } + case CSR_NPRESPONSE: + case CSR_TPRESPONSE: + { + static const int POINT_COUNT = 256; + PUINT out_uint = lpOutput; + int p; + + if (out_uint != NULL) + { + /* Linear response */ + for (p = 0; p < POINT_COUNT; p++) + out_uint[p] = MAX_PRESSURE * p / POINT_COUNT; + } + return POINT_COUNT * sizeof(UINT); + } + case CSR_PHYSID: + { + DWORD physid = 0xdeadbeef; + return TABLET_CopyData(lpOutput, &physid, sizeof(physid)); + } + case CSR_MODE: + { + UINT mode = (UINT)cursor_idx; + if(!(CURSOR_CAPABILITIES[cursor_idx] & CRC_MULTIMODE)) + return 0; + return TABLET_CopyData(lpOutput, &mode, sizeof(mode)); + } + case CSR_MINPKTDATA: + { + /* Should be safe to assume all tablets support these */ + UINT pktdata = PK_CONTEXT | PK_STATUS | PK_TIME | PK_CHANGED + | PK_SERIAL_NUMBER | PK_CURSOR | PK_BUTTONS | PK_X | PK_Y + | PK_NORMAL_PRESSURE; + if(!(CURSOR_CAPABILITIES[cursor_idx] & CRC_AGGREGATE)) + return 0; + return TABLET_CopyData(lpOutput, &pktdata, sizeof(pktdata)); + } + case CSR_MINBUTTONS: + { + UINT minbuttons = 1; + if(!(CURSOR_CAPABILITIES[cursor_idx] & CRC_AGGREGATE)) + return 0; + return TABLET_CopyData(lpOutput, &minbuttons, sizeof(minbuttons)); + } + case CSR_CAPABILITIES: + return TABLET_CopyData(lpOutput, CURSOR_CAPABILITIES + cursor_idx, sizeof(*CURSOR_CAPABILITIES)); + case CSR_TYPE: + return TABLET_CopyData(lpOutput, CURSOR_TYPES + cursor_idx, sizeof(*CURSOR_TYPES)); + default: + FIXME("WTI_CURSORS+%d unhandled index %i\n", cursor_idx, nIndex); + return 0; + } + } + + /* Non-indexed categories */ + switch(wCategory) + { + case 0: + /* Largest buffer necessary for any category. This is currently + * WTI_CURSORS :: CSR_NPRESPONSE (or CSR_TPRESPONSE). */ + return 256 * sizeof(UINT); + case WTI_INTERFACE: + switch (nIndex) + { + case IFC_WINTABID: + { + static const WCHAR name[] = {'M','a','c','d','r','v',' ','W','i','n','t','a','b',' ','1','.','1',0}; + return TABLET_CopyData(lpOutput, name, sizeof(name)); + } + case IFC_SPECVERSION: + { + static const WORD version = (0x01) | (0x01 << 8); + return TABLET_CopyData(lpOutput, &version, sizeof(version)); + } + case IFC_IMPLVERSION: + { + static const WORD version = (0x00) | (0x01 << 8); + return TABLET_CopyData(lpOutput, &version, sizeof(version)); + } + case IFC_NDEVICES: + { + static const UINT num = 1; + return TABLET_CopyData(lpOutput, &num, sizeof(num)); + } + case IFC_NCURSORS: + { + return TABLET_CopyData(lpOutput, &CURSOR_COUNT, sizeof(CURSOR_COUNT)); + } + case IFC_NCONTEXTS: + { + static const UINT num = 1; + return TABLET_CopyData(lpOutput, &num, sizeof(num)); + } + default: + FIXME("WTI_INTERFACE unhandled index %i\n", nIndex); + return 0; + } + break; + case WTI_DEFCONTEXT: + case WTI_DEFSYSCTX: + case WTI_DDCTXS: + case WTI_DDCTXS - 1: + case WTI_DSCTXS: + case WTI_DSCTXS - 1: + { + BOOL is_sys = (wCategory == WTI_DEFSYSCTX || wCategory == WTI_DSCTXS || wCategory == WTI_DSCTXS - 1); + LPLOGCONTEXTW active_ctx = (is_sys ? &macdrv_system_ctx : &macdrv_tablet_ctx); + switch (nIndex) + { + case 0: + return TABLET_CopyData(lpOutput, active_ctx, sizeof(*active_ctx)); + case CTX_NAME: + return TABLET_CopyData(lpOutput, active_ctx->lcName, (strlenW(active_ctx->lcName) + 1) * sizeof(WCHAR)); + case CTX_OPTIONS: + return TABLET_CopyData(lpOutput, &active_ctx->lcOptions, sizeof(active_ctx->lcOptions)); + case CTX_STATUS: + return TABLET_CopyData(lpOutput, &active_ctx->lcStatus, sizeof(active_ctx->lcStatus)); + case CTX_LOCKS: + return TABLET_CopyData(lpOutput, &active_ctx->lcLocks, sizeof(active_ctx->lcLocks)); + case CTX_MSGBASE: + return TABLET_CopyData(lpOutput, &active_ctx->lcMsgBase, sizeof(active_ctx->lcMsgBase)); + case CTX_DEVICE: + return TABLET_CopyData(lpOutput, &active_ctx->lcDevice, sizeof(active_ctx->lcDevice)); + case CTX_PKTRATE: + return TABLET_CopyData(lpOutput, &active_ctx->lcPktRate, sizeof(active_ctx->lcPktRate)); + case CTX_PKTDATA: + return TABLET_CopyData(lpOutput, &active_ctx->lcPktData, sizeof(active_ctx->lcPktData)); + case CTX_PKTMODE: + return TABLET_CopyData(lpOutput, &active_ctx->lcPktMode, sizeof(active_ctx->lcPktMode)); + case CTX_MOVEMASK: + return TABLET_CopyData(lpOutput, &active_ctx->lcMoveMask, sizeof(active_ctx->lcMoveMask)); + case CTX_BTNDNMASK: + return TABLET_CopyData(lpOutput, &active_ctx->lcBtnDnMask, sizeof(active_ctx->lcBtnDnMask)); + case CTX_BTNUPMASK: + return TABLET_CopyData(lpOutput, &active_ctx->lcBtnUpMask, sizeof(active_ctx->lcBtnUpMask)); + case CTX_INORGX: + return TABLET_CopyData(lpOutput, &active_ctx->lcInOrgX, sizeof(active_ctx->lcInOrgX)); + case CTX_INORGY: + return TABLET_CopyData(lpOutput, &active_ctx->lcInOrgY, sizeof(active_ctx->lcInOrgY)); + case CTX_INORGZ: + return TABLET_CopyData(lpOutput, &active_ctx->lcInOrgZ, sizeof(active_ctx->lcInOrgZ)); + case CTX_INEXTX: + return TABLET_CopyData(lpOutput, &active_ctx->lcInExtX, sizeof(active_ctx->lcInExtX)); + case CTX_INEXTY: + return TABLET_CopyData(lpOutput, &active_ctx->lcInExtY, sizeof(active_ctx->lcInExtY)); + case CTX_INEXTZ: + return TABLET_CopyData(lpOutput, &active_ctx->lcInExtZ, sizeof(active_ctx->lcInExtZ)); + case CTX_OUTORGX: + return TABLET_CopyData(lpOutput, &active_ctx->lcOutOrgX, sizeof(active_ctx->lcOutOrgX)); + case CTX_OUTORGY: + return TABLET_CopyData(lpOutput, &active_ctx->lcOutOrgY, sizeof(active_ctx->lcOutOrgY)); + case CTX_OUTORGZ: + return TABLET_CopyData(lpOutput, &active_ctx->lcOutOrgZ, sizeof(active_ctx->lcOutOrgZ)); + case CTX_OUTEXTX: + return TABLET_CopyData(lpOutput, &active_ctx->lcOutExtX, sizeof(active_ctx->lcOutExtX)); + case CTX_OUTEXTY: + return TABLET_CopyData(lpOutput, &active_ctx->lcOutExtY, sizeof(active_ctx->lcOutExtY)); + case CTX_OUTEXTZ: + return TABLET_CopyData(lpOutput, &active_ctx->lcOutExtZ, sizeof(active_ctx->lcOutExtZ)); + case CTX_SENSX: + return TABLET_CopyData(lpOutput, &active_ctx->lcSensX, sizeof(active_ctx->lcSensX)); + case CTX_SENSY: + return TABLET_CopyData(lpOutput, &active_ctx->lcSensY, sizeof(active_ctx->lcSensY)); + case CTX_SENSZ: + return TABLET_CopyData(lpOutput, &active_ctx->lcSensZ, sizeof(active_ctx->lcSensZ)); + case CTX_SYSMODE: + return TABLET_CopyData(lpOutput, &active_ctx->lcSysMode, sizeof(active_ctx->lcSysMode)); + case CTX_SYSORGX: + return TABLET_CopyData(lpOutput, &active_ctx->lcSysOrgX, sizeof(active_ctx->lcSysOrgX)); + case CTX_SYSORGY: + return TABLET_CopyData(lpOutput, &active_ctx->lcSysOrgY, sizeof(active_ctx->lcSysOrgY)); + case CTX_SYSEXTX: + return TABLET_CopyData(lpOutput, &active_ctx->lcSysExtX, sizeof(active_ctx->lcSysExtX)); + case CTX_SYSEXTY: + return TABLET_CopyData(lpOutput, &active_ctx->lcSysExtY, sizeof(active_ctx->lcSysExtY)); + case CTX_SYSSENSX: + return TABLET_CopyData(lpOutput, &active_ctx->lcSysSensX, sizeof(active_ctx->lcSysSensX)); + case CTX_SYSSENSY: + return TABLET_CopyData(lpOutput, &active_ctx->lcSysSensY, sizeof(active_ctx->lcSysSensY)); + default: + FIXME("WTI_DEFSYSCTX unhandled index %i\n", nIndex); + return 0; + } + } + case WTI_DEVICES: + case WTI_DEVICES - 1: + switch (nIndex) + { + case DVC_NAME: + { + static const WCHAR name[] = {'M','a','c','d','r','v',' ','T','a','b','l','e','t',0}; + return TABLET_CopyData(lpOutput, name, sizeof(name)); + } + case DVC_HARDWARE: + { + static const UINT hardware = HWC_HARDPROX; + return TABLET_CopyData(lpOutput, &hardware, sizeof(hardware)); + } + case DVC_NCSRTYPES: + { + static const UINT num = 0; + return TABLET_CopyData(lpOutput, &num, sizeof(num)); + } + case DVC_FIRSTCSR: + { + static const UINT first = 0; + return TABLET_CopyData(lpOutput, &first, sizeof(first)); + } + case DVC_PKTRATE: + return TABLET_CopyData(lpOutput, &macdrv_tablet_ctx.lcPktRate, sizeof(macdrv_tablet_ctx.lcPktRate)); + case DVC_PKTDATA: + return TABLET_CopyData(lpOutput, &macdrv_tablet_ctx.lcPktData, sizeof(macdrv_tablet_ctx.lcPktData)); + case DVC_PKTMODE: + return TABLET_CopyData(lpOutput, &macdrv_tablet_ctx.lcPktMode, sizeof(macdrv_tablet_ctx.lcPktMode)); + case DVC_CSRDATA: + { + static const WTPKT data = 0; + return TABLET_CopyData(lpOutput, &data, sizeof(data)); + } + case DVC_XMARGIN: + case DVC_YMARGIN: + case DVC_ZMARGIN: + { + static const INT margin = 0; + return TABLET_CopyData(lpOutput, &margin, sizeof(margin)); + } + case DVC_X: + case DVC_Y: + case DVC_Z: + { + UINT org = (nIndex == DVC_X ? macdrv_tablet_ctx.lcInOrgX : nIndex == DVC_Y ? macdrv_tablet_ctx.lcInOrgY : macdrv_tablet_ctx.lcInOrgZ); + UINT ext = (nIndex == DVC_X ? macdrv_tablet_ctx.lcInExtX : nIndex == DVC_Y ? macdrv_tablet_ctx.lcInExtY : macdrv_tablet_ctx.lcInExtZ); + AXIS ax = { + .axMin = org, + .axMax = org + ext - 1, + .axUnits = TU_NONE, + .axResolution = 1 + }; + return TABLET_CopyData(lpOutput, &ax, sizeof(ax)); + } + case DVC_NPRESSURE: + { + static const AXIS ax = { + .axMin = 0, + .axMax = MAX_PRESSURE, + .axUnits = TU_NONE, + .axResolution = 1 + }; + return TABLET_CopyData(lpOutput, &ax, sizeof(ax)); + } + case DVC_TPRESSURE: + { + static const AXIS ax = { + .axMin = -MAX_PRESSURE, + .axMax = MAX_PRESSURE, + .axUnits = TU_NONE, + .axResolution = 1 + }; + return TABLET_CopyData(lpOutput, &ax, sizeof(ax)); + } + case DVC_ORIENTATION: + { + static const AXIS axes[] = { + /*.orAzimuth = */ { + .axMin = 0, + .axMax = MAX_ANGLE, + .axUnits = TU_CIRCLE, + .axResolution = CASTFIX32(MAX_ANGLE) + }, + /*.orAltitude = */ { + .axMin = -MAKE_ANGLE_DEG(90), + .axMax = MAKE_ANGLE_DEG(90), + .axUnits = TU_CIRCLE, + .axResolution = CASTFIX32(MAX_ANGLE) + }, + /*.orTwist = */ { + .axMin = 0, + .axMax = MAX_ANGLE, + .axUnits = TU_CIRCLE, + .axResolution = CASTFIX32(MAX_ANGLE) + } + }; + return TABLET_CopyData(lpOutput, &axes, sizeof(axes)); + } + case DVC_ROTATION: + /* Unsupported */ + return 0; + case DVC_PNPID: + { + static const WCHAR pnpId[] = {'n','o','n','-','p','l','u','g','-','n','-','p','l','a','y',0}; + return TABLET_CopyData(lpOutput, pnpId, sizeof(pnpId)); + } + default: + FIXME("WTI_DEVICES unhandled index %i\n", nIndex); + return 0; + } + break; + default: + if (IS_WTI_DEVICES_TYPE(wCategory) || IS_WTI_DDCTXS_TYPE(wCategory) + || IS_WTI_DSCTXS_TYPE(wCategory)) + /* User error, there's only one device */ + return 0; + FIXME("Unhandled Category %i\n", wCategory); + } + return 0; +} + +int CDECL macdrv_AttachEventQueueToTablet(HWND hOwner) +{ + /* Tablet events come from a global monitor rather than relying on + * individual views. Maintain a list of HWNDs interested in these events so + * we can deliver to them later. */ + if (registered_hwnd_count >= registered_hwnd_cap) + { + registered_hwnd_cap = registered_hwnd_cap * 2 + 1; + registered_hwnd = realloc(registered_hwnd, registered_hwnd_cap * sizeof(*registered_hwnd)); + } + + registered_hwnd[registered_hwnd_count++] = hOwner; + + if (registered_hwnd_count > 1) + FIXME("Multiple contexts are not correctly supported. All events are delivered to all contexts.\n"); + + macdrv_start_tablet_monitor(); + return 0; +} + +/*********************************************************************** + * macdrv_tablet_event + * + * Handler for TABLET_EVENT events. + */ +void macdrv_tablet_event(const macdrv_event* event) +{ + int i; + PACKET* old_pkt = &current_packet; + PACKET* new_pkt = event->tablet_event.packet; + int event_type = event->tablet_event.type; + BOOL is_proximity = (event_type != TABLET_EVENT_POINT); + + if (is_proximity) + { + /* Wacom's documentation very confusingly states: + * > The high-order word is non-zero when the cursor is leaving or + * > entering hardware proximity. + * What it actually means is that the high-order word is 1 when entering + * proximity or 0 when leaving proximity. + * + * The low and high order words are always the same. The only way to + * enter/leave context proximity without entering/leaving device + * proximity is to have multiple contexts. Macdrv has no awareness of + * contexts so this would have to be handled by wintab.dll. */ + BOOL is_enter = (event_type == TABLET_EVENT_PROXIMITY_ENTER); + LPARAM l_param = MAKELPARAM(is_enter, is_enter); + + /* We can get duplicate events due to NSEventTypeMouseMoved + + * NSEventTypeTabletProximity both being delivered. Squash them here. */ + if (last_event_type == event_type) + return; + + last_event_type = event_type; + + for (i = 0; i < registered_hwnd_count; i++) + { + HWND hwnd = registered_hwnd[i]; + SendMessageW(macdrv_tablet_hwnd, WT_PROXIMITY, (WPARAM)hwnd, l_param); + } + } + else + { + last_event_type = TABLET_EVENT_POINT; + + /* Calculate which values changed */ + new_pkt->pkChanged = ((new_pkt->pkStatus != old_pkt->pkStatus) * PK_STATUS) + | ((new_pkt->pkTime != old_pkt->pkTime) * PK_TIME) + | PK_SERIAL_NUMBER + | ((new_pkt->pkButtons != old_pkt->pkButtons) * PK_BUTTONS) + | ((new_pkt->pkX != old_pkt->pkX) * PK_X) + | ((new_pkt->pkY != old_pkt->pkY) * PK_Y) + | ((new_pkt->pkZ != old_pkt->pkZ) * PK_Z) + | ((new_pkt->pkNormalPressure != old_pkt->pkNormalPressure) * PK_NORMAL_PRESSURE) + | ((new_pkt->pkTangentPressure != old_pkt->pkTangentPressure) * PK_TANGENT_PRESSURE) + | ((memcmp(&new_pkt->pkOrientation, &old_pkt->pkOrientation, sizeof(new_pkt->pkOrientation)) != 0) * PK_ORIENTATION); + + *old_pkt = *new_pkt; + free(new_pkt); + + for (i = 0; i < registered_hwnd_count; i++) + { + HWND hwnd = registered_hwnd[i]; + SendMessageW(macdrv_tablet_hwnd, WT_PACKET, (WPARAM)current_packet.pkSerialNumber, (LPARAM)hwnd); + } + } +} + +int CDECL macdrv_GetCurrentPacket(LPPACKET packet){ + *packet = current_packet; + return 1; +} diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 331601c3325..f8b0cb1cac9 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -203,54 +203,6 @@ typedef struct tagWTI_DEVICES_INFO } WTI_DEVICES_INFO, *LPWTI_DEVICES_INFO; -/*********************************************************************** - * WACOM WINTAB EXTENSIONS TO SUPPORT CSR_TYPE - * In Wintab 1.2, a CSR_TYPE feature was added. This adds the - * ability to return a type of cursor on a tablet. - * Unfortunately, we cannot get the cursor type directly from X, - * and it is not specified directly anywhere. So we virtualize - * the type here. (This is unfortunate, the kernel module has - * the exact type, but we have no way of getting that module to - * pass us that type). - * - * Reference linuxwacom driver project wcmCommon.c function - * idtotype for a much larger list of CSR_TYPE. - * - * http://linuxwacom.cvs.sourceforge.net/linuxwacom/linuxwacom-prod/src/xdrv/w… - * - * The WTI_CURSORS_INFO.TYPE data is supposed to be used like this: - * (cursor.TYPE & 0x0F06) == target_cursor_type - * Reference: Section Unique ID - * http://www.wacomeng.com/devsupport/ibmpc/gddevpc.html - */ -#define CSR_TYPE_PEN 0x822 -#define CSR_TYPE_ERASER 0x82a -#define CSR_TYPE_MOUSE_2D 0x007 -#define CSR_TYPE_MOUSE_4D 0x094 -/* CSR_TYPE_OTHER is a special value! assumed no real world significance - * if a stylus type or eraser type eventually have this value - * it'll be a bug. As of 2008 05 21 we can be sure because - * linux wacom lists all the known values and this isn't one of them */ -#define CSR_TYPE_OTHER 0x000 - -typedef struct tagWTPACKET { - HCTX pkContext; - UINT pkStatus; - LONG pkTime; - WTPKT pkChanged; - UINT pkSerialNumber; - UINT pkCursor; - DWORD pkButtons; - DWORD pkX; - DWORD pkY; - DWORD pkZ; - UINT pkNormalPressure; - UINT pkTangentPressure; - ORIENTATION pkOrientation; - ROTATION pkRotation; /* 1.1 */ -} WTPACKET, *LPWTPACKET; - - #ifdef SONAME_LIBXI #include <X11/Xlib.h> @@ -265,9 +217,9 @@ static int proximity_in_type; static int proximity_out_type; static HWND hwndTabletDefault; -static WTPACKET gMsgPacket; +static PACKET gMsgPacket; static DWORD gSerial; -static WTPACKET last_packet; +static PACKET last_packet; /* Reference: http://www.wacomeng.com/devsupport/ibmpc/gddevpc.html * @@ -845,7 +797,7 @@ static int cursor_from_device(DWORD deviceid, LPWTI_CURSORS_INFO *cursorp) return -1; } -static DWORD get_changed_state( WTPACKET *pkt) +static DWORD get_changed_state( PACKET *pkt) { DWORD change = 0; @@ -879,6 +831,11 @@ static DWORD get_changed_state( WTPACKET *pkt) return change; } +static inline DWORD flip_y( DWORD y ) +{ + return gSysContext.lcInExtY - y; +} + static BOOL motion_event( HWND hwnd, XEvent *event ) { XDeviceMotionEvent *motion = (XDeviceMotionEvent *)event; @@ -887,7 +844,7 @@ static BOOL motion_event( HWND hwnd, XEvent *event ) if (curnum < 0) return FALSE; - memset(&gMsgPacket,0,sizeof(WTPACKET)); + memset(&gMsgPacket,0,sizeof(PACKET)); TRACE("Received tablet motion event (%p); device id %d, cursor num %d\n",hwnd, (int) motion->deviceid, curnum); @@ -897,7 +854,7 @@ static BOOL motion_event( HWND hwnd, XEvent *event ) gMsgPacket.pkSerialNumber = gSerial++; gMsgPacket.pkCursor = curnum; gMsgPacket.pkX = motion->axis_data[0]; - gMsgPacket.pkY = motion->axis_data[1]; + gMsgPacket.pkY = flip_y(motion->axis_data[1]); gMsgPacket.pkOrientation.orAzimuth = figure_deg(motion->axis_data[3],motion->axis_data[4]); gMsgPacket.pkOrientation.orAltitude = ((1000 - 15 * max (abs(motion->axis_data[3]), @@ -919,7 +876,7 @@ static BOOL button_event( HWND hwnd, XEvent *event ) if (curnum < 0) return FALSE; - memset(&gMsgPacket,0,sizeof(WTPACKET)); + memset(&gMsgPacket,0,sizeof(PACKET)); TRACE("Received tablet button %s event\n", (event->type == button_press_type)?"press":"release"); @@ -931,7 +888,7 @@ static BOOL button_event( HWND hwnd, XEvent *event ) gMsgPacket.pkCursor = curnum; if (button->axes_count > 0) { gMsgPacket.pkX = button->axis_data[0]; - gMsgPacket.pkY = button->axis_data[1]; + gMsgPacket.pkY = flip_y(button->axis_data[1]); gMsgPacket.pkOrientation.orAzimuth = figure_deg(button->axis_data[3],button->axis_data[4]); gMsgPacket.pkOrientation.orAltitude = ((1000 - 15 * max(abs(button->axis_data[3]), abs(button->axis_data[4]))) @@ -971,7 +928,7 @@ static BOOL proximity_event( HWND hwnd, XEvent *event ) if (curnum < 0) return FALSE; - memset(&gMsgPacket,0,sizeof(WTPACKET)); + memset(&gMsgPacket,0,sizeof(PACKET)); /* Set cursor to inverted if cursor is the eraser */ gMsgPacket.pkStatus = (cursor->TYPE == CSR_TYPE_ERASER ? TPS_INVERT:0); @@ -980,7 +937,7 @@ static BOOL proximity_event( HWND hwnd, XEvent *event ) gMsgPacket.pkSerialNumber = gSerial++; gMsgPacket.pkCursor = curnum; gMsgPacket.pkX = proximity->axis_data[0]; - gMsgPacket.pkY = proximity->axis_data[1]; + gMsgPacket.pkY = flip_y(proximity->axis_data[1]); gMsgPacket.pkOrientation.orAzimuth = figure_deg(proximity->axis_data[3],proximity->axis_data[4]); gMsgPacket.pkOrientation.orAltitude = ((1000 - 15 * max(abs(proximity->axis_data[3]), abs(proximity->axis_data[4]))) @@ -1095,24 +1052,13 @@ int CDECL X11DRV_AttachEventQueueToTablet(HWND hOwner) /*********************************************************************** * X11DRV_GetCurrentPacket (X11DRV.@) */ -int CDECL X11DRV_GetCurrentPacket(LPWTPACKET packet) +int CDECL X11DRV_GetCurrentPacket(LPPACKET packet) { *packet = gMsgPacket; return 1; } -static inline int CopyTabletData(LPVOID target, LPCVOID src, INT size) -{ - /* - * It is valid to call CopyTabletData with NULL. - * This handles the WTInfo() case where lpOutput is null. - */ - if(target != NULL) - memcpy(target,src,size); - return(size); -} - /*********************************************************************** * X11DRV_WTInfoW (X11DRV.@) */ @@ -1123,7 +1069,7 @@ UINT CDECL X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) * lpOutput == NULL signifies the user only wishes * to find the size of the data. * NOTE: - * From now on use CopyTabletData to fill lpOutput. memcpy will break + * From now on use TABLET_CopyData to fill lpOutput. memcpy will break * the code. */ int rc = 0; @@ -1151,24 +1097,24 @@ UINT CDECL X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) case IFC_WINTABID: { static const WCHAR driver[] = {'W','i','n','e',' ','W','i','n','t','a','b',' ','1','.','1',0}; - rc = CopyTabletData(lpOutput, driver, (strlenW(driver) + 1) * sizeof(WCHAR)); + rc = TABLET_CopyData(lpOutput, driver, (strlenW(driver) + 1) * sizeof(WCHAR)); break; } case IFC_SPECVERSION: version = (0x01) | (0x01 << 8); - rc = CopyTabletData(lpOutput, &version,sizeof(WORD)); + rc = TABLET_CopyData(lpOutput, &version,sizeof(WORD)); break; case IFC_IMPLVERSION: version = (0x00) | (0x01 << 8); - rc = CopyTabletData(lpOutput, &version,sizeof(WORD)); + rc = TABLET_CopyData(lpOutput, &version,sizeof(WORD)); break; case IFC_NDEVICES: num = 1; - rc = CopyTabletData(lpOutput, &num,sizeof(num)); + rc = TABLET_CopyData(lpOutput, &num,sizeof(num)); break; case IFC_NCURSORS: num = gNumCursors; - rc = CopyTabletData(lpOutput, &num,sizeof(num)); + rc = TABLET_CopyData(lpOutput, &num,sizeof(num)); break; default: FIXME("WTI_INTERFACE unhandled index %i\n",nIndex); @@ -1185,143 +1131,143 @@ UINT CDECL X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) if (0 == gNumCursors) rc = 0; else - rc = CopyTabletData(lpOutput, &gSysContext, + rc = TABLET_CopyData(lpOutput, &gSysContext, sizeof(LOGCONTEXTW)); break; case CTX_NAME: - rc = CopyTabletData(lpOutput, gSysContext.lcName, + rc = TABLET_CopyData(lpOutput, gSysContext.lcName, (strlenW(gSysContext.lcName)+1) * sizeof(WCHAR)); break; case CTX_OPTIONS: - rc = CopyTabletData(lpOutput, &gSysContext.lcOptions, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcOptions, sizeof(UINT)); break; case CTX_STATUS: - rc = CopyTabletData(lpOutput, &gSysContext.lcStatus, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcStatus, sizeof(UINT)); break; case CTX_LOCKS: - rc= CopyTabletData (lpOutput, &gSysContext.lcLocks, + rc= TABLET_CopyData (lpOutput, &gSysContext.lcLocks, sizeof(UINT)); break; case CTX_MSGBASE: - rc = CopyTabletData(lpOutput, &gSysContext.lcMsgBase, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcMsgBase, sizeof(UINT)); break; case CTX_DEVICE: - rc = CopyTabletData(lpOutput, &gSysContext.lcDevice, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcDevice, sizeof(UINT)); break; case CTX_PKTRATE: - rc = CopyTabletData(lpOutput, &gSysContext.lcPktRate, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcPktRate, sizeof(UINT)); break; case CTX_PKTDATA: - rc = CopyTabletData(lpOutput, &gSysContext.lcPktData, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcPktData, sizeof(WTPKT)); break; case CTX_PKTMODE: - rc = CopyTabletData(lpOutput, &gSysContext.lcPktMode, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcPktMode, sizeof(WTPKT)); break; case CTX_MOVEMASK: - rc = CopyTabletData(lpOutput, &gSysContext.lcMoveMask, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcMoveMask, sizeof(WTPKT)); break; case CTX_BTNDNMASK: - rc = CopyTabletData(lpOutput, &gSysContext.lcBtnDnMask, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcBtnDnMask, sizeof(DWORD)); break; case CTX_BTNUPMASK: - rc = CopyTabletData(lpOutput, &gSysContext.lcBtnUpMask, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcBtnUpMask, sizeof(DWORD)); break; case CTX_INORGX: - rc = CopyTabletData(lpOutput, &gSysContext.lcInOrgX, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcInOrgX, sizeof(LONG)); break; case CTX_INORGY: - rc = CopyTabletData(lpOutput, &gSysContext.lcInOrgY, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcInOrgY, sizeof(LONG)); break; case CTX_INORGZ: - rc = CopyTabletData(lpOutput, &gSysContext.lcInOrgZ, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcInOrgZ, sizeof(LONG)); break; case CTX_INEXTX: - rc = CopyTabletData(lpOutput, &gSysContext.lcInExtX, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcInExtX, sizeof(LONG)); break; case CTX_INEXTY: - rc = CopyTabletData(lpOutput, &gSysContext.lcInExtY, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcInExtY, sizeof(LONG)); break; case CTX_INEXTZ: - rc = CopyTabletData(lpOutput, &gSysContext.lcInExtZ, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcInExtZ, sizeof(LONG)); break; case CTX_OUTORGX: - rc = CopyTabletData(lpOutput, &gSysContext.lcOutOrgX, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcOutOrgX, sizeof(LONG)); break; case CTX_OUTORGY: - rc = CopyTabletData(lpOutput, &gSysContext.lcOutOrgY, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcOutOrgY, sizeof(LONG)); break; case CTX_OUTORGZ: - rc = CopyTabletData(lpOutput, &gSysContext.lcOutOrgZ, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcOutOrgZ, sizeof(LONG)); break; case CTX_OUTEXTX: - rc = CopyTabletData(lpOutput, &gSysContext.lcOutExtX, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcOutExtX, sizeof(LONG)); break; case CTX_OUTEXTY: - rc = CopyTabletData(lpOutput, &gSysContext.lcOutExtY, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcOutExtY, sizeof(LONG)); break; case CTX_OUTEXTZ: - rc = CopyTabletData(lpOutput, &gSysContext.lcOutExtZ, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcOutExtZ, sizeof(LONG)); break; case CTX_SENSX: - rc = CopyTabletData(lpOutput, &gSysContext.lcSensX, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcSensX, sizeof(LONG)); break; case CTX_SENSY: - rc = CopyTabletData(lpOutput, &gSysContext.lcSensY, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcSensY, sizeof(LONG)); break; case CTX_SENSZ: - rc = CopyTabletData(lpOutput, &gSysContext.lcSensZ, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcSensZ, sizeof(LONG)); break; case CTX_SYSMODE: - rc = CopyTabletData(lpOutput, &gSysContext.lcSysMode, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcSysMode, sizeof(LONG)); break; case CTX_SYSORGX: - rc = CopyTabletData(lpOutput, &gSysContext.lcSysOrgX, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcSysOrgX, sizeof(LONG)); break; case CTX_SYSORGY: - rc = CopyTabletData(lpOutput, &gSysContext.lcSysOrgY, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcSysOrgY, sizeof(LONG)); break; case CTX_SYSEXTX: - rc = CopyTabletData(lpOutput, &gSysContext.lcSysExtX, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcSysExtX, sizeof(LONG)); break; case CTX_SYSEXTY: - rc = CopyTabletData(lpOutput, &gSysContext.lcSysExtY, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcSysExtY, sizeof(LONG)); break; case CTX_SYSSENSX: - rc = CopyTabletData(lpOutput, &gSysContext.lcSysSensX, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcSysSensX, sizeof(LONG)); break; case CTX_SYSSENSY: - rc = CopyTabletData(lpOutput, &gSysContext.lcSysSensY, + rc = TABLET_CopyData(lpOutput, &gSysContext.lcSysSensY, sizeof(LONG)); break; default: @@ -1353,44 +1299,44 @@ UINT CDECL X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) switch (nIndex) { case CSR_NAME: - rc = CopyTabletData(lpOutput, tgtcursor->NAME, + rc = TABLET_CopyData(lpOutput, tgtcursor->NAME, (strlenW(tgtcursor->NAME)+1) * sizeof(WCHAR)); break; case CSR_ACTIVE: - rc = CopyTabletData(lpOutput,&tgtcursor->ACTIVE, + rc = TABLET_CopyData(lpOutput,&tgtcursor->ACTIVE, sizeof(BOOL)); break; case CSR_PKTDATA: - rc = CopyTabletData(lpOutput,&tgtcursor->PKTDATA, + rc = TABLET_CopyData(lpOutput,&tgtcursor->PKTDATA, sizeof(WTPKT)); break; case CSR_BUTTONS: - rc = CopyTabletData(lpOutput,&tgtcursor->BUTTONS, + rc = TABLET_CopyData(lpOutput,&tgtcursor->BUTTONS, sizeof(BYTE)); break; case CSR_BUTTONBITS: - rc = CopyTabletData(lpOutput,&tgtcursor->BUTTONBITS, + rc = TABLET_CopyData(lpOutput,&tgtcursor->BUTTONBITS, sizeof(BYTE)); break; case CSR_BTNNAMES: FIXME("Button Names not returned correctly\n"); - rc = CopyTabletData(lpOutput,&tgtcursor->BTNNAMES, + rc = TABLET_CopyData(lpOutput,&tgtcursor->BTNNAMES, tgtcursor->cchBTNNAMES*sizeof(WCHAR)); break; case CSR_BUTTONMAP: - rc = CopyTabletData(lpOutput,tgtcursor->BUTTONMAP, + rc = TABLET_CopyData(lpOutput,tgtcursor->BUTTONMAP, sizeof(BYTE)*32); break; case CSR_SYSBTNMAP: - rc = CopyTabletData(lpOutput,tgtcursor->SYSBTNMAP, + rc = TABLET_CopyData(lpOutput,tgtcursor->SYSBTNMAP, sizeof(BYTE)*32); break; case CSR_NPBTNMARKS: - rc = CopyTabletData(lpOutput,tgtcursor->NPBTNMARKS, + rc = TABLET_CopyData(lpOutput,tgtcursor->NPBTNMARKS, sizeof(UINT)*2); break; case CSR_NPBUTTON: - rc = CopyTabletData(lpOutput,&tgtcursor->NPBUTTON, + rc = TABLET_CopyData(lpOutput,&tgtcursor->NPBUTTON, sizeof(BYTE)); break; case CSR_NPRESPONSE: @@ -1398,11 +1344,11 @@ UINT CDECL X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) rc = 0; break; case CSR_TPBUTTON: - rc = CopyTabletData(lpOutput,&tgtcursor->TPBUTTON, + rc = TABLET_CopyData(lpOutput,&tgtcursor->TPBUTTON, sizeof(BYTE)); break; case CSR_TPBTNMARKS: - rc = CopyTabletData(lpOutput,tgtcursor->TPBTNMARKS, + rc = TABLET_CopyData(lpOutput,tgtcursor->TPBTNMARKS, sizeof(UINT)*2); break; case CSR_TPRESPONSE: @@ -1413,26 +1359,26 @@ UINT CDECL X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) { DWORD id; id = tgtcursor->PHYSID; - rc = CopyTabletData(lpOutput,&id,sizeof(DWORD)); + rc = TABLET_CopyData(lpOutput,&id,sizeof(DWORD)); } break; case CSR_MODE: - rc = CopyTabletData(lpOutput,&tgtcursor->MODE,sizeof(UINT)); + rc = TABLET_CopyData(lpOutput,&tgtcursor->MODE,sizeof(UINT)); break; case CSR_MINPKTDATA: - rc = CopyTabletData(lpOutput,&tgtcursor->MINPKTDATA, + rc = TABLET_CopyData(lpOutput,&tgtcursor->MINPKTDATA, sizeof(UINT)); break; case CSR_MINBUTTONS: - rc = CopyTabletData(lpOutput,&tgtcursor->MINBUTTONS, + rc = TABLET_CopyData(lpOutput,&tgtcursor->MINBUTTONS, sizeof(UINT)); break; case CSR_CAPABILITIES: - rc = CopyTabletData(lpOutput,&tgtcursor->CAPABILITIES, + rc = TABLET_CopyData(lpOutput,&tgtcursor->CAPABILITIES, sizeof(UINT)); break; case CSR_TYPE: - rc = CopyTabletData(lpOutput,&tgtcursor->TYPE, + rc = TABLET_CopyData(lpOutput,&tgtcursor->TYPE, sizeof(UINT)); break; default: @@ -1445,91 +1391,91 @@ UINT CDECL X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) switch (nIndex) { case DVC_NAME: - rc = CopyTabletData(lpOutput,gSysDevice.NAME, + rc = TABLET_CopyData(lpOutput,gSysDevice.NAME, (strlenW(gSysDevice.NAME)+1) * sizeof(WCHAR)); break; case DVC_HARDWARE: - rc = CopyTabletData(lpOutput,&gSysDevice.HARDWARE, + rc = TABLET_CopyData(lpOutput,&gSysDevice.HARDWARE, sizeof(UINT)); break; case DVC_NCSRTYPES: - rc = CopyTabletData(lpOutput,&gSysDevice.NCSRTYPES, + rc = TABLET_CopyData(lpOutput,&gSysDevice.NCSRTYPES, sizeof(UINT)); break; case DVC_FIRSTCSR: - rc = CopyTabletData(lpOutput,&gSysDevice.FIRSTCSR, + rc = TABLET_CopyData(lpOutput,&gSysDevice.FIRSTCSR, sizeof(UINT)); break; case DVC_PKTRATE: - rc = CopyTabletData(lpOutput,&gSysDevice.PKTRATE, + rc = TABLET_CopyData(lpOutput,&gSysDevice.PKTRATE, sizeof(UINT)); break; case DVC_PKTDATA: - rc = CopyTabletData(lpOutput,&gSysDevice.PKTDATA, + rc = TABLET_CopyData(lpOutput,&gSysDevice.PKTDATA, sizeof(WTPKT)); break; case DVC_PKTMODE: - rc = CopyTabletData(lpOutput,&gSysDevice.PKTMODE, + rc = TABLET_CopyData(lpOutput,&gSysDevice.PKTMODE, sizeof(WTPKT)); break; case DVC_CSRDATA: - rc = CopyTabletData(lpOutput,&gSysDevice.CSRDATA, + rc = TABLET_CopyData(lpOutput,&gSysDevice.CSRDATA, sizeof(WTPKT)); break; case DVC_XMARGIN: - rc = CopyTabletData(lpOutput,&gSysDevice.XMARGIN, + rc = TABLET_CopyData(lpOutput,&gSysDevice.XMARGIN, sizeof(INT)); break; case DVC_YMARGIN: - rc = CopyTabletData(lpOutput,&gSysDevice.YMARGIN, + rc = TABLET_CopyData(lpOutput,&gSysDevice.YMARGIN, sizeof(INT)); break; case DVC_ZMARGIN: rc = 0; /* unsupported */ /* - rc = CopyTabletData(lpOutput,&gSysDevice.ZMARGIN, + rc = TABLET_CopyData(lpOutput,&gSysDevice.ZMARGIN, sizeof(INT)); */ break; case DVC_X: - rc = CopyTabletData(lpOutput,&gSysDevice.X, + rc = TABLET_CopyData(lpOutput,&gSysDevice.X, sizeof(AXIS)); break; case DVC_Y: - rc = CopyTabletData(lpOutput,&gSysDevice.Y, + rc = TABLET_CopyData(lpOutput,&gSysDevice.Y, sizeof(AXIS)); break; case DVC_Z: rc = 0; /* unsupported */ /* - rc = CopyTabletData(lpOutput,&gSysDevice.Z, + rc = TABLET_CopyData(lpOutput,&gSysDevice.Z, sizeof(AXIS)); */ break; case DVC_NPRESSURE: - rc = CopyTabletData(lpOutput,&gSysDevice.NPRESSURE, + rc = TABLET_CopyData(lpOutput,&gSysDevice.NPRESSURE, sizeof(AXIS)); break; case DVC_TPRESSURE: rc = 0; /* unsupported */ /* - rc = CopyTabletData(lpOutput,&gSysDevice.TPRESSURE, + rc = TABLET_CopyData(lpOutput,&gSysDevice.TPRESSURE, sizeof(AXIS)); */ break; case DVC_ORIENTATION: - rc = CopyTabletData(lpOutput,gSysDevice.ORIENTATION, + rc = TABLET_CopyData(lpOutput,gSysDevice.ORIENTATION, sizeof(AXIS)*3); break; case DVC_ROTATION: rc = 0; /* unsupported */ /* - rc = CopyTabletData(lpOutput,&gSysDevice.ROTATION, + rc = TABLET_CopyData(lpOutput,&gSysDevice.ROTATION, sizeof(AXIS)*3); */ break; case DVC_PNPID: - rc = CopyTabletData(lpOutput,gSysDevice.PNPID, + rc = TABLET_CopyData(lpOutput,gSysDevice.PNPID, (strlenW(gSysDevice.PNPID)+1)*sizeof(WCHAR)); break; default: @@ -1556,7 +1502,7 @@ int CDECL X11DRV_AttachEventQueueToTablet(HWND hOwner) /*********************************************************************** * GetCurrentPacket (X11DRV.@) */ -int CDECL X11DRV_GetCurrentPacket(LPWTPACKET packet) +int CDECL X11DRV_GetCurrentPacket(LPPACKET packet) { return 0; } diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 58ba6b49074..8c7953a8e68 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wintab32); /* * Documentation found at - * http://www.csl.sony.co.jp/projects/ar/restricted/wintabl.html + * https://developer-docs.wacom.com/intuos-cintiq-business-tablets/docs/wintab… */ static LPOPENCONTEXT gOpenContexts; @@ -62,7 +62,8 @@ static void LOGCONTEXTWtoA(const LOGCONTEXTW *in, LOGCONTEXTA *out) static BOOL is_logcontext_category(UINT wCategory) { - return wCategory == WTI_DEFSYSCTX || wCategory == WTI_DEFCONTEXT || wCategory == WTI_DDCTXS; + return wCategory == WTI_DEFSYSCTX || wCategory == WTI_DEFCONTEXT + || IS_WTI_DDCTXS_TYPE(wCategory) || IS_WTI_DSCTXS_TYPE(wCategory); } static BOOL is_string_field(UINT wCategory, UINT nIndex) @@ -71,10 +72,11 @@ static BOOL is_string_field(UINT wCategory, UINT nIndex) return TRUE; if (is_logcontext_category(wCategory) && nIndex == CTX_NAME) return TRUE; - if ((wCategory >= WTI_CURSORS && wCategory <= WTI_CURSORS + 9) && - (nIndex == CSR_NAME || nIndex == CSR_BTNNAMES)) + if (IS_WTI_CURSORS_TYPE(wCategory) + && (nIndex == CSR_NAME || nIndex == CSR_BTNNAMES)) return TRUE; - if (wCategory == WTI_DEVICES && (nIndex == DVC_NAME || nIndex == DVC_PNPID)) + if (IS_WTI_DEVICES_TYPE(wCategory) + && (nIndex == DVC_NAME || nIndex == DVC_PNPID)) return TRUE; return FALSE; } @@ -100,7 +102,7 @@ static const char* DUMPBITS(int x) return wine_dbg_sprintf("{%s}",buf); } -static inline void DUMPPACKET(WTPACKET packet) +static inline void DUMPPACKET(PACKET packet) { TRACE("pkContext: %p pkStatus: 0x%x pkTime : 0x%lx pkChanged: 0x%lx pkSerialNumber: 0x%x pkCursor : %i pkButtons: %lx pkX: %li pkY: %li pkZ: %li pkNormalPressure: %i pkTangentPressure: %i pkOrientation: (%i,%i,%i) pkRotation: (%i,%i,%i)\n", packet.pkContext, packet.pkStatus, packet.pkTime, packet.pkChanged, packet.pkSerialNumber, @@ -175,15 +177,47 @@ int TABLET_PostTabletMessage(LPOPENCONTEXT newcontext, UINT msg, WPARAM wParam, return 0; } +LPOPENCONTEXT FindContextForHwnd(HWND hwnd) +{ + LPOPENCONTEXT ptr = gOpenContexts; + + EnterCriticalSection(&csTablet); + while (ptr) + { + if (ptr->hwndOwner == hwnd && ptr->enabled) + break; + ptr = ptr->next; + } + LeaveCriticalSection(&csTablet); + return ptr; +} + +/* Scale point for tablet area. Org is offset. Ext is length. Negative extent + * indicates flipped coordinate system, but coordinates remain positive. + * (Org <= x < Org + abs(Ext)) */ static inline DWORD ScaleForContext(DWORD In, LONG InOrg, LONG InExt, LONG OutOrg, LONG OutExt) { - if (((InExt > 0 )&&(OutExt > 0)) || ((InExt<0) && (OutExt < 0))) - return MulDiv(In - InOrg, abs(OutExt), abs(InExt)) + OutOrg; + LONG AbsInExt = abs(InExt); + LONG AbsOutExt = abs(OutExt); + + if (AbsInExt <= 1 || AbsOutExt <= 1) + /* No dimensions */ + return 0; + + /* Largest representable value is 1 less than extent, we need to scale by + * that. This is the same way wintab does it. */ + AbsInExt--; + AbsOutExt--; + + if ((InExt < 0) == (OutExt < 0)) + /* Same sign, maintain direction */ + return MulDiv(In - InOrg, AbsOutExt, AbsInExt) + OutOrg; else - return MulDiv(abs(InExt) - (In - InOrg), abs(OutExt), abs(InExt)) + OutOrg; + /* Opposite signs, invert direction */ + return MulDiv(AbsInExt - (In - InOrg), AbsOutExt, AbsInExt) + OutOrg; } -LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd) +LPOPENCONTEXT AddPacketToContextQueue(LPPACKET packet, HWND hwnd) { LPOPENCONTEXT ptr=NULL; @@ -204,29 +238,36 @@ LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd) } tgt = ptr->PacketsQueued; + if (tgt > 0 && ptr->PacketQueue[tgt - 1].pkSerialNumber == packet->pkSerialNumber) + { + ptr = ptr->next; + continue; + + } packet->pkContext = ptr->handle; - /* translate packet data to the context */ + /* Translate packet data to the context */ packet->pkChanged = packet->pkChanged & ptr->context.lcPktData; - /* Scale as per documentation */ - packet->pkY = ScaleForContext(packet->pkY, ptr->context.lcInOrgY, - ptr->context.lcInExtY, ptr->context.lcOutOrgY, - ptr->context.lcOutExtY); + packet->pkX = ScaleForContext(packet->pkX, + ptr->context.lcInOrgX, ptr->context.lcInExtX, + ptr->context.lcOutOrgX, ptr->context.lcOutExtX); - packet->pkX = ScaleForContext(packet->pkX, ptr->context.lcInOrgX, - ptr->context.lcInExtX, ptr->context.lcOutOrgX, - ptr->context.lcOutExtX); + packet->pkY = ScaleForContext(packet->pkY, + ptr->context.lcInOrgY, ptr->context.lcInExtY, + ptr->context.lcOutOrgY, ptr->context.lcOutExtY); - /* flip the Y axis */ - if (ptr->context.lcOutExtY > 0) - packet->pkY = ptr->context.lcOutExtY - packet->pkY; - else if (ptr->context.lcOutExtY < 0) - { - int y = ptr->context.lcOutExtY + packet->pkY; - packet->pkY = abs(y); - } + /* Clip values if outside of reporting range */ + if ((LONG)packet->pkX < ptr->context.lcOutOrgX) + packet->pkX = ptr->context.lcOutOrgX; + else if((LONG)packet->pkX >= ptr->context.lcOutOrgX + abs(ptr->context.lcOutExtX)) + packet->pkX = ptr->context.lcOutOrgX + abs(ptr->context.lcOutExtX) - 1; + + if ((LONG)packet->pkY < ptr->context.lcOutOrgY) + packet->pkY = ptr->context.lcOutOrgY; + else if((LONG)packet->pkY >= ptr->context.lcOutOrgY + abs(ptr->context.lcOutExtY)) + packet->pkY = ptr->context.lcOutOrgY + abs(ptr->context.lcOutExtY) - 1; DUMPPACKET(*packet); @@ -274,7 +315,7 @@ static inline int CopyTabletData(LPVOID target, LPVOID src, INT size) } static INT TABLET_FindPacket(LPOPENCONTEXT context, UINT wSerial, - LPWTPACKET *pkt) + LPPACKET *pkt) { int loop; int index = -1; @@ -293,7 +334,7 @@ static INT TABLET_FindPacket(LPOPENCONTEXT context, UINT wSerial, static LPVOID TABLET_CopyPacketData(LPOPENCONTEXT context, LPVOID lpPkt, - LPWTPACKET wtp) + LPPACKET wtp) { LPBYTE ptr; @@ -378,47 +419,27 @@ static UINT WTInfoT(UINT wCategory, UINT nIndex, LPVOID lpOutput, BOOL bUnicode) if (!LoadTablet()) return 0; TRACE("(%d, %d, %p, %d)\n", wCategory, nIndex, lpOutput, bUnicode); - - /* - * Handle system extents here, as we can use user32.dll code to set them. - */ - if(wCategory == WTI_DEFSYSCTX) + if (is_logcontext_category(wCategory) && nIndex == 0) { - switch(nIndex) + if (pWTInfoW(wCategory, nIndex, NULL) == 0) { - case CTX_SYSEXTX: - if(lpOutput != NULL) - *(LONG*)lpOutput = GetSystemMetrics(SM_CXSCREEN); - return sizeof(LONG); - case CTX_SYSEXTY: - if(lpOutput != NULL) - *(LONG*)lpOutput = GetSystemMetrics(SM_CYSCREEN); - return sizeof(LONG); - /* No action, delegate to X11Drv */ + result = 0; } - } - - if (is_logcontext_category(wCategory) && nIndex == 0) - { - if (lpOutput) + else { - LOGCONTEXTW buf; - pWTInfoW(wCategory, nIndex, &buf); - - /* Handle system extents here, as we can use user32.dll code to set them */ - if(wCategory == WTI_DEFSYSCTX) + if (lpOutput) { - buf.lcSysExtX = GetSystemMetrics(SM_CXSCREEN); - buf.lcSysExtY = GetSystemMetrics(SM_CYSCREEN); + LOGCONTEXTW buf; + pWTInfoW(wCategory, nIndex, &buf); + + if (bUnicode) + memcpy(lpOutput, &buf, sizeof(buf)); + else + LOGCONTEXTWtoA(&buf, lpOutput); } - if (bUnicode) - memcpy(lpOutput, &buf, sizeof(buf)); - else - LOGCONTEXTWtoA(&buf, lpOutput); + result = bUnicode ? sizeof(LOGCONTEXTW) : sizeof(LOGCONTEXTA); } - - result = bUnicode ? sizeof(LOGCONTEXTW) : sizeof(LOGCONTEXTA); } else if (is_string_field(wCategory, nIndex) && !bUnicode) { @@ -458,6 +479,9 @@ UINT WINAPI WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) HCTX WINAPI WTOpenW(HWND hWnd, LPLOGCONTEXTW lpLogCtx, BOOL fEnable) { LPOPENCONTEXT newcontext; + LONG inOrgX, inOrgY, inExtX, inExtY; + int sysOrgX, sysOrgY, sysExtX, sysExtY; + AXIS devAxX, devAxY; if (!LoadTablet()) return 0; @@ -468,9 +492,61 @@ HCTX WINAPI WTOpenW(HWND hWnd, LPLOGCONTEXTW lpLogCtx, BOOL fEnable) newcontext->context = *lpLogCtx; newcontext->hwndOwner = hWnd; newcontext->ActiveCursor = -1; - newcontext->QueueSize = 10; + newcontext->QueueSize = 25; newcontext->PacketsQueued = 0; - newcontext->PacketQueue=HeapAlloc(GetProcessHeap(),0,sizeof(WTPACKET)*10); + newcontext->PacketQueue=HeapAlloc(GetProcessHeap(),0,sizeof(PACKET)*newcontext->QueueSize); + + /* Tablet area remapping is not supported. Ignore the incoming lcIn* values + * and use the system-provided values instead. */ + pWTInfoW(WTI_DEFSYSCTX, CTX_INORGX, &inOrgX); + pWTInfoW(WTI_DEFSYSCTX, CTX_INORGY, &inOrgY); + pWTInfoW(WTI_DEFSYSCTX, CTX_INEXTX, &inExtX); + pWTInfoW(WTI_DEFSYSCTX, CTX_INEXTY, &inExtY); + + /* According to Wacom's ScribbleDemo, the way to request raw tablet + * coordinates is to request an extent larger than the axis. */ + if (pWTInfoW(WTI_DEVICES + newcontext->context.lcDevice, DVC_X, &devAxX) > 0 + && pWTInfoW(WTI_DEVICES + newcontext->context.lcDevice, DVC_Y, &devAxY) > 0) + { + if (abs(newcontext->context.lcOutExtX) > devAxX.axMax - devAxX.axMin + 1 + || abs(newcontext->context.lcOutExtY) > devAxY.axMax - devAxY.axMin + 1) + { + newcontext->context.lcOutOrgX = inOrgX; + newcontext->context.lcOutExtX = (newcontext->context.lcOutExtX >= 0 + ? inExtX : -inExtX); + + newcontext->context.lcOutOrgY = inOrgY; + newcontext->context.lcOutExtY = (newcontext->context.lcOutExtY >= 0 + ? inExtY : -inExtY); + } + } + + /* wintab allows developers to customize the area of the screen that the + * tablet points to. Wine does NOT allow this, so fudge the input area as + * necessary to make it line up with the actual screen. */ + pWTInfoW(WTI_DEFSYSCTX, CTX_SYSORGX, &sysOrgX); + pWTInfoW(WTI_DEFSYSCTX, CTX_SYSORGY, &sysOrgY); + pWTInfoW(WTI_DEFSYSCTX, CTX_SYSEXTX, &sysExtX); + pWTInfoW(WTI_DEFSYSCTX, CTX_SYSEXTY, &sysExtY); + + newcontext->context.lcInOrgX = ScaleForContext(newcontext->context.lcSysOrgX, + sysOrgX, sysExtX, inOrgX, inExtX); + + /* Scale Y region from the bottom because the tablet is upside down */ + newcontext->context.lcInOrgY = ScaleForContext(newcontext->context.lcSysOrgY + abs(newcontext->context.lcSysExtY), + sysOrgY, -sysExtY, inOrgY, inExtY); + + newcontext->context.lcInExtX = MulDiv(abs(newcontext->context.lcSysExtX), + inExtX, sysExtX); + + newcontext->context.lcInExtY = MulDiv(abs(newcontext->context.lcSysExtY), + inExtY, sysExtY); + + if (memcmp(&newcontext->context, lpLogCtx, sizeof(newcontext->context)) != 0) + { + TRACE("Incoming context has been modified. Result:\n"); + DUMPCONTEXT(newcontext->context); + } EnterCriticalSection(&csTablet); newcontext->handle = gTopContext++; @@ -598,7 +674,7 @@ int WINAPI WTPacketsGet(HCTX hCtx, int cMaxPkts, LPVOID lpPkts) if (limit < context->PacketsQueued) { memmove(context->PacketQueue, &context->PacketQueue[limit], - (context->PacketsQueued - (limit))*sizeof(WTPACKET)); + (context->PacketsQueued - (limit))*sizeof(PACKET)); } context->PacketsQueued -= limit; LeaveCriticalSection(&csTablet); @@ -615,7 +691,7 @@ BOOL WINAPI WTPacket(HCTX hCtx, UINT wSerial, LPVOID lpPkt) { int rc = 0; LPOPENCONTEXT context; - LPWTPACKET wtp = NULL; + LPPACKET wtp = NULL; TRACE("(%p, %d, %p)\n", hCtx, wSerial, lpPkt); @@ -635,13 +711,14 @@ BOOL WINAPI WTPacket(HCTX hCtx, UINT wSerial, LPVOID lpPkt) if (rc >= 0) { + if (lpPkt) TABLET_CopyPacketData(context ,lpPkt, wtp); - if ((rc+1) < context->QueueSize) + if ((rc+1) < context->PacketsQueued) { memmove(context->PacketQueue, &context->PacketQueue[rc+1], - (context->PacketsQueued - (rc+1))*sizeof(WTPACKET)); + (context->PacketsQueued - (rc+1))*sizeof(PACKET)); } context->PacketsQueued -= (rc+1); } @@ -990,7 +1067,7 @@ int WINAPI WTDataGet(HCTX hCtx, UINT wBegin, UINT wEnd, /* remove read packets */ if ((end+1) < context->PacketsQueued) memmove( &context->PacketQueue[bgn], &context->PacketQueue[end+1], - (context->PacketsQueued - (end+1)) * sizeof (WTPACKET)); + (context->PacketsQueued - (end+1)) * sizeof (PACKET)); context->PacketsQueued -= ((end-bgn)+1); *lpNPkts = ((end-bgn)+1); @@ -1125,7 +1202,7 @@ BOOL WINAPI WTQueueSizeSet(HCTX hCtx, int nPkts) } context->PacketQueue = HeapReAlloc(GetProcessHeap(), 0, - context->PacketQueue, sizeof(WTPACKET)*nPkts); + context->PacketQueue, sizeof(PACKET)*nPkts); context->QueueSize = nPkts; LeaveCriticalSection(&csTablet); diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index b13c0573454..61a1917701a 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -43,7 +43,7 @@ static CRITICAL_SECTION_DEBUG csTablet_debug = CRITICAL_SECTION csTablet = { &csTablet_debug, -1, 0, 0, 0, 0 }; int (CDECL *pLoadTabletInfo)(HWND hwnddefault) = NULL; -int (CDECL *pGetCurrentPacket)(LPWTPACKET packet) = NULL; +int (CDECL *pGetCurrentPacket)(LPPACKET packet) = NULL; int (CDECL *pAttachEventQueueToTablet)(HWND hOwner) = NULL; UINT (CDECL *pWTInfoW)(UINT wCategory, UINT nIndex, LPVOID lpOutput) = NULL; @@ -143,7 +143,7 @@ static LRESULT WINAPI TABLET_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, case WT_PACKET: { - WTPACKET packet; + PACKET packet; LPOPENCONTEXT handler; if (pGetCurrentPacket) { @@ -158,16 +158,10 @@ static LRESULT WINAPI TABLET_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, } case WT_PROXIMITY: { - WTPACKET packet; - LPOPENCONTEXT handler; - if (pGetCurrentPacket) - { - pGetCurrentPacket(&packet); - handler = AddPacketToContextQueue(&packet,(HWND)wParam); - if (handler) - TABLET_PostTabletMessage(handler, WT_PROXIMITY, - (WPARAM)handler->handle, lParam, TRUE); - } + LPOPENCONTEXT handler = FindContextForHwnd((HWND)wParam); + if (handler) + TABLET_PostTabletMessage(handler, WT_PROXIMITY, + (WPARAM)handler->handle, lParam, TRUE); break; } } diff --git a/dlls/wintab32/wintab_internal.h b/dlls/wintab32/wintab_internal.h index 18c64bfe700..f28c7d0aba0 100644 --- a/dlls/wintab32/wintab_internal.h +++ b/dlls/wintab32/wintab_internal.h @@ -116,23 +116,6 @@ typedef struct tagWTI_EXTENSIONS_INFO */ } WTI_EXTENSIONS_INFO, *LPWTI_EXTENSIONS_INFO; -typedef struct tagWTPACKET { - HCTX pkContext; - UINT pkStatus; - LONG pkTime; - WTPKT pkChanged; - UINT pkSerialNumber; - UINT pkCursor; - DWORD pkButtons; - DWORD pkX; - DWORD pkY; - DWORD pkZ; - UINT pkNormalPressure; - UINT pkTangentPressure; - ORIENTATION pkOrientation; - ROTATION pkRotation; /* 1.1 */ -} WTPACKET, *LPWTPACKET; - typedef struct tagOPENCONTEXT { HCTX handle; @@ -142,17 +125,18 @@ typedef struct tagOPENCONTEXT INT ActiveCursor; INT QueueSize; INT PacketsQueued; - LPWTPACKET PacketQueue; + LPPACKET PacketQueue; struct tagOPENCONTEXT *next; } OPENCONTEXT, *LPOPENCONTEXT; int TABLET_PostTabletMessage(LPOPENCONTEXT newcontext, UINT msg, WPARAM wParam, LPARAM lParam, BOOL send_always) DECLSPEC_HIDDEN; -LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd) DECLSPEC_HIDDEN; +LPOPENCONTEXT FindContextForHwnd(HWND hwnd) DECLSPEC_HIDDEN; +LPOPENCONTEXT AddPacketToContextQueue(LPPACKET packet, HWND hwnd) DECLSPEC_HIDDEN; -/* X11drv functions */ +/* User driver functions */ extern int (CDECL *pLoadTabletInfo)(HWND hwnddefault) DECLSPEC_HIDDEN; -extern int (CDECL *pGetCurrentPacket)(LPWTPACKET packet) DECLSPEC_HIDDEN; +extern int (CDECL *pGetCurrentPacket)(LPPACKET packet) DECLSPEC_HIDDEN; extern int (CDECL *pAttachEventQueueToTablet)(HWND hOwner) DECLSPEC_HIDDEN; extern UINT (CDECL *pWTInfoW)(UINT wCategory, UINT nIndex, LPVOID lpOutput) DECLSPEC_HIDDEN; diff --git a/include/Makefile.in b/include/Makefile.in index 9578c557af7..b9d2f8416fa 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -590,7 +590,6 @@ SOURCES = \ perflib.h \ perhist.idl \ physicalmonitorenumerationapi.h \ - pktdef.h \ poppack.h \ powrprof.h \ prntvpt.h \ diff --git a/include/pktdef.h b/include/pktdef.h deleted file mode 100644 index a1622062658..00000000000 --- a/include/pktdef.h +++ /dev/null @@ -1,248 +0,0 @@ -/* - * Copyright (C) 1991-1998 by LCS/Telegraphics - * Copyright (C) 2002 Patrik Stridvall - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_PKTDEF_H -#define __WINE_PKTDEF_H - -/*********************************************************************** - * How to use pktdef.h: - * - * 1. Include wintab.h - * 2. if using just one packet format: - * a. Define PACKETDATA and PACKETMODE as or'ed combinations of WTPKT bits - * (use the PK_* identifiers). - * b. Include pktdef.h. - * c. The generated structure typedef will be called PACKET. Use PACKETDATA - * and PACKETMODE to fill in the LOGCONTEXT structure. - * 3. If using multiple packet formats, for each one: - * a. Define PACKETNAME. Its text value will be a prefix for this packet's - * parameters and names. - * b. Define <PACKETNAME>PACKETDATA and <PACKETNAME>PACKETMODE similar to - * 2.a. above. - * c. Include pktdef.h. - * d. The generated structure typedef will be called - * <PACKETNAME>PACKET. Compare with 2.c. above and example #2 below. - * 4. If using extension packet data, do the following additional steps - * for each extension: - * a. Before including pktdef.h, define <PACKETNAME>PACKET<EXTENSION> - * as either PKEXT_ABSOLUTE or PKEXT_RELATIVE. - * b. The generated structure typedef will contain a field for the - * extension data. - * c. Scan the WTI_EXTENSION categories to find the extension's - * packet mask bit. - * d. OR the packet mask bit with <PACKETNAME>PACKETDATA and use the - * result in the lcPktData field of the LOGCONTEXT structure. - * e. If <PACKETNAME>PACKET<EXTENSION> was PKEXT_RELATIVE, OR the - * packet mask bit with <PACKETNAME>PACKETMODE and use the result - * in the lcPktMode field of the LOGCONTEXT structure. - * - * - * Example #1. -- single packet format - * - * #include <wintab.h> - * #define PACKETDATA PK_X | PK_Y | PK_BUTTONS /@ x, y, buttons @/ - * #define PACKETMODE PK_BUTTONS /@ buttons relative mode @/ - * #include <pktdef.h> - * ... - * lc.lcPktData = PACKETDATA; - * lc.lcPktMode = PACKETMODE; - * - * Example #2. -- multiple formats - * - * #include <wintab.h> - * #define PACKETNAME MOE - * #define MOEPACKETDATA PK_X | PK_Y | PK_BUTTONS /@ x, y, buttons @/ - * #define MOEPACKETMODE PK_BUTTONS /@ buttons relative mode @/ - * #include <pktdef.h> - * #define PACKETNAME LARRY - * #define LARRYPACKETDATA PK_Y | PK_Z | PK_BUTTONS /@ y, z, buttons @/ - * #define LARRYPACKETMODE PK_BUTTONS /@ buttons relative mode @/ - * #include <pktdef.h> - * #define PACKETNAME CURLY - * #define CURLYPACKETDATA PK_X | PK_Z | PK_BUTTONS /@ x, z, buttons @/ - * #define CURLYPACKETMODE PK_BUTTONS /@ buttons relative mode @/ - * #include <pktdef.h> - * ... - * lcMOE.lcPktData = MOEPACKETDATA; - * lcMOE.lcPktMode = MOEPACKETMODE; - * ... - * lcLARRY.lcPktData = LARRYPACKETDATA; - * lcLARRY.lcPktMode = LARRYPACKETMODE; - * ... - * lcCURLY.lcPktData = CURLYPACKETDATA; - * lcCURLY.lcPktMode = CURLYPACKETMODE; - * - * Example #3. -- extension packet data "XFOO". - * - * #include <wintab.h> - * #define PACKETDATA PK_X | PK_Y | PK_BUTTONS /@ x, y, buttons @/ - * #define PACKETMODE PK_BUTTONS /@ buttons relative mode @/ - * #define PACKETXFOO PKEXT_ABSOLUTE /@ XFOO absolute mode @/ - * #include <pktdef.h> - * ... - * UINT ScanExts(UINT wTag) - * { - * UINT i; - * UINT wScanTag; - * - * /@ scan for wTag's info category. @/ - * for (i = 0; WTInfo(WTI_EXTENSIONS + i, EXT_TAG, &wScanTag); i++) { - * if (wTag == wScanTag) { - * /@ return category offset from WTI_EXTENSIONS. @/ - * return i; - * } - * } - * /@ return error code. @/ - * return 0xFFFF; - * } - * ... - * lc.lcPktData = PACKETDATA; - * lc.lcPktMode = PACKETMODE; - * #ifdef PACKETXFOO - * categoryXFOO = ScanExts(WTX_XFOO); - * WTInfo(WTI_EXTENSIONS + categoryXFOO, EXT_MASK, &maskXFOO); - * lc.lcPktData |= maskXFOO; - * #if PACKETXFOO == PKEXT_RELATIVE - * lc.lcPktMode |= maskXFOO; - * #endif - * #endif - * WTOpen(hWnd, &lc, TRUE); - */ - -#ifdef __cplusplus -extern "C" { -#endif /* defined(__cplusplus) */ - -#ifndef PACKETNAME -/* if no packet name prefix */ -# define __PFX(x) x -# define __IFX(x,y) x ## y -#else -/* add prefixes and infixes to packet format names */ -# define __PFX(x) __PFX2(PACKETNAME,x) -# define __PFX2(p,x) __PFX3(p,x) -# define __PFX3(p,x) p ## x -# define __IFX(x,y) __IFX2(x,PACKETNAME,y) -# define __IFX2(x,i,y) __IFX3(x,i,y) -# define __IFX3(x,i,y) x ## i ## y -#endif - -#define __SFX2(x,s) __SFX3(x,s) -#define __SFX3(x,s) x ## s - -#define __TAG __IFX(tag,PACKET) -#define __TYPES \ - __PFX(PACKET), * __IFX(P,PACKET), \ - * __IFX(NP,PACKET), * __IFX(LP,PACKET) - -#define __DATA (__PFX(PACKETDATA)) -#define __MODE (__PFX(PACKETMODE)) -#define __EXT(x) __SFX2(__PFX(PACKET),x) - -typedef struct __TAG { -#if (__DATA & PK_CONTEXT) - HCTX pkContext; -#endif -#if (__DATA & PK_STATUS) - UINT pkStatus; -#endif -#if (__DATA & PK_TIME) - DWORD pkTime; -#endif -#if (__DATA & PK_CHANGED) - WTPKT pkChanged; -#endif -#if (__DATA & PK_SERIAL_NUMBER) - UINT pkSerialNumber; -#endif -#if (__DATA & PK_CURSOR) - UINT pkCursor; -#endif -#if (__DATA & PK_BUTTONS) - DWORD pkButtons; -#endif -#if (__DATA & PK_X) - LONG pkX; -#endif -#if (__DATA & PK_Y) - LONG pkY; -#endif -#if (__DATA & PK_Z) - LONG pkZ; -#endif -#if (__DATA & PK_NORMAL_PRESSURE) -# if (__MODE & PK_NORMAL_PRESSURE) - /* relative */ - int pkNormalPressure; -# else - /* absolute */ - UINT pkNormalPressure; -# endif -#endif -#if (__DATA & PK_TANGENT_PRESSURE) -# if (__MODE & PK_TANGENT_PRESSURE) - /* relative */ - int pkTangentPressure; -# else - /* absolute */ - UINT pkTangentPressure; -# endif -#endif -#if (__DATA & PK_ORIENTATION) - ORIENTATION pkOrientation; -#endif -#if (__DATA & PK_ROTATION) - ROTATION pkRotation; /* 1.1 */ -#endif - -#ifndef NOWTEXTENSIONS - /* extensions begin here. */ - -#if (__EXT(FKEYS) == PKEXT_RELATIVE) || (__EXT(FKEYS) == PKEXT_ABSOLUTE) - UINT pkFKeys; -#endif -#if (__EXT(TILT) == PKEXT_RELATIVE) || (__EXT(TILT) == PKEXT_ABSOLUTE) - TILT pkTilt; -#endif - -#endif - -} __TYPES; - -#undef PACKETNAME -#undef __TAG -#undef __TAG2 -#undef __TYPES -#undef __TYPES2 -#undef __DATA -#undef __MODE -#undef __PFX -#undef __PFX2 -#undef __PFX3 -#undef __IFX -#undef __IFX2 -#undef __IFX3 -#undef __SFX2 -#undef __SFX3 - -#ifdef __cplusplus -} /* extern "C" */ -#endif /* defined(__cplusplus) */ - -#endif /* defined(__WINE_PKTDEF_H */ diff --git a/include/wintab.h b/include/wintab.h index d10371b0217..056e4a332dd 100644 --- a/include/wintab.h +++ b/include/wintab.h @@ -462,8 +462,6 @@ DECL_WINELIB_TYPE_AW(LPLOGCONTEXT) * EVENT DATA DEFS */ -/* For packet structure definition, see pktdef.h */ - /* packet status values */ #define TPS_PROXIMITY 0x0001 #define TPS_QUEUE_ERR 0x0002 @@ -493,6 +491,23 @@ typedef struct tagROTATION { /* 1.1 */ #define TBN_UP 1 #define TBN_DOWN 2 +typedef struct tagPACKET { + HCTX pkContext; + UINT pkStatus; + LONG pkTime; + WTPKT pkChanged; + UINT pkSerialNumber; + UINT pkCursor; + DWORD pkButtons; + DWORD pkX; + DWORD pkY; + DWORD pkZ; + UINT pkNormalPressure; + UINT pkTangentPressure; + ORIENTATION pkOrientation; + ROTATION pkRotation; /* 1.1 */ +} PACKET, *LPPACKET; + /*********************************************************************** * DEVICE CONFIG CONSTANTS */ @@ -779,10 +794,80 @@ BOOL WINAPI WTMgrCsrPressureBtnMarksEx(HMGR, UINT, UINT *, UINT *); #endif +/*********************************************************************** + * WACOM WINTAB EXTENSIONS TO SUPPORT CSR_TYPE + * In Wintab 1.2, a CSR_TYPE feature was added. This adds the + * ability to return a type of cursor on a tablet. + * Unfortunately, we cannot get the cursor type directly from X, + * and it is not specified directly anywhere. So we virtualize + * the type here. (This is unfortunate, the kernel module has + * the exact type, but we have no way of getting that module to + * pass us that type). + * + * Reference linuxwacom driver project wcmCommon.c function + * idtotype for a much larger list of CSR_TYPE. + * + * http://linuxwacom.cvs.sourceforge.net/linuxwacom/linuxwacom-prod/src/xdrv/w… + * + * The WTI_CURSORS_INFO.TYPE data is supposed to be used like this: + * (cursor.TYPE & 0x0F06) == target_cursor_type + * Reference: Section Unique ID + * http://www.wacomeng.com/devsupport/ibmpc/gddevpc.html + */ +#define CSR_TYPE_PEN 0x822 +#define CSR_TYPE_ERASER 0x82a +#define CSR_TYPE_MOUSE_2D 0x007 +#define CSR_TYPE_MOUSE_4D 0x094 +/* CSR_TYPE_OTHER is a special value! assumed no real world significance + * if a stylus type or eraser type eventually have this value + * it'll be a bug. As of 2008 05 21 we can be sure because + * linux wacom lists all the known values and this isn't one of them */ +#define CSR_TYPE_OTHER 0x000 + +/*********************************************************************** + * WINE HELPER FUNCTIONS + */ + +/* Helper for WTInfoW. It is valid to call WTInfoW with lpOutput == NULL, in + * in which case it must return the size of the data without copying anything. + * This function handles that case. */ +static inline int TABLET_CopyData(LPVOID target, LPCVOID src, INT size) +{ + if(target != NULL) + memcpy(target,src,size); + return(size); +} + +/* Helpers for category. Though undocumented, negative indices are valid, and + * represent iterating the categories in reverse order. */ +#ifndef NOWTDEVICES +static inline BOOL IS_WTI_DEVICES_TYPE(UINT wCategory){ + return wCategory > WTI_DEVICES - 50 && wCategory <= WTI_DEVICES + 50; +} #endif +#ifndef NOWTCURSORS +static inline BOOL IS_WTI_CURSORS_TYPE(UINT wCategory){ + return wCategory > WTI_CURSORS - 50 && wCategory <= WTI_CURSORS + 50; +} +#endif +#ifndef NOWTEXTENSIONS +static inline BOOL IS_WTI_EXTENSIONS_TYPE(UINT wCategory){ + return wCategory > WTI_EXTENSIONS - 50 && wCategory <= WTI_EXTENSIONS + 50; +} +#endif +#ifndef NOWTDEFCONTEXT +static inline BOOL IS_WTI_DDCTXS_TYPE(UINT wCategory){ + return wCategory > WTI_DDCTXS - 50 && wCategory <= WTI_DDCTXS + 50; +} +static inline BOOL IS_WTI_DSCTXS_TYPE(UINT wCategory){ + return wCategory > WTI_DSCTXS - 50 && wCategory <= WTI_DSCTXS + 50; +} +#endif + +#endif /* !defined(NOWTFUNCTIONS) */ #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */ -#endif /* defined(__WINE_WINTAB_H */ +#endif /* !defined(__WINE_WINTAB_H) */ diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 5f3dd85cc93..49116614a4b 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -5756,7 +5756,7 @@ LPPOINT LPRECT LPSIZE LPVOID -LPWTPACKET * +LPPACKET * MONITORENUMPROC PIXELFORMATDESCRIPTOR * POINT * -- 2.32.0 (Apple Git-132)

2 5

[PATCH resend 1/4] user32/tests: Add some optional messages to WmRestoreMinimizedSeq
by Alex Henrie 24 Mar '22

24 Mar '22

Fixes a testbot failure. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/user32/tests/msg.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a2adf56565d..20e808cbffe 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -18619,7 +18619,11 @@ static const struct message WmRestoreMinimizedSeq[] = { WM_WINDOWPOSCHANGED, sent|wparam|defwinproc, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|defwinproc }, + { WM_NCCALCSIZE, sent|wparam|defwinproc|optional, 1 }, /* 32-bit Vista sends it */ + { WM_NCPAINT, sent|wparam|defwinproc|optional, 1 }, /* 32-bit Vista sends it */ + { WM_ERASEBKGND, sent|defwinproc|optional }, /* 32-bit Vista sends it */ { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* 32-bit Vista sends it */ { EVENT_SYSTEM_MINIMIZEEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_NCCALCSIZE, sent|wparam|defwinproc|optional, 1 }, { WM_NCPAINT, sent|wparam|defwinproc|optional, 1 }, -- 2.35.1

2 7

[PATCH] dlls/ntdll/tests/wow64.c: enable compilation with long types
by Eric Pouech 24 Mar '22

24 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/tests/wow64.c | 327 +++++++++++++++++++++++----------------------- 1 file changed, 164 insertions(+), 163 deletions(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 1c8ca28a999..702b2b4d771 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include "ntdll_test.h" #include "winioctl.h" @@ -78,8 +79,8 @@ static void test_process_architecture( HANDLE process, USHORT expect_machine, US len = 0xdead; status = pNtQuerySystemInformationEx( SystemSupportedProcessorArchitectures, &process, sizeof(process), &buffer, sizeof(buffer), &len ); - ok( !status, "failed %x\n", status ); - ok( !(len & 3), "wrong len %x\n", len ); + ok( !status, "failed %lx\n", status ); + ok( !(len & 3), "wrong len %lx\n", len ); len /= sizeof(DWORD); for (i = 0; i < len - 1; i++) { @@ -87,31 +88,31 @@ static void test_process_architecture( HANDLE process, USHORT expect_machine, US USHORT machine = LOWORD(buffer[i]); if (flags & 8) - ok( machine == expect_machine, "wrong current machine %x\n", buffer[i]); + ok( machine == expect_machine, "wrong current machine %lx\n", buffer[i]); else - ok( machine != expect_machine, "wrong machine %x\n", buffer[i]); + ok( machine != expect_machine, "wrong machine %lx\n", buffer[i]); /* FIXME: not quite sure what the other flags mean, * observed on amd64 Windows: (flags & 7) == 7 for MACHINE_AMD64 and 2 for MACHINE_I386 */ if (flags & 4) - ok( machine == expect_native, "wrong native machine %x\n", buffer[i]); + ok( machine == expect_native, "wrong native machine %lx\n", buffer[i]); else - ok( machine != expect_native, "wrong machine %x\n", buffer[i]); + ok( machine != expect_native, "wrong machine %lx\n", buffer[i]); } ok( !buffer[i], "missing terminating null\n" ); len = i * sizeof(DWORD); status = pNtQuerySystemInformationEx( SystemSupportedProcessorArchitectures, &process, sizeof(process), &buffer, len, &len ); - ok( status == STATUS_BUFFER_TOO_SMALL, "failed %x\n", status ); - ok( len == (i + 1) * sizeof(DWORD), "wrong len %u\n", len ); + ok( status == STATUS_BUFFER_TOO_SMALL, "failed %lx\n", status ); + ok( len == (i + 1) * sizeof(DWORD), "wrong len %lu\n", len ); if (pRtlWow64GetProcessMachines) { USHORT current = 0xdead, native = 0xbeef; status = pRtlWow64GetProcessMachines( process, &current, &native ); - ok( !status, "failed %x\n", status ); + ok( !status, "failed %lx\n", status ); if (expect_machine == expect_native) ok( current == 0, "wrong current machine %x / %x\n", current, expect_machine ); else @@ -154,25 +155,25 @@ static void test_query_architectures(void) win_skip( "SystemSupportedProcessorArchitectures not supported\n" ); return; } - ok( !status, "failed %x\n", status ); + ok( !status, "failed %lx\n", status ); process = (HANDLE)0xdeadbeef; status = pNtQuerySystemInformationEx( SystemSupportedProcessorArchitectures, &process, sizeof(process), &buffer, sizeof(buffer), &len ); - ok( status == STATUS_INVALID_HANDLE, "failed %x\n", status ); + ok( status == STATUS_INVALID_HANDLE, "failed %lx\n", status ); process = (HANDLE)0xdeadbeef; status = pNtQuerySystemInformationEx( SystemSupportedProcessorArchitectures, &process, 3, &buffer, sizeof(buffer), &len ); ok( status == STATUS_INVALID_PARAMETER || broken(status == STATUS_INVALID_HANDLE), - "failed %x\n", status ); + "failed %lx\n", status ); process = GetCurrentProcess(); status = pNtQuerySystemInformationEx( SystemSupportedProcessorArchitectures, &process, 3, &buffer, sizeof(buffer), &len ); ok( status == STATUS_INVALID_PARAMETER || broken( status == STATUS_SUCCESS), - "failed %x\n", status ); + "failed %lx\n", status ); status = pNtQuerySystemInformationEx( SystemSupportedProcessorArchitectures, NULL, 0, &buffer, sizeof(buffer), &len ); - ok( status == STATUS_INVALID_PARAMETER, "failed %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER, "failed %lx\n", status ); test_process_architecture( GetCurrentProcess(), current_machine, native_machine ); test_process_architecture( 0, 0, native_machine ); @@ -203,24 +204,24 @@ static void test_query_architectures(void) { BOOLEAN ret = 0xcc; status = pRtlWow64IsWowGuestMachineSupported( IMAGE_FILE_MACHINE_I386, &ret ); - ok( !status, "failed %x\n", status ); + ok( !status, "failed %lx\n", status ); ok( ret == (native_machine == IMAGE_FILE_MACHINE_AMD64 || native_machine == IMAGE_FILE_MACHINE_ARM64), "wrong result %u\n", ret ); ret = 0xcc; status = pRtlWow64IsWowGuestMachineSupported( IMAGE_FILE_MACHINE_ARMNT, &ret ); - ok( !status, "failed %x\n", status ); + ok( !status, "failed %lx\n", status ); ok( ret == (native_machine == IMAGE_FILE_MACHINE_ARM64), "wrong result %u\n", ret ); ret = 0xcc; status = pRtlWow64IsWowGuestMachineSupported( IMAGE_FILE_MACHINE_AMD64, &ret ); - ok( !status, "failed %x\n", status ); + ok( !status, "failed %lx\n", status ); ok( !ret, "wrong result %u\n", ret ); ret = 0xcc; status = pRtlWow64IsWowGuestMachineSupported( IMAGE_FILE_MACHINE_ARM64, &ret ); - ok( !status, "failed %x\n", status ); + ok( !status, "failed %lx\n", status ); ok( !ret, "wrong result %u\n", ret ); ret = 0xcc; status = pRtlWow64IsWowGuestMachineSupported( 0xdead, &ret ); - ok( !status, "failed %x\n", status ); + ok( !status, "failed %lx\n", status ); ok( !ret, "wrong result %u\n", ret ); } } @@ -249,28 +250,28 @@ static void test_peb_teb(void) { memset( &info, 0xcc, sizeof(info) ); status = NtQueryInformationThread( pi.hThread, ThreadBasicInformation, &info, sizeof(info), NULL ); - ok( !status, "ThreadBasicInformation failed %x\n", status ); + ok( !status, "ThreadBasicInformation failed %lx\n", status ); if (!ReadProcessMemory( pi.hProcess, info.TebBaseAddress, &teb, sizeof(teb), &res )) res = 0; - ok( res == sizeof(teb), "wrong len %lx\n", res ); + ok( res == sizeof(teb), "wrong len %Ix\n", res ); ok( teb.Tib.Self == info.TebBaseAddress, "wrong teb %p / %p\n", teb.Tib.Self, info.TebBaseAddress ); if (is_wow64) { ok( !!teb.GdiBatchCount, "GdiBatchCount not set\n" ); ok( (char *)info.TebBaseAddress + teb.WowTebOffset == ULongToPtr(teb.GdiBatchCount) || broken(!NtCurrentTeb()->WowTebOffset), /* pre-win10 */ - "wrong teb offset %d\n", teb.WowTebOffset ); + "wrong teb offset %ld\n", teb.WowTebOffset ); } else { ok( !teb.GdiBatchCount, "GdiBatchCount set\n" ); ok( teb.WowTebOffset == 0x2000 || broken( !teb.WowTebOffset || teb.WowTebOffset == 1 ), /* pre-win10 */ - "wrong teb offset %d\n", teb.WowTebOffset ); + "wrong teb offset %ld\n", teb.WowTebOffset ); ok( (char *)teb.Tib.ExceptionList == (char *)info.TebBaseAddress + 0x2000, "wrong Tib.ExceptionList %p / %p\n", (char *)teb.Tib.ExceptionList, (char *)info.TebBaseAddress + 0x2000 ); if (!ReadProcessMemory( pi.hProcess, teb.Tib.ExceptionList, &teb32, sizeof(teb32), &res )) res = 0; - ok( res == sizeof(teb32), "wrong len %lx\n", res ); + ok( res == sizeof(teb32), "wrong len %Ix\n", res ); ok( (char *)ULongToPtr(teb32.Peb) == (char *)teb.Peb + 0x1000 || broken( ULongToPtr(teb32.Peb) != teb.Peb ), /* vista */ "wrong peb %p / %p\n", ULongToPtr(teb32.Peb), teb.Peb ); @@ -278,21 +279,21 @@ static void test_peb_teb(void) status = NtQueryInformationProcess( pi.hProcess, ProcessBasicInformation, &proc_info, sizeof(proc_info), NULL ); - ok( !status, "ProcessBasicInformation failed %x\n", status ); + ok( !status, "ProcessBasicInformation failed %lx\n", status ); ok( proc_info.PebBaseAddress == teb.Peb, "wrong peb %p / %p\n", proc_info.PebBaseAddress, teb.Peb ); if (!ReadProcessMemory( pi.hProcess, proc_info.PebBaseAddress, &peb, sizeof(peb), &res )) res = 0; - ok( res == sizeof(peb), "wrong len %lx\n", res ); + ok( res == sizeof(peb), "wrong len %Ix\n", res ); ok( !peb.BeingDebugged, "BeingDebugged is %u\n", peb.BeingDebugged ); if (!is_wow64) { if (!ReadProcessMemory( pi.hProcess, ULongToPtr(teb32.Peb), &peb32, sizeof(peb32), &res )) res = 0; - ok( res == sizeof(peb32), "wrong len %lx\n", res ); + ok( res == sizeof(peb32), "wrong len %Ix\n", res ); ok( !peb32.BeingDebugged, "BeingDebugged is %u\n", peb32.BeingDebugged ); } if (!ReadProcessMemory( pi.hProcess, peb.ProcessParameters, &params, sizeof(params), &res )) res = 0; - ok( res == sizeof(params), "wrong len %lx\n", res ); + ok( res == sizeof(params), "wrong len %Ix\n", res ); #define CHECK_STR(name) \ ok( (char *)params.name.Buffer >= (char *)peb.ProcessParameters && \ (char *)params.name.Buffer < (char *)peb.ProcessParameters + params.Size, \ @@ -309,11 +310,11 @@ static void test_peb_teb(void) ok( peb32.ProcessParameters && ULongToPtr(peb32.ProcessParameters) != peb.ProcessParameters, "wrong ptr32 %p / %p\n", ULongToPtr(peb32.ProcessParameters), peb.ProcessParameters ); if (!ReadProcessMemory( pi.hProcess, ULongToPtr(peb32.ProcessParameters), &params32, sizeof(params32), &res )) res = 0; - ok( res == sizeof(params32), "wrong len %lx\n", res ); + ok( res == sizeof(params32), "wrong len %Ix\n", res ); #define CHECK_STR(name) \ ok( ULongToPtr(params32.name.Buffer) >= ULongToPtr(peb32.ProcessParameters) && \ ULongToPtr(params32.name.Buffer) < ULongToPtr(peb32.ProcessParameters + params32.Size), \ - "wrong " #name " ptr %x / %x-%x\n", params32.name.Buffer, peb32.ProcessParameters, \ + "wrong " #name " ptr %lx / %lx-%lx\n", params32.name.Buffer, peb32.ProcessParameters, \ peb32.ProcessParameters + params.Size ); \ ok( params32.name.Length == params.name.Length, "wrong " #name "len %u / %u\n", \ params32.name.Length, params.name.Length ) @@ -323,19 +324,19 @@ static void test_peb_teb(void) CHECK_STR( Desktop ); CHECK_STR( ShellInfo ); #undef CHECK_STR - ok( params32.EnvironmentSize == params.EnvironmentSize, "wrong size %u / %lu\n", + ok( params32.EnvironmentSize == params.EnvironmentSize, "wrong size %lu / %Iu\n", params32.EnvironmentSize, params.EnvironmentSize ); } ret = DebugActiveProcess( pi.dwProcessId ); ok( ret, "debugging failed\n" ); if (!ReadProcessMemory( pi.hProcess, proc_info.PebBaseAddress, &peb, sizeof(peb), &res )) res = 0; - ok( res == sizeof(peb), "wrong len %lx\n", res ); + ok( res == sizeof(peb), "wrong len %Ix\n", res ); ok( peb.BeingDebugged == !!ret, "BeingDebugged is %u\n", peb.BeingDebugged ); if (!is_wow64) { if (!ReadProcessMemory( pi.hProcess, ULongToPtr(teb32.Peb), &peb32, sizeof(peb32), &res )) res = 0; - ok( res == sizeof(peb32), "wrong len %lx\n", res ); + ok( res == sizeof(peb32), "wrong len %Ix\n", res ); ok( peb32.BeingDebugged == !!ret, "BeingDebugged is %u\n", peb32.BeingDebugged ); } @@ -349,22 +350,22 @@ static void test_peb_teb(void) { memset( &info, 0xcc, sizeof(info) ); status = NtQueryInformationThread( pi.hThread, ThreadBasicInformation, &info, sizeof(info), NULL ); - ok( !status, "ThreadBasicInformation failed %x\n", status ); + ok( !status, "ThreadBasicInformation failed %lx\n", status ); if (!is_wow64) { if (!ReadProcessMemory( pi.hProcess, info.TebBaseAddress, &teb, sizeof(teb), &res )) res = 0; - ok( res == sizeof(teb), "wrong len %lx\n", res ); + ok( res == sizeof(teb), "wrong len %Ix\n", res ); ok( teb.Tib.Self == info.TebBaseAddress, "wrong teb %p / %p\n", teb.Tib.Self, info.TebBaseAddress ); ok( !teb.GdiBatchCount, "GdiBatchCount set\n" ); ok( !teb.WowTebOffset || broken( teb.WowTebOffset == 1 ), /* vista */ - "wrong teb offset %d\n", teb.WowTebOffset ); + "wrong teb offset %ld\n", teb.WowTebOffset ); } else ok( !info.TebBaseAddress, "got teb %p\n", info.TebBaseAddress ); status = NtQueryInformationProcess( pi.hProcess, ProcessBasicInformation, &proc_info, sizeof(proc_info), NULL ); - ok( !status, "ProcessBasicInformation failed %x\n", status ); + ok( !status, "ProcessBasicInformation failed %lx\n", status ); if (is_wow64) ok( !proc_info.PebBaseAddress || broken( (char *)proc_info.PebBaseAddress >= (char *)0x7f000000 ), /* vista */ @@ -389,13 +390,13 @@ static void test_peb_teb(void) ok( !!teb64, "GdiBatchCount not set\n" ); ok( (char *)NtCurrentTeb() + NtCurrentTeb()->WowTebOffset == (char *)teb64 || broken(!NtCurrentTeb()->WowTebOffset), /* pre-win10 */ - "wrong WowTebOffset %x (%p/%p)\n", NtCurrentTeb()->WowTebOffset, teb64, NtCurrentTeb() ); + "wrong WowTebOffset %lx (%p/%p)\n", NtCurrentTeb()->WowTebOffset, teb64, NtCurrentTeb() ); ok( (char *)teb64 + 0x2000 == (char *)NtCurrentTeb(), "unexpected diff %p / %p\n", teb64, NtCurrentTeb() ); ok( (char *)teb64 + teb64->WowTebOffset == (char *)NtCurrentTeb() || broken( !teb64->WowTebOffset || teb64->WowTebOffset == 1 ), /* pre-win10 */ - "wrong WowTebOffset %x (%p/%p)\n", teb64->WowTebOffset, teb64, NtCurrentTeb() ); - ok( !teb64->GdiBatchCount, "GdiBatchCount set %x\n", teb64->GdiBatchCount ); + "wrong WowTebOffset %lx (%p/%p)\n", teb64->WowTebOffset, teb64, NtCurrentTeb() ); + ok( !teb64->GdiBatchCount, "GdiBatchCount set %lx\n", teb64->GdiBatchCount ); ok( teb64->Tib.ExceptionList == PtrToUlong( NtCurrentTeb() ), "wrong Tib.ExceptionList %s / %p\n", wine_dbgstr_longlong(teb64->Tib.ExceptionList), NtCurrentTeb() ); ok( teb64->Tib.Self == PtrToUlong( teb64 ), "wrong Tib.Self %s / %p\n", @@ -403,24 +404,24 @@ static void test_peb_teb(void) ok( teb64->StaticUnicodeString.Buffer == PtrToUlong( teb64->StaticUnicodeBuffer ), "wrong StaticUnicodeString %s / %p\n", wine_dbgstr_longlong(teb64->StaticUnicodeString.Buffer), teb64->StaticUnicodeBuffer ); - ok( teb64->ClientId.UniqueProcess == GetCurrentProcessId(), "wrong pid %s / %x\n", + ok( teb64->ClientId.UniqueProcess == GetCurrentProcessId(), "wrong pid %s / %lx\n", wine_dbgstr_longlong(teb64->ClientId.UniqueProcess), GetCurrentProcessId() ); - ok( teb64->ClientId.UniqueThread == GetCurrentThreadId(), "wrong tid %s / %x\n", + ok( teb64->ClientId.UniqueThread == GetCurrentThreadId(), "wrong tid %s / %lx\n", wine_dbgstr_longlong(teb64->ClientId.UniqueThread), GetCurrentThreadId() ); peb64 = ULongToPtr( teb64->Peb ); ok( peb64->ImageBaseAddress == PtrToUlong( NtCurrentTeb()->Peb->ImageBaseAddress ), "wrong ImageBaseAddress %s / %p\n", wine_dbgstr_longlong(peb64->ImageBaseAddress), NtCurrentTeb()->Peb->ImageBaseAddress); - ok( peb64->OSBuildNumber == NtCurrentTeb()->Peb->OSBuildNumber, "wrong OSBuildNumber %x / %x\n", + ok( peb64->OSBuildNumber == NtCurrentTeb()->Peb->OSBuildNumber, "wrong OSBuildNumber %lx / %lx\n", peb64->OSBuildNumber, NtCurrentTeb()->Peb->OSBuildNumber ); - ok( peb64->OSPlatformId == NtCurrentTeb()->Peb->OSPlatformId, "wrong OSPlatformId %x / %x\n", + ok( peb64->OSPlatformId == NtCurrentTeb()->Peb->OSPlatformId, "wrong OSPlatformId %lx / %lx\n", peb64->OSPlatformId, NtCurrentTeb()->Peb->OSPlatformId ); return; } #endif - ok( !NtCurrentTeb()->GdiBatchCount, "GdiBatchCount set to %x\n", NtCurrentTeb()->GdiBatchCount ); + ok( !NtCurrentTeb()->GdiBatchCount, "GdiBatchCount set to %lx\n", NtCurrentTeb()->GdiBatchCount ); ok( !NtCurrentTeb()->WowTebOffset || broken( NtCurrentTeb()->WowTebOffset == 1 ), /* vista */ - "WowTebOffset set to %x\n", NtCurrentTeb()->WowTebOffset ); + "WowTebOffset set to %lx\n", NtCurrentTeb()->WowTebOffset ); } static void test_selectors(void) @@ -457,25 +458,25 @@ static void test_selectors(void) NtQueryInformationThread( GetCurrentThread(), ThreadDescriptorTableEntry, info, size, ret ) #endif - trace( "cs %04x ss %04x fs %04x\n", context.SegCs, context.SegSs, context.SegFs ); + trace( "cs %04lx ss %04lx fs %04lx\n", context.SegCs, context.SegSs, context.SegFs ); retlen = 0xdeadbeef; info.Selector = 0; status = GET_ENTRY( &info, sizeof(info) - 1, &retlen ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "wrong status %x\n", status ); - ok( retlen == 0xdeadbeef, "len set %u\n", retlen ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "wrong status %lx\n", status ); + ok( retlen == 0xdeadbeef, "len set %lu\n", retlen ); retlen = 0xdeadbeef; status = GET_ENTRY( &info, sizeof(info) + 1, &retlen ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "wrong status %x\n", status ); - ok( retlen == 0xdeadbeef, "len set %u\n", retlen ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "wrong status %lx\n", status ); + ok( retlen == 0xdeadbeef, "len set %lu\n", retlen ); retlen = 0xdeadbeef; status = GET_ENTRY( NULL, 0, &retlen ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "wrong status %x\n", status ); - ok( retlen == 0xdeadbeef, "len set %u\n", retlen ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "wrong status %lx\n", status ); + ok( retlen == 0xdeadbeef, "len set %lu\n", retlen ); status = GET_ENTRY( &info, sizeof(info), NULL ); - ok( !status, "wrong status %x\n", status ); + ok( !status, "wrong status %lx\n", status ); for (info.Selector = 0; info.Selector < 0x100; info.Selector++) { @@ -489,19 +490,19 @@ static void test_selectors(void) if (sel == 0x03) /* null selector */ { - ok( !status, "wrong status %x\n", status ); - ok( retlen == sizeof(info.Entry), "len set %u\n", retlen ); - ok( !base, "wrong base %x\n", base ); - ok( !limit, "wrong limit %x\n", limit ); + ok( !status, "wrong status %lx\n", status ); + ok( retlen == sizeof(info.Entry), "len set %lu\n", retlen ); + ok( !base, "wrong base %lx\n", base ); + ok( !limit, "wrong limit %lx\n", limit ); ok( !info.Entry.HighWord.Bytes.Flags1, "wrong flags1 %x\n", info.Entry.HighWord.Bytes.Flags1 ); ok( !info.Entry.HighWord.Bytes.Flags2, "wrong flags2 %x\n", info.Entry.HighWord.Bytes.Flags2 ); } else if (sel == context.SegCs) /* 32-bit code selector */ { - ok( !status, "wrong status %x\n", status ); - ok( retlen == sizeof(info.Entry), "len set %u\n", retlen ); - ok( !base, "wrong base %x\n", base ); - ok( limit == 0xfffff, "wrong limit %x\n", limit ); + ok( !status, "wrong status %lx\n", status ); + ok( retlen == sizeof(info.Entry), "len set %lu\n", retlen ); + ok( !base, "wrong base %lx\n", base ); + ok( limit == 0xfffff, "wrong limit %lx\n", limit ); ok( info.Entry.HighWord.Bits.Type == 0x1b, "wrong type %x\n", info.Entry.HighWord.Bits.Type ); ok( info.Entry.HighWord.Bits.Dpl == 3, "wrong dpl %x\n", info.Entry.HighWord.Bits.Dpl ); ok( info.Entry.HighWord.Bits.Pres, "wrong pres\n" ); @@ -511,10 +512,10 @@ static void test_selectors(void) } else if (sel == context.SegSs) /* 32-bit data selector */ { - ok( !status, "wrong status %x\n", status ); - ok( retlen == sizeof(info.Entry), "len set %u\n", retlen ); - ok( !base, "wrong base %x\n", base ); - ok( limit == 0xfffff, "wrong limit %x\n", limit ); + ok( !status, "wrong status %lx\n", status ); + ok( retlen == sizeof(info.Entry), "len set %lu\n", retlen ); + ok( !base, "wrong base %lx\n", base ); + ok( limit == 0xfffff, "wrong limit %lx\n", limit ); ok( info.Entry.HighWord.Bits.Type == 0x13, "wrong type %x\n", info.Entry.HighWord.Bits.Type ); ok( info.Entry.HighWord.Bits.Dpl == 3, "wrong dpl %x\n", info.Entry.HighWord.Bits.Dpl ); ok( info.Entry.HighWord.Bits.Pres, "wrong pres\n" ); @@ -524,17 +525,17 @@ static void test_selectors(void) } else if (sel == context.SegFs) /* TEB selector */ { - ok( !status, "wrong status %x\n", status ); - ok( retlen == sizeof(info.Entry), "len set %u\n", retlen ); + ok( !status, "wrong status %lx\n", status ); + ok( retlen == sizeof(info.Entry), "len set %lu\n", retlen ); #ifdef _WIN64 if (NtCurrentTeb()->WowTebOffset == 0x2000) - ok( base == (ULONG_PTR)NtCurrentTeb() + 0x2000, "wrong base %x / %p\n", + ok( base == (ULONG_PTR)NtCurrentTeb() + 0x2000, "wrong base %lx / %p\n", base, NtCurrentTeb() ); #else - ok( base == (ULONG_PTR)NtCurrentTeb(), "wrong base %x / %p\n", base, NtCurrentTeb() ); + ok( base == (ULONG_PTR)NtCurrentTeb(), "wrong base %lx / %p\n", base, NtCurrentTeb() ); #endif ok( limit == 0xfff || broken(limit == 0x4000), /* <= win8 */ - "wrong limit %x\n", limit ); + "wrong limit %lx\n", limit ); ok( info.Entry.HighWord.Bits.Type == 0x13, "wrong type %x\n", info.Entry.HighWord.Bits.Type ); ok( info.Entry.HighWord.Bits.Dpl == 3, "wrong dpl %x\n", info.Entry.HighWord.Bits.Dpl ); ok( info.Entry.HighWord.Bits.Pres, "wrong pres\n" ); @@ -544,8 +545,8 @@ static void test_selectors(void) } else if (!status) { - ok( retlen == sizeof(info.Entry), "len set %u\n", retlen ); - trace( "succeeded for %x base %x limit %x type %x\n", + ok( retlen == sizeof(info.Entry), "len set %lu\n", retlen ); + trace( "succeeded for %lx base %lx limit %lx type %x\n", sel, base, limit, info.Entry.HighWord.Bits.Type ); } else @@ -553,8 +554,8 @@ static void test_selectors(void) ok( status == STATUS_UNSUCCESSFUL || ((sel & 4) && (status == STATUS_NO_LDT)) || broken( status == STATUS_ACCESS_VIOLATION), /* <= win8 */ - "%x: wrong status %x\n", info.Selector, status ); - ok( retlen == 0xdeadbeef, "len set %u\n", retlen ); + "%lx: wrong status %lx\n", info.Selector, status ); + ok( retlen == 0xdeadbeef, "len set %lu\n", retlen ); } } #undef GET_ENTRY @@ -595,18 +596,18 @@ static void test_cpu_area(void) cpu->Flags = 0; cpu->Machine = tests[i].machine; status = pRtlWow64GetCpuAreaInfo( cpu, 0, &info ); - ok( status == tests[i].expect, "%u:%u: failed %x\n", i, j, status ); + ok( status == tests[i].expect, "%lu:%lu: failed %lx\n", i, j, status ); if (status) continue; - ok( info.Context == ALIGN( cpu + 1, tests[i].align ), "%u:%u: wrong offset %u\n", + ok( info.Context == ALIGN( cpu + 1, tests[i].align ), "%lu:%lu: wrong offset %lu\n", i, j, (ULONG)((char *)info.Context - (char *)cpu) ); ok( info.ContextEx == ALIGN( (char *)info.Context + tests[i].size, sizeof(void*) ), - "%u:%u: wrong ex offset %u\n", i, j, (ULONG)((char *)info.ContextEx - (char *)cpu) ); + "%lu:%lu: wrong ex offset %lu\n", i, j, (ULONG)((char *)info.ContextEx - (char *)cpu) ); ok( info.ContextFlagsLocation == (char *)info.Context + tests[i].offset, - "%u:%u: wrong flags offset %u\n", + "%lu:%lu: wrong flags offset %lu\n", i, j, (ULONG)((char *)info.ContextFlagsLocation - (char *)info.Context) ); - ok( info.CpuReserved == cpu, "%u:%u: wrong cpu %p / %p\n", i, j, info.CpuReserved, cpu ); - ok( info.ContextFlag == tests[i].flag, "%u:%u: wrong flag %08x\n", i, j, info.ContextFlag ); - ok( info.Machine == tests[i].machine, "%u:%u: wrong machine %x\n", i, j, info.Machine ); + ok( info.CpuReserved == cpu, "%lu:%lu: wrong cpu %p / %p\n", i, j, info.CpuReserved, cpu ); + ok( info.ContextFlag == tests[i].flag, "%lu:%lu: wrong flag %08lx\n", i, j, info.ContextFlag ); + ok( info.Machine == tests[i].machine, "%lu:%lu: wrong machine %x\n", i, j, info.Machine ); } } #undef ALIGN @@ -688,22 +689,22 @@ static void enum_modules64( void (*func)(ULONG64,const WCHAR *) ) HANDLE process; process = OpenProcess( PROCESS_ALL_ACCESS, FALSE, GetCurrentProcessId() ); - ok( process != 0, "failed to open current process %u\n", GetLastError() ); + ok( process != 0, "failed to open current process %lu\n", GetLastError() ); status = pNtWow64ReadVirtualMemory64( process, teb64->Peb, &peb64, sizeof(peb64), NULL ); - ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %lx\n", status ); todo_wine ok( peb64.LdrData, "LdrData not initialized\n" ); if (!peb64.LdrData) goto done; status = pNtWow64ReadVirtualMemory64( process, peb64.LdrData, &ldr, sizeof(ldr), NULL ); - ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %lx\n", status ); ptr = ldr.InLoadOrderModuleList.Flink; for (;;) { WCHAR buffer[256]; status = pNtWow64ReadVirtualMemory64( process, ptr, &entry, sizeof(entry), NULL ); - ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %lx\n", status ); status = pNtWow64ReadVirtualMemory64( process, entry.BaseDllName.Buffer, buffer, sizeof(buffer), NULL ); - ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %lx\n", status ); if (status) break; func( entry.DllBase, buffer ); ptr = entry.InLoadOrderLinks.Flink; @@ -727,30 +728,30 @@ static ULONG64 get_proc_address64( ULONG64 module, const char *name ) if (!module) return 0; process = OpenProcess( PROCESS_ALL_ACCESS, FALSE, GetCurrentProcessId() ); - ok( process != 0, "failed to open current process %u\n", GetLastError() ); + ok( process != 0, "failed to open current process %lu\n", GetLastError() ); status = pNtWow64ReadVirtualMemory64( process, module, &dos, sizeof(dos), NULL ); - ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %lx\n", status ); status = pNtWow64ReadVirtualMemory64( process, module + dos.e_lfanew, &nt, sizeof(nt), NULL ); - ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %lx\n", status ); status = pNtWow64ReadVirtualMemory64( process, module + nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress, &exports, sizeof(exports), NULL ); - ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %lx\n", status ); names = calloc( exports.NumberOfNames, sizeof(*names) ); ordinals = calloc( exports.NumberOfNames, sizeof(*ordinals) ); funcs = calloc( exports.NumberOfFunctions, sizeof(*funcs) ); status = pNtWow64ReadVirtualMemory64( process, module + exports.AddressOfNames, names, exports.NumberOfNames * sizeof(*names), NULL ); - ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %lx\n", status ); status = pNtWow64ReadVirtualMemory64( process, module + exports.AddressOfNameOrdinals, ordinals, exports.NumberOfNames * sizeof(*ordinals), NULL ); - ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %lx\n", status ); status = pNtWow64ReadVirtualMemory64( process, module + exports.AddressOfFunctions, funcs, exports.NumberOfFunctions * sizeof(*funcs), NULL ); - ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %lx\n", status ); for (i = 0; i < exports.NumberOfNames && !ret; i++) { status = pNtWow64ReadVirtualMemory64( process, module + names[i], buffer, sizeof(buffer), NULL ); - ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %lx\n", status ); if (!strcmp( buffer, name )) ret = module + funcs[ordinals[i]]; } free( funcs ); @@ -805,24 +806,24 @@ static void test_nt_wow64(void) ULONG64 res; HANDLE process = OpenProcess( PROCESS_ALL_ACCESS, FALSE, GetCurrentProcessId() ); - ok( process != 0, "failed to open current process %u\n", GetLastError() ); + ok( process != 0, "failed to open current process %lu\n", GetLastError() ); if (pNtWow64ReadVirtualMemory64) { status = pNtWow64ReadVirtualMemory64( process, (ULONG_PTR)str, buffer, sizeof(str), &res ); - ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %lx\n", status ); ok( res == sizeof(str), "wrong size %s\n", wine_dbgstr_longlong(res) ); ok( !strcmp( buffer, str ), "wrong data %s\n", debugstr_a(buffer) ); status = pNtWow64WriteVirtualMemory64( process, (ULONG_PTR)buffer, " bye ", 5, &res ); - ok( !status, "NtWow64WriteVirtualMemory64 failed %x\n", status ); + ok( !status, "NtWow64WriteVirtualMemory64 failed %lx\n", status ); ok( res == 5, "wrong size %s\n", wine_dbgstr_longlong(res) ); ok( !strcmp( buffer, " bye wow64" ), "wrong data %s\n", debugstr_a(buffer) ); /* current process pseudo-handle is broken on some Windows versions */ status = pNtWow64ReadVirtualMemory64( GetCurrentProcess(), (ULONG_PTR)str, buffer, sizeof(str), &res ); ok( !status || broken( status == STATUS_INVALID_HANDLE ), - "NtWow64ReadVirtualMemory64 failed %x\n", status ); + "NtWow64ReadVirtualMemory64 failed %lx\n", status ); status = pNtWow64WriteVirtualMemory64( GetCurrentProcess(), (ULONG_PTR)buffer, " bye ", 5, &res ); ok( !status || broken( status == STATUS_INVALID_HANDLE ), - "NtWow64WriteVirtualMemory64 failed %x\n", status ); + "NtWow64WriteVirtualMemory64 failed %lx\n", status ); } else win_skip( "NtWow64ReadVirtualMemory64 not supported\n" ); @@ -833,48 +834,48 @@ static void test_nt_wow64(void) status = pNtWow64AllocateVirtualMemory64( process, &ptr, 0, &size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE ); - ok( !status, "NtWow64AllocateVirtualMemory64 failed %x\n", status ); + ok( !status, "NtWow64AllocateVirtualMemory64 failed %lx\n", status ); ok( ptr, "ptr not set\n" ); ok( size == 0x3000, "size not set %s\n", wine_dbgstr_longlong(size) ); ptr += 0x1000; status = pNtWow64AllocateVirtualMemory64( process, &ptr, 0, &size, MEM_RESERVE | MEM_COMMIT, PAGE_READONLY ); - ok( status == STATUS_CONFLICTING_ADDRESSES, "NtWow64AllocateVirtualMemory64 failed %x\n", status ); + ok( status == STATUS_CONFLICTING_ADDRESSES, "NtWow64AllocateVirtualMemory64 failed %lx\n", status ); ptr = 0; size = 0; status = pNtWow64AllocateVirtualMemory64( process, &ptr, 0, &size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE ); ok( status == STATUS_INVALID_PARAMETER || status == STATUS_INVALID_PARAMETER_4, - "NtWow64AllocateVirtualMemory64 failed %x\n", status ); + "NtWow64AllocateVirtualMemory64 failed %lx\n", status ); size = 0x1000; status = pNtWow64AllocateVirtualMemory64( process, &ptr, 22, &size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE ); ok( status == STATUS_INVALID_PARAMETER || status == STATUS_INVALID_PARAMETER_3, - "NtWow64AllocateVirtualMemory64 failed %x\n", status ); + "NtWow64AllocateVirtualMemory64 failed %lx\n", status ); status = pNtWow64AllocateVirtualMemory64( process, &ptr, 33, &size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE ); ok( status == STATUS_INVALID_PARAMETER || status == STATUS_INVALID_PARAMETER_3, - "NtWow64AllocateVirtualMemory64 failed %x\n", status ); + "NtWow64AllocateVirtualMemory64 failed %lx\n", status ); status = pNtWow64AllocateVirtualMemory64( process, &ptr, 0x3fffffff, &size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE ); todo_wine_if( !is_wow64 ) - ok( !status, "NtWow64AllocateVirtualMemory64 failed %x\n", status ); + ok( !status, "NtWow64AllocateVirtualMemory64 failed %lx\n", status ); ok( ptr < 0x40000000, "got wrong ptr %s\n", wine_dbgstr_longlong(ptr) ); if (!status && pNtWow64WriteVirtualMemory64) { status = pNtWow64WriteVirtualMemory64( process, ptr, str, sizeof(str), &res ); - ok( !status, "NtWow64WriteVirtualMemory64 failed %x\n", status ); + ok( !status, "NtWow64WriteVirtualMemory64 failed %lx\n", status ); ok( res == sizeof(str), "wrong size %s\n", wine_dbgstr_longlong(res) ); ok( !strcmp( (char *)(ULONG_PTR)ptr, str ), "wrong data %s\n", debugstr_a((char *)(ULONG_PTR)ptr) ); ptr = 0; status = pNtWow64AllocateVirtualMemory64( process, &ptr, 0, &size, MEM_RESERVE | MEM_COMMIT, PAGE_READONLY ); - ok( !status, "NtWow64AllocateVirtualMemory64 failed %x\n", status ); + ok( !status, "NtWow64AllocateVirtualMemory64 failed %lx\n", status ); status = pNtWow64WriteVirtualMemory64( process, ptr, str, sizeof(str), &res ); todo_wine ok( status == STATUS_PARTIAL_COPY || broken( status == STATUS_ACCESS_VIOLATION ), - "NtWow64WriteVirtualMemory64 failed %x\n", status ); + "NtWow64WriteVirtualMemory64 failed %lx\n", status ); todo_wine ok( !res || broken(res) /* win10 1709 */, "wrong size %s\n", wine_dbgstr_longlong(res) ); } @@ -883,14 +884,14 @@ static void test_nt_wow64(void) MEM_RESERVE | MEM_COMMIT, PAGE_READONLY ); todo_wine ok( !status || broken( status == STATUS_CONFLICTING_ADDRESSES ), - "NtWow64AllocateVirtualMemory64 failed %x\n", status ); + "NtWow64AllocateVirtualMemory64 failed %lx\n", status ); if (!status) ok( ptr == 0x9876540000ull || broken(ptr == 0x76540000), /* win 8.1 */ "wrong ptr %s\n", wine_dbgstr_longlong(ptr) ); ptr = 0; status = pNtWow64AllocateVirtualMemory64( GetCurrentProcess(), &ptr, 0, &size, MEM_RESERVE | MEM_COMMIT, PAGE_READONLY ); ok( !status || broken( status == STATUS_INVALID_HANDLE ), - "NtWow64AllocateVirtualMemory64 failed %x\n", status ); + "NtWow64AllocateVirtualMemory64 failed %lx\n", status ); } else win_skip( "NtWow64AllocateVirtualMemory64 not supported\n" ); @@ -901,13 +902,13 @@ static void test_nt_wow64(void) memset( &sbi, 0xcc, sizeof(sbi) ); status = pNtQuerySystemInformation( SystemBasicInformation, &sbi, sizeof(sbi), &len ); - ok( status == STATUS_SUCCESS, "failed %x\n", status ); - ok( len == sizeof(sbi), "wrong length %d\n", len ); + ok( status == STATUS_SUCCESS, "failed %lx\n", status ); + ok( len == sizeof(sbi), "wrong length %ld\n", len ); memset( &sbi2, 0xcc, sizeof(sbi2) ); status = pRtlGetNativeSystemInformation( SystemBasicInformation, &sbi2, sizeof(sbi2), &len ); - ok( status == STATUS_SUCCESS, "failed %x\n", status ); - ok( len == sizeof(sbi2), "wrong length %d\n", len ); + ok( status == STATUS_SUCCESS, "failed %lx\n", status ); + ok( len == sizeof(sbi2), "wrong length %ld\n", len ); ok( sbi.HighestUserAddress == (void *)0x7ffeffff, "wrong limit %p\n", sbi.HighestUserAddress); todo_wine_if( is_wow64 ) @@ -916,15 +917,15 @@ static void test_nt_wow64(void) memset( &sbi3, 0xcc, sizeof(sbi3) ); status = pNtWow64GetNativeSystemInformation( SystemBasicInformation, &sbi3, sizeof(sbi3), &len ); - ok( status == STATUS_SUCCESS, "failed %x\n", status ); - ok( len == sizeof(sbi3), "wrong length %d\n", len ); + ok( status == STATUS_SUCCESS, "failed %lx\n", status ); + ok( len == sizeof(sbi3), "wrong length %ld\n", len ); ok( !memcmp( &sbi2, &sbi3, offsetof(SYSTEM_BASIC_INFORMATION,NumberOfProcessors)+1 ), "info is different\n" ); memset( &sbi3, 0xcc, sizeof(sbi3) ); status = pNtWow64GetNativeSystemInformation( SystemEmulationBasicInformation, &sbi3, sizeof(sbi3), &len ); - ok( status == STATUS_SUCCESS, "failed %x\n", status ); - ok( len == sizeof(sbi3), "wrong length %d\n", len ); + ok( status == STATUS_SUCCESS, "failed %lx\n", status ); + ok( len == sizeof(sbi3), "wrong length %ld\n", len ); ok( !memcmp( &sbi, &sbi3, offsetof(SYSTEM_BASIC_INFORMATION,NumberOfProcessors)+1 ), "info is different\n" ); @@ -936,21 +937,21 @@ static void test_nt_wow64(void) { case SystemNativeBasicInformation: ok( status == STATUS_INVALID_INFO_CLASS || status == STATUS_INFO_LENGTH_MISMATCH || - broken(status == STATUS_NOT_IMPLEMENTED) /* vista */, "%u: %x / %x\n", i, status, expect ); + broken(status == STATUS_NOT_IMPLEMENTED) /* vista */, "%lu: %lx / %lx\n", i, status, expect ); break; case SystemBasicInformation: case SystemCpuInformation: case SystemEmulationBasicInformation: case SystemEmulationProcessorInformation: - ok( status == expect, "%u: %x / %x\n", i, status, expect ); + ok( status == expect, "%lu: %lx / %lx\n", i, status, expect ); break; default: if (is_wow64) /* only a few info classes are supported on Wow64 */ ok( status == STATUS_INVALID_INFO_CLASS || broken(status == STATUS_NOT_IMPLEMENTED), /* vista */ - "%u: %x\n", i, status ); + "%lu: %lx\n", i, status ); else - ok( status == expect, "%u: %x / %x\n", i, status, expect ); + ok( status == expect, "%lu: %lx / %lx\n", i, status, expect ); break; } } @@ -971,7 +972,7 @@ static void test_init_block(void) if ((ptr = GetProcAddress( ntdll, "LdrSystemDllInitBlock" ))) { init_block = ptr; - trace( "got init block %08x\n", init_block[0] ); + trace( "got init block %08lx\n", init_block[0] ); #define CHECK_FUNC(val,func) \ ok( (val) == (ULONG_PTR)GetProcAddress( ntdll, func ), \ "got %p for %s %p\n", (void *)(ULONG_PTR)(val), func, GetProcAddress( ntdll, func )) @@ -1068,8 +1069,8 @@ static void test_init_block(void) size = 12 * sizeof(*block64); break; default: - ok( 0, "unknown init block %08x\n", init_block[0] ); - for (i = 0; i < 32; i++) trace("%04x: %08x\n", i, init_block[i]); + ok( 0, "unknown init block %08lx\n", init_block[0] ); + for (i = 0; i < 32; i++) trace("%04lx: %08lx\n", i, init_block[i]); break; } #undef CHECK_FUNC @@ -1079,7 +1080,7 @@ static void test_init_block(void) DWORD buffer[64]; HANDLE process = OpenProcess( PROCESS_ALL_ACCESS, FALSE, GetCurrentProcessId() ); NTSTATUS status = pNtWow64ReadVirtualMemory64( process, ptr64, buffer, size, NULL ); - ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %lx\n", status ); ok( !memcmp( buffer, init_block, size ), "wrong 64-bit init block\n" ); NtClose( process ); } @@ -1116,7 +1117,7 @@ static void test_iosb(void) server = CreateNamedPipeA( pipe_name, PIPE_ACCESS_INBOUND | FILE_FLAG_OVERLAPPED, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, 4, 1024, 1024, 1000, NULL ); - ok( server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %u\n", GetLastError() ); + ok( server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %lu\n", GetLastError() ); memset( &iosb32, 0x55, sizeof(iosb32) ); iosb64.Pointer = PtrToUlong( &iosb32 ); @@ -1124,17 +1125,17 @@ static void test_iosb(void) args[0] = (LONG_PTR)server; status = call_func64( func, ARRAY_SIZE(args), args ); - ok( status == STATUS_PENDING, "NtFsControlFile returned %x\n", status ); - ok( U(iosb32).Status == 0x55555555, "status changed to %x\n", U(iosb32).Status ); - ok( U(iosb64).Pointer == PtrToUlong(&iosb32), "status changed to %x\n", U(iosb64).Status ); + ok( status == STATUS_PENDING, "NtFsControlFile returned %lx\n", status ); + ok( U(iosb32).Status == 0x55555555, "status changed to %lx\n", U(iosb32).Status ); + ok( U(iosb64).Pointer == PtrToUlong(&iosb32), "status changed to %lx\n", U(iosb64).Status ); ok( iosb64.Information == 0xdeadbeef, "info changed to %lx\n", (ULONG_PTR)iosb64.Information ); client = CreateFileA( pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, NULL ); - ok( client != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError() ); + ok( client != INVALID_HANDLE_VALUE, "CreateFile failed: %lu\n", GetLastError() ); - ok( U(iosb32).Status == 0, "Wrong iostatus %x\n", U(iosb32).Status ); - ok( U(iosb64).Pointer == PtrToUlong(&iosb32), "status changed to %x\n", U(iosb64).Status ); + ok( U(iosb32).Status == 0, "Wrong iostatus %lx\n", U(iosb32).Status ); + ok( U(iosb64).Pointer == PtrToUlong(&iosb32), "status changed to %lx\n", U(iosb64).Status ); ok( iosb64.Information == 0xdeadbeef, "info changed to %lx\n", (ULONG_PTR)iosb64.Information ); memset( &iosb32, 0x55, sizeof(iosb32) ); @@ -1149,15 +1150,15 @@ static void test_iosb(void) args[9] = sizeof(id); status = call_func64( func, ARRAY_SIZE(args), args ); - ok( status == STATUS_PENDING || status == STATUS_SUCCESS, "NtFsControlFile returned %x\n", status ); + ok( status == STATUS_PENDING || status == STATUS_SUCCESS, "NtFsControlFile returned %lx\n", status ); todo_wine { - ok( U(iosb32).Status == STATUS_SUCCESS, "status changed to %x\n", U(iosb32).Status ); + ok( U(iosb32).Status == STATUS_SUCCESS, "status changed to %lx\n", U(iosb32).Status ); ok( iosb32.Information == sizeof(id), "info changed to %lx\n", iosb32.Information ); - ok( U(iosb64).Pointer == PtrToUlong(&iosb32), "status changed to %x\n", U(iosb64).Status ); + ok( U(iosb64).Pointer == PtrToUlong(&iosb32), "status changed to %lx\n", U(iosb64).Status ); ok( iosb64.Information == 0xdeadbeef, "info changed to %lx\n", (ULONG_PTR)iosb64.Information ); } - ok( id == GetCurrentProcessId(), "wrong id %x / %x\n", id, GetCurrentProcessId() ); + ok( id == GetCurrentProcessId(), "wrong id %lx / %lx\n", id, GetCurrentProcessId() ); CloseHandle( client ); CloseHandle( server ); @@ -1166,11 +1167,11 @@ static void test_iosb(void) server = CreateNamedPipeA( pipe_name, PIPE_ACCESS_INBOUND, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, 4, 1024, 1024, 1000, NULL ); - ok( server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %u\n", GetLastError() ); + ok( server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %lu\n", GetLastError() ); client = CreateFileA( pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, NULL ); - ok( client != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError() ); + ok( client != INVALID_HANDLE_VALUE, "CreateFile failed: %lu\n", GetLastError() ); memset( &iosb32, 0x55, sizeof(iosb32) ); iosb64.Pointer = PtrToUlong( &iosb32 ); @@ -1179,12 +1180,12 @@ static void test_iosb(void) args[0] = (LONG_PTR)server; status = call_func64( func, ARRAY_SIZE(args), args ); - ok( status == STATUS_SUCCESS, "NtFsControlFile returned %x\n", status ); - ok( U(iosb32).Status == 0x55555555, "status changed to %x\n", U(iosb32).Status ); + ok( status == STATUS_SUCCESS, "NtFsControlFile returned %lx\n", status ); + ok( U(iosb32).Status == 0x55555555, "status changed to %lx\n", U(iosb32).Status ); ok( iosb32.Information == 0x55555555, "info changed to %lx\n", iosb32.Information ); - ok( U(iosb64).Pointer == STATUS_SUCCESS, "status changed to %x\n", U(iosb64).Status ); + ok( U(iosb64).Pointer == STATUS_SUCCESS, "status changed to %lx\n", U(iosb64).Status ); ok( iosb64.Information == sizeof(id), "info changed to %lx\n", (ULONG_PTR)iosb64.Information ); - ok( id == GetCurrentProcessId(), "wrong id %x / %x\n", id, GetCurrentProcessId() ); + ok( id == GetCurrentProcessId(), "wrong id %lx / %lx\n", id, GetCurrentProcessId() ); CloseHandle( client ); CloseHandle( server ); } @@ -1222,17 +1223,17 @@ static void test_syscalls(void) event = CreateEventA( NULL, FALSE, FALSE, NULL ); status = NtSetEvent( event, NULL ); - ok( !status, "NtSetEvent failed %x\n", status ); + ok( !status, "NtSetEvent failed %lx\n", status ); args32[0] = HandleToLong( event ); status = invoke_syscall( "NtClose", args32 ); - ok( !status, "syscall failed %x\n", status ); + ok( !status, "syscall failed %lx\n", status ); status = NtSetEvent( event, NULL ); - ok( status == STATUS_INVALID_HANDLE, "NtSetEvent failed %x\n", status ); + ok( status == STATUS_INVALID_HANDLE, "NtSetEvent failed %lx\n", status ); status = invoke_syscall( "NtClose", args32 ); - ok( status == STATUS_INVALID_HANDLE, "syscall failed %x\n", status ); + ok( status == STATUS_INVALID_HANDLE, "syscall failed %lx\n", status ); args32[0] = 0xdeadbeef; status = invoke_syscall( "NtClose", args32 ); - ok( status == STATUS_INVALID_HANDLE, "syscall failed %x\n", status ); + ok( status == STATUS_INVALID_HANDLE, "syscall failed %lx\n", status ); RtlInitUnicodeString( &name, L"\\BaseNamedObjects\\wow64-test"); InitializeObjectAttributes( &attr, &name, OBJ_OPENIF, 0, NULL ); @@ -1243,32 +1244,32 @@ static void test_syscalls(void) args32[3] = NotificationEvent; args32[4] = 0; status = invoke_syscall( "NtCreateEvent", args32 ); - ok( !status, "syscall failed %x\n", status ); + ok( !status, "syscall failed %lx\n", status ); status = NtSetEvent( event, NULL ); - ok( !status, "NtSetEvent failed %x\n", status ); + ok( !status, "NtSetEvent failed %lx\n", status ); event2 = (HANDLE)0xdeadbeef; args32[0] = PtrToUlong( &event2 ); status = invoke_syscall( "NtOpenEvent", args32 ); - ok( !status, "syscall failed %x\n", status ); + ok( !status, "syscall failed %lx\n", status ); status = NtSetEvent( event2, NULL ); - ok( !status, "NtSetEvent failed %x\n", status ); + ok( !status, "NtSetEvent failed %lx\n", status ); args32[0] = HandleToLong( event2 ); status = invoke_syscall( "NtClose", args32 ); - ok( !status, "syscall failed %x\n", status ); + ok( !status, "syscall failed %lx\n", status ); event2 = (HANDLE)0xdeadbeef; args32[0] = PtrToUlong( &event2 ); status = invoke_syscall( "NtCreateEvent", args32 ); - ok( status == STATUS_OBJECT_NAME_EXISTS, "syscall failed %x\n", status ); + ok( status == STATUS_OBJECT_NAME_EXISTS, "syscall failed %lx\n", status ); status = NtSetEvent( event2, NULL ); - ok( !status, "NtSetEvent failed %x\n", status ); + ok( !status, "NtSetEvent failed %lx\n", status ); args32[0] = HandleToLong( event2 ); status = invoke_syscall( "NtClose", args32 ); - ok( !status, "syscall failed %x\n", status ); + ok( !status, "syscall failed %lx\n", status ); status = NtClose( event ); - ok( !status, "NtClose failed %x\n", status ); + ok( !status, "NtClose failed %lx\n", status ); if (pNtWow64ReadVirtualMemory64) { @@ -1279,11 +1280,11 @@ static void test_syscalls(void) ULONG args32[] = { HandleToLong( process ), (ULONG)teb64->Peb, teb64->Peb >> 32, PtrToUlong(&peb64_2), sizeof(peb64_2), 0, PtrToUlong(&res2) }; - ok( process != 0, "failed to open current process %u\n", GetLastError() ); + ok( process != 0, "failed to open current process %lu\n", GetLastError() ); status = pNtWow64ReadVirtualMemory64( process, teb64->Peb, &peb64, sizeof(peb64), &res ); - ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %lx\n", status ); status = invoke_syscall( "NtWow64ReadVirtualMemory64", args32 ); - ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %lx\n", status ); ok( res2 == res, "wrong len %s / %s\n", wine_dbgstr_longlong(res), wine_dbgstr_longlong(res2) ); ok( !memcmp( &peb64, &peb64_2, res ), "data is different\n" ); NtClose( process ); @@ -1306,14 +1307,14 @@ static void test_cpu_area(void) ULONG64 args[] = { (ULONG_PTR)&machine, (ULONG_PTR)&context, (ULONG_PTR)&context_ex }; status = call_func64( ptr, ARRAY_SIZE(args), args ); - ok( !status, "RtlWow64GetCpuAreaInfo failed %x\n", status ); + ok( !status, "RtlWow64GetCpuAreaInfo failed %lx\n", status ); ok( machine == IMAGE_FILE_MACHINE_I386, "wrong machine %x\n", machine ); ok( context == teb64->TlsSlots[WOW64_TLS_CPURESERVED] + 4, "wrong context %s / %s\n", wine_dbgstr_longlong(context), wine_dbgstr_longlong(teb64->TlsSlots[WOW64_TLS_CPURESERVED]) ); ok( !context_ex, "got context_ex %s\n", wine_dbgstr_longlong(context_ex) ); args[0] = args[1] = args[2] = 0; status = call_func64( ptr, ARRAY_SIZE(args), args ); - ok( !status, "RtlWow64GetCpuAreaInfo failed %x\n", status ); + ok( !status, "RtlWow64GetCpuAreaInfo failed %lx\n", status ); } else win_skip( "RtlWow64GetCpuAreaInfo not supported\n" );

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel