Skip to content

W
wine-winehq
Commit ccab1771 authored by Kusanagi Kouichi's avatar Kusanagi Kouichi Committed by Alexandre Julliard
Browse files
Options

user32: Consolidate empty string.

parent b8fbf9a1
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 7 deletions
dlls/user32/edit.c
View file @ ccab1771
...@@ -169,6 +169,7 @@ typedef struct ...@@ -169,6 +169,7 @@ typedef struct
(LPARAM)(es->hwndSelf)); \ (LPARAM)(es->hwndSelf)); \
} while(0) } while(0)
static const WCHAR empty_stringW[] = {0};
/********************************************************************* /*********************************************************************
* *
...@@ -2878,8 +2879,7 @@ static void EDIT_WM_Paste(EDITSTATE *es) ...@@ -2878,8 +2879,7 @@ static void EDIT_WM_Paste(EDITSTATE *es)
} }
else if (es->style & ES_PASSWORD) { else if (es->style & ES_PASSWORD) {
/* clear selected text in password edit box even with empty clipboard */ /* clear selected text in password edit box even with empty clipboard */
const WCHAR empty_strW[] = { 0 }; EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE);
EDIT_EM_ReplaceSel(es, TRUE, empty_strW, TRUE, TRUE);
} }
CloseClipboard(); CloseClipboard();
} }
...@@ -2921,8 +2921,6 @@ static void EDIT_WM_Copy(EDITSTATE *es) ...@@ -2921,8 +2921,6 @@ static void EDIT_WM_Copy(EDITSTATE *es)
*/ */
static inline void EDIT_WM_Clear(EDITSTATE *es) static inline void EDIT_WM_Clear(EDITSTATE *es)
{ {
static const WCHAR empty_stringW[] = {0};
/* Protect read-only edit control from modification */ /* Protect read-only edit control from modification */
if(es->style & ES_READONLY) if(es->style & ES_READONLY)
return; return;
...@@ -3674,7 +3672,6 @@ static void EDIT_WM_SetText(EDITSTATE *es, LPCWSTR text, BOOL unicode) ...@@ -3674,7 +3672,6 @@ static void EDIT_WM_SetText(EDITSTATE *es, LPCWSTR text, BOOL unicode)
} }
else else
{ {
static const WCHAR empty_stringW[] = {0};
TRACE("<NULL>\n"); TRACE("<NULL>\n");
EDIT_EM_ReplaceSel(es, FALSE, empty_stringW, FALSE, FALSE); EDIT_EM_ReplaceSel(es, FALSE, empty_stringW, FALSE, FALSE);
} }
...@@ -4189,7 +4186,6 @@ static void EDIT_ImeComposition(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) ...@@ -4189,7 +4186,6 @@ static void EDIT_ImeComposition(HWND hwnd, LPARAM CompFlag, EDITSTATE *es)
if (es->composition_len == 0 && es->selection_start != es->selection_end) if (es->composition_len == 0 && es->selection_start != es->selection_end)
{ {
static const WCHAR empty_stringW[] = {0};
EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE); EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE);
es->composition_start = es->selection_end; es->composition_start = es->selection_end;
} }
...@@ -4929,7 +4925,6 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B ...@@ -4929,7 +4925,6 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B
case WM_IME_ENDCOMPOSITION: case WM_IME_ENDCOMPOSITION:
if (es->composition_len > 0) if (es->composition_len > 0)
{ {
static const WCHAR empty_stringW[] = {0};
EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE); EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE);
es->selection_end = es->selection_start; es->selection_end = es->selection_start;
es->composition_len= 0; es->composition_len= 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment