Changeset View
Changeset View
Standalone View
Standalone View
files/d3d9-helper.patch
| From b2754287c16240b4d46da8ef89df9f471ad31ac0 Mon Sep 17 00:00:00 2001 | From 6c098bfed3f441e9b3a15ca82d52a3327fd2eb77 Mon Sep 17 00:00:00 2001 | ||||
| From: Nick Sarnie <sarnex@gentoo.org> | From: Nick Sarnie <sarnex@gentoo.org> | ||||
| Date: Sun, 11 Nov 2018 12:24:29 -0500 | Date: Wed, 23 Jan 2019 21:23:56 -0500 | ||||
| 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 c5e8d0d7c1..4aa342ac74 100644 | index 631e8bd998..72c0dd4b2a 100644 | ||||
| --- a/dlls/ntdll/loader.c | --- a/dlls/ntdll/loader.c | ||||
| +++ b/dlls/ntdll/loader.c | +++ b/dlls/ntdll/loader.c | ||||
| @@ -110,6 +110,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; | ||||
| ▲ Show 20 Lines • Show All 67 Lines • ▼ Show 20 Lines | @@ -1744,7 +1746,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) | ||||
| { | { | ||||
| @@ -1999,8 +2001,8 @@ static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info ) | @@ -1995,8 +1997,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; | ||||
| @@ -2043,7 +2045,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, | @@ -2039,7 +2041,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; | ||||
| @@ -2111,8 +2113,8 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, | @@ -2107,8 +2109,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; | ||||
| @@ -2132,6 +2134,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file, | @@ -2128,6 +2130,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; | ||||
| @@ -2330,6 +2333,108 @@ done: | @@ -2326,6 +2329,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 | ||||
| @@ -2376,7 +2481,7 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct | @@ -2372,7 +2477,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; | ||||
| @@ -2421,20 +2526,41 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, | @@ -2417,20 +2522,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 */ | ||||
| @@ -2482,8 +2608,10 @@ overflow: | @@ -2478,8 +2604,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; | ||||
| @@ -2500,7 +2628,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ | @@ -2496,7 +2624,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; | ||||
| @@ -2520,6 +2648,25 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ | @@ -2516,6 +2644,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 )) | ||||
| @@ -2542,22 +2689,22 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ | @@ -2538,22 +2685,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)) | ||||
| { | { | ||||
| @@ -2567,7 +2714,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ | @@ -2563,7 +2710,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; | ||||
| } | } | ||||
| @@ -2600,7 +2747,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags, | @@ -2596,7 +2743,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)) | ||||
| { | { | ||||
| @@ -2639,7 +2786,7 @@ NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_S | @@ -2635,7 +2782,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; | ||||
| @@ -3560,7 +3707,7 @@ void __wine_process_init(void) | @@ -3570,7 +3717,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 381 Lines • ▼ Show 20 Lines | |||||
| + ret = NULL; | + ret = NULL; | ||||
| + TRACE( "no redirection found for %s\n", debugstr_w(path) ); | + TRACE( "no redirection found for %s\n", debugstr_w(path) ); | ||||
| + | + | ||||
| + done: | + done: | ||||
| + RtlFreeHeap( GetProcessHeap(), 0, module ); | + RtlFreeHeap( GetProcessHeap(), 0, module ); | ||||
| + return ret; | + return ret; | ||||
| +} | +} | ||||
| diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h | diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h | ||||
| index fdb443b45c..4edd453c52 100644 | index 1630978f0a..b24b39a8b3 100644 | ||||
| --- a/dlls/ntdll/ntdll_misc.h | --- a/dlls/ntdll/ntdll_misc.h | ||||
| +++ b/dlls/ntdll/ntdll_misc.h | +++ b/dlls/ntdll/ntdll_misc.h | ||||
| @@ -215,6 +215,7 @@ enum loadorder | @@ -217,6 +217,7 @@ enum loadorder | ||||
| }; | }; | ||||
| extern enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path ) DECLSPEC_HIDDEN; | extern enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path ) DECLSPEC_HIDDEN; | ||||
| +extern WCHAR* get_redirect( const WCHAR *app_name, const WCHAR *path, BYTE *buffer, ULONG size ) DECLSPEC_HIDDEN; | +extern WCHAR* get_redirect( const WCHAR *app_name, const WCHAR *path, BYTE *buffer, ULONG size ) DECLSPEC_HIDDEN; | ||||
| struct debug_info | struct debug_info | ||||
| { | { | ||||
| diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in | diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in | ||||
| index d516778834..dd847307cd 100644 | index 4e66e04e31..1cf70310d5 100644 | ||||
| --- a/programs/winecfg/Makefile.in | --- a/programs/winecfg/Makefile.in | ||||
| +++ b/programs/winecfg/Makefile.in | +++ b/programs/winecfg/Makefile.in | ||||
| @@ -11,6 +11,7 @@ C_SRCS = \ | @@ -11,6 +11,7 @@ C_SRCS = \ | ||||
| driveui.c \ | driveui.c \ | ||||
| libraries.c \ | libraries.c \ | ||||
| main.c \ | main.c \ | ||||
| + staging.c \ | + staging.c \ | ||||
| theme.c \ | theme.c \ | ||||
| ▲ Show 20 Lines • Show All 191 Lines • ▼ Show 20 Lines | |||||
| + LTEXT "The following settings are experimental and may break stuff!\nMake sure to reset them again in case of a problem.\nGallium Nine requires MESA graphic drivers and AMD/Nvidia GPU.\n",IDC_STATIC,16,16,230,24 | + LTEXT "The following settings are experimental and may break stuff!\nMake sure to reset them again in case of a problem.\nGallium Nine requires MESA graphic drivers and AMD/Nvidia GPU.\n",IDC_STATIC,16,16,230,24 | ||||
| + CONTROL "Enable &Gallium Nine for better D3D9 graphic performance.",IDC_ENABLE_NATIVE_D3D9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,40,230,8 | + CONTROL "Enable &Gallium Nine for better D3D9 graphic performance.",IDC_ENABLE_NATIVE_D3D9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,40,230,8 | ||||
| +END | +END | ||||
| + | + | ||||
| LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL | LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL | ||||
| /* @makedep: winecfg.ico */ | /* @makedep: winecfg.ico */ | ||||
| -- | -- | ||||
| 2.19.1 | 2.20.1 | ||||
Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.