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

Józef Kucia : Update AUTHORS.
by Alexandre Julliard May 24, 2018

May 24, 2018

Module: vkd3d Branch: master Commit: 5423de8267d0d29ef84cf960ab585bcfab7ab2eb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5423de8267d0d29ef84cf96… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 24 13:08:32 2018 +0200 Update AUTHORS. 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> --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 3d0c470..1991bdf 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,2 +1,3 @@ Henri Verbeet Józef Kucia +Sven Hesse

1 0

Francois Gouget : testbot/build: Better detect when a native rebuild is needed.
by Alexandre Julliard May 24, 2018

May 24, 2018

Module: tools Branch: master Commit: 6dc36c17a79255663041f33182821726bf95c408 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6dc36c17a79255663041f33… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 24 17:28:39 2018 +0200 testbot/build: Better detect when a native rebuild is needed. The builds need more than just winebuild and wrc. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 19f220b..ce27baa 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -122,7 +122,7 @@ sub ApplyPatch($$$) { $NeedBuildNative = $NeedMakeMakefiles = $NeedConfigure = 1; } - elsif ($Line =~ m=^diff.*tools/(?:winebuild|wrc)=) + elsif ($Line =~ m=^diff.*tools/(?:makedep\.c|make_xftmpl\.c|sfnt2fon|winebuild|winegcc|widl|wmc|wrc)=) { $NeedBuildNative = 1; }

1 0

Francois Gouget : testbot: Sort the modules and test units alphabetically when creating jobs.
by Alexandre Julliard May 24, 2018

May 24, 2018

Module: tools Branch: master Commit: 3501004ebe177a3c76528433a1d9b6468022e17b URL: https://source.winehq.org/git/tools.git/?a=commit;h=3501004ebe177a3c7652843… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 24 17:28:28 2018 +0200 testbot: Sort the modules and test units alphabetically when creating jobs. This makes it easier to find the results for a specific module or test unit. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Patches.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 26127e9..b156687 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -241,7 +241,7 @@ sub Submit($$$) my $Disposition = "Submitted job "; my $First = 1; - foreach my $Module (keys %Modules) + foreach my $Module (sort keys %Modules) { my $Jobs = CreateJobs(); @@ -287,7 +287,7 @@ sub Submit($$$) return $ErrMessage; } - foreach my $Unit (keys %{$Modules{$Module}}) + foreach my $Unit (sort keys %{$Modules{$Module}}) { # Add 32 and 64-bit tasks foreach my $Bits ("32", "64")

1 0

Francois Gouget : testbot: Remove support for archiving jobs.
by Alexandre Julliard May 24, 2018

May 24, 2018

Module: tools Branch: master Commit: 09a8d72b062d613581271eea05623ec16aac5bca URL: https://source.winehq.org/git/tools.git/?a=commit;h=09a8d72b062d613581271ee… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 24 17:28:21 2018 +0200 testbot: Remove support for archiving jobs. We don't use it and there does not seem to be any forseable need for it anyway. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 26 +----------- testbot/ddl/update34.sql | 4 ++ testbot/ddl/winetestbot.sql | 2 - testbot/doc/winetestbot-schema.dia | 85 ++++++++++++++------------------------ testbot/lib/WineTestBot/Config.pm | 5 +-- testbot/lib/WineTestBot/Jobs.pm | 9 ---- testbot/web/index.pl | 20 +-------- 7 files changed, 39 insertions(+), 112 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=09a8d72b062d6135812…

1 0

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

May 23, 2018

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

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

May 23, 2018

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

Hugh McMaster : regedit: Do not directly include resource.h anymore.
by Alexandre Julliard May 23, 2018

May 23, 2018

Module: wine Branch: master Commit: 5bc81188fed88e79f7fb4730427614f937219187 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bc81188fed88e79f7fb4730… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 23 13:29:28 2018 +0000 regedit: Do not directly include resource.h anymore. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 03bfdbd..1459624 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -31,7 +31,6 @@ #include "wine/heap.h" #include "wine/unicode.h" #include "main.h" -#include "resource.h" static const WCHAR* editValueName; static WCHAR* stringValueData;

1 0

Henri Verbeet : wined3d: Default to OpenGL 4.4 contexts.
by Alexandre Julliard May 23, 2018

May 23, 2018

Module: wine Branch: master Commit: 0db4d1c251d293333e2721a78d6156008a90ff6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0db4d1c251d293333e2721a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 23 16:32:13 2018 +0430 wined3d: Default to OpenGL 4.4 contexts. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 6 +++--- dlls/wined3d/wined3d_main.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a4e4a0c..3ca389e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -6581,16 +6581,16 @@ static DWORD get_max_gl_version(const struct wined3d_gl_info *gl_info, DWORD fla { const char *gl_vendor, *gl_renderer; - if (wined3d_settings.explicit_gl_version || (flags & WINED3D_PIXEL_CENTER_INTEGER)) + if (wined3d_settings.explicit_gl_version) return wined3d_settings.max_gl_version; gl_vendor = (const char *)gl_info->gl_ops.gl.p_glGetString(GL_VENDOR); gl_renderer = (const char *)gl_info->gl_ops.gl.p_glGetString(GL_RENDERER); if (!gl_vendor || !gl_renderer || wined3d_guess_card_vendor(gl_vendor, gl_renderer) == HW_VENDOR_NVIDIA) - return wined3d_settings.max_gl_version; + return MAKEDWORD_VERSION(1, 0); - return MAKEDWORD_VERSION(4, 4); + return wined3d_settings.max_gl_version; } static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, DWORD wined3d_creation_flags) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 56fae6b..e322b4d 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -74,7 +74,7 @@ struct wined3d_settings wined3d_settings = { TRUE, /* Multithreaded CS by default. */ FALSE, /* explicit_gl_version */ - MAKEDWORD_VERSION(1, 0), /* Default to legacy OpenGL */ + MAKEDWORD_VERSION(4, 4), /* Default to OpenGL 4.4 */ TRUE, /* Use of GLSL enabled by default */ ORM_FBO, /* Use FBOs to do offscreen rendering */ PCI_VENDOR_NONE,/* PCI Vendor ID */

1 0

Nikolay Sivov : d2d1: Add ID2D1Bitmap1 stub.
by Alexandre Julliard May 23, 2018

May 23, 2018

Module: wine Branch: master Commit: b75660989418636a952b7eb585abc94c1d1f4b5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b75660989418636a952b7eb5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 23 16:32:12 2018 +0430 d2d1: Add ID2D1Bitmap1 stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap.c | 94 ++++++++++++++++++++++++++++++++++-------------- dlls/d2d1/brush.c | 8 ++--- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/device.c | 6 ++-- include/d2d1_1.idl | 47 ++++++++++++++++++++++++ 5 files changed, 122 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b75660989418636a952b…

1 0

Zebediah Figura : odbccp32: Avoid using RegQueryInfoKey() in SQLGetInstalledDrivers().
by Alexandre Julliard May 23, 2018

May 23, 2018

Module: wine Branch: master Commit: 5eb8894e93499638edb46b3b43557bd6f44adfe1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5eb8894e93499638edb46b3b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 22 16:27:57 2018 -0500 odbccp32: Avoid using RegQueryInfoKey() in SQLGetInstalledDrivers(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 8788330..862237c 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -510,15 +510,20 @@ BOOL WINAPI SQLGetInstalledDriversW(WCHAR *buf, WORD size, WORD *sizeout) return FALSE; } - RegQueryInfoKeyW(drivers, 0, 0, 0, 0, 0, 0, 0, &valuelen, 0, 0, 0); - value = heap_alloc(++valuelen * sizeof(WCHAR)); + valuelen = 256; + value = heap_alloc(valuelen * sizeof(WCHAR)); size--; while (1) { len = valuelen; - res = RegEnumValueW(drivers, index++, value, &len, NULL, NULL, NULL, NULL); + res = RegEnumValueW(drivers, index, value, &len, NULL, NULL, NULL, NULL); + while (res == ERROR_MORE_DATA) + { + value = heap_realloc(value, ++len * sizeof(WCHAR)); + res = RegEnumValueW(drivers, index, value, &len, NULL, NULL, NULL, NULL); + } if (res == ERROR_SUCCESS) { lstrcpynW(buf + written, value, size - written); @@ -532,6 +537,7 @@ BOOL WINAPI SQLGetInstalledDriversW(WCHAR *buf, WORD size, WORD *sizeout) ret = FALSE; break; } + index++; } buf[written++] = 0;

1 0