comctl32: Do not use wide character constants.
Michael Stefaniuc
mstefani at redhat.de
Thu Jun 21 15:58:50 CDT 2007
They aren't needed and the implicit cast from the 32bit wchar_t to the
16bit WCHAR isn't that much better than the (Wine) normal implicit cast
from the 8bit char.
---
dlls/comctl32/commctrl.c | 4 ++--
dlls/comctl32/string.c | 4 ++--
dlls/comctl32/tooltips.c | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c
index 1e74afd..5d75d79 100644
--- a/dlls/comctl32/commctrl.c
+++ b/dlls/comctl32/commctrl.c
@@ -442,10 +442,10 @@ void WINAPI DrawStatusTextW (HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style)
if (text) {
int oldbkmode = SetBkMode (hdc, TRANSPARENT);
UINT align = DT_LEFT;
- if (*text == L'\t') {
+ if (*text == '\t') {
text++;
align = DT_CENTER;
- if (*text == L'\t') {
+ if (*text == '\t') {
text++;
align = DT_RIGHT;
}
diff --git a/dlls/comctl32/string.c b/dlls/comctl32/string.c
index 00f72ad..654c467 100644
--- a/dlls/comctl32/string.c
+++ b/dlls/comctl32/string.c
@@ -240,7 +240,7 @@ INT WINAPI Str_GetPtrW (LPCWSTR lpSrc, LPWSTR lpDest, INT nMaxLen)
return 0;
if (lpSrc == NULL) {
- lpDest[0] = L'\0';
+ lpDest[0] = '\0';
return 0;
}
@@ -249,7 +249,7 @@ INT WINAPI Str_GetPtrW (LPCWSTR lpSrc, LPWSTR lpDest, INT nMaxLen)
len = nMaxLen - 1;
RtlMoveMemory (lpDest, lpSrc, len*sizeof(WCHAR));
- lpDest[len] = L'\0';
+ lpDest[len] = '\0';
return len;
}
diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c
index 032ef25..4e11c5c 100644
--- a/dlls/comctl32/tooltips.c
+++ b/dlls/comctl32/tooltips.c
@@ -427,7 +427,7 @@ TOOLTIPS_GetTipText (HWND hwnd, TOOLTIPS_INFO *infoPtr, INT nTool)
}
else {
/* no text available */
- infoPtr->szTipText[0] = L'\0';
+ infoPtr->szTipText[0] = '\0';
}
TRACE("%s\n", debugstr_w(infoPtr->szTipText));
@@ -515,7 +515,7 @@ TOOLTIPS_Show (HWND hwnd, TOOLTIPS_INFO *infoPtr)
TOOLTIPS_GetTipText (hwnd, infoPtr, infoPtr->nCurrentTool);
- if (infoPtr->szTipText[0] == L'\0') {
+ if (infoPtr->szTipText[0] == '\0') {
infoPtr->nCurrentTool = -1;
return;
}
@@ -734,7 +734,7 @@ TOOLTIPS_TrackShow (HWND hwnd, TOOLTIPS_INFO *infoPtr)
TOOLTIPS_GetTipText (hwnd, infoPtr, infoPtr->nTrackTool);
- if (infoPtr->szTipText[0] == L'\0') {
+ if (infoPtr->szTipText[0] == '\0') {
infoPtr->nTrackTool = -1;
return;
}
--
1.5.0.6
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20070621/2996553a/attachment.pgp
More information about the wine-patches
mailing list