January 2013 - Wine-Commits

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Jan. 23, 2013

Jan. 23, 2013

Module: wine Branch: master Commit: 534f5e5dd001c2dd20ff067672a5d1e50f34c08c URL: http://source.winehq.org/git/wine.git/?a=commit;h=534f5e5dd001c2dd20ff06767… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Jan 23 20:02:26 2013 +0200 po: Update Lithuanian translation. --- po/lt.po | 48 +++++++++++++++--------------------------------- 1 files changed, 15 insertions(+), 33 deletions(-) diff --git a/po/lt.po b/po/lt.po index 02996e0..f28206a 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: 2013-01-08 22:47+0300\n" +"PO-Revision-Date: 2013-01-23 20:00+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -10435,77 +10435,59 @@ msgstr "Nežinomi protokolai" #: netstat.rc:41 msgid "TCP Statistics for IPv4" -msgstr "" +msgstr "IPv4 TCP statistika" #: netstat.rc:42 -#, fuzzy -#| msgid "Active Connections" msgid "Active Opens" -msgstr "Aktyvūs ryšiai" +msgstr "Aktyvūs atvėrimai" #: netstat.rc:43 msgid "Passive Opens" -msgstr "" +msgstr "Pasyvūs atvėrimai" #: netstat.rc:44 -#, fuzzy -#| msgid "Active Connections" msgid "Failed Connection Attempts" -msgstr "Aktyvūs ryšiai" +msgstr "Nepavykę bandymai susijungti" #: netstat.rc:45 -#, fuzzy -#| msgid "Active Connections" msgid "Reset Connections" -msgstr "Aktyvūs ryšiai" +msgstr "Panaikinti ryšiai" #: netstat.rc:46 -#, fuzzy -#| msgid "Active Connections" msgid "Current Connections" -msgstr "Aktyvūs ryšiai" +msgstr "Dabartiniai ryšiai" #: netstat.rc:47 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Received" -msgstr "Segmentas užblokuotas.\n" +msgstr "Gauti segmentai" #: netstat.rc:48 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Sent" -msgstr "Segmentas užblokuotas.\n" +msgstr "Išsiųsti segmentai" #: netstat.rc:49 msgid "Segments Retransmitted" -msgstr "" +msgstr "Pakartotinai perduoti segmentai" #: netstat.rc:50 msgid "UDP Statistics for IPv4" -msgstr "" +msgstr "IPv4 UDP statistika" #: netstat.rc:51 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Datagrams Received" -msgstr "Segmentas užblokuotas.\n" +msgstr "Gauti duomenų paketai" #: netstat.rc:52 -#, fuzzy -#| msgid "Local Port" msgid "No Ports" -msgstr "Vietinis prievadas" +msgstr "Be prievadų" #: netstat.rc:53 -#, fuzzy -#| msgid "Decoding Error" msgid "Receive Errors" -msgstr "Dekodavimo klaida" +msgstr "Gavimo klaidos" #: netstat.rc:54 msgid "Datagrams Sent" -msgstr "" +msgstr "Išsiųsti duomenų paketai" #: notepad.rc:27 msgid "&New\tCtrl+N"

1 0

Henri Verbeet : d3drm: Avoid LPD3DVALUE.
by Alexandre Julliard Jan. 23, 2013

Jan. 23, 2013

Module: wine Branch: master Commit: e650f49f0e61032ce2daea3311e4944bc0e50663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e650f49f0e61032ce2daea331… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 23 08:50:09 2013 +0100 d3drm: Avoid LPD3DVALUE. --- dlls/d3drm/frame.c | 10 ++++------ include/d3drmobj.h | 10 +++++----- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index fdcf714..258da3a 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -766,9 +766,8 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_GetPosition(IDirect3DRMFrame2* iface return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFrame2Impl_GetRotation(IDirect3DRMFrame2* iface, - LPDIRECT3DRMFRAME reference, - LPD3DVECTOR axis, LPD3DVALUE return_theta) +static HRESULT WINAPI IDirect3DRMFrame2Impl_GetRotation(IDirect3DRMFrame2 *iface, + IDirect3DRMFrame *reference, D3DVECTOR *axis, D3DVALUE *return_theta) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); @@ -1854,9 +1853,8 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_GetPosition(IDirect3DRMFrame3* iface return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFrame3Impl_GetRotation(IDirect3DRMFrame3* iface, - LPDIRECT3DRMFRAME3 reference, - LPD3DVECTOR axis, LPD3DVALUE return_theta) +static HRESULT WINAPI IDirect3DRMFrame3Impl_GetRotation(IDirect3DRMFrame3 *iface, + IDirect3DRMFrame3 *reference, D3DVECTOR *axis, D3DVALUE *return_theta) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 69ab35d..bcfd724 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -1110,7 +1110,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame,IDirect3DRMVisual) STDMETHOD_(D3DRMMATERIALMODE, GetMaterialMode)(THIS) PURE; STDMETHOD(GetParent)(THIS_ LPDIRECT3DRMFRAME *) PURE; STDMETHOD(GetPosition)(THIS_ LPDIRECT3DRMFRAME reference, LPD3DVECTOR return_position) PURE; - STDMETHOD(GetRotation)(THIS_ LPDIRECT3DRMFRAME reference, LPD3DVECTOR axis, LPD3DVALUE return_theta) PURE; + STDMETHOD(GetRotation)(THIS_ IDirect3DRMFrame *reference, D3DVECTOR *axis, D3DVALUE *return_theta) PURE; STDMETHOD(GetScene)(THIS_ LPDIRECT3DRMFRAME *) PURE; STDMETHOD_(D3DRMSORTMODE, GetSortMode)(THIS) PURE; STDMETHOD(GetTexture)(THIS_ LPDIRECT3DRMTEXTURE *) PURE; @@ -1341,7 +1341,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame) STDMETHOD_(D3DRMMATERIALMODE, GetMaterialMode)(THIS) PURE; STDMETHOD(GetParent)(THIS_ LPDIRECT3DRMFRAME *) PURE; STDMETHOD(GetPosition)(THIS_ LPDIRECT3DRMFRAME reference, LPD3DVECTOR return_position) PURE; - STDMETHOD(GetRotation)(THIS_ LPDIRECT3DRMFRAME reference, LPD3DVECTOR axis, LPD3DVALUE return_theta) PURE; + STDMETHOD(GetRotation)(THIS_ IDirect3DRMFrame *reference, D3DVECTOR *axis, D3DVALUE *return_theta) PURE; STDMETHOD(GetScene)(THIS_ LPDIRECT3DRMFRAME *) PURE; STDMETHOD_(D3DRMSORTMODE, GetSortMode)(THIS) PURE; STDMETHOD(GetTexture)(THIS_ LPDIRECT3DRMTEXTURE *) PURE; @@ -1621,7 +1621,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame3,IDirect3DRMVisual) STDMETHOD_(D3DRMMATERIALMODE, GetMaterialMode)(THIS) PURE; STDMETHOD(GetParent)(THIS_ LPDIRECT3DRMFRAME3 *) PURE; STDMETHOD(GetPosition)(THIS_ LPDIRECT3DRMFRAME3 reference, LPD3DVECTOR return_position) PURE; - STDMETHOD(GetRotation)(THIS_ LPDIRECT3DRMFRAME3 reference, LPD3DVECTOR axis, LPD3DVALUE return_theta) PURE; + STDMETHOD(GetRotation)(THIS_ IDirect3DRMFrame3 *reference, D3DVECTOR *axis, D3DVALUE *return_theta) PURE; STDMETHOD(GetScene)(THIS_ LPDIRECT3DRMFRAME3 *) PURE; STDMETHOD_(D3DRMSORTMODE, GetSortMode)(THIS) PURE; STDMETHOD(GetTexture)(THIS_ LPDIRECT3DRMTEXTURE3 *) PURE; @@ -2196,8 +2196,8 @@ DECLARE_INTERFACE_(IDirect3DRMShadow2,IDirect3DRMVisual) STDMETHOD(SetVisual)(THIS_ LPUNKNOWN pUNK, DWORD) PURE; STDMETHOD(GetLight)(THIS_ LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(SetLight)(THIS_ LPDIRECT3DRMLIGHT, DWORD) PURE; - STDMETHOD(GetPlane)(THIS_ LPD3DVALUE px, LPD3DVALUE py, LPD3DVALUE pz, - LPD3DVALUE nx, LPD3DVALUE ny, LPD3DVALUE nz) PURE; + STDMETHOD(GetPlane)(THIS_ D3DVALUE *px, D3DVALUE *py, D3DVALUE *pz, + D3DVALUE *nx, D3DVALUE *ny, D3DVALUE *nz) PURE; STDMETHOD(SetPlane)(THIS_ D3DVALUE px, D3DVALUE py, D3DVALUE pz, D3DVALUE nx, D3DVALUE ny, D3DVALUE nz, DWORD) PURE; STDMETHOD(GetOptions)(THIS_ LPDWORD) PURE;

1 0

Ričardas Barkauskas : kernel32: Add SetFileInformationByHandle stub.
by Alexandre Julliard Jan. 23, 2013

Jan. 23, 2013

Module: wine Branch: master Commit: 2c041185344489b836647e95b324b0df34d13d19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c041185344489b836647e95b… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Tue Jan 22 23:53:35 2013 +0200 kernel32: Add SetFileInformationByHandle stub. --- dlls/kernel32/file.c | 5 +++++ dlls/kernel32/kernel32.spec | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 73b8416..91e8c8c 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1009,6 +1009,11 @@ BOOL WINAPI SetEndOfFile( HANDLE hFile ) return FALSE; } +BOOL WINAPI SetFileInformationByHandle( HANDLE file, FILE_INFO_BY_HANDLE_CLASS class, VOID *info, DWORD size ) +{ + FIXME("%p %u %p %u - stub\n", file, class, info, size); + return FALSE; +} /*********************************************************************** * SetFilePointer (KERNEL32.@) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 0bd1adc..f2f039b 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1126,6 +1126,7 @@ @ stdcall SetFileApisToOEM() @ stdcall SetFileAttributesA(str long) @ stdcall SetFileAttributesW(wstr long) +@ stdcall SetFileInformationByHandle(long long ptr long) @ stdcall SetFilePointer(long long ptr long) @ stdcall SetFilePointerEx(long int64 ptr long) # @ stub SetFileShortNameA

1 0

Dmitry Timoshkov : gdiplus: Make GdipCreateFromHDC2 not fail in case of hDevice != NULL.
by Alexandre Julliard Jan. 23, 2013

Jan. 23, 2013

Module: wine Branch: master Commit: 9532de882f830b9f10c8621bba5a3642a2f9d647 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9532de882f830b9f10c8621bb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 23 15:10:29 2013 +0800 gdiplus: Make GdipCreateFromHDC2 not fail in case of hDevice != NULL. --- dlls/gdiplus/graphics.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e5678a7..e287683 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2274,10 +2274,8 @@ GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **gra TRACE("(%p, %p, %p)\n", hdc, hDevice, graphics); - if(hDevice != NULL) { + if(hDevice != NULL) FIXME("Don't know how to handle parameter hDevice\n"); - return NotImplemented; - } if(hdc == NULL) return OutOfMemory;

1 0

Ričardas Barkauskas : advapi32: Add AddMandatoryAce stub.
by Alexandre Julliard Jan. 23, 2013

Jan. 23, 2013

Module: wine Branch: master Commit: 9a448b5d6a42033ed8b3354e6b576aa70c574c0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a448b5d6a42033ed8b3354e6… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Tue Jan 22 23:52:09 2013 +0200 advapi32: Add AddMandatoryAce stub. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 21357fa..38342dc 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -25,7 +25,7 @@ @ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) # @ stub AddAuditAccessObjectAce # @ stub AddConditionalAce -# @ stub AddMandatoryAce +@ stdcall AddMandatoryAce(ptr long long long ptr) # @ stub AddUsersToEncryptedFileEx # @ stub ADVAPI32_1000 # @ stub AddUsersToEncryptedFile diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 954a1c5..8e2f39c 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1567,6 +1567,12 @@ BOOL WINAPI AddAce( return set_ntstatus(RtlAddAce(pAcl, dwAceRevision, dwStartingAceIndex, pAceList, nAceListLength)); } +BOOL WINAPI AddMandatoryAce(ACL *acl, DWORD ace_revision, DWORD ace_flags, DWORD mandatory_policy, PSID label_sid) +{ + FIXME("%p %x %x %x %p - stub\n", acl, ace_revision, ace_flags, mandatory_policy, label_sid); + return FALSE; +} + /****************************************************************************** * DeleteAce [ADVAPI32.@] */

