Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
b7976c00
Commit
b7976c00
authored
Nov 26, 2003
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed declarations of BroadcastSystemMessage and TranslateAccelerator
in winuser.h. Added GetWindowModuleFileName.
parent
29cff12d
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
47 additions
and
31 deletions
+47
-31
menu.c
controls/menu.c
+1
-1
msg16.c
dlls/user/msg16.c
+1
-1
user32.spec
dlls/user/user32.spec
+5
-5
oleidl.h
include/oleidl.h
+3
-0
oleidl.idl
include/oleidl.idl
+5
-0
winuser.h
include/winuser.h
+27
-19
main.c
programs/regedit/main.c
+1
-1
main.h
programs/regedit/main.h
+2
-2
message.c
windows/message.c
+1
-1
win.c
windows/win.c
+1
-1
No files found.
controls/menu.c
View file @
b7976c00
...
...
@@ -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
TranslateAccelerator
W
(
HWND
hWnd
,
HACCEL
hAccel
,
LPMSG
msg
)
{
/* YES, Accel16! */
LPACCEL16
lpAccelTbl
;
...
...
dlls/user/msg16.c
View file @
b7976c00
...
...
@@ -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
TranslateAccelerator
W
(
WIN_Handle32
(
hwnd
),
HACCEL_32
(
hAccel
),
&
msg32
);
}
...
...
dlls/user/user32.spec
View file @
b7976c00
...
...
@@ -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) TranslateAccelerator
W
@ stdcall TranslateAcceleratorW(long long ptr)
@ stdcall TranslateMDISysAccel(long ptr)
@ stdcall TranslateMessage(ptr)
@ stdcall UnhookWindowsHook(long ptr)
...
...
include/oleidl.h
View file @
b7976c00
...
...
@@ -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
;
...
...
include/oleidl.idl
View file @
b7976c00
...
...
@@ -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
*/
...
...
include/winuser.h
View file @
b7976c00
...
...
@@ -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
);
...
...
programs/regedit/main.c
View file @
b7976c00
...
...
@@ -125,7 +125,7 @@ static BOOL DynamicBind( void )
d
(
SetWindowLongA
)
d
(
SetWindowTextA
)
d
(
ShowWindow
)
d
(
TranslateAccelerator
)
d
(
TranslateAccelerator
A
)
d
(
TranslateMessage
)
d
(
UpdateWindow
)
d
(
WinHelpA
)
...
...
programs/regedit/main.h
View file @
b7976c00
...
...
@@ -156,7 +156,7 @@ d(SetFocus)
d
(
SetWindowLongA
)
d
(
SetWindowTextA
)
d
(
ShowWindow
)
d
(
TranslateAccelerator
)
d
(
TranslateAccelerator
A
)
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 TranslateAccelerator
A pTranslateAcceleratorA
#define TranslateMessage pTranslateMessage
#define UpdateWindow pUpdateWindow
#define WinHelpA pWinHelpA
...
...
windows/message.c
View file @
b7976c00
...
...
@@ -932,7 +932,7 @@ WORD WINAPI RegisterWindowMessageW( LPCWSTR str )
* BroadcastSystemMessage (USER32.@)
* BroadcastSystemMessageA (USER32.@)
*/
LONG
WINAPI
BroadcastSystemMessage
(
LONG
WINAPI
BroadcastSystemMessage
A
(
DWORD
dwFlags
,
LPDWORD
recipients
,
UINT
uMessage
,
WPARAM
wParam
,
LPARAM
lParam
)
{
...
...
windows/win.c
View file @
b7976c00
...
...
@@ -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
,
LP
W
STR
lpszFileName
,
UINT
cchFileNameMax
)
{
FIXME
(
"GetWindowModuleFileNameW(hwnd %p, lpszFileName %p, cchFileNameMax %u) stub!
\n
"
,
hwnd
,
lpszFileName
,
cchFileNameMax
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment