October 2014 - Wine-Commits

Amine Khaldi : rpcrt4/tests: Remove unused if3_table and if4_table (Clang) .
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: 19254eb4381f075dc4939d527cf9d306076f0355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19254eb4381f075dc4939d527… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Thu Oct 23 19:12:18 2014 +0100 rpcrt4/tests: Remove unused if3_table and if4_table (Clang). --- dlls/rpcrt4/tests/cstub.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index ad723de..de0c224 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -288,12 +288,6 @@ static const MIDL_SERVER_INFO if3_server_info = 0, 0}; - -static const PRPC_STUB_FUNCTION if3_table[] = -{ - if1_fn1_Stub -}; - static CInterfaceStubVtbl if3_stub_vtbl = { { @@ -338,15 +332,6 @@ static const MIDL_SERVER_INFO if4_server_info = 0, 0}; - -static const PRPC_STUB_FUNCTION if4_table[] = -{ - STUB_FORWARDING_FUNCTION, - STUB_FORWARDING_FUNCTION, - STUB_FORWARDING_FUNCTION, - STUB_FORWARDING_FUNCTION, -}; - static CInterfaceStubVtbl if4_stub_vtbl = { {

1 0

Nikolay Sivov : dwrite: Implement custom font collections.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: fbf2557cd7f518977b30d0da338de6d37cb92642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbf2557cd7f518977b30d0da3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 24 11:43:21 2014 +0400 dwrite: Implement custom font collections. --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 346 +++++++++++++++++++++++++++++++++++-------- dlls/dwrite/main.c | 24 ++- 3 files changed, 311 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fbf2557cd7f518977b30d…

1 0

Nikolay Sivov : dwrite: Pass raw NAME table pointer to table reading code.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: 35e9b6d85d055b1ed195a2bde790c1a69a74d054 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35e9b6d85d055b1ed195a2bde… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 24 11:42:35 2014 +0400 dwrite: Pass raw NAME table pointer to table reading code. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 21 +++++++++++++++++---- dlls/dwrite/main.c | 39 +++++++++++++++++++++------------------ dlls/dwrite/opentype.c | 15 +++------------ dlls/dwrite/tests/font.c | 6 ++---- 5 files changed, 44 insertions(+), 39 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 02601fb..faf1b0a 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -113,7 +113,7 @@ extern HRESULT opentype_get_font_table(IDWriteFontFileStream*,DWRITE_FONT_FACE_T extern void opentype_cmap_get_glyphindex(void*,UINT32,UINT16*) DECLSPEC_HIDDEN; extern HRESULT opentype_cmap_get_unicode_ranges(void*,UINT32,DWRITE_UNICODE_RANGE*,UINT32*) DECLSPEC_HIDDEN; extern VOID get_font_properties(LPCVOID os2, LPCVOID head, LPCVOID post, DWRITE_FONT_METRICS *metrics, DWRITE_FONT_STRETCH *stretch, DWRITE_FONT_WEIGHT *weight, DWRITE_FONT_STYLE *style) DECLSPEC_HIDDEN; -extern HRESULT opentype_get_font_strings_from_id(IDWriteFontFace2*,DWRITE_INFORMATIONAL_STRING_ID,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; +extern HRESULT opentype_get_font_strings_from_id(const void*,DWRITE_INFORMATIONAL_STRING_ID,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT bidi_computelevels(const WCHAR*,UINT32,UINT8,UINT8*,UINT8*) DECLSPEC_HIDDEN; extern WCHAR bidi_get_mirrored_char(WCHAR) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index fcdfdb5..217f772 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -29,6 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); #define MS_OS2_TAG DWRITE_MAKE_OPENTYPE_TAG('O','S','/','2') #define MS_POST_TAG DWRITE_MAKE_OPENTYPE_TAG('p','o','s','t') #define MS_CMAP_TAG DWRITE_MAKE_OPENTYPE_TAG('c','m','a','p') +#define MS_NAME_TAG DWRITE_MAKE_OPENTYPE_TAG('n','a','m','e') struct dwrite_fontface_data { LONG ref; @@ -986,14 +987,26 @@ static HRESULT WINAPI dwritefont_GetInformationalStrings(IDWriteFont2 *iface, if (!data->info_strings[stringid]) { IDWriteFontFace2 *fontface; + const void *table_data; + BOOL table_exists; + void *context; + UINT32 size; hr = get_fontface_from_font(This, &fontface); if (FAILED(hr)) return hr; - hr = opentype_get_font_strings_from_id(fontface, stringid, &data->info_strings[stringid]); - if (FAILED(hr) || !data->info_strings[stringid]) - return hr; + table_exists = FALSE; + hr = IDWriteFontFace2_TryGetFontTable(fontface, MS_NAME_TAG, &table_data, &size, &context, &table_exists); + if (FAILED(hr) || !table_exists) + WARN("no NAME table found.\n"); + + if (table_exists) { + hr = opentype_get_font_strings_from_id(table_data, stringid, &data->info_strings[stringid]); + if (FAILED(hr) || !data->info_strings[stringid]) + return hr; + IDWriteFontFace2_ReleaseFontTable(fontface, context); + } } hr = clone_localizedstring(data->info_strings[stringid], strings); @@ -1001,7 +1014,7 @@ static HRESULT WINAPI dwritefont_GetInformationalStrings(IDWriteFont2 *iface, return hr; *exists = TRUE; - return hr; + return S_OK; } static DWRITE_FONT_SIMULATIONS WINAPI dwritefont_GetSimulations(IDWriteFont2 *iface) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 4c549d6..d844e7f 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -361,33 +361,36 @@ HRESULT add_localizedstring(IDWriteLocalizedStrings *iface, const WCHAR *locale, return S_OK; } -HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **strings) -{ - struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); - struct localizedstrings *New; +HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **ret) + { + struct localizedstrings *strings, *strings_clone; int i; - *strings = NULL; + *ret = NULL; + + if (!iface) + return S_FALSE; - New = heap_alloc(sizeof(struct localizedstrings)); - if (!New) return E_OUTOFMEMORY; + strings = impl_from_IDWriteLocalizedStrings(iface); + strings_clone = heap_alloc(sizeof(struct localizedstrings)); + if (!strings_clone) return E_OUTOFMEMORY; - New->IDWriteLocalizedStrings_iface.lpVtbl = &localizedstringsvtbl; - New->ref = 1; - New->count = This->count; - New->data = heap_alloc(sizeof(struct localizedpair) * New->count); - if (!New->data) { - heap_free(New); + strings_clone->IDWriteLocalizedStrings_iface.lpVtbl = &localizedstringsvtbl; + strings_clone->ref = 1; + strings_clone->count = strings->count; + strings_clone->data = heap_alloc(sizeof(struct localizedpair) * strings_clone->count); + if (!strings_clone->data) { + heap_free(strings_clone); return E_OUTOFMEMORY; } - for (i = 0; i < New->count; i++) + for (i = 0; i < strings_clone->count; i++) { - New->data[i].locale = heap_strdupW(This->data[i].locale); - New->data[i].string = heap_strdupW(This->data[i].string); + strings_clone->data[i].locale = heap_strdupW(strings->data[i].locale); + strings_clone->data[i].string = heap_strdupW(strings->data[i].string); } - New->alloc = New->count; + strings_clone->alloc = strings_clone->count; - *strings = &New->IDWriteLocalizedStrings_iface; + *ret = &strings_clone->IDWriteLocalizedStrings_iface; return S_OK; } diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index ed08899..c007b35 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -26,7 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); #define MS_TTCF_TAG DWRITE_MAKE_OPENTYPE_TAG('t','t','c','f') #define MS_OTTO_TAG DWRITE_MAKE_OPENTYPE_TAG('O','T','T','O') -#define MS_NAME_TAG DWRITE_MAKE_OPENTYPE_TAG('n','a','m','e') #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) @@ -615,24 +614,18 @@ VOID get_font_properties(LPCVOID os2, LPCVOID head, LPCVOID post, DWRITE_FONT_ME } } -HRESULT opentype_get_font_strings_from_id(IDWriteFontFace2 *fontface, DWRITE_INFORMATIONAL_STRING_ID id, IDWriteLocalizedStrings **strings) +HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMATIONAL_STRING_ID id, IDWriteLocalizedStrings **strings) { - const void *table_data = NULL; - void *name_context = NULL; const TT_NAME_V0 *header; BYTE *storage_area = 0; - BOOL exists = FALSE; USHORT count = 0; UINT16 name_id; - UINT32 size; + BOOL exists; HRESULT hr; int i; - hr = IDWriteFontFace2_TryGetFontTable(fontface, MS_NAME_TAG, &table_data, &size, &name_context, &exists); - if (FAILED(hr) || !exists) { - FIXME("failed to get NAME table\n"); + if (!table_data) return E_FAIL; - } hr = create_localizedstrings(strings); if (FAILED(hr)) return hr; @@ -727,8 +720,6 @@ HRESULT opentype_get_font_strings_from_id(IDWriteFontFace2 *fontface, DWRITE_INF } } - IDWriteFontFace2_ReleaseFontTable(fontface, name_context); - if (!exists) { IDWriteLocalizedStrings_Release(*strings); *strings = NULL; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index baba6c2..3830bc9 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1521,10 +1521,9 @@ static void test_GetInformationalStrings(void) exists = FALSE; strings = NULL; hr = IDWriteFont_GetInformationalStrings(font, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, &strings, &exists); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(exists == TRUE, "got %d\n", exists); -} + exists = TRUE; strings = NULL; hr = IDWriteFont_GetInformationalStrings(font, DWRITE_INFORMATIONAL_STRING_NONE, &strings, &exists); @@ -1534,10 +1533,9 @@ todo_wine { /* strings instance is not reused */ strings2 = NULL; hr = IDWriteFont_GetInformationalStrings(font, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, &strings2, &exists); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine ok(strings2 != strings, "got %p, %p\n", strings2, strings); -} if (strings) IDWriteLocalizedStrings_Release(strings);

1 0

Nikolay Sivov : dwrite: Cache fontface instances at factory level.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: 42882f7f75df1ac00ff721407e9a828c6dab121b URL: http://source.winehq.org/git/wine.git/?a=commit;h=42882f7f75df1ac00ff721407… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 24 11:40:06 2014 +0400 dwrite: Cache fontface instances at factory level. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 124 ++++++++++++++++++++-------------------- dlls/dwrite/main.c | 132 ++++++++++++++++++++++++++++++++++++++----- dlls/dwrite/tests/font.c | 14 +++-- 4 files changed, 189 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42882f7f75df1ac00ff72…

1 0

Nikolay Sivov : dwrite: Use helpers to search through loaders lists.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: 2300602586b8e1ff75a0c6d7773955b668437c8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2300602586b8e1ff75a0c6d77… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 24 11:41:46 2014 +0400 dwrite: Use helpers to search through loaders lists. --- dlls/dwrite/main.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 57e0038..4c549d6 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -495,6 +495,20 @@ static struct fileloader *factory_get_file_loader(struct dwritefactory *factory, return found; } +static struct collectionloader *factory_get_collection_loader(struct dwritefactory *factory, IDWriteFontCollectionLoader *loader) +{ + struct collectionloader *entry, *found = NULL; + + LIST_FOR_EACH_ENTRY(entry, &factory->collection_loaders, struct collectionloader, entry) { + if (entry->loader == loader) { + found = entry; + break; + } + } + + return found; +} + static HRESULT WINAPI dwritefactory_QueryInterface(IDWriteFactory *iface, REFIID riid, void **obj) { struct dwritefactory *This = impl_from_IDWriteFactory(iface); @@ -575,10 +589,8 @@ static HRESULT WINAPI dwritefactory_RegisterFontCollectionLoader(IDWriteFactory if (!loader) return E_INVALIDARG; - LIST_FOR_EACH_ENTRY(entry, &This->collection_loaders, struct collectionloader, entry) { - if (entry->loader == loader) - return DWRITE_E_ALREADYREGISTERED; - } + if (factory_get_collection_loader(This, loader)) + return DWRITE_E_ALREADYREGISTERED; entry = heap_alloc(sizeof(*entry)); if (!entry) @@ -595,20 +607,14 @@ static HRESULT WINAPI dwritefactory_UnregisterFontCollectionLoader(IDWriteFactor IDWriteFontCollectionLoader *loader) { struct dwritefactory *This = impl_from_IDWriteFactory(iface); - struct collectionloader *entry, *found = NULL; + struct collectionloader *found; TRACE("(%p)->(%p)\n", This, loader); if (!loader) return E_INVALIDARG; - LIST_FOR_EACH_ENTRY(entry, &This->collection_loaders, struct collectionloader, entry) { - if (entry->loader == loader) { - found = entry; - break; - } - } - + found = factory_get_collection_loader(This, loader); if (!found) return E_INVALIDARG; @@ -784,10 +790,8 @@ static HRESULT WINAPI dwritefactory_RegisterFontFileLoader(IDWriteFactory *iface if (!loader) return E_INVALIDARG; - LIST_FOR_EACH_ENTRY(entry, &This->file_loaders, struct fileloader, entry) { - if (entry->loader == loader) - return DWRITE_E_ALREADYREGISTERED; - } + if (factory_get_file_loader(This, loader)) + return DWRITE_E_ALREADYREGISTERED; entry = heap_alloc(sizeof(*entry)); if (!entry)

1 0

Bruno Jesus : wsock32: Clarify cast operation (PVS-Studio).
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: 2f38271fde329cbd7eeba09e3bd4e759d0871da4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f38271fde329cbd7eeba09e3… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 24 02:10:45 2014 -0200 wsock32: Clarify cast operation (PVS-Studio). --- dlls/wsock32/protocol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wsock32/protocol.c b/dlls/wsock32/protocol.c index 416613a..16109e3 100644 --- a/dlls/wsock32/protocol.c +++ b/dlls/wsock32/protocol.c @@ -191,7 +191,7 @@ INT WINAPI EnumProtocolsW(LPINT protocols, LPVOID buffer, LPDWORD buflen) pi[i].dwMessageSize = wsabuf[i].dwMessageSize; memcpy((char *)buffer + string_offset, wsabuf[i].szProtocol, string_size); - pi[i].lpProtocol = (WCHAR *)(char *)buffer + string_offset; + pi[i].lpProtocol = (WCHAR *)((char *)buffer + string_offset); string_offset += string_size; } HeapFree(GetProcessHeap(), 0, wsabuf);

1 0

Alexandre Julliard : iphlpapi: Avoid an uninitialized variable warning.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: c7924e530d87e69ae48fbbe2c1582c934700eb89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7924e530d87e69ae48fbbe2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 24 13:42:37 2014 +0900 iphlpapi: Avoid an uninitialized variable warning. --- dlls/iphlpapi/iphlpapi_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 4d18711..4d66810 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1251,7 +1251,7 @@ ULONG WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG family, ULONG flags, P PIP_ADAPTER_ADDRESSES aa, PULONG buflen) { InterfaceIndexTable *table; - ULONG i, size, dns_server_size, dns_suffix_size, total_size, ret = ERROR_NO_DATA; + ULONG i, size, dns_server_size = 0, dns_suffix_size, total_size, ret = ERROR_NO_DATA; TRACE("(%d, %08x, %p, %p, %p)\n", family, flags, reserved, aa, buflen); @@ -1308,7 +1308,7 @@ ULONG WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG family, ULONG flags, P size = bytes_left -= size; } } - if (!(flags & GAA_FLAG_SKIP_DNS_SERVER) && dns_server_size) + if (dns_server_size) { firstDns = (PIP_ADAPTER_DNS_SERVER_ADDRESS)((BYTE *)first_aa + total_size - dns_server_size - dns_suffix_size); get_dns_server_addresses(firstDns, &dns_server_size);

1 0

Amine Khaldi : d3dxof: Remove unused IDirectXFileObject_Vtbl (Clang).
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: e67beed64db03eaeb98082d61bcb9fd6d7216ccd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e67beed64db03eaeb98082d61… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Thu Oct 23 19:01:58 2014 +0100 d3dxof: Remove unused IDirectXFileObject_Vtbl (Clang). --- dlls/d3dxof/d3dxof.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 8ca5793..88647cf 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -39,7 +39,6 @@ static const struct IDirectXFileBinaryVtbl IDirectXFileBinary_Vtbl; static const struct IDirectXFileDataVtbl IDirectXFileData_Vtbl; static const struct IDirectXFileDataReferenceVtbl IDirectXFileDataReference_Vtbl; static const struct IDirectXFileEnumObjectVtbl IDirectXFileEnumObject_Vtbl; -static const struct IDirectXFileObjectVtbl IDirectXFileObject_Vtbl; static const struct IDirectXFileSaveObjectVtbl IDirectXFileSaveObject_Vtbl; static HRESULT IDirectXFileDataReferenceImpl_Create(IDirectXFileDataReferenceImpl** ppObj);

1 0

Jonathan Vollebregt : reg/tests: Add REG_DWORD_BIG_ENDIAN tests for reg add.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: d2e6e210ac23cba8e3f82af6cdb31c66d57ad2ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e6e210ac23cba8e3f82af6c… Author: Jonathan Vollebregt <jnvsor(a)gmail.com> Date: Thu Oct 23 17:03:53 2014 +0200 reg/tests: Add REG_DWORD_BIG_ENDIAN tests for reg add. --- programs/reg/tests/reg.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 0e5be50..3ba1e3a 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -246,6 +246,14 @@ static void test_add(void) dword = 456; verify_reg(hkey, "DWORD_LE", REG_DWORD_LITTLE_ENDIAN, &dword, sizeof(dword), 0); + /* REG_DWORD_BIG_ENDIAN */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_BE /t REG_DWORD_BIG_ENDIAN /d 456 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + dword = 456; + verify_reg(hkey, "DWORD_BE", REG_DWORD_BIG_ENDIAN, &dword, sizeof(dword), TODO_REG_SIZE); + /* REG_DWORD_BIG_ENDIAN is broken in every version of windows. It behaves like + * an ordinary REG_DWORD - that is little endian. GG */ + /* REG_MULTI_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi0 /t REG_MULTI_SZ /d \"three\\0little\\0strings\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r);

1 0

Jonathan Vollebregt : reg/tests: Add negative DWORD tests.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: b2c99522a6927b0ce00a69e1650884a8b90320d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2c99522a6927b0ce00a69e16… Author: Jonathan Vollebregt <jnvsor(a)gmail.com> Date: Thu Oct 23 17:03:49 2014 +0200 reg/tests: Add negative DWORD tests. --- programs/reg/tests/reg.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 5b79aed..f79c124 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -180,6 +180,11 @@ static void test_add(void) verify_reg(hkey, "dword8", REG_DWORD, &dword, sizeof(dword), (sizeof(long) > sizeof(DWORD)) ? 0 : TODO_REG_DATA); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /v dword9 /f /d -1", &r); + todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /v dword10 /f /d -0x1", &r); + todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); + /* REG_DWORD_LITTLE_ENDIAN */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_LE /t REG_DWORD_LITTLE_ENDIAN /d 456 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0