Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 59227: [QMGR_WINETEST] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 16 Jun '13

16 Jun '13

Author: akhaldi Date: Sun Jun 16 11:10:56 2013 New Revision: 59227 URL: http://svn.reactos.org/svn/reactos?rev=59227&view=rev Log: [QMGR_WINETEST] * Sync with Wine 1.5.26. Modified: trunk/rostests/winetests/qmgr/enum_files.c trunk/rostests/winetests/qmgr/enum_jobs.c trunk/rostests/winetests/qmgr/file.c trunk/rostests/winetests/qmgr/job.c trunk/rostests/winetests/qmgr/qmgr.c trunk/rostests/winetests/qmgr/testlist.c Modified: trunk/rostests/winetests/qmgr/enum_files.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qmgr/enum_files… ============================================================================== --- trunk/rostests/winetests/qmgr/enum_files.c [iso-8859-1] (original) +++ trunk/rostests/winetests/qmgr/enum_files.c [iso-8859-1] Sun Jun 16 11:10:56 2013 @@ -18,13 +18,23 @@ * 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> + +#include <windef.h> +#include <winbase.h> +#include <winreg.h> + #include <shlwapi.h> -#include <stdio.h> +//#include <stdio.h> #define COBJMACROS -#include "wine/test.h" -#include "bits.h" +#include <wine/test.h> +#include <bits.h> /* Globals used by many tests */ #define NUM_FILES 2 /* At least two. */ @@ -226,7 +236,7 @@ ok(hres == S_OK, "Skip failed: %08x\n", hres); if(hres != S_OK) { - skip("Unable to propely Skip files\n"); + skip("Unable to properly Skip files\n"); return; } } Modified: trunk/rostests/winetests/qmgr/enum_jobs.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qmgr/enum_jobs.… ============================================================================== --- trunk/rostests/winetests/qmgr/enum_jobs.c [iso-8859-1] (original) +++ trunk/rostests/winetests/qmgr/enum_jobs.c [iso-8859-1] Sun Jun 16 11:10:56 2013 @@ -18,12 +18,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> +//#include <stdio.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H #define COBJMACROS -#include "wine/test.h" -#include "bits.h" +#include <wine/test.h> +#include <objbase.h> +#include <bits.h> /* Globals used by many tests */ static const WCHAR test_displayNameA[] = {'T','e','s','t','A', 0}; @@ -218,7 +223,7 @@ { ok(jobs[i] != NULL, "Next returned NULL\n"); if (jobs[i]) - IBackgroundCopyFile_Release(jobs[i]); + IBackgroundCopyJob_Release(jobs[i]); } HeapFree(GetProcessHeap(), 0, jobs); @@ -247,7 +252,7 @@ ok(hres == S_OK, "Skip failed: %08x\n", hres); if(hres != S_OK) { - skip("Unable to propely Skip jobs\n"); + skip("Unable to properly Skip jobs\n"); return; } } Modified: trunk/rostests/winetests/qmgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qmgr/file.c?rev… ============================================================================== --- trunk/rostests/winetests/qmgr/file.c [iso-8859-1] (original) +++ trunk/rostests/winetests/qmgr/file.c [iso-8859-1] Sun Jun 16 11:10:56 2013 @@ -18,14 +18,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> +//#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 <winreg.h> #include <shlwapi.h> #define COBJMACROS -#include "wine/test.h" -#include "bits.h" +#include <wine/test.h> +#include <bits.h> /* Globals used by many tests */ #define NUM_FILES 1 @@ -162,7 +172,7 @@ (DWORD)(progress.BytesTotal >> 32), (DWORD)progress.BytesTotal); ok(progress.BytesTransferred == 0, "Got incorrect number of transferred bytes: %x%08x\n", (DWORD)(progress.BytesTransferred >> 32), (DWORD)progress.BytesTransferred); - ok(progress.Completed == FALSE, "Got incorret completion status\n"); + ok(progress.Completed == FALSE, "Got incorrect completion status\n"); } typedef void (*test_t)(void); Modified: trunk/rostests/winetests/qmgr/job.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qmgr/job.c?rev=… ============================================================================== --- trunk/rostests/winetests/qmgr/job.c [iso-8859-1] (original) +++ trunk/rostests/winetests/qmgr/job.c [iso-8859-1] Sun Jun 16 11:10:56 2013 @@ -18,75 +18,41 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> +//#include <stdio.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H #define COBJMACROS -#include "wine/test.h" -#include "bits.h" -#include "initguid.h" +#include <wine/test.h> +#include <objbase.h> +#include <bits.h> +#include <initguid.h> /* Globals used by many tests */ static const WCHAR test_displayName[] = {'T', 'e', 's', 't', 0}; -static const WCHAR test_remoteNameA[] = {'r','e','m','o','t','e','A', 0}; -static const WCHAR test_remoteNameB[] = {'r','e','m','o','t','e','B', 0}; -static const WCHAR test_localNameA[] = {'l','o','c','a','l','A', 0}; -static const WCHAR test_localNameB[] = {'l','o','c','a','l','B', 0}; -static WCHAR *test_currentDir; -static WCHAR *test_remotePathA; -static WCHAR *test_remotePathB; -static WCHAR *test_localPathA; -static WCHAR *test_localPathB; +static WCHAR test_remotePathA[MAX_PATH]; +static WCHAR test_remotePathB[MAX_PATH]; +static WCHAR test_localPathA[MAX_PATH]; +static WCHAR test_localPathB[MAX_PATH]; static IBackgroundCopyManager *test_manager; static IBackgroundCopyJob *test_job; static GUID test_jobId; static BG_JOB_TYPE test_type; -static BOOL init_paths(void) -{ - static const WCHAR format[] = {'%','s','\\','%','s', 0}; - DWORD n; - - n = GetCurrentDirectoryW(0, NULL); - if (n == 0) - { - skip("Couldn't get current directory size\n"); - return FALSE; - } - - test_currentDir = HeapAlloc(GetProcessHeap(), 0, n * sizeof(WCHAR)); - test_localPathA - = HeapAlloc(GetProcessHeap(), 0, - (n + 1 + lstrlenW(test_localNameA)) * sizeof(WCHAR)); - test_localPathB - = HeapAlloc(GetProcessHeap(), 0, - (n + 1 + lstrlenW(test_localNameB)) * sizeof(WCHAR)); - test_remotePathA - = HeapAlloc(GetProcessHeap(), 0, - (n + 1 + lstrlenW(test_remoteNameA)) * sizeof(WCHAR)); - test_remotePathB - = HeapAlloc(GetProcessHeap(), 0, - (n + 1 + lstrlenW(test_remoteNameB)) * sizeof(WCHAR)); - - if (!test_currentDir || !test_localPathA || !test_localPathB - || !test_remotePathA || !test_remotePathB) - { - skip("Couldn't allocate memory for full paths\n"); - return FALSE; - } - - if (GetCurrentDirectoryW(n, test_currentDir) != n - 1) - { - skip("Couldn't get current directory\n"); - return FALSE; - } - - wsprintfW(test_localPathA, format, test_currentDir, test_localNameA); - wsprintfW(test_localPathB, format, test_currentDir, test_localNameB); - wsprintfW(test_remotePathA, format, test_currentDir, test_remoteNameA); - wsprintfW(test_remotePathB, format, test_currentDir, test_remoteNameB); - - return TRUE; +static VOID init_paths(void) +{ + WCHAR tmpDir[MAX_PATH]; + WCHAR prefix[] = {'q', 'm', 'g', 'r', 0}; + + GetTempPathW(MAX_PATH, tmpDir); + + GetTempFileNameW(tmpDir, prefix, 0, test_localPathA); + GetTempFileNameW(tmpDir, prefix, 0, test_localPathB); + GetTempFileNameW(tmpDir, prefix, 0, test_remotePathA); + GetTempFileNameW(tmpDir, prefix, 0, test_remotePathB); } /* Generic test setup */ @@ -545,8 +511,7 @@ }; const test_t *test; - if (!init_paths()) - return; + init_paths(); CoInitialize(NULL); Modified: trunk/rostests/winetests/qmgr/qmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qmgr/qmgr.c?rev… ============================================================================== --- trunk/rostests/winetests/qmgr/qmgr.c [iso-8859-1] (original) +++ trunk/rostests/winetests/qmgr/qmgr.c [iso-8859-1] Sun Jun 16 11:10:56 2013 @@ -18,13 +18,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> +//#include <stdio.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H #define COBJMACROS -#include "wine/test.h" -#include "initguid.h" -#include "bits.h" +#include <wine/test.h> + +#include <winnls.h> +#include <initguid.h> +#include <objbase.h> +#include <bits.h> static WCHAR progname[MAX_PATH]; @@ -38,6 +45,11 @@ /* Creating BITS instance */ hres = CoCreateInstance(&CLSID_BackgroundCopyManager, NULL, CLSCTX_LOCAL_SERVER, &IID_IBackgroundCopyManager, (void **) &manager); + + if(hres == __HRESULT_FROM_WIN32(ERROR_SERVICE_DISABLED)) { + skip("Needed Service is disabled\n"); + return; + } ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); if(hres != S_OK) { skip("Unable to create bits instance.\n"); @@ -203,6 +215,7 @@ BOOL found = FALSE; hres = IEnumBackgroundCopyJobs_GetCount(enumJobs, &n); + ok(hres == S_OK, "GetCount failed: %08x\n", hres); for (i = 0; i < n && !found; ++i) { LPWSTR name; @@ -214,6 +227,7 @@ IBackgroundCopyJob_Release(job); } hres = IEnumBackgroundCopyJobs_Release(enumJobs); + ok(hres == S_OK, "Release failed: %08x\n", hres); ok(found, "Adding a job in another process failed\n"); } Modified: trunk/rostests/winetests/qmgr/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qmgr/testlist.c… ============================================================================== --- trunk/rostests/winetests/qmgr/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/qmgr/testlist.c [iso-8859-1] Sun Jun 16 11:10:56 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_enum_files(void); extern void func_enum_jobs(void);

1 0

[akhaldi] 59226: [QMGR] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 16 Jun '13

16 Jun '13

Author: akhaldi Date: Sun Jun 16 11:10:20 2013 New Revision: 59226 URL: http://svn.reactos.org/svn/reactos?rev=59226&view=rev Log: [QMGR] * Sync with Wine 1.5.26. Modified: trunk/reactos/dll/win32/qmgr/CMakeLists.txt trunk/reactos/dll/win32/qmgr/enum_files.c trunk/reactos/dll/win32/qmgr/enum_jobs.c trunk/reactos/dll/win32/qmgr/factory.c trunk/reactos/dll/win32/qmgr/file.c trunk/reactos/dll/win32/qmgr/job.c trunk/reactos/dll/win32/qmgr/qmgr.c trunk/reactos/dll/win32/qmgr/qmgr.h trunk/reactos/dll/win32/qmgr/service.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/qmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/CMakeLists.… ============================================================================== --- trunk/reactos/dll/win32/qmgr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/CMakeLists.txt [iso-8859-1] Sun Jun 16 11:10:20 2013 @@ -18,6 +18,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/qmgr.def) add_library(qmgr SHARED ${SOURCE}) +set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/qmgr.inf) add_idl_headers(qmgr_idlheader qmgr_local.idl) set_module_type(qmgr win32dll) target_link_libraries(qmgr uuid wine) Modified: trunk/reactos/dll/win32/qmgr/enum_files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/enum_files.… ============================================================================== --- trunk/reactos/dll/win32/qmgr/enum_files.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/enum_files.c [iso-8859-1] Sun Jun 16 11:10:20 2013 @@ -23,64 +23,67 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); -static void EnumBackgroundCopyFilesDestructor(EnumBackgroundCopyFilesImpl *This) -{ +typedef struct +{ + IEnumBackgroundCopyFiles IEnumBackgroundCopyFiles_iface; + LONG ref; + IBackgroundCopyFile **files; + ULONG numFiles; + ULONG indexFiles; +} EnumBackgroundCopyFilesImpl; + +static inline EnumBackgroundCopyFilesImpl *impl_from_IEnumBackgroundCopyFiles(IEnumBackgroundCopyFiles *iface) +{ + return CONTAINING_RECORD(iface, EnumBackgroundCopyFilesImpl, IEnumBackgroundCopyFiles_iface); +} + +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_QueryInterface(IEnumBackgroundCopyFiles *iface, + REFIID riid, void **ppv) +{ + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv); + + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumBackgroundCopyFiles)) + { + *ppv = iface; + IEnumBackgroundCopyFiles_AddRef(iface); + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI BITS_IEnumBackgroundCopyFiles_AddRef(IEnumBackgroundCopyFiles *iface) +{ + EnumBackgroundCopyFilesImpl *This = impl_from_IEnumBackgroundCopyFiles(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + return ref; +} + +static ULONG WINAPI BITS_IEnumBackgroundCopyFiles_Release(IEnumBackgroundCopyFiles *iface) +{ + EnumBackgroundCopyFilesImpl *This = impl_from_IEnumBackgroundCopyFiles(iface); + ULONG ref = InterlockedDecrement(&This->ref); ULONG i; - for(i = 0; i < This->numFiles; i++) - IBackgroundCopyFile_Release(This->files[i]); - - HeapFree(GetProcessHeap(), 0, This->files); - HeapFree(GetProcessHeap(), 0, This); -} - -static ULONG WINAPI BITS_IEnumBackgroundCopyFiles_AddRef( - IEnumBackgroundCopyFiles* iface) -{ - EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; - return InterlockedIncrement(&This->ref); -} - -static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_QueryInterface( - IEnumBackgroundCopyFiles* iface, - REFIID riid, - void **ppvObject) -{ - EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; - TRACE("IID: %s\n", debugstr_guid(riid)); - - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IEnumBackgroundCopyFiles)) - { - *ppvObject = &This->lpVtbl; - BITS_IEnumBackgroundCopyFiles_AddRef(iface); - return S_OK; - } - - *ppvObject = NULL; - return E_NOINTERFACE; -} - -static ULONG WINAPI BITS_IEnumBackgroundCopyFiles_Release( - IEnumBackgroundCopyFiles* iface) -{ - EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; - ULONG ref = InterlockedDecrement(&This->ref); - if (ref == 0) - EnumBackgroundCopyFilesDestructor(This); + { + for(i = 0; i < This->numFiles; i++) + IBackgroundCopyFile_Release(This->files[i]); + HeapFree(GetProcessHeap(), 0, This->files); + HeapFree(GetProcessHeap(), 0, This); + } return ref; } /* Return reference to one or more files in the file enumerator */ -static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Next( - IEnumBackgroundCopyFiles* iface, - ULONG celt, - IBackgroundCopyFile **rgelt, - ULONG *pceltFetched) -{ - EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Next(IEnumBackgroundCopyFiles *iface, + ULONG celt, IBackgroundCopyFile **rgelt, ULONG *pceltFetched) +{ + EnumBackgroundCopyFilesImpl *This = impl_from_IEnumBackgroundCopyFiles(iface); ULONG fetched; ULONG i; IBackgroundCopyFile *file; @@ -115,11 +118,10 @@ } /* Skip over one or more files in the file enumerator */ -static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Skip( - IEnumBackgroundCopyFiles* iface, - ULONG celt) -{ - EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Skip(IEnumBackgroundCopyFiles *iface, + ULONG celt) +{ + EnumBackgroundCopyFilesImpl *This = impl_from_IEnumBackgroundCopyFiles(iface); if (celt > This->numFiles - This->indexFiles) { @@ -131,27 +133,24 @@ return S_OK; } -static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Reset( - IEnumBackgroundCopyFiles* iface) -{ - EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Reset(IEnumBackgroundCopyFiles *iface) +{ + EnumBackgroundCopyFilesImpl *This = impl_from_IEnumBackgroundCopyFiles(iface); This->indexFiles = 0; return S_OK; } -static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Clone( - IEnumBackgroundCopyFiles* iface, - IEnumBackgroundCopyFiles **ppenum) +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Clone(IEnumBackgroundCopyFiles *iface, + IEnumBackgroundCopyFiles **ppenum) { FIXME("Not implemented\n"); return E_NOTIMPL; } -static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_GetCount( - IEnumBackgroundCopyFiles* iface, - ULONG *puCount) -{ - EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_GetCount(IEnumBackgroundCopyFiles *iface, + ULONG *puCount) +{ + EnumBackgroundCopyFilesImpl *This = impl_from_IEnumBackgroundCopyFiles(iface); *puCount = This->numFiles; return S_OK; } @@ -168,20 +167,19 @@ BITS_IEnumBackgroundCopyFiles_GetCount }; -HRESULT EnumBackgroundCopyFilesConstructor(LPVOID *ppObj, IBackgroundCopyJob2 *iCopyJob) +HRESULT EnumBackgroundCopyFilesConstructor(BackgroundCopyJobImpl *job, IEnumBackgroundCopyFiles **enum_files) { EnumBackgroundCopyFilesImpl *This; BackgroundCopyFileImpl *file; - BackgroundCopyJobImpl *job = (BackgroundCopyJobImpl *) iCopyJob; ULONG i; - TRACE("%p, %p)\n", ppObj, job); + TRACE("%p, %p)\n", job, enum_files); This = HeapAlloc(GetProcessHeap(), 0, sizeof *This); if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &BITS_IEnumBackgroundCopyFiles_Vtbl; + This->IEnumBackgroundCopyFiles_iface.lpVtbl = &BITS_IEnumBackgroundCopyFiles_Vtbl; This->ref = 1; /* Create array of files */ @@ -204,12 +202,12 @@ i = 0; LIST_FOR_EACH_ENTRY(file, &job->files, BackgroundCopyFileImpl, entryFromJob) { - file->lpVtbl->AddRef((IBackgroundCopyFile *) file); - This->files[i] = (IBackgroundCopyFile *) file; + IBackgroundCopyFile_AddRef(&file->IBackgroundCopyFile_iface); + This->files[i] = &file->IBackgroundCopyFile_iface; ++i; } LeaveCriticalSection(&job->cs); - *ppObj = &This->lpVtbl; - return S_OK; -} + *enum_files = &This->IEnumBackgroundCopyFiles_iface; + return S_OK; +} Modified: trunk/reactos/dll/win32/qmgr/enum_jobs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/enum_jobs.c… ============================================================================== --- trunk/reactos/dll/win32/qmgr/enum_jobs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/enum_jobs.c [iso-8859-1] Sun Jun 16 11:10:20 2013 @@ -23,63 +23,68 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); -static void EnumBackgroundCopyJobsDestructor(EnumBackgroundCopyJobsImpl *This) -{ +typedef struct +{ + IEnumBackgroundCopyJobs IEnumBackgroundCopyJobs_iface; + LONG ref; + IBackgroundCopyJob **jobs; + ULONG numJobs; + ULONG indexJobs; +} EnumBackgroundCopyJobsImpl; + +static inline EnumBackgroundCopyJobsImpl *impl_from_IEnumBackgroundCopyJobs(IEnumBackgroundCopyJobs *iface) +{ + return CONTAINING_RECORD(iface, EnumBackgroundCopyJobsImpl, IEnumBackgroundCopyJobs_iface); +} + +static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_QueryInterface(IEnumBackgroundCopyJobs *iface, + REFIID riid, void **ppv) +{ + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv); + + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumBackgroundCopyJobs)) + { + *ppv = iface; + IEnumBackgroundCopyJobs_AddRef(iface); + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI BITS_IEnumBackgroundCopyJobs_AddRef(IEnumBackgroundCopyJobs *iface) +{ + EnumBackgroundCopyJobsImpl *This = impl_from_IEnumBackgroundCopyJobs(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI BITS_IEnumBackgroundCopyJobs_Release(IEnumBackgroundCopyJobs *iface) +{ + EnumBackgroundCopyJobsImpl *This = impl_from_IEnumBackgroundCopyJobs(iface); + ULONG ref = InterlockedDecrement(&This->ref); ULONG i; - for(i = 0; i < This->numJobs; i++) - IBackgroundCopyJob_Release(This->jobs[i]); - - HeapFree(GetProcessHeap(), 0, This->jobs); - HeapFree(GetProcessHeap(), 0, This); -} - -static ULONG WINAPI BITS_IEnumBackgroundCopyJobs_AddRef( - IEnumBackgroundCopyJobs* iface) -{ - EnumBackgroundCopyJobsImpl *This = (EnumBackgroundCopyJobsImpl *) iface; - return InterlockedIncrement(&This->ref); -} - -static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_QueryInterface( - IEnumBackgroundCopyJobs* iface, - REFIID riid, - void **ppvObject) -{ - EnumBackgroundCopyJobsImpl *This = (EnumBackgroundCopyJobsImpl *) iface; - TRACE("IID: %s\n", debugstr_guid(riid)); - - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IEnumBackgroundCopyJobs)) - { - *ppvObject = &This->lpVtbl; - BITS_IEnumBackgroundCopyJobs_AddRef(iface); - return S_OK; - } - - *ppvObject = NULL; - return E_NOINTERFACE; -} - -static ULONG WINAPI BITS_IEnumBackgroundCopyJobs_Release( - IEnumBackgroundCopyJobs* iface) -{ - EnumBackgroundCopyJobsImpl *This = (EnumBackgroundCopyJobsImpl *) iface; - ULONG ref = InterlockedDecrement(&This->ref); - - if (ref == 0) - EnumBackgroundCopyJobsDestructor(This); + TRACE("(%p) ref=%d\n", This, ref); + + if (ref == 0) { + for(i = 0; i < This->numJobs; i++) + IBackgroundCopyJob_Release(This->jobs[i]); + HeapFree(GetProcessHeap(), 0, This->jobs); + HeapFree(GetProcessHeap(), 0, This); + } return ref; } -static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_Next( - IEnumBackgroundCopyJobs* iface, - ULONG celt, - IBackgroundCopyJob **rgelt, - ULONG *pceltFetched) -{ - EnumBackgroundCopyJobsImpl *This = (EnumBackgroundCopyJobsImpl *) iface; +static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_Next(IEnumBackgroundCopyJobs *iface, ULONG celt, + IBackgroundCopyJob **rgelt, ULONG *pceltFetched) +{ + EnumBackgroundCopyJobsImpl *This = impl_from_IEnumBackgroundCopyJobs(iface); ULONG fetched; ULONG i; IBackgroundCopyJob *job; @@ -110,11 +115,9 @@ return fetched == celt ? S_OK : S_FALSE; } -static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_Skip( - IEnumBackgroundCopyJobs* iface, - ULONG celt) -{ - EnumBackgroundCopyJobsImpl *This = (EnumBackgroundCopyJobsImpl *) iface; +static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_Skip(IEnumBackgroundCopyJobs *iface, ULONG celt) +{ + EnumBackgroundCopyJobsImpl *This = impl_from_IEnumBackgroundCopyJobs(iface); if (This->numJobs - This->indexJobs < celt) { @@ -126,27 +129,24 @@ return S_OK; } -static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_Reset( - IEnumBackgroundCopyJobs* iface) -{ - EnumBackgroundCopyJobsImpl *This = (EnumBackgroundCopyJobsImpl *) iface; +static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_Reset(IEnumBackgroundCopyJobs *iface) +{ + EnumBackgroundCopyJobsImpl *This = impl_from_IEnumBackgroundCopyJobs(iface); This->indexJobs = 0; return S_OK; } -static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_Clone( - IEnumBackgroundCopyJobs* iface, - IEnumBackgroundCopyJobs **ppenum) +static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_Clone(IEnumBackgroundCopyJobs *iface, + IEnumBackgroundCopyJobs **ppenum) { FIXME("Not implemented\n"); return E_NOTIMPL; } -static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_GetCount( - IEnumBackgroundCopyJobs* iface, +static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_GetCount(IEnumBackgroundCopyJobs *iface, ULONG *puCount) { - EnumBackgroundCopyJobsImpl *This = (EnumBackgroundCopyJobsImpl *) iface; + EnumBackgroundCopyJobsImpl *This = impl_from_IEnumBackgroundCopyJobs(iface); *puCount = This->numJobs; return S_OK; } @@ -163,20 +163,18 @@ BITS_IEnumBackgroundCopyJobs_GetCount }; -HRESULT EnumBackgroundCopyJobsConstructor(LPVOID *ppObj, - IBackgroundCopyManager* copyManager) -{ - BackgroundCopyManagerImpl *qmgr = (BackgroundCopyManagerImpl *) copyManager; +HRESULT enum_copy_job_create(BackgroundCopyManagerImpl *qmgr, IEnumBackgroundCopyJobs **enumjob) +{ EnumBackgroundCopyJobsImpl *This; BackgroundCopyJobImpl *job; ULONG i; - TRACE("%p, %p)\n", ppObj, copyManager); + TRACE("%p, %p)\n", qmgr, enumjob); This = HeapAlloc(GetProcessHeap(), 0, sizeof *This); if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &BITS_IEnumBackgroundCopyJobs_Vtbl; + This->IEnumBackgroundCopyJobs_iface.lpVtbl = &BITS_IEnumBackgroundCopyJobs_Vtbl; This->ref = 1; /* Create array of jobs */ @@ -202,12 +200,12 @@ i = 0; LIST_FOR_EACH_ENTRY(job, &qmgr->jobs, BackgroundCopyJobImpl, entryFromQmgr) { - IBackgroundCopyJob *iJob = (IBackgroundCopyJob *) job; - IBackgroundCopyJob_AddRef(iJob); - This->jobs[i++] = iJob; + IBackgroundCopyJob *job_iface = (IBackgroundCopyJob*)&job->IBackgroundCopyJob2_iface; + IBackgroundCopyJob_AddRef(job_iface); + This->jobs[i++] = job_iface; } LeaveCriticalSection(&qmgr->cs); - *ppObj = &This->lpVtbl; - return S_OK; -} + *enumjob = &This->IEnumBackgroundCopyJobs_iface; + return S_OK; +} Modified: trunk/reactos/dll/win32/qmgr/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/factory.c?r… ============================================================================== --- trunk/reactos/dll/win32/qmgr/factory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/factory.c [iso-8859-1] Sun Jun 16 11:10:20 2013 @@ -26,20 +26,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); static ULONG WINAPI -BITS_IClassFactory_AddRef(LPCLASSFACTORY iface) +BITS_IClassFactory_AddRef(IClassFactory *iface) { - return 2; + return 2; /* non-heap based object */ } static HRESULT WINAPI -BITS_IClassFactory_QueryInterface(LPCLASSFACTORY iface, REFIID riid, - LPVOID *ppvObj) +BITS_IClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppvObj) { - ClassFactoryImpl *This = (ClassFactoryImpl *) iface; - if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { - *ppvObj = &This->lpVtbl; + *ppvObj = &BITS_ClassFactory.IClassFactory_iface; return S_OK; } @@ -48,14 +45,14 @@ } static ULONG WINAPI -BITS_IClassFactory_Release(LPCLASSFACTORY iface) +BITS_IClassFactory_Release(IClassFactory *iface) { - return 1; + return 1; /* non-heap based object */ } static HRESULT WINAPI -BITS_IClassFactory_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pUnkOuter, - REFIID riid, LPVOID *ppvObj) +BITS_IClassFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, + void **ppvObj) { HRESULT res; IUnknown *punk = NULL; @@ -75,7 +72,7 @@ } static HRESULT WINAPI -BITS_IClassFactory_LockServer(LPCLASSFACTORY iface, BOOL fLock) +BITS_IClassFactory_LockServer(IClassFactory *iface, BOOL fLock) { FIXME("Not implemented\n"); return E_NOTIMPL; @@ -92,5 +89,5 @@ ClassFactoryImpl BITS_ClassFactory = { - &BITS_IClassFactory_Vtbl + { &BITS_IClassFactory_Vtbl } }; Modified: trunk/reactos/dll/win32/qmgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/file.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/qmgr/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/file.c [iso-8859-1] Sun Jun 16 11:10:20 2013 @@ -39,48 +39,55 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); -static void BackgroundCopyFileDestructor(BackgroundCopyFileImpl *This) -{ - IBackgroundCopyJob_Release((IBackgroundCopyJob *) This->owner); - HeapFree(GetProcessHeap(), 0, This->info.LocalName); - HeapFree(GetProcessHeap(), 0, This->info.RemoteName); - HeapFree(GetProcessHeap(), 0, This); -} - -static ULONG WINAPI BITS_IBackgroundCopyFile_AddRef(IBackgroundCopyFile* iface) -{ - BackgroundCopyFileImpl *This = (BackgroundCopyFileImpl *) iface; - return InterlockedIncrement(&This->ref); +static inline BackgroundCopyFileImpl *impl_from_IBackgroundCopyFile(IBackgroundCopyFile *iface) +{ + return CONTAINING_RECORD(iface, BackgroundCopyFileImpl, IBackgroundCopyFile_iface); } static HRESULT WINAPI BITS_IBackgroundCopyFile_QueryInterface( IBackgroundCopyFile* iface, REFIID riid, - void **ppvObject) -{ - BackgroundCopyFileImpl *This = (BackgroundCopyFileImpl *) iface; + void **obj) +{ + BackgroundCopyFileImpl *This = impl_from_IBackgroundCopyFile(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IBackgroundCopyFile)) { - *ppvObject = &This->lpVtbl; - BITS_IBackgroundCopyFile_AddRef(iface); + *obj = iface; + IBackgroundCopyFile_AddRef(iface); return S_OK; } - *ppvObject = NULL; + *obj = NULL; return E_NOINTERFACE; } +static ULONG WINAPI BITS_IBackgroundCopyFile_AddRef(IBackgroundCopyFile* iface) +{ + BackgroundCopyFileImpl *This = impl_from_IBackgroundCopyFile(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} static ULONG WINAPI BITS_IBackgroundCopyFile_Release( IBackgroundCopyFile* iface) { - BackgroundCopyFileImpl *This = (BackgroundCopyFileImpl *) iface; + BackgroundCopyFileImpl *This = impl_from_IBackgroundCopyFile(iface); ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + if (ref == 0) - BackgroundCopyFileDestructor(This); + { + IBackgroundCopyJob2_Release(&This->owner->IBackgroundCopyJob2_iface); + HeapFree(GetProcessHeap(), 0, This->info.LocalName); + HeapFree(GetProcessHeap(), 0, This->info.RemoteName); + HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -90,7 +97,7 @@ IBackgroundCopyFile* iface, LPWSTR *pVal) { - BackgroundCopyFileImpl *This = (BackgroundCopyFileImpl *) iface; + BackgroundCopyFileImpl *This = impl_from_IBackgroundCopyFile(iface); int n = (lstrlenW(This->info.RemoteName) + 1) * sizeof(WCHAR); *pVal = CoTaskMemAlloc(n); @@ -105,7 +112,7 @@ IBackgroundCopyFile* iface, LPWSTR *pVal) { - BackgroundCopyFileImpl *This = (BackgroundCopyFileImpl *) iface; + BackgroundCopyFileImpl *This = impl_from_IBackgroundCopyFile(iface); int n = (lstrlenW(This->info.LocalName) + 1) * sizeof(WCHAR); *pVal = CoTaskMemAlloc(n); @@ -120,7 +127,7 @@ IBackgroundCopyFile* iface, BG_FILE_PROGRESS *pVal) { - BackgroundCopyFileImpl *This = (BackgroundCopyFileImpl *) iface; + BackgroundCopyFileImpl *This = impl_from_IBackgroundCopyFile(iface); EnterCriticalSection(&This->owner->cs); pVal->BytesTotal = This->fileProgress.BytesTotal; @@ -143,13 +150,12 @@ HRESULT BackgroundCopyFileConstructor(BackgroundCopyJobImpl *owner, LPCWSTR remoteName, LPCWSTR localName, - LPVOID *ppObj) + BackgroundCopyFileImpl **file) { BackgroundCopyFileImpl *This; int n; - TRACE("(%s,%s,%p)\n", debugstr_w(remoteName), - debugstr_w(localName), ppObj); + TRACE("(%s, %s, %p)\n", debugstr_w(remoteName), debugstr_w(localName), file); This = HeapAlloc(GetProcessHeap(), 0, sizeof *This); if (!This) @@ -174,16 +180,16 @@ } memcpy(This->info.LocalName, localName, n); - This->lpVtbl = &BITS_IBackgroundCopyFile_Vtbl; + This->IBackgroundCopyFile_iface.lpVtbl = &BITS_IBackgroundCopyFile_Vtbl; This->ref = 1; This->fileProgress.BytesTotal = BG_SIZE_UNKNOWN; This->fileProgress.BytesTransferred = 0; This->fileProgress.Completed = FALSE; This->owner = owner; - IBackgroundCopyJob_AddRef((IBackgroundCopyJob *) owner); - - *ppObj = &This->lpVtbl; + IBackgroundCopyJob2_AddRef(&owner->IBackgroundCopyJob2_iface); + + *file = This; return S_OK; } @@ -217,25 +223,30 @@ typedef struct { - const IBindStatusCallbackVtbl *lpVtbl; + IBindStatusCallback IBindStatusCallback_iface; BackgroundCopyFileImpl *file; LONG ref; } DLBindStatusCallback; +static inline DLBindStatusCallback *impl_from_IBindStatusCallback(IBindStatusCallback *iface) +{ + return CONTAINING_RECORD(iface, DLBindStatusCallback, IBindStatusCallback_iface); +} + static ULONG WINAPI DLBindStatusCallback_AddRef(IBindStatusCallback *iface) { - DLBindStatusCallback *This = (DLBindStatusCallback *) iface; + DLBindStatusCallback *This = impl_from_IBindStatusCallback(iface); return InterlockedIncrement(&This->ref); } static ULONG WINAPI DLBindStatusCallback_Release(IBindStatusCallback *iface) { - DLBindStatusCallback *This = (DLBindStatusCallback *) iface; + DLBindStatusCallback *This = impl_from_IBindStatusCallback(iface); ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) { - IBackgroundCopyFile_Release((IBackgroundCopyFile *) This->file); + IBackgroundCopyFile_Release(&This->file->IBackgroundCopyFile_iface); HeapFree(GetProcessHeap(), 0, This); } @@ -247,12 +258,12 @@ REFIID riid, void **ppvObject) { - DLBindStatusCallback *This = (DLBindStatusCallback *) iface; + DLBindStatusCallback *This = impl_from_IBindStatusCallback(iface); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IBindStatusCallback)) { - *ppvObject = &This->lpVtbl; + *ppvObject = &This->IBindStatusCallback_iface; DLBindStatusCallback_AddRef(iface); return S_OK; } @@ -308,7 +319,7 @@ ULONG statusCode, LPCWSTR statusText) { - DLBindStatusCallback *This = (DLBindStatusCallback *) iface; + DLBindStatusCallback *This = impl_from_IBindStatusCallback(iface); BackgroundCopyFileImpl *file = This->file; BackgroundCopyJobImpl *job = file->owner; ULONG64 diff; @@ -363,8 +374,8 @@ if (!This) return NULL; - This->lpVtbl = &DLBindStatusCallback_Vtbl; - IBackgroundCopyFile_AddRef((IBackgroundCopyFile *) file); + This->IBindStatusCallback_iface.lpVtbl = &DLBindStatusCallback_Vtbl; + IBackgroundCopyFile_AddRef(&file->IBackgroundCopyFile_iface); This->file = file; This->ref = 1; return This; @@ -373,7 +384,7 @@ BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) { static const WCHAR prefix[] = {'B','I','T', 0}; - IBindStatusCallback *callbackObj; + DLBindStatusCallback *callbackObj; WCHAR tmpDir[MAX_PATH]; WCHAR tmpName[MAX_PATH]; HRESULT hr; @@ -394,7 +405,7 @@ return FALSE; } - callbackObj = (IBindStatusCallback *) DLBindStatusCallbackConstructor(file); + callbackObj = DLBindStatusCallbackConstructor(file); if (!callbackObj) { ERR("Out of memory\n"); @@ -416,8 +427,9 @@ transitionJobState(job, BG_JOB_STATE_QUEUED, BG_JOB_STATE_TRANSFERRING); DeleteUrlCacheEntryW(file->info.RemoteName); - hr = URLDownloadToFileW(NULL, file->info.RemoteName, tmpName, 0, callbackObj); - IBindStatusCallback_Release(callbackObj); + hr = URLDownloadToFileW(NULL, file->info.RemoteName, tmpName, 0, + &callbackObj->IBindStatusCallback_iface); + IBindStatusCallback_Release(&callbackObj->IBindStatusCallback_iface); if (hr == INET_E_DOWNLOAD_FAILURE) { TRACE("URLDownload failed, trying local file copy\n"); Modified: trunk/reactos/dll/win32/qmgr/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/job.c?rev=5… ============================================================================== --- trunk/reactos/dll/win32/qmgr/job.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/job.c [iso-8859-1] Sun Jun 16 11:10:20 2013 @@ -28,45 +28,53 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); -static void BackgroundCopyJobDestructor(BackgroundCopyJobImpl *This) -{ - DeleteCriticalSection(&This->cs); - HeapFree(GetProcessHeap(), 0, This->displayName); - HeapFree(GetProcessHeap(), 0, This); -} - -static ULONG WINAPI BITS_IBackgroundCopyJob_AddRef(IBackgroundCopyJob2 *iface) -{ - BackgroundCopyJobImpl *This = (BackgroundCopyJobImpl *) iface; - return InterlockedIncrement(&This->ref); +static inline BackgroundCopyJobImpl *impl_from_IBackgroundCopyJob2(IBackgroundCopyJob2 *iface) +{ + return CONTAINING_RECORD(iface, BackgroundCopyJobImpl, IBackgroundCopyJob2_iface); } static HRESULT WINAPI BITS_IBackgroundCopyJob_QueryInterface( - IBackgroundCopyJob2 *iface, REFIID riid, LPVOID *ppvObject) -{ - BackgroundCopyJobImpl *This = (BackgroundCopyJobImpl *) iface; - TRACE("IID: %s\n", debugstr_guid(riid)); + IBackgroundCopyJob2 *iface, REFIID riid, void **obj) +{ + BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob2(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IBackgroundCopyJob) || IsEqualGUID(riid, &IID_IBackgroundCopyJob2)) { - *ppvObject = &This->lpVtbl; - BITS_IBackgroundCopyJob_AddRef(iface); + *obj = iface; + IBackgroundCopyJob2_AddRef(iface); return S_OK; } - *ppvObject = NULL; + *obj = NULL; return E_NOINTERFACE; } +static ULONG WINAPI BITS_IBackgroundCopyJob_AddRef(IBackgroundCopyJob2 *iface) +{ + BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob2(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + static ULONG WINAPI BITS_IBackgroundCopyJob_Release(IBackgroundCopyJob2 *iface) { - BackgroundCopyJobImpl *This = (BackgroundCopyJobImpl *) iface; + BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob2(iface); ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + if (ref == 0) - BackgroundCopyJobDestructor(This); + { + This->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->cs); + HeapFree(GetProcessHeap(), 0, This->displayName); + HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -81,7 +89,7 @@ ULONG i; for (i = 0; i < cFileCount; ++i) { - HRESULT hr = IBackgroundCopyJob_AddFile(iface, pFileSet[i].RemoteName, + HRESULT hr = IBackgroundCopyJob2_AddFile(iface, pFileSet[i].RemoteName, pFileSet[i].LocalName); if (FAILED(hr)) return hr; @@ -94,21 +102,19 @@ LPCWSTR RemoteUrl, LPCWSTR LocalName) { - BackgroundCopyJobImpl *This = (BackgroundCopyJobImpl *) iface; - IBackgroundCopyFile *pFile; + BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob2(iface); BackgroundCopyFileImpl *file; HRESULT res; /* We should return E_INVALIDARG in these cases. */ FIXME("Check for valid filenames and supported protocols\n"); - res = BackgroundCopyFileConstructor(This, RemoteUrl, LocalName, (LPVOID *) &pFile); + res = BackgroundCopyFileConstructor(This, RemoteUrl, LocalName, &file); if (res != S_OK) return res; /* Add a reference to the file to file list */ - IBackgroundCopyFile_AddRef(pFile); - file = (BackgroundCopyFileImpl *) pFile; + IBackgroundCopyFile_AddRef(&file->IBackgroundCopyFile_iface); EnterCriticalSection(&This->cs); list_add_head(&This->files, &file->entryFromJob); This->jobProgress.BytesTotal = BG_SIZE_UNKNOWN; @@ -120,10 +126,11 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_EnumFiles( IBackgroundCopyJob2 *iface, - IEnumBackgroundCopyFiles **ppEnum) -{ - TRACE("\n"); - return EnumBackgroundCopyFilesConstructor((LPVOID *) ppEnum, iface); + IEnumBackgroundCopyFiles **enum_files) +{ + BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob2(iface); + TRACE("(%p)->(%p)\n", This, enum_files); + return EnumBackgroundCopyFilesConstructor(This, enum_files); } static HRESULT WINAPI BITS_IBackgroundCopyJob_Suspend( @@ -136,7 +143,7 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_Resume( IBackgroundCopyJob2 *iface) { - BackgroundCopyJobImpl *This = (BackgroundCopyJobImpl *) iface; + BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob2(iface); HRESULT rv = S_OK; EnterCriticalSection(&globalMgr.cs); @@ -170,7 +177,7 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_Complete( IBackgroundCopyJob2 *iface) { - BackgroundCopyJobImpl *This = (BackgroundCopyJobImpl *) iface; + BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob2(iface); HRESULT rv = S_OK; EnterCriticalSection(&This->cs); @@ -213,7 +220,7 @@ IBackgroundCopyJob2 *iface, GUID *pVal) { - BackgroundCopyJobImpl *This = (BackgroundCopyJobImpl *) iface; + BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob2(iface); *pVal = This->jobId; return S_OK; } @@ -222,7 +229,7 @@ IBackgroundCopyJob2 *iface, BG_JOB_TYPE *pVal) { - BackgroundCopyJobImpl *This = (BackgroundCopyJobImpl *) iface; + BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob2(iface); if (!pVal) return E_INVALIDARG; @@ -235,7 +242,7 @@ IBackgroundCopyJob2 *iface, BG_JOB_PROGRESS *pVal) { - BackgroundCopyJobImpl *This = (BackgroundCopyJobImpl *) iface; + BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob2(iface); if (!pVal) return E_INVALIDARG; @@ -262,7 +269,7 @@ IBackgroundCopyJob2 *iface, BG_JOB_STATE *pVal) { - BackgroundCopyJobImpl *This = (BackgroundCopyJobImpl *) iface; + BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob2(iface); if (!pVal) return E_INVALIDARG; @@ -300,7 +307,7 @@ IBackgroundCopyJob2 *iface, LPWSTR *pVal) { - BackgroundCopyJobImpl *This = (BackgroundCopyJobImpl *) iface; + BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob2(iface); int n; if (!pVal) @@ -562,21 +569,22 @@ BITS_IBackgroundCopyJob_RemoveCredentials }; -HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, - GUID *pJobId, LPVOID *ppObj) +HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID *job_id, BackgroundCopyJobImpl **job) { HRESULT hr; BackgroundCopyJobImpl *This; int n; - TRACE("(%s,%d,%p)\n", debugstr_w(displayName), type, ppObj); + TRACE("(%s,%d,%p)\n", debugstr_w(displayName), type, job); This = HeapAlloc(GetProcessHeap(), 0, sizeof *This); if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &BITS_IBackgroundCopyJob_Vtbl; + This->IBackgroundCopyJob2_iface.lpVtbl = &BITS_IBackgroundCopyJob_Vtbl; InitializeCriticalSection(&This->cs); + This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": BackgroundCopyJobImpl.cs"); + This->ref = 1; This->type = type; @@ -584,6 +592,7 @@ This->displayName = HeapAlloc(GetProcessHeap(), 0, n); if (!This->displayName) { + This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); HeapFree(GetProcessHeap(), 0, This); return E_OUTOFMEMORY; @@ -593,12 +602,13 @@ hr = CoCreateGuid(&This->jobId); if (FAILED(hr)) { + This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); HeapFree(GetProcessHeap(), 0, This->displayName); HeapFree(GetProcessHeap(), 0, This); return hr; } - *pJobId = This->jobId; + *job_id = This->jobId; list_init(&This->files); This->jobProgress.BytesTotal = 0; @@ -608,7 +618,7 @@ This->state = BG_JOB_STATE_SUSPENDED; - *ppObj = &This->lpVtbl; + *job = This; return S_OK; } Modified: trunk/reactos/dll/win32/qmgr/qmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/qmgr.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/qmgr/qmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/qmgr.c [iso-8859-1] Sun Jun 16 11:10:20 2013 @@ -23,93 +23,72 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); -/* Add a reference to the iface pointer */ -static ULONG WINAPI BITS_IBackgroundCopyManager_AddRef( - IBackgroundCopyManager* iface) +BackgroundCopyManagerImpl globalMgr; + +static HRESULT WINAPI BITS_IBackgroundCopyManager_QueryInterface(IBackgroundCopyManager *iface, + REFIID riid, void **ppv) +{ + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv); + + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IBackgroundCopyManager)) + { + *ppv = iface; + IBackgroundCopyManager_AddRef(iface); + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI BITS_IBackgroundCopyManager_AddRef(IBackgroundCopyManager *iface) { return 2; } -/* Attempt to provide a new interface to interact with iface */ -static HRESULT WINAPI BITS_IBackgroundCopyManager_QueryInterface( - IBackgroundCopyManager* iface, - REFIID riid, - LPVOID *ppvObject) -{ - BackgroundCopyManagerImpl * This = (BackgroundCopyManagerImpl *)iface; - - TRACE("IID: %s\n", debugstr_guid(riid)); - - if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IBackgroundCopyManager)) - { - *ppvObject = &This->lpVtbl; - BITS_IBackgroundCopyManager_AddRef(iface); - return S_OK; - } - - *ppvObject = NULL; - return E_NOINTERFACE; -} - -/* Release an interface to iface */ -static ULONG WINAPI BITS_IBackgroundCopyManager_Release( - IBackgroundCopyManager* iface) +static ULONG WINAPI BITS_IBackgroundCopyManager_Release(IBackgroundCopyManager *iface) { return 1; } /*** IBackgroundCopyManager interface methods ***/ -static HRESULT WINAPI BITS_IBackgroundCopyManager_CreateJob( - IBackgroundCopyManager* iface, - LPCWSTR DisplayName, - BG_JOB_TYPE Type, - GUID *pJobId, - IBackgroundCopyJob **ppJob) +static HRESULT WINAPI BITS_IBackgroundCopyManager_CreateJob(IBackgroundCopyManager *iface, + LPCWSTR DisplayName, BG_JOB_TYPE Type, GUID *pJobId, IBackgroundCopyJob **ppJob) { - BackgroundCopyManagerImpl * This = (BackgroundCopyManagerImpl *) iface; BackgroundCopyJobImpl *job; HRESULT hres; TRACE("\n"); - hres = BackgroundCopyJobConstructor(DisplayName, Type, pJobId, - (LPVOID *) ppJob); + hres = BackgroundCopyJobConstructor(DisplayName, Type, pJobId, &job); if (FAILED(hres)) return hres; /* Add a reference to the job to job list */ + *ppJob = (IBackgroundCopyJob*)&job->IBackgroundCopyJob2_iface; IBackgroundCopyJob_AddRef(*ppJob); - job = (BackgroundCopyJobImpl *) *ppJob; - EnterCriticalSection(&This->cs); - list_add_head(&This->jobs, &job->entryFromQmgr); - LeaveCriticalSection(&This->cs); + EnterCriticalSection(&globalMgr.cs); + list_add_head(&globalMgr.jobs, &job->entryFromQmgr); + LeaveCriticalSection(&globalMgr.cs); return S_OK; } -static HRESULT WINAPI BITS_IBackgroundCopyManager_GetJob( - IBackgroundCopyManager* iface, - REFGUID jobID, - IBackgroundCopyJob **ppJob) +static HRESULT WINAPI BITS_IBackgroundCopyManager_GetJob(IBackgroundCopyManager *iface, + REFGUID jobID, IBackgroundCopyJob **ppJob) { FIXME("Not implemented\n"); return E_NOTIMPL; } -static HRESULT WINAPI BITS_IBackgroundCopyManager_EnumJobs( - IBackgroundCopyManager* iface, - DWORD dwFlags, - IEnumBackgroundCopyJobs **ppEnum) +static HRESULT WINAPI BITS_IBackgroundCopyManager_EnumJobs(IBackgroundCopyManager *iface, + DWORD dwFlags, IEnumBackgroundCopyJobs **ppEnum) { TRACE("\n"); - return EnumBackgroundCopyJobsConstructor((LPVOID *) ppEnum, iface); + return enum_copy_job_create(&globalMgr, ppEnum); } -static HRESULT WINAPI BITS_IBackgroundCopyManager_GetErrorDescription( - IBackgroundCopyManager* iface, - HRESULT hResult, - DWORD LanguageId, - LPWSTR *pErrorDescription) +static HRESULT WINAPI BITS_IBackgroundCopyManager_GetErrorDescription(IBackgroundCopyManager *iface, + HRESULT hResult, DWORD LanguageId, LPWSTR *pErrorDescription) { FIXME("Not implemented\n"); return E_NOTIMPL; @@ -128,7 +107,7 @@ }; BackgroundCopyManagerImpl globalMgr = { - &BITS_IBackgroundCopyManager_Vtbl, + { &BITS_IBackgroundCopyManager_Vtbl }, { NULL, -1, 0, 0, 0, 0 }, NULL, LIST_INIT(globalMgr.jobs) @@ -161,7 +140,7 @@ LIST_FOR_EACH_ENTRY_SAFE(job, jobCur, &qmgr->jobs, BackgroundCopyJobImpl, entryFromQmgr) { list_remove(&job->entryFromQmgr); - IBackgroundCopyJob_Release((IBackgroundCopyJob *) job); + IBackgroundCopyJob2_Release(&job->IBackgroundCopyJob2_iface); } return 0; } @@ -176,7 +155,7 @@ if (job->state == BG_JOB_STATE_ACKNOWLEDGED || job->state == BG_JOB_STATE_CANCELLED) { list_remove(&job->entryFromQmgr); - IBackgroundCopyJob_Release((IBackgroundCopyJob *) job); + IBackgroundCopyJob2_Release(&job->IBackgroundCopyJob2_iface); } else if (job->state == BG_JOB_STATE_QUEUED) { Modified: trunk/reactos/dll/win32/qmgr/qmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/qmgr.h?rev=… ============================================================================== --- trunk/reactos/dll/win32/qmgr/qmgr.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/qmgr.h [iso-8859-1] Sun Jun 16 11:10:20 2013 @@ -40,7 +40,7 @@ /* Background copy job vtbl and related data */ typedef struct { - const IBackgroundCopyJob2Vtbl *lpVtbl; + IBackgroundCopyJob2 IBackgroundCopyJob2_iface; LONG ref; LPWSTR displayName; BG_JOB_TYPE type; @@ -53,30 +53,10 @@ struct list entryFromQmgr; } BackgroundCopyJobImpl; -/* Enum background copy jobs vtbl and related data */ -typedef struct -{ - const IEnumBackgroundCopyJobsVtbl *lpVtbl; - LONG ref; - IBackgroundCopyJob **jobs; - ULONG numJobs; - ULONG indexJobs; -} EnumBackgroundCopyJobsImpl; - -/* Enum background copy files vtbl and related data */ -typedef struct -{ - const IEnumBackgroundCopyFilesVtbl *lpVtbl; - LONG ref; - IBackgroundCopyFile **files; - ULONG numFiles; - ULONG indexFiles; -} EnumBackgroundCopyFilesImpl; - /* Background copy file vtbl and related data */ typedef struct { - const IBackgroundCopyFileVtbl *lpVtbl; + IBackgroundCopyFile IBackgroundCopyFile_iface; LONG ref; BG_FILE_INFO info; BG_FILE_PROGRESS fileProgress; @@ -88,7 +68,7 @@ /* Background copy manager vtbl and related data */ typedef struct { - const IBackgroundCopyManagerVtbl *lpVtbl; + IBackgroundCopyManager IBackgroundCopyManager_iface; /* Protects job list, job states, and jobEvent */ CRITICAL_SECTION cs; HANDLE jobEvent; @@ -97,26 +77,25 @@ typedef struct { - const IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; } ClassFactoryImpl; -extern HANDLE stop_event; -extern ClassFactoryImpl BITS_ClassFactory; -extern BackgroundCopyManagerImpl globalMgr; +extern HANDLE stop_event DECLSPEC_HIDDEN; +extern ClassFactoryImpl BITS_ClassFactory DECLSPEC_HIDDEN; +extern BackgroundCopyManagerImpl globalMgr DECLSPEC_HIDDEN; -HRESULT BackgroundCopyManagerConstructor(IUnknown *pUnkOuter, LPVOID *ppObj); +HRESULT BackgroundCopyManagerConstructor(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, - GUID *pJobId, LPVOID *ppObj); -HRESULT EnumBackgroundCopyJobsConstructor(LPVOID *ppObj, - IBackgroundCopyManager* copyManager); + GUID *pJobId, BackgroundCopyJobImpl **job) DECLSPEC_HIDDEN; +HRESULT enum_copy_job_create(BackgroundCopyManagerImpl *qmgr, + IEnumBackgroundCopyJobs **enumjob) DECLSPEC_HIDDEN; HRESULT BackgroundCopyFileConstructor(BackgroundCopyJobImpl *owner, LPCWSTR remoteName, LPCWSTR localName, - LPVOID *ppObj); -HRESULT EnumBackgroundCopyFilesConstructor(LPVOID *ppObj, - IBackgroundCopyJob2 *copyJob); -DWORD WINAPI fileTransfer(void *param); -void processJob(BackgroundCopyJobImpl *job); -BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job); + BackgroundCopyFileImpl **file) DECLSPEC_HIDDEN; +HRESULT EnumBackgroundCopyFilesConstructor(BackgroundCopyJobImpl*, IEnumBackgroundCopyFiles**) DECLSPEC_HIDDEN; +DWORD WINAPI fileTransfer(void *param) DECLSPEC_HIDDEN; +void processJob(BackgroundCopyJobImpl *job) DECLSPEC_HIDDEN; +BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) DECLSPEC_HIDDEN; /* Little helper functions */ static inline char * Modified: trunk/reactos/dll/win32/qmgr/service.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/service.c?r… ============================================================================== --- trunk/reactos/dll/win32/qmgr/service.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/service.c [iso-8859-1] Sun Jun 16 11:10:20 2013 @@ -95,9 +95,8 @@ return FALSE; hr = CoRegisterClassObject(&CLSID_BackgroundCopyManager, - (IUnknown *) &BITS_ClassFactory, - CLSCTX_LOCAL_SERVER, REGCLS_MULTIPLEUSE, - &dwReg); + (IUnknown *) &BITS_ClassFactory.IClassFactory_iface, + CLSCTX_LOCAL_SERVER, REGCLS_MULTIPLEUSE, &dwReg); if (FAILED(hr)) return FALSE; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Jun 16 11:10:20 2013 @@ -146,7 +146,7 @@ reactos/dll/win32/printui # Synced to Wine-1.5.4 reactos/dll/win32/propsys # Synced to Wine-1.5.26 reactos/dll/win32/pstorec # Synced to Wine-1.5.4 -reactos/dll/win32/qmgr # Synced to Wine-1.2-rc5? +reactos/dll/win32/qmgr # Synced to Wine-1.5-26 reactos/dll/win32/qmgrprxy # Synced to Wine-1.14? reactos/dll/win32/query # Synced to Wine-1.5.19 reactos/dll/win32/rasapi32 # Synced to Wine-1.5.4

1 0

[akhaldi] 59225: [ATACTL] * Add version information. By Lee Schroeder. CR-16 CORE-6822
by akhaldi＠svn.reactos.org 16 Jun '13

16 Jun '13

Author: akhaldi Date: Sun Jun 16 10:58:55 2013 New Revision: 59225 URL: http://svn.reactos.org/svn/reactos?rev=59225&view=rev Log: [ATACTL] * Add version information. By Lee Schroeder. CR-16 CORE-6822 Added: trunk/reactos/base/applications/atactl/atactl.rc (with props) Modified: trunk/reactos/base/applications/atactl/CMakeLists.txt Modified: trunk/reactos/base/applications/atactl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/atactl/C… ============================================================================== --- trunk/reactos/base/applications/atactl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/atactl/CMakeLists.txt [iso-8859-1] Sun Jun 16 10:58:55 2013 @@ -1,10 +1,7 @@ set_cpp() - add_definitions(-DUSER_MODE) include_directories(${REACTOS_SOURCE_DIR}/drivers/storage/ide/uniata) - -add_executable(atactl atactl.cpp) - +add_executable(atactl atactl.cpp atactl.rc) set_module_type(atactl win32cui) add_importlibs(atactl advapi32 msvcrt kernel32 ntdll) @@ -14,4 +11,5 @@ set_source_files_properties(atactl.cpp PROPERTIES COMPILE_FLAGS "-Wno-error") target_link_libraries(atactl gcc) endif() -add_cd_file(TARGET atactl DESTINATION reactos/system32 FOR all) + +add_cd_file(TARGET atactl DESTINATION reactos/system32 FOR all) Added: trunk/reactos/base/applications/atactl/atactl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/atactl/a… ============================================================================== --- trunk/reactos/base/applications/atactl/atactl.rc (added) +++ trunk/reactos/base/applications/atactl/atactl.rc [iso-8859-1] Sun Jun 16 10:58:55 2013 @@ -0,0 +1,4 @@ +#define REACTOS_STR_FILE_DESCRIPTION "UniATA Console Management Utility\0" +#define REACTOS_STR_INTERNAL_NAME "atactl\0" +#define REACTOS_STR_ORIGINAL_FILENAME "atactl.exe\0" +#include <reactos/version.rc> Propchange: trunk/reactos/base/applications/atactl/atactl.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 59224: [VIDEOPRT] - Check if there is a dma adapter CORE-7181 #comment please retest
by janderwald＠svn.reactos.org 16 Jun '13

