January 2012 - Wine-Commits

Francois Gouget : po: Remove English strings from the Dutch translation.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: 9bd05b916f3eb4590860ee4d0b0207bfedf007f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bd05b916f3eb4590860ee4d0… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 19 00:16:15 2012 +0100 po: Remove English strings from the Dutch translation. --- po/nl.po | 52 +++++++++++++++++++--------------------------------- 1 files changed, 19 insertions(+), 33 deletions(-) diff --git a/po/nl.po b/po/nl.po index 359458b..870e2dc 100644 --- a/po/nl.po +++ b/po/nl.po @@ -3318,7 +3318,7 @@ msgstr " Browsing history " #: inetcpl.rc:54 msgid "You can delete cached pages, cookies and other data." -msgstr "You can delete cached pages, cookies and other data." +msgstr "" #: inetcpl.rc:56 msgid "Delete &files..." @@ -4623,7 +4623,7 @@ msgstr "Media veranderd\n" #: winerror.mc:1351 msgid "I/O bus reset\n" -msgstr "I/O bus reset\n" +msgstr "" #: winerror.mc:1356 msgid "No media in drive\n" @@ -5567,7 +5567,7 @@ msgstr "Hook procedure heeft modulehandle nodig\n" #: winerror.mc:2541 msgid "Global-only hook procedure\n" -msgstr "Global-only hook procedure\n" +msgstr "" #: winerror.mc:2546 msgid "Journal hook already set\n" @@ -8211,19 +8211,6 @@ msgid "" "along with Wine; if not, write to the Free Software Foundation, Inc., 51 " "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." msgstr "" -"Wine is free software; you can redistribute it and/or modify it under the " -"terms of the GNU Lesser General Public License as published by the Free " -"Software Foundation; either version 2.1 of the License, or (at your option) " -"any later version.\n" -"\n" -"Wine is distributed in the hope that it will be useful, but WITHOUT ANY " -"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " -"FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for " -"more details.\n" -"\n" -"You should have received a copy of the GNU Lesser General Public License " -"along with Wine; if not, write to the Free Software Foundation, Inc., 51 " -"Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." #: shell32.rc:266 msgid "Wine License" @@ -8258,7 +8245,7 @@ msgstr " min" #: shlwapi.rc:30 msgctxt "time unit: seconds" msgid " sec" -msgstr " sec" +msgstr "" #: user32.rc:27 user32.rc:40 taskmgr.rc:138 msgctxt "window" @@ -12546,7 +12533,7 @@ msgstr " Vensterinstellingen " #: winecfg.rc:161 msgid "Automatically capture the &mouse in full-screen windows" -msgstr "Automatically capture the &mouse in full-screen windows" +msgstr "" #: winecfg.rc:162 msgid "Allow the window manager to &decorate the windows" @@ -12615,11 +12602,11 @@ msgstr " Laadvolgorde " #: winecfg.rc:200 msgid "&Builtin (Wine)" -msgstr "&Builtin (Wine)" +msgstr "" #: winecfg.rc:201 msgid "&Native (Windows)" -msgstr "&Native (Windows)" +msgstr "" #: winecfg.rc:202 msgid "Bui&ltin then Native" @@ -12668,7 +12655,7 @@ msgstr "Toon uitgebreid" #: winecfg.rc:240 msgid "De&vice:" -msgstr "De&vice:" +msgstr "" #: winecfg.rc:242 msgid "Bro&wse..." @@ -12687,9 +12674,8 @@ msgid "Show &dot files" msgstr "Toon \".\" bestanden" #: winecfg.rc:256 -#, fuzzy msgid "Driver diagnostics" -msgstr " Driver Diagnostics " +msgstr "" #: winecfg.rc:258 #, fuzzy @@ -12698,19 +12684,19 @@ msgstr " Defaults " #: winecfg.rc:259 msgid "Output device:" -msgstr "Output device:" +msgstr "" #: winecfg.rc:260 msgid "Voice output device:" -msgstr "Voice output device:" +msgstr "" #: winecfg.rc:261 msgid "Input device:" -msgstr "Input device:" +msgstr "" #: winecfg.rc:262 msgid "Voice input device:" -msgstr "Voice input device:" +msgstr "" #: winecfg.rc:267 msgid "&Test Sound" @@ -12840,15 +12826,15 @@ msgstr "native" #: winecfg.rc:54 msgid "builtin" -msgstr "builtin" +msgstr "" #: winecfg.rc:55 msgid "native, builtin" -msgstr "native, builtin" +msgstr "" #: winecfg.rc:56 msgid "builtin, native" -msgstr "builtin, native" +msgstr "" #: winecfg.rc:57 msgid "disabled" @@ -13170,7 +13156,7 @@ msgstr "Versie" #: wineconsole.rc:125 msgid "Console parameters" -msgstr "Console parameters" +msgstr "" #: wineconsole.rc:128 msgid "Retain these settings for later sessions" @@ -13744,7 +13730,7 @@ msgstr "Zoeken" #: winhlp32.rc:78 msgid "Wine Help" -msgstr "Wine Help" +msgstr "" #: winhlp32.rc:83 msgid "Error while reading the help file `%s'" @@ -13852,7 +13838,7 @@ msgstr "&Opmaak" #: wordpad.rc:82 wordpad.rc:105 msgid "&Bullet points" -msgstr "&Bullet points" +msgstr "" #: wordpad.rc:83 wordpad.rc:106 msgid "&Paragraph..."

