September 2008 - Wine-commits

Henri Verbeet : d3d9: GetDepthStencilSurface returns D3DERR_NOTFOUND when no depth stencil is present .
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: c0d770de9eb88a7ff91e416dce1bd6d9db252f54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0d770de9eb88a7ff91e416dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 10 11:08:51 2008 +0200 d3d9: GetDepthStencilSurface returns D3DERR_NOTFOUND when no depth stencil is present. --- dlls/d3d9/device.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ddeaca3..b12e562 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -737,15 +737,12 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetDepthStencilSurface(LPDIRECT3DDE EnterCriticalSection(&d3d9_cs); hr = IWineD3DDevice_GetDepthStencilSurface(This->WineD3DDevice,&pZStencilSurface); - if(hr == D3D_OK) { - if(pZStencilSurface != NULL){ - IWineD3DSurface_GetParent(pZStencilSurface,(IUnknown**)ppZStencilSurface); - IWineD3DSurface_Release(pZStencilSurface); - } else { - *ppZStencilSurface = NULL; - } + if (hr == WINED3D_OK) { + IWineD3DSurface_GetParent(pZStencilSurface,(IUnknown**)ppZStencilSurface); + IWineD3DSurface_Release(pZStencilSurface); } else { - WARN("Call to IWineD3DDevice_GetDepthStencilSurface failed\n"); + if (hr != WINED3DERR_NOTFOUND) + WARN("Call to IWineD3DDevice_GetDepthStencilSurface failed with 0x%08x\n", hr); *ppZStencilSurface = NULL; } LeaveCriticalSection(&d3d9_cs);

1 0

Kai Blin : ws2_32: Fix the SO_REUSEADDR tests to work on Win2k3 and newer.
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: 6f8d1aa8c27d4cd644c5bd256ea30c022c27f93b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f8d1aa8c27d4cd644c5bd256… Author: Kai Blin <kai.blin(a)gmail.com> Date: Wed Sep 10 10:57:47 2008 +0200 ws2_32: Fix the SO_REUSEADDR tests to work on Win2k3 and newer. It seems that with Win2k3, the meaning of SO_REUSEADDR got closer to BSD semantics. This is nice, as it allows us to finally work like some version of Windows here. --- dlls/ws2_32/tests/sock.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 680c75a..0643d00 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1013,13 +1013,14 @@ static void test_so_reuseaddr(void) rc = setsockopt(s2, SOL_SOCKET, SO_REUSEADDR, (char*)&reuse, sizeof(reuse)); ok(rc==0, "setsockopt() failed error: %d\n", WSAGetLastError()); - todo_wine { + /* On Win2k3 and above, all SO_REUSEADDR seems to do is to allow binding to + * a port immediately after closing another socket on that port, so + * basically following the BSD socket semantics here. */ + closesocket(s1); rc = bind(s2, (struct sockaddr*)&saddr, sizeof(saddr)); ok(rc==0, "bind() failed error: %d\n", WSAGetLastError()); - } closesocket(s2); - closesocket(s1); } /************* Array containing the tests to run **********/

1 0

Kai Blin : dplayx: Fix static overrun of pDP array in test. (Coverity).
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: d266abee14d369b211f70cdadb82231c3864f956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d266abee14d369b211f70cdad… Author: Kai Blin <kai.blin(a)gmail.com> Date: Wed Sep 10 10:58:52 2008 +0200 dplayx: Fix static overrun of pDP array in test. (Coverity). --- dlls/dplayx/tests/dplayx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 0f6d979..d084c9b 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -4282,7 +4282,7 @@ static void test_EnumGroupsInGroup(void) /* - Open session */ callbackData.pDP = pDP[1]; hr = IDirectPlayX_EnumSessions( pDP[1], &dpsd[0], 0, EnumSessions_cb_join, - (LPVOID) pDP[2], 0 ); + (LPVOID) &callbackData, 0 ); checkHR( DP_OK, hr );

1 0

Jeff Zaroyko : dsound: Fix a few failing tests and a crash on 2008 (revised ).
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: 49d309804d3a0beebb178793a04f99f771d2bf53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49d309804d3a0beebb178793a… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Wed Sep 10 04:44:46 2008 +1000 dsound: Fix a few failing tests and a crash on 2008 (revised). --- dlls/dsound/tests/dsound.c | 25 +++++++++++++++++++++---- dlls/dsound/tests/dsound8.c | 27 +++++++++++++++++++++++---- 2 files changed, 44 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index d6c0f29..9dc8f21 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -716,8 +716,9 @@ static HRESULT test_secondary(LPGUID lpGuid) if (gotdx8 || wfx.wBitsPerSample <= 16) { if (wfx.wBitsPerSample > 16) - ok((rc == DSERR_CONTROLUNAVAIL || rc == DSERR_INVALIDCALL) && - !secondary, "IDirectSound_CreateSoundBuffer() " + ok(((rc == DSERR_CONTROLUNAVAIL || rc == DSERR_INVALIDCALL || rc == DSERR_INVALIDPARAM /* 2003 */) && !secondary) + || rc == DS_OK, /* driver dependent? */ + "IDirectSound_CreateSoundBuffer() " "should have returned (DSERR_CONTROLUNAVAIL or DSERR_INVALIDCALL) " "and NULL, returned: %08x %p\n", rc, secondary); else @@ -750,20 +751,27 @@ static HRESULT test_secondary(LPGUID lpGuid) wfxe.dwChannelMask = (wfx.nChannels == 1 ? KSAUDIO_SPEAKER_MONO : KSAUDIO_SPEAKER_STEREO); rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - ok(rc==DSERR_INVALIDPARAM && !secondary, + ok((rc==DSERR_INVALIDPARAM || rc==DSERR_INVALIDCALL /* 2003 */) && !secondary, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); if (secondary) + { IDirectSoundBuffer_Release(secondary); + secondary=NULL; + } wfxe.Format.cbSize = sizeof(wfxe) - sizeof(wfx) + 1; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - ok(rc==DSERR_CONTROLUNAVAIL && !secondary, + ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL) && !secondary) + || rc==DS_OK, /* 2003 / 2008 */ "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); if (secondary) + { IDirectSoundBuffer_Release(secondary); + secondary=NULL; + } wfxe.Format.cbSize = sizeof(wfxe) - sizeof(wfx); wfxe.SubFormat = GUID_NULL; @@ -772,7 +780,10 @@ static HRESULT test_secondary(LPGUID lpGuid) "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); if (secondary) + { IDirectSoundBuffer_Release(secondary); + secondary=NULL; + } wfxe.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; ++wfxe.Samples.wValidBitsPerSample; @@ -781,7 +792,10 @@ static HRESULT test_secondary(LPGUID lpGuid) "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); if (secondary) + { IDirectSoundBuffer_Release(secondary); + secondary=NULL; + } --wfxe.Samples.wValidBitsPerSample; wfxe.Samples.wValidBitsPerSample = 0; @@ -790,7 +804,10 @@ static HRESULT test_secondary(LPGUID lpGuid) "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); if (secondary) + { IDirectSoundBuffer_Release(secondary); + secondary=NULL; + } wfxe.Samples.wValidBitsPerSample = wfxe.Format.wBitsPerSample; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 8edb9b4..2e02a92 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -574,7 +574,9 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) formats[f][2]); wfx2=wfx; rc=IDirectSoundBuffer_SetFormat(primary,&wfx); - ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %08x\n", + ok(rc==DS_OK + || rc==DSERR_INVALIDPARAM, /* 2003 */ + "IDirectSoundBuffer_SetFormat(%s) failed: %08x\n", format_string(&wfx), rc); /* There is no guarantee that SetFormat will actually change the @@ -723,8 +725,9 @@ static HRESULT test_secondary8(LPGUID lpGuid) bufdesc.lpwfxFormat=&wfx; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); if (wfx.wBitsPerSample != 8 && wfx.wBitsPerSample != 16) - ok((rc == DSERR_CONTROLUNAVAIL || rc == DSERR_INVALIDCALL) && - !secondary, "IDirectSound_CreateSoundBuffer() " + ok(((rc == DSERR_CONTROLUNAVAIL || rc == DSERR_INVALIDCALL || rc == DSERR_INVALIDPARAM /* 2003 */) && !secondary) + || rc == DS_OK, /* driver dependent? */ + "IDirectSound_CreateSoundBuffer() " "should have returned (DSERR_CONTROLUNAVAIL or DSERR_INVALIDCALL) " "and NULL, returned: %08x %p\n", rc, secondary); else @@ -748,16 +751,23 @@ static HRESULT test_secondary8(LPGUID lpGuid) "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); if (secondary) + { IDirectSoundBuffer_Release(secondary); + secondary=NULL; + } wfxe.Format.cbSize = sizeof(wfxe) - sizeof(wfx) + 1; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - ok(rc==DSERR_CONTROLUNAVAIL && !secondary, + ok(((rc==DSERR_CONTROLUNAVAIL || DSERR_INVALIDCALL /* 2003 */) && !secondary) + || rc==DS_OK /* driver dependent? */, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); if (secondary) + { IDirectSoundBuffer_Release(secondary); + secondary=NULL; + } wfxe.Format.cbSize = sizeof(wfxe) - sizeof(wfx); wfxe.SubFormat = GUID_NULL; @@ -766,7 +776,10 @@ static HRESULT test_secondary8(LPGUID lpGuid) "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); if (secondary) + { IDirectSoundBuffer_Release(secondary); + secondary=NULL; + } wfxe.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; ++wfxe.Samples.wValidBitsPerSample; @@ -775,7 +788,10 @@ static HRESULT test_secondary8(LPGUID lpGuid) "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); if (secondary) + { IDirectSoundBuffer_Release(secondary); + secondary=NULL; + } --wfxe.Samples.wValidBitsPerSample; wfxe.Samples.wValidBitsPerSample = 0; @@ -784,7 +800,10 @@ static HRESULT test_secondary8(LPGUID lpGuid) "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); if (secondary) + { IDirectSoundBuffer_Release(secondary); + secondary=NULL; + } wfxe.Samples.wValidBitsPerSample = wfxe.Format.wBitsPerSample; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL);

