winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
March 2011
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
849 discussions
Start a n
N
ew thread
Henri Verbeet : wined3d: Replace "pow2_matrix_identity" in wined3d_texture with a flag.
by Alexandre Julliard
29 Mar '11
29 Mar '11
Module: wine Branch: master Commit: 0e22aea01e768ccf7bb66fbe7088e48ee8725ea6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0e22aea01e768ccf7bb66fbe7…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 28 21:58:44 2011 +0200 wined3d: Replace "pow2_matrix_identity" in wined3d_texture with a flag. --- dlls/wined3d/shader.c | 2 +- dlls/wined3d/state.c | 6 ++---- dlls/wined3d/texture.c | 9 ++++----- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1c01a42..0641b27 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2101,7 +2101,7 @@ void find_ps_compile_args(const struct wined3d_state *state, args->shadow |= 1 << i; /* Flag samplers that need NP2 texcoord fixup. */ - if (!texture->pow2_matrix_identity) + if (!(texture->flags & WINED3D_TEXTURE_POW2_MAT_IDENT)) args->np2_fixup |= (1 << i); } if (shader->baseShader.reg_maps.shader_version.major >= 3) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e1de072..315705c 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3600,7 +3600,7 @@ static void sampler_texmatrix(DWORD state, struct wined3d_stateblock *stateblock */ if (sampler < MAX_TEXTURES) { - const BOOL texIsPow2 = !texture->pow2_matrix_identity; + const BOOL texIsPow2 = !(texture->flags & WINED3D_TEXTURE_POW2_MAT_IDENT); if (texIsPow2 || (context->lastWasPow2Texture & (1 << sampler))) { @@ -3671,10 +3671,8 @@ static void sampler(DWORD state_id, struct wined3d_stateblock *stateblock, struc } /* Trigger shader constant reloading (for NP2 texcoord fixup) */ - if (!texture->pow2_matrix_identity) - { + if (!(texture->flags & WINED3D_TEXTURE_POW2_MAT_IDENT)) device->shader_backend->shader_load_np2fixup_constants(device->shader_priv, gl_info, state); - } } else if (mapped_stage < gl_info->limits.textures) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e16d72d..10edf4a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -58,8 +58,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->texture_rgb.dirty = TRUE; texture->texture_srgb.dirty = TRUE; texture->is_srgb = FALSE; - texture->pow2_matrix_identity = TRUE; - texture->flags = 0; + texture->flags = WINED3D_TEXTURE_POW2_MAT_IDENT; if (texture->resource.format->flags & WINED3DFMT_FLAG_FILTERING) { @@ -900,7 +899,7 @@ HRESULT cubetexture_init(struct wined3d_texture *texture, UINT edge_length, UINT texture->pow2_matrix[5] = ((float)edge_length) / ((float)pow2_edge_length); texture->pow2_matrix[10] = ((float)edge_length) / ((float)pow2_edge_length); texture->pow2_matrix[15] = 1.0f; - texture->pow2_matrix_identity = FALSE; + texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; } texture->target = GL_TEXTURE_CUBE_MAP_ARB; @@ -1037,7 +1036,7 @@ HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT height, U && wined3d_settings.rendertargetlock_mode == RTL_READTEX)) { if (width != 1 || height != 1) - texture->pow2_matrix_identity = FALSE; + texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; texture->pow2_matrix[0] = (float)width; texture->pow2_matrix[5] = (float)height; @@ -1055,9 +1054,9 @@ HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT height, U { if ((width != pow2_width) || (height != pow2_height)) { - texture->pow2_matrix_identity = FALSE; texture->pow2_matrix[0] = (((float)width) / ((float)pow2_width)); texture->pow2_matrix[5] = (((float)height) / ((float)pow2_height)); + texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; } else { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index de50930..4ec25e6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1889,6 +1889,7 @@ struct wined3d_texture_ops }; #define WINED3D_TEXTURE_COND_NP2 0x1 +#define WINED3D_TEXTURE_POW2_MAT_IDENT 0x2 struct wined3d_texture { @@ -1905,7 +1906,6 @@ struct wined3d_texture DWORD sampler; BOOL is_srgb; DWORD flags; - BOOL pow2_matrix_identity; const struct min_lookup *min_mip_lookup; const GLenum *mag_lookup; GLenum target;
1
0
0
0
Henri Verbeet : wined3d: Replace "cond_np2" in wined3d_texture with a flag.
by Alexandre Julliard
29 Mar '11
29 Mar '11
Module: wine Branch: master Commit: e111acdf11673e5d985e8de1432683c69a765aa6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e111acdf11673e5d985e8de14…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 28 21:58:43 2011 +0200 wined3d: Replace "cond_np2" in wined3d_texture with a flag. --- dlls/wined3d/texture.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 170507b..e16d72d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -59,6 +59,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->texture_srgb.dirty = TRUE; texture->is_srgb = FALSE; texture->pow2_matrix_identity = TRUE; + texture->flags = 0; if (texture->resource.format->flags & WINED3DFMT_FLAG_FILTERING) { @@ -262,7 +263,7 @@ void wined3d_texture_apply_state_changes(struct wined3d_texture *texture, const DWORD sampler_states[WINED3D_HIGHEST_SAMPLER_STATE + 1], const struct wined3d_gl_info *gl_info) { - BOOL cond_np2 = texture->cond_np2; + BOOL cond_np2 = texture->flags & WINED3D_TEXTURE_COND_NP2; GLenum target = texture->target; struct gl_texture *gl_tex; DWORD state; @@ -666,7 +667,7 @@ static HRESULT texture2d_bind(struct wined3d_texture *texture, * state. The same applies to filtering. Even if the texture has only * one mip level, the default LINEAR_MIPMAP_LINEAR filter causes a SW * fallback on macos. */ - if (texture->cond_np2) + if (texture->flags & WINED3D_TEXTURE_COND_NP2) { GLenum target = texture->target; @@ -1028,7 +1029,7 @@ HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT height, U texture->pow2_matrix[10] = 1.0f; texture->pow2_matrix[15] = 1.0f; texture->target = GL_TEXTURE_2D; - texture->cond_np2 = TRUE; + texture->flags |= WINED3D_TEXTURE_COND_NP2; texture->min_mip_lookup = minMipLookup_noFilter; } else if (gl_info->supported[ARB_TEXTURE_RECTANGLE] && (width != pow2_width || height != pow2_height) @@ -1043,7 +1044,7 @@ HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT height, U texture->pow2_matrix[10] = 1.0f; texture->pow2_matrix[15] = 1.0f; texture->target = GL_TEXTURE_RECTANGLE_ARB; - texture->cond_np2 = TRUE; + texture->flags |= WINED3D_TEXTURE_COND_NP2; if (texture->resource.format->flags & WINED3DFMT_FLAG_FILTERING) texture->min_mip_lookup = minMipLookup_noMip; @@ -1067,7 +1068,6 @@ HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT height, U texture->pow2_matrix[10] = 1.0f; texture->pow2_matrix[15] = 1.0f; texture->target = GL_TEXTURE_2D; - texture->cond_np2 = FALSE; } TRACE("xf(%f) yf(%f)\n", texture->pow2_matrix[0], texture->pow2_matrix[5]); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 382df9d..de50930 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1888,6 +1888,8 @@ struct wined3d_texture_ops void (*texture_sub_resource_cleanup)(struct wined3d_resource *sub_resource); }; +#define WINED3D_TEXTURE_COND_NP2 0x1 + struct wined3d_texture { struct wined3d_resource resource; @@ -1902,8 +1904,8 @@ struct wined3d_texture LONG bind_count; DWORD sampler; BOOL is_srgb; + DWORD flags; BOOL pow2_matrix_identity; - BOOL cond_np2; const struct min_lookup *min_mip_lookup; const GLenum *mag_lookup; GLenum target;
1
0
0
0
Henri Verbeet : wined3d: Get rid of IWineD3DBaseTextureClass.
by Alexandre Julliard
29 Mar '11
29 Mar '11
Module: wine Branch: master Commit: c5bf96c95174b40cb53cc1668c6db5cdf185c190 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c5bf96c95174b40cb53cc1668…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 28 21:58:42 2011 +0200 wined3d: Get rid of IWineD3DBaseTextureClass. --- dlls/wined3d/arb_program_shader.c | 15 ++- dlls/wined3d/context.c | 4 +- dlls/wined3d/device.c | 16 +- dlls/wined3d/glsl_shader.c | 23 ++- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/shader.c | 9 +- dlls/wined3d/state.c | 19 ++- dlls/wined3d/surface.c | 14 +- dlls/wined3d/texture.c | 283 +++++++++++++++++----------------- dlls/wined3d/utils.c | 8 +- dlls/wined3d/volume.c | 2 +- dlls/wined3d/wined3d_private.h | 34 ++--- 12 files changed, 214 insertions(+), 215 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=c5bf96c95174b40cb53cc…
1
0
0
0
André Hentschel : wininet: Port numbers are unsigned.
by Alexandre Julliard
29 Mar '11
29 Mar '11
Module: wine Branch: master Commit: 316f1c2e7c5c37a275cb912b777c5b5b9d698d9f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=316f1c2e7c5c37a275cb912b7…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 28 22:47:27 2011 +0200 wininet: Port numbers are unsigned. --- dlls/wininet/internet.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index a0db965..9b37e58 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -4068,7 +4068,7 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COMPONENTSW lpUrlComponents, DWORD dwFlags, INTERNET_SCHEME nScheme; static const WCHAR slashSlashW[] = {'/','/'}; - static const WCHAR percentD[] = {'%','d',0}; + static const WCHAR fmtW[] = {'%','u',0}; TRACE("(%p,%d,%p,%p)\n", lpUrlComponents, dwFlags, lpszUrl, lpdwUrlLength); @@ -4155,7 +4155,7 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COMPONENTSW lpUrlComponents, DWORD dwFlags, { WCHAR szPort[MAX_WORD_DIGITS+1]; - sprintfW(szPort, percentD, lpUrlComponents->nPort); + sprintfW(szPort, fmtW, lpUrlComponents->nPort); *lpszUrl = ':'; lpszUrl++; dwLen = strlenW(szPort);
1
0
0
0
André Hentschel : winhttp: Port numbers are unsigned ( more).
by Alexandre Julliard
29 Mar '11
29 Mar '11
Module: wine Branch: master Commit: 1c7d45c093b2981a9c31061fe00ee7aef1314fbd URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1c7d45c093b2981a9c31061fe…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 28 21:40:43 2011 +0200 winhttp: Port numbers are unsigned (more). --- dlls/winhttp/url.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 09835b4..6ead33c 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -299,7 +299,7 @@ static DWORD comp_length( DWORD len, DWORD flags, WCHAR *comp ) static BOOL calc_length( URL_COMPONENTS *uc, DWORD flags, LPDWORD len ) { - static const WCHAR formatW[] = {'%','d',0}; + static const WCHAR formatW[] = {'%','u',0}; INTERNET_SCHEME scheme; *len = 0; @@ -360,7 +360,7 @@ static BOOL calc_length( URL_COMPONENTS *uc, DWORD flags, LPDWORD len ) */ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDWORD required ) { - static const WCHAR formatW[] = {'%','d',0}; + static const WCHAR formatW[] = {'%','u',0}; static const WCHAR twoslashW[] = {'/','/'}; DWORD len;
1
0
0
0
André Hentschel : mshtml: Port numbers are unsigned.
by Alexandre Julliard
29 Mar '11
29 Mar '11
Module: wine Branch: master Commit: 3a06c5a54a4fcab661c40d3a8c3071e88d20b448 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3a06c5a54a4fcab661c40d3a8…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 28 21:40:24 2011 +0200 mshtml: Port numbers are unsigned. --- dlls/mshtml/htmllocation.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 9d61cd1..9c90edc 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -333,7 +333,7 @@ static HRESULT WINAPI HTMLLocation_get_host(IHTMLLocation *iface, BSTR *p) if(url.nPort) { /* <hostname>:<port> */ - const WCHAR format[] = {'%','d',0}; + const WCHAR format[] = {'%','u',0}; DWORD len = url.dwHostNameLength + 1 + 5 + 1; WCHAR buf[len]; @@ -406,7 +406,7 @@ static HRESULT WINAPI HTMLLocation_get_port(IHTMLLocation *iface, BSTR *p) return hres; if(url.nPort) { - const WCHAR format[] = {'%','d',0}; + const WCHAR format[] = {'%','u',0}; WCHAR buf[6]; snprintfW(buf, 6, format, url.nPort); *p = SysAllocString(buf);
1
0
0
0
David Hedberg : comdlg32: Add stub implementation of the Common Item dialogs.
by Alexandre Julliard
29 Mar '11
29 Mar '11
Module: wine Branch: master Commit: ab085d661c901fd18fb4e02354dfbaffcd0d5c6b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ab085d661c901fd18fb4e0235…
Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Mar 24 22:38:51 2011 +0100 comdlg32: Add stub implementation of the Common Item dialogs. --- dlls/comdlg32/Makefile.in | 1 + dlls/comdlg32/cdlg.h | 4 + dlls/comdlg32/cdlg32.c | 9 + dlls/comdlg32/itemdlg.c | 845 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 859 insertions(+), 0 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=ab085d661c901fd18fb4e…
1
0
0
0
David Hedberg : comdlg32: Add DllGetClassObject and a default class factory .
by Alexandre Julliard
29 Mar '11
29 Mar '11
Module: wine Branch: master Commit: 55c717e84cd87d841da49f4fbd3210efaa2479a0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=55c717e84cd87d841da49f4fb…
Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Mar 24 22:38:50 2011 +0100 comdlg32: Add DllGetClassObject and a default class factory. --- dlls/comdlg32/cdlg32.c | 97 +++++++++++++++++++++++++++++++++++++++++++ dlls/comdlg32/comdlg32.spec | 1 + 2 files changed, 98 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/cdlg32.c b/dlls/comdlg32/cdlg32.c index 9502443..0982dfb 100644 --- a/dlls/comdlg32/cdlg32.c +++ b/dlls/comdlg32/cdlg32.c @@ -21,6 +21,8 @@ #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -167,3 +169,98 @@ DWORD WINAPI CommDlgExtendedError(void) else return 0; /* we never set an error, so there isn't one */ } + +/************************************************************************* + * Implement the CommDlg32 class factory + * + * (Taken from shdocvw/factory.c; based on implementation in + * ddraw/main.c) + */ +typedef struct +{ + IClassFactory IClassFactory_iface; + HRESULT (*cf)(IUnknown*, REFIID, void**); +} IClassFactoryImpl; + +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + +/************************************************************************* + * CDLGCF_QueryInterface (IUnknown) + */ +static HRESULT WINAPI CDLGCF_QueryInterface(IClassFactory* iface, + REFIID riid, void **ppobj) +{ + TRACE("%p (%s %p)\n", iface, debugstr_guid(riid), ppobj); + + if(!ppobj) + return E_POINTER; + + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IClassFactory, riid)) + { + *ppobj = iface; + IClassFactory_AddRef(iface); + return S_OK; + } + + WARN("Interface not supported.\n"); + + *ppobj = NULL; + return E_NOINTERFACE; +} + +/************************************************************************* + * CDLGCF_AddRef (IUnknown) + */ +static ULONG WINAPI CDLGCF_AddRef(IClassFactory *iface) +{ + return 2; /* non-heap based object */ +} + +/************************************************************************* + * CDLGCF_Release (IUnknown) + */ +static ULONG WINAPI CDLGCF_Release(IClassFactory *iface) +{ + return 1; /* non-heap based object */ +} + +/************************************************************************* + * CDLGCF_CreateInstance (IClassFactory) + */ +static HRESULT WINAPI CDLGCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, + REFIID riid, void **ppobj) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); + return This->cf(pOuter, riid, ppobj); +} + +/************************************************************************* + * CDLGCF_LockServer (IClassFactory) + */ +static HRESULT WINAPI CDLGCF_LockServer(IClassFactory *iface, BOOL dolock) +{ + TRACE("%p (%d)\n", iface, dolock); + return S_OK; +} + +static const IClassFactoryVtbl CDLGCF_Vtbl = +{ + CDLGCF_QueryInterface, + CDLGCF_AddRef, + CDLGCF_Release, + CDLGCF_CreateInstance, + CDLGCF_LockServer +}; + +/************************************************************************* + * DllGetClassObject (COMMDLG32.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) +{ + TRACE("%s, %s, %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/comdlg32/comdlg32.spec b/dlls/comdlg32/comdlg32.spec index 618ccd0..118d3d7 100644 --- a/dlls/comdlg32/comdlg32.spec +++ b/dlls/comdlg32/comdlg32.spec @@ -3,6 +3,7 @@ @ stdcall ChooseFontA(ptr) @ stdcall ChooseFontW(ptr) @ stdcall CommDlgExtendedError() +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall FindTextA(ptr) @ stdcall FindTextW(ptr) @ stdcall GetFileTitleA(str ptr long)
1
0
0
0
Joshua Beck : winex11: Improved error handling in pglXMakeCurrent() call.
by Alexandre Julliard
29 Mar '11
29 Mar '11
Module: wine Branch: master Commit: ddada6753836faac170b9613b1d237d937b41ed6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ddada6753836faac170b9613b…
Author: Joshua Beck <jxb091000(a)utdallas.edu> Date: Thu Mar 24 01:50:33 2011 -0500 winex11: Improved error handling in pglXMakeCurrent() call. --- dlls/winex11.drv/opengl.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index a9cc178..b74bc0a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -344,8 +344,11 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) else win = root; - pglXMakeCurrent(gdi_display, win, ctx); - + if(pglXMakeCurrent(gdi_display, win, ctx) == 0) + { + ERR_(winediag)( "Unable to activate OpenGL context, most likely your OpenGL drivers haven't been installed correctly\n" ); + goto done; + } WineGLInfo.glVersion = (const char *) pglGetString(GL_VERSION); str = (const char *) pglGetString(GL_EXTENSIONS); WineGLInfo.glExtensions = HeapAlloc(GetProcessHeap(), 0, strlen(str)+1);
1
0
0
0
David Hedberg : msi: Add support for patching files.
by Alexandre Julliard
29 Mar '11
29 Mar '11
Module: wine Branch: master Commit: 6771ed40e808bfaadaee49aae9cbc7092686994a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6771ed40e808bfaadaee49aae…
Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Tue Mar 22 20:45:11 2011 +0100 msi: Add support for patching files. --- dlls/msi/action.c | 73 ++++++++++++++++++++++--- dlls/msi/files.c | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/helpers.c | 14 +++++ dlls/msi/msipriv.h | 14 +++++ dlls/msi/package.c | 1 + include/msidefs.h | 6 ++- 6 files changed, 252 insertions(+), 10 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=6771ed40e808bfaadaee4…
1
0
0
0
← Newer
1
...
13
14
15
16
17
18
19
...
85
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
Results per page:
10
25
50
100
200