wine-commits February 2011

wine-commits@winehq.org

2 participants
674 discussions

David Hedberg : gdi32: Stay within the clipping area when painting text background.
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: 81bbd17c406e37ea23e8f86f95d307c0c45e2bc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81bbd17c406e37ea23e8f86f9… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Sun Jan 30 20:47:55 2011 +0800 gdi32: Stay within the clipping area when painting text background. --- dlls/gdi32/font.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b4aa9bc..3df3d0b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2030,7 +2030,16 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, rc.right = x + width.x; rc.top = y - tm.tmAscent; rc.bottom = y + tm.tmDescent; - dc->funcs->pExtTextOut(dc->physDev, 0, 0, ETO_OPAQUE, &rc, NULL, 0, NULL); + + if(flags & ETO_CLIPPED) + { + rc.left = max(lprect->left, rc.left); + rc.right = min(lprect->right, rc.right); + rc.top = max(lprect->top, rc.top); + rc.bottom = min(lprect->bottom, rc.bottom); + } + if(rc.left < rc.right && rc.top < rc.bottom) + dc->funcs->pExtTextOut(dc->physDev, 0, 0, ETO_OPAQUE, &rc, NULL, 0, NULL); } } }

1 0

Hans Leidekker : msi: Handle out-of-memory condition in encode_streamname.
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: bf192f6ac96fe372ad0fbed5ed5b657a091e1c2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf192f6ac96fe372ad0fbed5e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 1 14:02:01 2011 +0100 msi: Handle out-of-memory condition in encode_streamname. --- dlls/msi/table.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index d3675e2..739e189 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -156,7 +156,7 @@ LPWSTR encode_streamname(BOOL bTable, LPCWSTR in) if( !bTable ) count = lstrlenW( in )+2; - out = msi_alloc( count*sizeof(WCHAR) ); + if (!(out = msi_alloc( count*sizeof(WCHAR) ))) return NULL; p = out; if( bTable )

1 0

Hans Leidekker : programs: Add winemsibuilder.
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: 13700720573bdbadb3bbeb25f1e8a88c11dbf605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13700720573bdbadb3bbeb25f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 1 14:01:42 2011 +0100 programs: Add winemsibuilder. --- configure | 1 + configure.ac | 1 + programs/winemsibuilder/Makefile.in | 8 + programs/winemsibuilder/main.c | 281 +++++++++++++++++++++++++++++++++++ 4 files changed, 291 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 89cbede..64a7c50 100755 --- a/configure +++ b/configure @@ -15427,6 +15427,7 @@ wine_fn_config_program winedevice enable_winedevice install wine_fn_config_program winefile enable_winefile po,install,installbin wine_fn_config_program winemenubuilder enable_winemenubuilder install wine_fn_config_program winemine enable_winemine po,install,installbin +wine_fn_config_program winemsibuilder enable_winemsibuilder install wine_fn_config_program winepath enable_winepath install,installbin wine_fn_config_program winetest enable_winetest wine_fn_config_program winevdm enable_win16 install diff --git a/configure.ac b/configure.ac index 48ed667..6d8b574 100644 --- a/configure.ac +++ b/configure.ac @@ -2928,6 +2928,7 @@ WINE_CONFIG_PROGRAM(winedevice,,[install]) WINE_CONFIG_PROGRAM(winefile,,[po,install,installbin]) WINE_CONFIG_PROGRAM(winemenubuilder,,[install]) WINE_CONFIG_PROGRAM(winemine,,[po,install,installbin]) +WINE_CONFIG_PROGRAM(winemsibuilder,,[install]) WINE_CONFIG_PROGRAM(winepath,,[install,installbin]) WINE_CONFIG_PROGRAM(winetest) WINE_CONFIG_PROGRAM(winevdm,enable_win16,[install]) diff --git a/programs/winemsibuilder/Makefile.in b/programs/winemsibuilder/Makefile.in new file mode 100644 index 0000000..14517f1 --- /dev/null +++ b/programs/winemsibuilder/Makefile.in @@ -0,0 +1,8 @@ +MODULE = winemsibuilder.exe +APPMODE = -mconsole -municode +IMPORTS = msi ole32 +EXTRADEFS = -DWINE_NO_UNICODE_MACROS + +C_SRCS = main.c + +@MAKE_PROG_RULES@ diff --git a/programs/winemsibuilder/main.c b/programs/winemsibuilder/main.c new file mode 100644 index 0000000..ea4607e --- /dev/null +++ b/programs/winemsibuilder/main.c @@ -0,0 +1,281 @@ +/* + * winemsibuilder - tool to build MSI packages + * + * Copyright 2010 Hans Leidekker for CodeWeavers + * + * 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 + */ + +#define WIN32_LEAN_AND_MEAN +#define COBJMACROS + +#include <stdio.h> +#include <windows.h> +#include <msi.h> +#include <msiquery.h> +#include <objbase.h> + +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winemsibuilder); + +static UINT open_database( const WCHAR *msifile, MSIHANDLE *handle ) +{ + UINT r; + MSIHANDLE hdb; + + if (GetFileAttributesW( msifile ) == INVALID_FILE_ATTRIBUTES) + { + r = MsiOpenDatabaseW( msifile, MSIDBOPEN_CREATE, &hdb ); + if (r != ERROR_SUCCESS) + { + WINE_ERR( "failed to create package database %s (%u)\n", wine_dbgstr_w(msifile), r ); + return r; + } + r = MsiDatabaseCommit( hdb ); + if (r != ERROR_SUCCESS) + { + WINE_ERR( "failed to commit database (%u)\n", r ); + MsiCloseHandle( hdb ); + return r; + } + } + else + { + r = MsiOpenDatabaseW( msifile, MSIDBOPEN_TRANSACT, &hdb ); + if (r != ERROR_SUCCESS) + { + WINE_ERR( "failed to open package database %s (%u)\n", wine_dbgstr_w(msifile), r ); + return r; + } + } + + *handle = hdb; + return ERROR_SUCCESS; +} + +static int import_tables( const WCHAR *msifile, WCHAR **tables ) +{ + UINT r; + MSIHANDLE hdb; + WCHAR *dir; + DWORD len; + + r = open_database( msifile, &hdb ); + if (r != ERROR_SUCCESS) return 1; + + len = GetCurrentDirectoryW( 0, NULL ); + if (!(dir = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) + { + MsiCloseHandle( hdb ); + return 1; + } + GetCurrentDirectoryW( len + 1, dir ); + + while (*tables) + { + r = MsiDatabaseImportW( hdb, dir, *tables ); + if (r != ERROR_SUCCESS) + { + WINE_ERR( "failed to import table %s (%u)\n", wine_dbgstr_w(*tables), r ); + break; + } + tables++; + } + + if (r == ERROR_SUCCESS) + { + r = MsiDatabaseCommit( hdb ); + if (r != ERROR_SUCCESS) + WINE_ERR( "failed to commit changes (%u)\n", r ); + } + + HeapFree( GetProcessHeap(), 0, dir ); + MsiCloseHandle( hdb ); + return (r != ERROR_SUCCESS); +} + +/* taken from dlls/msi/table.c */ +static int utf2mime( int x ) +{ + if (x >= '0' && x <= '9') + return x - '0'; + if (x >= 'A' && x <= 'Z') + return x - 'A' + 10; + if (x >= 'a' && x <= 'z') + return x - 'a' + 10 + 26; + if (x == '.') + return 10 + 26 + 26; + if (x == '_') + return 10 + 26 + 26 + 1; + return -1; +} + +#define MAX_STREAM_NAME 0x1f + +static WCHAR *encode_stream( const WCHAR *in ) +{ + DWORD c, next, count; + WCHAR *out, *p; + + count = strlenW( in ); + if (count > MAX_STREAM_NAME) + return NULL; + + count += 2; + if (!(out = HeapAlloc( GetProcessHeap(), 0, count * sizeof(WCHAR) ))) return NULL; + p = out; + while (count--) + { + c = *in++; + if (!c) + { + *p = c; + return out; + } + if (c < 0x80 && utf2mime( c ) >= 0) + { + c = utf2mime( c ) + 0x4800; + next = *in; + if (next && next < 0x80) + { + next = utf2mime( next ); + if (next != -1) + { + next += 0x3ffffc0; + c += next << 6; + in++; + } + } + } + *p++ = c; + } + HeapFree( GetProcessHeap(), 0, out ); + return NULL; +} + +static int add_stream( const WCHAR *msifile, const WCHAR *stream, const WCHAR *file ) +{ + UINT r; + HRESULT hr; + MSIHANDLE hdb; + IStorage *stg; + IStream *stm = NULL; + HANDLE handle; + char buffer[4096]; + ULARGE_INTEGER size; + DWORD low, high, read; + WCHAR *encname; + int ret = 1; + + /* make sure we have the right type of file */ + r = open_database( msifile, &hdb ); + if (r != ERROR_SUCCESS) return 1; + MsiCloseHandle( hdb ); + + hr = StgOpenStorage( msifile, NULL, STGM_TRANSACTED|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, NULL, 0, &stg ); + if (hr != S_OK) + { + WINE_WARN( "failed to open storage %s (0x%08x)\n", wine_dbgstr_w(msifile), hr ); + return 1; + } + encname = encode_stream( stream ); + if (!encname) + { + WINE_WARN( "failed to encode stream name %s\n", wine_dbgstr_w(stream) ); + goto done; + } + hr = IStorage_CreateStream( stg, encname, STGM_CREATE|STGM_WRITE|STGM_SHARE_EXCLUSIVE, 0, 0, &stm ); + if (hr != S_OK) + { + WINE_WARN( "failed to create stream %s (0x%08x)\n", wine_dbgstr_w(encname), hr ); + goto done; + } + handle = CreateFileW( file, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL ); + if (handle == INVALID_HANDLE_VALUE) + { + WINE_WARN( "failed to open file %s (%u)\n", wine_dbgstr_w(file), GetLastError() ); + goto done; + } + low = GetFileSize( handle, &high ); + if (low == INVALID_FILE_SIZE || high) + { + WINE_WARN( "file %s too big\n", wine_dbgstr_w(file) ); + CloseHandle( handle ); + goto done; + } + size.QuadPart = low; + hr = IStream_SetSize( stm, size ); + if (hr != S_OK) goto done; + + while (ReadFile( handle, buffer, sizeof(buffer), &read, NULL ) && read) + { + hr = IStream_Write( stm, buffer, read, NULL ); + if (hr != S_OK) break; + size.QuadPart -= read; + } + CloseHandle( handle ); + if (size.QuadPart) + { + WINE_WARN( "failed to write stream contents\n" ); + goto done; + } + IStorage_Commit( stg, 0 ); + ret = 0; + +done: + HeapFree( GetProcessHeap(), 0, encname ); + if (stm) IStream_Release( stm ); + IStorage_Release( stg ); + return ret; +} + +static void show_usage( void ) +{ + WINE_MESSAGE( + "Usage: winemsibuilder [OPTION] [MSIFILE] ...\n" + "Options:\n" + " -i package.msi table1.idt [table2.idt ...] Import one or more tables into the database.\n" + " -a package.msi stream file Add 'stream' to storage with contents of 'file'.\n" + "\nExisting tables or streams will be overwritten. If package.msi does not exist a new file\n" + "will be created with an empty database.\n" + ); +} + +int wmain( int argc, WCHAR *argv[] ) +{ + if (argc < 3 || argv[1][0] != '-') + { + show_usage(); + return 1; + } + + switch (argv[1][1]) + { + case 'i': + if (argc < 4) break; + return import_tables( argv[2], argv + 3 ); + case 'a': + if (argc < 5) break; + return add_stream( argv[2], argv[3], argv[4] ); + default: + WINE_WARN( "unknown option\n" ); + break; + } + + show_usage(); + return 1; +}

