* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include "config.h"
-#include <config.h>
-
-//#include <stdarg.h>
+#include <stdarg.h>
#define COBJMACROS
-#include <wine/debug.h>
-//#include "windef.h"
-#include <winbase.h>
-#include <winreg.h>
-//#include "winuser.h"
-//#include "shlwapi.h"
-//#include "winerror.h"
-#include <objbase.h>
+#include "wine/debug.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
+#include "winuser.h"
+#include "shlwapi.h"
+#include "winerror.h"
+#include "objbase.h"
-#include <wine/unicode.h>
+#include "wine/unicode.h"
-#include <msctf.h>
+#include "msctf.h"
#include "msctf_internal.h"
WINE_DEFAULT_DEBUG_CHANNEL(msctf);
if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITfCategoryMgr))
{
- *ppvOut = This;
+ *ppvOut = &This->ITfCategoryMgr_iface;
}
if (*ppvOut)
{
- IUnknown_AddRef(iface);
+ ITfCategoryMgr_AddRef(iface);
return S_OK;
}
if (ulCount)
{
- int j;
+ ULONG j;
BOOL found = FALSE;
for (j = 0; j < ulCount; j++)
if (IsEqualGUID(&guid, ppcatidList[j]))
}
-static const ITfCategoryMgrVtbl CategoryMgr_CategoryMgrVtbl =
+static const ITfCategoryMgrVtbl CategoryMgrVtbl =
{
CategoryMgr_QueryInterface,
CategoryMgr_AddRef,
CategoryMgr_Release,
-
CategoryMgr_RegisterCategory,
CategoryMgr_UnregisterCategory,
CategoryMgr_EnumCategoriesInItem,
if (This == NULL)
return E_OUTOFMEMORY;
- This->ITfCategoryMgr_iface.lpVtbl = &CategoryMgr_CategoryMgrVtbl;
+ This->ITfCategoryMgr_iface.lpVtbl = &CategoryMgrVtbl;
This->refCount = 1;
- TRACE("returning %p\n", This);
- *ppOut = (IUnknown *)This;
+ *ppOut = (IUnknown *)&This->ITfCategoryMgr_iface;
+ TRACE("returning %p\n", *ppOut);
return S_OK;
}