wine-commits February 2016

wine-commits@winehq.org

2 participants
755 discussions

Józef Kucia : wined3d: Add support for WINED3DFMT_R32G32B32A32_UINT format.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: ea6070b93f7fab5589199c0661a8ba6fa0f7e318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea6070b93f7fab5589199c066… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 9 11:24:42 2016 +0100 wined3d: Add support for WINED3DFMT_R32G32B32A32_UINT format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0cc0b4c..d835bbe 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -200,6 +200,7 @@ static const struct wined3d_format_base_flags format_base_flags[] = {WINED3DFMT_R8G8B8A8_UINT, WINED3DFMT_FLAG_INTEGER}, {WINED3DFMT_R8G8B8A8_SINT, WINED3DFMT_FLAG_INTEGER}, {WINED3DFMT_R16_UINT, WINED3DFMT_FLAG_INTEGER}, + {WINED3DFMT_R32G32B32A32_UINT, WINED3DFMT_FLAG_INTEGER}, }; struct wined3d_format_block_info @@ -1315,6 +1316,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_DEPTH_STENCIL, GL_FLOAT_32_UNSIGNED_INT_24_8_REV, 8, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL | WINED3DFMT_FLAG_SHADOW, ARB_DEPTH_BUFFER_FLOAT, convert_s8_uint_d24_float}, + {WINED3DFMT_R32G32B32A32_UINT, GL_RGBA32UI, GL_RGBA32UI, 0, + GL_RGBA_INTEGER, GL_UNSIGNED_INT, 0, + WINED3DFMT_FLAG_TEXTURE, + EXT_TEXTURE_INTEGER, NULL}, /* Vendor-specific formats */ {WINED3DFMT_ATI1N, GL_COMPRESSED_RED_RGTC1, GL_COMPRESSED_RED_RGTC1, 0, GL_RED, GL_UNSIGNED_BYTE, 0,

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_R16_UINT format.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: ec45c894bc60008e8f6b9955e88adb33c92e1027 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec45c894bc60008e8f6b9955e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 9 11:24:41 2016 +0100 wined3d: Add support for WINED3DFMT_R16_UINT format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4d00281..0cc0b4c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -199,6 +199,7 @@ static const struct wined3d_format_base_flags format_base_flags[] = {WINED3DFMT_S8_UINT_D24_FLOAT, WINED3DFMT_FLAG_FLOAT}, {WINED3DFMT_R8G8B8A8_UINT, WINED3DFMT_FLAG_INTEGER}, {WINED3DFMT_R8G8B8A8_SINT, WINED3DFMT_FLAG_INTEGER}, + {WINED3DFMT_R16_UINT, WINED3DFMT_FLAG_INTEGER}, }; struct wined3d_format_block_info @@ -1138,6 +1139,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_RG, NULL}, + {WINED3DFMT_R16_UINT, GL_R16UI, GL_R16UI, 0, + GL_RED_INTEGER, GL_UNSIGNED_SHORT, 0, + WINED3DFMT_FLAG_TEXTURE, + ARB_TEXTURE_RG, NULL}, /* Luminance */ {WINED3DFMT_L8_UNORM, GL_LUMINANCE8, GL_SLUMINANCE8_EXT, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, 0, @@ -2319,6 +2324,11 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win && (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT)) continue; + /* ARB_texture_rg defines integer formats if ARB_texture_integer is also supported. */ + if (!gl_info->supported[EXT_TEXTURE_INTEGER] + && (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_INTEGER)) + continue; + format->glInternal = format_texture_info[i].gl_internal; format->glGammaInternal = format_texture_info[i].gl_srgb_internal; format->rtInternal = format_texture_info[i].gl_rt_internal;

1 0

Hugh McMaster : reg: Ask the user whether they want to overwrite an existing registry value.
by Alexandre Julliard 09 Feb '16

09 Feb '16

1 0

Hugh McMaster : reg: Output program name instead of the generic 'Error'.
by Alexandre Julliard 09 Feb '16

09 Feb '16

1 0

