Ros-diffs November 2011

ros-diffs@reactos.org

16 participants
274 discussions

[rharabien] 54524: [DESK] - Improve Polish translation
by rharabien＠svn.reactos.org 28 Nov '11

28 Nov '11

Author: rharabien Date: Mon Nov 28 10:22:27 2011 New Revision: 54524 URL: http://svn.reactos.org/svn/reactos?rev=54524&view=rev Log: [DESK] - Improve Polish translation Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/pl-PL.rc [iso-8859-1] Mon Nov 28 10:22:27 2011 @@ -40,16 +40,16 @@ PUSHBUTTON "&Ustawienia", IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP PUSHBUTTON "&PodglÄd", IDC_SCREENS_TESTSC, 175, 103, 50, 13 LTEXT "&Czekaj", IDC_WAITTEXT, 14, 125, 20, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY, 34, 123, 32, 13, ES_RIGHT | WS_GROUP + EDITTEXT IDC_SCREENS_TIMEDELAY, 35, 123, 32, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_BORDER | WS_GROUP, 54, 123, 12, 13 + WS_BORDER | WS_GROUP, 55, 123, 12, 13 LTEXT "minut", IDC_MINTEXT, 70, 125, 26, 9 - CONTROL "Ochrona &hasÅem.", IDC_SCREENS_USEPASSCHK, "button", + CONTROL "Po wznowieniu chroÅ &hasÅem", IDC_SCREENS_USEPASSCHK, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19 GROUPBOX "&Zasilanie monitora", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 LTEXT "Kliknij przycisk Zasilanie, aby dopasowaÄ ustawienia zasilania dla monitora i oszczÄdzanie energii.", - IDC_STATIC, 14, 166, 146, 20 + IDC_STATIC, 14, 166, 146, 25 PUSHBUTTON "Z&asilanie...", IDC_SCREENS_POWER_BUTTON, 165, 171, 61, 13 END

1 0

[rharabien] 54523: [SHELL32] - Don't fail if Shell folder cannot be created. This way shell registers more folders on LiveCD.
by rharabien＠svn.reactos.org 28 Nov '11

28 Nov '11

Author: rharabien Date: Mon Nov 28 10:01:24 2011 New Revision: 54523 URL: http://svn.reactos.org/svn/reactos?rev=54523&view=rev Log: [SHELL32] - Don't fail if Shell folder cannot be created. This way shell registers more folders on LiveCD. Modified: trunk/reactos/dll/win32/shell32/shellpath.cpp Modified: trunk/reactos/dll/win32/shell32/shellpath.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellpat… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellpath.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellpath.cpp [iso-8859-1] Mon Nov 28 10:01:24 2011 @@ -1563,13 +1563,15 @@ hr = HRESULT_FROM_WIN32(ret); else { - hr = SHGetFolderPathW(NULL, folders[i] | CSIDL_FLAG_CREATE, - hToken, SHGFP_TYPE_DEFAULT, path); - ret = RegSetValueExW(hKey, - CSIDL_Data[folders[i]].szValueName, 0, REG_SZ, - (LPBYTE)path, (wcslen(path) + 1) * sizeof(WCHAR)); - if (ret) - hr = HRESULT_FROM_WIN32(ret); + // Don't fail if folder can't be created + if (SUCCEEDED(SHGetFolderPathW(NULL, folders[i] | CSIDL_FLAG_CREATE, + hToken, SHGFP_TYPE_DEFAULT, path))) + { + ret = RegSetValueExW(hKey, CSIDL_Data[folders[i]].szValueName, 0, REG_SZ, + (LPBYTE)path, (wcslen(path) + 1) * sizeof(WCHAR)); + if (ret) + hr = HRESULT_FROM_WIN32(ret); + } } } }

1 0

[rharabien] 54522: [LIVECD] - Add registration to LiveCD. Fixes #6597, #6613 and probably some more
by rharabien＠svn.reactos.org 28 Nov '11

28 Nov '11

