October 2020 - Wine-Commits

Huw Davies : riched20: Pass a row ptr to the cursor from row function.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: b47e5d0d232b5cc407a95351c99176fb2e3c61e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b47e5d0d232b5cc407a95351… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 26 08:46:38 2020 +0000 riched20: Pass a row ptr to the cursor from row function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 66 ++++++++++++++++++++++++-------------------------- dlls/riched20/editor.h | 7 ++++++ dlls/riched20/row.c | 29 ++++++++++++++++++++++ 3 files changed, 68 insertions(+), 34 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 4da6898bef8..0c5f221a7c4 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -903,40 +903,39 @@ static ME_Paragraph *pixel_pos_in_table_row( int x, int y, ME_Paragraph *para ) return para; } - -static BOOL cursor_from_row( ME_TextEditor *editor, ME_DisplayItem *pRow, - int x, ME_Cursor *cursor ) +static BOOL row_cursor( ME_TextEditor *editor, ME_Row *row, int x, + ME_Cursor *cursor ) { - ME_DisplayItem *pNext, *pLastRun; - ME_Row *row = &pRow->member.row; - BOOL exact = TRUE; + ME_Run *run, *last; + BOOL exact = TRUE; - if (x < row->pt.x) - { - x = row->pt.x; - exact = FALSE; - } - pNext = ME_FindItemFwd(pRow, diRunOrStartRow); - assert(pNext->type == diRun); - cursor->nOffset = 0; - do { - int run_x = pNext->member.run.pt.x; - int width = pNext->member.run.nWidth; - - if (x >= run_x && x < run_x+width) + if (x < row->pt.x) { - cursor->nOffset = ME_CharFromPoint(editor, x-run_x, &pNext->member.run, TRUE, TRUE); - cursor->pRun = pNext; - cursor->pPara = ME_GetParagraph( cursor->pRun ); - return exact; + x = row->pt.x; + exact = FALSE; } - pLastRun = pNext; - pNext = ME_FindItemFwd(pNext, diRunOrStartRow); - } while(pNext && pNext->type == diRun); - cursor->pRun = pLastRun; - cursor->pPara = ME_GetParagraph( cursor->pRun ); - return FALSE; + run = row_first_run( row ); + assert( run ); + cursor->nOffset = 0; + do + { + if (x >= run->pt.x && x < run->pt.x + run->nWidth) + { + cursor->nOffset = ME_CharFromPoint( editor, x - run->pt.x, run, TRUE, TRUE ); + cursor->pRun = run_get_di( run ); + cursor->pPara = para_get_di( run->para ); + return exact; + } + last = run; + run = row_next_run( row, run ); + } while (run); + + run = last; + + cursor->pRun = run_get_di( run ); + cursor->pPara = para_get_di( run->para ); + return FALSE; } /* Finds the run and offset from the pixel position. @@ -995,8 +994,7 @@ static BOOL cursor_from_virtual_coords( ME_TextEditor *editor, int x, int y, row = ME_FindItemBack( para_get_di( para ), diStartRow); } - - if (row) return cursor_from_row( editor, row, x, result ) && isExact; + if (row) return row_cursor( editor, &row->member.row, x, result ) && isExact; ME_SetCursorToEnd(editor, result, TRUE); return FALSE; @@ -1279,7 +1277,7 @@ ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs, BOOL /* row not found - ignore */ return; } - cursor_from_row( editor, pItem, x, pCursor ); + row_cursor( editor, &pItem->member.row, x, pCursor ); assert(pCursor->pRun); assert(pCursor->pRun->type == diRun); } @@ -1329,7 +1327,7 @@ static void ME_ArrowPageUp(ME_TextEditor *editor, ME_Cursor *pCursor) pLast = p; } while(1); - cursor_from_row( editor, pLast, x, pCursor ); + row_cursor( editor, &pLast->member.row, x, pCursor ); } assert(pCursor->pRun); assert(pCursor->pRun->type == diRun); @@ -1383,7 +1381,7 @@ static void ME_ArrowPageDown(ME_TextEditor *editor, ME_Cursor *pCursor) pLast = p; } while(1); - cursor_from_row( editor, pLast, x, pCursor ); + row_cursor( editor, &pLast->member.row, x, pCursor ); } assert(pCursor->pRun); assert(pCursor->pRun->type == diRun); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 68c54c2b328..cf5e2d84fc2 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -111,10 +111,17 @@ int ME_ReverseFindNonWhitespaceV(const ME_String *s, int nVChar) DECLSPEC_HIDDEN int ME_ReverseFindWhitespaceV(const ME_String *s, int nVChar) DECLSPEC_HIDDEN; /* row.c */ +ME_Run *row_first_run( ME_Row *row ) DECLSPEC_HIDDEN; +ME_Row *row_next( ME_Row *row ) DECLSPEC_HIDDEN; +ME_Run *row_next_run( ME_Row *row, ME_Run *run ) DECLSPEC_HIDDEN; ME_DisplayItem *ME_RowStart(ME_DisplayItem *item) DECLSPEC_HIDDEN; /* ME_DisplayItem *ME_RowEnd(ME_DisplayItem *item); */ ME_DisplayItem *ME_FindRowWithNumber(ME_TextEditor *editor, int nRow) DECLSPEC_HIDDEN; int ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs) DECLSPEC_HIDDEN; +static inline ME_DisplayItem *row_get_di( ME_Row *row ) +{ + return (ME_DisplayItem *)((ptrdiff_t)row - offsetof(ME_DisplayItem, member)); +} /* run.c */ void cursor_from_char_ofs( ME_TextEditor *editor, int char_ofs, ME_Cursor *cursor ) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/row.c b/dlls/riched20/row.c index 1bf153f6ca9..a149231dcbe 100644 --- a/dlls/riched20/row.c +++ b/dlls/riched20/row.c @@ -24,6 +24,35 @@ #include "editor.h" +ME_Row *row_next( ME_Row *row ) +{ + ME_DisplayItem *item; + + item = ME_FindItemFwd( row_get_di( row ), diStartRow ); + if (!item) return NULL; + return &item->member.row; +} + +ME_Run *row_first_run( ME_Row *row ) +{ + ME_DisplayItem *item; + + item = ME_FindItemFwd( row_get_di( row ), diRunOrStartRow ); + assert( item->type == diRun ); + return &item->member.run; +} + +ME_Run *row_next_run( ME_Row *row, ME_Run *run ) +{ + ME_DisplayItem *item; + + assert( row == &ME_FindItemBack( run_get_di( run ), diStartRow )->member.row ); + + item = ME_FindItemFwd( run_get_di( run ), diRunOrStartRow ); + if (!item || item->type == diStartRow) return NULL; + return &item->member.run; +} + /* I'm sure these functions would simplify some code in caret ops etc, * I just didn't remember them when I wrote that code */

