kill msi.rc

6 files changed, 0 insertions, 367 deletions

diff --git a/configure.ac b/configure.ac
index 5188dc7..c2ecd8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,10 +8,7 @@ AM_INIT_AUTOMAKE([foreign])
 AC_PROG_CC
 AC_PROG_YACC
 
-AC_ARG_VAR([RCFLAGS], [Flags for the Windows resource compiler])
-
 LT_INIT([win32-dll disable-fast-install])
-LT_LANG([Windows Resource])
 
 AC_CONFIG_FILES([Makefile libmsi/Makefile])
 AC_OUTPUT
diff --git a/libmsi/Makefile.am b/libmsi/Makefile.am
index d188657..9ff3857 100644
--- a/libmsi/Makefile.am
+++ b/libmsi/Makefile.am
@@ -19,9 +19,6 @@ libmsi_la_SOURCES = alter.c create.c database.c delete.c distinct.c \
 	sql-parser.y \
 	msiserver_i.c
 
-libmsi_la_DEPENDENCIES = \
-	msi.res
-
 libmsi_la_LDFLAGS = -no-undefined
 libmsi_la_LIBADD = \
 	$(libmsi_la_DEPENDENCIES) \
@@ -42,6 +39,3 @@ libmsi_la_LIBADD = \
 	-lwintrust \
 	-lcrypt32 \
 	-limagehlp
-
-%.res: %.rc
-	$(RC) $(RCFLAGS) -o $@ $<
diff --git a/libmsi/msi.c b/libmsi/msi.c
index 248aa5f..74975b8 100644
--- a/libmsi/msi.c
+++ b/libmsi/msi.c
@@ -387,93 +387,6 @@ INSTALLUI_HANDLERW WINAPI MsiSetExternalUIW(INSTALLUI_HANDLERW puiHandler,
     return prev;
 }
 
