February 2017 - Wine-Commits

Fabian Maurer : msvcr120: Add fesetenv stub.
by Alexandre Julliard Feb. 7, 2017

Feb. 7, 2017

Module: wine Branch: master Commit: 986a67ab37be340c8fb527de9aee3dcde8332c0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=986a67ab37be340c8fb527de9… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Feb 7 17:42:34 2017 +0100 msvcr120: Add fesetenv stub. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 9 +++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 3dc6b20..6cea910 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -92,7 +92,7 @@ @ stub fegetexceptflag @ stub fegetround @ stub feholdexcept -@ stub fesetenv +@ cdecl fesetenv(ptr) ucrtbase.fesetenv @ stub fesetexceptflag @ stub fesetround @ stub fetestexcept diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index fa9eef3..62481c0 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2151,7 +2151,7 @@ @ cdecl feof(ptr) MSVCRT_feof @ stub feraiseexcept @ cdecl ferror(ptr) MSVCRT_ferror -@ stub fesetenv +@ cdecl fesetenv(ptr) MSVCRT_fesetenv @ stub fesetexceptflag @ stub fesetround @ stub fetestexcept diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 1b6e5a8..a74a140 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1817,7 +1817,7 @@ @ cdecl feof(ptr) msvcr120.feof @ stub feraiseexcept @ cdecl ferror(ptr) msvcr120.ferror -@ stub fesetenv +@ cdecl fesetenv(ptr) msvcr120.fesetenv @ stub fesetexceptflag @ stub fesetround @ stub fetestexcept diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 55e2efc..db8e441 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1268,6 +1268,15 @@ void CDECL _fpreset(void) } /********************************************************************* + * fesetenv (MSVCR120.@) + */ +int CDECL MSVCRT_fesetenv(const MSVCRT_fenv_t *env) +{ + FIXME("(%p) stub\n", env); + return 0; +} + +/********************************************************************* * _isnan (MSVCRT.@) */ INT CDECL MSVCRT__isnan(double num) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 85f196b..7602698 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2293,7 +2293,7 @@ @ stub feholdexcept @ cdecl feof(ptr) MSVCRT_feof @ cdecl ferror(ptr) MSVCRT_ferror -@ stub fesetenv +@ cdecl fesetenv(ptr) MSVCRT_fesetenv @ stub fesetexceptflag @ stub fesetround @ stub fetestexcept

1 0

Bruno Jesus : winealsa.drv: Fix handling of system real time MIDI messages.
by Alexandre Julliard Feb. 7, 2017

Feb. 7, 2017

Module: wine Branch: master Commit: 53454ce9359f4ec485aa9411a0e9b14e3d1ed0fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=53454ce9359f4ec485aa9411a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jan 31 04:16:17 2017 -0200 winealsa.drv: Fix handling of system real time MIDI messages. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/midi.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 6fc75ee..6ef1976 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -909,10 +909,15 @@ static DWORD modData(WORD wDevID, DWORD dwParam) case 0x0B: /* Continue */ case 0x0C: /* Stop */ case 0x0E: /* Active Sensing. */ - /* FIXME: Is this function suitable for these purposes - (and also Song Select and Song Position Pointer) */ - snd_seq_ev_set_sysex(&event, 1, &evt); + { + snd_midi_event_t *midi_event; + + snd_midi_event_new(1, &midi_event); + snd_midi_event_init(midi_event); + snd_midi_event_encode_byte(midi_event, evt, &event); + snd_midi_event_free(midi_event); break; + } case 0x0F: /* Reset */ /* snd_seq_ev_set_sysex(&event, 1, &evt); this other way may be better */

1 0

Daniel Lehman : kernel32/tests: Don't call function in assert().
by Alexandre Julliard Feb. 7, 2017

Feb. 7, 2017

