November 2020 - Wine-devel - list.winehq.org

[PATCH 5/5] riched20: Pass paragraph ptrs to the para marking function.
by Huw Davies 04 Nov '20

04 Nov '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 4 ++-- dlls/riched20/editor.h | 2 +- dlls/riched20/paint.c | 2 +- dlls/riched20/para.c | 16 ++++++++-------- dlls/riched20/style.c | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 41906d28e4c..b27bab48738 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4126,7 +4126,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_SetDefaultCharFormat(editor, &fmt); ME_CommitUndo(editor); - ME_MarkAllForWrapping(editor); + editor_mark_rewrap_all( editor ); ME_WrapMarkedParagraphs(editor); ME_UpdateScrollBar(editor); if (bRepaint) @@ -4771,7 +4771,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_SetDefaultFormatRect(editor); editor->bDefaultFormatRect = TRUE; } - ME_MarkAllForWrapping(editor); + editor_mark_rewrap_all( editor ); ME_WrapMarkedParagraphs(editor); ME_UpdateScrollBar(editor); if (msg != EM_SETRECTNP) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 05a6a7ee37f..24e750be1de 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -204,13 +204,13 @@ void ME_SendRequestResize(ME_TextEditor *editor, BOOL force) DECLSPEC_HIDDEN; /* para.c */ void editor_get_selection_paras(ME_TextEditor *editor, ME_Paragraph **para, ME_Paragraph **para_end ) DECLSPEC_HIDDEN; void editor_get_selection_para_fmt( ME_TextEditor *editor, PARAFORMAT2 *fmt ) DECLSPEC_HIDDEN; +void editor_mark_rewrap_all( ME_TextEditor *editor ) DECLSPEC_HIDDEN; void editor_set_default_para_fmt(ME_TextEditor *editor, PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN; BOOL editor_set_selection_para_fmt( ME_TextEditor *editor, const PARAFORMAT2 *fmt ) DECLSPEC_HIDDEN; ME_DisplayItem *ME_GetParagraph(ME_DisplayItem *run) DECLSPEC_HIDDEN; void ME_MakeFirstParagraph(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_DumpParaStyle(ME_Paragraph *s) DECLSPEC_HIDDEN; void ME_DumpParaStyleToBuf(const PARAFORMAT2 *pFmt, char buf[2048]) DECLSPEC_HIDDEN; -void ME_MarkAllForWrapping(ME_TextEditor *editor) DECLSPEC_HIDDEN; int get_total_width(ME_TextEditor *editor) DECLSPEC_HIDDEN; ME_Cell *para_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; void para_destroy( ME_TextEditor *editor, ME_Paragraph *item ) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index d15c47b72aa..6228c760295 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -138,7 +138,7 @@ ME_RewrapRepaint(ME_TextEditor *editor) /* RewrapRepaint should be called whenever the control has changed in * looks, but not content. Like resizing. */ - ME_MarkAllForWrapping(editor); + editor_mark_rewrap_all( editor ); ME_WrapMarkedParagraphs(editor); ME_UpdateScrollBar(editor); ME_Repaint(editor); diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 4348530bbdb..e7c3c6934b9 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -225,18 +225,18 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) ME_DestroyContext(&c); } -static void ME_MarkForWrapping(ME_TextEditor *editor, ME_DisplayItem *first, const ME_DisplayItem *last) +static void para_mark_rewrap_paras( ME_TextEditor *editor, ME_Paragraph *first, const ME_Paragraph *end ) { - while(first != last) - { - para_mark_rewrap( editor, &first->member.para ); - first = first->member.para.next_para; - } + while (first != end) + { + para_mark_rewrap( editor, first ); + first = para_next( first ); + } } -void ME_MarkAllForWrapping(ME_TextEditor *editor) +void editor_mark_rewrap_all( ME_TextEditor *editor ) { - ME_MarkForWrapping(editor, editor->pBuffer->pFirst->member.para.next_para, editor->pBuffer->pLast); + para_mark_rewrap_paras( editor, editor_first_para( editor ), editor_end_para( editor ) ); } static void table_update_flags( ME_Paragraph *para ) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index fbbe29dce14..95d3d3b6b29 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -536,5 +536,5 @@ void ME_SetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *mod) } ScriptFreeCache( &def->script_cache ); ME_ReleaseStyle( style ); - ME_MarkAllForWrapping( editor ); + editor_mark_rewrap_all( editor ); } -- 2.23.0

