November 2018 - Wine-Commits

Alex Henrie : shell32: Rename icon 137 from "options" to "control panel XP ".
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: a5d47b79717432d492aab9b3f620223c1462dbc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5d47b79717432d492aab9b3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:24 2018 -0600 shell32: Rename icon 137 from "options" to "control panel XP". Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e26bf9c3ea2e3ed2728a008722d54f7a8f89350b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shresdef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 7282fbb..d9cb3d9 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -224,7 +224,7 @@ #define IDI_SHELL_FILE_SEARCH 134 #define IDI_SHELL_SYSTEM_SEARCH 135 /* 136 not used on Windows */ -#define IDI_SHELL_OPTIONS 137 +#define IDI_SHELL_CONTROL_PANEL_XP 137 #define IDI_SHELL_PRINTERS_FOLDER_XP 138 #define IDI_SHELL_ADD_PRINTER 139 #define IDI_SHELL_REMOTE_PRINTER 140

1 0

Alex Henrie : shell32: Add remaining printer icons.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: e92e5a7ba004f1d07eb0ed590fbfe58b56a7836d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e92e5a7ba004f1d07eb0ed59… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:19 2018 -0600 shell32: Add remaining printer icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d0379a3060f14d347d97b792a2a288a51cb6f948) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 12 ++++++++++++ dlls/shell32/shresdef.h | 3 +++ 2 files changed, 15 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index d2c7067..8cb7ec8 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -826,6 +826,10 @@ IDI_SHELL_INTERNET_RADIO ICON resources/internet.ico /* @makedep: resources/internet.ico */ IDI_SHELL_UPLOAD_PHOTO ICON resources/internet.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/printer.ico */ +IDI_SHELL_PRINT_PHOTO ICON resources/printer.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_EMPTY_RECYCLE_BIN2 ICON resources/trash_file.ico @@ -860,6 +864,10 @@ IDI_SHELL_SHARED_FOLDER ICON resources/folder.ico /* @makedep: resources/users.ico */ IDI_SHELL_USERS_XP ICON resources/users.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/printer.ico */ +IDI_SHELL_MULTIFUNCTION_PRINTER ICON resources/printer.ico + /* @makedep: resources/internet.ico */ IDI_SHELL_INTERNET ICON resources/internet.ico @@ -910,6 +918,10 @@ IDI_SHELL_OPTICAL_DISC ICON resources/optical_disc.ico IDI_SHELL_DVD_ROM ICON resources/optical_disc.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/printer.ico */ +IDI_SHELL_INTERNET_PRINTER ICON resources/printer.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/disk_drive.ico */ IDI_SHELL_ZIP_DRIVE2 ICON resources/disk_drive.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 4fdb27e..59f9f09 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -314,6 +314,7 @@ #define IDI_SHELL_PLAY 246 #define IDI_SHELL_INTERNET_RADIO 247 #define IDI_SHELL_UPLOAD_PHOTO 251 +#define IDI_SHELL_PRINT_PHOTO 252 #define IDI_SHELL_EMPTY_RECYCLE_BIN2 254 #define IDI_SHELL_NEW_NETWORK_FOLDER 258 #define IDI_SHELL_WRITE_DISC 260 @@ -323,6 +324,7 @@ #define IDI_SHELL_BURN_DISC 266 #define IDI_SHELL_SHARED_FOLDER 267 #define IDI_SHELL_USERS_XP 269 +#define IDI_SHELL_MULTIFUNCTION_PRINTER 272 #define IDI_SHELL_INTERNET 273 #define IDI_SHELL_WEB_CALENDAR 276 #define IDI_SHELL_USERS_XP2 279 @@ -336,6 +338,7 @@ #define IDI_SHELL_DVD_R 298 #define IDI_SHELL_OPTICAL_DISC 302 #define IDI_SHELL_DVD_ROM 304 +#define IDI_SHELL_INTERNET_PRINTER 311 #define IDI_SHELL_ZIP_DRIVE2 313 #define IDI_SHELL_DVD_RW 318 #define IDI_SHELL_NEW_FOLDER 319

1 0

