October 2006 - Wine-Commits

Ivan Gyurdiev : wined3d: D3DDEVTYPE: Consistently use in WINED3D namespace.
by Alexandre Julliard Oct. 11, 2006

Oct. 11, 2006

Module: wine Branch: master Commit: 19c5534c3564e0fcead8f64c7906c8806001023d URL: http://source.winehq.org/git/wine.git/?a=commit;h=19c5534c3564e0fcead8f64c7… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Tue Oct 10 21:52:00 2006 -0400 wined3d: D3DDEVTYPE: Consistently use in WINED3D namespace. --- dlls/wined3d/utils.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index f3f7a1f..b8c6b5d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -216,15 +216,15 @@ #undef FMT_TO_STR } } -const char* debug_d3ddevicetype(D3DDEVTYPE devtype) { +const char* debug_d3ddevicetype(WINED3DDEVTYPE devtype) { switch (devtype) { #define DEVTYPE_TO_STR(dev) case dev: return #dev - DEVTYPE_TO_STR(D3DDEVTYPE_HAL); - DEVTYPE_TO_STR(D3DDEVTYPE_REF); - DEVTYPE_TO_STR(D3DDEVTYPE_SW); + DEVTYPE_TO_STR(WINED3DDEVTYPE_HAL); + DEVTYPE_TO_STR(WINED3DDEVTYPE_REF); + DEVTYPE_TO_STR(WINED3DDEVTYPE_SW); #undef DEVTYPE_TO_STR default: - FIXME("Unrecognized %u D3DDEVTYPE!\n", devtype); + FIXME("Unrecognized %u WINED3DDEVTYPE!\n", devtype); return "unrecognized"; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 765aea9..9d4fd9f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -529,7 +529,7 @@ #define NEEDS_DI /* Internal use fields */ WINED3DDEVICE_CREATION_PARAMETERS createParms; UINT adapterNo; - D3DDEVTYPE devType; + WINED3DDEVTYPE devType; IWineD3DSwapChain **swapchains; uint NumberOfSwapChains; @@ -1245,7 +1245,7 @@ extern IWineD3DSwapChainVtbl IWineD3DSwa /* Trace routines */ const char* debug_d3dformat(WINED3DFORMAT fmt); -const char* debug_d3ddevicetype(D3DDEVTYPE devtype); +const char* debug_d3ddevicetype(WINED3DDEVTYPE devtype); const char* debug_d3dresourcetype(WINED3DRESOURCETYPE res); const char* debug_d3dusage(DWORD usage); const char* debug_d3dusagequery(DWORD usagequery);

1 0

Ivan Gyurdiev : wined3d: D3DFORMAT: Consistently use WINED3D namespace.
by Alexandre Julliard Oct. 11, 2006

Oct. 11, 2006

Module: wine Branch: master Commit: fb0c932f217da135e03f7517a8cc964b940b5e9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb0c932f217da135e03f7517a… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Tue Oct 10 21:51:13 2006 -0400 wined3d: D3DFORMAT: Consistently use WINED3D namespace. --- dlls/wined3d/device.c | 10 +++--- dlls/wined3d/directx.c | 70 ++++++++++++++++++++-------------------- dlls/wined3d/surface.c | 2 + dlls/wined3d/swapchain.c | 10 +++--- dlls/wined3d/utils.c | 8 ++--- dlls/wined3d/wined3d_private.h | 4 +- 6 files changed, 52 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb0c932f217da135e03f7…

1 0

Ge van Geldorp : winapi_test: Regenerate tests.
by Alexandre Julliard Oct. 11, 2006

Oct. 11, 2006

Module: wine Branch: master Commit: d642e114389083496f5a2409cd0cf47d348e616c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d642e114389083496f5a2409c… Author: Ge van Geldorp <ge(a)gse.nl> Date: Tue Oct 10 20:35:46 2006 +0200 winapi_test: Regenerate tests. Remove structs from test list which have preprocessor directives in their definitions (winapi_test can't handle that). --- dlls/gdi/tests/generated.c | 6 +- dlls/kernel32/tests/generated.c | 16 ------ dlls/ntdll/tests/generated.c | 103 ++------------------------------------- dlls/rpcrt4/tests/generated.c | 30 +++++++++++ dlls/shell32/tests/generated.c | 47 ++++-------------- dlls/shlwapi/tests/generated.c | 6 -- dlls/urlmon/tests/generated.c | 19 +++---- dlls/user/tests/generated.c | 18 ------- tools/winapi/tests.dat | 14 +++-- tools/winapi/winapi_test | 4 ++ 10 files changed, 66 insertions(+), 197 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d642e114389083496f5a2…

1 0

James Hawkins : msi: Set the SourceDir and SOURCEDIR properties in the ResolveSource action.
by Alexandre Julliard Oct. 11, 2006

Oct. 11, 2006

Module: wine Branch: master Commit: c507543554b519f0dc3c50756c7c207f0c9e988a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c507543554b519f0dc3c50756… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Oct 10 13:39:50 2006 -0700 msi: Set the SourceDir and SOURCEDIR properties in the ResolveSource action. --- dlls/msi/action.c | 22 ++++++++++++++-- dlls/msi/helpers.c | 1 + dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 1 + dlls/msi/tests/package.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 85 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 0f2c6f8..ab2bf03 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -573,7 +573,6 @@ UINT MSI_InstallPackage( MSIPACKAGE *pac { LPWSTR p, check, path; - package->PackagePath = strdupW(szPackagePath); path = strdupW(szPackagePath); p = strrchrW(path,'\\'); if (p) @@ -592,8 +591,10 @@ UINT MSI_InstallPackage( MSIPACKAGE *pac check = msi_dup_property( package, cszSourceDir ); if (!check) MSI_SetPropertyW(package, cszSourceDir, path); + + package->PackagePath = path; + msi_free(check); - msi_free(path); } msi_parse_command_line( package, szCommandLine ); @@ -3851,8 +3852,10 @@ static UINT ACTION_ForceReboot(MSIPACKAG static UINT ACTION_ResolveSource(MSIPACKAGE* package) { - DWORD attrib; + DWORD attrib, len; + LPWSTR ptr, source; UINT rc; + /* * we are currently doing what should be done here in the top level Install * however for Adminastrative and uninstalls this step will be needed @@ -3860,6 +3863,19 @@ static UINT ACTION_ResolveSource(MSIPACK if (!package->PackagePath) return ERROR_SUCCESS; + ptr = strrchrW(package->PackagePath, '\\'); + if (!ptr) + return ERROR_SUCCESS; + + len = ptr - package->PackagePath + 2; + source = msi_alloc(len * sizeof(WCHAR)); + lstrcpynW(source, package->PackagePath, len); + + MSI_SetPropertyW(package, cszSourceDir, source); + MSI_SetPropertyW(package, cszSOURCEDIR, source); + + msi_free(source); + attrib = GetFileAttributesW(package->PackagePath); if (attrib == INVALID_FILE_ATTRIBUTES) { diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 2ebc13a..bb4dcc4 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -40,6 +40,7 @@ static const WCHAR cszTargetDir[] = {'T' static const WCHAR cszDatabase[]={'D','A','T','A','B','A','S','E',0}; const WCHAR cszSourceDir[] = {'S','o','u','r','c','e','D','i','r',0}; +const WCHAR cszSOURCEDIR[] = {'S','O','U','R','C','E','D','I','R',0}; const WCHAR cszRootDrive[] = {'R','O','O','T','D','R','I','V','E',0}; const WCHAR cszbs[]={'\\',0}; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index ef0c033..d65e0ab 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -768,6 +768,7 @@ extern void ui_actiondata(MSIPACKAGE *, /* string consts use a number of places and defined in helpers.c*/ extern const WCHAR cszSourceDir[]; +extern const WCHAR cszSOURCEDIR[]; extern const WCHAR szProductCode[]; extern const WCHAR cszRootDrive[]; extern const WCHAR cszbs[]; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index d0b0619..aae868c 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -424,6 +424,7 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABA list_init( &package->RunningActions ); package->WordCount = msi_get_word_count( package ); + package->PackagePath = strdupW( db->path ); /* OK, here is where we do a slew of things to the database to * prep for all that is to come as a package */ diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 508dde4..cdb71f6 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2728,6 +2728,68 @@ static void test_installprops(void) MsiCloseHandle(hpkg); } +static void test_sourcedirprop(void) +{ + MSIHANDLE hpkg, hdb; + CHAR source_dir[MAX_PATH]; + CHAR path[MAX_PATH]; + DWORD size; + UINT r; + + hdb = create_package_db(); + ok ( hdb, "failed to create package database\n" ); + + r = add_directory_entry( hdb, "'TARGETDIR', '', 'SourceDir'"); + ok( r == ERROR_SUCCESS, "cannot add directory: %d\n", r ); + + hpkg = package_from_db( hdb ); + ok( hpkg, "failed to create package\n"); + + MsiCloseHandle( hdb ); + + size = MAX_PATH; + r = MsiGetProperty( hpkg, "SourceDir", source_dir, &size ); + ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok( !lstrlenA(source_dir), "Expected emtpy source dir, got %s\n", source_dir); + + size = MAX_PATH; + r = MsiGetProperty( hpkg, "SOURCEDIR", source_dir, &size ); + ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok( !lstrlenA(source_dir), "Expected emtpy source dir, got %s\n", source_dir); + + r = MsiDoAction( hpkg, "CostInitialize"); + ok( r == ERROR_SUCCESS, "cost init failed\n"); + + size = MAX_PATH; + r = MsiGetProperty( hpkg, "SourceDir", source_dir, &size ); + ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok( !lstrlenA(source_dir), "Expected emtpy source dir, got %s\n", source_dir); + + size = MAX_PATH; + r = MsiGetProperty( hpkg, "SOURCEDIR", source_dir, &size ); + ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok( !lstrlenA(source_dir), "Expected emtpy source dir, got %s\n", source_dir); + + r = MsiDoAction( hpkg, "ResolveSource"); + ok( r == ERROR_SUCCESS, "file cost failed\n"); + + GetCurrentDirectory(MAX_PATH, path); + lstrcatA(path, "\\"); + + size = MAX_PATH; + r = MsiGetProperty( hpkg, "SourceDir", source_dir, &size ); + ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok( !lstrcmpA(source_dir, path), "Expected %s, got %s\n", path, source_dir); + + size = MAX_PATH; + r = MsiGetProperty( hpkg, "SOURCEDIR", source_dir, &size ); + ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok( !lstrcmpA(source_dir, path), "Expected %s, got %s\n", path, source_dir); + + MsiCloseHandle(hpkg); + DeleteFileA(msifile); +} + START_TEST(package) { test_createpackage(); @@ -2746,4 +2808,5 @@ START_TEST(package) test_appsearch(); test_featureparents(); test_installprops(); + test_sourcedirprop(); }

1 0

Mike McCormack : msi: Check transforms have the correct storage guid.
by Alexandre Julliard Oct. 11, 2006

Oct. 11, 2006

Module: wine Branch: master Commit: eb18bd9403e1054bd071c0939da69823d7d32744 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb18bd9403e1054bd071c0939… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Oct 11 16:27:15 2006 +0900 msi: Check transforms have the correct storage guid. --- dlls/msi/msiquery.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 824a5be..1346969 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -37,6 +37,8 @@ #include "winnls.h" #include "query.h" +#include "initguid.h" + WINE_DEFAULT_DEBUG_CHANNEL(msi); static void MSI_CloseView( MSIOBJECTHDR *arg ) @@ -737,30 +739,40 @@ MSIHANDLE WINAPI MsiGetLastErrorRecord( DEFINE_GUID( CLSID_MsiTransform, 0x000c1082, 0x0000, 0x0000, 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db, +UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db, LPCWSTR szTransformFile, int iErrorCond ) { - UINT r; + HRESULT r; + UINT ret = ERROR_FUNCTION_FAILED; IStorage *stg = NULL; - + STATSTG stat; + TRACE("%p %s %d\n", db, debugstr_w(szTransformFile), iErrorCond); r = StgOpenStorage( szTransformFile, NULL, STGM_DIRECT|STGM_READ|STGM_SHARE_DENY_WRITE, NULL, 0, &stg); - if( r ) - return r; + if ( FAILED(r) ) + return ret; + + r = IStorage_Stat( stg, &stat, STATFLAG_NONAME ); + if ( FAILED( r ) ) + goto end; + + if ( !IsEqualGUID( &stat.clsid, &CLSID_MsiTransform ) ) + goto end; if( TRACE_ON( msi ) ) enum_stream_names( stg ); - r = msi_table_apply_transform( db, stg ); + ret = msi_table_apply_transform( db, stg ); +end: IStorage_Release( stg ); - return r; + return ret; } -UINT WINAPI MsiDatabaseApplyTransformW( MSIHANDLE hdb, +UINT WINAPI MsiDatabaseApplyTransformW( MSIHANDLE hdb, LPCWSTR szTransformFile, int iErrorCond) { MSIDATABASE *db;

1 0

James Hawkins : msi: Clean up after the package tests.
by Alexandre Julliard Oct. 11, 2006

Oct. 11, 2006

Module: wine Branch: master Commit: 58870ce841f71d162277360930e82841a1729069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58870ce841f71d16227736093… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Oct 10 13:37:54 2006 -0700 msi: Clean up after the package tests. --- dlls/msi/tests/package.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index be5c614..508dde4 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1655,6 +1655,8 @@ static void test_states(void) hpkg = package_from_db( hdb ); ok( hpkg, "failed to create package\n"); + MsiCloseHandle( hdb ); + state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "one", &state, &action); @@ -2057,6 +2059,7 @@ static void test_states(void) ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); MsiCloseHandle( hpkg ); + DeleteFileA( msifile ); } static void test_getproperty(void) @@ -2194,6 +2197,8 @@ static void test_removefiles(void) hpkg = package_from_db( hdb ); ok( hpkg, "failed to create package\n"); + MsiCloseHandle( hdb ); + create_test_file( "hydrogen.txt" ); create_test_file( "helium.txt" ); create_test_file( "lithium.txt" ); @@ -2280,6 +2285,8 @@ static void test_appsearch(void) hpkg = package_from_db( hdb ); ok( hpkg, "failed to create package\n"); + MsiCloseHandle( hdb ); + r = MsiDoAction( hpkg, "AppSearch" ); ok( r == ERROR_SUCCESS, "AppSearch failed: %d\n", r); @@ -2466,6 +2473,8 @@ static void test_featureparents(void) hpkg = package_from_db( hdb ); ok( hpkg, "failed to create package\n"); + MsiCloseHandle( hdb ); + r = MsiDoAction( hpkg, "CostInitialize"); ok( r == ERROR_SUCCESS, "cost init failed\n"); @@ -2689,6 +2698,7 @@ static void test_featureparents(void) ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); MsiCloseHandle(hpkg); + DeleteFileA(msifile); } static void test_installprops(void)

1 0

Mike McCormack : msi: Check that transforms return the correct data.
by Alexandre Julliard Oct. 11, 2006

Oct. 11, 2006

Module: wine Branch: master Commit: ee55546d340386325f39399eb059e305e51caae4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee55546d340386325f39399eb… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Oct 11 16:26:54 2006 +0900 msi: Check that transforms return the correct data. --- dlls/msi/tests/db.c | 166 ++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 131 insertions(+), 35 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index b8215cf..3f65c58 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -17,22 +17,23 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#define COBJMACROS + #include <stdio.h> #include <windows.h> #include <msi.h> #include <msiquery.h> +#include <objidl.h> + #include "wine/test.h" static const char *msifile = "winetest.msi"; static const char *msifile2 = "winetst2.msi"; static const char *mstfile = "winetst.mst"; -#ifndef ERROR_INSTALL_TRANSFORM_FAILURE -#define ERROR_INSTALL_TRANSFORM_FAILURE 1624 -#endif - static void test_msidatabase(void) { MSIHANDLE hdb = 0, hdb2 = 0; @@ -1691,16 +1692,12 @@ static void test_handle_limit(void) ok( r == ERROR_SUCCESS, "failed to close database\n"); } -static void test_generate_transform(void) +static void generate_transform(void) { MSIHANDLE hdb1, hdb2; LPCSTR query; UINT r; - DeleteFile(msifile); - DeleteFile(msifile2); - DeleteFile(mstfile); - /* create an empty database */ r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb1 ); ok( r == ERROR_SUCCESS , "Failed to create database\n" ); @@ -1709,12 +1706,9 @@ static void test_generate_transform(void ok( r == ERROR_SUCCESS , "Failed to commit database\n" ); /* create another empty database */ - r = MsiOpenDatabase(msifile2, MSIDBOPEN_CREATE, &hdb2 ); + r = MsiOpenDatabase(msifile2, MSIDBOPEN_READONLY, &hdb2 ); ok( r == ERROR_SUCCESS , "Failed to create database\n" ); - r = MsiDatabaseCommit( hdb2 ); - ok( r == ERROR_SUCCESS , "Failed to commit database\n" ); - /* the transform between two empty database should be empty */ r = MsiDatabaseGenerateTransform(hdb1, hdb2, NULL, 0, 0); todo_wine { @@ -1733,13 +1727,6 @@ static void test_generate_transform(void r = run_query(hdb1, 0, query); ok(r == ERROR_SUCCESS, "failed to add row 2\n"); - todo_wine { - r = MsiDatabaseGenerateTransform(hdb1, hdb2, NULL, 0, 0); - ok( r == ERROR_SUCCESS, "return code %d, should be ERROR_SUCCESS\n", r ); - - r = MsiDatabaseGenerateTransform(hdb1, hdb2, mstfile, 0, 0); - ok( r == ERROR_SUCCESS, "return code %d, should be ERROR_SUCCESS\n", r ); - /* database needs to be committed */ MsiDatabaseCommit(hdb1); @@ -1747,33 +1734,142 @@ static void test_generate_transform(void ok( r == ERROR_SUCCESS, "return code %d, should be ERROR_SUCCESS\n", r ); MsiCloseHandle( hdb1 ); + MsiCloseHandle( hdb2 ); +} - r = MsiDatabaseApplyTransform( hdb2, mstfile, 0 ); - ok( r == ERROR_SUCCESS, "return code %d, should be ERROR_SUCCESS\n", r ); +static const WCHAR name1[] = { 0x4840, 0x3a8a, 0x481b, 0 }; /* AAR */ +static const WCHAR name2[] = { 0x4840, 0x3b3f, 0x43f2, 0x4438, 0x45b1, 0 }; /* _Columns */ +static const WCHAR name3[] = { 0x4840, 0x3f7f, 0x4164, 0x422f, 0x4836, 0 }; /* _Tables */ +static const WCHAR name4[] = { 0x4840, 0x3f3f, 0x4577, 0x446c, 0x3b6a, 0x45e4, 0x4824, 0 }; /* _StringData */ +static const WCHAR name5[] = { 0x4840, 0x3f3f, 0x4577, 0x446c, 0x3e6a, 0x44b2, 0x482f, 0 }; /* _StringPool */ + +static const WCHAR data1[] = { /* AAR */ + 0x0201, 0x0004, 0x8001, + 0x0201, 0x0005, 0x8002, +}; +static const WCHAR data2[] = { /* _Columns */ + 0x0401, 0x0001, 0x0000, 0x0002, 0xbdff, + 0x0401, 0x0001, 0x0000, 0x0003, 0x8502, +}; +static const WCHAR data3[] = { /* _Tables */ + 0x0101, 0x0001, +}; +static const char data4[] = /* _StringData */ + "AARCARBARvwbmw"; +static const WCHAR data5[] = { /* _StringPool */ +/* len, refs */ + 0, 0, + 3, 3, /* string 1 */ + 3, 1, /* string 2 */ + 3, 1, /* string 3 */ + 2, 1, /* string 4 */ + 3, 1, /* string 5 */ +}; + +static const struct { + LPCWSTR name; + const void *data; + DWORD size; +} table_transform_data[] = +{ + { name1, data1, sizeof data1 }, + { name2, data2, sizeof data2 }, + { name3, data3, sizeof data3 }, + { name4, data4, sizeof data4 }, + { name5, data5, sizeof data5 }, +}; + +#define NUM_TRANSFORM_TABLES (sizeof table_transform_data/sizeof table_transform_data[0]) + +static void generate_transform_manual(void) +{ + IStorage *stg = NULL; + IStream *stm; + WCHAR name[0x20]; + HRESULT r; + DWORD i, count; + const DWORD mode = STGM_CREATE|STGM_READWRITE|STGM_DIRECT|STGM_SHARE_EXCLUSIVE; + + const CLSID CLSID_MsiTransform = { 0xc1082,0,0,{0xc0,0,0,0,0,0,0,0x46}}; + + MultiByteToWideChar(CP_ACP, 0, mstfile, -1, name, 0x20); + + r = StgCreateDocfile(name, mode, 0, &stg); + ok(r == S_OK, "failed to create storage\n"); + if (!stg) + return; + + r = IStorage_SetClass( stg, &CLSID_MsiTransform ); + ok(r == S_OK, "failed to set storage type\n"); - MsiDatabaseCommit(hdb2); + for (i=0; i<NUM_TRANSFORM_TABLES; i++) + { + r = IStorage_CreateStream( stg, table_transform_data[i].name, + STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm ); + if (FAILED(r)) + { + ok(0, "failed to create stream\n"); + continue; + } - /* apply the same transform again? */ - r = MsiDatabaseApplyTransform( hdb2, mstfile, 0 ); - ok( r == ERROR_INSTALL_TRANSFORM_FAILURE, - "return code %d, should be ERROR_INSTALL_TRANSFORM_FAILURE\n", r ); + r = IStream_Write( stm, table_transform_data[i].data, + table_transform_data[i].size, &count ); + if (FAILED(r) || count != table_transform_data[i].size) + ok(0, "failed to write stream\n"); + IStream_Release(stm); } - MsiCloseHandle( hdb2 ); + IStorage_Release(stg); +} + +static void test_try_transform(void) +{ + MSIHANDLE hdb; + LPCSTR query; + UINT r; DeleteFile(msifile); + DeleteFile(msifile2); + DeleteFile(mstfile); - r = MsiOpenDatabase(msifile2, MSIDBOPEN_READONLY, &hdb1 ); + /* create an empty database */ + r = MsiOpenDatabase(msifile2, MSIDBOPEN_CREATE, &hdb ); ok( r == ERROR_SUCCESS , "Failed to create database\n" ); - todo_wine { - query = "select `BAR`,`CAR` from `AAR`"; - r = run_query(hdb1, 0, query); + r = MsiDatabaseCommit( hdb ); + ok( r == ERROR_SUCCESS , "Failed to commit database\n" ); + + MsiCloseHandle( hdb ); + + /* + * Both these generate an equivilent transform, + * but the first doesn't work in Wine yet + * because MsiDatabaseGenerateTransform is unimplemented. + */ + if (0) + generate_transform(); + else + generate_transform_manual(); + + r = MsiOpenDatabase(msifile2, MSIDBOPEN_DIRECT, &hdb ); + ok( r == ERROR_SUCCESS , "Failed to create database\n" ); + + r = MsiDatabaseApplyTransform( hdb, mstfile, 0 ); + ok( r == ERROR_SUCCESS, "return code %d, should be ERROR_SUCCESS\n", r ); + + MsiDatabaseCommit( hdb ); + + query = "select `BAR`,`CAR` from `AAR` where `BAR` = 1 AND `CAR` = 'vw'"; + r = run_query(hdb, 0, query); ok(r == ERROR_SUCCESS, "select query failed\n"); - } - MsiCloseHandle( hdb1 ); + query = "select `BAR`,`CAR` from `AAR` where `BAR` = 2 AND `CAR` = 'bmw'"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "select query failed\n"); + + MsiCloseHandle( hdb ); + DeleteFile(msifile); DeleteFile(msifile2); DeleteFile(mstfile); } @@ -2537,7 +2633,7 @@ START_TEST(db) test_msiimport(); test_markers(); test_handle_limit(); - test_generate_transform(); + test_try_transform(); test_join(); test_temporary_table(); test_alter();

1 0

Dmitry Timoshkov : user: Add some missing messages to the message spy.
by Alexandre Julliard Oct. 11, 2006

Oct. 11, 2006

Module: wine Branch: master Commit: a58a9f521202539c0a1c5732201567a59f8f6cfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a58a9f521202539c0a1c57322… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Oct 11 16:08:48 2006 +0900 user: Add some missing messages to the message spy. --- dlls/user/spy.c | 29 +++++++++++++++++++++-------- include/winuser.h | 4 ++-- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/user/spy.c b/dlls/user/spy.c index e1c3d0b..e46772e 100644 --- a/dlls/user/spy.c +++ b/dlls/user/spy.c @@ -410,7 +410,9 @@ static const char * const MessageTypeNam NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 0x01E0 */ - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, + "MN_GETHMENU", /* 0x01E1 */ + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 0x01F0 */ @@ -571,9 +573,11 @@ static const char * const MessageTypeNam "WM_PALETTECHANGED", "WM_HOTKEY", /* 0x0312 */ NULL, NULL, NULL, NULL, - "WM_PRINT", - "WM_PRINTCLIENT", - NULL, NULL, NULL, NULL, NULL, NULL, NULL, + "WM_PRINT", /* 0x0317 */ + "WM_PRINTCLIENT", /* 0x0318 */ + "WM_APPCOMMAND", /* 0x0319 */ + "WM_THEMECHANGED", /* 0x031A */ + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, @@ -583,10 +587,18 @@ static const char * const MessageTypeNam /* 0x0340 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + /* 0x0350 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - - "WM_QUERYAFXWNDPROC", /* 0x0360 */ + "WM_HANDHELDFIRST", /* 0x0358 */ + "WM_HANDHELDFIRST+1", /* 0x0359 */ + "WM_HANDHELDFIRST+2", /* 0x035A */ + "WM_HANDHELDFIRST+3", /* 0x035B */ + "WM_HANDHELDFIRST+4", /* 0x035C */ + "WM_HANDHELDFIRST+5", /* 0x035D */ + "WM_HANDHELDFIRST+6", /* 0x035E */ + "WM_HANDHELDLAST", /* 0x035F */ + + "WM_QUERYAFXWNDPROC", /* 0x0360 WM_AFXFIRST */ "WM_SIZEPARENT", /* 0x0361 */ "WM_SETMESSAGESTRING", /* 0x0362 */ "WM_IDLEUPDATECMDUI", /* 0x0363 */ @@ -613,7 +625,8 @@ static const char * const MessageTypeNam "WM_OCC_LOADFROMSTREAM_EX", /* 0x037A */ "WM_OCC_LOADFROMSTORAGE_EX", /* 0x037B */ - NULL,NULL,NULL,NULL, + NULL,NULL,NULL, + "WM_AFXLAST", /* 0x037F */ "WM_PENWINFIRST", /* 0x0380 */ "WM_RCRESULT", /* 0x0381 */ diff --git a/include/winuser.h b/include/winuser.h index 27f77d1..3d4795b 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -1189,8 +1189,6 @@ #define WM_CAPTURECHANGED 0x0215 #define WM_MOVING 0x0216 #define WM_POWERBROADCAST 0x0218 #define WM_DEVICECHANGE 0x0219 -/* Win32 5.1 messages */ -#define WM_THEMECHANGED 0x031A /* wParam for WM_SIZING message */ #define WMSZ_LEFT 1 @@ -1293,6 +1291,8 @@ #define WM_HOTKEY 0x0312 #define WM_PRINT 0x0317 #define WM_PRINTCLIENT 0x0318 +#define WM_APPCOMMAND 0x0319 +#define WM_THEMECHANGED 0x031A #define WM_HANDHELDFIRST 0x0358 #define WM_HANDHELDLAST 0x035F

