Fixed declarations of BroadcastSystemMessage and TranslateAccelerator

in winuser.h. Added GetWindowModuleFileName.

diff --git a/controls/menu.c b/controls/menu.c
index f82341c8c78b46cdb48351c3f5cb498b46a4091d..766697a1388da701a252118de997a79b05af92c3 100644 (file)
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -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;

diff --git a/dlls/user/msg16.c b/dlls/user/msg16.c
index 0b6156ca2a69c0cee65994afc259c738a079f299..e97556989dd30966d6de0207689894e6583e1f64 100644 (file)
--- a/dlls/user/msg16.c
+++ b/dlls/user/msg16.c
@@ -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 );
 }
 
 

diff --git a/dlls/user/user32.spec b/dlls/user/user32.spec
index ef3fe23c63a3f1dbf321cf77b8103a05dbf6f21a..0cc69005ce3fe5ec2c2bce4b2b23df9cf784c4c4 100644 (file)
--- a/dlls/user/user32.spec
+++ b/dlls/user/user32.spec
@@ -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)

diff --git a/include/oleidl.h b/include/oleidl.h
index 6b76ba2c4f42ad63c635f84e4d0c6c015aef3b2d..e4d57b9d3e660f69e2860bdc76bdd18d873781fa 100644 (file)
--- a/include/oleidl.h
+++ b/include/oleidl.h
@@ -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;

diff --git a/include/oleidl.idl b/include/oleidl.idl
index df6eb9ca711f476532b05ca23f67464c45bc9024..be323f624ac1e4077061b989cbab2541c39223e0 100644 (file)
--- a/include/oleidl.idl
+++ b/include/oleidl.idl
@@ -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
  */

diff --git a/include/winuser.h b/include/winuser.h
index 43684f9edf524b49b22a2d737ef25ad5639a6d7a..7afd7467ec61b0ce026fb33c6976b12319cf20ed 100644 (file)
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -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);

diff --git a/programs/regedit/main.c b/programs/regedit/main.c
index d0357946fb3c260507b07bd27c23a100eb1ef1bd..d28965de307098c957cb3d7ef09f5c753cb7e591 100644 (file)
--- a/programs/regedit/main.c
+++ b/programs/regedit/main.c
@@ -125,7 +125,7 @@ static BOOL DynamicBind( void )
     d(SetWindowLongA)
     d(SetWindowTextA)
     d(ShowWindow)
-    d(TranslateAccelerator)
+    d(TranslateAcceleratorA)
     d(TranslateMessage)
     d(UpdateWindow)
     d(WinHelpA)

diff --git a/programs/regedit/main.h b/programs/regedit/main.h
index c34509527f7419acb7aef973d505ff0811f16fc6..6131834925defebfbdbb5e5d283bc47a60167f30 100644 (file)
--- a/programs/regedit/main.h
+++ b/programs/regedit/main.h
@@ -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

diff --git a/windows/message.c b/windows/message.c
index 20b7b16177087a7c34a03026dfcb3e3cc8d9b25f..317a720f246e4c7c11b97ff4e6d0a8bbe22cf45d 100644 (file)
--- a/windows/message.c
+++ b/windows/message.c
@@ -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 )
 {

diff --git a/windows/win.c b/windows/win.c
index 987abd29939cc1ea318430420b9755764c167e17..cb8246d23696f9e2228737a384a4ab9fd759b2e1 100644 (file)
--- a/windows/win.c
+++ b/windows/win.c
@@ -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);