Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 59237: [NETAPI32] - BuildUserInfoBuffer: return password age - SetUserInfo: set account control flags and implement level 1008
by ekohl＠svn.reactos.org 16 Jun '13

16 Jun '13

Author: ekohl Date: Sun Jun 16 20:07:29 2013 New Revision: 59237 URL: http://svn.reactos.org/svn/reactos?rev=59237&view=rev Log: [NETAPI32] - BuildUserInfoBuffer: return password age - SetUserInfo: set account control flags and implement level 1008 Modified: trunk/reactos/dll/win32/netapi32/netapi32.h trunk/reactos/dll/win32/netapi32/user.c Modified: trunk/reactos/dll/win32/netapi32/netapi32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.h [iso-8859-1] Sun Jun 16 20:07:29 2013 @@ -24,6 +24,7 @@ #include <wine/list.h> #define NTOS_MODE_USER +#include <ndk/kefuncs.h> #include <ndk/rtlfuncs.h> #include <ntsam.h> 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] Sun Jun 16 20:07:29 2013 @@ -111,6 +111,63 @@ static +ULONG +GetAccountControl(ULONG Flags) +{ + ULONG AccountControl = 0; + + if (Flags & UF_ACCOUNTDISABLE) + AccountControl |= USER_ACCOUNT_DISABLED; + + if (Flags & UF_HOMEDIR_REQUIRED) + AccountControl |= USER_HOME_DIRECTORY_REQUIRED; + + if (Flags & UF_PASSWD_NOTREQD) + AccountControl |= USER_PASSWORD_NOT_REQUIRED; + + if (Flags & UF_LOCKOUT) + AccountControl |= USER_ACCOUNT_AUTO_LOCKED; + + if (Flags & UF_DONT_EXPIRE_PASSWD) + AccountControl |= USER_DONT_EXPIRE_PASSWORD; + + /* Set account type flags */ + if (Flags & UF_TEMP_DUPLICATE_ACCOUNT) + AccountControl |= USER_TEMP_DUPLICATE_ACCOUNT; + else if (Flags & UF_NORMAL_ACCOUNT) + AccountControl |= USER_NORMAL_ACCOUNT; + else if (Flags & UF_INTERDOMAIN_TRUST_ACCOUNT) + AccountControl |= USER_INTERDOMAIN_TRUST_ACCOUNT; + else if (Flags & UF_WORKSTATION_TRUST_ACCOUNT) + AccountControl |= USER_WORKSTATION_TRUST_ACCOUNT; + else if (Flags & UF_SERVER_TRUST_ACCOUNT) + AccountControl |= USER_SERVER_TRUST_ACCOUNT; + + return AccountControl; +} + + +static +DWORD +GetPasswordAge(IN PLARGE_INTEGER PasswordLastSet) +{ + LARGE_INTEGER SystemTime; + ULONG SystemSecondsSince1970; + ULONG PasswordSecondsSince1970; + NTSTATUS Status; + + Status = NtQuerySystemTime(&SystemTime); + if (!NT_SUCCESS(Status)) + return 0; + + RtlTimeToSecondsSince1970(&SystemTime, &SystemSecondsSince1970); + RtlTimeToSecondsSince1970(PasswordLastSet, &PasswordSecondsSince1970); + + return SystemSecondsSince1970 - PasswordSecondsSince1970; +} + + +static NET_API_STATUS BuildUserInfoBuffer(PUSER_ALL_INFORMATION UserInfo, DWORD level, @@ -306,7 +363,8 @@ UserInfo1->usri1_password = NULL; - /* FIXME: UserInfo1->usri1_password_age */ + UserInfo1->usri1_password_age = GetPasswordAge(&UserInfo->PasswordLastSet); + /* FIXME: UserInfo1->usri1_priv */ if (UserInfo->HomeDirectory.Length > 0) @@ -360,7 +418,8 @@ Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->UserName.Length + sizeof(WCHAR)); - /* FIXME: usri2_password_age */ + UserInfo2->usri2_password_age = GetPasswordAge(&UserInfo->PasswordLastSet); + /* FIXME: usri2_priv */ if (UserInfo->HomeDirectory.Length > 0) @@ -507,7 +566,8 @@ Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->UserName.Length + sizeof(WCHAR)); - /* FIXME: usri3_password_age */ + UserInfo3->usri3_password_age = GetPasswordAge(&UserInfo->PasswordLastSet); + /* FIXME: usri3_priv */ if (UserInfo->HomeDirectory.Length > 0) @@ -883,6 +943,7 @@ PUSER_INFO_1003 UserInfo1003; PUSER_INFO_1006 UserInfo1006; PUSER_INFO_1007 UserInfo1007; + PUSER_INFO_1008 UserInfo1008; PUSER_INFO_1009 UserInfo1009; PUSER_INFO_1011 UserInfo1011; PUSER_INFO_1012 UserInfo1012; @@ -937,8 +998,8 @@ UserAllInfo.WhichFields |= USER_ALL_ADMINCOMMENT; } -// UserInfo1->usri1_flags -// UserAllInfo.WhichFields |= USER_ALL_USERACCOUNTCONTROL; + UserAllInfo.UserAccountControl = GetAccountControl(UserInfo1->usri1_flags); + UserAllInfo.WhichFields |= USER_ALL_USERACCOUNTCONTROL; if (UserInfo1->usri1_script_path != NULL) { @@ -979,7 +1040,8 @@ UserAllInfo.WhichFields |= USER_ALL_ADMINCOMMENT; } -// UserInfo2->usri2_flags; + UserAllInfo.UserAccountControl = GetAccountControl(UserInfo2->usri2_flags); + UserAllInfo.WhichFields |= USER_ALL_USERACCOUNTCONTROL; if (UserInfo2->usri2_script_path != NULL) { @@ -1065,8 +1127,8 @@ UserAllInfo.WhichFields |= USER_ALL_ADMINCOMMENT; } -// UserInfo3->usri3_flags; -// UserAllInfo.WhichFields |= USER_ALL_USERACCOUNTCONTROL; + UserAllInfo.UserAccountControl = GetAccountControl(UserInfo3->usri3_flags); + UserAllInfo.WhichFields |= USER_ALL_USERACCOUNTCONTROL; if (UserInfo3->usri3_script_path != NULL) { @@ -1181,7 +1243,11 @@ } break; -// case 1008: + case 1008: + UserInfo1008 = (PUSER_INFO_1008)UserInfo; + UserAllInfo.UserAccountControl = GetAccountControl(UserInfo1008->usri1008_flags); + UserAllInfo.WhichFields |= USER_ALL_USERACCOUNTCONTROL; + break; case 1009: UserInfo1009 = (PUSER_INFO_1009)UserInfo; @@ -2342,7 +2408,7 @@ // case 1005: case 1006: case 1007: -// case 1008: + case 1008: case 1009: // case 1010: case 1011:

1 0

[akhaldi] 59236: [MESA32] * Silence warnings.
by akhaldi＠svn.reactos.org 16 Jun '13

16 Jun '13

Author: akhaldi Date: Sun Jun 16 19:13:50 2013 New Revision: 59236 URL: http://svn.reactos.org/svn/reactos?rev=59236&view=rev Log: [MESA32] * Silence warnings. Modified: trunk/reactos/dll/opengl/mesa/CMakeLists.txt Modified: trunk/reactos/dll/opengl/mesa/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/CMakeLists… ============================================================================== --- trunk/reactos/dll/opengl/mesa/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/CMakeLists.txt [iso-8859-1] Sun Jun 16 19:13:50 2013 @@ -13,10 +13,8 @@ if(NOT MSVC) add_compile_flags_language("-std=gnu99" "C") - add_compile_flags("-Wno-deprecated-declarations") - if(GCC_VERSION VERSION_EQUAL 4.7 OR GCC_VERSION VERSION_GREATER 4.7) - add_compile_flags("-Wno-error=unused-local-typedefs") - endif() + add_compile_flags("-Wno-deprecated-declarations -Wno-error=unused-local-typedefs -Wno-unused-but-set-variable") + add_compile_flags_language("-Wno-delete-non-virtual-dtor -Wno-narrowing" "CXX") # optimizations (builtin memcmp is slow on some gcc versions) used in SConsript files add_compile_flags("-ffast-math -fno-builtin-memcmp") else()

1 0

[akhaldi] 59235: [FREETYPE] * Silence the unused-but-set warnings. Dedicated to Thomas Faber.
by akhaldi＠svn.reactos.org 16 Jun '13

16 Jun '13

Author: akhaldi Date: Sun Jun 16 17:42:42 2013 New Revision: 59235 URL: http://svn.reactos.org/svn/reactos?rev=59235&view=rev Log: [FREETYPE] * Silence the unused-but-set warnings. Dedicated to Thomas Faber. Modified: trunk/reactos/lib/3rdparty/freetype/CMakeLists.txt Modified: trunk/reactos/lib/3rdparty/freetype/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/CMak… ============================================================================== --- trunk/reactos/lib/3rdparty/freetype/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/freetype/CMakeLists.txt [iso-8859-1] Sun Jun 16 17:42:42 2013 @@ -50,3 +50,7 @@ add_library(freetype ${SOURCE}) allow_warnings(freetype) + +if(NOT MSVC) + add_target_compile_flags(freetype "-Wno-unused-but-set-variable") +endif()

1 0

[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

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