1 0

Dmitry Timoshkov : winex11.drv: Make sure that default clipping region exists before calling ExcludeUpdateRgn ().
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: 38167e71d1ccff264d269c3bee7e1a448871829a URL: http://source.winehq.org/git/wine.git/?a=commit;h=38167e71d1ccff264d269c3be… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jan 31 19:30:43 2011 +0800 winex11.drv: Make sure that default clipping region exists before calling ExcludeUpdateRgn(). --- dlls/winex11.drv/window.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 65c046b..082c928 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1605,7 +1605,7 @@ static void move_window_bits( struct x11drv_win_data *data, const RECT *old_rect RECT dst_rect = *new_rect; HDC hdc_src, hdc_dst; INT code; - HRGN rgn = 0; + HRGN rgn; HWND parent = 0; if (!data->whole_window) @@ -1624,6 +1624,9 @@ static void move_window_bits( struct x11drv_win_data *data, const RECT *old_rect hdc_src = hdc_dst = GetDCEx( data->hwnd, 0, DCX_CACHE ); } + rgn = CreateRectRgnIndirect( &dst_rect ); + SelectClipRgn( hdc_dst, rgn ); + DeleteObject( rgn ); ExcludeUpdateRgn( hdc_dst, data->hwnd ); code = X11DRV_START_EXPOSURES; @@ -1636,6 +1639,7 @@ static void move_window_bits( struct x11drv_win_data *data, const RECT *old_rect dst_rect.right - dst_rect.left, dst_rect.bottom - dst_rect.top, hdc_src, src_rect.left, src_rect.top, SRCCOPY ); + rgn = 0; code = X11DRV_END_EXPOSURES; ExtEscape( hdc_dst, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, sizeof(rgn), (LPSTR)&rgn );

