February 2009 - Wine-commits

Henri Verbeet : d3d10: Add the ID3D10EffectTechnique interface.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 88f6c5c67b1a43f82a05feeb0dc4e3e0670f8bbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=88f6c5c67b1a43f82a05feeb0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 26 09:00:00 2009 +0100 d3d10: Add the ID3D10EffectTechnique interface. --- include/d3d10effect.h | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/include/d3d10effect.h b/include/d3d10effect.h index 9372112..acd5d83 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -26,6 +26,10 @@ #define D3D10_EFFECT_VARIABLE_ANNOTATION 0x2 #define D3D10_EFFECT_VARIABLE_EXPLICIT_BIND_POINT 0x4 +#ifndef D3D10_BYTES_FROM_BITS +#define D3D10_BYTES_FROM_BITS(x) (((x) + 7) >> 3) +#endif + typedef struct _D3D10_EFFECT_TYPE_DESC { LPCSTR TypeName; @@ -50,6 +54,41 @@ typedef struct _D3D10_EFFECT_VARIABLE_DESC UINT ExplicitBindPoint; } D3D10_EFFECT_VARIABLE_DESC; +typedef struct _D3D10_TECHNIQUE_DESC +{ + LPCSTR Name; + UINT Passes; + UINT Annotations; +} D3D10_TECHNIQUE_DESC; + +typedef struct _D3D10_STATE_BLOCK_MASK +{ + BYTE VS; + BYTE VSSamplers[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT)]; + BYTE VSShaderResources[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT)]; + BYTE VSConstantBuffers[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT)]; + BYTE GS; + BYTE GSSamplers[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT)]; + BYTE GSShaderResources[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT)]; + BYTE GSConstantBuffers[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT)]; + BYTE PS; + BYTE PSSamplers[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT)]; + BYTE PSShaderResources[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT)]; + BYTE PSConstantBuffers[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT)]; + BYTE IAVertexBuffers[D3D10_BYTES_FROM_BITS(D3D10_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT)]; + BYTE IAIndexBuffer; + BYTE IAInputLayout; + BYTE IAPrimitiveTopology; + BYTE OMRenderTargets; + BYTE OMDepthStencilState; + BYTE OMBlendState; + BYTE RSViewports; + BYTE RSScissorRects; + BYTE RSRasterizerState; + BYTE SOBuffers; + BYTE Predication; +} D3D10_STATE_BLOCK_MASK; + DEFINE_GUID(IID_ID3D10EffectType, 0x4e9e1ddc, 0xcd9d, 0x4772, 0xa8, 0x37, 0x00, 0x18, 0x0b, 0x9b, 0x88, 0xfd); #define INTERFACE ID3D10EffectType @@ -137,4 +176,19 @@ DECLARE_INTERFACE_(ID3D10EffectConstantBuffer, ID3D10EffectVariable) }; #undef INTERFACE +DEFINE_GUID(IID_ID3D10EffectTechnique, 0xdb122ce8, 0xd1c9, 0x4292, 0xb2, 0x37, 0x24, 0xed, 0x3d, 0xe8, 0xb1, 0x75); + +#define INTERFACE ID3D10EffectTechnique +DECLARE_INTERFACE(ID3D10EffectTechnique) +{ + STDMETHOD_(BOOL, IsValid)(THIS) PURE; + STDMETHOD(GetDesc)(THIS_ D3D10_TECHNIQUE_DESC *desc) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D10EffectPass *, GetPassByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectPass *, GetPassByName)(THIS_ LPCSTR name) PURE; + STDMETHOD(ComputeStateBlockMask)(THIS_ D3D10_STATE_BLOCK_MASK *mask) PURE; +}; +#undef INTERFACE + #endif /* __WINE_D3D10EFFECT_H */

1 0

