Skip to content

Commit

Permalink
Unicode: remove tchar.h, bring the project code base to Unicode
Browse files Browse the repository at this point in the history
  • Loading branch information
@Demonese
Demonese committed Dec 26, 2024
1 parent 0e14882 commit 71ff291
Show file tree
Hide file tree
Showing 7 changed files with 2,319 additions and 2,280 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ add_executable(${PROJECT_NAME} WIN32
resource.h
dxview.rc)

target_compile_definitions(${PROJECT_NAME} PRIVATE _UNICODE UNICODE)
target_link_libraries(${PROJECT_NAME} PRIVATE dxguid.lib comctl32.lib version.lib)

find_package(directx-headers CONFIG QUIET)
Expand Down
886 changes: 446 additions & 440 deletions ddraw.cpp
View file

Large diffs are not rendered by default.

1,213 changes: 610 additions & 603 deletions dxg.cpp
View file

Large diffs are not rendered by default.

2,108 changes: 1,044 additions & 1,064 deletions dxgi.cpp
View file

Large diffs are not rendered by default.

60 changes: 31 additions & 29 deletions dxprint.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <shlobj.h>

BOOL g_PrintToFile = FALSE; // Don't print to printer print to dxview.log
TCHAR g_PrintToFilePath[MAX_PATH]; // "Print" to this file instead of dxview.log
WCHAR g_PrintToFilePath[MAX_PATH]; // "Print" to this file instead of dxview.log

