ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed declarations of BroadcastSystemMessage and TranslateAccelerator 

in winuser.h. Added GetWindowModuleFileName.
This commit is contained in:
Alexandre Julliard 2003-11-26 04:09:00 +00:00
parent 29cff12d06
commit b7976c00a0
10 changed files with 47 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controls/menu.c
View File

@ -4754,7 +4754,7 @@ static BOOL translate_accelerator( HWND hWnd, UINT message, WPARAM wParam, LPARA
* TranslateAcceleratorA (USER32.@)
* TranslateAcceleratorW (USER32.@)
*/
INT WINAPI TranslateAccelerator( HWND hWnd, HACCEL hAccel, LPMSG msg )
INT WINAPI TranslateAcceleratorW( HWND hWnd, HACCEL hAccel, LPMSG msg )
{
/* YES, Accel16! */
LPACCEL16 lpAccelTbl;

2
dlls/user/msg16.c
View File

@ -468,7 +468,7 @@ INT16 WINAPI TranslateAccelerator16( HWND16 hwnd, HACCEL16 hAccel, LPMSG16 msg )
/* msg32.hwnd not used */
msg32.wParam = msg->wParam;
msg32.lParam = msg->lParam;
return TranslateAccelerator( WIN_Handle32(hwnd), HACCEL_32(hAccel), &msg32 );
return TranslateAcceleratorW( WIN_Handle32(hwnd), HACCEL_32(hAccel), &msg32 );
}

10
dlls/user/user32.spec
View File

@ -10,8 +10,8 @@
@ stdcall BeginPaint(long ptr)
# @ stub BlockInput
@ stdcall BringWindowToTop(long)
@ stdcall BroadcastSystemMessage(long ptr long long long)
@ stdcall BroadcastSystemMessageA(long ptr long long long) BroadcastSystemMessage
@ stdcall BroadcastSystemMessage(long ptr long long long) BroadcastSystemMessageA
@ stdcall BroadcastSystemMessageA(long ptr long long long)
@ stdcall BroadcastSystemMessageW(long ptr long long long)
@ stdcall CalcChildScroll(long long)
@ stdcall CallMsgFilter(ptr long) CallMsgFilterA
@ -583,9 +583,9 @@
@ stdcall ToUnicode(long long ptr wstr long long)
@ stdcall TrackPopupMenu(long long long long long long ptr)
@ stdcall TrackPopupMenuEx(long long long long long ptr)
@ stdcall TranslateAccelerator(long long ptr)
@ stdcall TranslateAcceleratorA(long long ptr) TranslateAccelerator
@ stdcall TranslateAcceleratorW(long long ptr) TranslateAccelerator
@ stdcall TranslateAccelerator(long long ptr) TranslateAcceleratorW
@ stdcall TranslateAcceleratorA(long long ptr) TranslateAcceleratorW
@ stdcall TranslateAcceleratorW(long long ptr)
@ stdcall TranslateMDISysAccel(long ptr)
@ stdcall TranslateMessage(ptr)
@ stdcall UnhookWindowsHook(long ptr)

3
include/oleidl.h
View File

@ -260,6 +260,9 @@ void __RPC_STUB IOleInPlaceObject_ReactivateAndUndo_Stub(
#endif /* __IOleInPlaceObject_INTERFACE_DEFINED__ */
#ifdef __WINESRC__
#undef TranslateAccelerator
#endif
#ifndef __IOleInPlaceUIWindow_FWD_DEFINED__
#define __IOleInPlaceUIWindow_FWD_DEFINED__
typedef struct IOleInPlaceUIWindow IOleInPlaceUIWindow;

5
include/oleidl.idl
View File

@ -96,6 +96,11 @@ interface IOleInPlaceObject : IOleWindow
}
/* avoid conflict with Wine Unicode macros */
cpp_quote("#ifdef __WINESRC__")
cpp_quote("#undef TranslateAccelerator")
cpp_quote("#endif")
/*****************************************************************************
* IOleInPlaceActiveObject interface
*/

46
include/winuser.h
View File

@ -3817,13 +3817,16 @@ BOOL WINAPI AnyPopup(void);
BOOL WINAPI AppendMenuA(HMENU,UINT,UINT_PTR,LPCSTR);
BOOL WINAPI AppendMenuW(HMENU,UINT,UINT_PTR,LPCWSTR);
#define AppendMenu WINELIB_NAME_AW(AppendMenu)
UINT WINAPI ArrangeIconicWindows(HWND);
HDWP WINAPI BeginDeferWindowPos(INT);
HDC WINAPI BeginPaint(HWND,LPPAINTSTRUCT);
BOOL WINAPI BringWindowToTop(HWND);
void WINAPI CalcChildScroll(HWND, INT);
BOOL WINAPI CallMsgFilterA(LPMSG,INT);
BOOL WINAPI CallMsgFilterW(LPMSG,INT);
UINT WINAPI ArrangeIconicWindows(HWND);
HDWP WINAPI BeginDeferWindowPos(INT);
HDC WINAPI BeginPaint(HWND,LPPAINTSTRUCT);
BOOL WINAPI BringWindowToTop(HWND);
LONG WINAPI BroadcastSystemMessageA(DWORD,LPDWORD,UINT,WPARAM,LPARAM);
LONG WINAPI BroadcastSystemMessageW(DWORD,LPDWORD,UINT,WPARAM,LPARAM);
#define BroadcastSystemMessage WINELIB_NAME_A(BroadcastSystemMessage)
void WINAPI CalcChildScroll(HWND, INT);
BOOL WINAPI CallMsgFilterA(LPMSG,INT);
BOOL WINAPI CallMsgFilterW(LPMSG,INT);
#define CallMsgFilter WINELIB_NAME_AW(CallMsgFilter)
LRESULT WINAPI CallNextHookEx(HHOOK,INT,WPARAM,LPARAM);
LRESULT WINAPI CallWindowProcA(WNDPROC,HWND,UINT,WPARAM,LPARAM);
@ -4133,6 +4136,9 @@ LONG WINAPI GetWindowLongW(HWND,INT);
#define GetWindowLongPtrA GetWindowLongA
#define GetWindowLongPtrW GetWindowLongW
#define GetWindowLongPtr WINELIB_NAME_AW(GetWindowLongPtr)
UINT WINAPI GetWindowModuleFileNameA(HWND,LPSTR,UINT);
UINT WINAPI GetWindowModuleFileNameW(HWND,LPWSTR,UINT);
#define GetWindowModuleFileName WINELIB_NAME_AW(GetWindowModuleFileName)
BOOL WINAPI GetWindowPlacement(HWND,LPWINDOWPLACEMENT);
BOOL WINAPI GetWindowRect(HWND,LPRECT);
INT WINAPI GetWindowRgn(HWND,HRGN);
@ -4384,18 +4390,20 @@ BOOL WINAPI SystemParametersInfoW(UINT,UINT,LPVOID,UINT);
LONG WINAPI TabbedTextOutA(HDC,INT,INT,LPCSTR,INT,INT,const INT*,INT);
LONG WINAPI TabbedTextOutW(HDC,INT,INT,LPCWSTR,INT,INT,const INT*,INT);
#define TabbedTextOut WINELIB_NAME_AW(TabbedTextOut)
INT WINAPI ToAscii(UINT,UINT,LPBYTE,LPWORD,UINT);
INT WINAPI ToAsciiEx(UINT,UINT,LPBYTE,LPWORD,UINT,HKL);
BOOL WINAPI TrackMouseEvent(LPTRACKMOUSEEVENT);
BOOL WINAPI TrackPopupMenu(HMENU,UINT,INT,INT,INT,HWND,const RECT*);
INT WINAPI TranslateAccelerator(HWND,HACCEL,LPMSG);
BOOL WINAPI TranslateMDISysAccel(HWND,LPMSG);
BOOL WINAPI TranslateMessage(const MSG*);
BOOL WINAPI UnhookWindowsHook(INT,HOOKPROC);
BOOL WINAPI UnhookWindowsHookEx(HHOOK);
BOOL WINAPI UnionRect(LPRECT,const RECT*,const RECT*);
BOOL WINAPI UnregisterClassA(LPCSTR,HINSTANCE);
BOOL WINAPI UnregisterClassW(LPCWSTR,HINSTANCE);
INT WINAPI ToAscii(UINT,UINT,LPBYTE,LPWORD,UINT);
INT WINAPI ToAsciiEx(UINT,UINT,LPBYTE,LPWORD,UINT,HKL);
BOOL WINAPI TrackMouseEvent(LPTRACKMOUSEEVENT);
BOOL WINAPI TrackPopupMenu(HMENU,UINT,INT,INT,INT,HWND,const RECT*);
INT WINAPI TranslateAcceleratorA(HWND,HACCEL,LPMSG);
INT WINAPI TranslateAcceleratorW(HWND,HACCEL,LPMSG);
#define TranslateAccelerator WINELIB_NAME_AW(TranslateAccelerator)
BOOL WINAPI TranslateMDISysAccel(HWND,LPMSG);
BOOL WINAPI TranslateMessage(const MSG*);
BOOL WINAPI UnhookWindowsHook(INT,HOOKPROC);
BOOL WINAPI UnhookWindowsHookEx(HHOOK);
BOOL WINAPI UnionRect(LPRECT,const RECT*,const RECT*);
BOOL WINAPI UnregisterClassA(LPCSTR,HINSTANCE);
BOOL WINAPI UnregisterClassW(LPCWSTR,HINSTANCE);
#define UnregisterClass WINELIB_NAME_AW(UnregisterClass)
BOOL WINAPI UpdateWindow(HWND);
UINT WINAPI UserRealizePalette(HDC);

2
programs/regedit/main.c
View File

@ -125,7 +125,7 @@ static BOOL DynamicBind( void )
d(SetWindowLongA)
d(SetWindowTextA)
d(ShowWindow)
d(TranslateAccelerator)
d(TranslateAcceleratorA)
d(TranslateMessage)
d(UpdateWindow)
d(WinHelpA)

4
programs/regedit/main.h
View File

@ -156,7 +156,7 @@ d(SetFocus)
d(SetWindowLongA)
d(SetWindowTextA)
d(ShowWindow)
d(TranslateAccelerator)
d(TranslateAcceleratorA)
d(TranslateMessage)
d(UpdateWindow)
d(WinHelpA)
@ -227,7 +227,7 @@ d(wsprintfA)
#define SetWindowLongA pSetWindowLongA
#define SetWindowTextA pSetWindowTextA
#define ShowWindow pShowWindow
#define TranslateAccelerator pTranslateAccelerator
#define TranslateAcceleratorA pTranslateAcceleratorA
#define TranslateMessage pTranslateMessage
#define UpdateWindow pUpdateWindow
#define WinHelpA pWinHelpA

2
windows/message.c
View File

@ -932,7 +932,7 @@ WORD WINAPI RegisterWindowMessageW( LPCWSTR str )
* BroadcastSystemMessage (USER32.@)
* BroadcastSystemMessageA (USER32.@)
*/
LONG WINAPI BroadcastSystemMessage(
LONG WINAPI BroadcastSystemMessageA(
DWORD dwFlags,LPDWORD recipients,UINT uMessage,WPARAM wParam,
LPARAM lParam )
{

2
windows/win.c
View File

@ -3199,7 +3199,7 @@ UINT WINAPI GetWindowModuleFileNameA( HWND hwnd, LPSTR lpszFileName, UINT cchFil
/******************************************************************************
* GetWindowModuleFileNameW (USER32.@)
*/
UINT WINAPI GetWindowModuleFileNameW( HWND hwnd, LPSTR lpszFileName, UINT cchFileNameMax)
UINT WINAPI GetWindowModuleFileNameW( HWND hwnd, LPWSTR lpszFileName, UINT cchFileNameMax)
{
FIXME("GetWindowModuleFileNameW(hwnd %p, lpszFileName %p, cchFileNameMax %u) stub!\n",
hwnd, lpszFileName, cchFileNameMax);