16 Jun '13

Author: janderwald Date: Sun Jun 16 09:17:29 2013 New Revision: 59224 URL: http://svn.reactos.org/svn/reactos?rev=59224&view=rev Log: [VIDEOPRT] - Check if there is a dma adapter CORE-7181 #comment please retest Modified: trunk/reactos/win32ss/drivers/videoprt/dma.c Modified: trunk/reactos/win32ss/drivers/videoprt/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/d… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/dma.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/dma.c [iso-8859-1] Sun Jun 16 09:17:29 2013 @@ -229,8 +229,11 @@ return NULL; } - /* sanity check */ - ASSERT(!IsListEmpty(&DeviceExtension->DmaAdapterList)); + if (IsListEmpty(&DeviceExtension->DmaAdapterList)) + { + /* no adapter available */ + return NULL; + } /* grab first dma adapter */ VpDmaAdapter = (PVIP_DMA_ADAPTER)CONTAINING_RECORD(DeviceExtension->DmaAdapterList.Flink, VIP_DMA_ADAPTER, Entry); @@ -239,7 +242,6 @@ ASSERT(VpDmaAdapter->HwDeviceExtension == HwDeviceExtension); ASSERT(VpDmaAdapter->Adapter != NULL); ASSERT(VpDmaAdapter->MapRegisters != 0); - /* allocate common buffer */ Result = VideoPortAllocateCommonBuffer(HwDeviceExtension, (PVP_DMA_ADAPTER)VpDmaAdapter, DesiredLength, LogicalAddress, CacheEnabled, NULL);

