wine-commits November 2011

wine-commits@winehq.org

2 participants
852 discussions

Alistair Leslie-Hughes : mscoree: Implement ICorDebug EnumerateProcesses.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: 7ee1250e4601535625f7e9dde1fa20f316ac444f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ee1250e4601535625f7e9dde… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 31 09:15:39 2011 +1100 mscoree: Implement ICorDebug EnumerateProcesses. --- dlls/mscoree/cordebug.c | 122 +++++++++++++++++++++++++++++++++++++++- dlls/mscoree/mscoree_private.h | 10 +++ dlls/mscoree/tests/debugging.c | 26 +++++++++ 3 files changed, 156 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/cordebug.c b/dlls/mscoree/cordebug.c index c5342bc..04c6e58 100644 --- a/dlls/mscoree/cordebug.c +++ b/dlls/mscoree/cordebug.c @@ -45,6 +45,104 @@ static inline CorDebug *impl_from_ICorDebug( ICorDebug *iface ) return CONTAINING_RECORD(iface, CorDebug, ICorDebug_iface); } +static inline CorDebug *impl_from_ICorDebugProcessEnum( ICorDebugProcessEnum *iface ) +{ + return CONTAINING_RECORD(iface, CorDebug, ICorDebugProcessEnum_iface); +} + +static HRESULT WINAPI process_enum_QueryInterface(ICorDebugProcessEnum *iface, REFIID riid, void **ppvObject) +{ + CorDebug *This = impl_from_ICorDebugProcessEnum(iface); + + TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + + if ( IsEqualGUID( riid, &IID_ICorDebugProcessEnum ) || + IsEqualGUID( riid, &IID_ICorDebugEnum ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *ppvObject = &This->ICorDebugProcessEnum_iface; + } + else + { + FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + ICorDebug_AddRef(iface); + + return S_OK; +} + +static ULONG WINAPI process_enum_AddRef(ICorDebugProcessEnum *iface) +{ + CorDebug *This = impl_from_ICorDebugProcessEnum(iface); + TRACE("%p ref=%u\n", This, This->ref); + + return ICorDebug_AddRef(&This->ICorDebug_iface); +} + +static ULONG WINAPI process_enum_Release(ICorDebugProcessEnum *iface) +{ + CorDebug *This = impl_from_ICorDebugProcessEnum(iface); + TRACE("%p ref=%u\n", This, This->ref); + + return ICorDebug_Release(&This->ICorDebug_iface); +} + +static HRESULT WINAPI process_enum_Skip(ICorDebugProcessEnum *iface, ULONG celt) +{ + CorDebug *This = impl_from_ICorDebugProcessEnum(iface); + FIXME("stub %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI process_enum_Reset(ICorDebugProcessEnum *iface) +{ + CorDebug *This = impl_from_ICorDebugProcessEnum(iface); + FIXME("stub %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI process_enum_Clone(ICorDebugProcessEnum *iface, ICorDebugEnum **ppEnum) +{ + CorDebug *This = impl_from_ICorDebugProcessEnum(iface); + FIXME("stub %p %p\n", This, ppEnum); + return E_NOTIMPL; +} + +static HRESULT WINAPI process_enum_GetCount(ICorDebugProcessEnum *iface, ULONG *pcelt) +{ + CorDebug *This = impl_from_ICorDebugProcessEnum(iface); + TRACE("stub %p %p\n", This, pcelt); + + if(!pcelt) + return E_INVALIDARG; + + *pcelt = list_count(&This->processes); + + return S_OK; +} + +static HRESULT WINAPI process_enum_Next(ICorDebugProcessEnum *iface, ULONG celt, + ICorDebugProcess * processes[], ULONG *pceltFetched) +{ + CorDebug *This = impl_from_ICorDebugProcessEnum(iface); + FIXME("stub %p %d %p %p\n", This, celt, processes, pceltFetched); + return E_NOTIMPL; +} + +static const struct ICorDebugProcessEnumVtbl processenum_vtbl = +{ + process_enum_QueryInterface, + process_enum_AddRef, + process_enum_Release, + process_enum_Skip, + process_enum_Reset, + process_enum_Clone, + process_enum_GetCount, + process_enum_Next +}; + /*** IUnknown methods ***/ static HRESULT WINAPI CorDebug_QueryInterface(ICorDebug *iface, REFIID riid, void **ppvObject) { @@ -82,11 +180,21 @@ static ULONG WINAPI CorDebug_Release(ICorDebug *iface) { CorDebug *This = impl_from_ICorDebug( iface ); ULONG ref = InterlockedDecrement(&This->ref); + struct CorProcess *cursor, *cursor2; TRACE("%p ref=%u\n", This, ref); if (ref == 0) { + LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &This->processes, struct CorProcess, entry) + { + if(cursor->pProcess) + ICorDebugProcess_Release(cursor->pProcess); + + list_remove(&cursor->entry); + HeapFree(GetProcessHeap(), 0, cursor); + } + if(This->runtimehost) ICLRRuntimeHost_Release(This->runtimehost); @@ -183,8 +291,15 @@ static HRESULT WINAPI CorDebug_DebugActiveProcess(ICorDebug *iface, DWORD id, BO static HRESULT WINAPI CorDebug_EnumerateProcesses( ICorDebug *iface, ICorDebugProcessEnum **ppProcess) { CorDebug *This = impl_from_ICorDebug( iface ); - FIXME("stub %p %p\n", This, ppProcess); - return E_NOTIMPL; + TRACE("stub %p %p\n", This, ppProcess); + + if(!ppProcess) + return E_INVALIDARG; + + *ppProcess = &This->ICorDebugProcessEnum_iface; + ICorDebugProcessEnum_AddRef(*ppProcess); + + return S_OK; } static HRESULT WINAPI CorDebug_GetProcess(ICorDebug *iface, DWORD dwProcessId, ICorDebugProcess **ppProcess) @@ -227,11 +342,14 @@ HRESULT CorDebug_Create(ICLRRuntimeHost *runtimehost, IUnknown** ppUnk) return E_OUTOFMEMORY; This->ICorDebug_iface.lpVtbl = &cordebug_vtbl; + This->ICorDebugProcessEnum_iface.lpVtbl = &processenum_vtbl; This->ref = 1; This->pCallback = NULL; This->pCallback2 = NULL; This->runtimehost = runtimehost; + list_init(&This->processes); + if(This->runtimehost) ICLRRuntimeHost_AddRef(This->runtimehost); diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 3c9ef1e..71bf738 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -72,9 +72,16 @@ struct RuntimeHost LONG ref; }; +typedef struct CorProcess +{ + struct list entry; + ICorDebugProcess *pProcess; +} CorProcess; + typedef struct CorDebug { ICorDebug ICorDebug_iface; + ICorDebugProcessEnum ICorDebugProcessEnum_iface; LONG ref; ICLRRuntimeHost *runtimehost; @@ -82,6 +89,9 @@ typedef struct CorDebug /* ICorDebug Callback */ ICorDebugManagedCallback *pCallback; ICorDebugManagedCallback2 *pCallback2; + + /* Debug Processes */ + struct list processes; } CorDebug; extern HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, diff --git a/dlls/mscoree/tests/debugging.c b/dlls/mscoree/tests/debugging.c index fb5abe3..bd961ed 100644 --- a/dlls/mscoree/tests/debugging.c +++ b/dlls/mscoree/tests/debugging.c @@ -418,6 +418,29 @@ static BOOL init_functionpointers(void) return TRUE; } +#define check_process_enum(core, e) _check_process_enum(__LINE__, core, e) +static void _check_process_enum(unsigned line, ICorDebug *pCorDebug, ULONG nExpected) +{ + HRESULT hr; + ICorDebugProcessEnum *pProcessEnum = NULL; + + hr = ICorDebug_EnumerateProcesses(pCorDebug, NULL); + ok_(__FILE__,line) (hr == E_INVALIDARG, "expected E_INVALIDARG got %08x\n", hr); + + hr = ICorDebug_EnumerateProcesses(pCorDebug, &pProcessEnum); + ok_(__FILE__,line) (hr == S_OK, "expected S_OK got %08x\n", hr); + if(hr == S_OK) + { + ULONG cnt; + + hr = ICorDebugProcessEnum_GetCount(pProcessEnum, &cnt); + ok_(__FILE__,line) (hr == S_OK, "expected S_OK got %08x\n", hr); + ok_(__FILE__,line) (cnt == nExpected, "expected %d got %d\n", nExpected, cnt); + + ICorDebugProcessEnum_Release(pProcessEnum); + } +} + static void test_createDebugger(void) { HRESULT hr; @@ -455,6 +478,9 @@ static void test_createDebugger(void) hr = ICorDebug_SetManagedHandler(pCorDebug, &ManagedCallback); ok(hr == S_OK, "expected S_OK got %08x\n", hr); + + /* We should have no processes */ + check_process_enum(pCorDebug, 0); } ICorDebug_Release(pCorDebug);

1 0

Alexandre Julliard : gdi32: Add some brush tests.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: 4ec87b3e8debe3dff817f1c4170b03f41f99ab16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ec87b3e8debe3dff817f1c41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 1 14:07:05 2011 +0100 gdi32: Add some brush tests. --- dlls/gdi32/brush.c | 14 ++++- dlls/gdi32/tests/brush.c | 137 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 147 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index ca95f20..0beda64 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -108,11 +108,17 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) switch (ptr->logbrush.lbStyle) { + case BS_SOLID: + case BS_HOLLOW: + case BS_HATCHED: + break; + case BS_PATTERN8X8: ptr->logbrush.lbStyle = BS_PATTERN; /* fall through */ case BS_PATTERN: ptr->logbrush.lbHatch = (ULONG_PTR)BITMAP_CopyBitmap( (HBITMAP) ptr->logbrush.lbHatch ); + ptr->logbrush.lbColor = 0; if (!ptr->logbrush.lbHatch) goto error; break; @@ -123,7 +129,6 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) if (!ptr->logbrush.lbHatch) goto error; break; - case BS_DIBPATTERN8X8: case BS_DIBPATTERN: { BITMAPINFO* bmi; @@ -137,9 +142,12 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) break; } + case BS_DIBPATTERN8X8: + case BS_MONOPATTERN: + case BS_INDEXED: default: - if(ptr->logbrush.lbStyle > BS_MONOPATTERN) goto error; - break; + WARN( "invalid brush style %u\n", ptr->logbrush.lbStyle ); + goto error; } if ((hbrush = alloc_gdi_handle( &ptr->header, OBJ_BRUSH, &brush_funcs ))) diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index 2197f7e..a2767ff 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -78,8 +78,143 @@ static void test_solidbrush(void) "GetObject succeeded on a deleted %s brush\n", stock[i].name); } } - + +static void test_pattern_brush(void) +{ + char buffer[sizeof(BITMAPINFOHEADER) + 2 * sizeof(RGBQUAD) + 32 * 32 / 8]; + BITMAPINFO *info = (BITMAPINFO *)buffer; + HBRUSH brush; + HBITMAP bitmap; + LOGBRUSH br; + INT ret; + void *bits; + DIBSECTION dib; + HGLOBAL mem; + + bitmap = CreateBitmap( 20, 20, 1, 1, NULL ); + ok( bitmap != NULL, "CreateBitmap failed\n" ); + brush = CreatePatternBrush( bitmap ); + ok( brush != NULL, "CreatePatternBrush failed\n" ); + memset( &br, 0x55, sizeof(br) ); + ret = GetObjectW( brush, sizeof(br), &br ); + ok( ret == sizeof(br), "wrong size %u\n", ret ); + ok( br.lbStyle == BS_PATTERN, "wrong style %u\n", br.lbStyle ); + ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); + todo_wine ok( (HBITMAP)br.lbHatch == bitmap, "wrong handle %p/%p\n", (HBITMAP)br.lbHatch, bitmap ); + DeleteObject( brush ); + + br.lbStyle = BS_PATTERN8X8; + br.lbColor = 0x12345; + br.lbHatch = (ULONG_PTR)bitmap; + brush = CreateBrushIndirect( &br ); + ok( brush != NULL, "CreatePatternBrush failed\n" ); + memset( &br, 0x55, sizeof(br) ); + ret = GetObjectW( brush, sizeof(br), &br ); + ok( ret == sizeof(br), "wrong size %u\n", ret ); + ok( br.lbStyle == BS_PATTERN, "wrong style %u\n", br.lbStyle ); + ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); + todo_wine ok( (HBITMAP)br.lbHatch == bitmap, "wrong handle %p/%p\n", (HBITMAP)br.lbHatch, bitmap ); + ret = GetObjectW( bitmap, sizeof(dib), &dib ); + ok( ret == sizeof(dib.dsBm), "wrong size %u\n", ret ); + DeleteObject( bitmap ); + ret = GetObjectW( bitmap, sizeof(dib), &dib ); + ok( ret == 0, "wrong size %u\n", ret ); + DeleteObject( brush ); + + memset( info, 0, sizeof(buffer) ); + info->bmiHeader.biSize = sizeof(info->bmiHeader); + info->bmiHeader.biHeight = 32; + info->bmiHeader.biWidth = 32; + info->bmiHeader.biBitCount = 1; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biCompression = BI_RGB; + bitmap = CreateDIBSection( 0, info, DIB_RGB_COLORS, (void**)&bits, NULL, 0 ); + ok( bitmap != NULL, "CreateDIBSection failed\n" ); + + /* MSDN says a DIB section is not allowed, but it works fine */ + brush = CreatePatternBrush( bitmap ); + ok( brush != NULL, "CreatePatternBrush failed\n" ); + memset( &br, 0x55, sizeof(br) ); + ret = GetObjectW( brush, sizeof(br), &br ); + ok( ret == sizeof(br), "wrong size %u\n", ret ); + ok( br.lbStyle == BS_PATTERN, "wrong style %u\n", br.lbStyle ); + ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); + todo_wine ok( (HBITMAP)br.lbHatch == bitmap, "wrong handle %p/%p\n", (HBITMAP)br.lbHatch, bitmap ); + ret = GetObjectW( bitmap, sizeof(dib), &dib ); + ok( ret == sizeof(dib), "wrong size %u\n", ret ); + DeleteObject( brush ); + DeleteObject( bitmap ); + + brush = CreateDIBPatternBrushPt( info, DIB_RGB_COLORS ); + ok( brush != NULL, "CreatePatternBrush failed\n" ); + memset( &br, 0x55, sizeof(br) ); + ret = GetObjectW( brush, sizeof(br), &br ); + ok( ret == sizeof(br), "wrong size %u\n", ret ); + ok( br.lbStyle == BS_DIBPATTERN, "wrong style %u\n", br.lbStyle ); + ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); + todo_wine ok( (BITMAPINFO *)br.lbHatch == info || broken(!br.lbHatch), /* nt4 */ + "wrong handle %p/%p\n", (BITMAPINFO *)br.lbHatch, info ); + DeleteObject( brush ); + + br.lbStyle = BS_DIBPATTERNPT; + br.lbColor = DIB_PAL_COLORS; + br.lbHatch = (ULONG_PTR)info; + brush = CreateBrushIndirect( &br ); + ok( brush != NULL, "CreatePatternBrush failed\n" ); + memset( &br, 0x55, sizeof(br) ); + ret = GetObjectW( brush, sizeof(br), &br ); + ok( ret == sizeof(br), "wrong size %u\n", ret ); + ok( br.lbStyle == BS_DIBPATTERN, "wrong style %u\n", br.lbStyle ); + todo_wine ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); + todo_wine ok( (BITMAPINFO *)br.lbHatch == info || broken(!br.lbHatch), /* nt4 */ + "wrong handle %p/%p\n", (BITMAPINFO *)br.lbHatch, info ); + + mem = GlobalAlloc( GMEM_MOVEABLE, sizeof(buffer) ); + memcpy( GlobalLock( mem ), buffer, sizeof(buffer) ); + + br.lbStyle = BS_DIBPATTERN; + br.lbColor = DIB_PAL_COLORS; + br.lbHatch = (ULONG_PTR)mem; + brush = CreateBrushIndirect( &br ); + ok( brush != NULL, "CreatePatternBrush failed\n" ); + memset( &br, 0x55, sizeof(br) ); + ret = GetObjectW( brush, sizeof(br), &br ); + ok( ret == sizeof(br), "wrong size %u\n", ret ); + ok( br.lbStyle == BS_DIBPATTERN, "wrong style %u\n", br.lbStyle ); + todo_wine ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); + ok( (HGLOBAL)br.lbHatch != mem, "wrong handle %p/%p\n", (HGLOBAL)br.lbHatch, mem ); + bits = GlobalLock( mem ); + todo_wine ok( (HGLOBAL)br.lbHatch == bits || broken(!br.lbHatch), /* nt4 */ + "wrong handle %p/%p\n", (HGLOBAL)br.lbHatch, bits ); + ret = GlobalFlags( mem ); + ok( ret == 2, "wrong flags %x\n", ret ); + DeleteObject( brush ); + ret = GlobalFlags( mem ); + ok( ret == 2, "wrong flags %x\n", ret ); + + br.lbStyle = BS_DIBPATTERN8X8; + br.lbColor = DIB_RGB_COLORS; + br.lbHatch = (ULONG_PTR)mem; + brush = CreateBrushIndirect( &br ); + ok( !brush, "CreatePatternBrush succeeded\n" ); + + br.lbStyle = BS_MONOPATTERN; + br.lbColor = DIB_RGB_COLORS; + br.lbHatch = (ULONG_PTR)mem; + brush = CreateBrushIndirect( &br ); + ok( !brush, "CreatePatternBrush succeeded\n" ); + + br.lbStyle = BS_INDEXED; + br.lbColor = DIB_RGB_COLORS; + br.lbHatch = (ULONG_PTR)mem; + brush = CreateBrushIndirect( &br ); + ok( !brush, "CreatePatternBrush succeeded\n" ); + + GlobalFree( mem ); +} + START_TEST(brush) { test_solidbrush(); + test_pattern_brush(); }

1 0

Hans Leidekker : jscript: Add a version resource.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: ed4143b912eb69406a0731b26dbeae6f010be07c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed4143b912eb69406a0731b26… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 1 11:09:02 2011 +0100 jscript: Add a version resource. --- dlls/jscript/jscript.rc | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript.rc b/dlls/jscript/jscript.rc index 630b0ce..d1c510e 100644 --- a/dlls/jscript/jscript.rc +++ b/dlls/jscript/jscript.rc @@ -55,3 +55,12 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: jscript.rgs */ 2 WINE_REGISTRY jscript.rgs + +#define WINE_FILEDESCRIPTION_STR "Wine JScript" +#define WINE_FILENAME_STR "jscript.dll" +#define WINE_FILEVERSION 5,7,7601,16982 +#define WINE_FILEVERSION_STR "5.8.7601.16982" +#define WINE_PRODUCTVERSION 5,8,7601,16982 +#define WINE_PRODUCTVERSION_STR "5.8.7601.16982" + +#include "wine/wine_common_ver.rc"

1 0

Hans Leidekker : vbscript: Add a version resource.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: 3b9df46e0373d18ca8c4ccbea2b852735c7bd6e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b9df46e0373d18ca8c4ccbea… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 1 11:08:45 2011 +0100 vbscript: Add a version resource. --- dlls/vbscript/vbscript.rc | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/vbscript.rc b/dlls/vbscript/vbscript.rc index 311804f..346f2bd 100644 --- a/dlls/vbscript/vbscript.rc +++ b/dlls/vbscript/vbscript.rc @@ -22,3 +22,12 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: vbscript.rgs */ 2 WINE_REGISTRY vbscript.rgs + +#define WINE_FILEDESCRIPTION_STR "Wine VBScript" +#define WINE_FILENAME_STR "vbscript.dll" +#define WINE_FILEVERSION 5,8,7601,16978 +#define WINE_FILEVERSION_STR "5.8.7601.16978" +#define WINE_PRODUCTVERSION 5,8,0,16978 +#define WINE_PRODUCTVERSION_STR "5.8.7601.16978" + +#include "wine/wine_common_ver.rc"