Hugh McMaster : reg: Specify the data type that is unsupported.
by Alexandre Julliard 09 Feb '16

09 Feb '16

1 0

Hugh McMaster : reg: Output messages with a variable number of arguments and convert message arrays to strings.
by Alexandre Julliard 09 Feb '16

09 Feb '16

1 0

Hugh McMaster : reg: Use FormatMessage for easier internationalization support.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: dfe1c2b57cbf5b99131136981b38e843ab832dec URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfe1c2b57cbf5b99131136981… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Feb 9 22:54:03 2016 +1100 reg: Use FormatMessage for easier internationalization support. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 7fddf62..33ae0cd 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -18,10 +18,13 @@ #include <windows.h> #include <wine/unicode.h> +#include <wine/debug.h> #include "reg.h" #define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) +WINE_DEFAULT_DEBUG_CHANNEL(reg); + static const WCHAR short_hklm[] = {'H','K','L','M',0}; static const WCHAR short_hkcu[] = {'H','K','C','U',0}; static const WCHAR short_hkcr[] = {'H','K','C','R',0}; @@ -74,7 +77,7 @@ type_rels[] = {REG_MULTI_SZ, type_multi_sz}, }; -static void output_writeconsole(const WCHAR *str, int wlen) +static void output_writeconsole(const WCHAR *str, DWORD wlen) { DWORD count, ret; @@ -100,11 +103,19 @@ static void output_writeconsole(const WCHAR *str, int wlen) static void output_formatstring(const WCHAR *fmt, __ms_va_list va_args) { - WCHAR msg_buffer[8192]; - int len; + WCHAR *str; + DWORD len; - len = vsnprintfW(msg_buffer, sizeof(msg_buffer)/sizeof(WCHAR), fmt, va_args); - output_writeconsole(msg_buffer, len); + SetLastError(NO_ERROR); + len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, + fmt, 0, 0, (WCHAR *)&str, 0, &va_args); + if (len == 0 && GetLastError() != NO_ERROR) + { + WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); + return; + } + output_writeconsole(str, len); + LocalFree(str); } static void reg_message(int msg) @@ -237,7 +248,7 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r } default: { - static const WCHAR unhandled[] = {'U','n','h','a','n','d','l','e','d',' ','T','y','p','e',' ','0','x','%','x',' ',' ','d','a','t','a',' ','%','s','\n',0}; + static const WCHAR unhandled[] = {'U','n','h','a','n','d','l','e','d',' ','T','y','p','e',' ','0','x','%','1','!','x','!',' ',' ','d','a','t','a',' ','%','2','\n',0}; output_string(unhandled, reg_type, data); } } @@ -446,7 +457,7 @@ static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL subkey) { static const WCHAR stubW[] = {'S','T','U','B',' ','Q','U','E','R','Y',' ', - '-',' ','%','s',' ','%','s',' ','%','d',' ','%','d','\n',0}; + '-',' ','%','1',' ','%','2',' ','%','3','!','d','!',' ','%','4','!','d','!','\n',0}; output_string(stubW, key_name, value_name, value_empty, subkey); return 1;

1 0

