October 2020 - Wine-commits

Michael Stefaniuc : rundll32: Use wide-char string literals.
by Alexandre Julliard 08 Oct '20

08 Oct '20

Module: wine Branch: master Commit: 1cba8c3f97ce23c9f9ea25bcd42a883a4f041078 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cba8c3f97ce23c9f9ea25bc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 7 23:34:33 2020 +0200 rundll32: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/rundll32/rundll32.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/programs/rundll32/rundll32.c b/programs/rundll32/rundll32.c index d1caefc2e2..eb7713518a 100644 --- a/programs/rundll32/rundll32.c +++ b/programs/rundll32/rundll32.c @@ -83,20 +83,14 @@ static void call_entry_point( void *func, HWND hwnd, HINSTANCE inst, void *cmdli } #endif -/* - * Control_RunDLL needs to have a window. So lets make us a very - * simple window class. - */ -static const WCHAR szTitle[] = {'r','u','n','d','l','l','3','2',0}; -static const WCHAR szWindowClass[] = {'c','l','a','s','s','_','r','u','n','d','l','l','3','2',0}; -static const WCHAR kernel32[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; -static const WCHAR shell32[] = {'s','h','e','l','l','3','2','.','d','l','l',0}; - static HINSTANCE16 (WINAPI *pLoadLibrary16)(LPCSTR libname); static FARPROC16 (WINAPI *pGetProcAddress16)(HMODULE16 hModule, LPCSTR name); static void (WINAPI *pRunDLL_CallEntry16)( FARPROC proc, HWND hwnd, HINSTANCE inst, LPCSTR cmdline, INT cmdshow ); +/* + * Control_RunDLL needs to have a window. So lets make us a very simple window class. + */ static ATOM register_class(void) { WNDCLASSEXW wcex; @@ -112,7 +106,7 @@ static ATOM register_class(void) wcex.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); wcex.lpszMenuName = NULL; - wcex.lpszClassName = szWindowClass; + wcex.lpszClassName = L"class_rundll32"; wcex.hIconSm = NULL; return RegisterClassExW(&wcex); @@ -127,7 +121,7 @@ static HINSTANCE16 load_dll16( LPCWSTR dll ) if (dllA) { WideCharToMultiByte( CP_ACP, 0, dll, -1, dllA, len, NULL, NULL ); - pLoadLibrary16 = (void *)GetProcAddress( GetModuleHandleW(kernel32), (LPCSTR)35 ); + pLoadLibrary16 = (void *)GetProcAddress( GetModuleHandleW(L"kernel32.dll"), (LPCSTR)35 ); if (pLoadLibrary16) ret = pLoadLibrary16( dllA ); HeapFree( GetProcessHeap(), 0, dllA ); } @@ -143,7 +137,7 @@ static FARPROC16 get_entry_point16( HINSTANCE16 inst, LPCWSTR entry ) if (entryA) { WideCharToMultiByte( CP_ACP, 0, entry, -1, entryA, len, NULL, NULL ); - pGetProcAddress16 = (void *)GetProcAddress( GetModuleHandleW(kernel32), (LPCSTR)37 ); + pGetProcAddress16 = (void *)GetProcAddress( GetModuleHandleW(L"kernel32.dll"), (LPCSTR)37 ); if (pGetProcAddress16) ret = pGetProcAddress16( inst, entryA ); HeapFree( GetProcessHeap(), 0, entryA ); } @@ -289,8 +283,7 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE hOldInstance, LPWSTR szCmdLine /* Initialize the rundll32 class */ register_class(); - hWnd = CreateWindowW(szWindowClass, szTitle, - WS_OVERLAPPEDWINDOW|WS_VISIBLE, + hWnd = CreateWindowW(L"class_rundll32", L"rundll32", WS_OVERLAPPEDWINDOW|WS_VISIBLE, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, NULL, NULL, NULL, NULL); /* Get the dll name and API EntryPoint */ @@ -359,7 +352,7 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE hOldInstance, LPWSTR szCmdLine if (win16) { - HMODULE shell = LoadLibraryW( shell32 ); + HMODULE shell = LoadLibraryW( L"shell32.dll" ); if (shell) pRunDLL_CallEntry16 = (void *)GetProcAddress( shell, (LPCSTR)122 ); if (pRunDLL_CallEntry16) pRunDLL_CallEntry16( entry_point, hWnd, instance, cmdline, info.wShowWindow );

1 0

Michael Stefaniuc : regsvr32: Use wide-char string literals.
by Alexandre Julliard 08 Oct '20

08 Oct '20

Module: wine Branch: master Commit: dea850cfd5387d9b2fffacb40544ae38296cba72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dea850cfd5387d9b2fffacb4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 8 12:16:09 2020 +0200 regsvr32: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regsvr32/regsvr32.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 730f1fef3d..885f0ff783 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -114,9 +114,7 @@ static LPCWSTR find_arg_start(LPCWSTR cmdline) static void reexec_self(void) { /* restart current process as 32-bit or 64-bit with same command line */ - static const WCHAR exe_name[] = {'\\','r','e','g','s','v','r','3','2','.','e','x','e',0}; #ifndef _WIN64 - static const WCHAR sysnative[] = {'\\','S','y','s','N','a','t','i','v','e',0}; BOOL wow64; #endif WCHAR systemdir[MAX_PATH]; @@ -138,16 +136,16 @@ static void reexec_self(void) } GetWindowsDirectoryW(systemdir, MAX_PATH); - wcscat(systemdir, sysnative); + wcscat(systemdir, L"\\SysNative"); #endif args = find_arg_start(GetCommandLineW()); cmdline = HeapAlloc(GetProcessHeap(), 0, - (wcslen(systemdir)+wcslen(exe_name)+wcslen(args)+1)*sizeof(WCHAR)); + (wcslen(systemdir)+wcslen(L"\\regsvr32.exe")+wcslen(args)+1)*sizeof(WCHAR)); wcscpy(cmdline, systemdir); - wcscat(cmdline, exe_name); + wcscat(cmdline, L"\\regsvr32.exe"); wcscat(cmdline, args); si.cb = sizeof(si);

1 0

Paul Gofman : ntdll: Introduce RtlProcessFlsData() and use it for FLS data destruction.
by Alexandre Julliard 08 Oct '20

08 Oct '20

Module: wine Branch: master Commit: 36981ad03356caf01eb7e446765e1e9c023c0195 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36981ad03356caf01eb7e446… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Oct 6 13:04:46 2020 +0300 ntdll: Introduce RtlProcessFlsData() and use it for FLS data destruction. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/thread.c | 2 +- dlls/ntdll/loader.c | 3 ++- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/thread.c | 10 ++++++++++ include/winternl.h | 1 + 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 0bfef62a7d..f2b746856e 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -1022,7 +1022,7 @@ void WINAPI DECLSPEC_HOTPATCH DeleteFiber( LPVOID fiber_ptr ) RtlExitUserThread( 1 ); } RtlFreeUserStack( fiber->stack_allocation ); - HeapFree( GetProcessHeap(), 0, fiber->fls_slots ); + RtlProcessFlsData( fiber->fls_slots, 3 ); HeapFree( GetProcessHeap(), 0, fiber ); } diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 20bc3f977d..cd27ce5658 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3255,7 +3255,8 @@ void WINAPI LdrShutdownThread(void) for (i = 0; i < tls_module_count; i++) RtlFreeHeap( GetProcessHeap(), 0, pointers[i] ); RtlFreeHeap( GetProcessHeap(), 0, pointers ); } - RtlFreeHeap( GetProcessHeap(), 0, NtCurrentTeb()->FlsSlots ); + RtlProcessFlsData( NtCurrentTeb()->FlsSlots, 3 ); + NtCurrentTeb()->FlsSlots = NULL; RtlFreeHeap( GetProcessHeap(), 0, NtCurrentTeb()->TlsExpansionSlots ); NtCurrentTeb()->TlsExpansionSlots = NULL; RtlReleasePebLock(); diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ce9f6281d5..6f44f49982 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -874,6 +874,7 @@ @ stdcall RtlPopFrame(ptr) @ stdcall RtlPrefixString(ptr ptr long) @ stdcall RtlPrefixUnicodeString(ptr ptr long) +@ stdcall RtlProcessFlsData(ptr long) @ stub RtlPropertySetNameToGuid @ stub RtlProtectHeap @ stdcall RtlPushFrame(ptr) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 716ef3b61d..5729204358 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -343,3 +343,13 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsGetValue( ULONG index, void **data ) return STATUS_SUCCESS; } + + +/*********************************************************************** + * RtlProcessFlsData (NTDLL.@) + */ +void WINAPI DECLSPEC_HOTPATCH RtlProcessFlsData( void *teb_fls_data, ULONG flags ) +{ + if (flags & 2) + RtlFreeHeap( GetProcessHeap(), 0, teb_fls_data ); +} diff --git a/include/winternl.h b/include/winternl.h index 82328167c9..75324635ed 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3480,6 +3480,7 @@ NTSYSAPI NTSTATUS WINAPI RtlPinAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM); NTSYSAPI void WINAPI RtlPopFrame(TEB_ACTIVE_FRAME*); NTSYSAPI BOOLEAN WINAPI RtlPrefixString(const STRING*,const STRING*,BOOLEAN); NTSYSAPI BOOLEAN WINAPI RtlPrefixUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); +NTSYSAPI void WINAPI RtlProcessFlsData(void*,ULONG); NTSYSAPI void WINAPI RtlPushFrame(TEB_ACTIVE_FRAME*); NTSYSAPI NTSTATUS WINAPI RtlQueryActivationContextApplicationSettings(DWORD,HANDLE,const WCHAR*,const WCHAR*,WCHAR*,SIZE_T,SIZE_T*); NTSYSAPI NTSTATUS WINAPI RtlQueryAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM,ULONG*,ULONG*,WCHAR*,ULONG*);

1 0

Paul Gofman : ntdll: Reimplement FLS data management on top of up to date structures.
by Alexandre Julliard 08 Oct '20

08 Oct '20

Module: wine Branch: master Commit: 905deff5da48c085bb4213d3c67ecf1cfae45564 URL: https://source.winehq.org/git/wine.git/?a=commit;h=905deff5da48c085bb4213d3… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Oct 6 13:04:47 2020 +0300 ntdll: Reimplement FLS data management on top of up to date structures. Win10 18132 introduced increased FLS data limit and entirely changed underlying structure. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/thread.c | 2 +- dlls/ntdll/loader.c | 6 +- dlls/ntdll/ntdll_misc.h | 3 + dlls/ntdll/thread.c | 227 ++++++++++++++++++++++++++++++++++++++--------- include/winternl.h | 28 +++++- 5 files changed, 216 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=905deff5da48c085bb42…

1 0

Paul Gofman : kernel32/tests: Test FLS data storage structures.
by Alexandre Julliard 08 Oct '20

08 Oct '20

Module: wine Branch: master Commit: 767fa07092cde0bbf3f08a8c728dced8cb28c748 URL: https://source.winehq.org/git/wine.git/?a=commit;h=767fa07092cde0bbf3f08a8c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Oct 6 13:04:48 2020 +0300 kernel32/tests: Test FLS data storage structures. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/fiber.c | 239 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 234 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=767fa07092cde0bbf3f0…

1 0

Paul Gofman : ntdll: Allocate TEB FLS data in LdrInitializeThunk().
by Alexandre Julliard 08 Oct '20

08 Oct '20

Module: wine Branch: master Commit: 87ea7698ab8c859f0b7e4f363339b0b15c31abd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87ea7698ab8c859f0b7e4f36… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Oct 6 13:04:49 2020 +0300 ntdll: Allocate TEB FLS data in LdrInitializeThunk(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 3 +-- dlls/ntdll/loader.c | 2 ++ dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/thread.c | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index fecbee3ba1..8e8834239b 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2629,8 +2629,7 @@ todo_wine SetLastError(0xdeadbeef); value = pFlsGetValue(fls_index); ok(!value, "FlsGetValue returned %p, expected NULL\n", value); - todo_wine - ok(GetLastError() == ERROR_SUCCESS, "FlsGetValue failed with error %u\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "FlsGetValue failed with error %u\n", GetLastError()); ret = pFlsSetValue(fls_index, (void*) 0x31415); ok(ret, "FlsSetValue failed\n"); fls_count++; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1d5ffc33f5..8374dd9732 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3511,6 +3511,8 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR InsertHeadList( &tls_links, &NtCurrentTeb()->TlsLinks ); RtlReleasePebLock(); + NtCurrentTeb()->FlsSlots = fls_alloc_data(); + if (!attach_done) /* first time around */ { attach_done = 1; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 19bf574a44..41e8666a25 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -129,5 +129,6 @@ static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) /* FLS data */ extern void init_global_fls_data(void) DECLSPEC_HIDDEN; +extern TEB_FLS_DATA *fls_alloc_data(void) DECLSPEC_HIDDEN; #endif diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 6b88d0ed8e..822dc21fbb 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -294,7 +294,7 @@ static unsigned int fls_chunk_index_from_index( unsigned int index, unsigned int return chunk_index; } -static TEB_FLS_DATA * fls_alloc_data(void) +TEB_FLS_DATA *fls_alloc_data(void) { TEB_FLS_DATA *fls;

1 0

Paul Gofman : ntdll: Don't use PEB lock for FLS data.
by Alexandre Julliard 08 Oct '20

08 Oct '20

Module: wine Branch: master Commit: 4039c5ad47a999a771120091ca57d087b01ee382 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4039c5ad47a999a771120091… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Oct 6 13:04:50 2020 +0300 ntdll: Don't use PEB lock for FLS data. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/fiber.c | 36 +++++++++++++++++++++++++++++++++--- dlls/ntdll/thread.c | 13 +++++++++++-- 2 files changed, 44 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index 336d913c54..30f9152c39 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -37,6 +37,8 @@ static DWORD (WINAPI *pFlsAlloc)(PFLS_CALLBACK_FUNCTION); static BOOL (WINAPI *pFlsFree)(DWORD); static PVOID (WINAPI *pFlsGetValue)(DWORD); static BOOL (WINAPI *pFlsSetValue)(DWORD,PVOID); +static void (WINAPI *pRtlAcquirePebLock)(void); +static void (WINAPI *pRtlReleasePebLock)(void); static NTSTATUS (WINAPI *pRtlFlsAlloc)(PFLS_CALLBACK_FUNCTION,DWORD*); static NTSTATUS (WINAPI *pRtlFlsFree)(ULONG); static NTSTATUS (WINAPI *pRtlFlsSetValue)(ULONG,void *); @@ -76,6 +78,8 @@ static VOID init_funcs(void) X(RtlFlsSetValue); X(RtlFlsGetValue); X(RtlProcessFlsData); + X(RtlAcquirePebLock); + X(RtlReleasePebLock); #undef X } @@ -239,6 +243,19 @@ static unsigned int test_fls_chunk_index_from_index(unsigned int index, unsigned return chunk_index; } +static HANDLE test_fiberlocalstorage_peb_locked_event; +static HANDLE test_fiberlocalstorage_done_event; + + +static DWORD WINAPI test_FiberLocalStorage_thread(void *arg) +{ + pRtlAcquirePebLock(); + SetEvent(test_fiberlocalstorage_peb_locked_event); + WaitForSingleObject(test_fiberlocalstorage_done_event, INFINITE); + pRtlReleasePebLock(); + return 0; +} + static void test_FiberLocalStorage(void) { static DWORD fls_indices[FLS_TEST_INDEX_COUNT]; @@ -246,10 +263,11 @@ static void test_FiberLocalStorage(void) LIST_ENTRY *fls_list_head, saved_entry; TEB_FLS_DATA *fls_data, *new_fls_data; GLOBAL_FLS_DATA *g_fls_data; + DWORD fls, fls_2, result; TEB *teb = NtCurrentTeb(); PEB *peb = teb->Peb; - DWORD fls, fls_2; NTSTATUS status; + HANDLE hthread; SIZE_T size; void* val; BOOL ret; @@ -424,17 +442,29 @@ static void test_FiberLocalStorage(void) HeapSize(GetProcessHeap(), 0, new_fls_data); } - saved_entry = new_fls_data->fls_list_entry; + test_fiberlocalstorage_peb_locked_event = CreateEventA(NULL, FALSE, FALSE, NULL); + test_fiberlocalstorage_done_event = CreateEventA(NULL, FALSE, FALSE, NULL); + hthread = CreateThread(NULL, 0, test_FiberLocalStorage_thread, NULL, 0, NULL); + ok(!!hthread, "CreateThread failed.\n"); + result = WaitForSingleObject(test_fiberlocalstorage_peb_locked_event, INFINITE); + ok(result == WAIT_OBJECT_0, "Got unexpected result %u.\n", result); teb->FlsSlots = NULL; + + saved_entry = new_fls_data->fls_list_entry; pRtlProcessFlsData(new_fls_data, 1); ok(!teb->FlsSlots, "Got unexpected teb->FlsSlots %p.\n", teb->FlsSlots); + teb->FlsSlots = fls_data; + SetEvent(test_fiberlocalstorage_done_event); + WaitForSingleObject(hthread, INFINITE); + CloseHandle(hthread); + CloseHandle(test_fiberlocalstorage_peb_locked_event); + CloseHandle(test_fiberlocalstorage_done_event); ok(new_fls_data->fls_list_entry.Flink == saved_entry.Flink, "Got unexpected Flink %p.\n", saved_entry.Flink); ok(new_fls_data->fls_list_entry.Blink == saved_entry.Blink, "Got unexpected Flink %p.\n", saved_entry.Blink); - size = HeapSize(GetProcessHeap(), 0, new_fls_data); ok(size == sizeof(*new_fls_data), "Got unexpected size %p.\n", (void *)size); pRtlProcessFlsData(new_fls_data, 2); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 822dc21fbb..cf6bddab0b 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -256,6 +256,15 @@ TEB_ACTIVE_FRAME * WINAPI RtlGetFrame(void) static GLOBAL_FLS_DATA fls_data; +static RTL_CRITICAL_SECTION fls_section; +static RTL_CRITICAL_SECTION_DEBUG fls_critsect_debug = +{ + 0, 0, &fls_section, + { &fls_critsect_debug.ProcessLocksList, &fls_critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": fls_section") } +}; +static RTL_CRITICAL_SECTION fls_section = { &fls_critsect_debug, -1, 0, 0, 0, 0 }; + #define MAX_FLS_DATA_COUNT 0xff0 void init_global_fls_data(void) @@ -265,12 +274,12 @@ void init_global_fls_data(void) static void lock_fls_data(void) { - RtlAcquirePebLock(); + RtlEnterCriticalSection( &fls_section ); } static void unlock_fls_data(void) { - RtlReleasePebLock(); + RtlLeaveCriticalSection( &fls_section ); } static unsigned int fls_chunk_size( unsigned int chunk_index )

1 0

Huw Davies : riched20: Move several of the wrapping functions to use ME_Run directly.
by Alexandre Julliard 08 Oct '20

08 Oct '20

Module: wine Branch: master Commit: 729150666715ac03339bc3fc655b2e1635890fee URL: https://source.winehq.org/git/wine.git/?a=commit;h=729150666715ac03339bc3fc… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 8 11:10:45 2020 +0100 riched20: Move several of the wrapping functions to use ME_Run directly. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 6 + dlls/riched20/run.c | 20 +++ dlls/riched20/wrap.c | 441 +++++++++++++++++++++++-------------------------- 3 files changed, 231 insertions(+), 236 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=729150666715ac03339b…

1 0

Huw Davies : riched20: Store a ME_Paragraph ptr in the wrap context.
by Alexandre Julliard 08 Oct '20

08 Oct '20

Module: wine Branch: master Commit: 94e34fa8ee3779c0b62b2f0669d6b2c99224426b URL: https://source.winehq.org/git/wine.git/?a=commit;h=94e34fa8ee3779c0b62b2f06… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 8 11:10:46 2020 +0100 riched20: Store a ME_Paragraph ptr in the wrap context. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 5 +++- dlls/riched20/para.c | 9 ++----- dlls/riched20/run.c | 4 +-- dlls/riched20/wrap.c | 68 +++++++++++++++++++++++--------------------------- 4 files changed, 39 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=94e34fa8ee3779c0b62b…

1 0

Huw Davies : riched20: Pass a ME_Paragraph ptr to WrapTextParagraph().
by Alexandre Julliard 08 Oct '20

08 Oct '20

Module: wine Branch: master Commit: 1500cfe8fa98827fc58c0f2d7e65d1c3feccc131 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1500cfe8fa98827fc58c0f2d… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 8 11:10:47 2020 +0100 riched20: Pass a ME_Paragraph ptr to WrapTextParagraph(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/wrap.c | 150 +++++++++++++++++++++++++-------------------------- 1 file changed, 73 insertions(+), 77 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index c74931015a..13a54829b2 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -687,32 +687,36 @@ static int ME_GetParaLineSpace(ME_Context* c, ME_Paragraph* para) return sp * c->editor->nZoomNumerator / c->editor->nZoomDenominator; } -static void ME_PrepareParagraphForWrapping(ME_TextEditor *editor, ME_Context *c, ME_DisplayItem *tp) { - ME_DisplayItem *p; - - tp->member.para.nWidth = 0; - /* remove row start items as they will be reinserted by the - * paragraph wrapper anyway */ - editor->total_rows -= tp->member.para.nRows; - tp->member.para.nRows = 0; - for (p = tp->next; p != tp->member.para.next_para; p = p->next) { - if (p->type == diStartRow) { - ME_DisplayItem *pRow = p; - p = p->prev; - ME_Remove(pRow); - ME_DestroyDisplayItem(pRow); +static void ME_PrepareParagraphForWrapping( ME_TextEditor *editor, ME_Context *c, ME_Paragraph *para ) +{ + ME_DisplayItem *p; + + para->nWidth = 0; + /* remove row start items as they will be reinserted by the + * paragraph wrapper anyway */ + editor->total_rows -= para->nRows; + para->nRows = 0; + for (p = para_get_di( para ); p != para->next_para; p = p->next) + { + if (p->type == diStartRow) + { + ME_DisplayItem *pRow = p; + p = p->prev; + ME_Remove( pRow ); + ME_DestroyDisplayItem( pRow ); + } } - } - /* join runs that can be joined */ - for (p = tp->next; p != tp->member.para.next_para; p = p->next) { - assert(p->type != diStartRow); /* should have been deleted above */ - if (p->type == diRun) { - while (p->next->type == diRun && /* FIXME */ - ME_CanJoinRuns(&p->member.run, &p->next->member.run)) { - ME_JoinRuns(c->editor, p); - } + + /* join runs that can be joined */ + for (p = para_get_di( para )->next; p != para->next_para; p = p->next) + { + assert(p->type != diStartRow); /* should have been deleted above */ + if (p->type == diRun) + { + while (p->next->type == diRun && ME_CanJoinRuns( &p->member.run, &p->next->member.run )) + ME_JoinRuns( c->editor, p ); + } } - } } static HRESULT itemize_para( ME_Context *c, ME_DisplayItem *p ) @@ -825,103 +829,95 @@ static HRESULT shape_para( ME_Context *c, ME_DisplayItem *p ) return hr; } -static void ME_WrapTextParagraph( ME_TextEditor *editor, ME_Context *c, ME_DisplayItem *tp ) +static void ME_WrapTextParagraph( ME_TextEditor *editor, ME_Context *c, ME_Paragraph *para ) { ME_Run *run; ME_WrapContext wc; int border = 0; int linespace = 0; - PARAFORMAT2 *pFmt; - assert(tp->type == diParagraph); - if (!(tp->member.para.nFlags & MEPF_REWRAP)) { - return; - } - ME_PrepareParagraphForWrapping(editor, c, tp); + if (!(para->nFlags & MEPF_REWRAP)) return; + + ME_PrepareParagraphForWrapping( editor, c, para ); /* Calculate paragraph numbering label */ - para_num_init( c, &tp->member.para ); + para_num_init( c, para ); /* For now treating all non-password text as complex for better testing */ if (!c->editor->cPasswordMask /* && ScriptIsComplex( tp->member.para.text->szData, tp->member.para.text->nLen, SIC_COMPLEX ) == S_OK */) { - if (SUCCEEDED( itemize_para( c, tp ) )) - shape_para( c, tp ); + if (SUCCEEDED( itemize_para( c, para_get_di( para ) ) )) + shape_para( c, para_get_di( para ) ); } - pFmt = &tp->member.para.fmt; - wc.context = c; - wc.para = &tp->member.para; -/* wc.para_style = tp->member.para.style; */ + wc.para = para; wc.style = NULL; wc.nParaNumOffset = 0; - if (tp->member.para.nFlags & MEPF_ROWEND) { + if (para->nFlags & MEPF_ROWEND) wc.nFirstMargin = wc.nLeftMargin = wc.nRightMargin = 0; - } else { - int dxStartIndent = pFmt->dxStartIndent; - if (tp->member.para.pCell) { - dxStartIndent += ME_GetTableRowEnd(tp)->member.para.fmt.dxOffset; - } - wc.nLeftMargin = ME_twips2pointsX(c, dxStartIndent + pFmt->dxOffset); - wc.nFirstMargin = ME_twips2pointsX(c, dxStartIndent); - if (pFmt->wNumbering) + else + { + int dxStartIndent = para->fmt.dxStartIndent; + if (para->pCell) + dxStartIndent += ME_GetTableRowEnd( para_get_di( para ) )->member.para.fmt.dxOffset; + + wc.nLeftMargin = ME_twips2pointsX( c, dxStartIndent + para->fmt.dxOffset ); + wc.nFirstMargin = ME_twips2pointsX( c, dxStartIndent ); + if (para->fmt.wNumbering) { wc.nParaNumOffset = wc.nFirstMargin; - dxStartIndent = max( ME_twips2pointsX(c, pFmt->wNumberingTab), - tp->member.para.para_num.width ); + dxStartIndent = max( ME_twips2pointsX(c, para->fmt.wNumberingTab), + para->para_num.width ); wc.nFirstMargin += dxStartIndent; } - wc.nRightMargin = ME_twips2pointsX(c, pFmt->dxRightIndent); + wc.nRightMargin = ME_twips2pointsX( c, para->fmt.dxRightIndent ); - if (wc.nFirstMargin < 0) - wc.nFirstMargin = 0; - if (wc.nLeftMargin < 0) - wc.nLeftMargin = 0; + if (wc.nFirstMargin < 0) wc.nFirstMargin = 0; + if (wc.nLeftMargin < 0) wc.nLeftMargin = 0; } if (c->editor->bEmulateVersion10 && /* v1.0 - 3.0 */ - pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE) + para->fmt.dwMask & PFM_TABLE && para->fmt.wEffects & PFE_TABLE) { - wc.nFirstMargin += ME_twips2pointsX(c, pFmt->dxOffset * 2); + wc.nFirstMargin += ME_twips2pointsX( c, para->fmt.dxOffset * 2 ); } wc.nRow = 0; wc.pt.y = 0; - if (pFmt->dwMask & PFM_SPACEBEFORE) - wc.pt.y += ME_twips2pointsY(c, pFmt->dySpaceBefore); - if (!(pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE) && - pFmt->dwMask & PFM_BORDER) + if (para->fmt.dwMask & PFM_SPACEBEFORE) + wc.pt.y += ME_twips2pointsY( c, para->fmt.dySpaceBefore ); + if (!(para->fmt.dwMask & PFM_TABLE && para->fmt.wEffects & PFE_TABLE) && + para->fmt.dwMask & PFM_BORDER) { - border = ME_GetParaBorderWidth(c, tp->member.para.fmt.wBorders); - if (pFmt->wBorders & 1) { + border = ME_GetParaBorderWidth( c, para->fmt.wBorders ); + if (para->fmt.wBorders & 1) + { wc.nFirstMargin += border; wc.nLeftMargin += border; } - if (pFmt->wBorders & 2) - wc.nRightMargin -= border; - if (pFmt->wBorders & 4) - wc.pt.y += border; + if (para->fmt.wBorders & 2) wc.nRightMargin -= border; + if (para->fmt.wBorders & 4) wc.pt.y += border; } - linespace = ME_GetParaLineSpace(c, &tp->member.para); + linespace = ME_GetParaLineSpace( c, para ); - ME_BeginRow(&wc); - run = &ME_FindItemFwd( tp, diRun )->member.run; + ME_BeginRow( &wc ); + run = &ME_FindItemFwd( para_get_di( para ), diRun )->member.run; while (run) { run = ME_WrapHandleRun( &wc, run ); if (wc.nRow && run == wc.pRowStart) wc.pt.y += linespace; } ME_WrapEndParagraph( &wc ); - if (!(pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE) && - (pFmt->dwMask & PFM_BORDER) && (pFmt->wBorders & 8)) + if (!(para->fmt.dwMask & PFM_TABLE && para->fmt.wEffects & PFE_TABLE) && + (para->fmt.dwMask & PFM_BORDER) && (para->fmt.wBorders & 8)) wc.pt.y += border; - if (tp->member.para.fmt.dwMask & PFM_SPACEAFTER) - wc.pt.y += ME_twips2pointsY(c, pFmt->dySpaceAfter); + if (para->fmt.dwMask & PFM_SPACEAFTER) + wc.pt.y += ME_twips2pointsY( c, para->fmt.dySpaceAfter ); - tp->member.para.nFlags &= ~MEPF_REWRAP; - tp->member.para.nHeight = wc.pt.y; - tp->member.para.nRows = wc.nRow; + para->nFlags &= ~MEPF_REWRAP; + para->nHeight = wc.pt.y; + para->nRows = wc.nRow; editor->total_rows += wc.nRow; } @@ -1068,7 +1064,7 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) assert(item->type == diParagraph); prev_width = item->member.para.nWidth; - ME_WrapTextParagraph(editor, &c, item); + ME_WrapTextParagraph( editor, &c, &item->member.para ); if (prev_width == totalWidth && item->member.para.nWidth < totalWidth) totalWidth = get_total_width(editor); else

1 0