Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 61831: [WINSPOOL.DRV] * Create a main header and move some inclusions to it. CORE-7716
by akhaldi＠svn.reactos.org 26 Jan '14

26 Jan '14

Author: akhaldi Date: Sun Jan 26 14:55:05 2014 New Revision: 61831 URL: http://svn.reactos.org/svn/reactos?rev=61831&view=rev Log: [WINSPOOL.DRV] * Create a main header and move some inclusions to it. CORE-7716 Added: trunk/reactos/dll/win32/winspool/precomp.h (with props) Modified: trunk/reactos/dll/win32/winspool/info.c trunk/reactos/dll/win32/winspool/stubs.c Modified: trunk/reactos/dll/win32/winspool/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winspool/info.c?… ============================================================================== --- trunk/reactos/dll/win32/winspool/info.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winspool/info.c [iso-8859-1] Sun Jan 26 14:55:05 2014 @@ -22,30 +22,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <wine/config.h> -//#include "wine/port.h" - -#include <stdarg.h> -//#include <stdio.h> -//#include <stdlib.h> -//#include <string.h> -//#include <ctype.h> -//#include <stddef.h> - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" -#include <wingdi.h> +#include "precomp.h" + #include <winreg.h> +#include <winnls.h> #include <shlwapi.h> -#include <winspool.h> -//#include "wine/unicode.h" + #include <wine/debug.h> -#include <winnls.h> WINE_DEFAULT_DEBUG_CHANNEL(winspool); Added: trunk/reactos/dll/win32/winspool/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winspool/precomp… ============================================================================== --- trunk/reactos/dll/win32/winspool/precomp.h (added) +++ trunk/reactos/dll/win32/winspool/precomp.h [iso-8859-1] Sun Jan 26 14:55:05 2014 @@ -0,0 +1,17 @@ +#ifndef _WINSPOOL_DRV_PCH_ +#define _WINSPOOL_DRV_PCH_ + +#include <wine/config.h> + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winspool.h> + +#endif /* _WINSPOOL_DRV_PCH_ */ Propchange: trunk/reactos/dll/win32/winspool/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/winspool/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winspool/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/winspool/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winspool/stubs.c [iso-8859-1] Sun Jan 26 14:55:05 2014 @@ -7,12 +7,9 @@ * REVISIONS: */ -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> +#include "precomp.h" + #include <winuser.h> -#include <wingdi.h> -#include <winspool.h> /* * @unimplemented

1 0

[akhaldi] 61830: [WINMM] * Improve redundant inclusion. CORE-7716
by akhaldi＠svn.reactos.org 26 Jan '14

26 Jan '14

Author: akhaldi Date: Sun Jan 26 14:53:32 2014 New Revision: 61830 URL: http://svn.reactos.org/svn/reactos?rev=61830&view=rev Log: [WINMM] * Improve redundant inclusion. CORE-7716 Modified: trunk/reactos/dll/win32/winmm/winemm.h Modified: trunk/reactos/dll/win32/winmm/winemm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winemm.h?r… ============================================================================== --- trunk/reactos/dll/win32/winmm/winemm.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/winemm.h [iso-8859-1] Sun Jan 26 14:53:32 2014 @@ -19,10 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> +#include <wine/config.h> #include <assert.h> -#include <stdarg.h> #include <stdio.h> #define _INC_WINDOWS

1 0

[akhaldi] 61829: [WININET] * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 26 Jan '14

26 Jan '14

Author: akhaldi Date: Sun Jan 26 13:23:06 2014 New Revision: 61829 URL: http://svn.reactos.org/svn/reactos?rev=61829&view=rev Log: [WININET] * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/win32/wininet/internet.h trunk/reactos/dll/win32/wininet/netconnection.c Modified: trunk/reactos/dll/win32/wininet/internet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… ============================================================================== --- trunk/reactos/dll/win32/wininet/internet.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/internet.h [iso-8859-1] Sun Jan 26 13:23:06 2014 @@ -26,7 +26,6 @@ #include <wine/config.h> #include <assert.h> -#include <stdarg.h> #include <stdio.h> #define _INC_WINDOWS @@ -45,10 +44,9 @@ #define NO_SHLWAPI_GDI #include <shlwapi.h> +#include <wine/list.h> +#include <wine/debug.h> #include <wine/unicode.h> -#include <wine/list.h> - -#include <time.h> #ifdef HAVE_ARPA_INET_H # include <arpa/inet.h> @@ -85,10 +83,9 @@ #include <winineti.h> -#include <wine/debug.h> +#include "resource.h" + WINE_DEFAULT_DEBUG_CHANNEL(wininet); - -#include "resource.h" extern HMODULE WININET_hModule DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/wininet/netconnection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/netconne… ============================================================================== --- trunk/reactos/dll/win32/wininet/netconnection.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/netconnection.c [iso-8859-1] Sun Jan 26 13:23:06 2014 @@ -30,7 +30,6 @@ #ifdef HAVE_SYS_FILIO_H # include <sys/filio.h> #endif -#include <time.h> #ifdef HAVE_NETINET_TCP_H # include <netinet/tcp.h> #endif

