February 2018 - Wine-Commits

Jacek Caban : mshtml: Added IDOMMouseEvent:: toElement property implementation.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: c0d248f2a5c167d228c4024feea2ec713abc42ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0d248f2a5c167d228c4024f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 21 15:19:56 2018 +0100 mshtml: Added IDOMMouseEvent::toElement property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 33 ++++++++++++++++++++++++++++----- dlls/mshtml/tests/events.js | 1 + 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 6c75475..e9a4731 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -138,6 +138,10 @@ typedef struct { #define EVENT_HASDEFAULTHANDLERS 0x0020 #define EVENT_FIXME 0x0040 +/* mouse event flags for fromElement and toElement implementation */ +#define EVENT_MOUSE_TO_RELATED 0x0100 +#define EVENT_MOUSE_FROM_RELATED 0x0200 + static const event_info_t event_info[] = { {abortW, EVENT_TYPE_EVENT, DISPID_EVMETH_ONABORT, EVENT_BIND_TO_BODY}, @@ -186,11 +190,11 @@ static const event_info_t event_info[] = { {mousedownW, EVENT_TYPE_MOUSE, DISPID_EVMETH_ONMOUSEDOWN, EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE}, {mousemoveW, EVENT_TYPE_MOUSE, DISPID_EVMETH_ONMOUSEMOVE, - EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE}, + EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE | EVENT_MOUSE_FROM_RELATED}, {mouseoutW, EVENT_TYPE_MOUSE, DISPID_EVMETH_ONMOUSEOUT, - EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE}, + EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE | EVENT_MOUSE_TO_RELATED}, {mouseoverW, EVENT_TYPE_MOUSE, DISPID_EVMETH_ONMOUSEOVER, - EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE}, + EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE | EVENT_MOUSE_FROM_RELATED}, {mouseupW, EVENT_TYPE_MOUSE, DISPID_EVMETH_ONMOUSEUP, EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE}, {mousewheelW, EVENT_TYPE_MOUSE, DISPID_EVMETH_ONMOUSEWHEEL, @@ -1583,8 +1587,27 @@ static HRESULT WINAPI DOMMouseEvent_get_fromElement(IDOMMouseEvent *iface, IHTML static HRESULT WINAPI DOMMouseEvent_get_toElement(IDOMMouseEvent *iface, IHTMLElement **p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + IEventTarget *related_target = NULL; + + TRACE("(%p)->(%p)\n", This, p); + + if(This->event_id != EVENTID_LAST) { + HRESULT hres = S_OK; + if(event_info[This->event_id].flags & EVENT_MOUSE_TO_RELATED) + hres = IDOMMouseEvent_get_relatedTarget(&This->IDOMMouseEvent_iface, &related_target); + else if(event_info[This->event_id].flags & EVENT_MOUSE_FROM_RELATED) + hres = IDOMEvent_get_target(&This->IDOMEvent_iface, &related_target); + if(FAILED(hres)) + return hres; + } + + if(!related_target) { + *p = NULL; + return S_OK; + } + + IEventTarget_QueryInterface(related_target, &IID_IHTMLElement, (void**)p); + return S_OK; } static HRESULT WINAPI DOMMouseEvent_get_x(IDOMMouseEvent *iface, LONG *p) diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index 677e8e7..a15ee51 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -632,6 +632,7 @@ function test_mouse_event() { ok(e.pageY === 0, "pageY = " + e.pageY); ok(e.which === 1, "which = " + e.which); ok(e.relatedTarget === null, "relatedTarget = " + e.relatedTarget); + ok(e.toElement === null, "toElement = " + e.toElement); e.initMouseEvent("test", true, true, window, 1, 2, 3, 4, 5, false, false, false, false, 1, document); ok(e.type === "test", "type = " + e.type);

1 0

Aric Stewart : winebus.sys: Map SDL game controllers if requested.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 2505d67cbcbae0763cef99e1e399dc1a1b74b519 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2505d67cbcbae0763cef99e1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 21 06:57:05 2018 -0600 winebus.sys: Map SDL game controllers if requested. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 267 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 251 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2505d67cbcbae0763cef…

1 0

Aric Stewart : winebus.sys: Support adding and removing SDL devices.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 752de1b56607b84c712e79ab34c507a3e8d96c4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=752de1b56607b84c712e79ab… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 21 06:55:50 2018 -0600 winebus.sys: Support adding and removing SDL devices. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 290 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 289 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 8486a0f..05443f5 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -19,10 +19,17 @@ */ #include "config.h" +#include "wine/port.h" #include <errno.h> #include <fcntl.h> #include <stdarg.h> #include <stdlib.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif +#ifdef HAVE_SDL2_SDL_H +# include <SDL2/SDL.h> +#endif #define NONAMELESSUNION @@ -33,7 +40,17 @@ #include "winnls.h" #include "winternl.h" #include "ddk/wdm.h" +#include "ddk/hidtypes.h" +#include "wine/library.h" #include "wine/debug.h" +#include "wine/unicode.h" +#include "hidusage.h" + +#ifdef WORDS_BIGENDIAN +# define LE_WORD(x) RtlUshortByteSwap(x) +#else +# define LE_WORD(x) (x) +#endif #include "bus.h" @@ -41,9 +58,280 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); #ifdef SONAME_LIBSDL2 +WINE_DECLARE_DEBUG_CHANNEL(hid_report); + +static DRIVER_OBJECT *sdl_driver_obj = NULL; + +static const WCHAR sdl_busidW[] = {'S','D','L','J','O','Y',0}; + +#include "initguid.h" +DEFINE_GUID(GUID_DEVCLASS_SDL, 0x463d60b5,0x802b,0x4bb2,0x8f,0xdb,0x7d,0xa9,0xb9,0x96,0x04,0xd8); + +static void *sdl_handle = NULL; + +#ifdef SONAME_LIBSDL2 +#define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL +MAKE_FUNCPTR(SDL_GetError); +MAKE_FUNCPTR(SDL_Init); +MAKE_FUNCPTR(SDL_JoystickEventState); +MAKE_FUNCPTR(SDL_JoystickGetGUID); +MAKE_FUNCPTR(SDL_JoystickGetGUIDString); +MAKE_FUNCPTR(SDL_JoystickInstanceID); +MAKE_FUNCPTR(SDL_JoystickName); +MAKE_FUNCPTR(SDL_JoystickNumAxes); +MAKE_FUNCPTR(SDL_JoystickOpen); +MAKE_FUNCPTR(SDL_WaitEvent); +#endif +static Uint16 (*pSDL_JoystickGetProduct)(SDL_Joystick * joystick); +static Uint16 (*pSDL_JoystickGetProductVersion)(SDL_Joystick * joystick); +static Uint16 (*pSDL_JoystickGetVendor)(SDL_Joystick * joystick); + +struct platform_private +{ + SDL_Joystick *sdl_joystick; + SDL_JoystickID id; +}; + +static inline struct platform_private *impl_from_DEVICE_OBJECT(DEVICE_OBJECT *device) +{ + return (struct platform_private *)get_platform_private(device); +} + +static int compare_platform_device(DEVICE_OBJECT *device, void *platform_dev) +{ + SDL_JoystickID id1 = impl_from_DEVICE_OBJECT(device)->id; + SDL_JoystickID id2 = PtrToUlong(platform_dev); + return (id1 != id2); +} + +static NTSTATUS get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *out_length) +{ + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS get_string(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD length) +{ + struct platform_private *ext = impl_from_DEVICE_OBJECT(device); + const char* str = NULL; + + switch (index) + { + case HID_STRING_ID_IPRODUCT: + str = pSDL_JoystickName(ext->sdl_joystick); + break; + case HID_STRING_ID_IMANUFACTURER: + str = "SDL"; + break; + case HID_STRING_ID_ISERIALNUMBER: + str = "000000"; + break; + default: + ERR("Unhandled string index %i\n", index); + } + + if (str && str[0]) + MultiByteToWideChar(CP_ACP, 0, str, -1, buffer, length); + else + buffer[0] = 0; + + return STATUS_SUCCESS; +} + +static NTSTATUS begin_report_processing(DEVICE_OBJECT *device) +{ + return STATUS_SUCCESS; +} + +static NTSTATUS set_output_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *written) +{ + *written = 0; + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS get_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *read) +{ + *read = 0; + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *written) +{ + *written = 0; + return STATUS_NOT_IMPLEMENTED; +} + +static const platform_vtbl sdl_vtbl = +{ + compare_platform_device, + get_reportdescriptor, + get_string, + begin_report_processing, + set_output_report, + get_feature_report, + set_feature_report, +}; + +static void try_remove_device(SDL_JoystickID index) +{ + DEVICE_OBJECT *device = NULL; + + device = bus_find_hid_device(&sdl_vtbl, ULongToPtr(index)); + if (!device) return; + + IoInvalidateDeviceRelations(device, RemovalRelations); + + bus_remove_hid_device(device); +} + +static void try_add_device(SDL_JoystickID index) +{ + DWORD vid = 0, pid = 0, version = 0; + DEVICE_OBJECT *device = NULL; + WCHAR serial[34] = {0}; + char guid_str[34]; + BOOL is_xbox_gamepad; + int button_count, axis_count; + + SDL_Joystick* joystick; + SDL_JoystickID id; + SDL_JoystickGUID guid; + + if ((joystick = pSDL_JoystickOpen(index)) == NULL) + { + WARN("Unable to open sdl device %i: %s\n", index, pSDL_GetError()); + return; + } + + id = index; + if (pSDL_JoystickGetProductVersion != NULL) { + vid = pSDL_JoystickGetVendor(joystick); + pid = pSDL_JoystickGetProduct(joystick); + version = pSDL_JoystickGetProductVersion(joystick); + } + else + { + vid = 0x01; + pid = pSDL_JoystickInstanceID(joystick) + 1; + version = 0; + } + + guid = pSDL_JoystickGetGUID(joystick); + pSDL_JoystickGetGUIDString(guid, guid_str, sizeof(guid_str)); + MultiByteToWideChar(CP_ACP, 0, guid_str, -1, serial, sizeof(guid_str)); + + TRACE("Found sdl device %i (vid %04x, pid %04x, version %u, serial %s)\n", + index, vid, pid, version, debugstr_w(serial)); + + axis_count = pSDL_JoystickNumAxes(joystick); + button_count = pSDL_JoystickNumAxes(joystick); + is_xbox_gamepad = (axis_count == 6 && button_count >= 14); + + device = bus_create_hid_device(sdl_driver_obj, sdl_busidW, vid, pid, version, 0, serial, is_xbox_gamepad, &GUID_DEVCLASS_SDL, &sdl_vtbl, sizeof(struct platform_private)); + + if (device) + { + struct platform_private *private = impl_from_DEVICE_OBJECT(device); + private->sdl_joystick = joystick; + private->id = id; + IoInvalidateDeviceRelations(device, BusRelations); + } + else + { + WARN("Ignoring device %i\n", index); + } +} + +static void process_device_event(SDL_Event *event) +{ + TRACE_(hid_report)("Received action %x\n", event->type); + + if (event->type == SDL_JOYDEVICEADDED) + try_add_device(((SDL_JoyDeviceEvent*)event)->which); + else if (event->type == SDL_JOYDEVICEREMOVED) + try_remove_device(((SDL_JoyDeviceEvent*)event)->which); +} + +static DWORD CALLBACK deviceloop_thread(void *args) +{ + HANDLE init_done = args; + SDL_Event event; + + if (pSDL_Init(SDL_INIT_JOYSTICK) < 0) + { + ERR("Can't Init SDL\n"); + return STATUS_UNSUCCESSFUL; + } + + pSDL_JoystickEventState(SDL_ENABLE); + + SetEvent(init_done); + + while (1) + while (pSDL_WaitEvent(&event) != 0) + process_device_event(&event); + + TRACE("Device thread exiting\n"); + return 0; +} + NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) { - FIXME("STUB: (%p, %s)\n", driver, debugstr_w(registry_path->Buffer)); + HANDLE events[2]; + DWORD result; + + TRACE("(%p, %s)\n", driver, debugstr_w(registry_path->Buffer)); + if (sdl_handle == NULL) + { + sdl_handle = wine_dlopen(SONAME_LIBSDL2, RTLD_NOW, NULL, 0); + if (!sdl_handle) { + WARN("could not load %s\n", SONAME_LIBSDL2); + sdl_driver_obj = NULL; + return STATUS_UNSUCCESSFUL; + } +#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(sdl_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} + LOAD_FUNCPTR(SDL_GetError); + LOAD_FUNCPTR(SDL_Init); + LOAD_FUNCPTR(SDL_JoystickEventState); + LOAD_FUNCPTR(SDL_JoystickGetGUID); + LOAD_FUNCPTR(SDL_JoystickGetGUIDString); + LOAD_FUNCPTR(SDL_JoystickInstanceID); + LOAD_FUNCPTR(SDL_JoystickName); + LOAD_FUNCPTR(SDL_JoystickNumAxes); + LOAD_FUNCPTR(SDL_JoystickOpen); + LOAD_FUNCPTR(SDL_WaitEvent); +#undef LOAD_FUNCPTR + pSDL_JoystickGetProduct = wine_dlsym(sdl_handle, "SDL_JoystickGetProduct", NULL, 0); + pSDL_JoystickGetProductVersion = wine_dlsym(sdl_handle, "SDL_JoystickGetProductVersion", NULL, 0); + pSDL_JoystickGetVendor = wine_dlsym(sdl_handle, "SDL_JoystickGetVendor", NULL, 0); + } + + sdl_driver_obj = driver; + driver->MajorFunction[IRP_MJ_PNP] = common_pnp_dispatch; + driver->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = hid_internal_dispatch; + + if (!(events[0] = CreateEventW(NULL, TRUE, FALSE, NULL))) + goto error; + if (!(events[1] = CreateThread(NULL, 0, deviceloop_thread, events[0], 0, NULL))) + { + CloseHandle(events[0]); + goto error; + } + + result = WaitForMultipleObjects(2, events, FALSE, INFINITE); + CloseHandle(events[0]); + CloseHandle(events[1]); + if (result == WAIT_OBJECT_0) + { + TRACE("Initialization successful\n"); + return STATUS_SUCCESS; + } + +error: + sdl_driver_obj = NULL; + return STATUS_UNSUCCESSFUL; +sym_not_found: + wine_dlclose(sdl_handle, NULL, 0); + sdl_handle = NULL; return STATUS_UNSUCCESSFUL; }

1 0

Nikolay Sivov : comctl32/tests: Run some tooltips tests on version 6 too.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 73b70aff6cca9587eab620c598df88163342f3c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73b70aff6cca9587eab620c5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 21 16:18:53 2018 +0300 comctl32/tests: Run some tooltips tests on version 6 too. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/tooltips.c | 48 ++++++++++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 7e82604..207536c 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -24,9 +24,11 @@ #include "wine/test.h" +#include "v6util.h" + #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) -static void test_create_tooltip(void) +static void test_create_tooltip(BOOL is_v6) { HWND parent, hwnd; DWORD style, exp_style; @@ -56,9 +58,12 @@ static void test_create_tooltip(void) ok(hwnd != NULL, "failed to create tooltip wnd\n"); style = GetWindowLongA(hwnd, GWL_STYLE); - trace("style = %08x\n", style); - ok(style == (WS_POPUP | WS_CLIPSIBLINGS | WS_BORDER), - "wrong style %08x\n", style); + exp_style = WS_POPUP | WS_CLIPSIBLINGS; + if (!is_v6) + exp_style |= WS_BORDER; +todo_wine_if(is_v6) + ok(style == exp_style || broken(style == (exp_style | WS_BORDER)) /* XP */, + "Unexpected window style %#x.\n", style); DestroyWindow(hwnd); @@ -273,9 +278,10 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP return DefWindowProcA(hwnd, message, wParam, lParam); } -static BOOL register_parent_wnd_class(void) +static void register_parent_wnd_class(void) { WNDCLASSA cls; + BOOL ret; cls.style = 0; cls.lpfnWndProc = parent_wnd_proc; @@ -287,14 +293,12 @@ static BOOL register_parent_wnd_class(void) cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "Tooltips test parent class"; - return RegisterClassA(&cls); + ret = RegisterClassA(&cls); + ok(ret, "Failed to register test parent class.\n"); } static HWND create_parent_window(void) { - if (!register_parent_wnd_class()) - return NULL; - return CreateWindowExA(0, "Tooltips test parent class", "Tooltips test parent window", WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | @@ -884,7 +888,7 @@ static LRESULT CALLBACK info_wnd_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM return 0; } -static void test_setinfo(void) +static void test_setinfo(BOOL is_v6) { WNDCLASSA wc; LRESULT lResult; @@ -976,7 +980,8 @@ static void test_setinfo(void) toolInfo2.uId = 0x1234ABCD; lResult = SendMessageA(hwndTip, TTM_GETTOOLINFOA, 0, (LPARAM)&toolInfo2); ok(lResult, "GetToolInfo failed\n"); - ok(toolInfo2.uFlags & TTF_SUBCLASS, "uFlags does not have subclass\n"); + ok(toolInfo2.uFlags & TTF_SUBCLASS || broken(is_v6 && !(toolInfo2.uFlags & TTF_SUBCLASS)) /* XP */, + "uFlags does not have subclass\n"); wndProc = (WNDPROC)GetWindowLongPtrA(parent, GWLP_WNDPROC); ok (wndProc != info_wnd_proc, "Window Proc is wrong\n"); @@ -1057,15 +1062,32 @@ static void test_margin(void) START_TEST(tooltips) { + ULONG_PTR ctx_cookie; + HANDLE hCtx; + LoadLibraryA("comctl32.dll"); - test_create_tooltip(); + register_parent_wnd_class(); + + test_create_tooltip(FALSE); test_customdraw(); test_gettext(); test_ttm_gettoolinfo(); test_longtextA(); test_longtextW(); test_track(); - test_setinfo(); + test_setinfo(FALSE); test_margin(); + + if (!load_v6_module(&ctx_cookie, &hCtx)) + return; + + test_create_tooltip(TRUE); + test_customdraw(); + test_longtextW(); + test_track(); + test_setinfo(TRUE); + test_margin(); + + unload_v6_module(ctx_cookie, hCtx); }

1 0

Nikolay Sivov : comctl32/tooltips: Fix structure size check for TTM_ADDTOOLW.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: c586b759a97eb62f399689bbc5572811b12eb78f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c586b759a97eb62f399689bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 21 16:18:54 2018 +0300 comctl32/tooltips: Fix structure size check for TTM_ADDTOOLW. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/tooltips.c | 80 ++++++++++++++++++++++++++++++++++++++++-- dlls/comctl32/tooltips.c | 2 +- 2 files changed, 79 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 207536c..c260e3d 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -44,7 +44,6 @@ static void test_create_tooltip(BOOL is_v6) ok(hwnd != NULL, "failed to create tooltip wnd\n"); style = GetWindowLongA(hwnd, GWL_STYLE); - trace("style = %08x\n", style); exp_style = 0x7fffffff | WS_POPUP; exp_style &= ~(WS_CHILD | WS_MAXIMIZE | WS_BORDER | WS_DLGFRAME); ok(style == exp_style || broken(style == (exp_style | WS_BORDER)), /* nt4 */ @@ -448,7 +447,7 @@ todo_wine NULL, NULL, NULL, 0); ok(hwnd != NULL, "failed to create tooltip wnd\n"); - toolinfoW.cbSize = sizeof(TTTOOLINFOW); + toolinfoW.cbSize = TTTOOLINFOW_V2_SIZE + 1; toolinfoW.hwnd = NULL; toolinfoW.hinst = GetModuleHandleA(NULL); toolinfoW.uFlags = 0; @@ -457,6 +456,9 @@ todo_wine toolinfoW.lParam = 0xdeadbeef; GetClientRect(hwnd, &toolinfoW.rect); r = SendMessageW(hwnd, TTM_ADDTOOLW, 0, (LPARAM)&toolinfoW); + /* Wine currently checks for V3 structure size, which matches what V6 control does. + Older implementation was never updated to support lpReserved field. */ +todo_wine ok(!r, "Adding the tool to the tooltip succeeded!\n"); if (0) /* crashes on NT4 */ @@ -1060,6 +1062,78 @@ static void test_margin(void) DestroyWindow(hwnd); } +static void test_TTM_ADDTOOL(BOOL is_v6) +{ + static const WCHAR testW[] = {'T','e','s','t',0}; + TTTOOLINFOW tiW; + TTTOOLINFOA ti; + int ret, size; + HWND hwnd, parent; + UINT max_size; + + parent = CreateWindowExA(0, "Static", NULL, WS_POPUP, 0, 0, 0, 0, NULL, NULL, NULL, 0); + ok(parent != NULL, "failed to create parent wnd\n"); + + hwnd = CreateWindowExA(WS_EX_TOPMOST, TOOLTIPS_CLASSA, NULL, TTS_NOPREFIX | TTS_ALWAYSTIP, + 0, 0, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0); + ok(hwnd != NULL, "Failed to create tooltip window.\n"); + + for (size = 0; size <= TTTOOLINFOW_V3_SIZE + 1; size++) + { + ti.cbSize = size; + ti.hwnd = NULL; + ti.hinst = GetModuleHandleA(NULL); + ti.uFlags = 0; + ti.uId = 0x1234abce; + ti.lpszText = (LPSTR)"Test"; + ti.lParam = 0xdeadbeef; + GetClientRect(hwnd, &ti.rect); + + ret = SendMessageA(hwnd, TTM_ADDTOOLA, 0, (LPARAM)&ti); + ok(ret, "Failed to add a tool, size %d.\n", size); + + ret = SendMessageA(hwnd, TTM_GETTOOLCOUNT, 0, 0); + ok(ret == 1, "Unexpected tool count %d, size %d.\n", ret, size); + + ret = SendMessageA(hwnd, TTM_DELTOOLA, 0, (LPARAM)&ti); + ok(!ret, "Unexpected ret value %d.\n", ret); + + ret = SendMessageA(hwnd, TTM_GETTOOLCOUNT, 0, 0); + ok(ret == 0, "Unexpected tool count %d, size %d.\n", ret, size); + } + + /* W variant checks cbSize. */ + max_size = is_v6 ? TTTOOLINFOW_V3_SIZE : TTTOOLINFOW_V2_SIZE; + for (size = 0; size <= max_size + 1; size++) + { + tiW.cbSize = size; + tiW.hwnd = NULL; + tiW.hinst = GetModuleHandleA(NULL); + tiW.uFlags = 0; + tiW.uId = 0x1234abce; + tiW.lpszText = (LPWSTR)testW; + tiW.lParam = 0xdeadbeef; + GetClientRect(hwnd, &tiW.rect); + + ret = SendMessageA(hwnd, TTM_ADDTOOLW, 0, (LPARAM)&tiW); + todo_wine_if(!is_v6 && size > max_size) + ok(size <= max_size ? ret : !ret, "%d: Unexpected ret value %d, size %d, max size %d.\n", is_v6, ret, size, max_size); + if (ret) + { + ret = SendMessageA(hwnd, TTM_GETTOOLCOUNT, 0, 0); + ok(ret == 1, "Unexpected tool count %d.\n", ret); + + ret = SendMessageA(hwnd, TTM_DELTOOLA, 0, (LPARAM)&tiW); + ok(!ret, "Unexpected ret value %d.\n", ret); + + ret = SendMessageA(hwnd, TTM_GETTOOLCOUNT, 0, 0); + ok(ret == 0, "Unexpected tool count %d.\n", ret); + } + } + + DestroyWindow(hwnd); +} + START_TEST(tooltips) { ULONG_PTR ctx_cookie; @@ -1078,6 +1152,7 @@ START_TEST(tooltips) test_track(); test_setinfo(FALSE); test_margin(); + test_TTM_ADDTOOL(FALSE); if (!load_v6_module(&ctx_cookie, &hCtx)) return; @@ -1088,6 +1163,7 @@ START_TEST(tooltips) test_track(); test_setinfo(TRUE); test_margin(); + test_TTM_ADDTOOL(TRUE); unload_v6_module(ctx_cookie, hCtx); } diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 1c8cb66..12f2d4b 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1059,7 +1059,7 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) TRACE("add tool (%p) %p %ld%s\n", infoPtr->hwndSelf, ti->hwnd, ti->uId, (ti->uFlags & TTF_IDISHWND) ? " TTF_IDISHWND" : ""); - if (ti->cbSize >= TTTOOLINFOW_V2_SIZE && !ti->lpszText && isW) + if (ti->cbSize > TTTOOLINFOW_V3_SIZE && isW) return FALSE; if (infoPtr->uNumTools == 0) {

1 0

Nikolay Sivov : dwrite: Use ARRAY_SIZE() macro.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: d31651b70566716d51c6495dbb6f8fce76561d7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d31651b70566716d51c6495d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 21 08:15:22 2018 +0300 dwrite: Use ARRAY_SIZE() macro. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 10 +++++----- dlls/dwrite/dwrite_private.h | 2 ++ dlls/dwrite/font.c | 26 +++++++++++++------------- dlls/dwrite/opentype.c | 6 +++--- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index bb08017..b20bafa 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -217,8 +217,8 @@ struct fallback_mapping { static const struct fallback_mapping fontfallback_neutral_data[] = { #define MAPPING_RANGE(ranges, families) \ - { (DWRITE_UNICODE_RANGE *)ranges, sizeof(ranges)/sizeof(ranges[0]), \ - (WCHAR **)families, sizeof(families)/sizeof(families[0]) } + { (DWRITE_UNICODE_RANGE *)ranges, ARRAY_SIZE(ranges), \ + (WCHAR **)families, ARRAY_SIZE(families) } MAPPING_RANGE(cjk_ranges, cjk_families), @@ -1056,7 +1056,7 @@ static UINT32 get_opentype_language(const WCHAR *locale) if (locale) { WCHAR tag[5]; - if (GetLocaleInfoEx(locale, LOCALE_SOPENTYPELANGUAGETAG, tag, sizeof(tag)/sizeof(WCHAR))) + if (GetLocaleInfoEx(locale, LOCALE_SOPENTYPELANGUAGETAG, tag, ARRAY_SIZE(tag))) language = DWRITE_MAKE_OPENTYPE_TAG(tag[0],tag[1],tag[2],tag[3]); } @@ -1108,7 +1108,7 @@ static DWRITE_NUMBER_SUBSTITUTION_METHOD get_number_substitutes(IDWriteNumberSub break; case DWRITE_NUMBER_SUBSTITUTION_METHOD_CONTEXTUAL: case DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL: - if (GetLocaleInfoEx(numbersubst->locale, LOCALE_SISO639LANGNAME, isolang, sizeof(isolang)/sizeof(isolang[0]))) { + if (GetLocaleInfoEx(numbersubst->locale, LOCALE_SISO639LANGNAME, isolang, ARRAY_SIZE(isolang))) { static const WCHAR arW[] = {'a','r',0}; static const WCHAR arabicW[] = {0x640,0x641,0x642,0x643,0x644,0x645,0x646,0x647,0x648,0x649,0}; @@ -2199,7 +2199,7 @@ HRESULT create_system_fontfallback(IDWriteFactory5 *factory, IDWriteFontFallback fallback->IDWriteFontFallback_iface.lpVtbl = &fontfallbackvtbl; fallback->factory = factory; fallback->mappings = (struct fallback_mapping *)fontfallback_neutral_data; - fallback->mappings_count = sizeof(fontfallback_neutral_data) / sizeof(*fontfallback_neutral_data); + fallback->mappings_count = ARRAY_SIZE(fontfallback_neutral_data); IDWriteFactory5_GetSystemFontCollection(fallback->factory, FALSE, &fallback->systemcollection, FALSE); *ret = &fallback->IDWriteFontFallback_iface; diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 31b977a..c16c401 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -24,6 +24,8 @@ #include "wine/list.h" #include "wine/unicode.h" +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) + static const DWRITE_MATRIX identity = { 1.0f, 0.0f, diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c545f09..c7824b6 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -419,7 +419,7 @@ static void release_font_data(struct dwrite_font_data *data) if (InterlockedDecrement(&data->ref) > 0) return; - for (i = DWRITE_INFORMATIONAL_STRING_NONE; i < sizeof(data->info_strings)/sizeof(data->info_strings[0]); i++) { + for (i = DWRITE_INFORMATIONAL_STRING_NONE; i < ARRAY_SIZE(data->info_strings); i++) { if (data->info_strings[i]) IDWriteLocalizedStrings_Release(data->info_strings[i]); } @@ -522,7 +522,7 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace4 *iface) IDWriteFontFileStream_Release(This->stream); heap_free(This->files); - for (i = 0; i < sizeof(This->glyphs)/sizeof(This->glyphs[0]); i++) + for (i = 0; i < ARRAY_SIZE(This->glyphs); i++) heap_free(This->glyphs[i]); freetype_notify_cacheremove(iface); @@ -3060,7 +3060,7 @@ static BOOL is_known_weight_value(DWRITE_FONT_WEIGHT weight, WCHAR *nameW) { extrablackW, DWRITE_FONT_WEIGHT_EXTRA_BLACK } }; - ptr = bsearch(&weight, knownweights, sizeof(knownweights)/sizeof(knownweights[0]), sizeof(knownweights[0]), + ptr = bsearch(&weight, knownweights, ARRAY_SIZE(knownweights), sizeof(knownweights[0]), compare_knownweights); if (!ptr) { nameW[0] = 0; @@ -3373,8 +3373,8 @@ static HRESULT init_font_data(const struct fontface_desc *desc, IDWriteLocalized data->fontsig = props.fontsig; data->lf = props.lf; - fontstrings_get_en_string(*family_name, familyW, sizeof(familyW)/sizeof(WCHAR)); - fontstrings_get_en_string(data->names, faceW, sizeof(faceW)/sizeof(WCHAR)); + fontstrings_get_en_string(*family_name, familyW, ARRAY_SIZE(familyW)); + fontstrings_get_en_string(data->names, faceW, ARRAY_SIZE(faceW)); if (font_apply_differentiation_rules(data, familyW, faceW)) { set_en_localizedstring(*family_name, familyW); set_en_localizedstring(data->names, faceW); @@ -3495,7 +3495,7 @@ static void fontfamily_add_bold_simulated_face(struct dwrite_fontfamily_data *fa /* Simulated face name should only contain Bold as weight term, so remove existing regular and weight terms. */ - fontstrings_get_en_string(family->fonts[heaviest]->names, initialW, sizeof(initialW)/sizeof(WCHAR)); + fontstrings_get_en_string(family->fonts[heaviest]->names, initialW, ARRAY_SIZE(initialW)); facename_remove_regular_term(initialW, -1); /* remove current weight pattern */ @@ -3566,7 +3566,7 @@ static void fontfamily_add_oblique_simulated_face(struct dwrite_fontfamily_data /* add oblique simulation based on this regular face */ /* remove regular term if any, append 'Oblique' */ - fontstrings_get_en_string(family->fonts[regular]->names, facenameW, sizeof(facenameW)/sizeof(WCHAR)); + fontstrings_get_en_string(family->fonts[regular]->names, facenameW, ARRAY_SIZE(facenameW)); facename_remove_regular_term(facenameW, -1); if (*facenameW) @@ -3610,7 +3610,7 @@ static BOOL fontcollection_add_replacement(struct dwrite_fontcollection *collect } fontcollection_add_family(collection, target); - fontstrings_get_en_string(replacement->familyname, nameW, sizeof(nameW)/sizeof(WCHAR)); + fontstrings_get_en_string(replacement->familyname, nameW, ARRAY_SIZE(nameW)); TRACE("replacement %s -> %s\n", debugstr_w(target_name), debugstr_w(nameW)); } IDWriteLocalizedStrings_Release(strings); @@ -3767,7 +3767,7 @@ HRESULT create_font_collection(IDWriteFactory5 *factory, IDWriteFontFileEnumerat continue; } - fontstrings_get_en_string(family_name, familyW, sizeof(familyW)/sizeof(WCHAR)); + fontstrings_get_en_string(family_name, familyW, ARRAY_SIZE(familyW)); /* ignore dot named faces */ if (familyW[0] == '.') { @@ -3886,7 +3886,7 @@ static HRESULT create_local_file_reference(IDWriteFactory5 *factory, const WCHAR static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\\',0}; WCHAR fullpathW[MAX_PATH]; - GetWindowsDirectoryW(fullpathW, sizeof(fullpathW)/sizeof(WCHAR)); + GetWindowsDirectoryW(fullpathW, ARRAY_SIZE(fullpathW)); strcatW(fullpathW, fontsW); strcatW(fullpathW, filename); @@ -3914,7 +3914,7 @@ static HRESULT WINAPI systemfontfileenumerator_MoveNext(IDWriteFontFileEnumerato { struct system_fontfile_enumerator *enumerator = impl_from_IDWriteFontFileEnumerator(iface); WCHAR name_buf[256], *name = name_buf; - DWORD name_count, max_name_count = sizeof(name_buf) / sizeof(*name_buf), type, data_size; + DWORD name_count, max_name_count = ARRAY_SIZE(name_buf), type, data_size; HRESULT hr = S_OK; LONG r; @@ -4162,8 +4162,8 @@ HRESULT get_eudc_fontcollection(IDWriteFactory5 *factory, IDWriteFontCollection1 WCHAR keynameW[64], pathW[MAX_PATH]; DWORD type, path_len, name_len; - path_len = sizeof(pathW)/sizeof(*pathW); - name_len = sizeof(keynameW)/sizeof(*keynameW); + path_len = ARRAY_SIZE(pathW); + name_len = ARRAY_SIZE(keynameW); retval = RegEnumValueW(eudckey, index++, keynameW, &name_len, NULL, &type, (BYTE*)pathW, &path_len); if (retval || type != REG_SZ) continue; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 18fb00b..b95083e 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1553,7 +1553,7 @@ static BOOL opentype_decode_namerecord(const TT_NAME_V0 *header, BYTE *storage_a UINT codepage; codepage = get_name_record_codepage(platform, encoding); - get_name_record_locale(platform, lang_id, locale, sizeof(locale)/sizeof(WCHAR)); + get_name_record_locale(platform, lang_id, locale, ARRAY_SIZE(locale)); if (codepage) { DWORD len = MultiByteToWideChar(codepage, 0, (LPSTR)(storage_area + offset), length, NULL, 0); @@ -1730,7 +1730,7 @@ HRESULT opentype_get_font_facename(struct file_stream_desc *stream_desc, WCHAR * BOOL exists; exists = FALSE; - if (GetSystemDefaultLocaleName(localeW, sizeof(localeW)/sizeof(WCHAR))) + if (GetSystemDefaultLocaleName(localeW, ARRAY_SIZE(localeW))) IDWriteLocalizedStrings_FindLocaleName(lfnames, localeW, &index, &exists); if (!exists) @@ -1801,7 +1801,7 @@ HRESULT opentype_get_typographic_features(IDWriteFontFace *fontface, UINT32 scri UINT8 i; *count = 0; - for (i = 0; i < sizeof(tables)/sizeof(tables[0]); i++) { + for (i = 0; i < ARRAY_SIZE(tables); i++) { const OT_ScriptList *scriptlist; const GPOS_GSUB_Header *header; const OT_Script *script;

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_sub_resource_target() in surface_download_data().
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: a09edd24461c75529565a9195835a25c4e24f657 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a09edd24461c75529565a919… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 21 10:43:30 2018 +0330 wined3d: Use wined3d_texture_get_sub_resource_target() in surface_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c3fabef..91979ee 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -555,6 +555,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct unsigned int src_row_pitch, src_slice_pitch; struct wined3d_bo_address data; BYTE *temporary_mem = NULL; + GLenum target; void *mem; /* Only support read back of converted P8 surfaces. */ @@ -565,8 +566,9 @@ static void surface_download_data(struct wined3d_surface *surface, const struct } sub_resource = &texture->sub_resources[sub_resource_idx]; + target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); - if (surface->texture_target == GL_TEXTURE_2D_ARRAY) + if (target == GL_TEXTURE_2D_ARRAY) { if (format->download) { @@ -658,7 +660,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct TRACE("Downloading compressed surface %p, level %u, format %#x, type %#x, data %p.\n", surface, surface->texture_level, format->glFormat, format->glType, mem); - GL_EXTCALL(glGetCompressedTexImage(surface->texture_target, surface->texture_level, mem)); + GL_EXTCALL(glGetCompressedTexImage(target, surface->texture_level, mem)); checkGLcall("glGetCompressedTexImage"); } else @@ -666,8 +668,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct TRACE("Downloading surface %p, level %u, format %#x, type %#x, data %p.\n", surface, surface->texture_level, format->glFormat, format->glType, mem); - gl_info->gl_ops.gl.p_glGetTexImage(surface->texture_target, surface->texture_level, - format->glFormat, format->glType, mem); + gl_info->gl_ops.gl.p_glGetTexImage(target, surface->texture_level, format->glFormat, format->glType, mem); checkGLcall("glGetTexImage"); }

1 0

Michael Stefaniuc : ddraw/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: f450e8e32fcd65ee669c12ede918e1e707d5ccbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=f450e8e32fcd65ee669c12ed… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 20 23:57:14 2018 +0100 ddraw/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 02b10b5..550d73a 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -14265,7 +14265,7 @@ static void test_map_synchronisation(void) tri_count = ((tri_count + 2 + 3) & ~3) - 2; vb_desc.dwNumVertices = tri_count + 2; - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3D3_CreateVertexBuffer(d3d, &vb_desc, &buffer, 0, NULL); ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 43c52aa..3f433a6 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -13640,7 +13640,7 @@ static void test_map_synchronisation(void) tri_count = ((tri_count + 2 + 3) & ~3) - 2; vb_desc.dwNumVertices = tri_count + 2; - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3D7_CreateVertexBuffer(d3d, &vb_desc, &buffer, 0); ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr);

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_sub_resource_target() in wined3d_texture_allocate_gl_mutable_storage().
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 4e3cd97d496b7830fd3681e83940b13f89c2188b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e3cd97d496b7830fd3681e8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 21 10:43:29 2018 +0330 wined3d: Use wined3d_texture_get_sub_resource_target() in wined3d_texture_allocate_gl_mutable_storage(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 94d6a98..1e34299 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -492,7 +492,7 @@ static void wined3d_texture_allocate_gl_mutable_storage(struct wined3d_texture * GLenum gl_internal_format, const struct wined3d_format *format, const struct wined3d_gl_info *gl_info) { - unsigned int i, sub_call_count; + unsigned int i, level, sub_call_count; sub_call_count = texture->level_count; if (texture->target != GL_TEXTURE_2D_ARRAY) @@ -502,29 +502,31 @@ static void wined3d_texture_allocate_gl_mutable_storage(struct wined3d_texture * { struct wined3d_surface *surface = texture->sub_resources[i].u.surface; GLsizei width, height; + GLenum target; - width = wined3d_texture_get_level_pow2_width(texture, surface->texture_level); - height = wined3d_texture_get_level_pow2_height(texture, surface->texture_level); + level = surface->texture_level; + width = wined3d_texture_get_level_pow2_width(texture, level); + height = wined3d_texture_get_level_pow2_height(texture, level); if (texture->resource.format_flags & WINED3DFMT_FLAG_HEIGHT_SCALE) { height *= format->height_scale.numerator; height /= format->height_scale.denominator; } + target = wined3d_texture_get_sub_resource_target(texture, i); TRACE("surface %p, target %#x, level %u, width %u, height %u.\n", - surface, surface->texture_target, surface->texture_level, width, height); + surface, target, level, width, height); if (texture->target == GL_TEXTURE_2D_ARRAY) { - GL_EXTCALL(glTexImage3D(surface->texture_target, surface->texture_level, - gl_internal_format, width, height, texture->layer_count, 0, - format->glFormat, format->glType, NULL)); + GL_EXTCALL(glTexImage3D(target, level, gl_internal_format, width, height, + texture->layer_count, 0, format->glFormat, format->glType, NULL)); checkGLcall("glTexImage3D"); } else { - gl_info->gl_ops.gl.p_glTexImage2D(surface->texture_target, surface->texture_level, - gl_internal_format, width, height, 0, format->glFormat, format->glType, NULL); + gl_info->gl_ops.gl.p_glTexImage2D(target, level, gl_internal_format, + width, height, 0, format->glFormat, format->glType, NULL); checkGLcall("glTexImage2D"); } }

1 0

Alexandre Julliard : makefiles: Make the directory specifications a bit more standard.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 832a40109e645a18d6fc608008ae357000750b39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=832a40109e645a18d6fc6080… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 21 12:25:26 2018 +0100 makefiles: Make the directory specifications a bit more standard. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 5 ++--- aclocal.m4 | 8 ++++---- configure | 11 ++++------- configure.ac | 1 - tools/makedep.c | 12 ++++++------ tools/widl/Makefile.in | 2 +- tools/winegcc/Makefile.in | 2 +- tools/wrc/Makefile.in | 2 +- 8 files changed, 19 insertions(+), 24 deletions(-) diff --git a/Makefile.in b/Makefile.in index ea19306..9ad9f23 100644 --- a/Makefile.in +++ b/Makefile.in @@ -27,10 +27,9 @@ libdir = @libdir@ datarootdir = @datarootdir@ datadir = @datadir@ mandir = @mandir@ +includedir = @includedir@ fontdir = ${datadir}/wine/fonts -includedir = @includedir@/wine -dlldir = @dlldir@ -fakedlldir = ${dlldir}/fakedlls +dlldir = ${libdir}/wine top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ srcdir = @srcdir@ diff --git a/aclocal.m4 b/aclocal.m4 index 334d7a8..3fd8606 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -363,9 +363,9 @@ __uninstall__: $ac_dir/uninstall" wine_fn_append_rule \ "$ac_dir/install-lib:: $ac_dir \$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT - \$(INSTALL_DATA) $ac_dir/$ac_dll.fake \$(DESTDIR)\$(fakedlldir)/$ac_dll + \$(INSTALL_DATA) $ac_dir/$ac_dll.fake \$(DESTDIR)\$(dlldir)/fakedlls/$ac_dll $ac_dir/uninstall:: - \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll" + \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/fakedlls/$ac_dll" else wine_fn_append_rule \ "$ac_dir/install-lib:: $ac_dir @@ -451,9 +451,9 @@ __uninstall__: $ac_dir/uninstall" wine_fn_append_rule \ "$ac_dir/install:: $ac_dir \$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT - \$(INSTALL_DATA) $ac_dir/$ac_program.fake \$(DESTDIR)\$(fakedlldir)/$ac_program + \$(INSTALL_DATA) $ac_dir/$ac_program.fake \$(DESTDIR)\$(dlldir)/fakedlls/$ac_program $ac_dir/uninstall:: - \$(RM) \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" + \$(RM) \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/fakedlls/$ac_program" if test -z "$with_wine64" && wine_fn_has_flag installbin then diff --git a/configure b/configure index 657a557..cd2b275 100755 --- a/configure +++ b/configure @@ -735,7 +735,6 @@ LDEXECFLAGS LDRPATH_LOCAL LDRPATH_INSTALL DLLFLAGS -dlldir CPP OPENGL_LIBS ICOTOOL @@ -7450,8 +7449,6 @@ done -dlldir="\${libdir}/wine" - DLLFLAGS="-D_REENTRANT" LDRPATH_INSTALL="" @@ -7853,9 +7850,9 @@ __uninstall__: $ac_dir/uninstall" wine_fn_append_rule \ "$ac_dir/install-lib:: $ac_dir \$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT - \$(INSTALL_DATA) $ac_dir/$ac_dll.fake \$(DESTDIR)\$(fakedlldir)/$ac_dll + \$(INSTALL_DATA) $ac_dir/$ac_dll.fake \$(DESTDIR)\$(dlldir)/fakedlls/$ac_dll $ac_dir/uninstall:: - \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll" + \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/fakedlls/$ac_dll" else wine_fn_append_rule \ "$ac_dir/install-lib:: $ac_dir @@ -7944,9 +7941,9 @@ __uninstall__: $ac_dir/uninstall" wine_fn_append_rule \ "$ac_dir/install:: $ac_dir \$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT - \$(INSTALL_DATA) $ac_dir/$ac_program.fake \$(DESTDIR)\$(fakedlldir)/$ac_program + \$(INSTALL_DATA) $ac_dir/$ac_program.fake \$(DESTDIR)\$(dlldir)/fakedlls/$ac_program $ac_dir/uninstall:: - \$(RM) \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" + \$(RM) \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/fakedlls/$ac_program" if test -z "$with_wine64" && wine_fn_has_flag installbin then diff --git a/configure.ac b/configure.ac index 2996010..2ec62b6 100644 --- a/configure.ac +++ b/configure.ac @@ -699,7 +699,6 @@ AC_CHECK_HEADERS([libprocstat.h],,, dnl **** Check for working dll **** -AC_SUBST(dlldir,"\${libdir}/wine") AC_SUBST(DLLFLAGS,"-D_REENTRANT") AC_SUBST(LDRPATH_INSTALL,"") AC_SUBST(LDRPATH_LOCAL,"") diff --git a/tools/makedep.c b/tools/makedep.c index d6019b8..8d39623 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2412,7 +2412,7 @@ static void output_source_h( struct makefile *make, struct incl_file *source, co { strarray_add( &make->install_rules[INSTALL_DEV], source->name ); strarray_add( &make->install_rules[INSTALL_DEV], - strmake( "D$(includedir)/%s", get_include_install_path( source->name ) )); + strmake( "D$(includedir)/wine/%s", get_include_install_path( source->name ) )); } } @@ -2540,12 +2540,12 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, { strarray_add( &make->install_rules[INSTALL_DEV], xstrdup( source->name )); strarray_add( &make->install_rules[INSTALL_DEV], - strmake( "D$(includedir)/%s.idl", get_include_install_path( obj ) )); + strmake( "D$(includedir)/wine/%s.idl", get_include_install_path( obj ) )); if (source->file->flags & FLAG_IDL_HEADER) { strarray_add( &make->install_rules[INSTALL_DEV], strmake( "%s.h", obj )); strarray_add( &make->install_rules[INSTALL_DEV], - strmake( "d$(includedir)/%s.h", get_include_install_path( obj ) )); + strmake( "d$(includedir)/wine/%s.h", get_include_install_path( obj ) )); } } if (!targets.count) return; @@ -2589,10 +2589,10 @@ static void output_source_x( struct makefile *make, struct incl_file *source, co { strarray_add( &make->install_rules[INSTALL_DEV], source->name ); strarray_add( &make->install_rules[INSTALL_DEV], - strmake( "D$(includedir)/%s", get_include_install_path( source->name ) )); + strmake( "D$(includedir)/wine/%s", get_include_install_path( source->name ) )); strarray_add( &make->install_rules[INSTALL_DEV], strmake( "%s.h", obj )); strarray_add( &make->install_rules[INSTALL_DEV], - strmake( "d$(includedir)/%s.h", get_include_install_path( obj ) )); + strmake( "d$(includedir)/wine/%s.h", get_include_install_path( obj ) )); } } @@ -2975,7 +2975,7 @@ static void output_module( struct makefile *make ) add_install_rule( make, make->module, strmake( "%s%s", make->module, dll_ext ), strmake( "p$(dlldir)/%s%s", make->module, dll_ext )); add_install_rule( make, make->module, strmake( "%s.fake", make->module ), - strmake( "d$(fakedlldir)/%s", make->module )); + strmake( "d$(dlldir)/fakedlls/%s", make->module )); output( "%s%s %s.fake:", module_path, dll_ext, module_path ); } else diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index b47a170..e06d6cc 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -19,7 +19,7 @@ C_SRCS = \ LEX_SRCS = parser.l BISON_SRCS = parser.y -widl_EXTRADEFS = -DDEFAULT_INCLUDE_DIR=\"${includedir}/windows/\" +widl_EXTRADEFS = -DDEFAULT_INCLUDE_DIR=\"${includedir}/wine/windows/\" EXTRALIBS = -lwpp diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index daeb91b..6de23b0 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -9,7 +9,7 @@ C_SRCS = \ winegcc.c winegcc_EXTRADEFS = \ - -DINCLUDEDIR="\"${includedir}\"" \ + -DINCLUDEDIR="\"${includedir}/wine\"" \ -DDLLDIR="\"${dlldir}\"" \ -DLIBDIR="\"${libdir}\"" \ -DCC="\"$(CC)\"" \ diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index d502e4b..500d5c1 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -15,7 +15,7 @@ C_SRCS = \ LEX_SRCS = parser.l BISON_SRCS = parser.y -wrc_EXTRADEFS = -DINCLUDEDIR="\"${includedir}\"" +wrc_EXTRADEFS = -DINCLUDEDIR="\"${includedir}/wine\"" EXTRALIBS = $(GETTEXTPO_LIBS) -lwpp

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_sub_resource_target() in wined3d_surface_upload_data().
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 29e0230a94de20206457ec59c3f0e0e3659f001f URL: https://source.winehq.org/git/wine.git/?a=commit;h=29e0230a94de20206457ec59… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 21 10:43:31 2018 +0330 wined3d: Use wined3d_texture_get_sub_resource_target() in wined3d_surface_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 91979ee..6e80f85 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -775,6 +775,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w struct wined3d_texture *texture = surface->container; UINT update_w = src_rect->right - src_rect->left; UINT update_h = src_rect->bottom - src_rect->top; + GLenum target; TRACE("surface %p, gl_info %p, format %s, src_rect %s, src_pitch %u, dst_point %s, srgb %#x, data {%#x:%p}.\n", surface, gl_info, debug_d3dformat(format->id), wine_dbgstr_rect(src_rect), src_pitch, @@ -798,6 +799,8 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w checkGLcall("glBindBuffer"); } + target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); + if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) { unsigned int dst_row_pitch, dst_slice_pitch; @@ -819,22 +822,20 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w TRACE("Uploading compressed data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " "format %#x, image_size %#x, addr %p.\n", - surface->texture_target, surface->texture_level, surface->texture_layer, - dst_point->x, dst_point->y, update_w, update_h, internal, dst_slice_pitch, addr); + target, surface->texture_level, surface->texture_layer, dst_point->x, dst_point->y, + update_w, update_h, internal, dst_slice_pitch, addr); if (dst_row_pitch == src_pitch) { - if (surface->texture_target == GL_TEXTURE_2D_ARRAY) + if (target == GL_TEXTURE_2D_ARRAY) { - GL_EXTCALL(glCompressedTexSubImage3D(surface->texture_target, surface->texture_level, - dst_point->x, dst_point->y, surface->texture_layer, update_w, update_h, 1, - internal, dst_slice_pitch, addr)); + GL_EXTCALL(glCompressedTexSubImage3D(target, surface->texture_level, dst_point->x, dst_point->y, + surface->texture_layer, update_w, update_h, 1, internal, dst_slice_pitch, addr)); } else { - GL_EXTCALL(glCompressedTexSubImage2D(surface->texture_target, surface->texture_level, - dst_point->x, dst_point->y, update_w, update_h, - internal, dst_slice_pitch, addr)); + GL_EXTCALL(glCompressedTexSubImage2D(target, surface->texture_level, dst_point->x, dst_point->y, + update_w, update_h, internal, dst_slice_pitch, addr)); } } else @@ -846,16 +847,15 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w * can't use the unpack row length like for glTexSubImage2D. */ for (row = 0, y = dst_point->y; row < row_count; ++row) { - if (surface->texture_target == GL_TEXTURE_2D_ARRAY) + if (target == GL_TEXTURE_2D_ARRAY) { - GL_EXTCALL(glCompressedTexSubImage3D(surface->texture_target, surface->texture_level, - dst_point->x, y, surface->texture_layer, update_w, format->block_height, 1, - internal, dst_row_pitch, addr)); + GL_EXTCALL(glCompressedTexSubImage3D(target, surface->texture_level, dst_point->x, y, + surface->texture_layer, update_w, format->block_height, 1, internal, dst_row_pitch, addr)); } else { - GL_EXTCALL(glCompressedTexSubImage2D(surface->texture_target, surface->texture_level, - dst_point->x, y, update_w, format->block_height, internal, dst_row_pitch, addr)); + GL_EXTCALL(glCompressedTexSubImage2D(target, surface->texture_level, dst_point->x, y, + update_w, format->block_height, internal, dst_row_pitch, addr)); } y += format->block_height; @@ -873,20 +873,19 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w TRACE("Uploading data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " "format %#x, type %#x, addr %p.\n", - surface->texture_target, surface->texture_level, surface->texture_layer, + target, surface->texture_level, surface->texture_layer, dst_point->x, dst_point->y, update_w, update_h, format->glFormat, format->glType, addr); gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, src_pitch / format->byte_count); - if (surface->texture_target == GL_TEXTURE_2D_ARRAY) + if (target == GL_TEXTURE_2D_ARRAY) { - GL_EXTCALL(glTexSubImage3D(surface->texture_target, surface->texture_level, - dst_point->x, dst_point->y, surface->texture_layer, update_w, update_h, 1, - format->glFormat, format->glType, addr)); + GL_EXTCALL(glTexSubImage3D(target, surface->texture_level, dst_point->x, dst_point->y, + surface->texture_layer, update_w, update_h, 1, format->glFormat, format->glType, addr)); } else { - gl_info->gl_ops.gl.p_glTexSubImage2D(surface->texture_target, surface->texture_level, - dst_point->x, dst_point->y, update_w, update_h, format->glFormat, format->glType, addr); + gl_info->gl_ops.gl.p_glTexSubImage2D(target, surface->texture_level, dst_point->x, dst_point->y, + update_w, update_h, format->glFormat, format->glType, addr); } gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); checkGLcall("Upload surface data");