Author: rharabien Date: Mon Nov 28 09:53:01 2011 New Revision: 54522 URL: http://svn.reactos.org/svn/reactos?rev=54522&view=rev Log: [LIVECD] - Add registration to LiveCD. Fixes #6597, #6613 and probably some more Modified: trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Mon Nov 28 09:53:01 2011 @@ -721,6 +721,24 @@ if (!CommonInstall()) goto error; + + /* Register components */ + _SEH2_TRY + { + if (!SetupInstallFromInfSectionW(NULL, + hSysSetupInf, L"RegistrationPhase2", + SPINST_ALL, + 0, NULL, 0, NULL, NULL, NULL, NULL)) + { + DPRINT1("SetupInstallFromInfSectionW failed!\n"); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + DPRINT1("Catching exception\n"); + } + _SEH2_END; + SetupCloseInfFile(hSysSetupInf); /* Run the shell */

1 0

[rharabien] 54521: [RBUILD] - Create livecd shortcuts on rbuild too
by rharabien＠svn.reactos.org 28 Nov '11

28 Nov '11

Author: rharabien Date: Mon Nov 28 09:46:59 2011 New Revision: 54521 URL: http://svn.reactos.org/svn/reactos?rev=54521&view=rev Log: [RBUILD] - Create livecd shortcuts on rbuild too Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/mingw.h trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Mon Nov 28 09:46:59 2011 @@ -152,7 +152,25 @@ } string -v2s ( const Backend* backend, const vector<FileLocation>& files, int wrap_at ) +MingwBackend::GetFullNamePrefixSpaces ( const FileLocation& file ) const +{ + string fullname = GetFullName ( file ); + + size_t pos = 0; + while ( true ) + { + pos = fullname.find ( ' ', pos ); + if ( pos == fullname.npos ) + break; + fullname.replace ( pos, 1, "\\ " ); + pos += 2; + } + + return fullname; +} + +string +MingwBackend::v2s ( const vector<FileLocation>& files, int wrap_at, bool prefixSpaces ) const { if ( !files.size() ) return ""; @@ -168,14 +186,16 @@ } else if ( s.size() ) s += " "; - s += backend->GetFullName ( file ); + if (prefixSpaces) + s += GetFullNamePrefixSpaces ( file ); + else + s += GetFullName ( file ); } return s; } - -string -v2s ( const string_list& v, int wrap_at ) +string +MingwBackend::v2s ( const string_list& v, int wrap_at ) const { if ( !v.size() ) return ""; @@ -196,7 +216,6 @@ } return s; } - static class MingwFactory : public Backend::Factory { @@ -1274,7 +1293,7 @@ registry_files.push_back ( FileLocation ( InstallDirectory, system32ConfigDirectory, "software" ) ); registry_files.push_back ( FileLocation ( InstallDirectory, system32ConfigDirectory, "system" ) ); - return v2s( this, registry_files, 6 ); + return v2s( registry_files, 6, true ); } void @@ -1307,7 +1326,7 @@ { vector<FileLocation> vInstallTargetFiles; GetInstallTargetFiles ( vInstallTargetFiles ); - string installTargetFiles = v2s ( this, vInstallTargetFiles, 5 ); + string installTargetFiles = v2s ( vInstallTargetFiles, 5, true ); string registryTargetFiles = GetRegistryTargetFiles (); fprintf ( fMakefile, Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h [iso-8859-1] Mon Nov 28 09:46:59 2011 @@ -29,11 +29,6 @@ class Directory; class MingwModuleHandler; -extern std::string -v2s ( const Backend* backend, const std::vector<FileLocation>& files, int wrap_at ); -extern std::string -v2s ( const string_list& v, int wrap_at ); - class MingwBackend : public Backend { @@ -59,8 +54,11 @@ std::string GetFullName ( const FileLocation& file ) const; std::string GetFullPath ( const FileLocation& file ) const; + std::string GetFullNamePrefixSpaces ( const FileLocation& file ) const; std::string GetRegistrySourceFiles () const; std::string GetRegistryTargetFiles () const; + std::string v2s ( const std::vector<FileLocation>& files, int wrap_at, bool prefixSpaces = false ) const; + std::string v2s ( const string_list& v, int wrap_at ) const; private: void CreateMakefile (); Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Mon Nov 28 09:46:59 2011 @@ -281,7 +281,7 @@ const File& file = *compilationUnit.GetFiles ()[i]; sourceFiles.push_back ( backend->GetFullName ( file.file ) ); } - return string ( " " ) + v2s ( sourceFiles, 10 ); + return string ( " " ) + backend->v2s ( sourceFiles, 10 ); } /* caller needs to delete the returned object */ @@ -322,7 +322,7 @@ fprintf ( fMakefile, "\t$(ECHO_CP)\n" ); fprintf ( fMakefile, - "\t${cp} %s %s 1>$(NUL)\n", + "\t${cp} \"%s\" \"%s\" 1>$(NUL)\n", backend->GetFullName ( source ).c_str (), backend->GetFullName ( *PassThruCacheDirectory ( &destination ) ).c_str () ); } @@ -333,12 +333,12 @@ { fprintf ( fMakefile, "%s : %s\n", - backend->GetFullName ( *PassThruCacheDirectory ( &destination ) ).c_str (), - backend->GetFullName ( source ).c_str () ); + backend->GetFullNamePrefixSpaces ( *PassThruCacheDirectory ( &destination ) ).c_str (), + backend->GetFullNamePrefixSpaces ( source ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_CP)\n" ); fprintf ( fMakefile, - "\t${cp} %s %s 1>$(NUL)\n", + "\t${cp} \"%s\" \"%s\" 1>$(NUL)\n", backend->GetFullName ( source ).c_str (), backend->GetFullName ( *PassThruCacheDirectory ( &destination ) ).c_str () ); } @@ -508,7 +508,7 @@ fprintf ( fMakefile, "%s: %s\n\t-@${rm}", GetModuleCleanTarget ( module ).c_str(), - v2s ( referencedModuleNames, 10 ).c_str () ); + backend->v2s ( referencedModuleNames, 10 ).c_str () ); for ( size_t i = 0; i < clean_files.size(); i++ ) { if ( ( i + 1 ) % 10 == 9 ) @@ -1196,7 +1196,7 @@ vector<FileLocation> rpcDependencies; GetRpcHeaderDependencies ( rpcDependencies ); if ( rpcDependencies.size () > 0 ) - dependencies += " " + v2s ( backend, rpcDependencies, 5 ); + dependencies += " " + backend->v2s ( rpcDependencies, 5 ); rule->Execute ( fMakefile, backend, module, sourceFile, clean_files, dependencies ); } @@ -1536,7 +1536,7 @@ vector<FileLocation> rpcDependencies; GetRpcHeaderDependencies ( rpcDependencies ); if ( rpcDependencies.size () > 0 ) - dependencies = " " + v2s ( backend, rpcDependencies, 5 ); + dependencies = " " + backend->v2s ( rpcDependencies, 5 ); if ( module.cplusplus ) pchCxxRule.Execute ( fMakefile, backend, module, module.pch->file, clean_files, dependencies ); @@ -2788,7 +2788,7 @@ fprintf( fMakefile, "\n%s_OBJS := %s\n\n", module.name.c_str (), - v2s ( backend, sourceFiles, 5 ).c_str () ); + backend->v2s ( sourceFiles, 5, true ).c_str () ); fprintf ( fMakefile, ".PHONY: %s\n\n", module.name.c_str ()); @@ -2916,6 +2916,75 @@ } void +MingwLiveIsoModuleHandler::OutputMakeLinkCommand ( const string name, + const string application, + const string &path, + vector<FileLocation>& destinations ) +{ + FileLocation location ( OutputDirectory, path, name + ".lnk" ); + fprintf ( fMakefile, + "%s : $(mkshelllink_TARGET)\n", + backend->GetFullNamePrefixSpaces ( *PassThruCacheDirectory ( &location ) ).c_str () ); + fprintf ( fMakefile, + "\t$(Q)$(mkshelllink_TARGET) -o \"%s\" -g {450D8FBA-AD25-11D0-98A8-0800361B1103} -c %s -i %s -m livecd_start.cmd\n", + backend->GetFullName ( location ).c_str (), + application.c_str (), + application.c_str () ); + destinations.push_back ( location ); +} + +void +MingwLiveIsoModuleHandler::OutputShortcutCommands ( string& livecdDirectory, + vector<FileLocation>& destinations ) +{ + string allUsersDir = livecdDirectory + sSep + "Profiles" + sSep + "All Users"; + string defaultUserDir = livecdDirectory + sSep + "Profiles" + sSep + "Default User"; + FileLocation helperSource ( SourceDirectory, "boot" + sSep + "bootdata", "livecd_start.cmd" ); + FileLocation helperDest ( OutputDirectory, defaultUserDir + sSep + "My Documents", "livecd_start.cmd" ); + OutputCopyCommandSingle ( helperSource, helperDest ); + destinations.push_back ( helperDest ); + + string desktopDir = allUsersDir + sSep + "Desktop"; + OutputMakeLinkCommand ( "Command Prompt", "cmd.exe", desktopDir, destinations ); + + string startMenuDir = allUsersDir + sSep + "Start Menu"; + OutputMakeLinkCommand ( "ReactOS Explorer", "explorer.exe", startMenuDir + sSep + "Programs", destinations ); + + string adminToolsDir = startMenuDir + sSep + "Programs" + sSep + "Administrative Tools"; + OutputMakeLinkCommand ( "Device Manager", "devmgmt.exe", adminToolsDir, destinations ); + OutputMakeLinkCommand ( "Event Viewer", "eventvwr.exe", adminToolsDir, destinations ); + OutputMakeLinkCommand ( "Service Manager", "servman.exe", adminToolsDir, destinations ); + OutputMakeLinkCommand ( "System Configuration", "msconfig.exe", adminToolsDir, destinations ); + + string accessibilityDir = startMenuDir + sSep + "Programs" + sSep + "Accessibility"; + OutputMakeLinkCommand ( "Magnify", "magnify.exe", accessibilityDir, destinations ); + + string accessoriesDir = startMenuDir + sSep + "Programs" + sSep + "Accessories"; + OutputMakeLinkCommand ( "Calculator", "calc.exe", accessoriesDir, destinations ); + OutputMakeLinkCommand ( "Command Prompt", "cmd.exe", accessoriesDir, destinations ); + OutputMakeLinkCommand ( "Paint", "mspaint.exe", accessoriesDir, destinations ); + OutputMakeLinkCommand ( "Notepad", "notepad.exe", accessoriesDir, destinations ); + OutputMakeLinkCommand ( "Remote desktop", "mstsc.exe", accessoriesDir, destinations ); + OutputMakeLinkCommand ( "WordPad", "wordpad.exe", accessoriesDir, destinations ); + + string entertainmentDir = startMenuDir + sSep + "Programs" + sSep + "Entertainment"; + OutputMakeLinkCommand ( "Audiorecorder", "sndrec32.exe", entertainmentDir, destinations ); + OutputMakeLinkCommand ( "Multimedia Player", "mplay32.exe", entertainmentDir, destinations ); + OutputMakeLinkCommand ( "Volume Control", "sndvol32.exe", entertainmentDir, destinations ); + + string gamesDir = startMenuDir + sSep + "Programs" + sSep + "Games"; + OutputMakeLinkCommand ( "Solitaire", "sol.exe", gamesDir, destinations ); + OutputMakeLinkCommand ( "Spider Solitaire", "spider.exe", gamesDir, destinations ); + OutputMakeLinkCommand ( "WineMine", "winmine.exe", gamesDir, destinations ); + + string sysToolsDir = startMenuDir + sSep + "Programs" + sSep + "System Tools"; + OutputMakeLinkCommand ( "Character Map", "charmap.exe", sysToolsDir, destinations ); + OutputMakeLinkCommand ( "Keyboard Layout Switcher", "kbswitch.exe", sysToolsDir, destinations ); + OutputMakeLinkCommand ( "ReactX Diagnostic", "dxdiag.exe", sysToolsDir, destinations ); + OutputMakeLinkCommand ( "Regedit", "regedit.exe", sysToolsDir, destinations ); +} + +void MingwLiveIsoModuleHandler::OutputRegistryCommands ( string& livecdDirectory ) { string registrySourceFiles = backend->GetRegistrySourceFiles (); @@ -2926,7 +2995,7 @@ fprintf ( fMakefile, "\t$(ECHO_MKHIVE)\n" ); fprintf ( fMakefile, - "\t$(mkhive_TARGET) %s %s boot%cbootdata%clivecd.inf\n", + "\t$(Q)$(mkhive_TARGET) %s %s boot%cbootdata%clivecd.inf\n", backend->GetFullPath ( reactosSystem32ConfigDirectory ).c_str (), registrySourceFiles.c_str(), cSep, cSep ); @@ -2976,11 +3045,12 @@ sourceFiles ); OutputProfilesDirectoryCommands ( livecdDirectory, sourceFiles ); OutputLoaderCommands ( livecdDirectory, sourceFiles ); + OutputShortcutCommands ( livecdDirectory, sourceFiles ); fprintf( fMakefile, "\n%s_OBJS := %s\n\n", module.name.c_str (), - v2s ( backend, sourceFiles, 5 ).c_str () ); + backend->v2s ( sourceFiles, 5, true ).c_str () ); fprintf ( fMakefile, ".PHONY: %s\n\n", module.name.c_str ()); Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] Mon Nov 28 09:46:59 2011 @@ -335,6 +335,12 @@ std::vector<FileLocation>& destinations ); void OutputLoaderCommands ( std::string& livecdDirectory, std::vector<FileLocation>& destinations ); + void OutputMakeLinkCommand ( const std::string name, + const std::string application, + const std::string &path, + std::vector<FileLocation>& destinations ); + void OutputShortcutCommands ( std::string& livecdDirectory, + std::vector<FileLocation>& destinations ); void OutputRegistryCommands ( std::string& livecdDirectory ); };

