January 2009 - Wine-commits

Aric Stewart : wine.inf: Add reg. exe as a stub to system32 now that it does something.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: 648094f1191408877ebcef3345900de3d7b6167d URL: http://source.winehq.org/git/wine.git/?a=commit;h=648094f1191408877ebcef334… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jan 28 09:21:42 2009 -0600 wine.inf: Add reg.exe as a stub to system32 now that it does something. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 5470c02..3bf399e 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2291,6 +2291,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,psapi.dll 11,,quartz.dll 11,,regsvr32.exe +11,,reg.exe 11,,riched20.dll 11,,riched32.dll 11,,rpcrt4.dll

1 0

Alexandre Julliard : ntdll: Convert the DbgPrint* functions to use MS ABI varargs.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: f8313855e420248d819d9e9aaa5fc84dc9a4c1d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8313855e420248d819d9e9aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 28 19:17:34 2009 +0100 ntdll: Convert the DbgPrint* functions to use MS ABI varargs. --- dlls/ntdll/ntdll_misc.h | 3 +++ dlls/ntdll/rtl.c | 20 ++++++++++---------- include/winternl.h | 4 ++-- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 306b36d..1d56da8 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -156,6 +156,9 @@ extern int ntdll_umbstowcs(DWORD flags, const char* src, int srclen, WCHAR* dst, extern int ntdll_wcstoumbs(DWORD flags, const WCHAR* src, int srclen, char* dst, int dstlen, const char* defchar, int *used ); +extern int CDECL NTDLL__vsnprintf( char *str, SIZE_T len, const char *format, __ms_va_list args ); +extern int CDECL NTDLL__vsnwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, __ms_va_list args ); + /* load order */ enum loadorder diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index f84c7c4..602bfad 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -303,11 +303,11 @@ void WINAPI RtlDumpResource(LPRTL_RWLOCK rwl) NTSTATUS WINAPIV DbgPrint(LPCSTR fmt, ...) { char buf[512]; - va_list args; + __ms_va_list args; - va_start(args, fmt); - vsprintf(buf,fmt, args); - va_end(args); + __ms_va_start(args, fmt); + NTDLL__vsnprintf(buf, sizeof(buf), fmt, args); + __ms_va_end(args); MESSAGE("DbgPrint says: %s",buf); /* hmm, raise exception? */ @@ -321,18 +321,18 @@ NTSTATUS WINAPIV DbgPrint(LPCSTR fmt, ...) NTSTATUS WINAPIV DbgPrintEx(ULONG iComponentId, ULONG Level, LPCSTR fmt, ...) { NTSTATUS ret; - va_list args; + __ms_va_list args; - va_start(args, fmt); + __ms_va_start(args, fmt); ret = vDbgPrintEx(iComponentId, Level, fmt, args); - va_end(args); + __ms_va_end(args); return ret; } /****************************************************************************** * vDbgPrintEx [NTDLL.@] */ -NTSTATUS WINAPI vDbgPrintEx( ULONG id, ULONG level, LPCSTR fmt, va_list args ) +NTSTATUS WINAPI vDbgPrintEx( ULONG id, ULONG level, LPCSTR fmt, __ms_va_list args ) { return vDbgPrintExWithPrefix( "", id, level, fmt, args ); } @@ -340,11 +340,11 @@ NTSTATUS WINAPI vDbgPrintEx( ULONG id, ULONG level, LPCSTR fmt, va_list args ) /****************************************************************************** * vDbgPrintExWithPrefix [NTDLL.@] */ -NTSTATUS WINAPI vDbgPrintExWithPrefix( LPCSTR prefix, ULONG id, ULONG level, LPCSTR fmt, va_list args ) +NTSTATUS WINAPI vDbgPrintExWithPrefix( LPCSTR prefix, ULONG id, ULONG level, LPCSTR fmt, __ms_va_list args ) { char buf[1024]; - vsprintf(buf, fmt, args); + NTDLL__vsnprintf(buf, sizeof(buf), fmt, args); switch (level & DPFLTR_MASK) { diff --git a/include/winternl.h b/include/winternl.h index 1a11469..1af1370 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2508,8 +2508,8 @@ NTSYSAPI NTSTATUS WINAPI RtlpNtCreateKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRI NTSYSAPI NTSTATUS WINAPI RtlpNtEnumerateSubKey(HANDLE,UNICODE_STRING *, ULONG); NTSYSAPI NTSTATUS WINAPI RtlpWaitForCriticalSection(RTL_CRITICAL_SECTION *); NTSYSAPI NTSTATUS WINAPI RtlpUnWaitCriticalSection(RTL_CRITICAL_SECTION *); -NTSYSAPI NTSTATUS WINAPI vDbgPrintEx(ULONG,ULONG,LPCSTR,va_list); -NTSYSAPI NTSTATUS WINAPI vDbgPrintExWithPrefix(LPCSTR,ULONG,ULONG,LPCSTR,va_list); +NTSYSAPI NTSTATUS WINAPI vDbgPrintEx(ULONG,ULONG,LPCSTR,__ms_va_list); +NTSYSAPI NTSTATUS WINAPI vDbgPrintExWithPrefix(LPCSTR,ULONG,ULONG,LPCSTR,__ms_va_list); /* Wine internal functions */

1 0

Hans Leidekker : kernel32: Add stub implementations of Wow64DisableWow64FsRedirection and Wow64RevertWow64FsRedirection .
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: 2095ba19bb480ef6d4dfe3bde6deb503e71b2e28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2095ba19bb480ef6d4dfe3bde… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 28 15:38:53 2009 +0100 kernel32: Add stub implementations of Wow64DisableWow64FsRedirection and Wow64RevertWow64FsRedirection. --- dlls/kernel32/kernel32.spec | 2 ++ dlls/kernel32/path.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 79d1720..b0f4ee7 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1141,6 +1141,8 @@ @ stdcall WaitNamedPipeW (wstr long) @ stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr) @ stdcall WinExec(str long) +@ stdcall Wow64DisableWow64FsRedirection(ptr) +@ stdcall Wow64RevertWow64FsRedirection(ptr) @ stdcall WriteConsoleA(long ptr long ptr ptr) @ stdcall WriteConsoleInputA(long ptr long ptr) @ stub WriteConsoleInputVDMA diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index b0f2fa0..6ac919a 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1539,6 +1539,26 @@ UINT WINAPI GetSystemWow64DirectoryA( LPSTR lpBuffer, UINT uSize ) return 0; } +/*********************************************************************** + * Wow64DisableWow64FsRedirection (KERNEL32.@) + */ +BOOL WINAPI Wow64DisableWow64FsRedirection( PVOID *old_value ) +{ + FIXME("%p\n", old_value); + + if (old_value) *old_value = (void *)0xdeadbeef; + return TRUE; +} + +/*********************************************************************** + * Wow64RevertWow64FsRedirection (KERNEL32.@) + */ +BOOL WINAPI Wow64RevertWow64FsRedirection( PVOID old_value ) +{ + FIXME("%p\n", old_value); + return TRUE; +} + /*********************************************************************** * NeedCurrentDirectoryForExePathW (KERNEL32.@)

1 0

Hans Leidekker : wininet: Mark IE6 behaviour of HttpSendRequestW as broken.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: 67c38bd472a9f69bc5f10466eb388898d2b9fb04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67c38bd472a9f69bc5f10466e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 28 15:39:20 2009 +0100 wininet: Mark IE6 behaviour of HttpSendRequestW as broken. --- dlls/wininet/tests/http.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index c5321b4..5fd45d5 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1834,7 +1834,8 @@ static void test_HttpSendRequestW(int port) ret = HttpSendRequestW(req, header, ~0u, NULL, 0); error = GetLastError(); ok(!ret, "HttpSendRequestW succeeded\n"); - ok(error == ERROR_IO_PENDING, "got %u expected ERROR_IO_PENDING\n", error); + ok(error == ERROR_IO_PENDING || broken(error == ERROR_HTTP_HEADER_NOT_FOUND), /* IE6 */ + "got %u expected ERROR_IO_PENDING\n", error); InternetCloseHandle(req); InternetCloseHandle(con);