1 0

Henri Verbeet : wined3d: Store overlay info in textures instead of in surfaces.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 90696dfe5efa2ac8e3d703aec03474d08107214e URL: https://source.winehq.org/git/wine.git/?a=commit;h=90696dfe5efa2ac8e3d703ae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 21 10:43:27 2018 +0330 wined3d: Store overlay info in textures instead of in surfaces. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 105 +++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 16 ++++--- 2 files changed, 73 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=90696dfe5efa2ac8e3d7…

1 0

Alexandre Julliard : ntdll: Add support for running IL-only .NET executables.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 39c8875ff8aa543eaa50e52db0c546717de691af URL: https://source.winehq.org/git/wine.git/?a=commit;h=39c8875ff8aa543eaa50e52d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 21 09:55:05 2018 +0100 ntdll: Add support for running IL-only .NET executables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 50 +++++++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/signal_arm.c | 2 +- dlls/ntdll/signal_arm64.c | 2 +- dlls/ntdll/signal_i386.c | 2 +- dlls/ntdll/signal_powerpc.c | 2 +- dlls/ntdll/signal_x86_64.c | 2 +- include/winternl.h | 3 ++- 8 files changed, 56 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 3fcbbf7..51aa334 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -887,6 +887,44 @@ static void free_tls_slot( LDR_MODULE *mod ) /**************************************************************** + * fixup_imports_ilonly + * + * Fixup imports for an IL-only module. All we do is import mscoree. + * The loader_section must be locked while calling this function. + */ +static NTSTATUS fixup_imports_ilonly( WINE_MODREF *wm, LPCWSTR load_path, void **entry ) +{ + static const WCHAR mscoreeW[] = {'m','s','c','o','r','e','e','.','d','l','l',0}; + IMAGE_EXPORT_DIRECTORY *exports; + DWORD exp_size; + NTSTATUS status; + void *proc = NULL; + WINE_MODREF *prev, *imp; + + if (!(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) return STATUS_SUCCESS; /* already done */ + wm->ldr.Flags &= ~LDR_DONT_RESOLVE_REFS; + + wm->nDeps = 1; + wm->deps = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(WINE_MODREF *) ); + + prev = current_modref; + current_modref = wm; + if (!(status = load_dll( load_path, mscoreeW, 0, &imp ))) wm->deps[0] = imp; + current_modref = prev; + if (status) return status; + + TRACE( "loaded mscoree for %s\n", debugstr_w(wm->ldr.FullDllName.Buffer) ); + + if ((exports = RtlImageDirectoryEntryToData( imp->ldr.BaseAddress, TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ))) + proc = find_named_export( imp->ldr.BaseAddress, exports, exp_size, "_CorExeMain", -1, load_path ); + if (!proc) return STATUS_PROCEDURE_NOT_FOUND; + *entry = proc; + return STATUS_SUCCESS; +} + + +/**************************************************************** * fixup_imports * * Fixup all imports of a given module. @@ -1837,6 +1875,9 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, return STATUS_NO_MEMORY; } + if (image_info.loader_flags) wm->ldr.Flags |= LDR_COR_IMAGE; + if (image_info.image_flags & IMAGE_FLAGS_ComPlusILOnly) wm->ldr.Flags |= LDR_COR_ILONLY; + set_security_cookie( module, len ); /* fixup imports */ @@ -2991,7 +3032,7 @@ PIMAGE_NT_HEADERS WINAPI RtlImageNtHeader(HMODULE hModule) * Attach to all the loaded dlls. * If this is the first time, perform the full process initialization. */ -NTSTATUS attach_dlls( CONTEXT *context ) +NTSTATUS attach_dlls( CONTEXT *context, void **entry ) { NTSTATUS status; WINE_MODREF *wm; @@ -3009,7 +3050,12 @@ NTSTATUS attach_dlls( CONTEXT *context ) if (!imports_fixup_done) { actctx_init(); - if ((status = fixup_imports( wm, load_path )) != STATUS_SUCCESS) + if (wm->ldr.Flags & LDR_COR_ILONLY) + status = fixup_imports_ilonly( wm, load_path, entry ); + else + status = fixup_imports( wm, load_path ); + + if (status) { ERR( "Importing dlls for %s failed, status %x\n", debugstr_w(NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer), status ); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 3fbccba..85bdd9e 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -106,7 +106,7 @@ extern NTSTATUS validate_open_object_attributes( const OBJECT_ATTRIBUTES *attr ) /* module handling */ extern LIST_ENTRY tls_links DECLSPEC_HIDDEN; -extern NTSTATUS attach_dlls( CONTEXT *context ) DECLSPEC_HIDDEN; +extern NTSTATUS attach_dlls( CONTEXT *context, void **entry ) DECLSPEC_HIDDEN; extern FARPROC RELAY_GetProcAddress( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, FARPROC proc, DWORD ordinal, const WCHAR *user ) DECLSPEC_HIDDEN; extern FARPROC SNOOP_GetProcAddress( HMODULE hmod, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 79aeb2a..7fe698c 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1277,7 +1277,7 @@ PCONTEXT DECLSPEC_HIDDEN attach_thread( LPTHREAD_START_ROUTINE entry, void *arg, init_thread_context( ctx, entry, arg, relay ); } ctx->ContextFlags = CONTEXT_FULL; - attach_dlls( ctx ); + attach_dlls( ctx, (void **)&ctx->R0 ); return ctx; } diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 7be64fd..c461e88 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1009,7 +1009,7 @@ static void thread_startup( void *param ) context.Pc = (DWORD_PTR)info->start; if (info->suspend) wait_suspend( &context ); - attach_dlls( &context ); + attach_dlls( &context, (void **)&context.u.s.X0 ); ((thread_start_func)context.Pc)( (LPTHREAD_START_ROUTINE)context.u.s.X0, (void *)context.u.s.X1 ); } diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index fcadcf9..71eff66 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2675,7 +2675,7 @@ PCONTEXT DECLSPEC_HIDDEN attach_thread( LPTHREAD_START_ROUTINE entry, void *arg, init_thread_context( ctx, entry, arg, relay ); } ctx->ContextFlags = CONTEXT_FULL; - attach_dlls( ctx ); + attach_dlls( ctx, (void **)&ctx->Eax ); return ctx; } diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 39e8f42..cb5089b 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -1171,7 +1171,7 @@ static void thread_startup( void *param ) context.Iar = (DWORD)info->start; if (info->suspend) wait_suspend( &context ); - attach_dlls( &context ); + attach_dlls( &context, (void **)&context->Gpr3 ); ((thread_start_func)context.Iar)( (LPTHREAD_START_ROUTINE)context.Gpr3, (void *)context.Gpr4 ); } diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index f75ba57c..169793b 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -4169,7 +4169,7 @@ PCONTEXT DECLSPEC_HIDDEN attach_thread( LPTHREAD_START_ROUTINE entry, void *arg, init_thread_context( ctx, entry, arg, relay ); } ctx->ContextFlags = CONTEXT_FULL; - attach_dlls( ctx ); + attach_dlls( ctx, (void **)&ctx->Rcx ); return ctx; } diff --git a/include/winternl.h b/include/winternl.h index ec6850a..c3cca80 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2158,7 +2158,8 @@ typedef struct _LDR_MODULE #define LDR_UNLOAD_IN_PROGRESS 0x00002000 #define LDR_NO_DLL_CALLS 0x00040000 #define LDR_PROCESS_ATTACHED 0x00080000 -#define LDR_MODULE_REBASED 0x00200000 +#define LDR_COR_IMAGE 0x00400000 +#define LDR_COR_ILONLY 0x01000000 /* these ones is Wine specific */ #define LDR_DONT_RESOLVE_REFS 0x40000000

1 0

Michael Stefaniuc : ddraw: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 27ef844bd1c2b5ebddf4c8663a597b38c3636e71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27ef844bd1c2b5ebddf4c866… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 20 23:57:15 2018 +0100 ddraw: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 10 +++++----- dlls/ddraw/device.c | 6 +++--- dlls/ddraw/main.c | 4 ++-- dlls/ddraw/utils.c | 25 ++++++++++++------------- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 56a02bc..97a11ef 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1738,7 +1738,7 @@ static HRESULT WINAPI ddraw7_GetFourCCCodes(IDirectDraw7 *iface, DWORD *NumCodes outsize = NumCodes && Codes ? *NumCodes : 0; - for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); ++i) + for (i = 0; i < ARRAY_SIZE(formats); ++i) { if (SUCCEEDED(wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL, mode.format_id, 0, WINED3D_RTYPE_TEXTURE_2D, formats[i]))) @@ -2395,7 +2395,7 @@ static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags, wined3d_mutex_lock(); pixelformat.dwSize = sizeof(pixelformat); - for(fmt = 0; fmt < (sizeof(checkFormatList) / sizeof(checkFormatList[0])); fmt++) + for(fmt = 0; fmt < ARRAY_SIZE(checkFormatList); fmt++) { modenum = 0; while (wined3d_enum_adapter_modes(ddraw->wined3d, WINED3DADAPTER_DEFAULT, checkFormatList[fmt], @@ -3111,7 +3111,7 @@ static BOOL ddraw_match_surface_desc(const DDSURFACEDESC2 *requested, const DDSU if ((requested->dwFlags & provided->dwFlags) != requested->dwFlags) return FALSE; - for (i=0; i < sizeof(compare)/sizeof(compare[0]); i++) + for (i=0; i < ARRAY_SIZE(compare); i++) { if (requested->dwFlags & compare[i].flag && memcmp((const char *)provided + compare[i].offset, @@ -3643,7 +3643,7 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA return hr; } - for (i = 0; i < sizeof(device_list7)/sizeof(device_list7[0]); i++) + for (i = 0; i < ARRAY_SIZE(device_list7); i++) { HRESULT ret; @@ -4357,7 +4357,7 @@ static HRESULT WINAPI d3d7_EnumZBufferFormats(IDirect3D7 *iface, REFCLSID device return hr; } - for (i = 0; i < (sizeof(formats) / sizeof(*formats)); ++i) + for (i = 0; i < ARRAY_SIZE(formats); ++i) { if (SUCCEEDED(wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT, type, mode.format_id, WINED3DUSAGE_DEPTHSTENCIL, WINED3D_RTYPE_TEXTURE_2D, formats[i]))) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index c2d87dd..75e000a 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1086,7 +1086,7 @@ static HRESULT d3d_device7_EnumTextureFormats(IDirect3DDevice7 *iface, return hr; } - for (i = 0; i < sizeof(FormatList) / sizeof(*FormatList); ++i) + for (i = 0; i < ARRAY_SIZE(FormatList); ++i) { if (wined3d_check_device_format(device->ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL, mode.format_id, WINED3DUSAGE_TEXTURE, WINED3D_RTYPE_TEXTURE_2D, FormatList[i]) == D3D_OK) @@ -1108,7 +1108,7 @@ static HRESULT d3d_device7_EnumTextureFormats(IDirect3DDevice7 *iface, } } - for (i = 0; i < sizeof(BumpFormatList) / sizeof(*BumpFormatList); ++i) + for (i = 0; i < ARRAY_SIZE(BumpFormatList); ++i) { if (wined3d_check_device_format(device->ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL, mode.format_id, WINED3DUSAGE_TEXTURE | WINED3DUSAGE_QUERY_LEGACYBUMPMAP, @@ -1214,7 +1214,7 @@ static HRESULT WINAPI d3d_device2_EnumTextureFormats(IDirect3DDevice2 *iface, return hr; } - for (i = 0; i < sizeof(FormatList) / sizeof(*FormatList); ++i) + for (i = 0; i < ARRAY_SIZE(FormatList); ++i) { if (wined3d_check_device_format(device->ddraw->wined3d, 0, WINED3D_DEVICE_TYPE_HAL, mode.format_id, WINED3DUSAGE_TEXTURE, WINED3D_RTYPE_TEXTURE_2D, FormatList[i]) == D3D_OK) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index b6e5b11..0faa9823 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -740,13 +740,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **out) && !IsEqualGUID(&IID_IUnknown, riid)) return E_NOINTERFACE; - for (i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) + for (i=0; i < ARRAY_SIZE(object_creation); i++) { if (IsEqualGUID(object_creation[i].clsid, rclsid)) break; } - if (i == sizeof(object_creation)/sizeof(object_creation[0])) + if (i == ARRAY_SIZE(object_creation)) { FIXME("%s: no class found.\n", debugstr_guid(rclsid)); return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 0170fcd..65f24dc 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -768,8 +768,8 @@ void DDRAW_dump_DDSCAPS2(const DDSCAPS2 *in) FE(DDSCAPS2_STEREOSURFACELEFT) }; - DDRAW_dump_flags_nolf(in->dwCaps, flags, sizeof(flags)/sizeof(flags[0])); - DDRAW_dump_flags(in->dwCaps2, flags2, sizeof(flags2)/sizeof(flags2[0])); + DDRAW_dump_flags_nolf(in->dwCaps, flags, ARRAY_SIZE(flags)); + DDRAW_dump_flags(in->dwCaps2, flags2, ARRAY_SIZE(flags2)); } static void @@ -806,7 +806,7 @@ DDRAW_dump_pixelformat_flag(DWORD flagmask) FE(DDPF_ZPIXELS) }; - DDRAW_dump_flags_nolf(flagmask, flags, sizeof(flags)/sizeof(flags[0])); + DDRAW_dump_flags_nolf(flagmask, flags, ARRAY_SIZE(flags)); } static void DDRAW_dump_members(DWORD flags, const void *data, const struct member_info *mems, size_t num_mems) @@ -906,8 +906,7 @@ void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd) { DDRAW_dump_members(lpddsd->dwFlags, lpddsd, members_caps, 1); } - DDRAW_dump_members(lpddsd->dwFlags, lpddsd, members, - sizeof(members)/sizeof(members[0])); + DDRAW_dump_members(lpddsd->dwFlags, lpddsd, members, ARRAY_SIZE(members)); } } @@ -984,7 +983,7 @@ void DDRAW_dump_cooperativelevel(DWORD cooplevel) if (TRACE_ON(ddraw)) { TRACE(" - "); - DDRAW_dump_flags(cooplevel, flags, sizeof(flags)/sizeof(flags[0])); + DDRAW_dump_flags(cooplevel, flags, ARRAY_SIZE(flags)); } } @@ -1143,13 +1142,13 @@ void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps) }; TRACE(" - dwSize : %d\n", lpcaps->dwSize); - TRACE(" - dwCaps : "); DDRAW_dump_flags(lpcaps->dwCaps, flags1, sizeof(flags1)/sizeof(flags1[0])); - TRACE(" - dwCaps2 : "); DDRAW_dump_flags(lpcaps->dwCaps2, flags2, sizeof(flags2)/sizeof(flags2[0])); - TRACE(" - dwCKeyCaps : "); DDRAW_dump_flags(lpcaps->dwCKeyCaps, flags3, sizeof(flags3)/sizeof(flags3[0])); - TRACE(" - dwFXCaps : "); DDRAW_dump_flags(lpcaps->dwFXCaps, flags4, sizeof(flags4)/sizeof(flags4[0])); - TRACE(" - dwFXAlphaCaps : "); DDRAW_dump_flags(lpcaps->dwFXAlphaCaps, flags5, sizeof(flags5)/sizeof(flags5[0])); - TRACE(" - dwPalCaps : "); DDRAW_dump_flags(lpcaps->dwPalCaps, flags6, sizeof(flags6)/sizeof(flags6[0])); - TRACE(" - dwSVCaps : "); DDRAW_dump_flags(lpcaps->dwSVCaps, flags7, sizeof(flags7)/sizeof(flags7[0])); + TRACE(" - dwCaps : "); DDRAW_dump_flags(lpcaps->dwCaps, flags1, ARRAY_SIZE(flags1)); + TRACE(" - dwCaps2 : "); DDRAW_dump_flags(lpcaps->dwCaps2, flags2, ARRAY_SIZE(flags2)); + TRACE(" - dwCKeyCaps : "); DDRAW_dump_flags(lpcaps->dwCKeyCaps, flags3, ARRAY_SIZE(flags3)); + TRACE(" - dwFXCaps : "); DDRAW_dump_flags(lpcaps->dwFXCaps, flags4, ARRAY_SIZE(flags4)); + TRACE(" - dwFXAlphaCaps : "); DDRAW_dump_flags(lpcaps->dwFXAlphaCaps, flags5, ARRAY_SIZE(flags5)); + TRACE(" - dwPalCaps : "); DDRAW_dump_flags(lpcaps->dwPalCaps, flags6, ARRAY_SIZE(flags6)); + TRACE(" - dwSVCaps : "); DDRAW_dump_flags(lpcaps->dwSVCaps, flags7, ARRAY_SIZE(flags7)); TRACE("...\n"); TRACE(" - dwNumFourCCCodes : %d\n", lpcaps->dwNumFourCCCodes); TRACE(" - dwCurrVisibleOverlays : %d\n", lpcaps->dwCurrVisibleOverlays);

