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
July
June
May
April
March
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
November 2011
----- 2025 -----
July 2025
June 2025
May 2025
April 2025
March 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
852 discussions
Start a n
N
ew thread
Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard
08 Nov '11
08 Nov '11
Module: wine Branch: master Commit: f840c7672492c694297a0ab93ddedd346bb461de URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f840c7672492c694297a0ab93…
Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Nov 7 23:19:20 2011 +0100 po: Update French translation. --- po/fr.po | 36 +++++++++++++++++------------------- 1 files changed, 17 insertions(+), 19 deletions(-) diff --git a/po/fr.po b/po/fr.po index 71d7d86..393092e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2043,73 +2043,71 @@ msgstr "%u MB utilisés, %u MB disponibles" #: gdi32.rc:25 msgid "Western" -msgstr "" +msgstr "Européen occidental" #: gdi32.rc:26 msgid "Central European" -msgstr "" +msgstr "Européen central" #: gdi32.rc:27 msgid "Cyrillic" -msgstr "" +msgstr "Cyrillique" #: gdi32.rc:28 -#, fuzzy msgid "Greek" -msgstr "Vert" +msgstr "Grec" #: gdi32.rc:29 msgid "Turkish" -msgstr "" +msgstr "Turc" #: gdi32.rc:30 msgid "Hebrew" -msgstr "" +msgstr "Hébreu" #: gdi32.rc:31 msgid "Arabic" -msgstr "" +msgstr "Arabe" #: gdi32.rc:32 msgid "Baltic" -msgstr "" +msgstr "Balte" #: gdi32.rc:33 msgid "Vietnamese" -msgstr "" +msgstr "Vietnamien" #: gdi32.rc:34 msgid "Thai" -msgstr "" +msgstr "Thaï" #: gdi32.rc:35 -#, fuzzy msgid "Japanese" -msgstr "panneau" +msgstr "Japonais" #: gdi32.rc:36 msgid "CHINESE_GB2312" -msgstr "" +msgstr "Chinois_GB2312" #: gdi32.rc:37 msgid "Hangul" -msgstr "" +msgstr "Hangeul" #: gdi32.rc:38 msgid "CHINESE_BIG5" -msgstr "" +msgstr "Chinois_BIG5" #: gdi32.rc:39 msgid "Hangul(Johab)" -msgstr "" +msgstr "Hangeul (Johab)" #: gdi32.rc:40 msgid "Symbol" -msgstr "" +msgstr "Symbole" #: gdi32.rc:41 msgid "OEM/DOS" -msgstr "" +msgstr "OEM/DOS" #: hhctrl.rc:56 msgid "S&ync"
1
0
0
0
Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard
08 Nov '11
08 Nov '11
Module: wine Branch: master Commit: 3abd9354695a69d086ef5bfe7a5b6116a32f169f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3abd9354695a69d086ef5bfe7…
Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Oct 31 20:16:19 2011 +0200 po: Update Lithuanian translation. --- po/lt.po | 38 ++++++++++++++++++-------------------- 1 files changed, 18 insertions(+), 20 deletions(-) diff --git a/po/lt.po b/po/lt.po index 1f6f589..fe3f460 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To:
http://bugs.winehq.org\n
" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-10-31 20:15+0300\n" +"PO-Revision-Date: 2011-11-07 22:04+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -2039,73 +2039,71 @@ msgstr "%u MB sunaudota, %u MB laisva" #: gdi32.rc:25 msgid "Western" -msgstr "" +msgstr "Vakarų Europos" #: gdi32.rc:26 msgid "Central European" -msgstr "" +msgstr "Vidurio Europos" #: gdi32.rc:27 msgid "Cyrillic" -msgstr "" +msgstr "Kirilica" #: gdi32.rc:28 -#, fuzzy msgid "Greek" -msgstr "Tamsiai žalia" +msgstr "Graikų" #: gdi32.rc:29 msgid "Turkish" -msgstr "" +msgstr "Turkų" #: gdi32.rc:30 msgid "Hebrew" -msgstr "" +msgstr "Hebrajų" #: gdi32.rc:31 msgid "Arabic" -msgstr "" +msgstr "Arabų" #: gdi32.rc:32 msgid "Baltic" -msgstr "" +msgstr "Baltų" #: gdi32.rc:33 msgid "Vietnamese" -msgstr "" +msgstr "Vietnamiečių" #: gdi32.rc:34 msgid "Thai" -msgstr "" +msgstr "Tajų" #: gdi32.rc:35 -#, fuzzy msgid "Japanese" -msgstr "polangis" +msgstr "Japonų" #: gdi32.rc:36 msgid "CHINESE_GB2312" -msgstr "" +msgstr "CHINESE_GB2312" #: gdi32.rc:37 msgid "Hangul" -msgstr "" +msgstr "Hangul" #: gdi32.rc:38 msgid "CHINESE_BIG5" -msgstr "" +msgstr "CHINESE_BIG5" #: gdi32.rc:39 msgid "Hangul(Johab)" -msgstr "" +msgstr "Hangul (Johab)" #: gdi32.rc:40 msgid "Symbol" -msgstr "" +msgstr "Simboliai" #: gdi32.rc:41 msgid "OEM/DOS" -msgstr "" +msgstr "OEM/DOS" #: hhctrl.rc:56 msgid "S&ync"
1
0
0
0
Henri Verbeet : wined3d: Get rid of the SAVEDSTATES typedef.
by Alexandre Julliard
08 Nov '11
08 Nov '11
Module: wine Branch: master Commit: 4c727ed0a1464a2200fb1746e0f564916edbc572 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4c727ed0a1464a2200fb1746e…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 7 21:20:01 2011 +0100 wined3d: Get rid of the SAVEDSTATES typedef. --- dlls/wined3d/stateblock.c | 6 +++--- dlls/wined3d/wined3d_private.h | 10 ++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index f9a2812..e122165 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -241,7 +241,7 @@ static inline void stateblock_set_bits(DWORD *map, UINT map_size) } /* Set all members of a stateblock savedstate to the given value */ -static void stateblock_savedstates_set_all(SAVEDSTATES *states, DWORD vs_consts, DWORD ps_consts) +static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, DWORD vs_consts, DWORD ps_consts) { unsigned int i; @@ -274,7 +274,7 @@ static void stateblock_savedstates_set_all(SAVEDSTATES *states, DWORD vs_consts, memset(states->vertexShaderConstantsF, TRUE, sizeof(BOOL) * vs_consts); } -static void stateblock_savedstates_set_pixel(SAVEDSTATES *states, const DWORD num_constants) +static void stateblock_savedstates_set_pixel(struct wined3d_saved_states *states, const DWORD num_constants) { DWORD texture_mask = 0; WORD sampler_mask = 0; @@ -300,7 +300,7 @@ static void stateblock_savedstates_set_pixel(SAVEDSTATES *states, const DWORD nu memset(states->pixelShaderConstantsF, TRUE, sizeof(BOOL) * num_constants); } -static void stateblock_savedstates_set_vertex(SAVEDSTATES *states, const DWORD num_constants) +static void stateblock_savedstates_set_vertex(struct wined3d_saved_states *states, const DWORD num_constants) { DWORD texture_mask = 0; WORD sampler_mask = 0; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b5b335f..14fbd2b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2205,10 +2205,8 @@ struct wined3d_vertex_declaration BOOL half_float_conv_needed; }; -/* Internal state Block for Begin/End/Capture/Create/Apply info */ -/* Note: Very long winded but gl Lists are not flexible enough */ -/* to resolve everything we need, so doing it manually for now */ -typedef struct SAVEDSTATES { +struct wined3d_saved_states +{ DWORD transform[(HIGHEST_TRANSFORMSTATE >> 5) + 1]; WORD streamSource; /* MAX_STREAMS, 16 */ WORD streamFreq; /* MAX_STREAMS, 16 */ @@ -2232,7 +2230,7 @@ typedef struct SAVEDSTATES { DWORD vertexShader : 1; DWORD scissorRect : 1; DWORD padding : 4; -} SAVEDSTATES; +}; struct StageState { DWORD stage; @@ -2298,7 +2296,7 @@ struct wined3d_stateblock WINED3DSTATEBLOCKTYPE blockType; /* Array indicating whether things have been set or changed */ - SAVEDSTATES changed; + struct wined3d_saved_states changed; struct wined3d_state state; /* Contained state management */
1
0
0
0
Henri Verbeet : wined3d: Get rid of the wineD3DSurface_DIB typedef.
by Alexandre Julliard
08 Nov '11
08 Nov '11
Module: wine Branch: master Commit: 1e1c442aca52d001f27b7a5455abb9322a876933 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1e1c442aca52d001f27b7a545…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 7 21:20:00 2011 +0100 wined3d: Get rid of the wineD3DSurface_DIB typedef. --- dlls/wined3d/wined3d_private.h | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d573d9f..b5b335f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1942,14 +1942,12 @@ void volume_add_dirty_box(struct wined3d_volume *volume, const WINED3DBOX *dirty void volume_load(const struct wined3d_volume *volume, struct wined3d_context *context, UINT level, BOOL srgb_mode) DECLSPEC_HIDDEN; void volume_set_container(struct wined3d_volume *volume, struct wined3d_texture *container) DECLSPEC_HIDDEN; -/***************************************************************************** - * Structure for DIB Surfaces (GetDC and GDI surfaces) - */ -typedef struct wineD3DSurface_DIB { +struct wined3d_surface_dib +{ HBITMAP DIBsection; - void* bitmap_data; + void *bitmap_data; UINT bitmap_size; -} wineD3DSurface_DIB; +}; struct wined3d_renderbuffer_entry { @@ -2035,7 +2033,7 @@ struct wined3d_surface #define MAXLOCKCOUNT 50 /* After this amount of locks do not free the sysmem copy */ /* For GetDC */ - wineD3DSurface_DIB dib; + struct wined3d_surface_dib dib; HDC hDC; /* Color keys for DDraw */
1
0
0
0
Henri Verbeet : wined3d: Get rid of client_memory from wineD3DSurface_DIB.
by Alexandre Julliard
08 Nov '11
08 Nov '11
Module: wine Branch: master Commit: d6b432b06893888c530c7ad9c28527595c146f7e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d6b432b06893888c530c7ad9c…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 7 21:19:59 2011 +0100 wined3d: Get rid of client_memory from wineD3DSurface_DIB. --- dlls/wined3d/surface.c | 8 -------- dlls/wined3d/swapchain.c | 8 -------- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 0 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7af21b4..5d32512 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4800,14 +4800,6 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) back->pbo = tmp_pbo; } - /* client_memory should not be different, but just in case */ - { - BOOL tmp; - tmp = front->dib.client_memory; - front->dib.client_memory = back->dib.client_memory; - back->dib.client_memory = tmp; - } - /* Flip the opengl texture */ { GLuint tmp; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 7d7be5b..a02a189 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -787,14 +787,6 @@ static HRESULT swapchain_gdi_present(struct wined3d_swapchain *swapchain, const ERR("GDI Surface %p has heap memory allocated.\n", back); } - /* Client_memory should not be different, but just in case. */ - { - BOOL tmp; - tmp = front->dib.client_memory; - front->dib.client_memory = back->dib.client_memory; - back->dib.client_memory = tmp; - } - /* FPS support */ if (TRACE_ON(fps)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e81ff88..d573d9f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1949,7 +1949,6 @@ typedef struct wineD3DSurface_DIB { HBITMAP DIBsection; void* bitmap_data; UINT bitmap_size; - BOOL client_memory; } wineD3DSurface_DIB; struct wined3d_renderbuffer_entry
1
0
0
0
Henri Verbeet : wined3d: Get rid of holdbitmap from wineD3DSurface_DIB.
by Alexandre Julliard
08 Nov '11
08 Nov '11
Module: wine Branch: master Commit: 896aaa67ca28d2a40ce21a92f14776f80f29de89 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=896aaa67ca28d2a40ce21a92f…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 7 21:19:58 2011 +0100 wined3d: Get rid of holdbitmap from wineD3DSurface_DIB. --- dlls/wined3d/device.c | 3 --- dlls/wined3d/surface.c | 7 +------ dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 1 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 05a0ad8..b271f5b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5220,10 +5220,7 @@ static HRESULT updateSurfaceDesc(struct wined3d_surface *surface, /* Reallocate proper memory for the front and back buffer and adjust their sizes */ if (surface->flags & SFLAG_DIBSECTION) { - /* Release the DC */ - SelectObject(surface->hDC, surface->dib.holdbitmap); DeleteDC(surface->hDC); - /* Release the DIB section */ DeleteObject(surface->dib.DIBsection); surface->dib.bitmap_data = NULL; surface->resource.allocatedMemory = NULL; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4529ad0..7af21b4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -97,10 +97,7 @@ static void surface_cleanup(struct wined3d_surface *surface) if (surface->flags & SFLAG_DIBSECTION) { - /* Release the DC. */ - SelectObject(surface->hDC, surface->dib.holdbitmap); DeleteDC(surface->hDC); - /* Release the DIB section. */ DeleteObject(surface->dib.DIBsection); surface->dib.bitmap_data = NULL; surface->resource.allocatedMemory = NULL; @@ -511,7 +508,7 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface) /* Now allocate a DC. */ surface->hDC = CreateCompatibleDC(0); - surface->dib.holdbitmap = SelectObject(surface->hDC, surface->dib.DIBsection); + SelectObject(surface->hDC, surface->dib.DIBsection); TRACE("Using wined3d palette %p.\n", surface->palette); SelectPalette(surface->hDC, surface->palette ? surface->palette->hpal : 0, FALSE); @@ -3139,9 +3136,7 @@ HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem /* Do I have to copy the old surface content? */ if (surface->flags & SFLAG_DIBSECTION) { - SelectObject(surface->hDC, surface->dib.holdbitmap); DeleteDC(surface->hDC); - /* Release the DIB section. */ DeleteObject(surface->dib.DIBsection); surface->dib.bitmap_data = NULL; surface->resource.allocatedMemory = NULL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2e3fef1..e81ff88 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1949,7 +1949,6 @@ typedef struct wineD3DSurface_DIB { HBITMAP DIBsection; void* bitmap_data; UINT bitmap_size; - HGDIOBJ holdbitmap; BOOL client_memory; } wineD3DSurface_DIB;
1
0
0
0
Henri Verbeet : wined3d: Only report a broken pitch in wined3d_surface_map( ).
by Alexandre Julliard
08 Nov '11
08 Nov '11
Module: wine Branch: master Commit: 604d15400274a07f3eb0231688e2e09b6edb8355 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=604d15400274a07f3eb023168…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 7 21:19:57 2011 +0100 wined3d: Only report a broken pitch in wined3d_surface_map(). We'd like the correct pitch for internal calls to wined3d_surface_get_pitch(). --- dlls/wined3d/surface.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1a44f72..4529ad0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3096,7 +3096,7 @@ DWORD CDECL wined3d_surface_get_pitch(const struct wined3d_surface *surface) TRACE("surface %p.\n", surface); - if ((format->flags & (WINED3DFMT_FLAG_BLOCKS | WINED3DFMT_FLAG_BROKEN_PITCH)) == WINED3DFMT_FLAG_BLOCKS) + if (format->flags & WINED3DFMT_FLAG_BLOCKS) { /* Since compressed formats are block based, pitch means the amount of * bytes to the next row of block rather than the next row of pixels. */ @@ -3743,7 +3743,10 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, surface->surface_ops->surface_map(surface, rect, flags); - locked_rect->Pitch = wined3d_surface_get_pitch(surface); + if (format->flags & WINED3DFMT_FLAG_BROKEN_PITCH) + locked_rect->Pitch = surface->resource.width * format->byte_count; + else + locked_rect->Pitch = wined3d_surface_get_pitch(surface); if (!rect) {
1
0
0
0
Austin English : include: Define _WIN64 on sparc/powerpc64.
by Alexandre Julliard
08 Nov '11
08 Nov '11
Module: wine Branch: master Commit: d67275fed84e74072d202fc98c205f40c6d18b63 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d67275fed84e74072d202fc98…
Author: Austin English <austinenglish(a)gmail.com> Date: Mon Nov 7 13:51:48 2011 -0600 include: Define _WIN64 on sparc/powerpc64. --- include/basetsd.h | 2 +- include/msvcrt/crtdefs.h | 2 +- include/windef.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/basetsd.h b/include/basetsd.h index 922c91c..698dd5c 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -36,7 +36,7 @@ extern "C" { * 64-bit. */ -#if defined(__x86_64__) && !defined(_WIN64) +#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__)) && !defined(_WIN64) #define _WIN64 #endif diff --git a/include/msvcrt/crtdefs.h b/include/msvcrt/crtdefs.h index bc017c4..06ce9c3 100644 --- a/include/msvcrt/crtdefs.h +++ b/include/msvcrt/crtdefs.h @@ -29,7 +29,7 @@ # error You cannot use both wine/port.h and msvcrt headers #endif -#if defined(__x86_64__) && !defined(_WIN64) +#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__)) && !defined(_WIN64) #define _WIN64 #endif diff --git a/include/windef.h b/include/windef.h index 8f5ea30..9cf98e7 100644 --- a/include/windef.h +++ b/include/windef.h @@ -37,7 +37,7 @@ extern "C" { /* Calling conventions definitions */ -#if defined(__x86_64__) && !defined(_WIN64) +#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__)) && !defined(_WIN64) #define _WIN64 #endif
1
0
0
0
Nikolay Sivov : msxml3: Move XSLPattern test data to a table.
by Alexandre Julliard
08 Nov '11
08 Nov '11
Module: wine Branch: master Commit: de8e11f5d837465ee01063a0f2dd42e60eac6638 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=de8e11f5d837465ee01063a0f…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 6 19:08:45 2011 +0300 msxml3: Move XSLPattern test data to a table. --- dlls/msxml3/tests/domdoc.c | 560 +++++++++++++------------------------------- 1 files changed, 161 insertions(+), 399 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=de8e11f5d837465ee0106…
1
0
0
0
Nikolay Sivov : msxml3: Test that IXMLHTTPRequest doesn' t support IDispatchEx.
by Alexandre Julliard
08 Nov '11
08 Nov '11
Module: wine Branch: master Commit: ff0bc51f9de209f1a165b6ce7c3d983bc8e52544 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ff0bc51f9de209f1a165b6ce7…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 5 12:27:55 2011 +0300 msxml3: Test that IXMLHTTPRequest doesn't support IDispatchEx. --- dlls/msxml3/httprequest.c | 5 +---- dlls/msxml3/tests/domdoc.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 0265c1a..32cfc2c 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -607,13 +607,10 @@ static HRESULT WINAPI httprequest_GetTypeInfo(IXMLHTTPRequest *iface, UINT iTInf LCID lcid, ITypeInfo **ppTInfo) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); - HRESULT hr; TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - hr = get_typeinfo(IXMLHTTPRequest_tid, ppTInfo); - - return hr; + return get_typeinfo(IXMLHTTPRequest_tid, ppTInfo); } static HRESULT WINAPI httprequest_GetIDsOfNames(IXMLHTTPRequest *iface, REFIID riid, diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 54ec8fc..b124eaa 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10671,6 +10671,7 @@ static void test_dispex(void) IXMLDOMParseError *error; IXMLDOMNamedNodeMap *map; IXMLDOMDocument *doc; + IXMLHTTPRequest *req; IXMLDOMElement *elem; IDispatchEx *dispex; IXMLDOMNode *node; @@ -10772,6 +10773,17 @@ static void test_dispex(void) IXMLDOMElement_Release(elem); IXMLDOMDocument_Release(doc); + + /* IXMLHTTPRequest */ + hr = CoCreateInstance(&CLSID_XMLHTTPRequest, NULL, CLSCTX_INPROC_SERVER, + &IID_IXMLHttpRequest, (void**)&req); + if (hr == S_OK) + { + hr = IXMLHTTPRequest_QueryInterface(req, &IID_IDispatchEx, (void**)&dispex); + EXPECT_HR(hr, E_NOINTERFACE); + IXMLHTTPRequest_Release(req); + } + free_bstrs(); }
1
0
0
0
← Newer
1
...
63
64
65
66
67
68
69
...
86
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
86
Results per page:
10
25
50
100
200