Changeset 21916 for trunk/src/dplay


Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
1 deleted
3 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/src/dplay/dplay.cpp

    r21494 r21916  
    5858  HKEY hkResult;
    5959  LPCSTR searchSubKey    = "SOFTWARE\\Microsoft\\DirectPlay\\Service Providers";
    60   LPSTR guidDataSubKey   = "Guid";
    61   LPSTR majVerDataSubKey = "dwReserved1";
     60  LPCSTR guidDataSubKey  = "Guid";
     61  LPCSTR majVerDataSubKey= "dwReserved1";
    6262  DWORD dwIndex, sizeOfSubKeyName=50;
    6363  char subKeyName[51];

  • trunk/src/dplay/dplay.def

    r4809 r21916  
    1515
    1616EXPORTS
    17   DirectPlayCreate           = _DirectPlayCreate@12            @1
    18   DirectPlayEnumerateA       = _DirectPlayEnumerateA@8         @2
    19   DirectPlayEnumerateW       = _DirectPlayEnumerateW@8         @3
     17  DirectPlayCreate           = "_DirectPlayCreate@12"          @1
     18  DirectPlayEnumerateA       = "_DirectPlayEnumerateA@8"       @2
     19  DirectPlayEnumerateW       = "_DirectPlayEnumerateW@8"       @3
Note: See TracChangeset for help on using the changeset viewer.