1 0

[PATCH 4/5] riched20: Use para_in_table() instead of IsInTable().
by Huw Davies 04 Nov '20

04 Nov '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.h | 1 - dlls/riched20/table.c | 17 ++--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e884cbee2f3..05a6a7ee37f 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -289,7 +289,6 @@ ME_Paragraph *editor_end_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; ME_Paragraph *editor_first_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; /* table.c */ -BOOL ME_IsInTable(ME_DisplayItem *pItem) DECLSPEC_HIDDEN; ME_Paragraph *cell_end_para( ME_Cell *cell ) DECLSPEC_HIDDEN; ME_Paragraph *cell_first_para( ME_Cell *cell ) DECLSPEC_HIDDEN; ME_Cell *cell_next( ME_Cell *cell ) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index e08876d29bd..9d0d24fa1c3 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -212,19 +212,6 @@ ME_Paragraph *cell_end_para( ME_Cell *cell ) return &ME_FindItemBack( cell_get_di( next ), diParagraph )->member.para; } -BOOL ME_IsInTable(ME_DisplayItem *pItem) -{ - PARAFORMAT2 *pFmt; - if (!pItem) - return FALSE; - if (pItem->type == diRun) - pItem = ME_GetParagraph(pItem); - if (pItem->type != diParagraph) - return FALSE; - pFmt = &pItem->member.para.fmt; - return pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE; -} - /* Table rows should either be deleted completely or not at all. */ void table_protect_partial_deletion( ME_TextEditor *editor, ME_Cursor *c, int *num_chars ) { @@ -504,7 +491,7 @@ void table_handle_tab( ME_TextEditor *editor, BOOL selected_row ) } if (!editor->bEmulateVersion10) /* v4.1 */ { - if (!ME_IsInTable(toCursor.pRun)) + if (!para_in_table( &toCursor.pPara->member.para )) { editor->pCursors[0] = toCursor; editor->pCursors[1] = toCursor; @@ -513,7 +500,7 @@ void table_handle_tab( ME_TextEditor *editor, BOOL selected_row ) } else /* v1.0 - 3.0 */ { - if (!ME_IsInTable(fromCursor.pRun)) + if (!para_in_table( &fromCursor.pPara->member.para) ) { editor->pCursors[0] = fromCursor; editor->pCursors[1] = fromCursor; -- 2.23.0

1 0

[PATCH 3/5] riched20: Return a row ptr from the row creation function.
by Huw Davies 04 Nov '20

