December 2009 - Wine-commits

Vincent Povirk : gdiplus: Add some traces for the values of point arguments .
by Alexandre Julliard 28 Dec '09

28 Dec '09

Module: wine Branch: master Commit: 7ded3d83c6148d6ad831772228d666179b5c2687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ded3d83c6148d6ad83177222… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 15:45:02 2009 -0600 gdiplus: Add some traces for the values of point arguments. --- dlls/gdiplus/brush.c | 6 +++--- dlls/gdiplus/gdiplus.c | 6 ++++++ dlls/gdiplus/gdiplus_private.h | 2 ++ dlls/gdiplus/graphics.c | 3 +++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 49e9e0e..ad372c0 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -311,8 +311,8 @@ GpStatus WINGDIPAPI GdipCreateLineBrush(GDIPCONST GpPointF* startpoint, { COLORREF col = ARGB2COLORREF(startcolor); - TRACE("(%p, %p, %x, %x, %d, %p)\n", startpoint, endpoint, - startcolor, endcolor, wrap, line); + TRACE("(%s, %s, %x, %x, %d, %p)\n", debugstr_pointf(startpoint), + debugstr_pointf(endpoint), startcolor, endcolor, wrap, line); if(!line || !startpoint || !endpoint || wrap == WrapModeClamp) return InvalidParameter; @@ -1448,7 +1448,7 @@ GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient *grad, GpStatus WINGDIPAPI GdipSetPathGradientCenterPoint(GpPathGradient *grad, GpPointF *point) { - TRACE("(%p, %p)\n", grad, point); + TRACE("(%p, %s)\n", grad, debugstr_pointf(point)); if(!grad || !point) return InvalidParameter; diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 9fe9332..77cbc5c 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -444,3 +444,9 @@ const char *debugstr_rectf(CONST RectF* rc) if (!rc) return "(null)"; return wine_dbg_sprintf("(%0.2f,%0.2f,%0.2f,%0.2f)", rc->X, rc->Y, rc->Width, rc->Height); } + +const char *debugstr_pointf(CONST PointF* pt) +{ + if (!pt) return "(null)"; + return wine_dbg_sprintf("(%0.2f,%0.2f)", pt->X, pt->Y); +} diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 6d778a4..7ce4bd5 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -80,6 +80,8 @@ static inline REAL deg2rad(REAL degrees) extern const char *debugstr_rectf(CONST RectF* rc); +extern const char *debugstr_pointf(CONST PointF* pt); + extern void convert_32bppARGB_to_32bppPARGB(UINT width, UINT height, BYTE *dst_bits, INT dst_stride, const BYTE *src_bits, INT src_stride); diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5ab544d..7d5caf8 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1876,6 +1876,9 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if(!graphics || !image || !points || count != 3) return InvalidParameter; + TRACE("%s %s %s\n", debugstr_pointf(&points[0]), debugstr_pointf(&points[1]), + debugstr_pointf(&points[2])); + memcpy(ptf, points, 3 * sizeof(GpPointF)); transform_and_round_points(graphics, pti, ptf, 3);

1 0

Vincent Povirk : gdiplus: Add traces to unimplemented functions in brush.c.
by Alexandre Julliard 28 Dec '09

28 Dec '09

Module: wine Branch: master Commit: d49510e7f009acc39a311af8c210dc12d775b95a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d49510e7f009acc39a311af8c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 15:54:26 2009 -0600 gdiplus: Add traces to unimplemented functions in brush.c. --- dlls/gdiplus/brush.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index ad372c0..0f6d707 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1160,6 +1160,8 @@ GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorsWithCount(GpPathGradient { static int calls; + TRACE("(%p,%p,%p)\n", grad, argb, count); + if(!grad || !argb || !count || (*count < grad->pathdata.Count)) return InvalidParameter; @@ -1415,6 +1417,8 @@ GpStatus WINGDIPAPI GdipSetPathGradientBlend(GpPathGradient *brush, GDIPCONST RE { static int calls; + TRACE("(%p,%p,%p,%i)\n", brush, blend, pos, count); + if(!(calls++)) FIXME("not implemented\n"); @@ -1507,6 +1511,8 @@ GpStatus WINGDIPAPI GdipSetPathGradientSigmaBlend(GpPathGradient *grad, { static int calls; + TRACE("(%p,%0.2f,%0.2f)\n", grad, focus, scale); + if(!grad || focus < 0.0 || focus > 1.0 || scale < 0.0 || scale > 1.0) return InvalidParameter; @@ -1521,6 +1527,8 @@ GpStatus WINGDIPAPI GdipSetPathGradientSurroundColorsWithCount(GpPathGradient { static int calls; + TRACE("(%p,%p,%p)\n", grad, argb, count); + if(!grad || !argb || !count || (*count <= 0) || (*count > grad->pathdata.Count)) return InvalidParameter; @@ -1734,6 +1742,8 @@ GpStatus WINGDIPAPI GdipResetLineTransform(GpLineGradient *brush) { static int calls; + TRACE("(%p)\n", brush); + if(!(calls++)) FIXME("not implemented\n"); @@ -1745,6 +1755,8 @@ GpStatus WINGDIPAPI GdipSetLineTransform(GpLineGradient *brush, { static int calls; + TRACE("(%p,%p)\n", brush, matrix); + if(!(calls++)) FIXME("not implemented\n"); @@ -1756,6 +1768,8 @@ GpStatus WINGDIPAPI GdipScaleLineTransform(GpLineGradient *brush, REAL sx, REAL { static int calls; + TRACE("(%p,%0.2f,%0.2f,%u)\n", brush, sx, sy, order); + if(!(calls++)) FIXME("not implemented\n"); @@ -1823,6 +1837,8 @@ GpStatus WINGDIPAPI GdipRotateLineTransform(GpLineGradient* brush, { static int calls; + TRACE("(%p,%0.2f,%u)\n", brush, angle, order); + if(!brush) return InvalidParameter;

1 0

Vincent Povirk : ole32: Always allow changes to read-only transacted storages.
by Alexandre Julliard 28 Dec '09

28 Dec '09

Module: wine Branch: master Commit: ffc4a49bcb9c98ee76a7b210232db35423e06de1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffc4a49bcb9c98ee76a7b2102… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 4 18:14:51 2009 -0600 ole32: Always allow changes to read-only transacted storages. The only time the write permissions of transacted storages matter is when committing. --- dlls/ole32/storage32.c | 30 +++++++++++++++--------------- dlls/ole32/tests/storage32.c | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 629709a..229fe76 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -864,15 +864,16 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( (grfMode & STGM_TRANSACTED)) return STG_E_INVALIDFUNCTION; - /* Can't create a stream on read-only storage */ - if ( STGM_ACCESS_MODE( This->openFlags ) == STGM_READ ) - return STG_E_ACCESSDENIED; - /* - * Check that we're compatible with the parent's storage mode - * if not in transacted mode + * Don't worry about permissions in transacted mode, as we can always write + * changes; we just can't always commit them. */ if(!(This->openFlags & STGM_TRANSACTED)) { + /* Can't create a stream on read-only storage */ + if ( STGM_ACCESS_MODE( This->openFlags ) == STGM_READ ) + return STG_E_ACCESSDENIED; + + /* Can't create a stream with greater access than the parent. */ if ( STGM_ACCESS_MODE( grfMode ) > STGM_ACCESS_MODE( This->openFlags ) ) return STG_E_ACCESSDENIED; } @@ -899,11 +900,6 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( else return STG_E_FILEALREADYEXISTS; } - else if (STGM_ACCESS_MODE(This->openFlags) == STGM_READ) - { - WARN("read-only storage\n"); - return STG_E_ACCESSDENIED; - } /* * memset the empty entry @@ -1058,7 +1054,8 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( /* * Check that we're compatible with the parent's storage mode */ - if ( STGM_ACCESS_MODE( grfMode ) > STGM_ACCESS_MODE( This->openFlags ) ) + if ( !(This->openFlags & STGM_TRANSACTED) && + STGM_ACCESS_MODE( grfMode ) > STGM_ACCESS_MODE( This->openFlags ) ) { WARN("access denied\n"); return STG_E_ACCESSDENIED; @@ -1075,7 +1072,8 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( * An element with this name already exists */ if (STGM_CREATE_MODE(grfMode) == STGM_CREATE && - STGM_ACCESS_MODE(This->openFlags) != STGM_READ) + ((This->openFlags & STGM_TRANSACTED) || + STGM_ACCESS_MODE(This->openFlags) != STGM_READ)) { hr = IStorage_DestroyElement(iface, pwcsName); if (FAILED(hr)) @@ -1087,7 +1085,8 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( return STG_E_FILEALREADYEXISTS; } } - else if (STGM_ACCESS_MODE(This->openFlags) == STGM_READ) + else if (!(This->openFlags & STGM_TRANSACTED) && + STGM_ACCESS_MODE(This->openFlags) == STGM_READ) { WARN("read-only storage\n"); return STG_E_ACCESSDENIED; @@ -1831,7 +1830,8 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement( if (This->reverted) return STG_E_REVERTED; - if ( STGM_ACCESS_MODE( This->openFlags ) == STGM_READ ) + if ( !(This->openFlags & STGM_TRANSACTED) && + STGM_ACCESS_MODE( This->openFlags ) == STGM_READ ) return STG_E_ACCESSDENIED; entryToDeleteRef = findElement( diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 2011375..e8a7ec9 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1505,7 +1505,7 @@ static void test_nonroot_transacted(void) { /* The storage can be modified. */ r = IStorage_CreateStorage(stg2, stgname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg3); - todo_wine ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); if (r == S_OK) IStream_Release(stg3);

1 0

Vincent Povirk : gdiplus: Fix memory leak in GdipSetStringFormatMeasurableCharacterRanges.
by Alexandre Julliard 28 Dec '09

28 Dec '09

Module: wine Branch: master Commit: 00e1e5ddd5a97fd15b2c94c14ff7bc6e6ce49ba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00e1e5ddd5a97fd15b2c94c14… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Dec 24 15:14:45 2009 -0500 gdiplus: Fix memory leak in GdipSetStringFormatMeasurableCharacterRanges. --- dlls/gdiplus/stringformat.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c index 392f11f..cf6ea1f 100644 --- a/dlls/gdiplus/stringformat.c +++ b/dlls/gdiplus/stringformat.c @@ -252,15 +252,19 @@ GpStatus WINGDIPAPI GdipSetStringFormatLineAlign(GpStringFormat *format, GpStatus WINGDIPAPI GdipSetStringFormatMeasurableCharacterRanges( GpStringFormat *format, INT rangeCount, GDIPCONST CharacterRange *ranges) { + CharacterRange *new_ranges; + if (!(format && ranges)) return InvalidParameter; TRACE("%p, %d, %p\n", format, rangeCount, ranges); - format->character_ranges = GdipAlloc(rangeCount * sizeof(CharacterRange)); - if (!format->character_ranges) + new_ranges = GdipAlloc(rangeCount * sizeof(CharacterRange)); + if (!new_ranges) return OutOfMemory; + GdipFree(format->character_ranges); + format->character_ranges = new_ranges; memcpy(format->character_ranges, ranges, sizeof(CharacterRange) * rangeCount); format->range_count = rangeCount;

1 0

Vincent Povirk : gdiplus: Add tests for multi-frame GIF images.
by Alexandre Julliard 28 Dec '09

28 Dec '09

Module: wine Branch: master Commit: d41f68fdb8c79c75891bda45fe46135e6638cd07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d41f68fdb8c79c75891bda45f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Dec 24 15:49:23 2009 -0500 gdiplus: Add tests for multi-frame GIF images. --- dlls/gdiplus/tests/image.c | 137 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 137 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index e090de9..60d8027 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1195,6 +1195,142 @@ static void test_colormatrix(void) GdipDisposeImageAttributes(imageattr); } +/* 1x1 pixel gif, 2 frames; first frame is white, second is black */ +static const unsigned char gifanimation[72] = { +0x47,0x49,0x46,0x38,0x39,0x61,0x01,0x00,0x01,0x00,0xa1,0x00,0x00,0x00,0x00,0x00, +0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x21,0xf9,0x04,0x00,0x0a,0x00,0xff, +0x00,0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x02,0x02,0x4c,0x01,0x00, +0x21,0xf9,0x04,0x01,0x0a,0x00,0x01,0x00,0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01, +0x00,0x00,0x02,0x02,0x44,0x01,0x00,0x3b +}; + +static void test_multiframegif(void) +{ + LPSTREAM stream; + HGLOBAL hglob; + LPBYTE data; + HRESULT hres; + GpStatus stat; + GpBitmap *bmp; + ARGB color; + UINT count; + GUID dimension; + + /* Test frame functions with an animated GIF */ + hglob = GlobalAlloc (0, sizeof(gifanimation)); + data = GlobalLock (hglob); + memcpy(data, gifanimation, sizeof(gifanimation)); + GlobalUnlock(hglob); + + hres = CreateStreamOnHGlobal(hglob, TRUE, &stream); + ok(hres == S_OK, "Failed to create a stream\n"); + if(hres != S_OK) return; + + stat = GdipCreateBitmapFromStream(stream, &bmp); + ok(stat == Ok, "Failed to create a Bitmap\n"); + if(stat != Ok){ + IStream_Release(stream); + return; + } + + /* Bitmap starts at frame 0 */ + color = 0xdeadbeef; + stat = GdipBitmapGetPixel(bmp, 0, 0, &color); + expect(Ok, stat); + expect(0xffffffff, color); + + /* Check that we get correct metadata */ + stat = GdipImageGetFrameDimensionsCount((GpImage*)bmp,&count); + expect(Ok, stat); + expect(1, count); + + stat = GdipImageGetFrameDimensionsList((GpImage*)bmp, &dimension, 1); + expect(Ok, stat); + expect_guid(&FrameDimensionTime, &dimension, __LINE__, TRUE); + + count = 12345; + stat = GdipImageGetFrameCount((GpImage*)bmp, &dimension, &count); + todo_wine expect(Ok, stat); + todo_wine expect(2, count); + + /* SelectActiveFrame overwrites our current data */ + stat = GdipImageSelectActiveFrame((GpImage*)bmp, &dimension, 1); + expect(Ok, stat); + + color = 0xdeadbeef; + GdipBitmapGetPixel(bmp, 0, 0, &color); + expect(Ok, stat); + todo_wine expect(0xff000000, color); + + stat = GdipImageSelectActiveFrame((GpImage*)bmp, &dimension, 0); + expect(Ok, stat); + + color = 0xdeadbeef; + GdipBitmapGetPixel(bmp, 0, 0, &color); + expect(Ok, stat); + expect(0xffffffff, color); + + /* Write over the image data */ + stat = GdipBitmapSetPixel(bmp, 0, 0, 0xff000000); + expect(Ok, stat); + + /* Switching to the same frame does not overwrite our changes */ + stat = GdipImageSelectActiveFrame((GpImage*)bmp, &dimension, 0); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bmp, 0, 0, &color); + expect(Ok, stat); + expect(0xff000000, color); + + /* But switching to another frame and back does */ + stat = GdipImageSelectActiveFrame((GpImage*)bmp, &dimension, 1); + expect(Ok, stat); + + stat = GdipImageSelectActiveFrame((GpImage*)bmp, &dimension, 0); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bmp, 0, 0, &color); + expect(Ok, stat); + todo_wine expect(0xffffffff, color); + + GdipDisposeImage((GpImage*)bmp); + IStream_Release(stream); + + /* Test with a non-animated gif */ + hglob = GlobalAlloc (0, sizeof(gifimage)); + data = GlobalLock (hglob); + memcpy(data, gifimage, sizeof(gifimage)); + GlobalUnlock(hglob); + + hres = CreateStreamOnHGlobal(hglob, TRUE, &stream); + ok(hres == S_OK, "Failed to create a stream\n"); + if(hres != S_OK) return; + + stat = GdipCreateBitmapFromStream(stream, &bmp); + ok(stat == Ok, "Failed to create a Bitmap\n"); + if(stat != Ok){ + IStream_Release(stream); + return; + } + + /* Check metadata */ + stat = GdipImageGetFrameDimensionsCount((GpImage*)bmp,&count); + expect(Ok, stat); + expect(1, count); + + stat = GdipImageGetFrameDimensionsList((GpImage*)bmp, &dimension, 1); + expect(Ok, stat); + expect_guid(&FrameDimensionTime, &dimension, __LINE__, TRUE); + + count = 12345; + stat = GdipImageGetFrameCount((GpImage*)bmp, &dimension, &count); + todo_wine expect(Ok, stat); + todo_wine expect(1, count); + + GdipDisposeImage((GpImage*)bmp); + IStream_Release(stream); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1224,6 +1360,7 @@ START_TEST(image) test_getsetpixel(); test_palette(); test_colormatrix(); + test_multiframegif(); GdiplusShutdown(gdiplusToken); }

1 0

Vincent Povirk : gdiplus: Remove fixme from GdipImageGetFrameDimensionsCount.
by Alexandre Julliard 28 Dec '09

28 Dec '09

Module: wine Branch: master Commit: 7d62e1f776000a44983ab1ed39c89943cabcb982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d62e1f776000a44983ab1ed3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Dec 24 15:52:02 2009 -0500 gdiplus: Remove fixme from GdipImageGetFrameDimensionsCount. --- dlls/gdiplus/image.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 9858f33..2716a34 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1725,13 +1725,13 @@ GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage *image, GpStatus WINGDIPAPI GdipImageGetFrameDimensionsCount(GpImage *image, UINT* count) { + /* Native gdiplus 1.1 does not yet support multiple frame dimensions. */ + if(!image || !count) return InvalidParameter; *count = 1; - FIXME("stub\n"); - return Ok; }

1 0

Alexandre Julliard : gdi32: Use a standard critical section instead of a syslevel for the GDI lock.
by Alexandre Julliard 28 Dec '09

28 Dec '09

Module: wine Branch: master Commit: 0d07420ecf920142ba0f6aea80d7140c3ddc6df6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d07420ecf920142ba0f6aea8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 24 17:42:13 2009 +0100 gdi32: Use a standard critical section instead of a syslevel for the GDI lock. --- dlls/gdi32/gdiobj.c | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 245b1cc..d32450a 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -67,14 +67,14 @@ static const LOGPEN DCPen = { PS_SOLID, { 0, 0 }, RGB(0,0,0) }; static HGDIOBJ stock_objects[NB_STOCK_OBJECTS]; -static SYSLEVEL GDI_level; +static CRITICAL_SECTION gdi_section; static CRITICAL_SECTION_DEBUG critsect_debug = { - 0, 0, &GDI_level.crst, + 0, 0, &gdi_section, { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": GDI_level") } + 0, 0, { (DWORD_PTR)(__FILE__ ": gdi_section") } }; -static SYSLEVEL GDI_level = { { &critsect_debug, -1, 0, 0, 0, 0 }, 3 }; +static CRITICAL_SECTION gdi_section = { &critsect_debug, -1, 0, 0, 0, 0 }; /**************************************************************************** @@ -649,18 +649,18 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs obj->funcs = funcs; obj->hdcs = NULL; - _EnterSysLevel( &GDI_level ); + EnterCriticalSection( &gdi_section ); for (i = next_large_handle + 1; i < MAX_LARGE_HANDLES; i++) if (!large_handles[i]) goto found; for (i = 0; i <= next_large_handle; i++) if (!large_handles[i]) goto found; - _LeaveSysLevel( &GDI_level ); + LeaveCriticalSection( &gdi_section ); return 0; found: large_handles[i] = obj; next_large_handle = i; - _LeaveSysLevel( &GDI_level ); + LeaveCriticalSection( &gdi_section ); return (HGDIOBJ)(ULONG_PTR)((i + FIRST_LARGE_HANDLE) << 2); } @@ -678,10 +678,10 @@ void *free_gdi_handle( HGDIOBJ handle ) i = ((ULONG_PTR)handle >> 2) - FIRST_LARGE_HANDLE; if (i >= 0 && i < MAX_LARGE_HANDLES) { - _EnterSysLevel( &GDI_level ); + EnterCriticalSection( &gdi_section ); object = large_handles[i]; large_handles[i] = NULL; - _LeaveSysLevel( &GDI_level ); + LeaveCriticalSection( &gdi_section ); } if (object) { @@ -704,7 +704,7 @@ void *GDI_GetObjPtr( HGDIOBJ handle, WORD type ) GDIOBJHDR *ptr = NULL; int i; - _EnterSysLevel( &GDI_level ); + EnterCriticalSection( &gdi_section ); i = ((UINT_PTR)handle >> 2) - FIRST_LARGE_HANDLE; if (i >= 0 && i < MAX_LARGE_HANDLES) @@ -715,10 +715,10 @@ void *GDI_GetObjPtr( HGDIOBJ handle, WORD type ) if (!ptr) { - _LeaveSysLevel( &GDI_level ); + LeaveCriticalSection( &gdi_section ); WARN( "Invalid handle %p\n", handle ); } - else TRACE("(%p): enter %d\n", handle, GDI_level.crst.RecursionCount); + else TRACE("(%p): enter %d\n", handle, gdi_section.RecursionCount); return ptr; } @@ -730,8 +730,8 @@ void *GDI_GetObjPtr( HGDIOBJ handle, WORD type ) */ void GDI_ReleaseObj( HGDIOBJ handle ) { - TRACE("(%p): leave %d\n", handle, GDI_level.crst.RecursionCount); - _LeaveSysLevel( &GDI_level ); + TRACE("(%p): leave %d\n", handle, gdi_section.RecursionCount); + LeaveCriticalSection( &gdi_section ); } @@ -740,7 +740,11 @@ void GDI_ReleaseObj( HGDIOBJ handle ) */ void GDI_CheckNotLock(void) { - _CheckNotSysLevel( &GDI_level ); + if (gdi_section.OwningThread == ULongToHandle(GetCurrentThreadId()) && gdi_section.RecursionCount) + { + ERR( "BUG: holding GDI lock\n" ); + DebugBreak(); + } }

1 0

Alexandre Julliard : user32: Use a standard critical section instead of a syslevel for the USER lock.
by Alexandre Julliard 28 Dec '09

28 Dec '09

Module: wine Branch: master Commit: 5d92931933e16fbe42ad37a32214b73146abbf10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d92931933e16fbe42ad37a32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 24 17:42:19 2009 +0100 user32: Use a standard critical section instead of a syslevel for the USER lock. --- dlls/user32/user_main.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 7868e19..a61a67d 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -39,14 +39,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(graphics); HMODULE user32_module = 0; -static SYSLEVEL USER_SysLevel; +static CRITICAL_SECTION user_section; static CRITICAL_SECTION_DEBUG critsect_debug = { - 0, 0, &USER_SysLevel.crst, + 0, 0, &user_section, { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": USER_SysLevel") } + 0, 0, { (DWORD_PTR)(__FILE__ ": user_section") } }; -static SYSLEVEL USER_SysLevel = { { &critsect_debug, -1, 0, 0, 0, 0 }, 2 }; +static CRITICAL_SECTION user_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static HPALETTE (WINAPI *pfnGDISelectPalette)( HDC hdc, HPALETTE hpal, WORD bkgnd ); static UINT (WINAPI *pfnGDIRealizePalette)( HDC hdc ); @@ -62,7 +62,7 @@ extern void WDML_NotifyThreadDetach(void); */ void USER_Lock(void) { - _EnterSysLevel( &USER_SysLevel ); + EnterCriticalSection( &user_section ); } @@ -71,7 +71,7 @@ void USER_Lock(void) */ void USER_Unlock(void) { - _LeaveSysLevel( &USER_SysLevel ); + LeaveCriticalSection( &user_section ); } @@ -82,7 +82,11 @@ void USER_Unlock(void) */ void USER_CheckNotLock(void) { - _CheckNotSysLevel( &USER_SysLevel ); + if (user_section.OwningThread == ULongToHandle(GetCurrentThreadId()) && user_section.RecursionCount) + { + ERR( "BUG: holding USER lock\n" ); + DebugBreak(); + } }

1 0

Alexandre Julliard : include: Move undocumented Win9x function definitions to winbase16.h.
by Alexandre Julliard 28 Dec '09

28 Dec '09

Module: wine Branch: master Commit: 21ddb9f48e219ddb073c9874bc64222635a11902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21ddb9f48e219ddb073c9874b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 24 20:28:12 2009 +0100 include: Move undocumented Win9x function definitions to winbase16.h. --- dlls/ddeml.dll16/ddeml.c | 1 + dlls/msvideo.dll16/msvideo16.c | 1 + dlls/ole2disp.dll16/ole2disp.c | 3 +- dlls/olecli.dll16/olecli.c | 1 + dlls/setupx.dll16/devinst16.c | 1 + dlls/winaspi.dll16/winaspi.c | 1 + include/winbase.h | 42 ---------------------------------------- include/wine/winbase16.h | 39 +++++++++++++++++++++++++++++++++++++ 8 files changed, 46 insertions(+), 43 deletions(-) diff --git a/dlls/ddeml.dll16/ddeml.c b/dlls/ddeml.dll16/ddeml.c index 874c456..e0a9dda 100644 --- a/dlls/ddeml.dll16/ddeml.c +++ b/dlls/ddeml.dll16/ddeml.c @@ -30,6 +30,7 @@ #include "windef.h" #include "winbase.h" #include "wine/windef16.h" +#include "wine/winbase16.h" #include "wownt32.h" #include "dde.h" #include "ddeml.h" diff --git a/dlls/msvideo.dll16/msvideo16.c b/dlls/msvideo.dll16/msvideo16.c index 6970278..e157808 100644 --- a/dlls/msvideo.dll16/msvideo16.c +++ b/dlls/msvideo.dll16/msvideo16.c @@ -29,6 +29,7 @@ #include "winnls.h" #include "winreg.h" #include "winuser.h" +#include "wine/winbase16.h" #include "vfw16.h" #include "wine/debug.h" diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index a09ef7c..081683e 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -23,7 +23,6 @@ #include <stdarg.h> #include <string.h> -#include "wine/windef16.h" #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -31,6 +30,8 @@ #include "ole2.h" #include "oleauto.h" #include "winerror.h" +#include "wine/windef16.h" +#include "wine/winbase16.h" #include "ole2disp.h" diff --git a/dlls/olecli.dll16/olecli.c b/dlls/olecli.dll16/olecli.c index a37254b..ad59fa3 100644 --- a/dlls/olecli.dll16/olecli.c +++ b/dlls/olecli.dll16/olecli.c @@ -27,6 +27,7 @@ #include "windef.h" #include "wine/windef16.h" +#include "wine/winbase16.h" #include "winbase.h" #include "wingdi.h" #include "wownt32.h" diff --git a/dlls/setupx.dll16/devinst16.c b/dlls/setupx.dll16/devinst16.c index 6c78aec..fb98f42 100644 --- a/dlls/setupx.dll16/devinst16.c +++ b/dlls/setupx.dll16/devinst16.c @@ -22,6 +22,7 @@ #include "windef.h" #include "winbase.h" +#include "wine/winbase16.h" #include "setupx16.h" #include "wine/debug.h" diff --git a/dlls/winaspi.dll16/winaspi.c b/dlls/winaspi.dll16/winaspi.c index 9ef9974..aceef36 100644 --- a/dlls/winaspi.dll16/winaspi.c +++ b/dlls/winaspi.dll16/winaspi.c @@ -34,6 +34,7 @@ #include "windef.h" #include "winbase.h" #include "wine/windef16.h" +#include "wine/winbase16.h" #include "winreg.h" #include "wownt32.h" #include "aspi.h" diff --git a/include/winbase.h b/include/winbase.h index 8298cbd..1cd26f5 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2304,48 +2304,6 @@ WINBASEAPI UINT WINAPI _lwrite(HFILE,LPCSTR,UINT); #define ZeroMemory RtlZeroMemory #define CopyMemory RtlCopyMemory -/* undocumented functions */ - -typedef struct tagSYSLEVEL -{ - CRITICAL_SECTION crst; - INT level; -} SYSLEVEL; - -/* [GS]etProcessDword offsets */ -#define GPD_APP_COMPAT_FLAGS (-56) -#define GPD_LOAD_DONE_EVENT (-52) -#define GPD_HINSTANCE16 (-48) -#define GPD_WINDOWS_VERSION (-44) -#define GPD_THDB (-40) -#define GPD_PDB (-36) -#define GPD_STARTF_SHELLDATA (-32) -#define GPD_STARTF_HOTKEY (-28) -#define GPD_STARTF_SHOWWINDOW (-24) -#define GPD_STARTF_SIZE (-20) -#define GPD_STARTF_POSITION (-16) -#define GPD_STARTF_FLAGS (-12) -#define GPD_PARENT (- 8) -#define GPD_FLAGS (- 4) -#define GPD_USERDATA ( 0) - -WINBASEAPI void WINAPI DisposeLZ32Handle(HANDLE); -WINBASEAPI HANDLE WINAPI DosFileHandleToWin32Handle(HFILE); -WINBASEAPI DWORD WINAPI GetProcessDword(DWORD,INT); -WINBASEAPI VOID WINAPI GetpWin16Lock(SYSLEVEL**); -WINBASEAPI DWORD WINAPI MapLS(LPCVOID); -WINBASEAPI LPVOID WINAPI MapSL(DWORD); -WINBASEAPI VOID WINAPI ReleaseThunkLock(DWORD*); -WINBASEAPI VOID WINAPI RestoreThunkLock(DWORD); -WINBASEAPI VOID WINAPI UnMapLS(DWORD); -WINBASEAPI HFILE WINAPI Win32HandleToDosFileHandle(HANDLE); -WINBASEAPI VOID WINAPI _CheckNotSysLevel(SYSLEVEL *lock); -WINBASEAPI DWORD WINAPI _ConfirmWin16Lock(void); -WINBASEAPI DWORD WINAPI _ConfirmSysLevel(SYSLEVEL*); -WINBASEAPI VOID WINAPI _EnterSysLevel(SYSLEVEL*); -WINBASEAPI VOID WINAPI _LeaveSysLevel(SYSLEVEL*); - - /* Wine internal functions */ extern char * CDECL wine_get_unix_file_name( LPCWSTR dos ); diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h index 0e41cba..aaa3336 100644 --- a/include/wine/winbase16.h +++ b/include/wine/winbase16.h @@ -320,6 +320,30 @@ typedef struct #define __AHINCR (1 << __AHSHIFT) /* undocumented functions */ + +typedef struct tagSYSLEVEL +{ + CRITICAL_SECTION crst; + INT level; +} SYSLEVEL; + +/* [GS]etProcessDword offsets */ +#define GPD_APP_COMPAT_FLAGS (-56) +#define GPD_LOAD_DONE_EVENT (-52) +#define GPD_HINSTANCE16 (-48) +#define GPD_WINDOWS_VERSION (-44) +#define GPD_THDB (-40) +#define GPD_PDB (-36) +#define GPD_STARTF_SHELLDATA (-32) +#define GPD_STARTF_HOTKEY (-28) +#define GPD_STARTF_SHOWWINDOW (-24) +#define GPD_STARTF_SIZE (-20) +#define GPD_STARTF_POSITION (-16) +#define GPD_STARTF_FLAGS (-12) +#define GPD_PARENT (- 8) +#define GPD_FLAGS (- 4) +#define GPD_USERDATA ( 0) + WORD WINAPI AllocCStoDSAlias16(WORD); WORD WINAPI AllocDStoCSAlias16(WORD); HGLOBAL16 WINAPI AllocResource16(HINSTANCE16,HRSRC16,DWORD); @@ -327,6 +351,8 @@ WORD WINAPI AllocSelector16(WORD); WORD WINAPI AllocSelectorArray16(WORD); VOID WINAPI DirectedYield16(HTASK16); HGLOBAL16 WINAPI DirectResAlloc16(HINSTANCE16,WORD,UINT16); +void WINAPI DisposeLZ32Handle(HANDLE); +HANDLE WINAPI DosFileHandleToWin32Handle(HFILE); HANDLE16 WINAPI FarGetOwner16(HGLOBAL16); VOID WINAPI FarSetOwner16(HGLOBAL16,HANDLE16); FARPROC16 WINAPI FileCDR16(FARPROC16); @@ -346,7 +372,9 @@ INT16 WINAPI GetInstanceData16(HINSTANCE16,WORD,INT16); BOOL16 WINAPI GetModuleName16(HINSTANCE16,LPSTR,INT16); INT16 WINAPI GetModuleUsage16(HINSTANCE16); UINT16 WINAPI GetNumTasks16(void); +VOID WINAPI GetpWin16Lock(SYSLEVEL**); SEGPTR WINAPI GetpWin16Lock16(void); +DWORD WINAPI GetProcessDword(DWORD,INT); DWORD WINAPI GetSelectorLimit16(WORD); FARPROC16 WINAPI GetSetKernelDOSProc16(FARPROC16 DosProc); HINSTANCE16 WINAPI GetTaskDS16(void); @@ -375,10 +403,14 @@ WORD WINAPI LocalHeapSize16(void); BOOL16 WINAPI LocalInit16(HANDLE16,WORD,WORD); FARPROC16 WINAPI LocalNotify16(FARPROC16); HTASK16 WINAPI LockCurrentTask16(BOOL16); +DWORD WINAPI MapLS(LPCVOID); +LPVOID WINAPI MapSL(DWORD); VOID WINAPI OldYield16(void); VOID WINAPI WIN32_OldYield16(void); VOID WINAPI PostEvent16(HTASK16); WORD WINAPI PrestoChangoSelector16(WORD,WORD); +VOID WINAPI ReleaseThunkLock(DWORD*); +VOID WINAPI RestoreThunkLock(DWORD); WORD WINAPI SelectorAccessRights16(WORD,WORD,WORD); void WINAPI SetFastQueue16(DWORD,HQUEUE16); VOID WINAPI SetPriority16(HTASK16,INT16); @@ -387,11 +419,18 @@ WORD WINAPI SetSelectorLimit16(WORD,DWORD); HQUEUE16 WINAPI SetTaskQueue16(HTASK16,HQUEUE16); HQUEUE16 WINAPI SetThreadQueue16(DWORD,HQUEUE16); VOID WINAPI SwitchStackTo16(WORD,WORD,WORD); +VOID WINAPI UnMapLS(DWORD); BOOL16 WINAPI WaitEvent16(HTASK16); +HFILE WINAPI Win32HandleToDosFileHandle(HANDLE); VOID WINAPI WriteOutProfiles16(void); VOID WINAPI hmemcpy16(LPVOID,LPCVOID,LONG); +VOID WINAPI _CheckNotSysLevel(SYSLEVEL *lock); +DWORD WINAPI _ConfirmSysLevel(SYSLEVEL*); +DWORD WINAPI _ConfirmWin16Lock(void); VOID WINAPI _CreateSysLevel(SYSLEVEL*,INT); +VOID WINAPI _EnterSysLevel(SYSLEVEL*); VOID WINAPI _EnterWin16Lock(void); +VOID WINAPI _LeaveSysLevel(SYSLEVEL*); VOID WINAPI _LeaveWin16Lock(void);

1 0

Alexandre Julliard : user32: Move handling of listbox sizes for Win 3. 1 apps to the 16-bit code.
by Alexandre Julliard 28 Dec '09

28 Dec '09

Module: wine Branch: master Commit: 537877adaee0199e2f28d89c1f69c5a4fc1aeb70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=537877adaee0199e2f28d89c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 24 21:09:17 2009 +0100 user32: Move handling of listbox sizes for Win 3.1 apps to the 16-bit code. --- dlls/user.exe16/message.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/user32/listbox.c | 26 -------------------------- 2 files changed, 39 insertions(+), 26 deletions(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index ee7fa46..b8a5190 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -584,6 +584,12 @@ static HANDLE16 convert_handle_32_to_16(UINT_PTR src, unsigned int flags) return dst; } +static BOOL is_old_app( HWND hwnd ) +{ + HINSTANCE inst = (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE ); + return inst && !((ULONG_PTR)inst >> 16) && (GetExpWinVer16(LOWORD(inst)) & 0xFF00) == 0x0300; +} + static int find_sub_menu( HMENU *hmenu, HMENU16 target ) { int i, pos, count = GetMenuItemCount( *hmenu ); @@ -2382,6 +2388,39 @@ static LRESULT listbox_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam switch (msg) { + case WM_SIZE: + if (is_old_app( hwnd )) + { + DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); + int width, height, remaining, item_height; + RECT rect; + + /* give a margin for error to old 16 bits programs - if we need + less than the height of the nonclient area, round to the + *next* number of items */ + + if (!(style & LBS_NOINTEGRALHEIGHT) && !(style & LBS_OWNERDRAWVARIABLE)) + { + GetClientRect( hwnd, &rect ); + width = rect.right - rect.left; + height = rect.bottom - rect.top; + item_height = wow_handlers32.listbox_proc( hwnd, LB_GETITEMHEIGHT, 0, 0, FALSE ); + remaining = item_height ? (height % item_height) : 0; + if ((height > item_height) && remaining) + { + GetWindowRect( hwnd, &rect ); + if ((item_height - remaining) <= rect.bottom - rect.top - height) + remaining = remaining - item_height; + TRACE( "[%p]: changing height %d -> %d\n", hwnd, height, height - remaining ); + SetWindowPos( hwnd, 0, 0, 0, rect.right - rect.left, + rect.bottom - rect.top - remaining, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOMOVE ); + return 0; + } + } + } + return wow_handlers32.listbox_proc( hwnd, msg, wParam, lParam, unicode ); + case LB_RESETCONTENT16: case LB_DELETESTRING16: case LB_GETITEMDATA16: diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 983eee6..059be04 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -39,7 +39,6 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "wine/winbase16.h" #include "wine/unicode.h" #include "user_private.h" #include "controls.h" @@ -161,13 +160,6 @@ const struct builtin_class_descr COMBOLBOX_builtin_class = }; -/* check whether app is a Win 3.1 app */ -static inline BOOL is_old_app( LB_DESCR *descr ) -{ - return (GetExpWinVer16( GetWindowLongPtrW(descr->self, GWLP_HINSTANCE) ) & 0xFF00 ) == 0x0300; -} - - /*********************************************************************** * LISTBOX_GetCurrentPageSize * @@ -394,14 +386,6 @@ static void LISTBOX_UpdateSize( LB_DESCR *descr ) remaining = 0; if ((descr->height > descr->item_height) && remaining) { - if (is_old_app(descr)) - { /* give a margin for error to 16 bits programs - if we need - less than the height of the nonclient area, round to the - *next* number of items */ - int ncheight = rect.bottom - rect.top - descr->height; - if ((descr->item_height - remaining) <= ncheight) - remaining = remaining - descr->item_height; - } TRACE("[%p]: changing height %d -> %d\n", descr->self, descr->height, descr->height - remaining ); SetWindowPos( descr->self, 0, 0, 0, rect.right - rect.left, @@ -2517,16 +2501,6 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) descr->locale = GetUserDefaultLCID(); descr->lphc = lphc; - if (is_old_app(descr) && ( descr->style & ( WS_VSCROLL | WS_HSCROLL ) ) ) - { - /* Win95 document "List Box Differences" from MSDN: - If a list box in a version 3.x application has either the - WS_HSCROLL or WS_VSCROLL style, the list box receives both - horizontal and vertical scroll bars. - */ - descr->style |= WS_VSCROLL | WS_HSCROLL; - } - if( lphc ) { TRACE("[%p]: resetting owner %p -> %p\n", descr->self, descr->owner, lphc->self );

1 0