Revision: 1400
http://emerge.svn.sourceforge.net/emerge/?rev=1400&view=rev
Author: ir0nh34d
Date: 2007-08-09 18:05:10 -0700 (Thu, 09 Aug 2007)
Log Message:
-----------
Make source gcc 4 friendly
Modified Paths:
--------------
trunk/Source/emergeCommand/Command.cpp
trunk/Source/emergeCommand/Config.cpp
trunk/Source/emergeCommand/CustomSource.cpp
trunk/Source/emergeCommand/Settings.cpp
trunk/Source/emergeCommand/Settings.h
trunk/Source/emergeCore/Core.cpp
trunk/Source/emergeCore/DDEWorker.cpp
trunk/Source/emergeCore/LaunchEditor.cpp
trunk/Source/emergeCore/ShellChanger.cpp
trunk/Source/emergeDesktop/Desktop.cpp
trunk/Source/emergeDesktop/MenuEditor.cpp
trunk/Source/emergeDesktop/Settings.cpp
trunk/Source/emergeGraphics/main.cpp
trunk/Source/emergeHotkeys/Actions.cpp
trunk/Source/emergeHotkeys/Settings.cpp
trunk/Source/emergeLauncher/Config.cpp
trunk/Source/emergeLauncher/Settings.cpp
trunk/Source/emergeLauncher/Settings.h
trunk/Source/emergeLib/emergeLib.h
trunk/Source/emergeLib/main.cpp
trunk/Source/emergeSchemeEngine/SchemeEditor.cpp
trunk/Source/emergeSchemeEngine/main.cpp
trunk/Source/emergeTasks/Config.cpp
trunk/Source/emergeTasks/Settings.cpp
trunk/Source/emergeTasks/Settings.h
trunk/Source/emergeTray/Applet.cpp
trunk/Source/emergeTray/Config.cpp
trunk/Source/emergeTray/Settings.cpp
trunk/Source/emergeTray/Settings.h
trunk/Source/emergeVWM/Applet.cpp
trunk/Source/emergeVWM/Config.cpp
trunk/Source/emergeVWM/Settings.cpp
trunk/Source/emergeVWM/Settings.h
Modified: trunk/Source/emergeCommand/Command.cpp
===================================================================
--- trunk/Source/emergeCommand/Command.cpp 2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeCommand/Command.cpp 2007-08-10 01:05:10 UTC (rev 1400)
@@ -245,6 +245,7 @@
{
DWORD top, bottom;
UINT dragBorder = pApplet->guiInfo.dragBorder + pApplet->guiInfo.bevelWidth;
+ LPVOID lpVoid;
top = (height / 2);
top -= (pSettings->GetFont()->lfHeight / 2);
@@ -283,32 +284,42 @@
}
if (!pac)
- CoCreateInstance(CLSID_AutoComplete,
- NULL,
- CLSCTX_INPROC_SERVER,
- IID_IAutoComplete,
- (LPVOID*)&pac);
+ {
+ CoCreateInstance(CLSID_AutoComplete,
+ NULL,
+ CLSCTX_INPROC_SERVER,
+ IID_IAutoComplete,
+ &lpVoid);
+ pac = reinterpret_cast <IAutoComplete*> (lpVoid);
+ }
if (!fileSource)
- CoCreateInstance(CLSID_ACListISF,
- NULL,
- CLSCTX_INPROC_SERVER,
- IID_IACList,
- (LPVOID*)&fileSource);
+ {
+ CoCreateInstance(CLSID_ACListISF,
+ NULL,
+ CLSCTX_INPROC_SERVER,
+ IID_IACList,
+ &lpVoid);
+ fileSource = reinterpret_cast <IUnknown*> (lpVoid);
+ }
if (!historySource)
{
history = new CustomSource();
- history->QueryInterface(IID_IEnumString, (LPVOID*)&historySource);
+ history->QueryInterface(IID_IEnumString, &lpVoid);
+ historySource = reinterpret_cast <IEnumString*> (lpVoid);
}
if (!pom)
- CoCreateInstance(CLSID_ACLMulti,
- NULL,
- CLSCTX_INPROC_SERVER,
- IID_IObjMgr,
- (LPVOID*)&pom);
+ {
+ CoCreateInstance(CLSID_ACLMulti,
+ NULL,
+ CLSCTX_INPROC_SERVER,
+ IID_IObjMgr,
+ &lpVoid);
+ pom = reinterpret_cast <IObjMgr*> (lpVoid);
+ }
if (fileSource && pom)
pom->Append(fileSource);
@@ -379,6 +390,8 @@
void Command::ShowTextWindow()
{
+ LPVOID lpVoid;
+
ShowWindow(hText, SW_SHOW);
SetWindowText(hText, TEXT(""));
SetForegroundWindow(commandWnd);
@@ -388,8 +401,9 @@
{
pac->Init(hText, pom, NULL, NULL);
- if (SUCCEEDED(pac->QueryInterface(IID_IAutoComplete2, (LPVOID*)&pac2)))
+ if (SUCCEEDED(pac->QueryInterface(IID_IAutoComplete2, &lpVoid)))
{
+ pac2 = reinterpret_cast <IAutoComplete2*> (lpVoid);
pac2->SetOptions(ACO_AUTOSUGGEST | ACO_UPDOWNKEYDROPSLIST);
pac2->Release();
}
Modified: trunk/Source/emergeCommand/Config.cpp
===================================================================
--- trunk/Source/emergeCommand/Config.cpp 2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeCommand/Config.cpp 2007-08-10 01:05:10 UTC (rev 1400)
@@ -204,33 +204,33 @@
if (SendDlgItemMessage(hwndDlg, IDC_TOP, BM_GETCHECK, 0, 0) == BST_CHECKED)
if (_wcsicmp(pSettings->GetZPosition(), TEXT("top")) != 0)
- pSettings->SetZPosition(TEXT("Top"));
+ pSettings->SetZPosition((WCHAR*)TEXT("Top"));
if (SendDlgItemMessage(hwndDlg, IDC_BOTTOM, BM_GETCHECK, 0, 0) == BST_CHECKED)
if (_wcsicmp(pSettings->GetZPosition(), TEXT("bottom")) != 0)
- pSettings->SetZPosition(TEXT("Bottom"));
+ pSettings->SetZPosition((WCHAR*)TEXT("Bottom"));
if (SendDlgItemMessage(hwndDlg, IDC_NORMAL, BM_GETCHECK, 0, 0) == BST_CHECKED)
if (_wcsicmp(pSettings->GetZPosition(), TEXT("normal")) != 0)
- pSettings->SetZPosition(TEXT("Normal"));
+ pSettings->SetZPosition((WCHAR*)TEXT("Normal"));
if (SendDlgItemMessage(hwndDlg, IDC_COMMANDLEFT, BM_GETCHECK, 0, 0) == BST_CHECKED)
if (_wcsicmp(pSettings->GetCommandTextAlign(), TEXT("left")) != 0)
- pSettings->SetCommandTextAlign(TEXT("Left"));
+ pSettings->SetCommandTextAlign((WCHAR*)TEXT("Left"));
if (SendDlgItemMessage(hwndDlg, IDC_COMMANDCENTER, BM_GETCHECK, 0, 0) == BST_CHECKED)
if (_wcsicmp(pSettings->GetCommandTextAlign(), TEXT("center")) != 0)
- pSettings->SetCommandTextAlign(TEXT("Center"));
+ pSettings->SetCommandTextAlign((WCHAR*)TEXT("Center"));
if (SendDlgItemMessage(hwndDlg, IDC_COMMANDRIGHT, BM_GETCHECK, 0, 0) == BST_CHECKED)
if (_wcsicmp(pSettings->GetCommandTextAlign(), TEXT("right")) != 0)
- pSettings->SetCommandTextAlign(TEXT("Right"));
+ pSettings->SetCommandTextAlign((WCHAR*)TEXT("Right"));
if (SendDlgItemMessage(hwndDlg, IDC_CLOCKLEFT, BM_GETCHECK, 0, 0) == BST_CHECKED)
if (_wcsicmp(pSettings->GetClockTextAlign(), TEXT("left")) != 0)
- pSettings->SetClockTextAlign(TEXT("Left"));
+ pSettings->SetClockTextAlign((WCHAR*)TEXT("Left"));
if (SendDlgItemMessage(hwndDlg, IDC_CLOCKCENTER, BM_GETCHECK, 0, 0) == BST_CHECKED)
if (_wcsicmp(pSettings->GetClockTextAlign(), TEXT("center")) != 0)
- pSettings->SetClockTextAlign(TEXT("Center"));
+ pSettings->SetClockTextAlign((WCHAR*)TEXT("Center"));
if (SendDlgItemMessage(hwndDlg, IDC_CLOCKRIGHT, BM_GETCHECK, 0, 0) == BST_CHECKED)
if (_wcsicmp(pSettings->GetClockTextAlign(), TEXT("right")) != 0)
- pSettings->SetClockTextAlign(TEXT("Right"));
+ pSettings->SetClockTextAlign((WCHAR*)TEXT("Right"));
return true;
}
Modified: trunk/Source/emergeCommand/CustomSource.cpp
===================================================================
--- trunk/Source/emergeCommand/CustomSource.cpp 2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeCommand/CustomSource.cpp 2007-08-10 01:05:10 UTC (rev 1400)
@@ -78,12 +78,12 @@
if (current == 0)
current = 1;
- ELOpenRegKey(TEXT("emergeCommand\\History"), &key, true);
+ ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\History"), &key, true);
for (i = 0; i < current; i++)
{
swprintf(path, TEXT("%d"), currentElement);
- if (!ELReadRegString(key, path, tmp, TEXT("\0")))
+ if (!ELReadRegString(key, path, tmp, (WCHAR*)TEXT("\0")))
break;
wideSize = sizeof(WCHAR) * (int)(wcslen(tmp) + 1);
@@ -132,11 +132,11 @@
HKEY key;
WCHAR path[2], tmp[MAX_LINE_LENGTH];
- ELOpenRegKey(TEXT("emergeCommand\\History"), &key, true);
+ ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\History"), &key, true);
for (i = 0; i < MAX_HISTORY; i++)
{
swprintf(path, TEXT("%d"), i);
- if (ELReadRegString(key, path, tmp, TEXT("\0")))
+ if (ELReadRegString(key, path, tmp, (WCHAR*)TEXT("\0")))
{
if (_wcsicmp(element, tmp) == 0)
return;
@@ -154,7 +154,7 @@
for (i = 0; i < MAX_HISTORY; i++)
{
swprintf(path, TEXT("%d"), i + 1);
- ELReadRegString(key, path, tmp, TEXT("\0"));
+ ELReadRegString(key, path, tmp, (WCHAR*)TEXT("\0"));
swprintf(path, TEXT("%d"), i);
ELWriteRegString(key, path, tmp);
}
Modified: trunk/Source/emergeCommand/Settings.cpp
===================================================================
--- trunk/Source/emergeCommand/Settings.cpp 2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeCommand/Settings.cpp 2007-08-10 01:05:10 UTC (rev 1400)
@@ -35,28 +35,28 @@
UINT i;
WCHAR *token;
- ELOpenRegKey(TEXT("emergeCommand\\Settings"), &key, true);
- ELReadRegDWord(key, TEXT("X"), (DWORD*)&x, 0);
- ELReadRegDWord(key, TEXT("Y"), (DWORD*)&y, 0);
- ELReadRegDWord(key, TEXT("Width"), &width, 100);
- ELReadRegDWord(key, TEXT("Height"), &height, 100);
- ELReadRegString(key, TEXT("ZPosition"), zPosition, TEXT("normal"));
- ELReadRegString(key, TEXT("ClockTextAlign"), clockTextAlign, TEXT("left"));
- ELReadRegString(key, TEXT("CommandTextAlign"), commandTextAlign, TEXT("left"));
- ELReadRegString(key, TEXT("Scheme"), schemeFile, TEXT("\0"));
- ELReadRegString(key, TEXT("TimeFormat"), timeFormat, TEXT("%m/%d/%y %I:%M:%S %p"));
- ELReadRegString(key, TEXT("TipFormat"), tipFormat, TEXT("%m/%d/%y %I:%M:%S %p"));
- ELReadRegDWord(key, TEXT("SnapMove"), &snapMove, 1);
- ELReadRegString(key, TEXT("Font"), fontString, TEXT("Tahoma-12"));
- ELReadRegDWord(key, TEXT("ClickThrough"), (DWORD*)&clickThrough, 0);
+ ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\Settings"), &key, true);
+ ELReadRegDWord(key, (WCHAR*)TEXT("X"), &x, 0);
+ ELReadRegDWord(key, (WCHAR*)TEXT("Y"), &y, 0);
+ ELReadRegDWord(key, (WCHAR*)TEXT("Width"), &width, 100);
+ ELReadRegDWord(key, (WCHAR*)TEXT("Height"), &height, 100);
+ ELReadRegString(key, (WCHAR*)TEXT("ZPosition"), zPosition, (WCHAR*)TEXT("normal"));
+ ELReadRegString(key, (WCHAR*)TEXT("ClockTextAlign"), clockTextAlign, (WCHAR*)TEXT("left"));
+ ELReadRegString(key, (WCHAR*)TEXT("CommandTextAlign"), commandTextAlign, (WCHAR*)TEXT("left"));
+ ELReadRegString(key, (WCHAR*)TEXT("Scheme"), schemeFile, (WCHAR*)TEXT("\0"));
+ ELReadRegString(key, (WCHAR*)TEXT("TimeFormat"), timeFormat, (WCHAR*)TEXT("%m/%d/%y %I:%M:%S %p"));
+ ELReadRegString(key, (WCHAR*)TEXT("TipFormat"), tipFormat, (WCHAR*)TEXT("%m/%d/%y %I:%M:%S %p"));
+ ELReadRegDWord(key, (WCHAR*)TEXT("SnapMove"), &snapMove, 1);
+ ELReadRegString(key, (WCHAR*)TEXT("Font"), fontString, (WCHAR*)TEXT("Tahoma-12"));
+ ELReadRegDWord(key, (WCHAR*)TEXT("ClickThrough"), (DWORD*)&clickThrough, 0);
tmpRect.left = x;
tmpRect.top = y;
tmpRect.right = tmpRect.left + width;
tmpRect.bottom = tmpRect.top + height;
ELGetDesktopRect(&tmpRect, &deskRect);
- ELReadRegRect(key, TEXT("Resolution"), &resolution, &deskRect);
- ELReadRegDWord(key, TEXT("SnapSize"), &snapSize, 1);
+ ELReadRegRect(key, (WCHAR*)TEXT("Resolution"), &resolution, &deskRect);
+ ELReadRegDWord(key, (WCHAR*)TEXT("SnapSize"), &snapSize, 1);
ELCloseRegKey(key);
HDC hdc = CreateCompatibleDC(NULL);
@@ -89,10 +89,10 @@
(*this).width = width;
(*this).height = height;
- if (ELOpenRegKey(TEXT("emergeCommand\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\Settings"), &key, true))
{
- ELWriteRegDWord(key, TEXT("Width"), &width);
- ELWriteRegDWord(key, TEXT("Height"), &height);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("Width"), &width);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("Height"), &height);
ELCloseRegKey(key);
}
}
@@ -103,24 +103,24 @@
CopyRect(&resolution, deskRect);
- if (ELOpenRegKey(TEXT("emergeCommand\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\Settings"), &key, true))
{
- ELWriteRegRect(key, TEXT("Resolution"), &resolution);
+ ELWriteRegRect(key, (WCHAR*)TEXT("Resolution"), &resolution);
ELCloseRegKey(key);
}
}
-void Settings::SetPosition(int x, int y)
+void Settings::SetPosition(DWORD x, DWORD y)
{
HKEY key;
(*this).x = x;
(*this).y = y;
- if (ELOpenRegKey(TEXT("emergeCommand\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\Settings"), &key, true))
{
- ELWriteRegDWord(key, TEXT("X"), (DWORD*)&x);
- ELWriteRegDWord(key, TEXT("Y"), (DWORD*)&y);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("X"), &x);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("Y"), &y);
ELCloseRegKey(key);
}
}
@@ -140,9 +140,9 @@
fontHeight = MulDiv(logFont->lfHeight, 72, GetDeviceCaps(hdc, LOGPIXELSY));
swprintf(fontString, TEXT("%s-%d"), _wcsdup(fontString), -fontHeight);
- if (ELOpenRegKey(TEXT("emergeCommand\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\Settings"), &key, true))
{
- ELWriteRegString(key, TEXT("Font"), fontString);
+ ELWriteRegString(key, (WCHAR*)TEXT("Font"), fontString);
ELCloseRegKey(key);
}
@@ -236,9 +236,9 @@
(*this).clickThrough = tmp;
- if (ELOpenRegKey(TEXT("emergeCommand\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\Settings"), &key, true))
{
- ELWriteRegDWord(key, TEXT("ClickThrough"), &tmp);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("ClickThrough"), &tmp);
ELCloseRegKey(key);
}
}
@@ -255,9 +255,9 @@
(*this).snapMove = snapMove;
- if (ELOpenRegKey(TEXT("emergeCommand\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\Settings"), &key, true))
{
- ELWriteRegDWord(key, TEXT("SnapMove"), &tmp);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("SnapMove"), &tmp);
ELCloseRegKey(key);
}
}
@@ -274,9 +274,9 @@
(*this).snapSize = snapSize;
- if (ELOpenRegKey(TEXT("emergeCommand\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\Settings"), &key, true))
{
- ELWriteRegDWord(key, TEXT("SnapSize"), &tmp);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("SnapSize"), &tmp);
ELCloseRegKey(key);
}
}
@@ -287,9 +287,9 @@
wcscpy((*this).zPosition, zPosition);
- if (ELOpenRegKey(TEXT("emergeCommand\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\Settings"), &key, true))
{
- ELWriteRegString(key, TEXT("ZPosition"), zPosition);
+ ELWriteRegString(key, (WCHAR*)TEXT("ZPosition"), zPosition);
ELCloseRegKey(key);
}
}
@@ -300,9 +300,9 @@
wcscpy((*this).clockTextAlign, clockTextAlign);
- if (ELOpenRegKey(TEXT("emergeCommand\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\Settings"), &key, true))
{
- ELWriteRegString(key, TEXT("ClockTextAlign"), clockTextAlign);
+ ELWriteRegString(key, (WCHAR*)TEXT("ClockTextAlign"), clockTextAlign);
ELCloseRegKey(key);
}
}
@@ -313,9 +313,9 @@
wcscpy((*this).commandTextAlign, commandTextAlign);
- if (ELOpenRegKey(TEXT("emergeCommand\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\Settings"), &key, true))
{
- ELWriteRegString(key, TEXT("CommandTextAlign"), commandTextAlign);
+ ELWriteRegString(key, (WCHAR*)TEXT("CommandTextAlign"), commandTextAlign);
ELCloseRegKey(key);
}
}
@@ -326,9 +326,9 @@
wcscpy((*this).timeFormat, timeFormat);
- if (ELOpenRegKey(TEXT("emergeCommand\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\Settings"), &key, true))
{
- ELWriteRegString(key, TEXT("TimeFormat"), timeFormat);
+ ELWriteRegString(key, (WCHAR*)TEXT("TimeFormat"), timeFormat);
ELCloseRegKey(key);
}
}
@@ -339,9 +339,9 @@
wcscpy((*this).tipFormat, tipFormat);
- if (ELOpenRegKey(TEXT("emergeCommand\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\Settings"), &key, true))
{
- ELWriteRegString(key, TEXT("TipFormat"), tipFormat);
+ ELWriteRegString(key, (WCHAR*)TEXT("TipFormat"), tipFormat);
ELCloseRegKey(key);
}
}
@@ -352,9 +352,9 @@
wcscpy((*this).schemeFile, schemeFile);
- if (ELOpenRegKey(TEXT("emergeCommand\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeCommand\\Settings"), &key, true))
{
- ELWriteRegString(key, TEXT("Scheme"), schemeFile);
+ ELWriteRegString(key, (WCHAR*)TEXT("Scheme"), schemeFile);
ELCloseRegKey(key);
}
}
Modified: trunk/Source/emergeCommand/Settings.h
===================================================================
--- trunk/Source/emergeCommand/Settings.h 2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeCommand/Settings.h 2007-08-10 01:05:10 UTC (rev 1400)
@@ -49,7 +49,7 @@
LOGFONT *GetFont();
bool GetClickThrough();
void SetFont(LOGFONT *logFont);
- void SetPosition(int x, int y);
+ void SetPosition(DWORD x, DWORD y);
void SetSize(DWORD width, DWORD height);
void SetZPosition(WCHAR *zPosition);
void SetSchemeFile(WCHAR *schemeFile);
@@ -63,7 +63,7 @@
private:
DWORD clickThrough;
DWORD width, height;
- int x, y;
+ DWORD x, y;
DWORD snapSize, snapMove;
WCHAR zPosition[MAX_LINE_LENGTH];
WCHAR schemeFile[MAX_LINE_LENGTH];
Modified: trunk/Source/emergeCore/Core.cpp
===================================================================
--- trunk/Source/emergeCore/Core.cpp 2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeCore/Core.cpp 2007-08-10 01:05:10 UTC (rev 1400)
@@ -63,8 +63,8 @@
WCHAR installDir[MAX_PATH];
ELGetCurrentPath(installDir);
- ELOpenRegKey(TEXT("emergeCore\\Settings"), &key, true);
- ELWriteRegString(key, TEXT("InstallDir"), installDir);
+ ELOpenRegKey((WCHAR*)TEXT("emergeCore\\Settings"), &key, true);
+ ELWriteRegString(key, (WCHAR*)TEXT("InstallDir"), installDir);
ELCloseRegKey(key);
WNDCLASSEX wincl;
@@ -116,8 +116,8 @@
pMessageControl = new MessageControl();
// Launch additional Emerge Desktop applets
- ELOpenRegKey(TEXT("emergeCore\\Launch"), &key, true);
- if (!pShell->RunRegEntries(key, false) && !wcsstr(commandLine, TEXT("/noautostart")))
+ ELOpenRegKey((WCHAR*)TEXT("emergeCore\\Launch"), &key, true);
+ if (!pShell->RunRegEntries(key, false) && !wcsstr(commandLine, (WCHAR*)TEXT("/noautostart")))
{
bool rerun = false;
WCHAR tmp[MAX_LINE_LENGTH];
@@ -127,7 +127,7 @@
if (PathFileExists(tmp))
{
rerun = true;
- ELWriteRegString(key, TEXT("10"), tmp);
+ ELWriteRegString(key, (WCHAR*)TEXT("10"), tmp);
}
wcscpy(tmp, installDir);
@@ -135,7 +135,7 @@
if (PathFileExists(tmp))
{
rerun = true;
- ELWriteRegString(key, TEXT("11"), tmp);
+ ELWriteRegString(key, (WCHAR*)TEXT("11"), tmp);
}
wcscpy(tmp, installDir);
@@ -143,7 +143,7 @@
if (PathFileExists(tmp))
{
rerun = true;
- ELWriteRegString(key, TEXT("12"), tmp);
+ ELWriteRegString(key, (WCHAR*)TEXT("12"), tmp);
}
if (rerun)
Modified: trunk/Source/emergeCore/DDEWorker.cpp
===================================================================
--- trunk/Source/emergeCore/DDEWorker.cpp 2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeCore/DDEWorker.cpp 2007-08-10 01:05:10 UTC (rev 1400)
@@ -579,9 +579,10 @@
{
WCHAR szPath[MAX_LINE_LENGTH];
HRESULT hr;
- IShellLink* pShellLink;
- IPersistFile* pPersistFile;
+ IShellLink* pShellLink = NULL;
+ IPersistFile* pPersistFile = NULL;
BOOL bReturn = FALSE;
+ LPVOID lpVoid;
// check that we've set a current group via showgroup or creategroup
if (m_szCurrentGroup[0])
@@ -615,8 +616,9 @@
wsprintf(szPath, TEXT("%s\\%s.lnk"), m_szCurrentGroup, szDesc);
+ lpVoid = pShellLink;
hr = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
- IID_IShellLink, (LPVOID*) & pShellLink);
+ IID_IShellLink, &lpVoid);
if (SUCCEEDED(hr))
{
// Set the shortcut info.
@@ -633,7 +635,8 @@
}
// Save it.
- hr = pShellLink->QueryInterface(IID_IPersistFile, (LPVOID*) & pPersistFile);
+ lpVoid = pPersistFile;
+ hr = pShellLink->QueryInterface(IID_IPersistFile, &lpVoid);
if (SUCCEEDED(hr))
{
WCHAR wsz[MAX_LINE_LENGTH];
Modified: trunk/Source/emergeCore/LaunchEditor.cpp
===================================================================
--- trunk/Source/emergeCore/LaunchEditor.cpp 2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeCore/LaunchEditor.cpp 2007-08-10 01:05:10 UTC (rev 1400)
@@ -153,15 +153,15 @@
ELStealFocus(hwndDlg);
lvCol.mask = LVCF_TEXT | LVCF_WIDTH;
- lvCol.pszText = TEXT("Applet");
+ lvCol.pszText = (WCHAR*)TEXT("Applet");
lvCol.cx = 160;
ListView_InsertColumn(listWnd, 0, &lvCol);
- lvCol.pszText = TEXT("Version");
+ lvCol.pszText = (WCHAR*)TEXT("Version");
lvCol.cx = 100;
ListView_InsertColumn(listWnd, 1, &lvCol);
- lvCol.pszText = TEXT("Path");
+ lvCol.pszText = (WCHAR*)TEXT("Path");
lvCol.cx = 320;
ListView_InsertColumn(listWnd, 2, &lvCol);
@@ -191,43 +191,43 @@
ti.hwnd = addWnd;
ti.uId = (UINT)addWnd;
ti.hinst = hInstance;
- ti.lpszText = TEXT("Add Launch Applet");
+ ti.lpszText = (WCHAR*)TEXT("Add Launch Applet");
GetClientRect(addWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = delWnd;
ti.uId = (UINT)delWnd;
- ti.lpszText = TEXT("Delete Launch Applet");
+ ti.lpszText = (WCHAR*)TEXT("Delete Launch Applet");
GetClientRect(delWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = startWnd;
ti.uId = (UINT)startWnd;
- ti.lpszText = TEXT("Start Launch Applet");
+ ti.lpszText = (WCHAR*)TEXT("Start Launch Applet");
GetClientRect(startWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = stopWnd;
ti.uId = (UINT)stopWnd;
- ti.lpszText = TEXT("Stop Launch Applet");
+ ti.lpszText = (WCHAR*)TEXT("Stop Launch Applet");
GetClientRect(stopWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = browseWnd;
ti.uId = (UINT)browseWnd;
- ti.lpszText = TEXT("Browse for Launch Applet");
+ ti.lpszText = (WCHAR*)TEXT("Browse for Launch Applet");
GetClientRect(browseWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = upWnd;
ti.uId = (UINT)upWnd;
- ti.lpszText = TEXT("Move Launch Applet Up");
+ ti.lpszText = (WCHAR*)TEXT("Move Launch Applet Up");
GetClientRect(upWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = downWnd;
ti.uId = (UINT)downWnd;
- ti.lpszText = TEXT("Move Launch Applet Down");
+ ti.lpszText = (WCHAR*)TEXT("Move Launch Applet Down");
GetClientRect(downWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
@@ -453,7 +453,7 @@
int i = 0;
HKEY key;
- ELOpenRegKey(TEXT("emergeCore\\Launch"), &key, true);
+ ELOpenRegKey((WCHAR*)TEXT("emergeCore\\Launch"), &key, true);
// Loop while there are entries in the key and remove them
@@ -498,7 +498,7 @@
lvItem.mask = LVIF_TEXT;
- ELOpenRegKey(TEXT("emergeCore\\Launch"), &key, true);
+ ELOpenRegKey((WCHAR*)TEXT("emergeCore\\Launch"), &key, true);
// Loop while there are entries in the key
while (RegEnumValue(key, index, value, &valueSize, NULL, &type, data, &dataSize) == ERROR_SUCCESS)
Modified: trunk/Source/emergeCore/ShellChanger.cpp
===================================================================
--- trunk/Source/emergeCore/ShellChanger.cpp 2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeCore/ShellChanger.cpp 2007-08-10 01:05:10 UTC (rev 1400)
@@ -140,37 +140,37 @@
ti.hwnd = addWnd;
ti.uId = (UINT)addWnd;
ti.hinst = hInstance;
- ti.lpszText = TEXT("Add Shell Item");
+ ti.lpszText = (WCHAR*)TEXT("Add Shell Item");
GetClientRect(addWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = editWnd;
ti.uId = (UINT)editWnd;
- ti.lpszText = TEXT("Edit Shell Item");
+ ti.lpszText = (WCHAR*)TEXT("Edit Shell Item");
GetClientRect(editWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = delWnd;
ti.uId = (UINT)delWnd;
- ti.lpszText = TEXT("Delete Shell Item");
+ ti.lpszText = (WCHAR*)TEXT("Delete Shell Item");
GetClientRect(delWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = saveWnd;
ti.uId = (UINT)saveWnd;
- ti.lpszText = TEXT("Save Changes");
+ ti.lpszText = (WCHAR*)TEXT("Save Changes");
GetClientRect(delWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = abortWnd;
ti.uId = (UINT)abortWnd;
- ti.lpszText = TEXT("Discard Changes");
+ ti.lpszText = (WCHAR*)TEXT("Discard Changes");
GetClientRect(delWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = browseWnd;
ti.uId = (UINT)browseWnd;
- ti.lpszText = TEXT("Browse for File");
+ ti.lpszText = (WCHAR*)TEXT("Browse for File");
GetClientRect(browseWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
@@ -225,7 +225,7 @@
SendMessage(shellWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Emerge Desktop"));
SendMessage(shellWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Windows Explorer"));
- ELOpenRegKey(TEXT("emergeCore\\Shells"), &key, true);
+ ELOpenRegKey((WCHAR*)TEXT("emergeCore\\Shells"), &key, true);
size = MAX_LINE_LENGTH * sizeof(subkeyName[0]);
while (RegEnumKeyEx(key, index, subkeyName, &size, NULL, NULL, NULL, NULL) == ERROR_SUCCESS)
@@ -235,8 +235,8 @@
wcscat(subkeyString, subkeyName);
ELOpenRegKey(subkeyString, &subkey, true);
- ELReadRegString(subkey, TEXT("name"), name, TEXT("\0"));
- ELReadRegString(subkey, TEXT("command"), command, TEXT("\0"));
+ ELReadRegString(subkey, (WCHAR*)TEXT("name"), name, (WCHAR*)TEXT("\0"));
+ ELReadRegString(subkey, (WCHAR*)TEXT("command"), command, (WCHAR*)TEXT("\0"));
ELCloseRegKey(subkey);
if (doCheck)
@@ -451,7 +451,7 @@
HKEY key;
ShellItemMap::iterator iter;
- ELDeleteRegKey(TEXT("emergeCore\\Shells"));
+ ELDeleteRegKey((WCHAR*)TEXT("emergeCore\\Shells"));
while (index < count)
{
@@ -461,8 +461,8 @@
if (ELOpenRegKey(subKey, &key, true))
{
- ELWriteRegString(key, TEXT("name"), name);
- ELWriteRegString(key, TEXT("command"), (WCHAR*)iter->second.c_str());
+ ELWriteRegString(key, (WCHAR*)TEXT("name"), name);
+ ELWriteRegString(key, (WCHAR*)TEXT("command"), (WCHAR*)iter->second.c_str());
ELCloseRegKey(key);
i++;
Modified: trunk/Source/emergeDesktop/Desktop.cpp
===================================================================
--- trunk/Source/emergeDesktop/Desktop.cpp 2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeDesktop/Desktop.cpp 2007-08-10 01:05:10 UTC (rev 1400)
@@ -536,12 +536,12 @@
wcscpy(subkeyString, inputString);
wcscat(subkeyString, subkeyName);
ELOpenRegKey(subkeyString, &subkey, true);
- ELReadRegDWord(subkey, TEXT("type"), &type, 0);
+ ELReadRegDWord(subkey, (WCHAR*)TEXT("type"), &type, 0);
// Separator
if (type == 0)
{
- MenuItem *menuItem = new MenuItem(type, TEXT("\0"), TEXT("\0"));
+ MenuItem *menuItem = new MenuItem(type, (WCHAR*)TEXT("\0"), (WCHAR*)TEXT("\0"));
itemInfo.fMask = MIIM_FTYPE;
itemInfo.cbSize = sizeof(MENUITEMINFO);
@@ -571,11 +571,11 @@
// Executable
if (type == 1)
{
- if (ELReadRegString(subkey, TEXT("value"), value, TEXT("\0")))
+ if (ELReadRegString(subkey, (WCHAR*)TEXT("value"), value, (WCHAR*)TEXT("\0")))
{
- ELReadRegString(subkey, TEXT("workingdir"), workingDir, TEXT("\0"));
+ ELReadRegString(subkey, (WCHAR*)TEXT("workingdir"), workingDir, (WCHAR*)TEXT("\0"));
MenuItem *menuItem = new MenuItem(type, value, workingDir);
- ELReadRegString(subkey, TEXT("name"), name, TEXT("\0"));
+ ELReadRegString(subkey, (WCHAR*)TEXT("name"), name, (WCHAR*)TEXT("\0"));
NoPrefixString(name);
itemInfo.fMask = MIIM_STRING | MIIM_ID;
@@ -617,15 +617,15 @@
// System Command
if (type == 2)
{
- if (ELReadRegString(subkey, TEXT("value"), value, TEXT("\0")))
+ if (ELReadRegString(subkey, (WCHAR*)TEXT("value"), value, (WCHAR*)TEXT("\0")))
{
- ELReadRegString(subkey, TEXT("name"), name, TEXT("\0"));
+ ELReadRegString(subkey, (WCHAR*)TEXT("name"), name, (WCHAR*)TEXT("\0"));
if (_wcsicmp(name, TEXT("DateTime")) == 0)
type = 3;
else
{
NoPrefixString(name);
- MenuItem *menuItem = new MenuItem(type, value, TEXT("\0"));
+ MenuItem *menuItem = new MenuItem(type, value, (WCHAR*)TEXT("\0"));
itemInfo.fMask = MIIM_STRING | MIIM_ID;
itemInfo.cbSize = sizeof(MENUITEMINFO);
@@ -666,9 +666,9 @@
if (type == 3)
{
- if (ELReadRegString(subkey, TEXT("value"), value, TEXT("\0")))
+ if (ELReadRegString(subkey, (WCHAR*)TEXT("value"), value, (WCHAR*)TEXT("\0")))
{
- MenuItem *menuItem = new MenuItem(type, value, TEXT("\0"));
+ MenuItem *menuItem = new MenuItem(type, value, (WCHAR*)TEXT("\0"));
time_t tVal;
struct tm *stVal;
@@ -699,10 +699,10 @@
// Special Folder
if (type == 4)
{
- if (ELReadRegString(subkey, TEXT("value"), value, TEXT("\0")))
+ if (ELReadRegString(subkey, (WCHAR*)TEXT("value"), value, (WCHAR*)TEXT("\0")))
{
- MenuItem *menuItem = new MenuItem(type, value, TEXT("\0"));
- ELReadRegString(subkey, TEXT("name"), name, TEXT("\0"));
+ MenuItem *menuItem = new MenuItem(type, value, (WCHAR*)TEXT("\0"));
+ ELReadRegString(subkey, (WCHAR*)TEXT("name"), name, (WCHAR*)TEXT("\0"));
NoPrefixString(name);
itemInfo.fMask = MIIM_STRING | MIIM_ID;
@@ -744,10 +744,10 @@
// Registry based submenu
if (type == 100)
{
- ELReadRegString(subkey, TEXT("name"), name, TEXT("\0"));
+ ELReadRegString(subkey, (WCHAR*)TEXT("name"), name, (WCHAR*)TEXT("\0"));
wcscpy(tmp, subkeyString);
wcscat(tmp, TEXT("\\"));
- MenuItem *menuItem = new MenuItem(type, TEXT("\0"), TEXT("\0"));
+ MenuItem *menuItem = new MenuItem(type, (WCHAR*)TEXT("\0"), (WCHAR*)TEXT("\0"));
MenuListItem *mli = new MenuListItem(type, tmp);
NoPrefixString(name);
@@ -792,10 +792,10 @@
// Path based submenu
if (type == 101)
{
- ELReadRegString(subkey, TEXT("name"), name, TEXT("\0"));
- ELReadRegString(subkey, TEXT("value"), value, TEXT("\0"));
+ ELReadRegString(subkey, (WCHAR*)TEXT("name"), name, (WCHAR*)TEXT("\0"));
+ ELReadRegString(subkey, (WCHAR*)TEXT("value"), value, (WCHAR*)TEXT("\0"));
ExpandVars(value);
- MenuItem *menuItem = new MenuItem(type, value, TEXT("\0"));
+ MenuItem *menuItem = new MenuItem(type, value, (WCHAR*)TEXT("\0"));
MenuListItem *mli = new MenuListItem(type, value);
NoPrefixString(name);
@@ -840,9 +840,9 @@
// Tasks(102) or Settings(103) submenu
if ((type == 102) || (type == 103))
{
- ELReadRegString(subkey, TEXT("name"), name, TEXT("\0"));
- MenuItem *menuItem = new MenuItem(type, TEXT("\0"), TEXT("\0"));
- MenuListItem *mli = new MenuListItem(type, TEXT("\0"));
+ ELReadRegString(subkey, (WCHAR*)TEXT("name"), name, (WCHAR*)TEXT("\0"));
+ MenuItem *menuItem = new MenuItem(type, (WCHAR*)TEXT("\0"), (WCHAR*)TEXT("\0"));
+ MenuListItem *mli = new MenuListItem(type, (WCHAR*)TEXT("\0"));
NoPrefixString(name);
itemInfo.fMask = MIIM_STRING | MIIM_ID | MIIM_SUBMENU;
@@ -950,16 +950,16 @@
wcscat(destkeyString, TEXT("\\"));
ELOpenRegKey(destkeyString, &destKey, true);
- if (ELReadRegDWord(subKey, TEXT("type"), &type, 0))
+ if (ELReadRegDWord(subKey, (WCHAR*)TEXT("type"), &type, 0))
{
- ELWriteRegDWord(destKey, TEXT("type"), &type);
+ ELWriteRegDWord(destKey, (WCHAR*)TEXT("type"), &type);
if (type == 100)
MigrateSubmenu(subkeyString, destkeyString);
}
- if (ELReadRegString(subKey, TEXT("value"), value, TEXT("\0")))
- ELWriteRegString(destKey, TEXT("value"), value);
- if (ELReadRegString(subKey, TEXT("name"), name, TEXT("\0")))
- ELWriteRegString(destKey, TEXT("name"), name);
+ if (ELReadRegString(subKey, (WCHAR*)TEXT("value"), value, (WCHAR*)TEXT("\0")))
+ ELWriteRegString(destKey, (WCHAR*)TEXT("value"), value);
+ if (ELReadRegString(subKey, (WCHAR*)TEXT("name"), name, (WCHAR*)TEXT("\0")))
+ ELWriteRegString(destKey, (WCHAR*)TEXT("name"), name);
ELCloseRegKey(subKey);
ELCloseRegKey(destKey);
@@ -978,8 +978,8 @@
{
WCHAR expandedPath[MAX_LINE_LENGTH];
- ExpandEmergeVar(value, TEXT("%CommonStartMenu%"));
- ExpandEmergeVar(value, TEXT("%StartMenu%"));
+ ExpandEmergeVar(value, (WCHAR*)TEXT("%CommonStartMenu%"));
+ ExpandEmergeVar(value, (WCHAR*)TEXT("%StartMenu%"));
ExpandEnvironmentStrings(value, expandedPath, MAX_LINE_LENGTH);
wcscpy(value, expandedPath);
@@ -1042,157 +1042,157 @@
type = 4;
if (ELOpenRegKey(tmp, &key, true))
{
- wcscpy(specialFolder, ELGetSpecialFolder(FOLDER_MYCOMPUTER));
- ELWriteRegDWord(key, TEXT("Type"), &type);
- ELWriteRegString(key, TEXT("Name"), specialFolder);
- ELWriteRegString(key, TEXT("Value"), specialFolder);
+ ELGetSpecialFolder(FOLDER_MYCOMPUTER, specialFolder);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("Type"), &type);
+ ELWriteRegString(key, (WCHAR*)TEXT("Name"), specialFolder);
+ ELWriteRegString(key, (WCHAR*)TEXT("Value"), specialFolder);
ELCloseRegKey(key);
}
wcscpy(tmp, inputString);
- wcscat(tmp, TEXT("11\\"));
+ wcscat(tmp, (WCHAR*)TEXT("11\\"));
type = 0;
if (ELOpenRegKey(tmp, &key, true))
{
- ELWriteRegDWord(key, TEXT("Type"), &type);
- ELWriteRegString(key, TEXT("Name"), TEXT("\0"));
- ELWriteRegString(key, TEXT("Value"), TEXT("\0"));
+ ELWriteRegDWord(key, (WCHAR*)TEXT("Type"), &type);
+ ELWriteRegString(key, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("\0"));
+ ELWriteRegString(key, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("\0"));
ELCloseRegKey(key);
}
wcscpy(tmp, inputString);
- wcscat(tmp, TEXT("12\\"));
+ wcscat(tmp, (WCHAR*)TEXT("12\\"));
type = 0x65;
if (ELOpenRegKey(tmp, &key, true))
{
- ELWriteRegDWord(key, TEXT("Type"), &type);
- ELWriteRegString(key, TEXT("Name"), TEXT("Start Menu"));
- ELWriteRegString(key, TEXT("Value"), TEXT("%StartMenu%|%CommonStartMenu%"));
+ ELWriteRegDWord(key, (WCHAR*)TEXT("Type"), &type);
+ ELWriteRegString(key, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Start Menu"));
+ ELWriteRegString(key, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("%StartMenu%|%CommonStartMenu%"));
ELCloseRegKey(key);
}
wcscpy(tmp, inputString);
- wcscat(tmp, TEXT("13\\"));
+ wcscat(tmp, (WCHAR*)TEXT("13\\"));
type = 0;
if (ELOpenRegKey(tmp, &key, true))
{
- ELWriteRegDWord(key, TEXT("Type"), &type);
- ELWriteRegString(key, TEXT("Name"), TEXT("\0"));
- ELWriteRegString(key, TEXT("Value"), TEXT("\0"));
+ ELWriteRegDWord(key, (WCHAR*)TEXT("Type"), &type);
+ ELWriteRegString(key, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("\0"));
+ ELWriteRegString(key, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("\0"));
ELCloseRegKey(key);
}
wcscpy(tmp, inputString);
- wcscat(tmp, TEXT("14\\"));
+ wcscat(tmp, (WCHAR*)TEXT("14\\"));
type = 103;
if (ELOpenRegKey(tmp, &key, true))
{
- ELWriteRegDWord(key, TEXT("Type"), &type);
- ELWriteRegString(key, TEXT("Name"), TEXT("Settings"));
- ELWriteRegString(key, TEXT("Value"), TEXT("\0"));
+ ELWriteRegDWord(key, (WCHAR*)TEXT("Type"), &type);
+ ELWriteRegString(key, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Settings"));
+ ELWriteRegString(key, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("\0"));
ELCloseRegKey(key);
}
wcscpy(tmp, inputString);
- wcscat(tmp, TEXT("15\\"));
+ wcscat(tmp, (WCHAR*)TEXT("15\\"));
type = 0;
if (ELOpenRegKey(tmp, &key, true))
{
- ELWriteRegDWord(key, TEXT("Type"), &type);
- ELWriteRegString(key, TEXT("Name"), TEXT("\0"));
- ELWriteRegString(key, TEXT("Value"), TEXT("\0"));
+ ELWriteRegDWord(key, (WCHAR*)TEXT("Type"), &type);
+ ELWriteRegString(key, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("\0"));
+ ELWriteRegString(key, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("\0"));
ELCloseRegKey(key);
}
wcscpy(tmp, inputString);
- wcscat(tmp, TEXT("16\\"));
+ wcscat(tmp, (WCHAR*)TEXT("16\\"));
type = 2;
if (ELOpenRegKey(tmp, &key, true))
{
- ELWriteRegDWord(key, TEXT("Type"), &type);
- ELWriteRegString(key, TEXT("Name"), TEXT("Run"));
- ELWriteRegString(key, TEXT("Value"), TEXT("Run"));
+ ELWriteRegDWord(key, (WCHAR*)TEXT("Type"), &type);
+ ELWriteRegString(key, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Run"));
+ ELWriteRegString(key, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("Run"));
ELCloseRegKey(key);
}
wcscpy(tmp, inputString);
- wcscat(tmp, TEXT("17\\"));
+ wcscat(tmp, (WCHAR*)TEXT("17\\"));
type = 2;
if (ELOpenRegKey(tmp, &key, true))
{
- ELWriteRegDWord(key, TEXT("Type"), &type);
- ELWriteRegString(key, TEXT("Name"), TEXT("Logoff"));
- ELWriteRegString(key, TEXT("Value"), TEXT("Logoff"));
+ ELWriteRegDWord(key, (WCHAR*)TEXT("Type"), &type);
+ ELWriteRegString(key, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Logoff"));
+ ELWriteRegString(key, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("Logoff"));
ELCloseRegKey(key);
}
wcscpy(tmp, inputString);
- wcscat(tmp, TEXT("18\\"));
+ wcscat(tmp, (WCHAR*)TEXT("18\\"));
type = 2;
if (ELOpenRegKey(tmp, &key, true))
{
- ELWriteRegDWord(key, TEXT("Type"), &type);
- ELWriteRegString(key, TEXT("Name"), TEXT("Shutdown"));
- ELWriteRegString(key, TEXT("Value"), TEXT("Shutdown"));
+ ELWriteRegDWord(key, (WCHAR*)TEXT("Type"), &type);
+ ELWriteRegString(key, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Shutdown"));
+ ELWriteRegString(key, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("Shutdown"));
ELCloseRegKey(key);
}
}
else if (menuType == MENU_MID)
{
- wcscpy(inputString, TEXT("emergeDesktop\\MidMenu\\"));
+ wcscpy(inputString, (WCHAR*)TEXT("emergeDesktop\\MidMenu\\"));
wcscpy(tmp, inputString);
- wcscat(tmp, TEXT("10\\"));
+ wcscat(tmp, (WCHAR*)TEXT("10\\"));
type = 102;
if (ELOpenRegKey(tmp, &key, true))
{
- ELWriteRegDWord(key, TEXT("Type"), &type);
- ELWriteRegString(key, TEXT("Name"), TEXT("Tasks"));
- ELWriteRegString(key, TEXT("Value"), TEXT("\0"));
+ ELWriteRegDWord(key, (WCHAR*)TEXT("Type"), &type);
+ ELWriteRegString(key, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Tasks"));
+ ELWriteRegString(key, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("\0"));
ELCloseRegKey(key);
}
wcscpy(tmp, inputString);
- wcscat(tmp, TEXT("11\\"));
+ wcscat(tmp, (WCHAR*)TEXT("11\\"));
type = 0;
if (ELOpenRegKey(tmp, &key, true))
{
- ELWriteRegDWord(key, TEXT("Type"), &type);
- ELWriteRegString(key, TEXT("Name"), TEXT("\0"));
- ELWriteRegString(key, TEXT("Value"), TEXT("\0"));
+ ELWriteRegDWord(key, (WCHAR*)TEXT("Type"), &type);
+ ELWriteRegString(key, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("\0"));
+ ELWriteRegString(key, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("\0"));
ELCloseRegKey(key);
}
wcscpy(tmp, inputString);
- wcscat(tmp, TEXT("12\\"));
+ wcscat(tmp, (WCHAR*)TEXT("12\\"));
type = 2;
if (ELOpenRegKey(tmp, &key, true))
{
- ELWriteRegDWord(key, TEXT("Type"), &type);
- ELWriteRegString(key, TEXT("Name"), TEXT("Show Applets"));
- ELWriteRegString(key, TEXT("Value"), TEXT("Show"));
+ ELWriteRegDWord(key, (WCHAR*)TEXT("Type"), &type);
+ ELWriteRegString(key, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Show Applets"));
+ ELWriteRegString(key, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("Show"));
ELCloseRegKey(key);
}
wcscpy(tmp, inputString);
- wcscat(tmp, TEXT("13\\"));
+ wcscat(tmp, (WCHAR*)TEXT("13\\"));
type = 2;
if (ELOpenRegKey(tmp, &key, true))
{
- ELWriteRegDWord(key, TEXT("Type"), &type);
- ELWriteRegString(key, TEXT("Name"), TEXT("Hide Applets"));
- ELWriteRegString(key, TEXT("Value"), TEXT("Hide"));
+ ELWriteRegDWord(key, (WCHAR*)TEXT("Type"), &type);
+ ELWriteRegString(key, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Hide Applets"));
+ ELWriteRegString(key, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("Hide"));
ELCloseRegKey(key);
}
wcscpy(tmp, inputString);
- wcscat(tmp, TEXT("14\\"));
+ wcscat(tmp, (WCHAR*)TEXT("14\\"));
type = 2;
if (ELOpenRegKey(tmp, &key, true))
{
- ELWriteRegDWord(key, TEXT("Type"), &type);
- ELWriteRegString(key, TEXT("Name"), TEXT("Show Desktop"));
- ELWriteRegString(key, TEXT("Value"), TEXT("ShowDesktop"));
+ ELWriteRegDWord(key, (WCHAR*)TEXT("Type"), &type);
+ ELWriteRegString(key, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Show Desktop"));
+ ELWriteRegString(key, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("ShowDesktop"));
ELCloseRegKey(key);
}
}
@@ -1257,7 +1257,7 @@
if (!GetPos(menuType, location, findData.cFileName, true, &folderPos, &itemID, &itemData))
{
- menuItem = new MenuItem(101, tmp, TEXT("\0"));
+ menuItem = new MenuItem(101, tmp, (WCHAR*)TEXT("\0"));
MENUITEMINFO itemInfo;
itemInfo.fMask = MIIM_STRING | MIIM_ID | MIIM_SUBMENU | MIIM_DATA;
@@ -1363,8 +1363,8 @@
else if ((wcsstr(_wcslwr(_wcsdup(entry)), TEXT(".url")) != NULL) &&
(wcsstr(_wcslwr(_wcsdup(menuItem->GetValue())), TEXT(".url")) != NULL))
{
- if (ELReadFileString(entry, TEXT("URL"), entryURL, TEXT("")) &&
- ELReadFileString(menuItem->GetValue(), TEXT("URL"), targetURL, TEXT("")))
+ if (ELReadFileString(entry, (WCHAR*)TEXT("URL"), entryURL, (WCHAR*)TEXT("")) &&
+ ELReadFileString(menuItem->GetValue(), (WCHAR*)TEXT("URL"), targetURL, (WCHAR*)TEXT("")))
{
if (wcsicmp(entryURL, targetURL) == 0)
continue;
@@ -1372,7 +1372,7 @@
}
}
- menuItem = new MenuItem(1, entry, TEXT("\0"));
+ menuItem = new MenuItem(1, entry, (WCHAR*)TEXT("\0"));
itemInfo.fMask = MIIM_STRING | MIIM_ID;
@@ -1471,7 +1471,7 @@
NoPrefixString(windowTitle);
swprintf(tmp, TEXT("%d"), (int)task);
- menuItem = new MenuItem(0, tmp, TEXT("\0"));
+ menuItem = new MenuItem(0, tmp, (WCHAR*)TEXT("\0"));
itemInfo.fMask = MIIM_STRING | MIIM_ID;
@@ -1576,7 +1576,7 @@
{
case WM_RBUTTONDOWN:
if (menuList.empty())
- menuList.push_back(new MenuListItem(100, TEXT("emergeDesktop\\RightMenu\\")));
+ menuList.push_back(new MenuListItem(100, (WCHAR*)TEXT("emergeDesktop\\RightMenu\\")));
itemID = TrackPopupMenuEx(menuList[0]->GetMenu(), TPM_RETURNCMD, mousePT.x, mousePT.y, hwnd, NULL);
if (itemID != 0)
@@ -1599,7 +1599,7 @@
}
if (menuListMid.empty())
- menuListMid.push_back(new MenuListItem(100, TEXT("emergeDesktop\\MidMenu\\")));
+ menuListMid.push_back(new MenuListItem(100, (WCHAR*)TEXT("emergeDesktop\\MidMenu\\")));
itemID = TrackPopupMenuEx(menuListMid[0]->GetMenu(), TPM_RETURNCMD, mousePT.x, mousePT.y, hwnd, NULL);
if (itemID != 0)
@@ -1785,16 +1785,16 @@
void Desktop::BuildSettingsMenu(UINT menuType, UINT location)
{
- AddSettingsItem(menuType, location, TEXT("Configure"), 0);
- AddSettingsItem(menuType, location, TEXT("Edit Launch Applets"), 1);
- AddSettingsItem(menuType, location, TEXT("Edit Desktop Menus"), 2);
- AddSettingsItem(menuType, location, TEXT("Change Desktop Shell"), 3);
+ AddSettingsItem(menuType, location, (WCHAR*)TEXT("Configure"), 0);
+ AddSettingsItem(menuType, location, (WCHAR*)TEXT("Edit Launch Applets"), 1);
+ AddSettingsItem(menuType, location, (WCHAR*)TEXT("Edit Desktop Menus"), 2);
+ AddSettingsItem(menuType, location, (WCHAR*)TEXT("Change Desktop Shell"), 3);
}
void Desktop::AddSettingsItem(UINT menuType, UINT location, WCHAR* text, UINT index)
{
MENUITEMINFO itemInfo;
- MenuItem *menuItem = new MenuItem(0, text, TEXT("\0"));
+ MenuItem *menuItem = new MenuItem(0, text, (WCHAR*)TEXT("\0"));
itemInfo.fMask = MIIM_STRING | MIIM_ID;
itemInfo.cbSize = sizeof(MENUITEMINFO);
@@ -1901,11 +1901,11 @@
}
}
if (index == 1)
- ELExecuteInternal(TEXT("CoreLaunchEditor"));
+ ELExecuteInternal((WCHAR*)TEXT("CoreLaunchEditor"));
if (index == 2)
res = pMenuEditor->Show();
if (index == 3)
- ELExecuteInternal(TEXT("CoreShellChanger"));
+ ELExecuteInternal((WCHAR*)TEXT("CoreShellChanger"));
}
void Desktop::UpdateMenuHook()
Modified: trunk/Source/emergeDesktop/MenuEditor.cpp
===================================================================
--- trunk/Source/emergeDesktop/MenuEditor.cpp 2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeDesktop/MenuEditor.cpp 2007-08-10 01:05:10 UTC (rev 1400)
@@ -174,37 +174,37 @@
ti.hwnd = addWnd;
ti.uId = (UINT)addWnd;
ti.hinst = hInstance;
- ti.lpszText = TEXT("Add Menu Item");
+ ti.lpszText = (WCHAR*)TEXT("Add Menu Item");
GetClientRect(addWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = editWnd;
ti.uId = (UINT)editWnd;
- ti.lpszText = TEXT("Edit Menu Item");
+ ti.lpszText = (WCHAR*)TEXT("Edit Menu Item");
GetClientRect(editWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = delWnd;
ti.uId = (UINT)delWnd;
- ti.lpszText = TEXT("Delete Menu Item");
+ ti.lpszText = (WCHAR*)TEXT("Delete Menu Item");
GetClientRect(delWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = saveWnd;
ti.uId = (UINT)saveWnd;
- ti.lpszText = TEXT("Save Changes");
+ ti.lpszText = (WCHAR*)TEXT("Save Changes");
GetClientRect(delWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = abortWnd;
ti.uId = (UINT)abortWnd;
- ti.lpszText = TEXT("Discard Changes");
+ ti.lpszText = (WCHAR*)TEXT("Discard Changes");
GetClientRect(delWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = browseWnd;
ti.uId = (UINT)browseWnd;
- ti.lpszText = TEXT("");
+ ti.lpszText = (WCHAR*)TEXT("");
GetClientRect(browseWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
@@ -274,16 +274,17 @@
void MenuEditor::PopulateSpecialFolders(HWND specialFoldersWnd)
{
WCHAR tmp[MAX_PATH];
- wcscpy(tmp, ELGetSpecialFolder(FOLDER_MYDOCUMENTS));
- SendMessage(specialFoldersWnd, CB_ADDSTRING, 0, (LPARAM)tmp);
- wcscpy(tmp, ELGetSpecialFolder(FOLDER_MYCOMPUTER));
- SendMessage(specialFoldersWnd, CB_ADDSTRING, 0, (LPARAM)tmp);
- wcscpy(tmp, ELGetSpecialFolder(FOLDER_NETWORKPLACES));
- SendMessage(specialFoldersWnd, CB_ADDSTRING, 0, (LPARAM)tmp);
- wcscpy(tmp, ELGetSpecialFolder(FOLDER_CONTROLPANEL));
- SendMessage(specialFoldersWnd, CB_ADDSTRING, 0, (LPARAM)tmp);
- wcscpy(tmp, ELGetSpecialFolder(FOLDER_RECYCLEBIN));
- SendMessage(specialFoldersWnd, CB_ADDSTRING, 0, (LPARAM)tmp);
+
+ if (ELGetSpecialFolder(FOLDER_MYDOCUMENTS, tmp))
+ SendMessage(specialFoldersWnd, CB_ADDSTRING, 0, (LPARAM)tmp);
+ if (ELGetSpecialFolder(FOLDER_MYCOMPUTER, tmp))
+ SendMessage(specialFoldersWnd, CB_ADDSTRING, 0, (LPARAM)tmp);
+ if (ELGetSpecialFolder(FOLDER_NETWORKPLACES, tmp))
+ SendMessage(specialFoldersWnd, CB_ADDSTRING, 0, (LPARAM)tmp);
+ if (ELGetSpecialFolder(FOLDER_CONTROLPANEL, tmp))
+ SendMessage(specialFoldersWnd, CB_ADDSTRING, 0, (LPARAM)tmp);
+ if (ELGetSpecialFolder(FOLDER_RECYCLEBIN, tmp))
+ SendMessage(specialFoldersWnd, CB_ADDSTRING, 0, (LPARAM)tmp);
}
bool MenuEditor::PopulateTree(HWND treeWnd)
@@ -293,13 +294,13 @@
tvInsert.hParent = NULL;
tvInsert.hInsertAfter=TVI_ROOT;
tvInsert.item.mask = TVIF_TEXT;
- tvInsert.item.pszText = TEXT("Right");
+ tvInsert.item.pszText = (WCHAR*)TEXT("Right");
rightRoot = TreeView_InsertItem(treeWnd, &tvInsert);
- BuildMenuTree(treeWnd, rightRoot, TEXT("emergeDesktop\\RightMenu"));
+ BuildMenuTree(treeWnd, rightRoot, (WCHAR*)TEXT("emergeDesktop\\RightMenu"));
- tvInsert.item.pszText = TEXT("Middle");
+ tvInsert.item.pszText = (WCHAR*)TEXT("Middle");
midRoot = TreeView_InsertItem(treeWnd, &tvInsert);
- BuildMenuTree(treeWnd, midRoot, TEXT("emergeDesktop\\MidMenu"));
+ BuildMenuTree(treeWnd, midRoot, (WCHAR*)TEXT("emergeDesktop\\MidMenu"));
return true;
}
@@ -323,10 +324,10 @@
wcscat(subkeyString, subkeyName);
ELOpenRegKey(subkeyString, &subkey, true);
- ELReadRegString(subkey, TEXT("name"), name, TEXT("\0"));
- ELReadRegDWord(subkey, TEXT("type"), &type, 0);
- ELReadRegString(subkey, TEXT("value"), value, TEXT("\0"));
- ELReadRegString(subkey, TEXT("workingdir"), workingDir, TEXT("\0"));
+ ELReadRegString(subkey, (WCHAR*)TEXT("name"), name, (WCHAR*)TEXT("\0"));
+ ELReadRegDWord(subkey, (WCHAR*)TEXT("type"), &type, 0);
+ ELReadRegString(subkey, (WCHAR*)TEXT("value"), value, (WCHAR*)TEXT("\0"));
+ ELReadRegString(subkey, (WCHAR*)TEXT("workingdir"), workingDir, (WCHAR*)TEXT("\0"));
ELCloseRegKey(subkey);
MENUTREEITEM menuItem;
@@ -339,7 +340,7 @@
tvInsert.hInsertAfter=TVI_LAST;
tvInsert.item.mask = TVIF_TEXT;
if (type == 0)
- tvInsert.item.pszText = TEXT("[Separator]");
+ tvInsert.item.pszText = (WCHAR*)TEXT("[Separator]");
else
tvInsert.item.pszText = name;
@@ -470,11 +471,11 @@
}
}
- ELDeleteRegKey(TEXT("emergeDesktop\\RightMenu"));
- WriteMenu(treeWnd, rightRoot, TEXT("emergeDesktop\\RightMenu"));
+ ELDeleteRegKey((WCHAR*)TEXT("emergeDesktop\\RightMenu"));
+ WriteMenu(treeWnd, rightRoot, (WCHAR*)TEXT("emergeDesktop\\RightMenu"));
- ELDeleteRegKey(TEXT("emergeDesktop\\MidMenu"));
- WriteMenu(treeWnd, midRoot, TEXT("emergeDesktop\\MidMenu"));
+ ELDeleteRegKey((WCHAR*)TEXT("emergeDesktop\\MidMenu"));
+ WriteMenu(treeWnd, midRoot, (WCHAR*)TEXT("emergeDesktop\\MidMenu"));
treeMap.clear();
@@ -511,14 +512,14 @@
ret = true;
if (wcslen(iter->second.name) > 0)
- ELWriteRegString(key, TEXT("name"),
+ ELWriteRegString(key, (WCHAR*)TEXT("name"),
iter->second.name);
- ELWriteRegDWord(key, TEXT("type"), &iter->second.type);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("type"), &iter->second.type);
if (wcslen(iter->second.value) > 0)
- ELWriteRegString(key, TEXT("value"),
+ ELWriteRegString(key, (WCHAR*)TEXT("value"),
iter->second.value);
if (wcslen(iter->second.workingDir) > 0)
- ELWriteRegString(key, TEXT("workingdir"),
+ ELWriteRegString(key, (WCHAR*)TEXT("workingdir"),
iter->second.workingDir);
ELCloseRegKey(key);
@@ -696,6 +697,7 @@
BOOL MenuEditor::DoMenuMouseMove(HWND hwndDlg, WPARAM wParam, LPARAM lParam)
{
HWND treeWnd = GetDlgItem(hwndDlg, IDC_MENUTREE);
+ HTREEITEM htItem;
if (dragging)
{
@@ -704,9 +706,9 @@
hitTest.pt.x = LOWORD(lParam);
hitTest.pt.y = HIWORD(lParam);
- TreeView_HitTest(treeWnd, &hitTest);
+ htItem = TreeView_HitTest(treeWnd, &hitTest);
- if (hitTest.hItem)
+ if (htItem != NULL)
{
if (SetTimer(hwndDlg, 1, 500, NULL))
hoverItem = hitTest.hItem;
@@ -739,15 +741,15 @@
TVHITTESTINFO hitTest;
TVINSERTSTRUCT tvInsert;
- HTREEITEM parent, item, prev;
+ HTREEITEM parent, item, prev, htItem;
TreeItemMap::iterator iter;
hitTest.pt.x = LOWORD(lParam);
hitTest.pt.y = HIWORD(lParam);
- TreeView_HitTest(treeWnd, &hitTest);
+ htItem = TreeView_HitTest(treeWnd, &hitTest);
- if (hitTest.hItem)
+ if (htItem != NULL)
{
if (dragging)
{
@@ -775,7 +777,7 @@
tvInsert.hInsertAfter = prev;
tvInsert.item.mask = TVIF_TEXT;
if (iter->second.type == 0)
- tvInsert.item.pszText = TEXT("[Separator]");
+ tvInsert.item.pszText = (WCHAR*)TEXT("[Separator]");
else
tvInsert.item.pszText = iter->second.name;
@@ -814,7 +816,7 @@
tvInsert.hInsertAfter = TVI_LAST;
tvInsert.item.mask = TVIF_TEXT;
if (iter->second.type == 0)
- tvInsert.item.pszText = TEXT("[Separator]");
+ tvInsert.item.pszText = (WCHAR*)TEXT("[Separator]");
else
tvInsert.item.pszText = iter->second.name;
@@ -1037,7 +1039,7 @@
iter->second.type = GetValueType((int)SendMessage(typeWnd, CB_GETCURSEL, 0, 0));
if (iter->second.type == 0)
- pItem.pszText = TEXT("[Separator]");
+ pItem.pszText = (WCHAR*)TEXT("[Separator]");
else
{
if (iter->second.type == 2)
@@ -1364,13 +1366,13 @@
switch (type)
{
case 1:
- ti.lpszText = TEXT("Browse for a file");
+ ti.lpszText = (WCHAR*)TEXT("Browse for a file");
break;
case 4:
- ti.lpszText = TEXT("Browse for an ELScript");
+ ti.lpszText = (WCHAR*)TEXT("Browse for an ELScript");
break;
case 101:
- ti.lpszText = TEXT("Browse for a directory");
+ ti.lpszText = (WCHAR*)TEXT("Browse for a directory");
}
SendMessage(toolWnd, TTM_SETTOOLINFO, 0, (LPARAM)(LPTOOLINFO)&ti);
Modified: trunk/Source/emergeDesktop/Settings.cpp
===================================================================
--- trunk/Source/emergeDesktop/Settings.cpp 2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeDesktop/Settings.cpp 2007-08-10 01:05:10 UTC (rev 1400)
@@ -32,30 +32,30 @@
HKEY coreKey, deskKey;
DWORD tmp, tmpa;
- ELOpenRegKey(TEXT("emergeCore\\Settings"), &coreKey, false);
- ELOpenRegKey(TEXT("emergeDesktop\\Settings"), &deskKey, true);
+ ELOpenRegKey((WCHAR*)TEXT("emergeCore\\Settings"), &coreKey, false);
+ ELOpenRegKey((WCHAR*)TEXT("emergeDesktop\\Settings"), &deskKey, true);
- if (!ELReadRegDWord(deskKey, TEXT("TopBorder"), &topBorder, 0))
- ELReadRegDWord(coreKey, TEXT("TopBorder"), &topBorder, 0);
+ if (!ELReadRegDWord(deskKey, (WCHAR*)TEXT("TopBorder"), &topBorder, 0))
+ ELReadRegDWord(coreKey, (WCHAR*)TEXT("TopBorder"), &topBorder, 0);
- if (!ELReadRegDWord(deskKey, TEXT("BottomBorder"), &bottomBorder, 0))
- ELReadRegDWord(coreKey, TEXT("BottomBorder"), &bottomBorder, 0);
+ if (!ELReadRegDWord(deskKey, (WCHAR*)TEXT("BottomBorder"), &bottomBorder, 0))
+ ELReadRegDWord(coreKey, (WCHAR*)TEXT("BottomBorder"), &bottomBorder, 0);
- if (!ELReadRegDWord(deskKey, TEXT("LeftBorder"), &leftBorder, 0))
- ELReadRegDWord(coreKey, TEXT("LeftBorder"), &leftBorder, 0);
+ if (!ELReadRegDWord(deskKey, (WCHAR*)TEXT("LeftBorder"), &leftBorder, 0))
+ ELReadRegDWord(coreKey, (WCHAR*)TEXT("LeftBorder"), &leftBorder, 0);
- if (!ELReadRegDWord(deskKey, TEXT("RightBorder"), &rightBorder, 0))
- ELReadRegDWord(coreKey, TEXT("RightBorder"), &rightBorder, 0);
+ if (!ELReadRegDWord(deskKey, (WCHAR*)TEXT("RightBorder"), &rightBorder, 0))
+ ELReadRegDWord(coreKey, (WCHAR*)TEXT("RightBorder"), &rightBorder, 0);
- if (!ELReadRegDWord(deskKey, TEXT("MenuAlpha"), &menuAlpha, 100))
- ELReadRegDWord(coreKey, TEXT("MenuAlpha"), &menuAlpha, 100);
+ if (!ELReadRegDWord(deskKey, (WCHAR*)TEXT("MenuAlpha"), &menuAlpha, 100))
+ ELReadRegDWord(coreKey, (WCHAR*)TEXT("MenuAlpha"), &menuAlpha, 100);
- if (!ELReadRegDWord(deskKey, TEXT("MenuIcons"), &tmp, 1))
- ELReadRegDWord(coreKey, TEXT("MenuIcons"), &tmp, 1);
+ if (!ELReadRegDWord(deskKey, (WCHAR*)TEXT("MenuIcons"), &tmp, 1))
+ ELReadRegDWord(coreKey, (WCHAR*)TEXT("MenuIcons"), &tmp, 1);
// roblarky
- if (!ELReadRegDWord(deskKey, TEXT("BorderPrimary"), &tmpa, 0))
- ELReadRegDWord(coreKey, TEXT("BorderPrimary"), &tmpa, 0);
+ if (!ELReadRegDWord(deskKey, (WCHAR*)TEXT("BorderPrimary"), &tmpa, 0))
+ ELReadRegDWord(coreKey, (WCHAR*)TEXT("BorderPrimary"), &tmpa, 0);
ELCloseRegKey(coreKey);
@@ -100,9 +100,9 @@
menuIcons = value;
- if (ELOpenRegKey(TEXT("emergeDesktop\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeDesktop\\Settings"), &key, true))
{
- ELWriteRegDWord(key, TEXT("MenuIcons"), &tmp);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("MenuIcons"), &tmp);
ELCloseRegKey(key);
}
}
@@ -113,9 +113,9 @@
topBorder = value;
- if (ELOpenRegKey(TEXT("emergeDesktop\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeDesktop\\Settings"), &key, true))
{
- ELWriteRegDWord(key, TEXT("TopBorder"), &value);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("TopBorder"), &value);
ELCloseRegKey(key);
}
}
@@ -137,9 +137,9 @@
leftBorder = value;
- if (ELOpenRegKey(TEXT("emergeDesktop\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeDesktop\\Settings"), &key, true))
{
- ELWriteRegDWord(key, TEXT("LeftBorder"), &value);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("LeftBorder"), &value);
ELCloseRegKey(key);
}
}
@@ -156,9 +156,9 @@
borderPrimary = value;
- if (ELOpenRegKey(TEXT("emergeDesktop\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeDesktop\\Settings"), &key, true))
{
- ELWriteRegDWord(key, TEXT("BorderPrimary"), &tmp);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("BorderPrimary"), &tmp);
ELCloseRegKey(key);
}
}
@@ -174,9 +174,9 @@
rightBorder = value;
- if (ELOpenRegKey(TEXT("emergeDesktop\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeDesktop\\Settings"), &key, true))
{
- ELWriteRegDWord(key, TEXT("RightBorder"), &value);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("RightBorder"), &value);
ELCloseRegKey(key);
}
}
@@ -192,9 +192,9 @@
bottomBorder = value;
- if (ELOpenRegKey(TEXT("emergeDesktop\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeDesktop\\Settings"), &key, true))
{
- ELWriteRegDWord(key, TEXT("BottomBorder"), &value);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("BottomBorder"), &value);
ELCloseRegKey(key);
}
}
@@ -210,9 +210,9 @@
menuAlpha = value;
- if (ELOpenRegKey(TEXT("emergeDesktop\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeDesktop\\Settings"), &key, true))
{
- ELWriteRegDWord(key, TEXT("MenuAlpha"), &value);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("MenuAlpha"), &value);
ELCloseRegKey(key);
}
}
Modified: trunk/Source/emergeGraphics/main.cpp
===================================================================
--- trunk/Source/emergeGraphics/main.cpp 2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeGraphics/main.cpp 2007-08-10 01:05:10 UTC (rev 1400)
@@ -489,6 +489,7 @@
UINT iconFlags = 0;
UINT iconID;
HRESULT hr;
+ LPVOID lpVoid;
ExpandEnvironmentStrings((LPCTSTR)file, (LPTSTR)expandedFile, MAX_PATH);
@@ -533,18 +534,19 @@
pidlRelative = MSILClone(MSILFindLastID(pidlLocal));
MSILRemoveLastID(pidlLocal);
- hr = deskFolder->BindToObject(pidlLocal, NULL, IID_IShellFolder, (void**)&appObject);
+ hr = deskFolder->BindToObject(pidlLocal, NULL, IID_IShellFolder, &lpVoid);
if (FAILED(hr))
{
deskFolder->Release();
MSILFree(pidlLocal);
return icon;
}
+ appObject = reinterpret_cast <IShellFolder*> (lpVoid);
MSILFree(pidlLocal);
hr = appObject->GetUIObjectOf(NULL, 1, (LPCITEMIDLIST*)&pidlRelative, IID_IExtractIcon, NULL,
- (void**)&extractIcon);
+ &lpVoid);
if (FAILED(hr))
{
deskFolder->Release();
@@ -552,6 +554,7 @@
MSILFree(pidlRelative);
return icon;
}
+ extractIcon = reinterpret_cast <IExtractIcon*> (lpVoid);
MSILFree(pidlRelative);
@@ -796,7 +799,7 @@
delete bmpBits;
delete maskBits;
- return ret = TRUE;
+ return (ret = TRUE);
}
HDC EGBeginPaint(HWND wnd)
Modified: trunk/Source/emergeHotkeys/Actions.cpp
===================================================================
--- trunk/Source/emergeHotkeys/Actions.cpp 2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeHotkeys/Actions.cpp 2007-08-10 01:05:10 UTC (rev 1400)
@@ -165,11 +165,11 @@
ELStealFocus(hwndDlg);
lvCol.mask = LVCF_TEXT | LVCF_WIDTH;
- lvCol.pszText = TEXT("Key Combination");
+ lvCol.pszText = (WCHAR*)TEXT("Key Combination");
lvCol.cx = 160;
ListView_InsertColumn(listWnd, 0, &lvCol);
- lvCol.pszText = TEXT("Action");
+ lvCol.pszText = (WCHAR*)TEXT("Action");
lvCol.cx = 160;
ListView_InsertColumn(listWnd, 1, &lvCol);
@@ -221,43 +221,43 @@
ti.hwnd = addWnd;
ti.uId = (UINT)addWnd;
ti.hinst = hInstance;
- ti.lpszText = TEXT("Add Hotkey");
+ ti.lpszText = (WCHAR*)TEXT("Add Hotkey");
GetClientRect(addWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = delWnd;
ti.uId = (UINT)delWnd;
- ti.lpszText = TEXT("Delete Hotkey");
+ ti.lpszText = (WCHAR*)TEXT("Delete Hotkey");
GetClientRect(delWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = editWnd;
ti.uId = (UINT)editWnd;
- ti.lpszText = TEXT("Edit Hotkey");
+ ti.lpszText = (WCHAR*)TEXT("Edit Hotkey");
GetClientRect(editWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = fileWnd;
ti.uId = (UINT)fileWnd;
- ti.lpszText = TEXT("Browse for a file");
+ ti.lpszText = (WCHAR*)TEXT("Browse for a file");
GetClientRect(fileWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = folderWnd;
ti.uId = (UINT)folderWnd;
- ti.lpszText = TEXT("Browse for a folder");
+ ti.lpszText = (WCHAR*)TEXT("Browse for a folder");
GetClientRect(folderWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = saveWnd;
ti.uId = (UINT)saveWnd;
- ti.lpszText = TEXT("Save hotkey definition");
+ ti.lpszText = (WCHAR*)TEXT("Save hotkey definition");
GetClientRect(saveWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = abortWnd;
ti.uId = (UINT)abortWnd;
- ti.lpszText = TEXT("Discard hotkey definition");
+ ti.lpszText = (WCHAR*)TEXT("Discard hotkey definition");
GetClientRect(abortWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
Modified: trunk/Source/emergeHotkeys/Settings.cpp
===================================================================
--- trunk/Source/emergeHotkeys/Settings.cpp 2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeHotkeys/Settings.cpp 2007-08-10 01:05:10 UTC (rev 1400)
@@ -71,7 +71,7 @@
WCHAR value[MAX_LINE_LENGTH];
HKEY key;
- ELOpenRegKey(TEXT("emergeHotkeys\\Actions"), &key, true);
+ ELOpenRegKey((WCHAR*)TEXT("emergeHotkeys\\Actions"), &key, true);
// Loop while there are entries in the key and remove them
while (RegEnumValue(key, 0, value, &valueSize, NULL, &type, data, &dataSize) == ERROR_SUCCESS)
@@ -125,7 +125,7 @@
hotkeyList.clear();
}
- ELOpenRegKey(TEXT("emergeHotkeys\\Actions"), &key, true);
+ ELOpenRegKey((WCHAR*)TEXT("emergeHotkeys\\Actions"), &key, true);
// Loop while there are entries in the key
while (RegEnumValue(key, index, value, &valueSize, NULL, &type, data, &dataSize) == ERROR_SUCCESS)
Modified: trunk/Source/emergeLauncher/Config.cpp
===================================================================
--- trunk/Source/emergeLauncher/Config.cpp 2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeLauncher/Config.cpp 2007-08-10 01:05:10 UTC (rev 1400)
@@ -204,19 +204,19 @@
}
lvCol.mask = LVCF_TEXT | LVCF_WIDTH;
- lvCol.pszText = TEXT("Command");
+ lvCol.pszText = (WCHAR*)TEXT("Command");
lvCol.cx = 160;
ListView_InsertColumn(listWnd, 0, &lvCol);
- lvCol.pszText = TEXT("Working Directory");
+ lvCol.pszText = (WCHAR*)TEXT("Working Directory");
lvCol.cx = 160;
ListView_InsertColumn(listWnd, 1, &lvCol);
- lvCol.pszText = TEXT("Icon");
+ lvCol.pszText = (WCHAR*)TEXT("Icon");
lvCol.cx = 100;
ListView_InsertColumn(listWnd, 2, &lvCol);
- lvCol.pszText = TEXT("Tip");
+ lvCol.pszText = (WCHAR*)TEXT("Tip");
lvCol.cx = 160;
ListView_InsertColumn(listWnd, 3, &lvCol);
@@ -298,55 +298,55 @@
ti.hwnd = addWnd;
ti.uId = (UINT)addWnd;
ti.hinst = hInstance;
- ti.lpszText = TEXT("Add Item");
+ ti.lpszText = (WCHAR*)TEXT("Add Item");
GetClientRect(addWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = delWnd;
ti.uId = (UINT)delWnd;
- ti.lpszText = TEXT("Delete Item");
+ ti.lpszText = (WCHAR*)TEXT("Delete Item");
GetClientRect(delWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = editWnd;
ti.uId = (UINT)editWnd;
- ti.lpszText = TEXT("Edit Item");
+ ti.lpszText = (WCHAR*)TEXT("Edit Item");
GetClientRect(editWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = upWnd;
ti.uId = (UINT)upWnd;
- ti.lpszText = TEXT("Move Item Up");
+ ti.lpszText = (WCHAR*)TEXT("Move Item Up");
GetClientRect(upWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = downWnd;
ti.uId = (UINT)downWnd;
- ti.lpszText = TEXT("Move Item Down");
+ ti.lpszText = (WCHAR*)TEXT("Move Item Down");
GetClientRect(downWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = saveWnd;
ti.uId = (UINT)saveWnd;
- ti.lpszText = TEXT("Save Item");
+ ti.lpszText = (WCHAR*)TEXT("Save Item");
GetClientRect(downWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = abortWnd;
ti.uId = (UINT)abortWnd;
- ti.lpszText = TEXT("Discard Item");
+ ti.lpszText = (WCHAR*)TEXT("Discard Item");
GetClientRect(abortWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = browseCommandWnd;
ti.uId = (UINT)browseCommandWnd;
- ti.lpszText = TEXT("Browse For An Application");
+ ti.lpszText = (WCHAR*)TEXT("Browse For An Application");
GetClientRect(browseCommandWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
ti.hwnd = browseIconWnd;
ti.uId = (UINT)browseIconWnd;
- ti.lpszText = TEXT("Browse For An Icon");
+ ti.lpszText = (WCHAR*)TEXT("Browse For An Icon");
GetClientRect(browseIconWnd, &ti.rect);
SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
@@ -544,34 +544,34 @@
if (SendDlgItemMessage(hwndDlg, IDC_UP, BM_GETCHECK, 0, 0) == BST_CHECKED)
if (_wcsicmp(pSettings->GetVerticalDirection(), TEXT("up")) != 0)
- pSettings->SetVerticalDirection(TEXT("Up"));
+ pSettings->SetVerticalDirection((WCHAR*)TEXT("Up"));
if (SendDlgItemMessage(hwndDlg, IDC_DOWN, BM_GETCHECK, 0, 0) == BST_CHECKED)
if (_wcsicmp(pSettings->GetVerticalDirection(), TEXT("down")) != 0)
- pSettings->SetVerticalDirection(TEXT("Down"));
+ pSettings->SetVerticalDirection((WCHAR*)TEXT("Down"));
if (SendDlgItemMessage(hwndDlg, IDC_VERTICAL, BM_GETCHECK, 0, 0) == BST_CHECKED)
if (_wcsicmp(pSettings->GetDirectionOrientation(), TEXT("vertical")) != 0)
- pSettings->SetDirectionOrientation(TEXT("Vertical"));
+ pSettings->SetDirectionOrientation((WCHAR*)TEXT("Vertical"));
if (SendDlgItemMessage(hwndDlg, IDC_HORIZONTAL, BM_GETCHECK, 0, 0) == BST_CHECKED)
if (_wcsicmp(pSettings->GetDirectionOrientation(), TEXT("horizontal")) != 0)
- pSettings->SetDirectionOrientation(TEXT("Horizontal"));
+ pSettings->SetDirectionOrientation((WCHAR*)TEXT("Horizontal"));
if (SendDlgItemMessage(hwndDlg, IDC_RIGHT, BM_GETCHECK, 0, 0) == BST_CHECKED)
if (_wcsicmp(pSettings->GetHorizontalDirection(), TEXT("left")) != 0)
- pSettings->SetHorizontalDirection(TEXT("Left"));
+ pSettings->SetHorizontalDirection((WCHAR*)TEXT("Left"));
if (SendDlgItemMessage(hwndDlg, IDC_LEFT, BM_GETCHECK, 0, 0) == BST_CHECKED)
if (_wcsicmp(pSettings->GetHorizontalDirection(), TEXT("right")) != 0)
- pSettings->SetHorizontalDirection(TEXT("Right"));
+ pSettings->SetHorizontalDirection((WCHAR*)TEXT("Right"));
if (SendDlgItemMessage(hwndDlg, IDC_TOP, BM_GETCHECK, 0, 0) == BST_CHECKED)
if (_wcsicmp(pSettings->GetZPosition(), TEXT("top")) != 0)
- pSettings->SetZPosition(TEXT("Top"));
+ pSettings->SetZPosition((WCHAR*)TEXT("Top"));
if (SendDlgItemMessage(hwndDlg, IDC_BOTTOM, BM_GETCHECK, 0, 0) == BST_CHECKED)
if (_wcsicmp(pSettings->GetZPosition(), TEXT("bottom")) != 0)
- pSettings->SetZPosition(TEXT("Bottom"));
+ pSettings->SetZPosition((WCHAR*)TEXT("Bottom"));
if (SendDlgItemMessage(hwndDlg, IDC_NORMAL, BM_GETCHECK, 0, 0) == BST_CHECKED)
if (_wcsicmp(pSettings->GetZPosition(), TEXT("normal")) != 0)
- pSettings->SetZPosition(TEXT("Normal"));
+ pSettings->SetZPosition((WCHAR*)TEXT("Normal"));
pSettings->DeleteItems();
Modified: trunk/Source/emergeLauncher/Settings.cpp
===================================================================
--- trunk/Source/emergeLauncher/Settings.cpp 2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeLauncher/Settings.cpp 2007-08-10 01:05:10 UTC (rev 1400)
@@ -40,29 +40,29 @@
HKEY key;
RECT deskRect, tmpRect;
- ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true);
- ELReadRegDWord(key, TEXT("X"), (DWORD*)&x, 0);
- ELReadRegDWord(key, TEXT("Y"), (DWORD*)&y, 0);
- ELReadRegDWord(key, TEXT("Width"), &width, 100);
- ELReadRegDWord(key, TEXT("Height"), &height, 100);
+ ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true);
+ ELReadRegDWord(key, (WCHAR*)TEXT("X"), &x, 0);
+ ELReadRegDWord(key, (WCHAR*)TEXT("Y"), &y, 0);
+ ELReadRegDWord(key, (WCHAR*)TEXT("Width"), &width, 100);
+ ELReadRegDWord(key, (WCHAR*)TEXT("Height"), &height, 100);
tmpRect.left = x;
tmpRect.right = tmpRect.left + width;
tmpRect.top = y;
tmpRect.bottom = tmpRect.top + height;
ELGetDesktopRect(&tmpRect, &deskRect);
- ELReadRegRect(key, TEXT("Resolution"), &resolution, &deskRect);
- ELReadRegString(key, TEXT("ZPosition"), zPosition, TEXT("normal"));
- ELReadRegString(key, TEXT("HorizontalDirection"), horizontalDirection, TEXT("right"));
- ELReadRegString(key, TEXT("VerticalDirection"), verticalDirection, TEXT("down"));
- ELReadRegString(key, TEXT("DirectionOrientation"), directionOrientation, TEXT("horizontal"));
- ELReadRegDWord(key, TEXT("AutoSize"), &autoSize, 0);
- ELReadRegDWord(key, TEXT("IconSize"), &iconSize, 16);
- ELReadRegDWord(key, TEXT("IconSpacing"), &iconSpacing, 1);
- ELReadRegString(key, TEXT("Scheme"), schemeFile, TEXT("\0"));
- ELReadRegDWord(key, TEXT("SnapMove"), &snapMove, 1);
- ELReadRegDWord(key, TEXT("SnapSize"), &snapSize, 1);
- ELReadRegDWord(key, TEXT("ClickThrough"), &clickThrough, 0);
+ ELReadRegRect(key, (WCHAR*)TEXT("Resolution"), &resolution, &deskRect);
+ ELReadRegString(key, (WCHAR*)TEXT("ZPosition"), zPosition, (WCHAR*)TEXT("normal"));
+ ELReadRegString(key, (WCHAR*)TEXT("HorizontalDirection"), horizontalDirection, (WCHAR*)TEXT("right"));
+ ELReadRegString(key, (WCHAR*)TEXT("VerticalDirection"), verticalDirection, (WCHAR*)TEXT("down"));
+ ELReadRegString(key, (WCHAR*)TEXT("DirectionOrientation"), directionOrientation, (WCHAR*)TEXT("horizontal"));
+ ELReadRegDWord(key, (WCHAR*)TEXT("AutoSize"), &autoSize, 0);
+ ELReadRegDWord(key, (WCHAR*)TEXT("IconSize"), &iconSize, 16);
+ ELReadRegDWord(key, (WCHAR*)TEXT("IconSpacing"), &iconSpacing, 1);
+ ELReadRegString(key, (WCHAR*)TEXT("Scheme"), schemeFile,(WCHAR*) TEXT("\0"));
+ ELReadRegDWord(key, (WCHAR*)TEXT("SnapMove"), &snapMove, 1);
+ ELReadRegDWord(key, (WCHAR*)TEXT("SnapSize"), &snapSize, 1);
+ ELReadRegDWord(key, (WCHAR*)TEXT("ClickThrough"), &clickThrough, 0);
ELCloseRegKey(key);
}
@@ -73,25 +73,25 @@
(*this).width = width;
(*this).height = height;
- if (ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
{
- ELWriteRegDWord(key, TEXT("Width"), &width);
- ELWriteRegDWord(key, TEXT("Height"), &height);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("Width"), &width);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("Height"), &height);
ELCloseRegKey(key);
}
}
-void Settings::SetPosition(int x, int y)
+void Settings::SetPosition(DWORD x, DWORD y)
{
HKEY key;
(*this).x = x;
(*this).y = y;
- if (ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
{
- ELWriteRegDWord(key, TEXT("X"), (DWORD*)&x);
- ELWriteRegDWord(key, TEXT("Y"), (DWORD*)&y);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("X"), &x);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("Y"), &y);
ELCloseRegKey(key);
}
}
@@ -102,9 +102,9 @@
CopyRect(&resolution, deskRect);
- if (ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
{
- ELWriteRegRect(key, TEXT("Resolution"), &resolution);
+ ELWriteRegRect(key, (WCHAR*)TEXT("Resolution"), &resolution);
ELCloseRegKey(key);
}
}
@@ -195,9 +195,9 @@
wcscpy((*this).zPosition, zPosition);
- if (ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
{
- ELWriteRegString(key, TEXT("ZPosition"), zPosition);
+ ELWriteRegString(key, (WCHAR*)TEXT("ZPosition"), zPosition);
ELCloseRegKey(key);
}
}
@@ -208,9 +208,9 @@
wcscpy((*this).horizontalDirection, horizontalDirection);
- if (ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
{
- ELWriteRegString(key, TEXT("HorizontalDirection"), horizontalDirection);
+ ELWriteRegString(key, (WCHAR*)TEXT("HorizontalDirection"), horizontalDirection);
ELCloseRegKey(key);
}
}
@@ -221,9 +221,9 @@
wcscpy((*this).verticalDirection, verticalDirection);
- if (ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
{
- ELWriteRegString(key, TEXT("VerticalDirection"), verticalDirection);
+ ELWriteRegString(key, (WCHAR*)TEXT("VerticalDirection"), verticalDirection);
ELCloseRegKey(key);
}
}
@@ -234,9 +234,9 @@
wcscpy((*this).directionOrientation, directionOrientation);
- if (ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
{
- ELWriteRegString(key, TEXT("DirectionOrientation"), directionOrientation);
+ ELWriteRegString(key, (WCHAR*)TEXT("DirectionOrientation"), directionOrientation);
ELCloseRegKey(key);
}
}
@@ -253,9 +253,9 @@
(*this).clickThrough = tmp;
- if (ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
{
- ELWriteRegDWord(key, TEXT("ClickThrough"), &tmp);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("ClickThrough"), &tmp);
ELCloseRegKey(key);
}
}
@@ -272,9 +272,9 @@
(*this).autoSize = autoSize;
- if (ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
{
- ELWriteRegDWord(key, TEXT("AutoSize"), &tmp);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("AutoSize"), &tmp);
ELCloseRegKey(key);
}
}
@@ -291,9 +291,9 @@
(*this).snapSize = snapSize;
- if (ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
{
- ELWriteRegDWord(key, TEXT("SnapSize"), &tmp);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("SnapSize"), &tmp);
ELCloseRegKey(key);
}
}
@@ -310,9 +310,9 @@
(*this).snapMove = snapMove;
- if (ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
{
- ELWriteRegDWord(key, TEXT("SnapMove"), &tmp);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("SnapMove"), &tmp);
ELCloseRegKey(key);
}
}
@@ -323,9 +323,9 @@
(*this).iconSize = iconSize;
- if (ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
{
- ELWriteRegDWord(key, TEXT("IconSize"), &iconSize);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("IconSize"), &iconSize);
ELCloseRegKey(key);
}
}
@@ -336,9 +336,9 @@
(*this).iconSize = iconSpacing;
- if (ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
{
- ELWriteRegDWord(key, TEXT("IconSpacing"), &iconSize);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("IconSpacing"), &iconSize);
ELCloseRegKey(key);
}
}
@@ -349,9 +349,9 @@
wcscpy((*this).schemeFile, schemeFile);
- if (ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true))
{
- ELWriteRegString(key, TEXT("Scheme"), schemeFile);
+ ELWriteRegString(key, (WCHAR*)TEXT("Scheme"), schemeFile);
ELCloseRegKey(key);
}
}
@@ -373,13 +373,13 @@
swprintf(tipValue, TEXT("Tip%d"), index);
swprintf(workingDirValue, TEXT("WorkingDir%d"), index);
- ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true);
+ ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true);
- while (ELReadRegString(key, commandValue, app, TEXT("\0")))
+ while (ELReadRegString(key, commandValue, app, (WCHAR*)TEXT("\0")))
{
- ELReadRegString(key, iconValue, icon, TEXT("\0"));
- ELReadRegString(key, tipValue, tip, TEXT("\0"));
- ELReadRegString(key, workingDirValue, workingDir, TEXT("\0"));
+ ELReadRegString(key, iconValue, icon, (WCHAR*)TEXT("\0"));
+ ELReadRegString(key, tipValue, tip, (WCHAR*)TEXT("\0"));
+ ELReadRegString(key, workingDirValue, workingDir, (WCHAR*)TEXT("\0"));
itemList.push_back(new Item(mainInstance, app, icon, tip, workingDir, iconSize));
@@ -410,9 +410,9 @@
swprintf(iconValue, TEXT("Icon%d"), index);
swprintf(tipValue, TEXT("Tip%d"), index);
- ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true);
+ ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true);
- while (ELReadRegString(key, commandValue, app, TEXT("")))
+ while (ELReadRegString(key, commandValue, app, (WCHAR*)TEXT("")))
{
RegDeleteValue(key, commandValue);
RegDeleteValue(key, iconValue);
@@ -444,7 +444,7 @@
swprintf(tipValue, TEXT("Tip%d"), index);
swprintf(workingDirValue, TEXT("WorkingDir%d"), index);
- ELOpenRegKey(TEXT("emergeLauncher\\Settings"), &key, true);
+ ELOpenRegKey((WCHAR*)TEXT("emergeLauncher\\Settings"), &key, true);
ELWriteRegString(key, commandValue, command);
ELWriteRegString(key, iconValue, iconPath);
Modified: trunk/Source/emergeLauncher/Settings.h
===================================================================
--- trunk/Source/emergeLauncher/Settings.h 2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeLauncher/Settings.h 2007-08-10 01:05:10 UTC (rev 1400)
@@ -48,7 +48,7 @@
WCHAR *GetSchemeFile();
RECT *GetResolution();
void SetResolution(RECT *deskRect);
- void SetPosition(int x, int y);
+ void SetPosition(DWORD x, DWORD y);
void SetSize(DWORD width, DWORD height);
void SetZPosition(WCHAR *zPosition);
void SetHorizontalDirection(WCHAR *horizontalDirection);
@@ -69,8 +69,7 @@
private:
std::vector<Item*> itemList;
- DWORD width, height;
- int x, y;
+ DWORD width, height, x, y;
WCHAR zPosition[MAX_LINE_LENGTH];
WCHAR horizontalDirection[MAX_LINE_LENGTH], verticalDirection[MAX_LINE_LENGTH],
directionOrientation[MAX_LINE_LENGTH];
Modified: trunk/Source/emergeLib/emergeLib.h
===================================================================
--- trunk/Source/emergeLib/emergeLib.h 2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeLib/emergeLib.h 2007-08-10 01:05:10 UTC (rev 1400)
@@ -290,7 +290,7 @@
DLL_EXPORT bool ELParseCommand(WCHAR *application, WCHAR *program, WCHAR *arguments);
DLL_EXPORT UINT ELIsSpecialFolder(WCHAR *folder);
DLL_EXPORT UINT ELIsInternalCommand(WCHAR *command);
- DLL_EXPORT WCHAR *ELGetSpecialFolder(UINT folder);
+ DLL_EXPORT bool ELGetSpecialFolder(UINT folder, WCHAR *folderPath);
DLL_EXPORT void ELWriteDebug(WCHAR *debugText);
DLL_EXPORT void ELDisplayChange(HWND hwnd);
DLL_EXPORT int ELMid(int left, int right);
Modified: trunk/Source/emergeLib/main.cpp
===================================================================
--- trunk/Source/emergeLib/main.cpp 2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeLib/main.cpp 2007-08-10 01:05:10 UTC (rev 1400)
@@ -572,7 +572,7 @@
return false;
}
- return ELExecute(command, TEXT("\0"));
+ return ELExecute(command, (WCHAR*)TEXT("\0"));
}
//------
@@ -768,7 +768,8 @@
wcscpy(tmp, path);
ELGetCurrentPath(corePath);
- *corePathPtr = corePath;
+ corePathPtr[0] = corePath;
+ corePathPtr[1] = NULL;
if (MSPathResolve(tmp, corePathPtr, PRF_VERIFYEXISTS | PRF_TRYPROGRAMEXTENSIONS) &&
!PathIsDirectory(tmp))
@@ -1393,10 +1394,12 @@
//-----
bool ELParseShortcut(LPTSTR shortcut, LPSHORTCUTINFO shortcutInfo)
{
- IShellLink *psl;
- IPersistFile* ppf;
+ IShellLink *psl = NULL;
+ IPersistFile* ppf = NULL;
LPITEMIDLIST pidl = NULL;
+ LPVOID lpVoid;
+
if (MSILFree == NULL)
MSILFree = (lpfnILFree)GetProcAddress(GetModuleHandle(TEXT("shell32.dll")), (LPCSTR)155);
@@ -1405,20 +1408,22 @@
// Get a pointer to the IShellLink interface.
if (FAILED(CoCreateInstance(CLSID_ShellLink, NULL,
CLSCTX_INPROC_SERVER, IID_IShellLink,
- (LPVOID*)&psl)))
+ &lpVoid)))
{
CoUninitialize();
return false;
}
+ psl = reinterpret_cast <IShellLink*> (lpVoid);
// Get a pointer to the IPersistFile interface.
if (FAILED(psl->QueryInterface(IID_IPersistFile,
- (void**)&ppf)))
+ &lpVoid)))
{
psl->Release();
CoUninitialize();
return false;
}
+ ppf = reinterpret_cast <IPersistFile*> (lpVoid);
// Load the shortcut.
if (FAILED(ppf->Load(shortcut, STGM_READ)))
@@ -1551,7 +1556,7 @@
// execute the command
if (wcscmp(value, alias) == 0)
{
- ELExecute(command, TEXT("\0"));
+ ELExecute(command, (WCHAR*)TEXT("\0"));
ret = true;
break;
}
@@ -2171,7 +2176,7 @@
if (GetFileVersionInfo(applet, notUsed, dataSize, data))
{
- if (VerQueryValue(data, TEXT("\\VarFileInfo\\Translation"), &buffer, &bufferSize))
+ if (VerQueryValue(data, (WCHAR*)TEXT("\\VarFileInfo\\Translation"), &buffer, &bufferSize))
swprintf(tmp, TEXT("\\StringFileInfo\\%04x%04x\\"), LOWORD(*((UINT*)buffer)),
HIWORD(*((UINT*)buffer)));
else
@@ -2355,7 +2360,7 @@
@param folder special folder to return path for
*/
-WCHAR *ELGetSpecialFolder(UINT folder)
+bool ELGetSpecialFolder(UINT folder, WCHAR *folderPath)
{
LPITEMIDLIST pidl;
SHFILEINFO fileInfo;
@@ -2378,12 +2383,13 @@
SHGetSpecialFolderLocation(NULL, CSIDL_BITBUCKET, &pidl);
break;
default:
- return NULL;
+ return false;
}
SHGetFileInfo((LPCTSTR)pidl, 0, &fileInfo, sizeof(fileInfo), SHGFI_PIDL | SHGFI_DISPLAYNAME);
+ wcscpy(folderPath, fileInfo.szDisplayName);
- return fileInfo.szDisplayName;
+ return true;
}
/*!
Modified: trunk/Source/emergeSchemeEngine/SchemeEditor.cpp
===================================================================
--- trunk/Source/emergeSchemeEngine/SchemeEditor.cpp 2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeSchemeEngine/SchemeEditor.cpp 2007-08-10 01:05:10 UTC (rev 1400)
@@ -86,7 +86,7 @@
wcsncpy(origScheme, scheme, MAX_PATH);
ESEReadScheme(scheme, &guiInfo);
- ESEReadScheme(TEXT(""), &defaultGuiInfo);
+ ESEReadScheme((WCHAR*)TEXT(""), &defaultGuiInfo);
origGuiInfo = guiInfo;
Modified: trunk/Source/emergeSchemeEngine/main.cpp
===================================================================
--- trunk/Source/emergeSchemeEngine/main.cpp 2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeSchemeEngine/main.cpp 2007-08-10 01:05:10 UTC (rev 1400)
@@ -82,61 +82,61 @@
void ESEWriteScheme(WCHAR *schemeFile, LPGUIINFO guiInfo)
{
- ELWriteFileInt(schemeFile, TEXT("alpha.active:"), (int)guiInfo->alphaActive);
- ELWriteFileInt(schemeFile, TEXT("alpha.inactive:"), (int)guiInfo->alphaInactive);
- ELWriteFileInt(schemeFile, TEXT("alpha.background:"), (int)guiInfo->alphaBackground);
- ELWriteFileInt(schemeFile, TEXT("alpha.menu:"), (int)guiInfo->alphaMenu);
- ELWriteFileInt(schemeFile, TEXT("alpha.foreground:"), (int)guiInfo->alphaForeground);
- ELWriteFileInt(schemeFile, TEXT("alpha.frame:"), (int)guiInfo->alphaFrame);
- ELWriteFileInt(schemeFile, TEXT("alpha.selected:"), (int)guiInfo->alphaSelected);
- ELWriteFileInt(schemeFile, TEXT("alpha.border:"), (int)guiInfo->alphaBorder);
- ELWriteFileInt(schemeFile, TEXT("alpha.text:"), (int)guiInfo->alphaText);
- ELWriteFileColor(schemeFile, TEXT("color.background:"), guiInfo->colorBackground);
- ELWriteFileColor(schemeFile, TEXT("color.selected:"), guiInfo->colorSelected);
- ELWriteFileColor(schemeFile, TEXT("color.foreground:"), guiInfo->colorForeground);
- ELWriteFileColor(schemeFile, TEXT("color.frame:"), guiInfo->colorFrame);
- ELWriteFileColor(schemeFile, TEXT("color.font:"), guiInfo->colorFont);
- ELWriteFileColor(schemeFile, TEXT("color.border:"), guiInfo->colorBorder);
- ELWriteFileBool(schemeFile, TEXT("window.shadow:"), guiInfo->windowShadow);
- ELWriteFileInt(schemeFile, TEXT("window.dragborder:"), (int)guiInfo->dragBorder);
- ELWriteFileInt(schemeFile, TEXT("window.bevelWidth:"), (int)guiInfo->bevelWidth);
- ELWriteFileInt(schemeFile, TEXT("window.padding:"), (int)guiInfo->padding);
- ELWriteFileColor(schemeFile, TEXT("gradient.colorFrom:"), guiInfo->gradientFrom);
- ELWriteFileColor(schemeFile, TEXT("gradient.colorTo:"), guiInfo->gradientTo);
- ELWriteFileString(schemeFile, TEXT("gradient.method:"), guiInfo->gradientMethod);
+ ELWriteFileInt(schemeFile, (WCHAR*)TEXT("alpha.active:"), (int)guiInfo->alphaActive);
+ ELWriteFileInt(schemeFile, (WCHAR*)TEXT("alpha.inactive:"), (int)guiInfo->alphaInactive);
+ ELWriteFileInt(schemeFile, (WCHAR*)TEXT("alpha.background:"), (int)guiInfo->alphaBackground);
+ ELWriteFileInt(schemeFile, (WCHAR*)TEXT("alpha.menu:"), (int)guiInfo->alphaMenu);
+ ELWriteFileInt(schemeFile, (WCHAR*)TEXT("alpha.foreground:"), (int)guiInfo->alphaForeground);
+ ELWriteFileInt(schemeFile, (WCHAR*)TEXT("alpha.frame:"), (int)guiInfo->alphaFrame);
+ ELWriteFileInt(schemeFile, (WCHAR*)TEXT("alpha.selected:"), (int)guiInfo->alphaSelected);
+ ELWriteFileInt(schemeFile, (WCHAR*)TEXT("alpha.border:"), (int)guiInfo->alphaBorder);
+ ELWriteFileInt(schemeFile, (WCHAR*)TEXT("alpha.text:"), (int)guiInfo->alphaText);
+ ELWriteFileColor(schemeFile, (WCHAR*)TEXT("color.background:"), guiInfo->colorBackground);
+ ELWriteFileColor(schemeFile, (WCHAR*)TEXT("color.selected:"), guiInfo->colorSelected);
+ ELWriteFileColor(schemeFile, (WCHAR*)TEXT("color.foreground:"), guiInfo->colorForeground);
+ ELWriteFileColor(schemeFile, (WCHAR*)TEXT("color.frame:"), guiInfo->colorFrame);
+ ELWriteFileColor(schemeFile, (WCHAR*)TEXT("color.font:"), guiInfo->colorFont);
+ ELWriteFileColor(schemeFile, (WCHAR*)TEXT("color.border:"), guiInfo->colorBorder);
+ ELWriteFileBool(schemeFile, (WCHAR*)TEXT("window.shadow:"), guiInfo->windowShadow);
+ ELWriteFileInt(schemeFile, (WCHAR*)TEXT("window.dragborder:"), (int)guiInfo->dragBorder);
+ ELWriteFileInt(schemeFile, (WCHAR*)TEXT("window.bevelWidth:"), (int)guiInfo->bevelWidth);
+ ELWriteFileInt(schemeFile, (WCHAR*)TEXT("window.padding:"), (int)guiInfo->padding);
+ ELWriteFileColor(schemeFile, (WCHAR*)TEXT("gradient.colorFrom:"), guiInfo->gradientFrom);
+ ELWriteFileColor(schemeFile, (WCHAR*)TEXT("gradient.colorTo:"), guiInfo->gradientTo);
+ ELWriteFileString(schemeFile, (WCHAR*)TEXT("gradient.method:"), guiInfo->gradientMethod);
}
void ESEReadScheme(WCHAR *schemeFile, LPGUIINFO guiInfo)
{
- ELReadFileInt(schemeFile, TEXT("alpha.active:"), (int*)&guiInfo->alphaActive, 100);
- ELReadFileInt(schemeFile, TEXT("alpha.inactive:"), (int*)&guiInfo->alphaInactive, 100);
- ELReadFileInt(schemeFile, TEXT("alpha.background:"), (int*)&guiInfo->alphaBackground, 100);
- ELReadFileInt(schemeFile, TEXT("alpha.menu:"), (int*)&guiInfo->alphaMenu, 100);
- ELReadFileInt(schemeFile, TEXT("alpha.foreground:"), (int*)&guiInfo->alphaForeground, 100);
- ELReadFileInt(schemeFile, TEXT("alpha.frame:"), (int*)&guiInfo->alphaFrame, 100);
- ELReadFileInt(schemeFile, TEXT("alpha.selected:"), (int*)&guiInfo->alphaSelected, 100);
- ELReadFileInt(schemeFile, TEXT("alpha.border:"), (int*)&guiInfo->alphaBorder, 100);
- ELReadFileInt(schemeFile, TEXT("alpha.text:"), (int*)&guiInfo->alphaText, 100);
- ELReadFileColor(schemeFile, TEXT("color.background:"), &guiInfo->colorBackground,
+ ELReadFileInt(schemeFile, (WCHAR*)TEXT("alpha.active:"), (int*)&guiInfo->alphaActive, 100);
+ ELReadFileInt(schemeFile, (WCHAR*)TEXT("alpha.inactive:"), (int*)&guiInfo->alphaInactive, 100);
+ ELReadFileInt(schemeFile, (WCHAR*)TEXT("alpha.background:"), (int*)&guiInfo->alphaBackground, 100);
+ ELReadFileInt(schemeFile, (WCHAR*)TEXT("alpha.menu:"), (int*)&guiInfo->alphaMenu, 100);
+ ELReadFileInt(schemeFile, (WCHAR*)TEXT("alpha.foreground:"), (int*)&guiInfo->alphaForeground, 100);
+ ELReadFileInt(schemeFile, (WCHAR*)TEXT("alpha.frame:"), (int*)&guiInfo->alphaFrame, 100);
+ ELReadFileInt(schemeFile, (WCHAR*)TEXT("alpha.selected:"), (int*)&guiInfo->alphaSelected, 100);
+ ELReadFileInt(schemeFile, (WCHAR*)TEXT("alpha.border:"), (int*)&guiInfo->alphaBorder, 100);
+ ELReadFileInt(schemeFile, (WCHAR*)TEXT("alpha.text:"), (int*)&guiInfo->alphaText, 100);
+ ELReadFileColor(schemeFile, (WCHAR*)TEXT("color.background:"), &guiInfo->colorBackground,
GetSysColor(COLOR_BTNFACE));
- ELReadFileColor(schemeFile, TEXT("color.selected:"), &guiInfo->colorSelected,
+ ELReadFileColor(schemeFile, (WCHAR*)TEXT("color.selected:"), &guiInfo->colorSelected,
GetSysColor(COLOR_HIGHLIGHT));
- ELReadFileColor(schemeFile, TEXT("color.foreground:"), &guiInfo->colorForeground,
+ ELReadFileColor(schemeFile, (WCHAR*)TEXT("color.foreground:"), &guiInfo->colorForeground,
GetSysColor(COLOR_WINDOW));
- ELReadFileColor(schemeFile, TEXT("color.frame:"), &guiInfo->colorFrame,
+ ELReadFileColor(schemeFile, (WCHAR*)TEXT("color.frame:"), &guiInfo->colorFrame,
GetSysColor(COLOR_ACTIVECAPTION));
- ELReadFileColor(schemeFile, TEXT("color.font:"), &guiInfo->colorFont,
+ ELReadFileColor(schemeFile, (WCHAR*)TEXT("color.font:"), &guiInfo->colorFont,
GetSysColor(COLOR_BTNTEXT));
- ELReadFileColor(schemeFile, TEXT("color.border:"), &guiInfo->colorBorder, RGB(0, 0, 0));
- ELReadFileBool(schemeFile, TEXT("window.shadow:"), &guiInfo->windowShadow, true);
- ELReadFileInt(schemeFile, TEXT("window.dragborder:"), (int*)&guiInfo->dragBorder, 1);
- ELReadFileInt(schemeFile, TEXT("window.bevelWidth:"), (int*)&guiInfo->bevelWidth, 1);
- ELReadFileInt(schemeFile, TEXT("window.padding:"), (int*)&guiInfo->padding, 0);
- ELReadFileColor(schemeFile, TEXT("gradient.colorFrom:"), &guiInfo->gradientFrom,
+ ELReadFileColor(schemeFile, (WCHAR*)TEXT("color.border:"), &guiInfo->colorBorder, RGB(0, 0, 0));
+ ELReadFileBool(schemeFile, (WCHAR*)TEXT("window.shadow:"), &guiInfo->windowShadow, true);
+ ELReadFileInt(schemeFile, (WCHAR*)TEXT("window.dragborder:"), (int*)&guiInfo->dragBorder, 1);
+ ELReadFileInt(schemeFile, (WCHAR*)TEXT("window.bevelWidth:"), (int*)&guiInfo->bevelWidth, 1);
+ ELReadFileInt(schemeFile, (WCHAR*)TEXT("window.padding:"), (int*)&guiInfo->padding, 0);
+ ELReadFileColor(schemeFile, (WCHAR*)TEXT("gradient.colorFrom:"), &guiInfo->gradientFrom,
GetSysColor(COLOR_ACTIVECAPTION));
- ELReadFileColor(schemeFile, TEXT("gradient.colorTo:"), &guiInfo->gradientTo,
+ ELReadFileColor(schemeFile, (WCHAR*)TEXT("gradient.colorTo:"), &guiInfo->gradientTo,
GetSysColor(COLOR_GRADIENTACTIVECAPTION));
- ELReadFileString(schemeFile, TEXT("gradient.method:"), guiInfo->gradientMethod, TEXT("Solid"));
+ ELReadFileString(schemeFile, (WCHAR*)TEXT("gradient.method:"), guiInfo->gradientMethod, (WCHAR*)TEXT("Solid"));
}
void ESELoadScheme(WCHAR *schemeFile, LPGUIINFO guiInfo)
Modified: trunk/Source/emergeTasks/Config.cpp
===================================================================
--- trunk/Source/emergeTasks/Config.cpp 2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeTasks/Config.cpp 2007-08-10 01:05:10 UTC (rev 1400)
@@ -235,34 +235,34 @@
if (SendDlgItemMessage(hwndDlg, IDC_UP, BM_GETCHECK, 0, 0) == BST_CHECKED)
if (_wcsicmp(pSettings->GetVerticalDirection(), TEXT("up")) != 0)
- pSettings->SetVerticalDirection(TEXT("Up"));
+ pSettings->SetVerticalDirection((WCHAR*)TEXT("Up"));
if (SendDlgItemMessage(hwndDlg, IDC_DOWN, BM_GETCHECK, 0, 0) == BST_CHECKED)
if (_wcsicmp(pSettings->GetVerticalDirection(), TEXT("down")) != 0)
- pSettings->SetVerticalDirection(TEXT("Down"));
+ pSettings->SetVerticalDirection((WCHAR*)TEXT("Down"));
if (SendDlgItemMessage(hwndDlg, IDC_VERTICAL, BM_GETCHECK, 0, 0) == BST_CHECKED)
if (_wcsicmp(pSettings->GetDirectionOrientation(), TEXT("vertical")) != 0)
- pSettings->SetDirectionOrientation(TEXT("Vertical"));
+ pSettings->SetDirectionOrientation((WCHAR*)TEXT("Vertical"));
if (SendDlgItemMessage(hwndDlg, IDC_HORIZONTAL, BM_GETCHECK, 0, 0) == BST_CHECKED)
if (_wcsicmp(pSettings->GetDirectionOrientation(), TEXT("horizontal")) != 0)
- pSettings->SetDirectionOrientation(TEXT("Horizontal"));
+ pSettings->SetDirectionOrientation((WCHAR*)TEXT("Horizontal"));
if (SendDlgItemMessage(hwndDlg, IDC_RIGHT, BM_GETCHECK, 0, 0) == BST_CHECKED)
if (_wcsicmp(pSettings->GetHorizontalDirection(), TEXT("left")) != 0)
- pSettings->SetHorizontalDirection(TEXT("Left"));
+ pSettings->SetHorizontalDirection((WCHAR*)TEXT("Left"));
if (SendDlgItemMessage(hwndDlg, IDC_LEFT, BM_GETCHECK, 0, 0) == BST_CHECKED)
if (_wcsicmp(pSettings->GetHorizontalDirection(), TEXT("right")) != 0)
- pSettings->SetHorizontalDirection(TEXT("Right"));
+ pSettings->SetHorizontalDirection((WCHAR*)TEXT("Right"));
if (SendDlgItemMessage(hwndDlg, IDC_TOP, BM_GETCHECK, 0, 0) == BST_CHECKED)
if (_wcsicmp(pSettings->GetZPosition(), TEXT("top")) != 0)
- pSettings->SetZPosition(TEXT("Top"));
+ pSettings->SetZPosition((WCHAR*)TEXT("Top"));
if (SendDlgItemMessage(hwndDlg, IDC_BOTTOM, BM_GETCHECK, 0, 0) == BST_CHECKED)
if (_wcsicmp(pSettings->GetZPosition(), TEXT("bottom")) != 0)
- pSettings->SetZPosition(TEXT("Bottom"));
+ pSettings->SetZPosition((WCHAR*)TEXT("Bottom"));
if (SendDlgItemMessage(hwndDlg, IDC_NORMAL, BM_GETCHECK, 0, 0) == BST_CHECKED)
if (_wcsicmp(pSettings->GetZPosition(), TEXT("normal")) != 0)
- pSettings->SetZPosition(TEXT("Normal"));
+ pSettings->SetZPosition((WCHAR*)TEXT("Normal"));
index = (int)SendDlgItemMessage(hwndDlg, IDC_ICONSIZE, CB_GETCURSEL, 0, 0);
if (index == 1)
Modified: trunk/Source/emergeTasks/Settings.cpp
===================================================================
--- trunk/Source/emergeTasks/Settings.cpp 2007-08-05 23:44:54 UTC (rev 1399)
+++ trunk/Source/emergeTasks/Settings.cpp 2007-08-10 01:05:10 UTC (rev 1400)
@@ -32,33 +32,33 @@
HKEY key;
RECT deskRect, tmpRect;
- ELOpenRegKey(TEXT("emergeTasks\\Settings"), &key, true);
- ELReadRegDWord(key, TEXT("X"), (DWORD*)&x, 0);
- ELReadRegDWord(key, TEXT("Y"), (DWORD*)&y, 0);
- ELReadRegDWord(key, TEXT("Width"), &width, 100);
- ELReadRegDWord(key, TEXT("Height"), &height, 100);
- ELReadRegString(key, TEXT("ZPosition"), zPosition, TEXT("normal"));
- ELReadRegString(key, TEXT("HorizontalDirection"), horizontalDirection, TEXT("right"));
- ELReadRegString(key, TEXT("VerticalDirection"), verticalDirection, TEXT("down"));
- ELReadRegString(key, TEXT("DirectionOrientation"), directionOrientation, TEXT("horizontal"));
- ELReadRegDWord(key, TEXT("FlashCount"), &flashCount, 0);
- ELReadRegDWord(key, TEXT("FlashInterval"), &flashInterval, 1000);
- ELReadRegDWord(key, TEXT("EnableFlash"), &enableFlash, 1);
- ELReadRegDWord(key, TEXT("AutoSize"), &autoSize, 0);
- ELReadRegDWord(key, TEXT("HighLightActive"), &hiliteActive, 1);
- ELReadRegDWord(key, TEXT("IconSize"), &iconSize, 16);
- ELReadRegDWord(key, TEXT("IconSpacing"), &iconSpacing, 1);
- ELReadRegString(key, TEXT("Scheme"), schemeFile, TEXT("\0"));
- ELReadRegDWord(key, TEXT("SnapMove"), &snapMove, 1);
- ELReadRegDWord(key, TEXT("ClickThrough"), &clickThrough, 0);
+ ELOpenRegKey((WCHAR*)TEXT("emergeTasks\\Settings"), &key, true);
+ ELReadRegDWord(key, (WCHAR*)TEXT("X"), (DWORD*)&x, 0);
+ ELReadRegDWord(key, (WCHAR*)TEXT("Y"), (DWORD*)&y, 0);
+ ELReadRegDWord(key, (WCHAR*)TEXT("Width"), &width, 100);
+ ELReadRegDWord(key, (WCHAR*)TEXT("Height"), &height, 100);
+ ELReadRegString(key, (WCHAR*)TEXT("ZPosition"), zPosition, (WCHAR*)TEXT("normal"));
+ ELReadRegString(key, (WCHAR*)TEXT("HorizontalDirection"), horizontalDirection, (WCHAR*)TEXT("right"));
+ ELReadRegString(key, (WCHAR*)TEXT("VerticalDirection"), verticalDirection, (WCHAR*)TEXT("down"));
+ ELReadRegString(key, (WCHAR*)TEXT("DirectionOrientation"), directionOrientation, (WCHAR*)TEXT("horizontal"));
+ ELReadRegDWord(key, (WCHAR*)TEXT("FlashCount"), &flashCount, 0);
+ ELReadRegDWord(key, (WCHAR*)TEXT("FlashInterval"), &flashInterval, 1000);
+ ELReadRegDWord(key, (WCHAR*)TEXT("EnableFlash"), &enableFlash, 1);
+ ELReadRegDWord(key, (WCHAR*)TEXT("AutoSize"), &autoSize, 0);
+ ELReadRegDWord(key, (WCHAR*)TEXT("HighLightActive"), &hiliteActive, 1);
+ ELReadRegDWord(key, (WCHAR*)TEXT("IconSize"), &iconSize, 16);
+ ELReadRegDWord(key, (WCHAR*)TEXT("IconSpacing"), &iconSpacing, 1);
+ ELReadRegString(key, (WCHAR*)TEXT("Scheme"), schemeFile, (WCHAR*)TEXT("\0"));
+ ELReadRegDWord(key, (WCHAR*)TEXT("SnapMove"), &snapMove, 1);
+ ELReadRegDWord(key, (WCHAR*)TEXT("ClickThrough"), &clickThrough, 0);
tmpRect.left = x;
tmpRect.right = tmpRect.left + width;
tmpRect.top = y;
tmpRect.bottom = tmpRect.top + height;
ELGetDesktopRect(&tmpRect, &deskRect);
- ELReadRegRect(key, TEXT("Resolution"), &resolution, &deskRect);
- ELReadRegDWord(key, TEXT("SnapSize"), &snapSize, 1);
+ ELReadRegRect(key, (WCHAR*)TEXT("Resolution"), &resolution, &deskRect);
+ ELReadRegDWord(key, (WCHAR*)TEXT("SnapSize"), &snapSize, 1);
ELCloseRegKey(key);
}
@@ -69,10 +69,10 @@
(*this).width = width;
(*this).height = height;
- if (ELOpenRegKey(TEXT("emergeTasks\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeTasks\\Settings"), &key, true))
{
- ELWriteRegDWord(key, TEXT("Width"), &width);
- ELWriteRegDWord(key, TEXT("Height"), &height);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("Width"), &width);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("Height"), &height);
ELCloseRegKey(key);
}
}
@@ -83,9 +83,9 @@
(*this).iconSize = iconSize;
- if (ELOpenRegKey(TEXT("emergeTasks\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeTasks\\Settings"), &key, true))
{
- ELWriteRegDWord(key, TEXT("IconSize"), &iconSize);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("IconSize"), &iconSize);
ELCloseRegKey(key);
}
}
@@ -96,24 +96,24 @@
(*this).iconSpacing = iconSpacing;
- if (ELOpenRegKey(TEXT("emergeTasks\\Settings"), &key, true))
+ if (ELOpenRegKey((WCHAR*)TEXT("emergeTasks\\Settings"), &key, true))
{
- ELWriteRegDWord(key, TEXT("IconSpacing"), &iconSpacing);
+ ELWriteRegDWord(key, (WCHAR*)TEXT("IconSpacing"), &iconSpacing);
ELCloseRegKey(key);
}
}
-void Settings::SetPosition(int x, int y)
+void Settings::SetPosition(DWORD x, DWORD y)
{
HKEY key;
(*this).x = x;
(*this).y = y;
- if (ELOpenRegKey(TEXT("emergeTasks\\Settings"), &key, true))
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|