Ros-diffs June 2013

ros-diffs@reactos.org

14 participants
274 discussions

[hbelusca] 59234: [KERNEL32] - Simplify initialization of CONSOLE_START_INFO objects by also initializing their AppPath member in InitConsoleInfo. - Add two members IconPath and IconIndex in the CO...
by hbelusca＠svn.reactos.org 16 Jun '13

16 Jun '13

Author: hbelusca Date: Sun Jun 16 17:16:33 2013 New Revision: 59234 URL: http://svn.reactos.org/svn/reactos?rev=59234&view=rev Log: [KERNEL32] - Simplify initialization of CONSOLE_START_INFO objects by also initializing their AppPath member in InitConsoleInfo. - Add two members IconPath and IconIndex in the CONSOLE_START_INFO structure, to be used in a future work... [HEADERS] - CHAR_INFO* == PCHAR_INFO - Add two informative comments for two fields of the CONSOLE_READOUTPUT structure (again, to be used in a future work...) Modified: trunk/reactos/dll/win32/kernel32/client/console/console.c trunk/reactos/dll/win32/kernel32/client/console/init.c trunk/reactos/dll/win32/kernel32/include/console.h trunk/reactos/include/reactos/subsys/win/conmsg.h Modified: trunk/reactos/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/console.c [iso-8859-1] Sun Jun 16 17:16:33 2013 @@ -937,8 +937,6 @@ CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_ALLOCCONSOLE AllocConsoleRequest = &ApiMessage.Data.AllocConsoleRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; - LPWSTR AppPath = NULL; - SIZE_T Length = 0; if (Parameters->ConsoleHandle) { @@ -959,14 +957,8 @@ sizeof(CONSOLE_START_INFO), (PVOID*)&AllocConsoleRequest->ConsoleStartInfo); -/** Copied from BasepInitConsole **********************************************/ - InitConsoleInfo(AllocConsoleRequest->ConsoleStartInfo); - - AppPath = AllocConsoleRequest->ConsoleStartInfo->AppPath; - Length = min(MAX_PATH, Parameters->ImagePathName.Length / sizeof(WCHAR)); - wcsncpy(AppPath, Parameters->ImagePathName.Buffer, Length); - AppPath[Length] = L'\0'; -/******************************************************************************/ + InitConsoleInfo(AllocConsoleRequest->ConsoleStartInfo, + &Parameters->ImagePathName); AllocConsoleRequest->Console = NULL; AllocConsoleRequest->CtrlDispatcher = ConsoleControlDispatcher; Modified: trunk/reactos/dll/win32/kernel32/client/console/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/init.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/init.c [iso-8859-1] Sun Jun 16 17:16:33 2013 @@ -108,12 +108,16 @@ VOID -InitConsoleInfo(IN OUT PCONSOLE_START_INFO ConsoleStartInfo) +InitConsoleInfo(IN OUT PCONSOLE_START_INFO ConsoleStartInfo, + IN PUNICODE_STRING ImagePathName) { STARTUPINFOW si; - + SIZE_T Length; + + /* Get the startup information */ GetStartupInfoW(&si); + /* Initialize the fields */ ConsoleStartInfo->dwStartupFlags = si.dwFlags; if (si.dwFlags & STARTF_USEFILLATTRIBUTE) { @@ -138,12 +142,8 @@ ConsoleStartInfo->ConsoleWindowSize.cx = (LONG)(si.dwXSize); ConsoleStartInfo->ConsoleWindowSize.cy = (LONG)(si.dwYSize); } - /* - if (si.dwFlags & STARTF_RUNFULLSCREEN) - { - } - */ - + + /* Set up the title for the console */ if (si.lpTitle) { wcsncpy(ConsoleStartInfo->ConsoleTitle, si.lpTitle, MAX_PATH + 1); @@ -152,6 +152,16 @@ { ConsoleStartInfo->ConsoleTitle[0] = L'\0'; } + + /* Retrieve the application path name */ + Length = min(sizeof(ConsoleStartInfo->AppPath) / sizeof(ConsoleStartInfo->AppPath[0]) - 1, + ImagePathName->Length / sizeof(WCHAR)); + wcsncpy(ConsoleStartInfo->AppPath, ImagePathName->Buffer, Length); + ConsoleStartInfo->AppPath[Length] = L'\0'; + + /* The Console Server will use these fields to set up the console icon */ + ConsoleStartInfo->IconPath[0] = L'\0'; + ConsoleStartInfo->IconIndex = 0; } @@ -191,15 +201,10 @@ } else { - SIZE_T Length = 0; LPCWSTR ExeName; - InitConsoleInfo(&ConnectInfo.ConsoleStartInfo); - - Length = min(sizeof(ConnectInfo.ConsoleStartInfo.AppPath) / sizeof(ConnectInfo.ConsoleStartInfo.AppPath[0]) - 1, - Parameters->ImagePathName.Length / sizeof(WCHAR)); - wcsncpy(ConnectInfo.ConsoleStartInfo.AppPath, Parameters->ImagePathName.Buffer, Length); - ConnectInfo.ConsoleStartInfo.AppPath[Length] = L'\0'; + InitConsoleInfo(&ConnectInfo.ConsoleStartInfo, + &Parameters->ImagePathName); /* Initialize Input EXE name */ ExeName = wcsrchr(Parameters->ImagePathName.Buffer, L'\\'); Modified: trunk/reactos/dll/win32/kernel32/include/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/console.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/console.h [iso-8859-1] Sun Jun 16 17:16:33 2013 @@ -51,7 +51,8 @@ TranslateStdHandle(HANDLE hHandle); VOID -InitConsoleInfo(IN OUT PCONSOLE_START_INFO ConsoleStartInfo); +InitConsoleInfo(IN OUT PCONSOLE_START_INFO ConsoleStartInfo, + IN PUNICODE_STRING ImagePathName); LPCWSTR IntCheckForConsoleFileName(IN LPCWSTR pszName, Modified: trunk/reactos/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] Sun Jun 16 17:16:33 2013 @@ -122,6 +122,8 @@ // UNICODE_STRING ConsoleTitle; WCHAR ConsoleTitle[MAX_PATH + 1]; // Console title or full path to the startup shortcut WCHAR AppPath[MAX_PATH + 1]; // Full path of the launched app + WCHAR IconPath[MAX_PATH + 1]; // Path to the file containing the icon + INT IconIndex; // Index of the icon } CONSOLE_START_INFO, *PCONSOLE_START_INFO; typedef struct _CONSOLE_CONNECTION_INFO @@ -315,7 +317,7 @@ COORD BufferSize; COORD BufferCoord; SMALL_RECT WriteRegion; - CHAR_INFO* CharInfo; + PCHAR_INFO CharInfo; } CONSOLE_WRITEOUTPUT, *PCONSOLE_WRITEOUTPUT; typedef struct @@ -372,12 +374,12 @@ { HANDLE OutputHandle; - ULONG BufferSize; + ULONG BufferSize; // Seems unusued WORD Length; COORD Coord; COORD EndCoord; - ULONG NrCharactersWritten; + ULONG NrCharactersWritten; // Seems unusued CODE_TYPE CodeType; union @@ -427,7 +429,7 @@ COORD BufferSize; COORD BufferCoord; SMALL_RECT ReadRegion; - CHAR_INFO* CharInfo; + PCHAR_INFO CharInfo; } CONSOLE_READOUTPUT, *PCONSOLE_READOUTPUT; typedef struct

1 0

[ekohl] 59233: [LSASRV] Fix uninitialized variable. CORE-7303 #resolve #comment Fixed!
by ekohl＠svn.reactos.org 16 Jun '13

16 Jun '13

Author: ekohl Date: Sun Jun 16 16:24:45 2013 New Revision: 59233 URL: http://svn.reactos.org/svn/reactos?rev=59233&view=rev Log: [LSASRV] Fix uninitialized variable. CORE-7303 #resolve #comment Fixed! Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sun Jun 16 16:24:45 2013 @@ -2178,7 +2178,7 @@ PRPC_UNICODE_STRING RightsBuffer = NULL; PRPC_UNICODE_STRING PrivilegeString; ACCESS_MASK SystemAccess; - ULONG RightsCount; + ULONG RightsCount = 0; ULONG RightsIndex; ULONG i; NTSTATUS Status;

1 0

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

16 Jun '13

Author: akhaldi Date: Sun Jun 16 14:36:02 2013 New Revision: 59232 URL: http://svn.reactos.org/svn/reactos?rev=59232&view=rev Log: [LOCALSPL_WINETEST] * Sync with Wine 1.5.26. Modified: trunk/rostests/winetests/localspl/CMakeLists.txt trunk/rostests/winetests/localspl/localmon.c trunk/rostests/winetests/localspl/testlist.c Modified: trunk/rostests/winetests/localspl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/localspl/CMakeL… ============================================================================== --- trunk/rostests/winetests/localspl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/localspl/CMakeLists.txt [iso-8859-1] Sun Jun 16 14:36:02 2013 @@ -1,8 +1,5 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) - +add_definitions(-D__ROS_LONG64__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_executable(localspl_winetest localmon.c testlist.c) target_link_libraries(localspl_winetest wine) Modified: trunk/rostests/winetests/localspl/localmon.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/localspl/localm… ============================================================================== --- trunk/rostests/winetests/localspl/localmon.c [iso-8859-1] (original) +++ trunk/rostests/winetests/localspl/localmon.c [iso-8859-1] Sun Jun 16 14:36:02 2013 @@ -21,16 +21,16 @@ #include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "winreg.h" - -#include "winspool.h" -#include "ddk/winsplp.h" - -#include "wine/test.h" +#include <windef.h> +#include <winbase.h> +//#include "winerror.h" +#include <wingdi.h> +#include <winreg.h> + +#include <winspool.h> +#include <ddk/winsplp.h> + +#include <wine/test.h> /* ##### */ @@ -208,8 +208,8 @@ if (0) { - /* NT4 crash on this test */ - res = pAddPort(NULL, 0, NULL); + /* NT4 crash on this test */ + pAddPort(NULL, 0, NULL); } /* Testing-Results (localmon.dll from NT4.0): @@ -445,8 +445,8 @@ if (0) { - /* NT4 crash on this test */ - res = pConfigurePort(NULL, 0, NULL); + /* NT4 crash on this test */ + pConfigurePort(NULL, 0, NULL); } /* Testing-Results (localmon.dll from NT4.0): @@ -486,8 +486,8 @@ if (0) { - /* NT4 crash on this test */ - res = pDeletePort(NULL, 0, NULL); + /* NT4 crash on this test */ + pDeletePort(NULL, 0, NULL); } /* Testing-Results (localmon.dll from NT4.0): @@ -573,10 +573,10 @@ if (0) { - /* The following tests crash this app with native localmon/localspl */ - res = pEnumPorts(NULL, level, NULL, cbBuf, &pcbNeeded, &pcReturned); - res = pEnumPorts(NULL, level, buffer, cbBuf, NULL, &pcReturned); - res = pEnumPorts(NULL, level, buffer, cbBuf, &pcbNeeded, NULL); + /* The following tests crash this app with native localmon/localspl */ + pEnumPorts(NULL, level, NULL, cbBuf, &pcbNeeded, &pcReturned); + pEnumPorts(NULL, level, buffer, cbBuf, NULL, &pcReturned); + pEnumPorts(NULL, level, buffer, cbBuf, &pcbNeeded, NULL); } /* The Servername is ignored */ @@ -747,9 +747,9 @@ if (0) { - /* crash with native localspl.dll (w2k+xp) */ - res = pXcvClosePort(NULL); - res = pXcvClosePort(INVALID_HANDLE_VALUE); + /* crash with native localspl.dll (w2k+xp) */ + pXcvClosePort(NULL); + pXcvClosePort(INVALID_HANDLE_VALUE); } @@ -761,12 +761,12 @@ if (res) { SetLastError(0xdeadbeef); res = pXcvClosePort(hXcv2); - ok( res, "returned %d with %u (expected '!= 0')\n", res, GetLastError()); + ok(res, "returned %d with %u (expected '!= 0')\n", res, GetLastError()); if (0) { - /* test for "Double Free": crash with native localspl.dll (w2k+xp) */ - res = pXcvClosePort(hXcv2); + /* test for "Double Free": crash with native localspl.dll (w2k+xp) */ + pXcvClosePort(hXcv2); } } } @@ -1001,6 +1001,7 @@ /* the default timeout is returned, when the value is empty */ res = RegSetValueExA(hroot, TransmissionRetryTimeoutA, 0, REG_SZ, (PBYTE)emptyA, 1); + ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", GetLastError()); needed = (DWORD) 0xdeadbeef; buffer[0] = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -1011,6 +1012,7 @@ /* the dialog is limited (1 - 999999), but that is done somewhere else */ res = RegSetValueExA(hroot, TransmissionRetryTimeoutA, 0, REG_SZ, (PBYTE)num_0A, lstrlenA(num_0A)+1); + ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", GetLastError()); needed = (DWORD) 0xdeadbeef; buffer[0] = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -1021,6 +1023,7 @@ res = RegSetValueExA(hroot, TransmissionRetryTimeoutA, 0, REG_SZ, (PBYTE)num_1A, lstrlenA(num_1A)+1); + ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", GetLastError()); needed = (DWORD) 0xdeadbeef; buffer[0] = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -1030,6 +1033,7 @@ "for '1')\n", res, GetLastError(), needed, buffer[0]); res = RegSetValueExA(hroot, TransmissionRetryTimeoutA, 0, REG_SZ, (PBYTE)num_999999A, lstrlenA(num_999999A)+1); + ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", GetLastError()); needed = (DWORD) 0xdeadbeef; buffer[0] = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -1040,6 +1044,7 @@ res = RegSetValueExA(hroot, TransmissionRetryTimeoutA, 0, REG_SZ, (PBYTE)num_1000000A, lstrlenA(num_1000000A)+1); + ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", GetLastError()); needed = (DWORD) 0xdeadbeef; buffer[0] = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -1094,10 +1099,10 @@ "(expected 'ERROR_INVALID_PARAMETER')\n", res, GetLastError(), needed); if (0) { - /* crash with native localspl.dll (w2k+xp) */ - res = pXcvDataPort(hXcv, NULL, NULL, 0, buffer, MAX_PATH, &needed); - res = pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, NULL, len, &needed); - res = pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len, NULL); + /* crash with native localspl.dll (w2k+xp) */ + pXcvDataPort(hXcv, NULL, NULL, 0, buffer, MAX_PATH, &needed); + pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, NULL, len, &needed); + pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len, NULL); } @@ -1173,8 +1178,8 @@ if (0) { - /* crash with native localspl.dll (w2k+xp) */ - res = pXcvDataPort(hXcv, cmd_PortIsValidW, NULL, 0, NULL, 0, &needed); + /* crash with native localspl.dll (w2k+xp) */ + pXcvDataPort(hXcv, cmd_PortIsValidW, NULL, 0, NULL, 0, &needed); } @@ -1304,9 +1309,9 @@ if (0) { - /* crash with native localspl.dll (w2k+xp) */ - res = pXcvOpenPort(NULL, SERVER_ACCESS_ADMINISTER, &hXcv2); - res = pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, NULL); + /* crash with native localspl.dll (w2k+xp) */ + pXcvOpenPort(NULL, SERVER_ACCESS_ADMINISTER, &hXcv2); + pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, NULL); } Modified: trunk/rostests/winetests/localspl/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/localspl/testli… ============================================================================== --- trunk/rostests/winetests/localspl/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/localspl/testlist.c [iso-8859-1] Sun Jun 16 14:36:02 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_localmon(void);

1 0

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

16 Jun '13

Author: akhaldi Date: Sun Jun 16 14:35:12 2013 New Revision: 59231 URL: http://svn.reactos.org/svn/reactos?rev=59231&view=rev Log: [LOCALSPL] * Sync with Wine 1.5.26. Modified: trunk/reactos/dll/win32/localspl/CMakeLists.txt trunk/reactos/dll/win32/localspl/localmon.c trunk/reactos/dll/win32/localspl/localspl_private.h trunk/reactos/dll/win32/localspl/provider.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/localspl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/localspl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/CMakeLists.txt [iso-8859-1] Sun Jun 16 14:35:12 2013 @@ -16,15 +16,7 @@ add_library(localspl SHARED ${SOURCE} localspl.rc) set_module_type(localspl win32dll) target_link_libraries(localspl wine) - -add_importlibs(localspl - spoolss - user32 - advapi32 - msvcrt - kernel32 - ntdll) - +add_importlibs(localspl spoolss user32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET localspl DESTINATION reactos/system32 FOR all) if(NOT MSVC) Modified: trunk/reactos/dll/win32/localspl/localmon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/localmo… ============================================================================== --- trunk/reactos/dll/win32/localspl/localmon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/localmon.c [iso-8859-1] Sun Jun 16 14:35:12 2013 @@ -515,7 +515,6 @@ static BOOL WINAPI localmon_OpenPortW(LPWSTR pName, PHANDLE phPort) { port_t * port; - DWORD len; DWORD type; TRACE("%s, %p)\n", debugstr_w(pName), phPort); @@ -527,12 +526,11 @@ type = get_type_from_local_name(pName); if (!type) return FALSE; - len = (lstrlenW(pName) + 1) * sizeof(WCHAR); - port = heap_alloc(sizeof(port_t) + len); + port = heap_alloc(FIELD_OFFSET(port_t, nameW[lstrlenW(pName) + 1])); if (!port) return FALSE; port->type = type; - memcpy(port->nameW, pName, len); + lstrcpyW(port->nameW, pName); *phPort = port; EnterCriticalSection(&port_handles_cs); @@ -736,16 +734,14 @@ */ static BOOL WINAPI localmon_XcvOpenPort(LPCWSTR pName, ACCESS_MASK GrantedAccess, PHANDLE phXcv) { - DWORD len; xcv_t * xcv; TRACE("%s, 0x%x, %p)\n", debugstr_w(pName), GrantedAccess, phXcv); /* No checks for any field is done in Windows */ - len = (lstrlenW(pName) + 1) * sizeof(WCHAR); - xcv = heap_alloc( sizeof(xcv_t) + len); + xcv = heap_alloc(FIELD_OFFSET(xcv_t, nameW[lstrlenW(pName) + 1])); if (xcv) { xcv->GrantedAccess = GrantedAccess; - memcpy(xcv->nameW, pName, len); + lstrcpyW(xcv->nameW, pName); *phXcv = xcv; EnterCriticalSection(&xcv_handles_cs); list_add_tail(&xcv_handles, &xcv->entry); Modified: trunk/reactos/dll/win32/localspl/localspl_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/localsp… ============================================================================== --- trunk/reactos/dll/win32/localspl/localspl_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/localspl_private.h [iso-8859-1] Sun Jun 16 14:35:12 2013 @@ -24,8 +24,8 @@ //#include <windef.h> /* ## DLL-wide Globals ## */ -extern HINSTANCE LOCALSPL_hInstance; -void setup_provider(void); +extern HINSTANCE LOCALSPL_hInstance DECLSPEC_HIDDEN; +void setup_provider(void) DECLSPEC_HIDDEN; /* ## Resource-ID ## */ #define IDS_LOCALPORT 500 Modified: trunk/reactos/dll/win32/localspl/provider.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/provide… ============================================================================== --- trunk/reactos/dll/win32/localspl/provider.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/provider.c [iso-8859-1] Sun Jun 16 14:35:12 2013 @@ -142,7 +142,8 @@ 'C','o','n','t','r','o','l','\\', 'P','r','i','n','t','\\', 'P','r','i','n','t','e','r','s',0}; -static const WCHAR spooldriversW[] = {'\\','s','p','o','o','l','\\','d','r','i','v','e','r','s','\\',0}; +static const WCHAR spoolW[] = {'\\','s','p','o','o','l',0}; +static const WCHAR driversW[] = {'\\','d','r','i','v','e','r','s','\\',0}; static const WCHAR spoolprtprocsW[] = {'\\','s','p','o','o','l','\\','p','r','t','p','r','o','c','s','\\',0}; static const WCHAR version0_regpathW[] = {'\\','V','e','r','s','i','o','n','-','0',0}; static const WCHAR version0_subdirW[] = {'\\','0',0}; @@ -214,41 +215,29 @@ * Failure: FALSE * */ -static BOOL apd_copyfile(LPWSTR filename, apd_data_t *apd) -{ - LPWSTR ptr; - LPWSTR srcname; - DWORD res; +static BOOL apd_copyfile( WCHAR *pathname, WCHAR *file_part, apd_data_t *apd ) +{ + WCHAR *srcname; + DWORD res; apd->src[apd->srclen] = '\0'; apd->dst[apd->dstlen] = '\0'; - if (!filename || !filename[0]) { + if (!pathname || !pathname[0]) { /* nothing to copy */ return TRUE; } - ptr = strrchrW(filename, '\\'); - if (ptr) { - ptr++; - } - else - { - ptr = filename; - } - - if (apd->copyflags & APD_COPY_FROM_DIRECTORY) { - /* we have an absolute Path */ - srcname = filename; - } + if (apd->copyflags & APD_COPY_FROM_DIRECTORY) + srcname = pathname; else { srcname = apd->src; - lstrcatW(srcname, ptr); - } - lstrcatW(apd->dst, ptr); - - TRACE("%s => %s\n", debugstr_w(filename), debugstr_w(apd->dst)); + strcatW( srcname, file_part ); + } + strcatW( apd->dst, file_part ); + + TRACE("%s => %s\n", debugstr_w(srcname), debugstr_w(apd->dst)); /* FIXME: handle APD_COPY_NEW_FILES */ res = CopyFileW(srcname, apd->dst, FALSE); @@ -1073,6 +1062,7 @@ { DWORD needed; const printenv_t * env; + WCHAR * const dir = (WCHAR *)pDriverDirectory; TRACE("(%s, %s, %d, %p, %d, %p)\n", debugstr_w(pName), debugstr_w(pEnvironment), Level, pDriverDirectory, cbBuf, pcbNeeded); @@ -1090,7 +1080,8 @@ /* GetSystemDirectoryW returns number of WCHAR including the '\0' */ needed = GetSystemDirectoryW(NULL, 0); /* add the Size for the Subdirectories */ - needed += lstrlenW(spooldriversW); + needed += lstrlenW(spoolW); + needed += lstrlenW(driversW); needed += lstrlenW(env->subdir); needed *= sizeof(WCHAR); /* return-value is size in Bytes */ @@ -1101,18 +1092,22 @@ return FALSE; } - if (pDriverDirectory == NULL) { + if (dir == NULL) { /* ERROR_INVALID_USER_BUFFER is NT, ERROR_INVALID_PARAMETER is win9x */ SetLastError(ERROR_INVALID_USER_BUFFER); return FALSE; } - GetSystemDirectoryW((LPWSTR) pDriverDirectory, cbBuf/sizeof(WCHAR)); + GetSystemDirectoryW( dir, cbBuf / sizeof(WCHAR) ); /* add the Subdirectories */ - lstrcatW((LPWSTR) pDriverDirectory, spooldriversW); - lstrcatW((LPWSTR) pDriverDirectory, env->subdir); - - TRACE("=> %s\n", debugstr_w((LPWSTR) pDriverDirectory)); + lstrcatW( dir, spoolW ); + CreateDirectoryW( dir, NULL ); + lstrcatW( dir, driversW ); + CreateDirectoryW( dir, NULL ); + lstrcatW( dir, env->subdir ); + CreateDirectoryW( dir, NULL ); + + TRACE( "=> %s\n", debugstr_w( dir ) ); return TRUE; } @@ -1286,6 +1281,12 @@ return (HANDLE)printer; } +static inline WCHAR *get_file_part( WCHAR *name ) +{ + WCHAR *ptr = strrchrW( name, '\\' ); + if (ptr) return ptr + 1; + return name; +} /****************************************************************************** * myAddPrinterDriverEx [internal] @@ -1301,7 +1302,7 @@ DRIVER_INFO_8W di; BOOL (WINAPI *pDrvDriverEvent)(DWORD, DWORD, LPBYTE, LPARAM); HMODULE hui; - LPWSTR ptr; + WCHAR *file; HKEY hroot; HKEY hdrv; DWORD disposition; @@ -1369,54 +1370,53 @@ } RegCloseKey(hroot); - if (disposition == REG_OPENED_EXISTING_KEY) { - TRACE("driver %s already installed\n", debugstr_w(di.pName)); - RegCloseKey(hdrv); - SetLastError(ERROR_PRINTER_DRIVER_ALREADY_INSTALLED); - return FALSE; - } - /* Verified with the Adobe PS Driver, that w2k does not use di.Version */ RegSetValueExW(hdrv, versionW, 0, REG_DWORD, (const BYTE*) &env->driverversion, sizeof(DWORD)); - RegSetValueExW(hdrv, driverW, 0, REG_SZ, (LPBYTE) di.pDriverPath, - (lstrlenW(di.pDriverPath)+1)* sizeof(WCHAR)); - apd_copyfile(di.pDriverPath, &apd); - - RegSetValueExW(hdrv, data_fileW, 0, REG_SZ, (LPBYTE) di.pDataFile, - (lstrlenW(di.pDataFile)+1)* sizeof(WCHAR)); - apd_copyfile(di.pDataFile, &apd); - - RegSetValueExW(hdrv, configuration_fileW, 0, REG_SZ, (LPBYTE) di.pConfigFile, - (lstrlenW(di.pConfigFile)+1)* sizeof(WCHAR)); - apd_copyfile(di.pConfigFile, &apd); + file = get_file_part( di.pDriverPath ); + RegSetValueExW( hdrv, driverW, 0, REG_SZ, (LPBYTE)file, (strlenW( file ) + 1) * sizeof(WCHAR) ); + apd_copyfile( di.pDriverPath, file, &apd ); + + file = get_file_part( di.pDataFile ); + RegSetValueExW( hdrv, data_fileW, 0, REG_SZ, (LPBYTE)file, (strlenW( file ) + 1) * sizeof(WCHAR) ); + apd_copyfile( di.pDataFile, file, &apd ); + + file = get_file_part( di.pConfigFile ); + RegSetValueExW( hdrv, configuration_fileW, 0, REG_SZ, (LPBYTE)file, (strlenW( file ) + 1) * sizeof(WCHAR) ); + apd_copyfile( di.pConfigFile, file, &apd ); /* settings for level 3 */ if (di.pHelpFile) - RegSetValueExW(hdrv, help_fileW, 0, REG_SZ, (LPBYTE) di.pHelpFile, - (lstrlenW(di.pHelpFile)+1)* sizeof(WCHAR)); + { + file = get_file_part( di.pHelpFile ); + RegSetValueExW( hdrv, help_fileW, 0, REG_SZ, (LPBYTE)file, (strlenW( file ) + 1) * sizeof(WCHAR) ); + apd_copyfile( di.pHelpFile, file, &apd ); + } else - RegSetValueExW(hdrv, help_fileW, 0, REG_SZ, (const BYTE*)emptyW, sizeof(emptyW)); - apd_copyfile(di.pHelpFile, &apd); - - - ptr = di.pDependentFiles; - if (ptr) - RegSetValueExW(hdrv, dependent_filesW, 0, REG_MULTI_SZ, (LPBYTE) di.pDependentFiles, - multi_sz_lenW(di.pDependentFiles)); + RegSetValueExW( hdrv, help_fileW, 0, REG_SZ, (const BYTE*)emptyW, sizeof(emptyW) ); + + if (di.pDependentFiles && *di.pDependentFiles) + { + WCHAR *reg, *reg_ptr, *in_ptr; + reg = reg_ptr = HeapAlloc( GetProcessHeap(), 0, multi_sz_lenW( di.pDependentFiles ) ); + + for (in_ptr = di.pDependentFiles; *in_ptr; in_ptr += strlenW( in_ptr ) + 1) + { + file = get_file_part( in_ptr ); + len = strlenW( file ) + 1; + memcpy( reg_ptr, file, len * sizeof(WCHAR) ); + reg_ptr += len; + apd_copyfile( in_ptr, file, &apd ); + } + *reg_ptr = 0; + + RegSetValueExW( hdrv, dependent_filesW, 0, REG_MULTI_SZ, (LPBYTE)reg, (reg_ptr - reg + 1) * sizeof(WCHAR) ); + HeapFree( GetProcessHeap(), 0, reg ); + } else RegSetValueExW(hdrv, dependent_filesW, 0, REG_MULTI_SZ, (const BYTE*)emptyW, sizeof(emptyW)); - while ((ptr != NULL) && (ptr[0])) { - if (apd_copyfile(ptr, &apd)) { - ptr += lstrlenW(ptr) + 1; - } - else - { - WARN("Failed to copy %s\n", debugstr_w(ptr)); - ptr = NULL; - } - } + /* The language-Monitor was already copied by the caller to "%SystemRoot%\system32" */ if (di.pMonitorName) RegSetValueExW(hdrv, monitorW, 0, REG_SZ, (LPBYTE) di.pMonitorName, @@ -1680,7 +1680,7 @@ else { FIXME("not implemented for %s (monitor %p: %s)\n", - debugstr_w(pMonitorName), pm, pm ? debugstr_w(pm->dllname) : NULL); + debugstr_w(pMonitorName), pm, pm ? debugstr_w(pm->dllname) : "(null)"); SetLastError(ERROR_INVALID_PARAMETER); res = 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 14:35:12 2013 @@ -83,7 +83,7 @@ reactos/dll/win32/itss # Synced to Wine-1.5.4 reactos/dll/win32/jscript # Synced to Wine-1.5.26 reactos/dll/win32/loadperf # Synced to Wine-1.5.19 -reactos/dll/win32/localspl # Synced to Wine-1.1.14? +reactos/dll/win32/localspl # Synced to Wine-1.5.26 reactos/dll/win32/localui # Synced to Wine-1.5.19 reactos/dll/win32/lz32 # Synced to Wine-1.5.19 reactos/dll/win32/mapi32 # Autosync

1 0

[akhaldi] 59230: [FONTVIEW] * Restructure Display_OnPrint to eliminate allocating an unused variable and plug a leak.
by akhaldi＠svn.reactos.org 16 Jun '13

16 Jun '13

Author: akhaldi Date: Sun Jun 16 12:43:35 2013 New Revision: 59230 URL: http://svn.reactos.org/svn/reactos?rev=59230&view=rev Log: [FONTVIEW] * Restructure Display_OnPrint to eliminate allocating an unused variable and plug a leak. Modified: trunk/reactos/base/applications/fontview/display.c Modified: trunk/reactos/base/applications/fontview/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/display.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/display.c [iso-8859-1] Sun Jun 16 12:43:35 2013 @@ -417,13 +417,6 @@ PRINTDLG pfont; TEXTMETRIC tm; int copies, yPos; - DISPLAYDATA* pData; - - pData = malloc(sizeof(DISPLAYDATA)); - ZeroMemory(pData, sizeof(DISPLAYDATA)); - - /* Sets up the font layout */ - pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); /* Clears the memory before using it */ ZeroMemory(&pfont, sizeof(pfont)); @@ -443,7 +436,15 @@ if (PrintDlg(&pfont)) { DOCINFO docinfo; - +#if 0 + DISPLAYDATA* pData; + + pData = malloc(sizeof(DISPLAYDATA)); + ZeroMemory(pData, sizeof(DISPLAYDATA)); + + /* Sets up the font layout */ + pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); +#endif docinfo.cbSize = sizeof(DOCINFO); docinfo.lpszDocName = "Printing Font"; docinfo.lpszOutput = NULL; @@ -470,7 +471,9 @@ /* TODO: Determine if using Display_DrawText() will work for both rendering out to the window and to the printer output */ - //Display_DrawText(pfont.hDC, pData, yPos); +#if 0 + Display_DrawText(pfont.hDC, pData, yPos); +#endif /* Ends the current page */ EndPage(pfont.hDC); @@ -487,12 +490,11 @@ EndDoc(pfont.hDC); DeleteDC(pfont.hDC); - } else { - return 0; - } - - /* Frees the memory since we no longer need it for now */ - free(pData); +#if 0 + /* Frees the memory since we no longer need it for now */ + free(pData); +#endif + } return 0; }