1 0

Michael Stefaniuc : wmiutils: Use wide-char string literals.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 20971961f7ffb38abbf3cc4f6f63e271edd4f828 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20971961f7ffb38abbf3cc4f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Oct 25 23:40:41 2020 +0100 wmiutils: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmiutils/statuscode.c | 8 +-- dlls/wmiutils/tests/path.c | 141 +++++++++++++++------------------------------ 2 files changed, 50 insertions(+), 99 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=20971961f7ffb38abbf3…

1 0

Vitaly Lipatov : ncrypt: Add NCryptIsKeyHandle stub.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 98c67d8679b144e8ef4d72e81d8c8c1af2414e2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=98c67d8679b144e8ef4d72e8… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sat Oct 24 15:34:08 2020 +0300 ncrypt: Add NCryptIsKeyHandle stub. Signed-off-by: Vitaly Lipatov <lav(a)etersoft.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 6 ++++++ dlls/ncrypt/ncrypt.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index c0cc05c43ca..a8dda3c54a0 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -132,6 +132,12 @@ SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const W return NTE_NOT_SUPPORTED; } +BOOL WINAPI NCryptIsKeyHandle(NCRYPT_KEY_HANDLE hKey) +{ + FIXME("(0x%lx): stub\n", hKey); + return FALSE; +} + SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, const WCHAR *name, DWORD keyspec, DWORD flags) { diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index 2b5a4fca420..0e92609790c 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -78,7 +78,7 @@ @ stub NCryptGetProtectionDescriptorInfo @ stdcall NCryptImportKey(long long wstr ptr ptr ptr long long) @ stub NCryptIsAlgSupported(long wstr long) -@ stub NCryptIsKeyHandle +@ stdcall NCryptIsKeyHandle(long) @ stub NCryptKeyDerivation @ stub NCryptNotifyChangeKey @ stdcall NCryptOpenKey(long ptr wstr long long)

1 0

Olivier F. R. Dierick : windowscodecs: Include system header png.h before Windows headers.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 195d0b5308580a0584296c909c2d76b799035423 URL: https://source.winehq.org/git/wine.git/?a=commit;h=195d0b5308580a0584296c90… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Sat Oct 24 23:10:52 2020 +0200 windowscodecs: Include system header png.h before Windows headers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50050 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c index 201f5c700d3..93ff6e056ec 100644 --- a/dlls/windowscodecs/libpng.c +++ b/dlls/windowscodecs/libpng.c @@ -25,6 +25,9 @@ #include "wine/port.h" #include <stdarg.h> +#ifdef SONAME_LIBPNG +#include <png.h> +#endif #define NONAMELESSUNION @@ -43,8 +46,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); #ifdef SONAME_LIBPNG -#include <png.h> - static void *libpng_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(png_create_info_struct);

1 0

Huw Davies : riched20: Use row helpers for Home/End key handling.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: f45408b24ac6745b9a917f82abeb42d9ec530112 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f45408b24ac6745b9a917f82… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 26 08:46:41 2020 +0000 riched20: Use row helpers for Home/End key handling. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 650c065dbe0..49ae1b2769a 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1375,19 +1375,11 @@ static void ME_ArrowPageDown(ME_TextEditor *editor, ME_Cursor *pCursor) assert(pCursor->pRun->type == diRun); } -static void ME_ArrowHome(ME_TextEditor *editor, ME_Cursor *pCursor) +static void ME_ArrowHome( ME_TextEditor *editor, ME_Cursor *cursor ) { - ME_DisplayItem *pRow = ME_FindItemBack(pCursor->pRun, diStartRow); - if (pRow) { - ME_DisplayItem *pRun; - - pRun = ME_FindItemFwd(pRow, diRun); - if (pRun) { - pCursor->pRun = pRun; - assert(pCursor->pPara == ME_GetParagraph(pRun)); - pCursor->nOffset = 0; - } - } + ME_Row *row = row_from_cursor( cursor ); + + row_first_cursor( row, cursor ); } static void ME_ArrowCtrlHome(ME_TextEditor *editor, ME_Cursor *pCursor) @@ -1395,14 +1387,11 @@ static void ME_ArrowCtrlHome(ME_TextEditor *editor, ME_Cursor *pCursor) ME_SetCursorToStart(editor, pCursor); } -static void ME_ArrowEnd(ME_TextEditor *editor, ME_Cursor *pCursor) +static void ME_ArrowEnd( ME_TextEditor *editor, ME_Cursor *cursor ) { - ME_DisplayItem *pRow; + ME_Row *row = row_from_cursor( cursor ); - pRow = ME_FindItemFwd(pCursor->pRun, diStartRowOrParagraphOrEnd); - assert(pRow); - pCursor->pRun = ME_FindItemBack(pRow, diRun); - pCursor->nOffset = (pRow->type == diStartRow) ? pCursor->pRun->member.run.len : 0; + row_end_cursor( row, cursor, FALSE ); } static void ME_ArrowCtrlEnd(ME_TextEditor *editor, ME_Cursor *pCursor)

