Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 39462: - Stub implement NlsResetProcessLocale
by dchapyshev＠svn.reactos.org 07 Feb '09

07 Feb '09

Author: dchapyshev Date: Sat Feb 7 12:29:11 2009 New Revision: 39462 URL: http://svn.reactos.org/svn/reactos?rev=39462&view=rev Log: - Stub implement NlsResetProcessLocale Modified: trunk/reactos/dll/win32/kernel32/kernel32.def trunk/reactos/dll/win32/kernel32/misc/stubs.c Modified: trunk/reactos/dll/win32/kernel32/kernel32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.def [iso-8859-1] Sat Feb 7 12:29:11 2009 @@ -685,7 +685,7 @@ NeedCurrentDirectoryForExePathW@4 NlsConvertIntegerToString@20 NlsGetCacheUpdateCount@0 -;NlsResetProcessLocale +NlsResetProcessLocale@0 ;NumaVirtualQueryNode OpenConsoleW@16 ;OpenDataFile Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] Sat Feb 7 12:29:11 2009 @@ -1049,3 +1049,11 @@ STUB; return FALSE; } + +BOOL +WINAPI +NlsResetProcessLocale(VOID) +{ + STUB; + return TRUE; +}

1 0

[dchapyshev] 39461: - Add olecli32 and olesvr32 from Wine
by dchapyshev＠svn.reactos.org 07 Feb '09

07 Feb '09