1 0

Henri Verbeet : wined3d: Fix the half pixel offset.
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: 27b8f719ca7f26e1edbec6f7e46cc612dce12b41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b8f719ca7f26e1edbec6f7e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 10 11:08:10 2008 +0200 wined3d: Fix the half pixel offset. Turns out the original fix was correct for fixed function, but for the wrong reason. The shader path was already correct. This fixes a regresssion introduced by 932e95c111118b643650d6643e47be0ddb5528a1. --- dlls/wined3d/state.c | 32 ++++++++++++++++++++------------ 1 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 61ccab6..358ad14 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3905,16 +3905,6 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock divide by the Width/Height, so we need the half range(1.0) to translate by half a pixel. - Note that when rendering offscreen, we need to translate 1 pixel - (2/h in normalized device coordinates) down after doing the flip, - because of the way the viewport transformation works in OpenGL: - (-1,1) in normalized device coordinates corresponds to the upper - left corner of the upper left pixel in the viewport. (-1,-1) - corresponds to lower left corner of the lower left pixel in the - viewport. In other words, the upper left corner of the pixel - *below* the lower left pixel in the viewport. See also section - 2.11.1 "Controlling the Viewport" of the GL 2.1 spec. - The other fun is that d3d's output z range after the transformation is [0;1], but opengl's is [-1;1]. Since the z buffer is in range [0;1] for both, gl scales [-1;1] to [0;1]. This would mean that we end up in [0.5;1] and loose a lot @@ -3922,6 +3912,24 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock [0;1] to [-1;1], so when gl undoes that we utilize the full z range */ + /* + * Careful with the order of operations here, we're essentially working backwards: + * x = x + 1/w; + * y = (y - 1/h) * flip; + * z = z * 2 - 1; + * + * Becomes: + * glTranslatef(0.0, 0.0, -1.0); + * glScalef(1.0, 1.0, 2.0); + * + * glScalef(1.0, flip, 1.0); + * glTranslatef(1/w, -1/h, 0.0); + * + * This is equivalent to: + * glTranslatef(1/w, -flip/h, -1.0) + * glScalef(1.0, flip, 2.0); + */ + if (stateblock->wineD3DDevice->render_offscreen) { /* D3D texture coordinates are flipped compared to OpenGL ones, so * render everything upside down when rendering offscreen. */ @@ -4517,7 +4525,7 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, W */ if (useVertexShaderFunction) { device->posFixup[1] = device->render_offscreen ? -1.0 : 1.0; - device->posFixup[3] = -1.0 / stateblock->viewport.Height; + device->posFixup[3] = -device->posFixup[1] / stateblock->viewport.Height; } } @@ -4649,7 +4657,7 @@ static void viewport_miscpart(DWORD state, IWineD3DStateBlockImpl *stateblock, W static void viewport_vertexpart(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { stateblock->wineD3DDevice->posFixup[2] = 1.0 / stateblock->viewport.Width; - stateblock->wineD3DDevice->posFixup[3] = -1.0 / stateblock->viewport.Height; + stateblock->wineD3DDevice->posFixup[3] = -stateblock->wineD3DDevice->posFixup[1] / stateblock->viewport.Height; if(!isStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION))) { transform_projection(STATE_TRANSFORM(WINED3DTS_PROJECTION), stateblock, context); }

1 0

Henri Verbeet : wined3d: Correct a comment.
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: 4987ffff1f2951a238e67a2180d21f2c39a53243 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4987ffff1f2951a238e67a218… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 10 11:08:40 2008 +0200 wined3d: Correct a comment. --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e89dbf3..f8159fd 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3672,7 +3672,7 @@ static void shader_glsl_generate_vshader(IWineD3DVertexShader *iface, SHADER_BUF * * Basically we want (in homogeneous coordinates) z = z * 2 - 1. However, shaders are run * before the homogeneous divide, so we have to take the w into account: z = ((z / w) * 2 - 1) * w, - * which is the same as z = z / 2 - w. + * which is the same as z = z * 2 - w. */ shader_addline(buffer, "gl_Position.z = gl_Position.z * 2.0 - gl_Position.w;\n");

1 0

Alexander Nicolaysen Sørnes : regedit: Fix importing REG_MULTI_SZ values for ANSI files.
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: 484421560b8c0a114a323f5474f9e0ee33e69e0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=484421560b8c0a114a323f547… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Sep 9 21:48:33 2008 +0200 regedit: Fix importing REG_MULTI_SZ values for ANSI files. --- programs/regedit/regproc.c | 47 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 38 insertions(+), 9 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index e94c481..ff4918c 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -84,6 +84,26 @@ WCHAR* GetWideString(const char* strA) } /****************************************************************************** + * Allocates memory and convers input from multibyte to wide chars + * Returned string must be freed by the caller + */ +WCHAR* GetWideStringN(const char* strA, int chars, DWORD *len) +{ + if(strA) + { + WCHAR* strW = NULL; + *len = MultiByteToWideChar(CP_ACP, 0, strA, chars, NULL, 0); + + strW = HeapAlloc(GetProcessHeap(), 0, *len * sizeof(WCHAR)); + CHECK_ENOUGH_MEMORY(strW); + MultiByteToWideChar(CP_ACP, 0, strA, chars, strW, *len); + return strW; + } + *len = 0; + return NULL; +} + +/****************************************************************************** * Allocates memory and convers input from wide chars to multibyte * Returned string must be freed by the caller */ @@ -322,7 +342,7 @@ static HKEY currentKeyHandle = NULL; * val_name - name of the registry value * val_data - registry value data */ -static LONG setValue(WCHAR* val_name, WCHAR* val_data) +static LONG setValue(WCHAR* val_name, WCHAR* val_data, BOOL is_unicode) { LONG res; DWORD dwDataType, dwParseType; @@ -371,6 +391,14 @@ static LONG setValue(WCHAR* val_name, WCHAR* val_data) lpbData = convertHexCSVToHex(val_data, &dwLen); if (!lpbData) return ERROR_INVALID_DATA; + + if(dwDataType == REG_MULTI_SZ && !is_unicode) + { + LPBYTE tmp = lpbData; + lpbData = (LPBYTE)GetWideStringN((char*)lpbData, dwLen, &dwLen); + dwLen *= sizeof(WCHAR); + HeapFree(GetProcessHeap(), 0, tmp); + } } else /* unknown format */ { @@ -451,7 +479,7 @@ static void closeKey(void) * line - registry file unwrapped line. Should have the registry value name and * complete registry value data. */ -static void processSetValue(WCHAR* line) +static void processSetValue(WCHAR* line, BOOL is_unicode) { WCHAR* val_name; /* registry value name */ WCHAR* val_data; /* registry value data */ @@ -499,7 +527,7 @@ static void processSetValue(WCHAR* line) val_data = line + line_idx; REGPROC_unescape_string(val_name); - res = setValue(val_name, val_data); + res = setValue(val_name, val_data, is_unicode); if ( res != ERROR_SUCCESS ) { char* val_nameA = GetMultiByteString(val_name); @@ -517,8 +545,9 @@ static void processSetValue(WCHAR* line) /****************************************************************************** * This function receives the currently read entry and performs the * corresponding action. + * isUnicode affects parsing of REG_MULTI_SZ values */ -static void processRegEntry(WCHAR* stdInput) +static void processRegEntry(WCHAR* stdInput, BOOL isUnicode) { /* * We encountered the end of the file, make sure we @@ -553,7 +582,7 @@ static void processRegEntry(WCHAR* stdInput) (( stdInput[0] == '@') || /* reading a default @=data pair */ ( stdInput[0] == '\"'))) /* reading a new value=data pair */ { - processSetValue(stdInput); + processSetValue(stdInput, isUnicode); } else { /* Since we are assuming that the file format is valid we must be @@ -677,10 +706,10 @@ void processRegLinesA(FILE *in) break; /* That is the full virtual line */ } - processRegEntry(lineW); + processRegEntry(lineW, FALSE); HeapFree(GetProcessHeap(), 0, lineW); } - processRegEntry(NULL); + processRegEntry(NULL, FALSE); HeapFree(GetProcessHeap(), 0, line); } @@ -786,14 +815,14 @@ void processRegLinesW(FILE *in) if(!s_eol) break; - processRegEntry(s); + processRegEntry(s, TRUE); s = s_eol + 1; s_eol = 0; continue; /* That is the full virtual line */ } } - processRegEntry(NULL); + processRegEntry(NULL, TRUE); HeapFree(GetProcessHeap(), 0, buf); }

1 0

Jeff Zaroyko : ws2_32: ioctlsocket should try to check if argp is valid.
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: 15978ddc01c56c085499066b3b871bbdfaac595a URL: http://source.winehq.org/git/wine.git/?a=commit;h=15978ddc01c56c085499066b3… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Wed Sep 10 05:34:41 2008 +1000 ws2_32: ioctlsocket should try to check if argp is valid. --- dlls/ws2_32/socket.c | 6 ++++++ dlls/ws2_32/tests/sock.c | 27 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 69d678c..f95f8bd 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2345,6 +2345,12 @@ int WINAPI WS_ioctlsocket(SOCKET s, LONG cmd, WS_u_long *argp) long newcmd = cmd; TRACE("socket %04lx, cmd %08x, ptr %p\n", s, cmd, argp); + /* broken apps like defcon pass the argp value directly instead of a pointer to it */ + if(IS_INTRESOURCE(argp)) + { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } switch( cmd ) { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 4b8c57f..680c75a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3,6 +3,7 @@ * * Copyright 2002 Martin Wilck * Copyright 2005 Thomas Kho + * Copyright 2008 Jeff Zaroyko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1989,6 +1990,31 @@ static void test_inet_addr(void) ok(addr == INADDR_NONE, "inet_addr succeeded unexpectedly\n"); } +static void test_ioctlsocket(void) +{ + SOCKET sock; + int ret; + long cmds[] = {FIONBIO, FIONREAD, SIOCATMARK}; + int i; + + sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(sock != INVALID_SOCKET, "Creating the socket failed: %d\n", WSAGetLastError()); + if(sock == INVALID_SOCKET) + { + skip("Can't continue without a socket.\n"); + return; + } + + for(i = 0; i < sizeof(cmds)/sizeof(long); i++) + { + /* broken apps like defcon pass the argp value directly instead of a pointer to it */ + ret = ioctlsocket(sock, cmds[i], (u_long *)1); + ok(ret == SOCKET_ERROR, "ioctlsocket succeeded unexpectedly\n"); + ret = WSAGetLastError(); + ok(ret == WSAEFAULT, "expected WSAEFAULT, got %d instead\n", ret); + } +} + static DWORD WINAPI drain_socket_thread(LPVOID arg) { char buffer[1024]; @@ -2304,6 +2330,7 @@ START_TEST( sock ) test_accept(); test_getsockname(); test_inet_addr(); + test_ioctlsocket(); test_dns(); test_gethostbyname_hack();