Henri Verbeet : d3d10: Add the ID3D10EffectConstantBuffer interface.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 0a9857f45a757e6616dd64041becf3aec595b437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a9857f45a757e6616dd64041… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 26 09:00:00 2009 +0100 d3d10: Add the ID3D10EffectConstantBuffer interface. --- include/d3d10effect.h | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/include/d3d10effect.h b/include/d3d10effect.h index e76a394..9372112 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -98,4 +98,43 @@ DECLARE_INTERFACE(ID3D10EffectVariable) }; #undef INTERFACE +DEFINE_GUID(IID_ID3D10EffectConstantBuffer, 0x56648f4d, 0xcc8b, 0x4444, 0xa5, 0xad, 0xb5, 0xa3, 0xd7, 0x6e, 0x91, 0xb3); + +#define INTERFACE ID3D10EffectConstantBuffer +DECLARE_INTERFACE_(ID3D10EffectConstantBuffer, ID3D10EffectVariable) +{ + /* ID3D10EffectVariable methods */ + STDMETHOD_(BOOL, IsValid)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE; + STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectVectorVariable *, AsVector)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectMatrixVariable *, AsMatrix)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectStringVariable *, AsString)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectShaderResourceVariable *, AsShaderResource)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectRenderTargetViewVariable *, AsRenderTargetView)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectDepthStencilViewVariable *, AsDepthStencilView)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectConstantBuffer *, AsConstantBuffer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectShaderVariable *, AsShader)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectBlendVariable *, AsBlend)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectDepthStencilVariable *, AsDepthStencil)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectRasterizerVariable *, AsRasterizer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectSamplerVariable *, AsSampler)(THIS) PURE; + STDMETHOD(SetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE; + STDMETHOD(GetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE; + /* ID3D10EffectConstantBuffer methods */ + STDMETHOD(SetConstantBuffer)(THIS_ ID3D10Buffer *buffer) PURE; + STDMETHOD(GetConstantBuffer)(THIS_ ID3D10Buffer **buffer) PURE; + STDMETHOD(SetTextureBuffer)(THIS_ ID3D10ShaderResourceView *view) PURE; + STDMETHOD(GetTextureBuffer)(THIS_ ID3D10ShaderResourceView **view) PURE; +}; +#undef INTERFACE + #endif /* __WINE_D3D10EFFECT_H */

1 0

James Hawkins : msi: Fix a failing test on win9x.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: b55c0310320d8e8ce8212a6e78a098c427d5b624 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b55c0310320d8e8ce8212a6e7… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Feb 25 21:14:28 2009 -0800 msi: Fix a failing test on win9x. --- dlls/msi/tests/automation.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index f831ef4..ca40f09 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -2295,12 +2295,22 @@ static void test_Installer_InstallProduct(void) ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); res = find_registry_key(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData", "05FA3C1F65B896A40AC00077F34EF203", &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS || + broken(res == ERROR_FILE_NOT_FOUND), /* win9x */ + "Expected ERROR_SUCCESS, got %d\n", res); if (res == ERROR_SUCCESS) { res = delete_registry_key(hkey, "05FA3C1F65B896A40AC00077F34EF203"); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); RegCloseKey(hkey); + + res = RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Installer\\Products\\05FA3C1F65B896A40AC00077F34EF203"); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + } + else + { + /* win9x defaults to a per-machine install. */ + RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Installer\\Products\\05FA3C1F65B896A40AC00077F34EF203"); } /* Remove registry keys written by PublishProduct standard action */ @@ -2315,9 +2325,6 @@ static void test_Installer_InstallProduct(void) RegCloseKey(hkey); - res = RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Installer\\Products\\05FA3C1F65B896A40AC00077F34EF203"); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); - /* Delete installation files we installed */ delete_test_files(); }

1 0

James Hawkins : msi: Trace the username to help debug test failures on certain machines.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: a7d5adc91f3c1f9e6b68d66e342f0b19004ace7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7d5adc91f3c1f9e6b68d66e3… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Feb 25 20:15:37 2009 -0800 msi: Trace the username to help debug test failures on certain machines. --- dlls/msi/tests/source.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index b508a15..192f010 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -3145,6 +3145,8 @@ static void test_MsiSourceListAddSource(void) size = MAX_PATH; GetUserNameA(ptr, &size); + trace("username: %s\n", username); + /* GetLastError is not set by the function */ /* NULL szProduct */

1 0

