September 2019 - Wine-Commits

Rémi Bernon : winex11.drv: Only call XWarpPointer if we can get exclusive pointer grab.
by Alexandre Julliard Sept. 6, 2019

Sept. 6, 2019

Module: wine Branch: master Commit: 74efb3e872aebf57a42d62b52e149ae26f320c9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=74efb3e872aebf57a42d62b5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 30 12:18:03 2019 +0200 winex11.drv: Only call XWarpPointer if we can get exclusive pointer grab. XWarpPointer will always succeed, regardless of grabs, so if the pointer is already grabbed, by some other application, we should not ask to warp it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index fff6fc7..8d1dc5e 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1467,8 +1467,21 @@ BOOL CDECL X11DRV_SetCursorPos( INT x, INT y ) return FALSE; } + if (!clipping_cursor && + XGrabPointer( data->display, root_window, False, + PointerMotionMask | ButtonPressMask | ButtonReleaseMask, + GrabModeAsync, GrabModeAsync, root_window, None, CurrentTime ) != GrabSuccess) + { + WARN( "refusing to warp pointer to %u, %u without exclusive grab\n", pos.x, pos.y ); + return FALSE; + } + XWarpPointer( data->display, root_window, root_window, 0, 0, 0, 0, pos.x, pos.y ); data->warp_serial = NextRequest( data->display ); + + if (!clipping_cursor) + XUngrabPointer( data->display, CurrentTime ); + XNoOp( data->display ); XFlush( data->display ); /* avoids bad mouse lag in games that do their own mouse warping */ TRACE( "warped to %d,%d serial %lu\n", x, y, data->warp_serial );

1 0

Alistair Leslie-Hughes : http.sys: Allocate enough memory including the NULL. (Coverity).
by Alexandre Julliard Sept. 6, 2019

Sept. 6, 2019

Module: wine Branch: master Commit: 446bc4689f7bf37c6085c8102e2606cc631cecef URL: https://source.winehq.org/git/wine.git/?a=commit;h=446bc4689f7bf37c6085c810… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 6 02:16:33 2019 +0000 http.sys: Allocate enough memory including the NULL. (Coverity). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index b2400a2..b5d5a21 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -1064,7 +1064,7 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) if (!(addr.sin_port = htons(strtol(strchr(params->url + 7, ':') + 1, &endptr, 10))) || *endptr != '/') return STATUS_INVALID_PARAMETER; - if (!(url = heap_alloc(strlen(params->url)))) + if (!(url = heap_alloc(strlen(params->url)+1))) return STATUS_NO_MEMORY; strcpy(url, params->url);

1 0

Zebediah Figura : strmbase: Store the filter as a strmbase_filter pointer in the BasePin structure.
by Alexandre Julliard Sept. 6, 2019

Sept. 6, 2019

Module: wine Branch: master Commit: 28a511554c7b81cfc766d7f91edae0785b69e41f URL: https://source.winehq.org/git/wine.git/?a=commit;h=28a511554c7b81cfc766d7f9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 5 19:02:15 2019 -0500 strmbase: Store the filter as a strmbase_filter pointer in the BasePin structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 22 ++++---- dlls/qcap/avimux.c | 115 ++++++++++++++-------------------------- dlls/qcap/smartteefilter.c | 44 +++++++-------- dlls/qcap/vfwcapture.c | 8 +-- dlls/quartz/avisplit.c | 12 ++--- dlls/quartz/filesource.c | 9 +--- dlls/quartz/mpegsplit.c | 12 ++--- dlls/quartz/parser.c | 32 +++++------ dlls/quartz/parser.h | 3 +- dlls/quartz/pin.c | 43 ++++++--------- dlls/quartz/pin.h | 4 +- dlls/quartz/waveparser.c | 15 ++---- dlls/strmbase/pin.c | 82 +++++++++++++--------------- dlls/strmbase/renderer.c | 10 +--- dlls/strmbase/transform.c | 18 ++----- dlls/winegstreamer/gstdemux.c | 59 +++++++++++---------- dlls/wineqtdecoder/qtsplitter.c | 73 +++++++++---------------- include/wine/strmbase.h | 29 +++++----- 18 files changed, 232 insertions(+), 358 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=28a511554c7b81cfc766…

1 0

Zebediah Figura : qcap/avimux: Use strmbase pin methods directly.
by Alexandre Julliard Sept. 6, 2019

Sept. 6, 2019

Module: wine Branch: master Commit: 85e559fadb4b5c67438bb0979427f8b48df75ec3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85e559fadb4b5c67438bb097… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 5 19:02:14 2019 -0500 qcap/avimux: Use strmbase pin methods directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 260 ++++++----------------------------------------------- 1 file changed, 26 insertions(+), 234 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=85e559fadb4b5c67438b…

