Page MenuHomeSolus
Differential D3767 Diff 9373 files/d3d9-helper.patch

Changeset View

Standalone View

View Options

files/d3d9-helper.patch

From 6ccba02d4f144a415394642dcd37a88ed29a40a4 Mon Sep 17 00:00:00 2001 From 58190cd8c0e5e9cefe55f3a74c5c2fe223eea3eb Mon Sep 17 00:00:00 2001
From: Nick Sarnie <sarnex@gentoo.org> From: Nick Sarnie <sarnex@gentoo.org>
Date: Sun, 24 Jun 2018 13:53:50 -0400 Date: Sun, 2 Sep 2018 10:29:11 -0400
Subject: [PATCH] D3D9 Helper Subject: [PATCH] D3D9 Helper
Signed-off-by: Nick Sarnie <sarnex@gentoo.org> Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
--- ---
dlls/ntdll/loader.c | 205 ++++++++++++++++++++---- dlls/ntdll/loader.c | 205 ++++++++++++++++++++----
dlls/ntdll/loadorder.c | 298 ++++++++++++++++++++++++++--------- dlls/ntdll/loadorder.c | 298 ++++++++++++++++++++++++++---------
dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/ntdll_misc.h | 1 +
programs/winecfg/Makefile.in | 1 + programs/winecfg/Makefile.in | 1 +
programs/winecfg/main.c | 12 +- programs/winecfg/main.c | 12 +-
programs/winecfg/resource.h | 5 + programs/winecfg/resource.h | 5 +
programs/winecfg/staging.c | 93 +++++++++++ programs/winecfg/staging.c | 93 +++++++++++
programs/winecfg/winecfg.h | 1 + programs/winecfg/winecfg.h | 1 +
programs/winecfg/winecfg.rc | 10 ++ programs/winecfg/winecfg.rc | 10 ++
9 files changed, 522 insertions(+), 104 deletions(-) 9 files changed, 522 insertions(+), 104 deletions(-)
create mode 100644 programs/winecfg/staging.c create mode 100644 programs/winecfg/staging.c
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 3e00ec6314..e026581352 100644 index 26b2431047..de57f5428b 100644
--- a/dlls/ntdll/loader.c --- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c
@@ -100,6 +100,7 @@ struct builtin_load_info @@ -110,6 +110,7 @@ struct builtin_load_info
{ {
const WCHAR *load_path; const WCHAR *load_path;
const WCHAR *filename; const WCHAR *filename;
+ const WCHAR *fakemodule; + const WCHAR *fakemodule;
NTSTATUS status; NTSTATUS status;
WINE_MODREF *wm; WINE_MODREF *wm;
}; };
@@ -125,7 +126,8 @@ static WINE_MODREF *cached_modref; @@ -135,7 +136,8 @@ static WINE_MODREF *cached_modref;
static WINE_MODREF *current_modref; static WINE_MODREF *current_modref;
static WINE_MODREF *last_failed_modref; static WINE_MODREF *last_failed_modref;
-static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_MODREF** pwm ); -static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_MODREF** pwm );
+static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, LPCWSTR fakemodule, +static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, LPCWSTR fakemodule,
+ DWORD flags, WINE_MODREF** pwm ); + DWORD flags, WINE_MODREF** pwm );
static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ); static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved );
static FARPROC find_ordinal_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, static FARPROC find_ordinal_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports,
DWORD exp_size, DWORD ordinal, LPCWSTR load_path ); DWORD exp_size, DWORD ordinal, LPCWSTR load_path );
@@ -478,7 +480,7 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS @@ -511,7 +513,7 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS
if (!(wm = find_basename_module( mod_name ))) if (!(wm = find_basename_module( mod_name )))
{ {
TRACE( "delay loading %s for '%s'\n", debugstr_w(mod_name), forward ); TRACE( "delay loading %s for '%s'\n", debugstr_w(mod_name), forward );
- if (load_dll( load_path, mod_name, 0, &wm ) == STATUS_SUCCESS && - if (load_dll( load_path, mod_name, 0, &wm ) == STATUS_SUCCESS &&
+ if (load_dll( load_path, mod_name, NULL, 0, &wm ) == STATUS_SUCCESS && + if (load_dll( load_path, mod_name, NULL, 0, &wm ) == STATUS_SUCCESS &&
!(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) !(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS))
{ {
if (!imports_fixup_done && current_modref) if (!imports_fixup_done && current_modref)
@@ -649,7 +651,7 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP @@ -682,7 +684,7 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP
{ {
ascii_to_unicode( buffer, name, len ); ascii_to_unicode( buffer, name, len );
buffer[len] = 0; buffer[len] = 0;
- status = load_dll( load_path, buffer, 0, &wmImp ); - status = load_dll( load_path, buffer, 0, &wmImp );
+ status = load_dll( load_path, buffer, NULL, 0, &wmImp ); + status = load_dll( load_path, buffer, NULL, 0, &wmImp );
} }
else /* need to allocate a larger buffer */ else /* need to allocate a larger buffer */
{ {
@@ -657,7 +659,7 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP @@ -690,7 +692,7 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP
if (!ptr) return FALSE; if (!ptr) return FALSE;
ascii_to_unicode( ptr, name, len ); ascii_to_unicode( ptr, name, len );
ptr[len] = 0; ptr[len] = 0;
- status = load_dll( load_path, ptr, 0, &wmImp ); - status = load_dll( load_path, ptr, 0, &wmImp );
+ status = load_dll( load_path, ptr, NULL, 0, &wmImp ); + status = load_dll( load_path, ptr, NULL, 0, &wmImp );
RtlFreeHeap( GetProcessHeap(), 0, ptr ); RtlFreeHeap( GetProcessHeap(), 0, ptr );
} }
@@ -943,7 +945,7 @@ static NTSTATUS fixup_imports_ilonly( WINE_MODREF *wm, LPCWSTR load_path, void * @@ -976,7 +978,7 @@ static NTSTATUS fixup_imports_ilonly( WINE_MODREF *wm, LPCWSTR load_path, void *
prev = current_modref; prev = current_modref;
current_modref = wm; current_modref = wm;
- if (!(status = load_dll( load_path, mscoreeW, 0, &imp ))) wm->deps[0] = imp; - if (!(status = load_dll( load_path, mscoreeW, 0, &imp ))) wm->deps[0] = imp;
+ if (!(status = load_dll( load_path, mscoreeW, NULL, 0, &imp ))) wm->deps[0] = imp; + if (!(status = load_dll( load_path, mscoreeW, NULL, 0, &imp ))) wm->deps[0] = imp;
current_modref = prev; current_modref = prev;
if (status) if (status)
{ {
@@ -1031,7 +1033,7 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) @@ -1064,7 +1066,7 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path )
* Allocate a WINE_MODREF structure and add it to the process list * Allocate a WINE_MODREF structure and add it to the process list
* The loader_section must be locked while calling this function. * The loader_section must be locked while calling this function.
*/ */
-static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) -static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename )
+static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename, LPCWSTR fakemodule ) +static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename, LPCWSTR fakemodule )
{ {
WINE_MODREF *wm; WINE_MODREF *wm;
const WCHAR *p; const WCHAR *p;
@@ -1045,7 +1047,7 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) @@ -1078,7 +1080,7 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename )
wm->ldr.TlsIndex = -1; wm->ldr.TlsIndex = -1;
wm->ldr.LoadCount = 1; wm->ldr.LoadCount = 1;
- RtlCreateUnicodeString( &wm->ldr.FullDllName, filename ); - RtlCreateUnicodeString( &wm->ldr.FullDllName, filename );
+ RtlCreateUnicodeString( &wm->ldr.FullDllName, fakemodule ? fakemodule : filename ); + RtlCreateUnicodeString( &wm->ldr.FullDllName, fakemodule ? fakemodule : filename );
if ((p = strrchrW( wm->ldr.FullDllName.Buffer, '\\' ))) p++; if ((p = strrchrW( wm->ldr.FullDllName.Buffer, '\\' ))) p++;
else p = wm->ldr.FullDllName.Buffer; else p = wm->ldr.FullDllName.Buffer;
RtlInitUnicodeString( &wm->ldr.BaseDllName, p ); RtlInitUnicodeString( &wm->ldr.BaseDllName, p );
@@ -1676,7 +1678,7 @@ static void load_builtin_callback( void *module, const char *filename ) @@ -1745,7 +1747,7 @@ static void load_builtin_callback( void *module, const char *filename )
return; return;
} }
- wm = alloc_module( module, fullname ); - wm = alloc_module( module, fullname );
+ wm = alloc_module( module, fullname, builtin_load_info->fakemodule ); + wm = alloc_module( module, fullname, builtin_load_info->fakemodule );
RtlFreeHeap( GetProcessHeap(), 0, fullname ); RtlFreeHeap( GetProcessHeap(), 0, fullname );
if (!wm) if (!wm)
{ {
@@ -1886,8 +1888,8 @@ static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info ) @@ -1955,8 +1957,8 @@ static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info )
/****************************************************************************** /******************************************************************************
* load_native_dll (internal) * load_native_dll (internal)
*/ */
-static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, -static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file,
- DWORD flags, WINE_MODREF** pwm, struct stat *st ) - DWORD flags, WINE_MODREF** pwm, struct stat *st )
+static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, LPCWSTR fakemodule, +static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, LPCWSTR fakemodule,
+ HANDLE file, DWORD flags, WINE_MODREF** pwm, struct stat *st ) + HANDLE file, DWORD flags, WINE_MODREF** pwm, struct stat *st )
{ {
void *module; void *module;
HANDLE mapping; HANDLE mapping;
@@ -1930,7 +1932,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, @@ -1999,7 +2001,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file,
/* create the MODREF */ /* create the MODREF */
- if (!(wm = alloc_module( module, name ))) - if (!(wm = alloc_module( module, name )))
+ if (!(wm = alloc_module( module, name, fakemodule ))) + if (!(wm = alloc_module( module, name, fakemodule )))
{ {
if (module) NtUnmapViewOfSection( NtCurrentProcess(), module ); if (module) NtUnmapViewOfSection( NtCurrentProcess(), module );
return STATUS_NO_MEMORY; return STATUS_NO_MEMORY;
@@ -1998,8 +2000,8 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, @@ -2067,8 +2069,8 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file,
/*********************************************************************** /***********************************************************************
* load_builtin_dll * load_builtin_dll
*/ */
-static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file, -static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file,
- DWORD flags, WINE_MODREF** pwm ) - DWORD flags, WINE_MODREF** pwm )
+static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, LPCWSTR fakemodule, +static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, LPCWSTR fakemodule,
+ HANDLE file, DWORD flags, WINE_MODREF** pwm ) + HANDLE file, DWORD flags, WINE_MODREF** pwm )
{ {
char error[256], dllname[MAX_PATH]; char error[256], dllname[MAX_PATH];
const WCHAR *name, *p; const WCHAR *name, *p;
@@ -2019,6 +2021,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file, @@ -2088,6 +2090,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file,
*/ */
info.load_path = load_path; info.load_path = load_path;
info.filename = NULL; info.filename = NULL;
+ info.fakemodule = fakemodule; + info.fakemodule = fakemodule;
info.status = STATUS_SUCCESS; info.status = STATUS_SUCCESS;
info.wm = NULL; info.wm = NULL;
@@ -2217,6 +2220,108 @@ done: @@ -2286,6 +2289,108 @@ done:
return status; return status;
} }
+#if defined(__i386__) +#if defined(__i386__)
+#define CURRENT_ARCH IMAGE_FILE_MACHINE_I386 +#define CURRENT_ARCH IMAGE_FILE_MACHINE_I386
+#elif defined(__x86_64__) +#elif defined(__x86_64__)
+#define CURRENT_ARCH IMAGE_FILE_MACHINE_AMD64 +#define CURRENT_ARCH IMAGE_FILE_MACHINE_AMD64
+#elif defined(__arm__) +#elif defined(__arm__)
▲ Show 20 Lines • Show All 92 Lines • ▼ Show 20 Lines
+ return ext_header.FileHeader.Machine; + return ext_header.FileHeader.Machine;
+ } + }
+ +
+ return 0; + return 0;
+} +}
/*********************************************************************** /***********************************************************************
* open_dll_file * open_dll_file
@@ -2263,7 +2368,7 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct @@ -2332,7 +2437,7 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct
*/ */
static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname,
WCHAR *filename, ULONG *size, WINE_MODREF **pwm, WCHAR *filename, ULONG *size, WINE_MODREF **pwm,
- HANDLE *handle, struct stat *st ) - HANDLE *handle, struct stat *st )
+ HANDLE *handle, struct stat *st, BOOL check_arch ) + HANDLE *handle, struct stat *st, BOOL check_arch )
{ {
UNICODE_STRING nt_name; UNICODE_STRING nt_name;
WCHAR *file_part, *ext, *dllname; WCHAR *file_part, *ext, *dllname;
@@ -2308,20 +2413,41 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, @@ -2377,20 +2482,41 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname,
if (RtlDetermineDosPathNameType_U( libname ) == RELATIVE_PATH) if (RtlDetermineDosPathNameType_U( libname ) == RELATIVE_PATH)
{ {
- /* we need to search for it */ - /* we need to search for it */
- len = RtlDosSearchPath_U( load_path, libname, NULL, *size, filename, &file_part ); - len = RtlDosSearchPath_U( load_path, libname, NULL, *size, filename, &file_part );
- if (len) - if (len)
+ while (load_path) + while (load_path)
{ {
Show All 29 Lines
+ if (*handle) goto found; + if (*handle) goto found;
+ +
+ next: + next:
+ load_path = strchrW(load_path, ';'); + load_path = strchrW(load_path, ';');
+ if (load_path) load_path++; + if (load_path) load_path++;
} }
/* not found */ /* not found */
@@ -2369,8 +2495,10 @@ overflow: @@ -2438,8 +2564,10 @@ overflow:
* Load a PE style module according to the load order. * Load a PE style module according to the load order.
* The loader_section must be locked while calling this function. * The loader_section must be locked while calling this function.
*/ */
-static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_MODREF** pwm ) -static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_MODREF** pwm )
+static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, LPCWSTR fakemodule, +static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, LPCWSTR fakemodule,
+ DWORD flags, WINE_MODREF** pwm ) + DWORD flags, WINE_MODREF** pwm )
{ {
+ BOOL data = flags & (LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE); + BOOL data = flags & (LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE);
enum loadorder loadorder; enum loadorder loadorder;
WCHAR buffer[64]; WCHAR buffer[64];
WCHAR *filename; WCHAR *filename;
@@ -2387,7 +2515,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ @@ -2456,7 +2584,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_
size = sizeof(buffer); size = sizeof(buffer);
for (;;) for (;;)
{ {
- nts = find_dll_file( load_path, libname, filename, &size, pwm, &handle, &st ); - nts = find_dll_file( load_path, libname, filename, &size, pwm, &handle, &st );
+ nts = find_dll_file( load_path, libname, filename, &size, pwm, &handle, &st, !data ); + nts = find_dll_file( load_path, libname, filename, &size, pwm, &handle, &st, !data );
if (nts == STATUS_SUCCESS) break; if (nts == STATUS_SUCCESS) break;
if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename ); if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename );
if (nts != STATUS_BUFFER_TOO_SMALL) return nts; if (nts != STATUS_BUFFER_TOO_SMALL) return nts;
@@ -2407,6 +2535,25 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ @@ -2476,6 +2604,25 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_
} }
main_exe = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); main_exe = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress );
+ +
+ /* handle dll redirection */ + /* handle dll redirection */
+ if (!fakemodule) + if (!fakemodule)
+ { + {
+ BYTE buffer2[sizeof(KEY_VALUE_PARTIAL_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; + BYTE buffer2[sizeof(KEY_VALUE_PARTIAL_INFORMATION) + MAX_PATH * sizeof(WCHAR)];
Show All 9 Lines
+ if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename ); + if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename );
+ return nts; + return nts;
+ } + }
+ } + }
+ +
loadorder = get_load_order( main_exe ? main_exe->ldr.BaseDllName.Buffer : NULL, filename ); loadorder = get_load_order( main_exe ? main_exe->ldr.BaseDllName.Buffer : NULL, filename );
if (handle && is_fake_dll( handle )) if (handle && is_fake_dll( handle ))
@@ -2429,22 +2576,22 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ @@ -2498,22 +2645,22 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_
if (!handle) nts = STATUS_DLL_NOT_FOUND; if (!handle) nts = STATUS_DLL_NOT_FOUND;
else else
{ {
- nts = load_native_dll( load_path, filename, handle, flags, pwm, &st ); - nts = load_native_dll( load_path, filename, handle, flags, pwm, &st );
+ nts = load_native_dll( load_path, filename, fakemodule, handle, flags, pwm, &st ); + nts = load_native_dll( load_path, filename, fakemodule, handle, flags, pwm, &st );
if (nts == STATUS_INVALID_IMAGE_NOT_MZ) if (nts == STATUS_INVALID_IMAGE_NOT_MZ)
/* not in PE format, maybe it's a builtin */ /* not in PE format, maybe it's a builtin */
- nts = load_builtin_dll( load_path, filename, handle, flags, pwm ); - nts = load_builtin_dll( load_path, filename, handle, flags, pwm );
Show All 11 Lines+ nts = load_builtin_dll( load_path, filename, fakemodule, handle, flags, pwm );
if (!handle) break; /* nothing else we can try */ if (!handle) break; /* nothing else we can try */
/* file is not a builtin library, try without using the specified file */ /* file is not a builtin library, try without using the specified file */
if (nts != STATUS_SUCCESS) if (nts != STATUS_SUCCESS)
- nts = load_builtin_dll( load_path, filename, 0, flags, pwm ); - nts = load_builtin_dll( load_path, filename, 0, flags, pwm );
+ nts = load_builtin_dll( load_path, filename, fakemodule, 0, flags, pwm ); + nts = load_builtin_dll( load_path, filename, fakemodule, 0, flags, pwm );
if (nts == STATUS_SUCCESS && loadorder == LO_DEFAULT && if (nts == STATUS_SUCCESS && loadorder == LO_DEFAULT &&
(MODULE_InitDLL( *pwm, DLL_WINE_PREATTACH, NULL ) != STATUS_SUCCESS)) (MODULE_InitDLL( *pwm, DLL_WINE_PREATTACH, NULL ) != STATUS_SUCCESS))
{ {
@@ -2454,7 +2601,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ @@ -2523,7 +2670,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_
nts = STATUS_DLL_NOT_FOUND; nts = STATUS_DLL_NOT_FOUND;
} }
if (nts == STATUS_DLL_NOT_FOUND && loadorder != LO_BUILTIN) if (nts == STATUS_DLL_NOT_FOUND && loadorder != LO_BUILTIN)
- nts = load_native_dll( load_path, filename, handle, flags, pwm, &st ); - nts = load_native_dll( load_path, filename, handle, flags, pwm, &st );
+ nts = load_native_dll( load_path, filename, fakemodule, handle, flags, pwm, &st ); + nts = load_native_dll( load_path, filename, fakemodule, handle, flags, pwm, &st );
break; break;
} }
@@ -2487,7 +2634,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags, @@ -2556,7 +2703,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags,
RtlEnterCriticalSection( &loader_section ); RtlEnterCriticalSection( &loader_section );
if (!path_name) path_name = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; if (!path_name) path_name = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer;
- nts = load_dll( path_name, libname->Buffer, flags, &wm ); - nts = load_dll( path_name, libname->Buffer, flags, &wm );
+ nts = load_dll( path_name, libname->Buffer, NULL, flags, &wm ); + nts = load_dll( path_name, libname->Buffer, NULL, flags, &wm );
if (nts == STATUS_SUCCESS && !(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) if (nts == STATUS_SUCCESS && !(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS))
{ {
@@ -2526,7 +2673,7 @@ NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_S @@ -2595,7 +2742,7 @@ NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_S
size = sizeof(buffer); size = sizeof(buffer);
for (;;) for (;;)
{ {
- status = find_dll_file( load_path, name->Buffer, filename, &size, &wm, &handle, &st ); - status = find_dll_file( load_path, name->Buffer, filename, &size, &wm, &handle, &st );
+ status = find_dll_file( load_path, name->Buffer, filename, &size, &wm, &handle, &st, TRUE ); + status = find_dll_file( load_path, name->Buffer, filename, &size, &wm, &handle, &st, TRUE );
if (handle) NtClose( handle ); if (handle) NtClose( handle );
if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename ); if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename );
if (status != STATUS_BUFFER_TOO_SMALL) break; if (status != STATUS_BUFFER_TOO_SMALL) break;
@@ -3448,7 +3595,7 @@ void __wine_process_init(void) @@ -3517,7 +3664,7 @@ void __wine_process_init(void)
/* setup the load callback and create ntdll modref */ /* setup the load callback and create ntdll modref */
wine_dll_set_callback( load_builtin_callback ); wine_dll_set_callback( load_builtin_callback );
- if ((status = load_builtin_dll( NULL, kernel32W, 0, 0, &wm )) != STATUS_SUCCESS) - if ((status = load_builtin_dll( NULL, kernel32W, 0, 0, &wm )) != STATUS_SUCCESS)
+ if ((status = load_builtin_dll( NULL, kernel32W, NULL, 0, 0, &wm )) != STATUS_SUCCESS) + if ((status = load_builtin_dll( NULL, kernel32W, NULL, 0, 0, &wm )) != STATUS_SUCCESS)
{ {
MESSAGE( "wine: could not load kernel32.dll, status %x\n", status ); MESSAGE( "wine: could not load kernel32.dll, status %x\n", status );
exit(1); exit(1);
▲ Show 20 Lines • Show All 435 Lines • ▼ Show 20 Lines
+ psp[pg].pszTitle = load_string (IDS_TAB_STAGING); + psp[pg].pszTitle = load_string (IDS_TAB_STAGING);
+ psp[pg].lParam = 0; + psp[pg].lParam = 0;
+ pg++; + pg++;
+ +
/* /*
* Fill out the (General) PROPSHEETPAGE data structure * Fill out the (General) PROPSHEETPAGE data structure
* for the property sheet * for the property sheet
diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h
index 0c0b038ff9..f0e370ecd6 100644 index 2760e92c00..0584422ab5 100644
--- a/programs/winecfg/resource.h --- a/programs/winecfg/resource.h
+++ b/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h
@@ -45,6 +45,7 @@ @@ -45,6 +45,7 @@
#define IDS_SHELL_FOLDER 16 #define IDS_SHELL_FOLDER 16
#define IDS_LINKS_TO 17 #define IDS_LINKS_TO 17
#define IDS_WINECFG_TITLE_APP 18 /* App specific title */ #define IDS_WINECFG_TITLE_APP 18 /* App specific title */
+#define IDS_TAB_STAGING 19 +#define IDS_TAB_STAGING 19
#define IDI_WINECFG 100 #define IDI_WINECFG 100
#define IDI_LOGO 102 #define IDI_LOGO 102
#define IDD_ABOUTCFG 107 #define IDD_ABOUTCFG 107
@@ -54,6 +55,7 @@ @@ -54,6 +55,7 @@
#define IDD_DLLCFG 111 #define IDD_DLLCFG 111
#define IDD_DRIVECFG 112 #define IDD_DRIVECFG 112
#define IDD_DESKTOP_INTEGRATION 115 #define IDD_DESKTOP_INTEGRATION 115
+#define IDD_STAGING 116 +#define IDD_STAGING 116
#define IDC_WINVER 1012 #define IDC_WINVER 1012
#define IDC_DESKTOP_WIDTH 1023 #define IDC_DESKTOP_WIDTH 1023
#define IDC_DESKTOP_HEIGHT 1024 #define IDC_DESKTOP_HEIGHT 1024
@@ -218,3 +220,6 @@ @@ -219,3 +221,6 @@
#define IDC_ABT_TITLE_TEXT 8436 #define IDC_ABT_TITLE_TEXT 8436
#define IDC_ABT_WEB_LINK 8437 #define IDC_ABT_WEB_LINK 8437
#define IDC_ABT_LICENSE_TEXT 8438 #define IDC_ABT_LICENSE_TEXT 8438
+ +
+/* Staging tab */ +/* Staging tab */
+#define IDC_ENABLE_NATIVE_D3D9 9001 +#define IDC_ENABLE_NATIVE_D3D9 9001
diff --git a/programs/winecfg/staging.c b/programs/winecfg/staging.c diff --git a/programs/winecfg/staging.c b/programs/winecfg/staging.c
new file mode 100644 new file mode 100644
▲ Show 20 Lines • Show All 90 Lines • ▼ Show 20 Lines
+ SendMessageW(GetParent(hDlg), PSM_CHANGED, 0, 0); + SendMessageW(GetParent(hDlg), PSM_CHANGED, 0, 0);
+ return TRUE; + return TRUE;
+ } + }
+ break; + break;
+ } + }
+ return FALSE; + return FALSE;
+} +}
diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h
index f2c24a2012..bbe60e4c5c 100644 index 110856a536..a94947439c 100644
--- a/programs/winecfg/winecfg.h --- a/programs/winecfg/winecfg.h
+++ b/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h
@@ -89,6 +89,7 @@ INT_PTR CALLBACK AppDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -87,6 +87,7 @@ INT_PTR CALLBACK AppDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
INT_PTR CALLBACK LibrariesDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK LibrariesDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
INT_PTR CALLBACK AudioDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK AudioDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
INT_PTR CALLBACK ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK StagingDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK StagingDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
INT_PTR CALLBACK AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
/* Drive management */ /* Drive management */
diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc
index 5908b491d4..a2da7e6b3a 100644 index 33f54d43b2..d12522e758 100644
--- a/programs/winecfg/winecfg.rc --- a/programs/winecfg/winecfg.rc
+++ b/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc
@@ -39,6 +39,7 @@ BEGIN @@ -39,6 +39,7 @@ BEGIN
IDS_TAB_GRAPHICS "Graphics" IDS_TAB_GRAPHICS "Graphics"
IDS_TAB_DESKTOP_INTEGRATION "Desktop Integration" IDS_TAB_DESKTOP_INTEGRATION "Desktop Integration"
IDS_TAB_AUDIO "Audio" IDS_TAB_AUDIO "Audio"
+ IDS_TAB_STAGING "Staging" + IDS_TAB_STAGING "Staging"
IDS_TAB_ABOUT "About" IDS_TAB_ABOUT "About"
IDS_WINECFG_TITLE "Wine configuration" IDS_WINECFG_TITLE "Wine configuration"
IDS_WINECFG_TITLE_APP "Wine configuration for %s" IDS_WINECFG_TITLE_APP "Wine configuration for %s"
@@ -308,6 +309,15 @@ BEGIN @@ -312,6 +313,15 @@ BEGIN
PUSHBUTTON "B&rowse...",IDC_BROWSE_SFPATH,195,195,50,13,WS_DISABLED PUSHBUTTON "B&rowse...",IDC_BROWSE_SFPATH,195,195,50,13,WS_DISABLED
END END
+IDD_STAGING DIALOG 0, 0, 260, 220 +IDD_STAGING DIALOG 0, 0, 260, 220
+STYLE WS_CHILD | WS_DISABLED +STYLE WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg"
+BEGIN +BEGIN
+ GROUPBOX "Staging settings",IDC_STATIC,8,4,244,210 + GROUPBOX "Staging settings",IDC_STATIC,8,4,244,210
Show All 10 Lines
Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.