September 2010 - Wine-commits

Oldřich Jedlička : ddraw: Allow creating back buffer for DirectX 1 interfaces.
by Alexandre Julliard 16 Sep '10

16 Sep '10

Module: wine Branch: master Commit: bec3b7692d02b343936c42d08a5c48b92335e182 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bec3b7692d02b343936c42d08… Author: Oldřich Jedlička <oldium.pro(a)seznam.cz> Date: Wed Sep 15 21:33:02 2010 +0200 ddraw: Allow creating back buffer for DirectX 1 interfaces. --- dlls/ddraw/ddraw.c | 73 ++++++++++++++++++++++++++++++++++++++----- dlls/ddraw/tests/d3d.c | 4 +- dlls/ddraw/tests/dsurface.c | 4 +- dlls/ddraw/tests/visual.c | 2 +- 4 files changed, 70 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index cb942d4..5449d84 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2880,7 +2880,7 @@ static HRESULT ddraw_create_gdi_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSur * DDERR_* if an error occurs * *****************************************************************************/ -static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, +static HRESULT CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 *DDSD, IDirectDrawSurface7 **Surf, IUnknown *UnkOuter) { IDirectDrawImpl *This = (IDirectDrawImpl *)iface; @@ -2944,9 +2944,9 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, return DDERR_NOEXCLUSIVEMODE; } - if(DDSD->ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER)) { - WARN("Application tried to create an explicit front or back buffer\n"); - LeaveCriticalSection(&ddraw_cs); + if((DDSD->ddsCaps.dwCaps & (DDSCAPS_BACKBUFFER | DDSCAPS_PRIMARYSURFACE)) == (DDSCAPS_BACKBUFFER | DDSCAPS_PRIMARYSURFACE)) + { + WARN("Application wanted to create back buffer primary surface\n"); return DDERR_INVALIDCAPS; } @@ -3305,6 +3305,27 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, return hr; } +static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, + DDSURFACEDESC2 *surface_desc, IDirectDrawSurface7 **surface, IUnknown *outer_unknown) +{ + TRACE("iface %p, surface_desc %p, surface %p, outer_unknown %p.\n", + iface, surface_desc, surface, outer_unknown); + + if(surface_desc->ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER)) + { + if (TRACE_ON(ddraw)) + { + TRACE(" (%p) Requesting surface desc :\n", iface); + DDRAW_dump_surface_desc(surface_desc); + } + + WARN("Application tried to create an explicit front or back buffer\n"); + return DDERR_INVALIDCAPS; + } + + return CreateSurface(iface, surface_desc, surface, outer_unknown); +} + static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface, DDSURFACEDESC2 *surface_desc, IDirectDrawSurface4 **surface, IUnknown *outer_unknown) { @@ -3315,7 +3336,19 @@ static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface, TRACE("iface %p, surface_desc %p, surface %p, outer_unknown %p.\n", iface, surface_desc, surface, outer_unknown); - hr = ddraw7_CreateSurface((IDirectDraw7 *)ddraw, surface_desc, (IDirectDrawSurface7 **)surface, outer_unknown); + if(surface_desc->ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER)) + { + if (TRACE_ON(ddraw)) + { + TRACE(" (%p) Requesting surface desc :\n", iface); + DDRAW_dump_surface_desc(surface_desc); + } + + WARN("Application tried to create an explicit front or back buffer\n"); + return DDERR_INVALIDCAPS; + } + + hr = CreateSurface((IDirectDraw7 *)ddraw, surface_desc, (IDirectDrawSurface7 **)surface, outer_unknown); impl = (IDirectDrawSurfaceImpl *)*surface; if (SUCCEEDED(hr) && impl) { @@ -3339,7 +3372,19 @@ static HRESULT WINAPI ddraw3_CreateSurface(IDirectDraw3 *iface, TRACE("iface %p, surface_desc %p, surface %p, outer_unknown %p.\n", iface, surface_desc, surface, outer_unknown); - hr = ddraw7_CreateSurface((IDirectDraw7 *)ddraw, (DDSURFACEDESC2 *)surface_desc, &surface7, outer_unknown); + if(surface_desc->ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER)) + { + if (TRACE_ON(ddraw)) + { + TRACE(" (%p) Requesting surface desc :\n", iface); + DDRAW_dump_surface_desc((LPDDSURFACEDESC2)surface_desc); + } + + WARN("Application tried to create an explicit front or back buffer\n"); + return DDERR_INVALIDCAPS; + } + + hr = CreateSurface((IDirectDraw7 *)ddraw, (DDSURFACEDESC2 *)surface_desc, &surface7, outer_unknown); if (FAILED(hr)) { *surface = NULL; @@ -3367,7 +3412,19 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, TRACE("iface %p, surface_desc %p, surface %p, outer_unknown %p.\n", iface, surface_desc, surface, outer_unknown); - hr = ddraw7_CreateSurface((IDirectDraw7 *)ddraw, (DDSURFACEDESC2 *)surface_desc, &surface7, outer_unknown); + if(surface_desc->ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER)) + { + if (TRACE_ON(ddraw)) + { + TRACE(" (%p) Requesting surface desc :\n", iface); + DDRAW_dump_surface_desc((LPDDSURFACEDESC2)surface_desc); + } + + WARN("Application tried to create an explicit front or back buffer\n"); + return DDERR_INVALIDCAPS; + } + + hr = CreateSurface((IDirectDraw7 *)ddraw, (DDSURFACEDESC2 *)surface_desc, &surface7, outer_unknown); if (FAILED(hr)) { *surface = NULL; @@ -3397,7 +3454,7 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, /* Remove front buffer flag, this causes failure in v7, and its added to normal * primaries anyway. */ surface_desc->ddsCaps.dwCaps &= ~DDSCAPS_FRONTBUFFER; - hr = ddraw7_CreateSurface((IDirectDraw7 *)ddraw, (DDSURFACEDESC2 *)surface_desc, &surface7, outer_unknown); + hr = CreateSurface((IDirectDraw7 *)ddraw, (DDSURFACEDESC2 *)surface_desc, &surface7, outer_unknown); if (FAILED(hr)) { *surface = NULL; diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index d291705..5043a01 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3569,7 +3569,7 @@ static void BackBuffer3DCreateSurfaceTest(void) created_ddsd.dwSize = sizeof(DDSURFACEDESC); hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &surf, NULL); - todo_wine ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface failed: 0x%08x\n", hr); + ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface failed: 0x%08x\n", hr); if (surf != NULL) { hr = IDirectDrawSurface_GetSurfaceDesc(surf, &created_ddsd); @@ -3636,7 +3636,7 @@ static void BackBuffer3DAttachmentTest(void) ddsd.dwWidth = GetSystemMetrics(SM_CXSCREEN); ddsd.dwHeight = GetSystemMetrics(SM_CYSCREEN); hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &surface2, NULL); - todo_wine ok(SUCCEEDED(hr), "CreateSurface returned: %x\n",hr); + ok(SUCCEEDED(hr), "CreateSurface returned: %x\n",hr); if (surface2 != NULL) { diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 95b0f26..1c219a4 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -3425,7 +3425,7 @@ static void BackBufferCreateSurfaceTest(void) created_ddsd.dwSize = sizeof(DDSURFACEDESC); hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surf, NULL); - todo_wine ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface failed: 0x%08x\n", hr); + ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface failed: 0x%08x\n", hr); if (surf != NULL) { hr = IDirectDrawSurface_GetSurfaceDesc(surf, &created_ddsd); @@ -3482,7 +3482,7 @@ static void BackBufferAttachmentFlipTest(void) ddsd.dwWidth = GetSystemMetrics(SM_CXSCREEN); ddsd.dwHeight = GetSystemMetrics(SM_CYSCREEN); hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface2, NULL); - todo_wine ok(SUCCEEDED(hr), "CreateSurface returned: %x\n",hr); + ok(SUCCEEDED(hr), "CreateSurface returned: %x\n",hr); if (surface2 != NULL) { diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 2616a36..e668691 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -2980,7 +2980,7 @@ static void DX1_BackBufferFlipTest(void) U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &Backbuffer, NULL); - todo_wine ok(hr==DD_OK, "IDirectDraw_CreateSurface returned: %08x\n", hr); + ok(hr==DD_OK, "IDirectDraw_CreateSurface returned: %08x\n", hr); if(FAILED(hr)) goto out; hr = IDirectDrawSurface_AddAttachedSurface(Primary, Backbuffer);

1 0

Sven Baars : inetcpl.cpl: Add the Dutch translation.
by Alexandre Julliard 16 Sep '10

16 Sep '10

Module: wine Branch: master Commit: 76730382342d02f2c46fa225acbbea0e8527f041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76730382342d02f2c46fa225a… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Sep 16 20:01:46 2010 +0200 inetcpl.cpl: Add the Dutch translation. --- dlls/inetcpl.cpl/Makefile.in | 1 + dlls/inetcpl.cpl/cpl_Nl.rc | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index 4965a0a..5c5588c 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -13,6 +13,7 @@ RC_SRCS = \ cpl_Fr.rc \ cpl_It.rc \ cpl_Ko.rc \ + cpl_Nl.rc \ cpl_Si.rc \ inetcpl.rc diff --git a/dlls/inetcpl.cpl/cpl_Nl.rc b/dlls/inetcpl.cpl/cpl_Nl.rc new file mode 100644 index 0000000..7c9acc7 --- /dev/null +++ b/dlls/inetcpl.cpl/cpl_Nl.rc @@ -0,0 +1,30 @@ +/* + * Dutch resources for the Internet control panel applet + * + * Copyright 2010 Sven Baars + * + * This library 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. + * + * This library 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. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "inetcpl.h" + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPL_NAME "Internet-instellingen" + IDS_CPL_INFO "Configureer Wine Internet Browser en gerelateerde instellingen" +END

1 0

Alexander Morozov : crypt32: Implement CryptSignMessage.
by Alexandre Julliard 16 Sep '10

16 Sep '10

Module: wine Branch: master Commit: 8cdf146317ae4c54986010a21ed879ca98d04c15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cdf146317ae4c54986010a21… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Thu Sep 16 18:44:53 2010 +0400 crypt32: Implement CryptSignMessage. --- dlls/crypt32/message.c | 111 +++++++++++++++++++++++++++++++++++++++++- dlls/crypt32/tests/message.c | 22 ++------ 2 files changed, 115 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8cdf146317ae4c5498601…

1 0

Frédéric Delanoy : inetcpl.cpl: Add French translation.
by Alexandre Julliard 16 Sep '10

16 Sep '10

Module: wine Branch: master Commit: aea961c1564a988f398f4d756c40e443344fdcc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aea961c1564a988f398f4d756… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Sep 16 12:12:40 2010 +0200 inetcpl.cpl: Add French translation. --- dlls/inetcpl.cpl/Makefile.in | 1 + dlls/inetcpl.cpl/cpl_Fr.rc | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index 66151e7..4952db9 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ RC_SRCS = \ cpl_De.rc \ cpl_En.rc \ + cpl_Fr.rc \ cpl_It.rc \ inetcpl.rc diff --git a/dlls/inetcpl.cpl/cpl_Fr.rc b/dlls/inetcpl.cpl/cpl_Fr.rc new file mode 100644 index 0000000..aeedb73 --- /dev/null +++ b/dlls/inetcpl.cpl/cpl_Fr.rc @@ -0,0 +1,34 @@ +/* + * Internet control panel applet + * French language support + * + * Copyright 2010 Frédéric Delanoy + * + * This library 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. + * + * This library 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. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "inetcpl.h" + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +/* UTF-8 */ +#pragma code_page(65001) + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPL_NAME "Paramètres Internet" + IDS_CPL_INFO "Configurer le navigateur internet de Wine et d'autres paramètres associés" +END

1 0

Hwang YunSong : inetcpl.cpl: New Korean resource.
by Alexandre Julliard 16 Sep '10

16 Sep '10

Module: wine Branch: master Commit: c6f876f4a60cc3de63f5d6ac4be06db13f679e0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6f876f4a60cc3de63f5d6ac4… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Sep 16 17:34:21 2010 +0900 inetcpl.cpl: New Korean resource. --- dlls/inetcpl.cpl/Makefile.in | 1 + dlls/inetcpl.cpl/cpl_Ko.rc | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index 4952db9..2c4b5b2 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -12,6 +12,7 @@ RC_SRCS = \ cpl_En.rc \ cpl_Fr.rc \ cpl_It.rc \ + cpl_Ko.rc \ inetcpl.rc SVG_SRCS = \ diff --git a/dlls/inetcpl.cpl/cpl_Ko.rc b/dlls/inetcpl.cpl/cpl_Ko.rc new file mode 100644 index 0000000..f6aa9ae --- /dev/null +++ b/dlls/inetcpl.cpl/cpl_Ko.rc @@ -0,0 +1,33 @@ +/* + * Internet control panel applet + * + * Copyright 2010 Detlef Riekenberg + * Copyright 2010 YunSong Hwang + * + * This library 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. + * + * This library 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. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "inetcpl.h" + +#pragma code_page(65001) + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPL_NAME "인터넷 설정" + IDS_CPL_INFO "Wine 인터넷 브라우저와 관련 설정 처리" +END

1 0

Misha Koshelev : d3dx9_36: Implement D3DXGetDeclLength with tests.
by Alexandre Julliard 16 Sep '10

16 Sep '10

Module: wine Branch: master Commit: fffe37aa0050a84650a5f1a39698160caac6bace URL: http://source.winehq.org/git/wine.git/?a=commit;h=fffe37aa0050a84650a5f1a39… Author: Misha Koshelev <misha680(a)gmail.com> Date: Wed Sep 15 19:20:46 2010 -0500 d3dx9_36: Implement D3DXGetDeclLength with tests. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 16 +++++++++++++ dlls/d3dx9_36/tests/mesh.c | 51 +++++++++++++++++++++++++++++++++++++++++++ include/d3dx9mesh.h | 1 + 4 files changed, 69 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 52fbe7c..e2e401c 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -147,7 +147,7 @@ @ stub D3DXGatherFragmentsFromResourceW @ stub D3DXGenerateOutputDecl @ stub D3DXGeneratePMesh -@ stub D3DXGetDeclLength +@ stdcall D3DXGetDeclLength(ptr) @ stdcall D3DXGetDeclVertexSize(ptr long) @ stdcall D3DXGetDriverLevel(ptr) @ stdcall D3DXGetFVFVertexSize(long) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 12e26da..a6146fe 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -521,6 +521,22 @@ UINT WINAPI D3DXGetDeclVertexSize(const D3DVERTEXELEMENT9 *decl, DWORD stream_id } /************************************************************************* + * D3DXGetDeclLength + */ +UINT WINAPI D3DXGetDeclLength(const D3DVERTEXELEMENT9 *decl) +{ + const D3DVERTEXELEMENT9 *element; + + TRACE("decl %p\n", decl); + + /* null decl results in exception on Windows XP */ + + for (element = decl; element->Stream != 0xff; ++element); + + return element - decl; +} + +/************************************************************************* * D3DXIntersectTri */ BOOL WINAPI D3DXIntersectTri(CONST D3DXVECTOR3 *p0, CONST D3DXVECTOR3 *p1, CONST D3DXVECTOR3 *p2, CONST D3DXVECTOR3 *praypos, CONST D3DXVECTOR3 *praydir, FLOAT *pu, FLOAT *pv, FLOAT *pdist) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 619d667..e5a49bf 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1407,6 +1407,56 @@ static void D3DXCreateSphereTest(void) DestroyWindow(wnd); } +static void test_get_decl_length(void) +{ + static const D3DVERTEXELEMENT9 declaration1[] = + { + {0, 0, D3DDECLTYPE_FLOAT1, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {1, 0, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {2, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {3, 0, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {4, 0, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {5, 0, D3DDECLTYPE_UBYTE4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {6, 0, D3DDECLTYPE_SHORT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {7, 0, D3DDECLTYPE_SHORT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {8, 0, D3DDECLTYPE_UBYTE4N, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {9, 0, D3DDECLTYPE_SHORT2N, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {10, 0, D3DDECLTYPE_SHORT4N, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {11, 0, D3DDECLTYPE_UDEC3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {12, 0, D3DDECLTYPE_DEC3N, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {13, 0, D3DDECLTYPE_FLOAT16_2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {14, 0, D3DDECLTYPE_FLOAT16_4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + D3DDECL_END(), + }; + static const D3DVERTEXELEMENT9 declaration2[] = + { + {0, 8, D3DDECLTYPE_FLOAT1, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {1, 8, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {2, 8, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {3, 8, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {4, 8, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {5, 8, D3DDECLTYPE_UBYTE4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {6, 8, D3DDECLTYPE_SHORT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {7, 8, D3DDECLTYPE_SHORT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {0, 8, D3DDECLTYPE_UBYTE4N, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {1, 8, D3DDECLTYPE_SHORT2N, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {2, 8, D3DDECLTYPE_SHORT4N, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {3, 8, D3DDECLTYPE_UDEC3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {4, 8, D3DDECLTYPE_DEC3N, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {5, 8, D3DDECLTYPE_FLOAT16_2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {6, 8, D3DDECLTYPE_FLOAT16_4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {7, 8, D3DDECLTYPE_FLOAT1, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + D3DDECL_END(), + }; + UINT size; + + size = D3DXGetDeclLength(declaration1); + ok(size == 15, "Got size %u, expected 15.\n", size); + + size = D3DXGetDeclLength(declaration2); + ok(size == 16, "Got size %u, expected 16.\n", size); +} + static void test_get_decl_vertex_size(void) { static const D3DVERTEXELEMENT9 declaration1[] = @@ -1488,6 +1538,7 @@ START_TEST(mesh) D3DXIntersectTriTest(); D3DXCreateMeshTest(); D3DXCreateSphereTest(); + test_get_decl_length(); test_get_decl_vertex_size(); test_fvf_decl_conversion(); } diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 32d3947..02dc7a9 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -152,6 +152,7 @@ extern "C" { HRESULT WINAPI D3DXCreateMesh(DWORD, DWORD, DWORD, CONST D3DVERTEXELEMENT9 *, LPDIRECT3DDEVICE9, LPD3DXMESH *); HRESULT WINAPI D3DXCreateBuffer(DWORD, LPD3DXBUFFER*); +UINT WINAPI D3DXGetDeclLength(const D3DVERTEXELEMENT9 *decl); UINT WINAPI D3DXGetDeclVertexSize(const D3DVERTEXELEMENT9 *decl, DWORD stream_idx); UINT WINAPI D3DXGetFVFVertexSize(DWORD); BOOL WINAPI D3DXBoxBoundProbe(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *);

1 0

Matej Spindler : shdocvw: Update Slovenian translation.
by Alexandre Julliard 16 Sep '10

16 Sep '10

Module: wine Branch: master Commit: 338a05a285500ea21f4af17b29ee232f6e17c666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=338a05a285500ea21f4af17b2… Author: Matej Spindler <spindler.matej(a)gmail.com> Date: Thu Sep 16 16:46:20 2010 +0200 shdocvw: Update Slovenian translation. --- dlls/shdocvw/Si.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Si.rc b/dlls/shdocvw/Si.rc index 31def14..c6b1a26 100644 --- a/dlls/shdocvw/Si.rc +++ b/dlls/shdocvw/Si.rc @@ -51,6 +51,7 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM "Predo&gled tiskanja...", ID_BROWSE_PRINT_PREVIEW MENUITEM SEPARATOR MENUITEM "&Lastnosti...", ID_BROWSE_PROPERTIES + MENUITEM "&Zapri", ID_BROWSE_QUIT } POPUP "Pogl&ed" {

1 0

Matej Spindler : ipconfig: Add Slovenian translation.
by Alexandre Julliard 16 Sep '10

16 Sep '10

Module: wine Branch: master Commit: 9cbf3bd3cbd65339b2f8b7f276d9061823926d0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cbf3bd3cbd65339b2f8b7f27… Author: Matej Spindler <spindler.matej(a)gmail.com> Date: Thu Sep 16 16:45:14 2010 +0200 ipconfig: Add Slovenian translation. --- programs/ipconfig/Makefile.in | 1 + programs/ipconfig/Si.rc | 49 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/Makefile.in b/programs/ipconfig/Makefile.in index 40966a9..c599edf 100644 --- a/programs/ipconfig/Makefile.in +++ b/programs/ipconfig/Makefile.in @@ -17,6 +17,7 @@ RC_SRCS = \ Ko.rc \ Lt.rc \ Nl.rc \ + Si.rc \ Sv.rc \ Uk.rc diff --git a/programs/ipconfig/Si.rc b/programs/ipconfig/Si.rc new file mode 100644 index 0000000..43f34d1 --- /dev/null +++ b/programs/ipconfig/Si.rc @@ -0,0 +1,49 @@ +/* + * IP configuration utility + * Slovenian language support + * + * Copyright 2010 Matej Špindler + * + * This library 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. + * + * This library 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. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "ipconfig.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_USAGE, "Uporaba: ipconfig [ /? | /all ]\n" + STRING_INVALID_CMDLINE, "Napaka: Nepoznana ali nepopolna ukazna vrstica\n" + STRING_ADAPTER_FRIENDLY, "%s kartica %s\n" + STRING_ETHERNET, "Ethernet" + STRING_UNKNOWN, "Nepoznano" + STRING_CONN_DNS_SUFFIX, "S povezavo določena DNS pripona" + STRING_IP_ADDRESS, "IP naslov" + STRING_HOSTNAME, "Ime gostitelja" + STRING_NODE_TYPE, "Tip vozlišča" + STRING_BROADCAST, "Broadcast" + STRING_PEER_TO_PEER, "Vsak z vsakim" + STRING_MIXED, "Mešan" + STRING_HYBRID, "Hibriden" + STRING_IP_ROUTING, "IP usmerjanje omogočeno" + STRING_DESCRIPTION, "Opis" + STRING_PHYS_ADDR, "Fizični naslov" + STRING_DHCP_ENABLED, "DHCP omogočen" + STRING_YES, "Da" + STRING_NO, "Ne" +}

1 0

Matej Spindler : inetcpl.cpl: Add Slovenian translation.
by Alexandre Julliard 16 Sep '10

16 Sep '10

Module: wine Branch: master Commit: 5349897afc12ca350a8e35fc116526f5ba836528 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5349897afc12ca350a8e35fc1… Author: Matej Spindler <spindler.matej(a)gmail.com> Date: Thu Sep 16 16:44:03 2010 +0200 inetcpl.cpl: Add Slovenian translation. --- dlls/inetcpl.cpl/Makefile.in | 1 + dlls/inetcpl.cpl/cpl_Si.rc | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index 2c4b5b2..4965a0a 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -13,6 +13,7 @@ RC_SRCS = \ cpl_Fr.rc \ cpl_It.rc \ cpl_Ko.rc \ + cpl_Si.rc \ inetcpl.rc SVG_SRCS = \ diff --git a/dlls/inetcpl.cpl/cpl_Si.rc b/dlls/inetcpl.cpl/cpl_Si.rc new file mode 100644 index 0000000..2ffc2fe --- /dev/null +++ b/dlls/inetcpl.cpl/cpl_Si.rc @@ -0,0 +1,32 @@ +/* + * Internet control panel applet + * + * Copyright 2010 Matej Špindler + * + * This library 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. + * + * This library 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. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "inetcpl.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPL_NAME "Internetne možnosti" + IDS_CPL_INFO "Konfiguriraj internetni brskalnik v Wine in sorodne nastavitve" +END

1 0

Matej Spindler : shell32: Update Slovenian translation.
by Alexandre Julliard 16 Sep '10

16 Sep '10

Module: wine Branch: master Commit: 21c3e4836a4d7ce259ab9bfd4945e2ab3bc42980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21c3e4836a4d7ce259ab9bfd4… Author: Matej Spindler <spindler.matej(a)gmail.com> Date: Thu Sep 16 16:46:42 2010 +0200 shell32: Update Slovenian translation. --- dlls/shell32/shell32_Si.rc | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Si.rc b/dlls/shell32/shell32_Si.rc index 2b37c6d..975d4a3 100644 --- a/dlls/shell32/shell32_Si.rc +++ b/dlls/shell32/shell32_Si.rc @@ -285,6 +285,24 @@ STRINGTABLE IDS_COMMON_PICTURES "Dokumenti\\Slike" IDS_COMMON_VIDEO "Dokumenti\\Video" IDS_CDBURN_AREA "Lokalne nastavitve\\Podatki programov\\Microsoft\\Zapisovanje CD-jev" + IDS_CONTACTS "Kontakti" + IDS_LINKS "Povezave" + IDS_PHOTO_ALBUMS "Slike\\Diaprojekcije" + IDS_PLAYLISTS "Glasba\\Seznam predvajanja" + IDS_PUBLIC_DOWNLOADS "Prenosi" + IDS_PUBLIC_GAME_TASKS "Microsoft\\Windows\\Raziskovalec Iger" + IDS_PUBLIC_LIBRARIES "Microsoft\\Windows\\Knjižnice" + IDS_PUBLIC_RINGTONES "Microsoft\\Windows\\Zvonenja" + IDS_SAMPLE_MUSIC "Glasba\\Primeri glasbe" + IDS_SAMPLE_PICTURES "Slike\\Primeri slik" + IDS_SAMPLE_PLAYLISTS "Music\\Primeri seznamov predvajanja" + IDS_SAMPLE_VIDEOS "Videos\\Primeri video posnetkov" + IDS_SAVED_GAMES "Shranjene igre" + IDS_SAVED_SEARCHES "Iskanja" + IDS_USER_PROFILES "Uporabniki" + IDS_COMMON_OEM_LINKS "OEM Povezave" + IDS_DOCUMENTS "Dokumenti" + IDS_DOWNLOADS "Prenosi" IDS_NEWFOLDER "Nova mapa"

1 0