1 0

Hans Leidekker : msi: Set the ComputerName property.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: 5266f34c3c36518459e4dfe380fe6fc8e5db853c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5266f34c3c36518459e4dfe38… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 1 11:07:45 2011 +0100 msi: Set the ComputerName property. --- dlls/msi/package.c | 18 ++++++++++++++---- dlls/msi/tests/package.c | 5 +++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 8ec6889..c265cca 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -751,14 +751,13 @@ static VOID set_installer_properties(MSIPACKAGE *package) static const WCHAR szNetHoodFolder[] = {'N','e','t','H','o','o','d','F','o','l','d','e','r',0}; static const WCHAR szPrintHoodFolder[] = {'P','r','i','n','t','H','o','o','d','F','o','l','d','e','r',0}; static const WCHAR szRecentFolder[] = {'R','e','c','e','n','t','F','o','l','d','e','r',0}; + static const WCHAR szComputerName[] = {'C','o','m','p','u','t','e','r','N','a','m','e',0}; /* * Other things that probably should be set: * - * ComputerName VirtualMemory - * ShellAdvSupport DefaultUIFont PackagecodeChanging - * CaptionHeight BorderTop BorderSide TextHeight - * RedirectedDllSupport + * VirtualMemory ShellAdvSupport DefaultUIFont PackagecodeChanging + * CaptionHeight BorderTop BorderSide TextHeight RedirectedDllSupport */ SHGetFolderPathW(NULL, CSIDL_COMMON_APPDATA, NULL, 0, pth); @@ -1014,6 +1013,17 @@ static VOID set_installer_properties(MSIPACKAGE *package) msi_free( username ); } } + len = 0; + if (!GetComputerNameW( NULL, &len ) && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + WCHAR *computername; + if ((computername = msi_alloc( len * sizeof(WCHAR) ))) + { + if (GetComputerNameW( computername, &len )) + msi_set_property( package->db, szComputerName, computername ); + msi_free( computername ); + } + } } static UINT msi_load_summary_properties( MSIPACKAGE *package ) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 04c3fe7..9fae1d9 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -10103,6 +10103,11 @@ static void test_installprops(void) ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); trace("PackageCode = %s\n", buf); + size = MAX_PATH; + r = MsiGetProperty(hpkg, "ComputerName", buf, &size); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r); + trace("ComputerName = %s\n", buf); + langid = GetUserDefaultLangID(); sprintf(path, "%d", langid);

