September 2019 - Wine-commits

Rémi Bernon : winebus.sys: Report the native product string for some Xbox gamepads.
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: wine Branch: master Commit: f36e9e3a2cdf956ab02ededa4866016d43f9c79d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f36e9e3a2cdf956ab02ededa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 20 10:31:42 2019 +0200 winebus.sys: Report the native product string for some Xbox gamepads. Some games are checking the hid product string of connected gamepads in order to decide whether or not to activate rumble. Wine usually delegates these queries to the backend driver, but they don't always report the same product strings as on Windows. This will allow to override backend strings with the actual strings as reported by native drivers. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 102 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 85 insertions(+), 17 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index fc6b8be7f5..5b9900c70d 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -49,22 +49,39 @@ WINE_DECLARE_DEBUG_CHANNEL(hid_report); static const WCHAR backslashW[] = {'\\',0}; +struct product_desc +{ + WORD vid; + WORD pid; + const WCHAR* manufacturer; + const WCHAR* product; + const WCHAR* serialnumber; +}; + #define VID_MICROSOFT 0x045e -static const WORD PID_XBOX_CONTROLLERS[] = { - 0x0202, /* Xbox Controller */ - 0x0285, /* Xbox Controller S */ - 0x0289, /* Xbox Controller S */ - 0x028e, /* Xbox360 Controller */ - 0x028f, /* Xbox360 Wireless Controller */ - 0x02d1, /* Xbox One Controller */ - 0x02dd, /* Xbox One Controller (Covert Forces/Firmware 2015) */ - 0x02e0, /* Xbox One X Controller */ - 0x02e3, /* Xbox One Elite Controller */ - 0x02e6, /* Wireless XBox Controller Dongle */ - 0x02ea, /* Xbox One S Controller */ - 0x02fd, /* Xbox One S Controller (Firmware 2017) */ - 0x0719, /* Xbox 360 Wireless Adapter */ +static const WCHAR xbox360_product_string[] = { + 'C','o','n','t','r','o','l','l','e','r',' ','(','X','B','O','X',' ','3','6','0',' ','F','o','r',' ','W','i','n','d','o','w','s',')',0 +}; + +static const WCHAR xboxone_product_string[] = { + 'C','o','n','t','r','o','l','l','e','r',' ','(','X','B','O','X',' ','O','n','e',' ','F','o','r',' ','W','i','n','d','o','w','s',')',0 +}; + +static const struct product_desc XBOX_CONTROLLERS[] = { + {VID_MICROSOFT, 0x0202, NULL, NULL, NULL}, /* Xbox Controller */ + {VID_MICROSOFT, 0x0285, NULL, NULL, NULL}, /* Xbox Controller S */ + {VID_MICROSOFT, 0x0289, NULL, NULL, NULL}, /* Xbox Controller S */ + {VID_MICROSOFT, 0x028e, NULL, xbox360_product_string, NULL}, /* Xbox360 Controller */ + {VID_MICROSOFT, 0x028f, NULL, xbox360_product_string, NULL}, /* Xbox360 Wireless Controller */ + {VID_MICROSOFT, 0x02d1, NULL, xboxone_product_string, NULL}, /* Xbox One Controller */ + {VID_MICROSOFT, 0x02dd, NULL, xboxone_product_string, NULL}, /* Xbox One Controller (Covert Forces/Firmware 2015) */ + {VID_MICROSOFT, 0x02e0, NULL, NULL, NULL}, /* Xbox One X Controller */ + {VID_MICROSOFT, 0x02e3, NULL, xboxone_product_string, NULL}, /* Xbox One Elite Controller */ + {VID_MICROSOFT, 0x02e6, NULL, NULL, NULL}, /* Wireless XBox Controller Dongle */ + {VID_MICROSOFT, 0x02ea, NULL, xboxone_product_string, NULL}, /* Xbox One S Controller */ + {VID_MICROSOFT, 0x02fd, NULL, xboxone_product_string, NULL}, /* Xbox One S Controller (Firmware 2017) */ + {VID_MICROSOFT, 0x0719, NULL, xbox360_product_string, NULL}, /* Xbox 360 Wireless Adapter */ }; static DRIVER_OBJECT *driver_obj; @@ -518,6 +535,55 @@ static NTSTATUS deliver_last_report(struct device_extension *ext, DWORD buffer_l } } +static NTSTATUS hid_get_native_string(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD length) +{ + struct device_extension *ext = (struct device_extension *)device->DeviceExtension; + const struct product_desc *vendor_products; + unsigned int i, vendor_products_size = 0; + + if (ext->vid == VID_MICROSOFT) + { + vendor_products = XBOX_CONTROLLERS; + vendor_products_size = ARRAY_SIZE(XBOX_CONTROLLERS); + } + + for (i = 0; i < vendor_products_size; i++) + { + if (ext->pid == vendor_products[i].pid) + break; + } + + if (i >= vendor_products_size) + return STATUS_UNSUCCESSFUL; + + switch (index) + { + case HID_STRING_ID_IPRODUCT: + if (vendor_products[i].product) + { + strcpyW(buffer, vendor_products[i].product); + return STATUS_SUCCESS; + } + break; + case HID_STRING_ID_IMANUFACTURER: + if (vendor_products[i].manufacturer) + { + strcpyW(buffer, vendor_products[i].manufacturer); + return STATUS_SUCCESS; + } + break; + case HID_STRING_ID_ISERIALNUMBER: + if (vendor_products[i].serialnumber) + { + strcpyW(buffer, vendor_products[i].serialnumber); + return STATUS_SUCCESS; + } + break; + } + + return STATUS_UNSUCCESSFUL; +} + static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) { NTSTATUS status = irp->IoStatus.u.Status; @@ -597,7 +663,9 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) DWORD index = (ULONG_PTR)irpsp->Parameters.DeviceIoControl.Type3InputBuffer; TRACE("IOCTL_HID_GET_STRING[%08x]\n", index); - irp->IoStatus.u.Status = status = ext->vtbl->get_string(device, index, (WCHAR *)irp->UserBuffer, length); + irp->IoStatus.u.Status = status = hid_get_native_string(device, index, (WCHAR *)irp->UserBuffer, length); + if (status != STATUS_SUCCESS) + irp->IoStatus.u.Status = status = ext->vtbl->get_string(device, index, (WCHAR *)irp->UserBuffer, length); if (status == STATUS_SUCCESS) irp->IoStatus.Information = (strlenW((WCHAR *)irp->UserBuffer) + 1) * sizeof(WCHAR); break; @@ -762,8 +830,8 @@ BOOL is_xbox_gamepad(WORD vid, WORD pid) if (vid != VID_MICROSOFT) return FALSE; - for (i = 0; i < ARRAY_SIZE(PID_XBOX_CONTROLLERS); i++) - if (pid == PID_XBOX_CONTROLLERS[i]) return TRUE; + for (i = 0; i < ARRAY_SIZE(XBOX_CONTROLLERS); i++) + if (pid == XBOX_CONTROLLERS[i].pid) return TRUE; return FALSE; }

