wine-commits October 2018

wine-commits@winehq.org

1 participants
602 discussions

Jacek Caban : ntdll/tests: Added more FILE_SKIP_COMPLETION_PORT_ON_SUCCESS tests.
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: wine Branch: master Commit: 4be482bc825c419acd3b524b4825e03998040bd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4be482bc825c419acd3b524b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 25 14:55:57 2018 +0200 ntdll/tests: Added more FILE_SKIP_COMPLETION_PORT_ON_SUCCESS tests. Based on a patch by Sebastian Lackner. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 38 +++++++++++ dlls/ntdll/tests/pipe.c | 169 +++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 198 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4be482bc825c419acd3b…

1 0

Sebastian Lackner : ntdll: Add setting FileIoCompletionNotificationInformation implementation.
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: wine Branch: master Commit: 2f17e0112dc0af3f0b246cf377e2cb8fd7a6cf58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f17e0112dc0af3f0b246cf3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 25 14:55:24 2018 +0200 ntdll: Add setting FileIoCompletionNotificationInformation implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38960 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 19 +++++++++++++++++++ dlls/ntdll/tests/file.c | 11 +++++++---- include/wine/server_protocol.h | 19 ++++++++++++++++++- server/fd.c | 25 ++++++++++++++++++++++++- server/protocol.def | 7 +++++++ server/request.h | 5 +++++ server/trace.c | 9 +++++++++ 7 files changed, 89 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2f17e0112dc0af3f0b24…

1 0

Dmitry Timoshkov : crypt32: Simplify the CertComparePublicKeyInfo implementation.
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: wine Branch: master Commit: b81c0c3e47a163c3b693099565257b6a91a67647 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b81c0c3e47a163c3b6930995… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 25 14:50:35 2018 +0300 crypt32: Simplify the CertComparePublicKeyInfo implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 4a7a1fe..9157814 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1267,32 +1267,21 @@ BOOL WINAPI CertComparePublicKeyInfo(DWORD dwCertEncodingType, ret = FALSE; if (CryptDecodeObject(dwCertEncodingType, RSA_CSP_PUBLICKEYBLOB, pPublicKey1->PublicKey.pbData, pPublicKey1->PublicKey.cbData, - 0, NULL, &length)) + CRYPT_DECODE_ALLOC_FLAG, &pblob1, &length)) { - pblob1 = CryptMemAlloc(length); if (CryptDecodeObject(dwCertEncodingType, RSA_CSP_PUBLICKEYBLOB, - pPublicKey1->PublicKey.pbData, pPublicKey1->PublicKey.cbData, - 0, pblob1, &length)) + pPublicKey2->PublicKey.pbData, pPublicKey2->PublicKey.cbData, + CRYPT_DECODE_ALLOC_FLAG, &pblob2, &length)) { - if (CryptDecodeObject(dwCertEncodingType, RSA_CSP_PUBLICKEYBLOB, - pPublicKey2->PublicKey.pbData, pPublicKey2->PublicKey.cbData, - 0, NULL, &length)) - { - pblob2 = CryptMemAlloc(length); - if (CryptDecodeObject(dwCertEncodingType, RSA_CSP_PUBLICKEYBLOB, - pPublicKey2->PublicKey.pbData, pPublicKey2->PublicKey.cbData, - 0, pblob2, &length)) - { - /* The RSAPUBKEY structure directly follows the BLOBHEADER */ - RSAPUBKEY *pk1 = (LPVOID)(pblob1 + 1), - *pk2 = (LPVOID)(pblob2 + 1); - ret = (pk1->bitlen == pk2->bitlen) && (pk1->pubexp == pk2->pubexp) - && !memcmp(pk1 + 1, pk2 + 1, pk1->bitlen/8); - } - CryptMemFree(pblob2); - } + /* The RSAPUBKEY structure directly follows the BLOBHEADER */ + RSAPUBKEY *pk1 = (LPVOID)(pblob1 + 1), + *pk2 = (LPVOID)(pblob2 + 1); + ret = (pk1->bitlen == pk2->bitlen) && (pk1->pubexp == pk2->pubexp) + && !memcmp(pk1 + 1, pk2 + 1, pk1->bitlen/8); + + LocalFree(pblob2); } - CryptMemFree(pblob1); + LocalFree(pblob1); } break;

