February 2013 - Wine-Commits

Andrew Talbot : mmdevapi: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 13, 2013

Feb. 13, 2013

Module: wine Branch: master Commit: b6717dd3b1c88d5cb6cba510e4d7a79dcb2ec9b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6717dd3b1c88d5cb6cba510e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Feb 12 22:20:09 2013 +0000 mmdevapi: Avoid signed-unsigned integer comparisons. --- dlls/mmdevapi/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 1518b02..e19f27d 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -271,7 +271,7 @@ static IClassFactoryImpl MMDEVAPI_CF[] = { HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { - int i = 0; + unsigned int i = 0; TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); if(!init_driver()){

1 0

André Hentschel : winedbg: Add PState to cpu_register_map for ARM64.
by Alexandre Julliard Feb. 13, 2013

Feb. 13, 2013

Module: wine Branch: master Commit: dd8ec9994b0ee8487d4c7afb9073c9f50957832b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd8ec9994b0ee8487d4c7afb9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 12 23:02:17 2013 +0100 winedbg: Add PState to cpu_register_map for ARM64. --- programs/winedbg/gdbproxy.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 0caed37..bbd3898 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -423,6 +423,7 @@ static struct cpu_register cpu_register_map[] = { REG(X30, 8), REG(Sp, 8), REG(Pc, 8), + REG(PState, 8), }; #else # error Define the registers map for your CPU

1 0

Austin English : d3d11: Add a stub for D3D11CreateDevice.
by Alexandre Julliard Feb. 13, 2013

Feb. 13, 2013

Module: wine Branch: master Commit: 0130eca6a0d6a2cd5d98ac3a008fcf0c224e9f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0130eca6a0d6a2cd5d98ac3a0… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 12 15:44:15 2013 -0800 d3d11: Add a stub for D3D11CreateDevice. --- dlls/d3d11/Makefile.in | 3 ++ dlls/d3d11/d3d11.spec | 2 +- dlls/d3d11/d3d11_main.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 1 deletions(-) diff --git a/dlls/d3d11/Makefile.in b/dlls/d3d11/Makefile.in index ef3c5a0..da7bbe6 100644 --- a/dlls/d3d11/Makefile.in +++ b/dlls/d3d11/Makefile.in @@ -1,3 +1,6 @@ MODULE = d3d11.dll +C_SRCS = \ + d3d11_main.c + @MAKE_DLL_RULES@ diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 0ff00d2..ffe0712 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -2,7 +2,7 @@ @ stub D3D11CoreCreateLayeredDevice @ stub D3D11CoreGetLayeredDeviceSize @ stub D3D11CoreRegisterLayers -@ stub D3D11CreateDevice +@ stdcall D3D11CreateDevice(ptr long ptr long long long long ptr ptr ptr) @ stub D3D11CreateDeviceAndSwapChain @ stub D3DKMTCloseAdapter @ stub D3DKMTCreateAllocation diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c new file mode 100644 index 0000000..4091bca --- /dev/null +++ b/dlls/d3d11/d3d11_main.c @@ -0,0 +1,56 @@ +/* + * Direct3D 11 + * + * Copyright 2013 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "d3d11.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d11); + +const char *debug_d3d_driver_type(D3D_DRIVER_TYPE driver_type) +{ + switch(driver_type) + { +#define D3D11_TO_STR(x) case x: return #x + D3D11_TO_STR(D3D_DRIVER_TYPE_UNKNOWN); + D3D11_TO_STR(D3D_DRIVER_TYPE_HARDWARE); + D3D11_TO_STR(D3D_DRIVER_TYPE_REFERENCE); + D3D11_TO_STR(D3D_DRIVER_TYPE_NULL); + D3D11_TO_STR(D3D_DRIVER_TYPE_SOFTWARE); + D3D11_TO_STR(D3D_DRIVER_TYPE_WARP); +#undef D3D11_TO_STR + default: + return wine_dbg_sprintf("Unrecognized D3D_DRIVER_TYPE %#x\n", driver_type); + } +} + +HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, + const D3D_FEATURE_LEVEL feature_levels, UINT levels, UINT sdk_version, + ID3D11Device **device, D3D_FEATURE_LEVEL *feature_level, ID3D11DeviceContext **context) +{ + FIXME("stub: adapter %p, driver_type %s, swrast %p, flags %#x, feature_levels %d, levels %#x, sdk_version %d, " + "device %p, feature_level %p, context %p\n", adapter, debug_d3d_driver_type(driver_type), swrast, + flags, feature_levels, levels, sdk_version, device, feature_level, context); + return E_OUTOFMEMORY; +}

1 0

Andrew Talbot : mscoree: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 13, 2013

Feb. 13, 2013

Module: wine Branch: master Commit: 14afcb8ccd72609973520937011b17205f89c724 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14afcb8ccd726099735209370… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Feb 12 22:20:14 2013 +0000 mscoree: Avoid signed-unsigned integer comparisons. --- dlls/mscoree/metahost.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 66dde5d..eb3bc93 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -871,7 +871,7 @@ static HRESULT WINAPI InstalledRuntimeEnum_Next(IEnumUnknown *iface, ULONG celt, IUnknown **rgelt, ULONG *pceltFetched) { struct InstalledRuntimeEnum *This = impl_from_IEnumUnknown(iface); - int num_fetched = 0; + ULONG num_fetched = 0; HRESULT hr=S_OK; IUnknown *item; @@ -903,7 +903,7 @@ static HRESULT WINAPI InstalledRuntimeEnum_Next(IEnumUnknown *iface, ULONG celt, static HRESULT WINAPI InstalledRuntimeEnum_Skip(IEnumUnknown *iface, ULONG celt) { struct InstalledRuntimeEnum *This = impl_from_IEnumUnknown(iface); - int num_fetched = 0; + ULONG num_fetched = 0; HRESULT hr=S_OK; TRACE("(%p,%u)\n", iface, celt);

1 0

Hans Leidekker : wininet/tests: Fix a test failure.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: c68bb8da7fad5d519a363b640254500d7deefb80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c68bb8da7fad5d519a363b640… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 12 17:42:40 2013 +0100 wininet/tests: Fix a test failure. --- dlls/wininet/tests/ftp.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 7fbbe41..9d0cf3e 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -257,10 +257,8 @@ static void test_getfile(HINTERNET hFtp, HINTERNET hConnect) "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); /* Zero attributes */ - SetLastError(0xdeadbeef); bRet = FtpGetFileA(hFtp, "welcome.msg", "should_be_existing_non_deadbeef", FALSE, 0, FTP_TRANSFER_TYPE_UNKNOWN, 0); ok ( bRet == TRUE, "Expected FtpGetFileA to succeed\n"); - ok (GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); ok (GetFileAttributesA("should_be_existing_non_deadbeef") != INVALID_FILE_ATTRIBUTES, "Local file should have been created\n"); DeleteFileA("should_be_existing_non_deadbeef");

1 0

Jacek Caban : urlmon: Fixed QueryInfo tests during BINDSTATUS_PROXYDETECTING notification.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: 76997f1a38ec7157890c07154e40d00d8fcb3cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76997f1a38ec7157890c07154… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 12 17:17:47 2013 +0100 urlmon: Fixed QueryInfo tests during BINDSTATUS_PROXYDETECTING notification. --- dlls/urlmon/tests/url.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 11d04c3..a7d0603 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1463,8 +1463,8 @@ static void test_WinInetHttpInfo(IWinInetHttpInfo *http_info, DWORD progress) size = sizeof(DWORD); hres = IWinInetHttpInfo_QueryInfo(http_info, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL, NULL); - ok(hres == expect || (progress == BINDSTATUS_COOKIE_SENT && hres == S_FALSE), - "hres = %x, expected %x\n", hres, expect); + ok(hres == expect || ((progress == BINDSTATUS_COOKIE_SENT || progress == BINDSTATUS_PROXYDETECTING) && hres == S_FALSE), + "progress %u: hres = %x, expected %x\n", progress, hres, expect); if(hres == S_OK) { if(download_state==BEFORE_DOWNLOAD && progress!=BINDSTATUS_MIMETYPEAVAILABLE) ok(status == 0, "status = %d\n", status);

1 0

Jacek Caban : urlmon: Clean up handling tested URLs.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: c8a4ce89d0b5e67c37a70a48c75db2027e596869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8a4ce89d0b5e67c37a70a48c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 12 17:17:02 2013 +0100 urlmon: Clean up handling tested URLs. --- dlls/urlmon/tests/url.c | 142 ++++++++++++++++++++++------------------------- 1 files changed, 67 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8a4ce89d0b5e67c37a70…

1 0

Jacek Caban : urlmon: Fixed tests on IEs that report BINDSTATUS_DECODING.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: abf8d628881281716924cddb0fa31deb50be6786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abf8d628881281716924cddb0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 12 17:22:15 2013 +0100 urlmon: Fixed tests on IEs that report BINDSTATUS_DECODING. This seems to happen on some IE versions that decode gzip streams in urlmon (as opposed to wininet). --- dlls/urlmon/tests/url.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index d00ebfe..a31a8a0 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1468,10 +1468,10 @@ static void test_WinInetHttpInfo(IWinInetHttpInfo *http_info, DWORD progress) ok(hres == expect || ((progress == BINDSTATUS_COOKIE_SENT || progress == BINDSTATUS_PROXYDETECTING) && hres == S_FALSE), "progress %u: hres = %x, expected %x\n", progress, hres, expect); if(hres == S_OK) { - if(download_state==BEFORE_DOWNLOAD && progress!=BINDSTATUS_MIMETYPEAVAILABLE) - ok(status == 0, "status = %d\n", status); + if(download_state == BEFORE_DOWNLOAD && progress != BINDSTATUS_MIMETYPEAVAILABLE && progress != BINDSTATUS_DECODING) + ok(status == 0, "progress %u: status = %d\n", progress, status); else - ok(status == HTTP_STATUS_OK, "status = %d\n", status); + ok(status == HTTP_STATUS_OK, "progress %u: status = %d\n", progress, status); ok(size == sizeof(DWORD), "size = %d\n", size); } @@ -1816,6 +1816,9 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallbackEx *iface, ULONG u case BINDSTATUS_COOKIE_SENT: trace("BINDSTATUS_COOKIE_SENT\n"); break; + case BINDSTATUS_DECODING: + trace("BINDSTATUS_DECODING\n"); + break; default: ok(0, "unexpected code %d\n", ulStatusCode); };

1 0

Jacek Caban : urlmon: Skip reported_url tests when binding to object.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: c1a15b75aa7ee783e1ae3a6c817710004ae0c145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1a15b75aa7ee783e1ae3a6c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 12 17:21:16 2013 +0100 urlmon: Skip reported_url tests when binding to object. This limits the scope of http://source.winehq.org/git/wine.git/commitdiff/259cd7933612abdef0f88f4465… to fix random test failures. This makes the original test questionable, so if we ever see it failing again, we should simply revert it. --- dlls/urlmon/tests/url.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index a7d0603..d00ebfe 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -933,7 +933,9 @@ static HRESULT WINAPI Protocol_Continue(IInternetProtocol *iface, CHECK_EXPECT(Continue); ok(GetCurrentThreadId() == thread_id, "wrong thread %d\n", GetCurrentThreadId()); - ok(reported_url && !lstrcmpW(reported_url, current_url), "wrong url %s\n", wine_dbgstr_w(reported_url)); + + if(!bind_to_object) + ok(reported_url && !lstrcmpW(reported_url, current_url), "wrong url %s\n", wine_dbgstr_w(reported_url)); ok(pProtocolData != NULL, "pProtocolData == NULL\n"); if(!pProtocolData)

1 0

Huw Davies : riched20: Move run extent calculation to wrap.c.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: c07212b3d080cf7df18c5bdb4c0e61c37bac618d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c07212b3d080cf7df18c5bdb4… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 12 15:48:14 2013 +0000 riched20: Move run extent calculation to wrap.c. --- dlls/riched20/editor.h | 3 ++- dlls/riched20/run.c | 26 ++------------------------ dlls/riched20/wrap.c | 29 +++++++++++++++++++++++------ 3 files changed, 27 insertions(+), 31 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 4401498..5383f82 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -147,7 +147,8 @@ int ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2) DECLSPEC_HIDDEN; void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p) DECLSPEC_HIDDEN; ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_Cursor *cursor) DECLSPEC_HIDDEN; void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) DECLSPEC_HIDDEN; -void ME_CalcRunExtent(ME_Context *c, const ME_Paragraph *para, int startx, ME_Run *run) DECLSPEC_HIDDEN; +SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, + int startx, int *pAscent, int *pDescent) DECLSPEC_HIDDEN; SIZE ME_GetRunSize(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, int startx) DECLSPEC_HIDDEN; void ME_CursorFromCharOfs(ME_TextEditor *editor, int nCharOfs, ME_Cursor *pCursor) DECLSPEC_HIDDEN; void ME_RunOfsFromCharOfs(ME_TextEditor *editor, int nCharOfs, ME_DisplayItem **ppPara, ME_DisplayItem **ppRun, int *pOfs) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 6f9d5b5..37445a1 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -530,8 +530,8 @@ int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset) * Finds width, height, ascent and descent of a run, up to given character * (nLen). */ -static SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, - int startx, int *pAscent, int *pDescent) +SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, + int startx, int *pAscent, int *pDescent) { SIZE size; int nMaxLen = run->len; @@ -615,28 +615,6 @@ SIZE ME_GetRunSize(ME_Context *c, const ME_Paragraph *para, } /****************************************************************************** - * ME_CalcRunExtent - * - * Updates the size of the run (fills width, ascent and descent). The height - * is calculated based on whole row's ascent and descent anyway, so no need - * to use it here. - */ -void ME_CalcRunExtent(ME_Context *c, const ME_Paragraph *para, int startx, ME_Run *run) -{ - if (run->nFlags & MERF_HIDDEN) - run->nWidth = 0; - else - { - int nEnd = run->len; - SIZE size = ME_GetRunSizeCommon(c, para, run, nEnd, startx, - &run->nAscent, &run->nDescent); - run->nWidth = size.cx; - if (!size.cx) - WARN("size.cx == 0\n"); - } -} - -/****************************************************************************** * ME_SetSelectionCharFormat * * Applies a style change, either to a current selection, or to insert cursor diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 0531c97..aed04806 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -33,6 +33,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); */ /****************************************************************************** + * calc_run_extent + * + * Updates the size of the run (fills width, ascent and descent). The height + * is calculated based on whole row's ascent and descent anyway, so no need + * to use it here. + */ +static void calc_run_extent(ME_Context *c, const ME_Paragraph *para, int startx, ME_Run *run) +{ + if (run->nFlags & MERF_HIDDEN) run->nWidth = 0; + else + { + SIZE size = ME_GetRunSizeCommon( c, para, run, run->len, startx, &run->nAscent, &run->nDescent ); + run->nWidth = size.cx; + } +} + +/****************************************************************************** * split_run_extents * * Splits a run into two in a given place. It also updates the screen position @@ -62,7 +79,7 @@ static ME_DisplayItem *split_run_extents(ME_WrapContext *wc, ME_DisplayItem *ite run2 = &cursor.pRun->member.run; - ME_CalcRunExtent(wc->context, para, wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, run); + calc_run_extent(wc->context, para, wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, run); run2->pt.x = run->pt.x+run->nWidth; run2->pt.y = run->pt.y; @@ -296,8 +313,8 @@ static void ME_WrapSizeRun(ME_WrapContext *wc, ME_DisplayItem *p) ME_UpdateRunFlags(wc->context->editor, &p->member.run); - ME_CalcRunExtent(wc->context, &wc->pPara->member.para, - wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, &p->member.run); + calc_run_extent(wc->context, &wc->pPara->member.para, + wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, &p->member.run); } @@ -488,9 +505,9 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) if (black) { wc->bOverflown = FALSE; pp = split_run_extents(wc, p, black); - ME_CalcRunExtent(wc->context, &wc->pPara->member.para, - wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, - &pp->member.run); + calc_run_extent(wc->context, &wc->pPara->member.para, + wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, + &pp->member.run); ME_InsertRowStart(wc, pp); return pp; }

1 0