wine-commits January 2016

wine-commits@winehq.org

2 participants
627 discussions

Sebastian Lackner : cmd: Fix sharing permissions of piped output files.
by Alexandre Julliard 09 Jan '16

09 Jan '16

Module: wine Branch: master Commit: c634f34aae0d35d3fe9a687abd86e8c0832b7d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c634f34aae0d35d3fe9a687ab… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jan 7 08:01:38 2016 +0100 cmd: Fix sharing permissions of piped output files. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd.exp | 2 +- programs/cmd/wcmdmain.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 811ba9f..7543b53 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1207,7 +1207,7 @@ passed --- a batch file can delete itself file correctly deleted --- a batch file can alter itself -@todo_wine@bar +bar ---------- Testing copy Passed: Found expected dummy.file Passed: Found expected dir1\file1 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index bf988f5..de92e0a 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1364,7 +1364,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, if (cmdList && (*cmdList)->pipeFile[0] != 0x00) { WINE_TRACE("Input coming from %s\n", wine_dbgstr_w((*cmdList)->pipeFile)); h = CreateFileW((*cmdList)->pipeFile, GENERIC_READ, - FILE_SHARE_READ, &sa, OPEN_EXISTING, + FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, NULL); if (h == INVALID_HANDLE_VALUE) { WCMD_print_error (); @@ -1425,8 +1425,8 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, } else { WCHAR *param = WCMD_parameter(p, 0, NULL, FALSE, FALSE); - h = CreateFileW(param, GENERIC_WRITE, 0, &sa, creationDisposition, - FILE_ATTRIBUTE_NORMAL, NULL); + h = CreateFileW(param, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_DELETE, + &sa, creationDisposition, FILE_ATTRIBUTE_NORMAL, NULL); if (h == INVALID_HANDLE_VALUE) { WCMD_print_error (); heap_free(cmd);

1 0

Sebastian Lackner : mshtml: Fix prototype of nsIDOMWindowUtils:: SetDisplayPortMarginsForElement.
by Alexandre Julliard 09 Jan '16

09 Jan '16

Module: wine Branch: master Commit: fedfe2ea2eaa67aaa9bcd6d6973cf0501d9123d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fedfe2ea2eaa67aaa9bcd6d69… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jan 7 08:41:20 2016 +0100 mshtml: Fix prototype of nsIDOMWindowUtils::SetDisplayPortMarginsForElement. Also add missing comments for some thiscall functions. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsiface.idl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index ccb2547..1f162d7 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -2961,7 +2961,7 @@ interface nsIDOMWindowUtils : nsISupports nsresult SetDisplayPortForElement(float aXPx, float aYPx, float aWidthPx, float aHeightPx, nsIDOMElement *aElement, uint32_t aPriority); nsresult SetDisplayPortMarginsForElement(float aLeftMargin, float aTopMargin, float aRightMargin, float aBottomMargin, - uint32_t aAlignmentX, uint32_t aAlignmentY, nsIDOMElement *aElement, uint32_t aPriority); + nsIDOMElement *aElement, uint32_t aPriority); nsresult SetDisplayPortBaseForElement(int32_t aX, int32_t aY, int32_t aWidth, int32_t aHeight, nsIDOMElement *aElement); nsresult SetResolution(float aResolution); nsresult GetResolution(float *aResolution); @@ -3893,8 +3893,8 @@ interface nsIDocShell : nsIDocShellTreeItem nsresult GatherCharsetMenuTelemetry(); nsresult GetForcedCharset(nsIAtom **aForcedCharset); nsresult SetForcedCharset(nsIAtom *aForcedCharset); - void SetParentCharset(const nsACString *parentCharset, int32_t parentCharsetSource, nsIPrincipal *parentCharsetPrincipal); - void GetParentCharset(nsACString *parentCharset, int32_t *parentCharsetSource, nsIPrincipal **parentCharsetPrincipal); + void /* thiscall */ SetParentCharset(const nsACString *parentCharset, int32_t parentCharsetSource, nsIPrincipal *parentCharsetPrincipal); + void /* thiscall */ GetParentCharset(nsACString *parentCharset, int32_t *parentCharsetSource, nsIPrincipal **parentCharsetPrincipal); nsresult GetRecordProfileTimelineMarkers(bool *aRecordProfileTimelineMarkers); nsresult SetRecordProfileTimelineMarkers(bool aRecordProfileTimelineMarkers); nsresult Now(int /* DOMHighResTimeStamp */ *_retval); @@ -3921,7 +3921,7 @@ interface nsIDocShell : nsIDocShellTreeItem nsresult SetSandboxFlags(uint32_t aSandboxFlags); nsresult GetOnePermittedSandboxedNavigator(nsIDocShell **aOnePermittedSandboxedNavigator); nsresult SetOnePermittedSandboxedNavigator(nsIDocShell *aOnePermittedSandboxedNavigator); - bool IsSandboxedFrom(nsIDocShell *aTargetDocShell); + bool /* thiscall */ IsSandboxedFrom(nsIDocShell *aTargetDocShell); nsresult GetMixedContentChannel(nsIChannel **aMixedContentChannel); nsresult SetMixedContentChannel(nsIChannel *aMixedContentChannel); nsresult GetAllowMixedContentAndConnectionData(bool *rootHasSecureConnection, bool *allowMixedContent, bool *isRootDocShell);

1 0

Jacek Caban : jscript: Added support for Function constructor called as a function.
by Alexandre Julliard 06 Jan '16

06 Jan '16

Module: wine Branch: master Commit: d7e4193df2f22a87031e44ce358a626a5f92b295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7e4193df2f22a87031e44ce3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 6 16:29:42 2016 +0100 jscript: Added support for Function constructor called as a function. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/function.c | 1 + dlls/jscript/tests/api.js | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 0ac6c61..dcddf59 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -821,6 +821,7 @@ static HRESULT FunctionConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla TRACE("\n"); switch(flags) { + case DISPATCH_METHOD: case DISPATCH_CONSTRUCT: { IDispatch *ret; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index f4f42b0..78145c6 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1869,6 +1869,16 @@ ok(tmp === undefined, "func() = " + tmp); tmp = func.toString(); ok(tmp == "function anonymous() {\n\n}", "func.toString() = " + tmp); +// Function constructor called as function +func = Function("return 3;"); + +tmp = func(); +ok(tmp === 3, "func() = " + tmp); +ok(func.call() === 3, "func.call() = " + tmp); +ok(func.length === 0, "func.length = " + func.length); +tmp = func.toString(); +ok(tmp === "function anonymous() {\nreturn 3;\n}", "func.toString() = " + tmp); + func = (function() { var tmp = 3; return new Function("return tmp;");

1 0

Jared Smudde : shlwapi: Fix OS_TABLETPC typo.
by Alexandre Julliard 06 Jan '16

06 Jan '16

Module: wine Branch: master Commit: 1c2dd4b3e750f0ab51232660fa317369ff6711e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c2dd4b3e750f0ab51232660f… Author: Jared Smudde <computerwhiz02(a)hotmail.com> Date: Tue Jan 5 21:42:11 2016 -0600 shlwapi: Fix OS_TABLETPC typo. Signed-off-by: Jared Smudde <computerwhiz02(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/ordinal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 699fcc6..e3d021f 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4045,7 +4045,7 @@ BOOL WINAPI IsOS(DWORD feature) case OS_SMALLBUSINESSSERVER: ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT) case OS_TABLETPC: - FIXME("(OS_TABLEPC) What should we return here?\n"); + FIXME("(OS_TABLETPC) What should we return here?\n"); return FALSE; case OS_SERVERADMINUI: FIXME("(OS_SERVERADMINUI) What should we return here?\n");

1 0

Jared Smudde : winefile: Set MDI child icon.
by Alexandre Julliard 06 Jan '16

06 Jan '16

Module: wine Branch: master Commit: 4b4288f86961055bcd0cb45af1502fe615f45738 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b4288f86961055bcd0cb45af… Author: Jared Smudde <computerwhiz02(a)hotmail.com> Date: Thu Dec 31 13:34:33 2015 -0600 winefile: Set MDI child icon. Signed-off-by: Jared Smudde <computerwhiz02(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winefile/winefile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 34830c5..9d3f0e1 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -4214,7 +4214,7 @@ static void InitInstance(HINSTANCE hinstance) wcChild.cbClsExtra = 0; wcChild.cbWndExtra = 0; wcChild.hInstance = hinstance; - wcChild.hIcon = 0; + wcChild.hIcon = LoadIconW(hinstance, MAKEINTRESOURCEW(IDI_WINEFILE)); wcChild.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); wcChild.hbrBackground = 0; wcChild.lpszMenuName = 0;

1 0

Nikolay Sivov : ieframe: Don' t write icon file path and index to storage if not specified in shortcut ( Valgrind).
by Alexandre Julliard 06 Jan '16

06 Jan '16

Module: wine Branch: master Commit: 41ff20886a2165005645f4da49bc7ef9e3650716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41ff20886a2165005645f4da4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 1 19:51:59 2016 +0300 ieframe: Don't write icon file path and index to storage if not specified in shortcut (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/intshcut.c | 13 ++++-------- dlls/ieframe/tests/intshcut.c | 46 ++++++++++++++++++++++++++++++++++--------- 2 files changed, 41 insertions(+), 18 deletions(-) diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index b2d3ba9..19b253d 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -506,8 +506,7 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &pPropStg); - get_profile_string(str_header, str_iconfile, pszFileName, &iconfile); - if (iconfile != NULL) + if (get_profile_string(str_header, str_iconfile, pszFileName, &iconfile)) { PROPSPEC ps; PROPVARIANT pv; @@ -520,13 +519,10 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam { TRACE("Failed to store the iconfile to our property storage. hr = 0x%x\n", hr); } - - CoTaskMemFree(iconfile); } + CoTaskMemFree(iconfile); - get_profile_string(str_header, str_iconindex, pszFileName, &iconindexstring); - - if (iconindexstring != NULL) + if (get_profile_string(str_header, str_iconindex, pszFileName, &iconindexstring)) { int iconindex; PROPSPEC ps; @@ -543,9 +539,8 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam { TRACE("Failed to store the iconindex to our property storage. hr = 0x%x\n", hr); } - - CoTaskMemFree(iconindexstring); } + CoTaskMemFree(iconindexstring); IPropertyStorage_Release(pPropStg); } diff --git a/dlls/ieframe/tests/intshcut.c b/dlls/ieframe/tests/intshcut.c index 75c6cfb..2a5f2df 100644 --- a/dlls/ieframe/tests/intshcut.c +++ b/dlls/ieframe/tests/intshcut.c @@ -213,7 +213,7 @@ static void test_ReadAndWriteProperties(void) pv[0].vt = VT_LPWSTR; U(pv[0]).pwszVal = (void *) iconPath; pv[1].vt = VT_I4; - U(pv[1]).iVal = iconIndex; + U(pv[1]).lVal = iconIndex; hr = urlA->lpVtbl->QueryInterface(urlA, &IID_IPropertySetStorage, (void **) &pPropSetStg); ok(hr == S_OK, "Unable to get an IPropertySetStorage, hr=0x%x\n", hr); @@ -261,16 +261,16 @@ static void test_ReadAndWriteProperties(void) hr = IPropertySetStorage_Open(pPropSetStg, &FMTID_Intshcut, STGM_READ | STGM_SHARE_EXCLUSIVE, &pPropStgRead); ok(hr == S_OK, "Unable to get an IPropertyStorage for reading, hr=0x%x\n", hr); + memset(pvread, 0, sizeof(pvread)); hr = IPropertyStorage_ReadMultiple(pPropStgRead, 2, ps, pvread); + todo_wine /* Wine doesn't yet support setting properties after save */ + { ok(hr == S_OK, "Unable to read properties, hr=0x%x\n", hr); - - todo_wine /* Wine doesn't yet support setting properties after save */ - { - ok(U(pvread[1]).iVal == iconIndex, "Read wrong icon index: %d\n", U(pvread[1]).iVal); - - ok(lstrcmpW(U(pvread[0]).pwszVal, iconPath) == 0, "Wrong icon path read: %s\n", wine_dbgstr_w(U(pvread[0]).pwszVal)); - } - + ok(pvread[1].vt == VT_I4, "got %d\n", pvread[1].vt); + ok(U(pvread[1]).lVal == iconIndex, "Read wrong icon index: %d\n", U(pvread[1]).iVal); + ok(pvread[0].vt == VT_LPWSTR, "got %d\n", pvread[0].vt); + ok(lstrcmpW(U(pvread[0]).pwszVal, iconPath) == 0, "Wrong icon path read: %s\n", wine_dbgstr_w(U(pvread[0]).pwszVal)); + } PropVariantClear(&pvread[0]); PropVariantClear(&pvread[1]); IPropertyStorage_Release(pPropStgRead); @@ -335,6 +335,11 @@ static void test_Load(void) lstrcatW(file_path, test_urlW); for(test = load_tests; test < load_tests + sizeof(load_tests)/sizeof(*load_tests); test++) { + IPropertySetStorage *propsetstorage; + IPropertyStorage *propstorage; + PROPVARIANT v; + PROPSPEC ps; + file = CreateFileW(file_path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); ok(file != INVALID_HANDLE_VALUE, "could not create test file\n"); if(file == INVALID_HANDLE_VALUE) @@ -351,6 +356,29 @@ static void test_Load(void) test_shortcut_url((IUnknown*)persist_file, test->url); + hres = IPersistFile_QueryInterface(persist_file, &IID_IPropertySetStorage, (void **)&propsetstorage); + ok(hres == S_OK, "Unable to get an IPropertySetStorage, hr=0x%x\n", hres); + + hres = IPropertySetStorage_Open(propsetstorage, &FMTID_Intshcut, STGM_READ | STGM_SHARE_EXCLUSIVE, &propstorage); + ok(hres == S_OK, "Unable to get an IPropertyStorage for reading, hr=0x%x\n", hres); + + ps.ulKind = PRSPEC_PROPID; + U(ps).propid = PID_IS_ICONFILE; + v.vt = VT_NULL; + hres = IPropertyStorage_ReadMultiple(propstorage, 1, &ps, &v); + ok(hres == S_FALSE, "got 0x%08x\n", hres); + ok(v.vt == VT_EMPTY, "got %d\n", v.vt); + + ps.ulKind = PRSPEC_PROPID; + U(ps).propid = PID_IS_ICONINDEX; + v.vt = VT_EMPTY; + hres = IPropertyStorage_ReadMultiple(propstorage, 1, &ps, &v); + ok(hres == S_FALSE, "got 0x%08x\n", hres); + ok(v.vt == VT_EMPTY, "got %d\n", v.vt); + + IPropertyStorage_Release(propstorage); + IPropertySetStorage_Release(propsetstorage); + IPersistFile_Release(persist_file); DeleteFileW(file_path); }

1 0

Nikolay Sivov : xaudio2: Added missing break in a switch (Coverity).
by Alexandre Julliard 06 Jan '16

06 Jan '16

Module: wine Branch: master Commit: f9be2024dab321ec00f30ed5a806ea0a7a8c60ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9be2024dab321ec00f30ed5a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 6 17:56:05 2016 +0300 xaudio2: Added missing break in a switch (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index e7176b2..1f5a91f 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -449,6 +449,7 @@ static ALenum get_al_format(const WAVEFORMATEX *fmt) case 8: return AL_FORMAT_71CHN8; } + break; case 16: switch(fmt->nChannels){ case 1:

1 0

Henri Verbeet : ddraw: Only allow DDSCAPS_MIPMAP on textures.
by Alexandre Julliard 06 Jan '16

06 Jan '16

Module: wine Branch: master Commit: 521e3a44cfac3bdecc9ee2078f63a71e164623c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=521e3a44cfac3bdecc9ee2078… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 6 15:52:07 2016 +0100 ddraw: Only allow DDSCAPS_MIPMAP on textures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 7 +++++++ dlls/ddraw/tests/ddraw1.c | 1 + dlls/ddraw/tests/ddraw2.c | 1 + dlls/ddraw/tests/ddraw4.c | 1 + dlls/ddraw/tests/ddraw7.c | 1 + 5 files changed, 11 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 9b845d2..3cf7a56 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5733,6 +5733,13 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return DDERR_INVALIDCAPS; } + if ((desc->ddsCaps.dwCaps & DDSCAPS_MIPMAP) && !(desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE)) + { + WARN("DDSCAPS_MIPMAP requested without DDSCAPS_TEXTURE.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDCAPS; + } + if ((desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP_ALLFACES) && !(desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP)) { diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 8530066..25b988a 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -5003,6 +5003,7 @@ static void test_mipmap(void) {DDSD_MIPMAPCOUNT, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 128, 32, 3, DD_OK, 3}, {DDSD_MIPMAPCOUNT, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 128, 32, 0, DDERR_INVALIDPARAMS, 0}, {0, DDSCAPS_TEXTURE | DDSCAPS_MIPMAP, 128, 32, 0, DD_OK, 1}, + {0, DDSCAPS_MIPMAP, 128, 32, 0, DDERR_INVALIDCAPS, 0}, {0, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 128, 32, 0, DD_OK, 6}, {0, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 32, 64, 0, DD_OK, 6}, }; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 66bb680..2e26c52 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6046,6 +6046,7 @@ static void test_mipmap(void) {DDSD_MIPMAPCOUNT, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 128, 32, 3, DD_OK, 3}, {DDSD_MIPMAPCOUNT, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 128, 32, 0, DDERR_INVALIDPARAMS, 0}, {0, DDSCAPS_TEXTURE | DDSCAPS_MIPMAP, 128, 32, 0, DD_OK, 1}, + {0, DDSCAPS_MIPMAP, 128, 32, 0, DDERR_INVALIDCAPS, 0}, {0, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 128, 32, 0, DD_OK, 6}, {0, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 32, 64, 0, DD_OK, 6}, }; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index f25516f..8b99eaa 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -7578,6 +7578,7 @@ static void test_mipmap(void) {DDSD_MIPMAPCOUNT, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 128, 32, 3, DD_OK, 3}, {DDSD_MIPMAPCOUNT, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 128, 32, 0, DDERR_INVALIDPARAMS, 0}, {0, DDSCAPS_TEXTURE | DDSCAPS_MIPMAP, 128, 32, 0, DD_OK, 1}, + {0, DDSCAPS_MIPMAP, 128, 32, 0, DDERR_INVALIDCAPS, 0}, {0, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 128, 32, 0, DD_OK, 6}, {0, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 32, 64, 0, DD_OK, 6}, }; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 3df6116..97ce7aa 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7427,6 +7427,7 @@ static void test_mipmap(void) {DDSD_MIPMAPCOUNT, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 128, 32, 3, DD_OK, 3}, {DDSD_MIPMAPCOUNT, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 128, 32, 0, DDERR_INVALIDPARAMS, 0}, {0, DDSCAPS_TEXTURE | DDSCAPS_MIPMAP, 128, 32, 0, DD_OK, 1}, + {0, DDSCAPS_MIPMAP, 128, 32, 0, DDERR_INVALIDCAPS, 0}, {0, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 128, 32, 0, DD_OK, 8}, {0, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 32, 64, 0, DD_OK, 7}, };

1 0

Henri Verbeet : ddraw/tests: Merge MipMapCreationTest() with test_mipmap_lock().
by Alexandre Julliard 06 Jan '16

06 Jan '16

Module: wine Branch: master Commit: cac1242a63cb4f1a083be773904e0b7e01016dcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac1242a63cb4f1a083be7739… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 6 15:52:06 2016 +0100 ddraw/tests: Merge MipMapCreationTest() with test_mipmap_lock(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 95 +++++++++++++++++++-------- dlls/ddraw/tests/ddraw2.c | 101 ++++++++++++++++++++--------- dlls/ddraw/tests/ddraw4.c | 95 +++++++++++++++++++-------- dlls/ddraw/tests/ddraw7.c | 95 +++++++++++++++++++-------- dlls/ddraw/tests/dsurface.c | 153 -------------------------------------------- 5 files changed, 275 insertions(+), 264 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cac1242a63cb4f1a083be…

1 0

Henri Verbeet : ddraw: Use the largest dimension to determine the mipmap count for version 7 surfaces.
by Alexandre Julliard 06 Jan '16

06 Jan '16

Module: wine Branch: master Commit: e53567f72abd99d7667f2f7b58ed3a5943eb0c80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e53567f72abd99d7667f2f7b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 6 15:52:05 2016 +0100 ddraw: Use the largest dimension to determine the mipmap count for version 7 surfaces. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 0976603..9b845d2 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5873,7 +5873,10 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ { /* Undocumented feature: Create sublevels until either the * width or the height is 1. */ - desc->u2.dwMipMapCount = wined3d_log2i(min(desc->dwWidth, desc->dwHeight)) + 1; + if (version == 7) + desc->u2.dwMipMapCount = wined3d_log2i(max(desc->dwWidth, desc->dwHeight)) + 1; + else + desc->u2.dwMipMapCount = wined3d_log2i(min(desc->dwWidth, desc->dwHeight)) + 1; } } else

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2016