1 0

Zebediah Figura : wineqtdecoder: Use strmbase_source_init().
by Alexandre Julliard Sept. 6, 2019

Sept. 6, 2019

Module: wine Branch: master Commit: 2732d74d99d53cbdf60adf0d5e89680dff1f5b03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2732d74d99d53cbdf60adf0d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 5 19:02:12 2019 -0500 wineqtdecoder: Use strmbase_source_init(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 48 ++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index e7597e1..3931452 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -790,10 +790,8 @@ static void free_source_pin(QTOutPin *pin) LeaveCriticalSection(pin->pin.pin.pCritSec); DeleteMediaType(pin->pmt); - FreeMediaType(&pin->pin.pin.mtCurrent); - if (pin->pin.pAllocator) - IMemAllocator_Release(pin->pin.pAllocator); - CoTaskMemFree(pin); + strmbase_source_cleanup(&pin->pin); + heap_free(pin); } /* @@ -1446,38 +1444,28 @@ static const OutputQueueFuncTable output_OutputQueueFuncTable = { OutputQueueImpl_ThreadProc }; -static HRESULT QT_AddPin(QTSplitter *This, const PIN_INFO *piOutput, const AM_MEDIA_TYPE *amt, BOOL video) +static HRESULT QT_AddPin(QTSplitter *filter, const PIN_INFO *pin_info, + const AM_MEDIA_TYPE *mt, BOOL video) { - HRESULT hr; - IPin **target; + QTOutPin *pin; + + if (!(pin = heap_alloc_zero(sizeof(*pin)))) + return E_OUTOFMEMORY; if (video) - target = (IPin**)&This->pVideo_Pin; + filter->pVideo_Pin = pin; else - target = (IPin**)&This->pAudio_Pin; - - if (*target != NULL) - { - FIXME("We already have a %s pin\n",(video)?"video":"audio"); - return E_FAIL; - } + filter->pAudio_Pin = pin; - hr = BaseOutputPin_Construct(&QT_OutputPin_Vtbl, sizeof(QTOutPin), piOutput, &output_BaseOutputFuncTable, &This->filter.csFilter, (IPin**)target); - if (SUCCEEDED(hr)) - { - QTOutPin *pin = (QTOutPin*)*target; - pin->pmt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); - CopyMediaType(pin->pmt, amt); - pin->pin.pin.pinInfo.pFilter = (LPVOID)This; - pin->IQualityControl_iface.lpVtbl = &QTOutPin_QualityControl_Vtbl; - - BaseFilterImpl_IncrementPinVersion(&This->filter); + strmbase_source_init(&pin->pin, &QT_OutputPin_Vtbl, piOutput, + &output_BaseOutputFuncTable, &filter->filter.csFilter); + pin->pmt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); + CopyMediaType(pin->pmt, mt); + pin->IQualityControl_iface.lpVtbl = &QTOutPin_QualityControl_Vtbl; + BaseFilterImpl_IncrementPinVersion(&filter->filter); - hr = OutputQueue_Construct(&pin->pin, TRUE, TRUE, 5, FALSE, THREAD_PRIORITY_NORMAL, &output_OutputQueueFuncTable, &pin->queue); - } - else - ERR("Failed with error %x\n", hr); - return hr; + return OutputQueue_Construct(&pin->pin, TRUE, TRUE, 5, FALSE, + THREAD_PRIORITY_NORMAL, &output_OutputQueueFuncTable, &pin->queue); } static HRESULT WINAPI QTSplitter_ChangeStart(IMediaSeeking *iface)

1 0

Rémi Bernon : winex11.drv: Do not set clipping_cursor when clip window map state changes.
by Alexandre Julliard Sept. 6, 2019

Sept. 6, 2019

Module: wine Branch: master Commit: 6f9e788fc0b6e83128559c775f25035c345abb12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f9e788fc0b6e83128559c77… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 30 12:18:01 2019 +0200 winex11.drv: Do not set clipping_cursor when clip window map state changes. This flag should only indicate a successful call to XGrabPointer. If not then we could assume we have ownership of the pointer when we don't. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 59ab4ce..f79f40c 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -984,11 +984,8 @@ static BOOL X11DRV_MapNotify( HWND hwnd, XEvent *event ) { struct x11drv_win_data *data; - if (event->xany.window == x11drv_thread_data()->clip_window) - { - clipping_cursor = TRUE; - return TRUE; - } + if (event->xany.window == x11drv_thread_data()->clip_window) return TRUE; + if (!(data = get_win_data( hwnd ))) return FALSE; if (!data->managed && !data->embedded && data->mapped) @@ -1007,8 +1004,6 @@ static BOOL X11DRV_MapNotify( HWND hwnd, XEvent *event ) */ static BOOL X11DRV_UnmapNotify( HWND hwnd, XEvent *event ) { - if (event->xany.window == x11drv_thread_data()->clip_window) - clipping_cursor = FALSE; return TRUE; }

