September 2021 - Wine-commits

Jacek Caban : gdi32: Use NtQueryFullAttributesFile directly in alloc_gdi_font.
by Alexandre Julliard 21 Sep '21

21 Sep '21

Module: wine Branch: master Commit: b4abe2010b90333bc00ef32245c5b3f235012d77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4abe2010b90333bc00ef322… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 21 15:54:04 2021 +0200 gdi32: Use NtQueryFullAttributesFile directly in alloc_gdi_font. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index acf281abcea..a0da2a385ca 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1713,11 +1713,25 @@ static struct gdi_font *alloc_gdi_font( const WCHAR *file, void *data_ptr, SIZE_ if (file) { - WIN32_FILE_ATTRIBUTE_DATA info; - if (GetFileAttributesExW( file, GetFileExInfoStandard, &info )) + FILE_NETWORK_OPEN_INFORMATION info; + UNICODE_STRING nt_name; + OBJECT_ATTRIBUTES attr; + + nt_name.Buffer = (WCHAR *)file; + nt_name.Length = nt_name.MaximumLength = len * sizeof(WCHAR); + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.ObjectName = &nt_name; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + if (!NtQueryFullAttributesFile( &attr, &info )) { - font->writetime = info.ftLastWriteTime; - font->data_size = (LONGLONG)info.nFileSizeHigh << 32 | info.nFileSizeLow; + font->writetime.dwLowDateTime = info.LastWriteTime.LowPart; + font->writetime.dwHighDateTime = info.LastWriteTime.HighPart; + font->data_size = info.EndOfFile.QuadPart; memcpy( font->file, file, len * sizeof(WCHAR) ); } }

1 0

Jacek Caban : gdi32: Directly use ntdll in load_directory_fonts.
by Alexandre Julliard 21 Sep '21

21 Sep '21

Module: wine Branch: master Commit: ce244d7523e976adf1f621c31d29c4572501e9cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce244d7523e976adf1f621c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 21 15:54:12 2021 +0200 gdi32: Directly use ntdll in load_directory_fonts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 66 ++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index a0da2a385ca..e5e294435e9 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -420,13 +420,13 @@ static void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) else if (GetEnvironmentVariableW( L"WINEBUILDDIR", path, MAX_PATH )) lstrcatW( path, L"\\fonts\\" ); - lstrcatW( path, file ); + if (file) lstrcatW( path, file ); } static void get_fonts_win_dir_path( const WCHAR *file, WCHAR *path ) { lstrcpyW( path, L"\\??\\C:\\windows\\fonts\\" ); - lstrcatW( path, file ); + if (file) lstrcatW( path, file ); } /* font substitutions */ @@ -5663,21 +5663,52 @@ static void load_system_bitmap_fonts(void) static void load_directory_fonts( WCHAR *path, UINT flags ) { + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nt_name; + IO_STATUS_BLOCK io; HANDLE handle; - WIN32_FIND_DATAW data; - WCHAR *p; + char buf[8192]; + size_t len; - p = path + lstrlenW(path) - 1; - TRACE( "loading fonts from %s\n", debugstr_w(path) ); - handle = FindFirstFileW( path, &data ); - if (handle == INVALID_HANDLE_VALUE) return; - do + len = lstrlenW( path ); + while (len && path[len - 1] == '\\') len--; + + nt_name.Buffer = path; + nt_name.MaximumLength = nt_name.Length = len * sizeof(WCHAR); + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.ObjectName = &nt_name; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + if (NtOpenFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT )) + return; + + path[len++] = '\\'; + + while (!NtQueryDirectoryFile( handle, 0, NULL, NULL, &io, buf, sizeof(buf), + FileBothDirectoryInformation, FALSE, NULL, FALSE ) && + io.Information) { - if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) continue; - lstrcpyW( p, data.cFileName ); - font_funcs->add_font( path, flags ); - } while (FindNextFileW( handle, &data )); - FindClose( handle ); + FILE_BOTH_DIR_INFORMATION *info = (FILE_BOTH_DIR_INFORMATION *)buf; + for (;;) + { + if (!(info->FileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + { + memcpy( path + len, info->FileName, info->FileNameLength ); + path[len + info->FileNameLength / sizeof(WCHAR)] = 0; + font_funcs->add_font( path, flags ); + } + if (!info->NextEntryOffset) break; + info = (FILE_BOTH_DIR_INFORMATION *)((char *)info + info->NextEntryOffset); + } + } + + NtClose( handle ); } static void load_file_system_fonts(void) @@ -5686,11 +5717,11 @@ static void load_file_system_fonts(void) DWORD len = sizeof(value); /* Windows directory */ - get_fonts_win_dir_path( L"*", path ); + get_fonts_win_dir_path( NULL, path ); load_directory_fonts( path, 0 ); /* Wine data directory */ - get_fonts_data_dir_path( L"*", path ); + get_fonts_data_dir_path( NULL, path ); load_directory_fonts( path, ADDFONT_EXTERNAL_FONT ); /* custom paths */ @@ -5701,8 +5732,7 @@ static void load_file_system_fonts(void) { if ((next = wcschr( ptr, ';' ))) *next++ = 0; if (next && next - ptr < 2) continue; - lstrcpynW( path, ptr, MAX_PATH - 2 ); - lstrcatW( path, L"\\*" ); + lstrcpynW( path, ptr, MAX_PATH ); if (path[1] == ':') { memmove( path + ARRAYSIZE(nt_prefixW), path, (lstrlenW( path ) + 1) * sizeof(WCHAR) );

1 0

Jacek Caban : gdi32: Directly use ntdll for font mutex.
by Alexandre Julliard 21 Sep '21

21 Sep '21

Module: wine Branch: master Commit: 57767a9af85d6d9759eb458b0d3695901ee50a0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=57767a9af85d6d9759eb458b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 21 15:54:17 2021 +0200 gdi32: Directly use ntdll for font mutex. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index e5e294435e9..f916ed97f01 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5889,9 +5889,15 @@ static const struct font_callback_funcs callback_funcs = { add_gdi_face }; */ void font_init(void) { + OBJECT_ATTRIBUTES attr = { sizeof(attr) }; + UNICODE_STRING name; HANDLE mutex; DWORD disposition; + static WCHAR wine_font_mutexW[] = + {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s', + '\\','_','_','W','I','N','E','_','F','O','N','T','_','M','U','T','E','X','_','_'}; + if (RegCreateKeyExW( HKEY_CURRENT_USER, L"Software\\Wine\\Fonts", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &wine_fonts_key, NULL )) return; @@ -5904,8 +5910,13 @@ void font_init(void) load_file_system_fonts(); font_funcs->load_fonts(); - if (!(mutex = CreateMutexW( NULL, FALSE, L"__WINE_FONT_MUTEX__" ))) return; - WaitForSingleObject( mutex, INFINITE ); + attr.Attributes = OBJ_OPENIF; + attr.ObjectName = &name; + name.Buffer = wine_font_mutexW; + name.Length = name.MaximumLength = sizeof(wine_font_mutexW); + + if (NtCreateMutant( &mutex, MUTEX_ALL_ACCESS, &attr, FALSE ) < 0) return; + NtWaitForSingleObject( mutex, FALSE, NULL ); RegCreateKeyExW( wine_fonts_key, L"Cache", 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &wine_fonts_cache_key, &disposition ); @@ -5916,7 +5927,7 @@ void font_init(void) update_external_font_keys(); } - ReleaseMutex( mutex ); + NtReleaseMutant( mutex, NULL ); if (disposition != REG_CREATED_NEW_KEY) {

1 0

Jacek Caban : gdi32: Remove workaround for old freetype versions.
by Alexandre Julliard 21 Sep '21

21 Sep '21

Module: wine Branch: master Commit: 862ae1a634cbf49f54622050b9bc60c95f019065 URL: https://source.winehq.org/git/wine.git/?a=commit;h=862ae1a634cbf49f54622050… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 21 15:54:36 2021 +0200 gdi32: Remove workaround for old freetype versions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 53 ++--------------------------------------------------- 1 file changed, 2 insertions(+), 51 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index f916ed97f01..11cec6b95ae 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5554,24 +5554,6 @@ DWORD WINAPI NtGdiGetGlyphIndicesW( HDC hdc, const WCHAR *str, INT count, * * ***********************************************************************/ -static BOOL CALLBACK load_enumed_resource(HMODULE hModule, LPCWSTR type, LPWSTR name, LONG_PTR lParam) -{ - HRSRC rsrc = FindResourceW(hModule, name, type); - HGLOBAL hMem = LoadResource(hModule, rsrc); - LPVOID *pMem = LockResource(hMem); - int *num_total = (int *)lParam; - DWORD num_in_res; - - TRACE("Found resource %s - trying to load\n", wine_dbgstr_w(type)); - if (!NtGdiAddFontMemResourceEx( pMem, SizeofResource(hModule, rsrc), NULL, 0, &num_in_res )) - { - ERR("Failed to load PE font resource mod=%p ptr=%p\n", hModule, hMem); - return FALSE; - } - - *num_total += num_in_res; - return TRUE; -} static int add_system_font_resource( const WCHAR *file, DWORD flags ) { @@ -5949,26 +5931,8 @@ void font_init(void) INT WINAPI NtGdiAddFontResourceW( const WCHAR *str, ULONG size, ULONG files, DWORD flags, DWORD tid, void *dv ) { - int ret; - if (!font_funcs) return 1; - if (!(ret = add_font_resource( str, flags ))) - { - /* FreeType <2.3.5 has problems reading resources wrapped in PE files. */ - HMODULE hModule = LoadLibraryExW(str, NULL, LOAD_LIBRARY_AS_DATAFILE); - if (hModule != NULL) - { - int num_resources = 0; - LPWSTR rt_font = (LPWSTR)((ULONG_PTR)8); /* we don't want to include winuser.h */ - - TRACE("WineEngAddFontResourceEx failed on PE file %s - trying to load resources manually\n", - wine_dbgstr_w(str)); - if (EnumResourceNamesW(hModule, rt_font, load_enumed_resource, (LONG_PTR)&num_resources)) - ret = num_resources; - FreeLibrary(hModule); - } - } - return ret; + return add_font_resource( str, flags ); } /*********************************************************************** @@ -6035,21 +5999,8 @@ BOOL WINAPI NtGdiRemoveFontMemResourceEx( HANDLE handle ) BOOL WINAPI NtGdiRemoveFontResourceW( const WCHAR *str, ULONG size, ULONG files, DWORD flags, DWORD tid, void *dv ) { - int ret; - if (!font_funcs) return TRUE; - - if (!(ret = remove_font_resource( str, flags ))) - { - /* FreeType <2.3.5 has problems reading resources wrapped in PE files. */ - HMODULE hModule = LoadLibraryExW(str, NULL, LOAD_LIBRARY_AS_DATAFILE); - if (hModule != NULL) - { - WARN("Can't unload resources from PE file %s\n", wine_dbgstr_w(str)); - FreeLibrary(hModule); - } - } - return ret; + return remove_font_resource( str, flags ); } /***********************************************************************

1 0

Nikolay Sivov : ole32/composite: Return requested interface in BindToObject() in NULL left moniker path.
by Alexandre Julliard 21 Sep '21

21 Sep '21

Module: wine Branch: master Commit: bbf0abdea5c8c8d3c77214fff995ef38077c902a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbf0abdea5c8c8d3c77214ff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 21 15:05:07 2021 +0300 ole32/composite: Return requested interface in BindToObject() in NULL left moniker path. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compositemoniker.c | 48 ++++++++++++++++++++----------------------- dlls/ole32/tests/moniker.c | 38 +++++++++++++++++++++++++++------- 2 files changed, 53 insertions(+), 33 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 5914008fe39..38a2e2a4892 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -323,37 +323,33 @@ CompositeMonikerImpl_GetSizeMax(IMoniker* iface,ULARGE_INTEGER* pcbSize) return S_OK; } -/****************************************************************************** - * CompositeMoniker_BindToObject - ******************************************************************************/ -static HRESULT WINAPI -CompositeMonikerImpl_BindToObject(IMoniker* iface, IBindCtx* pbc, - IMoniker* pmkToLeft, REFIID riid, VOID** ppvResult) +static HRESULT WINAPI CompositeMonikerImpl_BindToObject(IMoniker *iface, IBindCtx *pbc, + IMoniker *pmkToLeft, REFIID riid, void **result) { - HRESULT res; - IRunningObjectTable *prot; + IRunningObjectTable *rot; + IUnknown *object; + HRESULT hr; IMoniker *tempMk,*antiMk,*rightMostMk; IEnumMoniker *enumMoniker; - TRACE("(%p,%p,%p,%s,%p)\n",iface,pbc,pmkToLeft,debugstr_guid(riid),ppvResult); + TRACE("(%p,%p,%p,%s,%p)\n", iface, pbc, pmkToLeft, debugstr_guid(riid), result); - if (ppvResult==NULL) + if (!result) return E_POINTER; - *ppvResult=0; - /* If pmkToLeft is NULL, this method looks for the moniker in the ROT, and if found, queries the retrieved */ - /* object for the requested interface pointer. */ - if(pmkToLeft==NULL){ - - res=IBindCtx_GetRunningObjectTable(pbc,&prot); + *result = NULL; - if (SUCCEEDED(res)){ - - /* if the requested class was loaded before ! we don't need to reload it */ - res = IRunningObjectTable_GetObject(prot,iface,(IUnknown**)ppvResult); + if (!pmkToLeft) + { + hr = IBindCtx_GetRunningObjectTable(pbc, &rot); + if (SUCCEEDED(hr)) + { + hr = IRunningObjectTable_GetObject(rot, iface, &object); + IRunningObjectTable_Release(rot); + if (FAILED(hr)) return E_INVALIDARG; - if (res==S_OK) - return res; + hr = IUnknown_QueryInterface(object, riid, result); + IUnknown_Release(object); } } else{ @@ -364,17 +360,17 @@ CompositeMonikerImpl_BindToObject(IMoniker* iface, IBindCtx* pbc, IEnumMoniker_Next(enumMoniker,1,&rightMostMk,NULL); IEnumMoniker_Release(enumMoniker); - res=CreateAntiMoniker(&antiMk); - res=IMoniker_ComposeWith(iface,antiMk,0,&tempMk); + hr = CreateAntiMoniker(&antiMk); + hr = IMoniker_ComposeWith(iface,antiMk,0,&tempMk); IMoniker_Release(antiMk); - res=IMoniker_BindToObject(rightMostMk,pbc,tempMk,riid,ppvResult); + hr = IMoniker_BindToObject(rightMostMk,pbc,tempMk,riid,result); IMoniker_Release(tempMk); IMoniker_Release(rightMostMk); } - return res; + return hr; } /****************************************************************************** diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index b584f370d70..d65535a0584 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2906,8 +2906,9 @@ static void test_generic_composite_moniker(void) { IMoniker *moniker, *inverse, *inverse2, *moniker1, *moniker2, *moniker3, *moniker4; IEnumMoniker *enummoniker; + IRunningObjectTable *rot; + DWORD hash, cookie; HRESULT hr; - DWORD hash; IBindCtx *bindctx; FILETIME filetime; IUnknown *unknown; @@ -3032,15 +3033,9 @@ todo_wine hr = IMoniker_GetTimeOfLastChange(moniker, bindctx, NULL, &filetime); ok(hr == MK_E_NOTBINDABLE, "IMoniker_GetTimeOfLastChange should return MK_E_NOTBINDABLE, not 0x%08x\n", hr); - hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); - todo_wine - ok(hr == E_INVALIDARG, "IMoniker_BindToObject should return E_INVALIDARG, not 0x%08x\n", hr); - hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); ok(hr == E_INVALIDARG, "IMoniker_BindToStorage should return E_INVALIDARG, not 0x%08x\n", hr); - IBindCtx_Release(bindctx); - hr = IMoniker_Inverse(moniker, &inverse); ok(hr == S_OK, "Failed to get inverse, hr %#x.\n", hr); TEST_MONIKER_TYPE(inverse, MKSYS_GENERICCOMPOSITE); @@ -3059,7 +3054,36 @@ todo_wine todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + /* BindToObject() */ + hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IBindCtx_GetRunningObjectTable(bindctx, &rot); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IRunningObjectTable_Register(rot, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)moniker, + moniker, &cookie); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unknown); + + hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IMoniker, (void **)&unknown); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unknown); + + hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IDispatch, (void **)&unknown); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + + hr = IRunningObjectTable_Revoke(rot, cookie); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IRunningObjectTable_Release(rot); + IMoniker_Release(moniker); + + IBindCtx_Release(bindctx); } static void test_pointer_moniker(void)

