Changeset 8450 for trunk/src


Ignore:
Timestamp:
May 17, 2002, 12:18:06 PM (23 years ago)
Author:
sandervl
Message:

Wine resync

Location:
trunk/src/oleaut32
Files:
3 added
5 deleted
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/oleaut32/LICENSE.TXT

    r6379 r8450  
    1 $Id: LICENSE.TXT,v 1.2 2001-07-21 08:48:50 sandervl Exp $
    2 @c This is an additional Odin license agreement.
    3 @c It supercedes the main Odin license, but is only valid in
    4 @c the source directory in which it is present.
     1$Id: LICENSE.TXT,v 1.3 2002-05-17 10:16:57 sandervl Exp $
     2This is an additional Odin license agreement.
     3It supercedes the main Odin license, but is only valid in
     4the source directory in which it is present.
    55
    6 @c This file is processed by GNU's TeXinfo
    7 @c If you modify it or move it to another location, make sure that
    8 @c TeXinfo works (type `make' in directory documentation).
    9 
    10 Copyright (c) 1993-2000 the Wine project authors (see the file AUTHORS
     6Copyright (c) 1993-2002 the Wine project authors (see the file AUTHORS
    117for a complete list)
    128
    13 Permission is hereby granted, free of charge, to any person obtaining a copy
    14 of this software and associated documentation files (the "Software"), to deal
    15 in the Software without restriction, including without limitation the rights
    16 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
    17 copies of the Software, and to permit persons to whom the Software is
    18 furnished to do so, subject to the following conditions:
     9Wine is free software; you can redistribute it and/or modify it under
     10the terms of the GNU Lesser General Public License as published by the
     11Free Software Foundation; either version 2.1 of the License, or (at
     12your option) any later version.
    1913
    20 The above copyright notice and this permission notice shall be included in
    21 all copies or substantial portions of the Software.
     14This program is distributed in the hope that it will be useful, but
     15WITHOUT ANY WARRANTY; without even the implied warranty of
     16MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     17Lesser General Public License for more details.
    2218
    23 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    24 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    25 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
    26 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
    27 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
    28 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     19A copy of the GNU Lesser General Public License is included in the
     20Wine distribution in the file COPYING.LIB. If you did not receive this
     21copy, write to the Free Software Foundation, Inc., 59 Temple Place,
     22Suite 330, Boston, MA 02111-1307 USA.

  • trunk/src/oleaut32/connpt.c

    r6711 r8450  
    44 * Copyright 2000 Huw D M Davies for CodeWeavers
    55 *
     6 * This library is free software; you can redistribute it and/or
     7 * modify it under the terms of the GNU Lesser General Public
     8 * License as published by the Free Software Foundation; either
     9 * version 2.1 of the License, or (at your option) any later version.
     10 *
     11 * This library is distributed in the hope that it will be useful,
     12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     14 * Lesser General Public License for more details.
     15 *
     16 * You should have received a copy of the GNU Lesser General Public
     17 * License along with this library; if not, write to the Free Software
     18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
     19 *
     20 * NOTES:
    621 * See one exported function here is CreateConnectionPoint, see
    722 * comments just above that function for information.
    823 */
    9 
    1024#ifdef __WIN32OS2__
    1125#define HAVE_FLOAT_H
    1226#define WINE_LARGE_INTEGER
    1327#include "oleaut32.h"
     28
    1429#endif
    1530
    1631#include <assert.h>
     32#include <string.h>
    1733#include "winerror.h"
    1834#include "winbase.h"
    … …  
    2541#include "connpt.h"
    2642
    27 #include "debugtools.h"
    28 
    29 DEFAULT_DEBUG_CHANNEL(ole);
     43#include "wine/debug.h"
     44
     45WINE_DEFAULT_DEBUG_CHANNEL(ole);
    3046
    3147#define MAXSINKS 10

  • trunk/src/oleaut32/connpt.h

    r4837 r8450  
     1/*
     2 * Copyright 2000 Huw D M Davies for CodeWeavers
     3 *
     4 * This library is free software; you can redistribute it and/or
     5 * modify it under the terms of the GNU Lesser General Public
     6 * License as published by the Free Software Foundation; either
     7 * version 2.1 of the License, or (at your option) any later version.
     8 *
     9 * This library is distributed in the hope that it will be useful,
     10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     12 * Lesser General Public License for more details.
     13 *
     14 * You should have received a copy of the GNU Lesser General Public
     15 * License along with this library; if not, write to the Free Software
     16 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
     17 */
     18
    119#ifndef _CONNPT_H
    220#define _CONNPT_H

  • trunk/src/oleaut32/dbgwrap.cpp

    r7919 r8450  
    33#include <os2sel.h>
    44
    5 #include <os2win.h>
    6 #include <winreg.h>
    7 #include <winnt.h>
    8 #include <wincon.h>
    9 #include <winthunk.h>
    10 #include <winnls.h>
    11 #include <ntddk.h>
    12 #include <heapstring.h>
    135#include "oleaut32.h"
    146#include "wine/obj_errorinfo.h"

  • trunk/src/oleaut32/dispatch.c

    r6944 r8450  
    44 * Copyright 2000  Francois Jacques, Macadamian Technologies Inc.
    55 *
    6  * ---
     6 * This library is free software; you can redistribute it and/or
     7 * modify it under the terms of the GNU Lesser General Public
     8 * License as published by the Free Software Foundation; either
     9 * version 2.1 of the License, or (at your option) any later version.
     10 *
     11 * This library is distributed in the hope that it will be useful,
     12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     14 * Lesser General Public License for more details.
     15 *
     16 * You should have received a copy of the GNU Lesser General Public
     17 * License along with this library; if not, write to the Free Software
     18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    719 *
    820 * TODO: Type coercion is implemented in variant.c but not called yet.
    … …  
    2537#include "wine/obj_oleaut.h"
    2638
    27 #include "debugtools.h"
     39#include "wine/debug.h"
    2840
    29 DEFAULT_DEBUG_CHANNEL(ole);
    30 DECLARE_DEBUG_CHANNEL(typelib);
     41WINE_DEFAULT_DEBUG_CHANNEL(ole);
     42WINE_DECLARE_DEBUG_CHANNEL(typelib);
    3143
    3244

  • trunk/src/oleaut32/makefile

    r8446 r8450  
    1 # $Id: makefile,v 1.33 2002-05-16 19:35:14 sandervl Exp $
     1# $Id: makefile,v 1.34 2002-05-17 10:16:58 sandervl Exp $
    22
    33#
    … …  
    2222#
    2323OBJS = \
    24 $(OBJDIR)\oleaut32.obj \
    2524$(OBJDIR)\oleaut.obj \
    26 $(OBJDIR)\oList.obj \
    27 $(OBJDIR)\initterm.obj \
    2825$(OBJDIR)\olefont.obj \
    2926$(OBJDIR)\variant.obj \
    … …  
    3229$(OBJDIR)\olepicture.obj \
    3330$(OBJDIR)\asmutil.obj \
    34 #$(OBJDIR)\iPicture.obj \
    35 #$(OBJDIR)\iPictureNone.obj \
    36 #$(OBJDIR)\iPictureBmp.obj \
    37 #$(OBJDIR)\iPictureMeta.obj \
    38 #$(OBJDIR)\iPictureIcon.obj \
    39 #$(OBJDIR)\iPictureEmf.obj \
    4031$(OBJDIR)\typelib.obj \
    4132$(OBJDIR)\tmarshal.obj \
    42 #$(OBJDIR)\itypelib.obj \
    43 #$(OBJDIR)\itypecomp.obj \
    44 #$(OBJDIR)\itypeinfo.obj \
    4533$(OBJDIR)\hash.obj \
    4634$(OBJDIR)\safearray.obj \
    … …  
    5139$(OBJDIR)\dbgwrap.obj \
    5240!endif
     41$(DLLENTRY) \
    5342$(OBJDIR)\oleaut32rsrc.obj
    5443
    … …  
    6655$(ODIN32_LIB)/guidlib.lib \
    6756$(ODIN32_LIB)/$(ODINCRT).lib \
    68 $(ODIN32_LIB)/pmwinx.lib \
    6957OS2386.LIB \
    7058$(RTLLIB_O)

  • trunk/src/oleaut32/ole2disp.c

    r6711 r8450  
    33 *
    44 *      Copyright 1995  Martin von Loewis
    5  */
    6 #ifdef __WIN32OS2__
    7 #define HAVE_FLOAT_H
    8 #define WINE_LARGE_INTEGER
    9 #include "oleaut32.h"
    10 #endif
     5 *
     6 * This library is free software; you can redistribute it and/or
     7 * modify it under the terms of the GNU Lesser General Public
     8 * License as published by the Free Software Foundation; either
     9 * version 2.1 of the License, or (at your option) any later version.
     10 *
     11 * This library is distributed in the hope that it will be useful,
     12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     14 * Lesser General Public License for more details.
     15 *
     16 * You should have received a copy of the GNU Lesser General Public
     17 * License along with this library; if not, write to the Free Software
     18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
     19 */
     20
     21#include "config.h"
     22
    1123#include <string.h>
    1224
     25#include "wine/windef16.h"
     26#include "ole2.h"
     27#include "oleauto.h"
    1328#include "windef.h"
    1429#include "winbase.h"
     30#include "winerror.h"
    1531#include "wingdi.h"
    1632#include "winuser.h"
    17 #include "winerror.h"
    18 #include "wine/windef16.h"
    19 #include "ole2.h"
     33
     34#include "ole2disp.h"
    2035#include "olectl.h"
    21 #include "oleauto.h"
    22 #include "heap.h"
    23 #include "debugtools.h"
    24 
    25 DEFAULT_DEBUG_CHANNEL(ole);
    26 
    27 #ifndef __WIN32OS2__
     36
     37#include "wine/debug.h"
     38
     39WINE_DEFAULT_DEBUG_CHANNEL(ole);
     40
    2841/* This implementation of the BSTR API is 16-bit only. It
    2942   represents BSTR as a 16:16 far pointer, and the strings
    … …  
    3548static BSTR16 BSTR_AllocBytes(int n)
    3649{
    37     void *ptr = SEGPTR_ALLOC(n);
    38     return (BSTR16)SEGPTR_GET(ptr);
     50    void *ptr = HeapAlloc( GetProcessHeap(), 0, n );
     51    return (BSTR16)MapLS(ptr);
    3952}
    4053
    … …  
    4457static void BSTR_Free(BSTR16 in)
    4558{
    46     SEGPTR_FREE( MapSL((SEGPTR)in) );
     59    void *ptr = MapSL( (SEGPTR)in );
     60    UnMapLS( (SEGPTR)in );
     61    HeapFree( GetProcessHeap(), 0, ptr );
    4762}
    4863
    … …  
    5671
    5772/******************************************************************************
    58  *              SysAllocString16        [OLE2DISP.2]
     73 *              SysAllocString  [OLE2DISP.2]
    5974 */
    6075BSTR16 WINAPI SysAllocString16(LPCOLESTR16 in)
    … …  
    6580   
    6681        out = BSTR_AllocBytes(strlen(in)+1);
    67         if(!out)return 0;
     82        if (!out) return 0;
    6883        strcpy(BSTR_GetAddr(out),in);
    6984        return out;
    7085}
    71 #endif
    7286
    7387/******************************************************************************
    7488 *              SysAllocString  [OLEAUT32.2]
     89 *
     90 * MSDN (October 2001) states that this returns a NULL value if the argument
     91 * is a zero-length string.  This does not appear to be true; certainly it
     92 * returns a value under Win98 (Oleaut32.dll Ver 2.40.4515.0)
    7593 */
    7694BSTR WINAPI SysAllocString(LPCOLESTR in)
    … …  
    82100}
    83101
    84 #ifndef __WIN32OS2__
    85 /******************************************************************************
    86  *              SysReAllocString16      [OLE2DISP.3]
     102/******************************************************************************
     103 *              SysReallocString        [OLE2DISP.3]
    87104 */
    88105INT16 WINAPI SysReAllocString16(LPBSTR16 old,LPCOLESTR16 in)
    … …  
    93110        return 1;
    94111}
    95 #endif
    96112
    97113/******************************************************************************
    … …  
    120136}
    121137
    122 #ifndef __WIN32OS2__
    123 /******************************************************************************
    124  *              SysAllocStringLen16     [OLE2DISP.4]
     138/******************************************************************************
     139 *              SysAllocStringLen       [OLE2DISP.4]
    125140 */
    126141BSTR16 WINAPI SysAllocStringLen16(const char *in, int len)
    … …  
    143158        return out;
    144159}
    145 #endif
    146160
    147161/******************************************************************************
    … …  
    212226}
    213227
    214 #ifndef __WIN32OS2__
    215 /******************************************************************************
    216  *              SysReAllocStringLen16   [OLE2DISP.5]
     228/******************************************************************************
     229 *              SysReAllocStringLen     [OLE2DISP.5]
    217230 */
    218231int WINAPI SysReAllocStringLen16(BSTR16 *old,const char *in,int len)
    … …  
    223236        return 1;
    224237}
    225 #endif
    226238
    227239 
    … …  
    251263}
    252264
    253 #ifndef __WIN32OS2__
    254 /******************************************************************************
    255  *              SysFreeString16 [OLE2DISP.6]
     265/******************************************************************************
     266 *              SysFreeString   [OLE2DISP.6]
    256267 */
    257268void WINAPI SysFreeString16(BSTR16 in)
    … …  
    259270        BSTR_Free(in);
    260271}
    261 #endif
    262272
    263273/******************************************************************************
    … …  
    281291
    282292    /*
    283      * Free the memory from it's "real" origin.
     293     * Free the memory from its "real" origin.
    284294     */
    285295    HeapFree(GetProcessHeap(), 0, bufferPointer);
    286296}
    287297
    288 #ifndef __WIN32OS2__
    289 /******************************************************************************
    290  *              SysStringLen16  [OLE2DISP.7]
     298/******************************************************************************
     299 *              SysStringLen    [OLE2DISP.7]
    291300 */
    292301int WINAPI SysStringLen16(BSTR16 str)
    … …  
    294303        return strlen(BSTR_GetAddr(str));
    295304}
    296 #endif
    297305
    298306/******************************************************************************
    … …  
    344352}
    345353
    346 #ifndef __WIN32OS2__
    347 /******************************************************************************
    348  * CreateDispTypeInfo16 [OLE2DISP.31]
     354/******************************************************************************
     355 * CreateDispTypeInfo [OLEAUT32.31]
     356 */
     357HRESULT WINAPI CreateDispTypeInfo(
     358        INTERFACEDATA *pidata,
     359        LCID lcid,
     360        ITypeInfo **pptinfo)
     361{
     362        FIXME("(%p,%ld,%p),stub\n",pidata,lcid,pptinfo);
     363        return 0;
     364}
     365
     366/******************************************************************************
     367 * CreateDispTypeInfo [OLE2DISP.31]
    349368 */
    350369HRESULT WINAPI CreateDispTypeInfo16(
    … …  
    354373{
    355374        FIXME("(%p,%ld,%p),stub\n",pidata,lcid,pptinfo);
    356         return 0;
    357 }
    358 #endif
    359 
    360 /******************************************************************************
    361  * CreateDispTypeInfo [OLE2DISP.31]
    362  */
    363 HRESULT WINAPI CreateDispTypeInfo(
    364         INTERFACEDATA *pidata,
    365         LCID lcid,
    366         ITypeInfo **pptinfo)
    367 {
    368         FIXME("(%p,%ld,%p),stub\n",pidata,lcid,pptinfo);
    369         return 0;
    370 }
    371 
    372 #ifndef __WIN32OS2__
    373 /******************************************************************************
    374  * CreateStdDispatch16 [OLE2DISP.32]
     375        return E_NOTIMPL;
     376}
     377
     378/******************************************************************************
     379 * CreateStdDispatch [OLE2DISP.32]
    375380 */
    376381HRESULT WINAPI CreateStdDispatch16(
    … …  
    384389        return 0;
    385390}
    386 #endif
    387 
    388 /******************************************************************************
    389  * CreateStdDispatch [OLE2DISP.32]
     391
     392/******************************************************************************
     393 * CreateStdDispatch [OLEAUT32.32]
    390394 */
    391395HRESULT WINAPI CreateStdDispatch(
    … …  
    397401        FIXME("(%p,%p,%p,%p),stub\n",punkOuter, pvThis, ptinfo,
    398402               ppunkStdDisp);
    399         return 0;
    400 }
    401 
    402 #ifndef __WIN32OS2__
     403        return E_NOTIMPL;
     404}
     405
    403406/******************************************************************************
    404407 * RegisterActiveObject [OLE2DISP.35]
    … …  
    408411) {
    409412        FIXME("(%p,%s,0x%08lx,%p):stub\n",punk,debugstr_guid(rclsid),dwFlags,pdwRegister);
    410         return 0;
    411 }
    412 #endif
     413        return E_NOTIMPL;
     414}
    413415
    414416/******************************************************************************
    … …  
    504506    /*
    505507     * Allocate a new buffer to hold the string.
    506      * dont't forget to keep an empty spot at the begining of the
     508     * dont't forget to keep an empty spot at the beginning of the
    507509     * buffer for the character count and an extra character at the
    508510     * end for the NULL.

  • trunk/src/oleaut32/ole2disp.h

    r6504 r8450  
     1/*
     2 * Copyright 1995 Martin von Loewis
     3 *
     4 * This library is free software; you can redistribute it and/or
     5 * modify it under the terms of the GNU Lesser General Public
     6 * License as published by the Free Software Foundation; either
     7 * version 2.1 of the License, or (at your option) any later version.
     8 *
     9 * This library is distributed in the hope that it will be useful,
     10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     12 * Lesser General Public License for more details.
     13 *
     14 * You should have received a copy of the GNU Lesser General Public
     15 * License along with this library; if not, write to the Free Software
     16 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
     17 */
     18
    119#ifndef __WINE_OLEAUT32_OLE2DISP_H
    220#define __WINE_OLEAUT32_OLE2DISP_H
    321
    422#include "wtypes.h"
     23#include "wine/windef16.h"
    524
    625BSTR16 WINAPI SysAllocString16(LPCOLESTR16);

  • trunk/src/oleaut32/oleaut.c

    r7916 r8450  
    22 *      OLEAUT32
    33 *
     4 * Copyright 1999, 2000 Marcus Meissner
     5 *
     6 * This library is free software; you can redistribute it and/or
     7 * modify it under the terms of the GNU Lesser General Public
     8 * License as published by the Free Software Foundation; either
     9 * version 2.1 of the License, or (at your option) any later version.
     10 *
     11 * This library is distributed in the hope that it will be useful,
     12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     14 * Lesser General Public License for more details.
     15 *
     16 * You should have received a copy of the GNU Lesser General Public
     17 * License along with this library; if not, write to the Free Software
     18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    419 */
    520#ifdef __WIN32OS2__
    … …  
    722#define WINE_LARGE_INTEGER
    823#include "oleaut32.h"
     24
    925#endif
    1026
    … …  
    2440#include "tmarshal.h"
    2541
    26 #include "debugtools.h"
    27 
    28 DEFAULT_DEBUG_CHANNEL(ole);
     42#include "wine/debug.h"
     43
     44WINE_DEFAULT_DEBUG_CHANNEL(ole);
    2945
    3046static WCHAR    _delimiter[2] = {'!',0}; /* default delimiter apparently */

  • trunk/src/oleaut32/oleaut32.h

    r6944 r8450  
    1 /* $Id: oleaut32.h,v 1.11 2001-10-03 19:21:59 sandervl Exp $ */
     1/* $Id: oleaut32.h,v 1.12 2002-05-17 10:16:59 sandervl Exp $ */
    22/*
    33 * Win32 OLE stubs for OS/2
    … …  
    5353#include <unicode.h>
    5454
    55 extern int      loadNr;
    56 extern char     oleaut32Path[];
    57 
    58 void ClosePrivateLogFileTypelib();
    59 void OpenPrivateLogFileTypelib();
    60 
    6155#define snprintf wsnprintfA
    6256#endif

  • trunk/src/oleaut32/olefont.c

    r7916 r8450  
    66 *
    77 * Copyright 1999 Francis Beaudet
     8 *
     9 * This library is free software; you can redistribute it and/or
     10 * modify it under the terms of the GNU Lesser General Public
     11 * License as published by the Free Software Foundation; either
     12 * version 2.1 of the License, or (at your option) any later version.
     13 *
     14 * This library is distributed in the hope that it will be useful,
     15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     17 * Lesser General Public License for more details.
     18 *
     19 * You should have received a copy of the GNU Lesser General Public
     20 * License along with this library; if not, write to the Free Software
     21 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    822 */
    923#ifdef __WIN32OS2__
    … …  
    2539#include "ole2.h"
    2640#include "olectl.h"
    27 #include "debugtools.h"
     41#include "wine/debug.h"
    2842#include "connpt.h" /* for CreateConnectionPoint */
    2943
    30 DEFAULT_DEBUG_CHANNEL(ole);
     44WINE_DEFAULT_DEBUG_CHANNEL(ole);
    3145
    3246/***********************************************************************

  • trunk/src/oleaut32/olepicture.c

    r7508 r8450  
    77 * Copyright 2001 Marcus Meissner
    88 *
     9 * This library is free software; you can redistribute it and/or
     10 * modify it under the terms of the GNU Lesser General Public
     11 * License as published by the Free Software Foundation; either
     12 * version 2.1 of the License, or (at your option) any later version.
     13 *
     14 * This library is distributed in the hope that it will be useful,
     15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     17 * Lesser General Public License for more details.
     18 *
     19 * You should have received a copy of the GNU Lesser General Public
     20 * License along with this library; if not, write to the Free Software
     21 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    922 *
    1023 * BUGS
    … …  
    2235 *
    2336 */
    24 #ifdef __WIN32OS2__
    25 #define HAVE_FLOAT_H
    26 #define WINE_LARGE_INTEGER
    27 #include "oleaut32.h"
    28 #endif
    2937
    3038#include "config.h"
    … …  
    4351#include "wine/obj_connection.h"
    4452#include "connpt.h"
    45 #include "debugtools.h"
     53#include "wine/debug.h"
    4654
    4755#include "wine/wingdi16.h"
    … …  
    5159/* This is a hack, so jpeglib.h does not redefine INT32 and the like*/
    5260#define XMD_H
     61#define UINT16 JPEG_UINT16
    5362#ifdef HAVE_JPEGLIB_H
    5463# include <jpeglib.h>
    5564#endif
     65#undef UINT16
    5666#endif
    5767
    58 DEFAULT_DEBUG_CHANNEL(ole);
     68WINE_DEFAULT_DEBUG_CHANNEL(ole);
    5969
    6070/*************************************************************************
    … …  
    153163
    154164  if (pictDesc)
    155     TRACE("(%p) type = %d\n", pictDesc, pictDesc->picType);
     165      TRACE("(%p) type = %d\n", pictDesc, pictDesc->picType);
    156166
    157167  /*
    … …  
    12711281}
    12721282 
    1273 #ifdef __WIN32OS2__
    1274 
    1275 // ----------------------------------------------------------------------
    1276 // OleLoadPictureFile
    1277 // ----------------------------------------------------------------------
    1278 HRESULT WIN32API OleLoadPictureFile(VARIANT varFileName, LPDISPATCH* lplpdispPicture)
    1279 {
    1280     dprintf(("OLEAUT32: OleLoadPictureFile - stub"));
    1281     return S_OK;
    1282 }
    1283 
    1284 // ----------------------------------------------------------------------
    1285 // OleSavePictureFile
    1286 // ----------------------------------------------------------------------
    1287 HRESULT WIN32API OleSavePictureFile(LPDISPATCH lpdispPicture,
    1288     BSTR bstrFileName)
    1289 {
    1290     dprintf(("OLEAUT32: OleSavePictureFile - stub"));
    1291     return S_OK;
    1292 }
    1293 
    1294 // ----------------------------------------------------------------------
    1295 // OleLoadPicturePath
    1296 // ----------------------------------------------------------------------
    1297 HRESULT WIN32API OleLoadPicturePath
    1298    (LPOLESTR            szURLorPath,
    1299     LPUNKNOWN           punkCaller,
    1300     DWORD               dwReserved,
    1301     OLE_COLOR           clrReserved,
    1302     REFIID              riid,
    1303     LPVOID *            ppvRet )
    1304 {
    1305     dprintf(("OLEAUT32: OleLoadPicturePath - stub"));
    1306     return S_OK;
    1307 }
    1308 #endif

  • trunk/src/oleaut32/parsedt.c

    r6711 r8450  
    704704                if (IS_VALID_UTIME(tm->tm_year, tm->tm_mon, tm->tm_mday))
    705705                {
    706 #ifdef USE_POSIX_TIME
     706                        /* FIXME: The code below is not correct */
     707#if 0 /* defined(USE_POSIX_TIME) */
    707708                        tm->tm_year -= 1900;
    708709                        tm->tm_mon -= 1;
    … …  
    712713                        tm->tm_mon += 1;
    713714
    714 #ifdef HAVE_INT_TIMEZONE
     715#if 0 /* defined(HAVE_INT_TIMEZONE) */
    715716                        *tzp = ((tm->tm_isdst > 0) ? (timezone - 3600) : timezone);
    716717

  • trunk/src/oleaut32/parsedt.h

    r4837 r8450  
    3131 *
    3232 * Copyright (c) 1994, Regents of the University of California
    33  *
    34  * $Id: parsedt.h,v 1.3 2000-12-24 14:39:55 sandervl Exp $
    3533 *
    3634 *-------------------------------------------------------------------------

  • trunk/src/oleaut32/safearray.c

    r7916 r8450  
    66 *
    77 * Copyright 1999 Sylvain St-Germain
    8  */
     8 *
     9 * This library is free software; you can redistribute it and/or
     10 * modify it under the terms of the GNU Lesser General Public
     11 * License as published by the Free Software Foundation; either
     12 * version 2.1 of the License, or (at your option) any later version.
     13 *
     14 * This library is distributed in the hope that it will be useful,
     15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     17 * Lesser General Public License for more details.
     18 *
     19 * You should have received a copy of the GNU Lesser General Public
     20 * License along with this library; if not, write to the Free Software
     21 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
     22 */
     23#ifdef __WIN32OS2__
     24#define HAVE_FLOAT_H
     25#define WINE_LARGE_INTEGER
     26#include "oleaut32.h"
     27
     28#endif
    929
    1030#include <stdio.h>
    … …  
    1535#include "oleauto.h"
    1636#include "wine/obj_base.h"
    17 #include "debugtools.h"
    18 
    19 DEFAULT_DEBUG_CHANNEL(ole);
     37#include "wine/debug.h"
     38
     39WINE_DEFAULT_DEBUG_CHANNEL(ole);
    2040
    2141#define SYSDUPSTRING(str) SysAllocStringLen((str), SysStringLen(str))

  • trunk/src/oleaut32/stubs.cpp

    r8446 r8450  
    1 /* $Id: stubs.cpp,v 1.14 2002-05-16 19:35:15 sandervl Exp $ */
     1/* $Id: stubs.cpp,v 1.15 2002-05-17 10:17:00 sandervl Exp $ */
    22/*
    33 * Win32 COM/OLE stubs for OS/2
    … …  
    704704        return S_OK;
    705705}
     706
     707#ifdef __WIN32OS2__
     708
     709// ----------------------------------------------------------------------
     710// OleLoadPictureFile
     711// ----------------------------------------------------------------------
     712HRESULT WIN32API OleLoadPictureFile(VARIANT varFileName, LPDISPATCH* lplpdispPicture)
     713{
     714    dprintf(("OLEAUT32: OleLoadPictureFile - stub"));
     715    return S_OK;
     716}
     717
     718// ----------------------------------------------------------------------
     719// OleSavePictureFile
     720// ----------------------------------------------------------------------
     721HRESULT WIN32API OleSavePictureFile(LPDISPATCH lpdispPicture,
     722    BSTR bstrFileName)
     723{
     724    dprintf(("OLEAUT32: OleSavePictureFile - stub"));
     725    return S_OK;
     726}
     727
     728// ----------------------------------------------------------------------
     729// OleLoadPicturePath
     730// ----------------------------------------------------------------------
     731HRESULT WIN32API OleLoadPicturePath
     732   (LPOLESTR            szURLorPath,
     733    LPUNKNOWN           punkCaller,
     734    DWORD               dwReserved,
     735    OLE_COLOR           clrReserved,
     736    REFIID              riid,
     737    LPVOID *            ppvRet )
     738{
     739    dprintf(("OLEAUT32: OleLoadPicturePath - stub"));
     740    return S_OK;
     741}
     742#endif

  • trunk/src/oleaut32/tmarshal.c

    r7936 r8450  
    33 *
    44 *      Copyright 2002  Marcus Meissner
     5 *
     6 * This library is free software; you can redistribute it and/or
     7 * modify it under the terms of the GNU Lesser General Public
     8 * License as published by the Free Software Foundation; either
     9 * version 2.1 of the License, or (at your option) any later version.
     10 *
     11 * This library is distributed in the hope that it will be useful,
     12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     14 * Lesser General Public License for more details.
     15 *
     16 * You should have received a copy of the GNU Lesser General Public
     17 * License along with this library; if not, write to the Free Software
     18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    519 */
    6 #ifdef __WIN32OS2__
    7 #define HAVE_FLOAT_H
    8 #define WINE_LARGE_INTEGER
    9 #include "oleaut32.h"
    10 
    11 #endif
    1220
    1321#include "config.h"
    … …  
    3240#include "ole2disp.h"
    3341#include "typelib.h"
    34 #include "debugtools.h"
     42#include "wine/debug.h"
    3543#include "ntddk.h"
    3644
    3745static const WCHAR riidW[5] = {'r','i','i','d',0};
    3846
    39 DEFAULT_DEBUG_CHANNEL(ole);
    40 DECLARE_DEBUG_CHANNEL(olerelay);
     47WINE_DEFAULT_DEBUG_CHANNEL(ole);
     48WINE_DECLARE_DEBUG_CHANNEL(olerelay);
    4149
    4250typedef struct _marshal_state {
    … …  
    370378        return S_OK;
    371379    case VT_BSTR: {     /* DWORD size, string data */
    372             DWORD *bstr = ((DWORD*)(*arg))-1;
    373 
    374             if (relaydeb) MESSAGE("%s",debugstr_w((LPWSTR)(bstr+1)));
    375             return xbuf_add(buf,(LPBYTE)bstr,bstr[0]+4);
     380
     381            if (*arg) {
     382                DWORD *bstr = ((DWORD*)(*arg))-1;
     383
     384                if (relaydeb) MESSAGE("%s",debugstr_w((LPWSTR)(bstr+1)));
     385                return xbuf_add(buf,(LPBYTE)bstr,bstr[0]+4);
     386            } else {
     387                DWORD xnull = 0;
     388
     389                return xbuf_add(buf,(LPBYTE)&xnull,sizeof(xnull));
     390            }
    376391        }
    377392    case VT_BOOL:

  • trunk/src/oleaut32/tmarshal.h

    r7916 r8450  
     1/*
     2 * Copyright 2002 Marcus Meissner
     3 *
     4 * This library is free software; you can redistribute it and/or
     5 * modify it under the terms of the GNU Lesser General Public
     6 * License as published by the Free Software Foundation; either
     7 * version 2.1 of the License, or (at your option) any later version.
     8 *
     9 * This library is distributed in the hope that it will be useful,
     10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     12 * Lesser General Public License for more details.
     13 *
     14 * You should have received a copy of the GNU Lesser General Public
     15 * License along with this library; if not, write to the Free Software
     16 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
     17 */
     18
    119#ifndef TMARSHAL_H
    220#define TMARSHAL_H
     21
    322HRESULT WINAPI
    423TypeLibFac_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv);

  • trunk/src/oleaut32/typelib.c

    r7934 r8450  
    66 *                    2000  Francois Jacques
    77 *                    2001  Huw D M Davies for CodeWeavers
     8 *
     9 * This library is free software; you can redistribute it and/or
     10 * modify it under the terms of the GNU Lesser General Public
     11 * License as published by the Free Software Foundation; either
     12 * version 2.1 of the License, or (at your option) any later version.
     13 *
     14 * This library is distributed in the hope that it will be useful,
     15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     17 * Lesser General Public License for more details.
     18 *
     19 * You should have received a copy of the GNU Lesser General Public
     20 * License along with this library; if not, write to the Free Software
     21 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    822 *                   
    923 * --------------------------------------------------------------------------------------
    … …  
    3852 *
    3953 */
    40 #ifdef __WIN32OS2__
    41 #define HAVE_FLOAT_H
    42 #define WINE_LARGE_INTEGER
    43 #include "oleaut32.h"
    44 #endif
    4554
    4655#include "config.h"
    … …  
    6170#include "ole2disp.h"
    6271#include "typelib.h"
    63 #include "debugtools.h"
     72#include "wine/debug.h"
    6473#include "ntddk.h"
    6574
    66 DEFAULT_DEBUG_CHANNEL(ole);
    67 DECLARE_DEBUG_CHANNEL(typelib);
    68 
    69 #ifdef __WIN32OS2__
    70 #include <neexe.h>
    71 #else
     75WINE_DEFAULT_DEBUG_CHANNEL(ole);
     76WINE_DECLARE_DEBUG_CHANNEL(typelib);
     77
    7278/****************************************************************************
    7379 *              QueryPathOfRegTypeLib   [TYPELIB.14]
    … …  
    113119        return S_OK;
    114120}
    115 #endif
    116 
     121 
    117122/****************************************************************************
    118123 *              QueryPathOfRegTypeLib   [OLEAUT32.164]
    … …  
    133138    HRESULT hr        = E_FAIL;
    134139
    135     DWORD   dwPathLen = _MAX_PATH;
    136140    LCID    myLCID    = lcid;
    137141
    138142    char    szXGUID[80];
    139143    char    szTypeLibKey[100];
    140 #ifdef __WIN32OS2__
    141     char    szPath[_MAX_PATH];
    142 #else
    143     char    szPath[dwPathLen];
    144 #endif
     144    char    szPath[MAX_PATH];
     145    DWORD   dwPathLen = sizeof(szPath);
     146
    145147    if ( !HIWORD(guid) )
    146148    {
    … …  
    467469                ITypeInfo_GetTypeAttr(tinfo, &tattr);
    468470                if (tattr) {
    469                     TRACE_(typelib)("guid=%s, flags=%04x\n",
     471                    TRACE_(typelib)("guid=%s, flags=%04x (",
    470472                                    debugstr_guid(&tattr->guid),
    471473                                    tattr->wTypeFlags);
    472                     if (tattr->wTypeFlags & TYPEFLAG_FOLEAUTOMATION) {
     474                    if (TRACE_ON(typelib)) {
     475#define XX(x) if (TYPEFLAG_##x & tattr->wTypeFlags) MESSAGE(#x"|");
     476                        XX(FAPPOBJECT);
     477                        XX(FCANCREATE);
     478                        XX(FLICENSED);
     479                        XX(FPREDECLID);
     480                        XX(FHIDDEN);
     481                        XX(FCONTROL);
     482                        XX(FDUAL);
     483                        XX(FNONEXTENSIBLE);
     484                        XX(FOLEAUTOMATION);
     485                        XX(FRESTRICTED);
     486                        XX(FAGGREGATABLE);
     487                        XX(FREPLACEABLE);
     488                        XX(FDISPATCHABLE);
     489                        XX(FREVERSEBIND);
     490                        XX(FPROXY);
     491#undef XX
     492                        MESSAGE("\n");
     493                    }
     494                    /*
     495                     * FIXME: The 1 is just here until we implement rpcrt4
     496                     *        stub/proxy handling. Until then it helps IShield
     497                     *        v6 to work.
     498                     */
     499                    if (1 || (tattr->wTypeFlags & TYPEFLAG_FOLEAUTOMATION))
     500                    {
    473501                        /* register interface<->typelib coupling */
    474502                        StringFromGUID2(&tattr->guid, guid, 80);
    … …  
    546574}
    547575
    548 #ifndef __WIN32OS2__
    549576/****************************************************************************
    550577 *      OaBuildVersion                          (TYPELIB.15)
    … …  
    583610    }
    584611}
    585 #endif
    586612
    587613/* for better debugging info leave the static out for the time being */

  • trunk/src/oleaut32/typelib.h

    r7916 r8450  
    44 *
    55 * Copyright 1999 Rein KLazes
    6  * 
     6 *
     7 * This library is free software; you can redistribute it and/or
     8 * modify it under the terms of the GNU Lesser General Public
     9 * License as published by the Free Software Foundation; either
     10 * version 2.1 of the License, or (at your option) any later version.
     11 *
     12 * This library is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     15 * Lesser General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU Lesser General Public
     18 * License along with this library; if not, write to the Free Software
     19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    720 */
    821#ifndef _WINE_TYPELIB_H

  • trunk/src/oleaut32/variant.c

    r7916 r8450  
    33 *
    44 * Copyright 1998 Jean-Claude Cote
     5 *
     6 * This library is free software; you can redistribute it and/or
     7 * modify it under the terms of the GNU Lesser General Public
     8 * License as published by the Free Software Foundation; either
     9 * version 2.1 of the License, or (at your option) any later version.
     10 *
     11 * This library is distributed in the hope that it will be useful,
     12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     14 * Lesser General Public License for more details.
     15 *
     16 * You should have received a copy of the GNU Lesser General Public
     17 * License along with this library; if not, write to the Free Software
     18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    519 *
    620 * NOTES
    … …  
    2034 *   - The parsing does not accept as many formats as the Windows implementation.
    2135 */
    22 #ifdef __WIN32OS2__
    23 #define HAVE_FLOAT_H
    24 #define WINE_LARGE_INTEGER
    25 #include "oleaut32.h"
    26 
    27 #endif
    2836
    2937#include "config.h"
    … …  
    4250#include "oleauto.h"
    4351#include "heap.h"
    44 #include "debugtools.h"
     52#include "wine/debug.h"
    4553#include "winerror.h"
    4654#include "parsedt.h"
    4755
    48 DEFAULT_DEBUG_CHANNEL(ole);
     56WINE_DEFAULT_DEBUG_CHANNEL(ole);
    4957
    5058#define SYSDUPSTRING(str) SysAllocStringLen((str), SysStringLen(str))
    … …  
    16461654                        ( vt & VT_TYPEMASK ) > VT_MAXVALIDTYPE )
    16471655                {
    1648                         res = E_INVALIDARG;
     1656                        res = DISP_E_BADVARTYPE;
    16491657                }
    16501658                       
    … …  
    19681976          }
    19691977        }
    1970        
    1971         V_VT(pvargDest) = V_VT(pvargSrc) & VT_TYPEMASK;
     1978
     1979        if (res == S_OK) V_VT(pvargDest) = V_VT(pvargSrc) & VT_TYPEMASK;
    19721980      }
    19731981    }
Note: See TracChangeset for help on using the changeset viewer.