February 2016 - Wine-Commits

Józef Kucia : wined3d: Add support for WINED3DFMT_R32G32B32A32_UINT format.
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

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

Hugh McMaster : reg: Output program name instead of the generic 'Error'.
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

1 0

Hugh McMaster : reg: Ask the user whether they want to overwrite an existing registry value.
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_R16_UINT format.
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

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: Specify the data type that is unsupported.
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

1 0

Hugh McMaster : reg: Output messages with a variable number of arguments and convert message arrays to strings.
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

1 0

Jacek Caban : ntdll: Don't call NtOpenKeyEx directly from NtOpenKey.
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

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

Alexandre Julliard : server: Support opening file objects from any root, not only directories.
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

Module: wine Branch: master Commit: 6ccefdb7c59d6bea1650b661c9b72bb7096a3a97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ccefdb7c59d6bea1650b661c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 20:19:34 2016 +0900 server: Support opening file objects from any root, not only directories. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 26 ++++++-------------------- server/file.c | 11 ++++++++++- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/server/fd.c b/server/fd.c index 28f5346..e995380 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2393,27 +2393,13 @@ DECL_HANDLER(flush) DECL_HANDLER(open_file_object) { struct unicode_str name = get_req_unicode_str(); - struct directory *root = NULL; - struct object *obj, *result; + struct object *obj, *result, *root = NULL; - if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) - { - if (get_error() != STATUS_OBJECT_TYPE_MISMATCH) return; - if (!(obj = (struct object *)get_file_obj( current->process, req->rootdir, 0 ))) return; - if (name.len) - { - release_object( obj ); - set_error( STATUS_OBJECT_PATH_NOT_FOUND ); - return; - } - clear_error(); - } - else - { - obj = open_object_dir( root, &name, req->attributes, NULL ); - if (root) release_object( root ); - if (!obj) return; - } + if (req->rootdir && !(root = get_handle_obj( current->process, req->rootdir, 0, NULL ))) return; + + obj = open_named_object( root, NULL, &name, req->attributes ); + if (root) release_object( root ); + if (!obj) return; if ((result = obj->ops->open_file( obj, req->access, req->sharing, req->options ))) { diff --git a/server/file.c b/server/file.c index 15fd411..dacb24a 100644 --- a/server/file.c +++ b/server/file.c @@ -68,6 +68,7 @@ static struct object_type *file_get_type( struct object *obj ); static struct fd *file_get_fd( struct object *obj ); static struct security_descriptor *file_get_sd( struct object *obj ); static int file_set_sd( struct object *obj, const struct security_descriptor *sd, unsigned int set_info ); +static struct object *file_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); static struct object *file_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); static void file_destroy( struct object *obj ); @@ -90,7 +91,7 @@ static const struct object_ops file_ops = default_fd_map_access, /* map_access */ file_get_sd, /* get_sd */ file_set_sd, /* set_sd */ - no_lookup_name, /* lookup_name */ + file_lookup_name, /* lookup_name */ no_link_name, /* link_name */ NULL, /* unlink_name */ file_open_file, /* open_file */ @@ -609,6 +610,14 @@ static int file_set_sd( struct object *obj, const struct security_descriptor *sd return 1; } +static struct object *file_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) +{ + if (!name || !name->len) return NULL; /* open the file itself */ + + set_error( STATUS_OBJECT_PATH_NOT_FOUND ); + return NULL; +} + static struct object *file_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ) {

1 0

Alexandre Julliard : libwine: Map partial DBCS characters to the default char.
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

Module: wine Branch: master Commit: 62033734961f29ea95c489700648026949da4b19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62033734961f29ea95c489700… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 13:44:26 2016 +0900 libwine: Map partial DBCS characters to the default char. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/codepage.c | 8 ++++---- libs/wine/c_10001.c | 16 ++++++++-------- libs/wine/c_10002.c | 24 ++++++++++++------------ libs/wine/c_10003.c | 24 ++++++++++++------------ libs/wine/c_10008.c | 22 +++++++++++----------- libs/wine/c_1361.c | 32 ++++++++++++++++---------------- libs/wine/c_20932.c | 30 +++++++++++++++--------------- libs/wine/c_932.c | 16 ++++++++-------- libs/wine/c_936.c | 32 ++++++++++++++++---------------- libs/wine/c_949.c | 32 ++++++++++++++++---------------- libs/wine/c_950.c | 32 ++++++++++++++++---------------- libs/wine/mbtowc.c | 16 ++++++++-------- tools/make_unicode | 4 ++-- 13 files changed, 144 insertions(+), 144 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=62033734961f29ea95c48…

1 0

Hugh McMaster : reg: Use FormatMessage for easier internationalization support.
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

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