1 0

[dgorbachev] 54520: [DiskPart] Remove unused file. Lee Schroeder, bug #6699.
by dgorbachev＠svn.reactos.org 28 Nov '11

28 Nov '11

Author: dgorbachev Date: Mon Nov 28 07:35:58 2011 New Revision: 54520 URL: http://svn.reactos.org/svn/reactos?rev=54520&view=rev Log: [DiskPart] Remove unused file. Lee Schroeder, bug #6699. Removed: trunk/reactos/base/system/diskpart/remove.h Removed: trunk/reactos/base/system/diskpart/remove.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/remov… ============================================================================== --- trunk/reactos/base/system/diskpart/remove.h [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/remove.h (removed) @@ -1,16 +1,0 @@ -/* - * PROJECT: ReactOS DiskPart - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/system/diskpart/remove.h - * PURPOSE: Manages all the partitions of the OS in - * an interactive way - * PROGRAMMERS: Lee Schroeder - */ -#ifndef REMOVE_H_INCLUDED -#define REMOVE_H_INCLUDED - -/* FUNCTIONS *****************************************************************/ -BOOL remove_main(INT argc, WCHAR **argv); -VOID help_remove(INT argc, WCHAR **argv); - -#endif // REMOVE_H_INCLUDED

1 0

[dgorbachev] 54519: [NTDLL] Do not map already mapped section.
by dgorbachev＠svn.reactos.org 28 Nov '11

28 Nov '11

Author: dgorbachev Date: Mon Nov 28 07:35:51 2011 New Revision: 54519 URL: http://svn.reactos.org/svn/reactos?rev=54519&view=rev Log: [NTDLL] Do not map already mapped section. Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Mon Nov 28 07:35:51 2011 @@ -1251,7 +1251,7 @@ /* Stuff the image name in the TIB, for the debugger */ ArbitraryUserPointer = Teb->NtTib.ArbitraryUserPointer; Teb->NtTib.ArbitraryUserPointer = FullDllName.Buffer; - +#if 0 /* Map the DLL */ Status = NtMapViewOfSection(SectionHandle, NtCurrentProcess(), @@ -1263,7 +1263,7 @@ ViewShare, 0, PAGE_READWRITE); - +#endif /* Restore */ Teb->NtTib.ArbitraryUserPointer = ArbitraryUserPointer; @@ -1301,7 +1301,7 @@ /* Stuff the image name in the TIB, for the debugger */ ArbitraryUserPointer = Teb->NtTib.ArbitraryUserPointer; Teb->NtTib.ArbitraryUserPointer = FullDllName.Buffer; - +#if 0 /* Map the DLL */ Status = NtMapViewOfSection(SectionHandle, NtCurrentProcess(), @@ -1313,7 +1313,7 @@ ViewShare, 0, PAGE_READWRITE); - +#endif /* Restore */ Teb->NtTib.ArbitraryUserPointer = ArbitraryUserPointer;

