Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/src/kernel32/wprocess.cpp

    r21673 r21916  
    5252#include "shellapi.h"
    5353
    54 #include <win\ntddk.h>
    55 #include <win\psapi.h>
     54#include <win/ntddk.h>
     55#include <win/psapi.h>
    5656
    5757#include <custombuild.h>
    … …  
    109109PFNLXDLLLOAD pfnLxDllLoadCallback = NULL;
    110110
     111extern "C" {
    111112
    112113//******************************************************************************
    … …  
    299300    StartupInfo.cbReserved2     = NULL;
    300301    if (!StartupInfo.lpDesktop)
    301         StartupInfo.lpDesktop  = "Desktop";
     302        StartupInfo.lpDesktop  = (LPSTR)"Desktop";
    302303    if (!StartupInfo.lpTitle)
    303         StartupInfo.lpTitle    = "Title";
     304        StartupInfo.lpTitle    = (LPSTR)"Title";
    304305    ProcessENVDB.hStdin  = StartupInfo.hStdInput  = GetStdHandle(STD_INPUT_HANDLE);
    305306    ProcessENVDB.hStdout = StartupInfo.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
    … …  
    29872988
    29882989    lpmodinfo->SizeOfImage = winmod->getImageSize();
    2989     lpmodinfo->EntryPoint  = winmod->getEntryPoint();
     2990    lpmodinfo->EntryPoint  = (LPVOID)winmod->getEntryPoint();
    29902991    lpmodinfo->lpBaseOfDll = (void*)hModule;
    29912992
    … …  
    30583059}
    30593060
     3061} // extern "C"
     3062
Note: See TracChangeset for help on using the changeset viewer.