July 2008 - Wine-Commits - list.winehq.org

James Hawkins : msi: Test getting the source path from a package with compressed files.
by Alexandre Julliard July 22, 2008

July 22, 2008

Module: wine Branch: master Commit: e806a285ef4c961a5fa80f06834d0707120fdce5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e806a285ef4c961a5fa80f068… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 22 00:50:24 2008 -0500 msi: Test getting the source path from a package with compressed files. --- dlls/msi/tests/package.c | 141 ++++++++++++++++++++++++++++++++++++++++++++++ include/msidefs.h | 8 +++ 2 files changed, 149 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index e94845e..ec2b590 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -5237,12 +5237,30 @@ static void test_complocator(void) DeleteFileA(msifile); } +static void set_suminfo_prop(MSIHANDLE db, DWORD prop, DWORD val) +{ + MSIHANDLE summary; + UINT r; + + r = MsiGetSummaryInformationA(db, NULL, 1, &summary); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiSummaryInfoSetPropertyA(summary, prop, VT_I4, val, NULL, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiSummaryInfoPersist(summary); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + MsiCloseHandle(summary); +} + static void test_MsiGetSourcePath(void) { MSIHANDLE hdb, hpkg; CHAR path[MAX_PATH]; CHAR cwd[MAX_PATH]; CHAR subsrc[MAX_PATH]; + CHAR sub2[MAX_PATH]; DWORD size; UINT r; @@ -5253,15 +5271,29 @@ static void test_MsiGetSourcePath(void) lstrcatA(subsrc, "subsource"); lstrcatA(subsrc, "\\"); + lstrcpyA(sub2, subsrc); + lstrcatA(sub2, "sub2"); + lstrcatA(sub2, "\\"); + + /* uncompressed source */ + hdb = create_package_db(); ok( hdb, "failed to create database\n"); + set_suminfo_prop(hdb, PID_WORDCOUNT, 0); + r = add_directory_entry(hdb, "'TARGETDIR', '', 'SourceDir'"); ok(r == S_OK, "failed\n"); r = add_directory_entry(hdb, "'SubDir', 'TARGETDIR', 'subtarget:subsource'"); ok(r == S_OK, "failed\n"); + r = add_directory_entry(hdb, "'SubDir2', 'SubDir', 'sub2'"); + ok(r == S_OK, "failed\n"); + + r = MsiDatabaseCommit(hdb); + ok(r == ERROR_SUCCESS , "Failed to commit database\n"); + hpkg = package_from_db(hdb); ok(hpkg, "failed to create package\n"); @@ -5340,6 +5372,15 @@ static void test_MsiGetSourcePath(void) "Expected path to be unchanged, got \"%s\"\n", path); ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size); + /* try SubDir2 */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SubDir2", path, &size); + ok(r == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %d\n", r); + ok(!lstrcmpA(path, "kiwi"), + "Expected path to be unchanged, got \"%s\"\n", path); + ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size); + r = MsiDoAction(hpkg, "CostInitialize"); ok(r == ERROR_SUCCESS, "cost init failed\n"); @@ -5387,6 +5428,14 @@ static void test_MsiGetSourcePath(void) ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); + /* try SubDir2 after 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, sub2), "Expected \"%s\", got \"%s\"\n", sub2, path); + ok(size == lstrlenA(sub2), "Expected %d, got %d\n", lstrlenA(sub2), size); + r = MsiDoAction(hpkg, "ResolveSource"); ok(r == ERROR_SUCCESS, "file cost failed\n"); @@ -5431,6 +5480,14 @@ static void test_MsiGetSourcePath(void) ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); + /* try SubDir2 after ResolveSource */ + 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, sub2), "Expected \"%s\", got \"%s\"\n", sub2, path); + ok(size == lstrlenA(sub2), "Expected %d, got %d\n", lstrlenA(sub2), size); + r = MsiDoAction(hpkg, "FileCost"); ok(r == ERROR_SUCCESS, "file cost failed\n"); @@ -5467,6 +5524,14 @@ static void test_MsiGetSourcePath(void) ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); + /* try SubDir2 after FileCost */ + 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, sub2), "Expected \"%s\", got \"%s\"\n", sub2, path); + ok(size == lstrlenA(sub2), "Expected %d, got %d\n", lstrlenA(sub2), size); + r = MsiDoAction(hpkg, "CostFinalize"); ok(r == ERROR_SUCCESS, "file cost failed\n"); @@ -5503,6 +5568,14 @@ static void test_MsiGetSourcePath(void) ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); + /* try SubDir2 after CostFinalize */ + 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, sub2), "Expected \"%s\", got \"%s\"\n", sub2, path); + ok(size == lstrlenA(sub2), "Expected %d, got %d\n", lstrlenA(sub2), size); + /* nonexistent directory */ size = MAX_PATH; lstrcpyA(path, "kiwi"); @@ -5553,6 +5626,74 @@ static void test_MsiGetSourcePath(void) ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); MsiCloseHandle(hpkg); + + /* compressed source */ + + r = MsiOpenDatabase(msifile, MSIDBOPEN_DIRECT, &hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + set_suminfo_prop(hdb, PID_WORDCOUNT, msidbSumInfoSourceTypeCompressed); + + hpkg = package_from_db(hdb); + ok(hpkg, "failed to create package\n"); + + r = MsiDoAction(hpkg, "CostInitialize"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiDoAction(hpkg, "FileCost"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiDoAction(hpkg, "CostFinalize"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* try TARGETDIR after CostFinalize */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "TARGETDIR", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); + ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); + + /* try SourceDir after CostFinalize */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SourceDir", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); + ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); + + /* try SOURCEDIR after CostFinalize */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SOURCEDIR", path, &size); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); + ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); + } + + /* try SubDir after CostFinalize */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SubDir", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); + ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); + } + + /* try SubDir2 after CostFinalize */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SubDir2", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); + ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); + } + + MsiCloseHandle(hpkg); DeleteFile(msifile); } diff --git a/include/msidefs.h b/include/msidefs.h index 12b607d..141e203 100644 --- a/include/msidefs.h +++ b/include/msidefs.h @@ -207,6 +207,14 @@ enum msidbAssemblyAttributes msidbAssemblyAttributesWin32 = 0x00000001, }; +enum msidbSumInfoSourceType +{ + msidbSumInfoSourceTypeSFN = 0x00000001, + msidbSumInfoSourceTypeCompressed = 0x00000002, + msidbSumInfoSourceTypeAdminImage = 0x00000004, + msidbSumInfoSourceTypeLUAPackage = 0x00000008, +}; + /* * Windows SDK braindamage alert *

1 0

Lei Zhang : ntdll: Use our own implementation of atoi and atol.
by Alexandre Julliard July 22, 2008

July 22, 2008

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 July 22, 2008

July 22, 2008

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 July 22, 2008

July 22, 2008

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 July 22, 2008

July 22, 2008

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 July 22, 2008

July 22, 2008

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 July 22, 2008

July 22, 2008

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 July 22, 2008

July 22, 2008

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 July 22, 2008

July 22, 2008

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: Use less strict pixel format matching if the match fails.
by Alexandre Julliard July 22, 2008

July 22, 2008

Module: wine Branch: master Commit: 1219e3d4a752a1e5e6d9a4025d180f0c9da280f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1219e3d4a752a1e5e6d9a4025… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jul 21 09:22:22 2008 -0500 wined3d: Use less strict pixel format matching if the match fails. Some drivers(the open source ones most notably) cannot satisfy all possible D3D formats. This doesn't mean we should fall back to the emergency fallback instantly. Instead, try to loosen the requirements step by step. --- dlls/wined3d/context.c | 163 +++++++++++++++++++++++++++++------------------- 1 files changed, 98 insertions(+), 65 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index efa1006..ca81f3a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -113,10 +113,28 @@ static WineD3DContext *AddContextToArray(IWineD3DDeviceImpl *This, HWND win_hand /* This function takes care of WineD3D pixel format selection. */ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, WINED3DFORMAT ColorFormat, WINED3DFORMAT DepthStencilFormat, BOOL auxBuffers, int numSamples, BOOL pbuffer, BOOL findCompatible) { - int iPixelFormat=0; + int iPixelFormat=0, matchtry; short redBits, greenBits, blueBits, alphaBits, colorBits; short depthBits=0, stencilBits=0; + struct match_type { + BOOL require_aux; + BOOL exact_alpha; + BOOL exact_color; + } matches[] = { + /* First, try without aux buffers - this is the most common cause + * for not finding a pixel format. Also some drivers(the open source ones) + * only offer 32 bit ARB pixel formats. First try without an exact alpha + * match, then try without an exact alpha and color match. + */ + { TRUE, TRUE, TRUE }, + { FALSE, TRUE, TRUE }, + { TRUE, FALSE, TRUE }, + { TRUE, FALSE, FALSE }, + { FALSE, FALSE, TRUE }, + { FALSE, FALSE, FALSE }, + }; + int i = 0; int nCfgs = This->adapter->nCfgs; WineD3D_PixelFormat *cfgs = This->adapter->cfgs; @@ -149,70 +167,85 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, WINED3DF getDepthStencilBits(DepthStencilFormat, &depthBits, &stencilBits); } - /* Find a pixel format which EXACTLY matches our requirements (except for depth) */ - for(i=0; i<nCfgs; i++) { - BOOL exactDepthMatch = TRUE; - cfgs = &This->adapter->cfgs[i]; - - /* For now only accept RGBA formats. Perhaps some day we will - * allow floating point formats for pbuffers. */ - if(cfgs->iPixelType != WGL_TYPE_RGBA_ARB) - continue; - - /* In window mode (!pbuffer) we need a window drawable format and double buffering. */ - if(!pbuffer && !(cfgs->windowDrawable && cfgs->doubleBuffer)) - continue; - - /* We like to have aux buffers in backbuffer mode */ - if(auxBuffers && !cfgs->auxBuffers) - continue; - - /* In pbuffer-mode we need a pbuffer-capable format but we don't want double buffering */ - if(pbuffer && (!cfgs->pbufferDrawable || cfgs->doubleBuffer)) - continue; - - if(cfgs->redSize != redBits) - continue; - if(cfgs->greenSize != greenBits) - continue; - if(cfgs->blueSize != blueBits) - continue; - if(cfgs->alphaSize != alphaBits) - continue; - - /* We try to locate a format which matches our requirements exactly. In case of - * depth it is no problem to emulate 16-bit using e.g. 24-bit, so accept that. */ - if(cfgs->depthSize < depthBits) - continue; - else if(cfgs->depthSize > depthBits) - exactDepthMatch = FALSE; - - /* In all cases make sure the number of stencil bits matches our requirements - * even when we don't need stencil because it could affect performance EXCEPT - * on cards which don't offer depth formats without stencil like the i915 drivers - * on Linux. */ - if(stencilBits != cfgs->stencilSize && !(This->adapter->brokenStencil && stencilBits <= cfgs->stencilSize)) - continue; - - /* Check multisampling support */ - if(cfgs->numSamples != numSamples) - continue; - - /* When we have passed all the checks then we have found a format which matches our - * requirements. Note that we only check for a limit number of capabilities right now, - * so there can easily be a dozen of pixel formats which appear to be the 'same' but - * can still differ in things like multisampling, stereo, SRGB and other flags. - */ + for(matchtry = 0; matchtry < (sizeof(matches) / sizeof(matches[0])); matchtry++) { + for(i=0; i<nCfgs; i++) { + BOOL exactDepthMatch = TRUE; + cfgs = &This->adapter->cfgs[i]; + + /* For now only accept RGBA formats. Perhaps some day we will + * allow floating point formats for pbuffers. */ + if(cfgs->iPixelType != WGL_TYPE_RGBA_ARB) + continue; + + /* In window mode (!pbuffer) we need a window drawable format and double buffering. */ + if(!pbuffer && !(cfgs->windowDrawable && cfgs->doubleBuffer)) + continue; + + /* We like to have aux buffers in backbuffer mode */ + if(auxBuffers && !cfgs->auxBuffers && matches[matchtry].require_aux) + continue; + + /* In pbuffer-mode we need a pbuffer-capable format but we don't want double buffering */ + if(pbuffer && (!cfgs->pbufferDrawable || cfgs->doubleBuffer)) + continue; + + if(matches[matchtry].exact_color) { + if(cfgs->redSize != redBits) + continue; + if(cfgs->greenSize != greenBits) + continue; + if(cfgs->blueSize != blueBits) + continue; + } else { + if(cfgs->redSize < redBits) + continue; + if(cfgs->greenSize < greenBits) + continue; + if(cfgs->blueSize < blueBits) + continue; + } + if(matches[matchtry].exact_alpha) { + if(cfgs->alphaSize != alphaBits) + continue; + } else { + if(cfgs->alphaSize < alphaBits) + continue; + } - /* Exit the loop as we have found a format :) */ - if(exactDepthMatch) { - iPixelFormat = cfgs->iPixelFormat; - break; - } else if(!iPixelFormat) { - /* In the end we might end up with a format which doesn't exactly match our depth - * requirements. Accept the first format we found because formats with higher iPixelFormat - * values tend to have more extended capabilities (e.g. multisampling) which we don't need. */ - iPixelFormat = cfgs->iPixelFormat; + /* We try to locate a format which matches our requirements exactly. In case of + * depth it is no problem to emulate 16-bit using e.g. 24-bit, so accept that. */ + if(cfgs->depthSize < depthBits) + continue; + else if(cfgs->depthSize > depthBits) + exactDepthMatch = FALSE; + + /* In all cases make sure the number of stencil bits matches our requirements + * even when we don't need stencil because it could affect performance EXCEPT + * on cards which don't offer depth formats without stencil like the i915 drivers + * on Linux. */ + if(stencilBits != cfgs->stencilSize && !(This->adapter->brokenStencil && stencilBits <= cfgs->stencilSize)) + continue; + + /* Check multisampling support */ + if(cfgs->numSamples != numSamples) + continue; + + /* When we have passed all the checks then we have found a format which matches our + * requirements. Note that we only check for a limit number of capabilities right now, + * so there can easily be a dozen of pixel formats which appear to be the 'same' but + * can still differ in things like multisampling, stereo, SRGB and other flags. + */ + + /* Exit the loop as we have found a format :) */ + if(exactDepthMatch) { + iPixelFormat = cfgs->iPixelFormat; + break; + } else if(!iPixelFormat) { + /* In the end we might end up with a format which doesn't exactly match our depth + * requirements. Accept the first format we found because formats with higher iPixelFormat + * values tend to have more extended capabilities (e.g. multisampling) which we don't need. */ + iPixelFormat = cfgs->iPixelFormat; + } } }

1 0