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

Akihiro Sagawa : comctl32/edit: Implement EC_USEFONTINFO margins in the CJK case.
by Alexandre Julliard 24 Apr '19

24 Apr '19

Module: wine Branch: master Commit: ef94a9fc6c52fdbc76092e73964a1ed1082a7d07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef94a9fc6c52fdbc76092e73… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Apr 24 21:42:19 2019 +0900 comctl32/edit: 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/comctl32/edit.c | 45 ++++++++++++++++++++++++++++++++++++++++++--- dlls/comctl32/tests/edit.c | 2 -- 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 38a0d97..fc3742d 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -2685,6 +2685,36 @@ static void EDIT_EM_SetLimitText(EDITSTATE *es, UINT limit) es->buffer_limit = limit; } +static BOOL is_cjk(HDC dc) +{ + const DWORD FS_DBCS_MASK = FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB; + FONTSIGNATURE fs; + + switch (GdiGetCodePage(dc)) { + case 932: case 936: case 949: case 950: case 1361: + return TRUE; + default: + return (GetTextCharsetInfo(dc, &fs, 0) != DEFAULT_CHARSET && + (fs.fsCsb[0] & FS_DBCS_MASK)); + } +} + +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 *); /********************************************************************* * @@ -2714,9 +2744,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(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/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index b76a419..fa273a4 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1686,7 +1686,6 @@ 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 && 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); @@ -1706,7 +1705,6 @@ 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 && 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

Vijay Kiran Kamuju : include: Add CAL_UMALQURA definition to winnls.h.
by Alexandre Julliard 24 Apr '19

24 Apr '19

Module: wine Branch: master Commit: 370441b33ddb8d9564028759fb267ba1d2ad0b9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=370441b33ddb8d9564028759… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Apr 24 15:12:57 2019 +0200 include: Add CAL_UMALQURA definition to winnls.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnls.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/winnls.h b/include/winnls.h index c8580bd..5e5d8d1 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -553,6 +553,8 @@ static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e',' #define CAL_GREGORIAN_ARABIC 10 #define CAL_GREGORIAN_XLIT_ENGLISH 11 #define CAL_GREGORIAN_XLIT_FRENCH 12 +#define CAL_PERSIAN 22 +#define CAL_UMALQURA 23 /* EnumCalendarInfo Flags */ #define ENUM_ALL_CALENDARS 0xffffffff /* Enumerate all calendars within a locale */

1 0

Alexandre Julliard : configure: Add check for recent enough bison.
by Alexandre Julliard 24 Apr '19

24 Apr '19

Module: wine Branch: master Commit: a4c93936c9493f7619e1877b522eeb809a390dfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4c93936c9493f7619e1877b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 24 22:31:31 2019 +0200 configure: Add check for recent enough bison. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 20 ++++++++++++++++++++ configure.ac | 13 +++++++++++++ 2 files changed, 33 insertions(+) diff --git a/configure b/configure index 1ed30b9..e97f57f 100755 --- a/configure +++ b/configure @@ -5892,6 +5892,26 @@ if test "$BISON" = "none" then as_fn_error $? "no suitable bison found. Please install the 'bison' package." "$LINENO" 5 fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether bison is recent enough" >&5 +$as_echo_n "checking whether bison is recent enough... " >&6; } +if ${wine_cv_recent_bison+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat >conftest.y <<EOF +%define parse.error verbose +%% +empty: ; +EOF + if $BISON conftest.y >/dev/null 2>&5 + then + wine_cv_recent_bison=yes + else + wine_cv_recent_bison=no + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_recent_bison" >&5 +$as_echo "$wine_cv_recent_bison" >&6; } +test $wine_cv_recent_bison != no || as_fn_error $? "Your bison version is too old. Please install bison version 3.0 or newer." "$LINENO" 5 if test -n "$ac_tool_prefix"; then for ac_prog in ar gar diff --git a/configure.ac b/configure.ac index 68d52a8..d1502ba 100644 --- a/configure.ac +++ b/configure.ac @@ -288,6 +288,19 @@ if test "$BISON" = "none" then AC_MSG_ERROR([no suitable bison found. Please install the 'bison' package.]) fi +AC_CACHE_CHECK([whether bison is recent enough],wine_cv_recent_bison, + [cat >conftest.y <<EOF +%define parse.error verbose +%% +empty: ; +EOF + if $BISON conftest.y >/dev/null 2>&AS_MESSAGE_LOG_FD + then + wine_cv_recent_bison=yes + else + wine_cv_recent_bison=no + fi]) +test $wine_cv_recent_bison != no || AC_MSG_ERROR([Your bison version is too old. Please install bison version 3.0 or newer.]) AC_CHECK_TOOLS(AR,[ar gar],ar) AC_CHECK_TOOL(STRIP,strip,strip)

1 0

John Thomson : shell32: Do not fail in SHCreateDirectoryExW for ERROR_ALREADY_EXISTS.
by Alexandre Julliard 24 Apr '19

24 Apr '19

Module: wine Branch: master Commit: 9b6d198a3c7c8a02aa69c0d3d11829712e9778a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b6d198a3c7c8a02aa69c0d3… Author: John Thomson <git(a)johnthomson.fastmail.com.au> Date: Wed Apr 17 10:34:38 2019 +1000 shell32: Do not fail in SHCreateDirectoryExW for ERROR_ALREADY_EXISTS. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47023 Signed-off-by: John Thomson <git(a)johnthomson.fastmail.com.au> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlfileop.c | 4 +++- dlls/shell32/tests/shlfileop.c | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index c7bd54d..1515ad3 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -763,7 +763,9 @@ int WINAPI SHCreateDirectoryExW(HWND hWnd, LPCWSTR path, LPSECURITY_ATTRIBUTES s } } - if (ret && hWnd && (ERROR_CANCELLED != ret)) + if (ret && hWnd && + ret != ERROR_CANCELLED && + ret != ERROR_ALREADY_EXISTS) { /* We failed and should show a dialog box */ FIXME("Show system error message, creating path %s, failed with error %d\n", debugstr_w(path), ret); diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 8fb4dcf..27c7244 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -2543,6 +2543,7 @@ static void test_unicode(void) int ret; HANDLE file; static const WCHAR UNICODE_PATH_TO[] = {'c',':','\\',0x00ae,0x00ae,'\0'}; + HWND hwnd; shfoW.hwnd = NULL; shfoW.wFunc = FO_DELETE; @@ -2633,6 +2634,20 @@ static void test_unicode(void) ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == ERROR_INVALID_HANDLE), /* WinXp, win2k3 */ "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + + /* Check SHCreateDirectoryExW with a Hwnd + * returns ERROR_ALREADY_EXISTS where a directory already exists */ + /* Get any window handle */ + hwnd = FindWindowA(NULL, NULL); + ok(hwnd != 0, "FindWindowA failed to produce a hwnd\n"); + ret = SHCreateDirectoryExW(hwnd, UNICODE_PATH, NULL); + ok(!ret, "SHCreateDirectoryExW returned %d\n", ret); + /* Create already-existing directory */ + ok(file_existsW(UNICODE_PATH), "The directory was not created\n"); + ret = SHCreateDirectoryExW(hwnd, UNICODE_PATH, NULL); + ok(ret == ERROR_ALREADY_EXISTS, + "Expected ERROR_ALREADY_EXISTS, got %d\n", ret); + RemoveDirectoryW(UNICODE_PATH); } static void

1 0

Nikolay Sivov : dbgeng: Improve GetDebuggeeType() stub.
by Alexandre Julliard 24 Apr '19

24 Apr '19

