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

Francois Gouget : testbot: Fix handling of test unit deletion + helper dll patch.
by Alexandre Julliard 29 May '18

29 May '18

Module: tools Branch: master Commit: 4bf681b11dfafa2dd7f9f769e957d0fa5b6b43ec URL: https://source.winehq.org/git/tools.git/?a=commit;h=4bf681b11dfafa2dd7f9f76… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 29 00:42:49 2018 +0200 testbot: Fix handling of test unit deletion + helper dll patch. Take into account deleted test units when getting the full test unit list. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 8dde61b..2000c90 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -218,12 +218,7 @@ sub GetPatchImpact($;$) # Helper dlls are not test units next if (exists $TestInfo->{Files}->{"$Base.spec"}); - if ($AllUnits) - { - # All test units are impacted indirectly and must be rerun - $TestInfo->{Units}->{$Base} = 1; - } - elsif ($TestInfo->{Files}->{$File} and + if (($AllUnits or $TestInfo->{Files}->{$File}) and $TestInfo->{Files}->{$File} ne "rm") { # Only new/modified test units are impacted

1 0

Hugh McMaster : regedit: Confirm whether to delete a registry value from framewnd.c.
by Alexandre Julliard 28 May '18

28 May '18

1 0

Hugh McMaster : regedit: Pass NULL instead of the address of an empty WCHAR.
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: c7718d31c7887079206f1a9566bb413619008147 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7718d31c7887079206f1a95… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 28 13:48:07 2018 +0000 regedit: Pass NULL instead of the address of an empty WCHAR. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 89a5ec0..3e5b9dd 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -192,9 +192,8 @@ static LPWSTR read_value(HWND hwnd, HKEY hKey, LPCWSTR valueName, DWORD *lpType, DWORD valueDataLen; LPWSTR buffer = NULL; LONG lRet; - WCHAR empty = 0; - lRet = RegQueryValueExW(hKey, valueName ? valueName : &empty, 0, lpType, 0, &valueDataLen); + lRet = RegQueryValueExW(hKey, valueName, NULL, lpType, NULL, &valueDataLen); if (lRet) { if (lRet == ERROR_FILE_NOT_FOUND && !valueName) { /* no default value here, make it up */ if (len) *len = 1; @@ -413,12 +412,11 @@ BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) BOOL result = FALSE; LONG lRet; HKEY hKey; - WCHAR empty = 0; lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey); if (lRet) return FALSE; - lRet = RegDeleteValueW(hKey, valueName ? valueName : &empty); + lRet = RegDeleteValueW(hKey, valueName); if (lRet && valueName) { error_code_messagebox(hwnd, IDS_BAD_VALUE, valueName); }

1 0

Zebediah Figura : msi/tests: Test deferral of RegisterClassInfo and UnregisterClassInfo.
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: fc6bd87375a945aa456505c9b83d2e7e08c2f891 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc6bd87375a945aa456505c9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 25 21:18:12 2018 -0500 msi/tests: Test deferral of RegisterClassInfo and UnregisterClassInfo. 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 | 14 ++++++++++++++ dlls/msi/tests/custom.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 59 insertions(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 3d74704..9c8f016 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -1463,12 +1463,25 @@ static const char rci_install_exec_seq_dat[] = "RemoveFiles\t\t1700\n" "InstallFiles\t\t2000\n" "UnregisterClassInfo\t\t3000\n" + "uci_immediate\tREMOVE\t3001\n" + "uci_deferred\tREMOVE\t3002\n" "RegisterClassInfo\t\t4000\n" + "rci_immediate\tNOT REMOVE\t4001\n" + "rci_deferred\tNOT REMOVE\t4002\n" "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const char rci_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "rci_immediate\t1\tcustom.dll\trci_absent\n" + "rci_deferred\t1025\tcustom.dll\trci_present\n" + "uci_immediate\t1\tcustom.dll\trci_present\n" + "uci_deferred\t1025\tcustom.dll\trci_absent\n"; + static const char rei_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -2181,6 +2194,7 @@ static const msi_table rci_tables[] = ADD_TABLE(rci_appid), ADD_TABLE(rci_class), ADD_TABLE(rci_install_exec_seq), + ADD_TABLE(rci_custom_action), ADD_TABLE(media), ADD_TABLE(property) }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index cfb368f..a3dd904 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1565,3 +1565,46 @@ todo_wine return ERROR_SUCCESS; } + +UINT WINAPI rci_present(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", + 0, KEY_READ | KEY_WOW64_32KEY, &key); + ok(hinst, !res, "got %u\n", res); + RegCloseKey(key); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "FileType\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", &key); + ok(hinst, !res, "got %u\n", res); + RegCloseKey(key); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "AppID\\{CFCC3B38-E683-497D-9AB4-CB40AAFE307F}", &key); + ok(hinst, !res, "got %u\n", res); + RegCloseKey(key); +} + + return ERROR_SUCCESS; +} + +UINT WINAPI rci_absent(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", + 0, KEY_READ | KEY_WOW64_32KEY, &key); + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "FileType\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", &key); + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "AppID\\{CFCC3B38-E683-497D-9AB4-CB40AAFE307F}", &key); + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); +} + + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index d8b5f08..75f665e 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -23,6 +23,8 @@ @ stdcall ppc_absent(long) @ stdcall pub_present(long) @ stdcall pub_absent(long) +@ stdcall rci_present(long) +@ stdcall rci_absent(long) @ stdcall rd_present(long) @ stdcall rd_absent(long) @ stdcall sds_present(long)

1 0

Zebediah Figura : msi/tests: Test deferral of RegisterExtensionInfo and UnregisterExtensionInfo.
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: 884d146b3243f01f00efb527bf3f3f578344da94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=884d146b3243f01f00efb527… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 25 21:18:13 2018 -0500 msi/tests: Test deferral of RegisterExtensionInfo and UnregisterExtensionInfo. 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 | 14 ++++++++++++++ dlls/msi/tests/custom.c | 34 ++++++++++++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 50 insertions(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 9c8f016..43d76a3 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -1538,12 +1538,25 @@ static const char rei_install_exec_seq_dat[] = "RemoveFiles\t\t1700\n" "InstallFiles\t\t2000\n" "UnregisterExtensionInfo\t\t3000\n" + "uei_immediate\tREMOVE\t3001\n" + "uei_deferred\tREMOVE\t3002\n" "RegisterExtensionInfo\t\t4000\n" + "rei_immediate\tNOT REMOVE\t4001\n" + "rei_deferred\tNOT REMOVE\t4002\n" "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const char rei_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "rei_immediate\t1\tcustom.dll\trei_absent\n" + "rei_deferred\t1025\tcustom.dll\trei_present\n" + "uei_immediate\t1\tcustom.dll\trei_present\n" + "uei_deferred\t1025\tcustom.dll\trei_absent\n"; + static const char rpi_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -2210,6 +2223,7 @@ static const msi_table rei_tables[] = ADD_TABLE(rei_verb), ADD_TABLE(rei_progid), ADD_TABLE(rei_install_exec_seq), + ADD_TABLE(rei_custom_action), ADD_TABLE(media), ADD_TABLE(property) }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index a3dd904..566ab1a 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1608,3 +1608,37 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { return ERROR_SUCCESS; } + +UINT WINAPI rei_present(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + res = RegOpenKeyA(HKEY_CLASSES_ROOT, ".extension", &key); + ok(hinst, !res, "got %u\n", res); + RegCloseKey(key); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Prog.Id.1\\shell\\Open\\command", &key); + ok(hinst, !res, "got %u\n", res); + RegCloseKey(key); +} + + return ERROR_SUCCESS; +} + +UINT WINAPI rei_absent(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + res = RegOpenKeyA(HKEY_CLASSES_ROOT, ".extension", &key); + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Prog.Id.1\\shell\\Open\\command", &key); + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); +} + + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 75f665e..d302d05 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -25,6 +25,8 @@ @ stdcall pub_absent(long) @ stdcall rci_present(long) @ stdcall rci_absent(long) +@ stdcall rei_present(long) +@ stdcall rei_absent(long) @ stdcall rd_present(long) @ stdcall rd_absent(long) @ stdcall sds_present(long)

1 0

Zebediah Figura : msi/tests: Test deferral of RegisterFonts and UnregisterFonts.
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: a364e1a9c8aeba972f13f1af13cd0643b9a05a8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a364e1a9c8aeba972f13f1af… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 25 21:18:14 2018 -0500 msi/tests: Test deferral of RegisterFonts and UnregisterFonts. 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 | 14 ++++++++++++++ dlls/msi/tests/custom.c | 32 ++++++++++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 48 insertions(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 43d76a3..91cf3e1 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -799,13 +799,26 @@ static const char font_install_exec_seq_dat[] = "RemoveFiles\t\t3500\n" "InstallFiles\t\t4000\n" "RegisterFonts\t\t4100\n" + "rf_immediate\tNOT REMOVE\t4101\n" + "rf_deferred\tNOT REMOVE\t4102\n" "UnregisterFonts\t\t4200\n" + "uf_immediate\tREMOVE\t4201\n" + "uf_deferred\tREMOVE\t4202\n" "RegisterUser\t\t6000\n" "RegisterProduct\t\t6100\n" "PublishFeatures\t\t6300\n" "PublishProduct\t\t6400\n" "InstallFinalize\t\t6600"; +static const char font_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "rf_immediate\t1\tcustom.dll\tfont_absent\n" + "rf_deferred\t1025\tcustom.dll\tfont_present\n" + "uf_immediate\t1\tcustom.dll\tfont_present\n" + "uf_deferred\t1025\tcustom.dll\tfont_absent\n"; + static const char vp_property_dat[] = "Property\tValue\n" "s72\tl0\n" @@ -2054,6 +2067,7 @@ static const msi_table font_tables[] = ADD_TABLE(font_file), ADD_TABLE(font), ADD_TABLE(font_install_exec_seq), + ADD_TABLE(font_custom_action), ADD_TABLE(font_media), ADD_TABLE(property) }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 566ab1a..306a8f3 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1642,3 +1642,35 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { return ERROR_SUCCESS; } + +static const char font_key[] = "Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts"; + +UINT WINAPI font_present(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, font_key, 0, KEY_QUERY_VALUE | KEY_WOW64_64KEY, &key); + ok(hinst, !res, "got %u\n", res); + res = RegQueryValueExA(key, "msi test font", NULL, NULL, NULL, NULL); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + ok(hinst, !res, "got %u\n", res); + RegCloseKey(key); + + return ERROR_SUCCESS; +} + +UINT WINAPI font_absent(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, font_key, 0, KEY_QUERY_VALUE | KEY_WOW64_64KEY, &key); + ok(hinst, !res, "got %u\n", res); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + check_reg_str(hinst, key, "msi test font", NULL); +} + RegCloseKey(key); + + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index d302d05..b28b393 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 font_present(long) +@ stdcall font_absent(long) @ stdcall mov_present(long) @ stdcall mov_absent(long) @ stdcall odbc_present(long)

1 0

Zebediah Figura : msi/tests: Test deferral of RegisterMimeInfo and UnregisterMimeInfo.
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: f181e71400eb25a9aa4e1bf6355116269d04c0b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f181e71400eb25a9aa4e1bf6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 25 21:18:15 2018 -0500 msi/tests: Test deferral of RegisterMimeInfo and UnregisterMimeInfo. 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 | 14 ++++++++++++++ dlls/msi/tests/custom.c | 24 ++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 40 insertions(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 91cf3e1..980ed50 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -1716,13 +1716,26 @@ static const char rmi_install_exec_seq_dat[] = "InstallFiles\t\t2000\n" "UnregisterExtensionInfo\t\t3000\n" "UnregisterMIMEInfo\t\t3500\n" + "umi_immediate\tREMOVE\t3501\n" + "umi_deferred\tREMOVE\t3502\n" "RegisterExtensionInfo\t\t4000\n" "RegisterMIMEInfo\t\t4500\n" + "rmi_immediate\tNOT REMOVE\t4501\n" + "rmi_deferred\tNOT REMOVE\t4502\n" "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const char rmi_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "rmi_immediate\t1\tcustom.dll\trmi_absent\n" + "rmi_deferred\t1025\tcustom.dll\trmi_present\n" + "umi_immediate\t1\tcustom.dll\trmi_present\n" + "umi_deferred\t1025\tcustom.dll\trmi_absent\n"; + static const char pa_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -2270,6 +2283,7 @@ static const msi_table rmi_tables[] = ADD_TABLE(rmi_verb), ADD_TABLE(rmi_mime), ADD_TABLE(rmi_install_exec_seq), + ADD_TABLE(rmi_custom_action), ADD_TABLE(media), ADD_TABLE(property) }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 306a8f3..b59b97a 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1674,3 +1674,27 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { return ERROR_SUCCESS; } + +UINT WINAPI rmi_present(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "MIME\\Database\\Content Type\\mime/type", &key); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + ok(hinst, !res, "got %u\n", res); + + return ERROR_SUCCESS; +} + +UINT WINAPI rmi_absent(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "MIME\\Database\\Content Type\\mime/type", &key); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index b28b393..7f05f01 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -29,6 +29,8 @@ @ stdcall rci_absent(long) @ stdcall rei_present(long) @ stdcall rei_absent(long) +@ stdcall rmi_present(long) +@ stdcall rmi_absent(long) @ stdcall rd_present(long) @ stdcall rd_absent(long) @ stdcall sds_present(long)

1 0

Józef Kucia : winex11: Introduce GAMMA_RAMP_SIZE.
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: 913160d2a4b7e4291d0b4508f80c7ecb79c5b8a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=913160d2a4b7e4291d0b4508… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 28 10:26:42 2018 +0200 winex11: Introduce GAMMA_RAMP_SIZE. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/x11drv.h | 8 +++++--- dlls/winex11.drv/xvidmode.c | 12 ++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 6781d60..85a05a9 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -114,11 +114,13 @@ typedef struct int exposures; /* count of graphics exposures operations */ } X11DRV_PDEVICE; +#define GAMMA_RAMP_SIZE 256 + struct x11drv_gamma_ramp { - WORD red[256]; - WORD green[256]; - WORD blue[256]; + WORD red[GAMMA_RAMP_SIZE]; + WORD green[GAMMA_RAMP_SIZE]; + WORD blue[GAMMA_RAMP_SIZE]; }; static inline X11DRV_PDEVICE *get_x11drv_dev( PHYSDEV dev ) diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 0020b08..63282e7 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -202,7 +202,7 @@ void X11DRV_XF86VM_Init(void) pXF86VidModeGetGammaRampSize(gdi_display, DefaultScreen(gdi_display), &xf86vm_gammaramp_size); if (X11DRV_check_error()) xf86vm_gammaramp_size = 0; - if (xf86vm_gammaramp_size == 256) + if (xf86vm_gammaramp_size == GAMMA_RAMP_SIZE) xf86vm_use_gammaramp = TRUE; } #endif /* X_XF86VidModeSetGammaRamp */ @@ -250,16 +250,16 @@ sym_not_found: #ifdef X_XF86VidModeSetGamma -static void GenerateRampFromGamma(WORD ramp[256], float gamma) +static void GenerateRampFromGamma(WORD ramp[GAMMA_RAMP_SIZE], float gamma) { float r_gamma = 1/gamma; unsigned i; TRACE("gamma is %f\n", r_gamma); - for (i=0; i<256; i++) + for (i=0; i<GAMMA_RAMP_SIZE; i++) ramp[i] = pow(i/255.0, r_gamma) * 65535.0; } -static BOOL ComputeGammaFromRamp(WORD ramp[256], float *gamma) +static BOOL ComputeGammaFromRamp(WORD ramp[GAMMA_RAMP_SIZE], float *gamma) { float r_x, r_y, r_lx, r_ly, r_d, r_v, r_e, g_avg, g_min, g_max; unsigned i, f, l, g_n, c; @@ -342,7 +342,7 @@ static BOOL X11DRV_XF86VM_GetGammaRamp(struct x11drv_gamma_ramp *ramp) if (xf86vm_major < 2) return FALSE; /* no gamma control */ #ifdef X_XF86VidModeSetGammaRamp if (xf86vm_use_gammaramp) - return pXF86VidModeGetGammaRamp(gdi_display, DefaultScreen(gdi_display), 256, + return pXF86VidModeGetGammaRamp(gdi_display, DefaultScreen(gdi_display), GAMMA_RAMP_SIZE, ramp->red, ramp->green, ramp->blue); #endif if (pXF86VidModeGetGamma(gdi_display, DefaultScreen(gdi_display), &gamma)) @@ -367,7 +367,7 @@ static BOOL X11DRV_XF86VM_SetGammaRamp(struct x11drv_gamma_ramp *ramp) !ComputeGammaFromRamp(ramp->blue, &gamma.blue)) return FALSE; #ifdef X_XF86VidModeSetGammaRamp if (xf86vm_use_gammaramp) - return pXF86VidModeSetGammaRamp(gdi_display, DefaultScreen(gdi_display), 256, + return pXF86VidModeSetGammaRamp(gdi_display, DefaultScreen(gdi_display), GAMMA_RAMP_SIZE, ramp->red, ramp->green, ramp->blue); #endif return pXF86VidModeSetGamma(gdi_display, DefaultScreen(gdi_display), &gamma);