1 0

Alexandre Julliard : ntdll: Copy the msvcrt printf implementation to ntdll to allow supporting MS ABI varargs .
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: 649a576fd01ceb05ce09533f9d282acc2415eb4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=649a576fd01ceb05ce09533f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 28 19:14:13 2009 +0100 ntdll: Copy the msvcrt printf implementation to ntdll to allow supporting MS ABI varargs. --- dlls/ntdll/Makefile.in | 1 + dlls/ntdll/ntdll.spec | 12 +- dlls/ntdll/printf.c | 756 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/string.c | 46 --- dlls/ntdll/wcstring.c | 37 --- 5 files changed, 763 insertions(+), 89 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=649a576fd01ceb05ce095…

1 0

Alexandre Julliard : gdi32: Allocate and initialize GDI objects before giving them a handle.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: 311c53db4f485a5905d7fce95bcd116ca4044709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=311c53db4f485a5905d7fce95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 28 18:43:06 2009 +0100 gdi32: Allocate and initialize GDI objects before giving them a handle. This makes it unnecessary to hold the GDI lock since the object cannot be accessed before it has a handle. --- dlls/gdi32/bitmap.c | 21 ++++++++++-------- dlls/gdi32/brush.c | 21 +++++++++++++----- dlls/gdi32/dc.c | 31 ++++++++++++++++----------- dlls/gdi32/enhmetafile.c | 16 +++++++------- dlls/gdi32/font.c | 34 ++++++++++++++++------------- dlls/gdi32/gdi_private.h | 2 +- dlls/gdi32/gdiobj.c | 52 +++++++++++++-------------------------------- dlls/gdi32/metafile.c | 14 ++++++------ dlls/gdi32/palette.c | 9 +++++-- dlls/gdi32/pen.c | 16 +++++++------- dlls/gdi32/region.c | 14 ++++++++--- 11 files changed, 119 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=311c53db4f485a5905d7f…

1 0

Alexandre Julliard : gdi32: Release GDI handles before freeing the object.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: de831f334c8a2b09a96bc881f8359a6f1c766729 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de831f334c8a2b09a96bc881f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 28 18:45:21 2009 +0100 gdi32: Release GDI handles before freeing the object. This makes it unnecessary to hold the GDI lock during destruction. --- dlls/gdi32/bitmap.c | 10 +++++++--- dlls/gdi32/brush.c | 4 ++-- dlls/gdi32/dc.c | 5 ++--- dlls/gdi32/enhmetafile.c | 4 ++-- dlls/gdi32/font.c | 8 +++++--- dlls/gdi32/gdi_private.h | 2 +- dlls/gdi32/gdiobj.c | 24 ++++++++++++++---------- dlls/gdi32/metafile.c | 5 ++--- dlls/gdi32/palette.c | 4 ++-- dlls/gdi32/pen.c | 4 ++-- dlls/gdi32/region.c | 12 +++++++----- 11 files changed, 46 insertions(+), 36 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 520964d..8bb21f2 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -628,12 +628,16 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) */ static BOOL BITMAP_DeleteObject( HGDIOBJ handle ) { + const DC_FUNCTIONS *funcs; BITMAPOBJ *bmp = GDI_GetObjPtr( handle, OBJ_BITMAP ); if (!bmp) return FALSE; + funcs = bmp->funcs; + GDI_ReleaseObj( handle ); + + if (funcs && funcs->pDeleteBitmap) funcs->pDeleteBitmap( handle ); - if (bmp->funcs && bmp->funcs->pDeleteBitmap) - bmp->funcs->pDeleteBitmap( handle ); + if (!(bmp = free_gdi_handle( handle ))) return FALSE; HeapFree( GetProcessHeap(), 0, bmp->bitmap.bmBits ); @@ -665,7 +669,7 @@ static BOOL BITMAP_DeleteObject( HGDIOBJ handle ) } HeapFree(GetProcessHeap(), 0, bmp->color_table); } - return GDI_FreeObject( handle, bmp ); + return HeapFree( GetProcessHeap(), 0, bmp ); } diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 6b0369b..885fe88 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -416,7 +416,7 @@ static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ) */ static BOOL BRUSH_DeleteObject( HGDIOBJ handle ) { - BRUSHOBJ *brush = GDI_GetObjPtr( handle, OBJ_BRUSH ); + BRUSHOBJ *brush = free_gdi_handle( handle ); if (!brush) return FALSE; switch(brush->logbrush.lbStyle) @@ -428,7 +428,7 @@ static BOOL BRUSH_DeleteObject( HGDIOBJ handle ) GlobalFree16( (HGLOBAL16)brush->logbrush.lbHatch ); break; } - return GDI_FreeObject( handle, brush ); + return HeapFree( GetProcessHeap(), 0, brush ); } diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 5b05973..3648f64 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -163,9 +163,8 @@ DC *alloc_dc_ptr( const DC_FUNCTIONS *funcs, WORD magic ) BOOL free_dc_ptr( DC *dc ) { assert( dc->refcount == 1 ); - /* grab the gdi lock again */ - if (!GDI_GetObjPtr( dc->hSelf, 0 )) return FALSE; /* shouldn't happen */ - return GDI_FreeObject( dc->hSelf, dc ); + if (free_gdi_handle( dc->hSelf ) != dc) return FALSE; /* shouldn't happen */ + return HeapFree( GetProcessHeap(), 0, dc ); } diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index f77237b..9ca8517 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -276,7 +276,7 @@ HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, BOOL on_disk ) */ static BOOL EMF_Delete_HENHMETAFILE( HENHMETAFILE hmf ) { - ENHMETAFILEOBJ *metaObj = GDI_GetObjPtr( hmf, OBJ_ENHMETAFILE ); + ENHMETAFILEOBJ *metaObj = free_gdi_handle( hmf ); if(!metaObj) return FALSE; @@ -284,7 +284,7 @@ static BOOL EMF_Delete_HENHMETAFILE( HENHMETAFILE hmf ) UnmapViewOfFile( metaObj->emh ); else HeapFree( GetProcessHeap(), 0, metaObj->emh ); - return GDI_FreeObject( hmf, metaObj ); + return HeapFree( GetProcessHeap(), 0, metaObj ); } /****************************************************************** diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 2941f2c..409761a 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -559,10 +559,12 @@ static INT FONT_GetObjectW( HGDIOBJ handle, INT count, LPVOID buffer ) */ static BOOL FONT_DeleteObject( HGDIOBJ handle ) { - FONTOBJ *obj = GDI_GetObjPtr( handle, OBJ_FONT ); /* to grab the GDI lock (FIXME) */ - if (!obj) return FALSE; + FONTOBJ *obj; + WineEngDestroyFontInstance( handle ); - return GDI_FreeObject( handle, obj ); + + if (!(obj = free_gdi_handle( handle ))) return FALSE; + return HeapFree( GetProcessHeap(), 0, obj ); } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index f2d3830..e78e496 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -439,7 +439,7 @@ extern BOOL WineEngRemoveFontResourceEx(LPCWSTR, DWORD, PVOID) DECLSPEC_HIDDEN; extern BOOL GDI_Init(void) DECLSPEC_HIDDEN; extern HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs *funcs ) DECLSPEC_HIDDEN; extern void *GDI_ReallocObject( WORD, HGDIOBJ, void *obj ) DECLSPEC_HIDDEN; -extern BOOL GDI_FreeObject( HGDIOBJ, void *obj ) DECLSPEC_HIDDEN; +extern void *free_gdi_handle( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern void *GDI_GetObjPtr( HGDIOBJ, WORD ) DECLSPEC_HIDDEN; extern void GDI_ReleaseObj( HGDIOBJ ) DECLSPEC_HIDDEN; extern void GDI_CheckNotLock(void) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 647dcb8..cc87c6e 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -689,25 +689,29 @@ void *GDI_ReallocObject( WORD size, HGDIOBJ handle, void *object ) /*********************************************************************** - * GDI_FreeObject + * free_gdi_handle + * + * Free a GDI handle and return a pointer to the object. */ -BOOL GDI_FreeObject( HGDIOBJ handle, void *ptr ) +void *free_gdi_handle( HGDIOBJ handle ) { - GDIOBJHDR *object = ptr; + GDIOBJHDR *object = NULL; int i; - object->type = 0; /* Mark it as invalid */ - object->funcs = NULL; i = ((ULONG_PTR)handle >> 2) - FIRST_LARGE_HANDLE; if (i >= 0 && i < MAX_LARGE_HANDLES) { - HeapFree( GetProcessHeap(), 0, large_handles[i] ); + _EnterSysLevel( &GDI_level ); + object = large_handles[i]; large_handles[i] = NULL; + _LeaveSysLevel( &GDI_level ); } - else ERR( "Invalid handle %p\n", handle ); - TRACE("(%p): leave %d\n", handle, GDI_level.crst.RecursionCount); - _LeaveSysLevel( &GDI_level ); - return TRUE; + if (object) + { + object->type = 0; /* mark it as invalid */ + object->funcs = NULL; + } + return object; } diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index bfa4bdd..ea75ae8 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -163,11 +163,10 @@ static POINT *convert_points( UINT count, POINT16 *pt16 ) BOOL WINAPI DeleteMetaFile( HMETAFILE hmf ) { - METAFILEOBJ * metaObj = GDI_GetObjPtr( hmf, OBJ_METAFILE ); + METAFILEOBJ * metaObj = free_gdi_handle( hmf ); if (!metaObj) return FALSE; HeapFree( GetProcessHeap(), 0, metaObj->mh ); - GDI_FreeObject( hmf, metaObj ); - return TRUE; + return HeapFree( GetProcessHeap(), 0, metaObj ); } /****************************************************************** diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index 8f1c84a..a658440 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -679,8 +679,8 @@ static BOOL PALETTE_DeleteObject( HGDIOBJ handle ) PALETTEOBJ *obj; PALETTE_UnrealizeObject( handle ); - if (!(obj = GDI_GetObjPtr( handle, OBJ_PAL ))) return FALSE; - return GDI_FreeObject( handle, obj ); + if (!(obj = free_gdi_handle( handle ))) return FALSE; + return HeapFree( GetProcessHeap(), 0, obj ); } diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index 52e6d8c..a130b1f 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -254,10 +254,10 @@ static HGDIOBJ PEN_SelectObject( HGDIOBJ handle, HDC hdc ) */ static BOOL PEN_DeleteObject( HGDIOBJ handle ) { - PENOBJ *pen = GDI_GetObjPtr( handle, 0 ); + PENOBJ *pen = free_gdi_handle( handle ); if (!pen) return FALSE; - return GDI_FreeObject( handle, pen ); + return HeapFree( GetProcessHeap(), 0, pen ); } diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 92ea70b..b957bb8 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -542,11 +542,12 @@ static void REGION_DestroyWineRegion( WINEREGION* pReg ) */ static BOOL REGION_DeleteObject( HGDIOBJ handle ) { - RGNOBJ *rgn = GDI_GetObjPtr( handle, OBJ_REGION ); + RGNOBJ *rgn = free_gdi_handle( handle ); if (!rgn) return FALSE; REGION_DestroyWineRegion( rgn->rgn ); - return GDI_FreeObject( handle, rgn ); + HeapFree( GetProcessHeap(), 0, rgn ); + return TRUE; } /*********************************************************************** @@ -2820,7 +2821,8 @@ HRGN WINAPI CreatePolyPolygonRgn(const POINT *Pts, const INT *Count, if (! (pETEs = HeapAlloc( GetProcessHeap(), 0, sizeof(EdgeTableEntry) * total ))) { REGION_DestroyWineRegion( region ); - GDI_FreeObject( hrgn, obj ); + free_gdi_handle( hrgn ); + HeapFree( GetProcessHeap(), 0, obj ); return 0; } pts = FirstPtBlock.pts; @@ -2911,8 +2913,8 @@ HRGN WINAPI CreatePolyPolygonRgn(const POINT *Pts, const INT *Count, if(!tmpPtBlock) { WARN("Can't alloc tPB\n"); REGION_DestroyWineRegion( region ); - GDI_FreeObject( hrgn, obj ); - HeapFree( GetProcessHeap(), 0, pETEs ); + free_gdi_handle( hrgn ); + HeapFree( GetProcessHeap(), 0, obj ); return 0; } curPtBlock->next = tmpPtBlock;

1 0

Alexandre Julliard : gdi32: Allocate palette entries separately from the main GDI object.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: a83c81b544937051b87a09245b4aa192fdd6f4ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=a83c81b544937051b87a09245… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 28 19:02:17 2009 +0100 gdi32: Allocate palette entries separately from the main GDI object. This allows resizing the palette without changing the object pointer. --- dlls/gdi32/palette.c | 102 +++++++++++++++++++++++++------------------------- 1 files changed, 51 insertions(+), 51 deletions(-) diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index a658440..58ff4b5 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -42,7 +42,9 @@ typedef struct tagPALETTEOBJ { GDIOBJHDR header; const DC_FUNCTIONS *funcs; /* DC function table */ - LOGPALETTE logpalette; /* _MUST_ be the last field */ + WORD version; /* palette version */ + WORD count; /* count of palette entries */ + PALETTEENTRY *entries; } PALETTEOBJ; static INT PALETTE_GetObject( HGDIOBJ handle, INT count, LPVOID buffer ); @@ -149,15 +151,22 @@ HPALETTE WINAPI CreatePalette( size = sizeof(LOGPALETTE) + (palette->palNumEntries - 1) * sizeof(PALETTEENTRY); - if (!(palettePtr = HeapAlloc( GetProcessHeap(), 0, - FIELD_OFFSET( PALETTEOBJ, logpalette.palPalEntry[palette->palNumEntries] )))) + if (!(palettePtr = HeapAlloc( GetProcessHeap(), 0, sizeof(*palettePtr) ))) return 0; + palettePtr->funcs = NULL; + palettePtr->version = palette->palVersion; + palettePtr->count = palette->palNumEntries; + size = palettePtr->count * sizeof(*palettePtr->entries); + if (!(palettePtr->entries = HeapAlloc( GetProcessHeap(), 0, size ))) + { + HeapFree( GetProcessHeap(), 0, palettePtr ); return 0; - - memcpy( &palettePtr->logpalette, palette, size ); - palettePtr->funcs = NULL; + } + memcpy( palettePtr->entries, palette->palPalEntry, size ); if (!(hpalette = alloc_gdi_handle( &palettePtr->header, OBJ_PAL, &palette_funcs ))) + { + HeapFree( GetProcessHeap(), 0, palettePtr->entries ); HeapFree( GetProcessHeap(), 0, palettePtr ); - + } TRACE(" returning %p\n", hpalette); return hpalette; } @@ -286,22 +295,17 @@ UINT WINAPI GetPaletteEntries( /* NOTE: not documented but test show this to be the case */ if (count == 0) { - int rc = palPtr->logpalette.palNumEntries; - GDI_ReleaseObj( hpalette ); - return rc; + count = palPtr->count; } - - numEntries = palPtr->logpalette.palNumEntries; - if (start+count > numEntries) count = numEntries - start; - if (entries) + else { - if (start >= numEntries) - { - GDI_ReleaseObj( hpalette ); - return 0; - } - memcpy( entries, &palPtr->logpalette.palPalEntry[start], - count * sizeof(PALETTEENTRY) ); + numEntries = palPtr->count; + if (start+count > numEntries) count = numEntries - start; + if (entries) + { + if (start >= numEntries) count = 0; + else memcpy( entries, &palPtr->entries[start], count * sizeof(PALETTEENTRY) ); + } } GDI_ReleaseObj( hpalette ); @@ -333,17 +337,16 @@ UINT WINAPI SetPaletteEntries( palPtr = GDI_GetObjPtr( hpalette, OBJ_PAL ); if (!palPtr) return 0; - numEntries = palPtr->logpalette.palNumEntries; + numEntries = palPtr->count; if (start >= numEntries) { GDI_ReleaseObj( hpalette ); return 0; } if (start+count > numEntries) count = numEntries - start; - memcpy( &palPtr->logpalette.palPalEntry[start], entries, - count * sizeof(PALETTEENTRY) ); - UnrealizeObject( hpalette ); + memcpy( &palPtr->entries[start], entries, count * sizeof(PALETTEENTRY) ); GDI_ReleaseObj( hpalette ); + UnrealizeObject( hpalette ); return count; } @@ -362,23 +365,20 @@ BOOL WINAPI ResizePalette( UINT cEntries) /* [in] Number of entries in logical palette */ { PALETTEOBJ * palPtr = GDI_GetObjPtr( hPal, OBJ_PAL ); - UINT cPrevEnt, prevVer; - int prevsize, size = sizeof(LOGPALETTE) + (cEntries - 1) * sizeof(PALETTEENTRY); + PALETTEENTRY *entries; - TRACE("hpal = %p, prev = %i, new = %i\n", - hPal, palPtr ? palPtr->logpalette.palNumEntries : -1, cEntries ); if( !palPtr ) return FALSE; - cPrevEnt = palPtr->logpalette.palNumEntries; - prevVer = palPtr->logpalette.palVersion; - prevsize = sizeof(LOGPALETTE) + (cPrevEnt - 1) * sizeof(PALETTEENTRY) + - sizeof(int*) + sizeof(GDIOBJHDR); - size += sizeof(int*) + sizeof(GDIOBJHDR); + TRACE("hpal = %p, prev = %i, new = %i\n", hPal, palPtr->count, cEntries ); - if (!(palPtr = GDI_ReallocObject( size, hPal, palPtr ))) return FALSE; + if (!(entries = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, + palPtr->entries, cEntries * sizeof(*palPtr->entries) ))) + { + GDI_ReleaseObj( hPal ); + return FALSE; + } + palPtr->entries = entries; + palPtr->count = cEntries; - if( cEntries > cPrevEnt ) memset( (BYTE*)palPtr + prevsize, 0, size - prevsize ); - palPtr->logpalette.palNumEntries = cEntries; - palPtr->logpalette.palVersion = prevVer; GDI_ReleaseObj( hPal ); PALETTE_UnrealizeObject( hPal ); return TRUE; @@ -410,11 +410,12 @@ BOOL WINAPI AnimatePalette( PALETTEOBJ * palPtr; UINT pal_entries; const PALETTEENTRY *pptr = PaletteColors; + const DC_FUNCTIONS *funcs; palPtr = GDI_GetObjPtr( hPal, OBJ_PAL ); if (!palPtr) return 0; - pal_entries = palPtr->logpalette.palNumEntries; + pal_entries = palPtr->count; if (StartIndex >= pal_entries) { GDI_ReleaseObj( hPal ); @@ -424,22 +425,20 @@ BOOL WINAPI AnimatePalette( for (NumEntries += StartIndex; StartIndex < NumEntries; StartIndex++, pptr++) { /* According to MSDN, only animate PC_RESERVED colours */ - if (palPtr->logpalette.palPalEntry[StartIndex].peFlags & PC_RESERVED) { + if (palPtr->entries[StartIndex].peFlags & PC_RESERVED) { TRACE("Animating colour (%d,%d,%d) to (%d,%d,%d)\n", - palPtr->logpalette.palPalEntry[StartIndex].peRed, - palPtr->logpalette.palPalEntry[StartIndex].peGreen, - palPtr->logpalette.palPalEntry[StartIndex].peBlue, + palPtr->entries[StartIndex].peRed, + palPtr->entries[StartIndex].peGreen, + palPtr->entries[StartIndex].peBlue, pptr->peRed, pptr->peGreen, pptr->peBlue); - memcpy( &palPtr->logpalette.palPalEntry[StartIndex], pptr, - sizeof(PALETTEENTRY) ); + palPtr->entries[StartIndex] = *pptr; } else { TRACE("Not animating entry %d -- not PC_RESERVED\n", StartIndex); } } - if (palPtr->funcs && palPtr->funcs->pRealizePalette) - palPtr->funcs->pRealizePalette( NULL, hPal, hPal == hPrimaryPalette ); - + funcs = palPtr->funcs; GDI_ReleaseObj( hPal ); + if (funcs && funcs->pRealizePalette) funcs->pRealizePalette( NULL, hPal, hPal == hPrimaryPalette ); } return TRUE; } @@ -545,9 +544,9 @@ UINT WINAPI GetNearestPaletteIndex( { int i, diff = 0x7fffffff; int r,g,b; - PALETTEENTRY* entry = palObj->logpalette.palPalEntry; + PALETTEENTRY* entry = palObj->entries; - for( i = 0; i < palObj->logpalette.palNumEntries && diff ; i++, entry++) + for( i = 0; i < palObj->count && diff ; i++, entry++) { r = entry->peRed - GetRValue(color); g = entry->peGreen - GetGValue(color); @@ -641,7 +640,7 @@ static INT PALETTE_GetObject( HGDIOBJ handle, INT count, LPVOID buffer ) if (buffer) { if (count > sizeof(WORD)) count = sizeof(WORD); - memcpy( buffer, &palette->logpalette.palNumEntries, count ); + memcpy( buffer, &palette->count, count ); } else count = sizeof(WORD); GDI_ReleaseObj( handle ); @@ -680,6 +679,7 @@ static BOOL PALETTE_DeleteObject( HGDIOBJ handle ) PALETTE_UnrealizeObject( handle ); if (!(obj = free_gdi_handle( handle ))) return FALSE; + HeapFree( GetProcessHeap(), 0, obj->entries ); return HeapFree( GetProcessHeap(), 0, obj ); }

1 0

Alexandre Julliard : gdi32: Get rid of GDI_ReallocObject.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: f1ea7a40f8f8425c00460f8bee91bc3873b6e0d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1ea7a40f8f8425c00460f8be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 28 19:04:04 2009 +0100 gdi32: Get rid of GDI_ReallocObject. --- dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/gdiobj.c | 27 --------------------------- 2 files changed, 0 insertions(+), 28 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index e78e496..87d4ec0 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -438,7 +438,6 @@ extern BOOL WineEngRemoveFontResourceEx(LPCWSTR, DWORD, PVOID) DECLSPEC_HIDDEN; /* gdiobj.c */ extern BOOL GDI_Init(void) DECLSPEC_HIDDEN; extern HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs *funcs ) DECLSPEC_HIDDEN; -extern void *GDI_ReallocObject( WORD, HGDIOBJ, void *obj ) DECLSPEC_HIDDEN; extern void *free_gdi_handle( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern void *GDI_GetObjPtr( HGDIOBJ, WORD ) DECLSPEC_HIDDEN; extern void GDI_ReleaseObj( HGDIOBJ ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index cc87c6e..5557787 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -662,33 +662,6 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs /*********************************************************************** - * GDI_ReallocObject - * - * The object ptr must have been obtained with GDI_GetObjPtr. - * The new pointer must be released with GDI_ReleaseObj. - */ -void *GDI_ReallocObject( WORD size, HGDIOBJ handle, void *object ) -{ - void *new_ptr = NULL; - int i; - - i = ((ULONG_PTR)handle >> 2) - FIRST_LARGE_HANDLE; - if (i >= 0 && i < MAX_LARGE_HANDLES && large_handles[i]) - { - new_ptr = HeapReAlloc( GetProcessHeap(), 0, large_handles[i], size ); - if (new_ptr) large_handles[i] = new_ptr; - } - else ERR( "Invalid handle %p\n", handle ); - if (!new_ptr) - { - TRACE("(%p): leave %d\n", handle, GDI_level.crst.RecursionCount); - _LeaveSysLevel( &GDI_level ); - } - return new_ptr; -} - - -/*********************************************************************** * free_gdi_handle * * Free a GDI handle and return a pointer to the object.

1 0

Alexandre Julliard : gdi32: Don' t hold the GDI lock while calling the Freetype font engine functions.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: 7b82b98ee85aed918a90c33d4996b64a8311d9cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b82b98ee85aed918a90c33d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 28 19:38:15 2009 +0100 gdi32: Don't hold the GDI lock while calling the Freetype font engine functions. --- dlls/gdi32/font.c | 4 ---- dlls/gdi32/freetype.c | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 409761a..4e271ea 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -489,11 +489,7 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) } if (GetDeviceCaps( dc->hSelf, TEXTCAPS ) & TC_VA_ABLE) - { - FONTOBJ *font = GDI_GetObjPtr( handle, OBJ_FONT ); /* to grab the GDI lock (FIXME) */ dc->gdiFont = WineEngCreateFontInstance( dc, handle ); - if (font) GDI_ReleaseObj( handle ); - } if (dc->funcs->pSelectFont) ret = dc->funcs->pSelectFont( dc->physDev, handle, dc->gdiFont ); diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1ca6953..5c7b51b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2085,6 +2085,9 @@ static void delete_external_font_keys(void) INT WineEngAddFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv) { INT ret = 0; + + GDI_CheckNotLock(); + if (ft_handle) /* do it only if we have freetype up and running */ { char *unixname; @@ -2119,6 +2122,8 @@ INT WineEngAddFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv) */ HANDLE WineEngAddFontMemResourceEx(PVOID pbFont, DWORD cbFont, PVOID pdv, DWORD *pcFonts) { + GDI_CheckNotLock(); + if (ft_handle) /* do it only if we have freetype up and running */ { PVOID pFontCopy = HeapAlloc(GetProcessHeap(), 0, cbFont); @@ -2153,6 +2158,7 @@ HANDLE WineEngAddFontMemResourceEx(PVOID pbFont, DWORD cbFont, PVOID pdv, DWORD */ BOOL WineEngRemoveFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv) { + GDI_CheckNotLock(); FIXME(":stub\n"); return TRUE; } @@ -3342,6 +3348,7 @@ GdiFont *WineEngCreateFontInstance(DC *dc, HFONT hfont) TRACE("DC transform %f %f %f %f\n", dcmat.eM11, dcmat.eM12, dcmat.eM21, dcmat.eM22); + GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); /* check the cache first */ @@ -3711,6 +3718,7 @@ BOOL WineEngDestroyFontInstance(HFONT handle) struct list *font_elem_ptr, *hfontlist_elem_ptr; int i = 0; + GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); LIST_FOR_EACH_ENTRY(gdiFont, &child_font_list, struct tagGdiFont, entry) @@ -3896,6 +3904,7 @@ DWORD WineEngEnumFonts(LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lparam) TRACE("facename = %s charset %d\n", debugstr_w(plf->lfFaceName), plf->lfCharSet); + GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); if(plf->lfFaceName[0]) { FontSubst *psub; @@ -4380,6 +4389,7 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, font->font_desc.matrix.eM11, font->font_desc.matrix.eM12, font->font_desc.matrix.eM21, font->font_desc.matrix.eM22); + GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); if(format & GGO_GLYPH_INDEX) { @@ -5226,6 +5236,7 @@ static void scale_outline_font_metrics(const GdiFont *font, OUTLINETEXTMETRICW * */ BOOL WineEngGetTextMetrics(GdiFont *font, LPTEXTMETRICW ptm) { + GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); if(!font->potm) { if(!WineEngGetOutlineTextMetrics(font, 0, NULL)) @@ -5270,6 +5281,7 @@ UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize, if(!FT_IS_SCALABLE(ft_face)) return 0; + GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); if(font->potm) { @@ -5595,6 +5607,7 @@ BOOL WineEngGetCharWidth(GdiFont *font, UINT firstChar, UINT lastChar, TRACE("%p, %d, %d, %p\n", font, firstChar, lastChar, buffer); + GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); for(c = firstChar; c <= lastChar; c++) { get_glyph_index_linked(font, c, &linked_font, &glyph_index); @@ -5623,6 +5636,7 @@ BOOL WineEngGetCharABCWidths(GdiFont *font, UINT firstChar, UINT lastChar, if(!FT_IS_SCALABLE(font->ft_face)) return FALSE; + GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); for(c = firstChar; c <= lastChar; c++) { @@ -5653,6 +5667,7 @@ BOOL WineEngGetCharABCWidthsI(GdiFont *font, UINT firstChar, UINT count, LPWORD if(!FT_HAS_HORIZONTAL(font->ft_face)) return FALSE; + GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); get_glyph_index_linked(font, 'a', &linked_font, &glyph_index); @@ -5696,6 +5711,7 @@ BOOL WineEngGetTextExtentExPoint(GdiFont *font, LPCWSTR wstr, INT count, TRACE("%p, %s, %d, %d, %p\n", font, debugstr_wn(wstr, count), count, max_ext, size); + GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); size->cx = 0; @@ -5737,6 +5753,7 @@ BOOL WineEngGetTextExtentExPointI(GdiFont *font, const WORD *indices, INT count, TRACE("%p, %p, %d, %d, %p\n", font, indices, count, max_ext, size); + GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); size->cx = 0; @@ -5837,6 +5854,7 @@ BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) struct list *first_hfont; BOOL ret; + GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); ret = get_glyph_index_linked(font, c, &linked_font, glyph); TRACE("get_glyph_index_linked glyph %d font %p\n", *glyph, linked_font); @@ -5932,6 +5950,7 @@ DWORD WineEngGetFontUnicodeRanges(GdiFont *font, LPGLYPHSET glyphset) BOOL WineEngFontIsLinked(GdiFont *font) { BOOL ret; + GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); ret = !list_empty(&font->child_fonts); LeaveCriticalSection( &freetype_cs ); @@ -6120,6 +6139,7 @@ DWORD WineEngGetKerningPairs(GdiFont *font, DWORD cPairs, KERNINGPAIR *kern_pair USHORT i, nTables; USHORT *glyph_to_char; + GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); if (font->total_kern_pairs != (DWORD)-1) {

1 0