September 2006 - Wine-Commits

James Hawkins : msvcmaker: Remove a reference to libs/unicode in msvcmaker.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: bedcdee7147d448af47193cca1ec65d20576f3c2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bedcdee7147d448af47193c… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Sep 6 13:53:21 2006 -0700 msvcmaker: Remove a reference to libs/unicode in msvcmaker. --- tools/winapi/msvcmaker | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index 31bdc93..2e247e4 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -92,7 +92,6 @@ if ($options->wine || $options->winetest my @gdi32_dirs = qw(dlls/gdi/enhmfdrv dlls/gdi/mfdrv); push @makefile_in_files, "libs/wine/Makefile.in"; -push @makefile_in_files, "libs/unicode/Makefile.in"; push @makefile_in_files, "tools/winebuild/Makefile.in"; sub filter_files($$) {

1 0

James Hawkins : msi: Fix two MsiFormatRecord tests.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 16769b26b2bbd7adbca85eb93fe9b2c4dcd944f3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=16769b26b2bbd7adbca85eb… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Sep 6 13:51:06 2006 -0700 msi: Fix two MsiFormatRecord tests. --- dlls/msi/tests/format.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index e56b457..5a5cdd1 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -1835,14 +1835,11 @@ static void test_formatrecord_tables(voi /* component with INSTALLSTATE_LOCAL */ size = MAX_PATH; - MsiRecordSetString( hrec, 0, "[$temporal]" ); + MsiRecordSetString( hrec, 1, "[$temporal]" ); r = MsiFormatRecord( hpkg, hrec, buf, &size ); ok( r == ERROR_SUCCESS, "format record failed: %d\n", r); - todo_wine - { - ok( !lstrcmp( buf, "1: C:\\I am a really long directory\\ " ), - "Expected '1: C:\\I am a really long directory\\ ', got %s\n", buf); - } + ok( !lstrcmp( buf, "1: C:\\I am a really long directory\\ " ), + "Expected '1: C:\\I am a really long directory\\ ', got %s\n", buf); r = MsiSetComponentState( hpkg, "temporal", INSTALLSTATE_SOURCE ); ok( r == ERROR_SUCCESS, "failed to set install state: %d\n", r); @@ -1857,7 +1854,7 @@ static void test_formatrecord_tables(voi ok( r == ERROR_SUCCESS, "format record failed: %d\n", r); todo_wine { - ok( !lstrcmp( buf, expected ), "Expected '%s', got %s\n", buf, expected); + ok( !lstrcmp( buf, expected ), "Expected '%s', got %s\n", expected, buf); } DeleteFile( "C:\\I am a really long directory\\temporal.txt" );

1 0

James Hawkins : msi: Add many more MsiFormatRecord tests.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: f6463dfacdad2a1f6d0f12660c1b0a712a5176ed URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f6463dfacdad2a1f6d0f126… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Sep 6 15:31:31 2006 -0700 msi: Add many more MsiFormatRecord tests. --- dlls/msi/tests/format.c | 380 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 380 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=f6463dfacdad2a1f6d0…

1 0

James Hawkins : msi: Use the TargetPath of a file if the file doesn' t exist in MsiFormatRecord.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: ff6fe41df74a244282e8d38369d4d8da37141dba URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ff6fe41df74a244282e8d38… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Sep 5 20:28:15 2006 -0700 msi: Use the TargetPath of a file if the file doesn't exist in MsiFormatRecord. --- dlls/msi/format.c | 4 ++-- dlls/msi/tests/format.c | 14 ++++---------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 6dc92f9..2909089 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -165,8 +165,8 @@ static LPWSTR deformat_file(MSIPACKAGE* { ERR("Unable to get ShortPath size (%s)\n", debugstr_w( file->TargetPath) ); - value = NULL; - *sz = 0; + value = strdupW( file->TargetPath ); + *sz = (lstrlenW(value)) * sizeof(WCHAR); } } } diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index c9f9bc3..e56b457 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -1804,11 +1804,8 @@ static void test_formatrecord_tables(voi MsiRecordSetString( hrec, 1, "[!temporal_file]" ); r = MsiFormatRecord( hpkg, hrec, buf, &size ); ok( r == ERROR_SUCCESS, "format record failed: %d\n", r); - todo_wine - { - ok( !lstrcmp( buf, "1: C:\\I am a really long directory\\temporal.txt " ), - "Expected '1: C:\\I am a really long directory\\temporal.txt ', got %s\n", buf); - } + ok( !lstrcmp( buf, "1: C:\\I am a really long directory\\temporal.txt " ), + "Expected '1: C:\\I am a really long directory\\temporal.txt ', got %s\n", buf); /* custom action 51, files don't exist */ r = MsiDoAction( hpkg, "MyCustom" ); @@ -1817,11 +1814,8 @@ static void test_formatrecord_tables(voi size = MAX_PATH; r = MsiGetProperty( hpkg, "prop", buf, &size ); ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); - todo_wine - { - ok( !lstrcmp( buf, "C:\\I am a really long directory\\temporal.txt" ), - "Expected 'C:\\I am a really long directory\\temporal.txt', got %s\n", buf); - } + ok( !lstrcmp( buf, "C:\\I am a really long directory\\temporal.txt" ), + "Expected 'C:\\I am a really long directory\\temporal.txt', got %s\n", buf); CreateDirectory( "C:\\I am a really long directory", NULL ); create_test_file( "C:\\I am a really long directory\\temporal.txt" );

1 0

James Hawkins : msi: Fix creation of the default format in MsiFormatRecord.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: a248cc8f6284754c4b1abbe35ba42465437eb0b0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a248cc8f6284754c4b1abbe… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Sep 5 20:26:56 2006 -0700 msi: Fix creation of the default format in MsiFormatRecord. --- dlls/msi/format.c | 48 +++++++++++++++++++++++++++++++----- dlls/msi/tests/format.c | 63 ++++++++++++++++++++++------------------------- 2 files changed, 70 insertions(+), 41 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index b0d9d52..6dc92f9 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -50,19 +50,53 @@ static LPWSTR build_default_format(MSIRE { int i; int count; - LPWSTR rc; - static const WCHAR fmt[] = {'%','i',':',' ','[','%','i',']',' ',0}; - WCHAR buf[11]; + LPWSTR rc, buf; + static const WCHAR fmt[] = {'%','i',':',' ','%','s',' ',0}; + static const WCHAR fmt_null[] = {'%','i',':',' ',' ',0}; + static const WCHAR fmt_index[] = {'%','i',0}; + LPCWSTR str; + WCHAR index[10]; + DWORD size, max_len, len; count = MSI_RecordGetFieldCount(record); - rc = msi_alloc((11*count)*sizeof(WCHAR)); - rc[0] = 0; + max_len = MAX_PATH; + buf = msi_alloc((max_len + 1) * sizeof(WCHAR)); + + rc = NULL; + size = 1; for (i = 1; i <= count; i++) { - sprintfW(buf,fmt,i,i); - strcatW(rc,buf); + sprintfW(index,fmt_index,i); + str = MSI_RecordGetString(record, i); + len = (str) ? lstrlenW(str) : 0; + len += (sizeof(fmt_null) - 3) + lstrlenW(index); + size += len; + + if (len > max_len) + { + max_len = len; + buf = msi_realloc(buf, (max_len + 1) * sizeof(WCHAR)); + if (!buf) return NULL; + } + + if (str) + sprintfW(buf,fmt,i,str); + else + sprintfW(buf,fmt_null,i); + + if (!rc) + { + rc = msi_alloc(size * sizeof(WCHAR)); + lstrcpyW(rc, buf); + } + else + { + rc = msi_realloc(rc, size * sizeof(WCHAR)); + lstrcatW(rc, buf); + } } + msi_free(buf); return rc; } diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index c619c10..c9f9bc3 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -1501,6 +1501,24 @@ static void test_formatrecord_package(vo ok( sz == 51, "size wrong (%li)\n",sz); ok( 0 == strcmp(buffer,"1: 2: 3: 4: 5: 6: 7: 8: 9: 10: 11: 12: "), "wrong output(%s)\n",buffer); + r = MsiSetProperty(package, "prop", "val"); + ok( r == ERROR_SUCCESS, "failed to set propertY: %d\n", r); + + r = MsiRecordSetString(hrec, 0, NULL); + r = MsiRecordSetString(hrec, 1, "[2]"); + r = MsiRecordSetString(hrec, 2, "stuff"); + r = MsiRecordSetString(hrec, 3, "prop"); + r = MsiRecordSetString(hrec, 4, "[prop]"); + r = MsiRecordSetString(hrec, 5, "[noprop]"); + sz = sizeof buffer; + r = MsiFormatRecord(package, hrec, buffer, &sz); + ok( r == ERROR_SUCCESS, "format failed with empty buffer (%i)\n",r); + todo_wine + { + ok( sz == 66, "size wrong (%li)\n",sz); + ok( 0 == strcmp(buffer,"1: [2] 2: stuff 3: prop 4: val 5: 6: 7: 8: 9: 10: 11: 12: "), "wrong output(%s)\n",buffer); + } + /* now put play games with escaping */ r = MsiRecordSetString(hrec, 0, "[1] [2] [\\3asdf]"); r = MsiRecordSetString(hrec, 1, "boo"); @@ -1715,33 +1733,25 @@ static void test_formatrecord_tables(voi /* property doesn't exist */ size = MAX_PATH; + /*MsiRecordSetString( hrec, 0, "[1]" ); */ MsiRecordSetString( hrec, 1, "[idontexist]" ); r = MsiFormatRecord( hpkg, hrec, buf, &size ); ok( r == ERROR_SUCCESS, "format record failed: %d\n", r); - todo_wine - { - ok( !lstrcmp( buf, "1: " ), "Expected '1: ', got %s\n", buf ); - } + ok( !lstrcmp( buf, "1: " ), "Expected '1: ', got %s\n", buf ); /* property exists */ size = MAX_PATH; MsiRecordSetString( hrec, 1, "[imaprop]" ); r = MsiFormatRecord( hpkg, hrec, buf, &size ); ok( r == ERROR_SUCCESS, "format record failed: %d\n", r); - todo_wine - { - ok( !lstrcmp( buf, "1: ringer " ), "Expected '1: ringer ', got %s\n", buf ); - } + ok( !lstrcmp( buf, "1: ringer " ), "Expected '1: ringer ', got %s\n", buf ); /* environment variable doesn't exist */ size = MAX_PATH; MsiRecordSetString( hrec, 1, "[%idontexist]" ); r = MsiFormatRecord( hpkg, hrec, buf, &size ); ok( r == ERROR_SUCCESS, "format record failed: %d\n", r); - todo_wine - { - ok( !lstrcmp( buf, "1: " ), "Expected '1: ', got %s\n", buf ); - } + ok( !lstrcmp( buf, "1: " ), "Expected '1: ', got %s\n", buf ); /* environment variable exists */ size = MAX_PATH; @@ -1749,20 +1759,14 @@ static void test_formatrecord_tables(voi MsiRecordSetString( hrec, 1, "[%crazyvar]" ); r = MsiFormatRecord( hpkg, hrec, buf, &size ); ok( r == ERROR_SUCCESS, "format record failed: %d\n", r); - todo_wine - { - ok( !lstrcmp( buf, "1: crazyval " ), "Expected '1: crazyval ', got %s\n", buf ); - } + ok( !lstrcmp( buf, "1: crazyval " ), "Expected '1: crazyval ', got %s\n", buf ); /* file key before CostInitialize */ size = MAX_PATH; MsiRecordSetString( hrec, 1, "[#frontal_file]" ); r = MsiFormatRecord( hpkg, hrec, buf, &size ); ok( r == ERROR_SUCCESS, "format record failed: %d\n", r); - todo_wine - { - ok( !lstrcmp( buf, "1: " ), "Expected '1: ', got %s\n", buf ); - } + ok( !lstrcmp( buf, "1: " ), "Expected '1: ', got %s\n", buf ); r = MsiDoAction(hpkg, "CostInitialize"); ok( r == ERROR_SUCCESS, "CostInitialize failed: %d\n", r); @@ -1778,31 +1782,22 @@ static void test_formatrecord_tables(voi MsiRecordSetString( hrec, 1, "[#frontal_file]" ); r = MsiFormatRecord( hpkg, hrec, buf, &size ); ok( r == ERROR_SUCCESS, "format record failed: %d\n", r); - todo_wine - { - ok( !lstrcmp( buf, "1: C:\\frontal.txt " ), "Expected '1: C:\\frontal.txt ', got %s\n", buf); - } + ok( !lstrcmp( buf, "1: C:\\frontal.txt " ), "Expected '1: C:\\frontal.txt ', got %s\n", buf); /* frontal short file key */ size = MAX_PATH; MsiRecordSetString( hrec, 1, "[!frontal_file]" ); r = MsiFormatRecord( hpkg, hrec, buf, &size ); ok( r == ERROR_SUCCESS, "format record failed: %d\n", r); - todo_wine - { - ok( !lstrcmp( buf, "1: C:\\frontal.txt " ), "Expected '1: C:\\frontal.txt ', got %s\n", buf); - } + ok( !lstrcmp( buf, "1: C:\\frontal.txt " ), "Expected '1: C:\\frontal.txt ', got %s\n", buf); /* temporal full file key */ size = MAX_PATH; MsiRecordSetString( hrec, 1, "[#temporal_file]" ); r = MsiFormatRecord( hpkg, hrec, buf, &size ); ok( r == ERROR_SUCCESS, "format record failed: %d\n", r); - todo_wine - { - ok( !lstrcmp( buf, "1: C:\\I am a really long directory\\temporal.txt " ), - "Expected '1: C:\\I am a really long directory\\temporal.txt ', got %s\n", buf); - } + ok( !lstrcmp( buf, "1: C:\\I am a really long directory\\temporal.txt " ), + "Expected '1: C:\\I am a really long directory\\temporal.txt ', got %s\n", buf); /* temporal short file key */ size = MAX_PATH; @@ -1846,7 +1841,7 @@ static void test_formatrecord_tables(voi /* component with INSTALLSTATE_LOCAL */ size = MAX_PATH; - MsiRecordSetString( hrec, 1, "[$temporal]" ); + MsiRecordSetString( hrec, 0, "[$temporal]" ); r = MsiFormatRecord( hpkg, hrec, buf, &size ); ok( r == ERROR_SUCCESS, "format record failed: %d\n", r); todo_wine

1 0

Ivan Gyurdiev : wined3d: Add support for R32F and R16F texture formats.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 2e1cf4d9486fcdfa9dabe0407ff9a8c653bedad6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2e1cf4d9486fcdfa9dabe04… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Tue Sep 5 03:40:24 2006 -0400 wined3d: Add support for R32F and R16F texture formats. --- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/utils.c | 4 ++-- include/wine/wined3d_gl.h | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c413175..d4a0e97 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1650,8 +1650,10 @@ static HRESULT WINAPI IWineD3DImpl_Check BOOL half_pixel_support = GL_SUPPORT(ARB_HALF_FLOAT_PIXEL); switch (CheckFormat) { + case D3DFMT_R16F: case D3DFMT_A16B16G16R16F: if (!half_pixel_support) break; + case D3DFMT_R32F: case D3DFMT_A32B32G32R32F: TRACE_(d3d_caps)("[OK]\n"); return WINED3D_OK; @@ -1748,9 +1750,7 @@ static HRESULT WINAPI IWineD3DImpl_Check /***** * Float formats: Not supported right now */ - case WINED3DFMT_R16F: case WINED3DFMT_G16R16F: - case WINED3DFMT_R32F: case WINED3DFMT_G32R32F: case WINED3DFMT_CxV8U8: TRACE_(d3d_caps)("[FAILED]\n"); /* Enable when implemented */ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 372fdb1..e0778c0 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -47,13 +47,13 @@ static const PixelFormatDesc formats[] = {WINED3DFMT_G8R8_G8B8 ,0x0 ,0x0 ,0x0 ,0x0 ,1/*?*/ ,TRUE ,0 ,0 ,0 }, {WINED3DFMT_R8G8_B8G8 ,0x0 ,0x0 ,0x0 ,0x0 ,1/*?*/ ,TRUE ,0 ,0 ,0 }, /* IEEE formats */ - {WINED3DFMT_R32F ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,0 ,0 ,0 }, + {WINED3DFMT_R32F ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_RGB32F_ARB ,GL_RED ,GL_FLOAT }, {WINED3DFMT_G32R32F ,0x0 ,0x0 ,0x0 ,0x0 ,8 ,FALSE ,0 ,0 ,0 }, {WINED3DFMT_A32B32G32R32F,0x0 ,0x0 ,0x0 ,0x0 ,16 ,FALSE ,GL_RGBA32F_ARB ,GL_RGBA ,GL_FLOAT }, /* Hmm? */ {WINED3DFMT_CxV8U8 ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,0 ,0 ,0 }, /* Float */ - {WINED3DFMT_R16F ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,0 ,0 ,0 }, + {WINED3DFMT_R16F ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,GL_RGB16F_ARB ,GL_RED ,GL_HALF_FLOAT_ARB }, {WINED3DFMT_G16R16F ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,0 ,0 ,0 }, {WINED3DFMT_A16B16G16R16F,0x0 ,0x0 ,0x0 ,0x0 ,8 ,FALSE ,GL_RGBA16F_ARB ,GL_RGBA ,GL_HALF_FLOAT_ARB }, /* Palettized formats */ diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 36e9a20..1a589a5 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -477,7 +477,9 @@ #endif #ifndef GL_ARB_texture_float #define GL_ARB_texture_float 1 #define GL_RGBA32F_ARB 0x8814 +#define GL_RGB32F_ARB 0x8815 #define GL_RGBA16F_ARB 0x881A +#define GL_RGB16F_ARB 0x881B #endif /* GL_ARB_half_float_pixel */ #ifndef GL_ARB_half_float_pixel

1 0

James Hawkins : msi: Add more tests for MsiFormatRecord.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: ad2ec01739dd8eaa565591a4b6888f3b4259002d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ad2ec01739dd8eaa565591a… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Sep 5 15:54:41 2006 -0700 msi: Add more tests for MsiFormatRecord. --- dlls/msi/tests/format.c | 519 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/package.c | 4 2 files changed, 521 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ad2ec01739dd8eaa565…

1 0

Ivan Gyurdiev : wined3d: Remove unused field: Surface.textureName.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: de54843d7b26ddbe7d70bf3d38ac8704dbf63b70 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=de54843d7b26ddbe7d70bf3… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Mon Sep 4 01:26:00 2006 -0400 wined3d: Remove unused field: Surface.textureName. --- dlls/wined3d/wined3d_private.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f136ff2..f103705 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -860,7 +860,6 @@ struct IWineD3DSurfaceImpl WINED3DSURFACET_DESC currentDesc; IWineD3DPaletteImpl *palette; - UINT textureName; UINT bytesPerPixel; /* TODO: move this off into a management class(maybe!) */

1 0

Ivan Gyurdiev : wined3d: Clean up ActiveRender.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 448f918a395e6bac8ad77116169c2e6e11ee4eb9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=448f918a395e6bac8ad7711… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Mon Sep 4 01:25:08 2006 -0400 wined3d: Clean up ActiveRender. --- dlls/wined3d/device.c | 325 +++++++++++++++++++++++++++---------------------- 1 files changed, 182 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=448f918a395e6bac8ad…

1 0

Paul Chitescu : wined3d: Avoid crashing when ProcessVertices is called with NULL vertex declaration .
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 4a581e6030b1b257c787b6efa145a099dd2ef513 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4a581e6030b1b257c787b6e… Author: Paul Chitescu <pchitescu(a)voip.null.ro> Date: Mon Sep 4 17:16:45 2006 +0300 wined3d: Avoid crashing when ProcessVertices is called with NULL vertex declaration. --- dlls/wined3d/device.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index be90664..c939aa3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5437,6 +5437,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl WineDirect3DVertexStridedData strided; TRACE("(%p)->(%d,%d,%d,%p,%p,%ld\n", This, SrcStartIndex, DestIndex, VertexCount, pDestBuffer, pVertexDecl, Flags); + if (!SrcImpl) { + WARN("NULL source vertex buffer\n"); + return WINED3DERR_INVALIDCALL; + } /* We don't need the source vbo because this buffer is only used as * a source for ProcessVertices. Avoid wasting resources by converting the * buffer and loading the VBO

1 0