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

Michael Stefaniuc : msi: Unlock msi_custom_action_c on the error paths.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: c2add8a030b63d79f94d516d2dbee9fb09b9c09c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2add8a030b63d79f94d516d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Aug 16 22:31:22 2018 +0200 msi: Unlock msi_custom_action_c on the error paths. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45483 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 950681e..cd37a56 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -678,11 +678,13 @@ static DWORD WINAPI custom_client_thread(void *arg) size != sizeof(info->guid)) { ERR("Failed to write to custom action client pipe: %u\n", GetLastError()); + LeaveCriticalSection(&msi_custom_action_cs); return GetLastError(); } if (!ReadFile(pipe, &thread64, sizeof(thread64), &size, NULL) || size != sizeof(thread64)) { ERR("Failed to read from custom action client pipe: %u\n", GetLastError()); + LeaveCriticalSection(&msi_custom_action_cs); return GetLastError(); }

1 0

Alex Henrie : shell32: Add document icon.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: b14d8f9f11856c1b1f192bf773eb864cba5ad78b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b14d8f9f11856c1b1f192bf7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 14 22:09:57 2018 -0600 shell32: Add document icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(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 992c70f..b6cae77 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -422,6 +422,9 @@ END /* @makedep: document.ico */ IDI_SHELL_FILE ICON document.ico +/* @makedep: document.ico */ +IDI_SHELL_DOCUMENT ICON document.ico + /* @makedep: folder.ico */ IDI_SHELL_FOLDER ICON folder.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index cf43d4a..9c46d5f 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -170,6 +170,7 @@ #define IDD_TREEVIEW 0x3741 #define IDI_SHELL_FILE 1 +#define IDI_SHELL_DOCUMENT 2 #define IDI_SHELL_FOLDER 4 #define IDI_SHELL_FOLDER_OPEN 5 #define IDI_SHELL_5_12_FLOPPY 6

1 0

Alex Henrie : shell32: Rename IDI_SHELL_DOCUMENT to IDI_SHELL_FILE.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: 4b5d0f2f43ad1d34b1e3fb4424615c918487e68c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b5d0f2f43ad1d34b1e3fb44… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 14 22:09:56 2018 -0600 shell32: Rename IDI_SHELL_DOCUMENT to IDI_SHELL_FILE. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/iconcache.c | 12 ++++++------ dlls/shell32/shell32.rc | 3 ++- dlls/shell32/shresdef.h | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index d55bde9..6107e0c 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -467,8 +467,8 @@ static BOOL WINAPI SIC_Initialize( INIT_ONCE *once, void *param, void **context shell_imagelists[i] = ImageList_Create(sizes[i].cx, sizes[i].cy, ILC_COLOR32 | ILC_MASK, 0, 0x20); ImageList_SetBkColor(shell_imagelists[i], CLR_NONE); - /* Load the document icon, which is used as the default if an icon isn't found. */ - if (!(hicons[i] = LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_DOCUMENT), + /* Load the generic file icon, which is used as the default if an icon isn't found. */ + if (!(hicons[i] = LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_FILE), IMAGE_ICON, sizes[i].cx, sizes[i].cy, LR_SHARED))) { failed = TRUE; @@ -477,12 +477,12 @@ static BOOL WINAPI SIC_Initialize( INIT_ONCE *once, void *param, void **context if (failed) { - FIXME("Failed to load IDI_SHELL_DOCUMENT icon!\n"); + FIXME("Failed to load IDI_SHELL_FILE icon!\n"); return FALSE; } - SIC_IconAppend(swShell32Name, IDI_SHELL_DOCUMENT - 1, hicons, 0); - SIC_IconAppend(swShell32Name, -IDI_SHELL_DOCUMENT, hicons, 0); + SIC_IconAppend(swShell32Name, IDI_SHELL_FILE - 1, hicons, 0); + SIC_IconAppend(swShell32Name, -IDI_SHELL_FILE, hicons, 0); TRACE("small list=%p, large list=%p\n", shell_imagelists[SHIL_SMALL], shell_imagelists[SHIL_LARGE]); @@ -1014,7 +1014,7 @@ HRESULT WINAPI SHGetStockIconInfo(SHSTOCKICONID id, UINT flags, SHSTOCKICONINFO GetSystemDirectoryW(sii->szPath, MAX_PATH); /* no icons defined: use default */ - sii->iIcon = -IDI_SHELL_DOCUMENT; + sii->iIcon = -IDI_SHELL_FILE; lstrcatW(sii->szPath, shell32dll); if (flags) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 084b052..992c70f 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -418,8 +418,9 @@ BEGIN VK_F5, FCIDM_SHVIEW_REFRESH, VIRTKEY END +/* FIXME: Following resource is not yet added */ /* @makedep: document.ico */ -IDI_SHELL_DOCUMENT ICON document.ico +IDI_SHELL_FILE ICON document.ico /* @makedep: folder.ico */ IDI_SHELL_FOLDER ICON folder.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 1518de5..cf43d4a 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -169,7 +169,7 @@ #define IDD_TITLE 0x3742 #define IDD_TREEVIEW 0x3741 -#define IDI_SHELL_DOCUMENT 1 +#define IDI_SHELL_FILE 1 #define IDI_SHELL_FOLDER 4 #define IDI_SHELL_FOLDER_OPEN 5 #define IDI_SHELL_5_12_FLOPPY 6

1 0

Michael Stefaniuc : sane.ds: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: wine Branch: master Commit: 4e18649c4873f467acca37ff372d83ddd0abfa73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e18649c4873f467acca37ff… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Aug 16 20:19:26 2018 +0200 sane.ds: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sane.ds/capability.c | 14 +++++++------- dlls/sane.ds/ui.c | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 094bb93..9157cae 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -174,7 +174,7 @@ static TW_UINT16 TWAIN_GetSupportedCaps(pTW_CAPABILITY pCapability) TW_UINT32 i; a = GlobalLock (pCapability->hContainer); a->ItemType = TWTY_UINT16; - a->NumItems = sizeof(supported_caps) / sizeof(supported_caps[0]); + a->NumItems = ARRAY_SIZE(supported_caps); u = (UINT16 *) a->ItemList; for (i = 0; i < a->NumItems; i++) u[i] = supported_caps[i]; @@ -203,7 +203,7 @@ static TW_UINT16 SANE_ICAPXferMech (pTW_CAPABILITY pCapability, TW_UINT16 action break; case MSG_GET: - twCC = msg_get_enum(pCapability, possible_values, sizeof(possible_values) / sizeof(possible_values[0]), + twCC = msg_get_enum(pCapability, possible_values, ARRAY_SIZE(possible_values), TWTY_UINT16, activeDS.capXferMech, TWSX_NATIVE); break; @@ -482,7 +482,7 @@ static TW_UINT16 SANE_ICAPBitDepth(pTW_CAPABILITY pCapability, TW_UINT16 action) break; case MSG_GET: - twCC = msg_get_enum(pCapability, possible_values, sizeof(possible_values) / sizeof(possible_values[0]), + twCC = msg_get_enum(pCapability, possible_values, ARRAY_SIZE(possible_values), TWTY_UINT16, activeDS.sane_param.depth, activeDS.sane_param.depth); break; @@ -536,7 +536,7 @@ static TW_UINT16 SANE_ICAPCompression (pTW_CAPABILITY pCapability, TW_UINT16 act break; case MSG_GET: - twCC = msg_get_enum(pCapability, possible_values, sizeof(possible_values) / sizeof(possible_values[0]), + twCC = msg_get_enum(pCapability, possible_values, ARRAY_SIZE(possible_values), TWTY_UINT16, TWCP_NONE, TWCP_NONE); FIXME("Partial stub: We don't attempt to support compression\n"); break; @@ -731,7 +731,7 @@ static TW_UINT16 SANE_ICAPPixelFlavor (pTW_CAPABILITY pCapability, TW_UINT16 act break; case MSG_GET: - twCC = msg_get_enum(pCapability, possible_values, sizeof(possible_values) / sizeof(possible_values[0]), + twCC = msg_get_enum(pCapability, possible_values, ARRAY_SIZE(possible_values), TWTY_UINT16, flavor, flavor); break; @@ -935,9 +935,9 @@ static TW_UINT16 SANE_ICAPSupportedSizes (pTW_CAPABILITY pCapability, TW_UINT16 break; case MSG_GET: - for (i = 0; i < sizeof(supported_sizes) / sizeof(supported_sizes[0]); i++) + for (i = 0; i < ARRAY_SIZE(supported_sizes); i++) possible_values[i] = supported_sizes[i].size; - twCC = msg_get_enum(pCapability, possible_values, sizeof(possible_values) / sizeof(possible_values[0]), + twCC = msg_get_enum(pCapability, possible_values, ARRAY_SIZE(possible_values), TWTY_UINT16, current_size, default_size); WARN("Partial Stub: our supported size selection is a bit thin.\n"); break; diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index fe1988a..8a2890c 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -639,7 +639,7 @@ static void UpdateRelevantEdit(HWND hwnd, const SANE_Option_Descriptor *opt, else return; buffer[len++] = ' '; - LoadStringW( SANE_instance, opt->unit, buffer + len, sizeof(buffer)/sizeof(WCHAR) - len ); + LoadStringW( SANE_instance, opt->unit, buffer + len, ARRAY_SIZE( buffer ) - len ); edit_w = GetDlgItem(hwnd,index+ID_BASE+ID_EDIT_BASE); if (edit_w) SetWindowTextW(edit_w,buffer);

1 0

Zebediah Figura : msi/tests: Add a test for asynchronous custom actions.
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: wine Branch: master Commit: 6387476d99f4f762628cb0d72b2d43c23f76f563 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6387476d99f4f762628cb0d7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 16 10:34:41 2018 -0500 msi/tests: Add a test for asynchronous custom actions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/custom.c | 21 +++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ dlls/msi/tests/install.c | 10 +++++++++- 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 3989ca8..6332d68 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1169,6 +1169,27 @@ UINT WINAPI process2(MSIHANDLE hinst) return ERROR_SUCCESS; } +UINT WINAPI async1(MSIHANDLE hinst) +{ + HANDLE event = CreateEventA(NULL, TRUE, FALSE, "wine_msi_async_test"); + HANDLE event2 = CreateEventA(NULL, TRUE, FALSE, "wine_msi_async_test2"); + DWORD r = WaitForSingleObject(event, 10000); + ok(hinst, !r, "wait timed out\n"); + SetEvent(event2); + return ERROR_SUCCESS; +} + +UINT WINAPI async2(MSIHANDLE hinst) +{ + HANDLE event = CreateEventA(NULL, TRUE, FALSE, "wine_msi_async_test"); + HANDLE event2 = CreateEventA(NULL, TRUE, FALSE, "wine_msi_async_test2"); + DWORD r; + SetEvent(event); + r = WaitForSingleObject(event2, 10000); + ok(hinst, !r, "wait timed out\n"); + return ERROR_SUCCESS; +} + static BOOL pf_exists(const char *file) { char path[MAX_PATH]; diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index b7cbe58..5d78377 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -5,6 +5,8 @@ @ stdcall nested(long) @ stdcall process1(long) @ stdcall process2(long) +@ stdcall async1(long) +@ stdcall async2(long) @ stdcall cf_present(long) @ stdcall cf_absent(long) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index e147df6..4fa1862 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -677,6 +677,8 @@ static const CHAR ca1_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "process1\tTEST_PROCESS\t720\n" "process2\tTEST_PROCESS\t721\n" "process_deferred\tTEST_PROCESS\t722\n" + "async1\tTEST_ASYNC\t730\n" + "async2\tTEST_ASYNC\t731\n" "InstallFinalize\t\t800\n"; static const CHAR ca1_custom_action_dat[] = "Action\tType\tSource\tTarget\n" @@ -689,6 +691,8 @@ static const CHAR ca1_custom_action_dat[] = "Action\tType\tSource\tTarget\n" "process1\t1\tcustom.dll\tprocess1\n" "process2\t1\tcustom.dll\tprocess2\n" "process_deferred\t1025\tcustom.dll\tprocess2\n" + "async1\t129\tcustom.dll\tasync1\n" + "async2\t1\tcustom.dll\tasync2\n" "testretval\t1\tcustom.dll\ttest_retval\n"; static const CHAR ca1_test_seq_dat[] = "Action\tCondition\tSequence\n" @@ -4129,7 +4133,7 @@ static void test_customaction1(void) r = MsiInstallProductA(msifile, "TEST_RETVAL=0"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - r = MsiInstallProductA(msifile, "TEST_RETVAL=1626"); /* ERROR_FUNCTION_NOT_CALLED*/ + r = MsiInstallProductA(msifile, "TEST_RETVAL=1626"); /* ERROR_FUNCTION_NOT_CALLED */ ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); r = MsiInstallProductA(msifile, "TEST_RETVAL=1602"); @@ -4146,6 +4150,10 @@ static void test_customaction1(void) r = MsiInstallProductA(msifile, "TEST_PROCESS=1"); ok(!r, "got %u\n", r); + /* test asynchronous actions (msidbCustomActionTypeAsync) */ + r = MsiInstallProductA(msifile, "TEST_ASYNC=1"); + ok(!r, "got %u\n", r); + delete_test_files(); DeleteFileA(msifile); DeleteFileA("unus");

1 0

Dmitry Timoshkov : winecfg: Allow to disable MIME-type associations.
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

1 0

Zebediah Figura : msiexec: Don' t keep the custom action GUID in the main thread's stack.
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: wine Branch: master Commit: 2592690540a87498db09753a32c416cfe7f26e81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2592690540a87498db09753a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 16 10:34:40 2018 -0500 msiexec: Don't keep the custom action GUID in the main thread's stack. Since it could potentially change on us during an asynchronous custom action. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msiexec/msiexec.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index ead3bfb..efbcb5c 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -28,6 +28,7 @@ #include <stdio.h> #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "initguid.h" @@ -400,20 +401,21 @@ extern UINT CDECL __wine_msi_call_dll_function(GUID *guid); static DWORD CALLBACK custom_action_thread(void *arg) { - GUID *guid = arg; - return __wine_msi_call_dll_function(guid); + GUID guid = *(GUID *)arg; + heap_free(arg); + return __wine_msi_call_dll_function(&guid); } static int custom_action_server(const WCHAR *arg) { static const WCHAR pipe_name[] = {'\\','\\','.','\\','p','i','p','e','\\','m','s','i','c','a','_','%','x','_','%','d',0}; DWORD client_pid = atoiW(arg); + GUID guid, *thread_guid; DWORD64 thread64; WCHAR buffer[24]; HANDLE thread; HANDLE pipe; DWORD size; - GUID guid; TRACE("%s\n", debugstr_w(arg)); @@ -443,7 +445,9 @@ static int custom_action_server(const WCHAR *arg) return 0; } - thread = CreateThread(NULL, 0, custom_action_thread, &guid, 0, NULL); + thread_guid = heap_alloc(sizeof(GUID)); + memcpy(thread_guid, &guid, sizeof(GUID)); + thread = CreateThread(NULL, 0, custom_action_thread, thread_guid, 0, NULL); /* give the thread handle to the client to wait on, since we might have * to run a nested action and can't block during this one */

1 0

Michael Stefaniuc : sane.ds: Avoid an ARRAY_SIZE-like macro.
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: wine Branch: master Commit: 7d550de26391cfe4234568ddffab6a942319dc6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d550de26391cfe4234568dd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Aug 16 20:19:25 2018 +0200 sane.ds: Avoid an ARRAY_SIZE-like macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sane.ds/capability.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 45c54a1..094bb93 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -844,7 +844,6 @@ static const supported_size_t supported_sizes[] = { TWSS_USEXECUTIVE, 184.15, 266.7 }, { TWSS_A3, 297, 420 }, }; -#define SUPPORTED_SIZE_COUNT (sizeof(supported_sizes) / sizeof(supported_sizes[0])) static TW_UINT16 get_default_paper_size(const supported_size_t *s, int n) { @@ -920,11 +919,11 @@ static TW_UINT16 SANE_ICAPSupportedSizes (pTW_CAPABILITY pCapability, TW_UINT16 TW_UINT16 twCC = TWCC_BADCAP; #ifdef SONAME_LIBSANE - static TW_UINT32 possible_values[SUPPORTED_SIZE_COUNT]; + static TW_UINT32 possible_values[ARRAY_SIZE(supported_sizes)]; unsigned int i; TW_UINT32 val; - TW_UINT16 default_size = get_default_paper_size(supported_sizes, SUPPORTED_SIZE_COUNT); - TW_UINT16 current_size = get_current_paper_size(supported_sizes, SUPPORTED_SIZE_COUNT); + TW_UINT16 default_size = get_default_paper_size(supported_sizes, ARRAY_SIZE(supported_sizes)); + TW_UINT16 current_size = get_current_paper_size(supported_sizes, ARRAY_SIZE(supported_sizes)); TRACE("ICAP_SUPPORTEDSIZES\n"); @@ -946,7 +945,7 @@ static TW_UINT16 SANE_ICAPSupportedSizes (pTW_CAPABILITY pCapability, TW_UINT16 case MSG_SET: twCC = msg_set(pCapability, &val); if (twCC == TWCC_SUCCESS) - for (i = 1; i < SUPPORTED_SIZE_COUNT; i++) + for (i = 1; i < ARRAY_SIZE(supported_sizes); i++) if (supported_sizes[i].size == val) return set_width_height(supported_sizes[i].x, supported_sizes[i].y); @@ -960,7 +959,7 @@ static TW_UINT16 SANE_ICAPSupportedSizes (pTW_CAPABILITY pCapability, TW_UINT16 case MSG_RESET: twCC = TWCC_BADCAP; - for (i = 1; i < SUPPORTED_SIZE_COUNT; i++) + for (i = 1; i < ARRAY_SIZE(supported_sizes); i++) if (supported_sizes[i].size == default_size) { twCC = set_width_height(supported_sizes[i].x, supported_sizes[i].y); @@ -976,7 +975,6 @@ static TW_UINT16 SANE_ICAPSupportedSizes (pTW_CAPABILITY pCapability, TW_UINT16 break; } -#undef SUPPORTED_SIZE_COUNT #endif return twCC; }

1 0

Zebediah Figura : msi: Don' t start the custom action server inside of custom_client_thread().
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: wine Branch: master Commit: 3a884c2ef7a5828a5b42bf9d2532422afeac0fd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a884c2ef7a5828a5b42bf9d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 16 10:34:37 2018 -0500 msi: Don't start the custom action server inside of custom_client_thread(). Asynchronous custom actions don't wait for custom_client_thread() to terminate, so it's possible for two consecutive actions to both try to start the server at once, causing failures when the second action e.g. receives ERROR_PIPE_BUSY from CreateNamedPipe(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 61 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index b250b1b..a9bb81f 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -388,6 +388,7 @@ typedef struct _msi_custom_action_info { LPWSTR action; INT type; GUID guid; + DWORD arch; } msi_custom_action_info; static void release_custom_action_data( msi_custom_action_info *info ) @@ -662,45 +663,16 @@ void custom_stop_server(HANDLE process, HANDLE pipe) static DWORD WINAPI custom_client_thread(void *arg) { msi_custom_action_info *info = arg; - RPC_STATUS status; DWORD64 thread64; HANDLE process; HANDLE thread; HANDLE pipe; - DWORD arch; DWORD size; - BOOL ret; UINT rc; CoInitializeEx(NULL, COINIT_MULTITHREADED); /* needed to marshal streams */ - if (!info->package->rpc_server_started) - { - status = RpcServerUseProtseqEpW(ncalrpcW, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, - endpoint_lrpcW, NULL); - if (status != RPC_S_OK) - { - ERR("RpcServerUseProtseqEp failed: %#x\n", status); - return status; - } - - status = RpcServerRegisterIfEx(s_IWineMsiRemote_v0_0_s_ifspec, NULL, NULL, - RPC_IF_AUTOLISTEN, RPC_C_LISTEN_MAX_CALLS_DEFAULT, NULL); - if (status != RPC_S_OK) - { - ERR("RpcServerRegisterIfEx failed: %#x\n", status); - return status; - } - - info->package->rpc_server_started = 1; - } - - ret = GetBinaryTypeW(info->source, &arch); - if (!ret) - arch = (sizeof(void *) == 8 ? SCS_64BIT_BINARY : SCS_32BIT_BINARY); - - custom_start_server(info->package, arch); - if (arch == SCS_32BIT_BINARY) + if (info->arch == SCS_32BIT_BINARY) { process = info->package->custom_server_32_process; pipe = info->package->custom_server_32_pipe; @@ -741,6 +713,8 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( MSIPACKAGE *package, INT type, LPCWSTR source, LPCWSTR target, LPCWSTR action ) { msi_custom_action_info *info; + RPC_STATUS status; + BOOL ret; info = msi_alloc( sizeof *info ); if (!info) @@ -759,6 +733,33 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( list_add_tail( &msi_pending_custom_actions, &info->entry ); LeaveCriticalSection( &msi_custom_action_cs ); + if (!package->rpc_server_started) + { + status = RpcServerUseProtseqEpW(ncalrpcW, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, + endpoint_lrpcW, NULL); + if (status != RPC_S_OK) + { + ERR("RpcServerUseProtseqEp failed: %#x\n", status); + return NULL; + } + + status = RpcServerRegisterIfEx(s_IWineMsiRemote_v0_0_s_ifspec, NULL, NULL, + RPC_IF_AUTOLISTEN, RPC_C_LISTEN_MAX_CALLS_DEFAULT, NULL); + if (status != RPC_S_OK) + { + ERR("RpcServerRegisterIfEx failed: %#x\n", status); + return NULL; + } + + info->package->rpc_server_started = 1; + } + + ret = GetBinaryTypeW(source, &info->arch); + if (!ret) + info->arch = (sizeof(void *) == 8 ? SCS_64BIT_BINARY : SCS_32BIT_BINARY); + + custom_start_server(package, info->arch); + info->handle = CreateThread(NULL, 0, custom_client_thread, info, 0, NULL); if (!info->handle) {

1 0

Michael Stefaniuc : wineandroid.drv: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: wine Branch: master Commit: ccf6211c0ae6e86218f7e6c1f2fe725a23e568b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccf6211c0ae6e86218f7e6c1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Aug 16 20:19:30 2018 +0200 wineandroid.drv: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/device.c | 4 ++-- dlls/wineandroid.drv/init.c | 2 +- dlls/wineandroid.drv/keyboard.c | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 0ccae11..20519e2 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -1363,7 +1363,7 @@ static int perform( ANativeWindow *window, int operation, ... ) case NATIVE_WINDOW_SET_POST_TRANSFORM_CROP: default: FIXME( "unsupported perform hwnd %p op %d %s\n", win->hwnd, operation, - operation < sizeof(names)/sizeof(names[0]) ? names[operation] : "???" ); + operation < ARRAY_SIZE( names ) ? names[operation] : "???" ); break; } va_end( args ); @@ -1419,7 +1419,7 @@ void release_ioctl_window( struct ANativeWindow *window ) if (InterlockedDecrement( &win->ref ) > 0) return; TRACE( "%p %p\n", win, win->hwnd ); - for (i = 0; i < sizeof(win->buffers)/sizeof(win->buffers[0]); i++) + for (i = 0; i < ARRAY_SIZE( win->buffers ); i++) if (win->buffers[i]) win->buffers[i]->buffer.common.decRef( &win->buffers[i]->buffer.common ); destroy_ioctl_window( win->hwnd, win->opengl ); diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 0dd3e5e..da8fba3 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -677,7 +677,7 @@ static BOOL process_attach(void) load_android_libs(); (*java_vm)->AttachCurrentThread( java_vm, &jni_env, 0 ); class = (*jni_env)->GetObjectClass( jni_env, object ); - (*jni_env)->RegisterNatives( jni_env, class, methods, sizeof(methods)/sizeof(methods[0]) ); + (*jni_env)->RegisterNatives( jni_env, class, methods, ARRAY_SIZE( methods )); (*jni_env)->DeleteLocalRef( jni_env, class ); #ifdef __i386__ wine_set_fs( old_fs ); /* the Java VM hijacks %fs for its own purposes, restore it */ diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index 3167d54..2c37c42 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -638,7 +638,7 @@ static UINT scancode_to_vkey( UINT scan ) { UINT j; - for (j = 0; j < sizeof(vkey_to_scancode)/sizeof(vkey_to_scancode[0]); j++) + for (j = 0; j < ARRAY_SIZE( vkey_to_scancode ); j++) if (vkey_to_scancode[j] == scan) return j; return 0; @@ -648,7 +648,7 @@ static const char* vkey_to_name( UINT vkey ) { UINT j; - for (j = 0; j < sizeof(vkey_names)/sizeof(vkey_names[0]); j++) + for (j = 0; j < ARRAY_SIZE( vkey_names ); j++) if (vkey_names[j].vkey == vkey) return vkey_names[j].name; return NULL; @@ -724,7 +724,7 @@ jboolean keyboard_event( JNIEnv *env, jobject obj, jint win, jint action, jint k { union event_data data; - if ((unsigned int)keycode >= sizeof(keycode_to_vkey)/sizeof(keycode_to_vkey[0]) || + if ((unsigned int)keycode >= ARRAY_SIZE( keycode_to_vkey ) || !keycode_to_vkey[keycode]) { p__android_log_print( ANDROID_LOG_WARN, "wine", @@ -931,7 +931,7 @@ UINT CDECL ANDROID_MapVirtualKeyEx( UINT code, UINT maptype, HKL hkl ) code = VK_LMENU; break; } - if (code < sizeof(vkey_to_scancode) / sizeof(vkey_to_scancode[0])) ret = vkey_to_scancode[code]; + if (code < ARRAY_SIZE( vkey_to_scancode )) ret = vkey_to_scancode[code]; break; case MAPVK_VSC_TO_VK: case MAPVK_VSC_TO_VK_EX: @@ -993,7 +993,7 @@ HKL CDECL ANDROID_GetKeyboardLayout( DWORD thread_id ) SHORT CDECL ANDROID_VkKeyScanEx( WCHAR ch, HKL hkl ) { SHORT ret = -1; - if (ch < sizeof(char_vkey_map) / sizeof(char_vkey_map[0])) ret = char_vkey_map[ch]; + if (ch < ARRAY_SIZE( char_vkey_map )) ret = char_vkey_map[ch]; TRACE_(key)( "ch %04x hkl %p -> %04x\n", ch, hkl, ret ); return ret; }

1 0