Removed mapi dependency from xpfe/bootstarp

Checking in for kkhandrika@netscape.com


git-svn-id: svn://10.0.0.236/branches/MAPI_TRUNK_LANDING@107016 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/build/mac/build_scripts/BuildMozilla.pl

@@ -1,80 +0,0 @@
-#!perl
-
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#   Simon Fraser <sfraser@netscape.com>
-#
-
-require 5.004;
-
-use strict;
-
-use Cwd;
-use Moz::BuildUtils;
-use Moz::BuildCore;
-
-#-------------------------------------------------------------
-# Where have the build options gone?
-# 
-# The various build flags have been centralized into one place. 
-# The master list of options is in MozBuildFlags.txt. However, 
-# you should never need to edit that file, or this one.
-# 
-# To customize what gets built, or where to start the build, 
-# edit the $prefs_file_name file in
-# System Folder:Preferences:Mozilla build prefs:
-# Documentation is provided in that file.
-#-------------------------------------------------------------
-
-my($prefs_file_name) = "Mozilla opt build prefs";
-my($config_header_file_name) = ":mozilla:config:mac:DefinesOptions.h";
-
-#-------------------------------------------------------------
-# hashes to hold build options
-#-------------------------------------------------------------
-my(%build);
-my(%options);
-my(%filepaths);
-my(%optiondefines);
-
-# Hash of input files for this build. Eventually, there will be
-# input files for manifests, and projects too.
-my(%inputfiles) = (
-  "buildflags",     "MozillaBuildFlags.txt",
-  "checkoutdata",   "MozillaCheckoutList.txt",
-  "buildprogress",  "¥ Mozilla opt progress",
-  "buildmodule",    "MozillaBuildList.pm",
-  "checkouttime",   "Mozilla last checkout"
-);
-#-------------------------------------------------------------
-# end build hashes
-#-------------------------------------------------------------
-
-# set the build root directory, which is the the dir above mozilla
-SetupBuildRootDir(":mozilla:build:mac:build_scripts");
-
-# Set up all the flags on $main::, like DEBUG, CARBON etc.
-# Override the defaults using the preferences files.
-SetupDefaultBuildOptions(0, ":mozilla:dist:viewer:", $config_header_file_name);
-
-my($do_checkout)    = 0;
-my($do_build)       = 1;
-
-RunBuild($do_checkout, $do_build, \%inputfiles, $prefs_file_name);

mozilla/build/mac/build_scripts/BuildMozillaDebug.pl

@@ -1,80 +0,0 @@
-#!perl
-
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#   Simon Fraser <sfraser@netscape.com>
-#
-
-require 5.004;
-
-use strict;
-
-use Cwd;
-use Moz::BuildUtils;
-use Moz::BuildCore;
-
-#-------------------------------------------------------------
-# Where have the build options gone?
-# 
-# The various build flags have been centralized into one place. 
-# The master list of options is in MozBuildFlags.txt. However, 
-# you should never need to edit that file, or this one.
-# 
-# To customize what gets built, or where to start the build, 
-# edit the $prefs_file_name file in
-# System Folder:Preferences:Mozilla build prefs:
-# Documentation is provided in that file.
-#-------------------------------------------------------------
-
-my($prefs_file_name) = "Mozilla debug build prefs";
-my($config_header_file_name) = ":mozilla:config:mac:DefinesOptionsDebug.h";
-
-#-------------------------------------------------------------
-# hashes to hold build options
-#-------------------------------------------------------------
-my(%build);
-my(%options);
-my(%filepaths);
-my(%optiondefines);
-
-# Hash of input files for this build. Eventually, there will be
-# input files for manifests, and projects too.
-my(%inputfiles) = (
-  "buildflags",     "MozillaBuildFlags.txt",
-  "checkoutdata",   "MozillaCheckoutList.txt",
-  "buildprogress",  "¥ Mozilla debug progress",
-  "buildmodule",    "MozillaBuildList.pm",
-  "checkouttime",   "Mozilla last checkout"
-);
-#-------------------------------------------------------------
-# end build hashes
-#-------------------------------------------------------------
-
-# set the build root directory, which is the the dir above mozilla
-SetupBuildRootDir(":mozilla:build:mac:build_scripts");
-
-# Set up all the flags on $main::, like DEBUG, CARBON etc.
-# Override the defaults using the preferences files.
-SetupDefaultBuildOptions(1, ":mozilla:dist:viewer_debug:", $config_header_file_name);
-
-my($do_pull)        = 0;    # overridden by flags and prefs
-my($do_build)       = 1;
-
-RunBuild($do_pull, $do_build, \%inputfiles, $prefs_file_name);

mozilla/build/mac/build_scripts/Moz/BuildCore.pm

@@ -1,595 +0,0 @@
-#!perl -w
-package Moz::BuildCore;
-
-require 5.004;
-require Exporter;
-
-use strict;
-use vars qw( @ISA @EXPORT );
-
-# perl includes
-use Cwd;
-use POSIX;
-use Time::Local;
-use File::Basename;
-use LWP::Simple;
-
-# homegrown
-use Moz::Moz;
-use Moz::Jar;
-use Moz::BuildFlags;
-use Moz::BuildUtils;
-use Moz::CodeWarriorLib;
-
-# use MozillaBuildList;   # eventually, this should go away, and be replaced by data input
-
-
-@ISA        = qw(Exporter);
-@EXPORT     = qw(
-                    RunBuild
-                );
-
-
-#//--------------------------------------------------------------------------------------------------
-#// DoPrebuildCheck
-#//
-#// Check the build tools etc before running the build.
-#//--------------------------------------------------------------------------------------------------
-sub DoPrebuildCheck()
-{
-    SanityCheckBuildOptions();
-
-    # launch codewarrior and persist its location. Have to call this before first
-    # call to getCodeWarriorPath().
-    my($ide_path_file) = $main::filepaths{"idepath"};
-    $ide_path_file = full_path_to($ide_path_file);
-    LaunchCodeWarrior($ide_path_file);
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// SanityCheckBuildOptions
-#//--------------------------------------------------------------------------------------------------
-sub SanityCheckBuildOptions()
-{
-    my($bad_options) = 0;
-
-    # Jar options
-    if (!$main::options{chrome_jars} && !$main::options{chrome_files})
-    {
-        print "Warning: Both \$options{chrome_jars} and \$options{chrome_files} are off. You won't get any chrome.\n";
-        $bad_options = 1;
-    }
-
-    if (!$main::options{chrome_jars} && $main::options{use_jars})
-    {
-        print "Warning: \$options{chrome_jars} is off but \$options{use_jars} is on. Your build won't run (expects jars, got files).\n";
-        $bad_options = 1;
-    }
-
-    if (!$main::options{chrome_files} && !$main::options{use_jars})
-    {
-        print "Warning: \$options{chrome_jars} is off but \$options{chrome_files} is on. Your build won't run (expects files, got jars).\n";
-        $bad_options = 1;
-    }
-
-    if ($main::options{ldap_experimental} && !$main::options{ldap})
-    {
-        print "Warning: \$options{ldap_experimental} is on but \$options{ldap} is off. LDAP experimental features will not be built.\n";
-        $bad_options = 1;
-    }
-
-    if ($main::options{wsp} && !$main::options{xmlextras})
-    {
-        print "Warning: \$options{wsp} is on but \$options{xmlextras} is off. wsp will not be built.\n";
-        $bad_options = 1;
-    }
-
-    if ($bad_options) {
-        print "Build will start in 5 seconds. Press command-. to stop\n";
-        
-        DelayFor(5);
-    }
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// GenBuildSystemInfo
-#//--------------------------------------------------------------------------------------------------
-
-sub GenBuildSystemInfo()
-{
-    # always rebuild the configuration program.
-    BuildProjectClean(":mozilla:build:mac:tools:BuildSystemInfo:BuildSystemInfo.mcp", "BuildSystemInfo");
-
-    # delete the configuration file.
-    unlink(":mozilla:build:mac:BuildSystemInfo.pm");
-    
-    # run the program.
-    system(":mozilla:build:mac:BuildSystemInfo");
-
-    # wait for the file to be created.
-    while (!(-e ":mozilla:build:mac:BuildSystemInfo.pm")) { WaitNextEvent(); }
-    
-    # wait for BuildSystemInfo to finish, so that we see correct results.
-    while (IsProcessRunning("BuildSystemInfo")) { WaitNextEvent(); }
-
-    # now, evaluate the contents of the file.
-    open(F, ":mozilla:build:mac:BuildSystemInfo.pm");
-    while (<F>) { eval; }
-    close(F);
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// Make library aliases
-#//--------------------------------------------------------------------------------------------------
-
-sub MakeLibAliases()
-{
-    my($dist_dir) = GetBinDirectory();
-
-    #// ProfilerLib
-    if ($main::PROFILE)
-    {
-        my($profilerlibpath) = Moz::CodeWarriorLib::getCodeWarriorPath("MacOS Support:Profiler:Profiler Common:ProfilerLib");
-        MakeAlias("$profilerlibpath", "$dist_dir"."Essential Files:");
-    }
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// ConfigureBuildSystem
-#//
-#// defines some build-system configuration variables.
-#//--------------------------------------------------------------------------------------------------
-sub ConfigureBuildSystem()
-{
-    #// In the future, we may want to do configurations based on the actual build system itself.
-    #// GenBuildSystemInfo();
-        
-    #// For now, if we discover a newer header file than existed in Universal Interfaces 3.2,
-    #// we'll assume that 3.3 or later is in use.
-    my($universal_interfaces) = Moz::CodeWarriorLib::getCodeWarriorPath("MacOS Support:Universal:Interfaces:CIncludes:");
-    if (-e ($universal_interfaces . "ControlDefinitions.h")) {
-        $main::UNIVERSAL_INTERFACES_VERSION = 0x0330;
-    }
-
-    #// Rename IC SDK folder in the Mac OS Support folder
-    my($ic_sdk_folder) = Moz::CodeWarriorLib::getCodeWarriorPath("MacOS Support:ICProgKit2.0.2");
-    if( -e $ic_sdk_folder)
-    {
-        my($new_ic_folder_name) = Moz::CodeWarriorLib::getCodeWarriorPath("MacOS Support:(ICProgKit2.0.2)");
-        rename ($ic_sdk_folder, $new_ic_folder_name);
-        # note that CodeWarrior doesn't descend into folders with () the name
-        print "Mozilla no longer needs the Internet Config SDK to build:\n  Renaming the 'ICProgKit2.0.2' folder to '(ICProgKit2.0.2)'\n";
-    }
-
-    printf("UNIVERSAL_INTERFACES_VERSION = 0x%04X\n", $main::UNIVERSAL_INTERFACES_VERSION);
-
-    # alias required CodeWarrior libs into the Essential Files folder (only the Profiler lib now)
-    MakeLibAliases();
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// CheckOutModule. Takes variable number of args; first two are required
-#//--------------------------------------------------------------------------------------------------
-sub CheckOutModule($$$$)
-{
-    my($session, $module, $revision, $date) = @_;
-
-    my($result) = $session->checkout($module, $revision, $date);
-    
-    # result of 1 is success
-    if ($result) { return; }
-    
-    my($checkout_err) = $session->getLastError();
-    if ($checkout_err == 708) {
-        die "Error: Checkout was cancelled.\n";
-    } elsif ($checkout_err == 911) {
-        die "Error: CVS session settings are incorrect. Check your password, and the CVS root settings.\n";
-    } elsif ($checkout_err == 703) {
-        die "Error: CVS checkout failed. Unknown module, unknown tag, bad username, or other CVS error.\n";
-    } elsif ($checkout_err == 711) {
-        print "Checkout of '$module' failed.\n";
-    }
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// getScriptFolder
-#//--------------------------------------------------------------------------------------------------
-sub getScriptFolder()
-{
-    return dirname($0);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// getScriptFolder
-#//--------------------------------------------------------------------------------------------------
-sub get_url_contents($)
-{
-    my($url) = @_;
-
-    my($url_contents) = LWP::Simple::get($url);
-    $url_contents =~ s/\r\n/\n/g;     # normalize linebreaks
-    $url_contents =~ s/\r/\n/g;       # normalize linebreaks
-    return $url_contents;
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// get_files_from_content
-#//--------------------------------------------------------------------------------------------------
-sub uniq
-{
-    my $lastval;
-    grep(($_ ne $lastval, $lastval = $_)[$[], @_);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// get_files_from_content
-#//--------------------------------------------------------------------------------------------------
-sub get_files_from_content($)
-{
-    my($content) = @_;
-  
-    my(@jscalls) = grep (/return js_file_menu[^{]*/, split(/\n/, $content));
-    my $i;
-  
-    for ($i = 0; $i < @jscalls ; $i++)
-    {
-        $jscalls[$i] =~ s/.*\(|\).*//g;
-        my(@callparams) = split(/,/, $jscalls[$i]);
-        my ($repos, $dir, $file, $rev) = grep(s/['\s]//g, @callparams);
-        $jscalls[$i] = "$dir/$file";
-    }
-
-  &uniq(sort(@jscalls));
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// getLastUpdateTime
-#// 
-#// Get the last time we updated. Return 0 on failure
-#//--------------------------------------------------------------------------------------------------
-sub getLastUpdateTime($)
-{
-    my($timestamp_file) = @_;
- 
-    my($time_string);
-    
-    local(*TIMESTAMP_FILE);  
-    unless (open(TIMESTAMP_FILE, "< $timestamp_file")) { return 0; }
-
-    while (<TIMESTAMP_FILE>)
-    {
-        my($line) = $_;
-        chomp($line);
-
-        # ignore comments and empty lines
-        if ($line =~ /^\#/ || $line =~ /^\s*$/) {
-            next;
-        }
-        
-        $time_string = $line;
-    }
-
-    # get the epoch seconds
-    my($last_update_secs) = $time_string;
-    $last_update_secs =~ s/\s#.+$//;
-    
-    print "FAST_UPDATE found that you last updated at ".localtime($last_update_secs)."\n";
-    
-    # how long ago was this, in hours?
-    my($gm_now) = time();
-    my($update_hours) = 1 + ceil(($gm_now - $last_update_secs) / (60 * 60));
-    
-    return $update_hours;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// saveCheckoutTimestamp
-#// 
-#// Create a file on disk containing the current time. Param is time(), which is an Epoch seconds
-#// (and therefore in GMT).
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub saveCheckoutTimestamp($$)
-{
-    my($gm_secs, $timestamp_file) = @_;
-        
-    local(*TIMESTAMP_FILE);
-    open(TIMESTAMP_FILE, ">$timestamp_file") || die "Failed to open $timestamp_file\n";
-    print(TIMESTAMP_FILE "# time of last checkout or update, in GMT. Used by FAST_UPDATE\n");
-    print(TIMESTAMP_FILE "$gm_secs \# around ".localtime()." local time\n");
-    close(TIMESTAMP_FILE);
-
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// FastUpdate
-#// 
-#// Use Bonsai url data to update only those dirs which have new files
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub FastUpdate($$)
-{
-    my($modules, $timestamp_file) = @_;          # list of modules to check out
-
-    my($num_hours) = getLastUpdateTime($timestamp_file);
-    if ($num_hours == 0 || $num_hours > 170) {
-        print "Can't fast_update; last update was too long ago, or never. Doing normal checkout.\n";
-        return 0;
-    }
-
-    print "Doing fast update, pulling files changed in the last $num_hours hours\n";
-
-    my($cvsfile) = AskAndPersistFile($main::filepaths{"sessionpath"});
-    my($session) = Moz::MacCVS->new( $cvsfile );
-    unless (defined($session)) { die "Error: Checkout aborted. Cannot create session file: $session" }
-
-    # activate MacCVS
-    ActivateApplication('Mcvs');
-    
-    my($checkout_start_time) = time();
-
-    #print "Time now is $checkout_start_time ($checkout_start_time + 0)\n";
-    
-    my($this_co);
-    foreach $this_co (@$modules)
-    {
-        my($module, $revision, $date) = ($this_co->[0], $this_co->[1], $this_co->[2]);        
-        
-        # assume that things pulled by date wont change
-        if ($date ne "") {
-            print "$module is pulled by date, so ignoring in FastUpdate.\n";
-            next;
-        }
-
-        my($search_type) = "hours";
-        my($min_date) = "";
-        my($max_date) = "";
-        my($url) = "http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=${module}&branch=${revision}&branchtype=match&dir=&file=&filetype=match&who=&whotype=match&sortby=Date&hours=${num_hours}&date=${search_type}&mindate=${min_date}&maxdate=${max_date}&cvsroot=%2Fcvsroot";
-
-        if ($revision eq "") {
-            print "Getting list of checkins to $module from Bonsai...\n";
-        } else {
-            print "Getting list of checkins to $module on branch $revision from Bonsai...\n";
-        }
-        my(@files) = &get_files_from_content(&get_url_contents($url));
-
-        if ($#files > 0)
-        {
-           my(@cvs_co_list);
-        
-           my($co_file);
-           foreach $co_file (@files)
-           {
-               print "Updating $co_file\n";
-               push(@cvs_co_list, $co_file);
-           }
-
-            my($result) = $session->update($revision, \@cvs_co_list);
-            # result of 1 is success
-            if (!$result) { die "Error: Fast update failed\n"; }
-        } else {
-            print "No files in this module changed\n";        
-        }
-    }
-    
-    saveCheckoutTimestamp($checkout_start_time, $timestamp_file);
-    return 1;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// Checkout
-#//--------------------------------------------------------------------------------------------------
-sub CheckoutModules($$$)
-{
-    my($modules, $pull_date, $timestamp_file) = @_;          # list of modules to check out
-
-    my($start_time) = TimeStart();
-
-#    assertRightDirectory();
-    my($cvsfile) = AskAndPersistFile($main::filepaths{"sessionpath"});
-    my($session) = Moz::MacCVS->new( $cvsfile );
-    unless (defined($session)) { die "Error: Checkout aborted. Cannot create session file: $session" }
-
-    my($checkout_start_time) = time();
-    
-    # activate MacCVS
-    ActivateApplication('Mcvs');
-
-    my($this_co);
-    foreach $this_co (@$modules)
-    {
-        my($module, $revision, $date) = ($this_co->[0], $this_co->[1], $this_co->[2]);
-        if ($date eq "") {
-            $date = $pull_date;
-        }
-        CheckOutModule($session, $module, $revision, $date);
-        # print "Checking out $module with ref $revision, date $date\n";
-    }
-
-    saveCheckoutTimestamp($checkout_start_time, $timestamp_file);
-    TimeEnd($start_time, "Checkout");
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// ReadCheckoutModulesFile
-#//--------------------------------------------------------------------------------------------------
-sub ReadCheckoutModulesFile($$)
-{
-    my($modules_file, $co_list) = @_;
-
-    my($checkout_file) = getScriptFolder().":".$modules_file;
-    local(*CHECKOUT_FILE);  
-    open(CHECKOUT_FILE, "< $checkout_file") || die "Error: failed to open checkout list $checkout_file\n";
-    while (<CHECKOUT_FILE>)
-    {
-        my($line) = $_;
-        chomp($line);
-    
-        # ignore comments and empty lines
-        if ($line =~ /^\#/ || $line =~ /^\s*$/) {
-            next;
-        }
-    
-        my(@cvs_co) = ["", "", ""];
-        
-        my($module, $revision, $date) = (0, 1, 2);
-        
-        if ($line =~ /\s*([^#,\s]+)\s*\,\s*([^#,\s]+)\s*\,\s*([^#]+)/)
-        {
-            @cvs_co[$module] = $1;
-            @cvs_co[$revision] = $2;
-            @cvs_co[$date] = $3;
-        }
-        elsif ($line =~ /\s*([^#,\s]+)\s*\,\s*([^#,\s]+)\s*(#.+)?/)
-        {
-            @cvs_co[$module] = $1;
-            @cvs_co[$revision] = $2;
-        }
-        elsif ($line =~ /\s*([^#,\s]+)\s*\,\s*,\s*([^#,]+)/)       
-        {
-            @cvs_co[$module] = $1;
-            @cvs_co[$date] = $2;
-        }
-        elsif ($line =~ /\s*([^#,\s]+)/)
-        {
-            @cvs_co[$module] = $1;
-        }
-        else
-        {
-            die "Error: unrecognized line '$line' in $modules_file\n";
-        }
-        
-        # strip surrounding space from date
-        @cvs_co[$date] =~ s/^\s*|\s*$//g;
-        
-        # print "Going to check out '@cvs_co[$module]', '@cvs_co[$revision]', '@cvs_co[$date]'\n";
-        push(@$co_list, \@cvs_co);
-    }
-
-    close(CHECKOUT_FILE);
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// PullFromCVS
-#//--------------------------------------------------------------------------------------------------
-sub PullFromCVS($$)
-{
-    unless ( $main::build{pull} ) { return; }
-    
-    my($modules_file, $timestamp_file) = @_;
-
-    StartBuildModule("pull");
-    
-    my(@cvs_co_list);
-    ReadCheckoutModulesFile($modules_file, \@cvs_co_list);
-
-    if ($main::FAST_UPDATE && $main::options{pull_by_date})
-    {
-        die "Error: you can't use FAST_UPDATE if you are pulling by date.\n";
-    }
-
-    my($did_fast_update) = $main::FAST_UPDATE && FastUpdate(\@cvs_co_list, $timestamp_file);
-    if (!$did_fast_update)
-    {
-        my($pull_date) = "";
-        if ($main::options{pull_by_date})
-        {
-            # acceptable CVS date formats are (in local time):
-            # ISO8601 (e.g. "1972-09-24 20:05") and Internet (e.g. "24 Sep 1972 20:05").
-            # Perl's localtime() string format also seems to work.
-            $pull_date = localtime().""; # force string interp.
-            print "Pulling by date $pull_date\n";
-        }
-
-        CheckoutModules(\@cvs_co_list, $pull_date, $timestamp_file);
-    }
-
-    EndBuildModule("pull");
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// RunBuild
-#//--------------------------------------------------------------------------------------------------
-sub RunBuild($$$$)
-{
-    my($do_pull, $do_build, $input_files, $build_prefs) = @_;
-
-    InitBuildProgress($input_files->{"buildprogress"});
-    
-    # if we are pulling, we probably want to do a full build, so clear the build progress
-    if ($do_pull) {
-        ClearBuildProgress();    
-    }
-    
-    # read local prefs, and the build progress file, and set flags to say what to build
-    SetupBuildParams(\%main::build,
-                     \%main::options,
-                     \%main::optiondefines,
-                     \%main::filepaths,
-                     $input_files->{"buildflags"},
-                     $build_prefs);
-    
-    # If we were told to pull, make sure we do, overriding prefs etc.
-    if ($do_pull)
-    {
-        $main::build{"pull"} = 1;
-    }
-    
-    # transfer this flag
-    $CodeWarriorLib::CLOSE_PROJECTS_FIRST = $main::CLOSE_PROJECTS_FIRST;
-    
-    # setup the build log
-    SetupBuildLog($main::filepaths{"buildlogfilepath"}, $main::USE_TIMESTAMPED_LOGS);
-    StopForErrors();
-    
-    if ($main::LOG_TO_FILE) {
-        RedirectOutputToFile($main::filepaths{"scriptlogfilepath"});
-    }
-        
-    # run a pre-build check to see that the tools etc are in order
-    DoPrebuildCheck();
-    
-    # do the pull
-    PullFromCVS($input_files->{"checkoutdata"}, $input_files->{"checkouttime"});
-    
-    unless ($do_build) { return; }
-
-    my($build_start) = TimeStart();
-
-    # check the build environment
-    ConfigureBuildSystem();
-
-    # here we load and call methods in the build module indirectly.
-    # we have to use indirection because the build module can be named
-    # differently for different builds.
-    chdir(dirname($0));     # change to the script dir
-    my($build_module) = $input_files->{"buildmodule"};
-    # load the build module
-    require $build_module;
-    {   # scope for no strict 'refs'
-        no strict 'refs';
-        
-        my($package_name) = $build_module;
-        $package_name =~ s/\.pm$//;
-        
-        chdir($main::MOZ_SRC);
-        &{$package_name."::BuildDist"}();
-        
-        chdir($main::MOZ_SRC);
-        &{$package_name."::BuildProjects"}();
-    }
-    
-    # the build finished, so clear the build progress state
-    ClearBuildProgress();
-    
-    TimeEnd($build_start, "Build");
-    print "Build complete\n";
-}
-
-1;

mozilla/build/mac/build_scripts/Moz/BuildFlags.pm

@@ -1,425 +0,0 @@
-#!perl -w
-package Moz::BuildFlags;
-
-require 5.004;
-require Exporter;
-
-# Package that attempts to read a file from the Preferences folder,
-# and get build settings out of it
-
-use strict;
-use Exporter;
-
-use Cwd;
-use File::Basename;
-
-use Moz::Moz;
-use Moz::Prefs;
-
-use vars qw(@ISA @EXPORT);
-
-@ISA      = qw(Exporter);
-@EXPORT   = qw(
-                SetupBuildParams
-                InitBuildProgress
-                WriteBuildProgress
-                ClearBuildProgress
-                ReadBuildProgress
-              );
-
-
-my(@build_flags);
-my(@options_flags);
-my(@filepath_flags);
-
-my(%arrays_list) = (
-  "build_flags",    \@build_flags,
-  "options_flags",  \@options_flags,
-  "filepath_flags", \@filepath_flags
-);
-
-my($progress_file) = "¥ÊBuild progress";
-
-#-------------------------------------------------------------------------------
-# appendArrayFlag
-# 
-# Set a flag in the array
-#-------------------------------------------------------------------------------
-sub appendArrayFlag(@)
-{
-  my($array_name) = shift;
-  my($setting) = shift;
-  my($value) = shift;
-  
-  my(@optional_values);
-  foreach (@_) {
-    push(@optional_values, $_);
-  }
-
-  my(@this_flag) = [$setting, $value, @optional_values];
-  my($flags_array) = $arrays_list{$array_name};
-  if ($flags_array)
-  {
-    push(@{$flags_array}, @this_flag) || die "Failed to append\n";
-  }
-  else
-  {
-    die "Error: unknown build flags array $array_name\n";
-  }
-}
-
-#-------------------------------------------------------------------------------
-# readFlagsFile
-# 
-# Read the file of build flags from disk. File path is relative to the
-# script directory.
-#-------------------------------------------------------------------------------
-sub readFlagsFile($)
-{
-  my($flags_file) = @_;
-
-  my($file_path) = $0;
-  $file_path =~ s/[^:]+$/$flags_file/;
-  
-  print "Reading build flags from '$file_path'\n";
-
-  local(*FLAGS_FILE);
-  open(FLAGS_FILE, "< $file_path") || die "Error: failed to open flags file $file_path\n";
-
-  my($cur_array) = "";
-  
-  while(<FLAGS_FILE>)
-  {
-      my($line) = $_;
-      chomp($line);
-      
-      # ignore comments and empty lines  
-      if ($line =~ /^\#/ || $line =~ /^\s*$/) {
-        next;
-      }
-
-      # 1-word line, probably array name
-      if ($line =~ /^([^#\s]+)\s*$/)
-      {
-        $cur_array = $1;
-        next;  
-      }
-      elsif ($line =~ /^([^#\s]+)\s+\"(.+)\"(\s+#.+)?$/)    # quoted option, possible comment
-      {
-        my($flag) = $1;
-        my($setting) = $2;
-        
-        appendArrayFlag($cur_array, $flag, $setting);
-      }
-      elsif ($line =~ /^([^#\s]+)((\s+[^#\s]+)+)(\s+#.+)?$/)  # multiple word line, possible comment
-      {
-        my($flag) = $1;
-        
-        appendArrayFlag($cur_array, $flag, split(' ', $2));
-      }
-      else
-      {
-        die "Error: unknown build flag at '$line'\n";
-      }
-  
-  }
-  
-  close(FLAGS_FILE);
-}
-
-
-
-#-------------------------------------------------------------------------------
-# flagsArrayToHash
-# 
-# Utility routine to migrate flag from a 2D array to a hash, where
-# item[n][0] is the hash entry name, and item[n][1] is the hash entry value.
-#-------------------------------------------------------------------------------
-
-sub flagsArrayToHash($$)
-{
-  my($src_array, $dest_hash) = @_;
-  
-  my($item);
-  foreach $item (@$src_array)
-  {
-    $dest_hash->{$item->[0]} = $item->[1];
-  }
-}
-
-#-----------------------------------------------
-# printHash
-#
-# Utility routine to print a hash
-#-----------------------------------------------
-sub printHash($)
-{
-  my($hash_ref) = @_;
- 
-  print "Printing hash:\n";
-  
-  my($key, $value);
-  
-  while (($key, $value) = each (%$hash_ref))
-  {
-    print "  $key $value\n";
-  }
-}
-
-
-#-----------------------------------------------
-# printBuildArray
-#
-# Utility routine to print a 2D array
-#-----------------------------------------------
-sub printBuildArray($)
-{
-  my($build_array) = @_;
-  
-  my($entry);
-  foreach $entry (@$build_array)
-  {  
-    print "$entry->[0] = $entry->[1]\n";
-  }
-
-}
-
-#-------------------------------------------------------------------------------
-# SetBuildFlags
-#-------------------------------------------------------------------------------
-sub SetBuildFlags($)
-{
-  my($build) = @_;
-
-  flagsArrayToHash(\@build_flags, $build);
-}
-
-#-------------------------------------------------------------------------------
-# SetBuildOptions
-#-------------------------------------------------------------------------------
-sub SetBuildOptions($)
-{
-  my($options) = @_;
-
-  flagsArrayToHash(\@options_flags, $options);
-}
-
-#-------------------------------------------------------------------------------
-# SetFilepathFlags
-#-------------------------------------------------------------------------------
-sub SetFilepathFlags($)
-{
-  my($filepath) = @_;
-
-  flagsArrayToHash(\@filepath_flags, $filepath);
-}
-
-#-------------------------------------------------------------------------------
-# SetOptionDefines
-#-------------------------------------------------------------------------------
-sub SetOptionDefines($)
-{
-  my($optiondefines) = @_;
-
-  foreach my $entry (@options_flags)
-  {
-    if (defined($entry->[2])) {
-      $optiondefines->{$entry->[0]}{$entry->[2]} = 1;
-    }
-  }
-}
-
-
-#-------------------------------------------------------------------------------
-# PropagateAllFlags
-#-------------------------------------------------------------------------------
-sub PropagateAllFlags($)
-{
-  my($build_array) = @_;
-  
-  # if "all" is set, set all the flags to 1
-  unless ($build_array->[0][0] eq "all") { die "Error: 'all' must come first in the flags array\n"; }
-  
-  if ($build_array->[0][1] == 1)
-  {
-    my($index);
-    foreach $index (@$build_array)
-    {
-      $index->[1] = 1;
-    }
-  }
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// _getBuildProgressFile
-#//--------------------------------------------------------------------------------------------------
-sub _getBuildProgressFile()
-{
-  return $progress_file;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// setBuildProgressStart
-#// 
-#// This automagically sets $build{"all"} to 0
-#//--------------------------------------------------------------------------------------------------
-sub setBuildProgressStart($$)
-{
-  my($build_array, $name) = @_;
-
-  my($index);
-  foreach $index (@$build_array)
-  {
-    $index->[1] = 0;
-    if ($index->[0] eq $name) {
-      last;
-    }    
-  }
-
-  print "Building from module after $name, as specified by build progress\n";
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// InitBuildProgress
-#//--------------------------------------------------------------------------------------------------
-sub InitBuildProgress($)
-{
-  my($prog_file) = @_;
-  if ($prog_file ne "") {
-    $progress_file = full_path_to($prog_file);
-    print "Writing build progress to $progress_file\n";
-  }
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// WriteBuildProgress
-#//--------------------------------------------------------------------------------------------------
-sub WriteBuildProgress($)
-{
-  my($module_built) = @_;
-
-  my($progress_file) = _getBuildProgressFile();
-  
-  if ($progress_file ne "")
-  {
-    open(PROGRESS_FILE, ">>$progress_file") || die "Failed to open $progress_file\n";
-    print(PROGRESS_FILE "$module_built\n");
-    close(PROGRESS_FILE);
-  }
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// ClearBuildProgress
-#//--------------------------------------------------------------------------------------------------
-sub ClearBuildProgress()
-{
-  my($progress_file) = _getBuildProgressFile();
-  if ($progress_file ne "") {
-    unlink $progress_file;
-  }
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// WipeBuildProgress
-#//--------------------------------------------------------------------------------------------------
-sub WipeBuildProgress()
-{
-  print "Ignoring build progress\n";
-  ClearBuildProgress();
-  $progress_file = "";
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// ReadBuildProgress
-#//--------------------------------------------------------------------------------------------------
-sub ReadBuildProgress($)
-{
-  my($build_array) = @_;
-  my($progress_file) = _getBuildProgressFile();
-
-  my($last_module);
-  
-  if (open(PROGRESS_FILE, "< $progress_file"))
-  {
-    print "Getting build progress from $progress_file\n";
-    
-    while (<PROGRESS_FILE>)
-    {
-      my($line) = $_;
-      chomp($line);
-      $last_module = $line;
-    }
-    
-    close(PROGRESS_FILE);
-  }
-  
-  if ($last_module)
-  {
-    setBuildProgressStart($build_array, $last_module);
-  }
-}
-
-#-------------------------------------------------------------------------------
-# clearOldBuildSettings
-#-------------------------------------------------------------------------------
-sub clearOldBuildSettings($$$$)
-{
-  my($build, $options, $optiondefines, $filepaths) = @_;
-
-  # empty the arrays in case we're being called twice
-  @build_flags = ();
-  @options_flags = ();
-  @filepath_flags = ();
-  
-  # and empty the hashes
-  %$build = ();
-  %$options = ();
-  %$optiondefines = ();
-  %$filepaths = ();
-}
-
-#-------------------------------------------------------------------------------
-# SetupBuildParams
-#-------------------------------------------------------------------------------
-sub SetupBuildParams($$$$$$)
-{
-  my($build, $options, $optiondefines, $filepaths, $flags_file, $prefs_file) = @_;
-  
-  # Empty the hashes and arrays, to wipe out any stale data.
-  # Needed because these structures persist across two build scripts
-  # called using 'do' from a parent script.
-  clearOldBuildSettings($build, $options, $optiondefines, $filepaths);
-  
-  # Read from the flags file, which sets up the various arrays
-  readFlagsFile($flags_file);
-  
-  # If 'all' is set in the build array, propagate that to all entries
-  PropagateAllFlags(\@build_flags);
-  
-  # read the user pref file, that can change values in the array
-  ReadMozUserPrefs($prefs_file, \@build_flags, \@options_flags, \@filepath_flags);
-
-  # If build progress exists, this clears flags in the array up to a certain point
-  if ($main::USE_BUILD_PROGRESS) {
-    ReadBuildProgress(\@build_flags);
-  } else {
-    WipeBuildProgress();
-  }
-  
-#  printBuildArray(\@build_flags);
-#  printBuildArray(\@options_flags);
-  
-  SetBuildFlags($build);
-  SetBuildOptions($options);
-  SetOptionDefines($optiondefines);
-  SetFilepathFlags($filepaths);
-  
-#  printHash($build);
-#  printHash($options);
-}
-
-
-1;

mozilla/build/mac/build_scripts/Moz/BuildUtils.pm

@@ -1,786 +0,0 @@
-
-package Moz::BuildUtils;
-
-require 5.004;
-require Exporter;
-
-# Package that contains build util functions specific to the Mozilla build
-# process.
-
-use strict;
-use Exporter;
-
-use Cwd;
-use File::Path;
-use File::Basename;
-
-use Mac::Events;
-use Mac::StandardFile;
-
-use Moz::Moz;
-use Moz::BuildFlags;
-use Moz::MacCVS;
-#use Moz::ProjectXML;  #optional; required for static build only
-
-use vars qw(@ISA @EXPORT);
-
-@ISA      = qw(Exporter);
-@EXPORT   = qw(
-                SetupDefaultBuildOptions
-                SetupBuildRootDir
-                StartBuildModule
-                EndBuildModule
-                GetBinDirectory
-                BuildOneProjectWithOutput
-                BuildOneProject
-                BuildProject
-                BuildProjectClean
-                BuildIDLProject
-                BuildFolderResourceAliases
-                AskAndPersistFile
-                DelayFor
-                TimeStart
-                TimeEnd
-                EmptyTree
-                SetupBuildLog
-                SetBuildNumber
-                SetTimeBomb
-                UpdateConfigHeader
-              );
-
-#//--------------------------------------------------------------------------------------------------
-#// SetupDefaultBuildOptions
-#//--------------------------------------------------------------------------------------------------
-sub SetupDefaultBuildOptions($$$)
-{
-    my($debug, $bin_dir, $config_header_file_name) = @_;
-
-    # Here we set up defaults for the various build flags.
-    # If you want to override any of these, it's best to do
-    # so via the relevant preferences file, which lives in
-    # System Folder:Preferences:Mozilla build prefs:{build prefs file}.
-    # For the name of the prefs file, see the .pl script that you
-    # run to start this build. The prefs files are created when
-    # you run the build, and contain some documentation.
-    
-    #-------------------------------------------------------------
-    # configuration variables that globally affect what is built
-    #-------------------------------------------------------------
-    $main::DEBUG                  = $debug;
-    $main::PROFILE                = 0;
-    $main::RUNTIME                = 0;    # turn on to just build runtime support and NSPR projects
-    $main::GC_LEAK_DETECTOR       = 0;    # turn on to use GC leak detection
-    $main::MOZILLA_OFFICIAL       = 0;    # generate build number
-    $main::LOG_TO_FILE            = 0;    # write perl output to a file
-    
-    #-------------------------------------------------------------
-    # configuration variables that affect the manner of building, 
-    # but possibly affecting the outcome.
-    #-------------------------------------------------------------    
-    $main::ALIAS_SYM_FILES        = $main::DEBUG;
-    $main::CLOBBER_LIBS           = 1;      # turn on to clobber existing libs and .xSYM files before
-                                            # building each project                         
-    # The following two options will delete all dist files (if you have $main::build{dist} turned on),
-    # but leave the directory structure intact.
-    $main::CLOBBER_DIST_ALL       = 1;    # turn on to clobber all aliases/files inside dist (headers/xsym/libs)
-    $main::CLOBBER_DIST_LIBS      = 0;    # turn on to clobber only aliases/files for libraries/sym files in dist
-    $main::CLOBBER_IDL_PROJECTS   = 0;    # turn on to clobber all IDL projects.
-    $main::CLOBBER_PROJECTS       = 0;    # turn on to remove object code from each project before building it
-    
-    $main::UNIVERSAL_INTERFACES_VERSION = 0x0320;
-    
-    #-------------------------------------------------------------
-    # configuration variables that are preferences for the build,
-    # style and do not affect what is built.
-    #-------------------------------------------------------------
-    $main::CLOSE_PROJECTS_FIRST   = 0;
-                                    # 1 = close then make (for development),
-                                    # 0 = make then close (for tinderbox).
-    $main::USE_TIMESTAMPED_LOGS   = 0;
-    $main::USE_BUILD_PROGRESS     = 1;    # track build progress for restartable builds
-    #-------------------------------------------------------------
-    # END OF CONFIG SWITCHES
-    #-------------------------------------------------------------
-    
-    $main::BIN_DIRECTORY = $bin_dir;
-    $main::DEFINESOPTIONS_FILE = $config_header_file_name;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// SetupBuildRootDir
-#//--------------------------------------------------------------------------------------------------
-sub SetupBuildRootDir($)
-{
-    my($rel_path_to_script) = @_;
-
-    my($cur_dir) = cwd();
-    $cur_dir =~ s/$rel_path_to_script$//;
-    chdir($cur_dir) || die "Error: failed to set build root directory to '$cur_dir'.\nYou probably need to put 'mozilla' one level down (in a folder).\n";
-    $main::MOZ_SRC = cwd();
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// StartBuildModule
-#//--------------------------------------------------------------------------------------------------
-sub StartBuildModule($)
-{
-    my($module) = @_;
-
-    print("---- Start of $module ----\n");
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// EndBuildModule
-#//--------------------------------------------------------------------------------------------------
-sub EndBuildModule($)
-{
-    my($module) = @_;
-    WriteBuildProgress($module);
-    print("---- End of $module ----\n");
-}
-
-#--------------------------------------------------------------------------------------------------
-# GetBinDirectory
-#--------------------------------------------------------------------------------------------------
-sub GetBinDirectory()
-{
-    if ($main::BIN_DIRECTORY eq "") { die "Dist directory not set\n"; }
-    return $main::BIN_DIRECTORY;
-}
-
-#--------------------------------------------------------------------------------------------------
-# AskAndPersistFile stores the information about the user pick inside
-# the file $session_storage
-#--------------------------------------------------------------------------------------------------
-sub AskAndPersistFile($)
-{
-    my ($sessionStorage) = @_;
-    my $cvsfile;
-
-    if (( -e $sessionStorage) &&
-        open( SESSIONFILE, $sessionStorage ))
-    {
-    # Read in the path if available
-        $cvsfile = <SESSIONFILE>;
-        chomp $cvsfile;
-        close SESSIONFILE;
-        if ( ! -e $cvsfile )
-        {
-            print STDERR "$cvsfile has disappeared\n";
-            undef $cvsfile;
-        }
-    }
-    unless (defined ($cvsfile))
-    {
-        # make sure that MacPerl is a front process
-        ActivateApplication('McPL');
-        MacPerl::Answer("Could not find your MacCVS session file. Please choose one", "OK");
-        
-        # prompt user for the file name, and store it
-        my $macFile = StandardGetFile( 0, "McvD");  
-        if ( $macFile->sfGood() )
-        {
-            $cvsfile = $macFile->sfFile();
-            # save the choice if we can
-            if ( open (SESSIONFILE, ">" . $sessionStorage))
-            {
-                printf SESSIONFILE $cvsfile, "\n";
-                close SESSIONFILE;
-            }
-            else
-            {
-                print STDERR "Could not open storage file $sessionStorage for saving $cvsfile\n";
-            }
-        }
-    }
-    return $cvsfile;
-}
-
-
-#--------------------------------------------------------------------------------------------------
-# BuildIDLProject
-#
-#--------------------------------------------------------------------------------------------------
-
-sub BuildIDLProject($$)
-{
-    my ($project_path, $module_name) = @_;
-
-    if ($main::CLOBBER_IDL_PROJECTS)
-    {
-        my (@suffix_list) = (".mcp", ".xml");
-        my ($project_name, $project_dir, $suffix) = fileparse($project_path, @suffix_list);
-        if ($suffix eq "") { die "Error: Project, $project_path must end in .xml or .mcp\n"; }
-
-        my($datafolder_path);
-        if ($suffix eq ".xml")
-        {
-            $datafolder_path = $project_dir . "_" . $project_name . " Data:";
-        }
-        else {
-            $datafolder_path = $project_dir . $project_name . " Data:";
-        }
-
-        print STDERR "Deleting IDL data folder: $datafolder_path\n";
-        EmptyTree($datafolder_path);
-    }
-
-    BuildOneProject($project_path,  "headers", 0, 0, 0);
-    BuildOneProject($project_path,  $module_name.".xpt", 1, 0, 1);
-}
-
-
-#--------------------------------------------------------------------------------------------------
-# CreateStaticLibTargets
-#
-#--------------------------------------------------------------------------------------------------
-sub CreateXMLStaticLibTargets($)
-{
-    my($xml_path) = @_;
-
-    my (@suffix_list) = (".xml");
-    my ($project_name, $project_dir, $suffix) = fileparse($xml_path, @suffix_list);
-    if ($suffix eq "") { die "XML munging: $xml_path must end in .xml\n"; }
-
-    #sniff the file to see if we need to fix up broken Pro5-exported XML
-    print "Parsing $xml_path\n";
-    
-    my $ide_version = Moz::ProjectXML::SniffProjectXMLIDEVersion($xml_path);
-    if ($ide_version eq "4.0")
-    {
-        my $new_file = $project_dir.$project_name."2.xml";
-        
-        print "Cleaning up Pro 5 xml to $new_file\n";
-        
-        Moz::ProjectXML::CleanupPro5XML($xml_path, $new_file);
-
-        unlink $xml_path;
-        rename ($new_file, $xml_path);
-    }
-    
-    my $doc = Moz::ProjectXML::ParseXMLDocument($xml_path);
-    my @target_list = Moz::ProjectXML::GetTargetsList($doc);
-    my $target;
-    
-    my %target_hash;    # for easy lookups below
-    foreach $target (@target_list) { $target_hash{$target} = 1; }
-    
-    foreach $target (@target_list)
-    {
-        if ($target =~ /(.+).shlb$/)        # if this is a shared lib target
-        {
-            my $target_base = $1;
-            my $static_target = $target_base.".o";
-            
-            # ensure that this does not exist already
-            if ($target_hash{$static_target}) {
-                print "Static target $static_target already exists in project. Not making\n";
-                next;
-            }
-            
-            print "Making static target '$static_target' from target '$target'\n";
-
-            Moz::ProjectXML::CloneTarget($doc, $target, $static_target);
-            Moz::ProjectXML::SetAsStaticLibraryTarget($doc, $static_target, $static_target);
-        }
-    }
-    
-    print "Writing XML file to $xml_path\n";
-    my $temp_path = $project_dir."_".$project_name.".xml";
-    Moz::ProjectXML::WriteXMLDocument($doc, $temp_path, $ide_version);
-    Moz::ProjectXML::DisposeXMLDocument($doc);
-    
-    if (-e $temp_path)
-    {
-        unlink $xml_path;
-        rename ($temp_path, $xml_path);
-    }
-    else
-    {
-        die "Error: Failed to add new targets to XML project\n";
-    }
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// ProcessProjectXML
-#// 
-#// Helper routine to allow for XML pre-processing. This should read in the XML, process it,
-#// and replace the original file with the processed version.
-#//--------------------------------------------------------------------------------------------------
-sub ProcessProjectXML($)
-{
-    my($xml_path) = @_;
-  
-    # we need to manually load Moz::ProjectXML, becaues not everyone will have the
-    # required perl modules in their distro.
-    my($cur_dir) = cwd();
-    
-    chdir(dirname($0));     # change to the script dir
-    eval "require Moz::ProjectXML";
-    if ($@) { die "Error: could not do Project XML munging because you do not have the correct XML modules installed. Error is:\n################\n $@################"; }
-    
-    chdir($cur_dir);
-    
-    CreateXMLStaticLibTargets($xml_path);
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// Build one project, and make the alias. Parameters are project path, target name, shared  library
-#// name, make shlb alias (boolean), make xSYM alias (boolean), and is component (boolean).
-#//--------------------------------------------------------------------------------------------------
-
-sub BuildOneProjectWithOutput($$$$$$)
-{
-    my ($project_path, $target_name, $output_name, $alias_lib, $alias_xSYM, $component) = @_;
-
-    unless ($project_path =~ m/^$main::BUILD_ROOT.+/) { return; }
-
-    my (@suffix_list) = (".mcp", ".xml");
-    my ($project_name, $project_dir, $suffix) = fileparse($project_path, @suffix_list);
-    if ($suffix eq "") { die "Error: Project, $project_path must end in .xml or .mcp\n"; }
-    
-    my($dist_dir) = GetBinDirectory();
-    
-    # Put libraries in "Essential Files" folder, Components in "Components" folder
-    my($output_dir)  = $component ? "Components:" : "Essential Files:";
-    my($output_path) = $dist_dir.$output_dir;
-
-    if ($main::options{static_build})
-    {      
-      if ($output_name =~ /\.o$/ || $output_name =~ /\.[Ll]ib$/)
-      {
-        $alias_xSYM = 0;
-        $alias_lib  = 1;
-        $output_path = $main::DEBUG ? ":mozilla:dist:static_libs_debug:" : ":mozilla:dist:static_libs:";
-      }
-    }
-
-    # if the flag is on to export projects to XML, export and munge them
-    if ($main::EXPORT_PROJECTS && !($project_path =~ /IDL\.mcp$/))
-    {
-        my $xml_out_path = $project_path;
-
-        $xml_out_path =~ s/\.mcp$/\.xml/;
-
-        # only do this if project is newer?
-        if (! -e $xml_out_path)
-        {
-          ExportProjectToXML(full_path_to($project_path), full_path_to($xml_out_path));
-          ProcessProjectXML($xml_out_path);
-        }
-    }
-        
-    # if the flag is set to use XML projects, default to XML if the file 
-    # is present.
-    if ($main::USE_XML_PROJECTS && !($project_path =~ /IDL\.mcp$/))
-    {
-      my $xml_project_path = $project_dir.$project_name.".xml";
-      if (-e $xml_project_path)
-      {
-        $project_path = $xml_project_path;
-        $suffix = ".xml";
-      }
-    }
-    
-    if ($suffix eq ".xml")
-    {
-        my($xml_path) = $project_path;
-        # Prepend an "_" onto the name of the generated project file so it doesn't conflict
-        $project_path = $project_dir . "_" . $project_name . ".mcp";
-        my($project_modtime) = (-e $project_path ? GetFileModDate($project_path) : 0);
-        my($xml_modtime) = (-e $xml_path ? GetFileModDate($xml_path) : 0);
-
-        if ($xml_modtime > $project_modtime)
-        {
-            print("Importing $project_path from $project_name.xml.\n");
-            unlink($project_path);
-            # Might want to delete the "xxx.mcp Data" dir ???
-            ImportXMLProject(full_path_to($xml_path), full_path_to($project_path));
-        }
-    }
-
-
-    if ($main::CLOBBER_LIBS)
-    {
-        unlink "$project_dir$output_name";              # it's OK if these fail
-        unlink "$project_dir$output_name.xSYM";
-    }
-    
-    DoBuildProject($project_path, $target_name, $main::CLOBBER_PROJECTS);
-    
-    $alias_lib  ? MakeAlias("$project_dir$output_name",      "$output_path") : 0;
-    $alias_xSYM ? MakeAlias("$project_dir$output_name.xSYM", "$output_path") : 0;
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// For compatiblity with existing scripts, BuildOneProject now just calls
-#// BuildOneProjectWithOutput, with the output name and target name identical.
-#// Note that this routine assumes that the target name and the shared libary name
-#// are the same.
-#//--------------------------------------------------------------------------------------------------
-
-sub BuildOneProject($$$$$)
-{
-    my ($project_path, $target_name, $alias_lib, $alias_xSYM, $component) = @_;
-    
-	BuildOneProjectWithOutput($project_path, $target_name, $target_name,
-							  $alias_lib, $alias_xSYM, $component);
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// For compatiblity with existing scripts, BuildProject now just calls
-#// BuildOneProjectWithOutput, with the output name and target name identical.
-#// Note that this routine assumes that the target name and the shared libary name
-#// are the same. No aliases of the output are made.
-#//--------------------------------------------------------------------------------------------------
-
-sub BuildProject($$)
-{
-    my ($project_path, $target_name) = @_;
-    
-	BuildOneProjectWithOutput($project_path, $target_name, $target_name, 0, 0, 0);
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// Identical to BuildProject but clobbers the project before building it.
-#//--------------------------------------------------------------------------------------------------
-
-sub BuildProjectClean($$)
-{
-    my ($project_path, $target_name) = @_;
-    my ($save_clobber_flag) = $main::CLOBBER_PROJECTS;
-    $main::CLOBBER_PROJECTS = 1;
-	BuildOneProjectWithOutput($project_path, $target_name, $target_name, 0, 0, 0);
-	$main::CLOBBER_PROJECTS = $save_clobber_flag;
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// Make resource aliases for one directory
-#//--------------------------------------------------------------------------------------------------
-
-sub BuildFolderResourceAliases($$)
-{
-    my($src_dir, $dest_dir) = @_;
-        
-    # get a list of all the resource files
-    opendir(SRCDIR, $src_dir) || die("can't open $src_dir");
-    my(@resource_files) = readdir(SRCDIR);
-    closedir(SRCDIR);
-    
-    # make aliases for each one into the dest directory
-    print("Placing aliases to all files from $src_dir in $dest_dir\n");
-    for ( @resource_files )
-    {
-        next if $_ eq "CVS";
-        #print("    Doing $_\n");
-        if (-l $src_dir.$_)
-        {
-            print("     $_ is an alias\n");
-            next;
-        }
-        my($file_name) = $src_dir . $_; 
-        MakeAlias($file_name, $dest_dir);
-    }
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// DelayFor
-#//
-#// Delay for the given number of seconds, allowing the script to be cancelled
-#//--------------------------------------------------------------------------------------------------
-
-sub DelayFor($)
-{
-  my($delay_secs) = @_;
-  
-  STDOUT->autoflush(1);
-  
-  my($end_time) = time() + $delay_secs;
-    
-  my($last_time) = 0;
-  my($cur_time) = time();
-  
-  while ($cur_time < $end_time)
-  {
-    $cur_time = time();
-    if ($cur_time > $last_time)
-    {
-      print ".";
-      $last_time = $cur_time;
-    }
-    
-    WaitNextEvent();
-  }
-
-  print "\n";
-  STDOUT->autoflush(0);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// TimeStart
-#//--------------------------------------------------------------------------------------------------
-sub TimeStart()
-{
-    return time();
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// TimeEnd
-#//--------------------------------------------------------------------------------------------------
-sub TimeEnd($$)
-{
-    use integer;
-    
-    my($start_time, $operation_name) = @_;
-    my($end_time) = time();
-    
-    my($tot_sec) = $end_time - $start_time;
-    
-    my($seconds) = $tot_sec;
-    
-    my($hours) = $seconds / (60 * 60);
-    $seconds -= $hours * (60 * 60);
-    
-    my($minutes) = $seconds / 60;
-    $seconds -= $minutes * 60;
-        
-    print "$operation_name took $hours hours $minutes minutes and $seconds seconds\n";
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// Remove all files from a tree, leaving directories intact (except "CVS").
-#//--------------------------------------------------------------------------------------------------
-
-sub EmptyTree($)
-{
-    my ($root) = @_; 
-    #print "EmptyTree($root)\n";
-    opendir(DIR, $root);
-    my $sub;
-    foreach $sub (readdir(DIR))
-    {
-        my $fullpathname = $root.$sub; # -f, -d only work on full paths
-
-        # Don't call empty tree for the alias of a directory.
-        # -d returns true for the alias of a directory, false for a broken alias)
-
-        if (-d $fullpathname)
-        {
-            if (-l $fullpathname)   # delete aliases
-            {
-                unlink $fullpathname;
-                next;
-            }
-            EmptyTree($fullpathname.":");
-            if ($sub eq "CVS")
-            {
-                #print "rmdir $fullpathname\n";
-                rmdir $fullpathname;
-            }
-        }
-        else
-        {
-            unless (unlink $fullpathname) { die "Failed to delete $fullpathname\n"; }
-        }
-    }
-    closedir(DIR);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// Recurse through a directory hierarchy, looking for MANIFEST files.
-#// Currently unused.
-#//--------------------------------------------------------------------------------------------------
-
-sub ScanForManifestFiles($$$$)
-{
-    my($dir, $theme_root, $theme_name, $dist_dir) = @_;
-
-    opendir(DIR, $dir) or die "Cannot open dir $dir\n";
-    my @files = readdir(DIR);
-    closedir DIR;
-
-    my $file;
-
-    foreach $file (@files)
-    {    
-        my $filepath = $dir.":".$file;
-
-        if (-d $filepath)
-        {
-            # print "Looking for MANIFEST files in $filepath\n";        
-            ScanForManifestFiles($filepath, $theme_root, $theme_name, $dist_dir);
-        }
-        elsif ($file eq "MANIFEST")
-        {
-            # print "Doing manifest file $filepath\n";
-
-            # Get the dest path from the first line of the file
-
-            open(MANIFEST, $filepath) || die "Could not open file $file";
-            # Read in the path if available
-            my($dest_line) = <MANIFEST>;
-            chomp $dest_line;
-            close MANIFEST;
-
-            $dest_line =~ s|^#!dest[\t ]+|| || die "No destination line found in $filepath\n";
-
-            my($dest_path) = $dist_dir."chrome:skins:$theme_name:$dest_line";
-            # print " Destination is $dest_path\n";
-
-            InstallResources($filepath, "$dest_path", 0);
-        }
-    }
-}
-
-
-#-----------------------------------------------
-# SetupBuildLog
-#-----------------------------------------------
-sub SetupBuildLog($$)
-{
-    my($logfile_path, $timestamped_log) = @_;
-    
-    my($logdir) = "";
-    my($logfile) = $logfile_path;
-    
-    if ($logfile_path =~ /(.+?:)([^:]+)$/)       # ? for non-greedy match
-    {
-        $logdir = $1;
-        $logfile = $2;
-        
-        mkpath($logdir);
-    }
-    
-    if ($timestamped_log)
-    {
-        #Use time-stamped names so that you don't clobber your previous log file!
-        my $now = localtime();
-        while ($now =~ s@:@.@) {} # replace all colons by periods
-        OpenErrorLog("${logdir}${now}");
-    }
-    else
-    {
-        OpenErrorLog("${logdir}${logfile}");
-    }
-}
-
-#-----------------------------------------------
-# SetBuildNumber
-#-----------------------------------------------
-sub SetBuildNumber($$)
-{
-    my($build_num_file, $files_to_touch) = @_;
-
-    # Make sure we add the config dir to search, to pick up mozBDate.pm
-    # Need to do this dynamically, because this module can be used before
-    # mozilla/config has been checked out.
-    
-    my ($inc_path) = $0;        # $0 is the path to the parent script
-    $inc_path =~ s/:build:mac:build_scripts:.+$/:config/;
-    push(@INC, $inc_path);
-
-    require mozBDate;
-    
-    mozBDate::UpdateBuildNumber($build_num_file, $main::MOZILLA_OFFICIAL);
-   
-    my($file);
-    foreach $file (@$files_to_touch)
-    {
-        print "Writing build number to $file from ${file}.in\n";
-        mozBDate::SubstituteBuildNumber($file, $build_num_file, "${file}.in");
-    }
-}
-
-#-----------------------------------------------
-# SetTimeBomb
-#-----------------------------------------------
-sub SetTimeBomb($$)		
-{
-  my ($warn_days, $bomb_days) = @_;
-  
-  system("perl :mozilla:config:mac-set-timebomb.pl $warn_days $bomb_days");
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// Regenerate a configuration header file if necessary
-#//--------------------------------------------------------------------------------------------------
-sub UpdateConfigHeader($)
-{
-    my($config_path) = @_;
-    
-    my($config, $oldconfig) = ("", "");
-    my($define, $definevalue, $defines);
-    my($k, $l,);
-
-    foreach $k (keys(%main::options))
-    {
-        if ($main::options{$k})
-        {
-            foreach $l (keys(%{$main::optiondefines{$k}}))
-            {
-                $my::defines{$l} = $main::optiondefines{$k}{$l};
-                print "Setting up my::defines{$l}\n";
-            }
-        }
-    }
-
-    my $config_headerfile = current_directory().$config_path;
-    if (-e $config_headerfile)
-    {
-        open(CONFIG_HEADER, "< $config_headerfile") || die "$config_headerfile: $!\n";
-        my($line);
-        while ($line = <CONFIG_HEADER>)
-        {
-            if ($line =~ m/#define\s+([^\s]*)\s+([^\s]*)\s*\n/)
-            {
-                $define = $1;
-                $definevalue = $2;
-                
-                #canonicalize so that whitespace changes are not significant
-                my $canon_value = "#define " . $define . " " . $definevalue . "\n";
-                $oldconfig .= $canon_value;
-                
-                if (exists ($my::defines{$define}) and ($my::defines{$define} == $definevalue))
-                {
-                    delete $my::defines{$define};
-                    $config .= $canon_value;
-                }
-            }
-        }
-        close(CONFIG_HEADER);
-    }
-
-    if (%my::defines)
-    {
-        foreach $k (keys(%my::defines))
-        {
-            $config .= "#define " . $k . " " . $my::defines{$k} . "\n";
-        }
-    }
-
-    my $file_name = basename($config_headerfile);
-    if (($config ne $oldconfig) || (!-e $config_headerfile))
-    {
-        printf("Writing new configuration header $file_name\n");
-        open(CONFIG_HEADER, "> $config_headerfile") || die "$config_headerfile: $!\n";
-        print(CONFIG_HEADER "/* This file is auto-generated based on build options. Do not edit. */\n");
-        print CONFIG_HEADER ($config);
-        close(CONFIG_HEADER);
-
-        MacPerl::SetFileInfo("CWIE", "TEXT", $config_headerfile);
-    }
-    else
-    {
-        printf("Configuration header $file_name is up-to-date\n");
-    }
-}
-
-
-1;
-

mozilla/build/mac/build_scripts/Moz/CodeWarriorLib.pm

@@ -1,660 +0,0 @@
-#!perl
-package Moz::CodeWarriorLib;
-
-=pod
-
-=head1 NAME
-
-CodeWarriorLib - supply interface to CodeWarrior
-
-=head1 SYNOPSIS
-
-	#!perl
-	use CodeWarriorLib;
-	CodeWarriorLib::activate();
-	$had_errors = CodeWarriorLib::build_project(
-		$project_path, $target_name, $recent_errors_file, $clean_build
-	);
-
-=head1 DESCRIPTION
-
-Replaces the AppleScript library I<CodeWarriorLib>.
-
-=over 4
-
-=cut
-
-use strict;
-
-use Cwd;
-use File::Basename;
-
-use Mac::Types;
-use Mac::Events;
-use Mac::AppleEvents;
-use Mac::AppleEvents::Simple;
-use Mac::Processes;
-use Mac::MoreFiles;
-use Mac::StandardFile;
-
-
-use vars qw($VERSION);
-$VERSION = '1.02';
-
-my($app)  = 'CWIE';
-my($scriptDir) = cwd();         # could use $0 for this
-my($ide_loc_file) = "";
-
-# 0 == don't switch CWIE to front app in do_event(), 1 == do switch
-# note: activate() still switches when called
-$Mac::AppleEvents::Simple::SWITCH = 0;
-# $Mac::AppleEvents::Simple::WARN = 1;
-
-# supply your own path to the source here
-#_test('PowerPudgeIV:mozilla:mozilla:');
-
-# If you want to understand the gobbldeygook that's used to build Apple Events,
-# you should start by reading the AEGizmos documentation.
-
-=pod
-
-=item _get_project($full_path)
-
-A private routine returning a reference to the open project with the given name,
-or else the empty string (when that project is not open)
-
-full_path is a string identifying the project to be built and is of the form, 
-e.g., "HD:ProjectFolder:MyProject.mcp".  It must be supplied.
-
-=cut
-
-sub _get_project ($) {
-	my(
-		$full_path, $candidate_projects
-	) = @_;
-	$candidate_projects = _doc_named(basename($full_path, '*'));
-	if ($candidate_projects) {
-		my($cps) = _get_dobj($candidate_projects);
-		my($num) = AECountItems($cps);
-		if ($num) {  # is a list
-			foreach (1 .. AECountItems($cps)) {
-				my($cp) = AEGetNthDesc($cps, $_);
-				if (lc $full_path eq lc _full_path($cp)) {
-					return($cp);
-				}
-			}
-		} else {     # is only one, not a list
-			if (lc $full_path eq lc _full_path($cps)) {
-				return($cps);
-			}
-		}
-	}
-	return;
-}
-
-=pod
-
-=item build_project
-
-Build a selected target of a project, saving any errors to a file, if supplied.
-	
-full_path is a string identifying the project to be built and is of the form, 
-e.g., "HD:ProjectFolder:MyProject.mcp".  It must be supplied.
-
-If target_name is the empty string, the current target of the selected project 
-will be built, else, target_name should be a string matching a target name in 
-the selected project.
-	
-If error_path is the empty string, errors will not be saved to a file,
-else, error_path should be the full path of a file to save error messages into.
-
-=cut
-
-$CodeWarriorLib::CLOSE_PROJECTS_FIRST = 0; # If true we close then make. If false, make then close.
-my $last_project_built = "";
-my $last_project_was_closed = 0;
-
-sub build_project ($;$$$) {
-	my(
-		$full_path, $target_name, $error_path,
-		$remove_object, $p, $project_was_closed, $had_errors
-	) = @_;
-	_close_errors_window();
-
-	if ($CodeWarriorLib::CLOSE_PROJECTS_FIRST && ($last_project_built ne $full_path))
-	{
-		# If we're in "close first" mode, we don't close if the current project
-		# is the same as the previous one.
-		if ($last_project_was_closed) {
-			$p = _get_project($last_project_built);
-			_close($p);
-		}
-		$last_project_built = $full_path;
-		$last_project_was_closed = 0; # now refers to the new project
-	}
-	$project_was_closed = 0;
-	while (1) {
-		$p = _get_project($full_path);
-		if (!$p) {
-			if ($project_was_closed) {
-				print "### Error - request for project document failed after opening\n";
-				die "### possibly CW Pro 4 bug: be sure to close your Find window\n";
-			}
-			$project_was_closed = 1;
-			$last_project_was_closed = 1;
-			_open_file($full_path);
-		} else {
-			last;
-		}
-	}
-
-	$had_errors = 0;
-	if ($target_name eq '') {
-		if ($remove_object) {_remove_object($p)}
-		_build($p);
-	} else {
-		if ($remove_object) {_remove_object($p, $target_name)}
-		_build($p, $target_name);
-	}
-
-	if ($error_path ne '') {
-		_save_errors_window($error_path);
-	}
-	$had_errors = _close_errors_window();
-
-	if (!$CodeWarriorLib::CLOSE_PROJECTS_FIRST)
-	{
-		if ($project_was_closed) {
-			$p = _get_project($full_path);
-			_close($p);
-		}
-	}
-
-	return($had_errors);
-}
-
-=pod
-
-=item appIsRunning()
-
-=cut
-sub _appIsRunning($)
-{
-	my ($appSignature) = @_;
-	my ($psi);
-	my ($found) = 0;
-	my ($appPSN);
-
-	foreach $psi (values(%Process))
-	{
-		if ($psi->processSignature() eq $appSignature)
-		{
-			$appPSN = $psi->processNumber();
-			$found = 1;
-            last;
-		}
-	}
-	
-	return $found;
-}
-
-=pod
-
-=item appIsFrontmost()
-
-=cut
-sub _appIsFrontmost($)
-{
-	my ($appSignature) = @_;
-	my ($psi);
-	my ($found) = 0;
-	my ($appPSN);
-
-	foreach $psi (values(%Process))
-	{
-		if ($psi->processSignature() eq $appSignature)
-		{
-			$appPSN = $psi->processNumber();
-			$found = 1;
-            last;
-		}
-	}
-	
-	return (GetFrontProcess() == $appPSN);
-}
-
-
-=pod
-
-=item activate()
-
-Launches CodeWarrior and brings it to the front.
-
-Once found, path will be saved in $idepath_file for future reference.
-Edit or delete this file to change the location of the IDE.  If app is
-moved, C<activate()> will prompt for a new location.
-
-First looks for an open CodeWarrior app.  Second, tries to open previously
-saved location in ':idepath.txt'.  Third, tries to find it and allow user
-to choose it with Navigation Services (if present).  Fourth, uses good old
-GUSI routines built-in to MacPerl for a Choose Directory dialog box.
-
-=cut
-
-sub activate ($) {
-
-    $ide_loc_file = $_[0];     # save in global
-        
-	my($filepath, $appath, $psi) = ($ide_loc_file);
-
-	foreach $psi (values(%Process)) {
-		if ($psi->processSignature() eq $app) {
-			$appath = $psi->processAppSpec();
-			_save_appath($filepath, $appath);
-			last;
-		}
-	}
-
-	if (!$appath || !-x $appath) {
-		$appath = _read_appath($filepath);
-	}
-	
-	if (!$appath || ! -x $appath)
-	{
-		# make sure that MacPerl is a front process
-		#ActivateApplication('McPL');
-		MacPerl::Answer("Please locate the CodeWarrior application.", "OK");
-		
-		# prompt user for the file name, and store it
-		my $macFile = StandardGetFile( 0, "APPL");
-		if ( $macFile->sfGood() )
-		{
-			$appath = $macFile->sfFile();
-		}
-		else
-		{
-			die "Operation canceled\n";
-		}
-	
-#		if (eval {require Mac::Navigation}) {
-#			my($options, $nav);
-#			Mac::Navigation->import();
-#			$options = NavGetDefaultDialogOptions();
-#			$options->message('Where is CodeWarrior IDE?');
-#			$options->windowTitle('Find CodeWarrior IDE');
-#			$nav = NavChooseObject($Application{$app}, $options);
-#			die "CodeWarrior IDE not found.\n" if (!$nav || !$nav->file(1));
-#			$appath = $nav->file(1);
-#		} else {
-#			local(*D);
-#			my $cwd = `pwd`;
-#			$appath = _get_folder(
-#                               'Where is the CW IDE folder?',
-#				dirname($Application{$app})
-#			);
-#			die "CodeWarrior IDE not found.\n" if !$appath;
-#			opendir(D, $appath) or die $!;
-#			chdir($appath);
-#			foreach my $file (sort readdir (D)) {
-#				my(@app) = MacPerl::GetFileInfo($file);
-#				if ($app[0] && $app[1] &&
-#					$app[1] eq 'APPL' && $app[0] eq $app
-#				) {
-#					$appath .= $file;
-#					last;
-#				}
-#			}
-#			chomp($cwd);
-#			chdir($cwd);
-#		}
-		_save_appath($filepath, $appath);
-	}
-
-	my($lp) = LaunchParam->new(
-		launchAppSpec => $appath,
-		launchControlFlags => launchContinue() + launchNoFileFlags()
-	);
-	
-	unless (LaunchApplication($lp)) {
-		unlink($filepath);
-		die $^E;
-	}
-	
-	# wait for CodeWarrior to show up in the list of processes
-	while (!_appIsRunning('CWIE'))
-	{
-		WaitNextEvent();
-	}
-
-	# wait for CodeWarrior to come to the front
-	while (!_appIsFrontmost('CWIE'))
-	{
-		WaitNextEvent();
-	}
-}
-
-=pod
-
-=item getCodeWarriorPath()
-
-Returns a file path relative to the CodeWarrior folder
-
-=cut
-
-sub getCodeWarriorPath($)
-{
-    my($subfolder)=@_;
-    
-    my($app_path) = _read_appath($ide_loc_file);
-    if ($app_path eq "") { die "Error: Failed to get CodeWarrior IDE path\n"; }
-    
-    my($codewarrior_root) = $app_path;
-    $codewarrior_root =~ s/[^:]*$//;
-    return ($codewarrior_root . $subfolder);
-}
-
-
-=pod
-
-=item getCodeWarriorIDEName()
-
-Returns the name of the CodeWarrior application
-
-=cut
-
-sub getCodeWarriorIDEName()
-{
-    my($subfolder)=@_;
-
-    my($app_path) = _read_appath($ide_loc_file);
-    if ($app_path eq "") { die "Error: Failed to get CodeWarrior IDE path\n"; }
-
-    my(@codewarrior_path) = split(/:/, $app_path);
-    return pop(@codewarrior_path);
-}
-
-
-=pod
-
-=item quit()
-
-Quits CodeWarrior.
-
-=cut
-
-sub quit() {
-
-	$last_project_built = "";
-	$last_project_was_closed = 0;
-
-	my($evt) = do_event(qw/aevt quit/, $app);
-}
-
-
-sub _build ($;$) {
-	my($evt);
-	if ($_[1]) {
-		my($prm) =
-			q"'----':obj {form:name, want:type(TRGT), seld:TEXT(@), from:" .
-			AEPrint($_[0]) . '}';
-		$evt = do_event(qw/CWIE MAKE/, $app, $prm, $_[1]);
-	} else {
-		my($prm) = q"'----':" . AEPrint($_[0]);
-		$evt = do_event(qw/CWIE MAKE/, $app, $prm);
-	}
-}
-
-sub _remove_object ($;$) {
-	my($evt);
-	if ($_[1]) {
-		my($prm) =
-			q"'----':obj {form:name, want:type(TRGT), seld:TEXT(@), from:" .
-			AEPrint($_[0]) . '}';
-		$evt = do_event(qw/CWIE RMOB/, $app, $prm, $_[1]);
-	} else {
-		my($prm) = q"'----':" . AEPrint($_[0]);
-		$evt = do_event(qw/CWIE RMOB/, $app, $prm);
-	}
-}
-
-sub _open_file ($) {
-	my($prm) =
-		q"'----':obj {form:name, want:type(alis), " .
-		q"seld:TEXT(@), from:'null'()}";
-
-	do_event(qw/aevt odoc/, $app, $prm, $_[0]);
-}
-
-sub import_project ($$) {
-	my($xml_file, $project_path) = @_;
-	
-	my($prm) = "kocl:type(PRJD), rtyp:TEXT(@), data:TEXT(@), &subj:'null'()";
-	
-	my($evt) = do_event(qw/core crel/, $app, $prm, $project_path, $xml_file);    
-	my($result) = _get_event_result($evt);
-	
-	if ($result eq "") {
-		_close(_get_project($project_path));
-	}
-	return $result;
-}
-
-sub export_project ($$) {
-	my($project_path, $xml_out_path) = @_;
-	my($p, $project_was_closed);
-	
-	$project_was_closed = 0;
-	while (1) {
-		$p = _get_project($project_path);
-		if (!$p) {
-			if ($project_was_closed) {
-				print "### Error - request for project document failed after opening\n";
-				die "### possibly CW bug: be sure to close your Find window\n";
-}
-			$project_was_closed = 1;
-			_open_file($project_path);
-		} else {
-			last;
-		}
-	}
-
-    # avoid problems with the Project Messages window
-    _close_named_window("Project Messages");
-    
-	my($prm) =
-		q"'----':obj {form:indx, want:type(PRJD), " .
-		q"seld:1, from:'null'()}, kfil:TEXT(@)";
-
-	my($evt) = do_event(qw/CWIE EXPT/, $app, $prm, $xml_out_path);    
-	
-	if ($project_was_closed) {
-		$p = _get_project($project_path);
-		_close($p);
-	}
-	
-	return _get_event_result($evt);
-}
-
-sub _doc_named ($) {
-	my($prm) =
-		q"'----':obj {form:test, want:type(docu), from:'null'(), " .
-		q"seld:cmpd{relo:'=   ', 'obj1':obj {form:prop, want:type" .
-		q"(prop), seld:type(pnam), from:'exmn'()}, 'obj2':TEXT(@)}}";
-
-	my($evt) = do_event(qw/core getd/, $app, $prm, $_[0]);
-	return($evt->{REPLY} eq 'aevt\ansr{}' ? undef : $evt);
-}
-
-sub _full_path ($) {
-	my($obj) = $_[0];
-	my($prm) =
-		q"'----':obj {form:prop, want:type(prop), seld:type(FILE), " .
-		q"from:" . AEPrint($_[0]) . q"}, rtyp:type(TEXT)";
-	my($evt) = do_event(qw/core getd/, $app, $prm);
-
-	return MacPerl::MakePath(
-		MacUnpack('fss ', (
-			AEGetParamDesc($evt->{REP}, keyDirectObject()))->data()->get()
-		)
-	);
-}
-
-sub _save_errors_window ($) {
-	my($prm) = 
-		q"'----':obj {form:name, want:type(alis), seld:TEXT(@), from:'null'()}";
-	do_event(qw/MMPR SvMs/, $app, $prm, $_[0]);
-}
-
-
-sub _close_errors_window () {
-    return _close_named_window('Errors & Warnings');
-}
-
-
-sub _close_named_window ($) {
-    my($window_name) = @_;
-    
-	my($prm) =
-		q"'----':obj {form:name, want:type(cwin), " .
-		q"seld:TEXT(@), from:'null'()}";
-
-	my($evt) = do_event(qw/core clos/, $app, $prm, $window_name);
-	return($evt->{REPLY} eq 'aevt\ansr{}' ? 1 : 0);
-}
-
-sub _close () {
-	my($prm) = q"'----':" . AEPrint($_[0]);
-	do_event(qw/core clos/, $app, $prm);
-}
-
-sub _get_dobj ($) {
-	return(AEGetParamDesc($_[0]->{REP}, keyDirectObject()));
-}
-
-sub _get_folder ($$) {
-    require 'GUSI.ph';
-    my($prompt, $default) = @_;
-    MacPerl::Choose(
-        GUSI::AF_FILE(), 0, $prompt, '',
-        GUSI::CHOOSE_DIR() + ($default ? &GUSI::CHOOSE_DEFAULT : 0),
-        $default
-    );
-}
-
-sub _get_event_result ($)
-{
-    my($evt) = @_;
-
-    my($result) = $evt->{ERROR};
-    
-    if ( $result eq "" && $evt->{ERRNO} != 0 )
-    {
-        $result = "unknown error (".$evt->{ERRNO}.")";
-    }
-    
-    return $result;
-}
-
-
-sub _save_appath ($$) {
-
-	my($cwd) = cwd();	# remember the current working dir
-	chdir($scriptDir);	# change dir to the script dir
-
-	local(*F);
-	open(F, '>' . $_[0]) or die $!;
-	print F $_[1];
-	close(F);
-		
-	chdir($cwd);		# restore the cwd
-}
-
-sub _read_appath ($) {
-
-	my($filepath) = @_;
-
-	my($cwd) = cwd();	# remember the current working dir
-	chdir($scriptDir);	# change dir to the script dir
-	
-	if (! -e $filepath) {
-		return "";
-	}
-
-	local(*F);
-	open(F, $filepath);
-	my($appath) = <F>;
-	close(F);
-		
-	chdir($cwd);		# restore the cwd
-	return($appath);
-}
-
-
-sub _test ($) {
-	activate($ide_loc_file);
-	my($path) = $_[0];
-	build_project(
-	  "${path}modules:xml:macbuild:XML.mcp", '',
-	  "${path}build:mac:Mozilla.BuildLog.part"
-	);
-}
-
-1;
-
-=pod
-
-=back
-
-=head1 HISTORY
-
-=over 4
-
-=item v1.02, September 23, 1998
-
-Made fixes in finding and saving location of CodeWarrior IDE.
-
-=item v1.01, June 1, 1998
-
-Made fixes to C<chdir()> in C<activate()>, made C<activate()> more robust 
-in finding CodeWarrior IDE, added global variable to NOT switch to IDE
-for each sent event, a few other fixes.
-
-=item v1.00, May 30, 1998
-
-First shot
-
-=back
-
-
-=head1 AUTHORS
-
-Chris Nandor F<E<lt>pudge@pobox.comE<gt>>, and the author of the
-original I<CodeWarriorLib>, Scott Collins F<E<lt>scc@netscape.comE<gt>>.
-
-=head1 SEE ALSO
-
-BuildProject L<Moz>.
-
-=head1 COPYRIGHT
-
-The contents of this file are subject to the Netscape Public
-License Version 1.1 (the "License"); you may not use this file
-except in compliance with the License. You may obtain a copy of
-the License at http://www.mozilla.org/NPL/
-
-Software distributed under the License is distributed on an "AS
-IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-implied. See the License for the specific language governing
-rights and limitations under the License.
-
-The Original Code is Mozilla Communicator client code, released
-March 31, 1998.
-
-The Initial Developer of the Original Code is Netscape
-Communications Corporation. Portions created by Netscape are
-Copyright (C) 1998-1999 Netscape Communications Corporation. All
-Rights Reserved.
-
-Contributor(s): 
-
-=cut

mozilla/build/mac/build_scripts/Moz/Jar.pm

@@ -1,573 +0,0 @@
-#!perl -w
-package Moz::Jar;
-
-#
-# Module for creating jar files, either using a jar manifest, or
-# simply jarring up folders on disk.
-#
-
-require 5.004;
-require Exporter;
-
-use strict;
-use Archive::Zip;
-use File::Path;
-
-use Mac::Files;
-
-use Moz::Moz;
-
-use vars qw( @ISA @EXPORT );
-
-@ISA        = qw(Exporter);
-@EXPORT     = qw(
-                    CreateJarFileFromDirectory
-                    CreateJarFromManifest
-                    WriteOutJarFiles
-                    SanityCheckJarOptions
-                );
-
-
-#-------------------------------------------------------------------------------
-# Add the contents of a directory to the zip file
-#
-#-------------------------------------------------------------------------------
-sub _addDirToJar($$$$)
-{
-    my($dir, $jar_root, $zip, $compress) = @_;
-
-    opendir(DIR, $dir) or die "Error: Cannot open dir $dir\n";
-    my @files = readdir(DIR);
-    closedir DIR;
-    
-    my $unix_jar_root = $jar_root;
-    $unix_jar_root =~ s|:|/|g;       # colon to slash conversion
-    
-    my $file;
-    
-    foreach $file (@files)
-    {        
-        my $filepath = $dir.":".$file;
-        
-        if (-d $filepath)
-        {
-            print "Adding files to jar from $filepath\n";            
-            _addDirToJar($filepath, $jar_root, $zip, $compress);
-        }
-        else
-        {
-            my $member = Archive::Zip::Member->newFromFile($filepath);
-            die "Error: Failed to create zip file member $filepath\n" unless $member;
-            
-            my $unixName = $filepath;
-            $unixName =~ s|:|/|g;               # colon to slash conversion
-            $unixName =~ s|^$unix_jar_root||;   # relativise
-            
-            $member->fileName($unixName);
-            
-            # print "Adding $file as $unixName\n";
-            
-            if ($compress) {
-                $member->desiredCompressionMethod(Archive::Zip::COMPRESSION_DEFLATED);            
-            } else {
-                $member->desiredCompressionMethod(Archive::Zip::COMPRESSION_STORED);
-            }
-            
-            $zip->addMember($member);
-        }
-    }
-}
-
-#-------------------------------------------------------------------------------
-# Add the contents of a directory to the zip file
-#
-#-------------------------------------------------------------------------------
-
-sub CreateJarFileFromDirectory($$$)
-{
-    my($srcdir, $jarpath, $compress) = @_;
-
-    my $zip = Archive::Zip->new();
-
-    _addDirToJar($srcdir, $srcdir, $zip, $compress);
-
-    print "Saving zip file...\n";
-    my $status = $zip->writeToFileNamed($jarpath);
-    if ($status == 0) {
-        print "Zipping completed successfully\n";
-    } else {
-        print "Error saving zip file\n";
-    }
-    
-    # set the file type/creator to something reasonable
-    MacPerl::SetFileInfo("ZIP ", "ZIP ", $jarpath);
-}
-
-
-#-------------------------------------------------------------------------------
-# printZipContents
-# 
-#-------------------------------------------------------------------------------
-sub printZipContents($)
-{
-    my($zip) = @_;
-
-    my(@members) = $zip->memberNames();
-    
-    print "Zip contains:\n";
-    
-    my($member);
-    foreach $member (@members)
-    {
-        print "  $member\n";
-    }
-}
-
-
-#-------------------------------------------------------------------------------
-# safeSaveJarFile
-# 
-# Archive::Zip has a problem where you cannot save a zip file on top of
-# an existing zip file that it has open, because it holds references
-# into that zip. So we have to save to a temp file, then do a swap.
-# 
-# Note that the zip will become invalid after this operation.
-# If you want to do further operations on it, you'll have to reread it.
-#-------------------------------------------------------------------------------
-sub safeSaveJarFile($$)
-{
-    my($zip, $full_dest_path) = @_;
-    
-    my($temp_file_name) = $full_dest_path."_temp";
-
-    ($zip->writeToFileNamed($temp_file_name) == Archive::Zip::AZ_OK) || die "Error: died writing jar to temp file $temp_file_name\n";
-    
-    unlink $full_dest_path;
-    
-    (rename $temp_file_name, $full_dest_path) || die "Error: Failed to rename $temp_file_name\n";
-    
-    MacPerl::SetFileInfo("ZIP ", "ZIP ", $full_dest_path);
-}
-
-
-#-------------------------------------------------------------------------------
-# addToJarFile
-# 
-# Add a file to a jar file
-#
-# Parameters:
-#   1. Jar ID. Unix path of jar file inside chrome.
-#   2. Abs path to jar.mn file (i.e. source)    (mac breaks)
-#   3. File source, relative to jar.mn path     (mac breaks)
-#   4. Abs path to the resulting .jar file      (mac breaks)
-#   5. Relative file path within the jar        (unix breaks)
-#   6. Reference to hash of jar files
-#
-#-------------------------------------------------------------------------------
-
-sub addToJarFile($$$$$$$)
-{
-    my($jar_id, $jar_man_dir, $file_src, $jar_path, $file_jar_path, $override, $jars) = @_;
-
-    # print "addToJarFile with:\n  $jar_man_dir\n  $file_src\n  $jar_path\n  $file_jar_path\n";
-
-    unless ($jar_path =~ m/(.+:)([^:]+)$/) { die "Error: Bad jar path $jar_path\n"; }
-    
-    my($target_dir) = $1;
-    my($jar_name) = $2;
-
-    $target_dir =~ s/[^:]+$//;
-    
-    # print "¥ $target_dir $jar_name\n";
-
-    # find the source file
-    my($src) = $jar_man_dir.":".$file_src;
-    if ((!-e $src) && ($file_src =~ m/.+:([^:]+)$/))    # src does not exist. Fall back to looking for src in jar.mn dir
-    {
-        $file_src = $1;
-        $src = $jar_man_dir.":".$file_src;
-        
-        if (!-e $src) {
-            die "Error: Can't find chrome file $src\n";
-        }
-    }
-    
-    if ($main::options{chrome_jars})
-    {
-        my($zip) = $jars->{$jar_id};
-        unless ($zip) { die "Error: Can't find Zip entry for $jar_id\n"; }
-        
-        # print "Adding $file_src to jar file $jar_path at $file_jar_path\n";
-        my($member) = Archive::Zip::Member->newFromFile($src);
-        unless ($member) { die "Error: Failed to create zip file member $src\n"; }
-
-        $member->fileName($file_jar_path);    
-    
-        my($compress) = 1;
-        if ($compress) {
-            $member->desiredCompressionMethod(Archive::Zip::COMPRESSION_DEFLATED);            
-            $member->desiredCompressionLevel(Archive::Zip::COMPRESSION_LEVEL_DEFAULT);   # defaults to 6
-        } else {
-            $member->desiredCompressionMethod(Archive::Zip::COMPRESSION_STORED);
-        }
-
-        my($old_member) = $zip->memberNamed($file_jar_path);
-        
-        if ($override)
-        {
-            if ($old_member)
-            {
-                # print "Overriding $file_jar_path in jar file $jar_id\n";
-                # need to compare mod dates or use the + here
-                $zip->removeMember($old_member);
-            }
-        
-            $zip->addMember($member);
-        }
-        else
-        {
-            if ($old_member)
-            {
-                #compare dates here
-                my($member_moddate) = $old_member->lastModTime();
-                my($file_moddate) = GetFileModDate($src);
-            
-                if ($file_moddate > $member_moddate)
-                {
-                    print "Updating older file $file_jar_path in $jar_id\n";
-                    $zip->removeMember($old_member);
-                    $zip->addMember($member);
-                }
-                else
-                {
-                    print "File $file_jar_path in $jar_id is more recent. Not updating.\n";
-                }
-            }
-            else
-            {
-                $zip->addMember($member);
-            }
-        }
-    }
-    
-    if ($main::options{chrome_files})  # we install raw files too
-    {
-        my($rel_path) = $file_jar_path;
-        $rel_path =~ s|/|:|g;       # slash to colons
-        
-        my($dir_name) = $jar_name;
-        $dir_name =~ s/\.jar$//;
-        
-        my($dst) = $target_dir.$dir_name.":".$rel_path;
-                
-        # print "Aliassing $src\n to\n$dst\n";        
-        if ($override)
-        {
-            unlink $dst;
-        MakeAlias($src, $dst);      # don't check errors, otherwise we fail on replacement
-    }
-        else
-        {
-            if (-e $dst)
-            {
-                #compare dates here
-                my($dst_moddate) = GetFileModDate($dst);
-                my($file_moddate) = GetFileModDate($src);
-            
-                if ($file_moddate > $dst_moddate)
-                {
-                    print "Updating older file $rel_path in $dir_name\n";
-                    unlink $dst;
-                    MakeAlias($src, $dst);
-                }
-                else
-                {
-                    print "File $file_jar_path in $jar_id is more recent. Not updating.\n";
-                }
-            
-            }
-            else
-            {
-                MakeAlias($src, $dst);
-            }
-        }
-        
-    }
-}
-
-
-#-------------------------------------------------------------------------------
-# setupJarFile
-# 
-# setup a zip for writing
-#-------------------------------------------------------------------------------
-
-sub setupJarFile($$$)
-{
-    my($jar_id, $dest_path, $jar_hash) = @_;
-
-    # print "Creating jar file $jar_id at $jar_path\n";
-    
-    my($jar_file) = $jar_id;
-    $jar_file =~ s|/|:|g;           # slash to colons
-    my($full_jar_path) = full_path_to($dest_path.":".$jar_file);
-
-    if ($main::options{chrome_jars})
-    {
-        my($zip) = $jar_hash->{$jar_id};
-        if (!$zip)      # if we haven't made it already, do so
-        {
-	        my($zip) = Archive::Zip->new();
-	        $jar_hash->{$jar_id} = $zip;
-
-            # does the jar file exist already? If so, read it in
-            if (-e $full_jar_path)
-            {
-                print "Reading in jar file $jar_id\n";
-                if ($zip->read($full_jar_path) != Archive::Zip::AZ_OK) { die "Error: Failed to re-read $full_jar_path\n"; }
-                
-                # printZipContents($zip);
-            }
-
-        }
-    }
-    else
-    {
-        # installing files.
-        # nothing to do. MakeAlias creates dirs as needed.
-
-	    # add this jar to the list
-	    $jar_hash->{$jar_id} = 1;
-    }
-}
-
-
-#-------------------------------------------------------------------------------
-# closeJarFile
-# 
-# We're done with this jar file _for this jar.mn_. We may add more entries
-# to it later, so keep it open in the hash.
-#-------------------------------------------------------------------------------
-sub closeJarFile($$)
-{
-    my($jar_path, $jar_hash) = @_;
-
-    # print "Closing jar file $jar_path\n";
-
-    if ($main::options{chrome_jars})
-    {
-    
-    }
-    else
-    {
-        # installing files.
-        # nothing to do
-    }
-}
-
-
-#-------------------------------------------------------------------------------
-# WriteOutJarFiles
-# 
-# Now we dump out the jars
-#-------------------------------------------------------------------------------
-sub WriteOutJarFiles($$)
-{
-    my($chrome_dir, $jars) = @_;
-
-    unless ($main::options{chrome_jars}) { return; }
-    
-    my($full_chrome_path) = full_path_to($chrome_dir);
-
-    my($key);
-    foreach $key (keys %$jars)
-    {
-        my($zip) = $jars->{$key};
-        
-        my($rel_path) = $key;
-        $rel_path =~ s/\//:/g;
-        
-        my($output_path) = $full_chrome_path.":".$rel_path;
-        
-        print "Writing zip file $key to $output_path\n";
-
-        # ensure the target dirs exist
-        my($path) = $output_path;
-        $path =~ s/[^:]+$//;
-        mkpath($path);
-        
-        # unlink $output_path;        # remove any existing jar
-        safeSaveJarFile($zip, $output_path);
-        # $zip is invalid after this operation, so nuke it here
-        $jars->{$key} = 0;
-    }
-}
-
-
-#-------------------------------------------------------------------------------
-# registerChromePackage
-# 
-# Enter a chrome package into the installed-chrome.txt file
-#-------------------------------------------------------------------------------
-sub registerChromePackage($$$$$$)
-{
-    my($jar_file, $file_path, $chrome_dir, $jar_hash, $chrome_type, $pkg_name) = @_;
-
-    my($manifest_subdir) = $jar_file;
-    $manifest_subdir =~ s/:/\//g;
-    
-    my($chrome_entry);
-    
-    if ($main::options{use_jars}) {
-        $chrome_entry = "$chrome_type,install,url,jar:resource:/chrome/$manifest_subdir!/$chrome_type/$pkg_name";
-    } else {
-        $manifest_subdir =~ s/\.jar$//;
-        $chrome_entry = "$chrome_type,install,url,resource:/chrome/$manifest_subdir/$chrome_type/$pkg_name";
-    }
-
-    # print "Entering $chrome_entry in installed-chrome.txt\n";
-    
-    # ensure chrome_dir exists
-    mkpath($chrome_dir);
-    
-    my($inst_chrome) = ${chrome_dir}.":installed-chrome.txt";
-    
-    if (open(CHROMEFILE, "<$inst_chrome")) {
-        while (<CHROMEFILE>) {
-            chomp;
-            if ($_ eq $chrome_entry) {
-                # $chrome_entry already appears in installed-chrome.txt file
-                # just update the mod date
-                my $now = time;
-                utime($now, $now, $inst_chrome) || die "Error: Couldn't touch $inst_chrome";
-                print "+++ updating chrome $inst_chrome\n+++\t\t$chrome_entry\n";
-                close(CHROMEFILE) || die "Error: can't close $inst_chrome: $!";
-                return 0;
-            }
-        }
-        close(CHROMEFILE) || die "Error: can't close $inst_chrome: $!";
-    }
-    open(CHROMEFILE, ">>${inst_chrome}") || die "Error: Failed to open $inst_chrome\n";
-    print(CHROMEFILE "${chrome_entry}\n");
-    close(CHROMEFILE) || die "Error: Failed to close $inst_chrome\n";
-    print "+++ adding chrome $inst_chrome\n+++\t\t$chrome_entry\n";
-}
-
-#-------------------------------------------------------------------------------
-# Create or add to a jar file from a jar.mn file.
-# Both arguments are relative to the mozilla root dir.
-#
-#
-#-------------------------------------------------------------------------------
-sub CreateJarFromManifest($$$)
-{
-    my($jar_man_path, $dest_path, $jars) = @_;
-    
-    if ($main::options{chrome_jars}) {
-        print "Jarring from $jar_man_path\n";
-    }
-    if ($main::options{chrome_files}) {
-        print "Installing files from $jar_man_path\n";
-    }
-
-    $jar_man_path = full_path_to($jar_man_path);
-    $dest_path = full_path_to($dest_path);
-
-    # if the jars hash is empty, nuke installed-chrome.txt
-    if (! scalar(%$jars))
-    {
-        print "Nuking installed-chrome.txt\n";
-	    my($installed_chrome) = $dest_path.":installed-chrome.txt";
-	    # unlink $installed_chrome;
-    }
-    
-    my $jar_man_dir = "";
-    my $jar_man_file = "";
-    
-    if ($jar_man_path =~ /(.+):([^:]+)$/)
-    {
-        $jar_man_dir = $1;      # no trailing :
-        $jar_man_file = $2;
-    }
-
-    # Keep a hash of jar files, keyed on relative jar path (e.g. "packages/core.jar")
-    # Entries are open Archive::Zips (if zipping), and installed-chrome entries.
-    
-    my($jar_id) = "";       # Current foo/bar.jar from jar.mn file
-    my($jar_file) = "";     # relative path to jar file (from $dest_path), with mac separators
-    my($full_jar_path);
-    
-    open(FILE, "<$jar_man_path") || die "Error: could not open \"$jar_man_path\": $!";
-    while (<FILE>)
-    {
-        my($line) = $_;
-        chomp($line);
-        
-        # print "$line\n";
-        
-        if ($line =~ /^\s*\#.*$/) {     # skip comments
-            next;
-        }
-        
-        if ($line =~/^([\w\d.\-\_\\\/]+)\:\s*$/)                                  # line start jar file entries
-        {
-            $jar_id = $1;
-            $jar_file = $jar_id;
-            $jar_file =~ s|/|:|g;           # slash to colons
-            $full_jar_path = $dest_path.":".$jar_file;
-                        
-            setupJarFile($jar_id, $dest_path, $jars);
-
-        }
-        elsif ($line =~ /^(\+?)\s+([\w\d.\-\_\\\/]+)\s*(\([\w\d.\-\_\\\/]+\))?$\s*/)     # jar file entry
-        {
-            my($override) = ($1 eq "+");
-            my($file_dest) = $2;
-            my($file_src) = $3;
- 
-            if ($file_src) {  
-                $file_src = substr($file_src, 1, -1);      #strip the ()
-            } else {
-                $file_src = $file_dest;
-            }
-            
-            $file_src =~ s|/|:|g;
-            
-            if ($jar_file ne "")    # if jar is open, add to jar
-            {
-                if ($file_dest =~ /([\w\d.\-\_]+)\/([\w\d.\-\_\\\/]+)contents.rdf/)
-                {
-                    my $chrome_type = $1;
-                    my $pkg_name = $2;
-                    registerChromePackage($jar_file, $file_dest, $dest_path, $jars, $chrome_type, $pkg_name);
-                }
-                
-                addToJarFile($jar_id, $jar_man_dir, $file_src, $full_jar_path, $file_dest, $override, $jars);
-            }
-            else
-            {
-                die "Error: bad jar.mn format at $line\n";
-            }
-        }
-        elsif ($line =~ /^\s*$/ )                                               # blank line
-        {
-            if ($jar_file ne "")    #if a jar file is open, close it
-            {
-                closeJarFile($full_jar_path, $jars);
-                
-                $jar_file = "";
-                $full_jar_path = "";
-            }
-        }
-    }
-    
-    close(FILE);
-
-    if ($jar_file ne "")    #if a jar file is open, close it
-    {
-        closeJarFile($full_jar_path, $jars);
-    }
-
-}
-
-1;

mozilla/build/mac/build_scripts/Moz/MacCVS.pm

@@ -1,228 +0,0 @@
-#!perl -w
-package Moz::MacCVS;
-
-# package Mac::Apps::MacCVS; this should really be the name of the package
-# but due to our directory hierarchy in mozilla, I am not doing it
-
-require 5.004;
-require Exporter;
-
-use strict;
-use Exporter;
-
-use vars qw($VERSION @ISA @EXPORT);
-
-use Cwd;
-
-use File::Basename;
-
-use Mac::StandardFile;
-use Mac::AppleEvents;
-use Mac::AppleEvents::Simple;
-
-@ISA        = qw(Exporter);
-@EXPORT     = qw(new describe checkout update);
-$VERSION = "1.00";
-
-# If you want to understand the gobbldeygook that's used to build Apple Events,
-# you should start by reading the AEGizmos documentation.
-
-
-# Architecture:
-# cvs session object:
-# name - session name
-# session_file - session file
-# 
-# 
-
-my($last_error) = 0;
-my($gAppSig)    = 'Mcvs';   # MacCVS Pro
-
-#
-# utility routines
-#
-
-
-sub _checkForEventError($)
-{
-  my($evt) = @_;
-
-  if ($evt->{ERRNO} != 0)
-  {
-    print STDERR "Error. Script returned '$evt->{ERROR} (error $evt->{ERRNO})\n";
-    $last_error = $evt->{ERRNO};
-    return 0;
-  }
-  
-  return 1; # success
-}
-
-
-#
-# Session object methods
-#
-
-sub new
-{
-  my ( $proto, $session_file) = @_;
-  my $class = ref($proto) || $proto;
-  my $self = {};
-
-  if ( defined($session_file) && ( -e $session_file) )
-  {
-    $self->{"name"} = basename( $session_file );
-    $self->{"session_file"} = $session_file;
-    bless $self, $class;
-    return $self;
-  }
-  else
-  {
-    print STDERR "MacCVS->new cvs file < $session_file > does not exist\n";
-    return;
-  }
-}
-
-# makes sure that the session is open
-# assertSessionOpen()
-# returns 1 on success
-sub assertSessionOpen()
-{
-  my ($self) = shift;
-
-  $last_error = 0;
-
-  my($prm) =
-    q"'----':obj {form:name, want:type(alis), seld:TEXT(@), from:'null'()}";
-
-  my($evt) = do_event(qw/aevt odoc/, $gAppSig, $prm, $self->{session_file});
-  return _checkForEventError($evt);
-}
-
-# prints the cvs object, used mostly for debugging
-sub describe
-{
-  my($self) = shift;
-  $last_error = 0;
-  print "MacCVS:: name: ", $self->{name}, " session file: ", $self->{session_file}, "\n";
-}
-
-# checkout( self, module, revision, date)
-# MacCVS checkout command
-# returns 1 on success.
-sub checkout()
-{
-  my($self, $module, $revision, $date ) = @_;
-  unless( defined ($module) ) { $module = ""; } # get rid of the pesky undefined warnings
-  unless( defined ($revision) ) { $revision = ""; }
-  unless( defined ($date) ) { $date = ""; }
-
-  $last_error = 0;
-    
-  $self->assertSessionOpen() || die "Error: failed to open MacCVS session file at $self->{session_file}\n";
-  
-  my($revstring) = ($revision ne "") ? $revision : "(none)";
-  my($datestring) = ($date ne "") ? $date : "(none)";
-  
-  print "Checking out $module with revision $revstring, date $datestring\n";
-
-  my($prm) =
-    q"'----':obj {form:name, want:type(docu), seld:TEXT(@), from:'null'()}, ".
-    q"modl:'TEXT'(@), tagr:'TEXT'(@), tagd:'TEXT'(@) ";
-  
-  my($evt) = do_event(qw/MCvs cout/, $gAppSig, $prm, $self->{name}, $module, $revision, $date);
-  return _checkForEventError($evt);
-}
-
-
-# update( self, branch tag, list of paths)
-# MacCVS udate command
-# returns 1 on success.
-# NOTE: MacCVS Pro does not correctly support this stuff yet (as of version 2.7d5).
-sub update()
-{
-  my($self, $branch, $paths ) = @_;
-
-  $last_error = 0;
-    
-  $self->assertSessionOpen() || die "Error: failed to open MacCVS session file at $self->{session_file}\n";
-
-  if ($branch eq "HEAD") {
-    $branch = "";
-  }
-  
-  my($paths_list) = "";
-  
-  my($path);
-  foreach $path (@$paths)
-  {
-    if ($paths_list ne "") {
-      $paths_list = $paths_list.", ";
-    }
-    
-    $paths_list = $paths_list."Ò".$path."Ó";
-  }
-    
-  my($prm) =
-    q"'----':obj {form:name, want:type(docu), seld:TEXT(@), from:'null'()}, ".
-    q"tagr:'TEXT'(@), tFls:[";
-
-  $prm = $prm.$paths_list."]";
-    
-  my($evt) = do_event(qw/MCvs updt/, $gAppSig, $prm, $self->{name}, $branch);
-  return _checkForEventError($evt);
-};
-
-
-sub getLastError()
-{
-  return $last_error;
-}
-
-1;
-=pod
-
-=head1 NAME
-
-MacCVS - Interface to MacCVS
-
-=head1 SYNOPSIS
-
-  use MacCVS;
-  $session = MacCVS->new( <session_file_path>) || die "cannot create session";
-  $session->checkout([module] [revision] [date]) || die "Could not check out";
-    
-=head1 DESCRIPTION
-
-This is a MacCVS interface for talking to MacCVS Pro client.
-MacCVSSession is the class used to manipulate the session
-
-=item new
-  MacCVS->new( <cvs session file path>);
-  
-  Creates a new session. Returns undef on failure.
-
-=item checkout( <module> [revision] [date] )
-
-  cvs checkout command. Revision and date are optional
-  returns 0 on failure
-  
-=cut
-
-=head1 SEE ALSO
-
-=over
-
-=item MacCVS Home Page
-
-http://www.maccvs.org/
-
-=back 
-
-=head1 AUTHORS
-
-Aleks Totic atotic@netscape.com
-Simon Fraser sfraser@netscape.com
-
-=cut
-
-__END__

mozilla/build/mac/build_scripts/Moz/Moz.pm

@@ -1,603 +0,0 @@
-=head1 NAME
-
-B<Moz> - routines for automating CodeWarrior builds, and some extra-curricular
-activities related to building Mozilla
-
-=head1 SYNOPSIS
-
-    use Moz;
-
-    OpenErrorLog(":::BuildLog");
-    StopForErrors();
-
-		$Moz::QUIET = 1;
-		InstallFromManifest(":projects:MANIFEST", $dist_dir);
-
-    BuildProjectClean(":projects:SomeProject.mcp", "SomeTarget");
-    MakeAlias(":projects:SomeProject.shlb", $dist_dir);
-
-    DontStopForErrors();
-
-    BuildProject(":projects:SomeOtherProject.mcp", "SomeTarget");
-
-=head1 DESCRIPTION
-
-B<Moz> comprises the routines needed to slap CodeWarrior around, force it
-to build a sequence of projects, report the results, and a few other things.
-This module should only contain functions that are generic to any build,
-not just the Mozilla build.
-
-=cut
-
-
-package			Moz::Moz;
-require			Exporter;
-
-use Cwd;
-
-use File::Copy;
-use File::Path;
-use File::Basename;
-
-use Mac::Types;
-use Mac::Events;
-use Mac::Processes;
-
-use ExtUtils::Manifest 'maniread';
-
-use Moz::CodeWarriorLib;
-
-@ISA				= qw(Exporter);
-
-@EXPORT			= qw( LaunchCodeWarrior
-                  GetCodeWarriorRelativePath
-                  current_directory
-                  full_path_to
-                  DoBuildProject
-                  ImportXMLProject
-                  ExportProjectToXML
-                  OpenErrorLog
-                  MakeAlias
-                  GetFileModDate
-                  StopForErrors
-                  DontStopForErrors
-                  InstallFromManifest
-                  InstallResources
-                  RedirectOutputToFile
-                  Delay
-                  ActivateApplication
-                  IsProcessRunning);
-
-@EXPORT_OK	= qw(CloseErrorLog QUIET);
-
-
-sub current_directory()
-	{
-		my $current_directory = cwd();
-		chop($current_directory) if ( $current_directory =~ m/:$/ );
-		return $current_directory;
-	}
-
-sub full_path_to($)
-	{
-		my ($path) = @_;
-		if ( $path =~ m/^[^:]+$/ )
-			{
-				$path = ":" . $path;
-			}
-
-		if ( $path =~ m/^:/ )
-			{
-				$path = current_directory() . $path;
-			}
-
-		return $path;
-	}
-
-$logging								= 0;
-$recent_errors_file			= "";
-$stop_on_1st_error			= 1;
-$QUIET									= 0;
-
-
-
-=head2 Logging all the errors and warnings - C<OpenErrorLog($log_file)>, C<CloseErrorLog()>
-
-The warnings and errors generated in the course of building projects can be logged to a file.
-Tinderbox uses this facility to show why a remote build failed.
-
-Logging is off by default.
-  Start logging at any point in your build process with C<OpenErrorLog($log_file)>.
-  Stop with C<CloseErrorLog()>.
-  You never need to close the log explicitly, unless you want to just log a couple of projects in the middle of a big list.
-  C<CloseErrorLog()> is not exported by default. 
-
-=cut
-
-sub CloseErrorLog()
-	{
-		if ( $logging )
-			{
-				close(ERROR_LOG);
-				$logging = 0;
-				StopForErrors() if $stop_on_1st_error;
-			}
-	}
-
-
-
-sub OpenErrorLog($)
-	{
-		my ($log_file) = @_;
-
-		CloseErrorLog();
-		if ( $log_file )
-			{
-				$log_file = full_path_to($log_file);
- 
-				open(ERROR_LOG, ">$log_file") || die "Error: Can't open $log_file\n";
-				MacPerl::SetFileInfo("CWIE", "TEXT", $log_file);
-
-				$log_file =~ m/.+:(.+)/;
-				$recent_errors_file = full_path_to("$1.part");
-				$logging = 1;
-			}
-	}
-
-
-=head2 Stopping before it's too late - C<StopForErrors()>, C<DontStopForErrors()>
-
-When building a long list of projects, you decide whether to continue building subsequent projects when one fails.
-  By default, your build script will C<die> after the first project that generates an error while building.
-  Change this behavior with C<DontStopForErrors()>.
-  Re-enable it with C<StopForErrors()>.
-
-=cut
-
-sub StopForErrors()
-	{
-		$stop_on_1st_error = 1;
-		
-			# Can't stop for errors unless we notice them.
-			# Can't notice them unless we are logging.
-			# If the user didn't explicitly request logging, log to a temporary file.
-
-		if ( ! $recent_errors_file )
-			{
-				OpenErrorLog("${TMPDIR}BuildResults");
-			}
-	}
-
-sub DontStopForErrors()
-	{
-		$stop_on_1st_error = 0;		
-	}
-
-sub log_message($)
-	{
-		if ( $logging )
-			{
-				my ($message) = @_;
-				print ERROR_LOG $message;
-			}
-	}
-
-sub log_message_with_time($)
-	{
-		if ( $logging )
-			{
-				my ($message) = @_;
-				my $time_stamp = localtime();
-				log_message("$message ($time_stamp)\n");
-			}
-	}
-
-sub log_recent_errors($)
-	{
-		my ($project_name) = @_;
-		my $found_errors = 0;
-	
-		if ( $logging )
-			{
-				open(RECENT_ERRORS, "<$recent_errors_file");
-
-				while( <RECENT_ERRORS> )
-					{
-						if ( /^Error/ || /^CouldnÕt find project file/ || /^Link Error/ )
-							{
-#								if (!$found_errors)
-#									print $_;
-								$found_errors = 1;
-							}
-						print ERROR_LOG $_;
-					}
-
-				close(RECENT_ERRORS);
-				unlink("$recent_errors_file");
-			}
-		
-		if ( $stop_on_1st_error && $found_errors )
-			{
-				print ERROR_LOG "### Build failed.\n";
-				die "### Errors encountered building \"$project_name\".\n";
-			}
-	}
-	
-sub DoBuildProject($$$)
-	{
-		my ($project_path, $target_name, $clean_build) = @_;
-		$project_path = full_path_to($project_path);
-
-#		$project_path =~ m/.+:(.+)/;
-#		my $project_name = $1;
-
-		log_message_with_time("### Building \"$project_path\"");
-
-			# Check that the given project exists
-		if (! -e $project_path)
-			{
-				print ERROR_LOG "### Build failed.\n";
-				die "### Can't find project file \"$project_path\".\n";
-			}
-		
-		print "Building \"$project_path\[$target_name\]\"\n";
-		
-		$had_errors = Moz::CodeWarriorLib::build_project(
-			$project_path, $target_name, $recent_errors_file, $clean_build
-		);
-		WaitNextEvent();
-
-#		$had_errors =
-#MacPerl::DoAppleScript(<<END_OF_APPLESCRIPT);
-#	tell (load script file "$CodeWarriorLib") to BuildProject("$project_path", "$project_name", "$target_name", "$recent_errors_file", $clean_build)
-#END_OF_APPLESCRIPT
-
-			# Append any errors to the globally accumulated log file
-#		if ( $had_errors ) # Removed this test, because we want warnings, too.  -- jrm
-			{
-				log_recent_errors($project_path);
-			}
-	}
-
-
-sub ImportXMLProject($$)
-{
-    my ($xml_path, $project_path) = @_;
-
-#    my ($codewarrior_ide_name) = Moz::CodeWarriorLib::getCodeWarriorIDEName();
-#    my $ascript = <<EOS;
-#      tell application "$codewarrior_ide_name"
-#        make new (project document) as ("$project_path") with data ("$xml_path")
-#      end tell
-#EOS
-#    print $ascript."\n";
-#    my($result) = MacPerl::DoAppleScript($ascript);
-#    unless ($result) { die "Error: ImportXMLProject AppleScript failed $^E $result\n";  }
-#    
-
-    my($import_error) = Moz::CodeWarriorLib::import_project($xml_path, $project_path);
-    if ($import_error ne "") {
-      die "Error: ImportXMLProject failed with error $import_error\n";
-    }
-}
-
-sub ExportProjectToXML($$)
-{
-    my ($project_path, $xml_path) = @_;
-
-    my (@suffix_list) = (".mcp");
-    my ($project_name, $project_dir, $suffix) = fileparse($project_path, @suffix_list);
-    if ($suffix eq "") { die "Project: $project_path doesn't look like a project file.\n"; }
-    
-    if (-e $xml_path) {
-        print "$xml_path exists - not exporting $project_path\n";
-    }
-    else {
-        print "Exporting $project_path to $xml_path\n";
-        my($export_error) = Moz::CodeWarriorLib::export_project($project_path, $xml_path);
-        if ($export_error ne "") {
-            die "Error: export_project failed with error '$export_error'\n";
-        }
-        
-        if (! -e $xml_path) {
-          die "Error: XML export to $xml_path failed\n";
-        }
-    }
-}
-
-
-=head2 Miscellaneous
-
-C<MakeAlias($old_file, $new_file)> functions like C<symlink()>, except with better argument defaulting and more explicit error messages.
-
-=cut
-
-sub MakeAlias($$)
-	{
-		my ($old_file, $new_file) = @_;
-
-			# if the directory to hold $new_file doesn't exist, create it
-		if ( ($new_file =~ m/(.+:)/) && !-d $1 )
-			{
-				mkpath($1);
-			}
-
-			# if a leaf name wasn't specified for $new_file, use the leaf from $old_file
-		if ( ($new_file =~ m/:$/) && ($old_file =~ m/.+:(.+)/) )
-			{
-				$new_file .= $1;
-			}
-
-		my $message = "Can't create a Finder alias (at \"$new_file\")\n for \"$old_file\"; because ";
-
-		die "Error: $message \"$old_file\" doesn't exist.\n" unless -e $old_file;
-		die "Error: $message I won't replace an existing (non-alias) file with an alias.\n" if ( -e $new_file && ! -l $new_file );
-
-			# now: $old_file exists; $new_file doesn't (or else, is an alias already)
-
-		if ( -l $new_file )
-			{
-					# ...then see if it already points to $old_file
-				my $current_target	= full_path_to(readlink($new_file));
-				my $new_target			= full_path_to($old_file);
-
-				return if ( $current_target eq $new_target );
-					# if the desired alias already exists and points to the right thing, then we're done
-				
-				unlink $new_file;
-			}
-		
-		symlink($old_file, $new_file) || die "Error: $message symlink returned an unexpected error.\n";
-	}
-	
-	
-=pod
-
-C<InstallFromManifest()>
-
-=cut
-
-sub InstallFromManifest($;$$)
-	{
-		my ($manifest_file, $dest_dir, $flat) = @_;
-		
-		$flat = 0 unless defined($flat); # if $flat, all rel. paths in MANIFEST get aliased to the root of $dest_dir
-
-		$dest_dir ||= ":";
-
-		$manifest_file =~ m/(.+):/;
-		my $source_dir =  $1;
-
-		chop($dest_dir) if $dest_dir =~ m/:$/;
-
-		#Mac::Events->import();
-		WaitNextEvent();
-		if ($flat)
-		{
-			print "Doing manifest on \"$manifest_file\" FLAT\n" unless $QUIET;
-		}
-		else
-		{
-			print "Doing manifest on \"$manifest_file\"\n" unless $QUIET;
-		}
-		
-		my $read = maniread(full_path_to($manifest_file));
-		foreach $file (keys %$read)
-			{
-				next unless $file;
-
-				$subdir = ":";
-				if (!$flat && ($file =~ /:.+:/ ))
-					{
-						$subdir = $&;
-					}
-
-				$file = ":$file" unless $file =~ m/^:/;
-				MakeAlias("$source_dir$file", "$dest_dir$subdir");
-			}
-	}
-
-
-=pod
-
-C<InstallResources()>
-
-=cut
-
-# parameters are path to MANIFEST file, destination dir, true (to make copies) or false (to make aliases)
-sub InstallResources($;$;$)
-	{
-		my ($manifest_file, $dest_dir, $copy_files) = @_;
-
-		$dest_dir ||= ":";
-		mkpath($dest_dir) if !-d $dest_dir;
-
-		$manifest_file =~ m/(.+):/;
-		my $source_dir =  $1;
-
-		chop($dest_dir) if $dest_dir =~ m/:$/;
-
-		WaitNextEvent();
-		print "Installing resources from \"$manifest_file\"\n" unless $QUIET;
-		
-		my $read = maniread(full_path_to($manifest_file));
-		foreach $file (keys %$read)
-			{
-				next unless $file;
-				
-				if ($copy_files)
-					{
-						copy("$source_dir:$file", "$dest_dir:$file");
-					}
-				else
-					{
-						MakeAlias("$source_dir:$file", "$dest_dir:$file");
-					}
-			}
-	}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// Delay
-#//--------------------------------------------------------------------------------------------------
-sub Delay($)		
-{
-  my ($delay_seconds) = @_;
-
-  $now = time;
-  
-  $exit_time = $now + $delay_seconds;
-
-  while ($exit_time > $now) {
-     $now = time;
-  }
-	
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// GetFileModDate
-#//--------------------------------------------------------------------------------------------------
-sub GetFileModDate($)
-{
-    my($filePath)=@_;
-    my($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
-        $atime,$mtime,$ctime,$blksize,$blocks) = stat($filePath);
-    return $mtime;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// LaunchCodeWarrior
-#//--------------------------------------------------------------------------------------------------
-sub LaunchCodeWarrior($)
-{
-  my($idepath_file) = @_;   # full path to IDE location file
-  my($cur_dir) = cwd();
-  
-  # this both launches and writes the IDE path file
-  Moz::CodeWarriorLib::activate($idepath_file);
-  
-  chdir($cur_dir);
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// GetCodeWarriorRelativePath
-#//--------------------------------------------------------------------------------------------------
-sub GetCodeWarriorRelativePath($)
-{
-  my($rel_path) = @_;
-  return Moz::CodeWarriorLib::getCodeWarriorPath($rel_path);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// RedirectOutputToFile
-#//--------------------------------------------------------------------------------------------------
-sub RedirectOutputToFile($)
-{
-    my($log_file) = @_;
-    
-    # ensure that folders in the path exist
-    my($logdir) = "";
-    my($logfile) = $log_file;
-    
-    if ($log_file =~ /(.+?:)([^:]+)$/)       # ? for non-greedy match
-    {
-        $logdir = $1;
-        $logfile = $2;
-        
-        mkpath($logdir);
-    }
-
-    print "Output is now being redirected to the file '$log_file'\n";
-    
-    open(STDOUT, "> $log_file") || die "Can't redirect stdout";
-    open(STDERR, ">&STDOUT") || die "Can't dup stdout";
-    select(STDERR); $| = 1;     # make unbuffered
-    select(STDOUT); $| = 1;     # make unbuffered
-    
-    MacPerl::SetFileInfo("CWIE", "TEXT", $log_file);
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// ActivateApplication
-#//--------------------------------------------------------------------------------------------------
-
-sub ActivateApplication($)
-{
-	my ($appSignature) = @_;
-	my ($psi, $found);
-	my ($appPSN);
-	
-	$found = 0;
-		
-	foreach $psi (values(%Process))
-	{
-		if ($psi->processSignature() eq $appSignature)
-		{
-			$appPSN = $psi->processNumber();
-			$found = 1;
-            last;
-		}
-	}
-
-	if ($found == 0 || SameProcess($appPSN, GetFrontProcess()))
-	{
-		return;
-	}
-
-	SetFrontProcess($appPSN);
-
-	while (GetFrontProcess() != $appPSN)
-	{
-		WaitNextEvent();
-	}
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// IsProcessRunning
-#//--------------------------------------------------------------------------------------------------
-
-sub IsProcessRunning($)
-{
-    my($processName, $psn, $psi) = @_;
-    while ( ($psn, $psi) = each(%Process) ) {
-     if ($psi->processName eq $processName) { return 1; }
-    }
-    return 0;
-}
-
-
-1;
-
-=head1 AUTHORS
-
-Scott Collins <scc@netscape.com>, Simon Fraser <sfraser@netscape.com>, Chris Yeh <cyeh@netscape.com>
-
-=head1 SEE ALSO
-
-BuildMozillaDebug.pl (et al), BuildList.pm, CodeWarriorLib (an AppleScript library)
-
-=head1 COPYRIGHT
-
-The contents of this file are subject to the Netscape Public
-License Version 1.1 (the "License"); you may not use this file
-except in compliance with the License. You may obtain a copy of
-the License at http://www.mozilla.org/NPL/
-
-Software distributed under the License is distributed on an "AS
-IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-implied. See the License for the specific language governing
-rights and limitations under the License.
-
-The Original Code is Mozilla Communicator client code, released
-March 31, 1998.
-
-The Initial Developer of the Original Code is Netscape
-Communications Corporation. Portions created by Netscape are
-Copyright (C) 1998-1999 Netscape Communications Corporation. All
-Rights Reserved.
-
-Contributor(s): 
-
-=cut

mozilla/build/mac/build_scripts/Moz/Prefs.pm

@@ -1,272 +0,0 @@
-
-package Moz::Prefs;
-
-require 5.004;
-require Exporter;
-
-# Package that attempts to read a file from the Preferences folder,
-# and get build settings out of it
-
-use strict;
-
-use Exporter;
-use File::Path;
-
-use Mac::Files;
-
-use vars qw(@ISA @EXPORT);
-
-@ISA		  = qw(Exporter);
-@EXPORT 	= qw(ReadMozUserPrefs);
-
-
-#-------------------------------------------------------------------------------
-#
-# GetPrefsFolder
-#
-#-------------------------------------------------------------------------------
-
-sub GetPrefsFolder()
-{
-  my($prefs_folder) = FindFolder(kOnSystemDisk, kPreferencesFolderType, 1);
-  return $prefs_folder.":Mozilla build prefs";
-}
-
-
-#-------------------------------------------------------------------------------
-#
-# SetArrayValue
-#
-#-------------------------------------------------------------------------------
-sub SetArrayValue($$$)
-{
-  my($array_ref, $index1, $index2) = @_;
-
-  my($index);
-  foreach $index (@$array_ref)
-  {
-    if ($index->[0] eq $index1)
-    {
-      $index->[1] = $index2;
-      return 1;
-    }
-  }
-  
-  return 0;
-}
-
-
-#-------------------------------------------------------------------------------
-#
-# WriteDefaultPrefsFile
-#
-#-------------------------------------------------------------------------------
-
-sub WriteDefaultPrefsFile($)
-{
-  my($file_path) = @_;
-
-  my($file_contents);
-  $file_contents = <<'EOS';
-% You can use this file to customize the Mozilla build system.
-% The following kinds of lines are allowable:
-%   Comment lines, which start with a '%' in the first column
-%   Lines which modify the default build settings. For the list of flags,
-%   see MozBuildFlags.pm. Examples are:
-%
-%    build       pull            0                    % don't pull
-%    options     mng             1                    % turn mng on
-%   
-%   Line containing the special 'buildfrom' flag, which specifies
-%   where to start the build. Example:
-%   
-%    buildfrom   nglayout                % where to start the build
-%
-%   Lines which specify the location of the files used to store paths
-%   to the CodeWarrior IDE, and the MacCVS Pro session file. Note quoting
-%   of paths containing whitespace. Examples:
-%
-%    filepath   idepath         ::codewarrior.txt
-%    filepath   sessionpath     ":Some folder:MacCVS session path.txt"
-%
-%   Lines which modify the build settings like %main::DEBUG.
-%   Any lines which do not match either of the above are assumed
-%   to set variables on $main::. Examples:
-%   
-%    MOZILLA_OFFICIAL    1
-%
-EOS
-
-  $file_contents =~ s/%/#/g;
-   
-  local(*PREFS_FILE);
-
-  open(PREFS_FILE, "> $file_path") || die "Could not write default prefs file\n";
-  print PREFS_FILE ($file_contents);
-  close(PREFS_FILE);
-
-  MacPerl::SetFileInfo("McPL", "TEXT", $file_path);
-}
-
-
-#-------------------------------------------------------------------------------
-#
-# HandlePrefSet
-#
-#-------------------------------------------------------------------------------
-sub HandlePrefSet($$$$)
-{
-  my($flags, $name, $value, $desc) = @_;
-
-  if (SetArrayValue($flags, $name, $value)) {
-    print "Prefs set $desc flag '$name' to '$value'\n";
-  } else {
-    die "$desc setting '$name' is not a valid option\n";
-  }
-
-}
-
-
-#-------------------------------------------------------------------------------
-#
-# HandleBuildFromPref
-#
-#-------------------------------------------------------------------------------
-sub HandleBuildFromPref($$)
-{
-  my($build_array, $name) = @_;
-
-  my($setting) = 0;
-  my($index);
-  foreach $index (@$build_array)
-  {
-    if ($index->[0] eq $name) {
-      $setting = 1;
-    }
-    
-    $index->[1] = $setting;    
-  }
-
-  if ($setting == 1) {
-    print "Building from $name onwards, as specified by prefs\n";
-  } else {
-    printf "Failed to find buildfrom setting '$name'\n";
-  }
-}
-
-
-#-------------------------------------------------------------------------------
-#
-# ReadPrefsFile
-#
-#-------------------------------------------------------------------------------
-
-sub ReadPrefsFile($$$$$)
-{
-  my($file_path, $build_flags, $options_flags, $filepath_flags, $create_if_missing) = @_;
-  
-  local(*PREFS_FILE);
-  
-  if (open(PREFS_FILE, "< $file_path"))
-  {
-    print "Reading build prefs from '$file_path'\n";
-  
-    while (<PREFS_FILE>)
-    {
-      my($line) = $_;
-      chomp($line);
-      
-      if ($line =~ /^\#/ || $line =~ /^\s*$/) {    # ignore comments and empty lines
-        next;
-      }
-            
-      if (($line =~ /^\s*([^#\s]+)\s+([^#\s]+)\s+\"(.+)\"(\s+#.+)?/) ||
-          ($line =~ /^\s*([^#\s]+)\s+([^#\s]+)\s+\'(.+)\'(\s+#.+)?/) ||
-          ($line =~ /^\s*([^#\s]+)\s+([^#\s]+)\s+([^#\s]+)(\s+#.+)?/))
-      {
-        my($array_name) = $1;      
-        my($option_name) = $2;
-        my($option_value) = $3;      
-      
-        # print "Read '$array_name' '$option_name' '$option_value'\n";
-        
-        if ($array_name eq "build")
-        {
-          HandlePrefSet($build_flags, $option_name, $option_value, "Build");
-        }
-        elsif ($array_name eq "options")
-        {
-          HandlePrefSet($options_flags, $option_name, $option_value, "Options");
-        }
-        elsif ($array_name eq "filepath" && $option_name && $option_value)
-        {
-          HandlePrefSet($filepath_flags, $option_name, $option_value, "Filepath");
-        }
-        else
-        {
-          print "Unknown pref option at $line\n";
-        }
-      }
-      elsif ($line =~ /^\s*buildfrom\s+([^#\s]+)(\s+#.+)?/)
-      {
-        my($build_start) = $1;
-        HandleBuildFromPref($build_flags, $build_start);
-      }
-      elsif ($line =~ /^\s*([^#\s]+)\s+([^#\s]+)(\s+#.+)?/)
-      {
-        my($build_var) = $1;
-        my($var_setting) = $2;
-        
-        print "Setting \$main::$build_var to $var_setting\n";
-        eval "\$main::$build_var = \"$var_setting\"";
-      }
-      else
-      {
-        print "Unrecognized input line at $line\n";
-      }
-      
-    }
-    
-    close(PREFS_FILE);  
-  }
-  elsif ($create_if_missing)
-  {
-    print "No prefs file found at $file_path; using defaults\n";
-    
-    my($folder_path) = $file_path;
-    $folder_path =~ s/[^:]+$//;
-    mkpath($folder_path);
-    WriteDefaultPrefsFile($file_path);
-  }
-}
-
-
-#-------------------------------------------------------------------------------
-#
-# ReadMozUserPrefs
-#
-#-------------------------------------------------------------------------------
-
-sub ReadMozUserPrefs($$$$)
-{
-  my($prefs_file_name, $build_flags, $options_flags, $filepath_flags) = @_;
-  
-  if ($prefs_file_name eq "") { return; }
-  
-  # if local prefs exist, just use those. Othewise, look in the prefs folder
-  if (-e $prefs_file_name)
-  {
-    # read local prefs
-    ReadPrefsFile($prefs_file_name, $build_flags, $options_flags, $filepath_flags, 0);
-  }
-  else
-  {
-    # first read prefs folder prefs
-    my($prefs_path) = GetPrefsFolder();
-    $prefs_path .= ":$prefs_file_name";
-
-    ReadPrefsFile($prefs_path, $build_flags, $options_flags, $filepath_flags, 1);
-  }
-}
-
-1;

mozilla/build/mac/build_scripts/Moz/ProjectXML.pm

@@ -1,932 +0,0 @@
-#!/usr/bin/perl
-
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#   Simon Fraser <sfraser@netscape.com>
-#
-
-package Moz::ProjectXML;
-
-require 5.004;
-require Exporter;
-
-use strict;
-use Exporter;
-
-use Cwd;
-use XML::DOM;
-
-use vars qw(@ISA @EXPORT);
-
-@ISA      = qw(Exporter);
-@EXPORT   = qw(
-                ParseXMLDocument
-                DisposeXMLDocument
-                WriteXMLDocument
-                CleanupPro5XML
-                GetTargetsList
-                CloneTarget
-                SetAsSharedLibraryTarget
-                SetAsStaticLibraryTarget
-                AddTarget
-                RemoveTarget
-                GetTargetSetting
-                SetTargetSetting
-                getChildElementTextContents
-              );
-
-
-#--------------------------------------------------------------------------------------------------
-# A module for reading, manipulating, and writing XML-format CodeWarrior project files.
-# 
-# Sample usage:
-# 
-# use ProjectXML;
-# 
-# my $doc = ProjectXML::ParseXMLDocument("Test.mcp.xml");
-# ProjectXML::CloneTarget($doc, "Test.shlb", "Test.lib");
-# ProjectXML::SetAsStaticLibraryTarget($doc, "Test.lib", "TestOutput.lib");
-# ProjectXML::WriteXMLDocument($doc, "Test_out.xml");
-# ProjectXML::DisposeXMLDocument($doc);
-# 
-#--------------------------------------------------------------------------------------------------
-
-
-#//--------------------------------------------------------------------------------------------------
-#// ParseXMLDocument
-#// Note that the caller must call DisposeXMLDocument on the returned doc
-#//--------------------------------------------------------------------------------------------------
-sub ParseXMLDocument($)
-{
-  my($doc_path) = @_;
-
-  my $parser = new XML::DOM::Parser(ErrorContext => 2);
-  my $doc = $parser->parsefile($doc_path);
-
-  return $doc;
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// DisposeXMLDocument
-#// Needed to avoid memory leaks - cleanup circular references for garbage collection
-#//--------------------------------------------------------------------------------------------------
-sub DisposeXMLDocument($)
-{
-  my($doc) = @_;
-  
-  $doc->dispose();
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// WriteXMLDocument
-#//--------------------------------------------------------------------------------------------------
-
-sub _pro5_tag_compression($$)
-{
-   return 1;    # Pro 5 is broken and can't import XML with <foo/> style tags
-}
-
-sub _pro6plus_tag_compression($$)
-{
-   return 0;    # Pro 6 can deal with empty XML tags like <foo/>
-}
-
-sub WriteXMLDocument($$$)
-{
-  my($doc, $file_path, $ide_version) = @_;
-
-  if ($ide_version eq "4.0")
-  {
-    XML::DOM::setTagCompression(\&_pro5_tag_compression);
-  }
-  else
-  {
-    XML::DOM::setTagCompression(\&_pro6plus_tag_compression);
-  }
-
-  $doc->printToFile($file_path);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// CleanupPro5XML
-#// XML Projects exported by Pro 5 contain garbage data under the MWMerge_MacOS_skipResources
-#// setting. This routine cleans this up, saving the result to a new file
-#//--------------------------------------------------------------------------------------------------
-sub CleanupPro5XML($$)
-{
-  my($xml_path, $out_path) = @_;
-  
-  local(*XML_FILE);
-  open(XML_FILE, "< $xml_path") || die "Error: failed to open file $xml_path\n";
-  
-  local(*CLEANED_FILE);
-  open(CLEANED_FILE, "> $out_path") || die "Error: failed to open file $out_path for writing\n";
-  
-  my $in_skip_resources_settings = 0;
-  
-  while(<XML_FILE>)
-  {
-      my($line) = $_;
-
-      if ($line =~ /^<\?codewarrior/)    # is processing inst line
-      {
-        my $test_line = $line;
-        chomp($test_line);
-  
-        my $out_line = $test_line;
-        if ($test_line =~ /^<\?codewarrior\s+exportversion=\"(.+)\"\s+ideversion=\"(.+)\"\s*\?>$/)
-        {
-          my $export_version = $1;
-          my $ide_version    = $2;
-
-          $ide_version = "4.0_mozilla";   # pseudo IDE version so we know we touched it
-          $out_line = "<?codewarrior exportversion=\"".$export_version."\" ideversion=\"".$ide_version."\"?>";
-        }
-
-        print CLEANED_FILE "$out_line\n";
-        next;
-      }
-      
-      if ($line =~ /MWMerge_MacOS_skipResources/)
-      {
-        $in_skip_resources_settings = 1;
-        print CLEANED_FILE "$line";
-      }
-      elsif($in_skip_resources_settings && $line =~ /<!-- Settings for/)
-      {
-        # leaving bad settings lines. Write closing tag
-        print CLEANED_FILE "                    <!-- Corrupted setting entries removed by script -->\n";
-        print CLEANED_FILE "                </SETTING>\n\n";
-        
-        print CLEANED_FILE "$line";
-
-        $in_skip_resources_settings = 0;
-      }
-      elsif (!$in_skip_resources_settings)
-      {      
-        print CLEANED_FILE "$line";
-      }
-  }
-  
-  close(XML_FILE);
-  close(CLEANED_FILE);
-
-}
-
-#--------------------------------------------------------------------------------------------------
-# SniffProjectXMLIDEVersion
-#
-#--------------------------------------------------------------------------------------------------
-sub SniffProjectXMLIDEVersion($)
-{
-  my($xml_path) = @_;
-  
-  my $found_version = "";
-  
-  local(*XML_FILE);
-  open(XML_FILE, "< $xml_path") || die "Error: failed to open file $xml_path\n";
-  
-  while(<XML_FILE>)
-  {
-      my($line) = $_;
-      chomp($line);
-      
-      if ($line =~ /^<\?codewarrior/)    # is processing inst line
-      {
-        unless ($line =~ /^<\?codewarrior\s+exportversion=\"(.+)\"\s+ideversion=\"(.+)\"\s*\?>$/)
-        {
-          die "Error: Failed to find ideversion in $xml_path in line $line\n";
-        }
-        
-        my $export_version = $1;
-        my $ide_version    = $2;
-
-        $found_version = $ide_version;         
-        last;
-      }
-  }
-  
-  close(XML_FILE);
-
-  return $found_version;
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// GetTargetsList
-#// Returns an array of target names
-#//--------------------------------------------------------------------------------------------------
-sub GetTargetsList($)
-{
-  my($doc) = @_;
-
-  my $nodes = $doc->getElementsByTagName("TARGET");
-  my $n = $nodes->getLength;
-  
-  my @target_names;
-  
-  for (my $i = 0; $i < $n; $i++)
-  {
-    my ($node) = $nodes->item($i);   
-   
-    my($target_name) = getChildElementTextContents($node, "NAME");
-    push(@target_names, $target_name);
-  }
-
-  return @target_names;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// CloneTarget
-#// Clone the named target, renaming it to 'new_name'
-#//--------------------------------------------------------------------------------------------------
-sub CloneTarget($$$)
-{
-  my($doc, $target_name, $new_name) = @_;
-
-  my $target_node   = getTargetNode($doc, $target_name);
-
-  # clone here
-  my $target_clone  = $target_node->cloneNode(1);   # deep clone
-  
-  # -- munge target settings --
-
-  # set the target name field
-  setChildElementTextContents($doc, $target_clone, "NAME", $new_name);
-  
-  # set the targetname pref
-  setTargetNodeSetting($doc, $target_clone, "Targetname", $new_name);
-
-  # -- insert new target subtree --
-  
-  my $target_list   = $target_node->getParentNode();
-  $target_list->appendChild($target_clone);
-  
-  # -- now add to targetorder --
-  my (@target_order_nodes) = getChildOfDocument($doc, "TARGETORDER");
-  
-  my $target_order = @target_order_nodes[0];
-  
-  my $new_order     = $doc->createElement("ORDEREDTARGET");
-  my $order_name    = $doc->createElement("NAME");
-  
-  $new_order->appendChild($order_name);
-
-  setChildElementTextContents($doc, $new_order, "NAME", $new_name);
-  $target_order->appendChild($new_order);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// SetAsSharedLibraryTarget
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub SetAsSharedLibraryTarget($$$)
-{
-  my($doc, $target_name, $output_name) = @_;
-
-  my $target_node = getTargetNode($doc, $target_name);
-
-  setTargetNodeSetting($doc, $target_node, "MWProject_PPC_type", "SharedLibrary");
-  setTargetNodeSetting($doc, $target_node, "MWProject_PPC_filetype", "1936223330"); #'shlb'
-  setTargetNodeSetting($doc, $target_node, "MWProject_PPC_outfile", $output_name);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// AddFileToTarget
-#// 
-#// Add a file to the specified target(s).
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub AddFileToTarget($$$)
-{
-  my($doc, $target_list, $file_name) = @_;
-
-  # the file must be added in 3 places:
-  # 1. in <TARGET><FILELIST><FILE> (with linkage flags if necessary)
-  # 2. in <TARGET><LINKORDER><FILEREF>
-  # 3. in <GROUPLIST><GROUP><FILEREF>
-  die "Write me\n";
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// RemoveFileFromTarget
-#// 
-#// Remove a file from the specified target, removing it from the entire project
-#// if no other targets reference it.
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub RemoveFileFromTarget($$$)
-{
-  my($doc, $target_node, $file_name) = @_;
-  
-  # the file must be removed in 3 places:
-  # 1. in <TARGET><FILELIST><FILE>
-  # 2. in <TARGET><LINKORDER><FILEREF>
-  # 3. in <GROUPLIST><GROUP><FILEREF>
-  
-  # first, remove from <FILELIST>
-  my $filelist_node = getFirstChildElement($target_node, "FILELIST");
-  unless ($filelist_node) { die "Error: failed to find FILELIST node\n"; }
-  
-  my $file_node = getChildNodeByGrandchildContents($doc, $filelist_node, "FILE", "PATH", $file_name);
-  unless ($file_node) { return; }
-
-  $filelist_node->removeChild($file_node);
-  
-  # next, remove from <LINKORDER>
-  my $linkorder_node = getFirstChildElement($target_node, "LINKORDER");
-  unless ($linkorder_node) { die "Error: failed to find LINKORDER node\n"; }
-  
-  my $fileref_node = getChildNodeByGrandchildContents($doc, $linkorder_node, "FILEREF", "PATH", $file_name);
-  unless ($fileref_node) { die "Error: link order node for file $file_name not found\n"; }
-
-  $linkorder_node->removeChild($fileref_node);
-  
-  # last, remove from <GROUPLIST>
-  # <GROUPLIST> is cross-target, so we have to be careful here.
-  my $grouplist_node = getChildOfDocument($doc, "GROUPLIST");
-  unless ($grouplist_node) { die "Error: failed to find GROUPLIST node\n"; }
-
-  # if the file isn't in any other targets, remove it from the groups
-  if (!GetFileInUse($doc, $file_name))
-  {
-    print "File $file_name is in no other targest. Removing from project\n";
-
-    my @group_nodes;
-    getChildElementsOfType($doc, $grouplist_node, "GROUP", \@group_nodes);
-    my $group_node;
-    foreach $group_node (@group_nodes)
-    {
-      my @fileref_nodes;
-      getChildElementsOfType($doc, $group_node, "FILEREF", \@fileref_nodes);
-  
-      my $fileref_node;
-      foreach $fileref_node (@fileref_nodes)
-      {
-        my $path_name = getChildElementTextContents($fileref_node, "PATH");
-        if ($path_name eq $file_name)
-        {
-          print "Removing $file_name from project group list\n";
-          $group_node->removeChild($fileref_node);
-          last;
-        }
-      }
-      
-      # can a file appear in more than one group?
-    }
-  }
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// SetAsStaticLibraryTarget
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub SetAsStaticLibraryTarget($$$)
-{
-  my($doc, $target_name, $output_name) = @_;
-
-  my $target_node = getTargetNode($doc, $target_name);
-
-  setTargetNodeSetting($doc, $target_node, "MWProject_PPC_type", "Library");
-  setTargetNodeSetting($doc, $target_node, "MWProject_PPC_filetype", "1061109567"); #'????'
-  setTargetNodeSetting($doc, $target_node, "MWProject_PPC_outfile", $output_name);
-
-  # static targets don't need any library linkage, so we can remove linkage
-  # with all .shlb and .Lib files.
-  
-  my(@obsolete_files) = ("NSStdLibStubs", "InterfacesStubs", "InterfaceLib", "InternetConfigLib");
-
-  print " Removing libraries etc. from target\n";
-
-  # get all files in target
-  my @target_files = GetTargetFilesList($doc, $target_name);
-  my $target_file;
-  foreach $target_file (@target_files)
-  {
-    if ($target_file =~ /(\.shlb|\.lib|\.Lib|\.o|\.exp)$/)
-    {
-      RemoveFileFromTarget($doc, $target_node, $target_file);
-    }
-  }
-  
-  print " Removing stub libraries from target\n";
-  
-  # then remove files with known names
-  my $obs_file;
-  foreach $obs_file (@obsolete_files)
-  {
-    RemoveFileFromTarget($doc, $target_node, $obs_file);
-  }
-
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// AddTarget
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub AddTarget($$)
-{
-  my($doc, $target_name) = @_;
-
-  die "Write me\n";
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// RemoveTarget
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub RemoveTarget($$)
-{
-  my($doc, $target_name) = @_;
-
-  die "Write me\n";
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// GetTargetSetting
-#// Get the value for the specified setting in the specified target
-#//--------------------------------------------------------------------------------------------------
-sub GetTargetSetting($$$)
-{
-  my($doc, $target_name, $setting_name) = @_;
-
-  my $target_node   = getTargetNode($doc, $target_name);
-  return getTargetNodeSetting($target_node, "VALUE");
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// SetTargetSetting
-#// Set the value for the specified setting in the specified target
-#//--------------------------------------------------------------------------------------------------
-sub SetTargetSetting($$$$)
-{
-  my($doc, $target_name, $setting_name, $new_value) = @_;
-
-  my $target_node   = getTargetNode($doc, $target_name);
-  setTargetNodeSetting($doc, $target_node, "VALUE", $new_value);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// GetTargetFilesList
-#// Return an array of the files in the target (in filelist order)
-#//--------------------------------------------------------------------------------------------------
-sub GetTargetFilesList($$)
-{
-  my($doc, $target_name) = @_;
-
-  my $target_node = getTargetNode($doc, $target_name);
-
-  my @files_list;
-    
-  my $filelist_node = getFirstChildElement($target_node, "FILELIST");
-  unless ($filelist_node) { die "Error: failed to find FILELIST node\n"; }
-
-  my @file_nodes;
-  getChildElementsOfType($doc, $filelist_node, "FILE", \@file_nodes);
-  
-  my $node;
-  foreach $node (@file_nodes)
-  {
-    my $file_name = getChildElementTextContents($node, "PATH");
-    push(@files_list, $file_name);
-  }
-  
-  return @files_list;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// FileIsInTarget
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub FileIsInTarget($$$)
-{
-  my($doc, $file_name, $target_name) = @_;
-
-  my $target_node = getTargetNode($doc, $target_name);
-  unless ($target_node) { die "Error: no target found called $target_name\n"; }
-
-  my $file_node = GetTargetFileNode($doc, $target_node, $file_name);
-  if ($file_node) {
-    return 1;
-  }
-  
-  return 0;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// GetFileTargetsList
-#// Return an array of the targets that a file is in (expensive)
-#//--------------------------------------------------------------------------------------------------
-sub GetFileTargetsList($$)
-{
-  my ($doc, $file_name) = @_;
-
-  my @target_list;
-
-  my @targets = GetTargetsList($doc);
-  my $target;
-  
-  foreach $target (@targets)
-  {
-    if (FileIsInTarget($doc, $file_name, $target))
-    {
-      push(@target_list, $target);
-    }
-  }
-  
-  return @target_list;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// GetTargetFileNode
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub GetTargetFileNode($$$)
-{
-  my($doc, $target_node, $file_name) = @_;
-
-  my $filelist_node = getFirstChildElement($target_node, "FILELIST");
-  unless ($filelist_node) { die "Error: failed to find FILELIST node\n"; }
-  
-  my $file_node = getChildNodeByGrandchildContents($doc, $filelist_node, "FILE", "PATH", $file_name);
-
-  return $file_node;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// GetFileInUse
-#// Return true if the file is used by any target
-#//--------------------------------------------------------------------------------------------------
-sub GetFileInUse($$)
-{
-  my($doc, $file_name) = @_;
-
-  my $targetlist_node = getChildOfDocument($doc, "TARGETLIST");
-
-  my $target_node = $targetlist_node->getFirstChild();
- 
-  while ($target_node)
-  {
-    if ($target_node->getNodeTypeName eq "ELEMENT_NODE" &&
-        $target_node->getTagName() eq "TARGET")
-    {
-      # if this is a target node
-      my $file_node = GetTargetFileNode($doc, $target_node, $file_name);
-      if ($file_node) {
-        return 1;   # found it
-      }      
-    }
-
-    $target_node = $target_node->getNextSibling();
-  }
-  
-  # not found
-  return 0;
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// getChildOfDocument
-#//--------------------------------------------------------------------------------------------------
-sub getChildOfDocument($$)
-{
-  my($doc, $child_type) = @_;
-
-  return getFirstChildElement($doc->getDocumentElement(), $child_type);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// getFirstChildElement
-#//--------------------------------------------------------------------------------------------------
-sub getFirstChildElement($$)
-{
-  my($node, $element_name) = @_;
-
-  my $found_node;
-  
-  unless ($node) { die "getFirstChildElement called with empty node\n"; }
-  
-  #look for the first "element_name" child
-
-  my $child_node = $node->getFirstChild();
- 
-  while ($child_node)
-  {
-    if ($child_node->getNodeTypeName eq "ELEMENT_NODE" &&
-        $child_node->getTagName() eq $element_name)
-    {
-      $found_node = $child_node;
-      last;
-    }
-
-    $child_node = $child_node->getNextSibling();
-  }
-   
-  return $found_node;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// getChildElementsOfType
-#// 
-#// Return an array of refs to child nodes of the given type
-#//--------------------------------------------------------------------------------------------------
-sub getChildElementsOfType($$$$)
-{
-  my($doc, $node, $child_type, $array_ref) = @_;
-
-  my $child_node = $node->getFirstChild();
- 
-  while ($child_node)
-  {
-    if ($child_node->getNodeTypeName eq "ELEMENT_NODE" &&
-        $child_node->getTagName() eq $child_type)
-    {
-      push(@$array_ref, $child_node);
-    }
-
-    $child_node = $child_node->getNextSibling();
-  }
-
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// getChildElementTextContents
-#//--------------------------------------------------------------------------------------------------
-#
-# Given <FOOPY><NERD>Hi!</NERD></FOOPY>, where $node is <FOOPY>,
-# returns "Hi!". If > 1 <NERD> node, returns the contents of the first.
-#
-sub getChildElementTextContents($$)
-{
-  my($node, $tag_name) = @_;
-
-  my $first_element = getFirstChildElement($node, $tag_name);  
-  my $text_node     = $first_element->getFirstChild();
-  
-  my $text_contents = "";
-  
-  # concat adjacent text nodes
-  while ($text_node)
-  {
-    if ($text_node->getNodeTypeName() ne "TEXT_NODE")
-    {
-      last;
-    }
-
-    $text_contents = $text_contents.$text_node->getData();
-    $text_node = $text_node->getNextSibling();
-  }
-
-  return $text_contents;
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// setChildElementTextContents
-#//--------------------------------------------------------------------------------------------------
-sub setChildElementTextContents($$$$)
-{
-  my($doc, $node, $tag_name, $contents_text) = @_;
-  
-  my $first_element = getFirstChildElement($node, $tag_name);  
-  my $new_text_node = $doc->createTextNode($contents_text);
-  
-  # replace all child elements with a text element
-  removeAllChildren($first_element);
-  
-  $first_element->appendChild($new_text_node);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// getChildNodeByContents
-#// 
-#// Consider <foo><bar><baz>Foopy</baz></bar><bar><baz>Loopy</baz></bar></foo>
-#// This function, when called with getChildNodeByContents($foonode, "bar", "baz", "Loopy")
-#// returns the second <bar> node.
-#//--------------------------------------------------------------------------------------------------
-sub getChildNodeByGrandchildContents($$$$$)
-{
-  my($doc, $node, $child_type, $gc_type, $gc_contents) = @_;    # gc = grandchild
-
-  my $found_node;
-  my $child_node = $node->getFirstChild();
-  while ($child_node)
-  {
-    if ($child_node->getNodeTypeName eq "ELEMENT_NODE" &&
-        $child_node->getTagName() eq $child_type)
-    {
-      # check for a child of this node of type 
-      my $child_contents = getChildElementTextContents($child_node, $gc_type);
-
-      if ($child_contents eq $gc_contents)
-      {
-        $found_node = $child_node;
-        last;
-      }
-    }
-
-    $child_node = $child_node->getNextSibling();
-  }
-
-  return $found_node;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// getTargetNode
-#//--------------------------------------------------------------------------------------------------
-sub getTargetNode($$)
-{
-  my($doc, $target_name) = @_;
-
-  my $targetlist_node = getChildOfDocument($doc, "TARGETLIST");
-  return getChildNodeByGrandchildContents($doc, $targetlist_node, "TARGET", "NAME", $target_name);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// getTargetNamedSettingNode
-#//--------------------------------------------------------------------------------------------------
-sub getTargetNamedSettingNode($$)
-{
-  my($target_node, $setting_name) = @_;
-
-  my $setting_node;
-
-  my $settinglist_node = getFirstChildElement($target_node, "SETTINGLIST");
-  my $child_node = $settinglist_node->getFirstChild();
- 
-  while ($child_node)
-  {
-    if ($child_node->getNodeTypeName ne "ELEMENT_NODE")
-    {
-      $child_node = $child_node->getNextSibling();
-      next;
-    }
-    
-    if ($child_node->getTagName() eq "SETTING")
-    {
-      my $set_name = getChildElementTextContents($child_node, "NAME");
-
-      if ($set_name eq $setting_name)
-      {
-        $setting_node = $child_node;
-        last;
-      }
-    }
-
-    $child_node = $child_node->getNextSibling();
-  }
-
-  return $setting_node;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// getTargetNodeSetting
-#//--------------------------------------------------------------------------------------------------
-sub getTargetNodeSetting($$)
-{
-  my($target_node, $setting_name) = @_;
-  
-  my $setting_node  = getTargetNamedSettingNode($target_node, $setting_name);
-  return getChildElementTextContents($setting_node, "VALUE");
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// setTargetNodeSetting
-#//--------------------------------------------------------------------------------------------------
-sub setTargetNodeSetting($$$$)
-{
-  my($doc, $target_node, $setting_name, $new_value) = @_;
-
-  my $setting_node  = getTargetNamedSettingNode($target_node, $setting_name);
-
-  setChildElementTextContents($doc, $setting_node, "VALUE", $new_value);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// elementInArray
-#//--------------------------------------------------------------------------------------------------
-sub elementInArray($$)
-{
-  my($element, $array) = @_;
-  my $test;
-  foreach $test (@$array)
-  {
-    if ($test eq $element) {
-      return 1;
-    }
-  }
-  return 0;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// removeAllChildren
-#//--------------------------------------------------------------------------------------------------
-sub removeAllChildren($)
-{
-  my($node) = @_;
-  
-  my $child_node = $node->getFirstChild();
-  
-  while ($child_node)
-  {
-    $node->removeChild($child_node);
-    $child_node = $node->getFirstChild();
-  }
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// dumpNodeData
-#//--------------------------------------------------------------------------------------------------
-sub dumpNodeData($)
-{
-  my($node) = @_;
-  
-  unless ($node) { die "Null node passed to dumpNodeData\n"; }
-  
-  print "Dumping node $node\n";
-  
-  my($node_type) = $node->getNodeTypeName();
-  
-  if ($node_type eq "ELEMENT_NODE")
-  {
-    my($node_name) = $node->getTagName();
-    print "Element $node_name\n";
-  }
-  elsif ($node_type eq "TEXT_NODE")
-  {
-    my($node_data) = $node->getData;
-    # my(@node_vals) = unpack("C*", $node_data);
-    print "Text '$node_data'\n";    # may contain LF chars
-  }
-  else
-  {
-    print "Node $node_type\n";
-  }
-
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// dumpNodeTree
-#//--------------------------------------------------------------------------------------------------
-sub dumpNodeTree($)
-{
-  my($node) = @_;
-  
-  my($child_node) = $node->getFirstChild();
-  
-  unless ($child_node) { return; }
-
-  # recurse
-  dumpNodeData($child_node);
-  
-  # then go through child nodes
-  while ($child_node)
-  {
-    dumpNodeTree($child_node);
-  
-    $child_node = $child_node->getNextSibling();
-  }
-}
-
-
-
-
-1;
-

mozilla/build/mac/build_scripts/MozillaBuildFlags.txt

@@ -1,90 +0,0 @@
-#-------------------------------------------------------------------------------
-# These 3 lists are the 'master lists' to control what gets built.
-# 
-# Ordering in these arrays is important; it has to reflect the order in
-# which the build occurs.
-#
-# Setting containing spaces must be quoted with double quotes.
-#-------------------------------------------------------------------------------
-
-build_flags
-all             1
-pull            0
-dist            0
-config          0
-xpidl           0
-idl             0
-stubs           0
-runtime         0
-common          0
-imglib          0
-libimg2         0
-necko           0
-security        0
-browserutils    0
-intl            0
-nglayout        0
-accessiblity    0
-editor          0
-embedding       0
-viewer          0
-xpapp           0
-extensions      0
-plugins         0
-mailnews        0
-apprunner       0
-resources       0
-
-options_flags
-pull_by_date    0
-chrome_jars     1
-chrome_files    0
-use_jars        1
-transformiix    1
-mathml          0      MOZ_MATHML
-svg             0      MOZ_SVG
-# svg requires libart, which is an lgpl library. You need to pull it 
-# explicitly.
-libart_lgpl     0
-mng             1
-ldap            1      MOZ_LDAP_XPCOM
-ldap_experimental 0    MOZ_LDAP_XPCOM_EXPERIMENTAL
-xmlextras       1
-wsp             0      MOZ_WSP
-inspector       1
-mailextras      1
-xptlink         0
-psm             0      MOZ_PSM
-embedding_test  1
-embedding_chrome 0
-embedding_xulprefs 0
-embedding_xulsecurity 0
-carbon          0      TARGET_CARBON
-useimg2         1      USE_IMG2
-lowmem          0      MOZ_MAC_LOWMEM
-accessible      1      ACCESSIBILITY
-bidi            1      IBMBIDI
-p3p             0
-jsd             1
-venkman         1
-moz_logging     1      MOZ_LOGGING
-chatzilla       1
-content_packs   1
-xml_rpc         1
-cview           1
-help            1
-timeline        0      MOZ_TIMELINE
-static_build    0      MOZ_STATIC_COMPONENT_LIBS
-string_debug    0      DEBUG_STRING
-string_stats    0      DEBUG_STRING_STATS
-xpctools        0      XPC_TOOLS_SUPPORT
-smime           1
-mdn             1
-print_preview   1      NS_PRINT_PREVIEW
-moz_xul         1      MOZ_XUL
-
-filepath_flags
-idepath             ":CodeWarrior IDE Path.txt"
-sessionpath         ":Mozilla session path.txt"
-buildlogfilepath    ":Build Logs:Mozilla build log.txt"   # this is a path
-scriptlogfilepath   ":Build Logs:Mozilla script log.txt"

mozilla/build/mac/build_scripts/MozillaCheckoutList.txt

@@ -1,22 +0,0 @@
-# List of modules to check out. Format is
-#   module, (tag), (date)
-# where tag and date are optional (non-trailing commas are required)
-#
-# Examples:
-#   mozilla/nsprpub, NSPRPUB_CLIENT_TAG
-#   mozilla/gc, , 10/25/2000 12:00:00
-#
-
-mozilla/nsprpub,        	NETSCAPE_7_0_RTM
-mozilla/security/nss,   	NETSCAPE_7_0_RTM
-mozilla/security/manager,	NETSCAPE_7_0_RTM
-mozilla/accessible,			NETSCAPE_7_0_RTM
-mozilla/directory/c-sdk,	NETSCAPE_7_0_RTM
-mozilla/lib/mac/Instrumentation, 	NETSCAPE_7_0_RTM
-mozilla/gfx2, 				NETSCAPE_7_0_RTM
-mozilla/modules/libpr0n,	NETSCAPE_7_0_RTM
-SeaMonkeyAll, 				NETSCAPE_7_0_RTM
-
-## You need this if you want to be able to use SVG
-## Note that this library is under the LGPL, not the MPL
-#mozilla/other-licenses/libart_lgpl

mozilla/build/mac/build_scripts/PullMozilla.pl

@@ -1,79 +0,0 @@
-#!perl
-
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#   Simon Fraser <sfraser@netscape.com>
-#
-
-require 5.004;
-
-use strict;
-
-use Cwd;
-use Moz::BuildUtils;
-use Moz::BuildCore;
-
-#-------------------------------------------------------------
-# Where have the build options gone?
-# 
-# The various build flags have been centralized into one place. 
-# The master list of options is in MozBuildFlags.txt. However, 
-# you should never need to edit that file, or this one.
-# 
-# To customize what gets built, or where to start the build, 
-# edit the $prefs_file_name file in
-# System Folder:Preferences:Mozilla build prefs:
-# Documentation is provided in that file.
-#-------------------------------------------------------------
-
-my($prefs_file_name) = "Mozilla pull prefs";
-
-#-------------------------------------------------------------
-# hashes to hold build options
-#-------------------------------------------------------------
-my(%build);
-my(%options);
-my(%filepaths);
-my(%optiondefines);
-
-# Hash of input files for this build. Eventually, there will be
-# input files for manifests, and projects too.
-my(%inputfiles) = (
-  "buildflags",     "MozillaBuildFlags.txt",
-  "checkoutdata",   "MozillaCheckoutList.txt",
-  "buildprogress",  "",
-  "buildmodule",    "MozillaBuildList.pm",
-  "checkouttime",   "Mozilla last checkout"
-);
-#-------------------------------------------------------------
-# end build hashes
-#-------------------------------------------------------------
-
-# set the build root directory, which is the the dir above mozilla
-SetupBuildRootDir(":mozilla:build:mac:build_scripts");
-
-# Set up all the flags on $main::, like DEBUG, CARBON etc.
-# Override the defaults using the preferences files.
-SetupDefaultBuildOptions(0, ":mozilla:dist:viewer:", "");
-
-my($do_checkout)    = 1;
-my($do_build)       = 0;
-
-RunBuild($do_checkout, $do_build, \%inputfiles, $prefs_file_name);

mozilla/client.mak

@@ -1,511 +0,0 @@
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=.
-
-!if !defined(MOZ_TOP)
-#enable builds from changed top level directories
-MOZ_TOP=mozilla
-!endif
-
-MOZ_SRC_FLIPPED = $(MOZ_SRC:\=/)
-MOZ_DIST_FLIPPED = $(MOZ_SRC_FLIPPED)/mozilla/dist
-!ifdef MOZ_DEBUG
-MOZ_OBJDIR = WIN32_D.OBJ
-!else
-MOZ_OBJDIR = WIN32_O.OBJ
-!endif
-
-#
-# Command macro defines
-#
-
-#//------------------------------------------------------------------------
-#// Figure out how to do the pull.
-#//------------------------------------------------------------------------
-# uncomment these, modify branch tag, and check in to branch for milestones
-MOZ_BRANCH=NETSCAPE_7_0_RTM
-NSPR_CO_TAG=NETSCAPE_7_0_RTM
-PSM_CO_TAG=NETSCAPE_7_0_RTM
-NSS_CO_TAG=NETSCAPE_7_0_RTM
-LDAPCSDK_CO_TAG=NETSCAPE_7_0_RTM
-ACCESSIBLE_CO_TAG=NETSCAPE_7_0_RTM
-IMGLIB2_CO_TAG=NETSCAPE_7_0_RTM
-GFX2_CO_TAG=NETSCAPE_7_0_RTM
-
-
-!ifdef MOZ_BRANCH
-CVS_BRANCH=-r $(MOZ_BRANCH)
-!endif
-
-!ifdef MOZ_DATE
-CVS_BRANCH=$(CVS_BRANCH) -D "$(MOZ_DATE)"
-!endif
-
-# default pull is "quiet" but it can be overridden with MOZ_CVS_VERBOSE
-!ifndef MOZ_CVS_VERBOSE
-CVS_FLAGS=-q
-!endif
-
-# honor any user-defined CVS flags
-!ifdef MOZ_CVS_FLAGS
-CVS_FLAGS=$(CVS_FLAGS) $(MOZ_CVS_FLAGS)
-!endif
-
-# let's be explicit about CVSROOT... some windows cvs clients
-# are too stupid to correctly work without the -d option 
-#
-#  if they are too stupid, they should fail.  I am
-#  commenting this out because this does not work
-#  under 4nt.  (%'s are evaluted differently)
-#
-#  If it breaks you, mail dougt@netscape.com
-#  and leaf@mozilla.org
-#
-!if 0
-!if defined(CVSROOT)
-CVS_FLAGS=$(CVS_FLAGS) -d "$(CVSROOT)"
-!endif
-!endif
-
-!ifndef MOZ_CO_FLAGS
-MOZ_CO_FLAGS = -P
-!endif
-
-CVSCO = cvs $(CVS_FLAGS) co $(MOZ_CO_FLAGS) $(CVS_BRANCH)
-
-#//------------------------------------------------------------------------
-#// Figure out how to pull NSPR.
-#// If no NSPR_CO_TAG is specified, use the default static tag
-#//------------------------------------------------------------------------
-
-!ifndef NSPR_CO_FLAGS
-NSPR_CO_FLAGS=$(MOZ_CO_FLAGS)
-!endif
-
-NSPR_CO_FLAGS=$(NSPR_CO_FLAGS) $(CVS_BRANCH)
-
-
-CVSCO_NSPR = cvs $(CVS_FLAGS) co $(NSPR_CO_FLAGS)
-
-#//------------------------------------------------------------------------
-#// Figure out how to pull NSS and PSM libs.
-#// If no NSS_CO_TAG or PSM_CO_TAG is specified, use the default static tag
-#//------------------------------------------------------------------------
-
-!ifndef NSS_CO_FLAGS
-NSS_CO_FLAGS=$(MOZ_CO_FLAGS)
-!endif
-
-NSS_CO_FLAGS=$(NSS_CO_FLAGS) $(CVS_BRANCH)
-
-CVSCO_NSS = cvs $(CVS_FLAGS) co $(NSS_CO_FLAGS)
-
-!ifndef PSM_CO_FLAGS
-PSM_CO_FLAGS=$(MOZ_CO_FLAGS)
-!endif
-
-PSM_CO_FLAGS=$(PSM_CO_FLAGS) $(CVS_BRANCH)
-
-CVSCO_PSM = cvs $(CVS_FLAGS) co $(PSM_CO_FLAGS)
-
-#//------------------------------------------------------------------------
-#// Figure out how to pull LDAP C SDK client libs.
-#// If no LDAPCSDK_CO_TAG is specified, use the default tag
-#//------------------------------------------------------------------------
-
-
-!ifndef LDAPCSDK_CO_FLAGS
-LDAPCSDK_CO_FLAGS=$(MOZ_CO_FLAGS)
-!endif
-
-LDAPCSDK_CO_FLAGS=$(LDAPCSDK_CO_FLAGS) $(CVS_BRANCH)
-
-CVSCO_LDAPCSDK = cvs $(CVS_FLAGS) co $(LDAPCSDK_CO_FLAGS)
-
-#//------------------------------------------------------------------------
-#// Figure out how to pull accessibility libs.
-#// If no ACCESSIBLE_CO_TAG is specified, use the default tag
-#//------------------------------------------------------------------------
-
-!ifndef ACCESSIBLE_CO_FLAGS
-ACCESSIBLE_CO_FLAGS=$(MOZ_CO_FLAGS)
-!endif
-
-ACCESSIBLE_CO_FLAGS=$(ACCESSIBLE_CO_FLAGS) $(CVS_BRANCH)
-
-CVSCO_ACCESSIBLE = cvs $(CVS_FLAGS) co $(ACCESSIBLE_CO_FLAGS)
-
-#//------------------------------------------------------------------------
-#// Figure out how to pull new image library.
-#// If no IMGLIB2_CO_TAG is specified, use the default tag
-#//------------------------------------------------------------------------
-
-!ifndef IMGLIB2_CO_FLAGS
-IMGLIB2_CO_FLAGS=$(MOZ_CO_FLAGS)
-!endif
-
-IMGLIB2_CO_FLAGS=$(IMGLIB2_CO_FLAGS) $(CVS_BRANCH)
-
-CVSCO_IMGLIB2 = cvs $(CVS_FLAGS) co $(IMGLIB2_CO_FLAGS)
-
-#//------------------------------------------------------------------------
-#// Figure out how to pull new image library.
-#// If no GFX2_CO_TAG is specified, use the default tag
-#//------------------------------------------------------------------------
-
-!ifndef GFX2_CO_FLAGS
-GFX2_CO_FLAGS=$(MOZ_CO_FLAGS)
-!endif
-
-GFX2_CO_FLAGS=$(GFX2_CO_FLAGS) $(CVS_BRANCH)
-
-CVSCO_GFX2 = cvs $(CVS_FLAGS) co $(GFX2_CO_FLAGS)
-
-#//------------------------------------------------------------------------
-#// Figure out how to pull the internal libart
-#// (only pulled and built if MOZ_INTERNAL_LIBART_LGPL is set)
-#// If no MOZ_INTERNAL_LIBART_CO_TAG is specified, use the default tag
-#//------------------------------------------------------------------------
-
-!if defined(MOZ_SVG) && !defined(MOZ_INTERNAL_LIBART_LGPL)
-ERR_MESSAGE = ^
-You are trying to build Mozilla with SVG support (MOZ_SVG=1), but you ^
-haven not specified that mozilla/other-licenses/libart_lgpl should be ^
-pulled and built. At the moment Mozilla SVG builds need this patched ^
-version of libart. You either need to disable SVG support (unset MOZ_SVG) ^
-or enable pulling and building by setting MOZ_INTERNAL_LIBART_LGPL=1.^
-^
-If you choose to pull and build libart, note that it is only licensed^
-under the terms of the LGPL, not the MPL. (Which is why you have to opt^
-in explicitly.)
-!endif
-
-!if defined(MOZ_INTERNAL_LIBART_LGPL)
-
-!ifndef MOZ_INTERNAL_LIBART_CO_FLAGS
-MOZ_INTERNAL_LIBART_CO_FLAGS=$(MOZ_CO_FLAGS)
-!endif
-
-!if "$(MOZ_INTERNAL_LIBART_CO_TAG)" != ""
-MOZ_INTERNAL_LIBART_CO_FLAGS=$(MOZ_INTERNAL_LIBART_CO_FLAGS) -r $(MOZ_INTERNAL_LIBART_CO_TAG)
-!else
-MOZ_INTERNAL_LIBART_CO_FLAGS=$(MOZ_INTERNAL_LIBART_CO_FLAGS) $(CVS_BRANCH)
-!endif
-
-CVSCO_MOZ_INTERNAL_LIBART = cvs $(CVS_FLAGS) co $(MOZ_INTERNAL_LIBART_CO_FLAGS)
-
-!endif
-
-## The master target
-############################################################
-
-pull_and_build_all: pull_all build_all_dep
-
-
-## Rules for pulling the source from the cvs repository
-############################################################
-
-pull_clobber_and_build_all: pull_all clobber_all build_all
-
-!if !defined(MOZ_INTERNAL_LIBART_LGPL)
-pull_all: pull_nspr pull_psm pull_ldapcsdk pull_accessible pull_gfx2 pull_imglib2 pull_seamonkey
-!else
-pull_all: pull_nspr pull_psm pull_ldapcsdk pull_accessible pull_gfx2 pull_imglib2 pull_moz_internal_libart pull_seamonkey
-!endif
-
-pull_nspr: pull_clientmak
-      cd $(MOZ_SRC)\.
-      $(CVSCO_NSPR) mozilla/nsprpub
-
-pull_nss:
-	cd $(MOZ_SRC)\.
-	$(CVSCO_NSS) mozilla/security/coreconf
-	$(CVSCO_NSS) mozilla/security/nss
-
-pull_psm: pull_nss
-	cd $(MOZ_SRC)\.
-	$(CVSCO_PSM) mozilla/security/manager
-	$(CVSCO_PSM) mozilla/security/makefile.win
-
-pull_ldapcsdk:
-	cd $(MOZ_SRC)\.
-	$(CVSCO_LDAPCSDK) mozilla/directory/c-sdk
-
-pull_accessible:
-	cd $(MOZ_SRC)\.
-	$(CVSCO_ACCESSIBLE) mozilla/accessible
-
-pull_gfx2:
-  cd $(MOZ_SRC)\.
-  $(CVSCO_GFX2) mozilla/gfx2
-
-pull_imglib2:
-  cd $(MOZ_SRC)\.
-  $(CVSCO_IMGLIB2) mozilla/modules/libpr0n
-
-!if defined(MOZ_INTERNAL_LIBART_LGPL)
-pull_moz_internal_libart:
-  cd $(MOZ_SRC)\.
-  $(CVSCO_MOZ_INTERNAL_LIBART) mozilla/other-licenses/libart_lgpl
-!endif
-
-pull_xpconnect: pull_nspr
-	cd $(MOZ_SRC)\.
-	$(CVSCO) mozilla/include
-	$(CVSCO) mozilla/config
-	$(CVSCO) -l mozilla/js
-	$(CVSCO) -l mozilla/js/src
-	$(CVSCO) mozilla/js/src/fdlibm
-	$(CVSCO) mozilla/js/src/xpconnect
-	$(CVSCO) mozilla/modules/libreg
-	$(CVSCO) mozilla/xpcom
-	$(CVSCO) mozilla/string
-
-# pull either layout only or seamonkey the browser
-pull_layout:
-	cd $(MOZ_SRC)\.
-	$(CVSCO) RaptorWin
-
-pull_seamonkey: pull_clientmak
-	cd $(MOZ_SRC)\.
-	$(CVSCO) SeaMonkeyAll
-
-pull_clientmak:
-    cd $(MOZ_SRC)\.
-    $(CVSCO) mozilla/client.mak
-
-############################################################
-
-# nmake has to be hardcoded, or we have to depend on mozilla/config
-# being pulled already to figure out what $(NMAKE) should be.
-
-clobber_all: clobber_nspr clobber_ldapcsdk clobber_psm clobber_seamonkey
-
-build_all: build_nspr build_ldapcsdk build_seamonkey
-
-build_all_dep: depend libs
-
-distclean: 
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\directory\c-sdk
-	gmake -f gmakefile.win distclean MOZ_SRC_FLIPPED=$(MOZ_SRC_FLIPPED)
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\nsprpub
-	gmake -f gmakefile.win distclean MOZ_SRC_FLIPPED=$(MOZ_SRC_FLIPPED)
-	@cd $(MOZ_SRC)\$(MOZ_TOP)
-	nmake /f client.mak clobber_psm
-	nmake /f client.mak clobber_seamonkey
-
-clobber_ldapcsdk:
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\directory\c-sdk
-	gmake -f gmakefile.win clobber_all MOZ_SRC_FLIPPED=$(MOZ_SRC_FLIPPED) \
-		SHELL=sh
-
-clobber_nspr: 
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\nsprpub
-	gmake -f gmakefile.win clobber_all MOZ_SRC_FLIPPED=$(MOZ_SRC_FLIPPED)
-
-clobber_psm:
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\security
-	nmake -f makefile.win clobber_all
-
-clobber_xpconnect:
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\.
-	-rd /s /q dist
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\nsprpub
-	gmake -f gmakefile.win clobber_all  MOZ_SRC_FLIPPED=$(MOZ_SRC_FLIPPED)
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\include
-	nmake -f makefile.win clobber_all
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\modules\libreg
-	nmake -f makefile.win clobber_all
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\string
-	nmake -f makefile.win clobber_all
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\xpcom
-	nmake -f makefile.win clobber_all
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\js
-	nmake -f makefile.win clobber_all
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\js\src\xpconnect
-	nmake -f makefile.win clobber_all
-
-clobber_seamonkey:
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\.
-	-rd /s /q dist
-	nmake -f makefile.win clobber_all 
-
-depend: export
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\.
-	nmake -f makefile.win depend 
-
-depend_xpconnect:
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\include
-	nmake -f makefile.win depend
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\modules\libreg
-	nmake -f makefile.win depend
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\string
-	nmake -f makefile.win depend
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\xpcom
-	nmake -f makefile.win depend
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\js\src
-	nmake -f makefile.win depend
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\js\src\xpconnect
-	nmake -f makefile.win depend
-
-build_nspr: 
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\nsprpub
-	gmake -f gmakefile.win MOZ_SRC_FLIPPED=$(MOZ_SRC_FLIPPED)
-
-build_ldapcsdk:
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\directory\c-sdk
-	gmake -f gmakefile.win MOZ_SRC_FLIPPED=$(MOZ_SRC_FLIPPED) SHELL=sh
-
-build_psm:
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\security
-	nmake -f makefile.win 
-
-build_xpconnect: build_nspr
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\include
-	nmake -f makefile.win all
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\modules\libreg
-	nmake -f makefile.win all
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\xpcom
-	nmake -f makefile.win export
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\string
-	nmake -f makefile.win all
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\xpcom
-	nmake -f makefile.win libs
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\js\src
-	nmake -f makefile.win all
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\js\src\xpconnect
-	nmake -f makefile.win all
-
-build_seamonkey:
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\.
-	nmake -f makefile.win all
-
-build_client:
-	@cd $(MOZ_SRC)\mozilla\.
-	nmake -f makefile.win all
-
-build_layout:
-	@cd $(MOZ_SRC)\mozilla\.
-	nmake -f makefile.win all
-
-build_dist:
-	@cd $(MOZ_SRC)\mozilla\.
-	nmake -f makefile.win all
-
-libs:
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\.
-	nmake -f makefile.win libs
-
-export: build_nspr build_ldapcsdk
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\.
-	nmake -f makefile.win export
-
-clobber_dist:
-	@cd $(MOZ_SRC)\mozilla\.
-	nmake -f makefile.win clobber_all
-
-clobber_client:
-	@cd $(MOZ_SRC)\mozilla\.
-	nmake -f makefile.win clobber_all
-
-clobber_layout:
-	@cd $(MOZ_SRC)\mozilla\.
-	nmake -f makefile.win clobber_all
-
-browse_info::
-	cd $(MOZ_SRC)\$(MOZ_TOP)
-	-dir /s /b *.sbr > sbrlist.tmp
-	-bscmake /Es /o mozilla.bsc @sbrlist.tmp
-	-rm sbrlist.tmp
-
-regchrome::
-	@cd $(MOZ_SRC)\mozilla\.
-	nmake /f makefile.win regchrome
-
-deliver::
-	@cd $(MOZ_SRC)\mozilla\.
-	nmake /f makefile.win splitsymbols
-
-#//------------------------------------------------------------------------
-#// Utility stuff...
-#//------------------------------------------------------------------------
-
-#//------------------------------------------------------------------------
-# Verify that MOZ_SRC is set correctly
-#//------------------------------------------------------------------------
-
-# Check to see if it is set at all
-!if "$(MOZ_SRC)"==""
-MOZ_SRC = $(MAKEDIR)\..
-!endif
-
-#
-# create a temp file at the root and make sure it is visible from MOZ_SRC
-#
-!if [copy $(MAKEDIR)\client.mak $(MAKEDIR)\xyzzy.tmp > NUL] == 0
-!endif
-
-!if !EXIST( $(MOZ_SRC)\mozilla\xyzzy.tmp )
-ERR_MESSAGE=$(ERR_MESSAGE)^
-MOZ_SRC isn't set correctly: [$(MOZ_SRC)\mozilla]!=[$(MAKEDIR)]
-!endif
-
-!if [del $(MAKEDIR)\xyzzy.tmp]
-!endif
-
-#//------------------------------------------------------------------------
-# Verify that MOZ_BITS is set
-#//------------------------------------------------------------------------
-!if !defined(MOZ_BITS)
-ERR_MESSAGE=$(ERR_MESSAGE)^
-Environment variable MOZ_BITS isn't set.
-!endif
-
-!if !defined(MOZ_TOOLS)
-ERR_MESSAGE=$(ERR_MESSAGE)^
-Environment variable MOZ_TOOLS isn't set.
-!endif
-
-
-#//------------------------------------------------------------------------
-#// Display error 
-#//------------------------------------------------------------------------
-
-!if "$(ERR_MESSAGE)" != ""
-ERR_MESSAGE = ^
-client.mak:  ^
-$(ERR_MESSAGE) ^
-^
-client.mak: usage^
-^
-nmake -f client.mak [MOZ_BRANCH=<cvs_branch_name>] ^
-		    [MOZ_DATE=<cvs_date>]^
-		    [pull_and_build_all]^
-		    [pull_all]^
-		    [build_all]^
-^
-Environment variables:^
-^
-MOZ_BITS    set to 32^
-MOZ_TOOLS   set to the directory containing the needed tools ^
-
-!ERROR $(ERR_MESSAGE)
-
-!endif

mozilla/client.mk

@@ -1,650 +0,0 @@
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): Stephen Lamm
-
-# Build the Mozilla client.
-#
-# This needs CVSROOT set to work, e.g.,
-#   setenv CVSROOT :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
-# or
-#   setenv CVSROOT :pserver:username%somedomain.org@cvs.mozilla.org:/cvsroot
-# 
-# To checkout and build a tree,
-#    1. cvs co mozilla/client.mk
-#    2. cd mozilla
-#    3. gmake -f client.mk
-#
-# Other targets (gmake -f client.mk [targets...]),
-#    checkout
-#    build
-#    clean (realclean is now the same as clean)
-#    distclean
-#
-# See http://www.mozilla.org/build/unix.html for more information.
-#
-# Options:
-#   MOZ_OBJDIR           - Destination object directory
-#   MOZ_CO_DATE          - Date tag to use for checkout (default: none)
-#   MOZ_CO_MODULE        - Module to checkout (default: SeaMonkeyAll)
-#   MOZ_CVS_FLAGS        - Flags to pass cvs (default: -q -z3)
-#   MOZ_CO_FLAGS         - Flags to pass after 'cvs co' (default: -P)
-#   MOZ_MAKE_FLAGS       - Flags to pass to $(MAKE)
-#   MOZ_CO_BRANCH        - Branch tag (Deprecated. Use MOZ_CO_TAG below.)
-#
-
-#######################################################################
-# Checkout Tags
-#
-# For branches, uncomment the MOZ_CO_TAG line with the proper tag,
-# and commit this file on that tag.
-MOZ_CO_TAG = NETSCAPE_7_0_RTM
-NSPR_CO_TAG = NETSCAPE_7_0_RTM
-PSM_CO_TAG = NETSCAPE_7_0_RTM
-NSS_CO_TAG = NETSCAPE_7_0_RTM
-LDAPCSDK_CO_TAG = NETSCAPE_7_0_RTM
-ACCESSIBLE_CO_TAG = NETSCAPE_7_0_RTM
-GFX2_CO_TAG = NETSCAPE_7_0_RTM
-IMGLIB2_CO_TAG = NETSCAPE_7_0_RTM
-BUILD_MODULES = all
-
-#######################################################################
-# Defines
-#
-CVS = cvs
-
-CWD := $(shell pwd)
-
-ifeq "$(CWD)" "/"
-CWD   := /.
-endif
-
-ifneq (, $(wildcard client.mk))
-# Ran from mozilla directory
-ROOTDIR   := $(shell dirname $(CWD))
-TOPSRCDIR := $(CWD)
-else
-# Ran from mozilla/.. directory (?)
-ROOTDIR   := $(CWD)
-TOPSRCDIR := $(CWD)/mozilla
-endif
-
-# on os2, TOPSRCDIR may have two forward slashes in a row, which doesn't
-#  work;  replace first instance with one forward slash
-TOPSRCDIR := $(shell echo "$(TOPSRCDIR)" | sed -e 's%//%/%')
-
-ifndef TOPSRCDIR_MOZ
-TOPSRCDIR_MOZ=$(TOPSRCDIR)
-endif
-
-# if ROOTDIR equals only drive letter (i.e. "C:"), set to "/"
-DIRNAME := $(shell echo "$(ROOTDIR)" | sed -e 's/^.://')
-ifeq ($(DIRNAME),)
-ROOTDIR := /.
-endif
-
-AUTOCONF := autoconf
-MKDIR := mkdir
-SH := /bin/sh
-ifndef MAKE
-MAKE := gmake
-endif
-
-CONFIG_GUESS_SCRIPT := $(wildcard $(TOPSRCDIR)/build/autoconf/config.guess)
-ifdef CONFIG_GUESS_SCRIPT
-  CONFIG_GUESS = $(shell $(CONFIG_GUESS_SCRIPT))
-else
-  _IS_FIRST_CHECKOUT := 1
-endif
-
-####################################
-# CVS
-
-# Add the CVS root to CVS_FLAGS if needed
-CVS_ROOT_IN_TREE := $(shell cat $(TOPSRCDIR)/CVS/Root 2>/dev/null)
-ifneq ($(CVS_ROOT_IN_TREE),)
-ifneq ($(CVS_ROOT_IN_TREE),$(CVSROOT))
-  CVS_FLAGS := -d $(CVS_ROOT_IN_TREE)
-endif
-endif
-
-CVSCO = $(strip $(CVS) $(CVS_FLAGS) co $(CVS_CO_FLAGS))
-CVSCO_LOGFILE := $(ROOTDIR)/cvsco.log
-CVSCO_LOGFILE := $(shell echo $(CVSCO_LOGFILE) | sed s%//%/%)
-
-ifdef MOZ_CO_TAG
-  CVS_CO_FLAGS := -r $(MOZ_CO_TAG)
-endif
-
-####################################
-# Load mozconfig Options
-
-# See build pages, http://www.mozilla.org/build/unix.html, 
-# for how to set up mozconfig.
-MOZCONFIG_LOADER := mozilla/build/autoconf/mozconfig2client-mk
-MOZCONFIG_FINDER := mozilla/build/autoconf/mozconfig-find 
-MOZCONFIG_MODULES := mozilla/build/unix/modules.mk
-run_for_side_effects := \
-  $(shell cd $(ROOTDIR); \
-     if test "$(_IS_FIRST_CHECKOUT)"; then \
-        $(CVSCO) $(MOZCONFIG_FINDER) $(MOZCONFIG_LOADER) $(MOZCONFIG_MODULES); \
-     else true; \
-     fi; \
-     $(MOZCONFIG_LOADER) $(TOPSRCDIR) mozilla/.mozconfig.mk > mozilla/.mozconfig.out)
-include $(TOPSRCDIR)/.mozconfig.mk
-include $(TOPSRCDIR)/build/unix/modules.mk
-
-####################################
-# Options that may come from mozconfig
-
-# Change CVS flags if anonymous root is requested
-ifdef MOZ_CO_USE_MIRROR
-  CVS_FLAGS := -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
-endif
-
-# MOZ_CVS_FLAGS - Basic CVS flags
-ifeq "$(origin MOZ_CVS_FLAGS)" "undefined"
-  CVS_FLAGS := $(CVS_FLAGS) -q -z 3 
-else
-  CVS_FLAGS := $(MOZ_CVS_FLAGS)
-endif
-
-# This option is deprecated. The best way to have client.mk pull a tag
-# is to set MOZ_CO_TAG (see above) and commit that change on the tag.
-ifdef MOZ_CO_BRANCH
-  $(warning Use MOZ_CO_TAG instead of MOZ_CO_BRANCH)
-  CVS_CO_FLAGS := -r $(MOZ_CO_BRANCH)
-endif
-
-# MOZ_CO_FLAGS - Anything that we should use on all checkouts
-ifeq "$(origin MOZ_CO_FLAGS)" "undefined"
-  CVS_CO_FLAGS := $(CVS_CO_FLAGS) -P
-else
-  CVS_CO_FLAGS := $(CVS_CO_FLAGS) $(MOZ_CO_FLAGS)
-endif
-
-ifdef MOZ_CO_DATE
-  CVS_CO_DATE_FLAGS := -D "$(MOZ_CO_DATE)"
-endif
-
-ifdef MOZ_OBJDIR
-  OBJDIR := $(MOZ_OBJDIR)
-  MOZ_MAKE := $(MAKE) $(MOZ_MAKE_FLAGS) -C $(OBJDIR)
-else
-  OBJDIR := $(TOPSRCDIR)
-  MOZ_MAKE := $(MAKE) $(MOZ_MAKE_FLAGS)
-endif
-
-####################################
-# CVS defines for PSM
-#
-PSM_CO_MODULE= mozilla/security/manager
-PSM_CO_FLAGS := -P -A
-ifdef MOZ_CO_FLAGS
-  PSM_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-ifdef PSM_CO_TAG
-  PSM_CO_FLAGS := $(PSM_CO_FLAGS) -r $(PSM_CO_TAG)
-endif
-CVSCO_PSM = $(CVS) $(CVS_FLAGS) co $(PSM_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(PSM_CO_MODULE)
-
-####################################
-# CVS defines for NSS
-#
-NSS_CO_MODULE = mozilla/security/nss \
-		mozilla/security/coreconf \
-		$(NULL)
-
-NSS_CO_FLAGS := -P
-ifdef MOZ_CO_FLAGS
-  NSS_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-ifdef NSS_CO_TAG
-   NSS_CO_FLAGS := $(NSS_CO_FLAGS) -r $(NSS_CO_TAG)
-endif
-# Cannot pull static tags by date
-ifeq ($(NSS_CO_TAG),NSS_CLIENT_TAG)
-CVSCO_NSS = $(CVS) $(CVS_FLAGS) co $(NSS_CO_FLAGS) $(NSS_CO_MODULE)
-else
-CVSCO_NSS = $(CVS) $(CVS_FLAGS) co $(NSS_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(NSS_CO_MODULE)
-endif
-
-####################################
-# CVS defines for NSPR
-#
-NSPR_CO_MODULE = mozilla/nsprpub
-NSPR_CO_FLAGS := -P
-ifdef MOZ_CO_FLAGS
-  NSPR_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-ifdef NSPR_CO_TAG
-  NSPR_CO_FLAGS := $(NSPR_CO_FLAGS) -r $(NSPR_CO_TAG)
-endif
-# Cannot pull static tags by date
-ifeq ($(NSPR_CO_TAG),NSPRPUB_CLIENT_TAG)
-CVSCO_NSPR = $(CVS) $(CVS_FLAGS) co $(NSPR_CO_FLAGS) $(NSPR_CO_MODULE)
-else
-CVSCO_NSPR = $(CVS) $(CVS_FLAGS) co $(NSPR_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(NSPR_CO_MODULE)
-endif
-
-####################################
-# CVS defines for the C LDAP SDK
-#
-LDAPCSDK_CO_MODULE = mozilla/directory/c-sdk
-LDAPCSDK_CO_FLAGS := -P
-ifdef MOZ_CO_FLAGS
-  LDAPCSDK_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-ifdef LDAPCSDK_CO_TAG
-  LDAPCSDK_CO_FLAGS := $(LDAPCSDK_CO_FLAGS) -r $(LDAPCSDK_CO_TAG)
-endif
-CVSCO_LDAPCSDK = $(CVS) $(CVS_FLAGS) co $(LDAPCSDK_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(LDAPCSDK_CO_MODULE)
-
-####################################
-# CVS defines for the C LDAP SDK
-#
-ACCESSIBLE_CO_MODULE = mozilla/accessible
-ACCESSIBLE_CO_FLAGS := -P
-ifdef MOZ_CO_FLAGS
-  ACCESSIBLE_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-ifdef ACCESSIBLE_CO_TAG
-  ACCESSIBLE_CO_FLAGS := $(ACCESSIBLE_CO_FLAGS) -r $(ACCESSIBLE_CO_TAG)
-endif
-CVSCO_ACCESSIBLE = $(CVS) $(CVS_FLAGS) co $(ACCESSIBLE_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(ACCESSIBLE_CO_MODULE)
-
-####################################
-# CVS defines for gfx2
-#
-GFX2_CO_MODULE = mozilla/gfx2
-GFX2_CO_FLAGS := -P
-ifdef MOZ_CO_FLAGS
-  GFX2_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-ifdef GFX2_CO_TAG
-  GFX2_CO_FLAGS := $(GFX2_CO_FLAGS) -r $(GFX2_CO_TAG)
-endif
-CVSCO_GFX2 = $(CVS) $(CVS_FLAGS) co $(GFX2_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(GFX2_CO_MODULE)
-
-####################################
-# CVS defines for new image library
-#
-IMGLIB2_CO_MODULE = mozilla/modules/libpr0n
-IMGLIB2_CO_FLAGS := -P
-ifdef MOZ_CO_FLAGS
-  IMGLIB2_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-ifdef IMGLIB2_CO_TAG
-  IMGLIB2_CO_FLAGS := $(IMGLIB2_CO_FLAGS) -r $(IMGLIB2_CO_TAG)
-endif
-CVSCO_IMGLIB2 = $(CVS) $(CVS_FLAGS) co $(IMGLIB2_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(IMGLIB2_CO_MODULE)
-
-####################################
-# CVS defines for standalone modules
-#
-ifneq ($(BUILD_MODULES),all)
-  MOZ_CO_MODULE := $(filter-out $(NSPRPUB_DIR) security directory/c-sdk, $(BUILD_MODULE_CVS))
-  MOZ_CO_MODULE += allmakefiles.sh client.mk aclocal.m4 configure configure.in
-  MOZ_CO_MODULE += Makefile.in
-  MOZ_CO_MODULE := $(addprefix mozilla/, $(MOZ_CO_MODULE))
-
-  NOSUBDIRS_MODULE := $(addprefix mozilla/, $(BUILD_MODULE_CVS_NS))
-ifneq ($(NOSUBDIRS_MODULE),)
-  CVSCO_NOSUBDIRS := $(CVSCO) -l $(CVS_CO_DATE_FLAGS) $(NOSUBDIRS_MODULE)
-endif
-
-ifeq (,$(filter $(NSPRPUB_DIR), $(BUILD_MODULE_CVS)))
-  CVSCO_NSPR :=
-endif
-ifeq (,$(filter security security/manager, $(BUILD_MODULE_CVS)))
-  CVSCO_PSM :=
-  CVSCO_NSS :=
-endif
-ifeq (,$(filter directory/c-sdk, $(BUILD_MODULE_CVS)))
-  CVSCO_LDAPCSDK :=
-endif
-ifeq (,$(filter accessible, $(BUILD_MODULE_CVS)))
-  CVSCO_ACCESSIBLE :=
-endif
-ifeq (,$(filter gfx2, $(BUILD_MODULE_CVS)))
-  CVSCO_GFX2 :=
-endif
-ifeq (,$(filter modules/libpr0n, $(BUILD_MODULE_CVS)))
-  CVSCO_IMGLIB2 :=
-endif
-endif
-
-####################################
-# CVS defines for SeaMonkey
-#
-ifeq ($(MOZ_CO_MODULE),)
-  MOZ_CO_MODULE := SeaMonkeyAll
-endif
-CVSCO_SEAMONKEY := $(CVSCO) $(CVS_CO_DATE_FLAGS) $(MOZ_CO_MODULE)
-
-####################################
-# CVS defined for libart (pulled and built if MOZ_INTERNAL_LIBART_LGPL is set)
-#
-CVSCO_LIBART := $(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/other-licenses/libart_lgpl
-
-ifdef MOZ_INTERNAL_LIBART_LGPL
-FASTUPDATE_LIBART := fast_update $(CVSCO_LIBART)
-CHECKOUT_LIBART := cvs_co $(CVSCO_LIBART)
-else
-CHECKOUT_LIBART := true
-FASTUPDATE_LIBART := true
-endif
-
-####################################
-# CVS defines for Calendar (pulled and built if MOZ_CALENDAR is set)
-#
-CVSCO_CALENDAR := $(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/calendar
-
-ifdef MOZ_CALENDAR
-FASTUPDATE_CALENDAR := fast_update $(CVSCO_CALENDAR)
-CHECKOUT_CALENDAR := cvs_co $(CVSCO_CALENDAR)
-else
-CHECKOUT_CALENDAR := true
-FASTUPDATE_CALENDAR := true
-endif
-
-
-# because some cygwin tools can't handle native dos-drive paths & vice-versa
-# force configure to use a relative path for --srcdir
-# need a better check for win32
-# and we need to get OBJDIR earlier
-ifdef MOZ_TOOLS
-_tmpobjdir := $(shell cygpath -u $(OBJDIR))
-_abs2rel := $(shell cygpath -w $(TOPSRCDIR)/build/unix/abs2rel.pl | sed -e 's|\\|/|g')
-_OBJ2SRCPATH := $(shell $(_abs2rel) $(TOPSRCDIR) $(_tmpobjdir))
-endif 
-
-#######################################################################
-# Rules
-# 
-
-# Print out any options loaded from mozconfig.
-all build checkout clean depend distclean export libs install realclean::
-	@if test -f .mozconfig.out; then \
-	  cat .mozconfig.out; \
-	  rm -f .mozconfig.out; \
-	else true; \
-	fi
-
-ifdef _IS_FIRST_CHECKOUT
-all:: checkout build
-else
-all:: checkout alldep
-endif
-
-# Windows equivalents
-pull_all: checkout
-build_all: build
-build_all_dep: alldep
-build_all_depend: alldep
-clobber clobber_all: clean
-pull_and_build_all: checkout alldep
-
-# Do everything from scratch
-everything: checkout clean build
-
-####################################
-# CVS checkout
-#
-checkout::
-#	@: Backup the last checkout log.
-	@if test -f $(CVSCO_LOGFILE) ; then \
-	  mv $(CVSCO_LOGFILE) $(CVSCO_LOGFILE).old; \
-	else true; \
-	fi
-ifdef RUN_AUTOCONF_LOCALLY
-	@echo "Removing local configures" ; \
-	cd $(ROOTDIR) && \
-	$(RM) -f mozilla/configure mozilla/nsprpub/configure \
-		mozilla/directory/c-sdk/configure
-endif
-	@echo "checkout start: "`date` | tee $(CVSCO_LOGFILE)
-	@echo '$(CVSCO) mozilla/client.mk mozilla/build/unix/modules.mk'; \
-        cd $(ROOTDIR) && \
-	$(CVSCO) mozilla/client.mk mozilla/build/unix/modules.mk
-	@cd $(ROOTDIR) && $(MAKE) -f mozilla/client.mk real_checkout
-
-real_checkout:
-#	@: Start the checkout. Split the output to the tty and a log file. \
-#	 : If it fails, touch an error file because "tee" hides the error.
-	@failed=.cvs-failed.tmp; rm -f $$failed*; \
-	cvs_co() { echo "$$@" ; \
-	  ("$$@" || touch $$failed) 2>&1 | tee -a $(CVSCO_LOGFILE) && \
-	  if test -f $$failed; then false; else true; fi; }; \
-	cvs_co $(CVSCO_NSPR) && \
-	cvs_co $(CVSCO_NSS) && \
-	cvs_co $(CVSCO_PSM) && \
-        cvs_co $(CVSCO_LDAPCSDK) && \
-        cvs_co $(CVSCO_ACCESSIBLE) && \
-        cvs_co $(CVSCO_GFX2) && \
-        cvs_co $(CVSCO_IMGLIB2) && \
-	$(CHECKOUT_CALENDAR) && \
-	$(CHECKOUT_LIBART) && \
-	cvs_co $(CVSCO_SEAMONKEY) && \
-	cvs_co $(CVSCO_NOSUBDIRS)
-	@echo "checkout finish: "`date` | tee -a $(CVSCO_LOGFILE)
-#	@: Check the log for conflicts. ;
-	@conflicts=`egrep "^C " $(CVSCO_LOGFILE)` ;\
-	if test "$$conflicts" ; then \
-	  echo "$(MAKE): *** Conflicts during checkout." ;\
-	  echo "$$conflicts" ;\
-	  echo "$(MAKE): Refer to $(CVSCO_LOGFILE) for full log." ;\
-	  false; \
-	else true; \
-	fi
-ifdef RUN_AUTOCONF_LOCALLY
-	@echo Generating configures using $(AUTOCONF) ; \
-	cd $(TOPSRCDIR) && $(AUTOCONF) && \
-	cd $(TOPSRCDIR)/nsprpub && $(AUTOCONF) && \
-	cd $(TOPSRCDIR)/directory/c-sdk && $(AUTOCONF)
-endif
-
-fast-update:
-#	@: Backup the last checkout log.
-	@if test -f $(CVSCO_LOGFILE) ; then \
-	  mv $(CVSCO_LOGFILE) $(CVSCO_LOGFILE).old; \
-	else true; \
-	fi
-ifdef RUN_AUTOCONF_LOCALLY
-	@echo "Removing local configures" ; \
-	cd $(ROOTDIR) && \
-	$(RM) -f mozilla/configure mozilla/nsprpub/configure \
-		mozilla/directory/c-sdk/configure
-endif
-	@echo "checkout start: "`date` | tee $(CVSCO_LOGFILE)
-	@echo '$(CVSCO) mozilla/client.mk mozilla/build/unix/modules.mk'; \
-        cd $(ROOTDIR) && \
-	$(CVSCO) mozilla/client.mk mozilla/build/unix/modules.mk
-	@cd $(TOPSRCDIR) && \
-	$(MAKE) -f client.mk real_fast-update
-
-real_fast-update:
-#	@: Start the update. Split the output to the tty and a log file. \
-#	 : If it fails, touch an error file because "tee" hides the error.
-	@failed=.fast_update-failed.tmp; rm -f $$failed*; \
-	fast_update() { (config/cvsco-fast-update.pl $$@ || touch $$failed) 2>&1 | tee -a $(CVSCO_LOGFILE) && \
-	  if test -f $$failed; then false; else true; fi; }; \
-	cvs_co() { echo "$$@" ; \
-	  ("$$@" || touch $$failed) 2>&1 | tee -a $(CVSCO_LOGFILE) && \
-	  if test -f $$failed; then false; else true; fi; }; \
-	fast_update $(CVSCO_NSPR) && \
-	cd $(ROOTDIR) && \
-	failed=mozilla/.fast_update-failed.tmp && \
-	cvs_co $(CVSCO_NSS) && \
-	failed=.fast_update-failed.tmp && \
-	cd mozilla && \
-	fast_update $(CVSCO_PSM) && \
-	fast_update $(CVSCO_LDAPCSDK) && \
-	fast_update $(CVSCO_ACCESSIBLE) && \
-	fast_update $(CVSCO_GFX2) && \
-	fast_update $(CVSCO_IMGLIB2) && \
-	$(FASTUPDATE_CALENDAR) && \
-	$(FASTUPDATE_LIBART) && \
-	fast_update $(CVSCO_SEAMONKEY) && \
-	fast_update $(CVSCO_NOSUBDIRS)
-	@echo "fast_update finish: "`date` | tee -a $(CVSCO_LOGFILE)
-#	@: Check the log for conflicts. ;
-	@conflicts=`egrep "^C " $(CVSCO_LOGFILE)` ;\
-	if test "$$conflicts" ; then \
-	  echo "$(MAKE): *** Conflicts during fast-update." ;\
-	  echo "$$conflicts" ;\
-	  echo "$(MAKE): Refer to $(CVSCO_LOGFILE) for full log." ;\
-	  false; \
-	else true; \
-	fi
-ifdef RUN_AUTOCONF_LOCALLY
-	@echo Generating configures using $(AUTOCONF) ; \
-	cd $(TOPSRCDIR) && $(AUTOCONF) && \
-	cd $(TOPSRCDIR)/nsprpub && $(AUTOCONF) && \
-	cd $(TOPSRCDIR)/directory/c-sdk && $(AUTOCONF)
-endif
-
-####################################
-# Web configure
-
-WEBCONFIG_FILE  := $(HOME)/.mozconfig
-
-MOZCONFIG2CONFIGURATOR := build/autoconf/mozconfig2configurator
-webconfig:
-	@cd $(TOPSRCDIR); \
-	url=`$(MOZCONFIG2CONFIGURATOR) $(TOPSRCDIR)`; \
-	echo Running mozilla with the following url: ;\
-	echo ;\
-	echo $$url ;\
-	mozilla -remote "openURL($$url)" || \
-	netscape -remote "openURL($$url)" || \
-	mozilla $$url || \
-	netscape $$url ;\
-	echo ;\
-	echo   1. Fill out the form on the browser. ;\
-	echo   2. Save the results to $(WEBCONFIG_FILE)
-
-#####################################################
-# First Checkout
-
-ifdef _IS_FIRST_CHECKOUT
-# First time, do build target in a new process to pick up new files.
-build::
-	$(MAKE) -f $(TOPSRCDIR)/client.mk build
-else
-
-#####################################################
-# After First Checkout
-
-
-####################################
-# Configure
-
-CONFIG_STATUS := $(wildcard $(OBJDIR)/config.status)
-CONFIG_CACHE  := $(wildcard $(OBJDIR)/config.cache)
-
-ifdef RUN_AUTOCONF_LOCALLY
-EXTRA_CONFIG_DEPS := \
-	$(TOPSRCDIR)/aclocal.m4 \
-	$(wildcard $(TOPSRCDIR)/build/autoconf/*.m4) \
-	$(NULL)
-
-$(TOPSRCDIR)/configure: $(TOPSRCDIR)/configure.in $(EXTRA_CONFIG_DEPS)
-	@echo Generating $@ using autoconf
-	cd $(TOPSRCDIR); $(AUTOCONF)
-endif
-
-CONFIG_STATUS_DEPS_L10N := $(wildcard $(TOPSRCDIR)/l10n/makefiles.all)
-
-CONFIG_STATUS_DEPS := \
-	$(TOPSRCDIR)/configure \
-	$(TOPSRCDIR)/allmakefiles.sh \
-	$(TOPSRCDIR)/.mozconfig.mk \
-	$(wildcard $(TOPSRCDIR)/nsprpub/configure) \
-	$(wildcard $(TOPSRCDIR)/directory/c-sdk/configure) \
-	$(wildcard $(TOPSRCDIR)/mailnews/makefiles) \
-	$(CONFIG_STATUS_DEPS_L10N) \
-	$(wildcard $(TOPSRCDIR)/themes/makefiles) \
-	$(NULL)
-
-# configure uses the program name to determine @srcdir@. Calling it without
-#   $(TOPSRCDIR) will set @srcdir@ to "."; otherwise, it is set to the full
-#   path of $(TOPSRCDIR).
-ifeq ($(TOPSRCDIR),$(OBJDIR))
-  CONFIGURE := ./configure
-else
-  CONFIGURE := $(TOPSRCDIR)/configure
-endif
-
-ifdef _OBJ2SRCPATH
-CONFIGURE_ARGS := --srcdir=$(_OBJ2SRCPATH) $(CONFIGURE_ARGS)
-endif
-
-$(OBJDIR)/Makefile $(OBJDIR)/config.status: $(CONFIG_STATUS_DEPS)
-	@if test ! -d $(OBJDIR); then $(MKDIR) $(OBJDIR); else true; fi
-	@echo cd $(OBJDIR);
-	@echo $(CONFIGURE) $(CONFIGURE_ARGS)
-	@cd $(OBJDIR) && $(CONFIGURE_ENV_ARGS) $(CONFIGURE) $(CONFIGURE_ARGS) \
-	  || ( echo "*** Fix above errors and then restart with\
-               \"$(MAKE) -f client.mk build\"" && exit 1 )
-	@touch $(OBJDIR)/Makefile
-
-ifdef CONFIG_STATUS
-$(OBJDIR)/config/autoconf.mk: $(TOPSRCDIR)/config/autoconf.mk.in
-	cd $(OBJDIR); \
-	  CONFIG_FILES=config/autoconf.mk ./config.status
-endif
-
-
-####################################
-# Depend
-
-depend:: $(OBJDIR)/Makefile $(OBJDIR)/config.status
-	$(MOZ_MAKE) export && $(MOZ_MAKE) depend
-
-####################################
-# Build it
-
-build::  $(OBJDIR)/Makefile $(OBJDIR)/config.status
-	$(MOZ_MAKE)
-
-####################################
-# Other targets
-
-# Pass these target onto the real build system
-install export libs clean realclean distclean alldep:: $(OBJDIR)/Makefile $(OBJDIR)/config.status
-	$(MOZ_MAKE) $@
-
-cleansrcdir:
-	@cd $(TOPSRCDIR); \
-        if [ -f webshell/embed/gtk/Makefile ]; then \
-          $(MAKE) -C webshell/embed/gtk distclean; \
-        fi; \
-	if [ -f Makefile ]; then \
-	  $(MAKE) distclean ; \
-	else \
-	  echo "Removing object files from srcdir..."; \
-	  rm -fr `find . -type d \( -name .deps -print -o -name CVS \
-	          -o -exec test ! -d {}/CVS \; \) -prune \
-	          -o \( -name '*.[ao]' -o -name '*.so' \) -type f -print`; \
-	   build/autoconf/clean-config.sh; \
-	fi;
-
-# (! IS_FIRST_CHECKOUT)
-endif
-
-.PHONY: checkout real_checkout depend build export libs alldep install clean realclean distclean cleansrcdir pull_all build_all clobber clobber_all pull_and_build_all everything

mozilla/mailnews/mapi/makefile.win

@@ -0,0 +1,28 @@
+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s): 
+# Srilatha Moturi <srilatha@netscape.com>
+# Krishna Mohan Khandrika <kkhandrika@netscape.com>
+#
+
+DEPTH=..\..
+
+DIRS=mapihook resources mapiDll
+
+include <$(DEPTH)\config\rules.mak>

mozilla/mailnews/mapi/mapiDll/Mapi32.DEF

@@ -0,0 +1,54 @@
+; ***** BEGIN LICENSE BLOCK *****
+; Version: MPL 1.1/GPL 2.0/LGPL 2.1
+;
+; The contents of this file are subject to the Mozilla Public License Version
+; 1.1 (the "License"); you may not use this file except in compliance with
+; the License. You may obtain a copy of the License at
+; http://www.mozilla.org/MPL/
+;
+; Software distributed under the License is distributed on an "AS IS" basis,
+; WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+; for the specific language governing rights and limitations under the
+; License.
+;
+; The Original Code is Mozilla.
+;
+; The Initial Developer of the Original Code is
+; Netscape Communications Corp.
+; Portions created by the Initial Developer are Copyright (C) 2001
+; the Initial Developer. All Rights Reserved.
+;
+; Contributor(s):  Krishna Mohan Khandrika (kkhandrika@netscape.com)
+;
+; Alternatively, the contents of this file may be used under the terms of
+; either the GNU General Public License Version 2 or later (the "GPL"), or
+; the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+; in which case the provisions of the GPL or the LGPL are applicable instead
+; of those above. If you wish to allow use of your version of this file only
+; under the terms of either the GPL or the LGPL, and not to allow others to
+; use your version of this file under the terms of the MPL, indicate your
+; decision by deleting the provisions above and replace them with the notice
+; and other provisions required by the GPL or the LGPL. If you do not delete
+; the provisions above, a recipient may use your version of this file under
+; the terms of any one of the MPL, the GPL or the LGPL.
+;
+; ***** END LICENSE BLOCK ***** 
+
+LIBRARY         mozMapi32.dll
+DESCRIPTION     'Mozilla Simple MAPI Support'
+
+EXPORTS
+        MAPILogon
+        MAPILogoff
+	MAPISendMail
+	MAPISendDocuments
+        MAPIFindNext
+        MAPIReadMail
+        MAPISaveMail
+        MAPIDeleteMail
+        MAPIAddress
+        MAPIDetails
+        MAPIResolveName
+        MAPIFreeBuffer
+        GetMapiDllVersion
+

mozilla/mailnews/mapi/mapiDll/MapiDll.cpp

@@ -0,0 +1,335 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ * Contributor(s): Rajiv Dayal (rdayal@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include <windows.h>
+#include <tchar.h>
+#include <assert.h>
+#include <mapidefs.h>
+#include <mapi.h>
+#include "msgMapi.h"
+#include "msgMapiMain.h"
+
+#define MAX_RECIPS  100
+#define MAX_FILES   100
+
+const CLSID CLSID_nsMapiImp = {0x29f458be, 0x8866, 0x11d5,
+                              {0xa3, 0xdd, 0x0, 0xb0, 0xd0, 0xf3, 0xba, 0xa7}};
+const IID IID_nsIMapi = {0x6EDCD38E,0x8861,0x11d5,
+                        {0xA3,0xDD,0x00,0xB0,0xD0,0xF3,0xBA,0xA7}};
+
+DWORD tId = 0;
+
+BOOL WINAPI DllMain(HINSTANCE aInstance, DWORD aReason, LPVOID aReserved)
+{
+    switch (aReason)
+    {
+        case DLL_PROCESS_ATTACH : tId = TlsAlloc();
+                                  if (tId == 0xFFFFFFFF)
+                                      return FALSE;
+                                  break;
+
+        case DLL_PROCESS_DETACH : TlsFree(tId);
+                                  break;
+    }
+    return TRUE;
+}
+
+BOOL InitMozillaReference(nsIMapi **aRetValue)
+{
+    // Check wehther this thread has a valid Interface
+    // by looking into thread-specific-data variable
+
+    *aRetValue = (nsIMapi *)TlsGetValue(tId);
+
+    // Check whether the pointer actually resolves to
+    // a valid method call; otherwise mozilla is not running
+
+    if ((*aRetValue) && (*aRetValue)->IsValid() == S_OK)
+         return TRUE;
+
+    HRESULT hRes = CoInitialize(NULL);
+
+    hRes = ::CoCreateInstance(CLSID_nsMapiImp, NULL, CLSCTX_LOCAL_SERVER,
+                                         IID_nsIMapi, (LPVOID *)aRetValue);
+
+    if (hRes == S_OK && (*aRetValue)->Initialize() == S_OK)
+        if (TlsSetValue(tId, (LPVOID)(*aRetValue)))
+            return TRUE;
+
+    // Either CoCreate or TlsSetValue failed; so return FALSE
+
+    if ((*aRetValue))
+        (*aRetValue)->Release();
+
+            ::CoUninitialize();
+    return FALSE;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////
+// The MAPILogon function begins a Simple MAPI session, loading the default message ////
+// store and address book providers                            ////
+////////////////////////////////////////////////////////////////////////////////////////
+
+ULONG FAR PASCAL MAPILogon(ULONG aUIParam, LPTSTR aProfileName,
+                            LPTSTR aPassword, FLAGS aFlags,
+                            ULONG aReserved, LPLHANDLE aSession)
+{
+    HRESULT hr = 0;
+    ULONG nSessionId = 0;
+    nsIMapi *pNsMapi = NULL;
+
+    if (!InitMozillaReference(&pNsMapi))
+        return MAPI_E_FAILURE;
+
+    if (!(aFlags & MAPI_UNICODE))
+    {
+        // Need to convert the parameters to Unicode.
+
+        char *pUserName = (char *) aProfileName;
+        char *pPassWord = (char *) aPassword;
+
+        TCHAR ProfileName[MAX_NAME_LEN] = {0};
+        TCHAR PassWord[MAX_PW_LEN] = {0};
+
+        if (pUserName != NULL)
+        {
+            if (!MultiByteToWideChar(CP_ACP, 0, pUserName, -1, ProfileName,
+                                                            MAX_NAME_LEN))
+                return MAPI_E_FAILURE;
+        }
+
+        if (pPassWord != NULL)
+        {
+            if (!MultiByteToWideChar(CP_ACP, 0, pPassWord, -1, PassWord,
+                                                            MAX_NAME_LEN))
+                return MAPI_E_FAILURE;
+        }
+
+        hr = pNsMapi->Login(aUIParam, ProfileName, PassWord, aFlags,
+                                                        &nSessionId);
+    }
+    else
+        hr = pNsMapi->Login(aUIParam, aProfileName, aPassword,
+                                                aFlags, &nSessionId);
+    if (hr == S_OK)
+        (*aSession) = (LHANDLE) nSessionId;
+    else
+        return nSessionId;
+
+    return SUCCESS_SUCCESS;
+}
+
+ULONG FAR PASCAL MAPILogoff (LHANDLE aSession, ULONG aUIParam,
+                                            FLAGS aFlags, ULONG aReserved)
+{
+    nsIMapi *pNsMapi = (nsIMapi *)TlsGetValue(tId);
+    if (pNsMapi != NULL)
+    {
+        if (pNsMapi->Logoff((ULONG) aSession) == S_OK)
+            pNsMapi->Release();
+        pNsMapi = NULL;
+    }
+
+    TlsSetValue(tId, NULL);
+
+    ::CoUninitialize();
+
+    return SUCCESS_SUCCESS;
+}
+
+ULONG FAR PASCAL MAPISendMail (LHANDLE lhSession, ULONG ulUIParam, lpnsMapiMessage lpMessage,
+                FLAGS flFlags, ULONG ulReserved )
+{
+    HRESULT hr = 0;
+    BOOL bTempSession = FALSE ;
+    nsIMapi *pNsMapi = NULL;
+
+    if (!InitMozillaReference(&pNsMapi))
+        return MAPI_E_FAILURE;
+
+    if (lpMessage->nRecipCount > MAX_RECIPS)
+        return MAPI_E_TOO_MANY_RECIPIENTS ;
+
+    if (lpMessage->nFileCount > MAX_FILES)
+        return MAPI_E_TOO_MANY_FILES ;
+
+    if ( (!(flFlags & MAPI_DIALOG)) && (lpMessage->lpRecips == NULL) )
+        return MAPI_E_UNKNOWN_RECIPIENT ;
+
+    if (!lhSession || pNsMapi->IsValidSession(lhSession) != S_OK)
+    {
+        FLAGS LoginFlag ;
+        if ( (flFlags & MAPI_LOGON_UI) && (flFlags & MAPI_NEW_SESSION) )
+            LoginFlag = MAPI_LOGON_UI | MAPI_NEW_SESSION ;
+        else if (flFlags & MAPI_LOGON_UI) 
+            LoginFlag = MAPI_LOGON_UI ;
+
+        hr = MAPILogon (ulUIParam, (LPTSTR) NULL, (LPTSTR) NULL, LoginFlag, 0, &lhSession) ;
+        if (hr != SUCCESS_SUCCESS)
+            return MAPI_E_LOGIN_FAILURE ;
+        bTempSession = TRUE ;
+    }
+
+    // we need to deal with null data passed in by MAPI clients, specially when MAPI_DIALOG is set.
+    // The MS COM type lib code generated by MIDL for the MS COM interfaces checks for these parameters
+    // to be non null, although null is a valid value for them here. 
+    nsMapiRecipDesc * lpRecips ;
+    nsMapiFileDesc * lpFiles ;
+
+    nsMapiMessage Message ;
+    memset (&Message, 0, sizeof (nsMapiMessage) ) ;
+    nsMapiRecipDesc Recipient ;
+    memset (&Recipient, 0, sizeof (nsMapiRecipDesc) );
+    nsMapiFileDesc Files ;
+    memset (&Files, 0, sizeof (nsMapiFileDesc) ) ;
+
+    if(!lpMessage)
+    {
+       lpMessage = &Message ;
+    }
+    if(!lpMessage->lpRecips)
+    {
+        lpRecips = &Recipient ;
+    }
+    else
+        lpRecips = lpMessage->lpRecips ;
+    if(!lpMessage->lpFiles)
+    {
+        lpFiles = &Files ;
+    }
+    else
+        lpFiles = lpMessage->lpFiles ;
+
+    hr = pNsMapi->SendMail (lhSession, lpMessage, 
+                            (short) lpMessage->nRecipCount, lpRecips,
+                            (short) lpMessage->nFileCount, lpFiles,
+                            flFlags, ulReserved);
+
+    if (bTempSession)
+        MAPILogoff (lhSession, ulUIParam, 0,0) ;
+
+    // we are seeing a problem when using Word, although we return success from the MAPI support
+    // MS COM interface in mozilla, we are getting this error here. This is a temporary hack !!
+    if (hr == 0x800703e6)
+        return SUCCESS_SUCCESS;
+    
+    return hr ; 
+}
+
+
+ULONG FAR PASCAL MAPISendDocuments(ULONG ulUIParam, LPTSTR lpszDelimChar, LPTSTR lpszFilePaths,
+                                LPTSTR lpszFileNames, ULONG ulReserved)
+{
+    LHANDLE lhSession ;
+    nsIMapi *pNsMapi = NULL;
+
+    if (!InitMozillaReference(&pNsMapi))
+        return MAPI_E_FAILURE;
+
+    unsigned long result = MAPILogon (ulUIParam, (LPTSTR) NULL, (LPTSTR) NULL, MAPI_LOGON_UI, 0, &lhSession) ;
+    if (result != SUCCESS_SUCCESS)
+        return MAPI_E_LOGIN_FAILURE ;
+
+    HRESULT hr;
+
+    hr = pNsMapi->SendDocuments(lhSession, (LPTSTR) lpszDelimChar, (LPTSTR) lpszFilePaths, 
+                                    (LPTSTR) lpszFileNames, ulReserved) ;
+
+    MAPILogoff (lhSession, ulUIParam, 0,0) ;
+
+    return hr ;
+}
+
+ULONG FAR PASCAL MAPIFindNext(LHANDLE lhSession, ULONG ulUIParam, LPTSTR lpszMessageType,
+                              LPTSTR lpszSeedMessageID, FLAGS flFlags, ULONG ulReserved,
+                              LPTSTR lpszMessageID)
+{
+    return MAPI_E_FAILURE;
+}
+
+ULONG FAR PASCAL MAPIReadMail(LHANDLE lhSession, ULONG ulUIParam, LPTSTR lpszMessageID,
+                              FLAGS flFlags, ULONG ulReserved, lpMapiMessage FAR *lppMessage)
+{
+    return MAPI_E_FAILURE;
+}
+
+ULONG FAR PASCAL MAPISaveMail(LHANDLE lhSession, ULONG ulUIParam, lpMapiMessage lpMessage,
+                              FLAGS flFlags, ULONG ulReserved, LPTSTR lpszMessageID)
+{
+    return MAPI_E_FAILURE;
+}
+
+ULONG FAR PASCAL MAPIDeleteMail(LHANDLE lhSession, ULONG ulUIParam, LPTSTR lpszMessageID,
+                                FLAGS flFlags, ULONG ulReserved)
+{
+    return MAPI_E_FAILURE;
+}
+
+ULONG FAR PASCAL MAPIAddress(LHANDLE lhSession, ULONG ulUIParam, LPTSTR lpszCaption,
+                             ULONG nEditFields, LPTSTR lpszLabels, ULONG nRecips,
+                             lpMapiRecipDesc lpRecips, FLAGS flFlags,
+                             ULONG ulReserved, LPULONG lpnNewRecips,
+                             lpMapiRecipDesc FAR *lppNewRecips)
+{
+    return MAPI_E_FAILURE;
+}
+
+ULONG FAR PASCAL MAPIDetails(LHANDLE lhSession, ULONG ulUIParam, lpMapiRecipDesc lpRecip,
+                             FLAGS flFlags, ULONG ulReserved)
+{
+    return MAPI_E_FAILURE;
+}
+
+ULONG FAR PASCAL MAPIResolveName(LHANDLE lhSession, ULONG ulUIParam, LPTSTR lpszName,
+                                 FLAGS flFlags, ULONG ulReserved, lpMapiRecipDesc FAR *lppRecip)
+{
+    return MAPI_E_FAILURE;
+}
+
+ULONG FAR PASCAL MAPIFreeBuffer(LPVOID pv)
+{
+    return MAPI_E_FAILURE;
+}
+
+ULONG FAR PASCAL GetMapiDllVersion()
+{
+    return 94;
+}
+
+
+
+

mozilla/mailnews/mapi/mapiDll/makefile.win

@@ -0,0 +1,61 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corp.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK ***** 
+
+DEPTH=..\..\..
+
+MODULE          = mozMapi32
+EXPORT_LIBRARY  = $(MODULE)
+LIBRARY_NAME    = $(MODULE)
+DEFFILE         = Mapi32.def
+
+REQUIRES	= MapiProxy \
+                  msgMapi \
+		  xpcom \
+		  string \
+		  $(NULL)
+
+include <$(DEPTH)\config\config.mak>
+###############################################################
+
+LCFLAGS=-DUNICODE -D_UNICODE
+
+
+OBJS= .\$(OBJDIR)\MapiDll.obj
+
+WIN_LIBS= ole32.lib
+
+include <$(DEPTH)\config\rules.mak>
+

mozilla/mailnews/mapi/mapihook/makefile.win

@@ -0,0 +1,26 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s):  kkhandrika@netscape.com
+
+DEPTH=..\..\..
+
+DIRS= build public src
+
+include <$(DEPTH)\config\rules.mak>

mozilla/mailnews/mapi/mapihook/public/nsIMapiSupport.idl

@@ -0,0 +1,64 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Krishna Mohan Khandrika <kkhandrika@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsISupports.idl"
+
+/**
+ * This interface provides support for registering Mozilla as a COM component
+ * for extending the use of Mail/News through Simple MAPI.
+ * 
+ */
+
+[noscript, uuid(8967fed2-c8bb-11d5-a3e9-00b0d0f3baa7)]
+interface nsIMapiSupport : nsISupports {
+
+   /** Initiates MAPI support
+    */
+
+   void initializeMAPISupport();
+
+   /**  Shuts down the MAPI support
+    */
+
+   void shutdownMAPISupport();
+};
+
+%{C++
+#define NS_IMAPISUPPORT_CONTRACTID    "@mozilla.org/mapisupport;1"
+#define NS_IMAPISUPPORT_CLASSNAME "Mozilla MAPI Support"
+%}
+

mozilla/mailnews/mapi/mapihook/src/nsMapiSupport.cpp

@@ -0,0 +1,174 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsComPtr.h"
+#include "nsMapiSupport.h"
+#include "nsISupports.h"
+#include "nsMapiRegistry.h"
+#include "nsIGenericFactory.h"
+#include "nsIObserverService.h"
+#include "nsIAppStartupNotifier.h"
+#include "nsIServiceManager.h"
+#include "nsIComponentManager.h"
+#include "nsICategoryManager.h"
+
+const CLSID CLSID_nsMapiImp = {0x29f458be, 0x8866, 0x11d5, \
+                              {0xa3, 0xdd, 0x0, 0xb0, 0xd0, 0xf3, 0xba, 0xa7}};
+
+/** Implementation of the nsIMapiSupport interface.
+ *  Use standard implementation of nsISupports stuff.
+ */
+
+NS_IMPL_THREADSAFE_ISUPPORTS2(nsMapiSupport, nsIMapiSupport, nsIObserver);
+
+static NS_METHOD nsMapiRegistrationProc(nsIComponentManager *aCompMgr,
+                   nsIFile *aPath, const char *registryLocation, const char *componentType,
+                   const nsModuleComponentInfo *info)
+{
+  nsresult rv;
+
+  nsCOMPtr<nsICategoryManager> categoryManager(do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv));
+  if (NS_SUCCEEDED(rv)) 
+      rv = categoryManager->AddCategoryEntry(APPSTARTUP_CATEGORY, "Mapi Support", 
+                  "service," NS_IMAPISUPPORT_CONTRACTID, PR_TRUE, PR_TRUE, nsnull);
+
+  return rv;
+}
+
+NS_IMETHODIMP
+nsMapiSupport::Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *aData)
+{
+    if (!nsCRT::strcmp(aTopic, "profile-after-change"))
+        return InitializeMAPISupport();
+
+    if (!nsCRT::strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID))
+        return ShutdownMAPISupport();
+
+    nsresult rv;
+
+    nsCOMPtr<nsIObserverService> observerService(do_GetService("@mozilla.org/observer-service;1", &rv));
+    if (NS_FAILED(rv)) return rv;
+
+    rv = observerService->AddObserver(this,"profile-after-change", PR_FALSE);
+    if (NS_FAILED(rv)) return rv;
+
+    rv = observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_FALSE);
+           
+    return rv;
+}
+
+nsMapiSupport::nsMapiSupport()
+: m_dwRegister(0),
+  m_nsMapiFactory(nsnull)
+{
+    NS_INIT_ISUPPORTS();
+}
+
+nsMapiSupport::~nsMapiSupport()
+{
+}
+
+NS_IMETHODIMP
+nsMapiSupport::InitializeMAPISupport()
+{
+    ::CoInitialize(nsnull);
+    if (m_nsMapiFactory == nsnull)    // No Registering if already done.  Sanity Check!!
+    {
+        m_nsMapiFactory = new nsMapiFactory();
+
+        if (m_nsMapiFactory != nsnull)
+        {
+            HRESULT hr = ::CoRegisterClassObject(CLSID_nsMapiImp, \
+                                                 m_nsMapiFactory, \
+                                                 CLSCTX_LOCAL_SERVER, \
+                                                 REGCLS_MULTIPLEUSE, \
+                                                 &m_dwRegister);
+
+            if (FAILED(hr))
+            {
+                m_nsMapiFactory->Release() ;
+                m_nsMapiFactory = nsnull;
+                return NS_ERROR_FAILURE;
+            }
+        }
+    }
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMapiSupport::ShutdownMAPISupport()
+{
+    if (m_dwRegister != 0)
+        ::CoRevokeClassObject(m_dwRegister);
+
+    if (m_nsMapiFactory != nsnull)
+    {
+        m_nsMapiFactory->Release();
+        m_nsMapiFactory = nsnull;
+    }
+
+    ::CoUninitialize();
+
+    return NS_OK;
+}
+
+
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsMapiRegistry);
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsMapiSupport);
+
+// The list of components we register
+static nsModuleComponentInfo components[] = 
+{
+  {
+    NS_IMAPIREGISTRY_CLASSNAME, 
+    NS_IMAPIREGISTRY_CID,
+    NS_IMAPIREGISTRY_CONTRACTID, 
+    nsMapiRegistryConstructor
+  },
+
+  {
+    NS_IMAPISUPPORT_CLASSNAME,
+    NS_IMAPISUPPORT_CID,
+    NS_IMAPISUPPORT_CONTRACTID,
+    nsMapiSupportConstructor,
+    nsMapiRegistrationProc,
+    nsnull
+  }
+};
+
+NS_IMPL_NSGETMODULE(msgMapiModule, components);
+

mozilla/mailnews/mapi/mapihook/src/nsMapiSupport.h

@@ -0,0 +1,67 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla
+ *
+ * The Initial Developer of the Original Code is 
+ # Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef NS_MAPI_SUPPORT_H_
+#define NS_MAPI_SUPPORT_H_
+
+#include <nsIObserver.h>
+#include <nsIMapiSupport.h>
+#include "msgMapiFactory.h"
+
+
+#define NS_IMAPISUPPORT_CID \
+  {0x8967fed2, 0xc8bb, 0x11d5, \
+    { 0xa3, 0xe9, 0x00, 0xb0, 0xd0, 0xf3, 0xba, 0xa7 }}
+
+class nsMapiSupport : public nsIMapiSupport, public nsIObserver
+{
+    public :
+
+        nsMapiSupport();
+        ~nsMapiSupport();
+
+        // Declare all interface methods we must implement.
+        NS_DECL_ISUPPORTS
+        NS_DECL_NSIOBSERVER
+        NS_DECL_NSIMAPISUPPORT
+
+    private :
+
+        DWORD   m_dwRegister;
+        nsMapiFactory *m_nsMapiFactory;
+};
+
+#endif  // NS_MAPI_SUPPORT_H_

mozilla/mailnews/mapi/old/hook/makefile.win

@@ -0,0 +1,64 @@
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH=..\..\..
+MODULE=mapiguts
+
+################################################################################
+## exports
+
+#EXPORTS =
+
+
+################################################################################
+## library
+
+LIBNAME = .\$(OBJDIR)\mapiguts
+
+!ifdef MOZ_STATIC_COMPONENT_LIBS
+LIB = $(LIBNAME).lib
+!else
+DLL = $(LIBNAME).dll
+!endif
+
+DEFINES= -NS_DEBUG
+
+OBJS=										\
+    .\$(OBJDIR)\mapihook.obj  \
+    .\$(OBJDIR)\mapimail.obj  \
+		$(NULL)
+
+LLIBS=										\
+			$(LLIBS)						\
+			$(LIBNSPR)						\
+			$(DIST)\lib\xppref32.lib		\
+			$(DIST)\lib\xpcom.lib       	\
+			$(DIST)\lib\mapiutils_s.lib  \
+			$(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+!ifdef MOZ_STATIC_COMPONENT_LIBS
+install:: $(LIb)
+	$(MAKE_INSTALL)  $(LIBNAME).$(LIB_SUFFIX) $(DIST)\bin\components
+!else
+install:: $(DLL)
+	$(MAKE_INSTALL)  $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin\components
+!endif

mozilla/mailnews/mapi/old/hook/mapihook.h

@@ -0,0 +1,48 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#ifndef _MAPI_HOOK_H_
+#define _MAPI_HOOK_H_
+
+#include <structs.h>    // for MWContext
+
+//
+// This is the entry point to the MAPI session manager that lives
+// inside of Communicator.
+// 
+LONG ProcessNetscapeMAPIHook(WPARAM wParam, LPARAM lParam);
+
+#endif // _MAPI_HOOK_H_

mozilla/mailnews/mapi/old/hook/mapimail.cpp

@@ -0,0 +1,853 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+//  More MAPI Hooks for Communicator
+//  Written by: Rich Pizzarro (rhp@netscape.com)
+//  November 1997
+//
+#include "windows.h"
+#include "template.h"
+#include "msgcom.h"
+#include "wfemsg.h"
+#include "compstd.h"
+#include "compbar.h"
+#include "compmisc.h"
+#include "compfrm.h"
+#include "prefapi.h"
+#include "intl_csi.h"
+#include "dlghtmrp.h"
+#include "dlghtmmq.h"
+
+// rhp - was breaking the optimized build!
+//#include "edt.h"
+//#include "edview.h"
+//#include "postal.h"
+//#include "apiaddr.h"
+//#include "mailmisc.h"
+
+extern "C" {
+#include "xpgetstr.h"
+extern int MK_MSG_MSG_COMPOSITION;
+};
+
+#include "mapimail.h"
+#include "nscpmapi.h"
+#include "mailpriv.h"
+#include "nsstrseq.h"
+
+MWContext             
+*GetUsableContext(void)
+{
+  CGenericFrame     *pFrame = (CGenericFrame * )FEU_GetLastActiveFrame();
+
+  ASSERT(pFrame != NULL);
+  if (pFrame == NULL)
+  {
+    return(NULL);
+  }
+
+  // Now return the context...
+  return((MWContext *) pFrame->GetMainContext());
+}
+
+//
+// This function will create a composition window and either do
+// a blind send or pop up the compose window for the user to 
+// complete the operation
+//
+// Return: appropriate MAPI return code...
+//
+// 
+extern "C" LONG
+DoFullMAPIMailOperation(MAPISendMailType      *sendMailPtr,
+											  const char            *pInitialText,
+                        BOOL                  winShowFlag)
+{   
+CGenericDoc             *pDocument;
+LPSTR                   subject;
+NSstringSeq             mailInfoSeq;
+DWORD                   stringCount = 6;
+DWORD                   i;
+CString                 csDefault;
+
+  // Get a context to use for this call...
+  MWContext *pOldContext = GetUsableContext();
+  if (!pOldContext)
+  {
+    return(MAPI_E_FAILURE);
+  }
+
+  // Don't allow a compose window to be created if the user hasn't 
+  // specified an email address
+  const char *real_addr = FE_UsersMailAddress();
+  if (MISC_ValidateReturnAddress(pOldContext, real_addr) < 0)
+  {
+    return(MAPI_E_FAILURE);
+  }
+
+  //
+  // Now, we must build the fields object...
+  //
+  mailInfoSeq = (NSstringSeq) &(sendMailPtr->dataBuf[0]);
+  subject = NSStrSeqGet(mailInfoSeq, 0);
+
+  // We should give it a subject to preven the prompt from coming
+  // up...
+  if ((!subject) || !(*subject))
+  {
+    csDefault.LoadString(IDS_COMPOSE_DEFAULTNOSUBJECT);
+    subject = csDefault.GetBuffer(2);
+  }
+
+  TRACE("MAPI: ProcessMAPISendMail() Subject   = [%s]\n", subject);
+  TRACE("MAPI: ProcessMAPISendMail() Text Size = [%d]\n", strlen((const char *)pInitialText));
+  TRACE("MAPI: ProcessMAPISendMail() # of Recipients  = [%d]\n", sendMailPtr->MSG_nRecipCount);
+
+
+  char  toString[1024] = "";
+  char  ccString[1024] = "";
+  char  bccString[1024] = "";
+
+  for (i=0; i<sendMailPtr->MSG_nRecipCount; i++)
+  {
+    LPSTR   ptr;
+    UCHAR   tempString[256];
+
+    ULONG addrType = atoi(NSStrSeqGet(mailInfoSeq, stringCount++));
+
+    // figure which type of address this is?
+    if (addrType == MAPI_CC)
+      ptr = ccString;
+    else if (addrType == MAPI_BCC)
+      ptr = bccString;
+    else
+      ptr = toString;
+      
+    LPSTR namePtr = (LPSTR) NSStrSeqGet(mailInfoSeq, stringCount++);
+    LPSTR emailPtr = (LPSTR) NSStrSeqGet(mailInfoSeq, stringCount++);
+    if ( (lstrlen(emailPtr) > 5) && (*(emailPtr + 4) == ':') )
+    {
+      emailPtr += 5;
+    }
+
+    // Now build the temp string to tack on in the format
+    // "Rich Pizzarro" <rhp@netscape.com>
+    wsprintf((LPSTR) tempString, "\"%s\" <%s>", namePtr, emailPtr);
+
+    // add a comma if not the first one
+    if (ptr[0] != '\0')
+      lstrcat(ptr, ",");
+
+    // tack on string!
+    lstrcat(ptr, (LPSTR) tempString);
+  }
+
+  BOOL    bEncrypt = FALSE;
+  BOOL    bSign    = FALSE;
+
+  PREF_GetBoolPref("mail.crypto_sign_outgoing_mail", &bSign);
+  PREF_GetBoolPref("mail.encrypt_outgoing_mail", &bEncrypt);
+  MSG_CompositionFields *fields =
+      MSG_CreateCompositionFields(real_addr, real_addr, 
+                  toString, 
+                  ccString, 
+                  bccString,
+									"", "", "",
+									"", subject, "",
+									"", "", "",
+									"", 
+                  bEncrypt,
+                  bSign);
+  if (!fields)
+  {
+    return(MAPI_E_FAILURE);
+  }
+
+  // RICHIE
+  // INTL_CharSetInfo csi = LO_GetDocumentCharacterSetInfo(pOldContext);
+  // int16 win_csid = INTL_GetCSIWinCSID(csi);
+  
+  pDocument = (CGenericDoc*)theApp.m_TextComposeTemplate->OpenDocumentFile(NULL, NULL, /*win_csid RICHIE*/ winShowFlag);
+  if ( !pDocument )
+  {
+    return(MAPI_E_FAILURE);
+  }
+  
+  CWinCX * pContext = (CWinCX*) pDocument->GetContext();
+  if ( !pContext ) 
+  {
+    return(MAPI_E_FAILURE);
+  }
+
+  MSG_CompositionPaneCallbacks Callbacks;
+  Callbacks.CreateRecipientsDialog = CreateRecipientsDialog;
+  Callbacks.CreateAskHTMLDialog = CreateAskHTMLDialog;
+
+  int16 doccsid;
+  MWContext *context = pContext->GetContext();
+  CComposeFrame *pCompose = (CComposeFrame *) pContext->GetFrame()->GetFrameWnd();
+
+  pCompose->SetComposeStuff(context, fields); // squirl away stuff for post-create
+
+  // This needs to be set TRUE if using the old non-HTML text frame
+  // to prevent dropping dragged URLs
+  pContext->m_bDragging = !pCompose->UseHtml();
+  if (!pCompose->UseHtml()) 
+  {
+    pCompose->SetMsgPane(
+      MSG_CreateCompositionPane(pContext->GetContext(), 
+                                context, 
+                                g_MsgPrefs.m_pMsgPrefs, 
+                                fields,
+                                WFE_MSGGetMaster())
+                        );
+  }
+
+  ASSERT(pCompose->GetMsgPane());
+  MSG_SetFEData(pCompose->GetMsgPane(),(void *)pCompose);  
+  pCompose->UpdateAttachmentInfo();
+
+  // Pass doccsid info to new context for MailToWin conversion
+  doccsid = INTL_GetCSIDocCSID(LO_GetDocumentCharacterSetInfo(context));
+  INTL_SetCSIDocCSID(LO_GetDocumentCharacterSetInfo(context), 
+    (doccsid ? doccsid : INTL_DefaultDocCharSetID(context)));
+
+  pCompose->DisplayHeaders(NULL);
+
+  CComposeBar * pBar = pCompose->GetComposeBar();
+  ASSERT(pBar);
+  LPADDRESSCONTROL pIAddressList = pBar->GetAddressWidgetInterface();
+
+  if (!pIAddressList->IsCreated()) 
+  {
+    pBar->CreateAddressingBlock();
+  }
+
+  // rhp - Deal with addressing the brute force way! This is a 
+  // "fix" for bad behavior when creating these windows and not
+  // showing them on the desktop.
+  if (!winShowFlag)      // Hack to fix the window not being mapped
+  {
+    pCompose->AppendAddress(MSG_TO_HEADER_MASK, "");
+    pCompose->AppendAddress(MSG_CC_HEADER_MASK, "");
+    pCompose->AppendAddress(MSG_BCC_HEADER_MASK, "");
+  }
+
+  // Always do plain text composition!
+  pCompose->CompleteComposeInitialization();
+
+  // Do this so we don't get popups on "empty" messages
+  if ( (!pInitialText) || (!(*pInitialText)) )
+    pInitialText = " ";
+
+  const char * pBody = pInitialText ? pInitialText : MSG_GetCompBody(pCompose->GetMsgPane());
+  if (pBody)
+  {
+    FE_InsertMessageCompositionText(context,pBody,TRUE);
+  }
+
+  // 
+  // Now set the message as being edited!    
+  //
+  pCompose->SetModified(TRUE);
+
+  //
+  // Finally deal with the attachments...
+  //
+  if (sendMailPtr->MSG_nFileCount > 0)
+  {
+    // Send this puppy when done with the attachments...
+    if (!winShowFlag)
+    {
+      pCompose->SetMAPISendMode(MAPI_SEND);
+    }
+
+    MSG_AttachmentData *pAttach = (MSG_AttachmentData *)
+                  XP_CALLOC((sendMailPtr->MSG_nFileCount + 1),
+                  sizeof(MSG_AttachmentData));
+    if (!pAttach)
+    {
+      return(MAPI_E_INSUFFICIENT_MEMORY);
+    }
+
+    memset(pAttach, 0, (sendMailPtr->MSG_nFileCount + 1) * 
+                                sizeof(MSG_AttachmentData));
+    for (i=0; i<sendMailPtr->MSG_nFileCount; i++)
+    {
+      CString cs;
+      // Create URL from filename...
+      WFE_ConvertFile2Url(cs, 
+          (const char *)NSStrSeqGet(mailInfoSeq, stringCount++));
+      pAttach[i].url = XP_STRDUP(cs);
+
+      // Now also include the "display" name...
+      StrAllocCopy(pAttach[i].real_name, NSStrSeqGet(mailInfoSeq, stringCount++));
+    }
+
+    // Set the list!
+    MSG_SetAttachmentList(pCompose->GetMsgPane(), pAttach);
+
+    // Now free everything...
+    for (i=0; i<sendMailPtr->MSG_nFileCount; i++)
+    {
+      if (pAttach[i].url)
+        XP_FREE(pAttach[i].url);
+
+      if (pAttach[i].real_name)
+        XP_FREE(pAttach[i].real_name);
+    }
+
+    XP_FREE(pAttach);
+  }
+
+  //
+  // Now, if we were supposed to do the blind send...do it, otherwise,
+  // just popup the window...
+  //
+  if (winShowFlag)      
+  {
+    // Post message to compose window to set the initial focus.
+    pCompose->PostMessage(WM_COMP_SET_INITIAL_FOCUS);
+  }
+  else if (sendMailPtr->MSG_nFileCount <= 0)  // Send NOW if no attachments!
+  {
+    pCompose->PostMessage(WM_COMMAND, IDM_SEND);
+  }
+
+  return(SUCCESS_SUCCESS);
+}
+
+//
+// This function will create a composition window and just attach
+// the attachments of interest and pop up the window...
+//
+// Return: appropriate MAPI return code...
+//
+//
+extern "C" LONG
+DoPartialMAPIMailOperation(MAPISendDocumentsType *sendDocPtr)
+{   
+CGenericDoc             *pDocument;
+
+  // Get a context to use for this call...
+  MWContext *pOldContext = GetUsableContext();
+  if (!pOldContext)
+  {
+    return(MAPI_E_FAILURE);
+  }
+
+  // Don't allow a compose window to be created if the user hasn't 
+  // specified an email address
+  const char *real_addr = FE_UsersMailAddress();
+  if (MISC_ValidateReturnAddress(pOldContext, real_addr) < 0)
+  {
+    return(MAPI_E_FAILURE);
+  }
+
+  //
+  // Now, build the fields object w/o much info...
+  //
+  BOOL    bEncrypt = FALSE;
+  BOOL    bSign    = FALSE;
+
+  PREF_GetBoolPref("mail.crypto_sign_outgoing_mail", &bSign);
+  PREF_GetBoolPref("mail.encrypt_outgoing_mail", &bEncrypt);
+
+  MSG_CompositionFields *fields =
+      MSG_CreateCompositionFields(real_addr, real_addr, NULL, 
+                  "", "",
+									"", "", "",
+									"", "", "",
+									"", "", "",
+									"", 
+                  bEncrypt,
+                  bSign);
+  if (!fields)
+  {
+    return(MAPI_E_FAILURE);
+  }
+
+  // RICHIE - INTL_CharSetInfo csi = LO_GetDocumentCharacterSetInfo(pOldContext);
+  // int16 win_csid = INTL_GetCSIWinCSID(csi);
+
+  pDocument = (CGenericDoc*)theApp.m_TextComposeTemplate->OpenDocumentFile(NULL, NULL, /*RICHIE win_csid,*/ TRUE);
+  if ( !pDocument )
+  {
+    // cleanup fields object
+    MSG_DestroyCompositionFields(fields);
+    return(MAPI_E_FAILURE);
+  }
+
+  CWinCX * pContext = (CWinCX*) pDocument->GetContext();
+  if ( !pContext ) 
+  {
+    return(MAPI_E_FAILURE);
+  }
+
+  MSG_CompositionPaneCallbacks Callbacks;
+  Callbacks.CreateRecipientsDialog = CreateRecipientsDialog;
+  Callbacks.CreateAskHTMLDialog = CreateAskHTMLDialog;
+
+  MWContext *context = pContext->GetContext();
+  CComposeFrame *pCompose = (CComposeFrame *) pContext->GetFrame()->GetFrameWnd();
+  pCompose->SetComposeStuff(context,fields); // squirl away stuff for post-create
+
+  // This needs to be set TRUE if using the old non-HTML text frame
+  // to prevent dropping dragged URLs
+  pContext->m_bDragging = !pCompose->UseHtml();
+  if (!pCompose->UseHtml()) 
+  {
+    pCompose->SetMsgPane(MSG_CreateCompositionPane(
+      pContext->GetContext(), 
+      context,
+      g_MsgPrefs.m_pMsgPrefs, fields,
+      WFE_MSGGetMaster()));
+  }
+
+  ASSERT(pCompose->GetMsgPane());
+  MSG_SetFEData(pCompose->GetMsgPane(),(void *)pCompose);
+
+  pCompose->UpdateAttachmentInfo();
+
+  // Pass doccsid info to new context for MailToWin conversion
+  /***
+  doccsid = INTL_GetCSIDocCSID(LO_GetDocumentCharacterSetInfo(pOldContext));
+
+  INTL_SetCSIDocCSID(LO_GetDocumentCharacterSetInfo(context), 
+    (doccsid ? doccsid : INTL_DefaultDocCharSetID(pOldContext)));
+  ****/
+
+  pCompose->DisplayHeaders(NULL);
+
+  CComposeBar * pBar = pCompose->GetComposeBar();
+  ASSERT(pBar);
+  LPADDRESSCONTROL pIAddressList = pBar->GetAddressWidgetInterface();
+
+  if (!pIAddressList->IsCreated()) 
+  {
+    pBar->CreateAddressingBlock();
+  }
+
+  // Always do plain text composition!
+  pCompose->CompleteComposeInitialization();
+
+  //
+  // Finally deal with the attachments...
+  //
+  NSstringSeq     mailInfoSeq = (NSstringSeq) &(sendDocPtr->dataBuf[0]);
+  DWORD           stringCount = 0;
+  DWORD           i;
+
+  TRACE("MAPI: ProcessMAPISendDocuments() # of Attachments = [%d]\n", sendDocPtr->nFileCount);
+
+  if (sendDocPtr->nFileCount > 0)
+  {
+      MSG_AttachmentData *pAttach = (MSG_AttachmentData *)
+                    XP_CALLOC((sendDocPtr->nFileCount + 1),
+                    sizeof(MSG_AttachmentData));
+      if (!pAttach)
+      {
+        return(MAPI_E_INSUFFICIENT_MEMORY);
+      }
+
+      memset(pAttach, 0, (sendDocPtr->nFileCount + 1) * 
+                                  sizeof(MSG_AttachmentData));
+      for (i=0; i<sendDocPtr->nFileCount; i++)
+      {
+        CString cs;
+        // Create URL from filename...
+        WFE_ConvertFile2Url(cs, 
+            (const char *)NSStrSeqGet(mailInfoSeq, stringCount++));
+        pAttach[i].url = XP_STRDUP(cs);
+
+        // Now also include the "display" name...
+        StrAllocCopy(pAttach[i].real_name, NSStrSeqGet(mailInfoSeq, stringCount++));
+      }
+
+      // Set the list!
+      MSG_SetAttachmentList(pCompose->GetMsgPane(), pAttach);
+
+      // Now free everything...
+      for (i=0; i<sendDocPtr->nFileCount; i++)
+      {
+        if (pAttach[i].url)
+          XP_FREE(pAttach[i].url);
+
+        if (pAttach[i].real_name)
+          XP_FREE(pAttach[i].real_name);
+      }
+
+      XP_FREE(pAttach);
+  }
+    
+  // 
+  // Now some checking for ... well I'm not sure...
+  //
+  if (MSG_GetAttachmentList(pCompose->GetMsgPane()))
+    pCompose->SetModified(TRUE);
+  else
+    pCompose->SetModified(FALSE);
+
+  // Post message to compose window to set the initial focus.
+  pCompose->PostMessage(WM_COMP_SET_INITIAL_FOCUS);
+
+  //
+  // Now, just popup the window...
+  //
+  pCompose->ShowWindow(TRUE);
+
+  // return pCompose->GetMsgPane(); rhp - used to return the MsgPane
+  return(SUCCESS_SUCCESS);
+}
+
+static void _GetMailCallback(HWND hwnd, MSG_Pane *pane, void *closure)
+{
+   if (pane != NULL)
+   {
+     ShowWindow(hwnd, SW_HIDE);
+     MSG_Command( pane, MSG_GetNewMail, NULL, 0 );
+   }
+}
+
+static void _GetMailDoneCallback(HWND hwnd, MSG_Pane *pane, void *closure)
+{
+	for(CGenericFrame * f = theApp.m_pFrameList; f; f = f->m_pNext)
+		f->PostMessage(WM_COMMAND, (WPARAM) ID_DONEGETTINGMAIL, (LPARAM) 0);
+}
+
+//
+// This will fire off a "get mail in background operation" in an
+// async. fashion.
+//
+extern "C" void
+MAPIGetNewMessagesInBackground(void)
+{
+CGenericFrame     *pFrame = (CGenericFrame * )FEU_GetLastActiveFrame();
+
+  // rhp - we should not hit the net if we are offline!
+  if (NET_IsOffline())
+    return;
+
+  if (!pFrame)
+    return;
+
+  MWContext *pOldContext = GetUsableContext();
+  if (!pOldContext)
+    return;
+
+  TRACE("MAPI: DOWNLOAD MAIL IN BACKGROUND\n");
+  new CProgressDialog(
+                pFrame->GetFrameWnd(), 
+                NULL, 
+                _GetMailCallback, NULL, NULL, 
+                _GetMailDoneCallback);
+}
+
+//
+// This function will save a message into the Communicator "Drafts"
+// folder with no UI showing.
+//
+// Return: appropriate MAPI return code...
+//
+//
+extern "C" LONG 
+DoMAPISaveMailOperation(MAPISendMailType      *sendMailPtr,
+											  const char            *pInitialText)
+{
+CGenericDoc             *pDocument;
+LPSTR                   subject;
+NSstringSeq             mailInfoSeq;
+DWORD                   stringCount = 6;
+DWORD                   i;
+BOOL                    winShowFlag = FALSE;
+
+  // Get a context to use for this call...
+  MWContext *pOldContext = GetUsableContext();
+  if (!pOldContext)
+  {
+    return(MAPI_E_FAILURE);
+  }
+
+  // Don't allow a compose window to be created if the user hasn't 
+  // specified an email address
+  const char *real_addr = FE_UsersMailAddress();
+  if (MISC_ValidateReturnAddress(pOldContext, real_addr) < 0)
+  {
+    return(MAPI_E_FAILURE);
+  }
+
+  //
+  // Now, we must build the fields object...
+  //
+  mailInfoSeq = (NSstringSeq) &(sendMailPtr->dataBuf[0]);
+  subject = NSStrSeqGet(mailInfoSeq, 0);
+
+  TRACE("MAPI: ProcessMAPISendMail() Subject   = [%s]\n", subject);
+  TRACE("MAPI: ProcessMAPISendMail() Text Size = [%d]\n", strlen((const char *)pInitialText));
+  TRACE("MAPI: ProcessMAPISendMail() # of Recipients  = [%d]\n", sendMailPtr->MSG_nRecipCount);
+
+
+  char  toString[1024] = "";
+  char  ccString[1024] = "";
+  char  bccString[1024] = "";
+
+  for (i=0; i<sendMailPtr->MSG_nRecipCount; i++)
+  {
+    LPSTR   ptr;
+    UCHAR   tempString[256];
+
+    ULONG addrType = atoi(NSStrSeqGet(mailInfoSeq, stringCount++));
+
+    // figure which type of address this is?
+    if (addrType == MAPI_CC)
+      ptr = ccString;
+    else if (addrType == MAPI_BCC)
+      ptr = bccString;
+    else
+      ptr = toString;
+
+    LPSTR namePtr = (LPSTR) NSStrSeqGet(mailInfoSeq, stringCount++);
+    LPSTR emailPtr = (LPSTR) NSStrSeqGet(mailInfoSeq, stringCount++);
+
+    if ( (!emailPtr) && (!namePtr))
+    {
+      return(MAPI_E_INVALID_RECIPS);
+    }
+
+    if (!emailPtr)
+      emailPtr = namePtr;
+
+    char *tptr = strchr(emailPtr, ':');
+    if (tptr != NULL)
+    {
+      if ( (*tptr != '\0') && (*(tptr+1) != '\0') )
+      {
+        emailPtr = (tptr + 1);
+      }
+    }
+/**
+    if ( (lstrlen(emailPtr) > 5) && (*(emailPtr + 4) == ':') )
+    {
+      emailPtr += 5;
+    }
+**/
+    // Now build the temp string to tack on in the format
+    // "Rich Pizzarro" <rhp@netscape.com>
+    wsprintf((LPSTR) tempString, "\"%s\" <%s>", namePtr, emailPtr);
+
+    // add a comma if not the first one
+    if (ptr[0] != '\0')
+      lstrcat(ptr, ",");
+
+    // tack on string!
+    lstrcat(ptr, (LPSTR) tempString);
+  }
+
+  BOOL    bEncrypt = FALSE;
+  BOOL    bSign    = FALSE;
+
+  PREF_GetBoolPref("mail.crypto_sign_outgoing_mail", &bSign);
+  PREF_GetBoolPref("mail.encrypt_outgoing_mail", &bEncrypt);
+  MSG_CompositionFields *fields =
+      MSG_CreateCompositionFields(real_addr, real_addr, 
+                  toString, 
+                  ccString, 
+                  bccString,
+									"", "", "",
+									"", subject, "",
+									"", "", "",
+									"", 
+                  bEncrypt,
+                  bSign);
+  if (!fields)
+  {
+    return(MAPI_E_FAILURE);
+  }
+
+  // RICHIE
+  // INTL_CharSetInfo csi = LO_GetDocumentCharacterSetInfo(pOldContext);
+  // int16 win_csid = INTL_GetCSIWinCSID(csi);
+  
+  pDocument = (CGenericDoc*)theApp.m_TextComposeTemplate->OpenDocumentFile(NULL, NULL, /*win_csid RICHIE*/ winShowFlag);
+  if ( !pDocument )
+  {
+    return(MAPI_E_FAILURE);
+  }
+  
+  CWinCX * pContext = (CWinCX*) pDocument->GetContext();
+  if ( !pContext ) 
+  {
+    return(MAPI_E_FAILURE);
+  }
+
+  MSG_CompositionPaneCallbacks Callbacks;
+  Callbacks.CreateRecipientsDialog = CreateRecipientsDialog;
+  Callbacks.CreateAskHTMLDialog = CreateAskHTMLDialog;
+
+  int16 doccsid;
+  MWContext *context = pContext->GetContext();
+  CComposeFrame *pCompose = (CComposeFrame *) pContext->GetFrame()->GetFrameWnd();
+
+  pCompose->SetComposeStuff(context, fields); // squirl away stuff for post-create
+
+  // This needs to be set TRUE if using the old non-HTML text frame
+  // to prevent dropping dragged URLs
+  pContext->m_bDragging = !pCompose->UseHtml();
+  if (!pCompose->UseHtml()) 
+  {
+    pCompose->SetMsgPane(
+      MSG_CreateCompositionPane(pContext->GetContext(), 
+                                context, 
+                                g_MsgPrefs.m_pMsgPrefs, 
+                                fields,
+                                WFE_MSGGetMaster())
+                        );
+  }
+
+  ASSERT(pCompose->GetMsgPane());
+  MSG_SetFEData(pCompose->GetMsgPane(),(void *)pCompose);  
+  pCompose->UpdateAttachmentInfo();
+
+  // Pass doccsid info to new context for MailToWin conversion
+  doccsid = INTL_GetCSIDocCSID(LO_GetDocumentCharacterSetInfo(context));
+  INTL_SetCSIDocCSID(LO_GetDocumentCharacterSetInfo(context), 
+    (doccsid ? doccsid : INTL_DefaultDocCharSetID(context)));
+
+  pCompose->DisplayHeaders(NULL);
+
+  CComposeBar * pBar = pCompose->GetComposeBar();
+  ASSERT(pBar);
+  LPADDRESSCONTROL pIAddressList = pBar->GetAddressWidgetInterface();
+
+  if (!pIAddressList->IsCreated()) 
+  {
+    pBar->CreateAddressingBlock();
+  }
+
+  // rhp - Deal with addressing the brute force way! This is a 
+  // "fix" for bad behavior when creating these windows and not
+  // showing them on the desktop.
+  if (!winShowFlag)      // Hack to fix the window not being mapped
+  {
+    pCompose->AppendAddress(MSG_TO_HEADER_MASK, "");
+    pCompose->AppendAddress(MSG_CC_HEADER_MASK, "");
+    pCompose->AppendAddress(MSG_BCC_HEADER_MASK, "");
+  }
+
+  // Always do plain text composition!
+  pCompose->CompleteComposeInitialization();
+
+  // Do this so we don't get popups on "empty" messages
+  if ( (!pInitialText) || (!(*pInitialText)) )
+    pInitialText = " ";
+
+  const char * pBody = pInitialText ? pInitialText : MSG_GetCompBody(pCompose->GetMsgPane());
+  if (pBody)
+  {
+    FE_InsertMessageCompositionText(context,pBody,TRUE);
+  }
+
+  // 
+  // Now set the message as being edited!    
+  //
+  pCompose->SetModified(TRUE);
+
+  //
+  // Finally deal with the attachments...
+  //
+  if (sendMailPtr->MSG_nFileCount > 0)
+  {
+    // Send this puppy when done with the attachments...
+    if (!winShowFlag)
+    {
+      pCompose->SetMAPISendMode(MAPI_SAVE);
+    }
+
+    MSG_AttachmentData *pAttach = (MSG_AttachmentData *)
+                  XP_CALLOC((sendMailPtr->MSG_nFileCount + 1),
+                  sizeof(MSG_AttachmentData));
+    if (!pAttach)
+    {
+      return(MAPI_E_INSUFFICIENT_MEMORY);
+    }
+
+    memset(pAttach, 0, (sendMailPtr->MSG_nFileCount + 1) * 
+                                sizeof(MSG_AttachmentData));
+    for (i=0; i<sendMailPtr->MSG_nFileCount; i++)
+    {
+      CString cs;
+      // Create URL from filename...
+      WFE_ConvertFile2Url(cs, 
+          (const char *)NSStrSeqGet(mailInfoSeq, stringCount++));
+      pAttach[i].url = XP_STRDUP(cs);
+
+      // Now also include the "display" name...
+      StrAllocCopy(pAttach[i].real_name, NSStrSeqGet(mailInfoSeq, stringCount++));
+    }
+
+    // Set the list!
+    MSG_SetAttachmentList(pCompose->GetMsgPane(), pAttach);
+
+    // Now free everything...
+    for (i=0; i<sendMailPtr->MSG_nFileCount; i++)
+    {
+      if (pAttach[i].url)
+        XP_FREE(pAttach[i].url);
+
+      if (pAttach[i].real_name)
+        XP_FREE(pAttach[i].real_name);
+    }
+
+    XP_FREE(pAttach);
+  }
+
+  //
+  // Now, if we were supposed to do the blind send...do it, otherwise,
+  // just popup the window...
+  //
+  if (winShowFlag)      
+  {
+    // Post message to compose window to set the initial focus.
+    pCompose->PostMessage(WM_COMP_SET_INITIAL_FOCUS);
+  }
+  else if (sendMailPtr->MSG_nFileCount <= 0)  // Send NOW if no attachments!
+  {
+    pCompose->PostMessage(WM_COMMAND, IDM_SAVEASDRAFT);
+  }
+
+  return(SUCCESS_SUCCESS);
+}

mozilla/mailnews/mapi/old/hook/mapimail.h

@@ -0,0 +1,89 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#ifndef _MAPI_MAIL_H_
+#define _MAPI_MAIL_H_
+
+#include "nscpmapi.h"
+#include <structs.h>    // for MWContext
+
+//extern "C" {
+
+//
+// This function will create a composition window and either do
+// a blind send or pop up the compose window for the user to 
+// complete the operation
+//
+// Return: appropriate MAPI return code...
+//
+//
+extern "C" LONG
+DoFullMAPIMailOperation(MAPISendMailType      *sendMailPtr,
+											  const char            *pInitialText,
+                        BOOL                  winShowFlag);
+
+//
+// This function will create a composition window and just attach
+// the attachments of interest and pop up the window...
+//
+// Return: appropriate MAPI return code...
+//
+//
+extern "C" LONG
+DoPartialMAPIMailOperation(MAPISendDocumentsType *sendDocPtr);
+
+//
+// This function will save a message into the Communicator "Drafts"
+// folder with no UI showing.
+//
+// Return: appropriate MAPI return code...
+//
+//
+extern "C" LONG 
+DoMAPISaveMailOperation(MAPISendMailType      *sendMailPtr,
+											  const char            *pInitialText);
+
+//
+// This will fire off a "get mail in background operation" in an
+// async. fashion.
+//
+extern "C" void
+MAPIGetNewMessagesInBackground(void);
+
+
+// } // extern "C"
+
+#endif // _MAPI_MAIL_H_

mozilla/mailnews/mapi/old/lib/Makefile.win

@@ -0,0 +1,50 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..\..
+MODULE=mapiutils
+
+include <$(DEPTH)\config\config.mak>
+
+################################################################################
+## exports
+
+EXPORTS=	mapismem.h	\
+    		nsstrseq.h	\
+			$(NULL)
+
+################################################################################
+## library
+
+LIBRARY_NAME=mapiutils_s
+
+
+CPP_OBJS=   .\$(OBJDIR)\mapismem.obj		\
+			.\$(OBJDIR)\nsstrseq.obj		\
+			$(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(LIBRARY)
+	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+clobber::
+	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/mailnews/mapi/old/lib/mapismem.cpp

@@ -0,0 +1,173 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+//  smem.cpp - This deals with all shared memory functions needed for 
+//  the MAPI component of Communicator
+//  Written by: Rich Pizzarro (rhp@netscape.com)
+//  November 1997
+//
+#include <windows.h>
+#include <windowsx.h>
+
+#include "mapismem.h"
+
+
+#ifndef ZeroMemory
+#include <memory.h>
+#define ZeroMemory(PTR, SIZE) memset(PTR, 0, SIZE)
+#endif // ZeroMemory
+
+// 
+// *create new* shared memory chunk 
+// once this is created, use the pointer
+// to the segment to to store data 
+// e.g.: 
+//     lpString = "string for communicator"; 
+//     lstrcpy((LPSTR)pData->m_buf[0], lpString); 
+//  
+CSharedMem *
+NSCreateSharedMemory(DWORD memSize, LPCTSTR memName, HANDLE *hSharedMemory)
+{
+#ifdef WIN32
+
+  BOOL bExistedBefore;
+  CSharedMem *pData;
+
+  LPCTSTR szObjectName = memName; 
+  DWORD dwSize = sizeof(CSharedMem) + memSize; 
+  *hSharedMemory = CreateFileMapping( 
+    (HANDLE)0xFFFFFFFF,0,PAGE_READWRITE,0,dwSize,szObjectName); 
+  if(*hSharedMemory == 0) 
+  { 
+    return NULL; 
+  } 
+  bExistedBefore = (GetLastError() == ERROR_ALREADY_EXISTS); 
+  if(bExistedBefore) 
+  { 
+  	return NULL;
+  } 
+
+  pData = (CSharedMem *)MapViewOfFile( 
+            *hSharedMemory, FILE_MAP_ALL_ACCESS, 0, 0, 0); 
+  if(pData == NULL) 
+  { 
+    return NULL; 
+  } 
+
+  ZeroMemory(pData, dwSize); 
+  pData->m_dwSize = memSize; 
+
+  return pData;
+#else
+  CSharedMem 	*sMemChunk = NULL;
+  DWORD dwSize = memSize = (sizeof(CSharedMem) + memSize); 
+
+  if (sMemChunk != NULL)
+	  return(sMemChunk);
+
+  sMemChunk = (CSharedMem *) GlobalAllocPtr(GMEM_MOVEABLE, dwSize);
+  ZeroMemory(sMemChunk, (size_t) dwSize);
+  sMemChunk->m_dwSize = dwSize;   // Missing in Communicator code!
+  return(sMemChunk);
+
+#endif // WIN32
+}
+
+// 
+// *open existing* shared memory chunk 
+// once you have the pointer to the new segment 
+// use this pointer to access data, e.g.: 
+// 
+CSharedMem *
+NSOpenExistingSharedMemory(LPCTSTR memName, HANDLE *hSharedMemory)
+{
+#ifdef WIN32
+  CSharedMem *pData;
+  DWORD dwSize;
+
+  LPCTSTR szObjectName = memName; 
+  *hSharedMemory = OpenFileMapping( 
+    FILE_MAP_WRITE,FALSE,szObjectName); 
+  if(*hSharedMemory == 0) 
+  { 
+    return NULL; 
+  } 
+
+  pData = (CSharedMem *)MapViewOfFile( 
+              *hSharedMemory,FILE_MAP_ALL_ACCESS,0,0,0); 
+  if(pData == NULL) 
+  { 
+    return NULL; 
+  } 
+  
+  dwSize = pData->m_dwSize; 
+  return pData;
+#else
+
+  return(NULL);   // In Win16, this is really meaningless...
+
+#endif
+}  
+
+// 
+// to close shared memory segment
+// 
+void
+NSCloseSharedMemory(CSharedMem *pData, HANDLE hSharedMemory)
+{
+#ifdef WIN32
+  if(pData != 0) 
+  { 
+    UnmapViewOfFile(pData); 
+    pData = 0; 
+  } 
+
+  if(hSharedMemory != 0) 
+  { 
+    CloseHandle(hSharedMemory); 
+    hSharedMemory = 0; 
+  } 
+#else
+
+	if (pData != NULL)
+	{
+		GlobalFreePtr(pData);
+		pData = NULL;
+	}
+
+#endif // WIN32
+}

mozilla/mailnews/mapi/old/lib/mapismem.h

@@ -0,0 +1,116 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#ifndef __SMEM_HPP__
+#define __SMEM_HPP__
+
+//
+// Need this for Win16 since it is an undocumented message
+//
+#ifndef WIN32
+
+#define WM_COPYDATA                     0x004A
+
+/*
+ * lParam of WM_COPYDATA message points to...
+ */
+typedef struct tagCOPYDATASTRUCT {
+    DWORD         dwData;
+    DWORD         cbData;
+    LPVOID        lpData;
+} COPYDATASTRUCT, *PCOPYDATASTRUCT;
+
+# ifndef LPCTSTR
+#   define LPCTSTR LPCSTR
+# endif
+
+
+#endif // ifndef WIN32
+
+// The following structure will be stored in the shared memory 
+// and will be used to pass data back and forth 
+
+#pragma pack(4) 
+
+typedef struct  
+{ 
+  DWORD m_dwSize;       // size of the shared memory block 
+  BYTE  m_buf[1];       // this is the buffer of memory to be used
+} CSharedMem; 
+
+#pragma pack(4) 
+
+// ******************************************************
+// Public routines...
+// ******************************************************
+// 
+// 
+// *create new* shared memory chunk 
+// once this is created, use the pointer
+// to the segment to to store data 
+// e.g.: 
+//     lpString = "string for communicator"; 
+//     lstrcpy((LPSTR)pData->m_buf[0], lpString); 
+//     pData->m_dwBytesUsed = lstrlen(lpString) + 1; // count '\0' 
+//  
+CSharedMem *
+NSCreateSharedMemory(DWORD memSize, LPCTSTR memName, HANDLE *hSharedMemory);
+
+// 
+// *open existing* shared memory chunk 
+// once you have the pointer to the new segment 
+// use this pointer to access data, e.g.: 
+//
+// This will return the pointer to the memory chunk as well as
+// fill out the hSharedMemory argument that is needed for subsequent
+// operations.
+// 
+//  if(pData->m_dwBytesUsed > 0) 
+//  { 
+//    // use pData->m_buf here 
+//  } 
+//
+CSharedMem *
+NSOpenExistingSharedMemory(LPCTSTR memName, HANDLE *hSharedMemory);
+
+//
+// You must pass in the pointer to the memory chunk as well as
+// the hSharedMemory HANDLE to close shared memory segment
+// 
+void
+NSCloseSharedMemory(CSharedMem *pData, HANDLE hSharedMemory);
+
+#endif  // __SMEM_HPP__

mozilla/mailnews/mapi/old/lib/nsstrseq.cpp

@@ -0,0 +1,230 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+//  This is a string sequence handling routine to take complex
+//  structures and merge them into a chunk of memory.
+//
+//  Written by: Rich Pizzarro (rhp@netscape.com)
+//  November 1997
+//
+#include <string.h>
+#include <stdlib.h>
+#include <windows.h>
+#include <windowsx.h>
+
+#include "nsstrseq.h"
+
+#ifndef NULL
+#define NULL '\0'
+#endif
+
+#define MARKER '\377'
+
+//
+// Delete an existing string sequence
+//
+void NSStrSeqDelete(NSstringSeq seq)
+{
+  if (seq != NULL)
+    free(seq);
+  
+  seq = NULL;
+}
+
+//
+// Allocate a new sequence, copying the given strings into it. 
+//
+NSstringSeq NSStrSeqNew(LPSTR strings[])
+{
+  int size;
+  if (!strings)
+  {
+    return NULL;
+  }
+  
+  {
+    int i;
+    for (i=0,size=0; strings[i]; i++)
+    {
+      size+=strlen(strings[i])+1;
+      switch (strings[i][0])
+      {
+        // Need to pad "" or anything starting with 255 
+        // to allow for multiple blank strings in a row
+      case 0:
+      case MARKER:
+        size++;
+        break;
+        
+      default:
+        break;
+      }
+    }
+  }
+  
+  {
+    NSstringSeq s=(NSstringSeq)malloc(size+1);
+    if (!s)
+    {	return NULL;}
+    
+    {
+      int i,offset;
+      for (i=0,offset=0; strings[i]; i++)
+      {
+        switch (strings[i][0])
+        {
+          // Need to pad "" or anything starting with 255
+        case 0:
+        case MARKER:
+          s[offset++]=MARKER;
+          break;
+          
+        default:
+          break;
+        }
+        strcpy(s+offset,strings[i]);
+        offset+=strlen(strings[i])+1;
+      }
+      s[offset]=0;
+    }
+    
+    return s;
+  }
+}
+
+//
+// Get the # of bytes required for the sequence 
+//
+LONG NSStrSeqSize(NSstringSeq seq)
+{
+  const char* s;
+  if (!seq)
+    {
+      return -1;
+    }
+
+  for (s=seq+1; ((*s) || (*(s-1))); s++)
+    ;
+
+  // At this point, s points to the second 0 
+  // of the double 0 at the end 
+  return (s-seq)+1;
+}
+
+//
+// Get the # of strings in the sequence 
+//
+LONG NSStrSeqNumStrs(NSstringSeq seq)
+{
+  const char* s;
+  int N;
+  if (!seq)
+  {
+    return -1;
+  }
+  
+  for (s=seq+1,N=0; ((*s) || (*(s-1))); s++)
+  {
+    if (!(*s))
+      N++;
+  }
+  
+  return N;
+}
+
+static LPSTR correct(LPSTR s)
+{
+  if (s[0]==MARKER)
+    return s+1;
+  else  // Anup , 4/96
+    return s;
+}
+
+//
+// Extract the index'th string in the sequence
+//
+LPSTR NSStrSeqGet(NSstringSeq seq, LONG index)
+{
+  char* s;
+  int N;
+
+  if (!seq)
+  {
+    return NULL;
+  }
+  
+  if (index<0)
+  {
+    return NULL;
+  }
+  
+  if (!index)
+    return correct(seq);
+  
+  for (s=seq+1,N=0; ((*s) || (*(s-1))) && (N<index); s++)
+  {
+    if (!(*s))
+      N++;
+  }
+  
+  if (N==index)
+    return correct(s);
+  
+  return NULL;
+}
+
+LPSTR * NSStrSeqGetAll(NSstringSeq seq)
+{
+  LONG N=NSStrSeqNumStrs(seq);
+  if (N<0)
+    return NULL;
+  
+  {
+    char** res=(char**)malloc( (size_t) ((N+1)*sizeof(char*)) );
+    int i;
+    
+    if (!res)
+    {
+      return NULL;
+    }
+    for (i=0; i<N; i++)
+      res[i]=NSStrSeqGet(seq,i);
+    res[N]=NULL;
+    
+    return res;
+  }
+}

mozilla/mailnews/mapi/old/lib/nsstrseq.h

@@ -0,0 +1,68 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#ifndef __SEQUENCES_OF_STRINGS_H_
+#define __SEQUENCES_OF_STRINGS_H	
+
+
+typedef LPSTR NSstringSeq;
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+void NSStrSeqDelete(NSstringSeq seq);
+NSstringSeq NSStrSeqNew(LPSTR strings[]);
+
+// Get the # of bytes required for the sequence 
+LONG NSStrSeqSize(NSstringSeq seq);
+
+// Get the # of strings in the sequence
+LONG NSStrSeqNumStrs(NSstringSeq seq);
+
+// Extract the index'th string in the sequence
+LPSTR NSStrSeqGet(NSstringSeq seq, LONG index);
+
+// Build an array of all the strings in the sequence
+LPSTR *NSStrSeqGetAll(NSstringSeq seq);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif // __sequences_of_strings_h_

mozilla/mailnews/mapi/old/makefile.win

@@ -0,0 +1,26 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..
+
+DIRS=public lib mapi32 tests hook
+
+include <$(DEPTH)\config\rules.mak>

mozilla/mailnews/mapi/old/mapi32/maindll.cpp

@@ -0,0 +1,100 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+//  DLLMain to get a handle on an hInstance 
+//  Written by: Rich Pizzarro (rhp@netscape.com)
+//  November 1997
+#include <windows.h>
+
+//  
+// global variables
+//
+HINSTANCE hInstance;
+
+//
+// DLL entry
+//  
+#ifdef WIN32
+/****************************************************************************
+   FUNCTION: DllMain(HANDLE, DWORD, LPVOID)
+
+   PURPOSE:  DllMain is called by Windows when
+             the DLL is initialized, Thread Attached, and other times.
+             Refer to SDK documentation, as to the different ways this
+             may be called.
+             
+             The DllMain function should perform additional initialization
+             tasks required by the DLL.  In this example, no initialization
+             tasks are required.  DllMain should return a value of 1 if
+             the initialization is successful.
+           
+*******************************************************************************/
+BOOL APIENTRY DllMain(HANDLE hInstLocal, DWORD ul_reason_being_called, LPVOID lpReserved) 
+{
+  hInstance = (HINSTANCE)hInstLocal;
+
+  if (hInstance != NULL) 
+	  return 1;
+  else  
+	  return 0;
+}
+
+#else  // WIN16
+
+
+//--------------------------------------------------------------------
+// LibMain( hInstance, wDataSegment, wHeapSize, lpszCmdLine ) : WORD
+//
+//    hInstance      library instance handle
+//    wDataSegment   library data segment
+//    wHeapSize      default heap size
+//    lpszCmdLine    command line arguments
+//
+//--------------------------------------------------------------------
+
+int CALLBACK LibMain(HINSTANCE hInstLocal, WORD wDataSegment, WORD wHeapSize, LPSTR lpszCmdLine) 
+{
+  hInstance = hInstLocal;
+  /* return result 1 = success; 0 = fail */
+  if (hInstance != NULL) 
+	  return 1;
+  else
+	  return 0;
+}
+
+#endif // WIN16
+

mozilla/mailnews/mapi/old/mapi32/makefile.win

@@ -0,0 +1,70 @@
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH=..\..\..
+MODULE=mapi32
+
+################################################################################
+## exports
+
+#EXPORTS =
+
+
+################################################################################
+## library
+
+LIBNAME = .\$(OBJDIR)\mapi32
+DEFINES= -NS_DEBUG
+DEFFILE=MAPI32.def
+
+!ifdef MOZ_STATIC_COMPONENT_LIBS
+LIB = $(LIBNAME).lib
+!else
+DLL = $(LIBNAME).dll
+!endif
+
+OBJS=										\
+    .\$(OBJDIR)\maindll.obj  \
+    .\$(OBJDIR)\mapi32.obj  \
+    .\$(OBJDIR)\mapiipc.obj  \
+    .\$(OBJDIR)\mapimem.obj  \
+    .\$(OBJDIR)\mapiutl.obj  \
+    .\$(OBJDIR)\smem.obj  \
+    .\$(OBJDIR)\trace.obj  \
+    .\$(OBJDIR)\xpapi.obj  \
+		$(NULL)
+
+LLIBS=										\
+			$(LLIBS)						\
+			$(LIBNSPR)						\
+			$(DIST)\lib\xppref32.lib		\
+			$(DIST)\lib\xpcom.lib       	\
+			$(DIST)\lib\mapiutils_s.lib  \
+			$(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+!ifdef MOZ_STATIC_COMPONENT_LIBS
+install:: $(LIB)
+	$(MAKE_INSTALL)  $(LIBNAME).$(LIB_SUFFIX) $(DIST)\bin\components
+!else
+install:: $(DLL)
+	$(MAKE_INSTALL)  $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin\components
+!endif

mozilla/mailnews/mapi/old/mapi32/mapi32.def

@@ -0,0 +1,14 @@
+EXPORTS
+	MAPILogon
+	MAPILogoff
+	MAPISendMail
+	MAPISendDocuments
+	MAPIFreeBuffer
+	MAPIFindNext
+	MAPIReadMail
+	MAPISaveMail
+	MAPIDeleteMail
+	MAPIAddress
+	MAPIDetails
+	MAPIResolveName
+  MAPIGetNetscapeVersion

mozilla/mailnews/mapi/old/mapi32/mapi32.rc

@@ -0,0 +1,146 @@
+// Insert copyright and license here 1997
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+ID_DIALOG_MAPI DIALOGEX 0, 0, 186, 111
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_TOOLWINDOW
+CAPTION "Netscape MAPI Support"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,41,95,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,104,95,50,14
+    GROUPBOX        "Diagnostic Information",IDC_STATIC,2,2,182,91
+    CTEXT           "This window will contain MAPI relative\ninformation for Netscape Communicator",
+                    IDC_STATIC,11,14,159,30
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+    ID_DIALOG_MAPI, DIALOG
+    BEGIN
+        LEFTMARGIN, 2
+        RIGHTMARGIN, 184
+        TOPMARGIN, 2
+        BOTTOMMARGIN, 109
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+#ifndef _MAC
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 5,0,0,1
+ PRODUCTVERSION 5,0,0,1
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments", "Simple MAPI DLL\0"
+            VALUE "CompanyName", "Netscape Communications Corporation\0"
+            VALUE "FileDescription", "mapi32\0"
+            VALUE "FileVersion", "5, 0, 0, 1\0"
+            VALUE "InternalName", "mapi32\0"
+            VALUE "LegalCopyright", "Copyright © 1997\0"
+            VALUE "LegalTrademarks", "Netscape and Netscape Navigator are registered trademarks of Netscape Communications Corporation.\0"
+            VALUE "OriginalFilename", "mapi32.dll\0"
+            VALUE "ProductName", "Netscape Communications Simple MAPI\0"
+            VALUE "ProductVersion", "5, 0, 0, 1\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // !_MAC
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

mozilla/mailnews/mapi/old/mapi32/mapiipc.cpp

@@ -0,0 +1,249 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+//  MAPI IPC Routines
+//  Written by: Rich Pizzarro (rhp@netscape.com)
+//  November 1997
+//
+#include <windows.h>
+#include <windowsx.h>
+#include <nscpmapi.h>   // Should live in Communicator
+
+#include "resource.h"
+#include "mapiipc.h"
+#include "mapismem.h"
+#include "trace.h"
+
+#ifndef WIN32
+#include <string.h>
+#endif 
+
+//
+// Necessary variables...
+//
+static LONG       instanceCount = 0;
+HWND				      hWndMAPI = NULL;
+char				      szClassName[] = "NetscapeMAPIClient";
+char              szWindowName[] = "NetscapeMAPI";
+
+//
+// External declares...
+//
+extern HINSTANCE  hInstance;
+
+void 
+ProcessCommand(HWND hWnd, int id, HWND hCtl, UINT codeNotify) 
+{ 
+	switch (id) 
+	{
+	case IDOK:   
+	case IDCANCEL:
+		{
+			ShowWindow(hWnd, SW_HIDE);
+		}
+		
+	default:
+		;
+	}
+}
+
+BOOL CALLBACK LOADDS 
+MyDlgProc(HWND hWndMain, UINT wMsg, WPARAM wParam, LPARAM lParam) 
+{
+  switch (wMsg) 
+  {
+  case WM_INITDIALOG: 
+    {
+      hWndMAPI = hWndMain;
+    }
+    break;
+    
+  case WM_CLOSE:
+//    DestroyWindow(hWndMain);
+    break;
+    
+  case WM_DESTROY:
+    hWndMain = NULL;
+    break;
+
+  case WM_COMMAND:
+	  HANDLE_WM_COMMAND(hWndMAPI, wParam, lParam, ProcessCommand);
+    break;
+
+  default:
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+BOOL 
+InitInstance(HINSTANCE hInstance)
+{
+  //
+  // Create a main window for this application instance.  
+  //
+  /* RICHIE - TRY SOME CHANGES!!!
+  hWndMAPI = CreateDialog((HINSTANCE) hInstance, 
+        MAKEINTRESOURCE(ID_DIALOG_QAHOOK),
+        (HWND) NULL, (DLGPROC) MyDlgProc);
+   ******/
+  hWndMAPI = CreateWindow(
+              szClassName,	// pointer to registered class name
+              szWindowName,	// pointer to window name
+              WS_CHILD,	    // window style
+              -10,          	// horizontal position of window
+              -10,	          // vertical position of window
+              1,	          // window width
+              1,	          // window height
+              GetDesktopWindow(),	// handle to parent or owner window
+              NULL,	        // handle to menu or child-window identifier
+              hInstance,	  // handle to application instance
+              NULL          // pointer to window-creation data
+              );
+  if (!hWndMAPI)
+    return FALSE;
+  else
+    return TRUE;
+}
+
+BOOL 
+InitApp(void)
+{
+#ifdef WIN32
+  WNDCLASS wc;
+  wc.style         = 0; 
+  wc.lpfnWndProc   = DefDlgProc; 
+  wc.cbClsExtra    = 0; 
+  wc.cbWndExtra    = DLGWINDOWEXTRA; 
+  wc.hInstance     = hInstance; 
+  wc.hIcon         = LoadIcon(hInstance, MAKEINTRESOURCE(ID_ICON_APP)); 
+  wc.hCursor       = LoadCursor(0, IDC_ARROW); 
+  wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
+  wc.lpszMenuName  = NULL; 
+  wc.lpszClassName = szClassName;
+  
+  if(!RegisterClass(&wc))
+    return FALSE;
+#endif
+  
+  return TRUE;
+} // end InitApp
+
+BOOL
+InitDLL(void)
+{
+  if (hWndMAPI != NULL)
+    return TRUE;
+
+  if (!InitApp()) 
+  { 
+    return FALSE;
+  }
+  
+  if (!InitInstance(hInstance)) 
+  {    
+    return FALSE;
+  }
+  
+//  ShowWindow(hWndMAPI, SW_SHOW);    Just for jollies
+  return(TRUE);
+}
+
+//*************************************************************
+//* Calls exposed for rest of DLL...
+//*************************************************************
+//
+// Purpose: Open the API
+// Return: 1 on success
+//         0 on failure
+//
+DWORD nsMAPI_OpenAPI(void)
+{
+  if (instanceCount > 0)
+  {
+    return(1);
+  }
+
+  ++instanceCount;
+  return(1);
+}
+
+//
+// Purpose: Close the API
+//
+void nsMAPI_CloseAPI(void)
+{
+  --instanceCount;
+  if (instanceCount <= 0)
+  {
+    instanceCount = 0;
+  }
+
+  return;
+}
+
+//
+// Send the actual request to Communicator
+//
+LRESULT
+SendMAPIRequest(HWND hWnd, 
+                DWORD mapiRequestID, 
+                MAPIIPCType *ipcInfo)
+{
+LRESULT         returnVal = 0;
+COPYDATASTRUCT  cds;
+
+  if (!InitDLL())
+  {
+    return 0;
+  }
+
+  cds.dwData = mapiRequestID;
+  cds.cbData = sizeof(MAPIIPCType);
+  cds.lpData = ipcInfo;
+
+  // Make the call into Communicator
+  returnVal = SendMessage(hWnd, WM_COPYDATA, (WPARAM) hWndMAPI, (LPARAM) &cds);
+
+  // Now kill the window...
+  DestroyWindow(hWndMAPI);
+  hWndMAPI = NULL;
+  UnregisterClass(szClassName, hInstance);
+  
+  return returnVal;
+}

mozilla/mailnews/mapi/old/mapi32/mapiipc.h

@@ -0,0 +1,63 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#ifndef __MAPIIPC_HPP__
+#define __MAPIIPC_HPP__
+
+#include "port.h"
+#include <nscpmapi.h>
+
+//********************************************************
+// Open and close functions for API
+//********************************************************
+// Open the API
+// Return: 1 on success, 0 on failure
+//
+DWORD nsMAPI_OpenAPI(void);
+
+//
+// Purpose: Close the API
+//
+void  nsMAPI_CloseAPI(void);
+
+//
+// Send the actual request to Communicator
+//
+LRESULT   SendMAPIRequest(HWND hWnd, 
+                DWORD mapiRequestID, 
+                MAPIIPCType *ipcInfo);
+
+#endif // __MAPIIPC_HPP__

mozilla/mailnews/mapi/old/mapi32/mapimem.cpp

@@ -0,0 +1,363 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+//  mem.cpp
+//  Written by: Rich Pizzarro (rhp@netscape.com)
+//  November 1997
+//  This implements various memory management functions for use with
+//  MAPI features of Communicator
+//
+#include <windows.h>     
+#include <memory.h> 
+#include <malloc.h>
+#include "mapimem.h"
+#include <nscpmapi.h>   // lives in communicator winfe
+#include "nsstrseq.h"
+#include "trace.h"
+#include "mapiutl.h"
+#include "xpapi.h"
+
+LPSTR
+CheckNullString(LPSTR inStr)
+{
+  static UCHAR  str[1];
+
+  str[0] = '\0';
+  if (inStr == NULL)
+    return((LPSTR)str);
+  else
+    return(inStr);
+}
+
+void
+FreeMAPIFile(lpMapiFileDesc pv)
+{
+  if (!pv)
+    return;
+
+  if (pv->lpszPathName != NULL)   
+    free(pv->lpszPathName);
+
+  if (pv->lpszFileName != NULL)   
+    free(pv->lpszFileName);
+}
+
+void
+FreeMAPIMessage(lpMapiMessage pv)
+{
+  ULONG i;
+
+  if (!pv)
+    return;
+
+  if (pv->lpszSubject != NULL)
+    free(pv->lpszSubject);
+
+  if (pv->lpszNoteText)
+      free(pv->lpszNoteText);
+  
+  if (pv->lpszMessageType)
+    free(pv->lpszMessageType);
+  
+  if (pv->lpszDateReceived)
+    free(pv->lpszDateReceived);
+  
+  if (pv->lpszConversationID)
+    free(pv->lpszConversationID);
+  
+  if (pv->lpOriginator)
+    FreeMAPIRecipient(pv->lpOriginator);
+  
+  for (i=0; i<pv->nRecipCount; i++)
+  {
+    if (&(pv->lpRecips[i]) != NULL)
+    {
+      FreeMAPIRecipient(&(pv->lpRecips[i]));
+    }
+  }
+
+  if (pv->lpRecips != NULL)
+  {
+    free(pv->lpRecips);
+  }
+
+  for (i=0; i<pv->nFileCount; i++)
+  {
+    if (&(pv->lpFiles[i]) != NULL)
+    {
+      FreeMAPIFile(&(pv->lpFiles[i]));
+    }
+  }
+
+  if (pv->lpFiles != NULL)
+  {
+    free(pv->lpFiles);
+  }
+  
+  free(pv);
+  pv = NULL;
+}
+
+void
+FreeMAPIRecipient(lpMapiRecipDesc pv)
+{
+  if (!pv)
+    return;
+
+  if (pv->lpszName != NULL)   
+    free(pv->lpszName);
+
+  if (pv->lpszAddress != NULL)
+    free(pv->lpszAddress);
+
+  if (pv->lpEntryID != NULL)
+    free(pv->lpEntryID);  
+}
+
+//
+// This routine will take an lpMapiMessage structure and "flatten" it into
+// one contiguous chunk of memory that can be easily passed around. After this
+// is done, "extract" routines will be written to get complicated string routines
+// out of the chunk of memory at the end.
+// 
+LPVOID
+FlattenMAPIMessageStructure(lpMapiMessage msg, DWORD *totalSize)
+{
+  MAPISendMailType    *mailPtr;
+  LPSTR               *strArray;
+  DWORD               strCount = 0;
+  DWORD               currentString = 0;
+  DWORD               arrayBufSize = 0;
+  DWORD               i;
+
+  *totalSize = 0;
+  if (!msg)
+    return(NULL);
+
+  //
+  // Allocate the initial structure to hold all of the mail info.
+  //
+  *totalSize = sizeof(MAPISendMailType);
+  mailPtr = (MAPISendMailType *) malloc(sizeof(MAPISendMailType));
+  if (!mailPtr)
+    return(NULL);
+  memset(mailPtr, 0, sizeof(MAPISendMailType));
+
+  //
+  // First, assign all of the easy numeric values...
+  //
+  mailPtr->MSG_flFlags = msg->flFlags;          // unread,return receipt
+  mailPtr->MSG_nRecipCount = msg->nRecipCount;  // Number of recipients
+  mailPtr->MSG_nFileCount = msg->nFileCount;    // # of file attachments
+  if (msg->lpOriginator != NULL)
+  {
+    mailPtr->MSG_ORIG_ulRecipClass = msg->lpOriginator->ulRecipClass; //  Recipient class - MAPI_TO, MAPI_CC, MAPI_BCC, MAPI_ORIG
+  }
+
+  //
+  // Now, figure out how many string pointers we need...
+  //
+  strCount = 4;     // These are the 4 KNOWN strings up front for a message
+  strCount += 2;    // This is for the originator name and address
+
+  strCount += msg->nRecipCount * 3; // Name, address & class (cc, bcc) for each recipient
+  strCount += msg->nFileCount  * 2; // filename and display name for each attachment
+
+  // 
+  // Now allocate a new string sequence...add one entry for NULL at the end
+  //  
+  arrayBufSize = sizeof(LPSTR) * (strCount + 1);
+
+#ifdef WIN16    // Check for max mem allocation...
+  if ((sizeof(MAPISendMailType) + arrayBufSize) > 64000)
+  {
+    free(mailPtr);
+    return NULL;
+  }
+#endif
+
+  //
+  // Allocate a buffer for the string pointers and if this fails, 
+  // cleanup and return.
+  // 
+  strArray = (LPSTR *)malloc( (size_t) arrayBufSize);
+  if (!strArray)
+  {
+    free(mailPtr);
+    return NULL;
+  }
+
+  memset(strArray, 0, (size_t) arrayBufSize);  // Set the array to NULL
+  strArray[currentString++] = CheckNullString(msg->lpszSubject);        // Message Subject
+  strArray[currentString++] = CheckNullString(msg->lpszNoteText);       // Message Text  
+  strArray[currentString++] = CheckNullString(msg->lpszDateReceived);   // in YYYY/MM/DD HH:MM format
+  strArray[currentString++] = CheckNullString(msg->lpszConversationID); // conversation thread ID
+
+  if (msg->lpOriginator)
+  {
+    strArray[currentString++] = CheckNullString(msg->lpOriginator[0].lpszName);
+    strArray[currentString++] = CheckNullString(msg->lpOriginator[0].lpszAddress);
+  }
+  else
+  {
+    strArray[currentString++] = CheckNullString(NULL);
+    strArray[currentString++] = CheckNullString(NULL);
+  }
+
+  //
+  // Assign pointers for the Name and address of each recipient
+  //
+  LPSTR toString  = "1";
+  LPSTR ccString  = "2";
+  LPSTR bccString = "3";
+
+  for (i=0; i<msg->nRecipCount; i++)
+  {
+    // rhp - need message class
+    if (msg->lpRecips[i].ulRecipClass == MAPI_BCC)
+      strArray[currentString++] = CheckNullString(bccString);
+    else if (msg->lpRecips[i].ulRecipClass == MAPI_CC)
+      strArray[currentString++] = CheckNullString(ccString);
+    else
+      strArray[currentString++] = CheckNullString(toString);
+
+    strArray[currentString++] = CheckNullString(msg->lpRecips[i].lpszName);
+    strArray[currentString++] = CheckNullString(msg->lpRecips[i].lpszAddress);  
+  }
+
+  BYTE    szNewFileName[_MAX_PATH];
+
+  for (i=0; i<msg->nFileCount; i++)
+  {
+    char *namePtr;
+    // have to copy/create temp files here of office won't work...
+
+    if ( 
+          (msg->lpFiles[i].lpszFileName != NULL) &&
+          (*msg->lpFiles[i].lpszFileName != '\0') 
+       )
+    {
+      namePtr = (char *)msg->lpFiles[i].lpszFileName;
+    }
+    else
+    {
+      namePtr = (char *)msg->lpFiles[i].lpszPathName;
+    }
+
+    if (GetTempMailNameWithExtension((char *)szNewFileName, namePtr) == 0)
+    {
+      free(strArray);
+      free(mailPtr);
+      return NULL;
+    }
+    
+    if (!XP_CopyFile((char *)msg->lpFiles[i].lpszPathName, (char *)szNewFileName, TRUE))
+    {
+      free(strArray);
+      free(mailPtr);
+      return NULL;
+    }
+
+    strArray[currentString++] = CheckNullString((char *)szNewFileName);
+    strArray[currentString++] = CheckNullString(msg->lpFiles[i].lpszFileName);
+
+    AddTempFile((LPSTR) szNewFileName);
+//    strArray[currentString++] = CheckNullString(msg->lpFiles[i].lpszPathName);
+//    strArray[currentString++] = CheckNullString(msg->lpFiles[i].lpszFileName);
+  }
+
+  if (currentString != strCount)
+  {
+    TRACE("MAPI PROBLEM!!!!!! FlattenMAPIMessageStructure() currentString != strCount\n");
+  }
+
+  strArray[strCount] = NULL;    // terminate at the end
+  NSstringSeq strSeq = NSStrSeqNew(strArray);
+  if (!strSeq)
+  {
+    free(strArray);
+    free(mailPtr);
+    return NULL;
+  }
+  
+  //
+  // Now we need to copy the structure into a big, contiguous chunk of memory
+  //
+  LONG totalArraySize = NSStrSeqSize(strSeq);
+  LONG totalMemSize = sizeof(MAPISendMailType) + totalArraySize;
+
+#ifdef WIN16
+  if (totalMemSize > 64000)
+  {
+    free(strArray);
+    NSStrSeqDelete(strSeq);
+    free(mailPtr);
+    return NULL;
+  }
+#endif
+
+  MAPISendMailType *newMailPtr = (MAPISendMailType *)malloc((size_t)totalMemSize);
+  if (!newMailPtr)
+  {
+    free(strArray);
+    NSStrSeqDelete(strSeq);
+    free(mailPtr);
+    return NULL;
+  }
+
+  memset(newMailPtr, 0, (size_t) totalMemSize);
+  //
+  // Finally do the copy...
+  //
+  memcpy(newMailPtr, mailPtr, sizeof(MAPISendMailType));
+  memcpy(newMailPtr->dataBuf, strSeq, (size_t) totalArraySize);
+  *totalSize = totalMemSize;
+
+  //
+  // Cleanup and scram...
+  //
+  if (strArray)
+    free(strArray);
+
+  if (strSeq)
+    NSStrSeqDelete(strSeq);
+
+  if (mailPtr)
+    free(mailPtr);
+
+  return(newMailPtr);
+}

mozilla/mailnews/mapi/old/mapi32/mapimem.h

@@ -0,0 +1,76 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#ifndef __MY_MEM_HPP__
+#define __MY_MEM_HPP__
+
+#ifndef MAPI_OLE	// Because MSFT doesn't do this for us :-(
+#include <mapi.h>                                                 
+#endif
+
+//
+// Needed for turning NULL's into ""'s for string sequence routines...
+//
+LPSTR     CheckNullString(LPSTR inStr);
+
+//
+// Memory allocation functions...
+//
+
+//
+// This will free an lpMapiMessage structure allocated by this DLL
+//
+void      FreeMAPIMessage(lpMapiMessage pv);
+
+//
+// This will free an lpMapiRecipDesc structure allocated by this DLL
+//
+void      FreeMAPIRecipient(lpMapiRecipDesc pv);
+
+//
+// Frees a mapi file object...
+//
+void      FreeMAPIFile(lpMapiFileDesc pv);
+
+//
+// This routine will take an lpMapiMessage structure and "flatten" it into
+// one contiguous chunk of memory that can be easily passed around. 
+// 
+LPVOID    FlattenMAPIMessageStructure(lpMapiMessage msg, DWORD *totalSize);
+
+
+
+#endif  // __MY_MEM_HPP__

mozilla/mailnews/mapi/old/mapi32/mapiutl.cpp

@@ -0,0 +1,899 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+//  Various utils needed for the MAPI functions
+//  Written by: Rich Pizzarro (rhp@netscape.com)
+//  November 1997
+//
+#include <windows.h> 
+#include <time.h> 
+#include <sys/stat.h>
+#include <io.h>
+#include "xpapi.h"
+#include "trace.h"
+#include "mapiipc.h"
+#include "mapiutl.h"
+
+//
+// Global variables
+//
+BOOL	  gLoggingEnabled = FALSE;
+
+void
+SetLoggingEnabled(BOOL val)
+{
+  gLoggingEnabled = val;
+}
+
+// Log File
+void 
+LogString(LPCSTR pStr1)
+{
+  // Off of the declaration line...
+  LPCSTR pStr2 = NULL;
+  BOOL useStr1 = TRUE;
+
+	if (gLoggingEnabled)
+	{
+		char tempPath[_MAX_PATH] = "";
+    if (getenv("TEMP"))
+    {
+      lstrcpy((LPSTR) tempPath, getenv("TEMP"));  // environmental variable
+    } 
+
+		int len = lstrlen(tempPath);
+		if ((len > 1) && tempPath[len - 1] != '\\')
+		{
+			lstrcat(tempPath, "\\");
+		}
+		lstrcat(tempPath, szMapiLog);
+		HFILE hFile = _lopen(tempPath, OF_WRITE);
+		if (hFile == HFILE_ERROR)
+		{
+			hFile = _lcreat(tempPath, 0);
+		}
+		if (hFile != HFILE_ERROR)
+		{
+			_llseek(hFile, 0, SEEK_END);		// seek to the end of the file
+			LPCSTR pTemp = useStr1 ? pStr1 : pStr2;
+			_lwrite(hFile, pTemp, lstrlen(pTemp));
+			_lclose(hFile);
+		}
+	}
+}
+
+//
+// Find Communicator and return an HWND, if not, start Communicator,
+// then find an HWND
+//
+HWND 
+GetCommunicatorIPCWindow(void)
+{
+  HWND  hWnd = NULL; 
+  DWORD timeCount = 0;
+  BOOL  launchTry = FALSE;
+
+  //
+  // This will wait for 10 seconds before giving up and failing
+  //
+  while ((hWnd == NULL) && (timeCount < 20))
+  {
+    if ((hWnd = FindWindow("AfxFrameOrView", NULL)) && !FindWindow("aHiddenFrameClass", NULL))
+      return(hWnd);
+    else if ((hWnd = FindWindow("aHiddenFrameClass", NULL)))
+      return(hWnd);
+
+    if (!launchTry)
+    {
+    char    szPath[_MAX_PATH] = "";
+		DWORD   nMAPIERROR; 
+
+      if ((nMAPIERROR = XP_GetInstallLocation(szPath, _MAX_PATH)) != SUCCESS_SUCCESS)
+      {
+        return(NULL); 
+      }
+		
+		  WORD nReturn = XP_CallProcess(szPath, " -MAPICLIENT");
+      launchTry = TRUE;
+    }
+
+    //
+    // Pause for 1/2 a second and try to connect again...
+    //
+#ifdef WIN32
+    Sleep(500);
+#else 
+    Yield();
+#endif        
+
+    timeCount++;
+  }
+
+	return(hWnd);
+}
+
+void
+BuildMemName(LPSTR name, ULONG winSeed)
+{
+  static DWORD    id = 0;
+
+  if (id == 0)
+  {
+    // Seed the random-number generator with current time so that
+    // the numbers will be different every time we run.
+    srand( (unsigned)time( NULL ) );
+    id = rand();
+  }
+
+  wsprintf(name, "MAPI_IPC_SMEM-%d", (winSeed + id++));
+  TRACE("Shared Memory Name = [%s]\n", name);
+}
+
+DWORD 
+ValidateFile(LPCSTR szFile) 
+{
+  	struct _stat buf;
+    int result;
+
+    result = _stat( szFile, &buf );
+    if (result != 0)
+      return(1);
+
+    if (!(buf.st_mode & S_IREAD))
+      return(2);
+
+    return(0);
+}
+
+//
+// return of zero is ok 
+// 1 = MAPI_E_ATTACHMENT_NOT_FOUND
+// 2 = MAPI_E_ATTACHMENT_OPEN_FAILURE
+//
+DWORD
+SanityCheckAttachmentFiles(lpMapiMessage lpMessage)
+{
+  ULONG i;
+  DWORD rc;
+
+  for (i=0; i<lpMessage->nFileCount; i++)
+  {
+    if ((rc = ValidateFile(lpMessage->lpFiles[i].lpszPathName)) != 0)
+    {
+      return(rc);
+    }
+  }
+
+  return(0);
+}
+
+DWORD 
+GetFileCount(LPSTR pFiles, LPSTR delimChar)
+{
+  DWORD   count = 1;
+	if ((!pFiles) || (!*pFiles))
+		return(0);
+
+  for (DWORD i=0; i<strlen(pFiles); i++)
+  {
+    if (pFiles[i] == delimChar[0])
+    {
+      ++count;
+    }
+  }
+
+  return(count);
+}
+
+//
+// Extract a filename from a string
+// Return TRUE if file found, else FALSE
+//
+BOOL
+ExtractFile(LPSTR pFiles, LPSTR delimChar, DWORD fIndex, LPSTR fName)
+{
+  LPSTR   ptr = pFiles;
+  DWORD   loc;
+  DWORD   count = 0;
+
+	if ((!pFiles) || (!*pFiles))
+		return(0);
+
+  // Get to the fIndex'th entry
+  for (loc=0; loc<strlen(pFiles); loc++)
+  {
+    if (count == fIndex)
+      break;
+    if (pFiles[loc] == delimChar[0])
+      count++;
+  }
+
+  if (loc >= strlen(pFiles))    // Got to the end of string!
+    return(FALSE);
+
+  lstrcpy(fName, (LPSTR)pFiles + loc);
+  //
+  // Truncate at 2nd delimiter
+  //
+  for (DWORD i=0; i<strlen(fName); i++)
+  {
+    if (fName[i] == delimChar[0])
+    {
+      fName[i] = '\0';
+      break;
+    }
+  }
+
+  return(TRUE);
+}
+
+ULONG
+GetFileSize(LPSTR fName)
+{
+  struct _stat buf;
+  int result;
+  
+  result = _stat( fName, &buf );
+  if (result != 0)
+    return(0);
+  
+  return(buf.st_size);
+}
+ 
+LPVOID
+LoadBlobToMemory(LPSTR fName)
+{
+  UCHAR     *ptr = NULL;
+  ULONG     bufSize = GetFileSize(fName);
+
+  if (bufSize == 0)
+  {
+    _unlink(fName);
+    return(NULL);
+  }
+
+  ptr = (UCHAR *)malloc( (size_t) bufSize);
+  if (!ptr)
+  {
+    _unlink(fName);
+    return(NULL);
+  }
+
+  HFILE hFile = _lopen(fName, OF_READ);
+  if (hFile == HFILE_ERROR)
+  {
+    _unlink(fName);
+    free(ptr);
+    return(NULL);
+  }
+
+  UINT numRead = _lread(hFile, ptr, (size_t) bufSize);
+  _lclose(hFile);
+
+  if (numRead != bufSize)
+  {
+    _unlink(fName);
+    free(ptr);
+    return(NULL);
+  }
+
+  _unlink(fName);
+	return(ptr);	
+}
+
+LONG
+WriteMemoryBufferToDisk(LPSTR fName, LONG bufSize, LPSTR buf)
+{
+  if (!buf)
+  {
+    return(-1);
+  }
+
+  HFILE hFile = _lcreat(fName, 0);
+  if (hFile == HFILE_ERROR)
+  {
+    return(-1);
+  }
+
+  LONG writeCount = _lwrite(hFile, buf, (size_t) bufSize);
+  _lclose(hFile);
+
+  if (writeCount != bufSize)
+  {
+    _unlink(fName);
+    return(-1);
+  }
+
+  return(0);
+}
+
+LPSTR
+GetTheTempDirectoryOnTheSystem(void)
+{
+ static UCHAR retPath[_MAX_PATH];
+  
+  if (getenv("TEMP"))
+  {
+    lstrcpy((LPSTR) retPath, getenv("TEMP"));  // environmental variable
+  } 
+  else if (getenv("TMP"))
+  {
+    lstrcpy((LPSTR) retPath, getenv("TMP"));  // How about this environmental variable?
+  }
+  else
+  {
+    GetWindowsDirectory((LPSTR) retPath, sizeof(retPath));
+  }
+
+  return((LPSTR) &(retPath[0]));
+}
+
+#ifdef WIN16
+int WINAPI EXPORT ISGetTempFileName(LPCSTR a_pDummyPath,  LPCSTR a_pPrefix, UINT a_uUnique, LPSTR a_pResultName)
+{
+#ifdef GetTempFileName	// we need the real thing comming up next...
+#undef GetTempFileName
+#endif
+	return GetTempFileName(0, a_pPrefix, a_uUnique, a_pResultName);
+}
+#endif
+
+LONG
+GetTempAttachmentName(LPSTR fName) 
+{
+  UINT        res;
+  static UINT uUnique = 1;
+
+  if (!fName)
+    return(-1);
+
+  LPSTR szTempPath = GetTheTempDirectoryOnTheSystem();
+
+TRYAGAIN:
+#ifdef WIN32
+  res = GetTempFileName(szTempPath, "MAPI", uUnique++, fName);
+#else
+  res = ISGetTempFileName(szTempPath, "MAPI", uUnique++, fName);
+#endif
+
+  if (ValidateFile(fName) != 1) 
+  {
+    if (uUnique < 32000)
+    {
+      goto TRYAGAIN;
+    }
+    else
+    {
+      return(-1);
+    }
+  }
+
+  return 0;
+}
+
+// RICHIE - strip all of the HTML stuff out of the message...
+int
+CheckForInlineHTML(char *noteBody, DWORD len, DWORD *curPos, char *newBody, DWORD *realLen)
+{
+  LPSTR   tags[] = {"&nbsp;", "&lt;", "&amp;", NULL};
+  UCHAR   tagsSubst[] = {' ', '<', '&', NULL};
+  int     x = 0;
+
+  while (tags[x])
+  {
+    // should we check for first tag
+    if ( (*curPos+strlen(tags[x])) < len)
+    {
+      if (strncmp(tags[x], noteBody, strlen(tags[x])) == 0)
+      {
+        *curPos += strlen(tags[x]) - 1;
+        newBody[*realLen] = tagsSubst[x];
+        *realLen += 1;
+        return(-1);
+      }
+    }
+
+    ++x;
+  }
+
+  return(0);
+}
+
+//
+// RICHIE - This is also temporary fix for now...
+//
+LPSTR
+StripSignedMessage(LPSTR noteText, DWORD totalCR) 
+{
+char    *newBuf;
+LPSTR   startTag = "<HTML>";
+LPSTR   endTag = "/HTML>";
+DWORD   i;
+DWORD   realLen = 0;
+DWORD   startPos = 0;
+DWORD   len = strlen(noteText);;
+
+  // create a new buffer...
+  newBuf = (char *) malloc((size_t)(len + totalCR));
+  if (!newBuf)
+    return(noteText);
+
+  newBuf[0] = '\0';
+
+  // First, find the start of the HTML for the message...
+  for (i=0; i<len; i++)
+  {
+    // should we check for first tag
+    if ( (i+strlen(startTag)) < len)
+    {
+      if (strncmp(startTag, (noteText + i), strlen(startTag)) == 0)
+      {
+        startPos = i + strlen(startTag);
+        break;
+      }
+    }
+  }
+
+  // Didn't find any HTML start tag
+  if (i == len)
+    return(noteText);
+
+  BOOL    inHTML = FALSE;
+  BOOL    firstChar = FALSE;
+
+  for (i=startPos; i<len; i++)
+  {
+    char  *ptr = (noteText + i);
+
+    if ( ((*ptr == 0x0D) || (*ptr == 0x20)) && (!firstChar) )
+      continue;
+    else
+      firstChar = TRUE;
+
+    // First, check for the end /HTML> tag
+    if ( (i+strlen(endTag)) < len)
+    {
+      if (strncmp(endTag, ptr, strlen(endTag)) == 0)
+      {
+        break;
+      }
+    }
+
+    // If we are in HTML, check for a ">"...
+    if (inHTML)
+    {
+      if (*ptr == '>')
+      {
+        inHTML = FALSE;
+      }
+      continue;
+    }
+
+    // Check for NEW HTML...
+    if (*ptr == '<')
+    {
+      inHTML = TRUE;
+      continue;
+    }
+
+    if (CheckForInlineHTML(ptr, len, &i, newBuf, &realLen))
+      continue;
+
+    newBuf[realLen++] = *ptr;
+    // Tack on a line feed if we hit a CR...
+    if ( *ptr == 0x0D )
+    {
+      newBuf[realLen++] = 0x0A;
+    }
+  }
+
+  // terminate the buffer - reallocate and move on...
+  newBuf[realLen++] = '\0';
+  newBuf = (LPSTR) realloc(newBuf, (size_t) realLen);
+
+  // check if the realloc worked and if so, free old memory and
+  // return...if not, just return the original buffer
+  if (!newBuf)
+  {
+    return(noteText);
+  }
+  else
+  {
+    free(noteText);
+    return(newBuf);
+  }
+}
+
+//
+// RICHIE - this is a temporary fix for now to get rid of
+// html stuff within the text of a message - if there was a
+// valid noteText buffer coming into this call, we need to 
+// free it on the way out.
+//
+LPSTR
+StripHTML(LPSTR noteText)
+{
+  char    *newBuf;
+  LPSTR   signTag = "This is a cryptographically signed message in MIME format.";
+  LPSTR   mimeTag = "This is a multi-part message in MIME format.";
+
+  DWORD   i;
+  DWORD   realLen = 0;
+  DWORD   totalCR = 0;
+
+  // do sanity checking...
+  if ((!noteText) || (!(*noteText)))
+    return(noteText);
+
+  // more sanity checking...
+  DWORD len = strlen(noteText) + 1;
+  if (len <= 0) 
+    return(noteText);
+
+  // Get the number of CR's in this message and add room for
+  // the LF's
+  for (i=0; i<len; i++)
+  {
+    if ( (*(noteText + i)) == 0x0D )
+      ++totalCR;
+  }
+
+  // This is a check for a signed message in the start of a message
+  // check for sign line...    
+  if ( strlen(signTag) < len)
+  {
+    if ( 
+        (strncmp(signTag, noteText, strlen(signTag)) == 0) ||
+        (strncmp(mimeTag, noteText, strlen(mimeTag)) == 0) 
+       )
+    {
+      return( StripSignedMessage(noteText, totalCR) );
+    }
+  }
+
+  // create a new buffer...
+  newBuf = (char *) malloc((size_t)(len + totalCR));
+  if (!newBuf)
+    return(noteText);
+
+  newBuf[0] = '\0';
+
+  BOOL    firstChar = FALSE;
+
+  // Now do the translation for the body of the note...
+  for (i=0; i<len; i++)
+  {
+    char  *ptr = (noteText + i);
+    
+    if ( ((*ptr == 0x0D) || (*ptr == 0x20)) && (!firstChar) )
+      continue;
+    else
+      firstChar = TRUE;
+
+    if (CheckForInlineHTML(ptr, len, &i, newBuf, &realLen))
+      continue;
+
+    newBuf[realLen++] = *ptr;
+    if ( *ptr == 0x0D )
+    {
+      newBuf[realLen++] = 0x0A;
+    }
+  }
+
+  // terminate the buffer - reallocate and move on...
+  newBuf[realLen++] = '\0';
+  newBuf = (LPSTR) realloc(newBuf, (size_t) realLen);
+
+  // check if the realloc worked and if so, free old memory and
+  // return...if not, just return the original buffer
+  if (!newBuf)
+  {
+    return(noteText);
+  }
+  else
+  {
+    free(noteText);
+    return(newBuf);
+  }
+}
+
+#ifdef WIN16
+
+void
+GetWin16TempName(LPSTR realFileName, LPSTR tempPath, 
+				 LPSTR szTempFileName, UINT uUnique)
+{
+  char	 *dotPtr = strrchr(realFileName, '.');
+  if (dotPtr != NULL)
+  {
+    *dotPtr = '\0';
+  }                
+  
+  int nameLen = lstrlen(realFileName); 
+  if (dotPtr != NULL)
+  {
+    *dotPtr = '.';
+  }
+  
+  if (nameLen <= 7)
+  {
+ 	wsprintf(szTempFileName, "%s\\%d%s", tempPath, uUnique, realFileName);
+  }
+  else
+  {
+  	wsprintf(szTempFileName, "%s\\%d%s", tempPath, uUnique, (realFileName + 1));
+  }
+}
+
+#endif
+
+#define MAXTRY  9999  // How many times do we try..
+
+UINT
+GetTempMailNameWithExtension(LPSTR szTempFileName, 
+                             LPSTR origName)
+{
+  UINT        res = 1;
+  UINT        uUnique = 0;
+  char        *szTempPath = GetTheTempDirectoryOnTheSystem();
+  char        *tmpPtr;
+  char        *realFileName = NULL;
+
+  if ( (origName != NULL) && (*origName != '\0') )
+  {
+    tmpPtr = origName;
+  }
+  else
+  {
+    tmpPtr = szTempFileName;
+  }
+
+  realFileName = strrchr(tmpPtr, '\\');
+  if (!realFileName)
+    realFileName = tmpPtr;
+  else
+    realFileName++;
+
+TRYAGAIN:
+
+#ifdef WIN32
+  if (uUnique == 0)
+  {
+    wsprintf(szTempFileName, "%s\\%s", szTempPath, realFileName);
+  }
+  else
+  {
+    wsprintf(szTempFileName, "%s\\%d_%s", 
+                szTempPath, uUnique, realFileName);
+  }
+#else // WIN16
+  if ( (uUnique == 0) && (strlen(realFileName) <= 12) )
+  {
+    wsprintf(szTempFileName, "%s\\%s", szTempPath, realFileName);
+  }
+  else
+  {              
+    if (uUnique < 10)
+    {
+      GetWin16TempName(realFileName, szTempPath, szTempFileName, uUnique);
+    }
+    else 
+    { 
+      res = ISGetTempFileName(szTempPath, "ns", uUnique++, szTempFileName);    
+    }
+
+    // Now add the correct extension...
+    char *origExt = strrchr(realFileName, '.');
+    if (origExt != NULL)
+    {
+      char *tmpExt = strrchr(szTempFileName, '.');
+      if (tmpExt != NULL)
+      {
+        origExt++;
+        tmpExt++;
+
+        while ( ((tmpExt) && (origExt)) && (*origExt != '\0') )
+        {
+          *tmpExt = *origExt;
+          tmpExt++;
+          origExt++;
+        }
+
+        *tmpExt = '\0';
+      }
+    }
+  }
+#endif
+
+  if ( (ValidateFile(szTempFileName) != 1) && (uUnique < MAXTRY) )
+  {
+    uUnique++;
+    if (uUnique >= MAXTRY)
+      return(1);
+    goto TRYAGAIN;
+  }
+
+  return res;
+}
+
+#define kMaxTempFiles   10
+#define kMaxListLength  (10 * _MAX_PATH)
+
+void GetTempFiles(LPSTR pBuf, int lenBuf)
+{
+  if (!GetConfigInfoStr(szMapiSection, szTempFiles, pBuf, lenBuf, HKEY_ROOT))
+  {
+    *pBuf = 0;
+  }
+}
+
+void WriteTempFiles(LPSTR pBuf)
+{
+  SetConfigInfoStr(szMapiSection, szTempFiles, pBuf, HKEY_ROOT);
+}
+
+void  AddTempFile(LPCSTR pFileName)
+{
+  if ( (!pFileName) || (pFileName[0] == '\0') )
+    return;
+
+  char *files = (char *)malloc(kMaxListLength);
+
+  if (!files)
+    return;
+
+  GetTempFiles(files, kMaxListLength);
+  if ((lstrlen(files) + lstrlen(pFileName) + 2) >= kMaxListLength)
+  {
+    free(files);
+    return;
+  }
+
+  if (lstrlen(files) != 0)
+  {
+          lstrcat(files, ";");
+  }
+
+  lstrcat(files, pFileName);
+  WriteTempFiles(files);
+  free(files);
+}
+
+void DeleteFirstTempFile(LPSTR pFiles)
+{
+  if (!*pFiles)
+    return;
+  LPSTR pTemp = strchr(pFiles, ';');
+  if (pTemp)
+  {
+    *pTemp = 0;
+  }
+ 
+//#ifndef _DEBUG  
+  _unlink(pFiles);
+//#endif
+
+  if (pTemp)
+  {
+    memmove(pFiles, pTemp + 1, lstrlen(pTemp + 1) + 1);
+  }
+  else
+  {
+    *pFiles = 0;
+  }
+}
+
+void 
+RemoveAllTempFiles(void)
+{
+  char *files = (char *)malloc(kMaxListLength);
+
+  if (!files)
+    return;
+
+  GetTempFiles(files, kMaxListLength);
+
+  while (*files)
+  {
+    DeleteFirstTempFile(files);
+  }
+
+  WriteTempFiles(files);
+  free(files);
+}
+
+void CheckAgeTempFiles(void)
+{
+  char *files = (char *)malloc(kMaxListLength);
+
+  if (!files)
+    return;
+
+  GetTempFiles(files, kMaxListLength);
+  int i = 0;
+  LPSTR pTemp = files;
+  while (TRUE)
+  {
+    pTemp = strchr(pTemp, ';');
+    if (!pTemp)
+      break;
+    ++pTemp;
+    ++i;
+  }
+
+  if (i >= 10)
+  {
+    DeleteFirstTempFile(files);
+    WriteTempFiles(files);
+  }
+
+  free(files);
+}
+
+void 
+CleanupMAPITempFiles(void)
+{
+  if (Is_16_OR_32_BIT_CommunitorRunning() == 0)
+  {
+    RemoveAllTempFiles();           // if Communicator not running, clean up all the temp files
+  }
+  else
+  {
+    CheckAgeTempFiles();
+  }
+}
+
+void *
+CleanMalloc(size_t mallocSize)
+{
+  void *ptr = malloc(mallocSize);
+  if (!ptr)
+    return(NULL);
+
+  memset(ptr, 0, mallocSize);
+  return(ptr);
+}
+
+void
+SafeFree(void *ptr)
+{
+  if (!ptr)
+    return;
+
+  free(ptr);
+  ptr = NULL;
+}

mozilla/mailnews/mapi/old/mapi32/mapiutl.h

@@ -0,0 +1,89 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#ifndef __UTILS_
+#define __UTILS_
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#ifndef MAPI_OLE	// Because MSFT doesn't do this for us :-(
+#include <mapi.h>
+#endif
+
+//
+// Utility functions...
+//
+void    SetLoggingEnabled(BOOL val);    // Set a logging enabled flag
+void    LogString(LPCSTR pStr1);        // Log a string to a file...
+void    BuildMemName(LPSTR name, ULONG winSeed);  // Shared memory name
+HWND    GetCommunicatorIPCWindow(void);    // Get the IPC window we will use...
+DWORD   SanityCheckAttachmentFiles(lpMapiMessage lpMessage); // Check attachments
+DWORD   ValidateFile(LPCSTR szFile);       // Is this a valid file - 0=Yes 1 = NOT_FOUND 2 = OPEN_FAILURE
+
+DWORD   GetFileCount(LPSTR pFiles, LPSTR delimChar); // Get File count from string of file1;file2, etc..
+BOOL    ExtractFile(LPSTR pFiles, LPSTR delimChar, DWORD fIndex, LPSTR fName); // Extract a filename from a string
+
+LPVOID  LoadBlobToMemory(LPSTR fName);  // Load the blob into memory!
+LONG    GetTempAttachmentName(LPSTR fName); // Get a temp file name and put it in fName
+
+UINT    GetTempMailNameWithExtension(LPSTR szTempFileName, LPSTR origName);
+void    CleanupMAPITempFiles(void);
+void  AddTempFile(LPCSTR pFileName);
+
+void    *CleanMalloc(size_t mallocSize);
+void    SafeFree(void *ptr);
+
+//
+// RICHIE - this is a temporary fix for now to get rid of
+// html stuff within the text of a message - if there was a
+// valid noteText buffer coming into this call, we need to 
+// free it on the way out.
+//
+LPSTR   StripHTML(LPSTR noteText);
+
+//
+// Write a buffer to disk
+// Return 0 on success -1 on failure
+//
+LONG    WriteMemoryBufferToDisk(LPSTR fName, LONG bufSize, LPSTR buf); 
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __UTILS_

mozilla/mailnews/mapi/old/mapi32/port.h

@@ -0,0 +1,303 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+
+#ifndef PORT_H
+#define PORT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*****************************************************************\
+ *                                                               *
+ *  PORT.H                                                       *
+ *                                                               *
+ *  Win16/Win32 portability stuff                                *
+ *                                                               *
+ *  A.Sokolsky                                                   *
+ *      3.10.94 distilled into this header                       *
+ *                                                               *
+\*****************************************************************/
+
+/*
+ * calling conventions
+ */
+#include <assert.h>
+                                                      
+                                                      
+#ifndef CDECL
+#define CDECL __cdecl
+#endif  // CDECL
+
+#ifndef PASCAL
+#define PASCAL __pascal
+#endif  // PASCAL
+
+#ifdef FASTCALL
+#error FASTCALL defined
+#endif // FASTCALL
+
+
+#ifdef NDEBUG
+#define FASTCALL __fastcall
+#else
+#define FASTCALL PASCAL
+#endif // NDEBUG   
+
+
+
+#ifndef HWND2DWORD
+#  ifdef WIN32
+#    define HWND2DWORD(X_hWnd) ( (DWORD)(X_hWnd) )
+#  else // WIN16
+#    define HWND2DWORD(X_hWnd) ( (DWORD)MAKELONG(((WORD)(X_hWnd)), 0) )
+#  endif
+#endif // HWND2DWORD
+
+
+/*
+ * WIN16 - WIN32 compatibility stuff
+ */
+
+#ifdef WIN32
+
+# define DLLEXPORT    __declspec( dllexport )
+# define EXPORT
+# define LOADDS
+# define HUGE
+# ifndef FAR
+#  define FAR
+# endif // FAR
+# ifndef NEAR
+#  define NEAR
+# endif // NEAR 
+# ifdef UNICODE
+#  define SIZEOF(x)   (sizeof(x)/sizeof(WCHAR))
+# else
+#  define SIZEOF(x)   sizeof(x)
+# endif
+
+#else  // !WIN32 == WIN16
+
+# define DLLEXPORT    
+# define EXPORT       __export
+# define LOADDS       __loadds
+# define HUGE         __huge
+# ifndef FAR
+#   define FAR        __far
+#   define NEAR       __near
+# endif  // FAR
+# define CONST const
+# define SIZEOF(x)    sizeof(x)
+# define CHAR char
+# define TCHAR char
+# define WCHAR char
+# ifndef LPTSTR
+#   define LPTSTR LPSTR
+# endif
+# ifndef LPCTSTR 
+#   define LPCTSTR LPCSTR
+# endif
+# define UNREFERENCED_PARAMETER(x) x;
+# ifndef TEXT
+#   define TEXT(x) x
+# endif
+# define GetWindowTextW GetWindowText
+# define lstrcpyW lstrcpy   
+
+# define BN_DBLCLK BN_DOUBLECLICKED // ~~MRJ needed for custom control.
+// ~~MRJ begin Win95 backward compat section
+# define LPWSTR LPSTR
+# define LPCWSTR LPCSTR
+
+// button check state for WIN16
+#ifndef BST_UNCHECKED
+#define BST_UNCHECKED      0x0000
+#endif
+
+#ifndef BST_CHECKED
+#define BST_CHECKED        0x0001
+#endif
+
+
+#ifndef WIN95_COMPAT
+#  define WIN95_COMPAT
+#endif
+
+// ~~MRJ end Win95 compat section.
+
+// critical section API stubs
+typedef DWORD CRITICAL_SECTION;
+typedef CRITICAL_SECTION FAR * LPCRITICAL_SECTION; 
+#ifdef __cplusplus
+inline void InitializeCriticalSection(LPCRITICAL_SECTION lpSection) {}
+inline void DeleteCriticalSection(LPCRITICAL_SECTION lpSection) {}
+inline void EnterCriticalSection(LPCRITICAL_SECTION lpSection) {}
+inline void LeaveCriticalSection(LPCRITICAL_SECTION lpSection) {} 
+#endif // __cplusplus 
+
+// Added for nssock16 ---Neeti
+#ifndef ZeroMemory
+#include <memory.h>
+#define ZeroMemory(PTR, SIZE) memset(PTR, 0, SIZE)
+#endif // ZeroMemory
+
+#endif // WIN16
+
+/*
+ * unix - windows compatibility stuff
+ */
+typedef DWORD u_int32;
+typedef WORD  u_int16;
+typedef BYTE  u_int8;
+#ifdef WIN32
+typedef short int Bool16;
+#else  // WIN16
+typedef BOOL  Bool16;
+#endif // WIN16
+
+/*
+ * Cross Platform Compatibility
+ */
+#ifndef UNALIGNED
+# ifdef _M_ALPHA
+#  define UNALIGNED __unaligned
+# else  // !_M_ALPHA
+#  define UNALIGNED
+# endif // !_M_ALPHA
+#endif  // UNALIGNED
+
+//
+// RICHIE - for the Alpha port
+//
+#ifdef _M_ALPHA
+# undef pascal
+# undef PASCAL
+# if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED)
+#  define pascal __stdcall
+#  define PASCAL __stdcall
+# else
+#  define PASCAL
+# endif
+#endif
+
+
+/*
+ * Useful Types
+ */
+typedef char HUGE *HPSTR;
+typedef const char HUGE *HPCSTR;
+typedef unsigned char HUGE *HPBYTE;
+typedef WORD HUGE *HPWORD;
+typedef UINT FAR *LPUINT;
+typedef BOOL (CALLBACK *USERABORTPROC)();
+typedef BOOL (CALLBACK *PROGRESSPROC)(UINT uPos, UINT uRange);
+typedef int INT;   // ~~MRJ a function needed this defined.
+typedef MINMAXINFO FAR *LPMINMAXINFO; // ~~MRJ 
+
+//
+// stuff missing from windows.h
+//
+#ifndef MAKEWORD
+#define MAKEWORD(low, high)    ((WORD)(((BYTE)(low)) | (((WORD)((BYTE)(high))) << 8)))
+#endif // MAKEWORD
+
+#ifdef WIN32
+# ifndef hmemcpy
+#  define hmemcpy memcpy
+# endif // !defined(hmemcpy)
+# define _fmemset memset
+
+# include <malloc.h>
+
+#ifdef __cplusplus
+
+inline BOOL IsGDIObject(HGDIOBJ hObj) { return (hObj != 0); }
+inline void *_halloc(long num, unsigned int size) { return malloc(num * size); }
+inline void _hfree( void *memblock ) { free(memblock); } 
+/*
+inline BOOL IsInstance(HINSTANCE hInst) {
+# ifdef WIN32
+    return (hInst != 0);
+# else // WIN16
+    return (hInst > HINSTANCE_ERROR);
+# endif  
+}  
+*/
+
+#endif // __cplusplus
+
+  WINUSERAPI HANDLE WINAPI LoadImageA(HINSTANCE, LPCSTR, UINT, int, int, UINT);
+
+#endif // WIN32
+
+#ifdef __cplusplus 
+inline BOOL IsInstance(HINSTANCE hInst) {
+# ifdef WIN32
+    return (hInst != 0);
+# else // WIN16
+    return (hInst > HINSTANCE_ERROR);
+# endif  
+} 
+inline void SetWindowSmallIcon(HINSTANCE hInst, HWND hWnd, UINT uIconResourceId) {
+#ifdef WIN32
+# ifndef WM_SETICON
+#   define WM_SETICON 0x0080
+# endif  // WM_SETICON
+# ifndef IMAGE_ICON
+#   define IMAGE_ICON 1
+# endif
+  assert(IsWindow(hWnd));
+  HICON hIcon = (HICON)LoadImageA(hInst, MAKEINTRESOURCE(uIconResourceId), IMAGE_ICON,
+    16, 16, 0);
+  if(NULL != hIcon) {
+    SendMessage(hWnd, WM_SETICON, FALSE, (LPARAM)hIcon);
+  } else {
+    HICON hIcon = LoadIcon(hInst, MAKEINTRESOURCE(uIconResourceId));
+    assert(hIcon != 0);
+    SendMessage(hWnd, WM_SETICON, FALSE, (LPARAM)hIcon);
+  }
+#endif // WIN32
+}
+#endif // __cplusplus
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* PORT_H */

mozilla/mailnews/mapi/old/mapi32/resource.h

@@ -0,0 +1,54 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by mapi32.rc
+//
+#define ID_DIALOG_QAHOOK                101
+#define ID_DIALOG_MAPI                  101
+#define ID_ICON_APP                     102
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        103
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1000
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

mozilla/mailnews/mapi/old/mapi32/smem.cpp

@@ -0,0 +1,172 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+//  smem.cpp - This deals with all shared memory functions needed for 
+//  the MAPI component of Communicator
+//  Written by: Rich Pizzarro (rhp@netscape.com)
+//  November 1997
+//
+#include <windows.h>
+#include <windowsx.h>
+
+#include "mapismem.h"
+
+#ifndef ZeroMemory
+#include <memory.h>
+#define ZeroMemory(PTR, SIZE) memset(PTR, 0, SIZE)
+#endif // ZeroMemory
+
+// 
+// *create new* shared memory chunk 
+// once this is created, use the pointer
+// to the segment to to store data 
+// e.g.: 
+//     lpString = "string for communicator"; 
+//     lstrcpy((LPSTR)pData->m_buf[0], lpString); 
+//  
+CSharedMem *
+NSCreateSharedMemory(DWORD memSize, LPCTSTR memName, HANDLE *hSharedMemory)
+{
+#ifdef WIN32
+
+  BOOL bExistedBefore;
+  CSharedMem *pData;
+
+  LPCTSTR szObjectName = memName; 
+  DWORD dwSize = sizeof(CSharedMem) + memSize; 
+  *hSharedMemory = CreateFileMapping( 
+    (HANDLE)0xFFFFFFFF,0,PAGE_READWRITE,0,dwSize,szObjectName); 
+  if(*hSharedMemory == 0) 
+  { 
+    return NULL; 
+  } 
+  bExistedBefore = (GetLastError() == ERROR_ALREADY_EXISTS); 
+  if(bExistedBefore) 
+  { 
+  	return NULL;
+  } 
+
+  pData = (CSharedMem *)MapViewOfFile( 
+            *hSharedMemory, FILE_MAP_ALL_ACCESS, 0, 0, 0); 
+  if(pData == NULL) 
+  { 
+    return NULL; 
+  } 
+
+  ZeroMemory(pData, dwSize); 
+  pData->m_dwSize = memSize; 
+
+  return pData;
+#else
+  CSharedMem 	*sMemChunk = NULL;
+  DWORD dwSize = memSize = (sizeof(CSharedMem) + memSize); 
+
+  if (sMemChunk != NULL)
+	  return(sMemChunk);
+
+  sMemChunk = (CSharedMem *) GlobalAllocPtr(GMEM_MOVEABLE, dwSize);
+  ZeroMemory(sMemChunk, (size_t) dwSize);
+  sMemChunk->m_dwSize = dwSize;   // Missing in Communicator code!
+  return(sMemChunk);
+
+#endif // WIN32
+}
+
+// 
+// *open existing* shared memory chunk 
+// once you have the pointer to the new segment 
+// use this pointer to access data, e.g.: 
+// 
+CSharedMem *
+NSOpenExistingSharedMemory(LPCTSTR memName, HANDLE *hSharedMemory)
+{
+#ifdef WIN32
+  CSharedMem *pData;
+  DWORD dwSize;
+
+  LPCTSTR szObjectName = memName; 
+  *hSharedMemory = OpenFileMapping( 
+    PAGE_READWRITE,FALSE,szObjectName); 
+  if(*hSharedMemory == 0) 
+  { 
+    return NULL; 
+  } 
+
+  pData = (CSharedMem *)MapViewOfFile( 
+              *hSharedMemory,FILE_MAP_ALL_ACCESS,0,0,0); 
+  if(pData == NULL) 
+  { 
+    return NULL; 
+  } 
+  
+  dwSize = pData->m_dwSize; 
+  return pData;
+#else
+
+  return(NULL);   // In Win16, this is really meaningless...
+
+#endif
+}  
+
+// 
+// to close shared memory segment
+// 
+void
+NSCloseSharedMemory(CSharedMem *pData, HANDLE hSharedMemory)
+{
+#ifdef WIN32
+  if(pData != 0) 
+  { 
+    UnmapViewOfFile(pData); 
+    pData = 0; 
+  } 
+
+  if(hSharedMemory != 0) 
+  { 
+    CloseHandle(hSharedMemory); 
+    hSharedMemory = 0; 
+  } 
+#else
+
+	if (pData != NULL)
+	{
+		GlobalFreePtr(pData);
+		pData = NULL;
+	}
+
+#endif // WIN32
+}

mozilla/mailnews/mapi/old/mapi32/trace.cpp

@@ -0,0 +1,68 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#include <windows.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <tchar.h>
+#include "trace.h"
+
+#ifdef _DEBUG 
+
+#ifndef WIN16
+void CDECL AfxTrace(LPCTSTR lpszFormat, ...)
+#else                                       
+void CDECL AfxTrace(LPCSTR lpszFormat, ...)
+#endif
+{
+  va_list args;
+	va_start(args, lpszFormat);
+
+	int nBuf;
+	TCHAR szBuffer[512];
+
+	nBuf = _vstprintf(szBuffer, lpszFormat, args);
+	va_end(args);
+  OutputDebugString(szBuffer); 
+  return;
+}
+
+BOOL AfxAssertFailedLine(LPCSTR lpszFileName, int nLine)
+{    
+	return TRUE;
+}
+
+#endif

mozilla/mailnews/mapi/old/mapi32/trace.h

@@ -0,0 +1,81 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#include <windows.h>
+
+#ifdef _DEBUG
+BOOL AfxAssertFailedLine(LPCSTR lpszFileName, int nLine);
+
+#ifndef WIN16
+void CDECL AfxTrace(LPCTSTR lpszFormat, ...);
+#else
+void CDECL AfxTrace(LPCSTR lpszFormat, ...);
+#endif
+
+#define TRACE              ::AfxTrace
+#define THIS_FILE          __FILE__
+#define ASSERT(f) \
+	do \
+	{ \
+	if (!(f) && AfxAssertFailedLine(THIS_FILE, __LINE__)) \
+		AfxDebugBreak(); \
+	} while (0) \
+
+#define VERIFY(f)          ASSERT(f)
+#define TRACE_FN(name) LogFn __logFn(name)
+class LogFn
+{
+public:
+	LogFn(LPCSTR pFnName) {m_pFnName = pFnName; TRACE("--%s: In--\n", pFnName);}
+	~LogFn() {TRACE("--%s: Out--\n", m_pFnName);}
+private:
+	LPCSTR m_pFnName;
+};
+#else
+// NDEBUG
+#define ASSERT(f)          ((void)0)
+#define VERIFY(f)          ((void)(f))
+#define ASSERT_VALID(pOb)  ((void)0)
+#define DEBUG_ONLY(f)      ((void)0)   
+#ifdef WIN32
+inline void CDECL AfxTrace(LPCTSTR, ...) { }
+#else
+inline void CDECL AfxTrace(LPCSTR, ...) { }
+#endif
+#define TRACE              1 ? (void)0 : ::AfxTrace
+#define TRACE_FN(name)
+#endif // _DEBUG
+

mozilla/mailnews/mapi/old/mapi32/xpapi.cpp

@@ -0,0 +1,347 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+//  XPAPI.CPP
+//  API implementation file for mapi16.dll and mapi32.dll
+//  Written by: Rich Pizzarro (rhp@netscape.com)
+//  November 1997
+//
+#include <windows.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include "xpapi.h"
+#include "mapiutl.h"
+
+WORD LOAD_DS XP_CallProcess(LPCSTR pPath, LPCSTR pCmdLine)
+{            
+	WORD wReturn = 0;
+#ifndef WIN16
+	STARTUPINFO startupInfo;
+	PROCESS_INFORMATION processInfo;
+
+	memset(&startupInfo, 0, sizeof(startupInfo));
+	startupInfo.cb = sizeof(startupInfo);
+	if (wReturn = CreateProcess(pPath, (LPTSTR)pCmdLine, NULL, NULL, FALSE, CREATE_DEFAULT_ERROR_MODE | CREATE_NEW_PROCESS_GROUP, NULL, NULL, &startupInfo, &processInfo))
+	{
+		WaitForInputIdle(processInfo.hProcess, 120000);
+	}
+#else       
+	// char szMsg[80];	
+	char szExecute[512];
+	lstrcpy(szExecute, pPath);
+	lstrcat(szExecute, " ");
+	lstrcat(szExecute, pCmdLine);
+	wReturn = WinExec(szExecute,SW_SHOW);
+	
+	if (wReturn < 32) 
+	{
+	    wReturn = 0;
+	}
+#endif
+	return wReturn;
+}
+
+HKEY LOAD_DS RegOpenParent(LPCSTR pSection, HKEY hRootKey, REGSAM access)
+{
+	HKEY hKey;
+#ifndef WIN16
+	if (RegOpenKeyEx(hRootKey, pSection, 0, access, &hKey) != ERROR_SUCCESS)
+	{
+		return(NULL);
+	}        
+#else
+    if (RegOpenKey(hRootKey, pSection, &hKey) != ERROR_SUCCESS)
+    {
+    	return(NULL);
+    }
+#endif
+	return(hKey);
+}
+
+HKEY LOAD_DS RegCreateParent(LPCSTR pSection, HKEY hMasterKey)
+{
+	HKEY hKey;
+	if (RegCreateKey(hMasterKey, pSection, &hKey) != ERROR_SUCCESS)
+	{
+		return(NULL);
+	}        
+	return(hKey);
+}
+
+BOOL LOAD_DS GetConfigInfoStr(LPCSTR pSection, LPCSTR pKey, LPSTR pBuf, int lenBuf, HKEY hMasterKey)
+{
+	HKEY hKey;
+	hKey = RegOpenParent(pSection, hMasterKey, KEY_QUERY_VALUE);
+	if (!hKey)
+	{
+		return(FALSE);
+	}
+
+	DWORD len = (DWORD)lenBuf;
+#ifndef WIN16
+	BOOL retVal = (RegQueryValueEx(hKey, pKey, NULL, NULL, (LPBYTE)pBuf, &len) == ERROR_SUCCESS);
+#else
+	BOOL retVal = (RegQueryValue(hKey, pKey, pBuf, (long far*)&len) == ERROR_SUCCESS);
+#endif
+	RegCloseKey(hKey);
+	return(retVal);
+}
+
+BOOL LOAD_DS GetConfigInfoNum(LPCSTR pSection, LPCSTR pKey, DWORD* pVal, HKEY hMasterKey)
+{
+	HKEY hKey;
+	hKey = RegOpenParent(pSection, hMasterKey, KEY_QUERY_VALUE);
+	if (!hKey)
+	{
+		return(FALSE);
+	}
+
+	DWORD len = sizeof(DWORD);
+#ifndef WIN16
+	BOOL retVal = (RegQueryValueEx(hKey, pKey, NULL, NULL, (LPBYTE)pVal, &len) == ERROR_SUCCESS);
+#else
+	BOOL retVal = (RegQueryValue(hKey, pKey, (char far*)pVal, (long far*)&len) == ERROR_SUCCESS);
+#endif
+	RegCloseKey(hKey);
+	return(retVal);
+}
+
+BOOL LOAD_DS SetConfigInfoStr(LPCSTR pSection, LPCSTR pKey, LPSTR pStr, HKEY hMasterKey)
+{
+	HKEY hKey;
+	hKey = RegCreateParent(pSection, hMasterKey);
+	if (!hKey)
+	{
+		return(FALSE);
+	}
+#ifndef WIN16
+	BOOL retVal = (RegSetValueEx(hKey, pKey, 0, REG_SZ, (LPBYTE)pStr, lstrlen(pStr) + 1) == ERROR_SUCCESS);
+#else
+	BOOL retVal = (RegSetValue(hKey, pKey, REG_SZ, pStr, lstrlen(pStr) + 1) == ERROR_SUCCESS);
+#endif
+	RegCloseKey(hKey);
+	return(retVal);
+}
+
+
+BOOL LOAD_DS XP_GetInstallDirectory(LPCSTR pcurVersionSection, LPCSTR pInstallDirKey, LPSTR path, UINT nSize, HKEY hKey)
+{   
+#ifdef WIN32   
+	if (!GetConfigInfoStr(pcurVersionSection, pInstallDirKey, path, nSize, hKey))
+	{  
+		return FALSE;
+	}
+	else
+	{
+		return TRUE;
+	}       
+#else
+	if ( 0 < GetPrivateProfileString(pcurVersionSection, pInstallDirKey,"ERROR", path, nSize, szNetscapeINI))
+	{
+		return TRUE;
+	}
+	else
+	{
+		return FALSE;
+	}
+#endif
+}
+
+
+BOOL LOAD_DS XP_GetVersionInfoString(LPCSTR pNavigatorSection, LPCSTR pCurrentVersionKey, LPSTR pcurVersionStr, UINT nSize, HKEY hKey)
+{ 
+#ifdef WIN32
+	if (!GetConfigInfoStr(pNavigatorSection, pCurrentVersionKey, pcurVersionStr, nSize, HKEY_LOCAL_MACHINE))
+	{
+		return FALSE;
+	}               
+	else
+	{
+		return TRUE;
+	}
+#else 
+	if ( 0 < GetPrivateProfileString(pNavigatorSection, pCurrentVersionKey,"ERROR", pcurVersionStr, nSize, szNetscapeINI))
+	{
+		return TRUE;
+	}
+	else
+	{
+		return FALSE;
+	}
+#endif
+
+}   
+
+DWORD LOAD_DS XP_GetInstallLocation(LPSTR pPath, UINT nSize)
+{           
+char curVersionStr[256]; 
+char curVersionSection[256];
+
+  if (!pPath) 
+    return  MAPI_E_LOGON_FAILURE;
+  
+#ifdef WIN32
+  if (!XP_GetVersionInfoString(szNavigatorSection, szCurrentVersionKey, curVersionStr, 
+    sizeof(curVersionStr), HKEY_LOCAL_MACHINE))
+  {
+    return (MAPI_E_LOGON_FAILURE);
+  }
+  
+  wsprintf(curVersionSection, szNavigatorCurVersionSection, curVersionStr);
+		
+  if (!XP_GetInstallDirectory(curVersionSection, szInstallDirKey, pPath, 
+    nSize, HKEY_LOCAL_MACHINE))
+  {
+    return (MAPI_E_ACCESS_DENIED);
+    
+  }
+  
+  lstrcat(pPath, "\\");
+  lstrcat(pPath, "Program\\netscape.exe");
+  
+  return SUCCESS_SUCCESS;
+#else
+  if (32 == Is_16_OR_32_BIT_CommunitorRunning())
+  {   
+    if (!GetConfigInfoStr("snews\\shell\\open", "command", curVersionStr, sizeof(curVersionStr), HKEY_CLASSES_ROOT))
+    {
+      return (MAPI_E_ACCESS_DENIED);
+    }
+    else
+    {	
+      char *pFind = strstr(curVersionStr,"-h");
+      
+      if (pFind)
+      {
+        *pFind=0;
+        lstrcpy(pPath,curVersionStr);
+      }
+      else
+      {
+        return (MAPI_E_ACCESS_DENIED);
+      }
+    }
+    
+    return SUCCESS_SUCCESS;
+  }
+  else //setup up to start navstart since we are a sixteen bit DLL.
+  {
+    if (!XP_GetVersionInfoString(szNavigatorSection, szCurrentVersionKey, curVersionStr, sizeof(curVersionStr), HKEY_LOCAL_MACHINE))
+    {
+      return (MAPI_E_LOGON_FAILURE);
+    }
+    
+    wsprintf(curVersionSection, szNavigatorCurVersionSection, curVersionStr);
+    
+    if (!XP_GetInstallDirectory(curVersionSection, szInstallDirKey, pPath,nSize, HKEY_LOCAL_MACHINE))
+    {
+      return (MAPI_E_ACCESS_DENIED);		
+    }
+    
+    lstrcat(pPath, "\\");
+    lstrcat(pPath, "NAVSTART.EXE");
+    return SUCCESS_SUCCESS;	
+  }
+#endif
+}
+
+int LOAD_DS Is_16_OR_32_BIT_CommunitorRunning()
+{
+  if (FindWindow("AfxFrameOrView", NULL) && !FindWindow("aHiddenFrameClass", NULL))
+		return(16);
+	else if (FindWindow("aHiddenFrameClass", NULL))
+		return(32);
+	else 
+		return 0;
+}
+
+// size of buffer to use for copying files.
+#define COPYBUFSIZE 1024
+
+#ifdef WIN16
+     
+BOOL Win16CopyFile(LPCSTR a_Src, LPCSTR a_Dest, BOOL a_bOverwrite)
+{
+	OFSTRUCT ofSrc, ofDest;
+	HFILE hSrc, hDest;
+	BOOL bResult;
+	
+	ofDest.cBytes = ofSrc.cBytes = sizeof(OFSTRUCT);
+	hDest = OpenFile(a_Dest, &ofDest, OF_EXIST);
+	if (hDest != HFILE_ERROR && !a_bOverwrite)
+		bResult = FALSE;	// file exists but caller doesn't want file overwritten
+	else { // file either doesn't exist, or caller wants it overwritten.
+		hSrc = OpenFile(a_Src, &ofSrc, OF_READ);
+		hDest = OpenFile(a_Dest, &ofDest, OF_WRITE | OF_CREATE);
+		if (hSrc != HFILE_ERROR && hDest != HFILE_ERROR) {
+			unsigned char buf[COPYBUFSIZE];
+			UINT bufsize =  COPYBUFSIZE;
+			UINT bytesread;
+			
+			bResult = TRUE;			
+			while (0 != (bytesread = _lread(hSrc, (LPVOID)buf, bufsize))) {
+				if ((bytesread == HFILE_ERROR) || 	// check for read error...
+											// and write error
+					(bytesread != _lwrite(hDest, (LPVOID)buf, bytesread))) {
+					bResult = FALSE; // could be out of diskspace
+					break;
+				}
+			}
+		}
+		else
+			bResult = FALSE;
+
+		if (hSrc != HFILE_ERROR)
+			_lclose(hSrc);
+		if (hDest != HFILE_ERROR)
+			_lclose(hDest);
+	}
+			
+	return bResult;
+}
+
+#endif  // WIN16
+
+BOOL LOAD_DS 
+XP_CopyFile(LPCSTR lpExistingFile, LPCSTR lpNewFile, BOOL bFailifExist)
+{                                                  
+#ifdef WIN32
+  return	CopyFile(lpExistingFile, lpNewFile, bFailifExist);
+#else                                                             
+  return    Win16CopyFile(lpExistingFile, lpNewFile, TRUE);
+#endif
+}    

mozilla/mailnews/mapi/old/mapi32/xpapi.h

@@ -0,0 +1,138 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+//  Various routines for MAPI functions.
+//  Written by: Rich Pizzarro (rhp@netscape.com)
+//  November 1997
+//
+#ifndef __XPAPI_H
+#define __XPAPI_H
+
+#ifdef WIN16
+
+#include <string.h>
+#include <direct.h>
+#include <shellapi.h>
+#include <stdlib.h>
+#else
+#include <winreg.h>
+#endif 
+ 
+#ifdef WIN16
+extern "C" {
+#ifndef MAPI_OLE	// Because MSFT doesn't do this for us :-(
+#include <mapi.h>
+#endif 
+}           
+#else
+//#include <mapi.h>
+#endif
+
+
+#ifdef WIN32
+#define MAPI_IMPLEMENT(param) param PASCAL 
+#define LOAD_DS
+#else        
+#define LOAD_DS 	__loadds
+#define MAPI_IMPLEMENT(param) extern "C" param FAR PASCAL
+ 
+#endif   
+
+#ifdef WIN16
+#define _MAX_PATH 				260  /* max. length of full pathname*/
+#define MAPI_E_LOGON_FAILURE  	3 
+#define MAPI_E_ACCESS_DENIED	6  
+#define INVALID_HANDLE_VALUE 	(HANDLE)-1  
+#define KEY_QUERY_VALUE 		0x0001  
+#define HKEY_LOCAL_MACHINE 		((HKEY)0x80000002)
+#define HKEY_ROOT				HKEY_CLASSES_ROOT
+#else 
+#define HKEY_ROOT				((HKEY)0x80000002)
+#endif
+
+//
+// registry keys
+//
+#ifdef WIN32
+static char szNavigatorSection[] = "Software\\Netscape\\Netscape Navigator";
+static char szNavigatorCurVersionSection[] = "Software\\Netscape\\Netscape Navigator\\%s\\Main";
+static char szCurrentVersionKey[] = "CurrentVersion";
+static char szInstallDirKey[] = "Install Directory";
+static char szMapiSection[] = "Software\\Netscape\\Netscape Navigator\\MAPI";
+static char szTempFiles[] = "TempFiles";  
+static char szMapiLog[] = "NSMAPI32.LOG";
+#else 
+//32 bit key strings for trying to read the 32bit registry
+static char szNavigatorSection32[] = "Software\\Netscape\\Netscape Navigator";
+static char szNavigatorCurVersionSection32[] = "Software\\Netscape\\Netscape Navigator\\%s\\Main";
+static char szMapiSection32[] = "Software\\Netscape\\Netscape Navigator\\MAPI";
+
+// ini section and key strings 
+static char szNetscapeINI[] = "nscp.ini";
+static char szNavigatorSection[] = "Netscape Navigator";
+static char szNavigatorCurVersionSection[] = "Netscape Navigator-%s";
+static char szCurrentVersionKey[] = "CurrentVersion";
+static char szInstallDirKey[] = "Install Directory";
+static char szMapiSection[] = "MAPI";
+static char szTempFiles[] = "TempFiles";
+static char szExeName[] = "NAVSTART.EXE";
+static char szMapiLog[] = "NSMAPI16.LOG";
+#endif                                   
+
+//Since REGSAM is just an ACCESS_MASK which is just a DWORD and it's not 
+//declared in win16 we'll make one hear for the purpose of keeping parameters
+//the same even though the access rights don't get used for win16.
+
+typedef DWORD REGSAM;
+
+
+// XP declarations
+
+int 	LOAD_DS Is_16_OR_32_BIT_CommunitorRunning();
+WORD 	LOAD_DS XP_CallProcess(LPCSTR pPath, LPCSTR pCmdLine);
+HKEY LOAD_DS RegOpenParent(LPCSTR pSection, HKEY hRootKey, REGSAM access);
+HKEY LOAD_DS RegCreateParent(LPCSTR pSection, HKEY hMasterKey);
+BOOL LOAD_DS GetConfigInfoStr(LPCSTR pSection, LPCSTR pKey, LPSTR pBuf, int lenBuf, HKEY hMasterKey);
+BOOL LOAD_DS GetConfigInfoNum(LPCSTR pSection, LPCSTR pKey, DWORD* pVal, HKEY hMasterKey);
+BOOL LOAD_DS SetConfigInfoStr(LPCSTR pSection, LPCSTR pKey, LPSTR pStr, HKEY hMasterKey); 
+
+BOOL  LOAD_DS XP_GetInstallDirectory(LPCSTR pcurVersionSection, LPCSTR pInstallDirKey, LPSTR path, UINT nSize, HKEY hKey); 
+BOOL  LOAD_DS XP_GetVersionInfoString(LPCSTR pNavigatorSection, LPCSTR pCurrentVersionKey, LPSTR pcurVersionStr, UINT nSize, HKEY hKey);
+DWORD LOAD_DS XP_GetInstallLocation(LPSTR pPath, UINT nSize);
+BOOL LOAD_DS  XP_CopyFile(LPCSTR lpExistingFile, LPCSTR lpNewFile, BOOL bFailifExist);
+
+#endif    // __XPAPI_H

mozilla/mailnews/mapi/old/public/makefile.win

@@ -0,0 +1,31 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..\..
+MODULE=mime
+
+EXPORTS =							\
+	nscpmapi.h		\
+    $(NULL)
+
+
+include <$(DEPTH)\config\rules.mak>
+

mozilla/mailnews/mapi/old/public/nscpmapi.h

@@ -0,0 +1,351 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+// This is a header file for the MAPI support within 
+// Communicator. 
+//
+// Written by: Rich Pizzarro (rhp@netscape.com)
+//
+#ifndef _NSCPMAPI
+#define _NSCPMAPI
+
+#ifndef MAPI_OLE	// Because MSFT doesn't do this for us :-(
+#include <mapi.h>     // for MAPI specific types...        
+#endif 
+
+#ifdef WIN16
+typedef unsigned char	UCHAR;
+#endif 
+
+
+#define           MAX_NAME_LEN    256
+#define           MAX_PW_LEN      256
+#define           MAX_MSGINFO_LEN 512
+#define           MAX_CON         4     // Maximum MAPI session supported
+#define           MAX_POINTERS    32
+
+//
+// The MAPI class that will act as the internal mechanism for 
+// Communicator to control multiple MAPI sessions.
+//
+class CMAPIConnection 
+{
+protected:
+  LONG        m_ID;
+  BOOL        m_defaultConnection;  
+  LONG        m_sessionCount;
+  LONG        m_messageIndex;
+  LPVOID      m_cookie;
+  UCHAR       m_messageFindInfo[MAX_MSGINFO_LEN];
+  UCHAR       m_profileName[MAX_NAME_LEN];
+  UCHAR       m_password[MAX_PW_LEN];
+
+  // Methods
+
+public:
+  CMAPIConnection  ( LONG, LPSTR, LPSTR );
+  ~CMAPIConnection ( );
+
+  // ID related methods
+  LONG   GetID( ) { return m_ID; } ;
+
+  // Dealing with the default session...
+  BOOL    IsDefault( ) { return m_defaultConnection; } ;
+  void    SetDefault( BOOL flag ) { m_defaultConnection = flag; } ;
+
+  // For handling multiple sessions on a profile name...
+  LONG    GetSessionCount( ) { return m_sessionCount; } ;
+  void    IncrementSessionCount() { ++m_sessionCount; } ;
+  void    DecrementSessionCount() { --m_sessionCount; } ;
+
+  // Information retrieval stuff...
+  LPSTR   GetProfileName( ) { return (LPSTR) m_profileName; };
+  LPSTR   GetPassword( ) { return (LPSTR) m_password; };
+
+  // Dealing with message information...
+  void    SetMessageIndex( LONG mIndex ) { m_messageIndex = mIndex; } ;
+  LONG    GetMessageIndex( ) { return m_messageIndex; };
+
+  void    SetMessageFindInfo( LPSTR info ) { lstrcpy((LPSTR)m_messageFindInfo, info); } ;
+  LPSTR   GetMessageFindInfo( ) { return (LPSTR) m_messageFindInfo; };
+
+  // For enumerating Messages...
+  void    SetMapiListContext( LPVOID cookie) { m_cookie = cookie; } ;
+  LPVOID  GetMapiListContext( ) { return m_cookie; };
+};
+
+//
+// Defines needed for requests being made with the WM_COPYDATA call...
+//
+typedef enum {
+    NSCP_MAPIStartRequestID = 0,
+    NSCP_MAPILogon,
+    NSCP_MAPILogoff,
+    NSCP_MAPIFree,
+    NSCP_MAPISendMail,
+    NSCP_MAPISendDocuments, 
+    NSCP_MAPIFindNext,
+    NSCP_MAPIReadMail,
+    NSCP_MAPISaveMail,
+    NSCP_MAPIDeleteMail,
+    NSCP_MAPIAddress,
+    NSCP_MAPIDetails,
+    NSCP_MAPIResolveName,
+    NSCP_MAPIEndRequestID       // Note: this is a marker for MAPI IPC requests
+} NSCP_IPC_REQUEST;
+
+//
+// This is to keep track of the pointers allocated in the MAPI DLL
+// and deal with them correctly.
+//
+#define   MAPI_MESSAGE_TYPE     0
+#define   MAPI_RECIPIENT_TYPE   1
+ 
+typedef struct {
+  LPVOID    lpMem;
+  UCHAR     memType;
+} memTrackerType;
+
+//
+// This is the generic message that WM_COPYDATA will send to the
+// Communicator product to allow it to attach to shared memory.
+// NOTE: On Win16, this will simply reference a pointer.
+//
+typedef struct {
+  UCHAR   smemName[64]; // Name of shared memory
+  DWORD   smemSize;     // Size of shared memory
+  LPVOID  lpsmem;       // Will be really used in Win16 only
+} MAPIIPCType;
+
+//
+// These are message specific structures that will be used for 
+// the various MAPI operations.
+//
+typedef struct {
+  ULONG     ulUIParam;
+  FLAGS     flFlags;
+  LHANDLE   lhSession;
+  DWORD     ipcWorked;      // Necessary for IPC check with Communicator
+// LPSTR     strSequence,  // LPSTR lpszProfileName, LPSTR lpszPassword
+// This is here to document the fact there will be a string sequence at 
+// this location
+} MAPILogonType;
+
+typedef struct {
+  LHANDLE   lhSession;
+  ULONG     ulUIParam;
+  FLAGS     flFlags;
+  DWORD     ipcWorked;      // Necessary for IPC check with Communicator
+} MAPILogoffType;
+
+typedef struct {
+  LHANDLE   lhSession;
+  ULONG     ulUIParam;
+  FLAGS     flFlags;
+  DWORD     ipcWorked;      // Necessary for IPC check with Communicator
+  // The following is the "FLAT" representation of the (lpMapiMessage lpMessage) 
+  // argument of this structure 
+  FLAGS     MSG_flFlags;          // unread,return receipt                  
+  ULONG     MSG_nRecipCount;      // Number of recipients                   
+  ULONG     MSG_nFileCount;       // # of file attachments                  
+  ULONG     MSG_ORIG_ulRecipClass; //  Recipient class - MAPI_TO, MAPI_CC, MAPI_BCC, MAPI_ORIG
+  BYTE      dataBuf[1];           // For easy referencing
+  //
+  // This is where it gets CONFUSING...the following buffer of memory is a
+  // contiguous chunk of memory for various strings that are part of this
+  // multilevel structure. For any of the following structure, any numbers
+  // are represented by strings that will have to be converted back to numeric
+  // values with atoi() calls.
+
+  // String 0: LPSTR lpszSubject;            // Message Subject
+  // String 1: LPSTR lpszNoteText FILE NAME; // Message Text will be
+  //           stored into a temp file and this will be the pointer to that file.
+  // String 2: LPSTR lpszDateReceived;       // in YYYY/MM/DD HH:MM format
+  // String 3: LPSTR lpszConversationID;     // conversation thread ID
+  //
+  // The following are for the originator of the message. Only ONE of these.
+  //
+  // String 4: LPSTR lpszName;             // Originator name                           
+  // String 5: LPSTR lpszAddress;          // Originator address (optional)             
+  //
+  // The following strings are for the recipients for this message. There are
+  // MSG_nRecipCount of these in a row:
+  //
+  // for (i=0; i<MSG_nRecipCount; i++)
+  //      String x: LPSTR lpszRecipClass (ULONG) // Recipient class - MAPI_TO, MAPI_CC, MAPI_BCC, MAPI_ORIG        
+  //      String x: LPSTR lpszName;     // Recipient N name                           
+  //      String x: LPSTR lpszAddress;  // Recipient N address (optional)             
+  //
+  // Now, finally, add the attachments for this beast. There are MSG_nFileCount
+  // attachments so it would look like the following:
+  //
+  // for (i=0; i<MSG_nFileCount; i++)
+  //
+  //      String x: LPSTR lpszPathName // Fully qualified path of the attached file. 
+  //                                   // This path should include the disk drive letter and directory name.
+  //      String x: LPSTR lpszFileName // The display name for the attached file
+  //
+} MAPISendMailType;
+
+typedef struct {
+    ULONG     ulUIParam;
+    ULONG     nFileCount;
+    DWORD     ipcWorked;      // Necessary for IPC check with Communicator
+    BYTE      dataBuf[1];     // For easy referencing
+    //
+    // The sequence of strings to follow are groups of PathName/FileName couples.
+    // The strings will be parsed in MAPI[32].DLL and then put into this format:
+    //
+    // for (i=0; i<nFileCount; i++)
+    //
+    //      String x: LPSTR lpszPathName // Fully qualified path of the attached file. 
+    //                                   // This path should include the disk drive letter and directory name.
+    //      String x: LPSTR lpszFileName // The display name for the attached file
+} MAPISendDocumentsType;
+
+typedef struct {
+  LHANDLE     lhSession;
+  ULONG       ulUIParam;
+  FLAGS       flFlags;
+  DWORD       ipcWorked;      // Necessary for IPC check with Communicator
+  UCHAR       lpszSeedMessageID[MAX_MSGINFO_LEN];
+  UCHAR       lpszMessageID[MAX_MSGINFO_LEN];
+} MAPIFindNextType;
+
+typedef struct {
+  LHANDLE     lhSession;
+  ULONG       ulUIParam;
+  DWORD       ipcWorked;      // Necessary for IPC check with Communicator
+  UCHAR       lpszMessageID[MAX_MSGINFO_LEN];
+} MAPIDeleteMailType;
+
+typedef struct {
+  LHANDLE     lhSession;
+  ULONG       ulUIParam;
+  FLAGS       flFlags;
+  DWORD       ipcWorked;      // Necessary for IPC check with Communicator
+  UCHAR       lpszName[MAX_NAME_LEN];
+  // These are returned by Communicator
+  UCHAR       lpszABookID[MAX_NAME_LEN];         
+  UCHAR       lpszABookName[MAX_NAME_LEN];            
+  UCHAR       lpszABookAddress[MAX_NAME_LEN];         
+} MAPIResolveNameType;
+
+typedef struct {
+  LHANDLE     lhSession;
+  ULONG       ulUIParam;
+  FLAGS       flFlags;
+  DWORD       ipcWorked;      // Necessary for IPC check with Communicator
+  UCHAR       lpszABookID[MAX_NAME_LEN];
+} MAPIDetailsType;
+
+typedef struct {
+  LHANDLE     lhSession;
+  ULONG       ulUIParam;
+  FLAGS       flFlags;
+  DWORD       ipcWorked;      // Necessary for IPC check with Communicator
+  UCHAR       lpszMessageID[MAX_MSGINFO_LEN];
+  //
+  // The following is the "FLAT" representation of the (lpMapiMessage lpMessage) 
+  // argument of this structure 
+  //
+  FLAGS     MSG_flFlags;          // unread, return or receipt                  
+  ULONG     MSG_nRecipCount;      // Number of recipients                   
+  ULONG     MSG_nFileCount;       // # of file attachments                  
+  ULONG     MSG_ORIG_ulRecipClass; //  Recipient class - MAPI_TO, MAPI_CC, MAPI_BCC, MAPI_ORIG
+  //
+  // Output parameter for blob of information that will live on disk. 
+  //
+  UCHAR       lpszBlob[MAX_MSGINFO_LEN];    // file name on disk
+  //
+  // The format of this blob of information will be:
+  //
+  // String 0: LPSTR lpszSubject;            // Message Subject
+  // String 1: LPSTR lpszNoteText FILE NAME; // Message Text will be
+  //           stored into a temp file and this will be the pointer to that file.
+  // String 2: LPSTR lpszDateReceived;       // in YYYY/MM/DD HH:MM format
+  // String 3: LPSTR lpszConversationID;     // conversation thread ID
+  //
+  // The following are for the originator of the message. Only ONE of these.
+  //
+  // String 4: LPSTR lpszName;             // Originator name                           
+  // String 5: LPSTR lpszAddress;          // Originator address (optional)             
+  //
+  // The following strings are for the recipients for this message. There are
+  // MSG_nRecipCount of these in a row:
+  //
+  // for (i=0; i<MSG_nRecipCount; i++)
+  //      String x: LPSTR lpszName;             // Recipient N name                           
+  //      String x: LPSTR lpszAddress;          // Recipient N address (optional)             
+  //      String x: LPSTR lpszRecipClass        // recipient class - sprintf of ULONG
+  //
+  // Now, finally, add the attachments for this beast. There are MSG_nFileCount
+  // attachments so it would look like the following:
+  //
+  // for (i=0; i<MSG_nFileCount; i++)
+  //
+  //      String x: LPSTR lpszPathName // Fully qualified path of the attached file. 
+  //                                   // This path should include the disk drive letter and directory name.
+  //      String x: LPSTR lpszFileName // The display name for the attached file
+  //
+} MAPIReadMailType;
+
+typedef struct {
+  LHANDLE   lhSession;
+  ULONG     ulUIParam;
+  FLAGS     flFlags;
+  UCHAR     lpszCaption[MAX_MSGINFO_LEN];
+  DWORD     ipcWorked;      // Necessary for IPC check with Communicator
+  // The following is the "FLAT" representation of the (lpMapiRecipDesc lpRecips) 
+  // argument of this structure 
+  ULONG     nRecips;              // number of recips to start with...
+  ULONG     nNewRecips;           // number of recips returned...
+  UCHAR     lpszBlob[MAX_MSGINFO_LEN];    // file name for blob of information 
+                                          // that will live on disk. 
+  BYTE      dataBuf[1];           // For easy referencing
+  //
+  // The following contiguous chunk of memory is the buffer that holds 
+  // the recipients to load into the address picker...
+  //
+  // for (i=0; i<MSG_nRecipCount; i++)
+  //      String x: LPSTR lpszRecipClass (ULONG) // Recipient class - MAPI_TO, MAPI_CC, MAPI_BCC, MAPI_ORIG        
+  //      String x: LPSTR lpszName;     // Recipient N name                           
+  //      String x: LPSTR lpszAddress;  // Recipient N address (optional)             
+  //
+} MAPIAddressType;
+
+#endif    // _NSCPMAPI

mozilla/mailnews/mapi/old/tests/makefile.win

@@ -0,0 +1,27 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..\..
+
+
+DIRS=mapitest
+
+include <$(DEPTH)\config\rules.mak>

mozilla/mailnews/mapi/old/tests/mapitest/main.cpp

@@ -0,0 +1,239 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+#include <windows.h>
+#include <windowsx.h>
+#include <string.h>
+#include <stdlib.h>
+#ifndef MAPI_OLE	// Because MSFT doesn't do this for us :-(
+#include <mapi.h>
+#endif
+
+#include "port.h"
+#include "resource.h"
+
+#ifndef WM_PAINTICON
+#define WM_PAINTICON              0x26
+#endif // WM_PAINTICON
+
+/* 
+ * Forward Declarations...
+ */
+BOOL      InitInstance(HINSTANCE hInstance, int nCmdShow);
+BOOL CALLBACK LOADDS MyDlgProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam);
+extern void ProcessCommand(HWND hWnd, int id, HWND hCtl, UINT codeNotify);
+BOOL      OpenMAPI(void);
+void      CloseMAPI(void);
+
+/*  
+ * Global variables
+ */
+HINSTANCE   hInst;
+HWND      hWnd;    
+
+#ifdef WIN16
+HICON	hIconApp;
+#endif
+
+char NEAR szAppName[] = "Netscape QA Helper";
+char NEAR szShortAppName[] = "QAHelper";
+char szClassName[] = "Netscape_QAHelper_Class_Name";
+
+void
+AppCleanup(void)
+{
+  extern void    DoMAPILogoff(HWND hWnd);
+  static BOOL isDone = FALSE;
+
+  if (isDone)
+    return;
+
+  extern LHANDLE    mapiSession;
+
+  if (mapiSession != 0)
+  {
+    DoMAPILogoff(hWnd);
+  }
+
+  CloseMAPI();
+  isDone = TRUE;
+}
+
+BOOL 
+InitInstance(HINSTANCE hInstance, int nCmdShow)
+{
+  /* Create a main window for this application instance.  */
+  hWnd = CreateDialog((HINSTANCE) hInstance, 
+            MAKEINTRESOURCE(ID_DIALOG),
+            (HWND) NULL, (DLGPROC) MyDlgProc);
+  
+  if (!hWnd)
+    return FALSE;
+  else
+    return TRUE;
+}
+
+BOOL InitApp(void)
+{
+#ifndef WIN16
+  WNDCLASS wc;
+  wc.style         = 0; 
+  wc.lpfnWndProc   = DefDlgProc; 
+  wc.cbClsExtra    = 0; 
+  wc.cbWndExtra    = DLGWINDOWEXTRA; 
+  wc.hInstance     = hInst; 
+  wc.hIcon         = LoadIcon(hInst, MAKEINTRESOURCE(ID_ICON_APP)); 
+  wc.hCursor       = LoadCursor(0, IDC_ARROW); 
+  wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
+  wc.lpszMenuName  = NULL; 
+  wc.lpszClassName = szClassName;
+  
+  if(!RegisterClass(&wc))
+    return FALSE;
+
+#else                
+  hIconApp = LoadIcon(hInst, MAKEINTRESOURCE(ID_ICON_APP));
+#endif
+  
+  return TRUE;
+} // end InitApp
+
+// Win Main 
+int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
+{
+  MSG     msg;
+  
+  hInst = hInstance;
+  
+  if (!InitApp()) 
+  { 
+    return FALSE;
+  }
+  
+  if (!InitInstance(hInstance, nCmdShow)) 
+  {    
+    return FALSE;
+  }
+
+  if (!OpenMAPI()) 
+  {    
+    return FALSE;
+  }
+
+  ShowWindow(hWnd, SW_SHOW);
+  
+  // Start the application
+  while ((GetMessage(&msg, (HWND) NULL, (UINT) NULL, (UINT) NULL)))
+  {
+    if(IsDialogMessage(hWnd, &msg))
+      continue;
+    
+    TranslateMessage(&msg);
+    DispatchMessage(&msg);
+  }
+
+  return(msg.wParam);
+}
+
+BOOL CALLBACK LOADDS 
+MyDlgProc(HWND hWndMain, UINT wMsg, WPARAM wParam, LPARAM lParam) 
+{
+  switch (wMsg) 
+  {
+  case WM_INITDIALOG: 
+    {
+      hWnd = hWndMain;
+	    SetDlgItemText(hWnd, ID_EDIT_ROW, "0");
+    }
+    break;
+    
+  case WM_CLOSE:
+    {
+      DestroyWindow(hWnd);
+      break;
+    }
+
+  case WM_DESTROY:
+    {
+      AppCleanup();
+
+#ifndef WIN16
+      UnregisterClass(szClassName, hInst);
+#else              
+      // Destroy the 16 bit windows icon
+      if(hIconApp != 0)
+        DestroyIcon(hIconApp);
+#endif
+      
+      PostQuitMessage(0);
+      break;
+    }
+  case WM_COMMAND:
+    HANDLE_WM_COMMAND(hWnd, wParam, lParam, ProcessCommand);
+    break;
+    
+  case WM_QUERYDRAGICON:     
+#ifdef WIN16
+    return (BOOL)hIconApp;
+#endif
+    
+  case WM_PAINTICON:
+#ifdef WIN16    
+    SetClassWord(hWnd, GCW_HICON, 0);
+    
+    // fall trough
+  case WM_PAINT: 
+    {
+      if(!IsIconic(hWnd))
+        return FALSE;
+      PAINTSTRUCT ps;
+      HDC hDC = BeginPaint(hWnd, &ps);
+      SetMapMode(hDC, MM_TEXT);
+      DrawIcon(hDC, 2, 2, hIconApp);
+      EndPaint(hWnd, &ps);
+      break;
+    } 
+#endif //WIN16
+    break;    // RICHIE - if this is not here NT 3.51 Pukes!!!!  
+
+  default:
+    return FALSE;
+  }
+  
+  //~~av  return (DefWindowProc(hWnd, wMsg, wParam, lParam));
+  return TRUE;
+}

mozilla/mailnews/mapi/old/tests/mapitest/makefile.win

@@ -0,0 +1,240 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on mapitest.dsp
+!IF "$(CFG)" == ""
+CFG=mapitest - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to mapitest - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "mapitest - Win32 Release" && "$(CFG)" != "mapitest - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "mapitest.mak" CFG="mapitest - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "mapitest - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "mapitest - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "mapitest - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+ALL : "$(OUTDIR)\mapitest.exe"
+
+export :
+libs :
+install : 
+
+clobber_all : clobber
+
+clobber:
+	-@erase "$(INTDIR)\main.obj"
+	-@erase "$(INTDIR)\mapimail.obj"
+	-@erase "$(INTDIR)\mapiproc.obj"
+	-@erase "$(INTDIR)\mtest32.res"
+	-@erase "$(INTDIR)\readmail.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(OUTDIR)\mapitest.exe"
+	-@erase "$(OUTDIR)\mapitest.pch"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"$(INTDIR)\mapitest.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\mtest32.res" /d "NDEBUG" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\mapitest.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /incremental:no /pdb:"$(OUTDIR)\mapitest.pdb" /machine:I386 /out:"$(OUTDIR)\mapitest.exe" 
+LINK32_OBJS= \
+	"$(INTDIR)\main.obj" \
+	"$(INTDIR)\mapimail.obj" \
+	"$(INTDIR)\mapiproc.obj" \
+	"$(INTDIR)\readmail.obj" \
+	"$(INTDIR)\mtest32.res"
+
+"$(OUTDIR)\mapitest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "mapitest - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+ALL : "$(OUTDIR)\mapitest.exe"
+
+export :
+libs :
+install : 
+
+clobber_all : clobber
+
+clobber :
+	-@erase "$(INTDIR)\main.obj"
+	-@erase "$(INTDIR)\mapimail.obj"
+	-@erase "$(INTDIR)\mapiproc.obj"
+	-@erase "$(INTDIR)\mtest32.res"
+	-@erase "$(INTDIR)\readmail.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(OUTDIR)\mapitest.exe"
+	-@erase "$(OUTDIR)\mapitest.ilk"
+	-@erase "$(OUTDIR)\mapitest.pdb"
+	-@erase "$(OUTDIR)\mapitest.pch"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"$(INTDIR)\mapitest.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\mtest32.res" /d "_DEBUG" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\mapitest.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /incremental:yes /pdb:"$(OUTDIR)\mapitest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mapitest.exe" /pdbtype:sept 
+LINK32_OBJS= \
+	"$(INTDIR)\main.obj" \
+	"$(INTDIR)\mapimail.obj" \
+	"$(INTDIR)\mapiproc.obj" \
+	"$(INTDIR)\readmail.obj" \
+	"$(INTDIR)\mtest32.res"
+
+"$(OUTDIR)\mapitest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("mapitest.dep")
+!INCLUDE "mapitest.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "mapitest.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "mapitest - Win32 Release" || "$(CFG)" == "mapitest - Win32 Debug"
+SOURCE=.\main.cpp
+
+"$(INTDIR)\main.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=.\mapimail.cpp
+
+"$(INTDIR)\mapimail.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=.\mapiproc.cpp
+
+"$(INTDIR)\mapiproc.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=.\mtest32.rc
+
+"$(INTDIR)\mtest32.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) $(RSC_PROJ) $(SOURCE)
+
+
+SOURCE=.\readmail.cpp
+
+"$(INTDIR)\readmail.obj" : $(SOURCE) "$(INTDIR)"
+
+
+
+!ENDIF 
+

mozilla/mailnews/mapi/old/tests/mapitest/mapimail.cpp

@@ -0,0 +1,772 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+#include <windows.h>
+#include <windowsx.h>   
+#include <string.h>
+#include <mapi.h>         
+#include <stdlib.h>
+
+#include "port.h"
+#include "resource.h"
+
+//
+// Variables...
+// 
+extern HINSTANCE   m_hInstMapi;
+extern LHANDLE     mapiSession;
+
+// 
+// Forward declarations...
+//
+void          DoMAPIFreeBuffer(HWND hWnd, LPVOID buf, BOOL alert);
+extern void   ShowMessage(HWND hWnd, LPSTR msg);
+void          DoMAPISendMail(HWND hWnd);
+void          DoMAPISendDocuments(HWND hWnd);
+void          DoMAPISaveMail(HWND hWnd);
+void          DoMAPIAddress(HWND hWnd);
+extern void   SetFooter(LPSTR msg);
+extern LPSTR  GetMAPIError(LONG errorCode);
+
+void 
+ProcessMailCommand(HWND hWnd, int id, HWND hCtl, UINT codeNotify) 
+{ 
+  switch (id) 
+  {
+  case IDCANCEL:
+    EndDialog(hWnd, 0);
+    break;
+
+  case ID_BUTTON_MAPISENDMAIL:
+    DoMAPISendMail(hWnd);
+    break;
+
+  case ID_BUTTON_MAPISENDDOCUMENTS:
+    DoMAPISendDocuments(hWnd);
+    break;
+
+  case ID_BUTTON_MAPISAVEMAIL:
+    DoMAPISaveMail(hWnd);
+    break;
+
+  case ID_BUTTON_MAPIADDRESS:
+    DoMAPIAddress(hWnd);
+    break;
+
+  default:
+    break;
+  }
+}
+
+BOOL CALLBACK LOADDS 
+MailDlgProc(HWND hWndMain, UINT wMsg, WPARAM wParam, LPARAM lParam) 
+{
+  switch (wMsg) 
+  {
+  case WM_INITDIALOG: 
+    break;
+
+  case WM_COMMAND:
+    HANDLE_WM_COMMAND(hWndMain, wParam, lParam, ProcessMailCommand);
+    break;
+
+  default:
+    return FALSE;
+  }
+  
+  return TRUE;
+}
+
+static LPSTR lpszDelimChar = ";";
+
+void
+TackItOn(LPSTR fileBuf, LPSTR nameBuf, LPSTR addOn)
+{
+  if (addOn[0] != '\0')
+  {
+    lstrcat(fileBuf, addOn);
+    lstrcat(fileBuf, lpszDelimChar);
+
+    lstrcat(nameBuf, "NAMEOF.FILE");
+    lstrcat(nameBuf, lpszDelimChar);
+  }
+}
+
+void
+DoMAPISendDocuments(HWND hWnd)
+{
+  ULONG (FAR PASCAL *lpfnMAPISendDocuments) (ULONG ulUIParam, 
+          LPTSTR lpszDelimChar, LPTSTR lpszFullPaths, 
+          LPTSTR lpszFileNames, ULONG ulReserved);
+
+#ifdef WIN16		
+  (FARPROC&) lpfnMAPISendDocuments = GetProcAddress(m_hInstMapi, "MAPISENDDOCUMENTS"); 
+#else
+  (FARPROC&) lpfnMAPISendDocuments = GetProcAddress(m_hInstMapi, "MAPISendDocuments"); 
+#endif
+  
+  if (!lpfnMAPISendDocuments)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPI function.");
+    return;
+  }
+
+  char  msg[1024];
+  char  tempFileName[_MAX_PATH] = "";
+  char  lpszFullPaths[(_MAX_PATH + 1) * 4] = "";
+  char  lpszFileNames[(_MAX_PATH + 1) * 4] = "";
+
+  // Now get the names of the files to attach...
+  GetDlgItemText(hWnd, ID_EDIT_ATTACH1, tempFileName, sizeof(tempFileName));
+  TackItOn(lpszFullPaths, lpszFileNames, tempFileName); 
+
+  GetDlgItemText(hWnd, ID_EDIT_ATTACH2, tempFileName, sizeof(tempFileName));
+  TackItOn(lpszFullPaths, lpszFileNames, tempFileName); 
+
+  GetDlgItemText(hWnd, ID_EDIT_ATTACH3, tempFileName, sizeof(tempFileName));
+  TackItOn(lpszFullPaths, lpszFileNames, tempFileName); 
+
+  GetDlgItemText(hWnd, ID_EDIT_ATTACH4, tempFileName, sizeof(tempFileName));
+  TackItOn(lpszFullPaths, lpszFileNames, tempFileName); 
+
+  LONG  rc = (*lpfnMAPISendDocuments)
+        ( (ULONG) hWnd,        
+          lpszDelimChar, 
+          lpszFullPaths, 
+          lpszFileNames, 
+          0);
+
+  if (rc == SUCCESS_SUCCESS)
+  {
+    ShowMessage(hWnd, "Success with MAPISendDocuments");
+    SetFooter("MAPISendDocuments success");
+  }
+  else
+  {
+    wsprintf(msg, "FAILURE: Return code %d from MAPISendDocuments\nError=[%s]", 
+                      rc, GetMAPIError(rc));
+    ShowMessage(hWnd, msg);
+    SetFooter("MAPISendDocuments failed");
+  }
+}
+
+void
+FreeMAPIFile(lpMapiFileDesc pv)
+{
+  if (!pv)
+    return;
+
+  if (pv->lpszPathName != NULL)   
+    free(pv->lpszPathName);
+
+  if (pv->lpszFileName != NULL)   
+    free(pv->lpszFileName);
+}
+
+void
+FreeMAPIRecipient(lpMapiRecipDesc pv)
+{
+  if (!pv)
+    return;
+
+  if (pv->lpszName != NULL)   
+    free(pv->lpszName);
+
+  if (pv->lpszAddress != NULL)
+    free(pv->lpszAddress);
+
+  if (pv->lpEntryID != NULL)
+    free(pv->lpEntryID);  
+}
+
+void
+FreeMAPIMessage(lpMapiMessage pv)
+{
+  ULONG i;
+
+  if (!pv)
+    return;
+
+  if (pv->lpszSubject != NULL)
+    free(pv->lpszSubject);
+
+  if (pv->lpszNoteText)
+      free(pv->lpszNoteText);
+  
+  if (pv->lpszMessageType)
+    free(pv->lpszMessageType);
+  
+  if (pv->lpszDateReceived)
+    free(pv->lpszDateReceived);
+  
+  if (pv->lpszConversationID)
+    free(pv->lpszConversationID);
+  
+  if (pv->lpOriginator)
+    FreeMAPIRecipient(pv->lpOriginator);
+  
+  for (i=0; i<pv->nRecipCount; i++)
+  {
+    if (&(pv->lpRecips[i]) != NULL)
+    {
+      FreeMAPIRecipient(&(pv->lpRecips[i]));
+    }
+  }
+
+  if (pv->lpRecips != NULL)
+  {
+    free(pv->lpRecips);
+  }
+
+  for (i=0; i<pv->nFileCount; i++)
+  {
+    if (&(pv->lpFiles[i]) != NULL)
+    {
+      FreeMAPIFile(&(pv->lpFiles[i]));
+    }
+  }
+
+  if (pv->lpFiles != NULL)
+  {
+    free(pv->lpFiles);
+  }
+  
+  free(pv);
+  pv = NULL;
+}
+
+void
+DoMAPISendMail(HWND hWnd)
+{
+  ULONG (FAR PASCAL *lpfnMAPISendMail) (LHANDLE lhSession, ULONG ulUIParam, 
+                  lpMapiMessage lpMessage, FLAGS flFlags, ULONG ulReserved);
+
+#ifdef WIN16		
+  (FARPROC&) lpfnMAPISendMail = GetProcAddress(m_hInstMapi, "MAPISENDMAIL"); 
+#else
+  (FARPROC&) lpfnMAPISendMail = GetProcAddress(m_hInstMapi, "MAPISendMail"); 
+#endif
+  
+  if (!lpfnMAPISendMail)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPI function.");
+    return;
+  }          
+
+  FLAGS   flFlags = 0;
+  char    msg[512];
+  char    file1[_MAX_PATH] = "";
+  char    file2[_MAX_PATH] = "";
+  char    file3[_MAX_PATH] = "";
+  char    file4[_MAX_PATH] = "";
+  char    toAddr[128];
+  char    ccAddr[128];
+  char    bccAddr[128];
+  char    subject[128];
+  char    noteText[4096];
+  char    dateReceived[128] = "N/A";
+  char    threadID[128] = "N/A";;
+  char    origName[128] = "N/A";;
+  char    origAddress[128] = "N/A";;
+
+  GetDlgItemText(hWnd, ID_EDIT_TOADDRESS, toAddr, sizeof(toAddr));
+  GetDlgItemText(hWnd, ID_EDIT_CCADDRESS, ccAddr, sizeof(ccAddr));
+  GetDlgItemText(hWnd, ID_EDIT_BCCADDRESS, bccAddr, sizeof(bccAddr));
+  GetDlgItemText(hWnd, ID_EDIT_SUBJECT, subject, sizeof(subject));
+  GetDlgItemText(hWnd, ID_EDIT_NOTETEXT, noteText, sizeof(noteText));
+
+  // Do the one flag we support for this call...
+  if (BST_CHECKED == Button_GetCheck(GetDlgItem(hWnd, ID_CHECK_SHOWDIALOG)))
+  {
+    flFlags |= MAPI_DIALOG;
+  }
+
+  // Build the message to send off...
+  lpMapiMessage  msgPtr = (MapiMessage *)malloc(sizeof(MapiMessage));
+  if (msgPtr == NULL)
+  {
+    return;
+  }
+  
+  memset(msgPtr, 0, sizeof(MapiMessage)); 
+
+  //
+  // At this point, we need to populate the structure of information
+  // we are passing in via the *lppMessage
+  //
+
+  // Set all of the general information first!
+  msgPtr->lpszSubject = strdup(subject);
+  msgPtr->lpszNoteText = strdup(noteText);
+  msgPtr->lpszDateReceived = strdup(dateReceived);
+  msgPtr->lpszConversationID = strdup(threadID);
+  msgPtr->flFlags = flFlags;
+
+  // Now deal with the recipients of this message
+  DWORD       realRecips = 0;
+  if (toAddr[0] != '\0')    ++realRecips;
+  if (ccAddr[0] != '\0')    ++realRecips;
+  if (bccAddr[0] != '\0')   ++realRecips;
+
+  msgPtr->lpRecips = (lpMapiRecipDesc) malloc((size_t) (sizeof(MapiRecipDesc) * realRecips));
+  if (!msgPtr->lpRecips)
+  {
+    FreeMAPIMessage(msgPtr);
+    return;
+  }
+
+  msgPtr->nRecipCount = realRecips;
+  memset(msgPtr->lpRecips, 0, (size_t) (sizeof(MapiRecipDesc) * msgPtr->nRecipCount));
+
+  DWORD       rCount = 0;
+  if (toAddr[0] != '\0')
+  {
+    msgPtr->lpRecips[rCount].lpszName = strdup(toAddr);
+    msgPtr->lpRecips[rCount].lpszAddress = strdup(toAddr);
+    msgPtr->lpRecips[rCount].ulRecipClass = MAPI_TO;
+    rCount++;
+  }
+
+  if (ccAddr[0] != '\0')
+  {
+    msgPtr->lpRecips[rCount].lpszName = strdup(ccAddr);
+    msgPtr->lpRecips[rCount].lpszAddress = strdup(ccAddr);
+    msgPtr->lpRecips[rCount].ulRecipClass = MAPI_CC;    
+    rCount++;
+  }
+
+  if (bccAddr[0] != '\0')
+  {
+    msgPtr->lpRecips[rCount].lpszName = strdup(bccAddr);
+    msgPtr->lpRecips[rCount].lpszAddress = strdup(bccAddr);
+    msgPtr->lpRecips[rCount].ulRecipClass = MAPI_BCC;
+    rCount++;
+  }
+
+  // Now get the names of the files to attach...
+  GetDlgItemText(hWnd, ID_EDIT_ATTACH1, file1, sizeof(file1));
+  GetDlgItemText(hWnd, ID_EDIT_ATTACH2, file2, sizeof(file2));
+  GetDlgItemText(hWnd, ID_EDIT_ATTACH3, file3, sizeof(file3));
+  GetDlgItemText(hWnd, ID_EDIT_ATTACH4, file4, sizeof(file4));
+
+  DWORD       realFiles = 0;
+  if (file1[0] != '\0')    ++realFiles;
+  if (file2[0] != '\0')    ++realFiles;
+  if (file3[0] != '\0')    ++realFiles;
+  if (file4[0] != '\0')    ++realFiles;
+
+  // Now deal with the list of attachments! Since the nFileCount should be set
+  // correctly, this loop will automagically be correct
+  //
+  msgPtr->nFileCount = realFiles;
+  if (realFiles > 0)
+  {
+    msgPtr->lpFiles = (lpMapiFileDesc) malloc((size_t) (sizeof(MapiFileDesc) * realFiles));
+    if (!msgPtr->lpFiles)
+    {
+      FreeMAPIMessage(msgPtr);
+      return;
+    }
+
+    memset(msgPtr->lpFiles, 0, (size_t) (sizeof(MapiFileDesc) * msgPtr->nFileCount));
+  }
+
+  rCount = 0;
+  if (file1[0] != '\0')
+  {
+    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file1);
+    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file1);
+    ++rCount;
+  }
+
+  if (file2[0] != '\0')
+  {
+    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file2);
+    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file2);
+    ++rCount;
+  }
+
+  if (file3[0] != '\0')
+  {
+    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file3);
+    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file3);
+    ++rCount;
+  }
+
+  if (file4[0] != '\0')
+  {
+    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file4);
+    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file4);
+    ++rCount;
+  }
+
+  // Finally, make the call...
+  LONG  rc = (*lpfnMAPISendMail)
+           (mapiSession, 
+           (ULONG) hWnd, 
+           msgPtr, 
+           flFlags, 
+           0);
+
+  if (rc == SUCCESS_SUCCESS)
+  {
+    ShowMessage(hWnd, "Success with MAPISendMail");
+    SetFooter("MAPISendMail success");
+  }
+  else
+  {
+    wsprintf(msg, "FAILURE: Return code %d from MAPISendMail\nError=[%s]", 
+                      rc, GetMAPIError(rc));
+    ShowMessage(hWnd, msg);
+    SetFooter("MAPISendMail failed");
+  }
+
+  // Now cleanup and move on...
+  FreeMAPIMessage(msgPtr);
+}
+
+void
+DoMAPISaveMail(HWND hWnd)
+{
+  ULONG (FAR PASCAL *lpfnMAPISaveMail) (LHANDLE lhSession, ULONG ulUIParam, 
+                  lpMapiMessage lpMessage, FLAGS flFlags, ULONG ulReserved,
+                  LPTSTR lpszMessageID);
+
+#ifdef WIN16		
+  (FARPROC&) lpfnMAPISaveMail = GetProcAddress(m_hInstMapi, "MAPISAVEMAIL"); 
+#else
+  (FARPROC&) lpfnMAPISaveMail = GetProcAddress(m_hInstMapi, "MAPISaveMail"); 
+#endif
+  
+  if (!lpfnMAPISaveMail)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPI function.");
+    return;
+  }          
+
+  FLAGS   flFlags = 0;
+  char    msg[512];
+  char    file1[_MAX_PATH] = "";
+  char    file2[_MAX_PATH] = "";
+  char    file3[_MAX_PATH] = "";
+  char    file4[_MAX_PATH] = "";
+  char    toAddr[128];
+  char    ccAddr[128];
+  char    bccAddr[128];
+  char    subject[128];
+  char    noteText[4096];
+  char    dateReceived[128] = "N/A";
+  char    threadID[128] = "N/A";;
+  char    origName[128] = "N/A";;
+  char    origAddress[128] = "N/A";;
+
+  GetDlgItemText(hWnd, ID_EDIT_TOADDRESS, toAddr, sizeof(toAddr));
+  GetDlgItemText(hWnd, ID_EDIT_CCADDRESS, ccAddr, sizeof(ccAddr));
+  GetDlgItemText(hWnd, ID_EDIT_BCCADDRESS, bccAddr, sizeof(bccAddr));
+  GetDlgItemText(hWnd, ID_EDIT_SUBJECT, subject, sizeof(subject));
+  GetDlgItemText(hWnd, ID_EDIT_NOTETEXT, noteText, sizeof(noteText));
+
+  // Build the message to send off...
+  lpMapiMessage  msgPtr = (MapiMessage *)malloc(sizeof(MapiMessage));
+  if (msgPtr == NULL)
+  {
+    return;
+  }
+  
+  memset(msgPtr, 0, sizeof(MapiMessage)); 
+
+  //
+  // At this point, we need to populate the structure of information
+  // we are passing in via the *lppMessage
+  //
+
+  // Set all of the general information first!
+  msgPtr->lpszSubject = strdup(subject);
+  msgPtr->lpszNoteText = strdup(noteText);
+  msgPtr->lpszDateReceived = strdup(dateReceived);
+  msgPtr->lpszConversationID = strdup(threadID);
+  msgPtr->flFlags = flFlags;
+
+  // Now deal with the recipients of this message
+  DWORD       realRecips = 0;
+  if (toAddr[0] != '\0')    ++realRecips;
+  if (ccAddr[0] != '\0')    ++realRecips;
+  if (bccAddr[0] != '\0')   ++realRecips;
+
+  msgPtr->lpRecips = (lpMapiRecipDesc) malloc((size_t) (sizeof(MapiRecipDesc) * realRecips));
+  if (!msgPtr->lpRecips)
+  {
+    FreeMAPIMessage(msgPtr);
+    return;
+  }
+
+  msgPtr->nRecipCount = realRecips;
+  memset(msgPtr->lpRecips, 0, (size_t) (sizeof(MapiRecipDesc) * msgPtr->nRecipCount));
+
+  DWORD       rCount = 0;
+  if (toAddr[0] != '\0')
+  {
+    msgPtr->lpRecips[rCount].lpszName = strdup(toAddr);
+    msgPtr->lpRecips[rCount].lpszAddress = strdup(toAddr);
+    msgPtr->lpRecips[rCount].ulRecipClass = MAPI_TO;
+    rCount++;
+  }
+
+  if (ccAddr[0] != '\0')
+  {
+    msgPtr->lpRecips[rCount].lpszName = strdup(ccAddr);
+    msgPtr->lpRecips[rCount].lpszAddress = strdup(ccAddr);
+    msgPtr->lpRecips[rCount].ulRecipClass = MAPI_CC;    
+    rCount++;
+  }
+
+  if (bccAddr[0] != '\0')
+  {
+    msgPtr->lpRecips[rCount].lpszName = strdup(bccAddr);
+    msgPtr->lpRecips[rCount].lpszAddress = strdup(bccAddr);
+    msgPtr->lpRecips[rCount].ulRecipClass = MAPI_BCC;
+    rCount++;
+  }
+
+  // Now get the names of the files to attach...
+  GetDlgItemText(hWnd, ID_EDIT_ATTACH1, file1, sizeof(file1));
+  GetDlgItemText(hWnd, ID_EDIT_ATTACH2, file2, sizeof(file2));
+  GetDlgItemText(hWnd, ID_EDIT_ATTACH3, file3, sizeof(file3));
+  GetDlgItemText(hWnd, ID_EDIT_ATTACH4, file4, sizeof(file4));
+
+  DWORD       realFiles = 0;
+  if (file1[0] != '\0')    ++realFiles;
+  if (file2[0] != '\0')    ++realFiles;
+  if (file3[0] != '\0')    ++realFiles;
+  if (file4[0] != '\0')    ++realFiles;
+
+  // Now deal with the list of attachments! Since the nFileCount should be set
+  // correctly, this loop will automagically be correct
+  //
+  msgPtr->nFileCount = realFiles;
+  if (realFiles > 0)
+  {
+    msgPtr->lpFiles = (lpMapiFileDesc) malloc((size_t) (sizeof(MapiFileDesc) * realFiles));
+    if (!msgPtr->lpFiles)
+    {
+      FreeMAPIMessage(msgPtr);
+      return;
+    }
+
+    memset(msgPtr->lpFiles, 0, (size_t) (sizeof(MapiFileDesc) * msgPtr->nFileCount));
+  }
+
+  rCount = 0;
+  if (file1[0] != '\0')
+  {
+    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file1);
+    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file1);
+    ++rCount;
+  }
+
+  if (file2[0] != '\0')
+  {
+    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file2);
+    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file2);
+    ++rCount;
+  }
+
+  if (file3[0] != '\0')
+  {
+    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file3);
+    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file3);
+    ++rCount;
+  }
+
+  if (file4[0] != '\0')
+  {
+    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file4);
+    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file4);
+    ++rCount;
+  }
+
+  // Finally, make the call...
+  LONG  rc = (*lpfnMAPISaveMail)
+           (mapiSession, 
+           (ULONG) hWnd, 
+           msgPtr, 
+           flFlags, 
+           0, NULL);
+
+  if (rc == SUCCESS_SUCCESS)
+  {
+    ShowMessage(hWnd, "Success with MAPISaveMail");
+    SetFooter("MAPISaveMail success");
+  }
+  else
+  {
+    wsprintf(msg, "FAILURE: Return code %d from MAPISaveMail\nError=[%s]", 
+                      rc, GetMAPIError(rc));
+    ShowMessage(hWnd, msg);
+    SetFooter("MAPISaveMail failed");
+  }
+
+  // Now cleanup and move on...
+  FreeMAPIMessage(msgPtr);
+}
+
+void          
+DoMAPIAddress(HWND hWnd)
+{
+  ULONG (FAR PASCAL *lpfnMAPIAddress) 
+                            (LHANDLE lhSession,
+                            ULONG ulUIParam,
+                            LPSTR lpszCaption,
+                            ULONG nEditFields,
+                            LPSTR lpszLabels,
+                            ULONG nRecips,
+                            lpMapiRecipDesc lpRecips,
+                            FLAGS flFlags,
+                            ULONG ulReserved,
+                            LPULONG lpnNewRecips,
+                            lpMapiRecipDesc FAR *lppNewRecips);
+
+
+#ifdef WIN16		
+  (FARPROC&) lpfnMAPIAddress = GetProcAddress(m_hInstMapi, "MAPIADDRESS"); 
+#else
+  (FARPROC&) lpfnMAPIAddress = GetProcAddress(m_hInstMapi, "MAPIAddress"); 
+#endif
+  
+  if (!lpfnMAPIAddress)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPI function.");
+    return;
+  }          
+
+  DWORD   i;
+  FLAGS   flFlags = 0;
+  DWORD   addrCount = 0;
+  char    msg[512];
+  char    toAddr[128];
+  char    ccAddr[128];
+  char    bccAddr[128];
+
+  GetDlgItemText(hWnd, ID_EDIT_TOADDRESS, toAddr, sizeof(toAddr));
+  GetDlgItemText(hWnd, ID_EDIT_CCADDRESS, ccAddr, sizeof(ccAddr));
+  GetDlgItemText(hWnd, ID_EDIT_BCCADDRESS, bccAddr, sizeof(bccAddr));
+
+  if (toAddr[0]) ++addrCount;
+  if (ccAddr[0]) ++addrCount;
+  if (bccAddr[0]) ++addrCount;
+
+  lpMapiRecipDesc lpRecips = (lpMapiRecipDesc) malloc((size_t) (sizeof(MapiRecipDesc) * addrCount));
+  if (!lpRecips)
+  {
+    return;
+  }
+
+  memset(lpRecips, 0, (size_t) (sizeof(MapiRecipDesc) * addrCount));
+
+  DWORD       rCount = 0;
+  if (toAddr[0] != '\0')
+  {
+    lpRecips[rCount].lpszName = strdup("To Address Name");
+    lpRecips[rCount].lpszAddress = strdup(toAddr);
+    lpRecips[rCount].ulRecipClass = MAPI_TO;
+    rCount++;
+  }
+
+  if (ccAddr[0] != '\0')
+  {
+    lpRecips[rCount].lpszName = strdup("CC Address Name");
+    lpRecips[rCount].lpszAddress = strdup(ccAddr);
+    lpRecips[rCount].ulRecipClass = MAPI_CC;    
+    rCount++;
+  }
+
+  if (bccAddr[0] != '\0')
+  {
+    lpRecips[rCount].lpszName = strdup("BCC Address Name");
+    lpRecips[rCount].lpszAddress = strdup(bccAddr);
+    lpRecips[rCount].ulRecipClass = MAPI_BCC;
+    rCount++;
+  }
+  
+  ULONG             newRecips;
+  lpMapiRecipDesc   lpNewRecips;
+
+  // Finally, make the call...
+  LONG  rc = (*lpfnMAPIAddress)
+                     (mapiSession,
+                      0,
+                      "MAPI Test Address Picker",
+                      0,
+                      NULL,
+                      rCount,
+                      lpRecips,
+                      0,
+                      0,
+                      &newRecips,
+                      &lpNewRecips);
+  if (rc == SUCCESS_SUCCESS)
+  {
+    for (i=0; i<newRecips; i++)
+    {
+      char  tMsg[512];
+
+      wsprintf(tMsg, "User %d\nName=[%s]\nEmail=[%s]\nType=[%d]", 
+            i, 
+            lpNewRecips[i].lpszName, 
+            lpNewRecips[i].lpszAddress, 
+            lpNewRecips[i].ulRecipClass);
+      ShowMessage(hWnd, tMsg);
+    }
+
+    SetFooter("MAPIAddress success");
+
+    DoMAPIFreeBuffer(hWnd, lpNewRecips, TRUE);
+  }
+  else
+  {
+    wsprintf(msg, "FAILURE: Return code %d from MAPIAddress\nError=[%s]", 
+                      rc, GetMAPIError(rc));
+    ShowMessage(hWnd, msg);
+    SetFooter("MAPIAddress failed");
+  }
+
+  // Now cleanup and move on...
+  for (i=0; i<rCount; i++)
+  {
+    FreeMAPIRecipient(&(lpRecips[i]));
+  }
+}

mozilla/mailnews/mapi/old/tests/mapitest/mapiproc.cpp

@@ -0,0 +1,832 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+#include <windows.h>
+#include <windowsx.h>      
+#include <string.h>
+
+#ifndef MAPI_OLE	// Because MSFT doesn't do this for us :-(
+#include <mapi.h>
+#endif
+
+#include "port.h"
+#include "resource.h"
+
+//
+// Variables...
+// 
+extern HINSTANCE  hInst;
+HINSTANCE         m_hInstMapi;
+LHANDLE           mapiSession = 0;
+
+// 
+// Forward declarations...
+//
+void    LoadNSCPVersionFunc(HWND hWnd);
+void    DoMAPILogon(HWND hWnd);
+void    DoMAPILogoff(HWND hWnd);
+void    DoMAPIFreeBuffer(HWND hWnd, LPVOID buf, BOOL alert);
+void    DoMAPISendMail(HWND hWnd);
+void    DoMAPISendDocuments(HWND hWnd);
+void    DoMAPIFindNext(HWND hWnd);
+void    DoMAPIReadMail(HWND hWnd);
+void    DoMAPIDeleteMail(HWND hWnd);
+void    DoMAPIDetails(HWND hWnd);
+void    DoMAPIResolveName(HWND hWnd);
+void    DoMAPIResolveNameFreeBuffer(HWND hWnd);
+void    SetFooter(LPSTR msg);
+void    DoMAPI_NSCP_Sync(HWND hWnd);
+LPSTR   GetMAPIError(LONG errorCode);
+extern void DisplayMAPIReadMail(HWND hWnd, lpMapiMessage msgPtr);
+lpMapiMessage   GetMessage(HWND hWnd, LPSTR id);
+
+void
+SetFooter(LPSTR msg)
+{
+  extern HWND   hWnd;
+
+  SetDlgItemText(hWnd, ID_STATIC_RESULT, msg);
+}
+
+char FAR *
+GetMAPIError(LONG errorCode)
+{
+  static char FAR msg[128];
+
+  switch (errorCode) {                            
+  case MAPI_E_FAILURE:
+    lstrcpy(msg, "General MAPI Failure");
+    break;
+
+  case MAPI_E_INSUFFICIENT_MEMORY:
+    strcpy(msg, "Insufficient Memory");
+    break;
+
+  case MAPI_E_LOGIN_FAILURE:
+    strcpy(msg, "Login Failure");
+    break;
+
+  case MAPI_E_TOO_MANY_SESSIONS:
+    strcpy(msg, "Too many MAPI sessions");
+    break;
+
+  case MAPI_E_INVALID_SESSION:
+    strcpy(msg, "Invalid Session!");
+    break;
+
+  case MAPI_E_INVALID_MESSAGE:
+    strcpy(msg, "Message identifier was bad!");
+    break;
+
+  case MAPI_E_NO_MESSAGES:
+    strcpy(msg, "No messages were found!");
+    break;
+
+  case MAPI_E_ATTACHMENT_WRITE_FAILURE:
+    strcpy(msg, "Attachment write failure!");
+    break;
+
+  case MAPI_E_DISK_FULL:
+    strcpy(msg, "Attachment write failure! DISK FULL");
+    break;
+
+  case MAPI_E_AMBIGUOUS_RECIPIENT:
+    strcpy(msg, "Recipient requested is not a unique address list entry.");
+    break;
+
+  case MAPI_E_UNKNOWN_RECIPIENT:
+    strcpy(msg, "Recipient requested does not exist.");
+    break;
+
+  case MAPI_E_NOT_SUPPORTED:
+    strcpy(msg, "Not supported by messaging system");
+    break;
+
+  case SUCCESS_SUCCESS:
+    strcpy(msg, "Success on MAPI operation");
+    break;
+
+  case MAPI_E_INVALID_RECIPS:
+    strcpy(msg, "Recipient specified in the lpRecip parameter was\nunknown. No dialog box was displayed.");
+    break;
+
+  case MAPI_E_ATTACHMENT_OPEN_FAILURE:
+    strcpy(msg, "One or more files could not be located. No message was sent.");    
+    break;
+
+  case MAPI_E_ATTACHMENT_NOT_FOUND:
+    strcpy(msg, "The specified attachment was not found. No message was sent.");
+    break;
+
+  case MAPI_E_BAD_RECIPTYPE:
+    strcpy(msg, "The type of a recipient was not MAPI_TO, MAPI_CC, or MAPI_BCC. No message was sent.");
+    break;
+
+  default:
+    strcpy(msg, "Unknown MAPI Return Code");
+    break;
+  }
+
+  return((LPSTR) &(msg[0]));
+}
+
+void
+ShowMessage(HWND hWnd, LPSTR msg)
+{
+  MessageBox(hWnd, msg, "Info Message", MB_ICONINFORMATION);
+}
+
+BOOL
+OpenMAPI(void)
+{
+#ifdef WIN16
+	m_hInstMapi = LoadLibrary("Y:\\ns\\cmd\\winfe\\mapi\\MAPI.DLL");	
+#else
+  m_hInstMapi = LoadLibrary(".\\COMPONENTS\\MAPI32.DLL");
+#endif
+
+  if (!m_hInstMapi)
+  {
+    ShowMessage(NULL, "Error Loading the MAPI DLL...Probably not found!");
+    return(FALSE);
+  }
+
+  return(TRUE);
+}
+
+void
+CloseMAPI(void)
+{
+  if(m_hInstMapi)
+  {
+    FreeLibrary(m_hInstMapi);
+  }
+}
+
+void 
+ProcessCommand(HWND hWnd, int id, HWND hCtl, UINT codeNotify) 
+{ 
+  switch (id) 
+  {
+  case ID_BUTTON_SYNC:
+    DoMAPI_NSCP_Sync(hWnd);
+    break;
+
+  case ID_BUTTON_NSCPVERSION:
+    LoadNSCPVersionFunc(hWnd);
+    break;
+
+  case ID_BUTTON_LOGON:
+    DoMAPILogon(hWnd);
+    break;
+
+  case ID_BUTTON_LOGOFF:
+    DoMAPILogoff(hWnd);
+    break;
+
+  case ID_BUTTON_FINDNEXT:
+  case ID_MENU_MAPIFINDNEXT:
+    DoMAPIFindNext(hWnd);
+    break;
+
+  case ID_BUTTON_READMAIL:
+  case ID_MENU_MAPIREADMAIL:
+    DoMAPIReadMail(hWnd);
+    break;
+
+  case ID_BUTTON_MAIL:
+    {
+    extern CALLBACK LOADDS 
+           MailDlgProc(HWND hWndMain, UINT wMsg, WPARAM wParam, LPARAM lParam);
+
+    DialogBox(hInst, MAKEINTRESOURCE(ID_DIALOG_MAIL), hWnd, 
+      (DLGPROC)MailDlgProc);
+    }
+    break;
+
+  case ID_BUTTON_DELETEMAIL:
+  case ID_MENU_MAPIDELETEMAIL:
+    DoMAPIDeleteMail(hWnd);
+    break;
+
+  case ID_MENU_MYEXIT:
+	  DestroyWindow(hWnd);
+	  break;
+
+  case ID_BUTTON_CLEAR:
+  case ID_MENU_CLEARRESULTS:
+    ListBox_ResetContent(GetDlgItem(hWnd, ID_LIST_RESULT));      
+	  break;
+
+  case ID_BUTTON_FREEBUFFER:
+    DoMAPIResolveNameFreeBuffer(hWnd);
+    break;
+
+  case ID_BUTTON_RESOLVENAME:
+    DoMAPIResolveName(hWnd);
+    break;
+
+  case ID_BUTTON_DETAILS:
+    DoMAPIDetails(hWnd);
+    break;
+
+  case ID_MENU_MYABOUT:
+	  MessageBox(hWnd,	
+			  "Netscape MAPI Test Harness\nWritten by: Rich Pizzarro (rhp@netscape.com)",	
+			  "About",
+			  MB_ICONINFORMATION);
+	  break;
+  
+  default:
+    break;
+  }
+}
+
+void
+DoMAPILogon(HWND hWnd)
+{
+  char  msg[1024];
+  char  user[128] = "";
+  char  pw[128] = "";
+
+  // Get Address of MAPI function...
+  ULONG (FAR PASCAL *lpfnMAPILogon)(ULONG, LPSTR, LPSTR, FLAGS, ULONG, LPLHANDLE);   
+  
+#ifdef WIN16		
+  (FARPROC&) lpfnMAPILogon = GetProcAddress(m_hInstMapi, "MAPILOGON"); 
+#else
+  (FARPROC&) lpfnMAPILogon = GetProcAddress(m_hInstMapi, "MAPILogon"); 
+#endif
+  
+  if (!lpfnMAPILogon)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPI function.");
+    return;
+  }
+
+  GetDlgItemText(hWnd, ID_EDIT_USERNAME, user, sizeof(user));
+  GetDlgItemText(hWnd, ID_EDIT_PW, pw, sizeof(pw));
+
+  LONG  rc = (*lpfnMAPILogon)((ULONG) hWnd, user, pw, 
+                  MAPI_FORCE_DOWNLOAD | MAPI_NEW_SESSION, 0, &mapiSession);
+  if (rc == SUCCESS_SUCCESS)
+  {
+    wsprintf(msg, "Success with session = %d", mapiSession);
+    ShowMessage(hWnd, msg);
+    SetFooter("Logon success");
+  }
+  else
+  {
+    wsprintf(msg, "FAILURE: Return code %d from Logon\nError=[%s]", 
+                      rc, GetMAPIError(rc));
+    ShowMessage(hWnd, msg);
+    SetFooter("Logon failed");
+  }
+}
+
+void
+DoMAPILogoff(HWND hWnd)
+{
+  ULONG (FAR PASCAL *lpfnMAPILogoff) ( LHANDLE lhSession, ULONG ulUIParam, 
+                                FLAGS flFlags, ULONG ulReserved);
+
+#ifdef WIN16		
+  (FARPROC&) lpfnMAPILogoff = GetProcAddress(m_hInstMapi, "MAPILOGOFF"); 
+#else
+  (FARPROC&) lpfnMAPILogoff = GetProcAddress(m_hInstMapi, "MAPILogoff"); 
+#endif
+  
+  if (!lpfnMAPILogoff)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPI function.");
+    return;
+  }
+
+  char  msg[1024];
+  LONG  rc = (*lpfnMAPILogoff)(mapiSession, (ULONG) hWnd, 0, 0);
+  if (rc == SUCCESS_SUCCESS)
+  {
+    wsprintf(msg, "Successful logoff");
+    ShowMessage(hWnd, msg);
+    SetFooter(msg);
+  }
+  else
+  {
+    wsprintf(msg, "FAILURE: Return code %d from Logoff\nError=[%s]", 
+                      rc, GetMAPIError(rc));
+
+    ShowMessage(hWnd, msg);
+    SetFooter("Logoff failed");
+  }
+
+  mapiSession = 0;
+}
+
+void
+DoMAPIFreeBuffer(HWND hWnd, LPVOID buf, BOOL alert)
+{
+  ULONG (FAR PASCAL *lpfnMAPIFreeBuffer) (LPVOID lpBuffer);
+
+#ifdef WIN16		
+  (FARPROC&) lpfnMAPIFreeBuffer = GetProcAddress(m_hInstMapi, "MAPIFREEBUFFER"); 
+#else
+  (FARPROC&) lpfnMAPIFreeBuffer = GetProcAddress(m_hInstMapi, "MAPIFreeBuffer"); 
+#endif
+  
+  if (!lpfnMAPIFreeBuffer)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPI function.");
+    return;
+  }
+
+  char  msg[1024];
+  LONG  rc = (*lpfnMAPIFreeBuffer)(buf);
+#ifdef WIN32
+  if (rc == S_OK)
+#else
+  if (rc == SUCCESS_SUCCESS)
+#endif
+  {
+    wsprintf(msg, "Successful Free Buffer Operation");
+    if (alert)
+      ShowMessage(hWnd, msg);
+  }
+  else
+  {
+    wsprintf(msg, "FAILURE: Return code %d from Logoff", rc);
+    ShowMessage(hWnd, msg);
+  }
+}
+
+void
+DoMAPIFindNext(HWND hWnd)
+{
+  ULONG (FAR PASCAL *lpfnMAPIFindNext) (LHANDLE lhSession, ULONG ulUIParam, 
+           LPTSTR lpszMessageType, LPTSTR lpszSeedMessageID, FLAGS flFlags, 
+           ULONG ulReserved, LPTSTR lpszMessageID);
+
+#ifdef WIN16		
+  (FARPROC&) lpfnMAPIFindNext = GetProcAddress(m_hInstMapi, "MAPIFINDNEXT"); 
+#else
+  (FARPROC&) lpfnMAPIFindNext = GetProcAddress(m_hInstMapi, "MAPIFindNext"); 
+#endif
+
+  if (!lpfnMAPIFindNext)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPI function.");
+    return;
+  }
+
+  // Clear the list before we start...
+  ListBox_ResetContent(GetDlgItem(hWnd, ID_LIST_RESULT));
+
+  char  msg[1024];
+  char  messageID[512];
+  LONG  rc;                                                               
+#ifdef WIN32
+  FLAGS	flags = MAPI_GUARANTEE_FIFO | MAPI_LONG_MSGID | MAPI_UNREAD_ONLY;
+#else                                                                     	
+  FLAGS	flags = MAPI_GUARANTEE_FIFO | MAPI_UNREAD_ONLY;
+#endif
+  
+  while ( (rc = (*lpfnMAPIFindNext) (mapiSession, 
+           (ULONG) hWnd, 
+           NULL, 
+           NULL, 
+		   flags,
+           0,
+           messageID)) == SUCCESS_SUCCESS)
+  {
+      // 
+
+      lpMapiMessage mapiMsg = GetMessage(hWnd, messageID);
+      if (mapiMsg != NULL)
+      {
+        wsprintf(msg, "%s: \"%s\" Sender: %s", 
+                  messageID, 
+                  mapiMsg->lpszSubject, 
+                  mapiMsg->lpOriginator->lpszName);
+        DoMAPIFreeBuffer(hWnd, mapiMsg, FALSE);
+      }
+      else
+      {
+        lstrcpy(msg, messageID);
+      }
+
+      ListBox_InsertString(GetDlgItem(hWnd, ID_LIST_RESULT), 0, msg);
+  }
+
+  wsprintf(msg, "Enumeration ended: Return code %d from MAPIFindNext\nCondition=[%s]", 
+                    rc, GetMAPIError(rc));
+  ShowMessage(hWnd, msg);
+  SetFooter("Enumeration ended");
+}
+
+void
+DoMAPIReadMail(HWND hWnd)
+{
+  ULONG (FAR PASCAL *lpfnMAPIReadMail) (LHANDLE lhSession, ULONG ulUIParam, 
+           LPTSTR lpszMessageID, FLAGS flFlags, ULONG ulReserved, 
+           lpMapiMessage FAR * lppMessage);
+
+#ifdef WIN16		
+  (FARPROC&) lpfnMAPIReadMail = GetProcAddress(m_hInstMapi, "MAPIREADMAIL"); 
+#else
+  (FARPROC&) lpfnMAPIReadMail = GetProcAddress(m_hInstMapi, "MAPIReadMail"); 
+#endif
+  
+  if (!lpfnMAPIReadMail)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPI function.");
+    return;
+  }
+
+  char            msg[1024];
+  char            lpszMessageID[512];
+  lpMapiMessage   lpMessage = NULL;
+  FLAGS           flFlags = 0;
+
+  DWORD selected = ListBox_GetCurSel(GetDlgItem(hWnd, ID_LIST_RESULT));
+  if (selected == LB_ERR)
+  {
+    ShowMessage(hWnd, "You need to select a valid message. Make sure\nyou have done a MAPIFindNext and selected\none of the resulting messages.");
+    return;
+  }
+
+  ListBox_GetText(GetDlgItem(hWnd, ID_LIST_RESULT), selected, lpszMessageID);
+
+  // Do the various flags for this call...
+  if (BST_CHECKED == Button_GetCheck(GetDlgItem(hWnd, IDC_CHECK_BODYASFILE)))
+  {
+    flFlags |= MAPI_BODY_AS_FILE;
+  }
+
+  if (BST_CHECKED == Button_GetCheck(GetDlgItem(hWnd, IDC_CHECK_ENVELOPEONLY)))
+  {
+    flFlags |= MAPI_ENVELOPE_ONLY;
+  }
+
+  if (BST_CHECKED == Button_GetCheck(GetDlgItem(hWnd, IDC_CHECK_PEEK)))
+  {
+    flFlags |= MAPI_PEEK;
+  }
+  
+  if (BST_CHECKED == Button_GetCheck(GetDlgItem(hWnd, IDC_CHECK_SUPPRESSATTACH)))
+  {
+    flFlags |= MAPI_SUPPRESS_ATTACH;
+  }
+
+  char *ptr = strchr( (const char *) lpszMessageID, ':');
+  if (ptr) *ptr = '\0';
+
+  LONG  rc = (*lpfnMAPIReadMail)
+          (mapiSession, 
+          (ULONG) hWnd, 
+          lpszMessageID,
+          flFlags,
+          0, 
+          &lpMessage);
+
+  // Deal with error up front and return if need be...
+  if (rc != SUCCESS_SUCCESS)
+  {
+    wsprintf(msg, "FAILURE: Return code %d from MAPIReadMail\nError=[%s]", 
+                      rc, GetMAPIError(rc));
+
+    ShowMessage(hWnd, msg);
+    SetFooter("ReadMail failed");
+    return;
+  }
+
+  // Now display the message and then return...
+  DisplayMAPIReadMail(hWnd, lpMessage);
+  DoMAPIFreeBuffer(hWnd, lpMessage, TRUE);
+}
+
+void
+DoMAPIDeleteMail(HWND hWnd)
+{
+  ULONG (FAR PASCAL *lpfnMAPIDeleteMail) (LHANDLE lhSession, ULONG ulUIParam, 
+            LPTSTR lpszMessageID, FLAGS flFlags, ULONG ulReserved);
+
+#ifdef WIN16		
+  (FARPROC&) lpfnMAPIDeleteMail = GetProcAddress(m_hInstMapi, "MAPIDELETEMAIL"); 
+#else
+  (FARPROC&) lpfnMAPIDeleteMail = GetProcAddress(m_hInstMapi, "MAPIDeleteMail"); 
+#endif
+  
+  if (!lpfnMAPIDeleteMail)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPI function.");
+    return;
+  }
+ 
+  char            msg[1024];
+  char            lpszMessageID[512];
+  lpMapiMessage   lpMessage = NULL;
+
+  DWORD selected = ListBox_GetCurSel(GetDlgItem(hWnd, ID_LIST_RESULT));
+  if (selected == LB_ERR)
+  {
+    ShowMessage(hWnd, "You need to select a valid message. Make sure\nyou have done a MAPIFindNext and selected\none of the resulting messages.");
+    return;
+  }
+
+  ListBox_GetText(GetDlgItem(hWnd, ID_LIST_RESULT), selected, lpszMessageID);
+
+  char *ptr = strchr( (const char *) lpszMessageID, ':');
+  if (ptr) *ptr = '\0';
+
+  LONG  rc = (*lpfnMAPIDeleteMail)
+          (mapiSession, 
+          (ULONG) hWnd,
+          lpszMessageID, 
+          0,
+          0);
+  
+  // Deal with the return code...
+  if (rc == SUCCESS_SUCCESS)
+  {
+    wsprintf(msg, "Successful deletion");
+    ShowMessage(hWnd, msg);
+    SetFooter(msg);  
+
+    // If it worked, refresh the list...
+    ShowMessage(hWnd, "The message list will now be refreshed\nsince one message was deleted.");
+    DoMAPIFindNext(hWnd);
+  }
+  else
+  {
+    wsprintf(msg, "FAILURE: Return code %d from MAPIDeleteMail\nError=[%s]", 
+                      rc, GetMAPIError(rc));
+
+    ShowMessage(hWnd, msg);
+    SetFooter("Logoff failed");
+  }
+}
+
+// This is for the name lookup stuff...
+lpMapiRecipDesc       lpRecip = NULL;
+
+void
+DoMAPIResolveName(HWND hWnd)
+{
+  ULONG (FAR PASCAL *lpfnMAPIResolveName) (LHANDLE lhSession, ULONG ulUIParam, 
+            LPTSTR lpszName, FLAGS flFlags, ULONG ulReserved, 
+            lpMapiRecipDesc FAR * lppRecip); 
+
+#ifdef WIN16		
+  (FARPROC&) lpfnMAPIResolveName = GetProcAddress(m_hInstMapi, "MAPIRESOLVENAME"); 
+#else
+  (FARPROC&) lpfnMAPIResolveName = GetProcAddress(m_hInstMapi, "MAPIResolveName"); 
+#endif
+  
+  if (!lpfnMAPIResolveName)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPI function.");
+    return;
+  }
+
+  if (lpRecip != NULL)
+  {
+    ShowMessage(hWnd, "We need to free memory from a previous call...");
+    DoMAPIFreeBuffer(hWnd, lpRecip, TRUE);
+    lpRecip = NULL;
+  }
+
+  char        userName[512];
+  char        msg[1024];
+  FLAGS       flFlags = 0;    // We support none...
+
+  GetDlgItemText(hWnd, IDC_EDIT_RESOLVENAME, userName, sizeof(userName));
+  LONG  rc = (*lpfnMAPIResolveName)
+                      (mapiSession, 
+                       (ULONG) hWnd, 
+                       userName,
+                       flFlags, 
+                       0, 
+                       &lpRecip);
+
+  // Deal with error up front and return if need be...
+  if (rc != SUCCESS_SUCCESS)
+  {
+    wsprintf(msg, "FAILURE: Return code %d from DoMAPIResolveName\nError=[%s]", 
+                      rc, GetMAPIError(rc));
+
+    ShowMessage(hWnd, msg);
+    SetFooter("DoMAPIResolveName failed");
+    return;
+  }
+
+  // If we get here, we should probably show the information that we
+  // got back
+  wsprintf(msg, "Received information for %s\nName=[%s]\nAddress=[%s]\nID=[%s]",
+    userName, lpRecip->lpszName, lpRecip->lpszAddress, (LPSTR) lpRecip->lpEntryID);
+  ShowMessage(hWnd, msg);
+}
+
+void    
+DoMAPIResolveNameFreeBuffer(HWND hWnd)
+{
+  if (lpRecip == NULL)
+  {
+    ShowMessage(hWnd, "There is no memory allocated from MAPIResolveName()\nto be freed. Request ignored.");
+  }
+  else
+  {
+    DoMAPIFreeBuffer(hWnd, lpRecip, TRUE);
+    lpRecip = NULL;
+  }
+}
+
+void
+DoMAPIDetails(HWND hWnd)
+{
+  ULONG (FAR PASCAL *lpfnMAPIDetails) (LHANDLE lhSession, ULONG ulUIParam, 
+            lpMapiRecipDesc lpRecip, FLAGS flFlags, ULONG ulReserved);
+
+#ifdef WIN16		
+  (FARPROC&) lpfnMAPIDetails = GetProcAddress(m_hInstMapi, "MAPIDetails"); 
+#else
+  (FARPROC&) lpfnMAPIDetails = GetProcAddress(m_hInstMapi, "MAPIDetails"); 
+#endif
+  
+  if (!lpfnMAPIDetails)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPI function.");
+    return;
+  }
+
+  char        msg[1024];
+  FLAGS       flFlags = 0;    // We really don't support these...
+
+  LONG  rc = (*lpfnMAPIDetails)
+              (mapiSession, 
+              (ULONG) hWnd,
+               lpRecip,
+               flFlags,
+               0);
+
+  if (rc == SUCCESS_SUCCESS)
+  {
+
+    wsprintf(msg, "MAPIDetails call succeeded");
+    ShowMessage(hWnd, msg);
+    SetFooter(msg);
+  }
+  else
+  {
+
+    wsprintf(msg, "FAILURE: Return code %d from MAPIDetails\nError=[%s]", 
+                      rc, GetMAPIError(rc));
+
+    if (lpRecip == NULL)
+    {
+      lstrcat(msg, "\nNOTE: There is no valid pointer from a MAPIResolveName()\ncall to show details about.");
+    }
+
+    ShowMessage(hWnd, msg);
+    SetFooter("MAPIDetails failed");
+  }
+}
+
+lpMapiMessage 
+GetMessage(HWND hWnd, LPSTR id)
+{
+  ULONG (FAR PASCAL *lpfnMAPIReadMail) (LHANDLE lhSession, ULONG ulUIParam, 
+           LPTSTR lpszMessageID, FLAGS flFlags, ULONG ulReserved, 
+           lpMapiMessage FAR * lppMessage);
+
+#ifdef WIN16		
+  (FARPROC&) lpfnMAPIReadMail = GetProcAddress(m_hInstMapi, "MAPIREADMAIL"); 
+#else
+  (FARPROC&) lpfnMAPIReadMail = GetProcAddress(m_hInstMapi, "MAPIReadMail"); 
+#endif
+  
+  if (!lpfnMAPIReadMail)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPI function.");
+    return NULL;
+  }
+
+  char            msg[1024];
+  lpMapiMessage   lpMessage = NULL;
+  FLAGS           flFlags = 0;
+
+  flFlags |= MAPI_ENVELOPE_ONLY;
+  LONG  rc = (*lpfnMAPIReadMail)
+          (mapiSession, 
+          (ULONG) hWnd, 
+          id,
+          flFlags,
+          0, 
+          &lpMessage);
+
+  // Deal with error up front and return if need be...
+  if (rc != SUCCESS_SUCCESS)
+  {
+    wsprintf(msg, "FAILURE: Return code %d from MAPIReadMail\nError=[%s]", 
+                      rc, GetMAPIError(rc));
+
+    ShowMessage(hWnd, msg);
+    SetFooter("ReadMail failed");
+    return NULL;
+  }
+
+  return(lpMessage);
+}
+
+void    
+LoadNSCPVersionFunc(HWND hWnd)
+{
+  ULONG (FAR PASCAL *lpfnLoadNSCPVersion) ( void );
+
+#ifdef WIN16		
+  (FARPROC&) lpfnLoadNSCPVersion = GetProcAddress(m_hInstMapi, "MAPIGETNERSCAPEVERSION"); 
+#else
+  (FARPROC&) lpfnLoadNSCPVersion = GetProcAddress(m_hInstMapi, "MAPIGetNetscapeVersion"); 
+#endif
+  
+  if (!lpfnLoadNSCPVersion)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPIGetNetscapeVersion() function.");
+  }
+  else
+  {
+    ShowMessage(hWnd, "MAPIGetNetscapeVersion() function was FOUND!");
+  }
+  return;
+}
+
+void    
+DoMAPI_NSCP_Sync(HWND hWnd)
+{
+ULONG (FAR PASCAL *lpfnNSCPSync) ( LHANDLE lhSession,
+                                          ULONG ulReserved );
+#ifdef WIN16		
+  (FARPROC&) lpfnNSCPSync = GetProcAddress(m_hInstMapi, "MAPI_NSCP_SYNCHRONIZECLIENT"); 
+#else
+  (FARPROC&) lpfnNSCPSync = GetProcAddress(m_hInstMapi, "MAPI_NSCP_SynchronizeClient"); 
+#endif
+
+  if (!lpfnNSCPSync)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPI function.");
+    return;
+  }
+
+  LONG  rc = (*lpfnNSCPSync) (mapiSession, 0);
+
+  char    msg[256];
+
+  // Deal with error up front and return if need be...
+  if (rc != SUCCESS_SUCCESS)
+  {
+    wsprintf(msg, "FAILURE: Return code %d from MAPI_NSCP_SynchronizeClient\nError=[%s]", 
+                      rc, GetMAPIError(rc));
+
+    ShowMessage(hWnd, msg);
+    SetFooter("MAPI_NSCP_SynchronizeClient failed");
+    return;
+  }
+  else
+  {
+    wsprintf(msg, "Success for MAPI_NSCP_SynchronizeClient");    
+    ShowMessage(hWnd, msg);
+    SetFooter("MAPI_NSCP_SynchronizeClient success");
+  }
+}

mozilla/mailnews/mapi/old/tests/mapitest/mapitest.dep

@@ -0,0 +1,25 @@
+# Microsoft Developer Studio Generated Dependency File, included by mapitest.mak
+
+.\main.cpp : \
+	".\port.h"\
+	"c:\program files\msdev\vc98\include\basetsd.h"\
+	
+
+.\mapimail.cpp : \
+	".\port.h"\
+	"c:\program files\msdev\vc98\include\basetsd.h"\
+	
+
+.\mapiproc.cpp : \
+	".\port.h"\
+	"c:\program files\msdev\vc98\include\basetsd.h"\
+	
+
+.\mtest32.rc : \
+	".\nscicon.ico"\
+	
+
+.\readmail.cpp : \
+	".\port.h"\
+	"c:\program files\msdev\vc98\include\basetsd.h"\
+	

mozilla/mailnews/mapi/old/tests/mapitest/mapitest.dsp

@@ -0,0 +1,121 @@
+# Microsoft Developer Studio Project File - Name="mapitest" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=mapitest - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "mapitest.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "mapitest.mak" CFG="mapitest - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "mapitest - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "mapitest - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "mapitest - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
+
+!ELSEIF  "$(CFG)" == "mapitest - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "mapitest - Win32 Release"
+# Name "mapitest - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\main.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\mapimail.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\mapiproc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\mtest32.rc
+# End Source File
+# Begin Source File
+
+SOURCE=.\readmail.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project

mozilla/mailnews/mapi/old/tests/mapitest/mapitest.dsw

@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "mapitest"=.\mapitest.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+

mozilla/mailnews/mapi/old/tests/mapitest/mapitest.plg

@@ -0,0 +1,44 @@
+<html>
+<body>
+<pre>
+<h1>Build Log</h1>
+<h3>
+--------------------Configuration: mapitest - Win32 Debug--------------------
+</h3>
+<h3>Command Lines</h3>
+Creating command line "rc.exe /l 0x409 /fo"Debug/mtest32.res" /d "_DEBUG" "Y:\mozilla\mailnews\mapi\tests\mapitest\mtest32.rc"" 
+Creating temporary file "C:\TEMP\RSP38A.tmp" with contents
+[
+/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"Debug/mapitest.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
+"Y:\mozilla\mailnews\mapi\tests\mapitest\readmail.cpp"
+"Y:\mozilla\mailnews\mapi\tests\mapitest\mapimail.cpp"
+"Y:\mozilla\mailnews\mapi\tests\mapitest\mapiproc.cpp"
+"Y:\mozilla\mailnews\mapi\tests\mapitest\main.cpp"
+]
+Creating command line "cl.exe @C:\TEMP\RSP38A.tmp" 
+Creating temporary file "C:\TEMP\RSP38B.tmp" with contents
+[
+kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/mapitest.pdb" /debug /machine:I386 /out:"Debug/mapitest.exe" /pdbtype:sept 
+.\Debug\readmail.obj
+.\Debug\mapimail.obj
+.\Debug\mapiproc.obj
+.\Debug\mtest32.res
+.\Debug\main.obj
+]
+Creating command line "link.exe @C:\TEMP\RSP38B.tmp"
+<h3>Output Window</h3>
+Compiling resources...
+Compiling...
+readmail.cpp
+mapimail.cpp
+mapiproc.cpp
+main.cpp
+Linking...
+
+
+
+<h3>Results</h3>
+mapitest.exe - 0 error(s), 0 warning(s)
+</pre>
+</body>
+</html>

mozilla/mailnews/mapi/old/tests/mapitest/mtest32.rc

@@ -0,0 +1,245 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+ID_DIALOG DIALOG DISCARDABLE  0, 0, 344, 229
+STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Netscape MAPI Test Harness"
+MENU ID_MENU
+FONT 8, "MS Sans Serif"
+BEGIN
+    GROUPBOX        "Open/Close",IDC_STATIC,4,4,336,27
+    LTEXT           "User:",IDC_STATIC,9,17,18,11
+    EDITTEXT        ID_EDIT_USERNAME,28,15,41,12,ES_AUTOHSCROLL
+    LTEXT           "Password:",IDC_STATIC,74,17,38,11
+    EDITTEXT        ID_EDIT_PW,112,15,41,12,ES_PASSWORD | ES_AUTOHSCROLL
+    PUSHBUTTON      "MAPILogon",ID_BUTTON_LOGON,157,13,46,14
+    PUSHBUTTON      "MAPILogoff",ID_BUTTON_LOGOFF,209,13,46,14
+    GROUPBOX        "Mail Operations",IDC_STATIC,4,36,336,142
+    PUSHBUTTON      "MAPIFindNext",ID_BUTTON_FINDNEXT,17,50,57,14
+    PUSHBUTTON      "MAPIDeleteMail",ID_BUTTON_DELETEMAIL,80,50,57,14
+    PUSHBUTTON      "Clear Results",ID_BUTTON_CLEAR,143,50,57,14
+    PUSHBUTTON      "Send Mail",ID_BUTTON_MAIL,206,50,57,14
+    LISTBOX         ID_LIST_RESULT,9,66,325,56,LBS_SORT | 
+                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
+                    WS_TABSTOP
+    GROUPBOX        "User Information",IDC_STATIC,4,181,336,28
+    PUSHBUTTON      "MAPIResolveName",ID_BUTTON_RESOLVENAME,9,192,68,14
+    EDITTEXT        IDC_EDIT_RESOLVENAME,82,192,130,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "MAPIDetails",ID_BUTTON_DETAILS,219,192,48,14
+    LTEXT           "",ID_STATIC_RESULT,4,214,336,13,SS_SUNKEN
+    PUSHBUTTON      "MAPIReadMail",ID_BUTTON_READMAIL,34,142,57,14
+    CONTROL         "MAPI_BODY_AS_FILE - Body as attachment",
+                    IDC_CHECK_BODYASFILE,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,121,125,188,9
+    CONTROL         "MAPI_ENVELOPE_ONLY - Header information only",
+                    IDC_CHECK_ENVELOPEONLY,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,121,138,188,9
+    CONTROL         "MAPI_PEEK - Don't mark message as read",IDC_CHECK_PEEK,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,121,151,188,9
+    CONTROL         "MAPI_SUPPRESS_ATTACH - Suppress attachments",
+                    IDC_CHECK_SUPPRESSATTACH,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,121,164,188,9
+    PUSHBUTTON      "<- MAPIFreeBuffer",ID_BUTTON_FREEBUFFER,272,192,63,14
+    PUSHBUTTON      "MAPIGetNSCPVersion",ID_BUTTON_NSCPVERSION,261,13,76,14
+    PUSHBUTTON      "Synchronize",ID_BUTTON_SYNC,269,50,57,14
+END
+
+ID_DIALOG_MAIL DIALOG DISCARDABLE  0, 0, 285, 246
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Composition"
+FONT 8, "MS Sans Serif"
+BEGIN
+    GROUPBOX        "Address Information",IDC_STATIC,4,4,275,55
+    LTEXT           "To:",IDC_STATIC,21,19,12,8
+    EDITTEXT        ID_EDIT_TOADDRESS,36,16,239,13,ES_AUTOHSCROLL
+    EDITTEXT        ID_EDIT_CCADDRESS,36,30,239,13,ES_AUTOHSCROLL
+    EDITTEXT        ID_EDIT_BCCADDRESS,36,44,239,13,ES_AUTOHSCROLL
+    LTEXT           "Subject:",IDC_STATIC,5,65,29,9
+    EDITTEXT        ID_EDIT_SUBJECT,36,63,239,13,ES_AUTOHSCROLL
+    EDITTEXT        ID_EDIT_NOTETEXT,4,78,271,72,ES_MULTILINE | 
+                    ES_AUTOHSCROLL
+    GROUPBOX        "Attachments",IDC_STATIC,4,153,275,39
+    EDITTEXT        ID_EDIT_ATTACH1,16,162,122,13,ES_AUTOHSCROLL
+    EDITTEXT        ID_EDIT_ATTACH2,16,176,122,13,ES_AUTOHSCROLL
+    EDITTEXT        ID_EDIT_ATTACH3,147,162,122,13,ES_AUTOHSCROLL
+    EDITTEXT        ID_EDIT_ATTACH4,147,175,122,13,ES_AUTOHSCROLL
+    PUSHBUTTON      "MAPISendMail",ID_BUTTON_MAPISENDMAIL,70,204,58,14
+    PUSHBUTTON      "Cancel",IDCANCEL,50,225,84,14
+    PUSHBUTTON      "MAPISendDocuments",ID_BUTTON_MAPISENDDOCUMENTS,132,204,
+                    79,14
+    CONTROL         "Show Dialog",ID_CHECK_SHOWDIALOG,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,8,207,55,9
+    LTEXT           "cc:",IDC_STATIC,22,32,12,8
+    LTEXT           "bcc:",IDC_STATIC,18,47,15,8
+    GROUPBOX        "Send Operations",IDC_STATIC,4,196,275,26
+    PUSHBUTTON      "MAPISaveMail",ID_BUTTON_MAPISAVEMAIL,215,204,57,14
+    PUSHBUTTON      "MAPIAddress",ID_BUTTON_MAPIADDRESS,150,225,84,14
+END
+
+ID_DIALOG_READMAIL DIALOG DISCARDABLE  0, 0, 269, 266
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Mail Message"
+FONT 8, "MS Sans Serif"
+BEGIN
+    LTEXT           "Subject:",IDC_STATIC,5,71,27,9
+    EDITTEXT        IDC_EDIT_SUBJECT,36,69,229,12,ES_AUTOHSCROLL | 
+                    ES_READONLY
+    LISTBOX         IDC_LIST_ATTACHMENTS,4,211,261,37,LBS_SORT | 
+                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_EDIT_BODYTEXT,4,113,261,85,ES_MULTILINE | 
+                    ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | 
+                    ES_WANTRETURN
+    LISTBOX         IDC_LIST_RECIPIENTS,4,29,261,36,LBS_SORT | 
+                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Recipients:",IDC_STATIC,4,19,43,9
+    LTEXT           "Attachments:",IDC_STATIC,4,202,43,9
+    EDITTEXT        IDC_EDIT_DATETIME,36,83,229,12,ES_AUTOHSCROLL | 
+                    ES_READONLY
+    LTEXT           "Date:",IDC_STATIC,13,84,19,9
+    PUSHBUTTON      "OK",ID_OK,114,249,42,13
+    EDITTEXT        IDC_EDIT_THREAD,36,97,229,12,ES_AUTOHSCROLL | 
+                    ES_READONLY
+    LTEXT           "Thread:",IDC_STATIC,6,99,25,9
+    LTEXT           "From:",IDC_STATIC,4,6,19,9
+    EDITTEXT        IDC_EDIT_FROM,27,4,238,12,ES_AUTOHSCROLL | ES_READONLY
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+    ID_DIALOG, DIALOG
+    BEGIN
+        LEFTMARGIN, 4
+        RIGHTMARGIN, 340
+        VERTGUIDE, 9
+        VERTGUIDE, 309
+        TOPMARGIN, 4
+        BOTTOMMARGIN, 227
+        HORZGUIDE, 206
+    END
+
+    ID_DIALOG_MAIL, DIALOG
+    BEGIN
+        LEFTMARGIN, 4
+        RIGHTMARGIN, 281
+        TOPMARGIN, 4
+        BOTTOMMARGIN, 239
+    END
+
+    ID_DIALOG_READMAIL, DIALOG
+    BEGIN
+        LEFTMARGIN, 4
+        RIGHTMARGIN, 265
+        TOPMARGIN, 4
+        BOTTOMMARGIN, 262
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+ID_ICON_APP             ICON    DISCARDABLE     "nscicon.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menu
+//
+
+ID_MENU MENU DISCARDABLE 
+BEGIN
+    POPUP "&File"
+    BEGIN
+        MENUITEM "MAPI&FindNext",               ID_MENU_MAPIFINDNEXT
+        MENUITEM "MAPI&ReadMail",               ID_MENU_MAPIREADMAIL
+        MENUITEM SEPARATOR
+        MENUITEM "E&xit",                       ID_MENU_MYEXIT
+    END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "MAPI&DeleteMail",             ID_MENU_MAPIDELETEMAIL
+        MENUITEM "&Clear Results",              ID_MENU_CLEARRESULTS
+    END
+    POPUP "&Help"
+    BEGIN
+        MENUITEM "&About...",                   ID_MENU_MYABOUT
+    END
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

mozilla/mailnews/mapi/old/tests/mapitest/port.h

@@ -0,0 +1,303 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+
+#ifndef PORT_H
+#define PORT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*****************************************************************\
+ *                                                               *
+ *  PORT.H                                                       *
+ *                                                               *
+ *  Win16/Win32 portability stuff                                *
+ *                                                               *
+ *  A.Sokolsky                                                   *
+ *      3.10.94 distilled into this header                       *
+ *                                                               *
+\*****************************************************************/
+
+/*
+ * calling conventions
+ */
+#include <assert.h>
+                                                      
+                                                      
+#ifndef CDECL
+#define CDECL __cdecl
+#endif  // CDECL
+
+#ifndef PASCAL
+#define PASCAL __pascal
+#endif  // PASCAL
+
+#ifdef FASTCALL
+#error FASTCALL defined
+#endif // FASTCALL
+
+
+#ifdef NDEBUG
+#define FASTCALL __fastcall
+#else
+#define FASTCALL PASCAL
+#endif // NDEBUG   
+
+
+
+#ifndef HWND2DWORD
+#  ifdef WIN32
+#    define HWND2DWORD(X_hWnd) ( (DWORD)(X_hWnd) )
+#  else // WIN16
+#    define HWND2DWORD(X_hWnd) ( (DWORD)MAKELONG(((WORD)(X_hWnd)), 0) )
+#  endif
+#endif // HWND2DWORD
+
+
+/*
+ * WIN16 - WIN32 compatibility stuff
+ */
+
+#ifdef WIN32
+
+# define DLLEXPORT    __declspec( dllexport )
+# define EXPORT
+# define LOADDS
+# define HUGE
+# ifndef FAR
+#  define FAR
+# endif // FAR
+# ifndef NEAR
+#  define NEAR
+# endif // NEAR 
+# ifdef UNICODE
+#  define SIZEOF(x)   (sizeof(x)/sizeof(WCHAR))
+# else
+#  define SIZEOF(x)   sizeof(x)
+# endif
+
+#else  // !WIN32 == WIN16
+
+# define DLLEXPORT    
+# define EXPORT       __export
+# define LOADDS       __loadds
+# define HUGE         __huge
+# ifndef FAR
+#   define FAR        __far
+#   define NEAR       __near
+# endif  // FAR
+# define CONST const
+# define SIZEOF(x)    sizeof(x)
+# define CHAR char
+# define TCHAR char
+# define WCHAR char
+# ifndef LPTSTR
+#   define LPTSTR LPSTR
+# endif
+# ifndef LPCTSTR 
+#   define LPCTSTR LPCSTR
+# endif
+# define UNREFERENCED_PARAMETER(x) x;
+# ifndef TEXT
+#   define TEXT(x) x
+# endif
+# define GetWindowTextW GetWindowText
+# define lstrcpyW lstrcpy   
+
+# define BN_DBLCLK BN_DOUBLECLICKED // ~~MRJ needed for custom control.
+// ~~MRJ begin Win95 backward compat section
+# define LPWSTR LPSTR
+# define LPCWSTR LPCSTR
+
+// button check state for WIN16
+#ifndef BST_UNCHECKED
+#define BST_UNCHECKED      0x0000
+#endif
+
+#ifndef BST_CHECKED
+#define BST_CHECKED        0x0001
+#endif
+
+
+#ifndef WIN95_COMPAT
+#  define WIN95_COMPAT
+#endif
+
+// ~~MRJ end Win95 compat section.
+
+// critical section API stubs
+typedef DWORD CRITICAL_SECTION;
+typedef CRITICAL_SECTION FAR * LPCRITICAL_SECTION; 
+#ifdef __cplusplus
+inline void InitializeCriticalSection(LPCRITICAL_SECTION lpSection) {}
+inline void DeleteCriticalSection(LPCRITICAL_SECTION lpSection) {}
+inline void EnterCriticalSection(LPCRITICAL_SECTION lpSection) {}
+inline void LeaveCriticalSection(LPCRITICAL_SECTION lpSection) {} 
+#endif // __cplusplus 
+
+// Added for nssock16 ---Neeti
+#ifndef ZeroMemory
+#include <memory.h>
+#define ZeroMemory(PTR, SIZE) memset(PTR, 0, SIZE)
+#endif // ZeroMemory
+
+#endif // WIN16
+
+/*
+ * unix - windows compatibility stuff
+ */
+typedef DWORD u_int32;
+typedef WORD  u_int16;
+typedef BYTE  u_int8;
+#ifdef WIN32
+typedef short int Bool16;
+#else  // WIN16
+typedef BOOL  Bool16;
+#endif // WIN16
+
+/*
+ * Cross Platform Compatibility
+ */
+#ifndef UNALIGNED
+# ifdef _M_ALPHA
+#  define UNALIGNED __unaligned
+# else  // !_M_ALPHA
+#  define UNALIGNED
+# endif // !_M_ALPHA
+#endif  // UNALIGNED
+
+//
+// RICHIE - for the Alpha port
+//
+#ifdef _M_ALPHA
+# undef pascal
+# undef PASCAL
+# if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED)
+#  define pascal __stdcall
+#  define PASCAL __stdcall
+# else
+#  define PASCAL
+# endif
+#endif
+
+
+/*
+ * Useful Types
+ */
+typedef char HUGE *HPSTR;
+typedef const char HUGE *HPCSTR;
+typedef unsigned char HUGE *HPBYTE;
+typedef WORD HUGE *HPWORD;
+typedef UINT FAR *LPUINT;
+typedef BOOL (CALLBACK *USERABORTPROC)();
+typedef BOOL (CALLBACK *PROGRESSPROC)(UINT uPos, UINT uRange);
+typedef int INT;   // ~~MRJ a function needed this defined.
+typedef MINMAXINFO FAR *LPMINMAXINFO; // ~~MRJ 
+
+//
+// stuff missing from windows.h
+//
+#ifndef MAKEWORD
+#define MAKEWORD(low, high)    ((WORD)(((BYTE)(low)) | (((WORD)((BYTE)(high))) << 8)))
+#endif // MAKEWORD
+
+#ifdef WIN32
+# ifndef hmemcpy
+#  define hmemcpy memcpy
+# endif // !defined(hmemcpy)
+# define _fmemset memset
+
+# include <malloc.h>
+
+#ifdef __cplusplus
+
+inline BOOL IsGDIObject(HGDIOBJ hObj) { return (hObj != 0); }
+inline void *_halloc(long num, unsigned int size) { return malloc(num * size); }
+inline void _hfree( void *memblock ) { free(memblock); } 
+/*
+inline BOOL IsInstance(HINSTANCE hInst) {
+# ifdef WIN32
+    return (hInst != 0);
+# else // WIN16
+    return (hInst > HINSTANCE_ERROR);
+# endif  
+}  
+*/
+
+#endif // __cplusplus
+
+  WINUSERAPI HANDLE WINAPI LoadImageA(HINSTANCE, LPCSTR, UINT, int, int, UINT);
+
+#endif // WIN32
+
+#ifdef __cplusplus 
+inline BOOL IsInstance(HINSTANCE hInst) {
+# ifdef WIN32
+    return (hInst != 0);
+# else // WIN16
+    return (hInst > HINSTANCE_ERROR);
+# endif  
+} 
+inline void SetWindowSmallIcon(HINSTANCE hInst, HWND hWnd, UINT uIconResourceId) {
+#ifdef WIN32
+# ifndef WM_SETICON
+#   define WM_SETICON 0x0080
+# endif  // WM_SETICON
+# ifndef IMAGE_ICON
+#   define IMAGE_ICON 1
+# endif
+  assert(IsWindow(hWnd));
+  HICON hIcon = (HICON)LoadImageA(hInst, MAKEINTRESOURCE(uIconResourceId), IMAGE_ICON,
+    16, 16, 0);
+  if(NULL != hIcon) {
+    SendMessage(hWnd, WM_SETICON, FALSE, (LPARAM)hIcon);
+  } else {
+    HICON hIcon = LoadIcon(hInst, MAKEINTRESOURCE(uIconResourceId));
+    assert(hIcon != 0);
+    SendMessage(hWnd, WM_SETICON, FALSE, (LPARAM)hIcon);
+  }
+#endif // WIN32
+}
+#endif // __cplusplus
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* PORT_H */

mozilla/mailnews/mapi/old/tests/mapitest/readmail.cpp

@@ -0,0 +1,137 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+#include <windows.h>
+#include <windowsx.h>
+
+#ifndef MAPI_OLE	// Because MSFT doesn't do this for us :-(
+#include <mapi.h>
+#endif
+
+#include "port.h"
+#include "resource.h"
+
+//
+// Variables...
+// 
+extern HINSTANCE   hInst;
+extern HINSTANCE   m_hInstMapi;
+extern LHANDLE     mapiSession;
+
+// 
+// Forward declarations...
+//
+extern void   ShowMessage(HWND hWnd, LPSTR msg);
+extern void   SetFooter(LPSTR msg);
+extern LPSTR  GetMAPIError(LONG errorCode);
+lpMapiMessage mailPtr = NULL;
+
+void 
+ProcessReadMailCommand(HWND hWnd, int id, HWND hCtl, UINT codeNotify) 
+{ 
+  switch (id) 
+  {
+  case ID_OK:
+  case IDCANCEL:
+    EndDialog(hWnd, 0);
+    break;
+
+  default:
+    break;
+  }
+}
+
+BOOL CALLBACK LOADDS 
+ReadMailDlgProc(HWND hWndMail, UINT wMsg, WPARAM wParam, LPARAM lParam) 
+{
+  switch (wMsg) 
+  {
+  case WM_INITDIALOG: 
+    {
+      DWORD i;
+      // Do everything we need to display the message pointed to by
+      // mailPtr
+      if (!mailPtr)
+        break;
+
+      // Start with the basics...
+      SetDlgItemText(hWndMail, IDC_EDIT_SUBJECT, mailPtr->lpszSubject);
+      SetDlgItemText(hWndMail, IDC_EDIT_DATETIME, mailPtr->lpszDateReceived);
+      SetDlgItemText(hWndMail, IDC_EDIT_THREAD, mailPtr->lpszConversationID);
+      SetDlgItemText(hWndMail, IDC_EDIT_BODYTEXT, mailPtr->lpszNoteText);
+
+      char    buf[1024];
+      wsprintf(buf, "%s (%s)", mailPtr->lpOriginator->lpszName, 
+                              mailPtr->lpOriginator->lpszAddress);
+      SetDlgItemText(hWndMail, IDC_EDIT_FROM, buf);
+
+      for (i=0; i<mailPtr->nRecipCount; i++)
+      {
+          wsprintf(buf, "%s (%s)", mailPtr->lpRecips[i].lpszName, 
+                                   mailPtr->lpRecips[i].lpszAddress);
+          ListBox_InsertString(GetDlgItem(hWndMail, IDC_LIST_RECIPIENTS), 
+                  ListBox_GetCount(GetDlgItem(hWndMail, IDC_LIST_RECIPIENTS)), 
+                  buf);
+      }
+
+      for (i=0; i<mailPtr->nFileCount; i++)
+      {
+          ListBox_InsertString(GetDlgItem(hWndMail, IDC_LIST_ATTACHMENTS), 
+                ListBox_GetCount(GetDlgItem(hWndMail, IDC_LIST_ATTACHMENTS)), 
+                mailPtr->lpFiles[i].lpszPathName);
+      }
+    }
+    break;
+
+  case WM_COMMAND:
+    HANDLE_WM_COMMAND(hWndMail, wParam, lParam, ProcessReadMailCommand);
+    break;
+
+  default:
+    return FALSE;
+  }
+  
+  return TRUE;
+}
+
+void
+DisplayMAPIReadMail(HWND hWnd, lpMapiMessage msgPtr)
+{
+  mailPtr = msgPtr;
+  DialogBox(hInst, MAKEINTRESOURCE(ID_DIALOG_READMAIL), hWnd, 
+                (DLGPROC)ReadMailDlgProc);
+}

mozilla/mailnews/mapi/old/tests/mapitest/resource.h

@@ -0,0 +1,108 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by mtest32.rc
+//
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+#define ID_GUI_MESSAGE1                 1
+#define ID_BUTTON_MAPIADDRESS           3
+#define ID_DIALOG                       101
+#define ID_ICON_APP                     102
+#define ID_MENU                         104
+#define ID_DIALOG_MAIL                  105
+#define ID_DIALOG_READMAIL              106
+#define ID_SETFROMEDIT                  1000
+#define ID_SETTEXT                      1001
+#define ID_GETROWS                      1001
+#define ID_EDIT                         1002
+#define ID_EDIT_HWND                    1002
+#define ID_RESOURCETEXT                 1003
+#define ID_GETTEXT                      1003
+#define ID_STATIC_RESULT                1004
+#define ID_GETVISROWS                   1005
+#define ID_GETWINID                     1006
+#define ID_SETROWFOCUS                  1007
+#define ID_GETROWFOCUS                  1008
+#define ID_EDIT_ROW                     1009
+#define ID_LIST_RESULT                  1010
+#define ID_GETCOLCOUNT                  1011
+#define ID_BUTTON_LOGON                 1011
+#define ID_SETROWINVIEW                 1012
+#define ID_BUTTON_LOGOFF                1012
+#define ID_GETNUMCHILDREN               1013
+#define ID_EDIT_USERNAME                1013
+#define ID_CLEARRESULTS                 1014
+#define ID_EDIT_PW                      1014
+#define ID_BUTTON_FINDNEXT              1015
+#define ID_BUTTON_CLEAR                 1016
+#define ID_BUTTON_READMAIL              1017
+#define ID_BUTTON_DELETEMAIL            1018
+#define IDC_EDIT_RESOLVENAME            1019
+#define ID_BUTTON_MAPISENDMAIL          1020
+#define ID_BUTTON_NSCPVERSION           1020
+#define ID_BUTTON_RESOLVENAME           1021
+#define ID_BUTTON_MAPISENDDOCUMENTS     1021
+#define ID_EDIT_TOADDRESS               1022
+#define ID_EDIT_CCADDRESS               1023
+#define ID_BUTTON_DETAILS               1024
+#define ID_EDIT_BCCADDRESS              1024
+#define ID_EDIT_SUBJECT                 1025
+#define ID_BUTTON_MAIL                  1025
+#define ID_BUTTON_FREEBUFFER            1026
+#define ID_EDIT_NOTETEXT                1026
+#define ID_EDIT_ATTACH1                 1027
+#define ID_BUTTON_SYNC                  1027
+#define ID_EDIT_ATTACH2                 1028
+#define IDC_CHECK_BODYASFILE            1028
+#define ID_EDIT_ATTACH3                 1029
+#define IDC_CHECK_ENVELOPEONLY          1029
+#define IDC_LIST_ATTACHMENTS            1029
+#define ID_EDIT_ATTACH4                 1030
+#define IDC_CHECK_PEEK                  1030
+#define IDC_EDIT_BODYTEXT               1030
+#define IDC_CHECK_SUPPRESSATTACH        1031
+#define IDC_LIST_RECIPIENTS             1031
+#define ID_BUTTON_MAPISAVEMAIL          1031
+#define IDC_EDIT_SUBJECT                1032
+#define IDC_EDIT_DATETIME               1033
+#define ID_OK                           1034
+#define IDC_EDIT_THREAD                 1035
+#define ID_CHECK_SHOWDIALOG             1035
+#define IDC_EDIT_FROM                   1036
+#define ID_MENU_MYEXIT                  30001
+#define ID_MENU_CLEAR                   30002
+#define ID_MENU_MYABOUT                 30003
+#define ID_MENU_CLEARRESULTS            30004
+#define ID_MENU_MAPIDELETEMAIL          30005
+#define ID_MENU_MAPIFINDNEXT            30006
+#define ID_MENU_MAPIREADMAIL            30007
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        107
+#define _APS_NEXT_COMMAND_VALUE         30008
+#define _APS_NEXT_CONTROL_VALUE         1036
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

mozilla/mailnews/mapi/resources/content/contents.rdf

@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+
+<!-- If you modify this file, please also update the following files -->
+<!-- mailnews/mapi/resources/content/contents.rdf in the ns tree -->
+
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the packages being supplied by this jar -->
+  <RDF:Seq about="urn:mozilla:package:root">
+    <RDF:li resource="urn:mozilla:package:messenger"/>
+  </RDF:Seq>
+
+  <!-- package information -->
+  <RDF:Description about="urn:mozilla:package:messenger"
+        chrome:displayName="Messenger"
+        chrome:author="mozilla.org"
+        chrome:name="messenger"
+	chrome:localeVersion="0.9.4"
+		chrome:skinVersion="0.9.4">
+  </RDF:Description>
+
+  <!-- overlay information -->
+  <RDF:Seq about="urn:mozilla:overlays">
+    <RDF:li resource="chrome://communicator/content/pref/preftree.xul"/>
+    <RDF:li resource="chrome://communicator/content/pref/pref-appearance.xul"/>
+    <RDF:li resource="chrome://communicator/content/pref/pref-advanced.xul"/>
+    <RDF:li resource="chrome://communicator/content/tasksOverlay.xul"/>
+    <RDF:li resource="chrome://navigator/content/navigatorOverlay.xul"/>
+    <RDF:li resource="chrome://communicator/content/history/history.xul"/>
+    <RDF:li resource="chrome://communicator/content/bookmarks/bookmarks.xul"/>
+    <RDF:li resource="chrome://communicator/content/bookmarks/bm-find.xul"/>
+    <RDF:li resource="chrome://messenger/content/messenger.xul"/>
+    <RDF:li resource="chrome://messenger/content/mail3PaneWindowVertLayout.xul"/>
+    <RDF:li resource="chrome://messenger/content/messengercompose/messengercompose.xul"/>
+    <RDF:li resource="chrome://messenger/content/addressbook/addressbook.xul"/>
+    <RDF:li resource="chrome://messenger/content/addressbook/abSelectAddressesDialog.xul"/>
+    <RDF:li resource="chrome://editor/content/editor.xul"/>
+    <RDF:li resource="chrome://messenger/content/pref-mailnews.xul"/>
+  </RDF:Seq>
+
+
+  <!-- messenger preferences branches -->
+  <RDF:Seq about="chrome://communicator/content/pref/preftree.xul">
+    <RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <!-- messenger startup pref -->
+  <RDF:Seq about="chrome://communicator/content/pref/pref-appearance.xul">
+    <RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <!-- messenger js toggle pref -->
+  <RDF:Seq about="chrome://communicator/content/pref/pref-advanced.xul">
+    <RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <!-- messenger taskbar/tasks menu items -->
+  <RDF:Seq about="chrome://communicator/content/tasksOverlay.xul">
+    <RDF:li>chrome://messenger/content/mailTasksOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <!-- messenger items for History -->
+  <RDF:Seq about="chrome://communicator/content/history/history.xul">
+    <RDF:li>chrome://messenger/content/mailNavigatorOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <!-- messenger items for Bookmarks -->
+  <RDF:Seq about="chrome://communicator/content/bookmarks/bookmarks.xul">
+    <RDF:li>chrome://messenger/content/mailNavigatorOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <!-- messenger items for History -->
+  <RDF:Seq about="chrome://communicator/content/bookmarks/bm-find.xul">
+    <RDF:li>chrome://messenger/content/mailNavigatorOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <!-- messenger items for Navigator -->
+  <RDF:Seq about="chrome://navigator/content/navigatorOverlay.xul">
+    <RDF:li>chrome://messenger/content/mailNavigatorOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <!-- messenger items for Messenger -->
+  <RDF:Seq about="chrome://messenger/content/messenger.xul">
+    <RDF:li>chrome://messenger/content/mailMessengerOverlay.xul</RDF:li>
+  </RDF:Seq>
+  <RDF:Seq about="chrome://messenger/content/mail3PaneWindowVertLayout.xul">
+    <RDF:li>chrome://messenger/content/mailMessengerOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <!-- messenger items for Mail Compose -->
+  <RDF:Seq about="chrome://messenger/content/messengercompose/messengercompose.xul">
+    <RDF:li>chrome://messenger/content/mailMessengerComposeOverlay.xul</RDF:li>
+  </RDF:Seq>
+  
+  <!-- messenger items for Addressbook -->
+  <RDF:Seq about="chrome://messenger/content/addressbook/addressbook.xul">
+    <RDF:li>chrome://messenger/content/mailABOverlay.xul</RDF:li>
+  </RDF:Seq>
+  
+  <!-- messenger items for Select Addresses dialog -->
+  <RDF:Seq about="chrome://messenger/content/addressbook/abSelectAddressesDialog.xul">
+    <RDF:li>chrome://messenger/content/mailOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+
+  <!-- messenger items for Composer -->
+  <RDF:Seq about="chrome://editor/content/editor.xul">
+    <RDF:li>chrome://messenger/content/mailEditorOverlay.xul</RDF:li>
+  </RDF:Seq>
+  
+  <!-- mapi items for Mail And Newsgroups preferences pane -->
+  <RDF:Seq about="chrome://messenger/content/pref-mailnews.xul">
+    <RDF:li>chrome://messenger/content/pref-mailnewsOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+</RDF:RDF>

mozilla/mailnews/mapi/resources/content/jar.mn

@@ -0,0 +1,4 @@
+messenger.jar:
+     content/messenger/pref-mailnewsOverlay.xul
++    content/messenger/contents.rdf 
+     content/messenger/pref-mailnewsOverlay.js

mozilla/mailnews/mapi/resources/content/makefile.win

@@ -0,0 +1,26 @@
+#!nmake
+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s): 
+# Srilatha Moturi <srilatha@netscape.com>
+#
+
+DEPTH=..\..\..\..
+
+include <$(DEPTH)\config\rules.mak>

mozilla/mailnews/mapi/resources/content/overlays.rdf

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:chrome="http://www.mozilla.org/rdf/chrome#"
+         xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+
+   <!-- mapi items for mailnews preferences -->
+   <RDF:Seq about="urn:mozilla:overlays">
+     <RDF:li resource="chrome://messenger/content/pref-mailnews.xul"/>
+   </RDF:Seq>
+
+   <RDF:Seq about="chrome://messenger/content/pref-mailnews.xul">
+     <RDF:li>chrome://messenger/content/pref-mailnewsOverlay.xul</RDF:li>
+   </RDF:Seq>
+
+</RDF:RDF>

mozilla/mailnews/mapi/resources/content/pref-mailnewsOverlay.js

@@ -0,0 +1,104 @@
+/* 
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is mozilla.org code.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 2001 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ * Srilatha Moturi <srilatha@netscape.com>
+ */
+
+function mailnewsOverlayStartup() {
+    mailnewsOverlayInit();
+    parent.hPrefWindow.registerOKCallbackFunc(onOK);
+    if (!("mapiPref" in parent)) {
+        parent.mapiPref = new Object;
+        parent.mapiPref.isDefaultMailClient = 
+               document.getElementById("mailnewsEnableMapi").checked;
+    }
+    else { 
+        // when we switch between different panes
+        // set the checkbox based on the saved state
+        var mailnewsEnableMapi = document.getElementById("mailnewsEnableMapi");
+        if (parent.mapiPref.isDefaultMailClient)
+            mailnewsEnableMapi.setAttribute("checked", "true");
+        else
+            mailnewsEnableMapi.setAttribute("checked", "false");
+    }
+}
+
+function mailnewsOverlayInit() {
+    try {
+        var mapiRegistry = Components.classes[ "@mozilla.org/mapiregistry;1" ].
+                   getService( Components.interfaces.nsIMapiRegistry );
+    }
+    catch(ex){
+        mapiRegistry = null;
+    }
+
+    const prefbase = "system.windows.lock_ui.";
+    var mailnewsEnableMapi = document.getElementById("mailnewsEnableMapi");
+    if (mapiRegistry) {
+    // initialise preference component.
+    // While the data is coming from the system registry, we use a set
+    // of parallel preferences to indicate if the ui should be locked.
+        try { 
+            var prefService = Components.classes["@mozilla.org/preferences-service;1"]
+                          .getService()
+                          .QueryInterface(Components.interfaces.nsIPrefService);
+            var prefBranch = prefService.getBranch(prefbase);
+            if (prefBranch && prefBranch.prefIsLocked("default_mail_client")) {
+                if (prefBranch.getBoolPref("default_mail_client"))
+                    mapiRegistry.setDefaultMailClient();
+                else
+                    mapiRegistry.unsetDefaultMailClient();
+                mailnewsEnableMapi.setAttribute("disabled", "true");
+           }
+        }
+        catch(ex) {}
+        if (mapiRegistry.isDefaultMailClient)
+            mailnewsEnableMapi.setAttribute("checked", "true");
+        else
+            mailnewsEnableMapi.setAttribute("checked", "false");
+    }
+    else
+        mailnewsEnableMapi.setAttribute("disabled", "true");
+}
+
+function onEnableMapi() {
+    // save the state of the checkbox
+    if ("mapiPref" in parent)
+        parent.mapiPref.isDefaultMailClient = 
+               document.getElementById("mailnewsEnableMapi").checked;
+}
+
+function onOK()
+{
+    try {
+        var mapiRegistry = Components.classes[ "@mozilla.org/mapiregistry;1" ].
+                   getService( Components.interfaces.nsIMapiRegistry );
+    }
+    catch(ex){
+        mapiRegistry = null;
+    }
+    if (mapiRegistry &&
+        ("mapiPref" in parent) && 
+        (mapiRegistry.isDefaultMailClient != parent.mapiPref.isDefaultMailClient)) { 
+        if (parent.mapiPref.isDefaultMailClient)
+            mapiRegistry.setDefaultMailClient();
+        else
+            mapiRegistry.unsetDefaultMailClient();
+    }
+}

mozilla/mailnews/mapi/resources/content/pref-mailnewsOverlay.xul

@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!-- 
+The contents of this file are subject to the Mozilla Public
+License Version 1.1 (the "License"); you may not use this file
+except in compliance with the License. You may obtain a copy of
+the License at http://www.mozilla.org/MPL/
+
+oftware distributed under the License is distributed on an "AS
+IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+implied. See the License for the specific language governing
+rights and limitations under the License.
+
+The Original Code is mozilla.org code.
+The Initial Developer of the Original Code is Netscape
+Communications Corporation.  Portions created by Netscape are 
+Copyright (C) 2001 Netscape Communications Corporation.  All
+Rights Reserved.
+ 
+Contributor(s): 
+  Srilatha Moturi <srilatha@netscape.com>
+-->
+
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % prefMailnewsOverlayDTD SYSTEM "chrome://messenger/locale/pref-mailnewsOverlay.dtd" >
+%prefMailnewsOverlayDTD;
+]>
+<overlay id="prefMailnewsOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+<script type="application/x-javascript">
+  <![CDATA[
+      _elementIDs.push("mailnewsEnableMapi");
+  ]]>
+</script>         
+<script type="application/x-javascript" src="chrome://messenger/content/pref-mailnewsOverlay.js"/>
+<hbox autostretch="never" id="mapi">
+  <checkbox id="mailnewsEnableMapi" label="&enableMapi.label;"
+            accesskey="&enableMapi.accesskey;"
+            oncommand="onEnableMapi();"
+            startFunc="mailnewsOverlayStartup();"/>
+</hbox>
+</overlay> 

mozilla/mailnews/mapi/resources/locale/en-US/jar.mn

@@ -0,0 +1,3 @@
+en-US.jar:
+     locale/en-US/messenger/pref-mailnewsOverlay.dtd
+     locale/en-US/messenger/mapi.properties

mozilla/mailnews/mapi/resources/locale/en-US/makefile.win

@@ -0,0 +1,26 @@
+#!nmake
+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s): 
+# Srilatha Moturi <srilatha@netscape.com>
+# 
+
+DEPTH=..\..\..\..\..
+
+include <$(DEPTH)\config\rules.mak>

mozilla/mailnews/mapi/resources/locale/en-US/mapi.properties

@@ -0,0 +1,18 @@
+# Mail Integration Dialog
+dialogTitle=%S Mail
+dialogText=Do you want to use %S as the default mail application? 
+checkboxText=Do not display this dialog again
+
+# MAPI Messages
+loginText=Please enter your password for %S:
+loginTextwithName=Please enter your username and password 
+loginTitle=%S Mail
+PasswordTitle=%S Mail
+
+# MAPI Error Messages
+errorMessage=%S Mail could not be set as the default mail application because a registry key could not be updated. Verify with your system administrator that you have write access to your system registry, and then try again.
+errorMessageTitle=%S Mail
+
+# MAPI Security Messages
+mapiBlindSendWarning=Another application is attempting to send mail using your user profile. Are you sure you want to send mail?
+mapiBlindSendDontShowAgain=Warn me whenever other applications try to send mail from me

mozilla/mailnews/mapi/resources/locale/en-US/pref-mailnewsOverlay.dtd

@@ -0,0 +1,3 @@
+<!ENTITY enableMapiTitle.label        "When sending mail from other applications">
+<!ENTITY enableMapi.label             "Use &vendorShortName; Mail as the default mail application.">
+<!ENTITY enableMapi.accesskey         "u">

mozilla/mailnews/mapi/resources/locale/makefile.win

@@ -0,0 +1,28 @@
+#!nmake
+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s): 
+# Srilatha Moturi <srilatha@netscape.com>
+#
+
+DEPTH=..\..\..\..
+
+DIRS=en-US
+
+include <$(DEPTH)\config\rules.mak>

mozilla/mailnews/mapi/resources/makefile.win

@@ -0,0 +1,27 @@
+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s): 
+# Srilatha Moturi <srilatha@netscape.com>
+#
+
+DEPTH=..\..\..
+
+DIRS=content locale
+
+include <$(DEPTH)\config\rules.mak>