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

Nikolay Sivov : riched20: A bit more tests for GetChar(), improve tracing.
by Alexandre Julliard 28 May '15

28 May '15

Module: wine Branch: master Commit: 6a335ca5daa0d2822910f84c46110ee0a8caca44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a335ca5daa0d2822910f84c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 27 10:10:24 2015 +0300 riched20: A bit more tests for GetChar(), improve tracing. --- dlls/riched20/richole.c | 8 ++++++-- dlls/riched20/tests/richole.c | 24 ++++++++++++++++++++---- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index e25f2ea..63926e2 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1468,9 +1468,11 @@ static HRESULT WINAPI ITextRange_fnGetChar(ITextRange *me, LONG *pch) ITextRangeImpl *This = impl_from_ITextRange(me); ME_Cursor cursor; + TRACE("(%p)->(%p)\n", This, pch); + if (!This->reOle) return CO_E_RELEASED; - TRACE("%p\n", pch); + if (!pch) return E_INVALIDARG; @@ -3934,9 +3936,11 @@ static HRESULT WINAPI ITextSelection_fnGetChar(ITextSelection *me, LONG *pch) ITextSelectionImpl *This = impl_from_ITextSelection(me); ME_Cursor *start = NULL, *end = NULL; + TRACE("(%p)->(%p)\n", This, pch); + if (!This->reOle) return CO_E_RELEASED; - TRACE("%p\n", pch); + if (!pch) return E_INVALIDARG; diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 33a433a..3e41ede 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -683,7 +683,7 @@ static void test_ITextRange_GetChar(void) ITextDocument *txtDoc = NULL; ITextRange *txtRge = NULL; HRESULT hres; - LONG pch = 0xdeadbeef; + LONG pch; int first, lim; static const CHAR test_text1[] = "TestSomeText"; @@ -742,8 +742,16 @@ static void test_ITextRange_GetChar(void) ok(hres == S_OK, "got 0x%08x\n", hres); hres = ITextRange_GetChar(txtRge, NULL); ok(hres == E_INVALIDARG, "ITextRange_GetChar\n"); - ITextRange_Release(txtRge); + release_interfaces(&w, &reOle, &txtDoc, NULL); + + hres = ITextRange_GetChar(txtRge, NULL); + ok(hres == CO_E_RELEASED, "got 0x%08x\n", hres); + + hres = ITextRange_GetChar(txtRge, &pch); + ok(hres == CO_E_RELEASED, "got 0x%08x\n", hres); + + ITextRange_Release(txtRge); } static void test_ITextSelection_GetChar(void) @@ -753,7 +761,7 @@ static void test_ITextSelection_GetChar(void) ITextDocument *txtDoc = NULL; ITextSelection *txtSel = NULL; HRESULT hres; - LONG pch = 0xdeadbeef; + LONG pch; int first, lim; static const CHAR test_text1[] = "TestSomeText"; @@ -791,7 +799,15 @@ static void test_ITextSelection_GetChar(void) hres = ITextSelection_GetChar(txtSel, NULL); ok(hres == E_INVALIDARG, "ITextSelection_GetChar\n"); - release_interfaces(&w, &reOle, &txtDoc, &txtSel); + release_interfaces(&w, &reOle, &txtDoc, NULL); + + hres = ITextSelection_GetChar(txtSel, NULL); + ok(hres == CO_E_RELEASED, "got 0x%08x\n", hres); + + hres = ITextSelection_GetChar(txtSel, &pch); + ok(hres == CO_E_RELEASED, "got 0x%08x\n", hres); + + ITextSelection_Release(txtSel); } static void test_ITextRange_GetStart_GetEnd(void)

1 0

Piotr Caban : wininet/tests: Test if content is read from cache in INTERNET_FLAG_FROM_CACHE tests.
by Alexandre Julliard 28 May '15

28 May '15

