June 2020 - Wine-Commits - list.winehq.org

Rémi Bernon : user32: Implement GetRawInputBuffer.
by Alexandre Julliard June 30, 2020

June 30, 2020

Module: wine Branch: master Commit: 3a9edf9aad43c3e8ba724571da5381f821f1dc56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a9edf9aad43c3e8ba724571… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 25 19:08:43 2020 +0200 user32: Implement GetRawInputBuffer. CoD: WWII uses it to read mouse motion instead of listening to WM_INPUT messages. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 91 +++++++++++++++++++++++++++++++++++++++++- dlls/user32/tests/input.c | 27 ------------- dlls/user32/user_private.h | 2 +- include/wine/server_protocol.h | 21 +++++++++- server/protocol.def | 10 +++++ server/queue.c | 40 +++++++++++++++++++ server/request.h | 8 ++++ server/trace.c | 16 ++++++++ 8 files changed, 184 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3a9edf9aad43c3e8ba72…

1 0

Gijs Vermeulen : ntdll: Don't use WCHAR in unix_to_win_locale().
by Alexandre Julliard June 30, 2020

June 30, 2020

Module: wine Branch: master Commit: b6722aa7527abc71cb46ab75e4b875c288408d52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6722aa7527abc71cb46ab75… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Jun 30 16:44:54 2020 +0200 ntdll: Don't use WCHAR in unix_to_win_locale(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 49 +++++++++++++++++++------------------------------ 1 file changed, 19 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index e260e5c338..e57b625689 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -74,8 +74,8 @@ char **main_envp = NULL; static WCHAR **main_wargv; static CPTABLEINFO unix_table; -static WCHAR system_locale[LOCALE_NAME_MAX_LENGTH]; -static WCHAR user_locale[LOCALE_NAME_MAX_LENGTH]; +static char system_locale[LOCALE_NAME_MAX_LENGTH]; +static char user_locale[LOCALE_NAME_MAX_LENGTH]; static void *read_nls_file( const char *name ) { @@ -649,18 +649,11 @@ static WCHAR **build_wargv( char **argv ) /* Unix format is: lang[_country][.charset][@modifier] * Windows format is: lang[-script][-country][_modifier] */ -static BOOL unix_to_win_locale( const char *unix_name, WCHAR *win_name ) +static BOOL unix_to_win_locale( const char *unix_name, char *win_name ) { - static const WCHAR sepW[] = {'_','.','@',0}; - static const WCHAR posixW[] = {'P','O','S','I','X',0}; - static const WCHAR cW[] = {'C',0}; - static const WCHAR euroW[] = {'e','u','r','o',0}; - static const WCHAR latinW[] = {'l','a','t','i','n',0}; - static const WCHAR latnW[] = {'-','L','a','t','n',0}; - static const WCHAR enUSW[] = {'e','n','-','U','S',0}; - WCHAR buffer[LOCALE_NAME_MAX_LENGTH]; - WCHAR *p, *country = NULL, *modifier = NULL; - DWORD len; + static const char sep[] = "_.@"; + char buffer[LOCALE_NAME_MAX_LENGTH]; + char *p, *country = NULL, *modifier = NULL; if (!unix_name || !unix_name[0] || !strcmp( unix_name, "C" )) { @@ -668,16 +661,12 @@ static BOOL unix_to_win_locale( const char *unix_name, WCHAR *win_name ) if (!unix_name || !unix_name[0]) return FALSE; } - len = ntdll_umbstowcs( unix_name, strlen(unix_name), buffer, ARRAY_SIZE(buffer) ); - if (len == ARRAY_SIZE(buffer)) return FALSE; - buffer[len] = 0; - - if (!(p = wcspbrk( buffer, sepW ))) + if (!(p = strpbrk( buffer, sep ))) { - if (!wcscmp( buffer, posixW ) || !wcscmp( buffer, cW )) - wcscpy( win_name, enUSW ); + if (!strcmp( buffer, "POSIX" ) || !strcmp( buffer, "C" )) + strcpy( win_name, "en-US" ); else - wcscpy( win_name, buffer ); + strcpy( win_name, buffer ); return TRUE; } @@ -685,13 +674,13 @@ static BOOL unix_to_win_locale( const char *unix_name, WCHAR *win_name ) { *p++ = 0; country = p; - p = wcspbrk( p, sepW + 1 ); + p = strpbrk( p, sep + 1 ); } if (p && *p == '.') { *p++ = 0; /* charset, ignore */ - p = wcschr( p, '@' ); + p = strchr( p, '@' ); } if (p) { @@ -701,18 +690,18 @@ static BOOL unix_to_win_locale( const char *unix_name, WCHAR *win_name ) /* rebuild a Windows name */ - wcscpy( win_name, buffer ); + strcpy( win_name, buffer ); if (modifier) { - if (!wcscmp( modifier, latinW )) wcscat( win_name, latnW ); - else if (!wcscmp( modifier, euroW )) {} /* ignore */ + if (!strcmp( modifier, "latin" )) strcat( win_name, "-Latn" ); + else if (!strcmp( modifier, "euro" )) {} /* ignore */ else return FALSE; } if (country) { - p = win_name + wcslen(win_name); + p = win_name + strlen(win_name); *p++ = '-'; - wcscpy( p, country ); + strcpy( p, country ); } return TRUE; } @@ -1083,6 +1072,6 @@ void CDECL get_unix_codepage( CPTABLEINFO *table ) */ void CDECL get_locales( WCHAR *sys, WCHAR *user ) { - wcscpy( sys, system_locale ); - wcscpy( user, user_locale ); + ntdll_umbstowcs( system_locale, ARRAY_SIZE(system_locale), sys, LOCALE_NAME_MAX_LENGTH * sizeof(WCHAR) ); + ntdll_umbstowcs( user_locale, ARRAY_SIZE(user_locale), user, LOCALE_NAME_MAX_LENGTH * sizeof(WCHAR) ); }

1 0

Nikolay Sivov : evr: Add IMFVideoDeviceID for the presenter.
by Alexandre Julliard June 30, 2020

June 30, 2020

Module: wine Branch: master Commit: 50eb5eba6164b48d6e2b2436702070e69389939a URL: https://source.winehq.org/git/wine.git/?a=commit;h=50eb5eba6164b48d6e2b2436… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 30 16:34:01 2020 +0300 evr: Add IMFVideoDeviceID for the presenter. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 20 ++++++++++++++++++-- 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 234c1f076c..34c9a06fcf 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(evr); struct video_presenter { IMFVideoPresenter IMFVideoPresenter_iface; + IMFVideoDeviceID IMFVideoDeviceID_iface; IUnknown IUnknown_inner; IUnknown *outer_unk; LONG refcount; @@ -49,6 +50,11 @@ static struct video_presenter *impl_from_IMFVideoPresenter(IMFVideoPresenter *if return CONTAINING_RECORD(iface, struct video_presenter, IMFVideoPresenter_iface); } +static struct video_presenter *impl_from_IMFVideoDeviceID(IMFVideoDeviceID *iface) +{ + return CONTAINING_RECORD(iface, struct video_presenter, IMFVideoDeviceID_iface); +} + static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { struct video_presenter *presenter = impl_from_IUnknown(iface); @@ -64,6 +70,10 @@ static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFI { *obj = &presenter->IMFVideoPresenter_iface; } + else if (IsEqualIID(riid, &IID_IMFVideoDeviceID)) + { + *obj = &presenter->IMFVideoDeviceID_iface; + } else { WARN("Unimplemented interface %s.\n", debugstr_guid(riid)); @@ -188,6 +198,44 @@ static const IMFVideoPresenterVtbl video_presenter_vtbl = video_presenter_GetCurrentMediaType, }; +static HRESULT WINAPI video_presenter_device_id_QueryInterface(IMFVideoDeviceID *iface, REFIID riid, void **obj) +{ + struct video_presenter *presenter = impl_from_IMFVideoDeviceID(iface); + return IMFVideoPresenter_QueryInterface(&presenter->IMFVideoPresenter_iface, riid, obj); +} + +static ULONG WINAPI video_presenter_device_id_AddRef(IMFVideoDeviceID *iface) +{ + struct video_presenter *presenter = impl_from_IMFVideoDeviceID(iface); + return IMFVideoPresenter_AddRef(&presenter->IMFVideoPresenter_iface); +} + +static ULONG WINAPI video_presenter_device_id_Release(IMFVideoDeviceID *iface) +{ + struct video_presenter *presenter = impl_from_IMFVideoDeviceID(iface); + return IMFVideoPresenter_Release(&presenter->IMFVideoPresenter_iface); +} + +static HRESULT WINAPI video_presenter_device_id_GetDeviceID(IMFVideoDeviceID *iface, IID *device_id) +{ + TRACE("%p, %p.\n", iface, device_id); + + if (!device_id) + return E_POINTER; + + memcpy(device_id, &IID_IDirect3DDevice9, sizeof(*device_id)); + + return S_OK; +} + +static const IMFVideoDeviceIDVtbl video_presenter_device_id_vtbl = +{ + video_presenter_device_id_QueryInterface, + video_presenter_device_id_AddRef, + video_presenter_device_id_Release, + video_presenter_device_id_GetDeviceID, +}; + HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -208,6 +256,7 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) return E_OUTOFMEMORY; object->IMFVideoPresenter_iface.lpVtbl = &video_presenter_vtbl; + object->IMFVideoDeviceID_iface.lpVtbl = &video_presenter_device_id_vtbl; object->IUnknown_inner.lpVtbl = &video_presenter_inner_vtbl; object->outer_unk = outer ? outer : &object->IUnknown_inner; object->refcount = 1; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 6805a7ae2b..965b921937 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -869,15 +869,31 @@ done: static void test_default_presenter(void) { IMFVideoPresenter *presenter; + IMFVideoDeviceID *deviceid; HRESULT hr; + GUID iid; hr = MFCreateVideoPresenter(NULL, &IID_IMFVideoPresenter, &IID_IMFVideoPresenter, (void **)&presenter); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter); ok(hr == S_OK || broken(hr == E_FAIL) /* WinXP */, "Failed to create default presenter, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IMFVideoPresenter_Release(presenter); + if (FAILED(hr)) + return; + + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDeviceID, (void **)&deviceid); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDeviceID_GetDeviceID(deviceid, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDeviceID_GetDeviceID(deviceid, &iid); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(IsEqualIID(&iid, &IID_IDirect3DDevice9), "Unexpected id %s.\n", wine_dbgstr_guid(&iid)); + + IMFVideoDeviceID_Release(deviceid); + + IMFVideoPresenter_Release(presenter); } START_TEST(evr)

