Ros-diffs January 2014

ros-diffs@reactos.org

14 participants
426 discussions

[hbelusca] 61815: [NTVDM]: Each PIT channel is decreased by the same amount of "Count".

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jan 25 18:56:12 2014 New Revision: 61815 URL: http://svn.reactos.org/svn/reactos?rev=61815&view=rev Log: [NTVDM]: Each PIT channel is decreased by the same amount of "Count". Modified: branches/ntvdm/subsystems/ntvdm/hardware/timer.c branches/ntvdm/subsystems/ntvdm/hardware/timer.h Modified: branches/ntvdm/subsystems/ntvdm/hardware/timer.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware/timer.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware/timer.c [iso-8859-1] Sat Jan 25 18:56:12 2014 @@ -245,19 +245,32 @@ { /* Write LSB */ *ReadWriteMode &= ~1; - - PitChannels[Channel].ReloadValue &= 0xFF00; - PitChannels[Channel].ReloadValue |= Value; - return; + PitChannels[Channel].CountRegister &= 0xFF00; + PitChannels[Channel].CountRegister |= Value; } else if (*ReadWriteMode & 2) { /* Write MSB */ *ReadWriteMode &= ~2; - - PitChannels[Channel].ReloadValue &= 0x00FF; - PitChannels[Channel].ReloadValue |= Value << 8; - return; + PitChannels[Channel].CountRegister &= 0x00FF; + PitChannels[Channel].CountRegister |= Value << 8; + } + + /* ReadWriteMode went to zero: we are going to load the new count */ + if (*ReadWriteMode == 0x00) + { + if (PitChannels[Channel].CountRegister == 0x0000) + { + if (PitChannels[Channel].Bcd) + PitChannels[Channel].CountRegister = 9999; + else + PitChannels[Channel].CountRegister = 0xFFFF; // 0x10000; // 65536 + } + + /* Convert the current value from BCD if needed */ + PitChannels[Channel].CountRegister = WRITE_PIT_VALUE(PitChannels[Channel], + PitChannels[Channel].CountRegister); + PitChannels[Channel].ReloadValue = PitChannels[Channel].CountRegister; } } @@ -296,152 +309,160 @@ } } -/* PUBLIC FUNCTIONS ***********************************************************/ - -VOID PitDecrementCount(DWORD Count) -{ - INT i; - - for (i = 0; i < PIT_CHANNELS; i++) - { - switch (PitChannels[i].Mode) - { - case PIT_MODE_INT_ON_TERMINAL_COUNT: - { - /* Decrement the value */ - if (Count > PitChannels[i].CurrentValue) +static VOID PitDecrementCount(PPIT_CHANNEL Channel, DWORD Count) +{ + switch (Channel->Mode) + { + case PIT_MODE_INT_ON_TERMINAL_COUNT: + { + /* Decrement the value */ + if (Count > Channel->CurrentValue) + { + /* The value does not reload in this case */ + Channel->CurrentValue = 0; + } + else Channel->CurrentValue -= Count; + + /* Did it fall to the terminal count? */ + if (Channel->CurrentValue == 0 && !Channel->Pulsed) + { + /* Yes, raise the output line */ + if (Channel == &PitChannels[0]) PicInterruptRequest(0); + Channel->Pulsed = TRUE; + } + break; + } + + case PIT_MODE_RATE_GENERATOR: + { + BOOLEAN Reloaded = FALSE; + + while (Count) + { + if ((Count > Channel->CurrentValue) + && (Channel->CurrentValue != 0)) { - /* The value does not reload in this case */ - PitChannels[i].CurrentValue = 0; + /* Decrease the count */ + Count -= Channel->CurrentValue; + + /* Reload the value */ + Channel->CurrentValue = Channel->ReloadValue; + + /* Set the flag */ + Reloaded = TRUE; } - else PitChannels[i].CurrentValue -= Count; - - /* Did it fall to the terminal count? */ - if (PitChannels[i].CurrentValue == 0 && !PitChannels[i].Pulsed) + else { - /* Yes, raise the output line */ - if (i == 0) PicInterruptRequest(0); - PitChannels[i].Pulsed = TRUE; - } - break; - } - - case PIT_MODE_RATE_GENERATOR: - { - BOOLEAN Reloaded = FALSE; - - while (Count) - { - if ((Count > PitChannels[i].CurrentValue) - && (PitChannels[i].CurrentValue != 0)) + /* Decrease the value */ + Channel->CurrentValue -= Count; + + /* Clear the count */ + Count = 0; + + /* Did it fall to zero? */ + if (Channel->CurrentValue == 0) { - /* Decrease the count */ - Count -= PitChannels[i].CurrentValue; - - /* Reload the value */ - PitChannels[i].CurrentValue = PitChannels[i].ReloadValue; - - /* Set the flag */ + Channel->CurrentValue = Channel->ReloadValue; Reloaded = TRUE; } - else + } + } + + /* If there was a reload on channel 0, raise IRQ 0 */ + if ((Channel == &PitChannels[0]) && Reloaded) PicInterruptRequest(0); + + break; + } + + case PIT_MODE_SQUARE_WAVE: + { + INT ReloadCount = 0; + WORD ReloadValue = Channel->ReloadValue; + + /* The reload value must be even */ + ReloadValue &= ~1; + + while (Count) + { + if (((Count * 2) > Channel->CurrentValue) + && (Channel->CurrentValue != 0)) + { + /* Decrease the count */ + Count -= Channel->CurrentValue / 2; + + /* Reload the value */ + Channel->CurrentValue = ReloadValue; + + /* Increment the reload count */ + ReloadCount++; + } + else + { + /* Decrease the value */ + Channel->CurrentValue -= Count * 2; + + /* Clear the count */ + Count = 0; + + /* Did it fall to zero? */ + if (Channel->CurrentValue == 0) { - /* Decrease the value */ - PitChannels[i].CurrentValue -= Count; - - /* Clear the count */ - Count = 0; - - /* Did it fall to zero? */ - if (PitChannels[i].CurrentValue == 0) - { - PitChannels[i].CurrentValue = PitChannels[i].ReloadValue; - Reloaded = TRUE; - } - } - } - - /* If there was a reload on channel 0, raise IRQ 0 */ - if ((i == 0) && Reloaded) PicInterruptRequest(0); - - break; - } - - case PIT_MODE_SQUARE_WAVE: - { - INT ReloadCount = 0; - WORD ReloadValue = PitChannels[i].ReloadValue; - - /* The reload value must be even */ - ReloadValue &= ~1; - - while (Count) - { - if (((Count * 2) > PitChannels[i].CurrentValue) - && (PitChannels[i].CurrentValue != 0)) - { - /* Decrease the count */ - Count -= PitChannels[i].CurrentValue / 2; - /* Reload the value */ - PitChannels[i].CurrentValue = ReloadValue; + Channel->CurrentValue = ReloadValue; /* Increment the reload count */ ReloadCount++; } - else - { - /* Decrease the value */ - PitChannels[i].CurrentValue -= Count * 2; - - /* Clear the count */ - Count = 0; - - /* Did it fall to zero? */ - if (PitChannels[i].CurrentValue == 0) - { - /* Reload the value */ - PitChannels[i].CurrentValue = ReloadValue; - - /* Increment the reload count */ - ReloadCount++; - } - } } - - if (ReloadCount == 0) break; - - /* Toggle the flip-flop if the number of reloads was odd */ - if (ReloadCount & 1) - { - PitChannels[i].Out = !PitChannels[i].Out; - } - - /* Was there any rising edge on channel 0 ? */ - if (((PitChannels[i].Out && (ReloadCount == 1)) - || (ReloadCount > 1)) - && (i == 0)) - { - /* Yes, IRQ 0 */ - PicInterruptRequest(0); - } - - break; - } - - case PIT_MODE_SOFTWARE_STROBE: - { - // TODO: NOT IMPLEMENTED - break; - } - - case PIT_MODE_HARDWARE_ONE_SHOT: - case PIT_MODE_HARDWARE_STROBE: - { - /* These modes do not work on x86 PCs */ - break; - } - } + } + + if (ReloadCount == 0) break; + + /* Toggle the flip-flop if the number of reloads was odd */ + if (ReloadCount & 1) + { + Channel->Out = !Channel->Out; + } + + /* Was there any rising edge on channel 0 ? */ + if (((Channel->Out && (ReloadCount == 1)) + || (ReloadCount > 1)) + && (Channel == &PitChannels[0])) + { + /* Yes, IRQ 0 */ + PicInterruptRequest(0); + } + + break; + } + + case PIT_MODE_SOFTWARE_STROBE: + { + // TODO: NOT IMPLEMENTED + break; + } + + case PIT_MODE_HARDWARE_ONE_SHOT: + case PIT_MODE_HARDWARE_STROBE: + { + /* These modes do not work on x86 PCs */ + break; + } + } +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +VOID PitClock(DWORD Count) +{ + UINT i; + + if (Count == 0) return; + + for (i = 0; i < PIT_CHANNELS; i++) + { + // if (!PitChannels[i].Couting) continue; + PitDecrementCount(&PitChannels[i], Count); } } Modified: branches/ntvdm/subsystems/ntvdm/hardware/timer.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware/timer.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware/timer.h [iso-8859-1] Sat Jan 25 18:56:12 2014 @@ -72,7 +72,7 @@ /* FUNCTIONS ******************************************************************/ -VOID PitDecrementCount(DWORD Count); +VOID PitClock(DWORD Count); DWORD PitGetResolution(VOID); VOID PitInitialize(VOID);

