January 2014 - Wine-commits

Erich E. Hoover : ddraw: Make DirectDrawEnumerateEx report the driver description.
by Alexandre Julliard 09 Jan '14

09 Jan '14

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

Erich E. Hoover : ddraw/tests: Test DirectDrawEnumerateEx with DDENUM_ATTACHEDSECONDARYDEVICES.
by Alexandre Julliard 09 Jan '14

09 Jan '14

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

Frédéric Delanoy : Assorted spelling fixes.
by Alexandre Julliard 09 Jan '14

09 Jan '14

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

Andrey Gusev : xapofx1_1: Add version.rc file.
by Alexandre Julliard 09 Jan '14

09 Jan '14

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

Piotr Caban : msvcrt/tests: Fix crash in mbstowcs tests.
by Alexandre Julliard 09 Jan '14

09 Jan '14

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

Akihiro Sagawa : gdi32: Use defined names in GetFontLanguageInfo.
by Alexandre Julliard 09 Jan '14

09 Jan '14

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

Bruno Jesus : iphlpapi/tests: Add more IcmpSendEcho tests related to the reply size.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: 2548d75f1681172f058ff862e8b0726638d4e8a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2548d75f1681172f058ff862e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jan 8 21:47:11 2014 -0200 iphlpapi/tests: Add more IcmpSendEcho tests related to the reply size. --- dlls/iphlpapi/tests/iphlpapi.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index dbf97b2..94716d7 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -44,6 +44,8 @@ #include <stdio.h> #include <stdlib.h> +#define ICMP_MINLEN 8 /* copied from dlls/iphlpapi/ip_icmp.h file */ + static HMODULE hLibrary = NULL; static DWORD (WINAPI *pGetNumberOfInterfaces)(PDWORD); @@ -956,7 +958,8 @@ todo_wine "expected 87, got %d\n", error); SetLastError(0xdeadbeef); - ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, sizeof(replydata) - 1, 1000); + replysz = sizeof(replydata) - 1; + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); error = GetLastError(); todo_wine { ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); @@ -965,8 +968,42 @@ todo_wine "expected 11050, got %d\n", error); } + SetLastError(0xdeadbeef); + replysz = sizeof(ICMP_ECHO_REPLY); + ret = pIcmpSendEcho(icmp, address, senddata, 0, NULL, replydata, replysz, 1000); + error = GetLastError(); +todo_wine + ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); + + SetLastError(0xdeadbeef); + replysz = sizeof(ICMP_ECHO_REPLY) + ICMP_MINLEN; + ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN, NULL, replydata, replysz, 1000); + error = GetLastError(); +todo_wine + ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); + + SetLastError(0xdeadbeef); + replysz = sizeof(ICMP_ECHO_REPLY) + ICMP_MINLEN; + ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN + 1, NULL, replydata, replysz, 1000); + error = GetLastError(); + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); +todo_wine + ok (error == IP_GENERAL_FAILURE + || broken(error == IP_BUF_TOO_SMALL) /* <= 2003 */, + "expected 11050, got %d\n", error); + + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN, NULL, replydata, replysz - 1, 1000); + error = GetLastError(); + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); +todo_wine + ok (error == IP_GENERAL_FAILURE + || broken(error == IP_BUF_TOO_SMALL) /* <= 2003 */, + "expected 11050, got %d\n", error); + /* in windows >= vista the timeout can't be invalid */ SetLastError(0xdeadbeef); + replysz = sizeof(replydata); ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 0); error = GetLastError(); if (!ret) ok(error == ERROR_INVALID_PARAMETER, "expected 87, got %d\n", error);

1 0

