March 2021 - Wine-devel - list.winehq.org

[PATCH 5/5] riched20: Set the window title in the host.
by Huw Davies 17 Mar '21

17 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 55 +++++++++++++---------------------------- dlls/riched20/editor.h | 4 +-- dlls/riched20/txthost.c | 23 ++++++++++++++--- dlls/riched20/txtsrv.c | 16 ++++++------ 4 files changed, 47 insertions(+), 51 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 779472f1f04..13a04a003f4 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3207,16 +3207,10 @@ static void ME_SetText(ME_TextEditor *editor, void *text, BOOL unicode) ME_EndToUnicode(codepage, wszText); } -static LRESULT ME_WmCreate(ME_TextEditor *editor, LPARAM lParam, BOOL unicode) +static LRESULT ME_WmCreate( ME_TextEditor *editor ) { - CREATESTRUCTW *createW = (CREATESTRUCTW*)lParam; - CREATESTRUCTA *createA = (CREATESTRUCTA*)lParam; - void *text = NULL; INT max; - if (lParam) - text = unicode ? (void*)createW->lpszName : (void*)createA->lpszName; - max = (editor->scrollbars & ES_DISABLENOSCROLL) ? 1 : 0; if (~editor->scrollbars & ES_DISABLENOSCROLL || editor->scrollbars & WS_VSCROLL) ITextHost_TxSetScrollRange(editor->texthost, SB_VERT, 0, max, TRUE); @@ -3237,17 +3231,6 @@ static LRESULT ME_WmCreate(ME_TextEditor *editor, LPARAM lParam, BOOL unicode) ITextHost_TxShowScrollBar(editor->texthost, SB_HORZ, TRUE); } } - - if (text) - { - ME_SetText(editor, text, unicode); - ME_SetCursorToStart(editor, &editor->pCursors[0]); - ME_SetCursorToStart(editor, &editor->pCursors[1]); - } - - ME_CommitUndo(editor); - ME_WrapMarkedParagraphs(editor); - update_caret(editor); return 0; } @@ -3312,8 +3295,8 @@ static LRESULT handle_EM_SETCHARFORMAT( ME_TextEditor *editor, WPARAM flags, con * The LRESULT that is returned is a return value for window procs, * and the phresult parameter is the COM return code needed by the * text services interface. */ -LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, - LPARAM lParam, BOOL unicode, HRESULT* phresult) +LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, + LPARAM lParam, HRESULT* phresult ) { *phresult = S_OK; @@ -3978,7 +3961,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return (wParam >= 0x40000) ? 0 : MAKELONG( pt.x, pt.y ); } case WM_CREATE: - return ME_WmCreate(editor, lParam, unicode); + return ME_WmCreate( editor ); case WM_SETCURSOR: { POINT cursor_pos; @@ -4060,23 +4043,19 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_CHAR: return handle_wm_char( editor, wParam, lParam ); case WM_UNICHAR: - if (unicode) - { - if(wParam == UNICODE_NOCHAR) return TRUE; - if(wParam <= 0x000fffff) - { - if(wParam > 0xffff) /* convert to surrogates */ - { - wParam -= 0x10000; - handle_wm_char( editor, (wParam >> 10) + 0xd800, 0 ); - handle_wm_char( editor, (wParam & 0x03ff) + 0xdc00, 0 ); - } - else - handle_wm_char( editor, wParam, 0 ); - } - return 0; - } - break; + if (wParam == UNICODE_NOCHAR) return TRUE; + if (wParam <= 0x000fffff) + { + if (wParam > 0xffff) /* convert to surrogates */ + { + wParam -= 0x10000; + handle_wm_char( editor, (wParam >> 10) + 0xd800, 0 ); + handle_wm_char( editor, (wParam & 0x03ff) + 0xdc00, 0 ); + } + else + handle_wm_char( editor, wParam, 0 ); + } + return 0; case EM_STOPGROUPTYPING: ME_CommitUndo(editor); /* End coalesced undos for typed characters */ return 0; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index ee2cde833c4..d0645356678 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -271,8 +271,8 @@ void ME_DeleteReObject(struct re_object *re_object) DECLSPEC_HIDDEN; /* editor.c */ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) DECLSPEC_HIDDEN; void ME_DestroyEditor(ME_TextEditor *editor) DECLSPEC_HIDDEN; -LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, - LPARAM lParam, BOOL unicode, HRESULT* phresult) DECLSPEC_HIDDEN; +LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, + LPARAM lParam, HRESULT* phresult ) DECLSPEC_HIDDEN; void ME_SendOldNotify(ME_TextEditor *editor, int nCode) DECLSPEC_HIDDEN; int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int buflen, const ME_Cursor *start, int srcChars, BOOL bCRLF, BOOL bEOP) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 0325d5d41d8..c80263bbd69 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -963,10 +963,27 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, } case WM_CREATE: + { + CREATESTRUCTW *createW = (CREATESTRUCTW *)lparam; + CREATESTRUCTA *createA = (CREATESTRUCTA *)lparam; + void *text; + WCHAR *textW = NULL; + LONG codepage = unicode ? CP_UNICODE : CP_ACP; + int len; + ITextServices_OnTxPropertyBitsChange( host->text_srv, TXTBIT_CLIENTRECTCHANGE, 0 ); - res = ME_HandleMessage( editor, msg, wparam, lparam, unicode, &hr ); - break; + if (lparam) + { + text = unicode ? (void *)createW->lpszName : (void *)createA->lpszName; + textW = ME_ToUnicode( codepage, text, &len ); + } + ITextServices_TxSetText( host->text_srv, textW ); + if (lparam) ME_EndToUnicode( codepage, textW ); + + hr = ITextServices_TxSendMessage( host->text_srv, msg, wparam, lparam, &res ); + break; + } case WM_DESTROY: ITextHost_Release( &host->ITextHost_iface ); return 0; @@ -1254,7 +1271,7 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, break; } default: - res = ME_HandleMessage( editor, msg, wparam, lparam, unicode, &hr ); + hr = ITextServices_TxSendMessage( host->text_srv, msg, wparam, lparam, &res ); } if (hr == S_FALSE) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 3f7688e6b25..9cf1908b4de 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -130,16 +130,16 @@ static ULONG WINAPI fnTextSrv_Release(ITextServices *iface) } DEFINE_THISCALL_WRAPPER(fnTextSrv_TxSendMessage,20) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxSendMessage(ITextServices *iface, UINT msg, WPARAM wparam, - LPARAM lparam, LRESULT *plresult) +DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxSendMessage( ITextServices *iface, UINT msg, WPARAM wparam, + LPARAM lparam, LRESULT *result ) { - struct text_services *services = impl_from_ITextServices( iface ); - HRESULT hresult; - LRESULT lresult; + struct text_services *services = impl_from_ITextServices( iface ); + HRESULT hr; + LRESULT res; - lresult = ME_HandleMessage( services->editor, msg, wparam, lparam, TRUE, &hresult ); - if (plresult) *plresult = lresult; - return hresult; + res = editor_handle_message( services->editor, msg, wparam, lparam, &hr ); + if (result) *result = res; + return hr; } DEFINE_THISCALL_WRAPPER(fnTextSrv_TxDraw,52) -- 2.23.0

1 0

