Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 56615: [HLINK] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 10:12:58 2012 New Revision: 56615 URL: http://svn.reactos.org/svn/reactos?rev=56615&view=rev Log: [HLINK] * Sync to Wine 1.5.4. Modified: trunk/reactos/dll/win32/hlink/CMakeLists.txt trunk/reactos/dll/win32/hlink/extserv.c trunk/reactos/dll/win32/hlink/link.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/hlink/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/hlink/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/CMakeLists.txt [iso-8859-1] Sat May 19 10:12:58 2012 @@ -2,7 +2,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -set_rc_compiler() spec2def(hlink.dll hlink.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -18,15 +17,6 @@ set_module_type(hlink win32dll) target_link_libraries(hlink uuid wine) add_delay_importlibs(hlink urlmon) - -add_importlibs(hlink - shell32 - ole32 - advapi32 - msvcrt - kernel32 - ntdll) - +add_importlibs(hlink shell32 ole32 advapi32 msvcrt kernel32 ntdll) add_pch(hlink hlink_private.h) - add_cd_file(TARGET hlink DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/hlink/extserv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/extserv.c?… ============================================================================== --- trunk/reactos/dll/win32/hlink/extserv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/extserv.c [iso-8859-1] Sat May 19 10:12:58 2012 @@ -24,13 +24,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(hlink); typedef struct { - IUnknown IUnknown_iface; + IUnknown IUnknown_inner; IAuthenticate IAuthenticate_iface; IHttpNegotiate IHttpNegotiate_iface; IExtensionServices IExtensionServices_iface; + IUnknown *outer_unk; LONG ref; - IUnknown *outer; HWND hwnd; LPWSTR username; @@ -40,7 +40,7 @@ static inline ExtensionService *impl_from_IUnknown(IUnknown *iface) { - return CONTAINING_RECORD(iface, ExtensionService, IUnknown_iface); + return CONTAINING_RECORD(iface, ExtensionService, IUnknown_inner); } static HRESULT WINAPI ExtServUnk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) @@ -51,7 +51,7 @@ if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IUnknown_iface; + *ppv = &This->IUnknown_inner; }else if(IsEqualGUID(&IID_IAuthenticate, riid)) { TRACE("(%p)->(IID_IAuthenticate %p)\n", This, ppv); *ppv = &This->IAuthenticate_iface; @@ -113,19 +113,19 @@ static HRESULT WINAPI Authenticate_QueryInterface(IAuthenticate *iface, REFIID riid, void **ppv) { ExtensionService *This = impl_from_IAuthenticate(iface); - return IUnknown_QueryInterface(This->outer, riid, ppv); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } static ULONG WINAPI Authenticate_AddRef(IAuthenticate *iface) { ExtensionService *This = impl_from_IAuthenticate(iface); - return IUnknown_AddRef(This->outer); + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI Authenticate_Release(IAuthenticate *iface) { ExtensionService *This = impl_from_IAuthenticate(iface); - return IUnknown_Release(This->outer); + return IUnknown_Release(This->outer_unk); } static HRESULT WINAPI Authenticate_Authenticate(IAuthenticate *iface, @@ -160,19 +160,19 @@ static HRESULT WINAPI HttpNegotiate_QueryInterface(IHttpNegotiate *iface, REFIID riid, void **ppv) { ExtensionService *This = impl_from_IHttpNegotiate(iface); - return IUnknown_QueryInterface(This->outer, riid, ppv); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } static ULONG WINAPI HttpNegotiate_AddRef(IHttpNegotiate *iface) { ExtensionService *This = impl_from_IHttpNegotiate(iface); - return IUnknown_AddRef(This->outer); + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI HttpNegotiate_Release(IHttpNegotiate *iface) { ExtensionService *This = impl_from_IHttpNegotiate(iface); - return IUnknown_Release(This->outer); + return IUnknown_Release(This->outer_unk); } static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate *iface, @@ -218,19 +218,19 @@ static HRESULT WINAPI ExtServ_QueryInterface(IExtensionServices *iface, REFIID riid, void **ppv) { ExtensionService *This = impl_from_IExtensionServices(iface); - return IUnknown_QueryInterface(This->outer, riid, ppv); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } static ULONG WINAPI ExtServ_AddRef(IExtensionServices *iface) { ExtensionService *This = impl_from_IExtensionServices(iface); - return IUnknown_AddRef(This->outer); + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI ExtServ_Release(IExtensionServices *iface) { ExtensionService *This = impl_from_IExtensionServices(iface); - return IUnknown_Release(This->outer); + return IUnknown_Release(This->outer_unk); } static HRESULT ExtServ_ImplSetAdditionalHeaders(ExtensionService* This, LPCWSTR pwzAdditionalHeaders) @@ -311,7 +311,7 @@ ret = heap_alloc(sizeof(*ret)); - ret->IUnknown_iface.lpVtbl = &ExtServUnkVtbl; + ret->IUnknown_inner.lpVtbl = &ExtServUnkVtbl; ret->IAuthenticate_iface.lpVtbl = &AuthenticateVtbl; ret->IHttpNegotiate_iface.lpVtbl = &HttpNegotiateVtbl; ret->IExtensionServices_iface.lpVtbl = &ExtServVtbl; @@ -325,14 +325,14 @@ ExtServ_ImplSetAdditionalHeaders(ret, pwzAdditionalHeaders); if(!punkOuter) { - ret->outer = &ret->IUnknown_iface; - hres = IUnknown_QueryInterface(&ret->IUnknown_iface, riid, ppv); - IUnknown_Release(&ret->IUnknown_iface); + ret->outer_unk = &ret->IUnknown_inner; + hres = IUnknown_QueryInterface(&ret->IUnknown_inner, riid, ppv); + IUnknown_Release(&ret->IUnknown_inner); }else if(IsEqualGUID(&IID_IUnknown, riid)) { - ret->outer = punkOuter; - *ppv = &ret->IUnknown_iface; + ret->outer_unk = punkOuter; + *ppv = &ret->IUnknown_inner; }else { - IUnknown_Release(&ret->IUnknown_iface); + IUnknown_Release(&ret->IUnknown_inner); hres = E_INVALIDARG; } Modified: trunk/reactos/dll/win32/hlink/link.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/link.c?rev… ============================================================================== --- trunk/reactos/dll/win32/hlink/link.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/link.c [iso-8859-1] Sat May 19 10:12:58 2012 @@ -78,6 +78,19 @@ if (ref_type == HLINKGETREF_DEFAULT) ref_type = HLINKGETREF_RELATIVE; + if (This->Moniker) + { + DWORD mktype = MKSYS_NONE; + + hres = IMoniker_IsSystemMoniker(This->Moniker, &mktype); + if (hres == S_OK && mktype != MKSYS_NONE) + { + *moniker = This->Moniker; + IMoniker_AddRef(*moniker); + return S_OK; + } + } + if (ref_type == HLINKGETREF_ABSOLUTE && This->Site) { IMoniker *hls_moniker; @@ -217,9 +230,12 @@ This->Moniker = pmkTarget; if (This->Moniker) { + IBindCtx *pbc; LPOLESTR display_name; IMoniker_AddRef(This->Moniker); - IMoniker_GetDisplayName(This->Moniker, NULL, NULL, &display_name); + CreateBindCtx( 0, &pbc); + IMoniker_GetDisplayName(This->Moniker, pbc, NULL, &display_name); + IBindCtx_Release(pbc); This->absolute = display_name && strchrW(display_name, ':'); CoTaskMemFree(display_name); } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat May 19 10:12:58 2012 @@ -63,7 +63,7 @@ reactos/dll/win32/fusion # Synced to Wine-1.5.4 reactos/dll/win32/gdiplus # Synced to Wine-1.5.4 reactos/dll/win32/hhctrl.ocx # Autosync -reactos/dll/win32/hlink # Synced to Wine-1.3.37 +reactos/dll/win32/hlink # Synced to Wine-1.5.4 reactos/dll/win32/hnetcfg # Synced to Wine-1.3.37 reactos/dll/win32/httpapi # Synced to Wine-1.3.37 reactos/dll/win32/iccvid # Autosync

1 0

