wine-commits November 2011

wine-commits@winehq.org

2 participants
852 discussions

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 9b7178e63352aee5e23c6e2e1d09a1866f64e156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b7178e63352aee5e23c6e2e1… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 7 00:12:09 2011 +0100 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/dsurface.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 555ad23..3060379 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1745,12 +1745,12 @@ static void AttachmentTest(void) ddsd.dwWidth = 64; ddsd.dwHeight = 64; ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; - U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); - U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; /* D3DFMT_R5G6B5 */ - U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 16; - U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0xF800; - U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x07E0; - U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x001F; + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; /* D3DFMT_R5G6B5 */ + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 16; + U2(ddsd.ddpfPixelFormat).dwRBitMask = 0xF800; + U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x07E0; + U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x001F; memset(&ddsd2, 0, sizeof(ddsd2)); ddsd2.dwSize = sizeof(ddsd2); @@ -1758,10 +1758,10 @@ static void AttachmentTest(void) ddsd2.dwWidth = ddsd.dwWidth; ddsd2.dwHeight = ddsd.dwHeight; ddsd2.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; - U4(ddsd2).ddpfPixelFormat.dwSize = sizeof(U4(ddsd2).ddpfPixelFormat); - U4(ddsd2).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; - U1(U4(ddsd2).ddpfPixelFormat).dwZBufferBitDepth = 16; - U3(U4(ddsd2).ddpfPixelFormat).dwZBitMask = 0x0000FFFF; + ddsd2.ddpfPixelFormat.dwSize = sizeof(ddsd2.ddpfPixelFormat); + ddsd2.ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + U1(ddsd2.ddpfPixelFormat).dwZBufferBitDepth = 16; + U3(ddsd2.ddpfPixelFormat).dwZBitMask = 0x0000FFFF; hr = IDirectDraw_CreateSurface(lpDD, (DDSURFACEDESC *)&ddsd, &surface1, NULL); ok(hr == DD_OK, "CreateSurface returned %08x\n", hr);

1 0