1 0

Michael Ploujnikov : mlang/tests: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 11, 2006

Oct. 11, 2006

Module: wine Branch: master Commit: 7b048bdc0f32d7777e5a5d5596ef4b49825885f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b048bdc0f32d7777e5a5d559… Author: Michael Ploujnikov <ploujj(a)gmail.com> Date: Tue Oct 10 19:17:52 2006 -0400 mlang/tests: Win64 printf format warning fixes. --- dlls/mlang/tests/Makefile.in | 1 dlls/mlang/tests/mlang.c | 120 +++++++++++++++++++++--------------------- 2 files changed, 60 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b048bdc0f32d7777e5a5…

1 0

Michael Ploujnikov : usp10/tests: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 11, 2006

Oct. 11, 2006

Module: wine Branch: master Commit: f37c0aa279b0c8ce2d9d3b00c312fecea7ec7177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f37c0aa279b0c8ce2d9d3b00c… Author: Michael Ploujnikov <ploujj(a)gmail.com> Date: Tue Oct 10 18:19:54 2006 -0400 usp10/tests: Win64 printf format warning fixes. --- dlls/usp10/tests/Makefile.in | 1 dlls/usp10/tests/usp10.c | 134 +++++++++++++++++++++--------------------- 2 files changed, 67 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f37c0aa279b0c8ce2d9d3…

1 0