-/******************************************************************
- *  MsiLoadStringW            [MSI.@]
- *
- * Loads a string from MSI's string resources.
- *
- * PARAMS
- *
- *   handle        [I]  only -1 is handled currently
- *   id            [I]  id of the string to be loaded
- *   lpBuffer      [O]  buffer for the string to be written to
- *   nBufferMax    [I]  maximum size of the buffer in characters
- *   lang          [I]  the preferred language for the string
- *
- * RETURNS
- *
- *   If successful, this function returns the language id of the string loaded
- *   If the function fails, the function returns zero.
- *
- * NOTES
- *
- *   The type of the first parameter is unknown.  LoadString's prototype
- *  suggests that it might be a module handle.  I have made it an MSI handle
- *  for starters, as -1 is an invalid MSI handle, but not an invalid module
- *  handle.  Maybe strings can be stored in an MSI database somehow.
- */
-LANGID WINAPI MsiLoadStringW( MSIHANDLE handle, UINT id, LPWSTR lpBuffer,
-                int nBufferMax, LANGID lang )
-{
-    HRSRC hres;
-    HGLOBAL hResData;
-    LPWSTR p;
-    DWORD i, len;
-
-    TRACE("%d %u %p %d %d\n", handle, id, lpBuffer, nBufferMax, lang);
-
-    if( handle != -1 )
-        FIXME("don't know how to deal with handle = %08x\n", handle);
-
-    if( !lang )
-        lang = GetUserDefaultLangID();
-
-    hres = FindResourceExW( msi_hInstance, (LPCWSTR) RT_STRING,
-                            (LPWSTR)1, lang );
-    if( !hres )
-        return 0;
-    hResData = LoadResource( msi_hInstance, hres );
-    if( !hResData )
-        return 0;
-    p = LockResource( hResData );
-    if( !p )
-        return 0;
-
-    for (i = 0; i < (id & 0xf); i++) p += *p + 1;
-    len = *p;
-
-    if( nBufferMax <= len )
-        return 0;
-
-    memcpy( lpBuffer, p+1, len * sizeof(WCHAR));
-    lpBuffer[ len ] = 0;
-
-    TRACE("found -> %s\n", debugstr_w(lpBuffer));
-    return lang;
-}
-
-LANGID WINAPI MsiLoadStringA( MSIHANDLE handle, UINT id, LPSTR lpBuffer,
-                int nBufferMax, LANGID lang )
-{
-    LPWSTR bufW;
-    LANGID r;
-    INT len;
-
-    bufW = msi_alloc(nBufferMax*sizeof(WCHAR));
-    r = MsiLoadStringW(handle, id, bufW, nBufferMax, lang);
-    if( r )
-    {
-        len = WideCharToMultiByte(CP_ACP, 0, bufW, -1, NULL, 0, NULL, NULL );
-        if( len <= nBufferMax )
-            WideCharToMultiByte( CP_ACP, 0, bufW, -1,
-                                 lpBuffer, nBufferMax, NULL, NULL );
-        else
-            r = 0;
-    }
-    msi_free(bufW);
-    return r;
-}
-
 UINT WINAPI MsiMessageBoxA(HWND hWnd, LPCSTR lpText, LPCSTR lpCaption, UINT uType,
                 WORD wLanguageId, DWORD f)
 {
diff --git a/libmsi/msi.rc b/libmsi/msi.rc
deleted file mode 100644
index bc08cdb..0000000
--- a/libmsi/msi.rc
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Resources for MSI
- *
- * Copyright 2005 Mike McCormack
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include "windef.h"
-
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
-
-STRINGTABLE
-{
-	4 "The specified installation package could not be opened. Please check the file path and try again."
-	5 "path %s not found"
-	9 "insert disk %s"
-	10 "Windows Installer %s\n\n" \
-	"Usage:\n" \
-	"msiexec command {required parameter} [optional parameter]\n\n" \
-	"Install a product:\n" \
-	"\t/i {package|product_code} [property]\n" \
-	"\t/package {package|product_code} [property]\n" \
-	"\t/a package [property]\n" \
-	"Repair an installation:\n" \
-	"\t/f[p|o|e|d|c|a|u|m|s|v] {package|product_code}\n" \
-	"Uninstall a product:\n" \
-	"\t/uninstall {package|product_code} [property]\n" \
-	"\t/x {package|product_code} [property]\n" \
-	"Advertise a product:\n" \
-	"\t/j[u|m] package [/t transform] [/g languageid]\n" \
-	"Apply a patch:\n" \
-	"\t/p patch_package [property]\n" \
-	"\t/p patch_package /a package [property]\n" \
-	"Log and user interface modifiers for the above commands:\n" \
-	"\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] log_file\n" \
-	"\t/q{|n|b|r|f|n+|b+|b-}\n" \
-	"Register the MSI Service:\n" \
-	"\t/y\n" \
-	"Unregister the MSI Service:\n" \
-	"\t/z\n" \
-	"Display this help:\n" \
-	"\t/help\n" \
-	"\t/?\n"
-	11 "enter which folder contains %s"
-	12 "install source for feature missing"
-	13 "network drive for feature missing"
-	14 "feature from:"
-	15 "choose which folder contains %s"
-}
-
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
-#define WINE_FILEDESCRIPTION_STR "Wine MSI dll"
-#define WINE_FILENAME_STR "msi.dll"
-#define WINE_FILEVERSION 4,5,6001,22299
-#define WINE_FILEVERSION_STR "4.5.6001.22299"
-#define WINE_PRODUCTVERSION 4,5,6001,22299
-#define WINE_PRODUCTVERSION_STR "4.5.6001.22299"
-
-#include "wine/wine_common_ver.rc"
diff --git a/libmsi/msi_main.c b/libmsi/msi_main.c
index bc0bea4..17c3238 100644
--- a/libmsi/msi_main.c
+++ b/libmsi/msi_main.c
@@ -36,8 +36,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 
-static LONG dll_count;
-
 /* the UI level */
 INSTALLUILEVEL           gUILevel         = INSTALLUILEVEL_BASIC;
 HWND                     gUIhwnd          = 0;
@@ -48,79 +46,3 @@ DWORD                    gUIFilter        = 0;
 LPVOID                   gUIContext       = NULL;
 WCHAR                   *gszLogFile       = NULL;
 HINSTANCE msi_hInstance;
-
-
-/*
- * Dll lifetime tracking declaration
- */
-static void LockModule(void)
-{
-    InterlockedIncrement(&dll_count);
-}
-
-static void UnlockModule(void)
-{
-    InterlockedDecrement(&dll_count);
-}
-
-/******************************************************************
- *      DllMain
- */
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
-{
-    switch (fdwReason)
-    {
-    case DLL_PROCESS_ATTACH:
-        msi_hInstance = hinstDLL;
-        DisableThreadLibraryCalls(hinstDLL);
-        IsWow64Process( GetCurrentProcess(), &is_wow64 );
-        break;
-    case DLL_PROCESS_DETACH:
-        msi_free_handle_table();
-        msi_free( gszLogFile );
-        break;
-    }
-    return TRUE;
-}
-
-/******************************************************************
- * DllGetVersion              [MSI.@]
- */
-HRESULT WINAPI DllGetVersion(DLLVERSIONINFO *pdvi)
-{
-    TRACE("%p\n",pdvi);
-
-    if (pdvi->cbSize < sizeof(DLLVERSIONINFO))
-        return E_INVALIDARG;
-
-    pdvi->dwMajorVersion = MSI_MAJORVERSION;
-    pdvi->dwMinorVersion = MSI_MINORVERSION;
-    pdvi->dwBuildNumber = MSI_BUILDNUMBER;
-    pdvi->dwPlatformID = DLLVER_PLATFORM_WINDOWS;
-
-    return S_OK;
-}
-
-/******************************************************************
- * DllCanUnloadNow            [MSI.@]
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-    return dll_count == 0 ? S_OK : S_FALSE;
-}
-
-/***********************************************************************
- *  DllRegisterServer (MSI.@)
- */
-HRESULT WINAPI DllRegisterServer(void)
-{
-    return __wine_register_resources( msi_hInstance );
-}
-
-/***********************************************************************
- *  DllUnregisterServer (MSI.@)
- */
-HRESULT WINAPI DllUnregisterServer(void)
-{
-    return __wine_unregister_resources( msi_hInstance );
-}
diff --git a/libmsi/wine/wine_common_ver.rc b/libmsi/wine/wine_common_ver.rc
deleted file mode 100644
index 0e755e6..0000000
--- a/libmsi/wine/wine_common_ver.rc
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright 2001 Dmitry Timoshkov
- * Copyright 2004 Ivan Leo Puoti
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include "winresrc.h"
-
-/*
-Assign WINE_FILEVERSION and WINE_FILEVERSION_STR high enough number
-to make sure that programs, relying on the version numbers, will
-never complain.
-*/
-
-#ifndef WINE_FILEVERSION_MAJOR
-#define WINE_FILEVERSION_MAJOR 10
-#endif
-
-#ifndef WINE_FILEVERSION_MINOR
-#define WINE_FILEVERSION_MINOR 0
-#endif
-
-#ifndef WINE_FILEVERSION_BUILD
-#define WINE_FILEVERSION_BUILD 0
-#endif
-
-#ifndef WINE_FILEVERSION_PLATFORMID
-#define WINE_FILEVERSION_PLATFORMID 0
-#endif
-
-#ifndef WINE_FILEVERSION
-#define WINE_FILEVERSION WINE_FILEVERSION_MAJOR,WINE_FILEVERSION_MINOR,\
-                         WINE_FILEVERSION_BUILD,WINE_FILEVERSION_PLATFORMID
-#endif
-
-#define WINE_VER_STRINGIZE2(x) #x
-#define WINE_VER_STRINGIZE(x) WINE_VER_STRINGIZE2(x)
-
-#ifndef WINE_FILEVERSION_STR
-#define WINE_FILEVERSION_STR WINE_VER_STRINGIZE(WINE_FILEVERSION_MAJOR.WINE_FILEVERSION_MINOR.WINE_FILEVERSION_BUILD.WINE_FILEVERSION_PLATFORMID)
-#endif
-
-#ifndef WINE_FILEDESCRIPTION_STR
-#define WINE_FILEDESCRIPTION_STR "Wine core dll"
-#endif
-
-#ifndef WINE_FILENAME
-#define WINE_FILENAME ""
-#endif
-
-#ifndef WINE_FILENAME_STR
-#define WINE_FILENAME_STR ""
-#endif
-
-#ifndef WINE_FILETYPE
-#define WINE_FILETYPE VFT_DLL
-#endif
-
-#ifndef WINE_FILESUBTYPE
-#define WINE_FILESUBTYPE VFT2_UNKNOWN
-#endif
-
-#ifndef WINE_PRODUCTVERSION
-#define WINE_PRODUCTVERSION 1,0,0,0
-#endif
-
-#ifndef WINE_PRODUCTVERSION_STR
-#define WINE_PRODUCTVERSION_STR "1.0"
-#endif
-
-#ifndef WINE_PRODUCTNAME_STR
-#define WINE_PRODUCTNAME_STR "Wine"
-#endif
-
-#ifndef WINE_EXTRAVALUES
-#define WINE_EXTRAVALUES
-#endif
-
-VS_VERSION_INFO VERSIONINFO
-FILEVERSION    WINE_FILEVERSION
-PRODUCTVERSION WINE_PRODUCTVERSION
-FILEFLAGSMASK  63
-FILEFLAGS      0
-FILEOS         VOS_UNKNOWN
-FILETYPE       WINE_FILETYPE
-FILESUBTYPE    WINE_FILESUBTYPE
-{
-    BLOCK "StringFileInfo"
-    {
-	BLOCK "040904E4" /* LANG_ENGLISH/SUBLANG_DEFAULT, CP 1252 */
-	{
-	    VALUE "CompanyName", "Microsoft Corporation"  /* GameGuard depends on this */
-	    VALUE "FileDescription", WINE_FILEDESCRIPTION_STR
-	    VALUE "FileVersion", WINE_FILEVERSION_STR
-	    VALUE "InternalName", WINE_FILENAME
-	    VALUE "LegalCopyright", "Copyright (c) 1993-2012 the Wine project authors (see the file AUTHORS for a complete list)"
-	    VALUE "OriginalFilename", WINE_FILENAME_STR
-	    VALUE "ProductName", WINE_PRODUCTNAME_STR
-	    VALUE "ProductVersion", WINE_PRODUCTVERSION_STR
-	    WINE_EXTRAVALUES
-	}
-    }
-    BLOCK "VarFileInfo"
-    {
-	VALUE "Translation", 0x0409, 0x04E4 /* LANG_ENGLISH/SUBLANG_DEFAULT, CP 1252 */
-    }
-}