Nikolay Sivov : oleaut32: Mask out certain features on array copy.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: b058c96136850e543d171d766e5b132ba952cfb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b058c96136850e543d171d766… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 8 21:39:42 2014 +0400 oleaut32: Mask out certain features on array copy. --- dlls/oleaut32/safearray.c | 23 +++++++--- dlls/oleaut32/tests/safearray.c | 94 +++++++++++++++++++++++++++++++++++---- 2 files changed, 102 insertions(+), 15 deletions(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index 57a0d10..71f8c69 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -85,6 +85,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(variant); /* Undocumented hidden space before the start of a SafeArray descriptor */ #define SAFEARRAY_HIDDEN_SIZE sizeof(GUID) +/* features listed here are not propagated to newly created array or data copy + created with SafeArrayCopy()/SafeArrayCopyData() */ +static const USHORT ignored_copy_features = + FADF_AUTO | + FADF_STATIC | + FADF_EMBEDDED | + FADF_FIXEDSIZE | + FADF_CREATEVECTOR; + /* Allocate memory */ static inline LPVOID SAFEARRAY_Malloc(ULONG ulSize) { @@ -349,8 +358,7 @@ static HRESULT SAFEARRAY_CopyData(SAFEARRAY *psa, SAFEARRAY *dest) { ULONG ulCellCount = SAFEARRAY_GetCellCount(psa); - dest->fFeatures = (dest->fFeatures & FADF_CREATEVECTOR) | - (psa->fFeatures & ~(FADF_CREATEVECTOR|FADF_DATADELETED)); + dest->fFeatures = (dest->fFeatures & FADF_CREATEVECTOR) | (psa->fFeatures & ~ignored_copy_features); if (psa->fFeatures & FADF_VARIANT) { @@ -1273,6 +1281,7 @@ HRESULT WINAPI SafeArrayDestroyData(SAFEARRAY *psa) */ HRESULT WINAPI SafeArrayCopyData(SAFEARRAY *psaSource, SAFEARRAY *psaTarget) { + HRESULT hr; int dim; TRACE("(%p,%p)\n", psaSource, psaTarget); @@ -1288,10 +1297,10 @@ HRESULT WINAPI SafeArrayCopyData(SAFEARRAY *psaSource, SAFEARRAY *psaTarget) psaTarget->rgsabound[dim].cElements) return E_INVALIDARG; - if (SUCCEEDED(SAFEARRAY_DestroyData(psaTarget, 0)) && - SUCCEEDED(SAFEARRAY_CopyData(psaSource, psaTarget))) - return S_OK; - return E_UNEXPECTED; + hr = SAFEARRAY_DestroyData(psaTarget, 0); + if (FAILED(hr)) return hr; + + return SAFEARRAY_CopyData(psaSource, psaTarget); } /************************************************************************ @@ -1371,7 +1380,7 @@ HRESULT WINAPI SafeArrayCopy(SAFEARRAY *psa, SAFEARRAY **ppsaOut) hRet = SafeArrayAllocDescriptor(psa->cDims, ppsaOut); if (SUCCEEDED(hRet)) { - (*ppsaOut)->fFeatures = psa->fFeatures & ~FADF_CREATEVECTOR; + (*ppsaOut)->fFeatures = psa->fFeatures & ~ignored_copy_features; (*ppsaOut)->cbElements = psa->cbElements; } } diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index faec23e..064b038 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -39,6 +39,10 @@ #include "wtypes.h" #include "oleauto.h" +#ifndef FADF_CREATEVECTOR + const USHORT FADF_CREATEVECTOR = 0x2000; +#endif + static HMODULE hOleaut32; static HRESULT (WINAPI *pSafeArrayAllocDescriptorEx)(VARTYPE,UINT,SAFEARRAY**); @@ -57,6 +61,14 @@ static BOOL has_i8; /* Has INT_PTR/UINT_PTR type? */ static BOOL has_int_ptr; +static const USHORT ignored_copy_features[] = + { + FADF_AUTO, + FADF_STATIC, + FADF_EMBEDDED, + FADF_FIXEDSIZE + }; + #define START_REF_COUNT 1 #define RECORD_SIZE 64 #define RECORD_SIZE_FAIL 17 @@ -1250,14 +1262,13 @@ static void test_SafeArrayGetPutElement_VARIANT(void) ok(hres == S_OK, "got 0x%08x\n", hres); } - static void test_SafeArrayCopyData(void) { SAFEARRAYBOUND sab[4]; SAFEARRAY *sa; SAFEARRAY *sacopy; HRESULT hres; - int dimension,size=1; + int dimension, size = 1, i; if (!pSafeArrayCopyData) { @@ -1330,17 +1341,52 @@ static void test_SafeArrayCopyData(void) hres = SafeArrayCopy(sa, &sacopy); ok(hres == S_OK, "copy failed hres 0x%x\n", hres); - if (hres == S_OK) + ok(SafeArrayGetElemsize(sa) == SafeArrayGetElemsize(sacopy),"elemsize wrong\n"); + ok(SafeArrayGetDim(sa) == SafeArrayGetDim(sacopy),"dimensions wrong\n"); + ok(!memcmp(sa->pvData, sacopy->pvData, size * sizeof(int)), "compared different\n"); + hres = SafeArrayDestroy(sacopy); + ok(hres == S_OK, "got 0x%08x\n", hres); + + sacopy = SafeArrayCreate(VT_INT, NUM_DIMENSIONS, sab); + ok(sacopy != NULL, "Copy test couldn't create copy array\n"); + ok(sacopy->fFeatures == FADF_HAVEVARTYPE, "0x%04x\n", sacopy->fFeatures); + + for (i = 0; i < sizeof(ignored_copy_features)/sizeof(USHORT); i++) { - ok(SafeArrayGetElemsize(sa) == SafeArrayGetElemsize(sacopy),"elemsize wrong\n"); - ok(SafeArrayGetDim(sa) == SafeArrayGetDim(sacopy),"dimensions wrong\n"); - ok(!memcmp(sa->pvData, sacopy->pvData, size * sizeof(int)), "compared different\n"); - hres = SafeArrayDestroy(sacopy); - ok(hres == S_OK, "got 0x%08x\n", hres); + USHORT feature = ignored_copy_features[i]; + USHORT orig = sacopy->fFeatures; + + sa->fFeatures |= feature; + hres = SafeArrayCopyData(sa, sacopy); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(sacopy->fFeatures == orig && orig == FADF_HAVEVARTYPE, "got features 0x%04x\n", sacopy->fFeatures); + sa->fFeatures &= ~feature; } + hres = SafeArrayDestroy(sacopy); + ok(hres == S_OK, "got 0x%08x\n", hres); hres = SafeArrayDestroy(sa); ok(hres == S_OK, "got 0x%08x\n", hres); + + /* copy data from a vector */ + sa = SafeArrayCreateVector(VT_UI1, 0, 2); + + sacopy = SafeArrayCreateVector(VT_UI1, 0, 2); + ok(sa->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR), "got 0x%08x\n", sa->fFeatures); + ok(sacopy->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR), "got 0x%08x\n", sacopy->fFeatures); + hres = SafeArrayCopyData(sa, sacopy); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(sacopy->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR), "got 0x%04x\n", sacopy->fFeatures); + SafeArrayDestroy(sacopy); + + sacopy = SafeArrayCreate(VT_UI1, NUM_DIMENSIONS, sab); + ok(sacopy != NULL, "Copy test couldn't create copy array\n"); + ok(sacopy->fFeatures == FADF_HAVEVARTYPE, "0x%04x\n", sacopy->fFeatures); + hres = SafeArrayCopyData(sa, sacopy); + ok(hres == E_INVALIDARG, "got 0x%08x\n", hres); + SafeArrayDestroy(sacopy); + + SafeArrayDestroy(sa); } static void test_SafeArrayCreateEx(void) @@ -1541,6 +1587,7 @@ static void test_SafeArrayCopy(void) SAFEARRAY *sa, *sa2; VARIANTARG vSrc, vDst; HRESULT hres; + int i; sab.lLbound = 0; sab.cElements = 10; @@ -1605,6 +1652,37 @@ static void test_SafeArrayCopy(void) ok(hres == S_OK, "got 0x%08x\n", hres); hres = SafeArrayDestroy(sa); ok(hres == S_OK, "got 0x%08x\n", hres); + + /* test feature copy */ + hres = SafeArrayAllocDescriptor(1, &sa); + ok(hres == S_OK, "SafeArrayAllocDescriptor failed with error 0x%08x\n", hres); + ok(sa->fFeatures == 0, "got src features 0x%04x\n", sa->fFeatures); + sa->cbElements = 16; + + for (i = 0; i < sizeof(ignored_copy_features)/sizeof(USHORT); i++) + { + USHORT feature = ignored_copy_features[i]; + + sa->fFeatures |= feature; + hres = SafeArrayCopy(sa, &sa2); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(sa2->fFeatures == 0, "got features 0x%04x\n", sa2->fFeatures); + hres = SafeArrayDestroy(sa2); + ok(hres == S_OK, "got 0x%08x\n", hres); + sa->fFeatures &= ~feature; + } + + SafeArrayDestroy(sa); + + /* copy from a vector */ + sa = SafeArrayCreateVector(VT_UI1, 0, 2); + ok(sa->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR), "got 0x%08x\n", hres); + hres = SafeArrayCopy(sa, &sa2); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(sa2->fFeatures == FADF_HAVEVARTYPE, "got 0x%04x\n", sa2->fFeatures); + + SafeArrayDestroy(sa2); + SafeArrayDestroy(sa); } #define MKARRAY(low,num,typ) sab.lLbound = low; sab.cElements = num; \

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: 9cb328e185a710861dc8edfdb21d91e22e240ca6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cb328e185a710861dc8edfdb… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Jan 8 21:59:07 2014 +0200 po: Update Lithuanian translation. --- po/lt.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/lt.po b/po/lt.po index 4efafd9..7122fa2 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,11 +1,11 @@ # Lithuanian translations for Wine -# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011, 2012, 2013. +# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011, 2012, 2013, 2014. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-12-12 22:08+0300\n" +"PO-Revision-Date: 2014-01-08 21:58+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -10152,10 +10152,8 @@ msgid "Wine Explorer" msgstr "„Wine“ naršyklė" #: explorer.rc:33 -#, fuzzy -#| msgid "StartUp" msgid "Start" -msgstr "Paleidimas" +msgstr "Pradžia" #: explorer.rc:34 winefile.rc:36 msgid "&Run..."

1 0

Dmitry Timoshkov : ntdll: Remove shadow local variables.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: c7332fa1dc297e0aab71a7f6cf27d964c598e23d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7332fa1dc297e0aab71a7f6c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 9 19:06:29 2014 +0900 ntdll: Remove shadow local variables. --- dlls/ntdll/file.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index cf95cd0..d2efcc1 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2134,7 +2134,6 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, if (size > 0x10000) size = 0x10000; if ((tmpbuf = RtlAllocateHeap( GetProcessHeap(), 0, size ))) { - int fd, needs_close; if (!server_get_unix_fd( hFile, FILE_READ_DATA, &fd, &needs_close, NULL, NULL )) { int res = recv( fd, tmpbuf, size, MSG_PEEK );

1 0