04 Nov '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/wrap.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 75bbb2c05c5..5fc20dbf83b 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -173,14 +173,14 @@ static int find_split_point( ME_Context *c, int cx, ME_Run *run ) return ME_CharFromPointContext( c, cx, run, FALSE, FALSE ); } -static ME_DisplayItem *ME_MakeRow(int height, int baseline, int width) +static ME_Row *row_create( int height, int baseline, int width ) { ME_DisplayItem *item = ME_MakeDI(diStartRow); item->member.row.nHeight = height; item->member.row.nBaseline = baseline; item->member.row.nWidth = width; - return item; + return &item->member.row; } static void ME_BeginRow(ME_WrapContext *wc) @@ -284,7 +284,7 @@ static void layout_row( ME_Run *start, ME_Run *last ) static void ME_InsertRowStart( ME_WrapContext *wc, ME_Run *last ) { ME_Run *run; - ME_DisplayItem *row; + ME_Row *row; BOOL bSkippingSpaces = TRUE; int ascent = 0, descent = 0, width = 0, shift = 0, align = 0; @@ -328,7 +328,7 @@ static void ME_InsertRowStart( ME_WrapContext *wc, ME_Run *last ) } wc->para->nWidth = max( wc->para->nWidth, width ); - row = ME_MakeRow( ascent + descent, ascent, width ); + row = row_create( ascent + descent, ascent, width ); if (wc->context->editor->bEmulateVersion10 && /* v1.0 - 3.0 */ (wc->para->fmt.dwMask & PFM_TABLE) && (wc->para->fmt.wEffects & PFE_TABLE)) { @@ -336,11 +336,11 @@ static void ME_InsertRowStart( ME_WrapContext *wc, ME_Run *last ) * back to where it should be. */ wc->pt.y--; /* The height of the row is increased by the borders. */ - row->member.row.nHeight += 2; + row->nHeight += 2; } - row->member.row.pt = wc->pt; - row->member.row.nLMargin = (!wc->nRow ? wc->nFirstMargin : wc->nLeftMargin); - row->member.row.nRMargin = wc->nRightMargin; + row->pt = wc->pt; + row->nLMargin = (!wc->nRow ? wc->nFirstMargin : wc->nLeftMargin); + row->nRMargin = wc->nRightMargin; assert(wc->para->fmt.dwMask & PFM_ALIGNMENT); align = wc->para->fmt.wAlignment; if (align == PFA_CENTER) shift = max((wc->nAvailWidth-width)/2, 0); @@ -348,23 +348,23 @@ static void ME_InsertRowStart( ME_WrapContext *wc, ME_Run *last ) if (wc->para->nFlags & MEPF_COMPLEX) layout_row( wc->pRowStart, last ); - row->member.row.pt.x = row->member.row.nLMargin + shift; + row->pt.x = row->nLMargin + shift; for (run = wc->pRowStart; run; run = run_next( run )) { - run->pt.x += row->member.row.nLMargin+shift; + run->pt.x += row->nLMargin + shift; if (run == last) break; } if (wc->nRow == 0 && wc->para->fmt.wNumbering) { wc->para->para_num.pt.x = wc->nParaNumOffset + shift; - wc->para->para_num.pt.y = wc->pt.y + row->member.row.nBaseline; + wc->para->para_num.pt.y = wc->pt.y + row->nBaseline; } - ME_InsertBefore( run_get_di( wc->pRowStart ), row ); + ME_InsertBefore( run_get_di( wc->pRowStart ), row_get_di( row ) ); wc->nRow++; - wc->pt.y += row->member.row.nHeight; + wc->pt.y += row->nHeight; ME_BeginRow( wc ); } -- 2.23.0

1 0

[PATCH 2/5] riched20: Use a cell helper in the split paragraph undo function.
by Huw Davies 04 Nov '20

04 Nov '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/undo.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 884f87b56fd..d6665bfd104 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -399,9 +399,8 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) new_para->border = undo->u.split_para.border; if (paraFlags) { - ME_DisplayItem *pCell = new_para->pCell; - pCell->member.cell.nRightBoundary = undo->u.split_para.cell_right_boundary; - pCell->member.cell.border = undo->u.split_para.cell_border; + para_cell( new_para )->nRightBoundary = undo->u.split_para.cell_right_boundary; + para_cell( new_para )->border = undo->u.split_para.cell_border; } break; } -- 2.23.0

1 0

[PATCH 1/5] riched20: Use a paragraph ptr in the rtf writer function.
by Huw Davies 04 Nov '20

