wine-commits October 2018

wine-commits@winehq.org

1 participants
602 discussions

Nikolay Sivov : gdiplus: Implement GdipRotatePenTransform().
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: 363326678cd2f473b6fcf3d141846fa79007837d URL: https://source.winehq.org/git/wine.git/?a=commit;h=363326678cd2f473b6fcf3d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 24 00:04:18 2018 +0300 gdiplus: Implement GdipRotatePenTransform(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/pen.c | 7 +------ dlls/gdiplus/tests/pen.c | 38 ++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index ad45bcb..8bcb918 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -480,17 +480,12 @@ GpStatus WINGDIPAPI GdipScalePenTransform(GpPen *pen, REAL sx, REAL sy, GpMatrix GpStatus WINGDIPAPI GdipRotatePenTransform(GpPen *pen, REAL angle, GpMatrixOrder order) { - static int calls; - TRACE("(%p,%0.2f,%u)\n", pen, angle, order); if(!pen) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); - - return NotImplemented; + return GdipRotateMatrix(&pen->transform, angle, order); } GpStatus WINGDIPAPI GdipMultiplyPenTransform(GpPen *pen, GDIPCONST GpMatrix *matrix, diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 530967a..ceab92a 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -588,6 +588,44 @@ static void test_transform(void) expectf(-15.0, values[4]); expectf(-76.0, values[5]); + /* Rotate */ + status = GdipResetPenTransform(pen); + expect(Ok, status); + + status = GdipSetMatrixElements(matrix, 2.0, 1.0, 1.0, 4.0, 1.0, 2.0); + expect(Ok, status); + + status = GdipSetPenTransform(pen, matrix); + expect(Ok, status); + + status = GdipRotatePenTransform(NULL, 10.0, MatrixOrderPrepend); + expect(InvalidParameter, status); + + status = GdipRotatePenTransform(pen, 45.0, MatrixOrderPrepend); + expect(Ok, status); + + get_pen_transform(pen, values); + expectf(2.12, values[0]); + expectf(3.54, values[1]); + expectf(-0.71, values[2]); + expectf(2.12, values[3]); + expectf(1.0, values[4]); + expectf(2.0, values[5]); + + status = GdipScalePenTransform(pen, 2.0, -10.0, MatrixOrderAppend); + expect(Ok, status); + + status = GdipRotatePenTransform(pen, 180.0, MatrixOrderAppend); + expect(Ok, status); + + get_pen_transform(pen, values); + expectf(-4.24, values[0]); + expectf(35.36, values[1]); + expectf(1.41, values[2]); + expectf(21.21, values[3]); + expectf(-2.0, values[4]); + expectf(20.0, values[5]); + GdipDeletePen(pen); GdipDeleteMatrix(matrix); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 5593ac5..ad944d6 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -631,6 +631,7 @@ GpStatus WINGDIPAPI GdipGetPenMode(GpPen*,GpPenAlignment*); GpStatus WINGDIPAPI GdipGetPenTransform(GpPen *, GpMatrix *); GpStatus WINGDIPAPI GdipMultiplyPenTransform(GpPen *,GDIPCONST GpMatrix *,GpMatrixOrder); GpStatus WINGDIPAPI GdipResetPenTransform(GpPen*); +GpStatus WINGDIPAPI GdipRotatePenTransform(GpPen*,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipScalePenTransform(GpPen*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen*,GpBrush*); GpStatus WINGDIPAPI GdipSetPenColor(GpPen*,ARGB);

1 0