Module: wine Branch: master Commit: 4310ebcd6ace34fca2c4f09f2972c083761882b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4310ebcd6ace34fca2c4f09f2… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Feb 6 21:07:04 2017 -0800 kernel32/tests: Don't call function in assert(). Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 82faf3f..759234c 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -365,8 +365,8 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) #endif ok(wait_code == WAIT_OBJECT_0, "Timed out waiting for the debugger\n"); - assert(load_blackbox(childlog, &crash_blackbox, sizeof(crash_blackbox))); - assert(load_blackbox(dbglog, &dbg_blackbox, sizeof(dbg_blackbox))); + ok(load_blackbox(childlog, &crash_blackbox, sizeof(crash_blackbox)), "failed to open: %s\n", childlog); + ok(load_blackbox(dbglog, &dbg_blackbox, sizeof(dbg_blackbox)), "failed to open: %s\n", dbglog); ok(dbg_blackbox.argc == 6, "wrong debugger argument count: %d\n", dbg_blackbox.argc); ok(dbg_blackbox.pid == crash_blackbox.pid, "the child and debugged pids don't match: %d != %d\n", crash_blackbox.pid, dbg_blackbox.pid);

1 0

Huw Davies : user32/tests: Restore the mouse cursor to its original position.
by Alexandre Julliard Feb. 7, 2017

Feb. 7, 2017

Module: wine Branch: master Commit: 01112061c257cd77f6150dd1cde3468186e4e28c URL: http://source.winehq.org/git/wine.git/?a=commit;h=01112061c257cd77f6150dd1c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 7 10:26:23 2017 +0000 user32/tests: Restore the mouse cursor to its original position. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/menu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index a42bc1c..03454fe 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -2463,6 +2463,7 @@ static void test_menu_input(void) { HANDLE hThread, hWnd; DWORD tid; ATOM aclass; + POINT orig_pos; if (!pSendInput) { @@ -2507,6 +2508,8 @@ static void test_menu_input(void) { ShowWindow(hWnd, SW_SHOW); UpdateWindow(hWnd); + GetCursorPos(&orig_pos); + hThread = CreateThread(NULL, 0, test_menu_input_thread, hWnd, 0, &tid); while(1) { @@ -2514,6 +2517,7 @@ static void test_menu_input(void) { break; while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); } + SetCursorPos(orig_pos.x, orig_pos.y); DestroyWindow(hWnd); }

1 0

Lauri Kenttä : msvcrt: Fix _creat and _wcreat.
by Alexandre Julliard Feb. 7, 2017

Feb. 7, 2017

Module: wine Branch: master Commit: 9924f009ce0fb6975eba8cdcbe7de4a64a3dda9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9924f009ce0fb6975eba8cdcb… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Feb 7 17:59:53 2017 +0200 msvcrt: Fix _creat and _wcreat. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 24a6e2e..c31ce77 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2430,19 +2430,19 @@ int CDECL MSVCRT__wopen(const MSVCRT_wchar_t *path,int flags,...) /********************************************************************* * _creat (MSVCRT.@) */ -int CDECL MSVCRT__creat(const char *path, int flags) +int CDECL MSVCRT__creat(const char *path, int pmode) { - int usedFlags = (flags & MSVCRT__O_TEXT)| MSVCRT__O_CREAT| MSVCRT__O_WRONLY| MSVCRT__O_TRUNC; - return MSVCRT__open(path, usedFlags); + int flags = MSVCRT__O_CREAT | MSVCRT__O_TRUNC | MSVCRT__O_RDWR; + return MSVCRT__open(path, flags, pmode); } /********************************************************************* * _wcreat (MSVCRT.@) */ -int CDECL MSVCRT__wcreat(const MSVCRT_wchar_t *path, int flags) +int CDECL MSVCRT__wcreat(const MSVCRT_wchar_t *path, int pmode) { - int usedFlags = (flags & MSVCRT__O_TEXT)| MSVCRT__O_CREAT| MSVCRT__O_WRONLY| MSVCRT__O_TRUNC; - return MSVCRT__wopen(path, usedFlags); + int flags = MSVCRT__O_CREAT | MSVCRT__O_TRUNC | MSVCRT__O_RDWR; + return MSVCRT__wopen(path, flags, pmode); } /*********************************************************************

1 0

Dmitry Timoshkov : user32: Fix groupbox rectangle calculation in the button's WM_SETTEXT handler.
by Alexandre Julliard Feb. 7, 2017

Feb. 7, 2017

Module: wine Branch: master Commit: d639d3bba011bcae0134705bde5a47bf3934f166 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d639d3bba011bcae0134705bd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 6 14:23:42 2017 +0300 user32: Fix groupbox rectangle calculation in the button's WM_SETTEXT handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index cc70e37..e5cee12 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -394,6 +394,9 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, GetClientRect(hWnd, &client); rc = client; + /* FIXME: check other BS_* handlers */ + if (btn_type == BS_GROUPBOX) + InflateRect(&rc, -7, 1); /* GB_Paint does this */ BUTTON_CalcLabelRect(hWnd, hdc, &rc); /* Clip by client rect bounds */ if (rc.right > client.right) rc.right = client.right;