1 0

[jimtabor] 54518: - fix GetNCHitEx, restore track mouse buttons in test system.
by jimtabor＠svn.reactos.org 28 Nov '11

28 Nov '11

Author: jimtabor Date: Mon Nov 28 06:37:45 2011 New Revision: 54518 URL: http://svn.reactos.org/svn/reactos?rev=54518&view=rev Log: - fix GetNCHitEx, restore track mouse buttons in test system. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] Mon Nov 28 06:37:45 2011 @@ -305,8 +305,7 @@ } else { - IntGetClientRect(pWnd, &rcClient); // This or - //rcClient = pWnd->rcClient; // this one? + rcClient = pWnd->rcClient; rcWindow = pWnd->rcWindow; }

1 0

[jimtabor] 54517: - Add padded boarder width to NONCLIENTMETRICS.
by jimtabor＠svn.reactos.org 28 Nov '11

28 Nov '11

Author: jimtabor Date: Mon Nov 28 04:16:54 2011 New Revision: 54517 URL: http://svn.reactos.org/svn/reactos?rev=54517&view=rev Log: - Add padded boarder width to NONCLIENTMETRICS. Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Mon Nov 28 04:16:54 2011 @@ -3315,6 +3315,9 @@ LOGFONTA lfMenuFont; LOGFONTA lfStatusFont; LOGFONTA lfMessageFont; +#if (WINVER >= 0x0600) + int iPaddedBorderWidth; +#endif } NONCLIENTMETRICSA, *PNONCLIENTMETRICSA,*LPNONCLIENTMETRICSA; typedef struct tagNONCLIENTMETRICSW { @@ -3333,6 +3336,9 @@ LOGFONTW lfMenuFont; LOGFONTW lfStatusFont; LOGFONTW lfMessageFont; +#if (WINVER >= 0x0600) + int iPaddedBorderWidth; +#endif } NONCLIENTMETRICSW, *PNONCLIENTMETRICSW,*LPNONCLIENTMETRICSW; #ifdef UNICODE

1 0

[rharabien] 54516: [MKSHELLLINK] - Don't use stricmp. It's not a standard function.
by rharabien＠svn.reactos.org 27 Nov '11

27 Nov '11

Author: rharabien Date: Sun Nov 27 20:14:00 2011 New Revision: 54516 URL: http://svn.reactos.org/svn/reactos?rev=54516&view=rev Log: [MKSHELLLINK] - Don't use stricmp. It's not a standard function. Modified: trunk/reactos/tools/mkshelllink/mkshelllink.c Modified: trunk/reactos/tools/mkshelllink/mkshelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkshelllink/mkshelll… ============================================================================== --- trunk/reactos/tools/mkshelllink/mkshelllink.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkshelllink/mkshelllink.c [iso-8859-1] Sun Nov 27 20:14:00 2011 @@ -139,25 +139,25 @@ { if (argv[i][0] != '-' && argv[i][0] != '/') pszTarget = argv[i]; - else if (!stricmp(argv[i] + 1, "h")) + else if (!strcmp(argv[i] + 1, "h")) bHelp = 1; - else if (!stricmp(argv[i] + 1, "o") && i + 1 < argc) + else if (!strcmp(argv[i] + 1, "o") && i + 1 < argc) pszOutputPath = argv[++i]; - else if (!stricmp(argv[i] + 1, "d") && i + 1 < argc) + else if (!strcmp(argv[i] + 1, "d") && i + 1 < argc) pszDescription = argv[++i]; - else if (!stricmp(argv[i] + 1, "w") && i + 1 < argc) + else if (!strcmp(argv[i] + 1, "w") && i + 1 < argc) pszWorkingDir = argv[++i]; - else if (!stricmp(argv[i] + 1, "c") && i + 1 < argc) + else if (!strcmp(argv[i] + 1, "c") && i + 1 < argc) pszCmdLineArgs = argv[++i]; - else if (!stricmp(argv[i] + 1, "i") && i + 1 < argc) + else if (!strcmp(argv[i] + 1, "i") && i + 1 < argc) { pszIcon = argv[++i]; if (i + 1 < argc && isdigit(argv[i + 1][0])) IconNr = atoi(argv[++i]); } - else if (!stricmp(argv[i] + 1, "m")) + else if (!strcmp(argv[i] + 1, "m")) bMinimized = 1; - else if (!stricmp(argv[i] + 1, "g") && i + 1 < argc) + else if (!strcmp(argv[i] + 1, "g") && i + 1 < argc) { unsigned Data4Tmp[8], j;

