wine-commits November 2019

wine-commits@winehq.org

1 participants
895 discussions

Jacek Caban : vbscript: Support assigning to object default value.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 8f1e633874bbf1512436f4bbb50812d214259d51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f1e633874bbf1512436f4bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 4 17:36:58 2019 +0100 vbscript: Support assigning to object default value. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 5 ++++ dlls/vbscript/tests/run.c | 64 +++++++++++++++++++++++++++++++++-------------- 2 files changed, 50 insertions(+), 19 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 7339f42aba..191622e8e7 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -779,6 +779,11 @@ static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, WORD flags, DISPPARAMS * if(arg_cnt(dp)) { SAFEARRAY *array; + if(V_VT(v) == VT_DISPATCH) { + hres = disp_propput(ctx->script, V_DISPATCH(v), DISPID_VALUE, flags, dp); + break; + } + if(!(V_VT(v) & VT_ARRAY)) { FIXME("array assign on type %d\n", V_VT(v)); return E_FAIL; diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 208d647d46..d3d41a80d2 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -100,6 +100,7 @@ DEFINE_EXPECT(testobj_propget_i); DEFINE_EXPECT(testobj_propput_d); DEFINE_EXPECT(testobj_propput_i); DEFINE_EXPECT(testobj_value_i); +DEFINE_EXPECT(testobj_valueput_i); DEFINE_EXPECT(global_propargput_d); DEFINE_EXPECT(global_propargput_i); DEFINE_EXPECT(global_propargput1_d); @@ -872,29 +873,49 @@ static HRESULT WINAPI testObj_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { switch(id) { - case DISPID_VALUE: { - VARIANT *arg; - int i; + case DISPID_VALUE: + if(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD)) { + VARIANT *arg; + int i; - CHECK_EXPECT(testobj_value_i); + CHECK_EXPECT(testobj_value_i); - ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); - ok(pdp != NULL, "pdp == NULL\n"); - ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); - ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); - ok(pvarRes != NULL, "pvarRes == NULL\n"); - ok(pei != NULL, "pei == NULL\n"); + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + for(i=0; i<pdp->cArgs; i++) { + arg = pdp->rgvarg+pdp->cArgs-i-1; + ok(V_VT(arg) == VT_I2, "V_VT(arg) = %d\n", V_VT(arg)); + ok(V_I2(arg) == i+1, "V_I2(arg) = %d\n", V_I2(arg)); + } - for(i=0; i<pdp->cArgs; i++) { - arg = pdp->rgvarg+pdp->cArgs-i-1; - ok(V_VT(arg) == VT_I2, "V_VT(arg) = %d\n", V_VT(arg)); - ok(V_I2(arg) == i+1, "V_I2(arg) = %d\n", V_I2(arg)); + V_VT(pvarRes) = VT_I2; + V_I2(pvarRes) = pdp->cArgs; + return S_OK; } + if(wFlags == DISPATCH_PROPERTYPUT) { + CHECK_EXPECT(testobj_valueput_i); - V_VT(pvarRes) = VT_I2; - V_I2(pvarRes) = pdp->cArgs; - return S_OK; - } + ok(pdp->cArgs == 3, "cArgs = %d\n", pdp->cArgs); + ok(pdp->cNamedArgs == 1, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pdp->rgdispidNamedArgs[0] == DISPID_PROPERTYPUT, "pdp->rgdispidNamedArgs[0] = %d\n", pdp->rgdispidNamedArgs[0]); + ok(!pvarRes, "pvarRes != NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_I2, "V_VT(args[0]) = %d\n", V_VT(pdp->rgvarg)); + ok(V_I2(pdp->rgvarg) == 0, "V_I2(args[0]) = %d\n", V_I2(pdp->rgvarg)); + ok(V_VT(pdp->rgvarg+1) == VT_I2, "V_VT(args[1]) = %d\n", V_VT(pdp->rgvarg+1)); + ok(V_I2(pdp->rgvarg+1) == 2, "V_I2(args[1]) = %d\n", V_I2(pdp->rgvarg+1)); + ok(V_VT(pdp->rgvarg+2) == VT_I2, "V_VT(args[2]) = %d\n", V_VT(pdp->rgvarg+2)); + ok(V_I2(pdp->rgvarg+2) == 1, "V_I2(args[2]) = %d\n", V_I2(pdp->rgvarg+2)); + + return S_OK; + } + ok(0, "wFlags = %x\n", wFlags); + break; case DISPID_TESTOBJ_PROPGET: CHECK_EXPECT(testobj_propget_i); @@ -1419,7 +1440,6 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, case DISPID_GLOBAL_COUNTER: ok(pdp != NULL, "pdp == NULL\n"); - todo_wine ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); ok(!pdp->cArgs, "cArgs = %d\n", pdp->cArgs); ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); @@ -2881,6 +2901,12 @@ static void run_tests(void) CHECK_CALLED(testobj_propput_d); CHECK_CALLED(testobj_propput_i); + SET_EXPECT(testobj_valueput_i); + parse_script_a("dim x\n" + "set x = testObj\n" + "x(counter(), counter()) = counter\n"); + CHECK_CALLED(testobj_valueput_i); + parse_htmlscript_a(""); parse_htmlscript_a("\n");

1 0

Jeff Smith : msrle32: Return expected flags from GetInfo.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: a9928379b1159ea82f8087418461147dcfd7dcb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9928379b1159ea82f808741… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sat Nov 2 16:43:05 2019 -0500 msrle32: Return expected flags from GetInfo. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msrle32/msrle32.c | 2 +- dlls/msrle32/tests/msrle.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 5b17b25a0b..b68a50514f 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1179,7 +1179,7 @@ static LRESULT GetInfo(const CodecInfo *pi, ICINFO *icinfo, DWORD dwSize) icinfo->dwSize = sizeof(ICINFO); icinfo->fccType = ICTYPE_VIDEO; icinfo->fccHandler = (pi != NULL ? pi->fccHandler : FOURCC_MRLE); - icinfo->dwFlags = VIDCF_QUALITY | VIDCF_TEMPORAL | VIDCF_CRUNCH | VIDCF_FASTTEMPORALC; + icinfo->dwFlags = VIDCF_QUALITY | VIDCF_TEMPORAL | VIDCF_CRUNCH; icinfo->dwVersion = ICVERSION; icinfo->dwVersionICM = ICVERSION; diff --git a/dlls/msrle32/tests/msrle.c b/dlls/msrle32/tests/msrle.c index 4a442a0b90..84c5c21510 100644 --- a/dlls/msrle32/tests/msrle.c +++ b/dlls/msrle32/tests/msrle.c @@ -65,7 +65,7 @@ static void test_encode(void) ok(res == sizeof(info), "res = %ld\n", res); ok(info.dwSize == sizeof(info), "dwSize = %d\n", info.dwSize); ok(info.fccHandler == FCC('M','R','L','E'), "fccHandler = %x\n", info.fccHandler); - todo_wine ok(info.dwFlags == (VIDCF_QUALITY|VIDCF_CRUNCH|VIDCF_TEMPORAL), "dwFlags = %x\n", info.dwFlags); + ok(info.dwFlags == (VIDCF_QUALITY|VIDCF_CRUNCH|VIDCF_TEMPORAL), "dwFlags = %x\n", info.dwFlags); ok(info.dwVersionICM == ICVERSION, "dwVersionICM = %d\n", info.dwVersionICM); quality = 0xdeadbeef;

1 0

Biswapriyo Nath : include/netfw: Add INetFwRule2 and INetFwRule3 interfaces.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 718d9cb9d47aab08c0cd251f6d303f2b50befd54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=718d9cb9d47aab08c0cd251f… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sun Nov 3 00:39:37 2019 +0530 include/netfw: Add INetFwRule2 and INetFwRule3 interfaces. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/netfw.idl | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/include/netfw.idl b/include/netfw.idl index 7c5d3d40bb..013f2bfb0f 100644 --- a/include/netfw.idl +++ b/include/netfw.idl @@ -431,6 +431,59 @@ interface INetFwRule : IDispatch HRESULT Action( [in] NET_FW_ACTION action ); } +[ + local, + object, + uuid(9C27C8DA-189B-4DDE-89F7-8B39A316782C), + dual +] +interface INetFwRule2 : INetFwRule +{ + [id(19), propget] + HRESULT EdgeTraversalOptions( [out, retval] long* lOptions ); + [id(19), propput] + HRESULT EdgeTraversalOptions( [in] long lOptions ); +} + +[ + local, + object, + uuid(B21563FF-D696-4222-AB46-4E89B73AB34A), + dual +] +interface INetFwRule3 : INetFwRule2 +{ + [id(20), propget] + HRESULT LocalAppPackageId( [out, retval] BSTR* wszPackageId ); + [id(20), propput] + HRESULT LocalAppPackageId( [in] BSTR wszPackageId ); + + [id(21), propget] + HRESULT LocalUserOwner( [out, retval] BSTR* wszUserOwner ); + [id(21), propput] + HRESULT LocalUserOwner( [in] BSTR wszUserOwner ); + + [id(22), propget] + HRESULT LocalUserAuthorizedList( [out, retval] BSTR* wszUserAuthList ); + [id(22), propput] + HRESULT LocalUserAuthorizedList( [in] BSTR wszUserAuthList ); + + [id(23), propget] + HRESULT RemoteUserAuthorizedList( [out, retval] BSTR* wszUserAuthList ); + [id(23), propput] + HRESULT RemoteUserAuthorizedList( [in] BSTR wszUserAuthList ); + + [id(24), propget] + HRESULT RemoteMachineAuthorizedList( [out, retval] BSTR* wszUserAuthList ); + [id(24), propput] + HRESULT RemoteMachineAuthorizedList( [in] BSTR wszUserAuthList ); + + [id(25), propget] + HRESULT SecureFlags( [out, retval] long* lOptions ); + [id(25), propput] + HRESULT SecureFlags( [in] long lOptions ); +} + [ local, object, @@ -703,10 +756,15 @@ library NetFwPublicTypeLib interface INetFwServices; interface INetFwAuthorizedApplication; interface INetFwAuthorizedApplications; + interface INetFwServiceRestriction; + interface INetFwRule; + interface INetFwRules; interface INetFwProfile; interface INetFwPolicy; interface INetFwPolicy2; interface INetFwMgr; + interface INetFwProduct; + interface INetFwProducts; [ uuid(0CA545C6-37AD-4A6C-BF92-9F7610067EF5)

1 0

Andrew Eikum : user32: Support RIDI_PREPARSEDDATA in GetRawInputDeviceInfo.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 6d7828e8df68178ca662bc618f7598254afcfbe1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d7828e8df68178ca662bc61… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 30 14:26:37 2019 -0500 user32: Support RIDI_PREPARSEDDATA in GetRawInputDeviceInfo. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 18 ++++++++++++++++++ dlls/user32/tests/Makefile.in | 2 +- dlls/user32/tests/input.c | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 770ec91096..85ff0c5e80 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -33,6 +33,7 @@ #include "ddk/hidsdi.h" #include "wine/debug.h" #include "wine/server.h" +#include "wine/hid.h" #include "user_private.h" @@ -467,6 +468,23 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT to_copy = &info; break; + case RIDI_PREPARSEDDATA: + avail_bytes = *data_size; + if (device == WINE_MOUSE_HANDLE || + device == WINE_KEYBOARD_HANDLE) + { + to_copy_bytes = 0; + *data_size = 0; + to_copy = NULL; + } + else + { + to_copy_bytes = ((WINE_HIDP_PREPARSED_DATA*)hid_device->data)->dwSize; + *data_size = to_copy_bytes; + to_copy = hid_device->data; + } + break; + default: FIXME("command %#x not supported\n", command); return ~0U; diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index 7149dc824e..dd101d69f3 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = user32.dll -IMPORTS = user32 gdi32 advapi32 +IMPORTS = user32 gdi32 advapi32 hid C_SRCS = \ broadcast.c \ diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 5723af3fd2..1e6be311ee 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -55,6 +55,7 @@ #include "winbase.h" #include "winuser.h" #include "winnls.h" +#include "ddk/hidsdi.h" #include "wine/test.h" @@ -1605,6 +1606,7 @@ static void test_GetRawInputDeviceList(void) RAWINPUTDEVICELIST devices[32]; UINT ret, oret, devcount, odevcount, i; DWORD err; + BOOLEAN br; SetLastError(0xdeadbeef); ret = pGetRawInputDeviceList(NULL, NULL, 0); @@ -1642,6 +1644,7 @@ static void test_GetRawInputDeviceList(void) UINT sz, len; RID_DEVICE_INFO info; HANDLE file; + char *ppd; /* get required buffer size */ name[0] = '\0'; @@ -1688,6 +1691,44 @@ static void test_GetRawInputDeviceList(void) file = CreateFileW(name, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); todo_wine_if(info.dwType != RIM_TYPEHID) ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u\n", wine_dbgstr_w(name), GetLastError()); + + sz = 0; + ret = pGetRawInputDeviceInfoW(devices[i].hDevice, RIDI_PREPARSEDDATA, NULL, &sz); + ok(ret == 0, "GetRawInputDeviceInfo gave wrong return: %u\n", ret); + ok((info.dwType == RIM_TYPEHID && sz != 0) || + (info.dwType != RIM_TYPEHID && sz == 0), + "Got wrong PPD size for type 0x%x: %u\n", info.dwType, sz); + + ppd = HeapAlloc(GetProcessHeap(), 0, sz); + ret = pGetRawInputDeviceInfoW(devices[i].hDevice, RIDI_PREPARSEDDATA, ppd, &sz); + ok(ret == sz, "GetRawInputDeviceInfo gave wrong return: %u, should be %u\n", ret, sz); + + if (file != INVALID_HANDLE_VALUE && ret == sz) + { + PHIDP_PREPARSED_DATA preparsed; + + if (info.dwType == RIM_TYPEHID) + { + br = HidD_GetPreparsedData(file, &preparsed); + ok(br == TRUE, "HidD_GetPreparsedData failed\n"); + + if (br) + ok(!memcmp(preparsed, ppd, sz), "Expected to get same preparsed data\n"); + } + else + { + /* succeeds on hardware, fails in some VMs */ + br = HidD_GetPreparsedData(file, &preparsed); + todo_wine + ok(br == TRUE || broken(br == FALSE), "HidD_GetPreparsedData failed\n"); + } + + if (br) + HidD_FreePreparsedData(preparsed); + } + + HeapFree(GetProcessHeap(), 0, ppd); + CloseHandle(file); }

1 0

Andrew Eikum : user32: Clean up GetRawInputDeviceInfo.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 0b7f4b40cf2f19f80765f798bfdb4733c8952c26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b7f4b40cf2f19f80765f798… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 30 14:26:28 2019 -0500 user32: Clean up GetRawInputDeviceInfo. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 89 ++++++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 43 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 94cf7a9a5d..770ec91096 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -404,80 +404,83 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT static const WCHAR mouse_name[] = {'\\','\\','?','\\','W','I','N','E','_','M','O','U','S','E',0}; static const RID_DEVICE_INFO_KEYBOARD keyboard_info = {0, 0, 1, 12, 3, 101}; static const RID_DEVICE_INFO_MOUSE mouse_info = {1, 5, 0, FALSE}; - struct hid_device *hid_device; - const WCHAR *name = NULL; - RID_DEVICE_INFO *info; - UINT s; + + RID_DEVICE_INFO info; + struct hid_device *hid_device = device; + const void *to_copy; + UINT to_copy_bytes, avail_bytes; TRACE("device %p, command %#x, data %p, data_size %p.\n", device, command, data, data_size); if (!data_size) return ~0U; + /* each case below must set: + * *data_size: length (meaning defined by command) of data we want to copy + * avail_bytes: number of bytes available in user buffer + * to_copy_bytes: number of bytes we want to copy into user buffer + * to_copy: pointer to data we want to copy into user buffer + */ switch (command) { case RIDI_DEVICENAME: + /* for RIDI_DEVICENAME, data_size is in characters, not bytes */ + avail_bytes = *data_size * sizeof(WCHAR); if (device == WINE_MOUSE_HANDLE) { - s = ARRAY_SIZE(mouse_name); - name = mouse_name; + *data_size = ARRAY_SIZE(mouse_name); + to_copy = mouse_name; } else if (device == WINE_KEYBOARD_HANDLE) { - s = ARRAY_SIZE(keyboard_name); - name = keyboard_name; + *data_size = ARRAY_SIZE(keyboard_name); + to_copy = keyboard_name; } else { - hid_device = device; - s = strlenW(hid_device->path) + 1; - name = hid_device->path; + *data_size = strlenW(hid_device->path) + 1; + to_copy = hid_device->path; } + to_copy_bytes = *data_size * sizeof(WCHAR); break; + case RIDI_DEVICEINFO: - s = sizeof(*info); + avail_bytes = *data_size; + info.cbSize = sizeof(info); + if (device == WINE_MOUSE_HANDLE) + { + info.dwType = RIM_TYPEMOUSE; + info.u.mouse = mouse_info; + } + else if (device == WINE_KEYBOARD_HANDLE) + { + info.dwType = RIM_TYPEKEYBOARD; + info.u.keyboard = keyboard_info; + } + else + { + info.dwType = RIM_TYPEHID; + info.u.hid = hid_device->info; + } + to_copy_bytes = sizeof(info); + *data_size = to_copy_bytes; + to_copy = &info; break; + default: + FIXME("command %#x not supported\n", command); return ~0U; } if (!data) - { - *data_size = s; return 0; - } - if (*data_size < s) - { - *data_size = s; + if (avail_bytes < to_copy_bytes) return ~0U; - } - if (command == RIDI_DEVICENAME) - { - memcpy(data, name, s * sizeof(WCHAR)); - return s; - } + memcpy(data, to_copy, to_copy_bytes); - info = data; - info->cbSize = sizeof(*info); - if (device == WINE_MOUSE_HANDLE) - { - info->dwType = RIM_TYPEMOUSE; - info->u.mouse = mouse_info; - } - else if (device == WINE_KEYBOARD_HANDLE) - { - info->dwType = RIM_TYPEKEYBOARD; - info->u.keyboard = keyboard_info; - } - else - { - hid_device = device; - info->dwType = RIM_TYPEHID; - info->u.hid = hid_device->info; - } - return s; + return *data_size; } /***********************************************************************

1 0

Andrew Eikum : user32/tests: Move rawinput tests into input.c.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 4a58d67106b63772322a682cf1022b1a290acdca URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a58d67106b63772322a682c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 30 14:26:20 2019 -0500 user32/tests: Move rawinput tests into input.c. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/Makefile.in | 1 - dlls/user32/tests/input.c | 71 +++++++++++++++++++++++++++++ dlls/user32/tests/rawinput.c | 101 ------------------------------------------ 3 files changed, 71 insertions(+), 102 deletions(-) diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index 26bc3b2bc6..7149dc824e 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -17,7 +17,6 @@ C_SRCS = \ menu.c \ monitor.c \ msg.c \ - rawinput.c \ resource.c \ scroll.c \ static.c \ diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index c5cf9556ed..5723af3fd2 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1,6 +1,7 @@ /* Test Key event to Key message translation * * Copyright 2003 Rein Klazes + * Copyright 2019 Remi Bernon for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1712,6 +1713,75 @@ static void test_GetRawInputData(void) ok(ret == ~0U, "Expect ret %u, got %u\n", ~0U, ret); } +static void test_RegisterRawInputDevices(void) +{ + HWND hwnd; + RAWINPUTDEVICE raw_devices[1]; + BOOL res; + + raw_devices[0].usUsagePage = 0x01; + raw_devices[0].usUsage = 0x05; + + hwnd = CreateWindowExA(WS_EX_TOPMOST, "static", "dinput", WS_POPUP | WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindowExA failed\n"); + + + res = RegisterRawInputDevices(NULL, 0, 0); + ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); + + + raw_devices[0].dwFlags = 0; + raw_devices[0].hwndTarget = 0; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), 0); + ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(res == TRUE, "RegisterRawInputDevices failed\n"); + ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + + /* RIDEV_REMOVE requires hwndTarget == NULL */ + raw_devices[0].dwFlags = RIDEV_REMOVE; + raw_devices[0].hwndTarget = hwnd; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + raw_devices[0].hwndTarget = 0; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(res == TRUE, "RegisterRawInputDevices failed\n"); + ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + + /* RIDEV_INPUTSINK requires hwndTarget != NULL */ + raw_devices[0].dwFlags = RIDEV_INPUTSINK; + raw_devices[0].hwndTarget = 0; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + todo_wine + ok(res == FALSE, "RegisterRawInputDevices failed\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + raw_devices[0].hwndTarget = hwnd; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(res == TRUE, "RegisterRawInputDevices succeeded\n"); + ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + DestroyWindow(hwnd); +} + static void test_key_map(void) { HKL kl = GetKeyboardLayout(0); @@ -2902,6 +2972,7 @@ START_TEST(input) test_GetKeyState(); test_OemKeyScan(); test_GetRawInputData(); + test_RegisterRawInputDevices(); if(pGetMouseMovePointsEx) test_GetMouseMovePointsEx(); diff --git a/dlls/user32/tests/rawinput.c b/dlls/user32/tests/rawinput.c deleted file mode 100644 index f4c8eb6738..0000000000 --- a/dlls/user32/tests/rawinput.c +++ /dev/null @@ -1,101 +0,0 @@ -/* Unit test suite for rawinput. - * - * Copyright 2019 Remi Bernon for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> -#include <stdio.h> - -#define STRICT -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - -#include "wine/test.h" - -static void test_RegisterRawInputDevices(void) -{ - HWND hwnd; - RAWINPUTDEVICE raw_devices[1]; - BOOL res; - - raw_devices[0].usUsagePage = 0x01; - raw_devices[0].usUsage = 0x05; - - hwnd = CreateWindowExA(WS_EX_TOPMOST, "static", "dinput", WS_POPUP | WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, NULL, NULL); - ok(hwnd != NULL, "CreateWindowExA failed\n"); - - - res = RegisterRawInputDevices(NULL, 0, 0); - ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); - - - raw_devices[0].dwFlags = 0; - raw_devices[0].hwndTarget = 0; - - SetLastError(0xdeadbeef); - res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), 0); - ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); - - SetLastError(0xdeadbeef); - res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); - ok(res == TRUE, "RegisterRawInputDevices failed\n"); - ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); - - - /* RIDEV_REMOVE requires hwndTarget == NULL */ - raw_devices[0].dwFlags = RIDEV_REMOVE; - raw_devices[0].hwndTarget = hwnd; - - SetLastError(0xdeadbeef); - res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); - ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); - - raw_devices[0].hwndTarget = 0; - - SetLastError(0xdeadbeef); - res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); - ok(res == TRUE, "RegisterRawInputDevices failed\n"); - ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); - - - /* RIDEV_INPUTSINK requires hwndTarget != NULL */ - raw_devices[0].dwFlags = RIDEV_INPUTSINK; - raw_devices[0].hwndTarget = 0; - - SetLastError(0xdeadbeef); - res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); - todo_wine - ok(res == FALSE, "RegisterRawInputDevices failed\n"); - todo_wine - ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); - - raw_devices[0].hwndTarget = hwnd; - - SetLastError(0xdeadbeef); - res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); - ok(res == TRUE, "RegisterRawInputDevices succeeded\n"); - ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); - - DestroyWindow(hwnd); -} - -START_TEST(rawinput) -{ - test_RegisterRawInputDevices(); -}

1 0

Andrew Eikum : hid: Move preparsed data definition to global header.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: b466419c32550cac59f4b6a891d02255eb94c5f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b466419c32550cac59f4b6a8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 30 14:25:58 2019 -0500 hid: Move preparsed data definition to global header. PHIDP_PREPARSED_DATA is supposed to be an opaque pointer, but the size is accessible through user32.GetRawInputDeviceInfo(RIDI_PREPARSEDDATA), so we will need to know the struct layout in user32, too. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 2 +- dlls/hidclass.sys/hid.h | 2 +- dlls/hidclass.sys/parse.h | 69 ---------------------------------- dlls/hid/parse.h => include/wine/hid.h | 0 4 files changed, 2 insertions(+), 71 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 59a4078c6c..9d631912c8 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -32,7 +32,7 @@ #include "hidusage.h" #include "ddk/hidpi.h" -#include "parse.h" +#include "wine/hid.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(hidp); diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 86d7bdf98f..36d13c009d 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -29,7 +29,7 @@ #include "ddk/hidpi.h" #include "cfgmgr32.h" #include "wine/list.h" -#include "parse.h" +#include "wine/hid.h" #define DEFAULT_POLL_INTERVAL 200 #define MAX_POLL_INTERVAL_MSEC 10000 diff --git a/dlls/hidclass.sys/parse.h b/dlls/hidclass.sys/parse.h deleted file mode 100644 index 319105d286..0000000000 --- a/dlls/hidclass.sys/parse.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Wine internal HID structures - * - * Copyright 2015 Aric Stewart - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_PARSE_H -#define __WINE_PARSE_H - -#define HID_MAGIC 0x8491759 - -typedef enum __WINE_ELEMENT_TYPE { - UnknownElement = 0, - ButtonElement, - ValueElement, -} WINE_ELEMENT_TYPE; - -typedef struct __WINE_ELEMENT -{ - WINE_ELEMENT_TYPE ElementType; - UINT valueStartBit; - UINT bitCount; - union { - HIDP_VALUE_CAPS value; - HIDP_BUTTON_CAPS button; - } caps; -} WINE_HID_ELEMENT; - -typedef struct __WINE_HID_REPORT -{ - UCHAR reportID; - DWORD bitSize; - DWORD elementCount; - DWORD elementIdx; -} WINE_HID_REPORT; - -typedef struct __WINE_HIDP_PREPARSED_DATA -{ - DWORD magic; - DWORD dwSize; - HIDP_CAPS caps; - - DWORD elementOffset; - DWORD reportCount[3]; - BYTE reportIdx[3][256]; - - WINE_HID_REPORT reports[1]; -} WINE_HIDP_PREPARSED_DATA, *PWINE_HIDP_PREPARSED_DATA; - -#define HID_INPUT_REPORTS(d) ((d)->reports) -#define HID_OUTPUT_REPORTS(d) ((d)->reports + (d)->reportCount[0]) -#define HID_FEATURE_REPORTS(d) ((d)->reports + (d)->reportCount[0] + (d)->reportCount[1]) -#define HID_ELEMS(d) ((WINE_HID_ELEMENT*)((BYTE*)(d) + (d)->elementOffset)) - -#endif /* __WINE_PARSE_H */ diff --git a/dlls/hid/parse.h b/include/wine/hid.h similarity index 100% rename from dlls/hid/parse.h rename to include/wine/hid.h

1 0

Martin Storsjo : kernel32: Add a special case to EnumProcessModules for the local process.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: fbda8db334f0703c0e66a2b84dda6bb56537f50b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbda8db334f0703c0e66a2b8… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Oct 30 14:13:34 2019 +0200 kernel32: Add a special case to EnumProcessModules for the local process. LLVM's libunwind uses EnumProcessModules for locating .eh_frame sections when unwinding dwarf exceptions (used on i686). When running wine in docker (without adding custom additional permissions), EnumProcessModules currently fails as it uses ReadProcessMemory, which requires the SYS_PTRACE capability. The current implementation also is slower than necessary (by a couple orders of magnituide), for accessing the current process. Currently, unwinding 10000 exception throws with libunwind on i686 takes 24 seconds when run in wine, while it runs in less than 0.1 second with this patch. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index b7f19ffe36..45814dbff3 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -555,6 +555,40 @@ BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule, DWORD size = 0; INT ret; + if (process == GetCurrentProcess()) + { + PPEB_LDR_DATA ldr_data = NtCurrentTeb()->Peb->LdrData; + PLIST_ENTRY head = &ldr_data->InLoadOrderModuleList; + PLIST_ENTRY entry = head->Flink; + + if (cb && !lphModule) + { + SetLastError(ERROR_NOACCESS); + return FALSE; + } + while (entry != head) + { + PLDR_MODULE table_entry = (PLDR_MODULE) + ((PBYTE)entry - offsetof(LDR_MODULE, InLoadOrderModuleList)); + if (cb >= sizeof(HMODULE)) + { + *lphModule++ = table_entry->BaseAddress; + cb -= sizeof(HMODULE); + } + size += sizeof(HMODULE); + entry = entry->Flink; + } + + if (!needed) + { + SetLastError(ERROR_NOACCESS); + return FALSE; + } + *needed = size; + + return TRUE; + } + if (!init_module_iterator(&iter, process)) return FALSE;

1 0

Nikolay Sivov : mf: Add MFCreateVideoRendererActivate().
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: fef1d403c5dc18722883361e95f7b0f3a5e68b58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fef1d403c5dc18722883361e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 4 16:04:33 2019 +0300 mf: Add MFCreateVideoRendererActivate(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/main.c | 24 ++++++++++++++++++++++++ dlls/mf/mf.spec | 2 +- dlls/mf/tests/mf.c | 12 ++++++++++++ include/mfidl.idl | 1 + 4 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 2e6dc78290..251d59e1c0 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -1144,3 +1144,27 @@ HRESULT WINAPI MFEnumDeviceSources(IMFAttributes *attributes, IMFActivate ***sou return S_OK; } + +static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) +{ + FIXME("%p, %p, %p.\n", attributes, user_context, obj); + + return E_NOTIMPL; +} + +static void evr_free_private(void *user_context) +{ +} + +static const struct activate_funcs evr_activate_funcs = +{ + evr_create_object, + evr_free_private, +}; + +HRESULT WINAPI MFCreateVideoRendererActivate(HWND hwnd, IMFActivate **activate) +{ + TRACE("%p, %p.\n", hwnd, activate); + + return create_activation_object(hwnd, &evr_activate_funcs, activate); +} diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index f13a2451fb..a8dd314aa3 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -67,7 +67,7 @@ @ stub MFCreateTranscodeTopology @ stub MFCreateUrlmonSchemePlugin @ stub MFCreateVideoRenderer -@ stub MFCreateVideoRendererActivate +@ stdcall MFCreateVideoRendererActivate(long ptr) @ stub MFCreateWMAEncoderActivate @ stub MFCreateWMVEncoderActivate @ stdcall MFEnumDeviceSources(ptr ptr ptr) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 0428c22ed3..b353df780b 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2584,6 +2584,17 @@ if (SUCCEEDED(hr)) CoUninitialize(); } +static void test_evr(void) +{ + IMFActivate *activate; + HRESULT hr; + + hr = MFCreateVideoRendererActivate(NULL, &activate); + ok(hr == S_OK, "Failed to create activate object, hr %#x.\n", hr); + + IMFActivate_Release(activate); +} + START_TEST(mf) { test_topology(); @@ -2597,4 +2608,5 @@ START_TEST(mf) test_video_processor(); test_quality_manager(); test_sar(); + test_evr(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index 9c14c5604b..da43399828 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -586,6 +586,7 @@ cpp_quote("HRESULT WINAPI MFCreateSystemTimeSource(IMFPresentationTimeSource **t cpp_quote("HRESULT WINAPI MFCreateTopology(IMFTopology **topology);") cpp_quote("HRESULT WINAPI MFCreateTopologyNode(MF_TOPOLOGY_TYPE node_type, IMFTopologyNode **node);") cpp_quote("HRESULT WINAPI MFCreateTopoLoader(IMFTopoLoader **loader);") +cpp_quote("HRESULT WINAPI MFCreateVideoRendererActivate(HWND hwnd, IMFActivate **activate);") cpp_quote("HRESULT WINAPI MFEnumDeviceSources(IMFAttributes *attributes, IMFActivate ***sources, UINT32 *count);") cpp_quote("HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *array);") cpp_quote("HRESULT WINAPI MFGetService(IUnknown *object, REFGUID service, REFIID iid, void **obj);")

1 0

Zebediah Figura : httpapi: Implement HttpReceiveRequestEntityBody().
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: c1a62e0167835e85d4abcb4c362be25f492d4cb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1a62e0167835e85d4abcb4c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 3 20:20:38 2019 -0600 httpapi: Implement HttpReceiveRequestEntityBody(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48017 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi_main.c | 31 ++++++++++-- dlls/httpapi/tests/httpapi.c | 118 ++++++++++++++++++++++++++++++++++++++++++- include/http.h | 2 + 3 files changed, 147 insertions(+), 4 deletions(-) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 47b5d8a2bb..0449d53045 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -284,12 +284,37 @@ ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url) ULONG WINAPI HttpReceiveRequestEntityBody(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, void *buffer, ULONG size, ULONG *ret_size, OVERLAPPED *ovl) { - *ret_size = 0; + struct http_receive_body_params params = + { + .id = id, + .bits = sizeof(void *) * 8, + }; + ULONG ret = ERROR_SUCCESS; + OVERLAPPED sync_ovl; - FIXME("stub: queue %p, id %s, flags %#x, buffer %p, size %#x, ret_size %p, ovl %p.\n", + TRACE("queue %p, id %s, flags %#x, buffer %p, size %#x, ret_size %p, ovl %p.\n", queue, wine_dbgstr_longlong(id), flags, buffer, size, ret_size, ovl); - return ERROR_HANDLE_EOF; + if (flags) + FIXME("Ignoring flags %#x.\n", flags); + + if (!ovl) + { + sync_ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + ovl = &sync_ovl; + } + + if (!DeviceIoControl(queue, IOCTL_HTTP_RECEIVE_BODY, &params, sizeof(params), buffer, size, NULL, ovl)) + ret = GetLastError(); + + if (ovl == &sync_ovl) + { + if (!GetOverlappedResult(queue, ovl, ret_size, TRUE)) + ret = GetLastError(); + CloseHandle(sync_ovl.hEvent); + } + + return ret; } /*********************************************************************** diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index 5c3b4ec13c..c506023ee7 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -546,12 +546,13 @@ static void test_v1_short_buffer(void) static void test_v1_entity_body(void) { - char DECLSPEC_ALIGN(8) req_buffer[4096], response_buffer[2048], req_body[2048]; + char DECLSPEC_ALIGN(8) req_buffer[4096], response_buffer[2048], req_body[2048], recv_body[2000]; HTTP_REQUEST_V1 *req = (HTTP_REQUEST_V1 *)req_buffer; HTTP_RESPONSE_V1 response = {}; HTTP_DATA_CHUNK chunks[2] = {}; ULONG ret, chunk_size; unsigned int i; + OVERLAPPED ovl; DWORD ret_size; HANDLE queue; SOCKET s; @@ -571,6 +572,8 @@ static void test_v1_entity_body(void) "Content-Length: 2048\r\n" "\r\n"; + ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); + for (i = 0; i < sizeof(req_body); ++i) req_body[i] = i / 111; @@ -708,6 +711,119 @@ static void test_v1_entity_body(void) send_response_v1(queue, req->RequestId, s); + /* Test HttpReceiveRequestEntityBody(). */ + + ret = send(s, post_req, sizeof(post_req), 0); + ok(ret == sizeof(post_req), "send() returned %d.\n", ret); + Sleep(100); + + ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), &ret_size, NULL); + ok(!ret, "Got error %u.\n", ret); + + ret = HttpReceiveRequestEntityBody(queue, HTTP_NULL_ID, 0, recv_body, sizeof(recv_body), &ret_size, NULL); + ok(ret == ERROR_CONNECTION_INVALID, "Got error %u.\n", ret); + + ret_size = 0xdeadbeef; + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), &ret_size, NULL); + ok(!ret, "Got error %u.\n", ret); + ok(ret_size == 5, "Got size %u.\n", ret_size); + ok(!memcmp(recv_body, "ping", 5), "Entity body didn't match.\n"); + + ret_size = 0xdeadbeef; + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), &ret_size, NULL); + ok(ret == ERROR_HANDLE_EOF, "Got error %u.\n", ret); + ok(ret_size == 0xdeadbeef || !ret_size /* Win10+ */, "Got size %u.\n", ret_size); + + send_response_v1(queue, req->RequestId, s); + + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), &ret_size, NULL); + ok(ret == ERROR_CONNECTION_INVALID, "Got error %u.\n", ret); + + ret = send(s, post_req, sizeof(post_req), 0); + ok(ret == sizeof(post_req), "send() returned %d.\n", ret); + Sleep(100); + + ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), &ret_size, NULL); + ok(!ret, "Got error %u.\n", ret); + + memset(recv_body, 0xcc, sizeof(recv_body)); + ret_size = 0xdeadbeef; + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, 2, &ret_size, NULL); + ok(!ret, "Got error %u.\n", ret); + ok(ret_size == 2, "Got size %u.\n", ret_size); + ok(!memcmp(recv_body, "pi", 2), "Entity body didn't match.\n"); + + ret_size = 0xdeadbeef; + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, 4, &ret_size, NULL); + ok(!ret, "Got error %u.\n", ret); + ok(ret_size == 3, "Got size %u.\n", ret_size); + ok(!memcmp(recv_body, "ng", 3), "Entity body didn't match.\n"); + + ret_size = 0xdeadbeef; + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), &ret_size, NULL); + ok(ret == ERROR_HANDLE_EOF, "Got error %u.\n", ret); + ok(ret_size == 0xdeadbeef || !ret_size /* Win10+ */, "Got size %u.\n", ret_size); + + send_response_v1(queue, req->RequestId, s); + + ret = send(s, post_req, sizeof(post_req), 0); + ok(ret == sizeof(post_req), "send() returned %d.\n", ret); + Sleep(100); + + ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), &ret_size, NULL); + ok(!ret, "Got error %u.\n", ret); + + memset(recv_body, 0xcc, sizeof(recv_body)); + ret_size = 0xdeadbeef; + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), NULL, &ovl); + ok(!ret || ret == ERROR_IO_PENDING, "Got error %u.\n", ret); + ret = GetOverlappedResult(queue, &ovl, &ret_size, TRUE); + ok(ret, "Got error %u.\n", GetLastError()); + ok(ret_size == 5, "Got size %u.\n", ret_size); + ok(!memcmp(recv_body, "ping", 5), "Entity body didn't match.\n"); + + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), NULL, &ovl); + ok(ret == ERROR_HANDLE_EOF, "Got error %u.\n", ret); + + send_response_v1(queue, req->RequestId, s); + + ret = send(s, post_req, sizeof(post_req), 0); + ok(ret == sizeof(post_req), "send() returned %d.\n", ret); + Sleep(100); + + ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY, + (HTTP_REQUEST *)req, sizeof(req_buffer), &ret_size, NULL); + ok(!ret, "Got error %u.\n", ret); + + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), NULL, &ovl); + ok(ret == ERROR_HANDLE_EOF, "Got error %u.\n", ret); + + send_response_v1(queue, req->RequestId, s); + + ret = send(s, post_req2, strlen(post_req2), 0); + ok(ret == strlen(post_req2), "send() returned %d.\n", ret); + ret = send(s, req_body, sizeof(req_body), 0); + ok(ret == sizeof(req_body), "send() returned %d.\n", ret); + + Sleep(100); + + ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY, + (HTTP_REQUEST *)req, 2000, &ret_size, NULL); + ok(!ret, "Got error %u.\n", ret); + ok(ret_size == 2000, "Got size %u.\n", ret_size); + ok(req->Flags == HTTP_REQUEST_FLAG_MORE_ENTITY_BODY_EXISTS, "Got flags %#x.\n", req->Flags); + chunk_size = req->pEntityChunks[0].FromMemory.BufferLength; + + memset(recv_body, 0xcc, sizeof(recv_body)); + ret_size = 0xdeadbeef; + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), &ret_size, NULL); + ok(!ret, "Got error %u.\n", ret); + ok(ret_size == 2048 - chunk_size, "Got size %u.\n", ret_size); + ok(!memcmp(recv_body, req_body + chunk_size, ret_size), "Entity body didn't match.\n"); + + send_response_v1(queue, req->RequestId, s); + + CloseHandle(ovl.hEvent); ret = HttpRemoveUrl(queue, localhost_urlW); ok(!ret, "Got error %u.\n", ret); closesocket(s); diff --git a/include/http.h b/include/http.h index 49eb557fae..394167fd68 100644 --- a/include/http.h +++ b/include/http.h @@ -46,6 +46,8 @@ typedef struct _HTTPAPI_VERSION #define HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY 0x00000001 #define HTTP_RECEIVE_REQUEST_FLAG_FLUSH_BODY 0x00000002 +#define HTTP_RECEIVE_REQUEST_ENTITY_BODY_FLAG_FILL_BUFFER 0x00000001 + #define HTTP_REQUEST_FLAG_MORE_ENTITY_BODY_EXISTS 0x00000001 #define HTTP_REQUEST_FLAG_IP_ROUTED 0x00000002 #define HTTP_REQUEST_FLAG_HTTP2 0x00000004

1 0

← Newer
1
...
80
81
82
83
84
85
86
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2019