May 2015 - Wine-commits - list.winehq.org

Nikolay Sivov : dxdiagn: Silence some fixmes from class factory QI.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: 0491ad58737ddbd458260690911a5b5811826c32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0491ad58737ddbd4582606909… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 7 11:24:15 2015 +0300 dxdiagn: Silence some fixmes from class factory QI. --- dlls/dxdiagn/dxdiag_main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dxdiagn/dxdiag_main.c b/dlls/dxdiagn/dxdiag_main.c index 0745df6..e034b4e 100644 --- a/dlls/dxdiagn/dxdiag_main.c +++ b/dlls/dxdiagn/dxdiag_main.c @@ -67,6 +67,12 @@ static HRESULT WINAPI DXDiagCF_QueryInterface(IClassFactory *iface, REFIID riid, TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); else if (IsEqualGUID(&IID_IClassFactory, riid)) TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + else if (IsEqualGUID(&IID_IExternalConnection, riid) || + IsEqualGUID(&IID_IMarshal, riid)) { + TRACE("(%p)->(%s) ignoring\n", iface, debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } else { FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); *ppv = NULL;

1 0

Nikolay Sivov : dwrite: Fix breakpoint update logic.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: 76577c8e4b3861957bc6165689c3e297b70737eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=76577c8e4b3861957bc616568… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 24 13:53:49 2015 +0300 dwrite: Fix breakpoint update logic. --- dlls/dwrite/layout.c | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 0a95c4e..8ab1ef9 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -366,32 +366,36 @@ static HRESULT layout_update_breakpoints_range(struct dwrite_textlayout *layout, layout->actual_breakpoints = heap_alloc(sizeof(DWRITE_LINE_BREAKPOINT)*layout->len); if (!layout->actual_breakpoints) return E_OUTOFMEMORY; + memcpy(layout->actual_breakpoints, layout->nominal_breakpoints, sizeof(DWRITE_LINE_BREAKPOINT)*layout->len); } - memcpy(layout->actual_breakpoints, layout->nominal_breakpoints, sizeof(DWRITE_LINE_BREAKPOINT)*layout->len); for (i = cur->range.startPosition; i < cur->range.length + cur->range.startPosition; i++) { - UINT32 j = i + cur->range.startPosition; - if (i == 0) { - if (j) - layout->actual_breakpoints[j].breakConditionBefore = layout->actual_breakpoints[j-1].breakConditionAfter = - override_break_condition(layout->actual_breakpoints[j-1].breakConditionAfter, before); + /* for first codepoint check if there's anything before it and update accordingly */ + if (i == cur->range.startPosition) { + if (i > 0) + layout->actual_breakpoints[i].breakConditionBefore = layout->actual_breakpoints[i-1].breakConditionAfter = + override_break_condition(layout->actual_breakpoints[i-1].breakConditionAfter, before); else - layout->actual_breakpoints[j].breakConditionBefore = before; - - layout->actual_breakpoints[j].breakConditionAfter = DWRITE_BREAK_CONDITION_MAY_NOT_BREAK; + layout->actual_breakpoints[i].breakConditionBefore = before; + layout->actual_breakpoints[i].breakConditionAfter = DWRITE_BREAK_CONDITION_MAY_NOT_BREAK; } - - layout->actual_breakpoints[j].isWhitespace = 0; - layout->actual_breakpoints[j].isSoftHyphen = 0; - - if (i == cur->range.length - 1) { - layout->actual_breakpoints[j].breakConditionBefore = DWRITE_BREAK_CONDITION_MAY_NOT_BREAK; - if (j < layout->len - 1) - layout->actual_breakpoints[j].breakConditionAfter = layout->actual_breakpoints[j+1].breakConditionAfter = - override_break_condition(layout->actual_breakpoints[j+1].breakConditionAfter, before); + /* similar check for last codepoint */ + else if (i == cur->range.startPosition + cur->range.length - 1) { + if (i == layout->len - 1) + layout->actual_breakpoints[i].breakConditionAfter = after; else - layout->actual_breakpoints[j].breakConditionAfter = before; + layout->actual_breakpoints[i].breakConditionAfter = layout->actual_breakpoints[i+1].breakConditionBefore = + override_break_condition(layout->actual_breakpoints[i+1].breakConditionBefore, after); + layout->actual_breakpoints[i].breakConditionBefore = DWRITE_BREAK_CONDITION_MAY_NOT_BREAK; } + /* for all positions within a range disable breaks */ + else { + layout->actual_breakpoints[i].breakConditionBefore = DWRITE_BREAK_CONDITION_MAY_NOT_BREAK; + layout->actual_breakpoints[i].breakConditionAfter = DWRITE_BREAK_CONDITION_MAY_NOT_BREAK; + } + + layout->actual_breakpoints[i].isWhitespace = FALSE; + layout->actual_breakpoints[i].isSoftHyphen = FALSE; } return S_OK;

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: 47319a00287852a6c0c27e7d34f66abaf9c5e8dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=47319a00287852a6c0c27e7d3… Author: Julian Rüger <jr98(a)gmx.net> Date: Sun May 24 19:50:19 2015 +0200 po: Update German translation. --- po/de.po | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/po/de.po b/po/de.po index 357e96d..8f6a548 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-02-24 14:54+0100\n" +"PO-Revision-Date: 2015-05-24 19:47+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -3140,8 +3140,6 @@ msgid "&View Source" msgstr "&Quelltextansicht" #: hhctrl.rc:83 -#, fuzzy -#| msgid "Properties" msgid "Proper&ties" msgstr "&Eigenschaften" @@ -7460,10 +7458,8 @@ msgid "Add Control" msgstr "Steuerelement hinzufügen" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Font..." msgid "&Convert..." -msgstr "Schrift&art..." +msgstr "&Konvertieren..." #: oledlg.rc:33 oleview.rc:40 msgid "&Object" @@ -8593,10 +8589,8 @@ msgid "Duplex:" msgstr "Duplex:" #: wineps.rc:50 -#, fuzzy -#| msgid "&Setup" msgid "Setup" -msgstr "&Einrichten" +msgstr "Einrichten" #: wininet.rc:42 wininet.rc:62 msgid "Realm" @@ -8932,10 +8926,6 @@ msgstr "" "noch besteht." #: winmm.rc:86 -#, fuzzy -#| msgid "" -#| "Cannot find the specified device. Make sure it is installed or that the " -#| "device name is spelled correctly." msgid "" "Cannot find the specified device. Make sure it is installed and that the " "device name is spelled correctly." @@ -9259,24 +9249,20 @@ msgstr "" "noch besteht." #: winmm.rc:136 -#, fuzzy -#| msgid "Wine Mono Installer" msgid "Wine Sound Mapper" -msgstr "Wine-Mono-Installation" +msgstr "Wine-Soundmapper" #: winmm.rc:137 -#, fuzzy -#| msgid "column" msgid "Volume" -msgstr "Spalte" +msgstr "Lautstärke" #: winmm.rc:138 msgid "Master Volume" -msgstr "" +msgstr "Haupt-Lautstärke" #: winmm.rc:139 msgid "Mute" -msgstr "" +msgstr "Stumm" #: winspool.rc:37 msgid "Print to File"

1 0

Jacek Caban : kernel32: Fixed buffer overflow in GetShortPathNameW.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: 12a134fdc489f1ab23836eae99b500a072db3ae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12a134fdc489f1ab23836eae9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 24 20:16:20 2015 +0200 kernel32: Fixed buffer overflow in GetShortPathNameW. --- dlls/kernel32/path.c | 22 ++++++++++++++++++++-- dlls/kernel32/tests/path.c | 22 ++++++++++++++++++---- 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index eae2ca9..f74b952 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -443,7 +443,7 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl WCHAR *tmpshortpath; LPCWSTR p; DWORD sp = 0, lp = 0; - DWORD tmplen; + DWORD tmplen, buf_len; WIN32_FIND_DATAW wfd; HANDLE goit; @@ -462,7 +462,8 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl /* code below only removes characters from string, never adds, so this is * the largest buffer that tmpshortpath will need to have */ - tmpshortpath = HeapAlloc(GetProcessHeap(), 0, (strlenW(longpath) + 1) * sizeof(WCHAR)); + buf_len = strlenW(longpath) + 1; + tmpshortpath = HeapAlloc(GetProcessHeap(), 0, buf_len * sizeof(WCHAR)); if (!tmpshortpath) { SetLastError(ERROR_OUTOFMEMORY); @@ -524,6 +525,23 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl goit = FindFirstFileW(tmpshortpath, &wfd); if (goit == INVALID_HANDLE_VALUE) goto notfound; FindClose(goit); + + /* In rare cases (like "a.abcd") short path may be longer than original path. + * Make sure we have enough space in temp buffer. */ + if (wfd.cAlternateFileName && tmplen < strlenW(wfd.cAlternateFileName)) + { + WCHAR *new_buf; + buf_len += strlenW(wfd.cAlternateFileName) - tmplen; + new_buf = HeapReAlloc(GetProcessHeap(), 0, tmpshortpath, buf_len * sizeof(WCHAR)); + if(!new_buf) + { + HeapFree(GetProcessHeap(), 0, tmpshortpath); + SetLastError(ERROR_OUTOFMEMORY); + return 0; + } + tmpshortpath = new_buf; + } + strcpyW(tmpshortpath + sp, wfd.cAlternateFileName[0] ? wfd.cAlternateFileName : wfd.cFileName); sp += strlenW(tmpshortpath + sp); lp += tmplen; diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 3bf82fe..f8dfdc8 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1350,7 +1350,8 @@ static void test_GetShortPathNameW(void) static const WCHAR test_path[] = { 'L', 'o', 'n', 'g', 'D', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', 'N', 'a', 'm', 'e', 0 }; static const WCHAR name[] = { 't', 'e', 's', 't', 0 }; static const WCHAR backSlash[] = { '\\', 0 }; - WCHAR path[MAX_PATH], tmppath[MAX_PATH]; + static const WCHAR a_bcdeW[] = {'a','.','b','c','d','e',0}; + WCHAR path[MAX_PATH], tmppath[MAX_PATH], *ptr; WCHAR short_path[MAX_PATH]; DWORD length; HANDLE file; @@ -1387,7 +1388,7 @@ static void test_GetShortPathNameW(void) length = GetShortPathNameW( path, short_path, 0 ); ok( length, "GetShortPathNameW returned 0.\n" ); ret = GetShortPathNameW( path, short_path, length ); - ok( ret, "GetShortPathNameW returned 0.\n" ); + ok( ret && ret == length-1, "GetShortPathNameW returned 0.\n" ); lstrcatW( short_path, name ); @@ -1399,11 +1400,24 @@ static void test_GetShortPathNameW(void) file = CreateFileW( short_path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); ok( file != INVALID_HANDLE_VALUE, "File was not created.\n" ); - - /* End test */ CloseHandle( file ); ret = DeleteFileW( short_path ); ok( ret, "Cannot delete file.\n" ); + + ptr = path + lstrlenW(path); + lstrcpyW( ptr, a_bcdeW); + file = CreateFileW( path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); + ok( file != INVALID_HANDLE_VALUE, "File was not created.\n" ); + CloseHandle( file ); + + length = GetShortPathNameW( path, short_path, sizeof(short_path)/sizeof(*short_path) ); + ok( length, "GetShortPathNameW failed: %u.\n", GetLastError() ); + + ret = DeleteFileW( path ); + ok( ret, "Cannot delete file.\n" ); + *ptr = 0; + + /* End test */ ret = RemoveDirectoryW( path ); ok( ret, "Cannot delete directory.\n" ); }

1 0

Nikolay Sivov : riched20: Added IDispatch support.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: 81fc69d7e61e129d7de5c63fb773719e765e3b2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=81fc69d7e61e129d7de5c63fb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 24 14:01:38 2015 +0300 riched20: Added IDispatch support. --- dlls/riched20/editor.c | 1 + dlls/riched20/editor.h | 2 + dlls/riched20/richole.c | 300 ++++++++++++++++++++++++++++++++++-------- dlls/riched20/tests/richole.c | 20 ++- 4 files changed, 260 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=81fc69d7e61e129d7de5c…

1 0

Nikolay Sivov : riched20: Implement Start/End properties for ranges.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: f4438f1ee54cf1a9b367616206b827d624a94665 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4438f1ee54cf1a9b36761620… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 24 14:08:16 2015 +0300 riched20: Implement Start/End properties for ranges. --- dlls/riched20/richole.c | 120 +++++++++++++++++---------- dlls/riched20/tests/richole.c | 189 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 258 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4438f1ee54cf1a9b3676…

1 0

Nikolay Sivov : riched20/tests: Some tests for GetText().
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: b43a0e1175d4bf83db250057460fb5cefc897dcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b43a0e1175d4bf83db2500574… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 24 14:19:20 2015 +0300 riched20/tests: Some tests for GetText(). --- dlls/riched20/richole.c | 8 ++- dlls/riched20/tests/richole.c | 164 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 148 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b43a0e1175d4bf83db250…

1 0

Nikolay Sivov : riched20/tests: Basic test for Delete().
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: 95074af8a87dd8acd817f7b37930f25d0ff22da7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95074af8a87dd8acd817f7b37… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 24 14:21:06 2015 +0300 riched20/tests: Basic test for Delete(). --- dlls/riched20/tests/richole.c | 47 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index f195810..ee4294f 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -1880,6 +1880,52 @@ static void test_ITextFont(void) ITextFont_Release(font); } +static void test_Delete(void) +{ + static const CHAR test_text1[] = "TestSomeText"; + IRichEditOle *reOle = NULL; + ITextDocument *doc = NULL; + ITextRange *range, *range2; + LONG value; + HRESULT hr; + HWND hwnd; + + create_interfaces(&hwnd, &reOle, &doc, NULL); + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); + + hr = ITextDocument_Range(doc, 0, 4, &range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextDocument_Range(doc, 1, 2, &range2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextRange_GetEnd(range, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 4, "got %d\n", value); + + hr = ITextRange_Delete(range2, tomCharacter, 0, NULL); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextRange_GetEnd(range, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(value == 3, "got %d\n", value); + + hr = ITextRange_GetStart(range2, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 1, "got %d\n", value); + + hr = ITextRange_GetEnd(range2, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(value == 1, "got %d\n", value); + + ITextRange_Release(range); + ITextRange_Release(range2); + release_interfaces(&hwnd, &reOle, &doc, NULL); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -1905,4 +1951,5 @@ START_TEST(richole) test_GetPara(); test_dispatch(); test_ITextFont(); + test_Delete(); }

1 0

Nikolay Sivov : riched20/tests: Initial tests for font duplication behavior.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: c5a029f82e2b8ec45b867df59e4bb3c5f003ad79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5a029f82e2b8ec45b867df59… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 24 17:45:12 2015 +0300 riched20/tests: Initial tests for font duplication behavior. --- dlls/riched20/richole.c | 42 ++++++++-- dlls/riched20/tests/richole.c | 190 +++++++++++++++++++++++++++++++++--------- 2 files changed, 184 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c5a029f82e2b8ec45b867…

1 0

Stefan Dösinger : wined3d: Check resource types separately in check_fbo_compat.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: bd658a15b9c71ee67e8d4ca60370812cdd453b17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd658a15b9c71ee67e8d4ca60… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 22 10:11:21 2015 +0200 wined3d: Check resource types separately in check_fbo_compat. --- dlls/wined3d/utils.c | 491 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 307 insertions(+), 184 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd658a15b9c71ee67e8d4…

1 0