1 0

Michael Stefaniuc : dsound: Merge IDirectSound3DBuffer into the secondary buffer object.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: e0d81e55e22eff4f2be3926dfa6c1745b9438e22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d81e55e22eff4f2be3926df… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 19 01:18:30 2012 +0100 dsound: Merge IDirectSound3DBuffer into the secondary buffer object. --- dlls/dsound/buffer.c | 22 +-- dlls/dsound/dsound_private.h | 22 +--- dlls/dsound/sound3d.c | 369 +++++++++++++++++++----------------------- 3 files changed, 174 insertions(+), 239 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e0d81e55e22eff4f2be39…

1 0

Michael Stefaniuc : dsound: Get rid of some LPDIRECTSOUND3DBUFFER usage.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: a5d212002121b366ba6857e8d993e9173f352b5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5d212002121b366ba6857e8d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 19 01:13:04 2012 +0100 dsound: Get rid of some LPDIRECTSOUND3DBUFFER usage. --- dlls/dsound/sound3d.c | 109 ++++++++++++++++++------------------------------- 1 files changed, 40 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a5d212002121b366ba685…

1 0

Francois Gouget : po: Remove English strings from the Finnish translation.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: a0fdc2b3c942cd7dfc8508b0bf324d43b78d8d2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0fdc2b3c942cd7dfc8508b0b… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 19 00:20:49 2012 +0100 po: Remove English strings from the Finnish translation. --- po/fi.po | 52 +++++++++++++++++++++------------------------------- 1 files changed, 21 insertions(+), 31 deletions(-) diff --git a/po/fi.po b/po/fi.po index 882cd65..3c76cd4 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7704,7 +7704,7 @@ msgstr "Al&kuun" #: shdoclc.rc:196 msgid "Trace Tags" -msgstr "Trace Tags" +msgstr "" #: shdoclc.rc:197 msgid "Resource Failures" @@ -7712,7 +7712,7 @@ msgstr "" #: shdoclc.rc:198 msgid "Dump Tracking Info" -msgstr "Dump Tracking Info" +msgstr "" #: shdoclc.rc:199 msgid "Debug Break" @@ -7724,23 +7724,23 @@ msgstr "" #: shdoclc.rc:201 msgid "Dump Tree" -msgstr "Dump Tree" +msgstr "" #: shdoclc.rc:202 msgid "Dump Lines" -msgstr "Dump Lines" +msgstr "" #: shdoclc.rc:203 msgid "Dump DisplayTree" -msgstr "Dump DisplayTree" +msgstr "" #: shdoclc.rc:204 msgid "Dump FormatCaches" -msgstr "Dump FormatCaches" +msgstr "" #: shdoclc.rc:205 msgid "Dump LayoutRects" -msgstr "Dump LayoutRects" +msgstr "" #: shdoclc.rc:206 msgid "Memory Monitor" @@ -12321,15 +12321,10 @@ msgid "" "Free Software Foundation; either version 2.1 of the License, or (at your " "option) any later version." msgstr "" -"This program is free software; you can redistribute it and/or modify it " -"under the terms of the GNU Lesser General Public License as published by the " -"Free Software Foundation; either version 2.1 of the License, or (at your " -"option) any later version." #: winecfg.rc:134 -#, fuzzy msgid "Windows registration information" -msgstr " Windows Registration Information " +msgstr "" #: winecfg.rc:135 msgid "&Owner:" @@ -12373,11 +12368,11 @@ msgstr " Ikkuna-asetukset " #: winecfg.rc:161 msgid "Automatically capture the &mouse in full-screen windows" -msgstr "Automatically capture the &mouse in full-screen windows" +msgstr "" #: winecfg.rc:162 msgid "Allow the window manager to &decorate the windows" -msgstr "Allow the window manager to &decorate the windows" +msgstr "" #: winecfg.rc:163 msgid "Allow the &window manager to control the windows" @@ -12392,13 +12387,12 @@ msgid "Desktop &size:" msgstr "Työpöydän koko:" #: winecfg.rc:171 -#, fuzzy msgid "Screen resolution" -msgstr " Screen &Resolution " +msgstr "" #: winecfg.rc:175 msgid "This is a sample text using 10 point Tahoma" -msgstr "This is a sample text using 10 point Tahoma" +msgstr "" #: winecfg.rc:182 #, fuzzy @@ -12433,7 +12427,7 @@ msgstr "&Muokkaa" #: winecfg.rc:196 msgid "Edit Override" -msgstr "Edit Override" +msgstr "" #: winecfg.rc:199 #, fuzzy @@ -12475,8 +12469,6 @@ msgid "" "Failed to connect to the mount manager, the drive configuration cannot be " "edited." msgstr "" -"Failed to connect to the mount manager, the drive configuration cannot be " -"edited." #: winecfg.rc:227 msgid "&Add..." @@ -12496,7 +12488,7 @@ msgstr "Näytä lisäasetukset" #: winecfg.rc:240 msgid "De&vice:" -msgstr "De&vice:" +msgstr "" #: winecfg.rc:242 msgid "Bro&wse..." @@ -12515,34 +12507,32 @@ msgid "Show &dot files" msgstr "Näytä p&istetiedostot" #: winecfg.rc:256 -#, fuzzy msgid "Driver diagnostics" -msgstr " Driver Diagnostics " +msgstr "" #: winecfg.rc:258 -#, fuzzy msgid "Defaults" -msgstr " Defaults " +msgstr "" #: winecfg.rc:259 msgid "Output device:" -msgstr "Output device:" +msgstr "" #: winecfg.rc:260 msgid "Voice output device:" -msgstr "Voice output device:" +msgstr "" #: winecfg.rc:261 msgid "Input device:" -msgstr "Input device:" +msgstr "" #: winecfg.rc:262 msgid "Voice input device:" -msgstr "Voice input device:" +msgstr "" #: winecfg.rc:267 msgid "&Test Sound" -msgstr "&Test Sound" +msgstr "" #: winecfg.rc:274 #, fuzzy

