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

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to create_dummy_textures().
by Alexandre Julliard 04 Jun '19

04 Jun '19

Module: wine Branch: master Commit: a7b57b6872e1cfabcb02406218abd59fe9ef856d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7b57b6872e1cfabcb024062… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 4 15:49:52 2019 +0430 wined3d: Pass a wined3d_context_gl structure to create_dummy_textures(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 751676b..fe7d0e9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -672,11 +672,12 @@ out: } /* Context activation is done by the caller. */ -static void create_dummy_textures(struct wined3d_device *device, struct wined3d_context *context) +static void wined3d_device_gl_create_dummy_textures(struct wined3d_device_gl *device_gl, + struct wined3d_context_gl *context_gl) { - struct wined3d_dummy_textures *textures = &wined3d_device_gl(device)->dummy_textures; - const struct wined3d_d3d_info *d3d_info = context->d3d_info; - const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_dummy_textures *textures = &device_gl->dummy_textures; + const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; unsigned int i; DWORD color; @@ -689,7 +690,7 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ * OpenGL will only allow that when a valid texture is bound. * We emulate this by creating dummy textures and binding them * to each texture stage when the currently set D3D texture is NULL. */ - context_active_texture(context, gl_info, 0); + context_active_texture(&context_gl->c, gl_info, 0); gl_info->gl_ops.gl.p_glGenTextures(1, &textures->tex_1d); TRACE("Dummy 1D texture given name %u.\n", textures->tex_1d); @@ -802,7 +803,7 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ checkGLcall("create dummy textures"); - context_bind_dummy_textures(context); + context_bind_dummy_textures(&context_gl->c); } /* Context activation is done by the caller. */ @@ -1081,6 +1082,7 @@ void wined3d_device_delete_opengl_contexts_cs(void *object) void wined3d_device_create_primary_opengl_context_cs(void *object) { struct wined3d_device *device = object; + struct wined3d_context_gl *context_gl; struct wined3d_swapchain *swapchain; struct wined3d_context *context; struct wined3d_texture *target; @@ -1108,7 +1110,8 @@ void wined3d_device_create_primary_opengl_context_cs(void *object) swapchain = device->swapchains[0]; target = swapchain->back_buffers ? swapchain->back_buffers[0] : swapchain->front_buffer; context = context_acquire(device, target, 0); - create_dummy_textures(device, context); + context_gl = wined3d_context_gl(context); + wined3d_device_gl_create_dummy_textures(wined3d_device_gl(device), context_gl); create_default_samplers(device, context); context_release(context); }

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to glsl_blitter_upload_palette().
by Alexandre Julliard 04 Jun '19

04 Jun '19

Module: wine Branch: master Commit: 74ebaacb1af5864a1a5609a376e1b9bc9d231d26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74ebaacb1af5864a1a5609a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 4 15:49:53 2019 +0430 wined3d: Pass a wined3d_context_gl structure to glsl_blitter_upload_palette(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 54dfd96..fe8812b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12769,17 +12769,17 @@ static GLuint glsl_blitter_generate_program(struct wined3d_glsl_blitter *blitter /* Context activation is done by the caller. */ static void glsl_blitter_upload_palette(struct wined3d_glsl_blitter *blitter, - struct wined3d_context *context, const struct wined3d_texture *texture) + struct wined3d_context_gl *context_gl, const struct wined3d_texture_gl *texture_gl) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; const struct wined3d_palette *palette; - palette = texture->swapchain ? texture->swapchain->palette : NULL; + palette = texture_gl->t.swapchain ? texture_gl->t.swapchain->palette : NULL; if (!blitter->palette_texture) gl_info->gl_ops.gl.p_glGenTextures(1, &blitter->palette_texture); - context_active_texture(context, gl_info, 1); + context_active_texture(&context_gl->c, gl_info, 1); gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_1D, blitter->palette_texture); gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); @@ -12799,7 +12799,7 @@ static void glsl_blitter_upload_palette(struct wined3d_glsl_blitter *blitter, GL_UNSIGNED_INT_8_8_8_8_REV, &black); } - context_active_texture(context, gl_info, 0); + context_active_texture(&context_gl->c, gl_info, 0); } /* Context activation is done by the caller. */ @@ -13062,7 +13062,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli switch (get_complex_fixup(program->args.fixup)) { case COMPLEX_FIXUP_P8: - glsl_blitter_upload_palette(glsl_blitter, context, src_texture); + glsl_blitter_upload_palette(glsl_blitter, context_gl, src_texture_gl); break; case COMPLEX_FIXUP_YUY2:

1 0

Alexandre Julliard : dwmapi: Build with msvcrt.
by Alexandre Julliard 04 Jun '19

04 Jun '19

Module: wine Branch: master Commit: 6dbe7aaf886e729a43db18c73243784ea3b6d925 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dbe7aaf886e729a43db18c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 4 09:04:41 2019 +0200 dwmapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/Makefile.in | 2 ++ dlls/dwmapi/dwmapi_main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/Makefile.in b/dlls/dwmapi/Makefile.in index e6145a5..3a36913 100644 --- a/dlls/dwmapi/Makefile.in +++ b/dlls/dwmapi/Makefile.in @@ -1,6 +1,8 @@ MODULE = dwmapi.dll IMPORTLIB = dwmapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ dwmapi_main.c diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index eb06d15..6378a09 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -19,7 +19,6 @@ * */ -#include "config.h" #include <stdarg.h> #define COBJMACROS

1 0

Alexandre Julliard : dx8vb: Build with msvcrt.
by Alexandre Julliard 04 Jun '19

04 Jun '19

Module: wine Branch: master Commit: 351ffd93f0fee1d9a890af5acbcd89a45f84c090 URL: https://source.winehq.org/git/wine.git/?a=commit;h=351ffd93f0fee1d9a890af5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 4 09:04:54 2019 +0200 dx8vb: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dx8vb/Makefile.in | 2 ++ dlls/dx8vb/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dx8vb/Makefile.in b/dlls/dx8vb/Makefile.in index e0a083a..c11eb9e 100644 --- a/dlls/dx8vb/Makefile.in +++ b/dlls/dx8vb/Makefile.in @@ -1,6 +1,8 @@ MODULE = dx8vb.dll IMPORTS = uuid ole32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/dx8vb/main.c b/dlls/dx8vb/main.c index a1ee7c9..7dbe47d 100644 --- a/dlls/dx8vb/main.c +++ b/dlls/dx8vb/main.c @@ -18,7 +18,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include <string.h>

1 0

Alexandre Julliard : dxdiagn: Build with msvcrt.
by Alexandre Julliard 04 Jun '19

04 Jun '19

Module: wine Branch: master Commit: 2a1da89fd74fc33a31fbfd0196cee021a840e931 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a1da89fd74fc33a31fbfd01… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 4 09:05:32 2019 +0200 dxdiagn: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxdiagn/Makefile.in | 2 ++ dlls/dxdiagn/container.c | 12 +++++------ dlls/dxdiagn/dxdiag_main.c | 1 - dlls/dxdiagn/provider.c | 51 +++++++++++++++++++++++----------------------- 4 files changed, 32 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2a1da89fd74fc33a31fb…

1 0

Alexandre Julliard : dxva2: Build with msvcrt.
by Alexandre Julliard 04 Jun '19

04 Jun '19

Module: wine Branch: master Commit: 63cb594f01f25572e78356d0950790437bf99c34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63cb594f01f25572e78356d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 4 09:05:45 2019 +0200 dxva2: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in index 7b9ef6f..44e125e 100644 --- a/dlls/dxva2/Makefile.in +++ b/dlls/dxva2/Makefile.in @@ -1,4 +1,6 @@ MODULE = dxva2.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c

1 0

Alexandre Julliard : esent: Build with msvcrt.
by Alexandre Julliard 04 Jun '19

04 Jun '19

Module: wine Branch: master Commit: aade6e5eb4b5ffd84db7471d10c7875baebcb8c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aade6e5eb4b5ffd84db7471d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 4 09:06:28 2019 +0200 esent: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/esent/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/esent/Makefile.in b/dlls/esent/Makefile.in index ab55483..b789ee2 100644 --- a/dlls/esent/Makefile.in +++ b/dlls/esent/Makefile.in @@ -1,4 +1,6 @@ MODULE = esent.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ esent_main.c

1 0

Alexandre Julliard : explorerframe: Build with msvcrt.
by Alexandre Julliard 04 Jun '19

04 Jun '19

Module: wine Branch: master Commit: a003eb5db45ad50c9bbd034a44d969000dbd56bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a003eb5db45ad50c9bbd034a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 4 09:08:17 2019 +0200 explorerframe: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/explorerframe/Makefile.in b/dlls/explorerframe/Makefile.in index 18d054c..8f7208e 100644 --- a/dlls/explorerframe/Makefile.in +++ b/dlls/explorerframe/Makefile.in @@ -1,6 +1,8 @@ MODULE = explorerframe.dll IMPORTS = uuid ole32 comctl32 shell32 user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ explorerframe_main.c \ nstc.c \

1 0

Alexandre Julliard : faultrep: Build with msvcrt.
by Alexandre Julliard 04 Jun '19

04 Jun '19

Module: wine Branch: master Commit: b7818870045ed6e7d1512ad1aab55277864a1e6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7818870045ed6e7d1512ad1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 4 09:08:42 2019 +0200 faultrep: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/faultrep/Makefile.in | 2 ++ dlls/faultrep/faultrep.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/faultrep/Makefile.in b/dlls/faultrep/Makefile.in index c478df4..70cd1ff 100644 --- a/dlls/faultrep/Makefile.in +++ b/dlls/faultrep/Makefile.in @@ -2,4 +2,6 @@ MODULE = faultrep.dll IMPORTLIB = faultrep IMPORTS = advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = faultrep.c diff --git a/dlls/faultrep/faultrep.c b/dlls/faultrep/faultrep.c index 83f9027..3191659 100644 --- a/dlls/faultrep/faultrep.c +++ b/dlls/faultrep/faultrep.c @@ -24,7 +24,6 @@ #include "winnls.h" #include "winreg.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "errorrep.h" @@ -62,7 +61,7 @@ BOOL WINAPI AddERExcludedApplicationW(LPCWSTR lpAppFileName) LONG res; TRACE("(%s)\n", wine_dbgstr_w(lpAppFileName)); - bslash = strrchrW(lpAppFileName, '\\'); + bslash = wcsrchr(lpAppFileName, '\\'); if (bslash != NULL) lpAppFileName = bslash + 1; if (*lpAppFileName == '\0')

1 0

Alexandre Julliard : feclient: Build with msvcrt.
by Alexandre Julliard 04 Jun '19

04 Jun '19

Module: wine Branch: master Commit: 2ef5410350270b462735f2db21b145573c6110d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ef5410350270b462735f2db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 4 09:08:51 2019 +0200 feclient: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/feclient/Makefile.in | 2 ++ dlls/feclient/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/feclient/Makefile.in b/dlls/feclient/Makefile.in index d3eeefb..0ca446d 100644 --- a/dlls/feclient/Makefile.in +++ b/dlls/feclient/Makefile.in @@ -1,4 +1,6 @@ MODULE = feclient.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/feclient/main.c b/dlls/feclient/main.c index 91aed70..ef49494 100644 --- a/dlls/feclient/main.c +++ b/dlls/feclient/main.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h>

1 0