Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 39602: - Add url.dll from Wine
by dchapyshev＠svn.reactos.org 14 Feb '09

14 Feb '09

Author: dchapyshev Date: Sat Feb 14 02:54:01 2009 New Revision: 39602 URL: http://svn.reactos.org/svn/reactos?rev=39602&view=rev Log: - Add url.dll from Wine Added: trunk/reactos/dll/win32/url/ (with props) trunk/reactos/dll/win32/url/url.rbuild (with props) trunk/reactos/dll/win32/url/url.spec (with props) trunk/reactos/dll/win32/url/url_main.c (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=396… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Sat Feb 14 02:54:01 2009 @@ -9,6 +9,7 @@ <property name="BASEADDRESS_DEVENUM" value="0x35680000" /> <property name="BASEADDRESS_RSABASE" value="0x35700000" /> <property name="BASEADDRESS_RSAENH" value="0x35780000" /> + <property name="BASEADDRESS_URL" value="0x42ea0000" /> <property name="BASEADDRESS_DWMAPI" value="0x4A3F0000" /> <property name="BASEADDRESS_LOADPERF" value="0x4B920000" /> <property name="BASEADDRESS_MPRAPI" value="0x4C400000" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Feb 14 02:54:01 2009 @@ -379,6 +379,7 @@ dll\win32\ufat\ufat.dll 1 dll\win32\ufatx\ufatx.dll 1 optional dll\win32\untfs\untfs.dll 1 +dll\win32\url\url.dll 1 dll\win32\urlmon\urlmon.dll 1 dll\win32\user32\user32.dll 1 dll\win32\userenv\userenv.dll 1 Propchange: trunk/reactos/dll/win32/url/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Feb 14 02:54:01 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/url/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/url/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/url/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/url/url.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/url/url.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/url/url.rbuild (added) +++ trunk/reactos/dll/win32/url/url.rbuild [iso-8859-1] Sat Feb 14 02:54:01 2009 @@ -1,0 +1,12 @@ +<module name="url" type="win32dll" baseaddress="${BASEADDRESS_URL}" installbase="system32" installname="url.dll" allowwarnings="true"> + <importlibrary definition="url.spec" /> + <include base="url">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <file>url_main.c</file> + <library>wine</library> + <library>shell32</library> + <library>shlwapi</library> + <library>kernel32</library> + <library>ntdll</library> +</module> Propchange: trunk/reactos/dll/win32/url/url.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/url/url.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/url/url.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/url/url.spec (added) +++ trunk/reactos/dll/win32/url/url.spec [iso-8859-1] Sat Feb 14 02:54:01 2009 @@ -1,0 +1,23 @@ +@ stdcall AddMIMEFileTypesPS(ptr ptr) +@ stub AutodialHookCallback +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DummyEntryPoint +@ stub DummyEntryPointA +@ stdcall FileProtocolHandler(long ptr str long) FileProtocolHandlerA +@ stdcall FileProtocolHandlerA(long ptr str long) +@ stdcall InetIsOffline(long) +@ stub MIMEAssociationDialogA +@ stub MIMEAssociationDialogW +@ stub MailToProtocolHandler +@ stub MailToProtocolHandlerA +@ stub NewsProtocolHandler +@ stub NewsProtocolHandlerA +@ stub OpenURL +@ stub OpenURLA +@ stdcall TelnetProtocolHandler(long str) TelnetProtocolHandlerA +@ stdcall TelnetProtocolHandlerA(long str) +@ stub TranslateURLA +@ stub TranslateURLW +@ stub URLAssociationDialogA +@ stub URLAssociationDialogW Propchange: trunk/reactos/dll/win32/url/url.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/url/url_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/url/url_main.c?r… ============================================================================== --- trunk/reactos/dll/win32/url/url_main.c (added) +++ trunk/reactos/dll/win32/url/url_main.c [iso-8859-1] Sat Feb 14 02:54:01 2009 @@ -1,0 +1,118 @@ +/* + * Copyright 2006 Alexandre Julliard + * + * 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 <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winerror.h" +#include "shellapi.h" +#include "shlwapi.h" +#include "intshcut.h" +#include "winuser.h" +#include "commctrl.h" +#include "prsht.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(url); + +/*********************************************************************** + * DllMain (URL.@) + */ +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( inst ); + break; + } + return TRUE; +} + +/*********************************************************************** + * AddMIMEFileTypesPS (URL.@) + * + * Build and Manage a Filetype-Association Property Sheet + * + * PARAMS + * unknown1 [I] Pointer to an Read-Only Area + * lppsh [I] PTR to the target PropertySheetHeader (ANSI) + * + * RETURNS + * Success: 0 + * + */ +DWORD WINAPI AddMIMEFileTypesPS(VOID * unknown1, LPPROPSHEETHEADERA lppsh) +{ + FIXME("(%p, %p): stub!\n", unknown1, lppsh); + return 0; +} + +/*********************************************************************** + * InetIsOffline (URL.@) + * + */ +BOOL WINAPI InetIsOffline(DWORD flags) +{ + FIXME("(%08x): stub!\n", flags); + + return FALSE; +} + +/*********************************************************************** + * FileProtocolHandlerA (URL.@) + * + * Handles a URL given to it and executes it. + * + * HWND hWnd - Parent Window + * HINSTANCE hInst - ignored + * LPCSTR pszUrl - The URL that needs to be handled + * int nShowCmd - How to display the operation. + */ + +HRESULT WINAPI FileProtocolHandlerA(HWND hWnd, HINSTANCE hInst, LPCSTR pszUrl, + int nShowCmd) +{ + CHAR pszPath[MAX_PATH]; + DWORD size = MAX_PATH; + HRESULT createpath = PathCreateFromUrlA(pszUrl,pszPath,&size,0); + + TRACE("(%p, %s, %d)\n",hWnd,debugstr_a(pszUrl),nShowCmd); + + if(createpath != S_OK) + return E_FAIL; + + ShellExecuteA(hWnd,NULL,pszPath,NULL,NULL,nShowCmd); + + return S_OK; +} + +/*********************************************************************** + * TelnetProtocolHandlerA (URL.@) + * + */ + +HRESULT WINAPI TelnetProtocolHandlerA(HWND hWnd, LPSTR lpStr) +{ + FIXME("(%p, %p): stub!\n",hWnd,lpStr); + + return E_NOTIMPL; +} Propchange: trunk/reactos/dll/win32/url/url_main.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Sat Feb 14 02:54:01 2009 @@ -436,6 +436,9 @@ <directory name="untfs"> <xi:include href="untfs/untfs.rbuild" /> </directory> +<directory name="url"> + <xi:include href="url/url.rbuild" /> +</directory> <directory name="urlmon"> <xi:include href="urlmon/urlmon.rbuild" /> </directory> 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 Feb 14 02:54:01 2009 @@ -111,6 +111,7 @@ reactos/dll/win32/sxs # Autosync reactos/dll/win32/tapi32 # Autosync reactos/dll/win32/twain_32 # Out of sync +reactos/dll/win32/url # Autosync reactos/dll/win32/urlmon # Autosync reactos/dll/win32/usp10 # Autosync reactos/dll/win32/uxtheme # Autosync

1 0

[dchapyshev] 39601: - Sync gdiplus with Wine head
by dchapyshev＠svn.reactos.org 14 Feb '09

14 Feb '09

