May 2018 - Wine-commits - list.winehq.org

Zebediah Figura : msi/tests: Test deferral of MoveFiles.
by Alexandre Julliard 23 May '18

23 May '18

Module: wine Branch: master Commit: af737f9c2f78c448b914570005d34d61d95e7b83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af737f9c2f78c448b9145700… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 22 18:39:24 2018 -0500 msi/tests: Test deferral of MoveFiles. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 26 +++++++++++++++++++++++++- dlls/msi/tests/custom.c | 16 ++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 943c939..1600fe3 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -526,6 +526,29 @@ static const char mov_move_file_dat[] = "wildcardnodest\taugustus\tbudd*\t\tSourceDir\tMSITESTDIR\t1\n" "singlenodest\taugustus\tb?r\t\tSourceDir\tMSITESTDIR\t1\n"; +static const char mov_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "CostInitialize\t\t100\n" + "FileCost\t\t200\n" + "ResolveSource\t\t300\n" + "CostFinalize\t\t400\n" + "InstallValidate\t\t500\n" + "InstallInitialize\t\t600\n" + "MoveFiles\t\t700\n" + "mov_immediate\t\t701\n" + "mov_deferred\t\t702\n" + "InstallFiles\t\t800\n" + "InstallFinalize\t\t900\n"; + +static const char mov_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "mov_immediate\t1\tcustom.dll\tmov_absent\n" + "mov_deferred\t1025\tcustom.dll\tmov_present\n"; + static const char df_directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" "s72\tS72\tl255\n" @@ -1843,7 +1866,8 @@ static const msi_table mov_tables[] = ADD_TABLE(rof_feature), ADD_TABLE(ci2_feature_comp), ADD_TABLE(ci2_file), - ADD_TABLE(install_exec_seq), + ADD_TABLE(mov_install_exec_seq), + ADD_TABLE(mov_custom_action), ADD_TABLE(rof_media), ADD_TABLE(property), ADD_TABLE(mov_move_file), diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 0f34eb0..0bf62d9 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1363,3 +1363,19 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { } return ERROR_SUCCESS; } + +UINT WINAPI mov_present(MSIHANDLE hinst) +{ + ok(hinst, pf_exists("msitest\\canada"), "file absent\n"); + ok(hinst, pf_exists("msitest\\dominica"), "file absent\n"); + return ERROR_SUCCESS; +} + +UINT WINAPI mov_absent(MSIHANDLE hinst) +{ +todo_wine { + ok(hinst, !pf_exists("msitest\\canada"), "file present\n"); + ok(hinst, !pf_exists("msitest\\dominica"), "file present\n"); +} + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 52feffa..4b46dc3 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -9,6 +9,8 @@ @ stdcall crs_absent(long) @ stdcall file_present(long) @ stdcall file_absent(long) +@ stdcall mov_present(long) +@ stdcall mov_absent(long) @ stdcall odbc_present(long) @ stdcall odbc_absent(long) @ stdcall rd_present(long)

1 0

Zhiyi Zhang : comctl32/taskdialog: Send TDN_CREATED before window gets visible.
by Alexandre Julliard 23 May '18

23 May '18

Module: wine Branch: master Commit: fe182ce1f0da54e02fdca8f943c3cba1b3e499be URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe182ce1f0da54e02fdca8f9… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed May 23 23:11:20 2018 +0800 comctl32/taskdialog: Send TDN_CREATED before window gets visible. TDN_CREATED notification is sent before dialog window is shown. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index ec04485..7edb8ef 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -572,8 +572,6 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR SetPropW(hwnd, taskdialog_info_propnameW, dialog_info); taskdialog_notify(dialog_info, TDN_DIALOG_CONSTRUCTED, 0, 0); - break; - case WM_SHOWWINDOW: taskdialog_notify(dialog_info, TDN_CREATED, 0, 0); break; case WM_COMMAND:

1 0

Zhiyi Zhang : comctl32/taskdialog: Use bold font for main instruction.
by Alexandre Julliard 23 May '18

23 May '18