10 years, 11 months

[akhaldi] 61814: [STI] * Create a main header and move some inclusions to it. * Set the default debugging channel globally through the main header. * Improve the GUIDs situation. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jan 25 18:44:55 2014 New Revision: 61814 URL: http://svn.reactos.org/svn/reactos?rev=61814&view=rev Log: [STI] * Create a main header and move some inclusions to it. * Set the default debugging channel globally through the main header. * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/dll/win32/sti/guid.c (with props) trunk/reactos/dll/win32/sti/precomp.h (with props) Modified: trunk/reactos/dll/win32/sti/CMakeLists.txt trunk/reactos/dll/win32/sti/sti.c trunk/reactos/dll/win32/sti/sti_main.c Modified: trunk/reactos/dll/win32/sti/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/sti/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sti/CMakeLists.txt [iso-8859-1] Sat Jan 25 18:44:55 2014 @@ -11,6 +11,7 @@ list(APPEND SOURCE sti.c sti_main.c + guid.c ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c ${CMAKE_CURRENT_BINARY_DIR}/sti_wia_p.c ${CMAKE_CURRENT_BINARY_DIR}/sti.def) Added: trunk/reactos/dll/win32/sti/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/guid.c?rev=6… ============================================================================== --- trunk/reactos/dll/win32/sti/guid.c (added) +++ trunk/reactos/dll/win32/sti/guid.c [iso-8859-1] Sat Jan 25 18:44:55 2014 @@ -0,0 +1,14 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <initguid.h> +#include <sti.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/win32/sti/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/sti/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/precomp.h?re… ============================================================================== --- trunk/reactos/dll/win32/sti/precomp.h (added) +++ trunk/reactos/dll/win32/sti/precomp.h [iso-8859-1] Sat Jan 25 18:44:55 2014 @@ -0,0 +1,19 @@ +#ifndef _STI_PCH_ +#define _STI_PCH_ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <sti.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(sti); + +#endif /* _STI_PCH_ */ Propchange: trunk/reactos/dll/win32/sti/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/sti/sti.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/sti.c?rev=61… ============================================================================== --- trunk/reactos/dll/win32/sti/sti.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sti/sti.c [iso-8859-1] Sat Jan 25 18:44:55 2014 @@ -17,25 +17,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> +#include "precomp.h" + #include <winreg.h> -//#include "winerror.h" -//#include "objbase.h" -#include <sti.h> - -#include <wine/debug.h> + #include <wine/unicode.h> - -WINE_DEFAULT_DEBUG_CHANNEL(sti); static const WCHAR registeredAppsLaunchPath[] = { 'S','O','F','T','W','A','R','E','\\', Modified: trunk/reactos/dll/win32/sti/sti_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/sti_main.c?r… ============================================================================== --- trunk/reactos/dll/win32/sti/sti_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sti/sti_main.c [iso-8859-1] Sat Jan 25 18:44:55 2014 @@ -17,26 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winreg.h" -//#include "winerror.h" -//#include "objbase.h" -#include <initguid.h> -//#include "wia_lh.h" -#include <sti.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(sti); +#include "precomp.h" extern HRESULT WINAPI STI_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN; extern BOOL WINAPI STI_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN;

10 years, 11 months

[akhaldi] 61813: [SMDLL] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jan 25 18:07:29 2014 New Revision: 61813 URL: http://svn.reactos.org/svn/reactos?rev=61813&view=rev Log: [SMDLL] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/win32/smdll/dllmain.c trunk/reactos/dll/win32/smdll/precomp.h trunk/reactos/dll/win32/smdll/query.c Modified: trunk/reactos/dll/win32/smdll/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/smdll/dllmain.c?… ============================================================================== --- trunk/reactos/dll/win32/smdll/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/smdll/dllmain.c [iso-8859-1] Sat Jan 25 18:07:29 2014 @@ -5,7 +5,7 @@ * PURPOSE: SM Helper Library */ -#include "precomp.h" +#include <windef.h> BOOL WINAPI DllMainCRTStartup(HANDLE hinstDll, DWORD fdwReason, LPVOID fImpLoad) { Modified: trunk/reactos/dll/win32/smdll/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/smdll/precomp.h?… ============================================================================== --- trunk/reactos/dll/win32/smdll/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/smdll/precomp.h [iso-8859-1] Sat Jan 25 18:07:29 2014 @@ -1,4 +1,5 @@ -#define NTOS_MODE_USER -#include <ndk/lpctypes.h> -#include <ndk/lpcfuncs.h> -#include <sm/helper.h> +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> Modified: trunk/reactos/dll/win32/smdll/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/smdll/query.c?re… ============================================================================== --- trunk/reactos/dll/win32/smdll/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/smdll/query.c [iso-8859-1] Sat Jan 25 18:07:29 2014 @@ -6,6 +6,11 @@ */ #include "precomp.h" + +#define NTOS_MODE_USER +#include <ndk/lpctypes.h> +#include <ndk/lpcfuncs.h> +#include <sm/helper.h> #define NDEBUG #include <debug.h>

10 years, 11 months

