April 2017 - Wine-commits - list.winehq.org

Nikolay Sivov : dwrite/tests: Test locale name length in DrawGlyphRun().
by Alexandre Julliard 10 Apr '17

10 Apr '17

Module: wine Branch: master Commit: a0b0fac31b21b7ea92f7c3c62732448c1d04bf76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0b0fac31b21b7ea92f7c3c62… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 10 07:37:26 2017 +0300 dwrite/tests: Test locale name length in DrawGlyphRun(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 38b818c..8a32303 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -602,6 +602,7 @@ static HRESULT WINAPI testrenderer_DrawGlyphRun(IDWriteTextRenderer *iface, entry.kind = DRAW_GLYPHRUN; if (effect) entry.kind |= DRAW_EFFECT; + ok(lstrlenW(descr->localeName) < LOCALE_NAME_MAX_LENGTH, "unexpectedly long locale name\n"); lstrcpyW(entry.locale, descr->localeName); entry.glyphcount = run->glyphCount; add_call(sequences, RENDERER_ID, &entry);

1 0

Nikolay Sivov : crypt32/tests: Statically link to CertAddStoreToCollection ().
by Alexandre Julliard 10 Apr '17

10 Apr '17

Module: wine Branch: master Commit: 6d3c0dc16a2bf96cdf43eb8131536dab1520d1c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d3c0dc16a2bf96cdf43eb813… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 10 07:37:27 2017 +0300 crypt32/tests: Statically link to CertAddStoreToCollection(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/cert.c | 6 ++--- dlls/crypt32/tests/store.c | 55 +++++++++++++--------------------------------- 2 files changed, 17 insertions(+), 44 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 58a27df..e49b2a9 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -29,7 +29,6 @@ #include "wine/test.h" -static BOOL (WINAPI *pCertAddStoreToCollection)(HCERTSTORE,HCERTSTORE,DWORD,DWORD); static PCCERT_CONTEXT (WINAPI *pCertCreateSelfSignCertificate)(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE,PCERT_NAME_BLOB,DWORD,PCRYPT_KEY_PROV_INFO,PCRYPT_ALGORITHM_IDENTIFIER,PSYSTEMTIME,PSYSTEMTIME,PCERT_EXTENSIONS); static BOOL (WINAPI *pCertGetValidUsages)(DWORD,PCCERT_CONTEXT*,int*,LPSTR*,DWORD*); static BOOL (WINAPI *pCryptAcquireCertificatePrivateKey)(PCCERT_CONTEXT,DWORD,void*,HCRYPTPROV_OR_NCRYPT_KEY_HANDLE*,DWORD*,BOOL*); @@ -50,7 +49,6 @@ static void init_function_pointers(void) if(!p ## func) \ trace("GetProcAddress(%s) failed\n", #func); - GET_PROC(hCrypt32, CertAddStoreToCollection) GET_PROC(hCrypt32, CertCreateSelfSignCertificate) GET_PROC(hCrypt32, CertGetValidUsages) GET_PROC(hCrypt32, CryptAcquireCertificatePrivateKey) @@ -279,10 +277,10 @@ static void testAddCert(void) collection = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); ok(collection != NULL, "CertOpenStore failed: %08x\n", GetLastError()); - if (collection && pCertAddStoreToCollection) + if (collection) { /* Add store to the collection, but disable updates */ - pCertAddStoreToCollection(collection, store, 0, 0); + CertAddStoreToCollection(collection, store, 0, 0); context = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert2, sizeof(bigCert2)); diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index a396dfe..565495a 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -117,8 +117,6 @@ static const BYTE signedCTLWithCTLInnerContent[] = { 0x8e,0xe7,0x5f,0x76,0x2b,0xd1,0x6a,0x82,0xb3,0x30,0x25,0x61,0xf6,0x25,0x23, 0x57,0x6c,0x0b,0x47,0xb8 }; - -static BOOL (WINAPI *pCertAddStoreToCollection)(HCERTSTORE,HCERTSTORE,DWORD,DWORD); static BOOL (WINAPI *pCertControlStore)(HCERTSTORE,DWORD,DWORD,void const*); static PCCRL_CONTEXT (WINAPI *pCertEnumCRLsInStore)(HCERTSTORE,PCCRL_CONTEXT); static BOOL (WINAPI *pCertEnumSystemStore)(DWORD,void*,void*,PFN_CERT_ENUM_SYSTEM_STORE); @@ -503,11 +501,6 @@ static void testStoresInCollection(void) WineTestRW2_W[]= { 'W','i','n','e','T','e','s','t','_','R','W','2',0 }; BOOL ret; - if (!pCertAddStoreToCollection) - { - win_skip("CertAddStoreToCollection() is not available\n"); - return; - } collection = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); ok(collection != NULL, "Failed to init collection store, last error %x\n", GetLastError()); @@ -646,12 +639,6 @@ static void testCollectionStore(void) WCHAR filename[MAX_PATH]; HANDLE file; - if (!pCertAddStoreToCollection) - { - win_skip("CertAddStoreToCollection() is not available\n"); - return; - } - collection = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); @@ -668,7 +655,7 @@ static void testCollectionStore(void) bigCert, sizeof(bigCert), CERT_STORE_ADD_ALWAYS, NULL); ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); /* Add the memory store to the collection, without allowing adding */ - ret = pCertAddStoreToCollection(collection, store1, 0, 0); + ret = CertAddStoreToCollection(collection, store1, 0, 0); ok(ret, "CertAddStoreToCollection failed: %08x\n", GetLastError()); /* Verify the cert is in the collection */ context = CertEnumCertificatesInStore(collection, NULL); @@ -688,7 +675,7 @@ static void testCollectionStore(void) store2 = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); /* Try adding a store to a non-collection store */ - ret = pCertAddStoreToCollection(store1, store2, + ret = CertAddStoreToCollection(store1, store2, CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0); ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); @@ -698,7 +685,7 @@ static void testCollectionStore(void) CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0); */ /* This "succeeds"... */ - ret = pCertAddStoreToCollection(collection, 0, + ret = CertAddStoreToCollection(collection, 0, CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0); ok(ret, "CertAddStoreToCollection failed: %08x\n", GetLastError()); /* while this crashes. @@ -707,7 +694,7 @@ static void testCollectionStore(void) */ /* Add it to the collection, this time allowing adding */ - ret = pCertAddStoreToCollection(collection, store2, + ret = CertAddStoreToCollection(collection, store2, CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0); ok(ret, "CertAddStoreToCollection failed: %08x\n", GetLastError()); /* Check that adding to the collection is allowed */ @@ -775,7 +762,7 @@ static void testCollectionStore(void) /* Adding a collection to a collection is legal */ collection2 = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); - ret = pCertAddStoreToCollection(collection2, collection, + ret = CertAddStoreToCollection(collection2, collection, CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0); ok(ret, "CertAddStoreToCollection failed: %08x\n", GetLastError()); /* check the contents of collection2 */ @@ -835,11 +822,9 @@ static void testCollectionStore(void) CERT_STORE_CREATE_NEW_FLAG, NULL); ok(collection != 0, "CertOpenStore failed: %08x\n", GetLastError()); - ret = pCertAddStoreToCollection(collection, store1, - CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0); + ret = CertAddStoreToCollection(collection, store1, CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0); ok(ret, "CertAddStoreToCollection failed: %08x\n", GetLastError()); - ret = pCertAddStoreToCollection(collection, store2, - CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0); + ret = CertAddStoreToCollection(collection, store2, CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0); ok(ret, "CertAddStoreToCollection failed: %08x\n", GetLastError()); /* Check that the collection has two copies of the same cert */ @@ -948,8 +933,7 @@ static void testCollectionStore(void) ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); CertDeleteCertificateFromStore(context); - pCertAddStoreToCollection(collection, store1, - CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0); + CertAddStoreToCollection(collection, store1, CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0); ret = CertAddEncodedCertificateToStore(collection, X509_ASN_ENCODING, bigCert, sizeof(bigCert), CERT_STORE_ADD_ALWAYS, &context); @@ -976,7 +960,7 @@ static void testCollectionStore(void) */ store1 = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); - pCertAddStoreToCollection(collection, store1, 0, 0); + CertAddStoreToCollection(collection, store1, 0, 0); SetLastError(0xdeadbeef); ret = pCertControlStore(collection, 0, CERT_STORE_CTRL_COMMIT, NULL); ok(!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED, @@ -1000,8 +984,7 @@ static void testCollectionStore(void) CERT_FILE_STORE_COMMIT_ENABLE_FLAG, file); ok(store1 != NULL, "CertOpenStore failed: %08x\n", GetLastError()); CloseHandle(file); - pCertAddStoreToCollection(collection, store1, - CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0); + CertAddStoreToCollection(collection, store1, CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0); CertCloseStore(store1, 0); ret = CertAddEncodedCertificateToStore(collection, X509_ASN_ENCODING, @@ -1364,12 +1347,8 @@ static void testSystemRegStore(void) CERT_STORE_CREATE_NEW_FLAG, NULL); if (memStore) { - if (pCertAddStoreToCollection) - { - BOOL ret = pCertAddStoreToCollection(store, memStore, 0, 0); - ok(!ret && GetLastError() == E_INVALIDARG, - "Expected E_INVALIDARG, got %08x\n", GetLastError()); - } + BOOL ret = CertAddStoreToCollection(store, memStore, 0, 0); + ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); CertCloseStore(memStore, 0); } CertCloseStore(store, 0); @@ -1458,12 +1437,9 @@ static void testSystemStore(void) /* Check that it's a collection store */ if (memStore) { - if (pCertAddStoreToCollection) - { - BOOL ret = pCertAddStoreToCollection(store, memStore, 0, 0); - /* FIXME: this'll fail on NT4, but what error will it give? */ - ok(ret, "CertAddStoreToCollection failed: %08x\n", GetLastError()); - } + BOOL ret = CertAddStoreToCollection(store, memStore, 0, 0); + /* FIXME: this'll fail on NT4, but what error will it give? */ + ok(ret, "CertAddStoreToCollection failed: %08x\n", GetLastError()); CertCloseStore(memStore, 0); } CertCloseStore(store, 0); @@ -3169,7 +3145,6 @@ START_TEST(store) HMODULE hdll; hdll = GetModuleHandleA("Crypt32.dll"); - pCertAddStoreToCollection = (void*)GetProcAddress(hdll, "CertAddStoreToCollection"); pCertControlStore = (void*)GetProcAddress(hdll, "CertControlStore"); pCertEnumCRLsInStore = (void*)GetProcAddress(hdll, "CertEnumCRLsInStore"); pCertEnumSystemStore = (void*)GetProcAddress(hdll, "CertEnumSystemStore");

1 0

Nikolay Sivov : ole32/tests: Test pointer returned by ProgIDFromCLSID() on failure.
by Alexandre Julliard 10 Apr '17

10 Apr '17

Module: wine Branch: master Commit: 3237c5ed84764c8a196bd04e61e37d53ca940b83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3237c5ed84764c8a196bd04e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 10 07:37:28 2017 +0300 ole32/tests: Test pointer returned by ProgIDFromCLSID() on failure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 20d2962..e585a46 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -356,11 +356,13 @@ static void test_ProgIDFromCLSID(void) CoTaskMemFree(progid); /* classes without default progid, progid list is not used */ + progid = (void *)0xdeadbeef; hr = ProgIDFromCLSID(&IID_Testiface5, &progid); - ok(hr == REGDB_E_CLASSNOTREG, "got 0x%08x\n", hr); + ok(hr == REGDB_E_CLASSNOTREG && progid == NULL, "got 0x%08x, progid %p\n", hr, progid); + progid = (void *)0xdeadbeef; hr = ProgIDFromCLSID(&IID_Testiface6, &progid); - ok(hr == REGDB_E_CLASSNOTREG, "got 0x%08x\n", hr); + ok(hr == REGDB_E_CLASSNOTREG && progid == NULL, "got 0x%08x, progid %p\n", hr, progid); pDeactivateActCtx(0, cookie); pReleaseActCtx(handle);

1 0

Nikolay Sivov : qcap/tests: Return cloned enumeration objects (Coverity).
by Alexandre Julliard 10 Apr '17

10 Apr '17

Module: wine Branch: master Commit: 985acda3eeeeef14d2a8243e62a16790f51ddb4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=985acda3eeeeef14d2a8243e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 10 07:37:29 2017 +0300 qcap/tests: Return cloned enumeration objects (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index e927d59..f62a88f 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -299,6 +299,7 @@ static HRESULT WINAPI SinkEnumPins_Clone(IEnumPins *iface, IEnumPins **ppEnum) if (clone == NULL) return E_OUTOFMEMORY; clone->index = This->index; + *ppEnum = &clone->IEnumPins_iface; return S_OK; } @@ -971,6 +972,7 @@ static HRESULT WINAPI SourceEnumPins_Clone(IEnumPins *iface, IEnumPins **ppEnum) if (clone == NULL) return E_OUTOFMEMORY; clone->index = This->index; + *ppEnum = &clone->IEnumPins_iface; return S_OK; } @@ -1087,6 +1089,7 @@ static HRESULT WINAPI SourceEnumMediaTypes_Clone(IEnumMediaTypes *iface, IEnumMe if (clone == NULL) return E_OUTOFMEMORY; clone->index = This->index; + *ppEnum = &clone->IEnumMediaTypes_iface; return S_OK; }

1 0

Bruno Jesus : dinput: Assume a 1-to-1 axes map when no axes match.
by Alexandre Julliard 10 Apr '17

10 Apr '17

Module: wine Branch: master Commit: e87ccb8b055dc846211967e46ee2f17fbabef7a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e87ccb8b055dc846211967e46… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Sun Apr 9 22:25:35 2017 -0300 dinput: Assume a 1-to-1 axes map when no axes match. The wiimote is a well known problematic device, mainly because it is not a joystick. It is a USB device. But the classic controller is at least advertised as a joystick with 6 axes and 11 buttons (js driver only, NO event). Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linux.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 1f8f94d..1032659 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -228,19 +228,36 @@ static INT find_joystick_devices(void) else if ((joydev.dev_axes_map = HeapAlloc(GetProcessHeap(), 0, joydev.axis_count * sizeof(int)))) { - INT j; + INT j, found_axes = 0; /* Remap to DI numbers */ for (j = 0; j < joydev.axis_count; j++) + { if (axes_map[j] < 8) + { /* Axis match 1-to-1 */ joydev.dev_axes_map[j] = j; + found_axes++; + } else if (axes_map[j] == 16 || axes_map[j] == 17) + { /* POV axis */ joydev.dev_axes_map[j] = 8; + found_axes++; + } else joydev.dev_axes_map[j] = -1; + } + + /* If no axes were configured but there are axes assume a 1-to-1 (wii controller) */ + if (joydev.axis_count && !found_axes) + { + ERR("Incoherent joystick data, advertised %d axes, detected 0. Assuming 1-to-1.\n", + joydev.axis_count); + for (j = 0; j < joydev.axis_count; j++) + joydev.dev_axes_map[j] = j; + } } /* Find vendor_id and product_id in sysfs */

1 0

André Hentschel : ntdll: Bump Win 10 version to 15063.
by Alexandre Julliard 10 Apr '17

10 Apr '17

Module: wine Branch: master Commit: 72aecacf94d93fa640de761d2866490276fe07d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72aecacf94d93fa640de761d2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 8 16:15:43 2017 +0200 ntdll: Bump Win 10 version to 15063. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/version.c | 2 +- programs/winecfg/appdefaults.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 1fa40e0..58ccb95 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -185,7 +185,7 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = }, /* WIN10 */ { - sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x3839, VER_PLATFORM_WIN32_NT, + sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x3AD7, VER_PLATFORM_WIN32_NT, {0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index d272d1c..a08542a 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -48,7 +48,7 @@ static const struct const char *szProductType; } win_versions[] = { - { "win10", "Windows 10", 10, 0, 0x3839,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, + { "win10", "Windows 10", 10, 0, 0x3AD7,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, { "win81", "Windows 8.1", 6, 3, 0x2580,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, { "win8", "Windows 8", 6, 2, 0x23F0,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, { "win2008r2", "Windows 2008 R2", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"},

1 0

Andrey Gusev : d3dx11: Add D3DX11FilterTexture stub.
by Alexandre Julliard 10 Apr '17

10 Apr '17

Module: wine Branch: master Commit: 0e2bbb210a5973341adc9c88943da6ecebb9d9bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e2bbb210a5973341adc9c889… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun Apr 9 21:17:15 2017 +0300 d3dx11: Add D3DX11FilterTexture stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_42/d3dx11_42.spec | 2 +- dlls/d3dx11_43/d3dx11_43.c | 7 +++++++ dlls/d3dx11_43/d3dx11_43.spec | 2 +- include/d3dx11tex.h | 23 +++++++++++++++++++++++ 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index 815c162..12d4429 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -26,7 +26,7 @@ @ stub D3DX11CreateTextureFromResourceA @ stub D3DX11CreateTextureFromResourceW @ stub D3DX11CreateThreadPump -@ stub D3DX11FilterTexture +@ stdcall D3DX11FilterTexture(ptr ptr long long) d3dx11_43.D3DX11FilterTexture @ stub D3DX11GetImageInfoFromFileA @ stub D3DX11GetImageInfoFromFileW @ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr) d3dx11_43.D3DX11GetImageInfoFromMemory diff --git a/dlls/d3dx11_43/d3dx11_43.c b/dlls/d3dx11_43/d3dx11_43.c index 201f3fb..4bf4998 100644 --- a/dlls/d3dx11_43/d3dx11_43.c +++ b/dlls/d3dx11_43/d3dx11_43.c @@ -61,6 +61,13 @@ BOOL WINAPI D3DX11CheckVersion(UINT d3dsdkversion, UINT d3dxsdkversion) return FALSE; } +HRESULT WINAPI D3DX11FilterTexture(ID3D11DeviceContext *context, ID3D11Resource *texture, UINT src_level, UINT filter) +{ + FIXME("context %p, texture %p, src_level %u, filter %#x stub!\n", context, texture, src_level, filter); + + return E_NOTIMPL; +} + HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump, D3DX11_IMAGE_INFO *img_info, HRESULT *hresult) { diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index 452e513..a4e85af 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -26,7 +26,7 @@ @ stub D3DX11CreateTextureFromResourceA @ stub D3DX11CreateTextureFromResourceW @ stub D3DX11CreateThreadPump -@ stub D3DX11FilterTexture +@ stdcall D3DX11FilterTexture(ptr ptr long long) @ stub D3DX11GetImageInfoFromFileA @ stub D3DX11GetImageInfoFromFileW @ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr) diff --git a/include/d3dx11tex.h b/include/d3dx11tex.h index 16b280a..584a3bd 100644 --- a/include/d3dx11tex.h +++ b/include/d3dx11tex.h @@ -21,6 +21,27 @@ #ifndef __D3DX11TEX_H__ #define __D3DX11TEX_H__ +typedef enum D3DX11_FILTER_FLAG +{ + D3DX11_FILTER_NONE = 0x00000001, + D3DX11_FILTER_POINT = 0x00000002, + D3DX11_FILTER_LINEAR = 0x00000003, + D3DX11_FILTER_TRIANGLE = 0x00000004, + D3DX11_FILTER_BOX = 0x00000005, + + D3DX11_FILTER_MIRROR_U = 0x00010000, + D3DX11_FILTER_MIRROR_V = 0x00020000, + D3DX11_FILTER_MIRROR_W = 0x00040000, + D3DX11_FILTER_MIRROR = 0x00070000, + + D3DX11_FILTER_DITHER = 0x00080000, + D3DX11_FILTER_DITHER_DIFFUSION = 0x00100000, + + D3DX11_FILTER_SRGB_IN = 0x00200000, + D3DX11_FILTER_SRGB_OUT = 0x00400000, + D3DX11_FILTER_SRGB = 0x00600000, +} D3DX11_FILTER_FLAG; + typedef enum D3DX11_IMAGE_FILE_FORMAT { D3DX11_IFF_BMP = 0, @@ -93,6 +114,8 @@ HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, co HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *src_data, SIZE_T src_data_size, D3DX11_IMAGE_LOAD_INFO *loadinfo, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult); +HRESULT WINAPI D3DX11FilterTexture(ID3D11DeviceContext *context, ID3D11Resource *texture, UINT src_level, UINT filter); + HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump, D3DX11_IMAGE_INFO *img_info, HRESULT *hresult);

1 0

Zebediah Figura : winedump: Correctly process options for default mode.
by Alexandre Julliard 10 Apr '17

10 Apr '17

Module: wine Branch: master Commit: 027ccc6c4c2c44418aab6aa981e481a9992590d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=027ccc6c4c2c44418aab6aa98… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 7 15:25:31 2017 -0500 winedump: Correctly process options for default mode. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/main.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/winedump/main.c b/tools/winedump/main.c index a4ebb43..a5ab2bb 100644 --- a/tools/winedump/main.c +++ b/tools/winedump/main.c @@ -210,6 +210,13 @@ static const struct my_option option_table[] = { {"--help",NONE, 0, do_usage, "--help Display this help message"}, {"-h", NONE, 0, do_usage, "-h Synonym for --help"}, {"-?", NONE, 0, do_usage, "-? Synonym for --help"}, + {"dump", DUMP, 0, do_dump, "dump <file> Dump the contents of 'file' (dll, exe, lib...)"}, + {"-C", DUMP, 0, do_symdmngl, "-C Turn on symbol demangling"}, + {"-f", DUMP, 0, do_dumphead, "-f Dump file header information"}, + {"-G", DUMP, 0, do_rawdebug, "-G Dump raw debug information"}, + {"-j", DUMP, 1, do_dumpsect, "-j <sect_name> Dump only the content of section 'sect_name' (import, export, debug, resource, tls, loadcfg, clr, reloc, except)"}, + {"-t", DUMP, 0, do_symtable, "-t Dump symbol table"}, + {"-x", DUMP, 0, do_dumpall, "-x Dump everything"}, {"sym", DMGL, 0, do_demangle, "sym <sym> Demangle C++ symbol <sym> and exit"}, {"spec", SPEC, 0, do_spec, "spec <dll> Use 'dll' for input file and generate implementation code"}, {"-I", SPEC, 1, do_include, "-I <dir> Look for prototypes in 'dir' (implies -c)"}, @@ -224,13 +231,6 @@ static const struct my_option option_table[] = { {"-S", SPEC, 1, do_symfile, "-S <symfile> Search only prototype names found in 'symfile'"}, {"-q", SPEC, 0, do_quiet, "-q Don't show progress (quiet)."}, {"-v", SPEC, 0, do_verbose, "-v Show lots of detail while working (verbose)."}, - {"dump", DUMP, 0, do_dump, "dump <file> Dump the contents of 'file' (dll, exe, lib...)"}, - {"-C", DUMP, 0, do_symdmngl, "-C Turn on symbol demangling"}, - {"-f", DUMP, 0, do_dumphead, "-f Dump file header information"}, - {"-G", DUMP, 0, do_rawdebug, "-G Dump raw debug information"}, - {"-j", DUMP, 1, do_dumpsect, "-j <sect_name> Dump only the content of section 'sect_name' (import, export, debug, resource, tls, loadcfg, clr, reloc, except)"}, - {"-t", DUMP, 0, do_symtable, "-t Dump symbol table"}, - {"-x", DUMP, 0, do_dumpall, "-x Dump everything"}, {NULL, NONE, 0, NULL, NULL} };

1 0

Christian Inci : ntdll/tests: Check debug registers of a newly created thread.
by Alexandre Julliard 10 Apr '17

10 Apr '17

Module: wine Branch: master Commit: 8335d9152f64a51ffc3ba810d6ea0286883e3e58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8335d9152f64a51ffc3ba810d… Author: Christian Inci <chris.wine(a)broke-the-inter.net> Date: Sun Apr 9 20:22:34 2017 +0200 ntdll/tests: Check debug registers of a newly created thread. Signed-off-by: Christian Inci <chris.wine(a)broke-the-inter.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 3abec1b..27eac27 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1991,6 +1991,11 @@ static void test___C_specific_handler(void) #if defined(__i386__) || defined(__x86_64__) +static DWORD WINAPI dummy_thread(void *arg) +{ + return 0; +} + static void test_debug_registers(void) { static const struct @@ -2004,6 +2009,7 @@ static void test_debug_registers(void) }; NTSTATUS status; CONTEXT ctx; + HANDLE thread; int i; for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) @@ -2032,6 +2038,30 @@ static void test_debug_registers(void) ok((ctx.Dr6 & 0xf00f) == tests[i].dr6, "test %d: expected %lx, got %lx\n", i, tests[i].dr6, (DWORD_PTR)ctx.Dr6); ok((ctx.Dr7 & ~0xdc00) == tests[i].dr7, "test %d: expected %lx, got %lx\n", i, tests[i].dr7, (DWORD_PTR)ctx.Dr7); } + + memset(&ctx, 0, sizeof(ctx)); + ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; + ctx.Dr0 = 0xffffffff; + ctx.Dr1 = 0xffffffff; + ctx.Dr2 = 0xffffffff; + ctx.Dr3 = 0xffffffff; + ctx.Dr6 = 0xffffffff; + ctx.Dr7 = 0x00000400; + status = pNtSetContextThread(GetCurrentThread(), &ctx); + ok(status == STATUS_SUCCESS, "NtSetContextThread failed with %x\n", status); + thread = CreateThread(NULL, 0, dummy_thread, NULL, CREATE_SUSPENDED, NULL); + ok(thread != INVALID_HANDLE_VALUE, "CreateThread failed with %d\n", GetLastError()); + ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; + status = pNtGetContextThread(thread, &ctx); + ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %x\n", status); + ok(!ctx.Dr0, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr0); + ok(!ctx.Dr1, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr1); + ok(!ctx.Dr2, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr2); + ok(!ctx.Dr3, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr3); + todo_wine ok(!ctx.Dr6, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr6); + todo_wine ok(!ctx.Dr7, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr7); + TerminateThread(thread, 0); + CloseHandle(thread); } static DWORD outputdebugstring_exceptions;

1 0

Alexandre Julliard : wrc: Only add translations for specific fields in version blocks.
by Alexandre Julliard 07 Apr '17

07 Apr '17

Module: wine Branch: master Commit: 8f08aee04d101834336120f1fd480f2400d21f7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f08aee04d101834336120f1f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 7 11:19:08 2017 +0200 wrc: Only add translations for specific fields in version blocks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/wine_common_ver.rc | 12 ++++++------ tools/wrc/po.c | 18 +++++++++++++++++- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index b1b054d..39a17d6 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -125,14 +125,14 @@ FILESUBTYPE WINE_FILESUBTYPE /* LANG_ENGLISH/SUBLANG_DEFAULT, WINE_CODEPAGE */ BLOCK "0409" WINE_CODEPAGE_STR { - VALUE "CompanyName", "#msgctxt#do not translate#Microsoft Corporation" /* GameGuard depends on this */ + VALUE "CompanyName", "Microsoft Corporation" /* GameGuard depends on this */ VALUE "FileDescription", WINE_FILEDESCRIPTION_STR - VALUE "FileVersion", "#msgctxt#do not translate#" WINE_FILEVERSION_STR - VALUE "InternalName", "#msgctxt#do not translate#" WINE_FILENAME - VALUE "LegalCopyright", "#msgctxt#do not translate#" WINE_LEGALCOPYRIGHT - VALUE "OriginalFilename", "#msgctxt#do not translate#" WINE_FILENAME_STR + VALUE "FileVersion", WINE_FILEVERSION_STR + VALUE "InternalName", WINE_FILENAME + VALUE "LegalCopyright", WINE_LEGALCOPYRIGHT + VALUE "OriginalFilename", WINE_FILENAME_STR VALUE "ProductName", WINE_PRODUCTNAME_STR - VALUE "ProductVersion", "#msgctxt#do not translate#" WINE_PRODUCTVERSION_STR + VALUE "ProductVersion", WINE_PRODUCTVERSION_STR WINE_EXTRAVALUES } } diff --git a/tools/wrc/po.c b/tools/wrc/po.c index c28c7d8..7b09f10 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -917,6 +917,21 @@ static ver_block_t *get_version_langcharset_block( ver_block_t *block ) return NULL; } +static int version_value_needs_translation( const ver_value_t *val ) +{ + int ret; + char *key; + + if (val->type != val_str) return 0; + if (!(key = convert_msgid_ascii( val->key, 0 ))) return 0; + + /* most values contain version numbers or file names, only translate a few specific ones */ + ret = (!strcasecmp( key, "FileDescription" ) || !strcasecmp( key, "ProductName" )); + + free( key ); + return ret; +} + static void add_pot_versioninfo( po_file_t po, const resource_t *res ) { ver_value_t *val; @@ -924,7 +939,8 @@ static void add_pot_versioninfo( po_file_t po, const resource_t *res ) if (!langcharset) return; for (val = langcharset->values; val; val = val->next) - add_po_string( po, val->value.str, NULL, NULL ); + if (version_value_needs_translation( val )) + add_po_string( po, val->value.str, NULL, NULL ); } static void add_po_versioninfo( const resource_t *english, const resource_t *res )

1 0