wine-commits November 2017

wine-commits@winehq.org

2 participants
436 discussions

Nikolay Sivov : gdiplus/tests: Some tests for GdipGetFontCollectionFamilyList() and system collection.
by Alexandre Julliard 21 Nov '17

21 Nov '17

Module: wine Branch: master Commit: 4616954a9dc25ab9246fa43bbcd30ac3b7ec7992 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4616954a9dc25ab9246fa43bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 21 09:32:07 2017 +0300 gdiplus/tests: Some tests for GdipGetFontCollectionFamilyList() and system collection. 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/tests/font.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 2cae481..6c7738c 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -1110,6 +1110,60 @@ todo_wine DeleteDC(hdc); } +static void test_GdipGetFontCollectionFamilyList(void) +{ + GpFontFamily *family, *family2; + GpFontCollection *collection; + INT found, count; + GpStatus status; + + status = GdipNewInstalledFontCollection(&collection); + ok(status == Ok, "Failed to get system collection, status %d.\n", status); + + count = 0; + status = GdipGetFontCollectionFamilyCount(collection, &count); + ok(status == Ok, "Failed to get family count, status %d.\n", status); + ok(count > 0, "Unexpected empty collection.\n"); + + status = GdipGetFontCollectionFamilyList(NULL, 0, NULL, NULL); + ok(status == InvalidParameter, "Unexpected status %d.\n", status); + + found = 123; + status = GdipGetFontCollectionFamilyList(NULL, 0, NULL, &found); + ok(status == InvalidParameter, "Unexpected status %d.\n", status); + ok(found == 123, "Unexpected list count %d.\n", found); + + status = GdipGetFontCollectionFamilyList(collection, 0, NULL, NULL); + ok(status == InvalidParameter, "Unexpected status %d.\n", status); + + found = 123; + status = GdipGetFontCollectionFamilyList(collection, 0, NULL, &found); + ok(status == InvalidParameter, "Unexpected status %d.\n", status); + ok(found == 123, "Unexpected list count %d.\n", found); + + found = 123; + status = GdipGetFontCollectionFamilyList(collection, 1, NULL, &found); + ok(status == InvalidParameter, "Unexpected status %d.\n", status); + ok(found == 123, "Unexpected list count %d.\n", found); + + family = NULL; + found = 0; + status = GdipGetFontCollectionFamilyList(collection, 1, &family, &found); + ok(status == Ok, "Failed to get family list, status %d.\n", status); + ok(found == 1, "Unexpected list count %d.\n", found); + ok(family != NULL, "Expected family instance.\n"); + + family = NULL; + found = 0; + status = GdipGetFontCollectionFamilyList(collection, 1, &family2, &found); + ok(status == Ok, "Failed to get family list, status %d.\n", status); + ok(found == 1, "Unexpected list count %d.\n", found); + ok(family2 != family, "Unexpected family instance.\n"); + + GdipDeleteFontFamily(family); + GdipDeleteFontFamily(family2); +} + START_TEST(font) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1139,6 +1193,7 @@ START_TEST(font) test_getgenerics(); test_installedfonts(); test_heightgivendpi(); + test_GdipGetFontCollectionFamilyList(); GdiplusShutdown(gdiplusToken); }

1 0

Alex Henrie : comctl32/tests: Detect and handle an RTL locale.
by Alexandre Julliard 21 Nov '17

21 Nov '17

Module: wine Branch: master Commit: b8d01f9e1e8c44df5172c4cbfae627158930db72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8d01f9e1e8c44df5172c4cbf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 20 22:54:35 2017 -0700 comctl32/tests: Detect and handle an RTL locale. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/propsheet.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index a3f910d..ec53e6b 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -29,11 +29,19 @@ static HWND parenthwnd; static HWND sheethwnd; +static BOOL rtl; static LONG active_page = -1; #define IDC_APPLY_BUTTON 12321 +static void detect_locale(void) +{ + DWORD reading_layout; + rtl = GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_IREADINGLAYOUT | LOCALE_RETURN_NUMBER, + (void *)&reading_layout, sizeof(reading_layout)) && reading_layout == 1; +} + /* try to make sure pending X events have been processed before continuing */ static void flush_events(void) { @@ -496,19 +504,28 @@ static void test_buttons(void) button = GetDlgItem(hdlg, IDCANCEL); GetWindowRect(button, &rc); ok(rc.top == top, "Cancel button should have same top as OK button\n"); - ok(rc.left > prevRight, "Cancel button should be to the right of OK button\n"); + if (rtl) + ok(rc.left < prevRight, "Cancel button should be to the left of OK button\n"); + else + ok(rc.left > prevRight, "Cancel button should be to the right of OK button\n"); prevRight = rc.right; button = GetDlgItem(hdlg, IDC_APPLY_BUTTON); GetWindowRect(button, &rc); ok(rc.top == top, "Apply button should have same top as OK button\n"); - ok(rc.left > prevRight, "Apply button should be to the right of Cancel button\n"); + if (rtl) + ok(rc.left < prevRight, "Apply button should be to the left of Cancel button\n"); + else + ok(rc.left > prevRight, "Apply button should be to the right of Cancel button\n"); prevRight = rc.right; button = GetDlgItem(hdlg, IDHELP); GetWindowRect(button, &rc); ok(rc.top == top, "Help button should have same top as OK button\n"); - ok(rc.left > prevRight, "Help button should be to the right of Apply button\n"); + if (rtl) + ok(rc.left < prevRight, "Help button should be to the left of Apply button\n"); + else + ok(rc.left > prevRight, "Help button should be to the right of Apply button\n"); DestroyWindow(hdlg); } @@ -1124,6 +1141,15 @@ static void test_CreatePropertySheetPage(void) START_TEST(propsheet) { + detect_locale(); + if (rtl) + { + /* use locale-specific RTL resources when on an RTL locale */ + /* without this, propsheets on RTL locales use English LTR resources */ + trace("RTL locale detected\n"); + SetProcessDefaultLayout(LAYOUT_RTL); + } + test_title(); test_nopage(); test_disableowner();

1 0

Huw Davies : ole32/tests: Use a separate data source for the file dib to avoid confusion.
by Alexandre Julliard 21 Nov '17

21 Nov '17

Module: wine Branch: master Commit: ddd1882396b6043f544802a8f44e1d1c31607b9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddd1882396b6043f544802a8f… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 21 09:37:03 2017 +0000 ole32/tests: Use a separate data source for the file dib to avoid confusion. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 51 ++++++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 1a982b4..07157a7 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -199,19 +199,14 @@ static void inline check_expected_method_fmt(const char *method_name, const FORM } while (0) /* 2 x 1 x 32 bpp dib. PelsPerMeter = 200x400 */ -static BYTE dib[] = -{ - 0x42, 0x4d, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, 0x28, 0x00, - - 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x00, 0x00, 0x01, 0x00, 0x20, 0x00, 0x00, 0x00, - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x00, - 0x00, 0x00, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff +static const BYTE dib[] = +{ + 0x28, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x20, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xc8, 0x00, 0x00, 0x00, 0x90, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; static void create_dib( STGMEDIUM *med ) @@ -219,9 +214,9 @@ static void create_dib( STGMEDIUM *med ) void *ptr; med->tymed = TYMED_HGLOBAL; - U(med)->hGlobal = GlobalAlloc( GMEM_MOVEABLE, sizeof(dib) - sizeof(BITMAPFILEHEADER) ); + U(med)->hGlobal = GlobalAlloc( GMEM_MOVEABLE, sizeof(dib) ); ptr = GlobalLock( U(med)->hGlobal ); - memcpy( ptr, dib + sizeof(BITMAPFILEHEADER), sizeof(dib) - sizeof(BITMAPFILEHEADER) ); + memcpy( ptr, dib, sizeof(dib) ); GlobalUnlock( U(med)->hGlobal ); med->pUnkForRelease = NULL; } @@ -2038,9 +2033,21 @@ static void test_data_cache(void) IStorage_Release(pStorage); } - static const WCHAR CONTENTS[] = {'C','O','N','T','E','N','T','S',0}; +/* 2 x 1 x 32 bpp dib. PelsPerMeter = 200x400 */ +static BYTE file_dib[] = +{ + 0x42, 0x4d, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, 0x28, 0x00, + 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x00, + 0x00, 0x00, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff +}; + static IStorage *create_storage( int num ) { IStorage *stg; @@ -2056,10 +2063,10 @@ static IStorage *create_storage( int num ) ok( hr == S_OK, "got %08x\n", hr); if (num == 1) /* Set biXPelsPerMeter = 0 */ { - dib[0x26] = 0; - dib[0x27] = 0; + file_dib[0x26] = 0; + file_dib[0x27] = 0; } - hr = IStream_Write( stm, dib, sizeof(dib), &written ); + hr = IStream_Write( stm, file_dib, sizeof(file_dib), &written ); ok( hr == S_OK, "got %08x\n", hr); IStream_Release( stm ); return stg; @@ -2114,7 +2121,7 @@ static void test_data_cache_dib_contents_stream(int num) "got %lu\n", GlobalSize( U(med).hGlobal ) ); ptr = GlobalLock( U(med).hGlobal ); - expect_info = *(BITMAPINFOHEADER *)(dib + sizeof(BITMAPFILEHEADER)); + expect_info = *(BITMAPINFOHEADER *)(file_dib + sizeof(BITMAPFILEHEADER)); if (expect_info.biXPelsPerMeter == 0 || expect_info.biYPelsPerMeter == 0) { HDC hdc = GetDC( 0 ); @@ -2123,8 +2130,8 @@ static void test_data_cache_dib_contents_stream(int num) ReleaseDC( 0, hdc ); } ok( !memcmp( ptr, &expect_info, sizeof(expect_info) ), "mismatch\n" ); - ok( !memcmp( ptr + sizeof(expect_info), dib + sizeof(BITMAPFILEHEADER) + sizeof(expect_info), - sizeof(dib) - sizeof(BITMAPFILEHEADER) - sizeof(expect_info) ), "mismatch\n" ); + ok( !memcmp( ptr + sizeof(expect_info), file_dib + sizeof(BITMAPFILEHEADER) + sizeof(expect_info), + sizeof(file_dib) - sizeof(BITMAPFILEHEADER) - sizeof(expect_info) ), "mismatch\n" ); GlobalUnlock( U(med).hGlobal ); ReleaseStgMedium( &med );

1 0

Alexandre Julliard : ntdll: Set the initial process context on ARM.
by Alexandre Julliard 21 Nov '17

21 Nov '17

Module: wine Branch: master Commit: 5e3cf758d15fb468b7860c41ac72282c45be9609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e3cf758d15fb468b7860c41a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 21 20:03:20 2017 +0100 ntdll: Set the initial process context on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index e5e3140..bbd6c59 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1011,7 +1011,12 @@ void signal_init_process( CONTEXT *context, LPTHREAD_START_ROUTINE entry ) if (sigaction( SIGTRAP, &sig_act, NULL ) == -1) goto error; #endif - /* FIXME: set the initial context */ + /* set the initial context */ + context->ContextFlags = CONTEXT_FULL; + context->R0 = (DWORD)kernel32_start_process; + context->R1 = (DWORD)entry; + context->Sp = (DWORD)NtCurrentTeb()->Tib.StackBase; + context->Pc = (DWORD)call_thread_entry_point; return; error:

1 0

Alexandre Julliard : ntdll: Use a separate stack when starting new threads.
by Alexandre Julliard 21 Nov '17

21 Nov '17

Module: wine Branch: master Commit: 9e093936e27a29993979f36c18d6c627e36bd737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e093936e27a29993979f36c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 21 13:50:43 2017 +0100 ntdll: Use a separate stack when starting new threads. Based on a patch by Sebastian Lackner. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index ce0ba68..f403b12 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -23,6 +23,7 @@ #include <assert.h> #include <stdarg.h> +#include <limits.h> #include <sys/types.h> #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> @@ -468,6 +469,24 @@ void exit_thread( int status ) /*********************************************************************** + * thread_startup + */ +static void thread_startup( void *param ) +{ + struct startup_info *info = param; + PRTL_THREAD_START_ROUTINE func = info->entry_point; + void *arg = info->entry_arg; + + attach_dlls( (void *)1 ); + + if (TRACE_ON(relay)) + DPRINTF( "%04x:Starting thread proc %p (arg=%p)\n", GetCurrentThreadId(), func, arg ); + + call_thread_entry_point( (LPTHREAD_START_ROUTINE)func, arg ); +} + + +/*********************************************************************** * start_thread * * Startup routine for a newly created thread. @@ -476,8 +495,6 @@ static void start_thread( struct startup_info *info ) { TEB *teb = info->teb; struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; - PRTL_THREAD_START_ROUTINE func = info->entry_point; - void *arg = info->entry_arg; struct debug_info debug_info; debug_info.str_pos = debug_info.strings; @@ -486,14 +503,9 @@ static void start_thread( struct startup_info *info ) thread_data->pthread_id = pthread_self(); signal_init_thread( teb ); - server_init_thread( func ); + server_init_thread( info->entry_point ); - attach_dlls( (void *)1 ); - - if (TRACE_ON(relay)) - DPRINTF( "%04x:Starting thread proc %p (arg=%p)\n", GetCurrentThreadId(), func, arg ); - - call_thread_entry_point( (LPTHREAD_START_ROUTINE)func, arg ); + wine_switch_to_stack( thread_startup, info, teb->Tib.StackBase ); } @@ -603,8 +615,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * if ((status = virtual_alloc_thread_stack( teb, stack_reserve, stack_commit ))) goto error; pthread_attr_init( &attr ); - pthread_attr_setstack( &attr, teb->DeallocationStack, - (char *)teb->Tib.StackBase - (char *)teb->DeallocationStack ); + pthread_attr_setstacksize( &attr, PTHREAD_STACK_MIN ); pthread_attr_setscope( &attr, PTHREAD_SCOPE_SYSTEM ); /* force creating a kernel thread */ interlocked_xchg_add( &nb_threads, 1 ); if (pthread_create( &pthread_id, &attr, (void * (*)(void *))start_thread, info ))

1 0

Alexandre Julliard : ntdll: Delay attaching to dlls loaded because of a forwarded entry point.
by Alexandre Julliard 21 Nov '17

21 Nov '17

Module: wine Branch: master Commit: ed893d3591802bb562d100b277f968be402af740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed893d3591802bb562d100b27… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 21 13:13:35 2017 +0100 ntdll: Delay attaching to dlls loaded because of a forwarded entry point. Based on a patch by Sebastian Lackner. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 820398b..70f99e6 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -473,7 +473,21 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS if (load_dll( load_path, mod_name, 0, &wm ) == STATUS_SUCCESS && !(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) { - if (process_attach( wm, NULL ) != STATUS_SUCCESS) + if (!imports_fixup_done && current_modref) + { + WINE_MODREF **deps; + if (current_modref->nDeps) + deps = RtlReAllocateHeap( GetProcessHeap(), 0, current_modref->deps, + (current_modref->nDeps + 1) * sizeof(*deps) ); + else + deps = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*deps) ); + if (deps) + { + deps[current_modref->nDeps++] = wm; + current_modref->deps = deps; + } + } + else if (process_attach( wm, NULL ) != STATUS_SUCCESS) { LdrUnloadDll( wm->ldr.BaseAddress ); wm = NULL; @@ -906,7 +920,7 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) { int i, nb_imports; const IMAGE_IMPORT_DESCRIPTOR *imports; - WINE_MODREF *prev; + WINE_MODREF *prev, *imp; DWORD size; NTSTATUS status; ULONG_PTR cookie; @@ -940,11 +954,12 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) status = STATUS_SUCCESS; for (i = 0; i < nb_imports; i++) { - if (!import_dll( wm->ldr.BaseAddress, &imports[i], load_path, &wm->deps[i] )) + if (!import_dll( wm->ldr.BaseAddress, &imports[i], load_path, &imp )) { - wm->deps[i] = NULL; + imp = NULL; status = STATUS_DLL_NOT_FOUND; } + wm->deps[i] = imp; } current_modref = prev; if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie );

1 0

Francois Gouget : testbot/WineSendLog: Don' t try to add a MessageId if there is no Patch object.
by Alexandre Julliard 21 Nov '17

21 Nov '17

Module: tools Branch: master Commit: 06a0d0208ceb5d43d139d99fe9690eedc7067142 URL: http://source.winehq.org/git/tools.git/?a=commit;h=06a0d0208ceb5d43d139d99f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 20 19:00:29 2017 +0100 testbot/WineSendLog: Don't try to add a MessageId if there is no Patch object. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 1bb37f4..eadfe77 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -189,7 +189,7 @@ sub SendLog($) $Subject .= ": " . $Description; } print SENDMAIL "Subject: $Subject\n"; - if ($Job->Patch->MessageId) + if ($Job->Patch and $Job->Patch->MessageId) { print SENDMAIL "In-Reply-To: ", $Job->Patch->MessageId, "\n"; print SENDMAIL "References: ", $Job->Patch->MessageId, "\n";

1 0

Alexandre Julliard : ntdll: Fixup imports in the first thread that runs, even if it's not the main one.
by Alexandre Julliard 20 Nov '17

20 Nov '17

Module: wine Branch: master Commit: 8477ae27a87355d98035153927548b4b57d856f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8477ae27a87355d9803515392… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 17:09:29 2017 +0100 ntdll: Fixup imports in the first thread that runs, even if it's not the main one. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 1 - dlls/ntdll/loader.c | 85 ++++++++++++++++++++++++------------------- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/thread.c | 4 +- 4 files changed, 50 insertions(+), 42 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index bb91ec9..6790185 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3060,7 +3060,6 @@ static void test_SuspendProcessNewThread(void) ok(exit_code == 0x1234, "Invalid remote thread exit code\n"); ret = are_imports_resolved(pi.hProcess, exe_base, &nt_header); - todo_wine ok(ret, "EXE IAT entry not resolved\n"); if (thread_handle) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 9c89d57..820398b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -64,6 +64,7 @@ WINE_DECLARE_DEBUG_CHANNEL(pid); typedef DWORD (CALLBACK *DLLENTRYPROC)(HMODULE,DWORD,LPVOID); typedef void (CALLBACK *LDRENUMPROC)(LDR_MODULE *, void *, BOOLEAN *); +static BOOL imports_fixup_done = FALSE; /* set once the imports have been fixed up, before attaching them */ static BOOL process_detaching = FALSE; /* set on process detach to avoid deadlocks with thread detach */ static int free_lib_count; /* recursion depth of LdrUnloadDll calls */ @@ -1326,28 +1327,16 @@ static void process_detach(void) } /************************************************************************* - * MODULE_DllThreadAttach + * thread_attach * * Send DLL thread attach notifications. These are sent in the * reverse sequence of process detach notification. - * + * The loader_section must be locked while calling this function. */ -NTSTATUS MODULE_DllThreadAttach( LPVOID lpReserved ) +static void thread_attach(void) { PLIST_ENTRY mark, entry; PLDR_MODULE mod; - NTSTATUS status; - - /* don't do any attach calls if process is exiting */ - if (process_detaching) return STATUS_SUCCESS; - - RtlEnterCriticalSection( &loader_section ); - - RtlAcquirePebLock(); - InsertHeadList( &tls_links, &NtCurrentTeb()->TlsLinks ); - RtlReleasePebLock(); - - if ((status = alloc_thread_tls()) != STATUS_SUCCESS) goto done; mark = &NtCurrentTeb()->Peb->LdrData->InInitializationOrderModuleList; for (entry = mark->Flink; entry != mark; entry = entry->Flink) @@ -1359,13 +1348,8 @@ NTSTATUS MODULE_DllThreadAttach( LPVOID lpReserved ) if ( mod->Flags & LDR_NO_DLL_CALLS ) continue; - MODULE_InitDLL( CONTAINING_RECORD(mod, WINE_MODREF, ldr), - DLL_THREAD_ATTACH, lpReserved ); + MODULE_InitDLL( CONTAINING_RECORD(mod, WINE_MODREF, ldr), DLL_THREAD_ATTACH, NULL ); } - -done: - RtlLeaveCriticalSection( &loader_section ); - return status; } /****************************************************************** @@ -3014,25 +2998,57 @@ PIMAGE_NT_HEADERS WINAPI RtlImageNtHeader(HMODULE hModule) /*********************************************************************** - * attach_process_dlls + * attach_dlls * - * Initial attach to all the dlls loaded by the process. + * Attach to all the loaded dlls. + * If this is the first time, perform the full process initialization. */ -static NTSTATUS attach_process_dlls( void *wm ) +NTSTATUS attach_dlls( void *reserved ) { NTSTATUS status; + WINE_MODREF *wm; + LPCWSTR load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); + if (process_detaching) return STATUS_SUCCESS; + RtlEnterCriticalSection( &loader_section ); - if ((status = process_attach( wm, (LPVOID)1 )) != STATUS_SUCCESS) + + wm = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); + assert( wm ); + + if (!imports_fixup_done) { - if (last_failed_modref) - ERR( "%s failed to initialize, aborting\n", - debugstr_w(last_failed_modref->ldr.BaseDllName.Buffer) + 1 ); - return status; + actctx_init(); + if ((status = fixup_imports( wm, load_path )) != STATUS_SUCCESS) goto done; + imports_fixup_done = TRUE; } - attach_implicitly_loaded_dlls( (LPVOID)1 ); + + RtlAcquirePebLock(); + InsertHeadList( &tls_links, &NtCurrentTeb()->TlsLinks ); + RtlReleasePebLock(); + + if ((status = alloc_thread_tls()) != STATUS_SUCCESS) goto done; + + if (!(wm->ldr.Flags & LDR_PROCESS_ATTACHED)) /* first time around */ + { + if ((status = process_attach( wm, reserved )) != STATUS_SUCCESS) + { + if (last_failed_modref) + ERR( "%s failed to initialize, aborting\n", + debugstr_w(last_failed_modref->ldr.BaseDllName.Buffer) + 1 ); + goto done; + } + attach_implicitly_loaded_dlls( reserved ); + } + else + { + thread_attach(); + status = STATUS_SUCCESS; + } + +done: RtlLeaveCriticalSection( &loader_section ); return status; } @@ -3109,7 +3125,6 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, static const WCHAR globalflagW[] = {'G','l','o','b','a','l','F','l','a','g',0}; NTSTATUS status; WINE_MODREF *wm; - LPCWSTR load_path; PEB *peb = NtCurrentTeb()->Peb; CONTEXT context = { 0 }; @@ -3134,6 +3149,7 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, LdrQueryImageFileExecutionOptions( &peb->ProcessParameters->ImagePathName, globalflagW, REG_DWORD, &peb->NtGlobalFlag, sizeof(peb->NtGlobalFlag), NULL ); + heap_set_debug_flags( GetProcessHeap() ); /* the main exe needs to be the first in the load order list */ RemoveEntryList( &wm->ldr.InLoadOrderModuleList ); @@ -3144,12 +3160,7 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, if ((status = virtual_alloc_thread_stack( NtCurrentTeb(), 0, 0 )) != STATUS_SUCCESS) goto error; if ((status = server_init_process_done( &context )) != STATUS_SUCCESS) goto error; - actctx_init(); - load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; - if ((status = fixup_imports( wm, load_path )) != STATUS_SUCCESS) goto error; - heap_set_debug_flags( GetProcessHeap() ); - - status = wine_call_on_stack( attach_process_dlls, wm, (char *)NtCurrentTeb()->Tib.StackBase - page_size ); + status = wine_call_on_stack( attach_dlls, (void *)1, (char *)NtCurrentTeb()->Tib.StackBase - page_size ); if (status != STATUS_SUCCESS) goto error; virtual_release_address_space(); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 907bbdd..e469afd 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -104,7 +104,7 @@ extern NTSTATUS validate_open_object_attributes( const OBJECT_ATTRIBUTES *attr ) /* module handling */ extern LIST_ENTRY tls_links DECLSPEC_HIDDEN; -extern NTSTATUS MODULE_DllThreadAttach( LPVOID lpReserved ) DECLSPEC_HIDDEN; +extern NTSTATUS attach_dlls( void *unused ) DECLSPEC_HIDDEN; extern FARPROC RELAY_GetProcAddress( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, FARPROC proc, DWORD ordinal, const WCHAR *user ) DECLSPEC_HIDDEN; extern FARPROC SNOOP_GetProcAddress( HMODULE hmod, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 85ceb2b..ce0ba68 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -349,7 +349,6 @@ HANDLE thread_init(void) thread_data->wait_fd[0] = -1; thread_data->wait_fd[1] = -1; thread_data->debug_info = &debug_info; - InsertHeadList( &tls_links, &teb->TlsLinks ); signal_init_thread( teb ); virtual_init_threading(); @@ -488,9 +487,8 @@ static void start_thread( struct startup_info *info ) signal_init_thread( teb ); server_init_thread( func ); - pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); - MODULE_DllThreadAttach( NULL ); + attach_dlls( (void *)1 ); if (TRACE_ON(relay)) DPRINTF( "%04x:Starting thread proc %p (arg=%p)\n", GetCurrentThreadId(), func, arg );

1 0

Jonathan Doron : kernel32/tests: Test suspended process with new thread.
by Alexandre Julliard 20 Nov '17

20 Nov '17

Module: wine Branch: master Commit: 2f8c9d449b4107bbe1a81dc08ab9f20a752f8bb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f8c9d449b4107bbe1a81dc08… Author: Jonathan Doron <jond(a)wizery.com> Date: Mon Nov 20 16:08:10 2017 +0200 kernel32/tests: Test suspended process with new thread. Test the exe imports resolve time if a new thread is being created in a new suspended process. Signed-off-by: Jonathan Doron <jond(a)wizery.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 180 +++++++++++++++++++++++++++--------------- 1 file changed, 118 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f8c9d449b4107bbe1a81…

1 0

Hans Leidekker : wbemprox: Support NULL tests that use equality operators.
by Alexandre Julliard 20 Nov '17

20 Nov '17

Module: wine Branch: master Commit: b5633cc69b9fb8ff15e631ede40cc49c70027dfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5633cc69b9fb8ff15e631ede… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 20 15:07:03 2017 +0100 wbemprox: Support NULL tests that use equality operators. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 8 +++++++- dlls/wbemprox/wql.y | 24 ++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 083a717..79b09c0 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -106,8 +106,14 @@ static void test_select( IWbemServices *services ) {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', 'W','i','n','3','2','_','V','i','d','e','o','C','o','n','t','r','o','l','l','e','r',' ','w','h','e','r','e',' ', 'a','v','a','i','l','a','b','i','l','i','t','y',' ','=',' ','\'','3','\'',0}; + static const WCHAR query12[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_','B','I','O','S', + ' ','W','H','E','R','E',' ','N','A','M','E',' ','<','>',' ','N','U','L','L', 0}; + static const WCHAR query13[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_','B','I','O','S', + ' ','W','H','E','R','E',' ','N','U','L','L',' ','=',' ','N','A','M','E', 0}; static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7, query8, query9, query10, - query11 }; + query11, query12, query13 }; HRESULT hr; IEnumWbemClassObject *result; BSTR wql = SysAllocString( wqlW ); diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 98b0378..88da2b9 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -414,6 +414,30 @@ expr: if (!$$) YYABORT; } + | prop_val TK_EQ TK_NULL + { + $$ = expr_unary( ctx, $1, OP_ISNULL ); + if (!$$) + YYABORT; + } + | TK_NULL TK_EQ prop_val + { + $$ = expr_unary( ctx, $3, OP_ISNULL ); + if (!$$) + YYABORT; + } + | prop_val TK_NE TK_NULL + { + $$ = expr_unary( ctx, $1, OP_NOTNULL ); + if (!$$) + YYABORT; + } + | TK_NULL TK_NE prop_val + { + $$ = expr_unary( ctx, $3, OP_NOTNULL ); + if (!$$) + YYABORT; + } ; string_val:

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
44
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 November 2017