wine-devel November 2020

wine-devel@winehq.org

73 participants
650 discussions

[PATCH v2 2/4] gdi32: Move FreeType face creation to AddFaceToList.
by Huw Davies 20 Nov '20

20 Nov '20

From: Rémi Bernon <rbernon(a)codeweavers.com> So we can use it to add individual fontconfig fonts without iterating all faces. And rename it to add_unix_face. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 127 ++++++++++++++++++++++-------------------- 1 file changed, 66 insertions(+), 61 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1722f0c746c..… [View More]45b5e94d341 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1002,50 +1002,6 @@ static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) } } -static int AddFaceToList(FT_Face ft_face, const WCHAR *file, void *data_ptr, SIZE_T data_size, - FT_Long face_index, DWORD flags ) -{ - struct bitmap_font_size size; - FONTSIGNATURE fs; - int ret; - WCHAR *family_name = ft_face_get_family_name( ft_face, system_lcid ); - WCHAR *second_name = ft_face_get_family_name( ft_face, MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT) ); - WCHAR *style_name = ft_face_get_style_name( ft_face, system_lcid ); - WCHAR *full_name = ft_face_get_full_name( ft_face, system_lcid ); - - /* try to find another secondary name, preferring the lowest langids */ - if (!RtlCompareUnicodeStrings( family_name, lstrlenW(family_name), - second_name, lstrlenW(second_name), TRUE )) - { - RtlFreeHeap( GetProcessHeap(), 0, second_name ); - second_name = ft_face_get_family_name( ft_face, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL) ); - if (!RtlCompareUnicodeStrings( family_name, lstrlenW(family_name), - second_name, lstrlenW(second_name), TRUE )) - { - RtlFreeHeap( GetProcessHeap(), 0, second_name ); - second_name = NULL; - } - } - - get_fontsig( ft_face, &fs ); - if (!FT_IS_SCALABLE( ft_face )) get_bitmap_size( ft_face, &size ); - if (!HIWORD( flags )) flags |= ADDFONT_AA_FLAGS( default_aa_flags ); - - ret = callback_funcs->add_gdi_face( family_name, second_name, style_name, full_name, file, - data_ptr, data_size, face_index, fs, get_ntm_flags( ft_face ), - get_font_version( ft_face ), flags, - FT_IS_SCALABLE(ft_face) ? NULL : &size ); - - TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n", - fs.fsCsb[0], fs.fsCsb[1], fs.fsUsb[0], fs.fsUsb[1], fs.fsUsb[2], fs.fsUsb[3]); - - RtlFreeHeap( GetProcessHeap(), 0, family_name ); - RtlFreeHeap( GetProcessHeap(), 0, second_name ); - RtlFreeHeap( GetProcessHeap(), 0, style_name ); - RtlFreeHeap( GetProcessHeap(), 0, full_name ); - return ret; -} - static FT_Face new_ft_face( const char *file, void *font_data_ptr, DWORD font_data_size, FT_Long face_index, BOOL allow_bitmap ) { @@ -1122,6 +1078,68 @@ fail: return NULL; } +static int add_unix_face( const char *unix_name, const WCHAR *file, void *data_ptr, SIZE_T data_size, + DWORD face_index, DWORD flags, DWORD *num_faces ) +{ + struct bitmap_font_size size; + FONTSIGNATURE fs; + FT_Face ft_face; + WCHAR *family_name, *second_name, *style_name, *full_name; + int ret; + + if (num_faces) *num_faces = 0; + + if (!(ft_face = new_ft_face( unix_name, data_ptr, data_size, face_index, flags & ADDFONT_ALLOW_BITMAP ))) + return 0; + + if (ft_face->family_name[0] == '.') /* Ignore fonts with names beginning with a dot */ + { + TRACE("Ignoring %s since its family name begins with a dot\n", debugstr_a(unix_name)); + pFT_Done_Face( ft_face ); + return 0; + } + + family_name = ft_face_get_family_name( ft_face, system_lcid ); + second_name = ft_face_get_family_name( ft_face, MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT) ); + style_name = ft_face_get_style_name( ft_face, system_lcid ); + full_name = ft_face_get_full_name( ft_face, system_lcid ); + + /* try to find another secondary name, preferring the lowest langids */ + if (!RtlCompareUnicodeStrings( family_name, lstrlenW(family_name), + second_name, lstrlenW(second_name), TRUE )) + { + RtlFreeHeap( GetProcessHeap(), 0, second_name ); + second_name = ft_face_get_family_name( ft_face, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL) ); + if (!RtlCompareUnicodeStrings( family_name, lstrlenW(family_name), + second_name, lstrlenW(second_name), TRUE )) + { + RtlFreeHeap( GetProcessHeap(), 0, second_name ); + second_name = NULL; + } + } + + get_fontsig( ft_face, &fs ); + if (!FT_IS_SCALABLE( ft_face )) get_bitmap_size( ft_face, &size ); + if (!HIWORD( flags )) flags |= ADDFONT_AA_FLAGS( default_aa_flags ); + + ret = callback_funcs->add_gdi_face( family_name, second_name, style_name, full_name, file, + data_ptr, data_size, face_index, fs, get_ntm_flags( ft_face ), + get_font_version( ft_face ), flags, + FT_IS_SCALABLE(ft_face) ? NULL : &size ); + + TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n", + fs.fsCsb[0], fs.fsCsb[1], fs.fsUsb[0], fs.fsUsb[1], fs.fsUsb[2], fs.fsUsb[3]); + + RtlFreeHeap( GetProcessHeap(), 0, family_name ); + RtlFreeHeap( GetProcessHeap(), 0, second_name ); + RtlFreeHeap( GetProcessHeap(), 0, style_name ); + RtlFreeHeap( GetProcessHeap(), 0, full_name ); + + if (num_faces) *num_faces = ft_face->num_faces; + pFT_Done_Face( ft_face ); + return ret; +} + static WCHAR *get_dos_file_name( LPCSTR str ) { WCHAR *buffer; @@ -1176,8 +1194,7 @@ static char *get_unix_file_name( LPCWSTR dosW ) static INT AddFontToList(const WCHAR *dos_name, const char *unix_name, void *font_data_ptr, DWORD font_data_size, DWORD flags) { - FT_Face ft_face; - FT_Long face_index = 0, num_faces; + DWORD face_index = 0, num_faces; INT ret = 0; WCHAR *filename = NULL; @@ -1207,22 +1224,10 @@ static INT AddFontToList(const WCHAR *dos_name, const char *unix_name, void *fon if (!dos_name && unix_name) dos_name = filename = get_dos_file_name( unix_name ); - do { - ft_face = new_ft_face( unix_name, font_data_ptr, font_data_size, face_index, flags & ADDFONT_ALLOW_BITMAP ); - if (!ft_face) break; - - if(ft_face->family_name[0] == '.') /* Ignore fonts with names beginning with a dot */ - { - TRACE("Ignoring %s since its family name begins with a dot\n", debugstr_a(unix_name)); - pFT_Done_Face(ft_face); - break; - } - - ret += AddFaceToList(ft_face, dos_name, font_data_ptr, font_data_size, face_index, flags); + do + ret += add_unix_face( unix_name, dos_name, font_data_ptr, font_data_size, face_index, flags, &num_faces ); + while (num_faces > ++face_index); - num_faces = ft_face->num_faces; - pFT_Done_Face(ft_face); - } while(num_faces > ++face_index); RtlFreeHeap( GetProcessHeap(), 0, filename ); return ret; } -- 2.23.0 [View Less]

1 0

[PATCH v2 1/4] gdi32: Ignore Type 1 fonts in fontconfig enumeration.
by Huw Davies 20 Nov '20

20 Nov '20

From: Rémi Bernon <rbernon(a)codeweavers.com> Instead of loading the font with FreeType to discard it right away. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 61397e8b542..1722f0c746c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/… [View More]

1 0

[PATCH] gdi32: Avoid the actual drawing position is inconsistent with the desired position when the width or height is negative.
by Jiangyi Chen 20 Nov '20

20 Nov '20

The attachment contains a test program and source code written on the window. Please take a look.

2 1

[PATCH 1/2] quartz/tests: Add some tests for flushing on the DirectSound renderer.
by Zebediah Figura 20 Nov '20

20 Nov '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/dsoundrender.c | 46 ++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 5142ca2da6d..558e6989c98 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -832,6 +832,51 @@ static void test_filter_state(IMemInputPin *input, IMediaControl *control) * completely paused. */ } … [View More]

2 2

[PATCH 1/4] quartz/avidec: Don't send ICM_DECOMPRESS_BEGIN or ICM_DECOMPRESS_END messages if the source is disconnected.
by Zebediah Figura 19 Nov '20

19 Nov '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/avidec.c | 11 ++++++++--- dlls/quartz/tests/avidec.c | 18 +++++++++--------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 72f69ef7c5a..4995276dbfc 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -565,6 +565,9 @@ static HRESULT avi_decompressor_init_stream(struct strmbase_filter *iface) LRESULT res; HRESULT hr; + … [View More] if (!filter->source.pin.peer) + return S_OK; + filter->late = -1; source_format = (VIDEOINFOHEADER *)filter->sink.pin.mt.pbFormat; @@ -574,7 +577,7 @@ static HRESULT avi_decompressor_init_stream(struct strmbase_filter *iface) return E_FAIL; } - if (filter->source.pin.peer && FAILED(hr = IMemAllocator_Commit(filter->source.pAllocator))) + if (FAILED(hr = IMemAllocator_Commit(filter->source.pAllocator))) ERR("Failed to commit allocator, hr %#x.\n", hr); return S_OK; @@ -585,14 +588,16 @@ static HRESULT avi_decompressor_cleanup_stream(struct strmbase_filter *iface) struct avi_decompressor *filter = impl_from_strmbase_filter(iface); LRESULT res; + if (!filter->source.pin.peer) + return S_OK; + if (filter->hvid && (res = ICDecompressEnd(filter->hvid))) { ERR("ICDecompressEnd() failed, error %ld.\n", res); return E_FAIL; } - if (filter->source.pin.peer) - IMemAllocator_Decommit(filter->source.pAllocator); + IMemAllocator_Decommit(filter->source.pAllocator); return S_OK; } diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index ddfe22ed797..8717e107106 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -692,25 +692,25 @@ static void test_unconnected_filter_state(void) ok(state == State_Stopped, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Paused, "Got state %u.\n", state); + ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Running, "Got state %u.\n", state); + ok(state == State_Running, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Paused, "Got state %u.\n", state); + ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -720,11 +720,11 @@ static void test_unconnected_filter_state(void) ok(state == State_Stopped, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Running, "Got state %u.\n", state); + ok(state == State_Running, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -956,7 +956,7 @@ static void test_connect_pin(void) ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); hr = IMediaControl_Pause(control); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IFilterGraph2_ConnectDirect(graph, &testsource.source.pin.IPin_iface, sink, &req_mt); ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); hr = IMediaControl_Stop(control); -- 2.29.2 [View Less]

1 3

Re: [PATCH] msvcp120: Avoid type conversion warnings in test_tr2_sys__dir_operation.
by Gerald Pfeifer 19 Nov '20

19 Nov '20

This patch is obsolete now since a month later the essentially identical commit d276cf7112aa15aac102b03e519cc133da8ec1c1 Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 3 11:50:35 2020 +0200 msvcp120/tests: Fix signed integral cast warning. First cast to int, then to enum file_type. Reported by MinGW GCC 10 with -Woverflow. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)… [View More]codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Gerald On Sun, 3 May 2020, Gerald Pfeifer wrote: > GCC 10 warns > > msvcp120.c:1777:11: warning: overflow in conversion from 'enum file_type' > to 'int' changes value from 'type = 3735928559' to '-559038737' > msvcp120.c:1807:11: warning: overflow in conversion from 'enum file_type' > to 'int' changes value from 'type = 3735928559' to '-559038737' > msvcp120.c:1817:11: warning: overflow in conversion from 'enum file_type' > to 'int' changes value from 'type = 3735928559' to '-559038737' > > where 3735928559 is 0xdeadbeef. > > This happens since first this variable is assigned to an enum and > that then to an int, and GCC diagnoses the latter as an overflow > (from signed to unsigned). > > Assigning a hex constant does not trigger, so simply break out those > two assignments. > > Gerald > > Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> > --- > dlls/msvcp120/tests/msvcp120.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c > index 7a382ac6fa..3cfabaa7ca 100644 > --- a/dlls/msvcp120/tests/msvcp120.c > +++ b/dlls/msvcp120/tests/msvcp120.c > @@ -1774,7 +1774,8 @@ static void test_tr2_sys__dir_operation(void) > > memset(first_file_name, 0xff, MAX_PATH); > memset(dest, 0, MAX_PATH); > - err = type = 0xdeadbeef; > + err = 0xdeadbeef; > + type = 0xdeadbeef; > result_handle = NULL; > result_handle = p_tr2_sys__Open_dir(first_file_name, "tr2_test_dir", &err, &type); > ok(result_handle != NULL, "tr2_sys__Open_dir(): expect: not NULL, got %p\n", result_handle); > @@ -1804,7 +1805,8 @@ static void test_tr2_sys__dir_operation(void) > ok(num_of_other_files == 0, "found %d other files\n", num_of_other_files); > > memset(first_file_name, 0xff, MAX_PATH); > - err = type = 0xdeadbeef; > + err = 0xdeadbeef; > + type = 0xdeadbeef; > result_handle = file; > result_handle = p_tr2_sys__Open_dir(first_file_name, "not_exist", &err, &type); > ok(result_handle == NULL, "tr2_sys__Open_dir(): expect: NULL, got %p\n", result_handle); > @@ -1814,7 +1816,8 @@ static void test_tr2_sys__dir_operation(void) > > CreateDirectoryA("empty_dir", NULL); > memset(first_file_name, 0xff, MAX_PATH); > - err = type = 0xdeadbeef; > + err = 0xdeadbeef; > + type = 0xdeadbeef; > result_handle = file; > result_handle = p_tr2_sys__Open_dir(first_file_name, "empty_dir", &err, &type); > ok(result_handle == NULL, "tr2_sys__Open_dir(): expect: NULL, got %p\n", result_handle); [View Less]

1 0

[PATCH] imm32: Use wide-char string literals.
by Michael Stefaniuc 19 Nov '20

19 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/imm32/imm.c | 45 ++++++++++++++-------------------------- dlls/imm32/tests/imm32.c | 10 +++------ 2 files changed, 18 insertions(+), 37 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 0f3d7d5f8c8..9d2a09f22be 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -99,14 +99,8 @@ typedef struct _tagIMMThreadData { static struct list ImmHklList = LIST_INIT(ImmHklList); static struct list … [View More]ImmThreadDataList = LIST_INIT(ImmThreadDataList); -static const WCHAR szwWineIMCProperty[] = {'W','i','n','e','I','m','m','H','I','M','C','P','r','o','p','e','r','t','y',0}; - -static const WCHAR szImeFileW[] = {'I','m','e',' ','F','i','l','e',0}; -static const WCHAR szLayoutTextW[] = {'L','a','y','o','u','t',' ','T','e','x','t',0}; -static const WCHAR szImeRegFmt[] = {'S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','C','o','n','t','r','o','l','\\','K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','s','\\','%','0','8','l','x',0}; - -static const WCHAR szwIME[] = {'I','M','E',0}; -static const WCHAR szwDefaultIME[] = {'D','e','f','a','u','l','t',' ','I','M','E',0}; +static const WCHAR szwWineIMCProperty[] = L"WineImmHIMCProperty"; +static const WCHAR szImeRegFmt[] = L"System\\CurrentControlSet\\Control\\Keyboard Layouts\\%08lx"; static CRITICAL_SECTION threaddata_cs; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -297,23 +291,15 @@ static void IMM_FreeThreadData(void) static HMODULE load_graphics_driver(void) { - static const WCHAR display_device_guid_propW[] = { - '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', - 'd','e','v','i','c','e','_','g','u','i','d',0 }; - static const WCHAR key_pathW[] = { - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'V','i','d','e','o','\\','{',0}; - static const WCHAR displayW[] = {'}','\\','0','0','0','0',0}; - static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; + static const WCHAR key_pathW[] = L"System\\CurrentControlSet\\Control\\Video\\{"; + static const WCHAR displayW[] = L"}\\0000"; HMODULE ret = 0; HKEY hkey; DWORD size; WCHAR path[MAX_PATH]; WCHAR key[ARRAY_SIZE( key_pathW ) + ARRAY_SIZE( displayW ) + 40]; - UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), display_device_guid_propW )); + UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), L"__wine_display_device_guid" )); if (!guid_atom) return 0; memcpy( key, key_pathW, sizeof(key_pathW) ); @@ -321,7 +307,8 @@ static HMODULE load_graphics_driver(void) lstrcatW( key, displayW ); if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0; size = sizeof(path); - if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path ); + if (!RegQueryValueExW( hkey, L"GraphicsDriver", NULL, NULL, (BYTE *)path, &size )) + ret = LoadLibraryW( path ); RegCloseKey( hkey ); TRACE( "%s %p\n", debugstr_w(path), ret ); return ret; @@ -1642,7 +1629,7 @@ static BOOL needs_ime_window(HWND hwnd) { WCHAR classW[8]; - if (GetClassNameW(hwnd, classW, ARRAY_SIZE(classW)) && !lstrcmpW(classW, szwIME)) + if (GetClassNameW(hwnd, classW, ARRAY_SIZE(classW)) && !lstrcmpW(classW, L"IME")) return FALSE; if (GetClassLongPtrW(hwnd, GCL_STYLE) & CS_IME) return FALSE; @@ -1680,7 +1667,7 @@ BOOL WINAPI __wine_register_window(HWND hwnd) { /* Do not create the window inside of a critical section */ LeaveCriticalSection(&threaddata_cs); - new = CreateWindowExW( 0, szwIME, szwDefaultIME, + new = CreateWindowExW( 0, L"IME", L"Default IME", WS_POPUP | WS_DISABLED | WS_CLIPSIBLINGS, 0, 0, 1, 1, 0, 0, 0, 0); /* thread_data is in the current thread so we can assume it's still valid */ @@ -1785,13 +1772,11 @@ UINT WINAPI ImmGetDescriptionA( */ UINT WINAPI ImmGetDescriptionW(HKL hKL, LPWSTR lpszDescription, UINT uBufLen) { - static const WCHAR name[] = { 'W','i','n','e',' ','X','I','M',0 }; - FIXME("(%p, %p, %d): semi stub\n", hKL, lpszDescription, uBufLen); if (!hKL) return 0; - if (!uBufLen) return lstrlenW( name ); - lstrcpynW( lpszDescription, name, uBufLen ); + if (!uBufLen) return lstrlenW(L"Wine XIM" ); + lstrcpynW( lpszDescription, L"Wine XIM", uBufLen ); return lstrlenW( lpszDescription ); } @@ -1872,7 +1857,7 @@ UINT WINAPI ImmGetIMEFileNameW(HKL hKL, LPWSTR lpszFileName, UINT uBufLen) } length = 0; - rc = RegGetValueW(hkey, NULL, szImeFileW, RRF_RT_REG_SZ, NULL, NULL, &length); + rc = RegGetValueW(hkey, NULL, L"Ime File", RRF_RT_REG_SZ, NULL, NULL, &length); if (rc != ERROR_SUCCESS) { @@ -1892,7 +1877,7 @@ UINT WINAPI ImmGetIMEFileNameW(HKL hKL, LPWSTR lpszFileName, UINT uBufLen) return length / sizeof(WCHAR); } - RegGetValueW(hkey, NULL, szImeFileW, RRF_RT_REG_SZ, NULL, lpszFileName, &length); + RegGetValueW(hkey, NULL, L"Ime File", RRF_RT_REG_SZ, NULL, lpszFileName, &length); RegCloseKey(hkey); @@ -2111,10 +2096,10 @@ HKL WINAPI ImmInstallIMEW( if (rc == ERROR_SUCCESS) { - rc = RegSetValueExW(hkey, szImeFileW, 0, REG_SZ, (const BYTE*)lpszIMEFileName, + rc = RegSetValueExW(hkey, L"Ime File", 0, REG_SZ, (const BYTE*)lpszIMEFileName, (lstrlenW(lpszIMEFileName) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) - rc = RegSetValueExW(hkey, szLayoutTextW, 0, REG_SZ, (const BYTE*)lpszLayoutText, + rc = RegSetValueExW(hkey, L"Layout Text", 0, REG_SZ, (const BYTE*)lpszLayoutText, (lstrlenW(lpszLayoutText) + 1) * sizeof(WCHAR)); RegCloseKey(hkey); return hkl; diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 827b31eec2e..cc9e0e8c01f 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -1099,10 +1099,9 @@ static void test_ImmDefaultHwnd(void) static BOOL CALLBACK is_ime_window_proc(HWND hWnd, LPARAM param) { - static const WCHAR imeW[] = {'I','M','E',0}; WCHAR class_nameW[16]; HWND *ime_window = (HWND *)param; - if (GetClassNameW(hWnd, class_nameW, ARRAY_SIZE(class_nameW)) && !lstrcmpW(class_nameW, imeW)) + if (GetClassNameW(hWnd, class_nameW, ARRAY_SIZE(class_nameW)) && !lstrcmpW(class_nameW, L"IME")) { *ime_window = hWnd; return FALSE; @@ -1562,9 +1561,6 @@ static LRESULT CALLBACK processkey_wnd_proc( HWND hWnd, UINT msg, WPARAM wParam, static void test_ime_processkey(void) { - WCHAR classNameW[] = {'P','r','o','c','e','s','s', 'K','e','y','T','e','s','t','C','l','a','s','s',0}; - WCHAR windowNameW[] = {'P','r','o','c','e','s','s', 'K','e','y',0}; - MSG msg; WNDCLASSW wclass; HANDLE hInstance = GetModuleHandleW(NULL); @@ -1573,7 +1569,7 @@ static void test_ime_processkey(void) INT rc; HWND hWndTest; - wclass.lpszClassName = classNameW; + wclass.lpszClassName = L"ProcessKeyTestClass"; wclass.style = CS_HREDRAW | CS_VREDRAW; wclass.lpfnWndProc = processkey_wnd_proc; wclass.hInstance = hInstance; @@ -1589,7 +1585,7 @@ static void test_ime_processkey(void) } /* create the test window that will receive the keystrokes */ - hWndTest = CreateWindowW(wclass.lpszClassName, windowNameW, + hWndTest = CreateWindowW(wclass.lpszClassName, L"ProcessKey", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, 100, 100, NULL, NULL, hInstance, NULL); -- 2.26.2 [View Less]

1 0

[PATCH] itss: Use zero terminated WCHAR strings.
by Michael Stefaniuc 19 Nov '20

19 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/itss/protocol.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/itss/protocol.c b/dlls/itss/protocol.c index 167ce906b90..6d40ddf738f 100644 --- a/dlls/itss/protocol.c +++ b/dlls/itss/protocol.c @@ -148,16 +148,16 @@ static ULONG WINAPI ITSInternetProtocol_Release(IInternetProtocol *iface) static LPCWSTR skip_schema(LPCWSTR url) { - static const WCHAR its_schema[] = {'… [View More]

1 0

[PATCH] itss: Use wide-char string literals.
by Michael Stefaniuc 19 Nov '20

19 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/itss/chm_lib.c | 33 ++++------------------ dlls/itss/moniker.c | 7 ++--- dlls/itss/protocol.c | 8 ++---- dlls/itss/storage.c | 3 +- dlls/itss/tests/protocol.c | 58 +++++++++++++------------------------- 5 files changed, 29 insertions(+), 80 deletions(-) diff --git a/dlls/itss/chm_lib.c b/dlls/itss/chm_lib.c index be04ae5673a..91e3fa3d811 100644 --- a/dlls/itss/chm_lib.c +++ b/dlls/itss/… [View More]chm_lib.c @@ -203,31 +203,6 @@ static BOOL _unmarshal_uuid(unsigned char **pData, return _unmarshal_uchar_array(pData, pDataLen, dest, 16); } -/* names of sections essential to decompression */ -static const WCHAR _CHMU_RESET_TABLE[] = { -':',':','D','a','t','a','S','p','a','c','e','/', - 'S','t','o','r','a','g','e','/', - 'M','S','C','o','m','p','r','e','s','s','e','d','/', - 'T','r','a','n','s','f','o','r','m','/', - '{','7','F','C','2','8','9','4','0','-','9','D','3','1', - '-','1','1','D','0','-','9','B','2','7','-', - '0','0','A','0','C','9','1','E','9','C','7','C','}','/', - 'I','n','s','t','a','n','c','e','D','a','t','a','/', - 'R','e','s','e','t','T','a','b','l','e',0 -}; -static const WCHAR _CHMU_LZXC_CONTROLDATA[] = { -':',':','D','a','t','a','S','p','a','c','e','/', - 'S','t','o','r','a','g','e','/', - 'M','S','C','o','m','p','r','e','s','s','e','d','/', - 'C','o','n','t','r','o','l','D','a','t','a',0 -}; -static const WCHAR _CHMU_CONTENT[] = { -':',':','D','a','t','a','S','p','a','c','e','/', - 'S','t','o','r','a','g','e','/', - 'M','S','C','o','m','p','r','e','s','s','e','d','/', - 'C','o','n','t','e','n','t',0 -}; - /* * structures local to this module */ @@ -766,15 +741,17 @@ struct chmFile *chm_openW(const WCHAR *filename) /* prefetch most commonly needed unit infos */ if (CHM_RESOLVE_SUCCESS != chm_resolve_object(newHandle, - _CHMU_RESET_TABLE, + L"::DataSpace/Storage/MSCompressed/Transform/" + "{7FC28940-9D31-11D0-9B27-00A0C91E9C7C}/" + "InstanceData/ResetTable", &newHandle->rt_unit) || newHandle->rt_unit.space == CHM_COMPRESSED || CHM_RESOLVE_SUCCESS != chm_resolve_object(newHandle, - _CHMU_CONTENT, + L"::DataSpace/Storage/MSCompressed/Content", &newHandle->cn_unit) || newHandle->cn_unit.space == CHM_COMPRESSED || CHM_RESOLVE_SUCCESS != chm_resolve_object(newHandle, - _CHMU_LZXC_CONTROLDATA, + L"::DataSpace/Storage/MSCompressed/ControlData", &uiLzxc) || uiLzxc.space == CHM_COMPRESSED) { diff --git a/dlls/itss/moniker.c b/dlls/itss/moniker.c index 41faa23fb5e..3d0063f2bb7 100644 --- a/dlls/itss/moniker.c +++ b/dlls/itss/moniker.c @@ -283,8 +283,6 @@ static HRESULT WINAPI ITS_IMonikerImpl_GetDisplayName( LPOLESTR* ppszDisplayName) { ITS_IMonikerImpl *This = impl_from_IMoniker(iface); - static const WCHAR szFormat[] = { - 'm','s','-','i','t','s',':','%','s',':',':','%','s',0 }; DWORD len; LPWSTR str; @@ -292,7 +290,7 @@ static HRESULT WINAPI ITS_IMonikerImpl_GetDisplayName( len = lstrlenW( This->szFile ) + lstrlenW( This->szHtml ); str = CoTaskMemAlloc( len*sizeof(WCHAR) ); - swprintf( str, len, szFormat, This->szFile, This->szHtml ); + swprintf( str, len, L"ms-its:%s::%s", This->szFile, This->szHtml ); *ppszDisplayName = str; @@ -431,8 +429,7 @@ static HRESULT WINAPI ITS_IParseDisplayNameImpl_ParseDisplayName( ULONG * pchEaten, IMoniker ** ppmkOut) { - static const WCHAR szPrefix[] = { - '@','M','S','I','T','S','t','o','r','e',':',0 }; + static const WCHAR szPrefix[] = L"@MSITStore:"; const DWORD prefix_len = ARRAY_SIZE(szPrefix)-1; DWORD n; diff --git a/dlls/itss/protocol.c b/dlls/itss/protocol.c index 3f5362e5b9b..167ce906b90 100644 --- a/dlls/itss/protocol.c +++ b/dlls/itss/protocol.c @@ -231,8 +231,6 @@ static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, int res; HRESULT hres; - static const WCHAR separator[] = {':',':',0}; - TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); @@ -260,7 +258,7 @@ static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, return hres; } - p = wcsstr(file_name, separator); + p = wcsstr(file_name, L"::"); if(!p) { WARN("invalid url\n"); HeapFree(GetProcessHeap(), 0, file_name); @@ -480,13 +478,11 @@ static HRESULT WINAPI ITSProtocolInfo_CombineUrl(IInternetProtocolInfo *iface, LPCWSTR base_end, ptr; DWORD rel_len; - static const WCHAR separator[] = {':',':',0}; - TRACE("(%p)->(%s %s %08x %p %d %p %d)\n", This, debugstr_w(pwzBaseUrl), debugstr_w(pwzRelativeUrl), dwCombineFlags, pwzResult, cchResult, pcchResult, dwReserved); - base_end = wcsstr(pwzBaseUrl, separator); + base_end = wcsstr(pwzBaseUrl, L"::"); if(!base_end) return 0x80041001; base_end += 2; diff --git a/dlls/itss/storage.c b/dlls/itss/storage.c index 86d33f29dfb..ee5432d4d61 100644 --- a/dlls/itss/storage.c +++ b/dlls/itss/storage.c @@ -639,7 +639,6 @@ HRESULT ITSS_StgOpenStorage( IStorage** ppstgOpen) { struct chmFile *chmfile; - static const WCHAR szRoot[] = { '/', 0 }; TRACE("%s\n", debugstr_w(pwcsName) ); @@ -647,7 +646,7 @@ HRESULT ITSS_StgOpenStorage( if( !chmfile ) return E_FAIL; - return ITSS_create_chm_storage( chmfile, szRoot, ppstgOpen ); + return ITSS_create_chm_storage( chmfile, L"/", ppstgOpen ); } /************************************************************************/ diff --git a/dlls/itss/tests/protocol.c b/dlls/itss/tests/protocol.c index 4cafba7b615..43d867b9cfb 100644 --- a/dlls/itss/tests/protocol.c +++ b/dlls/itss/tests/protocol.c @@ -66,36 +66,24 @@ static HRESULT expect_hrResult; static IInternetProtocol *read_protocol = NULL; static DWORD bindf; -static const WCHAR blank_url1[] = {'i','t','s',':', - 't','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR blank_url2[] = {'m','S','-','i','T','s',':', - 't','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR blank_url3[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':', - 't','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR blank_url4[] = {'i','t','s',':', - 't','e','s','t','.','c','h','m',':',':','b','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR blank_url5[] = {'i','t','s',':', - 't','e','s','t','.','c','h','m',':',':','\\','b','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR blank_url6[] = {'i','t','s',':', - 't','e','s','t','.','c','h','m',':',':','/','%','6','2','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR blank_url7[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':', - 't','e','s','t','.','c','h','m',':',':','\\','b','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR blank_url8[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':', - 't','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l','/',0}; -static const WCHAR blank_url9[] = {'i','t','s',':', - 't','e','s','t','.','c','h','m',':',':','/','d','i','r','/','.','.','/','b','l','a','n','k','.','h','t','m','l',0}; +static const WCHAR blank_url1[] = L"its:test.chm::/blank.html"; +static const WCHAR blank_url2[] = L"mS-iTs:test.chm::/blank.html"; +static const WCHAR blank_url3[] = L"mk:@MSITStore:test.chm::/blank.html"; +static const WCHAR blank_url4[] = L"its:test.chm::blank.html"; +static const WCHAR blank_url5[] = L"its:test.chm::\\blank.html"; +static const WCHAR blank_url6[] = L"its:test.chm::/%62lank.html"; +static const WCHAR blank_url7[] = L"mk:@MSITStore:test.chm::\\blank.html"; +static const WCHAR blank_url8[] = L"mk:@MSITStore:test.chm::/blank.html/"; +static const WCHAR blank_url9[] = L"its:test.chm::/dir/../blank.html"; static enum { ITS_PROTOCOL, MK_PROTOCOL } test_protocol; -static const WCHAR cache_file1[] = - {'t','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR cache_file2[] = - {'t','e','s','t','.','c','h','m',':',':','\\','b','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR cache_file3[] = - {'t','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l','/',0}; +static const WCHAR cache_file1[] = L"test.chm::/blank.html"; +static const WCHAR cache_file2[] = L"test.chm::\\blank.html"; +static const WCHAR cache_file3[] = L"test.chm::/blank.html/"; static const WCHAR *cache_file = cache_file1; static HRESULT WINAPI ProtocolSink_QueryInterface(IInternetProtocolSink *iface, REFIID riid, void **ppv) @@ -126,9 +114,6 @@ static HRESULT WINAPI ProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOL static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, ULONG ulStatusCode, LPCWSTR szStatusText) { - static const WCHAR blank_html[] = {'b','l','a','n','k','.','h','t','m','l',0}; - static const WCHAR text_html[] = {'t','e','x','t','/','h','t','m','l',0}; - switch(ulStatusCode) { case BINDSTATUS_BEGINDOWNLOADDATA: CHECK_EXPECT(ReportProgress_BEGINDOWNLOADDATA); @@ -137,13 +122,13 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, case BINDSTATUS_SENDINGREQUEST: CHECK_EXPECT(ReportProgress_SENDINGREQUEST); if(test_protocol == ITS_PROTOCOL) - ok(!lstrcmpW(szStatusText, blank_html), "unexpected szStatusText\n"); + ok(!lstrcmpW(szStatusText, L"blank.html"), "unexpected szStatusText\n"); else ok(szStatusText == NULL, "szStatusText != NULL\n"); break; case BINDSTATUS_MIMETYPEAVAILABLE: CHECK_EXPECT(ReportProgress_MIMETYPEAVAILABLE); - ok(!lstrcmpW(szStatusText, text_html), "unexpected szStatusText\n"); + ok(!lstrcmpW(szStatusText, L"text/html"), "unexpected szStatusText\n"); break; case BINDSTATUS_CACHEFILENAMEAVAILABLE: CHECK_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); @@ -523,16 +508,11 @@ static void test_its_protocol(void) ULONG ref; HRESULT hres; - static const WCHAR wrong_url1[] = - {'i','t','s',':','t','e','s','t','.','c','h','m',':',':','/','b','l','a','n','.','h','t','m','l',0}; - static const WCHAR wrong_url2[] = - {'i','t','s',':','t','e','s','.','c','h','m',':',':','b','/','l','a','n','k','.','h','t','m','l',0}; - static const WCHAR wrong_url3[] = - {'i','t','s',':','t','e','s','t','.','c','h','m','/','b','l','a','n','k','.','h','t','m','l',0}; - static const WCHAR wrong_url4[] = {'m','k',':','@','M','S','I','T','S','t','o','r',':', - 't','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; - static const WCHAR wrong_url5[] = {'f','i','l','e',':', - 't','e','s','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; + static const WCHAR wrong_url1[] = L"its:test.chm::/blan.html"; + static const WCHAR wrong_url2[] = L"its:tes.chm::b/lank.html"; + static const WCHAR wrong_url3[] = L"its:test.chm/blank.html"; + static const WCHAR wrong_url4[] = L"mk:@MSITStor:test.chm::/blank.html"; + static const WCHAR wrong_url5[] = L"file:tes.chm::/blank.html"; test_protocol = ITS_PROTOCOL; -- 2.26.2 [View Less]

1 0

[PATCH] msvcrt: #include <stdarg.h> from unixlib.c
by Gerald Pfeifer 19 Nov '20

19 Nov '20

commit c72e1b096d16a1e9a36b86fbc8c403ec3653a504 Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 16:14:50 2020 +0100 msvcrt: Move math functions to a new Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> broke the build on FreeBSD whose system headers do not pull in others as commonly as is the case on GNU/Linux systems. Explicitly including <stdarg.h> addresses this. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.… [View More]

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
65
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-devel November 2020