September 2010 - Wine-commits

Hwang YunSong : ipconfig: Update Korean resource.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 38e1b22d4ba83ab59145bbc2dfdc346ae3c2a0e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38e1b22d4ba83ab59145bbc2d… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Sep 8 17:17:07 2010 +0900 ipconfig: Update Korean resource. --- programs/ipconfig/Ko.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/Ko.rc b/programs/ipconfig/Ko.rc index 9f9f7aa..dae65d4 100644 --- a/programs/ipconfig/Ko.rc +++ b/programs/ipconfig/Ko.rc @@ -45,4 +45,6 @@ STRINGTABLE STRING_DESCRIPTION, "설명" STRING_PHYS_ADDR, "물리 주소" STRING_DHCP_ENABLED, "DHCP 가능" + STRING_YES, "예" + STRING_NO, "아니오" }

1 0

Jason Edmeades : cmd: Make tests supply stderr + more diagnostics.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 199b2db50209e9aecb51b6f5fa04f9e38de45940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=199b2db50209e9aecb51b6f5f… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Tue Sep 7 15:59:41 2010 -0700 cmd: Make tests supply stderr + more diagnostics. --- programs/cmd/tests/batch.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 9e93a01..cc8c020 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -31,7 +31,7 @@ static BOOL run_cmd(const char *cmd_data, DWORD cmd_size) char command[] = "test.cmd"; STARTUPINFOA si = {sizeof(si)}; PROCESS_INFORMATION pi; - HANDLE file; + HANDLE file,fileerr; DWORD size; BOOL bres; @@ -53,8 +53,15 @@ static BOOL run_cmd(const char *cmd_data, DWORD cmd_size) if(file == INVALID_HANDLE_VALUE) return FALSE; + fileerr = CreateFileA("test.err", GENERIC_WRITE, FILE_SHARE_WRITE|FILE_SHARE_READ, &sa, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(fileerr != INVALID_HANDLE_VALUE, "CreateFile stderr failed\n"); + if(fileerr == INVALID_HANDLE_VALUE) + return FALSE; + si.dwFlags = STARTF_USESTDHANDLES; si.hStdOutput = file; + si.hStdError = fileerr; bres = CreateProcessA(NULL, command, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi); ok(bres, "CreateProcess failed: %u\n", GetLastError()); if(!bres) { @@ -66,6 +73,7 @@ static BOOL run_cmd(const char *cmd_data, DWORD cmd_size) CloseHandle(pi.hThread); CloseHandle(pi.hProcess); CloseHandle(file); + CloseHandle(fileerr); DeleteFileA("test.cmd"); return TRUE; } @@ -185,8 +193,8 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da exp_ptr++; } - ok(exp_ptr >= exp_data+exp_size, "unexpected end of output in line %d, expected 0x%x\n", line, *exp_ptr); - ok(out_ptr >= out_data+out_size, "too long output\n"); + ok(exp_ptr >= exp_data+exp_size, "unexpected end of output in line %d, missing %s\n", line, exp_ptr); + ok(out_ptr >= out_data+out_size, "too long output, got additional %s\n", out_ptr); } static void run_test(const char *cmd_data, DWORD cmd_size, const char *exp_data, DWORD exp_size) @@ -203,6 +211,7 @@ static void run_test(const char *cmd_data, DWORD cmd_size, const char *exp_data, UnmapViewOfFile(out_data); } DeleteFileA("test.out"); + DeleteFileA("test.err"); } static void run_from_file(char *file_name)

1 0

Damjan Jovanovic : windowscodecs: Test that ICO GetSize returns the BITMAPINFOHEADER size instead of the ICONDIRENTRY size .
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: f68333cb6b35fe19421e856f5f1103a3b1aee2a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f68333cb6b35fe19421e856f5… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Sep 8 09:45:37 2010 +0200 windowscodecs: Test that ICO GetSize returns the BITMAPINFOHEADER size instead of the ICONDIRENTRY size. --- dlls/windowscodecs/tests/Makefile.in | 1 + dlls/windowscodecs/tests/icoformat.c | 159 ++++++++++++++++++++++++++++++++++ 2 files changed, 160 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/Makefile.in b/dlls/windowscodecs/tests/Makefile.in index e274d3c..165f935 100644 --- a/dlls/windowscodecs/tests/Makefile.in +++ b/dlls/windowscodecs/tests/Makefile.in @@ -8,6 +8,7 @@ IMPORTS = ole32 windowscodecs C_SRCS = \ bmpformat.c \ converter.c \ + icoformat.c \ info.c \ palette.c \ stream.c diff --git a/dlls/windowscodecs/tests/icoformat.c b/dlls/windowscodecs/tests/icoformat.c new file mode 100644 index 0000000..dc34f40 --- /dev/null +++ b/dlls/windowscodecs/tests/icoformat.c @@ -0,0 +1,159 @@ +/* + * Copyright 2010 Damjan Jovanovic + * + * 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 <math.h> + +#define COBJMACROS + +#include "windef.h" +#include "objbase.h" +#include "wincodec.h" +#include "wine/test.h" + +static unsigned char testico_bad_icondirentry_size[] = { + /* ICONDIR */ + 0, 0, /* reserved */ + 1, 0, /* type */ + 1, 0, /* count */ + /* ICONDIRENTRY */ + 2, /* width */ + 2, /* height */ + 2, /* colorCount */ + 0, /* reserved */ + 1,0, /* planes */ + 8,0, /* bitCount */ + (40+2*4+16*16+16*4) & 0xFF,((40+2*4+16*16+16*4) >> 8) & 0xFF,0,0, /* bytesInRes */ + 22,0,0,0, /* imageOffset */ + /* BITMAPINFOHEADER */ + 40,0,0,0, /* header size */ + 16,0,0,0, /* width */ + 2*16,0,0,0, /* height (XOR+AND rows) */ + 1,0, /* planes */ + 8,0, /* bit count */ + 0,0,0,0, /* compression */ + 0,0,0,0, /* sizeImage */ + 0,0,0,0, /* x pels per meter */ + 0,0,0,0, /* y pels per meter */ + 2,0,0,0, /* clrUsed */ + 0,0,0,0, /* clrImportant */ + /* palette */ + 0,0,0,0, + 0xFF,0xFF,0xFF,0, + /* XOR mask */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0, + 0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0, + 0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0, + 0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0, + 0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0, + 0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0, + 0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0, + 0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0, + 0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,0, + 0,0,0,0,1,0,1,0,1,0,1,0,0,0,0,0, + 0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + /* AND mask */ + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0 +}; + +static void test_bad_icondirentry_size(void) +{ + IWICBitmapDecoder *decoder; + IWICImagingFactory *factory; + HRESULT hr; + IWICStream *icostream; + IWICBitmapFrameDecode *framedecode = NULL; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void**)&factory); + ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + if (FAILED(hr)) return; + + hr = IWICImagingFactory_CreateStream(factory, &icostream); + ok(hr == S_OK, "CreateStream failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICStream_InitializeFromMemory(icostream, testico_bad_icondirentry_size, + sizeof(testico_bad_icondirentry_size)); + ok(hr == S_OK, "InitializeFromMemory failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + { + hr = CoCreateInstance(&CLSID_WICIcoDecoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapDecoder, (void**)&decoder); + ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + } + + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_Initialize(decoder, (IStream*)icostream, + WICDecodeMetadataCacheOnDemand); + ok(hr == S_OK, "Initialize failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &framedecode); + ok(hr == S_OK, "GetFrame failed, hr=%x\n", hr); + } + + if (SUCCEEDED(hr)) + { + UINT width = 0, height = 0; + hr = IWICBitmapFrameDecode_GetSize(framedecode, &width, &height); + ok(hr == S_OK, "GetFrameSize failed, hr=%x\n", hr); + todo_wine ok(width == 16 && height == 16, "framesize=%ux%u\n", width, height); + IWICBitmapFrameDecode_Release(framedecode); + } + + IWICBitmapDecoder_Release(decoder); + } + + IWICStream_Release(icostream); + } + + IWICImagingFactory_Release(factory); +} + +START_TEST(icoformat) +{ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + test_bad_icondirentry_size(); + + CoUninitialize(); +}

1 0

Sven Baars : ipconfig: Update the Dutch translation.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: d7d61dacc18e72360946577d644cd9060f9d6924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7d61dacc18e72360946577d6… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue Sep 7 23:07:52 2010 +0200 ipconfig: Update the Dutch translation. --- programs/ipconfig/Nl.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/Nl.rc b/programs/ipconfig/Nl.rc index cda3152..66c126f 100644 --- a/programs/ipconfig/Nl.rc +++ b/programs/ipconfig/Nl.rc @@ -42,4 +42,6 @@ STRINGTABLE STRING_DESCRIPTION, "Beschrijving" STRING_PHYS_ADDR, "Fysiek adres" STRING_DHCP_ENABLED, "DHCP geactiveerd" + STRING_YES, "Ja" + STRING_NO, "Nee" }

1 0

Michael Stefaniuc : urlmon: Remove superfluous NULL check before heap_free (Smatch).
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: de9f0b98d432cbee69b9137ab78d10b53bc0b581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de9f0b98d432cbee69b9137ab… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 7 23:10:56 2010 +0200 urlmon: Remove superfluous NULL check before heap_free (Smatch). --- dlls/urlmon/uri.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 94be29b..dbe6d72 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3310,8 +3310,7 @@ static HRESULT get_builder_component(LPWSTR *component, DWORD *component_len, static HRESULT set_builder_component(LPWSTR *component, DWORD *component_len, LPCWSTR new_value, WCHAR prefix, DWORD *flags, DWORD success_flag) { - if(*component) - heap_free(*component); + heap_free(*component); if(!new_value) { *component = NULL;

1 0

Roderick Colenbrander : wined3d: Return generic info for unhandled devices/ drivers.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: d7472026a0ea37a9c9f7b11b820efa700ef3f19d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7472026a0ea37a9c9f7b11b8… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Sep 8 00:20:11 2010 +0200 wined3d: Return generic info for unhandled devices/drivers. --- dlls/wined3d/directx.c | 3 ++- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index bf75ca6..f51f968 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1103,7 +1103,7 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, OSVERSIONINFOW os_version; WORD driver_os_version; unsigned int i; - enum wined3d_display_driver driver = DRIVER_NVIDIA_TNT; + enum wined3d_display_driver driver = DRIVER_UNKNOWN; enum wined3d_driver_model driver_model; const struct driver_version_information *version_info; @@ -1220,6 +1220,7 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, else { driver_info->description = "Direct3D HAL"; + driver_info->name = "Display"; driver_info->version_high = MAKEDWORD_VERSION(driver_os_version, 15); driver_info->version_low = MAKEDWORD_VERSION(8, 6); /* Nvidia RIVA TNT, arbitrary */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ec989fd..30a5ea5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1244,7 +1244,8 @@ enum wined3d_display_driver DRIVER_NVIDIA_TNT, DRIVER_NVIDIA_GEFORCE2MX, DRIVER_NVIDIA_GEFORCEFX, - DRIVER_NVIDIA_GEFORCE6 + DRIVER_NVIDIA_GEFORCE6, + DRIVER_UNKNOWN }; enum wined3d_driver_model

1 0

Frédéric Delanoy : ipconfig: Update French translation.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: e270fccb809f8e2317d05ad33016990b4db0adf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e270fccb809f8e2317d05ad33… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 8 00:36:23 2010 +0200 ipconfig: Update French translation. --- programs/ipconfig/Fr.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/Fr.rc b/programs/ipconfig/Fr.rc index af3b557..f1cd12c 100644 --- a/programs/ipconfig/Fr.rc +++ b/programs/ipconfig/Fr.rc @@ -44,4 +44,6 @@ STRINGTABLE STRING_DESCRIPTION, "Description" STRING_PHYS_ADDR, "Adresse physique" STRING_DHCP_ENABLED, "DHCP activé" + STRING_YES, "Oui" + STRING_NO, "Non" }

1 0

André Hentschel : ntdll: Remove an unused function from signal_powerpc.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 053be78e39205bd247ce274e9b7fd6150fe0a24c URL: http://source.winehq.org/git/wine.git/?a=commit;h=053be78e39205bd247ce274e9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 8 01:49:19 2010 +0200 ntdll: Remove an unused function from signal_powerpc. --- dlls/ntdll/signal_powerpc.c | 25 ------------------------- 1 files changed, 0 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 662d97b..f6de65f 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -574,31 +574,6 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) /********************************************************************** - * get_fpu_code - * - * Get the FPU exception code from the FPU status. - */ -static inline DWORD get_fpu_code( const CONTEXT *context ) -{ - DWORD status = context->Fpscr; - - if (status & 0x01) /* IE */ - { - if (status & 0x40) /* SF */ - return EXCEPTION_FLT_STACK_CHECK; - else - return EXCEPTION_FLT_INVALID_OPERATION; - } - if (status & 0x02) return EXCEPTION_FLT_DENORMAL_OPERAND; /* DE flag */ - if (status & 0x04) return EXCEPTION_FLT_DIVIDE_BY_ZERO; /* ZE flag */ - if (status & 0x08) return EXCEPTION_FLT_OVERFLOW; /* OE flag */ - if (status & 0x10) return EXCEPTION_FLT_UNDERFLOW; /* UE flag */ - if (status & 0x20) return EXCEPTION_FLT_INEXACT_RESULT; /* PE flag */ - return EXCEPTION_FLT_INVALID_OPERATION; /* generic error */ -} - - -/********************************************************************** * call_stack_handlers * * Call the stack handlers chain.

1 0

Vincent Povirk : ole32: Don't fail if the file ends during a big block.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 2752c3bcd07806a84894eaad5b2c2299d139b1e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2752c3bcd07806a84894eaad5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 7 19:17:43 2010 -0500 ole32: Don't fail if the file ends during a big block. Apparently, it's valid for the last block in a file to be incomplete. --- dlls/ole32/storage32.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 8b6a3af..5c58201 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3875,13 +3875,20 @@ static BOOL StorageImpl_ReadBigBlock( void* buffer) { ULARGE_INTEGER ulOffset; - DWORD read; + DWORD read=0; ulOffset.u.HighPart = 0; ulOffset.u.LowPart = StorageImpl_GetBigBlockOffset(This, blockIndex); StorageImpl_ReadAt(This, ulOffset, buffer, This->bigBlockSize, &read); - return (read == This->bigBlockSize); + + if (read && read < This->bigBlockSize) + { + /* File ends during this block; fill the rest with 0's. */ + memset((LPBYTE)buffer+read, 0, This->bigBlockSize-read); + } + + return (read != 0); } static BOOL StorageImpl_ReadDWordFromBigBlock(

1 0

Misha Koshelev : d3dx9_36: Fix the D3DXCreateMesh() prototype.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: b9b9d7ccca84a7d7a25ea5895f18fb6c2e73ca80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9b9d7ccca84a7d7a25ea5895… Author: Misha Koshelev <misha680(a)gmail.com> Date: Tue Sep 7 19:33:22 2010 -0500 d3dx9_36: Fix the D3DXCreateMesh() prototype. --- dlls/d3dx9_36/mesh.c | 2 +- dlls/d3dx9_36/tests/mesh.c | 12 ++++++------ include/d3dx9mesh.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 28cf9d2..12e26da 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -583,7 +583,7 @@ BOOL WINAPI D3DXSphereBoundProbe(CONST D3DXVECTOR3 *pcenter, FLOAT radius, CONST return TRUE; } -HRESULT WINAPI D3DXCreateMesh(DWORD numfaces, DWORD numvertices, DWORD options, CONST LPD3DVERTEXELEMENT9 *declaration, +HRESULT WINAPI D3DXCreateMesh(DWORD numfaces, DWORD numvertices, DWORD options, CONST D3DVERTEXELEMENT9 *declaration, LPDIRECT3DDEVICE9 device, LPD3DXMESH *mesh) { FIXME("(%d, %d, %d, %p, %p, %p): stub\n", numfaces, numvertices, options, declaration, device, mesh); diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 488515d..619d667 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1006,7 +1006,7 @@ static void D3DXCreateMeshTest(void) hr = D3DXCreateMesh(0, 0, 0, NULL, NULL, NULL); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); - hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, (LPD3DVERTEXELEMENT9 *)&decl, NULL, &d3dxmesh); + hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, decl, NULL, &d3dxmesh); 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); @@ -1035,13 +1035,13 @@ static void D3DXCreateMeshTest(void) return; } - hr = D3DXCreateMesh(0, 3, D3DXMESH_MANAGED, (LPD3DVERTEXELEMENT9 *)&decl, device, &d3dxmesh); + hr = D3DXCreateMesh(0, 3, D3DXMESH_MANAGED, decl, device, &d3dxmesh); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); - hr = D3DXCreateMesh(1, 0, D3DXMESH_MANAGED, (LPD3DVERTEXELEMENT9 *)&decl, device, &d3dxmesh); + hr = D3DXCreateMesh(1, 0, D3DXMESH_MANAGED, decl, device, &d3dxmesh); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); - hr = D3DXCreateMesh(1, 3, 0, (LPD3DVERTEXELEMENT9 *)&decl, device, &d3dxmesh); + hr = D3DXCreateMesh(1, 3, 0, decl, device, &d3dxmesh); todo_wine ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); if (hr == D3D_OK) @@ -1052,10 +1052,10 @@ static void D3DXCreateMeshTest(void) hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, 0, device, &d3dxmesh); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); - hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, (LPD3DVERTEXELEMENT9 *)&decl, device, NULL); + hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, decl, device, NULL); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); - hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, (LPD3DVERTEXELEMENT9 *)&decl, device, &d3dxmesh); + hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, decl, device, &d3dxmesh); todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); if (hr == D3D_OK) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index bc3dd81..32d3947 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -150,7 +150,7 @@ DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh) extern "C" { #endif -HRESULT WINAPI D3DXCreateMesh(DWORD, DWORD, DWORD, CONST LPD3DVERTEXELEMENT9 *, LPDIRECT3DDEVICE9, LPD3DXMESH *); +HRESULT WINAPI D3DXCreateMesh(DWORD, DWORD, DWORD, CONST D3DVERTEXELEMENT9 *, LPDIRECT3DDEVICE9, LPD3DXMESH *); HRESULT WINAPI D3DXCreateBuffer(DWORD, LPD3DXBUFFER*); UINT WINAPI D3DXGetDeclVertexSize(const D3DVERTEXELEMENT9 *decl, DWORD stream_idx); UINT WINAPI D3DXGetFVFVertexSize(DWORD);

1 0