May 2011 - Wine-Commits - list.winehq.org

Marcus Meissner : dswave: Mark internal symbols with hidden visibility.
by Alexandre Julliard May 18, 2011

May 18, 2011

Module: wine Branch: master Commit: dffb1b2c8f55004721dec37471f9e404569f9178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dffb1b2c8f55004721dec3747… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 17:06:36 2011 +0200 dswave: Mark internal symbols with hidden visibility. --- dlls/dswave/dswave_private.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dswave/dswave_private.h b/dlls/dswave/dswave_private.h index c2c1f4b..6f402d7 100644 --- a/dlls/dswave/dswave_private.h +++ b/dlls/dswave/dswave_private.h @@ -48,7 +48,7 @@ typedef struct IDirectMusicWaveImpl IDirectMusicWaveImpl; /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicWaveImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); +extern HRESULT WINAPI DMUSIC_CreateDirectMusicWaveImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; /***************************************************************************** @@ -70,7 +70,7 @@ struct IDirectMusicWaveImpl { /********************************************************************** * Dll lifetime tracking declaration for dswave.dll */ -extern LONG DSWAVE_refCount; +extern LONG DSWAVE_refCount DECLSPEC_HIDDEN; static inline void DSWAVE_LockModule(void) { InterlockedIncrement( &DSWAVE_refCount ); } static inline void DSWAVE_UnlockModule(void) { InterlockedDecrement( &DSWAVE_refCount ); } @@ -107,10 +107,10 @@ typedef struct { #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) /* FOURCC to string conversion for debug messages */ -extern const char *debugstr_fourcc (DWORD fourcc); +extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN; /* returns name of given GUID */ -extern const char *debugstr_dmguid (const GUID *id); +extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN; /* dump whole DMUS_OBJECTDESC struct */ -extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc); +extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; #endif /* __WINE_DSWAVE_PRIVATE_H */

1 0

Lauri Kenttä : winemenubuilder: Avoid warning about uninitialized value (clang).
by Alexandre Julliard May 18, 2011

May 18, 2011

Module: wine Branch: master Commit: c2705081ac09e7b565ee6fb29d11d4644f885317 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2705081ac09e7b565ee6fb29… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue May 17 23:33:03 2011 +0300 winemenubuilder: Avoid warning about uninitialized value (clang). --- programs/winemenubuilder/winemenubuilder.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 5908e4e..56c0f80 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1012,8 +1012,7 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico for (i = 0; i < numEntries; i++) { - int bestIndex; - int maxBits = -1; + int bestIndex = i; int j; BOOLEAN duplicate = FALSE; int w, h; @@ -1034,14 +1033,13 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico } if (duplicate) continue; - for (j = i; j < numEntries; j++) + for (j = i + 1; j < numEntries; j++) { if (iconDirEntries[j].bWidth == iconDirEntries[i].bWidth && iconDirEntries[j].bHeight == iconDirEntries[i].bHeight && - iconDirEntries[j].wBitCount >= maxBits) + iconDirEntries[j].wBitCount >= iconDirEntries[bestIndex].wBitCount) { bestIndex = j; - maxBits = iconDirEntries[j].wBitCount; } } WINE_TRACE("Selected: %d\n", bestIndex);

1 0

Marcus Meissner : dpnet: Mark internals symbols with hidden visibility.
by Alexandre Julliard May 18, 2011

May 18, 2011

