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

[PSDK]

Browse source 
* Define MAKEINTRESOURCE correctly for Wine sources.
CORE-7669 #resolve #comment Fixed in r61200.

svn path=/trunk/; revision=61200
This commit is contained in:
Amine Khaldi 2013-12-02 22:41:02 +00:00
parent b46c4ec2b9
commit 600e33cfc4
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
reactos/include/psdk/winuser.h
View file

@ -576,9 +576,23 @@ extern "C" {
#define SB_RIGHT 7
#define SB_BOTTOM 7
#define SB_TOP 6
#define IS_INTRESOURCE(i) (((ULONG_PTR)(i) >> 16) == 0)
#define MAKEINTRESOURCEA(i) ((LPSTR)(ULONG_PTR)LOWORD(i))
#define MAKEINTRESOURCEW(i) ((LPWSTR)(ULONG_PTR)LOWORD(i))
#ifndef RC_INVOKED
#ifdef WINE_NO_UNICODE_MACROS /* force using a cast */
#define MAKEINTRESOURCE(i) ((ULONG_PTR)((WORD)(i)))
#else
#ifdef UNICODE
#define MAKEINTRESOURCE MAKEINTRESOURCEW
#else
#define MAKEINTRESOURCE MAKEINTRESOURCEA
#endif /* UNICODE */
#endif /* WINE_NO_UNICODE_MACROS */
#endif /* !RC_INVOKED */
#ifndef XFree86Server
# define RT_CURSOR MAKEINTRESOURCE(1)
# define RT_FONT MAKEINTRESOURCE(8)
@ -5368,7 +5382,6 @@ BOOL WINAPI GetLayeredWindowAttributes(_In_ HWND, _Out_opt_ COLORREF*, _Out_opt_
#define WINSTAENUMPROC WINSTAENUMPROCW
#define PROPENUMPROC PROPENUMPROCW
#define PROPENUMPROCEX PROPENUMPROCEXW
#define MAKEINTRESOURCE MAKEINTRESOURCEW
typedef WNDCLASSW WNDCLASS,*LPWNDCLASS,*PWNDCLASS;
typedef WNDCLASSEXW WNDCLASSEX,*LPWNDCLASSEX,*PWNDCLASSEX;
typedef MENUITEMINFOW MENUITEMINFO,*LPMENUITEMINFO;
@ -5536,7 +5549,6 @@ typedef MONITORINFOEXW MONITORINFOEX, *LPMONITORINFOEX;
#define WINSTAENUMPROC WINSTAENUMPROCA
#define PROPENUMPROC PROPENUMPROCA
#define PROPENUMPROCEX PROPENUMPROCEXA
#define MAKEINTRESOURCE MAKEINTRESOURCEA
typedef WNDCLASSA WNDCLASS,*LPWNDCLASS,*PWNDCLASS;
typedef WNDCLASSEXA WNDCLASSEX,*LPWNDCLASSEX,*PWNDCLASSEX;
typedef MENUITEMINFOA MENUITEMINFO,*LPMENUITEMINFO;