Changeset 21494 for trunk/src


Ignore:
Timestamp:
Dec 2, 2010, 1:19:12 AM (15 years ago)
Author:
dmik
Message:

Fixed broken build after r21492 by sorting out a huuuuge wagon of duplicates, wrong include order and other dirty mess.

Location:
trunk/src
Files:
60 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/DPlayX/dpclassfactory.cpp

    r4317 r21494  
    33
    44#include <odin.h>
    5 #define ICOM_CINTERFACE 1
     5
    66#define CINTERFACE
     7#include "wine/obj_base.h"
    78
    8 #include "wine/obj_base.h"
    99#include "winerror.h"
    1010#include "debugtools.h"

  • trunk/src/DPlayX/dplay.cpp

    r5526 r21494  
    1010
    1111#include <odin.h>
    12 #define ICOM_CINTERFACE 1
    1312#define CINTERFACE
    1413

  • trunk/src/DPlayX/dplaysp.cpp

    r5311 r21494  
    99
    1010#include <odin.h>
    11 #define ICOM_CINTERFACE 1
    1211#define CINTERFACE
    1312

  • trunk/src/DPlayX/dplayx_global.cpp

    r5526 r21494  
    1515
    1616#include <odin.h>
    17 #define ICOM_CINTERFACE 1
    1817#define CINTERFACE
    1918

  • trunk/src/DPlayX/dplayx_main.cpp

    r5311 r21494  
    99#include <string.h>
    1010#include <odin.h>
    11 #define ICOM_CINTERFACE 1
    12 #define CINTERFACE
     11
    1312#include "winerror.h"
    1413#include "winbase.h"
    1514#include "debugtools.h"
    1615#define INITGUID
    17 #include "initguid.h"  /* To define the GUIDs */
     16#include "guiddef.h"  /* To define the GUIDs */
    1817#include "dplaysp.h"
    1918#include "dplayx_global.h"

  • trunk/src/DPlayX/dplayx_messages.cpp

    r5311 r21494  
    1010
    1111#include <odin.h>
    12 #define ICOM_CINTERFACE 1
    1312#define CINTERFACE
    1413

  • trunk/src/DPlayX/dplobby.cpp

    r7940 r21494  
    1010
    1111#include <odin.h>
    12 #define ICOM_CINTERFACE 1
    1312#define CINTERFACE
    1413

  • trunk/src/DPlayX/name_server.cpp

    r5526 r21494  
    1313
    1414#include <odin.h>
    15 #define ICOM_CINTERFACE 1
    1615#define CINTERFACE
    1716

  • trunk/src/comdlg32/cdlg32.cpp

    r3544 r21494  
    99#ifdef __WIN32OS2__
    1010// ><DJR 17.05.99 Force to use C-interfaces for now to prevent CALLBACK definition compiler error
    11 #define CINTERFACE 1
     11#define CINTERFACE
    1212#include <os2win.h>
    1313#else

  • trunk/src/custombuild/guid.c

    r6459 r21494  
    11/* $Id: guid.c,v 1.4 2001-08-04 17:19:20 sandervl Exp $ */
    2 #define ICOM_CINTERFACE 1
    32#include <odin.h>
    43
    5 #define CINTERFACE 1
     4#define CINTERFACE
    65#define INITGUID
    7 #include <wine\obj_oleview.h>
    8 #include "initguid.h"
     6#include "wine/obj_base.h"
    97
    108#include "shlwapi.h"
    … …  
    2422#include "wine\obj_olefont.h"
    2523
    26 #include <wine/obj_oleview.h>
    27 #include <wine/obj_dragdrop.h>
    28 #include <wine/obj_inplace.h>
    29 #include <wine/obj_control.h>
    30 #include <wine/obj_shellfolder.h>
    31 #include <wine/obj_shelllink.h>
    32 #include <wine/obj_contextmenu.h>
    33 #include <wine/obj_commdlgbrowser.h>
    34 #include <wine/obj_extracticon.h>
    35 #include <wine/obj_shellextinit.h>
    36 #include <wine/obj_shellbrowser.h>
    37 #include <wine/obj_serviceprovider.h>
    38 #include <wine/unicode.h>
     24#include "wine/obj_oleview.h"
     25#include "wine/obj_dragdrop.h"
     26#include "wine/obj_inplace.h"
     27#include "wine/obj_control.h"
     28#include "wine/obj_shellfolder.h"
     29#include "wine/obj_shelllink.h"
     30#include "wine/obj_contextmenu.h"
     31#include "wine/obj_commdlgbrowser.h"
     32#include "wine/obj_extracticon.h"
     33#include "wine/obj_shellextinit.h"
     34#include "wine/obj_shellbrowser.h"
     35#include "wine/obj_serviceprovider.h"
     36#include "wine/unicode.h"
    3937
    4038#include <misc.h>

  • trunk/src/ddraw/clipper.cpp

    r21483 r21494  
    2020#include <memory.h>
    2121
    22 #ifndef CINTERFACE
    23 #define CINTERFACE 1
    24 #endif
     22#define CINTERFACE
    2523#include "ddraw2d.h"
    2624#include "clipper.h"

  • trunk/src/ddraw/ddclipper.cpp

    r21483 r21494  
    2020#include <stdio.h>
    2121
    22 #ifndef CINTERFACE
    23 #define CINTERFACE 1
    24 #endif
     22#define CINTERFACE
    2523#include "ddraw2d.h"
    2624#include "clipper.h"

  • trunk/src/ddraw/ddmain.cpp

    r21483 r21494  
    2323#include <stdio.h>
    2424
    25 #ifndef CINTERFACE
    26 #define CINTERFACE 1
    27 #endif
     25#define CINTERFACE
    2826#include "ddraw2d.h"
    2927#include "winerror.h"

  • trunk/src/ddraw/ddraw2d.cpp

    r21483 r21494  
    2222#include <winuser32.h>
    2323
    24 #ifndef CINTERFACE
    25 #define CINTERFACE 1
    26 #endif
     24#define CINTERFACE
    2725#define INITGUID
    2826#include "ddraw2d.h"

  • trunk/src/ddraw/ddraw3d.cpp

    r21483 r21494  
    2020#include <winbase.h>
    2121
    22 #ifndef CINTERFACE
    23 #define CINTERFACE 1
    24 #endif
     22#define CINTERFACE
    2523#include "ddraw2d.h"
    2624#include "clipper.h"

  • trunk/src/ddraw/new/ddraw.CPP

    r4970 r21494  
    1818#include <builtin.h>
    1919#define INITGUID
    20 #define ICOM_CINTERFACE 1
    2120#define CINTERFACE
    2221

  • trunk/src/ddraw/palette.cpp

    r21483 r21494  
    2121#include <memory.h>
    2222
    23 #ifndef CINTERFACE
    24 #define CINTERFACE 1
    25 #endif
     23#define CINTERFACE
    2624#include "ddraw2d.h"
    2725#include "clipper.h"

  • trunk/src/ddraw/surface.cpp

    r21483 r21494  
    2525#include <fourcc.h>
    2626
    27 #ifndef CINTERFACE
    28 #define CINTERFACE 1
    29 #endif
     27#define CINTERFACE
    3028#include "ddraw2d.h"
    3129#include "clipper.h"

  • trunk/src/ddraw/surfacehlp.cpp

    r21483 r21494  
    1313#include <fourcc.h>
    1414
    15 #ifndef CINTERFACE
    16 #define CINTERFACE 1
    17 #endif
     15#define CINTERFACE
    1816#include "ddraw2d.h"
    1917#include "clipper.h"

  • trunk/src/ddraw/surfblit.cpp

    r21483 r21494  
    2525#include <fourcc.h>
    2626
    27 #ifndef CINTERFACE
    28 #define CINTERFACE 1
    29 #endif
     27#define CINTERFACE
    3028#include "ddraw2d.h"
    3129#include "clipper.h"

  • trunk/src/ddraw/surfoverlay.cpp

    r21483 r21494  
    2525#include <fourcc.h>
    2626
    27 #ifndef CINTERFACE
    28 #define CINTERFACE 1
    29 #endif
     27#define CINTERFACE
    3028#include "ddraw2d.h"
    3129#include "clipper.h"

  • trunk/src/dplay/dplay.cpp

    r1118 r21494  
    1010#include <os2win.h>
    1111
    12 #define ICOM_CINTERFACE 1
    1312#define CINTERFACE
    14 
    1513
    1614#include "winerror.h"

  • trunk/src/guidlib/guid.c

    r10615 r21494  
    11/* $Id: guid.c,v 1.8 2004-07-06 16:57:30 sandervl Exp $ */
    2 #define ICOM_CINTERFACE 1
    32#include <odin.h>
    43
    5 #define CINTERFACE 1
     4#define CINTERFACE
    65#define INITGUID
    7 #include <wine\obj_oleview.h>
    8 #include "initguid.h"
     6#include "wine/obj_base.h"
    97
    108#include "shlwapi.h"
    … …  
    2321#include "wine/obj_clientserver.h"
    2422#include "wine/obj_cache.h"
    25 #include "wine\obj_oleaut.h"
    26 #include "wine\obj_olefont.h"
     23#include "wine/obj_oleaut.h"
     24#include "wine/obj_olefont.h"
    2725
    28 #include <wine/obj_oleview.h>
    29 #include <wine/obj_dragdrop.h>
    30 #include <wine/obj_inplace.h>
    31 #include <wine/obj_channel.h>
    32 #include <wine/obj_marshal.h>
    33 #include <wine/obj_control.h>
    34 #include <wine/obj_shellfolder.h>
    35 #include <wine/obj_shelllink.h>
    36 #include <wine/obj_contextmenu.h>
    37 #include <wine/obj_commdlgbrowser.h>
    38 #include <wine/obj_extracticon.h>
    39 #include <wine/obj_shellextinit.h>
    40 #include <wine/obj_shellbrowser.h>
    41 #include <wine/obj_serviceprovider.h>
    42 #include <wine/obj_queryassociations.h>
     26#include "wine/obj_oleview.h"
     27#include "wine/obj_dragdrop.h"
     28#include "wine/obj_inplace.h"
     29#include "wine/obj_channel.h"
     30#include "wine/obj_marshal.h"
     31#include "wine/obj_control.h"
     32#include "wine/obj_shellfolder.h"
     33#include "wine/obj_shelllink.h"
     34#include "wine/obj_contextmenu.h"
     35#include "wine/obj_commdlgbrowser.h"
     36#include "wine/obj_extracticon.h"
     37#include "wine/obj_shellextinit.h"
     38#include "wine/obj_shellbrowser.h"
     39#include "wine/obj_serviceprovider.h"
     40#include "wine/obj_queryassociations.h"
    4341#include "wine/obj_webbrowser.h"
    44 #include <wine/unicode.h>
    45 
     42#include "wine/unicode.h"
    4643
    4744#include <misc.h>

  • trunk/src/kernel32/test/Resources.cpp

    r1870 r21494  
    1212*   Defined Constants And Macros                                               *
    1313*******************************************************************************/
    14 //#define ICOM_CINTERFACE 0
    1514#ifdef __WATCOMC__
    1615    #define ENUMRESNAMEPROCW ENUMRESNAMEPROC

  • trunk/src/msvfw32/msvfw32.cpp

    r9140 r21494  
    99#include <odin.h>
    1010
    11 #define ICOM_CINTERFACE 1
     11#define ICOM_CINTERFACE
    1212////#define strcasecmp               strcmp
    1313

  • trunk/src/ole32/old/ole32.h

    r5601 r21494  
    1717#define NONAMELESSUNION
    1818// ><DJR 17.05.99 Force to use C-interfaces for now to prevent CALLBACK definition compiler error
    19 #define CINTERFACE 1
     19#define CINTERFACE
    2020
    2121// ><DJR 17.05.99 Move standard includes to before os2win.h [memcmp]
    … …  
    3737#endif
    3838#include <ole2ver.h>
    39 #include <ole.h>
    4039#include <ole2.h>
    4140#include <winreg.h>

  • trunk/src/ole32/ole32.h

    r5929 r21494  
    1717#define NONAMELESSUNION
    1818// ><DJR 17.05.99 Force to use C-interfaces for now to prevent CALLBACK definition compiler error
    19 #define CINTERFACE 1
     19#define CINTERFACE
    2020
    2121// ><DJR 17.05.99 Move standard includes to before os2win.h [memcmp]
    … …  
    3737#endif
    3838#include <ole2ver.h>
    39 #include <ole.h>
    4039#include <ole2.h>
    4140#include <winreg.h>

  • trunk/src/ole32/storage32.c

    r9400 r21494  
    2424 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    2525 */
     26
     27#include <assert.h>
     28#include <stdio.h>
     29#include <stdlib.h>
     30#include <string.h>
     31
     32#include "ole.h"
     33
    2634#ifdef __WIN32OS2__
    2735#include "ole32.h"
    2836#include "heapstring.h"
    2937#endif
    30 
    31 #include <assert.h>
    32 #include <stdio.h>
    33 #include <stdlib.h>
    34 #include <string.h>
    3538
    3639#include "winbase.h" /* for lstrlenW() and the likes */
    … …  
    72057208 * StgIsStorageFile [OLE32.146]
    72067209 */
    7207 HRESULT WINAPI 
    7208 StgIsStorageFile(LPCOLESTR fn) 
     7210HRESULT WINAPI
     7211StgIsStorageFile(LPCOLESTR fn)
    72097212{
    72107213    HRESULT ret;

  • trunk/src/ole32/stubs.cpp

    r10432 r21494  
    1313 */
    1414
     15#include "ole.h"
    1516#include "ole32.h"
    1617

  • trunk/src/oleaut32/dispatch.c

    r8450 r21494  
    2929
    3030#include "windef.h"
    31 #include "ole.h"
    3231#include "oleauto.h"
    3332#include "winerror.h"

  • trunk/src/oleaut32/oleaut32.h

    r8450 r21494  
    1414
    1515// ><DJR 17.05.99 Force to use C-interfaces for now to prevent CALLBACK definition compiler error
    16 #define CINTERFACE 1
     16#define CINTERFACE
    1717
    1818#include <odin.h>
    … …  
    3333
    3434#include <ole2ver.h>
    35 #include <ole.h>
    3635#include <winreg.h>
    3736

  • trunk/src/oledlg/oledlg.cpp

    r1710 r21494  
    1111
    1212// ><DJR 17.05.99 Force to use C-interfaces for now to prevent CALLBACK definition compiler error
    13 #define CINTERFACE 1
     13#define CINTERFACE
    1414
    1515// ><DJR 17.05.99 Move standard includes to before os2win.h [memcmp]

  • trunk/src/olepro32/olepro32.h

    r2842 r21494  
    1313
    1414// ><DJR 17.05.99 Force to use C-interfaces for now to prevent CALLBACK definition compiler error
    15 #define CINTERFACE 1
     15#define CINTERFACE
    1616
    1717#include <odin.h>
    … …  
    3333#include <os2win.h>
    3434#include <ole2ver.h>
    35 #include <ole.h>
    3635#include <winreg.h>
    3736

  • trunk/src/rpcrt4/rpcrt4.h

    r5472 r21494  
    88#define __ODIN_RPCRT4_H
    99
    10 #define CINTERFACE 1
     10#define CINTERFACE
    1111#define RPC_UNICODE_SUPPORTED   1
    1212

  • trunk/src/rsaenh/handle.c

    r21363 r21494  
    3939 *  init_handle_table
    4040 *
    41  * Initializes the HANDLETABLE structure pointed to by lpTable
    42  *
    43  * PARAMS
    44  *  lpTable [I] Pointer to the HANDLETABLE structure, which is to be initalized.
     41 * Initializes the HANDLETBL structure pointed to by lpTable
     42 *
     43 * PARAMS
     44 *  lpTable [I] Pointer to the HANDLETBL structure, which is to be initalized.
    4545 *
    4646 * NOTES
    4747 *  Note that alloc_handle_table calls init_handle_table on it's own, which
    4848 *  means that you only have to call init_handle_table, if you use a global
    49  *  variable of type HANDLETABLE for your handle table. However, in this
     49 *  variable of type HANDLETBL for your handle table. However, in this
    5050 *  case you have to call destroy_handle_table when you don't need the table
    5151 *  any more.
    5252 */
    53 void init_handle_table(HANDLETABLE *lpTable)
     53void init_handle_table(HANDLETBL *lpTable)
    5454{
    5555    TRACE("(lpTable=%p)\n", lpTable);
    … …  
    5959    lpTable->iFirstFree = 0;
    6060    InitializeCriticalSection(&lpTable->mutex);
    61     //lpTable->mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": HANDLETABLE.mutex");
     61    //lpTable->mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": HANDLETBL.mutex");
    6262}
    6363
    … …  
    7373 *  Note that release_handle_table takes care of this.
    7474 */
    75 void destroy_handle_table(HANDLETABLE *lpTable)
     75void destroy_handle_table(HANDLETBL *lpTable)
    7676{
    7777    TRACE("(lpTable=%p)\n", lpTable);
    … …  
    9797 *  zero,      if handle is not valid.
    9898 */
    99 int is_valid_handle(HANDLETABLE *lpTable, HCRYPTKEY handle, DWORD dwType)
     99int is_valid_handle(HANDLETBL *lpTable, HCRYPTKEY handle, DWORD dwType)
    100100{
    101101    unsigned int index = HANDLE2INDEX(handle);
    … …  
    133133 *  lpTable [I] The table of which all valid handles shall be released.
    134134 */
    135 static void release_all_handles(HANDLETABLE *lpTable)
     135static void release_all_handles(HANDLETBL *lpTable)
    136136{
    137137    unsigned int i;
    … …  
    160160 * NOTES
    161161 *  If all you need is a single handle table, you may as well declare a global
    162  *  variable of type HANDLETABLE and call init_handle_table on your own.
    163  */
    164 int alloc_handle_table(HANDLETABLE **lplpTable)
     162 *  variable of type HANDLETBL and call init_handle_table on your own.
     163 */
     164int alloc_handle_table(HANDLETBL **lplpTable)
    165165{
    166166    TRACE("(lplpTable=%p)\n", lplpTable);
    167167       
    168     *lplpTable = HeapAlloc(GetProcessHeap(), 0, sizeof(HANDLETABLE));
     168    *lplpTable = HeapAlloc(GetProcessHeap(), 0, sizeof(HANDLETBL));
    169169    if (*lplpTable)
    170170    {
    … …  
    191191 *   All valid handles still in the table are released also.
    192192 */
    193 int release_handle_table(HANDLETABLE *lpTable)
     193int release_handle_table(HANDLETBL *lpTable)
    194194{
    195195    TRACE("(lpTable=%p)\n", lpTable);
    … …  
    215215 *  This is a support function for alloc_handle. Do not call!
    216216 */
    217 static int grow_handle_table(HANDLETABLE *lpTable)
    218 {
    219     HANDLETABLEENTRY *newEntries;
     217static int grow_handle_table(HANDLETBL *lpTable)
     218{
     219    HANDLETBLENTRY *newEntries;
    220220    unsigned int i, newIEntries;
    221221
    222222    newIEntries = lpTable->iEntries + TABLE_SIZE_INCREMENT;
    223223
    224     newEntries = HeapAlloc(GetProcessHeap(), 0, sizeof(HANDLETABLEENTRY)*newIEntries);
     224    newEntries = HeapAlloc(GetProcessHeap(), 0, sizeof(HANDLETBLENTRY)*newIEntries);
    225225    if (!newEntries)
    226226        return 0;
    … …  
    228228    if (lpTable->paEntries)
    229229    {
    230         memcpy(newEntries, lpTable->paEntries, sizeof(HANDLETABLEENTRY)*lpTable->iEntries);
     230        memcpy(newEntries, lpTable->paEntries, sizeof(HANDLETBLENTRY)*lpTable->iEntries);
    231231        HeapFree(GetProcessHeap(), 0, lpTable->paEntries);
    232232    }
    … …  
    260260 *  zero,      if not successful (no free handle)
    261261 */
    262 static int alloc_handle(HANDLETABLE *lpTable, OBJECTHDR *lpObject, HCRYPTKEY *lpHandle)
     262static int alloc_handle(HANDLETBL *lpTable, OBJECTHDR *lpObject, HCRYPTKEY *lpHandle)
    263263{
    264264    int ret = 0;
    … …  
    307307 *  zero,      if not successful (invalid handle)
    308308 */
    309 int release_handle(HANDLETABLE *lpTable, HCRYPTKEY handle, DWORD dwType)
     309int release_handle(HANDLETBL *lpTable, HCRYPTKEY handle, DWORD dwType)
    310310{
    311311    unsigned int index = HANDLE2INDEX(handle);
    … …  
    352352 *  zero,      if not successful (invalid handle)
    353353 */
    354 int lookup_handle(HANDLETABLE *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject)
     354int lookup_handle(HANDLETBL *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject)
    355355{
    356356    int ret = 0;
    … …  
    387387 *  zero,      if not successful (invalid handle or out of memory)
    388388 */
    389 int copy_handle(HANDLETABLE *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy)
     389int copy_handle(HANDLETBL *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy)
    390390{
    391391    OBJECTHDR *pObject;
    … …  
    430430 *  a handle to the new object,  if successful.
    431431 */
    432 HCRYPTKEY new_object(HANDLETABLE *lpTable, size_t cbSize, DWORD dwType, DESTRUCTOR destructor,
     432HCRYPTKEY new_object(HANDLETBL *lpTable, size_t cbSize, DWORD dwType, DESTRUCTOR destructor,
    433433                        OBJECTHDR **ppObject)
    434434{

  • trunk/src/rsaenh/handle.h

    r21363 r21494  
    4343};
    4444
    45 typedef struct tagHANDLETABLEENTRY
     45typedef struct tagHANDLETBLENTRY
    4646{
    4747    OBJECTHDR    *pObject;
    4848    unsigned int iNextFree;
    49 } HANDLETABLEENTRY;
     49} HANDLETBLENTRY;
    5050
    51 typedef struct tagHANDLETABLE
     51typedef struct tagHANDLETBL
    5252{
    5353    unsigned int     iEntries;
    5454    unsigned int     iFirstFree;
    55     HANDLETABLEENTRY *paEntries;
     55    HANDLETBLENTRY *paEntries;
    5656    CRITICAL_SECTION mutex;
    57 } HANDLETABLE;
     57} HANDLETBL;
    5858
    59 int  alloc_handle_table  (HANDLETABLE **lplpTable);
    60 void init_handle_table   (HANDLETABLE *lpTable);
    61 int  release_handle_table(HANDLETABLE *lpTable);
    62 void destroy_handle_table(HANDLETABLE *lpTable);
    63 int  release_handle      (HANDLETABLE *lpTable, HCRYPTKEY handle, DWORD dwType);
    64 int  copy_handle         (HANDLETABLE *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy);
    65 int  lookup_handle       (HANDLETABLE *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject);
    66 int  is_valid_handle     (HANDLETABLE *lpTable, HCRYPTKEY handle, DWORD dwType);
     59int  alloc_handle_table  (HANDLETBL **lplpTable);
     60void init_handle_table   (HANDLETBL *lpTable);
     61int  release_handle_table(HANDLETBL *lpTable);
     62void destroy_handle_table(HANDLETBL *lpTable);
     63int  release_handle      (HANDLETBL *lpTable, HCRYPTKEY handle, DWORD dwType);
     64int  copy_handle         (HANDLETBL *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy);
     65int  lookup_handle       (HANDLETBL *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject);
     66int  is_valid_handle     (HANDLETBL *lpTable, HCRYPTKEY handle, DWORD dwType);
    6767
    68 HCRYPTKEY new_object     (HANDLETABLE *lpTable, size_t cbSize, DWORD dwType, DESTRUCTOR destructor,
    69                            OBJECTHDR **ppObject);
    70        
     68HCRYPTKEY new_object     (HANDLETBL *lpTable, size_t cbSize, DWORD dwType, DESTRUCTOR destructor,
     69                          OBJECTHDR **ppObject);
     70
    7171#ifdef __cplusplus
    7272}

  • trunk/src/rsaenh/rsaenh.c

    r21363 r21494  
    348348 * CSP's handle table (used by all acquired key containers)
    349349 */
    350 static HANDLETABLE handle_table;
     350static HANDLETBL handle_table;
    351351
    352352/******************************************************************************

  • trunk/src/rsaenh/rsaenh.def

    r21363 r21494  
    4444_MD4Init@4 = ADVAPI32.504
    4545_MD5Init@4 = ADVAPI32.507
    46 wsnprintfA = USER32.2100
     46_wsnprintfA = USER32.2100
    4747_SystemFunction036@8 = ADVAPI32.402

  • trunk/src/rsaenh/tomcrypt.h

    r21422 r21494  
    4646    int hi;
    4747} __long_long;
     48
     49#ifdef __int64
     50#undef __int64
     51#endif
    4852#define __int64 __long_long
    4953

  • trunk/src/shdocvw/shdocvw_main.c

    r10614 r21494  
    77#include "debugtools.h"
    88
    9 #include "initguid.h"
     9#define INITGUID
    1010#include "ole2.h"
    1111#include "shlwapi.h"

  • trunk/src/shell32/changenotify.c

    r9805 r21494  
    2020 */
    2121#ifdef __WIN32OS2__
    22 #define ICOM_CINTERFACE 1
     22#define CINTERFACE
    2323#include <odin.h>
    2424#endif

  • trunk/src/shell32/classes.c

    r8048 r21494  
    77 */
    88#ifdef __WIN32OS2__
    9 #define ICOM_CINTERFACE 1
     9#define CINTERFACE
    1010#include <odin.h>
    1111#endif

  • trunk/src/shell32/clipboard.c

    r8614 r21494  
    2121 */
    2222#ifdef __WIN32OS2__
    23 #define ICOM_CINTERFACE 1
     23#define CINTERFACE
    2424#include <odin.h>
    2525#endif

  • trunk/src/shell32/dataobject.c

    r8614 r21494  
    88 */
    99#ifdef __WIN32OS2__
    10 #define ICOM_CINTERFACE 1
     10#define CINTERFACE
    1111#include <odin.h>
    1212#endif

  • trunk/src/shell32/dbgwrap.cpp

    r21464 r21494  
    1212#include <heapstring.h>
    1313
    14 #define ICOM_CINTERFACE 1
    15 #define CINTERFACE 1
     14#define CINTERFACE
    1615
    1716//#define NO_SHLWAPI_STREAM

  • trunk/src/shell32/enumidlist.c

    r10185 r21494  
    66 */
    77#ifdef __WIN32OS2__
    8 #define ICOM_CINTERFACE 1
     8#define CINTERFACE
    99#include <odin.h>
    1010#endif

  • trunk/src/shell32/folders.c

    r8614 r21494  
    66 */
    77#ifdef __WIN32OS2__
    8 #define ICOM_CINTERFACE 1
     8#define CINTERFACE
    99#include <odin.h>
    1010#include "shellicon.h"

  • trunk/src/shell32/iconcache.c

    r10347 r21494  
    55 */
    66#ifdef __WIN32OS2__
    7 #define ICOM_CINTERFACE 1
     7#define CINTERFACE
    88#include <odin.h>
    99#endif

  • trunk/src/shell32/misc.cpp

    r8614 r21494  
    2222#include <wcstr.h>
    2323
    24 #define ICOM_CINTERFACE 1
     24#define CINTERFACE
    2525
    2626//#include <os2win.h>

  • trunk/src/shell32/sh.cpp

    r10314 r21494  
    2525#include <string.h>
    2626
    27 #define ICOM_CINTERFACE 1
     27#define CINTERFACE
    2828#include "shell32_main.h"
    2929#include <win\shlobj.h>

  • trunk/src/shell32/she.cpp

    r7904 r21494  
    2525
    2626
    27 #define ICOM_CINTERFACE 1
     27#define CINTERFACE
    2828#include "shell32_main.h"
    2929

  • trunk/src/shell32/shell.c

    r8048 r21494  
    66 */
    77#ifdef __WIN32OS2__
    8 #define ICOM_CINTERFACE 1
     8#define CINTERFACE
    99#include <odin.h>
    1010#endif

  • trunk/src/shell32/shell32_main.c

    r21464 r21494  
    77 */
    88#ifdef __WIN32OS2__
    9 #define ICOM_CINTERFACE 1
     9#define CINTERFACE
    1010#include <odin.h>
    1111#endif

  • trunk/src/shell32/shell32_odin.cpp

    r8614 r21494  
    2525#include <string.h>
    2626
    27 #define ICOM_CINTERFACE 1
    28 #define CINTERFACE 1
     27#define CINTERFACE
    2928
    3029#include "winerror.h"

  • trunk/src/shell32/shellstub.cpp

    r10259 r21494  
    2222#include <odin.h>
    2323
    24 #define ICOM_CINTERFACE 1
    25 #define CINTERFACE 1
     24#define CINTERFACE
    2625
    2726#include "debugtools.h"

  • trunk/src/shlwapi/ordinal_odin.cpp

    r8584 r21494  
    4343#include <winuser.h>
    4444
    45 
    46 #define ICOM_CINTERFACE 1
    47 #define CINTERFACE 1
     45#define CINTERFACE
    4846
    4947#include "winerror.h"

  • trunk/src/shlwapi/shlstub.cpp

    r7900 r21494  
    1919#include <odin.h>
    2020
    21 #define ICOM_CINTERFACE 1
    22 #define CINTERFACE 1
     21#define CINTERFACE
    2322
    2423#include "debugtools.h"

  • trunk/src/shlwapi/shlwapi.cpp

    r7820 r21494  
    2929#include <odin.h>
    3030
    31 #define ICOM_CINTERFACE 1
    32 #define CINTERFACE 1
     31#define CINTERFACE
    3332
    3433#include "debugtools.h"

  • trunk/src/shlwapi/string_odin.cpp

    r8584 r21494  
    4747#include <winuser.h>
    4848
    49 
    50 #define ICOM_CINTERFACE 1
    51 #define CINTERFACE 1
     49#define CINTERFACE
    5250
    5351#include "winerror.h"

  • trunk/src/wintrust/wintrust.cpp

    r7624 r21494  
    55 *
    66 */
    7 #define ICOM_CINTERFACE 1
    87#define CINTERFACE
    98
Note: See TracChangeset for help on using the changeset viewer.