[akhaldi] 61812: [SHELL32] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jan 25 17:24:24 2014 New Revision: 61812 URL: http://svn.reactos.org/svn/reactos?rev=61812&view=rev Log: [SHELL32] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/win32/shell32/CMenuBand.cpp trunk/reactos/dll/win32/shell32/CMenuBand.h trunk/reactos/dll/win32/shell32/CMenuDeskBar.cpp trunk/reactos/dll/win32/shell32/CMenuDeskBar.h trunk/reactos/dll/win32/shell32/authors.cpp trunk/reactos/dll/win32/shell32/autocomplete.h trunk/reactos/dll/win32/shell32/brsfolder.cpp trunk/reactos/dll/win32/shell32/changenotify.cpp trunk/reactos/dll/win32/shell32/control.cpp trunk/reactos/dll/win32/shell32/dialogs.cpp trunk/reactos/dll/win32/shell32/dragdrophelper.h trunk/reactos/dll/win32/shell32/drvdefext.cpp trunk/reactos/dll/win32/shell32/drvdefext.h trunk/reactos/dll/win32/shell32/enumidlist.h trunk/reactos/dll/win32/shell32/filedefext.h trunk/reactos/dll/win32/shell32/folder_options.cpp trunk/reactos/dll/win32/shell32/folders/admintools.cpp trunk/reactos/dll/win32/shell32/folders/admintools.h trunk/reactos/dll/win32/shell32/folders/cpanel.h trunk/reactos/dll/win32/shell32/folders/desktop.h trunk/reactos/dll/win32/shell32/folders/fonts.h trunk/reactos/dll/win32/shell32/folders/fs.h trunk/reactos/dll/win32/shell32/folders/mycomp.h trunk/reactos/dll/win32/shell32/folders/mydocuments.h trunk/reactos/dll/win32/shell32/folders/netplaces.h trunk/reactos/dll/win32/shell32/folders/printers.cpp trunk/reactos/dll/win32/shell32/folders/printers.h trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp trunk/reactos/dll/win32/shell32/folders/recyclebin.h trunk/reactos/dll/win32/shell32/newmenu.h trunk/reactos/dll/win32/shell32/openwithmenu.h trunk/reactos/dll/win32/shell32/pidl.h trunk/reactos/dll/win32/shell32/precomp.h trunk/reactos/dll/win32/shell32/shell32_main.cpp trunk/reactos/dll/win32/shell32/shell32_main.h trunk/reactos/dll/win32/shell32/shell32_version.h trunk/reactos/dll/win32/shell32/shellitem.h trunk/reactos/dll/win32/shell32/shelllink.cpp trunk/reactos/dll/win32/shell32/shelllink.h trunk/reactos/dll/win32/shell32/shellord.cpp trunk/reactos/dll/win32/shell32/shellpath.cpp trunk/reactos/dll/win32/shell32/shfldr.h trunk/reactos/dll/win32/shell32/shlfileop.cpp trunk/reactos/dll/win32/shell32/shlview.cpp trunk/reactos/dll/win32/shell32/startmenu.h trunk/reactos/dll/win32/shell32/xdg.h Modified: trunk/reactos/dll/win32/shell32/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMenuBan… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMenuBand.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMenuBand.cpp [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -7,6 +7,7 @@ */ #include "precomp.h" + #include <windowsx.h> WINE_DEFAULT_DEBUG_CHANNEL(CMenuBand); Modified: trunk/reactos/dll/win32/shell32/CMenuBand.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMenuBan… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMenuBand.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMenuBand.h [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -1,3 +1,4 @@ +#pragma once class CMenuBand; @@ -160,4 +161,4 @@ COM_INTERFACE_ENTRY_IID(IID_IShellMenuAcc, IShellMenuAcc) END_COM_MAP() -}; +}; Modified: trunk/reactos/dll/win32/shell32/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMenuDes… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMenuDeskBar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMenuDeskBar.cpp [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -1,4 +1,3 @@ - #include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); Modified: trunk/reactos/dll/win32/shell32/CMenuDeskBar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMenuDes… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMenuDeskBar.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMenuDeskBar.h [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -1,3 +1,4 @@ +#pragma once class CMenuDeskBar: public CComCoClass<CMenuDeskBar, &CLSID_MenuDeskBar>, Modified: trunk/reactos/dll/win32/shell32/authors.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/authors.… ============================================================================== --- trunk/reactos/dll/win32/shell32/authors.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/authors.cpp [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -1,2 +1 @@ - const char * const SHELL_Authors[] = { "Copyright 1993-2012 WINE team", "Copyright 1998-2012 ReactOS Team", 0 }; Modified: trunk/reactos/dll/win32/shell32/autocomplete.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/autocomp… ============================================================================== --- trunk/reactos/dll/win32/shell32/autocomplete.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/autocomplete.h [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -63,4 +63,4 @@ END_COM_MAP() }; -#endif // _AUTOCOMPLETE_H_ +#endif /* _AUTOCOMPLETE_H_ */ Modified: trunk/reactos/dll/win32/shell32/brsfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/brsfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/brsfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/brsfolder.cpp [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -24,7 +24,6 @@ */ #include "precomp.h" - WINE_DEFAULT_DEBUG_CHANNEL(shell); Modified: trunk/reactos/dll/win32/shell32/changenotify.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/changeno… ============================================================================== --- trunk/reactos/dll/win32/shell32/changenotify.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/changenotify.cpp [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -19,7 +19,6 @@ */ #include "precomp.h" - WINE_DEFAULT_DEBUG_CHANNEL(shell); Modified: trunk/reactos/dll/win32/shell32/control.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/control.… ============================================================================== --- trunk/reactos/dll/win32/shell32/control.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/control.cpp [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -16,7 +16,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - #include "precomp.h" Modified: trunk/reactos/dll/win32/shell32/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs.… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs.cpp [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -19,7 +19,6 @@ */ #include "precomp.h" - typedef struct { Modified: trunk/reactos/dll/win32/shell32/dragdrophelper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dragdrop… ============================================================================== --- trunk/reactos/dll/win32/shell32/dragdrophelper.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dragdrophelper.h [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -50,4 +50,4 @@ END_COM_MAP() }; -#endif // _DRAGDROPHELPER_H_ +#endif /* _DRAGDROPHELPER_H_ */ Modified: trunk/reactos/dll/win32/shell32/drvdefext.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drvdefex… ============================================================================== --- trunk/reactos/dll/win32/shell32/drvdefext.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/drvdefext.cpp [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -19,8 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "precomp.h" + #define _USE_MATH_DEFINES -#include "precomp.h" #include <math.h> WINE_DEFAULT_DEBUG_CHANNEL(shell); Modified: trunk/reactos/dll/win32/shell32/drvdefext.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drvdefex… ============================================================================== --- trunk/reactos/dll/win32/shell32/drvdefext.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/drvdefext.h [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -19,7 +19,7 @@ */ #ifndef _DRV_DEF_EXT_H_ -#define _FILE_DEF_EXT_H_ +#define _DRV_DEF_EXT_H_ class CDrvDefExt : public CComCoClass<CDrvDefExt, &CLSID_ShellDrvDefExt>, @@ -72,5 +72,4 @@ END_COM_MAP() }; -#endif // _FILE_DEF_EXT_H_ - +#endif /* _DRV_DEF_EXT_H_ */ Modified: trunk/reactos/dll/win32/shell32/enumidlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/enumidli… ============================================================================== --- trunk/reactos/dll/win32/shell32/enumidlist.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/enumidlist.h [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -13,6 +13,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #ifndef __ENUMIDLIST_H__ #define __ENUMIDLIST_H__ @@ -49,4 +50,4 @@ END_COM_MAP() }; -#endif /* ndef __ENUMIDLIST_H__ */ +#endif /* __ENUMIDLIST_H__ */ Modified: trunk/reactos/dll/win32/shell32/filedefext.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/filedefe… ============================================================================== --- trunk/reactos/dll/win32/shell32/filedefext.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/filedefext.h [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -116,4 +116,4 @@ END_COM_MAP() }; -#endif // _FILE_DEF_EXT_H_ +#endif /* _FILE_DEF_EXT_H_ */ Modified: trunk/reactos/dll/win32/shell32/folder_options.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folder_o… ============================================================================== --- trunk/reactos/dll/win32/shell32/folder_options.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folder_options.cpp [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -20,8 +20,8 @@ #include "precomp.h" - WINE_DEFAULT_DEBUG_CHANNEL (fprop); + #define MAX_PROPERTY_SHEET_PAGE (32) /// Folder Options: Modified: trunk/reactos/dll/win32/shell32/folders/admintools.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/admintools.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/admintools.cpp [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -22,7 +22,6 @@ #include <precomp.h> WINE_DEFAULT_DEBUG_CHANNEL (shell); - /* This folder should not exist. It is just a file system folder... Modified: trunk/reactos/dll/win32/shell32/folders/admintools.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/admintools.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/admintools.h [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -84,4 +84,4 @@ END_COM_MAP() }; -#endif // _SHFLDR_ADMINTOOLS_H_ +#endif /* _SHFLDR_ADMINTOOLS_H_ */ Modified: trunk/reactos/dll/win32/shell32/folders/cpanel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/cpanel.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/cpanel.h [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -107,4 +107,4 @@ END_COM_MAP() }; -#endif // _SHFLDR_CPANEL_H_ +#endif /* _SHFLDR_CPANEL_H_ */ Modified: trunk/reactos/dll/win32/shell32/folders/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/desktop.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/desktop.h [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -105,4 +105,4 @@ END_COM_MAP() }; -#endif // _CDESKTOPFOLDER_H_ +#endif /* _CDESKTOPFOLDER_H_ */ Modified: trunk/reactos/dll/win32/shell32/folders/fonts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/fonts.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/fonts.h [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -92,4 +92,4 @@ END_COM_MAP() }; -#endif // _SHFLDR_FONTS_H_ +#endif /* _SHFLDR_FONTS_H_ */ Modified: trunk/reactos/dll/win32/shell32/folders/fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/fs.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/fs.h [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -126,4 +126,4 @@ DWORD pdwEffect; }; -#endif // _CFSFOLDER_H_ +#endif /* _CFSFOLDER_H_ */ Modified: trunk/reactos/dll/win32/shell32/folders/mycomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/mycomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/mycomp.h [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -82,4 +82,4 @@ END_COM_MAP() }; -#endif // _CDRIVESFOLDER_H_ +#endif /* _CDRIVESFOLDER_H_ */ Modified: trunk/reactos/dll/win32/shell32/folders/mydocuments.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/mydocuments.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/mydocuments.h [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -81,4 +81,4 @@ END_COM_MAP() }; -#endif // _SHFLDR_MYDOCUMENTS_H_ +#endif /* _SHFLDR_MYDOCUMENTS_H_ */ Modified: trunk/reactos/dll/win32/shell32/folders/netplaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/netplaces.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/netplaces.h [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -82,4 +82,4 @@ END_COM_MAP() }; -#endif // _SHFLDR_NETPLACES_H_ +#endif /* _SHFLDR_NETPLACES_H_ */ Modified: trunk/reactos/dll/win32/shell32/folders/printers.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/printers.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/printers.cpp [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -22,6 +22,8 @@ */ #include <precomp.h> + +#include <winspool.h> WINE_DEFAULT_DEBUG_CHANNEL (shell); Modified: trunk/reactos/dll/win32/shell32/folders/printers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/printers.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/printers.h [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -85,4 +85,4 @@ END_COM_MAP() }; -#endif // _SHFLDR_PRINTERS_H_ +#endif /* _SHFLDR_PRINTERS_H_ */ Modified: trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -19,9 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <precomp.h> + +#include <ntquery.h> + #define MAX_PROPERTY_SHEET_PAGE 32 - -#include <precomp.h> WINE_DEFAULT_DEBUG_CHANNEL(CRecycleBin); Modified: trunk/reactos/dll/win32/shell32/folders/recyclebin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/recyclebin.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/recyclebin.h [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -110,4 +110,4 @@ END_COM_MAP() }; -#endif // _SHFLDR_RECYCLEBIN_H_ +#endif /* _SHFLDR_RECYCLEBIN_H_ */ Modified: trunk/reactos/dll/win32/shell32/newmenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/newmenu.… ============================================================================== --- trunk/reactos/dll/win32/shell32/newmenu.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/newmenu.h [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -99,4 +99,4 @@ END_COM_MAP() }; -#endif // _SHV_ITEM_NEW_H_ +#endif /* _SHV_ITEM_NEW_H_ */ Modified: trunk/reactos/dll/win32/shell32/openwithmenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/openwith… ============================================================================== --- trunk/reactos/dll/win32/shell32/openwithmenu.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/openwithmenu.h [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -68,4 +68,4 @@ END_COM_MAP() }; -#endif // _SHE_OCMENU_H_ +#endif /* _SHE_OCMENU_H_ */ Modified: trunk/reactos/dll/win32/shell32/pidl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.h?r… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/pidl.h [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -302,4 +302,4 @@ BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR path, DWORD type); -#endif +#endif /* __WINE_PIDL_H */ Modified: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… ============================================================================== --- trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -12,33 +12,23 @@ #include <windef.h> #include <winbase.h> -#include <wingdi.h> #include <winreg.h> #include <winuser.h> #include <wincon.h> -#include <shellapi.h> #include <commdlg.h> #include <ddeml.h> -#include <mmsystem.h> -#include <winspool.h> #include <shlguid_undoc.h> #include <shlwapi.h> #include <shlobj.h> #include <shlobj_undoc.h> #include <shlwapi_undoc.h> -#include <appmgmt.h> -#include <ntquery.h> #include <recyclebin.h> #include <ndk/rtlfuncs.h> #include <fmifs/fmifs.h> -#include <sddl.h> -#include <commoncontrols.h> - #include <tchar.h> #include <strsafe.h> #include <atlbase.h> #include <atlcom.h> -#include <atlwin.h> //#include "base/shell/explorer-new/todo.h" //#include "dlgs.h" @@ -51,8 +41,6 @@ #include "enumidlist.h" #include "shfldr.h" #include "shellfolder.h" -#include "xdg.h" - #include "shellitem.h" #include "shelllink.h" #include "dragdrophelper.h" @@ -76,6 +64,7 @@ #include "CMenuDeskBar.h" #include <wine/debug.h> +#include <wine/unicode.h> extern const GUID CLSID_AdminFolderShortcut; extern const GUID CLSID_FontsFolderShortcut; @@ -87,4 +76,4 @@ extern const GUID SHELL32_AdvtShortcutProduct; extern const GUID SHELL32_AdvtShortcutComponent; -#endif +#endif /* _PRECOMP_H__ */ Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -20,6 +20,7 @@ */ #include "precomp.h" + #include "shell32_version.h" #include <reactos/version.h> Modified: trunk/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -21,9 +21,6 @@ #ifndef __WINE_SHELL_MAIN_H #define __WINE_SHELL_MAIN_H - -#include <wine/unicode.h> - /******************************************* * global SHELL32.DLL variables @@ -205,4 +202,4 @@ EXTERN_C HRESULT WINAPI DoRegisterServer(void); EXTERN_C HRESULT WINAPI DoUnregisterServer(void); -#endif +#endif /* __WINE_SHELL_MAIN_H */ Modified: trunk/reactos/dll/win32/shell32/shell32_version.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_version.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_version.h [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma once + #define WINE_FILEVERSION_MAJOR 5 #define WINE_FILEVERSION_MINOR 0 #define WINE_FILEVERSION_BUILD 3900 Modified: trunk/reactos/dll/win32/shell32/shellitem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellite… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellitem.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellitem.h [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -60,4 +60,4 @@ END_COM_MAP() }; -#endif // _SHELLITEM_H_ +#endif /* _SHELLITEM_H_ */ Modified: trunk/reactos/dll/win32/shell32/shelllink.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelllink.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelllink.cpp [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -36,6 +36,8 @@ #include "precomp.h" +#include <appmgmt.h> + WINE_DEFAULT_DEBUG_CHANNEL(shell); #define SHLINK_LOCAL 0 Modified: trunk/reactos/dll/win32/shell32/shelllink.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelllink.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelllink.h [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -179,4 +179,4 @@ END_COM_MAP() }; -#endif // _SHELLLINK_H_ +#endif /* _SHELLLINK_H_ */ Modified: trunk/reactos/dll/win32/shell32/shellord.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellord.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellord.cpp [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -21,6 +21,9 @@ */ #include "precomp.h" + +#include <mmsystem.h> +#include <commoncontrols.h> WINE_DEFAULT_DEBUG_CHANNEL(shell); WINE_DECLARE_DEBUG_CHANNEL(pidl); 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] Sat Jan 25 17:24:24 2014 @@ -25,6 +25,8 @@ */ #include "precomp.h" + +#include <sddl.h> WINE_DEFAULT_DEBUG_CHANNEL(shell); Modified: trunk/reactos/dll/win32/shell32/shfldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr.h… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -75,4 +75,4 @@ void SHELL_FS_ProcessDisplayFilename(LPWSTR szPath, DWORD dwFlags); BOOL SHELL_FS_HideExtension(LPWSTR pwszPath); -#endif // _SHFLDR_H_ +#endif /* _SHFLDR_H_ */ Modified: trunk/reactos/dll/win32/shell32/shlfileop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -21,8 +21,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#define NO_SHLWAPI_STREAM #include "precomp.h" + +#include "xdg.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); Modified: trunk/reactos/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -49,6 +49,8 @@ */ #include "precomp.h" + +#include <atlwin.h> WINE_DEFAULT_DEBUG_CHANNEL(shell); Modified: trunk/reactos/dll/win32/shell32/startmenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/startmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/startmenu.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/startmenu.h [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -152,4 +152,4 @@ END_COM_MAP() }; -#endif // _STARTMENU_H_ +#endif /* _STARTMENU_H_ */ Modified: trunk/reactos/dll/win32/shell32/xdg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/xdg.h?re… ============================================================================== --- trunk/reactos/dll/win32/shell32/xdg.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/xdg.h [iso-8859-1] Sat Jan 25 17:24:24 2014 @@ -13,6 +13,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #ifndef __XDG_H__ #define __XDG_H__ @@ -48,4 +49,4 @@ void TRASH_DisposeElement(TRASH_ELEMENT *element); -#endif /* ndef __XDG_H__ */ +#endif /* __XDG_H__ */

