Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 33381: Fix compilation by using an unicode entrypoint
by hpoussin＠svn.reactos.org 08 May '08

08 May '08

Author: hpoussin Date: Thu May 8 13:42:29 2008 New Revision: 33381 URL: http://svn.reactos.org/svn/reactos?rev=33381&view=rev Log: Fix compilation by using an unicode entrypoint Modified: trunk/reactos/base/system/services/services.c Modified: trunk/reactos/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.c [iso-8859-1] Thu May 8 13:42:29 2008 @@ -293,10 +293,10 @@ int STDCALL -WinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPSTR lpCmdLine, - int nShowCmd) +wWinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPWSTR lpCmdLine, + int nShowCmd) { HANDLE hScmStartEvent; HANDLE hEvent;

1 0

[hpoussin] 33380: Fix some various unicode problems
by hpoussin＠svn.reactos.org 08 May '08

08 May '08

Author: hpoussin Date: Thu May 8 13:26:15 2008 New Revision: 33380 URL: http://svn.reactos.org/svn/reactos?rev=33380&view=rev Log: Fix some various unicode problems Modified: trunk/reactos/base/applications/dxdiag/dxdiag.c trunk/reactos/base/applications/sndvol32/sndvol32.c trunk/reactos/base/services/eventlog/eventlog.c trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/base/setup/vmwinst/vmwinst.c trunk/reactos/base/system/lsass/lsass.c trunk/reactos/base/system/regsvr32/regsvr32.c trunk/reactos/base/system/rundll32/rundll32.c trunk/reactos/boot/freeldr/fdebug/fdebug.c Modified: trunk/reactos/base/applications/dxdiag/dxdiag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] Thu May 8 13:26:15 2008 @@ -220,10 +220,10 @@ return 0; } -int APIENTRY WinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPSTR lpCmdLine, - int nCmdShow) +int APIENTRY wWinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPWSTR lpCmdLine, + int nCmdShow) { INITCOMMONCONTROLSEX InitControls; Modified: trunk/reactos/base/applications/sndvol32/sndvol32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/sndvol32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/sndvol32.c [iso-8859-1] Thu May 8 13:26:15 2008 @@ -798,10 +798,10 @@ } int WINAPI -WinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPSTR lpszCmdLine, - int nCmdShow) +_tWinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPTSTR lpszCmdLine, + int nCmdShow) { MSG Msg; int Ret = 1; Modified: trunk/reactos/base/services/eventlog/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] Thu May 8 13:26:15 2008 @@ -185,7 +185,7 @@ return TRUE; } -INT main() +INT wmain() { WCHAR LogPath[MAX_PATH]; INT RetCode = 0; Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Thu May 8 13:26:15 2008 @@ -2191,7 +2191,7 @@ int -main(int argc, char *argv[]) +wmain(int argc, WCHAR *argv[]) { DWORD dwError; Modified: trunk/reactos/base/setup/vmwinst/vmwinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/vmwinst… ============================================================================== --- trunk/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] Thu May 8 13:26:15 2008 @@ -1030,9 +1030,9 @@ } int WINAPI -WinMain(HINSTANCE hInstance, +wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, - LPSTR lpszCmdLine, + LPWSTR lpszCmdLine, int nCmdShow) { Modified: trunk/reactos/base/system/lsass/lsass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/lsass/lsass.c?… ============================================================================== --- trunk/reactos/base/system/lsass/lsass.c [iso-8859-1] (original) +++ trunk/reactos/base/system/lsass/lsass.c [iso-8859-1] Thu May 8 13:26:15 2008 @@ -55,10 +55,10 @@ } INT WINAPI -WinMain( +wWinMain( IN HINSTANCE hInstance, IN HINSTANCE hPrevInstance, - IN LPSTR lpCmdLine, + IN LPWSTR lpCmdLine, IN INT nShowCmd) { NTSTATUS Status = STATUS_SUCCESS; Modified: trunk/reactos/base/system/regsvr32/regsvr32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/regsv… ============================================================================== --- trunk/reactos/base/system/regsvr32/regsvr32.c [iso-8859-1] (original) +++ trunk/reactos/base/system/regsvr32/regsvr32.c [iso-8859-1] Thu May 8 13:26:15 2008 @@ -247,10 +247,10 @@ _tprintf(_T("%s: %s\n\n"),lpTitle,lpMessage); } -int WINAPI WinMain( +int WINAPI _tWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, - LPSTR lpCmdLineA, + LPTSTR lpCmdLine, int nCmdShow ) { Modified: trunk/reactos/base/system/rundll32/rundll32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rundl… ============================================================================== --- trunk/reactos/base/system/rundll32/rundll32.c [iso-8859-1] (original) +++ trunk/reactos/base/system/rundll32/rundll32.c [iso-8859-1] Thu May 8 13:26:15 2008 @@ -331,10 +331,10 @@ return Ret; } -int WINAPI WinMain( +int WINAPI _tWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, - LPSTR lpCmdLineA, + LPTSTR lpCmdLine, int nCmdShow ) { Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/fdebug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/fdebug.c [iso-8859-1] Thu May 8 13:26:15 2008 @@ -39,10 +39,10 @@ VOID CheckLocalEchoMenuItem(BOOL Checked); VOID Rs232Thread(VOID* Parameter); -int APIENTRY WinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPSTR lpCmdLine, - int nCmdShow) +int APIENTRY _tWinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPTSTR lpCmdLine, + int nCmdShow) { // TODO: Place code here. MSG msg;

