March 2012 - Wine-commits - list.winehq.org

Austin English : ntoskrnl.exe: Add a stub for IoStartNextPacket.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: 902d619dfef06c7eab46f1afd6e616bc5ef81a35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=902d619dfef06c7eab46f1afd… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Mar 8 13:14:28 2012 -0800 ntoskrnl.exe: Add a stub for IoStartNextPacket. --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 89f5b17..6eda074 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1760,3 +1760,11 @@ PKEVENT WINAPI IoCreateSynchronizationEvent(PUNICODE_STRING name, PHANDLE handle FIXME("(%p %p) stub\n", name, handle); return NULL; } + +/***************************************************** + * IoStartNextPacket (NTOSKRNL.EXE.@) + */ +VOID WINAPI IoStartNextPacket(PDEVICE_OBJECT deviceobject, BOOLEAN cancelable) +{ + FIXME("(%p %d) stub\n", deviceobject, cancelable); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index da3d38e..97a71fc 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -458,7 +458,7 @@ @ stub IoSetSystemPartition @ stdcall IoSetThreadHardErrorMode(long) @ stub IoSetTopLevelIrp -@ stub IoStartNextPacket +@ stdcall IoStartNextPacket(ptr long) @ stub IoStartNextPacketByKey @ stub IoStartPacket @ stdcall IoStartTimer(ptr)

1 0

Austin English : advapi32: Add a stub for RegDisableReflectionKey.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: 1163d1c00bbd209669615b64e22d7df113961866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1163d1c00bbd209669615b64e… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 3 21:54:14 2012 -0600 advapi32: Add a stub for RegDisableReflectionKey. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/registry.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 2b5db2b..87a92dc 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -596,7 +596,7 @@ @ stdcall RegDeleteValueW(long wstr) @ stdcall RegDisablePredefinedCache() # @ stub RegDisablePredefinedCacheEx -# @ stub RegDisableReflectionKey +@ stdcall RegDisableReflectionKey(ptr) # @ stub RegEnableReflectionKey @ stdcall RegEnumKeyA(long long ptr long) @ stdcall RegEnumKeyExA(long long ptr ptr ptr ptr ptr ptr) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 758ba08..c4fef67 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -2909,3 +2909,13 @@ LSTATUS WINAPI RegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey) RtlFreeUnicodeString( &lpszSubKeyW ); return ret; } + +/****************************************************************************** + * RegDisableReflectionKey [ADVAPI32.@] + * + */ +LONG WINAPI RegDisableReflectionKey(HKEY base) +{ + FIXME("%p: stub\n", base); + return ERROR_SUCCESS; +}

1 0

Austin English : kernel32: Add a stub for WerRegisterRuntimeExceptionModule .
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: f135f18b58cd6e7d6704a437c183df9806fb1d25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f135f18b58cd6e7d6704a437c… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Mar 4 14:41:18 2012 -0800 kernel32: Add a stub for WerRegisterRuntimeExceptionModule. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/wer.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index e6baa38..d933155 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1244,6 +1244,7 @@ @ stdcall WaitNamedPipeA (str long) @ stdcall WaitNamedPipeW (wstr long) @ stdcall WerRegisterFile(wstr long long) +@ stdcall WerRegisterRuntimeExceptionModule(wstr ptr) @ stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr) @ stdcall WinExec(str long) @ stdcall Wow64EnableWow64FsRedirection(long) diff --git a/dlls/kernel32/wer.c b/dlls/kernel32/wer.c index d5e27b6..a131ad0 100644 --- a/dlls/kernel32/wer.c +++ b/dlls/kernel32/wer.c @@ -39,3 +39,15 @@ HRESULT WINAPI WerRegisterFile(PCWSTR file, WER_REGISTER_FILE_TYPE regfiletype, FIXME("(%s, %d, %d) stub!\n", debugstr_w(file), regfiletype, flags); return E_NOTIMPL; } + +/*********************************************************************** + * WerRegisterRuntimeExceptionModule (KERNEL32.@) + * + * Register a custom runtime exception handler. + */ + +HRESULT WINAPI WerRegisterRuntimeExceptionModule(PCWSTR callbackdll, PVOID context) +{ + FIXME("(%s, %p) stub!\n", debugstr_w(callbackdll), context); + return S_OK; +}

1 0

