Ros-diffs May 2014

ros-diffs@reactos.org

14 participants
437 discussions

[akhaldi] 63192: [KERNEL32][NTDLL] * Sync ActCtx related code with Wine 1.7.17. * I'll let you find out how many tests that fixes ; ) * Dedicated to Christoph von Wittich. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu May 8 14:14:01 2014 New Revision: 63192 URL: http://svn.reactos.org/svn/reactos?rev=63192&view=rev Log: [KERNEL32][NTDLL] * Sync ActCtx related code with Wine 1.7.17. * I'll let you find out how many tests that fixes ;) * Dedicated to Christoph von Wittich. CORE-8080 Modified: trunk/reactos/dll/win32/kernel32/wine/actctx.c trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/actctx.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/kernel32/wine/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/wine/ac… Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=63192… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

10 years, 7 months

[akhaldi] 63191: [NDK] * Add RtlFindActivationContextSectionGuid().

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu May 8 14:09:06 2014 New Revision: 63191 URL: http://svn.reactos.org/svn/reactos?rev=63191&view=rev Log: [NDK] * Add RtlFindActivationContextSectionGuid(). Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Thu May 8 14:09:06 2014 @@ -4419,6 +4419,17 @@ #endif // NTOS_MODE_USER +NTSYSAPI +NTSTATUS +NTAPI +RtlFindActivationContextSectionGuid( + ULONG flags, + const GUID *extguid, + ULONG section_kind, + const GUID *guid, + void *ptr +); + #ifdef __cplusplus } #endif

10 years, 7 months

[akhaldi] 63190: [WINE/PORT] * Fix interlocked_cmpxchg_ptr and interlocked_xchg_ptr.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu May 8 14:08:20 2014 New Revision: 63190 URL: http://svn.reactos.org/svn/reactos?rev=63190&view=rev Log: [WINE/PORT] * Fix interlocked_cmpxchg_ptr and interlocked_xchg_ptr. Modified: trunk/reactos/include/reactos/wine/port.h Modified: trunk/reactos/include/reactos/wine/port.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/port.… ============================================================================== --- trunk/reactos/include/reactos/wine/port.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/port.h [iso-8859-1] Thu May 8 14:08:20 2014 @@ -343,9 +343,9 @@ #if defined(_MSC_VER) || (defined(__i386__) && defined(__GNUC__) && !defined(WINE_PORT_NO_INTERLOCKED)) #define interlocked_cmpxchg InterlockedCompareExchange -#define interlocked_cmpxchg_ptr InterlockedCompareExchangePtr +#define interlocked_cmpxchg_ptr InterlockedCompareExchangePointer #define interlocked_xchg InterlockedExchange -#define interlocked_xchg_ptr InterlockedExchangePtr +#define interlocked_xchg_ptr InterlockedExchangePointer #define interlocked_xchg_add InterlockedExchangeAdd

10 years, 7 months

[akhaldi] 63189: [NTDLL] * Export NtGetTickCount(). CORE-8174

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu May 8 14:07:36 2014 New Revision: 63189 URL: http://svn.reactos.org/svn/reactos?rev=63189&view=rev Log: [NTDLL] * Export NtGetTickCount(). CORE-8174 Modified: trunk/reactos/dll/ntdll/CMakeLists.txt trunk/reactos/dll/ntdll/def/ntdll.spec Modified: trunk/reactos/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] Thu May 8 14:07:36 2014 @@ -40,6 +40,7 @@ ${SOURCE} ${ntdll_asm} def/ntdll.rc + ${CMAKE_CURRENT_BINARY_DIR}/ntdll_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/ntdll.def) set_module_type(ntdll win32dll HOTPATCHABLE ENTRYPOINT 0) Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Thu May 8 14:07:36 2014 @@ -175,7 +175,7 @@ @ stdcall NtGetCurrentProcessorNumber() ; 5.2 and higher @ stdcall NtGetDevicePowerState(ptr ptr) @ stdcall NtGetPlugPlayEvent(long long ptr long) -;@ stdcall NtGetTickCount() +@ stdcall -stub NtGetTickCount() @ stdcall NtGetWriteWatch(long long ptr long ptr ptr ptr) @ stdcall NtImpersonateAnonymousToken(ptr) @ stdcall NtImpersonateClientOfPort(ptr ptr)