Module: wine Branch: master Commit: 3842fe5ae3957ff0f78f6cc2c83482c1361c0658 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3842fe5ae3957ff0f78f6cc2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 24 08:35:32 2019 +0300 dbgeng: Improve GetDebuggeeType() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 19 ++++++++++++++++--- include/dbgeng.h | 21 +++++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index 287e0d8..569b824 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -2525,11 +2525,24 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_OutputStackTrace(IDebugControl2 *i return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugcontrol_GetDebuggeeType(IDebugControl2 *iface, ULONG *_class, ULONG *qualifier) +static HRESULT STDMETHODCALLTYPE debugcontrol_GetDebuggeeType(IDebugControl2 *iface, ULONG *debug_class, + ULONG *qualifier) { - FIXME("%p, %p, %p stub.\n", iface, _class, qualifier); + struct debug_client *debug_client = impl_from_IDebugControl2(iface); + static struct target_process *target; - return E_NOTIMPL; + FIXME("%p, %p, %p stub.\n", iface, debug_class, qualifier); + + *debug_class = DEBUG_CLASS_UNINITIALIZED; + *qualifier = 0; + + if (!(target = debug_client_get_target(debug_client))) + return E_UNEXPECTED; + + *debug_class = DEBUG_CLASS_USER_WINDOWS; + *qualifier = DEBUG_USER_WINDOWS_PROCESS; + + return S_OK; } static HRESULT STDMETHODCALLTYPE debugcontrol_GetActualProcessorType(IDebugControl2 *iface, ULONG *type) diff --git a/include/dbgeng.h b/include/dbgeng.h index 3017eda..0c97d2c 100644 --- a/include/dbgeng.h +++ b/include/dbgeng.h @@ -169,6 +169,27 @@ DEFINE_GUID(IID_IDebugSystemObjects3, 0xe9676e2f, 0xe286, 0x4ea3, 0xb0, 0xf9 #define DEBUG_MODNAME_SYMBOL_FILE 3 #define DEBUG_MODNAME_MAPPED_IMAGE 4 +#define DEBUG_CLASS_UNINITIALIZED 0 +#define DEBUG_CLASS_KERNEL 1 +#define DEBUG_CLASS_USER_WINDOWS 2 +#define DEBUG_CLASS_IMAGE_FILE 3 + +#define DEBUG_DUMP_SMALL 1024 +#define DEBUG_DUMP_DEFAULT 1025 +#define DEBUG_DUMP_FULL 1026 +#define DEBUG_DUMP_IMAGE_FILE 1027 +#define DEBUG_DUMP_TRACE_LOG 1028 +#define DEBUG_DUMP_WINDOWS_CE 1029 +#define DEBUG_DUMP_ACTIVE 1030 + +#define DEBUG_USER_WINDOWS_PROCESS 0 +#define DEBUG_USER_WINDOWS_PROCESS_SERVER 1 +#define DEBUG_USER_WINDOWS_IDNA 2 +#define DEBUG_USER_WINDOWS_REPT 3 +#define DEBUG_USER_WINDOWS_SMALL_DUMP DEBUG_DUMP_SMALL +#define DEBUG_USER_WINDOWS_DUMP DEBUG_DUMP_DEFAULT +#define DEBUG_USER_WINDOWS_DUMP_WINDOWS_CE DEBUG_DUMP_WINDOWS_CE + #define DEBUG_INVALID_OFFSET ((ULONG64)-1) #define DEBUG_ANY_ID 0xffffffff

1 0

Nikolay Sivov : dbgeng: Set module timestamp field.
by Alexandre Julliard 24 Apr '19

24 Apr '19

Module: wine Branch: master Commit: 173c720e59db999852f74011444c1fdb13ca0459 URL: https://source.winehq.org/git/wine.git/?a=commit;h=173c720e59db999852f74011… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 24 08:35:33 2019 +0300 dbgeng: Set module timestamp field. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index 569b824..95a95b6 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -108,13 +108,28 @@ static WORD debug_target_get_module_machine(struct target_process *target, HMODU ReadProcessMemory(target->handle, module, &dos, sizeof(dos), NULL); if (dos.e_magic == IMAGE_DOS_SIGNATURE) { - ReadProcessMemory(target->handle, (const char *)module + dos.e_lfanew + 4 /* signature */, &machine, + ReadProcessMemory(target->handle, (const char *)module + dos.e_lfanew + 4 /* PE signature */, &machine, sizeof(machine), NULL); } return machine; } +static DWORD debug_target_get_module_timestamp(struct target_process *target, HMODULE module) +{ + IMAGE_DOS_HEADER dos = { 0 }; + DWORD timestamp = 0; + + ReadProcessMemory(target->handle, module, &dos, sizeof(dos), NULL); + if (dos.e_magic == IMAGE_DOS_SIGNATURE) + { + ReadProcessMemory(target->handle, (const char *)module + dos.e_lfanew + 4 /* PE signature */ + + FIELD_OFFSET(IMAGE_FILE_HEADER, TimeDateStamp), &timestamp, sizeof(timestamp), NULL); + } + + return timestamp; +} + static HRESULT debug_target_init_modules_info(struct target_process *target) { unsigned int i, count; @@ -156,6 +171,7 @@ static HRESULT debug_target_init_modules_info(struct target_process *target) target->modules.info[i].params.Base = (ULONG_PTR)info.lpBaseOfDll; target->modules.info[i].params.Size = info.SizeOfImage; + target->modules.info[i].params.TimeDateStamp = debug_target_get_module_timestamp(target, modules[i]); GetModuleFileNameExA(target->handle, modules[i], target->modules.info[i].image_name, ARRAY_SIZE(target->modules.info[i].image_name));

1 0

Nikolay Sivov : dbgeng: Add IDebugAdvanced stub.
by Alexandre Julliard 24 Apr '19

24 Apr '19

Module: wine Branch: master Commit: a36e03494e63ffe41cb6ffa8c103fe8b4b1f9706 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a36e03494e63ffe41cb6ffa8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 24 08:35:34 2019 +0300 dbgeng: Add IDebugAdvanced stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index 95a95b6..b62e4ad 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -67,6 +67,7 @@ struct debug_client IDebugDataSpaces IDebugDataSpaces_iface; IDebugSymbols3 IDebugSymbols3_iface; IDebugControl2 IDebugControl2_iface; + IDebugAdvanced IDebugAdvanced_iface; LONG refcount; ULONG engine_options; struct list targets; @@ -259,6 +260,11 @@ static struct debug_client *impl_from_IDebugControl2(IDebugControl2 *iface) return CONTAINING_RECORD(iface, struct debug_client, IDebugControl2_iface); } +static struct debug_client *impl_from_IDebugAdvanced(IDebugAdvanced *iface) +{ + return CONTAINING_RECORD(iface, struct debug_client, IDebugAdvanced_iface); +} + static HRESULT STDMETHODCALLTYPE debugclient_QueryInterface(IDebugClient *iface, REFIID riid, void **obj) { struct debug_client *debug_client = impl_from_IDebugClient(iface); @@ -285,6 +291,10 @@ static HRESULT STDMETHODCALLTYPE debugclient_QueryInterface(IDebugClient *iface, { *obj = &debug_client->IDebugControl2_iface; } + else if (IsEqualIID(riid, &IID_IDebugAdvanced)) + { + *obj = &debug_client->IDebugAdvanced_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -3289,6 +3299,53 @@ static const IDebugControl2Vtbl debugcontrolvtbl = debugcontrol_OutputTextReplacements, }; +static HRESULT STDMETHODCALLTYPE debugadvanced_QueryInterface(IDebugAdvanced *iface, REFIID riid, void **obj) +{ + struct debug_client *debug_client = impl_from_IDebugAdvanced(iface); + IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; + return IUnknown_QueryInterface(unk, riid, obj); +} + +static ULONG STDMETHODCALLTYPE debugadvanced_AddRef(IDebugAdvanced *iface) +{ + struct debug_client *debug_client = impl_from_IDebugAdvanced(iface); + IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; + return IUnknown_AddRef(unk); +} + +static ULONG STDMETHODCALLTYPE debugadvanced_Release(IDebugAdvanced *iface) +{ + struct debug_client *debug_client = impl_from_IDebugAdvanced(iface); + IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; + return IUnknown_Release(unk); +} + +static HRESULT STDMETHODCALLTYPE debugadvanced_GetThreadContext(IDebugAdvanced *iface, void *context, + ULONG context_size) +{ + FIXME("%p, %p, %u stub.\n", iface, context, context_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugadvanced_SetThreadContext(IDebugAdvanced *iface, void *context, + ULONG context_size) +{ + FIXME("%p, %p, %u stub.\n", iface, context, context_size); + + return E_NOTIMPL; +} + +static const IDebugAdvancedVtbl debugadvancedvtbl = +{ + debugadvanced_QueryInterface, + debugadvanced_AddRef, + debugadvanced_Release, + /* IDebugAdvanced */ + debugadvanced_GetThreadContext, + debugadvanced_SetThreadContext, +}; + /************************************************************ * DebugExtensionInitialize (DBGENG.@) * @@ -3333,6 +3390,7 @@ HRESULT WINAPI DebugCreate(REFIID riid, void **obj) debug_client->IDebugDataSpaces_iface.lpVtbl = &debugdataspacesvtbl; debug_client->IDebugSymbols3_iface.lpVtbl = &debugsymbolsvtbl; debug_client->IDebugControl2_iface.lpVtbl = &debugcontrolvtbl; + debug_client->IDebugAdvanced_iface.lpVtbl = &debugadvancedvtbl; debug_client->refcount = 1; list_init(&debug_client->targets);

1 0

Nikolay Sivov : dbgeng: Add IDebugSystemObjects stub.
by Alexandre Julliard 24 Apr '19

24 Apr '19

Module: wine Branch: master Commit: 7118bfedd82c74b8f914f758a5dc2e040aff4d51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7118bfedd82c74b8f914f758… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 24 08:35:35 2019 +0300 dbgeng: Add IDebugSystemObjects stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 280 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 280 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7118bfedd82c74b8f914…

1 0

Alexandre Julliard : makefiles: Allow using EXTRADLLFLAGS instead of APPMODE.
by Alexandre Julliard 24 Apr '19

24 Apr '19

Module: wine Branch: master Commit: a58f4abc08212116e39337c745aa6b5d3a7ca212 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a58f4abc08212116e39337c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 24 11:27:39 2019 +0200 makefiles: Allow using EXTRADLLFLAGS instead of APPMODE. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/notepad/Makefile.in | 3 ++- programs/reg/Makefile.in | 3 ++- programs/regedit/Makefile.in | 3 ++- programs/taskmgr/Makefile.in | 3 ++- programs/wordpad/Makefile.in | 3 ++- programs/xcopy/Makefile.in | 3 ++- tools/make_makefiles | 10 +++++++--- 7 files changed, 19 insertions(+), 9 deletions(-) diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in index 26e977d..06c5ff0 100644 --- a/programs/notepad/Makefile.in +++ b/programs/notepad/Makefile.in @@ -1,7 +1,8 @@ MODULE = notepad.exe -APPMODE = -mwindows -mno-cygwin IMPORTS = comdlg32 shell32 shlwapi user32 gdi32 advapi32 +EXTRADLLFLAGS = -mwindows -mno-cygwin + C_SRCS = \ dialog.c \ main.c diff --git a/programs/reg/Makefile.in b/programs/reg/Makefile.in index 7c6a899..248b470 100644 --- a/programs/reg/Makefile.in +++ b/programs/reg/Makefile.in @@ -1,8 +1,9 @@ MODULE = reg.exe -APPMODE = -mconsole -municode -mno-cygwin IMPORTS = advapi32 DELAYIMPORTS = user32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = \ export.c \ import.c \ diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in index 18602ef..5b9df84 100644 --- a/programs/regedit/Makefile.in +++ b/programs/regedit/Makefile.in @@ -1,8 +1,9 @@ MODULE = regedit.exe -APPMODE = -mwindows -municode -mno-cygwin IMPORTS = advapi32 DELAYIMPORTS = shlwapi shell32 comdlg32 comctl32 user32 gdi32 +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + C_SRCS = \ about.c \ childwnd.c \ diff --git a/programs/taskmgr/Makefile.in b/programs/taskmgr/Makefile.in index 6006ac3..c385e9b 100644 --- a/programs/taskmgr/Makefile.in +++ b/programs/taskmgr/Makefile.in @@ -1,7 +1,8 @@ MODULE = taskmgr.exe -APPMODE = -mwindows -mno-cygwin IMPORTS = shell32 shlwapi comctl32 user32 gdi32 advapi32 +EXTRADLLFLAGS = -mwindows -mno-cygwin + C_SRCS = \ about.c \ affinity.c \ diff --git a/programs/wordpad/Makefile.in b/programs/wordpad/Makefile.in index 5778692..ea12d91 100644 --- a/programs/wordpad/Makefile.in +++ b/programs/wordpad/Makefile.in @@ -1,7 +1,8 @@ MODULE = wordpad.exe -APPMODE = -mwindows -mno-cygwin IMPORTS = comdlg32 uuid ole32 shell32 user32 gdi32 advapi32 comctl32 +EXTRADLLFLAGS = -mwindows -mno-cygwin + C_SRCS = \ olecallback.c \ print.c \ diff --git a/programs/xcopy/Makefile.in b/programs/xcopy/Makefile.in index 05931c5..5059e71 100644 --- a/programs/xcopy/Makefile.in +++ b/programs/xcopy/Makefile.in @@ -1,7 +1,8 @@ MODULE = xcopy.exe -APPMODE = -mconsole -municode -mno-cygwin IMPORTS = shell32 user32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = \ xcopy.c diff --git a/tools/make_makefiles b/tools/make_makefiles index 111bc8f..7c376ac 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -229,7 +229,7 @@ sub parse_makefile($) { die "Configure substitution is not allowed in $file" unless $file eq "Makefile"; } - if (/^\s*(MODULE|IMPORTLIB|TESTDLL|PARENTSRC|APPMODE)\s*=\s*(.*)/) + if (/^\s*(MODULE|IMPORTLIB|TESTDLL|PARENTSRC|APPMODE|EXTRADLLFLAGS)\s*=\s*(.*)/) { my $var = $1; $make{$var} = $2; @@ -438,18 +438,21 @@ sub update_makefiles(@) elsif (defined($make{"MODULE"})) # dll or program { (my $name = $file) =~ s/^(dlls|programs)\/(.*)\/Makefile/$2/; + my $dllflags = $make{"EXTRADLLFLAGS"} || ""; + if (defined $make{"APPMODE"}) { $dllflags .= " " . $make{"APPMODE"}; } die "MODULE should not be defined in $file" unless $file =~ /^(dlls|programs)\//; die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; die "Invalid MODULE in $file" if $name =~ /\./ && $make{"MODULE"} ne $name; if ($file =~ /^programs\//) { - die "APPMODE should be defined in $file" unless defined $make{"APPMODE"} ; - die "APPMODE should contain -mconsole or -mwindows in $file" unless $make{"APPMODE"} =~ /-m(console|windows)/; + die "EXTRADLLFLAGS should be defined in $file" unless $dllflags; + die "EXTRADLLFLAGS should contain -mconsole or -mwindows in $file" unless $dllflags =~ /-m(console|windows)/; die "Invalid MODULE in $file" unless $name =~ /\./ || $make{"MODULE"} eq "$name.exe"; } else { die "APPMODE should not be defined in $file" if defined $make{"APPMODE"} ; + die "EXTRADLLFLAGS should not contain -mconsole or -mwindows in $file" if $dllflags =~ /-m(console|windows)/; die "Invalid MODULE in $file" unless $name =~ /\./ || $make{"MODULE"} eq "$name.dll"; } if (defined $make{"IMPORTLIB"}) @@ -462,6 +465,7 @@ sub update_makefiles(@) elsif ($file =~ /^tools.*\/Makefile$/) { die "APPMODE should not be defined in $file" if defined $make{"APPMODE"}; + die "EXTRADLLFLAGS should not be defined in $file" if defined $make{"EXTRADLLFLAGS"}; die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; $args = ",,[test \"x\$enable_tools\" = xno]"; }

1 0

Alexandre Julliard : makefiles: Build stub programs with msvcrt.
by Alexandre Julliard 24 Apr '19

24 Apr '19

Module: wine Branch: master Commit: 4ec78dc7b5da680d7df01696bd15975b48471ac6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ec78dc7b5da680d7df01696… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 24 11:27:57 2019 +0200 makefiles: Build stub programs with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/arp/Makefile.in | 3 ++- programs/aspnet_regiis/Makefile.in | 3 ++- programs/cacls/Makefile.in | 3 ++- programs/conhost/Makefile.in | 3 ++- programs/dism/Makefile.in | 3 ++- programs/dpnsvr/Makefile.in | 3 ++- programs/fc/Makefile.in | 3 ++- programs/find/Makefile.in | 3 ++- programs/findstr/Makefile.in | 3 ++- programs/fsutil/Makefile.in | 3 ++- programs/icacls/Makefile.in | 3 ++- programs/lodctr/Makefile.in | 3 ++- programs/mofcomp/Makefile.in | 4 ++-- programs/mshta/Makefile.in | 3 ++- programs/msinfo32/Makefile.in | 3 ++- programs/netsh/Makefile.in | 3 ++- programs/ngen/Makefile.in | 3 ++- programs/powershell/Makefile.in | 3 ++- programs/regasm/Makefile.in | 3 ++- programs/regsvcs/Makefile.in | 3 ++- programs/sdbinst/Makefile.in | 3 ++- programs/secedit/Makefile.in | 3 ++- programs/servicemodelreg/Makefile.in | 3 ++- programs/shutdown/Makefile.in | 3 ++- programs/subst/Makefile.in | 3 ++- programs/systeminfo/Makefile.in | 3 ++- programs/tasklist/Makefile.in | 3 ++- programs/unlodctr/Makefile.in | 3 ++- programs/wevtutil/Makefile.in | 3 ++- programs/wmplayer/Makefile.in | 3 ++- programs/wusa/Makefile.in | 3 ++- 31 files changed, 62 insertions(+), 32 deletions(-) diff --git a/programs/arp/Makefile.in b/programs/arp/Makefile.in index 397848b..2a7d1cd 100644 --- a/programs/arp/Makefile.in +++ b/programs/arp/Makefile.in @@ -1,5 +1,6 @@ MODULE = arp.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/aspnet_regiis/Makefile.in b/programs/aspnet_regiis/Makefile.in index 12b8f71..38c7a2f 100644 --- a/programs/aspnet_regiis/Makefile.in +++ b/programs/aspnet_regiis/Makefile.in @@ -1,5 +1,6 @@ MODULE = aspnet_regiis.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/cacls/Makefile.in b/programs/cacls/Makefile.in index 5307a9d..26cc907 100644 --- a/programs/cacls/Makefile.in +++ b/programs/cacls/Makefile.in @@ -1,5 +1,6 @@ MODULE = cacls.exe -APPMODE = -mconsole + +EXTRADLLFLAGS = -mconsole -mno-cygwin C_SRCS = \ cacls_main.c diff --git a/programs/conhost/Makefile.in b/programs/conhost/Makefile.in index 821cb5f..75ec7df 100644 --- a/programs/conhost/Makefile.in +++ b/programs/conhost/Makefile.in @@ -1,5 +1,6 @@ MODULE = conhost.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = conhost.c diff --git a/programs/dism/Makefile.in b/programs/dism/Makefile.in index 834d143..61d9fa4 100644 --- a/programs/dism/Makefile.in +++ b/programs/dism/Makefile.in @@ -1,4 +1,5 @@ MODULE = dism.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = dism.c diff --git a/programs/dpnsvr/Makefile.in b/programs/dpnsvr/Makefile.in index 1dac8a4..9bcf4ad 100644 --- a/programs/dpnsvr/Makefile.in +++ b/programs/dpnsvr/Makefile.in @@ -1,5 +1,6 @@ MODULE = dpnsvr.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/fc/Makefile.in b/programs/fc/Makefile.in index 96d878a..0a8f00f 100644 --- a/programs/fc/Makefile.in +++ b/programs/fc/Makefile.in @@ -1,4 +1,5 @@ MODULE = fc.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = fc.c diff --git a/programs/find/Makefile.in b/programs/find/Makefile.in index ef8d61b..0c6b334 100644 --- a/programs/find/Makefile.in +++ b/programs/find/Makefile.in @@ -1,4 +1,5 @@ MODULE = find.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = find.c diff --git a/programs/findstr/Makefile.in b/programs/findstr/Makefile.in index 10875af..0f29794 100644 --- a/programs/findstr/Makefile.in +++ b/programs/findstr/Makefile.in @@ -1,5 +1,6 @@ MODULE = findstr.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/fsutil/Makefile.in b/programs/fsutil/Makefile.in index f339c4c..64307e8 100644 --- a/programs/fsutil/Makefile.in +++ b/programs/fsutil/Makefile.in @@ -1,5 +1,6 @@ MODULE = fsutil.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/icacls/Makefile.in b/programs/icacls/Makefile.in index af919a5..7e3e50d 100644 --- a/programs/icacls/Makefile.in +++ b/programs/icacls/Makefile.in @@ -1,5 +1,6 @@ MODULE = icacls.exe -APPMODE = -mconsole + +EXTRADLLFLAGS = -mconsole -mno-cygwin C_SRCS = \ icacls_main.c diff --git a/programs/lodctr/Makefile.in b/programs/lodctr/Makefile.in index e74b1b8..af26db5 100644 --- a/programs/lodctr/Makefile.in +++ b/programs/lodctr/Makefile.in @@ -1,5 +1,6 @@ MODULE = lodctr.exe -APPMODE = -mconsole IMPORTS = loadperf +EXTRADLLFLAGS = -mconsole -mno-cygwin + C_SRCS = lodctr_main.c diff --git a/programs/mofcomp/Makefile.in b/programs/mofcomp/Makefile.in index 43d9e38..77fac00 100644 --- a/programs/mofcomp/Makefile.in +++ b/programs/mofcomp/Makefile.in @@ -1,5 +1,5 @@ MODULE = mofcomp.exe -APPMODE = -mconsole -municode -IMPORTS = kernel32 + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = mofcomp.c diff --git a/programs/mshta/Makefile.in b/programs/mshta/Makefile.in index 3a61c3d..f11d8a4 100644 --- a/programs/mshta/Makefile.in +++ b/programs/mshta/Makefile.in @@ -1,5 +1,6 @@ MODULE = mshta.exe -APPMODE = -mwindows -municode + +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/msinfo32/Makefile.in b/programs/msinfo32/Makefile.in index d752c91..e3e657b 100644 --- a/programs/msinfo32/Makefile.in +++ b/programs/msinfo32/Makefile.in @@ -1,7 +1,8 @@ MODULE = msinfo32.exe -APPMODE = -mwindows -municode IMPORTS = shell32 user32 +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + C_SRCS = \ main.c diff --git a/programs/netsh/Makefile.in b/programs/netsh/Makefile.in index 27e1c3d..a0c1359 100644 --- a/programs/netsh/Makefile.in +++ b/programs/netsh/Makefile.in @@ -1,4 +1,5 @@ MODULE = netsh.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = netsh.c diff --git a/programs/ngen/Makefile.in b/programs/ngen/Makefile.in index 3aef1e5..9a8d744 100644 --- a/programs/ngen/Makefile.in +++ b/programs/ngen/Makefile.in @@ -1,5 +1,6 @@ MODULE = ngen.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ ngen_main.c diff --git a/programs/powershell/Makefile.in b/programs/powershell/Makefile.in index 8a8c319..ac596fc 100644 --- a/programs/powershell/Makefile.in +++ b/programs/powershell/Makefile.in @@ -1,5 +1,6 @@ MODULE = powershell.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/regasm/Makefile.in b/programs/regasm/Makefile.in index 45faee9..baa4f83 100644 --- a/programs/regasm/Makefile.in +++ b/programs/regasm/Makefile.in @@ -1,5 +1,6 @@ MODULE = regasm.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/regsvcs/Makefile.in b/programs/regsvcs/Makefile.in index 22eb542..880900a 100644 --- a/programs/regsvcs/Makefile.in +++ b/programs/regsvcs/Makefile.in @@ -1,5 +1,6 @@ MODULE = regsvcs.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/sdbinst/Makefile.in b/programs/sdbinst/Makefile.in index 460dd8f..05c60c0 100644 --- a/programs/sdbinst/Makefile.in +++ b/programs/sdbinst/Makefile.in @@ -1,5 +1,6 @@ MODULE = sdbinst.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/secedit/Makefile.in b/programs/secedit/Makefile.in index 06dfd72..6700655 100644 --- a/programs/secedit/Makefile.in +++ b/programs/secedit/Makefile.in @@ -1,5 +1,6 @@ MODULE = secedit.exe -APPMODE = -mconsole + +EXTRADLLFLAGS = -mconsole -mno-cygwin C_SRCS = \ main.c diff --git a/programs/servicemodelreg/Makefile.in b/programs/servicemodelreg/Makefile.in index d145650f..bc6e165 100644 --- a/programs/servicemodelreg/Makefile.in +++ b/programs/servicemodelreg/Makefile.in @@ -1,5 +1,6 @@ MODULE = servicemodelreg.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/shutdown/Makefile.in b/programs/shutdown/Makefile.in index 0014021..a84eb89 100644 --- a/programs/shutdown/Makefile.in +++ b/programs/shutdown/Makefile.in @@ -1,5 +1,6 @@ MODULE = shutdown.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/subst/Makefile.in b/programs/subst/Makefile.in index 63d574f..3a1292b 100644 --- a/programs/subst/Makefile.in +++ b/programs/subst/Makefile.in @@ -1,5 +1,6 @@ MODULE = subst.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/systeminfo/Makefile.in b/programs/systeminfo/Makefile.in index 72e4791..053c52e 100644 --- a/programs/systeminfo/Makefile.in +++ b/programs/systeminfo/Makefile.in @@ -1,5 +1,6 @@ MODULE = systeminfo.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/tasklist/Makefile.in b/programs/tasklist/Makefile.in index 6e97d2e..53e6b79 100644 --- a/programs/tasklist/Makefile.in +++ b/programs/tasklist/Makefile.in @@ -1,5 +1,6 @@ MODULE = tasklist.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = tasklist.c diff --git a/programs/unlodctr/Makefile.in b/programs/unlodctr/Makefile.in index f414ce9..8985ab1 100644 --- a/programs/unlodctr/Makefile.in +++ b/programs/unlodctr/Makefile.in @@ -1,5 +1,6 @@ MODULE = unlodctr.exe -APPMODE = -mconsole IMPORTS = loadperf +EXTRADLLFLAGS = -mconsole -mno-cygwin + C_SRCS = unlodctr_main.c diff --git a/programs/wevtutil/Makefile.in b/programs/wevtutil/Makefile.in index f6882b2..9dc0839 100644 --- a/programs/wevtutil/Makefile.in +++ b/programs/wevtutil/Makefile.in @@ -1,5 +1,6 @@ MODULE = wevtutil.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/wmplayer/Makefile.in b/programs/wmplayer/Makefile.in index be345a0..1a91e2a 100644 --- a/programs/wmplayer/Makefile.in +++ b/programs/wmplayer/Makefile.in @@ -1,5 +1,6 @@ MODULE = wmplayer.exe -APPMODE = -mwindows -municode + +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin RC_SRCS = version.rc diff --git a/programs/wusa/Makefile.in b/programs/wusa/Makefile.in index 5068456..3042e86 100644 --- a/programs/wusa/Makefile.in +++ b/programs/wusa/Makefile.in @@ -1,5 +1,6 @@ MODULE = wusa.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c

1 0