Module: wine Branch: master Commit: 9eb9040e9751e3478d63bced138a24d9b1aeea54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eb9040e9751e3478d63bced1… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 17:06:00 2011 +0200 dpnet: Mark internals symbols with hidden visibility. --- dlls/dpnet/dpnet_private.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index bdd3f9d..76fb9c6 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -104,12 +104,12 @@ struct IDirectPlay8ThreadPoolImpl /** * factories */ -extern HRESULT DPNET_CreateDirectPlay8Client(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); -extern HRESULT DPNET_CreateDirectPlay8Server(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); -extern HRESULT DPNET_CreateDirectPlay8Peer(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); -extern HRESULT DPNET_CreateDirectPlay8Address(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); -extern HRESULT DPNET_CreateDirectPlay8LobbiedApp(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); -extern HRESULT DPNET_CreateDirectPlay8ThreadPool(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); +extern HRESULT DPNET_CreateDirectPlay8Client(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; +extern HRESULT DPNET_CreateDirectPlay8Server(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; +extern HRESULT DPNET_CreateDirectPlay8Peer(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; +extern HRESULT DPNET_CreateDirectPlay8Address(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; +extern HRESULT DPNET_CreateDirectPlay8LobbiedApp(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; +extern HRESULT DPNET_CreateDirectPlay8ThreadPool(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; /* used for generic dumping (copied from ddraw) */ typedef struct {

1 0

Marcus Meissner : dinput: Mark internal symbols with hidden visibility.
by Alexandre Julliard May 18, 2011

May 18, 2011

Module: wine Branch: master Commit: a19e31efd99d14ff76ce8b85f75d9c040ec112a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a19e31efd99d14ff76ce8b85f… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue May 17 23:16:42 2011 +0200 dinput: Mark internal symbols with hidden visibility. --- dlls/dinput/dinput_private.h | 14 +++++++------- dlls/dinput/effect_linuxinput.c | 6 +++--- dlls/dinput/joystick_private.h | 36 ++++++++++++++++++------------------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index d4914dc..5972081 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -53,16 +53,16 @@ struct dinput_device { HRESULT (*create_device)(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPVOID *pdev, int unicode); }; -extern const struct dinput_device mouse_device; -extern const struct dinput_device keyboard_device; -extern const struct dinput_device joystick_linux_device; -extern const struct dinput_device joystick_linuxinput_device; -extern const struct dinput_device joystick_osx_device; +extern const struct dinput_device mouse_device DECLSPEC_HIDDEN; +extern const struct dinput_device keyboard_device DECLSPEC_HIDDEN; +extern const struct dinput_device joystick_linux_device DECLSPEC_HIDDEN; +extern const struct dinput_device joystick_linuxinput_device DECLSPEC_HIDDEN; +extern const struct dinput_device joystick_osx_device DECLSPEC_HIDDEN; -extern void check_dinput_hooks(LPDIRECTINPUTDEVICE8W); +extern void check_dinput_hooks(LPDIRECTINPUTDEVICE8W) DECLSPEC_HIDDEN; typedef int (*DI_EVENT_PROC)(LPDIRECTINPUTDEVICE8A, WPARAM, LPARAM); -extern void _dump_diactionformatA(LPDIACTIONFORMATA); +extern void _dump_diactionformatA(LPDIACTIONFORMATA) DECLSPEC_HIDDEN; #define IS_DIPROP(x) (((ULONG_PTR)(x) >> 16) == 0) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 0154f49..c224bd8 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -779,7 +779,7 @@ static ULONG WINAPI LinuxInputEffectImpl_Release(LPDIRECTINPUTEFFECT iface) * LinuxInputEffect */ -HRESULT linuxinput_create_effect( +DECLSPEC_HIDDEN HRESULT linuxinput_create_effect( int* fd, REFGUID rguid, struct list *parent_list_entry, @@ -851,7 +851,7 @@ HRESULT linuxinput_create_effect( return DI_OK; } -HRESULT linuxinput_get_info_A( +DECLSPEC_HIDDEN HRESULT linuxinput_get_info_A( int fd, REFGUID rguid, LPDIEFFECTINFOA info) @@ -885,7 +885,7 @@ HRESULT linuxinput_get_info_A( return DI_OK; } -HRESULT linuxinput_get_info_W( +DECLSPEC_HIDDEN HRESULT linuxinput_get_info_W( int fd, REFGUID rguid, LPDIEFFECTINFOW info) diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index 92fb485..a332e24 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -52,38 +52,38 @@ typedef struct JoystickGenericImpl joy_polldev_handler *joy_polldev; } JoystickGenericImpl; -LONG joystick_map_axis(ObjProps *props, int val); -HRESULT setup_dinput_options(JoystickGenericImpl *This, const int *default_axis_map); +LONG joystick_map_axis(ObjProps *props, int val) DECLSPEC_HIDDEN; +HRESULT setup_dinput_options(JoystickGenericImpl *This, const int *default_axis_map) DECLSPEC_HIDDEN; -DWORD joystick_map_pov(const POINTL *p); +DWORD joystick_map_pov(const POINTL *p) DECLSPEC_HIDDEN; HRESULT WINAPI JoystickWGenericImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface, - LPDIDEVICEOBJECTINSTANCEW pdidoi, DWORD dwObj, DWORD dwHow); + LPDIDEVICEOBJECTINSTANCEW pdidoi, DWORD dwObj, DWORD dwHow) DECLSPEC_HIDDEN; HRESULT WINAPI JoystickAGenericImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8A iface, - LPDIDEVICEOBJECTINSTANCEA pdidoi, DWORD dwObj, DWORD dwHow); + LPDIDEVICEOBJECTINSTANCEA pdidoi, DWORD dwObj, DWORD dwHow) DECLSPEC_HIDDEN; -HRESULT WINAPI JoystickAGenericImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPDIPROPHEADER pdiph); -HRESULT WINAPI JoystickWGenericImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REFGUID rguid, LPDIPROPHEADER pdiph); +HRESULT WINAPI JoystickAGenericImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPDIPROPHEADER pdiph) DECLSPEC_HIDDEN; +HRESULT WINAPI JoystickWGenericImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REFGUID rguid, LPDIPROPHEADER pdiph) DECLSPEC_HIDDEN; -HRESULT WINAPI JoystickAGenericImpl_GetCapabilities(LPDIRECTINPUTDEVICE8A iface, LPDIDEVCAPS lpDIDevCaps); -HRESULT WINAPI JoystickWGenericImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W iface, LPDIDEVCAPS lpDIDevCaps); +HRESULT WINAPI JoystickAGenericImpl_GetCapabilities(LPDIRECTINPUTDEVICE8A iface, LPDIDEVCAPS lpDIDevCaps) DECLSPEC_HIDDEN; +HRESULT WINAPI JoystickWGenericImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W iface, LPDIDEVCAPS lpDIDevCaps) DECLSPEC_HIDDEN; -void _dump_DIDEVCAPS(const DIDEVCAPS *lpDIDevCaps); +void _dump_DIDEVCAPS(const DIDEVCAPS *lpDIDevCaps) DECLSPEC_HIDDEN; -HRESULT WINAPI JoystickAGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPCDIPROPHEADER ph); -HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REFGUID rguid, LPCDIPROPHEADER ph); +HRESULT WINAPI JoystickAGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPCDIPROPHEADER ph) DECLSPEC_HIDDEN; +HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REFGUID rguid, LPCDIPROPHEADER ph) DECLSPEC_HIDDEN; HRESULT WINAPI JoystickAGenericImpl_GetDeviceInfo( LPDIRECTINPUTDEVICE8A iface, - LPDIDEVICEINSTANCEA pdidi); + LPDIDEVICEINSTANCEA pdidi) DECLSPEC_HIDDEN; HRESULT WINAPI JoystickWGenericImpl_GetDeviceInfo( LPDIRECTINPUTDEVICE8W iface, - LPDIDEVICEINSTANCEW pdidi); + LPDIDEVICEINSTANCEW pdidi) DECLSPEC_HIDDEN; -HRESULT WINAPI JoystickAGenericImpl_Poll(LPDIRECTINPUTDEVICE8A iface); -HRESULT WINAPI JoystickWGenericImpl_Poll(LPDIRECTINPUTDEVICE8W iface); +HRESULT WINAPI JoystickAGenericImpl_Poll(LPDIRECTINPUTDEVICE8A iface) DECLSPEC_HIDDEN; +HRESULT WINAPI JoystickWGenericImpl_Poll(LPDIRECTINPUTDEVICE8W iface) DECLSPEC_HIDDEN; -HRESULT WINAPI JoystickAGenericImpl_GetDeviceState(LPDIRECTINPUTDEVICE8A iface, DWORD len, LPVOID ptr); -HRESULT WINAPI JoystickWGenericImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W iface, DWORD len, LPVOID ptr); +HRESULT WINAPI JoystickAGenericImpl_GetDeviceState(LPDIRECTINPUTDEVICE8A iface, DWORD len, LPVOID ptr) DECLSPEC_HIDDEN; +HRESULT WINAPI JoystickWGenericImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W iface, DWORD len, LPVOID ptr) DECLSPEC_HIDDEN; #endif /* __WINE_DLLS_DINPUT_JOYSTICK_PRIVATE_H */

1 0

Aric Stewart : usp10/tests: Add ScriptShapeOpenType tests mirroring ScriptShape tests.
by Alexandre Julliard May 18, 2011

May 18, 2011

Module: wine Branch: master Commit: 9edaaae99b48dc503ec9db873fdcbbcc141e7f11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9edaaae99b48dc503ec9db873… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 17 15:05:39 2011 -0500 usp10/tests: Add ScriptShapeOpenType tests mirroring ScriptShape tests. --- dlls/usp10/tests/usp10.c | 144 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 144 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9edaaae99b48dc503ec9d…

1 0

Aric Stewart : usp10: Correct a few fallback conditions in Syriac shaping.
by Alexandre Julliard May 18, 2011

May 18, 2011

Module: wine Branch: master Commit: d0012622d3c5e173da03272988756d7e5d6e4d52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0012622d3c5e173da0327298… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 17 15:05:10 2011 -0500 usp10: Correct a few fallback conditions in Syriac shaping. --- dlls/usp10/shape.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index b718190..c0050c9 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1178,6 +1178,8 @@ word_break_causing(neighbour_char(i,dirL,pwcChars,cChars))) context_shape[i] = Afn; else if ( (rchar == DALATH || rchar == RISH) && word_break_causing(neighbour_char(i,dirL,pwcChars,cChars))) context_shape[i] = Afx; + else + context_shape[i] = Xn; } else if (context_type[i] == jtR && right_join_causing(neighbour_joining_type(i,dirR,context_type,cChars,psa))) @@ -1206,6 +1208,8 @@ right_join_causing(neighbour_joining_type(i,dirR,context_type,cChars,psa))) UpdateClusters(nextIndex, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); i = nextIndex; } + else + i++; } HeapFree(GetProcessHeap(),0,context_shape);

1 0

Andrew Nguyen : taskmgr: Remove all TCHAR macro usage in miscellaneous UI code.
by Alexandre Julliard May 17, 2011

May 17, 2011

Module: wine Branch: master Commit: ec24b87adceb6ecbceb386c978a159bdfe6595f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec24b87adceb6ecbceb386c97… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue May 17 05:15:28 2011 -0500 taskmgr: Remove all TCHAR macro usage in miscellaneous UI code. --- programs/taskmgr/column.c | 4 ++-- programs/taskmgr/proclist.c | 12 +++++++----- programs/taskmgr/trayicon.c | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/programs/taskmgr/column.c b/programs/taskmgr/column.c index 688771d..aaa6046 100644 --- a/programs/taskmgr/column.c +++ b/programs/taskmgr/column.c @@ -493,9 +493,9 @@ void ProcessPage_OnViewSelectColumns(void) if (DialogBoxW(hInst, MAKEINTRESOURCEW(IDD_COLUMNS_DIALOG), hMainWnd, ColumnsDialogWndProc) == IDOK) { - for (i=Header_GetItemCount(hProcessPageHeaderCtrl)-1; i>=0; i--) + for (i=SendMessageW(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0)-1; i>=0; i--) { - ListView_DeleteColumn(hProcessPageListCtrl, i); + SendMessageW(hProcessPageListCtrl, LVM_DELETECOLUMN, 0, i); } for (i=0; i<25; i++) diff --git a/programs/taskmgr/proclist.c b/programs/taskmgr/proclist.c index 07151c0..9bb26a7 100644 --- a/programs/taskmgr/proclist.c +++ b/programs/taskmgr/proclist.c @@ -39,6 +39,7 @@ WNDPROC OldProcessListWndProc; LRESULT CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { HBRUSH hbrBackground; + int count; RECT rcItem; RECT rcClip; HDC hDC; @@ -69,7 +70,7 @@ LRESULT CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR /* * Get the background brush */ - hbrBackground = (HBRUSH) GetClassLongPtr(hWnd, GCLP_HBRBACKGROUND); + hbrBackground = (HBRUSH) GetClassLongPtrW(hWnd, GCLP_HBRBACKGROUND); /* * Calculate the clip rect by getting the RECT @@ -80,13 +81,14 @@ LRESULT CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR * use icons in this list control. */ rcClip.left = LVIR_BOUNDS; - SendMessage(hWnd, LVM_GETITEMRECT, 0, (LPARAM) &rcClip); + SendMessageW(hWnd, LVM_GETITEMRECT, 0, (LPARAM) &rcClip); rcItem.left = LVIR_BOUNDS; - SendMessage(hWnd, LVM_GETITEMRECT, ListView_GetItemCount(hWnd) - 1, (LPARAM) &rcItem); + count = SendMessageW(hWnd, LVM_GETITEMCOUNT, 0, 0); + SendMessageW(hWnd, LVM_GETITEMRECT, count - 1, (LPARAM) &rcItem); rcClip.bottom = rcItem.bottom; rcItem.left = LVIR_ICON; - SendMessage(hWnd, LVM_GETITEMRECT, 0, (LPARAM) &rcItem); + SendMessageW(hWnd, LVM_GETITEMRECT, 0, (LPARAM) &rcItem); rcClip.left = rcItem.right; /* @@ -117,5 +119,5 @@ LRESULT CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR /* * We pass on all messages except WM_ERASEBKGND */ - return CallWindowProc(OldProcessListWndProc, hWnd, message, wParam, lParam); + return CallWindowProcW(OldProcessListWndProc, hWnd, message, wParam, lParam); } diff --git a/programs/taskmgr/trayicon.c b/programs/taskmgr/trayicon.c index b1379f5..8ef9ed4 100644 --- a/programs/taskmgr/trayicon.c +++ b/programs/taskmgr/trayicon.c @@ -64,8 +64,8 @@ static HICON TrayIcon_GetProcessorUsageIcon(void) /* * Load the bitmaps */ - hBitmap = LoadBitmap(hInst, MAKEINTRESOURCE(IDB_TRAYICON)); - hBitmapMask = LoadBitmap(hInst, MAKEINTRESOURCE(IDB_TRAYMASK)); + hBitmap = LoadBitmapW(hInst, MAKEINTRESOURCEW(IDB_TRAYICON)); + hBitmapMask = LoadBitmapW(hInst, MAKEINTRESOURCEW(IDB_TRAYMASK)); if (!hBitmap || !hBitmapMask) goto done;

1 0

Andrew Nguyen : taskmgr: Remove all TCHAR macro usage in main taskmgr code.
by Alexandre Julliard May 17, 2011

May 17, 2011

Module: wine Branch: master Commit: eb4b262c895812949d9a7e384f045cb3ed63702d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb4b262c895812949d9a7e384… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue May 17 05:15:34 2011 -0500 taskmgr: Remove all TCHAR macro usage in main taskmgr code. --- programs/taskmgr/taskmgr.c | 42 ++++++++++++++++++++++-------------------- 1 files changed, 22 insertions(+), 20 deletions(-) diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index dcab031..b7ffd3d 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -58,7 +58,7 @@ TASKMANAGER_SETTINGS TaskManagerSettings; void FillSolidRect(HDC hDC, LPCRECT lpRect, COLORREF clr) { SetBkColor(hDC, clr); - ExtTextOut(hDC, 0, 0, ETO_OPAQUE, lpRect, NULL, 0, NULL); + ExtTextOutW(hDC, 0, 0, ETO_OPAQUE, lpRect, NULL, 0, NULL); } static void FillSolidRect2(HDC hDC, int x, int y, int cx, int cy, COLORREF clr) @@ -70,7 +70,7 @@ static void FillSolidRect2(HDC hDC, int x, int y, int cx, int cy, COLORREF clr) rect.top = y; rect.right = x + cx; rect.bottom = y + cy; - ExtTextOut(hDC, 0, 0, ETO_OPAQUE, &rect, NULL, 0, NULL); + ExtTextOutW(hDC, 0, 0, ETO_OPAQUE, &rect, NULL, 0, NULL); } static void Draw3dRect(HDC hDC, int x, int y, int cx, int cy, COLORREF clrTopLeft, COLORREF clrBottomRight) @@ -89,7 +89,7 @@ void Font_DrawText(HDC hDC, LPWSTR lpwszText, int x, int y) int i; hFontDC = CreateCompatibleDC(hDC); - hFontBitmap = LoadBitmap(hInst, MAKEINTRESOURCE(IDB_FONT)); + hFontBitmap = LoadBitmapW(hInst, MAKEINTRESOURCEW(IDB_FONT)); hOldBitmap = SelectObject(hFontDC, hFontBitmap); for (i = 0; lpwszText[i]; i++) { @@ -130,11 +130,11 @@ static BOOL OnCreate(HWND hWnd) LoadStringW(hInst, IDS_PROCESSES, wszProcesses, sizeof(wszProcesses)/sizeof(WCHAR)); LoadStringW(hInst, IDS_PERFORMANCE, wszPerformance, sizeof(wszPerformance)/sizeof(WCHAR)); - SendMessageW(hMainWnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIcon(hInst, MAKEINTRESOURCE(IDI_TASKMANAGER))); + SendMessageW(hMainWnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW(hInst, MAKEINTRESOURCEW(IDI_TASKMANAGER))); SendMessageW(hMainWnd, WM_SETICON, ICON_SMALL, - (LPARAM)LoadImage(hInst, MAKEINTRESOURCE(IDI_TASKMANAGER), IMAGE_ICON, - GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), - LR_SHARED)); + (LPARAM)LoadImageW(hInst, MAKEINTRESOURCEW(IDI_TASKMANAGER), IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), + LR_SHARED)); /* Initialize the Windows Common Controls DLL */ InitCommonControls(); @@ -269,10 +269,10 @@ static BOOL OnCreate(HWND hWnd) CheckMenuRadioItem(hCPUHistoryMenu, ID_VIEW_CPUHISTORY_ONEGRAPHALL, ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, ID_VIEW_CPUHISTORY_ONEGRAPHALL, MF_BYCOMMAND); nActivePage = TaskManagerSettings.ActiveTabPage; - TabCtrl_SetCurFocus/*Sel*/(hTabWnd, 0); - TabCtrl_SetCurFocus/*Sel*/(hTabWnd, 1); - TabCtrl_SetCurFocus/*Sel*/(hTabWnd, 2); - TabCtrl_SetCurFocus/*Sel*/(hTabWnd, nActivePage); + SendMessageW(hTabWnd, TCM_SETCURFOCUS, 0, 0); + SendMessageW(hTabWnd, TCM_SETCURFOCUS, 1, 0); + SendMessageW(hTabWnd, TCM_SETCURFOCUS, 2, 0); + SendMessageW(hTabWnd, TCM_SETCURFOCUS, nActivePage, 0); if (TaskManagerSettings.UpdateSpeed == 1) SetTimer(hWnd, 1, 1000, NULL); @@ -504,8 +504,8 @@ static void TaskManager_OnRestoreMainWindow(void) { BOOL OnTop; - OnTop = ((GetWindowLong(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0); - + OnTop = (GetWindowLongW(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0; + OpenIcon(hMainWnd); SetForegroundWindow(hMainWnd); SetWindowPos(hMainWnd, (OnTop ? HWND_TOPMOST : HWND_TOP), 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_SHOWWINDOW); @@ -541,7 +541,7 @@ static void TaskManager_OnExitMenuLoop(HWND hWnd) nParts[1] = 210; nParts[2] = rc.right; SendMessageW(hStatusWnd, SB_SETPARTS, 3, (LPARAM)nParts); - SendMessageW(hStatusWnd, SB_SETTEXT, 0, 0); + SendMessageW(hStatusWnd, SB_SETTEXTW, 0, 0); wsprintfW(text, wszCPU_Usage, PerfDataGetProcessorUsage()); SendMessageW(hStatusWnd, SB_SETTEXTW, 1, (LPARAM)text); wsprintfW(text, wszProcesses, PerfDataGetProcessCount()); @@ -654,7 +654,7 @@ static void TaskManager_OnTabWndSelChange(void) hMenu = GetMenu(hMainWnd); hViewMenu = GetSubMenu(hMenu, 2); hOptionsMenu = GetSubMenu(hMenu, 1); - TaskManagerSettings.ActiveTabPage = TabCtrl_GetCurSel(hTabWnd); + TaskManagerSettings.ActiveTabPage = SendMessageW(hTabWnd, TCM_GETCURSEL, 0, 0); for (i = GetMenuItemCount(hViewMenu) - 1; i > 2; i--) { hSubMenu = GetSubMenu(hViewMenu, i); if (hSubMenu) @@ -843,7 +843,7 @@ TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) ProcessPage_OnViewSelectColumns(); break; case ID_VIEW_REFRESH: - PostMessage(hDlg, WM_TIMER, 0, 0); + PostMessageW(hDlg, WM_TIMER, 0, 0); break; case ID_WINDOWS_TILEHORIZONTALLY: ApplicationPage_OnWindowsTileHorizontally(); @@ -928,7 +928,7 @@ TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) GetCursorPos(&pt); - OnTop = ((GetWindowLong(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0); + OnTop = (GetWindowLongW(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0; hMenu = LoadMenuW(hInst, MAKEINTRESOURCEW(IDR_TRAY_POPUP)); hPopupMenu = GetSubMenu(hMenu, 0); @@ -1030,8 +1030,8 @@ TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) TaskManagerSettings.Maximized = TRUE; else TaskManagerSettings.Maximized = FALSE; - return DefWindowProc(hDlg, message, wParam, lParam); - + return DefWindowProcW(hDlg, message, wParam, lParam); + case WM_TIMER: /* Refresh the performance data */ PerfDataRefresh(); @@ -1078,8 +1078,10 @@ int APIENTRY WinMain(HINSTANCE hInstance, /* Get a token for this process. */ if (OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hToken)) { + static const WCHAR SeDebugPrivilegeW[] = {'S','e','D','e','b','u','g','P','r','i','v','i','l','e','g','e',0}; + /* Get the LUID for the debug privilege. */ - LookupPrivilegeValue(NULL, SE_DEBUG_NAME, &tkp.Privileges[0].Luid); + LookupPrivilegeValueW(NULL, SeDebugPrivilegeW, &tkp.Privileges[0].Luid); tkp.PrivilegeCount = 1; /* one privilege to set */ tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;

1 0

Andrew Nguyen : taskmgr: Remove all TCHAR macro usage in miscellaneous menu code.
by Alexandre Julliard May 17, 2011

May 17, 2011

Module: wine Branch: master Commit: 088d0630d9df688a163cb0fbfc5ee687f4cab3a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=088d0630d9df688a163cb0fbf… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue May 17 05:15:22 2011 -0500 taskmgr: Remove all TCHAR macro usage in miscellaneous menu code. --- programs/taskmgr/optnmenu.c | 2 +- programs/taskmgr/run.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/taskmgr/optnmenu.c b/programs/taskmgr/optnmenu.c index 726531f..42f34e8 100644 --- a/programs/taskmgr/optnmenu.c +++ b/programs/taskmgr/optnmenu.c @@ -48,7 +48,7 @@ void TaskManager_OnOptionsAlwaysOnTop(void) * Check or uncheck the always on top menu item * and update main window. */ - if ((GetWindowLong(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0) + if ((GetWindowLongW(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0) { CheckMenuItem(hOptionsMenu, ID_OPTIONS_ALWAYSONTOP, MF_BYCOMMAND|MF_UNCHECKED); TaskManagerSettings.AlwaysOnTop = FALSE; diff --git a/programs/taskmgr/run.c b/programs/taskmgr/run.c index dc8cf7b..ccd09ec 100644 --- a/programs/taskmgr/run.c +++ b/programs/taskmgr/run.c @@ -52,7 +52,7 @@ void TaskManager_OnFileNew(void) { HMODULE hShell32; RUNFILEDLG RunFileDlg; - OSVERSIONINFO versionInfo; + OSVERSIONINFOW versionInfo; static const WCHAR wszShell32[] = {'S','H','E','L','L','3','2','.','D','L','L',0}; hShell32 = LoadLibraryW(wszShell32); @@ -62,8 +62,8 @@ void TaskManager_OnFileNew(void) if (RunFileDlg) { HICON hIcon = LoadIconW(GetModuleHandleW(NULL), MAKEINTRESOURCEW(IDI_TASKMANAGER)); - versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx(&versionInfo); + versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); + GetVersionExW(&versionInfo); if (versionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT) {

1 0

Andrew Nguyen : taskmgr: Remove all TCHAR macro usage in debug handling code.
by Alexandre Julliard May 17, 2011

May 17, 2011

Module: wine Branch: master Commit: da5623cb83ab76fee58e460c0b2a6bafb6dbfd8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=da5623cb83ab76fee58e460c0… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue May 17 05:15:18 2011 -0500 taskmgr: Remove all TCHAR macro usage in debug handling code. --- programs/taskmgr/debug.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/programs/taskmgr/debug.c b/programs/taskmgr/debug.c index cbd3ebf..f6afd45 100644 --- a/programs/taskmgr/debug.c +++ b/programs/taskmgr/debug.c @@ -36,7 +36,7 @@ void ProcessPage_OnDebug(void) { LVITEMW lvitem; - ULONG Index; + ULONG Index, Count; DWORD dwProcessId; WCHAR wstrErrorText[256]; HKEY hKey; @@ -62,7 +62,8 @@ void ProcessPage_OnDebug(void) LoadStringW(hInst, IDS_DEBUG_UNABLE2DEBUG, wszUnable2Debug, sizeof(wszUnable2Debug)/sizeof(WCHAR)); LoadStringW(hInst, IDS_DEBUG_MESSAGE, wszWarnMsg, sizeof(wszWarnMsg)/sizeof(WCHAR)); - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) + Count = SendMessageW(hProcessPageListCtrl, LVM_GETITEMCOUNT, 0, 0); + for (Index=0; Index<Count; Index++) { lvitem.mask = LVIF_STATE; lvitem.stateMask = LVIS_SELECTED; @@ -75,9 +76,9 @@ void ProcessPage_OnDebug(void) break; } + Count = SendMessageW(hProcessPageListCtrl, LVM_GETSELECTEDCOUNT, 0, 0); dwProcessId = PerfDataGetProcessId(Index); - - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) + if ((Count != 1) || (dwProcessId == 0)) return; if (MessageBoxW(hMainWnd, wszWarnMsg, wszWarnTitle, MB_YESNO|MB_ICONWARNING) != IDYES) @@ -105,7 +106,7 @@ void ProcessPage_OnDebug(void) RegCloseKey(hKey); - hDebugEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + hDebugEvent = CreateEventW(NULL, FALSE, FALSE, NULL); if (!hDebugEvent) { GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR));

1 0