Update of /cvsroot/silgraphite/silgraphite/src/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv14941/src/lib
Modified Files:
GrUtil.cpp GrUtil.h
Log Message:
Synchronized with FW, 20 Dec 2002, changelist #05908
Index: GrUtil.cpp
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/src/lib/GrUtil.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GrUtil.cpp 12 Nov 2002 23:11:31 -0000 1.2
--- GrUtil.cpp 2 Jan 2003 21:18:49 -0000 1.3
***************
*** 25,29 ****
#ifdef _WIN32
#include <windows.h>
! #endif
#include <stdio.h>
#include "GrUtil.h"
--- 25,30 ----
#ifdef _WIN32
#include <windows.h>
! #endif // _WIN32
!
#include <stdio.h>
#include "GrUtil.h"
***************
*** 77,87 ****
AssertPtr(phkey);
! #ifdef GR_FW
! StrApp str;
! str.Format("Software\\SIL\\GraphiteFonts\\%s", pszFontKey);
! #else
! char str[260];
! sprintf(str, "Software\\SIL\\GraphiteFonts\\%s", pszFontKey);
! #endif
if (at == katRead)
--- 78,88 ----
AssertPtr(phkey);
! //#ifdef GR_FW
! // StrApp str;
! // str.Format(_T("Software\\SIL\\GraphiteFonts\\%s"), pszFontKey);
! //#else
! achar str[260];
! _stprintf(str, _T("Software\\SIL\\GraphiteFonts\\%s"), pszFontKey);
! //#endif
if (at == katRead)
***************
*** 108,112 ****
for ( ; ; )
{
! char rgch[256];
DWORD cb = isizeof(rgch);
LONG l = ::RegEnumKeyEx(hkey, dwIndex, rgch, &cb, NULL, NULL, NULL, NULL);
--- 109,113 ----
for ( ; ; )
{
! achar rgch[256];
DWORD cb = isizeof(rgch);
LONG l = ::RegEnumKeyEx(hkey, dwIndex, rgch, &cb, NULL, NULL, NULL, NULL);
***************
*** 140,144 ****
if (OpenFontKey(pszFontKey, pszStyle, katRead, &hkey))
{
! char rgch[MAX_PATH];
DWORD cb = isizeof(rgch);
DWORD dwT;
--- 141,145 ----
if (OpenFontKey(pszFontKey, pszStyle, katRead, &hkey))
{
! achar rgch[MAX_PATH];
DWORD cb = isizeof(rgch);
DWORD dwT;
***************
*** 171,178 ****
for ( ; ; )
{
! char rgch[256];
DWORD cb = isizeof(rgch);
LONG l = ::RegEnumKeyEx(hkey, dwIndex, rgch, &cb, NULL, NULL, NULL, NULL);
! if (strcmp(pszFontKey, rgch) == 0)
return true;
else if (l == ERROR_NO_MORE_ITEMS)
--- 172,179 ----
for ( ; ; )
{
! achar rgch[256];
DWORD cb = isizeof(rgch);
LONG l = ::RegEnumKeyEx(hkey, dwIndex, rgch, &cb, NULL, NULL, NULL, NULL);
! if (_tcscmp(pszFontKey, rgch) == 0)
return true;
else if (l == ERROR_NO_MORE_ITEMS)
Index: GrUtil.h
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/src/lib/GrUtil.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** GrUtil.h 12 Nov 2002 22:27:10 -0000 1.3
--- GrUtil.h 2 Jan 2003 21:18:49 -0000 1.4
***************
*** 20,24 ****
#ifndef GR_FW
! #include "UtilVector.h"
#include "UtilString.h"
#endif // !GR_FW
--- 20,24 ----
#ifndef GR_FW
! #include "UtilVector.h" // was Vector.h
#include "UtilString.h"
#endif // !GR_FW
|
