From 488d2c56722391bf7e6ea0dd5fcfbfb2f1b29f93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Tue, 19 Mar 2013 11:11:14 -0400 Subject: [PATCH] wfreerdp: fix icon --- .gitignore | 1 + client/Windows/CMakeLists.txt | 4 +++- client/Windows/FreeRDP.ico | Bin 0 -> 30160 bytes client/Windows/cli/CMakeLists.txt | 3 ++- client/Windows/cli/wfreerdp.c | 2 ++ client/Windows/resource.h | 2 ++ client/Windows/wf_interface.c | 27 ++++++++++++--------------- client/Windows/wfreerdp.aps | Bin 0 -> 39084 bytes client/Windows/wfreerdp.rc | Bin 0 -> 180 bytes 9 files changed, 22 insertions(+), 17 deletions(-) create mode 100644 client/Windows/FreeRDP.ico create mode 100644 client/Windows/resource.h create mode 100644 client/Windows/wfreerdp.aps create mode 100644 client/Windows/wfreerdp.rc diff --git a/.gitignore b/.gitignore index 2b72aa942..e82f26244 100644 --- a/.gitignore +++ b/.gitignore @@ -53,6 +53,7 @@ DerivedData/ *.suo *.ncb *.opensdf +Thumbs.db ipch Debug RelWithDebInfo diff --git a/client/Windows/CMakeLists.txt b/client/Windows/CMakeLists.txt index 43098594a..c006d1b00 100644 --- a/client/Windows/CMakeLists.txt +++ b/client/Windows/CMakeLists.txt @@ -32,7 +32,9 @@ set(${MODULE_PREFIX}_SRCS wf_rail.c wf_rail.h wf_interface.c - wf_interface.h) + wf_interface.h + wfreerdp.rc + resource.h) if(WITH_CLIENT_INTERFACE) add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) diff --git a/client/Windows/FreeRDP.ico b/client/Windows/FreeRDP.ico new file mode 100644 index 0000000000000000000000000000000000000000..0864d1cdaa2396eb23c5667eead61b3d548999dc GIT binary patch literal 30160 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 M<8nS#V_JvwKd)_Y9smFU literal 0 HcmV?d00001 diff --git a/client/Windows/cli/CMakeLists.txt b/client/Windows/cli/CMakeLists.txt index 56e492853..7a0437279 100644 --- a/client/Windows/cli/CMakeLists.txt +++ b/client/Windows/cli/CMakeLists.txt @@ -22,7 +22,8 @@ include_directories(..) set(${MODULE_PREFIX}_SRCS wfreerdp.c - wfreerdp.h) + wfreerdp.h + ../wfreerdp.rc) add_executable(${MODULE_NAME} WIN32 ${${MODULE_PREFIX}_SRCS}) diff --git a/client/Windows/cli/wfreerdp.c b/client/Windows/cli/wfreerdp.c index a625a860b..19a2b2412 100644 --- a/client/Windows/cli/wfreerdp.c +++ b/client/Windows/cli/wfreerdp.c @@ -38,6 +38,8 @@ #include #include +#include "resource.h" + #include "wf_interface.h" INT WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) diff --git a/client/Windows/resource.h b/client/Windows/resource.h new file mode 100644 index 000000000..5ee440fa5 --- /dev/null +++ b/client/Windows/resource.h @@ -0,0 +1,2 @@ + +#define IDI_ICON1 101 diff --git a/client/Windows/wf_interface.c b/client/Windows/wf_interface.c index 5a9695d4b..71b2fdb94 100644 --- a/client/Windows/wf_interface.c +++ b/client/Windows/wf_interface.c @@ -55,6 +55,8 @@ #include "wf_interface.h" +#include "resource.h" + void wf_context_new(freerdp* instance, rdpContext* context) { wfInfo* wfi; @@ -187,6 +189,7 @@ void wf_hw_desktop_resize(rdpContext* context) if (same) wfi->drawing = wfi->primary; } + if (wfi->fullscreen != TRUE) { if (wfi->hwnd) @@ -517,7 +520,7 @@ BOOL wf_check_fds(freerdp* instance) return TRUE; } -int wfreerdp_run(freerdp* instance) +DWORD WINAPI wf_thread(LPVOID lpParam) { MSG msg; int index; @@ -529,8 +532,11 @@ int wfreerdp_run(freerdp* instance) void* wfds[32]; int fds_count; HANDLE fds[64]; + freerdp* instance; rdpChannels* channels; + instance = (freerdp*) lpParam; + ZeroMemory(rfds, sizeof(rfds)); ZeroMemory(wfds, sizeof(wfds)); @@ -634,18 +640,6 @@ int wfreerdp_run(freerdp* instance) return 0; } -DWORD WINAPI wf_thread(LPVOID lpParam) -{ - wfInfo* wfi; - freerdp* instance; - - instance = (freerdp*) lpParam; - - wfreerdp_run(instance); - - return (DWORD) NULL; -} - DWORD WINAPI wf_keyboard_thread(LPVOID lpParam) { MSG msg; @@ -721,6 +715,9 @@ wfInfo* wf_new(HINSTANCE hInstance, int argc, char** argv) wfInfo* wfi; freerdp* instance; + if (!hInstance) + hInstance = GetModuleHandle(NULL); + instance = freerdp_new(); instance->PreConnect = wf_pre_connect; instance->PostConnect = wf_post_connect; @@ -741,7 +738,7 @@ wfInfo* wf_new(HINSTANCE hInstance, int argc, char** argv) wfi->hInstance = hInstance; wfi->cursor = LoadCursor(NULL, IDC_ARROW); - wfi->icon = LoadIcon(NULL, IDI_APPLICATION); + wfi->icon = LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_ICON1)); wfi->wndClassName = _tcsdup(_T("FreeRDP")); wfi->wndClass.cbSize = sizeof(WNDCLASSEX); @@ -749,12 +746,12 @@ wfInfo* wf_new(HINSTANCE hInstance, int argc, char** argv) wfi->wndClass.lpfnWndProc = wf_event_proc; wfi->wndClass.cbClsExtra = 0; wfi->wndClass.cbWndExtra = 0; - wfi->wndClass.hIcon = LoadIcon(NULL, IDI_APPLICATION); wfi->wndClass.hCursor = wfi->cursor; wfi->wndClass.hbrBackground = (HBRUSH) GetStockObject(BLACK_BRUSH); wfi->wndClass.lpszMenuName = NULL; wfi->wndClass.lpszClassName = wfi->wndClassName; wfi->wndClass.hInstance = hInstance; + wfi->wndClass.hIcon = wfi->icon; wfi->wndClass.hIconSm = wfi->icon; RegisterClassEx(&(wfi->wndClass)); diff --git a/client/Windows/wfreerdp.aps b/client/Windows/wfreerdp.aps new file mode 100644 index 0000000000000000000000000000000000000000..1edfc0fc3c65158758d11b32c57410cd3301075d GIT binary patch literal 39084 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 literal 0 HcmV?d00001