namespace
{
Expand Down Expand Up @@ -151,8 +151,8 @@ namespace
//-----------------------------------------------------------------------------
VOID DoMessage(DWORD dwTitle, DWORD dwMsg)
{
TCHAR strTitle[MAX_TITLE];
TCHAR strMsg[MAX_MESSAGE];
WCHAR strTitle[MAX_TITLE];
WCHAR strMsg[MAX_MESSAGE];

LoadString(GetModuleHandle(nullptr), dwTitle, strTitle, MAX_TITLE);
LoadString(GetModuleHandle(nullptr), dwMsg, strMsg, MAX_MESSAGE);
Expand Down Expand Up @@ -184,10 +184,11 @@ namespace
BOOL fResult = FALSE;
BOOL fStartDoc = FALSE;
BOOL fDisableWindow = FALSE;
LPTSTR pstrTitle = nullptr;
LPTSTR pstrBuff = nullptr;
LPWSTR pstrTitle = nullptr;
LPWSTR pstrBuff = nullptr;
DWORD dwCurrCopy;
HANDLE hHeap = nullptr;
DWORD buffCnt;
DWORD buffSize;
DWORD cchLen;
TV_ITEM tvi;
Expand Down Expand Up @@ -246,8 +247,9 @@ namespace
}

// Create line buffer
buffSize = (pci.dwCharsPerLine + 1) * sizeof(TCHAR);
pstrBuff = (LPTSTR)HeapAlloc(hHeap, HEAP_NO_SERIALIZE, buffSize);
buffCnt = (pci.dwCharsPerLine + 1);
buffSize = buffCnt * sizeof(WCHAR);
pstrBuff = (LPWSTR)HeapAlloc(hHeap, HEAP_NO_SERIALIZE, buffSize);
if (!pstrBuff)
{
// Error, not enough memory
Expand Down Expand Up @@ -281,32 +283,32 @@ namespace
{
SetWindowText(g_hAbortPrintDlg, pstrBuff);
SetAbortProc(pd.hDC, AbortProc);
cchLen = static_cast<DWORD>(_tcsclen(pstrBuff));
DWORD cbSize = (cchLen + 1) * sizeof(TCHAR);
pstrTitle = (LPTSTR)HeapAlloc(hHeap, HEAP_NO_SERIALIZE, cbSize);
cchLen = static_cast<DWORD>(wcslen(pstrBuff));
DWORD cbSize = (cchLen + 1) * sizeof(WCHAR);
pstrTitle = (LPWSTR)HeapAlloc(hHeap, HEAP_NO_SERIALIZE, cbSize);
if (!pstrTitle)
{
// Error, not enough memory
goto lblCLEANUP;
}

strcpy_s(pstrTitle, cbSize, pstrBuff);
wcscpy_s(pstrTitle, cchLen + 1, pstrBuff);
pstrTitle[cchLen] = 0;
}
else
{
SetWindowText(g_hAbortPrintDlg, TEXT("Unknown"));
SetWindowText(g_hAbortPrintDlg, L"Unknown");
SetAbortProc(pd.hDC, AbortProc);
cchLen = static_cast<DWORD>(_tcsclen(TEXT("Unknown")));
DWORD cbSize = (cchLen + 1) * sizeof(TCHAR);
pstrTitle = (LPTSTR)HeapAlloc(hHeap, HEAP_NO_SERIALIZE, cbSize);
cchLen = static_cast<DWORD>(wcslen(L"Unknown"));
DWORD cbSize = (cchLen + 1) * sizeof(WCHAR);
pstrTitle = (LPWSTR)HeapAlloc(hHeap, HEAP_NO_SERIALIZE, cbSize);
if (!pstrTitle)
{
// Error, not enough memory
goto lblCLEANUP;
}

strcpy_s(pstrTitle, cbSize, TEXT("Unknown"));
wcscpy_s(pstrTitle, cchLen + 1, L"Unknown");
pstrTitle[cchLen] = 0;
}

Expand All @@ -320,20 +322,20 @@ namespace
// Start document
if (g_PrintToFile)
{
const TCHAR* pstrFile;
TCHAR buff[MAX_PATH];
if (strlen(g_PrintToFilePath) > 0)
const WCHAR* pstrFile;
WCHAR buff[MAX_PATH];
if (wcslen(g_PrintToFilePath) > 0)
pstrFile = g_PrintToFilePath;
else
{
HRESULT hr = SHGetFolderPath(nullptr, CSIDL_DESKTOP, nullptr, SHGFP_TYPE_CURRENT, buff);
if (SUCCEEDED(hr))
{
strcat_s(buff, MAX_PATH, TEXT("\\dxview.log"));
wcscat_s(buff, MAX_PATH, L"\\dxview.log");
pstrFile = buff;
}
else
pstrFile = TEXT("dxview.log");
pstrFile = L"dxview.log";
}
g_FileHandle = CreateFile(pstrFile, GENERIC_WRITE, 0, nullptr,
CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
Expand Down Expand Up @@ -381,8 +383,8 @@ namespace
tvi.cchTextMax = pci.dwCharsPerLine;
if (TreeView_GetItem(hTreeWnd, &tvi))
{
cchLen = static_cast<DWORD>(_tcslen(pstrBuff));
cchLen = __min(cchLen, buffSize);
cchLen = static_cast<DWORD>(wcslen(pstrBuff));
cchLen = __min(cchLen, buffCnt);
if (cchLen > 0)
{
int xOffset = (int)(pci.dwCurrIndent * DEF_TAB_SIZE * pci.dwCharWidth);
Expand Down Expand Up @@ -643,7 +645,7 @@ BOOL DXView_OnFile(HWND hWnd, HWND hTreeWnd, BOOL bPrintAll)
// Desc: Prints text to page at specified location
//-----------------------------------------------------------------------------
_Use_decl_annotations_
HRESULT PrintLine(int xOffset, int yOffset, LPCTSTR pszBuff, size_t cchBuff,
HRESULT PrintLine(int xOffset, int yOffset, LPCWSTR pszBuff, size_t cchBuff,
PRINTCBINFO* pci)
{
if (!pci)
Expand All @@ -661,19 +663,19 @@ HRESULT PrintLine(int xOffset, int yOffset, LPCTSTR pszBuff, size_t cchBuff,
if (g_PrintToFile)
{
DWORD dwDummy;
TCHAR Temp[80];
WCHAR Temp[80];

int offset = (xOffset - iLastXPos) / pci->dwCharWidth;

if (offset < 0 || offset >= 80)
return S_OK;

memset(Temp, ' ', sizeof(TCHAR) * 79);
for (auto& c : Temp) c = L' ';
Temp[offset] = 0;
WriteFile(g_FileHandle, Temp, (xOffset - iLastXPos) / pci->dwCharWidth, &dwDummy, nullptr);
WriteFile(g_FileHandle, Temp, (xOffset - iLastXPos) * sizeof(WCHAR) / pci->dwCharWidth, &dwDummy, nullptr);
iLastXPos = (xOffset - iLastXPos) + (pci->dwCharWidth * static_cast<DWORD>(cchBuff));

WriteFile(g_FileHandle, pszBuff, static_cast<DWORD>(cchBuff), &dwDummy, nullptr);
WriteFile(g_FileHandle, pszBuff, static_cast<DWORD>(cchBuff) * sizeof(WCHAR), &dwDummy, nullptr);
}
else
{
Expand All @@ -695,7 +697,7 @@ HRESULT PrintNextLine(PRINTCBINFO* pci)
{
DWORD dwDummy;

WriteFile(g_FileHandle, "\r\n", 2, &dwDummy, nullptr);
WriteFile(g_FileHandle, L"\r\n", 4, &dwDummy, nullptr);
iLastXPos = 0;
return S_OK;
}
Expand Down
Loading

0 comments on commit 71ff291

Please sign in to comment.