[ros-diffs] 01/02: [LICCPA] Make the License Manager GUI build and make it visible (again)

[Eric Kohl]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2fdb4d99c79a86343dddd…

commit 2fdb4d99c79a86343ddddd13a7f0a8b6a03588c8
Author:     Eric Kohl <eric.kohl(a)reactos.org>
AuthorDate: Sun Jul 1 11:02:10 2018 +0200
Commit:     Eric Kohl <eric.kohl(a)reactos.org>
CommitDate: Sun Jul 1 17:28:28 2018 +0200

    [LICCPA] Make the License Manager GUI build and make it visible (again)
    
    - Add the missing CMakeLists.txt file.
    - Comment-out an unused variable.
    - Make WM_INITDIALOG return TRUE, so that the dialog gets visible.
---
 dll/cpl/liccpa/CMakeLists.txt | 19 +++++++++++++++++++
 dll/cpl/liccpa/liccpa.c       |  9 ++-------
 dll/cpl/liccpa/liccpa.h       | 23 ++++++++++++++++++++++-
 3 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/dll/cpl/liccpa/CMakeLists.txt b/dll/cpl/liccpa/CMakeLists.txt
new file mode 100644
index 0000000000..c5871dbef3
--- /dev/null
+++ b/dll/cpl/liccpa/CMakeLists.txt
@@ -0,0 +1,19 @@
+
+spec2def(liccpa.cpl liccpa.spec)
+
+list(APPEND SOURCE
+    liccpa.c
+    liccpa.h)
+
+file(GLOB liccpa_rc_deps resources/*.*)
+add_rc_deps(liccpa.rc ${liccpa_rc_deps})
+
+add_library(liccpa SHARED
+    ${SOURCE}
+    liccpa.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/liccpa.def)
+
+set_module_type(liccpa cpl UNICODE)
+add_importlibs(liccpa advapi32 user32 gdi32 msvcrt kernel32 ntdll)
+add_pch(liccpa liccpa.h SOURCE)
+add_cd_file(TARGET liccpa DESTINATION reactos/system32 FOR all)
diff --git a/dll/cpl/liccpa/liccpa.c b/dll/cpl/liccpa/liccpa.c
index 860954bcf2..50b4fbb426 100644
--- a/dll/cpl/liccpa/liccpa.c
+++ b/dll/cpl/liccpa/liccpa.c
@@ -10,11 +10,6 @@
  * This application does almost nothing and its really good at it.
  */
 
-#include <windows.h>
-#include <commctrl.h>
-#include <cpl.h>
-
-#include "resource.h"
 #include "liccpa.h"
 
 HINSTANCE hApplet = 0;
@@ -26,12 +21,12 @@ DlgMainProc(HWND hwndDlg,
             WPARAM wParam,
             LPARAM lParam)
 {
-    TCHAR szString[256];
+//    TCHAR szString[256];
 
     switch (uMsg)
     {
         case WM_INITDIALOG:
-            break;
+            return TRUE;
 
         case WM_COMMAND:
             switch (HIWORD(wParam))
diff --git a/dll/cpl/liccpa/liccpa.h b/dll/cpl/liccpa/liccpa.h
index 694663d208..45c010b5db 100644
--- a/dll/cpl/liccpa/liccpa.h
+++ b/dll/cpl/liccpa/liccpa.h
@@ -1,4 +1,23 @@
-#pragma once
+#ifndef _LICCPA_H
+#define _LICCPA_H
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
+#include <wingdi.h>
+#include <wincon.h>
+#include <devguid.h>
+#include <shlobj.h>
+#include <cpl.h>
+#include <regstr.h>
+
+#include "resource.h"
 
 typedef struct
 {
@@ -10,4 +29,6 @@ typedef struct
 
 extern HINSTANCE hApplet;
 
+#endif /* _LICCPA_H */
+
 /* EOF */