wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

Alexandre Julliard : gdi32: Add a missing release in the error path.
by Alexandre Julliard 05 Aug '11

05 Aug '11

Module: wine Branch: master Commit: 805f083f3464b7f4b9f68cbe67578cb12cbbcd4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=805f083f3464b7f4b9f68cbe6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 5 10:58:16 2011 +0200 gdi32: Add a missing release in the error path. --- dlls/gdi32/bitmap.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 3d7e1a2..69b09ad 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -179,6 +179,7 @@ update_format: info->bmiHeader.biPlanes = 1; info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel; if (info->bmiHeader.biHeight > 0) info->bmiHeader.biHeight = -info->bmiHeader.biHeight; + GDI_ReleaseObj( hbitmap ); return ERROR_BAD_FORMAT; }

1 0

André Hentschel : c2man: Mark the file used if a comment is found.
by Alexandre Julliard 05 Aug '11

05 Aug '11

Module: wine Branch: master Commit: 1923e0e159b0c8140cf28d5378bd7c34b2ac1fa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1923e0e159b0c8140cf28d537… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Aug 4 21:08:37 2011 +0200 c2man: Mark the file used if a comment is found. --- tools/c2man.pl | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/c2man.pl b/tools/c2man.pl index ce8a444..7eca8c4 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -300,6 +300,9 @@ sub process_source_file($) { if ( /^\/\**$/ ) { + # This file is used by the DLL - Make sure we get our contributors right + @{$spec_files{$comment->{DLL_NAME}}[0]->{CURRENT_EXTRA}} = (); + push (@{$spec_files{$comment->{DLL_NAME}}[0]->{SOURCES}},$comment->{FILE}); # Found a comment start $comment->{COMMENT_NAME} = ""; $comment->{ALT_NAME} = ""; @@ -419,10 +422,6 @@ sub process_source_file($) if ($parse_state == 4) # Reading in the function definition { - # This file is used by the DLL - Make sure we get our contributors right - @{$spec_files{$comment->{DLL_NAME}}[0]->{CURRENT_EXTRA}} = (); - push (@{$spec_files{$comment->{DLL_NAME}}[0]->{SOURCES}},$comment->{FILE}); - push (@{$comment->{PROTOTYPE}},$_); # Strip comments from the line before checking for ')' my $stripped_line = $_;

1 0

Henri Verbeet : wined3d: Get rid of the fglrx point sprite hack.
by Alexandre Julliard 05 Aug '11

05 Aug '11

Module: wine Branch: master Commit: 812a31482149116e4d3332791d4bd42ba641791c URL: http://source.winehq.org/git/wine.git/?a=commit;h=812a31482149116e4d3332791… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 4 19:53:31 2011 +0200 wined3d: Get rid of the fglrx point sprite hack. Fglrx 9.3 is well over 2 years old at this point. I'd strongly encourage anyone still affected by this to upgrade to the r300g driver. --- dlls/wined3d/context.c | 11 ++++++--- dlls/wined3d/directx.c | 41 ---------------------------------------- dlls/wined3d/state.c | 13 ------------ dlls/wined3d/wined3d_private.h | 1 - 4 files changed, 7 insertions(+), 59 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 620a89b..ac252d8 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1522,11 +1522,14 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(dummy_program), dummy_program)); } - for (s = 0; s < gl_info->limits.point_sprite_units; ++s) + if (gl_info->supported[ARB_POINT_SPRITE]) { - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + s)); - glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE); - checkGLcall("glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE)"); + for (s = 0; s < gl_info->limits.textures; ++s) + { + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + s)); + glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE); + checkGLcall("glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE)"); + } } if (gl_info->supported[ARB_PROVOKING_VERTEX]) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a93895e..cdf3c11 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -596,13 +596,6 @@ static BOOL match_apple_nonr500ati(const struct wined3d_gl_info *gl_info, const return TRUE; } -static BOOL match_fglrx(const struct wined3d_gl_info *gl_info, const char *gl_renderer, - enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) -{ - return gl_vendor == GL_VENDOR_FGLRX; - -} - static BOOL match_dx10_capable(const struct wined3d_gl_info *gl_info, const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) { @@ -801,27 +794,6 @@ static void quirk_apple_glsl_constants(struct wined3d_gl_info *gl_info) gl_info->reserved_glsl_constants = max(gl_info->reserved_glsl_constants, 12); } -/* fglrx crashes with a very bad kernel panic if GL_POINT_SPRITE_ARB is set to GL_COORD_REPLACE_ARB - * on more than one texture unit. This means that the d3d9 visual point size test will cause a - * kernel panic on any machine running fglrx 9.3(latest that supports r300 to r500 cards). This - * quirk only enables point sprites on the first texture unit. This keeps point sprites working in - * most games, but avoids the crash - * - * A more sophisticated way would be to find all units that need texture coordinates and enable - * point sprites for one if only one is found, and software emulate point sprites in drawStridedSlow - * if more than one unit needs texture coordinates(This requires software ffp and vertex shaders though) - * - * Note that disabling the extension entirely does not gain predictability because there is no point - * sprite capability flag in d3d, so the potential rendering bugs are the same if we disable the extension. */ -static void quirk_one_point_sprite(struct wined3d_gl_info *gl_info) -{ - if (gl_info->supported[ARB_POINT_SPRITE]) - { - TRACE("Limiting point sprites to one texture unit.\n"); - gl_info->limits.point_sprite_units = 1; - } -} - static void quirk_amd_dx9(struct wined3d_gl_info *gl_info) { quirk_arb_constants(gl_info); @@ -963,11 +935,6 @@ static const struct driver_quirk quirk_table[] = "Init texcoord .w for Apple ATI >= r600 GPU driver" }, { - match_fglrx, - quirk_one_point_sprite, - "Fglrx point sprite crash workaround" - }, - { match_dx10_capable, quirk_clip_varying, "Reserved varying for gl_ClipPos" @@ -2625,14 +2592,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) /* GL_ARB_half_float_vertex is a subset of GL_NV_half_float. */ gl_info->supported[ARB_HALF_FLOAT_VERTEX] = TRUE; } - if (gl_info->supported[ARB_POINT_SPRITE]) - { - gl_info->limits.point_sprite_units = gl_info->limits.textures; - } - else - { - gl_info->limits.point_sprite_units = 0; - } checkGLcall("extension detection"); LEAVE_GL(); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c3dd7ff..b3c1270 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1594,21 +1594,8 @@ static void state_pointsprite_w(struct wined3d_context *context, const struct wi static void state_pointsprite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - const struct wined3d_gl_info *gl_info = context->gl_info; - if (state->render_states[WINED3DRS_POINTSPRITEENABLE]) { - static BOOL warned; - - if (gl_info->limits.point_sprite_units < gl_info->limits.textures && !warned) - { - if (use_ps(state) || state->lowest_disabled_stage > gl_info->limits.point_sprite_units) - { - FIXME("The app uses point sprite texture coordinates on more units than supported by the driver\n"); - warned = TRUE; - } - } - glEnable(GL_POINT_SPRITE_ARB); checkGLcall("glEnable(GL_POINT_SPRITE_ARB)"); } else { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d340049..129c156 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1445,7 +1445,6 @@ struct wined3d_gl_limits UINT texture3d_size; float pointsize_max; float pointsize_min; - UINT point_sprite_units; UINT blends; UINT anisotropy; float shininess;

1 0

Henri Verbeet : wined3d: Pass a non-NULL rectangle to surface_color_fill() in wined3d_device_clear_rendertarget_view().
by Alexandre Julliard 05 Aug '11

05 Aug '11

Module: wine Branch: master Commit: 293bf961ed7e161b29069f99a737d6249ca25365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=293bf961ed7e161b29069f99a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 4 19:53:30 2011 +0200 wined3d: Pass a non-NULL rectangle to surface_color_fill() in wined3d_device_clear_rendertarget_view(). --- dlls/wined3d/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ee08b7d..66f89f1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5008,6 +5008,7 @@ void CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *device, { struct wined3d_resource *resource; HRESULT hr; + RECT rect; resource = rendertarget_view->resource; if (resource->resourceType != WINED3DRTYPE_SURFACE) @@ -5016,7 +5017,8 @@ void CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *device, return; } - hr = surface_color_fill(surface_from_resource(resource), NULL, color); + SetRect(&rect, 0, 0, resource->width, resource->height); + hr = surface_color_fill(surface_from_resource(resource), &rect, color); if (FAILED(hr)) ERR("Color fill failed, hr %#x.\n", hr); }

1 0

Henri Verbeet : wined3d: Always pass a non-NULL rectangle to surface_color_fill() in wined3d_device_color_fill().
by Alexandre Julliard 05 Aug '11

05 Aug '11

Module: wine Branch: master Commit: 7e8e7ecebb2b2574cf185fa92e171844efe895bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e8e7ecebb2b2574cf185fa92… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 4 19:53:29 2011 +0200 wined3d: Always pass a non-NULL rectangle to surface_color_fill() in wined3d_device_color_fill(). --- dlls/wined3d/device.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 19aa3d0..ee08b7d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4981,6 +4981,8 @@ HRESULT CDECL wined3d_device_delete_patch(struct wined3d_device *device, UINT ha HRESULT CDECL wined3d_device_color_fill(struct wined3d_device *device, struct wined3d_surface *surface, const RECT *rect, const WINED3DCOLORVALUE *color) { + RECT r; + TRACE("device %p, surface %p, rect %s, color {%.8e, %.8e, %.8e, %.8e}.\n", device, surface, wine_dbgstr_rect(rect), color->r, color->g, color->b, color->a); @@ -4991,6 +4993,12 @@ HRESULT CDECL wined3d_device_color_fill(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } + if (!rect) + { + SetRect(&r, 0, 0, surface->resource.width, surface->resource.height); + rect = &r; + } + return surface_color_fill(surface, rect, color); }

1 0

Henri Verbeet : ddraw: Remove rectangle validation from ddraw_surface7_BltFast().
by Alexandre Julliard 05 Aug '11

05 Aug '11

Module: wine Branch: master Commit: 831801dd60ffee59f9f3c7532d0a3e18a5a3ef96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=831801dd60ffee59f9f3c7532… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 4 19:53:28 2011 +0200 ddraw: Remove rectangle validation from ddraw_surface7_BltFast(). This is already done by wined3d_surface_blt(). --- dlls/ddraw/surface.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index b51c360..2b06cb9 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3622,14 +3622,6 @@ static HRESULT WINAPI ddraw_surface7_BltFast(IDirectDrawSurface7 *iface, DWORD d */ if(rsrc) { - if(rsrc->top > rsrc->bottom || rsrc->left > rsrc->right || - rsrc->right > src->surface_desc.dwWidth || - rsrc->bottom > src->surface_desc.dwHeight) - { - WARN("Source rectangle is invalid, returning DDERR_INVALIDRECT\n"); - return DDERR_INVALIDRECT; - } - src_w = rsrc->right - rsrc->left; src_h = rsrc->bottom - rsrc->top; }

1 0

Henri Verbeet : wined3d: Implement wined3d_surface_bltfast() on top of wined3d_surface_blt().
by Alexandre Julliard 05 Aug '11

05 Aug '11

Module: wine Branch: master Commit: a84275075d4a20a9a7f42eda01585d34f31b56d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a84275075d4a20a9a7f42eda0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 4 19:53:27 2011 +0200 wined3d: Implement wined3d_surface_bltfast() on top of wined3d_surface_blt(). --- dlls/wined3d/surface.c | 358 ++-------------------------------------- dlls/wined3d/wined3d_private.h | 2 - 2 files changed, 18 insertions(+), 342 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a84275075d4a20a9a7f42…

1 0

Frédéric Delanoy : winedbg: Remove dead assignment (Clang).
by Alexandre Julliard 05 Aug '11

05 Aug '11

Module: wine Branch: master Commit: a2e8d6145344d5a1e4b65b3f5fa3d6ba56a5e36d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2e8d6145344d5a1e4b65b3f5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 4 19:26:00 2011 +0200 winedbg: Remove dead assignment (Clang). --- programs/winedbg/symbol.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 6b689c2..8d7af5d 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -293,7 +293,6 @@ enum sym_get_lval symbol_picker_interactive(const char* name, const struct sgv_d } do { - i = 0; if (input_read_line("=> ", buffer, sizeof(buffer))) { if (buffer[0] == '\0') return sglv_aborted;

1 0

Huw Davies : gdi32: Don' t load a font replacement if any face of the real family exists.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 33532613a8572b6dcae51bfe3bbd23f021d0d085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33532613a8572b6dcae51bfe3… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 4 16:15:58 2011 +0100 gdi32: Don't load a font replacement if any face of the real family exists. --- dlls/gdi32/freetype.c | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index cfe8c37..426dc05 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1613,19 +1613,24 @@ static void LoadReplaceList(void) /* "NewName"="Oldname" */ WideCharToMultiByte(CP_ACP, 0, value, -1, familyA, sizeof(familyA), NULL, NULL); - /* Find the old family and hence all of the font files - in that family */ - LIST_FOR_EACH(family_elem_ptr, &font_list) { - family = LIST_ENTRY(family_elem_ptr, Family, entry); - if(!strcmpiW(family->FamilyName, data)) { - LIST_FOR_EACH(face_elem_ptr, &family->faces) { - face = LIST_ENTRY(face_elem_ptr, Face, entry); - TRACE("mapping %s %s to %s\n", debugstr_w(family->FamilyName), - debugstr_w(face->StyleName), familyA); - /* Now add a new entry with the new family name */ - AddFontToList(face->file, face->font_data_ptr, face->font_data_size, familyA, family->FamilyName, ADDFONT_FORCE_BITMAP | (face->external ? ADDFONT_EXTERNAL_FONT : 0)); + if(!find_family_from_name(value)) + { + /* Find the old family and hence all of the font files + in that family */ + LIST_FOR_EACH(family_elem_ptr, &font_list) { + family = LIST_ENTRY(family_elem_ptr, Family, entry); + if(!strcmpiW(family->FamilyName, data)) { + LIST_FOR_EACH(face_elem_ptr, &family->faces) { + face = LIST_ENTRY(face_elem_ptr, Face, entry); + TRACE("mapping %s %s to %s\n", debugstr_w(family->FamilyName), + debugstr_w(face->StyleName), familyA); + /* Now add a new entry with the new family name */ + AddFontToList(face->file, face->font_data_ptr, face->font_data_size, + familyA, family->FamilyName, + ADDFONT_FORCE_BITMAP | (face->external ? ADDFONT_EXTERNAL_FONT : 0)); + } + break; } - break; } } /* reset dlen and vlen */

1 0

Piotr Caban : mshtml: Added error handling to get_doc_string.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: e934d847b2323f50dac7d27157de3c4a239a8ed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e934d847b2323f50dac7d2715… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 4 14:05:37 2011 +0200 mshtml: Added error handling to get_doc_string. --- dlls/mshtml/persist.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 7f974f0..b73476b 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -334,6 +334,7 @@ static HRESULT get_doc_string(HTMLDocumentNode *This, char **str) LPCWSTR strw; nsAString nsstr; nsresult nsres; + HRESULT hres; if(!This->nsdoc) { WARN("NULL nsdoc\n"); @@ -347,8 +348,12 @@ static HRESULT get_doc_string(HTMLDocumentNode *This, char **str) } nsAString_Init(&nsstr, NULL); - nsnode_to_nsstring(nsnode, &nsstr); + hres = nsnode_to_nsstring(nsnode, &nsstr); nsIDOMNode_Release(nsnode); + if(FAILED(hres)) { + nsAString_Finish(&nsstr); + return hres; + } nsAString_GetData(&nsstr, &strw); TRACE("%s\n", debugstr_w(strw)); @@ -357,6 +362,8 @@ static HRESULT get_doc_string(HTMLDocumentNode *This, char **str) nsAString_Finish(&nsstr); + if(!*str) + return E_OUTOFMEMORY; return S_OK; }

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
77
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 August 2011