Ignore:
Timestamp:
Apr 22, 2013 8:37:42 PM (8 years ago)
Author:
str4d <str4d@…>
Branches:
master
Children:
37ff409
Parents:
7f471910
Message:

disapproval of revision '4747eea80e136e04c9a239f0b6ecd9ef134c4d5a'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • installer/c/i2pExe/i2p.c

    r7f471910 r9550de67  
    88#include "errors.h"
    99
    10 #ifdef _WIN32
    11 #include <windows.h>
    12 #endif
    13 
    14 #include <stdio.h>
     10#include <windows.h>
     11#include <stdio.h>   
    1512#include <malloc.h>
    1613#include <sys/stat.h>
    1714
    1815//BOOL MoveFontPropertiesFile(const char *path);
    19 #ifdef _WIN32
    2016void SetWorkingDirectory(char *path);
    21 #endif
    2217void readOptions(char***, int*);
    2318//BOOL localJREExists(const char*);
    24 //BOOL exist(const char*);
     19BOOL exist(const char*);
    2520
    2621// defined in java.c
     
    4035        //char** new_argv;
    4136        //int i;
    42 #ifdef _WIN32
    4337        char currentDirectory[MAX_PATH+1];
    44 #endif
    4538
    4639        // Set/get the correct working directory.
    47 #ifdef _WIN32
    4840        SetWorkingDirectory(currentDirectory);
    49 #endif
    5041
    5142        // Read in options from disk (launch.properties)
     
    8071        case ERROR_COULDNT_INITIALIZE_JVM:
    8172        case ERROR_COULDNT_LOAD_JVM:
    82 #ifdef _WIN32
    8373                if (MessageBox(NULL, "I2P needs the Java Runtime Environment 5.0 or above. Click OK to go to www.java.com, where you can install Java.",
    8474                       "I2P Launcher Error",
    8575                       MB_ICONWARNING | MB_OKCANCEL) == IDOK)
    8676                        ShellExecute(NULL, NULL, "http://www.java.com/", "", "", SW_SHOWNORMAL);
    87 #endif
    8877                break;
    8978        case ERROR_COULDNT_PARSE_ARGUMENTS:
    90 #ifdef _WIN32
    9179                MessageBox(NULL, "I2P failed to parse the commandline arguments to Java.\n"
    9280                        "Please download and install I2P again.",
    9381                        "I2P Launcher Error", MB_OK);
    94 #endif
    9582                break;
    9683        case ERROR_STARTING_PROGRAM:
    97 #ifdef _WIN32
    9884                MessageBox(NULL, "I2P was unable to load.\n"
    9985                                "Please download and install I2P again.",
    10086                                "I2P Launcher Error", MB_OK);
    101 #endif
    10287                break;
    10388        }
     
    184169 * Sets the current working directory to wherever I2P.exe is located
    185170 */
    186 #ifdef _WIN32
    187171static void
    188172SetWorkingDirectory(char *path) {
     
    192176        GetCurrentDirectory(MAX_PATH + 1, path);
    193177}
    194 #endif
    195178
    196179/**
     
    226209}
    227210*/
    228 /*
     211
    229212BOOL exist(const char *filename) {
    230213        struct stat s;
    231214        return stat(filename, &s) == 0 ? TRUE : FALSE;
    232215}
    233 */
    234 
    235 #ifdef _WIN32
     216
     217
    236218__declspec(dllimport) char **__initenv;
    237219
     
    252234    return ret;
    253235}
    254 #endif
Note: See TracChangeset for help on using the changeset viewer.