November 2018 - Wine-Commits

Zebediah Figura : msvfw32: Fix driver enumeration.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: a1afb864ffb3092ee7af598159dc25a0a4819eeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1afb864ffb3092ee7af5981… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 13 13:00:04 2018 -0600 msvfw32: Fix driver enumeration. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3396ca87ae34e446be55fda76d7f21fb3e85cf39) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 53 +++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index d49ea74..e071d95 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -223,48 +223,48 @@ static int compare_fourcc(DWORD fcc1, DWORD fcc2) return strncasecmp(fcc_str1, fcc_str2, 4); } -typedef BOOL (*enum_handler_t)(const char*, unsigned int, void*); +typedef BOOL (*enum_handler_t)(const char *name, const char *driver, unsigned int index, void *param); static BOOL enum_drivers(DWORD fccType, enum_handler_t handler, void* param) { - CHAR buf[2048], fccTypeStr[5], *s; + char fccTypeStr[4]; + char name_buf[10]; + char buf[2048]; + DWORD i, cnt = 0, lRet; BOOL result = FALSE; HKEY hKey; fourcc_to_string(fccTypeStr, fccType); - fccTypeStr[4] = '.'; /* first, go through the registry entries */ lRet = RegOpenKeyExA(HKEY_LOCAL_MACHINE, HKLM_DRIVERS32, 0, KEY_QUERY_VALUE, &hKey); if (lRet == ERROR_SUCCESS) { - DWORD name, data, type; i = 0; for (;;) - { - name = 10; - data = sizeof buf - name; - lRet = RegEnumValueA(hKey, i++, buf, &name, 0, &type, (LPBYTE)(buf+name), &data); - if (lRet == ERROR_NO_MORE_ITEMS) break; - if (lRet != ERROR_SUCCESS) continue; - if (fccType && (name != 9 || strncasecmp(buf, fccTypeStr, 5))) continue; - buf[name] = '='; - if ((result = handler(buf, cnt++, param))) break; - } - RegCloseKey( hKey ); + { + DWORD name_len = 10, driver_len = 128; + lRet = RegEnumValueA(hKey, i++, name_buf, &name_len, 0, 0, (BYTE *)buf, &driver_len); + if (lRet == ERROR_NO_MORE_ITEMS) break; + if (name_len != 9 || name_buf[4] != '.') continue; + if (fccType && strncasecmp(name_buf, fccTypeStr, 4)) continue; + if ((result = handler(name_buf, buf, cnt++, param))) break; + } + RegCloseKey( hKey ); } if (result) return result; /* if that didn't work, go through the values in system.ini */ if (GetPrivateProfileSectionA("drivers32", buf, sizeof(buf), "system.ini")) { - for (s = buf; *s; s += strlen(s) + 1) - { - TRACE("got %s\n", s); - if (fccType && (strncasecmp(s, fccTypeStr, 5) || s[9] != '=')) continue; - if ((result = handler(s, cnt++, param))) break; - } + char *s; + for (s = buf; *s; s += strlen(s) + 1) + { + if (s[4] != '.' || s[9] != '=') continue; + if (fccType && strncasecmp(s, fccTypeStr, 4)) continue; + if ((result = handler(s, s + 10, cnt++, param))) break; + } } return result; @@ -294,10 +294,11 @@ DWORD WINAPI VideoForWindowsVersion(void) return 0x040003B6; /* 4.950 */ } -static BOOL ICInfo_enum_handler(const char *drv, unsigned int nr, void *param) +static BOOL ICInfo_enum_handler(const char *name, const char *driver, unsigned int nr, void *param) { ICINFO *lpicinfo = param; - DWORD fccHandler = mmioStringToFOURCCA(drv + 5, 0); + DWORD fccType = mmioStringToFOURCCA(name, 0); + DWORD fccHandler = mmioStringToFOURCCA(name + 5, 0); if (lpicinfo->fccHandler != nr && compare_fourcc(lpicinfo->fccHandler, fccHandler)) return FALSE; @@ -308,7 +309,7 @@ static BOOL ICInfo_enum_handler(const char *drv, unsigned int nr, void *param) lpicinfo->dwVersionICM = ICVERSION; lpicinfo->szName[0] = 0; lpicinfo->szDescription[0] = 0; - MultiByteToWideChar(CP_ACP, 0, drv + 10, -1, lpicinfo->szDriver, + MultiByteToWideChar(CP_ACP, 0, driver, -1, lpicinfo->szDriver, sizeof(lpicinfo->szDriver)/sizeof(WCHAR)); return TRUE; @@ -647,10 +648,10 @@ static HIC try_driver(driver_info_t *info) return 0; } -static BOOL ICLocate_enum_handler(const char *drv, unsigned int nr, void *param) +static BOOL ICLocate_enum_handler(const char *name, const char *driver, unsigned int nr, void *param) { driver_info_t *info = param; - info->fccHandler = mmioStringToFOURCCA(drv + 5, 0); + info->fccHandler = mmioStringToFOURCCA(name + 5, 0); info->hic = try_driver(info); return info->hic != 0; }

1 0

Dmitry Timoshkov : kernel32/tests: Add a test for holding a critical section during process termination.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: b4307ecab34b3e130046b147073a7701a6b542d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4307ecab34b3e130046b147… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 7 16:03:13 2018 +0800 kernel32/tests: Add a test for holding a critical section during process termination. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0f99327e78b07fa0a2a40454870a75f12c48eeb9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/loader.c | 67 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 63 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index fe2957c..5dc9308 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1673,13 +1673,15 @@ static void test_import_resolution(void) #define MAX_COUNT 10 static HANDLE attached_thread[MAX_COUNT]; static DWORD attached_thread_count; -HANDLE stop_event, event, mutex, semaphore, loader_lock_event, peb_lock_event, heap_lock_event, ack_event; -static int test_dll_phase, inside_loader_lock, inside_peb_lock, inside_heap_lock; +static HANDLE event, mutex, semaphore; +static HANDLE stop_event, loader_lock_event, peb_lock_event, heap_lock_event, cs_lock_event, ack_event; +static CRITICAL_SECTION cs_lock; +static int test_dll_phase, inside_loader_lock, inside_peb_lock, inside_heap_lock, inside_cs_lock; static LONG fls_callback_count; static DWORD WINAPI mutex_thread_proc(void *param) { - HANDLE wait_list[4]; + HANDLE wait_list[5]; DWORD ret; ret = WaitForSingleObject(mutex, 0); @@ -1691,6 +1693,7 @@ static DWORD WINAPI mutex_thread_proc(void *param) wait_list[1] = loader_lock_event; wait_list[2] = peb_lock_event; wait_list[3] = heap_lock_event; + wait_list[4] = cs_lock_event; trace("%04x: mutex_thread_proc: starting\n", GetCurrentThreadId()); while (1) @@ -1720,6 +1723,13 @@ static DWORD WINAPI mutex_thread_proc(void *param) inside_heap_lock++; SetEvent(ack_event); } + else if (ret == WAIT_OBJECT_0 + 4) + { + trace("%04x: mutex_thread_proc: Entering CS lock\n", GetCurrentThreadId()); + EnterCriticalSection(&cs_lock); + inside_cs_lock++; + SetEvent(ack_event); + } } trace("%04x: mutex_thread_proc: exiting\n", GetCurrentThreadId()); @@ -1829,14 +1839,19 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) ok(0, "dll_entry_point: process should already deadlock\n"); break; } + else if (test_dll_phase == 7) + { + EnterCriticalSection(&cs_lock); + } - if (test_dll_phase == 0 || test_dll_phase == 1 || test_dll_phase == 3) + if (test_dll_phase == 0 || test_dll_phase == 1 || test_dll_phase == 3 || test_dll_phase == 7) ok(param != NULL, "dll: param %p\n", param); else ok(!param, "dll: param %p\n", param); if (test_dll_phase == 0 || test_dll_phase == 1) expected_code = 195; else if (test_dll_phase == 3) expected_code = 196; + else if (test_dll_phase == 7) expected_code = 199; else expected_code = STILL_ACTIVE; if (test_dll_phase == 3) @@ -2154,6 +2169,11 @@ static void child_process(const char *dll_name, DWORD target_offset) heap_lock_event = CreateEventW(NULL, FALSE, FALSE, NULL); ok(heap_lock_event != 0, "CreateEvent error %d\n", GetLastError()); + InitializeCriticalSection(&cs_lock); + SetLastError(0xdeadbeef); + cs_lock_event = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(cs_lock_event != 0, "CreateEvent error %d\n", GetLastError()); + SetLastError(0xdeadbeef); ack_event = CreateEventW(NULL, FALSE, FALSE, NULL); ok(ack_event != 0, "CreateEvent error %d\n", GetLastError()); @@ -2370,6 +2390,20 @@ static void child_process(const char *dll_name, DWORD target_offset) ok(0, "ExitProcess should not return\n"); break; + case 7: + trace("setting cs_lock_event\n"); + SetEvent(cs_lock_event); + WaitForSingleObject(ack_event, 1000); + ok(inside_cs_lock != 0, "inside_cs_lock is not set\n"); + + *child_failures = winetest_get_failures(); + + /* calling ExitProcess should not cause a deadlock */ + trace("call ExitProcess(199)\n"); + ExitProcess(199); + ok(0, "ExitProcess should not return\n"); + break; + default: assert(0); break; @@ -2674,6 +2708,31 @@ static void test_ExitProcess(void) CloseHandle(pi.hThread); CloseHandle(pi.hProcess); + /* phase 7 */ + *child_failures = -1; + sprintf(cmdline, "\"%s\" loader %s %u 7", argv[0], dll_name, target_offset); + 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) + { + trace("terminating child process\n"); + TerminateProcess(pi.hProcess, 199); + } + ret = WaitForSingleObject(pi.hProcess, 1000); + ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); + GetExitCodeProcess(pi.hProcess, &ret); + ok(ret == 199, "expected exit code 199, got %u\n", ret); + if (*child_failures) + { + trace("%d failures in child process\n", *child_failures); + winetest_add_failures(*child_failures); + } + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + /* test remote process termination */ SetLastError(0xdeadbeef); ret = CreateProcessA(argv[0], NULL, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi);

1 0

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

Nov. 29, 2018

Module: wine Branch: stable Commit: 6646c7d25de12dfa59828538ab9116d8fcd6ad6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6646c7d25de12dfa59828538… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:21 2018 -0600 shell32: Add XP install icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 46dcc1a3dfaf3170030874cd09188851605d5407) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 3 +++ dlls/shell32/shresdef.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 98502cb..ccd8242 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -867,6 +867,9 @@ IDI_SHELL_SHARED_FOLDER ICON resources/folder.ico /* @makedep: resources/users.ico */ IDI_SHELL_USERS_XP ICON resources/users.ico +/* @makedep: resources/update.ico */ +IDI_SHELL_INSTALL_XP ICON resources/update.ico + /* FIXME: Following resource is not yet added */ /* @makedep: resources/printer.ico */ IDI_SHELL_MULTIFUNCTION_PRINTER ICON resources/printer.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 0b29a7f..1c965ca 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -325,6 +325,7 @@ #define IDI_SHELL_BURN_DISC 266 #define IDI_SHELL_SHARED_FOLDER 267 #define IDI_SHELL_USERS_XP 269 +#define IDI_SHELL_INSTALL_XP 271 #define IDI_SHELL_MULTIFUNCTION_PRINTER 272 #define IDI_SHELL_INTERNET 273 #define IDI_SHELL_WEB_CALENDAR 276