1 0

Piotr Caban : msi: Remove MSICOLUMNINFO.temporary field.
by Alexandre Julliard June 30, 2020

June 30, 2020

Module: wine Branch: master Commit: b61455cb81714ff4f4108b70584816adbffbc68a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b61455cb81714ff4f4108b70… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 30 05:40:57 2020 +0200 msi: Remove MSICOLUMNINFO.temporary field. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/table.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 3326958d94..d4912ab3ae 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -54,7 +54,6 @@ typedef struct tagMSICOLUMNINFO LPCWSTR colname; UINT type; UINT offset; - BOOL temporary; MSICOLUMNHASHENTRY **hash_table; } MSICOLUMNINFO; @@ -79,14 +78,14 @@ static const WCHAR szNumber[] = {'N','u','m','b','e','r',0}; static const WCHAR szType[] = {'T','y','p','e',0}; static const MSICOLUMNINFO _Columns_cols[4] = { - { szColumns, 1, szTable, MSITYPE_VALID | MSITYPE_STRING | MSITYPE_KEY | 64, 0, 0, NULL }, - { szColumns, 2, szNumber, MSITYPE_VALID | MSITYPE_KEY | 2, 2, 0, NULL }, - { szColumns, 3, szName, MSITYPE_VALID | MSITYPE_STRING | 64, 4, 0, NULL }, - { szColumns, 4, szType, MSITYPE_VALID | 2, 6, 0, NULL }, + { szColumns, 1, szTable, MSITYPE_VALID | MSITYPE_STRING | MSITYPE_KEY | 64, 0, NULL }, + { szColumns, 2, szNumber, MSITYPE_VALID | MSITYPE_KEY | 2, 2, NULL }, + { szColumns, 3, szName, MSITYPE_VALID | MSITYPE_STRING | 64, 4, NULL }, + { szColumns, 4, szType, MSITYPE_VALID | 2, 6, NULL }, }; static const MSICOLUMNINFO _Tables_cols[1] = { - { szTables, 1, szName, MSITYPE_VALID | MSITYPE_STRING | MSITYPE_KEY | 64, 0, 0, NULL }, + { szTables, 1, szName, MSITYPE_VALID | MSITYPE_STRING | MSITYPE_KEY | 64, 0, NULL }, }; #define MAX_STREAM_NAME 0x1f @@ -764,7 +763,6 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, table->colinfo[ i ].type = col->type; table->colinfo[ i ].offset = 0; table->colinfo[ i ].hash_table = NULL; - table->colinfo[ i ].temporary = (col->type & MSITYPE_TEMPORARY) != 0; } table_calc_column_offsets( db, table->colinfo, table->col_count); @@ -1613,7 +1611,7 @@ static UINT TABLE_get_column_info( struct tagMSIVIEW *view, *type = tv->columns[n-1].type; if( temporary ) - *temporary = tv->columns[n-1].temporary; + *temporary = (tv->columns[n-1].type & MSITYPE_TEMPORARY) != 0; return ERROR_SUCCESS; } @@ -1961,7 +1959,7 @@ static UINT TABLE_remove_column(struct tagMSIVIEW *view, LPCWSTR table, UINT num if (tv->table->col_count != number) return ERROR_BAD_QUERY_SYNTAX; - if (tv->table->colinfo[number-1].temporary) + if (tv->table->colinfo[number-1].type & MSITYPE_TEMPORARY) { UINT size = tv->table->colinfo[number-1].offset; tv->table->col_count--; @@ -2052,7 +2050,7 @@ static UINT TABLE_add_column(struct tagMSIVIEW *view, LPCWSTR column, return ERROR_SUCCESS; if (!temporary && tv->table->col_count && - tv->table->colinfo[tv->table->col_count-1].temporary) + tv->table->colinfo[tv->table->col_count-1].type & MSITYPE_TEMPORARY) return ERROR_BAD_QUERY_SYNTAX; for (i = 0; i < tv->table->col_count; i++) @@ -2077,7 +2075,6 @@ static UINT TABLE_add_column(struct tagMSIVIEW *view, LPCWSTR column, colinfo[tv->table->col_count].type = type; colinfo[tv->table->col_count].offset = 0; colinfo[tv->table->col_count].hash_table = NULL; - colinfo[tv->table->col_count].temporary = temporary; tv->table->col_count++; table_calc_column_offsets( tv->db, tv->table->colinfo, tv->table->col_count);