Author: dchapyshev Date: Sat Feb 7 12:25:36 2009 New Revision: 39461 URL: http://svn.reactos.org/svn/reactos?rev=39461&view=rev Log: - Add olecli32 and olesvr32 from Wine Added: trunk/reactos/dll/win32/olecli32/ (with props) trunk/reactos/dll/win32/olecli32/olecli.h (with props) trunk/reactos/dll/win32/olecli32/olecli.spec (with props) trunk/reactos/dll/win32/olecli32/olecli16.c (with props) trunk/reactos/dll/win32/olecli32/olecli32.rbuild (with props) trunk/reactos/dll/win32/olecli32/olecli32.spec (with props) trunk/reactos/dll/win32/olecli32/olecli_main.c (with props) trunk/reactos/dll/win32/olesvr32/ (with props) trunk/reactos/dll/win32/olesvr32/olesvr.spec (with props) trunk/reactos/dll/win32/olesvr32/olesvr32.rbuild (with props) trunk/reactos/dll/win32/olesvr32/olesvr32.spec (with props) trunk/reactos/dll/win32/olesvr32/olesvr_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=394… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Sat Feb 7 12:25:36 2009 @@ -99,6 +99,8 @@ <property name="BASEADDRESS_WSOCK32" value="0x71ab0000" /> <property name="BASEADDRESS_ACLEDIT" value="0x71b70000" /> <property name="BASEADDRESS_NETAPI32" value="0x71c00000" /> + <property name="BASEADDRESS_OLESVR32" value="0x71dd0000" /> + <property name="BASEADDRESS_OLECLI32" value="0x71df0000" /> <property name="BASEADDRESS_DPLAY" value="0x71e80000" /> <property name="BASEADDRESS_SECURITY" value="0x71f10000" /> <property name="BASEADDRESS_CRYPTUI" value="0x720D0000" /> 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 7 12:25:36 2009 @@ -326,8 +326,10 @@ dll\win32\ole32\ole32.dll 1 dll\win32\oleacc\oleacc.dll 1 dll\win32\oleaut32\oleaut32.dll 1 +dll\win32\olecli32\olecli32.dll 1 dll\win32\oledlg\oledlg.dll 1 dll\win32\olepro32\olepro32.dll 1 +dll\win32\olesvr32\olesvr32.dll 1 dll\win32\opengl32\opengl32.dll 1 dll\win32\pdh\pdh.dll 1 dll\win32\powrprof\powrprof.dll 1 Propchange: trunk/reactos/dll/win32/olecli32/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Feb 7 12:25:36 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/olecli32/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/olecli32/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/olecli32/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/olecli32/olecli.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olecli32/olecli.… ============================================================================== --- trunk/reactos/dll/win32/olecli32/olecli.h (added) +++ trunk/reactos/dll/win32/olecli32/olecli.h [iso-8859-1] Sat Feb 7 12:25:36 2009 @@ -1,0 +1,129 @@ +/* + * OLECLI library + * + * Copyright 1995 Martin von Loewis + * + * 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 + */ + +typedef enum +{ + OLE_OK, + OLE_WAIT_FOR_RELEASE, + OLE_BUSY, + OLE_ERROR_PROTECT_ONLY, + OLE_ERROR_MEMORY, + OLE_ERROR_STREAM, + OLE_ERROR_STATIC, + OLE_ERROR_BLANK, + OLE_ERROR_DRAW, + OLE_ERROR_METAFILE, + OLE_ERROR_ABORT, + OLE_ERROR_CLIPBOARD, + OLE_ERROR_FORMAT, + OLE_ERROR_OBJECT, + OLE_ERROR_OPTION, + OLE_ERROR_PROTOCOL, + OLE_ERROR_ADDRESS, + OLE_ERROR_NOT_EQUAL, + OLE_ERROR_HANDLE, + OLE_ERROR_GENERIC, + OLE_ERROR_CLASS, + OLE_ERROR_SYNTAX, + OLE_ERROR_DATATYPE, + OLE_ERROR_PALETTE, + OLE_ERROR_NOT_LINK, + OLE_ERROR_NOT_EMPTY, + OLE_ERROR_SIZE, + OLE_ERROR_DRIVE, + OLE_ERROR_NETWORK, + OLE_ERROR_NAME, + OLE_ERROR_TEMPLATE, + OLE_ERROR_NEW, + OLE_ERROR_EDIT, + OLE_ERROR_OPEN, + OLE_ERROR_NOT_OPEN, + OLE_ERROR_LAUNCH, + OLE_ERROR_COMM, + OLE_ERROR_TERMINATE, + OLE_ERROR_COMMAND, + OLE_ERROR_SHOW, + OLE_ERROR_DOVERB, + OLE_ERROR_ADVISE_NATIVE, + OLE_ERROR_ADVISE_PICT, + OLE_ERROR_ADVISE_RENAME, + OLE_ERROR_POKE_NATIVE, + OLE_ERROR_REQUEST_NATIVE, + OLE_ERROR_REQUEST_PICT, + OLE_ERROR_SERVER_BLOCKED, + OLE_ERROR_REGISTRATION, + OLE_ERROR_ALREADY_REGISTERED, + OLE_ERROR_TASK, + OLE_ERROR_OUTOFDATE, + OLE_ERROR_CANT_UPDATE_CLIENT, + OLE_ERROR_UPDATE, + OLE_ERROR_SETDATA_FORMAT, + OLE_ERROR_STATIC_FROM_OTHER_OS, + OLE_WARN_DELETE_DATA = 1000 +} OLESTATUS; + +typedef enum +{ + olerender_none, + olerender_draw, + olerender_format +} OLEOPT_RENDER; + +typedef enum +{ + oleupdate_always, + oleupdate_onsave, + oleupdate_oncall, + oleupdate_onclose +} OLEOPT_UPDATE; + +typedef enum { + OLE_NONE, /* none */ + OLE_DELETE, /* delete object */ + OLE_LNKPASTE, /* link paste */ + OLE_EMBPASTE, /* paste(and update) */ + OLE_SHOW, + OLE_RUN, + OLE_ACTIVATE, + OLE_UPDATE, + OLE_CLOSE, + OLE_RECONNECT, + OLE_SETUPDATEOPTIONS, + OLE_SERVERRUNLAUNCH, /* unlaunch (terminate?) server */ + OLE_LOADFROMSTREAM, /* (auto reconnect) */ + OLE_SETDATA, /* OleSetData */ + OLE_REQUESTDATA, /* OleRequestData */ + OLE_OTHER, + OLE_CREATE, + OLE_CREATEFROMTEMPLATE, + OLE_CREATELINKFROMFILE, + OLE_COPYFROMLNK, + OLE_CREATREFROMFILE, + OLE_CREATEINVISIBLE +} OLE_RELEASE_METHOD; + +typedef LONG LHCLIENTDOC; +typedef struct _OLEOBJECT *_LPOLEOBJECT; +typedef struct _OLECLIENT *LPOLECLIENT; +typedef LONG OLECLIPFORMAT;/* dunno about this type, please change/add */ +typedef OLEOPT_UPDATE *LPOLEOPT_UPDATE; +typedef LPCSTR LPCOLESTR16; + +struct _OLESTREAM; Propchange: trunk/reactos/dll/win32/olecli32/olecli.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/olecli32/olecli.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olecli32/olecli.… ============================================================================== --- trunk/reactos/dll/win32/olecli32/olecli.spec (added) +++ trunk/reactos/dll/win32/olecli32/olecli.spec [iso-8859-1] Sat Feb 7 12:25:36 2009 @@ -1,0 +1,178 @@ +#1 WEP +2 stub OLEDELETE +3 stub OLESAVETOSTREAM +4 stub OLELOADFROMSTREAM +6 stub OLECLONE +7 stub OLECOPYFROMLINK +8 stub OLEEQUAL +9 pascal -ret16 OleQueryLinkFromClip(str word word) OleQueryLinkFromClip16 +10 pascal -ret16 OleQueryCreateFromClip(str word word) OleQueryCreateFromClip16 +11 pascal -ret16 OleCreateLinkFromClip (str segptr long str segptr word word) OleCreateLinkFromClip16 +12 pascal -ret16 OleCreateFromClip(str segptr long str long word word) OleCreateFromClip16 +13 stub OLECOPYTOCLIPBOARD +14 pascal -ret16 OleQueryType(ptr segptr) OleQueryType16 +15 stub OLESETHOSTNAMES +16 stub OLESETTARGETDEVICE +17 stub OLESETBOUNDS +18 stub OLEQUERYBOUNDS +19 stub OLEDRAW +20 stub OLEQUERYOPEN +21 stub OLEACTIVATE +22 stub OLEUPDATE +23 stub OLERECONNECT +24 stub OLEGETLINKUPDATEOPTIONS +25 stub OLESETLINKUPDATEOPTIONS +26 stub OLEENUMFORMATS +27 stub OLECLOSE +28 stub OLEGETDATA +29 stub OLESETDATA +30 stub OLEQUERYPROTOCOL +31 stub OLEQUERYOUTOFDATE +32 stub OLEOBJECTCONVERT +33 stub OLECREATEFROMTEMPLATE +34 stub OLECREATE +35 stub OLEQUERYRELEASESTATUS +36 stub OLEQUERYRELEASEERROR +37 stub OLEQUERYRELEASEMETHOD +38 stub OLECREATEFROMFILE +39 stub OLECREATELINKFROMFILE +40 stub OLERELEASE +41 pascal OleRegisterClientDoc(ptr ptr long ptr) OleRegisterClientDoc16 +42 pascal OleRevokeClientDoc(long) OleRevokeClientDoc16 +43 pascal OleRenameClientDoc(long ptr) OleRenameClientDoc16 +44 pascal -ret16 OleRevertClientDoc(long) OleRevertClientDoc16 +45 pascal OleSavedClientDoc(long) OleSavedClientDoc16 +46 stub OLERENAME +47 pascal -ret16 OleEnumObjects(long segptr) OleEnumObjects16 +48 stub OLEQUERYNAME +49 stub OLESETCOLORSCHEME +50 stub OLEREQUESTDATA +54 stub OLELOCKSERVER +55 stub OLEUNLOCKSERVER +56 stub OLEQUERYSIZE +57 stub OLEEXECUTE +58 stub OLECREATEINVISIBLE +59 stub OLEQUERYCLIENTVERSION +60 pascal -ret16 OleIsDcMeta(word) OleIsDcMeta16 +100 stub DOCWNDPROC +101 stub SRVRWNDPROC +102 stub MFCALLBACKFUNC +110 stub DEFLOADFROMSTREAM +111 stub DEFCREATEFROMCLIP +112 stub DEFCREATELINKFROMCLIP +113 stub DEFCREATEFROMTEMPLATE +114 stub DEFCREATE +115 stub DEFCREATEFROMFILE +116 stub DEFCREATELINKFROMFILE +117 stub DEFCREATEINVISIBLE +200 stub LERELEASE +201 stub LESHOW +202 stub LEGETDATA +203 stub LESETDATA +204 stub LESETHOSTNAMES +205 stub LESETTARGETDEVICE +206 stub LESETBOUNDS +207 stub LESAVETOSTREAM +208 stub LECLONE +209 stub LECOPYFROMLINK +210 stub LEEQUAL +211 stub LECOPY +212 stub LEQUERYTYPE +213 stub LEQUERYBOUNDS +214 stub LEDRAW +215 stub LEQUERYOPEN +216 stub LEACTIVATE +218 stub LEUPDATE +219 stub LERECONNECT +220 stub LEENUMFORMAT +221 stub LEQUERYPROTOCOL +222 stub LEQUERYOUTOFDATE +223 stub LEOBJECTCONVERT +224 stub LECHANGEDATA +225 stub LECLOSE +226 stub LEGETUPDATEOPTIONS +227 stub LESETUPDATEOPTIONS +228 stub LEEXECUTE +229 stub LEOBJECTLONG +230 stub LECREATEINVISIBLE +300 stub MFRELEASE +301 stub MFGETDATA +302 stub MFSAVETOSTREAM +303 stub MFCLONE +304 stub MFEQUAL +305 stub MFCOPY +307 stub MFQUERYBOUNDS +308 stub MFDRAW +309 stub MFENUMFORMAT +310 stub MFCHANGEDATA +400 stub BMRELEASE +401 stub BMGETDATA +402 stub BMSAVETOSTREAM +403 stub BMCLONE +404 stub BMEQUAL +405 stub BMCOPY +407 stub BMQUERYBOUNDS +408 stub BMDRAW +409 stub BMENUMFORMAT +410 stub BMCHANGEDATA +500 stub DIBRELEASE +501 stub DIBGETDATA +502 stub DIBSAVETOSTREAM +503 stub DIBCLONE +504 stub DIBEQUAL +505 stub DIBCOPY +507 stub DIBQUERYBOUNDS +508 stub DIBDRAW +509 stub DIBENUMFORMAT +510 stub DIBCHANGEDATA +600 stub GENRELEASE +601 stub GENGETDATA +602 stub GENSETDATA +603 stub GENSAVETOSTREAM +604 stub GENCLONE +605 stub GENEQUAL +606 stub GENCOPY +608 stub GENQUERYBOUNDS +609 stub GENDRAW +610 stub GENENUMFORMAT +611 stub GENCHANGEDATA +701 stub ERRSHOW +702 stub ERRSETDATA +703 stub ERRSETHOSTNAMES +704 stub ERRSETTARGETDEVICE +705 stub ERRSETBOUNDS +706 stub ERRCOPYFROMLINK +707 stub ERRQUERYOPEN +708 stub ERRACTIVATE +709 stub ERRCLOSE +710 stub ERRUPDATE +711 stub ERRRECONNECT +712 stub ERRQUERYPROTOCOL +713 stub ERRQUERYOUTOFDATE +714 stub ERROBJECTCONVERT +715 stub ERRGETUPDATEOPTIONS +716 stub ERRSETUPDATEOPTIONS +717 stub ERREXECUTE +718 stub ERROBJECTLONG +800 stub PBLOADFROMSTREAM +801 stub PBCREATEFROMCLIP +802 stub PBCREATELINKFROMCLIP +803 stub PBCREATEFROMTEMPLATE +804 stub PBCREATE +805 stub PBDRAW +806 stub PBQUERYBOUNDS +807 stub PBCOPYTOCLIPBOARD +808 stub PBCREATEFROMFILE +809 stub PBCREATELINKFROMFILE +810 stub PBENUMFORMATS +811 stub PBGETDATA +812 stub PBCREATEINVISIBLE +910 stub OBJQUERYNAME +911 stub OBJRENAME +912 stub OBJQUERYTYPE +913 stub OBJQUERYSIZE +950 stub CONNECTDLGPROC +951 stub SETNETNAME +952 stub CHECKNETDRIVE +953 stub SETNEXTNETDRIVE +954 stub GETTASKVISIBLEWINDOW Propchange: trunk/reactos/dll/win32/olecli32/olecli.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/olecli32/olecli16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olecli32/olecli1… ============================================================================== --- trunk/reactos/dll/win32/olecli32/olecli16.c (added) +++ trunk/reactos/dll/win32/olecli32/olecli16.c [iso-8859-1] Sat Feb 7 12:25:36 2009 @@ -1,0 +1,203 @@ +/* + * OLECLI library + * + * Copyright 1995 Martin von Loewis + * + * 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 + */ + +/* At the moment, these are only empty stubs. + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "wine/windef16.h" +#include "winbase.h" +#include "wingdi.h" +#include "wownt32.h" +#include "objbase.h" +#include "olecli.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ole); + +typedef struct _OLEOBJECTVTBL16 { + void CALLBACK *(*QueryProtocol)(_LPOLEOBJECT,LPCOLESTR16); + OLESTATUS (CALLBACK *Release)(_LPOLEOBJECT); + OLESTATUS (CALLBACK *Show)(_LPOLEOBJECT,BOOL16); + OLESTATUS (CALLBACK *DoVerb)(_LPOLEOBJECT,UINT16,BOOL16,BOOL16); + OLESTATUS (CALLBACK *GetData)(_LPOLEOBJECT,OLECLIPFORMAT,HANDLE16 *); + OLESTATUS (CALLBACK *SetData)(_LPOLEOBJECT,OLECLIPFORMAT,HANDLE16); + OLESTATUS (CALLBACK *SetTargetDevice)(_LPOLEOBJECT,HGLOBAL16); + OLESTATUS (CALLBACK *SetBounds)(_LPOLEOBJECT,LPRECT16); + OLESTATUS (CALLBACK *EnumFormats)(_LPOLEOBJECT,OLECLIPFORMAT); + OLESTATUS (CALLBACK *SetColorScheme)(_LPOLEOBJECT,struct tagLOGPALETTE*); + OLESTATUS (CALLBACK *Delete)(_LPOLEOBJECT); + OLESTATUS (CALLBACK *SetHostNames)(_LPOLEOBJECT,LPCOLESTR16,LPCOLESTR16); + OLESTATUS (CALLBACK *SaveToStream)(_LPOLEOBJECT,struct _OLESTREAM*); + OLESTATUS (CALLBACK *Clone)(_LPOLEOBJECT,LPOLECLIENT,LHCLIENTDOC,LPCOLESTR16,_LPOLEOBJECT *); + OLESTATUS (CALLBACK *CopyFromLink)(_LPOLEOBJECT,LPOLECLIENT,LHCLIENTDOC,LPCOLESTR16,_LPOLEOBJECT *); + OLESTATUS (CALLBACK *Equal)(_LPOLEOBJECT,_LPOLEOBJECT); + OLESTATUS (CALLBACK *CopyToClipBoard)(_LPOLEOBJECT); + OLESTATUS (CALLBACK *Draw)(_LPOLEOBJECT,HDC16,LPRECT16,LPRECT16,HDC16); + OLESTATUS (CALLBACK *Activate)(_LPOLEOBJECT,UINT16,BOOL16,BOOL16,HWND16,LPRECT16); + OLESTATUS (CALLBACK *Execute)(_LPOLEOBJECT,HGLOBAL16,UINT16); + OLESTATUS (CALLBACK *Close)(_LPOLEOBJECT); + OLESTATUS (CALLBACK *Update)(_LPOLEOBJECT); + OLESTATUS (CALLBACK *Reconnect)(_LPOLEOBJECT); + OLESTATUS (CALLBACK *ObjectConvert)(_LPOLEOBJECT,LPCOLESTR16,LPOLECLIENT,LHCLIENTDOC,LPCOLESTR16,_LPOLEOBJECT*); + OLESTATUS (CALLBACK *GetLinkUpdateOptions)(_LPOLEOBJECT,LPOLEOPT_UPDATE); + OLESTATUS (CALLBACK *SetLinkUpdateOptions)(_LPOLEOBJECT,OLEOPT_UPDATE); + OLESTATUS (CALLBACK *Rename)(_LPOLEOBJECT,LPCOLESTR16); + OLESTATUS (CALLBACK *QueryName)(_LPOLEOBJECT,LPSTR,LPUINT16); + OLESTATUS (CALLBACK *QueryType)(_LPOLEOBJECT,LPLONG); + OLESTATUS (CALLBACK *QueryBounds)(_LPOLEOBJECT,LPRECT16); + OLESTATUS (CALLBACK *QuerySize)(_LPOLEOBJECT,LPDWORD); + OLESTATUS (CALLBACK *QueryOpen)(_LPOLEOBJECT); + OLESTATUS (CALLBACK *QueryOutOfDate)(_LPOLEOBJECT); + OLESTATUS (CALLBACK *QueryReleaseStatus)(_LPOLEOBJECT); + OLESTATUS (CALLBACK *QueryReleaseError)(_LPOLEOBJECT); + OLE_RELEASE_METHOD (CALLBACK *QueryReleaseMethod)(_LPOLEOBJECT); + OLESTATUS (CALLBACK *RequestData)(_LPOLEOBJECT,OLECLIPFORMAT); + OLESTATUS (CALLBACK *ObjectLong)(_LPOLEOBJECT,UINT16,LPLONG); +} OLEOBJECTVTBL; +typedef OLEOBJECTVTBL *LPOLEOBJECTVTBL; + +typedef struct _OLEOBJECT +{ + const OLEOBJECTVTBL *lpvtbl; +} OLEOBJECT16; + +static LONG OLE_current_handle; + +/****************************************************************************** + * OleSavedClientDoc [OLECLI.45] + */ +OLESTATUS WINAPI OleSavedClientDoc16(LHCLIENTDOC hDoc) +{ + FIXME("(%d: stub\n", hDoc); + return OLE_OK; +} + +/****************************************************************************** + * OleRegisterClientDoc [OLECLI.41] + */ +OLESTATUS WINAPI OleRegisterClientDoc16(LPCSTR classname, LPCSTR docname, + LONG reserved, LHCLIENTDOC *hRet ) +{ + FIXME("(%s,%s,...): stub\n",classname,docname); + *hRet=++OLE_current_handle; + return OLE_OK; +} + +/****************************************************************************** + * OleRenameClientDoc [OLECLI.43] + */ +OLESTATUS WINAPI OleRenameClientDoc16(LHCLIENTDOC hDoc, LPCSTR newName) +{ + FIXME("(%d,%s,...): stub\n",hDoc, newName); + return OLE_OK; +} + +/****************************************************************************** + * OleRevokeClientDoc [OLECLI.42] + */ +OLESTATUS WINAPI OleRevokeClientDoc16(LHCLIENTDOC hServerDoc) +{ + FIXME("(%d): stub\n",hServerDoc); + return OLE_OK; +} + +/****************************************************************************** + * OleRevertClientDoc [OLECLI.44] + */ +OLESTATUS WINAPI OleRevertClientDoc16(LHCLIENTDOC hServerDoc) +{ + FIXME("(%d): stub\n", hServerDoc); + return OLE_OK; +} + +/****************************************************************************** + * OleEnumObjects [OLECLI.47] + */ +OLESTATUS WINAPI OleEnumObjects16(LHCLIENTDOC hServerDoc, SEGPTR data) +{ + FIXME("(%d, %04x:%04x): stub\n", hServerDoc, HIWORD(data), + LOWORD(data)); + return OLE_OK; +} + +/****************************************************************************** + * OleCreateLinkFromClip [OLECLI.11] + */ +OLESTATUS WINAPI OleCreateLinkFromClip16( LPCSTR name, SEGPTR olecli, LHCLIENTDOC hclientdoc, + LPCSTR xname, SEGPTR lpoleob, UINT16 render, + UINT16 clipformat ) +{ + FIXME("(%s, %04x:%04x, %d, %s, %04x:%04x, %d, %d): stub!\n", + name, HIWORD(olecli), LOWORD(olecli), hclientdoc, xname, HIWORD(lpoleob), + LOWORD(lpoleob), render, clipformat); + return OLE_OK; +} + +/****************************************************************************** + * OleQueryLinkFromClip [OLECLI.9] + */ +OLESTATUS WINAPI OleQueryLinkFromClip16(LPCSTR name, UINT16 render, UINT16 clipformat) +{ + FIXME("(%s, %d, %d): stub!\n", name, render, clipformat); + return OLE_OK; +} + +/****************************************************************************** + * OleQueryCreateFromClip [OLECLI.10] + */ +OLESTATUS WINAPI OleQueryCreateFromClip16(LPCSTR name, UINT16 render, UINT16 clipformat) +{ + FIXME("(%s, %d, %d): stub!\n", name, render, clipformat); + return OLE_OK; +} + +/****************************************************************************** + * OleIsDcMeta [OLECLI.60] + */ +BOOL16 WINAPI OleIsDcMeta16(HDC16 hdc) +{ + return GetObjectType( HDC_32(hdc) ) == OBJ_METADC; +} + +/****************************************************************************** + * OleQueryType [OLECLI.14] + */ +OLESTATUS WINAPI OleQueryType16(_LPOLEOBJECT oleob, SEGPTR xlong) { + FIXME("(%p, %p): stub!\n", oleob, MapSL(xlong)); + return OLE_OK; +} + +/****************************************************************************** + * OleCreateFromClip [OLECLI.12] + */ +OLESTATUS WINAPI OleCreateFromClip16( LPCSTR name, SEGPTR olecli, LHCLIENTDOC hclientdoc, + LPCSTR xname, SEGPTR lpoleob, + UINT16 render, UINT16 clipformat ) +{ + FIXME("(%s, %04x:%04x, %d, %s, %04x:%04x, %d, %d): stub!\n", + name, HIWORD(olecli), LOWORD(olecli), hclientdoc, xname, HIWORD(lpoleob), + LOWORD(lpoleob), render, clipformat); + return OLE_OK; +} Propchange: trunk/reactos/dll/win32/olecli32/olecli16.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/olecli32/olecli32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olecli32/olecli3… ============================================================================== --- trunk/reactos/dll/win32/olecli32/olecli32.rbuild (added) +++ trunk/reactos/dll/win32/olecli32/olecli32.rbuild [iso-8859-1] Sat Feb 7 12:25:36 2009 @@ -1,0 +1,16 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="olecli32" type="win32dll" baseaddress="${BASEADDRESS_OLECLI32}" installbase="system32" installname="olecli32.dll" allowwarnings="true" entrypoint="0"> + <importlibrary definition="olecli32.spec" /> + <include base="olecli32">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <file>olecli_main.c</file> + <library>wine</library> + <library>ole32</library> + <library>gdi32</library> + <library>kernel32</library> + <library>ntdll</library> +</module> +</group> Propchange: trunk/reactos/dll/win32/olecli32/olecli32.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/olecli32/olecli32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olecli32/olecli3… ============================================================================== --- trunk/reactos/dll/win32/olecli32/olecli32.spec (added) +++ trunk/reactos/dll/win32/olecli32/olecli32.spec [iso-8859-1] Sat Feb 7 12:25:36 2009 @@ -1,0 +1,56 @@ + 1 stub WEP + 2 stub OleDelete + 3 stdcall OleSaveToStream(ptr ptr) ole32.OleSaveToStream + 4 stdcall OleLoadFromStream(ptr ptr ptr) ole32.OleLoadFromStream + 6 stub OleClone + 7 stub OleCopyFromLink + 8 stub OleEqual + 9 stdcall OleQueryLinkFromClip(str long long) + 10 stdcall OleQueryCreateFromClip(str long long) + 11 stdcall OleCreateLinkFromClip(str ptr long str ptr long long) + 12 stdcall OleCreateFromClip(str ptr long str ptr long long) + 13 stub OleCopyToClipboard + 14 stdcall OleQueryType(ptr ptr) + 15 stdcall OleSetHostNames(ptr str str) + 16 stub OleSetTargetDevice + 17 stub OleSetBounds + 18 stub OleQueryBounds + 19 stub OleDraw + 20 stub OleQueryOpen + 21 stub OleActivate + 22 stub OleUpdate + 23 stub OleReconnect + 24 stub OleGetLinkUpdateOptions + 25 stub OleSetLinkUpdateOptions + 26 stub OleEnumFormats + 27 stub OleClose + 28 stub OleGetData + 29 stub OleSetData + 30 stub OleQueryProtocol + 31 stub OleQueryOutOfDate + 32 stub OleObjectConvert + 33 stub OleCreateFromTemplate + 34 stdcall OleCreate(ptr ptr long ptr ptr ptr ptr) ole32.OleCreate + 35 stub OleQueryReleaseStatus + 36 stub OleQueryReleaseError + 37 stub OleQueryReleaseMethod + 38 stdcall OleCreateFromFile(ptr ptr ptr long ptr ptr ptr ptr) ole32.OleCreateFromFile + 39 stub OleCreateLinkFromFile + 40 stub OleRelease + 41 stdcall OleRegisterClientDoc(str str long ptr) + 42 stdcall OleRevokeClientDoc(long) + 43 stdcall OleRenameClientDoc(long str) + 44 stub OleRevertClientDoc + 45 stdcall OleSavedClientDoc(long) + 46 stub OleRename + 47 stub OleEnumObjects + 48 stub OleQueryName + 49 stub OleSetColorScheme + 50 stub OleRequestData + 54 stub OleLockServer + 55 stub OleUnlockServer + 56 stub OleQuerySize + 57 stub OleExecute + 58 stub OleCreateInvisible + 59 stub OleQueryClientVersion + 60 stdcall OleIsDcMeta(long) Propchange: trunk/reactos/dll/win32/olecli32/olecli32.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/olecli32/olecli_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olecli32/olecli_… ============================================================================== --- trunk/reactos/dll/win32/olecli32/olecli_main.c (added) +++ trunk/reactos/dll/win32/olecli32/olecli_main.c [iso-8859-1] Sat Feb 7 12:25:36 2009 @@ -1,0 +1,194 @@ +/* + * OLECLI library + * + * Copyright 1995 Martin von Loewis + * + * 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 + */ + +/* At the moment, these are only empty stubs. + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "wine/windef16.h" +#include "winbase.h" +#include "wingdi.h" +#include "wownt32.h" +#include "objbase.h" +#include "olecli.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ole); + +typedef struct _OLEOBJECTVTBL { + void * (CALLBACK *QueryProtocol)(_LPOLEOBJECT,LPCOLESTR16); + OLESTATUS (CALLBACK *Release)(_LPOLEOBJECT); + OLESTATUS (CALLBACK *Show)(_LPOLEOBJECT,BOOL16); + OLESTATUS (CALLBACK *DoVerb)(_LPOLEOBJECT,UINT16,BOOL16,BOOL16); + OLESTATUS (CALLBACK *GetData)(_LPOLEOBJECT,OLECLIPFORMAT,HANDLE16 *); + OLESTATUS (CALLBACK *SetData)(_LPOLEOBJECT,OLECLIPFORMAT,HANDLE16); + OLESTATUS (CALLBACK *SetTargetDevice)(_LPOLEOBJECT,HGLOBAL16); + OLESTATUS (CALLBACK *SetBounds)(_LPOLEOBJECT,LPRECT16); + OLESTATUS (CALLBACK *EnumFormats)(_LPOLEOBJECT,OLECLIPFORMAT); + OLESTATUS (CALLBACK *SetColorScheme)(_LPOLEOBJECT,struct tagLOGPALETTE*); + OLESTATUS (CALLBACK *Delete)(_LPOLEOBJECT); + OLESTATUS (CALLBACK *SetHostNames)(_LPOLEOBJECT,LPCOLESTR16,LPCOLESTR16); + OLESTATUS (CALLBACK *SaveToStream)(_LPOLEOBJECT,struct _OLESTREAM*); + OLESTATUS (CALLBACK *Clone)(_LPOLEOBJECT,LPOLECLIENT,LHCLIENTDOC,LPCOLESTR16,_LPOLEOBJECT *); + OLESTATUS (CALLBACK *CopyFromLink)(_LPOLEOBJECT,LPOLECLIENT,LHCLIENTDOC,LPCOLESTR16,_LPOLEOBJECT *); + OLESTATUS (CALLBACK *Equal)(_LPOLEOBJECT,_LPOLEOBJECT); + OLESTATUS (CALLBACK *CopyToClipBoard)(_LPOLEOBJECT); + OLESTATUS (CALLBACK *Draw)(_LPOLEOBJECT,HDC16,LPRECT16,LPRECT16,HDC16); + OLESTATUS (CALLBACK *Activate)(_LPOLEOBJECT,UINT16,BOOL16,BOOL16,HWND16,LPRECT16); + OLESTATUS (CALLBACK *Execute)(_LPOLEOBJECT,HGLOBAL16,UINT16); + OLESTATUS (CALLBACK *Close)(_LPOLEOBJECT); + OLESTATUS (CALLBACK *Update)(_LPOLEOBJECT); + OLESTATUS (CALLBACK *Reconnect)(_LPOLEOBJECT); + OLESTATUS (CALLBACK *ObjectConvert)(_LPOLEOBJECT,LPCOLESTR16,LPOLECLIENT,LHCLIENTDOC,LPCOLESTR16,_LPOLEOBJECT*); + OLESTATUS (CALLBACK *GetLinkUpdateOptions)(_LPOLEOBJECT,LPOLEOPT_UPDATE); + OLESTATUS (CALLBACK *SetLinkUpdateOptions)(_LPOLEOBJECT,OLEOPT_UPDATE); + OLESTATUS (CALLBACK *Rename)(_LPOLEOBJECT,LPCOLESTR16); + OLESTATUS (CALLBACK *QueryName)(_LPOLEOBJECT,LPSTR,LPUINT16); + OLESTATUS (CALLBACK *QueryType)(_LPOLEOBJECT,LPLONG); + OLESTATUS (CALLBACK *QueryBounds)(_LPOLEOBJECT,LPRECT16); + OLESTATUS (CALLBACK *QuerySize)(_LPOLEOBJECT,LPDWORD); + OLESTATUS (CALLBACK *QueryOpen)(_LPOLEOBJECT); + OLESTATUS (CALLBACK *QueryOutOfDate)(_LPOLEOBJECT); + OLESTATUS (CALLBACK *QueryReleaseStatus)(_LPOLEOBJECT); + OLESTATUS (CALLBACK *QueryReleaseError)(_LPOLEOBJECT); + OLE_RELEASE_METHOD (CALLBACK *QueryReleaseMethod)(_LPOLEOBJECT); + OLESTATUS (CALLBACK *RequestData)(_LPOLEOBJECT,OLECLIPFORMAT); + OLESTATUS (CALLBACK *ObjectLong)(_LPOLEOBJECT,UINT16,LPLONG); +} OLEOBJECTVTBL; +typedef OLEOBJECTVTBL *LPOLEOBJECTVTBL; + +typedef struct _OLEOBJECT +{ + const OLEOBJECTVTBL *lpvtbl; +} OLEOBJECT; + +static LONG OLE_current_handle; + +/****************************************************************************** + * OleSavedClientDoc [OLECLI32.45] + */ +OLESTATUS WINAPI OleSavedClientDoc(LHCLIENTDOC hDoc) +{ + FIXME("(%d: stub\n", hDoc); + return OLE_OK; +} + +/****************************************************************************** + * OleRegisterClientDoc [OLECLI32.41] + */ +OLESTATUS WINAPI OleRegisterClientDoc(LPCSTR classname, LPCSTR docname, + LONG reserved, LHCLIENTDOC *hRet ) +{ + FIXME("(%s,%s,...): stub\n",classname,docname); + *hRet=++OLE_current_handle; + return OLE_OK; +} + +/****************************************************************************** + * OleRenameClientDoc [OLECLI32.43] + */ +OLESTATUS WINAPI OleRenameClientDoc(LHCLIENTDOC hDoc, LPCSTR newName) +{ + FIXME("(%d,%s,...): stub\n",hDoc, newName); + return OLE_OK; +} + +/****************************************************************************** + * OleRevokeClientDoc [OLECLI32.42] + */ +OLESTATUS WINAPI OleRevokeClientDoc(LHCLIENTDOC hServerDoc) +{ + FIXME("(%d): stub\n",hServerDoc); + return OLE_OK; +} + +/****************************************************************************** + * OleCreateLinkFromClip [OLECLI32.11] + */ +OLESTATUS WINAPI OleCreateLinkFromClip( + LPCSTR name,LPOLECLIENT olecli,LHCLIENTDOC hclientdoc,LPCSTR xname, + _LPOLEOBJECT *lpoleob,OLEOPT_RENDER render,OLECLIPFORMAT clipformat +) { + FIXME("(%s,%p,%08x,%s,%p,%d,%d): stub!\n", + name,olecli,hclientdoc,xname,lpoleob,render,clipformat); + return OLE_OK; +} + +/****************************************************************************** + * OleQueryLinkFromClip [OLECLI32.9] + */ +OLESTATUS WINAPI OleQueryLinkFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIPFORMAT clipformat) { + FIXME("(%s,%d,%d): stub!\n",name,render,clipformat); + return OLE_OK; +} + +/****************************************************************************** + * OleQueryCreateFromClip [OLECLI32.10] + */ +OLESTATUS WINAPI OleQueryCreateFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIPFORMAT clipformat) { + FIXME("(%s,%d,%d): stub!\n",name,render,clipformat); + return OLE_OK; +} + +/****************************************************************************** + * OleIsDcMeta [OLECLI32.60] + */ +BOOL WINAPI OleIsDcMeta(HDC hdc) +{ + TRACE("(%p)\n",hdc); + return GetObjectType( hdc ) == OBJ_METADC; +} + +/****************************************************************************** + * OleSetHostNames [OLECLI32.15] + */ +OLESTATUS WINAPI OleSetHostNames(_LPOLEOBJECT oleob,LPCSTR name1,LPCSTR name2) { + FIXME("(%p,%s,%s): stub\n",oleob,name1,name2); + return OLE_OK; +} + +/****************************************************************************** + * OleQueryType [OLECLI32.14] + */ +OLESTATUS WINAPI OleQueryType(_LPOLEOBJECT oleob,LONG*xlong) { + FIXME("(%p,%p): stub!\n",oleob,xlong); + if (!oleob) + return 0x10; + TRACE("Calling OLEOBJECT.QueryType (%p) (%p,%p)\n", + oleob->lpvtbl->QueryType,oleob,xlong); + return oleob->lpvtbl->QueryType(oleob,xlong); +} + +/****************************************************************************** + * OleCreateFromClip [OLECLI32.12] + */ +OLESTATUS WINAPI OleCreateFromClip( + LPCSTR name,LPOLECLIENT olecli,LHCLIENTDOC hclientdoc,LPCSTR xname, + _LPOLEOBJECT *lpoleob,OLEOPT_RENDER render, OLECLIPFORMAT clipformat +) { + FIXME("(%s,%p,%08x,%s,%p,%d,%d): stub!\n", + name,olecli,hclientdoc,xname,lpoleob,render,clipformat); + /* clipb type, object kreieren entsprechend etc. */ + return OLE_OK; +} Propchange: trunk/reactos/dll/win32/olecli32/olecli_main.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/olesvr32/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Feb 7 12:25:36 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/olesvr32/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/olesvr32/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/olesvr32/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/olesvr32/olesvr.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olesvr32/olesvr.… ============================================================================== --- trunk/reactos/dll/win32/olesvr32/olesvr.spec (added) +++ trunk/reactos/dll/win32/olesvr32/olesvr.spec [iso-8859-1] Sat Feb 7 12:25:36 2009 @@ -1,0 +1,23 @@ +#1 WEP +2 pascal OleRegisterServer(str ptr ptr word word) OleRegisterServer16 +3 pascal OleRevokeServer(long) OleRevokeServer16 +4 pascal OleBlockServer(long) OleBlockServer16 +5 pascal OleUnblockServer(long ptr) OleUnblockServer16 +6 pascal OleRegisterServerDoc(long str ptr ptr) OleRegisterServerDoc16 +7 pascal OleRevokeServerDoc(long) OleRevokeServerDoc16 +8 pascal OleRenameServerDoc(long str) OleRenameServerDoc16 +9 pascal OleRevertServerDoc(long) OleRevertServerDoc16 +10 pascal OleSavedServerDoc(long) OleSavedServerDoc16 +11 stub OLEREVOKEOBJECT +12 stub OLEQUERYSERVERVERSION +21 stub SRVRWNDPROC +22 stub DOCWNDPROC +23 stub ITEMWNDPROC +24 stub SENDDATAMSG +25 stub FINDITEMWND +26 stub ITEMCALLBACK +27 stub TERMINATECLIENTS +28 stub TERMINATEDOCCLIENTS +29 stub DELETECLIENTINFO +30 stub SENDRENAMEMSG +31 stub ENUMFORTERMINATE Propchange: trunk/reactos/dll/win32/olesvr32/olesvr.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/olesvr32/olesvr32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olesvr32/olesvr3… ============================================================================== --- trunk/reactos/dll/win32/olesvr32/olesvr32.rbuild (added) +++ trunk/reactos/dll/win32/olesvr32/olesvr32.rbuild [iso-8859-1] Sat Feb 7 12:25:36 2009 @@ -1,0 +1,14 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="olesvr32" type="win32dll" baseaddress="${BASEADDRESS_OLESVR32}" installbase="system32" installname="olesvr32.dll" allowwarnings="true" entrypoint="0"> + <importlibrary definition="olesvr32.spec" /> + <include base="olesvr32">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <file>olesvr_main.c</file> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> +</module> +</group> Propchange: trunk/reactos/dll/win32/olesvr32/olesvr32.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/olesvr32/olesvr32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olesvr32/olesvr3… ============================================================================== --- trunk/reactos/dll/win32/olesvr32/olesvr32.spec (added) +++ trunk/reactos/dll/win32/olesvr32/olesvr32.spec [iso-8859-1] Sat Feb 7 12:25:36 2009 @@ -1,0 +1,12 @@ + 1 stub WEP + 2 stdcall OleRegisterServer(str ptr ptr long long) + 3 stub OleRevokeServer + 4 stdcall OleBlockServer(long) + 5 stdcall OleUnblockServer(long ptr) + 6 stdcall OleRegisterServerDoc(ptr str ptr ptr) + 7 stdcall OleRevokeServerDoc(long) + 8 stdcall OleRenameServerDoc(long str) + 9 stdcall OleRevertServerDoc(long) +10 stdcall OleSavedServerDoc(long) +11 stub OleRevokeObject +12 stub OleQueryServerVersion Propchange: trunk/reactos/dll/win32/olesvr32/olesvr32.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/olesvr32/olesvr_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olesvr32/olesvr_… ============================================================================== --- trunk/reactos/dll/win32/olesvr32/olesvr_main.c (added) +++ trunk/reactos/dll/win32/olesvr32/olesvr_main.c [iso-8859-1] Sat Feb 7 12:25:36 2009 @@ -1,0 +1,306 @@ +/* + * OLESVR library + * + * Copyright 1995 Martin von Loewis + * + * 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 + */ + +/* At the moment, these are only empty stubs. + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/windef16.h" +#include "objbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ole); + +typedef enum +{ + OLE_OK, + OLE_WAIT_FOR_RELEASE, + OLE_BUSY, + OLE_ERROR_PROTECT_ONLY, + OLE_ERROR_MEMORY, + OLE_ERROR_STREAM, + OLE_ERROR_STATIC, + OLE_ERROR_BLANK, + OLE_ERROR_DRAW, + OLE_ERROR_METAFILE, + OLE_ERROR_ABORT, + OLE_ERROR_CLIPBOARD, + OLE_ERROR_FORMAT, + OLE_ERROR_OBJECT, + OLE_ERROR_OPTION, + OLE_ERROR_PROTOCOL, + OLE_ERROR_ADDRESS, + OLE_ERROR_NOT_EQUAL, + OLE_ERROR_HANDLE, + OLE_ERROR_GENERIC, + OLE_ERROR_CLASS, + OLE_ERROR_SYNTAX, + OLE_ERROR_DATATYPE, + OLE_ERROR_PALETTE, + OLE_ERROR_NOT_LINK, + OLE_ERROR_NOT_EMPTY, + OLE_ERROR_SIZE, + OLE_ERROR_DRIVE, + OLE_ERROR_NETWORK, + OLE_ERROR_NAME, + OLE_ERROR_TEMPLATE, + OLE_ERROR_NEW, + OLE_ERROR_EDIT, + OLE_ERROR_OPEN, + OLE_ERROR_NOT_OPEN, + OLE_ERROR_LAUNCH, + OLE_ERROR_COMM, + OLE_ERROR_TERMINATE, + OLE_ERROR_COMMAND, + OLE_ERROR_SHOW, + OLE_ERROR_DOVERB, + OLE_ERROR_ADVISE_NATIVE, + OLE_ERROR_ADVISE_PICT, + OLE_ERROR_ADVISE_RENAME, + OLE_ERROR_POKE_NATIVE, + OLE_ERROR_REQUEST_NATIVE, + OLE_ERROR_REQUEST_PICT, + OLE_ERROR_SERVER_BLOCKED, + OLE_ERROR_REGISTRATION, + OLE_ERROR_ALREADY_REGISTERED, + OLE_ERROR_TASK, + OLE_ERROR_OUTOFDATE, + OLE_ERROR_CANT_UPDATE_CLIENT, + OLE_ERROR_UPDATE, + OLE_ERROR_SETDATA_FORMAT, + OLE_ERROR_STATIC_FROM_OTHER_OS, + OLE_WARN_DELETE_DATA = 1000 +} OLESTATUS; + +typedef enum { + OLE_SERVER_MULTI, + OLE_SERVER_SINGLE +} OLE_SERVER_USE; + +typedef LONG LHSERVER; +typedef LONG LHSERVERDOC; +typedef LPCSTR LPCOLESTR16; + +typedef struct _OLESERVERDOC *LPOLESERVERDOC; + +struct _OLESERVERDOCVTBL; +typedef struct _OLESERVERDOC +{ + const struct _OLESERVERDOCVTBL *lpvtbl; + /* server provided state info */ +} OLESERVERDOC; + +typedef struct _OLESERVER *LPOLESERVER; +typedef struct _OLESERVERVTBL +{ + OLESTATUS (CALLBACK *Open)(LPOLESERVER,LHSERVERDOC,LPCOLESTR16,LPOLESERVERDOC *); + OLESTATUS (CALLBACK *Create)(LPOLESERVER,LHSERVERDOC,LPCOLESTR16,LPCOLESTR16,LPOLESERVERDOC*); + OLESTATUS (CALLBACK *CreateFromTemplate)(LPOLESERVER,LHSERVERDOC,LPCOLESTR16,LPCOLESTR16,LPCOLESTR16,LPOLESERVERDOC *); + OLESTATUS (CALLBACK *Edit)(LPOLESERVER,LHSERVERDOC,LPCOLESTR16,LPCOLESTR16,LPOLESERVERDOC *); + OLESTATUS (CALLBACK *Exit)(LPOLESERVER); + OLESTATUS (CALLBACK *Release)(LPOLESERVER); + OLESTATUS (CALLBACK *Execute)(LPOLESERVER); +} OLESERVERVTBL, *LPOLESERVERVTBL; + +typedef struct _OLESERVER +{ + const OLESERVERVTBL *lpvtbl; + /* server specific data */ +} OLESERVER; + +static LONG OLE_current_handle; + +/****************************************************************************** + * OleRegisterServer [OLESVR.2] + */ +OLESTATUS WINAPI OleRegisterServer16( LPCSTR name, LPOLESERVER serverStruct, + LHSERVER *hRet, HINSTANCE16 hServer, + OLE_SERVER_USE use ) +{ + FIXME("(%s,...): stub\n",name); + *hRet=++OLE_current_handle; + /* return OLE_ERROR_MEMORY, OLE_ERROR_PROTECT_ONLY if you want it fail*/ + return OLE_OK; +} + +/****************************************************************************** + * OleBlockServer [OLESVR.4] + */ +OLESTATUS WINAPI OleBlockServer16(LHSERVER hServer) +{ + FIXME("(%d): stub\n",hServer); + return OLE_OK; +} + +/****************************************************************************** + * OleBlockServer [OLESVR32.4] + */ +OLESTATUS WINAPI OleBlockServer(LHSERVER hServer) +{ + FIXME("(%d): stub\n",hServer); + return OLE_OK; +} + +/****************************************************************************** + * OleUnblockServer [OLESVR.5] + */ +OLESTATUS WINAPI OleUnblockServer16(LHSERVER hServer, BOOL16 *block) +{ + FIXME("(%d): stub\n",hServer); + /* no more blocked messages :) */ + *block=FALSE; + return OLE_OK; +} + +/****************************************************************************** + * OleUnblockServer [OLESVR32.5] + */ +OLESTATUS WINAPI OleUnblockServer(LHSERVER hServer, BOOL *block) +{ + FIXME("(%d): stub\n",hServer); + /* no more blocked messages :) */ + *block=FALSE; + return OLE_OK; +} + +/*********************************************************************** + * OleRegisterServerDoc [OLESVR.6] + */ +OLESTATUS WINAPI OleRegisterServerDoc16( LHSERVER hServer, LPCSTR docname, + LPOLESERVERDOC document, + LHSERVERDOC *hRet) +{ + FIXME("(%d,%s): stub\n",hServer, docname); + *hRet=++OLE_current_handle; + return OLE_OK; +} + +/****************************************************************************** + * OleRevokeServerDoc [OLESVR.7] + */ +OLESTATUS WINAPI OleRevokeServerDoc16(LHSERVERDOC hServerDoc) +{ + FIXME("%d - stub\n",hServerDoc); + return OLE_OK; +} + +/****************************************************************************** + * OleRevokeServerDoc [OLESVR32.7] + */ +OLESTATUS WINAPI OleRevokeServerDoc(LHSERVERDOC hServerDoc) +{ + FIXME("(%d): stub\n",hServerDoc); + return OLE_OK; +} + +/****************************************************************************** + * OleRevokeServer [OLESVR.3] + */ +OLESTATUS WINAPI OleRevokeServer16(LHSERVER hServer) +{ + FIXME("%d - stub\n",hServer); + return OLE_OK; +} + +/****************************************************************************** + * OleRegisterServer [OLESVR32.2] + */ +OLESTATUS WINAPI OleRegisterServer(LPCSTR svrname,LPOLESERVER olesvr,LHSERVER* hRet,HINSTANCE hinst,OLE_SERVER_USE osu) { + FIXME("(%s,%p,%p,%p,%d): stub!\n",svrname,olesvr,hRet,hinst,osu); + *hRet=++OLE_current_handle; + return OLE_OK; +} + +/****************************************************************************** + * OleRegisterServerDoc [OLESVR32.6] + */ +OLESTATUS WINAPI OleRegisterServerDoc( LHSERVER hServer, LPCSTR docname, + LPOLESERVERDOC document, + LHSERVERDOC *hRet) +{ + FIXME("(%d,%s): stub\n", hServer, docname); + *hRet=++OLE_current_handle; + return OLE_OK; +} + +/****************************************************************************** + * OleRenameServerDoc [OLESVR.8] + * + */ +OLESTATUS WINAPI OleRenameServerDoc16(LHSERVERDOC hDoc, LPCSTR newName) +{ + FIXME("(%d,%s): stub.\n", hDoc, newName); + return OLE_OK; +} + +/****************************************************************************** + * OleRenameServerDoc [OLESVR32.8] + * + */ +OLESTATUS WINAPI OleRenameServerDoc(LHSERVERDOC hDoc, LPCSTR newName) +{ + FIXME("(%d,%s): stub.\n",hDoc, newName); + return OLE_OK; +} + +/****************************************************************************** + * OleRevertServerDoc [OLESVR.9] + * + */ +OLESTATUS WINAPI OleRevertServerDoc16(LHSERVERDOC hDoc) +{ + FIXME("(%d): stub.\n", hDoc); + return OLE_OK; +} + +/****************************************************************************** + * OleRevertServerDoc [OLESVR32.9] + * + */ +OLESTATUS WINAPI OleRevertServerDoc(LHSERVERDOC hDoc) +{ + FIXME("(%d): stub.\n", hDoc); + return OLE_OK; +} + +/****************************************************************************** + * OleSavedServerDoc [OLESVR.10] + * + */ +OLESTATUS WINAPI OleSavedServerDoc16(LHSERVERDOC hDoc) +{ + FIXME("(%d): stub.\n", hDoc); + return OLE_OK; +} + +/****************************************************************************** + * OleSavedServerDoc [OLESVR32.10] + * + */ +OLESTATUS WINAPI OleSavedServerDoc(LHSERVERDOC hDoc) +{ + FIXME("(%d): stub.\n", hDoc); + return OLE_OK; +} Propchange: trunk/reactos/dll/win32/olesvr32/olesvr_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 7 12:25:36 2009 @@ -277,12 +277,18 @@ <directory name="oleaut32"> <xi:include href="oleaut32/oleaut32.rbuild" /> </directory> +<directory name="olecli32"> + <xi:include href="olecli32/olecli32.rbuild" /> +</directory> <directory name="oledlg"> <xi:include href="oledlg/oledlg.rbuild" /> </directory> <directory name="olepro32"> <xi:include href="olepro32/olepro32.rbuild" /> </directory> +<directory name="olesvr32"> + <xi:include href="olesvr32/olesvr32.rbuild" /> +</directory> <directory name="opengl32"> <xi:include href="opengl32/opengl32.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 7 12:25:36 2009 @@ -84,8 +84,10 @@ reactos/dll/win32/ole32 # Autosync reactos/dll/win32/oleacc # Autosync reactos/dll/win32/oleaut32 # Autosync +reactos/dll/win32/olecli32 # Autosync reactos/dll/win32/oledlg # Autosync reactos/dll/win32/olepro32 # Autosync +reactos/dll/win32/olesvr32 # Autosync reactos/dll/win32/pdh # Autosync reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Autosync

