strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS warnings01 (1.2.6); FILE MERGED

Browse source 
2006/05/26 13:53:29 sb 1.2.6.1: #i53898# Made code warning-free and/or compile at all after resync to SRC680m170.
This commit is contained in:
Jens-Heiner Rechtien 2006-06-20 02:41:05 +00:00
parent d23fb21f2f
commit 5ed6699794
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
setup_native/source/win32/customactions/regpatchactivex/makefile.mk
View file

@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.2 $
# $Revision: 1.3 $
#
# last change: $Author: kz $ $Date: 2006-04-26 14:16:36 $
# last change: $Author: hr $ $Date: 2006-06-20 03:40:53 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -34,7 +34,7 @@
#*************************************************************************
PRJ=..$/..$/..$/..
PRJNAME=setup2
PRJNAME=setup_native
TARGET=regpatchactivex
USE_DEFFILE=TRUE

8
setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: regpatchactivex.cxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: kz $ $Date: 2006-04-26 14:16:45 $
* last change: $Author: hr $ $Date: 2006-06-20 03:41:05 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -35,8 +35,11 @@
#define UNICODE
#pragma warning(push,1) // disable warnings within system headers
#include <windows.h>
#include <msiquery.h>
#pragma warning(pop)
#include <string.h>
#include <malloc.h>
#include <stdio.h>
@ -105,7 +108,6 @@ extern "C" UINT __stdcall PatchActiveXControl( MSIHANDLE hMSI )
{
HKEY hkey = NULL;
char* aSubKey = "Software\\Classes\\MIME\\DataBase\\Content Type\\application/vnd.sun.xml.base";
DWORD nSubKeys = 0, nValues = 0;
if ( ERROR_SUCCESS == RegCreateKeyA(bInstallForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, &hkey) )
{
RegDeleteValueA( hkey, "CLSID" );