1 0

[cfinck] 33379: - Fix build by converting everything to use TCHAR's - Bugfix: Previously macros like "gotoroot=cd \" weren't passed correctly as we just used argv[1]. Now use GetCommandLine and pass the full command line. - Fix indentation
by cfinck＠svn.reactos.org 08 May '08

08 May '08

Author: cfinck Date: Thu May 8 13:11:56 2008 New Revision: 33379 URL: http://svn.reactos.org/svn/reactos?rev=33379&view=rev Log: - Fix build by converting everything to use TCHAR's - Bugfix: Previously macros like "gotoroot=cd \" weren't passed correctly as we just used argv[1]. Now use GetCommandLine and pass the full command line. - Fix indentation Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] Thu May 8 13:11:56 2008 @@ -5,131 +5,135 @@ static VOID partstrlwr (LPTSTR str) { - LPTSTR c = str; - while (*c && !_istspace (*c) && *c != _T('=')) - { - *c = _totlower (*c); - c++; - } + LPTSTR c = str; + while (*c && !_istspace (*c) && *c != _T('=')) + { + *c = _totlower (*c); + c++; + } } static VOID PrintAlias (VOID) { - LPTSTR Aliases; - LPTSTR ptr; - DWORD len; + LPTSTR Aliases; + LPTSTR ptr; + DWORD len; - len = GetConsoleAliasesLength(_T("cmd.exe")); - if (len <= 0) - return; + len = GetConsoleAliasesLength(_T("cmd.exe")); + if (len <= 0) + return; - /* allocate memory for an extra \0 char to make parsing easier */ - ptr = HeapAlloc(GetProcessHeap(), 0, (len + sizeof(TCHAR))); - if (!ptr) - return; + /* allocate memory for an extra \0 char to make parsing easier */ + ptr = HeapAlloc(GetProcessHeap(), 0, (len + sizeof(TCHAR))); + if (!ptr) + return; - Aliases = ptr; + Aliases = ptr; - ZeroMemory(Aliases, len + sizeof(TCHAR)); + ZeroMemory(Aliases, len + sizeof(TCHAR)); - if (GetConsoleAliases(Aliases, len, _T("cmd.exe")) != 0) - { - while (*Aliases != '\0') - { - _tprintf(_T("%s\n"), Aliases); - Aliases = Aliases + lstrlen(Aliases); - Aliases++; - } - } - HeapFree(GetProcessHeap(), 0 , ptr); + if (GetConsoleAliases(Aliases, len, _T("cmd.exe")) != 0) + { + while (*Aliases != '\0') + { + _tprintf(_T("%s\n"), Aliases); + Aliases = Aliases + lstrlen(Aliases); + Aliases++; + } + } + HeapFree(GetProcessHeap(), 0 , ptr); } INT SetMacro (LPTSTR param) { - LPTSTR ptr; + LPTSTR ptr; - while (*param == _T(' ')) - param++; + while (*param == _T(' ')) + param++; - /* error if no '=' found */ - if ((ptr = _tcschr (param, _T('='))) == 0) - return 1; + /* error if no '=' found */ + if ((ptr = _tcschr (param, _T('='))) == 0) + return 1; - while (*param == _T(' ')) - param++; + while (*param == _T(' ')) + param++; - while (*ptr == _T(' ')) - ptr--; + while (*ptr == _T(' ')) + ptr--; - /* Split rest into name and substitute */ - *ptr++ = _T('\0'); + /* Split rest into name and substitute */ + *ptr++ = _T('\0'); - partstrlwr (param); + partstrlwr (param); - _tprintf(_T("%s, %s\n"), ptr, param); + _tprintf(_T("%s, %s\n"), ptr, param); - if (ptr[0] == _T('\0')) - AddConsoleAlias(param, NULL, _T("cmd.exe")); - else - AddConsoleAlias(param, ptr, _T("cmd.exe")); + if (ptr[0] == _T('\0')) + AddConsoleAlias(param, NULL, _T("cmd.exe")); + else + AddConsoleAlias(param, ptr, _T("cmd.exe")); - return 0; + return 0; } -static VOID ReadFromFile(LPSTR param) +static VOID ReadFromFile(LPTSTR param) { - FILE* fp; - char line[MAX_PATH]; -#ifdef UNICODE - WCHAR lineW[MAX_PATH]; -#endif + FILE* fp; + TCHAR line[MAX_PATH]; - /* FIXME */ - param += 11; + /* Skip the "/macrofile=" prefix */ + param += 11; - fp = fopen(param,"r"); - while ( fgets(line, MAX_PATH, fp) != NULL) - { -#ifdef UNICODE - MultiByteToWideChar(CP_ACP, 0, line, -1, lineW, MAX_PATH); - SetMacro(lineW); -#else - SetMacro(line); -#endif - } + fp = _tfopen(param, _T("r")); - fclose(fp); - return; + while ( _fgetts(line, MAX_PATH, fp) != NULL) + SetMacro(line); + + fclose(fp); + return; } int -main (int argc, char **argv) +_tmain (int argc, LPTSTR argv[]) { -#ifdef UNICODE - WCHAR lineW[MAX_PATH]; -#endif + if (argc < 2) + return 0; - if (argc < 2) - return 0; + if (argv[1][0] == '/') + { + if (_tcsnicmp(argv[1], _T("/macrofile"), 10) == 0) + ReadFromFile(argv[1]); + if (_tcscmp(argv[1], _T("/macros")) == 0) + PrintAlias(); + } + else + { + /* Get the full command line using GetCommandLine(). + We can't just pass argv[1] here, because then a parameter like "gotoroot=cd \" wouldn't be passed completely. */ + TCHAR* szCommandLine = GetCommandLine(); - if (argv[1][0] == '/') - { - if (strnicmp(argv[1], "/macrofile", 10) == 0) - ReadFromFile(argv[1]); - if (stricmp(argv[1], "/macros") == 0) - PrintAlias(); - } - else - { -#ifdef UNICODE - MultiByteToWideChar(CP_ACP, 0, argv[1], -1, lineW, MAX_PATH); - SetMacro(lineW); -#else - SetMacro(argv[1]); -#endif - } + /* Skip the application name */ + if(*szCommandLine == '\"') + { + do + { + szCommandLine++; + } + while(*szCommandLine != '\"'); + } + else + { + do + { + szCommandLine++; + } + while(*szCommandLine != ' '); + } - return 0; + /* Skip the trailing quotation mark/whitespace and pass the command line to SetMacro */ + SetMacro(++szCommandLine); + } + + return 0; } -

