March 2011 - Wine-Commits - list.winehq.org

Hans Leidekker : msi: Make a second pass to determine which files to install in the InstallFiles action .
by Alexandre Julliard March 8, 2011

March 8, 2011

Module: wine Branch: master Commit: 4a6c63e24a5a9ab22dc4e2145db16d86fe8f1895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a6c63e24a5a9ab22dc4e2145… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 8 10:08:16 2011 +0100 msi: Make a second pass to determine which files to install in the InstallFiles action. This is needed because the target path can still change after CostFinalize is executed. This happens in the .NET 1.1 Service Pack 1 installer where a custom action calls SetTargetPath. --- dlls/msi/action.c | 52 +++++++-------------------------- dlls/msi/files.c | 81 ++++++++++++++++++++++++++++++++++++++++++++------- dlls/msi/msipriv.h | 4 ++- 3 files changed, 84 insertions(+), 53 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 86aa33f..a003f5e 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2178,7 +2178,7 @@ int msi_compare_file_versions( VS_FIXEDFILEINFO *fi, const WCHAR *version ) return 0; } -static int msi_compare_font_versions( const WCHAR *ver1, const WCHAR *ver2 ) +int msi_compare_font_versions( const WCHAR *ver1, const WCHAR *ver2 ) { DWORD ms1, ms2; @@ -2190,7 +2190,7 @@ static int msi_compare_font_versions( const WCHAR *ver1, const WCHAR *ver2 ) return 0; } -static DWORD get_disk_file_size( LPCWSTR filename ) +DWORD msi_get_disk_file_size( LPCWSTR filename ) { HANDLE file; DWORD size; @@ -2206,7 +2206,7 @@ static DWORD get_disk_file_size( LPCWSTR filename ) return size; } -static BOOL hash_matches( MSIFILE *file ) +BOOL msi_file_hash_matches( MSIFILE *file ) { UINT r; MSIFILEHASHINFO hash; @@ -2256,7 +2256,7 @@ static void set_target_path( MSIPACKAGE *package, MSIFILE *file ) TRACE("resolves to %s\n", debugstr_w(file->TargetPath)); } -static UINT set_file_install_states( MSIPACKAGE *package ) +static UINT calculate_file_cost( MSIPACKAGE *package ) { VS_FIXEDFILEINFO *file_version; WCHAR *font_version; @@ -2277,67 +2277,37 @@ static UINT set_file_install_states( MSIPACKAGE *package ) if ((comp->assembly && !comp->assembly->installed) || GetFileAttributesW(file->TargetPath) == INVALID_FILE_ATTRIBUTES) { - file->state = msifs_missing; comp->Cost += file->FileSize; continue; } + file_size = msi_get_disk_file_size( file->TargetPath ); + if (file->Version) { if ((file_version = msi_get_disk_file_version( file->TargetPath ))) { - TRACE("new %s old %u.%u.%u.%u\n", debugstr_w(file->Version), - HIWORD(file_version->dwFileVersionMS), - LOWORD(file_version->dwFileVersionMS), - HIWORD(file_version->dwFileVersionLS), - LOWORD(file_version->dwFileVersionLS)); - if (msi_compare_file_versions( file_version, file->Version ) < 0) { - file->state = msifs_overwrite; - comp->Cost += file->FileSize; - } - else - { - TRACE("Destination file version equal or greater, not overwriting\n"); - file->state = msifs_present; + comp->Cost += file->FileSize - file_size; } msi_free( file_version ); continue; } else if ((font_version = font_version_from_file( file->TargetPath ))) { - TRACE("new %s old %s\n", debugstr_w(file->Version), debugstr_w(font_version)); - if (msi_compare_font_versions( font_version, file->Version ) < 0) { - file->state = msifs_overwrite; - comp->Cost += file->FileSize; - } - else - { - TRACE("Destination file version equal or greater, not overwriting\n"); - file->state = msifs_present; + comp->Cost += file->FileSize - file_size; } msi_free( font_version ); continue; } } - if ((file_size = get_disk_file_size( file->TargetPath )) != file->FileSize) + if (file_size != file->FileSize) { - file->state = msifs_overwrite; comp->Cost += file->FileSize - file_size; - continue; } - if (file->hash.dwFileHashInfoSize && hash_matches( file )) - { - TRACE("File hashes match, not overwriting\n"); - file->state = msifs_present; - continue; - } - file->state = msifs_overwrite; - comp->Cost += file->FileSize - file_size; } - return ERROR_SUCCESS; } @@ -2404,8 +2374,8 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) } } - TRACE("Calculating file install states\n"); - set_file_install_states( package ); + TRACE("Calculating file cost\n"); + calculate_file_cost( package ); msi_set_property( package->db, szCosting, szOne ); /* set default run level if not set */ diff --git a/dlls/msi/files.c b/dlls/msi/files.c index df765e5..e88a0c6 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -60,6 +60,73 @@ static void msi_file_update_ui( MSIPACKAGE *package, MSIFILE *f, const WCHAR *ac ui_progress( package, 2, f->FileSize, 0, 0 ); } +static msi_file_state calculate_install_state( MSIFILE *file ) +{ + MSICOMPONENT *comp = file->Component; + VS_FIXEDFILEINFO *file_version; + WCHAR *font_version; + msi_file_state state; + DWORD file_size; + + if (comp->ActionRequest != INSTALLSTATE_LOCAL || !comp->Enabled || + (comp->assembly && comp->assembly->installed)) + { + TRACE("file %s is not scheduled for install\n", debugstr_w(file->File)); + return msifs_skipped; + } + if ((comp->assembly && !comp->assembly->installed) || + GetFileAttributesW( file->TargetPath ) == INVALID_FILE_ATTRIBUTES) + { + TRACE("file %s is missing\n", debugstr_w(file->File)); + return msifs_missing; + } + if (file->Version) + { + if ((file_version = msi_get_disk_file_version( file->TargetPath ))) + { + TRACE("new %s old %u.%u.%u.%u\n", debugstr_w(file->Version), + HIWORD(file_version->dwFileVersionMS), + LOWORD(file_version->dwFileVersionMS), + HIWORD(file_version->dwFileVersionLS), + LOWORD(file_version->dwFileVersionLS)); + + if (msi_compare_file_versions( file_version, file->Version ) < 0) + state = msifs_overwrite; + else + { + TRACE("destination file version equal or greater, not overwriting\n"); + state = msifs_present; + } + msi_free( file_version ); + return state; + } + else if ((font_version = font_version_from_file( file->TargetPath ))) + { + TRACE("new %s old %s\n", debugstr_w(file->Version), debugstr_w(font_version)); + + if (msi_compare_font_versions( font_version, file->Version ) < 0) + state = msifs_overwrite; + else + { + TRACE("destination file version equal or greater, not overwriting\n"); + state = msifs_present; + } + msi_free( font_version ); + return state; + } + } + if ((file_size = msi_get_disk_file_size( file->TargetPath )) != file->FileSize) + { + return msifs_overwrite; + } + if (file->hash.dwFileHashInfoSize && msi_file_hash_matches( file )) + { + TRACE("file hashes match, not overwriting\n"); + return msifs_present; + } + return msifs_overwrite; +} + static void schedule_install_files(MSIPACKAGE *package) { MSIFILE *file; @@ -68,22 +135,14 @@ static void schedule_install_files(MSIPACKAGE *package) { MSICOMPONENT *comp = file->Component; - if (comp->ActionRequest != INSTALLSTATE_LOCAL || !comp->Enabled || - (comp->assembly && comp->assembly->installed)) + file->state = calculate_install_state( file ); + if (file->state == msifs_overwrite && (comp->Attributes & msidbComponentAttributesNeverOverwrite)) { - TRACE("File %s is not scheduled for install\n", debugstr_w(file->File)); + TRACE("not overwriting %s\n", debugstr_w(file->TargetPath)); file->state = msifs_skipped; - continue; } comp->Action = INSTALLSTATE_LOCAL; ui_progress( package, 2, file->FileSize, 0, 0 ); - - if (file->state == msifs_overwrite && - (comp->Attributes & msidbComponentAttributesNeverOverwrite)) - { - TRACE("not overwriting %s\n", debugstr_w(file->TargetPath)); - file->state = msifs_skipped; - } } } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 7c25ec9..9ddcaeb 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -856,7 +856,9 @@ extern DWORD msi_version_str_to_dword(LPCWSTR p); extern void msi_parse_version_string(LPCWSTR, PDWORD, PDWORD); extern VS_FIXEDFILEINFO *msi_get_disk_file_version(LPCWSTR); extern int msi_compare_file_versions(VS_FIXEDFILEINFO *, const WCHAR *); - +extern int msi_compare_font_versions(const WCHAR *, const WCHAR *); +extern DWORD msi_get_disk_file_size(LPCWSTR); +extern BOOL msi_file_hash_matches(MSIFILE *); extern LONG msi_reg_set_val_str( HKEY hkey, LPCWSTR name, LPCWSTR value ); extern LONG msi_reg_set_val_multi_str( HKEY hkey, LPCWSTR name, LPCWSTR value );

