October 2020 - Wine-Commits

Zhiyi Zhang : user32/tests: Test changing to a valid depth but zero width and height display mode.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 2756cabbe43afcc1b10c2156765a5a5c12e8f721 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2756cabbe43afcc1b10c2156… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Oct 27 14:59:34 2020 +0800 user32/tests: Test changing to a valid depth but zero width and height display mode. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 119 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 0ce27455a66..d7d9086672d 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -323,6 +323,7 @@ static void test_ChangeDisplaySettingsEx(void) { static const DWORD registry_fields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY | DM_POSITION; + static const DWORD depths[] = {8, 16, 32}; DPI_AWARENESS_CONTEXT context = NULL; UINT primary, device, test, mode; UINT device_size, device_count; @@ -600,9 +601,127 @@ static void test_ChangeDisplaySettingsEx(void) ok(count == old_count, "Expect monitor count %d, got %d\n", old_count, count); } + /* Test changing to a mode with depth set but with zero width and height */ + /* This test is only ran for non-primary adapters for now as it may detach the adapters on Wine */ + for (device = 1; device < device_count; ++device) + { + for (test = 0; test < ARRAY_SIZE(depths); ++test) + { + /* Find the native resolution */ + memset(&dm, 0, sizeof(dm)); + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode = 0; EnumDisplaySettingsExA(devices[device].name, mode, &dm2, 0); ++mode) + { + if (dm2.dmBitsPerPel == depths[test] + && dm2.dmPelsWidth > dm.dmPelsWidth && dm2.dmPelsHeight > dm.dmPelsHeight) + dm = dm2; + } + if (dm.dmBitsPerPel != depths[test]) + { + skip("Depth %u is unsupported for %s.\n", depths[test], devices[device].name); + continue; + } + + /* Find the second resolution */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode = 0; EnumDisplaySettingsExA(devices[device].name, mode, &dm2, 0); ++mode) + { + if (dm2.dmBitsPerPel == depths[test] + && dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight) + break; + } + if (dm2.dmBitsPerPel != depths[test] + || dm2.dmPelsWidth == dm.dmPelsWidth || dm2.dmPelsHeight == dm.dmPelsHeight) + { + skip("Failed to find the second mode for %s.\n", devices[device].name); + continue; + } + + /* Find the third resolution */ + memset(&dm3, 0, sizeof(dm3)); + dm3.dmSize = sizeof(dm3); + for (mode = 0; EnumDisplaySettingsExA(devices[device].name, mode, &dm3, 0); ++mode) + { + if (dm3.dmBitsPerPel == depths[test] + && dm3.dmPelsWidth != dm.dmPelsWidth && dm3.dmPelsHeight != dm.dmPelsHeight + && dm3.dmPelsWidth != dm2.dmPelsWidth && dm3.dmPelsHeight != dm2.dmPelsHeight) + break; + } + if (dm3.dmBitsPerPel != depths[test] + || dm3.dmPelsWidth == dm.dmPelsWidth || dm3.dmPelsHeight == dm.dmPelsHeight + || dm3.dmPelsWidth == dm2.dmPelsWidth || dm3.dmPelsHeight == dm2.dmPelsHeight) + { + skip("Failed to find the third mode for %s.\n", devices[device].name); + continue; + } + + /* Change the current mode to the third mode first */ + res = ChangeDisplaySettingsExA(devices[device].name, &dm3, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL + || broken(res == DISP_CHANGE_FAILED), /* Win8 TestBots */ + "ChangeDisplaySettingsExA %s returned unexpected %d.\n", devices[device].name, res); + if (res != DISP_CHANGE_SUCCESSFUL) + { + win_skip("Failed to change display mode for %s.\n", devices[device].name); + continue; + } + flush_events(); + expect_dm(dm3, devices[device].name, test); + + /* Change the registry mode to the second mode */ + res = ChangeDisplaySettingsExA(devices[device].name, &dm2, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL + || broken(res == DISP_CHANGE_BADFLAGS), /* Win10 32bit */ + "ChangeDisplaySettingsExA %s returned unexpected %d.\n", devices[device].name, res); + + /* Change to a mode with depth set but with zero width and height */ + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + dm.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; + dm.dmBitsPerPel = depths[test]; + res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + devices[device].name, res); + flush_events(); + + dd.cb = sizeof(dd); + res = EnumDisplayDevicesA(NULL, devices[device].index, &dd, 0); + ok(res, "EnumDisplayDevicesA %s failed, error %#x.\n", devices[device].name, GetLastError()); + todo_wine ok(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP, "Expect %s attached.\n", + devices[device].name); + if (!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + continue; + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + res = EnumDisplaySettingsA(devices[device].name, ENUM_CURRENT_SETTINGS, &dm); + ok(res, "Device %s EnumDisplaySettingsA failed, error %#x.\n", devices[device].name, GetLastError()); + todo_wine_if(depths[test] != 32) + ok(dm.dmBitsPerPel == depths[test], "Device %s expect dmBitsPerPel %u, got %u.\n", + devices[device].name, depths[test], dm.dmBitsPerPel); + /* 2008 resets to the resolution in the registry. Newer versions of Windows doesn't + * change the current resolution */ + ok(dm.dmPelsWidth == dm3.dmPelsWidth || broken(dm.dmPelsWidth == dm2.dmPelsWidth), + "Device %s expect dmPelsWidth %u, got %u.\n", + devices[device].name, dm3.dmPelsWidth, dm.dmPelsWidth); + ok(dm.dmPelsHeight == dm3.dmPelsHeight || broken(dm.dmPelsHeight == dm2.dmPelsHeight), + "Device %s expect dmPelsHeight %u, got %u.\n", + devices[device].name, dm3.dmPelsHeight, dm.dmPelsHeight); + } + } + /* Detach all non-primary adapters to avoid position conflicts */ for (device = 1; device < device_count; ++device) { + dd.cb = sizeof(dd); + res = EnumDisplayDevicesA(NULL, devices[device].index, &dd, 0); + ok(res, "EnumDisplayDevicesA %s failed, error %#x.\n", devices[device].name, GetLastError()); + /* Already detached by previous tests */ + if (!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + continue; + old_count = GetSystemMetrics(SM_CMONITORS); memset(&dm, 0, sizeof(dm));

1 0

Zhiyi Zhang : user32: Use current width or height if a mode specifies zero width or height for ChangeDisplaySettingsExW().
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: e6b2da317350547f6d6cb6b8f52831428cf84cc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6b2da317350547f6d6cb6b8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Oct 27 15:00:47 2020 +0800 user32: Use current width or height if a mode specifies zero width or height for ChangeDisplaySettingsExW(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 16 ++++++++++++++++ dlls/user32/tests/monitor.c | 16 +++------------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index d4640e0068e..1381f387e03 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3182,6 +3182,22 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND return DISP_CHANGE_BADMODE; } + if (!is_detached_mode(devmode) && (!devmode->dmPelsWidth || !devmode->dmPelsHeight)) + { + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + if (!EnumDisplaySettingsExW(devname, ENUM_CURRENT_SETTINGS, &dm, 0)) + { + ERR("Current mode not found!\n"); + return DISP_CHANGE_BADMODE; + } + + if (!devmode->dmPelsWidth) + devmode->dmPelsWidth = dm.dmPelsWidth; + if (!devmode->dmPelsHeight) + devmode->dmPelsHeight = dm.dmPelsHeight; + } + ret = USER_Driver->pChangeDisplaySettingsEx(devname, devmode, hwnd, flags, lparam); if (ret != DISP_CHANGE_SUCCESSFUL) ERR("Changing %s display settings returned %d.\n", wine_dbgstr_w(devname), ret); diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index d7d9086672d..009fc0d626e 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -602,8 +602,7 @@ static void test_ChangeDisplaySettingsEx(void) } /* Test changing to a mode with depth set but with zero width and height */ - /* This test is only ran for non-primary adapters for now as it may detach the adapters on Wine */ - for (device = 1; device < device_count; ++device) + for (device = 0; device < device_count; ++device) { for (test = 0; test < ARRAY_SIZE(depths); ++test) { @@ -689,10 +688,8 @@ static void test_ChangeDisplaySettingsEx(void) dd.cb = sizeof(dd); res = EnumDisplayDevicesA(NULL, devices[device].index, &dd, 0); ok(res, "EnumDisplayDevicesA %s failed, error %#x.\n", devices[device].name, GetLastError()); - todo_wine ok(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP, "Expect %s attached.\n", - devices[device].name); - if (!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) - continue; + ok(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP, "Expect %s attached.\n", + devices[device].name); memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); @@ -715,13 +712,6 @@ static void test_ChangeDisplaySettingsEx(void) /* Detach all non-primary adapters to avoid position conflicts */ for (device = 1; device < device_count; ++device) { - dd.cb = sizeof(dd); - res = EnumDisplayDevicesA(NULL, devices[device].index, &dd, 0); - ok(res, "EnumDisplayDevicesA %s failed, error %#x.\n", devices[device].name, GetLastError()); - /* Already detached by previous tests */ - if (!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) - continue; - old_count = GetSystemMetrics(SM_CMONITORS); memset(&dm, 0, sizeof(dm));

1 0

Alexandre Julliard : gdi32: Move the loading of filesystem fonts out of freetype.c.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 7b291a094d20e315d44ae88a09529581556fd9d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b291a094d20e315d44ae88a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 10:27:32 2020 +0100 gdi32: Move the loading of filesystem fonts out of freetype.c. The fonts Path value now expects DOS paths. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 68 ++++++++++++++++++++++++++++++++++---------- dlls/gdi32/freetype.c | 73 ++---------------------------------------------- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 58 insertions(+), 85 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 3718d73f871..4e1c69d886e 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -359,36 +359,26 @@ CRITICAL_SECTION font_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; #define WINE_FONT_DIR "fonts" #endif -void get_font_dir( WCHAR *path ) +static void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) { - static const WCHAR slashW[] = {'\\',0}; - static const WCHAR fontsW[] = {'\\','f','o','n','t','s',0}; + static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\\',0}; static const WCHAR winedatadirW[] = {'W','I','N','E','D','A','T','A','D','I','R',0}; static const WCHAR winebuilddirW[] = {'W','I','N','E','B','U','I','L','D','D','I','R',0}; if (GetEnvironmentVariableW( winedatadirW, path, MAX_PATH )) { - const char fontdir[] = WINE_FONT_DIR; - strcatW( path, slashW ); + const char fontdir[] = "\\" WINE_FONT_DIR "\\"; MultiByteToWideChar( CP_ACP, 0, fontdir, -1, path + strlenW(path), MAX_PATH - strlenW(path) ); } else if (GetEnvironmentVariableW( winebuilddirW, path, MAX_PATH )) { strcatW( path, fontsW ); } + strcatW( path, file ); if (path[5] == ':') memmove( path, path + 4, (strlenW(path) - 3) * sizeof(WCHAR) ); else path[1] = '\\'; /* change \??\ to \\?\ */ } -static void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) -{ - static const WCHAR slashW[] = {'\\',0}; - - get_font_dir( path ); - strcatW( path, slashW ); - strcatW( path, file ); -} - static void get_fonts_win_dir_path( const WCHAR *file, WCHAR *path ) { static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\\',0}; @@ -5402,6 +5392,56 @@ void load_system_bitmap_fonts(void) RegCloseKey( hkey ); } +static void load_directory_fonts( WCHAR *path, UINT flags ) +{ + HANDLE handle; + WIN32_FIND_DATAW data; + WCHAR *p; + + p = path + strlenW(path) - 1; + TRACE( "loading fonts from %s\n", debugstr_w(path) ); + handle = FindFirstFileW( path, &data ); + if (handle == INVALID_HANDLE_VALUE) return; + do + { + if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) continue; + strcpyW( p, data.cFileName ); + font_funcs->add_font( path, flags ); + } while (FindNextFileW( handle, &data )); + FindClose( handle ); +} + +void load_file_system_fonts(void) +{ + static const WCHAR pathW[] = {'P','a','t','h',0}; + static const WCHAR slashstarW[] = {'\\','*',0}; + static const WCHAR starW[] = {'*',0}; + WCHAR *ptr, *next, path[MAX_PATH], value[1024]; + DWORD len = ARRAY_SIZE(value); + + /* Windows directory */ + get_fonts_win_dir_path( starW, path ); + load_directory_fonts( path, ADDFONT_ADD_TO_CACHE ); + + /* Wine data directory */ + get_fonts_data_dir_path( starW, path ); + load_directory_fonts( path, ADDFONT_ADD_TO_CACHE | ADDFONT_EXTERNAL_FONT ); + + /* custom paths */ + /* @@ Wine registry key: HKCU\Software\Wine\Fonts */ + if (!RegQueryValueExW( wine_fonts_key, pathW, NULL, NULL, (BYTE *)value, &len )) + { + for (ptr = value; ptr; ptr = next) + { + if ((next = strchrW( ptr, ';' ))) *next++ = 0; + if (next && next - ptr < 2) continue; + lstrcpynW( path, ptr, MAX_PATH - 2 ); + strcatW( path, slashstarW ); + load_directory_fonts( path, ADDFONT_ADD_TO_CACHE | ADDFONT_EXTERNAL_FONT ); + } + } +} + void load_registry_fonts(void) { static const WCHAR dot_fonW[] = {'.','f','o','n',0}; diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ee628a08304..0a5f5af491b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -329,7 +329,6 @@ static struct list font_list = LIST_INIT(font_list); static const struct font_backend_funcs font_funcs; -static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\0'}; static const WCHAR win9x_font_reg_key[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', @@ -2545,6 +2544,7 @@ skip_internal: list_add_tail(&system_links, &system_font_link->entry); } +#ifdef __ANDROID__ static BOOL ReadFontDir(const char *dirname, BOOL external_fonts) { DIR *dir; @@ -2585,16 +2585,7 @@ static BOOL ReadFontDir(const char *dirname, BOOL external_fonts) closedir(dir); return TRUE; } - -static void read_font_dir( const WCHAR *dirname, BOOL external_fonts ) -{ - char *unixname = wine_get_unix_file_name( dirname ); - if (unixname) - { - ReadFontDir( unixname, external_fonts ); - HeapFree( GetProcessHeap(), 0, unixname ); - } -} +#endif #ifdef SONAME_LIBFONTCONFIG @@ -3407,24 +3398,9 @@ sym_not_found: static void init_font_list(void) { - static const WCHAR pathW[] = {'P','a','t','h',0}; - HKEY hkey; - WCHAR path[MAX_PATH]; - char *unixname; - delete_external_font_keys(); - load_system_bitmap_fonts(); - - /* load in the fonts from %WINDOWSDIR%\\Fonts first of all */ - GetWindowsDirectoryW(path, ARRAY_SIZE(path)); - strcatW(path, fontsW); - read_font_dir( path, FALSE ); - - /* load the wine fonts */ - get_font_dir( path ); - read_font_dir( path, TRUE ); - + load_file_system_fonts(); load_registry_fonts(); #ifdef SONAME_LIBFONTCONFIG @@ -3434,49 +3410,6 @@ static void init_font_list(void) #elif defined(__ANDROID__) ReadFontDir("/system/fonts", TRUE); #endif - - /* then look in any directories that we've specified in the config file */ - /* @@ Wine registry key: HKCU\Software\Wine\Fonts */ - if(RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Fonts", &hkey) == ERROR_SUCCESS) - { - DWORD len; - LPWSTR valueW; - LPSTR valueA, ptr; - - if (RegQueryValueExW( hkey, pathW, NULL, NULL, NULL, &len ) == ERROR_SUCCESS) - { - len += sizeof(WCHAR); - valueW = HeapAlloc( GetProcessHeap(), 0, len ); - if (RegQueryValueExW( hkey, pathW, NULL, NULL, (LPBYTE)valueW, &len ) == ERROR_SUCCESS) - { - len = WideCharToMultiByte( CP_UNIXCP, 0, valueW, -1, NULL, 0, NULL, NULL ); - valueA = HeapAlloc( GetProcessHeap(), 0, len ); - WideCharToMultiByte( CP_UNIXCP, 0, valueW, -1, valueA, len, NULL, NULL ); - TRACE( "got font path %s\n", debugstr_a(valueA) ); - ptr = valueA; - while (ptr) - { - const char* home; - LPSTR next = strchr( ptr, ':' ); - if (next) *next++ = 0; - if (ptr[0] == '~' && ptr[1] == '/' && (home = getenv( "HOME" )) && - (unixname = HeapAlloc( GetProcessHeap(), 0, strlen(ptr) + strlen(home) ))) - { - strcpy( unixname, home ); - strcat( unixname, ptr + 1 ); - ReadFontDir( unixname, TRUE ); - HeapFree( GetProcessHeap(), 0, unixname ); - } - else - ReadFontDir( ptr, TRUE ); - ptr = next; - } - HeapFree( GetProcessHeap(), 0, valueA ); - } - HeapFree( GetProcessHeap(), 0, valueW ); - } - RegCloseKey(hkey); - } } static BOOL move_to_front(const WCHAR *name) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 080f53c1b61..aa6e6ddcaa9 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -389,8 +389,8 @@ struct font_backend_funcs void (CDECL *destroy_font)( struct gdi_font *font ); }; -extern void get_font_dir( WCHAR *path ) DECLSPEC_HIDDEN; extern void load_system_bitmap_fonts(void) DECLSPEC_HIDDEN; +extern void load_file_system_fonts(void) DECLSPEC_HIDDEN; extern void load_registry_fonts(void) DECLSPEC_HIDDEN; extern struct gdi_font *alloc_gdi_font( const WCHAR *file, void *data_ptr, SIZE_T data_size ) DECLSPEC_HIDDEN;

1 0

Huw Davies : riched20: Use row and para helpers in the extend selection function.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 245b9231c555a989138b3c97c6bef68f68973320 URL: https://source.winehq.org/git/wine.git/?a=commit;h=245b9231c555a989138b3c97… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 08:23:26 2020 +0000 riched20: Use row and para helpers in the extend selection function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 58 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 834f9fd3afe..d92b93ac2f0 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1044,37 +1044,53 @@ static void ME_ExtendAnchorSelection(ME_TextEditor *editor) { /* Extend the left side of selection */ editor->pCursors[1] = tmp_cursor; - if (editor->nSelectionType == stWord) + switch (editor->nSelectionType) + { + case stWord: ME_MoveCursorWords(editor, &editor->pCursors[1], -1); - else + break; + + case stLine: { - ME_DisplayItem *pItem; - ME_DIType searchType = ((editor->nSelectionType == stLine) ? - diStartRowOrParagraph:diParagraph); - pItem = ME_FindItemBack(editor->pCursors[1].pRun, searchType); - editor->pCursors[1].pRun = ME_FindItemFwd(pItem, diRun); - editor->pCursors[1].pPara = ME_GetParagraph(editor->pCursors[1].pRun); + ME_Row *row = row_from_cursor( editor->pCursors + 1 ); + row_first_cursor( row, editor->pCursors + 1 ); + break; + } + + case stParagraph: + editor->pCursors[1].pRun = run_get_di( para_first_run( &editor->pCursors[1].pPara->member.para ) ); editor->pCursors[1].nOffset = 0; + break; + + default: + break; } } else if (curOfs >= anchorEndOfs) { /* Extend the right side of selection */ editor->pCursors[0] = tmp_cursor; - if (editor->nSelectionType == stWord) - ME_MoveCursorWords(editor, &editor->pCursors[0], +1); - else + switch (editor->nSelectionType) { - ME_DisplayItem *pItem; - ME_DIType searchType = ((editor->nSelectionType == stLine) ? - diStartRowOrParagraphOrEnd:diParagraphOrEnd); - pItem = ME_FindItemFwd(editor->pCursors[0].pRun, searchType); - if (pItem->type == diTextEnd) - editor->pCursors[0].pRun = ME_FindItemBack(pItem, diRun); - else - editor->pCursors[0].pRun = ME_FindItemFwd(pItem, diRun); - editor->pCursors[0].pPara = ME_GetParagraph(editor->pCursors[0].pRun); - editor->pCursors[0].nOffset = 0; + case stWord: + ME_MoveCursorWords( editor, &editor->pCursors[0], +1 ); + break; + + case stLine: + { + ME_Row *row = row_from_cursor( editor->pCursors ); + row_end_cursor( row, editor->pCursors, TRUE ); + break; + } + + case stParagraph: + editor->pCursors[0].pRun = run_get_di( para_end_run( &editor->pCursors[0].pPara->member.para ) ); + editor->pCursors[0].pPara = para_get_di( editor->pCursors[0].pRun->member.run.para ); + editor->pCursors[0].nOffset = editor->pCursors[0].pRun->member.run.len; + break; + + default: + break; } } }

1 0

Alexandre Julliard : gdi32: Move the loading of registry fonts out of freetype.c.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 2c1a42bc675425f9820f05752a9904268a8a610c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c1a42bc675425f9820f0575… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 10:27:20 2020 +0100 gdi32: Move the loading of registry fonts out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 49 ++++++++++++++++++++++++++++++++++++++++++-- dlls/gdi32/freetype.c | 53 +----------------------------------------------- dlls/gdi32/gdi_private.h | 3 +-- 3 files changed, 49 insertions(+), 56 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d4ed29d7fd9..3718d73f871 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -109,6 +109,11 @@ static inline INT INTERNAL_YWSTODS(DC *dc, INT height) return pt[1].y - pt[0].y; } +static inline BOOL is_win9x(void) +{ + return GetVersion() & 0x80000000; +} + static inline WCHAR *strdupW( const WCHAR *p ) { WCHAR *ret; @@ -375,7 +380,7 @@ void get_font_dir( WCHAR *path ) else path[1] = '\\'; /* change \??\ to \\?\ */ } -void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) +static void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) { static const WCHAR slashW[] = {'\\',0}; @@ -384,7 +389,7 @@ void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) strcatW( path, file ); } -void get_fonts_win_dir_path( const WCHAR *file, WCHAR *path ) +static void get_fonts_win_dir_path( const WCHAR *file, WCHAR *path ) { static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\\',0}; @@ -5397,6 +5402,46 @@ void load_system_bitmap_fonts(void) RegCloseKey( hkey ); } +void load_registry_fonts(void) +{ + static const WCHAR dot_fonW[] = {'.','f','o','n',0}; + static const WCHAR win9x_key[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'F','o','n','t','s',0}; + static const WCHAR winnt_key[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'F','o','n','t','s',0}; + WCHAR value[MAX_PATH], data[MAX_PATH]; + DWORD i = 0, type, dlen, vlen; + HKEY hkey; + + /* Look under HKLM\Software\Microsoft\Windows[ NT]\CurrentVersion\Fonts + for any fonts not installed in %WINDOWSDIR%\Fonts. They will have their + full path as the entry. Also look for any .fon fonts, since ReadFontDir + will skip these. */ + if (RegOpenKeyW( HKEY_LOCAL_MACHINE, is_win9x() ? win9x_key : winnt_key, &hkey )) + return; + + vlen = ARRAY_SIZE(value); + dlen = sizeof(data); + while (!RegEnumValueW( hkey, i++, value, &vlen, NULL, &type, (LPBYTE)data, &dlen )) + { + dlen /= sizeof(WCHAR); + if (data[0] && data[1] == ':') + add_font_resource( data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); + else if (dlen >= 6 && !strcmpiW( data + dlen - 5, dot_fonW )) + add_system_font_resource( data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); + + vlen = ARRAY_SIZE(value); + dlen = sizeof(data); + } + RegCloseKey( hkey ); +} + /*********************************************************************** * AddFontResourceExW (GDI32.@) */ diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 0a05f6a701c..ee628a08304 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -768,10 +768,6 @@ static char **expand_mac_font(const char *path) #endif /* HAVE_CARBON_CARBON_H */ -static inline BOOL is_win9x(void) -{ - return GetVersion() & 0x80000000; -} /* This function builds an FT_Fixed from a double. It fails if the absolute value of the float number is greater than 32768. @@ -3411,10 +3407,8 @@ sym_not_found: static void init_font_list(void) { - static const WCHAR dot_fonW[] = {'.','f','o','n','\0'}; static const WCHAR pathW[] = {'P','a','t','h',0}; HKEY hkey; - DWORD valuelen, datalen, i = 0, type, dlen, vlen; WCHAR path[MAX_PATH]; char *unixname; @@ -3431,52 +3425,7 @@ static void init_font_list(void) get_font_dir( path ); read_font_dir( path, TRUE ); - /* now look under HKLM\Software\Microsoft\Windows[ NT]\CurrentVersion\Fonts - for any fonts not installed in %WINDOWSDIR%\Fonts. They will have their - full path as the entry. Also look for any .fon fonts, since ReadFontDir - will skip these. */ - if(RegOpenKeyW(HKEY_LOCAL_MACHINE, - is_win9x() ? win9x_font_reg_key : winnt_font_reg_key, - &hkey) == ERROR_SUCCESS) - { - LPWSTR data, valueW; - RegQueryInfoKeyW(hkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - &valuelen, &datalen, NULL, NULL); - - valuelen++; /* returned value doesn't include room for '\0' */ - valueW = HeapAlloc(GetProcessHeap(), 0, valuelen * sizeof(WCHAR)); - data = HeapAlloc(GetProcessHeap(), 0, datalen * sizeof(WCHAR)); - if (valueW && data) - { - dlen = datalen * sizeof(WCHAR); - vlen = valuelen; - while(RegEnumValueW(hkey, i++, valueW, &vlen, NULL, &type, (LPBYTE)data, - &dlen) == ERROR_SUCCESS) - { - if(data[0] && (data[1] == ':')) - { - freetype_add_font( data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE); - } - else if(dlen / 2 >= 6 && !strcmpiW(data + dlen / 2 - 5, dot_fonW)) - { - WCHAR pathW[MAX_PATH]; - - get_fonts_win_dir_path( data, pathW ); - if (!freetype_add_font( pathW, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE )) - { - get_fonts_data_dir_path( data, pathW ); - freetype_add_font( pathW, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); - } - } - /* reset dlen and vlen */ - dlen = datalen; - vlen = valuelen; - } - } - HeapFree(GetProcessHeap(), 0, data); - HeapFree(GetProcessHeap(), 0, valueW); - RegCloseKey(hkey); - } + load_registry_fonts(); #ifdef SONAME_LIBFONTCONFIG load_fontconfig_fonts(); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 5c4da5d629d..080f53c1b61 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -390,9 +390,8 @@ struct font_backend_funcs }; extern void get_font_dir( WCHAR *path ) DECLSPEC_HIDDEN; -extern void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) DECLSPEC_HIDDEN; -extern void get_fonts_win_dir_path( const WCHAR *file, WCHAR *path ) DECLSPEC_HIDDEN; extern void load_system_bitmap_fonts(void) DECLSPEC_HIDDEN; +extern void load_registry_fonts(void) DECLSPEC_HIDDEN; extern struct gdi_font *alloc_gdi_font( const WCHAR *file, void *data_ptr, SIZE_T data_size ) DECLSPEC_HIDDEN; extern void free_gdi_font( struct gdi_font *font ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Move the loading of system fonts out of freetype.c.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 131d3b1f5d371257af90593f79d1753d6d53e533 URL: https://source.winehq.org/git/wine.git/?a=commit;h=131d3b1f5d371257af90593f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 10:27:06 2020 +0100 gdi32: Move the loading of system fonts out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 22 ++++++++++++++++++++++ dlls/gdi32/freetype.c | 39 +-------------------------------------- dlls/gdi32/gdi_private.h | 1 + 3 files changed, 24 insertions(+), 38 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index af87c66498f..d4ed29d7fd9 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5375,6 +5375,28 @@ static BOOL remove_font_resource( LPCWSTR file, DWORD flags ) return ret; } +void load_system_bitmap_fonts(void) +{ + static const WCHAR keyW[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s',0}; + static const WCHAR fontsW[] = {'F','O','N','T','S','.','F','O','N',0}; + static const WCHAR oemfontW[] = {'O','E','M','F','O','N','T','.','F','O','N',0}; + static const WCHAR fixedfonW[] = {'F','I','X','E','D','F','O','N','.','F','O','N',0}; + static const WCHAR * const fonts[] = { fontsW, oemfontW, fixedfonW }; + + HKEY hkey; + WCHAR data[MAX_PATH]; + DWORD i, dlen, type; + + if (RegOpenKeyW( HKEY_CURRENT_CONFIG, keyW, &hkey )) return; + for (i = 0; i < ARRAY_SIZE(fonts); i++) + { + dlen = sizeof(data); + if (!RegQueryValueExW( hkey, fonts[i], 0, &type, (BYTE *)data, &dlen ) && type == REG_SZ) + add_system_font_resource( data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); + } + RegCloseKey( hkey ); +} + /*********************************************************************** * AddFontResourceExW (GDI32.@) */ diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9ed6077443f..0a05f6a701c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -340,18 +340,6 @@ static const WCHAR winnt_font_reg_key[] = {'S','o','f','t','w','a','r','e','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'F','o','n','t','s','\0'}; -static const WCHAR system_fonts_reg_key[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s','\0'}; -static const WCHAR FixedSys_Value[] = {'F','I','X','E','D','F','O','N','.','F','O','N','\0'}; -static const WCHAR System_Value[] = {'F','O','N','T','S','.','F','O','N','\0'}; -static const WCHAR OEMFont_Value[] = {'O','E','M','F','O','N','T','.','F','O','N','\0'}; - -static const WCHAR * const SystemFontValues[] = { - System_Value, - OEMFont_Value, - FixedSys_Value, - NULL -}; - static const WCHAR external_fonts_reg_key[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', 'F','o','n','t','s','\\','E','x','t','e','r','n','a','l',' ','F','o','n','t','s','\0'}; @@ -2861,30 +2849,6 @@ static void load_mac_fonts(void) #endif -static void load_system_fonts(void) -{ - HKEY hkey; - WCHAR data[MAX_PATH], pathW[MAX_PATH]; - const WCHAR * const *value; - DWORD dlen, type; - - if(RegOpenKeyW(HKEY_CURRENT_CONFIG, system_fonts_reg_key, &hkey) == ERROR_SUCCESS) { - for(value = SystemFontValues; *value; value++) { - dlen = sizeof(data); - if(RegQueryValueExW(hkey, *value, 0, &type, (void*)data, &dlen) == ERROR_SUCCESS && - type == REG_SZ) { - get_fonts_win_dir_path( data, pathW ); - if (!freetype_add_font( pathW, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE )) - { - get_fonts_data_dir_path( data, pathW ); - freetype_add_font( pathW, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); - } - } - } - RegCloseKey(hkey); - } -} - static WCHAR *get_full_path_name(const WCHAR *name) { WCHAR *full_path; @@ -3456,8 +3420,7 @@ static void init_font_list(void) delete_external_font_keys(); - /* load the system bitmap fonts */ - load_system_fonts(); + load_system_bitmap_fonts(); /* load in the fonts from %WINDOWSDIR%\\Fonts first of all */ GetWindowsDirectoryW(path, ARRAY_SIZE(path)); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 32cdace5c7d..5c4da5d629d 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -392,6 +392,7 @@ struct font_backend_funcs extern void get_font_dir( WCHAR *path ) DECLSPEC_HIDDEN; extern void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) DECLSPEC_HIDDEN; extern void get_fonts_win_dir_path( const WCHAR *file, WCHAR *path ) DECLSPEC_HIDDEN; +extern void load_system_bitmap_fonts(void) DECLSPEC_HIDDEN; extern struct gdi_font *alloc_gdi_font( const WCHAR *file, void *data_ptr, SIZE_T data_size ) DECLSPEC_HIDDEN; extern void free_gdi_font( struct gdi_font *font ) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : ntdll: Don't check "info" for NULL in NtQuerySystemInformation(SystemModuleInformation).
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 6257da8b429e251637d32608f92c934c2e91ad5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6257da8b429e251637d32608… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 26 18:40:06 2020 -0500 ntdll: Don't check "info" for NULL in NtQuerySystemInformation(SystemModuleInformation). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 6ff277c2d0c..7ac084a9899 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2333,30 +2333,27 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, "\\SystemRoot\\system32\\drivers\\mountmgr.sys" }; - if (!info) ret = STATUS_ACCESS_VIOLATION; - else - { - ULONG i; - SYSTEM_MODULE_INFORMATION *smi = info; + ULONG i; + SYSTEM_MODULE_INFORMATION *smi = info; - len = offsetof( SYSTEM_MODULE_INFORMATION, Modules[ARRAY_SIZE(fake_modules)] ); - if (len <= size) + len = offsetof( SYSTEM_MODULE_INFORMATION, Modules[ARRAY_SIZE(fake_modules)] ); + if (len <= size) + { + memset( smi, 0, len ); + for (i = 0; i < ARRAY_SIZE(fake_modules); i++) { - memset( smi, 0, len ); - for (i = 0; i < ARRAY_SIZE(fake_modules); i++) - { - SYSTEM_MODULE *sm = &smi->Modules[i]; - sm->ImageBaseAddress = (char *)0x10000000 + 0x200000 * i; - sm->ImageSize = 0x200000; - sm->LoadOrderIndex = i; - sm->LoadCount = 1; - strcpy( (char *)sm->Name, fake_modules[i] ); - sm->NameOffset = strrchr( fake_modules[i], '\\' ) - fake_modules[i] + 1; - } - smi->ModulesCount = i; + SYSTEM_MODULE *sm = &smi->Modules[i]; + sm->ImageBaseAddress = (char *)0x10000000 + 0x200000 * i; + sm->ImageSize = 0x200000; + sm->LoadOrderIndex = i; + sm->LoadCount = 1; + strcpy( (char *)sm->Name, fake_modules[i] ); + sm->NameOffset = strrchr( fake_modules[i], '\\' ) - fake_modules[i] + 1; } - else ret = STATUS_INFO_LENGTH_MISMATCH; + smi->ModulesCount = i; } + else ret = STATUS_INFO_LENGTH_MISMATCH; + break; }