1 0

Piotr Caban : msi: Test freeing _TransformView table.
by Alexandre Julliard June 30, 2020

June 30, 2020

Module: wine Branch: master Commit: eb5a803bdbb8f602ae1212674a121cadd24642a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb5a803bdbb8f602ae121267… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 30 05:40:29 2020 +0200 msi: Test freeing _TransformView table. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/db.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 2bf03e1ac6..c49b5e6265 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3217,6 +3217,12 @@ static void test_try_transform(void) r = MsiCloseHandle(hview); ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + query = "ALTER TABLE `_TransformView` FREE"; + r = run_query( hdb, 0, query ); + ok( r == ERROR_SUCCESS, "cannot free _TransformView table: %d\n", r ); + r = run_query( hdb, 0, query ); + ok( r == ERROR_BAD_QUERY_SYNTAX, "_TransformView table still exist: %d\n", r ); + r = MsiDatabaseApplyTransformA( hdb, mstfile, 0 ); ok( r == ERROR_SUCCESS, "return code %d, should be ERROR_SUCCESS\n", r );

1 0

Alexandre Julliard : ntdll: Build with msvcrt.
by Alexandre Julliard June 30, 2020

June 30, 2020

1 0

Alexandre Julliard : ntdll: Move part of the PE image mapping code into virtual_map_section().
by Alexandre Julliard June 30, 2020

June 30, 2020

Module: wine Branch: master Commit: 4fcf20d1d120985a6056ef8e1861738c2e903660 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fcf20d1d120985a6056ef8e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 30 12:00:08 2020 +0200 ntdll: Move part of the PE image mapping code into virtual_map_section(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 209 ++++++++++++++++++---------------------------- server/mapping.c | 6 +- server/trace.c | 1 + 3 files changed, 88 insertions(+), 128 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4fcf20d1d120985a6056…

1 0

Alexandre Julliard : ntdll: Support loading a PE-format ntdll.
by Alexandre Julliard June 30, 2020

June 30, 2020

Module: wine Branch: master Commit: f89f7a54c25eb202e70225713ed39687be048e26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f89f7a54c25eb202e7022571… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 30 12:00:57 2020 +0200 ntdll: Support loading a PE-format ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 17 +++++++------- dlls/ntdll/unix/loader.c | 18 +++++++++++--- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unix/virtual.c | 53 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index efacc0c081..4657745a28 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1956,12 +1956,12 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, /************************************************************************* - * build_so_dll_module + * build_builtin_module * - * Build the module for a .so builtin library. + * Build the module for a builtin library. */ -static NTSTATUS build_so_dll_module( const WCHAR *load_path, const UNICODE_STRING *nt_name, - void *module, DWORD flags, WINE_MODREF **pwm ) +static NTSTATUS build_builtin_module( const WCHAR *load_path, const UNICODE_STRING *nt_name, + void *module, DWORD flags, WINE_MODREF **pwm ) { NTSTATUS status; pe_image_info_t image_info = { 0 }; @@ -2337,7 +2337,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, } else { - if ((status = build_so_dll_module( load_path, &win_name, module, flags, &wm ))) return status; + if ((status = build_builtin_module( load_path, &win_name, module, flags, &wm ))) return status; TRACE_(loaddll)( "Loaded %s at %p: builtin\n", debugstr_us(nt_name), module ); } *pwm = wm; @@ -3919,7 +3919,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) */ void __wine_process_init(void) { - extern IMAGE_NT_HEADERS __wine_spec_nt_header; static const WCHAR ntdllW[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', 's','y','s','t','e','m','3','2','\\', 'n','t','d','l','l','.','d','l','l',0}; @@ -3932,7 +3931,7 @@ void __wine_process_init(void) NTSTATUS status; ANSI_STRING func_name; UNICODE_STRING nt_name; - HMODULE ntdll_module = (HMODULE)((__wine_spec_nt_header.OptionalHeader.ImageBase + 0xffff) & ~0xffff); + MEMORY_BASIC_INFORMATION meminfo; INITIAL_TEB stack; ULONG_PTR val; TEB *teb = NtCurrentTeb(); @@ -3976,7 +3975,9 @@ void __wine_process_init(void) /* setup the load callback and create ntdll modref */ RtlInitUnicodeString( &nt_name, ntdllW ); - status = build_so_dll_module( params->DllPath.Buffer, &nt_name, ntdll_module, 0, &wm ); + NtQueryVirtualMemory( GetCurrentProcess(), __wine_process_init, MemoryBasicInformation, + &meminfo, sizeof(meminfo), NULL ); + status = build_builtin_module( params->DllPath.Buffer, &nt_name, meminfo.AllocationBase, 0, &wm ); assert( !status ); RtlInitUnicodeString( &nt_name, kernel32W ); diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index f6004c6081..b47efcd0e5 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -124,7 +124,7 @@ const char *build_dir = NULL; const char *config_dir = NULL; const char **dll_paths = NULL; const char *user_name = NULL; -HMODULE ntdll_module = NULL; +static HMODULE ntdll_module; struct file_id { @@ -1295,10 +1295,22 @@ found: */ static HMODULE load_ntdll(void) { + NTSTATUS status; void *module; - char *name = build_path( dll_dir, "ntdll.dll.so" ); - NTSTATUS status = dlopen_dll( name, &module ); + int fd; + char *name = build_path( dll_dir, "ntdll.dll" ); + if ((fd = open( name, O_RDONLY )) != -1) + { + status = virtual_map_ntdll( fd, &module ); + close( fd ); + } + else + { + free( name ); + name = build_path( dll_dir, "ntdll.dll.so" ); + status = dlopen_dll( name, &module ); + } if (status) fatal_error( "failed to load %s error %x\n", name, status ); free( name ); return module; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 6971e6fe91..71d6ee7d4f 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -134,7 +134,6 @@ extern const char *build_dir DECLSPEC_HIDDEN; extern const char *config_dir DECLSPEC_HIDDEN; extern const char *user_name DECLSPEC_HIDDEN; extern const char **dll_paths DECLSPEC_HIDDEN; -extern HMODULE ntdll_module DECLSPEC_HIDDEN; extern USHORT *uctable DECLSPEC_HIDDEN; extern USHORT *lctable DECLSPEC_HIDDEN; extern SIZE_T startup_info_size DECLSPEC_HIDDEN; @@ -190,6 +189,7 @@ extern NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct o data_size_t *ret_len ) DECLSPEC_HIDDEN; extern void virtual_init(void) DECLSPEC_HIDDEN; +extern NTSTATUS virtual_map_ntdll( int fd, void **module ) DECLSPEC_HIDDEN; extern ULONG_PTR get_system_affinity_mask(void) DECLSPEC_HIDDEN; extern void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_create_builtin_view( void *module ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 2fe46c400a..d998966b5f 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2413,6 +2413,59 @@ void virtual_init(void) } +/*********************************************************************** + * virtual_map_ntdll + * + * Map ntdll, used instead of virtual_map_section() because some things are not initialized yet. + */ +NTSTATUS virtual_map_ntdll( int fd, void **module ) +{ + IMAGE_DOS_HEADER dos; + IMAGE_NT_HEADERS nt; + NTSTATUS status; + SIZE_T size; + void *base; + unsigned int vprot; + struct file_view *view; + + /* load the headers */ + + size = pread( fd, &dos, sizeof(dos), 0 ); + if (size < sizeof(dos)) return STATUS_INVALID_IMAGE_FORMAT; + if (dos.e_magic != IMAGE_DOS_SIGNATURE) return STATUS_INVALID_IMAGE_FORMAT; + + size = pread( fd, &nt, sizeof(nt), dos.e_lfanew ); + if (size < sizeof(nt)) return STATUS_INVALID_IMAGE_PROTECT; + if (nt.Signature != IMAGE_NT_SIGNATURE) return STATUS_INVALID_IMAGE_FORMAT; + if (nt.OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR_MAGIC) return STATUS_INVALID_IMAGE_FORMAT; +#ifdef __i386__ + if (nt.FileHeader.Machine != IMAGE_FILE_MACHINE_I386) return STATUS_INVALID_IMAGE_FORMAT; +#elif defined(__x86_64__) + if (nt.FileHeader.Machine != IMAGE_FILE_MACHINE_AMD64) return STATUS_INVALID_IMAGE_FORMAT; +#elif defined(__arm__) + if (nt.FileHeader.Machine != IMAGE_FILE_MACHINE_ARM && + nt.FileHeader.Machine != IMAGE_FILE_MACHINE_THUMB && + nt.FileHeader.Machine != IMAGE_FILE_MACHINE_ARMNT) return STATUS_INVALID_IMAGE_FORMAT; +#elif defined(__aarch64__) + if (nt.FileHeader.Machine != IMAGE_FILE_MACHINE_ARM64) return STATUS_INVALID_IMAGE_FORMAT; +#endif + + base = (void *)nt.OptionalHeader.ImageBase; + size = ROUND_SIZE( 0, nt.OptionalHeader.SizeOfImage ); + vprot = SEC_IMAGE | SEC_FILE | VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY; + + status = map_view( &view, base, size, FALSE, vprot, 0 ); + if (status == STATUS_CONFLICTING_ADDRESSES) + ERR( "couldn't load ntdll at preferred address %p\n", base ); + if (status) return status; + *module = view->base; + return map_image_into_view( view, fd, base, nt.OptionalHeader.SizeOfHeaders, 0, -1, FALSE ); +} + + +/*********************************************************************** + * get_system_affinity_mask + */ ULONG_PTR get_system_affinity_mask(void) { ULONG num_cpus = NtCurrentTeb()->Peb->NumberOfProcessors;

1 0

Alexandre Julliard : ntdll: Use the standard C library names for the string functions.
by Alexandre Julliard June 30, 2020

June 30, 2020

Module: wine Branch: master Commit: cfc9da22f58659e57d20d76c1c45b91da9dca789 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfc9da22f58659e57d20d76c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 30 12:06:01 2020 +0200 ntdll: Use the standard C library names for the string functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 78 ++++++++++++++++----------------- dlls/ntdll/ntdll_misc.h | 21 --------- dlls/ntdll/string.c | 114 ++++++++++++++++++++++++------------------------ 3 files changed, 96 insertions(+), 117 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cfc9da22f58659e57d20…

1 0

Alexandre Julliard : ntdll: Use the standard C library names for the wide char functions.
by Alexandre Julliard June 30, 2020

June 30, 2020

Module: wine Branch: master Commit: 70fceaa2fe581ed41408faa368ff3f6833fd463c URL: https://source.winehq.org/git/wine.git/?a=commit;h=70fceaa2fe581ed41408faa3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 30 12:07:01 2020 +0200 ntdll: Use the standard C library names for the wide char functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 4 +-- dlls/ntdll/ntdll.spec | 60 ++++++++++++++++++------------------- dlls/ntdll/ntdll_misc.h | 41 ------------------------- dlls/ntdll/wcstring.c | 80 ++++++++++++++++++++++++------------------------- 4 files changed, 72 insertions(+), 113 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=70fceaa2fe581ed41408…

1 0