10 years, 11 months

[akhaldi] 61811: [SHDOCVW] * Improve header inclusions. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jan 25 17:11:51 2014 New Revision: 61811 URL: http://svn.reactos.org/svn/reactos?rev=61811&view=rev Log: [SHDOCVW] * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.h Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw.h [iso-8859-1] Sat Jan 25 17:11:51 2014 @@ -22,7 +22,7 @@ #ifndef __WINE_SHDOCVW_H #define __WINE_SHDOCVW_H -#include <config.h> +#include <wine/config.h> #include <stdarg.h> @@ -34,10 +34,9 @@ #include <windef.h> #include <winbase.h> +#include <winnls.h> #include <winreg.h> #include <shlobj.h> - -#include <wine/unicode.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);

10 years, 11 months

[hbelusca] 61810: [NTVDM] Big PIT fix Part 1/X Currently, sound frequency is fixed (in Advanced NetWars, Rover, Dave)

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jan 25 17:00:09 2014 New Revision: 61810 URL: http://svn.reactos.org/svn/reactos?rev=61810&view=rev Log: [NTVDM] Big PIT fix Part 1/X Currently, sound frequency is fixed (in Advanced NetWars, Rover, Dave) Modified: branches/ntvdm/subsystems/ntvdm/hardware/timer.c branches/ntvdm/subsystems/ntvdm/hardware/timer.h Modified: branches/ntvdm/subsystems/ntvdm/hardware/timer.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware/timer.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware/timer.c [iso-8859-1] Sat Jan 25 17:00:09 2014 @@ -2,8 +2,10 @@ * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine * FILE: timer.c - * PURPOSE: Programmable Interval Timer emulation + * PURPOSE: Programmable Interval Timer emulation - + * i82C54/8254 compatible * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ /* INCLUDES *******************************************************************/ @@ -22,25 +24,139 @@ /* PRIVATE FUNCTIONS **********************************************************/ +static VOID PitLatchChannelStatus(BYTE Channel) +{ + if (Channel >= PIT_CHANNELS) return; + + /* + * A given counter can be latched only one time until it gets unlatched. + * If the counter is latched and then is latched again later before the + * value is read, then this last latch command is ignored and the value + * will be the value at the time the first command was issued. + */ + if (PitChannels[Channel].LatchStatusSet == FALSE) + { + BYTE StatusLatch = 0; + /* HACK!! */BYTE NullCount = 0;/* HACK!! */ + + StatusLatch = PitChannels[Channel].Out << 7 | NullCount << 6; + StatusLatch |= (PitChannels[Channel].ReadWriteMode & 0x03) << 4; + StatusLatch |= (PitChannels[Channel].Mode & 0x07) << 1; + StatusLatch |= (PitChannels[Channel].Bcd & 0x01); + + PitChannels[Channel].LatchStatusSet = TRUE; + PitChannels[Channel].StatusLatch = StatusLatch; + } +} + +static VOID PitLatchChannelCount(BYTE Channel) +{ + if (Channel >= PIT_CHANNELS) return; + + /* + * A given counter can be latched only one time until it gets unlatched. + * If the counter is latched and then is latched again later before the + * value is read, then this last latch command is ignored and the value + * will be the value at the time the first command was issued. + */ + if (PitChannels[Channel].ReadStatus == 0x00) + { + PitChannels[Channel].ReadStatus = PitChannels[Channel].ReadWriteMode; + + /* Convert the current value to BCD if needed */ + PitChannels[Channel].OutputLatch = READ_PIT_VALUE(PitChannels[Channel], + PitChannels[Channel].CurrentValue); + } +} + +static VOID PitSetOut(PPIT_CHANNEL Channel, BOOLEAN State) +{ + if (State == Channel->Out) return; + + /* Set the new state of the OUT pin */ + Channel->Out = State; + + // /* Call the callback */ + // if (Channel->OutFunction) Channel->OutFunction(Channel->OutParam, State); +} + +static VOID PitInitCounter(PPIT_CHANNEL Channel) +{ + switch (Channel->Mode) + { + case PIT_MODE_INT_ON_TERMINAL_COUNT: + PitSetOut(Channel, FALSE); + break; + + case PIT_MODE_HARDWARE_ONE_SHOT: + case PIT_MODE_RATE_GENERATOR: + case PIT_MODE_SQUARE_WAVE: + case PIT_MODE_SOFTWARE_STROBE: + case PIT_MODE_HARDWARE_STROBE: + PitSetOut(Channel, TRUE); + break; + } +} + static VOID PitWriteCommand(BYTE Value) { - BYTE Channel = Value >> 6; - BYTE Mode = (Value >> 1) & 0x07; - - /* Check if this is a counter latch command */ - if (((Value >> 4) & 3) == 0) - { - PitChannels[Channel].LatchSet = TRUE; - PitChannels[Channel].LatchedValue = PitChannels[Channel].CurrentValue; + BYTE Channel = (Value >> 6) & 0x03; + BYTE ReadWriteMode = (Value >> 4) & 0x03; + BYTE Mode = (Value >> 1) & 0x07; + BOOLEAN IsBcd = Value & 0x01; + + /* + * Check for valid PIT channel - Possible values: 0, 1, 2. + * A value of 3 is for Read-Back Command. + */ + if (Channel > PIT_CHANNELS) return; + + /* Read-Back Command */ + if (Channel == PIT_CHANNELS) + { + if ((Value & 0x20) == 0) // Bit 5 (Count) == 0: We latch multiple counters' counts + { + if (Value & 0x02) PitLatchChannelCount(0); + if (Value & 0x04) PitLatchChannelCount(1); + if (Value & 0x08) PitLatchChannelCount(2); + } + if ((Value & 0x10) == 0) // Bit 4 (Status) == 0: We latch multiple counters' statuses + { + if (Value & 0x02) PitLatchChannelStatus(0); + if (Value & 0x04) PitLatchChannelStatus(1); + if (Value & 0x08) PitLatchChannelStatus(2); + } return; } - /* Set the access mode and reset flip-flops */ - PitChannels[Channel].AccessMode = (Value >> 4) & 3; + /* Check if this is a counter latch command... */ + if (ReadWriteMode == 0) + { + PitLatchChannelCount(Channel); + return; + } + + /* ... otherwise, set the modes and reset flip-flops */ + PitChannels[Channel].ReadWriteMode = ReadWriteMode; + + PitChannels[Channel].LatchStatusSet = FALSE; + PitChannels[Channel].StatusLatch = 0x00; + + PitChannels[Channel].ReadStatus = 0x00; + PitChannels[Channel].WriteStatus = 0x00; + + PitChannels[Channel].CountRegister = 0x00; + PitChannels[Channel].OutputLatch = 0x00; + PitChannels[Channel].Pulsed = FALSE; - PitChannels[Channel].LatchSet = FALSE; - PitChannels[Channel].InputFlipFlop = FALSE; - PitChannels[Channel].OutputFlipFlop = FALSE; + + + // PitChannels[Channel].Out = FALSE; // <-- unneeded, see the PitInitCounter call below. + + /* Fix the current value if we switch to BCD counting */ + PitChannels[Channel].Bcd = IsBcd; + if (IsBcd && PitChannels[Channel].CurrentValue > 9999) + PitChannels[Channel].CurrentValue = 9999; switch (Mode) { @@ -56,96 +172,92 @@ } case 6: - { - PitChannels[Channel].Mode = PIT_MODE_RATE_GENERATOR; - break; - } - case 7: { - PitChannels[Channel].Mode = PIT_MODE_SQUARE_WAVE; - break; - } - } + /* + * Modes 6 and 7 become PIT_MODE_RATE_GENERATOR + * and PIT_MODE_SQUARE_WAVE respectively. + */ + PitChannels[Channel].Mode = Mode - 4; + break; + } + } + + PitInitCounter(&PitChannels[Channel]); } static BYTE PitReadData(BYTE Channel) { - WORD CurrentValue = PitChannels[Channel].CurrentValue; - BYTE AccessMode = PitChannels[Channel].AccessMode; - - /* Check if the value was latched */ - if (PitChannels[Channel].LatchSet) - { - CurrentValue = PitChannels[Channel].LatchedValue; - - if (AccessMode == 1 || AccessMode == 2) - { - /* The latched value was read as one byte */ - PitChannels[Channel].LatchSet = FALSE; - } - } - - /* Use the flip-flop for access mode 3 */ - if (AccessMode == 3) - { - AccessMode = PitChannels[Channel].InputFlipFlop ? 1 : 2; - PitChannels[Channel].InputFlipFlop = !PitChannels[Channel].InputFlipFlop; - - /* Check if this was the last read for the latched value */ - if (!PitChannels[Channel].InputFlipFlop) - { - /* Yes, the latch value was read as two bytes */ - PitChannels[Channel].LatchSet = FALSE; - } - } - - switch (AccessMode) - { - case 1: - { - /* Low byte */ - return CurrentValue & 0x00FF; - } - - case 2: - { - /* High byte */ - return CurrentValue >> 8; - } + LPBYTE ReadWriteMode = NULL; + LPWORD CurrentValue = NULL; + + /* + * If the status was latched, the first read operation + * will return the latched status, whichever the count + * value or the status was latched first. + */ + if (PitChannels[Channel].LatchStatusSet) + { + PitChannels[Channel].LatchStatusSet = FALSE; + return PitChannels[Channel].StatusLatch; + } + + /* To be able to read the count asynchronously, latch it first if needed */ + if (PitChannels[Channel].ReadStatus == 0) PitLatchChannelCount(Channel); + + /* The count is now latched */ + ASSERT(PitChannels[Channel].ReadStatus != 0); + + ReadWriteMode = &PitChannels[Channel].ReadStatus ; + CurrentValue = &PitChannels[Channel].OutputLatch; + + if (*ReadWriteMode & 1) + { + /* Read LSB */ + *ReadWriteMode &= ~1; + return LOBYTE(*CurrentValue); + } + + if (*ReadWriteMode & 2) + { + /* Read MSB */ + *ReadWriteMode &= ~2; + return HIBYTE(*CurrentValue); } /* Shouldn't get here */ + ASSERT(FALSE); return 0; } static VOID PitWriteData(BYTE Channel, BYTE Value) { - BYTE AccessMode = PitChannels[Channel].AccessMode; - - /* Use the flip-flop for access mode 3 */ - if (PitChannels[Channel].AccessMode == 3) - { - AccessMode = PitChannels[Channel].InputFlipFlop ? 1 : 2; - PitChannels[Channel].InputFlipFlop = !PitChannels[Channel].InputFlipFlop; - } - - switch (AccessMode) - { - case 1: - { - /* Low byte */ - PitChannels[Channel].ReloadValue &= 0xFF00; - PitChannels[Channel].ReloadValue |= Value; - break; - } - - case 2: - { - /* High byte */ - PitChannels[Channel].ReloadValue &= 0x00FF; - PitChannels[Channel].ReloadValue |= Value << 8; - } + LPBYTE ReadWriteMode = NULL; + + if (PitChannels[Channel].WriteStatus == 0x00) + { + PitChannels[Channel].WriteStatus = PitChannels[Channel].ReadWriteMode; + } + + ReadWriteMode = &PitChannels[Channel].WriteStatus; + + if (*ReadWriteMode & 1) + { + /* Write LSB */ + *ReadWriteMode &= ~1; + + PitChannels[Channel].ReloadValue &= 0xFF00; + PitChannels[Channel].ReloadValue |= Value; + return; + } + else if (*ReadWriteMode & 2) + { + /* Write MSB */ + *ReadWriteMode &= ~2; + + PitChannels[Channel].ReloadValue &= 0x00FF; + PitChannels[Channel].ReloadValue |= Value << 8; + return; } } @@ -302,11 +414,11 @@ /* Toggle the flip-flop if the number of reloads was odd */ if (ReloadCount & 1) { - PitChannels[i].OutputFlipFlop = !PitChannels[i].OutputFlipFlop; + PitChannels[i].Out = !PitChannels[i].Out; } /* Was there any rising edge on channel 0 ? */ - if (((PitChannels[i].OutputFlipFlop && (ReloadCount == 1)) + if (((PitChannels[i].Out && (ReloadCount == 1)) || (ReloadCount > 1)) && (i == 0)) { Modified: branches/ntvdm/subsystems/ntvdm/hardware/timer.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware/timer.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware/timer.h [iso-8859-1] Sat Jan 25 17:00:09 2014 @@ -2,8 +2,10 @@ * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine * FILE: timer.h - * PURPOSE: Programmable Interval Timer emulation + * PURPOSE: Programmable Interval Timer emulation - + * i82C54/8254 compatible * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ #ifndef _TIMER_H_ @@ -20,7 +22,13 @@ #define PIT_DATA_PORT(x) (0x40 + (x)) #define PIT_COMMAND_PORT 0x43 -enum +#define WRITE_PIT_VALUE(PitChannel, Value) \ + (PitChannel).Bcd ? BCD_TO_BINARY(Value) : (Value) + +#define READ_PIT_VALUE(PitChannel, Value) \ + (PitChannel).Bcd ? BINARY_TO_BCD(Value) : (Value) + +typedef enum _PIT_MODE { PIT_MODE_INT_ON_TERMINAL_COUNT, PIT_MODE_HARDWARE_ONE_SHOT, @@ -28,19 +36,36 @@ PIT_MODE_SQUARE_WAVE, PIT_MODE_SOFTWARE_STROBE, PIT_MODE_HARDWARE_STROBE -}; +} PIT_MODE, *PPIT_MODE; typedef struct _PIT_CHANNEL { - WORD ReloadValue; - WORD CurrentValue; - WORD LatchedValue; - INT Mode; BOOLEAN Pulsed; - BOOLEAN LatchSet; - BOOLEAN InputFlipFlop; - BOOLEAN OutputFlipFlop; - BYTE AccessMode; + + + /* PIT Status members */ + PIT_MODE Mode; + BOOLEAN Bcd; + BYTE ReadWriteMode; // 0 --> Counter Latch ; 1 --> LSB R/W ; 2 --> MSB R/W ; 3 --> LSB then MSB R/W + + /* Reading the PIT status byte */ + BOOLEAN LatchStatusSet; + BYTE StatusLatch; + + /* For interleaving reading and writing in 2-byte RW mode */ + BYTE ReadStatus; // Same convention as ReadWriteMode + BYTE WriteStatus; // Same convention as ReadWriteMode + + /**/WORD CountRegister;/**/ // Our ReloadValue ??? + WORD OutputLatch; + /*******************************/ + + WORD ReloadValue; // Max value of the counter + WORD CurrentValue; // Real value of the counter + + /* PIT Output */ + BOOLEAN Out; // 0: Low ; 1: High + } PIT_CHANNEL, *PPIT_CHANNEL; extern PPIT_CHANNEL PitChannel2; // Needed for PC Speaker