1 0

Huw Davies : riched20: Use a row ptr in the run drawing function.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 30ad0b936a96c403db6476ba45f2f455b613df3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=30ad0b936a96c403db6476ba… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 08:23:28 2020 +0000 riched20: Use a row ptr in the run drawing function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 2 +- dlls/riched20/paint.c | 41 +++++++++++++++++++++-------------------- dlls/riched20/richole.c | 2 +- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index f4484f57d39..ba1e5c169ff 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -264,7 +264,7 @@ int ME_GetParaBorderWidth(const ME_Context *c, int flags) DECLSPEC_HIDDEN; /* richole.c */ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *ppvObj) DECLSPEC_HIDDEN; -void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run* run, BOOL selected) DECLSPEC_HIDDEN; +void draw_ole( ME_Context *c, int x, int y, ME_Run* run, BOOL selected ) DECLSPEC_HIDDEN; void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) DECLSPEC_HIDDEN; void ME_CopyReObject(REOBJECT *dst, const REOBJECT *src, DWORD flags) DECLSPEC_HIDDEN; void ME_DeleteReObject(struct re_object *re_object) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 42f370c857c..0c37fc7c707 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -359,8 +359,8 @@ static void draw_text( ME_Context *c, ME_Run *run, int x, int y, BOOL selected, } -static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, - int nSelFrom, int nSelTo, int ymin, int cy) +static void draw_text_with_style( ME_Context *c, ME_Run *run, int x, int y, + int nSelFrom, int nSelTo, int ymin, int cy ) { HDC hDC = c->hDC; int yOffset = 0; @@ -434,16 +434,16 @@ static void ME_DebugWrite(HDC hDC, const POINT *pt, LPCWSTR szText) { SetTextColor(hDC, color); } -static void ME_DrawRun( ME_Context *c, int x, int y, ME_Run *run, ME_Paragraph *para ) +static void draw_run( ME_Context *c, int x, int y, ME_Cursor *cursor ) { - ME_DisplayItem *start; - int runofs = run->nCharOfs+para->nCharOfs; + ME_Row *row; + ME_Run *run = &cursor->pRun->member.run; + int runofs = run_char_ofs( run, cursor->nOffset ); int nSelFrom, nSelTo; - if (run->nFlags & MERF_HIDDEN) - return; + if (run->nFlags & MERF_HIDDEN) return; - start = ME_FindItemBack( run_get_di( run ), diStartRow ); + row = row_from_cursor( cursor ); ME_GetSelectionOfs(c->editor, &nSelFrom, &nSelTo); /* Draw selected end-of-paragraph mark */ @@ -452,8 +452,7 @@ static void ME_DrawRun( ME_Context *c, int x, int y, ME_Run *run, ME_Paragraph * if (runofs >= nSelFrom && runofs < nSelTo) { draw_space( c, run, x, y, TRUE, FALSE, - c->pt.y + para->pt.y + start->member.row.pt.y, - start->member.row.nHeight ); + c->pt.y + run->para->pt.y + row->pt.y, row->nHeight ); } return; } @@ -463,19 +462,15 @@ static void ME_DrawRun( ME_Context *c, int x, int y, ME_Run *run, ME_Paragraph * BOOL selected = runofs >= nSelFrom && runofs < nSelTo; draw_space( c, run, x, y, selected, TRUE, - c->pt.y + para->pt.y + start->member.row.pt.y, - start->member.row.nHeight ); + c->pt.y + run->para->pt.y + row->pt.y, row->nHeight ); return; } if (run->nFlags & MERF_GRAPHICS) - ME_DrawOLE(c, x, y, run, (runofs >= nSelFrom) && (runofs < nSelTo)); + draw_ole( c, x, y, run, (runofs >= nSelFrom) && (runofs < nSelTo) ); else - { - ME_DrawTextWithStyle(c, run, x, y, nSelFrom - runofs, nSelTo - runofs, - c->pt.y + para->pt.y + start->member.row.pt.y, - start->member.row.nHeight); - } + draw_text_with_style( c, run, x, y, nSelFrom - runofs, nSelTo - runofs, + c->pt.y + run->para->pt.y + row->pt.y, row->nHeight ); } /* The documented widths are in points (72 dpi), but converting them to @@ -1001,8 +996,14 @@ static void draw_paragraph( ME_Context *c, ME_Paragraph *para ) FrameRect(c->hDC, &rc, GetSysColorBrush(COLOR_GRAYTEXT)); } if (visible) - ME_DrawRun( c, c->pt.x + run->pt.x, - c->pt.y + para->pt.y + run->pt.y + baseline, run, para ); + { + ME_Cursor cursor; + + cursor.pRun = run_get_di( run ); + cursor.pPara = para_get_di( para ); + cursor.nOffset = 0; + draw_run( c, c->pt.x + run->pt.x, c->pt.y + para->pt.y + run->pt.y + baseline, &cursor ); + } if (me_debug) { static const WCHAR wszRunDebug[] = {'[','%','d',':','%','x',']',' ','%','l','s',0}; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 21b63911954..015326c5abc 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5846,7 +5846,7 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) } } -void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) +void draw_ole( ME_Context *c, int x, int y, ME_Run *run, BOOL selected ) { IDataObject* ido; FORMATETC fmt;

1 0

Huw Davies : riched20: Use a run helper in the delete text function.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 0d50e0182d6c8331cc468a8b25807c33e033531a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d50e0182d6c8331cc468a8b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 08:23:27 2020 +0000 riched20: Use a run helper in the delete text function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index d92b93ac2f0..6a8f1e1cd71 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -405,8 +405,8 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, } if (pThisCur->nOffset == run->len) { - pThisCur->pRun = ME_FindItemFwd(pThisCur->pRun, diRunOrParagraphOrEnd); - assert(pThisCur->pRun->type == diRun); + pThisCur->pRun = run_get_di( run_next( &pThisCur->pRun->member.run ) ); + assert( pThisCur->pRun ); pThisCur->nOffset = 0; } }

1 0

Michael Stefaniuc : wmp: Use wide-char string literals.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 6f92e48447c3e18f5c2723dd54028045cffc1759 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f92e48447c3e18f5c2723dd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 27 00:06:37 2020 +0100 wmp: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/oleobj.c | 6 ++---- dlls/wmp/player.c | 29 ++++++++++++----------------- dlls/wmp/tests/media.c | 49 +++++++++++++++++++------------------------------ dlls/wmp/tests/oleobj.c | 8 +++----- 4 files changed, 36 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f92e48447c3e18f5c27…

1 0