1 0

[hpoussin] 33378: Use _tWinMain instead of WinMain, as msconfig.exe uses TCHAR in other places
by hpoussin＠svn.reactos.org 08 May '08

08 May '08

Author: hpoussin Date: Thu May 8 12:49:42 2008 New Revision: 33378 URL: http://svn.reactos.org/svn/reactos?rev=33378&view=rev Log: Use _tWinMain instead of WinMain, as msconfig.exe uses TCHAR in other places Modified: trunk/reactos/base/applications/msconfig/msconfig.c Modified: trunk/reactos/base/applications/msconfig/msconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/msconfig.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/msconfig.c [iso-8859-1] Thu May 8 12:49:42 2008 @@ -204,10 +204,10 @@ return 0; } -int APIENTRY WinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPSTR lpCmdLine, - int nCmdShow) +int APIENTRY _tWinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPTSTR lpCmdLine, + int nCmdShow) { INITCOMMONCONTROLSEX InitControls;

1 0

[hpoussin] 33377: Fix route.exe compilation by removing hack
by hpoussin＠svn.reactos.org 08 May '08

08 May '08

Author: hpoussin Date: Thu May 8 12:48:13 2008 New Revision: 33377 URL: http://svn.reactos.org/svn/reactos?rev=33377&view=rev Log: Fix route.exe compilation by removing hack Modified: trunk/reactos/base/applications/network/route/route.c Modified: trunk/reactos/base/applications/network/route/route.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/route/route.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/route/route.c [iso-8859-1] Thu May 8 12:48:13 2008 @@ -251,9 +251,6 @@ return Error; } -#if defined(_UNICODE) && defined(__GNUC__) -static -#endif int _tmain( int argc, TCHAR **argv ) { if( argc < 2 ) @@ -267,41 +264,3 @@ else return Usage(); } - -#if defined(_UNICODE) && defined(__GNUC__) -/* HACK - MINGW HAS NO OFFICIAL SUPPORT FOR wmain()!!! */ -int main( int argc, char **argv ) -{ - WCHAR **argvW; - int i, j, Ret = 1; - - if ((argvW = malloc(argc * sizeof(WCHAR*)))) - { - /* convert the arguments */ - for (i = 0, j = 0; i < argc; i++) - { - if (!(argvW[i] = malloc((strlen(argv[i]) + 1) * sizeof(WCHAR)))) - { - j++; - } - swprintf(argvW[i], L"%hs", argv[i]); - } - - if (j == 0) - { - /* no error converting the parameters, call wmain() */ - Ret = wmain(argc, argvW); - } - - /* free the arguments */ - for (i = 0; i < argc; i++) - { - if (argvW[i]) - free(argvW[i]); - } - free(argvW); - } - - return Ret; -} -#endif