1 0

Detlef Riekenberg : oleaut32: Dump parameter and SYSKIND for LHashValOfNameSysA.
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: c51be54c796c81ca8855d97740fcbebc99cca3e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c51be54c796c81ca8855d9774… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Sep 9 22:16:13 2008 +0200 oleaut32: Dump parameter and SYSKIND for LHashValOfNameSysA. --- dlls/oleaut32/hash.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/hash.c b/dlls/oleaut32/hash.c index 32c1086..12c9389 100644 --- a/dlls/oleaut32/hash.c +++ b/dlls/oleaut32/hash.c @@ -510,6 +510,9 @@ ULONG WINAPI LHashValOfNameSysA( SYSKIND skind, LCID lcid, LPCSTR lpStr) ULONG nHiWord, nLoWord = 0x0deadbee; const unsigned char *str = (const unsigned char *)lpStr, *pnLookup = NULL; + TRACE("(%d, %d, %s) %s\n", skind, lcid, debugstr_a(lpStr), + (skind == SYS_WIN16) ? "SYS_WIN16" : (skind == SYS_WIN32) ? "SYS_WIN32" : ""); + if (!str) return 0;

1 0

Detlef Riekenberg : shlwapi: Add a stub for SHSetDefaultDialogFont.
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: 3a2dfbd4e4ee30f00bf4dbe937edada14535f2b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a2dfbd4e4ee30f00bf4dbe93… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Sep 9 23:04:14 2008 +0200 shlwapi: Add a stub for SHSetDefaultDialogFont. --- dlls/shlwapi/ordinal.c | 19 +++++++++++++++++++ dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index b7be1f1..bd549a1 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -2261,6 +2261,25 @@ HRESULT WINAPI QISearch( } /************************************************************************* + * @ [SHLWAPI.220] + * + * Set the Font for a window and the "PropDlgFont" property of the parent window. + * + * PARAMS + * hWnd [I] Parent Window to set the property + * id [I] Index of child Window to set the Font + * + * RETURNS + * Success: S_OK + * + */ +HRESULT WINAPI SHSetDefaultDialogFont(HWND hWnd, INT id) +{ + FIXME("(%p, %d) stub\n", hWnd, id); + return S_OK; +} + +/************************************************************************* * @ [SHLWAPI.221] * * Remove the "PropDlgFont" property from a window. diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 0e63e9f..f86bd7c 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -217,7 +217,7 @@ 217 stdcall -noname SHUnicodeToAnsi(wstr ptr ptr) 218 stdcall -noname SHUnicodeToAnsiCP(long wstr ptr ptr) 219 stdcall -noname QISearch(long long long long) -220 stub -noname SHSetDefaultDialogFont +220 stdcall -noname SHSetDefaultDialogFont(ptr long) 221 stdcall -noname SHRemoveDefaultDialogFont(ptr) 222 stdcall -noname SHGlobalCounterCreate(long) 223 stdcall -noname SHGlobalCounterGetValue(long)

1 0