1 0

[ekohl] 59229: [NTFS] Fix indentation and coding style. No code changes!!!
by ekohl＠svn.reactos.org 16 Jun '13

16 Jun '13

Author: ekohl Date: Sun Jun 16 12:15:06 2013 New Revision: 59229 URL: http://svn.reactos.org/svn/reactos?rev=59229&view=rev Log: [NTFS] Fix indentation and coding style. No code changes!!! Modified: trunk/reactos/drivers/filesystems/ntfs/CMakeLists.txt trunk/reactos/drivers/filesystems/ntfs/attrib.c trunk/reactos/drivers/filesystems/ntfs/blockdev.c trunk/reactos/drivers/filesystems/ntfs/close.c trunk/reactos/drivers/filesystems/ntfs/create.c trunk/reactos/drivers/filesystems/ntfs/dirctl.c trunk/reactos/drivers/filesystems/ntfs/dispatch.c trunk/reactos/drivers/filesystems/ntfs/fastio.c trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/finfo.c trunk/reactos/drivers/filesystems/ntfs/fsctl.c trunk/reactos/drivers/filesystems/ntfs/mft.c trunk/reactos/drivers/filesystems/ntfs/misc.c trunk/reactos/drivers/filesystems/ntfs/ntfs.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h trunk/reactos/drivers/filesystems/ntfs/rw.c trunk/reactos/drivers/filesystems/ntfs/volinfo.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/filesystems/ntfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/C… Modified: trunk/reactos/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/a… Modified: trunk/reactos/drivers/filesystems/ntfs/blockdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/b… Modified: trunk/reactos/drivers/filesystems/ntfs/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… Modified: trunk/reactos/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… Modified: trunk/reactos/drivers/filesystems/ntfs/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… Modified: trunk/reactos/drivers/filesystems/ntfs/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… Modified: trunk/reactos/drivers/filesystems/ntfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… Modified: trunk/reactos/drivers/filesystems/ntfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/r… Modified: trunk/reactos/drivers/filesystems/ntfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/v…

1 0

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

16 Jun '13

Author: akhaldi Date: Sun Jun 16 11:11:48 2013 New Revision: 59228 URL: http://svn.reactos.org/svn/reactos?rev=59228&view=rev Log: [QMGRPRXY] * Sync with Wine 1.5.26. Added: trunk/reactos/dll/win32/qmgrprxy/qmgrprxy.rc - copied unchanged from r59223, trunk/reactos/dll/win32/qmgrprxy/version.rc Removed: trunk/reactos/dll/win32/qmgrprxy/version.rc Modified: trunk/reactos/dll/win32/qmgrprxy/CMakeLists.txt trunk/reactos/dll/win32/qmgrprxy/qmgrprxy.idl trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/qmgrprxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgrprxy/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/qmgrprxy/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgrprxy/CMakeLists.txt [iso-8859-1] Sun Jun 16 11:11:48 2013 @@ -1,7 +1,7 @@ add_definitions( -D__WINESRC__ - -DREGISTER_PROXY_DLL) + -DWINE_REGISTER_DLL) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -12,7 +12,7 @@ add_rpcproxy_files(qmgrprxy.idl) list(APPEND SOURCE - version.rc + qmgrprxy.rc ${CMAKE_CURRENT_BINARY_DIR}/qmgrprxy_i.c ${CMAKE_CURRENT_BINARY_DIR}/qmgrprxy_p.c ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c Modified: trunk/reactos/dll/win32/qmgrprxy/qmgrprxy.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgrprxy/qmgrprx… ============================================================================== --- trunk/reactos/dll/win32/qmgrprxy/qmgrprxy.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgrprxy/qmgrprxy.idl [iso-8859-1] Sun Jun 16 11:11:48 2013 @@ -20,3 +20,9 @@ #define DO_NO_IMPORTS #include "bits1_5.idl" + +[ + threading(both), + uuid(5ce34c0d-0dc9-4c1f-897c-daa1b78cee7c) /* IBackgroundCopyManager */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } Removed: trunk/reactos/dll/win32/qmgrprxy/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgrprxy/version… ============================================================================== --- trunk/reactos/dll/win32/qmgrprxy/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgrprxy/version.rc (removed) @@ -1,4 +0,0 @@ -#define WINE_OLESELFREGISTER -#define WINE_FILENAME_STR "qmgrprxy.dll" - -#include <wine/wine_common_ver.rc> 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:11:48 2013 @@ -146,8 +146,8 @@ 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.5-26 -reactos/dll/win32/qmgrprxy # Synced to Wine-1.14? +reactos/dll/win32/qmgr # Synced to Wine-1.5.26 +reactos/dll/win32/qmgrprxy # Synced to Wine-1.5.26 reactos/dll/win32/query # Synced to Wine-1.5.19 reactos/dll/win32/rasapi32 # Synced to Wine-1.5.4 reactos/dll/win32/resutils # Synced to Wine-1.5.19

1 0

[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

← Newer
1
...
15
16
17
18
19
20
21
...
28
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2013