Module: wine Branch: master Commit: d7371fc49dfeb2b0dc146e43b3e6b063f5798c75 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d7371fc49dfeb2b0dc146e43...
Author: Mike McCormack mike@codeweavers.com Date: Fri Aug 11 20:21:46 2006 +0900
include: Rename indexsvr.idl to indexsrv.idl.
---
dlls/infosoft/infosoft_main.c | 2 - dlls/infosoft/wordbreaker.c | 2 - dlls/uuid/uuid.c | 2 - include/.gitignore | 2 - include/Makefile.in | 2 - include/indexsrv.idl | 126 +++++++++++++++++++++++++++++++++++++++++ include/indexsvr.idl | 126 ----------------------------------------- 7 files changed, 131 insertions(+), 131 deletions(-) create mode 100644 include/indexsrv.idl delete mode 100644 include/indexsvr.idl
diff --git a/dlls/infosoft/infosoft_main.c b/dlls/infosoft/infosoft_main.c index c13334c..6dfc8e3 100644 --- a/dlls/infosoft/infosoft_main.c +++ b/dlls/infosoft/infosoft_main.c @@ -30,7 +30,7 @@ #include "winbase.h" #include "winuser.h" #include "winreg.h" #include "ole2.h" -#include "indexsvr.h" +#include "indexsrv.h" #include "initguid.h"
#include "wine/debug.h" diff --git a/dlls/infosoft/wordbreaker.c b/dlls/infosoft/wordbreaker.c index 89d0b36..d2fa5b6 100644 --- a/dlls/infosoft/wordbreaker.c +++ b/dlls/infosoft/wordbreaker.c @@ -29,7 +29,7 @@ #include "winbase.h" #include "winuser.h" #include "winreg.h" #include "ole2.h" -#include "indexsvr.h" +#include "indexsrv.h" #include "wine/unicode.h" #include "wine/debug.h"
diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index a933923..c1d7cee 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -65,7 +65,7 @@ #include "downloadmgr.h" #include "objsel.h" #include "hlink.h" #include "optary.h" -#include "indexsvr.h" +#include "indexsrv.h" #include "htiframe.h"
/* FIXME: cguids declares GUIDs but does not define their values */ diff --git a/include/.gitignore b/include/.gitignore index a267815..4276dd8 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -13,7 +13,7 @@ /hlink.h /htiframe.h /iads.h -/indexsvr.h +/indexsrv.h /mediaobj.h /mimeinfo.h /mlang.h diff --git a/include/Makefile.in b/include/Makefile.in index c550a19..88e93ed 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -19,7 +19,7 @@ WINDOWS_IDL_SRCS = \ hlink.idl \ htiframe.idl \ iads.idl \ - indexsvr.idl \ + indexsrv.idl \ mediaobj.idl \ mimeinfo.idl \ mlang.idl \ diff --git a/include/indexsrv.idl b/include/indexsrv.idl new file mode 100644 index 0000000..e7b9919 --- /dev/null +++ b/include/indexsrv.idl @@ -0,0 +1,126 @@ +/* + * Copyright 2006 Mike McCormack + * + * 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 + */ + +import "unknwn.idl"; + +/* + * widl doesn't like the declaration of PFNFILLTEXTBUFFER, so work around it... + * Not sure that function pointers are even legal in idl. + */ +cpp_quote("struct tagTEXT_SOURCE;") +cpp_quote("typedef HRESULT (WINAPI *PFNFILLTEXTBUFFER)(struct tagTEXT_SOURCE *pTextSource);") +cpp_quote("#if 0") +typedef void* PFNFILLTEXTBUFFER; +cpp_quote("#endif") + +typedef struct tagTEXT_SOURCE +{ + PFNFILLTEXTBUFFER pfnFillTextBuffer; + const WCHAR *awcBuffer; + ULONG iEnd; + ULONG iCur; +} TEXT_SOURCE; + +typedef enum tagWORDREP_BREAK_TYPE +{ + WORDREP_BREAK_EOW = 0, + WORDREP_BREAK_EOS = 1, + WORDREP_BREAK_EOP = 2, + WORDREP_BREAK_EOC = 3 +} WORDREP_BREAK_TYPE; + + +/***************************************************************************** + * IWordSink interface + */ +[ + unique, + uuid(cc907054-c058-101a-b554-08002b33b0e6), + object, + local +] +interface IWordSink : IUnknown +{ + HRESULT PutWord( + [in] ULONG cwc, + [size_is(cwcSrcLen)][in] const WCHAR *pwcInBuf, + [in] ULONG cwcSrcLen, + [in] ULONG cwcSrcPos); + HRESULT PutAltWord( + [in] ULONG cwc, + [size_is(cwcSrcLen)][in] const WCHAR *pwcInBuf, + [in] ULONG cwcSrcLen, + [in] ULONG cwcSrcPos); + HRESULT StartAltPhrase(void); + HRESULT EndAltPhrase(void); + HRESULT PutBreak( + [in] WORDREP_BREAK_TYPE breakType); +} + +/***************************************************************************** + * IPhraseSink interface + */ +[ + unique, + uuid(cc906ff0-c058-101a-b554-08002b33b0e6), + object, + local +] +interface IPhraseSink: IUnknown +{ + HRESULT PutSmallPhrase( + [size_is(cwcNoun)][in] const WCHAR *pwcNoun, + [in] ULONG cwcNoun, + [size_is(cwcModifier)][in] const WCHAR *pwcModifier, + [in] ULONG cwcModifier, + [in] ULONG ulAttachmentType); + HRESULT PutPhrase( + [size_is(cwcPhrase)][in] const WCHAR *pwcPhrase, + [in] ULONG cwcPhrase); +} + +/***************************************************************************** + * IWordBreaker interface + */ +[ + unique, + uuid(d53552c8-77e3-101a-b552-08002b33b0e6), + object, + local +] +interface IWordBreaker: IUnknown +{ + HRESULT Init( + [in] BOOL fQuery, + [in] ULONG ulMaxTokenSize, + [out] BOOL *pfLicense); + HRESULT BreakText( + [in] TEXT_SOURCE *pTextSource, + [in] IWordSink *pWordSink, + [in] IPhraseSink *pPhraseSink); + HRESULT ComposePhrase( + [size_is(cwcNoun)][in] const WCHAR *pwcNoun, + [in] ULONG cwcNoun, + [size_is(cwcModifier)][in] const WCHAR *pwcModifier, + [in] ULONG cwcModifier, + [in] ULONG ulAttachmentType, + [size_is(*pcwcPhrase)][out] WCHAR *pwcPhrase, + [out][in] ULONG *pcwcPhrase); + HRESULT GetLicenseToUse( + [string][out] const WCHAR **ppwcsLicense); +} diff --git a/include/indexsvr.idl b/include/indexsvr.idl deleted file mode 100644 index c62caf7..0000000 --- a/include/indexsvr.idl +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright 2006 Mike McCormack - * - * 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 - */ - -import "unknwn.idl"; - -/* - * widl doesn't like the declaration of PFNFILLTEXTBUFFER, so work around it... - * Not sure that function pointers are even legal in idl. - */ -cpp_quote("struct tagTEXT_SOURCE;") -cpp_quote("typedef HRESULT (WINAPI *PFNFILLTEXTBUFFER)(struct tagTEXT_SOURCE *pTextSource);") -cpp_quote("#if 0") -typedef void* PFNFILLTEXTBUFFER; -cpp_quote("#endif") - -typedef struct tagTEXT_SOURCE -{ - PFNFILLTEXTBUFFER pfnFillTextBuffer; - const WCHAR *awcBuffer; - ULONG iEnd; - ULONG iCur; -} TEXT_SOURCE; - -typedef enum tagWORDREP_BREAK_TYPE -{ - WORDREP_BREAK_EOW = 0, - WORDREP_BREAK_EOS = 1, - WORDREP_BREAK_EOP = 2, - WORDREP_BREAK_EOC = 3 -} WORDREP_BREAK_TYPE; - - -/***************************************************************************** - * IWordSink interface - */ -[ - unique, - uuid(cc907054-c058-101a-b554-08002b33b0e6), - object, - local -] -interface IWordSink : IUnknown -{ - HRESULT PutWord( - [in] ULONG cwc, - [size_is(cwcSrcLen)][in] const WCHAR *pwcInBuf, - [in] ULONG cwcSrcLen, - [in] ULONG cwcSrcPos); - HRESULT PutAltWord( - [in] ULONG cwc, - [size_is(cwcSrcLen)][in] const WCHAR *pwcInBuf, - [in] ULONG cwcSrcLen, - [in] ULONG cwcSrcPos); - HRESULT StartAltPhrase(void); - HRESULT EndAltPhrase(void); - HRESULT PutBreak( - [in] WORDREP_BREAK_TYPE breakType); -} - -/***************************************************************************** - * IPhraseSink interface - */ -[ - unique, - uuid(cc906ff0-c058-101a-b554-08002b33b0e6), - object, - local -] -interface IPhraseSink: IUnknown -{ - HRESULT PutSmallPhrase( - [size_is(cwcNoun)][in] const WCHAR *pwcNoun, - [in] ULONG cwcNoun, - [size_is(cwcModifier)][in] const WCHAR *pwcModifier, - [in] ULONG cwcModifier, - [in] ULONG ulAttachmentType); - HRESULT PutPhrase( - [size_is(cwcPhrase)][in] const WCHAR *pwcPhrase, - [in] ULONG cwcPhrase); -} - -/***************************************************************************** - * IWordBreaker interface - */ -[ - unique, - uuid(d53552c8-77e3-101a-b552-08002b33b0e6), - object, - local -] -interface IWordBreaker: IUnknown -{ - HRESULT Init( - [in] BOOL fQuery, - [in] ULONG ulMaxTokenSize, - [out] BOOL *pfLicense); - HRESULT BreakText( - [in] TEXT_SOURCE *pTextSource, - [in] IWordSink *pWordSink, - [in] IPhraseSink *pPhraseSink); - HRESULT ComposePhrase( - [size_is(cwcNoun)][in] const WCHAR *pwcNoun, - [in] ULONG cwcNoun, - [size_is(cwcModifier)][in] const WCHAR *pwcModifier, - [in] ULONG cwcModifier, - [in] ULONG ulAttachmentType, - [size_is(*pcwcPhrase)][out] WCHAR *pwcPhrase, - [out][in] ULONG *pcwcPhrase); - HRESULT GetLicenseToUse( - [string][out] const WCHAR **ppwcsLicense); -}
-
Alexandre Julliard