Author: dchapyshev Date: Sat Feb 14 02:14:34 2009 New Revision: 39601 URL: http://svn.reactos.org/svn/reactos?rev=39601&view=rev Log: - Sync gdiplus with Wine head Modified: trunk/reactos/dll/win32/gdiplus/font.c trunk/reactos/dll/win32/gdiplus/gdiplus.spec 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/region.c trunk/reactos/dll/win32/gdiplus/stringformat.c trunk/reactos/include/psdk/gdiplusflat.h Modified: trunk/reactos/dll/win32/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/font.c?r… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] Sat Feb 14 02:14:34 2009 @@ -374,6 +374,29 @@ } /******************************************************************************* + * GdipGetLogFontA [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipGetLogFontA(GpFont *font, GpGraphics *graphics, + LOGFONTA *lfa) +{ + GpStatus status; + LOGFONTW lfw; + + TRACE("(%p, %p, %p)\n", font, graphics, lfa); + + status = GdipGetLogFontW(font, graphics, &lfw); + if(status != Ok) + return status; + + memcpy(lfa, &lfw, FIELD_OFFSET(LOGFONTA,lfFaceName) ); + + if(!MultiByteToWideChar(CP_ACP, 0, lfa->lfFaceName, -1, lfw.lfFaceName, LF_FACESIZE)) + return GenericError; + + return Ok; +} + +/******************************************************************************* * GdipGetLogFontW [GDIPLUS.@] */ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] Sat Feb 14 02:14:34 2009 @@ -76,7 +76,7 @@ @ stdcall GdipCreateBitmapFromGdiDib(ptr ptr ptr) @ stdcall GdipCreateBitmapFromGraphics(long long ptr ptr) @ stdcall GdipCreateBitmapFromHBITMAP(long long ptr) -@ stub GdipCreateBitmapFromHICON +@ stdcall GdipCreateBitmapFromHICON(long ptr) @ stdcall GdipCreateBitmapFromResource(long wstr ptr) @ stdcall GdipCreateBitmapFromScan0(long long long long ptr ptr) @ stdcall GdipCreateBitmapFromStream(ptr ptr) @@ -245,8 +245,8 @@ @ stdcall GdipGetCellAscent(ptr long ptr) @ stdcall GdipGetCellDescent(ptr long ptr) @ stdcall GdipGetClip(ptr ptr) -@ stub GdipGetClipBounds -@ stub GdipGetClipBoundsI +@ stdcall GdipGetClipBounds(ptr ptr) +@ stdcall GdipGetClipBoundsI(ptr ptr) @ stdcall GdipGetCompositingMode(ptr ptr) @ stdcall GdipGetCompositingQuality(ptr ptr) @ stdcall GdipGetCustomLineCapBaseCap(ptr ptr) @@ -311,7 +311,7 @@ @ stdcall GdipGetLineSpacing(ptr long ptr) @ stub GdipGetLineTransform @ stdcall GdipGetLineWrapMode(ptr ptr) -@ stub GdipGetLogFontA +@ stdcall GdipGetLogFontA(ptr ptr ptr) @ stdcall GdipGetLogFontW(ptr ptr ptr) @ stdcall GdipGetMatrixElements(ptr ptr) @ stub GdipGetMetafileDownLevelRasterizationLimit @@ -507,7 +507,7 @@ @ stdcall GdipSetAdjustableArrowCapMiddleInset(ptr long) @ stdcall GdipSetAdjustableArrowCapWidth(ptr long) @ stdcall GdipSetClipGraphics(ptr ptr long) -@ stub GdipSetClipHrgn +@ stdcall GdipSetClipHrgn(ptr long long) @ stdcall GdipSetClipPath(ptr ptr long) @ stdcall GdipSetClipRect(ptr long long long long long) @ stdcall GdipSetClipRectI(ptr long long long long long) @@ -609,8 +609,8 @@ @ stdcall GdipTransformPoints(ptr long long ptr long) @ stdcall GdipTransformPointsI(ptr long long ptr long) @ stdcall GdipTransformRegion(ptr ptr) -@ stub GdipTranslateClip -@ stub GdipTranslateClipI +@ stdcall GdipTranslateClip(ptr long long) +@ stdcall GdipTranslateClipI(ptr long long) @ stdcall GdipTranslateLineTransform(ptr long long long) @ stdcall GdipTranslateMatrix(ptr long long long) @ stub GdipTranslatePathGradientTransform Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] Sat Feb 14 02:14:34 2009 @@ -2375,18 +2375,39 @@ return ret; } +/***************************************************************************** + * GdipFillRegion [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipFillRegion(GpGraphics* graphics, GpBrush* brush, GpRegion* region) { + INT save_state; + GpStatus status; + HRGN hrgn; + + TRACE("(%p, %p, %p)\n", graphics, brush, region); + if (!(graphics && brush && region)) return InvalidParameter; if(graphics->busy) return ObjectBusy; - FIXME("(%p, %p, %p): stub\n", graphics, brush, region); - - return NotImplemented; + status = GdipGetRegionHRgn(region, graphics, &hrgn); + if(status != Ok) + return status; + + save_state = SaveDC(graphics->hdc); + EndPath(graphics->hdc); + SelectObject(graphics->hdc, GetStockObject(NULL_PEN)); + + FillRgn(graphics->hdc, hrgn, brush->gdibrush); + + RestoreDC(graphics->hdc, save_state); + + DeleteObject(hrgn); + + return Ok; } GpStatus WINGDIPAPI GdipFlush(GpGraphics *graphics, GpFlushIntention intention) @@ -2403,6 +2424,38 @@ FIXME("not implemented\n"); return NotImplemented; +} + +/***************************************************************************** + * GdipGetClipBounds [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipGetClipBounds(GpGraphics *graphics, GpRectF *rect) +{ + TRACE("(%p, %p)\n", graphics, rect); + + if(!graphics) + return InvalidParameter; + + if(graphics->busy) + return ObjectBusy; + + return GdipGetRegionBounds(graphics->clip, graphics, rect); +} + +/***************************************************************************** + * GdipGetClipBoundsI [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipGetClipBoundsI(GpGraphics *graphics, GpRect *rect) +{ + TRACE("(%p, %p)\n", graphics, rect); + + if(!graphics) + return InvalidParameter; + + if(graphics->busy) + return ObjectBusy; + + return GdipGetRegionBoundsI(graphics->clip, graphics, rect); } /* FIXME: Compositing mode is not used anywhere except the getter/setter. */ @@ -3057,6 +3110,29 @@ return GdipTranslateMatrix(graphics->worldtrans, dx, dy, order); } +/***************************************************************************** + * GdipSetClipHrgn [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipSetClipHrgn(GpGraphics *graphics, HRGN hrgn, CombineMode mode) +{ + GpRegion *region; + GpStatus status; + + TRACE("(%p, %p, %d)\n", graphics, hrgn, mode); + + if(!graphics) + return InvalidParameter; + + status = GdipCreateRegionHrgn(hrgn, &region); + if(status != Ok) + return status; + + status = GdipSetClipRegion(graphics, region, mode); + + GdipDeleteRegion(region); + return status; +} + GpStatus WINGDIPAPI GdipSetClipPath(GpGraphics *graphics, GpPath *path, CombineMode mode) { TRACE("(%p, %p, %d)\n", graphics, path, mode); @@ -3318,3 +3394,35 @@ return NULL; } + +/***************************************************************************** + * GdipTranslateClip [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipTranslateClip(GpGraphics *graphics, REAL dx, REAL dy) +{ + TRACE("(%p, %.2f, %.2f)\n", graphics, dx, dy); + + if(!graphics) + return InvalidParameter; + + if(graphics->busy) + return ObjectBusy; + + return GdipTranslateRegion(graphics->clip, dx, dy); +} + +/***************************************************************************** + * GdipTranslateClipI [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipTranslateClipI(GpGraphics *graphics, INT dx, INT dy) +{ + TRACE("(%p, %d, %d)\n", graphics, dx, dy); + + if(!graphics) + return InvalidParameter; + + if(graphics->busy) + return ObjectBusy; + + return GdipTranslateRegion(graphics->clip, (REAL)dx, (REAL)dy); +} Modified: trunk/reactos/dll/win32/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] Sat Feb 14 02:14:34 2009 @@ -723,6 +723,17 @@ if(!path) return InvalidParameter; + /* on zero width/height only start point added */ + if(width <= 1e-7 || height <= 1e-7){ + if(!lengthen_path(path, 1)) + return OutOfMemory; + path->pathdata.Points[0].X = x + width / 2.0; + path->pathdata.Points[0].Y = y + height / 2.0; + path->pathdata.Types[0] = PathPointTypeStart | PathPointTypeCloseSubpath; + path->pathdata.Count = 1; + return InvalidParameter; + } + count = arc2polybezier(NULL, x, y, width, height, startAngle, sweepAngle); if(count == 0) Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] Sat Feb 14 02:14:34 2009 @@ -18,6 +18,8 @@ #include <stdarg.h> +#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "winuser.h" @@ -427,6 +429,50 @@ NULL, bitmap); return ret; +} + +GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) +{ + HICON icon_copy; + ICONINFO iinfo; + PICTDESC desc; + + TRACE("%p, %p\n", hicon, bitmap); + + if(!bitmap || !GetIconInfo(hicon, &iinfo)) + return InvalidParameter; + + *bitmap = GdipAlloc(sizeof(GpBitmap)); + if(!*bitmap) return OutOfMemory; + + icon_copy = CreateIconIndirect(&iinfo); + + if(!icon_copy){ + GdipFree(*bitmap); + return InvalidParameter; + } + + desc.cbSizeofstruct = sizeof(PICTDESC); + desc.picType = PICTYPE_ICON; + desc.u.icon.hicon = icon_copy; + + if(OleCreatePictureIndirect(&desc, &IID_IPicture, TRUE, + (LPVOID*) &((*bitmap)->image.picture)) != S_OK){ + DestroyIcon(icon_copy); + GdipFree(*bitmap); + return GenericError; + } + + (*bitmap)->format = PixelFormat32bppARGB; + (*bitmap)->image.type = ImageTypeBitmap; + (*bitmap)->image.flags = ImageFlagsNone; + (*bitmap)->width = ipicture_pixel_width((*bitmap)->image.picture); + (*bitmap)->height = ipicture_pixel_height((*bitmap)->image.picture); + + DeleteObject(iinfo.hbmColor); + DeleteObject(iinfo.hbmMask); + + return Ok; } GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, Modified: trunk/reactos/dll/win32/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/region.c… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] Sat Feb 14 02:14:34 2009 @@ -567,15 +567,58 @@ return NotImplemented; } + +/****************************************************************************** + * GdipCreateRegionHrgn [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipCreateRegionHrgn(HRGN hrgn, GpRegion **region) { - FIXME("(%p, %p): stub\n", hrgn, region); - - if(!hrgn || !region) - return InvalidParameter; - - *region = NULL; - return NotImplemented; + union { + RGNDATA data; + char buf[sizeof(RGNDATAHEADER) + sizeof(RECT)]; + } rdata; + DWORD size; + GpRectF rectf; + GpPath *path; + GpStatus stat; + + TRACE("(%p, %p)\n", hrgn, region); + + if(!region || !(size = GetRegionData(hrgn, 0, NULL))) + return InvalidParameter; + + if(size > sizeof(RGNDATAHEADER) + sizeof(RECT)){ + FIXME("Only simple rect regions supported.\n"); + *region = NULL; + return NotImplemented; + } + + if(!GetRegionData(hrgn, sizeof(rdata), &rdata.data)) + return GenericError; + + /* return empty region */ + if(IsRectEmpty(&rdata.data.rdh.rcBound)){ + stat = GdipCreateRegion(region); + if(stat == Ok) + GdipSetEmpty(*region); + return stat; + } + + rectf.X = (REAL)rdata.data.rdh.rcBound.left; + rectf.Y = (REAL)rdata.data.rdh.rcBound.top; + rectf.Width = (REAL)rdata.data.rdh.rcBound.right - rectf.X; + rectf.Height = (REAL)rdata.data.rdh.rcBound.bottom - rectf.Y; + + stat = GdipCreatePath(FillModeAlternate, &path); + if(stat != Ok) + return stat; + + GdipAddPathRectangle(path, rectf.X, rectf.Y, rectf.Width, rectf.Height); + + stat = GdipCreateRegionPath(path, region); + GdipDeletePath(path); + + return stat; } GpStatus WINGDIPAPI GdipDeleteRegion(GpRegion *region) @@ -591,18 +634,66 @@ return Ok; } +/***************************************************************************** + * GdipGetRegionBounds [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipGetRegionBounds(GpRegion *region, GpGraphics *graphics, GpRectF *rect) { - FIXME("(%p, %p, %p): stub\n", region, graphics, rect); - - return NotImplemented; -} - + HRGN hrgn; + RECT r; + GpStatus status; + + TRACE("(%p, %p, %p)\n", region, graphics, rect); + + if(!region || !graphics || !rect) + return InvalidParameter; + + status = GdipGetRegionHRgn(region, graphics, &hrgn); + if(status != Ok) + return status; + + /* infinite */ + if(!hrgn){ + rect->X = rect->Y = -(REAL)(1 << 22); + rect->Width = rect->Height = (REAL)(1 << 23); + return Ok; + } + + if(!GetRgnBox(hrgn, &r)){ + DeleteObject(hrgn); + return GenericError; + } + + rect->X = r.left; + rect->Y = r.top; + rect->Width = r.right - r.left; + rect->Height = r.bottom - r.top; + + return Ok; +} + +/***************************************************************************** + * GdipGetRegionBoundsI [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipGetRegionBoundsI(GpRegion *region, GpGraphics *graphics, GpRect *rect) { - FIXME("(%p, %p, %p): stub\n", region, graphics, rect); - - return NotImplemented; + GpRectF rectf; + GpStatus status; + + TRACE("(%p, %p, %p)\n", region, graphics, rect); + + if(!rect) + return InvalidParameter; + + status = GdipGetRegionBounds(region, graphics, &rectf); + if(status == Ok){ + rect->X = roundr(rectf.X); + rect->Y = roundr(rectf.X); + rect->Width = roundr(rectf.Width); + rect->Height = roundr(rectf.Height); + } + + return status; } static inline void write_dword(DWORD* location, INT* offset, const DWORD write) @@ -963,12 +1054,39 @@ return Ok; } +/***************************************************************************** + * GdipIsEqualRegion [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipIsEqualRegion(GpRegion *region, GpRegion *region2, GpGraphics *graphics, BOOL *res) { - FIXME("(%p, %p, %p, %p): stub\n", region, region2, graphics, res); - - return NotImplemented; + HRGN hrgn1, hrgn2; + GpStatus stat; + + TRACE("(%p, %p, %p, %p)\n", region, region2, graphics, res); + + if(!region || !region2 || !graphics || !res) + return InvalidParameter; + + stat = GdipGetRegionHRgn(region, graphics, &hrgn1); + if(stat != Ok) + return stat; + stat = GdipGetRegionHRgn(region2, graphics, &hrgn2); + if(stat != Ok){ + DeleteObject(hrgn1); + return stat; + } + + *res = EqualRgn(hrgn1, hrgn2); + + /* one of GpRegions is infinite */ + if(*res == ERROR) + *res = (!hrgn1 && !hrgn2); + + DeleteObject(hrgn1); + DeleteObject(hrgn2); + + return Ok; } /***************************************************************************** @@ -1027,16 +1145,54 @@ return NotImplemented; } +/* Translates GpRegion elements with specified offsets */ +static void translate_region_element(region_element* element, REAL dx, REAL dy) +{ + INT i; + + switch(element->type) + { + case RegionDataEmptyRect: + case RegionDataInfiniteRect: + return; + case RegionDataRect: + element->elementdata.rect.X += dx; + element->elementdata.rect.Y += dy; + return; + case RegionDataPath: + for(i = 0; i < element->elementdata.pathdata.path->pathdata.Count; i++){ + element->elementdata.pathdata.path->pathdata.Points[i].X += dx; + element->elementdata.pathdata.path->pathdata.Points[i].Y += dy; + } + return; + default: + translate_region_element(element->elementdata.combine.left, dx, dy); + translate_region_element(element->elementdata.combine.right, dx, dy); + return; + } +} + +/***************************************************************************** + * GdipTranslateRegion [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipTranslateRegion(GpRegion *region, REAL dx, REAL dy) { - FIXME("(%p, %f, %f): stub\n", region, dx, dy); - - return NotImplemented; -} - + TRACE("(%p, %f, %f)\n", region, dx, dy); + + if(!region) + return InvalidParameter; + + translate_region_element(&region->node, dx, dy); + + return Ok; +} + +/***************************************************************************** + * GdipTranslateRegionI [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipTranslateRegionI(GpRegion *region, INT dx, INT dy) { - FIXME("(%p, %d, %d): stub\n", region, dx, dy); - - return NotImplemented; -} + TRACE("(%p, %d, %d)\n", region, dx, dy); + + return GdipTranslateRegion(region, (REAL)dx, (REAL)dy); +} Modified: trunk/reactos/dll/win32/gdiplus/stringformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/stringfo… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/stringformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/stringformat.c [iso-8859-1] Sat Feb 14 02:14:34 2009 @@ -284,9 +284,12 @@ return Ok; } -GpStatus WINGDIPAPI GdipSetStringFormatFlags(GDIPCONST GpStringFormat *format, INT flags) -{ - FIXME("format (%p) flags (%d)\n", format, flags); +GpStatus WINGDIPAPI GdipSetStringFormatFlags(GpStringFormat *format, INT flags) +{ + if(!format) + return InvalidParameter; + + format->attr = flags; return Ok; } Modified: trunk/reactos/include/psdk/gdiplusflat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusflat.h… ============================================================================== --- trunk/reactos/include/psdk/gdiplusflat.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplusflat.h [iso-8859-1] Sat Feb 14 02:14:34 2009 @@ -49,6 +49,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromGdiDib(GDIPCONST BITMAPINFO*,VOID*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT,INT,GpGraphics*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP, HPALETTE, GpBitmap**); +GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON, GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromResource(HINSTANCE,GDIPCONST WCHAR*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT,INT,INT,PixelFormat,BYTE*, GpBitmap**); @@ -189,6 +190,8 @@ GpStatus WINGDIPAPI GdipFillRectanglesI(GpGraphics*,GpBrush*,GDIPCONST GpRect*,INT); GpStatus WINGDIPAPI GdipFillRegion(GpGraphics*,GpBrush*,GpRegion*); GpStatus WINGDIPAPI GdipGetClip(GpGraphics*,GpRegion*); +GpStatus WINGDIPAPI GdipGetClipBounds(GpGraphics*,GpRectF*); +GpStatus WINGDIPAPI GdipGetClipBoundsI(GpGraphics*,GpRect*); GpStatus WINGDIPAPI GdipGetCompositingMode(GpGraphics*,CompositingMode*); GpStatus WINGDIPAPI GdipGetCompositingQuality(GpGraphics*,CompositingQuality*); GpStatus WINGDIPAPI GdipGetDC(GpGraphics*,HDC*); @@ -221,6 +224,7 @@ GpStatus WINGDIPAPI GdipRotateWorldTransform(GpGraphics*,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics*,GraphicsState*); GpStatus WINGDIPAPI GdipScaleWorldTransform(GpGraphics*,REAL,REAL,GpMatrixOrder); +GpStatus WINGDIPAPI GdipSetClipHrgn(GpGraphics*,HRGN,CombineMode); GpStatus WINGDIPAPI GdipSetClipPath(GpGraphics*,GpPath*,CombineMode); GpStatus WINGDIPAPI GdipSetClipRect(GpGraphics*,REAL,REAL,REAL,REAL,CombineMode); GpStatus WINGDIPAPI GdipSetClipRectI(GpGraphics*,INT,INT,INT,INT,CombineMode); @@ -239,6 +243,8 @@ GpPointF *, INT); GpStatus WINGDIPAPI GdipTransformPointsI(GpGraphics*, GpCoordinateSpace, GpCoordinateSpace, GpPoint *, INT); +GpStatus WINGDIPAPI GdipTranslateClip(GpGraphics*,REAL,REAL); +GpStatus WINGDIPAPI GdipTranslateClipI(GpGraphics*,INT,INT); GpStatus WINGDIPAPI GdipTranslateWorldTransform(GpGraphics*,REAL,REAL,GpMatrixOrder); /* GraphicsPath */ @@ -561,6 +567,7 @@ GpStringFormat*, INT, GDIPCONST CharacterRange*); GpStatus WINGDIPAPI GdipSetStringFormatTabStops(GpStringFormat*,REAL,INT,GDIPCONST REAL*); GpStatus WINGDIPAPI GdipSetStringFormatTrimming(GpStringFormat*,StringTrimming); +GpStatus WINGDIPAPI GdipSetStringFormatFlags(GpStringFormat*, INT); GpStatus WINGDIPAPI GdipStringFormatGetGenericDefault(GpStringFormat **); GpStatus WINGDIPAPI GdipStringFormatGetGenericTypographic(GpStringFormat **);