1 0

Dmitry Timoshkov : gdi32: Add some additional tests for negative axes extents.
by Alexandre Julliard March 8, 2011

March 8, 2011

Module: wine Branch: master Commit: afcfb51055751882f6b854b4b5c40a1aad3823da URL: http://source.winehq.org/git/wine.git/?a=commit;h=afcfb51055751882f6b854b4b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 8 16:55:24 2011 +0800 gdi32: Add some additional tests for negative axes extents. --- dlls/gdi32/tests/mapping.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index fba0abf..b0688a7 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -210,15 +210,43 @@ static void test_world_transform(void) expect_world_transform(hdc, 20.0, 20.0); expect_LPtoDP(hdc, 20000, 20000); + size.cx = 0xdeadbeef; + size.cy = 0xdeadbeef; + ret = SetViewportExtEx(hdc, -1, -1, &size); + ok(ret, "SetViewportExtEx(-1, -1) failed\n"); + ok(size.cx == 1 && size.cy == 1, "expected 1,1 got %d,%d\n", size.cx, size.cy); + expect_viewport_ext(hdc, 1, 1); + expect_window_ext(hdc, 1, 1); + expect_world_transform(hdc, 20.0, 20.0); + expect_LPtoDP(hdc, 20000, 20000); + + ret = SetMapMode(hdc, MM_ANISOTROPIC); + ok(ret == MM_TEXT, "expected MM_TEXT, got %d\n", ret); + + expect_viewport_ext(hdc, 1, 1); + expect_window_ext(hdc, 1, 1); + expect_world_transform(hdc, 20.0, 20.0); + expect_LPtoDP(hdc, 20000, 20000); + + size.cx = 0xdeadbeef; + size.cy = 0xdeadbeef; + ret = SetViewportExtEx(hdc, -1, -1, &size); + ok(ret, "SetViewportExtEx(-1, -1) failed\n"); + ok(size.cx == 1 && size.cy == 1, "expected 1,1 got %d,%d\n", size.cx, size.cy); + expect_viewport_ext(hdc, -1, -1); + expect_window_ext(hdc, 1, 1); + expect_world_transform(hdc, 20.0, 20.0); + expect_LPtoDP(hdc, -20000, -20000); + ret = SetGraphicsMode(hdc, GM_COMPATIBLE); ok(ret, "SetGraphicsMode(GM_COMPATIBLE) should not fail if DC has't an identity transform\n"); ret = GetGraphicsMode(hdc); ok(ret == GM_COMPATIBLE, "expected GM_COMPATIBLE, got %d\n", ret); - expect_viewport_ext(hdc, 1, 1); + expect_viewport_ext(hdc, -1, -1); expect_window_ext(hdc, 1, 1); expect_world_transform(hdc, 20.0, 20.0); - expect_LPtoDP(hdc, 20000, 20000); + expect_LPtoDP(hdc, -20000, -20000); DeleteDC(hdc); }

1 0

Hans Leidekker : msi: Load media info even if there's no file to install.
by Alexandre Julliard March 8, 2011

March 8, 2011

Module: wine Branch: master Commit: be790cb0adec3a41297d2a51bdcee4e46544341c URL: http://source.winehq.org/git/wine.git/?a=commit;h=be790cb0adec3a41297d2a51b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 8 10:08:39 2011 +0100 msi: Load media info even if there's no file to install. --- dlls/msi/files.c | 7 +++++++ dlls/msi/media.c | 9 +-------- dlls/msi/msipriv.h | 1 + dlls/msi/tests/install.c | 9 --------- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index e88a0c6..493baed 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -293,6 +293,13 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { + rc = msi_load_media_info( package, file, mi ); + if (rc != ERROR_SUCCESS) + { + ERR("Unable to load media info for %s (%u)\n", debugstr_w(file->File), rc); + return ERROR_FUNCTION_FAILED; + } + if (file->state != msifs_missing && !mi->is_continuous && file->state != msifs_overwrite) continue; diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 8b5a8c6..8c4b0f7 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -656,7 +656,7 @@ static UINT get_drive_type(const WCHAR *path) return GetDriveTypeW(root); } -static UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) +UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) { MSIRECORD *row; LPWSTR source_dir; @@ -803,13 +803,6 @@ UINT ready_media(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) if (mi->is_continuous) return ERROR_SUCCESS; - rc = msi_load_media_info(package, file, mi); - if (rc != ERROR_SUCCESS) - { - ERR("Unable to load media info %u\n", rc); - return ERROR_FUNCTION_FAILED; - } - /* cabinet is internal, no checks needed */ if (!mi->cabinet || mi->cabinet[0] == '#') return ERROR_SUCCESS; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 9ddcaeb..10f51de 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -987,6 +987,7 @@ typedef struct } MSICABDATA; extern UINT ready_media(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi); +extern UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi); extern void msi_free_media_info(MSIMEDIAINFO *mi); extern BOOL msi_cabextract(MSIPACKAGE* package, MSIMEDIAINFO *mi, LPVOID data); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index ea5431a..ae6be76 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3339,11 +3339,8 @@ static void test_lastusedsource(void) r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - todo_wine - { ok(!lstrcmpA(value, path), "Expected \"%s\", got \"%s\"\n", path, value); ok(size == lstrlenA(path), "Expected %d, got %d\n", lstrlenA(path), size); - } r = MsiInstallProductA("msifile0.msi", "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -3368,11 +3365,8 @@ static void test_lastusedsource(void) r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - todo_wine - { ok(!lstrcmpA(value, path), "Expected \"%s\", got \"%s\"\n", path, value); ok(size == lstrlenA(path), "Expected %d, got %d\n", lstrlenA(path), size); - } r = MsiInstallProductA("msifile1.msi", "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -3396,11 +3390,8 @@ static void test_lastusedsource(void) r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - todo_wine - { ok(!lstrcmpA(value, path), "Expected \"%s\", got \"%s\"\n", path, value); ok(size == lstrlenA(path), "Expected %d, got %d\n", lstrlenA(path), size); - } r = MsiInstallProductA("msifile2.msi", "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);

1 0

Henri Verbeet : wined3d: Pass gl_info to volume_bind_and_dirtify().
by Alexandre Julliard March 8, 2011

March 8, 2011

Module: wine Branch: master Commit: aa420ced0e6483e0c622b150064d738ebbf14a8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa420ced0e6483e0c622b1500… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 21:45:24 2011 +0100 wined3d: Pass gl_info to volume_bind_and_dirtify(). --- dlls/wined3d/volume.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 03bc5e6..e6f7687 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -27,9 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); /* Context activation is done by the caller. */ -static void volume_bind_and_dirtify(struct IWineD3DVolumeImpl *volume) +static void volume_bind_and_dirtify(struct IWineD3DVolumeImpl *volume, const struct wined3d_gl_info *gl_info) { - const struct wined3d_gl_info *gl_info = &volume->resource.device->adapter->gl_info; IWineD3DBaseTextureImpl *container = (IWineD3DBaseTextureImpl *)volume->container; DWORD active_sampler; @@ -102,7 +101,7 @@ void volume_load(IWineD3DVolumeImpl *volume, UINT level, BOOL srgb_mode) TRACE("volume %p, level %u, srgb %#x, format %s (%#x).\n", volume, level, srgb_mode, debug_d3dformat(format->id), format->id); - volume_bind_and_dirtify(volume); + volume_bind_and_dirtify(volume, gl_info); ENTER_GL(); GL_EXTCALL(glTexImage3DEXT(GL_TEXTURE_3D, level, format->glInternal,

1 0

Henri Verbeet : ddraw: Just pass NULL as swapchain parent.
by Alexandre Julliard March 8, 2011

March 8, 2011

Module: wine Branch: master Commit: 015ad93d47d9b3ea281979f18f0600836442bde3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=015ad93d47d9b3ea281979f18… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 21:45:26 2011 +0100 ddraw: Just pass NULL as swapchain parent. The swapchain was the last place using IParent, so this allows us to kill IParent completely. --- dlls/ddraw/Makefile.in | 1 - dlls/ddraw/ddraw.c | 24 +------- dlls/ddraw/ddraw_private.h | 45 --------------- dlls/ddraw/parent.c | 135 -------------------------------------------- 4 files changed, 4 insertions(+), 201 deletions(-) diff --git a/dlls/ddraw/Makefile.in b/dlls/ddraw/Makefile.in index 1d49e79..bc232f0 100644 --- a/dlls/ddraw/Makefile.in +++ b/dlls/ddraw/Makefile.in @@ -11,7 +11,6 @@ C_SRCS = \ main.c \ material.c \ palette.c \ - parent.c \ surface.c \ utils.c \ vertexbuffer.c \ diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e1d5c62..aeabe59 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2628,14 +2628,11 @@ static HRESULT ddraw_recreate_surfaces(IDirectDrawImpl *This) ddraw_recreate_surfaces_cb); } -ULONG WINAPI D3D7CB_DestroySwapChain(IWineD3DSwapChain *pSwapChain) +ULONG WINAPI D3D7CB_DestroySwapChain(IWineD3DSwapChain *swapchain) { - IUnknown *swapChainParent; + TRACE("swapchain %p.\n", swapchain); - TRACE("swapchain %p.\n", pSwapChain); - - swapChainParent = IWineD3DSwapChain_GetParent(pSwapChain); - return IUnknown_Release(swapChainParent); + return IWineD3DSwapChain_Release(swapchain); } /***************************************************************************** @@ -5919,32 +5916,19 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDevicePar { struct IDirectDrawImpl *This = ddraw_from_device_parent(iface); IDirectDrawSurfaceImpl *iterator; - IParentImpl *object; HRESULT hr; TRACE("iface %p, present_parameters %p, swapchain %p\n", iface, present_parameters, swapchain); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IParentImpl)); - if (!object) - { - FIXME("Allocation of memory failed\n"); - *swapchain = NULL; - return DDERR_OUTOFVIDEOMEMORY; - } - - ddraw_parent_init(object); - hr = IWineD3DDevice_CreateSwapChain(This->wineD3DDevice, present_parameters, - This->ImplType, object, swapchain); + This->ImplType, NULL, swapchain); if (FAILED(hr)) { FIXME("(%p) CreateSwapChain failed, returning %#x\n", iface, hr); - HeapFree(GetProcessHeap(), 0 , object); *swapchain = NULL; return hr; } - object->child = (IUnknown *)*swapchain; This->d3d_target->wineD3DSwapChain = *swapchain; iterator = This->d3d_target->complex_array[0]; while (iterator) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 7899deb..7df059f 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -39,30 +39,6 @@ extern const struct wined3d_parent_ops ddraw_null_wined3d_parent_ops DECLSPEC_HIDDEN; -/***************************************************************************** - * IParent - a helper interface - *****************************************************************************/ -DEFINE_GUID(IID_IParent, 0xc20e4c88, 0x74e7, 0x4940, 0xba, 0x9f, 0x2e, 0x32, 0x3f, 0x9d, 0xc9, 0x81); -typedef struct IParent *LPPARENT, *PPARENT; - -#define INTERFACE IParent -DECLARE_INTERFACE_(IParent,IUnknown) -{ - /*** IUnknown methods ***/ - STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; -}; -#undef INTERFACE - -#if !defined(__cplusplus) || defined(CINTERFACE) -/*** IUnknown methods ***/ -#define IParent_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IParent_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IParent_Release(p) (p)->lpVtbl->Release(p) -#endif - - /* Typdef the interfaces */ typedef struct IDirectDrawImpl IDirectDrawImpl; typedef struct IDirectDrawSurfaceImpl IDirectDrawSurfaceImpl; @@ -74,7 +50,6 @@ typedef struct IDirect3DViewportImpl IDirect3DViewportImpl; typedef struct IDirect3DMaterialImpl IDirect3DMaterialImpl; typedef struct IDirect3DExecuteBufferImpl IDirect3DExecuteBufferImpl; typedef struct IDirect3DVertexBufferImpl IDirect3DVertexBufferImpl; -typedef struct IParentImpl IParentImpl; /* Callbacks for implicit object destruction */ extern ULONG WINAPI D3D7CB_DestroySwapChain(IWineD3DSwapChain *pSwapChain) DECLSPEC_HIDDEN; @@ -270,26 +245,6 @@ static inline IDirectDrawSurfaceImpl *surface_from_surface3(IDirectDrawSurface3 #define PFGET_BPP(pf) (pf.dwFlags&DDPF_PALETTEINDEXED8?1:((pf.dwRGBBitCount+7)/8)) #define GET_BPP(desc) PFGET_BPP(desc.ddpfPixelFormat) -/***************************************************************************** - * IParent Implementation - *****************************************************************************/ -struct IParentImpl -{ - /* IUnknown fields */ - const IParentVtbl *lpVtbl; - LONG ref; - - /* IParentImpl fields */ - IUnknown *child; - -}; - -void ddraw_parent_init(IParentImpl *parent) DECLSPEC_HIDDEN; - -/***************************************************************************** - * IDirect3DDevice implementation - *****************************************************************************/ - #define DDRAW_INVALID_HANDLE ~0U enum ddraw_handle_type diff --git a/dlls/ddraw/parent.c b/dlls/ddraw/parent.c deleted file mode 100644 index 871f066..0000000 --- a/dlls/ddraw/parent.c +++ /dev/null @@ -1,135 +0,0 @@ -/* - * IParent implementation - * - * Copyright (c) 2006 Stefan Dösinger - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * A universal parent interface for everything in WineD3D that doesn't have - * a DDraw counterpart - */ - -#include "config.h" -#include "wine/port.h" - -#include "ddraw_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(ddraw); - -/***************************************************************************** - * IUnknown methods - *****************************************************************************/ - -/***************************************************************************** - * IParent::Queryinterface - * - * It can't query any interfaces, and it's not used for anything. So - * it just returns E_NOINTERFACE - * - * Params: - * riid: guid of queried interface - * obj: returns a pointer to the interface - * - * Return values - * This implementation always returns E_NOINTERFACE and NULL - * - *****************************************************************************/ -static HRESULT WINAPI -IParentImpl_QueryInterface(IParent *iface, - REFIID riid, - void **obj) -{ - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obj); - - *obj = NULL; - if ( IsEqualGUID( &IID_IUnknown, riid ) || - IsEqualGUID( &IID_IParent, riid ) ) - { - *obj = iface; - IParent_AddRef(iface); - return DD_OK; - } - return E_NOINTERFACE; -} - -/***************************************************************************** - * IParent::AddRef - * - * Increases the refcount - * - * Params: - * - * Return values - * The new refcount - * - *****************************************************************************/ -static ULONG WINAPI -IParentImpl_AddRef(IParent *iface) -{ - IParentImpl *This = (IParentImpl *)iface; - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("%p increasing refcount to %u.\n", This, ref); - - return ref; -} - - -/***************************************************************************** - * IParent::Release - * - * Releases the refcount, and destroys the object if the refcount falls to 0 - * Also releases the child object, if destroyed. That's almost the whole sense - * of this interface. - * - * Params: - * - * Return values - * The new refcount - * - *****************************************************************************/ -static ULONG WINAPI IParentImpl_Release(IParent *iface) -{ - IParentImpl *This = (IParentImpl *)iface; - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("%p decreasing refcount to %u.\n", This, ref); - - if (ref == 0) - { - TRACE("(%p) Releasing child at %p\n", This, This->child); - if(This->child) - IUnknown_Release(This->child); - HeapFree(GetProcessHeap(), 0, This); - TRACE("Released\n"); - } - return ref; -} - -/***************************************************************************** - * The VTable - *****************************************************************************/ -static const struct IParentVtbl ddraw_parent_vtbl = -{ - IParentImpl_QueryInterface, - IParentImpl_AddRef, - IParentImpl_Release, -}; - -void ddraw_parent_init(IParentImpl *parent) -{ - parent->lpVtbl = &ddraw_parent_vtbl; - parent->ref = 1; -}

1 0

Thomas Mullaly : mshtml: Correctly forward IHTMLWindow's IHTMLDocument' s ConnectionPointContainer.
by Alexandre Julliard March 8, 2011

March 8, 2011

Module: wine Branch: master Commit: a46e0c617b84226fba0fc70fd4030b20f91d9940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a46e0c617b84226fba0fc70fd… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Sat Feb 26 23:55:16 2011 -0500 mshtml: Correctly forward IHTMLWindow's IHTMLDocument's ConnectionPointContainer. --- dlls/mshtml/conpoint.c | 2 +- dlls/mshtml/htmlwindow.c | 4 +++- dlls/mshtml/tests/events.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index df6c5cf..ca45524 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -266,7 +266,7 @@ static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPo TRACE("(%p)->(%s %p)\n", This, debugstr_cp_guid(riid), ppCP); if(This->forward_container) - return IConnectionPointContainer_FindConnectionPoint(&This->IConnectionPointContainer_iface, + return IConnectionPointContainer_FindConnectionPoint(&This->forward_container->IConnectionPointContainer_iface, riid, ppCP); *ppCP = NULL; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index d0d378f..a4fa1be 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -40,6 +40,8 @@ static struct list window_list = LIST_INIT(window_list); static void window_set_docnode(HTMLWindow *window, HTMLDocumentNode *doc_node) { if(window->doc) { + if(window->doc_obj && window == window->doc_obj->basedoc.window) + window->doc->basedoc.cp_container.forward_container = NULL; abort_document_bindings(window->doc); window->doc->basedoc.window = NULL; htmldoc_release(&window->doc->basedoc); @@ -2245,6 +2247,7 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML list_init(&window->script_hosts); window->task_magic = get_task_target_magic(); + *ret = window; update_window_doc(window); list_init(&window->children); @@ -2257,7 +2260,6 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML list_add_tail(&parent->children, &window->sibling_entry); } - *ret = window; return S_OK; } diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index b1d1423..bdb8460 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2407,7 +2407,7 @@ static void test_empty_document(void) cp = get_cp((IUnknown*)doc, &IID_IDispatch); hres = IConnectionPoint_Unadvise(cp, cookie); IConnectionPoint_Release(cp); - todo_wine ok(hres == S_OK, "Unadvise failed: %08x\n", hres); + ok(hres == S_OK, "Unadvise failed: %08x\n", hres); IHTMLDocument2_Release(windows_doc); }

1 0

Henri Verbeet : winex11.drv: Allow disabling vertical sync using EXT_swap_control.
by Alexandre Julliard March 8, 2011

March 8, 2011

Module: wine Branch: master Commit: 727ecc17145b98e8cfcbc85cdb7a7a5374615b93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=727ecc17145b98e8cfcbc85cd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 21:45:27 2011 +0100 winex11.drv: Allow disabling vertical sync using EXT_swap_control. EXT_swap_control redefines glXSwapIntervalSGI() as glXSwapIntervalEXT() on the current drawable (if any), and glXSwapIntervalEXT() supports disabling vsync. --- dlls/winex11.drv/opengl.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 4b56c3f..a9cc178 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -150,6 +150,7 @@ static Wine_GLContext *context_list; static struct WineGLInfo WineGLInfo = { 0 }; static int use_render_texture_emulation = 1; static int use_render_texture_ati = 0; +static BOOL has_swap_control; static int swap_interval = 1; #define MAX_EXTENSIONS 16 @@ -3424,7 +3425,7 @@ static BOOL WINAPI X11DRV_wglSwapIntervalEXT(int interval) { SetLastError(ERROR_INVALID_DATA); return FALSE; } - else if (interval == 0) + else if (!has_swap_control && interval == 0) { /* wglSwapIntervalEXT considers an interval value of zero to mean that * vsync should be disabled, but glXSwapIntervalSGI considers such a @@ -3738,6 +3739,9 @@ static void X11DRV_WineGL_LoadExtensions(void) if(glxRequireExtension("GLX_EXT_fbconfig_packed_float")) register_extension_string("WGL_EXT_pixel_format_packed_float"); + if (glxRequireExtension("GLX_EXT_swap_control")) + has_swap_control = TRUE; + /* The OpenGL extension GL_NV_vertex_array_range adds wgl/glX functions which aren't exported as 'real' wgl/glX extensions. */ if(strstr(WineGLInfo.glExtensions, "GL_NV_vertex_array_range") != NULL) register_extension(&WGL_NV_vertex_array_range);

1 0

Henri Verbeet : wined3d: Don' t require container parents for IWineD3DDeviceParent methods to be COM objects .
by Alexandre Julliard March 8, 2011

March 8, 2011

Module: wine Branch: master Commit: b9fae5e9a8a142195aeb5dbe738101d0cd893d83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9fae5e9a8a142195aeb5dbe7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 21:45:25 2011 +0100 wined3d: Don't require container parents for IWineD3DDeviceParent methods to be COM objects. --- dlls/d3d10core/device.c | 18 +++++++++--------- dlls/d3d8/device.c | 26 +++++++++++++------------- dlls/d3d9/device.c | 28 ++++++++++++++-------------- dlls/ddraw/ddraw.c | 18 +++++++++--------- include/wine/wined3d.idl | 6 +++--- 5 files changed, 48 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9fae5e9a8a142195aeb5…

1 0

Thomas Mullaly : mshtml/tests: Added more ConnectionPoint tests for IHTMLDocument.
by Alexandre Julliard March 8, 2011

March 8, 2011

Module: wine Branch: master Commit: 1571097ed354f70931daeb06c6f3f56d1f869f6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1571097ed354f70931daeb06c… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Sat Feb 26 23:14:59 2011 -0500 mshtml/tests: Added more ConnectionPoint tests for IHTMLDocument. --- dlls/mshtml/tests/events.c | 106 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 106 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 65cf886..b1d1423 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -109,6 +109,9 @@ static const char img_doc_str[] = static const char input_doc_str[] = "<html><body><input id=\"inputid\"></input></body></html>"; +static const char iframe_doc_str[] = + "<html><body><iframe id=\"ifr\">Testing</iframe></body></html>"; + static const char form_doc_str[] = "<html><body><form id=\"formid\" method=\"post\" action=\"about:blank\">" "<input type=\"text\" value=\"test\" name=\"i\"/>" @@ -1717,6 +1720,77 @@ static void test_timeout(IHTMLDocument2 *doc) IHTMLWindow3_Release(win3); } +static IHTMLElement* find_element_by_id(IHTMLDocument2 *doc, const char *id) +{ + HRESULT hres; + IHTMLDocument3 *doc3; + IHTMLElement *result; + BSTR idW = a2bstr(id); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); + ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument3) failed: %08x\n", hres); + + hres = IHTMLDocument3_getElementById(doc3, idW, &result); + ok(hres == S_OK, "getElementById failed: %08x\n", hres); + ok(result != NULL, "result == NULL\n"); + SysFreeString(idW); + + IHTMLDocument3_Release(doc3); + return result; +} + +static IHTMLDocument2* get_iframe_doc(IHTMLIFrameElement *iframe) +{ + HRESULT hres; + IHTMLFrameBase2 *base; + IHTMLDocument2 *result = NULL; + + hres = IHTMLIFrameElement_QueryInterface(iframe, &IID_IHTMLFrameBase2, (void**)&base); + ok(hres == S_OK, "QueryInterface(IID_IHTMLFrameBase2) failed: %08x\n", hres); + if(hres == S_OK) { + IHTMLWindow2 *window; + + hres = IHTMLFrameBase2_get_contentWindow(base, &window); + ok(hres == S_OK, "get_contentWindow failed: %08x\n", hres); + ok(window != NULL, "window == NULL\n"); + if(window) { + hres = IHTMLWindow2_get_document(window, &result); + ok(hres == S_OK, "get_document failed: %08x\n", hres); + ok(result != NULL, "result == NULL\n"); + IHTMLWindow2_Release(window); + } + } + if(base) IHTMLFrameBase2_Release(base); + + return result; +} + +static void test_iframe_connections(IHTMLDocument2 *doc) +{ + HRESULT hres; + IHTMLIFrameElement *iframe; + IHTMLDocument2 *iframes_doc; + DWORD cookie; + IConnectionPoint *cp; + IHTMLElement *element = find_element_by_id(doc, "ifr"); + + hres = IHTMLElement_QueryInterface(element, &IID_IHTMLIFrameElement, (void**)&iframe); + IHTMLElement_Release(element); + ok(hres == S_OK, "QueryInterface(IID_IHTMLIFrameElement) failed: %08x\n", hres); + + iframes_doc = get_iframe_doc(iframe); + IHTMLIFrameElement_Release(iframe); + + cookie = register_cp((IUnknown*)iframes_doc, &IID_IDispatch, (IUnknown*)&div_onclick_disp); + + cp = get_cp((IUnknown*)doc, &IID_IDispatch); + hres = IConnectionPoint_Unadvise(cp, cookie); + IConnectionPoint_Release(cp); + ok(hres == CONNECT_E_NOCONNECTION, "Unadvise returned %08x, expected CONNECT_E_NOCONNECTION\n", hres); + + IHTMLDocument2_Release(iframes_doc); +} + static HRESULT QueryInterface(REFIID,void**); static HRESULT WINAPI InPlaceFrame_QueryInterface(IOleInPlaceFrame *iface, REFIID riid, void **ppv) @@ -2309,6 +2383,35 @@ static HWND create_container_window(void) 300, 300, NULL, NULL, NULL, NULL); } +static void test_empty_document(void) +{ + HRESULT hres; + IHTMLWindow2 *window; + IHTMLDocument2 *windows_doc, *doc; + IConnectionPoint *cp; + DWORD cookie; + + doc = create_document(); + if(!doc) + return; + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + + hres = IHTMLWindow2_get_document(window, &windows_doc); + IHTMLWindow2_Release(window); + ok(hres == S_OK, "get_document failed: %08x\n", hres); + + cookie = register_cp((IUnknown*)windows_doc, &IID_IDispatch, (IUnknown*)&div_onclick_disp); + + cp = get_cp((IUnknown*)doc, &IID_IDispatch); + hres = IConnectionPoint_Unadvise(cp, cookie); + IConnectionPoint_Release(cp); + todo_wine ok(hres == S_OK, "Unadvise failed: %08x\n", hres); + + IHTMLDocument2_Release(windows_doc); +} + START_TEST(events) { CoInitialize(NULL); @@ -2323,6 +2426,9 @@ START_TEST(events) run_test(img_doc_str, test_imgload); run_test(input_doc_str, test_focus); run_test(form_doc_str, test_submit); + run_test(iframe_doc_str, test_iframe_connections); + + test_empty_document(); DestroyWindow(container_hwnd); CoUninitialize();

