Ignore:
Timestamp:
Feb 6, 2002, 9:18:30 PM (24 years ago)
Author:
sandervl
Message:

Wine resync

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/shlwapi/shlwapi.cpp

    r6375 r7820  
    1 /* $Id: shlwapi.cpp,v 1.11 2001-07-20 15:37:52 sandervl Exp $ */
     1/* $Id: shlwapi.cpp,v 1.12 2002-02-06 20:18:29 sandervl Exp $ */
    22
    33/*
    … …  
    3333
    3434#include "debugtools.h"
     35#include "winbase.h"
    3536#include "winnls.h"
    3637#include "winversion.h"
    … …  
    5152ODINDEBUGCHANNEL(SHLWAPI)
    5253
    53 #include "shlwapi.h"
    5454
    5555
    … …  
    7070}
    7171
    72 #if 0
    73 // ----------------------------------------------------------------------
    74 // WINE_StringFromCLSID
    75 // ----------------------------------------------------------------------
    76 HRESULT WINAPI WINE_StringFromCLSID(const CLSID *rclsid, LPSTR idstr)
    77 {
    78 //    dprintf(("OLE32: WINE_StringFromCLSID"));
    79 
    80     if (rclsid == NULL)
    81     {
    82         dprintf(("       clsid: (NULL)"));
    83         *idstr = 0;
    84         return E_FAIL;
    85     }
    86 
    87     // Setup new string...
    88     sprintf(idstr, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
    89             rclsid->Data1,
    90             rclsid->Data2,
    91             rclsid->Data3,
    92             rclsid->Data4[0],
    93             rclsid->Data4[1],
    94             rclsid->Data4[2],
    95             rclsid->Data4[3],
    96             rclsid->Data4[4],
    97             rclsid->Data4[5],
    98             rclsid->Data4[6],
    99             rclsid->Data4[7]);
    100 
    101 //    dprintf(("       clsid: %s", idstr));
    102 
    103     return OLE_OK;
    104 }
    105 
    106 // ----------------------------------------------------------------------
    107 // StringFromGUID2
    108 // ----------------------------------------------------------------------
    109 int WINAPI StringFromGUID2(REFGUID rguid, LPOLESTR lpsz, int cbMax)
    110 {
    111 // NB cbMax is a CHARACTER count not a BYTE count... :-)
    112     char        tmp[50];
    113     size_t      strLen;
    114 
    115     // Setup new string...
    116     WINE_StringFromCLSID(rguid, tmp);
    117 
    118     strLen = (strlen(tmp) + 1);
    119     if (strLen > cbMax)
    120         strLen = cbMax;
    121 
    122     AsciiToUnicodeN(tmp, lpsz, strLen);
    123 
    124     return strLen;  // Num CHARACTERS including 0 terminator
    125 }
    126 #endif
    127 
    128 /*****************************************************************************
    129  * Name      : DllGetVersion
    130  * Purpose   : Return version information about the DLL used
    131  * Parameters:
    132  * Variables :
    133  * Result    :
    134  * Remark    : SHLWAPI.446
    135  * Status    : UNTESTED
    136  *
    137  * Author    :
    138  *****************************************************************************/
    139 
    140 typedef struct tagDLLVERSION
    141 {
    142   DWORD dwLength; // == 0x14
    143   DWORD dwMajorVersion;
    144   DWORD dwMinorVersion;
    145   DWORD dwRevision;
    146   DWORD dwBuildNumber;
    147 } DLLVERSION, *LPDLLVERSION;
    148 
    149 
    150 ODINFUNCTION1(DWORD,        DllGetVersion,
    151               LPDLLVERSION, lpBuffer)
    152 {
    153   if (lpBuffer == NULL)
    154     return E_INVALIDARG; // error code: invalid parameters
    155 
    156   if (IsBadWritePtr(lpBuffer,
    157                     20))
    158     return E_INVALIDARG;
    159  
    160   if (lpBuffer->dwLength != sizeof(DLLVERSION))
    161     return E_INVALIDARG;
    162      
    163   // our current version is 5.0.2314.1000
    164   lpBuffer->dwMajorVersion = 5;
    165 //lpBuffer->dwMinorVersion = 0;  // @@@PH not touched in windows code ?
    166   lpBuffer->dwRevision     = 2314;
    167   lpBuffer->dwBuildNumber  = 1;
    168  
    169   return ERROR_SUCCESS;
    170 }
Note: See TracChangeset for help on using the changeset viewer.