1 0

Alistair Leslie-Hughes : wininet: Use username/password parameters over cached credentials.
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: wine Branch: master Commit: f40aa5552c96942240009282b2db7739aa435f7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f40aa5552c96942240009282… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 20 02:10:13 2019 +0000 wininet: Use username/password parameters over cached credentials. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 9 ++++- dlls/wininet/tests/http.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 60dab62441..fc412849eb 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1700,11 +1700,18 @@ static BOOL HTTP_InsertAuthorization( http_request_t *request, struct HttpAuthIn HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD); heap_free(authorization); } - else if (!strcmpW(header, szAuthorization) && (host = get_host_header(request))) + else { UINT data_len; char *data; + /* Don't use cached credentials when a username or Authorization was specified */ + if ((request->session->userName && request->session->userName[0]) || strcmpW(header, szAuthorization)) + return TRUE; + + if (!(host = get_host_header(request))) + return TRUE; + if ((data_len = retrieve_cached_basic_authorization(request, host, NULL, &data))) { TRACE("Found cached basic authorization for %s\n", debugstr_w(host)); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index f1a647346e..90a38dc3af 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2431,6 +2431,13 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, notokmsg, sizeof notokmsg-1, 0); } + if (strstr(buffer, "HEAD /upload3.txt")) + { + if (strstr(buffer, "Authorization: Basic dXNlcjE6cHdkMQ==")) + send(c, okmsg, sizeof okmsg-1, 0); + else + send(c, noauthmsg, sizeof noauthmsg-1, 0); + } if (strstr(buffer, "/test_host_override")) { if (strstr(buffer, host_header_override)) @@ -4588,6 +4595,88 @@ static void test_basic_auth_credentials_end_session(int port) InternetCloseHandle( ses ); } +static void test_basic_auth_credentials_different(int port) +{ + HINTERNET ses, con, req; + DWORD status, size; + BOOL ret; + char buffer[0x40]; + + ses = InternetOpenA( "winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0 ); + ok( ses != NULL, "InternetOpenA failed\n" ); + + con = InternetConnectA( ses, "localhost", port, "user", "pwd", + INTERNET_SERVICE_HTTP, 0, 0 ); + ok( con != NULL, "InternetConnectA failed %u\n", GetLastError() ); + + req = HttpOpenRequestA( con, "HEAD", "/upload.txt", NULL, NULL, NULL, 0, 0 ); + ok( req != NULL, "HttpOpenRequestA failed %u\n", GetLastError() ); + + ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); + ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); + + size = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_USERNAME, buffer, &size); + ok(ret, "unexpected failure %u\n", GetLastError()); + ok(!strcmp(buffer, "user"), "got %s\n", buffer); + ok(size == 4, "got %u\n", size); + + size = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_PASSWORD, buffer, &size); + ok(ret, "unexpected failure %u\n", GetLastError()); + ok(!strcmp(buffer, "pwd"), "got %s\n", buffer); + ok(size == 3, "got %u\n", size); + + status = 0xdeadbeef; + size = sizeof(status); + ret = HttpQueryInfoA( req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); + ok( ret, "HttpQueryInfoA failed %u\n", GetLastError() ); + ok( status == 200, "got %u\n", status ); + + InternetCloseHandle( req ); + InternetCloseHandle( con ); + InternetCloseHandle( ses ); + + ses = InternetOpenA( "winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0 ); + ok( ses != NULL, "InternetOpenA failed\n" ); + + con = InternetConnectA( ses, "localhost", port, "user1", "pwd1", + INTERNET_SERVICE_HTTP, 0, 0 ); + ok( con != NULL, "InternetConnectA failed %u\n", GetLastError() ); + + req = HttpOpenRequestA( con, "HEAD", "/upload3.txt", NULL, NULL, NULL, 0, 0 ); + ok( req != NULL, "HttpOpenRequestA failed %u\n", GetLastError() ); + + ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); + ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); + + size = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_USERNAME, buffer, &size); + ok(ret, "unexpected failure %u\n", GetLastError()); + ok(!strcmp(buffer, "user1"), "got %s\n", buffer); + ok(size == 5, "got %u\n", size); + + size = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_PASSWORD, buffer, &size); + ok(ret, "unexpected failure %u\n", GetLastError()); + ok(!strcmp(buffer, "pwd1"), "got %s\n", buffer); + ok(size == 4, "got %u\n", size); + + status = 0xdeadbeef; + size = sizeof(status); + ret = HttpQueryInfoA( req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); + ok( ret, "HttpQueryInfoA failed %u\n", GetLastError() ); + ok( status == 200, "got %u\n", status ); + + InternetCloseHandle( req ); + InternetCloseHandle( con ); + InternetCloseHandle( ses ); +} + static void test_async_read(int port) { HINTERNET ses, con, req; @@ -5783,6 +5872,7 @@ static void test_http_connection(void) test_accept_encoding(si.port); test_basic_auth_credentials_reuse(si.port); test_basic_auth_credentials_end_session(si.port); + test_basic_auth_credentials_different(si.port); test_async_read(si.port); test_http_read(si.port); test_connection_break(si.port);

1 0

Michael Müller : wine.inf: Create the WindowsMediaVersion key and set its default value.
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: wine Branch: master Commit: acd5358f5bb7c2dd491f7490849a410634971a3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=acd5358f5bb7c2dd491f7490… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Sep 19 18:36:40 2019 -0500 wine.inf: Create the WindowsMediaVersion key and set its default value. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47779 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 3ddda8d5aa..f469703e71 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -498,6 +498,7 @@ HKLM,%CurrentVersion%\PreviewHandlers,,16 HKLM,%CurrentVersion%\Run,,16 HKLM,%CurrentVersion%\Setup,"BootDir",,"%30%" HKLM,%CurrentVersion%\Setup,"SharedDir",,"%25%" +HKLM,%CurrentVersion%\Setup\WindowsFeatures\WindowsMediaVersion,,,"12.0.7601.18840" HKLM,%CurrentVersion%\Shell Extensions\Approved,,16 HKLM,%CurrentVersion%\Uninstall,,16 HKLM,%CurrentVersion%\Winlogon,,16

1 0

Alex Henrie : wined3d: Avoid dead assignment (scan-build).
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: wine Branch: master Commit: 6c40c2dab2fcf587d89665369ff64786b07cfdb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c40c2dab2fcf587d8966536… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 15 23:40:42 2019 -0600 wined3d: Avoid dead assignment (scan-build). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 1 - dlls/wined3d/surface.c | 1 - 2 files changed, 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 76c3f9fc99..0e0977e1d4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10021,7 +10021,6 @@ static HRESULT shader_glsl_compile_compute_shader(struct shader_glsl_priv *priv, return E_OUTOFMEMORY; } shader_data = shader->backend_data; - gl_shaders = shader_data->gl_shaders.cs; if (!(shader_data->gl_shaders.cs = heap_alloc(sizeof(*gl_shaders)))) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d254e904f8..4a3ecf9863 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1285,7 +1285,6 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de if (previous && (previous->width != view->width || previous->height != view->height)) have_identical_size = FALSE; - previous = view; } if (have_identical_size)

