December 2011 - Wine-Commits

Ken Thomases : winex11: Have ToUnicodeEx null-terminate the output buffer, if there's room.
by Alexandre Julliard Dec. 20, 2011

Dec. 20, 2011

Module: wine Branch: master Commit: 3fa4da76ea2b3f2e91a42c0345e5764202a1e992 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa4da76ea2b3f2e91a42c034… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Dec 19 21:59:56 2011 -0600 winex11: Have ToUnicodeEx null-terminate the output buffer, if there's room. --- dlls/winex11.drv/keyboard.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index e985694..c561102 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2680,6 +2680,12 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState found: if (buf != lpChar) HeapFree(GetProcessHeap(), 0, lpChar); + + /* Null-terminate the buffer, if there's room. MSDN clearly states that the + caller must not assume this is done, but some programs (e.g. Audiosurf) do. */ + if (1 <= ret && ret < bufW_size) + bufW[ret] = 0; + TRACE_(key)("returning %d with %s\n", ret, debugstr_wn(bufW, ret)); return ret; }

1 0

Ken Thomases : comdlg32: Fix a leak.
by Alexandre Julliard Dec. 20, 2011

Dec. 20, 2011

Module: wine Branch: master Commit: c2f3c1114f9e597ba6c5385a0449d1d9778add3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2f3c1114f9e597ba6c5385a0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Dec 19 21:59:39 2011 -0600 comdlg32: Fix a leak. --- dlls/comdlg32/filedlg.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 9b725ba..43df312 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1529,8 +1529,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) lstrcpyW(fodInfos->filename,nameBit); *nameBit = 0x00; - if (fodInfos->initdir == NULL) - MemFree(fodInfos->initdir); + MemFree(fodInfos->initdir); fodInfos->initdir = MemAlloc((lstrlenW(tmpBuf) + 1)*sizeof(WCHAR)); lstrcpyW(fodInfos->initdir, tmpBuf); handledPath = TRUE;

1 0

Gerald Pfeifer : winedump: Remove unused parameter from codeview_dump_linetab(). codeview_dump_linetab().
by Alexandre Julliard Dec. 19, 2011

Dec. 19, 2011

Module: wine Branch: master Commit: 64de0876e4d635ac0e9c8a2d608ba5c246fce1f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64de0876e4d635ac0e9c8a2d6… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Dec 11 16:25:16 2011 +0800 winedump: Remove unused parameter from codeview_dump_linetab(). codeview_dump_linetab(). --- tools/winedump/msc.c | 2 +- tools/winedump/pdb.c | 2 +- tools/winedump/winedump.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index e56b4aa..932b6bb 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1383,7 +1383,7 @@ int codeview_dump_symbols(const void* root, unsigned long size) return 0; } -void codeview_dump_linetab(const char* linetab, DWORD size, BOOL pascal_str, const char* pfx) +void codeview_dump_linetab(const char* linetab, BOOL pascal_str, const char* pfx) { const char* ptr = linetab; int nfile, nseg, nline; diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 77d5643..7a0bd61 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -542,7 +542,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx /* line number info */ if (lineno_size) - codeview_dump_linetab((const char*)modimage + symbol_size, lineno_size, TRUE, " "); + codeview_dump_linetab((const char*)modimage + symbol_size, TRUE, " "); /* anyway, lineno_size doesn't see to really be the size of the line number information, and * it's not clear yet when to call for linetab2... */ diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 7141d0d..11f36f3 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -255,7 +255,7 @@ void fnt_dump( void ); int codeview_dump_symbols(const void* root, unsigned long size); int codeview_dump_types_from_offsets(const void* table, const DWORD* offsets, unsigned num_types); int codeview_dump_types_from_block(const void* table, unsigned long len); -void codeview_dump_linetab(const char* linetab, DWORD size, BOOL pascal_str, const char* pfx); +void codeview_dump_linetab(const char* linetab, BOOL pascal_str, const char* pfx); void codeview_dump_linetab2(const char* linetab, DWORD size, const char* strimage, DWORD strsize, const char* pfx); void dump_stabs(const void* pv_stabs, unsigned szstabs, const char* stabstr, unsigned szstr);

1 0

Alexandre Julliard : wordpad: Merge accelerators into the main resource file.
by Alexandre Julliard Dec. 19, 2011

Dec. 19, 2011

Module: wine Branch: master Commit: d9d4a06ca703fffa27c6d0a2e6220afe921a0bed URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d4a06ca703fffa27c6d0a2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 19 20:14:23 2011 +0100 wordpad: Merge accelerators into the main resource file. --- programs/wordpad/En.rc | 45 ------------------------------------------ programs/wordpad/Makefile.in | 5 +--- programs/wordpad/wordpad.rc | 24 ++++++++++++++++++++++ 3 files changed, 25 insertions(+), 49 deletions(-) diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc deleted file mode 100644 index 8ce359b..0000000 --- a/programs/wordpad/En.rc +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2004 by Krzysztof Foltman - * - * 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 "wordpad.h" - -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - -MAINACCELTABLE ACCELERATORS -BEGIN - "1", ID_BACK_1, VIRTKEY, CONTROL - "2", ID_BACK_2, VIRTKEY, CONTROL - "L", ID_ALIGN_LEFT, VIRTKEY, CONTROL - "E", ID_ALIGN_CENTER, VIRTKEY, CONTROL - "R", ID_ALIGN_RIGHT, VIRTKEY, CONTROL - "F", ID_FIND, VIRTKEY, CONTROL - VK_F3, ID_FIND_NEXT, VIRTKEY - "H", ID_REPLACE, VIRTKEY, CONTROL - "A", ID_EDIT_SELECTALL, VIRTKEY, CONTROL - "X", ID_EDIT_CUT, VIRTKEY, CONTROL - "C", ID_EDIT_COPY, VIRTKEY, CONTROL - "Z", ID_EDIT_UNDO, VIRTKEY, CONTROL - "Y", ID_EDIT_REDO, VIRTKEY, CONTROL - "B", ID_FORMAT_BOLD, VIRTKEY, CONTROL - "I", ID_FORMAT_ITALIC, VIRTKEY, CONTROL - "U", ID_FORMAT_UNDERLINE,VIRTKEY, CONTROL - "N", ID_FILE_NEW, VIRTKEY, CONTROL - "O", ID_FILE_OPEN, VIRTKEY, CONTROL - "S", ID_FILE_SAVE, VIRTKEY, CONTROL - "P", ID_PRINT, VIRTKEY, CONTROL -END diff --git a/programs/wordpad/Makefile.in b/programs/wordpad/Makefile.in index aef445c..07e2328 100644 --- a/programs/wordpad/Makefile.in +++ b/programs/wordpad/Makefile.in @@ -11,10 +11,7 @@ C_SRCS = \ registry.c \ wordpad.c -RC_SRCS = \ - En.rc \ - wordpad.rc - +RC_SRCS = wordpad.rc PO_SRCS = wordpad.rc SVG_SRCS = \ diff --git a/programs/wordpad/wordpad.rc b/programs/wordpad/wordpad.rc index 67e0562..7e0460a 100644 --- a/programs/wordpad/wordpad.rc +++ b/programs/wordpad/wordpad.rc @@ -265,6 +265,30 @@ BEGIN LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END +MAINACCELTABLE ACCELERATORS +BEGIN + "1", ID_BACK_1, VIRTKEY, CONTROL + "2", ID_BACK_2, VIRTKEY, CONTROL + "L", ID_ALIGN_LEFT, VIRTKEY, CONTROL + "E", ID_ALIGN_CENTER, VIRTKEY, CONTROL + "R", ID_ALIGN_RIGHT, VIRTKEY, CONTROL + "F", ID_FIND, VIRTKEY, CONTROL + VK_F3, ID_FIND_NEXT, VIRTKEY + "H", ID_REPLACE, VIRTKEY, CONTROL + "A", ID_EDIT_SELECTALL, VIRTKEY, CONTROL + "X", ID_EDIT_CUT, VIRTKEY, CONTROL + "C", ID_EDIT_COPY, VIRTKEY, CONTROL + "Z", ID_EDIT_UNDO, VIRTKEY, CONTROL + "Y", ID_EDIT_REDO, VIRTKEY, CONTROL + "B", ID_FORMAT_BOLD, VIRTKEY, CONTROL + "I", ID_FORMAT_ITALIC, VIRTKEY, CONTROL + "U", ID_FORMAT_UNDERLINE,VIRTKEY, CONTROL + "N", ID_FILE_NEW, VIRTKEY, CONTROL + "O", ID_FILE_OPEN, VIRTKEY, CONTROL + "S", ID_FILE_SAVE, VIRTKEY, CONTROL + "P", ID_PRINT, VIRTKEY, CONTROL +END + LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: toolbar.bmp */

1 0

Alexandre Julliard : winefile: Merge accelerators into the main resource file.
by Alexandre Julliard Dec. 19, 2011

Dec. 19, 2011

Module: wine Branch: master Commit: 0185c471ec3ffd90b5deed86087012afc4356873 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0185c471ec3ffd90b5deed860… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 19 20:14:11 2011 +0100 winefile: Merge accelerators into the main resource file. --- programs/winefile/En.rc | 42 ----------------------------------------- programs/winefile/Makefile.in | 5 +--- programs/winefile/winefile.rc | 16 +++++++++++++++ 3 files changed, 17 insertions(+), 46 deletions(-) diff --git a/programs/winefile/En.rc b/programs/winefile/En.rc deleted file mode 100644 index ea43a05..0000000 --- a/programs/winefile/En.rc +++ /dev/null @@ -1,42 +0,0 @@ -/* - * WineFile - * English Language Support - * - * Copyright 2000 Martin Fuchs - * Copyright 2002 Steven Edwards - * Copyright 2002 Alexandre Julliard - * - * 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" - -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - -IDA_WINEFILE ACCELERATORS -{ - VK_F1, ID_HELP, VIRTKEY - VK_F5, ID_REFRESH, VIRTKEY - VK_F7, ID_FILE_MOVE, VIRTKEY - VK_F8, ID_FILE_COPY, VIRTKEY - VK_DELETE, ID_FILE_DELETE, VIRTKEY - VK_RETURN, ID_ACTIVATE, VIRTKEY - VK_RETURN, ID_EDIT_PROPERTIES, VIRTKEY, ALT -#ifndef _NO_EXTENSIONS - "X", ID_FILE_EXIT, VIRTKEY, ALT - "S", ID_VIEW_FULLSCREEN, VIRTKEY, SHIFT, CONTROL - VK_ADD, ID_PREFERRED_SIZES, VIRTKEY, CONTROL -#endif -} diff --git a/programs/winefile/Makefile.in b/programs/winefile/Makefile.in index d6e085b..1b1ce0d 100644 --- a/programs/winefile/Makefile.in +++ b/programs/winefile/Makefile.in @@ -7,10 +7,7 @@ C_SRCS = \ splitpath.c \ winefile.c -RC_SRCS = \ - En.rc \ - winefile.rc - +RC_SRCS = winefile.rc PO_SRCS = winefile.rc MANPAGE = winefile.man diff --git a/programs/winefile/winefile.rc b/programs/winefile/winefile.rc index 2384f3f..39686d8 100644 --- a/programs/winefile/winefile.rc +++ b/programs/winefile/winefile.rc @@ -188,6 +188,22 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,191,110,50,14 END +IDA_WINEFILE ACCELERATORS +{ + VK_F1, ID_HELP, VIRTKEY + VK_F5, ID_REFRESH, VIRTKEY + VK_F7, ID_FILE_MOVE, VIRTKEY + VK_F8, ID_FILE_COPY, VIRTKEY + VK_DELETE, ID_FILE_DELETE, VIRTKEY + VK_RETURN, ID_ACTIVATE, VIRTKEY + VK_RETURN, ID_EDIT_PROPERTIES, VIRTKEY, ALT +#ifndef _NO_EXTENSIONS + "X", ID_FILE_EXIT, VIRTKEY, ALT + "S", ID_VIEW_FULLSCREEN, VIRTKEY, SHIFT, CONTROL + VK_ADD, ID_PREFERRED_SIZES, VIRTKEY, CONTROL +#endif +} + LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: winefile.ico */

1 0

Alexandre Julliard : regedit: Merge accelerators into the main resource file.
by Alexandre Julliard Dec. 19, 2011

Dec. 19, 2011

Module: wine Branch: master Commit: 3dc628c63685a182accba2c77a8c2b80786a634d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dc628c63685a182accba2c77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 19 20:13:45 2011 +0100 regedit: Merge accelerators into the main resource file. --- programs/regedit/En.rc | 47 ------------------------------------------ programs/regedit/Makefile.in | 5 +--- programs/regedit/regedit.rc | 15 +++++++++++++ 3 files changed, 16 insertions(+), 51 deletions(-) diff --git a/programs/regedit/En.rc b/programs/regedit/En.rc deleted file mode 100644 index 60120e2..0000000 --- a/programs/regedit/En.rc +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Regedit resources - * - * Copyright 2002 Robert Dickenson - * - * 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" - -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - -IDC_REGEDIT ACCELERATORS -{ - "^F", ID_EDIT_FIND - "^P", ID_REGISTRY_PRINT - VK_DELETE, ID_EDIT_DELETE, VIRTKEY - VK_F1, ID_HELP_HELPTOPICS, VIRTKEY - VK_F2, ID_EDIT_RENAME, VIRTKEY - VK_F3, ID_EDIT_FINDNEXT, VIRTKEY - VK_F5, ID_VIEW_REFRESH, VIRTKEY -} - -/*****************************************************************/ - -/* - * TEXTINCLUDE - */ - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -/*****************************************************************/ diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in index f512017..5d08ebf 100644 --- a/programs/regedit/Makefile.in +++ b/programs/regedit/Makefile.in @@ -18,10 +18,7 @@ C_SRCS = \ regproc.c \ treeview.c -RC_SRCS = \ - En.rc \ - regedit.rc - +RC_SRCS = regedit.rc PO_SRCS = regedit.rc MANPAGE = regedit.man diff --git a/programs/regedit/regedit.rc b/programs/regedit/regedit.rc index ed080ad..4ddd3dc 100644 --- a/programs/regedit/regedit.rc +++ b/programs/regedit/regedit.rc @@ -311,6 +311,21 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,160,156,45,15,WS_GROUP END +/* + * Accelerators + */ + +IDC_REGEDIT ACCELERATORS +{ + "^F", ID_EDIT_FIND + "^P", ID_REGISTRY_PRINT + VK_DELETE, ID_EDIT_DELETE, VIRTKEY + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY + VK_F2, ID_EDIT_RENAME, VIRTKEY + VK_F3, ID_EDIT_FINDNEXT, VIRTKEY + VK_F5, ID_VIEW_REFRESH, VIRTKEY +} + /* define language neutral resources */ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

1 0

Michael Mc Donnell : d3dx9/tests: Add a D3DXValidMesh test.
by Alexandre Julliard Dec. 19, 2011

Dec. 19, 2011

Module: wine Branch: master Commit: 50f785ef11f59ea9dd709a2cd64a6c7372ec3cc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50f785ef11f59ea9dd709a2cd… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Sun Dec 11 17:38:20 2011 +0100 d3dx9/tests: Add a D3DXValidMesh test. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 7 +++ dlls/d3dx9_36/tests/mesh.c | 125 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 133 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 6cbc1a2..70ff3d9 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -300,7 +300,7 @@ @ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) @ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) @ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) -@ stub D3DXValidMesh(ptr ptr ptr) +@ stdcall D3DXValidMesh(ptr ptr ptr) @ stub D3DXValidPatchMesh(ptr ptr ptr ptr) @ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float) @ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index ec77a37..022e66d 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -5939,6 +5939,13 @@ error: return hr; } +HRESULT WINAPI D3DXValidMesh(LPD3DXMESH mesh, CONST DWORD *adjacency, LPD3DXBUFFER *errors_and_warnings) +{ + FIXME("(%p, %p, %p): stub\n", mesh, adjacency, *errors_and_warnings); + + return E_NOTIMPL; +} + static BOOL weld_float1(void *to, void *from, FLOAT epsilon) { FLOAT *v1 = to; diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 50e0e6b..af0a9e8 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -9930,6 +9930,130 @@ cleanup: free_test_context(test_context); } +static void test_valid_mesh(void) +{ + HRESULT hr; + struct test_context *test_context = NULL; + UINT i; + const DWORD options = D3DXMESH_32BIT | D3DXMESH_SYSTEMMEM; + const D3DVERTEXELEMENT9 declaration[] = + { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + D3DDECL_END() + }; + const unsigned int VERTS_PER_FACE = 3; + /* mesh0 (one face) + * + * 0--1 + * | / + * |/ + * 2 + */ + const D3DXVECTOR3 vertices0[] = + { + { 0.0f, 3.0f, 0.f}, + { 2.0f, 3.0f, 0.f}, + { 0.0f, 0.0f, 0.f}, + }; + const DWORD indices0[] = {0, 1, 2}; + const unsigned int num_vertices0 = ARRAY_SIZE(vertices0); + const unsigned int num_faces0 = ARRAY_SIZE(indices0) / VERTS_PER_FACE; + const DWORD adjacency0[] = {-1, -1, -1}; + const HRESULT exp_hr0 = D3D_OK; + /* mesh1 (Simple bow-tie) + * + * 0--1 1--3 + * | / \ | + * |/ \| + * 2 4 + */ + const D3DXVECTOR3 vertices1[] = + { + { 0.0f, 3.0f, 0.f}, + { 2.0f, 3.0f, 0.f}, + { 0.0f, 0.0f, 0.f}, + + { 4.0f, 3.0f, 0.f}, + { 4.0f, 0.0f, 0.f}, + }; + const DWORD indices1[] = {0, 1, 2, 1, 3, 4}; + const unsigned int num_vertices1 = ARRAY_SIZE(vertices1); + const unsigned int num_faces1 = ARRAY_SIZE(indices1) / VERTS_PER_FACE; + const DWORD adjacency1[] = {-1, -1, -1, -1, -1, -1}; + const HRESULT exp_hr1 = D3DXERR_INVALIDMESH; + /* Common mesh data */ + ID3DXMesh *mesh = NULL; + UINT vertex_size = sizeof(D3DXVECTOR3); + ID3DXBuffer *errors_and_warnings = NULL; + struct + { + const D3DXVECTOR3 *vertices; + const DWORD *indices; + const UINT num_vertices; + const UINT num_faces; + const DWORD *adjacency; + const HRESULT exp_hr; + } + tc[] = + { + { + vertices0, + indices0, + num_vertices0, + num_faces0, + adjacency0, + exp_hr0, + }, + { + vertices1, + indices1, + num_vertices1, + num_faces1, + adjacency1, + exp_hr1, + }, + }; + + test_context = new_test_context(); + if (!test_context) + { + skip("Couldn't create test context\n"); + goto cleanup; + } + + for (i = 0; i < ARRAY_SIZE(tc); i++) + { + hr = init_test_mesh(tc[i].num_faces, tc[i].num_vertices, + options, declaration, + test_context->device, &mesh, + tc[i].vertices, vertex_size, + tc[i].indices, NULL); + if (FAILED(hr)) + { + skip("Couldn't initialize test mesh %d. Got %x expected D3D_OK\n", i, hr); + goto cleanup; + } + + hr = D3DXValidMesh(mesh, tc[i].adjacency, &errors_and_warnings); + todo_wine ok(hr == tc[i].exp_hr, "D3DXValidMesh test case %d failed. " + "Got %x\n, expected %x\n", i, hr, tc[i].exp_hr); + + /* Note errors_and_warnings is deliberately not checked because that + * would require copying wast amounts of the text output. */ + if (errors_and_warnings) + { + ID3DXBuffer_Release(errors_and_warnings); + errors_and_warnings = NULL; + } + mesh->lpVtbl->Release(mesh); + mesh = NULL; + } + +cleanup: + if (mesh) mesh->lpVtbl->Release(mesh); + free_test_context(test_context); +} + START_TEST(mesh) { D3DXBoundProbeTest(); @@ -9954,4 +10078,5 @@ START_TEST(mesh) test_convert_point_reps_to_adjacency(); test_weld_vertices(); test_clone_mesh(); + test_valid_mesh(); }

1 0

Piotr Caban : msvcp90: Use macro to define RTTI data.
by Alexandre Julliard Dec. 19, 2011

Dec. 19, 2011

Module: wine Branch: master Commit: 9c65376dcf6aa7ff5996f3c9a7f67b51f08ed41d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c65376dcf6aa7ff5996f3c9a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 19 15:55:16 2011 +0100 msvcp90: Use macro to define RTTI data. --- dlls/msvcp90/exception.c | 216 +------------------------------------ dlls/msvcp90/ios.c | 153 ++------------------------- dlls/msvcp90/locale.c | 265 ++-------------------------------------------- dlls/msvcp90/msvcp90.h | 38 +++++++ 4 files changed, 59 insertions(+), 613 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c65376dcf6aa7ff5996f…

1 0

Piotr Caban : msvcp90: Added collate<char> constructors implementation.
by Alexandre Julliard Dec. 19, 2011

Dec. 19, 2011

Module: wine Branch: master Commit: 5761bb5d7d5c925db24d3f2cf404d96a89f55b0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5761bb5d7d5c925db24d3f2cf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 19 15:53:54 2011 +0100 msvcp90: Added collate<char> constructors implementation. --- dlls/msvcp90/locale.c | 71 ++++++++++++++++++++++++++++++++---------------- 1 files changed, 47 insertions(+), 24 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index dd35cac..438c7c7 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -652,14 +652,34 @@ locale_id collate_char_id = {0}; /* ??_7?$collate(a)D@std@@6B@ */ extern const vtable_ptr MSVCP_collate_char_vtable; +/* ?_Init@?$collate(a)D@std@@IAEXABV_Locinfo(a)2@@Z */ +/* ?_Init@?$collate(a)D@std@@IEAAXAEBV_Locinfo(a)2@@Z */ +DEFINE_THISCALL_WRAPPER(collate_char__Init, 8) +void __thiscall collate_char__Init(collate *this, const _Locinfo *locinfo) +{ + TRACE("(%p %p)\n", this, locinfo); + this->coll = _Locinfo__Getcoll(locinfo); +} + /* ??0?$collate(a)D@std@@IAE(a)PBDI@Z */ /* ??0?$collate(a)D@std@@IEAA(a)PEBD_K@Z */ DEFINE_THISCALL_WRAPPER(collate_char_ctor_name, 12) collate* __thiscall collate_char_ctor_name(collate *this, const char *name, MSVCP_size_t refs) { - FIXME("(%p %s %lu) stub\n", this, name, refs); + _Lockit lockit; + _Locinfo locinfo; + + TRACE("(%p %s %lu)\n", this, name, refs); + + locale_facet_ctor_refs(&this->facet, refs); this->facet.vtable = &MSVCP_collate_char_vtable; - return NULL; + + _Lockit_ctor_locktype(&lockit, _LOCK_LOCALE); + _Locinfo_ctor_cstr(&locinfo, name); + collate_char__Init(this, &locinfo); + _Locinfo_dtor(&locinfo); + _Lockit_dtor(&lockit); + return this; } /* ??0?$collate(a)D@std@@QAE(a)ABV_Locinfo@1(a)I@Z */ @@ -667,9 +687,12 @@ collate* __thiscall collate_char_ctor_name(collate *this, const char *name, MSVC DEFINE_THISCALL_WRAPPER(collate_char_ctor_locinfo, 12) collate* __thiscall collate_char_ctor_locinfo(collate *this, _Locinfo *locinfo, MSVCP_size_t refs) { - FIXME("(%p %p %lu) stub\n", this, locinfo, refs); + TRACE("(%p %p %lu)\n", this, locinfo, refs); + + locale_facet_ctor_refs(&this->facet, refs); this->facet.vtable = &MSVCP_collate_char_vtable; - return NULL; + collate_char__Init(this, locinfo); + return this; } /* ??0?$collate(a)D@std@@QAE(a)I@Z */ @@ -677,9 +700,7 @@ collate* __thiscall collate_char_ctor_locinfo(collate *this, _Locinfo *locinfo, DEFINE_THISCALL_WRAPPER(collate_char_ctor_refs, 8) collate* __thiscall collate_char_ctor_refs(collate *this, MSVCP_size_t refs) { - FIXME("(%p %lu) stub\n", this, refs); - this->facet.vtable = &MSVCP_collate_char_vtable; - return NULL; + return collate_char_ctor_name(this, "C", refs); } /* ??1?$collate(a)D@std@@MAE(a)XZ */ @@ -687,7 +708,7 @@ collate* __thiscall collate_char_ctor_refs(collate *this, MSVCP_size_t refs) DEFINE_THISCALL_WRAPPER(collate_char_dtor, 4) void __thiscall collate_char_dtor(collate *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); } DEFINE_THISCALL_WRAPPER(MSVCP_collate_char_vector_dtor, 8) @@ -715,25 +736,27 @@ collate* __thiscall MSVCP_collate_char_vector_dtor(collate *this, unsigned int f DEFINE_THISCALL_WRAPPER(collate_char_ctor, 4) collate* __thiscall collate_char_ctor(collate *this) { - FIXME("(%p) stub\n", this); - this->facet.vtable = &MSVCP_collate_char_vtable; - return NULL; + return collate_char_ctor_name(this, "C", 0); } /* ?_Getcat@?$collate(a)D@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$collate(a)D@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -MSVCP_size_t __cdecl collate_char__Getcat(const locale_facet **facet, const locale_facet *loc) +MSVCP_size_t __cdecl collate_char__Getcat(const locale_facet **facet, const locale *loc) { - FIXME("(%p %p) stub\n", facet, loc); - return 0; -} + TRACE("(%p %p)\n", facet, loc); -/* ?_Init@?$collate(a)D@std@@IAEXABV_Locinfo(a)2@@Z */ -/* ?_Init@?$collate(a)D@std@@IEAAXAEBV_Locinfo(a)2@@Z */ -DEFINE_THISCALL_WRAPPER(collate_char__Init, 8) -void __thiscall collate_char__Init(collate *this, const _Locinfo *locinfo) -{ - FIXME("(%p %p) stub\n", this, locinfo); + if(facet && !*facet) { + *facet = MSVCRT_operator_new(sizeof(collate)); + if(!*facet) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + return 0; + } + collate_char_ctor_name((collate*)*facet, + MSVCP_basic_string_char_c_str(&loc->ptr->name), 0); + } + + return LC_COLLATE; } /* ?do_compare@?$collate(a)D@std@@MBEHPBD000(a)Z */ @@ -928,7 +951,7 @@ collate* __thiscall collate_short_ctor(collate *this) /* ?_Getcat@?$collate(a)_W@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ /* ?_Getcat@?$collate(a)G@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$collate(a)G@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -MSVCP_size_t __cdecl collate_wchar__Getcat(const locale_facet **facet, const locale_facet *loc) +MSVCP_size_t __cdecl collate_wchar__Getcat(const locale_facet **facet, const locale *loc) { FIXME("(%p %p) stub\n", facet, loc); return 0; @@ -1296,7 +1319,7 @@ const char* __thiscall ctype_char__Widen_s(const ctype_char *this, /* ?_Getcat@?$ctype(a)D@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$ctype(a)D@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -MSVCP_size_t __cdecl ctype_char__Getcat(const locale_facet **facet, const locale_facet *loc) +MSVCP_size_t __cdecl ctype_char__Getcat(const locale_facet **facet, const locale *loc) { FIXME("(%p %p) stub\n", facet, loc); return 0; @@ -1730,7 +1753,7 @@ const char* __thiscall ctype_wchar__Widen_s(const ctype_wchar *this, /* ?_Getcat@?$ctype(a)_W@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ /* ?_Getcat@?$ctype(a)G@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$ctype(a)G@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -MSVCP_size_t __cdecl ctype_wchar__Getcat(const locale_facet **facet, const locale_facet *loc) +MSVCP_size_t __cdecl ctype_wchar__Getcat(const locale_facet **facet, const locale *loc) { FIXME("(%p %p) stub\n", facet, loc); return 0;

1 0

Piotr Caban : msvcp90: Reorder classes to avoid forward declarations.
by Alexandre Julliard Dec. 19, 2011

Dec. 19, 2011

Module: wine Branch: master Commit: 786ff410bc477d530f8e4bdf505ff515809529ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=786ff410bc477d530f8e4bdf5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 19 15:53:36 2011 +0100 msvcp90: Reorder classes to avoid forward declarations. --- dlls/msvcp90/locale.c | 2834 ++++++++++++++++++++++++------------------------ 1 files changed, 1417 insertions(+), 1417 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=786ff410bc477d530f8e4…

1 0