February 2010 - Wine-commits

Dan Kegel : ntdll: Fix leak in test_symlinks.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 1aa3308fa5516b584c641f58ea2562ce23cd649b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aa3308fa5516b584c641f58e… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Feb 13 08:30:29 2010 -0800 ntdll: Fix leak in test_symlinks. --- dlls/ntdll/tests/reg.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index a4802c8..48de5a5 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -748,6 +748,8 @@ static void test_symlinks(void) status = pNtDeleteKey( root ); ok( status == STATUS_SUCCESS, "NtDeleteKey failed: 0x%08x\n", status ); pNtClose( root ); + + pRtlFreeHeap(GetProcessHeap(), 0, target); } START_TEST(reg)

1 0

Vincent Povirk : gdiplus: Copy hatch brushes using the create function.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: e933da4fdb69fd0667d2c9137717c68991ebf172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e933da4fdb69fd0667d2c9137… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 11 16:01:14 2010 -0600 gdiplus: Copy hatch brushes using the create function. The DIB used in the LOGBRUSH doesn't last long enough. --- dlls/gdiplus/brush.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 2eca755..0d32c0f 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -60,13 +60,11 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) break; } case BrushTypeHatchFill: - *clone = GdipAlloc(sizeof(GpHatch)); - if (!*clone) return OutOfMemory; - - memcpy(*clone, brush, sizeof(GpHatch)); + { + GpHatch *hatch = (GpHatch*)brush; - (*clone)->gdibrush = CreateBrushIndirect(&(*clone)->lb); - break; + return GdipCreateHatchBrush(hatch->hatchstyle, hatch->forecol, hatch->backcol, (GpHatch**)clone); + } case BrushTypePathGradient:{ GpPathGradient *src, *dest; INT count;

1 0

Vincent Povirk : gdiplus: Use GdipCloneBitmapArea to get bitmap areas for texture brushes.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 53e326a77c8eaba69917dfe0a3e257d5f3231289 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53e326a77c8eaba69917dfe0a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 11 16:30:56 2010 -0600 gdiplus: Use GdipCloneBitmapArea to get bitmap areas for texture brushes. --- dlls/gdiplus/brush.c | 140 ++++++++++++------------------------------------- 1 files changed, 35 insertions(+), 105 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 0d32c0f..a533aca 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -784,18 +784,15 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, GDIPCONST GpImageAttributes *imageattr, REAL x, REAL y, REAL width, REAL height, GpTexture **texture) { - HDC hdc; - HBITMAP hbm, old = NULL; - BITMAPINFO *pbmi; - BITMAPINFOHEADER *bmih; - INT n_x, n_y, n_width, n_height, abs_height, stride, image_stride, i, bytespp; - BOOL bm_is_selected; - BYTE *dibits, *buff, *textbits; + HBITMAP hbm; GpStatus status; + GpImage *new_image=NULL; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f, %p)\n", image, imageattr, x, y, width, height, texture); + *texture = NULL; + if(!image || !texture || x < 0.0 || y < 0.0 || width < 0.0 || height < 0.0) return InvalidParameter; @@ -804,121 +801,54 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, return NotImplemented; } - n_x = roundr(x); - n_y = roundr(y); - n_width = roundr(width); - n_height = roundr(height); - - if(n_x + n_width > ((GpBitmap*)image)->width || - n_y + n_height > ((GpBitmap*)image)->height) - return InvalidParameter; - - hbm = ((GpBitmap*)image)->hbitmap; - if(!hbm) return GenericError; - hdc = ((GpBitmap*)image)->hdc; - bm_is_selected = (hdc != 0); - - pbmi = GdipAlloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); - if (!pbmi) - return OutOfMemory; - pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - pbmi->bmiHeader.biBitCount = 0; - - if(!bm_is_selected){ - hdc = CreateCompatibleDC(0); - old = SelectObject(hdc, hbm); - } - - /* fill out bmi */ - GetDIBits(hdc, hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS); - - bytespp = pbmi->bmiHeader.biBitCount / 8; - abs_height = abs(pbmi->bmiHeader.biHeight); - - if(n_x > pbmi->bmiHeader.biWidth || n_x + n_width > pbmi->bmiHeader.biWidth || - n_y > abs_height || n_y + n_height > abs_height){ - GdipFree(pbmi); - return InvalidParameter; - } - - dibits = GdipAlloc(pbmi->bmiHeader.biSizeImage); - - if(dibits) /* this is not a good place to error out */ - GetDIBits(hdc, hbm, 0, abs_height, dibits, pbmi, DIB_RGB_COLORS); - - if(!bm_is_selected){ - SelectObject(hdc, old); - DeleteDC(hdc); - } - - if(!dibits){ - GdipFree(pbmi); - return OutOfMemory; - } - - image_stride = (pbmi->bmiHeader.biWidth * bytespp + 3) & ~3; - stride = (n_width * bytespp + 3) & ~3; - buff = GdipAlloc(sizeof(BITMAPINFOHEADER) + stride * n_height); - if(!buff){ - GdipFree(pbmi); - GdipFree(dibits); - return OutOfMemory; - } + status = GdipCloneBitmapArea(x, y, width, height, PixelFormatDontCare, (GpBitmap*)image, (GpBitmap**)&new_image); + if (status != Ok) + return status; - bmih = (BITMAPINFOHEADER*)buff; - textbits = (BYTE*) (bmih + 1); - bmih->biSize = sizeof(BITMAPINFOHEADER); - bmih->biWidth = n_width; - bmih->biHeight = n_height; - bmih->biCompression = BI_RGB; - bmih->biSizeImage = stride * n_height; - bmih->biBitCount = pbmi->bmiHeader.biBitCount; - bmih->biClrUsed = 0; - bmih->biPlanes = 1; - - /* image is flipped */ - if(pbmi->bmiHeader.biHeight > 0){ - dibits += image_stride * (pbmi->bmiHeader.biHeight - 1); - image_stride *= -1; - textbits += stride * (n_height - 1); - stride *= -1; + hbm = ((GpBitmap*)new_image)->hbitmap; + if(!hbm) + { + status = GenericError; + goto exit; } - GdipFree(pbmi); - - for(i = 0; i < n_height; i++) - memcpy(&textbits[i * stride], - &dibits[n_x * bytespp + (n_y + i) * image_stride], - abs(stride)); - *texture = GdipAlloc(sizeof(GpTexture)); if (!*texture){ - GdipFree(dibits); - GdipFree(buff); - return OutOfMemory; + status = OutOfMemory; + goto exit; } if((status = GdipCreateMatrix(&(*texture)->transform)) != Ok){ - GdipFree(*texture); - GdipFree(dibits); - GdipFree(buff); - return status; + goto exit; } - (*texture)->brush.lb.lbStyle = BS_DIBPATTERNPT; - (*texture)->brush.lb.lbColor = DIB_RGB_COLORS; - (*texture)->brush.lb.lbHatch = (ULONG_PTR)buff; + (*texture)->brush.lb.lbStyle = BS_PATTERN; + (*texture)->brush.lb.lbColor = 0; + (*texture)->brush.lb.lbHatch = (ULONG_PTR)hbm; (*texture)->brush.gdibrush = CreateBrushIndirect(&(*texture)->brush.lb); (*texture)->brush.bt = BrushTypeTextureFill; (*texture)->wrap = imageattr->wrap; - GdipFree(dibits); - GdipFree(buff); +exit: + GdipDisposeImage(new_image); - TRACE("<-- %p\n", *texture); + if (status == Ok) + { + TRACE("<-- %p\n", *texture); + } + else + { + if (*texture) + { + GdipDeleteMatrix((*texture)->transform); + GdipFree(*texture); + *texture = NULL; + } + TRACE("<-- error %u\n", status); + } - return Ok; + return status; } /******************************************************************************

1 0

Vincent Povirk : gdiplus: Store an image in texture brushes, and use it when cloning.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 70c9e4fb3d6811ed3e8574768c13e2f2e70f3aad URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c9e4fb3d6811ed3e8574768… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 11 16:43:45 2010 -0600 gdiplus: Store an image in texture brushes, and use it when cloning. --- dlls/gdiplus/brush.c | 25 ++++++++++++++++++------- dlls/gdiplus/gdiplus_private.h | 1 + 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index a533aca..4d36de2 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -160,13 +160,23 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) break; } case BrushTypeTextureFill: - *clone = GdipAlloc(sizeof(GpTexture)); - if(!*clone) return OutOfMemory; + { + GpStatus stat; + GpTexture *texture = (GpTexture*)brush; + GpTexture *new_texture; - memcpy(*clone, brush, sizeof(GpTexture)); + stat = GdipCreateTexture(texture->image, texture->wrap, &new_texture); - (*clone)->gdibrush = CreateBrushIndirect(&(*clone)->lb); - break; + if (stat == Ok) + { + memcpy(new_texture->transform, texture->transform, sizeof(GpMatrix)); + *clone = (GpBrush*)new_texture; + } + else + *clone = NULL; + + return stat; + } default: ERR("not implemented for brush type %d\n", brush->bt); return NotImplemented; @@ -829,10 +839,9 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, (*texture)->brush.gdibrush = CreateBrushIndirect(&(*texture)->brush.lb); (*texture)->brush.bt = BrushTypeTextureFill; (*texture)->wrap = imageattr->wrap; + (*texture)->image = new_image; exit: - GdipDisposeImage(new_image); - if (status == Ok) { TRACE("<-- %p\n", *texture); @@ -845,6 +854,7 @@ exit: GdipFree(*texture); *texture = NULL; } + GdipDisposeImage(new_image); TRACE("<-- error %u\n", status); } @@ -946,6 +956,7 @@ GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush *brush) break; case BrushTypeTextureFill: GdipDeleteMatrix(((GpTexture*)brush)->transform); + GdipDisposeImage(((GpTexture*)brush)->image); break; default: break; diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 75dc8c6..8e26eb1 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -180,6 +180,7 @@ struct GpLineGradient{ struct GpTexture{ GpBrush brush; GpMatrix *transform; + GpImage *image; WrapMode wrap; /* not used yet */ };

1 0

Vincent Povirk : gdiplus: Implement GdipGetTextureImage.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: cf4ec6e8406c618496146216c1c9f37803881c6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf4ec6e8406c618496146216c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Feb 13 12:21:08 2010 -0600 gdiplus: Implement GdipGetTextureImage. --- dlls/gdiplus/brush.c | 13 +++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 4d36de2..c867f91 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1190,6 +1190,19 @@ GpStatus WINGDIPAPI GdipGetSolidFillColor(GpSolidFill *sf, ARGB *argb) } /****************************************************************************** + * GdipGetTextureImage [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipGetTextureImage(GpTexture *brush, GpImage **image) +{ + TRACE("(%p, %p)\n", brush, image); + + if(!brush || !image) + return InvalidParameter; + + return GdipCloneImage(brush->image, image); +} + +/****************************************************************************** * GdipGetTextureTransform [GDIPLUS.@] */ GpStatus WINGDIPAPI GdipGetTextureTransform(GpTexture *brush, GpMatrix *matrix) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 7d6081d..1da91d3 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -397,7 +397,7 @@ @ stdcall GdipGetStringFormatTrimming(ptr ptr) @ stdcall GdipGetTextContrast(ptr ptr) @ stdcall GdipGetTextRenderingHint(ptr ptr) -@ stub GdipGetTextureImage +@ stdcall GdipGetTextureImage(ptr ptr) @ stdcall GdipGetTextureTransform(ptr ptr) @ stdcall GdipGetTextureWrapMode(ptr ptr) @ stdcall GdipGetVisibleClipBounds(ptr ptr)

1 0

Vincent Povirk : gdiplus: Convert formats that can' t be drawn by gdi32 when drawing bitmaps.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 00dec58bb256233e1f2e896ed99216bd1ca91f37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00dec58bb256233e1f2e896ed… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Feb 5 13:48:36 2010 -0600 gdiplus: Convert formats that can't be drawn by gdi32 when drawing bitmaps. --- dlls/gdiplus/graphics.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 39ab18c..359b954 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1926,12 +1926,16 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image else return NotImplemented; - if (bitmap->format == PixelFormat32bppARGB) + if (!(bitmap->format == PixelFormat16bppRGB555 || + bitmap->format == PixelFormat24bppRGB || + bitmap->format == PixelFormat32bppRGB || + bitmap->format == PixelFormat32bppPARGB)) { BITMAPINFOHEADER bih; BYTE *temp_bits; + PixelFormat dst_format; - /* we need a bitmap with premultiplied alpha */ + /* we can't draw a bitmap of this format directly */ hdc = CreateCompatibleDC(0); temp_hdc = 1; temp_bitmap = 1; @@ -1951,8 +1955,14 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image hbitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, (void**)&temp_bits, NULL, 0); - convert_32bppARGB_to_32bppPARGB(bitmap->width, bitmap->height, - temp_bits, bitmap->width*4, bitmap->bits, bitmap->stride); + if (bitmap->format & (PixelFormatAlpha|PixelFormatPAlpha)) + dst_format = PixelFormat32bppPARGB; + else + dst_format = PixelFormat32bppRGB; + + convert_pixels(bitmap->width, bitmap->height, + bitmap->width*4, temp_bits, dst_format, + bitmap->stride, bitmap->bits, bitmap->format, bitmap->image.palette_entries); } else { @@ -1967,7 +1977,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image old_hbm = SelectObject(hdc, hbitmap); } - if (bitmap->format == PixelFormat32bppARGB || bitmap->format == PixelFormat32bppPARGB) + if (bitmap->format & (PixelFormatAlpha|PixelFormatPAlpha)) { BLENDFUNCTION bf;

1 0

Vincent Povirk : ole32: Add error checking to StorageBaseImpl_CreateStream.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 1fab6e351564724d36c6cf97ce10c7bc32b81e0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fab6e351564724d36c6cf97c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Feb 13 12:44:12 2010 -0600 ole32: Add error checking to StorageBaseImpl_CreateStream. --- dlls/ole32/storage32.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 3beff78..a7c12b5 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -834,6 +834,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( StgStreamImpl* newStream; DirEntry currentEntry, newStreamEntry; DirRef currentEntryRef, newStreamEntryRef; + HRESULT hr; TRACE("(%p, %s, %x, %d, %d, %p)\n", iface, debugstr_w(pwcsName), grfMode, @@ -933,14 +934,22 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( /* * Create an entry with the new data */ - StorageBaseImpl_CreateDirEntry(This, &newStreamEntry, &newStreamEntryRef); + hr = StorageBaseImpl_CreateDirEntry(This, &newStreamEntry, &newStreamEntryRef); + if (FAILED(hr)) + return hr; + /* * Insert the new entry in the parent storage's tree. */ - insertIntoTree( + hr = insertIntoTree( This, This->storageDirEntry, newStreamEntryRef); + if (FAILED(hr)) + { + StorageBaseImpl_DestroyDirEntry(This, newStreamEntryRef); + return hr; + } /* * Open the stream to return it.

1 0

Alexandre Julliard : ntdll/tests: Fix a few function prototypes in the registry test.
by Alexandre Julliard 12 Feb '10

12 Feb '10

Module: wine Branch: master Commit: 5f699c93c83bcc45052f1ca7c96b79344f786d02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f699c93c83bcc45052f1ca7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 11 14:44:09 2010 +0100 ntdll/tests: Fix a few function prototypes in the registry test. --- dlls/ntdll/tests/reg.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index a061293..500d25d 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -120,18 +120,18 @@ static NTSTATUS (WINAPI * pRtlFreeUnicodeString)(PUNICODE_STRING); static NTSTATUS (WINAPI * pNtDeleteValueKey)(IN HANDLE, IN PUNICODE_STRING); static NTSTATUS (WINAPI * pRtlQueryRegistryValues)(IN ULONG, IN PCWSTR,IN PRTL_QUERY_REGISTRY_TABLE, IN PVOID,IN PVOID); static NTSTATUS (WINAPI * pRtlCheckRegistryKey)(IN ULONG,IN PWSTR); -static NTSTATUS (WINAPI * pRtlOpenCurrentUser)(IN ACCESS_MASK, OUT PHKEY); +static NTSTATUS (WINAPI * pRtlOpenCurrentUser)(IN ACCESS_MASK, PHANDLE); static NTSTATUS (WINAPI * pNtOpenKey)(PHANDLE, IN ACCESS_MASK, IN POBJECT_ATTRIBUTES); static NTSTATUS (WINAPI * pNtClose)(IN HANDLE); static NTSTATUS (WINAPI * pNtDeleteValueKey)(IN HANDLE, IN PUNICODE_STRING); -static NTSTATUS (WINAPI * pNtFlushKey)(HKEY); -static NTSTATUS (WINAPI * pNtDeleteKey)(HKEY); -static NTSTATUS (WINAPI * pNtCreateKey)( PHKEY retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, +static NTSTATUS (WINAPI * pNtFlushKey)(HANDLE); +static NTSTATUS (WINAPI * pNtDeleteKey)(HANDLE); +static NTSTATUS (WINAPI * pNtCreateKey)( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, ULONG TitleIndex, const UNICODE_STRING *class, ULONG options, PULONG dispos ); static NTSTATUS (WINAPI * pNtQueryValueKey)(HANDLE,const UNICODE_STRING *,KEY_VALUE_INFORMATION_CLASS,void *,DWORD,DWORD *); -static NTSTATUS (WINAPI * pNtSetValueKey)( PHKEY, const PUNICODE_STRING, ULONG, - ULONG, const PVOID, ULONG ); +static NTSTATUS (WINAPI * pNtSetValueKey)(HANDLE, const PUNICODE_STRING, ULONG, + ULONG, const void*, ULONG ); static NTSTATUS (WINAPI * pRtlFormatCurrentUserKeyPath)(PUNICODE_STRING); static NTSTATUS (WINAPI * pRtlCreateUnicodeString)( PUNICODE_STRING, LPCWSTR); static LPVOID (WINAPI * pRtlReAllocateHeap)(IN PVOID, IN ULONG, IN PVOID, IN ULONG); @@ -363,7 +363,7 @@ static void test_NtCreateKey(void) { /*Create WineTest*/ OBJECT_ATTRIBUTES attr; - HKEY key; + HANDLE key; ACCESS_MASK am = GENERIC_ALL; NTSTATUS status; @@ -433,7 +433,7 @@ static void test_NtSetValueKey(void) static void test_RtlOpenCurrentUser(void) { NTSTATUS status; - HKEY handle; + HANDLE handle; status=pRtlOpenCurrentUser(KEY_READ, &handle); ok(status == STATUS_SUCCESS, "RtlOpenCurrentUser Failed: 0x%08x\n", status); pNtClose(handle);

1 0

Alexandre Julliard : ntdll/tests: Test NtOpenKey with an existing key.
by Alexandre Julliard 12 Feb '10

12 Feb '10

Module: wine Branch: master Commit: 34b011c357143f6e5a6ec68dce1466b11a8f9b7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=34b011c357143f6e5a6ec68dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 12 16:03:07 2010 +0100 ntdll/tests: Test NtOpenKey with an existing key. --- dlls/ntdll/tests/reg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 500d25d..bb541bb 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -605,8 +605,8 @@ START_TEST(reg) pRtlAppendUnicodeToString(&winetestpath, winetest); - test_NtOpenKey(); test_NtCreateKey(); + test_NtOpenKey(); test_NtSetValueKey(); test_RtlCheckRegistryKey(); test_RtlOpenCurrentUser();

1 0

Alexandre Julliard : ntdll/tests: Add tests for registry symlinks.
by Alexandre Julliard 12 Feb '10

12 Feb '10

Module: wine Branch: master Commit: ed0f34c6e33145d650355b3695c092434951d07b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed0f34c6e33145d650355b369… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 12 16:03:27 2010 +0100 ntdll/tests: Add tests for registry symlinks. --- dlls/ntdll/tests/reg.c | 158 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 158 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index bb541bb..a4802c8 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -116,6 +116,7 @@ typedef enum _KEY_VALUE_INFORMATION_CLASS { #endif static NTSTATUS (WINAPI * pRtlCreateUnicodeStringFromAsciiz)(PUNICODE_STRING, LPCSTR); +static void (WINAPI * pRtlInitUnicodeString)(PUNICODE_STRING,PCWSTR); static NTSTATUS (WINAPI * pRtlFreeUnicodeString)(PUNICODE_STRING); static NTSTATUS (WINAPI * pNtDeleteValueKey)(IN HANDLE, IN PUNICODE_STRING); static NTSTATUS (WINAPI * pRtlQueryRegistryValues)(IN ULONG, IN PCWSTR,IN PRTL_QUERY_REGISTRY_TABLE, IN PVOID,IN PVOID); @@ -161,6 +162,7 @@ static BOOL InitFunctionPtrs(void) trace("Could not load ntdll.dll\n"); return FALSE; } + NTDLL_GET_PROC(RtlInitUnicodeString) NTDLL_GET_PROC(RtlCreateUnicodeStringFromAsciiz) NTDLL_GET_PROC(RtlCreateUnicodeString) NTDLL_GET_PROC(RtlFreeUnicodeString) @@ -593,6 +595,161 @@ static void test_RtlpNtQueryValueKey(void) ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got: 0x%08x\n", status); } +static void test_symlinks(void) +{ + static const WCHAR linkW[] = {'l','i','n','k',0}; + static const WCHAR valueW[] = {'v','a','l','u','e',0}; + static const WCHAR symlinkW[] = {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e',0}; + static const WCHAR targetW[] = {'\\','t','a','r','g','e','t',0}; + char buffer[1024]; + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; + WCHAR *target; + UNICODE_STRING symlink_str, link_str, target_str, value_str; + HANDLE root, key, link; + OBJECT_ATTRIBUTES attr; + NTSTATUS status; + DWORD target_len, len, dw; + + pRtlInitUnicodeString( &link_str, linkW ); + pRtlInitUnicodeString( &symlink_str, symlinkW ); + pRtlInitUnicodeString( &target_str, targetW + 1 ); + pRtlInitUnicodeString( &value_str, valueW ); + + target_len = winetestpath.Length + sizeof(targetW); + target = pRtlAllocateHeap( GetProcessHeap(), 0, target_len ); + memcpy( target, winetestpath.Buffer, winetestpath.Length ); + memcpy( target + winetestpath.Length/sizeof(WCHAR), targetW, sizeof(targetW) ); + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.Attributes = 0; + attr.ObjectName = &winetestpath; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + status = pNtCreateKey( &root, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); + + attr.RootDirectory = root; + attr.ObjectName = &link_str; + status = pNtCreateKey( &link, KEY_ALL_ACCESS, &attr, 0, 0, REG_OPTION_CREATE_LINK, 0 ); + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); + + /* REG_SZ is not allowed */ + status = pNtSetValueKey( link, &symlink_str, 0, REG_SZ, target, target_len ); + todo_wine + ok( status == STATUS_ACCESS_DENIED, "NtSetValueKey wrong status 0x%08x\n", status ); + status = pNtSetValueKey( link, &symlink_str, 0, REG_LINK, target, target_len - sizeof(WCHAR) ); + ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status ); + /* other values are not allowed */ + status = pNtSetValueKey( link, &link_str, 0, REG_LINK, target, target_len - sizeof(WCHAR) ); + todo_wine + ok( status == STATUS_ACCESS_DENIED, "NtSetValueKey wrong status 0x%08x\n", status ); + + /* try opening the target through the link */ + + attr.ObjectName = &link_str; + status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); + todo_wine + ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtOpenKey wrong status 0x%08x\n", status ); + if (!status) pNtClose( key ); + + attr.ObjectName = &target_str; + status = pNtCreateKey( &key, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); + + dw = 0xbeef; + status = pNtSetValueKey( key, &value_str, 0, REG_DWORD, &dw, sizeof(dw) ); + ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status ); + pNtClose( key ); + + attr.ObjectName = &link_str; + status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); + ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08x\n", status ); + + len = sizeof(buffer); + status = pNtQueryValueKey( key, &value_str, KeyValuePartialInformation, info, len, &len ); + todo_wine + { + ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08x\n", status ); + ok( len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION,Data) + sizeof(DWORD), "wrong len %u\n", len ); + } + + status = pNtQueryValueKey( key, &symlink_str, KeyValuePartialInformation, info, len, &len ); + todo_wine + ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryValueKey failed: 0x%08x\n", status ); + + /* REG_LINK can be created in non-link keys */ + status = pNtSetValueKey( key, &symlink_str, 0, REG_LINK, target, target_len - sizeof(WCHAR) ); + ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status ); + len = sizeof(buffer); + status = pNtQueryValueKey( key, &symlink_str, KeyValuePartialInformation, info, len, &len ); + ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08x\n", status ); + ok( len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION,Data) + target_len - sizeof(WCHAR), + "wrong len %u\n", len ); + status = pNtDeleteValueKey( key, &symlink_str ); + ok( status == STATUS_SUCCESS, "NtDeleteValueKey failed: 0x%08x\n", status ); + + pNtClose( key ); + + /* now open the symlink itself */ + + attr.RootDirectory = root; + attr.Attributes = OBJ_OPENLINK; + attr.ObjectName = &link_str; + status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); + ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08x\n", status ); + + len = sizeof(buffer); + status = pNtQueryValueKey( key, &symlink_str, KeyValuePartialInformation, info, len, &len ); + todo_wine + { + ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08x\n", status ); + ok( len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION,Data) + target_len - sizeof(WCHAR), + "wrong len %u\n", len ); + } + pNtClose( key ); + + /* target with terminating null doesn't work */ + status = pNtSetValueKey( link, &symlink_str, 0, REG_LINK, target, target_len ); + ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status ); + attr.Attributes = 0; + attr.ObjectName = &link_str; + status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); + todo_wine + ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtOpenKey wrong status 0x%08x\n", status ); + if (!status) pNtClose( key ); + + /* relative symlink, works only on win2k */ + status = pNtSetValueKey( link, &symlink_str, 0, REG_LINK, targetW+1, sizeof(targetW)-2*sizeof(WCHAR) ); + ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status ); + attr.ObjectName = &link_str; + status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); + ok( status == STATUS_SUCCESS || status == STATUS_OBJECT_NAME_NOT_FOUND, + "NtOpenKey wrong status 0x%08x\n", status ); + if (!status) pNtClose( key ); + + status = pNtCreateKey( &key, KEY_ALL_ACCESS, &attr, 0, 0, REG_OPTION_CREATE_LINK, 0 ); + todo_wine + ok( status == STATUS_OBJECT_NAME_COLLISION, "NtCreateKey failed: 0x%08x\n", status ); + if (!status) pNtClose( key ); + + status = pNtDeleteKey( link ); + ok( status == STATUS_SUCCESS, "NtDeleteKey failed: 0x%08x\n", status ); + pNtClose( link ); + + attr.ObjectName = &target_str; + status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); + ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08x\n", status ); + status = pNtDeleteKey( key ); + ok( status == STATUS_SUCCESS, "NtDeleteKey failed: 0x%08x\n", status ); + pNtClose( key ); + + status = pNtDeleteKey( root ); + ok( status == STATUS_SUCCESS, "NtDeleteKey failed: 0x%08x\n", status ); + pNtClose( root ); +} + START_TEST(reg) { static const WCHAR winetest[] = {'\\','W','i','n','e','T','e','s','t',0}; @@ -615,6 +772,7 @@ START_TEST(reg) test_NtFlushKey(); test_NtQueryValueKey(); test_NtDeleteKey(); + test_symlinks(); pRtlFreeUnicodeString(&winetestpath);

1 0