diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 66f758fdf3..226605016c 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -310,6 +310,7 @@ typedef struct /* ---- End of REBAR layout constants. ---- */ +#define RB_GETBANDINFO_OLD (WM_USER+5) /* obsoleted after IE3, but we have to support it anyway */ /* The following 6 defines return the proper rcBand element */ /* depending on whether CCS_VERT was set. */ @@ -4541,8 +4542,7 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case RB_GETBANDCOUNT: return REBAR_GetBandCount (infoPtr); - case RB_GETBANDINFO: /* obsoleted after IE3, but we have to - support it anyway. */ + case RB_GETBANDINFO_OLD: case RB_GETBANDINFOA: return REBAR_GetBandInfoA (infoPtr, wParam, lParam); diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 895d1feadf..f21ce78e42 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -51,6 +51,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); +typedef LPCSTR LPCOLESTR16; + /**************************************************************************** * This section defines variables internal to the COM module. * diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index e334c76fcf..52d9a99697 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -1332,16 +1332,6 @@ HRESULT WINAPI FileMonikerROTDataImpl_GetComparaisonData(IROTData* iface, return E_NOTIMPL; } -/****************************************************************************** - * CreateFileMoniker (OLE2.28) - ******************************************************************************/ -HRESULT WINAPI CreateFileMoniker16(LPCOLESTR16 lpszPathName,LPMONIKER* ppmk) -{ - - FIXME("(%s,%p),stub!\n",lpszPathName,ppmk); - return E_NOTIMPL; -} - /****************************************************************************** * CreateFileMoniker (OLE32.@) ******************************************************************************/ diff --git a/dlls/ole32/ifs.h b/dlls/ole32/ifs.h index 2a39940774..02f2e54d64 100644 --- a/dlls/ole32/ifs.h +++ b/dlls/ole32/ifs.h @@ -25,6 +25,10 @@ #include "winbase.h" #include "objbase.h" +typedef CHAR OLECHAR16; +typedef LPSTR LPOLESTR16; +typedef LPCSTR LPCOLESTR16; + /*********************************************************************** * IMalloc16 interface */ diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index c4818851d3..b426f712f1 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -957,17 +957,6 @@ HRESULT WINAPI ItemMonikerROTDataImpl_GetComparaisonData(IROTData* iface, return E_NOTIMPL; } -/****************************************************************************** - * CreateItemMoniker16 [OLE2.28] - ******************************************************************************/ -HRESULT WINAPI CreateItemMoniker16(LPCOLESTR16 lpszDelim,LPCOLESTR lpszItem,LPMONIKER* ppmk) -{ - - FIXME("(%s,%p),stub!\n",lpszDelim,ppmk); - *ppmk = NULL; - return E_NOTIMPL; -} - /****************************************************************************** * CreateItemMoniker [OLE32.@] ******************************************************************************/ diff --git a/dlls/ole32/ole2.spec b/dlls/ole32/ole2.spec index a9be14bac3..e4c7ae48e2 100644 --- a/dlls/ole32/ole2.spec +++ b/dlls/ole32/ole2.spec @@ -24,7 +24,7 @@ 24 stub OLESAVETOSTREAM 25 stub OLELOADFROMSTREAM 26 stub CREATEBINDCTX -27 stub CREATEITEMMONIKER +27 pascal CreateItemMoniker(str str ptr) CreateItemMoniker16 28 pascal CreateFileMoniker(str ptr) CreateFileMoniker16 29 stub CREATEGENERICCOMPOSITE 30 pascal GetRunningObjectTable(long ptr) GetRunningObjectTable16 diff --git a/dlls/ole32/ole2_16.c b/dlls/ole32/ole2_16.c index 67cbd9758c..67514ead80 100644 --- a/dlls/ole32/ole2_16.c +++ b/dlls/ole32/ole2_16.c @@ -46,6 +46,7 @@ #include "wine/wingdi16.h" #include "wine/winuser16.h" #include "ole32_main.h" +#include "ifs.h" #include "wine/debug.h" @@ -120,3 +121,24 @@ HGLOBAL16 WINAPI OleMetaFilePictFromIconAndLabel16( mf->hMF = CloseMetaFile16(HDC_16(hdc)); return hmf; } + + +/****************************************************************************** + * CreateItemMoniker (OLE2.27) + */ +HRESULT WINAPI CreateItemMoniker16(LPCOLESTR16 lpszDelim,LPCOLESTR16 lpszItem,LPMONIKER* ppmk) +{ + FIXME("(%s,%p),stub!\n",lpszDelim,ppmk); + *ppmk = NULL; + return E_NOTIMPL; +} + + +/****************************************************************************** + * CreateFileMoniker (OLE2.28) + */ +HRESULT WINAPI CreateFileMoniker16(LPCOLESTR16 lpszPathName,LPMONIKER* ppmk) +{ + FIXME("(%s,%p),stub!\n",lpszPathName,ppmk); + return E_NOTIMPL; +} diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 2241049b46..4347e9632c 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -6856,6 +6856,7 @@ HRESULT OLECONVERT_CreateCompObjStream(LPSTORAGE pStorage, LPCSTR strOleTypeName HRESULT hStorageRes, hRes = S_OK; OLECONVERT_ISTORAGE_COMPOBJ IStorageCompObj; WCHAR wstrStreamName[] = {1,'C', 'o', 'm', 'p', 'O', 'b', 'j', 0}; + WCHAR bufferW[OLESTREAM_MAX_STR_LEN]; BYTE pCompObjUnknown1[] = {0x01, 0x00, 0xFE, 0xFF, 0x03, 0x0A, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF}; BYTE pCompObjUnknown2[] = {0xF4, 0x39, 0xB2, 0x71}; @@ -6881,7 +6882,9 @@ HRESULT OLECONVERT_CreateCompObjStream(LPSTORAGE pStorage, LPCSTR strOleTypeName strcpy(IStorageCompObj.strProgIDName, strOleTypeName); /* Get the CLSID */ - hRes = CLSIDFromProgID16(IStorageCompObj.strProgIDName, &(IStorageCompObj.clsid)); + MultiByteToWideChar( CP_ACP, 0, IStorageCompObj.strProgIDName, -1, + bufferW, OLESTREAM_MAX_STR_LEN ); + hRes = CLSIDFromProgID(bufferW, &(IStorageCompObj.clsid)); if(hRes == S_OK) { diff --git a/dlls/oleaut32/ole2disp.h b/dlls/oleaut32/ole2disp.h index 1c2dda9e31..ec7c1c74e3 100644 --- a/dlls/oleaut32/ole2disp.h +++ b/dlls/oleaut32/ole2disp.h @@ -26,6 +26,12 @@ #include "wtypes.h" #include "wine/windef16.h" +typedef CHAR OLECHAR16; +typedef LPSTR LPOLESTR16; +typedef LPCSTR LPCOLESTR16; +typedef OLECHAR16 *BSTR16; +typedef BSTR16 *LPBSTR16; + BSTR16 WINAPI SysAllocString16(LPCOLESTR16); BSTR16 WINAPI SysAllocStringLen16(const char*, int); VOID WINAPI SysFreeString16(BSTR16); diff --git a/dlls/olecli/olecli16.c b/dlls/olecli/olecli16.c index 3738e5ddc4..508a22d00f 100644 --- a/dlls/olecli/olecli16.c +++ b/dlls/olecli/olecli16.c @@ -141,6 +141,7 @@ 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/olecli/olecli_main.c b/dlls/olecli/olecli_main.c index 2a7730314b..c19057dffa 100644 --- a/dlls/olecli/olecli_main.c +++ b/dlls/olecli/olecli_main.c @@ -141,6 +141,7 @@ 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/olesvr/olesvr_main.c b/dlls/olesvr/olesvr_main.c index 194112e4ad..723157c627 100644 --- a/dlls/olesvr/olesvr_main.c +++ b/dlls/olesvr/olesvr_main.c @@ -101,6 +101,7 @@ typedef enum { typedef LONG LHSERVER; typedef LONG LHSERVERDOC; +typedef LPCSTR LPCOLESTR16; typedef struct _OLESERVERDOC *LPOLESERVERDOC; diff --git a/include/commctrl.h b/include/commctrl.h index 6792b3d3b4..0fc8082064 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -265,7 +265,6 @@ typedef struct tagNMTTCUSTOMDRAW /* StatusWindow */ -#define STATUSCLASSNAME16 "msctls_statusbar" #define STATUSCLASSNAMEA "msctls_statusbar32" #if defined(__GNUC__) # define STATUSCLASSNAMEW (const WCHAR []){ 'm','s','c','t','l','s','_', \ @@ -365,7 +364,6 @@ INT WINAPI LBItemFromPt (HWND, POINT, BOOL); /* UpDown */ -#define UPDOWN_CLASS16 "msctls_updown" #define UPDOWN_CLASSA "msctls_updown32" #if defined(__GNUC__) # define UPDOWN_CLASSW (const WCHAR []){ 'm','s','c','t','l','s','_', \ @@ -435,7 +433,6 @@ HWND WINAPI CreateUpDownControl (DWORD, INT, INT, INT, INT, /* Progress Bar */ -#define PROGRESS_CLASS16 "msctls_progress" #define PROGRESS_CLASSA "msctls_progress32" #if defined(__GNUC__) # define PROGRESS_CLASSW (const WCHAR []){ 'm','s','c','t','l','s','_', \ @@ -632,7 +629,6 @@ _TrackMouseEvent( /* Flat Scrollbar control */ -#define FLATSB_CLASS16 "flatsb_class" #define FLATSB_CLASSA "flatsb_class32" #if defined(__GNUC__) # define FLATSB_CLASSW (const WCHAR []){ 'f','l','a','t','s','b','_', \ @@ -686,7 +682,6 @@ LRESULT WINAPI DefSubclassProc(HWND, UINT, WPARAM, LPARAM); /* Header control */ -#define WC_HEADER16 "SysHeader" #define WC_HEADERA "SysHeader32" #if defined(__GNUC__) # define WC_HEADERW (const WCHAR []){ 'S','y','s','H','e','a','d','e','r','3','2',0 } @@ -949,7 +944,6 @@ typedef struct tagNMHDDISPINFOW /* Toolbar */ -#define TOOLBARCLASSNAME16 "ToolbarWindow" #define TOOLBARCLASSNAMEA "ToolbarWindow32" #if defined(__GNUC__) # define TOOLBARCLASSNAMEW (const WCHAR []){ 'T','o','o','l','b','a','r', \ @@ -1447,7 +1441,6 @@ CreateMappedBitmap (HINSTANCE, INT, UINT, LPCOLORMAP, INT); /* Tool tips */ -#define TOOLTIPS_CLASS16 "tooltips_class" #define TOOLTIPS_CLASSA "tooltips_class32" #if defined(__GNUC__) # define TOOLTIPS_CLASSW (const WCHAR []){ 't','o','o','l','t','i','p','s','_', \ @@ -1633,7 +1626,6 @@ typedef struct tagNMTTDISPINFOW /* Rebar control */ -#define REBARCLASSNAME16 "ReBarWindow" #define REBARCLASSNAMEA "ReBarWindow32" #if defined(__GNUC__) # define REBARCLASSNAMEW (const WCHAR []){ 'R','e','B','a','r', \ @@ -1699,7 +1691,6 @@ static const WCHAR REBARCLASSNAMEW[] = { 'R','e','B','a','r', #define RB_DELETEBAND (WM_USER+2) #define RB_GETBARINFO (WM_USER+3) #define RB_SETBARINFO (WM_USER+4) -#define RB_GETBANDINFO (WM_USER+5) /* just for compatibility */ #define RB_SETBANDINFOA (WM_USER+6) #define RB_SETBANDINFOW (WM_USER+11) #define RB_SETBANDINFO WINELIB_NAME_AW(RB_SETBANDINFO) @@ -1723,7 +1714,7 @@ static const WCHAR REBARCLASSNAMEW[] = { 'R','e','B','a','r', #define RB_GETBARHEIGHT (WM_USER+27) #define RB_GETBANDINFOW (WM_USER+28) #define RB_GETBANDINFOA (WM_USER+29) -#define RB_GETBANDINFO16 WINELIB_NAME_AW(RB_GETBANDINFO16) +#define RB_GETBANDINFO WINELIB_NAME_AW(RB_GETBANDINFO) #define RB_MINIMIZEBAND (WM_USER+30) #define RB_MAXIMIZEBAND (WM_USER+31) #define RB_GETBANDBORDERS (WM_USER+34) @@ -1868,7 +1859,6 @@ typedef struct _RB_HITTESTINFO /* Trackbar control */ -#define TRACKBAR_CLASS16 "msctls_trackbar" #define TRACKBAR_CLASSA "msctls_trackbar32" #if defined(__GNUC__) # define TRACKBAR_CLASSW (const WCHAR []){ 'm','s','c','t','l','s','_', \ @@ -3550,7 +3540,6 @@ typedef struct NMLVSCROLL /* Tab Control */ -#define WC_TABCONTROL16 "SysTabControl" #define WC_TABCONTROLA "SysTabControl32" #if defined(__GNUC__) # define WC_TABCONTROLW (const WCHAR []){ 'S','y','s', \ @@ -3928,7 +3917,6 @@ typedef struct /* Hotkey control */ -#define HOTKEY_CLASS16 "msctls_hotkey" #define HOTKEY_CLASSA "msctls_hotkey32" #if defined(__GNUC__) # define HOTKEY_CLASSW (const WCHAR []){ 'm','s','c','t','l','s','_', \ diff --git a/include/objbase.h b/include/objbase.h index 121a6c32b9..cd39ded6bb 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -412,7 +412,7 @@ HRESULT WINAPI CoSetProxyBlanket(IUnknown* pProxy, DWORD dwAuthnSvc, DWORD dwAut HRESULT WINAPI CoCopyProxy(IUnknown* pProxy, IUnknown** ppCopy); HRESULT WINAPI CoImpersonateClient(void); -HRESULT WINAPI CoQueryClientBlanket(DWORD* pAuthnSvc, DWORD* pAuthzSvc, OLECHAR16** pServerPrincName, DWORD* pAuthnLevel, DWORD* pImpLevel, RPC_AUTHZ_HANDLE* pPrivs, DWORD* pCapabilities); +HRESULT WINAPI CoQueryClientBlanket(DWORD* pAuthnSvc, DWORD* pAuthzSvc, OLECHAR** pServerPrincName, DWORD* pAuthnLevel, DWORD* pImpLevel, RPC_AUTHZ_HANDLE* pPrivs, DWORD* pCapabilities); HRESULT WINAPI CoRevertToSelf(void); /* misc */ @@ -430,15 +430,9 @@ HRESULT WINAPI CoRegisterMessageFilter(LPMESSAGEFILTER lpMessageFilter,LPMESSAGE /***************************************************************************** * GUID API */ -HRESULT WINAPI StringFromCLSID16(REFCLSID id, LPOLESTR16*); HRESULT WINAPI StringFromCLSID(REFCLSID id, LPOLESTR*); - -HRESULT WINAPI CLSIDFromString16(LPCOLESTR16, CLSID *); HRESULT WINAPI CLSIDFromString(LPOLESTR, CLSID *); - -HRESULT WINAPI CLSIDFromProgID16(LPCOLESTR16 progid, LPCLSID riid); HRESULT WINAPI CLSIDFromProgID(LPCOLESTR progid, LPCLSID riid); - HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *lplpszProgID); INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax); @@ -460,13 +454,10 @@ HRESULT WINAPI CreateDataCache(LPUNKNOWN pUnkOuter, REFCLSID rclsid, REFIID iid, */ HRESULT WINAPI GetClassFile(LPCOLESTR filePathName,CLSID *pclsid); -HRESULT WINAPI CreateBindCtx16(DWORD reserved, LPBC* ppbc); HRESULT WINAPI CreateBindCtx(DWORD reserved, LPBC* ppbc); -HRESULT WINAPI CreateFileMoniker16(LPCOLESTR16 lpszPathName, LPMONIKER* ppmk); HRESULT WINAPI CreateFileMoniker(LPCOLESTR lpszPathName, LPMONIKER* ppmk); -HRESULT WINAPI CreateItemMoniker16(LPCOLESTR16 lpszDelim, LPCOLESTR lpszItem, LPMONIKER* ppmk); HRESULT WINAPI CreateItemMoniker(LPCOLESTR lpszDelim, LPCOLESTR lpszItem, LPMONIKER* ppmk); HRESULT WINAPI CreateAntiMoniker(LPMONIKER * ppmk); @@ -482,7 +473,6 @@ HRESULT WINAPI CreatePointerMoniker(LPUNKNOWN punk, LPMONIKER* ppmk); HRESULT WINAPI MonikerCommonPrefixWith(IMoniker* pmkThis,IMoniker* pmkOther,IMoniker** ppmkCommon); HRESULT WINAPI GetRunningObjectTable(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot); -HRESULT WINAPI GetRunningObjectTable16(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot); /***************************************************************************** * Storage API diff --git a/include/wtypes.h b/include/wtypes.h index bd500ddcc5..ac439a5895 100644 --- a/include/wtypes.h +++ b/include/wtypes.h @@ -271,15 +271,6 @@ typedef const OLECHAR *LPCOLESTR; #ifndef __WINESRC__ #define OLESTR(str) L##str #endif -typedef CHAR OLECHAR16; - -typedef LPSTR LPOLESTR16; - -typedef LPCSTR LPCOLESTR16; - -typedef OLECHAR16 *BSTR16; -typedef BSTR16 *LPBSTR16; -#define OLESTR16(x) x typedef LONG SCODE; typedef struct _COAUTHIDENTITY { diff --git a/include/wtypes.idl b/include/wtypes.idl index ade2dc4b53..e3e48e09cc 100644 --- a/include/wtypes.idl +++ b/include/wtypes.idl @@ -274,18 +274,6 @@ cpp_quote("#ifndef __WINESRC__") cpp_quote("#define OLESTR(str) L##str") cpp_quote("#endif") -/* from Wine's pre-WIDL wtypes.h */ -/* FIXME: does not belong here */ -typedef CHAR OLECHAR16; -typedef LPSTR LPOLESTR16; -typedef LPCSTR LPCOLESTR16; -/* quoted because if BSTR16 is ever used in IDL files, - * it'll probably need some wire_marshal stuff too, - * and quoting these will detect any such necessity */ -cpp_quote("typedef OLECHAR16 *BSTR16;") -cpp_quote("typedef BSTR16 *LPBSTR16;") -cpp_quote("#define OLESTR16(x) x") - typedef LONG SCODE; typedef struct _COAUTHIDENTITY { diff --git a/windows/spy.c b/windows/spy.c index b381b7fe7c..64c6604ea2 100644 --- a/windows/spy.c +++ b/windows/spy.c @@ -1283,12 +1283,14 @@ const USER_MSG *classmsg; /* pointer to first USER_MSG for class */ /* replace the "0" with a "SZOF(structure)", or with a */ /* number. (First method prefered.) */ +#define RB_GETBANDINFO_OLD (WM_USER+5) /* obsoleted after IE3, but we have to support it anyway */ + static const USER_MSG rebar_array[] = { USM(RB_INSERTBANDA, 0), USM(RB_DELETEBAND, 0), USM(RB_GETBARINFO, 0), USM(RB_SETBARINFO, 0), - USM(RB_GETBANDINFO, 0), + USM(RB_GETBANDINFO_OLD, 0), USM(RB_SETBANDINFOA, 0), USM(RB_SETPARENT, 0), USM(RB_HITTEST, 0),