Module: wine Branch: master Commit: 0b5ebcf2fd2d94bf84d076fa7c1f695dd183c155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b5ebcf2fd2d94bf84d076fa7c...
Author: Michael Stefaniuc mstefani@redhat.de Date: Fri Feb 1 23:09:18 2008 +0100
olecli: Remove duplicated typedefs/enums.
Use a local header file for them.
---
dlls/olecli32/olecli.h | 129 +++++++++++++++++++++++++++++++++++++++++++ dlls/olecli32/olecli16.c | 111 +------------------------------------ dlls/olecli32/olecli_main.c | 111 +------------------------------------ 3 files changed, 131 insertions(+), 220 deletions(-)
diff --git a/dlls/olecli32/olecli.h b/dlls/olecli32/olecli.h new file mode 100644 index 0000000..8430a7c --- /dev/null +++ b/dlls/olecli32/olecli.h @@ -0,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; diff --git a/dlls/olecli32/olecli16.c b/dlls/olecli32/olecli16.c index a1da30a..a37254b 100644 --- a/dlls/olecli32/olecli16.c +++ b/dlls/olecli32/olecli16.c @@ -31,120 +31,11 @@ #include "wingdi.h" #include "wownt32.h" #include "objbase.h" +#include "olecli.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 -{ - 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; - typedef struct _OLEOBJECTVTBL16 { void CALLBACK *(*QueryProtocol)(_LPOLEOBJECT,LPCOLESTR16); OLESTATUS (CALLBACK *Release)(_LPOLEOBJECT); diff --git a/dlls/olecli32/olecli_main.c b/dlls/olecli32/olecli_main.c index a36cb72..7abd438 100644 --- a/dlls/olecli32/olecli_main.c +++ b/dlls/olecli32/olecli_main.c @@ -31,120 +31,11 @@ #include "wingdi.h" #include "wownt32.h" #include "objbase.h" +#include "olecli.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 -{ - 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; - typedef struct _OLEOBJECTVTBL { void * (CALLBACK *QueryProtocol)(_LPOLEOBJECT,LPCOLESTR16); OLESTATUS (CALLBACK *Release)(_LPOLEOBJECT);