[akhaldi] 56614: [GDIPLUS_WINETEST] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 10:03:49 2012 New Revision: 56614 URL: http://svn.reactos.org/svn/reactos?rev=56614&view=rev Log: [GDIPLUS_WINETEST] * Sync to Wine 1.5.4. Added: trunk/rostests/winetests/gdiplus/metafile.c (with props) Modified: trunk/rostests/winetests/gdiplus/CMakeLists.txt trunk/rostests/winetests/gdiplus/brush.c trunk/rostests/winetests/gdiplus/font.c trunk/rostests/winetests/gdiplus/testlist.c Modified: trunk/rostests/winetests/gdiplus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/CMakeLi… ============================================================================== --- trunk/rostests/winetests/gdiplus/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/CMakeLists.txt [iso-8859-1] Sat May 19 10:03:49 2012 @@ -11,6 +11,7 @@ graphicspath.c image.c matrix.c + metafile.c pathiterator.c pen.c region.c Modified: trunk/rostests/winetests/gdiplus/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/brush.c… ============================================================================== --- trunk/rostests/winetests/gdiplus/brush.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/brush.c [iso-8859-1] Sat May 19 10:03:49 2012 @@ -773,21 +773,58 @@ { GpStatus status; GpPathGradient *grad; - ARGB *color; - INT count = 3; + ARGB color[3]; + INT count; status = GdipCreatePathGradient(blendcount_ptf, 2, WrapModeClamp, &grad); expect(Ok, status); - color = GdipAlloc(sizeof(ARGB[3])); - + count = 0; + status = GdipGetPathGradientSurroundColorCount(grad, &count); + expect(Ok, status); + expect(2, count); + + color[0] = color[1] = color[2] = 0xdeadbeef; + count = 3; + status = GdipGetPathGradientSurroundColorsWithCount(grad, color, &count); + expect(Ok, status); + expect(1, count); + expect(0xffffffff, color[0]); + expect(0xffffffff, color[1]); + expect(0xdeadbeef, color[2]); + + color[0] = color[1] = color[2] = 0xdeadbeef; + count = 2; + status = GdipGetPathGradientSurroundColorsWithCount(grad, color, &count); + expect(Ok, status); + expect(1, count); + expect(0xffffffff, color[0]); + expect(0xffffffff, color[1]); + expect(0xdeadbeef, color[2]); + + color[0] = color[1] = color[2] = 0xdeadbeef; + count = 1; + status = GdipGetPathGradientSurroundColorsWithCount(grad, color, &count); + expect(InvalidParameter, status); + expect(1, count); + expect(0xdeadbeef, color[0]); + expect(0xdeadbeef, color[1]); + expect(0xdeadbeef, color[2]); + + color[0] = color[1] = color[2] = 0xdeadbeef; + count = 0; + status = GdipGetPathGradientSurroundColorsWithCount(grad, color, &count); + expect(InvalidParameter, status); + expect(0, count); + expect(0xdeadbeef, color[0]); + expect(0xdeadbeef, color[1]); + expect(0xdeadbeef, color[2]); + + count = 3; status = GdipSetPathGradientSurroundColorsWithCount(grad, color, &count); expect(InvalidParameter, status); - GdipFree(color); count = 2; - - color = GdipAlloc(sizeof(ARGB[2])); color[0] = 0x00ff0000; color[1] = 0x0000ff00; @@ -806,7 +843,7 @@ } status = GdipSetPathGradientSurroundColorsWithCount(grad, color, &count); - todo_wine expect(Ok, status); + expect(Ok, status); expect(2, count); status = GdipGetPathGradientSurroundColorCount(NULL, &count); @@ -817,11 +854,418 @@ count = 0; status = GdipGetPathGradientSurroundColorCount(grad, &count); - todo_wine expect(Ok, status); - todo_wine expect(2, count); - - GdipFree(color); + expect(Ok, status); + expect(2, count); + + color[0] = color[1] = color[2] = 0xdeadbeef; + count = 2; + status = GdipGetPathGradientSurroundColorsWithCount(grad, color, &count); + expect(Ok, status); + expect(2, count); + expect(0x00ff0000, color[0]); + expect(0x0000ff00, color[1]); + expect(0xdeadbeef, color[2]); + + count = 1; + status = GdipSetPathGradientSurroundColorsWithCount(grad, color, &count); + expect(Ok, status); + expect(1, count); + + count = 0; + status = GdipGetPathGradientSurroundColorCount(grad, &count); + expect(Ok, status); + expect(2, count); + + /* If all colors are the same, count is set to 1. */ + color[0] = color[1] = 0; + count = 2; + status = GdipSetPathGradientSurroundColorsWithCount(grad, color, &count); + expect(Ok, status); + expect(2, count); + + color[0] = color[1] = color[2] = 0xdeadbeef; + count = 2; + status = GdipGetPathGradientSurroundColorsWithCount(grad, color, &count); + expect(Ok, status); + expect(1, count); + expect(0x00000000, color[0]); + expect(0x00000000, color[1]); + expect(0xdeadbeef, color[2]); + + color[0] = color[1] = 0xff00ff00; + count = 2; + status = GdipSetPathGradientSurroundColorsWithCount(grad, color, &count); + expect(Ok, status); + expect(2, count); + + color[0] = color[1] = color[2] = 0xdeadbeef; + count = 2; + status = GdipGetPathGradientSurroundColorsWithCount(grad, color, &count); + expect(Ok, status); + expect(1, count); + expect(0xff00ff00, color[0]); + expect(0xff00ff00, color[1]); + expect(0xdeadbeef, color[2]); + + count = 0; + status = GdipSetPathGradientSurroundColorsWithCount(grad, color, &count); + expect(InvalidParameter, status); + expect(0, count); + GdipDeleteBrush((GpBrush*)grad); + + status = GdipCreatePathGradient(getbounds_ptf, 3, WrapModeClamp, &grad); + expect(Ok, status); + + color[0] = color[1] = color[2] = 0xdeadbeef; + count = 3; + status = GdipGetPathGradientSurroundColorsWithCount(grad, color, &count); + expect(Ok, status); + expect(1, count); + expect(0xffffffff, color[0]); + expect(0xffffffff, color[1]); + expect(0xffffffff, color[2]); + + color[0] = color[1] = color[2] = 0xdeadbeef; + count = 2; + status = GdipGetPathGradientSurroundColorsWithCount(grad, color, &count); + expect(InvalidParameter, status); + expect(2, count); + expect(0xdeadbeef, color[0]); + expect(0xdeadbeef, color[1]); + expect(0xdeadbeef, color[2]); + + count = 0; + status = GdipGetPathGradientSurroundColorCount(grad, &count); + expect(Ok, status); + expect(3, count); + + GdipDeleteBrush((GpBrush*)grad); +} + +static void test_pathgradientpath(void) +{ + GpStatus status; + GpPath *path=NULL; + GpPathGradient *grad=NULL; + + status = GdipCreatePathGradient(blendcount_ptf, 2, WrapModeClamp, &grad); + expect(Ok, status); + + status = GdipGetPathGradientPath(grad, NULL); + expect(NotImplemented, status); + + status = GdipCreatePath(FillModeWinding, &path); + expect(Ok, status); + + status = GdipGetPathGradientPath(NULL, path); + expect(NotImplemented, status); + + status = GdipGetPathGradientPath(grad, path); + expect(NotImplemented, status); + + status = GdipDeletePath(path); + expect(Ok, status); + + status = GdipDeleteBrush((GpBrush*)grad); + 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); +} + +static void test_pathgradientpresetblend(void) +{ + static const GpPointF path_points[] = {{0,0}, {3,0}, {0,4}}; + GpStatus status; + GpPathGradient *grad; + INT count; + int i; + const REAL positions[5] = {0.0f, 0.2f, 0.5f, 0.8f, 1.0f}; + const REAL two_positions[2] = {0.0f, 1.0f}; + const ARGB colors[5] = {0xff0000ff, 0xff00ff00, 0xff00ffff, 0xffff0000, 0xffffffff}; + REAL res_positions[6] = {0.3f, 0.0f, 0.0f, 0.0f, 0.0f}; + ARGB res_colors[6] = {0xdeadbeef, 0, 0, 0, 0}; + + status = GdipCreatePathGradient(path_points+1, 2, WrapModeClamp, &grad); + expect(Ok, status); + + status = GdipGetPathGradientPresetBlendCount(NULL, &count); + expect(InvalidParameter, status); + + status = GdipGetPathGradientPresetBlendCount(grad, NULL); + expect(InvalidParameter, status); + + status = GdipGetPathGradientPresetBlendCount(grad, &count); + expect(Ok, status); + expect(0, count); + + status = GdipGetPathGradientPresetBlend(NULL, res_colors, res_positions, 1); + expect(InvalidParameter, status); + + status = GdipGetPathGradientPresetBlend(grad, NULL, res_positions, 1); + expect(InvalidParameter, status); + + status = GdipGetPathGradientPresetBlend(grad, res_colors, NULL, 1); + expect(InvalidParameter, status); + + status = GdipGetPathGradientPresetBlend(grad, res_colors, res_positions, 0); + expect(InvalidParameter, status); + + status = GdipGetPathGradientPresetBlend(grad, res_colors, res_positions, -1); + expect(OutOfMemory, status); + + status = GdipGetPathGradientPresetBlend(grad, res_colors, res_positions, 1); + expect(InvalidParameter, status); + + status = GdipGetPathGradientPresetBlend(grad, res_colors, res_positions, 2); + expect(GenericError, status); + + status = GdipSetPathGradientPresetBlend(NULL, colors, positions, 5); + expect(InvalidParameter, status); + + status = GdipSetPathGradientPresetBlend(grad, NULL, positions, 5); + expect(InvalidParameter, status); + + if (0) + { + /* crashes on windows xp */ + status = GdipSetPathGradientPresetBlend(grad, colors, NULL, 5); + expect(InvalidParameter, status); + } + + status = GdipSetPathGradientPresetBlend(grad, colors, positions, 0); + expect(InvalidParameter, status); + + status = GdipSetPathGradientPresetBlend(grad, colors, positions, -1); + expect(InvalidParameter, status); + + status = GdipSetPathGradientPresetBlend(grad, colors, positions, 1); + expect(InvalidParameter, status); + + /* leave off the 0.0 position */ + status = GdipSetPathGradientPresetBlend(grad, &colors[1], &positions[1], 4); + expect(InvalidParameter, status); + + /* leave off the 1.0 position */ + status = GdipSetPathGradientPresetBlend(grad, colors, positions, 4); + expect(InvalidParameter, status); + + status = GdipSetPathGradientPresetBlend(grad, colors, positions, 5); + expect(Ok, status); + + status = GdipGetPathGradientPresetBlendCount(grad, &count); + expect(Ok, status); + expect(5, count); + + if (0) + { + /* Native GdipGetPathGradientPresetBlend seems to copy starting from + * the end of each array and do no bounds checking. This is so braindead + * I'm not going to copy it. */ + + res_colors[0] = 0xdeadbeef; + res_positions[0] = 0.3; + + status = GdipGetPathGradientPresetBlend(grad, &res_colors[1], &res_positions[1], 4); + expect(Ok, status); + + expect(0xdeadbeef, res_colors[0]); + expectf(0.3, res_positions[0]); + + for (i=1; i<5; i++) + { + expect(colors[i], res_colors[i]); + expectf(positions[i], res_positions[i]); + } + + status = GdipGetPathGradientPresetBlend(grad, res_colors, res_positions, 6); + expect(Ok, status); + + for (i=0; i<5; i++) + { + expect(colors[i], res_colors[i+1]); + expectf(positions[i], res_positions[i+1]); + } + } + + status = GdipGetPathGradientPresetBlend(grad, res_colors, res_positions, 5); + expect(Ok, status); + + for (i=0; i<5; i++) + { + expect(colors[i], res_colors[i]); + expectf(positions[i], res_positions[i]); + } + + status = GdipGetPathGradientPresetBlend(grad, res_colors, res_positions, 0); + expect(InvalidParameter, status); + + status = GdipGetPathGradientPresetBlend(grad, res_colors, res_positions, -1); + expect(OutOfMemory, status); + + status = GdipGetPathGradientPresetBlend(grad, res_colors, res_positions, 1); + expect(InvalidParameter, status); + + status = GdipSetPathGradientPresetBlend(grad, colors, two_positions, 2); + expect(Ok, status); + + status = GdipDeleteBrush((GpBrush*)grad); + expect(Ok, status); +} + +static void test_pathgradientblend(void) +{ + static const GpPointF path_points[] = {{0,0}, {3,0}, {0,4}}; + GpPathGradient *brush; + GpStatus status; + INT count, i; + const REAL factors[5] = {0.0f, 0.1f, 0.5f, 0.9f, 1.0f}; + const REAL positions[5] = {0.0f, 0.2f, 0.5f, 0.8f, 1.0f}; + REAL res_factors[6] = {0.3f, 0.0f, 0.0f, 0.0f, 0.0f}; + REAL res_positions[6] = {0.3f, 0.0f, 0.0f, 0.0f, 0.0f}; + + status = GdipCreatePathGradient(path_points, 3, WrapModeClamp, &brush); + expect(Ok, status); + + status = GdipGetPathGradientBlendCount(NULL, &count); + expect(InvalidParameter, status); + + status = GdipGetPathGradientBlendCount(brush, NULL); + expect(InvalidParameter, status); + + status = GdipGetPathGradientBlendCount(brush, &count); + expect(Ok, status); + expect(1, count); + + status = GdipGetPathGradientBlend(NULL, res_factors, res_positions, 1); + expect(InvalidParameter, status); + + status = GdipGetPathGradientBlend(brush, NULL, res_positions, 1); + expect(InvalidParameter, status); + + status = GdipGetPathGradientBlend(brush, res_factors, NULL, 1); + expect(InvalidParameter, status); + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, 0); + expect(InvalidParameter, status); + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, -1); + expect(InvalidParameter, status); + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, 1); + expect(Ok, status); + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, 2); + expect(Ok, status); + + status = GdipSetPathGradientBlend(NULL, factors, positions, 5); + expect(InvalidParameter, status); + + status = GdipSetPathGradientBlend(brush, NULL, positions, 5); + expect(InvalidParameter, status); + + status = GdipSetPathGradientBlend(brush, factors, NULL, 5); + expect(InvalidParameter, status); + + status = GdipSetPathGradientBlend(brush, factors, positions, 0); + expect(InvalidParameter, status); + + status = GdipSetPathGradientBlend(brush, factors, positions, -1); + expect(InvalidParameter, status); + + /* leave off the 0.0 position */ + status = GdipSetPathGradientBlend(brush, &factors[1], &positions[1], 4); + expect(InvalidParameter, status); + + /* leave off the 1.0 position */ + status = GdipSetPathGradientBlend(brush, factors, positions, 4); + expect(InvalidParameter, status); + + status = GdipSetPathGradientBlend(brush, factors, positions, 5); + expect(Ok, status); + + status = GdipGetPathGradientBlendCount(brush, &count); + expect(Ok, status); + expect(5, count); + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, 4); + expect(InsufficientBuffer, status); + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, 5); + expect(Ok, status); + + for (i=0; i<5; i++) + { + expectf(factors[i], res_factors[i]); + expectf(positions[i], res_positions[i]); + } + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, 6); + expect(Ok, status); + + status = GdipSetPathGradientBlend(brush, factors, positions, 1); + expect(Ok, status); + + status = GdipGetPathGradientBlendCount(brush, &count); + expect(Ok, status); + expect(1, count); + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, 1); + expect(Ok, status); + + status = GdipDeleteBrush((GpBrush*)brush); + expect(Ok, status); } START_TEST(brush) @@ -848,6 +1292,10 @@ test_lineblend(); test_linelinearblend(); test_gradientsurroundcolorcount(); + test_pathgradientpath(); + test_pathgradientcenterpoint(); + test_pathgradientpresetblend(); + test_pathgradientblend(); GdiplusShutdown(gdiplusToken); } Modified: trunk/rostests/winetests/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/font.c?… ============================================================================== --- trunk/rostests/winetests/gdiplus/font.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/font.c [iso-8859-1] Sat May 19 10:03:49 2012 @@ -2,6 +2,7 @@ * Unit test suite for fonts * * Copyright (C) 2007 Google (Evan Stade) + * Copyright (C) 2012 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,10 +25,9 @@ #include "gdiplus.h" #include "wine/test.h" -#define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) -#define expectf(expected, got) ok(fabs(expected - got) < 0.0001, "Expected %.2f, got %.2f\n", expected, got) - -static const WCHAR arial[] = {'A','r','i','a','l','\0'}; +#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) +#define expectf(expected, got) ok(fabs(expected - got) < 0.0001, "Expected %f, got %f\n", expected, got) + static const WCHAR nonexistent[] = {'T','h','i','s','F','o','n','t','s','h','o','u','l','d','N','o','t','E','x','i','s','t','\0'}; static const WCHAR MSSansSerif[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; static const WCHAR MicrosoftSansSerif[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; @@ -50,12 +50,7 @@ expect (FontFamilyNotFound, stat); stat = GdipDeleteFont(font); expect (InvalidParameter, stat); - stat = GdipCreateFontFamilyFromName(arial, NULL, &fontfamily); - if(stat == FontFamilyNotFound) - { - skip("Arial not installed\n"); - return; - } + stat = GdipCreateFontFamilyFromName(Tahoma, NULL, &fontfamily); expect (Ok, stat); stat = GdipCreateFont(fontfamily, 12, FontStyleRegular, UnitPoint, &font); expect (Ok, stat); @@ -67,7 +62,7 @@ expect(Ok, stat); stat = GdipGetFamilyName(fontfamily2, familyname, 0); expect(Ok, stat); - ok (lstrcmpiW(arial, familyname) == 0, "Expected arial, got %s\n", + ok (lstrcmpiW(Tahoma, familyname) == 0, "Expected Tahoma, got %s\n", wine_dbgstr_w(familyname)); stat = GdipDeleteFontFamily(fontfamily2); expect(Ok, stat); @@ -96,12 +91,17 @@ { LOGFONTA lfa, lfa2; GpFont *font; + GpFontFamily *family; GpStatus stat; GpGraphics *graphics; HDC hdc = GetDC(0); INT style; + REAL rval; + UINT16 em_height, line_spacing; + Unit unit; GdipCreateFromHDC(hdc, &graphics); + memset(&lfa, 0, sizeof(LOGFONTA)); memset(&lfa2, 0xff, sizeof(LOGFONTA)); @@ -110,14 +110,9 @@ stat = GdipCreateFontFromLogfontA(hdc, &lfa, &font); expect(NotTrueTypeFont, stat); - lstrcpyA(lfa.lfFaceName, "Arial"); + lstrcpyA(lfa.lfFaceName, "Tahoma"); stat = GdipCreateFontFromLogfontA(hdc, &lfa, &font); - if (stat == FileNotFound) - { - skip("Arial not installed.\n"); - return; - } expect(Ok, stat); stat = GdipGetLogFontA(font, graphics, &lfa2); expect(Ok, stat); @@ -146,7 +141,7 @@ lfa.lfItalic = lfa.lfUnderline = lfa.lfStrikeOut = TRUE; memset(&lfa2, 0xff, sizeof(LOGFONTA)); - lstrcpyA(lfa.lfFaceName, "Arial"); + lstrcpyA(lfa.lfFaceName, "Tahoma"); stat = GdipCreateFontFromLogfontA(hdc, &lfa, &font); expect(Ok, stat); @@ -173,6 +168,60 @@ ok (style == (FontStyleItalic | FontStyleUnderline | FontStyleStrikeout), "Expected , got %d\n", style); + stat = GdipGetFontUnit(font, &unit); + expect(Ok, stat); + expect(UnitWorld, unit); + + stat = GdipGetFontHeight(font, graphics, &rval); + expect(Ok, stat); + expectf(25.347656, rval); + stat = GdipGetFontSize(font, &rval); + expect(Ok, stat); + expectf(21.0, rval); + + stat = GdipGetFamily(font, &family); + expect(Ok, stat); + stat = GdipGetEmHeight(family, FontStyleRegular, &em_height); + expect(Ok, stat); + expect(2048, em_height); + stat = GdipGetLineSpacing(family, FontStyleRegular, &line_spacing); + expect(Ok, stat); + expect(2472, line_spacing); + GdipDeleteFontFamily(family); + + GdipDeleteFont(font); + + memset(&lfa, 0, sizeof(lfa)); + lfa.lfHeight = -25; + lstrcpyA(lfa.lfFaceName, "Tahoma"); + stat = GdipCreateFontFromLogfontA(hdc, &lfa, &font); + expect(Ok, stat); + memset(&lfa2, 0xff, sizeof(lfa2)); + stat = GdipGetLogFontA(font, graphics, &lfa2); + expect(Ok, stat); + expect(lfa.lfHeight, lfa2.lfHeight); + + stat = GdipGetFontUnit(font, &unit); + expect(Ok, stat); + expect(UnitWorld, unit); + + stat = GdipGetFontHeight(font, graphics, &rval); + expect(Ok, stat); + expectf(30.175781, rval); + stat = GdipGetFontSize(font, &rval); + expect(Ok, stat); + expectf(25.0, rval); + + stat = GdipGetFamily(font, &family); + expect(Ok, stat); + stat = GdipGetEmHeight(family, FontStyleRegular, &em_height); + expect(Ok, stat); + expect(2048, em_height); + stat = GdipGetLineSpacing(family, FontStyleRegular, &line_spacing); + expect(Ok, stat); + expect(2472, line_spacing); + GdipDeleteFontFamily(family); + GdipDeleteFont(font); GdipDeleteGraphics(graphics); @@ -186,7 +235,7 @@ GpStatus stat; /* FontFamily cannot be NULL */ - stat = GdipCreateFontFamilyFromName (arial , NULL, NULL); + stat = GdipCreateFontFamilyFromName (Tahoma , NULL, NULL); expect (InvalidParameter, stat); /* FontFamily must be able to actually find the family. @@ -200,17 +249,12 @@ expect (FontFamilyNotFound, stat); if(stat == Ok) GdipDeleteFontFamily(family); - stat = GdipCreateFontFamilyFromName (arial, NULL, &family); - if(stat == FontFamilyNotFound) - { - skip("Arial not installed\n"); - return; - } + stat = GdipCreateFontFamilyFromName (Tahoma, NULL, &family); expect (Ok, stat); stat = GdipGetFamilyName (family, itsName, LANG_NEUTRAL); expect (Ok, stat); - expect (0, lstrcmpiW(itsName, arial)); + expect (0, lstrcmpiW(itsName, Tahoma)); if (0) { @@ -226,7 +270,7 @@ GdipDeleteFontFamily(family); stat = GdipGetFamilyName(clonedFontFamily, itsName, LANG_NEUTRAL); expect(Ok, stat); - expect(0, lstrcmpiW(itsName, arial)); + expect(0, lstrcmpiW(itsName, Tahoma)); GdipDeleteFontFamily(clonedFontFamily); } @@ -237,28 +281,25 @@ GpStatus stat; UINT16 result = 0; - stat = GdipCreateFontFamilyFromName(arial, NULL, &FontFamily); - if(stat == FontFamilyNotFound) - skip("Arial not installed\n"); - else - { - stat = GdipGetLineSpacing(FontFamily, FontStyleRegular, &result); - expect(Ok, stat); - ok (result == 2355, "Expected 2355, got %d\n", result); - result = 0; - stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result); - expect(Ok, stat); - ok(result == 2048, "Expected 2048, got %d\n", result); - result = 0; - stat = GdipGetCellAscent(FontFamily, FontStyleRegular, &result); - expect(Ok, stat); - ok(result == 1854, "Expected 1854, got %d\n", result); - result = 0; - stat = GdipGetCellDescent(FontFamily, FontStyleRegular, &result); - expect(Ok, stat); - ok(result == 434, "Expected 434, got %d\n", result); - GdipDeleteFontFamily(FontFamily); - } + stat = GdipCreateFontFamilyFromName(Tahoma, NULL, &FontFamily); + expect(Ok, stat); + + stat = GdipGetLineSpacing(FontFamily, FontStyleRegular, &result); + expect(Ok, stat); + ok (result == 2472, "Expected 2472, got %d\n", result); + result = 0; + stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result); + expect(Ok, stat); + ok(result == 2048, "Expected 2048, got %d\n", result); + result = 0; + stat = GdipGetCellAscent(FontFamily, FontStyleRegular, &result); + expect(Ok, stat); + ok(result == 2049, "Expected 2049, got %d\n", result); + result = 0; + stat = GdipGetCellDescent(FontFamily, FontStyleRegular, &result); + expect(Ok, stat); + ok(result == 423, "Expected 423, got %d\n", result); + GdipDeleteFontFamily(FontFamily); stat = GdipCreateFontFamilyFromName(TimesNewRoman, NULL, &FontFamily); if(stat == FontFamilyNotFound) @@ -362,13 +403,9 @@ GpFont* font = NULL; GpFontFamily* fontfamily = NULL; REAL height; - - stat = GdipCreateFontFamilyFromName(arial, NULL, &fontfamily); - if(stat == FontFamilyNotFound) - { - skip("Arial not installed\n"); - return; - } + Unit unit; + + stat = GdipCreateFontFamilyFromName(Tahoma, NULL, &fontfamily); expect(Ok, stat); stat = GdipCreateFont(fontfamily, 30, FontStyleRegular, UnitPixel, &font); @@ -382,15 +419,20 @@ stat = GdipGetFontHeightGivenDPI(font, 96, &height); expect(Ok, stat); - expectf((REAL)34.497070, height); + expectf(36.210938, height); GdipDeleteFont(font); height = 12345; stat = GdipCreateFont(fontfamily, 30, FontStyleRegular, UnitWorld, &font); expect(Ok, stat); + + stat = GdipGetFontUnit(font, &unit); + expect(Ok, stat); + expect(UnitWorld, unit); + stat = GdipGetFontHeightGivenDPI(font, 96, &height); expect(Ok, stat); - expectf((REAL)34.497070, height); + expectf(36.210938, height); GdipDeleteFont(font); height = 12345; @@ -398,34 +440,286 @@ expect(Ok, stat); stat = GdipGetFontHeightGivenDPI(font, 96, &height); expect(Ok, stat); - expectf((REAL)45.996094, height); + expectf(48.281250, height); GdipDeleteFont(font); height = 12345; stat = GdipCreateFont(fontfamily, 30, FontStyleRegular, UnitInch, &font); expect(Ok, stat); + + stat = GdipGetFontUnit(font, &unit); + expect(Ok, stat); + expect(UnitInch, unit); + stat = GdipGetFontHeightGivenDPI(font, 96, &height); expect(Ok, stat); - expectf((REAL)3311.718750, height); + expectf(3476.250000, height); GdipDeleteFont(font); height = 12345; stat = GdipCreateFont(fontfamily, 30, FontStyleRegular, UnitDocument, &font); expect(Ok, stat); + + stat = GdipGetFontUnit(font, &unit); + expect(Ok, stat); + expect(UnitDocument, unit); + stat = GdipGetFontHeightGivenDPI(font, 96, &height); expect(Ok, stat); - expectf((REAL)11.039062, height); + expectf(11.587500, height); GdipDeleteFont(font); height = 12345; stat = GdipCreateFont(fontfamily, 30, FontStyleRegular, UnitMillimeter, &font); expect(Ok, stat); + + stat = GdipGetFontUnit(font, &unit); + expect(Ok, stat); + expect(UnitMillimeter, unit); + stat = GdipGetFontHeightGivenDPI(font, 96, &height); expect(Ok, stat); - expectf((REAL)130.382614, height); + expectf(136.860245, height); GdipDeleteFont(font); GdipDeleteFontFamily(fontfamily); +} + +static int CALLBACK font_enum_proc(const LOGFONTW *lfe, const TEXTMETRICW *ntme, + DWORD type, LPARAM lparam) +{ + NEWTEXTMETRICW *ntm = (NEWTEXTMETRICW *)lparam; + + if (type != TRUETYPE_FONTTYPE) return 1; + + *ntm = *(NEWTEXTMETRICW *)ntme; + return 0; +} + +struct font_metrics +{ + UINT16 em_height, line_spacing, ascent, descent; + REAL font_height, font_size; + INT lfHeight; +}; + +static void gdi_get_font_metrics(LOGFONTW *lf, struct font_metrics *fm) +{ + HDC hdc; + HFONT hfont; + NEWTEXTMETRICW ntm; + OUTLINETEXTMETRICW otm; + int ret; + + hdc = CreateCompatibleDC(0); + + /* it's the only way to get extended NEWTEXTMETRIC fields */ + ret = EnumFontFamiliesExW(hdc, lf, font_enum_proc, (LPARAM)&ntm, 0); + ok(!ret, "EnumFontFamiliesExW failed to find %s\n", wine_dbgstr_w(lf->lfFaceName)); + + hfont = CreateFontIndirectW(lf); + SelectObject(hdc, hfont); + + otm.otmSize = sizeof(otm); + ret = GetOutlineTextMetricsW(hdc, otm.otmSize, &otm); + ok(ret, "GetOutlineTextMetrics failed\n"); + + DeleteDC(hdc); + DeleteObject(hfont); + + fm->lfHeight = -otm.otmTextMetrics.tmAscent; + fm->line_spacing = ntm.ntmCellHeight; + fm->font_size = (REAL)otm.otmTextMetrics.tmAscent; + fm->font_height = (REAL)fm->line_spacing * fm->font_size / (REAL)ntm.ntmSizeEM; + fm->em_height = ntm.ntmSizeEM; + fm->ascent = ntm.ntmSizeEM; + fm->descent = ntm.ntmCellHeight - ntm.ntmSizeEM; +} + +static void gdip_get_font_metrics(GpFont *font, struct font_metrics *fm) +{ + INT style; + GpFontFamily *family; + GpStatus stat; + + stat = GdipGetFontStyle(font, &style); + expect(Ok, stat); + + stat = GdipGetFontHeight(font, NULL, &fm->font_height); + expect(Ok, stat); + stat = GdipGetFontSize(font, &fm->font_size); + expect(Ok, stat); + + fm->lfHeight = (INT)(fm->font_size * -1.0); + + stat = GdipGetFamily(font, &family); + expect(Ok, stat); + + stat = GdipGetEmHeight(family, style, &fm->em_height); + expect(Ok, stat); + stat = GdipGetLineSpacing(family, style, &fm->line_spacing); + expect(Ok, stat); + stat = GdipGetCellAscent(family, style, &fm->ascent); + expect(Ok, stat); + stat = GdipGetCellDescent(family, style, &fm->descent); + expect(Ok, stat); + + GdipDeleteFontFamily(family); +} + +static void cmp_font_metrics(struct font_metrics *fm1, struct font_metrics *fm2, int line) +{ + ok_(__FILE__, line)(fm1->lfHeight == fm2->lfHeight, "lfHeight %d != %d\n", fm1->lfHeight, fm2->lfHeight); + ok_(__FILE__, line)(fm1->em_height == fm2->em_height, "em_height %u != %u\n", fm1->em_height, fm2->em_height); + ok_(__FILE__, line)(fm1->line_spacing == fm2->line_spacing, "line_spacing %u != %u\n", fm1->line_spacing, fm2->line_spacing); + ok_(__FILE__, line)(abs(fm1->ascent - fm2->ascent) <= 1, "ascent %u != %u\n", fm1->ascent, fm2->ascent); + ok_(__FILE__, line)(abs(fm1->descent - fm2->descent) <= 1, "descent %u != %u\n", fm1->descent, fm2->descent); + ok(fm1->font_height > 0.0, "fm1->font_height should be positive, got %f\n", fm1->font_height); + ok(fm2->font_height > 0.0, "fm2->font_height should be positive, got %f\n", fm2->font_height); + ok_(__FILE__, line)(fm1->font_height == fm2->font_height, "font_height %f != %f\n", fm1->font_height, fm2->font_height); + ok(fm1->font_size > 0.0, "fm1->font_size should be positive, got %f\n", fm1->font_size); + ok(fm2->font_size > 0.0, "fm2->font_size should be positive, got %f\n", fm2->font_size); + ok_(__FILE__, line)(fm1->font_size == fm2->font_size, "font_size %f != %f\n", fm1->font_size, fm2->font_size); +} + +static void test_font_metrics(void) +{ + LOGFONTW lf; + GpFont *font; + GpFontFamily *family; + GpGraphics *graphics; + GpStatus stat; + Unit unit; + struct font_metrics fm_gdi, fm_gdip; + HDC hdc; + + hdc = CreateCompatibleDC(0); + stat = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, stat); + + memset(&lf, 0, sizeof(lf)); + + /* Tahoma,-13 */ + lstrcpyW(lf.lfFaceName, Tahoma); + lf.lfHeight = -13; + stat = GdipCreateFontFromLogfontW(hdc, &lf, &font); + expect(Ok, stat); + + stat = GdipGetFontUnit(font, &unit); + expect(Ok, stat); + expect(UnitWorld, unit); + + gdip_get_font_metrics(font, &fm_gdip); + trace("gdiplus:\n"); + trace("%s,%d: EmHeight %u, LineSpacing %u, CellAscent %u, CellDescent %u, FontHeight %f, FontSize %f\n", + wine_dbgstr_w(lf.lfFaceName), lf.lfHeight, + fm_gdip.em_height, fm_gdip.line_spacing, fm_gdip.ascent, fm_gdip.descent, + fm_gdip.font_height, fm_gdip.font_size); + + gdi_get_font_metrics(&lf, &fm_gdi); + trace("gdi:\n"); + trace("%s,%d: EmHeight %u, LineSpacing %u, CellAscent %u, CellDescent %u, FontHeight %f, FontSize %f\n", + wine_dbgstr_w(lf.lfFaceName), lf.lfHeight, + fm_gdi.em_height, fm_gdi.line_spacing, fm_gdi.ascent, fm_gdi.descent, + fm_gdi.font_height, fm_gdi.font_size); + + cmp_font_metrics(&fm_gdip, &fm_gdi, __LINE__); + + stat = GdipGetLogFontW(font, graphics, &lf); + expect(Ok, stat); + ok(lf.lfHeight < 0, "lf.lfHeight should be negative, got %d\n", lf.lfHeight); + gdi_get_font_metrics(&lf, &fm_gdi); + trace("gdi:\n"); + trace("%s,%d: EmHeight %u, LineSpacing %u, CellAscent %u, CellDescent %u, FontHeight %f, FontSize %f\n", + wine_dbgstr_w(lf.lfFaceName), lf.lfHeight, + fm_gdi.em_height, fm_gdi.line_spacing, fm_gdi.ascent, fm_gdi.descent, + fm_gdi.font_height, fm_gdi.font_size); + ok((REAL)lf.lfHeight * -1.0 == fm_gdi.font_size, "expected %f, got %f\n", (REAL)lf.lfHeight * -1.0, fm_gdi.font_size); + + cmp_font_metrics(&fm_gdip, &fm_gdi, __LINE__); + + GdipDeleteFont(font); + + /* Tahoma,13 */ + lstrcpyW(lf.lfFaceName, Tahoma); + lf.lfHeight = 13; + stat = GdipCreateFontFromLogfontW(hdc, &lf, &font); + expect(Ok, stat); + + stat = GdipGetFontUnit(font, &unit); + expect(Ok, stat); + expect(UnitWorld, unit); + + gdip_get_font_metrics(font, &fm_gdip); + trace("gdiplus:\n"); + trace("%s,%d: EmHeight %u, LineSpacing %u, CellAscent %u, CellDescent %u, FontHeight %f, FontSize %f\n", + wine_dbgstr_w(lf.lfFaceName), lf.lfHeight, + fm_gdip.em_height, fm_gdip.line_spacing, fm_gdip.ascent, fm_gdip.descent, + fm_gdip.font_height, fm_gdip.font_size); + + gdi_get_font_metrics(&lf, &fm_gdi); + trace("gdi:\n"); + trace("%s,%d: EmHeight %u, LineSpacing %u, CellAscent %u, CellDescent %u, FontHeight %f, FontSize %f\n", + wine_dbgstr_w(lf.lfFaceName), lf.lfHeight, + fm_gdi.em_height, fm_gdi.line_spacing, fm_gdi.ascent, fm_gdi.descent, + fm_gdi.font_height, fm_gdi.font_size); + + cmp_font_metrics(&fm_gdip, &fm_gdi, __LINE__); + + stat = GdipGetLogFontW(font, graphics, &lf); + expect(Ok, stat); + ok(lf.lfHeight < 0, "lf.lfHeight should be negative, got %d\n", lf.lfHeight); + gdi_get_font_metrics(&lf, &fm_gdi); + trace("gdi:\n"); + trace("%s,%d: EmHeight %u, LineSpacing %u, CellAscent %u, CellDescent %u, FontHeight %f, FontSize %f\n", + wine_dbgstr_w(lf.lfFaceName), lf.lfHeight, + fm_gdi.em_height, fm_gdi.line_spacing, fm_gdi.ascent, fm_gdi.descent, + fm_gdi.font_height, fm_gdi.font_size); + ok((REAL)lf.lfHeight * -1.0 == fm_gdi.font_size, "expected %f, got %f\n", (REAL)lf.lfHeight * -1.0, fm_gdi.font_size); + + cmp_font_metrics(&fm_gdip, &fm_gdi, __LINE__); + + GdipDeleteFont(font); + + stat = GdipCreateFontFamilyFromName(Tahoma, NULL, &family); + expect(Ok, stat); + + /* Tahoma,13 */ + stat = GdipCreateFont(family, 13.0, FontStyleRegular, UnitPixel, &font); + expect(Ok, stat); + + gdip_get_font_metrics(font, &fm_gdip); + trace("gdiplus:\n"); + trace("%s,%d: EmHeight %u, LineSpacing %u, CellAscent %u, CellDescent %u, FontHeight %f, FontSize %f\n", + wine_dbgstr_w(lf.lfFaceName), lf.lfHeight, + fm_gdip.em_height, fm_gdip.line_spacing, fm_gdip.ascent, fm_gdip.descent, + fm_gdip.font_height, fm_gdip.font_size); + + stat = GdipGetLogFontW(font, graphics, &lf); + expect(Ok, stat); + ok(lf.lfHeight < 0, "lf.lfHeight should be negative, got %d\n", lf.lfHeight); + gdi_get_font_metrics(&lf, &fm_gdi); + trace("gdi:\n"); + trace("%s,%d: EmHeight %u, LineSpacing %u, CellAscent %u, CellDescent %u, FontHeight %f, FontSize %f\n", + wine_dbgstr_w(lf.lfFaceName), lf.lfHeight, + fm_gdi.em_height, fm_gdi.line_spacing, fm_gdi.ascent, fm_gdi.descent, + fm_gdi.font_height, fm_gdi.font_size); + ok((REAL)lf.lfHeight * -1.0 == fm_gdi.font_size, "expected %f, got %f\n", (REAL)lf.lfHeight * -1.0, fm_gdi.font_size); + + cmp_font_metrics(&fm_gdip, &fm_gdi, __LINE__); + + stat = GdipGetLogFontW(font, NULL, &lf); + expect(InvalidParameter, stat); + + GdipDeleteFont(font); + + stat = GdipCreateFont(family, -13.0, FontStyleRegular, UnitPixel, &font); + expect(InvalidParameter, stat); + + GdipDeleteFontFamily(family); + + GdipDeleteGraphics(graphics); + DeleteDC(hdc); } START_TEST(font) @@ -440,6 +734,7 @@ GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + test_font_metrics(); test_createfont(); test_logfont(); test_fontfamily(); Added: trunk/rostests/winetests/gdiplus/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/metafil… ============================================================================== --- trunk/rostests/winetests/gdiplus/metafile.c (added) +++ trunk/rostests/winetests/gdiplus/metafile.c [iso-8859-1] Sat May 19 10:03:49 2012 @@ -1,0 +1,568 @@ +/* + * Unit test suite for metafiles + * + * Copyright (C) 2011 Vincent Povirk for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windows.h" +#include <stdio.h> +#include "gdiplus.h" +#include "wine/test.h" + +#define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) + +typedef struct emfplus_record +{ + ULONG todo; + ULONG record_type; + ULONG playback_todo; +} emfplus_record; + +typedef struct emfplus_check_state +{ + const char *desc; + int count; + const struct emfplus_record *expected; + GpMetafile *metafile; +} emfplus_check_state; + +static void check_record(int count, const char *desc, const struct emfplus_record *expected, const struct emfplus_record *actual) +{ + if (expected->todo) + todo_wine ok(expected->record_type == actual->record_type, + "%s.%i: Expected record type 0x%x, got 0x%x\n", desc, count, + expected->record_type, actual->record_type); + else + ok(expected->record_type == actual->record_type, + "%s.%i: Expected record type 0x%x, got 0x%x\n", desc, count, + expected->record_type, actual->record_type); +} + +typedef struct EmfPlusRecordHeader +{ + WORD Type; + WORD Flags; + DWORD Size; + DWORD DataSize; +} EmfPlusRecordHeader; + +static int CALLBACK enum_emf_proc(HDC hDC, HANDLETABLE *lpHTable, const ENHMETARECORD *lpEMFR, + int nObj, LPARAM lpData) +{ + emfplus_check_state *state = (emfplus_check_state*)lpData; + emfplus_record actual; + + if (lpEMFR->iType == EMR_GDICOMMENT) + { + const EMRGDICOMMENT *comment = (const EMRGDICOMMENT*)lpEMFR; + + if (comment->cbData >= 4 && memcmp(comment->Data, "EMF+", 4) == 0) + { + int offset = 4; + + while (offset + sizeof(EmfPlusRecordHeader) <= comment->cbData) + { + const EmfPlusRecordHeader *record = (const EmfPlusRecordHeader*)&comment->Data[offset]; + + ok(record->Size == record->DataSize + sizeof(EmfPlusRecordHeader), + "%s: EMF+ record datasize %u and size %u mismatch\n", state->desc, record->DataSize, record->Size); + + ok(offset + record->DataSize <= comment->cbData, + "%s: EMF+ record truncated\n", state->desc); + + if (offset + record->DataSize > comment->cbData) + return 0; + + if (state->expected[state->count].record_type) + { + actual.todo = 0; + actual.record_type = record->Type; + + check_record(state->count, state->desc, &state->expected[state->count], &actual); + + state->count++; + } + else + { + ok(0, "%s: Unexpected EMF+ 0x%x record\n", state->desc, record->Type); + } + + offset += record->Size; + } + + ok(offset == comment->cbData, "%s: truncated EMF+ record data?\n", state->desc); + + return 1; + } + } + + if (state->expected[state->count].record_type) + { + actual.todo = 0; + actual.record_type = lpEMFR->iType; + + check_record(state->count, state->desc, &state->expected[state->count], &actual); + + state->count++; + } + else + { + ok(0, "%s: Unexpected EMF 0x%x record\n", state->desc, lpEMFR->iType); + } + + return 1; +} + +static void check_emfplus(HENHMETAFILE hemf, const emfplus_record *expected, const char *desc) +{ + emfplus_check_state state; + + state.desc = desc; + state.count = 0; + state.expected = expected; + + EnumEnhMetaFile(0, hemf, enum_emf_proc, &state, NULL); + + if (expected[state.count].todo) + todo_wine ok(expected[state.count].record_type == 0, "%s: Got %i records, expecting more\n", desc, state.count); + else + ok(expected[state.count].record_type == 0, "%s: Got %i records, expecting more\n", desc, state.count); +} + +static BOOL CALLBACK enum_metafile_proc(EmfPlusRecordType record_type, unsigned int flags, + unsigned int dataSize, const unsigned char *pStr, void *userdata) +{ + emfplus_check_state *state = (emfplus_check_state*)userdata; + emfplus_record actual; + + actual.todo = 0; + actual.record_type = record_type; + + if (dataSize == 0) + ok(pStr == NULL, "non-NULL pStr\n"); + + if (state->expected[state->count].record_type) + { + check_record(state->count, state->desc, &state->expected[state->count], &actual); + + state->count++; + } + else + { + ok(0, "%s: Unexpected EMF 0x%x record\n", state->desc, record_type); + } + + return TRUE; +} + +static void check_metafile(GpMetafile *metafile, const emfplus_record *expected, const char *desc, + const GpPointF *dst_points, const GpRectF *src_rect, Unit src_unit) +{ + GpStatus stat; + HDC hdc; + GpGraphics *graphics; + emfplus_check_state state; + + state.desc = desc; + state.count = 0; + state.expected = expected; + state.metafile = metafile; + + hdc = CreateCompatibleDC(0); + + stat = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, stat); + + stat = GdipEnumerateMetafileSrcRectDestPoints(graphics, metafile, dst_points, + 3, src_rect, src_unit, enum_metafile_proc, &state, NULL); + expect(Ok, stat); + + if (expected[state.count].todo) + todo_wine ok(expected[state.count].record_type == 0, "%s: Got %i records, expecting more\n", desc, state.count); + else + ok(expected[state.count].record_type == 0, "%s: Got %i records, expecting more\n", desc, state.count); + + GdipDeleteGraphics(graphics); + + DeleteDC(hdc); +} + +static BOOL CALLBACK play_metafile_proc(EmfPlusRecordType record_type, unsigned int flags, + unsigned int dataSize, const unsigned char *pStr, void *userdata) +{ + emfplus_check_state *state = (emfplus_check_state*)userdata; + GpStatus stat; + + stat = GdipPlayMetafileRecord(state->metafile, record_type, flags, dataSize, pStr); + + if (state->expected[state->count].record_type) + { + if (state->expected[state->count].playback_todo) + todo_wine ok(stat == Ok, "%s.%i: GdipPlayMetafileRecord failed with stat %i\n", state->desc, state->count, stat); + else + ok(stat == Ok, "%s.%i: GdipPlayMetafileRecord failed with stat %i\n", state->desc, state->count, stat); + state->count++; + } + else + { + if (state->expected[state->count].playback_todo) + todo_wine ok(0, "%s: too many records\n", state->desc); + else + ok(0, "%s: too many records\n", state->desc); + + return FALSE; + } + + return TRUE; +} + +static void play_metafile(GpMetafile *metafile, GpGraphics *graphics, const emfplus_record *expected, + const char *desc, const GpPointF *dst_points, const GpRectF *src_rect, Unit src_unit) +{ + GpStatus stat; + emfplus_check_state state; + + state.desc = desc; + state.count = 0; + state.expected = expected; + state.metafile = metafile; + + stat = GdipEnumerateMetafileSrcRectDestPoints(graphics, metafile, dst_points, + 3, src_rect, src_unit, play_metafile_proc, &state, NULL); + expect(Ok, stat); +} + +static const emfplus_record empty_records[] = { + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, + {0} +}; + +static void test_empty(void) +{ + GpStatus stat; + GpMetafile *metafile; + GpGraphics *graphics; + HDC hdc; + HENHMETAFILE hemf, dummy; + BOOL ret; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(NULL, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(InvalidParameter, stat); + + stat = GdipRecordMetafile(hdc, MetafileTypeInvalid, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(InvalidParameter, stat); + + stat = GdipRecordMetafile(hdc, MetafileTypeWmf, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(InvalidParameter, stat); + + stat = GdipRecordMetafile(hdc, MetafileTypeWmfPlaceable, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(InvalidParameter, stat); + + stat = GdipRecordMetafile(hdc, MetafileTypeEmfPlusDual+1, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(InvalidParameter, stat); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, NULL); + expect(InvalidParameter, stat); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + + DeleteDC(hdc); + + if (stat != Ok) + return; + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(InvalidParameter, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(InvalidParameter, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + check_metafile(metafile, empty_records, "empty metafile", dst_points, &frame, UnitPixel); + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(Ok, stat); + + stat = GdipGetHemfFromMetafile(metafile, &dummy); + expect(InvalidParameter, stat); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); + + check_emfplus(hemf, empty_records, "empty emf"); + + ret = DeleteEnhMetaFile(hemf); + ok(ret != 0, "Failed to delete enhmetafile %p\n", hemf); +} + +static const emfplus_record getdc_records[] = { + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {0, EmfPlusRecordTypeGetDC}, + {0, EMR_CREATEBRUSHINDIRECT}, + {0, EMR_SELECTOBJECT}, + {0, EMR_RECTANGLE}, + {0, EMR_SELECTOBJECT}, + {0, EMR_DELETEOBJECT}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, + {0} +}; + +static void test_getdc(void) +{ + GpStatus stat; + GpMetafile *metafile; + GpGraphics *graphics; + HDC hdc, metafile_dc; + HENHMETAFILE hemf; + BOOL ret; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; + static const GpPointF dst_points_half[3] = {{0.0,0.0},{50.0,0.0},{0.0,50.0}}; + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + HBRUSH hbrush, holdbrush; + GpBitmap *bitmap; + ARGB color; + + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + + DeleteDC(hdc); + + if (stat != Ok) + return; + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(InvalidParameter, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipGetDC(graphics, &metafile_dc); + expect(Ok, stat); + + if (stat != Ok) + { + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)metafile); + return; + } + + hbrush = CreateSolidBrush(0xff0000); + + holdbrush = SelectObject(metafile_dc, hbrush); + + Rectangle(metafile_dc, 25, 25, 75, 75); + + SelectObject(metafile_dc, holdbrush); + + DeleteObject(hbrush); + + stat = GdipReleaseDC(graphics, metafile_dc); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + check_metafile(metafile, getdc_records, "getdc metafile", dst_points, &frame, UnitPixel); + + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + play_metafile(metafile, graphics, getdc_records, "getdc playback", dst_points, &frame, UnitPixel); + + stat = GdipBitmapGetPixel(bitmap, 15, 15, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); + expect(Ok, stat); + expect(0xff0000ff, color); + + stat = GdipBitmapSetPixel(bitmap, 50, 50, 0); + expect(Ok, stat); + + play_metafile(metafile, graphics, getdc_records, "getdc playback", dst_points_half, &frame, UnitPixel); + + stat = GdipBitmapGetPixel(bitmap, 15, 15, &color); + expect(Ok, stat); + expect(0xff0000ff, color); + + stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, stat); + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); + + check_emfplus(hemf, getdc_records, "getdc emf"); + + ret = DeleteEnhMetaFile(hemf); + ok(ret != 0, "Failed to delete enhmetafile %p\n", hemf); +} + +static const emfplus_record emfonly_records[] = { + {0, EMR_HEADER}, + {0, EMR_CREATEBRUSHINDIRECT}, + {0, EMR_SELECTOBJECT}, + {0, EMR_RECTANGLE}, + {0, EMR_SELECTOBJECT}, + {0, EMR_DELETEOBJECT}, + {0, EMR_EOF}, + {0} +}; + +static void test_emfonly(void) +{ + GpStatus stat; + GpMetafile *metafile; + GpGraphics *graphics; + HDC hdc, metafile_dc; + HENHMETAFILE hemf; + BOOL ret; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + HBRUSH hbrush, holdbrush; + GpBitmap *bitmap; + ARGB color; + + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + + DeleteDC(hdc); + + if (stat != Ok) + return; + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(InvalidParameter, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipGetDC(graphics, &metafile_dc); + expect(Ok, stat); + + if (stat != Ok) + { + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)metafile); + return; + } + + hbrush = CreateSolidBrush(0xff0000); + + holdbrush = SelectObject(metafile_dc, hbrush); + + Rectangle(metafile_dc, 25, 25, 75, 75); + + SelectObject(metafile_dc, holdbrush); + + DeleteObject(hbrush); + + stat = GdipReleaseDC(graphics, metafile_dc); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + check_metafile(metafile, emfonly_records, "emfonly metafile", dst_points, &frame, UnitPixel); + + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + play_metafile(metafile, graphics, emfonly_records, "emfonly playback", dst_points, &frame, UnitPixel); + + stat = GdipBitmapGetPixel(bitmap, 15, 15, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); + expect(Ok, stat); + expect(0xff0000ff, color); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, stat); + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); + + check_emfplus(hemf, emfonly_records, "emfonly emf"); + + ret = DeleteEnhMetaFile(hemf); + ok(ret != 0, "Failed to delete enhmetafile %p\n", hemf); +} + +START_TEST(metafile) +{ + struct GdiplusStartupInput gdiplusStartupInput; + ULONG_PTR gdiplusToken; + + gdiplusStartupInput.GdiplusVersion = 1; + gdiplusStartupInput.DebugEventCallback = NULL; + gdiplusStartupInput.SuppressBackgroundThread = 0; + gdiplusStartupInput.SuppressExternalCodecs = 0; + + GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + + test_empty(); + test_getdc(); + test_emfonly(); + + GdiplusShutdown(gdiplusToken); +} Propchange: trunk/rostests/winetests/gdiplus/metafile.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/winetests/gdiplus/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/testlis… ============================================================================== --- trunk/rostests/winetests/gdiplus/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/testlist.c [iso-8859-1] Sat May 19 10:03:49 2012 @@ -13,6 +13,7 @@ extern void func_graphicspath(void); extern void func_image(void); extern void func_matrix(void); +extern void func_metafile(void); extern void func_pathiterator(void); extern void func_pen(void); extern void func_region(void); @@ -21,12 +22,13 @@ const struct test winetest_testlist[] = { { "brush", func_brush }, - { "customlinecap", func_customlinecap }, + { "customlinecap", func_customlinecap }, { "font", func_font }, { "graphics", func_graphics }, { "graphicspath", func_graphicspath }, { "image", func_image }, { "matrix", func_matrix }, + { "metafile", func_metafile }, { "pathiterator", func_pathiterator }, { "pen", func_pen }, { "region", func_region },

