From cbe3cb21f5bca61a03bbd4ae811ee906e09b3f4f Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 13 Jun 2015 16:55:17 +0000 Subject: - miranda32.exe now does nothing bug extends PATH to %miranda_root%\libs and loads mir_app.dll; - everything that was in miranda32.exe (including resources) moved to mir_app.dll; - exports from mir_app.dll now available for using directly, without perversions; - src/stdplug.h deleted; git-svn-id: http://svn.miranda-ng.org/main/trunk@14143 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/core/commonheaders.h | 107 ------ src/core/miranda.cpp | 422 --------------------- src/core/miranda.h | 190 ---------- src/core/modules.cpp | 184 --------- src/core/stdafx.cpp | 19 - src/core/stdauth/res/resource.rc | 4 +- src/core/stdauth/src/commonheaders.h | 3 +- src/core/stdauth/stdauth_10.vcxproj | 9 +- src/core/stdauth/stdauth_10.vcxproj.filters | 3 - src/core/stdauth/stdauth_12.vcxproj | 9 +- src/core/stdauth/stdauth_12.vcxproj.filters | 3 - src/core/stdautoaway/res/resource.rc | 4 +- src/core/stdautoaway/src/commonheaders.h | 3 +- src/core/stdautoaway/stdautoaway_10.vcxproj | 9 +- .../stdautoaway/stdautoaway_10.vcxproj.filters | 3 - src/core/stdautoaway/stdautoaway_12.vcxproj | 9 +- .../stdautoaway/stdautoaway_12.vcxproj.filters | 3 - src/core/stdaway/res/resource.rc | 4 +- src/core/stdaway/src/commonheaders.h | 3 +- src/core/stdaway/stdaway_10.vcxproj | 9 +- src/core/stdaway/stdaway_10.vcxproj.filters | 3 - src/core/stdaway/stdaway_12.vcxproj | 9 +- src/core/stdaway/stdaway_12.vcxproj.filters | 3 - src/core/stdcrypt/res/resource.rc | 4 +- src/core/stdcrypt/src/commonheaders.h | 3 +- src/core/stdcrypt/stdcrypt_10.vcxproj | 9 +- src/core/stdcrypt/stdcrypt_10.vcxproj.filters | 3 - src/core/stdcrypt/stdcrypt_12.vcxproj | 9 +- src/core/stdcrypt/stdcrypt_12.vcxproj.filters | 3 - src/core/stdemail/res/resource.rc | 4 +- src/core/stdemail/src/commonheaders.h | 3 +- src/core/stdemail/stdemail_10.vcxproj | 9 +- src/core/stdemail/stdemail_10.vcxproj.filters | 3 - src/core/stdemail/stdemail_12.vcxproj | 9 +- src/core/stdemail/stdemail_12.vcxproj.filters | 3 - src/core/stdfile/res/resource.rc | 4 +- src/core/stdfile/src/commonheaders.h | 3 +- src/core/stdfile/stdfile_10.vcxproj | 9 +- src/core/stdfile/stdfile_10.vcxproj.filters | 3 - src/core/stdfile/stdfile_12.vcxproj | 9 +- src/core/stdfile/stdfile_12.vcxproj.filters | 3 - src/core/stdhelp/res/resource.rc | 4 +- src/core/stdhelp/src/commonheaders.h | 3 +- src/core/stdhelp/stdhelp_10.vcxproj | 9 +- src/core/stdhelp/stdhelp_10.vcxproj.filters | 3 - src/core/stdhelp/stdhelp_12.vcxproj | 9 +- src/core/stdhelp/stdhelp_12.vcxproj.filters | 3 - src/core/stdidle/res/resource.rc | 4 +- src/core/stdidle/src/commonheaders.h | 3 +- src/core/stdidle/stdidle_10.vcxproj | 9 +- src/core/stdidle/stdidle_10.vcxproj.filters | 3 - src/core/stdidle/stdidle_12.vcxproj | 9 +- src/core/stdidle/stdidle_12.vcxproj.filters | 3 - src/core/stdmsg/src/msgdialog.cpp | 19 - src/core/stdplug.h | 25 -- src/core/stduihist/res/resource.rc | 4 +- src/core/stduihist/src/commonheaders.h | 3 +- src/core/stduihist/stduihist_10.vcxproj | 9 +- src/core/stduihist/stduihist_10.vcxproj.filters | 3 - src/core/stduihist/stduihist_12.vcxproj | 9 +- src/core/stduihist/stduihist_12.vcxproj.filters | 3 - src/core/stdurl/commonheaders.h | 3 +- src/core/stdurl/resource.rc | 4 +- src/core/stdurl/stdurl_10.vcxproj | 8 +- src/core/stdurl/stdurl_12.vcxproj | 9 +- src/core/stdurl/stdurl_12.vcxproj.filters | 3 - src/core/stduserinfo/res/resource.rc | 4 +- src/core/stduserinfo/src/commonheaders.h | 3 +- src/core/stduserinfo/stduserinfo_10.vcxproj | 9 +- .../stduserinfo/stduserinfo_10.vcxproj.filters | 3 - src/core/stduserinfo/stduserinfo_12.vcxproj | 9 +- .../stduserinfo/stduserinfo_12.vcxproj.filters | 3 - src/core/stduseronline/res/resource.rc | 2 +- src/core/stduseronline/src/commonheaders.h | 3 +- src/core/stduseronline/stduseronline_10.vcxproj | 9 +- .../stduseronline/stduseronline_10.vcxproj.filters | 3 - src/core/stduseronline/stduseronline_12.vcxproj | 9 +- .../stduseronline/stduseronline_12.vcxproj.filters | 3 - 78 files changed, 131 insertions(+), 1201 deletions(-) delete mode 100644 src/core/commonheaders.h delete mode 100644 src/core/miranda.cpp delete mode 100644 src/core/miranda.h delete mode 100644 src/core/modules.cpp delete mode 100644 src/core/stdafx.cpp delete mode 100644 src/core/stdplug.h (limited to 'src/core') diff --git a/src/core/commonheaders.h b/src/core/commonheaders.h deleted file mode 100644 index 3c60da9b96..0000000000 --- a/src/core/commonheaders.h +++ /dev/null @@ -1,107 +0,0 @@ -/* - -Miranda NG: the free IM client for Microsoft* Windows* - -Copyright (ñ) 2012-15 Miranda NG project (http://miranda-ng.org), -Copyright (c) 2000-12 Miranda IM project, -all portions of this codebase are copyrighted to the people -listed in contributors.txt. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#define _ALPHA_BASE_ 1 // defined for CVS builds -#define _ALPHA_FUSE_ 1 // defined for fuse powered core - -#define INCL_WINSOCK_API_TYPEDEFS 1 - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef _DEBUG -#include -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "miranda.h" -#include "stdplug.h" - -#include -#include -#include - -typedef struct GlobalLogSettingsBase GlobalLogSettings; -#include - -#include "../resource.h" \ No newline at end of file diff --git a/src/core/miranda.cpp b/src/core/miranda.cpp deleted file mode 100644 index b5b65f8d40..0000000000 --- a/src/core/miranda.cpp +++ /dev/null @@ -1,422 +0,0 @@ -/* - -Miranda NG: the free IM client for Microsoft* Windows* - -Copyright (ñ) 2012-15 Miranda NG project (http://miranda-ng.org), -Copyright (c) 2000-12 Miranda IM project, -all portions of this codebase are copyrighted to the people -listed in contributors.txt. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#include "commonheaders.h" - -#define MMI_SIZE_V1 (4*sizeof(void*)) -#define MMI_SIZE_V2 (7*sizeof(void*)) - -int LoadDefaultModules(void); -void UnloadNewPluginsModule(void); -void UnloadDefaultModules(void); - -pfnDrawThemeTextEx drawThemeTextEx; -pfnSetWindowThemeAttribute setWindowThemeAttribute; -pfnBufferedPaintInit bufferedPaintInit; -pfnBufferedPaintUninit bufferedPaintUninit; -pfnBeginBufferedPaint beginBufferedPaint; -pfnEndBufferedPaint endBufferedPaint; -pfnGetBufferedPaintBits getBufferedPaintBits; - -pfnDwmExtendFrameIntoClientArea dwmExtendFrameIntoClientArea; -pfnDwmIsCompositionEnabled dwmIsCompositionEnabled; - -ITaskbarList3 * pTaskbarInterface; - -HANDLE hOkToExitEvent, hModulesLoadedEvent; -HANDLE hShutdownEvent, hPreShutdownEvent; -static HANDLE hWaitObjects[MAXIMUM_WAIT_OBJECTS-1]; -static char *pszWaitServices[MAXIMUM_WAIT_OBJECTS-1]; -static int waitObjectCount = 0; -HANDLE hMirandaShutdown; -HINSTANCE hInst; -DWORD hMainThreadId; -int hLangpack = 0; -bool bModulesLoadedFired = false; - -///////////////////////////////////////////////////////////////////////////////////////// -// exception handling - -static INT_PTR srvGetExceptionFilter(WPARAM, LPARAM) -{ - return (INT_PTR)GetExceptionFilter(); -} - -static INT_PTR srvSetExceptionFilter(WPARAM, LPARAM lParam) -{ - return (INT_PTR)SetExceptionFilter((pfnExceptionFilter)lParam); -} - -///////////////////////////////////////////////////////////////////////////////////////// - -typedef LONG(WINAPI *pNtQIT)(HANDLE, LONG, PVOID, ULONG, PULONG); -#define ThreadQuerySetWin32StartAddress 9 - -INT_PTR MirandaIsTerminated(WPARAM, LPARAM) -{ - return WaitForSingleObject(hMirandaShutdown, 0) == WAIT_OBJECT_0; -} - -static void __cdecl compactHeapsThread(void*) -{ - Thread_SetName("compactHeapsThread"); - - while (!Miranda_Terminated()) { - HANDLE hHeaps[256]; - DWORD hc; - SleepEx((1000 * 60) * 5, TRUE); // every 5 minutes - hc = GetProcessHeaps(255, (PHANDLE)&hHeaps); - if (hc != 0 && hc < 256) { - DWORD j; - for (j = 0; j < hc; j++) - HeapCompact(hHeaps[j], 0); - } - } //while -} - -void(*SetIdleCallback) (void) = NULL; - -static INT_PTR SystemSetIdleCallback(WPARAM, LPARAM lParam) -{ - if (lParam && SetIdleCallback == NULL) { - SetIdleCallback = (void(*)(void))lParam; - return 1; - } - return 0; -} - -static DWORD dwEventTime = 0; -void checkIdle(MSG * msg) -{ - switch (msg->message) { - case WM_MOUSEACTIVATE: - case WM_MOUSEMOVE: - case WM_CHAR: - dwEventTime = GetTickCount(); - } -} - -static INT_PTR SystemGetIdle(WPARAM, LPARAM lParam) -{ - if (lParam) *(DWORD*)lParam = dwEventTime; - return 0; -} - -static int SystemShutdownProc(WPARAM, LPARAM) -{ - UnloadDefaultModules(); - return 0; -} - -#define MIRANDA_PROCESS_WAIT_TIMEOUT 60000 -#define MIRANDA_PROCESS_WAIT_RESOLUTION 1000 -#define MIRANDA_PROCESS_WAIT_STEPS (MIRANDA_PROCESS_WAIT_TIMEOUT/MIRANDA_PROCESS_WAIT_RESOLUTION) -static INT_PTR CALLBACK WaitForProcessDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - switch (msg) { - case WM_INITDIALOG: - TranslateDialogDefault(hwnd); - SetWindowLongPtr(hwnd, GWLP_USERDATA, lParam); - SendDlgItemMessage(hwnd, IDC_PROGRESSBAR, PBM_SETRANGE, 0, MAKELPARAM(0, MIRANDA_PROCESS_WAIT_STEPS)); - SendDlgItemMessage(hwnd, IDC_PROGRESSBAR, PBM_SETSTEP, 1, 0); - SetTimer(hwnd, 1, MIRANDA_PROCESS_WAIT_RESOLUTION, NULL); - break; - - case WM_TIMER: - if (SendDlgItemMessage(hwnd, IDC_PROGRESSBAR, PBM_STEPIT, 0, 0) == MIRANDA_PROCESS_WAIT_STEPS) - EndDialog(hwnd, 0); - if (WaitForSingleObject((HANDLE)GetWindowLongPtr(hwnd, GWLP_USERDATA), 1) != WAIT_TIMEOUT) { - SendDlgItemMessage(hwnd, IDC_PROGRESSBAR, PBM_SETPOS, MIRANDA_PROCESS_WAIT_STEPS, 0); - EndDialog(hwnd, 0); - } - break; - - case WM_COMMAND: - if (LOWORD(wParam) == IDCANCEL) { - SendDlgItemMessage(hwnd, IDC_PROGRESSBAR, PBM_SETPOS, MIRANDA_PROCESS_WAIT_STEPS, 0); - EndDialog(hwnd, 1); - } - break; - } - return FALSE; -} - -INT_PTR CheckRestart() -{ - LPCTSTR tszPID = CmdLine_GetOption(_T("restart")); - if (tszPID) { - HANDLE hProcess = OpenProcess(SYNCHRONIZE, FALSE, _ttol(tszPID)); - if (hProcess) { - INT_PTR result = DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_WAITRESTART), NULL, WaitForProcessDlgProc, (LPARAM)hProcess); - CloseHandle(hProcess); - return result; - } - } - return 0; -} - -static void crtErrorHandler(const wchar_t*, const wchar_t*, const wchar_t*, unsigned, uintptr_t) -{} - - -int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE, LPTSTR cmdLine, int) -{ - hInst = hInstance; - hMainThreadId = GetCurrentThreadId(); - - _set_invalid_parameter_handler(&crtErrorHandler); -#ifdef _DEBUG - _CrtSetReportMode(_CRT_ASSERT, 0); -#endif - - CmdLine_Parse(cmdLine); - setlocale(LC_ALL, ""); - -#ifdef _DEBUG - if (CmdLine_GetOption(_T("memdebug"))) - _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF); -#endif - - HMODULE hDwmApi, hThemeAPI; - if (IsWinVerVistaPlus()) { - hDwmApi = LoadLibrary(_T("dwmapi.dll")); - if (hDwmApi) { - dwmExtendFrameIntoClientArea = (pfnDwmExtendFrameIntoClientArea)GetProcAddress(hDwmApi, "DwmExtendFrameIntoClientArea"); - dwmIsCompositionEnabled = (pfnDwmIsCompositionEnabled)GetProcAddress(hDwmApi, "DwmIsCompositionEnabled"); - } - hThemeAPI = LoadLibrary(_T("uxtheme.dll")); - if (hThemeAPI) { - drawThemeTextEx = (pfnDrawThemeTextEx)GetProcAddress(hThemeAPI, "DrawThemeTextEx"); - setWindowThemeAttribute = (pfnSetWindowThemeAttribute)GetProcAddress(hThemeAPI, "SetWindowThemeAttribute"); - bufferedPaintInit = (pfnBufferedPaintInit)GetProcAddress(hThemeAPI, "BufferedPaintInit"); - bufferedPaintUninit = (pfnBufferedPaintUninit)GetProcAddress(hThemeAPI, "BufferedPaintUninit"); - beginBufferedPaint = (pfnBeginBufferedPaint)GetProcAddress(hThemeAPI, "BeginBufferedPaint"); - endBufferedPaint = (pfnEndBufferedPaint)GetProcAddress(hThemeAPI, "EndBufferedPaint"); - getBufferedPaintBits = (pfnGetBufferedPaintBits)GetProcAddress(hThemeAPI, "GetBufferedPaintBits"); - } - } - else hDwmApi = hThemeAPI = 0; - - if (bufferedPaintInit) - bufferedPaintInit(); - - OleInitialize(NULL); - - if (IsWinVer7Plus()) - CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_ALL, IID_ITaskbarList3, (void**)&pTaskbarInterface); - - int result = 0; - if (LoadDefaultModules()) { - SetEvent(hMirandaShutdown); - NotifyEventHooks(hPreShutdownEvent, 0, 0); - NotifyEventHooks(hShutdownEvent, 0, 0); - UnloadDefaultModules(); - - result = 1; - } - else { - InitPathVar(); - NotifyEventHooks(hModulesLoadedEvent, 0, 0); - bModulesLoadedFired = true; - - // ensure that the kernel hooks the SystemShutdownProc() after all plugins - HookEvent(ME_SYSTEM_SHUTDOWN, SystemShutdownProc); - - forkthread(compactHeapsThread, 0, NULL); - CreateServiceFunction(MS_SYSTEM_SETIDLECALLBACK, SystemSetIdleCallback); - CreateServiceFunction(MS_SYSTEM_GETIDLE, SystemGetIdle); - dwEventTime = GetTickCount(); - DWORD myPid = GetCurrentProcessId(); - - bool messageloop = true; - while (messageloop) { - MSG msg; - BOOL dying = FALSE; - DWORD rc = MsgWaitForMultipleObjectsEx(waitObjectCount, hWaitObjects, INFINITE, QS_ALLINPUT, MWMO_ALERTABLE); - if (rc < WAIT_OBJECT_0 + waitObjectCount) { - rc -= WAIT_OBJECT_0; - CallService(pszWaitServices[rc], (WPARAM)hWaitObjects[rc], 0); - } - // - while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { - if (msg.message != WM_QUIT) { - HWND h = GetForegroundWindow(); - DWORD pid = 0; - checkIdle(&msg); - if (h != NULL && GetWindowThreadProcessId(h, &pid) && pid == myPid && GetClassLongPtr(h, GCW_ATOM) == 32770) - if (h != NULL && IsDialogMessage(h, &msg)) /* Wine fix. */ - continue; - - TranslateMessage(&msg); - DispatchMessage(&msg); - if (SetIdleCallback != NULL) - SetIdleCallback(); - } - else if (!dying) { - dying++; - SetEvent(hMirandaShutdown); - NotifyEventHooks(hPreShutdownEvent, 0, 0); - - // this spins and processes the msg loop, objects and APC. - Thread_Wait(); - NotifyEventHooks(hShutdownEvent, 0, 0); - // if the hooks generated any messages, it'll get processed before the second WM_QUIT - PostQuitMessage(0); - } - else if (dying) - messageloop = false; - } - } - } - - UnloadNewPluginsModule(); - UnloadCoreModule(); - CloseHandle(hMirandaShutdown); - FreeLibrary(hDwmApi); - FreeLibrary(hThemeAPI); - - if (pTaskbarInterface) - pTaskbarInterface->Release(); - - OleUninitialize(); - - if (bufferedPaintUninit) - bufferedPaintUninit(); - return result; -} - -static INT_PTR OkToExit(WPARAM, LPARAM) -{ - return NotifyEventHooks(hOkToExitEvent, 0, 0) == 0; -} - -static INT_PTR GetMirandaVersion(WPARAM, LPARAM) -{ - TCHAR filename[MAX_PATH]; - GetModuleFileName(NULL, filename, SIZEOF(filename)); - - DWORD unused, verInfoSize = GetFileVersionInfoSize(filename, &unused); - PVOID pVerInfo = _alloca(verInfoSize); - GetFileVersionInfo(filename, 0, verInfoSize, pVerInfo); - - UINT blockSize; - VS_FIXEDFILEINFO *vsffi; - VerQueryValue(pVerInfo, _T("\\"), (PVOID*)&vsffi, &blockSize); - DWORD ver = (((vsffi->dwProductVersionMS >> 16) & 0xFF) << 24) | - ((vsffi->dwProductVersionMS & 0xFF) << 16) | - (((vsffi->dwProductVersionLS >> 16) & 0xFF) << 8) | - (vsffi->dwProductVersionLS & 0xFF); - return (INT_PTR)ver; -} - -static INT_PTR GetMirandaFileVersion(WPARAM, LPARAM lParam) -{ - TCHAR filename[MAX_PATH]; - GetModuleFileName(NULL, filename, SIZEOF(filename)); - - DWORD unused, verInfoSize = GetFileVersionInfoSize(filename, &unused); - PVOID pVerInfo = _alloca(verInfoSize); - GetFileVersionInfo(filename, 0, verInfoSize, pVerInfo); - - UINT blockSize; - VS_FIXEDFILEINFO *vsffi; - VerQueryValue(pVerInfo, _T("\\"), (PVOID*)&vsffi, &blockSize); - - WORD* p = (WORD*)lParam; - p[0] = HIWORD(vsffi->dwProductVersionMS); - p[1] = LOWORD(vsffi->dwProductVersionMS); - p[2] = HIWORD(vsffi->dwProductVersionLS); - p[3] = LOWORD(vsffi->dwProductVersionLS); - return 0; -} - -static INT_PTR GetMirandaVersionText(WPARAM wParam, LPARAM lParam) -{ - TCHAR filename[MAX_PATH], *productVersion; - GetModuleFileName(NULL, filename, SIZEOF(filename)); - - DWORD unused, verInfoSize = GetFileVersionInfoSize(filename, &unused); - PVOID pVerInfo = _alloca(verInfoSize); - GetFileVersionInfo(filename, 0, verInfoSize, pVerInfo); - - UINT blockSize; - VerQueryValue(pVerInfo, _T("\\StringFileInfo\\000004b0\\ProductVersion"), (LPVOID*)&productVersion, &blockSize); - strncpy((char*)lParam, _T2A(productVersion), wParam); -#if defined(_WIN64) - strcat_s((char*)lParam, wParam, " x64"); -#endif - return 0; -} - -INT_PTR WaitOnHandle(WPARAM wParam, LPARAM lParam) -{ - if (waitObjectCount >= MAXIMUM_WAIT_OBJECTS - 1) - return 1; - - hWaitObjects[waitObjectCount] = (HANDLE)wParam; - pszWaitServices[waitObjectCount] = (char*)lParam; - waitObjectCount++; - return 0; -} - -static INT_PTR RemoveWait(WPARAM wParam, LPARAM) -{ - int i; - - for (i = 0; i < waitObjectCount; i++) - if (hWaitObjects[i] == (HANDLE)wParam) - break; - - if (i == waitObjectCount) - return 1; - - waitObjectCount--; - memmove(&hWaitObjects[i], &hWaitObjects[i + 1], sizeof(HANDLE)*(waitObjectCount - i)); - memmove(&pszWaitServices[i], &pszWaitServices[i + 1], sizeof(char*)*(waitObjectCount - i)); - return 0; -} - -/////////////////////////////////////////////////////////////////////////////// - -int LoadSystemModule(void) -{ - hMirandaShutdown = CreateEvent(NULL, TRUE, FALSE, NULL); - - hShutdownEvent = CreateHookableEvent(ME_SYSTEM_SHUTDOWN); - hPreShutdownEvent = CreateHookableEvent(ME_SYSTEM_PRESHUTDOWN); - hModulesLoadedEvent = CreateHookableEvent(ME_SYSTEM_MODULESLOADED); - hOkToExitEvent = CreateHookableEvent(ME_SYSTEM_OKTOEXIT); - - CreateServiceFunction(MS_SYSTEM_TERMINATED, MirandaIsTerminated); - CreateServiceFunction(MS_SYSTEM_OKTOEXIT, OkToExit); - CreateServiceFunction(MS_SYSTEM_GETVERSION, GetMirandaVersion); - CreateServiceFunction(MS_SYSTEM_GETFILEVERSION, GetMirandaFileVersion); - CreateServiceFunction(MS_SYSTEM_GETVERSIONTEXT, GetMirandaVersionText); - CreateServiceFunction(MS_SYSTEM_WAITONHANDLE, WaitOnHandle); - CreateServiceFunction(MS_SYSTEM_REMOVEWAIT, RemoveWait); - CreateServiceFunction(MS_SYSTEM_GETEXCEPTFILTER, srvGetExceptionFilter); - CreateServiceFunction(MS_SYSTEM_SETEXCEPTFILTER, srvSetExceptionFilter); - return 0; -} diff --git a/src/core/miranda.h b/src/core/miranda.h deleted file mode 100644 index ba8516baf1..0000000000 --- a/src/core/miranda.h +++ /dev/null @@ -1,190 +0,0 @@ -/* - -Miranda NG: the free IM client for Microsoft* Windows* - -Copyright (ñ) 2012-15 Miranda NG project (http://miranda-ng.org), -Copyright (c) 2000-12 Miranda IM project, -all portions of this codebase are copyrighted to the people -listed in contributors.txt. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -typedef HRESULT (STDAPICALLTYPE *pfnDrawThemeTextEx)(HTHEME, HDC, int, int, LPCWSTR, int, DWORD, LPRECT, const struct _DTTOPTS *); -typedef HRESULT (STDAPICALLTYPE *pfnSetWindowThemeAttribute)(HWND, enum WINDOWTHEMEATTRIBUTETYPE, PVOID, DWORD); -typedef HRESULT (STDAPICALLTYPE *pfnBufferedPaintInit)(void); -typedef HRESULT (STDAPICALLTYPE *pfnBufferedPaintUninit)(void); -typedef HANDLE (STDAPICALLTYPE *pfnBeginBufferedPaint)(HDC, RECT *, BP_BUFFERFORMAT, BP_PAINTPARAMS *, HDC *); -typedef HRESULT (STDAPICALLTYPE *pfnEndBufferedPaint)(HANDLE, BOOL); -typedef HRESULT (STDAPICALLTYPE *pfnGetBufferedPaintBits)(HANDLE, RGBQUAD **, int *); - -extern pfnDrawThemeTextEx drawThemeTextEx; -extern pfnSetWindowThemeAttribute setWindowThemeAttribute; -extern pfnBufferedPaintInit bufferedPaintInit; -extern pfnBufferedPaintUninit bufferedPaintUninit; -extern pfnBeginBufferedPaint beginBufferedPaint; -extern pfnEndBufferedPaint endBufferedPaint; -extern pfnGetBufferedPaintBits getBufferedPaintBits; - -extern ITaskbarList3 * pTaskbarInterface; - -typedef HRESULT (STDAPICALLTYPE *pfnDwmExtendFrameIntoClientArea)(HWND hwnd, const MARGINS *margins); -typedef HRESULT (STDAPICALLTYPE *pfnDwmIsCompositionEnabled)(BOOL *); - -extern pfnDwmExtendFrameIntoClientArea dwmExtendFrameIntoClientArea; -extern pfnDwmIsCompositionEnabled dwmIsCompositionEnabled; - -/**** database.cpp *********************************************************************/ - -extern MIDatabase* currDb; -extern DATABASELINK* currDblink; -extern LIST arDbPlugins; - -int InitIni(void); -void UninitIni(void); - -/**** extraicons.cpp *******************************************************************/ - -void KillModuleExtraIcons(int hLangpack); - -/**** fontService.cpp ******************************************************************/ - -void KillModuleFonts(int hLangpack); -void KillModuleColours(int hLangpack); -void KillModuleEffects(int hLangpack); -void KillModuleHotkeys(int hLangpack); -void KillModuleSounds(int hLangpack); - -/**** miranda.cpp **********************************************************************/ - -extern HINSTANCE hInst; -extern DWORD hMainThreadId; -extern HANDLE hOkToExitEvent, hModulesLoadedEvent, hevLoadModule, hevUnloadModule; -extern TCHAR mirandabootini[MAX_PATH]; - -/**** newplugins.cpp *******************************************************************/ - -char* GetPluginNameByInstance(HINSTANCE hInstance); -int GetPluginFakeId(const MUUID &uuid, int hLangpack); -int LoadStdPlugins(void); - -/**** path.cpp *************************************************************************/ - -void InitPathVar(void); - -/**** srmm.cpp *************************************************************************/ - -void KillModuleSrmmIcons(int hLangpack); - -/**** utf.cpp **************************************************************************/ - -__forceinline char* Utf8DecodeA(const char* src) -{ - char* tmp = mir_strdup(src); - Utf8Decode(tmp, NULL); - return tmp; -} - -#pragma optimize("", on) - -/**** options.cpp **********************************************************************/ - -HTREEITEM FindNamedTreeItemAtRoot(HWND hwndTree, const TCHAR* name); - -/**** skin2icons.cpp *******************************************************************/ - -void KillModuleIcons(int hLangpack); - -/**** skinicons.cpp ********************************************************************/ - -HICON LoadIconEx(HINSTANCE hInstance, LPCTSTR lpIconName, BOOL bShared); -int ImageList_AddIcon_NotShared(HIMAGELIST hIml, LPCTSTR szResource); -int ImageList_ReplaceIcon_NotShared(HIMAGELIST hIml, int iIndex, HINSTANCE hInstance, LPCTSTR szResource); - -int ImageList_AddIcon_IconLibLoaded(HIMAGELIST hIml, int iconId); -int ImageList_AddIcon_ProtoIconLibLoaded(HIMAGELIST hIml, const char *szProto, int iconId); -int ImageList_ReplaceIcon_IconLibLoaded(HIMAGELIST hIml, int nIndex, HICON hIcon); - -#define Safe_DestroyIcon(hIcon) if (hIcon) DestroyIcon(hIcon) - -/**** clistmenus.cpp ********************************************************************/ - -extern HANDLE hMainMenuObject, hContactMenuObject, hStatusMenuObject; -extern HANDLE hPreBuildMainMenuEvent, hPreBuildContactMenuEvent; -extern HANDLE hShutdownEvent, hPreShutdownEvent; - -extern const int statusModeList[ MAX_STATUS_COUNT ]; -extern const int skinIconStatusList[ MAX_STATUS_COUNT ]; -extern const int skinIconStatusFlags[ MAX_STATUS_COUNT ]; - -int TryProcessDoubleClick(MCONTACT hContact); - -void KillModuleMenus(int hLangpack); - -/**** protocols.cpp *********************************************************************/ - -#define OFFSET_PROTOPOS 200 -#define OFFSET_VISIBLE 400 -#define OFFSET_ENABLED 600 -#define OFFSET_NAME 800 - -extern LIST accounts; - -INT_PTR ProtoCallService(LPCSTR szModule, const char *szService, WPARAM wParam, LPARAM lParam); - -PROTOACCOUNT* Proto_CreateAccount(const char *szModuleName, const char *szBaseProto, const TCHAR *tszAccountName); - -PROTOACCOUNT* __fastcall Proto_GetAccount(const char *accName); -PROTOACCOUNT* __fastcall Proto_GetAccount(MCONTACT hContact); - -bool __fastcall Proto_IsAccountEnabled(PROTOACCOUNT *pa); -bool __fastcall Proto_IsAccountLocked(PROTOACCOUNT *pa); - -PROTO_INTERFACE* AddDefaultAccount(const char *szProtoName); -int FreeDefaultAccount(PROTO_INTERFACE* ppi); - -BOOL ActivateAccount(PROTOACCOUNT *pa); -void EraseAccount(const char *pszProtoName); -void DeactivateAccount(PROTOACCOUNT *pa, bool bIsDynamic, bool bErase); -void UnloadAccount(PROTOACCOUNT *pa, bool bIsDynamic, bool bErase); -void OpenAccountOptions(PROTOACCOUNT *pa); - -void LoadDbAccounts(void); -void WriteDbAccounts(void); - -INT_PTR CallProtoServiceInt(MCONTACT hContact, const char* szModule, const char* szService, WPARAM wParam, LPARAM lParam); - -/**** utils.cpp ************************************************************************/ - -void HotkeyToName(TCHAR *buf, int size, BYTE shift, BYTE key); -WORD GetHotkeyValue(INT_PTR idHotkey); -int AssertInsideScreen(RECT &rc); - -HBITMAP ConvertIconToBitmap(HICON hIcon, HIMAGELIST hIml, int iconId); - -/////////////////////////////////////////////////////////////////////////////// - -extern "C" -{ - MIR_CORE_DLL(int) Langpack_MarkPluginLoaded(PLUGININFOEX* pInfo); - MIR_CORE_DLL(int) GetSubscribersCount(HANDLE hHook); - MIR_CORE_DLL(void) db_setCurrent(MIDatabase* _db); - - MIR_CORE_DLL(PROTOCOLDESCRIPTOR*) Proto_RegisterModule(PROTOCOLDESCRIPTOR *pd); - - int ProtoServiceExists(LPCSTR szModule, const char *szService); - INT_PTR CallContactService(MCONTACT, const char *, WPARAM, LPARAM); - INT_PTR CallProtoService(LPCSTR szModule, const char *szService, WPARAM wParam, LPARAM lParam); -}; diff --git a/src/core/modules.cpp b/src/core/modules.cpp deleted file mode 100644 index 21824566ed..0000000000 --- a/src/core/modules.cpp +++ /dev/null @@ -1,184 +0,0 @@ -/* - -Miranda NG: the free IM client for Microsoft* Windows* - -Copyright (ñ) 2012-15 Miranda NG project (http://miranda-ng.org), -Copyright (c) 2000-12 Miranda IM project, -all portions of this codebase are copyrighted to the people -listed in contributors.txt. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ -#include "commonheaders.h" - -#include "../modules/plugins/plugins.h" -#include "../modules/langpack/langpack.h" -#include "../modules/chat/chat.h" - -INT_PTR CheckRestart(); // core: IDD_WAITRESTART - -int LoadSystemModule(void); // core: m_system.h services -int LoadNewPluginsModuleInfos(void); // core: preloading plugins -int LoadNewPluginsModule(void); // core: N.O. plugins -int LoadNetlibModule(void); // core: network -int LoadSslModule(void); -int LoadLangpackModule(void); // core: translation -int LoadProtocolsModule(void); // core: protocol manager -int LoadAccountsModule(void); // core: account manager -int LoadIgnoreModule(void); // protocol filter: ignore -int LoadDbintfModule(void); -int LoadEventsModule(void); -int LoadSrmmModule(void); - -int LoadContactsModule(void); -int LoadContactListModule(void);// ui: clist -int LoadDatabaseModule(void); -int LoadMetacontacts(void); -int LoadOptionsModule(void); // ui: options dialog -int LoadFindAddModule(void); // ui: search/add users -int LoadSkinIcons(void); -int LoadSkinSounds(void); -int LoadSkinHotkeys(void); -int LoadUserInfoModule(void); // ui: user info -int LoadVisibilityModule(void); // ui: visibility control - -int LoadPluginOptionsModule(void); // ui: plugin viewer -int LoadAddContactModule(void); // ui: authcontrol contacts -int LoadUtilsModule(void); // ui: utils (has a few window classes, like HyperLink) -int LoadCLCModule(void); // window class: CLC control -int LoadButtonModule(void); // window class: button class -int LoadFontserviceModule(void); // ui: font manager -int LoadIcoLibModule(void); // ui: icons manager -int LoadServiceModePlugin(void); -int LoadDefaultServiceModePlugin(void); -int LoadErrorsModule(void); - -void UnloadAccountsModule(void); -void UnloadClcModule(void); -void UnloadContactListModule(void); -void UnloadDatabase(void); -void UnloadErrorsModule(void); -void UnloadEventsModule(void); -void UnloadExtraIconsModule(void); -void UnloadIcoLibModule(void); -void UnloadMetacontacts(void); -void UnloadNetlibModule(void); -void UnloadNewPlugins(void); -void UnloadProtocolsModule(void); -void UnloadSkinSounds(void); -void UnloadSkinHotkeys(void); -void UnloadSrmmModule(void); -void UnloadUtilsModule(void); - -int LoadIcoTabsModule(); -int LoadHeaderbarModule(); -int LoadDescButtonModule(); - -int LoadDefaultModules(void) -{ - // load order is very important for these - if (LoadSystemModule()) return 1; - if (LoadLangpackModule()) return 1; // langpack will be a system module in the new order so this is moved here - if (CheckRestart()) return 1; - if (LoadUtilsModule()) return 1; //order not important for this, but no dependencies and no point in pluginising - if (LoadIcoTabsModule()) return 1; - if (LoadHeaderbarModule()) return 1; - if (LoadDbintfModule()) return 1; - if (LoadEventsModule()) return 1; - - // load database drivers & service plugins without executing their Load() - if (LoadNewPluginsModuleInfos()) return 1; - - switch (LoadDefaultServiceModePlugin()) { - case SERVICE_CONTINUE: // continue loading Miranda normally - case SERVICE_ONLYDB: // load database and go to the message cycle - break; - case SERVICE_MONOPOLY: // unload database and go to the message cycle - return 0; - default: // smth went wrong, terminating - return 1; - } - - // the database will select which db plugin to use, or fail if no profile is selected - if (LoadDatabaseModule()) return 1; - - // database is available here - if (LoadButtonModule()) return 1; - if (LoadIcoLibModule()) return 1; - if (LoadSkinIcons()) return 1; - - // if (LoadErrorsModule()) return 1; - - switch (LoadServiceModePlugin()) { - case SERVICE_CONTINUE: // continue loading Miranda normally - break; - case SERVICE_ONLYDB: // load database and go to the message cycle - return 0; - case SERVICE_MONOPOLY: // unload database and go to the message cycle - UnloadDatabase(); - return 0; - default: // smth went wrong, terminating - return 1; - } - - if (LoadSkinSounds()) return 1; - if (LoadSkinHotkeys()) return 1; - if (LoadFontserviceModule()) return 1; - if (LoadSrmmModule()) return 1; - if (LoadChatModule()) return 1; - if (LoadDescButtonModule()) return 1; - if (LoadOptionsModule()) return 1; - if (LoadNetlibModule()) return 1; - if (LoadSslModule()) return 1; - if (LoadProtocolsModule()) return 1; - LoadDbAccounts(); // retrieves the account array from a database - if (LoadContactsModule()) return 1; - if (LoadContactListModule()) return 1; // prepare contact list interface - if (LoadAddContactModule()) return 1; - if (LoadMetacontacts()) return 1; - - if (LoadNewPluginsModule()) return 1; // will call Load(void) on everything, clist will load first - - Langpack_SortDuplicates(); - - if (LoadAccountsModule()) return 1; - - //order becomes less important below here - if (LoadFindAddModule()) return 1; - if (LoadIgnoreModule()) return 1; - if (LoadVisibilityModule()) return 1; - if (LoadStdPlugins()) return 1; - return 0; -} - -void UnloadDefaultModules(void) -{ - UnloadChatModule(); - UnloadAccountsModule(); - UnloadMetacontacts(); - UnloadNewPlugins(); - UnloadProtocolsModule(); - UnloadSkinSounds(); - UnloadSkinHotkeys(); - UnloadSrmmModule(); - // UnloadErrorsModule(); - UnloadIcoLibModule(); - UnloadUtilsModule(); - UnloadExtraIconsModule(); - UnloadClcModule(); - UnloadContactListModule(); - UnloadEventsModule(); - UnloadNetlibModule(); -} diff --git a/src/core/stdafx.cpp b/src/core/stdafx.cpp deleted file mode 100644 index 288f19664b..0000000000 --- a/src/core/stdafx.cpp +++ /dev/null @@ -1,19 +0,0 @@ -/* - -Copyright (C) 2012-15 Miranda NG team (http://miranda-ng.org) - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation version 2 -of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#include "commonheaders.h" \ No newline at end of file diff --git a/src/core/stdauth/res/resource.rc b/src/core/stdauth/res/resource.rc index 56c32d6d3f..d909dfcb98 100644 --- a/src/core/stdauth/res/resource.rc +++ b/src/core/stdauth/res/resource.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script. // -#include "..\..\resource.h" +#include "..\..\mir_app\src\resource.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -91,7 +91,7 @@ END 1 TEXTINCLUDE BEGIN - "..\..\resource.h\0" + "..\..\mir_app\src\resource.h\0" END 2 TEXTINCLUDE diff --git a/src/core/stdauth/src/commonheaders.h b/src/core/stdauth/src/commonheaders.h index 5ad3618b5c..1ba20c8690 100644 --- a/src/core/stdauth/src/commonheaders.h +++ b/src/core/stdauth/src/commonheaders.h @@ -69,7 +69,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "version.h" -#include "../../resource.h" -#include "../stdplug.h" +#include "../../mir_app/src/resource.h" extern HINSTANCE hInst; diff --git a/src/core/stdauth/stdauth_10.vcxproj b/src/core/stdauth/stdauth_10.vcxproj index c5a14dc7e2..7c0a70f0a1 100644 --- a/src/core/stdauth/stdauth_10.vcxproj +++ b/src/core/stdauth/stdauth_10.vcxproj @@ -91,7 +91,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -125,7 +125,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -156,7 +156,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -189,7 +189,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -207,7 +207,6 @@ - diff --git a/src/core/stdauth/stdauth_10.vcxproj.filters b/src/core/stdauth/stdauth_10.vcxproj.filters index fc99a6f1b1..cbb7778662 100644 --- a/src/core/stdauth/stdauth_10.vcxproj.filters +++ b/src/core/stdauth/stdauth_10.vcxproj.filters @@ -29,9 +29,6 @@ - - Header Files - Header Files diff --git a/src/core/stdauth/stdauth_12.vcxproj b/src/core/stdauth/stdauth_12.vcxproj index ff5b5fca31..8032a71d0e 100644 --- a/src/core/stdauth/stdauth_12.vcxproj +++ b/src/core/stdauth/stdauth_12.vcxproj @@ -95,7 +95,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -128,7 +128,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -160,7 +160,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -192,7 +192,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -210,7 +210,6 @@ - diff --git a/src/core/stdauth/stdauth_12.vcxproj.filters b/src/core/stdauth/stdauth_12.vcxproj.filters index fc99a6f1b1..cbb7778662 100644 --- a/src/core/stdauth/stdauth_12.vcxproj.filters +++ b/src/core/stdauth/stdauth_12.vcxproj.filters @@ -29,9 +29,6 @@ - - Header Files - Header Files diff --git a/src/core/stdautoaway/res/resource.rc b/src/core/stdautoaway/res/resource.rc index 5bb57eb276..16038b37b3 100644 --- a/src/core/stdautoaway/res/resource.rc +++ b/src/core/stdautoaway/res/resource.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script. // -#include "..\..\resource.h" +#include "..\..\mir_app\src\resource.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -47,7 +47,7 @@ END 1 TEXTINCLUDE BEGIN - "..\..\resource.h\0" + "..\..\mir_app\src\resource.h\0" END 2 TEXTINCLUDE diff --git a/src/core/stdautoaway/src/commonheaders.h b/src/core/stdautoaway/src/commonheaders.h index ac2017ea37..efdb7396e7 100644 --- a/src/core/stdautoaway/src/commonheaders.h +++ b/src/core/stdautoaway/src/commonheaders.h @@ -67,7 +67,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "version.h" -#include "../../resource.h" -#include "../stdplug.h" +#include "../../mir_app/src/resource.h" extern HINSTANCE hInst; diff --git a/src/core/stdautoaway/stdautoaway_10.vcxproj b/src/core/stdautoaway/stdautoaway_10.vcxproj index 5179cb23f3..7c901602a8 100644 --- a/src/core/stdautoaway/stdautoaway_10.vcxproj +++ b/src/core/stdautoaway/stdautoaway_10.vcxproj @@ -91,7 +91,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -125,7 +125,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -156,7 +156,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -189,7 +189,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -206,7 +206,6 @@ - diff --git a/src/core/stdautoaway/stdautoaway_10.vcxproj.filters b/src/core/stdautoaway/stdautoaway_10.vcxproj.filters index 92dada9114..c3fdd336cf 100644 --- a/src/core/stdautoaway/stdautoaway_10.vcxproj.filters +++ b/src/core/stdautoaway/stdautoaway_10.vcxproj.filters @@ -29,9 +29,6 @@ Header Files - - Header Files - Header Files diff --git a/src/core/stdautoaway/stdautoaway_12.vcxproj b/src/core/stdautoaway/stdautoaway_12.vcxproj index a99c2eff28..c3aeb1fa86 100644 --- a/src/core/stdautoaway/stdautoaway_12.vcxproj +++ b/src/core/stdautoaway/stdautoaway_12.vcxproj @@ -95,7 +95,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -128,7 +128,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -160,7 +160,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -192,7 +192,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -209,7 +209,6 @@ - diff --git a/src/core/stdautoaway/stdautoaway_12.vcxproj.filters b/src/core/stdautoaway/stdautoaway_12.vcxproj.filters index 92dada9114..c3fdd336cf 100644 --- a/src/core/stdautoaway/stdautoaway_12.vcxproj.filters +++ b/src/core/stdautoaway/stdautoaway_12.vcxproj.filters @@ -29,9 +29,6 @@ Header Files - - Header Files - Header Files diff --git a/src/core/stdaway/res/resource.rc b/src/core/stdaway/res/resource.rc index 85efa99e84..f064664603 100644 --- a/src/core/stdaway/res/resource.rc +++ b/src/core/stdaway/res/resource.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script. // -#include "..\..\resource.h" +#include "..\..\mir_app\src\resource.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -138,7 +138,7 @@ END 1 TEXTINCLUDE BEGIN - "..\..\resource.h\0" + "..\..\mir_app\src\resource.h\0" END 2 TEXTINCLUDE diff --git a/src/core/stdaway/src/commonheaders.h b/src/core/stdaway/src/commonheaders.h index bb73a7f7df..ea2707e767 100644 --- a/src/core/stdaway/src/commonheaders.h +++ b/src/core/stdaway/src/commonheaders.h @@ -69,7 +69,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "version.h" -#include "../../resource.h" -#include "../stdplug.h" +#include "../../mir_app/src/resource.h" extern HINSTANCE hInst; diff --git a/src/core/stdaway/stdaway_10.vcxproj b/src/core/stdaway/stdaway_10.vcxproj index 92d3ed1187..f597108572 100644 --- a/src/core/stdaway/stdaway_10.vcxproj +++ b/src/core/stdaway/stdaway_10.vcxproj @@ -91,7 +91,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -125,7 +125,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -156,7 +156,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -189,7 +189,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -207,7 +207,6 @@ - diff --git a/src/core/stdaway/stdaway_10.vcxproj.filters b/src/core/stdaway/stdaway_10.vcxproj.filters index 7d169c18e9..3f952c05b5 100644 --- a/src/core/stdaway/stdaway_10.vcxproj.filters +++ b/src/core/stdaway/stdaway_10.vcxproj.filters @@ -29,9 +29,6 @@ - - Header Files - Header Files diff --git a/src/core/stdaway/stdaway_12.vcxproj b/src/core/stdaway/stdaway_12.vcxproj index 36587fd1c1..a4363fedf7 100644 --- a/src/core/stdaway/stdaway_12.vcxproj +++ b/src/core/stdaway/stdaway_12.vcxproj @@ -95,7 +95,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -128,7 +128,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -160,7 +160,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -192,7 +192,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -210,7 +210,6 @@ - diff --git a/src/core/stdaway/stdaway_12.vcxproj.filters b/src/core/stdaway/stdaway_12.vcxproj.filters index 7d169c18e9..3f952c05b5 100644 --- a/src/core/stdaway/stdaway_12.vcxproj.filters +++ b/src/core/stdaway/stdaway_12.vcxproj.filters @@ -29,9 +29,6 @@ - - Header Files - Header Files diff --git a/src/core/stdcrypt/res/resource.rc b/src/core/stdcrypt/res/resource.rc index 5bb57eb276..16038b37b3 100644 --- a/src/core/stdcrypt/res/resource.rc +++ b/src/core/stdcrypt/res/resource.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script. // -#include "..\..\resource.h" +#include "..\..\mir_app\src\resource.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -47,7 +47,7 @@ END 1 TEXTINCLUDE BEGIN - "..\..\resource.h\0" + "..\..\mir_app\src\resource.h\0" END 2 TEXTINCLUDE diff --git a/src/core/stdcrypt/src/commonheaders.h b/src/core/stdcrypt/src/commonheaders.h index 19eea8147c..43da7d6c65 100644 --- a/src/core/stdcrypt/src/commonheaders.h +++ b/src/core/stdcrypt/src/commonheaders.h @@ -67,8 +67,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "version.h" -#include "../../resource.h" -#include "../stdplug.h" +#include "../../mir_app/src/resource.h" #include "stdcrypt.h" diff --git a/src/core/stdcrypt/stdcrypt_10.vcxproj b/src/core/stdcrypt/stdcrypt_10.vcxproj index 4bb55e0958..dc9387bae3 100644 --- a/src/core/stdcrypt/stdcrypt_10.vcxproj +++ b/src/core/stdcrypt/stdcrypt_10.vcxproj @@ -91,7 +91,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -125,7 +125,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -156,7 +156,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -189,7 +189,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -209,7 +209,6 @@ - diff --git a/src/core/stdcrypt/stdcrypt_10.vcxproj.filters b/src/core/stdcrypt/stdcrypt_10.vcxproj.filters index 4ac4b666d6..d1ef9ab89a 100644 --- a/src/core/stdcrypt/stdcrypt_10.vcxproj.filters +++ b/src/core/stdcrypt/stdcrypt_10.vcxproj.filters @@ -32,9 +32,6 @@ - - Header Files - Header Files diff --git a/src/core/stdcrypt/stdcrypt_12.vcxproj b/src/core/stdcrypt/stdcrypt_12.vcxproj index f75771d2e6..82478c5b2e 100644 --- a/src/core/stdcrypt/stdcrypt_12.vcxproj +++ b/src/core/stdcrypt/stdcrypt_12.vcxproj @@ -95,7 +95,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -128,7 +128,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -160,7 +160,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -192,7 +192,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -212,7 +212,6 @@ - diff --git a/src/core/stdcrypt/stdcrypt_12.vcxproj.filters b/src/core/stdcrypt/stdcrypt_12.vcxproj.filters index 4ac4b666d6..d1ef9ab89a 100644 --- a/src/core/stdcrypt/stdcrypt_12.vcxproj.filters +++ b/src/core/stdcrypt/stdcrypt_12.vcxproj.filters @@ -32,9 +32,6 @@ - - Header Files - Header Files diff --git a/src/core/stdemail/res/resource.rc b/src/core/stdemail/res/resource.rc index 5bb57eb276..16038b37b3 100644 --- a/src/core/stdemail/res/resource.rc +++ b/src/core/stdemail/res/resource.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script. // -#include "..\..\resource.h" +#include "..\..\mir_app\src\resource.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -47,7 +47,7 @@ END 1 TEXTINCLUDE BEGIN - "..\..\resource.h\0" + "..\..\mir_app\src\resource.h\0" END 2 TEXTINCLUDE diff --git a/src/core/stdemail/src/commonheaders.h b/src/core/stdemail/src/commonheaders.h index 87f368b0ee..537c6293fa 100644 --- a/src/core/stdemail/src/commonheaders.h +++ b/src/core/stdemail/src/commonheaders.h @@ -66,7 +66,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "version.h" -#include "../../resource.h" -#include "../stdplug.h" +#include "../../mir_app/src/resource.h" extern HINSTANCE hInst; diff --git a/src/core/stdemail/stdemail_10.vcxproj b/src/core/stdemail/stdemail_10.vcxproj index 234e74e475..981945533c 100644 --- a/src/core/stdemail/stdemail_10.vcxproj +++ b/src/core/stdemail/stdemail_10.vcxproj @@ -91,7 +91,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -125,7 +125,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -156,7 +156,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -189,7 +189,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -206,7 +206,6 @@ - diff --git a/src/core/stdemail/stdemail_10.vcxproj.filters b/src/core/stdemail/stdemail_10.vcxproj.filters index 052e412801..e37505cf51 100644 --- a/src/core/stdemail/stdemail_10.vcxproj.filters +++ b/src/core/stdemail/stdemail_10.vcxproj.filters @@ -26,9 +26,6 @@ - - Header Files - Header Files diff --git a/src/core/stdemail/stdemail_12.vcxproj b/src/core/stdemail/stdemail_12.vcxproj index 40b5e5ed57..c95c9c008b 100644 --- a/src/core/stdemail/stdemail_12.vcxproj +++ b/src/core/stdemail/stdemail_12.vcxproj @@ -95,7 +95,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -128,7 +128,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -160,7 +160,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -192,7 +192,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -209,7 +209,6 @@ - diff --git a/src/core/stdemail/stdemail_12.vcxproj.filters b/src/core/stdemail/stdemail_12.vcxproj.filters index 052e412801..e37505cf51 100644 --- a/src/core/stdemail/stdemail_12.vcxproj.filters +++ b/src/core/stdemail/stdemail_12.vcxproj.filters @@ -26,9 +26,6 @@ - - Header Files - Header Files diff --git a/src/core/stdfile/res/resource.rc b/src/core/stdfile/res/resource.rc index caa64ce5c7..a3fa9d6dc7 100644 --- a/src/core/stdfile/res/resource.rc +++ b/src/core/stdfile/res/resource.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script. // -#include "..\..\resource.h" +#include "..\..\mir_app\src\resource.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -268,7 +268,7 @@ END 1 TEXTINCLUDE BEGIN - "..\..\resource.h\0" + "..\..\mir_app\src\resource.h\0" END 2 TEXTINCLUDE diff --git a/src/core/stdfile/src/commonheaders.h b/src/core/stdfile/src/commonheaders.h index 9da5dfb390..b476a77cf1 100644 --- a/src/core/stdfile/src/commonheaders.h +++ b/src/core/stdfile/src/commonheaders.h @@ -76,8 +76,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "version.h" -#include "../../resource.h" -#include "../stdplug.h" +#include "../../mir_app/src/resource.h" extern HINSTANCE hInst; diff --git a/src/core/stdfile/stdfile_10.vcxproj b/src/core/stdfile/stdfile_10.vcxproj index 9a0a5214fb..a13322874b 100644 --- a/src/core/stdfile/stdfile_10.vcxproj +++ b/src/core/stdfile/stdfile_10.vcxproj @@ -91,7 +91,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;Shlwapi.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;Shlwapi.lib;%(AdditionalDependencies) true true true @@ -125,7 +125,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;Shlwapi.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;Shlwapi.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -156,7 +156,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;Shlwapi.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;Shlwapi.lib;%(AdditionalDependencies) true true true @@ -189,7 +189,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;Shlwapi.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;Shlwapi.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -212,7 +212,6 @@ - diff --git a/src/core/stdfile/stdfile_10.vcxproj.filters b/src/core/stdfile/stdfile_10.vcxproj.filters index b87e47dbdd..4b1bc4e70d 100644 --- a/src/core/stdfile/stdfile_10.vcxproj.filters +++ b/src/core/stdfile/stdfile_10.vcxproj.filters @@ -44,9 +44,6 @@ - - Header Files - Header Files diff --git a/src/core/stdfile/stdfile_12.vcxproj b/src/core/stdfile/stdfile_12.vcxproj index 9794c5d412..2622993274 100644 --- a/src/core/stdfile/stdfile_12.vcxproj +++ b/src/core/stdfile/stdfile_12.vcxproj @@ -95,7 +95,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;Shlwapi.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;Shlwapi.lib;%(AdditionalDependencies) true true true @@ -128,7 +128,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;Shlwapi.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;Shlwapi.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -160,7 +160,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;Shlwapi.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;Shlwapi.lib;%(AdditionalDependencies) true true true @@ -192,7 +192,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;Shlwapi.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;Shlwapi.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -215,7 +215,6 @@ - diff --git a/src/core/stdfile/stdfile_12.vcxproj.filters b/src/core/stdfile/stdfile_12.vcxproj.filters index b87e47dbdd..4b1bc4e70d 100644 --- a/src/core/stdfile/stdfile_12.vcxproj.filters +++ b/src/core/stdfile/stdfile_12.vcxproj.filters @@ -44,9 +44,6 @@ - - Header Files - Header Files diff --git a/src/core/stdhelp/res/resource.rc b/src/core/stdhelp/res/resource.rc index 98a5334dca..e3f8728481 100644 --- a/src/core/stdhelp/res/resource.rc +++ b/src/core/stdhelp/res/resource.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script. // -#include "..\..\resource.h" +#include "..\..\mir_app\src\resource.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -76,7 +76,7 @@ END 1 TEXTINCLUDE BEGIN - "..\..\resource.h\0" + "..\..\mir_app\src\resource.h\0" END 2 TEXTINCLUDE diff --git a/src/core/stdhelp/src/commonheaders.h b/src/core/stdhelp/src/commonheaders.h index 83c8ce38b1..e1763c4cc8 100644 --- a/src/core/stdhelp/src/commonheaders.h +++ b/src/core/stdhelp/src/commonheaders.h @@ -66,8 +66,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "version.h" -#include "../../resource.h" -#include "../stdplug.h" +#include "../../mir_app/src/resource.h" extern HINSTANCE hInst; diff --git a/src/core/stdhelp/stdhelp_10.vcxproj b/src/core/stdhelp/stdhelp_10.vcxproj index ac4df7abec..92a51e53f1 100644 --- a/src/core/stdhelp/stdhelp_10.vcxproj +++ b/src/core/stdhelp/stdhelp_10.vcxproj @@ -91,7 +91,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -125,7 +125,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -156,7 +156,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -189,7 +189,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -207,7 +207,6 @@ - diff --git a/src/core/stdhelp/stdhelp_10.vcxproj.filters b/src/core/stdhelp/stdhelp_10.vcxproj.filters index d783a2d94c..896fa3dd73 100644 --- a/src/core/stdhelp/stdhelp_10.vcxproj.filters +++ b/src/core/stdhelp/stdhelp_10.vcxproj.filters @@ -32,9 +32,6 @@ Header Files - - Header Files - Header Files diff --git a/src/core/stdhelp/stdhelp_12.vcxproj b/src/core/stdhelp/stdhelp_12.vcxproj index 67af883c0b..ae8167a6b1 100644 --- a/src/core/stdhelp/stdhelp_12.vcxproj +++ b/src/core/stdhelp/stdhelp_12.vcxproj @@ -95,7 +95,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -128,7 +128,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -160,7 +160,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -192,7 +192,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -210,7 +210,6 @@ - diff --git a/src/core/stdhelp/stdhelp_12.vcxproj.filters b/src/core/stdhelp/stdhelp_12.vcxproj.filters index d783a2d94c..896fa3dd73 100644 --- a/src/core/stdhelp/stdhelp_12.vcxproj.filters +++ b/src/core/stdhelp/stdhelp_12.vcxproj.filters @@ -32,9 +32,6 @@ Header Files - - Header Files - Header Files diff --git a/src/core/stdidle/res/resource.rc b/src/core/stdidle/res/resource.rc index bf68917cc7..a87378990a 100644 --- a/src/core/stdidle/res/resource.rc +++ b/src/core/stdidle/res/resource.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script. // -#include "..\..\resource.h" +#include "..\..\mir_app\src\resource.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -115,7 +115,7 @@ END 1 TEXTINCLUDE BEGIN - "..\..\resource.h\0" + "..\..\mir_app\src\resource.h\0" END 2 TEXTINCLUDE diff --git a/src/core/stdidle/src/commonheaders.h b/src/core/stdidle/src/commonheaders.h index e4f831a73d..4294473f85 100644 --- a/src/core/stdidle/src/commonheaders.h +++ b/src/core/stdidle/src/commonheaders.h @@ -68,7 +68,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "version.h" -#include "../../resource.h" -#include "../stdplug.h" +#include "../../mir_app/src/resource.h" extern HINSTANCE hInst; diff --git a/src/core/stdidle/stdidle_10.vcxproj b/src/core/stdidle/stdidle_10.vcxproj index b525a6ed4f..41bb96c640 100644 --- a/src/core/stdidle/stdidle_10.vcxproj +++ b/src/core/stdidle/stdidle_10.vcxproj @@ -91,7 +91,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;Wtsapi32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;Wtsapi32.lib;%(AdditionalDependencies) true true true @@ -125,7 +125,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;Wtsapi32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;Wtsapi32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -156,7 +156,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;Wtsapi32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;Wtsapi32.lib;%(AdditionalDependencies) true true true @@ -189,7 +189,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;Wtsapi32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;Wtsapi32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -206,7 +206,6 @@ - diff --git a/src/core/stdidle/stdidle_10.vcxproj.filters b/src/core/stdidle/stdidle_10.vcxproj.filters index 33719e104e..05a611456f 100644 --- a/src/core/stdidle/stdidle_10.vcxproj.filters +++ b/src/core/stdidle/stdidle_10.vcxproj.filters @@ -29,9 +29,6 @@ Header Files - - Header Files - Header Files diff --git a/src/core/stdidle/stdidle_12.vcxproj b/src/core/stdidle/stdidle_12.vcxproj index 798f60887c..e5ad5b4c8b 100644 --- a/src/core/stdidle/stdidle_12.vcxproj +++ b/src/core/stdidle/stdidle_12.vcxproj @@ -95,7 +95,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;Wtsapi32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;Wtsapi32.lib;%(AdditionalDependencies) true true true @@ -128,7 +128,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;Wtsapi32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;Wtsapi32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -160,7 +160,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;Wtsapi32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;Wtsapi32.lib;%(AdditionalDependencies) true true true @@ -192,7 +192,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;Wtsapi32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;Wtsapi32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -209,7 +209,6 @@ - diff --git a/src/core/stdidle/stdidle_12.vcxproj.filters b/src/core/stdidle/stdidle_12.vcxproj.filters index 33719e104e..05a611456f 100644 --- a/src/core/stdidle/stdidle_12.vcxproj.filters +++ b/src/core/stdidle/stdidle_12.vcxproj.filters @@ -29,9 +29,6 @@ Header Files - - Header Files - Header Files diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp index 5b04d948dc..1f86aba0ec 100644 --- a/src/core/stdmsg/src/msgdialog.cpp +++ b/src/core/stdmsg/src/msgdialog.cpp @@ -604,25 +604,6 @@ static void NotifyTyping(SrmmWindowData *dat, int mode) CallService(MS_PROTO_SELFISTYPING, (WPARAM)dat->hContact, dat->nTypeMode); } -void Button_SetIcon_IcoLib(HWND hwndDlg, int itemId, int iconId, const char* tooltip) -{ - HWND hWnd = GetDlgItem(hwndDlg, itemId); - SendMessage(hWnd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadSkinnedIcon(iconId)); - SendMessage(hWnd, BUTTONSETASFLATBTN, TRUE, 0); - SendMessage(hWnd, BUTTONADDTOOLTIP, (WPARAM)tooltip, 0); -} - -void Button_FreeIcon_IcoLib(HWND hwndDlg, int itemId) -{ - Skin_ReleaseIcon((HICON)SendDlgItemMessage(hwndDlg, itemId, BM_SETIMAGE, IMAGE_ICON, 0)); -} - -void Window_FreeIcon_IcoLib(HWND hwndDlg) -{ - Skin_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_SETICON, ICON_BIG, 0)); - Skin_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, 0)); -} - INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { SrmmWindowData *dat = (SrmmWindowData *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); diff --git a/src/core/stdplug.h b/src/core/stdplug.h deleted file mode 100644 index 9a6f751829..0000000000 --- a/src/core/stdplug.h +++ /dev/null @@ -1,25 +0,0 @@ - -#ifdef _STATIC - #define MIRANDA_EXE_FUNC(T) extern "C" T -#else - #define MIRANDA_EXE_FUNC(T) extern "C" T __declspec(dllimport) -#endif - -MIRANDA_EXE_FUNC(HICON) LoadSkinProtoIcon(const char *szProto, int status, bool big = false); -MIRANDA_EXE_FUNC(HICON) LoadSkinIcon(int idx, bool big = false); -MIRANDA_EXE_FUNC(HANDLE) GetSkinIconHandle(int idx); - -MIRANDA_EXE_FUNC(HANDLE) IcoLib_AddNewIcon(int hLangpack, SKINICONDESC* sid); -MIRANDA_EXE_FUNC(HICON) IcoLib_GetIcon(const char* pszIconName, bool big); -MIRANDA_EXE_FUNC(HICON) IcoLib_GetIconByHandle(HANDLE hItem, bool big); -MIRANDA_EXE_FUNC(HANDLE) IcoLib_IsManaged(HICON hIcon); -MIRANDA_EXE_FUNC(int) IcoLib_ReleaseIcon(HICON hIcon, char* szIconName, bool big=false); - -MIRANDA_EXE_FUNC(void) Button_SetIcon_IcoLib(HWND hDlg, int itemId, int iconId, const char* tooltip); -MIRANDA_EXE_FUNC(void) Button_FreeIcon_IcoLib(HWND hDlg, int itemId); - -MIRANDA_EXE_FUNC(void) Window_SetIcon_IcoLib(HWND hWnd, int iconId); -MIRANDA_EXE_FUNC(void) Window_SetProtoIcon_IcoLib(HWND hWnd, const char *szProto, int iconId); -MIRANDA_EXE_FUNC(void) Window_FreeIcon_IcoLib(HWND hWnd); - -MIRANDA_EXE_FUNC(int) GetPluginLangByInstance(HINSTANCE hInstance); diff --git a/src/core/stduihist/res/resource.rc b/src/core/stduihist/res/resource.rc index 1c0884e4a2..333634df8e 100644 --- a/src/core/stduihist/res/resource.rc +++ b/src/core/stduihist/res/resource.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script. // -#include "..\..\resource.h" +#include "..\..\mir_app\src\resource.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -88,7 +88,7 @@ END 1 TEXTINCLUDE BEGIN - "..\..\resource.h\0" + "..\..\mir_app\src\resource.h\0" END 2 TEXTINCLUDE diff --git a/src/core/stduihist/src/commonheaders.h b/src/core/stduihist/src/commonheaders.h index d6c986c227..93fb17ecb2 100644 --- a/src/core/stduihist/src/commonheaders.h +++ b/src/core/stduihist/src/commonheaders.h @@ -67,8 +67,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "version.h" -#include "../../resource.h" -#include "../stdplug.h" +#include "../../mir_app/src/resource.h" extern HINSTANCE hInst; diff --git a/src/core/stduihist/stduihist_10.vcxproj b/src/core/stduihist/stduihist_10.vcxproj index 0ff5edc20d..9df049cd1c 100644 --- a/src/core/stduihist/stduihist_10.vcxproj +++ b/src/core/stduihist/stduihist_10.vcxproj @@ -91,7 +91,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -125,7 +125,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -156,7 +156,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -189,7 +189,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -206,7 +206,6 @@ - diff --git a/src/core/stduihist/stduihist_10.vcxproj.filters b/src/core/stduihist/stduihist_10.vcxproj.filters index c2a89081c1..d26cc3ef70 100644 --- a/src/core/stduihist/stduihist_10.vcxproj.filters +++ b/src/core/stduihist/stduihist_10.vcxproj.filters @@ -29,9 +29,6 @@ Header Files - - Header Files - Header Files diff --git a/src/core/stduihist/stduihist_12.vcxproj b/src/core/stduihist/stduihist_12.vcxproj index cb0e16ee03..06b30d28ef 100644 --- a/src/core/stduihist/stduihist_12.vcxproj +++ b/src/core/stduihist/stduihist_12.vcxproj @@ -95,7 +95,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -128,7 +128,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -160,7 +160,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -192,7 +192,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -209,7 +209,6 @@ - diff --git a/src/core/stduihist/stduihist_12.vcxproj.filters b/src/core/stduihist/stduihist_12.vcxproj.filters index c2a89081c1..d26cc3ef70 100644 --- a/src/core/stduihist/stduihist_12.vcxproj.filters +++ b/src/core/stduihist/stduihist_12.vcxproj.filters @@ -29,9 +29,6 @@ Header Files - - Header Files - Header Files diff --git a/src/core/stdurl/commonheaders.h b/src/core/stdurl/commonheaders.h index 9cbb9b1c20..90c3c440d5 100644 --- a/src/core/stdurl/commonheaders.h +++ b/src/core/stdurl/commonheaders.h @@ -68,7 +68,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "version.h" -#include "../../resource.h" -#include "../stdplug.h" +#include "../../mir_app/src/resource.h" extern HINSTANCE hInst; diff --git a/src/core/stdurl/resource.rc b/src/core/stdurl/resource.rc index 5bb57eb276..8006315d61 100644 --- a/src/core/stdurl/resource.rc +++ b/src/core/stdurl/resource.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script. // -#include "..\..\resource.h" +#include "..\..\mir_app\src\resource.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -47,7 +47,7 @@ END 1 TEXTINCLUDE BEGIN - "..\..\resource.h\0" + "..\..\mir_app\src\resource.h\0" END 2 TEXTINCLUDE diff --git a/src/core/stdurl/stdurl_10.vcxproj b/src/core/stdurl/stdurl_10.vcxproj index 240ed7addb..adea018b75 100644 --- a/src/core/stdurl/stdurl_10.vcxproj +++ b/src/core/stdurl/stdurl_10.vcxproj @@ -91,7 +91,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -125,7 +125,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -156,7 +156,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -189,7 +189,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false diff --git a/src/core/stdurl/stdurl_12.vcxproj b/src/core/stdurl/stdurl_12.vcxproj index 972ca7532f..7943d30dd1 100644 --- a/src/core/stdurl/stdurl_12.vcxproj +++ b/src/core/stdurl/stdurl_12.vcxproj @@ -95,7 +95,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -128,7 +128,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -160,7 +160,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -192,7 +192,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -213,7 +213,6 @@ - diff --git a/src/core/stdurl/stdurl_12.vcxproj.filters b/src/core/stdurl/stdurl_12.vcxproj.filters index 046e56322f..2706f9b2f2 100644 --- a/src/core/stdurl/stdurl_12.vcxproj.filters +++ b/src/core/stdurl/stdurl_12.vcxproj.filters @@ -29,9 +29,6 @@ - - Header Files - Header Files diff --git a/src/core/stduserinfo/res/resource.rc b/src/core/stduserinfo/res/resource.rc index 63b5fd52eb..c91b0a1c03 100644 --- a/src/core/stduserinfo/res/resource.rc +++ b/src/core/stduserinfo/res/resource.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script. // -#include "..\..\resource.h" +#include "..\..\mir_app\src\resource.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -285,7 +285,7 @@ END 1 TEXTINCLUDE BEGIN - "..\..\resource.h\0" + "..\..\mir_app\src\resource.h\0" END 2 TEXTINCLUDE diff --git a/src/core/stduserinfo/src/commonheaders.h b/src/core/stduserinfo/src/commonheaders.h index d7e900ffae..ec79f2ea84 100644 --- a/src/core/stduserinfo/src/commonheaders.h +++ b/src/core/stduserinfo/src/commonheaders.h @@ -68,7 +68,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "version.h" -#include "../../resource.h" -#include "../stdplug.h" +#include "../../mir_app/src/resource.h" extern HINSTANCE hInst; diff --git a/src/core/stduserinfo/stduserinfo_10.vcxproj b/src/core/stduserinfo/stduserinfo_10.vcxproj index d04fcf9a96..50062a45d6 100644 --- a/src/core/stduserinfo/stduserinfo_10.vcxproj +++ b/src/core/stduserinfo/stduserinfo_10.vcxproj @@ -91,7 +91,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;UxTheme.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;UxTheme.lib;%(AdditionalDependencies) true true true @@ -125,7 +125,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;UxTheme.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;UxTheme.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -156,7 +156,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;UxTheme.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;UxTheme.lib;%(AdditionalDependencies) true true true @@ -189,7 +189,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;UxTheme.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;UxTheme.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -208,7 +208,6 @@ - diff --git a/src/core/stduserinfo/stduserinfo_10.vcxproj.filters b/src/core/stduserinfo/stduserinfo_10.vcxproj.filters index dd6ca7bfcf..17fb965c79 100644 --- a/src/core/stduserinfo/stduserinfo_10.vcxproj.filters +++ b/src/core/stduserinfo/stduserinfo_10.vcxproj.filters @@ -32,9 +32,6 @@ - - Header Files - Header Files diff --git a/src/core/stduserinfo/stduserinfo_12.vcxproj b/src/core/stduserinfo/stduserinfo_12.vcxproj index d6df81b469..2119bb3812 100644 --- a/src/core/stduserinfo/stduserinfo_12.vcxproj +++ b/src/core/stduserinfo/stduserinfo_12.vcxproj @@ -95,7 +95,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;UxTheme.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;UxTheme.lib;%(AdditionalDependencies) true true true @@ -128,7 +128,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;UxTheme.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;UxTheme.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -160,7 +160,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;UxTheme.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;UxTheme.lib;%(AdditionalDependencies) true true true @@ -192,7 +192,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;UxTheme.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;UxTheme.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -211,7 +211,6 @@ - diff --git a/src/core/stduserinfo/stduserinfo_12.vcxproj.filters b/src/core/stduserinfo/stduserinfo_12.vcxproj.filters index dd6ca7bfcf..17fb965c79 100644 --- a/src/core/stduserinfo/stduserinfo_12.vcxproj.filters +++ b/src/core/stduserinfo/stduserinfo_12.vcxproj.filters @@ -32,9 +32,6 @@ - - Header Files - Header Files diff --git a/src/core/stduseronline/res/resource.rc b/src/core/stduseronline/res/resource.rc index 5bb57eb276..8213a2958c 100644 --- a/src/core/stduseronline/res/resource.rc +++ b/src/core/stduseronline/res/resource.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script. // -#include "..\..\resource.h" +#include "..\..\mir_app\src\resource.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/core/stduseronline/src/commonheaders.h b/src/core/stduseronline/src/commonheaders.h index 366035a334..774e7c6dcc 100644 --- a/src/core/stduseronline/src/commonheaders.h +++ b/src/core/stduseronline/src/commonheaders.h @@ -66,7 +66,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "version.h" -#include "../../resource.h" -#include "../stdplug.h" +#include "../../mir_app/src/resource.h" extern HINSTANCE hInst; diff --git a/src/core/stduseronline/stduseronline_10.vcxproj b/src/core/stduseronline/stduseronline_10.vcxproj index 97b35f4967..5b4bb67288 100644 --- a/src/core/stduseronline/stduseronline_10.vcxproj +++ b/src/core/stduseronline/stduseronline_10.vcxproj @@ -91,7 +91,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -125,7 +125,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -156,7 +156,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -189,7 +189,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -206,7 +206,6 @@ - diff --git a/src/core/stduseronline/stduseronline_10.vcxproj.filters b/src/core/stduseronline/stduseronline_10.vcxproj.filters index f47f70fc21..91dcd67d73 100644 --- a/src/core/stduseronline/stduseronline_10.vcxproj.filters +++ b/src/core/stduseronline/stduseronline_10.vcxproj.filters @@ -29,9 +29,6 @@ Header Files - - Header Files - Header Files diff --git a/src/core/stduseronline/stduseronline_12.vcxproj b/src/core/stduseronline/stduseronline_12.vcxproj index f6bbbae09c..f7e58ca675 100644 --- a/src/core/stduseronline/stduseronline_12.vcxproj +++ b/src/core/stduseronline/stduseronline_12.vcxproj @@ -95,7 +95,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -128,7 +128,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -160,7 +160,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true true true @@ -192,7 +192,7 @@ ..\..\..\include\msapi;..\..\..\include - miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies) + ws2_32.lib;comctl32.lib;%(AdditionalDependencies) true 0x3ae00000 false @@ -209,7 +209,6 @@ - diff --git a/src/core/stduseronline/stduseronline_12.vcxproj.filters b/src/core/stduseronline/stduseronline_12.vcxproj.filters index f47f70fc21..91dcd67d73 100644 --- a/src/core/stduseronline/stduseronline_12.vcxproj.filters +++ b/src/core/stduseronline/stduseronline_12.vcxproj.filters @@ -29,9 +29,6 @@ Header Files - - Header Files - Header Files -- cgit v1.2.3