1 0

Jacek Caban : winerror.h: Moved DXGI HRESULT defines to winerror.h and add a few missing ones.
by Alexandre Julliard Feb. 7, 2017

Feb. 7, 2017

Module: wine Branch: master Commit: 7a2b07e2a666cd9ec23cbc20842fb1f15c4997d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a2b07e2a666cd9ec23cbc208… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 7 16:43:27 2017 +0100 winerror.h: Moved DXGI HRESULT defines to winerror.h and add a few missing ones. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dxgi.idl | 21 --------------------- include/winerror.h | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 21 deletions(-) diff --git a/include/dxgi.idl b/include/dxgi.idl index c7ba584..b35c891 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -23,28 +23,7 @@ import "dxgitype.h"; const UINT _FACDXGI = 0x87a; cpp_quote("#define MAKE_DXGI_STATUS(x) MAKE_HRESULT(0, _FACDXGI, x)") -cpp_quote("#define DXGI_STATUS_OCCLUDED MAKE_DXGI_STATUS(1)") -cpp_quote("#define DXGI_STATUS_CLIPPED MAKE_DXGI_STATUS(2)") -cpp_quote("#define DXGI_STATUS_NO_REDIRECTION MAKE_DXGI_STATUS(4)") -cpp_quote("#define DXGI_STATUS_NO_DESKTOP_ACCESS MAKE_DXGI_STATUS(5)") -cpp_quote("#define DXGI_STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE MAKE_DXGI_STATUS(6)") -cpp_quote("#define DXGI_STATUS_MODE_CHANGED MAKE_DXGI_STATUS(7)") -cpp_quote("#define DXGI_STATUS_MODE_CHANGE_IN_PROGRESS MAKE_DXGI_STATUS(8)") - cpp_quote("#define MAKE_DXGI_HRESULT(x) MAKE_HRESULT(1, _FACDXGI, x)") -cpp_quote("#define DXGI_ERROR_INVALID_CALL MAKE_DXGI_HRESULT(1)") -cpp_quote("#define DXGI_ERROR_NOT_FOUND MAKE_DXGI_HRESULT(2)") -cpp_quote("#define DXGI_ERROR_MORE_DATA MAKE_DXGI_HRESULT(3)") -cpp_quote("#define DXGI_ERROR_UNSUPPORTED MAKE_DXGI_HRESULT(4)") -cpp_quote("#define DXGI_ERROR_DEVICE_REMOVED MAKE_DXGI_HRESULT(5)") -cpp_quote("#define DXGI_ERROR_DEVICE_HUNG MAKE_DXGI_HRESULT(6)") -cpp_quote("#define DXGI_ERROR_DEVICE_RESET MAKE_DXGI_HRESULT(7)") -cpp_quote("#define DXGI_ERROR_WAS_STILL_DRAWING MAKE_DXGI_HRESULT(10)") -cpp_quote("#define DXGI_ERROR_FRAME_STATISTICS_DISJOINT MAKE_DXGI_HRESULT(11)") -cpp_quote("#define DXGI_ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE MAKE_DXGI_HRESULT(12)") -cpp_quote("#define DXGI_ERROR_DRIVER_INTERNAL_ERROR MAKE_DXGI_HRESULT(32)") -cpp_quote("#define DXGI_ERROR_NONEXCLUSIVE MAKE_DXGI_HRESULT(33)") -cpp_quote("#define DXGI_ERROR_NOT_CURRENTLY_AVAILABLE MAKE_DXGI_HRESULT(34)") cpp_quote("#if 0") typedef HANDLE HMONITOR; diff --git a/include/winerror.h b/include/winerror.h index 27b86b0..2c6ce20 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -3116,6 +3116,44 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define D2DERR_PRINT_FORMAT_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x8899002c) #define D2DERR_TOO_MANY_TRANSFORM_INPUTS _HRESULT_TYPEDEF_(0x8899002d) +#define DXGI_STATUS_OCCLUDED _HRESULT_TYPEDEF_(0x087a0001) +#define DXGI_STATUS_CLIPPED _HRESULT_TYPEDEF_(0x087a0002) +#define DXGI_STATUS_NO_REDIRECTION _HRESULT_TYPEDEF_(0x087a0004) +#define DXGI_STATUS_NO_DESKTOP_ACCESS _HRESULT_TYPEDEF_(0x087a0005) +#define DXGI_STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE _HRESULT_TYPEDEF_(0x087a0006) +#define DXGI_STATUS_MODE_CHANGED _HRESULT_TYPEDEF_(0x087a0007) +#define DXGI_STATUS_MODE_CHANGE_IN_PROGRESS _HRESULT_TYPEDEF_(0x087a0008) +#define DXGI_STATUS_UNOCCLUDED _HRESULT_TYPEDEF_(0x087a0009) +#define DXGI_STATUS_DDA_WAS_STILL_DRAWING _HRESULT_TYPEDEF_(0x087a000a) +#define DXGI_STATUS_PRESENT_REQUIRED _HRESULT_TYPEDEF_(0x087a002f) + +#define DXGI_ERROR_INVALID_CALL _HRESULT_TYPEDEF_(0x887a0001) +#define DXGI_ERROR_NOT_FOUND _HRESULT_TYPEDEF_(0x887a0002) +#define DXGI_ERROR_MORE_DATA _HRESULT_TYPEDEF_(0x887a0003) +#define DXGI_ERROR_UNSUPPORTED _HRESULT_TYPEDEF_(0x887a0004) +#define DXGI_ERROR_DEVICE_REMOVED _HRESULT_TYPEDEF_(0x887a0005) +#define DXGI_ERROR_DEVICE_HUNG _HRESULT_TYPEDEF_(0x887a0006) +#define DXGI_ERROR_DEVICE_RESET _HRESULT_TYPEDEF_(0x887a0007) +#define DXGI_ERROR_WAS_STILL_DRAWING _HRESULT_TYPEDEF_(0x887a000a) +#define DXGI_ERROR_FRAME_STATISTICS_DISJOINT _HRESULT_TYPEDEF_(0x887a000b) +#define DXGI_ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE _HRESULT_TYPEDEF_(0x887a000c) +#define DXGI_ERROR_DRIVER_INTERNAL_ERROR _HRESULT_TYPEDEF_(0x887a0020) +#define DXGI_ERROR_NONEXCLUSIVE _HRESULT_TYPEDEF_(0x887a0021) +#define DXGI_ERROR_NOT_CURRENTLY_AVAILABLE _HRESULT_TYPEDEF_(0x887a0022) +#define DXGI_ERROR_REMOTE_CLIENT_DISCONNECTED _HRESULT_TYPEDEF_(0x887a0023) +#define DXGI_ERROR_REMOTE_OUTOFMEMORY _HRESULT_TYPEDEF_(0x887a0024) +#define DXGI_ERROR_ACCESS_LOST _HRESULT_TYPEDEF_(0x887a0026) +#define DXGI_ERROR_WAIT_TIMEOUT _HRESULT_TYPEDEF_(0x887a0027) +#define DXGI_ERROR_SESSION_DISCONNECTED _HRESULT_TYPEDEF_(0x887a0028) +#define DXGI_ERROR_RESTRICT_TO_OUTPUT_STALE _HRESULT_TYPEDEF_(0x887a0029) +#define DXGI_ERROR_CANNOT_PROTECT_CONTENT _HRESULT_TYPEDEF_(0x887a002a) +#define DXGI_ERROR_ACCESS_DENIED _HRESULT_TYPEDEF_(0x887a002b) +#define DXGI_ERROR_NAME_ALREADY_EXISTS _HRESULT_TYPEDEF_(0x887a002c) +#define DXGI_ERROR_SDK_COMPONENT_MISSING _HRESULT_TYPEDEF_(0x887a002d) +#define DXGI_ERROR_NOT_CURRENT _HRESULT_TYPEDEF_(0x887a002e) +#define DXGI_ERROR_HW_PROTECTION_OUTOFMEMORY _HRESULT_TYPEDEF_(0x887a0030) +#define DXGI_ERROR_MODE_CHANGE_IN_PROGRESS _HRESULT_TYPEDEF_(0x887a0025) + #define ERROR_AUDITING_DISABLED _HRESULT_TYPEDEF_(0xC0090001) #define ERROR_ALL_SIDS_FILTERED _HRESULT_TYPEDEF_(0xC0090002)

