April 2010 - Wine-Commits - list.winehq.org

Hans Leidekker : msi: Test the contents of some of the system tables before and after patching.
by Alexandre Julliard April 29, 2010

April 29, 2010

Module: wine Branch: master Commit: 73f1294431393c3029590fd590be4994ea6f326b URL: http://source.winehq.org/git/wine.git/?a=commit;h=73f1294431393c3029590fd59… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 29 09:38:36 2010 +0200 msi: Test the contents of some of the system tables before and after patching. --- dlls/msi/tests/patch.c | 170 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 170 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index ff6d399..369254c 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -789,6 +789,175 @@ static void test_MsiOpenDatabase( void ) DeleteFileA( mspfile ); } +static UINT find_entry( MSIHANDLE hdb, const char *table, const char *entry ) +{ + static char fmt[] = "SELECT * FROM `%s` WHERE `Name` = '%s'"; + char query[0x100]; + UINT r; + MSIHANDLE hview, hrec; + + sprintf( query, fmt, table, entry ); + r = MsiDatabaseOpenView( hdb, query, &hview ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewExecute( hview, 0 ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewFetch( hview, &hrec ); + MsiViewClose( hview ); + MsiCloseHandle( hview ); + MsiCloseHandle( hrec ); + return r; +} + +static void test_system_tables( void ) +{ + UINT r; + const char *query; + MSIHANDLE hproduct, hdb, hview, hrec; + + if (!pMsiApplyPatchA) + { + win_skip("MsiApplyPatchA is not available\n"); + return; + } + + CreateDirectoryA( "msitest", NULL ); + create_file( "msitest\\patch.txt", 1000 ); + + create_database( msifile, tables, sizeof(tables) / sizeof(struct msi_table) ); + create_patch( mspfile ); + + MsiSetInternalUI( INSTALLUILEVEL_NONE, NULL ); + + r = MsiInstallProductA( msifile, NULL ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiOpenProductA( "{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}", &hproduct ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + hdb = MsiGetActiveDatabase( hproduct ); + ok( hdb, "failed to get database handle\n" ); + + r = find_entry( hdb, "_Streams", "\5SummaryInformation" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + query = "SELECT * FROM `_Storages`"; + r = MsiDatabaseOpenView( hdb, query, &hview ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewExecute( hview, 0 ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewFetch( hview, &hrec ); + ok( r == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %u\n", r ); + + r = find_entry( hdb, "_Tables", "Directory" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "File" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "Component" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "Feature" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "FeatureComponents" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "Property" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "InstallExecuteSequence" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "Media" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "_Property" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + MsiCloseHandle( hdb ); + MsiCloseHandle( hproduct ); + + r = MsiApplyPatchA( mspfile, NULL, INSTALLTYPE_DEFAULT, NULL ); + ok( r == ERROR_SUCCESS || broken( r == ERROR_PATCH_PACKAGE_INVALID ), /* version 2.0 */ + "expected ERROR_SUCCESS, got %u\n", r ); + + if (r == ERROR_PATCH_PACKAGE_INVALID) + { + win_skip("Windows Installer < 3.0 detected\n"); + return; + } + + r = MsiOpenProductA( "{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}", &hproduct ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + hdb = MsiGetActiveDatabase( hproduct ); + ok( hdb, "failed to get database handle\n" ); + + r = find_entry( hdb, "_Streams", "\5SummaryInformation" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + query = "SELECT * FROM `_Storages`"; + r = MsiDatabaseOpenView( hdb, query, &hview ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewExecute( hview, 0 ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewFetch( hview, &hrec ); + ok( r == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %u\n", r ); + + r = find_entry( hdb, "_Tables", "Directory" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "File" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "Component" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "Feature" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "FeatureComponents" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "Property" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "InstallExecuteSequence" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "Media" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "_Property" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "MsiPatchHeaders" ); + todo_wine ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "Patch" ); + todo_wine ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "PatchPackage" ); + todo_wine ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + MsiCloseHandle( hdb ); + MsiCloseHandle( hproduct ); + + r = MsiInstallProductA( msifile, "REMOVE=ALL" ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + DeleteFileA( msifile ); + DeleteFileA( mspfile ); + RemoveDirectoryA( "msitest" ); +} + START_TEST(patch) { DWORD len; @@ -810,6 +979,7 @@ START_TEST(patch) test_simple_patch(); test_MsiOpenDatabase(); + test_system_tables(); SetCurrentDirectoryA( prev_path ); }

