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

Jason Green : wined3d: Implement more GLSL instructions.
by Alexandre Julliard July 25, 2006

July 25, 2006

Module: wine Branch: refs/heads/master Commit: 7e90aba97be15e746839bda89f71bbd146af8c19 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7e90aba97be15e746839bda… Author: Jason Green <jave27(a)gmail.com> Date: Mon Jul 24 22:52:38 2006 -0400 wined3d: Implement more GLSL instructions. Implement D3DSIO_TEXREG2AR, TEXREG2GB, TEXREG2RGB, TEXM3X3TEX, TEXM3X3SPEC. --- dlls/wined3d/glsl_shader.c | 134 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/pixelshader.c | 10 +-- dlls/wined3d/wined3d_private.h | 5 + 3 files changed, 144 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=7e90aba97be15e74683…

1 0

Mike McCormack : msi: Fix where queries on 32bit integer columns.
by Alexandre Julliard July 25, 2006

July 25, 2006

Module: wine Branch: refs/heads/master Commit: 4ab109e507bcf29450da18f5935962e340ebf089 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4ab109e507bcf29450da18f… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jul 25 11:17:56 2006 +0900 msi: Fix where queries on 32bit integer columns. --- dlls/msi/query.h | 1 + dlls/msi/tests/db.c | 7 ++----- dlls/msi/where.c | 26 ++++++++++++++++++-------- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/msi/query.h b/dlls/msi/query.h index ea32c69..03ebbdd 100644 --- a/dlls/msi/query.h +++ b/dlls/msi/query.h @@ -53,6 +53,7 @@ #define EXPR_UVAL 6 #define EXPR_STRCMP 7 #define EXPR_WILDCARD 9 #define EXPR_COL_NUMBER_STRING 10 +#define EXPR_COL_NUMBER32 11 struct sql_str { LPCWSTR data; diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 5d03ca4..c268125 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1029,11 +1029,8 @@ static void test_where(void) query = "SELECT * FROM `Media` WHERE `LastSequence` >= 1"; r = do_query(hdb, query, &rec); - todo_wine - { - ok(r == ERROR_SUCCESS, "MsiViewFetch failed: %d\n", r); - ok( check_record( rec, 4, "one.cab"), "wrong cabinet\n"); - } + ok(r == ERROR_SUCCESS, "MsiViewFetch failed: %d\n", r); + ok( check_record( rec, 4, "one.cab"), "wrong cabinet\n"); MsiCloseHandle( hdb ); DeleteFile(msifile); diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 8fbedce..7670bfd 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -99,7 +99,7 @@ static UINT WHERE_set_int( struct tagMSI return wv->table->ops->set_int( wv->table, row, col, val ); } -static UINT INT_evaluate( UINT lval, UINT op, UINT rval ) +static INT INT_evaluate( INT lval, UINT op, INT rval ) { switch( op ) { @@ -156,7 +156,7 @@ static const WCHAR *STRING_evaluate( str } static UINT STRCMP_Evaluate( string_table *st, MSIVIEW *table, UINT row, - struct expr *cond, UINT *val, MSIRECORD *record ) + struct expr *cond, INT *val, MSIRECORD *record ) { int sr; const WCHAR *l_str, *r_str; @@ -180,18 +180,25 @@ static UINT STRCMP_Evaluate( string_tabl } static UINT WHERE_evaluate( MSIDATABASE *db, MSIVIEW *table, UINT row, - struct expr *cond, UINT *val, MSIRECORD *record ) + struct expr *cond, INT *val, MSIRECORD *record ) { - UINT r, lval, rval; + UINT r, tval; + INT lval, rval; if( !cond ) return ERROR_SUCCESS; switch( cond->type ) { - case EXPR_COL_NUMBER_STRING: case EXPR_COL_NUMBER: - return table->ops->fetch_int( table, row, cond->u.col_number, val ); + r = table->ops->fetch_int( table, row, cond->u.col_number, &tval ); + *val = tval - 0x8000; + return ERROR_SUCCESS; + + case EXPR_COL_NUMBER32: + r = table->ops->fetch_int( table, row, cond->u.col_number, &tval ); + *val = tval; + return r; case EXPR_UVAL: *val = cond->u.uval; @@ -226,7 +233,8 @@ static UINT WHERE_evaluate( MSIDATABASE static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) { MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view; - UINT count = 0, r, val, i; + UINT count = 0, r, i; + INT val; MSIVIEW *table = wv->table; TRACE("%p %p\n", wv, record); @@ -440,6 +448,8 @@ static UINT WHERE_VerifyCondition( MSIDA { if (type&MSITYPE_STRING) cond->type = EXPR_COL_NUMBER_STRING; + else if ((type&0xff) == 4) + cond->type = EXPR_COL_NUMBER32; else cond->type = EXPR_COL_NUMBER; cond->u.col_number = val; @@ -490,7 +500,7 @@ static UINT WHERE_VerifyCondition( MSIDA case EXPR_IVAL: *valid = 1; cond->type = EXPR_UVAL; - cond->u.uval = cond->u.ival + (1<<15); + cond->u.uval = cond->u.ival; break; case EXPR_WILDCARD: *valid = 1;

1 0

James Hawkins : msi: Add tests for the WHERE SQL clause.
by Alexandre Julliard July 25, 2006

July 25, 2006

Module: wine Branch: refs/heads/master Commit: 8144e171697bc3543c4c0b2ddd743ca3827db669 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8144e171697bc3543c4c0b2… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 24 17:10:23 2006 -0700 msi: Add tests for the WHERE SQL clause. --- dlls/msi/tests/db.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index fe2b8cf..5d03ca4 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -987,6 +987,58 @@ static void test_streamtable(void) DeleteFile(msifile); } +static void test_where(void) +{ + MSIHANDLE hdb = 0, rec; + LPSTR query; + UINT r; + + hdb = create_db(); + ok( hdb, "failed to create db\n"); + + r = run_query( hdb, + "CREATE TABLE `Media` (" + "`DiskId` SHORT NOT NULL, " + "`LastSequence` LONG, " + "`DiskPrompt` CHAR(64) LOCALIZABLE, " + "`Cabinet` CHAR(255), " + "`VolumeLabel` CHAR(32), " + "`Source` CHAR(72) " + "PRIMARY KEY `DiskId`)" ); + ok( r == S_OK, "cannot create Media table: %d\n", r ); + + r = run_query( hdb, "INSERT INTO `Media` " + "( `DiskId`, `LastSequence`, `DiskPrompt`, `Cabinet`, `VolumeLabel`, `Source` ) " + "VALUES ( 1, 0, '', 'zero.cab', '', '' )" ); + ok( r == S_OK, "cannot add file to the Media table: %d\n", r ); + + r = run_query( hdb, "INSERT INTO `Media` " + "( `DiskId`, `LastSequence`, `DiskPrompt`, `Cabinet`, `VolumeLabel`, `Source` ) " + "VALUES ( 2, 1, '', 'one.cab', '', '' )" ); + ok( r == S_OK, "cannot add file to the Media table: %d\n", r ); + + r = run_query( hdb, "INSERT INTO `Media` " + "( `DiskId`, `LastSequence`, `DiskPrompt`, `Cabinet`, `VolumeLabel`, `Source` ) " + "VALUES ( 3, 2, '', 'two.cab', '', '' )" ); + ok( r == S_OK, "cannot add file to the Media table: %d\n", r ); + + query = "SELECT * FROM `Media`"; + r = do_query(hdb, query, &rec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed: %d\n", r); + ok( check_record( rec, 4, "zero.cab"), "wrong cabinet\n"); + + query = "SELECT * FROM `Media` WHERE `LastSequence` >= 1"; + r = do_query(hdb, query, &rec); + todo_wine + { + ok(r == ERROR_SUCCESS, "MsiViewFetch failed: %d\n", r); + ok( check_record( rec, 4, "one.cab"), "wrong cabinet\n"); + } + + MsiCloseHandle( hdb ); + DeleteFile(msifile); +} + START_TEST(db) { test_msidatabase(); @@ -999,4 +1051,5 @@ START_TEST(db) test_msiexport(); test_longstrings(); test_streamtable(); + test_where(); }

1 0

Hwang YunSong(황윤성) : wineps.drv: Updated Korean resource.
by Alexandre Julliard July 25, 2006

July 25, 2006

Module: wine Branch: refs/heads/master Commit: 920b36bdc2903347326d6dfe834301eb94466272 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=920b36bdc2903347326d6df… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Tue Jul 25 08:46:36 2006 +0900 wineps.drv: Updated Korean resource. --- dlls/wineps.drv/wps_Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/wps_Ko.rc b/dlls/wineps.drv/wps_Ko.rc index a6793dd..75b576c 100644 --- a/dlls/wineps.drv/wps_Ko.rc +++ b/dlls/wineps.drv/wps_Ko.rc @@ -24,7 +24,7 @@ STYLE WS_POPUP | WS_CAPTION | WS_CLIPSI CAPTION "��" FONT 9, "MS Shell Dlg" { - LTEXT "�� ũ��(&z):", -1, 10, 6, 100, 8 + LTEXT "�� ũ��(&Z):", -1, 10, 6, 100, 8 LISTBOX IDD_PAPERS, 10, 15, 200, 45, LBS_STANDARD | LBS_HASSTRINGS | WS_TABSTOP GROUPBOX "��", -1, 10, 80, 200, 50

1 0

H. Verbeet : wined3d: D3d8 shaders can have a NULL pFunction, but a valid vertex declaration.
by Alexandre Julliard July 25, 2006

July 25, 2006

Module: wine Branch: refs/heads/master Commit: 2d6e661fbe1aec26fab03564edc82ee9fb8acea1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2d6e661fbe1aec26fab0356… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jul 25 00:50:43 2006 +0200 wined3d: D3d8 shaders can have a NULL pFunction, but a valid vertex declaration. --- dlls/wined3d/drawprim.c | 4 ++-- dlls/wined3d/vertexbuffer.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index b9dd6f8..bb48982 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -423,7 +423,7 @@ void primitiveDeclarationConvertToStride int reg; /* Locate the vertex declaration */ - if (useVertexShaderFunction && ((IWineD3DVertexShaderImpl *)This->stateBlock->vertexShader)->vertexDeclaration) { + if (This->stateBlock->vertexShader && ((IWineD3DVertexShaderImpl *)This->stateBlock->vertexShader)->vertexDeclaration) { TRACE("Using vertex declaration from shader\n"); vertexDeclaration = (IWineD3DVertexDeclarationImpl *)((IWineD3DVertexShaderImpl *)This->stateBlock->vertexShader)->vertexDeclaration; } else { @@ -2091,7 +2091,7 @@ void drawPrimitive(IWineD3DDevice *iface fixup = FALSE; } - else if (This->stateBlock->vertexDecl != NULL || useVertexShaderFunction) { + else if (This->stateBlock->vertexDecl || This->stateBlock->vertexShader) { /* Note: This is a fixed function or shader codepath. * This means it must handle both types of strided data. diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index b67a1ca..cea45fd 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -222,7 +222,7 @@ static void WINAPI IWineD3DVertexBuf /* Check against updated declarations */ memset(&strided, 0, sizeof(strided)); - if(device->stateBlock->vertexDecl != NULL) { + if(device->stateBlock->vertexDecl || device->stateBlock->vertexShader) { /* Check against the stream offset and make sure it is 0 */ This->Flags |= VBFLAG_LOAD;

1 0

H. Verbeet : wined3d: Add real occlusion query support.
by Alexandre Julliard July 25, 2006

July 25, 2006

Module: wine Branch: refs/heads/master Commit: 536638918d10207330c5c48b712fb50cd590a618 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=536638918d10207330c5c48… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jul 25 00:51:33 2006 +0200 wined3d: Add real occlusion query support. --- dlls/wined3d/device.c | 5 ++-- dlls/wined3d/query.c | 55 ++++++++++++++++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 2 + include/wine/wined3d_gl.h | 6 ++++ 4 files changed, 51 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cd166d2..323a2f5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1390,7 +1390,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl switch(Type) { case WINED3DQUERYTYPE_OCCLUSION: TRACE("(%p) occlusion query\n", This); - if (GL_SUPPORT(ARB_OCCLUSION_QUERY) || GL_SUPPORT(NV_OCCLUSION_QUERY)) + if (GL_SUPPORT(ARB_OCCLUSION_QUERY)) hr = WINED3D_OK; else WARN("Unsupported in local OpenGL implementation: ARB_OCCLUSION_QUERY/NV_OCCLUSION_QUERY\n"); @@ -1419,9 +1419,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl /* allocated the 'extended' data based on the type of query requested */ switch(Type){ case D3DQUERYTYPE_OCCLUSION: - if(GL_SUPPORT(ARB_OCCLUSION_QUERY) || GL_SUPPORT(NV_OCCLUSION_QUERY)) { + if(GL_SUPPORT(ARB_OCCLUSION_QUERY)) { TRACE("(%p) Allocating data for an occlusion query\n", This); object->extendedData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WineQueryOcclusionData)); + GL_EXTCALL(glGenQueriesARB(1, &((WineQueryOcclusionData *)(object->extendedData))->queryId)); break; } case D3DQUERYTYPE_VCACHE: diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index e01c8dc..026a23a 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -25,10 +25,15 @@ #include "config.h" #include "wined3d_private.h" /* -http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c/directx/graphics/programmingguide/advancedtopics/Queries.asp -*/ + * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… + * + * Occlusion Queries: + * http://www.gris.uni-tuebingen.de/~bartz/Publications/paper/hww98.pdf + * http://oss.sgi.com/projects/ogl-sample/registry/ARB/occlusion_query.txt + */ WINE_DEFAULT_DEBUG_CHANNEL(d3d); +#define GLINFO_LOCATION ((IWineD3DImpl *)(((IWineD3DDeviceImpl *)This->wineD3DDevice)->wineD3D))->gl_info /* ******************************************* IWineD3DQuery IUnknown parts follow @@ -89,6 +94,9 @@ static HRESULT WINAPI IWineD3DQueryImpl static HRESULT WINAPI IWineD3DQueryImpl_GetData(IWineD3DQuery* iface, void* pData, DWORD dwSize, DWORD dwGetDataFlags){ IWineD3DQueryImpl *This = (IWineD3DQueryImpl *)iface; + + TRACE("(%p) : type %#x, pData %p, dwSize %#lx, dwGetDataFlags %#lx\n", This, This->type, pData, dwSize, dwGetDataFlags); + if(dwSize == 0){ /*you can use this method to poll the resource for the query status*/ /*We return success(S_OK) if we support a feature, and faikure(S_FALSE) if we don't, just return success and fluff it for now*/ @@ -148,12 +156,15 @@ static HRESULT WINAPI IWineD3DQueryImpl case WINED3DQUERYTYPE_OCCLUSION: { DWORD* data = pData; - *data = 1; - /* TODO: opengl occlusion queries - http://www.gris.uni-tuebingen.de/~bartz/Publications/paper/hww98.pdf - http://oss.sgi.com/projects/ogl-sample/registry/ARB/occlusion_query.txt - http://oss.sgi.com/projects/ogl-sample/registry/ARB/occlusion_query.txt - */ + if (GL_SUPPORT(ARB_OCCLUSION_QUERY)) { + GLint samples; + GL_EXTCALL(glGetQueryObjectivARB(((WineQueryOcclusionData *)This->extendedData)->queryId, GL_QUERY_RESULT_ARB, &samples)); + TRACE("(%p) : Returning %d samples.\n", This, samples); + *data = samples; + } else { + FIXME("(%p) : Occlusion queries not supported. Returning 1.\n", This); + *data = 1; + } } break; case WINED3DQUERYTYPE_TIMESTAMP: @@ -263,11 +274,6 @@ static DWORD WINAPI IWineD3DQueryImpl_G break; case WINED3DQUERYTYPE_OCCLUSION: dataSize = sizeof(DWORD); - /* - http://www.gris.uni-tuebingen.de/~bartz/Publications/paper/hww98.pdf - http://oss.sgi.com/projects/ogl-sample/registry/ARB/occlusion_query.txt - http://oss.sgi.com/projects/ogl-sample/registry/ARB/occlusion_query.txt - */ break; case WINED3DQUERYTYPE_TIMESTAMP: dataSize = sizeof(UINT64); @@ -312,7 +318,28 @@ static WINED3DQUERYTYPE WINAPI IWineD3D static HRESULT WINAPI IWineD3DQueryImpl_Issue(IWineD3DQuery* iface, DWORD dwIssueFlags){ IWineD3DQueryImpl *This = (IWineD3DQueryImpl *)iface; - FIXME("(%p) : stub\n", This); + + TRACE("(%p) : dwIssueFlags %#lx, type %#x\n", This, dwIssueFlags, This->type); + + switch (This->type) { + case WINED3DQUERYTYPE_OCCLUSION: + if (GL_SUPPORT(ARB_OCCLUSION_QUERY)) { + if (dwIssueFlags & D3DISSUE_BEGIN) { + GL_EXTCALL(glBeginQueryARB(GL_SAMPLES_PASSED_ARB, ((WineQueryOcclusionData *)This->extendedData)->queryId)); + } + if (dwIssueFlags & D3DISSUE_END) { + GL_EXTCALL(glEndQueryARB(GL_SAMPLES_PASSED_ARB)); + } + } else { + FIXME("(%p) : Occlusion queries not supported\n", This); + } + break; + + default: + FIXME("(%p) : Unhandled query type %#x\n", This, This->type); + break; + } + return WINED3D_OK; /* can be WINED3DERR_INVALIDCALL. */ } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 813919a..1017c77 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1160,7 +1160,7 @@ extern const IWineD3DQueryVtbl IWineD3DQ /* Datastructures for IWineD3DQueryImpl.extendedData */ typedef struct WineQueryOcclusionData { - unsigned int queryId; + GLuint queryId; } WineQueryOcclusionData; diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 7937626..a0b96d6 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -1417,6 +1417,12 @@ #define GL_EXT_FUNCS_GEN \ USE_GL_FUNC(WINED3D_PFNGLMULTITEXCOORD2FARBPROC, glMultiTexCoord2fARB); \ USE_GL_FUNC(WINED3D_PFNGLMULTITEXCOORD3FARBPROC, glMultiTexCoord3fARB); \ USE_GL_FUNC(WINED3D_PFNGLMULTITEXCOORD4FARBPROC, glMultiTexCoord4fARB); \ + /* GL_ARB_occlusion_query */ \ + USE_GL_FUNC(PGLFNGENQUERIESARBPROC, glGenQueriesARB); \ + USE_GL_FUNC(PGLFNDELETEQUERIESARBPROC, glDeleteQueriesARB); \ + USE_GL_FUNC(PGLFNBEGINQUERYARBPROC, glBeginQueryARB); \ + USE_GL_FUNC(PGLFNENDQUERYARBPROC, glEndQueryARB); \ + USE_GL_FUNC(PGLFNGETQUERYOBJECTIVARBPROC, glGetQueryObjectivARB); \ /* GL_ARB_point_parameters */ \ USE_GL_FUNC(PGLFNGLPOINTPARAMETERFARBPROC, glPointParameterfARB); \ USE_GL_FUNC(PGLFNGLPOINTPARAMETERFVARBPROC, glPointParameterfvARB); \

1 0

Dan Hipschman : widl: Support SAFEARRAY(type) syntax.
by Alexandre Julliard July 25, 2006

July 25, 2006

Module: wine Branch: refs/heads/master Commit: 12a9dfd62fcfb0be520b0bba2954b780dc994329 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=12a9dfd62fcfb0be520b0bb… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Jul 24 14:40:44 2006 -0700 widl: Support SAFEARRAY(type) syntax. --- tools/widl/parser.l | 1 + tools/widl/parser.y | 8 ++++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index cefdca9..4fedd34 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -145,6 +145,7 @@ static UUID* parse_uuid(const char*u) yylval.num = strtoul(yytext, NULL, 0); return aNUM; } +SAFEARRAY{ws}*/\( return tSAFEARRAY; {cident} return kw_token(yytext); \n line_number++; {ws} diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 7257bd8..a7b1269 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -83,6 +83,7 @@ static ifref_t *make_ifref(type_t *iface static var_t *make_var(char *name); static func_t *make_func(var_t *def, var_t *args); static class_t *make_class(char *name); +static type_t *make_safearray(void); static type_t *reg_type(type_t *type, const char *name, int t); static type_t *reg_types(type_t *type, var_t *names, int t); @@ -179,6 +180,7 @@ static type_t std_uhyper = { "MIDL_uhype %token tREQUESTEDIT %token tRESTRICTED %token tRETVAL +%token tSAFEARRAY %token tSHORT %token tSIGNED %token tSINGLE @@ -777,6 +779,7 @@ type: tVOID { $$ = make_tref(NULL, | tSTRUCT aIDENTIFIER { $$ = make_tref(NULL, get_type(RPC_FC_STRUCT, $2, tsSTRUCT)); } | uniondef { $$ = make_tref(NULL, $1); } | tUNION aIDENTIFIER { $$ = make_tref(NULL, find_type2($2, tsUNION)); } + | tSAFEARRAY '(' type ')' { $$ = make_tref(NULL, make_safearray()); } ; typedef: tTYPEDEF m_attributes type pident_list { typeref_t *tref = uniq_tref($3); @@ -1139,6 +1142,11 @@ static class_t *make_class(char *name) return c; } +static type_t *make_safearray(void) +{ + return make_type(RPC_FC_FP, find_type("SAFEARRAY", 0)); +} + #define HASHMAX 64 static int hash_ident(const char *name)

1 0

H. Verbeet : wined3d: Add traces to IWineD3DVertexShaderImpl_SetFunction & IWineD3DPixelShaderImpl_SetFunction .
by Alexandre Julliard July 25, 2006

July 25, 2006

Module: wine Branch: refs/heads/master Commit: 8c981140a208ac7186498876ab2e82332f946fa5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8c981140a208ac718649887… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jul 25 00:51:03 2006 +0200 wined3d: Add traces to IWineD3DVertexShaderImpl_SetFunction & IWineD3DPixelShaderImpl_SetFunction. --- dlls/wined3d/pixelshader.c | 2 ++ dlls/wined3d/vertexshader.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index a1c8bf0..4a24213 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -919,6 +919,8 @@ static HRESULT WINAPI IWineD3DPixelShade HRESULT hr; shader_reg_maps reg_maps; + TRACE("(%p) : pFunction %p\n", iface, pFunction); + /* First pass: trace shader */ shader_trace_init((IWineD3DBaseShader*) This, pFunction); pshader_set_limits(This); diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 84f90f5..c0ee399 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -1126,6 +1126,8 @@ static HRESULT WINAPI IWineD3DVertexShad HRESULT hr; shader_reg_maps reg_maps; + TRACE("(%p) : pFunction %p\n", iface, pFunction); + /* First pass: trace shader */ shader_trace_init((IWineD3DBaseShader*) This, pFunction); vshader_set_limits(This);

1 0

Dan Hipschman : widl: Fix redefinition of types in output.
by Alexandre Julliard July 25, 2006

July 25, 2006

Module: wine Branch: refs/heads/master Commit: f3d01fb07b38858c28156eb1ec1799765f65fd20 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f3d01fb07b38858c28156eb… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Jul 24 14:39:38 2006 -0700 widl: Fix redefinition of types in output. --- tools/widl/header.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 2de2ca7..4cd599b 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -248,7 +248,7 @@ void write_type(FILE *h, type_t *t, cons break; case RPC_FC_ENUM16: case RPC_FC_ENUM32: - if (t->defined && !t->written) { + if (t->defined && !t->written && !t->ignore) { if (t->name) fprintf(h, "enum %s {\n", t->name); else fprintf(h, "enum {\n"); t->written = TRUE; @@ -274,7 +274,7 @@ void write_type(FILE *h, type_t *t, cons case RPC_FC_PSTRUCT: case RPC_FC_BOGUS_STRUCT: case RPC_FC_ENCAPSULATED_UNION: - if (t->defined && !t->written) { + if (t->defined && !t->written && !t->ignore) { if (t->name) fprintf(h, "struct %s {\n", t->name); else fprintf(h, "struct {\n"); t->written = TRUE; @@ -286,7 +286,7 @@ void write_type(FILE *h, type_t *t, cons else fprintf(h, "struct %s", t->name); break; case RPC_FC_NON_ENCAPSULATED_UNION: - if (t->defined && !t->written) { + if (t->defined && !t->written && !t->ignore) { if (t->name) fprintf(h, "union %s {\n", t->name); else fprintf(h, "union {\n"); t->written = TRUE;

1 0

Jacek Caban : shdocvw: Added more test and fixes.
by Alexandre Julliard July 25, 2006

July 25, 2006

Module: wine Branch: refs/heads/master Commit: f06f3cf470a9c5077e985bfbb1c823a6eecc0dcd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f06f3cf470a9c5077e985bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 24 23:10:00 2006 +0200 shdocvw: Added more test and fixes. --- dlls/shdocvw/tests/webbrowser.c | 117 +++++++++++++++++++++++++++++++++++++++ dlls/shdocvw/webbrowser.c | 6 +- 2 files changed, 120 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 5763fe0..7fa58c0 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -693,6 +693,122 @@ static void test_ClassInfo(IUnknown *unk IProvideClassInfo2_Release(class_info); } +static void test_ie_funcs(IUnknown *unk) +{ + IWebBrowser2 *wb; + VARIANT_BOOL b; + int i; + long hwnd; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); + ok(hres == S_OK, "Could not get IWebBrowser2 interface: %08lx\n", hres); + if(FAILED(hres)) + return; + + /* HWND */ + + hwnd = 0xdeadbeef; + hres = IWebBrowser2_get_HWND(wb, &hwnd); + ok(hres == E_FAIL, "get_HWND failed: %08lx, expected E_FAIL\n", hres); + ok(hwnd == 0, "unexpected hwnd %lx\n", hwnd); + + /* MenuBar */ + + hres = IWebBrowser2_get_MenuBar(wb, &b); + ok(hres == S_OK, "get_MenuBar failed: %08lx\n", hres); + ok(b == VARIANT_TRUE, "b=%x\n", b); + + hres = IWebBrowser2_put_MenuBar(wb, VARIANT_FALSE); + ok(hres == S_OK, "put_MenuBar failed: %08lx\n", hres); + + hres = IWebBrowser2_get_MenuBar(wb, &b); + ok(hres == S_OK, "get_MenuBar failed: %08lx\n", hres); + ok(b == VARIANT_FALSE, "b=%x\n", b); + + hres = IWebBrowser2_put_MenuBar(wb, 100); + ok(hres == S_OK, "put_MenuBar failed: %08lx\n", hres); + + hres = IWebBrowser2_get_MenuBar(wb, &b); + ok(hres == S_OK, "get_MenuBar failed: %08lx\n", hres); + ok(b == VARIANT_TRUE, "b=%x\n", b); + + /* AddressBar */ + + hres = IWebBrowser2_get_AddressBar(wb, &b); + ok(hres == S_OK, "get_AddressBar failed: %08lx\n", hres); + ok(b == VARIANT_TRUE, "b=%x\n", b); + + hres = IWebBrowser2_put_AddressBar(wb, VARIANT_FALSE); + ok(hres == S_OK, "put_AddressBar failed: %08lx\n", hres); + + hres = IWebBrowser2_get_AddressBar(wb, &b); + ok(hres == S_OK, "get_MenuBar failed: %08lx\n", hres); + ok(b == VARIANT_FALSE, "b=%x\n", b); + + hres = IWebBrowser2_put_AddressBar(wb, 100); + ok(hres == S_OK, "put_AddressBar failed: %08lx\n", hres); + + hres = IWebBrowser2_get_AddressBar(wb, &b); + ok(hres == S_OK, "get_AddressBar failed: %08lx\n", hres); + ok(b == VARIANT_TRUE, "b=%x\n", b); + + hres = IWebBrowser2_put_AddressBar(wb, VARIANT_TRUE); + ok(hres == S_OK, "put_MenuBar failed: %08lx\n", hres); + + /* StatusBar */ + + hres = IWebBrowser2_get_StatusBar(wb, &b); + ok(hres == S_OK, "get_StatusBar failed: %08lx\n", hres); + ok(b == VARIANT_TRUE, "b=%x\n", b); + + hres = IWebBrowser2_put_StatusBar(wb, VARIANT_TRUE); + ok(hres == S_OK, "put_StatusBar failed: %08lx\n", hres); + + hres = IWebBrowser2_get_StatusBar(wb, &b); + ok(hres == S_OK, "get_StatusBar failed: %08lx\n", hres); + ok(b == VARIANT_TRUE, "b=%x\n", b); + + hres = IWebBrowser2_put_StatusBar(wb, VARIANT_FALSE); + ok(hres == S_OK, "put_StatusBar failed: %08lx\n", hres); + + hres = IWebBrowser2_get_StatusBar(wb, &b); + ok(hres == S_OK, "get_StatusBar failed: %08lx\n", hres); + ok(b == VARIANT_FALSE, "b=%x\n", b); + + hres = IWebBrowser2_put_StatusBar(wb, 100); + ok(hres == S_OK, "put_StatusBar failed: %08lx\n", hres); + + hres = IWebBrowser2_get_StatusBar(wb, &b); + ok(hres == S_OK, "get_StatusBar failed: %08lx\n", hres); + ok(b == VARIANT_TRUE, "b=%x\n", b); + + /* ToolBar */ + + hres = IWebBrowser2_get_ToolBar(wb, &i); + ok(hres == S_OK, "get_ToolBar failed: %08lx\n", hres); + ok(i == VARIANT_TRUE, "i=%x\n", i); + + hres = IWebBrowser2_put_ToolBar(wb, VARIANT_FALSE); + ok(hres == S_OK, "put_ToolBar failed: %08lx\n", hres); + + hres = IWebBrowser2_get_ToolBar(wb, &i); + ok(hres == S_OK, "get_ToolBar failed: %08lx\n", hres); + ok(i == VARIANT_FALSE, "b=%x\n", i); + + hres = IWebBrowser2_put_ToolBar(wb, 100); + ok(hres == S_OK, "put_ToolBar failed: %08lx\n", hres); + + hres = IWebBrowser2_get_ToolBar(wb, &i); + ok(hres == S_OK, "get_ToolBar failed: %08lx\n", hres); + ok(i == VARIANT_TRUE, "i=%x\n", i); + + hres = IWebBrowser2_put_ToolBar(wb, VARIANT_TRUE); + ok(hres == S_OK, "put_ToolBar failed: %08lx\n", hres); + + IWebBrowser2_Release(wb); +} + static void test_WebBrowser(void) { IUnknown *unk = NULL; @@ -709,6 +825,7 @@ static void test_WebBrowser(void) test_ClientSite(unk, &ClientSite); test_DoVerb(unk); test_ClientSite(unk, NULL); + test_ie_funcs(unk); ref = IUnknown_Release(unk); ok(ref == 0, "ref=%ld, expected 0\n", ref); diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 7ab2ffc..2755bdd 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -541,7 +541,7 @@ static HRESULT WINAPI WebBrowser_put_Sta TRACE("(%p)->(%x)\n", This, Value); - This->status_bar = Value; + This->status_bar = Value ? VARIANT_TRUE : VARIANT_FALSE; /* In opposition to InternetExplorer, all we should do here is * inform the embedder about the status bar change. */ @@ -615,7 +615,7 @@ static HRESULT WINAPI WebBrowser_put_Men TRACE("(%p)->(%x)\n", This, Value); - This->menu_bar = Value; + This->menu_bar = Value ? VARIANT_TRUE : VARIANT_FALSE; /* In opposition to InternetExplorer, all we should do here is * inform the embedder about the menu bar change. */ @@ -815,7 +815,7 @@ static HRESULT WINAPI WebBrowser_put_Add TRACE("(%p)->(%x)\n", This, Value); - This->address_bar = Value; + This->address_bar = Value ? VARIANT_TRUE : VARIANT_FALSE; /* In opposition to InternetExplorer, all we should do here is * inform the embedder about the address bar change. */

1 0