1 0

Matteo Bruni : wined3d: Dirtify STATE_FRAMEBUFFER after a FBO depth blit.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: cf5bc7a7117b270c5351d61628b0307c710768ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf5bc7a7117b270c5351d6162… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 18 23:41:32 2012 +0100 wined3d: Dirtify STATE_FRAMEBUFFER after a FBO depth blit. --- dlls/wined3d/surface.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f38c148..7aa68d1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1071,6 +1071,7 @@ static void wined3d_surface_depth_blt_fbo(const struct wined3d_device *device, s context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, NULL, dst_surface, SFLAG_INTEXTURE); context_set_draw_buffer(context, GL_NONE); context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); + context_invalidate_state(context, STATE_FRAMEBUFFER); if (gl_mask & GL_DEPTH_BUFFER_BIT) {

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DDECLMETHOD typedef.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: c35c30fa6883025e873c8630073d59876d464d24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c35c30fa6883025e873c86300… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 18 21:46:21 2012 +0100 wined3d: Get rid of the WINED3DDECLMETHOD typedef. --- dlls/d3d10core/inputlayout.c | 2 +- dlls/d3d8/vertexdeclaration.c | 2 +- dlls/wined3d/utils.c | 22 ++++++++++++---------- dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 20 ++++++++++---------- 6 files changed, 26 insertions(+), 24 deletions(-) diff --git a/dlls/d3d10core/inputlayout.c b/dlls/d3d10core/inputlayout.c index dfc4ad7..d6ae787 100644 --- a/dlls/d3d10core/inputlayout.c +++ b/dlls/d3d10core/inputlayout.c @@ -80,7 +80,7 @@ static HRESULT d3d10_input_layout_to_wined3d_declaration(const D3D10_INPUT_ELEME e->input_slot = f->InputSlot; e->offset = f->AlignedByteOffset; e->output_slot = is.elements[j].register_idx; - e->method = WINED3DDECLMETHOD_DEFAULT; + e->method = WINED3D_DECL_METHOD_DEFAULT; e->usage = 0; e->usage_idx = 0; diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index 7ca8783..659256f 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -335,7 +335,7 @@ static UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3 element->input_slot = stream; element->offset = offset; element->output_slot = reg; - element->method = WINED3DDECLMETHOD_DEFAULT; + element->method = WINED3D_DECL_METHOD_DEFAULT; element->usage = wined3d_usage_lookup[reg].usage; element->usage_idx = wined3d_usage_lookup[reg].usage_idx; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 35775df..879015e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1934,19 +1934,21 @@ const char *debug_d3dusagequery(DWORD usagequery) return buf[0] ? wine_dbg_sprintf("%s", &buf[3]) : "0"; } -const char* debug_d3ddeclmethod(WINED3DDECLMETHOD method) { - switch (method) { +const char *debug_d3ddeclmethod(enum wined3d_decl_method method) +{ + switch (method) + { #define WINED3DDECLMETHOD_TO_STR(u) case u: return #u - WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_DEFAULT); - WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_PARTIALU); - WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_PARTIALV); - WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_CROSSUV); - WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_UV); - WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_LOOKUP); - WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_LOOKUPPRESAMPLED); + WINED3DDECLMETHOD_TO_STR(WINED3D_DECL_METHOD_DEFAULT); + WINED3DDECLMETHOD_TO_STR(WINED3D_DECL_METHOD_PARTIAL_U); + WINED3DDECLMETHOD_TO_STR(WINED3D_DECL_METHOD_PARTIAL_V); + WINED3DDECLMETHOD_TO_STR(WINED3D_DECL_METHOD_CROSS_UV); + WINED3DDECLMETHOD_TO_STR(WINED3D_DECL_METHOD_UV); + WINED3DDECLMETHOD_TO_STR(WINED3D_DECL_METHOD_LOOKUP); + WINED3DDECLMETHOD_TO_STR(WINED3D_DECL_METHOD_LOOKUP_PRESAMPLED); #undef WINED3DDECLMETHOD_TO_STR default: - FIXME("Unrecognized %u declaration method!\n", method); + FIXME("Unrecognized declaration method %#x.\n", method); return "unrecognized"; } } diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 576fe7c..6539964 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -289,7 +289,7 @@ static void append_decl_element(struct wined3d_fvf_convert_state *state, elements[idx].input_slot = 0; elements[idx].offset = offset; elements[idx].output_slot = 0; - elements[idx].method = WINED3DDECLMETHOD_DEFAULT; + elements[idx].method = WINED3D_DECL_METHOD_DEFAULT; elements[idx].usage = usage; elements[idx].usage_idx = usage_idx; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5ca9d23..9efbdb0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2491,7 +2491,7 @@ const char *debug_d3ddevicetype(enum wined3d_device_type device_type) DECLSPEC_H const char *debug_d3dresourcetype(enum wined3d_resource_type resource_type) DECLSPEC_HIDDEN; const char *debug_d3dusage(DWORD usage) DECLSPEC_HIDDEN; const char *debug_d3dusagequery(DWORD usagequery) DECLSPEC_HIDDEN; -const char *debug_d3ddeclmethod(WINED3DDECLMETHOD method) DECLSPEC_HIDDEN; +const char *debug_d3ddeclmethod(enum wined3d_decl_method method) DECLSPEC_HIDDEN; const char *debug_d3ddeclusage(BYTE usage) DECLSPEC_HIDDEN; const char *debug_d3dprimitivetype(enum wined3d_primitive_type primitive_type) DECLSPEC_HIDDEN; const char *debug_d3drenderstate(enum wined3d_render_state state) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f1e389d..e82b721 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -719,16 +719,16 @@ enum wined3d_stateblock_type WINED3D_SBT_RECORDED = 4, /* WineD3D private */ }; -typedef enum _WINED3DDECLMETHOD -{ - WINED3DDECLMETHOD_DEFAULT = 0, - WINED3DDECLMETHOD_PARTIALU = 1, - WINED3DDECLMETHOD_PARTIALV = 2, - WINED3DDECLMETHOD_CROSSUV = 3, - WINED3DDECLMETHOD_UV = 4, - WINED3DDECLMETHOD_LOOKUP = 5, - WINED3DDECLMETHOD_LOOKUPPRESAMPLED = 6 -} WINED3DDECLMETHOD; +enum wined3d_decl_method +{ + WINED3D_DECL_METHOD_DEFAULT = 0, + WINED3D_DECL_METHOD_PARTIAL_U = 1, + WINED3D_DECL_METHOD_PARTIAL_V = 2, + WINED3D_DECL_METHOD_CROSS_UV = 3, + WINED3D_DECL_METHOD_UV = 4, + WINED3D_DECL_METHOD_LOOKUP = 5, + WINED3D_DECL_METHOD_LOOKUP_PRESAMPLED = 6, +}; typedef enum _WINED3DDECLUSAGE {

1 0

Akihiro Sagawa : wined3d: Let GetRasterStatus return D3D_OK, again.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: bd97589dbac60d1ed78ed1e49cf6ce6cee8c40b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd97589dbac60d1ed78ed1e49… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jan 18 23:33:53 2012 +0900 wined3d: Let GetRasterStatus return D3D_OK, again. --- dlls/wined3d/swapchain.c | 37 ++++++++++++++++++++++++++++++++----- 1 files changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index de31fd3..3e3451d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -206,19 +206,46 @@ HRESULT CDECL wined3d_swapchain_get_raster_status(const struct wined3d_swapchain struct wined3d_raster_status *raster_status) { static BOOL warned; + LARGE_INTEGER counter, freq_per_sec; + LONGLONG freq_per_frame, freq_per_line; + struct wined3d_display_mode mode; + /* No OpenGL equivalent */ if (!warned) { - FIXME("swapchain %p, raster_status %p stub!\n", swapchain, raster_status); + FIXME("swapchain %p, raster_status %p semi-stub!\n", swapchain, raster_status); warned = TRUE; } /* Obtaining the raster status is a widely implemented but optional * feature. When this method returns OK StarCraft 2 expects the - * raster_status->InVBlank value to actually change over time. To prevent - * StarCraft 2 from running in an infinite loop at startup this method - * returns INVALIDCALL. */ - return WINED3DERR_INVALIDCALL; + * raster_status->InVBlank value to actually change over time. + * And Endless Alice Crysis doesn't care even if this method fails. + * Thus this method returns OK and fakes raster_status by + * QueryPerformanceCounter. */ + + if (!QueryPerformanceCounter(&counter) || !QueryPerformanceFrequency(&freq_per_sec)) + return WINED3DERR_INVALIDCALL; + + if (FAILED(wined3d_swapchain_get_display_mode(swapchain, &mode))) + return WINED3DERR_INVALIDCALL; + if (mode.refresh_rate == DEFAULT_REFRESH_RATE) + mode.refresh_rate = 60; + + freq_per_frame = freq_per_sec.QuadPart / mode.refresh_rate; + /* Assume 20 scan lines in the vertical blank */ + freq_per_line = freq_per_frame / (mode.height + 20); + raster_status->scan_line = (counter.QuadPart % freq_per_frame) / freq_per_line; + if (raster_status->scan_line < mode.height) + raster_status->in_vblank = FALSE; + else + { + raster_status->scan_line = 0; + raster_status->in_vblank = TRUE; + } + TRACE("Returning fake value, in_vblank %u, scan_line %u.\n", + raster_status->in_vblank, raster_status->scan_line); + return WINED3D_OK; } HRESULT CDECL wined3d_swapchain_get_display_mode(const struct wined3d_swapchain *swapchain,

1 0

Henri Verbeet : wined3d: Get rid of the mostly unused blockType field in struct wined3d_stateblock.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: e1cd2453b9756077d51473f71ba370bc73030001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1cd2453b9756077d51473f71… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 18 21:46:18 2012 +0100 wined3d: Get rid of the mostly unused blockType field in struct wined3d_stateblock. --- dlls/wined3d/stateblock.c | 6 +----- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index b00fb84..304a326 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -924,8 +924,7 @@ HRESULT CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblo unsigned int i; DWORD map; - TRACE("Applying stateblock %p of type %#x to device %p.\n", - stateblock, stateblock->blockType, device); + TRACE("Applying stateblock %p to device %p.\n", stateblock, device); if (stateblock->changed.vertexShader) wined3d_device_set_vertex_shader(device, stateblock->state.vertex_shader); @@ -1105,8 +1104,6 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) TRACE("stateblock %p.\n", stateblock); - stateblock->blockType = WINED3D_SBT_INIT; - memset(stateblock->changed.pixelShaderConstantsF, 0, device->d3d_pshader_constantF * sizeof(BOOL)); memset(stateblock->changed.vertexShaderConstantsF, 0, device->d3d_vshader_constantF * sizeof(BOOL)); @@ -1344,7 +1341,6 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, stateblock->ref = 1; stateblock->device = device; - stateblock->blockType = type; for (i = 0; i < LIGHTMAP_SIZE; i++) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c9d1208..5ca9d23 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2310,7 +2310,6 @@ struct wined3d_stateblock { LONG ref; /* Note: Ref counting not required */ struct wined3d_device *device; - enum wined3d_stateblock_type blockType; /* Array indicating whether things have been set or changed */ struct wined3d_saved_states changed;

1 0

Marcus Meissner : winedbg: LoadStringw gets character size, not bytes.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: 11705f569ca931d3e138a6d3a3f0796dc67aa3a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11705f569ca931d3e138a6d3a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 18 22:40:25 2012 +0100 winedbg: LoadStringw gets character size, not bytes. --- programs/winedbg/crashdlg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/crashdlg.c b/programs/winedbg/crashdlg.c index 1f73979..fe13502 100644 --- a/programs/winedbg/crashdlg.c +++ b/programs/winedbg/crashdlg.c @@ -153,11 +153,11 @@ static void save_crash_log( HWND hwnd ) memset( &save, 0, sizeof(save) ); lstrcpyW( path, default_name ); - LoadStringW( GetModuleHandleW(0), IDS_TEXT_FILES, buffer, sizeof(buffer) ); + LoadStringW( GetModuleHandleW(0), IDS_TEXT_FILES, buffer, sizeof(buffer)/sizeof(buffer[0]) ); p = buffer + lstrlenW(buffer) + 1; lstrcpyW(p, txt_files); p += lstrlenW(p) + 1; - LoadStringW( GetModuleHandleW(0), IDS_ALL_FILES, p, sizeof(buffer) - (p - buffer) ); + LoadStringW( GetModuleHandleW(0), IDS_ALL_FILES, p, sizeof(buffer)/sizeof(buffer[0]) - (p - buffer) ); p += lstrlenW(p) + 1; lstrcpyW(p, all_files); p += lstrlenW(p) + 1;

1 0

Henri Verbeet : wined3d: Respect SFLAG_PIN_SYSMEM when creating a surface DIB section.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: d0d094dea21152d2b645282b7387f8e0b4409896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0d094dea21152d2b645282b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 18 21:46:19 2012 +0100 wined3d: Respect SFLAG_PIN_SYSMEM when creating a surface DIB section. --- dlls/wined3d/surface.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index df5855e..f38c148 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -514,9 +514,6 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface) surface->flags |= SFLAG_DIBSECTION; - HeapFree(GetProcessHeap(), 0, surface->resource.heapMemory); - surface->resource.heapMemory = NULL; - return WINED3D_OK; } @@ -1986,9 +1983,17 @@ static void gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, D if (!(surface->flags & SFLAG_DIBSECTION)) { + HRESULT hr; + /* This happens on gdi surfaces if the application set a user pointer * and resets it. Recreate the DIB section. */ - surface_create_dib_section(surface); + if (FAILED(hr = surface_create_dib_section(surface))) + { + ERR("Failed to create dib section, hr %#x.\n", hr); + return; + } + HeapFree(GetProcessHeap(), 0, surface->resource.heapMemory); + surface->resource.heapMemory = NULL; surface->resource.allocatedMemory = surface->dib.bitmap_data; } } @@ -3843,8 +3848,12 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) return WINED3DERR_INVALIDCALL; /* Use the DIB section from now on if we are not using a PBO. */ - if (!(surface->flags & SFLAG_PBO)) + if (!(surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM))) + { + HeapFree(GetProcessHeap(), 0, surface->resource.heapMemory); + surface->resource.heapMemory = NULL; surface->resource.allocatedMemory = surface->dib.bitmap_data; + } } /* Map the surface. */ @@ -3857,7 +3866,7 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) /* Sync the DIB with the PBO. This can't be done earlier because Map() * activates the allocatedMemory. */ - if (surface->flags & SFLAG_PBO) + if (surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM)) memcpy(surface->dib.bitmap_data, surface->resource.allocatedMemory, surface->resource.size); if (surface->resource.format->id == WINED3DFMT_P8_UINT @@ -3920,7 +3929,7 @@ HRESULT CDECL wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc) } /* Copy the contents of the DIB over to the PBO. */ - if ((surface->flags & SFLAG_PBO) && surface->resource.allocatedMemory) + if ((surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM)) && surface->resource.allocatedMemory) memcpy(surface->resource.allocatedMemory, surface->dib.bitmap_data, surface->resource.size); /* We locked first, so unlock now. */

1 0