Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-04 21:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Sync atl and cabinet with Wine head

Browse source 
svn path=/trunk/; revision=39759
This commit is contained in:
Dmitry Chapyshev 2009-02-26 10:20:22 +00:00
parent be3c2ddc31
commit b6bab62a3b
3 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/dll/win32/atl/atl_ax.c
View file

@ -126,11 +126,11 @@ static ULONG IOCS_AddRef(IOCS *This)
return ref;
}
#define THIS2IOLECLIENTSITE(This) ((IOleClientSite*)&This->lpOleClientSiteVtbl)
#define THIS2IOLECONTAINER(This) ((IOleContainer*)&This->lpOleContainerVtbl)
#define THIS2IOLEINPLACESITEWINDOWLESS(This) ((IOleInPlaceSiteWindowless*)&This->lpOleInPlaceSiteWindowlessVtbl)
#define THIS2IOLEINPLACEFRAME(This) ((IOleInPlaceFrame*)&This->lpOleInPlaceFrameVtbl)
#define THIS2IOLECONTROLSITE(This) ((IOleControlSite*)&This->lpOleControlSiteVtbl)
#define THIS2IOLECLIENTSITE(This) ((IOleClientSite*)&(This)->lpOleClientSiteVtbl)
#define THIS2IOLECONTAINER(This) (&(This)->lpOleContainerVtbl)
#define THIS2IOLEINPLACESITEWINDOWLESS(This) (&(This)->lpOleInPlaceSiteWindowlessVtbl)
#define THIS2IOLEINPLACEFRAME(This) (&(This)->lpOleInPlaceFrameVtbl)
#define THIS2IOLECONTROLSITE(This) (&(This)->lpOleControlSiteVtbl)
static HRESULT IOCS_QueryInterface(IOCS *This, REFIID riid, void **ppv)
{

4
reactos/dll/win32/cabinet/cabinet.h
View file

@ -653,8 +653,4 @@ typedef struct {
struct FILELIST *FilterList;
} SESSION;
/* from fdi.c */
void QTMupdatemodel(struct QTMmodel *model, int sym);
int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits, const cab_UBYTE *length, cab_UWORD *table);
#endif /* __WINE_CABINET_H */

5
reactos/dll/win32/cabinet/fdi.c
View file

@ -151,7 +151,7 @@ typedef struct fdi_cds_fwd {
/****************************************************************
* QTMupdatemodel (internal)
*/
void QTMupdatemodel(struct QTMmodel *model, int sym) {
static void QTMupdatemodel(struct QTMmodel *model, int sym) {
struct QTMmodelsym temp;
int i, j;
@ -220,7 +220,8 @@ void QTMupdatemodel(struct QTMmodel *model, int sym) {
* OK: 0
* error: 1
*/
int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits, const cab_UBYTE *length, cab_UWORD *table) {
static int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits,
const cab_UBYTE *length, cab_UWORD *table) {
register cab_UWORD sym;
register cab_ULONG leaf;
register cab_UBYTE bit_num = 1;