Module: wine Branch: master Commit: bf4d0982fd88f9c8848b9e27bb1391d45d18b68e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf4d0982fd88f9c8848b9e27… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed May 23 23:11:48 2018 +0800 comctl32/taskdialog: Use bold font for main instruction. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 7edb8ef..346a079 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -89,6 +89,7 @@ struct taskdialog_info HWND hwnd; const TASKDIALOGCONFIG *taskconfig; DWORD last_timer_tick; + HFONT main_instruction_font; }; static void pixels_to_dialogunits(const struct taskdialog_template_desc *desc, LONG *width, LONG *height) @@ -113,6 +114,24 @@ static void template_write_data(char **ptr, const void *src, unsigned int size) *ptr += size; } +static void taskdialog_set_main_instruction_font(struct taskdialog_info *dialog_info) +{ + NONCLIENTMETRICSW ncm; + HWND hwnd; + + hwnd = GetDlgItem(dialog_info->hwnd, ID_MAIN_INSTRUCTION); + if(!hwnd) return; + + ncm.cbSize = sizeof(ncm); + SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, ncm.cbSize, &ncm, 0); + /* 1.25 times the height */ + ncm.lfMessageFont.lfHeight = ncm.lfMessageFont.lfHeight * 5 / 4; + ncm.lfMessageFont.lfWeight = FW_BOLD; + dialog_info->main_instruction_font = CreateFontIndirectW(&ncm.lfMessageFont); + + SendMessageW(hwnd, WM_SETFONT, (WPARAM)dialog_info->main_instruction_font, TRUE); +} + /* used to calculate size for the controls */ static void taskdialog_get_text_extent(const struct taskdialog_template_desc *desc, const WCHAR *text, BOOL user_resource, SIZE *sz) @@ -548,6 +567,8 @@ static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) SetTimer(hwnd, ID_TIMER, DIALOG_TIMER_MS, NULL); dialog_info->last_timer_tick = GetTickCount(); } + + taskdialog_set_main_instruction_font(dialog_info); } static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) @@ -597,6 +618,8 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR RemovePropW(hwnd, taskdialog_info_propnameW); if (dialog_info->taskconfig->dwFlags & TDF_CALLBACK_TIMER) KillTimer(hwnd, ID_TIMER); + if (dialog_info->main_instruction_font) + DeleteObject(dialog_info->main_instruction_font); break; default: return FALSE;

1 0

Alexandre Julliard : vkd3d release 1.0
by Alexandre Julliard 23 May '18

23 May '18

Module: website Branch: master Commit: 55cb706c0fcba7e139e666b4921e11aef0fb3459 URL: https://source.winehq.org/git/website.git/?a=commit;h=55cb706c0fcba7e139e66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 19:26:10 2018 +0200 vkd3d release 1.0 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018052301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2018052301.xml b/news/en/2018052301.xml new file mode 100644 index 0000000..3742db1 --- /dev/null +++ b/news/en/2018052301.xml @@ -0,0 +1,16 @@ +<news> +<date>May 23, 2018</date> +<title>Vkd3d 1.0 Released</title> +<body> +The Wine team is proud to announce that release 1.0 of vkd3d, the +Direct3D 12 to Vulkan translation library, is now available. + +This is the first release of vkd3d. A lot of Direct3D 12 features are still +missing and bugs are expected. The current version was tested mainly with demo +applications. A number of features that are being worked on have been deferred +to the next development cycle. This includes in particular geometry and +tessellation shaders support, various shader translation improvements, as well +as various improvements for core Direct3D 12 methods. + +The source is <a href="https://dl.winehq.org/vkd3d/source/vkd3d-1.0.tar.xz">available here</a>. +</body></news>

1 0

Tag vkd3d-1.0 : Alexandre Julliard : Release 1.0
by Alexandre Julliard 23 May '18

23 May '18

Module: vkd3d Branch: refs/tags/vkd3d-1.0 Tag: 9e3814ff2bb8ceb2deaf65302bcf6548ac31febd URL: https://source.winehq.org/git/vkd3d.git/?a=tag;h=9e3814ff2bb8ceb2deaf65302b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 19:19:15 2018 +0200 Release 1.0

