April 2017 - Wine-commits - list.winehq.org

Andrey Gusev : setupapi: Add CM_Get_Child_Ex stub.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 472804187c8288e18203a38c76fdc2ca8b171a19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=472804187c8288e18203a38c7… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jan 27 14:32:30 2017 +0200 setupapi: Add CM_Get_Child_Ex stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit afa920a73fbcea3fd9459b1b53976ab1b6e99735) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/cfgmgr32/cfgmgr32.spec | 2 +- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 10 ++++++++++ include/cfgmgr32.h | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 4ca4d3c..14c9cc5 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -43,7 +43,7 @@ @ stub CM_Free_Res_Des_Ex @ stub CM_Free_Res_Des_Handle @ stdcall CM_Get_Child(ptr long long) setupapi.CM_Get_Child -@ stub CM_Get_Child_Ex +@ stdcall CM_Get_Child_Ex(ptr long long ptr) setupapi.CM_Get_Child_Ex @ stub CM_Get_Class_Key_NameA @ stub CM_Get_Class_Key_NameW @ stub CM_Get_Class_Key_Name_ExA diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 5c57c23..5d5b8b2 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -54,7 +54,7 @@ @ stub CM_Free_Res_Des_Ex @ stub CM_Free_Res_Des_Handle @ stdcall CM_Get_Child(ptr long long) -@ stub CM_Get_Child_Ex +@ stdcall CM_Get_Child_Ex(ptr long long ptr) @ stub CM_Get_Class_Key_NameA @ stub CM_Get_Class_Key_NameW @ stub CM_Get_Class_Key_Name_ExA diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 9b71c1c..a738eec 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -101,6 +101,16 @@ CONFIGRET WINAPI CM_Get_Child( } /*********************************************************************** + * CM_Get_Child_Ex (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_Child_Ex( + PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine) +{ + FIXME("%p 0x%08x 0x%08x %p: stub\n", pdnDevInst, dnDevInst, ulFlags, hMachine); + return CR_SUCCESS; +} + +/*********************************************************************** * CM_Get_Device_ID_ExA (SETUPAPI.@) */ DWORD WINAPI CM_Get_Device_ID_ExA( diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index 4606389..8573067 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -210,6 +210,7 @@ CMAPI CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST,DEVINSTID_W,ULONG); CMAPI CONFIGRET WINAPI CM_Open_DevNode_Key(DEVINST dnDevInst, REGSAM access, ULONG ulHardwareProfile, REGDISPOSITION disposition, PHKEY phkDevice, ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_Child(PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags); +CMAPI CONFIGRET WINAPI CM_Get_Child_Ex(PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine); #ifdef __cplusplus }

1 0

Anton Romanov : user32: Add OCR_RDR* cursors.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 002e66739223d161d086647f10ea6d6a30210f5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=002e66739223d161d086647f1… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Sat Jan 28 00:08:42 2017 -0800 user32: Add OCR_RDR* cursors. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cb4545eccdc4b15d0d3bd45dea57b2df4830c5d1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/resources/ocr_rdr2dim.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdreast.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrhorz.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrnorth.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrnortheast.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrnorthwest.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrsouth.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrsoutheast.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrsouthwest.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrvert.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrwest.cur | Bin 0 -> 326 bytes dlls/user32/user32.rc | 34 +++++++++++++++++++++++++++++ 12 files changed, 34 insertions(+) diff --git a/dlls/user32/resources/ocr_rdr2dim.cur b/dlls/user32/resources/ocr_rdr2dim.cur new file mode 100644 index 0000000..0685c97 Binary files /dev/null and b/dlls/user32/resources/ocr_rdr2dim.cur differ diff --git a/dlls/user32/resources/ocr_rdreast.cur b/dlls/user32/resources/ocr_rdreast.cur new file mode 100644 index 0000000..20a548c Binary files /dev/null and b/dlls/user32/resources/ocr_rdreast.cur differ diff --git a/dlls/user32/resources/ocr_rdrhorz.cur b/dlls/user32/resources/ocr_rdrhorz.cur new file mode 100644 index 0000000..31cffb4 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrhorz.cur differ diff --git a/dlls/user32/resources/ocr_rdrnorth.cur b/dlls/user32/resources/ocr_rdrnorth.cur new file mode 100644 index 0000000..db00a53 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrnorth.cur differ diff --git a/dlls/user32/resources/ocr_rdrnortheast.cur b/dlls/user32/resources/ocr_rdrnortheast.cur new file mode 100644 index 0000000..9d31be5 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrnortheast.cur differ diff --git a/dlls/user32/resources/ocr_rdrnorthwest.cur b/dlls/user32/resources/ocr_rdrnorthwest.cur new file mode 100644 index 0000000..ab38893 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrnorthwest.cur differ diff --git a/dlls/user32/resources/ocr_rdrsouth.cur b/dlls/user32/resources/ocr_rdrsouth.cur new file mode 100644 index 0000000..96909c2 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrsouth.cur differ diff --git a/dlls/user32/resources/ocr_rdrsoutheast.cur b/dlls/user32/resources/ocr_rdrsoutheast.cur new file mode 100644 index 0000000..53dbfe3 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrsoutheast.cur differ diff --git a/dlls/user32/resources/ocr_rdrsouthwest.cur b/dlls/user32/resources/ocr_rdrsouthwest.cur new file mode 100644 index 0000000..eb2a204 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrsouthwest.cur differ diff --git a/dlls/user32/resources/ocr_rdrvert.cur b/dlls/user32/resources/ocr_rdrvert.cur new file mode 100644 index 0000000..019cf77 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrvert.cur differ diff --git a/dlls/user32/resources/ocr_rdrwest.cur b/dlls/user32/resources/ocr_rdrwest.cur new file mode 100644 index 0000000..d6bbe89 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrwest.cur differ diff --git a/dlls/user32/user32.rc b/dlls/user32/user32.rc index 28a6c74..01fe13a 100644 --- a/dlls/user32/user32.rc +++ b/dlls/user32/user32.rc @@ -266,6 +266,40 @@ OCR_DRAGOBJECT CURSOR resources/ocr_dragobject.cur /* @makedep: resources/ocr_pen.cur */ OCR_PEN CURSOR resources/ocr_pen.cur +/* @makedep: resources/ocr_rdrvert.cur */ +OCR_RDRVERT CURSOR resources/ocr_rdrvert.cur + +/* @makedep: resources/ocr_rdrhorz.cur */ +/* FIXME: OCR_DRAGOBJECT already uses same resource number even though cursor image + * is entirely different */ +/*OCR_RDRHORZ CURSOR resources/ocr_rdrhorz.cur*/ + +/* @makedep: resources/ocr_rdr2dim.cur */ +OCR_RDR2DIM CURSOR resources/ocr_rdr2dim.cur + +/* @makedep: resources/ocr_rdrnorth.cur */ +OCR_RDRNORTH CURSOR resources/ocr_rdrnorth.cur + +/* @makedep: resources/ocr_rdrsouth.cur */ +OCR_RDRSOUTH CURSOR resources/ocr_rdrsouth.cur + +/* @makedep: resources/ocr_rdrwest.cur */ +OCR_RDRWEST CURSOR resources/ocr_rdrwest.cur + +/* @makedep: resources/ocr_rdreast.cur */ +OCR_RDREAST CURSOR resources/ocr_rdreast.cur + +/* @makedep: resources/ocr_rdrnorthwest.cur */ +OCR_RDRNORTHWEST CURSOR resources/ocr_rdrnorthwest.cur + +/* @makedep: resources/ocr_rdrnortheast.cur */ +OCR_RDRNORTHEAST CURSOR resources/ocr_rdrnortheast.cur + +/* @makedep: resources/ocr_rdrsouthwest.cur */ +OCR_RDRSOUTHWEST CURSOR resources/ocr_rdrsouthwest.cur + +/* @makedep: resources/ocr_rdrsoutheast.cur */ +OCR_RDRSOUTHEAST CURSOR resources/ocr_rdrsoutheast.cur /****************************************************************/ /* Icons */

1 0

Bruno Jesus : winmm: Fix the ordinal number for function PlaySound.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: f8d44fcdbb7f2e50a86c9d2416e46c67bb33cf5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8d44fcdbb7f2e50a86c9d241… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Jan 27 19:14:40 2017 -0200 winmm: Fix the ordinal number for function PlaySound. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 00046b816ca0cacbbebe1957326ed45abe24c097) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winmm/tests/wave.c | 6 ++++++ dlls/winmm/winmm.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index d6019f9..a8a5e8d 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1656,6 +1656,12 @@ static void test_PlaySound(void) { BOOL br; char test_file[MAX_PATH], temp[MAX_PATH], *exts; + void *psound_ordinal, *psound_name; + HMODULE dll = GetModuleHandleA("winmm.dll"); + + psound_name = GetProcAddress(dll, "PlaySound"); + psound_ordinal = GetProcAddress(dll, (LPCSTR) 2); + ok(psound_name == psound_ordinal, "Expected ordinal 2 to be PlaySound function\n"); if(waveOutGetNumDevs() == 0) { skip("No output devices available\n"); diff --git a/dlls/winmm/winmm.spec b/dlls/winmm/winmm.spec index a1eaf81..87908b3 100644 --- a/dlls/winmm/winmm.spec +++ b/dlls/winmm/winmm.spec @@ -1,5 +1,5 @@ # ordinal exports -1 stdcall @(ptr long long) PlaySoundA +2 stdcall @(ptr long long) PlaySoundA 3 stub @ 4 stub @

1 0

Nikolay Sivov : uxtheme: Create compatible bitmap using target hdc.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 14d81d9eb9cd78206e950446acd06cfe0c96ae4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=14d81d9eb9cd78206e950446a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 19 13:30:43 2017 +0300 uxtheme: Create compatible bitmap using target hdc. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uxtheme/buffer.c b/dlls/uxtheme/buffer.c index ce1fc9f..17bdf3d 100644 --- a/dlls/uxtheme/buffer.c +++ b/dlls/uxtheme/buffer.c @@ -105,7 +105,7 @@ HPAINTBUFFER WINAPI BeginBufferedPaint(HDC targetdc, const RECT *rect, switch (format) { case BPBF_COMPATIBLEBITMAP: - hbm = CreateCompatibleBitmap(buffer->memorydc, rect->right - rect->left, rect->bottom - rect->top); + hbm = CreateCompatibleBitmap(targetdc, rect->right - rect->left, rect->bottom - rect->top); buffer->bits = NULL; break; case BPBF_DIB:

1 0

Hans Leidekker : msi: Apply feature selection to the whole feature subtree.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: d94653d0ebbfd5d48cba4e9d97331f65023d0d07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d94653d0ebbfd5d48cba4e9d9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 19 11:26:47 2017 +0200 msi: Apply feature selection to the whole feature subtree. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 79 +++++++++++++++++++--------------- dlls/msi/tests/install.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 152 insertions(+), 34 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 4d7e8b9..ab701c2 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1772,6 +1772,45 @@ static BOOL process_overrides( MSIPACKAGE *package, int level ) return ret; } +static void disable_children( MSIFEATURE *feature, int level ) +{ + FeatureList *fl; + + LIST_FOR_EACH_ENTRY( fl, &feature->Children, FeatureList, entry ) + { + if (!is_feature_selected( feature, level )) + { + TRACE("child %s (level %d request %d) follows disabled parent %s (level %d request %d)\n", + debugstr_w(fl->feature->Feature), fl->feature->Level, fl->feature->ActionRequest, + debugstr_w(feature->Feature), feature->Level, feature->ActionRequest); + + fl->feature->Level = feature->Level; + fl->feature->Action = INSTALLSTATE_UNKNOWN; + fl->feature->ActionRequest = INSTALLSTATE_UNKNOWN; + } + disable_children( fl->feature, level ); + } +} + +static void follow_parent( MSIFEATURE *feature ) +{ + FeatureList *fl; + + LIST_FOR_EACH_ENTRY( fl, &feature->Children, FeatureList, entry ) + { + if (fl->feature->Attributes & msidbFeatureAttributesFollowParent) + { + TRACE("child %s (level %d request %d) follows parent %s (level %d request %d)\n", + debugstr_w(fl->feature->Feature), fl->feature->Level, fl->feature->ActionRequest, + debugstr_w(feature->Feature), feature->Level, feature->ActionRequest); + + fl->feature->Action = feature->Action; + fl->feature->ActionRequest = feature->ActionRequest; + } + follow_parent( fl->feature ); + } +} + UINT MSI_SetFeatureStates(MSIPACKAGE *package) { int level; @@ -1810,24 +1849,9 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) /* disable child features of unselected parent or follow parent */ LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { - FeatureList *fl; - - LIST_FOR_EACH_ENTRY( fl, &feature->Children, FeatureList, entry ) - { - if (!is_feature_selected( feature, level )) - { - fl->feature->Action = INSTALLSTATE_UNKNOWN; - fl->feature->ActionRequest = INSTALLSTATE_UNKNOWN; - } - else if (fl->feature->Attributes & msidbFeatureAttributesFollowParent) - { - TRACE("feature %s (level %d request %d) follows parent %s (level %d request %d)\n", - debugstr_w(fl->feature->Feature), fl->feature->Level, fl->feature->ActionRequest, - debugstr_w(feature->Feature), feature->Level, feature->ActionRequest); - fl->feature->Action = feature->Action; - fl->feature->ActionRequest = feature->ActionRequest; - } - } + if (feature->Feature_Parent) continue; + disable_children( feature, level ); + follow_parent( feature ); } } else /* preselected */ @@ -1852,22 +1876,9 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) } LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { - FeatureList *fl; - - if (!is_feature_selected( feature, level )) continue; - - LIST_FOR_EACH_ENTRY( fl, &feature->Children, FeatureList, entry ) - { - if (fl->feature->Attributes & msidbFeatureAttributesFollowParent && - (!(feature->Attributes & msidbFeatureAttributesFavorAdvertise))) - { - TRACE("feature %s (level %d request %d) follows parent %s (level %d request %d)\n", - debugstr_w(fl->feature->Feature), fl->feature->Level, fl->feature->ActionRequest, - debugstr_w(feature->Feature), feature->Level, feature->ActionRequest); - fl->feature->Action = feature->Action; - fl->feature->ActionRequest = feature->ActionRequest; - } - } + if (feature->Feature_Parent) continue; + disable_children( feature, level ); + follow_parent( feature ); } } diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index a377184..9d4fecc 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1222,6 +1222,69 @@ static const char shc_install_exec_seq_dat[] = "PublishProduct\t\t1900\n" "InstallFinalize\t\t2000\n"; +static const char ft_file_dat[] = + "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "featuretree\tcomp\tfeaturetree.txt\t1000\t\t\t8192\t1\n"; + +static const char ft_comp_dat[] = + "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "comp\t{12345678-1234-1234-1234-222222222222}\tTARGETDIR\t0\t\t\n" + "comp2\t{12345678-1234-1234-1234-333333333333}\tTARGETDIR\t0\t\tfeaturetree\n"; + +static const char ft_feature_dat[] = + "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "A\t\t\t\t2\t1\t\t0\n" + "C\tB\t\t\t2\t1\t\t0\n" + "B\tA\t\t\t4\t1\t\t0\n" + "D\t\t\t\t2\t1\t\t0\n"; + +static const char ft_feature_comp_dat[] = + "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "C\tcomp\n" + "D\tcomp2\n"; + +static const char ft_condition_dat[] = + "Feature_\tLevel\tCondition\n" + "s38\ti2\tS255\n" + "Condition\tFeature_\tLevel\n" + "A\t0\t\"0\"<>INSTALLTYPE\n"; + +static const char ft_custom_action_dat[] = + "Action\tType\tSource\tTarget\tISComments\n" + "s72\ti2\tS64\tS0\tS255\n" + "CustomAction\tAction\n" + "Run A\t19\t\tA\t\n" + "Run B\t19\t\tB\t\n" + "Run C\t19\t\tC\t\n"; + +static const char ft_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "CostInitialize\t\t100\n" + "FileCost\t\t200\n" + "CostFinalize\t\t300\n" + "InstallValidate\t\t400\n" + "InstallInitialize\t\t500\n" + "Run C\t3 = &C AND NOT Installed\t600\n" + "Run B\t3 = &B AND NOT Installed\t700\n" + "Run A\t3 = &A AND NOT Installed\t800\n" + "ProcessComponents\t\t900\n" + "RemoveFiles\t\t1000\n" + "InstallFiles\t\t1100\n" + "RegisterProduct\t\t1200\n" + "PublishFeatures\t\t1300\n" + "PublishProduct\t\t1400\n" + "InstallFinalize\t\t1500\n"; + typedef struct _msi_table { const CHAR *filename; @@ -1862,6 +1925,20 @@ static const msi_table shc2_tables[] = ADD_TABLE(shc2_property) }; +static const msi_table ft_tables[] = +{ + ADD_TABLE(media), + ADD_TABLE(directory), + ADD_TABLE(ft_file), + ADD_TABLE(ft_comp), + ADD_TABLE(ft_feature), + ADD_TABLE(ft_feature_comp), + ADD_TABLE(ft_condition), + ADD_TABLE(ft_custom_action), + ADD_TABLE(ft_install_exec_seq), + ADD_TABLE(property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -5939,6 +6016,35 @@ static void test_remove_upgrade_code(void) DeleteFileA( msifile ); } +static void test_feature_tree(void) +{ + UINT r; + + if (is_process_limited()) + { + skip( "process is limited\n" ); + return; + } + + create_file( "msitest\\featuretree.txt", 1000 ); + create_database( msifile, ft_tables, sizeof(ft_tables)/sizeof(ft_tables[0]) ); + + MsiSetInternalUI( INSTALLUILEVEL_NONE, NULL ); + + r = MsiInstallProductA( msifile, "INSTALLTYPE=\"0\"" ); + ok( r == ERROR_INSTALL_FAILURE, "got %u\n", r ); + + r = MsiInstallProductA( msifile, "INSTALLTYPE=\"1\"" ); + ok( r == ERROR_SUCCESS, "got %u\n", r ); + + r = MsiInstallProductA( msifile, "REMOVE=ALL" ); + ok( r == ERROR_SUCCESS, "got %u\n", r ); + + DeleteFileA( "msitest\\featuretree.txt" ); + RemoveDirectoryA( "msitest" ); + DeleteFileA( msifile ); +} + START_TEST(install) { DWORD len; @@ -6026,6 +6132,7 @@ START_TEST(install) test_volume_props(); test_shared_component(); test_remove_upgrade_code(); + test_feature_tree(); DeleteFileA(log_file);

1 0

Hans Leidekker : msi: Properly handle DWORD registry values in MsiGetPatchInfoEx.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: f3adb4a17a1428b9f9a14c924865dc3bd45ea508 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3adb4a17a1428b9f9a14c924… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 19 11:26:48 2017 +0200 msi: Properly handle DWORD registry values in MsiGetPatchInfoEx. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msi.c | 48 ++++++++++++++++++++++++------------------------ dlls/msi/tests/msi.c | 17 ++++++++++++++++- 2 files changed, 40 insertions(+), 25 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 972eec6..f6b6151 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1075,26 +1075,26 @@ done: return rc; } -static LPWSTR msi_reg_get_value(HKEY hkey, LPCWSTR name, DWORD *type) +static WCHAR *reg_get_value( HKEY hkey, const WCHAR *name, DWORD *type ) { - DWORD dval; LONG res; - WCHAR temp[20]; - static const WCHAR format[] = {'%','d',0}; + if ((res = RegQueryValueExW( hkey, name, NULL, type, NULL, NULL )) != ERROR_SUCCESS) return NULL; - res = RegQueryValueExW(hkey, name, NULL, type, NULL, NULL); - if (res != ERROR_SUCCESS) - return NULL; - - if (*type == REG_SZ) - return msi_reg_get_val_str(hkey, name); + if (*type == REG_SZ) return msi_reg_get_val_str( hkey, name ); + if (*type == REG_DWORD) + { + static const WCHAR fmt[] = {'%','u',0}; + WCHAR temp[11]; + DWORD val; - if (!msi_reg_get_val_dword(hkey, name, &dval)) - return NULL; + if (!msi_reg_get_val_dword( hkey, name, &val )) return NULL; + sprintfW( temp, fmt, val ); + return strdupW( temp ); + } - sprintfW(temp, format, dval); - return strdupW(temp); + ERR( "unhandled value type %u\n", *type ); + return NULL; } static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, @@ -1168,7 +1168,7 @@ static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, else if (!strcmpW( szAttribute, INSTALLPROPERTY_VERSIONSTRINGW )) szAttribute = display_version; - val = msi_reg_get_value(userdata, szAttribute, &type); + val = reg_get_value(userdata, szAttribute, &type); if (!val) val = empty; RegCloseKey(userdata); @@ -1202,7 +1202,7 @@ static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, goto done; } - val = msi_reg_get_value(source, szAttribute, &type); + val = reg_get_value(source, szAttribute, &type); if (!val) val = empty; @@ -1210,7 +1210,7 @@ static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, } else { - val = msi_reg_get_value(prodkey, szAttribute, &type); + val = reg_get_value(prodkey, szAttribute, &type); if (!val) val = empty; } @@ -1492,7 +1492,7 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid, !strcmpW( szProperty, INSTALLPROPERTY_REGOWNERW ) || !strcmpW( szProperty, INSTALLPROPERTY_INSTANCETYPEW )) { - val = msi_reg_get_value(props, package, &type); + val = reg_get_value(props, package, &type); if (!val) { if (prod || classes) @@ -1508,7 +1508,7 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid, else if (!strcmpW( szProperty, INSTALLPROPERTY_VERSIONSTRINGW )) szProperty = displayversion; - val = msi_reg_get_value(props, szProperty, &type); + val = reg_get_value(props, szProperty, &type); if (!val) val = strdupW(szEmpty); @@ -1533,7 +1533,7 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid, else if (dwContext == MSIINSTALLCONTEXT_MACHINE) hkey = classes; - val = msi_reg_get_value(hkey, szProperty, &type); + val = reg_get_value(hkey, szProperty, &type); if (!val) val = strdupW(szEmpty); @@ -1545,7 +1545,7 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid, { if (props) { - val = msi_reg_get_value(props, package, &type); + val = reg_get_value(props, package, &type); if (!val) goto done; @@ -1558,7 +1558,7 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid, r = msi_copy_outval(val, szValue, pcchValue); goto done; } - else if (props && (val = msi_reg_get_value(props, package, &type))) + else if (props && (val = reg_get_value(props, package, &type))) { msi_free(val); val = strdupW(five); @@ -1674,7 +1674,7 @@ UINT WINAPI MsiGetPatchInfoExW(LPCWSTR szPatchCode, LPCWSTR szProductCode, HKEY udpatch = 0, datakey = 0; HKEY prodpatches = 0; UINT r = ERROR_UNKNOWN_PRODUCT; - DWORD len; + DWORD len, type; LONG res; TRACE("(%s, %s, %s, %d, %s, %p, %p)\n", debugstr_w(szPatchCode), @@ -1766,7 +1766,7 @@ UINT WINAPI MsiGetPatchInfoExW(LPCWSTR szPatchCode, LPCWSTR szProductCode, } } - val = msi_reg_get_val_str(datakey, szProperty); + val = reg_get_value(datakey, szProperty, &type); if (!val) val = strdupW(szEmpty); diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index ad7fb84..fb939ff 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -12675,7 +12675,22 @@ static void test_MsiGetPatchInfoEx(void) MSIINSTALLCONTEXT_USERMANAGED, INSTALLPROPERTY_PATCHSTATEA, val, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmpA(val, "1"), "Expected \"1\", got \"%s\"\n", val); + ok(!lstrcmpA(val, "1"), "Expected \"1\", got \"%s\"\n", val); + ok(size == 1, "Expected 1, got %d\n", size); + + size = 1; + res = RegSetValueExA(hpatch, "Uninstallable", 0, REG_DWORD, + (const BYTE *)&size, sizeof(DWORD)); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* Uninstallable value exists */ + size = MAX_PATH; + lstrcpyA(val, "apple"); + r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid, + MSIINSTALLCONTEXT_USERMANAGED, + INSTALLPROPERTY_UNINSTALLABLEA, val, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(val, "1"), "Expected \"1\", got \"%s\"\n", val); ok(size == 1, "Expected 1, got %d\n", size); res = RegSetValueExA(hpatch, "DisplayName", 0, REG_SZ,

1 0

Hans Leidekker : msi: Set patch property Uninstallable.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: b956b1f407cf6f00d09095f3e64d8d78690cfa18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b956b1f407cf6f00d09095f3e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 19 11:26:49 2017 +0200 msi: Set patch property Uninstallable. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 11 ++++++++++- dlls/msi/msipriv.h | 2 ++ dlls/msi/patch.c | 35 ++++++++++++++++++++++++++++++++++- 3 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index ab701c2..1665200 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4431,7 +4431,16 @@ static UINT msi_publish_patches( MSIPACKAGE *package ) if (res != ERROR_SUCCESS) goto done; - res = RegSetValueExW( patch_key, szState, 0, REG_DWORD, (const BYTE *)&patch->state, sizeof(patch->state) ); + res = RegSetValueExW( patch_key, szState, 0, REG_DWORD, (const BYTE *)&patch->state, + sizeof(patch->state) ); + if (res != ERROR_SUCCESS) + { + RegCloseKey( patch_key ); + goto done; + } + + res = RegSetValueExW( patch_key, szUninstallable, 0, REG_DWORD, (const BYTE *)&patch->uninstallable, + sizeof(patch->uninstallable) ); RegCloseKey( patch_key ); if (res != ERROR_SUCCESS) goto done; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 56ba725..2e9e91e 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -192,6 +192,7 @@ typedef struct tagMSIPATCHINFO LPWSTR filename; LPWSTR localfile; MSIPATCHSTATE state; + DWORD uninstallable; BOOL delete_on_close; BOOL registered; UINT disk_id; @@ -1198,6 +1199,7 @@ static const WCHAR szData[] = {'D','a','t','a',0}; static const WCHAR szLangResource[] = {'\\','V','a','r','F','i','l','e','I','n','f','o','\\','T','r','a','n','s','l','a','t','i','o','n',0}; static const WCHAR szInstallLocation[] = {'I','n','s','t','a','l','l','L','o','c','a','t','i','o','n',0}; static const WCHAR szProperty[] = {'P','r','o','p','e','r','t','y',0}; +static const WCHAR szUninstallable[] = {'U','n','i','n','s','t','a','l','l','a','b','l','e',0}; /* memory allocation macro functions */ static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1); diff --git a/dlls/msi/patch.c b/dlls/msi/patch.c index eb91e06..f6ed3c1 100644 --- a/dlls/msi/patch.c +++ b/dlls/msi/patch.c @@ -836,6 +836,38 @@ done: return r; } +static DWORD is_uninstallable( MSIDATABASE *db ) +{ + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','`','V','a','l','u','e','`',' ','F','R','O','M',' ', + '`','M','s','i','P','a','t','c','h','M','e','t','a','d','a','t','a','`',' ', + 'W','H','E','R','E',' ','`','C','o','m','p','a','n','y','`',' ','I','S',' ', + 'N','U','L','L',' ','A','N','D',' ','`','P','r','o','p','e','r','t','y','`','=', + '\'','A','l','l','o','w','R','e','m','o','v','a','l','\'',0}; + MSIQUERY *view; + MSIRECORD *rec; + DWORD ret = 0; + + if (MSI_DatabaseOpenViewW( db, query, &view ) != ERROR_SUCCESS) return 0; + if (MSI_ViewExecute( view, 0 ) != ERROR_SUCCESS) + { + msiobj_release( &view->hdr ); + return 0; + } + + if (MSI_ViewFetch( view, &rec ) == ERROR_SUCCESS) + { + const WCHAR *value = MSI_RecordGetString( rec, 1 ); + ret = atoiW( value ); + msiobj_release( &rec->hdr ); + } + + FIXME( "check other criteria\n" ); + + msiobj_release( &view->hdr ); + return ret; +} + static UINT msi_apply_patch_db( MSIPACKAGE *package, MSIDATABASE *patch_db, MSIPATCHINFO *patch ) { UINT i, r = ERROR_SUCCESS; @@ -861,7 +893,8 @@ static UINT msi_apply_patch_db( MSIPACKAGE *package, MSIDATABASE *patch_db, MSIP if (r != ERROR_SUCCESS) return r; - patch->state = MSIPATCHSTATE_APPLIED; + patch->uninstallable = is_uninstallable( patch_db ); + patch->state = MSIPATCHSTATE_APPLIED; list_add_tail( &package->patches, &patch->entry ); return ERROR_SUCCESS; }

1 0

Piotr Caban : server: Update all children upon SetLayeredWindowAttributes.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 6a0ffd70c76371409a5893149eed198c1e8574df URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a0ffd70c76371409a5893149… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 18 18:43:13 2017 +0200 server: Update all children upon SetLayeredWindowAttributes. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/window.c b/server/window.c index 4f30079..f35d6f6 100644 --- a/server/window.c +++ b/server/window.c @@ -2833,7 +2833,7 @@ DECL_HANDLER(set_window_layered_info) win->layered_flags = req->flags; win->is_layered = 1; /* repaint since we know now it's not going to use UpdateLayeredWindow */ - if (!was_layered) redraw_window( win, 0, 1, RDW_INVALIDATE | RDW_ERASE | RDW_FRAME ); + if (!was_layered) redraw_window( win, 0, 1, RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_ERASE | RDW_FRAME ); } else set_win32_error( ERROR_INVALID_WINDOW_HANDLE ); }

1 0

Piotr Caban : user32: Switch to normal window drawing on SetLayeredWindowAttributes call.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 34b108dd1dbc1e65e168b52beb88eb7d0a9ba02e URL: http://source.winehq.org/git/wine.git/?a=commit;h=34b108dd1dbc1e65e168b52be… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 18 18:43:19 2017 +0200 user32: Switch to normal window drawing on SetLayeredWindowAttributes call. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 6 +++++- dlls/winemac.drv/window.c | 2 ++ dlls/winex11.drv/window.c | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 5c27a01..560fbc5 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3749,7 +3749,11 @@ BOOL WINAPI SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWO } SERVER_END_REQ; - if (ret) USER_Driver->pSetLayeredWindowAttributes( hwnd, key, alpha, flags ); + if (ret) + { + USER_Driver->pSetLayeredWindowAttributes( hwnd, key, alpha, flags ); + update_window_state( hwnd ); + } return ret; } diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index e07507b..878b4dc 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1561,6 +1561,8 @@ void CDECL macdrv_SetLayeredWindowAttributes(HWND hwnd, COLORREF key, BYTE alpha if (data) { data->layered = TRUE; + data->ulw_layered = FALSE; + if (data->surface) set_surface_use_alpha(data->surface, FALSE); if (data->cocoa_window) { sync_window_opacity(data, key, alpha, FALSE, flags); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7408a0e..ea4933f 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2535,6 +2535,8 @@ void CDECL X11DRV_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alph if (data) { + set_window_visual( data, &default_visual ); + if (data->whole_window) sync_window_opacity( data->display, data->whole_window, key, alpha, flags ); if (data->surface)

1 0

Piotr Caban : user32/tests: Add layered window child painting test when WS_CLIPCHILDREN flag is specified.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: f7402accc40b66140be4d27c5ad1b2fee8532dfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7402accc40b66140be4d27c5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 18 18:43:29 2017 +0200 user32/tests: Add layered window child painting test when WS_CLIPCHILDREN flag is specified. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index fef9cb0..e146e96 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7317,7 +7317,7 @@ static void test_hwnd_message(void) static void test_layered_window(void) { - HWND hwnd; + HWND hwnd, child; COLORREF key = 0; BYTE alpha = 0; DWORD flags = 0; @@ -7326,6 +7326,7 @@ static void test_layered_window(void) HDC hdc; HBITMAP hbm; BOOL ret; + MSG msg; if (!pGetLayeredWindowAttributes || !pSetLayeredWindowAttributes || !pUpdateLayeredWindow) { @@ -7465,6 +7466,40 @@ static void test_layered_window(void) ok( alpha == 0 || alpha == 55, "wrong alpha %u\n", alpha ); ok( flags == 0, "wrong flags %x\n", flags ); + /* test layered window with WS_CLIPCHILDREN flag */ + SetWindowLongA( hwnd, GWL_STYLE, GetWindowLongA(hwnd, GWL_STYLE) | WS_CLIPCHILDREN ); + SetWindowLongA( hwnd, GWL_EXSTYLE, GetWindowLongA(hwnd, GWL_EXSTYLE) & ~WS_EX_LAYERED ); + SetWindowLongA( hwnd, GWL_EXSTYLE, GetWindowLongA(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED ); + child = CreateWindowExA( 0, "button", "button", WS_VISIBLE | WS_CHILD, + 0, 0, 50, 50, hwnd, 0, 0, NULL ); + ok( child != NULL, "CreateWindowEx error %u\n", GetLastError() ); + ShowWindow( hwnd, SW_SHOW ); + + ret = pSetLayeredWindowAttributes( hwnd, 0, 255, LWA_ALPHA ); + ok( ret, "SetLayeredWindowAttributes should succeed on layered window\n" ); + while (GetMessageA(&msg, 0, 0, 0)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_PAINT && msg.hwnd == child) + break; + } + + SetWindowLongA( hwnd, GWL_EXSTYLE, GetWindowLongA(hwnd, GWL_EXSTYLE) & ~WS_EX_LAYERED ); + SetWindowLongA( hwnd, GWL_EXSTYLE, GetWindowLongA(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED ); + ret = pUpdateLayeredWindow( hwnd, 0, NULL, &sz, hdc, &pt, 0, NULL, ULW_OPAQUE ); + ok( ret, "UpdateLayeredWindow should succeed on layered window\n" ); + + ret = pSetLayeredWindowAttributes( hwnd, 0, 255, LWA_ALPHA ); + ok( ret, "SetLayeredWindowAttributes should succeed on layered window\n" ); + while (GetMessageA(&msg, 0, 0, 0)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_PAINT && msg.hwnd == child) + break; + } + DestroyWindow( hwnd ); DeleteDC( hdc ); DeleteObject( hbm );

1 0