Module: wine Branch: master Commit: 5306ce9d4a2cb7530ffce42c90999bc6fec3a246 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5306ce9d4a2cb7530ffce42c9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 28 14:20:05 2015 +0200 wininet/tests: Test if content is read from cache in INTERNET_FLAG_FROM_CACHE tests. --- dlls/wininet/tests/http.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 3b2f9a5..bd4ca54 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1432,7 +1432,9 @@ static void test_http_cache(void) BYTE buf[100]; HANDLE file; BOOL ret; + FILETIME filetime_zero = {0}; + static const char cached_content[] = "data read from cache"; static const char *types[] = { "*", "", NULL }; session = InternetOpenA("Wine Regression Test", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); @@ -1492,9 +1494,13 @@ static void test_http_cache(void) ok(InternetCloseHandle(request), "Close request handle failed\n"); - file = CreateFileA(file_name, GENERIC_READ, 0, NULL, OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, NULL); + file = CreateFileA(file_name, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, NULL); ok(file != INVALID_HANDLE_VALUE, "Could not create file: %u\n", GetLastError()); + ret = WriteFile(file, cached_content, sizeof(cached_content), &size, NULL); + ok(ret && size, "WriteFile failed: %d, %d\n", ret, size); + ret = CommitUrlCacheEntryA(url, file_name, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY, NULL, 0, NULL, 0); + ok(ret, "CommitUrlCacheEntry failed: %d\n", GetLastError()); CloseHandle(file); /* Send the same request, requiring it to be retrieved from the cache */ @@ -1507,7 +1513,17 @@ static void test_http_cache(void) ret = InternetReadFile(request, buf, sizeof(buf), &size); ok(ret, "InternetReadFile failed: %u\n", GetLastError()); ok(size == 100, "size = %u\n", size); + buf[99] = 0; + todo_wine ok(!strcmp((char*)buf, cached_content), "incorrect page data: %s\n", (char*)buf); + + ok(InternetCloseHandle(request), "Close request handle failed\n"); + DeleteUrlCacheEntryA(url); + request = HttpOpenRequestA(connect, "GET", "/tests/hello.html", NULL, NULL, NULL, INTERNET_FLAG_FROM_CACHE, 0); + ret = HttpSendRequestA(request, NULL, 0, NULL, 0); + todo_wine ok(!ret, "HttpSendRequest succeeded\n"); + if(!ret) + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() = %d\n", GetLastError()); ok(InternetCloseHandle(request), "Close request handle failed\n"); request = HttpOpenRequestA(connect, NULL, "/", NULL, NULL, types, INTERNET_FLAG_NO_CACHE_WRITE, 0);

1 0

Indrek Altpere : winex11: Fix uninitialized memory access appearing in multiple tests (Valgrind).
by Alexandre Julliard 28 May '15

28 May '15

Module: wine Branch: master Commit: 68e1fdf99954c0f66f9a536d8f8a384033104bf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68e1fdf99954c0f66f9a536d8… Author: Indrek Altpere <efbiaiinzinz(a)hotmail.com> Date: Thu May 28 12:13:41 2015 +0300 winex11: Fix uninitialized memory access appearing in multiple tests (Valgrind). --- dlls/winex11.drv/window.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 06e2294..7146cfc 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -725,6 +725,8 @@ static void set_mwm_hints( struct x11drv_win_data *data, DWORD style, DWORD ex_s data->hwnd, mwm_hints.decorations, mwm_hints.functions, style, ex_style ); mwm_hints.flags = MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS; + mwm_hints.input_mode = 0; + mwm_hints.status = 0; XChangeProperty( data->display, data->whole_window, x11drv_atom(_MOTIF_WM_HINTS), x11drv_atom(_MOTIF_WM_HINTS), 32, PropModeReplace, (unsigned char*)&mwm_hints, sizeof(mwm_hints)/sizeof(long) );

1 0

Huw Davies : winex11: Fix ctrl-<symbol> to generate codes below 0x20 where necessary.
by Alexandre Julliard 28 May '15

28 May '15

Module: wine Branch: master Commit: 10556c25e468768d1422e872f16dbc1ae85ef968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10556c25e468768d1422e872f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 28 11:35:05 2015 +0100 winex11: Fix ctrl-<symbol> to generate codes below 0x20 where necessary. --- dlls/user32/tests/input.c | 94 +++++++++++++++++++++++++++++++++++---------- dlls/winex11.drv/keyboard.c | 16 ++++++-- 2 files changed, 85 insertions(+), 25 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 29b655c..cb130e8 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1587,6 +1587,56 @@ static void test_key_map(void) } } +#define shift 1 +#define ctrl 2 + +static const struct tounicode_tests +{ + UINT vk; + DWORD modifiers; + WCHAR chr; /* if vk is 0, lookup vk using this char */ + int expect_ret; + WCHAR expect_buf[4]; +} utests[] = +{ + { 'A', 0, 0, 1, {'a',0}}, + { 'A', ctrl, 0, 1, {1, 0}}, + { 'A', shift|ctrl, 0, 1, {1, 0}}, + { VK_TAB, ctrl, 0, 0, {}}, + { VK_TAB, shift|ctrl, 0, 0, {}}, + { VK_RETURN, ctrl, 0, 1, {'\n', 0}}, + { VK_RETURN, shift|ctrl, 0, 0, {}}, + { '4', ctrl, 0, 0, {}}, + { '4', shift|ctrl, 0, 0, {}}, + { 0, ctrl, '!', 0, {}}, + { 0, ctrl, '\"', 0, {}}, + { 0, ctrl, '#', 0, {}}, + { 0, ctrl, '$', 0, {}}, + { 0, ctrl, '%', 0, {}}, + { 0, ctrl, '\'', 0, {}}, + { 0, ctrl, '(', 0, {}}, + { 0, ctrl, ')', 0, {}}, + { 0, ctrl, '*', 0, {}}, + { 0, ctrl, '+', 0, {}}, + { 0, ctrl, ',', 0, {}}, + { 0, ctrl, '-', 0, {}}, + { 0, ctrl, '.', 0, {}}, + { 0, ctrl, '/', 0, {}}, + { 0, ctrl, ':', 0, {}}, + { 0, ctrl, ';', 0, {}}, + { 0, ctrl, '<', 0, {}}, + { 0, ctrl, '=', 0, {}}, + { 0, ctrl, '>', 0, {}}, + { 0, ctrl, '?', 0, {}}, + { 0, ctrl, '@', 1, {0}}, + { 0, ctrl, '[', 1, {0x1b}}, + { 0, ctrl, '\\', 1, {0x1c}}, + { 0, ctrl, ']', 1, {0x1d}}, + { 0, ctrl, '^', 1, {0x1e}}, + { 0, ctrl, '_', 1, {0x1f}}, + { 0, ctrl, '`', 0, {}}, +}; + static void test_ToUnicode(void) { WCHAR wStr[4]; @@ -1614,30 +1664,32 @@ static void test_ToUnicode(void) "ToUnicode didn't null-terminate the buffer when there was room.\n"); } - ret = ToUnicode('A', SC_A, state, wStr, 4, 0); - ok(ret == 1, "ToUnicode for character A didn't return 1 (was %i)\n", ret); - ok(wStr[0] == 'a', "ToUnicode for character 'A' was %i (expected %i)\n", wStr[0], 'a'); + for (i = 0; i < sizeof(utests) / sizeof(utests[0]); i++) + { + UINT vk = utests[i].vk, mod = utests[i].modifiers, scan; - state[VK_CONTROL] |= HIGHEST_BIT; - state[VK_LCONTROL] |= HIGHEST_BIT; - ret = ToUnicode(VK_TAB, SC_TAB, state, wStr, 2, 0); - ok(ret == 0, "ToUnicode for CTRL + Tab didn't return 0 (was %i)\n", ret); + if(!vk) + { + short vk_ret = VkKeyScanW(utests[i].chr); + if (vk_ret == -1) continue; + vk = vk_ret & 0xff; + if (vk_ret & 0x100) mod |= shift; + if (vk_ret & 0x200) mod |= ctrl; + } + scan = MapVirtualKeyW(vk, MAPVK_VK_TO_VSC); - ret = ToUnicode(VK_RETURN, SC_RETURN, state, wStr, 2, 0); - ok(ret == 1, "ToUnicode for CTRL + Return didn't return 1 (was %i)\n", ret); - if(ret == 1) - ok(wStr[0]=='\n', "ToUnicode for CTRL + Return was %i (expected 10)\n", wStr[0]); + state[VK_SHIFT] = state[VK_LSHIFT] = (mod & shift) ? HIGHEST_BIT : 0; + state[VK_CONTROL] = state[VK_LCONTROL] = (mod & ctrl) ? HIGHEST_BIT : 0; - ret = ToUnicode('A', SC_A, state, wStr, 4, 0); - ok(ret == 1, "ToUnicode for CTRL + character A didn't return 1 (was %i)\n", ret); - ok(wStr[0] == 1, "ToUnicode for CTRL + character 'A' was %i (expected 1)\n", wStr[0]); + ret = ToUnicode(vk, scan, state, wStr, 4, 0); + ok(ret == utests[i].expect_ret, "%d: got %d expected %d\n", i, ret, utests[i].expect_ret); + if (ret) + ok(!lstrcmpW(wStr, utests[i].expect_buf), "%d: got %s expected %s\n", i, wine_dbgstr_w(wStr), + wine_dbgstr_w(utests[i].expect_buf)); - state[VK_SHIFT] |= HIGHEST_BIT; - state[VK_LSHIFT] |= HIGHEST_BIT; - ret = ToUnicode(VK_TAB, SC_TAB, state, wStr, 2, 0); - ok(ret == 0, "ToUnicode for CTRL + SHIFT + Tab didn't return 0 (was %i)\n", ret); - ret = ToUnicode(VK_RETURN, SC_RETURN, state, wStr, 2, 0); - todo_wine ok(ret == 0, "ToUnicode for CTRL + SHIFT + Return didn't return 0 (was %i)\n", ret); + } + state[VK_SHIFT] = state[VK_LSHIFT] = 0; + state[VK_CONTROL] = state[VK_LCONTROL] = 0; ret = ToUnicode(VK_TAB, SC_TAB, NULL, wStr, 4, 0); ok(ret == 0, "ToUnicode with NULL keystate didn't return 0 (was %i)\n", ret); @@ -1688,7 +1740,7 @@ static void test_ToAscii(void) state[VK_SHIFT] |= HIGHEST_BIT; state[VK_LSHIFT] |= HIGHEST_BIT; ret = ToAscii(VK_RETURN, SC_RETURN, state, &character, 0); - todo_wine ok(ret == 0, "ToAscii for CTRL + Shift + Return key didn't return 0 (was %i)\n", ret); + ok(ret == 0, "ToAscii for CTRL + Shift + Return key didn't return 0 (was %i)\n", ret); ret = ToAscii(VK_RETURN, SC_RETURN, NULL, &character, 0); ok(ret == 0, "ToAscii for NULL keystate didn't return 0 (was %i)\n", ret); diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 1323e19..b0f5b95 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2664,8 +2664,8 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState CTRL + number or CTRL + symbol */ if (e.state & ControlMask) { - if (((keysym>=33) && (keysym < 'A')) || - ((keysym > 'Z') && (keysym < 'a')) || + if (((keysym>=33) && (keysym < '@')) || + (keysym == '`') || (keysym == XK_Tab)) { lpChar[0] = 0; @@ -2689,8 +2689,16 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState else if((lpKeyState[VK_CONTROL] & 0x80) /* Control is pressed */ && (keysym == XK_Return || keysym == XK_KP_Enter)) { - lpChar[0] = '\n'; - ret = 1; + if (lpKeyState[VK_SHIFT] & 0x80) + { + lpChar[0] = 0; + ret = 0; + } + else + { + lpChar[0] = '\n'; + ret = 1; + } } /* Hack to detect an XLookupString hard-coded to Latin1 */

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard 28 May '15