1 0

[akhaldi] 56613: [GDIPLUS] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 10:03:40 2012 New Revision: 56613 URL: http://svn.reactos.org/svn/reactos?rev=56613&view=rev Log: [GDIPLUS] * Sync to Wine 1.5.4. Modified: trunk/reactos/dll/win32/gdiplus/CMakeLists.txt trunk/reactos/dll/win32/gdiplus/brush.c trunk/reactos/dll/win32/gdiplus/font.c trunk/reactos/dll/win32/gdiplus/gdiplus.c trunk/reactos/dll/win32/gdiplus/gdiplus.spec trunk/reactos/dll/win32/gdiplus/gdiplus_private.h trunk/reactos/dll/win32/gdiplus/graphics.c trunk/reactos/dll/win32/gdiplus/graphicspath.c trunk/reactos/dll/win32/gdiplus/image.c trunk/reactos/dll/win32/gdiplus/imageattributes.c trunk/reactos/include/psdk/gdiplusflat.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/gdiplus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/CMakeLis… Modified: trunk/reactos/dll/win32/gdiplus/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/brush.c?… Modified: trunk/reactos/dll/win32/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/font.c?r… Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… Modified: trunk/reactos/dll/win32/gdiplus/gdiplus_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus_… Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… Modified: trunk/reactos/dll/win32/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… Modified: trunk/reactos/dll/win32/gdiplus/imageattributes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/imageatt… Modified: trunk/reactos/include/psdk/gdiplusflat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusflat.h… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 56612: [FUSION_WINETEST] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 09:41:19 2012 New Revision: 56612 URL: http://svn.reactos.org/svn/reactos?rev=56612&view=rev Log: [FUSION_WINETEST] * Sync to Wine 1.5.4. Modified: trunk/rostests/winetests/fusion/asmcache.c Modified: trunk/rostests/winetests/fusion/asmcache.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/fusion/asmcache… ============================================================================== --- trunk/rostests/winetests/fusion/asmcache.c [iso-8859-1] (original) +++ trunk/rostests/winetests/fusion/asmcache.c [iso-8859-1] Sat May 19 09:41:19 2012 @@ -888,7 +888,6 @@ ULONG disp; DWORD attr; char dllpath[MAX_PATH]; - UINT size; static const WCHAR empty[] = {0}; static const WCHAR noext[] = {'f','i','l','e',0}; @@ -942,7 +941,7 @@ hr = IAssemblyCache_InstallAssembly(cache, 0, winedll, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - size = GetWindowsDirectoryA(dllpath, MAX_PATH); + GetWindowsDirectoryA(dllpath, MAX_PATH); strcat(dllpath, "\\assembly\\GAC_MSIL\\wine\\\\1.0.0.0__2d03617b1c31e2f5\\wine.dll"); attr = GetFileAttributes(dllpath); @@ -951,19 +950,18 @@ /* uninstall the assembly from the GAC */ disp = 0xf00dbad; hr = IAssemblyCache_UninstallAssembly(cache, 0, wine, NULL, &disp); - todo_wine - { - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(disp == IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, - "Expected IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, got %d\n", disp); - } - - /* FIXME: remove once UninstallAssembly is implemented */ - DeleteFileA(dllpath); - dllpath[size + sizeof("\\assembly\\GAC_MSIL\\wine\\1.0.0.0__2d03617b1c31e2f5")] = '\0'; - RemoveDirectoryA(dllpath); - dllpath[size + sizeof("\\assembly\\GAC_MSIL\\wine")] = '\0'; - RemoveDirectoryA(dllpath); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(disp == IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, + "Expected IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, got %d\n", disp); + + attr = GetFileAttributes(dllpath); + ok(attr == INVALID_FILE_ATTRIBUTES, "Expected assembly not to exist\n"); + + disp = 0xf00dbad; + hr = IAssemblyCache_UninstallAssembly(cache, 0, wine, NULL, &disp); + ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); + ok(disp == IASSEMBLYCACHE_UNINSTALL_DISPOSITION_ALREADY_UNINSTALLED, + "Expected IASSEMBLYCACHE_UNINSTALL_DISPOSITION_ALREADY_UNINSTALLED, got %d\n", disp); DeleteFileA("test.dll"); DeleteFileA("wine.dll"); @@ -987,8 +985,6 @@ HRESULT hr; DWORD size; ULONG disp; - char dllpath[MAX_PATH]; - UINT len; static const WCHAR empty[] = {0}; static const WCHAR commasep[] = {',',' ',0}; @@ -1485,24 +1481,27 @@ ok(info.cchBuf == lstrlenW(asmpath) + 1, "Expected %d, got %d\n", lstrlenW(asmpath) + 1, info.cchBuf); + /* no flags, display name is "wine, Version=1.0.0.0" */ + INIT_ASM_INFO(); + info.pszCurrentAssemblyPathBuf = NULL; + info.cchBuf = 0; + lstrcpyW(name, wine); + lstrcatW(name, commasep); + lstrcatW(name, ver); + hr = IAssemblyCache_QueryAssemblyInfo(cache, 0, name, &info); + ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), + "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); + ok(info.cbAssemblyInfo == sizeof(ASSEMBLY_INFO), + "Expected sizeof(ASSEMBLY_INFO), got %d\n", info.cbAssemblyInfo); + ok(info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED, + "Expected ASSEMBLYINFO_FLAG_INSTALLED, got %08x\n", info.dwAssemblyFlags); + /* uninstall the assembly from the GAC */ disp = 0xf00dbad; hr = IAssemblyCache_UninstallAssembly(cache, 0, wine, NULL, &disp); - todo_wine - { - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(disp == IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, - "Expected IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, got %d\n", disp); - } - - /* FIXME: remove once UninstallAssembly is implemented */ - len = GetWindowsDirectoryA(dllpath, MAX_PATH); - strcat(dllpath, "\\assembly\\GAC_MSIL\\wine\\\\1.0.0.0__2d03617b1c31e2f5\\wine.dll"); - DeleteFileA(dllpath); - dllpath[len + sizeof("\\assembly\\GAC_MSIL\\wine\\1.0.0.0__2d03617b1c31e2f5")] = '\0'; - RemoveDirectoryA(dllpath); - dllpath[len + sizeof("\\assembly\\GAC_MSIL\\wine")] = '\0'; - RemoveDirectoryA(dllpath); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(disp == IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, + "Expected IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, got %d\n", disp); DeleteFileA("test.dll"); DeleteFileA("wine.dll");