10 years, 7 months

[tfaber] 63188: [MSDMO] - Actually copy output string in IEnumDMO_fnNext. Patch by Víctor Martínez CORE-8151 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu May 8 13:24:09 2014 New Revision: 63188 URL: http://svn.reactos.org/svn/reactos?rev=63188&view=rev Log: [MSDMO] - Actually copy output string in IEnumDMO_fnNext. Patch by Víctor Martínez CORE-8151 #resolve Modified: trunk/reactos/dll/directx/wine/msdmo/dmoreg.c Modified: trunk/reactos/dll/directx/wine/msdmo/dmoreg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/msdmo/dmo… ============================================================================== --- trunk/reactos/dll/directx/wine/msdmo/dmoreg.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/msdmo/dmoreg.c [iso-8859-1] Thu May 8 13:24:09 2014 @@ -607,9 +607,9 @@ hres = RegQueryValueExW(hkey, NULL, NULL, NULL, (LPBYTE) szValue, &len); if (ERROR_SUCCESS == hres) { - Names[count] = HeapAlloc(GetProcessHeap(), 0, strlenW(szValue) + 1); + Names[count] = HeapAlloc(GetProcessHeap(), 0, (strlenW(szValue) + 1) * sizeof(WCHAR)); if (Names[count]) - strcmpW(Names[count], szValue); + strcpyW(Names[count], szValue); } wsprintfW(szGuidKey,szToGuidFmt,szNextKey); CLSIDFromString(szGuidKey, &pCLSID[count]);

10 years, 7 months

[tfaber] 63187: [SHLWAPI] - Revert 24342314 unintended changes

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu May 8 12:54:22 2014 New Revision: 63187 URL: http://svn.reactos.org/svn/reactos?rev=63187&view=rev Log: [SHLWAPI] - Revert 24342314 unintended changes Modified: trunk/reactos/dll/win32/shlwapi/path.c Modified: trunk/reactos/dll/win32/shlwapi/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/path.c?r… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/path.c [iso-8859-1] Thu May 8 12:54:22 2014 @@ -19,25 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#include "wine/unicode.h" -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winreg.h" -#include "winternl.h" -#define NO_SHLWAPI_STREAM -#include "shlwapi.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(shell); +#include "precomp.h" /* Get a function pointer from a DLL handle */ #define GET_FUNC(func, module, name, fail) \ @@ -2207,7 +2189,7 @@ { TRACE("(%s)\n",debugstr_a(lpszPath)); - if (lpszPath && lpszPath[0] == '\\' && lpszPath[1] == '\\' && lpszPath[2] != '?') + if (lpszPath && (lpszPath[0]=='\\') && (lpszPath[1]=='\\') && (lpszPath[2]!='?')) return TRUE; return FALSE; } @@ -2221,7 +2203,7 @@ { TRACE("(%s)\n",debugstr_w(lpszPath)); - if (lpszPath && lpszPath[0] == '\\' && lpszPath[1] == '\\' && lpszPath[2] != '?') + if (lpszPath && (lpszPath[0]=='\\') && (lpszPath[1]=='\\') && (lpszPath[2]!='?')) return TRUE; return FALSE; } @@ -2247,7 +2229,7 @@ { TRACE("(%s)\n", debugstr_a(lpszPath)); - if (lpszPath && *lpszPath++ == '\\' && *lpszPath++ == '\\' && *lpszPath != '?') + if (lpszPath && *lpszPath++ == '\\' && *lpszPath++ == '\\') { while (*lpszPath) { @@ -2269,7 +2251,7 @@ { TRACE("(%s)\n", debugstr_w(lpszPath)); - if (lpszPath && lpszPath[0] == '\\' && lpszPath[1] == '\\' && lpszPath[2] != '?') + if (lpszPath && lpszPath[0] == '\\' && lpszPath[1] == '\\') { return !strchrW( lpszPath + 2, '\\' ); } @@ -2297,7 +2279,7 @@ { TRACE("(%s)\n", debugstr_a(lpszPath)); - if (lpszPath && *lpszPath++ == '\\' && *lpszPath++ == '\\' && *lpszPath != '?') + if (lpszPath && *lpszPath++ == '\\' && *lpszPath++ == '\\') { BOOL bSeenSlash = FALSE; while (*lpszPath) @@ -2324,7 +2306,7 @@ { TRACE("(%s)\n", debugstr_w(lpszPath)); - if (lpszPath && *lpszPath++ == '\\' && *lpszPath++ == '\\' && *lpszPath != '?') + if (lpszPath && *lpszPath++ == '\\' && *lpszPath++ == '\\') { BOOL bSeenSlash = FALSE; while (*lpszPath)

10 years, 7 months

[jimtabor] 63186: [User32] - Fixed regression from r63183. See CORE-7967.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu May 8 12:46:01 2014 New Revision: 63186 URL: http://svn.reactos.org/svn/reactos?rev=63186&view=rev Log: [User32] - Fixed regression from r63183. See CORE-7967. Modified: trunk/reactos/win32ss/user/user32/windows/menu.c Modified: trunk/reactos/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] Thu May 8 12:46:01 2014 @@ -2945,6 +2945,8 @@ MenuHideSubPopups(WndOwner, &SubMenuInfo, FALSE, wFlags); MenuSelectItem(WndOwner, &SubMenuInfo, NO_SELECTED_ITEM, SendMenuSelect, NULL); + DestroyWindow(SubMenuInfo.Wnd); + /* Native returns handle to destroyed window */ if (!(wFlags & TPM_NONOTIFY)) SendMessageW( WndOwner, WM_UNINITMENUPOPUP, (WPARAM)ItemInfo.hSubMenu, MAKELPARAM(0, IS_SYSTEM_MENU(&SubMenuInfo)) ); @@ -2952,7 +2954,6 @@ // Call WM_UNINITMENUPOPUP FIRST before destroy!! // Fixes todo_wine User32 test menu.c line 2233 GetMenuBarInfo callback.... // - DestroyWindow(SubMenuInfo.Wnd); SubMenuInfo.Wnd = NULL; MenuSetRosMenuInfo(&SubMenuInfo); //// @@ -3966,6 +3967,7 @@ IntNotifyWinEvent(EVENT_SYSTEM_MENUPOPUPEND, MenuInfo.Wnd, OBJID_CLIENT, CHILDID_SELF, 0); DestroyWindow(MenuInfo.Wnd); MenuInfo.Wnd = NULL; + MenuSetRosMenuInfo(&MenuInfo); if (!(wFlags & TPM_NONOTIFY)) SendMessageW( mt.OwnerWnd, WM_UNINITMENUPOPUP, (WPARAM)mt.TopMenu,

10 years, 7 months