Alex Henrie : shell32: Add remaining Internet icons.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 22793d96d7702f96fa21541cb80c2de4a4721f7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=22793d96d7702f96fa21541c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:18 2018 -0600 shell32: Add remaining Internet icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dc0ad3acbfc81881baeb234901f75981bbe81aea) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 18 ++++++++++++++++++ dlls/shell32/shresdef.h | 6 ++++++ 2 files changed, 24 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index eab4343..d2c7067 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -818,6 +818,14 @@ IDI_SHELL_PRINT ICON resources/printer.ico /* @makedep: resources/play.ico */ IDI_SHELL_PLAY ICON resources/play.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/internet.ico */ +IDI_SHELL_INTERNET_RADIO ICON resources/internet.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/internet.ico */ +IDI_SHELL_UPLOAD_PHOTO ICON resources/internet.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_EMPTY_RECYCLE_BIN2 ICON resources/trash_file.ico @@ -852,6 +860,13 @@ IDI_SHELL_SHARED_FOLDER ICON resources/folder.ico /* @makedep: resources/users.ico */ IDI_SHELL_USERS_XP ICON resources/users.ico +/* @makedep: resources/internet.ico */ +IDI_SHELL_INTERNET ICON resources/internet.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/internet.ico */ +IDI_SHELL_WEB_CALENDAR ICON resources/internet.ico + /* @makedep: resources/users.ico */ IDI_SHELL_USERS_XP2 ICON resources/users.ico @@ -920,6 +935,9 @@ IDI_SHELL_APP_FOLDER_SMALL ICON resources/folder.ico /* @makedep: resources/restricted.ico */ IDI_SHELL_RESTRICTED2 ICON resources/restricted.ico +/* @makedep: resources/internet.ico */ +IDI_SHELL_WEB_BROWSER ICON resources/internet.ico + /* @makedep: resources/idb_tb_large.bmp */ IDB_TB_LARGE_LIGHT BITMAP resources/idb_tb_large.bmp diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 53a9f33..4fdb27e 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -312,6 +312,8 @@ #define IDI_SHELL_UPLOAD 244 #define IDI_SHELL_PRINT 245 #define IDI_SHELL_PLAY 246 +#define IDI_SHELL_INTERNET_RADIO 247 +#define IDI_SHELL_UPLOAD_PHOTO 251 #define IDI_SHELL_EMPTY_RECYCLE_BIN2 254 #define IDI_SHELL_NEW_NETWORK_FOLDER 258 #define IDI_SHELL_WRITE_DISC 260 @@ -321,6 +323,8 @@ #define IDI_SHELL_BURN_DISC 266 #define IDI_SHELL_SHARED_FOLDER 267 #define IDI_SHELL_USERS_XP 269 +#define IDI_SHELL_INTERNET 273 +#define IDI_SHELL_WEB_CALENDAR 276 #define IDI_SHELL_USERS_XP2 279 #define IDI_SHELL_DVD_DRIVE 291 #define IDI_SHELL_HYBRID_CD 292 @@ -339,6 +343,8 @@ #define IDI_SHELL_FAVORITES_SMALL 322 #define IDI_SHELL_APP_FOLDER_SMALL 326 #define IDI_SHELL_RESTRICTED2 338 +/* 339 - 511 not used on Windows */ +#define IDI_SHELL_WEB_BROWSER 512 /* AVI resources, windows shell32 has 14 of them: 150-152 and 160-170

1 0

Alex Henrie : shell32: Add users icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 24f4871ac5cd22d536d077a088e26206f534cb16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24f4871ac5cd22d536d077a0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:17 2018 -0600 shell32: Add users icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 63767f4b90dd704354accaea71e8e557f360b407) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/users.ico | Bin 0 -> 57595 bytes dlls/shell32/resources/users.svg | 1172 ++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 15 +- 4 files changed, 1179 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=24f4871ac5cd22d536d0…

1 0

