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

Alexandre Julliard : ntdll: Added spec entry for NtQueryMultipleValueKey.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: 72e2dea1f13fb28c9391b41fa412bf75f26da811 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=72e2dea1f13fb28c9391b41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 16:10:28 2006 +0200 ntdll: Added spec entry for NtQueryMultipleValueKey. --- dlls/ntdll/ntdll.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 2950453..4b5549f 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -252,7 +252,7 @@ # @ stub NtQueryInformationJobObject @ stub NtQueryIntervalProfile @ stub NtQueryIoCompletion @ stdcall NtQueryKey (long long ptr long ptr) -# @ stub NtQueryMultipleValueKey +@ stdcall NtQueryMultipleValueKey(long ptr long ptr long ptr) @ stdcall NtQueryMutant(long long ptr long ptr) @ stdcall NtQueryObject(long long long long long) @ stub NtQueryOpenSubKeys

1 0

Alexandre Julliard : riched20: Fix an uninitialized variable bug.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: fe4c4780eb0a047f09a2e536eeaa1f51434b4b61 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fe4c4780eb0a047f09a2e53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 16:09:50 2006 +0200 riched20: Fix an uninitialized variable bug. Mark todo a test that depended on the bug to succeed. --- dlls/riched20/editor.c | 3 ++- dlls/riched20/tests/editor.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a2689df..ac1bf39 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -310,7 +310,8 @@ static void ME_RTFCharAttrHook(RTF_Info CHARFORMAT2W fmt; fmt.cbSize = sizeof(fmt); fmt.dwMask = 0; - + fmt.dwEffects = 0; + switch(info->rtfMinor) { case rtfPlain: diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 8dca7d9..c2e3e04 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -343,7 +343,8 @@ static void test_EM_SETTEXTMODE(void) /*Compare the two formattings*/ ok((cf2.dwMask == cf2test.dwMask) && (cf2.dwEffects == cf2test.dwEffects), - "two formats found in plain text mode - cf2.dwEffects: %f cf2test.dwEffects: %f\n",(double) cf2.dwEffects, (double) cf2test.dwEffects); + "two formats found in plain text mode - cf2.dwEffects: %lx cf2test.dwEffects: %lx\n", + cf2.dwEffects, cf2test.dwEffects); /*Test TM_RICHTEXT by: switching back to Rich Text mode printing "wine" in the current format(normal) pasting "wine" from the clipboard(italicized) @@ -385,7 +386,7 @@ static void test_EM_SETTEXTMODE(void) (LPARAM) &cf2test); /*Test that the two formattings are not the same*/ - ok((cf2.dwMask == cf2test.dwMask) && (cf2.dwEffects != cf2test.dwEffects), + todo_wine ok((cf2.dwMask == cf2test.dwMask) && (cf2.dwEffects != cf2test.dwEffects), "expected different formats - cf2.dwMask: %lx, cf2test.dwMask: %lx, cf2.dwEffects: %lx, cf2test.dwEffects: %lx\n", cf2.dwMask, cf2test.dwMask, cf2.dwEffects, cf2test.dwEffects);

1 0

H. Verbeet : wined3d: Cleanup GetSrcAndOpFromValue().
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: 405e11ea62411b8551edeeb5a36f9870bf34ee53 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=405e11ea62411b8551edeeb… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sat Jun 10 23:49:09 2006 +0200 wined3d: Cleanup GetSrcAndOpFromValue(). - Cleanup GetSrcAndOpFromValue(). - Use naming more consistent with the rest of the file. --- dlls/wined3d/utils.c | 112 +++++++++++++++------------------------- dlls/wined3d/wined3d_private.h | 1 2 files changed, 42 insertions(+), 71 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6c1acde..97f5b4f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -399,6 +399,44 @@ GLenum StencilOp(DWORD op) { } } +static void get_src_and_opr(DWORD arg, BOOL is_alpha, GLenum* source, GLenum* operand) { + /* The D3DTA_ALPHAREPLICATE flag specifies the alpha component of the + * input should be used for all input components. The D3DTA_COMPLEMENT + * flag specifies the complement of the input should be used. */ + BOOL from_alpha = is_alpha || arg & D3DTA_ALPHAREPLICATE; + BOOL complement = arg & D3DTA_COMPLEMENT; + + /* Calculate the operand */ + if (complement) { + if (from_alpha) *operand = GL_ONE_MINUS_SRC_ALPHA; + else *operand = GL_ONE_MINUS_SRC_COLOR; + } else { + if (from_alpha) *operand = GL_SRC_ALPHA; + else *operand = GL_SRC_COLOR; + } + + /* Calculate the source */ + switch (arg & D3DTA_SELECTMASK) { + case D3DTA_CURRENT: *source = GL_PREVIOUS_EXT; break; + case D3DTA_DIFFUSE: *source = GL_PRIMARY_COLOR_EXT; break; + case D3DTA_TEXTURE: *source = GL_TEXTURE; break; + case D3DTA_TFACTOR: *source = GL_CONSTANT_EXT; break; + case D3DTA_SPECULAR: + /* + * According to the GL_ARB_texture_env_combine specs, SPECULAR is + * 'Secondary color' and isn't supported until base GL supports it + * There is no concept of temp registers as far as I can tell + */ + FIXME("Unhandled texture arg D3DTA_SPECULAR\n"); + *source = GL_TEXTURE; + break; + default: + FIXME("Unrecognized texture arg %#lx\n", arg); + *source = GL_TEXTURE; + break; + } +} + /* Set texture operations up - The following avoids lots of ifdefs in this routine!*/ #if defined (GL_VERSION_1_3) # define useext(A) A @@ -475,12 +513,12 @@ #define GLINFO_LOCATION ((IWineD3DImpl * then the default argument is D3DTA_DIFFUSE. FIXME? If texture added/removed, may need to reset back as well? */ if (isAlpha && This->stateBlock->textures[Stage] == NULL && arg1 == D3DTA_TEXTURE) { - GetSrcAndOpFromValue(D3DTA_DIFFUSE, isAlpha, &src1, &opr1); + get_src_and_opr(D3DTA_DIFFUSE, isAlpha, &src1, &opr1); } else { - GetSrcAndOpFromValue(arg1, isAlpha, &src1, &opr1); + get_src_and_opr(arg1, isAlpha, &src1, &opr1); } - GetSrcAndOpFromValue(arg2, isAlpha, &src2, &opr2); - GetSrcAndOpFromValue(arg3, isAlpha, &src3, &opr3); + get_src_and_opr(arg2, isAlpha, &src2, &opr2); + get_src_and_opr(arg3, isAlpha, &src3, &opr3); TRACE("ct(%x), 1:(%x,%x), 2:(%x,%x), 3:(%x,%x)\n", comb_target, src1, opr1, src2, opr2, src3, opr3); @@ -1569,72 +1607,6 @@ void set_texture_matrix(const float *sma checkGLcall("glLoadMatrixf(mat)"); } -void GetSrcAndOpFromValue(DWORD iValue, BOOL isAlphaArg, GLenum* source, GLenum* operand) -{ - BOOL isAlphaReplicate = FALSE; - BOOL isComplement = FALSE; - - *operand = GL_SRC_COLOR; - *source = GL_TEXTURE; - - /* Catch alpha replicate */ - if (iValue & D3DTA_ALPHAREPLICATE) { - iValue = iValue & ~D3DTA_ALPHAREPLICATE; - isAlphaReplicate = TRUE; - } - - /* Catch Complement */ - if (iValue & D3DTA_COMPLEMENT) { - iValue = iValue & ~D3DTA_COMPLEMENT; - isComplement = TRUE; - } - - /* Calculate the operand */ - if (isAlphaReplicate && !isComplement) { - *operand = GL_SRC_ALPHA; - } else if (isAlphaReplicate && isComplement) { - *operand = GL_ONE_MINUS_SRC_ALPHA; - } else if (isComplement) { - if (isAlphaArg) { - *operand = GL_ONE_MINUS_SRC_ALPHA; - } else { - *operand = GL_ONE_MINUS_SRC_COLOR; - } - } else { - if (isAlphaArg) { - *operand = GL_SRC_ALPHA; - } else { - *operand = GL_SRC_COLOR; - } - } - - /* Calculate the source */ - switch (iValue & D3DTA_SELECTMASK) { - case D3DTA_CURRENT: *source = GL_PREVIOUS_EXT; - break; - case D3DTA_DIFFUSE: *source = GL_PRIMARY_COLOR_EXT; - break; - case D3DTA_TEXTURE: *source = GL_TEXTURE; - break; - case D3DTA_TFACTOR: *source = GL_CONSTANT_EXT; - break; - case D3DTA_SPECULAR: - /* - * According to the GL_ARB_texture_env_combine specs, SPECULAR is - * 'Secondary color' and isn't supported until base GL supports it - * There is no concept of temp registers as far as I can tell - */ - FIXME("Unhandled texture arg D3DTA_SPECULAR\n"); - *source = GL_TEXTURE; - break; - - default: - FIXME("Unrecognized texture arg %ld\n", iValue); - *source = GL_TEXTURE; - } -} - - #define GLINFO_LOCATION ((IWineD3DImpl *)(This->wineD3D))->gl_info GLint D3DFmt2GLIntFmt(IWineD3DDeviceImpl* This, D3DFORMAT fmt) { GLint retVal = 0; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1e4573d..98eac5b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1168,7 +1168,6 @@ const char* debug_d3dpool(WINED3DPOOL po GLenum StencilOp(DWORD op); void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, D3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3); void set_texture_matrix(const float *smat, DWORD flags, BOOL calculatedCoords); -void GetSrcAndOpFromValue(DWORD iValue, BOOL isAlphaArg, GLenum* source, GLenum* operand); SHORT D3DFmtGetBpp(IWineD3DDeviceImpl* This, D3DFORMAT fmt); GLenum D3DFmt2GLFmt(IWineD3DDeviceImpl* This, D3DFORMAT fmt);

1 0

Mike McCormack : msi: Add some more test cases for INSERT.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: a28ebdf7d4cb6a4ea6dc568bfe1b5ac285055e76 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a28ebdf7d4cb6a4ea6dc568… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jun 12 17:57:27 2006 +0900 msi: Add some more test cases for INSERT. --- dlls/msi/tests/db.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 420e194..fc8331b 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -162,6 +162,44 @@ static void test_msiinsert(void) r = do_query(hdb, query, &hrec); ok(r == ERROR_NO_MORE_ITEMS, "MsiViewFetch failed\n"); + todo_wine { + /* now try a few bad INSERT xqueries */ + query = "INSERT INTO `phone` ( `id`, `name`, `number` )" + "VALUES(?, ?)"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_BAD_QUERY_SYNTAX, "MsiDatabaseOpenView failed\n"); + + if (r == ERROR_SUCCESS) + r = MsiCloseHandle(hview); + } + + /* construct a record to insert */ + hrec = MsiCreateRecord(4); + r = MsiRecordSetInteger(hrec, 1, 2); + ok(r == ERROR_SUCCESS, "MsiRecordSetInteger failed\n"); + r = MsiRecordSetString(hrec, 2, "Adam"); + ok(r == ERROR_SUCCESS, "MsiRecordSetString failed\n"); + r = MsiRecordSetString(hrec, 3, "96905305"); + ok(r == ERROR_SUCCESS, "MsiRecordSetString failed\n"); + + /* insert another value, using a record and wildcards */ + query = "INSERT INTO `phone` ( `id`, `name`, `number` )" + "VALUES(?, ?, ?)"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + + if (r == ERROR_SUCCESS) + { + r = MsiViewExecute(hview, hrec); + 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 = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + r = MsiViewFetch(0, NULL); ok(r == ERROR_INVALID_PARAMETER, "MsiViewFetch failed\n");

1 0

Mike McCormack : msi: Add some more MsiFormatRecord tests.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: 7f64332d11d73836180734e180ebfceffaa3bfa9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7f64332d11d73836180734e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jun 12 15:06:59 2006 +0900 msi: Add some more MsiFormatRecord tests. --- dlls/msi/tests/format.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 112 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index aaa57aa..e776fa6 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -1060,18 +1060,127 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecord(0, hrec, buffer, &sz); ok( sz == 13, "size wrong\n"); - ok( 0 == strcmp(buffer,"{[1{{bo}o}}]}"), "wrong output\n"); + ok( 0 == strcmp(buffer,"{[1{{bo}o}}]}"), "wrong output %s\n",buffer); ok( r == ERROR_SUCCESS, "format failed\n"); r = MsiRecordSetString(hrec, 0, "{[1{{b{o}o}}]}"); + sz = sizeof buffer; + r = MsiFormatRecord(0, hrec, buffer, &sz); + ok( sz == 14, "size wrong\n"); + ok( 0 == strcmp(buffer,"{[1{{b{o}o}}]}"), "wrong output %s\n",buffer); + ok( r == ERROR_SUCCESS, "format failed\n"); + + r = MsiRecordSetString(hrec, 0, "{ {[1]}"); r = MsiRecordSetString(hrec, 1, "hoo"); sz = sizeof buffer; r = MsiFormatRecord(0, hrec, buffer, &sz); + ok( sz == 5, "size wrong\n"); + ok( 0 == strcmp(buffer," {hoo"), "wrong output %s\n",buffer); + ok( r == ERROR_SUCCESS, "format failed\n"); + + /* {} inside a substitution does strange things... */ + r = MsiRecordSetString(hrec, 0, "[[1]{}]"); + r = MsiRecordSetString(hrec, 1, "2"); + sz = sizeof buffer; + r = MsiFormatRecord(0, hrec, buffer, &sz); + ok( sz == 5, "size wrong\n"); + ok( 0 == strcmp(buffer,"[[1]]"), "wrong output %s\n",buffer); + ok( r == ERROR_SUCCESS, "format failed\n"); + + r = MsiRecordSetString(hrec, 0, "[[1]{}[1]]"); + r = MsiRecordSetString(hrec, 1, "2"); + sz = sizeof buffer; + r = MsiFormatRecord(0, hrec, buffer, &sz); + ok( sz == 6, "size wrong\n"); + ok( 0 == strcmp(buffer,"[[1]2]"), "wrong output %s\n",buffer); + ok( r == ERROR_SUCCESS, "format failed\n"); + + r = MsiRecordSetString(hrec, 0, "[a[1]b[1]c{}d[1]e]"); + r = MsiRecordSetString(hrec, 1, "2"); + sz = sizeof buffer; + r = MsiFormatRecord(0, hrec, buffer, &sz); ok( sz == 14, "size wrong\n"); - ok( 0 == strcmp(buffer,"{[1{{b{o}o}}]}"), "wrong output\n"); + ok( 0 == strcmp(buffer,"[a[1]b[1]cd2e]"), "wrong output %s\n",buffer); ok( r == ERROR_SUCCESS, "format failed\n"); - MsiCloseHandle(hrec); + r = MsiRecordSetString(hrec, 0, "[a[1]b"); + r = MsiRecordSetString(hrec, 1, "2"); + sz = sizeof buffer; + r = MsiFormatRecord(0, hrec, buffer, &sz); + ok( sz == 6, "size wrong\n"); + ok( 0 == strcmp(buffer,"[a[1]b"), "wrong output %s\n",buffer); + ok( r == ERROR_SUCCESS, "format failed\n"); + + r = MsiRecordSetString(hrec, 0, "a[1]b]"); + r = MsiRecordSetString(hrec, 1, "2"); + sz = sizeof buffer; + r = MsiFormatRecord(0, hrec, buffer, &sz); + ok( sz == 4, "size wrong\n"); + ok( 0 == strcmp(buffer,"a2b]"), "wrong output %s\n",buffer); + ok( r == ERROR_SUCCESS, "format failed\n"); + + r = MsiRecordSetString(hrec, 0, "]a[1]b"); + r = MsiRecordSetString(hrec, 1, "2"); + sz = sizeof buffer; + r = MsiFormatRecord(0, hrec, buffer, &sz); + ok( sz == 4, "size wrong\n"); + ok( 0 == strcmp(buffer,"]a2b"), "wrong output %s\n",buffer); + ok( r == ERROR_SUCCESS, "format failed\n"); + + r = MsiRecordSetString(hrec, 0, "]a[1]b"); + r = MsiRecordSetString(hrec, 1, "2"); + sz = sizeof buffer; + r = MsiFormatRecord(0, hrec, buffer, &sz); + ok( sz == 4, "size wrong\n"); + ok( 0 == strcmp(buffer,"]a2b"), "wrong output %s\n",buffer); + ok( r == ERROR_SUCCESS, "format failed\n"); + + r = MsiRecordSetString(hrec, 0, "\\[1]"); + r = MsiRecordSetString(hrec, 1, "2"); + sz = sizeof buffer; + r = MsiFormatRecord(0, hrec, buffer, &sz); + ok( sz == 2, "size wrong\n"); + ok( 0 == strcmp(buffer,"\\2"), "wrong output %s\n",buffer); + ok( r == ERROR_SUCCESS, "format failed\n"); + + r = MsiRecordSetString(hrec, 0, "\\{[1]}"); + r = MsiRecordSetString(hrec, 1, "2"); + sz = sizeof buffer; + r = MsiFormatRecord(0, hrec, buffer, &sz); + ok( sz == 2, "size wrong\n"); + ok( 0 == strcmp(buffer,"\\2"), "wrong output %s\n",buffer); + ok( r == ERROR_SUCCESS, "format failed\n"); + + r = MsiRecordSetString(hrec, 0, "a{b[1]c}d"); + r = MsiRecordSetString(hrec, 1, NULL); + sz = sizeof buffer; + r = MsiFormatRecord(0, hrec, buffer, &sz); + ok( sz == 2, "size wrong\n"); + ok( 0 == strcmp(buffer,"ad"), "wrong output %s\n",buffer); + ok( r == ERROR_SUCCESS, "format failed\n"); + + r = MsiRecordSetString(hrec, 0, "{a[0]b}"); + r = MsiRecordSetString(hrec, 1, "foo"); + sz = sizeof buffer; + r = MsiFormatRecord(0, hrec, buffer, &sz); + ok( sz == 9, "size wrong\n"); + ok( 0 == strcmp(buffer,"a{a[0]b}b"), "wrong output %s\n",buffer); + ok( r == ERROR_SUCCESS, "format failed\n"); + + r = MsiRecordSetString(hrec, 0, "[foo]"); + sz = sizeof buffer; + r = MsiFormatRecord(0, hrec, buffer, &sz); + ok( sz == 5, "size wrong\n"); + ok( 0 == strcmp(buffer,"[foo]"), "wrong output %s\n",buffer); + ok( r == ERROR_SUCCESS, "format failed\n"); + + r = MsiRecordSetString(hrec, 0, "{[1][-1][1]}"); + r = MsiRecordSetString(hrec, 1, "foo"); + sz = sizeof buffer; + r = MsiFormatRecord(0, hrec, buffer, &sz); + ok( sz == 12, "size wrong\n"); + ok( 0 == strcmp(buffer,"{foo[-1]foo}"), "wrong output %s\n",buffer); + ok( r == ERROR_SUCCESS, "format failed\n"); } static void test_formatrecord_package(void)

1 0

Mike McCormack : msi: Add tests for creating packages and formatting records.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: bef879cb2413e42435bbfa73298b12345059ad19 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bef879cb2413e42435bbfa7… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jun 12 13:21:11 2006 +0900 msi: Add tests for creating packages and formatting records. --- dlls/msi/tests/package.c | 168 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 168 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 89e0403..48fde61 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -844,6 +844,172 @@ static void test_props(void) DeleteFile(msifile); } +static UINT try_query_param( MSIHANDLE hdb, LPSTR szQuery, MSIHANDLE hrec ) +{ + MSIHANDLE htab = 0; + UINT res; + + res = MsiDatabaseOpenView( hdb, szQuery, &htab ); + if( res == ERROR_SUCCESS ) + { + UINT r; + + r = MsiViewExecute( htab, hrec ); + if( r != ERROR_SUCCESS ) + { + res = r; + fprintf(stderr,"MsiViewExecute failed %08x\n", res); + } + + r = MsiViewClose( htab ); + if( r != ERROR_SUCCESS ) + res = r; + + r = MsiCloseHandle( htab ); + if( r != ERROR_SUCCESS ) + res = r; + } + return res; +} + +static UINT try_query( MSIHANDLE hdb, LPSTR szQuery ) +{ + return try_query_param( hdb, szQuery, 0 ); +} + +static void test_msipackage(void) +{ + MSIHANDLE hdb = 0, hpack = 100; + UINT r; + char *query; + char name[10]; + + DeleteFile(msifile); + + todo_wine { + name[0] = 0; + r = MsiOpenPackage(name, &hpack); + ok(r == ERROR_SUCCESS, "failed to open package with no name\n"); + r = MsiCloseHandle(hpack); + ok(r == ERROR_SUCCESS, "failed to close package\n"); + } + + /* just MsiOpenDatabase should not create a file */ + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "MsiOpenDatabase failed\n"); + + name[0]='#'; + name[1]=0; + r = MsiOpenPackage(name, &hpack); + ok(r == ERROR_INVALID_HANDLE, "MsiOpenPackage returned wrong code\n"); + + todo_wine { + /* now try again with our empty database */ + sprintf(name, "#%ld", hdb); + r = MsiOpenPackage(name, &hpack); + ok(r == ERROR_INSTALL_PACKAGE_INVALID, "MsiOpenPackage returned wrong code\n"); + if (!r) MsiCloseHandle(hpack); + } + + /* create a table */ + query = "CREATE TABLE `Property` ( " + "`Property` CHAR(72), `Value` CHAR(0) " + "PRIMARY KEY `Property`)"; + r = try_query(hdb, query); + ok(r == ERROR_SUCCESS, "failed to create Properties table\n"); + + todo_wine { + query = "CREATE TABLE `InstallExecuteSequence` (" + "`Action` CHAR(72), `Condition` CHAR(0), `Sequence` INTEGER " + "PRIMARY KEY `Action`)"; + r = try_query(hdb, query); + ok(r == ERROR_SUCCESS, "failed to create InstallExecuteSequence table\n"); + + sprintf(name, "#%ld", hdb); + r = MsiOpenPackage(name, &hpack); + ok(r == ERROR_INSTALL_PACKAGE_INVALID, "MsiOpenPackage returned wrong code\n"); + if (!r) MsiCloseHandle(hpack); + } + + r = MsiCloseHandle(hdb); + ok(r == ERROR_SUCCESS, "MsiCloseHandle(database) failed\n"); + DeleteFile(msifile); +} + +static void test_formatrecord2(void) +{ + MSIHANDLE hpkg, hrec ; + char buffer[0x100]; + DWORD sz; + UINT r; + + hpkg = package_from_db(create_package_db()); + ok( hpkg, "failed to create package\n"); + + r = MsiSetProperty(hpkg, "Manufacturer", " " ); + ok( r == ERROR_SUCCESS, "set property failed\n"); + + hrec = MsiCreateRecord(2); + ok(hrec, "create record failed\n"); + + r = MsiRecordSetString( hrec, 0, "[ProgramFilesFolder][Manufacturer]\\asdf"); + ok( r == ERROR_SUCCESS, "format record failed\n"); + + buffer[0] = 0; + sz = sizeof buffer; + r = MsiFormatRecord( hpkg, hrec, buffer, &sz ); + + r = MsiRecordSetString(hrec, 0, "[foo][1]"); + r = MsiRecordSetString(hrec, 1, "hoo"); + sz = sizeof buffer; + r = MsiFormatRecord(hpkg, hrec, buffer, &sz); + ok( sz == 3, "size wrong\n"); + ok( 0 == strcmp(buffer,"hoo"), "wrong output %s\n",buffer); + ok( r == ERROR_SUCCESS, "format failed\n"); + + r = MsiRecordSetString(hrec, 0, "x[~]x"); + sz = sizeof buffer; + r = MsiFormatRecord(hpkg, hrec, buffer, &sz); + ok( sz == 3, "size wrong\n"); + ok( 0 == strcmp(buffer,"x"), "wrong output %s\n",buffer); + ok( r == ERROR_SUCCESS, "format failed\n"); + + r = MsiRecordSetString(hrec, 0, "[foo.$%}][1]"); + r = MsiRecordSetString(hrec, 1, "hoo"); + sz = sizeof buffer; + r = MsiFormatRecord(hpkg, hrec, buffer, &sz); + ok( sz == 3, "size wrong\n"); + ok( 0 == strcmp(buffer,"hoo"), "wrong output %s\n",buffer); + ok( r == ERROR_SUCCESS, "format failed\n"); + + r = MsiRecordSetString(hrec, 0, "[\\[]"); + sz = sizeof buffer; + r = MsiFormatRecord(hpkg, hrec, buffer, &sz); + ok( sz == 1, "size wrong\n"); + ok( 0 == strcmp(buffer,"["), "wrong output %s\n",buffer); + ok( r == ERROR_SUCCESS, "format failed\n"); + + SetEnvironmentVariable("FOO", "BAR"); + r = MsiRecordSetString(hrec, 0, "[%FOO]"); + sz = sizeof buffer; + r = MsiFormatRecord(hpkg, hrec, buffer, &sz); + ok( sz == 3, "size wrong\n"); + ok( 0 == strcmp(buffer,"BAR"), "wrong output %s\n",buffer); + ok( r == ERROR_SUCCESS, "format failed\n"); + + r = MsiRecordSetString(hrec, 0, "[[1]]"); + r = MsiRecordSetString(hrec, 1, "%FOO"); + sz = sizeof buffer; + r = MsiFormatRecord(hpkg, hrec, buffer, &sz); + ok( sz == 3, "size wrong\n"); + ok( 0 == strcmp(buffer,"BAR"), "wrong output %s\n",buffer); + ok( r == ERROR_SUCCESS, "format failed\n"); + + MsiCloseHandle( hrec ); + MsiCloseHandle( hpkg ); + DeleteFile(msifile); +} + START_TEST(package) { test_createpackage(); @@ -854,4 +1020,6 @@ START_TEST(package) test_settargetpath_bad(); test_props(); test_condition(); + test_msipackage(); + test_formatrecord2(); }

1 0

Mike McCormack : msi: Delete any databases we create at the end of each test.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: f29ec238e89325ac15243c4d26151d5cc301b266 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f29ec238e89325ac15243c4… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jun 12 13:20:46 2006 +0900 msi: Delete any databases we create at the end of each test. --- dlls/msi/tests/package.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index e23b73c..89e0403 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -28,6 +28,8 @@ #include <msiquery.h> #include "wine/test.h" +static const char msifile[] = "winetest.msi"; + static UINT run_query( MSIHANDLE hdb, const char *query ) { MSIHANDLE hview = 0; @@ -92,13 +94,12 @@ static UINT set_summary_info(MSIHANDLE h MSIHANDLE create_package_db(void) { MSIHANDLE hdb = 0; - CHAR szName[] = "winetest.msi"; UINT res; - DeleteFile(szName); + DeleteFile(msifile); /* create an empty database */ - res = MsiOpenDatabase(szName, MSIDBOPEN_CREATE, &hdb ); + res = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb ); ok( res == ERROR_SUCCESS , "Failed to create database\n" ); if( res != ERROR_SUCCESS ) return hdb; @@ -145,6 +146,7 @@ static void test_createpackage(void) res = MsiCloseHandle( hPackage); ok( res == ERROR_SUCCESS , "Failed to close package\n" ); + DeleteFile(msifile); } static void test_getsourcepath_bad( void ) @@ -270,6 +272,7 @@ static void test_getsourcepath( void ) } MsiCloseHandle( hpkg ); + DeleteFile(msifile); } static void test_doaction( void ) @@ -293,6 +296,7 @@ static void test_doaction( void ) ok( r == ERROR_FUNCTION_NOT_CALLED, "wrong return val\n"); MsiCloseHandle( hpkg ); + DeleteFile(msifile); } static void test_gettargetpath_bad(void) @@ -324,6 +328,7 @@ static void test_gettargetpath_bad(void) ok( r == ERROR_DIRECTORY, "wrong return val\n"); MsiCloseHandle( hpkg ); + DeleteFile(msifile); } static void test_settargetpath_bad(void) @@ -713,6 +718,7 @@ static void test_condition(void) ok( r == MSICONDITION_TRUE, "wrong return val\n"); MsiCloseHandle( hpkg ); + DeleteFile(msifile); } static BOOL check_prop_empty( MSIHANDLE hpkg, char * prop) @@ -835,6 +841,7 @@ static void test_props(void) ok( sz == 3, "wrong size returned\n"); MsiCloseHandle( hpkg ); + DeleteFile(msifile); } START_TEST(package)

1 0

Mike McCormack : msi: Fix compilation on msvc6.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: 53041d8f73003e491992cba6529e69dba120f312 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=53041d8f73003e491992cba… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jun 12 13:20:31 2006 +0900 msi: Fix compilation on msvc6. --- dlls/msi/tests/msi.c | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index ff15af4..b79f45d 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -27,6 +27,10 @@ #include "wine/test.h" typedef INSTALLSTATE (WINAPI *fnMsiUseFeatureExA)(LPCSTR, LPCSTR ,DWORD, DWORD ); fnMsiUseFeatureExA pMsiUseFeatureExA; +typedef UINT (WINAPI *fnMsiOpenPackageExA)(LPCSTR, DWORD, MSIHANDLE*); +fnMsiOpenPackageExA pMsiOpenPackageExA; +typedef UINT (WINAPI *fnMsiOpenPackageExW)(LPCWSTR, DWORD, MSIHANDLE*); +fnMsiOpenPackageExW pMsiOpenPackageExW; static void test_usefeature(void) { @@ -41,29 +45,27 @@ static void test_usefeature(void) r = MsiQueryFeatureState("{9085040-6000-11d3-8cfe-0150048383c9}" ,NULL); ok( r == INSTALLSTATE_INVALIDARG, "wrong return val\n"); - r = MsiUseFeatureExA(NULL,NULL,0,0); + r = pMsiUseFeatureExA(NULL,NULL,0,0); ok( r == INSTALLSTATE_INVALIDARG, "wrong return val\n"); - r = MsiUseFeatureExA(NULL, - "WORDVIEWFiles", -2, 1 ); + r = pMsiUseFeatureExA(NULL, "WORDVIEWFiles", -2, 1 ); ok( r == INSTALLSTATE_INVALIDARG, "wrong return val\n"); - r = MsiUseFeatureExA("{90850409-6000-11d3-8cfe-0150048383c9}", + r = pMsiUseFeatureExA("{90850409-6000-11d3-8cfe-0150048383c9}", NULL, -2, 0 ); ok( r == INSTALLSTATE_INVALIDARG, "wrong return val\n"); - r = MsiUseFeatureExA("{9085040-6000-11d3-8cfe-0150048383c9}", + r = pMsiUseFeatureExA("{9085040-6000-11d3-8cfe-0150048383c9}", "WORDVIEWFiles", -2, 0 ); ok( r == INSTALLSTATE_INVALIDARG, "wrong return val\n"); - r = MsiUseFeatureExA("{0085040-6000-11d3-8cfe-0150048383c9}", + r = pMsiUseFeatureExA("{0085040-6000-11d3-8cfe-0150048383c9}", "WORDVIEWFiles", -2, 0 ); ok( r == INSTALLSTATE_INVALIDARG, "wrong return val\n"); - r = MsiUseFeatureExA("{90850409-6000-11d3-8cfe-0150048383c9}", + r = pMsiUseFeatureExA("{90850409-6000-11d3-8cfe-0150048383c9}", "WORDVIEWFiles", -2, 1 ); ok( r == INSTALLSTATE_INVALIDARG, "wrong return val\n"); - } static void test_null(void) @@ -71,7 +73,7 @@ static void test_null(void) MSIHANDLE hpkg; UINT r; - r = MsiOpenPackageExW(NULL, 0, &hpkg); + r = pMsiOpenPackageExW(NULL, 0, &hpkg); ok( r == ERROR_INVALID_PARAMETER,"wrong error\n"); r = MsiQueryProductStateW(NULL); @@ -86,6 +88,10 @@ START_TEST(msi) HMODULE hmod = GetModuleHandle("msi.dll"); pMsiUseFeatureExA = (fnMsiUseFeatureExA) GetProcAddress(hmod, "MsiUseFeatureExA"); + pMsiOpenPackageExA = (fnMsiOpenPackageExA) + GetProcAddress(hmod, "MsiOpenPackageExA"); + pMsiOpenPackageExW = (fnMsiOpenPackageExW) + GetProcAddress(hmod, "MsiOpenPackageExW"); test_usefeature(); test_null();