1 0

[tkreuzer] 39600: Add PPROCESSOR_IDLE_FUNCTION, fix PROCESSOR_POWER_STATE
by tkreuzer＠svn.reactos.org 14 Feb '09

14 Feb '09

Author: tkreuzer Date: Fri Feb 13 20:19:52 2009 New Revision: 39600 URL: http://svn.reactos.org/svn/reactos?rev=39600&view=rev Log: Add PPROCESSOR_IDLE_FUNCTION, fix PROCESSOR_POWER_STATE Modified: trunk/reactos/include/ndk/potypes.h Modified: trunk/reactos/include/ndk/potypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/potypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/potypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/potypes.h [iso-8859-1] Fri Feb 13 20:19:52 2009 @@ -42,9 +42,16 @@ // // Processor Power State Data // +struct _PROCESSOR_POWER_STATE; + +typedef +VOID +(FASTCALL *PPROCESSOR_IDLE_FUNCTION)( + struct _PROCESSOR_POWER_STATE *PState); + typedef struct _PROCESSOR_POWER_STATE { - PVOID IdleFunction; + PPROCESSOR_IDLE_FUNCTION IdleFunction; ULONG Idle0KernelTimeLimit; ULONG Idle0LastTime; PVOID IdleHandlers; @@ -61,10 +68,10 @@ UCHAR ThermalThrottleIndex; ULONG LastKernelUserTime; ULONG PerfIdleTime; - ULONG DebugDelta; + ULONGLONG DebugDelta; ULONG DebugCount; ULONG LastSysTime; - ULONG TotalIdleStateTime[3]; + ULONGLONG TotalIdleStateTime[3]; ULONG TotalIdleTransitions[3]; ULONGLONG PreviousC3StateTime; UCHAR KneeThrottleIndex;