[PATCH 3/5] riched20: Handle ES_SELECTIONBAR in the host.
by Huw Davies 17 Mar '21

17 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 70 +++-------------------------------------- dlls/riched20/editstr.h | 1 - dlls/riched20/txthost.c | 22 ++++++------- dlls/riched20/txtsrv.c | 18 +++++++++++ 4 files changed, 34 insertions(+), 77 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index df4cbcb4129..17b7d427d83 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2979,6 +2979,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ME_TextEditor *ed = heap_alloc(sizeof(*ed)); int i; LONG selbarwidth; + HRESULT hr; ed->hWnd = NULL; ed->hwndParent = NULL; @@ -2986,7 +2987,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->texthost = texthost; ed->reOle = NULL; ed->bEmulateVersion10 = bEmulateVersion10; - ed->styleFlags = 0; ed->exStyleFlags = 0; ed->total_rows = 0; ITextHost_TxGetPropertyBits( texthost, TXTBIT_RICHTEXT | TXTBIT_MULTILINE | TXTBIT_READONLY | @@ -3047,14 +3047,10 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ME_CheckCharOffsets(ed); SetRectEmpty(&ed->rcFormat); ed->bDefaultFormatRect = TRUE; - ITextHost_TxGetSelectionBarWidth(ed->texthost, &selbarwidth); - if (selbarwidth) { - /* FIXME: Convert selbarwidth from HIMETRIC to pixels */ - ed->selofs = SELECTIONBAR_WIDTH; - ed->styleFlags |= ES_SELECTIONBAR; - } else { - ed->selofs = 0; - } + hr = ITextHost_TxGetSelectionBarWidth( ed->texthost, &selbarwidth ); + /* FIXME: Convert selbarwidth from HIMETRIC to pixels */ + if (hr == S_OK && selbarwidth) ed->selofs = SELECTIONBAR_WIDTH; + else ed->selofs = 0; ed->nSelectionType = stPosition; ed->cPasswordMask = 0; @@ -3405,14 +3401,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return ME_Undo(editor); case EM_REDO: return ME_Redo(editor); - case EM_GETOPTIONS: - { - /* these flags are equivalent to the ES_* counterparts */ - DWORD mask = ECO_SELECTIONBAR; - DWORD settings = editor->styleFlags & mask; - - return settings; - } case EM_SETFONTSIZE: { CHARFORMAT2W cf; @@ -3454,54 +3442,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return TRUE; } - case EM_SETOPTIONS: - { - /* these flags are equivalent to ES_* counterparts, except for - * ECO_AUTOWORDSELECTION that doesn't have an ES_* counterpart, - * but is still stored in editor->styleFlags. */ - const DWORD mask = ECO_SELECTIONBAR; - DWORD settings = mask & editor->styleFlags; - DWORD oldSettings = settings; - DWORD changedSettings; - - switch(wParam) - { - case ECOOP_SET: - settings = lParam; - break; - case ECOOP_OR: - settings |= lParam; - break; - case ECOOP_AND: - settings &= lParam; - break; - case ECOOP_XOR: - settings ^= lParam; - } - changedSettings = oldSettings ^ settings; - - if (changedSettings) { - editor->styleFlags = (editor->styleFlags & ~mask) | (settings & mask); - - if (changedSettings & ECO_SELECTIONBAR) - { - ITextHost_TxInvalidateRect(editor->texthost, &editor->rcFormat, TRUE); - if (settings & ECO_SELECTIONBAR) { - assert(!editor->selofs); - editor->selofs = SELECTIONBAR_WIDTH; - editor->rcFormat.left += editor->selofs; - } else { - editor->rcFormat.left -= editor->selofs; - editor->selofs = 0; - } - ME_RewrapRepaint(editor); - } - - - } - - return settings; - } case EM_SETSEL: { return set_selection( editor, wParam, lParam ); diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 1fbf70ee6b2..a3e5970bff8 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -383,7 +383,6 @@ typedef struct tagME_TextEditor BOOL bEmulateVersion10; ME_TextBuffer *pBuffer; ME_Cursor *pCursors; - DWORD styleFlags; DWORD exStyleFlags; DWORD props; DWORD scrollbars; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 9ae54a2a5f2..3ba522331b0 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -42,6 +42,7 @@ struct host unsigned int emulate_10 : 1; unsigned int dialog_mode : 1; unsigned int want_return : 1; + unsigned int sel_bar : 1; PARAFORMAT2 para_fmt; DWORD props, scrollbars, event_mask; }; @@ -73,6 +74,7 @@ static void host_init_props( struct host *host ) if (!(host->scrollbars & ES_AUTOHSCROLL)) host->props |= TXTBIT_WORDWRAP; + host->sel_bar = !!(style & ES_SELECTIONBAR); host->want_return = !!(style & ES_WANTRETURN); } @@ -471,8 +473,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetSelectionBarWidth( ITextHo { struct host *host = impl_from_ITextHost( iface ); - DWORD style = host->editor ? host->editor->styleFlags : GetWindowLongW( host->window, GWL_STYLE ); - *width = (style & ES_SELECTIONBAR) ? 225 : 0; /* in HIMETRIC */ + *width = host->sel_bar ? 225 : 0; /* in HIMETRIC */ return S_OK; } @@ -773,10 +774,6 @@ static HRESULT set_options( struct host *host, DWORD op, DWORD value, LRESULT *r DWORD style, old_options, new_options, change, props_mask = 0; DWORD mask = ECO_AUTOWORDSELECTION | ECO_AUTOVSCROLL | ECO_AUTOHSCROLL | ECO_NOHIDESEL | ECO_READONLY | ECO_WANTRETURN | ECO_SAVESEL | ECO_SELECTIONBAR | ECO_VERTICAL; - const DWORD host_mask = ECO_AUTOWORDSELECTION | ECO_AUTOVSCROLL | ECO_AUTOHSCROLL | ECO_NOHIDESEL | ECO_READONLY | - ECO_WANTRETURN | ECO_SAVESEL | ECO_VERTICAL; - - HRESULT hr = S_OK; new_options = old_options = SendMessageW( host->window, EM_GETOPTIONS, 0, 0 ); @@ -828,6 +825,11 @@ static HRESULT set_options( struct host *host, DWORD op, DWORD value, LRESULT *r host->props ^= TXTBIT_SAVESELECTION; props_mask |= TXTBIT_SAVESELECTION; } + if (change & ECO_SELECTIONBAR) + { + host->sel_bar ^= 1; + props_mask |= TXTBIT_SELBARCHANGE; + } if (change & ECO_VERTICAL) { host->props ^= TXTBIT_VERTICAL; @@ -838,15 +840,13 @@ static HRESULT set_options( struct host *host, DWORD op, DWORD value, LRESULT *r if (props_mask) ITextServices_OnTxPropertyBitsChange( host->text_srv, props_mask, host->props & props_mask ); - /* Handle the rest in the editor for now */ - hr = ITextServices_TxSendMessage( host->text_srv, EM_SETOPTIONS, op, value, res ); - *res = (*res & ~host_mask) | (new_options & host_mask); + *res = new_options; mask &= ~ECO_AUTOWORDSELECTION; /* doesn't correspond to a window style */ style = GetWindowLongW( host->window, GWL_STYLE ); style = (style & ~mask) | (*res & mask); SetWindowLongW( host->window, GWL_STYLE, style ); - return hr; + return S_OK; } /* handle dialog mode VK_RETURN. Returns TRUE if message has been processed */ @@ -1017,7 +1017,6 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, break; } case EM_GETOPTIONS: - hr = ITextServices_TxSendMessage( host->text_srv, EM_GETOPTIONS, 0, 0, &res ); if (host->props & TXTBIT_READONLY) res |= ECO_READONLY; if (!(host->props & TXTBIT_HIDESELECTION)) res |= ECO_NOHIDESEL; if (host->props & TXTBIT_SAVESELECTION) res |= ECO_SAVESEL; @@ -1026,6 +1025,7 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, if (host->scrollbars & ES_AUTOHSCROLL) res |= ECO_AUTOHSCROLL; if (host->scrollbars & ES_AUTOVSCROLL) res |= ECO_AUTOVSCROLL; if (host->want_return) res |= ECO_WANTRETURN; + if (host->sel_bar) res |= ECO_SELECTIONBAR; break; case WM_GETTEXT: diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 8fb6416d38b..df62a2dd7c5 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -327,6 +327,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxPropertyBitsChange( ITextServic struct text_services *services = impl_from_ITextServices( iface ); DWORD scrollbars; HRESULT hr; + BOOL repaint = FALSE; TRACE( "%p, mask %08x, bits %08x\n", services, mask, bits ); @@ -349,6 +350,23 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxPropertyBitsChange( ITextServic if ((mask & TXTBIT_HIDESELECTION) && !services->editor->bHaveFocus) ME_InvalidateSelection( services->editor ); + if (mask & TXTBIT_SELBARCHANGE) + { + LONG width; + + hr = ITextHost_TxGetSelectionBarWidth( services->host, &width ); + if (hr == S_OK) + { + ITextHost_TxInvalidateRect( services->host, &services->editor->rcFormat, TRUE ); + services->editor->rcFormat.left -= services->editor->selofs; + services->editor->selofs = width ? SELECTIONBAR_WIDTH : 0; /* FIXME: convert from HIMETRIC */ + services->editor->rcFormat.left += services->editor->selofs; + repaint = TRUE; + } + } + + if (repaint) ME_RewrapRepaint( services->editor ); + return S_OK; } -- 2.23.0

1 0

[PATCH 2/5] riched20: Handle ES_WANTRETURN in the host.
by Huw Davies 17 Mar '21

17 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 4 ++-- dlls/riched20/txthost.c | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 77787906344..df4cbcb4129 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3408,7 +3408,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case EM_GETOPTIONS: { /* these flags are equivalent to the ES_* counterparts */ - DWORD mask = ECO_WANTRETURN | ECO_SELECTIONBAR; + DWORD mask = ECO_SELECTIONBAR; DWORD settings = editor->styleFlags & mask; return settings; @@ -3459,7 +3459,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, /* these flags are equivalent to ES_* counterparts, except for * ECO_AUTOWORDSELECTION that doesn't have an ES_* counterpart, * but is still stored in editor->styleFlags. */ - const DWORD mask = ECO_WANTRETURN | ECO_SELECTIONBAR; + const DWORD mask = ECO_SELECTIONBAR; DWORD settings = mask & editor->styleFlags; DWORD oldSettings = settings; DWORD changedSettings; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index ddbb879a75f..9ae54a2a5f2 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -41,6 +41,7 @@ struct host HWND window, parent; unsigned int emulate_10 : 1; unsigned int dialog_mode : 1; + unsigned int want_return : 1; PARAFORMAT2 para_fmt; DWORD props, scrollbars, event_mask; }; @@ -71,6 +72,8 @@ static void host_init_props( struct host *host ) if (style & ES_NOOLEDRAGDROP) host->props |= TXTBIT_DISABLEDRAG; if (!(host->scrollbars & ES_AUTOHSCROLL)) host->props |= TXTBIT_WORDWRAP; + + host->want_return = !!(style & ES_WANTRETURN); } struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) @@ -698,7 +701,6 @@ static BOOL create_windowed_editor( HWND hwnd, CREATESTRUCTW *create, BOOL emula IUnknown_Release( unk ); host->editor->exStyleFlags = GetWindowLongW( hwnd, GWL_EXSTYLE ); - host->editor->styleFlags |= GetWindowLongW( hwnd, GWL_STYLE ) & ES_WANTRETURN; host->editor->hWnd = hwnd; /* FIXME: Remove editor's dependence on hWnd */ host->editor->hwndParent = create->hwndParent; @@ -772,7 +774,7 @@ static HRESULT set_options( struct host *host, DWORD op, DWORD value, LRESULT *r DWORD mask = ECO_AUTOWORDSELECTION | ECO_AUTOVSCROLL | ECO_AUTOHSCROLL | ECO_NOHIDESEL | ECO_READONLY | ECO_WANTRETURN | ECO_SAVESEL | ECO_SELECTIONBAR | ECO_VERTICAL; const DWORD host_mask = ECO_AUTOWORDSELECTION | ECO_AUTOVSCROLL | ECO_AUTOHSCROLL | ECO_NOHIDESEL | ECO_READONLY | - ECO_SAVESEL | ECO_VERTICAL; + ECO_WANTRETURN | ECO_SAVESEL | ECO_VERTICAL; HRESULT hr = S_OK; @@ -831,6 +833,7 @@ static HRESULT set_options( struct host *host, DWORD op, DWORD value, LRESULT *r host->props ^= TXTBIT_VERTICAL; props_mask |= TXTBIT_VERTICAL; } + if (change & ECO_WANTRETURN) host->want_return ^= 1; if (props_mask) ITextServices_OnTxPropertyBitsChange( host->text_srv, props_mask, host->props & props_mask ); @@ -853,7 +856,7 @@ static BOOL handle_dialog_enter( struct host *host ) if (ctrl_is_down) return TRUE; - if (host->editor->styleFlags & ES_WANTRETURN) return FALSE; + if (host->want_return) return FALSE; if (host->parent) { @@ -1022,6 +1025,7 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, if (host->props & TXTBIT_VERTICAL) res |= ECO_VERTICAL; if (host->scrollbars & ES_AUTOHSCROLL) res |= ECO_AUTOHSCROLL; if (host->scrollbars & ES_AUTOVSCROLL) res |= ECO_AUTOVSCROLL; + if (host->want_return) res |= ECO_WANTRETURN; break; case WM_GETTEXT: -- 2.23.0

1 0

[PATCH 1/5] riched20: Handle dialog mode in the host.
by Huw Davies 17 Mar '21

17 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 47 --------------------------------- dlls/riched20/editstr.h | 1 - dlls/riched20/txthost.c | 57 ++++++++++++++++++++++++++++++++++++++++- 3 files changed, 56 insertions(+), 49 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 6f38231de9b..77787906344 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2411,34 +2411,8 @@ static void ME_UpdateSelectionLinkAttribute(ME_TextEditor *editor) static BOOL handle_enter(ME_TextEditor *editor) { - BOOL ctrl_is_down = GetKeyState(VK_CONTROL) & 0x8000; BOOL shift_is_down = GetKeyState(VK_SHIFT) & 0x8000; - if (editor->bDialogMode) - { - if (ctrl_is_down) - return TRUE; - - if (!(editor->styleFlags & ES_WANTRETURN)) - { - if (editor->hwndParent) - { - DWORD dw; - dw = SendMessageW(editor->hwndParent, DM_GETDEFID, 0, 0); - if (HIWORD(dw) == DC_HASDEFID) - { - HWND hwDefCtrl = GetDlgItem(editor->hwndParent, LOWORD(dw)); - if (hwDefCtrl) - { - SendMessageW(editor->hwndParent, WM_NEXTDLGCTL, (WPARAM)hwDefCtrl, TRUE); - PostMessageW(hwDefCtrl, WM_KEYDOWN, VK_RETURN, 0); - } - } - } - return TRUE; - } - } - if (editor->props & TXTBIT_MULTILINE) { ME_Cursor cursor = editor->pCursors[0]; @@ -2647,14 +2621,6 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) if (!editor->bEmulateVersion10) return handle_enter(editor); break; - case VK_ESCAPE: - if (editor->bDialogMode && editor->hwndParent) - PostMessageW(editor->hwndParent, WM_CLOSE, 0, 0); - return TRUE; - case VK_TAB: - if (editor->bDialogMode && editor->hwndParent) - SendMessageW(editor->hwndParent, WM_NEXTDLGCTL, shift_is_down, 0); - return TRUE; case 'A': if (ctrl_is_down) { @@ -3068,7 +3034,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->mode |= (ed->props & TXTBIT_RICHTEXT) ? TM_RICHTEXT : TM_PLAINTEXT; ed->AutoURLDetect_bEnable = FALSE; ed->bHaveFocus = FALSE; - ed->bDialogMode = FALSE; ed->bMouseCaptured = FALSE; ed->caret_hidden = FALSE; ed->caret_height = 0; @@ -3399,18 +3364,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return ME_StreamIn(editor, wParam, (EDITSTREAM*)lParam, TRUE); case EM_STREAMOUT: return ME_StreamOut(editor, wParam, (EDITSTREAM *)lParam); - case WM_GETDLGCODE: - { - UINT code = DLGC_WANTCHARS|DLGC_WANTTAB|DLGC_WANTARROWS; - - if (lParam) - editor->bDialogMode = TRUE; - if (editor->props & TXTBIT_MULTILINE) - code |= DLGC_WANTMESSAGE; - if (!(editor->props & TXTBIT_SAVESELECTION)) - code |= DLGC_HASSETSEL; - return code; - } case EM_EMPTYUNDOBUFFER: ME_EmptyUndoStack(editor); return 0; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index f689194901c..1fbf70ee6b2 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -424,7 +424,6 @@ typedef struct tagME_TextEditor BOOL AutoURLDetect_bEnable; WCHAR cPasswordMask; BOOL bHaveFocus; - BOOL bDialogMode; /* Indicates that we are inside a dialog window */ /*for IME */ int imeStartIndex; DWORD selofs; /* The size of the selection bar on the left side of control */ diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index a8286905659..ddbb879a75f 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -39,7 +39,8 @@ struct host ITextServices *text_srv; ME_TextEditor *editor; /* to be removed */ HWND window, parent; - BOOL emulate_10; + unsigned int emulate_10 : 1; + unsigned int dialog_mode : 1; PARAFORMAT2 para_fmt; DWORD props, scrollbars, event_mask; }; @@ -84,6 +85,7 @@ struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) texthost->window = hwnd; texthost->parent = cs->hwndParent; texthost->emulate_10 = emulate_10; + texthost->dialog_mode = 0; memset( &texthost->para_fmt, 0, sizeof(texthost->para_fmt) ); texthost->para_fmt.cbSize = sizeof(texthost->para_fmt); texthost->para_fmt.dwMask = PFM_ALIGNMENT; @@ -844,6 +846,31 @@ static HRESULT set_options( struct host *host, DWORD op, DWORD value, LRESULT *r return hr; } +/* handle dialog mode VK_RETURN. Returns TRUE if message has been processed */ +static BOOL handle_dialog_enter( struct host *host ) +{ + BOOL ctrl_is_down = GetKeyState( VK_CONTROL ) & 0x8000; + + if (ctrl_is_down) return TRUE; + + if (host->editor->styleFlags & ES_WANTRETURN) return FALSE; + + if (host->parent) + { + DWORD id = SendMessageW( host->parent, DM_GETDEFID, 0, 0 ); + if (HIWORD( id ) == DC_HASDEFID) + { + HWND ctrl = GetDlgItem( host->parent, LOWORD( id )); + if (ctrl) + { + SendMessageW( host->parent, WM_NEXTDLGCTL, (WPARAM)ctrl, TRUE ); + PostMessageW( ctrl, WM_KEYDOWN, VK_RETURN, 0 ); + } + } + } + return TRUE; +} + static LRESULT send_msg_filter( struct host *host, UINT msg, WPARAM *wparam, LPARAM *lparam ) { MSGFILTER msgf; @@ -905,6 +932,7 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, WCHAR wc = wparam; if (!unicode) MultiByteToWideChar( CP_ACP, 0, (char *)&wparam, 1, &wc, 1 ); + if (wparam == '\r' && host->dialog_mode && host->emulate_10 && handle_dialog_enter( host )) break; hr = ITextServices_TxSendMessage( host->text_srv, msg, wc, lparam, &res ); break; } @@ -958,6 +986,14 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, } break; } + case WM_GETDLGCODE: + if (lparam) host->dialog_mode = TRUE; + + res = DLGC_WANTCHARS | DLGC_WANTTAB | DLGC_WANTARROWS; + if (host->props & TXTBIT_MULTILINE) res |= DLGC_WANTMESSAGE; + if (!(host->props & TXTBIT_SAVESELECTION)) res |= DLGC_HASSETSEL; + break; + case EM_GETLINE: if (unicode) hr = ITextServices_TxSendMessage( host->text_srv, msg, wparam, lparam, &res ); else hr = get_lineA( host->text_srv, wparam, lparam, &res ); @@ -1014,6 +1050,25 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, else hr = get_text_rangeA( host, (TEXTRANGEA *)lparam, &res ); break; + case WM_KEYDOWN: + switch (LOWORD( wparam )) + { + case VK_ESCAPE: + if (host->dialog_mode && host->parent) + PostMessageW( host->parent, WM_CLOSE, 0, 0 ); + break; + case VK_TAB: + if (host->dialog_mode && host->parent) + SendMessageW( host->parent, WM_NEXTDLGCTL, GetKeyState( VK_SHIFT ) & 0x8000, 0 ); + break; + case VK_RETURN: + if (host->dialog_mode && !host->emulate_10 && handle_dialog_enter( host )) break; + /* fall through */ + default: + hr = ITextServices_TxSendMessage( host->text_srv, msg, wparam, lparam, &res ); + } + break; + case WM_PAINT: { HDC hdc; -- 2.23.0

1 0

[tools] testbot: Increase the unique Job/Patch/RecordGroup id limits.
by Francois Gouget 17 Mar '21

17 Mar '21

First we don't actually care about the SQL formatting directives (i.e. the '(5)' in 'INT(5)'), and these have no impact on the allowed range. They are changed anyway only for consistency with the TestBot ORM declarations. However the TestBot ORM enforces the declared maximum number of digits. So increase those to allow the full range of the underlying database type, which in this case is 0..2^31-1. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This patch requires updating the database and then restarting the TestBot Engine and web server. What would increase the range would be switching the autoincrement fields from signed to unsigned. It would also make sense since these start at zero and never wrap. However they are used as foreign keys so changing their type is more trouble than it's worth. At the current rate 2 billion jobs / Wine patches should be enough for over 150000 years. Enough I guess. The RecordGroupId field may be more troublesome: I don't know what its value is on the official TestBot but here is seems to be 10x the job id (it sort of scales with the number of VM operations, and thus the number of tasks). So it may only have another 1500 to 15000 years in it. That should still be enough. Maybe we should have a Munin graph to monitor the 'wear' on these. --- testbot/ddl/update45.sql | 24 ++++++++++++++++++++++++ testbot/ddl/winetestbot.sql | 18 +++++++++--------- testbot/lib/WineTestBot/Jobs.pm | 2 +- testbot/lib/WineTestBot/Patches.pm | 4 ++-- testbot/lib/WineTestBot/RecordGroups.pm | 2 +- testbot/lib/WineTestBot/Records.pm | 2 +- testbot/lib/WineTestBot/Steps.pm | 2 +- testbot/lib/WineTestBot/StepsTasks.pm | 2 +- testbot/lib/WineTestBot/Tasks.pm | 2 +- 9 files changed, 41 insertions(+), 17 deletions(-) create mode 100644 testbot/ddl/update45.sql diff --git a/testbot/ddl/update45.sql b/testbot/ddl/update45.sql new file mode 100644 index 000000000..a04dba1e8 --- /dev/null +++ b/testbot/ddl/update45.sql @@ -0,0 +1,24 @@ +USE winetestbot; + +ALTER TABLE Patches + MODIFY Id INT NOT NULL AUTO_INCREMENT, + MODIFY WebPatchId INT NULL; + +ALTER TABLE PendingPatches + MODIFY PatchId INT NOT NULL; + +ALTER TABLE Jobs + MODIFY Id INT NOT NULL AUTO_INCREMENT, + MODIFY PatchId INT NULL; + +ALTER TABLE Steps + MODIFY JobId INT NOT NULL; + +ALTER TABLE Tasks + MODIFY JobId INT NOT NULL; + +ALTER TABLE RecordGroups + MODIFY Id INT NOT NULL AUTO_INCREMENT; + +ALTER TABLE Records + MODIFY RecordGroupId INT NOT NULL; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 1794b2508..3b5cda757 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -66,8 +66,8 @@ ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE Patches ( - Id INT(7) NOT NULL AUTO_INCREMENT, - WebPatchId INT(7) NULL, + Id INT NOT NULL AUTO_INCREMENT, + WebPatchId INT NULL, Received DATETIME NOT NULL, Disposition VARCHAR(40) NOT NULL, FromName VARCHAR(40) NULL, @@ -94,7 +94,7 @@ CREATE TABLE PendingPatches PendingPatchSetVersion INT(2) NOT NULL, PendingPatchSetTotalParts INT(2) NOT NULL, No INT(2) NOT NULL, - PatchId INT(7) NOT NULL, + PatchId INT NOT NULL, FOREIGN KEY (PendingPatchSetEMail, PendingPatchSetVersion, PendingPatchSetTotalParts) REFERENCES PendingPatchSets(EMail, Version, TotalParts), FOREIGN KEY (PatchId) REFERENCES Patches(Id), @@ -112,7 +112,7 @@ ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE Jobs ( - Id INT(5) NOT NULL AUTO_INCREMENT, + Id INT NOT NULL AUTO_INCREMENT, BranchName VARCHAR(20) NOT NULL, UserName VARCHAR(40) NOT NULL, Priority INT(1) NOT NULL, @@ -120,7 +120,7 @@ CREATE TABLE Jobs Remarks VARCHAR(128) NULL, Submitted DATETIME NOT NULL, Ended DATETIME NULL, - PatchId INT(7) NULL, + PatchId INT NULL, FOREIGN KEY (BranchName) REFERENCES Branches(Name), FOREIGN KEY (UserName) REFERENCES Users(Name), FOREIGN KEY (PatchId) REFERENCES Patches(Id), @@ -130,7 +130,7 @@ ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE Steps ( - JobId INT(5) NOT NULL, + JobId INT NOT NULL, No INT(2) NOT NULL, PreviousNo INT(2) NULL, Type ENUM('suite', 'single', 'build', 'reconfig') NOT NULL, @@ -148,7 +148,7 @@ ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE Tasks ( - JobId INT(5) NOT NULL, + JobId INT NOT NULL, StepNo INT(2) NOT NULL, No INT(2) NOT NULL, Status ENUM('queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped') NOT NULL, @@ -166,7 +166,7 @@ ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE RecordGroups ( - Id INT(6) NOT NULL AUTO_INCREMENT, + Id INT NOT NULL AUTO_INCREMENT, Timestamp DATETIME NOT NULL, PRIMARY KEY (Id) ) @@ -174,7 +174,7 @@ ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE Records ( - RecordGroupId INT(6) NOT NULL, + RecordGroupId INT NOT NULL, Type ENUM('engine', 'tasks', 'vmresult', 'vmstatus') NOT NULL, Name VARCHAR(96) NOT NULL, Value VARCHAR(64) NULL, diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index aeecea0c1..5dbc1a7f4 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -446,7 +446,7 @@ sub CreateItem($) } my @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Id", "Job", 1, 1, "S", 5), + CreateBasicPropertyDescriptor("Id", "Job", 1, 1, "S", 10), CreateItemrefPropertyDescriptor("Branch", "Branch", !1, 1, \&CreateBranches, ["BranchName"]), CreateItemrefPropertyDescriptor("User", "Author", !1, 1, \&CreateUsers, ["UserName"]), CreateBasicPropertyDescriptor("Priority", "Priority", !1, 1, "N", 1), diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index cb8c78cb5..b6a8af4c4 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -453,8 +453,8 @@ sub CreateItem($) } my @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Id", "Patch id", 1, 1, "S", 7), - CreateBasicPropertyDescriptor("WebPatchId", "Wine Web Patch id", !1, !1, "N", 7), + CreateBasicPropertyDescriptor("Id", "Patch id", 1, 1, "S", 10), + CreateBasicPropertyDescriptor("WebPatchId", "Wine Web Patch id", !1, !1, "N", 10), CreateBasicPropertyDescriptor("Received", "Received", !1, 1, "DT", 19), CreateBasicPropertyDescriptor("FromName", "Author", !1, !1, "A", 40), CreateBasicPropertyDescriptor("FromEMail", "Author's email address", !1, !1, "A", 40), diff --git a/testbot/lib/WineTestBot/RecordGroups.pm b/testbot/lib/WineTestBot/RecordGroups.pm index 27cedfe32..f0945434c 100644 --- a/testbot/lib/WineTestBot/RecordGroups.pm +++ b/testbot/lib/WineTestBot/RecordGroups.pm @@ -73,7 +73,7 @@ sub CreateItem($) } my @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Id", "Group id", 1, 1, "S", 6), + CreateBasicPropertyDescriptor("Id", "Group id", 1, 1, "S", 10), CreateBasicPropertyDescriptor("Timestamp", "Timestamp", !1, 1, "DT", 19), CreateDetailrefPropertyDescriptor("Records", "Records", !1, !1, \&CreateRecords), ); diff --git a/testbot/lib/WineTestBot/Records.pm b/testbot/lib/WineTestBot/Records.pm index 00364f292..fd8e574ea 100644 --- a/testbot/lib/WineTestBot/Records.pm +++ b/testbot/lib/WineTestBot/Records.pm @@ -83,7 +83,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Value", "Value", !1, !1, "A", 64), ); my @FlatPropertyDescriptors = ( - CreateBasicPropertyDescriptor("RecordGroupId", "Group id", 1, 1, "S", 6), + CreateBasicPropertyDescriptor("RecordGroupId", "Group id", 1, 1, "S", 10), @PropertyDescriptors ); diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 921077b48..0f65d631c 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -247,7 +247,7 @@ my @PropertyDescriptors = ( ); SetDetailrefKeyPrefix("Step", @PropertyDescriptors); my @FlatPropertyDescriptors = ( - CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "S", 5), + CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "S", 10), @PropertyDescriptors ); diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index a9326bec9..0b1655a37 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -177,7 +177,7 @@ sub CreateItem($) # Note: To simplify maintenance replace enums with simple string fields. my @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Id", "Id", 1, 1, "N", 4), + CreateBasicPropertyDescriptor("Id", "Id", 1, 1, "N", 10), CreateBasicPropertyDescriptor("StepNo", "Step", !1, 1, "N", 2), CreateBasicPropertyDescriptor("PreviousNo", "Previous step", !1, !1, "N", 2), CreateBasicPropertyDescriptor("TaskNo", "Task", !1, 1, "N", 2), diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 141fee07b..5cc2cc667 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -368,7 +368,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("TestFailures", "Failures", !1, !1, "N", 6), ); my @FlatPropertyDescriptors = ( - CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "S", 5), + CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "S", 10), CreateBasicPropertyDescriptor("StepNo", "Step no", 1, 1, "N", 2), @PropertyDescriptors ); -- 2.20.1