Alex Henrie : shell32: Add remaining help icons.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 477fc591cd5a52ca21ca67537aefb5397f0394ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=477fc591cd5a52ca21ca6753… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:20 2018 -0600 shell32: Add remaining help icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ce40aa4edfee97fc770c1226ce50f2eacd251236) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 9 +++++++++ dlls/shell32/shresdef.h | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 8cb7ec8..98502cb 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -849,6 +849,9 @@ IDI_SHELL_DELETE_FILE ICON resources/delete.ico /* @makedep: resources/delete.ico */ IDI_SHELL_ERASE_DISC ICON resources/delete.ico +/* @makedep: resources/help.ico */ +IDI_SHELL_HELP2 ICON resources/help.ico + /* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ IDI_SHELL_TO_FOLDER ICON resources/folder.ico @@ -878,6 +881,9 @@ IDI_SHELL_WEB_CALENDAR ICON resources/internet.ico /* @makedep: resources/users.ico */ IDI_SHELL_USERS_XP2 ICON resources/users.ico +/* @makedep: resources/help.ico */ +IDI_SHELL_HELP_FILE ICON resources/help.ico + /* FIXME: Following resource is not yet added */ /* @makedep: resources/optical_drive.ico */ IDI_SHELL_DVD_DRIVE ICON resources/optical_drive.ico @@ -940,6 +946,9 @@ IDI_SHELL_BURN_DISC2 ICON resources/optical_disc.ico /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_SMALL ICON resources/favorites.ico +/* @makedep: resources/help.ico */ +IDI_SHELL_HELP_SMALL ICON resources/help.ico + /* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ IDI_SHELL_APP_FOLDER_SMALL ICON resources/folder.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 59f9f09..0b29a7f 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -320,6 +320,7 @@ #define IDI_SHELL_WRITE_DISC 260 #define IDI_SHELL_DELETE_FILE 261 #define IDI_SHELL_ERASE_DISC 262 +#define IDI_SHELL_HELP2 263 #define IDI_SHELL_TO_FOLDER 264 #define IDI_SHELL_BURN_DISC 266 #define IDI_SHELL_SHARED_FOLDER 267 @@ -328,6 +329,8 @@ #define IDI_SHELL_INTERNET 273 #define IDI_SHELL_WEB_CALENDAR 276 #define IDI_SHELL_USERS_XP2 279 +/* 285 - 288 not used on Windows */ +#define IDI_SHELL_HELP_FILE 289 #define IDI_SHELL_DVD_DRIVE 291 #define IDI_SHELL_HYBRID_CD 292 #define IDI_SHELL_UNKNOWN_DISC 293 @@ -344,6 +347,7 @@ #define IDI_SHELL_NEW_FOLDER 319 #define IDI_SHELL_BURN_DISC2 320 #define IDI_SHELL_FAVORITES_SMALL 322 +#define IDI_SHELL_HELP_SMALL 324 #define IDI_SHELL_APP_FOLDER_SMALL 326 #define IDI_SHELL_RESTRICTED2 338 /* 339 - 511 not used on Windows */

1 0