1 0

[tkreuzer] 39599: Revert last commit. MS doesn't want poor ddk users mess with their secret structures and instead present them only some censored stuff.
by tkreuzer＠svn.reactos.org 14 Feb '09

14 Feb '09

Author: tkreuzer Date: Fri Feb 13 20:10:32 2009 New Revision: 39599 URL: http://svn.reactos.org/svn/reactos?rev=39599&view=rev Log: Revert last commit. MS doesn't want poor ddk users mess with their secret structures and instead present them only some censored stuff. Modified: trunk/reactos/include/ddk/ntpoapi.h trunk/reactos/include/ndk/potypes.h Modified: trunk/reactos/include/ddk/ntpoapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntpoapi.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ntpoapi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntpoapi.h [iso-8859-1] Fri Feb 13 20:10:32 2009 @@ -270,64 +270,6 @@ ULONG CurrentIdleState; } PROCESSOR_POWER_INFORMATION, *PPROCESSOR_POWER_INFORMATION; -// -// Processor Power State Data -// -struct _PROCESSOR_POWER_STATE; - -typedef -VOID -(FASTCALL *PPROCESSOR_IDLE_FUNCTION)( - struct _PROCESSOR_POWER_STATE *PState); - -typedef struct _PROCESSOR_POWER_STATE -{ - PPROCESSOR_IDLE_FUNCTION IdleFunction; - ULONG Idle0KernelTimeLimit; - ULONG Idle0LastTime; - PVOID IdleHandlers; - PVOID IdleState; - ULONG IdleHandlersCount; - ULONGLONG LastCheck; - PROCESSOR_IDLE_TIMES IdleTimes; - ULONG IdleTime1; - ULONG PromotionCheck; - ULONG IdleTime2; - UCHAR CurrentThrottle; - UCHAR ThermalThrottleLimit; - UCHAR CurrentThrottleIndex; - UCHAR ThermalThrottleIndex; - ULONG LastKernelUserTime; - ULONG PerfIdleTime; - ULONGLONG DebugDelta; - ULONG DebugCount; - ULONG LastSysTime; - ULONGLONG TotalIdleStateTime[3]; - ULONG TotalIdleTransitions[3]; - ULONGLONG PreviousC3StateTime; - UCHAR KneeThrottleIndex; - UCHAR ThrottleLimitIndex; - UCHAR PerfStatesCount; - UCHAR ProcessorMinThrottle; - UCHAR ProcessorMaxThrottle; - UCHAR LastBusyPercentage; - UCHAR LastC3Percentage; - UCHAR LastAdjustedBusyPercentage; - ULONG PromotionCount; - ULONG DemotionCount; - ULONG ErrorCount; - ULONG RetryCount; - ULONG Flags; - LARGE_INTEGER PerfCounterFrequency; - ULONG PerfTickCount; - KTIMER PerfTimer; - KDPC PerfDpc; - PROCESSOR_PERF_STATE *PerfStates; - PVOID PerfSetThrottle; - ULONG LastC3KernelUserTime; - ULONG Spare1[1]; -} PROCESSOR_POWER_STATE, *PPROCESSOR_POWER_STATE; - #ifdef __cplusplus } #endif Modified: trunk/reactos/include/ndk/potypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/potypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/potypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/potypes.h [iso-8859-1] Fri Feb 13 20:10:32 2009 @@ -40,6 +40,57 @@ #ifndef NTOS_MODE_USER // +// Processor Power State Data +// +typedef struct _PROCESSOR_POWER_STATE +{ + PVOID IdleFunction; + ULONG Idle0KernelTimeLimit; + ULONG Idle0LastTime; + PVOID IdleHandlers; + PVOID IdleState; + ULONG IdleHandlersCount; + ULONGLONG LastCheck; + PROCESSOR_IDLE_TIMES IdleTimes; + ULONG IdleTime1; + ULONG PromotionCheck; + ULONG IdleTime2; + UCHAR CurrentThrottle; + UCHAR ThermalThrottleLimit; + UCHAR CurrentThrottleIndex; + UCHAR ThermalThrottleIndex; + ULONG LastKernelUserTime; + ULONG PerfIdleTime; + ULONG DebugDelta; + ULONG DebugCount; + ULONG LastSysTime; + ULONG TotalIdleStateTime[3]; + ULONG TotalIdleTransitions[3]; + ULONGLONG PreviousC3StateTime; + UCHAR KneeThrottleIndex; + UCHAR ThrottleLimitIndex; + UCHAR PerfStatesCount; + UCHAR ProcessorMinThrottle; + UCHAR ProcessorMaxThrottle; + UCHAR LastBusyPercentage; + UCHAR LastC3Percentage; + UCHAR LastAdjustedBusyPercentage; + ULONG PromotionCount; + ULONG DemotionCount; + ULONG ErrorCount; + ULONG RetryCount; + ULONG Flags; + LARGE_INTEGER PerfCounterFrequency; + ULONG PerfTickCount; + KTIMER PerfTimer; + KDPC PerfDpc; + PROCESSOR_PERF_STATE *PerfStates; + PVOID PerfSetThrottle; + ULONG LastC3KernelUserTime; + ULONG Spare1[1]; +} PROCESSOR_POWER_STATE, *PPROCESSOR_POWER_STATE; + +// // Device Notification Structure // typedef struct _PO_DEVICE_NOTIFY