28 May '15

Module: wine Branch: master Commit: 809127a2da31aa8eb12e7e905404bc416aeb4e26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=809127a2da31aa8eb12e7e905… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu May 28 15:58:47 2015 +0300 po: Update Ukrainian translation. --- po/uk.po | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/po/uk.po b/po/uk.po index ccbd5c8..0c2b8ad 100644 --- a/po/uk.po +++ b/po/uk.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-08 13:50+0200\n" +"PO-Revision-Date: 2015-05-28 15:57+0200\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -2553,7 +2553,7 @@ msgstr "Властивості сертифікату" #: cryptui.rc:67 msgid "Please enter an OID in the form 1.2.3.4" -msgstr "Будь-ласка, введіть OID в формі 1.2.3.4" +msgstr "Будь ласка, введіть OID в формі 1.2.3.4" #: cryptui.rc:68 msgid "The OID you entered already exists." @@ -2561,7 +2561,7 @@ msgstr "OID, який ви ввели, вже існує." #: cryptui.rc:70 msgid "Please select a certificate store." -msgstr "Будь-ласка, виберіть сховище сертифікатів." +msgstr "Будь ласка, виберіть сховище сертифікатів." #: cryptui.rc:72 msgid "" @@ -6709,7 +6709,7 @@ msgstr "Введіть Мережний Пароль" #: mpr.rc:38 wininet.rc:40 wininet.rc:60 msgid "Please enter your username and password:" -msgstr "Будь-ласка, введіть Ваші ім'я та пароль:" +msgstr "Будь ласка, введіть Ваші ім'я та пароль:" #: mpr.rc:39 wininet.rc:41 msgid "Proxy" @@ -8652,10 +8652,8 @@ msgid "Duplex:" msgstr "Дуплекс:" #: wineps.rc:50 -#, fuzzy -#| msgid "&Setup" msgid "Setup" -msgstr "Властивості" +msgstr "Налаштування" #: wininet.rc:42 wininet.rc:62 msgid "Realm" @@ -12998,7 +12996,7 @@ msgstr "Wine" #: wineboot.rc:46 msgid "The Wine configuration in %s is being updated, please wait..." -msgstr "Оновлення конфігурації Wine в %s, будь-ласка, зачекайте..." +msgstr "Оновлення конфігурації Wine в %s, будь ласка, зачекайте..." #: winecfg.rc:141 msgid "" @@ -13260,7 +13258,7 @@ msgstr "Диски" #: winecfg.rc:36 msgid "Select the Unix target directory, please." -msgstr "Будь-ласка, виберіть цільову теку Unix." +msgstr "Будь ласка, виберіть цільову теку Unix." #: winecfg.rc:37 msgid "Hide &Advanced"

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 28 May '15

28 May '15

Module: wine Branch: master Commit: 22983f2b65dc40bfa90a73e3e3bd2e13cc90e22f URL: http://source.winehq.org/git/wine.git/?a=commit;h=22983f2b65dc40bfa90a73e3e… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu May 28 16:32:13 2015 +0300 po: Update Finnish translation. --- po/fi.po | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/po/fi.po b/po/fi.po index 22c792d..3d4d03e 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7442,10 +7442,8 @@ msgid "Add Control" msgstr "Lisää kontrolli" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Font..." msgid "&Convert..." -msgstr "&Fontti..." +msgstr "&Muunna..." #: oledlg.rc:33 oleview.rc:40 msgid "&Object" @@ -8879,16 +8877,12 @@ msgstr "" "verkkoyhteys toimii." #: 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." msgstr "" -"Annettua laitetta ei löydy. Tarkista, että se on asennettu tai sen nimi on " -"kirjoitettu oikein." +"Annettua laitetta ei löydy. Tarkista, että se on asennettu ja että sen nimi " +"on kirjoitettu oikein." #: winmm.rc:87 msgid "" @@ -9184,24 +9178,20 @@ msgstr "" "riittävästi tai verkkoyhteys on toiminnassa." #: winmm.rc:136 -#, fuzzy -#| msgid "Wine Mono Installer" msgid "Wine Sound Mapper" -msgstr "Wine Mono -asennusohjelma" +msgstr "Wine Sound Mapper" #: winmm.rc:137 -#, fuzzy -#| msgid "column" msgid "Volume" -msgstr "sarake" +msgstr "Äänenvoimakkuus" #: winmm.rc:138 msgid "Master Volume" -msgstr "" +msgstr "Pää-äänenvoimakkuus" #: winmm.rc:139 msgid "Mute" -msgstr "" +msgstr "Mykistä" #: winspool.rc:37 msgid "Print to File"

1 0

André Hentschel : include: Add more ARM64 CV constants.
by Alexandre Julliard 28 May '15

28 May '15

Module: wine Branch: master Commit: 8e0164bd2681f97af0fe5989b5f46ed657041f9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e0164bd2681f97af0fe5989b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed May 27 22:33:19 2015 +0200 include: Add more ARM64 CV constants. --- dlls/dbghelp/cpu_arm64.c | 24 +++++++++++++----------- dlls/ntdll/signal_arm64.c | 20 +++++++++++++++----- include/cvconst.h | 26 +++++++++++++++++++------- include/winnt.h | 6 +++--- programs/winedbg/be_arm64.c | 19 +++++++++---------- programs/winedbg/gdbproxy.c | 4 ++-- 6 files changed, 61 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e0164bd2681f97af0fe5…

1 0

André Hentschel : winedump: Add more image debug types.
by Alexandre Julliard 28 May '15

28 May '15

