wine-commits August 2006

wine-commits@winehq.org

5 participants
746 discussions

James Hawkins : msi: Add tests for MsiGetProperty.
by Alexandre Julliard 08 Aug '06

08 Aug '06

Module: wine Branch: refs/heads/master Commit: 4fade6d3a85df6872d676d33fcee1a0666f8e73c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4fade6d3a85df6872d676d3… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Aug 7 10:49:18 2006 -0700 msi: Add tests for MsiGetProperty. --- dlls/msi/tests/package.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 679c45c..07b9296 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1737,6 +1737,50 @@ static void test_states(void) MsiCloseHandle( hpkg ); } +static void test_getproperty(void) +{ + MSIHANDLE hPackage = 0; + char prop[100]; + DWORD size; + UINT r; + + hPackage = package_from_db(create_package_db()); + ok( hPackage != 0, " Failed to create package\n"); + + /* set the property */ + r = MsiSetProperty(hPackage, "Name", "Value"); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* retrieve the size, NULL pointer */ + size = 0; + r = MsiGetProperty(hPackage, "Name", NULL, &size); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok( size == 5, "Expected 5, got %ld\n", size); + + /* retrieve the size, empty string */ + size = 0; + r = MsiGetProperty(hPackage, "Name", "", &size); + ok( r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); + ok( size == 5, "Expected 5, got %ld\n", size); + + /* don't change size */ + r = MsiGetProperty(hPackage, "Name", prop, &size); + ok( r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); + ok( size == 5, "Expected 5, got %ld\n", size); + ok( !lstrcmp(prop, "Valu"), "Expected Valu, got %s\n", prop); + + /* increase the size by 1 */ + size++; + r = MsiGetProperty(hPackage, "Name", prop, &size); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok( size == 5, "Expected 5, got %ld\n", size); + ok( !lstrcmp(prop, "Value"), "Expected Value, got %s\n", prop); + + r = MsiCloseHandle( hPackage); + ok( r == ERROR_SUCCESS , "Failed to close package\n" ); + DeleteFile(msifile); +} + START_TEST(package) { test_createpackage(); @@ -1750,4 +1794,5 @@ START_TEST(package) test_msipackage(); test_formatrecord2(); test_states(); + test_getproperty(); }

1 0

Alexandre Julliard : configure: Fixed soname detection on MacOS by using otool instead of ldd.
by Alexandre Julliard 08 Aug '06

08 Aug '06

Module: wine Branch: refs/heads/master Commit: bdbffd97402a35d2149e52dcc80a7ac7a689e468 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bdbffd97402a35d2149e52d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 7 21:41:55 2006 +0200 configure: Fixed soname detection on MacOS by using otool instead of ldd. --- aclocal.m4 | 5 ++- configure | 105 ++++++++++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 88 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=bdbffd97402a35d2149…

1 0

Kevin Koltzau : hid: Initial implementation.
by Alexandre Julliard 07 Aug '06

07 Aug '06

Module: wine Branch: refs/heads/master Commit: b89cafaf92795b56c2a1be12c039c7def11b1ffb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b89cafaf92795b56c2a1be1… Author: Kevin Koltzau <kevin(a)plop.org> Date: Sat Aug 5 23:09:06 2006 -0400 hid: Initial implementation. --- configure | 3 ++- configure.ac | 1 + dlls/.gitignore | 1 + dlls/Makefile.in | 5 ++++ dlls/hid/Makefile.in | 16 ++++++++++++++ dlls/hid/hid.spec | 44 +++++++++++++++++++++++++++++++++++++++ dlls/hid/main.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/hid/version.rc | 21 +++++++++++++++++++ 8 files changed, 146 insertions(+), 1 deletions(-) create mode 100644 dlls/hid/Makefile.in create mode 100644 dlls/hid/hid.spec create mode 100644 dlls/hid/main.c create mode 100644 dlls/hid/version.rc Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b89cafaf92795b56c2a…

1 0

Ulrich Czekalla : wininet: Add INTERNET_OPTION_SECURITY_FLAGS stub to InternetSetOptionW.
by Alexandre Julliard 07 Aug '06

07 Aug '06