Nikolay Sivov : start: Try cycling through extensions if original path failed to execute.
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: 1c9365488553ff5fe21b710b25d2808583bf1a5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c9365488553ff5fe21b710b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 24 14:32:14 2018 +0300 start: Try cycling through extensions if original path failed to execute. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/start/start.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/programs/start/start.c b/programs/start/start.c index 32372ec..ccec9bc 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -403,7 +403,55 @@ int wmain (int argc, WCHAR *argv[]) } if (!ShellExecuteExW(&sei)) - fatal_string_error(STRING_EXECFAIL, GetLastError(), sei.lpFile); + { + static const WCHAR pathextW[] = {'P','A','T','H','E','X','T',0}; + const WCHAR *filename = sei.lpFile; + DWORD size, filename_len; + WCHAR *name, *env; + + size = GetEnvironmentVariableW(pathextW, NULL, 0); + if (size) + { + WCHAR *start, *ptr; + + env = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (!env) + fatal_string_error(STRING_EXECFAIL, ERROR_OUTOFMEMORY, sei.lpFile); + GetEnvironmentVariableW(pathextW, env, size); + + filename_len = strlenW(filename); + name = HeapAlloc(GetProcessHeap(), 0, (filename_len + size) * sizeof(WCHAR)); + if (!name) + fatal_string_error(STRING_EXECFAIL, ERROR_OUTOFMEMORY, sei.lpFile); + + sei.lpFile = name; + start = env; + while ((ptr = strchrW(start, ';'))) + { + if (start == ptr) + { + start = ptr + 1; + continue; + } + + strcpyW(name, filename); + memcpy(&name[filename_len], start, (ptr - start) * sizeof(WCHAR)); + name[filename_len + (ptr - start)] = 0; + + if (ShellExecuteExW(&sei)) + { + HeapFree(GetProcessHeap(), 0, name); + HeapFree(GetProcessHeap(), 0, env); + goto done; + } + + start = ptr + 1; + } + + } + + fatal_string_error(STRING_EXECFAIL, GetLastError(), filename); + } done: HeapFree( GetProcessHeap(), 0, args );

1 0

Nikolay Sivov : ntdll/tests: Add a test for qsort() stability.
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: dd7230d1bce94c02449aead6eca352da57b89608 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd7230d1bce94c02449aead6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 24 16:34:31 2018 +0300 ntdll/tests: Add a test for qsort() stability. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/string.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 708d6e7..0ab28ff 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1189,6 +1189,16 @@ static int __cdecl strcomparefunc(const void *a, const void *b) return lstrcmpA(*p, *q); } +static int __cdecl istrcomparefunc(const void *a, const void *b) +{ + const char * const *p = a; + const char * const *q = b; + + ok (a != b, "must never get the same pointer\n"); + + return lstrcmpiA(*p, *q); +} + static void test_qsort(void) { int arr[5] = { 23, 42, 8, 4, 16 }; @@ -1202,6 +1212,15 @@ static void test_qsort(void) "Sorted", "." }; + const char *strarr2[7] = { + "Hello", + "Wine", + "World", + "!", + "wine", + "Sorted", + "WINE" + }; p_qsort ((void*)arr, 0, sizeof(int), intcomparefunc); ok(arr[0] == 23, "badly sorted, nmemb=0, arr[0] is %d\n", arr[0]); @@ -1246,6 +1265,17 @@ static void test_qsort(void) ok(!strcmp(strarr[4],"Sorted"), "badly sorted, strarr[4] is %s\n", strarr[4]); ok(!strcmp(strarr[5],"Wine"), "badly sorted, strarr[5] is %s\n", strarr[5]); ok(!strcmp(strarr[6],"World"), "badly sorted, strarr[6] is %s\n", strarr[6]); + + p_qsort ((void*)strarr2, 7, sizeof(char*), istrcomparefunc); + ok(!strcmp(strarr2[0], "!"), "badly sorted, strar2r[0] is %s\n", strarr2[0]); + ok(!strcmp(strarr2[1], "Hello"), "badly sorted, strarr2[1] is %s\n", strarr2[1]); + ok(!strcmp(strarr2[2], "Sorted"), "badly sorted, strarr2[2] is %s\n", strarr2[2]); +todo_wine { + ok(!strcmp(strarr2[3], "wine"), "badly sorted, strarr2[3] is %s\n", strarr2[3]); + ok(!strcmp(strarr2[4], "WINE"), "badly sorted, strarr2[4] is %s\n", strarr2[4]); + ok(!strcmp(strarr2[5], "Wine"), "badly sorted, strarr2[5] is %s\n", strarr2[5]); +} + ok(!strcmp(strarr2[6], "World"), "badly sorted, strarr2[6] is %s\n", strarr2[6]); } static void test_bsearch(void)

1 0

Dmitry Timoshkov : shell32: Add bitmap resources for ids 133 and 134.
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: ed24889dad5a6aeea4867be1056ca76ab6953c42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed24889dad5a6aeea4867be1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 24 15:28:10 2018 +0300 shell32: Add bitmap resources for ids 133 and 134. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/resources/idb_sort_decr.bmp | Bin 0 -> 838 bytes dlls/shell32/resources/idb_sort_incr.bmp | Bin 0 -> 838 bytes dlls/shell32/shell32.rc | 6 ++++++ dlls/shell32/shresdef.h | 3 +++ 4 files changed, 9 insertions(+) diff --git a/dlls/shell32/resources/idb_sort_decr.bmp b/dlls/shell32/resources/idb_sort_decr.bmp new file mode 100644 index 0000000..6956552 Binary files /dev/null and b/dlls/shell32/resources/idb_sort_decr.bmp differ diff --git a/dlls/shell32/resources/idb_sort_incr.bmp b/dlls/shell32/resources/idb_sort_incr.bmp new file mode 100644 index 0000000..0d9b6a2 Binary files /dev/null and b/dlls/shell32/resources/idb_sort_incr.bmp differ diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 5c11590..46f0b6f 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -1064,6 +1064,12 @@ IDI_SHELL_RESTRICTED2 ICON resources/restricted.ico /* @makedep: resources/internet.ico */ IDI_SHELL_WEB_BROWSER ICON resources/internet.ico +/* @makedep: resources/idb_sort_incr.bmp */ +IDB_SORT_INCR BITMAP resources/idb_sort_incr.bmp + +/* @makedep: resources/idb_sort_decr.bmp */ +IDB_SORT_DECR BITMAP resources/idb_sort_decr.bmp + /* @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 16c9293..92185d6 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -424,6 +424,9 @@ FIXME: Need to add them, but for now just let them use the same: searching.avi #define IDC_FPROP_ARCHIVE 13021 /* bitmaps */ +#define IDB_SORT_INCR 133 +#define IDB_SORT_DECR 134 + /* explorer toolbar icons * FIXME: images are hacky and should be re-drawn; also dark and light bitmaps are same for now */

1 0

Alexandre Julliard : ntdll: Also return the SECTION_IMAGE_INFORMATION data from RtlCreateUserProcess( ).
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: c998667bf0983ef99cc48847d3d6fc6ca6ff4a2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c998667bf0983ef99cc48847… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 24 12:32:30 2018 +0200 ntdll: Also return the SECTION_IMAGE_INFORMATION data from RtlCreateUserProcess(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 2 ++ dlls/ntdll/process.c | 1 + dlls/ntdll/virtual.c | 59 ++++++++++++++++++++++++++++--------------------- 3 files changed, 37 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index f4de3cf..fdb443b 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -185,6 +185,8 @@ extern NTSTATUS virtual_uninterrupted_write_memory( void *addr, const void *buff extern void VIRTUAL_SetForceExec( BOOL enable ) DECLSPEC_HIDDEN; extern void virtual_release_address_space(void) DECLSPEC_HIDDEN; extern void virtual_set_large_address_space(void) DECLSPEC_HIDDEN; +extern void virtual_fill_image_information( const pe_image_info_t *pe_info, + SECTION_IMAGE_INFORMATION *info ) DECLSPEC_HIDDEN; extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN; /* completion */ diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 372e26e..623bf65 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -1314,6 +1314,7 @@ NTSTATUS WINAPI RtlCreateUserProcess( UNICODE_STRING *path, ULONG attributes, info->Thread = thread_handle; info->ClientId.UniqueProcess = ULongToHandle( process_id ); info->ClientId.UniqueThread = ULongToHandle( thread_id ); + virtual_fill_image_information( &pe_info, &info->ImageInformation ); process_handle = thread_handle = 0; status = STATUS_SUCCESS; } diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index af1509e..5dfbe74 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -3176,6 +3176,39 @@ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr ) /****************************************************************************** + * virtual_fill_image_information + * + * Helper for NtQuerySection. + */ +void virtual_fill_image_information( const pe_image_info_t *pe_info, SECTION_IMAGE_INFORMATION *info ) +{ + info->TransferAddress = wine_server_get_ptr( pe_info->entry_point ); + info->ZeroBits = pe_info->zerobits; + info->MaximumStackSize = pe_info->stack_size; + info->CommittedStackSize = pe_info->stack_commit; + info->SubSystemType = pe_info->subsystem; + info->SubsystemVersionLow = pe_info->subsystem_low; + info->SubsystemVersionHigh = pe_info->subsystem_high; + info->GpValue = pe_info->gp; + info->ImageCharacteristics = pe_info->image_charact; + info->DllCharacteristics = pe_info->dll_charact; + info->Machine = pe_info->machine; + info->ImageContainsCode = pe_info->contains_code; + info->u.ImageFlags = pe_info->image_flags; + info->LoaderFlags = pe_info->loader_flags; + info->ImageFileSize = pe_info->file_size; + info->CheckSum = pe_info->checksum; +#ifndef _WIN64 /* don't return 64-bit values to 32-bit processes */ + if (pe_info->machine == IMAGE_FILE_MACHINE_AMD64 || pe_info->machine == IMAGE_FILE_MACHINE_ARM64) + { + info->TransferAddress = (void *)0x81231234; /* sic */ + info->MaximumStackSize = 0x100000; + info->CommittedStackSize = 0x10000; + } +#endif +} + +/****************************************************************************** * NtQuerySection (NTDLL.@) * ZwQuerySection (NTDLL.@) */ @@ -3217,32 +3250,8 @@ NTSTATUS WINAPI NtQuerySection( HANDLE handle, SECTION_INFORMATION_CLASS class, else if (reply->flags & SEC_IMAGE) { SECTION_IMAGE_INFORMATION *info = ptr; - info->TransferAddress = wine_server_get_ptr( image_info.entry_point ); - info->ZeroBits = image_info.zerobits; - info->MaximumStackSize = image_info.stack_size; - info->CommittedStackSize = image_info.stack_commit; - info->SubSystemType = image_info.subsystem; - info->SubsystemVersionLow = image_info.subsystem_low; - info->SubsystemVersionHigh = image_info.subsystem_high; - info->GpValue = image_info.gp; - info->ImageCharacteristics = image_info.image_charact; - info->DllCharacteristics = image_info.dll_charact; - info->Machine = image_info.machine; - info->ImageContainsCode = image_info.contains_code; - info->u.ImageFlags = image_info.image_flags; - info->LoaderFlags = image_info.loader_flags; - info->ImageFileSize = image_info.file_size; - info->CheckSum = image_info.checksum; + virtual_fill_image_information( &image_info, info ); if (ret_size) *ret_size = sizeof(*info); -#ifndef _WIN64 /* don't return 64-bit values to 32-bit processes */ - if (image_info.machine == IMAGE_FILE_MACHINE_AMD64 || - image_info.machine == IMAGE_FILE_MACHINE_ARM64) - { - info->TransferAddress = (void *)0x81231234; /* sic */ - info->MaximumStackSize = 0x100000; - info->CommittedStackSize = 0x10000; - } -#endif } else status = STATUS_SECTION_NOT_IMAGE; }

1 0

Alexandre Julliard : ntdll: Implement RtlCreateUserProcess().
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: 5cc8bcf0b05f6cfd4f60fe371e00ec8a575bec83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cc8bcf0b05f6cfd4f60fe37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 24 12:27:23 2018 +0200 ntdll: Implement RtlCreateUserProcess(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 583 ++++++++++++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/rtl.c | 13 -- 2 files changed, 578 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5cc8bcf0b05f6cfd4f60…

1 0

Alexandre Julliard : kernel32: Avoid setting an empty current directory in the process params.
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: 7a8ff7fab34e765956fbaf29b63226e561cc0045 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a8ff7fab34e765956fbaf29… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 24 12:21:06 2018 +0200 kernel32: Avoid setting an empty current directory in the process params. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index ea483b9..1490f6d 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1887,8 +1887,9 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( LPCWSTR filename, LPC RtlInitUnicodeString( &desktopW, startup->lpDesktop ); runtimeW.Buffer = (WCHAR *)startup->lpReserved2; runtimeW.Length = runtimeW.MaximumLength = startup->cbReserved2; - if (RtlCreateProcessParametersEx( &params, &imageW, NULL, &curdirW, &cmdlineW, envW, &titleW, - &desktopW, NULL, &runtimeW, PROCESS_PARAMS_FLAG_NORMALIZED )) + if (RtlCreateProcessParametersEx( &params, &imageW, NULL, cur_dir ? &curdirW : NULL, + &cmdlineW, envW, &titleW, &desktopW, + NULL, &runtimeW, PROCESS_PARAMS_FLAG_NORMALIZED )) { if (envW != env) HeapFree( GetProcessHeap(), 0, envW ); return NULL;

1 0

Alexandre Julliard : kernel32: Use the Unicode string length to build the argv array.
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: 1a561b640b52359a2dba8aa345264f2f2a88fafe URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a561b640b52359a2dba8aa3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 24 12:20:38 2018 +0200 kernel32: Use the Unicode string length to build the argv array. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 59b6961..ea483b9 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1483,16 +1483,19 @@ void CDECL __wine_kernel_init(void) * Build an argv array from a command-line. * 'reserved' is the number of args to reserve before the first one. */ -static char **build_argv( const WCHAR *cmdlineW, int reserved ) +static char **build_argv( const UNICODE_STRING *cmdlineW, int reserved ) { int argc; char** argv; char *arg,*s,*d,*cmdline; int in_quotes,bcount,len; - len = WideCharToMultiByte( CP_UNIXCP, 0, cmdlineW, -1, NULL, 0, NULL, NULL ); - if (!(cmdline = HeapAlloc( GetProcessHeap(), 0, len ))) return NULL; - WideCharToMultiByte( CP_UNIXCP, 0, cmdlineW, -1, cmdline, len, NULL, NULL ); + len = WideCharToMultiByte( CP_UNIXCP, 0, cmdlineW->Buffer, cmdlineW->Length / sizeof(WCHAR), + NULL, 0, NULL, NULL ); + if (!(cmdline = HeapAlloc( GetProcessHeap(), 0, len + 1 ))) return NULL; + WideCharToMultiByte( CP_UNIXCP, 0, cmdlineW->Buffer, cmdlineW->Length / sizeof(WCHAR), + cmdline, len, NULL, NULL ); + cmdline[len++] = 0; argc=reserved+1; bcount=0; @@ -1689,7 +1692,7 @@ static int fork_and_exec( const RTL_USER_PROCESS_PARAMETERS *params, const char wine_server_handle_to_fd( params->hStdOutput, FILE_WRITE_DATA, &stdout_fd, NULL ); wine_server_handle_to_fd( params->hStdError, FILE_WRITE_DATA, &stderr_fd, NULL ); - argv = build_argv( params->CommandLine.Buffer, 0 ); + argv = build_argv( &params->CommandLine, 0 ); envp = build_envp( params->Environment ); if (!(pid = fork())) /* child */ @@ -2045,7 +2048,7 @@ static pid_t spawn_loader( const RTL_USER_PROCESS_PARAMETERS *params, int socket const char *loader = NULL; char **argv; - argv = build_argv( params->CommandLine.Buffer, 1 ); + argv = build_argv( &params->CommandLine, 1 ); if (!is_win64 ^ !is_64bit_arch( pe_info->cpu )) loader = get_alternate_loader( &wineloader ); @@ -2132,7 +2135,7 @@ static NTSTATUS exec_loader( const RTL_USER_PROCESS_PARAMETERS *params, int sock ULONGLONG res_start = pe_info->base; ULONGLONG res_end = pe_info->base + pe_info->map_size; - if (!(argv = build_argv( params->CommandLine.Buffer, 1 ))) return STATUS_NO_MEMORY; + if (!(argv = build_argv( &params->CommandLine, 1 ))) return STATUS_NO_MEMORY; if (!is_win64 ^ !is_64bit_arch( pe_info->cpu )) loader = get_alternate_loader( &wineloader );

1 0

Alexandre Julliard : kernel32: Get std handles from the process parameters.
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: 33c3cee81771c6437cd73564ed84ab530e7f0185 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33c3cee81771c6437cd73564… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 24 11:32:16 2018 +0200 kernel32: Get std handles from the process parameters. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 799519e..59b6961 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1663,7 +1663,7 @@ static char **build_envp( const WCHAR *envW ) * * Fork and exec a new Unix binary, checking for errors. */ -static int fork_and_exec( const RTL_USER_PROCESS_PARAMETERS *params, const char *newdir, DWORD flags ) +static int fork_and_exec( const RTL_USER_PROCESS_PARAMETERS *params, const char *newdir ) { int fd[2], stdin_fd = -1, stdout_fd = -1, stderr_fd = -1; int pid, err; @@ -1698,7 +1698,8 @@ static int fork_and_exec( const RTL_USER_PROCESS_PARAMETERS *params, const char { close( fd[0] ); - if (flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS)) + if (params->ConsoleFlags || params->ConsoleHandle == KERNEL32_CONSOLE_ALLOC || + (params->hStdInput == INVALID_HANDLE_VALUE && params->hStdOutput == INVALID_HANDLE_VALUE)) { int nullfd = open( "/dev/null", O_RDWR ); setsid(); @@ -2035,11 +2036,11 @@ static BOOL terminate_main_thread(void) /*********************************************************************** * spawn_loader */ -static pid_t spawn_loader( const RTL_USER_PROCESS_PARAMETERS *params, unsigned int flags, int socketfd, - int stdin_fd, int stdout_fd, const char *unixdir, char *winedebug, - const pe_image_info_t *pe_info ) +static pid_t spawn_loader( const RTL_USER_PROCESS_PARAMETERS *params, int socketfd, + const char *unixdir, char *winedebug, const pe_image_info_t *pe_info ) { pid_t pid; + int stdin_fd = -1, stdout_fd = -1; char *wineloader = NULL; const char *loader = NULL; char **argv; @@ -2049,6 +2050,9 @@ static pid_t spawn_loader( const RTL_USER_PROCESS_PARAMETERS *params, unsigned i if (!is_win64 ^ !is_64bit_arch( pe_info->cpu )) loader = get_alternate_loader( &wineloader ); + wine_server_handle_to_fd( params->hStdInput, FILE_READ_DATA, &stdin_fd, NULL ); + wine_server_handle_to_fd( params->hStdOutput, FILE_WRITE_DATA, &stdout_fd, NULL ); + if (!(pid = fork())) /* child */ { if (!(pid = fork())) /* grandchild */ @@ -2057,7 +2061,8 @@ static pid_t spawn_loader( const RTL_USER_PROCESS_PARAMETERS *params, unsigned i ULONGLONG res_start = pe_info->base; ULONGLONG res_end = pe_info->base + pe_info->map_size; - if (flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS)) + if (params->ConsoleFlags || params->ConsoleHandle == KERNEL32_CONSOLE_ALLOC || + (params->hStdInput == INVALID_HANDLE_VALUE && params->hStdOutput == INVALID_HANDLE_VALUE)) { int fd = open( "/dev/null", O_RDWR ); setsid(); @@ -2107,6 +2112,8 @@ static pid_t spawn_loader( const RTL_USER_PROCESS_PARAMETERS *params, unsigned i } while (wret < 0 && errno == EINTR); } + if (stdin_fd != -1) close( stdin_fd ); + if (stdout_fd != -1) close( stdout_fd ); HeapFree( GetProcessHeap(), 0, wineloader ); HeapFree( GetProcessHeap(), 0, argv ); return pid; @@ -2292,7 +2299,7 @@ static BOOL create_process( HANDLE hFile, LPSECURITY_ATTRIBUTES psa, LPSECURITY_ char *winedebug = NULL; startup_info_t *startup_info; DWORD startup_info_size; - int socketfd[2], stdin_fd = -1, stdout_fd = -1; + int socketfd[2]; pid_t pid; int err; @@ -2401,23 +2408,12 @@ static BOOL create_process( HANDLE hFile, LPSECURITY_ATTRIBUTES psa, LPSECURITY_ return FALSE; } - if (!(flags & (CREATE_NEW_CONSOLE | DETACHED_PROCESS))) - { - if (startup_info->hstdin) - wine_server_handle_to_fd( wine_server_ptr_handle(startup_info->hstdin), - FILE_READ_DATA, &stdin_fd, NULL ); - if (startup_info->hstdout) - wine_server_handle_to_fd( wine_server_ptr_handle(startup_info->hstdout), - FILE_WRITE_DATA, &stdout_fd, NULL ); - } HeapFree( GetProcessHeap(), 0, startup_info ); /* create the child process */ - pid = spawn_loader( params, flags, socketfd[0], stdin_fd, stdout_fd, unixdir, winedebug, pe_info ); + pid = spawn_loader( params, socketfd[0], unixdir, winedebug, pe_info ); - if (stdin_fd != -1) close( stdin_fd ); - if (stdout_fd != -1) close( stdout_fd ); close( socketfd[0] ); HeapFree( GetProcessHeap(), 0, winedebug ); if (pid == -1) @@ -2782,7 +2778,7 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A case BINARY_UNIX_EXE: /* unknown file, try as unix executable */ TRACE( "starting %s as Unix binary\n", debugstr_w(name) ); - retv = (fork_and_exec( params, unixdir, flags ) != -1); + retv = (fork_and_exec( params, unixdir ) != -1); break; } if (hFile) CloseHandle( hFile );

1 0

Jacek Caban : server: Add NtQueryInformationFile( FileIoCompletionNotificationInformation) implementation.
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: 66e20ce576fd815cffd016f3d36f84c619ea7bc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66e20ce576fd815cffd016f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 23 17:45:42 2018 +0200 server: Add NtQueryInformationFile(FileIoCompletionNotificationInformation) implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 10 ++++++++++ server/fd.c | 12 ++++++++++++ 2 files changed, 22 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index c340839..5240854 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1284,6 +1284,11 @@ static void _test_file_info(unsigned line, HANDLE handle) status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), FileAccessInformation); ok_(__FILE__,line)(status == STATUS_SUCCESS, "FileAccessInformation returned %x\n", status); + + status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), + FileIoCompletionNotificationInformation); + ok_(__FILE__,line)(status == STATUS_SUCCESS || broken(status == STATUS_INVALID_INFO_CLASS), + "FileIoCompletionNotificationInformation returned %x\n", status); } #define test_no_file_info(a) _test_no_file_info(__LINE__,a) @@ -1300,6 +1305,11 @@ static void _test_no_file_info(unsigned line, HANDLE handle) status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), FileAccessInformation); ok_(__FILE__,line)(status == STATUS_OBJECT_TYPE_MISMATCH, "FileAccessInformation returned %x\n", status); + + status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), + FileIoCompletionNotificationInformation); + ok_(__FILE__,line)(status == STATUS_OBJECT_TYPE_MISMATCH || broken(status == STATUS_INVALID_INFO_CLASS), + "FileIoCompletionNotificationInformation returned %x\n", status); } static void test_query_object(void) diff --git a/server/fd.c b/server/fd.c index 65dc8a2..3e73fae 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2192,6 +2192,18 @@ void default_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int set_reply_data( &info, sizeof(info) ); break; } + case FileIoCompletionNotificationInformation: + { + FILE_IO_COMPLETION_NOTIFICATION_INFORMATION info; + if (get_reply_max_size() < sizeof(info)) + { + set_error( STATUS_INFO_LENGTH_MISMATCH ); + return; + } + info.Flags = 0; /* FIXME */ + set_reply_data( &info, sizeof(info) ); + break; + } default: set_error( STATUS_NOT_IMPLEMENTED ); }

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2018