1 0

[rharabien] 54515: [MKSHELLLINK] - Don't use windows.h in host tool
by rharabien＠svn.reactos.org 27 Nov '11

27 Nov '11

Author: rharabien Date: Sun Nov 27 20:11:06 2011 New Revision: 54515 URL: http://svn.reactos.org/svn/reactos?rev=54515&view=rev Log: [MKSHELLLINK] - Don't use windows.h in host tool Modified: trunk/reactos/tools/mkshelllink/mkshelllink.c Modified: trunk/reactos/tools/mkshelllink/mkshelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkshelllink/mkshelll… ============================================================================== --- trunk/reactos/tools/mkshelllink/mkshelllink.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkshelllink/mkshelllink.c [iso-8859-1] Sun Nov 27 20:11:06 2011 @@ -6,9 +6,24 @@ */ #include <stdio.h> -#include <stdlib.h> +#include <string.h> #include <ctype.h> -#include <windows.h> +#include <stdint.h> + +#define SW_SHOWNORMAL 1 +#define SW_SHOWMINNOACTIVE 7 + +typedef struct _GUID { + uint32_t Data1; + uint16_t Data2; + uint16_t Data3; + uint8_t Data4[8]; +} GUID; + +typedef struct _FILETIME { + uint32_t dwLowDateTime; + uint32_t dwHighDateTime; +} FILETIME, *PFILETIME; #define DEFINE_GUID2(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const GUID name = { l,w1,w2,{ b1,b2,b3,b4,b5,b6,b7,b8 } } DEFINE_GUID2(CLSID_ShellLink,0x00021401L,0,0,0xC0,0,0,0,0,0,0,0x46); @@ -32,39 +47,39 @@ typedef struct _LNK_HEADER { - DWORD Signature; + uint32_t Signature; GUID Guid; - DWORD Flags; - DWORD Attributes; + uint32_t Flags; + uint32_t Attributes; FILETIME CreationTime; FILETIME ModificationTime; FILETIME LastAccessTime; - DWORD FileSize; - DWORD IconNr; - DWORD Show; - DWORD Hotkey; - DWORD Unknown; - DWORD Unknown2; + uint32_t FileSize; + uint32_t IconNr; + uint32_t Show; + uint32_t Hotkey; + uint32_t Unknown; + uint32_t Unknown2; } LNK_HEADER; typedef struct _LNK_LOCATOR_INFO { - DWORD Size; - DWORD DataOffset; - DWORD Flags; - DWORD LocalVolumeInfoOffset; - DWORD LocalBasePathnameOffset; - DWORD NetworkVolumeInfoOffset; - DWORD RemainingPathnameOffset; + uint32_t Size; + uint32_t DataOffset; + uint32_t Flags; + uint32_t LocalVolumeInfoOffset; + uint32_t LocalBasePathnameOffset; + uint32_t NetworkVolumeInfoOffset; + uint32_t RemainingPathnameOffset; char Data[0]; } LNK_LOCATOR_INFO; typedef struct _LNK_LOCAL_VOLUME_INFO { - DWORD Size; - DWORD VolumeType; /* See GetDriveType */ - DWORD SerialNumber; - DWORD VolumeNameOffset; + uint32_t Size; + uint32_t VolumeType; /* See GetDriveType */ + uint32_t SerialNumber; + uint32_t VolumeNameOffset; char VolumeLabel[0]; } LNK_LOCAL_VOLUME_INFO; @@ -75,30 +90,30 @@ typedef struct _ID_LIST_FILE { - WORD Size; - BYTE Type; - BYTE dummy; - DWORD dwFileSize; - WORD uFileDate; - WORD uFileTime; - WORD uFileAttribs; + uint16_t Size; + uint8_t Type; + uint8_t dummy; + uint32_t dwFileSize; + uint16_t uFileDate; + uint16_t uFileTime; + uint16_t uFileAttribs; char szName[0]; } ID_LIST_FILE; typedef struct _ID_LIST_GUID { - WORD Size; - BYTE Type; - BYTE dummy; + uint16_t Size; + uint8_t Type; + uint8_t dummy; GUID guid; } ID_LIST_GUID; typedef struct _ID_LIST_DRIVE { - WORD Size; - BYTE Type; - CHAR szDriveName[20]; - WORD unknown; + uint16_t Size; + uint8_t Type; + char szDriveName[20]; + uint16_t unknown; } ID_LIST_DRIVE; #pragma pack(pop) @@ -114,18 +129,18 @@ const char *pszIcon = NULL; int IconNr = 0; GUID Guid = CLSID_MyComputer; - BOOL bHelp = FALSE, bMinimized = FALSE; + int bHelp = 0, bMinimized = 0; FILE *pFile; LNK_HEADER Header; - USHORT uhTmp; - DWORD dwTmp; + uint16_t uhTmp; + uint32_t dwTmp; for (i = 1; i < argc; ++i) { if (argv[i][0] != '-' && argv[i][0] != '/') pszTarget = argv[i]; else if (!stricmp(argv[i] + 1, "h")) - bHelp = TRUE; + bHelp = 1; else if (!stricmp(argv[i] + 1, "o") && i + 1 < argc) pszOutputPath = argv[++i]; else if (!stricmp(argv[i] + 1, "d") && i + 1 < argc) @@ -141,7 +156,7 @@ IconNr = atoi(argv[++i]); } else if (!stricmp(argv[i] + 1, "m")) - bMinimized = TRUE; + bMinimized = 1; else if (!stricmp(argv[i] + 1, "g") && i + 1 < argc) { unsigned Data4Tmp[8], j; @@ -151,7 +166,7 @@ &Data4Tmp[0], &Data4Tmp[1], &Data4Tmp[2], &Data4Tmp[3], &Data4Tmp[4], &Data4Tmp[5], &Data4Tmp[6], &Data4Tmp[7]); for (j = 0; j < 8; ++j) - Guid.Data4[j] = (BYTE)Data4Tmp[j]; + Guid.Data4[j] = (uint8_t)Data4Tmp[j]; } else printf("Invalid option: %s\n", argv[i]); @@ -180,7 +195,7 @@ // Header memset(&Header, 0, sizeof(Header)); - Header.Signature = (DWORD)'L'; + Header.Signature = (uint32_t)'L'; Header.Guid = CLSID_ShellLink; Header.Flags = LINK_ID_LIST; if (pszDescription) @@ -200,7 +215,7 @@ ID_LIST_FILE IdListFile; ID_LIST_GUID IdListGuid; ID_LIST_DRIVE IdListDrive; - unsigned cbListSize = sizeof(IdListGuid) + sizeof(WORD), cchName; + unsigned cbListSize = sizeof(IdListGuid) + sizeof(uint16_t), cchName; const char *pszName = pszTarget; // ID list

1 0

← Newer
1
2
3
4
5
6
7
...
28
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2011