Alistair Leslie-Hughes : powrprof: Added PowerEnumerate stub.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 59d262ccbaec1bdd4efe4e9670182d19fbc8593f URL: https://source.winehq.org/git/wine.git/?a=commit;h=59d262ccbaec1bdd4efe4e96… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 15 06:32:45 2018 +0000 powrprof: Added PowerEnumerate stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45603 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit acecb72006bee20682c31ad9e02c8cab50436042) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/powrprof/powrprof.c | 8 ++++++++ dlls/powrprof/powrprof.spec | 1 + include/powrprof.h | 31 +++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index 685b663..1597d96 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -321,6 +321,14 @@ POWER_PLATFORM_ROLE WINAPI PowerDeterminePlatformRole(void) return PlatformRoleDesktop; } +DWORD WINAPI PowerEnumerate(HKEY key, const GUID *scheme, const GUID *subgroup, POWER_DATA_ACCESSOR flags, + ULONG index, UCHAR *buffer, DWORD *buffer_size) +{ + FIXME("(%p,%s,%s,%d,%d,%p,%p) stub!\n", key, debugstr_guid(scheme), debugstr_guid(subgroup), + flags, index, buffer, buffer_size); + return ERROR_CALL_NOT_IMPLEMENTED; +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { switch(fdwReason) { diff --git a/dlls/powrprof/powrprof.spec b/dlls/powrprof/powrprof.spec index c90fafc..a9e337a 100644 --- a/dlls/powrprof/powrprof.spec +++ b/dlls/powrprof/powrprof.spec @@ -11,6 +11,7 @@ @ stdcall IsPwrShutdownAllowed () @ stdcall IsPwrSuspendAllowed () @ stdcall PowerDeterminePlatformRole () +@ stdcall PowerEnumerate(long ptr ptr long long ptr ptr) @ stdcall PowerGetActiveScheme (ptr ptr) @ stdcall PowerSetActiveScheme (ptr ptr) @ stdcall PowerReadDCValue (ptr ptr ptr ptr ptr ptr ptr) diff --git a/include/powrprof.h b/include/powrprof.h index 239044e..318188e 100644 --- a/include/powrprof.h +++ b/include/powrprof.h @@ -109,6 +109,36 @@ typedef struct _POWER_POLICY { } POWER_POLICY, *PPOWER_POLICY; +typedef enum _POWER_DATA_ACCESSOR { + ACCESS_AC_POWER_SETTING_INDEX, + ACCESS_DC_POWER_SETTING_INDEX, + ACCESS_FRIENDLY_NAME, + ACCESS_DESCRIPTION, + ACCESS_POSSIBLE_POWER_SETTING, + ACCESS_POSSIBLE_POWER_SETTING_FRIENDLY_NAME, + ACCESS_POSSIBLE_POWER_SETTING_DESCRIPTION, + ACCESS_DEFAULT_AC_POWER_SETTING, + ACCESS_DEFAULT_DC_POWER_SETTING, + ACCESS_POSSIBLE_VALUE_MIN, + ACCESS_POSSIBLE_VALUE_MAX, + ACCESS_POSSIBLE_VALUE_INCREMENT, + ACCESS_POSSIBLE_VALUE_UNITS, + ACCESS_ICON_RESOURCE, + ACCESS_DEFAULT_SECURITY_DESCRIPTOR, + ACCESS_ATTRIBUTES, + ACCESS_SCHEME, + ACCESS_SUBGROUP, + ACCESS_INDIVIDUAL_SETTING, + ACCESS_ACTIVE_SCHEME, + ACCESS_CREATE_SCHEME, + ACCESS_AC_POWER_SETTING_MAX, + ACCESS_DC_POWER_SETTING_MAX, + ACCESS_AC_POWER_SETTING_MIN, + ACCESS_DC_POWER_SETTING_MIN, + ACCESS_PROFILE, + ACCESS_OVERLAY_SCHEME, + ACCESS_ACTIVE_OVERLAY_SCHEME, +} POWER_DATA_ACCESSOR, *PPOWER_DATA_ACCESSOR; #ifdef __cplusplus extern "C" { @@ -128,6 +158,7 @@ BOOLEAN WINAPI IsAdminOverrideActive(PADMINISTRATOR_POWER_POLICY); BOOLEAN WINAPI IsPwrHibernateAllowed(VOID); BOOLEAN WINAPI IsPwrShutdownAllowed(VOID); BOOLEAN WINAPI IsPwrSuspendAllowed(VOID); +DWORD WINAPI PowerEnumerate(HKEY, const GUID *, const GUID *, POWER_DATA_ACCESSOR, ULONG, UCHAR *, DWORD *); BOOLEAN WINAPI ReadGlobalPwrPolicy(PGLOBAL_POWER_POLICY); BOOLEAN WINAPI ReadProcessorPwrScheme(UINT, PMACHINE_PROCESSOR_POWER_POLICY); BOOLEAN WINAPI ReadPwrScheme(UINT, PPOWER_POLICY);

1 0

