Changeset 5472 for trunk/src/winmm


Ignore:
Timestamp:
Apr 4, 2001, 11:05:50 AM (25 years ago)
Author:
sandervl
Message:

compile fix

Location:
trunk/src/winmm
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/winmm/joy.cpp

    r3933 r5472  
    1 /* $Id: joy.cpp,v 1.8 2000-08-02 17:30:05 bird Exp $ */
     1/* $Id: joy.cpp,v 1.9 2001-04-04 09:02:16 sandervl Exp $ */
    22/*
    33 * Odin Joystick apis
    … …  
    145145      lpCaps->wMid = MM_MICROSOFT;
    146146      lpCaps->wPid = MM_PC_JOYSTICK;
    147       AsciiToUnicode("OS/2 Joystick", lpCaps->szPname);
     147      lstrcpyW(lpCaps->szPname, (LPWSTR)L"OS/2 Joystick");
    148148      lpCaps->wXmin = 0;
    149149      lpCaps->wXmax = 0xffff;
    … …  
    166166      lpCaps->wNumAxes = 2;
    167167      lpCaps->wMaxButtons = 2;
    168       AsciiToUnicode("",lpCaps->szRegKey);
    169       AsciiToUnicode("",lpCaps->szOEMVxD);
     168      lpCaps->szRegKey[0] = 0;
     169      lpCaps->szOEMVxD[0] = 0;
    170170      dprintf(("OK!!!\n"));
    171171      return JOYERR_NOERROR;

  • trunk/src/winmm/mci.cpp

    r4748 r5472  
    1 /* $Id: mci.cpp,v 1.6 2000-12-03 22:18:17 sandervl Exp $ */
     1/* $Id: mci.cpp,v 1.7 2001-04-04 09:02:16 sandervl Exp $ */
    22
    33/*
    … …  
    357357#define SET_EIP(ptr) /* nothing */
    358358#endif  /* __GNUC__ */
    359 
    360 /***********************************************************************
    361  *           HEAP_strdupA
    362  */
    363 static LPSTR HEAP_strdupA( HANDLE heap, DWORD flags, LPCSTR str )
    364 {
    365     LPSTR p = (LPSTR) HeapAlloc( heap, flags, strlen(str) + 1 );
    366     if(p) {
    367       //SET_EIP(p);
    368       strcpy( p, str );
    369     }
    370     return p;
    371 }
    372359
    373360

  • trunk/src/winmm/waveoutdart.cpp

    r5421 r5472  
    1 /* $Id: waveoutdart.cpp,v 1.2 2001-04-01 12:31:01 sandervl Exp $ */
     1/* $Id: waveoutdart.cpp,v 1.3 2001-04-04 09:02:16 sandervl Exp $ */
    22
    33/*
    … …  
    2323#define  INCL_BASE
    2424#define  INCL_OS2MM
     25#define  INCL_DOSPROCESS
    2526#include <os2wrap.h>   //Odin32 OS/2 api wrappers
    2627#include <os2mewrap.h> //Odin32 OS/2 MMPM/2 api wrappers
    2728#include <stdlib.h>
     29#include <stddef.h>
    2830#include <string.h>
    2931#define  OS2_ONLY
Note: See TracChangeset for help on using the changeset viewer.