1 0

Alexandre Julliard : makefiles: Generate the uninstall rule using the subdirs file lists.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 1a52ba0bc8a7640a53f86bc06f51fa3848020834 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a52ba0bc8a7640a53f86bc0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 21 12:29:06 2018 +0100 makefiles: Generate the uninstall rule using the subdirs file lists. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 9 +--- aclocal.m4 | 60 +++++++---------------- configure | 60 +++++++---------------- tools/makedep.c | 146 +++++++++++++++++++++++++++++++++++++------------------- 4 files changed, 132 insertions(+), 143 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1a52ba0bc8a7640a53f8…

1 0

Alex Henrie : user32/tests: Drop broadcast test workarounds for Windows <= 2000.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: e1c2a870617df9a540d5258ba91f7bcb96256a24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1c2a870617df9a540d5258b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 21 00:01:48 2018 -0700 user32/tests: Drop broadcast test workarounds for Windows <= 2000. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/broadcast.c | 73 +++++++++++-------------------------------- 1 file changed, 19 insertions(+), 54 deletions(-) diff --git a/dlls/user32/tests/broadcast.c b/dlls/user32/tests/broadcast.c index 322fbd0..5869119 100644 --- a/dlls/user32/tests/broadcast.c +++ b/dlls/user32/tests/broadcast.c @@ -33,10 +33,6 @@ typedef LONG (WINAPI *PBROADCAST)( DWORD,LPDWORD,UINT,WPARAM,LPARAM ); typedef LONG (WINAPI *PBROADCASTEX)( DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO ); -static PBROADCAST pBroadcastA; -static PBROADCAST pBroadcastW; -static PBROADCASTEX pBroadcastExA; -static PBROADCASTEX pBroadcastExW; static HANDLE hevent; static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) @@ -59,20 +55,6 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR static BOOL init_procs(void) { WNDCLASSA cls; - HANDLE user32 = GetModuleHandleA("user32.dll"); - pBroadcastA = (PBROADCAST)GetProcAddress(user32, "BroadcastSystemMessageA"); - if (!pBroadcastA) - pBroadcastA = (PBROADCAST)GetProcAddress(user32, "BroadcastSystemMessage"); - ok(pBroadcastA != NULL, "No BroadcastSystemMessage found\n"); - if (!pBroadcastA) - { - win_skip("BroadcastA is not available\n"); - return FALSE; - } - - pBroadcastW = (PBROADCAST)GetProcAddress(user32, "BroadcastSystemMessageW"); - pBroadcastExA = (PBROADCASTEX)GetProcAddress(user32, "BroadcastSystemMessageExA"); - pBroadcastExW = (PBROADCASTEX)GetProcAddress(user32, "BroadcastSystemMessageExW"); hevent = CreateEventA(NULL, TRUE, FALSE, "Asynchronous checking event"); @@ -264,12 +246,8 @@ if (0) /* TODO: Check the hang flags */ PulseEvent(hevent); } -static BOOL (WINAPI *pOpenProcessToken)(HANDLE, DWORD, HANDLE*); -static BOOL (WINAPI *pAdjustTokenPrivileges)(HANDLE, BOOL, PTOKEN_PRIVILEGES, DWORD, PTOKEN_PRIVILEGES, PDWORD); - static void test_noprivileges(void) { - HANDLE advapi32 = GetModuleHandleA("advapi32"); HANDLE token; DWORD recips; BOOL ret; @@ -277,14 +255,12 @@ static void test_noprivileges(void) static const DWORD BSM_ALL_RECIPS = BSM_VXDS | BSM_NETDRIVER | BSM_INSTALLABLEDRIVERS | BSM_APPLICATIONS; - pOpenProcessToken = (void *)GetProcAddress(advapi32, "OpenProcessToken"); - pAdjustTokenPrivileges = (void *)GetProcAddress(advapi32, "AdjustTokenPrivileges"); - if (!pOpenProcessToken || !pAdjustTokenPrivileges || !pOpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &token)) + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &token)) { skip("Can't open security token for process\n"); return; } - if (!pAdjustTokenPrivileges(token, TRUE, NULL, 0, NULL, NULL)) + if (!AdjustTokenPrivileges(token, TRUE, NULL, 0, NULL, NULL)) { skip("Can't adjust security token for process\n"); return; @@ -294,7 +270,7 @@ static void test_noprivileges(void) SetLastError(0xcafebabe); recips = BSM_ALLDESKTOPS; ResetEvent(hevent); - ret = pBroadcastExW( BSF_QUERY, &recips, WM_NULL, 100, 0, NULL ); + ret = BroadcastSystemMessageExW( BSF_QUERY, &recips, WM_NULL, 100, 0, NULL ); ok(ret==1, "Returned: %d error %u\n", ret, GetLastError()); ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); ok(recips == BSM_ALLDESKTOPS || @@ -305,7 +281,7 @@ static void test_noprivileges(void) SetLastError(0xcafebabe); recips = BSM_ALLCOMPONENTS; ResetEvent(hevent); - ret = pBroadcastExW( BSF_QUERY, &recips, WM_NULL, 100, 0, NULL ); + ret = BroadcastSystemMessageExW( BSF_QUERY, &recips, WM_NULL, 100, 0, NULL ); ok(ret==1, "Returned: %d error %u\n", ret, GetLastError()); ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); ok(recips == BSM_ALLCOMPONENTS || @@ -316,7 +292,7 @@ static void test_noprivileges(void) SetLastError(0xcafebabe); recips = BSM_ALLDESKTOPS|BSM_APPLICATIONS; ResetEvent(hevent); - ret = pBroadcastExW( BSF_QUERY, &recips, WM_NULL, 100, 0, NULL ); + ret = BroadcastSystemMessageExW( BSF_QUERY, &recips, WM_NULL, 100, 0, NULL ); ok(ret==1, "Returned: %d error %u\n", ret, GetLastError()); ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); ok(recips == (BSM_ALLDESKTOPS|BSM_APPLICATIONS) || @@ -327,7 +303,7 @@ static void test_noprivileges(void) SetLastError(0xcafebabe); recips = BSM_ALLDESKTOPS|BSM_APPLICATIONS; ResetEvent(hevent); - ret = pBroadcastExW( BSF_QUERY, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY, NULL ); + ret = BroadcastSystemMessageExW( BSF_QUERY, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY, NULL ); ok(!ret, "Returned: %d\n", ret); ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); ok(recips == (BSM_ALLDESKTOPS|BSM_APPLICATIONS) || @@ -342,28 +318,17 @@ START_TEST(broadcast) return; trace("Running BroadcastSystemMessageA tests\n"); - test_parameters(pBroadcastA, "BroadcastSystemMessageA"); - if (pBroadcastW) - { - trace("Running BroadcastSystemMessageW tests\n"); - test_parameters(pBroadcastW, "BroadcastSystemMessageW"); - } - else - win_skip("No BroadcastSystemMessageW, skipping\n"); - if (pBroadcastExA) - { - trace("Running BroadcastSystemMessageExA tests\n"); - test_parametersEx(pBroadcastExA); - } - else - win_skip("No BroadcastSystemMessageExA, skipping\n"); - if (pBroadcastExW) - { - trace("Running BroadcastSystemMessageExW tests\n"); - test_parametersEx(pBroadcastExW); - trace("Attempting privileges checking tests\n"); - test_noprivileges(); - } - else - win_skip("No BroadcastSystemMessageExW, skipping\n"); + test_parameters(BroadcastSystemMessageA, "BroadcastSystemMessageA"); + + trace("Running BroadcastSystemMessageW tests\n"); + test_parameters(BroadcastSystemMessageW, "BroadcastSystemMessageW"); + + trace("Running BroadcastSystemMessageExA tests\n"); + test_parametersEx(BroadcastSystemMessageExA); + + trace("Running BroadcastSystemMessageExW tests\n"); + test_parametersEx(BroadcastSystemMessageExW); + + trace("Attempting privileges checking tests\n"); + test_noprivileges(); }