[tfaber] 63185: [SHLWAPI] - Fix copypasta in PathRelativePathToW. Patch by Víctor Martínez CORE-8162 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu May 8 12:43:10 2014 New Revision: 63185 URL: http://svn.reactos.org/svn/reactos?rev=63185&view=rev Log: [SHLWAPI] - Fix copypasta in PathRelativePathToW. Patch by Víctor Martínez CORE-8162 #resolve Modified: trunk/reactos/dll/win32/shlwapi/path.c Modified: trunk/reactos/dll/win32/shlwapi/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/path.c?r… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/path.c [iso-8859-1] Thu May 8 12:43:10 2014 @@ -19,7 +19,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> +#include <string.h> +#include <stdlib.h> + +#include "wine/unicode.h" +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "winternl.h" +#define NO_SHLWAPI_STREAM +#include "shlwapi.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(shell); /* Get a function pointer from a DLL handle */ #define GET_FUNC(func, module, name, fail) \ @@ -2189,7 +2207,7 @@ { TRACE("(%s)\n",debugstr_a(lpszPath)); - if (lpszPath && (lpszPath[0]=='\\') && (lpszPath[1]=='\\') && (lpszPath[2]!='?')) + if (lpszPath && lpszPath[0] == '\\' && lpszPath[1] == '\\' && lpszPath[2] != '?') return TRUE; return FALSE; } @@ -2203,7 +2221,7 @@ { TRACE("(%s)\n",debugstr_w(lpszPath)); - if (lpszPath && (lpszPath[0]=='\\') && (lpszPath[1]=='\\') && (lpszPath[2]!='?')) + if (lpszPath && lpszPath[0] == '\\' && lpszPath[1] == '\\' && lpszPath[2] != '?') return TRUE; return FALSE; } @@ -2229,7 +2247,7 @@ { TRACE("(%s)\n", debugstr_a(lpszPath)); - if (lpszPath && *lpszPath++ == '\\' && *lpszPath++ == '\\') + if (lpszPath && *lpszPath++ == '\\' && *lpszPath++ == '\\' && *lpszPath != '?') { while (*lpszPath) { @@ -2251,7 +2269,7 @@ { TRACE("(%s)\n", debugstr_w(lpszPath)); - if (lpszPath && lpszPath[0] == '\\' && lpszPath[1] == '\\') + if (lpszPath && lpszPath[0] == '\\' && lpszPath[1] == '\\' && lpszPath[2] != '?') { return !strchrW( lpszPath + 2, '\\' ); } @@ -2279,7 +2297,7 @@ { TRACE("(%s)\n", debugstr_a(lpszPath)); - if (lpszPath && *lpszPath++ == '\\' && *lpszPath++ == '\\') + if (lpszPath && *lpszPath++ == '\\' && *lpszPath++ == '\\' && *lpszPath != '?') { BOOL bSeenSlash = FALSE; while (*lpszPath) @@ -2306,7 +2324,7 @@ { TRACE("(%s)\n", debugstr_w(lpszPath)); - if (lpszPath && *lpszPath++ == '\\' && *lpszPath++ == '\\') + if (lpszPath && *lpszPath++ == '\\' && *lpszPath++ == '\\' && *lpszPath != '?') { BOOL bSeenSlash = FALSE; while (*lpszPath) @@ -3515,7 +3533,7 @@ if(!(dwAttrFrom & FILE_ATTRIBUTE_DIRECTORY)) PathRemoveFileSpecW(szFrom); - if(!(dwAttrFrom & FILE_ATTRIBUTE_DIRECTORY)) + if(!(dwAttrTo & FILE_ATTRIBUTE_DIRECTORY)) PathRemoveFileSpecW(szTo); /* Paths can only be relative if they have a common root */

10 years, 7 months

[hbelusca] 63184: [NTDLL] - Fix potential bug in CsrCaptureMessageString, in case StringLength > MaximumLength, and also do not copy too much data into the captured buffer. Then always NULL-termina...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed May 7 23:00:03 2014 New Revision: 63184 URL: http://svn.reactos.org/svn/reactos?rev=63184&view=rev Log: [NTDLL] - Fix potential bug in CsrCaptureMessageString, in case StringLength > MaximumLength, and also do not copy too much data into the captured buffer. Then always NULL-terminate the captured strings if possible. - Implement CsrCaptureMessageMultiUnicodeStringsInPlace, used by Win2k3 kernel32.dll in CreateProcess and for SxS thingies. Modified: branches/condrv_restructure/dll/ntdll/csr/capture.c branches/condrv_restructure/include/reactos/subsys/csr/csr.h Modified: branches/condrv_restructure/dll/ntdll/csr/capture.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/ntdll/cs… ============================================================================== --- branches/condrv_restructure/dll/ntdll/csr/capture.c [iso-8859-1] (original) +++ branches/condrv_restructure/dll/ntdll/csr/capture.c [iso-8859-1] Wed May 7 23:00:03 2014 @@ -128,7 +128,7 @@ NTAPI CsrAllocateMessagePointer(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, IN ULONG MessageLength, - OUT PVOID *CapturedData) + OUT PVOID* CapturedData) { if (MessageLength == 0) { @@ -165,7 +165,7 @@ CsrCaptureMessageBuffer(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, IN PVOID MessageBuffer OPTIONAL, IN ULONG MessageLength, - OUT PVOID *CapturedData) + OUT PVOID* CapturedData) { /* Simply allocate a message pointer in the buffer */ CsrAllocateMessagePointer(CaptureBuffer, MessageLength, CapturedData); @@ -189,34 +189,22 @@ } /* - * @unimplemented - */ -NTSTATUS -NTAPI -CsrCaptureMessageMultiUnicodeStringsInPlace(IN PCSR_CAPTURE_BUFFER *CaptureBuffer, - IN ULONG MessageCount, - IN PVOID MessageStrings) -{ - /* FIXME: allocate a buffer if we don't have one, and return it */ - /* FIXME: call CsrCaptureMessageUnicodeStringInPlace for each string */ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* * @implemented */ VOID NTAPI CsrCaptureMessageString(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, - IN LPSTR String OPTIONAL, + IN PCSTR String OPTIONAL, IN ULONG StringLength, IN ULONG MaximumLength, - OUT PANSI_STRING CapturedString) -{ - ULONG ReturnedLength; - - /* If we don't have a string, initialize an empty one */ + OUT PSTRING CapturedString) +{ + ASSERT(CapturedString != NULL); + + /* + * If we don't have a string, initialize an empty one, + * otherwise capture the given string. + */ if (!String) { CapturedString->Length = 0; @@ -226,31 +214,95 @@ CsrAllocateMessagePointer(CaptureBuffer, MaximumLength, (PVOID*)&CapturedString->Buffer); - return; - } - - /* Initialize this string */ - CapturedString->Length = (USHORT)StringLength; - - /* Allocate a buffer and get its size */ - ReturnedLength = CsrAllocateMessagePointer(CaptureBuffer, - MaximumLength, - (PVOID*)&CapturedString->Buffer); - CapturedString->MaximumLength = (USHORT)ReturnedLength; - - /* If the string had data */ - if (StringLength) - { - /* Copy it into the capture buffer */ - RtlMoveMemory(CapturedString->Buffer, String, MaximumLength); - - /* If we don't take up the whole space */ - if (CapturedString->Length < CapturedString->MaximumLength) + } + else + { + /* Cut-off the string length if needed */ + if (StringLength > MaximumLength) + StringLength = MaximumLength; + + CapturedString->Length = (USHORT)StringLength; + + /* Allocate a buffer and get its size */ + CapturedString->MaximumLength = + (USHORT)CsrAllocateMessagePointer(CaptureBuffer, + MaximumLength, + (PVOID*)&CapturedString->Buffer); + + /* If the string has data, copy it into the buffer */ + if (StringLength) + RtlMoveMemory(CapturedString->Buffer, String, StringLength); + } + + /* Null-terminate the string if we don't take up the whole space */ + if (CapturedString->Length < CapturedString->MaximumLength) + CapturedString->Buffer[CapturedString->Length] = '\0'; +} + +static VOID +CsrCaptureMessageUnicodeStringInPlace(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, + IN PUNICODE_STRING String) +{ + ASSERT(String != NULL); + + /* This is a way to capture the UNICODE string, since (Maximum)Length are also in bytes */ + CsrCaptureMessageString(CaptureBuffer, + (PCSTR)String->Buffer, + String->Length, + String->MaximumLength, + (PSTRING)String); + + /* Null-terminate the string */ + if (String->MaximumLength >= String->Length + sizeof(WCHAR)) + { + String->Buffer[String->Length / sizeof(WCHAR)] = L'\0'; + } +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +CsrCaptureMessageMultiUnicodeStringsInPlace(OUT PCSR_CAPTURE_BUFFER* CaptureBuffer, + IN ULONG StringsCount, + IN PUNICODE_STRING* MessageStrings) +{ + ULONG Count; + + if (!CaptureBuffer) return STATUS_INVALID_PARAMETER; + + /* Allocate a new capture buffer if we don't have one already */ + if (!*CaptureBuffer) + { + /* Compute the required size for the capture buffer */ + ULONG Size = 0; + + Count = 0; + while (Count < StringsCount) { - /* Null-terminate it */ - CapturedString->Buffer[CapturedString->Length] = '\0'; + if (MessageStrings[Count]) + Size += MessageStrings[Count]->MaximumLength; + + ++Count; } - } + + /* Allocate the capture buffer */ + *CaptureBuffer = CsrAllocateCaptureBuffer(StringsCount, Size); + if (!*CaptureBuffer) return STATUS_NO_MEMORY; + } + + /* Now capture each UNICODE string */ + Count = 0; + while (Count < StringsCount) + { + if (MessageStrings[Count]) + CsrCaptureMessageUnicodeStringInPlace(*CaptureBuffer, MessageStrings[Count]); + + ++Count; + } + + return STATUS_SUCCESS; } /* Modified: branches/condrv_restructure/include/reactos/subsys/csr/csr.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/reac… ============================================================================== --- branches/condrv_restructure/include/reactos/subsys/csr/csr.h [iso-8859-1] (original) +++ branches/condrv_restructure/include/reactos/subsys/csr/csr.h [iso-8859-1] Wed May 7 23:00:03 2014 @@ -36,26 +36,32 @@ NTAPI CsrAllocateMessagePointer(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, IN ULONG MessageLength, - OUT PVOID *CapturedData); + OUT PVOID* CapturedData); VOID NTAPI CsrCaptureMessageBuffer(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, IN PVOID MessageBuffer OPTIONAL, IN ULONG MessageLength, - OUT PVOID *CapturedData); + OUT PVOID* CapturedData); + +VOID +NTAPI +CsrFreeCaptureBuffer(IN PCSR_CAPTURE_BUFFER CaptureBuffer); VOID NTAPI CsrCaptureMessageString(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, - IN LPSTR String OPTIONAL, + IN PCSTR String OPTIONAL, IN ULONG StringLength, IN ULONG MaximumLength, - OUT PANSI_STRING CapturedString); + OUT PSTRING CapturedString); -VOID +NTSTATUS NTAPI -CsrFreeCaptureBuffer(IN PCSR_CAPTURE_BUFFER CaptureBuffer); +CsrCaptureMessageMultiUnicodeStringsInPlace(OUT PCSR_CAPTURE_BUFFER* CaptureBuffer, + IN ULONG StringsCount, + IN PUNICODE_STRING* MessageStrings); PLARGE_INTEGER NTAPI