1 0

Hans Leidekker : msi: Handle some more message types in MSI_ProcessMessage.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: 936c14f87fe32e09f89d97d2708a2971e0f6176d URL: http://source.winehq.org/git/wine.git/?a=commit;h=936c14f87fe32e09f89d97d27… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 1 11:07:21 2011 +0100 msi: Handle some more message types in MSI_ProcessMessage. --- dlls/msi/package.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index bd8a8d2..8ec6889 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1752,6 +1752,8 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC TRACE("%x\n", eMessageType); + if ((eMessageType & 0xff000000) == INSTALLMESSAGE_FATALEXIT) + log_type |= INSTALLLOGMODE_FATALEXIT; if ((eMessageType & 0xff000000) == INSTALLMESSAGE_ERROR) log_type |= INSTALLLOGMODE_ERROR; if ((eMessageType & 0xff000000) == INSTALLMESSAGE_WARNING) @@ -1760,6 +1762,10 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC log_type |= INSTALLLOGMODE_USER; if ((eMessageType & 0xff000000) == INSTALLMESSAGE_INFO) log_type |= INSTALLLOGMODE_INFO; + if ((eMessageType & 0xff000000) == INSTALLMESSAGE_RESOLVESOURCE) + log_type |= INSTALLLOGMODE_RESOLVESOURCE; + if ((eMessageType & 0xff000000) == INSTALLMESSAGE_OUTOFDISKSPACE) + log_type |= INSTALLLOGMODE_OUTOFDISKSPACE; if ((eMessageType & 0xff000000) == INSTALLMESSAGE_COMMONDATA) log_type |= INSTALLLOGMODE_COMMONDATA; if ((eMessageType & 0xff000000) == INSTALLMESSAGE_ACTIONSTART) @@ -1768,6 +1774,12 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC log_type |= INSTALLLOGMODE_ACTIONDATA; if ((eMessageType & 0xff000000) == INSTALLMESSAGE_PROGRESS) log_type |= INSTALLLOGMODE_PROGRESS; + if ((eMessageType & 0xff000000) == INSTALLMESSAGE_INITIALIZE) + log_type |= INSTALLLOGMODE_INITIALIZE; + if ((eMessageType & 0xff000000) == INSTALLMESSAGE_TERMINATE) + log_type |= INSTALLLOGMODE_TERMINATE; + if ((eMessageType & 0xff000000) == INSTALLMESSAGE_SHOWDIALOG) + log_type |= INSTALLLOGMODE_SHOWDIALOG; if ((eMessageType & 0xff000000) == INSTALLMESSAGE_ACTIONSTART) {