1 0

Józef Kucia : winex11: Interpolate gamma ramp when gamma ramp size is greater than 256.
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: 11cd0d34a25dec64d1c8478dccc08de468dc21a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11cd0d34a25dec64d1c8478d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 28 10:26:43 2018 +0200 winex11: Interpolate gamma ramp when gamma ramp size is greater than 256. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xvidmode.c | 98 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 93 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 63282e7..f055c3a 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -37,6 +37,7 @@ #include "windef.h" #include "wingdi.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/library.h" WINE_DEFAULT_DEBUG_CHANNEL(xvidmode); @@ -202,7 +203,8 @@ void X11DRV_XF86VM_Init(void) pXF86VidModeGetGammaRampSize(gdi_display, DefaultScreen(gdi_display), &xf86vm_gammaramp_size); if (X11DRV_check_error()) xf86vm_gammaramp_size = 0; - if (xf86vm_gammaramp_size == GAMMA_RAMP_SIZE) + TRACE("Gamma ramp size %d.\n", xf86vm_gammaramp_size); + if (xf86vm_gammaramp_size >= GAMMA_RAMP_SIZE) xf86vm_use_gammaramp = TRUE; } #endif /* X_XF86VidModeSetGammaRamp */ @@ -334,6 +336,94 @@ static BOOL ComputeGammaFromRamp(WORD ramp[GAMMA_RAMP_SIZE], float *gamma) /* Hmm... should gamma control be available in desktop mode or not? * I'll assume that it should */ +#ifdef X_XF86VidModeSetGammaRamp +static void interpolate_gamma_ramp(WORD *dst_r, WORD *dst_g, WORD *dst_b, unsigned int dst_size, + const WORD *src_r, const WORD *src_g, const WORD *src_b, unsigned int src_size) +{ + double position, distance; + unsigned int dst_i, src_i; + + for (dst_i = 0; dst_i < dst_size; ++dst_i) + { + position = dst_i * (src_size - 1) / (double)(dst_size - 1); + src_i = position; + + if (src_i + 1 < src_size) + { + distance = position - src_i; + + dst_r[dst_i] = (1.0 - distance) * src_r[src_i] + distance * src_r[src_i + 1] + 0.5; + dst_g[dst_i] = (1.0 - distance) * src_g[src_i] + distance * src_g[src_i + 1] + 0.5; + dst_b[dst_i] = (1.0 - distance) * src_b[src_i] + distance * src_b[src_i + 1] + 0.5; + } + else + { + dst_r[dst_i] = src_r[src_i]; + dst_g[dst_i] = src_g[src_i]; + dst_b[dst_i] = src_b[src_i]; + } + } +} + +static BOOL xf86vm_get_gamma_ramp(struct x11drv_gamma_ramp *ramp) +{ + WORD *red, *green, *blue; + BOOL ret = FALSE; + + if (xf86vm_gammaramp_size == GAMMA_RAMP_SIZE) + { + red = ramp->red; + green = ramp->green; + blue = ramp->blue; + } + else + { + if (!(red = heap_calloc(3 * xf86vm_gammaramp_size, sizeof(*red)))) + return FALSE; + green = red + xf86vm_gammaramp_size; + blue = green + xf86vm_gammaramp_size; + } + + ret = pXF86VidModeGetGammaRamp(gdi_display, DefaultScreen(gdi_display), + xf86vm_gammaramp_size, red, green, blue); + if (ret && red != ramp->red) + interpolate_gamma_ramp(ramp->red, ramp->green, ramp->blue, GAMMA_RAMP_SIZE, + red, green, blue, xf86vm_gammaramp_size); + if (red != ramp->red) + heap_free(red); + return ret; +} + +static BOOL xf86vm_set_gamma_ramp(struct x11drv_gamma_ramp *ramp) +{ + WORD *red, *green, *blue; + BOOL ret = FALSE; + + if (xf86vm_gammaramp_size == GAMMA_RAMP_SIZE) + { + red = ramp->red; + green = ramp->green; + blue = ramp->blue; + } + else + { + if (!(red = heap_calloc(3 * xf86vm_gammaramp_size, sizeof(*red)))) + return FALSE; + green = red + xf86vm_gammaramp_size; + blue = green + xf86vm_gammaramp_size; + + interpolate_gamma_ramp(red, green, blue, xf86vm_gammaramp_size, + ramp->red, ramp->green, ramp->blue, GAMMA_RAMP_SIZE); + } + + ret = pXF86VidModeSetGammaRamp(gdi_display, DefaultScreen(gdi_display), + xf86vm_gammaramp_size, red, green, blue); + if (red != ramp->red) + heap_free(red); + return ret; +} +#endif + static BOOL X11DRV_XF86VM_GetGammaRamp(struct x11drv_gamma_ramp *ramp) { #ifdef X_XF86VidModeSetGamma @@ -342,8 +432,7 @@ static BOOL X11DRV_XF86VM_GetGammaRamp(struct x11drv_gamma_ramp *ramp) if (xf86vm_major < 2) return FALSE; /* no gamma control */ #ifdef X_XF86VidModeSetGammaRamp if (xf86vm_use_gammaramp) - return pXF86VidModeGetGammaRamp(gdi_display, DefaultScreen(gdi_display), GAMMA_RAMP_SIZE, - ramp->red, ramp->green, ramp->blue); + return xf86vm_get_gamma_ramp(ramp); #endif if (pXF86VidModeGetGamma(gdi_display, DefaultScreen(gdi_display), &gamma)) { @@ -367,8 +456,7 @@ static BOOL X11DRV_XF86VM_SetGammaRamp(struct x11drv_gamma_ramp *ramp) !ComputeGammaFromRamp(ramp->blue, &gamma.blue)) return FALSE; #ifdef X_XF86VidModeSetGammaRamp if (xf86vm_use_gammaramp) - return pXF86VidModeSetGammaRamp(gdi_display, DefaultScreen(gdi_display), GAMMA_RAMP_SIZE, - ramp->red, ramp->green, ramp->blue); + return xf86vm_set_gamma_ramp(ramp); #endif return pXF86VidModeSetGamma(gdi_display, DefaultScreen(gdi_display), &gamma); #else

1 0

Alexandre Julliard : msvcrtd: Fix _CrtDbgReport calling convention.
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: b7b61f0e0641f1efc49442a4a4d0d16f66c92b15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7b61f0e0641f1efc49442a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 28 11:01:36 2018 +0200 msvcrtd: Fix _CrtDbgReport calling convention. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrtd/debug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrtd/debug.c b/dlls/msvcrtd/debug.c index df7a892..2756a13 100644 --- a/dlls/msvcrtd/debug.c +++ b/dlls/msvcrtd/debug.c @@ -88,8 +88,8 @@ int CDECL _CrtSetDbgFlag(int new) /********************************************************************* * _CrtDbgReport (MSVCRTD.@) */ -int CDECL _CrtDbgReport(int reportType, const char *filename, int linenumber, - const char *moduleName, const char *format, ...) +int WINAPIV _CrtDbgReport(int reportType, const char *filename, int linenumber, + const char *moduleName, const char *format, ...) { return 0; }

1 0