wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Fabian Maurer : msvcr120: Add fesetenv stub.
by Alexandre Julliard 07 Feb '17

07 Feb '17

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

Lauri Kenttä : msvcrt/tests: Add tests for _creat.
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: cabf96512aefd1a10ee589d55e6aad5d16c98f6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cabf96512aefd1a10ee589d55… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Feb 7 17:59:54 2017 +0200 msvcrt/tests: Add tests for _creat. 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/tests/file.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 9e2beee..2c356ea 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -49,6 +49,8 @@ static HANDLE proc_handles[2]; static int (__cdecl *p_fopen_s)(FILE**, const char*, const char*); static int (__cdecl *p__wfopen_s)(FILE**, const wchar_t*, const wchar_t*); +static errno_t (__cdecl *p__get_fmode)(int*); +static errno_t (__cdecl *p__set_fmode)(int); static const char* get_base_name(const char *path) { @@ -71,6 +73,8 @@ static void init(void) p_fopen_s = (void*)GetProcAddress(hmod, "fopen_s"); p__wfopen_s = (void*)GetProcAddress(hmod, "_wfopen_s"); __pioinfo = (void*)GetProcAddress(hmod, "__pioinfo"); + p__get_fmode = (void*)GetProcAddress(hmod, "_get_fmode"); + p__set_fmode = (void*)GetProcAddress(hmod, "_set_fmode"); } static void test_filbuf( void ) @@ -2386,6 +2390,59 @@ static void test_close(void) DeleteFileA( "fdopen.tst" ); } +static void test__creat(void) +{ + int fd, pos, count, readonly, old_fmode = 0, have_fmode; + char buf[6], testdata[4] = {'a', '\n', 'b', '\n'}; + + have_fmode = p__get_fmode && p__set_fmode && !p__get_fmode(&old_fmode); + if (!have_fmode) + win_skip("_fmode can't be set, skipping mode tests\n"); + + if (have_fmode) + p__set_fmode(_O_TEXT); + fd = _creat("_creat.tst", 0); + ok(fd > 0, "_creat failed\n"); + _write(fd, testdata, 4); + if (have_fmode) { + pos = _tell(fd); + ok(pos == 6, "expected pos 6 (text mode), got %d\n", pos); + } + ok(_lseek(fd, SEEK_SET, 0) == 0, "_lseek failed\n"); + count = _read(fd, buf, 6); + ok(count == 4, "_read returned %d, expected 4\n", count); + count = count > 0 ? count > 4 ? 4 : count : 0; + ok(memcmp(buf, testdata, count) == 0, "_read returned wrong contents\n"); + _close(fd); + readonly = GetFileAttributesA("_creat.tst") & FILE_ATTRIBUTE_READONLY; + ok(readonly, "expected read-only file\n"); + SetFileAttributesA("_creat.tst", FILE_ATTRIBUTE_NORMAL); + DeleteFileA("_creat.tst"); + + if (have_fmode) + p__set_fmode(_O_BINARY); + fd = _creat("_creat.tst", _S_IREAD | _S_IWRITE); + ok(fd > 0, "_creat failed\n"); + _write(fd, testdata, 4); + if (have_fmode) { + pos = _tell(fd); + ok(pos == 4, "expected pos 4 (binary mode), got %d\n", pos); + } + ok(_lseek(fd, SEEK_SET, 0) == 0, "_lseek failed\n"); + count = _read(fd, buf, 6); + ok(count == 4, "_read returned %d, expected 4\n", count); + count = count > 0 ? count > 4 ? 4 : count : 0; + ok(memcmp(buf, testdata, count) == 0, "_read returned wrong contents\n"); + _close(fd); + readonly = GetFileAttributesA("_creat.tst") & FILE_ATTRIBUTE_READONLY; + ok(!readonly, "expected rw file\n"); + SetFileAttributesA("_creat.tst", FILE_ATTRIBUTE_NORMAL); + DeleteFileA("_creat.tst"); + + if (have_fmode) + p__set_fmode(old_fmode); +} + START_TEST(file) { int arg_c; @@ -2453,6 +2510,7 @@ START_TEST(file) test__open_osfhandle(); test_write_flush(); test_close(); + test__creat(); /* Wait for the (_P_NOWAIT) spawned processes to finish to make sure the report * file contains lines in the correct order

1 0

Lauri Kenttä : msvcrt: Fix _creat and _wcreat.
by Alexandre Julliard 07 Feb '17

07 Feb '17

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 07 Feb '17

07 Feb '17

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

Dmitry Timoshkov : user32: BUTTON_CalcLabelRect should use the button font.
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: e45b80088bc4bf6f048e267c09dc0ce83c1a3485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e45b80088bc4bf6f048e267c0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 6 14:23:41 2017 +0300 user32: BUTTON_CalcLabelRect should use the button font. Otherwise WM_SETTEXT handler gets wrong rectangle to erase an old text. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index e85e30d..cc70e37 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -598,15 +598,22 @@ static UINT BUTTON_CalcLabelRect(HWND hwnd, HDC hdc, RECT *rc) switch (style & (BS_ICON|BS_BITMAP)) { case BS_TEXT: + { + HFONT hFont, hPrevFont = 0; + if (!(text = get_button_text( hwnd ))) goto empty_rect; if (!text[0]) { HeapFree( GetProcessHeap(), 0, text ); goto empty_rect; } + + if ((hFont = get_button_font( hwnd ))) hPrevFont = SelectObject( hdc, hFont ); DrawTextW(hdc, text, -1, &r, dtStyle | DT_CALCRECT); + if (hPrevFont) SelectObject( hdc, hPrevFont ); HeapFree( GetProcessHeap(), 0, text ); break; + } case BS_ICON: if (!GetIconInfo((HICON)GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET ), &iconInfo))

1 0

Nikolay Sivov : user32/tests: Test to show that original font is not selected back after painting buttons.
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: a423f14a564c4983c876e77aa16cc6f06085a62f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a423f14a564c4983c876e77aa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 6 14:23:40 2017 +0300 user32/tests: Test to show that original font is not selected back after painting buttons. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c608c11..2d2f689 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5800,10 +5800,11 @@ static void test_button_messages(void) WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq, WmSetTextButtonSeq }, }; + LOGFONTA logfont = { 0 }; + HFONT zfont, hfont2; unsigned int i; HWND hwnd, parent; DWORD dlg_code; - HFONT zfont; /* selection with VK_SPACE should capture button window */ hwnd = CreateWindowExA(0, "button", "test", BS_CHECKBOX | WS_VISIBLE | WS_POPUP, @@ -5822,11 +5823,21 @@ static void test_button_messages(void) 100, 100, 200, 200, 0, 0, 0, NULL); ok(parent != 0, "Failed to create parent window\n"); + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = -12; + logfont.lfWeight = FW_NORMAL; + strcpy(logfont.lfFaceName, "Tahoma"); + + hfont2 = CreateFontIndirectA(&logfont); + ok(hfont2 != NULL, "Failed to create Tahoma font\n"); + for (i = 0; i < sizeof(button)/sizeof(button[0]); i++) { MSG msg; DWORD style, state; + HFONT prevfont; char desc[64]; + HDC hdc; trace("button style %08x\n", button[i].style); @@ -6001,15 +6012,35 @@ static void test_button_messages(void) ok_sequence(button[i].lbuttonup, desc, FALSE); flush_sequence(); - zfont = GetStockObject(SYSTEM_FONT); + zfont = GetStockObject(DEFAULT_GUI_FONT); SendMessageA(hwnd, WM_SETFONT, (WPARAM)zfont, TRUE); UpdateWindow(hwnd); sprintf(desc, "button[%i]: WM_SETFONT on a button", i); ok_sequence(button[i].setfont, desc, FALSE); + /* Test that original font is not selected back after painting */ + hdc = CreateCompatibleDC(0); + + prevfont = SelectObject(hdc, hfont2); + ok(prevfont == GetStockObject(SYSTEM_FONT), "Unexpected default font\n"); + SendMessageA(hwnd, WM_PRINTCLIENT, (WPARAM)hdc, 0); + todo_wine + ok(GetStockObject(SYSTEM_FONT) == GetCurrentObject(hdc, OBJ_FONT), "button[%u]: unexpected font selected after WM_PRINTCLIENT\n", i); + SelectObject(hdc, prevfont); + + prevfont = SelectObject(hdc, hfont2); + ok(prevfont == GetStockObject(SYSTEM_FONT), "Unexpected default font\n"); + SendMessageA(hwnd, WM_PAINT, (WPARAM)hdc, 0); + todo_wine + ok(GetStockObject(SYSTEM_FONT) == GetCurrentObject(hdc, OBJ_FONT), "button[%u]: unexpected font selected after WM_PAINT\n", i); + SelectObject(hdc, prevfont); + + DeleteDC(hdc); + DestroyWindow(hwnd); } + DeleteObject(hfont2); DestroyWindow(parent); }

1 0

Jacek Caban : winerror.h: Moved DXGI HRESULT defines to winerror.h and add a few missing ones.
by Alexandre Julliard 07 Feb '17

07 Feb '17

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 07 Feb '17

07 Feb '17

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

Bruno Jesus : winealsa.drv: Fix handling of system real time MIDI messages.
by Alexandre Julliard 07 Feb '17

07 Feb '17

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 : opengl32/tests: Fix leak in opengl test (valgrind).
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: 55023fc0370611ac3c20c41c1639f0c441614c62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55023fc0370611ac3c20c41c1… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Feb 6 21:03:24 2017 -0800 opengl32/tests: Fix leak in opengl test (valgrind). Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/tests/opengl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 7552d44..0593465 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -670,6 +670,9 @@ static void test_bitmap_rendering( BOOL use_dib ) glGetIntegerv( GL_VIEWPORT, viewport ); ok( viewport[0] == 0 && viewport[1] == 0 && viewport[2] == 12 && viewport[3] == 12, "wrong viewport %d,%d,%d,%d\n", viewport[0], viewport[1], viewport[2], viewport[3] ); + + wglDeleteContext(hglrc2); + wglDeleteContext(hglrc); } }

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
84
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 February 2017