1 0

Zebediah Figura : winegstreamer: Clear bFixedSizeSamples in amt_from_gst_caps_video().
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: wine Branch: master Commit: 8d5c0a6631d0cd3c4afe9aacdbc492ebc3f04155 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d5c0a6631d0cd3c4afe9aac… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 19 18:59:35 2019 -0500 winegstreamer: Clear bFixedSizeSamples in amt_from_gst_caps_video(). This makes no logical sense, but the native AVI splitter never sets this field. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 1b4857a2a1..5294e166b5 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -204,7 +204,8 @@ static gboolean amt_from_gst_caps_video(const GstCaps *caps, AM_MEDIA_TYPE *amt) amt->formattype = FORMAT_VideoInfo; amt->pbFormat = (BYTE*)vih; amt->cbFormat = sizeof(*vih); - amt->bFixedSizeSamples = amt->bTemporalCompression = 1; + amt->bFixedSizeSamples = FALSE; + amt->bTemporalCompression = TRUE; amt->lSampleSize = 0; amt->pUnk = NULL; ZeroMemory(vih, sizeof(*vih));

1 0

Zebediah Figura : winegstreamer: Fix registration for the WAVE parser.
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: wine Branch: master Commit: 28c334b273c7acf6bcb79fe36999e442a9d3b48c URL: https://source.winehq.org/git/wine.git/?a=commit;h=28c334b273c7acf6bcb79fe3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 19 18:59:34 2019 -0500 winegstreamer: Fix registration for the WAVE parser. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 8503f9c7ab..1056d0d667 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -206,7 +206,7 @@ static const AMOVIESETUP_PIN wave_parser_pin_data[] = }, { NULL, - FALSE, FALSE, FALSE, FALSE, + FALSE, TRUE, FALSE, FALSE, &GUID_NULL, NULL, ARRAY_SIZE(wave_parser_source_type_data),

1 0

Zebediah Figura : winegstreamer: Set lSampleSize to 1 in amt_from_gst_caps_video().
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: wine Branch: master Commit: 923a7808f4966a9cde8eaa98b7f16a6494661b4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=923a7808f4966a9cde8eaa98… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 19 18:59:36 2019 -0500 winegstreamer: Set lSampleSize to 1 in amt_from_gst_caps_video(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 5294e166b5..2597a2cb4d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -206,7 +206,7 @@ static gboolean amt_from_gst_caps_video(const GstCaps *caps, AM_MEDIA_TYPE *amt) amt->cbFormat = sizeof(*vih); amt->bFixedSizeSamples = FALSE; amt->bTemporalCompression = TRUE; - amt->lSampleSize = 0; + amt->lSampleSize = 1; amt->pUnk = NULL; ZeroMemory(vih, sizeof(*vih)); amt->majortype = MEDIATYPE_Video;

1 0

Zebediah Figura : winegstreamer: Don't set the source and target rects in amt_from_gst_caps_video().
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: wine Branch: master Commit: bf46266099b49295a57d97533fdda0c67c2a4bca URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf46266099b49295a57d9753… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 19 18:59:37 2019 -0500 winegstreamer: Don't set the source and target rects in amt_from_gst_caps_video(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 2597a2cb4d..22fb8ef4c8 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -262,11 +262,6 @@ static gboolean amt_from_gst_caps_video(const GstCaps *caps, AM_MEDIA_TYPE *amt) bih->biSizeImage = width * height * bih->biBitCount / 8; if ((vih->AvgTimePerFrame = (REFERENCE_TIME)MulDiv(10000000, denom, nom)) == -1) vih->AvgTimePerFrame = 0; /* zero division or integer overflow */ - vih->rcSource.left = 0; - vih->rcSource.right = width; - vih->rcSource.top = height; - vih->rcSource.bottom = 0; - vih->rcTarget = vih->rcSource; bih->biSize = sizeof(*bih); bih->biWidth = width; bih->biHeight = height;

1 0

Nikolay Sivov : d3d10_1/tests: Add a test for creating SRV for resource without D3D10_BIND_SHADER_RESOURCE.
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: wine Branch: master Commit: dcba4ab5329de5140738f487dc16cc5ec7da3a5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcba4ab5329de5140738f487… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 20 11:39:33 2019 +0300 d3d10_1/tests: Add a test for creating SRV for resource without D3D10_BIND_SHADER_RESOURCE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/tests/d3d10_1.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index f6abea0ced..9c468c13a2 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -399,6 +399,24 @@ static void test_create_shader_resource_view(void) ID3D10ShaderResourceView1_Release(srview); ID3D10Buffer_Release(buffer); + /* Without D3D10_BIND_SHADER_RESOURCE. */ + buffer_desc.ByteWidth = 1024; + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.BindFlags = 0; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + + hr = ID3D10Device1_CreateBuffer(device, &buffer_desc, NULL, &buffer); + ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x\n", hr); + + hr = ID3D10Device1_CreateShaderResourceView1(device, (ID3D10Resource *)buffer, &srv_desc, &srview); +todo_wine + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D10ShaderResourceView1_Release(srview); + + ID3D10Buffer_Release(buffer); + texture_desc.Width = 512; texture_desc.Height = 512; texture_desc.MipLevels = 0;

1 0

Francois Gouget : testbot: Move SecureConnection() before its first use.
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: tools Branch: master Commit: f1402e0dd5d19cc646bd78c02884e4993ebb5efb URL: https://source.winehq.org/git/tools.git/?a=commit;h=f1402e0dd5d19cc646bd78c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 20 13:55:45 2019 +0200 testbot: Move SecureConnection() before its first use. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Utils.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 309fb19..25c60d5 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -27,7 +27,7 @@ WineTestBot::Utils - Utility functions =cut use Exporter 'import'; -our @EXPORT = qw(MakeSecureURL SecureConnection GenerateRandomString +our @EXPORT = qw(SecureConnection MakeSecureURL GenerateRandomString OpenNewFile CreateNewFile CreateNewLink CreateNewDir GetMTime DurationToString BuildEMailRecipient IsValidFileName BuildTag SanitizeTag LocaleName NotifyAdministrator @@ -42,6 +42,11 @@ use WineTestBot::Config; # Web helpers # +sub SecureConnection() +{ + return defined($ENV{"HTTPS"}) && $ENV{"HTTPS"} eq "on"; +} + sub MakeSecureURL($) { my ($URL) = @_; @@ -55,11 +60,6 @@ sub MakeSecureURL($) return $Protocol . "://" . $ENV{"HTTP_HOST"} . $URL; } -sub SecureConnection() -{ - return defined($ENV{"HTTPS"}) && $ENV{"HTTPS"} eq "on"; -} - sub DurationToString($;$) { my ($Secs, $Raw) = @_;

1 0