Fixed a number of incompatibilities in OEM icons/cursors handling.
diff --git a/programs/clock/main.h b/programs/clock/main.h
index 0cb56fa..00c4abc 100644
--- a/programs/clock/main.h
+++ b/programs/clock/main.h
@@ -9,7 +9,7 @@
#define MAX_LANGUAGE_NUMBER (CL_LAST_LANGUAGE - CL_FIRST_LANGUAGE)
#define HELPFILE "clock.hlp"
-#define DEFAULTICON OIC_WINEICON
+#define DEFAULTICON OIC_WINLOGO
/* hide the following from winerc */
#ifndef RC_INVOKED
diff --git a/programs/notepad/lcc.h b/programs/notepad/lcc.h
index 686c374..fd2c8ff 100644
--- a/programs/notepad/lcc.h
+++ b/programs/notepad/lcc.h
@@ -16,7 +16,7 @@
#define INVALID_HANDLE_VALUE INVALID_HANDLE_VALUE
#define WINE_RELEASE_INFO "Compiled using LCC"
- #define OIC_WINEICON 0
+ #define OIC_WINLOGO 0
#ifndef LCC_HASASSERT
/* prevent multiple inclusion of assert methods */
diff --git a/programs/notepad/main.h b/programs/notepad/main.h
index 2c65cd8d..304491c 100644
--- a/programs/notepad/main.h
+++ b/programs/notepad/main.h
@@ -11,7 +11,7 @@
#define HELPFILE "notepad.hlp"
#define LOGPREFIX ".LOG"
-#define DEFAULTICON OIC_WINEICON
+#define DEFAULTICON OIC_WINLOGO
/* hide the following from winerc */
#ifndef RC_INVOKED
diff --git a/programs/progman/group.c b/programs/progman/group.c
index d8cf17d..0a623a7 100644
--- a/programs/progman/group.c
+++ b/programs/progman/group.c
@@ -51,7 +51,7 @@
class.cbClsExtra = 0;
class.cbWndExtra = sizeof(LONG);
class.hInstance = Globals.hInstance;
- class.hIcon = LoadIcon (0, MAKEINTRESOURCE(OIC_WINEICON));
+ class.hIcon = LoadIcon (0, IDI_WINLOGO);
class.hCursor = LoadCursor (0, IDC_ARROW);
class.hbrBackground = GetStockObject (WHITE_BRUSH);
class.lpszMenuName = 0;
diff --git a/programs/progman/progman.h b/programs/progman/progman.h
index a367518..ce5f19b 100644
--- a/programs/progman/progman.h
+++ b/programs/progman/progman.h
@@ -16,11 +16,7 @@
#include "windows.h"
/* Fallback icon */
-#ifdef WINELIB
-#define DEFAULTICON OIC_WINEICON
-#else
-#define DEFAULTICON OIC_LANDSCAPE
-#endif
+#define DEFAULTICON OIC_WINLOGO
/* Icon index in M$ Window's progman.exe */
#define PROGMAN_ICON_INDEX 0
diff --git a/programs/progman/program.c b/programs/progman/program.c
index 15346be..3937237 100644
--- a/programs/progman/program.c
+++ b/programs/progman/program.c
@@ -95,7 +95,7 @@
&nCmdShow, MAX_PATHNAME_LEN))
return;
- if (!hIcon) hIcon = LoadIcon(0, MAKEINTRESOURCE(OIC_WINEICON));
+ if (!hIcon) hIcon = LoadIcon(0, IDI_WINLOGO);
if (!PROGRAM_AddProgram(hGroup, hIcon, szName, 0, 0, szCmdLine, szIconFile,
