November 2016 - Wine-commits

Hans Leidekker : msi/tests: Properly clean up test services.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: 6f463db5b0d477e4a76038a8158292680c3a553b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f463db5b0d477e4a76038a81… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 4 13:28:05 2016 +0100 msi/tests: Properly clean up test services. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index c281d3b..d51a3d5 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -5427,28 +5427,23 @@ static void test_start_stop_services(void) DeleteFileA(msifile); } -static void delete_TestService(void) +static void delete_test_service(const char *name) { BOOL ret; SC_HANDLE manager, service; manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); ok(manager != NULL, "can't open service manager\n"); - if (!manager) - return; - - service = OpenServiceA(manager, "TestService", GENERIC_ALL); - ok(service != NULL, "TestService doesn't exist\n"); + if (!manager) return; + service = OpenServiceA(manager, name, GENERIC_ALL); if (service) { ret = DeleteService( service ); ok( ret, "failed to delete service %u\n", GetLastError() ); - CloseServiceHandle(service); } CloseServiceHandle(manager); - } static void test_delete_services(void) @@ -5473,7 +5468,7 @@ static void test_delete_services(void) ok(service != NULL, "can't create service %u\n", GetLastError()); CloseServiceHandle(service); CloseServiceHandle(manager); - if (!service) goto error; + if (!service) return; create_test_files(); create_database(msifile, sds_tables, sizeof(sds_tables) / sizeof(msi_table)); @@ -5516,7 +5511,9 @@ static void test_delete_services(void) ok(delete_pf("msitest", FALSE), "Directory not created\n"); error: - delete_TestService(); + delete_test_service("TestService"); + delete_test_service("TestService2"); + delete_test_service("TestService3"); delete_test_files(); DeleteFileA(msifile); } @@ -5558,7 +5555,6 @@ static void test_install_services(void) service = OpenServiceA(manager, "TestService4", GENERIC_ALL); ok(service == NULL, "TestService4 installed\n"); - CloseServiceHandle(manager); res = RegOpenKeyA(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Services\\TestService", &hKey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -5576,6 +5572,11 @@ static void test_install_services(void) r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + service = OpenServiceA(manager, "TestService", GENERIC_ALL); + ok(service != NULL, "TestService deleted\n"); + CloseServiceHandle(service); + CloseServiceHandle(manager); + ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); ok(delete_pf("msitest\\cabout\\new", FALSE), "Directory not created\n"); ok(delete_pf("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); @@ -5591,7 +5592,7 @@ static void test_install_services(void) ok(delete_pf("msitest", FALSE), "Directory not created\n"); error: - delete_TestService(); + delete_test_service("TestService"); delete_test_files(); DeleteFileA(msifile); }

1 0

Hans Leidekker : msi/tests: Fix a typo in test data.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: 6eae08774c504c154ff62e65ce7d4816e4d5fa6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eae08774c504c154ff62e65c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 4 13:28:06 2016 +0100 msi/tests: Fix a typo in test data. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index d51a3d5..11e244c 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -227,7 +227,7 @@ static const char service_install_dat[] = "s72\ts255\tL255\ti4\ti4\ti4\tS255\tS255\tS255\tS255\tS255\ts72\tL255\n" "ServiceInstall\tServiceInstall\n" "TestService\t[SERVNAME]\t[SERVDISP]\t2\t3\t0\t\tservice1[~]+group1[~]service2[~]+group2[~][~]\tTestService\t\t-a arg\tservice_comp\tdescription\n" - "TestService2\tSERVNAME2]\t[SERVDISP2]\t2\t3\t0\t\tservice1[~]+group1[~]service2[~]+group2[~][~]\tTestService2\t\t-a arg\tservice_comp2\tdescription"; + "TestService2\t[SERVNAME2]\t[SERVDISP2]\t2\t3\t0\t\tservice1[~]+group1[~]service2[~]+group2[~][~]\tTestService2\t\t-a arg\tservice_comp2\tdescription\n"; static const char service_install2_dat[] = "ServiceInstall\tName\tDisplayName\tServiceType\tStartType\tErrorControl\t"

1 0

Hans Leidekker : msi: Use exact size for squashed GUID buffers.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: 2b0d2ec553bc9e51baaf99be99e717113a683470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b0d2ec553bc9e51baaf99be9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 4 13:28:07 2016 +0100 msi: Use exact size for squashed GUID buffers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 47 ++++------ dlls/msi/msi.c | 92 ++++++++---------- dlls/msi/msipriv.h | 2 +- dlls/msi/registry.c | 262 +++++++++++++++++++++++++--------------------------- dlls/msi/source.c | 88 ++++++------------ dlls/msi/upgrade.c | 6 +- 6 files changed, 216 insertions(+), 281 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b0d2ec553bc9e51baaf9…

1 0

Hans Leidekker : msi: Take the install context into account when deleting the product key.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: 5343a6f445e95f33f2822fadeb92877a4dc496d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5343a6f445e95f33f2822fade… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 4 13:28:08 2016 +0100 msi: Take the install context into account when deleting the product key. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 4 ++-- dlls/msi/msipriv.h | 2 +- dlls/msi/registry.c | 17 +++++++++++------ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index ee53684..b35969b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5307,7 +5307,7 @@ static UINT msi_unpublish_product( MSIPACKAGE *package, const WCHAR *remove ) return ERROR_SUCCESS; MSIREG_DeleteProductKey(package->ProductCode); - MSIREG_DeleteUserDataProductKey(package->ProductCode); + MSIREG_DeleteUserDataProductKey(package->ProductCode, package->Context); MSIREG_DeleteUninstallKey(package->ProductCode, package->platform); MSIREG_DeleteLocalClassesProductKey(package->ProductCode); @@ -5524,7 +5524,7 @@ static UINT ACTION_RegisterUser(MSIPACKAGE *package) if (msi_check_unpublish(package)) { - MSIREG_DeleteUserDataProductKey(package->ProductCode); + MSIREG_DeleteUserDataProductKey(package->ProductCode, package->Context); goto end; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index ce1eb6d..a2939b3 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -915,7 +915,7 @@ extern UINT MSIREG_OpenUserUpgradeCodesKey(LPCWSTR szProduct, HKEY* key, BOOL cr extern UINT MSIREG_DeleteProductKey(LPCWSTR szProduct) DECLSPEC_HIDDEN; extern UINT MSIREG_DeleteUserProductKey(LPCWSTR szProduct) DECLSPEC_HIDDEN; extern UINT MSIREG_DeleteUserDataPatchKey(LPCWSTR patch, MSIINSTALLCONTEXT context) DECLSPEC_HIDDEN; -extern UINT MSIREG_DeleteUserDataProductKey(LPCWSTR szProduct) DECLSPEC_HIDDEN; +extern UINT MSIREG_DeleteUserDataProductKey(LPCWSTR, MSIINSTALLCONTEXT) DECLSPEC_HIDDEN; extern UINT MSIREG_DeleteUserFeaturesKey(LPCWSTR szProduct) DECLSPEC_HIDDEN; extern UINT MSIREG_DeleteUserDataComponentKey(LPCWSTR szComponent, LPCWSTR szUserSid) DECLSPEC_HIDDEN; extern UINT MSIREG_DeleteUserUpgradeCodesKey(LPCWSTR szUpgradeCode) DECLSPEC_HIDDEN; diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 01d8ba7..8852f57 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -852,7 +852,7 @@ UINT MSIREG_OpenInstallProps(LPCWSTR szProduct, MSIINSTALLCONTEXT dwContext, LPC return RegOpenKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, access, key); } -UINT MSIREG_DeleteUserDataProductKey(LPCWSTR szProduct) +UINT MSIREG_DeleteUserDataProductKey(LPCWSTR szProduct, MSIINSTALLCONTEXT context) { REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; WCHAR *usersid, squashed_pc[SQUASHED_GUID_SIZE], keypath[0x200]; @@ -862,13 +862,18 @@ UINT MSIREG_DeleteUserDataProductKey(LPCWSTR szProduct) if (!squash_guid( szProduct, squashed_pc )) return ERROR_FUNCTION_FAILED; TRACE("%s squashed %s\n", debugstr_w(szProduct), debugstr_w(squashed_pc)); - if (!(usersid = get_user_sid())) + if (context == MSIINSTALLCONTEXT_MACHINE) + sprintfW(keypath, szUserDataProducts_fmt, szLocalSid); + else { - ERR("Failed to retrieve user SID\n"); - return ERROR_FUNCTION_FAILED; + if (!(usersid = get_user_sid())) + { + ERR("Failed to retrieve user SID\n"); + return ERROR_FUNCTION_FAILED; + } + sprintfW(keypath, szUserDataProducts_fmt, usersid); + LocalFree(usersid); } - sprintfW(keypath, szUserDataProducts_fmt, usersid); - LocalFree(usersid); if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, access, &hkey)) return ERROR_SUCCESS; r = RegDeleteTreeW( hkey, squashed_pc );

1 0

Hans Leidekker : msi: Run the installer in silent mode in RemoveExistingProducts.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: 6233eace9769ecc639b39dab7f41297811669244 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6233eace9769ecc639b39dab7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 4 13:28:09 2016 +0100 msi: Run the installer in silent mode in RemoveExistingProducts. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index b35969b..34d1a25 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7391,7 +7391,8 @@ static UINT ACTION_SetODBCFolders( MSIPACKAGE *package ) static UINT ITERATE_RemoveExistingProducts( MSIRECORD *rec, LPVOID param ) { static const WCHAR fmtW[] = - {'m','s','i','e','x','e','c',' ','/','i',' ','%','s',' ','R','E','M','O','V','E','=','%','s',0}; + {'m','s','i','e','x','e','c',' ','/','q','n',' ','/','i',' ','%','s',' ', + 'R','E','M','O','V','E','=','%','s',0}; MSIPACKAGE *package = param; const WCHAR *property = MSI_RecordGetString( rec, 7 ); int attrs = MSI_RecordGetInteger( rec, 5 );

1 0

Hans Leidekker : msi: Also roll back changes made in PublishProduct.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: d4814f98c81c42257cc47bd6f579b8cc7278aacc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4814f98c81c42257cc47bd6f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 4 13:28:10 2016 +0100 msi: Also roll back changes made in PublishProduct. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 57 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 34d1a25..751462b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -145,6 +145,8 @@ static const WCHAR szUnpublishComponents[] = {'U','n','p','u','b','l','i','s','h', 'C','o','m','p','o','n','e','n','t','s',0}; static const WCHAR szUnpublishFeatures[] = {'U','n','p','u','b','l','i','s','h','F','e','a','t','u','r','e','s',0}; +static const WCHAR szUnpublishProduct[] = + {'U','n','p','u','b','l','i','s','h','P','r','o','d','u','c','t',0}; static const WCHAR szUnregisterComPlus[] = {'U','n','r','e','g','i','s','t','e','r','C','o','m','P','l','u','s',0}; static const WCHAR szUnregisterTypeLibraries[] = @@ -5283,28 +5285,10 @@ static UINT msi_unpublish_icons( MSIPACKAGE *package ) return ERROR_SUCCESS; } -static UINT msi_unpublish_product( MSIPACKAGE *package, const WCHAR *remove ) +static UINT ACTION_UnpublishProduct(MSIPACKAGE *package) { - static const WCHAR szUpgradeCode[] = {'U','p','g','r','a','d','e','C','o','d','e',0}; - WCHAR *upgrade, **features; - BOOL full_uninstall = TRUE; - MSIFEATURE *feature; + WCHAR *upgrade; MSIPATCHINFO *patch; - UINT i; - - LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) - { - if (feature->Action == INSTALLSTATE_LOCAL) full_uninstall = FALSE; - } - features = msi_split_string( remove, ',' ); - for (i = 0; features && features[i]; i++) - { - if (!strcmpW( features[i], szAll )) full_uninstall = TRUE; - } - msi_free(features); - - if (!full_uninstall) - return ERROR_SUCCESS; MSIREG_DeleteProductKey(package->ProductCode); MSIREG_DeleteUserDataProductKey(package->ProductCode, package->Context); @@ -5340,10 +5324,32 @@ static UINT msi_unpublish_product( MSIPACKAGE *package, const WCHAR *remove ) return ERROR_SUCCESS; } +static BOOL is_full_uninstall( MSIPACKAGE *package ) +{ + WCHAR **features, *remove = msi_dup_property( package->db, szRemove ); + MSIFEATURE *feature; + BOOL ret = TRUE; + UINT i; + + LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) + { + if (feature->Action == INSTALLSTATE_LOCAL) ret = FALSE; + } + + features = msi_split_string( remove, ',' ); + for (i = 0; features && features[i]; i++) + { + if (!strcmpW( features[i], szAll )) ret = TRUE; + } + + msi_free(features); + msi_free(remove); + return ret; +} + static UINT ACTION_InstallFinalize(MSIPACKAGE *package) { UINT rc; - WCHAR *remove; /* first do the same as an InstallExecute */ rc = execute_script(package, SCRIPT_INSTALL); @@ -5355,9 +5361,9 @@ static UINT ACTION_InstallFinalize(MSIPACKAGE *package) if (rc != ERROR_SUCCESS) return rc; - remove = msi_dup_property(package->db, szRemove); - rc = msi_unpublish_product(package, remove); - msi_free(remove); + if (is_full_uninstall(package)) + rc = ACTION_UnpublishProduct(package); + return rc; } @@ -7673,7 +7679,7 @@ StandardActions[] = { szProcessComponents, ACTION_ProcessComponents, szProcessComponents }, { szPublishComponents, ACTION_PublishComponents, szUnpublishComponents }, { szPublishFeatures, ACTION_PublishFeatures, szUnpublishFeatures }, - { szPublishProduct, ACTION_PublishProduct, NULL }, + { szPublishProduct, ACTION_PublishProduct, szUnpublishProduct }, { szRegisterClassInfo, ACTION_RegisterClassInfo, szUnregisterClassInfo }, { szRegisterComPlus, ACTION_RegisterComPlus, szUnregisterComPlus }, { szRegisterExtensionInfo, ACTION_RegisterExtensionInfo, szUnregisterExtensionInfo }, @@ -7702,6 +7708,7 @@ StandardActions[] = { szStopServices, ACTION_StopServices, szStartServices }, { szUnpublishComponents, ACTION_UnpublishComponents, szPublishComponents }, { szUnpublishFeatures, ACTION_UnpublishFeatures, szPublishFeatures }, + { szUnpublishProduct, ACTION_UnpublishProduct, NULL }, /* for rollback only */ { szUnregisterClassInfo, ACTION_UnregisterClassInfo, szRegisterClassInfo }, { szUnregisterComPlus, ACTION_UnregisterComPlus, szRegisterComPlus }, { szUnregisterExtensionInfo, ACTION_UnregisterExtensionInfo, szRegisterExtensionInfo },

1 0

Nikolay Sivov : resend patch 1/2: Gdiplus: Implement GdipBitmapGetHistogramSize.
by Alexandre Julliard 03 Nov '16

03 Nov '16

Module: wine Branch: master Commit: 8de0275e48d9b64adc6c29f2df347b94e2cb1ce8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8de0275e48d9b64adc6c29f2d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 2 12:56:30 2016 +0300 resend patch 1/2: Gdiplus: Implement GdipBitmapGetHistogramSize. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 14 +++++++++++++ dlls/gdiplus/tests/image.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ include/gdipluscolormatrix.h | 13 ++++++++++++ include/gdiplusflat.h | 1 + 5 files changed, 77 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index db0a49a..92251a7 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -619,7 +619,7 @@ 619 stdcall GdipBitmapCreateApplyEffect(ptr long ptr ptr ptr ptr long ptr ptr) 620 stdcall GdipBitmapApplyEffect(ptr ptr ptr long ptr ptr) 621 stub GdipBitmapGetHistogram -622 stub GdipBitmapGetHistogramSize +622 stdcall GdipBitmapGetHistogramSize(long ptr) 623 stdcall GdipBitmapConvertFormat(ptr long long long ptr float) 624 stdcall GdipImageSetAbort(ptr ptr) 625 stub GdipGraphicsSetAbort diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 74fad29..672b2e5 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -5386,3 +5386,17 @@ GpStatus WINGDIPAPI GdipBitmapConvertFormat(GpBitmap *bitmap, PixelFormat format FIXME("(%p, 0x%08x, %d, %d, %p, %f): stub\n", bitmap, format, dithertype, palettetype, palette, alphathreshold); return NotImplemented; } + +/***************************************************************************** + * GdipBitmapGetHistogramSize [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipBitmapGetHistogramSize(HistogramFormat format, UINT *num_of_entries) +{ + TRACE("(%d, %p)\n", format, num_of_entries); + + if (!num_of_entries) + return InvalidParameter; + + *num_of_entries = 256; + return Ok; +} diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 8c123b9..baf5c3b 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -30,6 +30,8 @@ #include "gdiplus.h" #include "wine/test.h" +static GpStatus (WINAPI *pGdipBitmapGetHistogramSize)(HistogramFormat,UINT*); + #define expect(expected, got) ok((got) == (expected), "Expected %d, got %d\n", (UINT)(expected), (UINT)(got)) #define expectf(expected, got) ok(fabs((expected) - (got)) < 0.0001, "Expected %f, got %f\n", (expected), (got)) @@ -4785,8 +4787,51 @@ static void test_getadjustedpalette(void) GdipDisposeImageAttributes(imageattributes); } +static void test_histogramsize(void) +{ + HistogramFormat test_formats[] = + { + HistogramFormatARGB, + HistogramFormatPARGB, + HistogramFormatRGB, + HistogramFormatGray, + HistogramFormatB, + HistogramFormatG, + HistogramFormatR, + HistogramFormatA, + }; + GpStatus stat; + UINT num, i; + + if (!pGdipBitmapGetHistogramSize) + { + win_skip("GdipBitmapGetHistogramSize is not supported\n"); + return; + } + + stat = pGdipBitmapGetHistogramSize(HistogramFormatARGB, NULL); + expect(InvalidParameter, stat); + + stat = pGdipBitmapGetHistogramSize(0xff, NULL); + expect(InvalidParameter, stat); + + num = 123; + stat = pGdipBitmapGetHistogramSize(10, &num); + expect(Ok, stat); + expect(256, num); + + for (i = 0; i < sizeof(test_formats)/sizeof(test_formats[0]); i++) + { + num = 0; + stat = pGdipBitmapGetHistogramSize(test_formats[i], &num); + expect(Ok, stat); + expect(256, num); + } +} + START_TEST(image) { + HMODULE mod = GetModuleHandleA("gdiplus.dll"); struct GdiplusStartupInput gdiplusStartupInput; ULONG_PTR gdiplusToken; @@ -4797,6 +4842,8 @@ START_TEST(image) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + pGdipBitmapGetHistogramSize = (void*)GetProcAddress(mod, "GdipBitmapGetHistogramSize"); + test_supported_encoders(); test_CloneBitmapArea(); test_ARGB_conversion(); @@ -4843,6 +4890,7 @@ START_TEST(image) test_dispose(); test_createeffect(); test_getadjustedpalette(); + test_histogramsize(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdipluscolormatrix.h b/include/gdipluscolormatrix.h index fbf1b2a..44016ff 100644 --- a/include/gdipluscolormatrix.h +++ b/include/gdipluscolormatrix.h @@ -48,10 +48,23 @@ struct ColorMap Color newColor; }; +enum HistogramFormat +{ + HistogramFormatARGB, + HistogramFormatPARGB, + HistogramFormatRGB, + HistogramFormatGray, + HistogramFormatB, + HistogramFormatG, + HistogramFormatR, + HistogramFormatA, +}; + #ifndef __cplusplus typedef enum ColorAdjustType ColorAdjustType; typedef enum ColorMatrixFlags ColorMatrixFlags; +typedef enum HistogramFormat HistogramFormat; typedef struct ColorMatrix ColorMatrix; typedef struct ColorMap ColorMap; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index c6f16c4..824b460 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -41,6 +41,7 @@ GpStatus WINGDIPAPI GdipSetAdjustableArrowCapWidth(GpAdjustableArrowCap*,REAL); /* Bitmap */ GpStatus WINGDIPAPI GdipBitmapApplyEffect(GpBitmap*,CGpEffect*,RECT*,BOOL,VOID**,INT*); GpStatus WINGDIPAPI GdipBitmapCreateApplyEffect(GpBitmap**,INT,CGpEffect*,RECT*,RECT*,GpBitmap**,BOOL,VOID**,INT*); +GpStatus WINGDIPAPI GdipBitmapGetHistogramSize(HistogramFormat,UINT*); GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap*,INT,INT,ARGB*); GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap*,GDIPCONST GpRect*,UINT, PixelFormat,BitmapData*);

1 0

Nikolay Sivov : gdiplus: Implement GdipBitmapGetHistogram().
by Alexandre Julliard 03 Nov '16

03 Nov '16

Module: wine Branch: master Commit: 509ba80bcbd502fa98ad189d5ae26627f9606757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=509ba80bcbd502fa98ad189d5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 2 21:24:21 2016 +0300 gdiplus: Implement GdipBitmapGetHistogram(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 123 +++++++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/image.c | 94 ++++++++++++++++++++++++++++++++-- include/gdiplusflat.h | 1 + 4 files changed, 216 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=509ba80bcbd502fa98ad1…

1 0

Nikolay Sivov : d2d1: Implement FillContainsPoint() for rectangle geometry.
by Alexandre Julliard 03 Nov '16

03 Nov '16

Module: wine Branch: master Commit: 97e52ab67312a565f3d8c31288ea9bb94edf212a URL: http://source.winehq.org/git/wine.git/?a=commit;h=97e52ab67312a565f3d8c3128… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 2 16:12:39 2016 +0300 d2d1: Implement FillContainsPoint() for rectangle geometry. 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/geometry.c | 24 +++++++++++++++++-- dlls/d2d1/tests/d2d1.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++-- include/d2d1.idl | 2 ++ 3 files changed, 86 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 4abe9bc..afbf339 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2390,10 +2390,30 @@ static HRESULT STDMETHODCALLTYPE d2d_rectangle_geometry_StrokeContainsPoint(ID2D static HRESULT STDMETHODCALLTYPE d2d_rectangle_geometry_FillContainsPoint(ID2D1RectangleGeometry *iface, D2D1_POINT_2F point, const D2D1_MATRIX_3X2_F *transform, float tolerance, BOOL *contains) { - FIXME("iface %p, point {%.8e, %.8e}, transform %p, tolerance %.8e, contains %p stub!\n", + struct d2d_geometry *geometry = impl_from_ID2D1RectangleGeometry(iface); + D2D1_RECT_F *rect = &geometry->u.rectangle.rect; + float dx, dy; + + TRACE("iface %p, point {%.8e, %.8e}, transform %p, tolerance %.8e, contains %p.\n", iface, point.x, point.y, transform, tolerance, contains); - return E_NOTIMPL; + if (transform) + { + D2D1_MATRIX_3X2_F g_i; + + if (!d2d_matrix_invert(&g_i, transform)) + return D2DERR_UNSUPPORTED_OPERATION; + d2d_point_transform(&point, &g_i, point.x, point.y); + } + + if (tolerance == 0.0f) + tolerance = D2D1_DEFAULT_FLATTENING_TOLERANCE; + + dx = max(fabsf((rect->right + rect->left) / 2.0f - point.x) - (rect->right - rect->left) / 2.0f, 0.0f); + dy = max(fabsf((rect->bottom + rect->top) / 2.0f - point.y) - (rect->bottom - rect->top) / 2.0f, 0.0f); + + *contains = tolerance * tolerance > (dx * dx + dy * dy); + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_rectangle_geometry_CompareWithGeometry(ID2D1RectangleGeometry *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 4409bb8..721afa4 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1749,6 +1749,66 @@ static void test_path_geometry(void) DestroyWindow(window); } +static void test_rectangle_geometry(void) +{ + ID2D1RectangleGeometry *geometry; + ID2D1Factory *factory; + D2D1_POINT_2F point; + D2D1_RECT_F rect; + BOOL contains; + HRESULT hr; + + hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); + + set_rect(&rect, 0.0f, 0.0f, 10.0f, 20.0f); + hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + + /* Edge. */ + contains = FALSE; + set_point(&point, 0.0f, 0.0f); + hr = ID2D1RectangleGeometry_FillContainsPoint(geometry, point, NULL, 0.0f, &contains); + ok(SUCCEEDED(hr), "FillContainsPoint() failed, hr %#x.\n", hr); + ok(!!contains, "Got wrong hit test result %d.\n", contains); + + /* Within tolerance limit around corner. */ + contains = TRUE; + set_point(&point, -D2D1_DEFAULT_FLATTENING_TOLERANCE, 0.0f); + hr = ID2D1RectangleGeometry_FillContainsPoint(geometry, point, NULL, 0.0f, &contains); + ok(SUCCEEDED(hr), "FillContainsPoint() failed, hr %#x.\n", hr); + ok(!contains, "Got wrong hit test result %d.\n", contains); + + contains = FALSE; + set_point(&point, -D2D1_DEFAULT_FLATTENING_TOLERANCE + 0.01f, 0.0f); + hr = ID2D1RectangleGeometry_FillContainsPoint(geometry, point, NULL, 0.0f, &contains); + ok(SUCCEEDED(hr), "FillContainsPoint() failed, hr %#x.\n", hr); + ok(!!contains, "Got wrong hit test result %d.\n", contains); + + contains = TRUE; + set_point(&point, -D2D1_DEFAULT_FLATTENING_TOLERANCE - 0.01f, 0.0f); + hr = ID2D1RectangleGeometry_FillContainsPoint(geometry, point, NULL, 0.0f, &contains); + ok(SUCCEEDED(hr), "FillContainsPoint() failed, hr %#x.\n", hr); + ok(!contains, "Got wrong hit test result %d.\n", contains); + + contains = TRUE; + set_point(&point, -D2D1_DEFAULT_FLATTENING_TOLERANCE, -D2D1_DEFAULT_FLATTENING_TOLERANCE); + hr = ID2D1RectangleGeometry_FillContainsPoint(geometry, point, NULL, 0.0f, &contains); + ok(SUCCEEDED(hr), "FillContainsPoint() failed, hr %#x.\n", hr); + ok(!contains, "Got wrong hit test result %d.\n", contains); + + /* Inside. */ + contains = FALSE; + set_point(&point, 5.0f, 5.0f); + hr = ID2D1RectangleGeometry_FillContainsPoint(geometry, point, NULL, 0.0f, &contains); + ok(SUCCEEDED(hr), "FillContainsPoint() failed, hr %#x.\n", hr); + ok(!!contains, "Got wrong hit test result %d.\n", contains); + + ID2D1RectangleGeometry_Release(geometry); + + ID2D1Factory_Release(factory); +} + static void test_bitmap_formats(void) { D2D1_BITMAP_PROPERTIES bitmap_desc; @@ -2705,8 +2765,7 @@ todo_wine ok(hr == D2DERR_WRONG_FACTORY, "EndDraw failure expected, hr %#x.\n", hr); /* Effect is d2d resource, but not a brush. */ - rect.left = rect.top = 0.0f; - rect.right = rect.bottom = 10.0f; + set_rect(&rect, 0.0f, 0.0f, 10.0f, 10.0f); hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry); ok(SUCCEEDED(hr), "Failed to geometry, hr %#x.\n", hr); @@ -3189,6 +3248,7 @@ START_TEST(d2d1) test_color_brush(); test_bitmap_brush(); test_path_geometry(); + test_rectangle_geometry(); test_bitmap_formats(); test_alpha_mode(); test_shared_bitmap(); diff --git a/include/d2d1.idl b/include/d2d1.idl index 6d39e88..cb07cfa 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -50,6 +50,8 @@ typedef D2D_POINT_2U D2D1_POINT_2U; typedef D2D_RECT_U D2D1_RECT_U; typedef D2D_COLOR_F D2D1_COLOR_F; +cpp_quote("#define D2D1_DEFAULT_FLATTENING_TOLERANCE (0.25f)") + enum { D2D1_INTERPOLATION_MODE_DEFINITION_NEAREST_NEIGHBOR = 0,

1 0

Józef Kucia : d3d9/tests: Add test for checking buffer resource format support.
by Alexandre Julliard 03 Nov '16

03 Nov '16

Module: wine Branch: master Commit: 89ba45701149af27bab2eca4c0794c667d4c39bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=89ba45701149af27bab2eca4c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 3 12:21:09 2016 +0100 d3d9/tests: Add test for checking buffer resource format support. 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/d3d9/tests/device.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 9f1d39b..4ea5e6c 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11022,6 +11022,26 @@ static void test_check_device_format(void) ok(FAILED(hr), "Got unexpected hr %#x.\n", hr); } + hr = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + 0, D3DRTYPE_VERTEXBUFFER, D3DFMT_VERTEXDATA); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + 0, D3DRTYPE_INDEXBUFFER, D3DFMT_VERTEXDATA); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + 0, D3DRTYPE_INDEXBUFFER, D3DFMT_INDEX16); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_SOFTWAREPROCESSING, D3DRTYPE_VERTEXBUFFER, D3DFMT_VERTEXDATA); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_SOFTWAREPROCESSING, D3DRTYPE_INDEXBUFFER, D3DFMT_VERTEXDATA); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_SOFTWAREPROCESSING, D3DRTYPE_INDEXBUFFER, D3DFMT_INDEX16); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + IDirect3D9_Release(d3d); }

1 0