Hugh McMaster : reg: Split reg_printfW into separate functions.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: bfcee1f149f566452790049ce6591cf024608642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfcee1f149f566452790049ce… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Feb 9 22:54:02 2016 +1100 reg: Split reg_printfW into separate functions. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 52 ++++++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index e7729a3..7fddf62 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -74,19 +74,11 @@ type_rels[] = {REG_MULTI_SZ, type_multi_sz}, }; -static int reg_printfW(const WCHAR *msg, ...) +static void output_writeconsole(const WCHAR *str, int wlen) { - va_list va_args; - int wlen; DWORD count, ret; - WCHAR msg_buffer[8192]; - - va_start(va_args, msg); - vsnprintfW(msg_buffer, 8192, msg, va_args); - va_end(va_args); - wlen = lstrlenW(msg_buffer); - ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL); + ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, wlen, &count, NULL); if (!ret) { DWORD len; @@ -96,29 +88,41 @@ static int reg_printfW(const WCHAR *msg, ...) * back to WriteFile(), assuming the console encoding is still the right * one in that case. */ - len = WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen, - NULL, 0, NULL, NULL); + len = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, NULL, 0, NULL, NULL); msgA = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char)); - if (!msgA) - return 0; + if (!msgA) return; - WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen, msgA, len, - NULL, NULL); + WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, msgA, len, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); HeapFree(GetProcessHeap(), 0, msgA); } +} - return count; +static void output_formatstring(const WCHAR *fmt, __ms_va_list va_args) +{ + WCHAR msg_buffer[8192]; + int len; + + len = vsnprintfW(msg_buffer, sizeof(msg_buffer)/sizeof(WCHAR), fmt, va_args); + output_writeconsole(msg_buffer, len); } -static int reg_message(int msg) +static void reg_message(int msg) { - static const WCHAR formatW[] = {'%','s',0}; WCHAR msg_buffer[8192]; LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, sizeof(msg_buffer)/sizeof(WCHAR)); - return reg_printfW(formatW, msg_buffer); + output_writeconsole(msg_buffer, strlenW(msg_buffer)); +} + +static void __cdecl output_string(const WCHAR *fmt, ...) +{ + __ms_va_list va_args; + + __ms_va_start(va_args, fmt); + output_formatstring(fmt, va_args); + __ms_va_end(va_args); } static inline BOOL path_rootname_cmp(const WCHAR *input_path, const WCHAR *rootkey_name) @@ -193,7 +197,7 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r val = strtolW(data, &rest, 0); if (rest == data) { static const WCHAR nonnumber[] = {'E','r','r','o','r',':',' ','/','d',' ','r','e','q','u','i','r','e','s',' ','n','u','m','b','e','r','.','\n',0}; - reg_printfW(nonnumber); + output_string(nonnumber); break; } *reg_count = sizeof(DWORD); @@ -227,14 +231,14 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r no_hex_data: /* cleanup, print error */ HeapFree(GetProcessHeap(), 0, out_data); - reg_printfW(nohex); + output_string(nohex); out_data = NULL; break; } default: { static const WCHAR unhandled[] = {'U','n','h','a','n','d','l','e','d',' ','T','y','p','e',' ','0','x','%','x',' ',' ','d','a','t','a',' ','%','s','\n',0}; - reg_printfW(unhandled, reg_type,data); + output_string(unhandled, reg_type, data); } } @@ -443,7 +447,7 @@ static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, { static const WCHAR stubW[] = {'S','T','U','B',' ','Q','U','E','R','Y',' ', '-',' ','%','s',' ','%','s',' ','%','d',' ','%','d','\n',0}; - reg_printfW(stubW, key_name, value_name, value_empty, subkey); + output_string(stubW, key_name, value_name, value_empty, subkey); return 1; }

1 0

Jacek Caban : ntdll: Don't call NtOpenKeyEx directly from NtOpenKey.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: 7f005dc43cf76d09c9646969db1fa16639a1d960 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f005dc43cf76d09c9646969d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 9 12:12:43 2016 +0100 ntdll: Don't call NtOpenKeyEx directly from NtOpenKey. Needed by Office 2013. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/reg.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 6156409..8af2181 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -120,11 +120,7 @@ NTSTATUS WINAPI RtlpNtCreateKey( PHANDLE retkey, ACCESS_MASK access, const OBJEC return NtCreateKey(retkey, access, attr, 0, NULL, 0, dispos); } -/****************************************************************************** - * NtOpenKeyEx [NTDLL.@] - * ZwOpenKeyEx [NTDLL.@] - */ -NTSTATUS WINAPI NtOpenKeyEx( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, ULONG options ) +static NTSTATUS open_key( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, ULONG options ) { NTSTATUS ret; @@ -151,6 +147,15 @@ NTSTATUS WINAPI NtOpenKeyEx( PHANDLE retkey, ACCESS_MASK access, const OBJECT_AT } /****************************************************************************** + * NtOpenKeyEx [NTDLL.@] + * ZwOpenKeyEx [NTDLL.@] + */ +NTSTATUS WINAPI NtOpenKeyEx( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, ULONG options ) +{ + return open_key( retkey, access, attr, options ); +} + +/****************************************************************************** * NtOpenKey [NTDLL.@] * ZwOpenKey [NTDLL.@] * @@ -160,7 +165,7 @@ NTSTATUS WINAPI NtOpenKeyEx( PHANDLE retkey, ACCESS_MASK access, const OBJECT_AT */ NTSTATUS WINAPI NtOpenKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) { - return NtOpenKeyEx( retkey, access, attr, 0 ); + return open_key( retkey, access, attr, 0 ); } NTSTATUS WINAPI NtOpenKeyTransactedEx( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr,

1 0

Jacek Caban : ntdll: Pass SYNCHRONIZE flag in NtOpenFile and NtCreateFile calls.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: 443c2a4719cd366a254eaa387417c357935b5634 URL: http://source.winehq.org/git/wine.git/?a=commit;h=443c2a4719cd366a254eaa387… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 9 12:11:07 2016 +0100 ntdll: Pass SYNCHRONIZE flag in NtOpenFile and NtCreateFile calls. This is needed by Office 2013, which hooks those functions and expects flag to be set. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 4 ++-- dlls/ntdll/directory.c | 2 +- dlls/ntdll/loader.c | 4 ++-- dlls/ntdll/path.c | 2 +- dlls/ntdll/reg.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 715a760..4aa1a72 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2449,7 +2449,7 @@ static NTSTATUS open_nt_file( HANDLE *handle, UNICODE_STRING *name ) attr.ObjectName = name; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - return NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_ALERT ); + return NtOpenFile( handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_ALERT ); } static NTSTATUS get_module_filename( HMODULE module, UNICODE_STRING *str, unsigned int extra_len ) @@ -2790,7 +2790,7 @@ static NTSTATUS lookup_winsxs(struct actctx_loader* acl, struct assembly_identit attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (!NtOpenFile( &handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, + if (!NtOpenFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT )) { sxs_ai = *ai; diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 04c8e26..93fe594 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -3345,7 +3345,7 @@ NTSTATUS DIR_get_unix_cwd( char **cwd ) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - status = NtOpenFile( &handle, 0, &attr, &io, 0, + status = NtOpenFile( &handle, SYNCHRONIZE, &attr, &io, 0, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); RtlFreeUnicodeString( &dirW ); if (status != STATUS_SUCCESS) goto done; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 5bcc03e..bf1d365 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2149,7 +2149,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, attr.ObjectName = &nt_name; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE )) *handle = 0; + if (NtOpenFile( handle, GENERIC_READ|SYNCHRONIZE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE )) *handle = 0; goto found; } @@ -2184,7 +2184,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, attr.ObjectName = &nt_name; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE )) *handle = 0; + if (NtOpenFile( handle, GENERIC_READ|SYNCHRONIZE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE )) *handle = 0; } found: RtlFreeUnicodeString( &nt_name ); diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index feaac9e..ae0646a 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -984,7 +984,7 @@ NTSTATUS WINAPI RtlSetCurrentDirectory_U(const UNICODE_STRING* dir) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - nts = NtOpenFile( &handle, 0, &attr, &io, 0, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); + nts = NtOpenFile( &handle, SYNCHRONIZE, &attr, &io, 0, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); if (nts != STATUS_SUCCESS) goto out; /* don't keep the directory handle open on removable media */ diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 77126de..6156409 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -659,7 +659,7 @@ NTSTATUS WINAPI NtLoadKey( const OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *fil TRACE("(%p,%p)\n", attr, file); - ret = NtCreateFile(&hive, GENERIC_READ, file, &io, NULL, FILE_ATTRIBUTE_NORMAL, 0, + ret = NtCreateFile(&hive, GENERIC_READ | SYNCHRONIZE, file, &io, NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN, 0, NULL, 0); if (ret) return ret;

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2016