1 0

Dmitry Timoshkov : crypt32: Forward CryptDecodeObject to CryptDecodeObjectEx.
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: wine Branch: master Commit: 98fad7df790f2164236306cae99bcd3b44d8963d URL: https://source.winehq.org/git/wine.git/?a=commit;h=98fad7df790f2164236306ca… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 25 14:50:28 2018 +0300 crypt32: Forward CryptDecodeObject to CryptDecodeObjectEx. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/decode.c | 44 ++------------------------------------------ 1 file changed, 2 insertions(+), 42 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index b177872..06d456a 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -6276,48 +6276,8 @@ BOOL WINAPI CryptDecodeObject(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo) { - BOOL ret = FALSE; - CryptDecodeObjectFunc pCryptDecodeObject = NULL; - CryptDecodeObjectExFunc pCryptDecodeObjectEx = NULL; - HCRYPTOIDFUNCADDR hFunc = NULL; - - TRACE_(crypt)("(0x%08x, %s, %p, %d, 0x%08x, %p, %p)\n", dwCertEncodingType, - debugstr_a(lpszStructType), pbEncoded, cbEncoded, dwFlags, - pvStructInfo, pcbStructInfo); - - if (!pvStructInfo && !pcbStructInfo) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - if (cbEncoded > MAX_ENCODED_LEN) - { - SetLastError(CRYPT_E_ASN1_LARGE); - return FALSE; - } - - if (!(pCryptDecodeObjectEx = CRYPT_GetBuiltinDecoder(dwCertEncodingType, - lpszStructType))) - { - TRACE_(crypt)("OID %s not found or unimplemented, looking for DLL\n", - debugstr_a(lpszStructType)); - pCryptDecodeObject = CRYPT_LoadDecoderFunc(dwCertEncodingType, - lpszStructType, &hFunc); - if (!pCryptDecodeObject) - pCryptDecodeObjectEx = CRYPT_LoadDecoderExFunc(dwCertEncodingType, - lpszStructType, &hFunc); - } - if (pCryptDecodeObject) - ret = pCryptDecodeObject(dwCertEncodingType, lpszStructType, - pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo); - else if (pCryptDecodeObjectEx) - ret = pCryptDecodeObjectEx(dwCertEncodingType, lpszStructType, - pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, - pvStructInfo, pcbStructInfo); - if (hFunc) - CryptFreeOIDFunctionAddress(hFunc, 0); - TRACE_(crypt)("returning %d\n", ret); - return ret; + return CryptDecodeObjectEx(dwCertEncodingType, lpszStructType, + pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo); } BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType,

1 0

Dmitry Timoshkov : crypt32: Make it clear that LocalAlloc should return a pointer.
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: wine Branch: master Commit: 855dab34bd4a76f36e2ae986b6a4025326bbed62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=855dab34bd4a76f36e2ae986… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 25 14:50:26 2018 +0300 crypt32: Make it clear that LocalAlloc should return a pointer. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/decode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 080feec..b177872 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -215,7 +215,7 @@ static BOOL CRYPT_DecodeEnsureSpace(DWORD dwFlags, if (pDecodePara && pDecodePara->pfnAlloc) *(BYTE **)pvStructInfo = pDecodePara->pfnAlloc(bytesNeeded); else - *(BYTE **)pvStructInfo = LocalAlloc(0, bytesNeeded); + *(BYTE **)pvStructInfo = LocalAlloc(LPTR, bytesNeeded); if (!*(BYTE **)pvStructInfo) ret = FALSE; else

1 0

Dmitry Timoshkov : crypt32/tests: Get rid of win9x specific checks.
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: wine Branch: master Commit: 4422a96a23b68feebd08b4e835f9a80a982ff931 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4422a96a23b68feebd08b4e8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 25 14:50:21 2018 +0300 crypt32/tests: Get rid of win9x specific checks. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/cert.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index bb0cc52..d6c249c 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -3232,15 +3232,11 @@ static void testComparePublicKeyInfo(void) ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(!ret, "CertComparePublicKeyInfo: as raw binary: keys should be unequal\n"); ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); - ok(ret || - broken(!ret), /* win9x */ - "CertComparePublicKeyInfo: as ASN.1 encoded: keys should be equal\n"); + ok(ret, "CertComparePublicKeyInfo: as ASN.1 encoded: keys should be equal\n"); info1.PublicKey.cUnusedBits = 1; info2.PublicKey.cUnusedBits = 5; ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); - ok(ret || - broken(!ret), /* win9x */ - "CertComparePublicKeyInfo: ASN.1 encoding should ignore cUnusedBits\n"); + ok(ret, "CertComparePublicKeyInfo: ASN.1 encoding should ignore cUnusedBits\n"); info1.PublicKey.cUnusedBits = 0; info2.PublicKey.cUnusedBits = 0; info1.PublicKey.cbData--; /* kill one byte, make ASN.1 encoded data invalid */

1 0

Alexandre Julliard : ntdll: Convert PE header to 64-bit when loading a 32-bit IL-only module.
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: wine Branch: master Commit: 926dd780697852b375ec0a193c762e7723a3f5e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=926dd780697852b375ec0a19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 25 13:48:46 2018 +0200 ntdll: Convert PE header to 64-bit when loading a 32-bit IL-only module. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 51 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 31168c0..c5e8d0d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1921,6 +1921,51 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len ) return STATUS_SUCCESS; } +#ifdef _WIN64 +/* convert PE header to 64-bit when loading a 32-bit IL-only module into a 64-bit process */ +static BOOL convert_to_pe64( HMODULE module, const pe_image_info_t *info ) +{ + static const ULONG copy_dirs[] = { IMAGE_DIRECTORY_ENTRY_RESOURCE, + IMAGE_DIRECTORY_ENTRY_SECURITY, + IMAGE_DIRECTORY_ENTRY_BASERELOC, + IMAGE_DIRECTORY_ENTRY_DEBUG, + IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR }; + IMAGE_OPTIONAL_HEADER32 hdr32 = { IMAGE_NT_OPTIONAL_HDR32_MAGIC }; + IMAGE_OPTIONAL_HEADER64 hdr64 = { IMAGE_NT_OPTIONAL_HDR64_MAGIC }; + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( module ); + SIZE_T hdr_size = min( sizeof(hdr32), nt->FileHeader.SizeOfOptionalHeader ); + IMAGE_SECTION_HEADER *sec = (IMAGE_SECTION_HEADER *)((char *)&nt->OptionalHeader + hdr_size); + SIZE_T size = (char *)(nt + 1) + nt->FileHeader.NumberOfSections * sizeof(*sec) - (char *)module; + void *addr = module; + ULONG i, old_prot; + + TRACE( "%p\n", module ); + + if (size > info->header_size) return FALSE; + if (NtProtectVirtualMemory( NtCurrentProcess(), &addr, &size, PAGE_READWRITE, &old_prot )) + return FALSE; + + memcpy( &hdr32, &nt->OptionalHeader, hdr_size ); + memcpy( &hdr64, &hdr32, offsetof( IMAGE_OPTIONAL_HEADER64, SizeOfStackReserve )); + hdr64.Magic = IMAGE_NT_OPTIONAL_HDR64_MAGIC; + hdr64.AddressOfEntryPoint = 0; + hdr64.ImageBase = hdr32.ImageBase; + hdr64.SizeOfStackReserve = hdr32.SizeOfStackReserve; + hdr64.SizeOfStackCommit = hdr32.SizeOfStackCommit; + hdr64.SizeOfHeapReserve = hdr32.SizeOfHeapReserve; + hdr64.SizeOfHeapCommit = hdr32.SizeOfHeapCommit; + hdr64.LoaderFlags = hdr32.LoaderFlags; + hdr64.NumberOfRvaAndSizes = hdr32.NumberOfRvaAndSizes; + for (i = 0; i < ARRAY_SIZE( copy_dirs ); i++) + hdr64.DataDirectory[copy_dirs[i]] = hdr32.DataDirectory[copy_dirs[i]]; + + memmove( nt + 1, sec, nt->FileHeader.NumberOfSections * sizeof(*sec) ); + nt->FileHeader.SizeOfOptionalHeader = sizeof(hdr64); + nt->OptionalHeader = hdr64; + NtProtectVirtualMemory( NtCurrentProcess(), &addr, &size, old_prot, &old_prot ); + return TRUE; +} +#endif /* On WoW64 setups, an image mapping can also be created for the other 32/64 CPU */ /* but it cannot necessarily be loaded as a dll, so we need some additional checks */ @@ -1932,18 +1977,18 @@ static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info ) return info->machine == IMAGE_FILE_MACHINE_ARM || info->machine == IMAGE_FILE_MACHINE_THUMB || info->machine == IMAGE_FILE_MACHINE_ARMNT; -#elif defined(__x86_64__) || defined(__aarch64__) /* support 32-bit IL-only images on 64-bit */ - const IMAGE_COR20_HEADER *cor_header; - DWORD size; - +#elif defined(_WIN64) /* support 32-bit IL-only images on 64-bit */ #ifdef __x86_64__ if (info->machine == IMAGE_FILE_MACHINE_AMD64) return TRUE; #else if (info->machine == IMAGE_FILE_MACHINE_ARM64) return TRUE; #endif if (!info->contains_code) return TRUE; - cor_header = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR, &size ); - if (cor_header && (cor_header->Flags & COMIMAGE_FLAGS_ILONLY)) return TRUE; + if (info->image_flags & IMAGE_FLAGS_ComPlusNativeReady) + { + if (!convert_to_pe64( module, info )) return FALSE; + } + if (info->image_flags & IMAGE_FLAGS_ComPlusILOnly) return TRUE; return FALSE; #else return FALSE; /* no wow64 support on other platforms */