1 0

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

Nov. 29, 2018

Module: wine Branch: stable Commit: 68a92513156579d4059e07cecd025396156fbfbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=68a92513156579d4059e07ce… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:22 2018 -0600 shell32: Add remaining search icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d0d1c6c2fdb92c7eb80be4cc5870949e34813459) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 11 +++++++++++ dlls/shell32/shresdef.h | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index ccd8242..0c7c0b5 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -884,6 +884,10 @@ IDI_SHELL_WEB_CALENDAR ICON resources/internet.ico /* @makedep: resources/users.ico */ IDI_SHELL_USERS_XP2 ICON resources/users.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/search.ico */ +IDI_SHELL_SEARCH_WINDOW ICON resources/search.ico + /* @makedep: resources/help.ico */ IDI_SHELL_HELP_FILE ICON resources/help.ico @@ -949,6 +953,9 @@ IDI_SHELL_BURN_DISC2 ICON resources/optical_disc.ico /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_SMALL ICON resources/favorites.ico +/* @makedep: resources/search.ico */ +IDI_SHELL_SEARCH_SMALL ICON resources/search.ico + /* @makedep: resources/help.ico */ IDI_SHELL_HELP_SMALL ICON resources/help.ico @@ -956,6 +963,10 @@ IDI_SHELL_HELP_SMALL ICON resources/help.ico /* @makedep: resources/folder.ico */ IDI_SHELL_APP_FOLDER_SMALL ICON resources/folder.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/search.ico */ +IDI_SHELL_SEARCH_DIRECTORY ICON resources/search.ico + /* @makedep: resources/restricted.ico */ IDI_SHELL_RESTRICTED2 ICON resources/restricted.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 1c965ca..4d6cf7c 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -330,6 +330,8 @@ #define IDI_SHELL_INTERNET 273 #define IDI_SHELL_WEB_CALENDAR 276 #define IDI_SHELL_USERS_XP2 279 +/* 280 not used on Windows */ +#define IDI_SHELL_SEARCH_WINDOW 281 /* 285 - 288 not used on Windows */ #define IDI_SHELL_HELP_FILE 289 #define IDI_SHELL_DVD_DRIVE 291 @@ -348,8 +350,11 @@ #define IDI_SHELL_NEW_FOLDER 319 #define IDI_SHELL_BURN_DISC2 320 #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 +/* 332 - 336 not used on Windows */ +#define IDI_SHELL_SEARCH_DIRECTORY 337 #define IDI_SHELL_RESTRICTED2 338 /* 339 - 511 not used on Windows */ #define IDI_SHELL_WEB_BROWSER 512