1 0

Henri Verbeet : wined3d: Store the VTF format capability in the format table.
by Alexandre Julliard April 29, 2010

April 29, 2010

Module: wine Branch: master Commit: c1ea8fb6c7e230020da18444e5f5e757b2edc330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1ea8fb6c7e230020da18444e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 29 00:09:03 2010 +0200 wined3d: Store the VTF format capability in the format table. --- dlls/wined3d/directx.c | 26 ++------------------------ dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 4 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e4544be..baabda8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3636,30 +3636,8 @@ static BOOL CheckSurfaceCapability(struct wined3d_adapter *adapter, static BOOL CheckVertexTextureCapability(struct wined3d_adapter *adapter, const struct wined3d_format_desc *format_desc) { - const struct wined3d_gl_info *gl_info = &adapter->gl_info; - - if (!gl_info->limits.vertex_samplers) - { - TRACE_(d3d_caps)("[FAILED]\n"); - return FALSE; - } - - switch (format_desc->format) - { - case WINED3DFMT_R32G32B32A32_FLOAT: - if (!gl_info->supported[ARB_TEXTURE_FLOAT]) - { - TRACE_(d3d_caps)("[FAILED]\n"); - return FALSE; - } - TRACE_(d3d_caps)("[OK]\n"); - return TRUE; - - default: - TRACE_(d3d_caps)("[FAILED]\n"); - return FALSE; - } - return FALSE; + return adapter->gl_info.limits.vertex_samplers + && (format_desc->Flags & WINED3DFMT_FLAG_VTF); } static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapter, WINED3DDEVTYPE DeviceType, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 60a7bee..ac7e2da 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -619,7 +619,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = ARB_TEXTURE_RG, NULL}, {WINED3DFMT_R32G32B32A32_FLOAT, GL_RGBA32F_ARB, GL_RGBA32F_ARB, 0, GL_RGBA, GL_FLOAT, 0, - WINED3DFMT_FLAG_RENDERTARGET, + WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_VTF, ARB_TEXTURE_FLOAT, NULL}, /* Float */ {WINED3DFMT_R16_FLOAT, GL_RGB16F_ARB, GL_RGB16F_ARB, 0, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d0ed13c..c316a4b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2991,6 +2991,7 @@ extern WINED3DFORMAT pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN; #define WINED3DFMT_FLAG_BUMPMAP 0x00000400 #define WINED3DFMT_FLAG_SRGB_READ 0x00000800 #define WINED3DFMT_FLAG_SRGB_WRITE 0x00001000 +#define WINED3DFMT_FLAG_VTF 0x00002000 struct wined3d_format_desc {

1 0

Henri Verbeet : wined3d: Store the sRGB read format capability in the format table.
by Alexandre Julliard April 29, 2010

April 29, 2010

Module: wine Branch: master Commit: c0417812556cf3ada911bf490807bfa8cfd78f22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0417812556cf3ada911bf490… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 29 00:09:01 2010 +0200 wined3d: Store the sRGB read format capability in the format table. --- dlls/wined3d/directx.c | 31 ++----------------------------- dlls/wined3d/utils.c | 22 ++++++++++++---------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 15 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 94a1fb2..1fa277b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3298,35 +3298,8 @@ static BOOL CheckRenderTargetCapability(struct wined3d_adapter *adapter, static BOOL CheckSrgbReadCapability(struct wined3d_adapter *adapter, const struct wined3d_format_desc *format_desc) { - const struct wined3d_gl_info *gl_info = &adapter->gl_info; - - /* Check for supported sRGB formats (Texture loading and framebuffer) */ - if (!gl_info->supported[EXT_TEXTURE_SRGB]) - { - TRACE_(d3d_caps)("[FAILED] GL_EXT_texture_sRGB not supported\n"); - return FALSE; - } - - switch (format_desc->format) - { - case WINED3DFMT_B8G8R8A8_UNORM: - case WINED3DFMT_B8G8R8X8_UNORM: - case WINED3DFMT_B4G4R4A4_UNORM: - case WINED3DFMT_L8_UNORM: - case WINED3DFMT_L8A8_UNORM: - case WINED3DFMT_DXT1: - case WINED3DFMT_DXT2: - case WINED3DFMT_DXT3: - case WINED3DFMT_DXT4: - case WINED3DFMT_DXT5: - TRACE_(d3d_caps)("[OK]\n"); - return TRUE; - - default: - TRACE_(d3d_caps)("[FAILED] Gamma texture format %s not supported.\n", debug_d3dformat(format_desc->format)); - return FALSE; - } - return FALSE; + return adapter->gl_info.supported[EXT_TEXTURE_SRGB] + && (format_desc->Flags & WINED3DFMT_FLAG_SRGB_READ); } static BOOL CheckSrgbWriteCapability(struct wined3d_adapter *adapter, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8e9540b..b6fb5e9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -582,23 +582,23 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_DXT1, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_SRGB_READ, EXT_TEXTURE_COMPRESSION_S3TC, NULL}, {WINED3DFMT_DXT2, GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_SRGB_READ, EXT_TEXTURE_COMPRESSION_S3TC, NULL}, {WINED3DFMT_DXT3, GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_SRGB_READ, EXT_TEXTURE_COMPRESSION_S3TC, NULL}, {WINED3DFMT_DXT4, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_SRGB_READ, EXT_TEXTURE_COMPRESSION_S3TC, NULL}, {WINED3DFMT_DXT5, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_SRGB_READ, EXT_TEXTURE_COMPRESSION_S3TC, NULL}, /* IEEE formats */ {WINED3DFMT_R32_FLOAT, GL_RGB32F_ARB, GL_RGB32F_ARB, 0, @@ -658,11 +658,13 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_B8G8R8A8_UNORM, GL_RGBA8, GL_SRGB8_ALPHA8_EXT, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET + | WINED3DFMT_FLAG_SRGB_READ, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_B8G8R8X8_UNORM, GL_RGB8, GL_SRGB8_EXT, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET + | WINED3DFMT_FLAG_SRGB_READ, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_B5G6R5_UNORM, GL_RGB5, GL_RGB5, GL_RGB8, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 0, @@ -678,7 +680,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_B4G4R4A4_UNORM, GL_RGBA4, GL_SRGB8_ALPHA8_EXT, 0, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4_REV, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_SRGB_READ, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_B2G3R3_UNORM, GL_R3_G3_B2, GL_R3_G3_B2, 0, GL_RGB, GL_UNSIGNED_BYTE_3_3_2, 0, @@ -719,11 +721,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = /* Luminance */ {WINED3DFMT_L8_UNORM, GL_LUMINANCE8, GL_SLUMINANCE8_EXT, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_SRGB_READ, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_L8A8_UNORM, GL_LUMINANCE8_ALPHA8, GL_SLUMINANCE8_ALPHA8_EXT, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_SRGB_READ, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_L4A4_UNORM, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE4_ALPHA4, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 2, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5a22610..f79ca0f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2989,6 +2989,7 @@ extern WINED3DFORMAT pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN; #define WINED3DFMT_FLAG_GETDC 0x00000100 #define WINED3DFMT_FLAG_FLOAT 0x00000200 #define WINED3DFMT_FLAG_BUMPMAP 0x00000400 +#define WINED3DFMT_FLAG_SRGB_READ 0x00000800 struct wined3d_format_desc {

1 0

Henri Verbeet : wined3d: Avoid some needless depth buffer copies.
by Alexandre Julliard April 29, 2010

April 29, 2010

Module: wine Branch: master Commit: f09b8e454d932f3768c8ad5f6f4658ee587f291e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f09b8e454d932f3768c8ad5f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 29 00:08:59 2010 +0200 wined3d: Avoid some needless depth buffer copies. If an application switches between render targets of a different size, but with the same depth/stencil surface it'll typically clear the depth/stencil surface before drawing. However, in case of the smaller render target that wouldn't be a full clear, so we'd have to do a depth copy if we also switched between onscreen and offscreen rendering. Keeping track of which part of the depth/stencil surface is current for onscreen/offscreen allows us to avoid most of these kinds of copies. The current scheme requires the current/dirty rectangle to have an origin at (0,0). This could be extended to an arbitrary rectangle, but the bookkeeping becomes somewhat more complex in that case, and it's not clear that there would be much of a benefit at this point. --- dlls/wined3d/arb_program_shader.c | 78 +++++++++++++++++++++++++++++------ dlls/wined3d/device.c | 70 ++++++++++++++++++++++++++++--- dlls/wined3d/drawprim.c | 23 +++++++++- dlls/wined3d/glsl_shader.c | 83 +++++++++++++++++++++++++++++++------ dlls/wined3d/shader.c | 2 +- dlls/wined3d/surface.c | 21 ++++++++-- dlls/wined3d/swapchain.c | 4 +- dlls/wined3d/wined3d_private.h | 6 ++- 8 files changed, 243 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f09b8e454d932f3768c8a…

1 0

Hans Leidekker : msi: Store a copy of the file extension in the MSIMIME structure.
by Alexandre Julliard April 29, 2010

April 29, 2010

Module: wine Branch: master Commit: 319465831c1470cffc20a815c702ab2d556735a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=319465831c1470cffc20a815c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 29 09:38:08 2010 +0200 msi: Store a copy of the file extension in the MSIMIME structure. Fixes a crash that occurs when the extension foreign key points to nowhere. Reported by Vincent Pelletier. --- dlls/msi/classes.c | 11 ++++++----- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index ce2325d..22d11c1 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -344,7 +344,7 @@ static MSIEXTENSION *load_given_extension( MSIPACKAGE *package, LPCWSTR extensio static MSIMIME *load_mime( MSIPACKAGE* package, MSIRECORD *row ) { - LPCWSTR buffer; + LPCWSTR extension; MSIMIME *mt; /* fill in the data */ @@ -356,8 +356,9 @@ static MSIMIME *load_mime( MSIPACKAGE* package, MSIRECORD *row ) mt->ContentType = msi_dup_record_field( row, 1 ); TRACE("loading mime %s\n", debugstr_w(mt->ContentType)); - buffer = MSI_RecordGetString( row, 2 ); - mt->Extension = load_given_extension( package, buffer ); + extension = MSI_RecordGetString( row, 2 ); + mt->Extension = load_given_extension( package, extension ); + mt->suffix = strdupW( extension ); mt->clsid = msi_dup_record_field( row, 3 ); mt->Class = load_given_class( package, mt->clsid ); @@ -1467,7 +1468,7 @@ UINT ACTION_RegisterMIMEInfo(MSIPACKAGE *package) uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, mt->ContentType ); - MSI_RecordSetStringW( uirow, 2, mt->Extension->Extension ); + MSI_RecordSetStringW( uirow, 2, mt->suffix ); ui_actiondata( package, szRegisterMIMEInfo, uirow ); msiobj_release( &uirow->hdr ); } @@ -1512,7 +1513,7 @@ UINT ACTION_UnregisterMIMEInfo( MSIPACKAGE *package ) uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, mime->ContentType ); - MSI_RecordSetStringW( uirow, 2, mime->Extension->Extension ); + MSI_RecordSetStringW( uirow, 2, mime->suffix ); ui_actiondata( package, szUnregisterMIMEInfo, uirow ); msiobj_release( &uirow->hdr ); } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 6e7829a..06a4367 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -553,6 +553,7 @@ struct tagMSIMIME struct list entry; LPWSTR ContentType; /* Primary Key */ MSIEXTENSION *Extension; + LPWSTR suffix; LPWSTR clsid; MSICLASS *Class; /* not in the table, set during installation */ diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 0fdce76..0c06088 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -214,6 +214,7 @@ static void free_package_structures( MSIPACKAGE *package ) MSIMIME *mt = LIST_ENTRY( item, MSIMIME, entry ); list_remove( &mt->entry ); + msi_free( mt->suffix ); msi_free( mt->clsid ); msi_free( mt->ContentType ); msi_free( mt );

1 0

Hans Leidekker : msi: Make sure to only open a patch database in msi_apply_patch_package.
by Alexandre Julliard April 29, 2010

April 29, 2010

Module: wine Branch: master Commit: c6f281fcf736628cc2f9121bfd9b057bba7ac327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6f281fcf736628cc2f9121bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 29 09:38:54 2010 +0200 msi: Make sure to only open a patch database in msi_apply_patch_package. --- dlls/msi/action.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 0b23656..fd7f782 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -541,12 +541,7 @@ static UINT msi_apply_patch_package( MSIPACKAGE *package, LPCWSTR file ) TRACE("%p %s\n", package, debugstr_w( file ) ); - /* FIXME: - * We probably want to make sure we only open a patch collection here. - * Patch collections (.msp) and databases (.msi) have different GUIDs - * but currently MSI_OpenDatabaseW will accept both. - */ - r = MSI_OpenDatabaseW( file, MSIDBOPEN_READONLY, &patch_db ); + r = MSI_OpenDatabaseW( file, MSIDBOPEN_READONLY + MSIDBOPEN_PATCHFILE, &patch_db ); if ( r != ERROR_SUCCESS ) { ERR("failed to open patch collection %s\n", debugstr_w( file ) ); @@ -565,7 +560,7 @@ static UINT msi_apply_patch_package( MSIPACKAGE *package, LPCWSTR file ) /* * There might be a CAB file in the patch package, - * so append it to the list of storage to search for streams. + * so append it to the list of storages to search for streams. */ append_storage_to_db( package->db, patch_db->storage );

1 0

Henri Verbeet : wined3d: Store the sRGB write format capability in the format table.
by Alexandre Julliard April 29, 2010

April 29, 2010

Module: wine Branch: master Commit: be7b01589f2d6c69325180824adf5fb4857fba1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=be7b01589f2d6c69325180824… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 29 00:09:02 2010 +0200 wined3d: Store the sRGB write format capability in the format table. --- dlls/wined3d/directx.c | 2 +- dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1fa277b..e4544be 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3308,7 +3308,7 @@ static BOOL CheckSrgbWriteCapability(struct wined3d_adapter *adapter, /* Only offer SRGB writing on X8R8G8B8/A8R8G8B8 when we use ARB or GLSL shaders as we are * doing the color fixup in shaders. * Note Windows drivers (at least on the Geforce 8800) also offer this on R5G6B5. */ - if ((format_desc->format == WINED3DFMT_B8G8R8X8_UNORM) || (format_desc->format == WINED3DFMT_B8G8R8A8_UNORM)) + if (format_desc->Flags & WINED3DFMT_FLAG_SRGB_WRITE) { int vs_selected_mode; int ps_selected_mode; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b6fb5e9..60a7bee 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -659,12 +659,12 @@ static const struct wined3d_format_texture_info format_texture_info[] = {WINED3DFMT_B8G8R8A8_UNORM, GL_RGBA8, GL_SRGB8_ALPHA8_EXT, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 0, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET - | WINED3DFMT_FLAG_SRGB_READ, + | WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_B8G8R8X8_UNORM, GL_RGB8, GL_SRGB8_EXT, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 0, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET - | WINED3DFMT_FLAG_SRGB_READ, + | WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_B5G6R5_UNORM, GL_RGB5, GL_RGB5, GL_RGB8, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 0, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f79ca0f..d0ed13c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2990,6 +2990,7 @@ extern WINED3DFORMAT pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN; #define WINED3DFMT_FLAG_FLOAT 0x00000200 #define WINED3DFMT_FLAG_BUMPMAP 0x00000400 #define WINED3DFMT_FLAG_SRGB_READ 0x00000800 +#define WINED3DFMT_FLAG_SRGB_WRITE 0x00001000 struct wined3d_format_desc {

1 0

Hans Leidekker : msi: Fix some test failures on Windows.
by Alexandre Julliard April 29, 2010

April 29, 2010

Module: wine Branch: master Commit: 7d9d6707c1134efd00356e26522c3935f5aea9d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d9d6707c1134efd00356e265… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 29 09:37:44 2010 +0200 msi: Fix some test failures on Windows. --- dlls/msi/tests/package.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index e2a95c0..ce15c66 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2007,7 +2007,7 @@ static void test_property_table(void) const char *query; UINT r; MSIHANDLE hpkg, hdb, hrec; - char buffer[MAX_PATH]; + char buffer[MAX_PATH], package[10]; DWORD sz; BOOL found; @@ -2050,15 +2050,14 @@ static void test_property_table(void) r = run_query(hdb, query); ok(r == ERROR_SUCCESS, "failed to add column\n"); - hpkg = package_from_db(hdb); - todo_wine - { - ok(!hpkg, "package should not be created\n"); - } + sprintf(package, "#%i", hdb); + r = MsiOpenPackage(package, &hpkg); + todo_wine ok(r != ERROR_SUCCESS, "MsiOpenPackage succeeded\n"); + if (r == ERROR_SUCCESS) + MsiCloseHandle(hpkg); - MsiCloseHandle(hdb); - MsiCloseHandle(hpkg); - DeleteFile(msifile); + r = MsiCloseHandle(hdb); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed %u\n", r); hdb = create_package_db(); ok (hdb, "failed to create package database\n");

1 0

Henri Verbeet : wined3d: Store the bumpmap format capability in the format table.
by Alexandre Julliard April 29, 2010

April 29, 2010

Module: wine Branch: master Commit: 163940540dbba2c9923f9570ada70c612af0e553 URL: http://source.winehq.org/git/wine.git/?a=commit;h=163940540dbba2c9923f9570a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 29 00:09:00 2010 +0200 wined3d: Store the bumpmap format capability in the format table. --- dlls/wined3d/directx.c | 27 +++++---------------------- dlls/wined3d/utils.c | 20 ++++++++++---------- dlls/wined3d/wined3d_private.h | 21 +++++++++++---------- 3 files changed, 26 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e7475e7..94a1fb2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3204,28 +3204,11 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceType(IWineD3D *iface, UINT Adapter static BOOL CheckBumpMapCapability(struct wined3d_adapter *adapter, WINED3DDEVTYPE DeviceType, const struct wined3d_format_desc *format_desc) { - switch(format_desc->format) - { - case WINED3DFMT_R8G8_SNORM: - case WINED3DFMT_R16G16_SNORM: - case WINED3DFMT_R5G5_SNORM_L6_UNORM: - case WINED3DFMT_R8G8_SNORM_L8X8_UNORM: - case WINED3DFMT_R8G8B8A8_SNORM: - /* Ask the fixed function pipeline implementation if it can deal - * with the conversion. If we've got a GL extension giving native - * support this will be an identity conversion. */ - if (adapter->fragment_pipe->color_fixup_supported(format_desc->color_fixup)) - { - TRACE_(d3d_caps)("[OK]\n"); - return TRUE; - } - TRACE_(d3d_caps)("[FAILED]\n"); - return FALSE; - - default: - TRACE_(d3d_caps)("[FAILED]\n"); - return FALSE; - } + /* Ask the fixed function pipeline implementation if it can deal + * with the conversion. If we've got a GL extension giving native + * support this will be an identity conversion. */ + return (format_desc->Flags & WINED3DFMT_FLAG_BUMPMAP) + && adapter->fragment_pipe->color_fixup_supported(format_desc->color_fixup); } /* Check if the given DisplayFormat + DepthStencilFormat combination is valid for the Adapter */ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7585804..8e9540b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -732,43 +732,43 @@ static const struct wined3d_format_texture_info format_texture_info[] = /* Bump mapping stuff */ {WINED3DFMT_R8G8_SNORM, GL_RGB8, GL_RGB8, 0, GL_BGR, GL_UNSIGNED_BYTE, 3, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, WINED3D_GL_EXT_NONE, &convert_r8g8_snorm}, {WINED3DFMT_R8G8_SNORM, GL_DSDT8_NV, GL_DSDT8_NV, 0, GL_DSDT_NV, GL_BYTE, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, NV_TEXTURE_SHADER, NULL}, {WINED3DFMT_R5G5_SNORM_L6_UNORM, GL_RGB5, GL_RGB5, 0, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 2, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, WINED3D_GL_EXT_NONE, &convert_r5g5_snorm_l6_unorm}, {WINED3DFMT_R5G5_SNORM_L6_UNORM, GL_DSDT8_MAG8_NV, GL_DSDT8_MAG8_NV, 0, GL_DSDT_MAG_NV, GL_BYTE, 3, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, NV_TEXTURE_SHADER, &convert_r5g5_snorm_l6_unorm_nv}, {WINED3DFMT_R8G8_SNORM_L8X8_UNORM, GL_RGB8, GL_RGB8, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, WINED3D_GL_EXT_NONE, &convert_r8g8_snorm_l8x8_unorm}, {WINED3DFMT_R8G8_SNORM_L8X8_UNORM, GL_DSDT8_MAG8_INTENSITY8_NV, GL_DSDT8_MAG8_INTENSITY8_NV, 0, GL_DSDT_MAG_VIB_NV, GL_UNSIGNED_INT_8_8_S8_S8_REV_NV, 4, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, NV_TEXTURE_SHADER, &convert_r8g8_snorm_l8x8_unorm_nv}, {WINED3DFMT_R8G8B8A8_SNORM, GL_RGBA8, GL_RGBA8, 0, GL_BGRA, GL_UNSIGNED_BYTE, 4, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, WINED3D_GL_EXT_NONE, &convert_r8g8b8a8_snorm}, {WINED3DFMT_R8G8B8A8_SNORM, GL_SIGNED_RGBA8_NV, GL_SIGNED_RGBA8_NV, 0, GL_RGBA, GL_BYTE, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, NV_TEXTURE_SHADER, NULL}, {WINED3DFMT_R16G16_SNORM, GL_RGB16, GL_RGB16, 0, GL_BGR, GL_UNSIGNED_SHORT, 6, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, WINED3D_GL_EXT_NONE, &convert_r16g16_snorm}, {WINED3DFMT_R16G16_SNORM, GL_SIGNED_HILO16_NV, GL_SIGNED_HILO16_NV, 0, GL_HILO_NV, GL_SHORT, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, NV_TEXTURE_SHADER, NULL}, /* Depth stencil formats */ {WINED3DFMT_D16_LOCKABLE, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c2e17b1..5a22610 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2978,16 +2978,17 @@ extern WINED3DFORMAT pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN; */ /* WineD3D pixel format flags */ -#define WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING 0x1 -#define WINED3DFMT_FLAG_FILTERING 0x2 -#define WINED3DFMT_FLAG_DEPTH 0x4 -#define WINED3DFMT_FLAG_STENCIL 0x8 -#define WINED3DFMT_FLAG_RENDERTARGET 0x10 -#define WINED3DFMT_FLAG_FOURCC 0x20 -#define WINED3DFMT_FLAG_FBO_ATTACHABLE 0x40 -#define WINED3DFMT_FLAG_COMPRESSED 0x80 -#define WINED3DFMT_FLAG_GETDC 0x100 -#define WINED3DFMT_FLAG_FLOAT 0x200 +#define WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING 0x00000001 +#define WINED3DFMT_FLAG_FILTERING 0x00000002 +#define WINED3DFMT_FLAG_DEPTH 0x00000004 +#define WINED3DFMT_FLAG_STENCIL 0x00000008 +#define WINED3DFMT_FLAG_RENDERTARGET 0x00000010 +#define WINED3DFMT_FLAG_FOURCC 0x00000020 +#define WINED3DFMT_FLAG_FBO_ATTACHABLE 0x00000040 +#define WINED3DFMT_FLAG_COMPRESSED 0x00000080 +#define WINED3DFMT_FLAG_GETDC 0x00000100 +#define WINED3DFMT_FLAG_FLOAT 0x00000200 +#define WINED3DFMT_FLAG_BUMPMAP 0x00000400 struct wined3d_format_desc {

1 0

Maarten Lankhorst : mmdevapi: Add a warning if openal is not available.
by Alexandre Julliard April 29, 2010

April 29, 2010

Module: wine Branch: master Commit: 34ffff074f12d178308e8f7bbe31377f40dff6cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=34ffff074f12d178308e8f7bb… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 28 22:06:54 2010 +0200 mmdevapi: Add a warning if openal is not available. As spotted by Christoph Hohmann. --- dlls/mmdevapi/devenum.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 0a7a661..281faf5 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -932,6 +932,10 @@ HRESULT MMDevEnum_Create(REFIID riid, void **ppv) openal_scanrender(); openal_scancapture(); } + else + FIXME("OpenAL support not enabled, application will not find sound devices\n"); +#else + ERR("OpenAL support not compiled in, application will not find sound devices\n"); #endif /*HAVE_OPENAL*/ } return IUnknown_QueryInterface((IUnknown*)This, riid, ppv);

1 0