1 0

Aaryaman Vasishta : d3drm: Implement d3drm*_LoadTexture().
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: wine Branch: master Commit: 1fd88b38856cbaee4087281511c807f110c97c97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fd88b38856cbaee40872815… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Oct 25 14:29:29 2018 +0330 d3drm: Implement d3drm*_LoadTexture(). Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 40 ++++++++++++++++++++++++----- dlls/d3drm/tests/d3drm.c | 66 ++++++++++++++++++++---------------------------- 2 files changed, 61 insertions(+), 45 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 3ea1632..d0f2023 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -638,12 +638,24 @@ static HRESULT WINAPI d3drm1_LoadTexture(IDirect3DRM *iface, struct d3drm_texture *object; HRESULT hr; - FIXME("iface %p, filename %s, texture %p stub!\n", iface, debugstr_a(filename), texture); + TRACE("iface %p, filename %s, texture %p.\n", iface, debugstr_a(filename), texture); + + if (!texture) + return D3DRMERR_BADVALUE; if (FAILED(hr = d3drm_texture_create(&object, iface))) return hr; *texture = &object->IDirect3DRMTexture_iface; + if (FAILED(hr = IDirect3DRMTexture_InitFromFile(*texture, filename))) + { + IDirect3DRMTexture_Release(*texture); + *texture = NULL; + if (!filename) + return D3DRMERR_BADVALUE; + + return hr == D3DRMERR_BADOBJECT ? D3DRMERR_FILENOTFOUND : hr; + } return D3DRM_OK; } @@ -1143,15 +1155,22 @@ static HRESULT WINAPI d3drm2_LoadTexture(IDirect3DRM2 *iface, const char *filename, IDirect3DRMTexture2 **texture) { struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); - struct d3drm_texture *object; + IDirect3DRMTexture3 *texture3; HRESULT hr; - FIXME("iface %p, filename %s, texture %p stub!\n", iface, debugstr_a(filename), texture); + TRACE("iface %p, filename %s, texture %p.\n", iface, debugstr_a(filename), texture); - if (FAILED(hr = d3drm_texture_create(&object, &d3drm->IDirect3DRM_iface))) + if (!texture) + return D3DRMERR_BADVALUE; + + if (FAILED(hr = IDirect3DRM3_LoadTexture(&d3drm->IDirect3DRM3_iface, filename, &texture3))) + { + *texture = NULL; return hr; + } - *texture = &object->IDirect3DRMTexture2_iface; + hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IDirect3DRMTexture2, (void **)texture); + IDirect3DRMTexture3_Release(texture3); return hr; } @@ -1818,12 +1837,21 @@ static HRESULT WINAPI d3drm3_LoadTexture(IDirect3DRM3 *iface, struct d3drm_texture *object; HRESULT hr; - FIXME("iface %p, filename %s, texture %p stub!\n", iface, debugstr_a(filename), texture); + TRACE("iface %p, filename %s, texture %p.\n", iface, debugstr_a(filename), texture); + + if (!texture) + return D3DRMERR_BADVALUE; if (FAILED(hr = d3drm_texture_create(&object, &d3drm->IDirect3DRM_iface))) return hr; *texture = &object->IDirect3DRMTexture3_iface; + if (FAILED(hr = IDirect3DRMTexture3_InitFromFile(*texture, filename))) + { + IDirect3DRMTexture3_Release(*texture); + *texture = NULL; + return hr == D3DRMERR_BADOBJECT ? D3DRMERR_FILENOTFOUND : hr; + } return D3DRM_OK; } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 91ee68c..5157952 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -5601,45 +5601,36 @@ static void test_load_texture(void) /* Test all failures together. */ texture1 = (IDirect3DRMTexture *)0xdeadbeef; hr = IDirect3DRM_LoadTexture(d3drm1, NULL, &texture1); - todo_wine ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); - todo_wine ok(!texture1, "Got unexpected texture %p.\n", texture1); + ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); + ok(!texture1, "Got unexpected texture %p.\n", texture1); texture1 = (IDirect3DRMTexture *)0xdeadbeef; hr = IDirect3DRM_LoadTexture(d3drm1, "", &texture1); - todo_wine ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); - todo_wine ok(!texture1, "Got unexpected texture %p.\n", texture1); - if (hr == D3DRMERR_FILENOTFOUND) - { - hr = IDirect3DRM_LoadTexture(d3drm1, NULL, NULL); - ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); - } + ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!texture1, "Got unexpected texture %p.\n", texture1); + hr = IDirect3DRM_LoadTexture(d3drm1, NULL, NULL); + ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); texture2 = (IDirect3DRMTexture2 *)0xdeadbeef; hr = IDirect3DRM2_LoadTexture(d3drm2, NULL, &texture2); - todo_wine ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); - todo_wine ok(!texture2, "Got unexpected texture %p.\n", texture2); + ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!texture2, "Got unexpected texture %p.\n", texture2); texture2 = (IDirect3DRMTexture2 *)0xdeadbeef; hr = IDirect3DRM2_LoadTexture(d3drm2, "", &texture2); - todo_wine ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); - todo_wine ok(!texture2, "Got unexpected texture %p.\n", texture2); - if (hr == D3DRMERR_FILENOTFOUND) - { - hr = IDirect3DRM2_LoadTexture(d3drm2, NULL, NULL); - ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); - } + ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!texture2, "Got unexpected texture %p.\n", texture2); + hr = IDirect3DRM2_LoadTexture(d3drm2, NULL, NULL); + ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); texture3 = (IDirect3DRMTexture3 *)0xdeadbeef; hr = IDirect3DRM3_LoadTexture(d3drm3, NULL, &texture3); - todo_wine ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); - todo_wine ok(!texture3, "Got unexpected texture %p.\n", texture3); + ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!texture3, "Got unexpected texture %p.\n", texture3); texture3 = (IDirect3DRMTexture3 *)0xdeadbeef; hr = IDirect3DRM_LoadTexture(d3drm3, "", &texture3); - todo_wine ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); - todo_wine ok(!texture3, "Got unexpected texture %p.\n", texture3); - if (hr == D3DRMERR_FILENOTFOUND) - { - hr = IDirect3DRM3_LoadTexture(d3drm3, NULL, NULL); - ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); - } + ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!texture3, "Got unexpected texture %p.\n", texture3); + hr = IDirect3DRM3_LoadTexture(d3drm3, NULL, NULL); + ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(tests); ++i) { @@ -5648,13 +5639,12 @@ static void test_load_texture(void) hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); ref2 = get_refcount((IUnknown *)d3drm1); - todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %u, ref2 %u.\n", i, ref1, ref2); hr = IDirect3DRMTexture_InitFromFile(texture1, filename); - todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); /* InitFromFile() seems to AddRef() IDirect3DRM even if it fails. */ - if (hr == D3DRMERR_BADOBJECT) - IDirect3DRM_Release(d3drm1); + IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture_GetImage(texture1); ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); test_bitmap_data(i * 7, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); @@ -5678,12 +5668,11 @@ static void test_load_texture(void) hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); ref2 = get_refcount((IUnknown *)d3drm1); - todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %u, ref2 %u.\n", i, ref1, ref2); hr = IDirect3DRMTexture2_InitFromFile(texture2, filename); - todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); - if (hr == D3DRMERR_BADOBJECT) - IDirect3DRM_Release(d3drm1); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); + IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture2_GetImage(texture2); ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); test_bitmap_data(i * 7 + 2, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); @@ -5707,12 +5696,11 @@ static void test_load_texture(void) hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); ref2 = get_refcount((IUnknown *)d3drm1); - todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %u, ref2 %u.\n", i, ref1, ref2); hr = IDirect3DRMTexture3_InitFromFile(texture3, filename); - todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); - if (hr == D3DRMERR_BADOBJECT) - IDirect3DRM_Release(d3drm1); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); + IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture3_GetImage(texture3); ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); test_bitmap_data(i * 7 + 4, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);