1 0

[akhaldi] 56611: [FUSION] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 09:41:07 2012 New Revision: 56611 URL: http://svn.reactos.org/svn/reactos?rev=56611&view=rev Log: [FUSION] * Sync to Wine 1.5.4. Modified: trunk/reactos/dll/win32/fusion/CMakeLists.txt trunk/reactos/dll/win32/fusion/asmcache.c trunk/reactos/dll/win32/fusion/asmname.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] Sat May 19 09:41:07 2012 @@ -1,9 +1,6 @@ add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() spec2def(fusion.dll fusion.spec) @@ -19,11 +16,10 @@ ${CMAKE_CURRENT_BINARY_DIR}/fusion.def) add_library(fusion SHARED ${SOURCE}) - set_module_type(fusion win32dll) target_link_libraries(fusion wine uuid) add_importlibs(fusion shlwapi advapi32 dbghelp user32 msvcrt kernel32 ntdll) add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.0.3705 FOR all) add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.1.4322 FOR all) add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v2.0.50727 FOR all) -add_cd_file(TARGET fusion DESTINATION reactos/system32 FOR all) +add_cd_file(TARGET fusion DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/fusion/asmcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmcache.… ============================================================================== --- trunk/reactos/dll/win32/fusion/asmcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/asmcache.c [iso-8859-1] Sat May 19 09:41:07 2012 @@ -41,6 +41,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(fusion); +static const WCHAR cache_mutex_nameW[] = + {'_','_','W','I','N','E','_','F','U','S','I','O','N','_','C','A','C','H','E','_','M','U','T','E','X','_','_',0}; + static BOOL create_full_path(LPCWSTR path) { LPWSTR new_path; @@ -126,6 +129,7 @@ IAssemblyCache IAssemblyCache_iface; LONG ref; + HANDLE lock; } IAssemblyCacheImpl; static inline IAssemblyCacheImpl *impl_from_IAssemblyCache(IAssemblyCache *iface) @@ -166,15 +170,27 @@ static ULONG WINAPI IAssemblyCacheImpl_Release(IAssemblyCache *iface) { - IAssemblyCacheImpl *This = impl_from_IAssemblyCache(iface); - ULONG refCount = InterlockedDecrement(&This->ref); - - TRACE("(%p)->(ref before = %u)\n", This, refCount + 1); + IAssemblyCacheImpl *cache = impl_from_IAssemblyCache(iface); + ULONG refCount = InterlockedDecrement( &cache->ref ); + + TRACE("(%p)->(ref before = %u)\n", cache, refCount + 1); if (!refCount) - HeapFree(GetProcessHeap(), 0, This); - + { + CloseHandle( cache->lock ); + HeapFree( GetProcessHeap(), 0, cache ); + } return refCount; +} + +static void cache_lock( IAssemblyCacheImpl *cache ) +{ + WaitForSingleObject( cache->lock, INFINITE ); +} + +static void cache_unlock( IAssemblyCacheImpl *cache ) +{ + ReleaseMutex( cache->lock ); } static HRESULT WINAPI IAssemblyCacheImpl_UninstallAssembly(IAssemblyCache *iface, @@ -183,10 +199,81 @@ LPCFUSION_INSTALL_REFERENCE pRefData, ULONG *pulDisposition) { - FIXME("(%p, %d, %s, %p, %p) stub!\n", iface, dwFlags, + HRESULT hr; + IAssemblyCacheImpl *cache = impl_from_IAssemblyCache(iface); + IAssemblyName *asmname, *next = NULL; + IAssemblyEnum *asmenum = NULL; + WCHAR *p, *path = NULL; + ULONG disp; + DWORD len; + + TRACE("(%p, 0%08x, %s, %p, %p)\n", iface, dwFlags, debugstr_w(pszAssemblyName), pRefData, pulDisposition); - return E_NOTIMPL; + if (pRefData) + { + FIXME("application reference not supported\n"); + return E_NOTIMPL; + } + hr = CreateAssemblyNameObject( &asmname, pszAssemblyName, CANOF_PARSE_DISPLAY_NAME, NULL ); + if (FAILED( hr )) + return hr; + + cache_lock( cache ); + + hr = CreateAssemblyEnum( &asmenum, NULL, asmname, ASM_CACHE_GAC, NULL ); + if (FAILED( hr )) + goto done; + + hr = IAssemblyEnum_GetNextAssembly( asmenum, NULL, &next, 0 ); + if (hr == S_FALSE) + { + if (pulDisposition) + *pulDisposition = IASSEMBLYCACHE_UNINSTALL_DISPOSITION_ALREADY_UNINSTALLED; + goto done; + } + hr = IAssemblyName_GetPath( next, NULL, &len ); + if (hr != HRESULT_FROM_WIN32( ERROR_INSUFFICIENT_BUFFER )) + goto done; + + if (!(path = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + { + hr = E_OUTOFMEMORY; + goto done; + } + hr = IAssemblyName_GetPath( next, path, &len ); + if (FAILED( hr )) + goto done; + + if (DeleteFileW( path )) + { + if ((p = strrchrW( path, '\\' ))) + { + *p = 0; + RemoveDirectoryW( path ); + if ((p = strrchrW( path, '\\' ))) + { + *p = 0; + RemoveDirectoryW( path ); + } + } + disp = IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED; + hr = S_OK; + } + else + { + disp = IASSEMBLYCACHE_UNINSTALL_DISPOSITION_ALREADY_UNINSTALLED; + hr = S_FALSE; + } + if (pulDisposition) *pulDisposition = disp; + +done: + IAssemblyName_Release( asmname ); + if (next) IAssemblyName_Release( next ); + if (asmenum) IAssemblyEnum_Release( asmenum ); + HeapFree( GetProcessHeap(), 0, path ); + cache_unlock( cache ); + return hr; } static HRESULT WINAPI IAssemblyCacheImpl_QueryAssemblyInfo(IAssemblyCache *iface, @@ -194,6 +281,7 @@ LPCWSTR pszAssemblyName, ASSEMBLY_INFO *pAsmInfo) { + IAssemblyCacheImpl *cache = impl_from_IAssemblyCache(iface); IAssemblyName *asmname, *next = NULL; IAssemblyEnum *asmenum = NULL; HRESULT hr; @@ -214,6 +302,8 @@ if (FAILED(hr)) return hr; + cache_lock( cache ); + hr = CreateAssemblyEnum(&asmenum, NULL, asmname, ASM_CACHE_GAC, NULL); if (FAILED(hr)) goto done; @@ -236,7 +326,7 @@ IAssemblyName_Release(asmname); if (next) IAssemblyName_Release(next); if (asmenum) IAssemblyEnum_Release(asmenum); - + cache_unlock( cache ); return hr; } @@ -264,9 +354,10 @@ LPCWSTR pszManifestFilePath, LPCFUSION_INSTALL_REFERENCE pRefData) { - static const WCHAR format[] = - {'%','s','\\','%','s','\\','%','s','_','_','%','s','\\',0}; - + static const WCHAR format[] = {'%','s','\\','%','s','\\','%','s','_','_','%','s','\\',0}; + static const WCHAR ext_exe[] = {'.','e','x','e',0}; + static const WCHAR ext_dll[] = {'.','d','l','l',0}; + IAssemblyCacheImpl *cache = impl_from_IAssemblyCache(iface); ASSEMBLY *assembly; LPWSTR filename; LPWSTR name = NULL; @@ -278,9 +369,6 @@ LPWSTR ext; HRESULT hr; - static const WCHAR ext_exe[] = {'.','e','x','e',0}; - static const WCHAR ext_dll[] = {'.','d','l','l',0}; - TRACE("(%p, %d, %s, %p)\n", iface, dwFlags, debugstr_w(pszManifestFilePath), pRefData); @@ -314,6 +402,8 @@ hr = assembly_get_version(assembly, &version); if (FAILED(hr)) goto done; + + cache_lock( cache ); get_assembly_directory(asmdir, MAX_PATH, assembly_get_architecture(assembly)); @@ -337,6 +427,7 @@ HeapFree(GetProcessHeap(), 0, version); HeapFree(GetProcessHeap(), 0, asmpath); assembly_release(assembly); + cache_unlock( cache ); return hr; } @@ -371,9 +462,13 @@ cache->IAssemblyCache_iface.lpVtbl = &AssemblyCacheVtbl; cache->ref = 1; - + cache->lock = CreateMutexW( NULL, FALSE, cache_mutex_nameW ); + if (!cache->lock) + { + HeapFree( GetProcessHeap(), 0, cache ); + return HRESULT_FROM_WIN32( GetLastError() ); + } *ppAsmCache = &cache->IAssemblyCache_iface; - return S_OK; } Modified: trunk/reactos/dll/win32/fusion/asmname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmname.c… ============================================================================== --- trunk/reactos/dll/win32/fusion/asmname.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/asmname.c [iso-8859-1] Sat May 19 09:41:07 2012 @@ -666,7 +666,7 @@ IAssemblyNameImpl *name; HRESULT hr; - TRACE("(%p, %s, %08x, %p) stub!\n", ppAssemblyNameObj, + TRACE("(%p, %s, %08x, %p)\n", ppAssemblyNameObj, debugstr_w(szAssemblyName), dwFlags, pvReserved); if (!ppAssemblyNameObj) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat May 19 09:41:07 2012 @@ -60,7 +60,7 @@ reactos/dll/win32/dbghelp # Synced to Wine-1.3.37 reactos/dll/win32/dciman32 # Synced to Wine-1.3.37 reactos/dll/win32/dwmapi # Synced to Wine-1.3.37 -reactos/dll/win32/fusion # Synced to Wine-1.3.37 +reactos/dll/win32/fusion # Synced to Wine-1.5.4 reactos/dll/win32/gdiplus # Synced to Wine-1.3.37 reactos/dll/win32/hhctrl.ocx # Autosync reactos/dll/win32/hlink # Synced to Wine-1.3.37