1 0

Alistair Leslie-Hughes : include: Add comsvcs.idl.
by Alexandre Julliard Feb. 7, 2017

Feb. 7, 2017

Module: wine Branch: master Commit: 32b227dbc3d0955b30c81f760bd32e25d53e76b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32b227dbc3d0955b30c81f760… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jan 30 07:05:38 2017 +0000 include: Add comsvcs.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/comsvcs.idl | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 9f615cd..80fa362 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -27,6 +27,7 @@ IDL_SRCS = \ colinf.idl \ comcat.idl \ commoncontrols.idl \ + comsvcs.idl \ control.idl \ cor.idl \ cordebug.idl \ diff --git a/include/comsvcs.idl b/include/comsvcs.idl new file mode 100644 index 0000000..2c510f8 --- /dev/null +++ b/include/comsvcs.idl @@ -0,0 +1,99 @@ +/* + * Copyright (C) 2017 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +import "unknwn.idl"; +import "objidl.idl"; +import "oaidl.idl"; + +#ifndef __WIDL__ +#define threading(model) +#endif + +typedef DWORD_PTR INSTID; +typedef DWORD_PTR RESID; +typedef DWORD RESOURCERATING; +typedef DWORD_PTR RESTYPID; +typedef LPOLESTR SRESID; +typedef long TIMEINSECS; +typedef DWORD_PTR TRANSID; + +[ + uuid(2a005c00-a5de-11cf-9e66-00aa00a3f464), + version(1.0) +] +library COMSVCSLib +{ + [ + object, + hidden, + local, + uuid(bf6a1850-2b45-11cf-be10-00aa00a2fa25), + pointer_default(unique) + ] + interface IHolder : IUnknown + { + HRESULT AllocResource([in] const RESTYPID typeid, [out] RESID *resid); + HRESULT FreeResource([in] const RESID _resid); + HRESULT TrackResource([in] const RESID resid); + HRESULT TrackResourceS([in] const SRESID resid); + HRESULT UntrackResource([in] const RESID resid, [in] const BOOL value); + HRESULT UntrackResourceS([in] const SRESID resid, [in] const BOOL value); + HRESULT Close(void); + HRESULT RequestDestroyResource([in] const RESID resid); + }; + + [ + object, + hidden, + local, + uuid(208b3651-2b48-11cf-be10-00aa00a2fa25), + pointer_default(unique) + ] + interface IDispenserDriver : IUnknown + { + HRESULT CreateResource([in] const RESTYPID restypid, [out] RESID *resid, [out] TIMEINSECS *destroy); + HRESULT RateResource([in] const RESTYPID restypid, [in] const RESID resid, + [in] const BOOL requires, [out] RESOURCERATING *rating); + HRESULT EnlistResource([in] const RESID resid, [in] const TRANSID transid); + HRESULT ResetResource([in] const RESID resid); + HRESULT DestroyResource([in] const RESID resid); + HRESULT DestroyResourceS([in] const SRESID resid); + }; + + [ + object, + hidden, + local, + uuid(5cb31e10-2b5f-11cf-be10-00aa00a2fa25), + pointer_default(unique) + ] + interface IDispenserManager : IUnknown + { + HRESULT RegisterDispenser([in] IDispenserDriver *driver, [in] LPCOLESTR name, [out] IHolder **dispenser); + HRESULT GetContext([out] INSTID *id, [out] TRANSID *transid); + }; + + [ + uuid(ecabb0c0-7f19-11d2-978e-0000f8757e2a), + hidden, + threading(both) + ] + coclass DispenserManager + { + [default] interface IDispenserManager; + }; +};

1 0

Daniel Lehman : kernel32/tests: Don't call DeleteFile from assert().
by Alexandre Julliard Feb. 7, 2017

Feb. 7, 2017

Module: wine Branch: master Commit: d14456ceff621c95fe3201d51963f5c1d5e6d359 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d14456ceff621c95fe3201d51… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Feb 6 21:07:05 2017 -0800 kernel32/tests: Don't call DeleteFile from assert(). Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 12 ++++++------ dlls/kernel32/tests/process.c | 44 +++++++++++++++++++++--------------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 759234c..a85fe59 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -321,8 +321,8 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) TerminateProcess(info.hProcess, WAIT_TIMEOUT); WaitForSingleObject(info.hProcess, 5000); CloseHandle(info.hProcess); - assert(DeleteFileA(dbglog) != 0); - assert(DeleteFileA(childlog) != 0); + DeleteFileA(dbglog); + DeleteFileA(childlog); win_skip("Giving up on child process\n"); return; } @@ -357,8 +357,8 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) skip_crash_and_debug = broken(wait_code == WAIT_TIMEOUT); if (skip_crash_and_debug) { - assert(DeleteFileA(dbglog) != 0); - assert(DeleteFileA(childlog) != 0); + DeleteFileA(dbglog); + DeleteFileA(childlog); win_skip("Giving up on debugger\n"); return; } @@ -375,8 +375,8 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) ok(dbg_blackbox.nokill_rc, "DebugSetProcessKillOnExit(FALSE) failed err=%d\n", dbg_blackbox.nokill_err); ok(dbg_blackbox.detach_rc, "DebugActiveProcessStop(%d) failed err=%d\n", dbg_blackbox.pid, dbg_blackbox.detach_err); - assert(DeleteFileA(dbglog) != 0); - assert(DeleteFileA(childlog) != 0); + DeleteFileA(dbglog); + DeleteFileA(childlog); } static void crash_and_winedbg(HKEY hkey, const char* argv0) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index f66ab45..68d6b64 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -632,7 +632,7 @@ static void test_Startup(void) okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* not so simplistic now */ memset(&startup, 0, sizeof(startup)); @@ -670,7 +670,7 @@ static void test_Startup(void) okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* not so simplistic now */ memset(&startup, 0, sizeof(startup)); @@ -708,7 +708,7 @@ static void test_Startup(void) okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* not so simplistic now */ memset(&startup, 0, sizeof(startup)); @@ -746,7 +746,7 @@ static void test_Startup(void) okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* not so simplistic now */ memset(&startup, 0, sizeof(startup)); @@ -786,7 +786,7 @@ static void test_Startup(void) okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* not so simplistic now */ memset(&startup, 0, sizeof(startup)); @@ -824,7 +824,7 @@ static void test_Startup(void) okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* not so simplistic now */ memset(&startup, 0, sizeof(startup)); @@ -862,7 +862,7 @@ static void test_Startup(void) okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* TODO: test for A/W and W/A and W/W */ } @@ -894,7 +894,7 @@ static void test_CommandLine(void) okChildString("Arguments", "argvA5", NULL); okChildString("Arguments", "CommandLineA", buffer); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); @@ -917,7 +917,7 @@ static void test_CommandLine(void) okChildString("Arguments", "argvA7", NULL); okChildString("Arguments", "CommandLineA", buffer); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* Test for Bug1330 to show that XP doesn't change '/' to '\\' in argv[0]*/ get_file_name(resfile); @@ -933,7 +933,7 @@ static void test_CommandLine(void) sprintf(buffer, "./%s", exename); okChildString("Arguments", "argvA0", buffer); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); get_file_name(resfile); /* Use exename to avoid buffer containing things like 'C:' */ @@ -948,8 +948,8 @@ static void test_CommandLine(void) sprintf(buffer, ".\\%s", exename); okChildString("Arguments", "argvA0", buffer); release_memory(); - assert(DeleteFileA(resfile) != 0); - + DeleteFileA(resfile); + get_file_name(resfile); GetFullPathNameA(selfname, MAX_PATH, fullpath, &lpFilePart); assert ( lpFilePart != 0); @@ -969,7 +969,7 @@ static void test_CommandLine(void) else sprintf(buffer, "./%s", exename); okChildString("Arguments", "argvA0", buffer); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* Using AppName */ get_file_name(resfile); @@ -993,7 +993,7 @@ static void test_CommandLine(void) okChildString("Arguments", "CommandLineA", buffer2); okChildStringWA("Arguments", "CommandLineW", buffer2); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); if (0) /* Test crashes on NT-based Windows. */ { @@ -1088,7 +1088,7 @@ static void test_Directory(void) okChildIString("Misc", "CurrDirA", windir); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* search PATH for the exe if directory is NULL */ ok(CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); @@ -1301,7 +1301,7 @@ static void test_Environment(void) env = GetEnvironmentStringsA(); cmpEnvironment(env); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); @@ -1360,7 +1360,7 @@ static void test_Environment(void) HeapFree(GetProcessHeap(), 0, child_env); FreeEnvironmentStringsA(env); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); } static void test_SuspendFlag(void) @@ -1408,7 +1408,7 @@ static void test_SuspendFlag(void) okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); } static void test_DebuggingFlag(void) @@ -1470,7 +1470,7 @@ static void test_DebuggingFlag(void) okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); } static BOOL is_console(HANDLE h) @@ -1617,7 +1617,7 @@ static void test_Console(void) ok(sbiC.dwCursorPosition.Y == (sbi.dwCursorPosition.Y ^ 1), "Wrong cursor position\n"); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); ok(CreatePipe(&hParentIn, &hChildOut, NULL, 0), "Creating parent-input pipe\n"); ok(DuplicateHandle(GetCurrentProcess(), hChildOut, GetCurrentProcess(), @@ -1660,7 +1660,7 @@ static void test_Console(void) okChildString("StdHandle", "msg", msg); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); } static void test_ExitCode(void) @@ -1689,7 +1689,7 @@ static void test_ExitCode(void) okChildInt("ExitCode", "value", code); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); } static void test_OpenProcess(void)

1 0

Józef Kucia : wined3d: Allow passing compute states to device_invalidate_state().
by Alexandre Julliard Feb. 7, 2017

Feb. 7, 2017

Module: wine Branch: master Commit: 8ac7c1faf20208e2e71fac9e8e17c824fd1e8285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ac7c1faf20208e2e71fac9e8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 6 14:12:16 2017 +0100 wined3d: Allow passing compute states to device_invalidate_state(). 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/cs.c | 13 ++----------- dlls/wined3d/device.c | 16 +++++++--------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index d575159..422f3f1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -907,10 +907,7 @@ static void wined3d_cs_exec_set_constant_buffer(struct wined3d_cs *cs, const voi if (prev) InterlockedDecrement(&prev->resource.bind_count); - if (op->type != WINED3D_SHADER_TYPE_COMPUTE) - device_invalidate_state(cs->device, STATE_CONSTANT_BUFFER(op->type)); - else - device_invalidate_compute_state(cs->device, STATE_CONSTANT_BUFFER(op->type)); + device_invalidate_state(cs->device, STATE_CONSTANT_BUFFER(op->type)); } void wined3d_cs_emit_set_constant_buffer(struct wined3d_cs *cs, enum wined3d_shader_type type, @@ -1097,15 +1094,9 @@ static void wined3d_cs_exec_set_shader(struct wined3d_cs *cs, const void *data) const struct wined3d_cs_set_shader *op = data; cs->state.shader[op->type] = op->shader; + device_invalidate_state(cs->device, STATE_SHADER(op->type)); if (op->type != WINED3D_SHADER_TYPE_COMPUTE) - { - device_invalidate_state(cs->device, STATE_SHADER(op->type)); device_invalidate_state(cs->device, STATE_SHADER_RESOURCE_BINDING); - } - else - { - device_invalidate_compute_state(cs->device, STATE_SHADER(op->type)); - } } void wined3d_cs_emit_set_shader(struct wined3d_cs *cs, enum wined3d_shader_type type, struct wined3d_shader *shader) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 71bb929..03d4069 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5092,7 +5092,6 @@ err: return hr; } - void device_invalidate_state(const struct wined3d_device *device, DWORD state) { DWORD rep = device->StateTable[state].representative; @@ -5101,6 +5100,13 @@ void device_invalidate_state(const struct wined3d_device *device, DWORD state) BYTE shift; UINT i; + if (STATE_IS_COMPUTE(state)) + { + for (i = 0; i < device->context_count; ++i) + context_invalidate_compute_state(device->contexts[i], state); + return; + } + for (i = 0; i < device->context_count; ++i) { context = device->contexts[i]; @@ -5113,14 +5119,6 @@ void device_invalidate_state(const struct wined3d_device *device, DWORD state) } } -void device_invalidate_compute_state(const struct wined3d_device *device, DWORD state_id) -{ - unsigned int i; - - for (i = 0; i < device->context_count; ++i) - context_invalidate_compute_state(device->contexts[i], state_id); -} - LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL unicode, UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ca992b9..3a0de2a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1443,6 +1443,7 @@ DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) DECLSPEC_HIDDEN; #define STATE_COMPUTE_HIGHEST (STATE_COMPUTE_CONSTANT_BUFFER) #define STATE_HIGHEST (STATE_COMPUTE_CONSTANT_BUFFER) +#define STATE_IS_COMPUTE(a) ((a) >= STATE_COMPUTE_OFFSET && (a) <= STATE_COMPUTE_HIGHEST) #define STATE_COMPUTE_COUNT (STATE_COMPUTE_HIGHEST - STATE_COMPUTE_OFFSET + 1) #define STATE_SHADER(a) ((a) != WINED3D_SHADER_TYPE_COMPUTE ? STATE_GRAPHICS_SHADER(a) : STATE_COMPUTE_SHADER) @@ -2651,7 +2652,6 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN; void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; -void device_invalidate_compute_state(const struct wined3d_device *device, DWORD state_id) DECLSPEC_HIDDEN; void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN; static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD state)

1 0