Module: wine Branch: refs/heads/master Commit: f6c0a461ec46d3f5eef3e05cdc4b9424548500c9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f6c0a461ec46d3f5eef3e05… Author: Ulrich Czekalla <ulrich(a)codeweavers.com> Date: Mon Aug 7 12:35:09 2006 -0400 wininet: Add INTERNET_OPTION_SECURITY_FLAGS stub to InternetSetOptionW. --- dlls/wininet/internet.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index ebe209d..00fb434 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2504,6 +2504,9 @@ BOOL WINAPI InternetSetOptionW(HINTERNET case INTERNET_OPTION_CONTEXT_VALUE: FIXME("Option INTERNET_OPTION_CONTEXT_VALUE; STUB\n"); break; + case INTERNET_OPTION_SECURITY_FLAGS: + FIXME("Option INTERNET_OPTION_SECURITY_FLAGS; STUB\n"); + break; default: FIXME("Option %ld STUB\n",dwOption); INTERNET_SetLastError(ERROR_INVALID_PARAMETER);

1 0

Krzysztof Foltman : riched20: New, clean, simple selection repaint logic - should fix all outstanding refresh issues .
by Alexandre Julliard 07 Aug '06

07 Aug '06

Module: wine Branch: refs/heads/master Commit: bad844d0a90c6947f2365a1d1b259be56ebf5ca5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bad844d0a90c6947f2365a1… Author: Krzysztof Foltman <wdev(a)foltman.com> Date: Mon Aug 7 17:27:16 2006 +0200 riched20: New, clean, simple selection repaint logic - should fix all outstanding refresh issues. --- dlls/riched20/caret.c | 26 ++++++++++++++------ dlls/riched20/editor.c | 3 ++ dlls/riched20/editor.h | 4 ++- dlls/riched20/editstr.h | 3 ++ dlls/riched20/paint.c | 62 +++++++++++++++++++++++++++++------------------ dlls/riched20/para.c | 14 +++++++++++ dlls/riched20/undo.c | 1 - dlls/riched20/wrap.c | 51 ++++++++++++++++++++++----------------- 8 files changed, 106 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=bad844d0a90c6947f23…

1 0

H. Verbeet : d3d9: Stub D3DPERF_ functions.
by Alexandre Julliard 07 Aug '06

07 Aug '06

Module: wine Branch: refs/heads/master Commit: 6128a05071cac044b623a88b6cf02947c5d051e1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6128a05071cac044b623a88… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Aug 7 19:23:11 2006 +0200 d3d9: Stub D3DPERF_ functions. --- dlls/d3d9/d3d9.spec | 6 ++++++ dlls/d3d9/d3d9_main.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/d3d9.spec b/dlls/d3d9/d3d9.spec index 0e6e5d2..949f03f 100644 --- a/dlls/d3d9/d3d9.spec +++ b/dlls/d3d9/d3d9.spec @@ -1,4 +1,10 @@ @ stdcall D3D9GetSWInfo() @ stdcall DebugSetMute() @ stdcall Direct3DCreate9(long) +@ stdcall D3DPERF_BeginEvent(long wstr) +@ stdcall D3DPERF_EndEvent() +@ stdcall D3DPERF_GetStatus() @ stdcall D3DPERF_SetOptions(long) +@ stdcall D3DPERF_QueryRepeatFrame() +@ stdcall D3DPERF_SetMarker(long wstr) +@ stdcall D3DPERF_SetRegion(long wstr) diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index b64f50e..b9bff60 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -27,6 +27,8 @@ #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); +static int D3DPERF_event_level = 0; + void (*wine_tsx11_lock_ptr)(void) = NULL; void (*wine_tsx11_unlock_ptr)(void) = NULL; @@ -71,6 +73,33 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, } /*********************************************************************** + * D3DPERF_BeginEvent (D3D9.@) + */ +int WINAPI D3DPERF_BeginEvent(D3DCOLOR color, LPCWSTR name) { + FIXME("(color %#lx, name %s) : stub\n", color, debugstr_w(name)); + + return D3DPERF_event_level++; +} + +/*********************************************************************** + * D3DPERF_EndEvent (D3D9.@) + */ +int WINAPI D3DPERF_EndEvent(void) { + FIXME("(void) : stub\n"); + + return --D3DPERF_event_level; +} + +/*********************************************************************** + * D3DPERF_GetStatus (D3D9.@) + */ +DWORD WINAPI D3DPERF_GetStatus(void) { + FIXME("(void) : stub\n"); + + return 0; +} + +/*********************************************************************** * D3DPERF_SetOptions (D3D9.@) * */ @@ -78,3 +107,26 @@ void WINAPI D3DPERF_SetOptions(DWORD opt { FIXME("(%#lx) : stub\n", options); } + +/*********************************************************************** + * D3DPERF_QueryRepeatFrame (D3D9.@) + */ +BOOL WINAPI D3DPERF_QueryRepeatFrame(void) { + FIXME("(void) : stub\n"); + + return FALSE; +} + +/*********************************************************************** + * D3DPERF_SetMarker (D3D9.@) + */ +void WINAPI D3DPERF_SetMarker(D3DCOLOR color, LPCWSTR name) { + FIXME("(color %#lx, name %s) : stub\n", color, debugstr_w(name)); +} + +/*********************************************************************** + * D3DPERF_SetRegion (D3D9.@) + */ +void WINAPI D3DPERF_SetRegion(D3DCOLOR color, LPCWSTR name) { + FIXME("(color %#lx, name %s) : stub\n", color, debugstr_w(name)); +}

1 0

H. Verbeet : wined3d: Allow async occlusion queries.
by Alexandre Julliard 07 Aug '06

07 Aug '06

Module: wine Branch: refs/heads/master Commit: 3d2ae6910264280695c90570dd1d73fa308db1bf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3d2ae6910264280695c9057… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Aug 7 19:25:17 2006 +0200 wined3d: Allow async occlusion queries. --- dlls/wined3d/query.c | 26 ++++++++++++++++++++------ include/wine/wined3d_gl.h | 1 + 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index a4f0b9d..0d11369 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -94,6 +94,7 @@ static HRESULT WINAPI IWineD3DQueryImpl static HRESULT WINAPI IWineD3DQueryImpl_GetData(IWineD3DQuery* iface, void* pData, DWORD dwSize, DWORD dwGetDataFlags){ IWineD3DQueryImpl *This = (IWineD3DQueryImpl *)iface; + HRESULT res = S_OK; TRACE("(%p) : type %#x, pData %p, dwSize %#lx, dwGetDataFlags %#lx\n", This, This->type, pData, dwSize, dwGetDataFlags); @@ -157,14 +158,27 @@ static HRESULT WINAPI IWineD3DQueryImpl { DWORD* data = pData; if (GL_SUPPORT(ARB_OCCLUSION_QUERY)) { - GLint samples; - GL_EXTCALL(glGetQueryObjectivARB(((WineQueryOcclusionData *)This->extendedData)->queryId, GL_QUERY_RESULT_ARB, &samples)); - checkGLcall("glGetQueryObjectiv()\n"); - TRACE("(%p) : Returning %d samples.\n", This, samples); - *data = samples; + GLuint available; + GLuint samples; + GLuint queryId = ((WineQueryOcclusionData *)This->extendedData)->queryId; + + GL_EXTCALL(glGetQueryObjectuivARB(queryId, GL_QUERY_RESULT_AVAILABLE_ARB, &available)); + checkGLcall("glGetQueryObjectiv(GL_QUERY_RESULT_AVAILABLE)\n"); + TRACE("(%p) : available %d.\n", This, available); + + if (available || dwGetDataFlags & WINED3DGETDATA_FLUSH) { + GL_EXTCALL(glGetQueryObjectuivARB(queryId, GL_QUERY_RESULT_ARB, &samples)); + checkGLcall("glGetQueryObjectuiv(GL_QUERY_RESULT)\n"); + TRACE("(%p) : Returning %d samples.\n", This, samples); + *data = samples; + res = S_OK; + } else { + res = S_FALSE; + } } else { FIXME("(%p) : Occlusion queries not supported. Returning 1.\n", This); *data = 1; + res = S_OK; } } break; @@ -252,7 +266,7 @@ static HRESULT WINAPI IWineD3DQueryImpl D3DGETDATA_FLUSH may return WINED3DERR_DEVICELOST if the device is lost */ FIXME("(%p) : type %#x, Partial stub\n", This, This->type); - return S_OK; /* S_OK if the query data is available*/ + return res; /* S_OK if the query data is available*/ } diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 5af463e..d50be65 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -1439,6 +1439,7 @@ #define GL_EXT_FUNCS_GEN \ USE_GL_FUNC(PGLFNBEGINQUERYARBPROC, glBeginQueryARB); \ USE_GL_FUNC(PGLFNENDQUERYARBPROC, glEndQueryARB); \ USE_GL_FUNC(PGLFNGETQUERYOBJECTIVARBPROC, glGetQueryObjectivARB); \ + USE_GL_FUNC(PGLFNGETQUERYOBJECTUIVARBPROC, glGetQueryObjectuivARB); \ /* GL_ARB_point_parameters */ \ USE_GL_FUNC(PGLFNGLPOINTPARAMETERFARBPROC, glPointParameterfARB); \ USE_GL_FUNC(PGLFNGLPOINTPARAMETERFVARBPROC, glPointParameterfvARB); \

1 0

H. Verbeet : wined3d: Improve a few query traces.
by Alexandre Julliard 07 Aug '06

07 Aug '06

Module: wine Branch: refs/heads/master Commit: 008c23d06a5426555f0fe9ee6f8661983a166ee3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=008c23d06a5426555f0fe9e… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Aug 7 19:23:49 2006 +0200 wined3d: Improve a few query traces. The query type is useful to have in query TRACEs. IWineD3DQueryImpl_GetDataSize isn't really a stub. --- dlls/wined3d/query.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 93d595b..a4f0b9d 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -251,7 +251,7 @@ static HRESULT WINAPI IWineD3DQueryImpl /*dwGetDataFlags = 0 || D3DGETDATA_FLUSH D3DGETDATA_FLUSH may return WINED3DERR_DEVICELOST if the device is lost */ - FIXME("(%p) : stub\n", This); + FIXME("(%p) : type %#x, Partial stub\n", This, This->type); return S_OK; /* S_OK if the query data is available*/ } @@ -259,7 +259,7 @@ static HRESULT WINAPI IWineD3DQueryImpl static DWORD WINAPI IWineD3DQueryImpl_GetDataSize(IWineD3DQuery* iface){ IWineD3DQueryImpl *This = (IWineD3DQueryImpl *)iface; int dataSize = 0; - FIXME("(%p) : stub\n", This); + TRACE("(%p) : type %#x\n", This, This->type); switch(This->type){ case WINED3DQUERYTYPE_VCACHE: dataSize = sizeof(WINED3DDEVINFO_VCACHE);

1 0

H. Verbeet : wined3d: Check Occlusion query GL calls.
by Alexandre Julliard 07 Aug '06

07 Aug '06

Module: wine Branch: refs/heads/master Commit: 44c1747f71c58526041a9c3ea64b3daf4008ded4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=44c1747f71c58526041a9c3… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Aug 7 19:23:27 2006 +0200 wined3d: Check Occlusion query GL calls. --- dlls/wined3d/query.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 026a23a..93d595b 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -159,6 +159,7 @@ static HRESULT WINAPI IWineD3DQueryImpl if (GL_SUPPORT(ARB_OCCLUSION_QUERY)) { GLint samples; GL_EXTCALL(glGetQueryObjectivARB(((WineQueryOcclusionData *)This->extendedData)->queryId, GL_QUERY_RESULT_ARB, &samples)); + checkGLcall("glGetQueryObjectiv()\n"); TRACE("(%p) : Returning %d samples.\n", This, samples); *data = samples; } else { @@ -326,9 +327,11 @@ static HRESULT WINAPI IWineD3DQueryImpl if (GL_SUPPORT(ARB_OCCLUSION_QUERY)) { if (dwIssueFlags & D3DISSUE_BEGIN) { GL_EXTCALL(glBeginQueryARB(GL_SAMPLES_PASSED_ARB, ((WineQueryOcclusionData *)This->extendedData)->queryId)); + checkGLcall("glBeginQuery()"); } if (dwIssueFlags & D3DISSUE_END) { GL_EXTCALL(glEndQueryARB(GL_SAMPLES_PASSED_ARB)); + checkGLcall("glEndQuery()"); } } else { FIXME("(%p) : Occlusion queries not supported\n", This);

1 0

H. Verbeet : wined3d: Add a couple of traces to the vertexdeclaration creation code.
by Alexandre Julliard 07 Aug '06

07 Aug '06

Module: wine Branch: refs/heads/master Commit: 02a8f74490cc0d765f828faa8d5972645bd218fc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=02a8f74490cc0d765f828fa… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Aug 7 19:21:54 2006 +0200 wined3d: Add a couple of traces to the vertexdeclaration creation code. --- dlls/wined3d/utils.c | 46 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/vertexdeclaration.c | 14 ++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ include/wine/wined3d_types.h | 10 ++++++++ 4 files changed, 72 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index fc9edf6..debd8a3 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -269,6 +269,51 @@ #undef WINED3DUSAGEQUERY_TO_STR } } +const char* debug_d3ddeclmethod(WINED3DDECLMETHOD method) { + switch (method) { +#define WINED3DDECLMETHOD_TO_STR(u) case u: return #u + WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_DEFAULT); + WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_PARTIALU); + WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_PARTIALV); + WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_CROSSUV); + WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_UV); + WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_LOOKUP); + WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_LOOKUPPRESAMPLED); +#undef WINED3DDECLMETHOD_TO_STR + default: + FIXME("Unrecognized %u declaration method!\n", method); + return "unrecognized"; + } +} + +const char* debug_d3ddecltype(WINED3DDECLTYPE type) { + switch (type) { +#define WINED3DDECLTYPE_TO_STR(u) case u: return #u + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_FLOAT1); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_FLOAT2); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_FLOAT3); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_FLOAT4); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_D3DCOLOR); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_UBYTE4); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_SHORT2); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_SHORT4); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_UBYTE4N); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_SHORT2N); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_SHORT4N); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_USHORT2N); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_USHORT4N); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_UDEC3); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_DEC3N); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_FLOAT16_2); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_FLOAT16_4); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_UNUSED); +#undef WINED3DDECLTYPE_TO_STR + default: + FIXME("Unrecognized %u declaration type!\n", type); + return "unrecognized"; + } +} + const char* debug_d3ddeclusage(BYTE usage) { switch (usage) { #define WINED3DDECLUSAGE_TO_STR(u) case u: return #u @@ -600,6 +645,7 @@ #undef POOL_TO_STR return "unrecognized"; } } + /***************************************************************************** * Useful functions mapping GL <-> D3D values */ diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 8045745..eeacb31 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -170,6 +170,16 @@ #define D3DVSD_TOKENTYPEMASK (0x7 #define D3DVSD_END() 0xFFFFFFFF #define D3DVSD_NOP() 0x00000000 +static void dump_wined3dvertexelement(const WINED3DVERTEXELEMENT *element) { + TRACE(" Stream: %d\n", element->Stream); + TRACE(" Offset: %d\n", element->Offset); + TRACE(" Type: %s (%#x)\n", debug_d3ddecltype(element->Type), element->Type); + TRACE(" Method: %s (%#x)\n", debug_d3ddeclmethod(element->Method), element->Method); + TRACE(" Usage: %s (%#x)\n", debug_d3ddeclusage(element->Usage), element->Usage); + TRACE("Usage index: %d\n", element->UsageIndex); + TRACE(" Register: %d\n", element->Reg); +} + static DWORD IWineD3DVertexDeclarationImpl_ParseToken8(const DWORD* pToken) { const DWORD token = *pToken; DWORD tokenlen = 1; @@ -298,6 +308,8 @@ #define MAKE_LOOKUP(_reg,_usage,_usagein convToW[nTokens].Type = type; convToW[nTokens].Offset = offset; convToW[nTokens].Reg = reg; + TRACE("Adding element %ld:\n", nTokens); + dump_wined3dvertexelement(&convToW[nTokens]); offset += glTypeLookup[type].size * glTypeLookup[type].typesize; ++nTokens; } else if (D3DVSD_TOKEN_STREAMDATA == tokentype && 0x10000000 & tokentype ) { @@ -386,6 +398,8 @@ static HRESULT IWineD3DVertexDeclaration for(i = 0; i < This->declaration9NumElements; ++i) { memcpy(This->pDeclarationWine + i, This->pDeclaration9 + i, sizeof(D3DVERTEXELEMENT9)); This->pDeclarationWine[i].Reg = -1; + TRACE("Adding element %d:\n", i); + dump_wined3dvertexelement(&This->pDeclarationWine[i]); } This->declarationWNumElements = This->declaration9NumElements; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7ef8877..a87439b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1216,6 +1216,8 @@ const char* debug_d3ddevicetype(D3DDEVTY const char* debug_d3dresourcetype(WINED3DRESOURCETYPE res); const char* debug_d3dusage(DWORD usage); const char* debug_d3dusagequery(DWORD usagequery); +const char* debug_d3ddeclmethod(WINED3DDECLMETHOD method); +const char* debug_d3ddecltype(WINED3DDECLTYPE type); const char* debug_d3ddeclusage(BYTE usage); const char* debug_d3dprimitivetype(D3DPRIMITIVETYPE PrimitiveType); const char* debug_d3drenderstate(DWORD state); diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 5538563..a82f094 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -893,6 +893,16 @@ typedef struct glDescriptor { int/*GLenum*/ glType; } glDescriptor; +typedef enum _WINED3DDECLMETHOD { + WINED3DDECLMETHOD_DEFAULT = 0, + WINED3DDECLMETHOD_PARTIALU = 1, + WINED3DDECLMETHOD_PARTIALV = 2, + WINED3DDECLMETHOD_CROSSUV = 3, + WINED3DDECLMETHOD_UV = 4, + WINED3DDECLMETHOD_LOOKUP = 5, + WINED3DDECLMETHOD_LOOKUPPRESAMPLED = 6 +} WINED3DDECLMETHOD; + typedef enum _WINED3DDECLTYPE { WINED3DDECLTYPE_FLOAT1 = 0, WINED3DDECLTYPE_FLOAT2 = 1,

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
75
Older →

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 August 2006