1 0

Henri Verbeet : wined3d: Properly set WINED3DFMT_FLAG_FILTERING in init_format_texture_info().
by Alexandre Julliard Jan. 23, 2013

Jan. 23, 2013

Module: wine Branch: master Commit: 6527277a58494d4175c14650c8c83c2655be9c50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6527277a58494d4175c14650c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 23 08:50:12 2013 +0100 wined3d: Properly set WINED3DFMT_FLAG_FILTERING in init_format_texture_info(). --- dlls/wined3d/directx.c | 3 +-- dlls/wined3d/utils.c | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 18e8f31..b49e897 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3485,8 +3485,7 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, static BOOL CheckFilterCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) { /* The flags entry of a format contains the filtering capability */ - if ((format->flags & WINED3DFMT_FLAG_FILTERING) - || !(adapter->gl_info.quirks & WINED3D_QUIRK_LIMITED_TEX_FILTERING)) + if (format->flags & WINED3DFMT_FLAG_FILTERING) return TRUE; return FALSE; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5c71c55..39309ae 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1287,6 +1287,9 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win format->height_scale.numerator = 1; format->height_scale.denominator = 1; + if (!(gl_info->quirks & WINED3D_QUIRK_LIMITED_TEX_FILTERING)) + format->flags |= WINED3DFMT_FLAG_FILTERING; + if (format->glGammaInternal != format->glInternal) { /* Filter sRGB capabilities if EXT_texture_sRGB is not supported. */

1 0

Henri Verbeet : wined3d: Get rid of select_shader_mode().
by Alexandre Julliard Jan. 23, 2013

Jan. 23, 2013

Module: wine Branch: master Commit: 3f21757702239f1c254cdc860d71e76e9929d409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f21757702239f1c254cdc860… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 23 08:50:11 2013 +0100 wined3d: Get rid of select_shader_mode(). --- dlls/wined3d/directx.c | 51 ++++++++++++++++++++++++--------------- dlls/wined3d/utils.c | 25 ------------------- dlls/wined3d/wined3d_private.h | 7 ----- 3 files changed, 31 insertions(+), 52 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index aa11116..18e8f31 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2247,16 +2247,14 @@ static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info * return select_card_fallback_nvidia(gl_info); } -static const struct fragment_pipeline *select_fragment_implementation(const struct wined3d_gl_info *gl_info) +static const struct fragment_pipeline *select_fragment_implementation(const struct wined3d_gl_info *gl_info, + const struct wined3d_shader_backend_ops *shader_backend_ops) { - int vs_selected_mode, ps_selected_mode; - - select_shader_mode(gl_info, &ps_selected_mode, &vs_selected_mode); - if (ps_selected_mode == SHADER_GLSL) + if (shader_backend_ops == &glsl_shader_backend) return &glsl_fragment_pipe; - if (ps_selected_mode == SHADER_ARB) + if (shader_backend_ops == &arb_program_shader_backend) return &arbfp_fragment_pipeline; - if (ps_selected_mode == SHADER_ATI) + if (gl_info->supported[ATI_FRAGMENT_SHADER]) return &atifs_fragment_pipeline; if (gl_info->supported[NV_REGISTER_COMBINERS] && gl_info->supported[NV_TEXTURE_SHADER2]) return &nvts_fragment_pipeline; @@ -2267,22 +2265,35 @@ static const struct fragment_pipeline *select_fragment_implementation(const stru static const struct wined3d_shader_backend_ops *select_shader_backend(const struct wined3d_gl_info *gl_info) { - int vs_selected_mode, ps_selected_mode; - - select_shader_mode(gl_info, &ps_selected_mode, &vs_selected_mode); - if (vs_selected_mode == SHADER_GLSL || ps_selected_mode == SHADER_GLSL) return &glsl_shader_backend; - if (vs_selected_mode == SHADER_ARB || ps_selected_mode == SHADER_ARB) return &arb_program_shader_backend; + BOOL glsl = wined3d_settings.glslRequested && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 20); + + if (wined3d_settings.vs_mode == VS_NONE && wined3d_settings.ps_mode == PS_NONE) + return &none_shader_backend; + if (glsl && gl_info->supported[ARB_FRAGMENT_SHADER]) + return &glsl_shader_backend; + if (glsl && gl_info->supported[ARB_VERTEX_SHADER]) + { + /* Geforce4 cards support GLSL but for vertex shaders only. Further + * its reported GLSL caps are wrong. This combined with the fact that + * GLSL won't offer more features or performance, use ARB shaders only + * on this card. */ + if (gl_info->supported[NV_VERTEX_PROGRAM] && !gl_info->supported[NV_VERTEX_PROGRAM2]) + return &arb_program_shader_backend; + return &glsl_shader_backend; + } + if (gl_info->supported[ARB_VERTEX_PROGRAM] || gl_info->supported[ARB_FRAGMENT_PROGRAM]) + return &arb_program_shader_backend; return &none_shader_backend; } -static const struct blit_shader *select_blit_implementation(const struct wined3d_gl_info *gl_info) +static const struct blit_shader *select_blit_implementation(const struct wined3d_gl_info *gl_info, + const struct wined3d_shader_backend_ops *shader_backend_ops) { - int vs_selected_mode, ps_selected_mode; - - select_shader_mode(gl_info, &ps_selected_mode, &vs_selected_mode); - if ((ps_selected_mode == SHADER_ARB || ps_selected_mode == SHADER_GLSL) - && gl_info->supported[ARB_FRAGMENT_PROGRAM]) return &arbfp_blit; - else return &ffp_blit; + if ((shader_backend_ops == &glsl_shader_backend + || shader_backend_ops == &arb_program_shader_backend) + && gl_info->supported[ARB_FRAGMENT_PROGRAM]) + return &arbfp_blit; + return &ffp_blit; } static void parse_extension_string(struct wined3d_gl_info *gl_info, const char *extensions, @@ -2753,9 +2764,9 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) checkGLcall("extension detection"); - adapter->fragment_pipe = select_fragment_implementation(gl_info); adapter->shader_backend = select_shader_backend(gl_info); - adapter->blitter = select_blit_implementation(gl_info); + adapter->fragment_pipe = select_fragment_implementation(gl_info, adapter->shader_backend); + adapter->blitter = select_blit_implementation(gl_info, adapter->shader_backend); adapter->fragment_pipe->get_caps(gl_info, &fragment_caps); gl_info->limits.texture_stages = fragment_caps.MaxTextureBlendStages; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6caeee6..5c71c55 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3338,31 +3338,6 @@ UINT wined3d_log2i(UINT32 x) return (i = x >> 16) ? (x = i >> 8) ? l[x] + 24 : l[i] + 16 : (i = x >> 8) ? l[i] + 8 : l[x]; } -/* Set the shader type for this device, depending on the given capabilities - * and the user preferences in wined3d_settings. */ -void select_shader_mode(const struct wined3d_gl_info *gl_info, int *ps_selected, int *vs_selected) -{ - BOOL glsl = wined3d_settings.glslRequested && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 20); - - if (wined3d_settings.vs_mode == VS_NONE) *vs_selected = SHADER_NONE; - else if (gl_info->supported[ARB_VERTEX_SHADER] && glsl) - { - /* Geforce4 cards support GLSL but for vertex shaders only. Further its reported GLSL caps are - * wrong. This combined with the fact that glsl won't offer more features or performance, use ARB - * shaders only on this card. */ - if (gl_info->supported[NV_VERTEX_PROGRAM] && !gl_info->supported[NV_VERTEX_PROGRAM2]) *vs_selected = SHADER_ARB; - else *vs_selected = SHADER_GLSL; - } - else if (gl_info->supported[ARB_VERTEX_PROGRAM]) *vs_selected = SHADER_ARB; - else *vs_selected = SHADER_NONE; - - if (wined3d_settings.ps_mode == PS_NONE) *ps_selected = SHADER_NONE; - else if (gl_info->supported[ARB_FRAGMENT_SHADER] && glsl) *ps_selected = SHADER_GLSL; - else if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) *ps_selected = SHADER_ARB; - else if (gl_info->supported[ATI_FRAGMENT_SHADER]) *ps_selected = SHADER_ATI; - else *ps_selected = SHADER_NONE; -} - const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b6ecfa9..af24e69 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -252,11 +252,6 @@ static inline float float_24_to_32(DWORD in) #define ORM_BACKBUFFER 0 #define ORM_FBO 1 -#define SHADER_ARB 1 -#define SHADER_GLSL 2 -#define SHADER_ATI 3 -#define SHADER_NONE 4 - #define RTL_READDRAW 1 #define RTL_READTEX 2 @@ -2581,8 +2576,6 @@ void multiply_matrix(struct wined3d_matrix *dest, const struct wined3d_matrix *s UINT wined3d_log2i(UINT32 x) DECLSPEC_HIDDEN; unsigned int count_bits(unsigned int mask) DECLSPEC_HIDDEN; -void select_shader_mode(const struct wined3d_gl_info *gl_info, int *ps_selected, int *vs_selected) DECLSPEC_HIDDEN; - struct wined3d_shader_lconst { struct list entry;