Henri Verbeet : wined3d: Make the surface parameter to blit_shader. set_shader() const.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: a64271c07efeecd4ed9db56c3bbfe3ddfac7f608 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a64271c07efeecd4ed9db56c3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 6 22:05:59 2011 +0100 wined3d: Make the surface parameter to blit_shader.set_shader() const. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4fabeea..a4f2e68 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7121,7 +7121,7 @@ static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_ } /* Context activation is done by the caller. */ -static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, struct wined3d_surface *surface) +static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface) { GLenum shader; float size[4] = {(float) surface->pow2Width, (float) surface->pow2Height, 1.0f, 1.0f}; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d70e22d..8def5b5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6260,7 +6260,7 @@ static void ffp_blit_p8_upload_palette(const struct wined3d_surface *surface, co } /* Context activation is done by the caller. */ -static HRESULT ffp_blit_set(void *blit_priv, struct wined3d_context *context, struct wined3d_surface *surface) +static HRESULT ffp_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface) { enum complex_fixup fixup = get_complex_fixup(surface->resource.format->color_fixup); @@ -6409,7 +6409,7 @@ static void cpu_blit_free(struct wined3d_device *device) } /* Context activation is done by the caller. */ -static HRESULT cpu_blit_set(void *blit_priv, struct wined3d_context *context, struct wined3d_surface *surface) +static HRESULT cpu_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface) { return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8b560f5..b4bc30d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1201,7 +1201,7 @@ struct blit_shader { HRESULT (*alloc_private)(struct wined3d_device *device); void (*free_private)(struct wined3d_device *device); - HRESULT (*set_shader)(void *blit_priv, struct wined3d_context *context, struct wined3d_surface *surface); + HRESULT (*set_shader)(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface); void (*unset_shader)(const struct wined3d_gl_info *gl_info); BOOL (*blit_supported)(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, WINED3DPOOL src_pool, const struct wined3d_format *src_format,

1 0

Henri Verbeet : wined3d: Make the surface parameter to upload_palette() const.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 12268879a2b36cd1eabeccffffe9d5683529e784 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12268879a2b36cd1eabeccfff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 6 22:05:58 2011 +0100 wined3d: Make the surface parameter to upload_palette() const. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d32b5f1..4fabeea 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6932,7 +6932,7 @@ static GLuint gen_p8_shader(struct arbfp_blit_priv *priv, } /* Context activation is done by the caller. */ -static void upload_palette(struct wined3d_surface *surface, struct wined3d_context *context) +static void upload_palette(const struct wined3d_surface *surface, struct wined3d_context *context) { BYTE table[256][4]; struct wined3d_device *device = surface->resource.device;

1 0

Henri Verbeet : comctl32: Avoid using __FUNCTION__ in ranges_check.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: b99a2a9ff87fc158a462ae44e4248d12117256f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b99a2a9ff87fc158a462ae44e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 6 22:05:57 2011 +0100 comctl32: Avoid using __FUNCTION__ in ranges_check. --- dlls/comctl32/listview.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index cc997c1..b0c4646 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3053,14 +3053,14 @@ static INT CALLBACK ranges_cmp(LPVOID range1, LPVOID range2, LPARAM flags) return cmp; } -#define ranges_check(ranges, desc) if (TRACE_ON(listview)) ranges_assert(ranges, desc, __FUNCTION__, __LINE__) +#define ranges_check(ranges, desc) if (TRACE_ON(listview)) ranges_assert(ranges, desc, __FILE__, __LINE__) -static void ranges_assert(RANGES ranges, LPCSTR desc, const char *func, int line) +static void ranges_assert(RANGES ranges, LPCSTR desc, const char *file, int line) { INT i; RANGE *prev, *curr; - TRACE("*** Checking %s:%d:%s ***\n", func, line, desc); + TRACE("*** Checking %s:%d:%s ***\n", file, line, desc); assert (ranges); assert (DPA_GetPtrCount(ranges->hdpa) >= 0); ranges_dump(ranges);

1 0

Henri Verbeet : wined3d: Remove surface_draw_overlay from wined3d_surface_ops.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 35515e466976f441987f7f8b340c409c526e3260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35515e466976f441987f7f8b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 6 22:05:56 2011 +0100 wined3d: Remove surface_draw_overlay from wined3d_surface_ops. --- dlls/wined3d/surface.c | 18 +++++------------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a123016..d70e22d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1019,7 +1019,7 @@ static void surface_unmap(struct wined3d_surface *surface) done: /* Overlays have to be redrawn manually after changes with the GL implementation */ if (surface->overlay_dest) - surface->surface_ops->surface_draw_overlay(surface); + surface_draw_overlay(surface); } static BOOL surface_is_full_rect(const struct wined3d_surface *surface, const RECT *r) @@ -1908,7 +1908,6 @@ static const struct wined3d_surface_ops surface_ops = { surface_private_setup, surface_realize_palette, - surface_draw_overlay, surface_map, surface_unmap, }; @@ -1995,12 +1994,6 @@ static void gdi_surface_realize_palette(struct wined3d_surface *surface) } } -static HRESULT gdi_surface_draw_overlay(struct wined3d_surface *surface) -{ - FIXME("GDI surfaces can't draw overlays yet.\n"); - return E_FAIL; -} - static void gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD flags) { TRACE("surface %p, rect %s, flags %#x.\n", @@ -2036,7 +2029,6 @@ static const struct wined3d_surface_ops gdi_surface_ops = { gdi_surface_private_setup, gdi_surface_realize_palette, - gdi_surface_draw_overlay, gdi_surface_map, gdi_surface_unmap, }; @@ -3216,7 +3208,7 @@ HRESULT CDECL wined3d_surface_set_overlay_position(struct wined3d_surface *surfa surface->overlay_destrect.right = x + w; surface->overlay_destrect.bottom = y + h; - surface->surface_ops->surface_draw_overlay(surface); + surface_draw_overlay(surface); return WINED3D_OK; } @@ -3326,7 +3318,7 @@ HRESULT CDECL wined3d_surface_update_overlay(struct wined3d_surface *surface, co surface->overlay_dest = NULL; } - surface->surface_ops->surface_draw_overlay(surface); + surface_draw_overlay(surface); return WINED3D_OK; } @@ -3941,7 +3933,7 @@ HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined /* Update overlays if they're visible. */ if ((surface->resource.usage & WINED3DUSAGE_OVERLAY) && surface->overlay_dest) - return surface->surface_ops->surface_draw_overlay(surface); + return surface_draw_overlay(surface); return WINED3D_OK; } @@ -5794,7 +5786,7 @@ void surface_modify_location(struct wined3d_surface *surface, DWORD location, BO { LIST_FOR_EACH_ENTRY(overlay, &surface->overlays, struct wined3d_surface, overlay_entry) { - overlay->surface_ops->surface_draw_overlay(overlay); + surface_draw_overlay(overlay); } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ba78162..8b560f5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2001,7 +2001,6 @@ struct wined3d_surface_ops { HRESULT (*surface_private_setup)(struct wined3d_surface *surface); void (*surface_realize_palette)(struct wined3d_surface *surface); - HRESULT (*surface_draw_overlay)(struct wined3d_surface *surface); void (*surface_map)(struct wined3d_surface *surface, const RECT *rect, DWORD flags); void (*surface_unmap)(struct wined3d_surface *surface); };

1 0

Henri Verbeet : wined3d: Remove surface_preload from wined3d_surface_ops.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 48b6050ca36f6da3bc6a5858aea97a79998fe47e URL: http://source.winehq.org/git/wine.git/?a=commit;h=48b6050ca36f6da3bc6a5858a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 6 22:05:55 2011 +0100 wined3d: Remove surface_preload from wined3d_surface_ops. --- dlls/wined3d/surface.c | 24 +++++++----------------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5568695..a123016 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -849,13 +849,6 @@ static HRESULT surface_draw_overlay(struct wined3d_surface *surface) return hr; } -static void surface_preload(struct wined3d_surface *surface) -{ - TRACE("surface %p.\n", surface); - - surface_internal_preload(surface, SRGB_ANY); -} - static void surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD flags) { struct wined3d_device *device = surface->resource.device; @@ -1916,7 +1909,6 @@ static const struct wined3d_surface_ops surface_ops = surface_private_setup, surface_realize_palette, surface_draw_overlay, - surface_preload, surface_map, surface_unmap, }; @@ -2009,13 +2001,6 @@ static HRESULT gdi_surface_draw_overlay(struct wined3d_surface *surface) return E_FAIL; } -static void gdi_surface_preload(struct wined3d_surface *surface) -{ - TRACE("surface %p.\n", surface); - - ERR("Preloading GDI surfaces is not supported.\n"); -} - static void gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD flags) { TRACE("surface %p, rect %s, flags %#x.\n", @@ -2052,7 +2037,6 @@ static const struct wined3d_surface_ops gdi_surface_ops = gdi_surface_private_setup, gdi_surface_realize_palette, gdi_surface_draw_overlay, - gdi_surface_preload, gdi_surface_map, gdi_surface_unmap, }; @@ -2947,7 +2931,13 @@ void CDECL wined3d_surface_preload(struct wined3d_surface *surface) { TRACE("surface %p.\n", surface); - surface->surface_ops->surface_preload(surface); + if (!surface->resource.device->d3d_initialized) + { + ERR("D3D not initialized.\n"); + return; + } + + surface_internal_preload(surface, SRGB_ANY); } void * CDECL wined3d_surface_get_parent(const struct wined3d_surface *surface) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c4784b0..ba78162 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2002,7 +2002,6 @@ struct wined3d_surface_ops HRESULT (*surface_private_setup)(struct wined3d_surface *surface); void (*surface_realize_palette)(struct wined3d_surface *surface); HRESULT (*surface_draw_overlay)(struct wined3d_surface *surface); - void (*surface_preload)(struct wined3d_surface *surface); void (*surface_map)(struct wined3d_surface *surface, const RECT *rect, DWORD flags); void (*surface_unmap)(struct wined3d_surface *surface); };

1 0

André Hentschel : winebuild: Add support for building on powerpc64.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 64d883a356f6a046a7104ce243b6588a21342e9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=64d883a356f6a046a7104ce24… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 6 17:30:33 2011 +0100 winebuild: Add support for building on powerpc64. With much help from Austin English. --- tools/winebuild/utils.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 2edb9e3..09f9b73 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -358,7 +358,15 @@ struct strarray *get_as_command(void) strarray_add( args, "-arch", (force_pointer_size == 8) ? "x86_64" : "i386", NULL ); break; default: - strarray_add_one( args, (force_pointer_size == 8) ? "--64" : "--32" ); + switch(target_cpu) + { + case CPU_POWERPC: + strarray_add_one( args, (force_pointer_size == 8) ? "-a64" : "-a32" ); + break; + default: + strarray_add_one( args, (force_pointer_size == 8) ? "--64" : "--32" ); + break; + } break; } } @@ -389,7 +397,15 @@ struct strarray *get_ld_command(void) strarray_add( args, "-m", (force_pointer_size == 8) ? "elf_x86_64_fbsd" : "elf_i386_fbsd", NULL ); break; default: - strarray_add( args, "-m", (force_pointer_size == 8) ? "elf_x86_64" : "elf_i386", NULL ); + switch(target_cpu) + { + case CPU_POWERPC: + strarray_add( args, "-m", (force_pointer_size == 8) ? "elf64ppc" : "elf32ppc", NULL ); + break; + default: + strarray_add( args, "-m", (force_pointer_size == 8) ? "elf_x86_64" : "elf_i386", NULL ); + break; + } break; } }

1 0

André Hentschel : ntdll: Declare debug channel only when used.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 2741edb9989d33ae7bb3d2dceba5e5d916655340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2741edb9989d33ae7bb3d2dce… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 6 15:08:06 2011 +0100 ntdll: Declare debug channel only when used. --- dlls/ntdll/relay.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 23e6675..3588f1c 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -37,10 +37,11 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(relay); -WINE_DECLARE_DEBUG_CHANNEL(timestamp); #if defined(__i386__) || defined(__x86_64__) +WINE_DECLARE_DEBUG_CHANNEL(timestamp); + struct relay_descr /* descriptor for a module */ { void *magic; /* signature */

1 0

Thomas Faber : msvcrt: Fix MSVC build in locale.c.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: e374c8fe46142921be9be357e8409199801acb30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e374c8fe46142921be9be357e… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sun Nov 6 12:15:25 2011 +0100 msvcrt: Fix MSVC build in locale.c. --- dlls/msvcrt/locale.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 017d358..44fdf7c 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -330,7 +330,7 @@ static BOOL update_threadlocinfo_category(LCID lcid, MSVCRT__locale_t loc, int c len += GetLocaleInfoA(lcid, LOCALE_IDEFAULTANSICODEPAGE |LOCALE_NOUSEROVERRIDE, &buf[len], 256-len); - loc->locinfo->lc_category[category].locale = MSVCRT_malloc(sizeof(char[len])); + loc->locinfo->lc_category[category].locale = MSVCRT_malloc(len); loc->locinfo->lc_category[category].refcount = MSVCRT_malloc(sizeof(int)); if(!loc->locinfo->lc_category[category].locale || !loc->locinfo->lc_category[category].refcount) { @@ -340,7 +340,7 @@ static BOOL update_threadlocinfo_category(LCID lcid, MSVCRT__locale_t loc, int c loc->locinfo->lc_category[category].refcount = NULL; return TRUE; } - memcpy(loc->locinfo->lc_category[category].locale, buf, sizeof(char[len])); + memcpy(loc->locinfo->lc_category[category].locale, buf, len); *loc->locinfo->lc_category[category].refcount = 1; return FALSE; @@ -862,8 +862,8 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) i = GetLocaleInfoA(lcid[MSVCRT_LC_MONETARY], LOCALE_SINTLSYMBOL |LOCALE_NOUSEROVERRIDE, buf, 256); - if(i && (loc->locinfo->lconv->int_curr_symbol = MSVCRT_malloc(sizeof(char[i])))) - memcpy(loc->locinfo->lconv->int_curr_symbol, buf, sizeof(char[i])); + if(i && (loc->locinfo->lconv->int_curr_symbol = MSVCRT_malloc(i))) + memcpy(loc->locinfo->lconv->int_curr_symbol, buf, i); else { MSVCRT__free_locale(loc); return NULL; @@ -871,8 +871,8 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) i = GetLocaleInfoA(lcid[MSVCRT_LC_MONETARY], LOCALE_SCURRENCY |LOCALE_NOUSEROVERRIDE, buf, 256); - if(i && (loc->locinfo->lconv->currency_symbol = MSVCRT_malloc(sizeof(char[i])))) - memcpy(loc->locinfo->lconv->currency_symbol, buf, sizeof(char[i])); + if(i && (loc->locinfo->lconv->currency_symbol = MSVCRT_malloc(i))) + memcpy(loc->locinfo->lconv->currency_symbol, buf, i); else { MSVCRT__free_locale(loc); return NULL; @@ -880,8 +880,8 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) i = GetLocaleInfoA(lcid[MSVCRT_LC_MONETARY], LOCALE_SMONDECIMALSEP |LOCALE_NOUSEROVERRIDE, buf, 256); - if(i && (loc->locinfo->lconv->mon_decimal_point = MSVCRT_malloc(sizeof(char[i])))) - memcpy(loc->locinfo->lconv->mon_decimal_point, buf, sizeof(char[i])); + if(i && (loc->locinfo->lconv->mon_decimal_point = MSVCRT_malloc(i))) + memcpy(loc->locinfo->lconv->mon_decimal_point, buf, i); else { MSVCRT__free_locale(loc); return NULL; @@ -889,8 +889,8 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) i = GetLocaleInfoA(lcid[MSVCRT_LC_MONETARY], LOCALE_SMONTHOUSANDSEP |LOCALE_NOUSEROVERRIDE, buf, 256); - if(i && (loc->locinfo->lconv->mon_thousands_sep = MSVCRT_malloc(sizeof(char[i])))) - memcpy(loc->locinfo->lconv->mon_thousands_sep, buf, sizeof(char[i])); + if(i && (loc->locinfo->lconv->mon_thousands_sep = MSVCRT_malloc(i))) + memcpy(loc->locinfo->lconv->mon_thousands_sep, buf, i); else { MSVCRT__free_locale(loc); return NULL; @@ -900,7 +900,7 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) |LOCALE_NOUSEROVERRIDE, buf, 256); if(i>1) i = i/2 + (buf[i-2]=='0'?0:1); - if(i && (loc->locinfo->lconv->mon_grouping = MSVCRT_malloc(sizeof(char[i])))) { + if(i && (loc->locinfo->lconv->mon_grouping = MSVCRT_malloc(i))) { for(i=0; buf[i+1]==';'; i+=2) loc->locinfo->lconv->mon_grouping[i/2] = buf[i]-'0'; loc->locinfo->lconv->mon_grouping[i/2] = buf[i]-'0'; @@ -913,8 +913,8 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) i = GetLocaleInfoA(lcid[MSVCRT_LC_MONETARY], LOCALE_SPOSITIVESIGN |LOCALE_NOUSEROVERRIDE, buf, 256); - if(i && (loc->locinfo->lconv->positive_sign = MSVCRT_malloc(sizeof(char[i])))) - memcpy(loc->locinfo->lconv->positive_sign, buf, sizeof(char[i])); + if(i && (loc->locinfo->lconv->positive_sign = MSVCRT_malloc(i))) + memcpy(loc->locinfo->lconv->positive_sign, buf, i); else { MSVCRT__free_locale(loc); return NULL; @@ -922,8 +922,8 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) i = GetLocaleInfoA(lcid[MSVCRT_LC_MONETARY], LOCALE_SNEGATIVESIGN |LOCALE_NOUSEROVERRIDE, buf, 256); - if(i && (loc->locinfo->lconv->negative_sign = MSVCRT_malloc(sizeof(char[i])))) - memcpy(loc->locinfo->lconv->negative_sign, buf, sizeof(char[i])); + if(i && (loc->locinfo->lconv->negative_sign = MSVCRT_malloc(i))) + memcpy(loc->locinfo->lconv->negative_sign, buf, i); else { MSVCRT__free_locale(loc); return NULL; @@ -1047,8 +1047,8 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) i = GetLocaleInfoA(lcid[MSVCRT_LC_NUMERIC], LOCALE_SDECIMAL |LOCALE_NOUSEROVERRIDE, buf, 256); - if(i && (loc->locinfo->lconv->decimal_point = MSVCRT_malloc(sizeof(char[i])))) - memcpy(loc->locinfo->lconv->decimal_point, buf, sizeof(char[i])); + if(i && (loc->locinfo->lconv->decimal_point = MSVCRT_malloc(i))) + memcpy(loc->locinfo->lconv->decimal_point, buf, i); else { MSVCRT__free_locale(loc); return NULL; @@ -1056,8 +1056,8 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) i = GetLocaleInfoA(lcid[MSVCRT_LC_NUMERIC], LOCALE_STHOUSAND |LOCALE_NOUSEROVERRIDE, buf, 256); - if(i && (loc->locinfo->lconv->thousands_sep = MSVCRT_malloc(sizeof(char[i])))) - memcpy(loc->locinfo->lconv->thousands_sep, buf, sizeof(char[i])); + if(i && (loc->locinfo->lconv->thousands_sep = MSVCRT_malloc(i))) + memcpy(loc->locinfo->lconv->thousands_sep, buf, i); else { MSVCRT__free_locale(loc); return NULL; @@ -1067,7 +1067,7 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) |LOCALE_NOUSEROVERRIDE, buf, 256); if(i>1) i = i/2 + (buf[i-2]=='0'?0:1); - if(i && (loc->locinfo->lconv->grouping = MSVCRT_malloc(sizeof(char[i])))) { + if(i && (loc->locinfo->lconv->grouping = MSVCRT_malloc(i))) { for(i=0; buf[i+1]==';'; i+=2) loc->locinfo->lconv->grouping[i/2] = buf[i]-'0'; loc->locinfo->lconv->grouping[i/2] = buf[i]-'0';

1 0

Thomas Faber : msvcrt: Fix MSVC build in exit.c and msvcrt.h.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 5402827329cbce679e03cc925adc8fadcee6d4cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5402827329cbce679e03cc925… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sat Nov 5 09:03:45 2011 +0100 msvcrt: Fix MSVC build in exit.c and msvcrt.h. --- dlls/msvcrt/exit.c | 2 +- dlls/msvcrt/msvcrt.h | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index fd22e62..11373b5 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -300,7 +300,7 @@ void CDECL MSVCRT_exit(int exitcode) { HMODULE hmscoree; static const WCHAR mscoreeW[] = {'m','s','c','o','r','e','e',0}; - void WINAPI (*pCorExitProcess)(int); + void (WINAPI *pCorExitProcess)(int); TRACE("(%d)\n",exitcode); MSVCRT__cexit(); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 671eb5b..d9eb6bd 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -76,14 +76,14 @@ typedef __int64 DECLSPEC_ALIGN(8) MSVCRT___time64_t; typedef __int64 DECLSPEC_ALIGN(8) MSVCRT_fpos_t; typedef int MSVCRT_mbstate_t; -typedef void (*__cdecl MSVCRT_terminate_handler)(void); -typedef void (*__cdecl MSVCRT_terminate_function)(void); -typedef void (*__cdecl MSVCRT_unexpected_handler)(void); -typedef void (*__cdecl MSVCRT_unexpected_function)(void); -typedef void (*__cdecl MSVCRT__se_translator_function)(unsigned int code, struct _EXCEPTION_POINTERS *info); -typedef void (*__cdecl MSVCRT__beginthread_start_routine_t)(void *); +typedef void (__cdecl *MSVCRT_terminate_handler)(void); +typedef void (__cdecl *MSVCRT_terminate_function)(void); +typedef void (__cdecl *MSVCRT_unexpected_handler)(void); +typedef void (__cdecl *MSVCRT_unexpected_function)(void); +typedef void (__cdecl *MSVCRT__se_translator_function)(unsigned int code, struct _EXCEPTION_POINTERS *info); +typedef void (__cdecl *MSVCRT__beginthread_start_routine_t)(void *); typedef unsigned int (__stdcall *MSVCRT__beginthreadex_start_routine_t)(void *); -typedef int (*__cdecl MSVCRT__onexit_t)(void); +typedef int (__cdecl *MSVCRT__onexit_t)(void); typedef void (__cdecl *MSVCRT_invalid_parameter_handler)(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, unsigned, MSVCRT_uintptr_t); typedef void (__cdecl *MSVCRT_purecall_handler)(void); typedef void (__cdecl *MSVCRT_security_error_handler)(int, void *);

1 0

← Newer
1
...
68
69
70
71
72
73
74
...
86
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 November 2011