1 0

Rémi Bernon : mscoree/tests: Test querying interfaces with generated GUID.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 6b450f8deb984fd4deb1e7e4501855b781d4dff6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b450f8deb984fd4deb1e7e4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 23 08:51:45 2020 +0200 mscoree/tests: Test querying interfaces with generated GUID. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/tests/comtest.c | 6 ++++++ dlls/mscoree/tests/comtest.cs | 12 +++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index 8c2ae955cef..659eb9059a7 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -33,6 +33,8 @@ HMODULE hmscoree; +DEFINE_GUID(IID_ITest2, 0x50adb433, 0xf6c5, 0x3b30, 0x92,0x0a, 0x55,0x57,0x11,0x86,0x75,0x09); + typedef enum _run_type { run_type_current_working_directory = 0, @@ -156,6 +158,7 @@ static void run_registry_test(run_type run) char buffer[256]; ITest *test = NULL; HRESULT hr, result_expected; + IUnknown *unk = NULL; HKEY hkey; DWORD ret; int i = 0; @@ -184,6 +187,9 @@ static void run_registry_test(run_type run) hr = ITest_Func(test, &i); ok(hr == S_OK, "Got %x\n", hr); ok(i == 42, "Expected 42, got %d\n", i); + hr = ITest_QueryInterface(test, &IID_ITest2, (void**)&unk); + todo_wine ok(hr == S_OK, "ITest_QueryInterface returned %x\n", hr); + if (hr == S_OK) IUnknown_Release(unk); ITest_Release(test); } diff --git a/dlls/mscoree/tests/comtest.cs b/dlls/mscoree/tests/comtest.cs index f6461450331..536cd807691 100644 --- a/dlls/mscoree/tests/comtest.cs +++ b/dlls/mscoree/tests/comtest.cs @@ -30,12 +30,22 @@ namespace DLL void Func(ref int i); } + [ComVisible(true), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] + public interface ITest2 + { + void Func2(ref int i); + } + [Guid("2e106e50-e7a4-4489-8538-83643f100fdc"), ComVisible(true), ClassInterface(ClassInterfaceType.None)] - public class Test : ITest + public class Test : ITest, ITest2 { public void Func(ref int i) { i = 42; } + public void Func2(ref int i) + { + i = 43; + } } }

