Changeset 633 for trunk/src


Ignore:
Timestamp:
Aug 23, 1999, 12:09:56 AM (26 years ago)
Author:
sandervl
Message:

Changes for updated Wine headers (NOT TESTED..)

Location:
trunk/src/ole32
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/ole32/guid.cpp

    r291 r633  
    1 /*
    2  *
    3  * Project Odin Software License can be found in LICENSE.TXT
    4  *
    5  */
    61/*
    72 * Concrete defintions of all IID's
    … …  
    116 * Copyright 1999 David J. Raison
    127 *
     8 *
     9 * Project Odin Software License can be found in LICENSE.TXT
     10 *
    1311 */
    1412
    1513// This causes all the DEFINE_GUID macros to instantiate their GUID's
    16 #define INITGUID 1
     14#define INITGUID
    1715
    1816#include "ole32.h"

  • trunk/src/ole32/moniker.cpp

    r291 r633  
    146146    * ppvObject = 0;
    147147
    148     if (IsEqualIID(IID_IUnknown, riid))
     148    if (IsEqualIID(&IID_IUnknown, &riid))
    149149        * ppvObject = (IRunningObjectTable * )This;
    150150    else
    151         if (IsEqualIID(IID_IRunningObjectTable, riid))
     151        if (IsEqualIID(&IID_IRunningObjectTable, &riid))
    152152            * ppvObject = (IRunningObjectTable * )This;
    153153
    … …  
    426426// GetRunningObjectTable
    427427// ----------------------------------------------------------------------
    428 HRESULT WIN32API GetRunningObjectTable(DWORD reserved, LPVOID *pprot)
     428HRESULT WIN32API GetRunningObjectTable(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot)
    429429{
    430430    IID         riid = IID_IRunningObjectTable;

  • trunk/src/ole32/ole32.cpp

    r291 r633  
    505505    {
    506506        // Check if we have a match on the class ID.
    507         if (IsEqualGUID(curClass->classIdentifier, rclsid))
     507        if (IsEqualGUID(&curClass->classIdentifier, &rclsid))
    508508        {
    509509            // Since we don't do out-of process or DCOM just right away,

  • trunk/src/ole32/ole32.h

    r290 r633  
    2828#include <win/wtypes.h>
    2929#include <winbase.h>
    30 #include <uconv.h>
     30//#include <uconv.h>
    3131#undef CALLCONV
    3232

  • trunk/src/ole32/stubs.cpp

    r291 r633  
    1 /*
    2  *
    3  * Project Odin Software License can be found in LICENSE.TXT
    4  *
    5  */
    61/*
    72 * Win32 COM/OLE stubs for OS/2
    … …  
    116 * Copyright 1999 David J. Raison
    127 * Copyright 1998 Sander van Leeuwen
     8 *
     9 *
     10 * Project Odin Software License can be found in LICENSE.TXT
    1311 *
    1412 */
Note: See TracChangeset for help on using the changeset viewer.