Skip to content

W
wine-cw
Commit 98e33334 authored by Paul Vriens's avatar Paul Vriens Committed by Alexandre Julliard
Browse files
Options

Rename bText to wType.

parent a1ebea41
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
dlls/version/info.c
View file @ 98e33334
...@@ -179,7 +179,7 @@ typedef struct ...@@ -179,7 +179,7 @@ typedef struct
{ {
WORD wLength; WORD wLength;
WORD wValueLength; WORD wValueLength;
WORD bText; WORD wType;
WCHAR szKey[1]; WCHAR szKey[1];
#if 0 /* variable length structure */ #if 0 /* variable length structure */
/* DWORD aligned */ /* DWORD aligned */
...@@ -206,7 +206,7 @@ typedef struct ...@@ -206,7 +206,7 @@ typedef struct
#define VersionInfo32_Children( ver ) \ #define VersionInfo32_Children( ver ) \
(VS_VERSION_INFO_STRUCT32 *)( VersionInfo32_Value( ver ) + \ (VS_VERSION_INFO_STRUCT32 *)( VersionInfo32_Value( ver ) + \
( ( (ver)->wValueLength * \ ( ( (ver)->wValueLength * \
((ver)->bText? 2 : 1) + 3 ) & ~3 ) ) ((ver)->wType? 2 : 1) + 3 ) & ~3 ) )
#define VersionInfo16_Next( ver ) \ #define VersionInfo16_Next( ver ) \
(VS_VERSION_INFO_STRUCT16 *)( (LPBYTE)ver + (((ver)->wLength + 3) & ~3) ) (VS_VERSION_INFO_STRUCT16 *)( (LPBYTE)ver + (((ver)->wLength + 3) & ~3) )
...@@ -222,14 +222,14 @@ void ConvertVersionInfo32To16( VS_VERSION_INFO_STRUCT32 *info32, ...@@ -222,14 +222,14 @@ void ConvertVersionInfo32To16( VS_VERSION_INFO_STRUCT32 *info32,
/* Copy data onto local stack to prevent overwrites */ /* Copy data onto local stack to prevent overwrites */
WORD wLength = info32->wLength; WORD wLength = info32->wLength;
WORD wValueLength = info32->wValueLength; WORD wValueLength = info32->wValueLength;
WORD bText = info32->bText; WORD wType = info32->wType;
LPBYTE lpValue = VersionInfo32_Value( info32 ); LPBYTE lpValue = VersionInfo32_Value( info32 );
VS_VERSION_INFO_STRUCT32 *child32 = VersionInfo32_Children( info32 ); VS_VERSION_INFO_STRUCT32 *child32 = VersionInfo32_Children( info32 );
VS_VERSION_INFO_STRUCT16 *child16; VS_VERSION_INFO_STRUCT16 *child16;
TRACE("Converting %p to %p\n", info32, info16 ); TRACE("Converting %p to %p\n", info32, info16 );
TRACE("wLength %d, wValueLength %d, bText %d, value %p, child %p\n", TRACE("wLength %d, wValueLength %d, wType %d, value %p, child %p\n",
wLength, wValueLength, bText, lpValue, child32 ); wLength, wValueLength, wType, lpValue, child32 );
/* Convert key */ /* Convert key */
WideCharToMultiByte( CP_ACP, 0, info32->szKey, -1, info16->szKey, 0x7fffffff, NULL, NULL ); WideCharToMultiByte( CP_ACP, 0, info32->szKey, -1, info16->szKey, 0x7fffffff, NULL, NULL );
...@@ -243,7 +243,7 @@ void ConvertVersionInfo32To16( VS_VERSION_INFO_STRUCT32 *info32, ...@@ -243,7 +243,7 @@ void ConvertVersionInfo32To16( VS_VERSION_INFO_STRUCT32 *info32,
info16->wValueLength = 0; info16->wValueLength = 0;
TRACE("No value present\n" ); TRACE("No value present\n" );
} }
else if ( bText ) else if ( wType )
{ {
info16->wValueLength = WideCharToMultiByte( CP_ACP, 0, (LPCWSTR)lpValue, -1, NULL, 0, NULL, NULL ); info16->wValueLength = WideCharToMultiByte( CP_ACP, 0, (LPCWSTR)lpValue, -1, NULL, 0, NULL, NULL );
WideCharToMultiByte( CP_ACP, 0, (LPCWSTR)lpValue, -1, WideCharToMultiByte( CP_ACP, 0, (LPCWSTR)lpValue, -1,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment