October 2014 - Wine-Commits

Nikolay Sivov : dwrite: Implement system font collection as any other font collection.
by Alexandre Julliard Oct. 30, 2014

Oct. 30, 2014

Module: wine Branch: master Commit: cae5d19338099f3ae8a57fcaf7c8bf46a2d79538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cae5d19338099f3ae8a57fcaf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 29 22:41:47 2014 +0300 dwrite: Implement system font collection as any other font collection. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 631 +++++++++++++++---------------------------- dlls/dwrite/main.c | 2 +- dlls/dwrite/tests/font.c | 39 +-- 4 files changed, 225 insertions(+), 449 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cae5d19338099f3ae8a57…

1 0

Nikolay Sivov : dwrite: Properly null-terminate name string when converting to WCHAR.
by Alexandre Julliard Oct. 30, 2014

Oct. 30, 2014

Module: wine Branch: master Commit: 2bc984a5b1eafa23944fdee26526c342329da870 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bc984a5b1eafa23944fdee26… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 29 22:39:55 2014 +0300 dwrite: Properly null-terminate name string when converting to WCHAR. --- dlls/dwrite/opentype.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 21b1cb2..6d48f90 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -793,8 +793,9 @@ HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMA if (codepage) { DWORD len = MultiByteToWideChar(codepage, 0, (LPSTR)(storage_area + offset), length, NULL, 0); - name_string = heap_alloc(sizeof(WCHAR) * len); + name_string = heap_alloc(sizeof(WCHAR) * (len+1)); MultiByteToWideChar(codepage, 0, (LPSTR)(storage_area + offset), length, name_string, len); + name_string[len] = 0; } else { int i;

1 0

Bruno Jesus : regedit: Allow importing/exporting strings with '\r'.
by Alexandre Julliard Oct. 30, 2014

Oct. 30, 2014

Module: wine Branch: master Commit: 84d72396401f845969d2b9b55506e606d2419d3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=84d72396401f845969d2b9b55… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Oct 29 23:55:08 2014 -0200 regedit: Allow importing/exporting strings with '\r'. --- programs/regedit/regproc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 9d96287..1adeddf 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -267,6 +267,9 @@ static int REGPROC_unescape_string(WCHAR* str) case 'n': str[val_idx] = '\n'; break; + case 'r': + str[val_idx] = '\r'; + break; case '0': str[val_idx] = '\0'; break; @@ -963,6 +966,13 @@ static void REGPROC_export_string(WCHAR **line_buf, DWORD *line_buf_size, DWORD (*line_buf)[pos++] = 'n'; break; + case '\r': + extra++; + REGPROC_resize_char_buffer(line_buf, line_buf_size, *line_len + str_len + extra); + (*line_buf)[pos++] = '\\'; + (*line_buf)[pos++] = 'r'; + break; + case '\\': case '"': extra++;

1 0

Nikolay Sivov : dwrite: Turn fixme to trace in Analyze().
by Alexandre Julliard Oct. 30, 2014

Oct. 30, 2014

Module: wine Branch: master Commit: 712692161573fc03fa7ef127e957088dc43a7b0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=712692161573fc03fa7ef127e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 29 22:43:51 2014 +0300 dwrite: Turn fixme to trace in Analyze(). --- dlls/dwrite/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 622027c..8420fdc 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1792,7 +1792,7 @@ static HRESULT WINAPI dwritefontfile_Analyze(IDWriteFontFile *iface, BOOL *isSup IDWriteFontFileStream *stream; HRESULT hr; - FIXME("(%p)->(%p, %p, %p, %p): Stub\n", This, isSupportedFontType, fontFileType, fontFaceType, numberOfFaces); + TRACE("(%p)->(%p, %p, %p, %p)\n", This, isSupportedFontType, fontFileType, fontFaceType, numberOfFaces); *isSupportedFontType = FALSE; *fontFileType = DWRITE_FONT_FILE_TYPE_UNKNOWN;

1 0

Jacek Caban : mshtml: Don' t call stop_binding in error cases in start_binding.
by Alexandre Julliard Oct. 30, 2014

Oct. 30, 2014

Module: wine Branch: master Commit: 0506a52266a0243a01338208830fa3da059f9358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0506a52266a0243a013382088… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 29 18:00:49 2014 +0100 mshtml: Don't call stop_binding in error cases in start_binding. --- dlls/mshtml/navigate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index a0174ea..0b3d5b5 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -801,7 +801,7 @@ HRESULT start_binding(HTMLInnerWindow *inner_window, BSCallback *bscallback, IBi } if(FAILED(hres)) { - bscallback->vtbl->stop_binding(bscallback, hres); + bscallback->window = NULL; return hres; } @@ -809,7 +809,7 @@ HRESULT start_binding(HTMLInnerWindow *inner_window, BSCallback *bscallback, IBi IBindCtx_Release(bctx); if(FAILED(hres)) { WARN("BindToStorage failed: %08x\n", hres); - bscallback->vtbl->stop_binding(bscallback, hres); + bscallback->window = NULL; return hres; }

1 0

Huw Davies : user32: Merge the blitting of the centred and non-centred cases.
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Module: wine Branch: master Commit: 3cd145f63f0ba15726b32c6be800460e3aef84e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd145f63f0ba15726b32c6be… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 29 09:09:08 2014 +0000 user32: Merge the blitting of the centred and non-centred cases. --- dlls/user32/static.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index f4b5880..ff5c77c 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -775,19 +775,15 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) GetClientRect(hwnd, &rcClient); if (style & SS_CENTERIMAGE) { - INT x, y; - x = (rcClient.right - rcClient.left)/2 - bm.bmWidth/2; - y = (rcClient.bottom - rcClient.top)/2 - bm.bmHeight/2; FillRect( hdc, &rcClient, hbrush ); - BitBlt(hdc, x, y, bm.bmWidth, bm.bmHeight, hMemDC, 0, 0, - SRCCOPY); - } - else - { - StretchBlt(hdc, 0, 0, rcClient.right - rcClient.left, - rcClient.bottom - rcClient.top, hMemDC, - 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY); + rcClient.left = (rcClient.right - rcClient.left)/2 - bm.bmWidth/2; + rcClient.top = (rcClient.bottom - rcClient.top)/2 - bm.bmHeight/2; + rcClient.right = rcClient.left + bm.bmWidth; + rcClient.bottom = rcClient.top + bm.bmHeight; } + StretchBlt(hdc, rcClient.left, rcClient.top, rcClient.right - rcClient.left, + rcClient.bottom - rcClient.top, hMemDC, + 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY); SelectObject(hMemDC, oldbitmap); DeleteDC(hMemDC); }

1 0

Nikolay Sivov : dwrite: Use API-defined type for family count.
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Module: wine Branch: master Commit: 6706ada9f845866e9ffe990c08083578b5558bf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6706ada9f845866e9ffe990c0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 27 14:48:46 2014 +0300 dwrite: Use API-defined type for family count. --- dlls/dwrite/font.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 50c3acb..b271e93 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -71,8 +71,8 @@ struct dwrite_fontcollection { int alloc; struct dwrite_fontfamily_data **family_data; - DWORD data_count; - int data_alloc; + UINT32 family_count; + UINT32 family_alloc; }; struct dwrite_fontfamily { @@ -1304,7 +1304,7 @@ static ULONG WINAPI dwritefontcollection_Release(IDWriteFontCollection *iface) for (i = 0; i < This->count; i++) heap_free(This->families[i]); heap_free(This->families); - for (i = 0; i < This->data_count; i++) + for (i = 0; i < This->family_count; i++) _free_fontfamily_data(This->family_data[i]); heap_free(This->family_data); heap_free(This); @@ -1317,8 +1317,8 @@ static UINT32 WINAPI dwritefontcollection_GetFontFamilyCount(IDWriteFontCollecti { struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); TRACE("(%p)\n", This); - if (This->data_count) - return This->data_count; + if (This->family_count) + return This->family_count; return This->count; } @@ -1331,9 +1331,9 @@ static HRESULT WINAPI dwritefontcollection_GetFontFamily(IDWriteFontCollection * TRACE("(%p)->(%u %p)\n", This, index, family); - if (This->data_count) + if (This->family_count) { - if (index >= This->data_count) + if (index >= This->family_count) { *family = NULL; return E_FAIL; @@ -1362,8 +1362,8 @@ static HRESULT collection_find_family(struct dwrite_fontcollection *collection, { UINT32 i; - if (collection->data_count) { - for (i = 0; i < collection->data_count; i++) { + if (collection->family_count) { + for (i = 0; i < collection->family_count; i++) { IDWriteLocalizedStrings *family_name = collection->family_data[i]->familyname; HRESULT hr; int j; @@ -1421,7 +1421,7 @@ static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollec if (!face) return E_INVALIDARG; - for (i = 0; i < This->data_count; i++) { + for (i = 0; i < This->family_count; i++) { struct dwrite_fontfamily_data *family_data = This->family_data[i]; for (j = 0; j < family_data->font_count; j++) { if ((IDWriteFontFace*)family_data->fonts[j]->face == face) { @@ -1494,21 +1494,21 @@ static HRESULT fontfamily_add_font(struct dwrite_fontfamily_data *family_data, s static HRESULT fontcollection_add_family(struct dwrite_fontcollection *collection, struct dwrite_fontfamily_data *family) { - if (collection->data_alloc < collection->data_count + 1) { + if (collection->family_alloc < collection->family_count + 1) { struct dwrite_fontfamily_data **new_list; UINT32 new_alloc; - new_alloc = collection->data_alloc * 2; + new_alloc = collection->family_alloc * 2; new_list = heap_realloc(collection->family_data, sizeof(*new_list) * new_alloc); if (!new_list) return E_OUTOFMEMORY; - collection->data_alloc = new_alloc; + collection->family_alloc = new_alloc; collection->family_data = new_list; } - collection->family_data[collection->data_count] = family; - collection->data_count++; + collection->family_data[collection->family_count] = family; + collection->family_count++; return S_OK; } @@ -1517,8 +1517,8 @@ static HRESULT init_font_collection(struct dwrite_fontcollection *collection) { collection->IDWriteFontCollection_iface.lpVtbl = &fontcollectionvtbl; collection->ref = 1; - collection->data_count = 0; - collection->data_alloc = 2; + collection->family_count = 0; + collection->family_alloc = 2; collection->count = 0; collection->alloc = 0; collection->families = NULL; @@ -1739,8 +1739,8 @@ HRESULT get_system_fontcollection(IDWriteFontCollection **collection) heap_free(This); return E_OUTOFMEMORY; } - This->data_count = 0; - This->data_alloc = 2; + This->family_count = 0; + This->family_alloc = 2; This->family_data = heap_alloc(sizeof(*This->family_data)*2); if (!This->family_data) {

1 0

Michael Stefaniuc : oleaut32/tests: Remove always true ok conditions ( PVS-Studio).
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Module: wine Branch: master Commit: 53c54d922229210afcfbad697ed46caf013228ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=53c54d922229210afcfbad697… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 28 23:41:14 2014 +0100 oleaut32/tests: Remove always true ok conditions (PVS-Studio). --- dlls/oleaut32/tests/vartest.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 224dad3..d00e577 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -7403,10 +7403,10 @@ static void test_VarPow(void) hres = pVarPow(&cy, &right, &result); if (hres == S_OK) { - ok(hres == S_OK && V_VT(&result) == VT_R8, + ok(V_VT(&result) == VT_R8, "VARPOW: expected coerced hres 0x%X type VT_R8, got hres 0x%X type %s!\n", S_OK, hres, vtstr(V_VT(&result))); - ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 4.0), + ok(EQ_DOUBLE(V_R8(&result), 4.0), "VARPOW: CY value %f, expected %f\n", V_R8(&result), 4.0); } else @@ -7440,10 +7440,10 @@ static void test_VarPow(void) hres = pVarPow(&dec, &right, &result); if (hres == S_OK) { - ok(hres == S_OK && V_VT(&result) == VT_R8, + ok(V_VT(&result) == VT_R8, "VARPOW: expected coerced hres 0x%X type VT_R8, got hres 0x%X type %s!\n", S_OK, hres, vtstr(V_VT(&result))); - ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 4.0), + ok(EQ_DOUBLE(V_R8(&result), 4.0), "VARPOW: DECIMAL value %f, expected %f\n", V_R8(&result), 4.0); } else

1 0

Vincent Povirk : msvcrt: Implement _wcsnicmp_l.
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Module: wine Branch: master Commit: 1860efaa9e4f8143cebfd8e8eb63dca0c33ec3d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1860efaa9e4f8143cebfd8e8e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Sep 4 14:17:26 2014 -0500 msvcrt: Implement _wcsnicmp_l. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 10 +++++++++- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 2f2b0dc..d6c38f4 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1497,7 +1497,7 @@ @ cdecl _wcsncoll(wstr wstr long) MSVCRT__wcsncoll @ cdecl _wcsncoll_l(wstr wstr long ptr) MSVCRT__wcsncoll_l @ cdecl _wcsnicmp(wstr wstr long) MSVCRT__wcsnicmp -@ stub _wcsnicmp_l +@ cdecl _wcsnicmp_l(wstr wstr long ptr) MSVCRT__wcsnicmp_l @ cdecl _wcsnicoll(wstr wstr long) MSVCRT__wcsnicoll @ cdecl _wcsnicoll_l(wstr wstr long ptr) MSVCRT__wcsnicoll_l @ cdecl _wcsnset(wstr long long) MSVCRT__wcsnset diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 282f5bc..02b6497 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1856,7 +1856,7 @@ @ cdecl _wcsncoll(wstr wstr long) MSVCRT__wcsncoll @ cdecl _wcsncoll_l(wstr wstr long ptr) MSVCRT__wcsncoll_l @ cdecl _wcsnicmp(wstr wstr long) MSVCRT__wcsnicmp -@ stub _wcsnicmp_l +@ cdecl _wcsnicmp_l(wstr wstr long ptr) MSVCRT__wcsnicmp_l @ cdecl _wcsnicoll(wstr wstr long) MSVCRT__wcsnicoll @ cdecl _wcsnicoll_l(wstr wstr long ptr) MSVCRT__wcsnicoll_l @ cdecl _wcsnset(wstr long long) MSVCRT__wcsnset diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 5783f3e..ce09f00 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1176,7 +1176,7 @@ @ cdecl _wcsncoll(wstr wstr long) MSVCRT__wcsncoll @ cdecl _wcsncoll_l(wstr wstr long ptr) MSVCRT__wcsncoll_l @ cdecl _wcsnicmp(wstr wstr long) MSVCRT__wcsnicmp -@ stub _wcsnicmp_l +@ cdecl _wcsnicmp_l(wstr wstr long ptr) MSVCRT__wcsnicmp_l @ cdecl _wcsnicoll(wstr wstr long) MSVCRT__wcsnicoll @ cdecl _wcsnicoll_l(wstr wstr long ptr) MSVCRT__wcsnicoll_l @ cdecl _wcsnset(wstr long long) MSVCRT__wcsnset diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ec5d1e7..e4302cf 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1152,7 +1152,7 @@ @ cdecl _wcsncoll(wstr wstr long) MSVCRT__wcsncoll @ cdecl _wcsncoll_l(wstr wstr long ptr) MSVCRT__wcsncoll_l @ cdecl _wcsnicmp(wstr wstr long) MSVCRT__wcsnicmp -@ stub _wcsnicmp_l +@ cdecl _wcsnicmp_l(wstr wstr long ptr) MSVCRT__wcsnicmp_l @ cdecl _wcsnicoll(wstr wstr long) MSVCRT__wcsnicoll @ cdecl _wcsnicoll_l(wstr wstr long ptr) MSVCRT__wcsnicoll_l @ cdecl _wcsnset(wstr long long) MSVCRT__wcsnset diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 51c2d40..f376db3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1113,7 +1113,7 @@ @ cdecl _wcsncoll(wstr wstr long) MSVCRT__wcsncoll @ cdecl _wcsncoll_l(wstr wstr long ptr) MSVCRT__wcsncoll_l @ cdecl _wcsnicmp(wstr wstr long) MSVCRT__wcsnicmp -# stub _wcsnicmp_l(wstr wstr long ptr) +@ cdecl _wcsnicmp_l(wstr wstr long ptr) MSVCRT__wcsnicmp_l @ cdecl _wcsnicoll(wstr wstr long) MSVCRT__wcsnicoll @ cdecl _wcsnicoll_l(wstr wstr long ptr) MSVCRT__wcsnicoll_l @ cdecl _wcsnset(wstr long long) MSVCRT__wcsnset diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index c2b8f58..4123d06 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -90,11 +90,19 @@ INT CDECL MSVCRT__wcsicmp( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str } /********************************************************************* + * _wcsnicmp_l (MSVCRT.@) + */ +INT CDECL MSVCRT__wcsnicmp_l(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, INT n, MSVCRT__locale_t locale) +{ + return strncmpiW(str1, str2, n); +} + +/********************************************************************* * _wcsnicmp (MSVCRT.@) */ INT CDECL MSVCRT__wcsnicmp(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, INT n) { - return strncmpiW(str1, str2, n); + return MSVCRT__wcsnicmp_l(str1, str2, n, NULL); } /*********************************************************************

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8Address GetComponentByName.
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Module: wine Branch: master Commit: a235e86316438a03a418de7cab975db4ada3d4d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a235e86316438a03a418de7ca… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 29 16:11:46 2014 +1000 dpnet: Implement IDirectPlay8Address GetComponentByName. --- dlls/dpnet/address.c | 53 ++++++++++++++++++++++++++++++++++++++++++---- dlls/dpnet/tests/address.c | 23 +++++++++++++++++--- 2 files changed, 69 insertions(+), 7 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 7df7ad6..2062bc4 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -316,9 +316,53 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetNumComponents(IDirectPlay8Addre static HRESULT WINAPI IDirectPlay8AddressImpl_GetComponentByName(IDirectPlay8Address *iface, const WCHAR *const pwszName, void *pvBuffer, DWORD *pdwBufferSize, DWORD *pdwDataType) { - IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); - TRACE("(%p): stub\n", This); - return DPN_OK; + IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); + struct component *entry; + + TRACE("(%p)->(%p %p %p %p)\n", This, pwszName, pvBuffer, pdwBufferSize, pdwDataType); + + if(!pwszName || !pdwBufferSize || !pdwDataType || (!pvBuffer && pdwBufferSize)) + return E_POINTER; + + LIST_FOR_EACH_ENTRY(entry, &This->components, struct component, entry) + { + if (lstrcmpW(pwszName, entry->name) == 0) + { + TRACE("Found %s\n", debugstr_w(pwszName)); + + if(*pdwBufferSize < entry->size) + { + *pdwBufferSize = entry->size; + return DPNERR_BUFFERTOOSMALL; + } + + *pdwBufferSize = entry->size; + *pdwDataType = entry->type; + + switch (entry->type) + { + case DPNA_DATATYPE_DWORD: + memcpy(pvBuffer, &entry->data.value, sizeof(DWORD)); + break; + case DPNA_DATATYPE_GUID: + memcpy(pvBuffer, &entry->data.guid, sizeof(GUID)); + break; + case DPNA_DATATYPE_STRING: + memcpy(pvBuffer, &entry->data.string, entry->size); + break; + case DPNA_DATATYPE_STRING_ANSI: + memcpy(pvBuffer, &entry->data.ansi, entry->size); + break; + case DPNA_DATATYPE_BINARY: + memcpy(pvBuffer, &entry->data.binary, entry->size); + break; + } + + return S_OK; + } + } + + return DPNERR_DOESNOTEXIST; } static HRESULT WINAPI IDirectPlay8AddressImpl_GetComponentByIndex(IDirectPlay8Address *iface, @@ -364,7 +408,6 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * list_add_tail(&This->components, &entry->entry); } - entry->size = dwDataSize; switch (dwDataType) { case DPNA_DATATYPE_DWORD: @@ -402,6 +445,8 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * break; } + entry->size = dwDataSize; + return DPN_OK; } diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index ad35954..5908000 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -102,11 +102,28 @@ static void address_addcomponents(void) hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_PORT, &port, sizeof(DWORD), DPNA_DATATYPE_DWORD); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDirectPlay8Address_GetComponentByName(localaddr, NULL, &compguid, &size, &type); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetComponentByName(localaddr, UNKNOWN, NULL, &size, &type); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetComponentByName(localaddr, UNKNOWN, &compguid, NULL, &type); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetComponentByName(localaddr, UNKNOWN, &compguid, &size, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + size = sizeof(GUID)-1; + hr = IDirectPlay8Address_GetComponentByName(localaddr, UNKNOWN, &compguid, &size, &type); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + ok(size == sizeof(GUID), "got %d\n", size); + size = sizeof(GUID); hr = IDirectPlay8Address_GetComponentByName(localaddr, UNKNOWN, &compguid, &size, &type); - todo_wine ok(IsEqualGUID(&compguid, &IID_Random), "incorrect guid\n"); - ok(size == sizeof(GUID), "incorrect size\n"); - todo_wine ok(type == DPNA_DATATYPE_GUID, "incorrect type\n"); + ok(IsEqualGUID(&compguid, &IID_Random), "incorrect guid\n"); + ok(size == sizeof(GUID), "incorrect size got %d\n", size); + ok(type == DPNA_DATATYPE_GUID, "incorrect type\n"); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDirectPlay8Address_GetNumComponents(localaddr, NULL);

1 0