Changeset 2345 for trunk/src


Ignore:
Timestamp:
Jan 6, 2000, 9:07:10 PM (26 years ago)
Author:
sandervl
Message:

some updates/minor changes

Location:
trunk/src/kernel32
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/kernel32/Fileio.cpp

    r2329 r2345  
    1 /* $Id: Fileio.cpp,v 1.22 2000-01-05 19:39:54 sandervl Exp $ */
     1/* $Id: Fileio.cpp,v 1.23 2000-01-06 20:07:09 sandervl Exp $ */
    22
    33/*
    … …  
    244244{
    245245  dprintf(("DeleteFileA %s", lpszFile));
    246   return 1;
    247 //  return O32_DeleteFile(lpszFile);
     246  return O32_DeleteFile(lpszFile);
    248247}
    249248//******************************************************************************

  • trunk/src/kernel32/unicode.cpp

    r2213 r2345  
    1 /* $Id: unicode.cpp,v 1.20 1999-12-27 18:42:25 sandervl Exp $ */
     1/* $Id: unicode.cpp,v 1.21 2000-01-06 20:07:10 sandervl Exp $ */
    22
    33/*
    … …  
    374374
    375375    uni_chars_left = in_bytes_left; //elements
    376     dprintf(("KERNEL32: AsciiToUnicode %d\n", in_bytes_left));
     376    dprintf2(("KERNEL32: AsciiToUnicode %d\n", in_bytes_left));
    377377
    378378    rc = UniUconvToUcs( uconv_object,

  • trunk/src/kernel32/winexebase.cpp

    r1833 r2345  
    1 /* $Id: winexebase.cpp,v 1.3 1999-11-24 19:31:23 sandervl Exp $ */
     1/* $Id: winexebase.cpp,v 1.4 2000-01-06 20:07:10 sandervl Exp $ */
    22
    33/*
    … …  
    4848                 : Win32ImageBase(hInstance),
    4949                   fConsoleApp(FALSE),
    50                    cmdline(NULL)
     50                   cmdLineA(NULL), cmdLineW(NULL)
    5151{
    5252  WinExe = this;
    … …  
    5858  Win32DllBase::deleteAll();
    5959  WinExe = NULL;
     60  if(cmdLineA)
     61        free(cmdLineA);
     62  if(cmdLineW)
     63        free(cmdLineW);
    6064}
    6165//******************************************************************************
    … …  
    97101//******************************************************************************
    98102//******************************************************************************
     103void Win32ExeBase::setCommandLine(char *cline)
     104{
     105 ULONG cmdlength = strlen(cline) + 1;
     106
     107  cmdLineA = (LPSTR)malloc(cmdlength);
     108  strcpy(cmdLineA, cline);
     109  cmdLineW = (LPWSTR)malloc(cmdlength*sizeof(WCHAR));
     110  AsciiToUnicode(cmdLineA, cmdLineW);
     111}
     112//******************************************************************************
     113//******************************************************************************

  • trunk/src/kernel32/winexelx.cpp

    r1221 r2345  
    1 /* $Id: winexelx.cpp,v 1.3 1999-10-09 13:33:24 sandervl Exp $ */
     1/* $Id: winexelx.cpp,v 1.4 2000-01-06 20:07:10 sandervl Exp $ */
    22
    33/*
    … …  
    113113
    114114  SetWin32TIB();
    115   rc = ((WINMAIN)entryPoint)(hinstance, 0, cmdline, SW_SHOWNORMAL_W);
     115  rc = ((WINMAIN)entryPoint)(hinstance, 0, cmdLineA, SW_SHOWNORMAL_W);
    116116  RestoreOS2TIB();
    117117

  • trunk/src/kernel32/wprocess.cpp

    r2329 r2345  
    1 /* $Id: wprocess.cpp,v 1.65 2000-01-05 19:39:57 sandervl Exp $ */
     1/* $Id: wprocess.cpp,v 1.66 2000-01-06 20:07:10 sandervl Exp $ */
    22
    33/*
    … …  
    575575
    576576  if(WinExe) {
    577     cmdline = WinExe->getCommandLine();
     577    cmdline = WinExe->getCommandLineA();
    578578  }
    579579  if(cmdline == NULL) //not used for converted exes
    … …  
    597597
    598598    if(WinExe) {
    599       asciicmdline = WinExe->getCommandLine();
     599        if(WinExe->getCommandLineW())
     600                return WinExe->getCommandLineW();
    600601    }
    601602    if(asciicmdline == NULL) //not used for converted exes
Note: See TracChangeset for help on using the changeset viewer.