December 2015 - Wine-commits

Alexandre Julliard : Release 1.8-rc4.
by Alexandre Julliard 12 Dec '15

12 Dec '15

Module: wine Branch: master Commit: ca9001d6bda3084ab9bc80baa7d6e5533252c797 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca9001d6bda3084ab9bc80baa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 12 17:33:44 2015 +0100 Release 1.8-rc4. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 293 +++++++++++++++++++++++++++----------------------------------- VERSION | 2 +- configure | 18 ++-- 3 files changed, 136 insertions(+), 177 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca9001d6bda3084ab9bc8…

1 0

Tag wine-1.8-rc4 : Alexandre Julliard : Release 1.8-rc4
by Alexandre Julliard 12 Dec '15

12 Dec '15

Module: wine Branch: refs/tags/wine-1.8-rc4 Tag: dfd18199c01a9f541ec50568409834210ffcec4a URL: http://source.winehq.org/git/wine.git/?a=tag;h=dfd18199c01a9f541ec505684098… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 12 17:33:44 2015 +0100 Release 1.8-rc4

1 0

Alexandre Julliard : Revert "opengl32: Store alternative function in wglGetProcAddress."
by Alexandre Julliard 12 Dec '15

12 Dec '15

Module: wine Branch: master Commit: 50da224be714a623a76646bbd6582b8d802a3d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=50da224be714a623a76646bbd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 12 05:24:56 2015 +0100 Revert "opengl32: Store alternative function in wglGetProcAddress." This reverts commit e44f8eaa0fce02032e6c3f43052821f40eaba53b. It mixes up the driver function and the WINAPI wrapper. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/wgl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 3b817a4..88aa564 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -884,15 +884,15 @@ PROC WINAPI wglGetProcAddress( LPCSTR name ) { "glCopyTexSubImage3DEXT", "glCopyTexSubImage3D" }, /* needed by RuneScape */ }; - WARN("Extension %s required for %s not supported\n", ext_ret->extension, name); - driver_func = NULL; - - for (i = 0; i < sizeof(alternatives)/sizeof(alternatives[0]) && !driver_func; i++) + for (i = 0; i < sizeof(alternatives)/sizeof(alternatives[0]); i++) { if (strcmp( name, alternatives[i].name )) continue; - WARN("Trying alternative %s for %s\n", alternatives[i].alt, name ); - driver_func = wglGetProcAddress( alternatives[i].alt ); + WARN("Extension %s required for %s not supported, trying %s\n", + ext_ret->extension, name, alternatives[i].alt ); + return wglGetProcAddress( alternatives[i].alt ); } + WARN("Extension %s required for %s not supported\n", ext_ret->extension, name); + return NULL; } if (driver_func == NULL)

1 0

Sebastian Lackner : opengl32: Add alternative function for glVertexAttribDivisor.
by Alexandre Julliard 12 Dec '15

12 Dec '15

Module: wine Branch: master Commit: f915f9db4cc11d58006efaa9b54710020ca1f9d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f915f9db4cc11d58006efaa9b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Dec 11 05:33:23 2015 +0100 opengl32: Add alternative function for glVertexAttribDivisor. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/wgl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 88aa564..f3f78ef 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -881,7 +881,8 @@ PROC WINAPI wglGetProcAddress( LPCSTR name ) unsigned int i; static const struct { const char *name, *alt; } alternatives[] = { - { "glCopyTexSubImage3DEXT", "glCopyTexSubImage3D" }, /* needed by RuneScape */ + { "glCopyTexSubImage3DEXT", "glCopyTexSubImage3D" }, /* needed by RuneScape */ + { "glVertexAttribDivisor", "glVertexAttribDivisorARB"}, /* needed by Caffeine */ }; for (i = 0; i < sizeof(alternatives)/sizeof(alternatives[0]); i++)

1 0

Stefan Dösinger : wined3d: Restore WINEDDBLT_ALPHATEST support.
by Alexandre Julliard 12 Dec '15

12 Dec '15

