wine-commits December 2016

wine-commits@winehq.org

2 participants
342 discussions

Matteo Bruni : wined3d: Recognize a couple of Haswell / Broadwell GPUs on macOS.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: e8caceda7059474499420ef940928ed2abf4e9ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8caceda7059474499420ef94… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 14 00:03:34 2016 +0200 wined3d: Recognize a couple of Haswell / Broadwell GPUs on macOS. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bdc3df38ed1129d6b0dd6a55446322cf64acc138) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6fe1cdb..364082d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2009,8 +2009,10 @@ cards_intel[] = /* Broadwell */ {"Iris Pro 6200", CARD_INTEL_IP6200}, {"Iris 6100", CARD_INTEL_IG6100}, + {"Iris(TM) Graphics 6100", CARD_INTEL_IG6100}, /* MacOS */ /* Haswell */ {"Haswell Mobile", CARD_INTEL_HWM}, + {"Iris OpenGL Engine", CARD_INTEL_HWM}, /* MacOS */ /* Ivybridge */ {"Ivybridge Server", CARD_INTEL_IVBS}, {"Ivybridge Mobile", CARD_INTEL_IVBM},

1 0

Bruno Jesus : xinput1_3: Prefer builtin DLL.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: ecba1f4c5fcef8f0bf854064af63398462f32eb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecba1f4c5fcef8f0bf854064a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Oct 29 23:13:25 2016 -0200 xinput1_3: Prefer builtin DLL. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4b09e848b8867683007f4c90ac589b43dfdc5707) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xinput1_3/xinput1_3_main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c index 63f725b..d5d6147 100644 --- a/dlls/xinput1_3/xinput1_3_main.c +++ b/dlls/xinput1_3/xinput1_3_main.c @@ -35,8 +35,6 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) { switch(reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(inst); break;

1 0

Austin English : ntoskrnl.exe: Add KeSetTimerEx stub.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: 628629e831953562e58573e98d916cf9d93c7a14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=628629e831953562e58573e98… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Nov 4 20:59:20 2016 -0500 ntoskrnl.exe: Add KeSetTimerEx stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9e443e95f291a7e96c48fe0907e742507e21ca4b) Conflicts: dlls/ntoskrnl.exe/ntoskrnl.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 871daa9..904d66a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2435,3 +2435,12 @@ NTSTATUS WINAPI IoAttachDevice(DEVICE_OBJECT *source, UNICODE_STRING *target, DE FIXME("(%p, %s, %p): stub\n", source, debugstr_us(target), attached); return STATUS_NOT_IMPLEMENTED; } + +/*********************************************************************** + * KeSetTimerEx (NTOSKRNL.EXE.@) + */ +BOOL WINAPI KeSetTimerEx( KTIMER *timer, LARGE_INTEGER duetime, LONG period, KDPC *dpc ) +{ + FIXME("stub: %p %s %u %p\n", timer, wine_dbgstr_longlong(duetime.QuadPart), period, dpc); + return TRUE; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index b684595..a02c8d0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -618,7 +618,7 @@ @ stub KeSetTargetProcessorDpc @ stub KeSetTimeIncrement @ stub KeSetTimer -@ stub KeSetTimerEx +@ stdcall KeSetTimerEx(ptr int64 long ptr) @ stub KeStackAttachProcess @ stub KeSynchronizeExecution @ stub KeTerminateThread

1 0

Austin English : ntoskrnl.exe: Add IoAttachDevice stub.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: 921409f712c0b306fe6a4976ec55e94d75be0beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=921409f712c0b306fe6a4976e… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jul 11 21:59:22 2016 -0500 ntoskrnl.exe: Add IoAttachDevice stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0e5fdf0e00c72bd9e6129823d6ee3c69a74378a8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6b0ea0c..871daa9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2426,3 +2426,12 @@ NTSTATUS WINAPI KeDelayExecutionThread(KPROCESSOR_MODE waitmode, BOOLEAN alertab FIXME("(%u, %u, %p): stub\n", waitmode, alertable, interval); return STATUS_NOT_IMPLEMENTED; } + +/*********************************************************************** + * IoAttachDevice (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoAttachDevice(DEVICE_OBJECT *source, UNICODE_STRING *target, DEVICE_OBJECT *attached) +{ + FIXME("(%p, %s, %p): stub\n", source, debugstr_us(target), attached); + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index b32c5e8..b684595 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -315,7 +315,7 @@ @ stdcall IoAllocateMdl(ptr long long long ptr) @ stdcall IoAllocateWorkItem(ptr) @ stub IoAssignResources -@ stub IoAttachDevice +@ stdcall IoAttachDevice(ptr ptr ptr) @ stub IoAttachDeviceByPointer @ stdcall IoAttachDeviceToDeviceStack(ptr ptr) @ stub IoAttachDeviceToDeviceStackSafe

1 0

Jacek Caban : vbscript: Call GetItemInfo() with original item name.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: a1f860a4d80d34f65deb2376cb56ff47096df2d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1f860a4d80d34f65deb2376c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 7 14:08:17 2016 +0100 vbscript: Call GetItemInfo() with original item name. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c46dbfb131958849ac5fa5eab5703ad404cd0c6e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/interp.c | 2 +- dlls/vbscript/tests/run.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index bc34860..02180d9 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -183,7 +183,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ if(!item->disp) { IUnknown *unk; - hres = IActiveScriptSite_GetItemInfo(ctx->script->site, name, SCRIPTINFO_IUNKNOWN, &unk, NULL); + hres = IActiveScriptSite_GetItemInfo(ctx->script->site, item->name, SCRIPTINFO_IUNKNOWN, &unk, NULL); if(FAILED(hres)) { WARN("GetItemInfo failed: %08x\n", hres); continue; diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index d8c5467..0209106 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -2126,6 +2126,12 @@ static void run_tests(void) CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + parse_script_af(0, "TEST.reportSuccess()"); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + SET_EXPECT(global_vbvar_d); SET_EXPECT(global_vbvar_i); parse_script_a("Option Explicit\nvbvar = 3");

1 0

Andrey Gusev : user32: Add support for WS_EX_RIGHT style.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: 7a483350069fef3c6e7125f446bebed9db3cfd1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a483350069fef3c6e7125f44… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Oct 20 16:53:00 2016 +0300 user32: Add support for WS_EX_RIGHT style. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 535f1de80db22e5ba76af5cb69ae61524224eb31) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/button.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 13fc746..0968f10 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -859,6 +859,7 @@ static void CB_Paint( HWND hwnd, HDC hDC, UINT action ) HFONT hFont; LONG state = get_button_state( hwnd ); LONG style = GetWindowLongW( hwnd, GWL_STYLE ); + LONG ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE ); HWND parent; HRGN hrgn; @@ -882,7 +883,7 @@ static void CB_Paint( HWND hwnd, HDC hDC, UINT action ) (WPARAM)hDC, (LPARAM)hwnd ); hrgn = set_control_clipping( hDC, &client ); - if (style & BS_LEFTTEXT) + if (style & BS_LEFTTEXT || ex_style & WS_EX_RIGHT) { /* magic +4 is what CTL3D expects */

1 0

Austin English : api-ms-win-core-rtlsupport-l1-1-0: Add missing forwards.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: 14a7ea3b199ee83803ff1322b06b2ba3cc371919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14a7ea3b199ee83803ff1322b… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Oct 19 01:09:25 2016 -0500 api-ms-win-core-rtlsupport-l1-1-0: Add missing forwards. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 80aee498f0082f5b346f30c4628348306b5cd7eb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-core-rtlsupport-l1-1-0.spec | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec b/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec index 69136d5..d2966f5 100644 --- a/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec +++ b/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec @@ -1,4 +1,15 @@ +@ cdecl -arch=arm,x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable @ stdcall -norelay RtlCaptureContext(ptr) ntdll.RtlCaptureContext @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace +@ stdcall RtlCompareMemory(ptr ptr long) ntdll.RtlCompareMemory +@ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) ntdll.RtlCopyMemory +@ cdecl -arch=arm,x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory +@ cdecl -arch=x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr wstr) ntdll.RtlInstallFunctionTableCallback +@ stdcall -arch=arm,x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry +@ stdcall RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader +@ stdcall -register RtlRaiseException(ptr) ntdll.RtlRaiseException +@ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext @ stdcall -register RtlUnwind(ptr ptr ptr ptr) ntdll.RtlUnwind +@ stdcall -arch=x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) ntdll.RtlUnwindEx +@ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind

1 0

Jacek Caban : msctf: Added Push/Pop context tests.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: 1eb046bc37a24584f69acf3f31cd1c4de0287d74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eb046bc37a24584f69acf3f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 27 18:35:35 2016 +0200 msctf: Added Push/Pop context tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bc645ca71a7e2575e9808d54b78a97f84f9ffe66) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 6cb08fe..2d0c6c0 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -73,6 +73,7 @@ static INT test_OnPushContext = SINK_UNEXPECTED; static INT test_OnPopContext = SINK_UNEXPECTED; static INT test_KEV_OnSetFocus = SINK_UNEXPECTED; static INT test_ACP_AdviseSink = SINK_UNEXPECTED; +static INT test_ACP_UnadviseSink = SINK_UNEXPECTED; static INT test_ACP_GetStatus = SINK_UNEXPECTED; static INT test_ACP_RequestLock = SINK_UNEXPECTED; static INT test_ACP_GetEndACP = SINK_UNEXPECTED; @@ -235,6 +236,9 @@ static HRESULT WINAPI TextStoreACP_AdviseSink(ITextStoreACP *iface, sink_fire_ok(&test_ACP_AdviseSink,"TextStoreACP_AdviseSink"); + if(ACPSink) + return S_OK; + hr = IUnknown_QueryInterface(punk, &IID_ITextStoreACPSink, (void**)&ACPSink); ok(SUCCEEDED(hr),"Unable to QueryInterface on sink\n"); @@ -248,7 +252,7 @@ static HRESULT WINAPI TextStoreACP_AdviseSink(ITextStoreACP *iface, static HRESULT WINAPI TextStoreACP_UnadviseSink(ITextStoreACP *iface, IUnknown *punk) { - trace("\n"); + sink_fire_ok(&test_ACP_UnadviseSink,"TextStoreACP_UnadviseSink"); return S_OK; } @@ -1413,7 +1417,7 @@ static void test_startSession(void) DWORD editCookie; ITfDocumentMgr *dmtest; ITfContext *cxt,*cxt2,*cxt3,*cxtTest; - ITextStoreACP *ts; + ITextStoreACP *ts = NULL; TfClientId cid2 = 0; ITfThreadMgrEx *tmex; @@ -1577,6 +1581,8 @@ static void test_startSession(void) ok(hr == S_FALSE, "ITfContext_GetDocumentMgr wrong rc %x\n",hr); ok(dmtest == NULL,"returned documentmgr should be null\n"); + ITfContext_Release(cxt2); + hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); ok(SUCCEEDED(hr),"GetTop Failed\n"); ok(cxtTest == cxt, "Wrong context on top\n"); @@ -1587,6 +1593,25 @@ static void test_startSession(void) ok(cxtTest == cxt, "Wrong context on base\n"); ITfContext_Release(cxtTest); + hr = ITfDocumentMgr_CreateContext(g_dm, cid, 0, (IUnknown*)ts, &cxt2, &editCookie); + ok(hr == S_OK,"CreateContext Failed\n"); + + test_OnPushContext = SINK_EXPECTED; + test_ACP_AdviseSink = SINK_EXPECTED; + hr = ITfDocumentMgr_Push(g_dm, cxt2); + ok(hr == S_OK,"Push Failed\n"); + sink_check_ok(&test_OnPushContext,"OnPushContext"); + sink_check_ok(&test_ACP_AdviseSink,"TextStoreACP_AdviseSink"); + + test_ACP_UnadviseSink = SINK_EXPECTED; + cnt = check_context_refcount(cxt2); + test_OnPopContext = SINK_EXPECTED; + hr = ITfDocumentMgr_Pop(g_dm, 0); + ok(hr == S_OK,"Pop Failed\n"); + ok(check_context_refcount(cxt2) < cnt, "Ref count did not decrease\n"); + sink_check_ok(&test_OnPopContext,"OnPopContext"); + sink_check_ok(&test_ACP_UnadviseSink,"TextStoreACP_AdviseSink"); + hr = ITfDocumentMgr_Pop(g_dm, 0); ok(FAILED(hr),"Pop Succeeded\n");

1 0

Jacek Caban : msctf: Don't call ITextStoreACP:: UnadviseSink in context destructor.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: 6a1ac3e31c43debc83d8689f9740a6565402e51a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a1ac3e31c43debc83d8689f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 27 18:35:24 2016 +0200 msctf: Don't call ITextStoreACP::UnadviseSink in context destructor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 79025d0e6af8189fd6c3360c5bd335954124c205) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msctf/context.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 5a45466..0def547 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -140,10 +140,7 @@ static void Context_Destructor(Context *This) TRACE("destroying %p\n", This); if (This->pITextStoreACP) - { - ITextStoreACP_UnadviseSink(This->pITextStoreACP, (IUnknown*)&This->ITextStoreACPSink_iface); ITextStoreACP_Release(This->pITextStoreACP); - } if (This->pITfContextOwnerCompositionSink) ITfContextOwnerCompositionSink_Release(This->pITfContextOwnerCompositionSink);

1 0

Alexandre Julliard : server: Avoid some compiler warnings when EWOULDBLOCK == EAGAIN.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: 0befffb5d9e884d9793d9cb671941aff14415d97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0befffb5d9e884d9793d9cb67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 30 19:08:23 2016 +0900 server: Avoid some compiler warnings when EWOULDBLOCK == EAGAIN. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 438dae524d9410f571f7fe5cc335fb74fec8d2bb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- server/request.c | 6 +++--- server/sock.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/request.c b/server/request.c index f78026a..e7eb89f 100644 --- a/server/request.c +++ b/server/request.c @@ -184,7 +184,7 @@ void write_reply( struct thread *thread ) } if (errno == EPIPE) kill_thread( thread, 0 ); /* normal death */ - else if (errno != EWOULDBLOCK && errno != EAGAIN) + else if (errno != EWOULDBLOCK && (EWOULDBLOCK == EAGAIN || errno != EAGAIN)) fatal_protocol_error( thread, "reply write: %s\n", strerror( errno )); } @@ -311,7 +311,7 @@ error: kill_thread( thread, 0 ); else if (ret > 0) fatal_protocol_error( thread, "partial read %d\n", ret ); - else if (errno != EWOULDBLOCK && errno != EAGAIN) + else if (errno != EWOULDBLOCK && (EWOULDBLOCK == EAGAIN || errno != EAGAIN)) fatal_protocol_error( thread, "read: %s\n", strerror( errno )); } @@ -392,7 +392,7 @@ int receive_fd( struct process *process ) } else { - if (errno != EWOULDBLOCK && errno != EAGAIN) + if (errno != EWOULDBLOCK && (EWOULDBLOCK == EAGAIN || errno != EAGAIN)) { fprintf( stderr, "Protocol error: process %04x: ", process->id ); perror( "recvmsg" ); diff --git a/server/sock.c b/server/sock.c index 1767dea..a35a115 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1071,8 +1071,8 @@ static void ifchange_poll_event( struct fd *fd, int event ) r = recv( get_unix_fd(fd), buffer, sizeof(buffer), MSG_DONTWAIT ); if (r < 0) { - if (errno == EWOULDBLOCK || errno == EAGAIN) - return; /* retry when poll() says the socket is ready */ + if (errno == EWOULDBLOCK || (EWOULDBLOCK != EAGAIN && errno == EAGAIN)) + return; /* retry when poll() says the socket is ready */ status = sock_get_ntstatus( errno ); } else if (r > 0)

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
35
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 December 2016