1 0

[hpoussin] 33376: Use _tWinMain instead of WinMain, as welcome.exe uses TCHAR in other places
by hpoussin＠svn.reactos.org 08 May '08

08 May '08

Author: hpoussin Date: Thu May 8 12:08:47 2008 New Revision: 33376 URL: http://svn.reactos.org/svn/reactos?rev=33376&view=rev Log: Use _tWinMain instead of WinMain, as welcome.exe uses TCHAR in other places Modified: trunk/reactos/base/setup/welcome/welcome.c Modified: trunk/reactos/base/setup/welcome/welcome.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… ============================================================================== --- trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] Thu May 8 12:08:47 2008 @@ -96,9 +96,9 @@ /* FUNCTIONS ****************************************************************/ int WINAPI -WinMain(HINSTANCE hInst, +_tWinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, - LPSTR lpszCmdLine, + LPTSTR lpszCmdLine, int nCmdShow) { WNDCLASSEX wndclass;

1 0

[hpoussin] 33375: Do not define _UNICODE twice (on command line and in utility.h)
by hpoussin＠svn.reactos.org 08 May '08

08 May '08

Author: hpoussin Date: Thu May 8 12:06:47 2008 New Revision: 33375 URL: http://svn.reactos.org/svn/reactos?rev=33375&view=rev Log: Do not define _UNICODE twice (on command line and in utility.h) Modified: trunk/reactos/base/shell/explorer/utility/utility.h Modified: trunk/reactos/base/shell/explorer/utility/utility.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/utility.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/utility.h [iso-8859-1] Thu May 8 12:06:47 2008 @@ -45,7 +45,7 @@ #include <windows.h> // Unicode support -#ifdef UNICODE +#if defined(UNICODE) && !defined(_UNICODE) #define _UNICODE #endif #include <tchar.h>