Module: wine Branch: master Commit: 080dedaf6e248931c58f94a6312803af5758a66f URL: http://source.winehq.org/git/wine.git/?a=commit;h=080dedaf6e248931c58f94a63… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Dec 10 20:02:34 2015 +0000 wined3d: Restore WINEDDBLT_ALPHATEST support. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 12 +++++++++++- dlls/wined3d/surface.c | 23 +++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index be3d727..6851620 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7774,6 +7774,7 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, TRACE("Color keying not supported with converted textures.\n"); return FALSE; } + case WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST: case WINED3D_BLIT_OP_COLOR_BLIT: break; @@ -7828,7 +7829,7 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, } } -static void arbfp_blit_surface(struct wined3d_device *device, DWORD filter, +static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, DWORD filter, struct wined3d_surface *src_surface, const RECT *src_rect_in, struct wined3d_surface *dst_surface, const RECT *dst_rect_in, const struct wined3d_color_key *color_key) @@ -7836,6 +7837,7 @@ static void arbfp_blit_surface(struct wined3d_device *device, DWORD filter, struct wined3d_context *context; RECT src_rect = *src_rect_in; RECT dst_rect = *dst_rect_in; + struct wined3d_color_key alpha_test_key; /* Activate the destination context, set it up for blitting */ context = context_acquire(device, dst_surface); @@ -7864,6 +7866,14 @@ static void arbfp_blit_surface(struct wined3d_device *device, DWORD filter, if (!wined3d_resource_is_offscreen(&dst_surface->container->resource)) surface_translate_drawable_coords(dst_surface, context->win_handle, &dst_rect); + if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) + { + const struct wined3d_format *fmt = src_surface->resource.format; + alpha_test_key.color_space_low_value = 0; + alpha_test_key.color_space_high_value = ~(((1u << fmt->alpha_size) - 1) << fmt->alpha_offset); + color_key = &alpha_test_key; + } + arbfp_blit_set(device->blit_priv, context, src_surface, color_key); /* Draw a textured quad */ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 29687c3..f8a1ba1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4230,6 +4230,7 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, return FALSE; } case WINED3D_BLIT_OP_COLOR_BLIT: + case WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST: if (TRACE_ON(d3d_surface) && TRACE_ON(d3d)) { TRACE("Checking support for fixup:\n"); @@ -4319,7 +4320,7 @@ static HRESULT ffp_blit_depth_fill(struct wined3d_device *device, struct wined3d return WINED3D_OK; } -static void ffp_blit_blit_surface(struct wined3d_device *device, DWORD filter, +static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, DWORD filter, struct wined3d_surface *src_surface, const RECT *src_rect, struct wined3d_surface *dst_surface, const RECT *dst_rect, const struct wined3d_color_key *color_key) @@ -4335,8 +4336,16 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, DWORD filter, wined3d_texture_set_color_key(src_surface->container, WINED3D_CKEY_SRC_BLT, color_key); context = context_acquire(device, dst_surface); + + if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) + glEnable(GL_ALPHA_TEST); + surface_blt_to_drawable(device, context, filter, !!color_key, src_surface, src_rect, dst_surface, dst_rect); + + if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) + glDisable(GL_ALPHA_TEST); + context_release(context); /* Restore the color key parameters */ @@ -5000,7 +5009,7 @@ static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } -static void cpu_blit_blit_surface(struct wined3d_device *device, DWORD filter, +static void cpu_blit_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, DWORD filter, struct wined3d_surface *src_surface, const RECT *src_rect, struct wined3d_surface *dst_surface, const RECT *dst_rect, const struct wined3d_color_key *color_key) @@ -5036,7 +5045,8 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC | WINEDDBLT_KEYSRCOVERRIDE | WINEDDBLT_WAIT | WINEDDBLT_DEPTHFILL - | WINEDDBLT_DONOTWAIT; + | WINEDDBLT_DONOTWAIT + | WINEDDBLT_ALPHATEST; TRACE("dst_surface %p, dst_rect_in %s, src_surface %p, src_rect_in %s, flags %#x, fx %p, filter %s.\n", dst_surface, wine_dbgstr_rect(dst_rect_in), src_surface, wine_dbgstr_rect(src_rect_in), @@ -5264,6 +5274,10 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC color_key = &src_surface->container->async.src_blt_color_key; blit_op = WINED3D_BLIT_OP_COLOR_BLIT_CKEY; } + else if (flags & WINEDDBLT_ALPHATEST) + { + blit_op = WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST; + } else if ((src_surface->locations & WINED3D_LOCATION_SYSMEM) && !(dst_surface->locations & WINED3D_LOCATION_SYSMEM)) { @@ -5335,7 +5349,8 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format); if (blitter) { - blitter->blit_surface(device, filter, src_surface, &src_rect, dst_surface, &dst_rect, color_key); + blitter->blit_surface(device, blit_op, filter, src_surface, + &src_rect, dst_surface, &dst_rect, color_key); return WINED3D_OK; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index abe1262..464bdf6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1362,6 +1362,7 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ enum wined3d_blit_op { WINED3D_BLIT_OP_COLOR_BLIT, + WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST, WINED3D_BLIT_OP_COLOR_BLIT_CKEY, WINED3D_BLIT_OP_COLOR_FILL, WINED3D_BLIT_OP_DEPTH_FILL, @@ -1385,7 +1386,7 @@ struct blit_shader const RECT *dst_rect, const struct wined3d_color *color); HRESULT (*depth_fill)(struct wined3d_device *device, struct wined3d_surface *surface, const RECT *rect, float depth); - void (*blit_surface)(struct wined3d_device *device, DWORD filter, + void (*blit_surface)(struct wined3d_device *device, enum wined3d_blit_op op, DWORD filter, struct wined3d_surface *src_surface, const RECT *src_rect, struct wined3d_surface *dst_surface, const RECT *dst_rect, const struct wined3d_color_key *color_key);

