Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 08:25:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[KERNEL32/STRING] Sync format_msg.c with Wine Staging 3.3. CORE-14434

Browse source
This commit is contained in:
Amine Khaldi 2018-04-11 12:47:12 +01:00
parent 7f3e00c573
commit eaa9d0d12c
2 changed files with 39 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
dll/win32/kernel32/winnls/string/format_msg.c
View file

@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifdef __REACTOS__
#include <k32.h>
#define NDEBUG
@ -27,6 +29,30 @@ DEBUG_CHANNEL(resource);
extern HMODULE kernel32_handle;
#else /* __REACTOS__ */
#include "config.h"
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include "ntstatus.h"
#define WIN32_NO_STATUS
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "winternl.h"
#include "winuser.h"
#include "winnls.h"
#include "wine/unicode.h"
#include "kernel_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(resource);
#endif /* __REACTOS__ */
struct format_args
{
ULONG_PTR *args;
@ -61,17 +87,25 @@ struct format_args
*/
static LPWSTR load_message( HMODULE module, UINT id, WORD lang )
{
#ifdef __REACTOS__
MESSAGE_RESOURCE_ENTRY *mre;
#else
const MESSAGE_RESOURCE_ENTRY *mre;
#endif
WCHAR *buffer;
NTSTATUS Status;
NTSTATUS status;
TRACE("module = %p, id = %08x\n", module, id );
if (!module) module = GetModuleHandleW( NULL );
Status = RtlFindMessage(module, (ULONG_PTR)RT_MESSAGETABLE, lang, id, &mre);
if (!NT_SUCCESS(Status))
#ifdef __REACTOS__
status = RtlFindMessage(module, (ULONG_PTR)RT_MESSAGETABLE, lang, id, &mre);
if (!NT_SUCCESS(status))
#else
if ((status = RtlFindMessage( module, RT_MESSAGETABLE, lang, id, &mre )) != STATUS_SUCCESS)
#endif
{
SetLastError(RtlNtStatusToDosError(Status));
SetLastError( RtlNtStatusToDosError(status) );
return NULL;
}

2
media/doc/README.WINE
View file

@ -280,7 +280,7 @@ kernel32 -
reactos/dll/win32/kernel32/winnls/string/collation.c # Synced to WineStaging-1.7.55
reactos/dll/win32/kernel32/winnls/string/digitmap.c # Synced to WineStaging-3.3
reactos/dll/win32/kernel32/winnls/string/fold.c # Synced to WineStaging-3.3
reactos/dll/win32/kernel32/winnls/string/format_msg.c # Synced to WineStaging-1.7.55
reactos/dll/win32/kernel32/winnls/string/format_msg.c # Synced to WineStaging-3.3
reactos/dll/win32/kernel32/winnls/string/lang.c # Synced in r52754
reactos/dll/win32/kernel32/winnls/string/lcformat.c # Synced to WineStaging-1.7.55
reactos/dll/win32/kernel32/winnls/string/nls.c # Synced in r52754