April 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : makefiles: Stop installing wine/unicode.h.
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: 0ffb1535517301d28c7c004eac639a9a0cc26c00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ffb1535517301d28c7c004e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 12 15:30:45 2019 +0200 makefiles: Stop installing wine/unicode.h. Third party code should be using exported C runtime APIs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 - tools/make_makefiles | 1 - 2 files changed, 2 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index c478c34..74198af 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -683,7 +683,6 @@ SOURCES = \ wine/itss.idl \ wine/library.h \ wine/svcctl.idl \ - wine/unicode.h \ wine/winedxgi.idl \ winerror.h \ winevt.h \ diff --git a/tools/make_makefiles b/tools/make_makefiles index 3936310..111bc8f 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -42,7 +42,6 @@ my %exported_wine_headers = ( "wine/debug.h" => 1, "wine/exception.h" => 1, "wine/library.h" => 1, - "wine/unicode.h" => 1, "wine/itss.idl" => 1, "wine/svcctl.idl" => 1, );

1 0

Zebediah Figura : qcap/tests: Remove some unnecessary workarounds.
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: 5f71a3f125343c9e4f21ef192668eb4da455d20a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f71a3f125343c9e4f21ef19… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 12 00:20:51 2019 -0500 qcap/tests: Remove some unnecessary workarounds. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 42 +++++++++++++--------------------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index f62a88f..0c79ea7 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -1,5 +1,5 @@ /* - * SmartTeeFilter tests + * Smart tee filter unit tests * * Copyright 2015 Damjan Jovanovic * @@ -18,18 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" #define COBJMACROS -#include <dshow.h> -#include <guiddef.h> -#include <devguid.h> -#include <stdio.h> - -#include "wine/strmbase.h" +#include "dshow.h" #include "wine/test.h" static HANDLE event; @@ -2022,25 +2012,19 @@ end: START_TEST(smartteefilter) { - if (SUCCEEDED(CoInitialize(NULL))) - { - event = CreateEventW(NULL, FALSE, FALSE, NULL); - if (event) { - test_smart_tee_filter_aggregation(); - test_smart_tee_filter(); + CoInitialize(NULL); - test_audio_smart_tee_filter_auto_insertion(test_audio_preview); - test_audio_smart_tee_filter_auto_insertion(test_audio_capture); + event = CreateEventW(NULL, FALSE, FALSE, NULL); - test_video_smart_tee_filter_auto_insertion(test_video_preview); - test_video_smart_tee_filter_auto_insertion(test_video_capture); + test_smart_tee_filter_aggregation(); + test_smart_tee_filter(); - CloseHandle(event); - } else - skip("CreateEvent failed, error=%u\n", GetLastError()); + test_audio_smart_tee_filter_auto_insertion(test_audio_preview); + test_audio_smart_tee_filter_auto_insertion(test_audio_capture); - CoUninitialize(); - } - else - skip("CoInitialize failed\n"); + test_video_smart_tee_filter_auto_insertion(test_video_preview); + test_video_smart_tee_filter_auto_insertion(test_video_capture); + + CloseHandle(event); + CoUninitialize(); }

1 0

Zhiyi Zhang : ntdll/tests: Test readonly file access.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: b193e6a787aa7d746738f8118967f6d1df719c33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b193e6a787aa7d746738f811… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 9 23:53:53 2019 +0800 ntdll/tests: Test readonly file access. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index ce1619e..8e54dbb 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4763,6 +4763,74 @@ static void test_flush_buffers_file(void) DeleteFileA(buffer); } +static void test_file_readonly_access(void) +{ + static const DWORD default_sharing = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; + static const WCHAR fooW[] = {'f', 'o', 'o', 0}; + WCHAR path[MAX_PATH]; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + IO_STATUS_BLOCK io; + HANDLE handle; + NTSTATUS status; + DWORD ret; + + /* Set up */ + GetTempPathW(MAX_PATH, path); + GetTempFileNameW(path, fooW, 0, path); + DeleteFileW(path); + pRtlDosPathNameToNtPathName_U(path, &nameW, NULL, NULL); + + attr.Length = sizeof(attr); + attr.RootDirectory = NULL; + attr.ObjectName = &nameW; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + status = pNtCreateFile(&handle, FILE_GENERIC_WRITE, &attr, &io, NULL, FILE_ATTRIBUTE_READONLY, default_sharing, + FILE_CREATE, 0, NULL, 0); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x.\n", status); + CloseHandle(handle); + + /* NtCreateFile FILE_GENERIC_WRITE */ + status = pNtCreateFile(&handle, FILE_GENERIC_WRITE, &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, default_sharing, + FILE_OPEN, FILE_NON_DIRECTORY_FILE, NULL, 0); + ok(status == STATUS_ACCESS_DENIED, "expected STATUS_ACCESS_DENIED, got %#x.\n", status); + + /* NtCreateFile DELETE without FILE_DELETE_ON_CLOSE */ + status = pNtCreateFile(&handle, DELETE, &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, default_sharing, FILE_OPEN, + FILE_NON_DIRECTORY_FILE, NULL, 0); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x.\n", status); + CloseHandle(handle); + + /* NtCreateFile DELETE with FILE_DELETE_ON_CLOSE */ + status = pNtCreateFile(&handle, SYNCHRONIZE | DELETE, &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, default_sharing, + FILE_OPEN, FILE_DELETE_ON_CLOSE | FILE_NON_DIRECTORY_FILE, NULL, 0); + ok(status == STATUS_CANNOT_DELETE, "expected STATUS_CANNOT_DELETE, got %#x.\n", status); + + /* NtOpenFile GENERIC_WRITE */ + status = pNtOpenFile(&handle, GENERIC_WRITE, &attr, &io, default_sharing, FILE_NON_DIRECTORY_FILE); + ok(status == STATUS_ACCESS_DENIED, "expected STATUS_ACCESS_DENIED, got %#x.\n", status); + + /* NtOpenFile DELETE without FILE_DELETE_ON_CLOSE */ + status = pNtOpenFile(&handle, DELETE, &attr, &io, default_sharing, FILE_NON_DIRECTORY_FILE); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x.\n", status); + CloseHandle(handle); + + /* NtOpenFile DELETE with FILE_DELETE_ON_CLOSE */ + status = pNtOpenFile(&handle, DELETE, &attr, &io, default_sharing, FILE_DELETE_ON_CLOSE | FILE_NON_DIRECTORY_FILE); + ok(status == STATUS_CANNOT_DELETE, "expected STATUS_CANNOT_DELETE, got %#x.\n", status); + + ret = GetFileAttributesW(path); + ok(ret & FILE_ATTRIBUTE_READONLY, "got wrong attribute: %#x.\n", ret); + + /* Clean up */ + pRtlFreeUnicodeString(&nameW); + SetFileAttributesW(path, FILE_ATTRIBUTE_NORMAL); + DeleteFileW(path); +} + START_TEST(file) { HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); @@ -4827,6 +4895,7 @@ START_TEST(file) test_file_id_information(); test_file_access_information(); test_file_mode(); + test_file_readonly_access(); test_query_volume_information_file(); test_query_attribute_information_file(); test_ioctl();

1 0

Nikolay Sivov : dbgeng: Keep a list of processes to attach to.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 8f3e72edd97d4431c430474bb16385ea515333ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f3e72edd97d4431c430474b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 11 16:03:10 2019 +0300 dbgeng: Keep a list of processes to attach to. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 39 +++++++- dlls/dbgeng/tests/dbgeng.c | 231 +++++++++++++++++++++++++++++++++++++++++++++ include/dbgeng.h | 89 +++++++++++++++++ 3 files changed, 357 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8f3e72edd97d4431c430…

1 0

Zhiyi Zhang : kernel32: Open replaced file without GENERIC_WRITE in ReplaceFileW().
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 04ccd995b1aec5eac5874454a320b37676b69c42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04ccd995b1aec5eac5874454… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 9 23:54:20 2019 +0800 kernel32: Open replaced file without GENERIC_WRITE in ReplaceFileW(). As MSDN says, the replaced file is opened with the GENERIC_READ, DELETE, and SYNCHRONIZE access rights. If GENERIC_WRITE is added, then it will fail with previous file opens without FILE_SHARE_WRITE. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33845 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 19 +++++++++++++++++-- dlls/kernel32/tests/file.c | 4 ++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index c66073b..64c3e3e 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1746,6 +1746,7 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa NTSTATUS status; IO_STATUS_BLOCK io; OBJECT_ATTRIBUTES attr; + FILE_BASIC_INFORMATION info; TRACE("%s %s %s 0x%08x %p %p\n", debugstr_w(lpReplacedFileName), debugstr_w(lpReplacementFileName), debugstr_w(lpBackupFileName), @@ -1772,7 +1773,7 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - /* Open the "replaced" file for reading and writing */ + /* Open the "replaced" file for reading */ if (!(RtlDosPathNameToNtPathName_U(lpReplacedFileName, &nt_replaced_name, NULL, NULL))) { error = ERROR_PATH_NOT_FOUND; @@ -1780,7 +1781,7 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa } replaced_flags = lpBackupFileName ? FILE_OPEN : FILE_OPEN_IF; attr.ObjectName = &nt_replaced_name; - status = NtOpenFile(&hReplaced, GENERIC_READ|GENERIC_WRITE|DELETE|SYNCHRONIZE, + status = NtOpenFile(&hReplaced, GENERIC_READ|DELETE|SYNCHRONIZE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE); @@ -1796,6 +1797,20 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa goto fail; } + /* Replacement should fail if replaced is READ_ONLY */ + status = NtQueryInformationFile(hReplaced, &io, &info, sizeof(info), FileBasicInformation); + if (status != STATUS_SUCCESS) + { + error = RtlNtStatusToDosError(status); + goto fail; + } + + if (info.FileAttributes & FILE_ATTRIBUTE_READONLY) + { + error = ERROR_ACCESS_DENIED; + goto fail; + } + /* * Open the replacement file for reading, writing, and deleting * (writing and deleting are needed when finished) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 65ef4a6..4df31c1 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3691,7 +3691,7 @@ static void test_ReplaceFileA(void) */ SetLastError(0xdeadbeef); ret = pReplaceFileA(replaced, replacement, backup, 0, 0, 0); - todo_wine ok(ret == 0 && GetLastError() == ERROR_ACCESS_DENIED, "ReplaceFileA: unexpected error %d\n", GetLastError()); + ok(ret == 0 && GetLastError() == ERROR_ACCESS_DENIED, "ReplaceFileA: unexpected error %d\n", GetLastError()); /* make sure that the replacement file still exists */ hReplacementFile = CreateFileA(replacement, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); ok(hReplacementFile != INVALID_HANDLE_VALUE || @@ -3727,7 +3727,7 @@ static void test_ReplaceFileA(void) "unexpected error, replaced file should be able to be opened %d\n", GetLastError()); /*Calling ReplaceFileA on an exe should succeed*/ ret = pReplaceFileA(replaced, replacement, NULL, 0, 0, 0); - todo_wine ok(ret, "ReplaceFileA: unexpected error %d\n", GetLastError()); + ok(ret, "ReplaceFileA: unexpected error %d\n", GetLastError()); CloseHandle(hReplacedFile); /* replace file while replacement is opened */

1 0

Micah N Gorrell : winex11.drv: Recreate gl_drawable for top-level windows as non-top level when clipping for child windows is required.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 0cb79db12ac7c48477518dcff269ccc5d6b745e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cb79db12ac7c48477518dcf… Author: Micah N Gorrell <mgorrell(a)codeweavers.com> Date: Wed Apr 10 13:04:18 2019 -0600 winex11.drv: Recreate gl_drawable for top-level windows as non-top level when clipping for child windows is required. Prevent creating a gl_drawable for a window as type DC_GL_WINDOW if there are known children of the window, since DC_GL_WINDOW does not support clipping. Recreate a gl_drawable that was previously create as type DC_GL_WINDOW when a child is encountered. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=15232 Signed-off-by: Micah N Gorrell <mgorrell(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 20 ++++++++++++-------- dlls/winex11.drv/window.c | 13 ++++++++++++- dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 13a1da3..a51a935 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1328,7 +1328,7 @@ static GLXContext create_glxcontext(Display *display, struct wgl_context *contex /*********************************************************************** * create_gl_drawable */ -static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct wgl_pixel_format *format ) +static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct wgl_pixel_format *format, BOOL known_child ) { struct gl_drawable *gl, *prev; XVisualInfo *visual = format->visual; @@ -1349,7 +1349,7 @@ static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct wgl_pixel gl->format = format; gl->ref = 1; - if (GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) /* top-level window */ + if (!known_child && !GetWindow( hwnd, GW_CHILD ) && GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) /* childless top-level window */ { gl->type = DC_GL_WINDOW; gl->window = create_client_window( hwnd, visual ); @@ -1412,7 +1412,7 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format ) if (!format->visual) return FALSE; - if (!(gl = create_gl_drawable( hwnd, format ))) return FALSE; + if (!(gl = create_gl_drawable( hwnd, format, FALSE ))) return FALSE; TRACE( "created GL drawable %lx for win %p %s\n", gl->drawable, hwnd, debugstr_fbconfig( format->fbconfig )); @@ -1471,7 +1471,7 @@ static BOOL set_pixel_format(HDC hdc, int format, BOOL allow_change) /*********************************************************************** * sync_gl_drawable */ -void sync_gl_drawable( HWND hwnd ) +void sync_gl_drawable( HWND hwnd, BOOL known_child ) { struct gl_drawable *old, *new; @@ -1479,8 +1479,11 @@ void sync_gl_drawable( HWND hwnd ) switch (old->type) { + case DC_GL_WINDOW: + if (!known_child) break; /* Still a childless top-level window */ + /* fall through */ case DC_GL_PIXMAP_WIN: - if (!(new = create_gl_drawable( hwnd, old->format ))) break; + if (!(new = create_gl_drawable( hwnd, old->format, known_child ))) break; mark_drawable_dirty( old, new ); XFlush( gdi_display ); TRACE( "Recreated GL drawable %lx to replace %lx\n", new->drawable, old->drawable ); @@ -1517,7 +1520,7 @@ void set_gl_drawable_parent( HWND hwnd, HWND parent ) return; } - if ((new = create_gl_drawable( hwnd, old->format ))) + if ((new = create_gl_drawable( hwnd, old->format, FALSE ))) { mark_drawable_dirty( old, new ); release_gl_drawable( new ); @@ -3304,9 +3307,10 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) } pglXSwapBuffers(gdi_display, gl->drawable); break; + case DC_GL_WINDOW: case DC_GL_CHILD_WIN: if (ctx) sync_context( ctx ); - escape.gl_drawable = gl->window; + if (gl->type == DC_GL_CHILD_WIN) escape.gl_drawable = gl->window; /* fall through */ default: if (escape.gl_drawable && pglXSwapBuffersMscOML) @@ -3362,7 +3366,7 @@ struct opengl_funcs *get_glx_driver( UINT version ) return NULL; } -void sync_gl_drawable( HWND hwnd ) +void sync_gl_drawable( HWND hwnd, BOOL known_child ) { } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7a3b340..97dee52 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1874,6 +1874,11 @@ static struct x11drv_win_data *X11DRV_create_win_data( HWND hwnd, const RECT *wi if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) return NULL; + /* Recreate the parent gl_drawable now that we know there are child windows + * that will need clipping support. + */ + sync_gl_drawable( parent, TRUE ); + display = thread_init_display(); init_clip_window(); /* make sure the clip window is initialized in this thread */ @@ -2206,6 +2211,12 @@ void CDECL X11DRV_SetParent( HWND hwnd, HWND parent, HWND old_parent ) done: release_win_data( data ); set_gl_drawable_parent( hwnd, parent ); + + /* Recreate the parent gl_drawable now that we know there are child windows + * that will need clipping support. + */ + sync_gl_drawable( parent, TRUE ); + fetch_icon_data( hwnd, 0, 0 ); } @@ -2369,7 +2380,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags data->client_rect.bottom - data->client_rect.top != old_client_rect.bottom - old_client_rect.top)); release_win_data( data ); - if (needs_resize) sync_gl_drawable( hwnd ); + if (needs_resize) sync_gl_drawable( hwnd, FALSE ); return; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a0308b0..c633102 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -583,7 +583,7 @@ extern void release_win_data( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; extern Window X11DRV_get_whole_window( HWND hwnd ) DECLSPEC_HIDDEN; extern XIC X11DRV_get_ic( HWND hwnd ) DECLSPEC_HIDDEN; -extern void sync_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN; +extern void sync_gl_drawable( HWND hwnd, BOOL known_child ) DECLSPEC_HIDDEN; extern void set_gl_drawable_parent( HWND hwnd, HWND parent ) DECLSPEC_HIDDEN; extern void destroy_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN; extern void wine_vk_surface_destroy( HWND hwnd ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml.idl: Add more SVG interfaces.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: f1562cfd55454bb4db66b7b9976c0b56ca5888d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1562cfd55454bb4db66b7b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 11 14:23:17 2019 +0200 mshtml.idl: Add more SVG interfaces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 53 ++++++++ include/mshtml.idl | 388 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 441 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f1562cfd55454bb4db66…

1 0

Akihiro Sagawa : user32/tests: Use calculated EC_USEFONTINFO margins in the CJK case.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 8ba6c1f2fcee2f6432928395dfb660ace169327f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ba6c1f2fcee2f6432928395… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 11 00:04:39 2019 +0900 user32/tests: Use calculated EC_USEFONTINFO margins in the CJK case. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 46 +++++++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index b1223a9..2930c33 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1549,6 +1549,16 @@ static void test_margins_usefontinfo(UINT charset) DeleteObject(hfont); } +static INT get_cjk_fontinfo_margin(INT width, INT side_bearing) +{ + INT margin; + if (side_bearing < 0) + margin = min(-side_bearing, width/2); + else + margin = 0; + return margin; +} + static void test_margins_default(const char* facename, UINT charset) { HWND hwnd; @@ -1562,6 +1572,14 @@ static void test_margins_default(const char* facename, UINT charset) INT margins, expect; const UINT small_margins = MAKELONG(1, 5); const WCHAR EditW[] = {'E','d','i','t',0}, strW[] = {'W',0}; + struct char_width_info { + INT lsb, rsb, unknown; + } info; + HMODULE hgdi32; + BOOL (WINAPI *pGetCharWidthInfo)(HDC, struct char_width_info *); + + hgdi32 = GetModuleHandleA("gdi32.dll"); + pGetCharWidthInfo = (void *)GetProcAddress(hgdi32, "GetCharWidthInfo"); memset(&lf, 0, sizeof(lf)); lf.lfHeight = -11; @@ -1590,8 +1608,16 @@ static void test_margins_default(const char* facename, UINT charset) DeleteObject(hfont); return; } - expect = MAKELONG(size.cx / 2, size.cx / 2); cjk_charset = is_cjk_charset(hdc); + if (cjk_charset && pGetCharWidthInfo && pGetCharWidthInfo(hdc, &info)) { + short left, right; + + left = get_cjk_fontinfo_margin(size.cx, info.lsb); + right = get_cjk_fontinfo_margin(size.cx, info.rsb); + expect = MAKELONG(left, right); + } + else + expect = MAKELONG(size.cx / 2, size.cx / 2); hfont = SelectObject(hdc, hfont); ReleaseDC(hwnd, hdc); @@ -1606,13 +1632,8 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - if (!cjk_charset) - ok(margins == expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); - else - { - ok(HIWORD(margins) <= HIWORD(expect), "%s:%d: got %d\n", facename, charset, HIWORD(margins)); - ok(LOWORD(margins) <= LOWORD(expect), "%s:%d: got %d\n", facename, charset, LOWORD(margins)); - } + todo_wine_if(cjk_charset && expect != MAKELONG(size.cx / 2, size.cx / 2)) + ok(margins == expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(expect), LOWORD(expect), HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd); /* ANSI version */ @@ -1631,13 +1652,8 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - if (!cjk_charset) - ok(margins == expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); - else - { - ok(HIWORD(margins) <= HIWORD(expect), "%s:%d: got %d\n", facename, charset, HIWORD(margins)); - ok(LOWORD(margins) <= LOWORD(expect), "%s:%d: got %d\n", facename, charset, LOWORD(margins)); - } + todo_wine_if(cjk_charset && expect != MAKELONG(size.cx / 2, size.cx / 2)) + ok(margins == expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(expect), LOWORD(expect), HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd); DeleteObject(hfont);

1 0

Zhiyi Zhang : kernel32/tests: Add more tests for ReplaceFileA().
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 57e8e2d59cd66db0fc14b305963d0b365c2a675d URL: https://source.winehq.org/git/wine.git/?a=commit;h=57e8e2d59cd66db0fc14b305… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 9 23:54:13 2019 +0800 kernel32/tests: Add more tests for ReplaceFileA(). Also remove residue test files and remove no effect tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index e92764b..65ef4a6 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3664,6 +3664,7 @@ static void test_ReplaceFileA(void) "ReplaceFileA: unexpected error %d\n", GetLastError()); /* re-create replacement file for pass w/ backup (backup-file not existing) */ + DeleteFileA(replacement); ret = GetTempFileNameA(temp_path, prefix, 0, replacement); ok(ret != 0, "GetTempFileNameA error (replacement) %d\n", GetLastError()); ret = DeleteFileA(backup); @@ -3679,6 +3680,7 @@ static void test_ReplaceFileA(void) removeBackup = TRUE; /* re-create replacement file for pass w/ no permissions to "replaced" */ + DeleteFileA(replacement); ret = GetTempFileNameA(temp_path, prefix, 0, replacement); ok(ret != 0, "GetTempFileNameA error (replacement) %d\n", GetLastError()); ret = SetFileAttributesA(replaced, FILE_ATTRIBUTE_READONLY); @@ -3700,21 +3702,25 @@ static void test_ReplaceFileA(void) ok(ret || GetLastError() == ERROR_ACCESS_DENIED, "SetFileAttributesA: error setting to normal %d\n", GetLastError()); + /* replacement readonly */ + DeleteFileA(replacement); + ret = GetTempFileNameA(temp_path, prefix, 0, replacement); + ok(ret != 0, "GetTempFileNameA error (replacement) %#x\n", GetLastError()); + ret = SetFileAttributesA(replacement, FILE_ATTRIBUTE_READONLY); + ok(ret, "SetFileAttributesA: error setting to readonly %#x\n", GetLastError()); + ret = pReplaceFileA(replaced, replacement, NULL, 0, 0, 0); + ok(GetLastError() == ERROR_ACCESS_DENIED, "ReplaceFileA: unexpected error %#x\n", GetLastError()); + ret = SetFileAttributesA(replacement, FILE_ATTRIBUTE_NORMAL); + ok(ret, "SetFileAttributesA: error setting to normal %#x\n", GetLastError()); + /* re-create replacement file for pass w/ replaced opened with * the same permissions as an exe (Replicating an exe trying to * replace itself) */ + DeleteFileA(replacement); ret = GetTempFileNameA(temp_path, prefix, 0, replacement); ok(ret != 0, "GetTempFileNameA error (replacement) %d\n", GetLastError()); - SetLastError(0xdeadbeef); - /* make sure that the replacement file still exists */ - hReplacementFile = CreateFileA(replacement, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); - ok(hReplacementFile != INVALID_HANDLE_VALUE || - broken(GetLastError() == ERROR_FILE_NOT_FOUND), /* win2k */ - "unexpected error, replacement file should still exist %d\n", GetLastError()); - CloseHandle(hReplacementFile); - /* make sure that the replaced file is opened like an exe*/ hReplacedFile = CreateFileA(replaced, GENERIC_READ | SYNCHRONIZE, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0); ok(hReplacedFile != INVALID_HANDLE_VALUE, @@ -3724,6 +3730,17 @@ static void test_ReplaceFileA(void) todo_wine ok(ret, "ReplaceFileA: unexpected error %d\n", GetLastError()); CloseHandle(hReplacedFile); + /* replace file while replacement is opened */ + ret = GetTempFileNameA(temp_path, prefix, 0, replacement); + ok(ret != 0, "GetTempFileNameA error (replacement) %d\n", GetLastError()); + CreateFileA(replacement, GENERIC_READ | SYNCHRONIZE, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0); + ok(hReplacementFile != INVALID_HANDLE_VALUE, "unexpected error, replacement file should be able to be opened %d\n", + GetLastError()); + ret = pReplaceFileA(replaced, replacement, NULL, 0, 0, 0); + ok(!ret, "expect failure\n"); + ok(GetLastError() == ERROR_SHARING_VIOLATION, "expect ERROR_SHARING_VIOLATION, got %#x.\n", GetLastError()); + CloseHandle(hReplacedFile); + /* replacement file still exists, make pass w/o "replaced" */ ret = DeleteFileA(replaced); ok(ret || GetLastError() == ERROR_ACCESS_DENIED,

1 0

Alistair Leslie-Hughes : wintab32: Improve tracing of LOGCONTEXT.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 810201cf4d8311f2d1be280ddf766376a834db16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=810201cf4d8311f2d1be280d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 11 08:23:31 2019 +0000 wintab32: Improve tracing of LOGCONTEXT. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintab32/context.c | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 095e258..9882a3c 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -113,28 +113,22 @@ static inline void DUMPPACKET(WTPACKET packet) static inline void DUMPCONTEXT(LOGCONTEXTW lc) { - TRACE("Name: %s, Options: %x, Status: %x, Locks: %x, MsgBase: %x, " - "Device: %x, PktRate: %x, " - "%x%s, %x%s, %x%s, " - "BtnDnMask: %x, BtnUpMask: %x, " - "InOrgX: %i, InOrgY: %i, InOrgZ: %i, " - "InExtX: %i, InExtY: %i, InExtZ: %i, " - "OutOrgX: %i, OutOrgY: %i, OutOrgZ: %i, " - "OutExtX: %i, OutExtY: %i, OutExtZ: %i, " - "SensX: %i, SensY: %i, SensZ: %i, " - "SysMode: %i, " - "SysOrgX: %i, SysOrgY: %i, " - "SysExtX: %i, SysExtY: %i, " - "SysSensX: %i, SysSensY: %i\n", - wine_dbgstr_w(lc.lcName), lc.lcOptions, lc.lcStatus, lc.lcLocks, lc.lcMsgBase, - lc.lcDevice, lc.lcPktRate, lc.lcPktData, DUMPBITS(lc.lcPktData), - lc.lcPktMode, DUMPBITS(lc.lcPktMode), lc.lcMoveMask, - DUMPBITS(lc.lcMoveMask), lc.lcBtnDnMask, lc.lcBtnUpMask, - lc.lcInOrgX, lc.lcInOrgY, lc.lcInOrgZ, lc.lcInExtX, lc.lcInExtY, - lc.lcInExtZ, lc.lcOutOrgX, lc.lcOutOrgY, lc.lcOutOrgZ, lc.lcOutExtX, - lc.lcOutExtY, lc.lcOutExtZ, lc.lcSensX, lc.lcSensY, lc.lcSensZ, lc.lcSysMode, - lc.lcSysOrgX, lc.lcSysOrgY, lc.lcSysExtX, lc.lcSysExtY, lc.lcSysSensX, - lc.lcSysSensY); + TRACE("Name: %s, Options: %x, Status: %x, Locks: %x, MsgBase: %x, Device: %x\n", + wine_dbgstr_w(lc.lcName), lc.lcOptions, lc.lcStatus, lc.lcLocks, lc.lcMsgBase, lc.lcDevice); + TRACE("PktRate %x\n", lc.lcPktRate); + TRACE("PktData 0x%04x %s\n", lc.lcPktData, DUMPBITS(lc.lcPktData)); + TRACE("PktMode 0x%04x %s\n", lc.lcPktMode, DUMPBITS(lc.lcPktMode)); + TRACE("MovMask 0x%04x %s\n", lc.lcMoveMask, DUMPBITS(lc.lcMoveMask)); + TRACE("BtnDnMask: %x, BtnUpMask: %x\n", lc.lcBtnDnMask, lc.lcBtnUpMask); + TRACE("InOrgX: %i, InOrgY: %i, InOrgZ: %i\n", lc.lcInOrgX, lc.lcInOrgY, lc.lcInOrgZ); + TRACE("InExtX: %i, InExtY: %i, InExtZ: %i\n", lc.lcInExtX, lc.lcInExtY, lc.lcInExtZ); + TRACE("OutOrgX: %i, OutOrgY: %i, OutOrgZ: %i\n", lc.lcOutOrgX, lc.lcOutOrgY, lc.lcOutOrgZ); + TRACE("OutExtX: %i, OutExtY: %i, OutExtZ: %i\n", lc.lcOutExtX, lc.lcOutExtY, lc.lcOutExtZ); + TRACE("SensX: %i, SensY: %i, SensZ: %i\n", lc.lcSensX, lc.lcSensY, lc.lcSensZ); + TRACE("SysMode: %i\n", lc.lcSysMode); + TRACE("SysOrgX: %i, SysOrgY: %i\n", lc.lcSysOrgX, lc.lcSysOrgY); + TRACE("SysExtX: %i, SysExtY: %i\n", lc.lcSysExtX, lc.lcSysExtY); + TRACE("SysSensX: %i, SysSensY: %i\n", lc.lcSysSensX, lc.lcSysSensY); }

1 0

Jacek Caban : jscript: Support type conversion to VT_UI2.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: f192f2f1a13190378cbecc33dcf06ff3fd637eb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f192f2f1a13190378cbecc33… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 11 16:44:06 2019 +0200 jscript: Support type conversion to VT_UI2. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsutils.c | 8 ++++++++ dlls/jscript/tests/caller.c | 3 +++ 2 files changed, 11 insertions(+) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index b653e52..f252824 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -894,6 +894,14 @@ HRESULT variant_change_type(script_ctx_t *ctx, VARIANT *dst, VARIANT *src, VARTY } break; } + case VT_UI2: { + UINT32 i; + + hres = to_uint32(ctx, val, &i); + if(SUCCEEDED(hres)) + V_UI2(dst) = i; + break; + } case VT_R8: { double n; hres = to_number(ctx, val, &n); diff --git a/dlls/jscript/tests/caller.c b/dlls/jscript/tests/caller.c index f09ad90..dc97fb7 100644 --- a/dlls/jscript/tests/caller.c +++ b/dlls/jscript/tests/caller.c @@ -136,6 +136,9 @@ static void test_change_type(IVariantChangeType *change_type, VARIANT *src, cons call_change_type(change_type, &v, src, VT_I4); ok(V_I4(&v) == ex->int_result, "V_I4(v) = %d, expected %d\n", V_I4(&v), ex->int_result); + call_change_type(change_type, &v, src, VT_UI2); + ok(V_UI2(&v) == (UINT16)ex->int_result, "V_UI2(v) = %u, expected %u\n", V_UI2(&v), (UINT16)ex->int_result); + call_change_type(change_type, &v, src, VT_BSTR); ok(!strcmp_wa(V_BSTR(&v), ex->str_result), "V_BSTR(v) = %s, expected %s\n", wine_dbgstr_w(V_BSTR(&v)), ex->str_result); VariantClear(&v);

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 77aa55d9eebc9437d4772b4bd55b12820bc69bea URL: https://source.winehq.org/git/wine.git/?a=commit;h=77aa55d9eebc9437d4772b4b… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Apr 11 12:24:45 2019 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 48 +++++++++++++----------------------------------- 1 file changed, 13 insertions(+), 35 deletions(-) diff --git a/po/fi.po b/po/fi.po index e27f3f0..6a2a857 100644 --- a/po/fi.po +++ b/po/fi.po @@ -4917,7 +4917,7 @@ msgstr "Kovalevyn nollaus epäonnistui.\n" #: winerror.mc:1443 msgid "End of tape media.\n" -msgstr "Nauha on loppussa.\n" +msgstr "Nauhan loppu.\n" #: winerror.mc:1448 msgid "Not enough server memory.\n" @@ -7029,78 +7029,56 @@ msgid "No events available.\n" msgstr "Tapahtumia ei ole saatavilla.\n" #: mferror.mc:445 -#, fuzzy -#| msgid "Unsupported state transition.\n" msgid "Invalid media source state transition.\n" -msgstr "Tilan muutosta ei tueta.\n" +msgstr "Medialähteen tilan muutos ei kelpaa.\n" #: mferror.mc:452 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "End of media stream has been reached.\n" -msgstr "Rekisteri on palautettu.\n" +msgstr "Mediavirta on lopussa.\n" #: mferror.mc:459 msgid "Shutdown() was called.\n" msgstr "Shutdown() kutsuttu.\n" #: mferror.mc:466 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media stream has no duration set.\n" -msgstr "Rekisteri on palautettu.\n" +msgstr "Mediavirralla ei ole kestoa.\n" #: mferror.mc:473 msgid "Media format was recognized but is invalid.\n" -msgstr "" +msgstr "Median muoto tunnistettiin, mutta se ei kelpaa.\n" #: mferror.mc:480 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Property wasn't found.\n" -msgstr "Ominaisuusjoukkoa ei löytynyt.\n" +msgstr "Ominaisuutta ei löytynyt.\n" #: mferror.mc:487 -#, fuzzy -#| msgid "Property is empty.\n" msgid "Property is read-only.\n" -msgstr "Ominaisuus on tyhjä.\n" +msgstr "Ominaisuus on vain luettava.\n" #: mferror.mc:494 -#, fuzzy -#| msgid "Property type is not allowed.\n" msgid "Property is not allowed.\n" -msgstr "Ominaisuuden tyyppi ei ole sallittu.\n" +msgstr "Ominaisuutta ei sallita.\n" #: mferror.mc:501 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is not started.\n" -msgstr "Resurssi on käytössä.\n" +msgstr "Medialähdettä ei ole käynnistetty.\n" #: mferror.mc:508 -#, fuzzy -#| msgid "Unsupported time format.\n" msgid "Unsupported media format.\n" -msgstr "Ajan muotoa ei tueta.\n" +msgstr "Median muotoa ei tueta.\n" #: mferror.mc:515 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is in wrong state.\n" -msgstr "Resurssi on käytössä.\n" +msgstr "Medialähde on väärässä tilassa.\n" #: mferror.mc:522 -#, fuzzy -#| msgid "No data detected.\n" msgid "No media streams were selected.\n" -msgstr "Dataa ei löytynyt.\n" +msgstr "Mediavirtoja ei ole valittu.\n" #: mferror.mc:529 -#, fuzzy -#| msgid "Unsupported time format.\n" msgid "Unsupported media source characteristics.\n" -msgstr "Ajan muotoa ei tueta.\n" +msgstr "Medialähteen ominaisuuksia ei tueta.\n" #: mferror.mc:536 msgid "Optional node is invalid.\n"

1 0

Nikolay Sivov : dbgeng: Keep event callbacks pointer.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 02da0edd9d2746ddd0d6266a5945608726603e01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02da0edd9d2746ddd0d6266a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 11 16:03:11 2019 +0300 dbgeng: Keep event callbacks pointer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 26 ++++++++++++++++++++++---- dlls/dbgeng/tests/dbgeng.c | 1 - 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index 9aed1b0..f9faef0 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -51,6 +51,7 @@ struct debug_client LONG refcount; ULONG engine_options; struct list targets; + IDebugEventCallbacks *event_callbacks; }; static struct debug_client *impl_from_IDebugClient(IDebugClient *iface) @@ -133,6 +134,8 @@ static ULONG STDMETHODCALLTYPE debugclient_Release(IDebugClient *iface) list_remove(&cur->entry); heap_free(cur); } + if (debug_client->event_callbacks) + debug_client->event_callbacks->lpVtbl->Release(debug_client->event_callbacks); heap_free(debug_client); } @@ -467,16 +470,31 @@ static HRESULT STDMETHODCALLTYPE debugclient_OutputIdentity(IDebugClient *iface, static HRESULT STDMETHODCALLTYPE debugclient_GetEventCallbacks(IDebugClient *iface, IDebugEventCallbacks **callbacks) { - FIXME("%p, %p stub.\n", iface, callbacks); + struct debug_client *debug_client = impl_from_IDebugClient(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, callbacks); + + if (debug_client->event_callbacks) + { + *callbacks = debug_client->event_callbacks; + (*callbacks)->lpVtbl->AddRef(*callbacks); + } + + return S_OK; } static HRESULT STDMETHODCALLTYPE debugclient_SetEventCallbacks(IDebugClient *iface, IDebugEventCallbacks *callbacks) { - FIXME("%p, %p stub.\n", iface, callbacks); + struct debug_client *debug_client = impl_from_IDebugClient(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, callbacks); + + if (debug_client->event_callbacks) + debug_client->event_callbacks->lpVtbl->Release(debug_client->event_callbacks); + if ((debug_client->event_callbacks = callbacks)) + debug_client->event_callbacks->lpVtbl->AddRef(debug_client->event_callbacks); + + return S_OK; } static HRESULT STDMETHODCALLTYPE debugclient_FlushCallbacks(IDebugClient *iface) diff --git a/dlls/dbgeng/tests/dbgeng.c b/dlls/dbgeng/tests/dbgeng.c index f5d50c8..baec60a 100644 --- a/dlls/dbgeng/tests/dbgeng.c +++ b/dlls/dbgeng/tests/dbgeng.c @@ -247,7 +247,6 @@ static void test_attach(void) ok(hr == S_OK, "Failed to get interface pointer, hr %#x.\n", hr); hr = client->lpVtbl->SetEventCallbacks(client, &event_callbacks); -todo_wine ok(hr == S_OK, "Failed to set event callbacks, hr %#x.\n", hr); event = CreateEventA(NULL, FALSE, FALSE, event_name);

1 0

Akihiro Sagawa : user32: Implement EC_USEFONTINFO margins in the CJK case.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: c5823e9cac8311cd1dfd622331f2502df0b9f12a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5823e9cac8311cd1dfd6223… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 11 00:04:41 2019 +0900 user32: Implement EC_USEFONTINFO margins in the CJK case. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 41 ++++++++++++++++++++++++++++++++++++++--- dlls/user32/tests/edit.c | 4 ++-- 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index d1659b4..7eb2214 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -2841,6 +2841,32 @@ static void EDIT_EM_SetLimitText(EDITSTATE *es, UINT limit) es->buffer_limit = limit; } +static BOOL is_cjk_charset(HDC dc) +{ + switch (GdiGetCodePage(dc)) { + case 932: case 936: case 949: case 950: case 1361: + return TRUE; + default: + return FALSE; + } +} + +static int get_cjk_fontinfo_margin(int width, int side_bearing) +{ + int margin; + if (side_bearing < 0) + margin = min(-side_bearing, width/2); + else + margin = 0; + return margin; +} + +struct char_width_info { + INT min_lsb, min_rsb, unknown; +}; + +/* Undocumented gdi32 export */ +extern BOOL WINAPI GetCharWidthInfo(HDC, struct char_width_info *); /********************************************************************* * @@ -2870,9 +2896,18 @@ static void EDIT_EM_SetMargins(EDITSTATE *es, INT action, /* The default margins are only non zero for TrueType or Vector fonts */ if (tm.tmPitchAndFamily & ( TMPF_VECTOR | TMPF_TRUETYPE )) { - /* FIXME: figure out the CJK values. */ - default_left_margin = width / 2; - default_right_margin = width / 2; + struct char_width_info width_info; + + if (is_cjk_charset(dc) && GetCharWidthInfo(dc, &width_info)) + { + default_left_margin = get_cjk_fontinfo_margin(width, width_info.min_lsb); + default_right_margin = get_cjk_fontinfo_margin(width, width_info.min_rsb); + } + else + { + default_left_margin = width / 2; + default_right_margin = width / 2; + } GetClientRect(es->hwndSelf, &rc); rc_width = !IsRectEmpty(&rc) ? rc.right - rc.left : 80; diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 2930c33..e8ea774 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1632,7 +1632,7 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - todo_wine_if(cjk_charset && expect != MAKELONG(size.cx / 2, size.cx / 2)) + ok(margins == expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(expect), LOWORD(expect), HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd); @@ -1652,7 +1652,7 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - todo_wine_if(cjk_charset && expect != MAKELONG(size.cx / 2, size.cx / 2)) + ok(margins == expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(expect), LOWORD(expect), HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd);

1 0

Paul Gofman : ddraw: Improve d3d_device7_GetClipStatus() stub.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 38bdd6fc5c36c61a2b8edbb8fe52ba858d4c32c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38bdd6fc5c36c61a2b8edbb8… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 11 17:05:36 2019 +0300 ddraw: Improve d3d_device7_GetClipStatus() stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43411 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 003ce1d..054e2dc 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3916,7 +3916,20 @@ static HRESULT WINAPI d3d_device2_SetClipStatus(IDirect3DDevice2 *iface, D3DCLIP *****************************************************************************/ static HRESULT WINAPI d3d_device7_GetClipStatus(IDirect3DDevice7 *iface, D3DCLIPSTATUS *clip_status) { - FIXME("iface %p, clip_status %p stub!\n", iface, clip_status); + struct d3d_device *device = impl_from_IDirect3DDevice7(iface); + struct wined3d_viewport vp; + + FIXME("iface %p, clip_status %p stub.\n", iface, clip_status); + + wined3d_device_get_viewports(device->wined3d_device, NULL, &vp); + clip_status->minx = vp.x; + clip_status->maxx = vp.x + vp.width; + clip_status->miny = vp.y; + clip_status->maxy = vp.y + vp.height; + clip_status->minz = 0.0f; + clip_status->maxz = 0.0f; + clip_status->dwFlags = D3DCLIPSTATUS_EXTENTS2; + clip_status->dwStatus = 0; return D3D_OK; }

1 0

Zhiyi Zhang : dinput: Fix a possible deadlock at exit.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 886d28de974b0b012be87cf8552806dc65ef3ea9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=886d28de974b0b012be87cf8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Apr 11 18:28:40 2019 +0800 dinput: Fix a possible deadlock at exit. This fix another deadlock issue with dinput. The old implementation of dinput waits for a hook thread to exit during its uninitialization, which will never return during DLL_THREAD_DETACH. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 65aaf92..1b2020c 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1781,7 +1781,7 @@ static DWORD WINAPI hook_thread_proc(void *param) DispatchMessageW(&msg); } - return 0; + FreeLibraryAndExitThread(DINPUT_instance, 0); } static DWORD hook_thread_id; @@ -1798,15 +1798,16 @@ static CRITICAL_SECTION dinput_hook_crit = { &dinput_critsect_debug, -1, 0, 0, 0 static BOOL check_hook_thread(void) { static HANDLE hook_thread; + HMODULE module; EnterCriticalSection(&dinput_hook_crit); TRACE("IDirectInputs left: %d\n", list_count(&direct_input_list)); if (!list_empty(&direct_input_list) && !hook_thread) { + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR*)DINPUT_instance, &module); hook_thread_event = CreateEventW(NULL, FALSE, FALSE, NULL); hook_thread = CreateThread(NULL, 0, hook_thread_proc, hook_thread_event, 0, &hook_thread_id); - LeaveCriticalSection(&dinput_hook_crit); } else if (list_empty(&direct_input_list) && hook_thread) { @@ -1821,16 +1822,11 @@ static BOOL check_hook_thread(void) hook_thread_id = 0; PostThreadMessageW(tid, WM_USER+0x10, 0, 0); - LeaveCriticalSection(&dinput_hook_crit); - - /* wait for hook thread to exit */ - WaitForSingleObject(hook_thread, INFINITE); CloseHandle(hook_thread); hook_thread = NULL; } - else - LeaveCriticalSection(&dinput_hook_crit); + LeaveCriticalSection(&dinput_hook_crit); return hook_thread_id != 0; }