1 0

[tkreuzer] 39598: Add PPROCESSOR_IDLE_FUNCTION, fix PROCESSOR_POWER_STATE and move it from ndk to ntpoapi.h
by tkreuzer＠svn.reactos.org 14 Feb '09

14 Feb '09

Author: tkreuzer Date: Fri Feb 13 19:57:28 2009 New Revision: 39598 URL: http://svn.reactos.org/svn/reactos?rev=39598&view=rev Log: Add PPROCESSOR_IDLE_FUNCTION, fix PROCESSOR_POWER_STATE and move it from ndk to ntpoapi.h Modified: trunk/reactos/include/ddk/ntpoapi.h trunk/reactos/include/ndk/potypes.h Modified: trunk/reactos/include/ddk/ntpoapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntpoapi.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ntpoapi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntpoapi.h [iso-8859-1] Fri Feb 13 19:57:28 2009 @@ -270,6 +270,64 @@ ULONG CurrentIdleState; } PROCESSOR_POWER_INFORMATION, *PPROCESSOR_POWER_INFORMATION; +// +// Processor Power State Data +// +struct _PROCESSOR_POWER_STATE; + +typedef +VOID +(FASTCALL *PPROCESSOR_IDLE_FUNCTION)( + struct _PROCESSOR_POWER_STATE *PState); + +typedef struct _PROCESSOR_POWER_STATE +{ + PPROCESSOR_IDLE_FUNCTION IdleFunction; + ULONG Idle0KernelTimeLimit; + ULONG Idle0LastTime; + PVOID IdleHandlers; + PVOID IdleState; + ULONG IdleHandlersCount; + ULONGLONG LastCheck; + PROCESSOR_IDLE_TIMES IdleTimes; + ULONG IdleTime1; + ULONG PromotionCheck; + ULONG IdleTime2; + UCHAR CurrentThrottle; + UCHAR ThermalThrottleLimit; + UCHAR CurrentThrottleIndex; + UCHAR ThermalThrottleIndex; + ULONG LastKernelUserTime; + ULONG PerfIdleTime; + ULONGLONG DebugDelta; + ULONG DebugCount; + ULONG LastSysTime; + ULONGLONG TotalIdleStateTime[3]; + ULONG TotalIdleTransitions[3]; + ULONGLONG PreviousC3StateTime; + UCHAR KneeThrottleIndex; + UCHAR ThrottleLimitIndex; + UCHAR PerfStatesCount; + UCHAR ProcessorMinThrottle; + UCHAR ProcessorMaxThrottle; + UCHAR LastBusyPercentage; + UCHAR LastC3Percentage; + UCHAR LastAdjustedBusyPercentage; + ULONG PromotionCount; + ULONG DemotionCount; + ULONG ErrorCount; + ULONG RetryCount; + ULONG Flags; + LARGE_INTEGER PerfCounterFrequency; + ULONG PerfTickCount; + KTIMER PerfTimer; + KDPC PerfDpc; + PROCESSOR_PERF_STATE *PerfStates; + PVOID PerfSetThrottle; + ULONG LastC3KernelUserTime; + ULONG Spare1[1]; +} PROCESSOR_POWER_STATE, *PPROCESSOR_POWER_STATE; + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/ndk/potypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/potypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/potypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/potypes.h [iso-8859-1] Fri Feb 13 19:57:28 2009 @@ -40,57 +40,6 @@ #ifndef NTOS_MODE_USER // -// Processor Power State Data -// -typedef struct _PROCESSOR_POWER_STATE -{ - PVOID IdleFunction; - ULONG Idle0KernelTimeLimit; - ULONG Idle0LastTime; - PVOID IdleHandlers; - PVOID IdleState; - ULONG IdleHandlersCount; - ULONGLONG LastCheck; - PROCESSOR_IDLE_TIMES IdleTimes; - ULONG IdleTime1; - ULONG PromotionCheck; - ULONG IdleTime2; - UCHAR CurrentThrottle; - UCHAR ThermalThrottleLimit; - UCHAR CurrentThrottleIndex; - UCHAR ThermalThrottleIndex; - ULONG LastKernelUserTime; - ULONG PerfIdleTime; - ULONG DebugDelta; - ULONG DebugCount; - ULONG LastSysTime; - ULONG TotalIdleStateTime[3]; - ULONG TotalIdleTransitions[3]; - ULONGLONG PreviousC3StateTime; - UCHAR KneeThrottleIndex; - UCHAR ThrottleLimitIndex; - UCHAR PerfStatesCount; - UCHAR ProcessorMinThrottle; - UCHAR ProcessorMaxThrottle; - UCHAR LastBusyPercentage; - UCHAR LastC3Percentage; - UCHAR LastAdjustedBusyPercentage; - ULONG PromotionCount; - ULONG DemotionCount; - ULONG ErrorCount; - ULONG RetryCount; - ULONG Flags; - LARGE_INTEGER PerfCounterFrequency; - ULONG PerfTickCount; - KTIMER PerfTimer; - KDPC PerfDpc; - PROCESSOR_PERF_STATE *PerfStates; - PVOID PerfSetThrottle; - ULONG LastC3KernelUserTime; - ULONG Spare1[1]; -} PROCESSOR_POWER_STATE, *PPROCESSOR_POWER_STATE; - -// // Device Notification Structure // typedef struct _PO_DEVICE_NOTIFY

1 0

[jmorlan] 39597: Make delayed environment-variable expansions actually be delayed.
by jmorlan＠svn.reactos.org 14 Feb '09

14 Feb '09

Author: jmorlan Date: Fri Feb 13 19:13:17 2009 New Revision: 39597 URL: http://svn.reactos.org/svn/reactos?rev=39597&view=rev Log: Make delayed environment-variable expansions actually be delayed. Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/if.c trunk/reactos/base/shell/cmd/redir.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Fri Feb 13 19:13:17 2009 @@ -868,6 +868,7 @@ { BOOL bNewBatch = TRUE; PARSED_COMMAND *Sub; + LPTSTR ExpandedLine; BOOL Success = TRUE; if (!PerformRedirection(Cmd->Redirections)) @@ -879,7 +880,14 @@ if(bc) bNewBatch = FALSE; - Success = DoCommand(Cmd->Command.CommandLine); + ExpandedLine = DoDelayedExpansion(Cmd->Command.CommandLine); + if (!ExpandedLine) + { + Success = FALSE; + break; + } + Success = DoCommand(ExpandedLine); + cmd_free(ExpandedLine); if(bNewBatch && bc) AddBatchRedirection(&Cmd->Redirections); @@ -1097,8 +1105,11 @@ return NULL; } +BOOL bNoInteractive; +BOOL bIsBatch; + BOOL -SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim, BOOL bIsBatch) +SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim) { #define APPEND(From, Length) { \ if (Dest + (Length) > DestEnd) \ @@ -1250,14 +1261,26 @@ #undef APPEND1 } +LPTSTR +DoDelayedExpansion(LPTSTR Line) +{ + TCHAR Buf[CMDLINE_LENGTH]; + if (!_tcschr(Line, _T('!'))) + return cmd_dup(Line); + + /* FIXME: Delayed substitutions actually aren't quite the same as + * immediate substitutions. In particular, it's possible to escape + * the exclamation point using ^. */ + if (!SubstituteVars(Line, Buf, _T('!'))) + return NULL; + return cmd_dup(Buf); +} + /* * do the prompt/input/process loop * */ - -BOOL bNoInteractive; -BOOL bIsBatch; BOOL ReadLine (TCHAR *commandline, BOOL bMore) @@ -1299,15 +1322,7 @@ bIsBatch = TRUE; } - if (!SubstituteVars(ip, commandline, _T('%'), bIsBatch)) - return FALSE; - - /* FIXME: !vars! should be substituted later, after parsing. */ - if (!SubstituteVars(commandline, readline, _T('!'), bIsBatch)) - return FALSE; - _tcscpy(commandline, readline); - - return TRUE; + return SubstituteVars(ip, commandline, _T('%')); } static INT Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Fri Feb 13 19:13:17 2009 @@ -102,6 +102,7 @@ LPCTSTR GetEnvVarOrSpecial ( LPCTSTR varName ); VOID AddBreakHandler (VOID); VOID RemoveBreakHandler (VOID); +LPTSTR DoDelayedExpansion(LPTSTR Line); BOOL DoCommand (LPTSTR line); BOOL ReadLine(TCHAR *commandline, BOOL bMore); int cmd_main (int argc, const TCHAR *argv[]); Modified: trunk/reactos/base/shell/cmd/if.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/if.c?rev=39… ============================================================================== --- trunk/reactos/base/shell/cmd/if.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/if.c [iso-8859-1] Fri Feb 13 19:13:17 2009 @@ -67,15 +67,30 @@ { INT result = FALSE; /* when set cause 'then' clause to be executed */ LPTSTR param; + LPTSTR Left = NULL, Right; + + if (Cmd->If.LeftArg) + { + Left = DoDelayedExpansion(Cmd->If.LeftArg); + if (!Left) + return FALSE; + } + Right = DoDelayedExpansion(Cmd->If.RightArg); + if (!Right) + { + cmd_free(Left); + return FALSE; + } if (Cmd->If.Operator == IF_CMDEXTVERSION) { /* IF CMDEXTVERSION n: check if Command Extensions version * is greater or equal to n */ - DWORD n = _tcstoul(Cmd->If.RightArg, &param, 10); + DWORD n = _tcstoul(Right, &param, 10); if (*param != _T('\0')) { - error_syntax(Cmd->If.RightArg); + error_syntax(Right); + cmd_free(Right); return FALSE; } result = (2 >= n); @@ -83,7 +98,7 @@ else if (Cmd->If.Operator == IF_DEFINED) { /* IF DEFINED var: check if environment variable exists */ - result = (GetEnvVarOrSpecial(Cmd->If.RightArg) != NULL); + result = (GetEnvVarOrSpecial(Right) != NULL); } else if (Cmd->If.Operator == IF_ERRORLEVEL) { @@ -91,7 +106,8 @@ INT n = _tcstol(Cmd->If.RightArg, &param, 10); if (*param != _T('\0')) { - error_syntax(Cmd->If.RightArg); + error_syntax(Right); + cmd_free(Right); return FALSE; } result = (nErrorLevel >= n); @@ -102,9 +118,9 @@ WIN32_FIND_DATA f; HANDLE hFind; - StripQuotes(Cmd->If.RightArg); + StripQuotes(Right); - hFind = FindFirstFile(Cmd->If.RightArg, &f); + hFind = FindFirstFile(Right, &f); if (hFind != INVALID_HANDLE_VALUE) { result = TRUE; @@ -120,11 +136,11 @@ if (Cmd->If.Operator == IF_STRINGEQ) { /* IF str1 == str2 */ - result = StringCmp(Cmd->If.LeftArg, Cmd->If.RightArg) == 0; + result = StringCmp(Left, Right) == 0; } else { - result = GenericCmp(StringCmp, Cmd->If.LeftArg, Cmd->If.RightArg); + result = GenericCmp(StringCmp, Left, Right); switch (Cmd->If.Operator) { case IF_EQU: result = (result == 0); break; @@ -136,6 +152,9 @@ } } } + + cmd_free(Left); + cmd_free(Right); if (result ^ ((Cmd->If.Flags & IFFLAG_NEGATE) != 0)) { Modified: trunk/reactos/base/shell/cmd/redir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/redir.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/redir.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/redir.c [iso-8859-1] Fri Feb 13 19:13:17 2009 @@ -54,7 +54,7 @@ PerformRedirection(REDIRECTION *RedirList) { REDIRECTION *Redir; - TCHAR Filename[MAX_PATH]; + LPTSTR Filename; HANDLE hNew; UINT DupNumber; static SECURITY_ATTRIBUTES SecAttr = { sizeof(SECURITY_ATTRIBUTES), NULL, TRUE }; @@ -78,8 +78,9 @@ for (Redir = RedirList; Redir; Redir = Redir->Next) { - *Filename = _T('\0'); - _tcsncat(Filename, Redir->Filename, MAX_PATH - 1); + Filename = DoDelayedExpansion(Redir->Filename); + if (!Filename) + goto redir_error; StripQuotes(Filename); if (*Filename == _T('&')) @@ -112,6 +113,8 @@ { ConErrResPrintf(Redir->Type == REDIR_READ ? STRING_CMD_ERROR1 : STRING_CMD_ERROR3, Filename); + cmd_free(Filename); +redir_error: /* Undo all the redirections before this one */ UndoRedirection(RedirList, Redir); return FALSE; @@ -123,6 +126,7 @@ SetHandle(Redir->Number, hNew); TRACE("%d redirected to: %s\n", Redir->Number, debugstr_aw(Filename)); + cmd_free(Filename); } return TRUE; }

1 0

[tkreuzer] 39596: Get rid of VOLATILE, use volatile instead and fix PENTER_STATE_HANDLER by using "LONG volatile *" like in ms header, which means a pointer to a volatile LONG, instead of "volatile PLONG", which would be a volatile pointer to a LONG.
by tkreuzer＠svn.reactos.org 14 Feb '09

14 Feb '09

Author: tkreuzer Date: Fri Feb 13 18:58:55 2009 New Revision: 39596 URL: http://svn.reactos.org/svn/reactos?rev=39596&view=rev Log: Get rid of VOLATILE, use volatile instead and fix PENTER_STATE_HANDLER by using "LONG volatile *" like in ms header, which means a pointer to a volatile LONG, instead of "volatile PLONG", which would be a volatile pointer to a LONG. Modified: trunk/reactos/include/ddk/ntpoapi.h Modified: trunk/reactos/include/ddk/ntpoapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntpoapi.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ntpoapi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntpoapi.h [iso-8859-1] Fri Feb 13 18:58:55 2009 @@ -90,7 +90,7 @@ IN PENTER_STATE_SYSTEM_HANDLER SystemHandler OPTIONAL, IN PVOID SystemContext, IN LONG NumberProcessors, - IN VOLATILE PLONG Number); + IN LONG volatile *Number); typedef struct _POWER_STATE_HANDLER { POWER_STATE_HANDLER_TYPE Type;

1 0

[cwittich] 39595: sync translations, remove a little change from ros.diff
by cwittich＠svn.reactos.org 13 Feb '09

13 Feb '09