1 0

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

Nov. 29, 2018

Module: wine Branch: stable Commit: 8addc609f25c1065dc6a8cf4b852ee7fcda564c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8addc609f25c1065dc6a8cf4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:16 2018 -0600 shell32: Add multimedia file icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 618441bb92f666363b07817621b35ab9f5f03339) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index b3ab03e..bd70fbe 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -748,6 +748,10 @@ IDI_SHELL_AUDIO_FILE ICON resources/audio.ico IDI_SHELL_IMAGE_FILE ICON resources/image.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/video.ico */ +IDI_SHELL_MULTIMEDIA_FILE ICON resources/video.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/optical_disc.ico */ IDI_SHELL_MUSIC_CD_95 ICON resources/optical_disc.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 1ac98a9..53a9f33 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -292,6 +292,7 @@ #define IDI_SHELL_VIDEO_FILE 224 #define IDI_SHELL_AUDIO_FILE 225 #define IDI_SHELL_IMAGE_FILE 226 +#define IDI_SHELL_MULTIMEDIA_FILE 227 #define IDI_SHELL_MUSIC_CD_95 228 #define IDI_SHELL_CARD_READER 229 #define IDI_SHELL_ZIP_DRIVE 230

1 0

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

Nov. 29, 2018

Module: wine Branch: stable Commit: b8d362d45f1953503adbfc6800ee313fc7880b2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8d362d45f1953503adbfc68… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:46 2018 -0600 shell32: Add zip drive icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a2e2b5ba1da2277053aef9cf9f9e996223012805) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 8 ++++++++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index d9c6615..8dc0cb9 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -752,6 +752,10 @@ IDI_SHELL_MUSIC_CD_95 ICON resources/optical_disc.ico /* @makedep: resources/disk_drive.ico */ IDI_SHELL_CARD_READER ICON resources/disk_drive.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/disk_drive.ico */ +IDI_SHELL_ZIP_DRIVE ICON resources/disk_drive.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico @@ -852,6 +856,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/disk_drive.ico */ +IDI_SHELL_ZIP_DRIVE2 ICON resources/disk_drive.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/optical_disc.ico */ IDI_SHELL_DVD_RW ICON resources/optical_disc.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 8960de6..679c277 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -293,6 +293,7 @@ #define IDI_SHELL_AUDIO_FILE 225 #define IDI_SHELL_MUSIC_CD_95 228 #define IDI_SHELL_CARD_READER 229 +#define IDI_SHELL_ZIP_DRIVE 230 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_MY_PICTURES 236 #define IDI_SHELL_MY_MUSIC 237 @@ -319,6 +320,7 @@ #define IDI_SHELL_DVD_R 298 #define IDI_SHELL_OPTICAL_DISC 302 #define IDI_SHELL_DVD_ROM 304 +#define IDI_SHELL_ZIP_DRIVE2 313 #define IDI_SHELL_DVD_RW 318 #define IDI_SHELL_NEW_FOLDER 319 #define IDI_SHELL_BURN_DISC2 320

1 0

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

Nov. 29, 2018

Module: wine Branch: stable Commit: 1ec686de28722c6ea5b2d285147361f8ab1774b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ec686de28722c6ea5b2d285… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:52 2018 -0600 shell32: Add upload icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d721c454e66d28429acbcfb231d70f035347b3c9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 50836e9..36d2762 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -802,6 +802,10 @@ IDI_SHELL_RENAME ICON resources/rename.ico /* @makedep: resources/copy.ico */ IDI_SHELL_COPY ICON resources/copy.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/internet.ico */ +IDI_SHELL_UPLOAD ICON resources/internet.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_EMPTY_RECYCLE_BIN2 ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index ec9a1b3..7430751 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -307,6 +307,7 @@ #define IDI_SHELL_MOVE 241 #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243 +#define IDI_SHELL_UPLOAD 244 #define IDI_SHELL_EMPTY_RECYCLE_BIN2 254 #define IDI_SHELL_NEW_NETWORK_FOLDER 258 #define IDI_SHELL_WRITE_DISC 260

1 0

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

Nov. 29, 2018

Module: wine Branch: stable Commit: e9fd796122ed679e8d15780c2de923041acdb6b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9fd796122ed679e8d15780c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:37 2018 -0600 shell32: Add remaining optical disc icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 12a6a58cca74ef35dd1ff06e75de74dc78ff74fd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 68 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shresdef.h | 17 +++++++++++++ 2 files changed, 85 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 0f71d69..0f126e7 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -730,6 +730,14 @@ IDI_SHELL_USERS ICON resources/security.ico /* @makedep: resources/shut_down.ico */ IDI_SHELL_POWER_OFF ICON resources/shut_down.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_DVD ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_MUSIC_CD_95 ICON resources/optical_disc.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico @@ -759,10 +767,26 @@ IDI_SHELL_EMPTY_RECYCLE_BIN2 ICON resources/trash_file.ico IDI_SHELL_NEW_NETWORK_FOLDER ICON resources/folder.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_WRITE_DISC ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/delete.ico */ +IDI_SHELL_DELETE_FILE ICON resources/delete.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/delete.ico */ +IDI_SHELL_ERASE_DISC ICON resources/delete.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ IDI_SHELL_TO_FOLDER ICON resources/folder.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_BURN_DISC ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ IDI_SHELL_SHARED_FOLDER ICON resources/folder.ico @@ -774,13 +798,57 @@ IDI_SHELL_USERS_XP ICON resources/security.ico /* @makedep: resources/security.ico */ IDI_SHELL_USERS_XP2 ICON resources/security.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_drive.ico */ +IDI_SHELL_DVD_DRIVE ICON resources/optical_drive.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_HYBRID_CD ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_UNKNOWN_DISC ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_CD_ROM ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_CD_R ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_CD_RW ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_DVD_RAM ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_DVD_R ICON resources/optical_disc.ico + /* @makedep: resources/optical_disc.ico */ IDI_SHELL_OPTICAL_DISC ICON resources/optical_disc.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_DVD_ROM ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_DVD_RW ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ IDI_SHELL_NEW_FOLDER ICON resources/folder.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_BURN_DISC2 ICON resources/optical_disc.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_SMALL ICON resources/favorites.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index d8d2f13..4d0690d 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -287,6 +287,8 @@ /* 211 - 219 not used on Windows */ #define IDI_SHELL_USERS 220 #define IDI_SHELL_POWER_OFF 221 +#define IDI_SHELL_DVD 222 +#define IDI_SHELL_MUSIC_CD_95 228 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_MY_PICTURES 236 #define IDI_SHELL_MY_MUSIC 237 @@ -295,12 +297,27 @@ #define IDI_SHELL_COPY 243 #define IDI_SHELL_EMPTY_RECYCLE_BIN2 254 #define IDI_SHELL_NEW_NETWORK_FOLDER 258 +#define IDI_SHELL_WRITE_DISC 260 +#define IDI_SHELL_DELETE_FILE 261 +#define IDI_SHELL_ERASE_DISC 262 #define IDI_SHELL_TO_FOLDER 264 +#define IDI_SHELL_BURN_DISC 266 #define IDI_SHELL_SHARED_FOLDER 267 #define IDI_SHELL_USERS_XP 269 #define IDI_SHELL_USERS_XP2 279 +#define IDI_SHELL_DVD_DRIVE 291 +#define IDI_SHELL_HYBRID_CD 292 +#define IDI_SHELL_UNKNOWN_DISC 293 +#define IDI_SHELL_CD_ROM 294 +#define IDI_SHELL_CD_R 295 +#define IDI_SHELL_CD_RW 296 +#define IDI_SHELL_DVD_RAM 297 +#define IDI_SHELL_DVD_R 298 #define IDI_SHELL_OPTICAL_DISC 302 +#define IDI_SHELL_DVD_ROM 304 +#define IDI_SHELL_DVD_RW 318 #define IDI_SHELL_NEW_FOLDER 319 +#define IDI_SHELL_BURN_DISC2 320 #define IDI_SHELL_FAVORITES_SMALL 322 #define IDI_SHELL_APP_FOLDER_SMALL 326 #define IDI_SHELL_RESTRICTED2 338

1 0

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

Nov. 29, 2018

Module: wine Branch: stable Commit: 9d39d656ce4d830c9ce6d34a031e17b4d0df8c2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d39d656ce4d830c9ce6d34a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:38 2018 -0600 shell32: Add documents icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5d66862e5aa37ea8c6982a5783acd85ff1f2ec28) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 0f126e7..b3c914e 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -735,6 +735,10 @@ IDI_SHELL_POWER_OFF ICON resources/shut_down.ico IDI_SHELL_DVD ICON resources/optical_disc.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/document.ico */ +IDI_SHELL_DOCUMENTS ICON resources/document.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/optical_disc.ico */ IDI_SHELL_MUSIC_CD_95 ICON resources/optical_disc.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 4d0690d..4e49a7c 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -288,6 +288,7 @@ #define IDI_SHELL_USERS 220 #define IDI_SHELL_POWER_OFF 221 #define IDI_SHELL_DVD 222 +#define IDI_SHELL_DOCUMENTS 223 #define IDI_SHELL_MUSIC_CD_95 228 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_MY_PICTURES 236

1 0

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

Nov. 29, 2018

Module: wine Branch: stable Commit: 13f023a4a6b1a74628c317ba23f62e7e63d91d6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=13f023a4a6b1a74628c317ba… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:47 2018 -0600 shell32: Add download icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 042b9cc23f64e023b8d0f415f73e179dc39015e2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 8 ++++++++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 8dc0cb9..7925cc6 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -756,6 +756,14 @@ IDI_SHELL_CARD_READER ICON resources/disk_drive.ico /* @makedep: resources/disk_drive.ico */ IDI_SHELL_ZIP_DRIVE ICON resources/disk_drive.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/blank.ico */ +IDI_SHELL_DOWNLOAD ICON resources/blank.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/blank.ico */ +IDI_SHELL_DOWNLOAD_EMBLEM ICON resources/blank.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 679c277..298185a 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -294,6 +294,8 @@ #define IDI_SHELL_MUSIC_CD_95 228 #define IDI_SHELL_CARD_READER 229 #define IDI_SHELL_ZIP_DRIVE 230 +#define IDI_SHELL_DOWNLOAD 231 +#define IDI_SHELL_DOWNLOAD_EMBLEM 232 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_MY_PICTURES 236 #define IDI_SHELL_MY_MUSIC 237

1 0