1 0

Sebastian Lackner : opengl32: Store alternative function in wglGetProcAddress.
by Alexandre Julliard 10 Dec '15

10 Dec '15

Module: wine Branch: master Commit: e44f8eaa0fce02032e6c3f43052821f40eaba53b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e44f8eaa0fce02032e6c3f430… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Dec 10 01:47:47 2015 +0100 opengl32: Store alternative function in wglGetProcAddress. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/wgl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 88aa564..3b817a4 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -884,15 +884,15 @@ PROC WINAPI wglGetProcAddress( LPCSTR name ) { "glCopyTexSubImage3DEXT", "glCopyTexSubImage3D" }, /* needed by RuneScape */ }; - for (i = 0; i < sizeof(alternatives)/sizeof(alternatives[0]); i++) + WARN("Extension %s required for %s not supported\n", ext_ret->extension, name); + driver_func = NULL; + + for (i = 0; i < sizeof(alternatives)/sizeof(alternatives[0]) && !driver_func; i++) { if (strcmp( name, alternatives[i].name )) continue; - WARN("Extension %s required for %s not supported, trying %s\n", - ext_ret->extension, name, alternatives[i].alt ); - return wglGetProcAddress( alternatives[i].alt ); + WARN("Trying alternative %s for %s\n", alternatives[i].alt, name ); + driver_func = wglGetProcAddress( alternatives[i].alt ); } - WARN("Extension %s required for %s not supported\n", ext_ret->extension, name); - return NULL; } if (driver_func == NULL)

1 0

Sebastian Lackner : ntdll/tests: Add more tests for ProcessDebugFlags.
by Alexandre Julliard 10 Dec '15

10 Dec '15

Module: wine Branch: master Commit: 85df0c61e5d6e081f54f42481e5a300c9e780ec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85df0c61e5d6e081f54f42481… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Dec 10 03:11:06 2015 +0100 ntdll/tests: Add more tests for ProcessDebugFlags. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 160 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 123 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=85df0c61e5d6e081f54f4…

1 0

Alistair Leslie-Hughes : wevtapi: Add EvtClose stub.
by Alexandre Julliard 10 Dec '15

10 Dec '15

Module: wine Branch: master Commit: bf3f65e810cff47cfb29febeb55e04ca51bbfe55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf3f65e810cff47cfb29febeb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Dec 10 17:53:54 2015 +1100 wevtapi: Add EvtClose stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wevtapi/main.c | 6 ++++++ dlls/wevtapi/wevtapi.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index ecb8427..0b88165 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -79,3 +79,9 @@ EVT_HANDLE WINAPI EvtOpenChannelConfig(EVT_HANDLE Session, LPCWSTR ChannelPath, FIXME("(%p %s %u) stub\n", Session, debugstr_w(ChannelPath), Flags); return NULL; } + +BOOL WINAPI EvtClose(EVT_HANDLE handle) +{ + FIXME("(%p) stub\n", handle); + return TRUE; +} diff --git a/dlls/wevtapi/wevtapi.spec b/dlls/wevtapi/wevtapi.spec index a493da4..328b0db 100644 --- a/dlls/wevtapi/wevtapi.spec +++ b/dlls/wevtapi/wevtapi.spec @@ -1,7 +1,7 @@ @ stub EvtArchiveExportedLog @ stub EvtCancel @ stub EvtClearLog -@ stub EvtClose +@ stdcall EvtClose(ptr) @ stub EvtCreateBookmark @ stub EvtCreateRenderContext @ stub EvtExportLog

1 0

Viliam Lejcik : kernel32/nls: Regional settings translation for Czech and Slovak.
by Alexandre Julliard 10 Dec '15