1 0

Michael Stefaniuc : d3d9: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 417983f2daf60b85850df3f701ba1f9ca32f088c URL: https://source.winehq.org/git/wine.git/?a=commit;h=417983f2daf60b85850df3f7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 20 23:57:12 2018 +0100 d3d9: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 ++-- dlls/d3d9/vertexdeclaration.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5f88278..5e0f558 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2401,7 +2401,7 @@ static HRESULT WINAPI d3d9_device_GetTextureStageState(IDirect3DDevice9Ex *iface TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, stage, state, value); - if (state >= sizeof(tss_lookup) / sizeof(*tss_lookup)) + if (state >= ARRAY_SIZE(tss_lookup)) { WARN("Invalid state %#x passed.\n", state); return D3D_OK; @@ -2421,7 +2421,7 @@ static HRESULT WINAPI d3d9_device_SetTextureStageState(IDirect3DDevice9Ex *iface TRACE("iface %p, stage %u, state %#x, value %#x.\n", iface, stage, state, value); - if (state >= sizeof(tss_lookup) / sizeof(*tss_lookup)) + if (state >= ARRAY_SIZE(tss_lookup)) { WARN("Invalid state %#x passed.\n", state); return D3D_OK; diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index f7e0eb9..5075309 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -344,7 +344,7 @@ static HRESULT convert_to_wined3d_declaration(const D3DVERTEXELEMENT9 *d3d9_elem for (i = 0; i < count; ++i) { - if (d3d9_elements[i].Type >= (sizeof(d3d_dtype_lookup) / sizeof(*d3d_dtype_lookup))) + if (d3d9_elements[i].Type >= ARRAY_SIZE(d3d_dtype_lookup)) { WARN("Invalid element type %#x.\n", d3d9_elements[i].Type); heap_free(*wined3d_elements);

