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

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to wined3d_sampler_bind().
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: 90485cdcc723616d6ba1f56e1468498f422c2564 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90485cdcc723616d6ba1f56e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 13 16:28:36 2019 +0430 wined3d: Pass a wined3d_context_gl structure to wined3d_sampler_bind(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/sampler.c | 5 ++--- dlls/wined3d/state.c | 2 +- dlls/wined3d/view.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 8c3a947..bfc3aec 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -182,10 +182,9 @@ static void texture_gl_apply_base_level(struct wined3d_texture_gl *texture_gl, /* This function relies on the correct texture being bound and loaded. */ void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, - struct wined3d_texture_gl *texture_gl, const struct wined3d_context *context) + struct wined3d_texture_gl *texture_gl, const struct wined3d_context_gl *context_gl) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; if (gl_info->supported[ARB_SAMPLER_OBJECTS]) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d87f608..06b30ba 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3638,7 +3638,7 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state } } - wined3d_sampler_bind(sampler, mapped_stage, texture_gl, context); + wined3d_sampler_bind(sampler, mapped_stage, texture_gl, context_gl); /* Trigger shader constant reloading (for NP2 texcoord fixup) */ if (!(texture_gl->t.flags & WINED3D_TEXTURE_POW2_MAT_IDENT)) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 06e24fb..d74c36f 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -839,7 +839,7 @@ void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl if (view_gl->gl_view.name) { wined3d_context_gl_bind_texture(context_gl, view_gl->gl_view.target, view_gl->gl_view.name); - wined3d_sampler_bind(sampler, unit, NULL, context); + wined3d_sampler_bind(sampler, unit, NULL, context_gl); return; } @@ -851,7 +851,7 @@ void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl texture_gl = wined3d_texture_gl(wined3d_texture_from_resource(view_gl->v.resource)); wined3d_texture_gl_bind(texture_gl, context_gl, FALSE); - wined3d_sampler_bind(sampler, unit, texture_gl, context); + wined3d_sampler_bind(sampler, unit, texture_gl, context_gl); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ece1aca..31eb31a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3685,7 +3685,7 @@ struct wined3d_sampler }; void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, - struct wined3d_texture_gl *texture_gl, const struct wined3d_context *context) DECLSPEC_HIDDEN; + struct wined3d_texture_gl *texture_gl, const struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; struct wined3d_vertex_declaration_element {

1 0

Alexandre Julliard : msisip: Build with msvcrt.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: 91792d9cf066981e7f0e2e5a2a561fe4570e3bf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91792d9cf066981e7f0e2e5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 08:44:23 2019 +0200 msisip: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msisip/Makefile.in | 2 ++ dlls/msisip/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msisip/Makefile.in b/dlls/msisip/Makefile.in index fa1b3e6..c19f183 100644 --- a/dlls/msisip/Makefile.in +++ b/dlls/msisip/Makefile.in @@ -1,5 +1,7 @@ MODULE = msisip.dll IMPORTS = crypt32 ole32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/msisip/main.c b/dlls/msisip/main.c index 882db3d..aabea78 100644 --- a/dlls/msisip/main.c +++ b/dlls/msisip/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include "windef.h" #include "winbase.h"

1 0

Alexandre Julliard : server: Fix the returned error code for an invalid NT header offset.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: f59d05223d68522853dae6aa52f2308da759a94b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f59d05223d68522853dae6aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 20:30:35 2019 +0200 server: Fix the returned error code for an invalid NT header offset. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47359 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 5 +++++ server/mapping.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index bc6f4ab..eb02e95 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1153,6 +1153,11 @@ static void test_Loader(void) } ((IMAGE_OS2_HEADER *)&nt_header)->ne_exetyp = ((IMAGE_OS2_HEADER *)&nt_header_template)->ne_exetyp; + dos_header.e_lfanew = 0x98760000; + status = map_image_section( &nt_header, &section, section_data, __LINE__ ); + ok( status == STATUS_INVALID_IMAGE_PROTECT, "NtCreateSection error %08x\n", status ); + + dos_header.e_lfanew = sizeof(dos_header); nt_header.Signature = 0xdeadbeef; status = map_image_section( &nt_header, &section, section_data, __LINE__ ); ok( status == STATUS_INVALID_IMAGE_PROTECT, "NtCreateSection error %08x\n", status ); diff --git a/server/mapping.c b/server/mapping.c index 8a6c4f1..0728fdc 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -593,7 +593,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s pos = mz.dos.e_lfanew; size = pread( unix_fd, &nt, sizeof(nt), pos ); - if (size < sizeof(nt.Signature) + sizeof(nt.FileHeader)) return STATUS_INVALID_IMAGE_FORMAT; + if (size < sizeof(nt.Signature) + sizeof(nt.FileHeader)) return STATUS_INVALID_IMAGE_PROTECT; /* zero out Optional header in the case it's not present or partial */ size = min( size, sizeof(nt.Signature) + sizeof(nt.FileHeader) + nt.FileHeader.SizeOfOptionalHeader ); if (size < sizeof(nt)) memset( (char *)&nt + size, 0, sizeof(nt) - size );

1 0

Alexandre Julliard : jscript: Consistently use wcscmp() instead of lstrcmpW().
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: 784b3f611a2bb89072650e264b5346feeb7751d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=784b3f611a2bb89072650e26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 14:47:56 2019 +0200 jscript: Consistently use wcscmp() instead of lstrcmpW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 8 ++++---- dlls/jscript/dispex.c | 4 ++-- dlls/jscript/engine.c | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 7746744..e38e5c5 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1419,7 +1419,7 @@ static HRESULT compile_continue_statement(compiler_ctx_t *ctx, branch_statement_ for(iter = ctx->stat_ctx; iter; iter = iter->next) { if(iter->continue_label) pop_ctx = iter; - if(iter->labelled_stat && !lstrcmpW(iter->labelled_stat->identifier, stat->identifier)) + if(iter->labelled_stat && !wcscmp(iter->labelled_stat->identifier, stat->identifier)) break; } @@ -1465,7 +1465,7 @@ static HRESULT compile_break_statement(compiler_ctx_t *ctx, branch_statement_t * if(stat->identifier) { for(pop_ctx = ctx->stat_ctx; pop_ctx; pop_ctx = pop_ctx->next) { - if(pop_ctx->labelled_stat && !lstrcmpW(pop_ctx->labelled_stat->identifier, stat->identifier)) { + if(pop_ctx->labelled_stat && !wcscmp(pop_ctx->labelled_stat->identifier, stat->identifier)) { assert(pop_ctx->break_label); break; } @@ -1549,7 +1549,7 @@ static HRESULT compile_labelled_statement(compiler_ctx_t *ctx, labelled_statemen HRESULT hres; for(iter = ctx->stat_ctx; iter; iter = iter->next) { - if(iter->labelled_stat && !lstrcmpW(iter->labelled_stat->identifier, stat->identifier)) { + if(iter->labelled_stat && !wcscmp(iter->labelled_stat->identifier, stat->identifier)) { WARN("Label %s redefined\n", debugstr_w(stat->identifier)); return JS_E_LABEL_REDEFINED; } @@ -1825,7 +1825,7 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_ctx_t *stat_ctx, static int function_local_cmp(const void *key, const struct wine_rb_entry *entry) { function_local_t *local = WINE_RB_ENTRY_VALUE(entry, function_local_t, entry); - return CompareStringOrdinal(key, -1, local->name, -1, FALSE) - 2; + return wcscmp(key, local->name); } static inline function_local_t *find_local(compiler_ctx_t *ctx, const WCHAR *name) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 032facd..b1f2914 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -93,7 +93,7 @@ static const builtin_prop_t *find_builtin_prop(jsdisp_t *This, const WCHAR *name while(min <= max) { i = (min+max)/2; - r = CompareStringOrdinal(name, -1, This->builtin_info->props[i].name, -1, FALSE) - 2; + r = wcscmp(name, This->builtin_info->props[i].name); if(!r) { /* Skip prop if it's available only in higher compatibility mode. */ unsigned version = (This->builtin_info->props[i].flags & PROPF_VERSION_MASK) @@ -203,7 +203,7 @@ static HRESULT find_prop_name(jsdisp_t *This, unsigned hash, const WCHAR *name, bucket = get_props_idx(This, hash); pos = This->props[bucket].bucket_head; while(pos != 0) { - if(!lstrcmpW(name, This->props[pos].name)) { + if(!wcscmp(name, This->props[pos].name)) { if(prev != 0) { This->props[prev].bucket_next = This->props[pos].bucket_next; This->props[pos].bucket_next = This->props[bucket].bucket_head; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 7d3eb13..0a68a51 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -612,9 +612,9 @@ static BOOL lookup_global_members(script_ctx_t *ctx, BSTR identifier, exprval_t return FALSE; } -static int local_ref_cmp(const void *key, const void *ref) +static int __cdecl local_ref_cmp(const void *key, const void *ref) { - return CompareStringOrdinal((const WCHAR*)key, -1, ((const local_ref_t*)ref)->name, -1, FALSE) - 2; + return wcscmp((const WCHAR*)key, ((const local_ref_t*)ref)->name); } local_ref_t *lookup_local(const function_code_t *function, const WCHAR *identifier) @@ -646,7 +646,7 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re return S_OK; } - if(!lstrcmpW(identifier, argumentsW)) { + if(!wcscmp(identifier, argumentsW)) { hres = detach_variable_object(ctx, scope->frame, FALSE); if(FAILED(hres)) return hres; @@ -670,7 +670,7 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re } for(item = ctx->named_items; item; item = item->next) { - if((item->flags & SCRIPTITEM_ISVISIBLE) && !lstrcmpW(item->name, identifier)) { + if((item->flags & SCRIPTITEM_ISVISIBLE) && !wcscmp(item->name, identifier)) { if(!item->disp) { IUnknown *unk;

1 0

Alexandre Julliard : mssip32: Build with msvcrt.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: 39c9a451738be148d02a63560fcc9d1d2d93e7f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39c9a451738be148d02a6356… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 08:46:42 2019 +0200 mssip32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mssip32/Makefile.in | 2 ++ dlls/mssip32/main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mssip32/Makefile.in b/dlls/mssip32/Makefile.in index 84e01b7..665cbc9 100644 --- a/dlls/mssip32/Makefile.in +++ b/dlls/mssip32/Makefile.in @@ -1,4 +1,6 @@ MODULE = mssip32.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/mssip32/main.c b/dlls/mssip32/main.c index a72c346..abefdd0 100644 --- a/dlls/mssip32/main.c +++ b/dlls/mssip32/main.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : msscript.ocx: Build with msvcrt.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: e7ed15a16ad53ade1ec649f3a88fcb1293c7402d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7ed15a16ad53ade1ec649f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 08:46:04 2019 +0200 msscript.ocx: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/Makefile.in | 2 ++ dlls/msscript.ocx/msscript.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msscript.ocx/Makefile.in b/dlls/msscript.ocx/Makefile.in index 7d76896..304b924 100644 --- a/dlls/msscript.ocx/Makefile.in +++ b/dlls/msscript.ocx/Makefile.in @@ -3,5 +3,7 @@ RC_SRCS = msscript.rc IDL_SRCS = msscript.idl IMPORTS = gdi32 user32 ole32 oleaut32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ msscript.c diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 459c35a..fb3ad08 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -192,7 +192,7 @@ static struct named_item *host_get_named_item(ScriptHost *host, const WCHAR *nam struct named_item *item; LIST_FOR_EACH_ENTRY(item, &host->named_items, struct named_item, entry) { - if (!lstrcmpW(item->name, nameW)) + if (!wcscmp(item->name, nameW)) return item; }

1 0

Alexandre Julliard : msports: Build with msvcrt.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: 1a74ff30dbe85d69a28988e8cb0007f24f1cafb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a74ff30dbe85d69a28988e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 08:45:41 2019 +0200 msports: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msports/Makefile.in | 2 ++ dlls/msports/main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msports/Makefile.in b/dlls/msports/Makefile.in index d4e8593..f3795c9 100644 --- a/dlls/msports/Makefile.in +++ b/dlls/msports/Makefile.in @@ -1,4 +1,6 @@ MODULE = msports.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/msports/main.c b/dlls/msports/main.c index fe2c153..0ad2d1d 100644 --- a/dlls/msports/main.c +++ b/dlls/msports/main.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : msls31: Build with msvcrt.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: 78790a275237369c42ee278d9a2a33a952a9c753 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78790a275237369c42ee278d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 08:44:54 2019 +0200 msls31: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msls31/Makefile.in | 2 ++ dlls/msls31/msls31_main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msls31/Makefile.in b/dlls/msls31/Makefile.in index a6dc63f..19f079b 100644 --- a/dlls/msls31/Makefile.in +++ b/dlls/msls31/Makefile.in @@ -1,4 +1,6 @@ MODULE = msls31.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ msls31_main.c diff --git a/dlls/msls31/msls31_main.c b/dlls/msls31/msls31_main.c index 9625a91..84dc528 100644 --- a/dlls/msls31/msls31_main.c +++ b/dlls/msls31/msls31_main.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : msimg32: Build with msvcrt.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: 08a9a6f35b0c034faa59c9064f10d431c082a4a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08a9a6f35b0c034faa59c906… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 08:43:44 2019 +0200 msimg32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msimg32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msimg32/Makefile.in b/dlls/msimg32/Makefile.in index 5080d80..9f64e80 100644 --- a/dlls/msimg32/Makefile.in +++ b/dlls/msimg32/Makefile.in @@ -2,4 +2,6 @@ MODULE = msimg32.dll IMPORTLIB = msimg32 IMPORTS = gdi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = msimg32_main.c

1 0

Alexandre Julliard : msident: Build with msvcrt.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: a37791c95f13fb3432a31885bb24b562074b93b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a37791c95f13fb3432a31885… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 08:43:37 2019 +0200 msident: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msident/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msident/Makefile.in b/dlls/msident/Makefile.in index 913c114..433d454 100644 --- a/dlls/msident/Makefile.in +++ b/dlls/msident/Makefile.in @@ -1,5 +1,7 @@ MODULE = msident.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ msident.c

1 0