diff --git a/reactos/subsys/system/winefile/explorer.rc b/reactos/subsys/system/winefile/explorer.rc deleted file mode 100644 index 197bd89c8f7..00000000000 --- a/reactos/subsys/system/winefile/explorer.rc +++ /dev/null @@ -1,39 +0,0 @@ -#include -#include -#include "winefile.rc" - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -VS_VERSION_INFO VERSIONINFO - FILEVERSION RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD - PRODUCTVERSION RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", RES_STR_COMPANY_NAME - VALUE "FileDescription", "ReactOS Explorer\0" - VALUE "FileVersion", RES_STR_FILE_VERSION - VALUE "InternalName", "explorer\0" - VALUE "LegalCopyright", RES_STR_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "explorer.exe\0" - VALUE "ProductName", RES_STR_PRODUCT_NAME - VALUE "ProductVersion", RES_STR_PRODUCT_VERSION - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - diff --git a/reactos/subsys/system/winefile/externals.h b/reactos/subsys/system/winefile/externals.h index 0015cee0d82..fe7c4690276 100644 --- a/reactos/subsys/system/winefile/externals.h +++ b/reactos/subsys/system/winefile/externals.h @@ -29,11 +29,11 @@ // launch start programs extern int startup(int argc, char *argv[]); - // explorer main routine -extern int explorer_main(HINSTANCE hinstance, HWND hwndDesktop, int cmdshow); + // winefile main routine +extern int winefile_main(HINSTANCE hinstance, HWND hwndDesktop, int cmdshow); - // display explorer/file manager window -extern void explorer_show_frame(HWND hwndDesktop, int cmdshow); + // display winefile/file manager window +extern void winefile_show_frame(HWND hwndDesktop, int cmdshow); // test for already running desktop instance extern BOOL IsAnyDesktopRunning(); diff --git a/reactos/subsys/system/winefile/make_winefile.dsp b/reactos/subsys/system/winefile/make_winefile.dsp index b0a1e57d043..f7e63036ec1 100644 --- a/reactos/subsys/system/winefile/make_winefile.dsp +++ b/reactos/subsys/system/winefile/make_winefile.dsp @@ -1,10 +1,10 @@ -# Microsoft Developer Studio Project File - Name="make_explorer" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="make_winefile" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) External Target" 0x0106 -CFG=make_explorer - Win32 Debug +CFG=make_winefile - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,12 +13,12 @@ CFG=make_explorer - Win32 Debug !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 "make_winefile.mak" CFG="make_explorer - Win32 Debug" +!MESSAGE NMAKE /f "make_winefile.mak" CFG="make_winefile - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "make_explorer - Win32 Release" (based on "Win32 (x86) External Target") -!MESSAGE "make_explorer - Win32 Debug" (based on "Win32 (x86) External Target") +!MESSAGE "make_winefile - Win32 Release" (based on "Win32 (x86) External Target") +!MESSAGE "make_winefile - Win32 Debug" (based on "Win32 (x86) External Target") !MESSAGE # Begin Project @@ -26,16 +26,16 @@ CFG=make_explorer - Win32 Debug # PROP Scc_ProjName "" # PROP Scc_LocalPath "" -!IF "$(CFG)" == "make_explorer - Win32 Release" +!IF "$(CFG)" == "make_winefile - 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 Cmd_Line "NMAKE /f make_explorer.mak" +# PROP BASE Cmd_Line "NMAKE /f make_winefile.mak" # PROP BASE Rebuild_Opt "/a" -# PROP BASE Target_File "make_explorer.exe" -# PROP BASE Bsc_Name "make_explorer.bsc" +# PROP BASE Target_File "make_winefile.exe" +# PROP BASE Bsc_Name "make_winefile.bsc" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 @@ -43,20 +43,20 @@ CFG=make_explorer - Win32 Debug # PROP Intermediate_Dir "Release" # PROP Cmd_Line "msdevfilt -gcc -pipe "perl d:\tools\gSTLFilt.pl" make" # PROP Rebuild_Opt "clean all" -# PROP Target_File "explorer.exe" +# PROP Target_File "winefile.exe" # PROP Bsc_Name "" # PROP Target_Dir "" -!ELSEIF "$(CFG)" == "make_explorer - Win32 Debug" +!ELSEIF "$(CFG)" == "make_winefile - 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 Cmd_Line "NMAKE /f make_explorer.mak" +# PROP BASE Cmd_Line "NMAKE /f make_winefile.mak" # PROP BASE Rebuild_Opt "/a" -# PROP BASE Target_File "make_explorer.exe" -# PROP BASE Bsc_Name "make_explorer.bsc" +# PROP BASE Target_File "make_winefile.exe" +# PROP BASE Bsc_Name "make_winefile.bsc" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 @@ -64,7 +64,7 @@ CFG=make_explorer - Win32 Debug # PROP Intermediate_Dir "Debug" # PROP Cmd_Line "msdevfilt -gcc -pipe "perl d:\tools\gSTLFilt.pl" make DEBUG=1" # PROP Rebuild_Opt "clean all" -# PROP Target_File "explorer.exe" +# PROP Target_File "winefile.exe" # PROP Bsc_Name "" # PROP Target_Dir "" @@ -72,12 +72,12 @@ CFG=make_explorer - Win32 Debug # Begin Target -# Name "make_explorer - Win32 Release" -# Name "make_explorer - Win32 Debug" +# Name "make_winefile - Win32 Release" +# Name "make_winefile - Win32 Debug" -!IF "$(CFG)" == "make_explorer - Win32 Release" +!IF "$(CFG)" == "make_winefile - Win32 Release" -!ELSEIF "$(CFG)" == "make_explorer - Win32 Debug" +!ELSEIF "$(CFG)" == "make_winefile - Win32 Debug" !ENDIF diff --git a/reactos/subsys/system/winefile/winefile.c b/reactos/subsys/system/winefile/winefile.c index 0f35270afc1..b9ba6193103 100644 --- a/reactos/subsys/system/winefile/winefile.c +++ b/reactos/subsys/system/winefile/winefile.c @@ -3600,7 +3600,7 @@ static void InitInstance(HINSTANCE hinstance) } -void explorer_show_frame(HWND hwndParent, int cmdshow) +void show_frame(HWND hwndParent, int cmdshow) { TCHAR path[MAX_PATH]; ChildWnd* child; @@ -3794,7 +3794,7 @@ int find_window_class(LPCTSTR classname) } -int explorer_main(HINSTANCE hinstance, HWND hwndParent, int cmdshow) +int winefile_main(HINSTANCE hinstance, HWND hwndParent, int cmdshow) { MSG msg; @@ -3806,7 +3806,7 @@ int explorer_main(HINSTANCE hinstance, HWND hwndParent, int cmdshow) cmdshow = SW_MAXIMIZE; #endif - explorer_show_frame(hwndParent, cmdshow); + show_frame(hwndParent, cmdshow); while(GetMessage(&msg, 0, 0, 0)) { if (Globals.hmdiclient && TranslateMDISysAccel(Globals.hmdiclient, &msg)) @@ -3835,7 +3835,7 @@ int APIENTRY WinMain(HINSTANCE hinstance, return 1; #endif - explorer_main(hinstance, 0, cmdshow); + winefile_main(hinstance, 0, cmdshow); return 0; }