wine-commits November 2018

wine-commits@winehq.org

2 participants
951 discussions

Henri Verbeet : d3d9: Disallow creating managed cube textures on d3d9ex devices.
by Alexandre Julliard 23 Nov '18

23 Nov '18

Module: wine Branch: master Commit: 4d6dfd5d19bb6de1bf16591a9f2a557e3ac94d7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d6dfd5d19bb6de1bf16591a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 23 19:18:44 2018 +0330 d3d9: Disallow creating managed cube textures on d3d9ex devices. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 4 ++-- dlls/d3d9/texture.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 5387296..6601c94 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4289,8 +4289,8 @@ static void test_resource_access(void) case SURFACE_CUBE: hr = IDirect3DDevice9Ex_CreateCubeTexture(device, 16, 1, tests[j].usage, format, tests[j].pool, &texture_cube, NULL); - todo_wine_if(!tests[j].valid && !tests[j].usage && (tests[j].format == FORMAT_DEPTH - || tests[j].pool == D3DPOOL_MANAGED)) + todo_wine_if(!tests[j].valid && tests[j].format == FORMAT_DEPTH + && !tests[j].usage && tests[j].pool != D3DPOOL_MANAGED) ok(hr == (tests[j].valid && (tests[j].format != FORMAT_DEPTH || depth_cube) ? D3D_OK : D3DERR_INVALIDCALL), "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 456e41e..0c58519 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1383,6 +1383,12 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *devic DWORD flags = 0; HRESULT hr; + if (pool == D3DPOOL_MANAGED && device->d3d_parent->extended) + { + WARN("Managed resources are not supported by d3d9ex devices.\n"); + return D3DERR_INVALIDCALL; + } + texture->IDirect3DBaseTexture9_iface.lpVtbl = (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_cube_vtbl; d3d9_resource_init(&texture->resource); list_init(&texture->rtv_list);

1 0

Piotr Caban : msvcp90: Add time_get<wchar> implementation.
by Alexandre Julliard 23 Nov '18

23 Nov '18

Module: wine Branch: master Commit: e6ec3cbd62c9e098f8a78ce5a0cc1f2bbaa8e42d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6ec3cbd62c9e098f8a78ce5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 23 15:11:50 2018 +0100 msvcp90: Add time_get<wchar> implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 88 +-- dlls/msvcp110/msvcp110.spec | 168 ++--- dlls/msvcp120/msvcp120.spec | 168 ++--- dlls/msvcp120_app/msvcp120_app.spec | 168 ++--- dlls/msvcp140/msvcp140.spec | 172 ++--- dlls/msvcp70/msvcp70.spec | 76 +-- dlls/msvcp71/msvcp71.spec | 80 +-- dlls/msvcp80/msvcp80.spec | 84 +-- dlls/msvcp90/locale.c | 1274 ++++++++++++++++++++++++++++++----- dlls/msvcp90/msvcp90.spec | 88 +-- 10 files changed, 1654 insertions(+), 712 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e6ec3cbd62c9e098f8a7…

1 0

Piotr Caban : msvcp90: Add '_char' suffix to time_get<char> helper functions.
by Alexandre Julliard 23 Nov '18

23 Nov '18

Module: wine Branch: master Commit: 9eff1e0682c24131cb9a9326cc13c880a241a7b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9eff1e0682c24131cb9a9326… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 23 15:10:02 2018 +0100 msvcp90: Add '_char' suffix to time_get<char> helper functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 7755ddf..e2e081a 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -10019,7 +10019,7 @@ dateorder __thiscall time_get_char_date_order(const time_get_char *this) return call_time_get_char_do_date_order(this); } -static int find_longest_match(istreambuf_iterator_char *iter, const char *str) +static int find_longest_match_char(istreambuf_iterator_char *iter, const char *str) { int i, len = 0, last_match = -1, match = -1; const char *p, *end; @@ -10085,7 +10085,7 @@ istreambuf_iterator_char* __thiscall time_get_char_do_get_monthname(const time_g TRACE("(%p %p %p %p %p)\n", this, ret, base, err, t); - if ((match = find_longest_match(&s, this->months)) != -1) + if ((match = find_longest_match_char(&s, this->months)) != -1) t->tm_mon = match / 2; else *err |= IOSTATE_failbit; @@ -10174,7 +10174,7 @@ istreambuf_iterator_char* __thiscall time_get_char_do_get_weekday(const time_get TRACE("(%p %p %p %p %p)\n", this, ret, base, err, t); - if ((match = find_longest_match(&s, this->days)) != -1) + if ((match = find_longest_match_char(&s, this->days)) != -1) t->tm_wday = match / 2; else *err |= IOSTATE_failbit; @@ -10239,19 +10239,19 @@ istreambuf_iterator_char* __thiscall time_get_char_get_year(const time_get_char return call_time_get_char_do_get_year(this, ret, s, e, base, err, t); } -static void skip_ws(ctype_char *ctype, istreambuf_iterator_char *iter) +static void skip_ws_char(ctype_char *ctype, istreambuf_iterator_char *iter) { istreambuf_iterator_char_val(iter); while(iter->strbuf && ctype_char_is_ch(ctype, _SPACE, iter->val)) istreambuf_iterator_char_inc(iter); } -static void skip_date_delim(ctype_char *ctype, istreambuf_iterator_char *iter) +static void skip_date_delim_char(ctype_char *ctype, istreambuf_iterator_char *iter) { - skip_ws(ctype, iter); + skip_ws_char(ctype, iter); if(iter->strbuf && (iter->val == '/' || iter->val == ':')) istreambuf_iterator_char_inc(iter); - skip_ws(ctype, iter); + skip_ws_char(ctype, iter); } /* ?do_get_date@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MBE?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AAVios_base@2@AAHPAUtm@@@Z */ @@ -10284,7 +10284,7 @@ istreambuf_iterator_char* __thiscall time_get_char_do_get_date(const time_get_ch switch(order) { case DATEORDER_dmy: *err |= time_get_char__Getint(this, &s, &e, 1, 31, &t->tm_mday); - skip_date_delim(ctype, &s); + skip_date_delim_char(ctype, &s); if(!s.strbuf) { *err |= IOSTATE_failbit; break; @@ -10295,7 +10295,7 @@ istreambuf_iterator_char* __thiscall time_get_char_do_get_date(const time_get_ch } else { time_get_char_get_monthname(this, &s, s, e, base, err, t); } - skip_date_delim(ctype, &s); + skip_date_delim_char(ctype, &s); if(!s.strbuf) { *err |= IOSTATE_failbit; break; @@ -10310,13 +10310,13 @@ istreambuf_iterator_char* __thiscall time_get_char_do_get_date(const time_get_ch } else { time_get_char_get_monthname(this, &s, s, e, base, err, t); } - skip_date_delim(ctype, &s); + skip_date_delim_char(ctype, &s); if(!s.strbuf) { *err |= IOSTATE_failbit; break; } *err |= time_get_char__Getint(this, &s, &e, 1, 31, &t->tm_mday); - skip_date_delim(ctype, &s); + skip_date_delim_char(ctype, &s); if(!s.strbuf) { *err |= IOSTATE_failbit; break; @@ -10325,7 +10325,7 @@ istreambuf_iterator_char* __thiscall time_get_char_do_get_date(const time_get_ch break; case DATEORDER_ymd: time_get_char_get_year(this, &s, s, e, base, err, t); - skip_date_delim(ctype, &s); + skip_date_delim_char(ctype, &s); if(!s.strbuf) { *err |= IOSTATE_failbit; break; @@ -10336,7 +10336,7 @@ istreambuf_iterator_char* __thiscall time_get_char_do_get_date(const time_get_ch } else { time_get_char_get_monthname(this, &s, s, e, base, err, t); } - skip_date_delim(ctype, &s); + skip_date_delim_char(ctype, &s); if(!s.strbuf) { *err |= IOSTATE_failbit; break; @@ -10345,13 +10345,13 @@ istreambuf_iterator_char* __thiscall time_get_char_do_get_date(const time_get_ch break; case DATEORDER_ydm: time_get_char_get_year(this, &s, s, e, base, err, t); - skip_date_delim(ctype, &s); + skip_date_delim_char(ctype, &s); if(!s.strbuf) { *err |= IOSTATE_failbit; break; } *err |= time_get_char__Getint(this, &s, &e, 1, 31, &t->tm_mday); - skip_date_delim(ctype, &s); + skip_date_delim_char(ctype, &s); if(!s.strbuf) { *err |= IOSTATE_failbit; break; @@ -10404,7 +10404,7 @@ istreambuf_iterator_char* __thiscall time_get_char__Getfmt(const time_get_char * while(*fmt) { if(ctype_char_is_ch(ctype, _SPACE, *fmt)) { - skip_ws(ctype, &s); + skip_ws_char(ctype, &s); fmt++; continue; } @@ -10477,7 +10477,7 @@ istreambuf_iterator_char* __thiscall time_get_char_do_get(const time_get_char *t break; case 'd': case 'e': - if(fmt == 'e') skip_ws(ctype, &s); + if(fmt == 'e') skip_ws_char(ctype, &s); *err |= time_get_char__Getint(this, &s, &e, 1, 31, &t->tm_mday); break; case 'D': @@ -10505,7 +10505,7 @@ istreambuf_iterator_char* __thiscall time_get_char_do_get(const time_get_char *t break; case 'n': case 't': - skip_ws(ctype, &s); + skip_ws_char(ctype, &s); case 'p': { BOOL pm = FALSE; @@ -10580,6 +10580,7 @@ istreambuf_iterator_char* __thiscall time_get_char_get(const time_get_char *this return call_time_get_char_do_get(this, ret, s, e, base, err, t, fmt, mod); } +/* ?get@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QBE?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AAVios_base@2@AAHPAUtm@@PBD4@Z */ /* ?get@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AEAVios_base@2@AEAHPEAUtm@@PEBD4@Z */ DEFINE_THISCALL_WRAPPER(time_get_char_get_fmt, 44) istreambuf_iterator_char* __thiscall time_get_char_get_fmt(const time_get_char *this, @@ -10595,7 +10596,7 @@ istreambuf_iterator_char* __thiscall time_get_char_get_fmt(const time_get_char * while(fmtstart < fmtend) { if(ctype_char_is_ch(ctype, _SPACE, *fmtstart)) { - skip_ws(ctype, &s); + skip_ws_char(ctype, &s); fmtstart++; continue; } @@ -10628,7 +10629,6 @@ istreambuf_iterator_char* __thiscall time_get_char_get_fmt(const time_get_char * return ret; } -/* ?get@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QBE?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AAVios_base@2@AAHPAUtm@@PBD4@Z */ /* ??_7_Locimp@locale@std@@6B@ */ extern const vtable_ptr MSVCP_locale__Locimp_vtable;

1 0

Józef Kucia : wined3d: Propagate HRESULTs in wined3d_swapchain_resize_target().
by Alexandre Julliard 23 Nov '18

23 Nov '18

Module: wine Branch: master Commit: 74351205ace530870f39d024b06f287ebcbf0a6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=74351205ace530870f39d024… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 23 14:41:16 2018 +0100 wined3d: Propagate HRESULTs in wined3d_swapchain_resize_target(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index b95623b..43582ce 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1358,7 +1358,7 @@ HRESULT CDECL wined3d_swapchain_resize_target(struct wined3d_swapchain *swapchai &actual_mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); - return WINED3DERR_INVALIDCALL; + return hr; } SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height);

1 0

Józef Kucia : dxgi/tests: Add missing ok() call.
by Alexandre Julliard 23 Nov '18

23 Nov '18

Module: wine Branch: master Commit: 650abc567acca1593d64396137123d19474ba6c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=650abc567acca1593d643961… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 23 14:41:15 2018 +0100 dxgi/tests: Add missing ok() call. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 9073a03..b3a4705 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2433,10 +2433,11 @@ static void test_windowed_resize_target(IDXGISwapChain *swapchain, HWND window, } ret = MoveWindow(window, 0, 0, 0, 0, TRUE); - ok(ret, "MoveWindow failed.\n"); + ok(ret, "Failed to move window.\n"); GetWindowRect(window, &e->window_rect); GetClientRect(window, &e->client_rect); ret = MoveWindow(window, 0, 0, 200, 200, TRUE); + ok(ret, "Failed to move window.\n"); memset(&mode, 0, sizeof(mode)); hr = IDXGISwapChain_ResizeTarget(swapchain, &mode);

1 0

Józef Kucia : wined3d: Do not crash when trying to draw to buffer render target.
by Alexandre Julliard 23 Nov '18

23 Nov '18

Module: wine Branch: master Commit: 8890ece54cf258906c41b4dd63c6b7b8bf48fab8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8890ece54cf258906c41b4dd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 23 14:41:14 2018 +0100 wined3d: Do not crash when trying to draw to buffer render target. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4cd46c6..4096673 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4840,6 +4840,13 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (!(rtv = fb->render_targets[0])) rtv = fb->depth_stencil; + + if (rtv && rtv->resource->type == WINED3D_RTYPE_BUFFER) + { + FIXME("Buffer render targets not implemented.\n"); + return; + } + if (rtv) context = context_acquire(device, wined3d_texture_from_resource(rtv->resource), rtv->sub_resource_idx); else

1 0

Andrew Eikum : winebus: Don't override real VID/PID for controllers.
by Alexandre Julliard 23 Nov '18

23 Nov '18

Module: wine Branch: master Commit: ccb06c6b6f74d61b2d89b6d02afee4f589e3f4a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccb06c6b6f74d61b2d89b6d0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Nov 22 10:56:01 2018 +1100 winebus: Don't override real VID/PID for controllers. It's unclear what this was useful for, possibly native xinput requires it. Our built-in xinput is good enough now, though, so let's keep the real VID/PID. Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 42 ++++++++---------------------------------- 1 file changed, 8 insertions(+), 34 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 4f0f685..5cf5ddd 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -59,24 +59,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); #ifdef SONAME_LIBSDL2 -#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 */ -}; - WINE_DECLARE_DEBUG_CHANNEL(hid_report); static DRIVER_OBJECT *sdl_driver_obj = NULL; @@ -818,25 +800,17 @@ static void try_add_device(SDL_JoystickID index) controller = pSDL_GameControllerOpen(index); id = pSDL_JoystickInstanceID(joystick); - if (controller) - { - vid = VID_MICROSOFT; - pid = PID_XBOX_CONTROLLERS[3]; - version = 0x01; + + if (pSDL_JoystickGetProductVersion != NULL) { + vid = pSDL_JoystickGetVendor(joystick); + pid = pSDL_JoystickGetProduct(joystick); + version = pSDL_JoystickGetProductVersion(joystick); } else { - 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; - } + vid = 0x01; + pid = pSDL_JoystickInstanceID(joystick) + 1; + version = 0; } guid = pSDL_JoystickGetGUID(joystick);

1 0

Nikolay Sivov : shcore: Implement method wrapper functions.
by Alexandre Julliard 23 Nov '18

23 Nov '18

Module: wine Branch: master Commit: d1443c3a5056ad7ec3831de52f2a14cc29aa4489 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1443c3a5056ad7ec3831de5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 22 15:12:07 2018 +0300 shcore: Implement method wrapper functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/main.c | 160 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/shcore/shcore.spec | 18 +++--- 2 files changed, 169 insertions(+), 9 deletions(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 07918bc..aa513ee 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -19,10 +19,14 @@ #include "config.h" #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "initguid.h" +#include "ocidl.h" #include "shellscalingapi.h" #include "wine/debug.h" @@ -61,3 +65,159 @@ HRESULT WINAPI GetDpiForMonitor(HMONITOR monitor, MONITOR_DPI_TYPE type, UINT *x if (GetDpiForMonitorInternal( monitor, type, x, y )) return S_OK; return HRESULT_FROM_WIN32( GetLastError() ); } + +HRESULT WINAPI _IStream_Read(IStream *stream, void *dest, ULONG size) +{ + ULONG read; + HRESULT hr; + + TRACE("(%p, %p, %u)\n", stream, dest, size); + + hr = IStream_Read(stream, dest, size, &read); + if (SUCCEEDED(hr) && read != size) + hr = E_FAIL; + return hr; +} + +HRESULT WINAPI IStream_Reset(IStream *stream) +{ + static const LARGE_INTEGER zero; + + TRACE("(%p)\n", stream); + + return IStream_Seek(stream, zero, 0, NULL); +} + +HRESULT WINAPI IStream_Size(IStream *stream, ULARGE_INTEGER *size) +{ + STATSTG statstg; + HRESULT hr; + + TRACE("(%p, %p)\n", stream, size); + + memset(&statstg, 0, sizeof(statstg)); + + hr = IStream_Stat(stream, &statstg, STATFLAG_NONAME); + + if (SUCCEEDED(hr) && size) + *size = statstg.cbSize; + return hr; +} + +HRESULT WINAPI _IStream_Write(IStream *stream, const void *src, ULONG size) +{ + ULONG written; + HRESULT hr; + + TRACE("(%p, %p, %u)\n", stream, src, size); + + hr = IStream_Write(stream, src, size, &written); + if (SUCCEEDED(hr) && written != size) + hr = E_FAIL; + + return hr; +} + +void WINAPI IUnknown_AtomicRelease(IUnknown **obj) +{ + TRACE("(%p)\n", obj); + + if (!obj || !*obj) + return; + + IUnknown_Release(*obj); + *obj = NULL; +} + +HRESULT WINAPI IUnknown_GetSite(IUnknown *unk, REFIID iid, void **site) +{ + IObjectWithSite *obj = NULL; + HRESULT hr = E_INVALIDARG; + + TRACE("(%p, %s, %p)\n", unk, debugstr_guid(iid), site); + + if (unk && iid && site) + { + hr = IUnknown_QueryInterface(unk, &IID_IObjectWithSite, (void **)&obj); + if (SUCCEEDED(hr) && obj) + { + hr = IObjectWithSite_GetSite(obj, iid, site); + IObjectWithSite_Release(obj); + } + } + + return hr; +} + +HRESULT WINAPI IUnknown_QueryService(IUnknown *obj, REFGUID sid, REFIID iid, void **out) +{ + IServiceProvider *provider = NULL; + HRESULT hr; + + if (!out) + return E_FAIL; + + *out = NULL; + + if (!obj) + return E_FAIL; + + hr = IUnknown_QueryInterface(obj, &IID_IServiceProvider, (void **)&provider); + if (hr == S_OK && provider) + { + TRACE("Using provider %p.\n", provider); + + hr = IServiceProvider_QueryService(provider, sid, iid, out); + + TRACE("Provider %p returned %p.\n", provider, *out); + + IServiceProvider_Release(provider); + } + + return hr; +} + +void WINAPI IUnknown_Set(IUnknown **dest, IUnknown *src) +{ + TRACE("(%p, %p)\n", dest, src); + + IUnknown_AtomicRelease(dest); + + if (src) + { + IUnknown_AddRef(src); + *dest = src; + } +} + +HRESULT WINAPI IUnknown_SetSite(IUnknown *obj, IUnknown *site) +{ + IInternetSecurityManager *sec_manager; + IObjectWithSite *objwithsite; + HRESULT hr; + + if (!obj) + return E_FAIL; + + hr = IUnknown_QueryInterface(obj, &IID_IObjectWithSite, (void **)&objwithsite); + TRACE("ObjectWithSite %p, hr %#x.\n", objwithsite, hr); + if (SUCCEEDED(hr)) + { + hr = IObjectWithSite_SetSite(objwithsite, site); + TRACE("SetSite() hr %#x.\n", hr); + IObjectWithSite_Release(objwithsite); + } + else + { + hr = IUnknown_QueryInterface(obj, &IID_IInternetSecurityManager, (void **)&sec_manager); + TRACE("InternetSecurityManager %p, hr %#x.\n", sec_manager, hr); + if (FAILED(hr)) + return hr; + + hr = IInternetSecurityManager_SetSecuritySite(sec_manager, (IInternetSecurityMgrSite *)site); + TRACE("SetSecuritySite() hr %#x.\n", hr); + IInternetSecurityManager_Release(sec_manager); + } + + return hr; +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index a9a6f31..0b20781 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -14,17 +14,17 @@ @ stub GetScaleFactorForDevice @ stub GetScaleFactorForMonitor @ stub IStream_Copy -@ stdcall IStream_Read(ptr ptr long) shlwapi.IStream_Read +@ stdcall IStream_Read(ptr ptr long) _IStream_Read @ stub IStream_ReadStr -@ stdcall IStream_Reset(ptr) shlwapi.IStream_Reset -@ stdcall IStream_Size(ptr ptr) shlwapi.IStream_Size -@ stdcall IStream_Write(ptr ptr long) shlwapi.IStream_Write +@ stdcall IStream_Reset(ptr) +@ stdcall IStream_Size(ptr ptr) +@ stdcall IStream_Write(ptr ptr long) _IStream_Write @ stub IStream_WriteStr -@ stdcall IUnknown_AtomicRelease(long) shlwapi.IUnknown_AtomicRelease -@ stdcall IUnknown_GetSite(ptr ptr ptr) shlwapi.IUnknown_GetSite -@ stdcall IUnknown_QueryService(ptr ptr ptr ptr) shlwapi.IUnknown_QueryService -@ stdcall IUnknown_Set(ptr ptr) shlwapi.IUnknown_Set -@ stdcall IUnknown_SetSite(ptr ptr) shlwapi.IUnknown_SetSite +@ stdcall IUnknown_AtomicRelease(long) +@ stdcall IUnknown_GetSite(ptr ptr ptr) +@ stdcall IUnknown_QueryService(ptr ptr ptr ptr) +@ stdcall IUnknown_Set(ptr ptr) +@ stdcall IUnknown_SetSite(ptr ptr) @ stdcall IsOS(long) shlwapi.IsOS @ stub RegisterScaleChangeEvent @ stub RegisterScaleChangeNotifications

1 0

Hans Leidekker : winhttp: Use the thread pool for asynchronous hostname resolution.
by Alexandre Julliard 23 Nov '18

23 Nov '18

Module: wine Branch: master Commit: 539f2f15308cfef5edb936948aa1988cb1d3519d URL: https://source.winehq.org/git/wine.git/?a=commit;h=539f2f15308cfef5edb93694… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 23 11:35:28 2018 +0100 winhttp: Use the thread pool for asynchronous hostname resolution. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/net.c | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index af1d19d..a1ad046 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -651,42 +651,44 @@ static DWORD resolve_hostname( const WCHAR *name, INTERNET_PORT port, struct soc return ERROR_SUCCESS; } -struct resolve_args +struct async_resolve { const WCHAR *hostname; INTERNET_PORT port; - struct sockaddr_storage *sa; + struct sockaddr_storage *addr; + DWORD result; + HANDLE done; }; -static DWORD CALLBACK resolve_proc( LPVOID arg ) +static void CALLBACK resolve_proc( TP_CALLBACK_INSTANCE *instance, void *ctx ) { - struct resolve_args *ra = arg; - return resolve_hostname( ra->hostname, ra->port, ra->sa ); + struct async_resolve *async = ctx; + async->result = resolve_hostname( async->hostname, async->port, async->addr ); + SetEvent( async->done ); } -BOOL netconn_resolve( WCHAR *hostname, INTERNET_PORT port, struct sockaddr_storage *sa, int timeout ) +BOOL netconn_resolve( WCHAR *hostname, INTERNET_PORT port, struct sockaddr_storage *addr, int timeout ) { DWORD ret; - if (timeout) + if (!timeout) ret = resolve_hostname( hostname, port, addr ); + else { - DWORD status; - HANDLE thread; - struct resolve_args ra; - - ra.hostname = hostname; - ra.port = port; - ra.sa = sa; - - thread = CreateThread( NULL, 0, resolve_proc, &ra, 0, NULL ); - if (!thread) return FALSE; + struct async_resolve async; - status = WaitForSingleObject( thread, timeout ); - if (status == WAIT_OBJECT_0) GetExitCodeThread( thread, &ret ); - else ret = ERROR_WINHTTP_TIMEOUT; - CloseHandle( thread ); + async.hostname = hostname; + async.port = port; + async.addr = addr; + if (!(async.done = CreateEventW( NULL, FALSE, FALSE, NULL ))) return FALSE; + if (!TrySubmitThreadpoolCallback( resolve_proc, &async, NULL )) + { + CloseHandle( async.done ); + return FALSE; + } + if (WaitForSingleObject( async.done, timeout ) != WAIT_OBJECT_0) ret = ERROR_WINHTTP_TIMEOUT; + else ret = async.result; + CloseHandle( async.done ); } - else ret = resolve_hostname( hostname, port, sa ); if (ret) {

1 0

Hans Leidekker : winhttp: Propagate errors from refill_buffer.
by Alexandre Julliard 23 Nov '18

23 Nov '18

Module: wine Branch: master Commit: c6251cbb12431a9788be0e56699d1363386ae602 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6251cbb12431a9788be0e56… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 23 11:35:27 2018 +0100 winhttp: Propagate errors from refill_buffer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38228 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 49 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 9817287..61af6ea 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1949,6 +1949,7 @@ static BOOL end_of_read_data( struct request *request ) static BOOL read_data( struct request *request, void *buffer, DWORD size, DWORD *read, BOOL async ) { int count, bytes_read = 0; + BOOL ret = TRUE; if (end_of_read_data( request )) goto done; @@ -1956,7 +1957,7 @@ static BOOL read_data( struct request *request, void *buffer, DWORD size, DWORD { if (!(count = get_available_data( request ))) { - if (!refill_buffer( request, async )) goto done; + if (!(ret = refill_buffer( request, async ))) goto done; if (!(count = get_available_data( request ))) goto done; } count = min( count, size ); @@ -1968,15 +1969,25 @@ static BOOL read_data( struct request *request, void *buffer, DWORD size, DWORD request->content_read += count; if (end_of_read_data( request )) goto done; } - if (request->read_chunked && !request->read_chunked_size) refill_buffer( request, async ); + if (request->read_chunked && !request->read_chunked_size) ret = refill_buffer( request, async ); done: TRACE( "retrieved %u bytes (%u/%u)\n", bytes_read, request->content_read, request->content_length ); + if (async) + { + if (ret) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, buffer, bytes_read ); + else + { + WINHTTP_ASYNC_RESULT result; + result.dwResult = API_READ_DATA; + result.dwError = GetLastError(); + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); + } + } - if (async) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, buffer, bytes_read ); - if (read) *read = bytes_read; + if (ret && read) *read = bytes_read; if (end_of_read_data( request )) finished_reading( request ); - return TRUE; + return ret; } /* read any content returned by the server so that the connection can be reused */ @@ -2781,7 +2792,7 @@ static BOOL receive_response( struct request *request, BOOL async ) } netconn_set_timeout( request->netconn, FALSE, request->receive_timeout ); - if (request->content_length) refill_buffer( request, FALSE ); + if (request->content_length) ret = refill_buffer( request, FALSE ); if (async) { @@ -2847,25 +2858,35 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) static BOOL query_data_available( struct request *request, DWORD *available, BOOL async ) { DWORD count = 0; + BOOL ret = TRUE; if (end_of_read_data( request )) goto done; count = get_available_data( request ); - if (!request->read_chunked && request->netconn) - count += netconn_query_data_available( request->netconn ); + if (!request->read_chunked && request->netconn) count += netconn_query_data_available( request->netconn ); if (!count) { - refill_buffer( request, async ); + if (!(ret = refill_buffer( request, async ))) goto done; count = get_available_data( request ); - if (!request->read_chunked && request->netconn) - count += netconn_query_data_available( request->netconn ); + if (!request->read_chunked && request->netconn) count += netconn_query_data_available( request->netconn ); } done: - if (async) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE, &count, sizeof(count) ); TRACE("%u bytes available\n", count); - if (available) *available = count; - return TRUE; + if (async) + { + if (ret) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE, &count, sizeof(count) ); + else + { + WINHTTP_ASYNC_RESULT result; + result.dwResult = API_QUERY_DATA_AVAILABLE; + result.dwError = GetLastError(); + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); + } + } + + if (ret && available) *available = count; + return ret; } static void task_query_data_available( struct task_header *task )

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
96
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 2018