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

Henri Verbeet : wined3d: Remove entries without an internal format from the GL formats template.
by Alexandre Julliard June 4, 2009

June 4, 2009

Module: wine Branch: master Commit: 0cf49767ad181bdc4b4d80473c538255d43230b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf49767ad181bdc4b4d80473… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 4 10:16:20 2009 +0200 wined3d: Remove entries without an internal format from the GL formats template. --- dlls/wined3d/utils.c | 52 +++---------------------------------------------- 1 files changed, 4 insertions(+), 48 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 858e3ca..4802a7c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -182,9 +182,6 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { /* WINED3DFORMAT internal srgbInternal rtInternal format type flags */ - {WINED3DFMT_UNKNOWN, 0, 0, 0, - 0, 0, - 0}, /* FourCC formats */ /* GL_APPLE_ycbcr_422 claims that its '2YUV' format, which is supported via the UNSIGNED_SHORT_8_8_REV_APPLE type * is equivalent to 'UYVY' format on Windows, and the 'YUVS' via UNSIGNED_SHORT_8_8_APPLE equates to 'YUY2'. The @@ -216,15 +213,6 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { {WINED3DFMT_DXT5, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, - {WINED3DFMT_MULTI2_ARGB8, 0, 0, 0, - 0, 0, - 0}, - {WINED3DFMT_G8R8_G8B8, 0, 0, 0, - 0, 0, - 0}, - {WINED3DFMT_R8G8_B8G8, 0, 0, 0, - 0, 0, - 0}, /* IEEE formats */ {WINED3DFMT_R32_FLOAT, GL_RGB32F_ARB, GL_RGB32F_ARB, 0, GL_RED, GL_FLOAT, @@ -235,10 +223,6 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { {WINED3DFMT_R32G32B32A32_FLOAT, GL_RGBA32F_ARB, GL_RGBA32F_ARB, 0, GL_RGBA, GL_FLOAT, WINED3DFMT_FLAG_RENDERTARGET}, - /* Hmm? */ - {WINED3DFMT_CxV8U8, 0, 0, 0, - 0, 0, - 0}, /* Float */ {WINED3DFMT_R16_FLOAT, GL_RGB16F_ARB, GL_RGB16F_ARB, 0, GL_RED, GL_HALF_FLOAT_ARB, @@ -250,9 +234,6 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { GL_RGBA, GL_HALF_FLOAT_ARB, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET}, /* Palettized formats */ - {WINED3DFMT_A8P8, 0, 0, 0, - 0, 0, - 0}, {WINED3DFMT_P8, GL_COLOR_INDEX8_EXT, GL_COLOR_INDEX8_EXT, 0, GL_COLOR_INDEX, GL_UNSIGNED_BYTE, 0}, @@ -284,9 +265,6 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { {WINED3DFMT_A8_UNORM, GL_ALPHA8, GL_ALPHA8, 0, GL_ALPHA, GL_UNSIGNED_BYTE, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING}, - {WINED3DFMT_A8R3G3B2, 0, 0, 0, - 0, 0, - 0}, {WINED3DFMT_X4R4G4B4, GL_RGB4, GL_RGB4, 0, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4_REV, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, @@ -334,12 +312,6 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { {WINED3DFMT_R16G16_SNORM, GL_SIGNED_HILO16_NV, GL_SIGNED_HILO16_NV, 0, GL_HILO_NV, GL_SHORT, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, - {WINED3DFMT_W11V11U10, 0, 0, 0, - 0, 0, - 0}, - {WINED3DFMT_A2W10V10U10, 0, 0, 0, - 0, 0, - 0}, /* Depth stencil formats */ {WINED3DFMT_D16_LOCKABLE, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, @@ -371,29 +343,9 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { {WINED3DFMT_D24FS8, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_FLOAT, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL}, - /* Is this a vertex buffer? */ - {WINED3DFMT_VERTEXDATA, 0, 0, 0, - 0, 0, - 0}, - {WINED3DFMT_R16_UINT, 0, 0, 0, - 0, 0, - 0}, - {WINED3DFMT_R32_UINT, 0, 0, 0, - 0, 0, - 0}, {WINED3DFMT_R16G16B16A16_SNORM, GL_COLOR_INDEX, GL_COLOR_INDEX, 0, GL_COLOR_INDEX, GL_UNSIGNED_SHORT, 0}, - /* Vendor-specific formats */ - {WINED3DFMT_ATI2N, 0, 0, 0, - GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, - 0}, - {WINED3DFMT_NVHU, 0, 0, 0, - GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, - 0}, - {WINED3DFMT_NVHS, 0, 0, 0, - GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, - 0} }; static inline int getFmtIdx(WINED3DFORMAT fmt) { @@ -616,6 +568,8 @@ static void apply_format_fixups(WineD3D_GL_Info *gl_info) idx = getFmtIdx(WINED3DFMT_ATI2N); gl_info->gl_formats[idx].glInternal = GL_COMPRESSED_RED_GREEN_RGTC2_EXT; gl_info->gl_formats[idx].glGammaInternal = GL_COMPRESSED_RED_GREEN_RGTC2_EXT; + gl_info->gl_formats[idx].glFormat = GL_LUMINANCE_ALPHA; + gl_info->gl_formats[idx].glType = GL_UNSIGNED_BYTE; gl_info->gl_formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); } @@ -624,6 +578,8 @@ static void apply_format_fixups(WineD3D_GL_Info *gl_info) idx = getFmtIdx(WINED3DFMT_ATI2N); gl_info->gl_formats[idx].glInternal = GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI; gl_info->gl_formats[idx].glGammaInternal = GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI; + gl_info->gl_formats[idx].glFormat = GL_LUMINANCE_ALPHA; + gl_info->gl_formats[idx].glType = GL_UNSIGNED_BYTE; gl_info->gl_formats[idx].color_fixup= create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_W, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); }

1 0

Henri Verbeet : wined3d: Check FBO compatibility after the fixups are applied.
by Alexandre Julliard June 4, 2009

June 4, 2009

Module: wine Branch: master Commit: 0a059aafbe7155e0d058689fe948acc5f3cbdcc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a059aafbe7155e0d058689fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 4 10:16:21 2009 +0200 wined3d: Check FBO compatibility after the fixups are applied. --- dlls/wined3d/utils.c | 59 ++++++++++++++++++++++++++++++------------------- 1 files changed, 36 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e152337..e4c09c8 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -420,6 +420,40 @@ static BOOL check_fbo_compat(const WineD3D_GL_Info *gl_info, GLint internal_form return status == GL_FRAMEBUFFER_COMPLETE_EXT; } +static void init_format_fbo_compat_info(WineD3D_GL_Info *gl_info) +{ + unsigned int i; + + for (i = 0; i < sizeof(formats) / sizeof(*formats); ++i) + { + struct GlPixelFormatDesc *desc = &gl_info->gl_formats[i]; + + if (!desc->glInternal) continue; + + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && desc->rtInternal) + { + /* Check if the default internal format is supported as a frame buffer target, otherwise + * fall back to the render target internal. + * + * Try to stick to the standard format if possible, this limits precision differences. */ + if (check_fbo_compat(gl_info, desc->glInternal)) + { + TRACE("Format %s is supported as fbo target\n", debug_d3dformat(desc->format)); + desc->rtInternal = desc->glInternal; + } + else + { + TRACE("Internal format of %s not supported as FBO target, using render target internal instead\n", + debug_d3dformat(desc->format)); + } + } + else + { + desc->rtInternal = desc->glInternal; + } + } +} + static BOOL init_format_texture_info(WineD3D_GL_Info *gl_info) { unsigned int i; @@ -439,34 +473,12 @@ static BOOL init_format_texture_info(WineD3D_GL_Info *gl_info) desc = &gl_info->gl_formats[fmt_idx]; desc->glInternal = gl_formats_template[i].glInternal; desc->glGammaInternal = gl_formats_template[i].glGammaInternal; + desc->rtInternal = gl_formats_template[i].rtInternal; desc->glFormat = gl_formats_template[i].glFormat; desc->glType = gl_formats_template[i].glType; desc->color_fixup = COLOR_FIXUP_IDENTITY; desc->Flags |= gl_formats_template[i].Flags; desc->heightscale = 1.0; - - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && gl_formats_template[i].rtInternal) - { - /* Check if the default internal format is supported as a frame buffer target, otherwise - * fall back to the render target internal. - * - * Try to stick to the standard format if possible, this limits precision differences */ - if (!check_fbo_compat(gl_info, gl_formats_template[i].glInternal)) - { - TRACE("Internal format of %s not supported as FBO target, using render target internal instead\n", - debug_d3dformat(gl_formats_template[i].fmt)); - desc->rtInternal = gl_formats_template[i].rtInternal; - } - else - { - TRACE("Format %s is supported as fbo target\n", debug_d3dformat(gl_formats_template[i].fmt)); - desc->rtInternal = gl_formats_template[i].glInternal; - } - } - else - { - desc->rtInternal = gl_formats_template[i].glInternal; - } } return TRUE; @@ -670,6 +682,7 @@ BOOL initPixelFormats(WineD3D_GL_Info *gl_info) } apply_format_fixups(gl_info); + init_format_fbo_compat_info(gl_info); return TRUE; }

1 0

Henri Verbeet : wined3d: Free priv->stack in shader_glsl_free().
by Alexandre Julliard June 4, 2009

June 4, 2009

Module: wine Branch: master Commit: 37bdcd6b9bf041e55643f20673c79acc91ed91ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=37bdcd6b9bf041e55643f2067… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 4 10:16:20 2009 +0200 wined3d: Free priv->stack in shader_glsl_free(). --- dlls/wined3d/glsl_shader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d33a3ff..89b1e03 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4503,6 +4503,7 @@ static void shader_glsl_free(IWineD3DDevice *iface) { wine_rb_destroy(&priv->program_lookup, NULL, NULL); constant_heap_free(&priv->pconst_heap); constant_heap_free(&priv->vconst_heap); + HeapFree(GetProcessHeap(), 0, priv->stack); HeapFree(GetProcessHeap(), 0, This->shader_priv); This->shader_priv = NULL;

1 0

Hans Leidekker : msi/tests: Ignore case when comparing file names.
by Alexandre Julliard June 4, 2009

June 4, 2009

Module: wine Branch: master Commit: f9e33e9af6970f2f82156a047050a4118a438dc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9e33e9af6970f2f82156a047… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 4 10:14:06 2009 +0200 msi/tests: Ignore case when comparing file names. --- dlls/msi/tests/package.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index c403051..a7c0ed6 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -980,13 +980,13 @@ static void test_settargetpath(void) ok( r == ERROR_SUCCESS, "MsiSetTargetPath returned %d\n", r ); query_file_path( hpkg, "[#TestFile]", buffer ); - ok( !lstrcmp(buffer, "C:\\one\\two\\TestDir\\testfile.txt"), + ok( !lstrcmpi(buffer, "C:\\one\\two\\TestDir\\testfile.txt"), "Expected C:\\one\\two\\TestDir\\testfile.txt, got %s\n", buffer ); sz = sizeof buffer - 1; r = MsiGetTargetPath( hpkg, "TestParent", buffer, &sz ); ok( r == ERROR_SUCCESS, "failed to get target path: %d\n", r); - ok( !lstrcmp(buffer, "C:\\one\\two\\"), "Expected C:\\one\\two\\, got %s\n", buffer); + ok( !lstrcmpi(buffer, "C:\\one\\two\\"), "Expected C:\\one\\two\\, got %s\n", buffer); MsiCloseHandle( hpkg ); } @@ -8790,7 +8790,7 @@ static void test_appsearch_drlocator(void) search_absolute_directory(path, CURR_DIR + 3); r = MsiGetPropertyA(hpkg, "SIGPROP3", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); + ok(!lstrcmpiA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); size = MAX_PATH; r = MsiGetPropertyA(hpkg, "SIGPROP4", prop, &size); @@ -8837,7 +8837,7 @@ static void test_appsearch_drlocator(void) search_absolute_directory(path, ""); r = MsiGetPropertyA(hpkg, "SIGPROP11", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); + ok(!lstrcmpiA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); DeleteFileA("FileName1"); DeleteFileA("FileName3.dll");

1 0

Hans Leidekker : msi: Add tests for importing a _SummaryInformation table.
by Alexandre Julliard June 4, 2009

June 4, 2009

Module: wine Branch: master Commit: a0b9315dffa3610cf3fc3b0c8d0d84ce143ff896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0b9315dffa3610cf3fc3b0c8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 4 10:13:14 2009 +0200 msi: Add tests for importing a _SummaryInformation table. --- dlls/msi/tests/db.c | 142 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 142 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index a48bcab..95f2170 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -24,6 +24,7 @@ #include <windows.h> #include <msi.h> +#include <msidefs.h> #include <msiquery.h> #include <objidl.h> @@ -1711,6 +1712,24 @@ static const CHAR endlines2[] = "A\tB\tC\tD\tE\tF\r" "a\tb\tc\td\te\tf\n" "g\th\ti\tj\tk\tl\r\n"; +static const CHAR suminfo[] = "PropertyId\tValue\n" + "i2\tl255\n" + "_SummaryInformation\tPropertyId\n" + "1\t1252\n" + "2\tInstaller Database\n" + "3\tInstaller description\n" + "4\tWineHQ\n" + "5\tInstaller\n" + "6\tInstaller comments\n" + "7\tIntel;1033\n" + "9\t{12345678-1234-1234-1234-123456789012}\n" + "12\t2009/04/12 15:46:11\n" + "13\t2009/04/12 15:46:11\n" + "14\t200\n" + "15\t2\n" + "18\tVim\n" + "19\t2\n"; + static void write_file(const CHAR *filename, const char *data, int data_size) { DWORD size; @@ -1733,6 +1752,128 @@ static UINT add_table_to_db(MSIHANDLE hdb, LPCSTR table_data) return r; } +static void test_suminfo_import(void) +{ + MSIHANDLE hdb, hsi, view = 0; + LPCSTR query; + UINT r, count, size, type; + char str_value[50]; + INT int_value; + FILETIME ft_value; + + GetCurrentDirectoryA(MAX_PATH, CURR_DIR); + + r = MsiOpenDatabaseA(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + r = add_table_to_db(hdb, suminfo); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + /* _SummaryInformation is not imported as a regular table... */ + + query = "SELECT * FROM `_SummaryInformation`"; + r = MsiDatabaseOpenViewA(hdb, query, &view); + ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %u\n", r); + MsiCloseHandle(view); + + /* ...its data is added to the special summary information stream */ + + r = MsiGetSummaryInformationA(hdb, NULL, 0, &hsi); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + r = MsiSummaryInfoGetPropertyCount(hsi, &count); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(count == 14, "Expected 14, got %u\n", count); + + r = MsiSummaryInfoGetPropertyA(hsi, PID_CODEPAGE, &type, &int_value, NULL, NULL, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(type == VT_I2, "Expected VT_I2, got %u\n", type); + ok(int_value == 1252, "Expected 1252, got %d\n", int_value); + + size = sizeof(str_value); + r = MsiSummaryInfoGetPropertyA(hsi, PID_TITLE, &type, NULL, NULL, str_value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(type == VT_LPSTR, "Expected VT_LPSTR, got %u\n", type); + ok(size == 18, "Expected 18, got %u\n", size); + ok(!strcmp(str_value, "Installer Database"), + "Expected \"Installer Database\", got %s\n", str_value); + + size = sizeof(str_value); + r = MsiSummaryInfoGetPropertyA(hsi, PID_SUBJECT, &type, NULL, NULL, str_value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(type == VT_LPSTR, "Expected VT_LPSTR, got %u\n", type); + ok(!strcmp(str_value, "Installer description"), + "Expected \"Installer description\", got %s\n", str_value); + + size = sizeof(str_value); + r = MsiSummaryInfoGetPropertyA(hsi, PID_AUTHOR, &type, NULL, NULL, str_value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(type == VT_LPSTR, "Expected VT_LPSTR, got %u\n", type); + ok(!strcmp(str_value, "WineHQ"), + "Expected \"WineHQ\", got %s\n", str_value); + + size = sizeof(str_value); + r = MsiSummaryInfoGetPropertyA(hsi, PID_KEYWORDS, &type, NULL, NULL, str_value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(type == VT_LPSTR, "Expected VT_LPSTR, got %u\n", type); + ok(!strcmp(str_value, "Installer"), + "Expected \"Installer\", got %s\n", str_value); + + size = sizeof(str_value); + r = MsiSummaryInfoGetPropertyA(hsi, PID_COMMENTS, &type, NULL, NULL, str_value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(type == VT_LPSTR, "Expected VT_LPSTR, got %u\n", type); + ok(!strcmp(str_value, "Installer comments"), + "Expected \"Installer comments\", got %s\n", str_value); + + size = sizeof(str_value); + r = MsiSummaryInfoGetPropertyA(hsi, PID_TEMPLATE, &type, NULL, NULL, str_value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(type == VT_LPSTR, "Expected VT_LPSTR, got %u\n", type); + ok(!strcmp(str_value, "Intel;1033"), + "Expected \"Intel;1033\", got %s\n", str_value); + + size = sizeof(str_value); + r = MsiSummaryInfoGetPropertyA(hsi, PID_REVNUMBER, &type, NULL, NULL, str_value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(type == VT_LPSTR, "Expected VT_LPSTR, got %u\n", type); + ok(!strcmp(str_value, "{12345678-1234-1234-1234-123456789012}"), + "Expected \"{12345678-1234-1234-1234-123456789012}\", got %s\n", str_value); + + r = MsiSummaryInfoGetPropertyA(hsi, PID_CREATE_DTM, &type, NULL, &ft_value, NULL, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(type == VT_FILETIME, "Expected VT_FILETIME, got %u\n", type); + + r = MsiSummaryInfoGetPropertyA(hsi, PID_LASTSAVE_DTM, &type, NULL, &ft_value, NULL, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(type == VT_FILETIME, "Expected VT_FILETIME, got %u\n", type); + + r = MsiSummaryInfoGetPropertyA(hsi, PID_PAGECOUNT, &type, &int_value, NULL, NULL, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(type == VT_I4, "Expected VT_I4, got %u\n", type); + ok(int_value == 200, "Expected 200, got %d\n", int_value); + + r = MsiSummaryInfoGetPropertyA(hsi, PID_WORDCOUNT, &type, &int_value, NULL, NULL, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(type == VT_I4, "Expected VT_I4, got %u\n", type); + ok(int_value == 2, "Expected 2, got %d\n", int_value); + + r = MsiSummaryInfoGetPropertyA(hsi, PID_SECURITY, &type, &int_value, NULL, NULL, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(type == VT_I4, "Expected VT_I4, got %u\n", type); + ok(int_value == 2, "Expected 2, got %d\n", int_value); + + size = sizeof(str_value); + r = MsiSummaryInfoGetPropertyA(hsi, PID_APPNAME, &type, NULL, NULL, str_value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(type == VT_LPSTR, "Expected VT_LPSTR, got %u\n", type); + ok(!strcmp(str_value, "Vim"), "Expected \"Vim\", got %s\n", str_value); + + MsiCloseHandle(hsi); + MsiCloseHandle(hdb); + DeleteFileA(msifile); +} + static void test_msiimport(void) { MSIHANDLE hdb, view, rec; @@ -7784,4 +7925,5 @@ START_TEST(db) test_dbmerge(); test_insertorder(); test_columnorder(); + test_suminfo_import(); }

1 0

Hans Leidekker : msi: Don't trace an out parameter.
by Alexandre Julliard June 4, 2009

June 4, 2009

Module: wine Branch: master Commit: c1670fb353ed3c2ca4424a3c11ea613d8011a160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1670fb353ed3c2ca4424a3c1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 4 10:12:31 2009 +0200 msi: Don't trace an out parameter. --- dlls/msi/format.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index de531bf..f59024a 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -869,7 +869,7 @@ UINT MSI_FormatRecordW( MSIPACKAGE* package, MSIRECORD* record, LPWSTR buffer, DWORD len; UINT rc = ERROR_INVALID_PARAMETER; - TRACE("%p %p %p %i\n", package, record ,buffer, *size); + TRACE("%p %p %p %p\n", package, record, buffer, size); rec = msi_dup_record_field(record,0); if (!rec)

1 0

Alexandre Julliard : user32/tests: Add more synchronization in the exit thread test to avoid races.
by Alexandre Julliard June 4, 2009

June 4, 2009

Module: wine Branch: master Commit: 52ad8123f9146959257d2f991215dbf2a3fc4d22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52ad8123f9146959257d2f991… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 20:33:45 2009 +0200 user32/tests: Add more synchronization in the exit thread test to avoid races. --- dlls/user32/tests/msg.c | 49 ++++++++++++++++++++++++++++------------------ 1 files changed, 30 insertions(+), 19 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index dfc4c0d..0a59ae8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6315,7 +6315,9 @@ static void test_paint_messages(void) struct wnd_event { HWND hwnd; - HANDLE event; + HANDLE grand_child; + HANDLE start_event; + HANDLE stop_event; }; static DWORD WINAPI thread_proc(void *param) @@ -6327,7 +6329,7 @@ static DWORD WINAPI thread_proc(void *param) 100, 100, 200, 200, 0, 0, 0, NULL); ok(wnd_event->hwnd != 0, "Failed to create overlapped window\n"); - SetEvent(wnd_event->event); + SetEvent(wnd_event->start_event); while (GetMessage(&msg, 0, 0, 0)) { @@ -6351,13 +6353,13 @@ static DWORD CALLBACK create_grand_child_thread( void *param ) ok (hchild != 0, "Failed to create child window\n"); flush_events(); flush_sequence(); - SetEvent( wnd_event->event ); + SetEvent( wnd_event->start_event ); - while (GetMessage(&msg, 0, 0, 0)) + for (;;) { - TranslateMessage(&msg); - DispatchMessage(&msg); + MsgWaitForMultipleObjects(0, NULL, FALSE, 1000, QS_ALLINPUT); if (!IsWindow( hchild )) break; /* will be destroyed when parent thread exits */ + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg); } return 0; } @@ -6366,7 +6368,7 @@ static DWORD CALLBACK create_child_thread( void *param ) { struct wnd_event *wnd_event = param; struct wnd_event child_event; - DWORD tid; + DWORD ret, tid; MSG msg; child_event.hwnd = CreateWindowExA(0, "TestWindowClass", "Test child", @@ -6375,15 +6377,16 @@ static DWORD CALLBACK create_child_thread( void *param ) SetFocus( child_event.hwnd ); flush_events(); flush_sequence(); - child_event.event = wnd_event->event; - CloseHandle( CreateThread(NULL, 0, create_grand_child_thread, &child_event, 0, &tid) ); + child_event.start_event = wnd_event->start_event; + wnd_event->grand_child = CreateThread(NULL, 0, create_grand_child_thread, &child_event, 0, &tid); for (;;) { - DWORD ret = MsgWaitForMultipleObjects(1, &child_event.event, FALSE, 1000, QS_SENDMESSAGE); + DWORD ret = MsgWaitForMultipleObjects(1, &child_event.start_event, FALSE, 1000, QS_SENDMESSAGE); if (ret != 1) break; while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg); } - Sleep( 200 ); /* leave parent the time to finish processing messages */ + ret = WaitForSingleObject( wnd_event->stop_event, 5000 ); + ok( !ret, "WaitForSingleObject failed %x\n", ret ); return 0; } @@ -6398,8 +6401,8 @@ static void test_interthread_messages(void) struct wnd_event wnd_event; BOOL ret; - wnd_event.event = CreateEventW(NULL, 0, 0, NULL); - if (!wnd_event.event) + wnd_event.start_event = CreateEventW(NULL, 0, 0, NULL); + if (!wnd_event.start_event) { win_skip("skipping interthread message test under win9x\n"); return; @@ -6408,9 +6411,9 @@ static void test_interthread_messages(void) hThread = CreateThread(NULL, 0, thread_proc, &wnd_event, 0, &tid); ok(hThread != NULL, "CreateThread failed, error %d\n", GetLastError()); - ok(WaitForSingleObject(wnd_event.event, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + ok(WaitForSingleObject(wnd_event.start_event, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); - CloseHandle(wnd_event.event); + CloseHandle(wnd_event.start_event); SetLastError(0xdeadbeef); ok(!DestroyWindow(wnd_event.hwnd), "DestroyWindow succeded\n"); @@ -6460,20 +6463,28 @@ static void test_interthread_messages(void) ok (wnd_event.hwnd != 0, "Failed to create parent window\n"); flush_sequence(); log_all_parent_messages++; - wnd_event.event = CreateEventA( NULL, TRUE, FALSE, NULL ); + wnd_event.start_event = CreateEventA( NULL, TRUE, FALSE, NULL ); + wnd_event.stop_event = CreateEventA( NULL, TRUE, FALSE, NULL ); hThread = CreateThread( NULL, 0, create_child_thread, &wnd_event, 0, &tid ); for (;;) { - ret = MsgWaitForMultipleObjects(1, &wnd_event.event, FALSE, 1000, QS_SENDMESSAGE); + ret = MsgWaitForMultipleObjects(1, &wnd_event.start_event, FALSE, 1000, QS_SENDMESSAGE); if (ret != 1) break; while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg); } ok( !ret, "MsgWaitForMultipleObjects failed %x\n", ret ); /* now wait for the thread without processing messages; this shouldn't deadlock */ + SetEvent( wnd_event.stop_event ); ret = WaitForSingleObject( hThread, 5000 ); ok( !ret, "WaitForSingleObject failed %x\n", ret ); CloseHandle( hThread ); - CloseHandle( wnd_event.event ); + + ret = WaitForSingleObject( wnd_event.grand_child, 5000 ); + ok( !ret, "WaitForSingleObject failed %x\n", ret ); + CloseHandle( wnd_event.grand_child ); + + CloseHandle( wnd_event.start_event ); + CloseHandle( wnd_event.stop_event ); flush_events(); ok_sequence(WmExitThreadSeq, "destroy child on thread exit", FALSE); log_all_parent_messages--; @@ -10210,7 +10221,7 @@ static const struct message WmShowMaximized_2[] = { }; static const struct message WmShowMaximized_3[] = { { HCBT_MINMAX, hook|lparam, 0, SW_SHOWMAXIMIZED }, - { WM_GETMINMAXINFO, sent }, + { WM_GETMINMAXINFO, sent|optional }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED, 0, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOSIZE|SWP_NOMOVE }, { HCBT_ACTIVATE, hook|optional }, /* win2000 doesn't send it */ { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2000 doesn't send it */

1 0

Nikolay Sivov : comctl32/listview: Some tests for LVS_SORT[A, DE]SCENDING, remove these styles from TODOs.
by Alexandre Julliard June 4, 2009

June 4, 2009

Module: wine Branch: master Commit: 3e4ba3048a64a33f2f8d798f12f37e84a8dda7bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e4ba3048a64a33f2f8d798f1… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jun 3 22:43:28 2009 +0400 comctl32/listview: Some tests for LVS_SORT[A,DE]SCENDING, remove these styles from TODOs. --- dlls/comctl32/listview.c | 1 - dlls/comctl32/tests/listview.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index aa614c2..b83c697 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -80,7 +80,6 @@ * Styles * -- LVS_NOLABELWRAP * -- LVS_NOSCROLL (see Q137520) - * -- LVS_SORTASCENDING, LVS_SORTDESCENDING * -- LVS_ALIGNTOP * -- LVS_TYPESTYLEMASK * diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index d0aa1f3..a8e0b9b 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2226,6 +2226,35 @@ static void test_ownerdata(void) "ownerdata getitem selected state 2", FALSE); DestroyWindow(hwnd); + + /* LVS_SORTASCENDING/LVS_SORTDESCENDING aren't compatible with LVS_OWNERDATA */ + hwnd = create_listview_control(LVS_OWNERDATA | LVS_SORTASCENDING); + ok(hwnd != NULL, "failed to create a listview window\n"); + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(style & LVS_OWNERDATA, "Expected LVS_OWNERDATA\n"); + ok(style & LVS_SORTASCENDING, "Expected LVS_SORTASCENDING to be set\n"); + SetWindowLongPtrA(hwnd, GWL_STYLE, style & ~LVS_SORTASCENDING); + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(!(style & LVS_SORTASCENDING), "Expected LVS_SORTASCENDING not set\n"); + DestroyWindow(hwnd); + /* apparently it's allowed to switch these style on after creation */ + hwnd = create_listview_control(LVS_OWNERDATA); + ok(hwnd != NULL, "failed to create a listview window\n"); + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(style & LVS_OWNERDATA, "Expected LVS_OWNERDATA\n"); + SetWindowLongPtrA(hwnd, GWL_STYLE, style | LVS_SORTASCENDING); + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(style & LVS_SORTASCENDING, "Expected LVS_SORTASCENDING to be set\n"); + DestroyWindow(hwnd); + + hwnd = create_listview_control(LVS_OWNERDATA); + ok(hwnd != NULL, "failed to create a listview window\n"); + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(style & LVS_OWNERDATA, "Expected LVS_OWNERDATA\n"); + SetWindowLongPtrA(hwnd, GWL_STYLE, style | LVS_SORTDESCENDING); + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(style & LVS_SORTDESCENDING, "Expected LVS_SORTDESCENDING to be set\n"); + DestroyWindow(hwnd); } static void test_norecompute(void)

1 0

Hans Leidekker : msi: Initialize some variables.
by Alexandre Julliard June 4, 2009

June 4, 2009

Module: wine Branch: master Commit: d02dbf44922231799f851bff962759b651c41c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d02dbf44922231799f851bff9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 4 10:12:56 2009 +0200 msi: Initialize some variables. --- dlls/msi/registry.c | 2 +- dlls/msi/tests/package.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 3ba34d1..f22c01f 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1822,7 +1822,7 @@ static UINT msi_check_product_patches(LPCWSTR prodcode, LPCWSTR usersid, LPWSTR patch, LPWSTR targetprod, MSIINSTALLCONTEXT *targetctx, LPWSTR targetsid, DWORD *sidsize, LPWSTR *transforms) { - MSIPATCHSTATE state; + MSIPATCHSTATE state = MSIPATCHSTATE_INVALID; LPWSTR ptr, patches = NULL; HKEY prod, patchkey = 0; HKEY localprod = 0, localpatch = 0; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index a9eef76..3263ec1 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -939,6 +939,7 @@ static void test_settargetpath(void) sz = sizeof tempdir - 1; r = MsiGetTargetPath( hpkg, "TARGETDIR", tempdir, &sz ); sprintf( file, "%srootfile.txt", tempdir ); + buffer[0] = 0; query_file_path( hpkg, "[#RootFile]", buffer ); ok( r == ERROR_SUCCESS, "failed to get target path: %d\n", r); ok( !lstrcmp(buffer, file), "Expected %s, got %s\n", file, buffer ); @@ -11057,8 +11058,8 @@ static void test_access(void) static void test_emptypackage(void) { - MSIHANDLE hpkg, hdb, hsuminfo; - MSIHANDLE hview, hrec; + MSIHANDLE hpkg = 0, hdb = 0, hsuminfo = 0; + MSIHANDLE hview = 0, hrec = 0; MSICONDITION condition; CHAR buffer[MAX_PATH]; DWORD size;

1 0

Hans Leidekker : crypt32: Initialize salt correctly.
by Alexandre Julliard June 4, 2009

June 4, 2009

Module: wine Branch: master Commit: 0376ec38b01a9664842debc085c02a2b34d1340e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0376ec38b01a9664842debc08… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 4 10:11:55 2009 +0200 crypt32: Initialize salt correctly. --- dlls/crypt32/protectdata.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/protectdata.c b/dlls/crypt32/protectdata.c index e6ac16e..a7351bb 100644 --- a/dlls/crypt32/protectdata.c +++ b/dlls/crypt32/protectdata.c @@ -609,7 +609,7 @@ BOOL fill_protect_data(struct protect_data_t * pInfo, LPCWSTR szDataDescr, if ((pInfo->salt.pbData=CryptMemAlloc(CRYPT32_PROTECTDATA_SALT_LEN))) { /* generate random salt */ - if (!CryptGenRandom(hProv, pInfo->salt.cbData, pInfo->salt.pbData)) + if (!CryptGenRandom(hProv, CRYPT32_PROTECTDATA_SALT_LEN, pInfo->salt.pbData)) { ERR("CryptGenRandom\n"); free_protect_data(pInfo);

1 0