1 0

Józef Kucia : include: Force stack alignment on i386.
by Alexandre Julliard 23 May '18

23 May '18

Module: vkd3d Branch: master Commit: d3c59c1a01e691934cc60a6dded5de87174d4225 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d3c59c1a01e691934cc60a6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 23 12:14:47 2018 +0200 include: Force stack alignment on i386. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_windows.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_windows.h b/include/vkd3d_windows.h index 9cea6b4..ca7da53 100644 --- a/include/vkd3d_windows.h +++ b/include/vkd3d_windows.h @@ -168,7 +168,11 @@ typedef struct SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES; # ifdef __x86_64__ # define __stdcall __attribute__((ms_abi)) # else -# define __stdcall __attribute__((__stdcall__)) +# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) +# define __stdcall __attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__)) +# else +# define __stdcall __attribute__((__stdcall__)) +# endif # endif # define WINAPI __stdcall

1 0

Alexandre Julliard : Release 1.0.
by Alexandre Julliard 23 May '18

23 May '18

Module: vkd3d Branch: master Commit: 020c119e2da0786d8be0615cff961c190b00d62d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=020c119e2da0786d8be0615… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 19:19:15 2018 +0200 Release 1.0. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 2 +- 2 files changed, 91 insertions(+), 1 deletion(-) diff --git a/ANNOUNCE b/ANNOUNCE new file mode 100644 index 0000000..8c2c1de --- /dev/null +++ b/ANNOUNCE @@ -0,0 +1,90 @@ +The Wine team is proud to announce that release 1.0 of vkd3d, the +Direct3D 12 to Vulkan translation library, is now available. + +This is the first release of vkd3d. A lot of Direct3D 12 features are still +missing and bugs are expected. The current version was tested mainly with demo +applications. A number of features that are being worked on have been deferred +to the next development cycle. This includes in particular geometry and +tessellation shaders support, various shader translation improvements, as well +as various improvements for core Direct3D 12 methods. + +The source is available from the following location: + + https://dl.winehq.org/vkd3d/source/vkd3d-1.0.tar.xz + +The current source can also be pulled directly from the git repository: + + https://source.winehq.org/git/vkd3d.git/ + +Vkd3d is available thanks to the work of multiple people. See the file AUTHORS +for the complete list. + +---------------------------------------------------------------- + +What's included in vkd3d 1.0 +============================ + + +*** libvkd3d + +- libvkd3d is the main component of the vkd3d project. It's a 3D graphics + library built on top of Vulkan with an API very similar to Direct3D 12. + +- A significant number of Direct3D 12 features are implemented, including: + - Graphics and compute pipelines. + - Command lists, command allocators and command queues. + - Descriptors and descriptor heaps. + - Root signatures. + - Constant buffer, shader resource, unordered access, render target and depth + stencil views. + - Samplers. + - Static samplers. + - Descriptors copying. + - Committed resources. + - Fences. + - Queries and query heaps. + - Resource barriers. + - Root constants. + - Basic support for indirect draws and dispatches. + - Basic support for command signatures. + - Various Clear*() methods. + - Various Copy*() methods. + + +*** libvkd3d-shader + +- libvkd3d-shader is a library which translates shader model 4 and 5 bytecode + to SPIR-V. In this release, libvkd3d-shader is an internal library. Its API + isn't set in stone yet. + +- Vertex, pixel and compute shaders are supported. Also, very simple geometry + shaders should be translated correctly. Issues are expected when trying to + translate tessellation shaders or more complex geometry shaders. + +- A significant number of shader instructions are supported in this release, + including: + - Arithmetic instructions. + - Bit instructions. + - Comparison instructions. + - Control flow instructions. + - Sample, gather and load instructions. + - Atomic instructions. + - UAV instructions. + +- Root signature serialization and deserialization is implemented. + +- Shader model 4 and 5 bytecode parser is imported from wined3d. + +- Shader model 5.1 is not supported yet. + + +*** libvkd3d-utils + +- libvkd3d-utils contains simple implementations of various functions which + might be useful for source ports of Direct3D 12 applications. + + +*** demos + +- A simple hello triangle Direct3D 12 demo. +- A Direct3D 12 port of glxgears. diff --git a/configure.ac b/configure.ac index 2b8249e..de4ece8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT([vkd3d], 0.0.1) +AC_INIT([vkd3d],[1.0]) AC_CONFIG_AUX_DIR([bin]) AC_CONFIG_MACRO_DIR([m4])

