diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 09:40:34 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 09:40:34 +0000 |
| commit | 911abbf41c1fb09bb007aa07a8cb0aefc28f1a4a (patch) | |
| tree | d0aa1761c0d2a5126f02f60ff52a18a2096112f2 /setup_native/source | |
| parent | c847430b218bdb50cd478b5837e8090fa58f8ce7 (diff) | |
INTEGRATION: CWS nativefixer3 (1.2.12); FILE MERGED
2005/01/14 14:26:12 hro 1.2.12.1: #i40595# New custom action to customize start menu folder icon
Diffstat (limited to 'setup_native/source')
3 files changed, 13 insertions, 5 deletions
diff --git a/setup_native/source/win32/customactions/shellextensions/exports.dxp b/setup_native/source/win32/customactions/shellextensions/exports.dxp index c1343f8e7e76..7a041d65e951 100644 --- a/setup_native/source/win32/customactions/shellextensions/exports.dxp +++ b/setup_native/source/win32/customactions/shellextensions/exports.dxp @@ -1,3 +1,5 @@ InstallExecSequenceEntry DeinstallExecSequenceEntry +InstallStartmenuFolderIcon +DeinstallStartmenuFolderIcon
\ No newline at end of file diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk index bde742bdfa80..bdf303ce5b4f 100644 --- a/setup_native/source/win32/customactions/shellextensions/makefile.mk +++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: pjunck $ $Date: 2004-11-03 08:04:15 $ +# last change: $Author: rt $ $Date: 2005-01-31 10:40:21 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -81,7 +81,9 @@ CFLAGS+=-D_STLP_USE_STATIC_LIB UWINAPILIB= -SLOFILES = $(SLO)$/shellextensions.obj +SLOFILES = \ + $(SLO)$/shellextensions.obj \ + $(SLO)$/startmenuicon.obj SHL1STDLIBS= kernel32.lib\ user32.lib\ diff --git a/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx b/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx index 4395a23e2252..0d2ef6e4fc68 100644 --- a/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx +++ b/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx @@ -2,9 +2,9 @@ * * $RCSfile: shellextensions.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: pjunck $ $Date: 2004-11-03 08:04:29 $ + * last change: $Author: rt $ $Date: 2005-01-31 10:40:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -109,6 +109,10 @@ #include <windows.h> #include <msiquery.h> #include <malloc.h> + +#ifdef UNICODE +#define _UNICODE +#endif #include <tchar.h> struct RegistryEntry |