1 0

Aaryaman Vasishta : d3drm: Partially implement d3drm_texture*_InitFromFile ().
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: wine Branch: master Commit: dbb49e32c34907cf8fd8731f6bd9c4296b798751 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbb49e32c34907cf8fd8731f… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Oct 25 14:29:28 2018 +0330 d3drm: Partially implement d3drm_texture*_InitFromFile(). Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 53 ++++---- dlls/d3drm/texture.c | 312 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 329 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dbb49e32c34907cf8fd8…

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: wine Branch: master Commit: f1ccd02608559b2c6009ea741a8583354c398875 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1ccd02608559b2c6009ea74… Author: Kim Malmo <berencamlost(a)msn.com> Date: Thu Oct 25 10:02:51 2018 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 7580e4e..b861c2b 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-10-07 20:50+0200\n" +"PO-Revision-Date: 2018-10-25 11:58+0200\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -308,25 +308,23 @@ msgstr "Avbryter..." #: browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "%1!u! %2 gjenstår" #: browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "%1!u! %2 og %3!u! %4 gjenstår" #: browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "&Sekunder" +msgstr "sekunder" #: browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "minutter" #: browseui.rc:33 msgid "hours" -msgstr "" +msgstr "timer" #: comctl32.rc:68 winefile.rc:157 msgid "Properties for %s"

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2018