Author: cwittich Date: Fri Feb 13 13:10:55 2009 New Revision: 39595 URL: http://svn.reactos.org/svn/reactos?rev=39595&view=rev Log: sync translations, remove a little change from ros.diff Added: trunk/reactos/dll/win32/wininet/wininet_Zh.rc (with props) Modified: trunk/reactos/dll/win32/wininet/rsrc.rc trunk/reactos/dll/win32/wininet/wininet_Ja.rc trunk/reactos/dll/win32/wininet/wininet_Ko.rc trunk/reactos/dll/win32/wininet/wininet_Uk.rc trunk/reactos/dll/win32/wininet/wininet_ros.diff Modified: trunk/reactos/dll/win32/wininet/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/wininet/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/rsrc.rc [iso-8859-1] Fri Feb 13 13:10:55 2009 @@ -63,3 +63,4 @@ #include "wininet_Sv.rc" #include "wininet_Uk.rc" #include "wininet_Tr.rc" +#include "wininet_Zh.rc" Modified: trunk/reactos/dll/win32/wininet/wininet_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/wininet_Ja.rc [iso-8859-1] Fri Feb 13 13:10:55 2009 @@ -16,24 +16,34 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "lbg[NpX[hÌüÍ" -FONT 9, "MS UI Gothic" +CAPTION "ãããã¯ã¼ã¯ ãã¹ã¯ã¼ãã®å¥å" +FONT 9, "MS Shell Dlg" { - LTEXT "[U¼ÆpX[hðüÍµÄº³¢:", -1, 40, 6, 150, 15 - LTEXT "vLV", -1, 40, 26, 50, 10 - LTEXT "næ", -1, 40, 46, 50, 10 - LTEXT "[U¼", -1, 40, 66, 50, 10 - LTEXT "pX[h", -1, 40, 86, 50, 10 + LTEXT "ã¦ã¼ã¶åã¨ãã¹ã¯ã¼ããå¥åãã¦ä¸ãã:", -1, 40, 6, 150, 15 + LTEXT "ãããã·", -1, 40, 26, 50, 10 + LTEXT "å°å", -1, 40, 46, 50, 10 + LTEXT "ã¦ã¼ã¶å", -1, 40, 66, 50, 10 + LTEXT "ãã¹ã¯ã¼ã", -1, 40, 86, 50, 10 LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "pX[hðÛ¶·é(&S)(ZLAÅÍ èÜ¹ñ)", IDC_SAVEPASSWORD, + CHECKBOX "ãã¹ã¯ã¼ããä¿åãã(&S)(ã»ãã¥ã¢ã§ã¯ããã¾ãã)", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "LZ", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } + +STRINGTABLE DISCARDABLE +{ + IDS_LANCONNECTION "LAN æ¥ç¶" +} + +#pragma code_page(default) Modified: trunk/reactos/dll/win32/wininet/wininet_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/wininet_Ko.rc [iso-8859-1] Fri Feb 13 13:10:55 2009 @@ -16,12 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "³×Æ®¿öÅ© ¾ÏÈ£ ÀÔ·Â" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" { LTEXT "´ç½ÅÀÇ »ç¿ëÀÚ ÀÌ¸§°ú ¾ÏÈ£¸¦ ÀÔ·ÂÇÏ½Ã¿À:", -1, 40, 6, 150, 15 LTEXT "ÇÁ·Ï½Ã", -1, 40, 26, 50, 10 Modified: trunk/reactos/dll/win32/wininet/wininet_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/wininet_Uk.rc [iso-8859-1] Fri Feb 13 13:10:55 2009 @@ -15,7 +15,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT Added: trunk/reactos/dll/win32/wininet/wininet_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet_Zh.rc (added) +++ trunk/reactos/dll/win32/wininet/wininet_Zh.rc [iso-8859-1] Fri Feb 13 13:10:55 2009 @@ -1,0 +1,78 @@ +/* + * wininet (Simplified and Traditional Chinese Resources) + * + * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> + * + * 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 + */ + +/* Chinese text is encoded in UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "è¾å¥ç½ç»å¯ç " +FONT 9, "MS Shell Dlg" +{ + LTEXT "è¯·è¾å¥ä½ çç¨æ·ååå¯ç :", -1, 40, 6, 150, 15 + LTEXT "ä»£ç", -1, 40, 26, 50, 10 + LTEXT "Realm", -1, 40, 46, 50, 10 + LTEXT "ç¨æ·", -1, 40, 66, 50, 10 + LTEXT "å¯ç ", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "ä¿åå¯ç (ä¸å®å¨)(&S)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "ç¡®å®", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "åæ¶", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ + IDS_LANCONNECTION "å±åç½è¿æ¥" +} + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "è¼¸å¥ç¶²è·¯å¯ç¢¼" +FONT 9, "MS Shell Dlg" +{ + LTEXT "è«è¼¸å¥ä½ çç¨æ¶ååå¯ç¢¼:", -1, 40, 6, 150, 15 + LTEXT "ä»£ç", -1, 40, 26, 50, 10 + LTEXT "Realm", -1, 40, 46, 50, 10 + LTEXT "ç¨æ¶", -1, 40, 66, 50, 10 + LTEXT "å¯ç¢¼", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "å²åå¯ç¢¼(ä¸å®å¨)(&S)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "ç¢ºå®", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "åæ¶", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ + IDS_LANCONNECTION "å±åç¶²é£æ¥" +} + +#pragma code_page(default) Propchange: trunk/reactos/dll/win32/wininet/wininet_Zh.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/wininet/wininet_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/wininet_ros.diff [iso-8859-1] Fri Feb 13 13:10:55 2009 @@ -101,11 +101,3 @@ { if (recv(connection->socketFD, &lpszBuffer[nRecv], 1, 0) <= 0) { ---- D:/Wine-CVS/wine/dlls/wininet/rsrc.rc Thu May 08 21:26:20 2008 -+++ D:/ReactOS-Trunk/reactos/dll/win32/wininet/rsrc.rc Thu May 29 18:57:29 2008 -@@ -60,4 +60,5 @@ - #include "wininet_Ru.rc" - #include "wininet_Si.rc" - #include "wininet_Sv.rc" -+#include "wininet_Uk.rc" - #include "wininet_Tr.rc"

1 0

[cwittich] 39594: sync mshtml and shdocvw winetests with wine 1.1.15
by cwittich＠svn.reactos.org 13 Feb '09

13 Feb '09

