January 2014 - Wine-Commits

Hans Leidekker : wbemprox: Implement Win32_OperatingSystem.Name.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: a1d8886f6ad760caa338e388f0d233bcefa2381e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1d8886f6ad760caa338e388f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 10 09:38:19 2014 +0100 wbemprox: Implement Win32_OperatingSystem.Name. --- dlls/wbemprox/builtin.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 2db27c0..58054de 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -364,6 +364,7 @@ static const struct column col_os[] = { prop_lastbootuptimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, { prop_localdatetimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, { prop_localeW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_nameW, CIM_STRING }, { prop_osarchitectureW, CIM_STRING }, { prop_oslanguageW, CIM_UINT32, VT_I4 }, { prop_osproductsuiteW, CIM_UINT32, VT_I4 }, @@ -520,6 +521,11 @@ static const WCHAR os_32bitW[] = {'3','2','-','b','i','t',0}; static const WCHAR os_64bitW[] = {'6','4','-','b','i','t',0}; +static const WCHAR os_nameW[] = + {'M','i','c','r','o','s','o','f','t',' ','W','i','n','d','o','w','s',' ','X','P',' ', + 'P','r','o','f','e','s','s','i','o','n','a','l','|','C',':','\\','W','I','N','D','O','W','S', + '|','\\','D','e','v','i','c','e','\\','H','a','r','d','d','i','s','k','0', + '\\','P','a','r','t','i','t','i','o','n','1',0}; static const WCHAR os_versionW[] = {'5','.','1','.','2','6','0','0',0}; static const WCHAR sounddevice_productnameW[] = @@ -633,6 +639,7 @@ struct record_operatingsystem const WCHAR *lastbootuptime; const WCHAR *localdatetime; const WCHAR *locale; + const WCHAR *name; const WCHAR *osarchitecture; UINT32 oslanguage; UINT32 osproductsuite; @@ -1943,6 +1950,7 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond ) rec->lastbootuptime = get_lastbootuptime(); rec->localdatetime = get_localdatetime(); rec->locale = get_locale(); + rec->name = os_nameW; rec->osarchitecture = get_osarchitecture(); rec->oslanguage = GetSystemDefaultLangID(); rec->osproductsuite = 2461140; /* Windows XP Professional */

1 0

Frédéric Delanoy : kernel32/tests: Unconstify a character string.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: 7215eb249794928b156856405b553db228bbb370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7215eb249794928b156856405… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jan 10 02:37:02 2014 +0100 kernel32/tests: Unconstify a character string. --- dlls/kernel32/tests/profile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index c6e0b61..ca3a07e 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -92,7 +92,7 @@ static void test_profile_int(void) static void test_profile_string(void) { - static const WCHAR emptyW[] = { 0 }; + static WCHAR emptyW[] = { 0 }; /* if "const", GetPrivateProfileStringW(emptyW, ...) crashes on win2k */ static const WCHAR keyW[] = { 'k','e','y',0 }; static const WCHAR sW[] = { 's',0 }; static const WCHAR TESTFILE2W[] = {'.','\\','t','e','s','t','w','i','n','e','2','.','i','n','i',0};

1 0

Nikolay Sivov : oleaut32: Add missing methods to test IRecordInfo implementation.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: 92ed7c50a910ab80e03792de3e2ef5a5310225c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92ed7c50a910ab80e03792de3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 10 12:17:42 2014 +0400 oleaut32: Add missing methods to test IRecordInfo implementation. --- dlls/oleaut32/tests/safearray.c | 173 ++++++++++++++++++++++++++++++--------- 1 file changed, 134 insertions(+), 39 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 064b038..3e311e3 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -83,32 +83,33 @@ typedef struct IRecordInfoImpl DWORD clearCalled; } IRecordInfoImpl; -static const IRecordInfoVtbl IRecordInfoImpl_VTable; - static inline IRecordInfoImpl *impl_from_IRecordInfo(IRecordInfo *iface) { return CONTAINING_RECORD(iface, IRecordInfoImpl, IRecordInfo_iface); } -static IRecordInfoImpl *IRecordInfoImpl_Construct(void) +static HRESULT WINAPI RecordInfo_QueryInterface(IRecordInfo *iface, REFIID riid, void **obj) { - IRecordInfoImpl *rec; + *obj = NULL; - rec = HeapAlloc(GetProcessHeap(), 0, sizeof(IRecordInfoImpl)); - rec->IRecordInfo_iface.lpVtbl = &IRecordInfoImpl_VTable; - rec->ref = START_REF_COUNT; - rec->clearCalled = 0; - rec->sizeCalled = 0; - return rec; + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IRecordInfo)) + { + *obj = iface; + IRecordInfo_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; } -static ULONG CALLBACK IRecordInfoImpl_AddRef(IRecordInfo *iface) +static ULONG WINAPI RecordInfo_AddRef(IRecordInfo *iface) { IRecordInfoImpl* This = impl_from_IRecordInfo(iface); return InterlockedIncrement(&This->ref); } -static ULONG CALLBACK IRecordInfoImpl_Release(IRecordInfo *iface) +static ULONG WINAPI RecordInfo_Release(IRecordInfo *iface) { IRecordInfoImpl* This = impl_from_IRecordInfo(iface); ULONG ref = InterlockedDecrement(&This->ref); @@ -119,16 +120,40 @@ static ULONG CALLBACK IRecordInfoImpl_Release(IRecordInfo *iface) return ref; } +static HRESULT WINAPI RecordInfo_RecordInit(IRecordInfo *iface, PVOID pvNew) +{ + ok(0, "enexpected call\n"); + return E_NOTIMPL; +} + static BOOL fail_GetSize; /* Whether to fail the GetSize call */ -static HRESULT CALLBACK IRecordInfoImpl_RecordClear(IRecordInfo *iface, PVOID pvExisting) +static HRESULT WINAPI RecordInfo_RecordClear(IRecordInfo *iface, PVOID pvExisting) { IRecordInfoImpl* This = impl_from_IRecordInfo(iface); This->clearCalled++; return S_OK; } -static HRESULT CALLBACK IRecordInfoImpl_GetSize(IRecordInfo *iface, ULONG* size) +static HRESULT WINAPI RecordInfo_RecordCopy(IRecordInfo *iface, PVOID pvExisting, PVOID pvNew) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecordInfo_GetGuid(IRecordInfo *iface, GUID *pguid) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecordInfo_GetName(IRecordInfo *iface, BSTR *pbstrName) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecordInfo_GetSize(IRecordInfo *iface, ULONG* size) { IRecordInfoImpl* This = impl_from_IRecordInfo(iface); This->sizeCalled++; @@ -141,37 +166,107 @@ static HRESULT CALLBACK IRecordInfoImpl_GetSize(IRecordInfo *iface, ULONG* size) return S_OK; } -static HRESULT CALLBACK IRecordInfoImpl_Dummy(IRecordInfo *iface) +static HRESULT WINAPI RecordInfo_GetTypeInfo(IRecordInfo *iface, ITypeInfo **ppTypeInfo) { - trace("Called an unexpected IRecordInfo method - please report!\n"); - /* Quit because we'll just crash anyway */ - fflush(NULL); - exit(255); + ok(0, "unexpected call\n"); + return E_NOTIMPL; } -static const IRecordInfoVtbl IRecordInfoImpl_VTable = +static HRESULT WINAPI RecordInfo_GetField(IRecordInfo *iface, PVOID pvData, + LPCOLESTR szFieldName, VARIANT *pvarField) { - (PVOID)IRecordInfoImpl_Dummy, - IRecordInfoImpl_AddRef, - IRecordInfoImpl_Release, - (PVOID)IRecordInfoImpl_Dummy, - IRecordInfoImpl_RecordClear, - (PVOID)IRecordInfoImpl_Dummy, - (PVOID)IRecordInfoImpl_Dummy, - (PVOID)IRecordInfoImpl_Dummy, - IRecordInfoImpl_GetSize, - (PVOID)IRecordInfoImpl_Dummy, - (PVOID)IRecordInfoImpl_Dummy, - (PVOID)IRecordInfoImpl_Dummy, - (PVOID)IRecordInfoImpl_Dummy, - (PVOID)IRecordInfoImpl_Dummy, - (PVOID)IRecordInfoImpl_Dummy, - (PVOID)IRecordInfoImpl_Dummy, - (PVOID)IRecordInfoImpl_Dummy, - (PVOID)IRecordInfoImpl_Dummy, - (PVOID)IRecordInfoImpl_Dummy + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecordInfo_GetFieldNoCopy(IRecordInfo *iface, PVOID pvData, + LPCOLESTR szFieldName, VARIANT *pvarField, PVOID *ppvDataCArray) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecordInfo_PutField(IRecordInfo *iface, ULONG wFlags, PVOID pvData, + LPCOLESTR szFieldName, VARIANT *pvarField) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecordInfo_PutFieldNoCopy(IRecordInfo *iface, ULONG wFlags, + PVOID pvData, LPCOLESTR szFieldName, VARIANT *pvarField) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecordInfo_GetFieldNames(IRecordInfo *iface, ULONG *pcNames, + BSTR *rgBstrNames) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static BOOL WINAPI RecordInfo_IsMatchingType(IRecordInfo *iface, IRecordInfo *info2) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static PVOID WINAPI RecordInfo_RecordCreate(IRecordInfo *iface) +{ + ok(0, "unexpected call\n"); + return NULL; +} + +static HRESULT WINAPI RecordInfo_RecordCreateCopy(IRecordInfo *iface, PVOID pvSource, + PVOID *ppvDest) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecordInfo_RecordDestroy(IRecordInfo *iface, PVOID pvRecord) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IRecordInfoVtbl RecordInfoVtbl = +{ + RecordInfo_QueryInterface, + RecordInfo_AddRef, + RecordInfo_Release, + RecordInfo_RecordInit, + RecordInfo_RecordClear, + RecordInfo_RecordCopy, + RecordInfo_GetGuid, + RecordInfo_GetName, + RecordInfo_GetSize, + RecordInfo_GetTypeInfo, + RecordInfo_GetField, + RecordInfo_GetFieldNoCopy, + RecordInfo_PutField, + RecordInfo_PutFieldNoCopy, + RecordInfo_GetFieldNames, + RecordInfo_IsMatchingType, + RecordInfo_RecordCreate, + RecordInfo_RecordCreateCopy, + RecordInfo_RecordDestroy }; +static IRecordInfoImpl *IRecordInfoImpl_Construct(void) +{ + IRecordInfoImpl *rec; + + rec = HeapAlloc(GetProcessHeap(), 0, sizeof(IRecordInfoImpl)); + rec->IRecordInfo_iface.lpVtbl = &RecordInfoVtbl; + rec->ref = START_REF_COUNT; + rec->clearCalled = 0; + rec->sizeCalled = 0; + return rec; +} + static DWORD SAFEARRAY_GetVTSize(VARTYPE vt) { switch (vt)

1 0

Jeremy Newman : remove ending block of links
by Jeremy Newman Jan. 10, 2014

Jan. 10, 2014

Module: appdb Branch: master Commit: 49eb69955d469209285633369a292948012c87dc URL: http://source.winehq.org/git/appdb.git/?a=commit;h=49eb69955d46920928563336… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Jan 10 11:21:24 2014 -0600 remove ending block of links Wine-reviews is down, the Firefox logo is broken, and we don't need to advertise the tech we use. --- index.php | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/index.php b/index.php index c027841..b1560ea 100644 --- a/index.php +++ b/index.php @@ -145,34 +145,8 @@ if(!$_SESSION['current']->isLoggedIn()) </div> </div> -<br><br> - -<h2>Other Wine Application Compatibility Sites</h2> -<p> -<a href="http://www.wine-reviews.net/"><b>Wine-Reviews</b></a>: Is a Wine application and game -Blog, with tips and how-to's on getting listed applications and games to run. -</p> -</div> - <?php -// promotional buttons -echo "<center>\n"; -echo "<table>\n"; -echo "<tr>\n"; -echo "<td style='padding:10px;'>\n"; -echo '<a href="http://getfirefox.com/" - title="Get Firefox - Web browsing redefined."><img - src="//www.mozilla.org/products/firefox/buttons/getfirefox_large2.png" - width="178" height="60" border="0" alt="Get Firefox"></a>'."\n"; -echo "</td>\n"; -echo "<td style='padding:10px;'>\n"; -echo '<a href="http://xinha.python-hosting.com/" title="Xinha textarea replacement"> - <img src="images/xinha-red-95.png" width="95" height="100" alt="Xinha"></a>'."\n"; -echo "</td>\n"; -echo "</tr>\n"; -echo "</table>\n"; -echo "</center>\n"; - apidb_footer(); + ?>

1 0

刘涛 : website: Simplified Chinese translation for 1.7.9 release
by Jeremy Newman Jan. 10, 2014

Jan. 10, 2014

Module: website Branch: master Commit: 094e5426a3760a6789ac560be2ce9fe112064bd3 URL: http://source.winehq.org/git/website.git/?a=commit;h=094e5426a3760a6789ac56… Author: 刘涛 <wendaotao(a)163.com> Date: Fri Jan 10 16:39:50 2014 +0800 website: Simplified Chinese translation for 1.7.9 release --- news/zh-cn/2013122001.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/zh-cn/2013122001.xml b/news/zh-cn/2013122001.xml new file mode 100644 index 0000000..53c61b4 --- /dev/null +++ b/news/zh-cn/2013122001.xml @@ -0,0 +1,15 @@ +<news> +<date>十二月 20, 2013</date> +<title>Wine 1.7.9 发布</title> +<body> +<p> Wine 开发版 1.7.9 现在可以使用了。</p> +<p> 本次<a href="{$root}/announce/1.7.9">更新</a> : +<ul> + <li>改善了 Mac 后端驱动中窗口的移动/调整大小。</li> + <li>修复了一些 DirectDraw 的调色板。</li> + <li>减少了不同版本的 C++ 运行时库间的重复代码。</li> + <li>各种 bug 的修复。</li> +</ul> +<p>源代码可以从<a href="http://prdownloads.sourceforge.net/wine/wine-1.7.9.tar.bz2">这里</a>获取。 +二进制包正在构建中，稍后将出现在各自相应的<a href="{$root}/download">下载位置</a>。 +</p></body></news>

1 0

Akihiro Sagawa : gdi32: Relax vertical face requirements.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: ebccff822576cbff2b4401c74d83912d637a7026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebccff822576cbff2b4401c74… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jan 9 21:07:45 2014 +0900 gdi32: Relax vertical face requirements. --- dlls/gdi32/freetype.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index fda54aa..4be2978 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2148,6 +2148,9 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ #endif /* HAVE_CARBON_CARBON_H */ do { + const DWORD FS_DBCS_MASK = FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB; + FONTSIGNATURE fs; + ft_face = new_ft_face( file, font_data_ptr, font_data_size, face_index, flags & ADDFONT_ALLOW_BITMAP ); if (!ft_face) return 0; @@ -2161,7 +2164,8 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index, flags); ++ret; - if (FT_HAS_VERTICAL(ft_face)) + get_fontsig(ft_face, &fs); + if (fs.fsCsb[0] & FS_DBCS_MASK) { AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index, flags | ADDFONT_VERTICAL_FONT);

1 0

Akihiro Sagawa : gdi32: Fix DBCS mask value in GetFontLanguageInfo.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: 142a0f7af0585223251d533f4b5b061831c85a50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=142a0f7af0585223251d533f4… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jan 9 21:07:43 2014 +0900 gdi32: Fix DBCS mask value in GetFontLanguageInfo. --- dlls/gdi32/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index fcb024b..0dfd5b1 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3023,7 +3023,7 @@ BOOL WINAPI TranslateCharsetInfo( DWORD WINAPI GetFontLanguageInfo(HDC hdc) { FONTSIGNATURE fontsig; - static const DWORD GCP_DBCS_MASK=FS_THAI|FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB, + static const DWORD GCP_DBCS_MASK=FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB, GCP_DIACRITIC_MASK=0x00000000, FLI_GLYPHS_MASK=0x00000000, GCP_GLYPHSHAPE_MASK=FS_ARABIC,

1 0

Akihiro Sagawa : gdi32: Use defined names in GetFontLanguageInfo.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: ab32c657ed769ba7af399d9da934991891945acb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab32c657ed769ba7af399d9da… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jan 9 21:07:41 2014 +0900 gdi32: Use defined names in GetFontLanguageInfo. --- dlls/gdi32/font.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index a025d17..fcb024b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3023,14 +3023,14 @@ BOOL WINAPI TranslateCharsetInfo( DWORD WINAPI GetFontLanguageInfo(HDC hdc) { FONTSIGNATURE fontsig; - static const DWORD GCP_DBCS_MASK=0x003F0000, + static const DWORD GCP_DBCS_MASK=FS_THAI|FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB, GCP_DIACRITIC_MASK=0x00000000, FLI_GLYPHS_MASK=0x00000000, - GCP_GLYPHSHAPE_MASK=0x00000040, + GCP_GLYPHSHAPE_MASK=FS_ARABIC, GCP_KASHIDA_MASK=0x00000000, GCP_LIGATE_MASK=0x00000000, GCP_USEKERNING_MASK=0x00000000, - GCP_REORDER_MASK=0x00000060; + GCP_REORDER_MASK=FS_HEBREW|FS_ARABIC; DWORD result=0;

1 0

Frédéric Delanoy : Assorted spelling fixes.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: 91f2435469fb812bc3cf14f9612756c11c8c248d URL: http://source.winehq.org/git/wine.git/?a=commit;h=91f2435469fb812bc3cf14f96… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jan 9 15:02:45 2014 +0100 Assorted spelling fixes. --- dlls/advapi32/security.c | 2 +- dlls/advapi32/tests/lsa.c | 2 +- dlls/crypt32/tests/encode.c | 4 ++-- dlls/d3d10core/inputlayout.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/dbghelp/storage.c | 2 +- dlls/gdi32/freetype.c | 2 +- dlls/kernel32/tests/file.c | 18 +++++++++--------- dlls/localspl/provider.c | 4 ++-- dlls/msxml3/tests/domdoc.c | 4 ++-- dlls/shell32/shellole.c | 2 +- dlls/version/version.c | 2 +- dlls/wined3d/surface.c | 4 ++-- tools/winedump/lnk.c | 2 +- 14 files changed, 26 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=91f2435469fb812bc3cf1…

1 0

Erich E. Hoover : ddraw: Make DirectDrawEnumerateEx only enumerate secondary display devices when requested.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: 639f9335c2405832b9962a4bc5b95b053bf596a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=639f9335c2405832b9962a4bc… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Wed Jan 8 15:02:28 2014 -0700 ddraw: Make DirectDrawEnumerateEx only enumerate secondary display devices when requested. --- dlls/ddraw/main.c | 61 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index e613126..2e61b0c 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -59,6 +59,36 @@ static HRESULT CALLBACK enum_callback(GUID *guid, char *description, char *drive return info->callback(guid, description, driver_name, info->context); } +static void ddraw_enumerate_secondary_devices(struct wined3d *wined3d, LPDDENUMCALLBACKEXA callback, + void *context) +{ + static CHAR driver_desc[] = "DirectDraw HAL"; + struct wined3d_adapter_identifier adapter_id; + BOOL cont_enum = TRUE; + HRESULT hr = S_OK; + UINT adapter = 0; + + for (adapter = 0; SUCCEEDED(hr) && cont_enum; adapter++) + { + char DriverName[512] = ""; + + /* The Battle.net System Checker expects the GetAdapterIdentifier DeviceName to match the + * Driver Name, so obtain the DeviceName and GUID from D3D. */ + memset(&adapter_id, 0x0, sizeof(adapter_id)); + adapter_id.device_name = DriverName; + adapter_id.device_name_size = sizeof(DriverName); + wined3d_mutex_lock(); + hr = wined3d_get_adapter_identifier(wined3d, adapter, 0x0, &adapter_id); + wined3d_mutex_unlock(); + if (SUCCEEDED(hr)) + { + TRACE("Interface %d: %s\n", adapter, wine_dbgstr_guid(&adapter_id.device_identifier)); + cont_enum = callback(&adapter_id.device_identifier, driver_desc, adapter_id.device_name, + context, 0); + } + } +} + /* Handle table functions */ BOOL ddraw_handle_table_init(struct ddraw_handle_table *t, UINT initial_size) { @@ -373,8 +403,8 @@ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *contex DDENUM_NONDISPLAYDEVICES)) return DDERR_INVALIDPARAMS; - if (flags) - FIXME("flags 0x%08x not handled\n", flags); + if (flags & ~DDENUM_ATTACHEDSECONDARYDEVICES) + FIXME("flags 0x%08x not handled\n", flags & ~DDENUM_ATTACHEDSECONDARYDEVICES); TRACE("Enumerating ddraw interfaces\n"); if (!(wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS))) @@ -393,33 +423,14 @@ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *contex /* QuickTime expects the description "DirectDraw HAL" */ static CHAR driver_desc[] = "DirectDraw HAL", driver_name[] = "display"; - struct wined3d_adapter_identifier adapter_id; - HRESULT hr = S_OK; - UINT adapter = 0; BOOL cont_enum; - /* The Battle.net System Checker expects both a NULL device and a GUID-based device */ TRACE("Default interface: DirectDraw HAL\n"); cont_enum = callback(NULL, driver_desc, driver_name, context, 0); - for (adapter = 0; SUCCEEDED(hr) && cont_enum; adapter++) - { - char DriverName[512] = ""; - - /* The Battle.net System Checker expects the GetAdapterIdentifier DeviceName to match the - * Driver Name, so obtain the DeviceName and GUID from D3D. */ - memset(&adapter_id, 0x0, sizeof(adapter_id)); - adapter_id.device_name = DriverName; - adapter_id.device_name_size = sizeof(DriverName); - wined3d_mutex_lock(); - hr = wined3d_get_adapter_identifier(wined3d, adapter, 0x0, &adapter_id); - wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) - { - TRACE("Interface %d: %s\n", adapter, wine_dbgstr_guid(&adapter_id.device_identifier)); - cont_enum = callback(&adapter_id.device_identifier, driver_desc, - adapter_id.device_name, context, 0); - } - } + + /* The Battle.net System Checker expects both a NULL device and a GUID-based device */ + if (cont_enum && (flags & ~DDENUM_ATTACHEDSECONDARYDEVICES)) + ddraw_enumerate_secondary_devices(wined3d, callback, context); } __EXCEPT_PAGE_FAULT {

1 0

Dmitry Timoshkov : cabarc: Fix printing of a not recognized compression type argument.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: dcc057c686dce5b1cc492825091bfbaddeff3f83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcc057c686dce5b1cc4928250… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 9 22:32:44 2014 +0900 cabarc: Fix printing of a not recognized compression type argument. --- programs/cabarc/cabarc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index 032aab2..c49796d 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -666,7 +666,8 @@ int wmain( int argc, WCHAR *argv[] ) else if (!strcmpiW( argv[1], mszipW )) opt_compression = tcompTYPE_MSZIP; else { - WINE_MESSAGE( "cabarc: Unknown compression type '%s'\n", optarg ); + char *arg = strdupWtoA( CP_ACP, argv[1] ); + WINE_MESSAGE( "cabarc: Unknown compression type '%s'\n", arg); return 1; } break;

1 0

Alexandre Julliard : gdi32/tests: Don't test unreliable palette entries.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: eba26475fb49fc59f05562bbe4993097c70cd8d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eba26475fb49fc59f05562bbe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 9 16:02:14 2014 +0100 gdi32/tests: Don't test unreliable palette entries. --- dlls/gdi32/tests/palette.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/palette.c b/dlls/gdi32/tests/palette.c index 71da6f9..f95c0d3 100644 --- a/dlls/gdi32/tests/palette.c +++ b/dlls/gdi32/tests/palette.c @@ -162,10 +162,10 @@ static void test_halftone_palette(void) ok( count == 256 || broken(count <= 20), /* nt 4 */ "wrong size %u\n", count ); - /* first and last 10 match the default palette */ + /* first and last 8 match the default palette */ if (count >= 20) { - for (i = 0; i < 10; i++) + for (i = 0; i < 8; i++) { ok( entries[i].peRed == defpal[i].peRed && entries[i].peGreen == defpal[i].peGreen && @@ -175,7 +175,7 @@ static void test_halftone_palette(void) entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags, defpal[i].peRed, defpal[i].peGreen, defpal[i].peBlue ); } - for (i = count - 10; i < count; i++) + for (i = count - 8; i < count; i++) { int idx = i - count + 20; ok( entries[i].peRed == defpal[idx].peRed &&

1 0

Piotr Caban : msvcrt/tests: Fix crash in mbstowcs tests.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: 1d4ac6dc1e2e5d6b26a3ff31c32ba9fbcbc0c3db URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d4ac6dc1e2e5d6b26a3ff31c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 9 17:34:05 2014 +0100 msvcrt/tests: Fix crash in mbstowcs tests. --- dlls/msvcrt/tests/string.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 800a06b..71b6815 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1635,10 +1635,13 @@ static void test_mbstowcs(void) wOut[4] = '!'; wOut[5] = '\0'; mOut[4] = '!'; mOut[5] = '\0'; - errno = 0xdeadbeef; - ret = mbstowcs(wOut, NULL, 4); - ok(ret == -1, "mbstowcs did not return -1\n"); - ok(errno == EINVAL, "errno = %d\n", errno); + if(pmbstowcs_s) { + /* crashes on some systems */ + errno = 0xdeadbeef; + ret = mbstowcs(wOut, NULL, 4); + ok(ret == -1, "mbstowcs did not return -1\n"); + ok(errno == EINVAL, "errno = %d\n", errno); + } ret = mbstowcs(NULL, mSimple, 0); ok(ret == 4, "mbstowcs did not return 4\n");

1 0

Alexandre Julliard : ntdll/tests: Fix a test that fails on Win2k.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: 406587898f4bc077d4e2e353ab73998bf2baadaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=406587898f4bc077d4e2e353a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 9 16:01:59 2014 +0100 ntdll/tests: Fix a test that fails on Win2k. --- dlls/ntdll/tests/string.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 7b56691..56b7584 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1281,12 +1281,15 @@ static void test__snprintf(void) int res; res = p__snprintf(NULL, 0, teststring); - ok(res == lstrlenA(teststring), "_snprintf returned %d, expected %d.\n", res, lstrlenA(teststring)); - - res = p__snprintf(NULL, 1, teststring); - ok(res == lstrlenA(teststring) /* WinXP */ || res < 0 /* Vista and greater */, - "_snprintf returned %d, expected %d or < 0.\n", res, lstrlenA(teststring)); + ok(res == lstrlenA(teststring) || broken(res == -1) /* <= w2k */, + "_snprintf returned %d, expected %d.\n", res, lstrlenA(teststring)); + if (res != -1) + { + res = p__snprintf(NULL, 1, teststring); + ok(res == lstrlenA(teststring) /* WinXP */ || res < 0 /* Vista and greater */, + "_snprintf returned %d, expected %d or < 0.\n", res, lstrlenA(teststring)); + } res = p__snprintf(buffer, strlen(teststring) - 1, teststring); ok(res < 0, "_snprintf returned %d, expected < 0.\n", res);

1 0

Erich E. Hoover : ddraw: Make DirectDrawEnumerateEx report the driver description.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: eba5132bfa351b52fdec513a532450497306b09e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eba5132bfa351b52fdec513a5… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Wed Jan 8 15:02:47 2014 -0700 ddraw: Make DirectDrawEnumerateEx report the driver description. --- dlls/ddraw/main.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 2e61b0c..2dd0393 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -62,7 +62,6 @@ static HRESULT CALLBACK enum_callback(GUID *guid, char *description, char *drive static void ddraw_enumerate_secondary_devices(struct wined3d *wined3d, LPDDENUMCALLBACKEXA callback, void *context) { - static CHAR driver_desc[] = "DirectDraw HAL"; struct wined3d_adapter_identifier adapter_id; BOOL cont_enum = TRUE; HRESULT hr = S_OK; @@ -70,21 +69,23 @@ static void ddraw_enumerate_secondary_devices(struct wined3d *wined3d, LPDDENUMC for (adapter = 0; SUCCEEDED(hr) && cont_enum; adapter++) { - char DriverName[512] = ""; + char DriverName[512] = "", DriverDescription[512] = ""; /* The Battle.net System Checker expects the GetAdapterIdentifier DeviceName to match the * Driver Name, so obtain the DeviceName and GUID from D3D. */ memset(&adapter_id, 0x0, sizeof(adapter_id)); adapter_id.device_name = DriverName; adapter_id.device_name_size = sizeof(DriverName); + adapter_id.description = DriverDescription; + adapter_id.description_size = sizeof(DriverDescription); wined3d_mutex_lock(); hr = wined3d_get_adapter_identifier(wined3d, adapter, 0x0, &adapter_id); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) { TRACE("Interface %d: %s\n", adapter, wine_dbgstr_guid(&adapter_id.device_identifier)); - cont_enum = callback(&adapter_id.device_identifier, driver_desc, adapter_id.device_name, - context, 0); + cont_enum = callback(&adapter_id.device_identifier, adapter_id.description, + adapter_id.device_name, context, 0); } } }

1 0

Alexandre Julliard : gdi32/tests: Run all DIB tests with a hardcoded palette.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: d1463cc44b79df3242c6bff9ee00a280c1eba43c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1463cc44b79df3242c6bff9e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 9 17:05:20 2014 +0100 gdi32/tests: Run all DIB tests with a hardcoded palette. --- dlls/gdi32/tests/dib.c | 213 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 172 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1463cc44b79df3242c6b…

1 0

Stefan Dösinger : wined3d: Remove SFLAG_USERPTR.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: db6d3c500ca5d69f49756b69777f09190e6bc498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6d3c500ca5d69f49756b697… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 9 13:43:20 2014 +0100 wined3d: Remove SFLAG_USERPTR. --- dlls/wined3d/surface.c | 14 +++++--------- dlls/wined3d/wined3d_private.h | 22 ++++++++++------------ 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 60539c0..f3bb04c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -604,7 +604,8 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) static void surface_evict_sysmem(struct wined3d_surface *surface) { - if (surface->resource.map_count || (surface->flags & SFLAG_DONOTFREE)) + if (surface->resource.map_count || (surface->flags & SFLAG_DONOTFREE) + || surface->user_memory) return; wined3d_resource_free_sysmem(&surface->resource); @@ -2715,7 +2716,7 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, create_dib = TRUE; } - surface->flags &= ~(SFLAG_LOCATIONS | SFLAG_USERPTR); + surface->flags &= ~SFLAG_LOCATIONS; surface->resource.allocatedMemory = NULL; wined3d_resource_free_sysmem(&surface->resource); @@ -2741,13 +2742,8 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, else surface->flags &= ~SFLAG_NONPOW2; - if (mem) - { - surface->user_memory = mem; - surface->flags |= SFLAG_USERPTR; - } + surface->user_memory = mem; surface->pitch = pitch; - surface->resource.format = format; surface->resource.multisample_type = multisample_type; surface->resource.multisample_quality = multisample_quality; @@ -3220,7 +3216,7 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) return WINED3DERR_INVALIDCALL; /* Use the DIB section from now on if we are not using a PBO or user memory. */ - if (!(surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM | SFLAG_USERPTR))) + if (!(surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM) || surface->user_memory)) { wined3d_resource_free_sysmem(&surface->resource); surface->resource.allocatedMemory = surface->dib.bitmap_data; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f8109bc..c10f120 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2294,17 +2294,16 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_GLCKEY 0x00000100 /* The GL texture was created with a color key. */ #define SFLAG_CLIENT 0x00000200 /* GL_APPLE_client_storage is used with this surface. */ #define SFLAG_DIBSECTION 0x00000400 /* Has a DIB section attached for GetDC. */ -#define SFLAG_USERPTR 0x00000800 /* The application allocated the memory for this surface. */ -#define SFLAG_ALLOCATED 0x00001000 /* A GL texture is allocated for this surface. */ -#define SFLAG_SRGBALLOCATED 0x00002000 /* A sRGB GL texture is allocated for this surface. */ -#define SFLAG_PBO 0x00004000 /* The surface has a PBO. */ -#define SFLAG_INSYSMEM 0x00008000 /* The system memory copy is current. */ -#define SFLAG_INTEXTURE 0x00010000 /* The GL texture is current. */ -#define SFLAG_INSRGBTEX 0x00020000 /* The GL sRGB texture is current. */ -#define SFLAG_INDRAWABLE 0x00040000 /* The GL drawable is current. */ -#define SFLAG_INRB_MULTISAMPLE 0x00080000 /* The multisample renderbuffer is current. */ -#define SFLAG_INRB_RESOLVED 0x00100000 /* The resolved renderbuffer is current. */ -#define SFLAG_DISCARDED 0x00200000 /* Surface was discarded, allocating new location is enough. */ +#define SFLAG_ALLOCATED 0x00000800 /* A GL texture is allocated for this surface. */ +#define SFLAG_SRGBALLOCATED 0x00001000 /* A sRGB GL texture is allocated for this surface. */ +#define SFLAG_PBO 0x00002000 /* The surface has a PBO. */ +#define SFLAG_INSYSMEM 0x00004000 /* The system memory copy is current. */ +#define SFLAG_INTEXTURE 0x00008000 /* The GL texture is current. */ +#define SFLAG_INSRGBTEX 0x00010000 /* The GL sRGB texture is current. */ +#define SFLAG_INDRAWABLE 0x00020000 /* The GL drawable is current. */ +#define SFLAG_INRB_MULTISAMPLE 0x00040000 /* The multisample renderbuffer is current. */ +#define SFLAG_INRB_RESOLVED 0x00080000 /* The resolved renderbuffer is current. */ +#define SFLAG_DISCARDED 0x00100000 /* Surface was discarded, allocating new location is enough. */ /* In some conditions the surface memory must not be freed: * SFLAG_CONVERTED: Converting the data back would take too long @@ -2317,7 +2316,6 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D SFLAG_DYNLOCK | \ SFLAG_CLIENT | \ SFLAG_DIBSECTION | \ - SFLAG_USERPTR | \ SFLAG_PBO | \ SFLAG_PIN_SYSMEM)

1 0

Stefan Dösinger : wined3d: Mark the system location up to date in the DIB recreation codepath.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: 441d8ffeb2dc409462e15f12b1fc8043a27196f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=441d8ffeb2dc409462e15f12b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 9 13:43:21 2014 +0100 wined3d: Mark the system location up to date in the DIB recreation codepath. --- dlls/wined3d/surface.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f3bb04c..a7c9d5c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2760,6 +2760,7 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, return hr; } surface->resource.allocatedMemory = surface->dib.bitmap_data; + surface->flags |= SFLAG_INSYSMEM; } else if (!surface_init_sysmem(surface)) return E_OUTOFMEMORY;

1 0

Stefan Dösinger : wined3d: GL_NV_vertex_program2_option supports relative offsets > 63.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: bffd5362138cd4963005d4fe008c321596a24587 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bffd5362138cd4963005d4fe0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 9 13:43:22 2014 +0100 wined3d: GL_NV_vertex_program2_option supports relative offsets > 63. The ARR codepath used if ctx->target_version >= NV2 does not account for the correction offset, but the indirect addressing reads do, which ultimately results in incorrect offsets. Since the limitation goes away as soon as we enable GL_NV_vertex_program_2_option ignoring the offset is the best thing to do. I don't set shader_data->rel_offset to zero in the pre-compilation analysis because enablding NV_vertex_program2 is in theory a decision that is taken later during code generation. --- dlls/wined3d/arb_program_shader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a1bb3e6..ff4345f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1119,7 +1119,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction if (!pshader && reg->idx[0].rel_addr) { const struct arb_vshader_private *shader_data = shader->backend_data; - UINT rel_offset = shader_data->rel_offset; + UINT rel_offset = ctx->target_version == ARB ? shader_data->rel_offset : 0; BOOL aL = FALSE; char rel_reg[50]; if (reg_maps->shader_version.major < 2) @@ -1849,7 +1849,7 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) const struct arb_vshader_private *shader_data = shader->backend_data; src0_param[0] = '\0'; - if (shader_data->rel_offset) + if (shader_data->rel_offset && ctx->target_version == ARB) { const char *offset = arb_get_helper_value(WINED3D_SHADER_TYPE_VERTEX, ARB_VS_REL_OFFSET); shader_arb_get_src_param(ins, &ins->src[0], 0, src0_param);

1 0

Erich E. Hoover : ddraw/tests: Test DirectDrawEnumerateEx with DDENUM_ATTACHEDSECONDARYDEVICES.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: dc184b526ce1fcfabcf36ac201ad7675fee98eb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc184b526ce1fcfabcf36ac20… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Thu Jan 9 08:34:46 2014 -0700 ddraw/tests: Test DirectDrawEnumerateEx with DDENUM_ATTACHEDSECONDARYDEVICES. --- dlls/ddraw/tests/ddrawmodes.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 515f4d1..643fe9b 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -209,8 +209,22 @@ static BOOL WINAPI test_context_callbackExA(GUID *lpGUID, char *lpDriverDescript return TRUE; } +static BOOL WINAPI test_count_callbackExA(GUID *lpGUID, char *lpDriverDescription, + char *lpDriverName, void *lpContext, HMONITOR hm) +{ + DWORD *count = (DWORD *)lpContext; + + trace("test_count_callbackExA: %p %s %s %p %p\n", lpGUID, + lpDriverDescription, lpDriverName, lpContext, hm); + + (*count)++; + + return TRUE; +} + static void test_DirectDrawEnumerateExA(void) { + DWORD callbackCount; HRESULT ret; if (!pDirectDrawEnumerateExA) @@ -237,6 +251,21 @@ static void test_DirectDrawEnumerateExA(void) ret = pDirectDrawEnumerateExA(test_context_callbackExA, (void *)0xdeadbeef, 0); ok(ret == DD_OK, "Expected DD_OK, got %d\n", ret); + /* Test with valid callback parameter and count the number of primary devices */ + callbackCount = 0; + ret = pDirectDrawEnumerateExA(test_count_callbackExA, &callbackCount, 0); + ok(ret == DD_OK, "Expected DD_OK, got %d\n", ret); + ok(callbackCount == 1, "Expected 1 primary device, got %d\n", callbackCount); + + /* Test with valid callback parameter and count the number of secondary devices */ + callbackCount = 0; + ret = pDirectDrawEnumerateExA(test_count_callbackExA, &callbackCount, + DDENUM_ATTACHEDSECONDARYDEVICES); + ok(ret == DD_OK, "Expected DD_OK, got %d\n", ret); + /* Note: this list includes the primary devices as well and some systems (such as the TestBot) + do not include any secondary devices */ + ok(callbackCount >= 1, "Expected at least one device, got %d\n", callbackCount); + /* Test with valid callback parameter, NULL context parameter, and all flags set. */ trace("Calling DirectDrawEnumerateExA with all flags set and NULL context.\n"); ret = pDirectDrawEnumerateExA(test_nullcontext_callbackExA, NULL,

1 0

Andrey Gusev : xapofx1_1: Add version.rc file.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: 8d426f5398254edbdd4aafcd957cf51df361c45c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d426f5398254edbdd4aafcd9… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Jan 4 21:00:55 2014 +0200 xapofx1_1: Add version.rc file. --- dlls/xapofx1_1/Makefile.in | 2 ++ dlls/xapofx1_1/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/xapofx1_1/Makefile.in b/dlls/xapofx1_1/Makefile.in index 3a793ac..aff49eb 100644 --- a/dlls/xapofx1_1/Makefile.in +++ b/dlls/xapofx1_1/Makefile.in @@ -2,3 +2,5 @@ MODULE = xapofx1_1.dll C_SRCS = \ main.c + +RC_SRCS = version.rc diff --git a/dlls/xapofx1_1/version.rc b/dlls/xapofx1_1/version.rc new file mode 100644 index 0000000..6e8c5f7 --- /dev/null +++ b/dlls/xapofx1_1/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2014 Andrey Gusev + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine XAPOFX dll" +#define WINE_FILENAME_STR "xapofx1_1.dll" +#define WINE_FILEVERSION 9,24,1400,0 +#define WINE_FILEVERSION_STR "9.24.1400.0" +#define WINE_PRODUCTVERSION 9,24,1400,0 +#define WINE_PRODUCTVERSION_STR "9.24.1400.0" + +#include "wine/wine_common_ver.rc"

1 0

Henri Verbeet : ddraw/tests: Add some color key tests for complex surfaces.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: e00cc024fde84c53a200310ac9d13326e986c171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e00cc024fde84c53a200310ac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 9 13:49:32 2014 +0100 ddraw/tests: Add some color key tests for complex surfaces. --- dlls/ddraw/tests/ddraw1.c | 141 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 141 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 140 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 125 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 547 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e00cc024fde84c53a2003…

1 0

Henri Verbeet : ddraw: Don' t propagate color key changes to attached surfaces.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: f7ee96c311dd8127141f268f18f9492b218dd75c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7ee96c311dd8127141f268f1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 9 12:17:01 2014 +0100 ddraw: Don't propagate color key changes to attached surfaces. --- dlls/ddraw/surface.c | 61 ++++---------------------------------------------- 1 file changed, 4 insertions(+), 57 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 8137157..8ce651c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4494,60 +4494,11 @@ static HRESULT WINAPI ddraw_surface1_GetPalette(IDirectDrawSurface *iface, IDire return ddraw_surface7_GetPalette(&surface->IDirectDrawSurface7_iface, palette); } -/***************************************************************************** - * SetColorKeyEnum - * - * EnumAttachedSurface callback for SetColorKey. Used to set color keys - * recursively in the surface tree - * - *****************************************************************************/ -struct SCKContext -{ - HRESULT ret; - struct wined3d_color_key *color_key; - DWORD Flags; -}; - -static HRESULT WINAPI SetColorKeyEnum(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) -{ - struct ddraw_surface *surface_impl = impl_from_IDirectDrawSurface7(surface); - struct SCKContext *ctx = context; - HRESULT hr; - - hr = wined3d_surface_set_color_key(surface_impl->wined3d_surface, ctx->Flags, ctx->color_key); - if (FAILED(hr)) - { - WARN("IWineD3DSurface_SetColorKey failed, hr = %08x\n", hr); - ctx->ret = hr; - } - - ddraw_surface7_EnumAttachedSurfaces(surface, context, SetColorKeyEnum); - ddraw_surface7_Release(surface); - - return DDENUMRET_OK; -} - -/***************************************************************************** - * IDirectDrawSurface7::SetColorKey - * - * Sets the color keying options for the surface. Observations showed that - * in case of complex surfaces the color key has to be assigned to all - * sublevels. - * - * Params: - * Flags: DDCKEY_* - * CKey: The new color key - * - * Returns: - * DD_OK on success - * See IWineD3DSurface::SetColorKey for details - * - *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_SetColorKey(IDirectDrawSurface7 *iface, DWORD Flags, DDCOLORKEY *CKey) { struct ddraw_surface *This = impl_from_IDirectDrawSurface7(iface); + HRESULT hr = WINED3D_OK; DDCOLORKEY FixedCKey; - struct SCKContext ctx = { DD_OK, (struct wined3d_color_key *)(CKey ? &FixedCKey : NULL), Flags }; TRACE("iface %p, flags %#x, color_key %p.\n", iface, Flags, CKey); @@ -4612,15 +4563,11 @@ static HRESULT WINAPI ddraw_surface7_SetColorKey(IDirectDrawSurface7 *iface, DWO } } if (This->wined3d_texture) - ctx.ret = wined3d_texture_set_color_key(This->wined3d_texture, Flags, ctx.color_key); - ddraw_surface7_EnumAttachedSurfaces(iface, &ctx, SetColorKeyEnum); + hr = wined3d_texture_set_color_key(This->wined3d_texture, Flags, + CKey ? (struct wined3d_color_key *)&FixedCKey : NULL); wined3d_mutex_unlock(); - switch(ctx.ret) - { - case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS; - default: return ctx.ret; - } + return hr_ddraw_from_wined3d(hr); } static HRESULT WINAPI ddraw_surface4_SetColorKey(IDirectDrawSurface4 *iface, DWORD flags, DDCOLORKEY *color_key)

1 0

Henri Verbeet : wined3d: Reset the command stream state as well in wined3d_device_reset().
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: 4d93adf75e21cd09677e8e21e009d1b57435c452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d93adf75e21cd09677e8e21e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 9 12:16:58 2014 +0100 wined3d: Reset the command stream state as well in wined3d_device_reset(). --- dlls/wined3d/cs.c | 29 +++++++++++++++++++++++++++++ dlls/wined3d/device.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 31 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 3d9a07c..ef10e9d 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -48,6 +48,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_TRANSFORM, WINED3D_CS_OP_SET_CLIP_PLANE, WINED3D_CS_OP_SET_MATERIAL, + WINED3D_CS_OP_RESET_STATE, }; struct wined3d_cs_present @@ -218,6 +219,11 @@ struct wined3d_cs_set_material const struct wined3d_material *material; }; +struct wined3d_cs_reset_state +{ + enum wined3d_cs_op opcode; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -814,6 +820,28 @@ void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_ma cs->ops->submit(cs); } +static void wined3d_cs_exec_reset_state(struct wined3d_cs *cs, const void *data) +{ + struct wined3d_adapter *adapter = cs->device->adapter; + HRESULT hr; + + state_cleanup(&cs->state); + memset(&cs->state, 0, sizeof(cs->state)); + if (FAILED(hr = state_init(&cs->state, &cs->fb, &adapter->gl_info, &adapter->d3d_info, + WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT))) + ERR("Failed to initialize CS state, hr %#x.\n", hr); +} + +void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) +{ + struct wined3d_cs_reset_state *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_RESET_STATE; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -838,6 +866,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_TRANSFORM */ wined3d_cs_exec_set_transform, /* WINED3D_CS_OP_SET_CLIP_PLANE */ wined3d_cs_exec_set_clip_plane, /* WINED3D_CS_OP_SET_MATERIAL */ wined3d_cs_exec_set_material, + /* WINED3D_CS_OP_RESET_STATE */ wined3d_cs_exec_reset_state, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 46fdee2..46492c4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4406,6 +4406,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_stateblock_decref(device->recording); device->recording = NULL; } + wined3d_cs_emit_reset_state(device->cs); state_cleanup(&device->state); if (device->d3d_initialized) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0735116..6d38ec2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2473,6 +2473,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, UINT start_idx, UINT index_coun void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags) DECLSPEC_HIDDEN; +void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_constant_buffer(struct wined3d_cs *cs, enum wined3d_shader_type type,

1 0

Bruno Jesus : ws2_32/tests: Add broken for a WSALookupServiceBegin test in NT.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: 0d965c14e9932226aa9446c01707790c73284bd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d965c14e9932226aa9446c01… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jan 9 00:32:12 2014 -0200 ws2_32/tests: Add broken for a WSALookupServiceBegin test in NT. --- dlls/ws2_32/tests/sock.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 86a829e..f8dc5a5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7381,7 +7381,8 @@ todo_wine ok(ret == SOCKET_ERROR, "WSALookupServiceBeginW should have failed\n"); todo_wine ok(error == WSAEINVAL - || broken(error == ERROR_INVALID_PARAMETER) /* <= XP */ + || broken(error == ERROR_INVALID_PARAMETER) /* == XP */ + || broken(error == WSAEFAULT) /* == NT */ || broken(error == WSASERVICE_NOT_FOUND) /* == 2000 */, "expected 10022, got %d\n", error); @@ -7399,7 +7400,7 @@ todo_wine error = WSAGetLastError(); if(ret && error == ERROR_INVALID_PARAMETER) { - win_skip("the current WSALookupServiceBeginW test is not supported in win 2000\n"); + win_skip("the current WSALookupServiceBeginW test is not supported in win <= 2000\n"); return; }

1 0