1 0

Alexandre Julliard : server: Fix checking of X button flags when updating the input key state.
by Alexandre Julliard March 8, 2011

March 8, 2011

Module: wine Branch: master Commit: 0b8571e3dc348d3ca0bbd43dd9d4e0895c59e0f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b8571e3dc348d3ca0bbd43dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 7 23:48:03 2011 +0100 server: Fix checking of X button flags when updating the input key state. --- server/queue.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/queue.c b/server/queue.c index 97e0c4d..7d25afa 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1147,8 +1147,8 @@ static void update_input_key_state( struct desktop *desktop, unsigned char *keys down = (keystate == desktop->keystate) ? 0xc0 : 0x80; /* fall through */ case WM_XBUTTONUP: - if (msg->wparam == XBUTTON1) set_input_key_state( keystate, VK_XBUTTON1, down ); - else if (msg->wparam == XBUTTON2) set_input_key_state( keystate, VK_XBUTTON2, down ); + if (msg->wparam >> 16 == XBUTTON1) set_input_key_state( keystate, VK_XBUTTON1, down ); + else if (msg->wparam >> 16 == XBUTTON2) set_input_key_state( keystate, VK_XBUTTON2, down ); break; case WM_KEYDOWN: case WM_SYSKEYDOWN:

1 0