1 0

Hans Leidekker : msi: Fix the log mode for progress messages.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: 899e85ab26448f984012e48d45577e08a2e7db91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=899e85ab26448f984012e48d4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 1 11:06:46 2011 +0100 msi: Fix the log mode for progress messages. --- dlls/msi/package.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 4b59425..bd8a8d2 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1766,9 +1766,8 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC log_type |= INSTALLLOGMODE_ACTIONSTART; if ((eMessageType & 0xff000000) == INSTALLMESSAGE_ACTIONDATA) log_type |= INSTALLLOGMODE_ACTIONDATA; - /* just a guess */ if ((eMessageType & 0xff000000) == INSTALLMESSAGE_PROGRESS) - log_type |= 0x800; + log_type |= INSTALLLOGMODE_PROGRESS; if ((eMessageType & 0xff000000) == INSTALLMESSAGE_ACTIONSTART) {

1 0

Alistair Leslie-Hughes : shell32: Release site pointer.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: be1a6d8323862d61dc8e2dc876f6f522e7bca76f URL: http://source.winehq.org/git/wine.git/?a=commit;h=be1a6d8323862d61dc8e2dc87… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 1 14:29:28 2011 +1100 shell32: Release site pointer. --- dlls/shell32/shelllink.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 7d97f97..bb246e3 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -2630,6 +2630,10 @@ ShellLink_SetSite( IObjectWithSite *iface, IUnknown *punk ) if ( punk ) IUnknown_AddRef( punk ); + + if( This->site ) + IUnknown_Release( This->site ); + This->site = punk; return S_OK;

1 0

Alexandre Julliard : winefile: Convert dialogs to po files.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: 1ce7b7a54c33de51f426042f3af44be3761f0f1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ce7b7a54c33de51f426042f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 1 12:10:10 2011 +0100 winefile: Convert dialogs to po files. --- po/ar.po | 113 +++++++++++++++++++++++++-- po/bg.po | 118 +++++++++++++++++++++++++++-- po/ca.po | 124 ++++++++++++++++++++++++++++-- po/cs.po | 118 +++++++++++++++++++++++++++-- po/da.po | 112 ++++++++++++++++++++++++--- po/de.po | 105 ++++++++++++++++++++++++-- po/el.po | 109 +++++++++++++++++++++++++-- po/en.po | 105 ++++++++++++++++++++++++-- po/en_US.po | 105 ++++++++++++++++++++++++-- po/eo.po | 121 +++++++++++++++++++++++++++-- po/es.po | 105 ++++++++++++++++++++++++-- po/fa.po | 113 +++++++++++++++++++++++++-- po/fi.po | 123 ++++++++++++++++++++++++++++-- po/fr.po | 105 ++++++++++++++++++++++++-- po/he.po | 105 ++++++++++++++++++++++++-- po/hi.po | 107 ++++++++++++++++++++++++-- po/hu.po | 124 ++++++++++++++++++++++++++++-- po/it.po | 105 ++++++++++++++++++++++++-- po/ja.po | 105 ++++++++++++++++++++++++-- po/ko.po | 105 ++++++++++++++++++++++++-- po/lt.po | 105 ++++++++++++++++++++++++-- po/ml.po | 107 ++++++++++++++++++++++++-- po/nb_NO.po | 112 ++++++++++++++++++++++++--- po/nl.po | 105 ++++++++++++++++++++++++-- po/or.po | 107 ++++++++++++++++++++++++-- po/pa.po | 107 ++++++++++++++++++++++++-- po/pl.po | 105 ++++++++++++++++++++++++-- po/pt_BR.po | 105 ++++++++++++++++++++++++-- po/pt_PT.po | 105 ++++++++++++++++++++++++-- po/rm.po | 108 ++++++++++++++++++++++++-- po/ro.po | 105 ++++++++++++++++++++++++-- po/ru.po | 105 ++++++++++++++++++++++++-- po/sk.po | 123 ++++++++++++++++++++++++++++-- po/sl.po | 105 ++++++++++++++++++++++++-- po/sr_RS(a)cyrillic.po | 129 +++++++++++++++++++++++++++++-- po/sr_RS(a)latin.po | 137 +++++++++++++++++++++++++++++++-- po/sv.po | 105 ++++++++++++++++++++++++-- po/te.po | 107 ++++++++++++++++++++++++-- po/th.po | 114 ++++++++++++++++++++++++++-- po/tr.po | 112 ++++++++++++++++++++++++--- po/uk.po | 105 ++++++++++++++++++++++++-- po/wa.po | 114 ++++++++++++++++++++++++++-- po/wine.pot | 105 ++++++++++++++++++++++++-- po/zh_CN.po | 121 +++++++++++++++++++++++++++-- po/zh_TW.po | 125 ++++++++++++++++++++++++++++-- programs/winefile/Cs.rc | 43 ---------- programs/winefile/Da.rc | 89 --------------------- programs/winefile/De.rc | 93 ---------------------- programs/winefile/En.rc | 65 ---------------- programs/winefile/Es.rc | 89 --------------------- programs/winefile/Fr.rc | 95 ----------------------- programs/winefile/He.rc | 97 ----------------------- programs/winefile/It.rc | 96 ----------------------- programs/winefile/Ja.rc | 94 ---------------------- programs/winefile/Ko.rc | 95 ----------------------- programs/winefile/Lt.rc | 92 ---------------------- programs/winefile/Makefile.in | 20 ----- programs/winefile/Nl.rc | 90 --------------------- programs/winefile/No.rc | 89 --------------------- programs/winefile/Pl.rc | 92 ---------------------- programs/winefile/Pt.rc | 171 ----------------------------------------- programs/winefile/Ro.rc | 94 ---------------------- programs/winefile/Ru.rc | 92 ---------------------- programs/winefile/Si.rc | 91 ---------------------- programs/winefile/Sv.rc | 91 ---------------------- programs/winefile/Tr.rc | 89 --------------------- programs/winefile/Uk.rc | 95 ----------------------- programs/winefile/winefile.rc | 65 ++++++++++++++++ 68 files changed, 4782 insertions(+), 2250 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ce7b7a54c33de51f4260…

1 0

Alexandre Julliard : wordpad: Convert dialogs to po files.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: c4ed97d70b452c626fa91c6df1071280e351c932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4ed97d70b452c626fa91c6df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 1 11:52:09 2011 +0100 wordpad: Convert dialogs to po files. --- po/ar.po | 103 +++++++++++++++++++++---- po/bg.po | 107 ++++++++++++++++++++++---- po/ca.po | 106 ++++++++++++++++++++++---- po/cs.po | 109 ++++++++++++++++++++++---- po/da.po | 106 ++++++++++++++++++++------ po/de.po | 96 ++++++++++++++++++++---- po/el.po | 98 ++++++++++++++++++++---- po/en.po | 96 ++++++++++++++++++++---- po/en_US.po | 96 ++++++++++++++++++++---- po/eo.po | 106 ++++++++++++++++++++++---- po/es.po | 110 +++++++++++++++++++++++---- po/fa.po | 103 +++++++++++++++++++++---- po/fi.po | 108 ++++++++++++++++++++++---- po/fr.po | 96 ++++++++++++++++++++---- po/he.po | 96 ++++++++++++++++++++---- po/hi.po | 96 ++++++++++++++++++++---- po/hu.po | 113 +++++++++++++++++++++++---- po/it.po | 96 ++++++++++++++++++++---- po/ja.po | 96 ++++++++++++++++++++---- po/ko.po | 96 ++++++++++++++++++++---- po/lt.po | 96 ++++++++++++++++++++---- po/ml.po | 96 ++++++++++++++++++++---- po/nb_NO.po | 99 ++++++++++++++++++++---- po/nl.po | 99 ++++++++++++++++++++---- po/or.po | 96 ++++++++++++++++++++---- po/pa.po | 96 ++++++++++++++++++++---- po/pl.po | 96 ++++++++++++++++++++---- po/pt_BR.po | 106 ++++++++++++++++++++------ po/pt_PT.po | 106 ++++++++++++++++++++------ po/rm.po | 99 +++++++++++++++++++++---- po/ro.po | 106 ++++++++++++++++++++------ po/ru.po | 96 ++++++++++++++++++++---- po/sk.po | 98 ++++++++++++++++++++---- po/sl.po | 99 ++++++++++++++++++++---- po/sr_RS(a)cyrillic.po | 108 ++++++++++++++++++++++---- po/sr_RS(a)latin.po | 110 +++++++++++++++++++++++---- po/sv.po | 99 ++++++++++++++++++++---- po/te.po | 96 ++++++++++++++++++++---- po/th.po | 101 +++++++++++++++++++++---- po/tr.po | 113 +++++++++++++++++++++++---- po/uk.po | 96 ++++++++++++++++++++---- po/wa.po | 102 +++++++++++++++++++++---- po/wine.pot | 96 ++++++++++++++++++++---- po/zh_CN.po | 106 ++++++++++++++++++++------ po/zh_TW.po | 108 +++++++++++++++++++++------ programs/wordpad/Da.rc | 95 ----------------------- programs/wordpad/De.rc | 94 ----------------------- programs/wordpad/En.rc | 71 ----------------- programs/wordpad/Fr.rc | 96 ----------------------- programs/wordpad/He.rc | 100 ------------------------ programs/wordpad/It.rc | 96 ----------------------- programs/wordpad/Ja.rc | 95 ----------------------- programs/wordpad/Ko.rc | 95 ----------------------- programs/wordpad/Lt.rc | 95 ----------------------- programs/wordpad/Makefile.in | 18 ----- programs/wordpad/Nl.rc | 95 ----------------------- programs/wordpad/No.rc | 94 ----------------------- programs/wordpad/Pl.rc | 94 ----------------------- programs/wordpad/Pt.rc | 97 ------------------------ programs/wordpad/Ro.rc | 96 ----------------------- programs/wordpad/Ru.rc | 95 ----------------------- programs/wordpad/Si.rc | 94 ----------------------- programs/wordpad/Sv.rc | 94 ----------------------- programs/wordpad/Uk.rc | 99 ------------------------ programs/wordpad/Zh.rc | 171 ------------------------------------------ programs/wordpad/wordpad.rc | 71 +++++++++++++++++ 66 files changed, 3875 insertions(+), 2636 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c4ed97d70b452c626fa91…

1 0

← Newer
1
...
79
80
81
82
83
84
85
86
Older →

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 November 2011