10 years, 11 months

[hbelusca] 61809: [NTVDM] Welcome sound in Advanced NetWars! However it won't work totally due to problems in the PIT or in the sound emulation (and as a result, the emulator will "hang").

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jan 25 16:23:27 2014 New Revision: 61809 URL: http://svn.reactos.org/svn/reactos?rev=61809&view=rev Log: [NTVDM] Welcome sound in Advanced NetWars! However it won't work totally due to problems in the PIT or in the sound emulation (and as a result, the emulator will "hang"). Modified: branches/ntvdm/subsystems/ntvdm/bios/bios.c Modified: branches/ntvdm/subsystems/ntvdm/bios/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios.c [iso-8859-1] Sat Jan 25 16:23:27 2014 @@ -269,10 +269,23 @@ IOWriteB(PIC_SLAVE_DATA , 0xFF); - /* Initialize the PIT */ + /* Initialize PIT Counter 0 */ IOWriteB(PIT_COMMAND_PORT, 0x34); IOWriteB(PIT_DATA_PORT(0), 0x00); IOWriteB(PIT_DATA_PORT(0), 0x00); + // PitSetGate(0, TRUE); + + /* Initialize PIT Counter 1 */ + IOWriteB(PIT_COMMAND_PORT, 0x74); + IOWriteB(PIT_DATA_PORT(1), 0x00); + IOWriteB(PIT_DATA_PORT(1), 0x00); + // PitSetGate(1, TRUE); + + /* Initialize PIT Counter 2 */ + IOWriteB(PIT_COMMAND_PORT, 0xB4); + IOWriteB(PIT_DATA_PORT(2), 0x00); + IOWriteB(PIT_DATA_PORT(2), 0x00); + // PitSetGate(2, FALSE); // PitSetGate(2, TRUE); EnableHwIRQ(0, BiosTimerIrq); }