Author: cwittich Date: Fri Feb 13 12:47:09 2009 New Revision: 39594 URL: http://svn.reactos.org/svn/reactos?rev=39594&view=rev Log: sync mshtml and shdocvw winetests with wine 1.1.15 Modified: trunk/rostests/winetests/mshtml/dom.c trunk/rostests/winetests/mshtml/script.c trunk/rostests/winetests/shdocvw/webbrowser.c Modified: trunk/rostests/winetests/mshtml/dom.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/dom.c?re… ============================================================================== --- trunk/rostests/winetests/mshtml/dom.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/dom.c [iso-8859-1] Fri Feb 13 12:47:09 2009 @@ -307,6 +307,8 @@ &IID_IDispatchEx, &IID_IHTMLStyle, &IID_IHTMLStyle2, + &IID_IHTMLStyle3, + &IID_IHTMLStyle4, NULL }; @@ -2411,6 +2413,7 @@ float f; BSTR sOverflowDefault; BSTR sDefault; + VARIANT vDefault; test_disp((IUnknown*)style, &DIID_DispHTMLStyle); test_ifaces((IUnknown*)style, style_iids); @@ -2428,6 +2431,82 @@ hres = IHTMLStyle_get_fontWeight(style, &str); ok(hres == S_OK, "get_fontWeight failed: %08x\n", hres); ok(!str, "fontWeight = %s\n", dbgstr_w(str)); + + hres = IHTMLStyle_get_fontWeight(style, &sDefault); + ok(hres == S_OK, "get_fontWeight failed: %08x\n", hres); + + str = a2bstr("test"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == E_INVALIDARG, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("bold"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("bolder"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("lighter"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("100"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("200"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("300"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("400"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("500"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("600"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("700"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("800"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("900"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLStyle_get_fontWeight(style, &str); + ok(hres == S_OK, "get_fontWeight failed: %08x\n", hres); + ok(!strcmp_wa(str, "900"), "str != style900\n"); + SysFreeString(str); + + hres = IHTMLStyle_put_fontWeight(style, sDefault); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); /* font Variant */ hres = IHTMLStyle_get_fontVariant(style, NULL); @@ -2482,10 +2561,32 @@ ok(hres == S_OK, "get_textDecorationUnderline failed: %08x\n", hres); ok(b == VARIANT_FALSE, "textDecorationUnderline = %x\n", b); + hres = IHTMLStyle_put_textDecorationUnderline(style, VARIANT_TRUE); + ok(hres == S_OK, "get_textDecorationUnderline failed: %08x\n", hres); + ok(b == VARIANT_FALSE, "textDecorationUnderline = %x\n", b); + + hres = IHTMLStyle_get_textDecorationUnderline(style, &b); + ok(hres == S_OK, "get_textDecorationUnderline failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "textDecorationUnderline = %x\n", b); + + hres = IHTMLStyle_put_textDecorationUnderline(style, VARIANT_FALSE); + ok(hres == S_OK, "get_textDecorationUnderline failed: %08x\n", hres); + b = 0xfefe; hres = IHTMLStyle_get_textDecorationLineThrough(style, &b); ok(hres == S_OK, "get_textDecorationLineThrough failed: %08x\n", hres); ok(b == VARIANT_FALSE, "textDecorationLineThrough = %x\n", b); + + hres = IHTMLStyle_put_textDecorationLineThrough(style, VARIANT_TRUE); + ok(hres == S_OK, "get_textDecorationLineThrough failed: %08x\n", hres); + ok(b == VARIANT_FALSE, "textDecorationLineThrough = %x\n", b); + + hres = IHTMLStyle_get_textDecorationLineThrough(style, &b); + ok(hres == S_OK, "get_textDecorationLineThrough failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "textDecorationLineThrough = %x\n", b); + + hres = IHTMLStyle_put_textDecorationLineThrough(style, VARIANT_FALSE); + ok(hres == S_OK, "get_textDecorationLineThrough failed: %08x\n", hres); hres = IHTMLStyle_get_posWidth(style, NULL); ok(hres == E_POINTER, "get_posWidth failed: %08x\n", hres); @@ -2903,6 +3004,29 @@ str = a2bstr("bordertopstyle"); test_border_styles(style, str); SysFreeString(str); + + hres = IHTMLStyle_get_backgroundColor(style, &v); + ok(hres == S_OK, "get_backgroundColor: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "type failed: %d\n", V_VT(&v)); + ok(!V_BSTR(&v), "str=%s\n", dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + /* PaddingLeft */ + hres = IHTMLStyle_get_paddingLeft(style, &vDefault); + ok(hres == S_OK, "get_paddingLeft: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("10"); + hres = IHTMLStyle_put_paddingLeft(style, v); + ok(hres == S_OK, "get_paddingLeft: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle_get_paddingLeft(style, &v); + ok(hres == S_OK, "get_paddingLeft: %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "10px"), "expecte 10 = %s\n", dbgstr_w(V_BSTR(&v))); + + hres = IHTMLStyle_put_paddingLeft(style, vDefault); + ok(hres == S_OK, "get_paddingLeft: %08x\n", hres); hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); Modified: trunk/rostests/winetests/mshtml/script.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/script.c… ============================================================================== --- trunk/rostests/winetests/mshtml/script.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/script.c [iso-8859-1] Fri Feb 13 12:47:09 2009 @@ -36,6 +36,20 @@ DEFINE_GUID(CLSID_IdentityUnmarshal,0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +#ifdef _WIN64 + +#define CTXARG_T DWORDLONG +#define IActiveScriptParseVtbl IActiveScriptParse64Vtbl +#define IActiveScriptParseProcedure2Vtbl IActiveScriptParseProcedure2_64Vtbl + +#else + +#define CTXARG_T DWORD +#define IActiveScriptParseVtbl IActiveScriptParse32Vtbl +#define IActiveScriptParseProcedure2Vtbl IActiveScriptParseProcedure2_32Vtbl + +#endif + #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -538,7 +552,7 @@ static HRESULT WINAPI ActiveScriptParseProcedure_ParseProcedureText(IActiveScriptParseProcedure2 *iface, LPCOLESTR pstrCode, LPCOLESTR pstrFormalParams, LPCOLESTR pstrProcedureName, LPCOLESTR pstrItemName, IUnknown *punkContext, LPCOLESTR pstrDelimiter, - DWORD dwSourceContextCookie, ULONG ulStartingLineNumber, DWORD dwFlags, IDispatch **ppdisp) + CTXARG_T dwSourceContextCookie, ULONG ulStartingLineNumber, DWORD dwFlags, IDispatch **ppdisp) { ok(0, "unexpected call\n"); return E_NOTIMPL; @@ -579,7 +593,7 @@ static HRESULT WINAPI ActiveScriptParse_AddScriptlet(IActiveScriptParse *iface, LPCOLESTR pstrDefaultName, LPCOLESTR pstrCode, LPCOLESTR pstrItemName, LPCOLESTR pstrSubItemName, LPCOLESTR pstrEventName, LPCOLESTR pstrDelimiter, - DWORD dwSourceContextCookie, ULONG ulStartingLineNumber, DWORD dwFlags, + CTXARG_T dwSourceContextCookie, ULONG ulStartingLineNumber, DWORD dwFlags, BSTR *pbstrName, EXCEPINFO *pexcepinfo) { ok(0, "unexpected call\n"); @@ -588,7 +602,7 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *iface, LPCOLESTR pstrCode, LPCOLESTR pstrItemName, IUnknown *punkContext, - LPCOLESTR pstrDelimiter, DWORD dwSourceContextCookie, ULONG ulStartingLine, + LPCOLESTR pstrDelimiter, CTXARG_T dwSourceContextCookie, ULONG ulStartingLine, DWORD dwFlags, VARIANT *pvarResult, EXCEPINFO *pexcepinfo) { IDispatchEx *document; Modified: trunk/rostests/winetests/shdocvw/webbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shdocvw/webbrow… ============================================================================== --- trunk/rostests/winetests/shdocvw/webbrowser.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shdocvw/webbrowser.c [iso-8859-1] Fri Feb 13 12:47:09 2009 @@ -68,6 +68,9 @@ ok(called_ ## func || broken(!called_ ## func), "expected " #func "\n"); \ expect_ ## func = called_ ## func = FALSE; \ }while(0) + +#define CLEAR_CALLED(func) \ + expect_ ## func = called_ ## func = FALSE DEFINE_EXPECT(GetContainer); DEFINE_EXPECT(Site_GetWindow); @@ -1773,6 +1776,35 @@ ok(b == VARIANT_FALSE, "b=%x\n", b); } +static void test_ambient_unknown(IWebBrowser2 *wb, IOleControl *control, BOOL is_clientsite) +{ + HRESULT hres; + + SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + SET_EXPECT(Invoke_AMBIENT_SILENT); + SET_EXPECT(Invoke_AMBIENT_USERMODE); + SET_EXPECT(Invoke_AMBIENT_DLCONTROL); + SET_EXPECT(Invoke_AMBIENT_USERAGENT); + SET_EXPECT(Invoke_AMBIENT_PALETTE); + + hres = IOleControl_OnAmbientPropertyChange(control, DISPID_UNKNOWN); + ok(hres == S_OK, "OnAmbientPropertyChange failed %08x\n", hres); + + CHECK_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + CHECK_EXPECT(Invoke_AMBIENT_SILENT); + CHECK_EXPECT(Invoke_AMBIENT_USERMODE); + CHECK_EXPECT(Invoke_AMBIENT_DLCONTROL); + CHECK_EXPECT(Invoke_AMBIENT_USERAGENT); + CHECK_EXPECT(Invoke_AMBIENT_PALETTE); + + CLEAR_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + CLEAR_CALLED(Invoke_AMBIENT_SILENT); + CLEAR_CALLED(Invoke_AMBIENT_USERMODE); + CLEAR_CALLED(Invoke_AMBIENT_DLCONTROL); + CLEAR_CALLED(Invoke_AMBIENT_USERAGENT); + CLEAR_CALLED(Invoke_AMBIENT_PALETTE); +} + static void test_wb_funcs(IUnknown *unk, BOOL is_clientsite) { IWebBrowser2 *wb; @@ -1787,6 +1819,7 @@ test_Silent(wb, control, is_clientsite); test_Offline(wb, control, is_clientsite); + test_ambient_unknown(wb, control, is_clientsite); IWebBrowser_Release(wb); IOleControl_Release(control);

1 0

[cwittich] 39593: apply ros-hack
by cwittich＠svn.reactos.org 13 Feb '09

13 Feb '09

Author: cwittich Date: Fri Feb 13 12:34:10 2009 New Revision: 39593 URL: http://svn.reactos.org/svn/reactos?rev=39593&view=rev Log: apply ros-hack Modified: trunk/reactos/dll/win32/mshtml/install.c Modified: trunk/reactos/dll/win32/mshtml/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/install.c… ============================================================================== --- trunk/reactos/dll/win32/mshtml/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/install.c [iso-8859-1] Fri Feb 13 12:34:10 2009 @@ -54,6 +54,11 @@ '\\','W','i','n','e', '\\','M','S','H','T','M','L',0}; +static const CHAR mshtml_keyA[] = + {'S','o','f','t','w','a','r','e', + '\\','W','i','n','e', + '\\','M','S','H','T','M','L',0}; + static HWND install_dialog = NULL; static LPWSTR tmp_file_name = NULL; static HANDLE tmp_file = INVALID_HANDLE_VALUE; @@ -219,23 +224,18 @@ static BOOL install_from_registered_dir(void) { char *file_name; - HKEY hkey; DWORD res, type, size = MAX_PATH; BOOL ret; + file_name = heap_alloc(size+sizeof(GECKO_FILE_NAME)); /* @@ Wine registry key: HKCU\Software\Wine\MSHTML */ - res = RegOpenKeyW(HKEY_CURRENT_USER, mshtml_keyW, &hkey); - if(res != ERROR_SUCCESS) - return FALSE; - - file_name = heap_alloc(size+sizeof(GECKO_FILE_NAME)); - res = RegQueryValueExA(hkey, "GeckoCabDir", NULL, &type, (PBYTE)file_name, &size); + res = RegGetValueA(HKEY_CURRENT_USER, mshtml_keyA, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)file_name, &size); if(res == ERROR_MORE_DATA) { file_name = heap_realloc(file_name, size+sizeof(GECKO_FILE_NAME)); - res = RegQueryValueExA(hkey, "GeckoCabDir", NULL, &type, (PBYTE)file_name, &size); - } - RegCloseKey(hkey); - if(res != ERROR_SUCCESS || type != REG_SZ) { + res = RegGetValueA(HKEY_CURRENT_USER, mshtml_keyA, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)file_name, &size); + } + + if(res != ERROR_SUCCESS || (type != REG_SZ && type != REG_EXPAND_SZ)) { heap_free(file_name); return FALSE; }

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