July 2010 - Wine-Commits - list.winehq.org

Owen Rudge : d3dx9: Add basic implementation of D3DXFilterTexture, plus tests.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: 54f049a656ba236bd4b9d00c1b0abe4a8721f904 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54f049a656ba236bd4b9d00c1… Author: Owen Rudge <owen(a)owenrudge.net> Date: Thu Jul 22 20:38:31 2010 +0100 d3dx9: Add basic implementation of D3DXFilterTexture, plus tests. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/tests/texture.c | 55 ++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/texture.c | 66 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 122 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index b9a00da..622a03c 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -128,7 +128,7 @@ @ stub D3DXFillTextureTX @ stub D3DXFillVolumeTexture @ stub D3DXFillVolumeTextureTX -@ stub D3DXFilterTexture +@ stdcall D3DXFilterTexture(ptr ptr long long) @ stdcall D3DXFindShaderComment(ptr long ptr ptr) @ stub D3DXFloat16To32Array @ stub D3DXFloat32To16Array diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 0eaf649..9a3b3bc 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -315,6 +315,60 @@ static void test_D3DXCreateTexture(IDirect3DDevice9 *device) } } +static void test_D3DXFilterTexture(IDirect3DDevice9 *device) +{ + IDirect3DTexture9 *tex; + HRESULT hr; + + hr = IDirect3DDevice9_CreateTexture(device, 256, 256, 5, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &tex, NULL); + + if (SUCCEEDED(hr)) + { + hr = D3DXFilterTexture((IDirect3DBaseTexture9*) tex, NULL, 0, D3DX_FILTER_NONE); + ok(hr == D3D_OK, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3D_OK); + + hr = D3DXFilterTexture((IDirect3DBaseTexture9*) tex, NULL, 0, D3DX_FILTER_BOX + 1); /* Invalid filter */ + ok(hr == D3DERR_INVALIDCALL, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXFilterTexture((IDirect3DBaseTexture9*) tex, NULL, 5, D3DX_FILTER_NONE); /* Last miplevel */ + ok(hr == D3DERR_INVALIDCALL, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXFilterTexture((IDirect3DBaseTexture9*) tex, NULL, 20, D3DX_FILTER_NONE); /* Invalid miplevel */ + ok(hr == D3DERR_INVALIDCALL, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + } + else + skip("Failed to create texture\n"); + + IDirect3DTexture9_Release(tex); + + hr = D3DXFilterTexture(NULL, NULL, 0, D3DX_FILTER_NONE); + ok(hr == D3DERR_INVALIDCALL, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + /* Test different pools */ + hr = IDirect3DDevice9_CreateTexture(device, 256, 256, 0, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &tex, NULL); + + if (SUCCEEDED(hr)) + { + hr = D3DXFilterTexture((IDirect3DBaseTexture9*) tex, NULL, 0, D3DX_FILTER_NONE); + ok(hr == D3D_OK, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3D_OK); + IDirect3DTexture9_Release(tex); + } + else + skip("Failed to create texture\n"); + + + hr = IDirect3DDevice9_CreateTexture(device, 256, 256, 0, 0, D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &tex, NULL); + + if (SUCCEEDED(hr)) + { + hr = D3DXFilterTexture((IDirect3DBaseTexture9*) tex, NULL, 0, D3DX_FILTER_NONE); + ok(hr == D3D_OK, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3D_OK); + IDirect3DTexture9_Release(tex); + } + else + skip("Failed to create texture\n"); +} + START_TEST(texture) { HWND wnd; @@ -348,6 +402,7 @@ START_TEST(texture) test_D3DXCheckTextureRequirements(device); test_D3DXCreateTexture(device); + test_D3DXFilterTexture(device); IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d); diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 9d547ce..8992399 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -44,6 +44,72 @@ UINT make_pow2(UINT num) return result; } +HRESULT WINAPI D3DXFilterTexture(LPDIRECT3DBASETEXTURE9 texture, + CONST PALETTEENTRY *palette, + UINT srclevel, + DWORD filter) +{ + UINT level = srclevel + 1; + HRESULT hr; + + TRACE("(%p, %p, %d, %d)\n", texture, palette, srclevel, filter); + + if (!texture) + return D3DERR_INVALIDCALL; + + if ((filter & 0xFFFF) > D3DX_FILTER_BOX && filter != D3DX_DEFAULT) + return D3DERR_INVALIDCALL; + + if (srclevel >= IDirect3DBaseTexture9_GetLevelCount(texture)) + return D3DERR_INVALIDCALL; + + switch (IDirect3DBaseTexture9_GetType(texture)) + { + case D3DRTYPE_TEXTURE: + { + IDirect3DSurface9 *topsurf, *mipsurf; + D3DSURFACE_DESC desc; + + if (filter == D3DX_DEFAULT) + { + IDirect3DTexture9_GetLevelDesc((IDirect3DTexture9*) texture, srclevel, &desc); + + if (is_pow2(desc.Width) && is_pow2(desc.Height)) + filter = D3DX_FILTER_BOX; + else + filter = D3DX_FILTER_BOX | D3DX_FILTER_DITHER; + } + + hr = IDirect3DTexture9_GetSurfaceLevel((IDirect3DTexture9*) texture, srclevel, &topsurf); + + if (FAILED(hr)) + return D3DERR_INVALIDCALL; + + while (IDirect3DTexture9_GetSurfaceLevel((IDirect3DTexture9*) texture, level, &mipsurf) == D3D_OK) + { + hr = D3DXLoadSurfaceFromSurface(mipsurf, palette, NULL, topsurf, palette, NULL, filter, 0); + IDirect3DSurface9_Release(mipsurf); + + if (FAILED(hr)) + break; + + level++; + } + + IDirect3DSurface9_Release(topsurf); + + if (level == srclevel + 1) + return D3DERR_INVALIDCALL; + + return D3D_OK; + } + + default: + FIXME("Implement volume and cube texture filtering\n"); + return E_NOTIMPL; + } +} + HRESULT WINAPI D3DXCheckTextureRequirements(LPDIRECT3DDEVICE9 device, UINT* width, UINT* height,

1 0

Igor Paliychuk : shdocvw: Add Ukrainian translation.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: f31428e107f3f2e8f616e4de727f59326a84d4ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=f31428e107f3f2e8f616e4de7… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Fri Jul 23 21:49:27 2010 +0300 shdocvw: Add Ukrainian translation. --- dlls/shdocvw/Makefile.in | 1 + dlls/shdocvw/Uk.rc | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 8326b78..f18b08d 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -30,6 +30,7 @@ C_SRCS = \ RC_SRCS = \ En.rc \ + Uk.rc \ shdocvw.rc IDL_TLB_SRCS = shdocvw_v1.idl diff --git a/dlls/shdocvw/Uk.rc b/dlls/shdocvw/Uk.rc new file mode 100644 index 0000000..6af3f3b --- /dev/null +++ b/dlls/shdocvw/Uk.rc @@ -0,0 +1,61 @@ +/* + * Copyright 2010 Alexander N. Sørnes <alex(a)thehandofagony.com> + * Copyright 2010 Igor Paliychuk + * + * 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 "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_BROWSE_OPEN DIALOG 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "Відкрити URL" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Вкажіть URL, що ви хочете відкрити в Internet Explorer",-1,25, 5, 150,15 + LTEXT "Відкрити:", -1, 2, 32, 30, 15 + EDITTEXT IDC_BROWSE_OPEN_URL, 35, 30, 160, 13 + DEFPUSHBUTTON "&OK", IDOK, 45, 50, 50, 15 + PUSHBUTTON "&Скасувати", IDCANCEL, 105, 50, 50, 15 +} + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "&Файл" + { + POPUP "&Створити" + { + MENUITEM "&Вікно" ID_BROWSE_NEW_WINDOW + } + MENUITEM "&Відкрити...", ID_BROWSE_OPEN + MENUITEM "&Зберегти", ID_BROWSE_SAVE + MENUITEM "Зберегти &як...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Формат друку...", ID_BROWSE_PRINT_FORMAT + MENUITEM "&Друк...", ID_BROWSE_PRINT + MENUITEM "Попередній пе&регляд...", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "В&ластивості...", ID_BROWSE_PROPERTIES + } + POPUP "&Довідка" + { + MENUITEM "&Про Internet Explorer...", ID_BROWSE_ABOUT + } +}

1 0

Andrew Eikum : comdlg32: Store and use save/open dialogs' most-recently-used data.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: 4b93548df1578d4345d89ae978207cebb0366a00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b93548df1578d4345d89ae97… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jul 23 13:13:04 2010 -0500 comdlg32: Store and use save/open dialogs' most-recently-used data. --- dlls/comdlg32/filedlg.c | 226 ++++++++++++++++++++++++++++++++++++++++- dlls/comdlg32/tests/filedlg.c | 60 +++++++++++ 2 files changed, 283 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b93548df1578d4345d89…

1 0

Owen Rudge : d3dx9: Implement D3DXCreateTexture plus tests.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: 30d5e375e6f432b184ddc76d8d97c630718bd657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30d5e375e6f432b184ddc76d8… Author: Owen Rudge <owen(a)owenrudge.net> Date: Thu Jul 22 20:38:23 2010 +0100 d3dx9: Implement D3DXCreateTexture plus tests. --- dlls/d3dx9_36/tests/texture.c | 161 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/texture.c | 12 +++- 2 files changed, 172 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index f4c74d7..0eaf649 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -155,6 +155,166 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) ok(format == D3DFMT_A8R8G8B8, "Returned format %u, expected %u\n", format, D3DFMT_A8R8G8B8); } +static void test_D3DXCreateTexture(IDirect3DDevice9 *device) +{ + IDirect3DTexture9 *texture; + D3DSURFACE_DESC desc; + D3DCAPS9 caps; + UINT mipmaps; + HRESULT hr; + + IDirect3DDevice9_GetDeviceCaps(device, &caps); + + hr = D3DXCreateTexture(NULL, 0, 0, 0, 0, D3DX_DEFAULT, 0, D3DPOOL_DEFAULT); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateTexture returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + /* width and height tests */ + + hr = D3DXCreateTexture(device, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, 0, D3DPOOL_DEFAULT, &texture); + ok(hr == D3D_OK, "D3DXCreateTexture returned %#x, expected %#x\n", hr, D3D_OK); + + if (texture) + { + hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + + ok(desc.Width == 256, "Returned width %d, expected %d\n", desc.Width, 256); + ok(desc.Height == 256, "Returned height %d, expected %d\n", desc.Height, 256); + + IDirect3DTexture9_Release(texture); + } + + + hr = D3DXCreateTexture(device, 0, 0, 0, 0, 0, D3DPOOL_DEFAULT, &texture); + ok(hr == D3D_OK, "D3DXCreateTexture returned %#x, expected %#x\n", hr, D3D_OK); + + if (texture) + { + hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + + ok(desc.Width == 1, "Returned width %d, expected %d\n", desc.Width, 1); + ok(desc.Height == 1, "Returned height %d, expected %d\n", desc.Height, 1); + + IDirect3DTexture9_Release(texture); + } + + + if (caps.TextureCaps & D3DPTEXTURECAPS_POW2) + skip("Hardware only supports pow2 textures\n"); + else + { + hr = D3DXCreateTexture(device, D3DX_DEFAULT, 63, 0, 0, 0, D3DPOOL_DEFAULT, &texture); + ok((hr == D3D_OK) || + /* may not work with conditional NPOT */ + ((hr != D3D_OK) && (caps.TextureCaps & D3DPTEXTURECAPS_NONPOW2CONDITIONAL)), + "D3DXCreateTexture returned %#x, expected %#x\n", hr, D3D_OK); + + if (texture) + { + hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + + /* Conditional NPOT may create a texture with different dimensions, so allow those + situations instead of returning a fail */ + + ok(desc.Width == 63 || + (caps.TextureCaps & D3DPTEXTURECAPS_NONPOW2CONDITIONAL), + "Returned width %d, expected %d\n", desc.Width, 63); + + ok(desc.Height == 63 || + (caps.TextureCaps & D3DPTEXTURECAPS_NONPOW2CONDITIONAL), + "Returned height %d, expected %d\n", desc.Height, 63); + + IDirect3DTexture9_Release(texture); + } + } + + /* mipmaps */ + + hr = D3DXCreateTexture(device, 64, 63, 9, 0, 0, D3DPOOL_DEFAULT, &texture); + ok(hr == D3D_OK, "D3DXCreateTexture returned %#x, expected %#x\n", hr, D3D_OK); + + if (texture) + { + mipmaps = IDirect3DTexture9_GetLevelCount(texture); + ok(mipmaps == 7, "Returned mipmaps %d, expected %d\n", mipmaps, 7); + + IDirect3DTexture9_Release(texture); + } + + + hr = D3DXCreateTexture(device, 284, 137, 9, 0, 0, D3DPOOL_DEFAULT, &texture); + ok(hr == D3D_OK, "D3DXCreateTexture returned %#x, expected %#x\n", hr, D3D_OK); + + if (texture) + { + mipmaps = IDirect3DTexture9_GetLevelCount(texture); + ok(mipmaps == 9, "Returned mipmaps %d, expected %d\n", mipmaps, 9); + + IDirect3DTexture9_Release(texture); + } + + + hr = D3DXCreateTexture(device, 0, 0, 20, 0, 0, D3DPOOL_DEFAULT, &texture); + ok(hr == D3D_OK, "D3DXCreateTexture returned %#x, expected %#x\n", hr, D3D_OK); + + if (texture) + { + mipmaps = IDirect3DTexture9_GetLevelCount(texture); + ok(mipmaps == 1, "Returned mipmaps %d, expected %d\n", mipmaps, 1); + + IDirect3DTexture9_Release(texture); + } + + + hr = D3DXCreateTexture(device, 64, 64, 1, 0, 0, D3DPOOL_DEFAULT, &texture); + ok(hr == D3D_OK, "D3DXCreateTexture returned %#x, expected %#x\n", hr, D3D_OK); + + if (texture) + { + mipmaps = IDirect3DTexture9_GetLevelCount(texture); + ok(mipmaps == 1, "Returned mipmaps %d, expected %d\n", mipmaps, 1); + + IDirect3DTexture9_Release(texture); + } + + /* usage */ + + hr = D3DXCreateTexture(device, 0, 0, 0, D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, &texture); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateTexture succeeded, but should have failed.\n"); + hr = D3DXCreateTexture(device, 0, 0, 0, D3DUSAGE_DONOTCLIP, 0, D3DPOOL_DEFAULT, &texture); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateTexture succeeded, but should have failed.\n"); + hr = D3DXCreateTexture(device, 0, 0, 0, D3DUSAGE_POINTS, 0, D3DPOOL_DEFAULT, &texture); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateTexture succeeded, but should have failed.\n"); + hr = D3DXCreateTexture(device, 0, 0, 0, D3DUSAGE_RTPATCHES, 0, D3DPOOL_DEFAULT, &texture); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateTexture succeeded, but should have failed.\n"); + hr = D3DXCreateTexture(device, 0, 0, 0, D3DUSAGE_NPATCHES, 0, D3DPOOL_DEFAULT, &texture); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateTexture succeeded, but should have failed.\n"); + + /* format */ + + hr = D3DXCreateTexture(device, 0, 0, 0, 0, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, &texture); + ok(hr == D3D_OK, "D3DXCreateTexture returned %#x, expected %#x\n", hr, D3D_OK); + + if (texture) + { + hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(desc.Format == D3DFMT_A8R8G8B8, "Returned format %u, expected %u\n", desc.Format, D3DFMT_A8R8G8B8); + + IDirect3DTexture9_Release(texture); + } + + + hr = D3DXCreateTexture(device, 0, 0, 0, 0, 0, D3DPOOL_DEFAULT, &texture); + ok(hr == D3D_OK, "D3DXCreateTexture returned %#x, expected %#x\n", hr, D3D_OK); + + if (texture) + { + hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(desc.Format == D3DFMT_A8R8G8B8, "Returned format %u, expected %u\n", desc.Format, D3DFMT_A8R8G8B8); + + IDirect3DTexture9_Release(texture); + } +} + START_TEST(texture) { HWND wnd; @@ -187,6 +347,7 @@ START_TEST(texture) } test_D3DXCheckTextureRequirements(device); + test_D3DXCreateTexture(device); IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d); diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index ad3a1c2..9d547ce 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -185,9 +185,19 @@ HRESULT WINAPI D3DXCreateTexture(LPDIRECT3DDEVICE9 pDevice, D3DPOOL pool, LPDIRECT3DTEXTURE9 *ppTexture) { - FIXME("(%p, %u, %u, %u, %x, %x, %x, %p): semi-stub\n", pDevice, width, height, miplevels, usage, format, + HRESULT hr; + + TRACE("(%p, %u, %u, %u, %x, %x, %x, %p)\n", pDevice, width, height, miplevels, usage, format, pool, ppTexture); + if (!pDevice || !ppTexture) + return D3DERR_INVALIDCALL; + + hr = D3DXCheckTextureRequirements(pDevice, &width, &height, &miplevels, usage, &format, pool); + + if (FAILED(hr)) + return hr; + return IDirect3DDevice9_CreateTexture(pDevice, width, height, miplevels, usage, format, pool, ppTexture, NULL); }

1 0

Owen Rudge : d3dx9: Implement D3DXCheckTextureRequirements.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: b5c7675dd32cc9b5384583848a0cec5e4ad09a6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5c7675dd32cc9b5384583848… Author: Owen Rudge <owen(a)owenrudge.net> Date: Thu Jul 22 20:38:04 2010 +0100 d3dx9: Implement D3DXCheckTextureRequirements. --- dlls/d3dx9_36/tests/texture.c | 4 - dlls/d3dx9_36/texture.c | 146 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 144 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index de7ccf4..15b3e78 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -27,8 +27,6 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) { HRESULT hr; - todo_wine { - /* general tests */ hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, 0, NULL, D3DPOOL_DEFAULT); ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); @@ -38,8 +36,6 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) hr = D3DXCheckTextureRequirements(NULL, NULL, NULL, NULL, D3DX_DEFAULT, NULL, D3DPOOL_DEFAULT); ok(hr == D3DERR_INVALIDCALL, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); - - } /* todo_wine */ } START_TEST(texture) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 9454615..ad3a1c2 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1,5 +1,7 @@ /* + * Copyright 2009 Tony Wasserka * Copyright 2010 Christian Costa + * Copyright 2010 Owen Rudge for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,6 +23,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); +/* Returns TRUE if num is a power of 2, FALSE if not, or if 0 */ +BOOL is_pow2(UINT num) +{ + return !(num & (num - 1)); +} + +/* Returns the smallest power of 2 which is greater than or equal to num */ +UINT make_pow2(UINT num) +{ + UINT result = 1; + + /* In the unlikely event somebody passes a large value, make sure we don't enter an infinite loop */ + if (num >= 0x80000000) + return 0x80000000; + + while (result < num) + result <<= 1; + + return result; +} + HRESULT WINAPI D3DXCheckTextureRequirements(LPDIRECT3DDEVICE9 device, UINT* width, UINT* height, @@ -29,9 +52,128 @@ HRESULT WINAPI D3DXCheckTextureRequirements(LPDIRECT3DDEVICE9 device, D3DFORMAT* format, D3DPOOL pool) { - FIXME("(%p, %p, %p, %p, %u, %p, %u): stub\n", device, width, height, miplevels, usage, format, pool); + UINT w = (width && *width) ? *width : 1; + UINT h = (height && *height) ? *height : 1; + D3DCAPS9 caps; - return E_NOTIMPL; + TRACE("(%p, %p, %p, %p, %u, %p, %u)\n", device, width, height, miplevels, usage, format, pool); + + if (!device) + return D3DERR_INVALIDCALL; + + /* usage */ + if ((usage != D3DX_DEFAULT) && + (usage & (D3DUSAGE_WRITEONLY | D3DUSAGE_DONOTCLIP | D3DUSAGE_POINTS | D3DUSAGE_RTPATCHES | D3DUSAGE_NPATCHES))) + return D3DERR_INVALIDCALL; + + /* pool */ + if ((pool != D3DPOOL_DEFAULT) && (pool != D3DPOOL_MANAGED) && (pool != D3DPOOL_SYSTEMMEM) && (pool != D3DPOOL_SCRATCH)) + return D3DERR_INVALIDCALL; + + /* width and height */ + if (FAILED(IDirect3DDevice9_GetDeviceCaps(device, &caps))) + return D3DERR_INVALIDCALL; + + /* 256 x 256 default width/height */ + if ((w == D3DX_DEFAULT) && (h == D3DX_DEFAULT)) + w = h = 256; + else if (w == D3DX_DEFAULT) + w = (height ? h : 256); + else if (h == D3DX_DEFAULT) + h = (width ? w : 256); + + /* ensure width/height is power of 2 */ + if ((caps.TextureCaps & D3DPTEXTURECAPS_POW2) && (!is_pow2(w))) + w = make_pow2(w); + + if (w > caps.MaxTextureWidth) + w = caps.MaxTextureWidth; + + if ((caps.TextureCaps & D3DPTEXTURECAPS_POW2) && (!is_pow2(h))) + h = make_pow2(h); + + if (h > caps.MaxTextureHeight) + h = caps.MaxTextureHeight; + + /* texture must be square? */ + if (caps.TextureCaps & D3DPTEXTURECAPS_SQUAREONLY) + { + if (w > h) + h = w; + else + w = h; + } + + if (width) + *width = w; + + if (height) + *height = h; + + /* miplevels */ + if (miplevels) + { + UINT max_mipmaps = 1; + + if (!width && !height) + max_mipmaps = 9; /* number of mipmaps in a 256x256 texture */ + else + { + UINT max_dimen = max(w, h); + + while (max_dimen > 1) + { + max_dimen >>= 1; + max_mipmaps++; + } + } + + if (*miplevels == 0 || *miplevels > max_mipmaps) + *miplevels = max_mipmaps; + } + + /* format */ + if (format) + { + D3DDEVICE_CREATION_PARAMETERS params; + IDirect3D9 *d3d = NULL; + D3DDISPLAYMODE mode; + HRESULT hr; + + hr = IDirect3DDevice9_GetDirect3D(device, &d3d); + + if (FAILED(hr)) + goto cleanup; + + hr = IDirect3DDevice9_GetCreationParameters(device, &params); + + if (FAILED(hr)) + goto cleanup; + + hr = IDirect3DDevice9_GetDisplayMode(device, 0, &mode); + + if (FAILED(hr)) + goto cleanup; + + if ((*format == D3DFMT_UNKNOWN) || (*format == D3DX_DEFAULT)) + *format = D3DFMT_A8R8G8B8; + + hr = IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, mode.Format, usage, + D3DRTYPE_TEXTURE, *format); + + if (FAILED(hr)) + FIXME("Pixel format adjustment not implemented yet\n"); + +cleanup: + + if (d3d) + IDirect3D9_Release(d3d); + + if (FAILED(hr)) + return D3DERR_INVALIDCALL; + } + + return D3D_OK; } HRESULT WINAPI D3DXCreateTexture(LPDIRECT3DDEVICE9 pDevice,

1 0

Owen Rudge : d3dx9/tests: Implement additional texture requirement tests.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: a9fe0ccbd2d2ef1f92ebf303bd445d97d712c5b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9fe0ccbd2d2ef1f92ebf303b… Author: Owen Rudge <owen(a)owenrudge.net> Date: Thu Jul 22 20:38:17 2010 +0100 d3dx9/tests: Implement additional texture requirement tests. --- dlls/d3dx9_36/tests/texture.c | 117 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 117 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 15b3e78..f4c74d7 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -25,8 +25,13 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) { + UINT width, height, mipmaps; + D3DFORMAT format; + D3DCAPS9 caps; HRESULT hr; + IDirect3DDevice9_GetDeviceCaps(device, &caps); + /* general tests */ hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, 0, NULL, D3DPOOL_DEFAULT); ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); @@ -36,6 +41,118 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) hr = D3DXCheckTextureRequirements(NULL, NULL, NULL, NULL, D3DX_DEFAULT, NULL, D3DPOOL_DEFAULT); ok(hr == D3DERR_INVALIDCALL, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + /* width & height */ + width = height = D3DX_DEFAULT; + hr = D3DXCheckTextureRequirements(device, &width, &height, NULL, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(width == 256, "Returned width %d, expected %d\n", width, 256); + ok(height == 256, "Returned height %d, expected %d\n", height, 256); + + width = D3DX_DEFAULT; + hr = D3DXCheckTextureRequirements(device, &width, NULL, NULL, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(width == 256, "Returned width %d, expected %d\n", width, 256); + + if (caps.TextureCaps & D3DPTEXTURECAPS_POW2) + skip("Hardware only supports pow2 textures\n"); + else + { + width = 62; + hr = D3DXCheckTextureRequirements(device, &width, NULL, NULL, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(width == 62, "Returned width %d, expected %d\n", width, 62); + + width = D3DX_DEFAULT; height = 63; + hr = D3DXCheckTextureRequirements(device, &width, &height, NULL, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(width == height, "Returned width %d, expected %d\n", width, height); + ok(height == 63, "Returned height %d, expected %d\n", height, 63); + } + + width = D3DX_DEFAULT; height = 0; + hr = D3DXCheckTextureRequirements(device, &width, &height, NULL, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(width == 1, "Returned width %d, expected %d\n", width, 1); + ok(height == 1, "Returned height %d, expected %d\n", height, 1); + + width = 0; height = 0; + hr = D3DXCheckTextureRequirements(device, &width, &height, NULL, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(width == 1, "Returned width %d, expected %d\n", width, 1); + ok(height == 1, "Returned height %d, expected %d\n", height, 1); + + width = 0; + hr = D3DXCheckTextureRequirements(device, &width, NULL, NULL, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(width == 1, "Returned width %d, expected %d\n", width, 1); + + width = D3DX_DEFAULT; + hr = D3DXCheckTextureRequirements(device, &width, NULL, NULL, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(width == 256, "Returned width %d, expected %d\n", width, 256); + + width = 0xFFFFFFFE; + hr = D3DXCheckTextureRequirements(device, &width, NULL, NULL, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(width == caps.MaxTextureWidth, "Returned width %d, expected %d\n", width, caps.MaxTextureWidth); + + width = caps.MaxTextureWidth-1; + hr = D3DXCheckTextureRequirements(device, &width, NULL, NULL, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(width == caps.MaxTextureWidth-1, "Returned width %d, expected %d\n", width, caps.MaxTextureWidth-1); + + /* mipmaps */ + width = 64; height = 63; + mipmaps = 9; + hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 7, "Returned mipmaps %d, expected %d\n", mipmaps, 7); + + width = 284; height = 137; + mipmaps = 20; + hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 9, "Returned mipmaps %d, expected %d\n", mipmaps, 9); + + width = height = 63; + mipmaps = 9; + hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 6, "Returned mipmaps %d, expected %d\n", mipmaps, 6); + + mipmaps = 20; + hr = D3DXCheckTextureRequirements(device, NULL, NULL, &mipmaps, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 9, "Returned mipmaps %d, expected %d\n", mipmaps, 9); + + mipmaps = 0; + hr = D3DXCheckTextureRequirements(device, NULL, NULL, &mipmaps, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 9, "Returned mipmaps %d, expected %d\n", mipmaps, 9); + + /* usage */ + hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, D3DUSAGE_WRITEONLY, NULL, D3DPOOL_DEFAULT); + ok(hr == D3DERR_INVALIDCALL, "D3DXCheckTextureRequirements succeeded, but should've failed.\n"); + hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, D3DUSAGE_DONOTCLIP, NULL, D3DPOOL_DEFAULT); + ok(hr == D3DERR_INVALIDCALL, "D3DXCheckTextureRequirements succeeded, but should've failed.\n"); + hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, D3DUSAGE_POINTS, NULL, D3DPOOL_DEFAULT); + ok(hr == D3DERR_INVALIDCALL, "D3DXCheckTextureRequirements succeeded, but should've failed.\n"); + hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, D3DUSAGE_RTPATCHES, NULL, D3DPOOL_DEFAULT); + ok(hr == D3DERR_INVALIDCALL, "D3DXCheckTextureRequirements succeeded, but should've failed.\n"); + hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, D3DUSAGE_NPATCHES, NULL, D3DPOOL_DEFAULT); + ok(hr == D3DERR_INVALIDCALL, "D3DXCheckTextureRequirements succeeded, but should've failed.\n"); + + /* format */ + format = D3DFMT_UNKNOWN; + hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, 0, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(format == D3DFMT_A8R8G8B8, "Returned format %u, expected %u\n", format, D3DFMT_A8R8G8B8); + + format = 0; + hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, 0, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(format == D3DFMT_A8R8G8B8, "Returned format %u, expected %u\n", format, D3DFMT_A8R8G8B8); } START_TEST(texture)

1 0

Frédéric Delanoy : Localize French paypal donation page
by Jeremy Newman July 26, 2010

July 26, 2010

Module: website Branch: master Commit: b6840a0755263ea9663e4983249615bf3553583b URL: http://source.winehq.org/git/website.git/?a=commit;h=b6840a0755263ea9663e49… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jul 25 14:06:12 2010 +0200 Localize French paypal donation page >From 413949b78d069c4f71a11fd1f3156ed8a672e5e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delanoy?= <frederic.delanoy(a)gmail.com> Date: Sun, 25 Jul 2010 14:05:10 +0200 Subject: Localize French paypal donation page --- templates/fr/home.template | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/templates/fr/home.template b/templates/fr/home.template index 71a78a7..ad8d7f6 100644 --- a/templates/fr/home.template +++ b/templates/fr/home.template @@ -44,7 +44,9 @@ <form action="https://www.paypal.com/cgi-bin/webscr" method="post" name="donateForm" style="margin: 0; padding: 0;"> <input type="hidden" name="cmd" value="_donations"> <input type="hidden" name="business" value="donate(a)winehq.org"> - <input type="hidden" name="item_name" value="Wine donation"> + <input type="hidden" name="item_name" value="Donation pour Wine"> + <input type="hidden" name="lc" value="FR"> + <input type="hidden" name="currency_code" value="EUR"> </form> <div class="donate" onClick="document.donateForm.submit();"> <div class="icon"></div>

1 0

Frédéric Delanoy : Paypal donations should use ' _donations' cmd value instead of '_xclick'.
by Jeremy Newman July 23, 2010

July 23, 2010

Module: website Branch: master Commit: 9253307ddbb7bf353a9cae0370cac7d71d541d05 URL: http://source.winehq.org/git/website.git/?a=commit;h=9253307ddbb7bf353a9cae… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 23 18:18:32 2010 +0200 Paypal donations should use '_donations' cmd value instead of '_xclick'. This allows in addition a better donation screen wording. See "Technical HTML Variables" on "HTML Variables for Website Payments Standard" page (https://cms.paypal.com/en/cgi-bin/?&cmd=_render-content&content_ID=develope…) >From 0a879430bfd49afe4d70ff2dd70ec834d49d0a23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delanoy?= <frederic.delanoy(a)gmail.com> Date: Fri, 23 Jul 2010 18:11:06 +0200 Subject: Paypal donations should use '_donations' cmd value instead of '_xclick'. This is the PayPal preferred way; see doc on paypal. --- templates/de/home.template | 2 +- templates/en/home.template | 2 +- templates/es/home.template | 2 +- templates/fr/home.template | 2 +- templates/pl/home.template | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/de/home.template b/templates/de/home.template index c839178..b2693ad 100644 --- a/templates/de/home.template +++ b/templates/de/home.template @@ -42,7 +42,7 @@ </div> <form action="https://www.paypal.com/cgi-bin/webscr" method="post" name="donateForm" style="margin: 0; padding: 0;"> - <input type="hidden" name="cmd" value="_xclick"> + <input type="hidden" name="cmd" value="_donations"> <input type="hidden" name="business" value="donate(a)winehq.org"> <input type="hidden" name="item_name" value="Wine donation"> </form> diff --git a/templates/en/home.template b/templates/en/home.template index 288e921..1feb78a 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -42,7 +42,7 @@ </div> <form action="https://www.paypal.com/cgi-bin/webscr" method="post" name="donateForm" style="margin: 0; padding: 0;"> - <input type="hidden" name="cmd" value="_xclick"> + <input type="hidden" name="cmd" value="_donations"> <input type="hidden" name="business" value="donate(a)winehq.org"> <input type="hidden" name="item_name" value="Wine donation"> </form> diff --git a/templates/es/home.template b/templates/es/home.template index 8a5f42b..0b3a910 100644 --- a/templates/es/home.template +++ b/templates/es/home.template @@ -42,7 +42,7 @@ </div> <form action="https://www.paypal.com/cgi-bin/webscr" method="post" name="donateForm" style="margin: 0; padding: 0;"> - <input type="hidden" name="cmd" value="_xclick"> + <input type="hidden" name="cmd" value="_donations"> <input type="hidden" name="business" value="donate(a)winehq.org"> <input type="hidden" name="item_name" value="Wine donation"> </form> diff --git a/templates/fr/home.template b/templates/fr/home.template index 2765775..71a78a7 100644 --- a/templates/fr/home.template +++ b/templates/fr/home.template @@ -42,7 +42,7 @@ </div> <form action="https://www.paypal.com/cgi-bin/webscr" method="post" name="donateForm" style="margin: 0; padding: 0;"> - <input type="hidden" name="cmd" value="_xclick"> + <input type="hidden" name="cmd" value="_donations"> <input type="hidden" name="business" value="donate(a)winehq.org"> <input type="hidden" name="item_name" value="Wine donation"> </form> diff --git a/templates/pl/home.template b/templates/pl/home.template index 422eb94..3a018ac 100644 --- a/templates/pl/home.template +++ b/templates/pl/home.template @@ -42,7 +42,7 @@ </div> <form action="https://www.paypal.com/cgi-bin/webscr" method="post" name="donateForm" style="margin: 0; padding: 0;"> - <input type="hidden" name="cmd" value="_xclick"> + <input type="hidden" name="cmd" value="_donations"> <input type="hidden" name="business" value="donate(a)winehq.org"> <input type="hidden" name="item_name" value="Wine donation"> </form>

1 0

Alistair Leslie-Hughes : dwmapi: Add stub DwmEnableBlurBehindWindow.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: e158bb0b4cd3703bdc83223352cf22e000c53442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e158bb0b4cd3703bdc8322335… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 23 19:53:02 2010 +1000 dwmapi: Add stub DwmEnableBlurBehindWindow. --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 10 ++++++++++ include/dwmapi.h | 13 +++++++++++++ 3 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 7c613d0..ea41e0c 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -23,7 +23,7 @@ @ stub DwmAttachMilContent @ stub DwmDefWindowProc @ stub DwmDetachMilContent -@ stub DwmEnableBlurBehindWindow +@ stdcall DwmEnableBlurBehindWindow(ptr ptr) @ stdcall DwmEnableMMCSS(long) @ stdcall DwmExtendFrameIntoClientArea(long ptr) @ stdcall DwmFlush() diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index ee86691..fcc52c3 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -166,3 +166,13 @@ HRESULT WINAPI DwmGetGraphicsStreamTransformHint(UINT uIndex, MilMatrix3x2D *pTr return E_NOTIMPL; } + +/********************************************************************** + * DwmEnableBlurBehindWindow (DWMAPI.@) + */ +HRESULT WINAPI DwmEnableBlurBehindWindow(HWND hWnd, const DWM_BLURBEHIND *pBlurBuf) +{ + FIXME("%p %p\n", hWnd, pBlurBuf); + + return E_NOTIMPL; +} diff --git a/include/dwmapi.h b/include/dwmapi.h index 4fe51bc..2cf5d6d 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -41,6 +41,19 @@ typedef struct _MilMatrix3x2D DOUBLE DY; } MilMatrix3x2D; +#define DWM_BB_ENABLE 0x00000001 +#define DWM_BB_BLURREGION 0x00000002 +#define DWM_BB_TRANSITIONONMAXIMIZED 0x00000004 + +typedef struct _DWM_BLURBEHIND +{ + DWORD dwFlags; + BOOL fEnable; + HRGN hRgnBlur; + BOOL fTransitionOnMaximized; +} DWM_BLURBEHIND, *PDWM_BLURBEHIND; + +DWMAPI DwmEnableBlurBehindWindow(HWND, const DWM_BLURBEHIND *); DWMAPI DwmEnableComposition(UINT); DWMAPI DwmEnableMMCSS(BOOL); DWMAPI DwmExtendFrameIntoClientArea(HWND,const MARGINS*);

1 0

Paul Vriens : winhlp32: Add the Serbian (Latin) translation.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: 841153aaaa5875049c82861bf2ccb9c428066575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=841153aaaa5875049c82861bf… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jul 23 14:45:51 2010 +0200 winhlp32: Add the Serbian (Latin) translation. Translation by Nenad Vujic <nesa24casa(a)gmail.com> --- programs/winhlp32/Makefile.in | 1 + programs/winhlp32/Sr.rc | 131 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+), 0 deletions(-) diff --git a/programs/winhlp32/Makefile.in b/programs/winhlp32/Makefile.in index c889017..393e205 100644 --- a/programs/winhlp32/Makefile.in +++ b/programs/winhlp32/Makefile.in @@ -42,6 +42,7 @@ RC_SRCS = \ Ru.rc \ Si.rc \ Sk.rc \ + Sr.rc \ Sv.rc \ Tr.rc \ Uk.rc \ diff --git a/programs/winhlp32/Sr.rc b/programs/winhlp32/Sr.rc new file mode 100644 index 0000000..8ce964b --- /dev/null +++ b/programs/winhlp32/Sr.rc @@ -0,0 +1,131 @@ +/* + * Help Viewer + * + * Copyright 2010 Nenad Vujic + * Paul Vriens + * + * 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 "winhelp_res.h" + +#pragma code_page(65001) + +/* Menu */ + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +MAIN_MENU MENU +{ + POPUP "&Fajl" { + MENUITEM "&Otvori", MNID_FILE_OPEN + MENUITEM SEPARATOR + MENUITEM "&Štampaj", MNID_FILE_PRINT + MENUITEM "Štampač &podešavanje...", MNID_FILE_SETUP + MENUITEM SEPARATOR + MENUITEM "I&zlaz", MNID_FILE_EXIT + } + POPUP "&Izmeni" { + MENUITEM "&Kopiraj...", MNID_EDIT_COPYDLG + MENUITEM SEPARATOR + MENUITEM "&Pribeleži...", MNID_EDIT_ANNOTATE + } + POPUP "&Označi" { + MENUITEM "&Odredi...", MNID_BKMK_DEFINE + } + POPUP "&Opcije" { + POPUP "Pomoć uvek vidljiva" + BEGIN + MENUITEM "Osnovno", MNID_OPTS_HELP_DEFAULT + MENUITEM "Vidljivo", MNID_OPTS_HELP_VISIBLE + MENUITEM "Nije vidljivo", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "Istorija", MNID_OPTS_HISTORY + POPUP "Fontovi" + BEGIN + MENUITEM "Mali", MNID_OPTS_FONTS_SMALL + MENUITEM "Normalan", MNID_OPTS_FONTS_NORMAL + MENUITEM "Veliki", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Koristi sistenske boje", MNID_OPTS_SYSTEM_COLORS + } + POPUP "&Pomoć" { + MENUITEM "Pomoć &na pomoći", MNID_HELP_HELPON + MENUITEM "Uvek na &vrhu", MNID_HELP_HELPTOP + MENUITEM SEPARATOR + MENUITEM "&Info...", MNID_HELP_ABOUT +#ifdef WINELIB + MENUITEM "&O Wine", MNID_HELP_WINE +#endif + } +} + +IDD_INDEX DIALOG 0, 0, 200, 190 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Index" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER +} + +IDD_SEARCH DIALOG 0, 0, 200, 190 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Traži" +{ + LTEXT "Not implemented yet", -1, 10, 10, 180, 150 +} + +/* Strings */ +STRINGTABLE +{ +STID_WINE_HELP, "Wine Pomoć" +STID_WHERROR, "GREŠKA" +STID_WARNING, "UPOZORENJE" +STID_INFO, "Informacija" +STID_NOT_IMPLEMENTED, "Nije jos u programu" +STID_HLPFILE_ERROR_s, "Greška tokom čitanja pomoćnog fajla `%s'" +STID_INDEX, "&Index" +STID_CONTENTS, "Pregled" +STID_BACK, "&Nazad" +STID_ALL_FILES, "Svi fajlovi (*.*)" +STID_HELP_FILES_HLP, "Pomočni fajlovi (*.hlp)" +STID_FILE_NOT_FOUND_s "Ne mogu naći '%s'. Da li želite da sami nađete fajl?" +STID_NO_RICHEDIT "Ne mogu naći richedit ubacen... Prekidam" +STID_PSH_INDEX, "Teme pomoći: " +} + +CONTEXT_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Beleške...", MNID_CTXT_ANNOTATE + MENUITEM "Kopiraj", MNID_CTXT_COPY + MENUITEM "Štampaj...", MNID_CTXT_PRINT + POPUP "Fontovi" + BEGIN + MENUITEM "Mali", MNID_CTXT_FONTS_SMALL + MENUITEM "Normalno", MNID_CTXT_FONTS_NORMAL + MENUITEM "Veliki", MNID_CTXT_FONTS_LARGE + END + POPUP "Pomoć uvek vidljiva" + BEGIN + MENUITEM "Osnovno", MNID_CTXT_HELP_DEFAULT + MENUITEM "Vidljiv", MNID_CTXT_HELP_VISIBLE + MENUITEM "Nije vidljiv", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "Koristi sistemske boje", MNID_CTXT_SYSTEM_COLORS + END +END

1 0