10 years, 11 months

[ekohl] 61808: [MSGINA] - Enable the "Change Password" button of the security dialog. - Initialize the "Change Password" dialog.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jan 25 15:56:09 2014 New Revision: 61808 URL: http://svn.reactos.org/svn/reactos?rev=61808&view=rev Log: [MSGINA] - Enable the "Change Password" button of the security dialog. - Initialize the "Change Password" dialog. Modified: trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/lang/bg-BG.rc trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc trunk/reactos/dll/win32/msgina/lang/de-DE.rc trunk/reactos/dll/win32/msgina/lang/es-ES.rc trunk/reactos/dll/win32/msgina/lang/fr-FR.rc trunk/reactos/dll/win32/msgina/lang/he-IL.rc trunk/reactos/dll/win32/msgina/lang/id-ID.rc trunk/reactos/dll/win32/msgina/lang/it-IT.rc trunk/reactos/dll/win32/msgina/lang/ja-JP.rc trunk/reactos/dll/win32/msgina/lang/no-NO.rc trunk/reactos/dll/win32/msgina/lang/pl-PL.rc trunk/reactos/dll/win32/msgina/lang/ro-RO.rc trunk/reactos/dll/win32/msgina/lang/ru-RU.rc trunk/reactos/dll/win32/msgina/lang/sk-SK.rc trunk/reactos/dll/win32/msgina/lang/tr-TR.rc trunk/reactos/dll/win32/msgina/lang/uk-UA.rc Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Sat Jan 25 15:56:09 2014 @@ -220,6 +220,14 @@ } +static +BOOL +DoChangePassword(HWND hwndDlg) +{ + return FALSE; +} + + static INT_PTR CALLBACK ChangePasswordDialogProc( IN HWND hwndDlg, @@ -227,17 +235,36 @@ IN WPARAM wParam, IN LPARAM lParam) { + PGINA_CONTEXT pgContext; + + pgContext = (PGINA_CONTEXT)GetWindowLongPtr(hwndDlg, GWL_USERDATA); + switch (uMsg) { case WM_INITDIALOG: - FIXME("ChangePasswordDialogProc: WM_INITDLG\n"); + pgContext = (PGINA_CONTEXT)lParam; + SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pgContext); + + SetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_USERNAME, pgContext->UserName); + SendDlgItemMessageW(hwndDlg, IDC_CHANGEPWD_DOMAIN, CB_ADDSTRING, 0, (LPARAM)pgContext->Domain); + SendDlgItemMessageW(hwndDlg, IDC_CHANGEPWD_DOMAIN, CB_SETCURSEL, 0, 0); + SetFocus(GetDlgItem(hwndDlg, IDC_CHANGEPWD_OLDPWD)); return TRUE; case WM_COMMAND: switch (LOWORD(wParam)) { case IDOK: - EndDialog(hwndDlg, TRUE); + if (DoChangePassword(hwndDlg)) + { + EndDialog(hwndDlg, TRUE); + } + else + { + SetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_NEWPWD1, NULL); + SetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_NEWPWD2, NULL); + SetFocus(GetDlgItem(hwndDlg, IDC_CHANGEPWD_OLDPWD)); + } return TRUE; case IDCANCEL: Modified: trunk/reactos/dll/win32/msgina/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/bg-B… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] Sat Jan 25 15:56:09 2014 @@ -46,7 +46,7 @@ PUSHBUTTON "ÐÐ°ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° ÐºÐ¾Ð¼Ð¿ÑÑÑÑÐ°", IDC_LOCK, 25, 154, 99, 14 PUSHBUTTON "ÐÐ·ÑÐ¾Ð´", IDC_LOGOFF, 90, 135, 75, 14 PUSHBUTTON "ÐÐ·ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ", IDC_SHUTDOWN, 170, 135, 75, 14 - PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "ÐÐ°Ð´Ð°ÑÐµÐ½ ÑÐ¿ÑÐ°Ð²Ð¸ÑÐµÐ»", IDC_TASKMGR, 10, 135, 75, 14 PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 130, 154, 99, 14 END Modified: trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/cs-C… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] Sat Jan 25 15:56:09 2014 @@ -51,7 +51,7 @@ PUSHBUTTON "Uzamknout poÄÃtaÄ", IDC_LOCK, 10, 135, 70, 14 PUSHBUTTON "OdhlÃ¡sit", IDC_LOGOFF, 90, 135, 70, 14 PUSHBUTTON "Vypnout", IDC_SHUTDOWN, 170, 135, 70, 14 - PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "SprÃ¡vce Ãºloh", IDC_TASKMGR, 90, 154, 70, 14 PUSHBUTTON "Storno", IDCANCEL, 170, 154, 70, 14 END Modified: trunk/reactos/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] Sat Jan 25 15:56:09 2014 @@ -46,7 +46,7 @@ PUSHBUTTON "Computer sperren", IDC_LOCK, 10, 135, 76, 14 PUSHBUTTON "Abmelden...", IDC_LOGOFF, 100, 135, 75, 14 PUSHBUTTON "Herunterfahren", IDC_SHUTDOWN, 189, 135, 76, 14 - PUSHBUTTON "Password Ã¤ndern", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Password Ã¤ndern", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "Task-Manager", IDC_TASKMGR, 100, 154, 75, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 189, 154, 76, 14 END Modified: trunk/reactos/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/es-E… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] Sat Jan 25 15:56:09 2014 @@ -48,7 +48,7 @@ PUSHBUTTON "Bloquear computadora", IDC_LOCK, 4, 135, 83, 14 PUSHBUTTON "Salir", IDC_LOGOFF, 92, 135, 88, 14 PUSHBUTTON "Cerrar", IDC_SHUTDOWN, 186, 135, 70, 14 - PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "Administrador de tareas", IDC_TASKMGR, 92, 154, 88, 14 PUSHBUTTON "Cancelar", IDCANCEL, 186, 154, 70, 14 END Modified: trunk/reactos/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] Sat Jan 25 15:56:09 2014 @@ -46,7 +46,7 @@ PUSHBUTTON "Verrouiller l'ordinateur", IDC_LOCK, 4, 135, 82, 14 PUSHBUTTON "DÃ©connecter", IDC_LOGOFF, 93, 135, 85, 14 PUSHBUTTON "Ãteindre", IDC_SHUTDOWN, 184, 135, 70, 14 - PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "Gestionnaire de tÃ¢ches", IDC_TASKMGR, 93, 154, 85, 14 PUSHBUTTON "Annuler", IDCANCEL, 184, 154, 70, 14 END Modified: trunk/reactos/dll/win32/msgina/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/he-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] Sat Jan 25 15:56:09 2014 @@ -46,7 +46,7 @@ PUSHBUTTON "×× ×¢×× ××ª ××××©×", IDC_LOCK, 10, 76, 70, 14 PUSHBUTTON "×××ª× ×ª×§", IDC_LOGOFF, 90, 76, 70, 14 PUSHBUTTON "×××××ª", IDC_SHUTDOWN, 170, 76, 70, 14 - PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "×× ×× ×××©××××ª", IDC_TASKMGR, 90, 95, 70, 14 PUSHBUTTON "×××××", IDCANCEL, 170, 95, 70, 14 END Modified: trunk/reactos/dll/win32/msgina/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/id-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] Sat Jan 25 15:56:09 2014 @@ -46,7 +46,7 @@ PUSHBUTTON "Kunci komputer", IDC_LOCK, 10, 135, 70, 14 PUSHBUTTON "Keluar", IDC_LOGOFF, 90, 135, 70, 14 PUSHBUTTON "Matikan", IDC_SHUTDOWN, 170, 135, 70, 14 - PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "Manager Tugas", IDC_TASKMGR, 90, 154, 70, 14 PUSHBUTTON "Batal", IDCANCEL, 170, 154, 70, 14 END Modified: trunk/reactos/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/it-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] Sat Jan 25 15:56:09 2014 @@ -54,7 +54,7 @@ PUSHBUTTON "Bloccare il computer", IDC_LOCK, 10, 135, 70, 14 PUSHBUTTON "Fine sessione", IDC_LOGOFF, 90, 135, 70, 14 PUSHBUTTON "Spegnimento", IDC_SHUTDOWN, 170, 135, 70, 14 - PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "Task manager", IDC_TASKMGR, 90, 154, 70, 14 PUSHBUTTON "Annulla", IDCANCEL, 170, 154, 70, 14 END Modified: trunk/reactos/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ja-J… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] Sat Jan 25 15:56:09 2014 @@ -46,7 +46,7 @@ PUSHBUTTON "ã³ã³ãã¥ã¼ã¿ã®ããã¯", IDC_LOCK, 10, 135, 70, 14 PUSHBUTTON "ãã°ãªã", IDC_LOGOFF, 90, 135, 70, 14 PUSHBUTTON "ã·ã£ãããã¦ã³", IDC_SHUTDOWN, 170, 135, 70, 14 - PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "ã¿ã¹ã¯ ããã¼ã¸ã£", IDC_TASKMGR, 90, 154, 70, 14 PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 170, 154, 70, 14 END Modified: trunk/reactos/dll/win32/msgina/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/no-N… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] Sat Jan 25 15:56:09 2014 @@ -46,7 +46,7 @@ PUSHBUTTON "LÃ¥s datamaskinen...", IDC_LOCK, 7, 135, 74, 14 PUSHBUTTON "Logg av...", IDC_LOGOFF, 86, 135, 78, 14 PUSHBUTTON "Avslutt...", IDC_SHUTDOWN, 170, 135, 70, 14 - PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "Oppgavebehandling...", IDC_TASKMGR, 86, 154, 78, 14 PUSHBUTTON "Avbryt", IDCANCEL, 170, 154, 70, 14 END Modified: trunk/reactos/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/pl-P… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] Sat Jan 25 15:56:09 2014 @@ -55,7 +55,7 @@ PUSHBUTTON "Blokada komputera", IDC_LOCK, 10, 135, 70, 14 PUSHBUTTON "Wyloguj", IDC_LOGOFF, 90, 135, 70, 14 PUSHBUTTON "WyÅÄcz", IDC_SHUTDOWN, 170, 135, 70, 14 - PUSHBUTTON "ZmieÅ hasÅo", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "ZmieÅ hasÅo", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "MenedÅ¼er zadaÅ", IDC_TASKMGR, 90, 154, 70, 14 PUSHBUTTON "Anuluj", IDCANCEL, 170, 154, 70, 14 END Modified: trunk/reactos/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] Sat Jan 25 15:56:09 2014 @@ -48,7 +48,7 @@ PUSHBUTTON "&BlocheazÄ calculatorul", IDC_LOCK, 10, 135, 70, 14 PUSHBUTTON "&DeautentificÄ-mÄ", IDC_LOGOFF, 90, 135, 70, 14 PUSHBUTTON "Ãnchid&e calculatorul", IDC_SHUTDOWN, 170, 135, 70, 14 - PUSHBUTTON "Schim&bÄ parola", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Schim&bÄ parola", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "&Gestionar de activitÄÈiâ¦", IDC_TASKMGR, 90, 154, 70, 14 PUSHBUTTON "A&nuleazÄ", IDCANCEL, 170, 154, 70, 14 END Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] Sat Jan 25 15:56:09 2014 @@ -48,7 +48,7 @@ PUSHBUTTON "ÐÐ°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ", IDC_LOCK, 7, 135, 86, 14 PUSHBUTTON "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ ÑÐµÐ°Ð½ÑÐ°", IDC_LOGOFF, 102, 135, 86, 14 PUSHBUTTON "ÐÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ", IDC_SHUTDOWN, 198, 135, 70, 14 - PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ Ð·Ð°Ð´Ð°Ñ", IDC_TASKMGR, 102, 154, 86, 14 PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 198, 154, 70, 14 END Modified: trunk/reactos/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/sk-S… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] Sat Jan 25 15:56:09 2014 @@ -51,7 +51,7 @@ PUSHBUTTON "UzamknÃºÅ¥ poÄÃtaÄ", IDC_LOCK, 10, 135, 70, 14 PUSHBUTTON "OdhlÃ¡siÅ¥", IDC_LOGOFF, 90, 135, 70, 14 PUSHBUTTON "VypnÃºÅ¥", IDC_SHUTDOWN, 170, 135, 70, 14 - PUSHBUTTON "Change password", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Change password", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "SprÃ¡vca Ãºloh", IDC_TASKMGR, 90, 154, 70, 14 PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 170, 154, 70, 14 END Modified: trunk/reactos/dll/win32/msgina/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/tr-T… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] Sat Jan 25 15:56:09 2014 @@ -48,7 +48,7 @@ PUSHBUTTON "BilgisayarÄ± Kilitle", IDC_LOCK, 10, 135, 76, 14 PUSHBUTTON "Oturumu Kapat", IDC_LOGOFF, 100, 135, 75, 14 PUSHBUTTON "BilgisayarÄ± Kapat", IDC_SHUTDOWN, 189, 135, 76, 14 - PUSHBUTTON "Åifreyi DeÄiÅtir", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Åifreyi DeÄiÅtir", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "GÃ¶rev YÃ¶neticisi", IDC_TASKMGR, 100, 154, 75, 14 PUSHBUTTON "Ä°ptal", IDCANCEL, 189, 154, 76, 14 END Modified: trunk/reactos/dll/win32/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] Sat Jan 25 15:56:09 2014 @@ -54,7 +54,7 @@ PUSHBUTTON "ÐÐ»Ð¾ÐºÑÐ²Ð°Ð½Ð½Ñ", IDC_LOCK, 6, 135, 70, 14 PUSHBUTTON "ÐÐ¸ÑÑÐ´ ÑÐ· ÑÐ¸ÑÑÐµÐ¼Ð¸...", IDC_LOGOFF, 80, 135, 80, 14 PUSHBUTTON "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð½Ñ ÑÐ¾Ð±Ð¾ÑÐ¸...", IDC_SHUTDOWN, 165, 135, 86, 14 - PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ Ð·Ð°Ð²Ð´Ð°Ð½Ñ", IDC_TASKMGR, 80, 154, 80, 14 PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 165, 154, 86, 14 END

10 years, 11 months

[akhaldi] 61807: [SECUR32] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jan 25 15:49:57 2014 New Revision: 61807 URL: http://svn.reactos.org/svn/reactos?rev=61807&view=rev Log: [SECUR32] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 Modified: trunk/reactos/dll/win32/secur32/dllmain.c trunk/reactos/dll/win32/secur32/precomp.h trunk/reactos/dll/win32/secur32/secext.c trunk/reactos/dll/win32/secur32/stubs.c Modified: trunk/reactos/dll/win32/secur32/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/dllmain.… ============================================================================== --- trunk/reactos/dll/win32/secur32/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/dllmain.c [iso-8859-1] Sat Jan 25 15:49:57 2014 @@ -7,7 +7,6 @@ * Created 05/08/00 */ -/* INCLUDES ******************************************************************/ #include "precomp.h" /* GLOBALS *******************************************************************/ Modified: trunk/reactos/dll/win32/secur32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/precomp.… ============================================================================== --- trunk/reactos/dll/win32/secur32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/precomp.h [iso-8859-1] Sat Jan 25 15:49:57 2014 @@ -5,8 +5,6 @@ * PURPOSE: Security Library Header * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ - -/* INCLUDES ******************************************************************/ #include <stdarg.h> @@ -16,10 +14,8 @@ #define COM_NO_WINDOWS_H #include <windef.h> #include <winbase.h> -#include <winnls.h> #define NTOS_MODE_USER #include <ndk/rtlfuncs.h> -#include <lsass/lsass.h> #include <secext.h> #include <security.h> Modified: trunk/reactos/dll/win32/secur32/secext.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/secext.c… ============================================================================== --- trunk/reactos/dll/win32/secur32/secext.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/secext.c [iso-8859-1] Sat Jan 25 15:49:57 2014 @@ -18,11 +18,13 @@ #include "precomp.h" +#include <winnls.h> +#include <lsass/lsass.h> + #define NDEBUG #include <debug.h> #define UNLEN 256 - /*********************************************************************** * GetComputerObjectNameA (SECUR32.@) Wine 1.1.14 Modified: trunk/reactos/dll/win32/secur32/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/secur32/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/stubs.c [iso-8859-1] Sat Jan 25 15:49:57 2014 @@ -1,4 +1,3 @@ - #include "precomp.h" #define NDEBUG @@ -50,4 +49,3 @@ UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; } -

10 years, 11 months

[akhaldi] 61806: [SCRRUN] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jan 25 15:37:02 2014 New Revision: 61806 URL: http://svn.reactos.org/svn/reactos?rev=61806&view=rev Log: [SCRRUN] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/win32/scrrun/filesystem.c trunk/reactos/dll/win32/scrrun/scrrun_private.h Modified: trunk/reactos/dll/win32/scrrun/filesystem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/filesyste… ============================================================================== --- trunk/reactos/dll/win32/scrrun/filesystem.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/scrrun/filesystem.c [iso-8859-1] Sat Jan 25 15:37:02 2014 @@ -21,6 +21,7 @@ #include <winver.h> #include <olectl.h> #include <ntsecapi.h> +#include <wine/unicode.h> struct folder { IFolder IFolder_iface; Modified: trunk/reactos/dll/win32/scrrun/scrrun_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/scrrun_pr… ============================================================================== --- trunk/reactos/dll/win32/scrrun/scrrun_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/scrrun/scrrun_private.h [iso-8859-1] Sat Jan 25 15:37:02 2014 @@ -19,7 +19,7 @@ #ifndef _SCRRUN_PRIVATE_H_ #define _SCRRUN_PRIVATE_H_ -#include <config.h> +#include <wine/config.h> #include <stdarg.h> @@ -31,12 +31,11 @@ #include <windef.h> #include <winbase.h> +#include <winnls.h> #include <objbase.h> #include <oleauto.h> #include <dispex.h> #include <scrrun.h> - -#include <wine/unicode.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(scrrun);

10 years, 11 months

← Newer
1
...
6
7
8
9
10
11
12
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2014