November 2011 - Wine-Commits

Alexandre Julliard : gdi32: Sanitize the DIB information for DIB pattern brushes.
by Alexandre Julliard Nov. 2, 2011

Nov. 2, 2011

Module: wine Branch: master Commit: 7f7dd82c7b2dae9bd11a299ba9a19ff2f73a6178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f7dd82c7b2dae9bd11a299ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 2 12:22:44 2011 +0100 gdi32: Sanitize the DIB information for DIB pattern brushes. --- dlls/gdi32/brush.c | 21 +++------------------ dlls/gdi32/dib.c | 17 +++++++++++++++++ dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/tests/brush.c | 10 ++++++++++ 4 files changed, 31 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 222ba42..45874af 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -53,21 +53,6 @@ static const struct gdi_obj_funcs brush_funcs = BRUSH_DeleteObject /* pDeleteObject */ }; -static void *dib_copy(const BITMAPINFO *info, UINT coloruse) -{ - BITMAPINFO *newInfo; - INT size; - - if (info->bmiHeader.biCompression != BI_RGB && info->bmiHeader.biCompression != BI_BITFIELDS) - size = info->bmiHeader.biSizeImage; - else - size = get_dib_image_size(info); - size += bitmap_info_size( info, coloruse ); - - if ((newInfo = HeapAlloc( GetProcessHeap(), 0, size ))) memcpy( newInfo, info, size ); - return newInfo; -} - /*********************************************************************** * CreateBrushIndirect (GDI32.@) @@ -117,8 +102,8 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) case BS_DIBPATTERNPT: ptr->logbrush.lbStyle = BS_DIBPATTERN; - ptr->logbrush.lbHatch = (ULONG_PTR)dib_copy( (BITMAPINFO *) ptr->logbrush.lbHatch, - ptr->logbrush.lbColor); + ptr->logbrush.lbHatch = (ULONG_PTR)copy_packed_dib( (BITMAPINFO *) ptr->logbrush.lbHatch, + ptr->logbrush.lbColor ); if (!ptr->logbrush.lbHatch) goto error; break; @@ -129,7 +114,7 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) ptr->logbrush.lbStyle = BS_DIBPATTERN; if (!(bmi = GlobalLock( h ))) goto error; - ptr->logbrush.lbHatch = (ULONG_PTR)dib_copy( bmi, ptr->logbrush.lbColor); + ptr->logbrush.lbHatch = (ULONG_PTR)copy_packed_dib( bmi, ptr->logbrush.lbColor ); GlobalUnlock( h ); if (!ptr->logbrush.lbHatch) goto error; break; diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 7cc24a6..b9f9f3b 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1113,6 +1113,23 @@ void get_ddb_bitmapinfo( BITMAPOBJ *bmp, BITMAPINFO *info ) if (info->bmiHeader.biBitCount <= 8) fill_default_color_table( info ); } +BITMAPINFO *copy_packed_dib( const BITMAPINFO *src_info, UINT usage ) +{ + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *ret, *info = (BITMAPINFO *)buffer; + int info_size, image_size; + + if (!bitmapinfo_from_user_bitmapinfo( info, src_info, usage, FALSE )) return NULL; + + info_size = bitmap_info_size( info, usage ); + image_size = get_dib_image_size( info ); + if ((ret = HeapAlloc( GetProcessHeap(), 0, info_size + image_size ))) + { + memcpy( ret, info, info_size ); + memcpy( (char *)ret + info_size, (char *)src_info + bitmap_info_size(src_info,usage), image_size ); + } + return ret; +} /****************************************************************************** * GetDIBits [GDI32.@] diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 9ecb3b1..ddeb0bd 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -230,6 +230,7 @@ extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src /* bitmap.c */ extern void get_ddb_bitmapinfo( BITMAPOBJ *bmp, BITMAPINFO *info ) DECLSPEC_HIDDEN; +extern BITMAPINFO *copy_packed_dib( const BITMAPINFO *src_info, UINT usage ) DECLSPEC_HIDDEN; extern BOOL get_bitmap_image( HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; extern HBITMAP BITMAP_CopyBitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index 3742608..a02209f 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -192,6 +192,16 @@ static void test_pattern_brush(void) ret = GlobalFlags( mem ); ok( ret == 2, "wrong flags %x\n", ret ); + info->bmiHeader.biBitCount = 8; + info->bmiHeader.biCompression = BI_RLE8; + brush = CreateDIBPatternBrushPt( info, DIB_RGB_COLORS ); + ok( !brush, "CreateDIBPatternBrushPt succeeded\n" ); + + info->bmiHeader.biBitCount = 4; + info->bmiHeader.biCompression = BI_RLE4; + brush = CreateDIBPatternBrushPt( info, DIB_RGB_COLORS ); + ok( !brush, "CreateDIBPatternBrushPt succeeded\n" ); + br.lbStyle = BS_DIBPATTERN8X8; br.lbColor = DIB_RGB_COLORS; br.lbHatch = (ULONG_PTR)mem;

1 0

Alexandre Julliard : gdi32: Store a pointer instead of a global handle for DIB pattern brushes.
by Alexandre Julliard Nov. 2, 2011

Nov. 2, 2011

Module: wine Branch: master Commit: 6bf6575c5c2f1b5181b6f33c299a77ac3de5fd90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bf6575c5c2f1b5181b6f33c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 2 12:02:27 2011 +0100 gdi32: Store a pointer instead of a global handle for DIB pattern brushes. --- dlls/gdi32/brush.c | 17 +++++------------ dlls/gdi32/dibdrv/objects.c | 4 +--- dlls/gdi32/enhmfdrv/objects.c | 3 +-- dlls/gdi32/mfdrv/objects.c | 4 +--- dlls/wineps.drv/brush.c | 3 +-- dlls/winex11.drv/brush.c | 6 ++---- 6 files changed, 11 insertions(+), 26 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 0beda64..222ba42 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -53,10 +53,9 @@ static const struct gdi_obj_funcs brush_funcs = BRUSH_DeleteObject /* pDeleteObject */ }; -static HGLOBAL dib_copy(const BITMAPINFO *info, UINT coloruse) +static void *dib_copy(const BITMAPINFO *info, UINT coloruse) { BITMAPINFO *newInfo; - HGLOBAL hmem; INT size; if (info->bmiHeader.biCompression != BI_RGB && info->bmiHeader.biCompression != BI_BITFIELDS) @@ -65,14 +64,8 @@ static HGLOBAL dib_copy(const BITMAPINFO *info, UINT coloruse) size = get_dib_image_size(info); size += bitmap_info_size( info, coloruse ); - if (!(hmem = GlobalAlloc( GMEM_MOVEABLE, size ))) - { - return 0; - } - newInfo = GlobalLock( hmem ); - memcpy( newInfo, info, size ); - GlobalUnlock( hmem ); - return hmem; + if ((newInfo = HeapAlloc( GetProcessHeap(), 0, size ))) memcpy( newInfo, info, size ); + return newInfo; } @@ -162,7 +155,7 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) if (ptr->logbrush.lbStyle == BS_PATTERN) DeleteObject( (HGDIOBJ)ptr->logbrush.lbHatch ); else if (ptr->logbrush.lbStyle == BS_DIBPATTERN) - GlobalFree( (HGLOBAL)ptr->logbrush.lbHatch ); + HeapFree( GetProcessHeap(), 0, (void *)ptr->logbrush.lbHatch ); } HeapFree( GetProcessHeap(), 0, ptr ); return 0; @@ -439,7 +432,7 @@ static BOOL BRUSH_DeleteObject( HGDIOBJ handle ) DeleteObject( (HGDIOBJ)brush->logbrush.lbHatch ); break; case BS_DIBPATTERN: - GlobalFree( (HGLOBAL)brush->logbrush.lbHatch ); + HeapFree( GetProcessHeap(), 0, (void *)brush->logbrush.lbHatch ); break; } return HeapFree( GetProcessHeap(), 0, brush ); diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 8d84284..6c2469ab 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1372,13 +1372,12 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) case BS_DIBPATTERN: { - BITMAPINFOHEADER *bi = GlobalLock((HGLOBAL)logbrush.lbHatch); + BITMAPINFOHEADER *bi = (BITMAPINFOHEADER *)logbrush.lbHatch; dib_info orig_dib; WORD usage = LOWORD(logbrush.lbColor); HPALETTE pal = (usage == DIB_PAL_COLORS) ? GetCurrentObject(dev->hdc, OBJ_PAL) : NULL; RECT rect; - if(!bi) return NULL; if(init_dib_info_from_packed(&orig_dib, bi, usage, pal)) { copy_dib_color_info(&pdev->brush_dib, &pdev->dib); @@ -1402,7 +1401,6 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) pdev->defer &= ~DEFER_BRUSH; free_dib_info(&orig_dib); } - GlobalUnlock((HGLOBAL)logbrush.lbHatch); break; } diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index 4e1fa7e..0580700 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -136,7 +136,7 @@ DWORD EMFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) { EMRCREATEDIBPATTERNBRUSHPT *emr; DWORD bmSize, biSize, size; - BITMAPINFO *info = GlobalLock( (HGLOBAL)logbrush.lbHatch ); + BITMAPINFO *info = (BITMAPINFO *)logbrush.lbHatch; if (info->bmiHeader.biCompression) bmSize = info->bmiHeader.biSizeImage; @@ -160,7 +160,6 @@ DWORD EMFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) if(!EMFDRV_WriteRecord( dev, &emr->emr )) index = 0; HeapFree( GetProcessHeap(), 0, emr ); - GlobalUnlock( (HGLOBAL)logbrush.lbHatch ); } break; diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c index 150fb22..ef0988b 100644 --- a/dlls/gdi32/mfdrv/objects.c +++ b/dlls/gdi32/mfdrv/objects.c @@ -232,10 +232,9 @@ INT16 MFDRV_CreateBrushIndirect(PHYSDEV dev, HBRUSH hBrush ) case BS_DIBPATTERN: { - BITMAPINFO *info; + BITMAPINFO *info = (BITMAPINFO *)logbrush.lbHatch; DWORD bmSize, biSize; - info = GlobalLock( (HGLOBAL)logbrush.lbHatch ); if (info->bmiHeader.biCompression) bmSize = info->bmiHeader.biSizeImage; else @@ -253,7 +252,6 @@ INT16 MFDRV_CreateBrushIndirect(PHYSDEV dev, HBRUSH hBrush ) *(mr->rdParm) = logbrush.lbStyle; *(mr->rdParm + 1) = LOWORD(logbrush.lbColor); memcpy(mr->rdParm + 2, info, biSize + bmSize); - GlobalUnlock( (HGLOBAL)logbrush.lbHatch ); break; } default: diff --git a/dlls/wineps.drv/brush.c b/dlls/wineps.drv/brush.c index 1e42c1f..9401746 100644 --- a/dlls/wineps.drv/brush.c +++ b/dlls/wineps.drv/brush.c @@ -255,7 +255,7 @@ BOOL PSDRV_Brush(PHYSDEV dev, BOOL EO) case BS_DIBPATTERN: { - BITMAPINFO *bmi = GlobalLock( (HGLOBAL)logbrush.lbHatch ); + BITMAPINFO *bmi = (BITMAPINFO *)logbrush.lbHatch; UINT usage = logbrush.lbColor; TRACE("size %dx%dx%d\n", bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight, bmi->bmiHeader.biBitCount); @@ -268,7 +268,6 @@ BOOL PSDRV_Brush(PHYSDEV dev, BOOL EO) FIXME("Trying to set a pattern brush on a level 1 printer\n"); ret = FALSE; } - GlobalUnlock( (HGLOBAL)logbrush.lbHatch ); } break; diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index d0fdb8d..a3c7f28 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -254,11 +254,10 @@ static BOOL BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap ) /*********************************************************************** * BRUSH_SelectDIBPatternBrush */ -static BOOL BRUSH_SelectDIBPatternBrush( X11DRV_PDEVICE *physDev, HGLOBAL mem ) +static BOOL BRUSH_SelectDIBPatternBrush( X11DRV_PDEVICE *physDev, const BITMAPINFO *info ) { BOOL ret; HDC memdc; - BITMAPINFO *info = GlobalLock( mem ); HBITMAP bitmap = CreateDIBitmap( physDev->dev.hdc, &info->bmiHeader, CBM_INIT, (LPBYTE)info + bitmap_info_size( info, DIB_RGB_COLORS ), info, DIB_RGB_COLORS ); @@ -274,7 +273,6 @@ static BOOL BRUSH_SelectDIBPatternBrush( X11DRV_PDEVICE *physDev, HGLOBAL mem ) physBitmap->pixmap = 0; /* so it doesn't get freed */ } DeleteObject( bitmap ); - GlobalUnlock( mem ); return ret; } @@ -330,7 +328,7 @@ HBRUSH X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) case BS_DIBPATTERN: TRACE("BS_DIBPATTERN\n"); - if (!BRUSH_SelectDIBPatternBrush( physDev, (HGLOBAL)logbrush.lbHatch )) return 0; + if (!BRUSH_SelectDIBPatternBrush( physDev, (BITMAPINFO *)logbrush.lbHatch )) return 0; break; } return hbrush;

