[ros-diffs] [dchapyshev] 39759: - Sync atl and cabinet with Wine head

Author: dchapyshev
Date: Thu Feb 26 13:20:22 2009
New Revision: 39759

URL: http://svn.reactos.org/svn/reactos?rev=39759&view=rev
Log:
- Sync atl and cabinet with Wine head

Modified:
    trunk/reactos/dll/win32/atl/atl_ax.c
    trunk/reactos/dll/win32/cabinet/cabinet.h
    trunk/reactos/dll/win32/cabinet/fdi.c

Modified: trunk/reactos/dll/win32/atl/atl_ax.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl_ax.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/atl/atl_ax.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/atl/atl_ax.c [iso-8859-1] Thu Feb 26 13:20:22 2009
@@ -126,11 +126,11 @@
     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)
 {

Modified: trunk/reactos/dll/win32/cabinet/cabinet.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet.…
==============================================================================
--- trunk/reactos/dll/win32/cabinet/cabinet.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cabinet/cabinet.h [iso-8859-1] Thu Feb 26 13:20:22 2009
@@ -653,8 +653,4 @@
     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 */

Modified: trunk/reactos/dll/win32/cabinet/fdi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fdi.c?re…
==============================================================================
--- trunk/reactos/dll/win32/cabinet/fdi.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cabinet/fdi.c [iso-8859-1] Thu Feb 26 13:20:22 2009
@@ -151,7 +151,7 @@
 /****************************************************************
  * 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 @@
  *   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;