1 0

[PATCH] evr: Remove superfluous cast to self
by Michael Stefaniuc 16 Mar '21

16 Mar '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/evr/mixer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 52fc7d0cfcc..c59ec002340 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -899,7 +899,7 @@ static HRESULT WINAPI video_mixer_transform_GetInputCurrentType(IMFTransform *if hr = MF_E_TRANSFORM_TYPE_NOT_SET; else { - *type = (IMFMediaType *)stream->media_type; + *type = stream->media_type; IMFMediaType_AddRef(*type); } } @@ -925,7 +925,7 @@ static HRESULT WINAPI video_mixer_transform_GetOutputCurrentType(IMFTransform *i hr = MF_E_TRANSFORM_TYPE_NOT_SET; else { - *type = (IMFMediaType *)mixer->output.media_type; + *type = mixer->output.media_type; IMFMediaType_AddRef(*type); } -- 2.26.3

1 0

[PATCH] gameux: Use wide-char string literals.
by Michael Stefaniuc 16 Mar '21

16 Mar '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gameux/gameexplorer.c | 67 +++++++++--------------------------- dlls/gameux/gamestatistics.c | 57 +++++++++--------------------- 2 files changed, 32 insertions(+), 92 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 8b62c72f389..5fdacacf4b2 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -80,12 +80,6 @@ HRESULT GAMEUX_buildGameRegistryPath(GAME_INSTALL_SCOPE installScope, LPCGUID gameInstanceId, LPWSTR* lpRegistryPath) { - static const WCHAR sGameUxRegistryPath[] = {'S','O','F','T','W','A','R','E','\\', - 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','G','a','m','e','U','X',0}; - static const WCHAR sGames[] = {'G','a','m','e','s',0}; - static const WCHAR sBackslash[] = {'\\',0}; - HRESULT hr = S_OK; HANDLE hToken = NULL; PTOKEN_USER pTokenUser = NULL; @@ -99,8 +93,7 @@ HRESULT GAMEUX_buildGameRegistryPath(GAME_INSTALL_SCOPE installScope, /* this will make freeing it easier for user */ *lpRegistryPath = NULL; - lstrcpyW(sRegistryPath, sGameUxRegistryPath); - lstrcatW(sRegistryPath, sBackslash); + lstrcpyW(sRegistryPath, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\GameUX\\"); if(installScope == GIS_CURRENT_USER) { @@ -141,7 +134,7 @@ HRESULT GAMEUX_buildGameRegistryPath(GAME_INSTALL_SCOPE installScope, } else if(installScope == GIS_ALL_USERS) /* build registry path without SID */ - lstrcatW(sRegistryPath, sGames); + lstrcatW(sRegistryPath, L"Games"); else hr = E_INVALIDARG; @@ -153,7 +146,7 @@ HRESULT GAMEUX_buildGameRegistryPath(GAME_INSTALL_SCOPE installScope, if(SUCCEEDED(hr)) { - lstrcatW(sRegistryPath, sBackslash); + lstrcatW(sRegistryPath, L"\\"); lstrcatW(sRegistryPath, sInstanceId); } } @@ -197,17 +190,6 @@ HRESULT GAMEUX_buildGameRegistryPath(GAME_INSTALL_SCOPE installScope, */ static HRESULT GAMEUX_WriteRegistryRecord(struct GAMEUX_GAME_DATA *GameData) { - static const WCHAR sApplicationId[] = - {'A','p','p','l','i','c','a','t','i','o','n','I','d',0}; - static const WCHAR sConfigApplicationPath[] = - {'C','o','n','f','i','g','A','p','p','l','i','c','a','t','i','o','n','P','a','t','h',0}; - static const WCHAR sConfigGDFBinaryPath[] = - {'C','o','n','f','i','g','G','D','F','B','i','n','a','r','y','P','a','t','h',0}; - static const WCHAR sTitle[] = - {'T','i','t','l','e',0}; - static const WCHAR sDescription[] = - {'D','e','s','c','r','i','p','t','i','o','n',0}; - HRESULT hr, hr2; LPWSTR lpRegistryKey; HKEY hKey; @@ -228,27 +210,27 @@ static HRESULT GAMEUX_WriteRegistryRecord(struct GAMEUX_GAME_DATA *GameData) if(SUCCEEDED(hr)) { /* write game data to registry key */ - hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, sConfigApplicationPath, 0, + hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, L"ConfigApplicationPath", 0, REG_SZ, (LPBYTE)(GameData->sGameInstallDirectory), (lstrlenW(GameData->sGameInstallDirectory)+1)*sizeof(WCHAR))); if(SUCCEEDED(hr)) - hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, sConfigGDFBinaryPath, 0, + hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, L"ConfigGDFBinaryPath", 0, REG_SZ, (LPBYTE)(GameData->sGDFBinaryPath), (lstrlenW(GameData->sGDFBinaryPath)+1)*sizeof(WCHAR))); if(SUCCEEDED(hr)) - hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, sApplicationId, 0, + hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, L"ApplicationId", 0, REG_SZ, (LPBYTE)(sGameApplicationId), (lstrlenW(sGameApplicationId)+1)*sizeof(WCHAR))); if(SUCCEEDED(hr)) - hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, sTitle, 0, + hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, L"Title", 0, REG_SZ, (LPBYTE)(GameData->bstrName), (lstrlenW(GameData->bstrName)+1)*sizeof(WCHAR))); if(SUCCEEDED(hr)) - hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, sDescription, 0, + hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, L"Description", 0, REG_SZ, (LPBYTE)(GameData->bstrDescription ? GameData->bstrDescription : GameData->bstrName), (lstrlenW(GameData->bstrDescription ? GameData->bstrDescription : GameData->bstrName)+1)*sizeof(WCHAR))); @@ -282,11 +264,6 @@ static HRESULT GAMEUX_ProcessGameDefinitionElement( IXMLDOMElement *element, struct GAMEUX_GAME_DATA *GameData) { - static const WCHAR sName[] = - {'N','a','m','e',0}; - static const WCHAR sDescription[] = - {'D','e','s','c','r','i','p','t','i','o','n',0}; - HRESULT hr; BSTR bstrElementName; @@ -296,10 +273,10 @@ static HRESULT GAMEUX_ProcessGameDefinitionElement( if(SUCCEEDED(hr)) { /* check element name */ - if(lstrcmpW(bstrElementName, sName) == 0) + if(lstrcmpW(bstrElementName, L"Name") == 0) hr = IXMLDOMElement_get_text(element, &GameData->bstrName); - else if(lstrcmpW(bstrElementName, sDescription) == 0) + else if(lstrcmpW(bstrElementName, L"Description") == 0) hr = IXMLDOMElement_get_text(element, &GameData->bstrDescription); else @@ -323,7 +300,6 @@ static HRESULT GAMEUX_ProcessGameDefinitionElement( */ static HRESULT GAMEUX_ParseGameDefinition(IXMLDOMElement *gamedef, struct GAMEUX_GAME_DATA *game_data) { - static const WCHAR gameidW[] = {'g','a','m','e','I','D',0}; IXMLDOMNodeList *props; VARIANT var; HRESULT hr; @@ -331,7 +307,7 @@ static HRESULT GAMEUX_ParseGameDefinition(IXMLDOMElement *gamedef, struct GAMEUX TRACE("(%p, %p)\n", gamedef, game_data); - attr = SysAllocString(gameidW); + attr = SysAllocString(L"gameID"); if (!attr) return E_OUTOFMEMORY; @@ -397,9 +373,6 @@ static DWORD WINAPI GAMEUX_ParseGDFBinary(void *thread_param) { struct parse_gdf_thread_param *ctx = thread_param; struct GAMEUX_GAME_DATA *GameData = ctx->GameData; - static const WCHAR sRes[] = {'r','e','s',':','/','/',0}; - static const WCHAR sDATA[] = {'D','A','T','A',0}; - static const WCHAR sSlash[] = {'/',0}; HRESULT hr = S_OK; WCHAR sResourcePath[MAX_PATH]; @@ -412,11 +385,9 @@ static DWORD WINAPI GAMEUX_ParseGDFBinary(void *thread_param) TRACE("(%p)->sGDFBinaryPath = %s\n", GameData, debugstr_w(GameData->sGDFBinaryPath)); /* prepare path to GDF, using res:// prefix */ - lstrcpyW(sResourcePath, sRes); + lstrcpyW(sResourcePath, L"res://"); lstrcatW(sResourcePath, GameData->sGDFBinaryPath); - lstrcatW(sResourcePath, sSlash); - lstrcatW(sResourcePath, sDATA); - lstrcatW(sResourcePath, sSlash); + lstrcatW(sResourcePath, L"/DATA/"); lstrcatW(sResourcePath, ID_GDF_XML_STR); CoInitialize(NULL); @@ -662,9 +633,6 @@ static HRESULT GAMEUX_LoadRegistryString(HKEY hRootKey, * Helper function, updates stored data about game with given InstanceID */ static HRESULT GAMEUX_UpdateGame(LPGUID InstanceID) { - static const WCHAR sConfigGDFBinaryPath[] = {'C','o','n','f','i','g','G','D','F','B','i','n','a','r','y','P','a','t','h',0}; - static const WCHAR sConfigApplicationPath[] = {'C','o','n','f','i','g','A','p','p','l','i','c','a','t','i','o','n','P','a','t','h',0}; - HRESULT hr; GAME_INSTALL_SCOPE installScope; LPWSTR lpRegistryPath; @@ -697,11 +665,11 @@ static HRESULT GAMEUX_UpdateGame(LPGUID InstanceID) { /* first, read required data about game */ hr = GAMEUX_LoadRegistryString(HKEY_LOCAL_MACHINE, lpRegistryPath, - sConfigGDFBinaryPath, &lpGDFBinaryPath); + L"ConfigGDFBinaryPath", &lpGDFBinaryPath); if(SUCCEEDED(hr)) hr = GAMEUX_LoadRegistryString(HKEY_LOCAL_MACHINE, lpRegistryPath, - sConfigApplicationPath, &lpGameInstallDirectory); + L"ConfigApplicationPath", &lpGameInstallDirectory); /* now remove currently existing registry key */ if(SUCCEEDED(hr)) @@ -730,9 +698,6 @@ HRESULT GAMEUX_FindGameInstanceId( GAME_INSTALL_SCOPE installScope, GUID* pInstanceId) { - static const WCHAR sConfigGDFBinaryPath[] = - {'C','o','n','f','i','g','G','D','F','B','i','n','a','r','y','P','a','t','h',0}; - HRESULT hr; BOOL found = FALSE; LPWSTR lpRegistryPath = NULL; @@ -769,7 +734,7 @@ HRESULT GAMEUX_FindGameInstanceId( if(SUCCEEDED(hr)) hr = GAMEUX_LoadRegistryString(hRootKey, lpName, - sConfigGDFBinaryPath, &lpValue); + L"ConfigGDFBinaryPath", &lpValue); if(SUCCEEDED(hr)) { diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 7189261a4f6..1696ee1e76a 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -102,13 +102,6 @@ static HRESULT GAMEUX_createStatsDirectory(LPCWSTR lpFilePath) */ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) { - static const WCHAR sStatistics[] = {'S','t','a','t','i','s','t','i','c','s',0}; - static const WCHAR sCategory[] = {'C','a','t','e','g','o','r','y',0}; - static const WCHAR sIndex[] = {'I','n','d','e','x',0}; - static const WCHAR sStatistic[] = {'S','t','a','t','i','s','t','i','c',0}; - static const WCHAR sName[] = {'N','a','m','e',0}; - static const WCHAR sValue[] = {'V','a','l','u','e',0}; - HRESULT hr = S_OK; IXMLDOMDocument *document = NULL; IXMLDOMElement *root = NULL, *statisticsElement = NULL; @@ -131,7 +124,7 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) if(SUCCEEDED(hr)) { - bstrStatistics = SysAllocString(sStatistics); + bstrStatistics = SysAllocString(L"Statistics"); if(!bstrStatistics) hr = E_OUTOFMEMORY; } @@ -141,35 +134,35 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) if(SUCCEEDED(hr)) { - bstrCategory = SysAllocString(sCategory); + bstrCategory = SysAllocString(L"Category"); if(!bstrCategory) hr = E_OUTOFMEMORY; } if(SUCCEEDED(hr)) { - bstrIndex = SysAllocString(sIndex); + bstrIndex = SysAllocString(L"Index"); if(!bstrIndex) hr = E_OUTOFMEMORY; } if(SUCCEEDED(hr)) { - bstrStatistic = SysAllocString(sStatistic); + bstrStatistic = SysAllocString(L"Statistic"); if(!bstrStatistic) hr = E_OUTOFMEMORY; } if(SUCCEEDED(hr)) { - bstrName = SysAllocString(sName); + bstrName = SysAllocString(L"Name"); if(!bstrName) hr = E_OUTOFMEMORY; } if(SUCCEEDED(hr)) { - bstrValue = SysAllocString(sValue); + bstrValue = SysAllocString(L"Value"); if(!bstrValue) hr = E_OUTOFMEMORY; } @@ -318,24 +311,17 @@ static HRESULT GAMEUX_buildStatisticsFilePath( LPCWSTR lpApplicationId, LPWSTR lpStatisticsFile) { - static const WCHAR sBackslash[] = {'\\',0}; - static const WCHAR sStatisticsDir[] = {'\\','M','i','c','r','o','s','o','f','t', - '\\','W','i','n','d','o','w','s','\\','G','a','m','e','E','x','p', - 'l','o','r','e','r','\\','G','a','m','e','S','t','a','t','i','s', - 't','i','c','s','\\',0}; - static const WCHAR sDotGamestats[] = {'.','g','a','m','e','s','t','a','t','s',0}; - HRESULT hr; hr = SHGetFolderPathW(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, lpStatisticsFile); if(SUCCEEDED(hr)) { - lstrcatW(lpStatisticsFile, sStatisticsDir); + lstrcatW(lpStatisticsFile, L"\\Microsoft\\Windows\\GameExplorer\\GameStatistics\\"); lstrcatW(lpStatisticsFile, lpApplicationId); - lstrcatW(lpStatisticsFile, sBackslash); + lstrcatW(lpStatisticsFile, L"\\"); lstrcatW(lpStatisticsFile, lpApplicationId); - lstrcatW(lpStatisticsFile, sDotGamestats); + lstrcatW(lpStatisticsFile, L".gamestats"); } return hr; @@ -357,9 +343,6 @@ static HRESULT GAMEUX_getAppIdFromGDFPath( LPCWSTR GDFBinaryPath, LPWSTR lpApplicationId) { - static const WCHAR sApplicationId[] = - {'A','p','p','l','i','c','a','t','i','o','n','I','d',0}; - HRESULT hr; GAME_INSTALL_SCOPE installScope; GUID instanceId; @@ -393,8 +376,7 @@ static HRESULT GAMEUX_getAppIdFromGDFPath( hr = HRESULT_FROM_WIN32(RegOpenKeyExW(HKEY_LOCAL_MACHINE, lpRegistryPath, 0, KEY_READ | KEY_WOW64_64KEY, &hKey)); if(SUCCEEDED(hr)) { - hr = HRESULT_FROM_WIN32(RegGetValueW(hKey, - NULL, sApplicationId, RRF_RT_REG_SZ, + hr = HRESULT_FROM_WIN32(RegGetValueW(hKey, NULL, L"ApplicationId", RRF_RT_REG_SZ, NULL, lpApplicationId, &dwLength)); RegCloseKey(hKey); } @@ -416,13 +398,6 @@ static HRESULT GAMEUX_getAppIdFromGDFPath( */ static HRESULT GAMEUX_loadStatisticsFromFile(struct GAMEUX_STATS *data) { - static const WCHAR sStatistics[] = {'S','t','a','t','i','s','t','i','c','s',0}; - static const WCHAR sCategory[] = {'C','a','t','e','g','o','r','y',0}; - static const WCHAR sIndex[] = {'I','n','d','e','x',0}; - static const WCHAR sStatistic[] = {'S','t','a','t','i','s','t','i','c',0}; - static const WCHAR sName[] = {'N','a','m','e',0}; - static const WCHAR sValue[] = {'V','a','l','u','e',0}; - HRESULT hr = S_OK; IXMLDOMDocument *document = NULL; IXMLDOMElement *root = NULL, *categoryElement = NULL, *statisticElement = NULL; @@ -446,42 +421,42 @@ static HRESULT GAMEUX_loadStatisticsFromFile(struct GAMEUX_STATS *data) if(SUCCEEDED(hr)) { - bstrStatistics = SysAllocString(sStatistics); + bstrStatistics = SysAllocString(L"Statistics"); if(!bstrStatistics) hr = E_OUTOFMEMORY; } if(SUCCEEDED(hr)) { - bstrCategory = SysAllocString(sCategory); + bstrCategory = SysAllocString(L"Category"); if(!bstrCategory) hr = E_OUTOFMEMORY; } if(SUCCEEDED(hr)) { - bstrIndex = SysAllocString(sIndex); + bstrIndex = SysAllocString(L"Index"); if(!bstrIndex) hr = E_OUTOFMEMORY; } if(SUCCEEDED(hr)) { - bstrStatistic = SysAllocString(sStatistic); + bstrStatistic = SysAllocString(L"Statistic"); if(!bstrStatistic) hr = E_OUTOFMEMORY; } if(SUCCEEDED(hr)) { - bstrName = SysAllocString(sName); + bstrName = SysAllocString(L"Name"); if(!bstrName) hr = E_OUTOFMEMORY; } if(SUCCEEDED(hr)) { - bstrValue = SysAllocString(sValue); + bstrValue = SysAllocString(L"Value"); if(!bstrValue) hr = E_OUTOFMEMORY; } -- 2.26.3

1 0

[PATCH 1/2] winegstreamer: Don't invert the proportion twice in wg_parser_stream_notify_qos().
by Zebediah Figura 16 Mar '21

16 Mar '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/wg_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 85909f1c8f8..801fc096302 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -694,7 +694,7 @@ static void CDECL wg_parser_stream_notify_qos(struct wg_parser_stream *stream, GstEvent *event; if (!(event = gst_event_new_qos(underflow ? GST_QOS_TYPE_UNDERFLOW : GST_QOS_TYPE_OVERFLOW, - 1000.0 / proportion, diff * 100, timestamp * 100))) + proportion, diff * 100, timestamp * 100))) ERR("Failed to create QOS event.\n"); gst_pad_push_event(stream->my_sink, event); } -- 2.20.1

1 1

[PATCH] ntdll: Don't call possibly deadly DbgUiGetThreadDebugObject.
by Rémi Bernon 16 Mar '21

16 Mar '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Call of Duty Infinite Warfare for instance. dlls/ntdll/loader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index a7e6d712df1..a982bf9bc2e 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3221,7 +3221,8 @@ void WINAPI LdrShutdownThread(void) RtlReleasePebLock(); RtlLeaveCriticalSection( &loader_section ); - if (DbgUiGetThreadDebugObject()) NtClose( DbgUiGetThreadDebugObject() ); + /* don't call DbgUiGetThreadDebugObject as some apps hook it and terminate if called */ + if (NtCurrentTeb()->DbgSsReserved[1]) NtClose( NtCurrentTeb()->DbgSsReserved[1] ); RtlFreeThreadActivationContextStack(); } -- 2.30.2

1 0

[PATCH 7/7] mshtml: Rename init_dispex_with_compat_mode to init_dispatch.
by Jacek Caban 16 Mar '21

16 Mar '21

1 0