04 Nov '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/writer.c | 58 +++++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 20 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 98ae352ab7b..72242194127 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -995,7 +995,7 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, const ME_Cursor *start, int nChars, int dwFormat) { ME_Cursor cursor = *start; - ME_DisplayItem *prev_para = NULL; + ME_Paragraph *prev_para = NULL; ME_Cursor endCur = cursor; ME_MoveCursorChars(editor, &endCur, nChars, TRUE); @@ -1019,64 +1019,82 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, /* TODO: section formatting properties */ - do { - if (cursor.pPara != prev_para) + do + { + if (&cursor.pPara->member.para != prev_para) { - prev_para = cursor.pPara; + prev_para = &cursor.pPara->member.para; if (!stream_out_para_props( editor, pStream, &cursor.pPara->member.para )) return FALSE; } if (cursor.pRun == endCur.pRun && !endCur.nOffset) break; + TRACE("flags %xh\n", cursor.pRun->member.run.nFlags); /* TODO: emit embedded objects */ - if (cursor.pPara->member.para.nFlags & (MEPF_ROWSTART|MEPF_ROWEND)) + if (cursor.pPara->member.para.nFlags & (MEPF_ROWSTART | MEPF_ROWEND)) continue; - if (cursor.pRun->member.run.nFlags & MERF_GRAPHICS) { + if (cursor.pRun->member.run.nFlags & MERF_GRAPHICS) + { if (!stream_out_graphics(editor, pStream, &cursor.pRun->member.run)) return FALSE; - } else if (cursor.pRun->member.run.nFlags & MERF_TAB) { + } + else if (cursor.pRun->member.run.nFlags & MERF_TAB) + { if (editor->bEmulateVersion10 && /* v1.0 - 3.0 */ - cursor.pPara->member.para.fmt.dwMask & PFM_TABLE && - cursor.pPara->member.para.fmt.wEffects & PFE_TABLE) + para_in_table( &cursor.pPara->member.para )) { if (!ME_StreamOutPrint(pStream, "\\cell ")) return FALSE; - } else { + } + else + { if (!ME_StreamOutPrint(pStream, "\\tab ")) return FALSE; } - } else if (cursor.pRun->member.run.nFlags & MERF_ENDCELL) { - if (pStream->nNestingLevel > 1) { + } + else if (cursor.pRun->member.run.nFlags & MERF_ENDCELL) + { + if (pStream->nNestingLevel > 1) + { if (!ME_StreamOutPrint(pStream, "\\nestcell ")) return FALSE; - } else { + } + else + { if (!ME_StreamOutPrint(pStream, "\\cell ")) return FALSE; } nChars--; - } else if (cursor.pRun->member.run.nFlags & MERF_ENDPARA) { + } + else if (cursor.pRun->member.run.nFlags & MERF_ENDPARA) + { if (!ME_StreamOutRTFCharProps(pStream, &cursor.pRun->member.run.style->fmt)) return FALSE; - if (cursor.pPara->member.para.fmt.dwMask & PFM_TABLE && - cursor.pPara->member.para.fmt.wEffects & PFE_TABLE && - !(cursor.pPara->member.para.nFlags & (MEPF_ROWSTART|MEPF_ROWEND|MEPF_CELL))) + if (para_in_table( &cursor.pPara->member.para) && + !(cursor.pPara->member.para.nFlags & (MEPF_ROWSTART | MEPF_ROWEND | MEPF_CELL))) { if (!ME_StreamOutPrint(pStream, "\\row\r\n")) return FALSE; - } else { + } + else + { if (!ME_StreamOutPrint(pStream, "\\par\r\n")) return FALSE; } /* Skip as many characters as required by current line break */ nChars = max(0, nChars - cursor.pRun->member.run.len); - } else if (cursor.pRun->member.run.nFlags & MERF_ENDROW) { + } + else if (cursor.pRun->member.run.nFlags & MERF_ENDROW) + { if (!ME_StreamOutPrint(pStream, "\\line\r\n")) return FALSE; nChars--; - } else { + } + else + { int nEnd; TRACE("style %p\n", cursor.pRun->member.run.style); -- 2.23.0

1 0

[PATCH 1/3] winemac: Update the stored display settings immediately.
by Matteo Bruni 04 Nov '20

04 Nov '20

Instead of after sending the WM_MACDRV_UPDATE_DESKTOP_RECT message. Specifically ddraw reacts to the followup messages and expects to get the new display rects inside the message handler. Fixes commit b8415e0310595d239b5bcef4e74efd1f0972fac0. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/winemac.drv/display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index f6390becea7..6706c88341c 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -996,6 +996,8 @@ better: size_t width = CGDisplayModeGetWidth(best_display_mode); size_t height = CGDisplayModeGetHeight(best_display_mode); + macdrv_init_display_devices(TRUE); + if (best_is_original && retina_enabled) { width *= 2; @@ -1005,8 +1007,6 @@ better: SendMessageW(GetDesktopWindow(), WM_MACDRV_UPDATE_DESKTOP_RECT, mode_bpp, MAKELPARAM(width, height)); ret = DISP_CHANGE_SUCCESSFUL; - - macdrv_init_display_devices(TRUE); } else { -- 2.26.2

4 5

[PATCH 1/2] winebrowser: Prefix an invalid URL with 'http://' before opening with a browser.
by Brendan Shanks 03 Nov '20

03 Nov '20

Fixes usage like 'winebrowser winehq.org' when xdg-open or macOS 'open' is used. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50094 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- programs/winebrowser/main.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 9cd6812d032..7895afae842 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -118,7 +118,7 @@ static LSTATUS get_commands( HKEY key, const WCHAR *value, WCHAR *buffer, DWORD return res; } -static int open_http_url( const WCHAR *url ) +static int open_http_url( const WCHAR *url, BOOL url_valid ) { #ifdef __APPLE__ static const WCHAR defaultbrowsers[] = @@ -136,9 +136,13 @@ static int open_http_url( const WCHAR *url ) #endif static const WCHAR browsersW[] = {'B','r','o','w','s','e','r','s',0}; + static const WCHAR httpW[] = + {'h','t','t','p',':','/','/',0}; WCHAR browsers[256]; + WCHAR *url_prefixed; HKEY key; + int ret; LONG r; /* @@ Wine registry key: HKCU\Software\Wine\WineBrowser */ @@ -150,7 +154,27 @@ static int open_http_url( const WCHAR *url ) if (r != ERROR_SUCCESS) memcpy( browsers, defaultbrowsers, sizeof(defaultbrowsers) ); - return launch_app( browsers, url ); + /* If url parsing failed, prefix url with 'http://'. Required by xdg-open and macOS open. */ + if (url_valid) + { + ret = launch_app( browsers, url ); + } + else + { + url_prefixed = HeapAlloc( GetProcessHeap(), 0, (ARRAY_SIZE(httpW) + strlenW( url )) * sizeof(WCHAR) ); + if (!url_prefixed) + { + WINE_ERR("Out of memory\n"); + return 1; + } + + strcpyW( url_prefixed, httpW ); + strcatW( url_prefixed, url ); + + ret = launch_app( browsers, url_prefixed ); + HeapFree( GetProcessHeap(), 0, url_prefixed ); + } + return ret; } static int open_mailto_url( const WCHAR *url ) @@ -448,8 +472,8 @@ int __cdecl wmain(int argc, WCHAR *argv[]) hres = CreateUri(url, Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME|Uri_CREATE_FILE_USE_DOS_PATH, 0, &uri); if(FAILED(hres)) { - WINE_ERR("Failed to parse URL\n"); - ret = open_http_url(url); + WINE_ERR("Failed to parse URL %s, treating as HTTP\n", wine_dbgstr_w(url)); + ret = open_http_url(url, FALSE); HeapFree(GetProcessHeap(), 0, ddeString); return ret; } @@ -476,7 +500,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) ret = open_mailto_url(display_uri); else /* let the browser decide how to handle the given url */ - ret = open_http_url(display_uri); + ret = open_http_url(display_uri, TRUE); SysFreeString(display_uri); return ret; -- 2.26.2

1 1

[PATCH 2/2] svchost: Inline a simple string.
by Michael Stefaniuc 03 Nov '20

03 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/svchost/svchost.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/svchost/svchost.c b/programs/svchost/svchost.c index 0daaa6ebf47..603deef1abd 100644 --- a/programs/svchost/svchost.c +++ b/programs/svchost/svchost.c @@ -37,8 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(svchost); static const WCHAR service_reg_path[] = L"System\\CurrentControlSet\\Services"; static const WCHAR svchost_path[] = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Svchost"; -static const CHAR service_main[] = "ServiceMain"; - /* Allocate and initialize a WSTR containing the queried value */ static LPWSTR GetRegValue(HKEY service_key, const WCHAR *value_name) { @@ -162,14 +160,14 @@ static BOOL AddServiceElem(LPWSTR service_name, } /* Look for alternate to default ServiceMain entry point */ - ret = RegQueryValueExA(service_hkey, service_main, NULL, NULL, NULL, &reg_size); + ret = RegQueryValueExA(service_hkey, "ServiceMain", NULL, NULL, NULL, &reg_size); if (ret == ERROR_SUCCESS) { /* Add space for potentially missing NULL terminator, allocate, and * fill with the registry value */ size = reg_size + 1; dll_service_main = HeapAlloc(GetProcessHeap(), 0, size); - ret = RegQueryValueExA(service_hkey, service_main, NULL, NULL, + ret = RegQueryValueExA(service_hkey, "ServiceMain", NULL, NULL, (LPBYTE)dll_service_main, &reg_size); if (ret != ERROR_SUCCESS) { @@ -196,7 +194,7 @@ static BOOL AddServiceElem(LPWSTR service_name, else { service_main_func = - (LPSERVICE_MAIN_FUNCTIONW) GetProcAddress(library, service_main); + (LPSERVICE_MAIN_FUNCTIONW) GetProcAddress(library, "ServiceMain"); } if (!service_main_func) { -- 2.26.2

1 0

[PATCH 1/2] svchost: Use wide-char string literals.
by Michael Stefaniuc 03 Nov '20

03 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/svchost/svchost.c | 46 +++++++++----------------------------- 1 file changed, 11 insertions(+), 35 deletions(-) diff --git a/programs/svchost/svchost.c b/programs/svchost/svchost.c index 30c35616990..0daaa6ebf47 100644 --- a/programs/svchost/svchost.c +++ b/programs/svchost/svchost.c @@ -34,30 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(svchost); -/* Static strings used throughout svchost */ -static const WCHAR kd[] = {'-','k',0}; - -static const WCHAR ks[] = {'/','k',0}; - -static const WCHAR reg_separator[] = {'\\',0}; - -static const WCHAR service_reg_path[] = { - 'S','y','s','t','e','m', - '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', - '\\','S','e','r','v','i','c','e','s',0}; - -static const WCHAR parameters[] = { - 'P','a','r','a','m','e','t','e','r','s',0}; - -static const WCHAR service_dll[] = { - 'S','e','r','v','i','c','e','D','l','l',0}; - -static const WCHAR svchost_path[] = { - 'S','o','f','t','w','a','r','e', - '\\','M','i','c','r','o','s','o','f','t', - '\\','W','i','n','d','o','w','s',' ','N','T', - '\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n', - '\\','S','v','c','h','o','s','t',0}; +static const WCHAR service_reg_path[] = L"System\\CurrentControlSet\\Services"; +static const WCHAR svchost_path[] = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Svchost"; static const CHAR service_main[] = "ServiceMain"; @@ -145,15 +123,14 @@ static BOOL AddServiceElem(LPWSTR service_name, WINE_TRACE("Adding element for %s\n", wine_dbgstr_w(service_name)); /* Construct registry path to the service's parameters key */ - size = (lstrlenW(service_reg_path) + lstrlenW(reg_separator) + - lstrlenW(service_name) + lstrlenW(reg_separator) + - lstrlenW(parameters) + 1); + size = lstrlenW(service_reg_path) + lstrlenW(L"\\") + lstrlenW(service_name) + lstrlenW(L"\\") + + lstrlenW(L"Parameters") + 1; service_param_key = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); lstrcpyW(service_param_key, service_reg_path); - lstrcatW(service_param_key, reg_separator); + lstrcatW(service_param_key, L"\\"); lstrcatW(service_param_key, service_name); - lstrcatW(service_param_key, reg_separator); - lstrcatW(service_param_key, parameters); + lstrcatW(service_param_key, L"\\"); + lstrcatW(service_param_key, L"Parameters"); service_param_key[size - 1] = '\0'; ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, service_param_key, 0, KEY_READ, &service_hkey); @@ -165,11 +142,11 @@ static BOOL AddServiceElem(LPWSTR service_name, } /* Find DLL associate with service from key */ - dll_name_short = GetRegValue(service_hkey, service_dll); + dll_name_short = GetRegValue(service_hkey, L"ServiceDll"); if (!dll_name_short) { - WINE_ERR("cannot find registry value %s for service %s\n", - wine_dbgstr_w(service_dll), wine_dbgstr_w(service_name)); + WINE_ERR("cannot find registry value ServiceDll for service %s\n", + wine_dbgstr_w(service_name)); RegCloseKey(service_hkey); goto cleanup; } @@ -340,8 +317,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) for (option_index = 1; option_index < argc; option_index++) { - if (lstrcmpiW(argv[option_index], ks) == 0 || - lstrcmpiW(argv[option_index], kd) == 0) + if (lstrcmpiW(argv[option_index], L"/k") == 0 || lstrcmpiW(argv[option_index], L"-k") == 0) { ++option_index; if (option_index >= argc) -- 2.26.2

1 0

[PATCH 2/2] winedevice: Use wide-char string literals.
by Michael Stefaniuc 03 Nov '20

03 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winedevice/device.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 7bada000520..c591d743337 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -32,12 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winedevice); -static const WCHAR servicesW[] = {'\\','R','e','g','i','s','t','r','y', - '\\','M','a','c','h','i','n','e', - '\\','S','y','s','t','e','m', - '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', - '\\','S','e','r','v','i','c','e','s', - '\\',0}; +static const WCHAR servicesW[] = L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"; extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ); -- 2.26.2

1 0