1 0

André Hentschel : winebuild: Use ARMv7 for wine modules.
by Alexandre Julliard Nov. 2, 2011

Nov. 2, 2011

Module: wine Branch: master Commit: 6f84e89d2dbb7fb18e921fa82782d200a242880b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f84e89d2dbb7fb18e921fa82… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 1 16:41:11 2011 +0100 winebuild: Use ARMv7 for wine modules. --- tools/winebuild/spec32.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 2cfeb99..1e5c694 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -36,7 +36,7 @@ #define IMAGE_FILE_MACHINE_I386 0x014c #define IMAGE_FILE_MACHINE_POWERPC 0x01f0 #define IMAGE_FILE_MACHINE_AMD64 0x8664 -#define IMAGE_FILE_MACHINE_ARM 0x01C0 +#define IMAGE_FILE_MACHINE_ARMV7 0x01C4 /* Wine extension */ #define IMAGE_FILE_MACHINE_SPARC 0x2000 @@ -480,7 +480,7 @@ void output_module( DLLSPEC *spec ) { case CPU_x86: machine = IMAGE_FILE_MACHINE_I386; break; case CPU_x86_64: machine = IMAGE_FILE_MACHINE_AMD64; break; - case CPU_ARM: machine = IMAGE_FILE_MACHINE_ARM; break; + case CPU_ARM: machine = IMAGE_FILE_MACHINE_ARMV7; break; case CPU_POWERPC: machine = IMAGE_FILE_MACHINE_POWERPC; break; case CPU_SPARC: machine = IMAGE_FILE_MACHINE_SPARC; break; } @@ -669,7 +669,7 @@ void output_fake_module( DLLSPEC *spec ) case CPU_x86_64: put_word( IMAGE_FILE_MACHINE_AMD64 ); break; case CPU_POWERPC: put_word( IMAGE_FILE_MACHINE_POWERPC ); break; case CPU_SPARC: put_word( IMAGE_FILE_MACHINE_SPARC ); break; - case CPU_ARM: put_word( IMAGE_FILE_MACHINE_ARM ); break; + case CPU_ARM: put_word( IMAGE_FILE_MACHINE_ARMV7 ); break; } put_word( nb_sections ); /* NumberOfSections */ put_dword( 0 ); /* TimeDateStamp */

1 0

Alexandre Julliard : wineps: Fix a couple of typos in the path painting function.
by Alexandre Julliard Nov. 2, 2011

Nov. 2, 2011

Module: wine Branch: master Commit: 2cf3975dfca3c1fca918ca8c09890d38614ca274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cf3975dfca3c1fca918ca8c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 1 21:10:13 2011 +0100 wineps: Fix a couple of typos in the path painting function. Thanks to Octavian Voicu. --- dlls/wineps.drv/graphics.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/graphics.c b/dlls/wineps.drv/graphics.c index 3459fe1..41f6e91 100644 --- a/dlls/wineps.drv/graphics.c +++ b/dlls/wineps.drv/graphics.c @@ -540,11 +540,11 @@ static BOOL paint_path( PHYSDEV dev, BOOL stroke, BOOL fill ) if (!points || !types) goto done; if (GetPath( dev->hdc, points, types, size ) == -1) goto done; - if (fill) PSDRV_SetPen(dev); + if (stroke) PSDRV_SetPen(dev); PSDRV_SetClip(dev); for (i = 0; i < size; i++) { - switch (types[i] & ~PT_CLOSEFIGURE) + switch (types[i]) { case PT_MOVETO: PSDRV_WriteMoveTo( dev, points[i].x, points[i].y );

1 0

André Hentschel : ntdll: Try to load ARMv7 PE images on ARM.
by Alexandre Julliard Nov. 1, 2011

Nov. 1, 2011

Module: wine Branch: master Commit: 9afb206eaf359a1b35e1041df8df076cc81bb342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9afb206eaf359a1b35e1041df… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 1 16:19:16 2011 +0100 ntdll: Try to load ARMv7 PE images on ARM. --- dlls/ntdll/virtual.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 7185f14..3d75fa1 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1055,7 +1055,8 @@ static NTSTATUS check_architecture( const IMAGE_NT_HEADERS *nt ) return STATUS_INVALID_IMAGE_FORMAT; } #elif defined(__arm__) && !defined(__ARMEB__) - if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARM || + if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARMV7 || + nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARM || nt->FileHeader.Machine == IMAGE_FILE_MACHINE_THUMB) return STATUS_SUCCESS; #endif @@ -1074,6 +1075,7 @@ static NTSTATUS check_architecture( const IMAGE_NT_HEADERS *nt ) case IMAGE_FILE_MACHINE_ALPHA64: arch = "Alpha-64"; break; case IMAGE_FILE_MACHINE_AMD64: arch = "AMD-64"; break; case IMAGE_FILE_MACHINE_ARM: arch = "ARM"; break; + case IMAGE_FILE_MACHINE_ARMV7: arch = "ARMv7"; break; case IMAGE_FILE_MACHINE_THUMB: arch = "ARM Thumb"; break; case IMAGE_FILE_MACHINE_SPARC: arch = "SPARC"; break; default: arch = wine_dbg_sprintf( "Unknown-%04x", nt->FileHeader.Machine ); break;

1 0

Ken Sharp : kernel32: Update English resource.
by Alexandre Julliard Nov. 1, 2011

Nov. 1, 2011

1 0

Andrew Eikum : winecfg: Play test sound asynchronously.
by Alexandre Julliard Nov. 1, 2011

Nov. 1, 2011

Module: wine Branch: master Commit: b6169510d21f50ed3aab28ed87ba6cd26e924fc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6169510d21f50ed3aab28ed8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Nov 1 10:18:13 2011 -0500 winecfg: Play test sound asynchronously. --- programs/winecfg/audio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index f2d4fe3..944abcb 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -305,7 +305,7 @@ static void set_reg_device(HWND hDlg, int dlgitem, const WCHAR *key_name) static void test_sound(void) { - if(!PlaySoundW(MAKEINTRESOURCEW(IDW_TESTSOUND), NULL, SND_RESOURCE | SND_SYNC)){ + if(!PlaySoundW(MAKEINTRESOURCEW(IDW_TESTSOUND), NULL, SND_RESOURCE | SND_ASYNC)){ WCHAR error_str[256], title_str[256]; LoadStringW(GetModuleHandle(NULL), IDS_AUDIO_TEST_FAILED,

1 0

Alistair Leslie-Hughes : mscoree: Implement ICorDebug EnumerateProcesses.
by Alexandre Julliard Nov. 1, 2011

Nov. 1, 2011

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

André Hentschel : winedump: Add machine string for ARMv7.
by Alexandre Julliard Nov. 1, 2011

Nov. 1, 2011

Module: wine Branch: master Commit: 43e4e4746517f72b71826df4fc72420e6be92c6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=43e4e4746517f72b71826df4f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 1 16:19:24 2011 +0100 winedump: Add machine string for ARMv7. --- tools/winedump/pe.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 9690c33..f005b49 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -62,6 +62,7 @@ const char *get_machine_str(int mach) case IMAGE_FILE_MACHINE_AMD64: return "AMD64"; case IMAGE_FILE_MACHINE_IA64: return "IA64"; case IMAGE_FILE_MACHINE_ARM: return "ARM"; + case IMAGE_FILE_MACHINE_ARMV7: return "ARMv7"; case IMAGE_FILE_MACHINE_THUMB: return "ARM Thumb"; case IMAGE_FILE_MACHINE_SPARC: return "SPARC"; }

1 0

André Hentschel : kernel32/tests: Use ARMv7 for PE images.
by Alexandre Julliard Nov. 1, 2011

Nov. 1, 2011

Module: wine Branch: master Commit: 8f369c9edbed2a6f48a66f1b883163042c65228e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f369c9edbed2a6f48a66f1b8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 1 16:18:52 2011 +0100 kernel32/tests: Use ARMv7 for PE images. --- dlls/kernel32/tests/file.c | 2 +- dlls/kernel32/tests/loader.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index a720d52..f2a9a07 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1758,7 +1758,7 @@ static BOOL create_fake_dll( LPCSTR filename ) #elif defined __sparc__ nt->FileHeader.Machine = IMAGE_FILE_MACHINE_SPARC; #elif defined __arm__ - nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARM; + nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARMV7; #else # error You must specify the machine type #endif diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index c740d77..4d420ea 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -57,7 +57,7 @@ static IMAGE_NT_HEADERS nt_header = #elif defined __sparc__ IMAGE_FILE_MACHINE_SPARC, /* Machine */ #elif defined __arm__ - IMAGE_FILE_MACHINE_ARM, /* Machine */ + IMAGE_FILE_MACHINE_ARMV7, /* Machine */ #else # error You must specify the machine type #endif

1 0