March 2006 - Wine-Commits - list.winehq.org

James Hawkins : advpack: Set hexe to a non-NULL value to test that the handle is NULL on return.
by Alexandre Julliard March 27, 2006

March 27, 2006

Module: wine Branch: refs/heads/master Commit: 2fb1ac86119510764a8bf8ab92a4618c53a87be3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2fb1ac86119510764a8bf8a… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 26 21:38:40 2006 -0600 advpack: Set hexe to a non-NULL value to test that the handle is NULL on return. --- dlls/advpack/install.c | 7 +++++++ dlls/advpack/tests/install.c | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 55c7703..ecf8a18 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -231,5 +231,12 @@ HRESULT WINAPI RunSetupCommandW(HWND hWn hWnd, debugstr_w(szCmdName), debugstr_w(szInfSection), debugstr_w(szDir), debugstr_w(lpszTitle), phEXE, dwFlags, pvReserved); + + if (!szCmdName || !szDir) + return E_INVALIDARG; + + if (!(dwFlags & RSC_FLAG_INF)) + *phEXE = NULL; + return E_UNEXPECTED; } diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index b8a14eb..6d0daae 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -55,7 +55,7 @@ static void test_RunSetupCommand() ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %ld\n", hr); /* try to run a non-existent exe */ - hexe = NULL; + hexe = (HANDLE)0xdeadbeef; hr = pRunSetupCommand(NULL, "idontexist.exe", "Install", "c:\\windows\\system32", "Title", &hexe, 0, NULL); todo_wine { @@ -66,7 +66,7 @@ static void test_RunSetupCommand() ok(!TerminateProcess(hexe, 0), "Expected TerminateProcess to fail\n"); /* try a bad directory */ - hexe = NULL; + hexe = (HANDLE)0xdeadbeef; hr = pRunSetupCommand(NULL, "winver.exe", "Install", "windows\\system32", "Title", &hexe, 0, NULL); todo_wine { @@ -77,17 +77,17 @@ static void test_RunSetupCommand() ok(!TerminateProcess(hexe, 0), "Expected TerminateProcess to fail\n"); /* try to run an exe with the RSC_FLAG_INF flag */ - hexe = NULL; + hexe = (HANDLE)0xdeadbeef; hr = pRunSetupCommand(NULL, "winver.exe", "Install", "c:\\windows\\system32", "Title", &hexe, RSC_FLAG_INF, NULL); todo_wine { ok(hr == SPAPI_E_WRONG_INF_STYLE, "Expected SPAPI_E_WRONG_INF_STYLE, got %ld\n", hr); } - ok(hexe == NULL, "Expected hexe to be NULL\n"); + ok(hexe == (HANDLE)0xdeadbeef, "Expected hexe to be 0xdeadbeef\n"); ok(!TerminateProcess(hexe, 0), "Expected TerminateProcess to fail\n"); /* run winver.exe */ - hexe = NULL; + hexe = (HANDLE)0xdeadbeef; hr = pRunSetupCommand(NULL, "winver.exe", "Install", "c:\\windows\\system32", "Title", &hexe, 0, NULL); todo_wine {

1 0

Mike McCormack : commdlg: Malformed filters are still added to the filter combo box.
by Alexandre Julliard March 27, 2006

March 27, 2006

Module: wine Branch: refs/heads/master Commit: 05eaadc1f771cf861c3cbebc6b8fd0d6fdaa542b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=05eaadc1f771cf861c3cbeb… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Mar 26 11:35:52 2006 +0900 commdlg: Malformed filters are still added to the filter combo box. --- dlls/commdlg/filedlg.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/commdlg/filedlg.c b/dlls/commdlg/filedlg.c index a3a4c83..428841f 100644 --- a/dlls/commdlg/filedlg.c +++ b/dlls/commdlg/filedlg.c @@ -2367,16 +2367,19 @@ static HRESULT FILEDLG95_FILETYPE_Init(H lpstrDisplay = lpstrPos; lpstrPos += strlenW(lpstrPos) + 1; + CBAddStringW(fodInfos->DlgInfos.hwndFileTypeCB, lpstrDisplay); + + nFilters++; + /* malformed filters are added anyway... */ + if (!*lpstrPos) break; + /* Copy the extensions */ - if (! *lpstrPos) return E_FAIL; /* malformed filter */ if (!(lpstrExt = MemAlloc((strlenW(lpstrPos)+1)*sizeof(WCHAR)))) return E_FAIL; strcpyW(lpstrExt,lpstrPos); lpstrPos += strlenW(lpstrPos) + 1; /* Add the item at the end of the combo */ - CBAddStringW(fodInfos->DlgInfos.hwndFileTypeCB, lpstrDisplay); - CBSetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, nFilters, lpstrExt); - nFilters++; + CBSetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, nFilters-1, lpstrExt); } }

1 0

Mike McCormack : comctl32: Having an MRU list without a compare function works in Windows.
by Alexandre Julliard March 27, 2006

March 27, 2006

Module: wine Branch: refs/heads/master Commit: 316e5835a02cc761336983ac0c4a5aa4270cbcd9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=316e5835a02cc761336983a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Mar 26 11:35:29 2006 +0900 comctl32: Having an MRU list without a compare function works in Windows. --- dlls/comctl32/comctl32undoc.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c index aa79f88..2812e34 100644 --- a/dlls/comctl32/comctl32undoc.c +++ b/dlls/comctl32/comctl32undoc.c @@ -386,10 +386,8 @@ INT WINAPI FindMRUData (HANDLE hList, LP UINT i; LPSTR dataA = NULL; - if (!mp->extview.lpfnCompare) { - ERR("MRU list not properly created. No compare procedure.\n"); + if (!mp->extview.lpfnCompare) return -1; - } if(!(mp->extview.dwFlags & MRUF_BINARY_LIST) && !mp->isUnicode) { DWORD len = WideCharToMultiByte(CP_ACP, 0, lpData, -1,

1 0

H. Verbeet : msvcrt: Fix reading of signed numbers with unsigned read types in scanf.
by Alexandre Julliard March 27, 2006

March 27, 2006

Module: wine Branch: refs/heads/master Commit: 8c29b7dc8ba584fb72cc12d9f405a1920aea95e8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8c29b7dc8ba584fb72cc12d… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sun Mar 26 04:10:28 2006 +0200 msvcrt: Fix reading of signed numbers with unsigned read types in scanf. --- dlls/msvcrt/scanf.h | 35 +++++++++++------------------------ dlls/msvcrt/tests/scanf.c | 25 +++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 24 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 4c27c68..ad3245d 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -114,7 +114,7 @@ _FUNCTION_ { * the form %[*][width][{h | l | I64 | L}]type */ else if (*format == '%') { int st = 0; int suppress = 0; int width = 0; - int base, number_signed; + int base; int h_prefix = 0; int l_prefix = 0; int L_prefix = 0; @@ -157,19 +157,19 @@ _FUNCTION_ { switch(*format) { case 'x': case 'X': /* hexadecimal integer. */ - base = 16; number_signed = 0; + base = 16; goto number; case 'o': /* octal integer */ - base = 8; number_signed = 0; + base = 8; goto number; case 'u': /* unsigned decimal integer */ - base = 10; number_signed = 0; + base = 10; goto number; case 'd': /* signed decimal integer */ - base = 10; number_signed = 1; + base = 10; goto number; case 'i': /* generic integer */ - base = 10; number_signed = 1; + base = 10; number: { /* read an integer */ ULONGLONG cur = 0; @@ -179,8 +179,7 @@ _FUNCTION_ { while ((nch!=_EOF_) && _ISSPACE_(nch)) nch = _GETC_(file); /* get sign */ - if (number_signed && (nch == '-' || - nch == '+')) { + if (nch == '-' || nch == '+') { negative = (nch=='-'); nch = _GETC_(file); if (width>0) width--; @@ -225,22 +224,10 @@ _FUNCTION_ { st = 1; if (!suppress) { #define _SET_NUMBER_(type) *va_arg(ap, type*) = negative ? -cur : cur - if (number_signed) { - if (I64_prefix) _SET_NUMBER_(LONGLONG); - else if (l_prefix) _SET_NUMBER_(long int); - else if (h_prefix) _SET_NUMBER_(short int); - else _SET_NUMBER_(int); - } else { - if (negative) { - WARN("Dropping sign in reading a negative number into an unsigned value"); - negative = 0; - } - if (I64_prefix) _SET_NUMBER_(ULONGLONG); - else if (l_prefix) _SET_NUMBER_(unsigned long int); - else if (h_prefix) - _SET_NUMBER_(unsigned short int); - else _SET_NUMBER_(unsigned int); - } + if (I64_prefix) _SET_NUMBER_(LONGLONG); + else if (l_prefix) _SET_NUMBER_(long int); + else if (h_prefix) _SET_NUMBER_(short int); + else _SET_NUMBER_(int); } } break; diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 2482825..d90a3bd 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -52,6 +52,11 @@ static void test_sscanf( void ) ok( sscanf(buffer, "%x", &result) == 1, "sscanf failed\n" ); ok( result == 0x51, "sscanf reads %x instead of %x\n", result, 0x51 ); + result = 0; + ret = sscanf("-1", "%x", &result); + ok(ret == 1, "Wrong number of arguments read: %d (expected 1)\n", ret); + ok(result == -1, "Read %d, expected -1\n", result); + /* check % followed by any char */ strcpy(buffer,"\"%12@"); strcpy(format,"%\"%%%d%@"); /* work around gcc format check */ @@ -93,9 +98,29 @@ static void test_sscanf( void ) ret = sscanf(buffer, "%i", &result); ok(ret == 1, "Wrong number of arguments read: %d\n", ret); ok(result == 123, "Wrong number read\n"); + result = 0; + ret = sscanf("-1", "%i", &result); + ok(ret == 1, "Wrong number of arguments read: %d (expected 1)\n", ret); + ok(result == -1, "Read %d, expected -1\n", result); ret = sscanf(buffer, "%d", &result); ok(ret == 1, "Wrong number of arguments read: %d\n", ret); ok(result == 123, "Wrong number read\n"); + result = 0; + ret = sscanf("-1", "%d", &result); + ok(ret == 1, "Wrong number of arguments read: %d (expected 1)\n", ret); + ok(result == -1, "Read %d, expected -1\n", result); + + /* %o */ + result = 0; + ret = sscanf("-1", "%o", &result); + ok(ret == 1, "Wrong number of arguments read: %d (expected 1)\n", ret); + ok(result == -1, "Read %d, expected -1\n", result); + + /* %u */ + result = 0; + ret = sscanf("-1", "%u", &result); + ok(ret == 1, "Wrong number of arguments read: %d (expected 1)\n", ret); + ok(result == -1, "Read %d, expected -1\n", result); /* Check %c */ strcpy(buffer,"a");

1 0

Alexandre Julliard : msvcrt: Fix fflush() of files opened for read.
by Alexandre Julliard March 27, 2006

March 27, 2006

Module: wine Branch: refs/heads/master Commit: 19a088202a21bbc9d77103d3ee5f696d6a08defc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=19a088202a21bbc9d77103d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 24 16:53:12 2006 +0000 msvcrt: Fix fflush() of files opened for read. Some apps, for no particular reason, call fflush() on files opened for read. This keeps them from tripping over their shoelaces. --- dlls/msvcrt/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 9162ee7..0a99cce 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -588,11 +588,11 @@ int MSVCRT_fflush(MSVCRT_FILE* file) { if(!file) { _flushall(); - return 0; - } else { + } else if(file->_flag & MSVCRT__IOWRT) { int res=msvcrt_flush_buffer(file); return res; } + return 0; } /*********************************************************************

1 0

Tomas Carnecky : opengl: Put OpenGL setup functions into their own debug channel.
by Alexandre Julliard March 27, 2006

March 27, 2006

Module: wine Branch: refs/heads/master Commit: 56de92d795fa250c2a35d89189ce6543951333b7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=56de92d795fa250c2a35d89… Author: Tomas Carnecky <tom(a)dbservice.com> Date: Sat Mar 25 13:07:23 2006 +0100 opengl: Put OpenGL setup functions into their own debug channel. --- dlls/opengl32/wgl.c | 5 +++-- dlls/opengl32/wgl_ext.c | 2 +- dlls/x11drv/opengl.c | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 71f7511..c7d3147 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -44,7 +44,8 @@ #include "wine/library.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(opengl); +WINE_DEFAULT_DEBUG_CHANNEL(wgl); +WINE_DECLARE_DEBUG_CHANNEL(opengl); /** global glx object */ wine_glx_t wine_glx; @@ -698,7 +699,7 @@ BOOL WINAPI wglShareLists(HGLRC hglrc1, */ BOOL WINAPI wglSwapLayerBuffers(HDC hdc, UINT fuPlanes) { - TRACE("(%p, %08x)\n", hdc, fuPlanes); + TRACE_(opengl)("(%p, %08x)\n", hdc, fuPlanes); if (fuPlanes & WGL_SWAP_MAIN_PLANE) { if (!SwapBuffers(hdc)) return FALSE; diff --git a/dlls/opengl32/wgl_ext.c b/dlls/opengl32/wgl_ext.c index 24e990d..624a82c 100644 --- a/dlls/opengl32/wgl_ext.c +++ b/dlls/opengl32/wgl_ext.c @@ -37,7 +37,7 @@ #include "wine/library.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(opengl); +WINE_DEFAULT_DEBUG_CHANNEL(wgl); /* x11drv GDI escapes */ diff --git a/dlls/x11drv/opengl.c b/dlls/x11drv/opengl.c index 3fc0231..ba125b9 100644 --- a/dlls/x11drv/opengl.c +++ b/dlls/x11drv/opengl.c @@ -28,7 +28,8 @@ #include "wine/library.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(opengl); +WINE_DEFAULT_DEBUG_CHANNEL(wgl); +WINE_DECLARE_DEBUG_CHANNEL(opengl); #if defined(HAVE_GL_GL_H) && defined(HAVE_GL_GLX_H) @@ -533,7 +534,7 @@ BOOL X11DRV_SwapBuffers(X11DRV_PDEVICE * return 0; } - TRACE("(%p)\n", physDev); + TRACE_(opengl)("(%p)\n", physDev); wine_tsx11_lock(); pglXSwapBuffers(gdi_display, physDev->drawable);

1 0

Eric Pouech : winedbg: Fixes for identifiers.
by Alexandre Julliard March 27, 2006

March 27, 2006

Module: wine Branch: refs/heads/master Commit: f661e7a924293a574c894ac7706324b2e49c6ceb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f661e7a924293a574c894ac… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Mar 25 10:12:45 2006 +0100 winedbg: Fixes for identifiers. - fixed lexical rules for a path name - fixed identifier rules so that we get the right precedence between ! and :: - modules (in mod!name forms) are now handled as tIDENTIFIER (tPATH was buggy anyhow) --- programs/winedbg/dbg.y | 12 ++++++++---- programs/winedbg/debug.l | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index ecbb3fa..987a315 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -86,7 +86,7 @@ int yyerror(const char*); %type <expression> expr lvalue %type <lvalue> expr_lvalue lvalue_addr %type <integer> expr_rvalue -%type <string> pathname identifier +%type <string> pathname identifier cpp_identifier %type <listing> list_arg %type <type> type_expr @@ -162,14 +162,18 @@ pathname: | tPATH { $$ = $1; } ; -identifier: +cpp_identifier: tIDENTIFIER { $$ = $1; } - | tPATH '!' tIDENTIFIER { $$ = lexeme_alloc_size(strlen($1) + 1 + strlen($3) + 1); - sprintf($$, "%s!%s", $1, $3); } | identifier OP_SCOPE tIDENTIFIER { $$ = lexeme_alloc_size(strlen($1) + 2 + strlen($3) + 1); sprintf($$, "%s::%s", $1, $3); } ; +identifier: + cpp_identifier { $$ = $1; } + | tIDENTIFIER '!' cpp_identifier { $$ = lexeme_alloc_size(strlen($1) + 1 + strlen($3) + 1); + sprintf($$, "%s!%s", $1, $3); } + ; + list_arg: tNUM { $$.FileName = NULL; $$.LineNumber = $1; } | pathname ':' tNUM { $$.FileName = $1; $$.LineNumber = $3; } diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index dd18a89..0a14e9a 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -77,7 +77,7 @@ DIGIT [0-9] HEXDIGIT [0-9a-fA-F] FORMAT [ubcdgiswx] IDENTIFIER [_a-zA-Z~?][_a-zA-Z0-9~?@]* -PATHNAME [-/_a-zA-Z\.~][-/_a-zA-Z0-9\.~@]* +PATHNAME [\\/-_a-zA-Z0-9\.~@]+ STRING \"[^\n"]+\" %s FORMAT_EXPECTED

1 0

Eric Pouech : dbghelp: Module should be case insensitive.
by Alexandre Julliard March 27, 2006

March 27, 2006

Module: wine Branch: refs/heads/master Commit: 983d8aea3ec335d9676ea2b7ac00f4885227b801 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=983d8aea3ec335d9676ea2b… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Mar 25 10:12:57 2006 +0100 dbghelp: Module should be case insensitive. When looking up a symbol name in the form module!name, the module lookup should be insensitive. --- dlls/dbghelp/symbol.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 6458a6e..091845d 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -797,8 +797,7 @@ BOOL WINAPI SymEnumSymbols(HANDLE hProce if (bang == Mask) return FALSE; - compile_regex(Mask, bang - Mask, &mod_regex, - dbghelp_options & SYMOPT_CASE_INSENSITIVE); + compile_regex(Mask, bang - Mask, &mod_regex, TRUE); compile_regex(bang + 1, -1, &sym_regex, dbghelp_options & SYMOPT_CASE_INSENSITIVE);

1 0

Stefan Dösinger : wined3d: Add WINED3DMULTISAMPLE_TYPE to wined3d_types.h.
by Alexandre Julliard March 27, 2006

March 27, 2006

Module: wine Branch: refs/heads/master Commit: b4b295c2a57c9d0750015adba13df249f6f0a14d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b4b295c2a57c9d0750015ad… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Mar 24 17:34:26 2006 +0100 wined3d: Add WINED3DMULTISAMPLE_TYPE to wined3d_types.h. --- dlls/d3d8/cubetexture.c | 2 + dlls/d3d8/d3d8_private.h | 4 +- dlls/d3d8/device.c | 4 +- dlls/d3d8/directx.c | 8 ++-- dlls/d3d8/surface.c | 2 + dlls/d3d8/texture.c | 2 + dlls/d3d9/cubetexture.c | 2 + dlls/d3d9/d3d9_private.h | 4 +- dlls/d3d9/device.c | 2 + dlls/d3d9/directx.c | 6 ++- dlls/d3d9/surface.c | 2 + dlls/d3d9/swapchain.c | 4 +- dlls/d3d9/texture.c | 2 + dlls/wined3d/device.c | 2 + dlls/wined3d/directx.c | 4 +- dlls/wined3d/wined3d_private.h | 8 ++-- include/wine/wined3d_interface.h | 8 ++-- include/wine/wined3d_types.h | 70 +++++++++++++++++++++++++------------- 18 files changed, 79 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b4b295c2a57c9d07500…

1 0

Stefan Dösinger : wined3d: Add WINED3DTRIPATCH_INFO to wined3d_types.h.
by Alexandre Julliard March 27, 2006

March 27, 2006

Module: wine Branch: refs/heads/master Commit: 0f7eb52789a9265a2700c3f1f7cacc1056835f3f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0f7eb52789a9265a2700c3f… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Mar 24 16:06:28 2006 +0100 wined3d: Add WINED3DTRIPATCH_INFO to wined3d_types.h. --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/wined3d/device.c | 2 +- include/wine/wined3d_interface.h | 2 +- include/wine/wined3d_types.h | 8 ++++++++ 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 525ded9..0d668b9 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1325,7 +1325,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_Draw IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_DrawTriPatch(This->WineD3DDevice, Handle, pNumSegs, pTriPatchInfo); + return IWineD3DDevice_DrawTriPatch(This->WineD3DDevice, Handle, pNumSegs, (WINED3DTRIPATCH_INFO *)pTriPatchInfo); } HRESULT WINAPI IDirect3DDevice8Impl_DeletePatch(LPDIRECT3DDEVICE8 iface, UINT Handle) { diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index c61bf15..a134d59 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -802,7 +802,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_Dr HRESULT WINAPI IDirect3DDevice9Impl_DrawTriPatch(LPDIRECT3DDEVICE9 iface, UINT Handle, CONST float* pNumSegs, CONST D3DTRIPATCH_INFO* pTriPatchInfo) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_DrawTriPatch(This->WineD3DDevice, Handle, pNumSegs, pTriPatchInfo); + return IWineD3DDevice_DrawTriPatch(This->WineD3DDevice, Handle, pNumSegs, (WINED3DTRIPATCH_INFO *) pTriPatchInfo); } HRESULT WINAPI IDirect3DDevice9Impl_DeletePatch(LPDIRECT3DDEVICE9 iface, UINT Handle) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1a55b8e..b0ea82b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5819,7 +5819,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_DrawRe } /* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… */ -HRESULT WINAPI IWineD3DDeviceImpl_DrawTriPatch(IWineD3DDevice *iface, UINT Handle, CONST float* pNumSegs, CONST D3DTRIPATCH_INFO* pTriPatchInfo) { +HRESULT WINAPI IWineD3DDeviceImpl_DrawTriPatch(IWineD3DDevice *iface, UINT Handle, CONST float* pNumSegs, CONST WINED3DTRIPATCH_INFO* pTriPatchInfo) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("(%p) Handle(%d) noSegs(%p) tripatch(%p)\n", This, Handle, pNumSegs, pTriPatchInfo); FIXME("(%p) : Stub\n", This); diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 255ecea..c4494f6 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -416,7 +416,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD STDMETHOD(DrawPrimitiveUP)(THIS_ D3DPRIMITIVETYPE PrimitiveType,UINT PrimitiveCount,CONST void * pVertexStreamZeroData,UINT VertexStreamZeroStride) PURE; STDMETHOD(DrawIndexedPrimitiveUP)(THIS_ D3DPRIMITIVETYPE PrimitiveType,UINT MinVertexIndex,UINT NumVertexIndices,UINT PrimitiveCount,CONST void * pIndexData,WINED3DFORMAT IndexDataFormat,CONST void * pVertexStreamZeroData,UINT VertexStreamZeroStride) PURE; STDMETHOD(DrawRectPatch)(THIS_ UINT Handle, CONST float* pNumSegs, CONST WINED3DRECTPATCH_INFO* pRectPatchInfo) PURE; - STDMETHOD(DrawTriPatch)(THIS_ UINT Handle, CONST float* pNumSegs, CONST D3DTRIPATCH_INFO* pTriPatchInfo) PURE; + STDMETHOD(DrawTriPatch)(THIS_ UINT Handle, CONST float* pNumSegs, CONST WINED3DTRIPATCH_INFO* pTriPatchInfo) PURE; STDMETHOD(DeletePatch)(THIS_ UINT Handle) PURE; STDMETHOD(ColorFill)(THIS_ struct IWineD3DSurface* pSurface, CONST D3DRECT* pRect, D3DCOLOR color) PURE; STDMETHOD(UpdateTexture)(THIS_ struct IWineD3DBaseTexture *pSourceTexture, struct IWineD3DBaseTexture *pDestinationTexture) PURE; diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 3c76715..e26ac21 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -5,6 +5,7 @@ * Copyright 2002-2003 Jason Edmeades * Raphael Junqueira * Copyright 2005 Oliver Stieber + * Copyright 2006 Stefan D�singer * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -428,6 +429,13 @@ typedef struct _WINEDD3DRECTPATCH_INFO { WINED3DDEGREETYPE Degree; } WINED3DRECTPATCH_INFO; +typedef struct _WINED3DTRIPATCH_INFO { + UINT StartVertexOffset; + UINT NumVertices; + WINED3DBASISTYPE Basis; + WINED3DDEGREETYPE Degree; +} WINED3DTRIPATCH_INFO; + typedef struct _WINED3DADAPTER_IDENTIFIER { char *Driver;

1 0