1 0

[sedwards] 39460: Always call TerminateProcess when exiting a session.
by sedwards＠svn.reactos.org 07 Feb '09

07 Feb '09

Author: sedwards Date: Sat Feb 7 11:39:51 2009 New Revision: 39460 URL: http://svn.reactos.org/svn/reactos?rev=39460&view=rev Log: Always call TerminateProcess when exiting a session. Modified: trunk/rosapps/applications/sysutils/telnetd/telnetd.c Modified: trunk/rosapps/applications/sysutils/telnetd/telnetd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/teln… ============================================================================== --- trunk/rosapps/applications/sysutils/telnetd/telnetd.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/telnetd/telnetd.c [iso-8859-1] Sat Feb 7 11:39:51 2009 @@ -10,6 +10,9 @@ * Written by fred.van.lieshout 'at' zonnet.nl * Use freely, no copyrights. * Use Linux. + * + * Parts Copyright Steven Edwards + * Public Domain * * TODO: * - access control @@ -615,7 +618,9 @@ } TerminateProcess(client->hProcess, 0); } - } + TerminateProcess(client->hProcess, 0); + } + TerminateProcess(client->hProcess, 0); } /* ErrorExit */

1 0

[janderwald] 39459: - Add a hack
by janderwald＠svn.reactos.org 07 Feb '09

07 Feb '09

Author: janderwald Date: Sat Feb 7 09:43:14 2009 New Revision: 39459 URL: http://svn.reactos.org/svn/reactos?rev=39459&view=rev Log: - Add a hack Modified: trunk/reactos/base/system/services/config.c trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/confi… ============================================================================== --- trunk/reactos/base/system/services/config.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/config.c [iso-8859-1] Sat Feb 7 09:43:14 2009 @@ -289,7 +289,7 @@ *lpValue = ptr; } -done:; +done: if (dwError != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, ptr); Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sat Feb 7 09:43:14 2009 @@ -4012,33 +4012,36 @@ if (InfoW.dwInfoLevel == SERVICE_CONFIG_DESCRIPTION) { - LPSERVICE_DESCRIPTIONW lpServiceDesriptonW; - LPSERVICE_DESCRIPTIONA lpServiceDesriptonA; - - lpServiceDesriptonA = Info.psd; - - if (lpServiceDesriptonA && - lpServiceDesriptonA->lpDescription) - { - dwLength = (strlen(lpServiceDesriptonA->lpDescription) + 1) * sizeof(WCHAR); - - lpServiceDesriptonW = HeapAlloc(GetProcessHeap(), + LPSERVICE_DESCRIPTIONW lpServiceDescriptonW; + LPSERVICE_DESCRIPTIONA lpServiceDescriptonA; + + lpServiceDescriptonA = Info.psd; + + ///if (lpServiceDescriptonA && + ///lpServiceDescriptonA->lpDescription) + ///{ + dwLength = (strlen(Info.lpDescription) + 1) * sizeof(WCHAR); + + lpServiceDescriptonW = HeapAlloc(GetProcessHeap(), 0, dwLength + sizeof(SERVICE_DESCRIPTIONW)); - if (!lpServiceDesriptonW) + if (!lpServiceDescriptonW) { return ERROR_NOT_ENOUGH_MEMORY; } + lpServiceDescriptonW->lpDescription = (LPWSTR)(lpServiceDescriptonW + 1); + MultiByteToWideChar(CP_ACP, 0, - lpServiceDesriptonA->lpDescription, + Info.lpDescription, -1, - lpServiceDesriptonW->lpDescription, + lpServiceDescriptonW->lpDescription, dwLength); - ptr = lpServiceDesriptonW; - } + ptr = lpServiceDescriptonW; + InfoW.psd = lpServiceDescriptonW; + ///} } else if (Info.dwInfoLevel == SERVICE_CONFIG_FAILURE_ACTIONS) { @@ -4162,12 +4165,13 @@ { LPSERVICE_DESCRIPTIONW lpServiceDescription; - lpServiceDescription = (LPSERVICE_DESCRIPTIONW)&Info; - lpServiceDescription->lpDescription = (LPWSTR)(&Info + sizeof(LPSERVICE_DESCRIPTIONW)); + lpServiceDescription = (LPSERVICE_DESCRIPTIONW)Info.psd; + lpServiceDescription->lpDescription = (LPWSTR)((ULONG_PTR)lpServiceDescription + sizeof(LPSERVICE_DESCRIPTIONW)); if (lpServiceDescription != NULL && lpServiceDescription->lpDescription != NULL) { + DPRINT1("Setting value %S\n", lpServiceDescription->lpDescription); RegSetValueExW(hServiceKey, L"Description", 0, @@ -4212,7 +4216,7 @@ LPWSTR lpDescriptionW = NULL; LPSTR lpDescription = NULL; - DPRINT("RQueryServiceConfig2W() called\n"); + DPRINT1("RQueryServiceConfig2A() called hService %p dwInfoLevel %u, lpBuffer %p cbBufSize %u pcbBytesNeeded %p\n",hService, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); if (!lpBuffer) return ERROR_INVALID_ADDRESS; @@ -4261,7 +4265,7 @@ &lpDescriptionW); if (dwError == ERROR_SUCCESS) { - *pcbBytesNeeded += ((wcslen(lpDescriptionW) + 1)); + *pcbBytesNeeded += ((wcslen(lpDescriptionW) + 1) * sizeof(WCHAR)); } if (cbBufSize >= *pcbBytesNeeded)

1 0

[janderwald] 39458: - Add a hack
by janderwald＠svn.reactos.org 07 Feb '09

07 Feb '09

Author: janderwald Date: Sat Feb 7 09:35:07 2009 New Revision: 39458 URL: http://svn.reactos.org/svn/reactos?rev=39458&view=rev Log: - Add a hack Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Sat Feb 7 09:35:07 2009 @@ -229,10 +229,11 @@ { case SERVICE_CONFIG_DESCRIPTION: Info.psd = (LPSERVICE_DESCRIPTIONA)&lpInfo; + Info.lpDescription = ((LPSERVICE_DESCRIPTIONA)lpInfo)->lpDescription; //HACK break; case SERVICE_CONFIG_FAILURE_ACTIONS: - Info.psfa = (LPSERVICE_FAILURE_ACTIONSA)&lpInfo; + Info.psfa = (LPSERVICE_FAILURE_ACTIONSA)lpInfo; break; default: @@ -2000,7 +2001,7 @@ { DWORD dwError; - TRACE("QueryServiceConfig2A(%p, %lu, %p, %lu, %p)\n", + DbgPrint("QueryServiceConfig2A(hService %p, dwInfoLevel %lu, lpBuffer %p, cbBufSize %lu, pcbBytesNeeded %p)\n", hService, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); if (dwInfoLevel != SERVICE_CONFIG_DESCRIPTION &&

1 0

[sedwards] 39457: - Reimplement TerminateShell function using WaitForSingleObject to avoid some of the excessive usage of Sleep. Let me know if you spot a bug.
by sedwards＠svn.reactos.org 07 Feb '09

07 Feb '09

Author: sedwards Date: Sat Feb 7 09:21:15 2009 New Revision: 39457 URL: http://svn.reactos.org/svn/reactos?rev=39457&view=rev Log: - Reimplement TerminateShell function using WaitForSingleObject to avoid some of the excessive usage of Sleep. Let me know if you spot a bug. Modified: trunk/rosapps/applications/sysutils/telnetd/telnetd.c Modified: trunk/rosapps/applications/sysutils/telnetd/telnetd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/teln… ============================================================================== --- trunk/rosapps/applications/sysutils/telnetd/telnetd.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/telnetd/telnetd.c [iso-8859-1] Sat Feb 7 09:21:15 2009 @@ -17,19 +17,14 @@ * - Unify Debugging output and return StatusCodes */ -#include <stdio.h> -#include <windows.h> - #include "telnetd.h" #define telnetd_printf printf - #if 0 -extern void syslog (int priority, const char *fmt, ...); - -int telnetd_printf(const char *format, ...) -{ - syslog (6, format); +static inline int telnetd_printf(const char *format, ...); +{ + printf(format,...); + syslog (6, format); } #endif @@ -37,7 +32,6 @@ static BOOLEAN bShutdown = 0; static BOOLEAN bSocketInterfaceInitialised = 0; - static int sock; /* In the future, some options might be passed here to handle @@ -50,6 +44,9 @@ */ int main(int argc, char **argv) { + printf("Attempting to start Simple TelnetD\n"); + +// DetectPlatform(); SetConsoleCtrlHandler(Cleanup, 1); if (!StartSocketInterface()) @@ -142,7 +139,6 @@ if (client == NULL) ErrorExit("failed to allocate memory for client"); - client->socket = client_socket; CreateThread(NULL, 0, UserLoginThread, client, 0, &threadID); @@ -574,35 +570,52 @@ /* TerminateShell */ static void TerminateShell(client_t *client) { - DWORD exitCode; - DWORD dwWritten; - char stop[] = "\003\r\nexit\r\n"; /* Ctrl-C + exit */ - - GetExitCodeProcess(client->hProcess, &exitCode); - if (exitCode == STILL_ACTIVE) { - telnetd_printf("user shell still active, send Ctrl-Break to group-id %lu\n", client->dwProcessId ); - - if (!GenerateConsoleCtrlEvent( CTRL_BREAK_EVENT, client->dwProcessId )) - telnetd_printf("Failed to send Ctrl_break\n"); - - Sleep(500); - - if (!GenerateConsoleCtrlEvent( CTRL_C_EVENT, client->dwProcessId )) - telnetd_printf("Failed to send Ctrl_C\n"); - - Sleep(500); - - if (!WriteFile(client->hChildStdinWr, stop, sizeof(stop), &dwWritten, NULL)) - telnetd_printf("Error writing to pipe\n"); - - Sleep(500); + DWORD exitCode; + DWORD dwWritten; + char stop[] = "\003\r\nexit\r\n"; /* Ctrl-C + exit */ GetExitCodeProcess(client->hProcess, &exitCode); - if (exitCode == STILL_ACTIVE) { - telnetd_printf("user shell still active, attempt to terminate it now...\n"); - TerminateProcess(client->hProcess, 0); - } - } + + if (exitCode == STILL_ACTIVE) + { + HANDLE hEvent = NULL; + DWORD dwWaitResult; + + telnetd_printf("user shell still active, send Ctrl-Break to group-id %lu\n", client->dwProcessId ); + + hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + + if (hEvent == NULL) + printf("CreateEvent error\n"); + + if (!GenerateConsoleCtrlEvent( CTRL_BREAK_EVENT, client->dwProcessId )) + telnetd_printf("Failed to send Ctrl_break\n"); + + if (!GenerateConsoleCtrlEvent( CTRL_C_EVENT, client->dwProcessId )) + telnetd_printf("Failed to send Ctrl_C\n"); + + if (!WriteFile(client->hChildStdinWr, stop, sizeof(stop), &dwWritten, NULL)) + telnetd_printf("Error writing to pipe\n"); + + /* wait for our handler to be called */ + dwWaitResult=WaitForSingleObject(hEvent, 500); + + if (WAIT_FAILED==dwWaitResult) + telnetd_printf("WaitForSingleObject failed\n"); + + GetExitCodeProcess(client->hProcess, &exitCode); + if (exitCode == STILL_ACTIVE) + { + telnetd_printf("user shell still active, attempt to terminate it now...\n"); + + if (hEvent != NULL) + { + if (!CloseHandle(hEvent)) + telnetd_printf("CloseHandle"); + } + TerminateProcess(client->hProcess, 0); + } + } } /* ErrorExit */

1 0

[cwittich] 39456: fix a comment
by cwittich＠svn.reactos.org 07 Feb '09

07 Feb '09

Author: cwittich Date: Sat Feb 7 09:15:01 2009 New Revision: 39456 URL: http://svn.reactos.org/svn/reactos?rev=39456&view=rev Log: fix a comment Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sat Feb 7 09:15:01 2009 @@ -727,7 +727,7 @@ ControlPacket->dwSize = TotalLength; wcscpy(&ControlPacket->szArguments[0], Service->lpServiceName); - /* Send the start command */ + /* Send the control packet */ WriteFile(Service->ControlPipeHandle, ControlPacket, sizeof(SCM_CONTROL_PACKET) + (TotalLength * sizeof(WCHAR)),

1 0

[janderwald] 39455: - Add a new member to SC_RPC_CONFIG_INFOA structure - This hack is currently required to pass LPSERVICE_DESCRIPTION onto services via rpc as the member is lpDescription is a variable length string pointer
by janderwald＠svn.reactos.org 07 Feb '09

07 Feb '09

Author: janderwald Date: Sat Feb 7 09:06:59 2009 New Revision: 39455 URL: http://svn.reactos.org/svn/reactos?rev=39455&view=rev Log: - Add a new member to SC_RPC_CONFIG_INFOA structure - This hack is currently required to pass LPSERVICE_DESCRIPTION onto services via rpc as the member is lpDescription is a variable length string pointer Modified: trunk/reactos/include/reactos/idl/svcctl.idl Modified: trunk/reactos/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/svcctl… ============================================================================== --- trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] Sat Feb 7 09:06:59 2009 @@ -189,6 +189,7 @@ [case(6)] LPSERVICE_RPC_REQUIRED_PRIVILEGES_INFO psrp; [case(7)] LPSERVICE_PRESHUTDOWN_INFO psps; } DUMMYUNIONNAME; + [string, range(0, 8 * 1024)] LPSTR lpDescription; //FIXME } SC_RPC_CONFIG_INFOA, *LPSC_RPC_CONFIG_INFOA; typedef struct _SC_RPC_CONFIG_INFOW {