1 0

Rémi Bernon : winex11.drv: Only grab or warp the cursor when keyboard isn't grabbed.
by Alexandre Julliard Sept. 6, 2019

Sept. 6, 2019

Module: wine Branch: master Commit: 54f8077c41f715cfcf9c2bc016d964b720911326 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54f8077c41f715cfcf9c2bc0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 30 12:17:59 2019 +0200 winex11.drv: Only grab or warp the cursor when keyboard isn't grabbed. When the window manager has taken a keyboard grab, it may be going to move the window itself, so the application should not move the cursor at the same time. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 9 +++++++++ dlls/winex11.drv/mouse.c | 12 ++++++++++++ dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 22 insertions(+) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index ff4cbb2..447aa50 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -155,6 +155,9 @@ static const char * event_names[MAX_EVENT_HANDLERS] = "SelectionNotify", "ColormapNotify", "ClientMessage", "MappingNotify", "GenericEvent" }; +/* is someone else grabbing the keyboard, for example the WM, when manipulating the window */ +BOOL keyboard_grabbed = FALSE; + int xinput2_opcode = 0; /* return the name of an X event */ @@ -778,10 +781,13 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev ) WARN( "unexpected FocusIn event with NotifyGrab mode\n" ); break; case NotifyWhileGrabbed: + keyboard_grabbed = TRUE; break; case NotifyNormal: + keyboard_grabbed = FALSE; break; case NotifyUngrab: + keyboard_grabbed = FALSE; return TRUE; /* ignore wm specific NotifyUngrab / NotifyGrab events w.r.t focus */ } @@ -875,10 +881,13 @@ static BOOL X11DRV_FocusOut( HWND hwnd, XEvent *xev ) WARN( "unexpected FocusOut event with NotifyUngrab mode\n" ); break; case NotifyNormal: + keyboard_grabbed = FALSE; break; case NotifyWhileGrabbed: + keyboard_grabbed = TRUE; break; case NotifyGrab: + keyboard_grabbed = TRUE; return TRUE; /* ignore wm specific NotifyUngrab / NotifyGrab events w.r.t focus */ } diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index f737a30..a268cd9 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -392,6 +392,12 @@ static BOOL grab_clipping_window( const RECT *clip ) GetModuleHandleW(0), NULL ))) return TRUE; + if (keyboard_grabbed) + { + WARN( "refusing to clip to %s\n", wine_dbgstr_rect(clip) ); + return FALSE; + } + /* enable XInput2 unless we are already clipping */ if (!data->clip_hwnd) enable_xinput2(); @@ -1430,6 +1436,12 @@ BOOL CDECL X11DRV_SetCursorPos( INT x, INT y ) struct x11drv_thread_data *data = x11drv_init_thread_data(); POINT pos = virtual_screen_to_root( x, y ); + if (keyboard_grabbed) + { + WARN( "refusing to warp to %u, %u\n", pos.x, pos.y ); + return FALSE; + } + XWarpPointer( data->display, root_window, root_window, 0, 0, 0, 0, pos.x, pos.y ); data->warp_serial = NextRequest( data->display ); XNoOp( data->display ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 0d3695b..8418cae 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -382,6 +382,7 @@ extern Colormap default_colormap DECLSPEC_HIDDEN; extern XPixmapFormatValues **pixmap_formats DECLSPEC_HIDDEN; extern Window root_window DECLSPEC_HIDDEN; extern BOOL clipping_cursor DECLSPEC_HIDDEN; +extern BOOL keyboard_grabbed DECLSPEC_HIDDEN; extern unsigned int screen_bpp DECLSPEC_HIDDEN; extern BOOL use_xkb DECLSPEC_HIDDEN; extern BOOL usexrandr DECLSPEC_HIDDEN;

1 0

Rémi Bernon : winex11.drv: Do not react to keyboard grab focus events.
by Alexandre Julliard Sept. 6, 2019

Sept. 6, 2019

Module: wine Branch: master Commit: 4b81771b00c2f60bb4cd4c9cfedb1a77a59213e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b81771b00c2f60bb4cd4c9c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 30 12:17:58 2019 +0200 winex11.drv: Do not react to keyboard grab focus events. Several window managers are sending FocusOut with NotifyGrab mode then FocusOut with NotifyWhileGrabbed mode when a window focus is lost, as a consequence of grabbing the keyboard input before changing window focus. This is the case during alt-tab, but keyboard can also be grabbed when bringing activity view or clicking on the title bar. In this cases NotifyWhileGrabbed events aren't sent until the window really loses foreground. In the same manner, when focus is restored, they usually send FocusIn with NotifyWhileGrabbed mode followed by FocusIn with NotifyUngrab mode when the keyboard grab is released. When bringing activity view back and forth, or clicking on the title bar, only NotifyUngrab event will be sent. In order to be consistent across WM and to help simplifying focus handling, just ignore focus events related to keyboard grabs. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index edeae7c..ff4cbb2 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -772,6 +772,19 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev ) if (event->detail == NotifyPointer) return FALSE; if (hwnd == GetDesktopWindow()) return FALSE; + switch (event->mode) + { + case NotifyGrab: + WARN( "unexpected FocusIn event with NotifyGrab mode\n" ); + break; + case NotifyWhileGrabbed: + break; + case NotifyNormal: + break; + case NotifyUngrab: + return TRUE; /* ignore wm specific NotifyUngrab / NotifyGrab events w.r.t focus */ + } + if ((xic = X11DRV_get_ic( hwnd ))) XSetICFocus( xic ); if (use_take_focus) { @@ -855,6 +868,20 @@ static BOOL X11DRV_FocusOut( HWND hwnd, XEvent *xev ) return TRUE; } if (!hwnd) return FALSE; + + switch (event->mode) + { + case NotifyUngrab: + WARN( "unexpected FocusOut event with NotifyUngrab mode\n" ); + break; + case NotifyNormal: + break; + case NotifyWhileGrabbed: + break; + case NotifyGrab: + return TRUE; /* ignore wm specific NotifyUngrab / NotifyGrab events w.r.t focus */ + } + focus_out( event->display, hwnd ); return TRUE; }

1 0

Dmitry Timoshkov : localspl: Unload monitor in DeleteMonitor.
by Alexandre Julliard Sept. 6, 2019

Sept. 6, 2019

Module: wine Branch: master Commit: db4d01e191484729743839f9e2640cad5fef57fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=db4d01e191484729743839f9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 6 12:01:05 2019 +0800 localspl: Unload monitor in DeleteMonitor. Some print monitors are very sensitive to loads/unloads being done in a quick succession like AddMonitor() does, and that even leads to crashes because the monitor I have here creates a thread on load and when the thread starts - the monitor dll is already unloaded. A solution to this is moving the monitor unloading to DeleteMonitor. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/provider.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 54bd959..def3215 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1560,10 +1560,7 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) res = FALSE; } else - { - monitor_unload(pm); SetLastError(ERROR_SUCCESS); /* Monitor installer depends on this */ - } } RegCloseKey(hentry); @@ -1857,6 +1854,7 @@ static BOOL WINAPI fpConfigurePort(LPWSTR pName, HWND hWnd, LPWSTR pPortName) static BOOL WINAPI fpDeleteMonitor(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMonitorName) { + monitor_t *pm; HKEY hroot = NULL; LONG lres; @@ -1877,6 +1875,18 @@ static BOOL WINAPI fpDeleteMonitor(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMo return FALSE; } + /* Unload the monitor if it's loaded */ + EnterCriticalSection(&monitor_handles_cs); + LIST_FOR_EACH_ENTRY(pm, &monitor_handles, monitor_t, entry) + { + if (pm->name && !lstrcmpW(pMonitorName, pm->name)) + { + monitor_unload(pm); + break; + } + } + LeaveCriticalSection(&monitor_handles_cs); + if(RegCreateKeyW(HKEY_LOCAL_MACHINE, monitorsW, &hroot) != ERROR_SUCCESS) { ERR("unable to create key %s\n", debugstr_w(monitorsW)); return FALSE;

1 0

Alistair Leslie-Hughes : httpapi/tests: Assign to correct type (Coverity).
by Alexandre Julliard Sept. 6, 2019

Sept. 6, 2019

Module: wine Branch: master Commit: 5c17a0b07c471fada324b414b5a0b963acb14392 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c17a0b07c471fada324b414… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 6 02:16:32 2019 +0000 httpapi/tests: Assign to correct type (Coverity). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/tests/httpapi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index ff5884d..5da7101 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -74,7 +74,7 @@ static const char simple_req[] = "User-Agent: WINE\r\n" "\r\n"; -static int create_client_socket(void) +static SOCKET create_client_socket(void) { struct sockaddr_in sockaddr = { @@ -82,7 +82,7 @@ static int create_client_socket(void) .sin_port = htons(50000), .sin_addr.S_un.S_addr = inet_addr("127.0.0.1"), }; - int s = socket(AF_INET, SOCK_STREAM, 0), ret; + SOCKET s = socket(AF_INET, SOCK_STREAM, 0), ret; ret = connect(s, (struct sockaddr *)&sockaddr, sizeof(sockaddr)); ok(!ret, "Failed to connect socket, error %u.\n", GetLastError()); return s;

1 0