André Hentschel : inetcpl: Add stub for DllInstall.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: 0ff72271d1cd946747a1f475798f2d90dbcf1385 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ff72271d1cd946747a1f4757… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 8 22:32:00 2012 +0100 inetcpl: Add stub for DllInstall. --- dlls/inetcpl.cpl/inetcpl.c | 9 +++++++++ dlls/inetcpl.cpl/inetcpl.cpl.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/inetcpl.cpl/inetcpl.c b/dlls/inetcpl.cpl/inetcpl.c index 6981277..e11bf85 100644 --- a/dlls/inetcpl.cpl/inetcpl.c +++ b/dlls/inetcpl.cpl/inetcpl.c @@ -60,6 +60,15 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) return TRUE; } +/*********************************************************************** + * DllInstall (inetcpl.@) + */ +HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) +{ + FIXME("(%s, %s): stub\n", bInstall ? "TRUE" : "FALSE", debugstr_w(cmdline)); + return S_OK; +} + /****************************************************************************** * propsheet_callback [internal] * diff --git a/dlls/inetcpl.cpl/inetcpl.cpl.spec b/dlls/inetcpl.cpl/inetcpl.cpl.spec index 90f1d43..2e59562 100644 --- a/dlls/inetcpl.cpl/inetcpl.cpl.spec +++ b/dlls/inetcpl.cpl/inetcpl.cpl.spec @@ -3,7 +3,7 @@ @ stub AddInternetPropertySheetsEx @ stdcall CPlApplet(long long long long) @ stub DisplayPopupWindowManagementDialog -@ stub DllInstall +@ stdcall -private DllInstall(long wstr) @ stub GetAddSitesDisplayUrl @ stub ImportExportPFX @ stub LaunchAddSitesDialog

1 0

Christian Costa : d3dxof: Do not allow separator to terminate the string. Only the double quote can do that.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: 67488dec097e56c8bcb64a17f65d5f4a317b7b2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=67488dec097e56c8bcb64a17f… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Mar 9 11:54:00 2012 +0100 d3dxof: Do not allow separator to terminate the string. Only the double quote can do that. --- dlls/d3dxof/parsing.c | 3 +- dlls/d3dxof/tests/d3dxof.c | 64 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 9f426c4..0bef29d 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -605,8 +605,9 @@ static BOOL is_string(parse_buffer* buf) if (*buf->buffer != '"') return FALSE; - while ((pos+1) < buf->rem_bytes && !is_operator(c = *(buf->buffer+pos+1))) + while ((pos+1) < buf->rem_bytes) { + c = *(buf->buffer+pos+1); if (c == '"') { ok = 1; diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 5293b44..335db62 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -118,6 +118,27 @@ static char object_syntax_empty_array_nosemicolon[] = "1234;\n" "}\n"; +static char template_syntax_string[] = +"xof 0302txt 0064\n" +"template Filename\n" +"{\n" +"<3D82AB43-62DA-11CF-AB39-0020AF71E433>\n" +"STRING filename;\n" +"}\n"; + +static char object_syntax_string_normal[] = +"xof 0302txt 0064\n" +"Filename\n" +"{\n" +"\"foobar\";\n" +"}\n"; + +static char object_syntax_string_with_separator[] = +"xof 0302txt 0064\n" +"Filename\n" +"{\n" +"\"foo;bar\";\n" +"}\n"; static void init_function_pointers(void) { @@ -493,6 +514,8 @@ static void test_syntax(void) LPDIRECTXFILEENUMOBJECT lpdxfeo; LPDIRECTXFILEDATA lpdxfd; DXFILELOADMEMORY dxflm; + DWORD size; + char** string; if (!pDirectXFileCreate) { @@ -541,6 +564,47 @@ static void test_syntax(void) ok(ref == 0, "Got refcount %d, expected 0\n", ref); } + hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template_syntax_string, sizeof(template_syntax_string) - 1); + ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + + dxflm.lpMemory = &object_syntax_string_normal; + dxflm.dSize = sizeof(object_syntax_string_normal) - 1; + hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, DXFILELOAD_FROMMEMORY, &lpdxfeo); + ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); + ok(hr == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr); + hr = IDirectXFileData_GetData(lpdxfd, NULL, &size, (void**)&string); + ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); + ok(size == sizeof(char*), "Got wrong data size %d\n", size); + ok(!strcmp(*string, "foobar"), "Got string %s, expected foobar\n", *string); + + ref = IDirectXFileEnumObject_Release(lpdxfeo); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + if (hr == DXFILE_OK) + { + ref = IDirectXFileData_Release(lpdxfd); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + } + + dxflm.lpMemory = &object_syntax_string_with_separator; + dxflm.dSize = sizeof(object_syntax_string_with_separator) - 1; + hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, DXFILELOAD_FROMMEMORY, &lpdxfeo); + ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); + ok(hr == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr); + hr = IDirectXFileData_GetData(lpdxfd, NULL, &size, (void**)&string); + ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); + ok(size == sizeof(char*), "Got wrong data size %d\n", size); + ok(!strcmp(*string, "foo;bar"), "Got string %s, expected foo;bar\n", *string); + + ref = IDirectXFileEnumObject_Release(lpdxfeo); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + if (hr == DXFILE_OK) + { + ref = IDirectXFileData_Release(lpdxfd); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + } + ref = IDirectXFile_Release(lpDirectXFile); ok(ref == 0, "Got refcount %d, expected 0\n", ref); }

1 0

Jozef Kucia : d3dx9/tests: Don't leak D3DXBuffer in D3DXWeldVertices tests.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: c76743631dab828410d038ae7b1b456f08089049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c76743631dab828410d038ae7… Author: Jozef Kucia <joseph.kucia(a)gmail.com> Date: Fri Mar 9 18:43:25 2012 +0100 d3dx9/tests: Don't leak D3DXBuffer in D3DXWeldVertices tests. --- dlls/d3dx9_36/tests/mesh.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index d24326f..2a05e0d 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -8060,12 +8060,6 @@ static void test_weld_vertices(void) skip("Couldn't allocate face_remap array.\n"); goto cleanup; } - hr = D3DXCreateBuffer(tc[i].num_vertices * sizeof(DWORD), &vertex_remap); - if (FAILED(hr)) - { - skip("Couldn't create vertex_remap buffer.\n"); - goto cleanup; - } hr = D3DXWeldVertices(mesh, tc[i].flags, tc[i].epsilons, tc[i].adjacency, adjacency_out, face_remap, &vertex_remap);

1 0

André Hentschel : d3drm/tests: Add tests for IDirect3DRMFrameArray_GetElement.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: f5dfa21115f470811fa90f35252e736e0612ccc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5dfa21115f470811fa90f352… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 10 17:55:33 2012 +0100 d3drm/tests: Add tests for IDirect3DRMFrameArray_GetElement. --- dlls/d3drm/tests/d3drm.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index ff2986b..482806e 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1,5 +1,6 @@ /* * Copyright 2010 Christian Costa + * Copyright 2012 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -268,6 +269,9 @@ static void test_Frame(void) { count = IDirect3DRMFrameArray_GetSize(pArray); ok(count == 0, "count = %u\n", count); + hr = IDirect3DRMFrameArray_GetElement(pArray, 0, &pFrameTmp); + ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr); + ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp); IDirect3DRMFrameArray_Release(pArray); } @@ -301,6 +305,10 @@ static void test_Frame(void) { count = IDirect3DRMFrameArray_GetSize(pArray); ok(count == 1, "count = %u\n", count); + hr = IDirect3DRMFrameArray_GetElement(pArray, 0, &pFrameTmp); + ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr); + ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp); + IDirect3DRMFrame_Release(pFrameTmp); IDirect3DRMFrameArray_Release(pArray); } @@ -325,6 +333,10 @@ static void test_Frame(void) { count = IDirect3DRMFrameArray_GetSize(pArray); ok(count == 1, "count = %u\n", count); + hr = IDirect3DRMFrameArray_GetElement(pArray, 0, &pFrameTmp); + ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr); + ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp); + IDirect3DRMFrame_Release(pFrameTmp); IDirect3DRMFrameArray_Release(pArray); } @@ -335,6 +347,9 @@ static void test_Frame(void) { count = IDirect3DRMFrameArray_GetSize(pArray); ok(count == 0, "count = %u\n", count); + hr = IDirect3DRMFrameArray_GetElement(pArray, 0, &pFrameTmp); + ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr); + ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp); IDirect3DRMFrameArray_Release(pArray); } @@ -357,6 +372,10 @@ static void test_Frame(void) { count = IDirect3DRMFrameArray_GetSize(pArray); ok(count == 1, "count = %u\n", count); + hr = IDirect3DRMFrameArray_GetElement(pArray, 0, &pFrameTmp); + ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr); + ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp); + IDirect3DRMFrame_Release(pFrameTmp); IDirect3DRMFrameArray_Release(pArray); } @@ -372,6 +391,9 @@ static void test_Frame(void) { count = IDirect3DRMFrameArray_GetSize(pArray); ok(count == 0, "count = %u\n", count); + hr = IDirect3DRMFrameArray_GetElement(pArray, 0, &pFrameTmp); + ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr); + ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp); IDirect3DRMFrameArray_Release(pArray); } @@ -396,6 +418,14 @@ static void test_Frame(void) { count = IDirect3DRMFrameArray_GetSize(pArray); ok(count == 2, "count = %u\n", count); + hr = IDirect3DRMFrameArray_GetElement(pArray, 0, &pFrameTmp); + ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr); + ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp); + IDirect3DRMFrame_Release(pFrameTmp); + hr = IDirect3DRMFrameArray_GetElement(pArray, 1, &pFrameTmp); + ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr); + ok(pFrameTmp == pFrameP1, "pFrameTmp = %p\n", pFrameTmp); + IDirect3DRMFrame_Release(pFrameTmp); IDirect3DRMFrameArray_Release(pArray); }

1 0

Vincent Povirk : gdiplus: Set path gradient center points based on the path 's bounding rect.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: 1515a4b89cb078b2ad0545643ed0530a7fe4b7e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1515a4b89cb078b2ad0545643… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Feb 20 15:02:39 2012 -0600 gdiplus: Set path gradient center points based on the path's bounding rect. --- dlls/gdiplus/brush.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index c601c10..48dd14d 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -484,9 +484,13 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngleI(GDIPCONST GpRect* rect static GpStatus create_path_gradient(GpPath *path, GpPathGradient **grad) { + GpRectF bounds; + if(!path || !grad) return InvalidParameter; + GdipGetPathWorldBounds(path, &bounds, NULL, NULL); + *grad = GdipAlloc(sizeof(GpPathGradient)); if (!*grad) { @@ -513,8 +517,8 @@ static GpStatus create_path_gradient(GpPath *path, GpPathGradient **grad) (*grad)->wrap = WrapModeClamp; (*grad)->gamma = FALSE; /* FIXME: this should be set to the "centroid" of the path by default */ - (*grad)->center.X = 0.0; - (*grad)->center.Y = 0.0; + (*grad)->center.X = bounds.X + bounds.Width / 2; + (*grad)->center.Y = bounds.Y + bounds.Height / 2; (*grad)->focus.X = 0.0; (*grad)->focus.Y = 0.0;

1 0

Vincent Povirk : gdiplus: Add tests for path gradient center point functions.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: 7fd6ccd19ed65149f7450042ce3e9307bfa8b750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fd6ccd19ed65149f7450042c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Feb 20 15:04:07 2012 -0600 gdiplus: Add tests for path gradient center point functions. --- dlls/gdiplus/tests/brush.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 296cf0f..726e855 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -852,6 +852,59 @@ static void test_pathgradientpath(void) expect(Ok, status); } +static void test_pathgradientcenterpoint(void) +{ + static const GpPointF path_points[] = {{0,0}, {3,0}, {0,4}}; + GpStatus status; + GpPathGradient *grad; + GpPointF point; + + status = GdipCreatePathGradient(path_points+1, 2, WrapModeClamp, &grad); + expect(Ok, status); + + status = GdipGetPathGradientCenterPoint(NULL, &point); + expect(InvalidParameter, status); + + status = GdipGetPathGradientCenterPoint(grad, NULL); + expect(InvalidParameter, status); + + status = GdipGetPathGradientCenterPoint(grad, &point); + expect(Ok, status); + expectf(1.5, point.X); + expectf(2.0, point.Y); + + status = GdipSetPathGradientCenterPoint(NULL, &point); + expect(InvalidParameter, status); + + status = GdipSetPathGradientCenterPoint(grad, NULL); + expect(InvalidParameter, status); + + point.X = 10.0; + point.Y = 15.0; + status = GdipSetPathGradientCenterPoint(grad, &point); + expect(Ok, status); + + point.X = point.Y = -1; + status = GdipGetPathGradientCenterPoint(grad, &point); + expect(Ok, status); + expectf(10.0, point.X); + expectf(15.0, point.Y); + + status = GdipDeleteBrush((GpBrush*)grad); + expect(Ok, status); + + status = GdipCreatePathGradient(path_points, 3, WrapModeClamp, &grad); + expect(Ok, status); + + status = GdipGetPathGradientCenterPoint(grad, &point); + expect(Ok, status); + todo_wine expectf(1.0, point.X); + todo_wine expectf(4.0/3.0, point.Y); + + status = GdipDeleteBrush((GpBrush*)grad); + expect(Ok, status); +} + START_TEST(brush) { struct GdiplusStartupInput gdiplusStartupInput; @@ -877,6 +930,7 @@ START_TEST(brush) test_linelinearblend(); test_gradientsurroundcolorcount(); test_pathgradientpath(); + test_pathgradientcenterpoint(); GdiplusShutdown(gdiplusToken); }

1 0

Ken Thomases : ntdll: Fix status returned for too-long registry value names .
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: 97645d7a1a9eec6100c637534620ac6811622794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97645d7a1a9eec6100c637534… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Mar 12 22:50:09 2012 -0500 ntdll: Fix status returned for too-long registry value names. --- dlls/ntdll/reg.c | 6 +++--- dlls/ntdll/tests/reg.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index d68f154..cdca88a 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -190,7 +190,7 @@ NTSTATUS WINAPI NtDeleteValueKey( HANDLE hkey, const UNICODE_STRING *name ) NTSTATUS ret; TRACE( "(%p,%s)\n", hkey, debugstr_us(name) ); - if (name->Length > MAX_VALUE_LENGTH) return STATUS_BUFFER_OVERFLOW; + if (name->Length > MAX_VALUE_LENGTH) return STATUS_OBJECT_NAME_NOT_FOUND; SERVER_START_REQ( delete_key_value ) { @@ -483,7 +483,7 @@ NTSTATUS WINAPI NtQueryValueKey( HANDLE handle, const UNICODE_STRING *name, TRACE( "(%p,%s,%d,%p,%d)\n", handle, debugstr_us(name), info_class, info, length ); - if (name->Length > MAX_VALUE_LENGTH) return STATUS_BUFFER_OVERFLOW; + if (name->Length > MAX_VALUE_LENGTH) return STATUS_OBJECT_NAME_NOT_FOUND; /* compute the length we want to retrieve */ switch(info_class) @@ -771,7 +771,7 @@ NTSTATUS WINAPI NtSetValueKey( HANDLE hkey, const UNICODE_STRING *name, ULONG Ti TRACE( "(%p,%s,%d,%p,%d)\n", hkey, debugstr_us(name), type, data, count ); - if (name->Length > MAX_VALUE_LENGTH) return STATUS_BUFFER_OVERFLOW; + if (name->Length > MAX_VALUE_LENGTH) return STATUS_INVALID_PARAMETER; SERVER_START_REQ( set_key_value ) { diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 1bd0a01..d56d4f8 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1244,6 +1244,41 @@ static void test_redirection(void) pNtClose( key64 ); } +static void test_long_value_name(void) +{ + HANDLE key; + NTSTATUS status, expected; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING ValName; + DWORD i; + + InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); + status = pNtOpenKey(&key, KEY_WRITE|KEY_READ, &attr); + ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); + + ValName.MaximumLength = 0xfffc; + ValName.Length = ValName.MaximumLength - sizeof(WCHAR); + ValName.Buffer = HeapAlloc(GetProcessHeap(), 0, ValName.MaximumLength); + for (i = 0; i < ValName.Length / sizeof(WCHAR); i++) + ValName.Buffer[i] = 'a'; + ValName.Buffer[i] = 0; + + status = pNtDeleteValueKey(key, &ValName); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtDeleteValueKey with nonexistent long value name returned 0x%08x\n", status); + status = pNtSetValueKey(key, &ValName, 0, REG_DWORD, &i, sizeof(i)); + ok(status == STATUS_INVALID_PARAMETER || broken(status == STATUS_SUCCESS) /* nt4 */, + "NtSetValueKey with long value name returned 0x%08x\n", status); + expected = (status == STATUS_SUCCESS) ? STATUS_SUCCESS : STATUS_OBJECT_NAME_NOT_FOUND; + status = pNtDeleteValueKey(key, &ValName); + ok(status == expected, "NtDeleteValueKey with long value name returned 0x%08x\n", status); + + status = pNtQueryValueKey(key, &ValName, KeyValueBasicInformation, NULL, 0, &i); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryValueKey with nonexistent long value name returned 0x%08x\n", status); + + pRtlFreeUnicodeString(&ValName); + pNtClose(key); +} + START_TEST(reg) { static const WCHAR winetest[] = {'\\','W','i','n','e','T','e','s','t',0}; @@ -1265,6 +1300,7 @@ START_TEST(reg) test_RtlpNtQueryValueKey(); test_NtFlushKey(); test_NtQueryValueKey(); + test_long_value_name(); test_NtDeleteKey(); test_symlinks(); test_redirection();

1 0