October 2019 - Wine-Devel - list.winehq.org

[PATCH v2 3/4] winex11.drv: Retrieve virtual and primary monitor rectangles from SetupAPI.
by Zhiyi Zhang Nov. 1, 2019

Nov. 1, 2019

So that a process can still get the correct virtual and primary monitor rectangles if display devices are reinitialized in another process. Note that we can't use EnumDisplayMonitor() and GetMonitorInfo() here because they are not loaded when loading winex11.drv. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 162 +++++++++++++++++++++++++------------ 1 file changed, 109 insertions(+), 53 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 6c4097a790..5b0b062ff6 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -104,33 +104,134 @@ static const WCHAR monitor_hardware_idW[] = { 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; static struct x11drv_display_device_handler handler; + +/* Cached screen information, protected by screen_section */ static RECT virtual_screen_rect; static RECT primary_monitor_rect; +static FILETIME last_query_screen_time; +static CRITICAL_SECTION screen_section; +static CRITICAL_SECTION_DEBUG screen_critsect_debug = +{ + 0, 0, &screen_section, + {&screen_critsect_debug.ProcessLocksList, &screen_critsect_debug.ProcessLocksList}, + 0, 0, {(DWORD_PTR)(__FILE__ ": screen_section")} +}; +static CRITICAL_SECTION screen_section = {&screen_critsect_debug, -1, 0, 0, 0, 0}; + +static HANDLE get_display_device_init_mutex(void) +{ + static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; + HANDLE mutex = CreateMutexW(NULL, FALSE, init_mutexW); + + WaitForSingleObject(mutex, INFINITE); + return mutex; +} + +static void release_display_device_init_mutex(HANDLE mutex) +{ + ReleaseMutex(mutex); + CloseHandle(mutex); +} + +/* Update screen rect cache from SetupAPI if it's outdated, return FALSE on failure and TRUE on success */ +static BOOL update_screen_cache(void) +{ + RECT virtual_rect = {0}, primary_rect = {0}, monitor_rect; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO devinfo = INVALID_HANDLE_VALUE; + FILETIME filetime; + HKEY video_key; + HANDLE mutex; + DWORD i = 0; + INT result; + DWORD type; + LSTATUS lr; + BOOL ret = FALSE; + + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, video_keyW, &video_key)) + return FALSE; + lr = RegQueryInfoKeyW(video_key, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, &filetime); + RegCloseKey(video_key); + if (lr) + return FALSE; + + EnterCriticalSection(&screen_section); + result = CompareFileTime(&filetime, &last_query_screen_time); + LeaveCriticalSection(&screen_section); + if (result < 1) + return TRUE; + + mutex = get_display_device_init_mutex(); + + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, DIGCF_PRESENT); + if (devinfo == INVALID_HANDLE_VALUE) + goto fail; + + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, + (BYTE *)&monitor_rect, sizeof(monitor_rect), NULL, 0)) + goto fail; + + UnionRect(&virtual_rect, &virtual_rect, &monitor_rect); + if (i == 1) + primary_rect = monitor_rect; + } + + EnterCriticalSection(&screen_section); + virtual_screen_rect = virtual_rect; + primary_monitor_rect = primary_rect; + last_query_screen_time = filetime; + LeaveCriticalSection(&screen_section); + ret = TRUE; +fail: + SetupDiDestroyDeviceInfoList(devinfo); + release_display_device_init_mutex(mutex); + if (!ret) + ERR("Update screen cache failed!\n"); + return ret; +} POINT virtual_screen_to_root(INT x, INT y) { + RECT virtual = get_virtual_screen_rect(); POINT pt; - pt.x = x - virtual_screen_rect.left; - pt.y = y - virtual_screen_rect.top; + + pt.x = x - virtual.left; + pt.y = y - virtual.top; return pt; } POINT root_to_virtual_screen(INT x, INT y) { + RECT virtual = get_virtual_screen_rect(); POINT pt; - pt.x = x + virtual_screen_rect.left; - pt.y = y + virtual_screen_rect.top; + + pt.x = x + virtual.left; + pt.y = y + virtual.top; return pt; } RECT get_virtual_screen_rect(void) { - return virtual_screen_rect; + RECT virtual; + + update_screen_cache(); + EnterCriticalSection(&screen_section); + virtual = virtual_screen_rect; + LeaveCriticalSection(&screen_section); + return virtual; } RECT get_primary_monitor_rect(void) { - return primary_monitor_rect; + RECT primary; + + update_screen_cache(); + EnterCriticalSection(&screen_section); + primary = primary_monitor_rect; + LeaveCriticalSection(&screen_section); + return primary; } void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *new_handler) @@ -321,9 +422,6 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, (const BYTE *)&monitor->rc_monitor, sizeof(monitor->rc_monitor), 0)) goto done; - UnionRect(&virtual_screen_rect, &virtual_screen_rect, &monitor->rc_monitor); - if (video_index == 0) - primary_monitor_rect = monitor->rc_monitor; /* RcWork */ if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, DEVPROP_TYPE_BINARY, (const BYTE *)&monitor->rc_work, sizeof(monitor->rc_work), 0)) @@ -348,9 +446,6 @@ static void prepare_devices(HKEY video_hkey) HDEVINFO devinfo; DWORD i = 0; - SetRectEmpty(&virtual_screen_rect); - SetRectEmpty(&primary_monitor_rect); - /* Remove all monitors */ devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, 0); while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) @@ -399,39 +494,8 @@ static void cleanup_devices(void) SetupDiDestroyDeviceInfoList(devinfo); } -/* Initialize virtual screen rect and primary monitor rect for current process */ -static void init_screen_rects(void) -{ - SP_DEVINFO_DATA device_data = {sizeof(device_data)}; - HDEVINFO devinfo; - DWORD type; - DWORD i = 0; - RECT rect; - - /* Already initialized */ - if (!IsRectEmpty(&virtual_screen_rect)) - return; - - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, 0); - while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) - { - if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, (BYTE *)&rect, - sizeof(rect), NULL, 0)) - ERR("Failed to get monitor size property\n"); - - UnionRect(&virtual_screen_rect, &virtual_screen_rect, &rect); - if (i == 1) - primary_monitor_rect = rect; - } - SetupDiDestroyDeviceInfoList(devinfo); - - TRACE("virtual screen rect:%s primary monitor rect:%s\n", wine_dbgstr_rect(&virtual_screen_rect), - wine_dbgstr_rect(&primary_monitor_rect)); -} - void X11DRV_DisplayDevices_Init(BOOL force) { - static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; HANDLE mutex; struct x11drv_gpu *gpus = NULL; struct x11drv_adapter *adapters = NULL; @@ -445,8 +509,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) WCHAR guidW[40]; WCHAR driverW[1024]; - mutex = CreateMutexW(NULL, FALSE, init_mutexW); - WaitForSingleObject(mutex, INFINITE); + mutex = get_display_device_init_mutex(); if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &video_hkey, &disposition)) @@ -457,10 +520,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) /* Avoid unnecessary reinit */ if (!force && disposition != REG_CREATED_NEW_KEY) - { - init_screen_rects(); goto done; - } TRACE("via %s\n", wine_dbgstr_a(handler.name)); @@ -511,16 +571,12 @@ void X11DRV_DisplayDevices_Init(BOOL force) adapters = NULL; } - TRACE("virtual screen rect:%s primary monitor rect:%s\n", wine_dbgstr_rect(&virtual_screen_rect), - wine_dbgstr_rect(&primary_monitor_rect)); - done: cleanup_devices(); SetupDiDestroyDeviceInfoList(monitor_devinfo); SetupDiDestroyDeviceInfoList(gpu_devinfo); RegCloseKey(video_hkey); - ReleaseMutex(mutex); - CloseHandle(mutex); + release_display_device_init_mutex(mutex); if (gpus) handler.free_gpus(gpus); if (adapters) -- 2.23.0

2 2

[PATCH] urlmon/tests: Fix a test failure on Windows XP.
by Sven Baars Nov. 1, 2019

Nov. 1, 2019

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/urlmon/tests/url.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 1aef981b83..287eb2702e 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -3911,7 +3911,8 @@ static BOOL can_do_https(void) ok(req != NULL, "HttpOpenRequest failed\n"); ret = HttpSendRequestA(req, NULL, 0, NULL, 0); - ok(ret || broken(GetLastError() == ERROR_INTERNET_CANNOT_CONNECT), + ok(ret || broken(GetLastError() == ERROR_INTERNET_CANNOT_CONNECT) + || broken(GetLastError() == ERROR_INTERNET_SECURITY_CHANNEL_ERROR) /* WinXP */, "request failed: %u\n", GetLastError()); InternetCloseHandle(req); -- 2.17.1

3 2

[PATCH v2] shcore: Add GetScaleFactorForMonitor stub
by Esdras Tarsis Oct. 31, 2019

Oct. 31, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48016 Signed-off-by: Esdras Tarsis <esdrastarsis(a)gmail.com> --- v2: Fix fixme concatenation for monitor and return of GetScaleFactorForMonitor function. --- dlls/shcore/main.c | 9 +++++++++ dlls/shcore/shcore.spec | 2 +- include/shellscalingapi.h | 22 ++++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 6a6247930f..d8d6d4f8e2 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -1517,6 +1517,15 @@ void WINAPI SetProcessReference(IUnknown *obj) process_ref = obj; } +/************************************************************************* + * GetScaleFactorForMonitor [SHCORE.@] + */ +HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR monitor, DEVICE_SCALE_FACTOR *scale) +{ + FIXME("(%p, %p) - stub!\n", monitor, scale); + return SCALE_100_PERCENT; +} + struct thread_data { LPTHREAD_START_ROUTINE thread_proc; diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 6a634bdee5..d5b7a342e3 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -12,7 +12,7 @@ @ stdcall GetProcessDpiAwareness(long ptr) @ stdcall GetProcessReference(ptr) @ stub GetScaleFactorForDevice -@ stub GetScaleFactorForMonitor +@ stdcall GetScaleFactorForMonitor(long ptr) @ stub IStream_Copy @ stdcall IStream_Read(ptr ptr long) _IStream_Read @ stub IStream_ReadStr diff --git a/include/shellscalingapi.h b/include/shellscalingapi.h index 1df85d5982..80dab0178f 100644 --- a/include/shellscalingapi.h +++ b/include/shellscalingapi.h @@ -34,8 +34,30 @@ typedef enum PROCESS_DPI_AWARENESS PROCESS_PER_MONITOR_DPI_AWARE } PROCESS_DPI_AWARENESS; +typedef enum DEVICE_SCALE_FACTOR +{ + DEVICE_SCALE_FACTOR_INVALID, + SCALE_100_PERCENT, + SCALE_120_PERCENT, + SCALE_125_PERCENT, + SCALE_140_PERCENT, + SCALE_150_PERCENT, + SCALE_160_PERCENT, + SCALE_175_PERCENT, + SCALE_180_PERCENT, + SCALE_200_PERCENT, + SCALE_225_PERCENT, + SCALE_250_PERCENT, + SCALE_300_PERCENT, + SCALE_350_PERCENT, + SCALE_400_PERCENT, + SCALE_450_PERCENT, + SCALE_500_PERCENT +} DEVICE_SCALE_FACTOR; + HRESULT WINAPI GetDpiForMonitor(HMONITOR,MONITOR_DPI_TYPE,UINT*,UINT*); HRESULT WINAPI GetProcessDpiAwareness(HANDLE,PROCESS_DPI_AWARENESS*); HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS); +HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR,DEVICE_SCALE_FACTOR*); #endif /* __WINE_SHELLSCALINGAPI_H */ -- 2.23.0

2 1

[PATCH] msvcrt: Cleanup sprintf tests.
by Piotr Caban Oct. 31, 2019

Oct. 31, 2019

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/printf.c | 806 +++++++++---------------------------- 1 file changed, 193 insertions(+), 613 deletions(-)

4 3

[PATCH 1/1] qedit: Correct MediaDet_Release() crash.
by Roberto Pungartnik Oct. 31, 2019

Oct. 31, 2019

2 1

[PATCH 1/1] secur32: reset phCredential->dwUpper at AcquireCredentialsHandleA
by Roberto Pungartnik Oct. 31, 2019

Oct. 31, 2019

2 1

[PATCH v6 01/12] d3dcompiler: Fix declaration issues if used outside of d3dcompiler
by Connor McAdams Oct. 31, 2019

Oct. 31, 2019

If used outside of other d3dcompiler_xx versions, GUID's do not need to be initialized, and when used for the reflection functions only, certain functions in utils.c don't need to be defined. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> --- dlls/d3dcompiler_43/reflection.c | 3 +++ dlls/d3dcompiler_43/utils.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index b163fca9e7..8f71bd9ce8 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -18,7 +18,10 @@ * */ +#ifdef D3D_COMPILER_VERSION #include "initguid.h" +#endif + #include "d3dcompiler_private.h" #include "winternl.h" diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 079bd1c6bc..27c0ba8c91 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -758,6 +758,7 @@ void compilation_message(struct compilation_messages *msg, const char *fmt, __ms } } +#ifdef D3D_COMPILER_VERSION BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var) { struct hlsl_ir_var *var; @@ -2327,3 +2328,4 @@ void add_function_decl(struct wine_rb_tree *funcs, char *name, struct hlsl_ir_fu func->intrinsic = intrinsic; wine_rb_put(funcs, func->name, &func->entry); } +#endif -- 2.20.1

1 11

[PATCH v5 01/14] d3d10: move parse_dxbc + helpers into effects.c
by Connor McAdams Oct. 31, 2019

Oct. 31, 2019

parse_dxbc is only used in effects.c, so having it in utils.c isn't necessary. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> --- dlls/d3d10/d3d10_private.h | 6 --- dlls/d3d10/effect.c | 101 +++++++++++++++++++++++++++++++++++++ dlls/d3d10/utils.c | 101 ------------------------------------- 3 files changed, 101 insertions(+), 107 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index f3fce9c569..2fe6183e15 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -278,9 +278,6 @@ HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapte #define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') #define TAG_SHDR MAKE_TAG('S', 'H', 'D', 'R') -HRESULT parse_dxbc(const char *data, SIZE_T data_size, - HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) DECLSPEC_HIDDEN; - static inline void read_dword(const char **ptr, DWORD *d) { memcpy(d, *ptr, sizeof(*d)); @@ -298,7 +295,4 @@ static inline BOOL require_space(size_t offset, size_t count, size_t size, size_ return !count || (data_size - offset) / count >= size; } -void skip_dword_unknown(const char *location, const char **ptr, unsigned int count) DECLSPEC_HIDDEN; -void write_dword_unknown(char **ptr, DWORD d) DECLSPEC_HIDDEN; - #endif /* __WINE_D3D10_PRIVATE_H */ diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 439833485d..ba5b033b0c 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -241,6 +241,107 @@ static const struct d3d10_effect_state_storage_info d3d10_effect_state_storage_i {D3D10_SVT_SAMPLER, sizeof(default_sampler_desc), &default_sampler_desc }, }; +static void skip_dword_unknown(const char *location, const char **ptr, unsigned int count) +{ + unsigned int i; + DWORD d; + + FIXME("Skipping %u unknown DWORDs (%s):\n", count, location); + for (i = 0; i < count; ++i) + { + read_dword(ptr, &d); + FIXME("\t0x%08x\n", d); + } +} + +static void write_dword_unknown(char **ptr, DWORD d) +{ + FIXME("Writing unknown DWORD 0x%08x\n", d); + write_dword(ptr, d); +} + +static HRESULT parse_dxbc(const char *data, SIZE_T data_size, + HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) +{ + const char *ptr = data; + HRESULT hr = S_OK; + DWORD chunk_count; + DWORD total_size; + unsigned int i; + DWORD version; + DWORD tag; + + if (!data) + { + WARN("No data supplied.\n"); + return E_FAIL; + } + + read_dword(&ptr, &tag); + TRACE("tag: %s.\n", debugstr_an((const char *)&tag, 4)); + + if (tag != TAG_DXBC) + { + WARN("Wrong tag.\n"); + return E_FAIL; + } + + /* checksum? */ + skip_dword_unknown("DXBC header", &ptr, 4); + + read_dword(&ptr, &version); + TRACE("version: %#x.\n", version); + if (version != 0x00000001) + { + WARN("Got unexpected DXBC version %#x.\n", version); + return E_FAIL; + } + + read_dword(&ptr, &total_size); + TRACE("total size: %#x\n", total_size); + + if (data_size != total_size) + { + WARN("Wrong size supplied.\n"); + return E_FAIL; + } + + read_dword(&ptr, &chunk_count); + TRACE("chunk count: %#x\n", chunk_count); + + for (i = 0; i < chunk_count; ++i) + { + DWORD chunk_tag, chunk_size; + const char *chunk_ptr; + DWORD chunk_offset; + + read_dword(&ptr, &chunk_offset); + TRACE("chunk %u at offset %#x\n", i, chunk_offset); + + if (chunk_offset >= data_size || !require_space(chunk_offset, 2, sizeof(DWORD), data_size)) + { + WARN("Invalid chunk offset %#x (data size %#lx).\n", chunk_offset, data_size); + return E_FAIL; + } + + chunk_ptr = data + chunk_offset; + + read_dword(&chunk_ptr, &chunk_tag); + read_dword(&chunk_ptr, &chunk_size); + + if (!require_space(chunk_ptr - data, 1, chunk_size, data_size)) + { + WARN("Invalid chunk size %#x (data size %#lx, chunk offset %#x).\n", chunk_size, data_size, chunk_offset); + return E_FAIL; + } + + hr = chunk_handler(chunk_ptr, chunk_size, chunk_tag, ctx); + if (FAILED(hr)) break; + } + + return hr; +} + static BOOL fx10_get_string(const char *data, size_t data_size, DWORD offset, const char **s, size_t *l) { size_t len, max_len; diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c index 3b51868488..9c76e1f375 100644 --- a/dlls/d3d10/utils.c +++ b/dlls/d3d10/utils.c @@ -128,104 +128,3 @@ const char *debug_d3d10_device_state_types(D3D10_DEVICE_STATE_TYPES t) } #undef WINE_D3D10_TO_STR - -void skip_dword_unknown(const char *location, const char **ptr, unsigned int count) -{ - unsigned int i; - DWORD d; - - FIXME("Skipping %u unknown DWORDs (%s):\n", count, location); - for (i = 0; i < count; ++i) - { - read_dword(ptr, &d); - FIXME("\t0x%08x\n", d); - } -} - -void write_dword_unknown(char **ptr, DWORD d) -{ - FIXME("Writing unknown DWORD 0x%08x\n", d); - write_dword(ptr, d); -} - -HRESULT parse_dxbc(const char *data, SIZE_T data_size, - HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) -{ - const char *ptr = data; - HRESULT hr = S_OK; - DWORD chunk_count; - DWORD total_size; - unsigned int i; - DWORD version; - DWORD tag; - - if (!data) - { - WARN("No data supplied.\n"); - return E_FAIL; - } - - read_dword(&ptr, &tag); - TRACE("tag: %s.\n", debugstr_an((const char *)&tag, 4)); - - if (tag != TAG_DXBC) - { - WARN("Wrong tag.\n"); - return E_FAIL; - } - - /* checksum? */ - skip_dword_unknown("DXBC header", &ptr, 4); - - read_dword(&ptr, &version); - TRACE("version: %#x.\n", version); - if (version != 0x00000001) - { - WARN("Got unexpected DXBC version %#x.\n", version); - return E_FAIL; - } - - read_dword(&ptr, &total_size); - TRACE("total size: %#x\n", total_size); - - if (data_size != total_size) - { - WARN("Wrong size supplied.\n"); - return E_FAIL; - } - - read_dword(&ptr, &chunk_count); - TRACE("chunk count: %#x\n", chunk_count); - - for (i = 0; i < chunk_count; ++i) - { - DWORD chunk_tag, chunk_size; - const char *chunk_ptr; - DWORD chunk_offset; - - read_dword(&ptr, &chunk_offset); - TRACE("chunk %u at offset %#x\n", i, chunk_offset); - - if (chunk_offset >= data_size || !require_space(chunk_offset, 2, sizeof(DWORD), data_size)) - { - WARN("Invalid chunk offset %#x (data size %#lx).\n", chunk_offset, data_size); - return E_FAIL; - } - - chunk_ptr = data + chunk_offset; - - read_dword(&chunk_ptr, &chunk_tag); - read_dword(&chunk_ptr, &chunk_size); - - if (!require_space(chunk_ptr - data, 1, chunk_size, data_size)) - { - WARN("Invalid chunk size %#x (data size %#lx, chunk offset %#x).\n", chunk_size, data_size, chunk_offset); - return E_FAIL; - } - - hr = chunk_handler(chunk_ptr, chunk_size, chunk_tag, ctx); - if (FAILED(hr)) break; - } - - return hr; -} -- 2.20.1

2 27

[PATCH 4/4] vbscript: Support DISP_E_EXCEPTION Invoke[Ex] return value.
by Jacek Caban Oct. 31, 2019

Oct. 31, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/tests/error.vbs | 16 ++++++++++++++++ dlls/vbscript/tests/run.c | 11 ++++++++++- dlls/vbscript/vbdisp.c | 19 +++++++++++++++---- 3 files changed, 41 insertions(+), 5 deletions(-)

1 0

[PATCH 3/4] vbscript/tests: Introduce get_dispid helper.
by Jacek Caban Oct. 31, 2019

Oct. 31, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/tests/run.c | 320 ++++++++++++++------------------------ 1 file changed, 113 insertions(+), 207 deletions(-)

1 0