1 0

Henri Verbeet : wined3d: Introduce a helper to retrieve the texture target in context_set_fbo_key_for_render_target ().
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 4678dac730e4349525c5b0cb422e48109aad4d98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4678dac730e4349525c5b0cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 21 10:43:28 2018 +0330 wined3d: Introduce a helper to retrieve the texture target in context_set_fbo_key_for_render_target(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 14 ++++---------- dlls/wined3d/wined3d_private.h | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9b6c19e..fc97205 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -454,17 +454,11 @@ static inline void context_set_fbo_key_for_render_target(const struct wined3d_co key->rb_namespace |= 1 << idx; return; } - - key->objects[idx].target = surface->texture_target; - key->objects[idx].level = surface->texture_level; - key->objects[idx].layer = surface->texture_layer; - } - else - { - key->objects[idx].target = texture->target; - key->objects[idx].level = sub_resource_idx % texture->level_count; - key->objects[idx].layer = sub_resource_idx / texture->level_count; } + key->objects[idx].target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); + key->objects[idx].level = sub_resource_idx % texture->level_count; + key->objects[idx].layer = sub_resource_idx / texture->level_count; + if (render_target->layer_count != 1) key->objects[idx].layer = WINED3D_ALL_LAYERS; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b12aa21..021c274 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3179,6 +3179,23 @@ static inline struct wined3d_texture *texture_from_resource(struct wined3d_resou return CONTAINING_RECORD(resource, struct wined3d_texture, resource); } +static inline GLenum wined3d_texture_get_sub_resource_target(const struct wined3d_texture *texture, + unsigned int sub_resource_idx) +{ + static const GLenum cube_targets[] = + { + GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB, + GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB, + GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB, + GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB, + GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB, + GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB, + }; + + return texture->resource.usage & WINED3DUSAGE_LEGACY_CUBEMAP + ? cube_targets[sub_resource_idx / texture->level_count] : texture->target; +} + static inline struct gl_texture *wined3d_texture_get_gl_texture(struct wined3d_texture *texture, BOOL srgb) {

1 0

Francois Gouget : testbot/web: Show the number of blocked tasks on the activity page.
by Alexandre Julliard Feb. 21, 2018

Feb. 21, 2018

Module: tools Branch: master Commit: ab5406028e06f1c51341e88a89c5c2a6af0dfb3b URL: https://source.winehq.org/git/tools.git/?a=commit;h=ab5406028e06f1c51341e88… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 21 01:38:29 2018 +0100 testbot/web: Show the number of blocked tasks on the activity page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 5 +++-- testbot/web/Activity.pl | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 3016b14..acec606 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -68,6 +68,7 @@ for the specified timestamp. Entries have the following structure: end => <EndTimestamp>, runnable => <RunnableTasksCount>, queued => <QueuedTasksCount>, + blocked => <TasksOnMaintenanceOrDisabledVMsCount>, engine => <StartOrStop>, statusvms => { <VMName1> => { @@ -145,7 +146,7 @@ sub GetActivity($;$) my $Group = $ActivityHash->{$Record->RecordGroupId}; if ($Record->Type eq "tasks" and $Record->Name eq "counters") { - ($Group->{runnable}, $Group->{queued}) = split / /, $Record->Value; + ($Group->{runnable}, $Group->{queued}, $Group->{blocked}) = split / /, $Record->Value; } elsif ($Record->Type eq "engine" and $Record->Name =~ /^(?:start|stop)$/) { @@ -237,7 +238,7 @@ sub GetActivity($;$) if ($LastGroup) { $LastGroup->{end} = $Group->{start}; - foreach my $Counter ('runnable', 'queued') + foreach my $Counter ('runnable', 'queued', 'blocked') { if (!exists $Group->{$Counter} and exists $LastGroup->{$Counter}) { diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 13c77c6..91153b3 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -161,9 +161,11 @@ EOF print "<td colspan='", scalar(@SortedVMs), "'><hr></td>\n"; next; } - if ($Group->{runnable} or $Group->{queued}) + if ($Group->{runnable} or $Group->{queued} or $Group->{blocked}) { - print "<td class='Record'>", ($Group->{runnable} || 0), " / ", ($Group->{queued} || 0), "</td>"; + print "<td class='Record'>", ($Group->{runnable} || 0), " / ", + ($Group->{queued} || 0), + ($Group->{blocked} ? "+$Group->{blocked}" : ""), "</td>"; } else { @@ -282,7 +284,7 @@ sub GenerateFooter($) print "running a task (in which case it links to it), \n"; print "dirty while the server is powering off the VM after a task or while it assesses its state on startup.\n"; - print "If no time is indicated then the VM remained in that state for less than 2 seconds. The tasks column indicates the number of runnable / queued tasks before that scheduling round. A long horizontal bar indicates the TestBot server was restarted. \n"; + print "If no time is indicated then the VM remained in that state for less than 2 seconds. The tasks column indicates the number of runnable / queued tasks before that scheduling round. If any task needs to run on a maintenance, retired or deleted VM is is shown as +N. A long horizontal bar indicates the TestBot server was restarted. \n"; print "This border indicates that the task timed out, \n"; print "this border denotes a transient (network?) error so the task will be re-run, \n"; print "and this border indicates a TestBot error. \n";

1 0

Francois Gouget : testbot: Track the per-host queued tasks and use it for future VMs.
by Alexandre Julliard Feb. 21, 2018

Feb. 21, 2018

Module: tools Branch: master Commit: 99fe00204051affc4800140afbdce4fada591d86 URL: https://source.winehq.org/git/tools.git/?a=commit;h=99fe00204051affc4800140… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 21 01:38:47 2018 +0100 testbot: Track the per-host queued tasks and use it for future VMs. It is a better sign that the host is idle than checking it only has idle VMs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 7c9da68..56c903d 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -464,7 +464,8 @@ sub _GetSchedHost($$) if (!$Sched->{hosts}->{$HostKey}) { $Sched->{hosts}->{$HostKey} = { - active => 0, + queued => 0, # Tasks + active => 0, # VMs... idle => 0, reverting => 0, sleeping => 0, @@ -865,6 +866,8 @@ sub _ScheduleTasks($) $Sched->{blocked}++; next; } + my $Host = _GetSchedHost($Sched, $VM); + $Host->{queued}++; $Sched->{queued}++; if ($StepRank >= 2 or !$PreviousVMs) @@ -906,7 +909,6 @@ sub _ScheduleTasks($) # candidate for shutdown since it will be needed next. delete $Sched->{lambvms}->{$VMKey}; - my $Host = _GetSchedHost($Sched, $VM); # Dirty VMs are VMs that were running and have still not been # powered off. Sleeping VMs may be VMs that are booting. # So in both cases they may still be using CPU and I/O resources so @@ -1099,24 +1101,15 @@ sub _RevertVMs($$) my $NeedsSacrifice; if (_GetNiceness($NeededVMs, $VMKey) >= $FUTURE_BASE) { - if (!exists $Host->{isidle}) - { - # Only start preparing VMs for future jobs on a host which is idle. - # FIXME As a proxy we currently check that the host only has idle VMs. - # This is a bad proxy because: - # - The host could still have pending tasks for a 'next step'. Once - # those get closer to running, preparing those would be better than - # preparing future VMs. - # - Checking there are no queued tasks on that host would be better - # but this information is not available on a per-host basis. - # - It forces the host to go through an extra poweroff during which we - # lose track of which VM is 'hot'. - # - However on startup this helps ensure that we are not prevented - # from preparing the best VM (e.g. build) just because it is still - # being checked (i.e. marked dirty). - $Host->{isidle} = ($Host->{active} == $Host->{idle}); - } - if (!$Host->{isidle} or $Host->{MaxVMsWhenIdle} == 0) + # Only start preparing VMs for future jobs on a host which is idle, i.e. + # which no longer has queued tasks (ignoring blocked ones). + # Note that we could also check that the host only has idle VMs. This + # would help ensure that we are not prevented from preparing the best VM + # (e.g. build) on startup just because it is still being checked (i.e. + # marked dirty). But during regular operation this would force the host + # to go through an extra poweroff during which we lose track of which + # VM is 'hot' + if ($Host->{queued} != 0 or $Host->{MaxVMsWhenIdle} == 0) { # The TestBot is busy or does not prepare VMs when idle next;

1 0

Francois Gouget : testbot: Also record the number of blocked tasks.
by Alexandre Julliard Feb. 21, 2018

Feb. 21, 2018

Module: tools Branch: master Commit: 0003b2cf5f51c0da447a60c918ab442296415d12 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0003b2cf5f51c0da447a60c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 21 01:38:16 2018 +0100 testbot: Also record the number of blocked tasks. A task is blocked if it should run on a retired or deleted VM, or one which is undergoing maintenance. Previously the runnable and queued task counters would include blocked tasks which was wrong since, although they are queued, blocked tasks cannot be run until some external actor makes the VM usable again. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index b71073a..7c9da68 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -572,6 +572,7 @@ sub _CheckAndClassifyVMs() nicefuture => {}, runnable => 0, queued => 0, + blocked => 0, recordgroups => CreateRecordGroups(), }; $Sched->{recordgroup} = $Sched->{recordgroups}->Add(); @@ -848,30 +849,29 @@ sub _ScheduleTasks($) $Steps->AddFilter("Status", ["queued", "running"]); foreach my $Step (sort { $a->No <=> $b->No } @{$Steps->GetItems()}) { - my $Tasks = $Step->Tasks; - $Tasks->AddFilter("Status", ["queued"]); - $Sched->{queued} += $Tasks->GetItemsCount(); - # StepRank 0 contains the runnable tasks, 1 the 'may soon be runnable' # ones, and 2 and greater tasks we don't care about yet - next if ($StepRank >= 2); - if ($StepRank == 0) - { - $Step->HandleStaging() if ($Step->Status eq "queued"); - $Sched->{runnable} += $Tasks->GetItemsCount(); - } - elsif (!$PreviousVMs) - { - # The previous step is nowhere near done so skip this one for now - next; - } + $Step->HandleStaging() if ($StepRank == 0 and $Step->Status eq "queued"); my $StepVMs = []; + + my $Tasks = $Step->Tasks; + $Tasks->AddFilter("Status", ["queued"]); foreach my $Task (@{$Tasks->GetItems()}) { my $VM = $Task->VM; - next if (!$VM->HasEnabledRole() or !$VM->HasEnabledStatus()); + if (!$VM->HasEnabledRole() or !$VM->HasEnabledStatus()) + { + $Sched->{blocked}++; + next; + } + $Sched->{queued}++; + if ($StepRank >= 2 or !$PreviousVMs) + { + # The previous step is nowhere near done so skip this one for now + next; + } if ($StepRank == 1) { # Passing $PreviousVMs ensures this VM will be reverted if and only @@ -880,6 +880,7 @@ sub _ScheduleTasks($) _AddNeededVM($NeededVMs, $VM, $NEXT_BASE + $JobRank, $PreviousVMs); next; } + $Sched->{runnable}++; # $StepRank == 0 if (!_AddNeededVM($NeededVMs, $VM, $JobRank)) { @@ -1108,9 +1109,6 @@ sub _RevertVMs($$) # preparing future VMs. # - Checking there are no queued tasks on that host would be better # but this information is not available on a per-host basis. - # - Also the number of queued tasks includes tasks scheduled to run - # on maintenance and retired/deleted VMs. Any such task would prevent - # preparing future VMs for no good reason. # - It forces the host to go through an extra poweroff during which we # lose track of which VM is 'hot'. # - However on startup this helps ensure that we are not prevented @@ -1253,9 +1251,7 @@ sub ScheduleJobs() if (@{$Sched->{records}->GetItems()}) { - # FIXME Add the number of tasks scheduled to run on a maintenance, retired - # or deleted VM... - my $TaskCounts = "$Sched->{runnable} $Sched->{queued} 0"; + my $TaskCounts = "$Sched->{runnable} $Sched->{queued} $Sched->{blocked}"; if ($TaskCounts ne $_LastTaskCounts) { $Sched->{records}->AddRecord('tasks', 'counters', $TaskCounts);

1 0

Henri Verbeet : usp10: Make "pair_count" unsigned in computeBracketPairs() .
by Alexandre Julliard Feb. 20, 2018

Feb. 20, 2018

Module: wine Branch: master Commit: 24f64acc357a4682b3caa6e6a97db2ba9875dfad URL: https://source.winehq.org/git/wine.git/?a=commit;h=24f64acc357a4682b3caa6e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 20 10:21:59 2018 +0330 usp10: Make "pair_count" unsigned in computeBracketPairs(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/bidi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 8f94ede..2277190 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -692,8 +692,8 @@ static BracketPair *computeBracketPairs(IsolatedRun *iso_run) WCHAR *open_stack; int *stack_index; int stack_top = iso_run->length; + unsigned int pair_count = 0; BracketPair *out = NULL; - int pair_count = 0; int i; open_stack = heap_alloc(iso_run->length * sizeof(*open_stack)); @@ -745,13 +745,13 @@ static BracketPair *computeBracketPairs(IsolatedRun *iso_run) heap_free(open_stack); heap_free(stack_index); - if (pair_count == 0) + if (!pair_count) { heap_free(out); - out = NULL; + return NULL; } - else if (pair_count > 1) - qsort(out, pair_count, sizeof(BracketPair), compr); + + qsort(out, pair_count, sizeof(*out), compr); return out; }

1 0

Jacek Caban : mshtml: Added IDOMMouseEvent::relatedTarget implementation.
by Alexandre Julliard Feb. 20, 2018

Feb. 20, 2018

Module: wine Branch: master Commit: 832b90d4a50df10e2d1ef86d6d67f1a0d938de92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=832b90d4a50df10e2d1ef86d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 20 13:48:44 2018 +0100 mshtml: Added IDOMMouseEvent::relatedTarget implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 7 ++++ dlls/mshtml/htmlelem.c | 7 ++++ dlls/mshtml/htmlevent.c | 90 +++++++++++++++++++++++++++++++++++++------- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlwindow.c | 7 ++++ dlls/mshtml/tests/events.js | 5 ++- dlls/mshtml/xmlhttprequest.c | 7 ++++ 7 files changed, 109 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=832b90d4a50df10e2d1e…

1 0

Henri Verbeet : usp10: Use usp10_array_reserve() in computeBracketPairs().
by Alexandre Julliard Feb. 20, 2018

Feb. 20, 2018

Module: wine Branch: master Commit: d48dd7efbf5e7e78e5b42c893341256b5054b4ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=d48dd7efbf5e7e78e5b42c89… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 20 10:22:00 2018 +0330 usp10: Use usp10_array_reserve() in computeBracketPairs(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/bidi.c | 71 +++++++++++++++++++++++++++---------------------------- 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 2277190..b0df781 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -694,6 +694,7 @@ static BracketPair *computeBracketPairs(IsolatedRun *iso_run) int stack_top = iso_run->length; unsigned int pair_count = 0; BracketPair *out = NULL; + SIZE_T out_size = 0; int i; open_stack = heap_alloc(iso_run->length * sizeof(*open_stack)); @@ -702,42 +703,43 @@ static BracketPair *computeBracketPairs(IsolatedRun *iso_run) for (i = 0; i < iso_run->length; i++) { unsigned short ubv = get_table_entry(bidi_bracket_table, iso_run->item[i].ch); - if (ubv) + + if (!ubv) + continue; + + if ((ubv >> 8) == 0) { - if (!out) - { - out = heap_alloc(sizeof(*out)); - out[0].start = -1; - } + --stack_top; + open_stack[stack_top] = iso_run->item[i].ch + (signed char)(ubv & 0xff); + /* Deal with canonical equivalent U+2329/232A and U+3008/3009. */ + if (open_stack[stack_top] == 0x232a) + open_stack[stack_top] = 0x3009; + stack_index[stack_top] = i; + } + else if ((ubv >> 8) == 1) + { + unsigned int j; - if ((ubv >> 8) == 0) - { - stack_top --; - open_stack[stack_top] = iso_run->item[i].ch + (signed char)(ubv & 0xff); - /* deal with canonical equivalent U+2329/232A and U+3008/3009 */ - if (open_stack[stack_top] == 0x232A) - open_stack[stack_top] = 0x3009; - stack_index[stack_top] = i; - } - else if ((ubv >> 8) == 1) + for (j = stack_top; j < iso_run->length; ++j) { - int j; - if (stack_top == iso_run->length) continue; - for (j = stack_top; j < iso_run->length; j++) - { - WCHAR c = iso_run->item[i].ch; - if (c == 0x232A) c = 0x3009; - if (c == open_stack[j]) - { - out[pair_count].start = stack_index[j]; - out[pair_count].end = i; - pair_count++; - out = HeapReAlloc(GetProcessHeap(), 0, out, sizeof(BracketPair) * (pair_count+1)); - out[pair_count].start = -1; - stack_top = j+1; - break; - } - } + WCHAR c = iso_run->item[i].ch; + + if (c == 0x232a) + c = 0x3009; + + if (c != open_stack[j]) + continue; + + if (!(usp10_array_reserve((void **)&out, &out_size, pair_count + 2, sizeof(*out)))) + ERR("Failed to grow output array.\n"); + + out[pair_count].start = stack_index[j]; + out[pair_count].end = i; + ++pair_count; + + out[pair_count].start = -1; + stack_top = j + 1; + break; } } } @@ -746,10 +748,7 @@ static BracketPair *computeBracketPairs(IsolatedRun *iso_run) heap_free(stack_index); if (!pair_count) - { - heap_free(out); return NULL; - } qsort(out, pair_count, sizeof(*out), compr);

1 0

Jacek Caban : mshtml: Get rid of no longer needed document argument from create_collection_from_nodelist and create_collection_from_htmlcol.
by Alexandre Julliard Feb. 20, 2018

Feb. 20, 2018

Module: wine Branch: master Commit: 62335569c4d6318b54c087ca71e96dde1949eee9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62335569c4d6318b54c087ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 20 13:25:06 2018 +0100 mshtml: Get rid of no longer needed document argument from create_collection_from_nodelist and create_collection_from_htmlcol. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 18 +++++++++--------- dlls/mshtml/htmlelem.c | 8 ++++---- dlls/mshtml/htmlelemcol.c | 8 ++++---- dlls/mshtml/htmlform.c | 2 +- dlls/mshtml/htmltable.c | 4 ++-- dlls/mshtml/htmltablerow.c | 2 +- dlls/mshtml/mshtml_private.h | 4 ++-- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index ec4771d..3bf3419 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -354,7 +354,7 @@ static HRESULT WINAPI HTMLDocument_get_images(IHTMLDocument2 *iface, IHTMLElemen } if(nscoll) { - *p = create_collection_from_htmlcol(This->doc_node, nscoll); + *p = create_collection_from_htmlcol(nscoll, This->doc_node->document_mode); nsIDOMHTMLCollection_Release(nscoll); } @@ -386,7 +386,7 @@ static HRESULT WINAPI HTMLDocument_get_applets(IHTMLDocument2 *iface, IHTMLEleme } if(nscoll) { - *p = create_collection_from_htmlcol(This->doc_node, nscoll); + *p = create_collection_from_htmlcol(nscoll, This->doc_node->document_mode); nsIDOMHTMLCollection_Release(nscoll); } @@ -418,7 +418,7 @@ static HRESULT WINAPI HTMLDocument_get_links(IHTMLDocument2 *iface, IHTMLElement } if(nscoll) { - *p = create_collection_from_htmlcol(This->doc_node, nscoll); + *p = create_collection_from_htmlcol(nscoll, This->doc_node->document_mode); nsIDOMHTMLCollection_Release(nscoll); } @@ -450,7 +450,7 @@ static HRESULT WINAPI HTMLDocument_get_forms(IHTMLDocument2 *iface, IHTMLElement } if(nscoll) { - *p = create_collection_from_htmlcol(This->doc_node, nscoll); + *p = create_collection_from_htmlcol(nscoll, This->doc_node->document_mode); nsIDOMHTMLCollection_Release(nscoll); } @@ -482,7 +482,7 @@ static HRESULT WINAPI HTMLDocument_get_anchors(IHTMLDocument2 *iface, IHTMLEleme } if(nscoll) { - *p = create_collection_from_htmlcol(This->doc_node, nscoll); + *p = create_collection_from_htmlcol(nscoll, This->doc_node->document_mode); nsIDOMHTMLCollection_Release(nscoll); } @@ -567,7 +567,7 @@ static HRESULT WINAPI HTMLDocument_get_scripts(IHTMLDocument2 *iface, IHTMLEleme } if(nscoll) { - *p = create_collection_from_htmlcol(This->doc_node, nscoll); + *p = create_collection_from_htmlcol(nscoll, This->doc_node->document_mode); nsIDOMHTMLCollection_Release(nscoll); } @@ -2377,7 +2377,7 @@ static HRESULT WINAPI HTMLDocument3_getElementsByName(IHTMLDocument3 *iface, BST return E_FAIL; } - *ppelColl = create_collection_from_nodelist(This->doc_node, node_list); + *ppelColl = create_collection_from_nodelist(node_list, This->doc_node->document_mode); nsIDOMNodeList_Release(node_list); return S_OK; } @@ -2452,7 +2452,7 @@ static HRESULT WINAPI HTMLDocument3_getElementsByTagName(IHTMLDocument3 *iface, } - *pelColl = create_collection_from_nodelist(This->doc_node, nslist); + *pelColl = create_collection_from_nodelist(nslist, This->doc_node->document_mode); nsIDOMNodeList_Release(nslist); return S_OK; @@ -3368,7 +3368,7 @@ static HRESULT WINAPI HTMLDocument7_getElementsByClassName(IHTMLDocument7 *iface } - *pel = create_collection_from_nodelist(This->doc_node, nslist); + *pel = create_collection_from_nodelist(nslist, This->doc_node->document_mode); nsIDOMNodeList_Release(nslist); return S_OK; } diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index ca935d3..28dd716 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1998,7 +1998,7 @@ static HRESULT WINAPI HTMLElement_get_children(IHTMLElement *iface, IDispatch ** return E_FAIL; } - *p = (IDispatch*)create_collection_from_nodelist(This->node.doc, nsnode_list); + *p = (IDispatch*)create_collection_from_nodelist(nsnode_list, This->node.doc->document_mode); nsIDOMNodeList_Release(nsnode_list); return S_OK; @@ -3185,7 +3185,7 @@ static HRESULT WINAPI HTMLElement2_getElementsByTagName(IHTMLElement2 *iface, BS TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pelColl); if(!This->dom_element) { - *pelColl = create_collection_from_htmlcol(This->node.doc, NULL); + *pelColl = create_collection_from_htmlcol(NULL, This->node.doc->document_mode); return S_OK; } @@ -3197,7 +3197,7 @@ static HRESULT WINAPI HTMLElement2_getElementsByTagName(IHTMLElement2 *iface, BS return E_FAIL; } - *pelColl = create_collection_from_htmlcol(This->node.doc, nscol); + *pelColl = create_collection_from_htmlcol(nscol, dispex_compat_mode(&This->node.event_target.dispex)); nsIDOMHTMLCollection_Release(nscol); return S_OK; } @@ -4263,7 +4263,7 @@ static HRESULT WINAPI HTMLElement6_getElementsByClassName(IHTMLElement6 *iface, } } - *pel = create_collection_from_htmlcol(This->node.doc, nscol); + *pel = create_collection_from_htmlcol(nscol, dispex_compat_mode(&This->node.event_target.dispex)); nsIDOMHTMLCollection_Release(nscol); return S_OK; } diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 6671434..6398942 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -683,7 +683,7 @@ IHTMLElementCollection *create_all_collection(HTMLDOMNode *node, BOOL include_ro dispex_compat_mode(&node->event_target.dispex)); } -IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode *doc, nsIDOMNodeList *nslist) +IHTMLElementCollection *create_collection_from_nodelist(nsIDOMNodeList *nslist, compat_mode_t compat_mode) { UINT32 length = 0, i; HTMLDOMNode *node; @@ -715,10 +715,10 @@ IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode *doc, n buf.buf = NULL; } - return HTMLElementCollection_Create(buf.buf, buf.len, doc->document_mode); + return HTMLElementCollection_Create(buf.buf, buf.len, compat_mode); } -IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode *doc, nsIDOMHTMLCollection *nscol) +IHTMLElementCollection *create_collection_from_htmlcol(nsIDOMHTMLCollection *nscol, compat_mode_t compat_mode) { UINT32 length = 0, i; elem_vector_t buf; @@ -751,7 +751,7 @@ IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode *doc, ns return NULL; } - return HTMLElementCollection_Create(buf.buf, buf.len, doc->document_mode); + return HTMLElementCollection_Create(buf.buf, buf.len, compat_mode); } HRESULT get_elem_source_index(HTMLElement *elem, LONG *ret) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index acf2eba..27a82fa 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -291,7 +291,7 @@ static HRESULT WINAPI HTMLFormElement_get_elements(IHTMLFormElement *iface, IDis return E_FAIL; } - *p = (IDispatch*)create_collection_from_htmlcol(This->element.node.doc, elements); + *p = (IDispatch*)create_collection_from_htmlcol(elements, dispex_compat_mode(&This->element.node.event_target.dispex)); nsIDOMHTMLCollection_Release(elements); return S_OK; } diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 455826e..983e81d 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -478,7 +478,7 @@ static HRESULT WINAPI HTMLTable_get_rows(IHTMLTable *iface, IHTMLElementCollecti return E_FAIL; } - *p = create_collection_from_htmlcol(This->element.node.doc, nscol); + *p = create_collection_from_htmlcol(nscol, dispex_compat_mode(&This->element.node.event_target.dispex)); nsIDOMHTMLCollection_Release(nscol); return S_OK; @@ -605,7 +605,7 @@ static HRESULT WINAPI HTMLTable_get_tBodies(IHTMLTable *iface, IHTMLElementColle return E_FAIL; } - *p = create_collection_from_htmlcol(This->element.node.doc, nscol); + *p = create_collection_from_htmlcol(nscol, dispex_compat_mode(&This->element.node.event_target.dispex)); nsIDOMHTMLCollection_Release(nscol); return S_OK; diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index 61bdbd4..0097e58 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -299,7 +299,7 @@ static HRESULT WINAPI HTMLTableRow_get_cells(IHTMLTableRow *iface, IHTMLElementC return E_FAIL; } - *p = create_collection_from_htmlcol(This->element.node.doc, nscol); + *p = create_collection_from_htmlcol(nscol, dispex_compat_mode(&This->element.node.event_target.dispex)); nsIDOMHTMLCollection_Release(nscol); return S_OK; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c9c6682..c720ef4 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1087,8 +1087,8 @@ HRESULT handle_link_click_event(HTMLElement*,nsAString*,nsAString*,nsIDOMEvent*, HRESULT wrap_iface(IUnknown*,IUnknown*,IUnknown**) DECLSPEC_HIDDEN; IHTMLElementCollection *create_all_collection(HTMLDOMNode*,BOOL) DECLSPEC_HIDDEN; -IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode*,nsIDOMNodeList*) DECLSPEC_HIDDEN; -IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode*,nsIDOMHTMLCollection*) DECLSPEC_HIDDEN; +IHTMLElementCollection *create_collection_from_nodelist(nsIDOMNodeList*,compat_mode_t) DECLSPEC_HIDDEN; +IHTMLElementCollection *create_collection_from_htmlcol(nsIDOMHTMLCollection*,compat_mode_t) DECLSPEC_HIDDEN; IHTMLDOMChildrenCollection *create_child_collection(nsIDOMNodeList*) DECLSPEC_HIDDEN; HRESULT attr_value_to_string(VARIANT*) DECLSPEC_HIDDEN;

1 0