1 0

Hans Leidekker : msi: Reset file attributes before removing a file.
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: bc13c7eb90f486bca0cebe9976b2038325295ed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc13c7eb90f486bca0cebe997… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 1 12:27:09 2011 +0100 msi: Reset file attributes before removing a file. --- dlls/msi/files.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 1205690..a044ec7 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -1048,9 +1048,11 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) } TRACE("removing %s\n", debugstr_w(file->File) ); + + SetFileAttributesW( file->TargetPath, FILE_ATTRIBUTE_NORMAL ); if (!DeleteFileW( file->TargetPath )) { - WARN("failed to delete %s\n", debugstr_w(file->TargetPath)); + WARN("failed to delete %s (%u)\n", debugstr_w(file->TargetPath), GetLastError()); } /* FIXME: check persistence for each directory */ else if (r && (dir = strdupW( file->TargetPath )))

1 0

Hans Leidekker : hnetcfg: Return success from fw_app_put_Enabled.
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: 726c045549217ae079b04708a04b5bdb62c789f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=726c045549217ae079b04708a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 1 12:26:50 2011 +0100 hnetcfg: Return success from fw_app_put_Enabled. --- dlls/hnetcfg/apps.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c index 81bfe36..90a1807 100644 --- a/dlls/hnetcfg/apps.c +++ b/dlls/hnetcfg/apps.c @@ -262,7 +262,7 @@ static HRESULT WINAPI fw_app_put_Enabled( fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); FIXME("%p, %d\n", This, enabled); - return E_NOTIMPL; + return S_OK; } static const struct INetFwAuthorizedApplicationVtbl fw_app_vtbl =

1 0

Nikolay Sivov : oleaut32/tests: Fix a safearray leak (Valgrind).
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: 1dcf3f7aefbbb62dfa8b9ae8acca1b275ea5cc03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dcf3f7aefbbb62dfa8b9ae8a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 1 14:29:50 2011 +0300 oleaut32/tests: Fix a safearray leak (Valgrind). --- dlls/oleaut32/tests/safearray.c | 13 +++++++++++-- dlls/oleaut32/variant.c | 5 ++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 689494d..97ba9dd 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1683,9 +1683,18 @@ static void test_SafeArrayChangeTypeEx(void) VariantInit(&v2); hres = VariantChangeTypeEx(&v2, &v, 0, 0, VT_BSTR); - ok(hres != S_OK, "CTE VT_ARRAY|VT %d->BSTR succeeded\n", vt); + if (vt == VT_INT_PTR || vt == VT_UINT_PTR) + { + ok(hres == DISP_E_BADVARTYPE, "expected DISP_E_BADVARTYPE, got 0x%08x\n", hres); + SafeArrayDestroy(sa); + } + else + { + ok(hres == DISP_E_TYPEMISMATCH, "got 0x%08x for vt=%d, instead of DISP_E_TYPEMISMATCH\n", hres, vt); + hres = VariantClear(&v); + ok(hres == S_OK, "expected S_OK, got 0x%08x\n", hres); + } VariantClear(&v2); - VariantClear(&v); } /* Can't change an array of one type into array of another type , even diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 776c0e7..5d32c3b 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -652,7 +652,7 @@ HRESULT VARIANT_ClearInd(VARIANTARG *pVarg) */ HRESULT WINAPI VariantClear(VARIANTARG* pVarg) { - HRESULT hres = S_OK; + HRESULT hres; TRACE("(%p->(%s%s))\n", pVarg, debugstr_VT(pVarg), debugstr_VF(pVarg)); @@ -664,8 +664,7 @@ HRESULT WINAPI VariantClear(VARIANTARG* pVarg) { if (V_ISARRAY(pVarg) || V_VT(pVarg) == VT_SAFEARRAY) { - if (V_ARRAY(pVarg)) - hres = SafeArrayDestroy(V_ARRAY(pVarg)); + hres = SafeArrayDestroy(V_ARRAY(pVarg)); } else if (V_VT(pVarg) == VT_BSTR) {

1 0

Nikolay Sivov : oleaut32/tests: Fix a IRecordInfo leak (Valgrind).
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: a0e7c9996b90887dd7bd8ab2ef5d28d81f8cd1eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0e7c9996b90887dd7bd8ab2e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 1 14:12:46 2011 +0300 oleaut32/tests: Fix a IRecordInfo leak (Valgrind). --- dlls/oleaut32/tests/safearray.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index a01f05d..689494d 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -111,7 +111,12 @@ static ULONG CALLBACK IRecordInfoImpl_AddRef(IRecordInfo *iface) static ULONG CALLBACK IRecordInfoImpl_Release(IRecordInfo *iface) { IRecordInfoImpl* This = impl_from_IRecordInfo(iface); - return InterlockedDecrement(&This->ref); + ULONG ref = InterlockedDecrement(&This->ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; } static BOOL fail_GetSize; /* Whether to fail the GetSize call */ @@ -1463,6 +1468,7 @@ static void test_SafeArrayCreateEx(void) hres = SafeArrayDestroy(sa); ok(hres == S_OK, "got 0x%08x\n", hres); ok(iRec->clearCalled == sab[0].cElements, "Destroy->Clear called %d times\n", iRec->clearCalled); + ok(iRec->ref == START_REF_COUNT, "got %d, expected %d\n", iRec->ref, START_REF_COUNT); } /* Test VT_RECORD array */ @@ -1662,7 +1668,7 @@ static void test_SafeArrayChangeTypeEx(void) } /* To/from BSTR only works with arrays of VT_UI1 */ - for (vt = 0; vt <= VT_CLSID; vt++) + for (vt = VT_EMPTY; vt <= VT_CLSID; vt++) { if (vt == VT_UI1) continue;

1 0

Andrew Nguyen : dxdiagn: Avoid caching a single instance of the root container.
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: 1fe904bd08b26b0f0548b77f9b1d7ef3c00a5509 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fe904bd08b26b0f0548b77f9… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Feb 1 04:32:34 2011 -0600 dxdiagn: Avoid caching a single instance of the root container. --- dlls/dxdiagn/dxdiag_private.h | 1 - dlls/dxdiagn/provider.c | 19 +++++++++++-------- dlls/dxdiagn/tests/provider.c | 9 ++++++++- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/dxdiagn/dxdiag_private.h b/dlls/dxdiagn/dxdiag_private.h index 58de882..ba48c14 100644 --- a/dlls/dxdiagn/dxdiag_private.h +++ b/dlls/dxdiagn/dxdiag_private.h @@ -48,7 +48,6 @@ struct IDxDiagProviderImpl { /* IDxDiagProvider fields */ BOOL init; DXDIAG_INIT_PARAMS params; - IDxDiagContainer* pRootContainer; }; /* ---------------- */ diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 428c7ef..0734241 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -107,21 +107,24 @@ static HRESULT WINAPI IDxDiagProviderImpl_Initialize(PDXDIAGPROVIDER iface, DXDI } static HRESULT WINAPI IDxDiagProviderImpl_GetRootContainer(PDXDIAGPROVIDER iface, IDxDiagContainer** ppInstance) { - HRESULT hr = S_OK; + HRESULT hr; IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface; + IDxDiagContainer *root; + TRACE("(%p,%p)\n", iface, ppInstance); if (FALSE == This->init) { return CO_E_NOTINITIALIZED; } - if (NULL == This->pRootContainer) { - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &This->pRootContainer); - if (FAILED(hr)) { - return hr; - } - hr = DXDiag_InitRootDXDiagContainer(This->pRootContainer); + + hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void **)&root); + if (FAILED(hr)) { + return hr; } - return IDxDiagContainerImpl_QueryInterface((PDXDIAGCONTAINER)This->pRootContainer, &IID_IDxDiagContainer, (void**) ppInstance); + + DXDiag_InitRootDXDiagContainer(root); + + return IDxDiagContainerImpl_QueryInterface(root, &IID_IDxDiagContainer, (void **)ppInstance); } static const IDxDiagProviderVtbl DxDiagProvider_Vtbl = diff --git a/dlls/dxdiagn/tests/provider.c b/dlls/dxdiagn/tests/provider.c index 0aa228b..69006f0 100644 --- a/dlls/dxdiagn/tests/provider.c +++ b/dlls/dxdiagn/tests/provider.c @@ -94,7 +94,7 @@ static void test_GetRootContainer(void) { HRESULT hr; IDxDiagProvider *pddp; - IDxDiagContainer *pddc; + IDxDiagContainer *pddc, *pddc2; DXDIAG_INIT_PARAMS params; hr = CoCreateInstance(&CLSID_DxDiagProvider, NULL, CLSCTX_INPROC_SERVER, @@ -140,6 +140,13 @@ static void test_GetRootContainer(void) hr = IDxDiagProvider_GetRootContainer(pddp, &pddc); ok(hr == S_OK, "Expected IDxDiagProvider::GetRootContainer to return S_OK, got %x\n", hr); + /* IDxDiagProvider::GetRootContainer creates new instances of the root + * container rather than maintain a static root container. */ + hr = IDxDiagProvider_GetRootContainer(pddp, &pddc2); + ok(hr == S_OK, "Expected IDxDiagProvider::GetRootContainer to return S_OK, got %x\n", hr); + ok(pddc != pddc2, "Expected the two pointers (%p vs. %p) to be unequal\n", pddc, pddc2); + + IDxDiagContainer_Release(pddc2); IDxDiagContainer_Release(pddc); IDxDiagProvider_Release(pddp); }

1 0

Andrew Nguyen : dxdiagn: Simplify the root container initialization.
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: c99e0fbc0e7a631b9dd1a39afb76619c49c9aed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c99e0fbc0e7a631b9dd1a39af… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Feb 1 04:32:24 2011 -0600 dxdiagn: Simplify the root container initialization. --- dlls/dxdiagn/provider.c | 92 +++++++++++++++++---------------------- dlls/dxdiagn/tests/container.c | 79 ++++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c99e0fbc0e7a631b9dd1a…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2011