1 0

[akhaldi] 61828: [WINDOWSCODECS] * Move some inclusions to the main header. * Improve the GUIDs situation. CORE-7716
by akhaldi＠svn.reactos.org 26 Jan '14

26 Jan '14

Author: akhaldi Date: Sun Jan 26 12:05:45 2014 New Revision: 61828 URL: http://svn.reactos.org/svn/reactos?rev=61828&view=rev Log: [WINDOWSCODECS] * Move some inclusions to the main header. * Improve the GUIDs situation. CORE-7716 Modified: trunk/reactos/dll/win32/windowscodecs/bmpdecode.c trunk/reactos/dll/win32/windowscodecs/clsfactory.c trunk/reactos/dll/win32/windowscodecs/gifformat.c trunk/reactos/dll/win32/windowscodecs/guid.c trunk/reactos/dll/win32/windowscodecs/icoformat.c trunk/reactos/dll/win32/windowscodecs/imgfactory.c trunk/reactos/dll/win32/windowscodecs/info.c trunk/reactos/dll/win32/windowscodecs/jpegformat.c trunk/reactos/dll/win32/windowscodecs/metadatahandler.c trunk/reactos/dll/win32/windowscodecs/pngformat.c trunk/reactos/dll/win32/windowscodecs/propertybag.c trunk/reactos/dll/win32/windowscodecs/proxy.c trunk/reactos/dll/win32/windowscodecs/regsvr.c trunk/reactos/dll/win32/windowscodecs/stream.c trunk/reactos/dll/win32/windowscodecs/tiffformat.c trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h Modified: trunk/reactos/dll/win32/windowscodecs/bmpdecode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/bm… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/bmpdecode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/bmpdecode.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -19,7 +19,6 @@ #include "wincodecs_private.h" #include <assert.h> -#include <wingdi.h> typedef struct { DWORD bc2Size; Modified: trunk/reactos/dll/win32/windowscodecs/clsfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/cl… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/clsfactory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/clsfactory.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -17,9 +17,6 @@ */ #include "wincodecs_private.h" - -#include <initguid.h> -#include <wincodecsdk.h> extern HRESULT WINAPI WIC_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/windowscodecs/gifformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/gi… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/gifformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/gifformat.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -19,9 +19,7 @@ #include "wincodecs_private.h" -#include <winnls.h> #include <ole2.h> -#include <wincodecsdk.h> #include "ungif.h" Modified: trunk/reactos/dll/win32/windowscodecs/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/gu… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/guid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/guid.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -10,7 +10,7 @@ #include <winbase.h> #include <objbase.h> #include <initguid.h> -#include <wincodec.h> +#include <wincodecsdk.h> DEFINE_GUID(CLSID_WineTgaDecoder, 0xb11fc79a,0x67cc,0x43e6,0xa9,0xce,0xe3,0xd5,0x49,0x45,0xd3,0x04); DEFINE_GUID(CLSID_WICIcnsEncoder, 0x312fb6f1,0xb767,0x409d,0x8a,0x6d,0x0f,0xc1,0x54,0xd4,0xf0,0x5c); Modified: trunk/reactos/dll/win32/windowscodecs/icoformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ic… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/icoformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/icoformat.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -17,8 +17,6 @@ */ #include "wincodecs_private.h" - -#include <wingdi.h> #include <pshpack1.h> Modified: trunk/reactos/dll/win32/windowscodecs/imgfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/im… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/imgfactory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/imgfactory.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -18,9 +18,6 @@ */ #include "wincodecs_private.h" - -#include <wingdi.h> -#include <wincodecsdk.h> typedef struct { IWICComponentFactory IWICComponentFactory_iface; Modified: trunk/reactos/dll/win32/windowscodecs/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/in… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/info.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/info.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -19,10 +19,6 @@ #include "wincodecs_private.h" -#include <winreg.h> -#include <wincodecsdk.h> - -#include <wine/unicode.h> #include <wine/list.h> static const WCHAR mimetypes_valuename[] = {'M','i','m','e','T','y','p','e','s',0}; Modified: trunk/reactos/dll/win32/windowscodecs/jpegformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/jp… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/jpegformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/jpegformat.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -22,9 +22,6 @@ # include <unistd.h> #endif -#include <stdio.h> -#include <setjmp.h> - #ifdef SONAME_LIBJPEG /* This is a hack, so jpeglib.h does not redefine INT32 and the like*/ #define XMD_H @@ -39,8 +36,6 @@ #undef UINT16 #undef boolean #endif - -#include <wine/library.h> #ifdef SONAME_LIBJPEG WINE_DECLARE_DEBUG_CHANNEL(jpeg); Modified: trunk/reactos/dll/win32/windowscodecs/metadatahandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/me… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/metadatahandler.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/metadatahandler.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -21,7 +21,6 @@ #include <stdio.h> #include <winternl.h> -#include <wincodecsdk.h> typedef struct MetadataHandler { IWICMetadataWriter IWICMetadataWriter_iface; Modified: trunk/reactos/dll/win32/windowscodecs/pngformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/pn… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/pngformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/pngformat.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -21,10 +21,6 @@ #ifdef HAVE_PNG_H #include <png.h> #endif - -#include <wincodecsdk.h> - -#include <wine/library.h> static HRESULT read_png_chunk(IStream *stream, BYTE *type, BYTE **data, ULONG *data_size) { Modified: trunk/reactos/dll/win32/windowscodecs/propertybag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/pr… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/propertybag.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/propertybag.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -19,9 +19,6 @@ #include "wincodecs_private.h" -#include <ole2.h> -#include <wine/unicode.h> - typedef struct PropertyBag { IPropertyBag2 IPropertyBag2_iface; LONG ref; Modified: trunk/reactos/dll/win32/windowscodecs/proxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/pr… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/proxy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/proxy.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -20,8 +20,6 @@ #include "wincodecs_private.h" -#include <wincodecsdk.h> - HRESULT WINAPI IWICBitmapClipper_Initialize_Proxy_W(IWICBitmapClipper *iface, IWICBitmapSource *pISource, const WICRect *prc) { Modified: trunk/reactos/dll/win32/windowscodecs/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/re… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/regsvr.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -17,12 +17,6 @@ */ #include "wincodecs_private.h" - -#include <winreg.h> -#include <objbase.h> -#include <wincodecsdk.h> - -#include <wine/unicode.h> /*********************************************************************** * interface for self-registering Modified: trunk/reactos/dll/win32/windowscodecs/stream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/st… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/stream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/stream.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -18,7 +18,6 @@ #include "wincodecs_private.h" -#include <winreg.h> #include <shlwapi.h> /****************************************** Modified: trunk/reactos/dll/win32/windowscodecs/tiffformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ti… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/tiffformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/tiffformat.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -24,11 +24,6 @@ #ifdef HAVE_TIFFIO_H #include <tiffio.h> #endif - -#include <oleauto.h> -#include <wincodecsdk.h> - -#include <wine/library.h> #ifdef SONAME_LIBTIFF Modified: trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/wi… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -34,10 +34,16 @@ #include <windef.h> #include <winbase.h> +#include <wingdi.h> +#include <winreg.h> #include <objbase.h> -#include <wincodec.h> +#include <oleauto.h> +#include <wincodecsdk.h> #include <wine/debug.h> +#include <wine/library.h> +#include <wine/unicode.h> + WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); DEFINE_GUID(CLSID_WineTgaDecoder, 0xb11fc79a,0x67cc,0x43e6,0xa9,0xce,0xe3,0xd5,0x49,0x45,0xd3,0x04);