1 0

Huw Davies : riched20: Use row ptrs in the cursor to co-ordinates function.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 6b3fd7869a73e715db066810bcb594cdefc94242 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b3fd7869a73e715db066810… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 26 08:46:42 2020 +0000 riched20: Use row ptrs in the cursor to co-ordinates function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 24 +++++++++++------------- dlls/riched20/editor.h | 2 +- dlls/riched20/richole.c | 4 ++-- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 49ae1b2769a..834f9fd3afe 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -218,31 +218,29 @@ int set_selection_cursors(ME_TextEditor *editor, int from, int to) } -void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, - int *x, int *y, int *height) +void cursor_coords( ME_TextEditor *editor, ME_Cursor *cursor, + int *x, int *y, int *height ) { - ME_DisplayItem *row; - ME_Run *run = &pCursor->pRun->member.run; - ME_Paragraph *para = &pCursor->pPara->member.para; + ME_Row *row; + ME_Run *run = &cursor->pRun->member.run; + ME_Paragraph *para = &cursor->pPara->member.para; ME_Run *size_run = run, *prev; ME_Context c; int run_x; - assert(height && x && y); assert(~para->nFlags & MEPF_REWRAP); - row = ME_FindItemBack( run_get_di( run ), diStartRowOrParagraph ); - assert(row && row->type == diStartRow); + row = row_from_cursor( cursor ); ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); - if (!pCursor->nOffset && (prev = run_prev( run ))) size_run = prev; + if (!cursor->nOffset && (prev = run_prev( run ))) size_run = prev; - run_x = ME_PointFromCharContext( &c, run, pCursor->nOffset, TRUE ); + run_x = ME_PointFromCharContext( &c, run, cursor->nOffset, TRUE ); *height = size_run->nAscent + size_run->nDescent; *x = c.rcView.left + run->pt.x + run_x - editor->horz_si.nPos; - *y = c.rcView.top + para->pt.y + row->member.row.nBaseline + *y = c.rcView.top + para->pt.y + row->nBaseline + run->pt.y - size_run->nAscent - editor->vert_si.nPos; ME_DestroyContext(&c); return; @@ -252,7 +250,7 @@ void create_caret(ME_TextEditor *editor) { int x, y, height; - ME_GetCursorCoordinates(editor, &editor->pCursors[0], &x, &y, &height); + cursor_coords( editor, &editor->pCursors[0], &x, &y, &height ); ITextHost_TxCreateCaret(editor->texthost, NULL, 0, height); editor->caret_height = height; editor->caret_hidden = TRUE; @@ -281,7 +279,7 @@ void update_caret(ME_TextEditor *editor) if (!editor->bHaveFocus) return; if (!ME_IsSelection(editor)) { - ME_GetCursorCoordinates(editor, &editor->pCursors[0], &x, &y, &height); + cursor_coords( editor, &editor->pCursors[0], &x, &y, &height ); if (height != editor->caret_height) create_caret(editor); x = min(x, editor->rcFormat.right-1); ITextHost_TxSetCaretPos(editor->texthost, x, y); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e197e3e9a9b..f4484f57d39 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -164,6 +164,7 @@ static inline ME_DisplayItem *run_get_di( ME_Run *run ) } /* caret.c */ +void cursor_coords( ME_TextEditor *editor, ME_Cursor *cursor, int *x, int *y, int *height ) DECLSPEC_HIDDEN; void ME_SetCursorToStart(ME_TextEditor *editor, ME_Cursor *cursor) DECLSPEC_HIDDEN; int set_selection_cursors(ME_TextEditor *editor, int from, int to) DECLSPEC_HIDDEN; BOOL ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) DECLSPEC_HIDDEN; @@ -192,7 +193,6 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, int nChars, int ME_GetTextLength(ME_TextEditor *editor) DECLSPEC_HIDDEN; int ME_GetTextLengthEx(ME_TextEditor *editor, const GETTEXTLENGTHEX *how) DECLSPEC_HIDDEN; ME_Style *ME_GetSelectionInsertStyle(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, int *x, int *y, int *height) DECLSPEC_HIDDEN; /* context.c */ void ME_InitContext(ME_Context *c, ME_TextEditor *editor, HDC hDC) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 2f2e5e09d1f..21b63911954 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -2734,11 +2734,11 @@ static HRESULT WINAPI ITextRange_fnScrollIntoView(ITextRange *me, LONG value) { case tomStart: cursor_from_char_ofs( editor, This->start, &cursor ); - ME_GetCursorCoordinates(editor, &cursor, &x, &y, &height); + cursor_coords( editor, &cursor, &x, &y, &height ); break; case tomEnd: cursor_from_char_ofs( editor, This->end, &cursor ); - ME_GetCursorCoordinates(editor, &cursor, &x, &y, &height); + cursor_coords( editor, &cursor, &x, &y, &height ); break; default: FIXME("bStart value %d not handled\n", value);

1 0

Rémi Bernon : mscoree: Fallback to assembly name if codebase path is invalid.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 7b0a939a1fb9f0acc7b450cd849fb4e1d93eb499 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b0a939a1fb9f0acc7b450cd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 23 08:51:46 2020 +0200 mscoree: Fallback to assembly name if codebase path is invalid. Also use the InprocServer32 key values if there's no subkeys, as shown by the test results. L.A.Noire game crashes on startup after failing to load its ErrorHandler assembly, that has an invalid CodeBase path in the registry. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 44 +++++++++++++++++++++++++++++-------------- dlls/mscoree/tests/comtest.c | 3 ++- 2 files changed, 32 insertions(+), 15 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index f50eb5a0cd7..cf8acae09e0 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1747,6 +1747,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) HKEY key, subkey; LONG res; int offset = 0; + HANDLE file = INVALID_HANDLE_VALUE; DWORD numKeys, keyLength; WCHAR codebase[MAX_PATH + 8]; WCHAR classname[350], subkeyName[256]; @@ -1782,7 +1783,12 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) offset = lstrlenW(wszFileSlash); lstrcpyW(filename, codebase + offset); + + file = CreateFileW(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); } + + if (file != INVALID_HANDLE_VALUE) + CloseHandle(file); else { WCHAR assemblyname[MAX_PATH + 8]; @@ -1791,27 +1797,37 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) WARN("CodeBase value cannot be found, trying Assembly.\n"); /* get the last subkey of InprocServer32 */ res = RegQueryInfoKeyW(key, 0, 0, 0, &numKeys, 0, 0, 0, 0, 0, 0, 0); - if (res != ERROR_SUCCESS || numKeys == 0) - goto cleanup; - numKeys--; - keyLength = ARRAY_SIZE(subkeyName); - res = RegEnumKeyExW(key, numKeys, subkeyName, &keyLength, 0, 0, 0, 0); - if (res != ERROR_SUCCESS) - goto cleanup; - res = RegOpenKeyExW(key, subkeyName, 0, KEY_READ, &subkey); - if (res != ERROR_SUCCESS) - goto cleanup; - dwBufLen = MAX_PATH + 8; - res = RegGetValueW(subkey, NULL, wszAssembly, RRF_RT_REG_SZ, NULL, assemblyname, &dwBufLen); - RegCloseKey(subkey); if (res != ERROR_SUCCESS) goto cleanup; + if (numKeys > 0) + { + numKeys--; + keyLength = ARRAY_SIZE(subkeyName); + res = RegEnumKeyExW(key, numKeys, subkeyName, &keyLength, 0, 0, 0, 0); + if (res != ERROR_SUCCESS) + goto cleanup; + res = RegOpenKeyExW(key, subkeyName, 0, KEY_READ, &subkey); + if (res != ERROR_SUCCESS) + goto cleanup; + dwBufLen = MAX_PATH + 8; + res = RegGetValueW(subkey, NULL, wszAssembly, RRF_RT_REG_SZ, NULL, assemblyname, &dwBufLen); + RegCloseKey(subkey); + if (res != ERROR_SUCCESS) + goto cleanup; + } + else + { + dwBufLen = MAX_PATH + 8; + res = RegGetValueW(key, NULL, wszAssembly, RRF_RT_REG_SZ, NULL, assemblyname, &dwBufLen); + if (res != ERROR_SUCCESS) + goto cleanup; + } hr = get_file_from_strongname(assemblyname, filename, MAX_PATH); if (FAILED(hr)) { /* - * The registry doesn't have a CodeBase entry and it's not in the GAC. + * The registry doesn't have a CodeBase entry or the file isn't there, and it's not in the GAC. * * Use the Assembly Key to retrieve the filename. * Assembly : REG_SZ : AssemblyName, Version=X.X.X.X, Culture=neutral, PublicKeyToken=null diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index 659eb9059a7..b62d527bb95 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -180,7 +180,8 @@ static void run_registry_test(run_type run) ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %x\n", ret); hr = CoCreateInstance(&CLSID_Test, NULL, CLSCTX_INPROC_SERVER, &IID_ITest, (void**)&test); - todo_wine ok(hr == result_expected, "Expected %x, got %x\n", result_expected, hr); + todo_wine_if(result_expected != S_OK) + ok(hr == result_expected, "Expected %x, got %x\n", result_expected, hr); if (hr == S_OK) {

1 0

Rémi Bernon : mscoree/tests: Test invalid assembly paths in registry.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 7612ff5930c7de8c2279f2b6613c8dbaeea9894e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7612ff5930c7de8c2279f2b6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 23 08:51:44 2020 +0200 mscoree/tests: Test invalid assembly paths in registry. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/tests/Makefile.in | 2 +- dlls/mscoree/tests/comtest.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/dlls/mscoree/tests/Makefile.in b/dlls/mscoree/tests/Makefile.in index f65e1bc6c25..7dcd5b64113 100644 --- a/dlls/mscoree/tests/Makefile.in +++ b/dlls/mscoree/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mscoree.dll -IMPORTS = ole32 shlwapi uuid shell32 +IMPORTS = ole32 shlwapi uuid shell32 advapi32 C_SRCS = \ comtest.c \ diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index 12b112417d5..8c2ae955cef 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -148,6 +148,51 @@ static void run_test(BOOL expect_success) } IClassFactory_Release(classFactory); } + +} + +static void run_registry_test(run_type run) +{ + char buffer[256]; + ITest *test = NULL; + HRESULT hr, result_expected; + HKEY hkey; + DWORD ret; + int i = 0; + + if (run == run_type_exe_directory) result_expected = S_OK; + else result_expected = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + + sprintf(buffer, "CLSID\\%s", wine_dbgstr_guid(&CLSID_Test), ""); + ret = RegCreateKeyA( HKEY_CLASSES_ROOT, buffer, &hkey ); + ok(ret == ERROR_SUCCESS, "RegCreateKeyA returned %x\n", ret); + + ret = RegSetKeyValueA(hkey, "InprocServer32", NULL, REG_SZ, "mscoree.dll", 11); + ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %x\n", ret); + ret = RegSetKeyValueA(hkey, "InprocServer32", "Assembly", REG_SZ, "comtest, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", 74); + ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %x\n", ret); + ret = RegSetKeyValueA(hkey, "InprocServer32", "Class", REG_SZ, "DLL.Test", 8); + ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %x\n", ret); + ret = RegSetKeyValueA(hkey, "InprocServer32", "CodeBase", REG_SZ, "file:///U:/invalid/path/to/comtest.dll", 41); + ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %x\n", ret); + + hr = CoCreateInstance(&CLSID_Test, NULL, CLSCTX_INPROC_SERVER, &IID_ITest, (void**)&test); + todo_wine ok(hr == result_expected, "Expected %x, got %x\n", result_expected, hr); + + if (hr == S_OK) + { + hr = ITest_Func(test, &i); + ok(hr == S_OK, "Got %x\n", hr); + ok(i == 42, "Expected 42, got %d\n", i); + ITest_Release(test); + } + + RegDeleteKeyValueA(hkey, "InprocServer32", "CodeBase"); + RegDeleteKeyValueA(hkey, "InprocServer32", "Class"); + RegDeleteKeyValueA(hkey, "InprocServer32", "Assembly"); + RegDeleteKeyValueA(hkey, "InprocServer32", NULL); + RegDeleteKeyA(hkey, "InprocServer32"); + RegCloseKey(hkey); } static void get_dll_path_for_run(char *path_dll, UINT path_dll_size, run_type run) @@ -247,6 +292,7 @@ static void prepare_and_run_test(const char *dll_source, run_type run) SetCurrentDirectoryA(path_tmp); run_test(run == run_type_exe_directory); + run_registry_test(run); cleanup: if (handle_context != NULL && handle_context != INVALID_HANDLE_VALUE)

1 0

Huw Davies : riched20: Use row and para helpers for the selection function.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: aaf29c799121dc388310d06c7fc0ef0512462547 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaf29c799121dc388310d06c… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 26 08:46:40 2020 +0000 riched20: Use row and para helpers for the selection function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 38 ++++++++++++++------------------------ dlls/riched20/editor.h | 3 +++ dlls/riched20/row.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 24 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 5af4cd04d55..650c065dbe0 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -818,38 +818,28 @@ ME_SelectByType(ME_TextEditor *editor, ME_SelectionType selectionType) editor->pCursors[1] = editor->pCursors[0]; ME_MoveCursorWords(editor, &editor->pCursors[1], -1); break; - case stLine: case stParagraph: - { - ME_DisplayItem *pItem; - ME_DIType fwdSearchType, backSearchType; - if (selectionType == stParagraph) { - backSearchType = diParagraph; - fwdSearchType = diParagraphOrEnd; - } else { - backSearchType = diStartRow; - fwdSearchType = diStartRowOrParagraphOrEnd; - } - pItem = ME_FindItemFwd(editor->pCursors[0].pRun, fwdSearchType); - assert(pItem); - if (pItem->type == diTextEnd) - editor->pCursors[0].pRun = ME_FindItemBack(pItem, diRun); - else - editor->pCursors[0].pRun = ME_FindItemFwd(pItem, diRun); - editor->pCursors[0].pPara = ME_GetParagraph(editor->pCursors[0].pRun); - editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; - pItem = ME_FindItemBack(pItem, backSearchType); - editor->pCursors[1].pRun = ME_FindItemFwd(pItem, diRun); - editor->pCursors[1].pPara = ME_GetParagraph(editor->pCursors[1].pRun); + editor->pCursors[0].pRun = run_get_di( para_end_run( &editor->pCursors[0].pPara->member.para ) ); + editor->pCursors[0].pPara = para_get_di( editor->pCursors[0].pRun->member.run.para ); + editor->pCursors[0].nOffset = editor->pCursors[0].pRun->member.run.len; + + editor->pCursors[1].pRun = run_get_di( para_first_run( &editor->pCursors[1].pPara->member.para ) ); editor->pCursors[1].nOffset = 0; break; + case stLine: + { + ME_Row *row = row_from_cursor( editor->pCursors ); + + row_first_cursor( row, editor->pCursors + 1 ); + row_end_cursor( row, editor->pCursors, TRUE ); + break; } case stDocument: /* Select everything with cursor anchored from the start of the text */ - editor->nSelectionType = stDocument; ME_SetCursorToStart(editor, &editor->pCursors[1]); - ME_SetCursorToEnd(editor, &editor->pCursors[0], FALSE); + ME_SetCursorToEnd(editor, &editor->pCursors[0], TRUE); break; default: assert(0); } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 7025ddceea7..e197e3e9a9b 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -111,7 +111,10 @@ int ME_ReverseFindNonWhitespaceV(const ME_String *s, int nVChar) DECLSPEC_HIDDEN int ME_ReverseFindWhitespaceV(const ME_String *s, int nVChar) DECLSPEC_HIDDEN; /* row.c */ +void row_end_cursor( ME_Row *row, ME_Cursor *cursor, BOOL include_eop ) DECLSPEC_HIDDEN; +void row_first_cursor( ME_Row *row, ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Run *row_first_run( ME_Row *row ) DECLSPEC_HIDDEN; +ME_Row *row_from_cursor( ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Row *row_next( ME_Row *row ) DECLSPEC_HIDDEN; ME_Run *row_next_run( ME_Row *row, ME_Run *run ) DECLSPEC_HIDDEN; ME_DisplayItem *ME_RowStart(ME_DisplayItem *item) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/row.c b/dlls/riched20/row.c index ce8de935a19..ba082244cfc 100644 --- a/dlls/riched20/row.c +++ b/dlls/riched20/row.c @@ -53,6 +53,35 @@ ME_Run *row_next_run( ME_Row *row, ME_Run *run ) return &item->member.run; } +ME_Row *row_from_cursor( ME_Cursor *cursor ) +{ + ME_DisplayItem *item; + + item = ME_FindItemBack( cursor->pRun, diStartRow ); + return &item->member.row; +} + +void row_first_cursor( ME_Row *row, ME_Cursor *cursor ) +{ + ME_DisplayItem *item; + + item = ME_FindItemFwd( row_get_di( row ), diRun ); + cursor->pRun = item; + cursor->pPara = para_get_di( cursor->pRun->member.run.para ); + cursor->nOffset = 0; +} + +void row_end_cursor( ME_Row *row, ME_Cursor *cursor, BOOL include_eop ) +{ + ME_DisplayItem *item, *run; + + item = ME_FindItemFwd( row_get_di( row ), diStartRowOrParagraphOrEnd ); + run = ME_FindItemBack( item, diRun ); + cursor->pRun = run; + cursor->pPara = para_get_di( cursor->pRun->member.run.para ); + cursor->nOffset = (item->type == diStartRow || include_eop) ? cursor->pRun->member.run.len : 0; +} + /* I'm sure these functions would simplify some code in caret ops etc, * I just didn't remember them when I wrote that code */

1 0