1 0

Nikolay Sivov : ole32/composite: Store components as a pair of top level monikers.
by Alexandre Julliard 21 Sep '21

21 Sep '21

Module: wine Branch: master Commit: a767c6d6c61bb69749be615829bb4a1469b386bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a767c6d6c61bb69749be6158… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 21 15:05:08 2021 +0300 ole32/composite: Store components as a pair of top level monikers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compositemoniker.c | 966 +++++++++++++++++++++--------------------- dlls/ole32/tests/moniker.c | 48 ++- 2 files changed, 517 insertions(+), 497 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a767c6d6c61bb69749be…

1 0

Eric Pouech : dbghelp/dwarf: In DW_AT_ranges, the values are relative to the start of the CU.
by Alexandre Julliard 21 Sep '21

21 Sep '21

Module: wine Branch: master Commit: ab8fdb191c7fc3868decfa7d442898612bf9b4b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab8fdb191c7fc3868decfa7d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Sep 21 07:59:48 2021 +0200 dbghelp/dwarf: In DW_AT_ranges, the values are relative to the start of the CU. And not the module, as most of the other addresses. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index f67efc43993..3009dead905 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1222,6 +1222,9 @@ static BOOL dwarf2_read_range(dwarf2_parse_context_t* ctx, const dwarf2_debug_in high = dwarf2_parse_addr_head(&traverse, &ctx->head); if (low == 0 && high == 0) break; if (low == ULONG_MAX) FIXME("unsupported yet (base address selection)\n"); + /* range values are relative to start of compilation unit */ + low += ctx->compiland->address - ctx->module_ctx->load_offset; + high += ctx->compiland->address - ctx->module_ctx->load_offset; if (low < *plow) *plow = low; if (high > *phigh) *phigh = high; }

1 0

Rémi Bernon : winebus.sys: Remove the bogus SDL "unknown" HID report constant.
by Alexandre Julliard 21 Sep '21

21 Sep '21

Module: wine Branch: master Commit: 059764e87ea32b0c0bb32c84d5f4749558c874f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=059764e87ea32b0c0bb32c84… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 21 08:36:39 2021 +0200 winebus.sys: Remove the bogus SDL "unknown" HID report constant. It was used for XInput compatibility and is not needed anymore. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index b7734b4016e..bf36830b817 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -424,8 +424,7 @@ static NTSTATUS build_mapped_report_descriptor(struct platform_private *ext) ext->hat_bit_offs = CONTROLLER_NUM_BUTTONS; ext->buffer_length = (BUTTON_BIT_COUNT + 7) / 8 - + CONTROLLER_NUM_AXES * sizeof(WORD) - + 2/* unknown constant*/; + + CONTROLLER_NUM_AXES * sizeof(WORD); TRACE("Report will be %i bytes\n", ext->buffer_length); @@ -457,10 +456,6 @@ static NTSTATUS build_mapped_report_descriptor(struct platform_private *ext) return STATUS_NO_MEMORY; } - /* unknown constant */ - if (!hid_descriptor_add_padding(&ext->desc, 16)) - return STATUS_NO_MEMORY; - if (!descriptor_add_haptic(ext)) return STATUS_NO_MEMORY; @@ -475,10 +470,6 @@ static NTSTATUS build_mapped_report_descriptor(struct platform_private *ext) set_hat_value(ext, 0, compose_dpad_value(ext->sdl_controller)); - /* unknown constant */ - ext->report_buffer[14] = 0x89; - ext->report_buffer[15] = 0xc5; - return STATUS_SUCCESS; failed:

1 0

Rémi Bernon : winebus.sys: Enforce all axis values to be 32bit.
by Alexandre Julliard 21 Sep '21

21 Sep '21

Module: wine Branch: master Commit: d7c4867257e0388096839c3208fb6e8a7d19625e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7c4867257e0388096839c32… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 21 08:36:40 2021 +0200 winebus.sys: Enforce all axis values to be 32bit. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 40 +++++++++++++++++--------------------- dlls/winebus.sys/bus_udev.c | 15 ++++++-------- dlls/winebus.sys/hid.c | 43 +++++------------------------------------ dlls/winebus.sys/unix_private.h | 2 +- 4 files changed, 30 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d7c4867257e038809683…

1 0

Rémi Bernon : winebus.sys: Move hats before buttons and use one byte each.
by Alexandre Julliard 21 Sep '21

21 Sep '21

Module: wine Branch: master Commit: 593c4d51493c95b6ffa87c0572f893b42233d803 URL: https://source.winehq.org/git/wine.git/?a=commit;h=593c4d51493c95b6ffa87c05… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 21 08:36:41 2021 +0200 winebus.sys: Move hats before buttons and use one byte each. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 57 ++++++++++++++------------------------------- dlls/winebus.sys/bus_udev.c | 34 +++++++++++++-------------- dlls/winebus.sys/hid.c | 2 +- 3 files changed, 35 insertions(+), 58 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index a589814ee26..c83276aa873 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -126,7 +126,7 @@ struct platform_private int button_start; int axis_start; int ball_start; - int hat_bit_offs; /* hatswitches are reported in the same bytes as buttons */ + int hat_start; struct hid_descriptor desc; @@ -193,26 +193,8 @@ static void set_ball_value(struct platform_private *ext, int index, int value1, static void set_hat_value(struct platform_private *ext, int index, int value) { - int byte = ext->button_start + (ext->hat_bit_offs + 4 * index) / 8; - int bit_offs = (ext->hat_bit_offs + 4 * index) % 8; - int num_low_bits, num_high_bits; - unsigned char val, low_mask, high_mask; - - /* 4-bit hatswitch value is packed into button bytes */ - if (bit_offs <= 4) - { - num_low_bits = 4; - num_high_bits = 0; - low_mask = 0xf; - high_mask = 0; - } - else - { - num_low_bits = 8 - bit_offs; - num_high_bits = 4 - num_low_bits; - low_mask = (1 << num_low_bits) - 1; - high_mask = (1 << num_high_bits) - 1; - } + int byte = ext->hat_start + index; + unsigned char val; switch (value) { @@ -231,13 +213,7 @@ static void set_hat_value(struct platform_private *ext, int index, int value) default: return; } - ext->report_buffer[byte] &= ~(low_mask << bit_offs); - ext->report_buffer[byte] |= (val & low_mask) << bit_offs; - if (high_mask) - { - ext->report_buffer[byte + 1] &= ~high_mask; - ext->report_buffer[byte + 1] |= val & high_mask; - } + ext->report_buffer[byte] = val; } static BOOL descriptor_add_haptic(struct platform_private *ext) @@ -319,14 +295,14 @@ static NTSTATUS build_report_descriptor(struct platform_private *ext) report_size += (sizeof(DWORD) * 2 * ball_count); } + hat_count = pSDL_JoystickNumHats(ext->sdl_joystick); + ext->hat_start = report_size; + report_size += hat_count; + /* For now lump all buttons just into incremental usages, Ignore Keys */ button_count = pSDL_JoystickNumButtons(ext->sdl_joystick); ext->button_start = report_size; - - hat_count = pSDL_JoystickNumHats(ext->sdl_joystick); - ext->hat_bit_offs = button_count; - - report_size += (button_count + hat_count * 4 + 7) / 8; + report_size += (button_count + 7) / 8; TRACE("Report will be %i bytes\n", report_size); @@ -350,10 +326,10 @@ static NTSTATUS build_report_descriptor(struct platform_private *ext) &joystick_usages[axis_count], TRUE, INT32_MIN, INT32_MAX)) return STATUS_NO_MEMORY; - if (button_count && !hid_descriptor_add_buttons(&ext->desc, HID_USAGE_PAGE_BUTTON, 1, button_count)) + if (hat_count && !hid_descriptor_add_hatswitch(&ext->desc, hat_count)) return STATUS_NO_MEMORY; - if (hat_count && !hid_descriptor_add_hatswitch(&ext->desc, hat_count)) + if (button_count && !hid_descriptor_add_buttons(&ext->desc, HID_USAGE_PAGE_BUTTON, 1, button_count)) return STATUS_NO_MEMORY; if (!descriptor_add_haptic(ext)) @@ -413,13 +389,14 @@ static NTSTATUS build_mapped_report_descriptor(struct platform_private *ext) static const USAGE trigger_axis_usages[] = {HID_USAGE_GENERIC_Z, HID_USAGE_GENERIC_RZ}; INT i; - static const int BUTTON_BIT_COUNT = CONTROLLER_NUM_BUTTONS + CONTROLLER_NUM_HATSWITCHES * 4; + static const int BUTTON_BIT_COUNT = CONTROLLER_NUM_BUTTONS; ext->axis_start = 0; - ext->button_start = CONTROLLER_NUM_AXES * sizeof(DWORD); - ext->hat_bit_offs = CONTROLLER_NUM_BUTTONS; + ext->hat_start = CONTROLLER_NUM_AXES * sizeof(DWORD); + ext->button_start = ext->hat_start + CONTROLLER_NUM_HATSWITCHES; ext->buffer_length = (BUTTON_BIT_COUNT + 7) / 8 + + CONTROLLER_NUM_HATSWITCHES + CONTROLLER_NUM_AXES * sizeof(DWORD); TRACE("Report will be %i bytes\n", ext->buffer_length); @@ -439,10 +416,10 @@ static NTSTATUS build_mapped_report_descriptor(struct platform_private *ext) FALSE, 0, 0x7fff)) return STATUS_NO_MEMORY; - if (!hid_descriptor_add_buttons(&ext->desc, HID_USAGE_PAGE_BUTTON, 1, CONTROLLER_NUM_BUTTONS)) + if (!hid_descriptor_add_hatswitch(&ext->desc, CONTROLLER_NUM_HATSWITCHES)) return STATUS_NO_MEMORY; - if (!hid_descriptor_add_hatswitch(&ext->desc, 1)) + if (!hid_descriptor_add_buttons(&ext->desc, HID_USAGE_PAGE_BUTTON, 1, CONTROLLER_NUM_BUTTONS)) return STATUS_NO_MEMORY; if (BUTTON_BIT_COUNT % 8 != 0) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index e62c8c2eda1..00c64829172 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -496,6 +496,23 @@ static NTSTATUS build_report_descriptor(struct wine_input_private *ext, struct u rel_count++; } + hat_count = 0; + for (i = ABS_HAT0X; i <=ABS_HAT3X; i+=2) + { + if (!test_bit(absbits, i)) continue; + ext->hat_map[i - ABS_HAT0X] = report_size; + ext->hat_values[i - ABS_HAT0X] = 0; + ext->hat_values[i - ABS_HAT0X + 1] = 0; + report_size++; + hat_count++; + } + + if (hat_count) + { + if (!hid_descriptor_add_hatswitch(&ext->desc, hat_count)) + return STATUS_NO_MEMORY; + } + /* For now lump all buttons just into incremental usages, Ignore Keys */ ext->button_start = report_size; button_count = count_buttons(ext->base.device_fd, ext->button_map); @@ -514,23 +531,6 @@ static NTSTATUS build_report_descriptor(struct wine_input_private *ext, struct u report_size += (button_count + 7) / 8; } - hat_count = 0; - for (i = ABS_HAT0X; i <=ABS_HAT3X; i+=2) - { - if (!test_bit(absbits, i)) continue; - ext->hat_map[i - ABS_HAT0X] = report_size; - ext->hat_values[i - ABS_HAT0X] = 0; - ext->hat_values[i - ABS_HAT0X + 1] = 0; - report_size++; - hat_count++; - } - - if (hat_count) - { - if (!hid_descriptor_add_hatswitch(&ext->desc, hat_count)) - return STATUS_NO_MEMORY; - } - if (!hid_descriptor_end(&ext->desc)) return STATUS_NO_MEMORY; diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index feff8aec013..ba9fa4ba12d 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -138,7 +138,7 @@ BOOL hid_descriptor_add_hatswitch(struct hid_descriptor *desc, INT count) LOGICAL_MAXIMUM(1, 8), PHYSICAL_MINIMUM(1, 0), PHYSICAL_MAXIMUM(2, 8), - REPORT_SIZE(1, 4), + REPORT_SIZE(1, 8), REPORT_COUNT(4, count), UNIT(1, 0x0e /* none */), INPUT(1, Data|Var|Abs|Null),

1 0