1 0

[akhaldi] 61827: [WDMAUD.DRV] * 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 26 Jan '14

26 Jan '14

Author: akhaldi Date: Sun Jan 26 11:45:40 2014 New Revision: 61827 URL: http://svn.reactos.org/svn/reactos?rev=61827&view=rev Log: [WDMAUD.DRV] * 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/wdmaud.drv/mixer.c trunk/reactos/dll/win32/wdmaud.drv/mmixer.c trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h Modified: trunk/reactos/dll/win32/wdmaud.drv/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/mixer… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/mixer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/mixer.c [iso-8859-1] Sun Jan 26 11:45:40 2014 @@ -8,6 +8,9 @@ */ #include "wdmaud.h" + +#include <samplerate.h> +#include <float_cast.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/dll/win32/wdmaud.drv/mmixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/mmixe… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] Sun Jan 26 11:45:40 2014 @@ -8,6 +8,10 @@ */ #include "wdmaud.h" + +#include <winreg.h> +#include <setupapi.h> +#include <mmixer.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h [iso-8859-1] Sun Jan 26 11:45:40 2014 @@ -1,20 +1,19 @@ -#ifndef WDMAUD_H__ -#define WDMAUD_H__ - -#include <devioctl.h> +#ifndef __WDMAUD_H__ +#define __WDMAUD_H__ + #include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include <windef.h> -#include <winbase.h> #include <winuser.h> -#include <winreg.h> -#include <setupapi.h> #include <mmddk.h> #include <mmebuddy.h> #include <ksmedia.h> -#include <samplerate.h> -#include <float_cast.h> #include <interface.h> -#include <mmixer.h> +#include <devioctl.h> BOOL WdmAudInitUserModeMixer(VOID); @@ -238,4 +237,4 @@ MixerEventThreadRoutine( LPVOID Parameter); -#endif +#endif /* __WDMAUD_H__ */

