January 2014 - Wine-devel - list.winehq.org

Re: dpnet: Add stubbed interface IDirectPlay8Server
by Michael Stefaniuc 08 Jan '14

08 Jan '14

Hello Alistair, On 01/08/2014 06:26 AM, Alistair Leslie-Hughes wrote: > Changelog: > dpnet: Add stubbed interface IDirectPlay8Server > diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h > index 72012cd..5195d51 100644 > --- a/dlls/dpnet/dpnet_private.h > +++ b/dlls/dpnet/dpnet_private.h > @@ -37,6 +37,7 @@ typedef struct IDirectPlay8AddressImpl IDirectPlay8AddressImpl; > typedef struct IDirectPlay8LobbiedApplicationImpl IDirectPlay8LobbiedApplicationImpl; > typedef struct IDirectPlay8PeerImpl IDirectPlay8PeerImpl; > typedef struct IDirectPlay8ThreadPoolImpl IDirectPlay8ThreadPoolImpl; > +typedef struct IDirectPlay8ServerImpl IDirectPlay8ServerImpl; please add the struct directly to server.c as it is used only there. > +static ULONG WINAPI IDirectPlay8ServerImpl_AddRef(IDirectPlay8Server *iface) > +{ > + IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); > + ULONG refCount = InterlockedIncrement(&This->ref); > + > + TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); The standard to which Wine moves is to print the current refcount. See http://wiki.winehq.org/COMGuideline under "COM aggregation" for sample AddRef / Release functions. > +HRESULT DPNET_CreateDirectPlay8Server(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) IClassFactory* and IUnknown* are much nicer. > +{ > + IDirectPlay8ServerImpl *server; > + > + TRACE("(%p, %s, %p)\n", punkOuter, debugstr_guid(riid), ppobj); > + > + server = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlay8ServerImpl)); > + if (!server) > + { > + *ppobj = NULL; > + return E_OUTOFMEMORY; > + } > + server->IDirectPlay8Server_iface.lpVtbl = &DirectPlay8ServerVtbl; > + server->ref = 1; > + > + *ppobj = (LPVOID*)&server->IDirectPlay8Server_iface; This will fail to fail for an unsupported riid. I have added the correct way to the COMGuideline wiki page. thanks bye michael

1 0

Re: dssenh/tests: Added Cylink Mek algorithm definition and crypto provider algorithm tests for dssenh.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Marek Chmiel <kcmark(a)gmail.com> writes: > + while(GetLastError() != ERROR_NO_MORE_ITEMS) > + { > + SetLastError(0xdeadbeef); > + dataLen = sizeof(dataBuffer); > + > + result = CryptGetProvParam(hProv, PP_ENUMALGS_EX, dataBuffer, &dataLen, flag); > + ok(result || (!result && GetLastError() == ERROR_NO_MORE_ITEMS), > + "Failed to get parameter, got %x\n", GetLastError()); > + > + pointer = dataBuffer; > + algid = *(ALG_ID *)pointer; pointer += sizeof(ALG_ID); > + defaultLen = *(DWORD *)pointer; pointer += dwIncrement; It doesn't make sense to test last error before the first call, or to test the buffer contents on failure. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: shell32/tests: Add test for SHGetPathFromIDListA (try 3)
by Nikolay Sivov 08 Jan '14

08 Jan '14

On 1/8/2014 12:47, Zhenbo Li wrote: > try 3: > Add 'static' in my code > I forgot to call test_SHGetPathFromIDListA() in try2 > Check GetLastError() as well > try 2: > Move code to string.c to avoid creating a new file. > Avoid malloc() and free(). > > I'm working on Bug 33750, so I'll add test cases for > SHGetPathFromIDListA gradually. > --- > dlls/shell32/tests/string.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > +static void test_SHGetPathFromIDListA(void) > +{ > + BOOL ret; > + char pszPath[MAX_PATH]; > + > + ret = SHGetPathFromIDListA(NULL, pszPath); > + ok(!ret, "SHGetPathFromIDListA should fail.\n"); > + ok(GetLastError() == ERROR_PROC_NOT_FOUND, > + "Bad GetLastError = %d\n", GetLastError()); > +} > + You need to set last error to something like 0xdeadbeef, your test suggest that this call doesn't set it. I guess you're trying to test return value only, but it could be interesting to test what happens to path buffer too. P.S. please avoid psz* style prefixes in names.

1 0

Re: shell32/tests: Add test for SHGetPathFromIDListA (try 3)
by Marvin 08 Jan '14

08 Jan '14

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://newtestbot.winehq.org/JobDetails.pl?Key=4066 Your paranoid android. === wxppro (32 bit string) === string.c:107: Test failed: Bad GetLastError = 0 === wvista (32 bit string) === string.c:107: Test failed: Bad GetLastError = 0 === w2008s64 (32 bit string) === string.c:107: Test failed: Bad GetLastError = 0 === w7pro64 (32 bit string) === string.c:107: Test failed: Bad GetLastError = 1114 === w2008s64 (64 bit string) === string.c:107: Test failed: Bad GetLastError = 0 === w7pro64 (64 bit string) === string.c:107: Test failed: Bad GetLastError = 1114

1 0

Re: shell32/tests: Add test for SHGetPathFromIDListA
by Dmitry Timoshkov 08 Jan '14

08 Jan '14

Zhenbo Li <litimetal(a)gmail.com> wrote: > +void test_SHGetPathFromIDListA(void) > +{ > + BOOL ret; > + char pszPath[MAX_PATH]; > + > + ret = SHGetPathFromIDListA(NULL, pszPath); > + ok(!ret, "SHGetPathFromIDListA should fail.\n"); > +} 1. the test should be 'static'. 2. who is supposed to call this test? 3. it would be ineteresting to see whether the tested API should set an error code or somehow indicate a reason of the failure. -- Dmitry.

2 1

WineHQ Downtime
by Jeremy Newman 07 Jan '14

07 Jan '14

Starting tomorrow at 10:00 CST we will be performing updates and maintenance to the WineHQ server. The service window should be around 2 hours at most. Various services will experience outages during this time frame. This will affect www.winehq.org, appdb.winehq.org, bugs.winehq.org, forum.winehq.org, source.winehq.org, mailing lists, and GIT. wiki.winehq.org will not be affected.

3 4

Re: [PATCH 1/5] wined3d: Check parameters directly in wined3d_surface_update_desc.
by Henri Verbeet 07 Jan '14

07 Jan '14

On 7 January 2014 13:53, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > --- > dlls/wined3d/surface.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c > index 2fca299..9155c6b 100644 > --- a/dlls/wined3d/surface.c > +++ b/dlls/wined3d/surface.c > @@ -2810,15 +2810,17 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, > struct wined3d_device *device = surface->resource.device; > const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; > const struct wined3d_format *format = wined3d_get_format(gl_info, format_id); > - UINT resource_size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, 1); > BOOL create_dib = FALSE; > HRESULT hr; > > TRACE("surface %p, width %u, height %u, format %s, multisample_type %#x, multisample_quality %u.\n", > surface, width, height, debug_d3dformat(format_id), multisample_type, multisample_type); > > - if (!resource_size) > + if (!width || !height || !format) That's not quite equivalent. For example, a format like WINED3DFMT_NVDB has a zero format->byte_count.

2 1

Re: [2/4] gdi32: Fix text rotation problem in GM_ADVANCED graphics mode.
by Huw Davies 07 Jan '14

07 Jan '14

On Tue, Jan 07, 2014 at 02:33:32PM +0100, Ralf Habacker wrote: > @@ -1327,6 +1327,20 @@ BOOL WINAPI GetTextExtentExPointW( HDC hdc, LPCWSTR str, INT count, INT max_ext, > } > } > > + XFORM old; > + BOOL exclude_rotation = FALSE; > + if ( GetGraphicsMode( hdc ) == GM_ADVANCED ) > + { > + GetWorldTransform( hdc, &old ); > + XFORM xf = old; > + if ( hasRotatedAndSameScaledMatrixOnly( &xf ) ) > + { > + exclude_rotation = TRUE; > + removeRotationFromMatrix( &xf, NULL ); > + SetWorldTransform( hdc, &xf ); > + } > + } Does Windows really do this only in the same-scaled, non-sheared case? Huw.

1 0

Re: [2/4] gdi32: Fix text rotation problem in GM_ADVANCED graphics mode.
by Nikolay Sivov 07 Jan '14

07 Jan '14

On 1/7/2014 17:33, Ralf Habacker wrote: > This patch detects operational condition first and then removes > temporary rotation from the world transform. > Bug: http://bugs.winehq.org/show_bug.cgi?id=33190 > --- > dlls/gdi32/font.c | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) > > + XFORM old; > + BOOL exclude_rotation = FALSE; > + if ( GetGraphicsMode( hdc ) == GM_ADVANCED ) > + { > + GetWorldTransform( hdc, &old ); > + XFORM xf = old; > + if ( hasRotatedAndSameScaledMatrixOnly( &xf ) ) > + { > + exclude_rotation = TRUE; > + removeRotationFromMatrix( &xf, NULL ); > + SetWorldTransform( hdc, &xf ); > + } > + } > + Flag really means do we need to restore transform or not. > + if ( GetGraphicsMode( hdc ) == GM_ADVANCED && exclude_rotation == TRUE ) > + { > + SetWorldTransform( hdc, &old ); > + } > + Doesn't look like you need to check a mode again.

1 0

Re: [1/4] gid32: Add matrix helper functions.
by Nikolay Sivov 07 Jan '14

07 Jan '14

On 1/7/2014 17:31, Ralf Habacker wrote: > Contains basic functions required by further patches > --- > dlls/gdi32/dibdrv/graphics.c | 49 > ++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 49 insertions(+) > That should be merged with a first patch that uses it. > +/* > + check matrix for condition > +*/ > +BOOL hasRotatedAndSameScaledMatrixOnly(XFORM *xform) > +{ > + return xform->eM11 == xform->eM22 && > + -xform->eM21 == xform->eM12; > +} > + Comment is telling nothing, 'xform' should be const probably. > + double determinant = 0; > + > + /* xform = xfrom-transposed * xform */ > + xform->eM11 = sqrt( xform->eM11 * xform->eM11 + xform->eM21 * xform->eM21 ); > + xform->eM22 = sqrt( xform->eM12 * xform->eM12 + xform->eM22 * xform->eM22 ); > + xform->eM12 = 0; > + xform->eM21 = 0; > + xform->eDx = 0; > + xform->eDy = 0; > + > + if ( rotation_and_translation == NULL ) > + return TRUE; > + > + determinant = xform->eM11 * xform->eM22; > + > + inverse_matrix_scale.eM11 = xform->eM22 / determinant; Is it possible to get 0 determinant here? Function never returns FALSE, so return value is useless. Also please follow function and variable naming conventions used in this file.

1 0