1 0

Mike McCormack : msi: Remove an inconsistent test.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: 3c81969a55aa839fbcda8369fce609c360b25d62 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3c81969a55aa839fbcda836… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jun 12 13:20:11 2006 +0900 msi: Remove an inconsistent test. --- dlls/msi/tests/db.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 44eecb1..420e194 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -70,7 +70,7 @@ static UINT do_query(MSIHANDLE hdb, cons return ret; } -void test_msiinsert(void) +static void test_msiinsert(void) { MSIHANDLE hdb = 0, hview = 0, hrec = 0; UINT r; @@ -120,8 +120,6 @@ void test_msiinsert(void) todo_wine { r = MsiRecordIsNull(hrec, 0); ok(r == FALSE, "field 0 not null\n"); - r = MsiRecordGetInteger(hrec, 0); - ok(r == 0x138080, "field 0 contents wrong\n"); } r = MsiRecordGetInteger(hrec, 1);

1 0

Mike McCormack : msi: Fix some test cases to pass against win2k.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: a302ec19bd96d7d1343c7aca9a4e591b50e1a034 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a302ec19bd96d7d1343c7ac… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jun 12 13:19:51 2006 +0900 msi: Fix some test cases to pass against win2k. --- dlls/msi/tests/format.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index 6016c62..aaa57aa 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -1037,14 +1037,12 @@ static void test_formatrecord(void) ok( 0 == strcmp(buffer,"hoo{{boo }}"), "wrong output\n"); ok( r == ERROR_SUCCESS, "format failed\n"); - todo_wine { r = MsiRecordSetString(hrec, 0, "{[1{{boo}}]}"); r = MsiRecordSetString(hrec, 1, "hoo"); sz = sizeof buffer; r = MsiFormatRecord(0, hrec, buffer, &sz); - ok( sz == 3, "size wrong: got %lu, expected 3\n", sz); - ok( 0 == strcmp(buffer,"[1]"), "wrong output: got %s, expected [1]\n", buffer); - } + ok( sz == 12, "size wrong: got %lu, expected 12\n", sz); + ok( 0 == strcmp(buffer,"{[1{{boo}}]}"), "wrong output: got %s, expected [1]\n", buffer); ok( r == ERROR_SUCCESS, "format failed\n"); todo_wine { @@ -1052,8 +1050,8 @@ static void test_formatrecord(void) r = MsiRecordSetString(hrec, 1, "hoo"); sz = sizeof buffer; r = MsiFormatRecord(0, hrec, buffer, &sz); - ok( sz == 3, "size wrong: got %lu, expected 3\n", sz); - ok( 0 == strcmp(buffer,"[1]"), "wrong output: got %s, expected [1]\n", buffer); + ok( sz == 6, "size wrong: got %lu, expected 3\n", sz); + ok( 0 == strcmp(buffer,"{{hoo}"), "wrong output: got %s, expected [1]\n", buffer); } ok( r == ERROR_SUCCESS, "format failed\n");

1 0