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

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

May 28, 2018

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 RegisterClassInfo and UnregisterClassInfo.
by Alexandre Julliard May 28, 2018

May 28, 2018

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 RegisterMimeInfo and UnregisterMimeInfo.
by Alexandre Julliard May 28, 2018

May 28, 2018

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: Interpolate gamma ramp when gamma ramp size is greater than 256.
by Alexandre Julliard May 28, 2018

May 28, 2018

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

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

May 28, 2018

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

Józef Kucia : wined3d: Implement clears for 3D render target views.
by Alexandre Julliard May 28, 2018

May 28, 2018

Module: wine Branch: master Commit: 82155cbc77455c3f7578b738d23ec222d2e6cded URL: https://source.winehq.org/git/wine.git/?a=commit;h=82155cbc77455c3f7578b738… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 28 11:33:16 2018 +0200 wined3d: Implement clears for 3D render target views. 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> --- dlls/wined3d/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0f590c4..ec77a56 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4418,13 +4418,13 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi return WINED3D_OK; resource = view->resource; - if (resource->type != WINED3D_RTYPE_TEXTURE_1D && resource->type != WINED3D_RTYPE_TEXTURE_2D) + if (resource->type == WINED3D_RTYPE_BUFFER) { FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); return WINED3DERR_INVALIDCALL; } - if (view->layer_count > 1) + if (view->layer_count != max(1, resource->depth >> view->desc.u.texture.level_idx)) { FIXME("Layered clears not implemented.\n"); return WINED3DERR_INVALIDCALL;

1 0

Józef Kucia : dxgi: Rename dxgi_swapchain to d3d11_swapchain.
by Alexandre Julliard May 28, 2018

May 28, 2018

Module: wine Branch: master Commit: eae33d5595ad525b335aa5cb5229b0a8ae854bb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eae33d5595ad525b335aa5cb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 28 14:40:25 2018 +0200 dxgi: Rename dxgi_swapchain to d3d11_swapchain. We will have more than one implementation of IDXGISwapChain. 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> --- dlls/dxgi/device.c | 8 +- dlls/dxgi/dxgi_private.h | 4 +- dlls/dxgi/swapchain.c | 186 +++++++++++++++++++++++------------------------ 3 files changed, 99 insertions(+), 99 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eae33d5595ad525b335a…

1 0

Józef Kucia : odbccp32: Fix memory leak in SQLGetInstalledDrivers() (Coverity).
by Alexandre Julliard May 28, 2018

May 28, 2018

Module: wine Branch: master Commit: e034ba1b591a2b843b902055a51da50c4371cea1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e034ba1b591a2b843b902055… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 28 11:38:42 2018 +0200 odbccp32: Fix memory leak in SQLGetInstalledDrivers() (Coverity). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 862237c..f54674c 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -572,7 +572,10 @@ BOOL WINAPI SQLGetInstalledDrivers(char *buf, WORD size, WORD *sizeout) ret = SQLGetInstalledDriversW(wbuf, size, &written); if (!ret) + { + heap_free(wbuf); return FALSE; + } *sizeout = WideCharToMultiByte(CP_ACP, 0, wbuf, written, NULL, 0, NULL, NULL); WideCharToMultiByte(CP_ACP, 0, wbuf, written, buf, size, NULL, NULL);

1 0

Józef Kucia : d3d11/tests: Add test for clearing 3D render target views.
by Alexandre Julliard May 28, 2018

May 28, 2018

Module: wine Branch: master Commit: faec0676074aa8dd7791f329116155f63c2af516 URL: https://source.winehq.org/git/wine.git/?a=commit;h=faec0676074aa8dd7791f329… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 28 11:33:17 2018 +0200 d3d11/tests: Add test for clearing 3D render target views. 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> --- dlls/d3d11/tests/d3d11.c | 315 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 223 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=faec0676074aa8dd7791…

1 0

Józef Kucia : d3d11/tests: Check return value of CheckMultisampleQualityLevels() (Coverity).
by Alexandre Julliard May 28, 2018

May 28, 2018

Module: wine Branch: master Commit: f2c9e04c49d4fafa78a9994d50bb4b15d47ccaa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2c9e04c49d4fafa78a9994d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 28 11:33:18 2018 +0200 d3d11/tests: Check return value of CheckMultisampleQualityLevels() (Coverity). 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> --- dlls/d3d11/tests/d3d11.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index aa48365..1043722 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2381,7 +2381,8 @@ static void test_create_texture2d(void) check_interface(texture, &IID_IDXGISurface, FALSE, FALSE); ID3D11Texture2D_Release(texture); - ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_level_count); + hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_level_count); + ok(hr == S_OK, "Failed to check multisample quality levels, hr %#x.\n", hr); desc.ArraySize = 1; desc.SampleDesc.Count = 2; hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); @@ -12298,7 +12299,8 @@ static void test_check_multisample_quality_levels(void) return; } - ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_levels); + hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_levels); + ok(hr == S_OK, "Failed to check multisample quality levels, hr %#x.\n", hr); if (!quality_levels) { skip("Multisampling not supported for DXGI_FORMAT_R8G8B8A8_UNORM, skipping test.\n");

1 0