1 0

[ekohl] 59223: [NETAPI32] - NetUserEnum, NetUserGetInfo: Query UserAllInformation instead of UserAccountInformation. - BuildUserInfoBuffer: Return more information to the caller (UserComment, Param...
by ekohl＠svn.reactos.org 15 Jun '13

15 Jun '13

Author: ekohl Date: Sat Jun 15 22:22:15 2013 New Revision: 59223 URL: http://svn.reactos.org/svn/reactos?rev=59223&view=rev Log: [NETAPI32] - NetUserEnum, NetUserGetInfo: Query UserAllInformation instead of UserAccountInformation. - BuildUserInfoBuffer: Return more information to the caller (UserComment, Parameters, UnitsPerWeek, LogonHours and LogonServer). - FreeUserInfo: Free additional strings. Modified: trunk/reactos/dll/win32/netapi32/user.c Modified: trunk/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/user.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] Sat Jun 15 22:22:15 2013 @@ -112,11 +112,12 @@ static NET_API_STATUS -BuildUserInfoBuffer(PUSER_ACCOUNT_INFORMATION UserInfo, +BuildUserInfoBuffer(PUSER_ALL_INFORMATION UserInfo, DWORD level, ULONG RelativeId, LPVOID *Buffer) { + UNICODE_STRING LogonServer = RTL_CONSTANT_STRING(L"\\\\*"); LPVOID LocalBuffer = NULL; PUSER_INFO_0 UserInfo0; PUSER_INFO_1 UserInfo1; @@ -168,14 +169,20 @@ if (UserInfo->FullName.Length > 0) Size += UserInfo->FullName.Length + sizeof(WCHAR); - /* FIXME: usri2_usr_comment */ - /* FIXME: usri2_parms */ + if (UserInfo->UserComment.Length > 0) + Size += UserInfo->UserComment.Length + sizeof(WCHAR); + + if (UserInfo->Parameters.Length > 0) + Size += UserInfo->Parameters.Length + sizeof(WCHAR); if (UserInfo->WorkStations.Length > 0) Size += UserInfo->WorkStations.Length + sizeof(WCHAR); - /* FIXME: usri2_logon_hours */ - /* FIXME: usri2_logon_server */ + if (UserInfo->LogonHours.UnitsPerWeek > 0) + Size += (((ULONG)UserInfo->LogonHours.UnitsPerWeek) + 7) / 8; + + if (LogonServer.Length > 0) + Size += LogonServer.Length + sizeof(WCHAR); break; case 3: @@ -194,14 +201,20 @@ if (UserInfo->FullName.Length > 0) Size += UserInfo->FullName.Length + sizeof(WCHAR); - /* FIXME: usri3_usr_comment */ - /* FIXME: usri3_parms */ + if (UserInfo->UserComment.Length > 0) + Size += UserInfo->UserComment.Length + sizeof(WCHAR); + + if (UserInfo->Parameters.Length > 0) + Size += UserInfo->Parameters.Length + sizeof(WCHAR); if (UserInfo->WorkStations.Length > 0) Size += UserInfo->WorkStations.Length + sizeof(WCHAR); - /* FIXME: usri3_logon_hours */ - /* FIXME: usri3_logon_server */ + if (UserInfo->LogonHours.UnitsPerWeek > 0) + Size += (((ULONG)UserInfo->LogonHours.UnitsPerWeek) + 7) / 8; + + if (LogonServer.Length > 0) + Size += LogonServer.Length + sizeof(WCHAR); if (UserInfo->ProfilePath.Length > 0) Size += UserInfo->ProfilePath.Length + sizeof(WCHAR); @@ -219,7 +232,8 @@ if (UserInfo->AdminComment.Length > 0) Size += UserInfo->AdminComment.Length + sizeof(WCHAR); - /* FIXME: usri10_usr_comment */ + if (UserInfo->UserComment.Length > 0) + Size += UserInfo->UserComment.Length + sizeof(WCHAR); if (UserInfo->FullName.Length > 0) Size += UserInfo->FullName.Length + sizeof(WCHAR); @@ -401,8 +415,29 @@ Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->FullName.Length + sizeof(WCHAR)); } - /* FIXME: usri2_usr_comment */ - /* FIXME: usri2_parms */ + if (UserInfo->UserComment.Length > 0) + { + UserInfo2->usri2_usr_comment = Ptr; + + memcpy(UserInfo2->usri2_usr_comment, + UserInfo->UserComment.Buffer, + UserInfo->UserComment.Length); + UserInfo2->usri2_usr_comment[UserInfo->UserComment.Length / sizeof(WCHAR)] = UNICODE_NULL; + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->UserComment.Length + sizeof(WCHAR)); + } + + if (UserInfo->Parameters.Length > 0) + { + UserInfo2->usri2_parms = Ptr; + + memcpy(UserInfo2->usri2_parms, + UserInfo->Parameters.Buffer, + UserInfo->Parameters.Length); + UserInfo2->usri2_parms[UserInfo->Parameters.Length / sizeof(WCHAR)] = UNICODE_NULL; + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->Parameters.Length + sizeof(WCHAR)); + } if (UserInfo->WorkStations.Length > 0) { @@ -426,17 +461,36 @@ &UserInfo2->usri2_acct_expires); UserInfo2->usri2_max_storage = USER_MAXSTORAGE_UNLIMITED; - - /* FIXME: usri2_units_per_week */ - /* FIXME: usri2_logon_hours */ + UserInfo2->usri2_units_per_week = UserInfo->LogonHours.UnitsPerWeek; + + if (UserInfo->LogonHours.UnitsPerWeek > 0) + { + UserInfo2->usri2_logon_hours = (PVOID)Ptr; + + memcpy(UserInfo2->usri2_logon_hours, + UserInfo->LogonHours.LogonHours, + (((ULONG)UserInfo->LogonHours.UnitsPerWeek) + 7) / 8); + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + (((ULONG)UserInfo->LogonHours.UnitsPerWeek) + 7) / 8); + } UserInfo2->usri2_bad_pw_count = UserInfo->BadPasswordCount; UserInfo2->usri2_num_logons = UserInfo->LogonCount; - /* FIXME: usri2_logon_server */ - /* FIXME: usri2_country_code */ - /* FIXME: usri2_code_page */ - + if (LogonServer.Length > 0) + { + UserInfo2->usri2_logon_server = Ptr; + + memcpy(UserInfo2->usri2_logon_server, + LogonServer.Buffer, + LogonServer.Length); + UserInfo2->usri2_logon_server[LogonServer.Length / sizeof(WCHAR)] = UNICODE_NULL; + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + LogonServer.Length + sizeof(WCHAR)); + } + + UserInfo2->usri2_country_code = UserInfo->CountryCode; + UserInfo2->usri2_code_page = UserInfo->CodePage; break; case 3: @@ -508,8 +562,29 @@ Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->FullName.Length + sizeof(WCHAR)); } - /* FIXME: usri3_usr_comment */ - /* FIXME: usri3_parms */ + if (UserInfo->UserComment.Length > 0) + { + UserInfo3->usri3_usr_comment = Ptr; + + memcpy(UserInfo3->usri3_usr_comment, + UserInfo->UserComment.Buffer, + UserInfo->UserComment.Length); + UserInfo3->usri3_usr_comment[UserInfo->UserComment.Length / sizeof(WCHAR)] = UNICODE_NULL; + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->UserComment.Length + sizeof(WCHAR)); + } + + if (UserInfo->Parameters.Length > 0) + { + UserInfo3->usri3_parms = Ptr; + + memcpy(UserInfo3->usri3_parms, + UserInfo->Parameters.Buffer, + UserInfo->Parameters.Length); + UserInfo3->usri3_parms[UserInfo->Parameters.Length / sizeof(WCHAR)] = UNICODE_NULL; + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->Parameters.Length + sizeof(WCHAR)); + } if (UserInfo->WorkStations.Length > 0) { @@ -533,17 +608,36 @@ &UserInfo3->usri3_acct_expires); UserInfo3->usri3_max_storage = USER_MAXSTORAGE_UNLIMITED; - - /* FIXME: usri3_units_per_week */ - /* FIXME: usri3_logon_hours */ + UserInfo3->usri3_units_per_week = UserInfo->LogonHours.UnitsPerWeek; + + if (UserInfo->LogonHours.UnitsPerWeek > 0) + { + UserInfo3->usri3_logon_hours = (PVOID)Ptr; + + memcpy(UserInfo3->usri3_logon_hours, + UserInfo->LogonHours.LogonHours, + (((ULONG)UserInfo->LogonHours.UnitsPerWeek) + 7) / 8); + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + (((ULONG)UserInfo->LogonHours.UnitsPerWeek) + 7) / 8); + } UserInfo3->usri3_bad_pw_count = UserInfo->BadPasswordCount; UserInfo3->usri3_num_logons = UserInfo->LogonCount; - /* FIXME: usri3_logon_server */ - /* FIXME: usri3_country_code */ - /* FIXME: usri3_code_page */ - + if (LogonServer.Length > 0) + { + UserInfo3->usri3_logon_server = Ptr; + + memcpy(UserInfo3->usri3_logon_server, + LogonServer.Buffer, + LogonServer.Length); + UserInfo3->usri3_logon_server[LogonServer.Length / sizeof(WCHAR)] = UNICODE_NULL; + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + LogonServer.Length + sizeof(WCHAR)); + } + + UserInfo3->usri3_country_code = UserInfo->CountryCode; + UserInfo3->usri3_code_page = UserInfo->CodePage; UserInfo3->usri3_user_id = RelativeId; UserInfo3->usri3_primary_group_id = UserInfo->PrimaryGroupId; @@ -602,7 +696,17 @@ Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->AdminComment.Length + sizeof(WCHAR)); } - /* FIXME: usri10_usr_comment */ + if (UserInfo->UserComment.Length > 0) + { + UserInfo10->usri10_usr_comment = Ptr; + + memcpy(UserInfo10->usri10_usr_comment, + UserInfo->UserComment.Buffer, + UserInfo->UserComment.Length); + UserInfo10->usri10_usr_comment[UserInfo->UserComment.Length / sizeof(WCHAR)] = UNICODE_NULL; + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->UserComment.Length + sizeof(WCHAR)); + } if (UserInfo->FullName.Length > 0) { @@ -723,7 +827,7 @@ static VOID -FreeUserInfo(PUSER_ACCOUNT_INFORMATION UserInfo) +FreeUserInfo(PUSER_ALL_INFORMATION UserInfo) { if (UserInfo->UserName.Buffer != NULL) SamFreeMemory(UserInfo->UserName.Buffer); @@ -748,6 +852,15 @@ if (UserInfo->WorkStations.Buffer != NULL) SamFreeMemory(UserInfo->WorkStations.Buffer); + + if (UserInfo->UserComment.Buffer != NULL) + SamFreeMemory(UserInfo->UserComment.Buffer); + + if (UserInfo->Parameters.Buffer != NULL) + SamFreeMemory(UserInfo->Parameters.Buffer); + + if (UserInfo->PrivateData.Buffer != NULL) + SamFreeMemory(UserInfo->PrivateData.Buffer); if (UserInfo->LogonHours.LogonHours != NULL) SamFreeMemory(UserInfo->LogonHours.LogonHours); @@ -1495,7 +1608,7 @@ LPVOID Buffer = NULL; ULONG i; SAM_HANDLE UserHandle = NULL; - PUSER_ACCOUNT_INFORMATION UserInfo = NULL; + PUSER_ALL_INFORMATION UserInfo = NULL; NET_API_STATUS ApiStatus = NERR_Success; NTSTATUS Status = STATUS_SUCCESS; @@ -1620,7 +1733,7 @@ } Status = SamQueryInformationUser(UserHandle, - UserAccountInformation, + UserAllInformation, (PVOID *)&UserInfo); if (!NT_SUCCESS(Status)) { @@ -1747,7 +1860,7 @@ SAM_HANDLE UserHandle = NULL; PULONG RelativeIds = NULL; PSID_NAME_USE Use = NULL; - PUSER_ACCOUNT_INFORMATION UserInfo = NULL; + PUSER_ALL_INFORMATION UserInfo = NULL; LPVOID Buffer = NULL; NET_API_STATUS ApiStatus = NERR_Success; NTSTATUS Status = STATUS_SUCCESS; @@ -1820,7 +1933,7 @@ } Status = SamQueryInformationUser(UserHandle, - UserAccountInformation, + UserAllInformation, (PVOID *)&UserInfo); if (!NT_SUCCESS(Status)) { @@ -2212,6 +2325,9 @@ TRACE("(%s %s %lu %p %p)\n", debugstr_w(servername), debugstr_w(username), level, buf, parm_err); + if (parm_err != NULL) + *parm_err = PARM_ERROR_NONE; + /* Check the info level */ switch (level) {

1 0

[ekohl] 59222: [NETAPI32] - SetUserInfo: Implement level 2, 1003, 1006, 1007, 1009, 1011, 1012, 1013, 1014, 1052 and 1053. - SetUserInfo: Ignore NULL-Strings. - NetUserSetInfo: Enable implemented l...
by ekohl＠svn.reactos.org 15 Jun '13

15 Jun '13

Author: ekohl Date: Sat Jun 15 19:15:36 2013 New Revision: 59222 URL: http://svn.reactos.org/svn/reactos?rev=59222&view=rev Log: [NETAPI32] - SetUserInfo: Implement level 2, 1003, 1006, 1007, 1009, 1011, 1012, 1013, 1014, 1052 and 1053. - SetUserInfo: Ignore NULL-Strings. - NetUserSetInfo: Enable implemented level. Modified: trunk/reactos/dll/win32/netapi32/user.c Modified: trunk/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/user.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] Sat Jun 15 19:15:36 2013 @@ -765,7 +765,18 @@ USER_ALL_INFORMATION UserAllInfo; PUSER_INFO_0 UserInfo0; PUSER_INFO_1 UserInfo1; + PUSER_INFO_2 UserInfo2; PUSER_INFO_3 UserInfo3; + PUSER_INFO_1003 UserInfo1003; + PUSER_INFO_1006 UserInfo1006; + PUSER_INFO_1007 UserInfo1007; + PUSER_INFO_1009 UserInfo1009; + PUSER_INFO_1011 UserInfo1011; + PUSER_INFO_1012 UserInfo1012; + PUSER_INFO_1013 UserInfo1013; + PUSER_INFO_1014 UserInfo1014; + PUSER_INFO_1052 UserInfo1052; + PUSER_INFO_1053 UserInfo1053; NET_API_STATUS ApiStatus = NERR_Success; NTSTATUS Status = STATUS_SUCCESS; @@ -779,97 +790,368 @@ RtlInitUnicodeString(&UserAllInfo.UserName, UserInfo0->usri0_name); - UserAllInfo.WhichFields = USER_ALL_USERNAME; + UserAllInfo.WhichFields |= USER_ALL_USERNAME; break; case 1: UserInfo1 = (PUSER_INFO_1)UserInfo; -// RtlInitUnicodeString(&UserAllInfo.UserName, -// UserInfo1->usri1_name); - - RtlInitUnicodeString(&UserAllInfo.AdminComment, - UserInfo1->usri1_comment); - - RtlInitUnicodeString(&UserAllInfo.HomeDirectory, - UserInfo1->usri1_home_dir); - - RtlInitUnicodeString(&UserAllInfo.ScriptPath, - UserInfo1->usri1_script_path); - - RtlInitUnicodeString(&UserAllInfo.NtPassword, - UserInfo1->usri1_password); - UserAllInfo.NtPasswordPresent = TRUE; + // usri1_name ignored + + if (UserInfo1->usri1_password != NULL) + { + RtlInitUnicodeString(&UserAllInfo.NtPassword, + UserInfo1->usri1_password); + UserAllInfo.NtPasswordPresent = TRUE; + UserAllInfo.WhichFields |= USER_ALL_NTPASSWORDPRESENT; + } + + // usri1_password_age ignored + +// UserInfo1->usri1_priv + + if (UserInfo1->usri1_home_dir != NULL) + { + RtlInitUnicodeString(&UserAllInfo.HomeDirectory, + UserInfo1->usri1_home_dir); + UserAllInfo.WhichFields |= USER_ALL_HOMEDIRECTORY; + } + + if (UserInfo1->usri1_comment != NULL) + { + RtlInitUnicodeString(&UserAllInfo.AdminComment, + UserInfo1->usri1_comment); + UserAllInfo.WhichFields |= USER_ALL_ADMINCOMMENT; + } // UserInfo1->usri1_flags -// UserInfo1->usri1_priv - - UserAllInfo.WhichFields = - USER_ALL_ADMINCOMMENT | - USER_ALL_HOMEDIRECTORY | - USER_ALL_SCRIPTPATH | - USER_ALL_NTPASSWORDPRESENT -// USER_ALL_USERACCOUNTCONTROL - ; - break; - +// UserAllInfo.WhichFields |= USER_ALL_USERACCOUNTCONTROL; + + if (UserInfo1->usri1_script_path != NULL) + { + RtlInitUnicodeString(&UserAllInfo.ScriptPath, + UserInfo1->usri1_script_path); + UserAllInfo.WhichFields |= USER_ALL_SCRIPTPATH; + } + break; + + case 2: + UserInfo2 = (PUSER_INFO_2)UserInfo; + + // usri2_name ignored + + if (UserInfo2->usri2_password != NULL) + { + RtlInitUnicodeString(&UserAllInfo.NtPassword, + UserInfo2->usri2_password); + UserAllInfo.NtPasswordPresent = TRUE; + UserAllInfo.WhichFields |= USER_ALL_NTPASSWORDPRESENT; + } + + // usri2_password_age ignored + +// UserInfo2->usri2_priv; + + if (UserInfo2->usri2_home_dir != NULL) + { + RtlInitUnicodeString(&UserAllInfo.HomeDirectory, + UserInfo2->usri2_home_dir); + UserAllInfo.WhichFields |= USER_ALL_HOMEDIRECTORY; + } + + if (UserInfo2->usri2_comment != NULL) + { + RtlInitUnicodeString(&UserAllInfo.AdminComment, + UserInfo2->usri2_comment); + UserAllInfo.WhichFields |= USER_ALL_ADMINCOMMENT; + } + +// UserInfo2->usri2_flags; + + if (UserInfo2->usri2_script_path != NULL) + { + RtlInitUnicodeString(&UserAllInfo.ScriptPath, + UserInfo2->usri2_script_path); + UserAllInfo.WhichFields |= USER_ALL_SCRIPTPATH; + } + +// UserInfo2->usri2_auth_flags; + + if (UserInfo2->usri2_full_name != NULL) + { + RtlInitUnicodeString(&UserAllInfo.FullName, + UserInfo2->usri2_full_name); + UserAllInfo.WhichFields |= USER_ALL_FULLNAME; + } + + if (UserInfo2->usri2_usr_comment != NULL) + { + RtlInitUnicodeString(&UserAllInfo.UserComment, + UserInfo2->usri2_usr_comment); + UserAllInfo.WhichFields |= USER_ALL_USERCOMMENT; + } + + if (UserInfo2->usri2_parms != NULL) + { + RtlInitUnicodeString(&UserAllInfo.Parameters, + UserInfo2->usri2_parms); + UserAllInfo.WhichFields |= USER_ALL_PARAMETERS; + } + + if (UserInfo2->usri2_workstations != NULL) + { + RtlInitUnicodeString(&UserAllInfo.WorkStations, + UserInfo2->usri2_workstations); + UserAllInfo.WhichFields |= USER_ALL_WORKSTATIONS; + } + + // usri2_last_logon ignored + // usri2_last_logoff ignored + +// UserInfo2->usri2_acct_expires; +// UserInfo2->usri2_max_storage; +// UserInfo2->usri2_units_per_week; +// UserInfo2->usri2_logon_hours; + + // usri2_bad_pw_count ignored + // usri2_num_logons ignored + // usri2_logon_server ignored + +// UserInfo2->usri2_country_code; +// UserInfo2->usri2_code_page; + break; case 3: UserInfo3 = (PUSER_INFO_3)UserInfo; -// LPWSTR usri3_name; - - RtlInitUnicodeString(&UserAllInfo.NtPassword, - UserInfo3->usri3_password); - UserAllInfo.NtPasswordPresent = TRUE; - -// DWORD usri3_password_age; // ignored -// DWORD usri3_priv; - - RtlInitUnicodeString(&UserAllInfo.HomeDirectory, - UserInfo3->usri3_home_dir); - - RtlInitUnicodeString(&UserAllInfo.AdminComment, - UserInfo3->usri3_comment); - -// DWORD usri3_flags; - - RtlInitUnicodeString(&UserAllInfo.ScriptPath, - UserInfo3->usri3_script_path); - -// DWORD usri3_auth_flags; - - RtlInitUnicodeString(&UserAllInfo.FullName, - UserInfo3->usri3_full_name); - -// LPWSTR usri3_usr_comment; -// LPWSTR usri3_parms; -// LPWSTR usri3_workstations; -// DWORD usri3_last_logon; -// DWORD usri3_last_logoff; -// DWORD usri3_acct_expires; -// DWORD usri3_max_storage; -// DWORD usri3_units_per_week; -// PBYTE usri3_logon_hours; -// DWORD usri3_bad_pw_count; -// DWORD usri3_num_logons; -// LPWSTR usri3_logon_server; -// DWORD usri3_country_code; -// DWORD usri3_code_page; -// DWORD usri3_user_id; // ignored -// DWORD usri3_primary_group_id; -// LPWSTR usri3_profile; -// LPWSTR usri3_home_dir_drive; -// DWORD usri3_password_expired; - - UserAllInfo.WhichFields = - USER_ALL_NTPASSWORDPRESENT | - USER_ALL_HOMEDIRECTORY | - USER_ALL_ADMINCOMMENT | - USER_ALL_SCRIPTPATH | - USER_ALL_FULLNAME -// USER_ALL_USERACCOUNTCONTROL - ; + // usri3_name ignored + + if (UserInfo3->usri3_password != NULL) + { + RtlInitUnicodeString(&UserAllInfo.NtPassword, + UserInfo3->usri3_password); + UserAllInfo.NtPasswordPresent = TRUE; + UserAllInfo.WhichFields |= USER_ALL_NTPASSWORDPRESENT; + } + + // usri3_password_age ignored + +// UserInfo3->usri3_priv; + + if (UserInfo3->usri3_home_dir != NULL) + { + RtlInitUnicodeString(&UserAllInfo.HomeDirectory, + UserInfo3->usri3_home_dir); + UserAllInfo.WhichFields |= USER_ALL_HOMEDIRECTORY; + } + + if (UserInfo3->usri3_comment != NULL) + { + RtlInitUnicodeString(&UserAllInfo.AdminComment, + UserInfo3->usri3_comment); + UserAllInfo.WhichFields |= USER_ALL_ADMINCOMMENT; + } + +// UserInfo3->usri3_flags; +// UserAllInfo.WhichFields |= USER_ALL_USERACCOUNTCONTROL; + + if (UserInfo3->usri3_script_path != NULL) + { + RtlInitUnicodeString(&UserAllInfo.ScriptPath, + UserInfo3->usri3_script_path); + UserAllInfo.WhichFields |= USER_ALL_SCRIPTPATH; + } + +// UserInfo3->usri3_auth_flags; + + if (UserInfo3->usri3_full_name != NULL) + { + RtlInitUnicodeString(&UserAllInfo.FullName, + UserInfo3->usri3_full_name); + UserAllInfo.WhichFields |= USER_ALL_FULLNAME; + } + + if (UserInfo3->usri3_usr_comment != NULL) + { + RtlInitUnicodeString(&UserAllInfo.UserComment, + UserInfo3->usri3_usr_comment); + UserAllInfo.WhichFields |= USER_ALL_USERCOMMENT; + } + + if (UserInfo3->usri3_parms != NULL) + { + RtlInitUnicodeString(&UserAllInfo.Parameters, + UserInfo3->usri3_parms); + UserAllInfo.WhichFields |= USER_ALL_PARAMETERS; + } + + if (UserInfo3->usri3_workstations != NULL) + { + RtlInitUnicodeString(&UserAllInfo.WorkStations, + UserInfo3->usri3_workstations); + UserAllInfo.WhichFields |= USER_ALL_WORKSTATIONS; + } + + // usri3_last_logon ignored + // usri3_last_logoff ignored + +// UserInfo3->usri3_acct_expires; +// UserInfo3->usri3_max_storage; +// UserInfo3->usri3_units_per_week; +// UserInfo3->usri3_logon_hours; + + // usri3_bad_pw_count ignored + // usri3_num_logons ignored + // usri3_logon_server ignored + +// UserInfo3->usri3_country_code; +// UserInfo3->usri3_code_page; + + // usri3_user_id ignored + +// UserInfo3->usri3_primary_group_id; + + if (UserInfo3->usri3_profile != NULL) + { + RtlInitUnicodeString(&UserAllInfo.ProfilePath, + UserInfo3->usri3_profile); + UserAllInfo.WhichFields |= USER_ALL_PROFILEPATH; + } + + if (UserInfo3->usri3_home_dir_drive != NULL) + { + RtlInitUnicodeString(&UserAllInfo.HomeDirectoryDrive, + UserInfo3->usri3_home_dir_drive); + UserAllInfo.WhichFields |= USER_ALL_HOMEDIRECTORYDRIVE; + } + +// UserInfo3->usri3_password_expired; + break; + +// case 4: +// case 21: +// case 22: + + case 1003: + UserInfo1003 = (PUSER_INFO_1003)UserInfo; + + if (UserInfo1003->usri1003_password != NULL) + { + RtlInitUnicodeString(&UserAllInfo.NtPassword, + UserInfo1003->usri1003_password); + UserAllInfo.NtPasswordPresent = TRUE; + UserAllInfo.WhichFields |= USER_ALL_NTPASSWORDPRESENT; + } + break; + +// case 1005: + + case 1006: + UserInfo1006 = (PUSER_INFO_1006)UserInfo; + + if (UserInfo1006->usri1006_home_dir != NULL) + { + RtlInitUnicodeString(&UserAllInfo.HomeDirectory, + UserInfo1006->usri1006_home_dir); + UserAllInfo.WhichFields |= USER_ALL_HOMEDIRECTORY; + } + break; + + case 1007: + UserInfo1007 = (PUSER_INFO_1007)UserInfo; + + if (UserInfo1007->usri1007_comment != NULL) + { + RtlInitUnicodeString(&UserAllInfo.AdminComment, + UserInfo1007->usri1007_comment); + UserAllInfo.WhichFields |= USER_ALL_ADMINCOMMENT; + } + break; + +// case 1008: + + case 1009: + UserInfo1009 = (PUSER_INFO_1009)UserInfo; + + if (UserInfo1009->usri1009_script_path != NULL) + { + RtlInitUnicodeString(&UserAllInfo.ScriptPath, + UserInfo1009->usri1009_script_path); + UserAllInfo.WhichFields |= USER_ALL_SCRIPTPATH; + } + break; + +// case 1010: + + case 1011: + UserInfo1011 = (PUSER_INFO_1011)UserInfo; + + if (UserInfo1011->usri1011_full_name != NULL) + { + RtlInitUnicodeString(&UserAllInfo.FullName, + UserInfo1011->usri1011_full_name); + UserAllInfo.WhichFields |= USER_ALL_FULLNAME; + } + break; + + case 1012: + UserInfo1012 = (PUSER_INFO_1012)UserInfo; + + if (UserInfo1012->usri1012_usr_comment != NULL) + { + RtlInitUnicodeString(&UserAllInfo.UserComment, + UserInfo1012->usri1012_usr_comment); + UserAllInfo.WhichFields |= USER_ALL_USERCOMMENT; + } + break; + + case 1013: + UserInfo1013 = (PUSER_INFO_1013)UserInfo; + + if (UserInfo1013->usri1013_parms != NULL) + { + RtlInitUnicodeString(&UserAllInfo.Parameters, + UserInfo1013->usri1013_parms); + UserAllInfo.WhichFields |= USER_ALL_PARAMETERS; + } + break; + + case 1014: + UserInfo1014 = (PUSER_INFO_1014)UserInfo; + + if (UserInfo1014->usri1014_workstations != NULL) + { + RtlInitUnicodeString(&UserAllInfo.WorkStations, + UserInfo1014->usri1014_workstations); + UserAllInfo.WhichFields |= USER_ALL_WORKSTATIONS; + } + break; + +// case 1017: +// case 1020: +// case 1024: +// case 1051: + + case 1052: + UserInfo1052 = (PUSER_INFO_1052)UserInfo; + + if (UserInfo1052->usri1052_profile != NULL) + { + RtlInitUnicodeString(&UserAllInfo.ProfilePath, + UserInfo1052->usri1052_profile); + UserAllInfo.WhichFields |= USER_ALL_PROFILEPATH; + } + break; + + case 1053: + UserInfo1053 = (PUSER_INFO_1053)UserInfo; + + if (UserInfo1053->usri1053_home_dir_drive != NULL) + { + RtlInitUnicodeString(&UserAllInfo.HomeDirectoryDrive, + UserInfo1053->usri1053_home_dir_drive); + UserAllInfo.WhichFields |= USER_ALL_HOMEDIRECTORYDRIVE; + } break; default: @@ -1935,27 +2217,28 @@ { case 0: case 1: -// case 2: + case 2: case 3: // case 4: // case 21: // case 22: -// case 1003: + case 1003: // case 1005: -// case 1006: -// case 1007: + case 1006: + case 1007: // case 1008: -// case 1009: + case 1009: // case 1010: -// case 1011: -// case 1012: -// case 1014: + case 1011: + case 1012: + case 1013: + case 1014: // case 1017: // case 1020: // case 1024: // case 1051: -// case 1052: -// case 1053: + case 1052: + case 1053: break; default:

1 0

[akhaldi] 59221: [DBGHELP] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 15 Jun '13

15 Jun '13

Author: akhaldi Date: Sat Jun 15 11:57:55 2013 New Revision: 59221 URL: http://svn.reactos.org/svn/reactos?rev=59221&view=rev Log: [DBGHELP] * Sync with Wine 1.5.26. Added: trunk/reactos/dll/win32/dbghelp/cpu_arm64.c (with props) Removed: trunk/reactos/dll/win32/dbghelp/cpu_sparc.c trunk/reactos/dll/win32/dbghelp/regex.c Modified: trunk/reactos/dll/win32/dbghelp/CMakeLists.txt trunk/reactos/dll/win32/dbghelp/coff.c trunk/reactos/dll/win32/dbghelp/cpu_arm.c trunk/reactos/dll/win32/dbghelp/cpu_i386.c trunk/reactos/dll/win32/dbghelp/cpu_ppc.c trunk/reactos/dll/win32/dbghelp/cpu_x86_64.c trunk/reactos/dll/win32/dbghelp/dbghelp.c trunk/reactos/dll/win32/dbghelp/dbghelp_private.h trunk/reactos/dll/win32/dbghelp/dwarf.c trunk/reactos/dll/win32/dbghelp/elf_module.c trunk/reactos/dll/win32/dbghelp/image_private.h trunk/reactos/dll/win32/dbghelp/macho_module.c trunk/reactos/dll/win32/dbghelp/minidump.c trunk/reactos/dll/win32/dbghelp/module.c trunk/reactos/dll/win32/dbghelp/msc.c trunk/reactos/dll/win32/dbghelp/path.c trunk/reactos/dll/win32/dbghelp/pe_module.c trunk/reactos/dll/win32/dbghelp/stabs.c trunk/reactos/dll/win32/dbghelp/symbol.c trunk/reactos/dll/win32/dbghelp/type.c trunk/reactos/include/psdk/cvconst.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/reactos/wine/mscvpdb.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/dbghelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/CMakeLis… Modified: trunk/reactos/dll/win32/dbghelp/coff.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/coff.c?r… Modified: trunk/reactos/dll/win32/dbghelp/cpu_arm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_arm.… Added: trunk/reactos/dll/win32/dbghelp/cpu_arm64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_arm6… Modified: trunk/reactos/dll/win32/dbghelp/cpu_i386.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_i386… Modified: trunk/reactos/dll/win32/dbghelp/cpu_ppc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_ppc.… Removed: trunk/reactos/dll/win32/dbghelp/cpu_sparc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_spar… Modified: trunk/reactos/dll/win32/dbghelp/cpu_x86_64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_x86_… Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… Modified: trunk/reactos/dll/win32/dbghelp/dbghelp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp_… Modified: trunk/reactos/dll/win32/dbghelp/dwarf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dwarf.c?… Modified: trunk/reactos/dll/win32/dbghelp/elf_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/elf_modu… Modified: trunk/reactos/dll/win32/dbghelp/image_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/image_pr… Modified: trunk/reactos/dll/win32/dbghelp/macho_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/macho_mo… Modified: trunk/reactos/dll/win32/dbghelp/minidump.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/minidump… Modified: trunk/reactos/dll/win32/dbghelp/module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/module.c… Modified: trunk/reactos/dll/win32/dbghelp/msc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/msc.c?re… Modified: trunk/reactos/dll/win32/dbghelp/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/path.c?r… Modified: trunk/reactos/dll/win32/dbghelp/pe_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/pe_modul… Removed: trunk/reactos/dll/win32/dbghelp/regex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/regex.c?… Modified: trunk/reactos/dll/win32/dbghelp/stabs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/stabs.c?… Modified: trunk/reactos/dll/win32/dbghelp/symbol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/symbol.c… Modified: trunk/reactos/dll/win32/dbghelp/type.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/type.c?r… Modified: trunk/reactos/include/psdk/cvconst.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/cvconst.h?rev… Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… Modified: trunk/reactos/include/reactos/wine/mscvpdb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/mscvp… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[janderwald] 59220: [MMSYS] - Implement audio selection button
by janderwald＠svn.reactos.org 15 Jun '13

15 Jun '13

Author: janderwald Date: Sat Jun 15 08:23:21 2013 New Revision: 59220 URL: http://svn.reactos.org/svn/reactos?rev=59220&view=rev Log: [MMSYS] - Implement audio selection button Modified: trunk/reactos/dll/cpl/mmsys/CMakeLists.txt trunk/reactos/dll/cpl/mmsys/mmsys.h trunk/reactos/dll/cpl/mmsys/sounds.c Modified: trunk/reactos/dll/cpl/mmsys/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/CMakeLists.txt [iso-8859-1] Sat Jun 15 08:23:21 2013 @@ -24,7 +24,8 @@ setupapi shlwapi ntdll - kernel32) + kernel32 + comdlg32) add_pch(mmsys mmsys.h) add_cd_file(TARGET mmsys DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/cpl/mmsys/mmsys.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.h?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.h [iso-8859-1] Sat Jun 15 08:23:21 2013 @@ -17,7 +17,7 @@ #include <devguid.h> #include <debug.h> #include <shlwapi.h> - +#include <commdlg.h> #include "resource.h" //typedef LONG (CALLBACK *APPLET_PROC)(VOID); Modified: trunk/reactos/dll/cpl/mmsys/sounds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/sounds.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] Sat Jun 15 08:23:21 2013 @@ -904,6 +904,11 @@ WPARAM wParam, LPARAM lParam) { + OPENFILENAMEW ofn; + WCHAR filename[MAX_PATH]; + LPWSTR pFileName; + LRESULT lResult; + switch (uMsg) { case WM_INITDIALOG: @@ -936,6 +941,41 @@ { switch (LOWORD(wParam)) { + case IDC_BROWSE_SOUND: + { + ZeroMemory(&ofn, sizeof(OPENFILENAMEW)); + ofn.lStructSize = sizeof(OPENFILENAMEW); + ofn.hwndOwner = hwndDlg; + ofn.lpstrFile = filename; + ofn.lpstrFile[0] = L'\0'; + ofn.nMaxFile = MAX_PATH; + ofn.lpstrFilter = L"Wave Files (*.wav)\0*.wav\0"; //FIXME non-nls + ofn.nFilterIndex = 0; + ofn.lpstrFileTitle = L"Search for new sounds"; //FIXME non-nls + ofn.nMaxFileTitle = wcslen(ofn.lpstrFileTitle); + ofn.lpstrInitialDir = NULL; + ofn.Flags = OFN_FILEMUSTEXIST; + + if (GetOpenFileNameW(&ofn) == TRUE) + { + // FIXME search if list already contains that sound + + // extract file name + pFileName = wcsrchr(filename, L'\\'); + ASSERT(pFileName != NULL); + pFileName++; + + // add to list + lResult = SendDlgItemMessageW(hwndDlg, IDC_SOUND_LIST, CB_ADDSTRING, (WPARAM)0, (LPARAM)pFileName); + if (lResult != CB_ERR) + { + // add path and select item + SendDlgItemMessageW(hwndDlg, IDC_SOUND_LIST, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)_wcsdup(filename)); + SendDlgItemMessageW(hwndDlg, IDC_SOUND_LIST, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0); + } + } + break; + } case IDC_PLAY_SOUND: { LRESULT lIndex;

1 0

[janderwald] 59219: [MOUHID] - Fix build [HIDUSB] - Fix warnings
by janderwald＠svn.reactos.org 15 Jun '13

15 Jun '13

Author: janderwald Date: Sat Jun 15 06:34:38 2013 New Revision: 59219 URL: http://svn.reactos.org/svn/reactos?rev=59219&view=rev Log: [MOUHID] - Fix build [HIDUSB] - Fix warnings Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c trunk/reactos/drivers/hid/mouhid/mouhid.c Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidusb/hidusb.… ============================================================================== --- trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] Sat Jun 15 06:34:38 2013 @@ -421,8 +421,6 @@ IN PIRP Irp, IN PVOID Context) { - PHID_USB_DEVICE_EXTENSION HidDeviceExtension; - PHID_DEVICE_EXTENSION DeviceExtension; PURB Urb; PHID_USB_RESET_CONTEXT ResetContext; @@ -467,12 +465,6 @@ // return STATUS_CONTINUE_COMPLETION; } - - // - // get device extension - // - DeviceExtension = DeviceObject->DeviceExtension; - HidDeviceExtension = DeviceExtension->MiniDeviceExtension; // // allocate reset context @@ -971,7 +963,6 @@ { PIRP Irp; KEVENT Event; - PHID_USB_DEVICE_EXTENSION HidDeviceExtension; PHID_DEVICE_EXTENSION DeviceExtension; IO_STATUS_BLOCK IoStatus; PIO_STACK_LOCATION IoStack; @@ -986,7 +977,6 @@ // get device extension // DeviceExtension = DeviceObject->DeviceExtension; - HidDeviceExtension = DeviceExtension->MiniDeviceExtension; // // build irp @@ -1374,16 +1364,8 @@ Hid_SetIdle( IN PDEVICE_OBJECT DeviceObject) { - PHID_USB_DEVICE_EXTENSION HidDeviceExtension; - PHID_DEVICE_EXTENSION DeviceExtension; PURB Urb; NTSTATUS Status; - - // - // get device extension - // - DeviceExtension = DeviceObject->DeviceExtension; - HidDeviceExtension = DeviceExtension->MiniDeviceExtension; // // allocate urb @@ -1443,7 +1425,6 @@ PHID_USB_DEVICE_EXTENSION HidDeviceExtension; PHID_DEVICE_EXTENSION DeviceExtension; PURB Urb; - NTSTATUS Status; UCHAR Protocol[1]; // @@ -1494,10 +1475,11 @@ 1, NULL); Protocol[0] = 0xFF; + // // dispatch urb // - Status = Hid_DispatchUrb(DeviceObject, Urb); + Hid_DispatchUrb(DeviceObject, Urb); // // free urb @@ -1706,7 +1688,6 @@ { NTSTATUS Status; PIO_STACK_LOCATION IoStack; - PHID_USB_DEVICE_EXTENSION HidDeviceExtension; PHID_DEVICE_EXTENSION DeviceExtension; KEVENT Event; @@ -1714,7 +1695,6 @@ // get device extension // DeviceExtension = DeviceObject->DeviceExtension; - HidDeviceExtension = DeviceExtension->MiniDeviceExtension; // // get current stack location Modified: trunk/reactos/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/mouhid/mouhid.… ============================================================================== --- trunk/reactos/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/mouhid/mouhid.c [iso-8859-1] Sat Jun 15 06:34:38 2013 @@ -775,7 +775,7 @@ HID_COLLECTION_INFORMATION Information; PVOID PreparsedData; HIDP_CAPS Capabilities; - ULONG ValueCapsLength; + USHORT ValueCapsLength; HIDP_VALUE_CAPS ValueCaps; PMOUHID_DEVICE_EXTENSION DeviceExtension; PUSAGE Buffer;

1 0

[janderwald] 59218: [HID] - Fix function signatures - Fix build
by janderwald＠svn.reactos.org 15 Jun '13

15 Jun '13

Author: janderwald Date: Sat Jun 15 06:24:03 2013 New Revision: 59218 URL: http://svn.reactos.org/svn/reactos?rev=59218&view=rev Log: [HID] - Fix function signatures - Fix build Modified: trunk/reactos/dll/win32/hid/hid.c trunk/reactos/dll/win32/hid/stubs.c Modified: trunk/reactos/dll/win32/hid/hid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hid/hid.c?rev=59… ============================================================================== --- trunk/reactos/dll/win32/hid/hid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hid/hid.c [iso-8859-1] Sat Jun 15 06:24:03 2013 @@ -126,7 +126,7 @@ NTSTATUS WINAPI HidP_GetButtonCaps(IN HIDP_REPORT_TYPE ReportType, OUT PHIDP_BUTTON_CAPS ButtonCaps, - IN OUT PULONG ButtonCapsLength, + IN OUT PUSHORT ButtonCapsLength, IN PHIDP_PREPARSED_DATA PreparsedData) { return HidP_GetSpecificButtonCaps(ReportType, 0, 0, 0, ButtonCaps, @@ -343,7 +343,7 @@ NTSTATUS WINAPI HidP_GetValueCaps(IN HIDP_REPORT_TYPE ReportType, OUT PHIDP_VALUE_CAPS ValueCaps, - IN OUT PULONG ValueCapsLength, + IN OUT PUSHORT ValueCapsLength, IN PHIDP_PREPARSED_DATA PreparsedData) { return HidP_GetSpecificValueCaps(ReportType, 0, 0, 0, ValueCaps, Modified: trunk/reactos/dll/win32/hid/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hid/stubs.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/hid/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hid/stubs.c [iso-8859-1] Sat Jun 15 06:24:03 2013 @@ -99,7 +99,7 @@ IN USHORT LinkCollection, IN USAGE Usage, OUT PHIDP_BUTTON_CAPS ButtonCaps, - IN OUT PULONG ButtonCapsLength, + IN OUT PUSHORT ButtonCapsLength, IN PHIDP_PREPARSED_DATA PreparsedData) { UNIMPLEMENTED; @@ -117,7 +117,7 @@ IN USHORT LinkCollection, IN USAGE Usage, OUT PHIDP_VALUE_CAPS ValueCaps, - IN OUT PULONG ValueCapsLength, + IN OUT PUSHORT ValueCapsLength, IN PHIDP_PREPARSED_DATA PreparsedData) { UNIMPLEMENTED;

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