1 0

Dmitry Timoshkov : mstask: Implement ITask::GetNextRunTime() for WEEKLY trigger type.
by Alexandre Julliard 22 May '18

22 May '18

Module: wine Branch: master Commit: 5a9ed96aec4c38d6bf179fc60cc4439cb06d9a96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a9ed96aec4c38d6bf179fc6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 22 16:18:44 2018 +0800 mstask: Implement ITask::GetNextRunTime() for WEEKLY trigger type. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/mstask/tests/task_trigger.c | 22 +++++++++++++++++++++- 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 57ad0f7..14705022 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -466,6 +466,11 @@ static void filetime_add_days(FILETIME *ft, ULONG days) filetime_add_hours(ft, (ULONGLONG)days * 24); } +static void filetime_add_weeks(FILETIME *ft, ULONG weeks) +{ + filetime_add_days(ft, (ULONGLONG)weeks * 7); +} + static HRESULT WINAPI MSTASK_ITask_GetNextRunTime(ITask *iface, SYSTEMTIME *rt) { TaskImpl *This = impl_from_ITask(iface); @@ -540,6 +545,40 @@ static HRESULT WINAPI MSTASK_ITask_GetNextRunTime(ITask *iface, SYSTEMTIME *rt) } break; + case TASK_TIME_TRIGGER_WEEKLY: + if (!This->trigger[i].Type.Weekly.rgfDaysOfTheWeek) + break; /* avoid infinite loop */ + + st = current_st; + st.wHour = This->trigger[i].wStartHour; + st.wMinute = This->trigger[i].wStartMinute; + st.wSecond = 0; + st.wMilliseconds = 0; + SystemTimeToFileTime(&st, &current_ft); + while (CompareFileTime(&current_ft, &end_ft) < 0) + { + FileTimeToSystemTime(&current_ft, &st); + + if (CompareFileTime(&current_ft, &begin_ft) >= 0) + { + if (This->trigger[i].Type.Weekly.rgfDaysOfTheWeek & (1 << st.wDayOfWeek)) + { + if (!have_best_time || CompareFileTime(&current_ft, &best_ft) < 0) + { + best_ft = current_ft; + have_best_time = TRUE; + } + break; + } + } + + if (st.wDayOfWeek == 0) /* Sunday, goto next week */ + filetime_add_weeks(&current_ft, This->trigger[i].Type.Weekly.WeeksInterval - 1); + else /* check next weekday */ + filetime_add_days(&current_ft, 1); + } + break; + default: FIXME("trigger type %u is not handled\n", This->trigger[i].TriggerType); break; diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index 328cae2..168d6f3 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -552,7 +552,27 @@ static void test_GetNextRunTime(void) st.wDay, st.wMonth, st.wYear, st.wDayOfWeek, st.wHour, st.wMinute, st.wSecond); - /* FIXME: TASK_TIME_TRIGGER_WEEKLY */ + /* TASK_TIME_TRIGGER_WEEKLY */ + + hr = ITaskTrigger_GetTrigger(trigger, &data); + ok(hr == S_OK, "got %#x\n", hr); + data.rgFlags &= ~TASK_TRIGGER_FLAG_DISABLED; + data.TriggerType = TASK_TIME_TRIGGER_WEEKLY; + data.Type.Weekly.WeeksInterval = 1; + /* add 3 days */ + time_add_ms(&cmp, 3 * 24 * 60 * 60 * 1000); + /* bits: TASK_SUNDAY = 1, TASK_MONDAY = 2, TASK_TUESDAY = 4, etc. */ + data.Type.Weekly.rgfDaysOfTheWeek = 1 << cmp.wDayOfWeek; /* wDayOfWeek is 0 based */ + hr = ITaskTrigger_SetTrigger(trigger, &data); + ok(hr == S_OK, "got %#x\n", hr); + + memset(&st, 0xff, sizeof(st)); + hr = ITask_GetNextRunTime(task, &st); + ok(hr == S_OK, "got %#x\n", hr); + ok(!memcmp(&st, &cmp, sizeof(st)), "got %u/%u/%u wday %u %u:%02u:%02u\n", + st.wDay, st.wMonth, st.wYear, st.wDayOfWeek, + st.wHour, st.wMinute, st.wSecond); + /* FIXME: TASK_TIME_TRIGGER_MONTHLYDATE */ /* FIXME: TASK_TIME_TRIGGER_MONTHLYDOW */

1 0

Alistair Leslie-Hughes : include: Add MmGetSystemRoutineAddress definition.
by Alexandre Julliard 22 May '18

22 May '18

Module: wine Branch: master Commit: 0b6337f0957cf1dd0940596015266516bab3185a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b6337f0957cf1dd09405960… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 22 04:27:17 2018 +0000 include: Add MmGetSystemRoutineAddress definition. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/wdm.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index cab9828..d6b808f 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1421,6 +1421,7 @@ PVOID WINAPI MmAllocateContiguousMemory(SIZE_T,PHYSICAL_ADDRESS); PVOID WINAPI MmAllocateNonCachedMemory(SIZE_T); PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,SIZE_T); void WINAPI MmFreeNonCachedMemory(PVOID,SIZE_T); +void * WINAPI MmGetSystemRoutineAddress(UNICODE_STRING*); PVOID WINAPI MmMapLockedPagesSpecifyCache(PMDL,KPROCESSOR_MODE,MEMORY_CACHING_TYPE,PVOID,ULONG,ULONG); MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void); void WINAPI MmProbeAndLockPages(PMDLX, KPROCESSOR_MODE, LOCK_OPERATION);

1 0

Zebediah Figura : vbscript: Add stub IActiveScriptDebug interface.
by Alexandre Julliard 22 May '18

22 May '18

Module: wine Branch: master Commit: 3dde8287c69d4274b5b22bc1859d84a4a02b3613 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dde8287c69d4274b5b22bc1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 21 20:32:40 2018 -0500 vbscript: Add stub IActiveScriptDebug interface. Visual Pinball 9.9.5 expects this interface to be present, and crashes on teardown trying to Release() it. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbscript.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 2 files changed, 66 insertions(+) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index b97cf5a..06a855b 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -29,12 +29,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); #ifdef _WIN64 #define CTXARG_T DWORDLONG +#define IActiveScriptDebugVtbl IActiveScriptDebug64Vtbl #define IActiveScriptParseVtbl IActiveScriptParse64Vtbl #define IActiveScriptParseProcedure2Vtbl IActiveScriptParseProcedure2_64Vtbl #else #define CTXARG_T DWORD +#define IActiveScriptDebugVtbl IActiveScriptDebug32Vtbl #define IActiveScriptParseVtbl IActiveScriptParse32Vtbl #define IActiveScriptParseProcedure2Vtbl IActiveScriptParseProcedure2_32Vtbl @@ -42,6 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); struct VBScript { IActiveScript IActiveScript_iface; + IActiveScriptDebug IActiveScriptDebug_iface; IActiveScriptParse IActiveScriptParse_iface; IActiveScriptParseProcedure2 IActiveScriptParseProcedure2_iface; IObjectSafety IObjectSafety_iface; @@ -267,6 +270,9 @@ static HRESULT WINAPI VBScript_QueryInterface(IActiveScript *iface, REFIID riid, }else if(IsEqualGUID(riid, &IID_IActiveScript)) { TRACE("(%p)->(IID_IActiveScript %p)\n", This, ppv); *ppv = &This->IActiveScript_iface; + }else if(IsEqualGUID(riid, &IID_IActiveScriptDebug)) { + TRACE("(%p)->(IID_IActiveScriptDebug %p)\n", This, ppv); + *ppv = &This->IActiveScriptDebug_iface; }else if(IsEqualGUID(riid, &IID_IActiveScriptParse)) { TRACE("(%p)->(IID_IActiveScriptParse %p)\n", This, ppv); *ppv = &This->IActiveScriptParse_iface; @@ -564,6 +570,64 @@ static const IActiveScriptVtbl VBScriptVtbl = { VBScript_Clone }; +static inline VBScript *impl_from_IActiveScriptDebug(IActiveScriptDebug *iface) +{ + return CONTAINING_RECORD(iface, VBScript, IActiveScriptDebug_iface); +} + +static HRESULT WINAPI VBScriptDebug_QueryInterface(IActiveScriptDebug *iface, REFIID riid, void **ppv) +{ + VBScript *This = impl_from_IActiveScriptDebug(iface); + return IActiveScript_QueryInterface(&This->IActiveScript_iface, riid, ppv); +} + +static ULONG WINAPI VBScriptDebug_AddRef(IActiveScriptDebug *iface) +{ + VBScript *This = impl_from_IActiveScriptDebug(iface); + return IActiveScript_AddRef(&This->IActiveScript_iface); +} + +static ULONG WINAPI VBScriptDebug_Release(IActiveScriptDebug *iface) +{ + VBScript *This = impl_from_IActiveScriptDebug(iface); + return IActiveScript_Release(&This->IActiveScript_iface); +} + +static HRESULT WINAPI VBScriptDebug_GetScriptTextAttributes(IActiveScriptDebug *iface, + LPCOLESTR code, ULONG len, LPCOLESTR delimiter, DWORD flags, SOURCE_TEXT_ATTR *attr) +{ + VBScript *This = impl_from_IActiveScriptDebug(iface); + FIXME("(%p)->(%s %u %s %#x %p)\n", This, debugstr_w(code), len, + debugstr_w(delimiter), flags, attr); + return E_NOTIMPL; +} + +static HRESULT WINAPI VBScriptDebug_GetScriptletTextAttributes(IActiveScriptDebug *iface, + LPCOLESTR code, ULONG len, LPCOLESTR delimiter, DWORD flags, SOURCE_TEXT_ATTR *attr) +{ + VBScript *This = impl_from_IActiveScriptDebug(iface); + FIXME("(%p)->(%s %u %s %#x %p)\n", This, debugstr_w(code), len, + debugstr_w(delimiter), flags, attr); + return E_NOTIMPL; +} + +static HRESULT WINAPI VBScriptDebug_EnumCodeContextsOfPosition(IActiveScriptDebug *iface, + CTXARG_T source, ULONG offset, ULONG len, IEnumDebugCodeContexts **ret) +{ + VBScript *This = impl_from_IActiveScriptDebug(iface); + FIXME("(%p)->(%s %u %u %p)\n", This, wine_dbgstr_longlong(source), offset, len, ret); + return E_NOTIMPL; +} + +static const IActiveScriptDebugVtbl VBScriptDebugVtbl = { + VBScriptDebug_QueryInterface, + VBScriptDebug_AddRef, + VBScriptDebug_Release, + VBScriptDebug_GetScriptTextAttributes, + VBScriptDebug_GetScriptletTextAttributes, + VBScriptDebug_EnumCodeContextsOfPosition, +}; + static inline VBScript *impl_from_IActiveScriptParse(IActiveScriptParse *iface) { return CONTAINING_RECORD(iface, VBScript, IActiveScriptParse_iface); @@ -806,6 +870,7 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pU return E_OUTOFMEMORY; ret->IActiveScript_iface.lpVtbl = &VBScriptVtbl; + ret->IActiveScriptDebug_iface.lpVtbl = &VBScriptDebugVtbl; ret->IActiveScriptParse_iface.lpVtbl = &VBScriptParseVtbl; ret->IActiveScriptParseProcedure2_iface.lpVtbl = &VBScriptParseProcedureVtbl; ret->IObjectSafety_iface.lpVtbl = &VBScriptSafetyVtbl; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 5877762..98a5cb1 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -25,6 +25,7 @@ #include "ole2.h" #include "dispex.h" #include "activscp.h" +#include "activdbg.h" #include "vbscript_classes.h"

1 0