10 Dec '15

Module: wine Branch: master Commit: 157d2e961a098f11155cf230c531743c850c6a3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=157d2e961a098f11155cf230c… Author: Viliam Lejcik <lejcik(a)host.sk> Date: Thu Dec 10 00:16:14 2015 +0100 kernel32/nls: Regional settings translation for Czech and Slovak. Signed-off-by: Viliam Lejcik <lejcik(a)host.sk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/csy.nls | 34 +++++++++++++++++----------------- dlls/kernel32/nls/sky.nls | 34 +++++++++++++++++----------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/dlls/kernel32/nls/csy.nls b/dlls/kernel32/nls/csy.nls index 2a39441..e1bfdaf 100644 --- a/dlls/kernel32/nls/csy.nls +++ b/dlls/kernel32/nls/csy.nls @@ -141,21 +141,21 @@ STRINGTABLE LANGUAGE LANG_CZECH, SUBLANG_DEFAULT LOCALE_STIMEFORMAT "H:mm:ss" LOCALE_SYEARMONTH "MMMM yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" - LGRPID_GREEK+LGRPID_RES_BASE "Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE "Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" - LGRPID_THAI+LGRPID_RES_BASE "Thai" - LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE "Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Z�padn� Evropa a Spojen� st�ty" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "St�edoevropsk� jazyky" + LGRPID_BALTIC+LGRPID_RES_BASE "Pobaltsk� jazyky" + LGRPID_GREEK+LGRPID_RES_BASE "�e�tina" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrilice" + LGRPID_TURKISH+LGRPID_RES_BASE "Tureck� jazyky" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japon�tina" + LGRPID_KOREAN+LGRPID_RES_BASE "Korej�tina" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "��n�tina (tradi�n�)" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "��n�tina (zjednodu�en�)" + LGRPID_THAI+LGRPID_RES_BASE "Thaj�tina" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrej�tina" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabsk� jazyky" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnam�tina" + LGRPID_INDIC+LGRPID_RES_BASE "Indick� jazyky" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Gruz�n�tina" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�n�tina" } diff --git a/dlls/kernel32/nls/sky.nls b/dlls/kernel32/nls/sky.nls index c9a07f6..1e1065f 100644 --- a/dlls/kernel32/nls/sky.nls +++ b/dlls/kernel32/nls/sky.nls @@ -141,21 +141,21 @@ STRINGTABLE LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT LOCALE_STIMEFORMAT "H:mm:ss" LOCALE_SYEARMONTH "MMMM yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" - LGRPID_GREEK+LGRPID_RES_BASE "Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE "Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" - LGRPID_THAI+LGRPID_RES_BASE "Thai" - LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE "Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Z�padn� Eur�pa a Spojen� �t�ty" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Stredoeur�pske jazyky" + LGRPID_BALTIC+LGRPID_RES_BASE "Pobaltsk� jazyky" + LGRPID_GREEK+LGRPID_RES_BASE "Gr��tina" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrilika" + LGRPID_TURKISH+LGRPID_RES_BASE "Tureck� jazyky" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japon�ina" + LGRPID_KOREAN+LGRPID_RES_BASE "K�rej�ina" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "��n�tina (tradi�n�)" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "��n�tina (zjednodu�en�)" + LGRPID_THAI+LGRPID_RES_BASE "Thaj�ina" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrej�ina" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabsk� jazyky" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnam�ina" + LGRPID_INDIC+LGRPID_RES_BASE "Indick� jazyky" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Gruz�n�ina" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�n�ina" }

1 0

Piotr Caban : ole32: Fix minimal size check of compound file in StgOpenStorage.
by Alexandre Julliard 10 Dec '15

10 Dec '15

Module: wine Branch: master Commit: 726698ab81cd9f916b7926b0e761ae9a05dc694d URL: http://source.winehq.org/git/wine.git/?a=commit;h=726698ab81cd9f916b7926b0e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 10 14:09:52 2015 +0100 ole32: Fix minimal size check of compound file in StgOpenStorage. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/storage32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index bf1c1b3..2bc9d3d 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8900,7 +8900,7 @@ HRESULT WINAPI StgOpenStorage( * Refuse to open the file if it's too small to be a structured storage file * FIXME: verify the file when reading instead of here */ - if (GetFileSize(hFile, NULL) < 0x100) + if (GetFileSize(hFile, NULL) < HEADER_SIZE) { CloseHandle(hFile); hr = STG_E_FILEALREADYEXISTS;

1 0