1 0

[ekohl] 61826: [MSV1_0] MsvpChangePassword: Open the SAM domain and user objects that represent the logon domain and user account.
by ekohl＠svn.reactos.org 26 Jan '14

26 Jan '14

Author: ekohl Date: Sun Jan 26 10:43:58 2014 New Revision: 61826 URL: http://svn.reactos.org/svn/reactos?rev=61826&view=rev Log: [MSV1_0] MsvpChangePassword: Open the SAM domain and user objects that represent the logon domain and user account. Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c trunk/reactos/dll/win32/msv1_0/msv1_0.h Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.c?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] Sun Jan 26 10:43:58 2014 @@ -428,6 +428,15 @@ PMSV1_0_CHANGEPASSWORD_REQUEST RequestBuffer; ULONG_PTR PtrOffset; + SAMPR_HANDLE ServerHandle = NULL; + SAMPR_HANDLE DomainHandle = NULL; + SAMPR_HANDLE UserHandle = NULL; + PRPC_SID DomainSid = NULL; + RPC_UNICODE_STRING Names[1]; + SAMPR_ULONG_ARRAY RelativeIds = {0, NULL}; + SAMPR_ULONG_ARRAY Use = {0, NULL}; + NTSTATUS Status; + TRACE("()\n"); RequestBuffer = (PMSV1_0_CHANGEPASSWORD_REQUEST)ProtocolSubmitBuffer; @@ -445,8 +454,113 @@ TRACE("Old Password: %S\n", RequestBuffer->OldPassword.Buffer); TRACE("New Password: %S\n", RequestBuffer->NewPassword.Buffer); - - return STATUS_SUCCESS; + /* Connect to the SAM server */ + Status = SamIConnect(NULL, + &ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + TRUE); + if (!NT_SUCCESS(Status)) + { + TRACE("SamIConnect() failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Get the domain SID */ + Status = SamrLookupDomainInSamServer(ServerHandle, + (PRPC_UNICODE_STRING)&RequestBuffer->DomainName, + &DomainSid); + if (!NT_SUCCESS(Status)) + { + TRACE("SamrLookupDomainInSamServer failed (Status %08lx)\n", Status); + goto done; + } + + /* Open the domain */ + Status = SamrOpenDomain(ServerHandle, + DOMAIN_LOOKUP, + DomainSid, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + TRACE("SamrOpenDomain failed (Status %08lx)\n", Status); + goto done; + } + + Names[0].Length = RequestBuffer->AccountName.Length; + Names[0].MaximumLength = RequestBuffer->AccountName.MaximumLength; + Names[0].Buffer = RequestBuffer->AccountName.Buffer; + + /* Try to get the RID for the user name */ + Status = SamrLookupNamesInDomain(DomainHandle, + 1, + Names, + &RelativeIds, + &Use); + if (!NT_SUCCESS(Status)) + { + TRACE("SamrLookupNamesInDomain failed (Status %08lx)\n", Status); + Status = STATUS_NO_SUCH_USER; + goto done; + } + + /* Fail, if it is not a user account */ + if (Use.Element[0] != SidTypeUser) + { + TRACE("Account is not a user account!\n"); + Status = STATUS_NO_SUCH_USER; + goto done; + } + + /* Open the user object */ + Status = SamrOpenUser(DomainHandle, + USER_CHANGE_PASSWORD, + RelativeIds.Element[0], + &UserHandle); + if (!NT_SUCCESS(Status)) + { + TRACE("SamrOpenUser failed (Status %08lx)\n", Status); + goto done; + } + + + +#if 0 + /* Change the password */ + Status = SamrChangePasswordUser(UserHandle, + IN unsigned char LmPresent, + IN PENCRYPTED_LM_OWF_PASSWORD OldLmEncryptedWithNewLm, + IN PENCRYPTED_LM_OWF_PASSWORD NewLmEncryptedWithOldLm, + IN unsigned char NtPresent, + IN PENCRYPTED_NT_OWF_PASSWORD OldNtEncryptedWithNewNt, + IN PENCRYPTED_NT_OWF_PASSWORD NewNtEncryptedWithOldNt, + IN unsigned char NtCrossEncryptionPresent, + IN PENCRYPTED_NT_OWF_PASSWORD NewNtEncryptedWithNewLm, + IN unsigned char LmCrossEncryptionPresent, + IN PENCRYPTED_LM_OWF_PASSWORD NewLmEncryptedWithNewNt) + if (!NT_SUCCESS(Status)) + { + TRACE("SamrChangePasswordUser failed (Status %08lx)\n", Status); + goto done; + } +#endif + +done: + if (UserHandle != NULL) + SamrCloseHandle(&UserHandle); + + SamIFree_SAMPR_ULONG_ARRAY(&RelativeIds); + SamIFree_SAMPR_ULONG_ARRAY(&Use); + + if (DomainHandle != NULL) + SamrCloseHandle(&DomainHandle); + + if (DomainSid != NULL) + SamIFreeVoid(DomainSid); + + if (ServerHandle != NULL) + SamrCloseHandle(&ServerHandle); + + return Status; } Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.h?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.h [iso-8859-1] Sun Jan 26 10:43:58 2014 @@ -173,6 +173,10 @@ VOID NTAPI +SamIFreeVoid(PVOID Ptr); + +VOID +NTAPI SamIFree_SAMPR_ULONG_ARRAY(PSAMPR_ULONG_ARRAY Ptr); VOID @@ -183,6 +187,12 @@ NTSTATUS NTAPI SamrCloseHandle(IN OUT SAMPR_HANDLE *SamHandle); + +NTSTATUS +NTAPI +SamrLookupDomainInSamServer(IN SAMPR_HANDLE ServerHandle, + IN PRPC_UNICODE_STRING Name, + OUT PRPC_SID *DomainId); NTSTATUS NTAPI