James Hawkins : msi: A non-temporary table cannot have a temporary primary key.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 241933e13ccc07ea32165f6f728ddbda865b6389 URL: http://source.winehq.org/git/wine.git/?a=commit;h=241933e13ccc07ea32165f6f7… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Feb 25 19:45:22 2009 -0800 msi: A non-temporary table cannot have a temporary primary key. --- dlls/msi/create.c | 9 +++++++++ dlls/msi/sql.y | 10 ++++++++-- dlls/msi/tests/db.c | 2 -- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/msi/create.c b/dlls/msi/create.c index 571d006..0d4d9cf 100644 --- a/dlls/msi/create.c +++ b/dlls/msi/create.c @@ -161,6 +161,7 @@ UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, UINT r; column_info *col; BOOL temp = TRUE; + BOOL tempprim = FALSE; TRACE("%p\n", cv ); @@ -179,6 +180,14 @@ UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, if( !col->temporary ) temp = FALSE; + else if ( col->type & MSITYPE_KEY ) + tempprim = TRUE; + } + + if ( !temp && tempprim ) + { + msi_free( cv ); + return ERROR_FUNCTION_FAILED; } /* fill the structure */ diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index 0ddbc64..2c87884 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -45,6 +45,7 @@ typedef struct tag_SQL_input MSIDATABASE *db; LPCWSTR command; DWORD n, len; + UINT r; MSIVIEW **view; /* view structure for the resulting query */ struct list *mem; } SQL_input; @@ -166,12 +167,16 @@ onecreate: { SQL_input* sql = (SQL_input*) info; MSIVIEW *create = NULL; + UINT r; if( !$5 ) YYABORT; - CREATE_CreateView( sql->db, &create, $3, $5, FALSE ); + r = CREATE_CreateView( sql->db, &create, $3, $5, FALSE ); if( !create ) + { + sql->r = r; YYABORT; + } $$ = create; } | TK_CREATE TK_TABLE table TK_LP table_def TK_RP TK_HOLD @@ -914,6 +919,7 @@ UINT MSI_ParseSQL( MSIDATABASE *db, LPCWSTR command, MSIVIEW **phview, sql.command = command; sql.n = 0; sql.len = 0; + sql.r = ERROR_BAD_QUERY_SYNTAX; sql.view = phview; sql.mem = mem; @@ -923,7 +929,7 @@ UINT MSI_ParseSQL( MSIDATABASE *db, LPCWSTR command, MSIVIEW **phview, if( r ) { *sql.view = NULL; - return ERROR_BAD_QUERY_SYNTAX; + return sql.r; } return ERROR_SUCCESS; diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 91426ca..5a9f7b1 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3286,14 +3286,12 @@ static void test_temporary_table(void) cond = MsiDatabaseIsTablePersistent(hdb, "T3"); ok( cond == MSICONDITION_TRUE, "wrong return condition\n"); - todo_wine { query = "CREATE TABLE `T4` ( `B` SHORT NOT NULL, `C` CHAR(255) TEMPORARY PRIMARY KEY `C`)"; r = run_query(hdb, 0, query); ok(r == ERROR_FUNCTION_FAILED, "failed to add table\n"); cond = MsiDatabaseIsTablePersistent(hdb, "T4"); ok( cond == MSICONDITION_NONE, "wrong return condition\n"); - } query = "CREATE TABLE `T5` ( `B` SHORT NOT NULL TEMP, `C` CHAR(255) TEMP PRIMARY KEY `C`) HOLD"; r = run_query(hdb, 0, query);

1 0

James Hawkins : msi: Don't create a temporary table that is not held.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: ea28915133f7b96512233ca194a890e46a50b80e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea28915133f7b96512233ca19… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Feb 25 19:45:28 2009 -0800 msi: Don't create a temporary table that is not held. --- dlls/msi/create.c | 7 ++++++- dlls/msi/package.c | 17 +++++++++-------- dlls/msi/tests/db.c | 7 +++++-- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/msi/create.c b/dlls/msi/create.c index 0d4d9cf..8a801f2 100644 --- a/dlls/msi/create.c +++ b/dlls/msi/create.c @@ -44,6 +44,7 @@ typedef struct tagMSICREATEVIEW MSIDATABASE *db; LPWSTR name; BOOL bIsTemp; + BOOL hold; column_info *col_info; } MSICREATEVIEW; @@ -62,9 +63,12 @@ static UINT CREATE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) MSITABLE *table; BOOL persist = (cv->bIsTemp) ? MSICONDITION_FALSE : MSICONDITION_TRUE; - TRACE("%p Table %s (%s)\n", cv, debugstr_w(cv->name), + TRACE("%p Table %s (%s)\n", cv, debugstr_w(cv->name), cv->bIsTemp?"temporary":"permanent"); + if (cv->bIsTemp && !cv->hold) + return ERROR_SUCCESS; + return msi_create_table( cv->db, cv->name, cv->col_info, persist, &table); } @@ -197,6 +201,7 @@ UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, cv->name = table; cv->col_info = col_info; cv->bIsTemp = temp; + cv->hold = hold; *view = (MSIVIEW*) cv; return ERROR_SUCCESS; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 6ae4870..f662fe0 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -66,14 +66,15 @@ static UINT create_temp_property_table(MSIPACKAGE *package) UINT rc; static const WCHAR CreateSql[] = { - 'C','R','E','A','T','E',' ','T','A','B','L','E',' ','`','_','P','r','o', - 'p','e','r','t','y','`',' ','(',' ','`','_','P','r','o','p','e','r','t', - 'y','`',' ','C','H','A','R','(','5','6',')',' ','N','O','T',' ','N','U', - 'L','L',' ','T','E','M','P','O','R','A','R','Y',',',' ','`','V','a','l', - 'u','e','`',' ','C','H','A','R','(','9','8',')',' ','N','O','T',' ','N', - 'U','L','L',' ','T','E','M','P','O','R','A','R','Y',' ','P','R','I','M', - 'A','R','Y',' ','K','E','Y',' ','`','_','P','r','o','p','e','r','t','y', - '`',')',0}; + 'C','R','E','A','T','E',' ','T','A','B','L','E',' ', + '`','_','P','r','o','p','e','r','t','y','`',' ','(',' ', + '`','_','P','r','o','p','e','r','t','y','`',' ', + 'C','H','A','R','(','5','6',')',' ','N','O','T',' ','N','U','L','L',' ', + 'T','E','M','P','O','R','A','R','Y',',',' ', + '`','V','a','l','u','e','`',' ','C','H','A','R','(','9','8',')',' ', + 'N','O','T',' ','N','U','L','L',' ','T','E','M','P','O','R','A','R','Y', + ' ','P','R','I','M','A','R','Y',' ','K','E','Y',' ', + '`','_','P','r','o','p','e','r','t','y','`',')',' ','H','O','L','D',0}; rc = MSI_DatabaseOpenViewW(package->db, CreateSql, &view); if (rc != ERROR_SUCCESS) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 5a9f7b1..e0694b2 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3274,10 +3274,13 @@ static void test_temporary_table(void) r = run_query(hdb, 0, query); ok(r == ERROR_SUCCESS, "failed to add table\n"); - todo_wine { + query = "SELECT * FROM `T2`"; + r = MsiDatabaseOpenView(hdb, query, &view); + ok(r == ERROR_BAD_QUERY_SYNTAX, + "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + cond = MsiDatabaseIsTablePersistent(hdb, "T2"); ok( cond == MSICONDITION_NONE, "wrong return condition\n"); - } query = "CREATE TABLE `T3` ( `B` SHORT NOT NULL TEMPORARY, `C` CHAR(255) PRIMARY KEY `C`)"; r = run_query(hdb, 0, query);

1 0

James Hawkins : msi: Fix a failing test on win9x.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 5735e2fafd9aefebbd31ef04f2414fa04aa11419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5735e2fafd9aefebbd31ef04f… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Feb 25 20:15:31 2009 -0800 msi: Fix a failing test on win9x. --- dlls/msi/tests/install.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 95dd03a..601b0f7 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -4628,10 +4628,15 @@ static void test_missingcab(void) create_pf_data("msitest\\caesar", "abcdefgh", TRUE); r = MsiInstallProductA(msifile, NULL); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + ok(r == ERROR_SUCCESS || + broken(r == ERROR_INSTALL_FAILURE), /* win9x */ + "Expected ERROR_SUCCESS, got %u\n", r); + if (r == ERROR_SUCCESS) + { + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + } ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(!delete_pf("msitest\\gaius", TRUE), "File installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n");

1 0

James Hawkins : msi: The _Tables and _Columns tables have no persistence attribute.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 74aa05348540f3bdac4d1dd759072de50e494d0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=74aa05348540f3bdac4d1dd75… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Feb 25 19:45:15 2009 -0800 msi: The _Tables and _Columns tables have no persistence attribute. --- dlls/msi/create.c | 3 ++- dlls/msi/query.h | 2 +- dlls/msi/table.c | 23 ++++++++++++----------- dlls/msi/tests/db.c | 2 -- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/msi/create.c b/dlls/msi/create.c index 0c61c76..571d006 100644 --- a/dlls/msi/create.c +++ b/dlls/msi/create.c @@ -60,11 +60,12 @@ static UINT CREATE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) { MSICREATEVIEW *cv = (MSICREATEVIEW*)view; MSITABLE *table; + BOOL persist = (cv->bIsTemp) ? MSICONDITION_FALSE : MSICONDITION_TRUE; TRACE("%p Table %s (%s)\n", cv, debugstr_w(cv->name), cv->bIsTemp?"temporary":"permanent"); - return msi_create_table( cv->db, cv->name, cv->col_info, !cv->bIsTemp, &table); + return msi_create_table( cv->db, cv->name, cv->col_info, persist, &table); } static UINT CREATE_close( struct tagMSIVIEW *view ) diff --git a/dlls/msi/query.h b/dlls/msi/query.h index 25bb500..93b13fd 100644 --- a/dlls/msi/query.h +++ b/dlls/msi/query.h @@ -124,6 +124,6 @@ int sqliteGetToken(const WCHAR *z, int *tokenType); MSIRECORD *msi_query_merge_record( UINT fields, const column_info *vl, MSIRECORD *rec ); UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, - BOOL persistent, MSITABLE **table_ret); + MSICONDITION persistent, MSITABLE **table_ret); #endif /* __WINE_MSI_QUERY_H */ diff --git a/dlls/msi/table.c b/dlls/msi/table.c index e9c2196..369dde4 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -78,7 +78,7 @@ struct tagMSITABLE struct list entry; MSICOLUMNINFO *colinfo; UINT col_count; - BOOL persistent; + MSICONDITION persistent; INT ref_count; WCHAR name[1]; }; @@ -610,7 +610,7 @@ static UINT table_get_column_info( MSIDATABASE *db, LPCWSTR name, MSICOLUMNINFO } UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, - BOOL persistent, MSITABLE **table_ret) + MSICONDITION persistent, MSITABLE **table_ret) { UINT r, nField; MSIVIEW *tv = NULL; @@ -683,7 +683,7 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, if( r ) goto err; - r = tv->ops->insert_row( tv, rec, !persistent ); + r = tv->ops->insert_row( tv, rec, persistent == MSICONDITION_FALSE ); TRACE("insert_row returned %x\n", r); if( r ) goto err; @@ -694,7 +694,7 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, msiobj_release( &rec->hdr ); rec = NULL; - if( persistent ) + if( persistent != MSICONDITION_FALSE ) { /* add each column to the _Columns table */ r = TABLE_CreateView( db, szColumns, &tv ); @@ -785,9 +785,12 @@ static UINT get_table( MSIDATABASE *db, LPCWSTR name, MSITABLE **table_ret ) table->nonpersistent_data = NULL; table->colinfo = NULL; table->col_count = 0; - table->persistent = TRUE; + table->persistent = MSICONDITION_TRUE; lstrcpyW( table->name, name ); + if ( !lstrcmpW(name, szTables) || !lstrcmpW(name, szColumns) ) + table->persistent = MSICONDITION_NONE; + r = table_get_column_info( db, name, &table->colinfo, &table->col_count); if (r != ERROR_SUCCESS) { @@ -813,7 +816,7 @@ static UINT save_table( MSIDATABASE *db, const MSITABLE *t ) UINT rawsize, r, i, j, row_size; /* Nothing to do for non-persistent tables */ - if( !t->persistent ) + if( t->persistent == MSICONDITION_FALSE ) return ERROR_SUCCESS; TRACE("Saving %s\n", debugstr_w( t->name ) ); @@ -1298,7 +1301,8 @@ static UINT TABLE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI continue; /* if row >= tv->table->row_count then it is a non-persistent row */ - persistent = tv->table->persistent && (row < tv->table->row_count); + persistent = (tv->table->persistent != MSICONDITION_FALSE) && + (row < tv->table->row_count); /* FIXME: should we allow updating keys? */ val = 0; @@ -2214,10 +2218,7 @@ MSICONDITION MSI_DatabaseIsTablePersistent( MSIDATABASE *db, LPCWSTR table ) if (r != ERROR_SUCCESS) return MSICONDITION_NONE; - if (t->persistent) - return MSICONDITION_TRUE; - else - return MSICONDITION_FALSE; + return t->persistent; } static UINT read_raw_int(const BYTE *data, UINT col, UINT bytes) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index bc7e513..91426ca 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3237,13 +3237,11 @@ static void test_temporary_table(void) cond = MsiDatabaseIsTablePersistent(hdb, NULL); ok( cond == MSICONDITION_ERROR, "wrong return condition\n"); - todo_wine { cond = MsiDatabaseIsTablePersistent(hdb, "_Tables"); ok( cond == MSICONDITION_NONE, "wrong return condition\n"); cond = MsiDatabaseIsTablePersistent(hdb, "_Columns"); ok( cond == MSICONDITION_NONE, "wrong return condition\n"); - } cond = MsiDatabaseIsTablePersistent(hdb, "_Storages"); ok( cond == MSICONDITION_NONE, "wrong return condition\n");

1 0

James Hawkins : msi: Add tests for field zero of a record.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 7d7f14c10136839c6246e8a84734ab0905ea1d54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d7f14c10136839c6246e8a84… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Feb 25 19:44:01 2009 -0800 msi: Add tests for field zero of a record. --- dlls/msi/tests/record.c | 148 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 148 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index 29a57a0..567f110 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -24,6 +24,8 @@ #include "wine/test.h" +static const char *msifile = "winetest.msi"; + static BOOL create_temp_file(char *name) { UINT r; @@ -443,9 +445,155 @@ static void test_MsiRecordGetInteger(void) MsiCloseHandle(rec); } +static void test_fieldzero(void) +{ + MSIHANDLE hdb, hview, rec; + CHAR buf[MAX_PATH]; + LPCSTR query; + DWORD sz; + UINT r; + + rec = MsiCreateRecord(1); + ok(rec != 0, "Expected a valid handle\n"); + + r = MsiRecordGetInteger(rec, 0); + ok(r == MSI_NULL_INTEGER, "Expected MSI_NULL_INTEGER, got %d\n", r); + + sz = MAX_PATH; + lstrcpyA(buf, "apple"); + r = MsiRecordGetString(rec, 0, buf, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); + ok(sz == 0, "Expectd 0, got %d\n", sz); + + r = MsiRecordIsNull(rec, 0); + ok(r == TRUE, "Expected TRUE, got %d\n", r); + + r = MsiRecordGetInteger(rec, 1); + ok(r == MSI_NULL_INTEGER, "Expected MSI_NULL_INTEGER, got %d\n", r); + + r = MsiRecordSetInteger(rec, 1, 42); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiRecordGetInteger(rec, 0); + ok(r == MSI_NULL_INTEGER, "Expected MSI_NULL_INTEGER, got %d\n", r); + + sz = MAX_PATH; + lstrcpyA(buf, "apple"); + r = MsiRecordGetString(rec, 0, buf, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); + ok(sz == 0, "Expectd 0, got %d\n", sz); + + r = MsiRecordIsNull(rec, 0); + ok(r == TRUE, "Expected TRUE, got %d\n", r); + + r = MsiRecordGetInteger(rec, 1); + ok(r == 42, "Expected 42, got %d\n", r); + + r = MsiRecordSetString(rec, 1, "bologna"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiRecordGetInteger(rec, 0); + ok(r == MSI_NULL_INTEGER, "Expected MSI_NULL_INTEGER, got %d\n", r); + + sz = MAX_PATH; + lstrcpyA(buf, "apple"); + r = MsiRecordGetString(rec, 0, buf, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); + ok(sz == 0, "Expectd 0, got %d\n", sz); + + r = MsiRecordIsNull(rec, 0); + ok(r == TRUE, "Expected TRUE, got %d\n", r); + + sz = MAX_PATH; + lstrcpyA(buf, "apple"); + r = MsiRecordGetString(rec, 1, buf, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, "bologna"), "Expected \"bologna\", got \"%s\"\n", buf); + ok(sz == 7, "Expectd 7, got %d\n", sz); + + MsiCloseHandle(rec); + + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "MsiOpenDatabase failed\n"); + + query = "CREATE TABLE `drone` ( " + "`id` INT, `name` CHAR(32), `number` CHAR(32) " + "PRIMARY KEY `id`)"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + query = "INSERT INTO `drone` ( `id`, `name`, `number` )" + "VALUES('1', 'Abe', '8675309')"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + r = MsiDatabaseGetPrimaryKeysA(hdb, "drone", &rec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiRecordGetInteger(rec, 0); + ok(r == MSI_NULL_INTEGER, "Expected MSI_NULL_INTEGER, got %d\n", r); + + sz = MAX_PATH; + lstrcpyA(buf, "apple"); + r = MsiRecordGetString(rec, 0, buf, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(!lstrcmpA(buf, "drone"), "Expected \"drone\", got \"%s\"\n", buf); + ok(sz == 5, "Expectd 5, got %d\n", sz); + } + + r = MsiRecordIsNull(rec, 0); + todo_wine + { + ok(r == FALSE, "Expected FALSE, got %d\n", r); + } + + MsiCloseHandle(rec); + + query = "SELECT * FROM `drone` WHERE `id` = 1"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewFetch(hview, &rec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiRecordGetInteger(rec, 0); + todo_wine + { + ok(r != MSI_NULL_INTEGER && r != 0, "Expected non-NULL value, got %d\n", r); + } + + r = MsiRecordIsNull(rec, 0); + todo_wine + { + ok(r == FALSE, "Expected FALSE, got %d\n", r); + } + + MsiCloseHandle(hdb); + DeleteFileA(msifile); +} + START_TEST(record) { test_msirecord(); test_MsiRecordGetString(); test_MsiRecordGetInteger(); + test_fieldzero(); }

1 0

James Hawkins : msi: Set field zero to the name of the table containing the primary keys.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: e872681af7c2238f7320fe96794b709b43cbb10c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e872681af7c2238f7320fe967… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Feb 25 19:44:09 2009 -0800 msi: Set field zero to the name of the table containing the primary keys. --- dlls/msi/msiquery.c | 8 +++++++- dlls/msi/tests/record.c | 12 +++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 1ee63b5..430ff52 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -842,7 +842,7 @@ struct msi_primary_key_record_info static UINT msi_primary_key_iterator( MSIRECORD *rec, LPVOID param ) { struct msi_primary_key_record_info *info = param; - LPCWSTR name; + LPCWSTR name, table; DWORD type; type = MSI_RecordGetInteger( rec, 4 ); @@ -851,6 +851,12 @@ static UINT msi_primary_key_iterator( MSIRECORD *rec, LPVOID param ) info->n++; if( info->rec ) { + if ( info->n == 1 ) + { + table = MSI_RecordGetString( rec, 1 ); + MSI_RecordSetStringW( info->rec, 0, table); + } + name = MSI_RecordGetString( rec, 3 ); MSI_RecordSetStringW( info->rec, info->n, name ); } diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index 567f110..1b88239 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -552,17 +552,11 @@ static void test_fieldzero(void) lstrcpyA(buf, "apple"); r = MsiRecordGetString(rec, 0, buf, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(buf, "drone"), "Expected \"drone\", got \"%s\"\n", buf); - ok(sz == 5, "Expectd 5, got %d\n", sz); - } + ok(!lstrcmpA(buf, "drone"), "Expected \"drone\", got \"%s\"\n", buf); + ok(sz == 5, "Expectd 5, got %d\n", sz); r = MsiRecordIsNull(rec, 0); - todo_wine - { - ok(r == FALSE, "Expected FALSE, got %d\n", r); - } + ok(r == FALSE, "Expected FALSE, got %d\n", r); MsiCloseHandle(rec);

1 0