1 0

Jacek Caban : ntoskrnl.exe: Use proper device handle in DevicePropertyPhysicalDeviceObjectName implementation.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: c1fb240f0ccc92d6ec180bfc2542c0dbcb52296c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1fb240f0ccc92d6ec180bfc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 11 17:19:03 2019 +0200 ntoskrnl.exe: Use proper device handle in DevicePropertyPhysicalDeviceObjectName implementation. Spotted by Huw Davies. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index acb204d..861eb40 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1831,8 +1831,11 @@ NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROP { ULONG used_len, len = buffer_length + sizeof(OBJECT_NAME_INFORMATION); OBJECT_NAME_INFORMATION *name = HeapAlloc(GetProcessHeap(), 0, len); + HANDLE handle; - status = NtQueryObject(device->Reserved, ObjectNameInformation, name, len, &used_len); + handle = kernel_object_handle( device, 0 ); + status = NtQueryObject( handle, ObjectNameInformation, name, len, &used_len ); + NtClose( handle ); if (status == STATUS_SUCCESS) { /* Ensure room for NULL termination */

1 0

Alistair Leslie-Hughes : wintab32/tests: Add WTInfoA tests.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 9b7b9fa0f53ebaf7bcb96e4af276b2b6a632f013 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b7b9fa0f53ebaf7bcb96e4a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 11 08:23:32 2019 +0000 wintab32/tests: Add WTInfoA tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintab32/tests/context.c | 64 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/wintab32/tests/context.c b/dlls/wintab32/tests/context.c index 5f05912..3eb1315 100644 --- a/dlls/wintab32/tests/context.c +++ b/dlls/wintab32/tests/context.c @@ -32,8 +32,11 @@ static const UINT Y = 0; static const UINT WIDTH = 200; static const UINT HEIGHT = 200; +static LOGCONTEXTA glogContext; + static HCTX (WINAPI *pWTOpenA)(HWND, LPLOGCONTEXTA, BOOL); static BOOL (WINAPI *pWTClose)(HCTX); +static UINT (WINAPI *pWTInfoA)(UINT, UINT, void*); static HMODULE load_functions(void) { @@ -50,6 +53,7 @@ static HMODULE load_functions(void) } if (GET_PROC(WTOpenA) && + GET_PROC(WTInfoA) && GET_PROC(WTClose) ) { return hWintab; @@ -135,6 +139,65 @@ static void test_WTOpenContextValidation(void) wintab_destroy_window(defaultWindow); } +static void test_WTInfoA(void) +{ + char name[LCNAMELEN]; + UINT ret; + AXIS value; + AXIS orientation[3]; + + glogContext.lcOptions |= CXO_SYSTEM; + + ret = pWTInfoA(WTI_DEFSYSCTX, 0, &glogContext); + if(!ret) + { + skip("No tablet connected\n"); + return; + } + ok(ret == sizeof( LOGCONTEXTA ), "incorrect size\n" ); + ok(glogContext.lcOptions & CXO_SYSTEM, "Wrong options 0x%08x\n", glogContext.lcOptions); + + ret = pWTInfoA( WTI_DEVICES, DVC_NAME, name ); + trace("DVC_NAME %s\n", name); + + ret = pWTInfoA( WTI_DEVICES, DVC_X, &value ); + ok(ret == sizeof( AXIS ), "Wrong DVC_X size %d\n", ret); + trace("DVC_X %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + + ret = pWTInfoA( WTI_DEVICES, DVC_Y, &value ); + ok(ret == sizeof( AXIS ), "Wrong DVC_Y size %d\n", ret); + trace("DVC_Y %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + + ret = pWTInfoA( WTI_DEVICES, DVC_Z, &value ); + todo_wine ok(ret == sizeof( AXIS ), "Wrong DVC_Z size %d\n", ret); + trace("DVC_Z %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + + ret = pWTInfoA( WTI_DEVICES, DVC_NPRESSURE, &value ); + ok(ret == sizeof( AXIS ), "Wrong DVC_NPRESSURE, size %d\n", ret); + trace("DVC_NPRESSURE %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + + ret = pWTInfoA( WTI_DEVICES, DVC_TPRESSURE, &value ); + todo_wine ok(ret == sizeof( AXIS ), "Wrong DVC_TPRESSURE, size %d\n", ret); + trace("DVC_TPRESSURE %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + + ret = pWTInfoA( WTI_DEVICES, DVC_ORIENTATION, &orientation ); + ok(ret == sizeof( AXIS )*3, "Wrong DVC_ORIENTATION, size %d\n", ret); + trace("DVC_ORIENTATION0 %d, %d, %d\n", orientation[0].axMin, orientation[0].axMax, orientation[0].axUnits); + trace("DVC_ORIENTATION1 %d, %d, %d\n", orientation[1].axMin, orientation[1].axMax, orientation[1].axUnits); + trace("DVC_ORIENTATION2 %d, %d, %d\n", orientation[2].axMin, orientation[2].axMax, orientation[2].axUnits); + + ret = pWTInfoA( WTI_DEVICES, DVC_ROTATION, &orientation ); + if(ret) + { + trace("DVC_ROTATION0 %d, %d, %d\n", orientation[0].axMin, orientation[0].axMax, orientation[0].axUnits); + trace("DVC_ROTATION1 %d, %d, %d\n", orientation[1].axMin, orientation[1].axMax, orientation[1].axUnits); + trace("DVC_ROTATION2 %d, %d, %d\n", orientation[2].axMin, orientation[2].axMax, orientation[2].axUnits); + } + else + trace("DVC_ROTATION not supported\n"); + +} + START_TEST(context) { HMODULE hWintab = load_functions(); @@ -146,6 +209,7 @@ START_TEST(context) } test_WTOpenContextValidation(); + test_WTInfoA(); FreeLibrary(hWintab); }

1 0

Martin Storsjo : msvcrt: Implement the remquo family of functions.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: de8be4a09c18fabd72f33f7e45b19ff0d735864b URL: https://source.winehq.org/git/wine.git/?a=commit;h=de8be4a09c18fabd72f33f7e… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Apr 10 21:14:28 2019 +0300 msvcrt: Implement the remquo family of functions. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 2 ++ .../api-ms-win-crt-math-l1-1-0.spec | 6 ++-- dlls/msvcr120/msvcr120.spec | 6 ++-- dlls/msvcr120_app/msvcr120_app.spec | 6 ++-- dlls/msvcrt/math.c | 38 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 ++-- include/config.h.in | 6 ++++ 8 files changed, 60 insertions(+), 12 deletions(-) diff --git a/configure b/configure index a7c072b..5733ea7 100755 --- a/configure +++ b/configure @@ -19163,6 +19163,8 @@ for ac_func in \ powl \ remainder \ remainderf \ + remquo \ + remquof \ rint \ rintf \ round \ diff --git a/configure.ac b/configure.ac index bb02ec4..4dbb7f4 100644 --- a/configure.ac +++ b/configure.ac @@ -2724,6 +2724,8 @@ AC_CHECK_FUNCS(\ powl \ remainder \ remainderf \ + remquo \ + remquof \ rint \ rintf \ round \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index dea5094..a9deec8 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -308,9 +308,9 @@ @ cdecl remainder(double double) ucrtbase.remainder @ cdecl remainderf(float float) ucrtbase.remainderf @ cdecl remainderl(double double) ucrtbase.remainderl -@ stub remquo -@ stub remquof -@ stub remquol +@ cdecl remquo(double double ptr) ucrtbase.remquo +@ cdecl remquof(float float ptr) ucrtbase.remquof +@ cdecl remquol(double double ptr) ucrtbase.remquol @ cdecl rint(double) ucrtbase.rint @ cdecl rintf(float) ucrtbase.rintf @ cdecl rintl(double) ucrtbase.rintl diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 8cd39ea..618b9bc 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2328,9 +2328,9 @@ @ cdecl remainderf(float float) MSVCR120_remainderf @ cdecl remainderl(double double) MSVCR120_remainderl @ cdecl remove(str) MSVCRT_remove -@ stub remquo -@ stub remquof -@ stub remquol +@ cdecl remquo(double double ptr) MSVCR120_remquo +@ cdecl remquof(float float ptr) MSVCR120_remquof +@ cdecl remquol(double double ptr) MSVCR120_remquol @ cdecl rename(str str) MSVCRT_rename @ cdecl rewind(ptr) MSVCRT_rewind @ cdecl rint(double) MSVCR120_rint diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index dc3f3bd..26ffaf7 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1991,9 +1991,9 @@ @ cdecl remainderf(float float) msvcr120.remainderf @ cdecl remainderl(double double) msvcr120.remainderl @ cdecl remove(str) msvcr120.remove -@ stub remquo -@ stub remquof -@ stub remquol +@ cdecl remquo(double double ptr) msvcr120.remquo +@ cdecl remquof(float float ptr) msvcr120.remquof +@ cdecl remquol(double double ptr) msvcr120.remquol @ cdecl rename(str str) msvcr120.rename @ cdecl rewind(ptr) msvcr120.rewind @ cdecl rint(double) msvcr120.rint diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 754e46c..c893c83 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3273,6 +3273,44 @@ LDOUBLE CDECL MSVCR120_remainderl(LDOUBLE x, LDOUBLE y) } /********************************************************************* + * remquo (MSVCR120.@) + */ +double CDECL MSVCR120_remquo(double x, double y, int *quo) +{ +#ifdef HAVE_REMQUO + if(!finite(x)) *MSVCRT__errno() = MSVCRT_EDOM; + if(isnan(y) || y==0.0) *MSVCRT__errno() = MSVCRT_EDOM; + return remquo(x, y, quo); +#else + FIXME( "not implemented\n" ); + return 0.0; +#endif +} + +/********************************************************************* + * remquof (MSVCR120.@) + */ +float CDECL MSVCR120_remquof(float x, float y, int *quo) +{ +#ifdef HAVE_REMQUOF + if(!finitef(x)) *MSVCRT__errno() = MSVCRT_EDOM; + if(isnan(y) || y==0.0f) *MSVCRT__errno() = MSVCRT_EDOM; + return remquof(x, y, quo); +#else + FIXME( "not implemented\n" ); + return 0.0f; +#endif +} + +/********************************************************************* + * remquol (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_remquol(LDOUBLE x, LDOUBLE y, int *quo) +{ + return MSVCR120_remquo(x, y, quo); +} + +/********************************************************************* * lgamma (MSVCR120.@) */ double CDECL MSVCR120_lgamma(double x) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index d218aa3..1866f1b 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2463,9 +2463,9 @@ @ cdecl remainderf(float float) MSVCR120_remainderf @ cdecl remainderl(double double) MSVCR120_remainderl @ cdecl remove(str) MSVCRT_remove -@ stub remquo -@ stub remquof -@ stub remquol +@ cdecl remquo(double double ptr) MSVCR120_remquo +@ cdecl remquof(float float ptr) MSVCR120_remquof +@ cdecl remquol(double double ptr) MSVCR120_remquol @ cdecl rename(str str) MSVCRT_rename @ cdecl rewind(ptr) MSVCRT_rewind @ cdecl rint(double) MSVCR120_rint diff --git a/include/config.h.in b/include/config.h.in index 535f43f..aeb571a 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -744,6 +744,12 @@ /* Define to 1 if you have the `remainderf' function. */ #undef HAVE_REMAINDERF +/* Define to 1 if you have the `remquo' function. */ +#undef HAVE_REMQUO + +/* Define to 1 if you have the `remquof' function. */ +#undef HAVE_REMQUOF + /* Define to 1 if the system has the type `request_sense'. */ #undef HAVE_REQUEST_SENSE

1 0

Zhiyi Zhang : kernel32/tests: Test readonly file access.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 304fb43aaa60268dbc01992cb049b5b27b9931b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=304fb43aaa60268dbc01992c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 9 23:54:04 2019 +0800 kernel32/tests: Test readonly file access. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 33b17aa..e92764b 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5228,6 +5228,75 @@ static void test_overlapped_read(void) ok(ret, "Unexpected error %u.\n", GetLastError()); } +static void test_file_readonly_access(void) +{ + static const DWORD default_sharing = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; + static const CHAR prefix[] = "pfx"; + CHAR file_name[MAX_PATH], file_name2[MAX_PATH]; + CHAR temp_path[MAX_PATH]; + HANDLE handle; + DWORD error; + DWORD ret; + + /* Set up */ + ret = GetTempPathA(MAX_PATH, temp_path); + ok(ret != 0, "GetTempPathA error %d\n", GetLastError()); + ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n"); + + ret = GetTempFileNameA(temp_path, prefix, 0, file_name); + ok(ret != 0, "GetTempFileNameA error %d\n", GetLastError()); + ret = DeleteFileA(file_name); + ok(ret, "expect success\n"); + + ret = GetTempFileNameA(temp_path, prefix, 0, file_name2); + ok(ret != 0, "GetTempFileNameA error %d\n", GetLastError()); + ret = DeleteFileA(file_name2); + ok(ret, "expect success\n"); + + handle = CreateFileA(file_name, 0, default_sharing, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_READONLY, 0); + ok(handle != INVALID_HANDLE_VALUE, "CreateFileA: error %d\n", GetLastError()); + CloseHandle(handle); + + /* CreateFile GENERIC_WRITE */ + SetLastError(0xdeadbeef); + handle = CreateFileA(file_name, GENERIC_WRITE, default_sharing, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); + error = GetLastError(); + ok(handle == INVALID_HANDLE_VALUE, "expect failure\n"); + ok(error == ERROR_ACCESS_DENIED, "wrong error code: %#x\n", error); + + /* CreateFile DELETE without FILE_FLAG_DELETE_ON_CLOSE */ + handle = CreateFileA(file_name, DELETE, default_sharing, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); + ok(handle != INVALID_HANDLE_VALUE, "expect success\n"); + CloseHandle(handle); + + /* CreateFile DELETE with FILE_FLAG_DELETE_ON_CLOSE */ + SetLastError(0xdeadbeef); + handle = CreateFileA(file_name, DELETE, default_sharing, NULL, OPEN_EXISTING, + FILE_FLAG_DELETE_ON_CLOSE | FILE_ATTRIBUTE_NORMAL, 0); + error = GetLastError(); + ok(handle == INVALID_HANDLE_VALUE, "expect failure\n"); + ok(error == ERROR_ACCESS_DENIED, "wrong error code: %#x\n", error); + + ret = MoveFileA(file_name, file_name2); + ok(ret, "expect success\n"); + ret = MoveFileA(file_name2, file_name); + ok(ret, "expect success\n"); + + SetLastError(0xdeadbeef); + ret = DeleteFileA(file_name); + error = GetLastError(); + ok(!ret, "expect failure\n"); + ok(error == ERROR_ACCESS_DENIED, "wrong error code: %#x\n", error); + + ret = GetFileAttributesA(file_name); + ok(ret & FILE_ATTRIBUTE_READONLY, "got wrong attribute: %#x.\n", ret); + + /* Clean up */ + SetFileAttributesA(file_name, FILE_ATTRIBUTE_NORMAL); + ret = DeleteFileA(file_name); + ok(ret, "DeleteFileA: error %d\n", GetLastError()); +} + START_TEST(file) { char temp_path[MAX_PATH]; @@ -5298,4 +5367,5 @@ START_TEST(file) test_GetFileAttributesExW(); test_post_completion(); test_overlapped_read(); + test_file_readonly_access(); }

1 0

Martin Storsjo : msvcrt: Implement _get_environ and _get_wenviron.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: f20be3b00cee829ada0c7b4ed67af8f63b6aeff3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f20be3b00cee829ada0c7b4e… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Apr 10 15:51:55 2019 +0300 msvcrt: Implement _get_environ and _get_wenviron. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/environ.c | 16 ++++++++++++++++ dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/tests/environ.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index cce62bc..cc180e8 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -310,3 +310,19 @@ int CDECL _wgetenv_s(MSVCRT_size_t *pReturnValue, MSVCRT_wchar_t *buffer, MSVCRT strcpyW(buffer, e); return 0; } + +/********************************************************************* + * _get_environ (MSVCRT.@) + */ +void CDECL MSVCRT__get_environ(char ***ptr) +{ + *ptr = MSVCRT__environ; +} + +/********************************************************************* + * _get_wenviron (MSVCRT.@) + */ +void CDECL MSVCRT__get_wenviron(MSVCRT_wchar_t ***ptr) +{ + *ptr = MSVCRT__wenviron; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 0c2881d..5be4b4c 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -501,7 +501,7 @@ @ cdecl _gcvt_s(ptr long double long) MSVCRT__gcvt_s @ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _get_doserrno(ptr) -# stub _get_environ(ptr) +@ cdecl _get_environ(ptr) MSVCRT__get_environ @ cdecl _get_errno(ptr) # stub _get_fileinfo(ptr) @ cdecl _get_fmode(ptr) MSVCRT__get_fmode @@ -512,7 +512,7 @@ @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_sbh_threshold() -# stub _get_wenviron(ptr) +@ cdecl _get_wenviron(ptr) MSVCRT__get_wenviron @ cdecl _get_winmajor(ptr) MSVCRT__get_winmajor @ cdecl _get_winminor(ptr) MSVCRT__get_winminor # stub _get_winver(ptr) diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index fdfe81f..11b79f0 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -47,6 +47,8 @@ void __cdecl __wgetmainargs(int *, wchar_t ***, wchar_t ***, int, int *); static char ***(__cdecl *p__p__environ)(void); static WCHAR ***(__cdecl *p__p__wenviron)(void); +static void (*p_get_environ)(char ***); +static void (*p_get_wenviron)(WCHAR ***); static char ***p_environ; static WCHAR ***p_wenviron; @@ -59,6 +61,8 @@ static void init(void) p__p__wenviron = (void *)GetProcAddress(hmod, "__p__wenviron"); p_environ = (void *)GetProcAddress(hmod, "_environ"); p_wenviron = (void *)GetProcAddress(hmod, "_wenviron"); + p_get_environ = (void *)GetProcAddress(hmod, "_get_environ"); + p_get_wenviron = (void *)GetProcAddress(hmod, "_get_wenviron"); } static void test_system(void) @@ -95,6 +99,16 @@ static void test__environ(void) else win_skip( "__p__environ() is not available\n" ); + if (p_get_environ) + { + char **retptr; + p_get_environ(&retptr); + ok( retptr == *p_environ, + "Expected _environ pointers to be identical\n" ); + } + else + win_skip( "_get_environ() is not available\n" ); + /* Note that msvcrt from Windows versions older than Vista * expects the mode pointer parameter to be valid.*/ __getmainargs(&argc, &argv, &envp, 0, &mode); @@ -151,6 +165,16 @@ static void test__wenviron(void) else win_skip( "__p__wenviron() is not available\n" ); + if (p_get_wenviron) + { + WCHAR **retptr; + p_get_wenviron(&retptr); + ok( retptr == NULL, + "Expected _wenviron pointers to be NULL\n" ); + } + else + win_skip( "_get_wenviron() is not available\n" ); + /* __getmainargs doesn't initialize _wenviron. */ __getmainargs(&argc, &argv, &envp, 0, &mode); @@ -191,6 +215,14 @@ static void test__wenviron(void) "Expected _wenviron pointers to be identical\n" ); } + if (p_get_wenviron) + { + WCHAR **retptr; + p_get_wenviron(&retptr); + ok( retptr == *p_wenviron, + "Expected _wenviron pointers to be identical\n" ); + } + for (i = 0; ; i++) { if ((*p_wenviron)[i])

1 0

Alexandre Julliard : msvcp60: Rename clog variable to avoid conflict with builtin function.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 403674a9746fe195c7ca532f086a49f42f34274b URL: https://source.winehq.org/git/wine.git/?a=commit;h=403674a9746fe195c7ca532f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 11 10:13:49 2019 +0200 msvcp60: Rename clog variable to avoid conflict with builtin function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 10 +++++----- dlls/msvcp60/msvcp60.spec | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 079c4fa..f439339 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -13873,10 +13873,10 @@ static basic_filebuf_char filebuf_char_log; struct { basic_ostream_char obj; basic_ios_char vbase; -} clog = { { 0 } }; +} MSVCP_clog = { { 0 } }; /* ?_Ptr_clog(a)std@@3PAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A */ /* ?_Ptr_clog(a)std@@3PEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)EA */ -basic_ostream_char *_Ptr_clog = &clog.obj; +basic_ostream_char *_Ptr_clog = &MSVCP_clog.obj; static basic_filebuf_wchar filebuf_short_log; /* ?wclog(a)std@@3V?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)A */ @@ -13939,7 +13939,7 @@ void __cdecl ios_base_Init__Init_dtor(void *this) if(!ios_base_Init__Init_cnt) { basic_ostream_char_flush(&cout.obj); basic_ostream_char_flush(&cerr.obj); - basic_ostream_char_flush(&clog.obj); + basic_ostream_char_flush(&MSVCP_clog.obj); } } @@ -14079,7 +14079,7 @@ void init_io(void *base) basic_ostream_short_ctor(&wcerr.obj, &filebuf_wchar_stderr.base, FALSE/*FIXME*/, TRUE, TRUE); basic_filebuf_char_ctor_file(&filebuf_char_log, stderr); - basic_ostream_char_ctor(&clog.obj, &filebuf_char_log.base, FALSE/*FIXME*/, TRUE, TRUE); + basic_ostream_char_ctor(&MSVCP_clog.obj, &filebuf_char_log.base, FALSE/*FIXME*/, TRUE, TRUE); basic_filebuf_short_ctor_file(&filebuf_short_log, stderr); basic_ostream_short_ctor(&uclog.obj, &filebuf_short_log.base, FALSE/*FIXME*/, TRUE, TRUE); @@ -14117,7 +14117,7 @@ void free_io(void) basic_ostream_wchar_vbase_dtor(&wcerr.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stderr); - basic_ostream_char_vbase_dtor(&clog.obj); + basic_ostream_char_vbase_dtor(&MSVCP_clog.obj); basic_filebuf_char_dtor(&filebuf_char_log); basic_ostream_wchar_vbase_dtor(&uclog.obj); diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index f496430..196ac6a 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2515,7 +2515,7 @@ @ stub -arch=win64 ?clear(a)ios_base@std@@QEAAXF(a)Z @ thiscall -arch=win32 ?clear(a)ios_base@std@@QAEXH_N(a)Z(ptr long long) ios_base_clear_reraise @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXH_N(a)Z(ptr long long) ios_base_clear_reraise -@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A clog +@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A MSVCP_clog @ thiscall -arch=win32 ?close@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)XZ(ptr) basic_filebuf_char_close @ cdecl -arch=win64 ?close@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)XZ(ptr) basic_filebuf_char_close @ thiscall -arch=win32 ?close@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QAEPAV12(a)XZ(ptr) basic_filebuf_wchar_close

1 0

Alexandre Julliard : msvcrt/tests: Add a function pointer to bypass builtin printf().
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 7b83b6b9dedca9d0256b0430b4758bf45edaa4e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b83b6b9dedca9d0256b0430… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 11 19:29:15 2019 +0200 msvcrt/tests: Add a function pointer to bypass builtin printf(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/printf.c | 300 +++++++++++++++++++++++---------------------- 1 file changed, 151 insertions(+), 149 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b83b6b9dedca9d0256b…

1 0

Alexandre Julliard : include: Default to the standards-compliant version of swprintf().
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 9b63daca51e859166adcbf687ce857feab30ff44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b63daca51e859166adcbf68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 11 10:04:28 2019 +0200 include: Default to the standards-compliant version of swprintf(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 20 ++++++++++++++++++-- include/msvcrt/wchar.h | 19 +++++++++++++++++-- programs/reg/export.c | 12 ++++++------ programs/reg/reg.c | 8 ++++---- programs/regedit/framewnd.c | 3 ++- programs/regedit/regproc.c | 14 +++++++------- programs/taskmgr/graph.c | 6 +++--- programs/taskmgr/taskmgr.c | 2 +- programs/wordpad/wordpad.c | 2 +- 9 files changed, 59 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9b63daca51e859166adc…

1 0

Alexandre Julliard : include: Add cast to avoid a compiler warning on MSVC.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: d97d922afd5215327aa3613fae07c977a5ef4f11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d97d922afd5215327aa3613f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 11 09:18:46 2019 +0200 include: Add cast to avoid a compiler warning on MSVC. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46991 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index 6a981d6..aa4dc0d 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -290,7 +290,7 @@ static inline const char *wine_dbgstr_wn( const WCHAR *str, int n ) *dst++ = hex[(c >> 4) & 0x0f]; *dst++ = hex[c & 0x0f]; } - else *dst++ = c; + else *dst++ = (char)c; } } *dst++ = '"';

1 0