1 0

[akhaldi] 56610: [MSSIGN32] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 09:26:02 2012 New Revision: 56610 URL: http://svn.reactos.org/svn/reactos?rev=56610&view=rev Log: [MSSIGN32] * Sync to Wine 1.5.4. Modified: trunk/reactos/dll/win32/mssign32/CMakeLists.txt trunk/reactos/dll/win32/mssign32/mssign32.spec trunk/reactos/dll/win32/mssign32/mssign32_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mssign32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mssign32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/mssign32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mssign32/CMakeLists.txt [iso-8859-1] Sat May 19 09:26:02 2012 @@ -10,11 +10,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/mssign32.def) add_library(mssign32 SHARED ${SOURCE}) - set_module_type(mssign32 win32dll) - target_link_libraries(mssign32 wine) - add_importlibs(mssign32 msvcrt kernel32 ntdll) - add_cd_file(TARGET mssign32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/mssign32/mssign32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mssign32/mssign3… ============================================================================== --- trunk/reactos/dll/win32/mssign32/mssign32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mssign32/mssign32.spec [iso-8859-1] Sat May 19 09:26:02 2012 @@ -2,11 +2,11 @@ @ stub -private DllUnregisterServer @ stub FreeCryptProvFromCert @ stub GetCryptProvFromCert -@ stub PvkFreeCryptProv -@ stub PvkGetCryptProv +@ stdcall PvkFreeCryptProv(ptr wstr long wstr) +@ stdcall PvkGetCryptProv(ptr wstr wstr long wstr wstr ptr ptr ptr) @ stub PvkPrivateKeyAcquireContext @ stub PvkPrivateKeyAcquireContextA -@ stub PvkPrivateKeyAcquireContextFromMemory +@ stdcall PvkPrivateKeyAcquireContextFromMemory(wstr long ptr long ptr wstr ptr ptr ptr) @ stub PvkPrivateKeyAcquireContextFromMemoryA @ stub PvkPrivateKeyLoad @ stub PvkPrivateKeyLoadA Modified: trunk/reactos/dll/win32/mssign32/mssign32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mssign32/mssign3… ============================================================================== --- trunk/reactos/dll/win32/mssign32/mssign32_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mssign32/mssign32_main.c [iso-8859-1] Sat May 19 09:26:02 2012 @@ -24,7 +24,11 @@ #include "windef.h" #include "winbase.h" +#include "wincrypt.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mssign); BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) { @@ -40,3 +44,33 @@ } return TRUE; } + + +HRESULT WINAPI PvkGetCryptProv(HWND hwnd, LPCWSTR pwszCaption, LPCWSTR pwszCapiProvider, + DWORD dwProviderType, LPCWSTR pwszPvkFile, LPCWSTR pwszKeyContainerName, + DWORD *pdwKeySpec, LPWSTR *ppwszTmpContainer, HCRYPTPROV *phCryptProv) +{ + FIXME("%p %s %s %d %s %s %p %p %p stub\n", hwnd, debugstr_w(pwszCaption), debugstr_w(pwszCapiProvider), + dwProviderType, debugstr_w(pwszPvkFile), debugstr_w(pwszKeyContainerName), + pdwKeySpec, ppwszTmpContainer, phCryptProv); + + return E_FAIL; +} + +BOOL WINAPI PvkPrivateKeyAcquireContextFromMemory(LPCWSTR pwszProvName, DWORD dwProvType, + BYTE *pbData, DWORD cbData, HWND hwndOwner, LPCWSTR pwszKeyName, + DWORD *pdwKeySpec, HCRYPTPROV *phCryptProv, LPWSTR *ppwszTmpContainer) +{ + FIXME("%s %d %p %d %p %s %p %p %p stub\n", debugstr_w(pwszProvName), dwProvType, + pbData, cbData, hwndOwner, debugstr_w(pwszKeyName), pdwKeySpec, + phCryptProv, ppwszTmpContainer); + + return FALSE; +} + +void WINAPI PvkFreeCryptProv(HCRYPTPROV hProv, LPCWSTR pwszCapiProvider, DWORD dwProviderType, + LPWSTR pwszTmpContainer) +{ + FIXME("%08lx %s %d %s stub\n", hProv, debugstr_w(pwszCapiProvider), dwProviderType, + debugstr_w(pwszTmpContainer)); +} Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat May 19 09:26:02 2012 @@ -109,7 +109,7 @@ reactos/dll/win32/msisys.ocx # Synced to Wine-1.3.37 reactos/dll/win32/msnet32 # Synced to Wine-1.3.37 reactos/dll/win32/msrle32 # Autosync -reactos/dll/win32/mssign32 # Synced to Wine-1.3.37 +reactos/dll/win32/mssign32 # Synced to Wine-1.5.4 reactos/dll/win32/mssip32 # Synced to Wine-1.3.37 reactos/dll/win32/mstask # Synced to Wine-1.3.37 reactos/dll/win32/msvcrt20 # Autosync

1 0

[jimtabor] 56609: [Win32SS] - Fix test_child_window_from_point results. - Turn on process layout. - Miscellaneous changes and fixups.
by jimtabor＠svn.reactos.org 19 May '12

19 May '12

Author: jimtabor Date: Sat May 19 04:40:37 2012 New Revision: 56609 URL: http://svn.reactos.org/svn/reactos?rev=56609&view=rev Log: [Win32SS] - Fix test_child_window_from_point results. - Turn on process layout. - Miscellaneous changes and fixups. Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c trunk/reactos/win32ss/user/ntuser/winpos.c trunk/reactos/win32ss/user/ntuser/winpos.h trunk/reactos/win32ss/user/user32/misc/stubs.c trunk/reactos/win32ss/user/user32/user32.spec trunk/reactos/win32ss/user/user32/windows/window.c Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Sat May 19 04:40:37 2012 @@ -908,17 +908,6 @@ return 0; } -BOOL -APIENTRY -NtUserGetLayeredWindowAttributes( - HWND hwnd, - COLORREF *pcrKey, - BYTE *pbAlpha, - DWORD *pdwFlags) -{ - STUB; - return 0; -} DWORD APIENTRY @@ -1018,19 +1007,6 @@ /* * @unimplemented */ -HWND APIENTRY -NtUserRealChildWindowFromPoint(HWND Parent, - LONG x, - LONG y) -{ - STUB - - return 0; -} - -/* - * @unimplemented - */ DWORD APIENTRY NtUserSetImeOwnerWindow(DWORD Unknown0, DWORD Unknown1) @@ -1038,6 +1014,18 @@ STUB return 0; +} + +BOOL +APIENTRY +NtUserGetLayeredWindowAttributes( + HWND hwnd, + COLORREF *pcrKey, + BYTE *pbAlpha, + DWORD *pdwFlags) +{ + STUB; + return 0; } /* Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Sat May 19 04:40:37 2012 @@ -150,10 +150,8 @@ if (!Wnd) return FALSE; style = Wnd->style; - if (!(style & WS_VISIBLE) && - Wnd->head.pti->pEThread->ThreadsProcess != CsrProcess) return FALSE; - if ((style & WS_MINIMIZE) && - Wnd->head.pti->pEThread->ThreadsProcess != CsrProcess) return FALSE; + if (!(style & WS_VISIBLE)) return FALSE; + if (style & WS_MINIMIZE) return FALSE; if ((style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return FALSE; return TRUE; /* FIXME: This window could be disable because the child that closed @@ -1783,8 +1781,10 @@ WPARAM wParam = SIZE_RESTORED; IntGetClientRect(Wnd, &Rect); + lParam = MAKELONG(Rect.right-Rect.left, Rect.bottom-Rect.top); Wnd->state &= ~WNDS_SENDSIZEMOVEMSGS; + if (Wnd->style & WS_MAXIMIZE) { wParam = SIZE_MAXIMIZED; @@ -1792,9 +1792,10 @@ else if (Wnd->style & WS_MINIMIZE) { wParam = SIZE_MINIMIZED; + lParam = 0; } - co_IntSendMessageNoWait(UserHMGetHandle(Wnd), WM_SIZE, wParam, MAKELONG(Rect.right-Rect.left, Rect.bottom-Rect.top)); + co_IntSendMessageNoWait(UserHMGetHandle(Wnd), WM_SIZE, wParam, lParam); if (Wnd->spwndParent == UserGetDesktopWindow()) // Wnd->spwndParent->fnid != FNID_DESKTOP ) lParam = MAKELONG(Wnd->rcClient.left, Wnd->rcClient.top); @@ -2010,8 +2011,7 @@ UserReferenceObject(ScopeWin); - if (Point->x - ScopeWin->rcClient.left < ScopeWin->rcClient.right && - Point->y - ScopeWin->rcClient.top < ScopeWin->rcClient.bottom ) + if ( RECTL_bPointInRect(&ScopeWin->rcClient, Point->x, Point->y) ) { List = IntWinListChildren(ScopeWin); if(List) @@ -2075,6 +2075,99 @@ ASSERT_REFS_CO(ScopeWin); return Window; +} + +PWND FASTCALL +IntRealChildWindowFromPoint(PWND Parent, LONG x, LONG y) +{ + POINTL Pt; + HWND *List, *phWnd; + PWND pwndHit = NULL; + + Pt.x = x; + Pt.y = y; + + if (Parent != UserGetDesktopWindow()) + { + Pt.x += Parent->rcClient.left; + Pt.y += Parent->rcClient.top; + } + + if (!IntPtInWindow(Parent, Pt.x, Pt.y)) return NULL; + + if ((List = IntWinListChildren(Parent))) + { + for (phWnd = List; *phWnd; phWnd++) + { + PWND Child; + if ((Child = UserGetWindowObject(*phWnd))) + { + if ( Child->style & WS_VISIBLE && IntPtInWindow(Child, Pt.x, Pt.y) ) + { + if ( Child->pcls->atomClassName != gpsi->atomSysClass[ICLS_BUTTON] || + (Child->style & BS_TYPEMASK) != BS_GROUPBOX ) + { + ExFreePool(List); + return Child; + } + pwndHit = Child; + } + } + } + ExFreePool(List); + } + return pwndHit ? pwndHit : Parent; +} + +PWND APIENTRY +IntChildWindowFromPointEx(PWND Parent, LONG x, LONG y, UINT uiFlags) +{ + POINTL Pt; + HWND *List, *phWnd; + PWND pwndHit = NULL; + + Pt.x = x; + Pt.y = y; + + if (Parent != UserGetDesktopWindow()) + { + if (Parent->ExStyle & WS_EX_LAYOUTRTL) + Pt.x = Parent->rcClient.right - Pt.x; + else + Pt.x += Parent->rcClient.left; + Pt.y += Parent->rcClient.top; + } + + if (!IntPtInWindow(Parent, Pt.x, Pt.y)) return NULL; + + if ((List = IntWinListChildren(Parent))) + { + for (phWnd = List; *phWnd; phWnd++) + { + PWND Child; + if ((Child = UserGetWindowObject(*phWnd))) + { + if (uiFlags & (CWP_SKIPINVISIBLE|CWP_SKIPDISABLED)) + { + if (!(Child->style & WS_VISIBLE) && (uiFlags & CWP_SKIPINVISIBLE)) continue; + if ((Child->style & WS_DISABLED) && (uiFlags & CWP_SKIPDISABLED)) continue; + } + + if (uiFlags & CWP_SKIPTRANSPARENT) + { + if (Child->ExStyle & WS_EX_TRANSPARENT) continue; + } + + if (IntPtInWindow(Child, Pt.x, Pt.y)) + { + pwndHit = Child; + break; + } + } + } + ExFreePool(List); + } + return pwndHit ? pwndHit : Parent; } HDWP @@ -2191,7 +2284,7 @@ winpos->pos.hwnd, winpos->pos.hwndInsertAfter, winpos->pos.x, winpos->pos.y, winpos->pos.cx, winpos->pos.cy, winpos->pos.flags); - pwnd = UserGetWindowObject(winpos->pos.hwnd); + pwnd = (PWND)UserGetObject(gHandleTable, winpos->pos.hwnd, otWindow); if (!pwnd) continue; @@ -2207,7 +2300,7 @@ /* Yes it's a pointer inside Win32k! */ lRes = co_IntSendMessageNoWait( winpos->pos.hwnd, WM_ASYNC_SETWINDOWPOS, 0, (LPARAM)ppos); /* We handle this the same way as Event Hooks and Hooks. */ - if ( -1 == (int) lRes ) + if ( !lRes ) { ExFreePoolWithTag(ppos, USERTAG_SWP); } @@ -2240,61 +2333,16 @@ LONG y, UINT uiFlags) { - PWND Parent; - POINTL Pt; - HWND Ret; - HWND *List, *phWnd; - - if(!(Parent = UserGetWindowObject(hwndParent))) - { - return NULL; - } - - Pt.x = x; - Pt.y = y; - - if(Parent->head.h != IntGetDesktopWindow()) - { - Pt.x += Parent->rcClient.left; - Pt.y += Parent->rcClient.top; - } - - if(!IntPtInWindow(Parent, Pt.x, Pt.y)) - { - return NULL; - } - - Ret = Parent->head.h; - if((List = IntWinListChildren(Parent))) - { - for(phWnd = List; *phWnd; phWnd++) - { - PWND Child; - if((Child = UserGetWindowObject(*phWnd))) - { - if(!(Child->style & WS_VISIBLE) && (uiFlags & CWP_SKIPINVISIBLE)) - { - continue; - } - if((Child->style & WS_DISABLED) && (uiFlags & CWP_SKIPDISABLED)) - { - continue; - } - if((Child->ExStyle & WS_EX_TRANSPARENT) && (uiFlags & CWP_SKIPTRANSPARENT)) - { - continue; - } - if(IntPtInWindow(Child, Pt.x, Pt.y)) - { - Ret = Child->head.h; - break; - } - } - } - ExFreePool(List); - } - - return Ret; + PWND pwndParent; + TRACE("Enter NtUserChildWindowFromPointEx\n"); + UserEnterExclusive(); + if ((pwndParent = UserGetWindowObject(hwndParent))) + { + pwndParent = IntChildWindowFromPointEx(pwndParent, x, y, uiFlags); + } + UserLeave(); + TRACE("Leave NtUserChildWindowFromPointEx\n"); + return pwndParent ? UserHMGetHandle(pwndParent) : NULL; } /* @@ -2521,9 +2569,9 @@ goto Exit; } - co_WinPosMinMaximize(pWnd, cmd, &NewPos); - - SwFlags = Hide ? SWP_NOACTIVATE|SWP_NOZORDER|SWP_FRAMECHANGED : SWP_NOZORDER|SWP_FRAMECHANGED; + SwFlags = co_WinPosMinMaximize(pWnd, cmd, &NewPos); + + SwFlags |= Hide ? SWP_NOACTIVATE : 0; co_WinPosSetWindowPos( pWnd, NULL, @@ -2556,6 +2604,26 @@ return NtUserSetWindowPos(hWnd, 0, X, Y, nWidth, nHeight, (bRepaint ? SWP_NOZORDER | SWP_NOACTIVATE : SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW)); +} + +/* + * @implemented + */ +HWND APIENTRY +NtUserRealChildWindowFromPoint(HWND Parent, + LONG x, + LONG y) +{ + PWND pwndParent; + TRACE("Enter NtUserRealChildWindowFromPoint\n"); + UserEnterShared(); + if ((pwndParent = UserGetWindowObject(Parent))) + { + pwndParent = IntRealChildWindowFromPoint(pwndParent, x, y); + } + UserLeave(); + TRACE("Leave NtUserRealChildWindowFromPoint\n"); + return pwndParent ? UserHMGetHandle(pwndParent) : NULL; } /* Modified: trunk/reactos/win32ss/user/ntuser/winpos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.h [iso-8859-1] Sat May 19 04:40:37 2012 @@ -53,4 +53,5 @@ BOOLEAN FASTCALL co_WinPosShowWindow(PWND Window, INT Cmd); void FASTCALL co_WinPosSendSizeMove(PWND Window); PWND FASTCALL co_WinPosWindowFromPoint(PWND ScopeWin, POINT *WinPoint, USHORT* HitTest); -VOID FASTCALL co_WinPosActivateOtherWindow(PWND Window); +VOID FASTCALL co_WinPosActivateOtherWindow(PWND); +PWND FASTCALL IntRealChildWindowFromPoint(PWND,LONG,LONG); Modified: trunk/reactos/win32ss/user/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/s… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/stubs.c [iso-8859-1] Sat May 19 04:40:37 2012 @@ -67,28 +67,6 @@ PCLIENTINFO pci = GetWin32ClientInfo(); return pci->dwCompatFlags2; -} - -/* - * @unimplemented - */ -UINT -WINAPI -GetInternalWindowPos( - HWND hwnd, - LPRECT rectWnd, - LPPOINT ptIcon - ) -{ - WINDOWPLACEMENT wndpl; - - if (GetWindowPlacement(hwnd, &wndpl)) - { - if (rectWnd) *rectWnd = wndpl.rcNormalPosition; - if (ptIcon) *ptIcon = wndpl.ptMinPosition; - return wndpl.showCmd; - } - return 0; } /* Modified: trunk/reactos/win32ss/user/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/user32… ============================================================================== --- trunk/reactos/win32ss/user/user32/user32.spec [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/user32.spec [iso-8859-1] Sat May 19 04:40:37 2012 @@ -286,7 +286,7 @@ @ stdcall GetIconInfo(long ptr) @ stdcall GetInputDesktop() @ stdcall GetInputState() -@ stdcall GetInternalWindowPos(long ptr ptr) ; direct call NtUserGetInternalWindowPos +@ stdcall GetInternalWindowPos(long ptr ptr) NtUserGetInternalWindowPos @ stdcall GetKBCodePage() @ stdcall GetKeyNameTextA(long ptr long) @ stdcall GetKeyNameTextW(long ptr long) Modified: trunk/reactos/win32ss/user/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] Sat May 19 04:40:37 2012 @@ -1028,21 +1028,12 @@ /* - * @unimplemented + * @implemented */ BOOL WINAPI GetProcessDefaultLayout(DWORD *pdwDefaultLayout) { - if (!pdwDefaultLayout) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - UNIMPLEMENTED; - - *pdwDefaultLayout = 0; - return TRUE; +return (BOOL)NtUserCallOneParam( (DWORD_PTR)pdwDefaultLayout, ONEPARAM_ROUTINE_GETPROCDEFLAYOUT); } @@ -1659,7 +1650,7 @@ RealChildWindowFromPoint(HWND hwndParent, POINT ptParentClientCoords) { - return ChildWindowFromPointEx(hwndParent, ptParentClientCoords, CWP_SKIPTRANSPARENT | CWP_SKIPINVISIBLE); + return NtUserRealChildWindowFromPoint(hwndParent, ptParentClientCoords.x, ptParentClientCoords.y); } /* @@ -1673,16 +1664,12 @@ /* - * @unimplemented + * @implemented */ BOOL WINAPI SetProcessDefaultLayout(DWORD dwDefaultLayout) { - if (dwDefaultLayout == 0) - return TRUE; - - UNIMPLEMENTED; - return FALSE; +return NtUserCallOneParam( (DWORD_PTR)dwDefaultLayout, ONEPARAM_ROUTINE_SETPROCDEFLAYOUT); }

1 0

[jimtabor] 56608: [Win32k] - Fix all the wine Win test_SetForegroundWindow and todo tests.
by jimtabor＠svn.reactos.org 18 May '12

18 May '12

Author: jimtabor Date: Fri May 18 18:08:54 2012 New Revision: 56608 URL: http://svn.reactos.org/svn/reactos?rev=56608&view=rev Log: [Win32k] - Fix all the wine Win test_SetForegroundWindow and todo tests. Modified: trunk/reactos/win32ss/user/ntuser/focus.c trunk/reactos/win32ss/user/ntuser/simplecall.c Modified: trunk/reactos/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/focus.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] Fri May 18 18:08:54 2012 @@ -229,6 +229,38 @@ return NULL; } +VOID FASTCALL +FindRemoveAsyncMsg(PWND Wnd) +{ + PUSER_MESSAGE_QUEUE MessageQueue; + PUSER_SENT_MESSAGE Message; + PLIST_ENTRY Entry; + + if (!Wnd) return; + + MessageQueue = Wnd->head.pti->MessageQueue; + + if (!IsListEmpty(&MessageQueue->SentMessagesListHead)) + { + // Scan sent queue messages to see if we received async messages. + Entry = MessageQueue->SentMessagesListHead.Flink; + Message = CONTAINING_RECORD(Entry, USER_SENT_MESSAGE, ListEntry); + do + { + if (Message->Msg.message == WM_ASYNC_SETACTIVEWINDOW && + Message->Msg.hwnd == UserHMGetHandle(Wnd) && + Message->Msg.wParam == 0 ) + { + TRACE("ASYNC SAW: Found one in the Sent Msg Queue! %p\n", Message->Msg.hwnd); + RemoveEntryList(Entry); // Purge the entry. + } + Entry = Message->ListEntry.Flink; + Message = CONTAINING_RECORD(Entry, USER_SENT_MESSAGE, ListEntry); + } + while (Entry != &MessageQueue->SentMessagesListHead); + } +} + /* Can the system force foreground from one or more conditions. */ @@ -307,15 +339,17 @@ { IntSetFocusMessageQueue(Wnd->head.pti->MessageQueue); gptiForeground = Wnd->head.pti; - fgRet = TRUE; - } -/* - Fix FG Bounce with regedit but breaks test_SFW todos: +/* Henri Verbeet, What happens is that we get the WM_WINE_SETACTIVEWINDOW message sent by the other thread after we already changed the foreground window back to our own window. */ + FindRemoveAsyncMsg(Wnd); // Do this to fix test_SFW todos! + fgRet = TRUE; + } + + // Fix FG Bounce with regedit. if (hWndPrev != hWnd ) { if (PrevForegroundQueue && Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Fri May 18 18:08:54 2012 @@ -569,7 +569,9 @@ break; case HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOW: + TRACE("co_IntSetForegroundWindow 1 %p\n",hWnd); Ret = co_IntSetForegroundWindow(Window); + TRACE("co_IntSetForegroundWindow 2 \n"); break; case HWNDLOCK_ROUTINE_UPDATEWINDOW:

1 0

[ekohl] 56607: [SYSSETUP] - Create builtin LSA accounts. - Add privileges to the accounts.
by ekohl＠svn.reactos.org 17 May '12

17 May '12

Author: ekohl Date: Thu May 17 21:30:30 2012 New Revision: 56607 URL: http://svn.reactos.org/svn/reactos?rev=56607&view=rev Log: [SYSSETUP] - Create builtin LSA accounts. - Add privileges to the accounts. Modified: trunk/reactos/dll/win32/syssetup/globals.h trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/precomp.h trunk/reactos/dll/win32/syssetup/security.c Modified: trunk/reactos/dll/win32/syssetup/globals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/globals… ============================================================================== --- trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] Thu May 17 21:30:30 2012 @@ -64,6 +64,7 @@ /* security.c */ NTSTATUS SetAccountDomain(LPCWSTR DomainName, PSID DomainSid); +VOID InstallSecurity(VOID); /* wizard.c */ VOID InstallWizard (VOID); Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Thu May 17 21:30:30 2012 @@ -956,6 +956,8 @@ InstallWizard(); + InstallSecurity(); + /* Create the Administrator account */ if (!SamCreateUser(L"Administrator", L"", AdminSid)) { Modified: trunk/reactos/dll/win32/syssetup/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/precomp… ============================================================================== --- trunk/reactos/dll/win32/syssetup/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/precomp.h [iso-8859-1] Thu May 17 21:30:30 2012 @@ -22,7 +22,9 @@ #include <string.h> #include <pseh/pseh2.h> #include <time.h> +#include <ntlsa.h> #include <ntsecapi.h> +#include <sddl.h> #include "globals.h" #include "resource.h" Modified: trunk/reactos/dll/win32/syssetup/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/securit… ============================================================================== --- trunk/reactos/dll/win32/syssetup/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/security.c [iso-8859-1] Thu May 17 21:30:30 2012 @@ -85,3 +85,188 @@ return Status; } + + +static +VOID +InstallBuiltinAccounts(VOID) +{ + LPWSTR BuiltinAccounts[] = { + L"S-1-1-0", /* Everyone */ + L"S-1-5-4", /* Interactive */ + L"S-1-5-6", /* Service */ + L"S-1-5-19", /* Local Service */ + L"S-1-5-20", /* Network Service */ + L"S-1-5-32-544", /* Administrators */ + L"S-1-5-32-545", /* Users */ + L"S-1-5-32-547", /* Power Users */ + L"S-1-5-32-551", /* Backup Operators */ + L"S-1-5-32-555"}; /* Remote Desktop Users */ + LSA_OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status; + LSA_HANDLE PolicyHandle = NULL; + LSA_HANDLE AccountHandle = NULL; + PSID AccountSid; + ULONG i; + + DPRINT("InstallBuiltinAccounts()\n"); + + memset(&ObjectAttributes, 0, sizeof(LSA_OBJECT_ATTRIBUTES)); + + Status = LsaOpenPolicy(NULL, + &ObjectAttributes, + POLICY_CREATE_ACCOUNT, + &PolicyHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("LsaOpenPolicy failed (Status %08lx)\n", Status); + return; + } + + for (i = 0; i < 10; i++) + { + ConvertStringSidToSid(BuiltinAccounts[i], &AccountSid); + + Status = LsaCreateAccount(PolicyHandle, + AccountSid, + 0, + &AccountHandle); + if (NT_SUCCESS(Status)) + { + LsaClose(AccountHandle); + } + + LocalFree(AccountSid); + } + + LsaClose(PolicyHandle); +} + + +static +VOID +InstallPrivileges(VOID) +{ + HINF hSecurityInf = INVALID_HANDLE_VALUE; + LSA_OBJECT_ATTRIBUTES ObjectAttributes; + WCHAR szPrivilegeString[256]; + WCHAR szSidString[256]; + INFCONTEXT InfContext; + DWORD i; + PRIVILEGE_SET PrivilegeSet; + PSID AccountSid; + NTSTATUS Status; + LSA_HANDLE PolicyHandle = NULL; + LSA_HANDLE AccountHandle; + + DPRINT("InstallPrivileges()\n"); + + hSecurityInf = SetupOpenInfFileW(L"defltws.inf", //szNameBuffer, + NULL, + INF_STYLE_WIN4, + NULL); + if (hSecurityInf == INVALID_HANDLE_VALUE) + { + DPRINT1("SetupOpenInfFileW failed\n"); + return; + } + + memset(&ObjectAttributes, 0, sizeof(LSA_OBJECT_ATTRIBUTES)); + + Status = LsaOpenPolicy(NULL, + &ObjectAttributes, + POLICY_CREATE_ACCOUNT, + &PolicyHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("LsaOpenPolicy failed (Status %08lx)\n", Status); + goto done; + } + + if (!SetupFindFirstLineW(hSecurityInf, + L"Privilege Rights", + NULL, + &InfContext)) + { + DPRINT1("SetupFindfirstLineW failed\n"); + goto done; + } + + PrivilegeSet.PrivilegeCount = 1; + PrivilegeSet.Control = 0; + + do + { + /* Retrieve the privilege name */ + if (!SetupGetStringFieldW(&InfContext, + 0, + szPrivilegeString, + 256, + NULL)) + { + DPRINT1("SetupGetStringFieldW() failed\n"); + goto done; + } + DPRINT("Privilege: %S\n", szPrivilegeString); + + if (!LookupPrivilegeValueW(NULL, + szPrivilegeString, + &(PrivilegeSet.Privilege[0].Luid))) + { + DPRINT1("LookupPrivilegeNameW() failed\n"); + goto done; + } + + PrivilegeSet.Privilege[0].Attributes = 0; + + for (i = 0; i < SetupGetFieldCount(&InfContext); i++) + { + if (!SetupGetStringFieldW(&InfContext, + i + 1, + szSidString, + 256, + NULL)) + { + DPRINT1("SetupGetStringFieldW() failed\n"); + goto done; + } + DPRINT("SID: %S\n", szSidString); + + ConvertStringSidToSid(szSidString, &AccountSid); + + Status = LsaOpenAccount(PolicyHandle, + AccountSid, + ACCOUNT_VIEW | ACCOUNT_ADJUST_PRIVILEGES, + &AccountHandle); + if (NT_SUCCESS(Status)) + { + Status = LsaAddPrivilegesToAccount(AccountHandle, + &PrivilegeSet); + if (!NT_SUCCESS(Status)) + { + DPRINT1("LsaAddPrivilegesToAccount() failed (Status %08lx)\n", Status); + } + + LsaClose(AccountHandle); + } + + LocalFree(AccountSid); + } + + } + while (SetupFindNextLine(&InfContext, &InfContext)); + +done: + if (PolicyHandle != NULL) + LsaClose(PolicyHandle); + + if (hSecurityInf != INVALID_HANDLE_VALUE) + SetupCloseInfFile(hSecurityInf); +} + +VOID +InstallSecurity(VOID) +{ + InstallBuiltinAccounts(); + InstallPrivileges(); +}

1 0

[tkreuzer] 56606: [GDI32_APITEST] - Create a global 4bpp dib section for tests - More tests for GetDIBits
by tkreuzer＠svn.reactos.org 17 May '12

17 May '12

Author: tkreuzer Date: Thu May 17 18:56:00 2012 New Revision: 56606 URL: http://svn.reactos.org/svn/reactos?rev=56606&view=rev Log: [GDI32_APITEST] - Create a global 4bpp dib section for tests - More tests for GetDIBits Modified: trunk/rostests/apitests/gdi32/GetDIBits.c trunk/rostests/apitests/gdi32/init.c trunk/rostests/apitests/gdi32/init.h Modified: trunk/rostests/apitests/gdi32/GetDIBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetDIBits.… ============================================================================== --- trunk/rostests/apitests/gdi32/GetDIBits.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetDIBits.c [iso-8859-1] Thu May 17 18:56:00 2012 @@ -8,164 +8,429 @@ #include <stdio.h> #include <wine/test.h> #include <windows.h> +#include "init.h" + +void +Test_GetDIBits_xBpp( + ULONG cBitsPixel) +{ + UCHAR ajBuffer[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)]; + PBITMAPINFO pbmi = (PBITMAPINFO)ajBuffer; + HBITMAP hbmp; + ULONG cjSizeImage, cColors; + HDC hdc; + + hdc = GetDC(0); + hbmp = CreateBitmap(3, 3, 1, cBitsPixel, NULL); + + /* Fill in the size field */ + ZeroMemory(pbmi, sizeof(ajBuffer)); + pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + + /* Get info */ + ok_int(GetDIBits(hdc, hbmp, 0, 0, NULL, pbmi, DIB_RGB_COLORS), 1); + cjSizeImage = (((pbmi->bmiHeader.biWidth * pbmi->bmiHeader.biBitCount) + 31) & ~31) * pbmi->bmiHeader.biHeight / 8; + cColors = cBitsPixel <= 8 ? 1 << pbmi->bmiHeader.biBitCount : 0; + + ok_int(pbmi->bmiHeader.biSize, sizeof(BITMAPINFOHEADER)); + ok_int(pbmi->bmiHeader.biWidth, 3); + ok_int(pbmi->bmiHeader.biHeight, 3); + ok_int(pbmi->bmiHeader.biPlanes, 1); + ok_int(pbmi->bmiHeader.biBitCount, cBitsPixel); + ok_int(pbmi->bmiHeader.biCompression, (cBitsPixel == 16) || (cBitsPixel == 32) ? BI_BITFIELDS : BI_RGB); + ok_int(pbmi->bmiHeader.biSizeImage, cjSizeImage); + ok_int(pbmi->bmiHeader.biXPelsPerMeter, 0); + ok_int(pbmi->bmiHeader.biYPelsPerMeter, 0); + ok_int(pbmi->bmiHeader.biClrUsed, cColors); + ok_int(pbmi->bmiHeader.biClrImportant, cColors); + +// pbmi->bmiHeader.biSizeImage = 0; + //ok_int(GetDIBits(NULL, hbmp, 0, 0, NULL, pbmi, DIB_RGB_COLORS), 1); + + /* Test a bitmap with values partly set */ + ZeroMemory(pbmi, sizeof(BITMAPINFO)); + pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbmi->bmiHeader.biWidth = 12; + pbmi->bmiHeader.biHeight = 14; + pbmi->bmiHeader.biPlanes = 2; + pbmi->bmiHeader.biBitCount = 0; // keep biBitCount == 0! + pbmi->bmiHeader.biCompression = 7; + pbmi->bmiHeader.biSizeImage = 123; + ok_int(GetDIBits(hdc, hbmp, 0, 5, NULL, pbmi, DIB_RGB_COLORS), 1); + ok_int(pbmi->bmiHeader.biWidth, 3); + ok_int(pbmi->bmiHeader.biHeight, 3); + ok_int(pbmi->bmiHeader.biPlanes, 1); + ok_int(pbmi->bmiHeader.biBitCount, cBitsPixel); + ok_int(pbmi->bmiHeader.biSizeImage, cjSizeImage); + ok_int(pbmi->bmiHeader.biXPelsPerMeter, 0); + ok_int(pbmi->bmiHeader.biYPelsPerMeter, 0); + ok_int(pbmi->bmiHeader.biClrUsed, cColors); + ok_int(pbmi->bmiHeader.biClrImportant, cColors); + + +#if 0 + /* Get info including the color table */ + ZeroMemory(pbmi, sizeof(ajBuffer)); + pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbmi->bmiHeader.biBitCount = 1; + ok_int(GetDIBits(NULL, hbmp, 0, 0, NULL, pbmi, DIB_PAL_COLORS), 1); + + /* Check a different bit depth */ + pbmi->bmiHeader.biBitCount, cBitsPixel = (cBitsPixel == 1) ? 8 : 1; + ok_int(GetDIBits(hdc, hbmp, 0, 0, NULL, pbmi, DIB_RGB_COLORS), 1); + ok_int(pbmi->bmiHeader.biBitCount, (cBitsPixel == 1) ? 8 : 1); + + /* Get the bits */ + SetLastError(0); + ok_int(GetDIBits(hdc, hbmp, 0, 4, pvBits, pbmi, DIB_PAL_COLORS), 3); + ok_int(GetDIBits(hdc, hbmp, 3, 7, pvBits, pbmi, DIB_RGB_COLORS), 1); + ok_err(0); + + pbmi->bmiHeader.biPlanes = 2; + pbmi->bmiHeader.biClrUsed = 0; + ok_int(GetDIBits(hdc, hbmp, 0, 4, pvBits, pbmi, DIB_RGB_COLORS), 3); +#endif + + DeleteObject(hbmp); + ReleaseDC(NULL, hdc); +} void Test_GetDIBits() { - HDC hdcScreen, hdcMem; - HBITMAP hbmp; - PBITMAPINFO pbi; - INT ret, ScreenBpp; - DWORD ajBits[10] = {0xff, 0x00, 0xcc, 0xf0, 0x0f}; + HDC hdcScreen, hdcMem; + HBITMAP hbmp; + PBITMAPINFO pbi; + PBITMAPCOREHEADER pbch; + PBITMAPV5HEADER pbV5Header; + INT ScreenBpp; + DWORD ajBits[100] = {0xff, 0x00, 0xcc, 0xf0, 0x0f}; + PVOID pvBits; + ULONG cjSizeImage; pbi = malloc(sizeof(BITMAPV5HEADER) + 256 * sizeof(DWORD)); - - hdcScreen = GetDC(NULL); - ok(hdcScreen != 0, "GetDC failed, skipping tests\n"); - if (hdcScreen == NULL) return; + pbch = (PVOID)pbi; + pbV5Header = (PVOID)pbi; + + hdcScreen = GetDC(NULL); + ok(hdcScreen != 0, "GetDC failed, skipping tests\n"); + if (hdcScreen == NULL) return; hdcMem = CreateCompatibleDC(0); - ok(hdcMem != 0, "CreateCompatibleDC failed, skipping tests\n"); - if (hdcMem == NULL) return; - - hbmp = CreateCompatibleBitmap(hdcScreen, 16, 16); - ok(hbmp != NULL, "CreateCompatibleBitmap failed\n"); - - /* misc */ - SetLastError(ERROR_SUCCESS); - ok(GetDIBits(0, 0, 0, 0, NULL, NULL, 0) == 0, "\n"); - ok_err(ERROR_INVALID_PARAMETER); - - SetLastError(ERROR_SUCCESS); - ok(GetDIBits((HDC)2345, 0, 0, 0, NULL, NULL, 0) == 0, "\n"); - ok_err(ERROR_INVALID_PARAMETER); - - SetLastError(ERROR_SUCCESS); - ok(GetDIBits((HDC)2345, hbmp, 0, 0, NULL, NULL, 0) == 0, "\n"); - ok_err(ERROR_INVALID_PARAMETER); - - SetLastError(ERROR_SUCCESS); - ok(GetDIBits((HDC)2345, hbmp, 0, 15, NULL, pbi, 0) == 0, "\n"); - ok_err(ERROR_INVALID_PARAMETER); - - - - /* null hdc */ - SetLastError(ERROR_SUCCESS); - ZeroMemory(pbi, sizeof(BITMAPINFO)); - pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - ok(GetDIBits(NULL, hbmp, 0, 15, NULL, pbi, DIB_RGB_COLORS) == 0, "\n"); - ok_err(ERROR_INVALID_PARAMETER); - - /* null bitmap */ - SetLastError(ERROR_SUCCESS); - ZeroMemory(pbi, sizeof(BITMAPINFO)); - pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - ok(GetDIBits(hdcScreen, NULL, 0, 15, NULL, pbi, DIB_RGB_COLORS) == 0, "\n"); - ok_err(ERROR_SUCCESS); - - /* 0 scan lines */ - SetLastError(ERROR_SUCCESS); - ZeroMemory(pbi, sizeof(BITMAPINFO)); - pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - ok(GetDIBits(hdcScreen, hbmp, 0, 0, NULL, pbi, DIB_RGB_COLORS) > 0, "\n"); - ok_err(ERROR_SUCCESS); - - /* null bitmap info - crashes XP*/ - //SetLastError(ERROR_SUCCESS); - //ok(GetDIBits(hdcScreen, NULL, 0, 15, NULL, NULL, DIB_RGB_COLORS) == 0); - //ok(GetLastError() == ERROR_INVALID_PARAMETER); - - /* bad bmi colours (uUsage) */ - SetLastError(ERROR_SUCCESS); - ZeroMemory(pbi, sizeof(BITMAPINFO)); - pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - ok(GetDIBits(hdcScreen, hbmp, 0, 15, NULL, pbi, 100) == 0, "\n"); - ok_err(ERROR_SUCCESS); - ok(pbi->bmiHeader.biWidth == 0, "\n"); - ok(pbi->bmiHeader.biHeight == 0, "\n"); - ok(pbi->bmiHeader.biBitCount == 0, "\n"); - ok(pbi->bmiHeader.biSizeImage == 0, "\n"); - - /* basic call */ - SetLastError(ERROR_SUCCESS); - ZeroMemory(pbi, sizeof(BITMAPINFO)); - pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - ok(GetDIBits(hdcScreen, hbmp, 0, 15, NULL, pbi, DIB_RGB_COLORS) > 0, "\n"); - ok_err(ERROR_SUCCESS); - ScreenBpp = GetDeviceCaps(hdcScreen, BITSPIXEL); - ok(pbi->bmiHeader.biWidth == 16, "\n"); - ok(pbi->bmiHeader.biHeight == 16, "\n"); - ok(pbi->bmiHeader.biBitCount == ScreenBpp, "\n"); - ok(pbi->bmiHeader.biSizeImage == (16 * 16) * (ScreenBpp / 8), "\n"); + ok(hdcMem != 0, "CreateCompatibleDC failed, skipping tests\n"); + if (hdcMem == NULL) return; + + hbmp = CreateCompatibleBitmap(hdcScreen, 16, 16); + ok(hbmp != NULL, "CreateCompatibleBitmap failed\n"); + + /* misc */ + SetLastError(ERROR_SUCCESS); + ok(GetDIBits(0, 0, 0, 0, NULL, NULL, 0) == 0, "\n"); + ok_err(ERROR_INVALID_PARAMETER); + + SetLastError(ERROR_SUCCESS); + ok(GetDIBits((HDC)2345, 0, 0, 0, NULL, NULL, 0) == 0, "\n"); + ok_err(ERROR_INVALID_PARAMETER); + + SetLastError(ERROR_SUCCESS); + ok(GetDIBits((HDC)2345, hbmp, 0, 0, NULL, NULL, 0) == 0, "\n"); + ok_err(ERROR_INVALID_PARAMETER); + + SetLastError(ERROR_SUCCESS); + ok(GetDIBits((HDC)2345, hbmp, 0, 15, NULL, pbi, 0) == 0, "\n"); + ok_err(ERROR_INVALID_PARAMETER); + + + + /* null hdc */ + SetLastError(ERROR_SUCCESS); + ZeroMemory(pbi, sizeof(BITMAPINFO)); + pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + ok(GetDIBits(NULL, hbmp, 0, 15, NULL, pbi, DIB_RGB_COLORS) == 0, "\n"); + ok_err(ERROR_INVALID_PARAMETER); + + /* null bitmap */ + SetLastError(ERROR_SUCCESS); + ZeroMemory(pbi, sizeof(BITMAPINFO)); + pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + ok(GetDIBits(hdcScreen, NULL, 0, 15, NULL, pbi, DIB_RGB_COLORS) == 0, "\n"); + ok_err(ERROR_SUCCESS); + + /* 0 scan lines */ + SetLastError(ERROR_SUCCESS); + ZeroMemory(pbi, sizeof(BITMAPINFO)); + pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + ok(GetDIBits(hdcScreen, hbmp, 0, 0, NULL, pbi, DIB_RGB_COLORS) > 0, "\n"); + ok_err(ERROR_SUCCESS); + + /* null bitmap info - crashes XP*/ + //SetLastError(ERROR_SUCCESS); + //ok(GetDIBits(hdcScreen, NULL, 0, 15, NULL, NULL, DIB_RGB_COLORS) == 0); + //ok(GetLastError() == ERROR_INVALID_PARAMETER); + + /* bad bmi colours (uUsage) */ + SetLastError(0); + ZeroMemory(pbi, sizeof(BITMAPINFO)); + pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + ok(GetDIBits(hdcScreen, hbmp, 0, 15, NULL, pbi, 100) == 0, "\n"); + ok_err(ERROR_SUCCESS); + ok(pbi->bmiHeader.biWidth == 0, "\n"); + ok(pbi->bmiHeader.biHeight == 0, "\n"); + ok(pbi->bmiHeader.biBitCount == 0, "\n"); + ok(pbi->bmiHeader.biSizeImage == 0, "\n"); + + /* basic call */ + SetLastError(ERROR_SUCCESS); + ZeroMemory(pbi, sizeof(BITMAPINFO)); + pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + ok(GetDIBits(hdcScreen, hbmp, 0, 15, NULL, pbi, DIB_RGB_COLORS) > 0, "\n"); + ok_err(ERROR_SUCCESS); + ScreenBpp = GetDeviceCaps(hdcScreen, BITSPIXEL); + ok(pbi->bmiHeader.biWidth == 16, "\n"); + ok(pbi->bmiHeader.biHeight == 16, "\n"); + ok(pbi->bmiHeader.biBitCount == ScreenBpp, "\n"); + ok(pbi->bmiHeader.biSizeImage == (16 * 16) * (ScreenBpp / 8), "\n"); /* Test if COREHEADER is supported */ - pbi->bmiHeader.biSize = sizeof(BITMAPCOREHEADER); - ok(GetDIBits(hdcScreen, hbmp, 0, 15, NULL, pbi, DIB_RGB_COLORS) > 0, "\n"); - ok(pbi->bmiHeader.biSize == sizeof(BITMAPCOREHEADER), "\n"); + ZeroMemory(pbi, sizeof(BITMAPINFO)); + pbi->bmiHeader.biSize = sizeof(BITMAPCOREHEADER); + ok_int(GetDIBits(hdcScreen, hbmp, 0, 15, NULL, pbi, DIB_RGB_COLORS), 1); + ok_int(pbi->bmiHeader.biSize, sizeof(BITMAPCOREHEADER)); + ok_int(pbch->bcWidth, 16); + ok_int(pbch->bcHeight, 16); + ok_int(pbch->bcPlanes, 1); + //ok_int(pbch->bcBitCount, ScreenBpp > 16 ? 24 : ScreenBpp); // fails on XP with screenbpp == 16 /* Test different header sizes */ - pbi->bmiHeader.biSize = sizeof(BITMAPCOREHEADER) + 4; - ok(GetDIBits(hdcScreen, hbmp, 0, 15, NULL, pbi, DIB_RGB_COLORS) == 0, "should fail.\n"); - pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER) + 4; - ok(GetDIBits(hdcScreen, hbmp, 0, 15, NULL, pbi, DIB_RGB_COLORS) == 0, "should fail.\n"); - pbi->bmiHeader.biSize = sizeof(BITMAPV5HEADER); - ok(GetDIBits(hdcScreen, hbmp, 0, 15, NULL, pbi, DIB_RGB_COLORS) > 0, "should not fail.\n"); - pbi->bmiHeader.biSize = sizeof(BITMAPV5HEADER) + 4; - ok(GetDIBits(hdcScreen, hbmp, 0, 15, NULL, pbi, DIB_RGB_COLORS) > 0, "should not fail.\n"); - - - DeleteObject(hbmp); + ZeroMemory(pbi, sizeof(BITMAPINFO)); + pbi->bmiHeader.biSize = sizeof(BITMAPCOREHEADER) + 4; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 15, NULL, pbi, DIB_RGB_COLORS), 0); + + ZeroMemory(pbi, sizeof(BITMAPINFO)); + pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER) + 4; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 15, NULL, pbi, DIB_RGB_COLORS), 1); + + ZeroMemory(pbi, sizeof(BITMAPINFO)); + pbi->bmiHeader.biSize = sizeof(BITMAPV4HEADER); + ok_int(GetDIBits(hdcScreen, hbmp, 0, 15, NULL, pbi, DIB_RGB_COLORS), 1); + + ZeroMemory(pbi, sizeof(BITMAPINFO)); + pbi->bmiHeader.biSize = sizeof(BITMAPV4HEADER) + 4; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 15, NULL, pbi, DIB_RGB_COLORS), 1); + + ZeroMemory(pbi, sizeof(BITMAPINFO)); + pbi->bmiHeader.biSize = sizeof(BITMAPV5HEADER); + ok_int(GetDIBits(hdcScreen, hbmp, 0, 15, NULL, pbi, DIB_RGB_COLORS), 1); + + ZeroMemory(pbi, sizeof(BITMAPINFO)); + pbi->bmiHeader.biSize = sizeof(BITMAPV5HEADER) + 4; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 15, NULL, pbi, DIB_RGB_COLORS), 1); + ok_int(pbV5Header->bV5RedMask, 0); + ok_int(pbV5Header->bV5GreenMask, 0); + ok_int(pbV5Header->bV5BlueMask, 0); + ok_int(pbV5Header->bV5AlphaMask, 0); + ok_int(pbV5Header->bV5CSType, 0); + // CIEXYZTRIPLE bV5Endpoints; + ok_int(pbV5Header->bV5GammaRed, 0); + ok_int(pbV5Header->bV5GammaGreen, 0); + ok_int(pbV5Header->bV5GammaBlue, 0); + ok_int(pbV5Header->bV5Intent, 0); + ok_int(pbV5Header->bV5ProfileData, 0); + ok_int(pbV5Header->bV5ProfileSize, 0); + ok_int(pbV5Header->bV5Reserved, 0); + + ZeroMemory(pbi, sizeof(BITMAPINFO)); + pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + ok_int(GetDIBits(hdcScreen, hbmp, 234, 43, NULL, pbi, DIB_RGB_COLORS), 1); + + DeleteObject(hbmp); /* Test a mono bitmap */ hbmp = CreateBitmap(13, 7, 1, 1, ajBits); ok(hbmp != 0, "failed to create bitmap\n"); - ZeroMemory(pbi, sizeof(BITMAPINFO)); - pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - ret = GetDIBits(hdcScreen, hbmp, 0, 0, NULL, pbi, DIB_RGB_COLORS); - ok(ret == 1, "%d\n", ret); - ok(pbi->bmiHeader.biWidth == 13, "pbi->bmiHeader.biWidth = %ld\n", pbi->bmiHeader.biWidth); - ok(pbi->bmiHeader.biHeight == 7, "pbi->bmiHeader.biHeight = %ld\n", pbi->bmiHeader.biHeight); - ok(pbi->bmiHeader.biBitCount == 1, "pbi->bmiHeader.biBitCount = %d\n", pbi->bmiHeader.biBitCount); - ok(pbi->bmiHeader.biSizeImage == 28, "pbi->bmiHeader.biSizeImage = %ld\n", pbi->bmiHeader.biSizeImage); - - /* Test a mono bitmap with values set */ - ZeroMemory(pbi, sizeof(BITMAPINFO)); - pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - pbi->bmiHeader.biWidth = 12; - pbi->bmiHeader.biHeight = 9; - pbi->bmiHeader.biPlanes = 1; - pbi->bmiHeader.biBitCount = 32; - pbi->bmiHeader.biCompression = BI_RGB; - pbi->bmiHeader.biSizeImage = 123; - ret = GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS); - ok(ret == 1, "%d\n", ret); - ok(pbi->bmiHeader.biWidth == 12, "pbi->bmiHeader.biWidth = %ld\n", pbi->bmiHeader.biWidth); - ok(pbi->bmiHeader.biHeight == 9, "pbi->bmiHeader.biHeight = %ld\n", pbi->bmiHeader.biHeight); - ok(pbi->bmiHeader.biBitCount == 32, "pbi->bmiHeader.biBitCount = %d\n", pbi->bmiHeader.biBitCount); - ok(pbi->bmiHeader.biSizeImage == 432, "pbi->bmiHeader.biSizeImage = %ld\n", pbi->bmiHeader.biSizeImage); + ZeroMemory(pbi, sizeof(BITMAPINFO)); + pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + ok_int(GetDIBits(hdcScreen, hbmp, 0, 0, NULL, pbi, DIB_RGB_COLORS), 1); + ok_int(pbi->bmiHeader.biWidth, 13); + ok_int(pbi->bmiHeader.biHeight, 7); + ok_int(pbi->bmiHeader.biBitCount, 1); + ok_int(pbi->bmiHeader.biSizeImage, 28); + + /* Test with values set, except biSizeImage */ + pbi->bmiHeader.biSizeImage = 0; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 0, NULL, pbi, DIB_RGB_COLORS), 1); + ok_int(pbi->bmiHeader.biSizeImage, 28); + + /* Test with different biWidth set */ + pbi->bmiHeader.biWidth = 17; + pbi->bmiHeader.biHeight = 3; + pbi->bmiHeader.biSizeImage = 0; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 0, NULL, pbi, DIB_RGB_COLORS), 1); + ok_int(pbi->bmiHeader.biSizeImage, 12); + ok_int(pbi->bmiHeader.biWidth, 17); + ok_int(pbi->bmiHeader.biHeight, 3); + + /* Test with different biBitCount set */ + pbi->bmiHeader.biBitCount = 4; + pbi->bmiHeader.biSizeImage = 0; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 0, NULL, pbi, DIB_RGB_COLORS), 1); + ok_int(pbi->bmiHeader.biSizeImage, 36); + ok_int(pbi->bmiHeader.biBitCount, 4); + + /* Set bitmap dimensions */ + ok_int(SetBitmapDimensionEx(hbmp, 110, 220, NULL), 1); + ZeroMemory(pbi, sizeof(BITMAPINFO)); + pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 1); + ok_int(pbi->bmiHeader.biXPelsPerMeter, 0); + ok_int(pbi->bmiHeader.biYPelsPerMeter, 0); /* Set individual values */ - ZeroMemory(pbi, sizeof(BITMAPINFO)); - pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - pbi->bmiHeader.biWidth = 12; - ret = GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS); - ok(ret == 1, "%d\n", ret); - pbi->bmiHeader.biWidth = 0; - pbi->bmiHeader.biSizeImage = 123; - ret = GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS); - ok(ret == 0, "%d\n", ret); - pbi->bmiHeader.biSizeImage = 0; - pbi->bmiHeader.biCompression = BI_RGB; - ret = GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS); - ok(ret == 0, "%d\n", ret); - - DeleteObject(hbmp); - DeleteDC(hdcMem); - ReleaseDC(NULL, hdcScreen); + ZeroMemory(pbi, sizeof(BITMAPINFO)); + pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbi->bmiHeader.biWidth = 12; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 1); + ok_int(pbi->bmiHeader.biWidth, 13); + ok_int(pbi->bmiHeader.biSizeImage, 28); + + ZeroMemory(pbi, sizeof(BITMAPINFO)); + pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbi->bmiHeader.biSizeImage = 123; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 1); + + ZeroMemory(pbi, sizeof(BITMAPINFO)); + pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbi->bmiHeader.biCompression = BI_RGB; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 1); + + /* Set only biBitCount */ + ZeroMemory(pbi, sizeof(BITMAPINFO)); + pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbi->bmiHeader.biBitCount = 5; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 0); + pbi->bmiHeader.biBitCount = 1; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 0); + pbi->bmiHeader.biBitCount = 8; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 0); + pbi->bmiHeader.biBitCount = 32; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 0); + ok_int(pbi->bmiHeader.biWidth, 0); + ok_int(pbi->bmiHeader.biHeight, 0); + ok_int(pbi->bmiHeader.biPlanes, 0); + ok_int(pbi->bmiHeader.biBitCount, 32); + ok_int(pbi->bmiHeader.biCompression, 0); + ok_int(pbi->bmiHeader.biSizeImage, 0); + + /* Get the bitmap bits */ + pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbi->bmiHeader.biWidth = 4; + pbi->bmiHeader.biHeight = 4; + pbi->bmiHeader.biPlanes = 1; + pbi->bmiHeader.biBitCount = 32; + pbi->bmiHeader.biCompression = BI_RGB; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 1); + pbi->bmiHeader.biWidth = 0; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 0); + pbi->bmiHeader.biWidth = -3; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 0); + pbi->bmiHeader.biWidth = 4; + pbi->bmiHeader.biHeight = 0; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 0); + pbi->bmiHeader.biHeight = -4; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 1); + pbi->bmiHeader.biBitCount = 31; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 0); + pbi->bmiHeader.biBitCount = 16; + pbi->bmiHeader.biPlanes = 23; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 1); + ok_int(pbi->bmiHeader.biPlanes, 1); + pbi->bmiHeader.biCompression = BI_JPEG; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 0); + pbi->bmiHeader.biCompression = BI_PNG; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 0); + + + /* Get the bitmap bits */ + pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbi->bmiHeader.biWidth = 4; + pbi->bmiHeader.biHeight = 4; + pbi->bmiHeader.biPlanes = 1; + pbi->bmiHeader.biBitCount = 32; + pbi->bmiHeader.biCompression = BI_RGB; + pbi->bmiHeader.biSizeImage = 0; + pbi->bmiHeader.biXPelsPerMeter = 0; + pbi->bmiHeader.biYPelsPerMeter = 0; + pbi->bmiHeader.biClrUsed = 0; + pbi->bmiHeader.biClrImportant = 0; + cjSizeImage = ((pbi->bmiHeader.biWidth * pbi->bmiHeader.biBitCount + 31) / 32) * 4 * pbi->bmiHeader.biHeight; + pvBits = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 512); + ok_int(GetDIBits(hdcScreen, hbmp, 0, 4, pvBits, pbi, DIB_RGB_COLORS), 4); + + /* Set biBitCount to 0 */ + pbi->bmiHeader.biBitCount = 0; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 4, pvBits, pbi, DIB_RGB_COLORS), 0); + ok_int(GetDIBits(hdcScreen, hbmp, 0, 4, NULL, pbi, DIB_RGB_COLORS), 1); + ok_int(GetDIBits(NULL, hbmp, 0, 4, NULL, pbi, DIB_RGB_COLORS), 0); + + /* Try different biBitCount and biWidth */ + pbi->bmiHeader.biBitCount = 24; + pbi->bmiHeader.biWidth = 3; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 4, pvBits, pbi, DIB_RGB_COLORS), 4); + + /* Try different biBitCount and biWidth */ + pbi->bmiHeader.biBitCount = 24; + pbi->bmiHeader.biWidth = 3; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 4, pvBits, pbi, DIB_RGB_COLORS), 4); + + /* Set only biBitCount and pjInit */ + ZeroMemory(pbi, sizeof(BITMAPINFO)); + pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbi->bmiHeader.biBitCount = 5; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 4, pvBits, pbi, DIB_RGB_COLORS), 0); + + DeleteObject(hbmp); + HeapFree(GetProcessHeap(), 0, pvBits); + + /* Test a 4 bpp bitmap */ + hbmp = CreateBitmap(3, 5, 1, 4, NULL); + ok(hbmp != 0, "failed to create bitmap\n"); + ZeroMemory(pbi, sizeof(BITMAPINFO)); + pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + ok_int(GetDIBits(hdcScreen, hbmp, 0, 0, NULL, pbi, DIB_RGB_COLORS), 1); + ok_int(pbi->bmiHeader.biWidth, 3); + ok_int(pbi->bmiHeader.biHeight, 5); + ok_int(pbi->bmiHeader.biBitCount, 4); + ok_int(pbi->bmiHeader.biSizeImage, 20); + + /* This does NOT work with incompatible bitmaps */ + pbi->bmiHeader.biSizeImage = 0; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 0, NULL, pbi, DIB_RGB_COLORS), 0); + + cjSizeImage = ((pbi->bmiHeader.biWidth * pbi->bmiHeader.biBitCount + 31) / 32) * 4 * pbi->bmiHeader.biHeight; + pvBits = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cjSizeImage); + + ok(SelectObject(hdcMem, ghbmpDIB4) != 0, "\n");; + ok_int(GetDIBits(hdcMem, hbmp, 0, 4, pvBits, pbi, DIB_RGB_COLORS), 0); + ok_int(GetDIBits(hdcMem, ghbmpDIB4, 0, 4, pvBits, pbi, DIB_RGB_COLORS), 3); + + + DeleteDC(hdcMem); + ReleaseDC(NULL, hdcScreen); +} + +void Test_GetDIBits_BI_BITFIELDS() +{ } START_TEST(GetDIBits) { + //getchar(); + InitStuff(); + Test_GetDIBits_xBpp(1); + Test_GetDIBits_xBpp(4); + Test_GetDIBits_xBpp(8); + Test_GetDIBits_xBpp(16); + Test_GetDIBits_xBpp(24); + Test_GetDIBits_xBpp(32); Test_GetDIBits(); } Modified: trunk/rostests/apitests/gdi32/init.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/init.c?rev… ============================================================================== --- trunk/rostests/apitests/gdi32/init.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/init.c [iso-8859-1] Thu May 17 18:56:00 2012 @@ -5,6 +5,9 @@ HBITMAP ghbmpDIB32; HDC ghdcDIB32; PULONG pulDIB32Bits; +HBITMAP ghbmpDIB4; +HDC ghdcDIB4; +PULONG pulDIB4Bits; HPALETTE ghpal; struct @@ -31,10 +34,16 @@ { BITMAPINFO bmi32 = {{sizeof(BITMAPINFOHEADER), 4, -4, 1, 32, BI_RGB, 0, 1, 1, 0, 0}}; + BITMAPINFO bmi4 = + {{sizeof(BITMAPINFOHEADER), 4, -4, 1, 4, BI_RGB, 0, 1, 1, 0, 0}}; ghdcDIB32 = CreateCompatibleDC(0); + ghdcDIB4 = CreateCompatibleDC(0); ghbmpDIB32 = CreateDIBSection(ghdcDIB32, &bmi32, DIB_PAL_COLORS, (PVOID*)&pulDIB32Bits, 0, 0 ); + if (!ghbmpDIB32) return FALSE; + + ghbmpDIB4 = CreateDIBSection(ghdcDIB4, &bmi4, DIB_PAL_COLORS, (PVOID*)&pulDIB4Bits, 0, 0 ); if (!ghbmpDIB32) return FALSE; SelectObject(ghdcDIB32, ghbmpDIB32); Modified: trunk/rostests/apitests/gdi32/init.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/init.h?rev… ============================================================================== --- trunk/rostests/apitests/gdi32/init.h [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/init.h [iso-8859-1] Thu May 17 18:56:00 2012 @@ -2,6 +2,9 @@ extern HBITMAP ghbmpDIB32; extern HDC ghdcDIB32; extern PULONG pulDIB32Bits; +extern HBITMAP ghbmpDIB4; +extern HDC ghdcDIB4; +extern PULONG pulDIB4Bits; extern HPALETTE ghpal; extern struct {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs