March 2020 - Wine-Commits - list.winehq.org

Damjan Jovanovic : shell32: Simplify SHELL_execute().
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: 06f1f53c4c11c972561de91e76cd5ea6dc5c2ced URL: https://source.winehq.org/git/wine.git/?a=commit;h=06f1f53c4c11c972561de91e… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Mar 22 13:46:18 2020 +0200 shell32: Simplify SHELL_execute(). Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlexec.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 28f2e36f9a..d3ff821135 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1806,26 +1806,10 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) TRACE("execute:%s,%s,%s\n", debugstr_w(wszApplicationName), debugstr_w(wszParameters), debugstr_w(wszDir)); lpFile = sei_tmp.lpFile; wcmd = wcmdBuffer; - len = lstrlenW(wszApplicationName) + 3; - if (sei_tmp.lpParameters[0]) - len += 1 + lstrlenW(wszParameters); - if (len > wcmdLen) - { - wcmd = heap_alloc(len * sizeof(WCHAR)); - wcmdLen = len; - } - wcmd[0] = '\"'; - len = lstrlenW(wszApplicationName); - memcpy(wcmd+1, wszApplicationName, len * sizeof(WCHAR)); - len++; - wcmd[len++] = '\"'; - wcmd[len] = 0; - if (sei_tmp.lpParameters[0]) { - wcmd[len++] = ' '; - strcpyW(wcmd+len, wszParameters); - } - - retval = execfunc(wcmd, NULL, FALSE, &sei_tmp, sei); + strcpyW(wcmd, wszApplicationName); + retval = SHELL_quote_and_execute( wcmd, wszParameters, wszEmpty, + wszApplicationName, NULL, &sei_tmp, + sei, execfunc ); if (retval > 32) { heap_free(wszApplicationName); if (wszParameters != parametersBuffer)

1 0

Damjan Jovanovic : shell32: Pass the executable's full path from SHELL_execute() to CreateProcess().
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: 9736fe499d0887bf92652ca32ba5195e7b0b0e9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9736fe499d0887bf92652ca3… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Mar 22 13:46:23 2020 +0200 shell32: Pass the executable's full path from SHELL_execute() to CreateProcess(). Several older Microsoft installers, particularly those changing CDs during installation, break because they launch a child setup.exe, from a parent process also called setup.exe, which Wine finds in the wrong directory, as CreateProcess() first searches the parent executable's own directory, thus re-launching the parent itself instead of the child. Therefore CreateProcess() must be passed a full path from SHELL_execute(), so it launches the correct child. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=8439 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlexec.c | 8 ++++++++ dlls/shell32/tests/shlexec.c | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index d3ff821135..ce0b8f6d2b 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1807,6 +1807,14 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) lpFile = sei_tmp.lpFile; wcmd = wcmdBuffer; strcpyW(wcmd, wszApplicationName); + if (sei_tmp.lpDirectory) + { + LPCWSTR searchPath[] = { + sei_tmp.lpDirectory, + NULL + }; + PathFindOnPathW(wcmd, searchPath); + } retval = SHELL_quote_and_execute( wcmd, wszParameters, wszEmpty, wszApplicationName, NULL, &sei_tmp, sei, execfunc ); diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 0b3d0cb18e..b49297bb41 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2842,7 +2842,7 @@ static void test_directory(void) NULL, "test2.exe", params, tmpdir, NULL); okShell(rc > 32, "returned %lu\n", rc); okChildInt("argcA", 4); - todo_wine okChildString("argvA0", path); + okChildString("argvA0", path); okChildString("argvA3", "Exec"); okChildPath("longPath", path); @@ -2855,7 +2855,7 @@ static void test_directory(void) NULL, "test2.exe", params, "%TMPDIR%", NULL); okShell(rc > 32, "returned %lu\n", rc); okChildInt("argcA", 4); - todo_wine okChildString("argvA0", path); + okChildString("argvA0", path); okChildString("argvA3", "Exec"); okChildPath("longPath", path); @@ -2872,9 +2872,9 @@ static void test_directory(void) NULL, strrchr(argv0, '\\') + 1, params, tmpdir, NULL); okShell(rc > 32, "returned %lu\n", rc); okChildInt("argcA", 4); - todo_wine okChildString("argvA0", path); + okChildString("argvA0", path); okChildString("argvA3", "Exec"); - todo_wine okChildPath("longPath", path); + okChildPath("longPath", path); DeleteFileA(path); }

1 0

Francois Gouget : qasf/tests: Fix a couple of spelling errors in ok() messages.
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: 778a48edca1194e81aea1439f8c15fa4ece164ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=778a48edca1194e81aea1439… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Mar 22 14:19:15 2020 +0100 qasf/tests: Fix a couple of spelling errors in ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/tests/dmowrapper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index 6f6cb77e52..a456891a38 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -1835,7 +1835,7 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); - ok(testdmo_output_mt_set, "Ouput type should be set.\n"); + ok(testdmo_output_mt_set, "Output type should be set.\n"); ok(compare_media_types(&testdmo_output_mt, &req_mt), "Media types didn't match.\n"); test_filter_state(control); @@ -1878,7 +1878,7 @@ static void test_connect_pin(void) hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(compare_media_types(&testsink.sink.pin.mt, &mt2), "Media types didn't match.\n"); - ok(testdmo_output_mt_set, "Ouput type should be set.\n"); + ok(testdmo_output_mt_set, "Output type should be set.\n"); ok(compare_media_types(&testdmo_output_mt, &mt2), "Media types didn't match.\n"); IFilterGraph2_Disconnect(graph, source); IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface);

1 0

Francois Gouget : kernel32/tests: Remove an unneeded sprintf() in the process tests.
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: f08abe0811961d169e3512f186be98cdbcfc80c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f08abe0811961d169e3512f1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 22 14:19:36 2020 +0100 kernel32/tests: Remove an unneeded sprintf() in the process tests. The buffer content is not used before being overwritten again. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 1889939fff..0f0889073b 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1036,7 +1036,6 @@ static void test_CommandLine(void) WritePrivateProfileStringA(NULL, NULL, NULL, resfile); CloseHandle(info.hThread); CloseHandle(info.hProcess); - sprintf(buffer, "process dump %s", resfile); okChildString("Arguments", "argvA0", "dummy"); okChildString("Arguments", "CommandLineA", buffer2); okChildStringWA("Arguments", "CommandLineW", buffer2);

1 0

Alexandre Julliard : server: Store length of console title instead of null-terminating it.
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: 8d6d5a9bc6cb23290978066fe3ade991fe55d887 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d6d5a9bc6cb23290978066f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 21 11:44:03 2020 +0100 server: Store length of console title instead of null-terminating it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/server/console.c b/server/console.c index c3b235d022..e05bc9668c 100644 --- a/server/console.c +++ b/server/console.c @@ -53,6 +53,7 @@ struct console_input INPUT_RECORD *records; /* input records */ struct console_input_events *evt; /* synchronization event with renderer */ WCHAR *title; /* console title */ + data_size_t title_len; /* length of console title */ WCHAR **history; /* lines history */ int history_size; /* number of entries in history array */ int history_index; /* number of used entries in history array */ @@ -339,6 +340,7 @@ static struct object *create_console_input( struct thread* renderer, int fd ) console_input->records = NULL; console_input->evt = renderer ? create_console_input_events() : NULL; console_input->title = NULL; + console_input->title_len = 0; console_input->history_size = 50; console_input->history = calloc( console_input->history_size, sizeof(WCHAR*) ); console_input->history_index = 0; @@ -779,16 +781,15 @@ static int set_console_input_info( const struct set_console_input_info_request * } if (req->mask & SET_CONSOLE_INPUT_INFO_TITLE) { - WCHAR *new_title = mem_alloc( len + sizeof(WCHAR) ); - if (new_title) - { - memcpy( new_title, title, len ); - new_title[len / sizeof(WCHAR)] = 0; - free( console->title ); - console->title = new_title; - evt.event = CONSOLE_RENDERER_TITLE_EVENT; - console_input_events_append( console, &evt ); - } + WCHAR *new_title = NULL; + + len = (len / sizeof(WCHAR)) * sizeof(WCHAR); + if (len && !(new_title = memdup( title, len ))) goto error; + free( console->title ); + console->title = new_title; + console->title_len = len; + evt.event = CONSOLE_RENDERER_TITLE_EVENT; + console_input_events_append( console, &evt ); } if (req->mask & SET_CONSOLE_INPUT_INFO_HISTORY_MODE) { @@ -1629,12 +1630,7 @@ DECL_HANDLER(get_console_input_info) struct console_input *console; if (!(console = console_input_get( req->handle, FILE_READ_PROPERTIES ))) return; - if (console->title) - { - data_size_t len = strlenW( console->title ) * sizeof(WCHAR); - if (len > get_reply_max_size()) len = get_reply_max_size(); - set_reply_data( console->title, len ); - } + if (console->title) set_reply_data( console->title, min( console->title_len, get_reply_max_size() )); reply->history_mode = console->history_mode; reply->history_size = console->history_size; reply->history_index = console->history_index;

1 0

Alexandre Julliard : server: Store length of console history lines instead of null-terminating them.
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: ffe6548d6c55f81918e1aa63228b724cbe72e567 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffe6548d6c55f81918e1aa63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 21 11:57:39 2020 +0100 server: Store length of console history lines instead of null-terminating them. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/server/console.c b/server/console.c index e05bc9668c..5feb1c2ba7 100644 --- a/server/console.c +++ b/server/console.c @@ -42,6 +42,12 @@ struct screen_buffer; struct console_input_events; +struct history_line +{ + data_size_t len; + WCHAR text[1]; +}; + struct console_input { struct object obj; /* object header */ @@ -54,7 +60,7 @@ struct console_input struct console_input_events *evt; /* synchronization event with renderer */ WCHAR *title; /* console title */ data_size_t title_len; /* length of console title */ - WCHAR **history; /* lines history */ + struct history_line **history; /* lines history */ int history_size; /* number of entries in history array */ int history_index; /* number of used entries in history array */ int history_mode; /* mode of history (non zero means remove doubled strings */ @@ -342,7 +348,7 @@ static struct object *create_console_input( struct thread* renderer, int fd ) console_input->title = NULL; console_input->title_len = 0; console_input->history_size = 50; - console_input->history = calloc( console_input->history_size, sizeof(WCHAR*) ); + console_input->history = calloc( console_input->history_size, sizeof(*console_input->history) ); console_input->history_index = 0; console_input->history_mode = 0; console_input->edition_mode = 0; @@ -798,15 +804,13 @@ static int set_console_input_info( const struct set_console_input_info_request * if ((req->mask & SET_CONSOLE_INPUT_INFO_HISTORY_SIZE) && console->history_size != req->history_size) { - WCHAR** mem = NULL; - int i; - int delta; + struct history_line **mem = NULL; + int i, delta; if (req->history_size) { - mem = mem_alloc( req->history_size * sizeof(WCHAR*) ); - if (!mem) goto error; - memset( mem, 0, req->history_size * sizeof(WCHAR*) ); + if (!(mem = mem_alloc( req->history_size * sizeof(*mem) ))) goto error; + memset( mem, 0, req->history_size * sizeof(*mem) ); } delta = (console->history_index > req->history_size) ? @@ -1081,31 +1085,26 @@ static int set_console_output_info( struct screen_buffer *screen_buffer, /* appends a new line to history (history is a fixed size array) */ static void console_input_append_hist( struct console_input* console, const WCHAR* buf, data_size_t len ) { - WCHAR* ptr = mem_alloc( (len + 1) * sizeof(WCHAR) ); - - if (!ptr) - return; + struct history_line *ptr; if (!console || !console->history_size) { set_error( STATUS_INVALID_PARAMETER ); /* FIXME */ - free( ptr ); return; } - memcpy( ptr, buf, len * sizeof(WCHAR) ); - ptr[len] = 0; - + len = (len / sizeof(WCHAR)) * sizeof(WCHAR); if (console->history_mode && console->history_index && - !strcmpW( console->history[console->history_index - 1], ptr )) + console->history[console->history_index - 1]->len == len && + !memcmp( console->history[console->history_index - 1]->text, buf, len )) { - /* ok, mode ask us to not use twice the same string... - * so just free mem and returns - */ + /* don't duplicate entry */ set_error( STATUS_ALIAS_EXISTS ); - free(ptr); return; } + if (!(ptr = mem_alloc( offsetof( struct history_line, text[len / sizeof(WCHAR)] )))) return; + ptr->len = len; + memcpy( ptr->text, buf, len ); if (console->history_index < console->history_size) { @@ -1115,7 +1114,7 @@ static void console_input_append_hist( struct console_input* console, const WCHA { free( console->history[0]) ; memmove( &console->history[0], &console->history[1], - (console->history_size - 1) * sizeof(WCHAR*) ); + (console->history_size - 1) * sizeof(*console->history) ); console->history[console->history_size - 1] = ptr; } } @@ -1128,8 +1127,8 @@ static data_size_t console_input_get_hist( struct console_input *console, int in if (index >= console->history_index) set_error( STATUS_INVALID_PARAMETER ); else { - ret = strlenW( console->history[index] ) * sizeof(WCHAR); - set_reply_data( console->history[index], min( ret, get_reply_max_size() )); + ret = console->history[index]->len; + set_reply_data( console->history[index]->text, min( ret, get_reply_max_size() )); } return ret; }

1 0

Alexandre Julliard : server: Store length of window text instead of null-terminating it.
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: a88973a5f969eaa0ba0788c52977dd5100a80dad URL: https://source.winehq.org/git/wine.git/?a=commit;h=a88973a5f969eaa0ba0788c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 21 11:40:18 2020 +0100 server: Store length of window text instead of null-terminating it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/window.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/server/window.c b/server/window.c index c9b131cba5..3a88b7f34f 100644 --- a/server/window.c +++ b/server/window.c @@ -88,6 +88,7 @@ struct window DPI_AWARENESS dpi_awareness; /* DPI awareness mode */ lparam_t user_data; /* user-specific data */ WCHAR *text; /* window caption text */ + data_size_t text_len; /* length of window caption */ unsigned int paint_flags; /* various painting flags */ int prop_inuse; /* number of in-use window properties */ int prop_alloc; /* number of allocated window properties */ @@ -506,6 +507,7 @@ static struct window *create_window( struct window *parent, struct window *owner win->dpi = 0; win->user_data = 0; win->text = NULL; + win->text_len = 0; win->paint_flags = 0; win->prop_inuse = 0; win->prop_alloc = 0; @@ -2407,10 +2409,10 @@ DECL_HANDLER(get_window_text) { struct window *win = get_window( req->handle ); - if (win && win->text) + if (win && win->text_len) { - reply->length = strlenW( win->text ); - set_reply_data( win->text, min( reply->length * sizeof(WCHAR), get_reply_max_size() )); + reply->length = win->text_len / sizeof(WCHAR); + set_reply_data( win->text, min( win->text_len, get_reply_max_size() )); } } @@ -2418,21 +2420,16 @@ DECL_HANDLER(get_window_text) /* set the window text */ DECL_HANDLER(set_window_text) { + data_size_t len; + WCHAR *text = NULL; struct window *win = get_window( req->handle ); - if (win) - { - WCHAR *text = NULL; - data_size_t len = get_req_data_size() / sizeof(WCHAR); - if (len) - { - if (!(text = mem_alloc( (len+1) * sizeof(WCHAR) ))) return; - memcpy( text, get_req_data(), len * sizeof(WCHAR) ); - text[len] = 0; - } - free( win->text ); - win->text = text; - } + if (!win) return; + len = (get_req_data_size() / sizeof(WCHAR)) * sizeof(WCHAR); + if (len && !(text = memdup( get_req_data(), len ))) return; + free( win->text ); + win->text = text; + win->text_len = len; }

1 0

Nikolay Sivov : ole32: Add support for reading VT_CLSID properties.
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: 9eab89bec6011ded9fa76c08c2fecd71b9b17200 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9eab89bec6011ded9fa76c08… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 23 09:24:11 2020 +0300 ole32: Add support for reading VT_CLSID properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_prop.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index c5d2a42e1c..adf4c2f337 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1454,6 +1454,14 @@ static HRESULT propertystorage_read_scalar(PROPVARIANT *prop, const struct read_ else hr = STG_E_INVALIDPARAMETER; } + break; + case VT_CLSID: + if (!(prop->u.puuid = allocate(allocate_data, sizeof (*prop->u.puuid)))) + return STG_E_INSUFFICIENTMEMORY; + + if (SUCCEEDED(hr = buffer_test_offset(buffer, offset, sizeof(*prop->u.puuid)))) + StorageUtl_ReadGUID(buffer->data, offset, prop->u.puuid); + break; default: FIXME("unsupported type %d\n", prop->vt);

1 0

Francois Gouget : iphlpapi/tests: Fix a spelling error in an ok() message.
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: 8d71e3e8e7874c4d84255418ddbd58eb1c4f90e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d71e3e8e7874c4d84255418… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Mar 22 14:19:07 2020 +0100 iphlpapi/tests: Fix a spelling error in an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 77475ca4df..d5690c11ee 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -2324,7 +2324,7 @@ static void test_NotifyUnicastIpAddressChange(void) ret = pCancelMibChangeNotify2(handle); ok(ret == NO_ERROR, "Unexpected ret %#x.\n", ret); - ok(!CloseHandle(handle), "CloseHandle() succeded.\n"); + ok(!CloseHandle(handle), "CloseHandle() succeeded.\n"); } START_TEST(iphlpapi)

1 0

Francois Gouget : kernel32/tests: Fix a race condition in test_QueryInformationJobObject().
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: 9d38c4864c4800313812feef2c3bc6ca6551ce57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d38c4864c4800313812feef… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 22 14:19:26 2020 +0100 kernel32/tests: Fix a race condition in test_QueryInformationJobObject(). The process must still be running for AssignProcessToJobObject() to succeed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index e54c43ca94..1889939fff 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2572,21 +2572,26 @@ static void test_QueryInformationJobObject(void) PJOBOBJECT_BASIC_PROCESS_ID_LIST pid_list = (JOBOBJECT_BASIC_PROCESS_ID_LIST *)buf; JOBOBJECT_EXTENDED_LIMIT_INFORMATION ext_limit_info; JOBOBJECT_BASIC_LIMIT_INFORMATION *basic_limit_info = &ext_limit_info.BasicLimitInformation; - DWORD dwret, ret_len; + DWORD ret_len; PROCESS_INFORMATION pi[2]; - HANDLE job; + char buffer[50]; + HANDLE job, sem; BOOL ret; job = pCreateJobObjectW(NULL, NULL); ok(job != NULL, "CreateJobObject error %u\n", GetLastError()); /* Only active processes are returned */ - create_process("exit", &pi[0]); + sprintf(buffer, "sync kernel32-process-%x", GetCurrentProcessId()); + sem = CreateSemaphoreA(NULL, 0, 1, buffer + 5); + ok(sem != NULL, "CreateSemaphoreA failed le=%u\n", GetLastError()); + create_process(buffer, &pi[0]); + ret = pAssignProcessToJobObject(job, pi[0].hProcess); ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); - dwret = WaitForSingleObject(pi[0].hProcess, 1000); - ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret); + ReleaseSemaphore(sem, 1, NULL); + wait_child_process(pi[0].hProcess); CloseHandle(pi[0].hProcess); CloseHandle(pi[0].hThread);

1 0