1 0

[dchapyshev] 39454: - Partially revert r39453
by dchapyshev＠svn.reactos.org 07 Feb '09

07 Feb '09

Author: dchapyshev Date: Sat Feb 7 06:55:43 2009 New Revision: 39454 URL: http://svn.reactos.org/svn/reactos?rev=39454&view=rev Log: - Partially revert r39453 Removed: trunk/reactos/base/applications/winhstb/ Modified: trunk/reactos/base/applications/applications.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applicat… ============================================================================== --- trunk/reactos/base/applications/applications.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/applications.rbuild [iso-8859-1] Sat Feb 7 06:55:43 2009 @@ -73,9 +73,6 @@ <directory name="winhlp32"> <xi:include href="winhlp32/winhlp32.rbuild" /> </directory> - <directory name="winhstb"> - <xi:include href="winhstb/winhstb.rbuild" /> - </directory> <directory name="wordpad"> <xi:include href="wordpad/wordpad.rbuild" /> </directory> 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 7 06:55:43 2009 @@ -75,7 +75,6 @@ base\applications\sndvol32\sndvol32.exe 1 base\applications\taskmgr\taskmgr.exe 1 base\applications\winhlp32\winhlp32.exe 4 -base\applications\winhstb\winhlp32.exe 1 base\applications\wordpad\wordpad.exe 1 base\services\audiosrv\audiosrv.exe 1

1 0

[dchapyshev] 39453: - Add stub program for winhlp32 (should be located in system32) - winhlp32 now it is located in c:\reactos BUG: Stub program and winhlp32 have an identical name of a file, but are located in different directories. At installation winhlp32 it is copied in system32 and c:\reactos. We need to think up a way to install two or more files with identical names
by dchapyshev＠svn.reactos.org 07 Feb '09

07 Feb '09

Author: dchapyshev Date: Sat Feb 7 05:21:07 2009 New Revision: 39453 URL: http://svn.reactos.org/svn/reactos?rev=39453&view=rev Log: - Add stub program for winhlp32 (should be located in system32) - winhlp32 now it is located in c:\reactos BUG: Stub program and winhlp32 have an identical name of a file, but are located in different directories. At installation winhlp32 it is copied in system32 and c:\reactos. We need to think up a way to install two or more files with identical names Added: trunk/reactos/base/applications/winhstb/ (with props) trunk/reactos/base/applications/winhstb/res/ (with props) trunk/reactos/base/applications/winhstb/res/4000.ico (with props) trunk/reactos/base/applications/winhstb/resource.h (with props) trunk/reactos/base/applications/winhstb/winhstb.c (with props) trunk/reactos/base/applications/winhstb/winhstb.rbuild (with props) trunk/reactos/base/applications/winhstb/winhstb.rc (with props) Modified: trunk/reactos/base/applications/applications.rbuild trunk/reactos/base/applications/winhlp32/winhlp32.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applicat… ============================================================================== --- trunk/reactos/base/applications/applications.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/applications.rbuild [iso-8859-1] Sat Feb 7 05:21:07 2009 @@ -73,6 +73,9 @@ <directory name="winhlp32"> <xi:include href="winhlp32/winhlp32.rbuild" /> </directory> + <directory name="winhstb"> + <xi:include href="winhstb/winhstb.rbuild" /> + </directory> <directory name="wordpad"> <xi:include href="wordpad/wordpad.rbuild" /> </directory> Modified: trunk/reactos/base/applications/winhlp32/winhlp32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhlp32.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhlp32.rbuild [iso-8859-1] Sat Feb 7 05:21:07 2009 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="winhlp32" type="win32gui" installbase="system32" installname="winhlp32.exe" allowwarnings="true" unicode="no"> +<module name="winhlp32" type="win32gui" installname="winhlp32.exe" allowwarnings="true" unicode="no"> <include base="winhlp32">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__ROS_LONG64__" /> Propchange: trunk/reactos/base/applications/winhstb/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Feb 7 05:21:07 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/base/applications/winhstb/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/base/applications/winhstb/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/base/applications/winhstb/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Propchange: trunk/reactos/base/applications/winhstb/res/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Feb 7 05:21:07 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/base/applications/winhstb/res/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/base/applications/winhstb/res/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/base/applications/winhstb/res/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/applications/winhstb/res/4000.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhstb/… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/winhstb/res/4000.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/winhstb/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhstb/… ============================================================================== --- trunk/reactos/base/applications/winhstb/resource.h (added) +++ trunk/reactos/base/applications/winhstb/resource.h [iso-8859-1] Sat Feb 7 05:21:07 2009 @@ -1,0 +1,2 @@ +/* Icons */ +#define IDI_MAIN 4000 Propchange: trunk/reactos/base/applications/winhstb/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/winhstb/winhstb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhstb/… ============================================================================== --- trunk/reactos/base/applications/winhstb/winhstb.c (added) +++ trunk/reactos/base/applications/winhstb/winhstb.c [iso-8859-1] Sat Feb 7 05:21:07 2009 @@ -1,0 +1,46 @@ +/* + * PROJECT: winhlp32.exe + * FILE: base\applications\winhlp32\winhstb\winhstb.c + * PURPOSE: Stub winhelp32 + * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) + */ + +#include <windows.h> +#include <tchar.h> +#include <shellapi.h> +#include <shlwapi.h> +#include "resource.h" + +#define WINHLP _T("winhlp32.exe") + +int +WINAPI +_tWinMain(HINSTANCE hCurInst, + HINSTANCE hPrevInst, + LPTSTR lpsCmdLine, + int nCmdShow) +{ + TCHAR szPath[MAX_PATH]; + + if(GetWindowsDirectory(szPath, MAX_PATH)) + { + PathAppend(szPath, WINHLP); + ShellExecute(NULL, + NULL, + szPath, + lpsCmdLine, + NULL, + nCmdShow); + } + else + { + ShellExecute(NULL, + NULL, + WINHLP, + lpsCmdLine, + NULL, + nCmdShow); + } + + return 0; +} Propchange: trunk/reactos/base/applications/winhstb/winhstb.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/winhstb/winhstb.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhstb/… ============================================================================== --- trunk/reactos/base/applications/winhstb/winhstb.rbuild (added) +++ trunk/reactos/base/applications/winhstb/winhstb.rbuild [iso-8859-1] Sat Feb 7 05:21:07 2009 @@ -1,0 +1,11 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="winhstb" type="win32gui" installbase="system32" installname="winhlp32.exe" unicode="no"> + <include base="winhstb">.</include> + <library>user32</library> + <library>kernel32</library> + <library>shell32</library> + <library>shlwapi</library> + <file>winhstb.c</file> + <file>winhstb.rc</file> +</module> Propchange: trunk/reactos/base/applications/winhstb/winhstb.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/winhstb/winhstb.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhstb/… ============================================================================== --- trunk/reactos/base/applications/winhstb/winhstb.rc (added) +++ trunk/reactos/base/applications/winhstb/winhstb.rc [iso-8859-1] Sat Feb 7 05:21:07 2009 @@ -1,0 +1,11 @@ +#include "resource.h" +#include <windows.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS WinHlp32 Stub\0" +#define REACTOS_STR_INTERNAL_NAME "winhstb\0" +#define REACTOS_STR_ORIGINAL_FILENAME "winhlp32.exe\0" +#include <reactos/version.rc> + +IDI_MAIN ICON "res/4000.ico" Propchange: trunk/reactos/base/applications/winhstb/winhstb.rc ------------------------------------------------------------------------------ svn:eol-style = native 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 7 05:21:07 2009 @@ -74,7 +74,8 @@ base\applications\shutdown\shutdown.exe 1 base\applications\sndvol32\sndvol32.exe 1 base\applications\taskmgr\taskmgr.exe 1 -base\applications\winhlp32\winhlp32.exe 1 +base\applications\winhlp32\winhlp32.exe 4 +base\applications\winhstb\winhlp32.exe 1 base\applications\wordpad\wordpad.exe 1 base\services\audiosrv\audiosrv.exe 1

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