Nikolay Sivov : comctl32/header: Fix item text color.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: e35208351299a51a97f3e5a7960f889730953206 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e35208351299a51a97f3e5a7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 12 22:39:46 2018 +0300 comctl32/header: Fix item text color. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2225ff4126f82cad0dc6aef00edcf39c48fb73ba) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/header.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index fcba262..bdcf6f1 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -388,7 +388,7 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU state = (phdi->bDown) ? HIS_PRESSED : (bHotTrack ? HIS_HOT : HIS_NORMAL); /* Set the colors before sending NM_CUSTOMDRAW so that it can change them */ - SetTextColor(hdc, (bHotTrack && !theme) ? COLOR_HIGHLIGHT : COLOR_BTNTEXT); + SetTextColor(hdc, (bHotTrack && !theme) ? comctl32_color.clrHighlight : comctl32_color.clrBtnText); SetBkColor(hdc, comctl32_color.clr3dFace); if (lCDFlags & CDRF_NOTIFYITEMDRAW && !(phdi->fmt & HDF_OWNERDRAW))

1 0

Fabian Maurer : cmd: Handle quotes when parsing the folders in the PATH environment variable.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 11bca0d760a9b61be4441f57cefcc3c300650716 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11bca0d760a9b61be4441f57… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Aug 2 19:48:59 2018 +0200 cmd: Handle quotes when parsing the folders in the PATH environment variable. Semicolons are also allowed inside a path, as long as they are quoted. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45552 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d175419f0b52550d2a8126e6221428fdb9992980) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd | 17 +++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 3 +++ programs/cmd/wcmdmain.c | 27 ++++++++++++++++++++++----- 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 236238c..03c6cc8 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -507,6 +507,23 @@ rem Only the final quote ends the string set "WINE_FOO=apple"banana"grape"orange echo '%WINE_FOO%' set WINE_FOO= +rem set PATH must work with quotes +set PATH_BACKUP=%PATH% +mkdir folder +mkdir "fol;der" +echo echo I'm here! > "fol;der\sub1.bat" +echo echo I'm here! > folder\sub1.bat +set PATH=nothing;"fol;der" +call sub1 +set PATH="folder +call sub1 +set PATH=folder" +call sub1 +del "fol;der\sub1.bat" +del folder\sub1.bat +rmdir "fol;der" +rmdir folder +PATH=%PATH_BACKUP% echo ------------ Testing variable expansion ------------ call :setError 0 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index eb60620..0431e41 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -475,6 +475,9 @@ foo 'jim fred' 'jim' 'apple"banana"grape' +I'm here!@space@ +I'm here!@space@ +I'm here!@space@ ------------ Testing variable expansion ------------ ~p0 should be path containing batch file @path@ diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 8fe2d57..5135be4 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1099,24 +1099,41 @@ void WCMD_run_program (WCHAR *command, BOOL called) wine_dbgstr_w(stemofsearch)); while (pathposn) { WCHAR thisDir[MAX_PATH] = {'\0'}; + int length = 0; WCHAR *pos = NULL; BOOL found = FALSE; + BOOL inside_quotes = FALSE; /* Work on the first directory on the search path */ - pos = strchrW(pathposn, ';'); - if (pos) { + pos = pathposn; + while ((inside_quotes || *pos != ';') && *pos != 0) + { + if (*pos == '"') + inside_quotes = !inside_quotes; + pos++; + } + + if (*pos) { /* Reached semicolon */ memcpy(thisDir, pathposn, (pos-pathposn) * sizeof(WCHAR)); thisDir[(pos-pathposn)] = 0x00; pathposn = pos+1; - - } else { + } else { /* Reached string end */ strcpyW(thisDir, pathposn); pathposn = NULL; } + /* Remove quotes */ + length = strlenW(thisDir); + if (thisDir[length - 1] == '"') + thisDir[length - 1] = 0; + + if (*thisDir != '"') + strcpyW(temp, thisDir); + else + strcpyW(temp, thisDir + 1); + /* Since you can have eg. ..\.. on the path, need to expand to full information */ - strcpyW(temp, thisDir); GetFullPathNameW(temp, MAX_PATH, thisDir, NULL); /* 1. If extension supplied, see if that file exists */

1 0

Dmitry Timoshkov : ntdll: Don' t allow blocking on a critical section during process termination.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 9a3c62249c746710d47aa02709e75f1bf33957a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a3c62249c746710d47aa027… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 7 16:03:16 2018 +0800 ntdll: Don't allow blocking on a critical section during process termination. As a result HeapLock() no longer blocks process termination since underlying implementation uses a critical section. However this should be considered as a minor side effect because applications shouldn't depend on this behaviour. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7def0f200f117a5a72ce454004ac4fd600ef8a4b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/loader.c | 4 +++- dlls/ntdll/critsection.c | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 5dc9308..7066bca 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1836,6 +1836,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) * doesn't call the DLL entry point on process detach either. */ HeapLock(GetProcessHeap()); +todo_wine ok(0, "dll_entry_point: process should already deadlock\n"); break; } @@ -2690,6 +2691,7 @@ static void test_ExitProcess(void) ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); ret = WaitForSingleObject(pi.hProcess, 5000); +todo_wine ok(ret == WAIT_TIMEOUT || broken(ret == WAIT_OBJECT_0) /* XP */, "child process should fail to terminate\n"); if (ret != WAIT_OBJECT_0) { @@ -2699,6 +2701,7 @@ static void test_ExitProcess(void) ret = WaitForSingleObject(pi.hProcess, 1000); ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); GetExitCodeProcess(pi.hProcess, &ret); +todo_wine ok(ret == 201 || broken(ret == 1) /* XP */, "expected exit code 201, got %u\n", ret); if (*child_failures) { @@ -2714,7 +2717,6 @@ static void test_ExitProcess(void) ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); ret = WaitForSingleObject(pi.hProcess, 5000); -todo_wine ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); if (ret != WAIT_OBJECT_0) { diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index e405b08..42e432c 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -436,6 +436,15 @@ NTSTATUS WINAPI RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) { LONGLONG timeout = NtCurrentTeb()->Peb->CriticalSectionTimeout.QuadPart / -10000000; + + /* Don't allow blocking on a critical section during process termination */ + if (RtlDllShutdownInProgress()) + { + WARN( "process %s is shutting down, returning STATUS_SUCCESS\n", + debugstr_w(NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer) ); + return STATUS_SUCCESS; + } + for (;;) { EXCEPTION_RECORD rec;

1 0

Alex Henrie : shell32: Add remaining control panel icons.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: c4d42a2dc8007945ba35f04864e560076de18769 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4d42a2dc8007945ba35f048… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:25 2018 -0600 shell32: Add remaining control panel icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1a924932da5655ab1270beaa0003f8b5bcc4dba1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 6 ++++++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 7b253d1..3e42d46 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -954,6 +954,9 @@ IDI_SHELL_NEW_FOLDER ICON resources/folder.ico /* @makedep: resources/optical_disc.ico */ IDI_SHELL_BURN_DISC2 ICON resources/optical_disc.ico +/* @makedep: resources/control.ico */ +IDI_SHELL_CONTROL_PANEL_XP2 ICON resources/control.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_SMALL ICON resources/favorites.ico @@ -967,6 +970,9 @@ IDI_SHELL_HELP_SMALL ICON resources/help.ico /* @makedep: resources/folder.ico */ IDI_SHELL_APP_FOLDER_SMALL ICON resources/folder.ico +/* @makedep: resources/control.ico */ +IDI_SHELL_CONTROL_PANEL_SMALL ICON resources/control.ico + /* FIXME: Following resource is not yet added */ /* @makedep: resources/search.ico */ IDI_SHELL_SEARCH_DIRECTORY ICON resources/search.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index d9cb3d9..a48dfd4 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -350,10 +350,12 @@ #define IDI_SHELL_DVD_RW 318 #define IDI_SHELL_NEW_FOLDER 319 #define IDI_SHELL_BURN_DISC2 320 +#define IDI_SHELL_CONTROL_PANEL_XP2 321 #define IDI_SHELL_FAVORITES_SMALL 322 #define IDI_SHELL_SEARCH_SMALL 323 #define IDI_SHELL_HELP_SMALL 324 #define IDI_SHELL_APP_FOLDER_SMALL 326 +#define IDI_SHELL_CONTROL_PANEL_SMALL 330 /* 332 - 336 not used on Windows */ #define IDI_SHELL_SEARCH_DIRECTORY 337 #define IDI_SHELL_RESTRICTED2 338

1 0