wine-commits July 2008

wine-commits@winehq.org

3 participants
1114 discussions

James Hawkins : msi: Add more tests for MsiGetSourcePath.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: 45f9cb4d6221fc00f60e2911c3cf147c631465ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=45f9cb4d6221fc00f60e2911c… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 22 00:49:48 2008 -0500 msi: Add more tests for MsiGetSourcePath. --- dlls/msi/tests/package.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 111 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index d26226d..e94845e 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -5581,17 +5581,50 @@ static void test_shortlongsource(void) r = add_directory_entry(hdb, "'SubDir', 'TARGETDIR', 'short|long'"); ok(r == S_OK, "failed\n"); + /* CostInitialize:short */ + r = add_directory_entry(hdb, "'SubDir2', 'TARGETDIR', 'one|two'"); + ok(r == S_OK, "failed\n"); + + /* CostInitialize:long */ + r = add_directory_entry(hdb, "'SubDir3', 'TARGETDIR', 'three|four'"); + ok(r == S_OK, "failed\n"); + + /* FileCost:short */ + r = add_directory_entry(hdb, "'SubDir4', 'TARGETDIR', 'five|six'"); + ok(r == S_OK, "failed\n"); + + /* FileCost:long */ + r = add_directory_entry(hdb, "'SubDir5', 'TARGETDIR', 'seven|eight'"); + ok(r == S_OK, "failed\n"); + + /* CostFinalize:short */ + r = add_directory_entry(hdb, "'SubDir6', 'TARGETDIR', 'nine|ten'"); + ok(r == S_OK, "failed\n"); + + /* CostFinalize:long */ + r = add_directory_entry(hdb, "'SubDir7', 'TARGETDIR', 'eleven|twelve'"); + ok(r == S_OK, "failed\n"); + hpkg = package_from_db(hdb); ok(hpkg, "failed to create package\n"); MsiCloseHandle(hdb); + CreateDirectoryA("one", NULL); + CreateDirectoryA("four", NULL); + r = MsiDoAction(hpkg, "CostInitialize"); ok(r == ERROR_SUCCESS, "file cost failed\n"); + CreateDirectory("five", NULL); + CreateDirectory("eight", NULL); + r = MsiDoAction(hpkg, "FileCost"); ok(r == ERROR_SUCCESS, "file cost failed\n"); + CreateDirectory("nine", NULL); + CreateDirectory("twelve", NULL); + r = MsiDoAction(hpkg, "CostFinalize"); ok(r == ERROR_SUCCESS, "file cost failed\n"); @@ -5623,9 +5656,87 @@ static void test_shortlongsource(void) ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); + lstrcpyA(subsrc, cwd); + lstrcatA(subsrc, "two"); + lstrcatA(subsrc, "\\"); + + /* short dir exists before CostInitialize */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SubDir2", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); + + lstrcpyA(subsrc, cwd); + lstrcatA(subsrc, "four"); + lstrcatA(subsrc, "\\"); + + /* long dir exists before CostInitialize */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SubDir3", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); + + lstrcpyA(subsrc, cwd); + lstrcatA(subsrc, "six"); + lstrcatA(subsrc, "\\"); + + /* short dir exists before FileCost */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SubDir4", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); + + lstrcpyA(subsrc, cwd); + lstrcatA(subsrc, "eight"); + lstrcatA(subsrc, "\\"); + + /* long dir exists before FileCost */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SubDir5", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); + + lstrcpyA(subsrc, cwd); + lstrcatA(subsrc, "ten"); + lstrcatA(subsrc, "\\"); + + /* short dir exists before CostFinalize */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SubDir6", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); + + lstrcpyA(subsrc, cwd); + lstrcatA(subsrc, "twelve"); + lstrcatA(subsrc, "\\"); + + /* long dir exists before CostFinalize */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SubDir7", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); + MsiCloseHandle(hpkg); RemoveDirectoryA("short"); RemoveDirectoryA("long"); + RemoveDirectoryA("one"); + RemoveDirectoryA("four"); + RemoveDirectoryA("five"); + RemoveDirectoryA("eight"); + RemoveDirectoryA("nine"); + RemoveDirectoryA("twelve"); DeleteFileA(msifile); }

1 0

Lei Zhang : ntdll: Use our own implementation of atoi and atol.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: ee60c49dd63fc65b9eb6813cb910ba581d80758d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee60c49dd63fc65b9eb6813cb… Author: Lei Zhang <thestig(a)google.com> Date: Mon Jul 21 18:15:20 2008 -0700 ntdll: Use our own implementation of atoi and atol. --- dlls/ntdll/string.c | 38 +++++++++++++++++++------------------- dlls/ntdll/tests/string.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index ebfa6fb..604154c 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -465,24 +465,6 @@ ULONG __cdecl NTDLL_strtoul( const char *nptr, char **endptr, int base ) /********************************************************************* - * atoi (NTDLL.@) - */ -int __cdecl NTDLL_atoi( const char *nptr ) -{ - return atoi( nptr ); -} - - -/********************************************************************* - * atol (NTDLL.@) - */ -LONG __cdecl NTDLL_atol( const char *nptr ) -{ - return atol( nptr ); -} - - -/********************************************************************* * _ultoa (NTDLL.@) * * Convert an unsigned long integer to a string. @@ -727,7 +709,7 @@ char * __cdecl _i64toa( * - No check is made for value overflow, only the lower 64 bits are assigned. * - If str is NULL it crashes, as the native function does. */ -LONGLONG __cdecl _atoi64( char *str ) +LONGLONG __cdecl _atoi64( const char *str ) { ULONGLONG RunningTotal = 0; char bMinus = 0; @@ -753,6 +735,24 @@ LONGLONG __cdecl _atoi64( char *str ) /********************************************************************* + * atoi (NTDLL.@) + */ +int __cdecl NTDLL_atoi( const char *nptr ) +{ + return _atoi64( nptr ); +} + + +/********************************************************************* + * atol (NTDLL.@) + */ +LONG __cdecl NTDLL_atol( const char *nptr ) +{ + return _atoi64( nptr ); +} + + +/********************************************************************* * sprintf (NTDLL.@) */ int __cdecl NTDLL_sprintf( char *str, const char *format, ... ) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index e9bf5e1..40a39a4 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -893,6 +893,31 @@ static void test_wtoi(void) } /* for */ } +static void test_atoi(void) +{ + int test_num; + int result; + + for (test_num = 0; test_num < NB_STR2LONG; test_num++) { + result = patoi(str2long[test_num].str); + ok(result == str2long[test_num].value, + "(test %d): call failed: _atoi(\"%s\") has result %d, expected: %d\n", + test_num, str2long[test_num].str, result, str2long[test_num].value); + } +} + +static void test_atol(void) +{ + int test_num; + int result; + + for (test_num = 0; test_num < NB_STR2LONG; test_num++) { + result = patol(str2long[test_num].str); + ok(result == str2long[test_num].value, + "(test %d): call failed: _atol(\"%s\") has result %d, expected: %d\n", + test_num, str2long[test_num].str, result, str2long[test_num].value); + } +} static void test_wtol(void) { @@ -1095,4 +1120,8 @@ START_TEST(string) test_wtoi64(); if (p_wcschr && p_wcsrchr) test_wcsfuncs(); + if (patoi) + test_atoi(); + if (patol) + test_atol(); }

1 0

Reece Dunn : setupapi/tests: Use FIELD_OFFSET instead of offsetof.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: 960ae6fedbf90b3e69c9dae89d4aec4a07170e55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=960ae6fedbf90b3e69c9dae89… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Mon Jul 21 21:14:01 2008 +0100 setupapi/tests: Use FIELD_OFFSET instead of offsetof. --- dlls/setupapi/tests/devinst.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 8fcff08..4e11bc0 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -824,7 +824,7 @@ static void testGetDeviceInterfaceDetail(void) LPBYTE buf = HeapAlloc(GetProcessHeap(), 0, size); SP_DEVICE_INTERFACE_DETAIL_DATA_A *detail = (SP_DEVICE_INTERFACE_DETAIL_DATA_A *)buf; - DWORD expectedsize = offsetof(SP_DEVICE_INTERFACE_DETAIL_DATA_W, DevicePath) + sizeof(WCHAR)*(1 + strlen(path)); + DWORD expectedsize = FIELD_OFFSET(SP_DEVICE_INTERFACE_DETAIL_DATA_W, DevicePath) + sizeof(WCHAR)*(1 + strlen(path)); detail->cbSize = 0; SetLastError(0xdeadbeef); @@ -1101,7 +1101,7 @@ static void testRegisterAndGetDetail(void) detail = (PSP_DEVICE_INTERFACE_DETAIL_DATA_A)HeapAlloc(GetProcessHeap(), 0, dwSize); if (detail) { - detail->cbSize = offsetof(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath) + sizeof(char); + detail->cbSize = FIELD_OFFSET(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath) + sizeof(char); SetLastError(0xdeadbeef); ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, detail, dwSize, &dwSize, NULL);

1 0

Lei Zhang : ole32: Silence FIXME from CoGetContextToken stub.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: c7ce692d139af1a5b7e4c6db00ef4750053f58ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7ce692d139af1a5b7e4c6db0… Author: Lei Zhang <thestig(a)google.com> Date: Mon Jul 21 11:55:48 2008 -0700 ole32: Silence FIXME from CoGetContextToken stub. --- dlls/ole32/compobj.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 3df0421..64a99ec 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3742,7 +3742,8 @@ HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv) */ HRESULT WINAPI CoGetContextToken( ULONG_PTR *token ) { - FIXME( "stub\n" ); + static int calls; + if(!(calls++)) FIXME( "stub\n" ); if (token) *token = 0; return E_NOTIMPL; }

1 0

Alex Villacís Lasso : richedit: Shorten EM_AUTOURLDETECT tests.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: 43cf3b80afb7d626b53321aefe39e92fa202f4df URL: http://source.winehq.org/git/wine.git/?a=commit;h=43cf3b80afb7d626b53321aef… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sun Jul 20 12:29:57 2008 -0500 richedit: Shorten EM_AUTOURLDETECT tests. EM_AUTOURLDETECT tests are taking too much time, so this patch tests just one URL and one non-URL for all messages but WM_SETTEXT. Also, remove one trace that spams the output needlessly. --- dlls/riched20/tests/editor.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 8d22e85..8a55197 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1383,6 +1383,9 @@ static HWND new_static_wnd(HWND parent) { static void test_EM_AUTOURLDETECT(void) { + /* DO NOT change the properties of the first two elements. To shorten the + tests, all tests after WM_SETTEXT test just the first two elements - + one non-URL and one URL */ struct urls_s { const char *text; int is_url; @@ -1647,10 +1650,12 @@ static void test_EM_AUTOURLDETECT(void) } /* Test detection of URLs within normal text - WM_CHAR case. */ - for (i = 0; i < sizeof(urls)/sizeof(struct urls_s); i++) { + /* Test only the first two URL examples for brevity */ + for (i = 0; i < 2; i++) { hwndRichEdit = new_richedit(parent); - for (j = 0; j < sizeof(templates_delim) / sizeof(const char *); j++) { + /* Also for brevity, test only the first three delimiters */ + for (j = 0; j < 3; j++) { char * at_pos; int at_offset; int end_offset; @@ -1674,7 +1679,6 @@ static void test_EM_AUTOURLDETECT(void) } } SendMessage(hwndRichEdit, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); - trace("Using template: %s\n", templates_delim[j]); /* This assumes no templates start with the URL itself, and that they have at least two characters before the URL text */ @@ -1784,7 +1788,8 @@ static void test_EM_AUTOURLDETECT(void) } /* Test detection of URLs within normal text - EM_SETTEXTEX case. */ - for (i = 0; i < sizeof(urls)/sizeof(struct urls_s); i++) { + /* Test just the first two URL examples for brevity */ + for (i = 0; i < 2; i++) { SETTEXTEX st; hwndRichEdit = new_richedit(parent); @@ -1971,7 +1976,8 @@ static void test_EM_AUTOURLDETECT(void) } /* Test detection of URLs within normal text - EM_REPLACESEL case. */ - for (i = 0; i < sizeof(urls)/sizeof(struct urls_s); i++) { + /* Test just the first two URL examples for brevity */ + for (i = 0; i < 2; i++) { hwndRichEdit = new_richedit(parent); /* Set selection with X to the URL */

1 0

Stefan Dösinger : wined3d: Move set_tex_op(_nvrc) to their specific files.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: eea2c95727a2d6ba2ab9955b661c59d411412ab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eea2c95727a2d6ba2ab9955b6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 12 11:45:33 2008 -0500 wined3d: Move set_tex_op(_nvrc) to their specific files. --- dlls/wined3d/nvidia_texture_shader.c | 385 +++++++++ dlls/wined3d/state.c | 1109 +++++++++++++++++++++++++ dlls/wined3d/utils.c | 1496 +--------------------------------- dlls/wined3d/wined3d_private.h | 3 +- 4 files changed, 1499 insertions(+), 1494 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eea2c95727a2d6ba2ab99…

1 0

Stefan Dösinger : wined3d: Remove some #ifdefs.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: 212ff6ff57c5de76bf1881b821a180bff47a5938 URL: http://source.winehq.org/git/wine.git/?a=commit;h=212ff6ff57c5de76bf1881b82… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 12 11:26:36 2008 -0500 wined3d: Remove some #ifdefs. --- dlls/wined3d/utils.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 40c154d..245c2c2 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1545,24 +1545,12 @@ static void get_src_and_opr(DWORD arg, BOOL is_alpha, GLenum* source, GLenum* op /* Set texture operations up - The following avoids lots of ifdefs in this routine!*/ #if defined (GL_VERSION_1_3) # define useext(A) A -# define combine_ext 1 #elif defined (GL_EXT_texture_env_combine) # define useext(A) A##_EXT -# define combine_ext 1 #elif defined (GL_ARB_texture_env_combine) # define useext(A) A##_ARB -# define combine_ext 1 -#else -# undef combine_ext #endif -#if !defined(combine_ext) -void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3) -{ - FIXME("Requires opengl combine extensions to work\n"); - return; -} -#else /* Setup the texture operations texture stage states */ void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3) { @@ -2623,7 +2611,6 @@ void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, WINED3DTEXTUREOP FIXME("Unhandled texture operation %s\n", debug_d3dtop(op)); #undef GLINFO_LOCATION } -#endif /* Setup this textures matrix according to the texture flags*/ void set_texture_matrix(const float *smat, DWORD flags, BOOL calculatedCoords, BOOL transformed, DWORD coordtype)

1 0

Stefan Dösinger : wined3d: Set WINED3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: bfd1ac26e22b15fc617cdc5ac9760d5f9e54b07f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfd1ac26e22b15fc617cdc5ac… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 12 11:22:18 2008 -0500 wined3d: Set WINED3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET. --- dlls/wined3d/directx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c9b5c09..f353739 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3253,8 +3253,8 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, pCaps->MaxStreamStride = 1024; /* d3d9.dll sets D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES here because StretchRects is implemented in d3d9 */ - pCaps->DevCaps2 = WINED3DDEVCAPS2_STREAMOFFSET; - /* TODO: VS3.0 needs at least D3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET */ + pCaps->DevCaps2 = WINED3DDEVCAPS2_STREAMOFFSET | + WINED3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET; pCaps->MaxNpatchTessellationLevel = 0; pCaps->MasterAdapterOrdinal = 0; pCaps->AdapterOrdinalInGroup = 0;

1 0

Stefan Dösinger : wined3d: Whitespace fix.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: 448fee287998c868a1cb543f90763bc56e2464b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=448fee287998c868a1cb543f9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 11 21:16:28 2008 -0500 wined3d: Whitespace fix. --- dlls/wined3d/state.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 01ee006..9ff10a1 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2516,7 +2516,7 @@ static void shader_bumpenvmat(DWORD state, IWineD3DStateBlockImpl *stateblock, W if(!isStateDirty(context, STATE_PIXELSHADERCONSTANT) && !isStateDirty(context, STATE_PIXELSHADER)) { shaderconstant(STATE_PIXELSHADERCONSTANT, stateblock, context); - } + } } }

1 0

Stefan Dösinger : wined3d: Fix a copy and paste bug.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: d66c05ce1de614febd922ad507d586cf09e78b7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d66c05ce1de614febd922ad50… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jul 10 13:38:35 2008 -0500 wined3d: Fix a copy and paste bug. This happened to work because most cards have the same amount of pshader and vshader constants, but for some reason this doesn't hold true on this macbook pro here, which lead to a crash due to heap corruption --- dlls/wined3d/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 131e1b7..b3db3b7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -459,11 +459,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice* iface, object->changed.pixelShader = TRUE; /* Pixel Shader Constants */ - for (i = 0; i < GL_LIMITS(vshader_constantsF); ++i) { + for (i = 0; i < GL_LIMITS(pshader_constantsF); ++i) { object->contained_ps_consts_f[i] = i; object->changed.pixelShaderConstantsF[i] = TRUE; } - object->num_contained_ps_consts_f = GL_LIMITS(vshader_constantsF); + object->num_contained_ps_consts_f = GL_LIMITS(pshader_constantsF); for (i = 0; i < MAX_CONST_B; ++i) { object->contained_ps_consts_b[i] = i; object->changed.pixelShaderConstantsB[i] = TRUE;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2008