1 0

[akhaldi] 61825: [VBSCRIPT] * 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 26 Jan '14

26 Jan '14

Author: akhaldi Date: Sun Jan 26 10:42:07 2014 New Revision: 61825 URL: http://svn.reactos.org/svn/reactos?rev=61825&view=rev Log: [VBSCRIPT] * 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/vbscript/global.c trunk/reactos/dll/win32/vbscript/vbscript.h Modified: trunk/reactos/dll/win32/vbscript/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/global.… ============================================================================== --- trunk/reactos/dll/win32/vbscript/global.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/global.c [iso-8859-1] Sun Jan 26 10:42:07 2014 @@ -19,6 +19,7 @@ #include "vbscript.h" #include <math.h> +#include <mshtmhst.h> #define round(x) (((x) < 0) ? (int)((x) - 0.5) : (int)((x) + 0.5)) Modified: trunk/reactos/dll/win32/vbscript/vbscript.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscrip… ============================================================================== --- trunk/reactos/dll/win32/vbscript/vbscript.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/vbscript.h [iso-8859-1] Sun Jan 26 10:42:07 2014 @@ -27,16 +27,16 @@ #include <windef.h> #include <winbase.h> -#include <ole2.h> +#include <objbase.h> +#include <oleauto.h> #include <objsafe.h> #include <dispex.h> #include <activscp.h> -#include <mshtmhst.h> - + +#include <wine/debug.h> #include <wine/list.h> #include <wine/unicode.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(vbscript); typedef struct {

1 0

[ekohl] 61824: [SAMSRV] Implement SamIFreeVoid.
by ekohl＠svn.reactos.org 26 Jan '14

26 Jan '14

Author: ekohl Date: Sun Jan 26 02:34:59 2014 New Revision: 61824 URL: http://svn.reactos.org/svn/reactos?rev=61824&view=rev Log: [SAMSRV] Implement SamIFreeVoid. Modified: trunk/reactos/dll/win32/samsrv/samsrv.c trunk/reactos/dll/win32/samsrv/samsrv.spec Modified: trunk/reactos/dll/win32/samsrv/samsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] Sun Jan 26 02:34:59 2014 @@ -143,6 +143,14 @@ VOID NTAPI +SamIFreeVoid(PVOID Ptr) +{ + MIDL_user_free(Ptr); +} + + +VOID +NTAPI SamIFree_SAMPR_ENUMERATION_BUFFER(PSAMPR_ENUMERATION_BUFFER Ptr) { ULONG i; Modified: trunk/reactos/dll/win32/samsrv/samsrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.sp… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] Sun Jan 26 02:34:59 2014 @@ -16,7 +16,7 @@ @ stub SamIFloatingSingleMasterOpEx @ stub SamIFreeSidAndAttributesList @ stub SamIFreeSidArray -@ stub SamIFreeVoid +@ stdcall SamIFreeVoid(ptr) @ stub SamIFree_SAMPR_ALIAS_INFO_BUFFER @ stub SamIFree_SAMPR_DISPLAY_INFO_BUFFER @ stub SamIFree_SAMPR_DOMAIN_INFO_BUFFER

1 0

[tkreuzer] 61823: [CRYPTLIB] MSVC doesn't define __BYTE_ORDER__, so simply assume it is LE.
by tkreuzer＠svn.reactos.org 25 Jan '14

25 Jan '14

Author: tkreuzer Date: Sat Jan 25 23:51:04 2014 New Revision: 61823 URL: http://svn.reactos.org/svn/reactos?rev=61823&view=rev Log: [CRYPTLIB] MSVC doesn't define __BYTE_ORDER__, so simply assume it is LE. Modified: trunk/reactos/lib/cryptlib/util.c trunk/reactos/lib/cryptlib/util.h Modified: trunk/reactos/lib/cryptlib/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cryptlib/util.c?rev=61… ============================================================================== --- trunk/reactos/lib/cryptlib/util.c [iso-8859-1] (original) +++ trunk/reactos/lib/cryptlib/util.c [iso-8859-1] Sat Jan 25 23:51:04 2014 @@ -1,6 +1,6 @@ -#if (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) +#if !defined(_MSC_VER) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) #include <stdlib.h> #include <intrin.h> @@ -22,5 +22,5 @@ } while (--longs); } -#endif // (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) +#endif // !defined(_MSC_VER) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) Modified: trunk/reactos/lib/cryptlib/util.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cryptlib/util.h?rev=61… ============================================================================== --- trunk/reactos/lib/cryptlib/util.h [iso-8859-1] (original) +++ trunk/reactos/lib/cryptlib/util.h [iso-8859-1] Sat Jan 25 23:51:04 2014 @@ -1,8 +1,7 @@ #pragma once - -#if (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) +#if defined(_MSC_VER) || (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) #define byteReverse(buf, long)((void)(buf, long)) #else void

1 0

[akhaldi] 61822: [UXTHEME] * 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 25 Jan '14

25 Jan '14

Author: akhaldi Date: Sat Jan 25 23:07:09 2014 New Revision: 61822 URL: http://svn.reactos.org/svn/reactos?rev=61822&view=rev Log: [UXTHEME] * 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/uxtheme/system.c trunk/reactos/dll/win32/uxtheme/uxini.c trunk/reactos/dll/win32/uxtheme/uxthemep.h Modified: trunk/reactos/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] Sat Jan 25 23:07:09 2014 @@ -20,6 +20,7 @@ #include "uxthemep.h" +#include <stdio.h> #include <winreg.h> #include <uxundoc.h> Modified: trunk/reactos/dll/win32/uxtheme/uxini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxini.c?… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxini.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxini.c [iso-8859-1] Sat Jan 25 23:07:09 2014 @@ -19,7 +19,7 @@ */ #include "uxthemep.h" -#include <winnls.h> + /*********************************************************************** * Defines and global variables */ Modified: trunk/reactos/dll/win32/uxtheme/uxthemep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxthemep… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] Sat Jan 25 23:07:09 2014 @@ -1,10 +1,14 @@ -#include <stdio.h> +#include <stdarg.h> #define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include <windef.h> #include <winbase.h> #include <wingdi.h> #include <winuser.h> +#include <winnls.h> #include <windowsx.h> #include <undocuser.h> #include <uxtheme.h>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs