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

Andrew Nguyen : shlwapi/tests: Add tests for StrStrA.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: c43bac44ba261cb730da05df54b059aea6afc981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c43bac44ba261cb730da05df5… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Jul 18 19:33:27 2010 -0500 shlwapi/tests: Add tests for StrStrA. --- dlls/shlwapi/tests/string.c | 48 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index b8cf7e0..a4e8d45 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -960,6 +960,53 @@ if (0) win_skip("wnsprintfW() is not available\n"); } +static void test_StrStrA(void) +{ + static const char *deadbeef = "DeAdBeEf"; + + const struct + { + const char *search; + const char *expect; + } StrStrA_cases[] = + { + {"", NULL}, + {"DeAd", deadbeef}, + {"dead", NULL}, + {"AdBe", deadbeef + 2}, + {"adbe", NULL}, + {"BeEf", deadbeef + 4}, + {"beef", NULL}, + }; + + LPSTR ret; + int i; + + /* Tests crash on Win9x/Win2k. */ + if (0) + { + ret = StrStrA(NULL, NULL); + ok(!ret, "Expected StrStrA to return NULL, got %p\n", ret); + + ret = StrStrA(NULL, ""); + ok(!ret, "Expected StrStrA to return NULL, got %p\n", ret); + + ret = StrStrA("", NULL); + ok(!ret, "Expected StrStrA to return NULL, got %p\n", ret); + } + + ret = StrStrA("", ""); + ok(!ret, "Expected StrStrA to return NULL, got %p\n", ret); + + for (i = 0; i < sizeof(StrStrA_cases)/sizeof(StrStrA_cases[0]); i++) + { + ret = StrStrA(deadbeef, StrStrA_cases[i].search); + ok(ret == StrStrA_cases[i].expect, + "[%d] Expected StrStrA to return %p, got %p\n", + i, StrStrA_cases[i].expect, ret); + } +} + START_TEST(string) { HMODULE hShlwapi; @@ -1029,6 +1076,7 @@ START_TEST(string) test_SHAnsiToAnsi(); test_SHUnicodeToUnicode(); test_StrXXX_overflows(); + test_StrStrA(); CoUninitialize(); }

1 0

Andrew Nguyen : shlwapi: Fix handling of an empty search string in StrStrW.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 9bcdb1c423070d5ed387ba3efc767adea2d2930b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bcdb1c423070d5ed387ba3ef… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Jul 18 19:33:36 2010 -0500 shlwapi: Fix handling of an empty search string in StrStrW. --- dlls/shlwapi/string.c | 4 ++- dlls/shlwapi/tests/string.c | 55 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index a0269b6..5647a35 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -584,7 +584,9 @@ LPSTR WINAPI StrStrA(LPCSTR lpszStr, LPCSTR lpszSearch) */ LPWSTR WINAPI StrStrW(LPCWSTR lpszStr, LPCWSTR lpszSearch) { - if (!lpszStr || !lpszSearch) return NULL; + TRACE("(%s, %s)\n", debugstr_w(lpszStr), debugstr_w(lpszSearch)); + + if (!lpszStr || !lpszSearch || !*lpszSearch) return NULL; return strstrW( lpszStr, lpszSearch ); } diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index a4e8d45..0eaaafb 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -1007,6 +1007,60 @@ static void test_StrStrA(void) } } +static void test_StrStrW(void) +{ + static const WCHAR emptyW[] = {0}; + static const WCHAR deadbeefW[] = {'D','e','A','d','B','e','E','f',0}; + static const WCHAR deadW[] = {'D','e','A','d',0}; + static const WCHAR dead_lowerW[] = {'d','e','a','d',0}; + static const WCHAR adbeW[] = {'A','d','B','e',0}; + static const WCHAR adbe_lowerW[] = {'a','d','b','e',0}; + static const WCHAR beefW[] = {'B','e','E','f',0}; + static const WCHAR beef_lowerW[] = {'b','e','e','f',0}; + + const struct + { + const WCHAR *search; + const WCHAR *expect; + } StrStrW_cases[] = + { + {emptyW, NULL}, + {deadW, deadbeefW}, + {dead_lowerW, NULL}, + {adbeW, deadbeefW + 2}, + {adbe_lowerW, NULL}, + {beefW, deadbeefW + 4}, + {beef_lowerW, NULL}, + }; + + LPWSTR ret; + int i; + + /* Tests crash on Win9x. */ + if (0) + { + ret = StrStrW(NULL, NULL); + ok(!ret, "Expected StrStrW to return NULL, got %p\n", ret); + + ret = StrStrW(NULL, emptyW); + ok(!ret, "Expected StrStrW to return NULL, got %p\n", ret); + + ret = StrStrW(emptyW, NULL); + ok(!ret, "Expected StrStrW to return NULL, got %p\n", ret); + } + + ret = StrStrW(emptyW, emptyW); + ok(!ret, "Expected StrStrW to return NULL, got %p\n", ret); + + for (i = 0; i < sizeof(StrStrW_cases)/sizeof(StrStrW_cases[0]); i++) + { + ret = StrStrW(deadbeefW, StrStrW_cases[i].search); + ok(ret == StrStrW_cases[i].expect, + "[%d] Expected StrStrW to return %p, got %p\n", + i, StrStrW_cases[i].expect, ret); + } +} + START_TEST(string) { HMODULE hShlwapi; @@ -1077,6 +1131,7 @@ START_TEST(string) test_SHUnicodeToUnicode(); test_StrXXX_overflows(); test_StrStrA(); + test_StrStrW(); CoUninitialize(); }

1 0

Andrew Nguyen : shlwapi/tests: Add tests for StrStrIA.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 1784dbd17a2fc3c71a44cf27a9f6a83ccbc5b0de URL: http://source.winehq.org/git/wine.git/?a=commit;h=1784dbd17a2fc3c71a44cf27a… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Jul 18 19:33:47 2010 -0500 shlwapi/tests: Add tests for StrStrIA. --- dlls/shlwapi/tests/string.c | 49 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 0eaaafb..07a4602 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -1061,6 +1061,54 @@ static void test_StrStrW(void) } } +static void test_StrStrIA(void) +{ + static const char *deadbeef = "DeAdBeEf"; + + const struct + { + const char *search; + const char *expect; + } StrStrIA_cases[] = + { + {"", NULL}, + {"DeAd", deadbeef}, + {"dead", deadbeef}, + {"AdBe", deadbeef + 2}, + {"adbe", deadbeef + 2}, + {"BeEf", deadbeef + 4}, + {"beef", deadbeef + 4}, + {"cafe", NULL}, + }; + + LPSTR ret; + int i; + + /* Tests crash on Win9x/Win2k. */ + if (0) + { + ret = StrStrIA(NULL, NULL); + ok(!ret, "Expected StrStrIA to return NULL, got %p\n", ret); + + ret = StrStrIA(NULL, ""); + ok(!ret, "Expected StrStrIA to return NULL, got %p\n", ret); + + ret = StrStrIA("", NULL); + ok(!ret, "Expected StrStrIA to return NULL, got %p\n", ret); + } + + ret = StrStrIA("", ""); + ok(!ret, "Expected StrStrIA to return NULL, got %p\n", ret); + + for (i = 0; i < sizeof(StrStrIA_cases)/sizeof(StrStrIA_cases[0]); i++) + { + ret = StrStrIA(deadbeef, StrStrIA_cases[i].search); + ok(ret == StrStrIA_cases[i].expect, + "[%d] Expected StrStrIA to return %p, got %p\n", + i, StrStrIA_cases[i].expect, ret); + } +} + START_TEST(string) { HMODULE hShlwapi; @@ -1132,6 +1180,7 @@ START_TEST(string) test_StrXXX_overflows(); test_StrStrA(); test_StrStrW(); + test_StrStrIA(); CoUninitialize(); }

1 0

Andrew Nguyen : shlwapi/tests: Add tests for StrStrIW.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 355057d5290bb75098b468e94e570bca3ca49214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=355057d5290bb75098b468e94… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Jul 18 19:34:00 2010 -0500 shlwapi/tests: Add tests for StrStrIW. --- dlls/shlwapi/tests/string.c | 57 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 07a4602..8b4bb17 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -1109,6 +1109,62 @@ static void test_StrStrIA(void) } } +static void test_StrStrIW(void) +{ + static const WCHAR emptyW[] = {0}; + static const WCHAR deadbeefW[] = {'D','e','A','d','B','e','E','f',0}; + static const WCHAR deadW[] = {'D','e','A','d',0}; + static const WCHAR dead_lowerW[] = {'d','e','a','d',0}; + static const WCHAR adbeW[] = {'A','d','B','e',0}; + static const WCHAR adbe_lowerW[] = {'a','d','b','e',0}; + static const WCHAR beefW[] = {'B','e','E','f',0}; + static const WCHAR beef_lowerW[] = {'b','e','e','f',0}; + static const WCHAR cafeW[] = {'c','a','f','e',0}; + + const struct + { + const WCHAR *search; + const WCHAR *expect; + } StrStrIW_cases[] = + { + {emptyW, NULL}, + {deadW, deadbeefW}, + {dead_lowerW, deadbeefW}, + {adbeW, deadbeefW + 2}, + {adbe_lowerW, deadbeefW + 2}, + {beefW, deadbeefW + 4}, + {beef_lowerW, deadbeefW + 4}, + {cafeW, NULL}, + }; + + LPWSTR ret; + int i; + + /* Tests crash on Win9x/Win2k */ + if (0) + { + ret = StrStrIW(NULL, NULL); + ok(!ret, "Expected StrStrIW to return NULL, got %p\n", ret); + + ret = StrStrIW(NULL, emptyW); + ok(!ret, "Expected StrStrIW to return NULL, got %p\n", ret); + + ret = StrStrIW(emptyW, NULL); + ok(!ret, "Expected StrStrIW to return NULL, got %p\n", ret); + } + + ret = StrStrIW(emptyW, emptyW); + ok(!ret, "Expected StrStrIW to return NULL, got %p\n", ret); + + for (i = 0; i < sizeof(StrStrIW_cases)/sizeof(StrStrIW_cases[0]); i++) + { + ret = StrStrIW(deadbeefW, StrStrIW_cases[i].search); + ok(ret == StrStrIW_cases[i].expect, + "[%d] Expected StrStrIW to return %p, got %p\n", + i, StrStrIW_cases[i].expect, ret); + } +} + START_TEST(string) { HMODULE hShlwapi; @@ -1181,6 +1237,7 @@ START_TEST(string) test_StrStrA(); test_StrStrW(); test_StrStrIA(); + test_StrStrIW(); CoUninitialize(); }

1 0

Nikolay Sivov : msxml3: Speed up a IPersistStreamInit::Save() by querying for BSTR length.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 331e179632b0519451d25dc02729a2e9fc2713d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=331e179632b0519451d25dc02… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 18 17:18:13 2010 +0400 msxml3: Speed up a IPersistStreamInit::Save() by querying for BSTR length. --- dlls/msxml3/domdoc.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 0007503..f9f02e0 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -415,22 +415,20 @@ static HRESULT WINAPI domdoc_IPersistStreamInit_Load( } static HRESULT WINAPI domdoc_IPersistStreamInit_Save( - IPersistStreamInit *iface, LPSTREAM pStm, BOOL fClearDirty) + IPersistStreamInit *iface, IStream *stream, BOOL clr_dirty) { domdoc *This = impl_from_IPersistStreamInit(iface); - HRESULT hr; BSTR xmlString; + HRESULT hr; - TRACE("(%p)->(%p %d)\n", This, pStm, fClearDirty); + TRACE("(%p)->(%p %d)\n", This, stream, clr_dirty); hr = IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(&This->node), &xmlString ); if(hr == S_OK) { - DWORD count; - DWORD len = strlenW(xmlString) * sizeof(WCHAR); - - hr = IStream_Write( pStm, xmlString, len, &count ); + DWORD len = SysStringLen(xmlString) * sizeof(WCHAR); + hr = IStream_Write( stream, xmlString, len, NULL ); SysFreeString(xmlString); }

1 0

Detlef Riekenberg : rundll.exe16: Add program as 16bit wrapper for rundll32 .exe.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: df898ea47a8a1833a842037f6d9935fcd33d7898 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df898ea47a8a1833a842037f6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jul 18 19:15:57 2010 +0200 rundll.exe16: Add program as 16bit wrapper for rundll32.exe. --- configure | 1 + configure.ac | 1 + programs/rundll.exe16/Makefile.in | 11 ++++++++ programs/rundll.exe16/rundll.c | 48 +++++++++++++++++++++++++++++++++++++ tools/wine.inf.in | 1 + 5 files changed, 62 insertions(+), 0 deletions(-) diff --git a/configure b/configure index a57e048..864f60e 100755 --- a/configure +++ b/configure @@ -14786,6 +14786,7 @@ wine_fn_config_program reg enable_reg install wine_fn_config_program regedit enable_regedit installbin wine_fn_config_program regsvr32 enable_regsvr32 installbin wine_fn_config_program rpcss enable_rpcss install +wine_fn_config_program rundll.exe16 enable_win16 install wine_fn_config_program rundll32 enable_rundll32 install wine_fn_config_program sc enable_sc install wine_fn_config_program secedit enable_secedit install diff --git a/configure.ac b/configure.ac index 61f376e..3416773 100644 --- a/configure.ac +++ b/configure.ac @@ -2723,6 +2723,7 @@ WINE_CONFIG_PROGRAM(reg,install) WINE_CONFIG_PROGRAM(regedit,installbin) WINE_CONFIG_PROGRAM(regsvr32,installbin) WINE_CONFIG_PROGRAM(rpcss,install) +WINE_CONFIG_PROGRAM(rundll.exe16,install,enable_win16) WINE_CONFIG_PROGRAM(rundll32,install) WINE_CONFIG_PROGRAM(sc,install) WINE_CONFIG_PROGRAM(secedit,install) diff --git a/programs/rundll.exe16/Makefile.in b/programs/rundll.exe16/Makefile.in new file mode 100644 index 0000000..9e5df3e --- /dev/null +++ b/programs/rundll.exe16/Makefile.in @@ -0,0 +1,11 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = rundll.exe16 +APPMODE = -mwindows -Wb,--subsystem,win16 +IMPORTS = kernel32 kernel + +C_SRCS = rundll.c + +(a)MAKE_PROG_RULES@ diff --git a/programs/rundll.exe16/rundll.c b/programs/rundll.exe16/rundll.c new file mode 100644 index 0000000..f7788f2 --- /dev/null +++ b/programs/rundll.exe16/rundll.c @@ -0,0 +1,48 @@ +/* + * 16-bit rundll implementation + * + * Copyright 2009 Alexandre Julliard + * Copyright 2010 Detlef Riekenberg + * + * 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 <stdarg.h> +#include <stdio.h> + +#include "wine/winbase16.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(rundll); + +/************************************************************************** + * RUNDLL entry point + */ +WORD WINAPI WinMain16( HINSTANCE16 inst, HINSTANCE16 prev, LPSTR cmdline, WORD show ) +{ + int len = GetSystemDirectoryA( NULL, 0 ) + sizeof("\\rundll32.exe ") + strlen(cmdline); + char *buffer = HeapAlloc( GetProcessHeap(), 0, len ); + + GetSystemDirectoryA( buffer, len ); + strcat( buffer, "\\rundll32.exe " ); + strcat( buffer, cmdline ); + + WINE_TRACE( "starting %s\n", wine_dbgstr_a(buffer) ); + + WinExec16( buffer, show ); + + HeapFree( GetProcessHeap(), 0, buffer ); + ExitThread( 0 ); +} diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 63a78d2..8612f22 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2541,6 +2541,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" ; 32bit-only fake dlls [FakeDllsWin32] +10,,rundll.exe,rundll.exe16 10,,twain.dll,twain.dll16 10,,twain_32.dll 10,,winhelp.exe,winhelp.exe16

1 0

Misha Koshelev : d3dx9: Add stub and basic test for D3DXCreateSphere.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 242b4f3fe8b060e629db2622e1715f5169f5e888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=242b4f3fe8b060e629db2622e… Author: Misha Koshelev <misha680(a)gmail.com> Date: Fri Jul 16 17:20:06 2010 -0500 d3dx9: Add stub and basic test for D3DXCreateSphere. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 8 +++++ dlls/d3dx9_36/tests/mesh.c | 62 +++++++++++++++++++++++++++++++++++++++++++ include/d3dx9shape.h | 7 +++++ 4 files changed, 78 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 19406e7..b9a00da 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -87,7 +87,7 @@ @ stub D3DXCreateSkinInfo @ stub D3DXCreateSkinInfoFromBlendedMesh @ stub D3DXCreateSkinInfoFVF -@ stub D3DXCreateSphere +@ stdcall D3DXCreateSphere(ptr long long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stub D3DXCreateTeapot @ stub D3DXCreateTextA diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 9691eed..bfa1c23 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -335,3 +335,11 @@ HRESULT WINAPI D3DXCreateBox(LPDIRECT3DDEVICE9 device, FLOAT width, FLOAT height return E_NOTIMPL; } + +HRESULT WINAPI D3DXCreateSphere(LPDIRECT3DDEVICE9 device, FLOAT radius, UINT slices, + UINT stacks, LPD3DXMESH* mesh, LPD3DXBUFFER* adjacency) +{ + FIXME("(%p, %f, %d, %d, %p, %p): stub\n", device, radius, slices, stacks, mesh, adjacency); + + return E_NOTIMPL; +} diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index e675d7d..f3a629d 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -479,6 +479,67 @@ static void D3DXIntersectTriTest(void) ok( got_res == exp_res, "Expected result = %d, got %d\n",exp_res,got_res); } +static void D3DXCreateSphereTest(void) +{ + HRESULT hr; + HWND wnd; + IDirect3D9* d3d; + IDirect3DDevice9* device; + D3DPRESENT_PARAMETERS d3dpp; + ID3DXMesh* sphere = NULL; + + hr = D3DXCreateSphere(NULL, 0.0f, 0, 0, NULL, NULL); + todo_wine ok( hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n",hr,D3DERR_INVALIDCALL); + + hr = D3DXCreateSphere(NULL, 0.1f, 0, 0, NULL, NULL); + todo_wine ok( hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n",hr,D3DERR_INVALIDCALL); + + hr = D3DXCreateSphere(NULL, 0.0f, 1, 0, NULL, NULL); + todo_wine ok( hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n",hr,D3DERR_INVALIDCALL); + + hr = D3DXCreateSphere(NULL, 0.0f, 0, 1, NULL, NULL); + todo_wine ok( hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n",hr,D3DERR_INVALIDCALL); + + wnd = CreateWindow("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + if (!wnd) + { + skip("Couldn't create application window\n"); + return; + } + if (!d3d) + { + skip("Couldn't create IDirect3D9 object\n"); + DestroyWindow(wnd); + return; + } + + ZeroMemory(&d3dpp, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + if (FAILED(hr)) + { + skip("Failed to create IDirect3DDevice9 object %#x\n", hr); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); + return; + } + + hr = D3DXCreateSphere(device, 1.0f, 1, 1, &sphere, NULL); + todo_wine ok( hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n",hr,D3DERR_INVALIDCALL); + + hr = D3DXCreateSphere(device, 1.0f, 2, 2, &sphere, NULL); + todo_wine ok( hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n",hr); + + if (sphere) + sphere->lpVtbl->Release(sphere); + + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); +} + static void test_get_decl_vertex_size(void) { static const D3DVERTEXELEMENT9 declaration1[] = @@ -559,5 +620,6 @@ START_TEST(mesh) D3DXDeclaratorFromFVFTest(); D3DXGetFVFVertexSizeTest(); D3DXIntersectTriTest(); + D3DXCreateSphereTest(); test_get_decl_vertex_size(); } diff --git a/include/d3dx9shape.h b/include/d3dx9shape.h index e1bf231..36bca6b 100644 --- a/include/d3dx9shape.h +++ b/include/d3dx9shape.h @@ -32,6 +32,13 @@ HRESULT WINAPI D3DXCreateBox(LPDIRECT3DDEVICE9 device, LPD3DXMESH* mesh, LPD3DXBUFFER* adjacency); +HRESULT WINAPI D3DXCreateSphere(LPDIRECT3DDEVICE9 device, + FLOAT radius, + UINT slices, + UINT stacks, + LPD3DXMESH* mesh, + LPD3DXBUFFER* adjacency); + #ifdef __cplusplus } #endif

1 0

Nikolay Sivov : comctl32/monthcal: Prepare drawing helpers for multiple calendars.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 2042cbc2431061126ffed311ec61572188253a76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2042cbc2431061126ffed311e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 18 16:13:44 2010 +0400 comctl32/monthcal: Prepare drawing helpers for multiple calendars. --- dlls/comctl32/monthcal.c | 236 ++++++++++++++++++++++++++-------------------- 1 files changed, 133 insertions(+), 103 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2042cbc2431061126ffed…

1 0

Nikolay Sivov : comctl32/monthcal: Modify hittesting helper to work with multiple calendars.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 8ea515c872b52e1c7273493b74d8dc7342793fe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ea515c872b52e1c7273493b7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 18 16:14:56 2010 +0400 comctl32/monthcal: Modify hittesting helper to work with multiple calendars. --- dlls/comctl32/monthcal.c | 118 ++++++++++++++++++++++++++++++++------------- 1 files changed, 84 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ea515c872b52e1c72734…

1 0

Nikolay Sivov : comctl32/monthcal: Get rid of goto jumps in hit test helper .
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 34fba5a2d2c0df771aa2cb4651ff06d2a26c8257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34fba5a2d2c0df771aa2cb465… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 18 16:16:33 2010 +0400 comctl32/monthcal: Get rid of goto jumps in hit test helper. --- dlls/comctl32/monthcal.c | 89 ++++++++++++++++++++++------------------------ 1 files changed, 43 insertions(+), 46 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 52b3bd4..d2245c3 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1618,17 +1618,16 @@ static INT MONTHCAL_GetCalendarFromPoint(const MONTHCAL_INFO *infoPtr, const POI static LRESULT MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) { - UINT x,y; - DWORD retval; INT day, wday, wnum, calIdx; SYSTEMTIME ht_month; + UINT x, y; if(!lpht || lpht->cbSize < MCHITTESTINFO_V1_SIZE) return -1; x = lpht->pt.x; y = lpht->pt.y; - ZeroMemory(&lpht->st, sizeof(lpht->st)); + memset(&lpht->st, 0, sizeof(lpht->st)); /* Comment in for debugging... TRACE("%d %d wd[%d %d %d %d] d[%d %d %d %d] t[%d %d %d %d] wn[%d %d %d %d]\n", x, y, @@ -1644,47 +1643,58 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) /* guess in what calendar we are */ calIdx = MONTHCAL_GetCalendarFromPoint(infoPtr, &lpht->pt); - if (calIdx == -1) goto nocal; + if (calIdx == -1) + { + if (PtInRect(&infoPtr->todayrect, lpht->pt)) + lpht->uHit = MCHT_TODAYLINK; + else + /* outside of calendar area? What's left must be background :-) */ + lpht->uHit = MCHT_CALENDARBK; + + return lpht->uHit; + } ht_month = infoPtr->calendars[calIdx].month; /* are we in the header? */ - - if(PtInRect(&infoPtr->calendars[calIdx].title, lpht->pt)) { + if (PtInRect(&infoPtr->calendars[calIdx].title, lpht->pt)) { /* FIXME: buttons hittesting could be optimized cause maximum two calendars have buttons */ - if(PtInRect(&infoPtr->titlebtnprev, lpht->pt)) { - retval = MCHT_TITLEBTNPREV; - goto done; + if (calIdx == 0 && PtInRect(&infoPtr->titlebtnprev, lpht->pt)) + { + lpht->uHit = MCHT_TITLEBTNPREV; } - if(PtInRect(&infoPtr->titlebtnnext, lpht->pt)) { - retval = MCHT_TITLEBTNNEXT; - goto done; + else if (PtInRect(&infoPtr->titlebtnnext, lpht->pt)) + { + lpht->uHit = MCHT_TITLEBTNNEXT; } - if(PtInRect(&infoPtr->calendars[calIdx].titlemonth, lpht->pt)) { - retval = MCHT_TITLEMONTH; - goto done; + else if (PtInRect(&infoPtr->calendars[calIdx].titlemonth, lpht->pt)) + { + lpht->uHit = MCHT_TITLEMONTH; } - if(PtInRect(&infoPtr->calendars[calIdx].titleyear, lpht->pt)) { - retval = MCHT_TITLEYEAR; - goto done; + else if (PtInRect(&infoPtr->calendars[calIdx].titleyear, lpht->pt)) + { + lpht->uHit = MCHT_TITLEYEAR; } + else + lpht->uHit = MCHT_TITLE; - retval = MCHT_TITLE; - goto done; + return lpht->uHit; } + /* days area (including week days and week numbers */ day = MONTHCAL_CalcDayFromPos(infoPtr, x, y, &wday, &wnum); - if(PtInRect(&infoPtr->calendars[calIdx].wdays, lpht->pt)) { - retval = MCHT_CALENDARDAY; + if (PtInRect(&infoPtr->calendars[calIdx].wdays, lpht->pt)) + { + lpht->uHit = MCHT_CALENDARDAY; lpht->st.wYear = ht_month.wYear; - lpht->st.wMonth = (day < 1)? ht_month.wMonth -1 : ht_month.wMonth; - lpht->st.wDay = (day < 1)? + lpht->st.wMonth = (day < 1) ? ht_month.wMonth -1 : ht_month.wMonth; + lpht->st.wDay = (day < 1) ? MONTHCAL_MonthLength(ht_month.wMonth-1, ht_month.wYear) - day : day; - goto done; } - if(PtInRect(&infoPtr->calendars[calIdx].weeknums, lpht->pt)) { - retval = MCHT_CALENDARWEEKNUM; + else if(PtInRect(&infoPtr->calendars[calIdx].weeknums, lpht->pt)) + { + lpht->uHit = MCHT_CALENDARWEEKNUM; lpht->st.wYear = ht_month.wYear; if (day < 1) { @@ -1704,46 +1714,33 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) } else lpht->st.wDay = day; - - goto done; } - if(PtInRect(&infoPtr->calendars[calIdx].days, lpht->pt)) + else if(PtInRect(&infoPtr->calendars[calIdx].days, lpht->pt)) { lpht->st.wYear = ht_month.wYear; lpht->st.wMonth = ht_month.wMonth; if (day < 1) { - retval = MCHT_CALENDARDATEPREV; + lpht->uHit = MCHT_CALENDARDATEPREV; MONTHCAL_GetPrevMonth(&lpht->st); lpht->st.wDay = MONTHCAL_MonthLength(lpht->st.wMonth, lpht->st.wYear) + day; } else if (day > MONTHCAL_MonthLength(ht_month.wMonth, ht_month.wYear)) { - retval = MCHT_CALENDARDATENEXT; + lpht->uHit = MCHT_CALENDARDATENEXT; MONTHCAL_GetNextMonth(&lpht->st); lpht->st.wDay = day - MONTHCAL_MonthLength(ht_month.wMonth, ht_month.wYear); } else { - retval = MCHT_CALENDARDATE; + lpht->uHit = MCHT_CALENDARDATE; lpht->st.wDay = day; } + /* always update day of week */ MONTHCAL_CalculateDayOfWeek(&lpht->st, TRUE); - goto done; } -nocal: - if(PtInRect(&infoPtr->todayrect, lpht->pt)) { - retval = MCHT_TODAYLINK; - goto done; - } - - /* Hit nothing special? What's left must be background :-) */ - retval = MCHT_CALENDARBK; - -done: - lpht->uHit = retval; - return retval; + return lpht->uHit; } /* MCN_GETDAYSTATE notification helper */

1 0