1 0

Henri Verbeet : d3drm: Avoid LPD3DVECTOR.
by Alexandre Julliard Jan. 23, 2013

Jan. 23, 2013

Module: wine Branch: master Commit: f90bdedd9046c385a4bd2e654874417815fb01a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f90bdedd9046c385a4bd2e654… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 23 08:50:10 2013 +0100 d3drm: Avoid LPD3DVECTOR. --- dlls/d3drm/frame.c | 51 ++++++++++++++------------------------ dlls/d3drm/math.c | 22 ++++++++-------- dlls/d3drm/meshbuilder.c | 28 +++++++++------------ dlls/d3drm/tests/vector.c | 20 +++++++------- dlls/d3drm/viewport.c | 12 +++------ include/d3drmdef.h | 25 +++++++++--------- include/d3drmobj.h | 60 +++++++++++++++++++++++--------------------- 7 files changed, 99 insertions(+), 119 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f90bdedd9046c385a4bd2…

1 0

Nikolay Sivov : xmllite: Complete content parsing with implemented parts and stubs.
by Alexandre Julliard Jan. 23, 2013

Jan. 23, 2013

Module: wine Branch: master Commit: 6ab47275aadd937cb91f07732a5b56475f1301fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ab47275aadd937cb91f07732… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 23 12:12:55 2013 +0400 xmllite: Complete content parsing with implemented parts and stubs. --- dlls/xmllite/reader.c | 56 ++++++++++++++++++++++++++++++++++++++---- dlls/xmllite/tests/reader.c | 6 ++++- 2 files changed, 55 insertions(+), 7 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 647af24..d3452d6 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -69,7 +69,10 @@ static const WCHAR utf8W[] = {'U','T','F','-','8',0}; static const WCHAR dblquoteW[] = {'\"',0}; static const WCHAR quoteW[] = {'\'',0}; +static const WCHAR ltW[] = {'<',0}; static const WCHAR gtW[] = {'>',0}; +static const WCHAR commentW[] = {'<','!','-','-',0}; +static const WCHAR piW[] = {'<','?',0}; struct xml_encoding_data { @@ -1264,8 +1267,6 @@ static HRESULT reader_parse_misc(xmlreader *reader) while (1) { - static const WCHAR commentW[] = {'<','!','-','-',0}; - static const WCHAR piW[] = {'<','?',0}; const WCHAR *cur = reader_get_cur(reader); if (is_wchar_space(*cur)) @@ -1519,7 +1520,6 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca /* [39] element ::= EmptyElemTag | STag content ETag */ static HRESULT reader_parse_element(xmlreader *reader) { - static const WCHAR ltW[] = {'<',0}; strval qname, prefix, local; HRESULT hr; int empty; @@ -1584,18 +1584,62 @@ static HRESULT reader_parse_endtag(xmlreader *reader) return S_OK; } +/* [18] CDSect ::= CDStart CData CDEnd + [19] CDStart ::= '<![CDATA[' + [20] CData ::= (Char* - (Char* ']]>' Char*)) + [21] CDEnd ::= ']]>' */ +static HRESULT reader_parse_cdata(xmlreader *reader) +{ + FIXME("CDATA sections are not supported\n"); + return E_NOTIMPL; +} + +/* [66] CharRef ::= '&#' [0-9]+ ';' | '&#x' [0-9a-fA-F]+ ';' + [67] Reference ::= EntityRef | CharRef + [68] EntityRef ::= '&' Name ';' */ +static HRESULT reader_parse_reference(xmlreader *reader) +{ + FIXME("References not supported\n"); + return E_NOTIMPL; +} + +/* [14] CharData ::= [^<&]* - ([^<&]* ']]>' [^<&]*) */ +static HRESULT reader_parse_chardata(xmlreader *reader) +{ + FIXME("CharData not supported\n"); + return E_NOTIMPL; +} + /* [43] content ::= CharData? ((element | Reference | CDSect | PI | Comment) CharData?)* */ static HRESULT reader_parse_content(xmlreader *reader) { + static const WCHAR cdstartW[] = {'<','!','[','C','D','A','T','A','[',0}; static const WCHAR etagW[] = {'<','/',0}; + static const WCHAR ampW[] = {'&',0}; + reader_shrink(reader); - /* handle end tag */ + /* handle end tag here, it indicates end of content as well */ if (!reader_cmp(reader, etagW)) return reader_parse_endtag(reader); - /* FIXME: handle the rest of possible content nodes */ - return reader_parse_element(reader); + if (!reader_cmp(reader, commentW)) + return reader_parse_comment(reader); + + if (!reader_cmp(reader, piW)) + return reader_parse_pi(reader); + + if (!reader_cmp(reader, cdstartW)) + return reader_parse_cdata(reader); + + if (!reader_cmp(reader, ampW)) + return reader_parse_reference(reader); + + if (!reader_cmp(reader, ltW)) + return reader_parse_element(reader); + + /* what's left must be CharData */ + return reader_parse_chardata(reader); } static HRESULT reader_parse_nextnode(xmlreader *reader) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index babb1c9..5e6531b 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -877,7 +877,7 @@ static void test_read_pi(void) struct nodes_test { const char *xml; - XmlNodeType types[10]; + XmlNodeType types[20]; }; static const char misc_test_xml[] = @@ -889,6 +889,8 @@ static const char misc_test_xml[] = "" "<a>" "<b/>" + "" + "<?pi pibody ?>" "</a>" ; @@ -903,6 +905,8 @@ static struct nodes_test misc_test = { XmlNodeType_Comment, XmlNodeType_Element, XmlNodeType_Element, + XmlNodeType_Comment, + XmlNodeType_ProcessingInstruction, XmlNodeType_EndElement, XmlNodeType_None }

1 0

André Hentschel : dbghelp: Remove useless code in ARM stack walk.
by Alexandre Julliard Jan. 23, 2013

Jan. 23, 2013

Module: wine Branch: master Commit: 9d49dd82e8c3e40b9aa847d14af6cda3a37f5fe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d49dd82e8c3e40b9aa847d14… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 22 20:35:21 2013 +0100 dbghelp: Remove useless code in ARM stack walk. --- dlls/dbghelp/cpu_arm.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/cpu_arm.c b/dlls/dbghelp/cpu_arm.c index 769bc95..740db0f 100644 --- a/dlls/dbghelp/cpu_arm.c +++ b/dlls/dbghelp/cpu_arm.c @@ -99,13 +99,6 @@ static BOOL arm_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CON if (curr_mode == stm_start) { - if ((frame->AddrPC.Mode == AddrModeFlat) && - (frame->AddrFrame.Mode != AddrModeFlat)) - { - WARN("Bad AddrPC.Mode / AddrFrame.Mode combination\n"); - goto done_err; - } - /* Init done */ set_curr_mode(stm_arm); frame->AddrReturn.Mode = frame->AddrStack.Mode = AddrModeFlat;

1 0