November 2015 - Wine-Commits

Julian Rüger : German translation for release 1.8-rc2
by Jeremy Newman Nov. 30, 2015

Nov. 30, 2015

Module: website Branch: master Commit: b31136c0235afcc11512e7490bd2961793b004d5 URL: http://source.winehq.org/git/website.git/?a=commit;h=b31136c0235afcc11512e7… Author: Julian Rüger <jr98(a)gmx.net> Date: Sat Nov 28 01:25:18 2015 +0100 German translation for release 1.8-rc2 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2015112701.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2015112701.xml b/news/de/2015112701.xml new file mode 100644 index 0000000..0bae90e --- /dev/null +++ b/news/de/2015112701.xml @@ -0,0 +1,12 @@ +<news> +<date>27. November 2015</date> +<title>Wine 1.8-rc2 freigegeben</title> +<body> + Die Entwicklungsversion 1.8-rc2 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.8-rc2">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-freeze befinden.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.8/wine-1.8-rc2.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Make the staged patchset a URL in the edit form.
by Alexandre Julliard Nov. 30, 2015

Nov. 30, 2015

Module: bugzilla Branch: master Commit: d04fe4e66f9df0098ae8291e6c94c8c1f3c42b6d URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=d04fe4e66f9df0098ae82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 30 19:19:06 2015 +0900 Make the staged patchset a URL in the edit form. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- template/en/default/bug/edit.html.tmpl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index f99e521..6738394 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -912,8 +912,14 @@ desc_url = "//source.winehq.org/git/wine.git/commit/${bug.cf_fixedby_sha1sum}" editable = bug.check_can_change_field(field.name, 0, 1) value_span = 2 %] + [% ELSIF field.name == 'cf_staged_patchset' && bug.${field.name} && is_safe_url("${bug.cf_staged_patchset}") %] + [% PROCESS bug/field.html.tmpl value = bug.${field.name} + desc_url = "${bug.cf_staged_patchset}" + editable = bug.check_can_change_field(field.name, 0, 1) + value_span = 2 %] [% ELSE %] [% PROCESS bug/field.html.tmpl value = bug.${field.name} + desc_url = "" editable = bug.check_can_change_field(field.name, 0, 1) value_span = 2 %] [% END %]

1 0

Alexandre Julliard : SFC fundraiser announcement.
by Alexandre Julliard Nov. 29, 2015

Nov. 29, 2015

Module: website Branch: master Commit: c7b01322bd28ef2ecb50c2be72c79a80b9c860ba URL: http://source.winehq.org/git/website.git/?a=commit;h=c7b01322bd28ef2ecb50c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Nov 29 23:42:20 2015 +0900 SFC fundraiser announcement. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2015112901.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2015112901.xml b/news/en/2015112901.xml new file mode 100644 index 0000000..f3dc6bd --- /dev/null +++ b/news/en/2015112901.xml @@ -0,0 +1,18 @@ +<news> +<date>November 29, 2015</date> +<title>Software Freedom Conservancy 2015 Fundraiser</title> +<body> +The <a href="https://sfconservancy.org/">Software Freedom Conservancy</a> is a not-for-profit +organization that supports FLOSS projects by taking care of project needs such as management of +donations, asset stewardship, basic legal advice, and FLOSS copyright license enforcement. They +have been extremely helpful to us. + +Unfortunately, in the past year the SFC has had some of its corporate support withdrawn due to +its FLOSS license enforcement activities and must now rely more on individual donors. They have +recently launched their <a href="https://sfconservancy.org/supporter/">2015 Fundraising +Campaign</a>, and have asked member projects to help publicize it. + +Please consider <a href="https://sfconservancy.org/donate/">donating</a>; your support of +the SFC will benefit all of its <a href="https://sfconservancy.org/members/current/">members</a>, +including the Wine Project. +</body></news>

1 0

Alexandre Julliard : Wine release 1.8-rc2
by Alexandre Julliard Nov. 27, 2015

Nov. 27, 2015

Module: website Branch: master Commit: 21ee9826149eed59ee7ab20e15255bdb57319498 URL: http://source.winehq.org/git/website.git/?a=commit;h=21ee9826149eed59ee7ab2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 27 23:20:59 2015 +0900 Wine release 1.8-rc2 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2015112701.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2015112701.xml b/news/en/2015112701.xml new file mode 100644 index 0000000..d587635 --- /dev/null +++ b/news/en/2015112701.xml @@ -0,0 +1,12 @@ +<news> +<date>November 27, 2015</date> +<title>Wine 1.8-rc2 Released</title> +<body> + The Wine development release 1.8-rc2 is now available. + <a href="{$root}/announce/1.8-rc2">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.8/wine-1.8-rc2.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Andrey Gusev : Assorted typos fixes.
by Alexandre Julliard Nov. 27, 2015

Nov. 27, 2015

Module: wine Branch: master Commit: 8bfc9bd2ee2c2d3de8469e2dc1bb016547998945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bfc9bd2ee2c2d3de8469e2dc… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Nov 27 00:23:09 2015 +0200 Assorted typos fixes. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 2 +- dlls/d3d11/device.c | 2 +- dlls/ddraw/ddraw.c | 2 +- dlls/kernel32/tests/file.c | 4 ++-- dlls/msvcrt/tests/scanf.c | 2 +- dlls/ole32/defaulthandler.c | 2 +- dlls/oleaut32/olepicture.c | 2 +- dlls/urlmon/tests/misc.c | 4 ++-- dlls/urlmon/tests/protocol.c | 6 +++--- dlls/user32/tests/combo.c | 8 ++++---- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 48cd062..193fe90 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -403,7 +403,7 @@ static enum install_res install_from_cache(void) return INSTALL_NEXT; if(!sha_check(cache_file_name)) { - WARN("could not validate check sum\n"); + WARN("could not validate checksum\n"); DeleteFileW(cache_file_name); heap_free(cache_file_name); return INSTALL_NEXT; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index b1f56c3..8fc6cb1 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2103,7 +2103,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDomainShader(ID3D11Device *i static HRESULT STDMETHODCALLTYPE d3d11_device_CreateComputeShader(ID3D11Device *iface, const void *byte_code, SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11ComputeShader **shader) { - FIXME("iface %p, byte_code %p, byte_code_lenghth %lu, class_linkage %p, shader %p stub!\n", + FIXME("iface %p, byte_code %p, byte_code_length %lu, class_linkage %p, shader %p stub!\n", iface, byte_code, byte_code_length, class_linkage, shader); return E_NOTIMPL; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 41048fa..e521734 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -991,7 +991,7 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, ddraw->cooperative_level = cooplevel; ddraw->dest_window = window; - TRACE("SetCooperativeLevel retuning DD_OK\n"); + TRACE("SetCooperativeLevel returning DD_OK\n"); hr = DD_OK; done: ddraw->flags &= ~DDRAW_SCL_RECURSIVE; diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 4ad1da8..53dc04b 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3956,8 +3956,8 @@ static void test_GetFileInformationByHandleEx(void) ret = pGetFileInformationByHandleEx(file, FileStandardInfo, buffer, sizeof(buffer)); ok(ret, "GetFileInformationByHandleEx: failed to get FileStandardInfo, %u\n", GetLastError()); standardInfo = (FILE_STANDARD_INFO *)buffer; - ok(standardInfo->NumberOfLinks == 1, "GetFileInformationByHandleEx: Unexpcted number of links\n"); - ok(standardInfo->DeletePending == FALSE, "GetFileInformationByHandleEx: Unexpcted pending delete\n"); + ok(standardInfo->NumberOfLinks == 1, "GetFileInformationByHandleEx: Unexpected number of links\n"); + ok(standardInfo->DeletePending == FALSE, "GetFileInformationByHandleEx: Unexpected pending delete\n"); ok(standardInfo->Directory == FALSE, "GetFileInformationByHandleEx: Incorrect directory flag\n"); /* Test FileNameInfo */ diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 97b8074..3c5a05e 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -165,7 +165,7 @@ static void test_sscanf( void ) ret = sscanf(buffer, "%lld", &result64); ok(ret == 1, "Wrong number of arguments read: %d\n", ret); ret = sprintf(buffer1, "%lld", result64); - ok(ret==14 || broken(ret==10), "sprintf retuned %d\n", ret); + ok(ret==14 || broken(ret==10), "sprintf returned %d\n", ret); if(ret == 14) ok(!strcmp(buffer, buffer1), "got %s, expected %s\n", buffer1, buffer); diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 3200f4b..e6c52cd 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -253,7 +253,7 @@ static HRESULT WINAPI DefaultHandler_NDIUnknown_QueryInterface( /* Check that we obtained an interface. */ if (*ppvObject == NULL) { - WARN( "() : asking for un supported interface %s\n", debugstr_guid(riid)); + WARN( "() : asking for unsupported interface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 5ce83e0..44157de 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -472,7 +472,7 @@ static HRESULT WINAPI OLEPictureImpl_QueryInterface( if (!*ppvObject) { - FIXME("() : asking for un supported interface %s\n",debugstr_guid(riid)); + FIXME("() : asking for unsupported interface %s\n",debugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index ebfef2b..d63f1fe 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1305,14 +1305,14 @@ static void test_CopyBindInfo(void) memset(src, 0, sizeof(BINDINFO[2])); memset(dest, 0xde, sizeof(BINDINFO[2])); hres = pCopyBindInfo(src, dest); - ok(hres == E_INVALIDARG, "CopyBindInfo retuned: %08x, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "CopyBindInfo returned: %08x, expected E_INVALIDARG\n", hres); memset(src, 0, sizeof(BINDINFO[2])); memset(dest, 0xde, sizeof(BINDINFO[2])); src[0].cbSize = sizeof(BINDINFO); dest[0].cbSize = 0; hres = pCopyBindInfo(src, dest); - ok(hres == E_INVALIDARG, "CopyBindInfo retuned: %08x, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "CopyBindInfo returned: %08x, expected E_INVALIDARG\n", hres); memset(src, 0, sizeof(BINDINFO[2])); memset(dest, 0xde, sizeof(BINDINFO[2])); diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 01d52ea..a55db96 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1371,7 +1371,7 @@ static HRESULT WINAPI BindInfo_GetBindString(IInternetBindInfo *iface, ULONG ulS CHECK_EXPECT(GetBindString_USER_AGENT); ok(cEl == 1, "cEl=%d, expected 1\n", cEl); if(pcElFetched) { - ok(*pcElFetched == 0, "*pcElFetch=%d, expectd 0\n", *pcElFetched); + ok(*pcElFetched == 0, "*pcElFetch=%d, expected 0\n", *pcElFetched); *pcElFetched = 1; } if(ppwzStr) { @@ -1383,14 +1383,14 @@ static HRESULT WINAPI BindInfo_GetBindString(IInternetBindInfo *iface, ULONG ulS CHECK_EXPECT(GetBindString_POST_COOKIE); ok(cEl == 1, "cEl=%d, expected 1\n", cEl); if(pcElFetched) - ok(*pcElFetched == 0, "*pcElFetch=%d, expectd 0\n", *pcElFetched); + ok(*pcElFetched == 0, "*pcElFetch=%d, expected 0\n", *pcElFetched); return S_OK; case BINDSTRING_URL: { DWORD size; CHECK_EXPECT(GetBindString_URL); ok(cEl == 1, "cEl=%d, expected 1\n", cEl); - ok(*pcElFetched == 0, "*pcElFetch=%d, expectd 0\n", *pcElFetched); + ok(*pcElFetched == 0, "*pcElFetch=%d, expected 0\n", *pcElFetched); *pcElFetched = 1; size = (lstrlenW(binding_urls[tested_protocol])+1)*sizeof(WCHAR); diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index b6d5ef6..0d22fa5 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -378,12 +378,12 @@ static void test_changesize( DWORD style) /* first make it slightly smaller */ MoveWindow( hCombo, 10, 10, clwidth - 2, clheight - 2, TRUE); GetClientRect( hCombo, &rc); - ok( rc.right - rc.left == clwidth - 2, "clientrect witdh is %d vs %d\n", + ok( rc.right - rc.left == clwidth - 2, "clientrect width is %d vs %d\n", rc.right - rc.left, clwidth - 2); ok( rc.bottom - rc.top == clheight, "clientrect height is %d vs %d\n", rc.bottom - rc.top, clheight); SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&rc); - ok( rc.right - rc.left == clwidth - 2, "drop-down rect witdh is %d vs %d\n", + ok( rc.right - rc.left == clwidth - 2, "drop-down rect width is %d vs %d\n", rc.right - rc.left, clwidth - 2); ok( rc.bottom - rc.top == ddheight, "drop-down rect height is %d vs %d\n", rc.bottom - rc.top, ddheight); @@ -392,12 +392,12 @@ static void test_changesize( DWORD style) /* new cx, cy is slightly bigger than the initial values */ MoveWindow( hCombo, 10, 10, clwidth + 2, clheight + 2, TRUE); GetClientRect( hCombo, &rc); - ok( rc.right - rc.left == clwidth + 2, "clientrect witdh is %d vs %d\n", + ok( rc.right - rc.left == clwidth + 2, "clientrect width is %d vs %d\n", rc.right - rc.left, clwidth + 2); ok( rc.bottom - rc.top == clheight, "clientrect height is %d vs %d\n", rc.bottom - rc.top, clheight); SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&rc); - ok( rc.right - rc.left == clwidth + 2, "drop-down rect witdh is %d vs %d\n", + ok( rc.right - rc.left == clwidth + 2, "drop-down rect width is %d vs %d\n", rc.right - rc.left, clwidth + 2); todo_wine { ok( rc.bottom - rc.top == clheight + 2, "drop-down rect height is %d vs %d\n",

1 0

Nikolay Sivov : d3dx9: Use proper enum member (Clang).
by Alexandre Julliard Nov. 27, 2015

Nov. 27, 2015

Module: wine Branch: master Commit: 236d97fed913d2e59d5438b569a8555209d908ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=236d97fed913d2e59d5438b56… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 27 11:53:59 2015 +0300 d3dx9: Use proper enum member (Clang). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index e9d893b..e25480d 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -372,7 +372,7 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(const WCHAR *filename, const D3DXMACR WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL); EnterCriticalSection(&from_file_mutex); - hr = ID3DXInclude_Open(include, D3D_INCLUDE_LOCAL, filename_a, NULL, &buffer, &len); + hr = ID3DXInclude_Open(include, D3DXINC_LOCAL, filename_a, NULL, &buffer, &len); if (FAILED(hr)) { LeaveCriticalSection(&from_file_mutex); @@ -507,7 +507,7 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, filename_len, NULL, NULL); EnterCriticalSection(&from_file_mutex); - hr = ID3DXInclude_Open(include, D3D_INCLUDE_LOCAL, filename_a, NULL, &buffer, &len); + hr = ID3DXInclude_Open(include, D3DXINC_LOCAL, filename_a, NULL, &buffer, &len); if (FAILED(hr)) { LeaveCriticalSection(&from_file_mutex); @@ -630,7 +630,7 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(const WCHAR *filename, const D3DXMA WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL); EnterCriticalSection(&from_file_mutex); - hr = ID3DXInclude_Open(include, D3D_INCLUDE_LOCAL, filename_a, NULL, &buffer, &len); + hr = ID3DXInclude_Open(include, D3DXINC_LOCAL, filename_a, NULL, &buffer, &len); if (FAILED(hr)) { LeaveCriticalSection(&from_file_mutex);

1 0

Alexandre Julliard : gdi32: Periodically flush a window surface if the app is continuously painting.
by Alexandre Julliard Nov. 27, 2015

Nov. 27, 2015

Module: wine Branch: master Commit: 89f12fc1016ef3a0fcf98dfcbe7c41102b7df5e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89f12fc1016ef3a0fcf98dfcb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 27 18:46:43 2015 +0900 gdi32: Periodically flush a window surface if the app is continuously painting. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dc.c | 120 ++++++++++++++++++++++++++----------------------- 1 file changed, 63 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89f12fc1016ef3a0fcf98…

1 0

Andrey Gusev : progman: Fix GROUP_AddGroup() declaration.
by Alexandre Julliard Nov. 27, 2015

Nov. 27, 2015

Module: wine Branch: master Commit: 95baccdf7e6c2bca247a8c67855d0481aac50392 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95baccdf7e6c2bca247a8c678… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Nov 27 01:00:59 2015 +0200 progman: Fix GROUP_AddGroup() declaration. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/progman/progman.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/progman/progman.h b/programs/progman/progman.h index ca42d77..8fd823a 100644 --- a/programs/progman/progman.h +++ b/programs/progman/progman.h @@ -145,10 +145,10 @@ HLOCAL GRPFILE_ReadGroupFile(const char* path); BOOL GRPFILE_WriteGroupFile(HLOCAL hGroup); ATOM GROUP_RegisterGroupWinClass(void); -HLOCAL GROUP_AddGroup(LPCSTR lpszName, LPCSTR lpszGrpFile, INT showcmd, - INT x, INT y, INT width, INT heiht, +HLOCAL GROUP_AddGroup(LPCSTR lpszName, LPCSTR lpszGrpFile, INT nCmdShow, + INT x, INT y, INT width, INT height, INT iconx, INT icony, - BOOL bModifiedFileName, BOOL bOverwriteFileOk, + BOOL bFileNameModified, BOOL bOverwriteFileOk, /* FIXME shouldn't be necessary */ BOOL bSuppressShowWindow); VOID GROUP_NewGroup(void);

1 0

Jacek Caban : ieframe: Silence some noisy FIXMEs.
by Alexandre Julliard Nov. 27, 2015

Nov. 27, 2015

Module: wine Branch: master Commit: 8900609ded78de15d0ee874318043a365accdffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8900609ded78de15d0ee87431… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 27 11:50:12 2015 +0100 ieframe: Silence some noisy FIXMEs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/dochost.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 2d4261a..424868d 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -655,13 +655,13 @@ static HRESULT WINAPI ClOleCommandTarget_QueryStatus(IOleCommandTarget *iface, const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText) { DocHost *This = impl_from_IOleCommandTarget(iface); - ULONG i= 0; - FIXME("(%p)->(%s %u %p %p)\n", This, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, + ULONG i; + + TRACE("(%p)->(%s %u %p %p)\n", This, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, pCmdText); - while (prgCmds && (cCmds > i)) { - FIXME("command_%u: %u, 0x%x\n", i, prgCmds[i].cmdID, prgCmds[i].cmdf); - i++; - } + for(i=0; prgCmds && i < cCmds; i++) + TRACE("unsupported command %u (%x)\n", prgCmds[i].cmdID, prgCmds[i].cmdf); + return E_NOTIMPL; } @@ -690,7 +690,7 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, notify_download_state(This, V_I4(pvaIn)); return S_OK; default: - FIXME("Unimplemented cmdid %d\n", nCmdID); + TRACE("Unimplemented cmdid %d\n", nCmdID); return E_NOTIMPL; } } @@ -742,7 +742,7 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, } default: - FIXME("unsupported command %d of CGID_DocHostCmdPriv\n", nCmdID); + TRACE("unsupported command %d of CGID_DocHostCmdPriv\n", nCmdID); return E_NOTIMPL; } } @@ -755,7 +755,7 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, return S_OK; default: - FIXME("Unimplemented cmdid %d of CGID_Explorer\n", nCmdID); + TRACE("Unimplemented cmdid %d of CGID_Explorer\n", nCmdID); return E_NOTIMPL; } } @@ -763,7 +763,7 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, if(IsEqualGUID(pguidCmdGroup, &CGID_ShellDocView)) { switch(nCmdID) { default: - FIXME("Unimplemented cmdid %d of CGID_ShellDocView\n", nCmdID); + TRACE("Unimplemented cmdid %d of CGID_ShellDocView\n", nCmdID); return E_NOTIMPL; } } @@ -774,7 +774,7 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, return IOleCommandTarget_Exec(This->olecmd, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); } - FIXME("Unimplemented cmdid %d of group %s\n", nCmdID, debugstr_guid(pguidCmdGroup)); + TRACE("Unimplemented cmdid %d of group %s\n", nCmdID, debugstr_guid(pguidCmdGroup)); return E_NOTIMPL; }

1 0

Alexandre Julliard : Release 1.8-rc2.
by Alexandre Julliard Nov. 27, 2015

Nov. 27, 2015

Module: wine Branch: master Commit: e6c67c52757508ce92c3819bb14e87c2ab21fa20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6c67c52757508ce92c3819bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 27 23:18:47 2015 +0900 Release 1.8-rc2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 410 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 2 + VERSION | 2 +- configure | 18 +-- 4 files changed, 227 insertions(+), 205 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6c67c52757508ce92c38…

1 0