Module: wine Branch: master Commit: 29c47defe62fb2b47efa964d1b8486b4f6f19544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c47defe62fb2b47efa964d1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed May 27 22:33:30 2015 +0200 winedump: Add more image debug types. --- include/winnt.h | 4 ++++ tools/winedump/pe.c | 19 +++++-------------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 73d4d36..7a08810 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3531,6 +3531,10 @@ typedef struct _IMAGE_DEBUG_DIRECTORY { #define IMAGE_DEBUG_TYPE_BORLAND 9 #define IMAGE_DEBUG_TYPE_RESERVED10 10 #define IMAGE_DEBUG_TYPE_CLSID 11 +#define IMAGE_DEBUG_TYPE_VC_FEATURE 12 +#define IMAGE_DEBUG_TYPE_POGO 13 +#define IMAGE_DEBUG_TYPE_ILTCG 14 +#define IMAGE_DEBUG_TYPE_MPX 15 typedef enum ReplacesCorHdrNumericDefines { diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 51ceba4..dbe5d8f 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1331,6 +1331,10 @@ static void dump_dir_debug_dir(const IMAGE_DEBUG_DIRECTORY* idd, int idx) case IMAGE_DEBUG_TYPE_BORLAND: str = "BORLAND"; break; case IMAGE_DEBUG_TYPE_RESERVED10: str = "RESERVED10"; break; case IMAGE_DEBUG_TYPE_CLSID: str = "CLSID"; break; + case IMAGE_DEBUG_TYPE_VC_FEATURE: str = "VC_FEATURE"; break; + case IMAGE_DEBUG_TYPE_POGO: str = "POGO"; break; + case IMAGE_DEBUG_TYPE_ILTCG: str = "ILTCG"; break; + case IMAGE_DEBUG_TYPE_MPX: str = "MPX"; break; } printf(" Type: %u (%s)\n", idd->Type, str); printf(" SizeOfData: %u\n", idd->SizeOfData); @@ -1363,20 +1367,7 @@ static void dump_dir_debug_dir(const IMAGE_DEBUG_DIRECTORY* idd, int idx) printf(" Data: %s\n", misc->Data); } break; - case IMAGE_DEBUG_TYPE_EXCEPTION: - break; - case IMAGE_DEBUG_TYPE_FIXUP: - break; - case IMAGE_DEBUG_TYPE_OMAP_TO_SRC: - break; - case IMAGE_DEBUG_TYPE_OMAP_FROM_SRC: - break; - case IMAGE_DEBUG_TYPE_BORLAND: - break; - case IMAGE_DEBUG_TYPE_RESERVED10: - break; - case IMAGE_DEBUG_TYPE_CLSID: - break; + default: break; } printf("\n"); }

1 0

Jeremy Newman : use winehq.org for official tarball downloads
by Jeremy Newman 27 May '15

27 May '15

Module: website Branch: master Commit: 2b77af289b83adad50895e9f05d5c1bc97ad1123 URL: http://source.winehq.org/git/website.git/?a=commit;h=2b77af289b83adad50895e… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed May 27 13:58:02 2015 -0500 use winehq.org for official tarball downloads --- templates/de/download.template | 2 +- templates/en/download.template | 2 +- templates/fr/download.template | 2 +- templates/he/download.template | 2 +- templates/pl/download.template | 2 +- templates/pt/download.template | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index 4fc8982..69be404 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -140,7 +140,7 @@ für das Hosten der Wine-Webseite erbeten hat.</p> </tr> <tr bgcolor="#ffffff"> - <td> <a href="http://sourceforge.net/projects/wine/files/Source/" target="_blank">sourceforge.net</a></td> + <td> <a href="http://ftp.winehq.org/pub/wine/source/" target="_blank">winehq.org</a></td> <td> Unsere offizielle Website für freigegebenen Quellcode. </td> </tr> diff --git a/templates/en/download.template b/templates/en/download.template index b759b4f..587415f 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -135,7 +135,7 @@ requested in exchange for hosting the Wine web site.</p> </tr> <tr bgcolor="#ffffff"> - <td> <a href="http://sourceforge.net/projects/wine/files/Source/" target="_blank">sourceforge.net</a></td> + <td> <a href="http://ftp.winehq.org/pub/wine/source/" target="_blank">winehq.org</a></td> <td> Our official source release site. </td> </tr> diff --git a/templates/fr/download.template b/templates/fr/download.template index 6232d01..4ffaad9 100644 --- a/templates/fr/download.template +++ b/templates/fr/download.template @@ -146,7 +146,7 @@ href="http://wiki.winehq.org/ThirdPartyApplications">applications tierces</a>.</ </tr> <tr bgcolor="#ffffff"> - <td> <a href="http://sourceforge.net/projects/wine/files/Source/" target="_blank">sourceforge.net</a></td> + <td> <a href="http://ftp.winehq.org/pub/wine/source/" target="_blank">winehq.org</a></td> <td> Site officiel de téléchargement. </td> </tr> diff --git a/templates/he/download.template b/templates/he/download.template index 0fd5dfe..61efa19 100644 --- a/templates/he/download.template +++ b/templates/he/download.template @@ -133,7 +133,7 @@ </tr> <tr bgcolor="#ffffff"> - <td> <a href="http://sourceforge.net/projects/wine/files/Source/" target="_blank">sourceforge.net</a></td> + <td> <a href="http://ftp.winehq.org/pub/wine/source/" target="_blank">winehq.org</a></td> <td> אתר הפצת קוד המקור הרשמי שלנו. </td> </tr> diff --git a/templates/pl/download.template b/templates/pl/download.template index 4037a71..1f3baa6 100644 --- a/templates/pl/download.template +++ b/templates/pl/download.template @@ -139,7 +139,7 @@ stronę wiki</a> w poszukiwaniu aplikacji osób trzecich.</p> </tr> <tr bgcolor="#ffffff"> - <td> <a href="http://sourceforge.net/projects/wine/files/Source/" target="_blank">sourceforge.net</a></td> + <td> <a href="http://ftp.winehq.org/pub/wine/source/" target="_blank">winehq.org</a></td> <td> Nasza oficjalna strona źródeł. </td> </tr> diff --git a/templates/pt/download.template b/templates/pt/download.template index 43c4934..063beae 100644 --- a/templates/pt/download.template +++ b/templates/pt/download.template @@ -130,7 +130,7 @@ de terceiros. </tr> <tr bgcolor="#ffffff"> - <td> <a href="http://sourceforge.net/projects/wine/files/Source/" target="_blank">sourceforge.net</a></td> + <td> <a href="http://ftp.winehq.org/pub/wine/source/" target="_blank">winehq.org</a></td> <td> Nosso sítio oficial para lançamentos. </td> </tr>

1 0

Nikolay Sivov : riched20: Implement SetName().
by Alexandre Julliard 27 May '15

27 May '15

Module: wine Branch: master Commit: aa37c179ad20a9b8461122584bd44d08e5d65c3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa37c179ad20a9b8461122584… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 26 17:36:23 2015 +0300 riched20: Implement SetName(). --- dlls/riched20/richole.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 8b611d5..a34c210 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -541,7 +541,12 @@ static HRESULT set_textfont_prop(ITextFontImpl *font, enum textfont_prop_id prop /* when font is not attached to any range use cache */ if (!font->range || font->set_cache_enabled) { - font->props[propid] = *value; + if (propid == FONT_NAME) { + SysFreeString(font->props[propid].str); + font->props[propid].str = SysAllocString(value->str); + } + else + font->props[propid] = *value; return S_OK; } @@ -600,6 +605,9 @@ static HRESULT set_textfont_prop(ITextFontImpl *font, enum textfont_prop_id prop case FONT_WEIGHT: fmt.wWeight = value->l; break; + case FONT_NAME: + lstrcpynW(fmt.szFaceName, value->str, sizeof(fmt.szFaceName)/sizeof(WCHAR)); + break; default: FIXME("unhandled font property %d\n", propid); return E_FAIL; @@ -2543,8 +2551,12 @@ static HRESULT WINAPI TextFont_GetName(ITextFont *iface, BSTR *value) static HRESULT WINAPI TextFont_SetName(ITextFont *iface, BSTR value) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p)->(%s): stub\n", This, debugstr_w(value)); - return E_NOTIMPL; + textfont_prop_val v; + + TRACE("(%p)->(%s)\n", This, debugstr_w(value)); + + v.str = value; + return set_textfont_prop(This, FONT_NAME, &v); } static HRESULT WINAPI TextFont_GetOutline(ITextFont *iface, LONG *value)

1 0