10 years, 7 months

[jimtabor] 63183: [User32] - Fixed more wine tests. WM_UNINITMENUPOPUP is called before destroying pop up menu window.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed May 7 22:25:16 2014 New Revision: 63183 URL: http://svn.reactos.org/svn/reactos?rev=63183&view=rev Log: [User32] - Fixed more wine tests. WM_UNINITMENUPOPUP is called before destroying pop up menu window. Modified: trunk/reactos/win32ss/user/user32/windows/menu.c Modified: trunk/reactos/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] Wed May 7 22:25:16 2014 @@ -2944,13 +2944,18 @@ { MenuHideSubPopups(WndOwner, &SubMenuInfo, FALSE, wFlags); MenuSelectItem(WndOwner, &SubMenuInfo, NO_SELECTED_ITEM, SendMenuSelect, NULL); + + if (!(wFlags & TPM_NONOTIFY)) + SendMessageW( WndOwner, WM_UNINITMENUPOPUP, (WPARAM)ItemInfo.hSubMenu, + MAKELPARAM(0, IS_SYSTEM_MENU(&SubMenuInfo)) ); + //// + // Call WM_UNINITMENUPOPUP FIRST before destroy!! + // Fixes todo_wine User32 test menu.c line 2233 GetMenuBarInfo callback.... + // DestroyWindow(SubMenuInfo.Wnd); SubMenuInfo.Wnd = NULL; MenuSetRosMenuInfo(&SubMenuInfo); - - if (!(wFlags & TPM_NONOTIFY)) - SendMessageW( WndOwner, WM_UNINITMENUPOPUP, (WPARAM)ItemInfo.hSubMenu, - MAKELPARAM(0, IS_SYSTEM_MENU(&SubMenuInfo)) ); + //// } } }

10 years, 7 months

← Newer
1
...
31
32
33
34
35
36
37
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2014