1 0

[cfinck] 33374: Fix win32kdxtest build
by cfinck＠svn.reactos.org 08 May '08

08 May '08

Author: cfinck Date: Thu May 8 12:00:15 2008 New Revision: 33374 URL: http://svn.reactos.org/svn/reactos?rev=33374&view=rev Log: Fix win32kdxtest build Modified: trunk/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild Modified: trunk/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/win32… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild [iso-8859-1] (original) +++ trunk/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild [iso-8859-1] Thu May 8 12:00:15 2008 @@ -1,7 +1,5 @@ <module name="win32kdxtest" type="win32cui" installbase="bin" installname="win32kdxtest.exe" allowwarnings ="true" > <include base="win32kdxtest">.</include> - <define name="__USE_W32API" /> - <define name="__REACTOS__" /> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <library>kernel32</library>

1 0

[hpoussin] 33373: Use _tWinMain instead of WinMain, as setup.exe uses TCHAR in other places
by hpoussin＠svn.reactos.org 08 May '08

08 May '08

Author: hpoussin Date: Thu May 8 11:56:03 2008 New Revision: 33373 URL: http://svn.reactos.org/svn/reactos?rev=33373&view=rev Log: Use _tWinMain instead of WinMain, as setup.exe uses TCHAR in other places Modified: trunk/reactos/base/setup/setup/setup.c Modified: trunk/reactos/base/setup/setup/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/setup/setup.c?r… ============================================================================== --- trunk/reactos/base/setup/setup/setup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/setup/setup.c [iso-8859-1] Thu May 8 11:56:03 2008 @@ -114,9 +114,9 @@ } int STDCALL -WinMain (HINSTANCE hInstance, +_tWinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, - LPSTR lpCmdLine, + LPTSTR lpCmdLine, int nShowCmd) { LPTSTR CmdLine;

1 0

[hpoussin] 33372: Fix sc.exe compilation by removing hack
by hpoussin＠svn.reactos.org 08 May '08

08 May '08

Author: hpoussin Date: Thu May 8 11:48:39 2008 New Revision: 33372 URL: http://svn.reactos.org/svn/reactos?rev=33372&view=rev Log: Fix sc.exe compilation by removing hack Modified: trunk/reactos/base/applications/sc/sc.c Modified: trunk/reactos/base/applications/sc/sc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.c?… ============================================================================== --- trunk/reactos/base/applications/sc/sc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sc.c [iso-8859-1] Thu May 8 11:48:39 2008 @@ -189,10 +189,6 @@ return 0; } -#if defined(_UNICODE) && defined(__GNUC__) -static -#endif - int _tmain(int argc, LPCTSTR argv[]) { LPCTSTR Server = NULL; // remote machine @@ -236,42 +232,3 @@ argc-2); } } - - -#if defined(_UNICODE) && defined(__GNUC__) -/* HACK - MINGW HAS NO OFFICIAL SUPPORT FOR wmain()!!! */ -int main( int argc, char **argv ) -{ - WCHAR **argvW; - int i, j, Ret = 1; - - if ((argvW = (WCHAR**) malloc(argc * sizeof(WCHAR*)))) - { - /* convert the arguments */ - for (i = 0, j = 0; i < argc; i++) - { - if (!(argvW[i] = (WCHAR*) malloc((strlen(argv[i]) + 1) * sizeof(WCHAR)))) - { - j++; - } - swprintf(argvW[i], L"%hs", argv[i]); - } - - if (j == 0) - { - /* no error converting the parameters, call wmain() */ - Ret = wmain(argc, (LPCTSTR *)argvW); - } - - /* free the arguments */ - for (i = 0; i < argc; i++) - { - if (argvW[i]) - free(argvW[i]); - } - free(argvW); - } - - return Ret; -} -#endif

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs