wine-commits April 2009

wine-commits@winehq.org

2 participants
664 discussions

Stefan Dösinger : d3d: Limit d3d8 and d3d9 vshader constants to 256.
by Alexandre Julliard 27 Apr '09

27 Apr '09

Module: wine Branch: master Commit: 9f1731edb6b20be5bbad527148c9a8f588e28b33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f1731edb6b20be5bbad52714… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Apr 25 15:02:42 2009 +0200 d3d: Limit d3d8 and d3d9 vshader constants to 256. DX10 cards support 512(ATI) or 1024(Nvidia) vertex shader constants in GL. The dx9 DXCapsViewer shows that dx10 windows drivers only claim 256 constants on Windows, so we can and should do the same. --- dlls/d3d8/d3d8_private.h | 2 ++ dlls/d3d8/device.c | 13 +++++++++++++ dlls/d3d8/directx.c | 1 + dlls/d3d9/d3d9_private.h | 2 ++ dlls/d3d9/directx.c | 2 ++ dlls/d3d9/vertexshader.c | 12 ++++++++++++ dlls/wined3d/vertexshader.c | 17 +++++++++++++---- 7 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index c9afe17..c38d8cc 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -601,6 +601,8 @@ struct IDirect3DVertexShader8Impl { IWineD3DVertexShader *wineD3DVertexShader; }; +#define D3D8_MAX_VERTEX_SHADER_CONSTANTF 256 + /* ------------------------ */ /* IDirect3DPixelShaderImpl */ diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index a33bdbc..f5ab8b3 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -359,6 +359,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetDeviceCaps(LPDIRECT3DDEVICE8 iface if(pCaps->VertexShaderVersion > D3DVS_VERSION(1,1)){ pCaps->VertexShaderVersion = D3DVS_VERSION(1,1); } + pCaps->MaxVertexShaderConst = min(D3D8_MAX_VERTEX_SHADER_CONSTANTF, pCaps->MaxVertexShaderConst); TRACE("Returning %p %p\n", This, pCaps); return hrc; @@ -1998,6 +1999,12 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetVertexShaderConstant(LPDIRECT3DDEV HRESULT hr; TRACE("(%p) : Relay\n", This); + if(Register + ConstantCount > D3D8_MAX_VERTEX_SHADER_CONSTANTF) { + WARN("Trying to access %u constants, but d3d8 only supports %u\n", + Register + ConstantCount, D3D8_MAX_VERTEX_SHADER_CONSTANTF); + return D3DERR_INVALIDCALL; + } + EnterCriticalSection(&d3d8_cs); hr = IWineD3DDevice_SetVertexShaderConstantF(This->WineD3DDevice, Register, pConstantData, ConstantCount); LeaveCriticalSection(&d3d8_cs); @@ -2009,6 +2016,12 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderConstant(LPDIRECT3DDEV HRESULT hr; TRACE("(%p) : Relay\n", This); + if(Register + ConstantCount > D3D8_MAX_VERTEX_SHADER_CONSTANTF) { + WARN("Trying to access %u constants, but d3d8 only supports %u\n", + Register + ConstantCount, D3D8_MAX_VERTEX_SHADER_CONSTANTF); + return D3DERR_INVALIDCALL; + } + EnterCriticalSection(&d3d8_cs); hr = IWineD3DDevice_GetVertexShaderConstantF(This->WineD3DDevice, Register, pConstantData, ConstantCount); LeaveCriticalSection(&d3d8_cs); diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 64fc360..d39d3d6 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -265,6 +265,7 @@ static HRESULT WINAPI IDirect3D8Impl_GetDeviceCaps(LPDIRECT3D8 iface, UINT Ada if(pCaps->VertexShaderVersion > D3DVS_VERSION(1,1)){ pCaps->VertexShaderVersion = D3DVS_VERSION(1,1); } + pCaps->MaxVertexShaderConst = min(D3D8_MAX_VERTEX_SHADER_CONSTANTF, pCaps->MaxVertexShaderConst); TRACE("(%p) returning %p\n", This, pCaps); return hrc; diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 25b6ae2..7e43974 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -497,6 +497,8 @@ typedef struct IDirect3DVertexShader9Impl { LPDIRECT3DDEVICE9EX parentDevice; } IDirect3DVertexShader9Impl; +#define D3D9_MAX_VERTEX_SHADER_CONSTANTF 256 + /* --------------------- */ /* IDirect3DPixelShader9 */ /* --------------------- */ diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 229368a..e9547a7 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -311,6 +311,8 @@ void filter_caps(D3DCAPS9* pCaps) D3DPTEXTURECAPS_PROJECTED | D3DPTEXTURECAPS_CUBEMAP | D3DPTEXTURECAPS_VOLUMEMAP | D3DPTEXTURECAPS_MIPMAP | D3DPTEXTURECAPS_MIPVOLUMEMAP | D3DPTEXTURECAPS_MIPCUBEMAP | D3DPTEXTURECAPS_CUBEMAP_POW2 | D3DPTEXTURECAPS_VOLUMEMAP_POW2| D3DPTEXTURECAPS_NOPROJECTEDBUMPENV; + + pCaps->MaxVertexShaderConst = min(D3D9_MAX_VERTEX_SHADER_CONSTANTF, pCaps->MaxVertexShaderConst); } static HRESULT WINAPI IDirect3D9Impl_GetDeviceCaps(LPDIRECT3D9EX iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DCAPS9* pCaps) { diff --git a/dlls/d3d9/vertexshader.c b/dlls/d3d9/vertexshader.c index 6478b68..fd2837d 100644 --- a/dlls/d3d9/vertexshader.c +++ b/dlls/d3d9/vertexshader.c @@ -192,6 +192,12 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShaderConstantF(LPDIRECT3DDEVICE9EX HRESULT hr; TRACE("(%p) : Relay\n", This); + if(Register + Vector4fCount > D3D9_MAX_VERTEX_SHADER_CONSTANTF) { + WARN("Trying to access %u constants, but d3d9 only supports %u\n", + Register + Vector4fCount, D3D9_MAX_VERTEX_SHADER_CONSTANTF); + return D3DERR_INVALIDCALL; + } + EnterCriticalSection(&d3d9_cs); hr = IWineD3DDevice_SetVertexShaderConstantF(This->WineD3DDevice, Register, pConstantData, Vector4fCount); LeaveCriticalSection(&d3d9_cs); @@ -202,6 +208,12 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShaderConstantF(LPDIRECT3DDEVICE9EX IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; + if(Register + Vector4fCount > D3D9_MAX_VERTEX_SHADER_CONSTANTF) { + WARN("Trying to access %u constants, but d3d9 only supports %u\n", + Register + Vector4fCount, D3D9_MAX_VERTEX_SHADER_CONSTANTF); + return D3DERR_INVALIDCALL; + } + TRACE("(%p) : Relay\n", This); EnterCriticalSection(&d3d9_cs); hr = IWineD3DDevice_GetVertexShaderConstantF(This->WineD3DDevice, Register, pConstantData, Vector4fCount); diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index fab0dca..7f1dd92 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -115,9 +115,6 @@ static void vshader_set_limits( This->baseShader.limits.attributes = 16; This->baseShader.limits.packed_input = 0; - /* Must match D3DCAPS9.MaxVertexShaderConst: at least 256 for vs_2_0 */ - This->baseShader.limits.constant_float = GL_LIMITS(vshader_constantsF); - switch (This->baseShader.reg_maps.shader_version) { case WINED3DVS_VERSION(1,0): @@ -129,8 +126,12 @@ static void vshader_set_limits( This->baseShader.limits.packed_output = 0; This->baseShader.limits.sampler = 0; This->baseShader.limits.label = 0; + /* TODO: vs_1_1 has a minimum of 96 constants. What happens if a vs_1_1 shader is used + * on a vs_3_0 capable card that has 256 constants? + */ + This->baseShader.limits.constant_float = min(256, GL_LIMITS(vshader_constantsF)); break; - + case WINED3DVS_VERSION(2,0): case WINED3DVS_VERSION(2,1): This->baseShader.limits.temporary = 12; @@ -140,6 +141,7 @@ static void vshader_set_limits( This->baseShader.limits.packed_output = 0; This->baseShader.limits.sampler = 0; This->baseShader.limits.label = 16; + This->baseShader.limits.constant_float = min(256, GL_LIMITS(vshader_constantsF)); break; case WINED3DVS_VERSION(3,0): @@ -150,6 +152,12 @@ static void vshader_set_limits( This->baseShader.limits.packed_output = 12; This->baseShader.limits.sampler = 4; This->baseShader.limits.label = 16; /* FIXME: 2048 */ + /* DX10 cards on Windows advertise a d3d9 constant limit of 256 even though they are capable + * of supporting much more(GL drivers advertise 1024). d3d9.dll and d3d8.dll clamp the + * wined3d-advertised maximum. Clamp the constant limit for <= 3.0 shaders to 256.s + * use constant buffers + */ + This->baseShader.limits.constant_float = min(256, GL_LIMITS(vshader_constantsF)); break; default: This->baseShader.limits.temporary = 12; @@ -159,6 +167,7 @@ static void vshader_set_limits( This->baseShader.limits.packed_output = 0; This->baseShader.limits.sampler = 0; This->baseShader.limits.label = 16; + This->baseShader.limits.constant_float = min(256, GL_LIMITS(vshader_constantsF)); FIXME("Unrecognized vertex shader version %#x\n", This->baseShader.reg_maps.shader_version); }

1 0

Jeff Latimer : include: Define IN6ADDR_ANY_INIT and IN6ADDR_LOOPBACK_INIT and code for IN6_IS_ADDR_LOOPBACK .
by Alexandre Julliard 27 Apr '09

27 Apr '09

Module: wine Branch: master Commit: 7ded3afe93f7af048cca3b5103e06668ad69dee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ded3afe93f7af048cca3b510… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Sat Apr 25 22:59:30 2009 +1000 include: Define IN6ADDR_ANY_INIT and IN6ADDR_LOOPBACK_INIT and code for IN6_IS_ADDR_LOOPBACK. --- include/ws2ipdef.h | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index ff2b201..bc30f96 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -247,9 +247,25 @@ struct WS(ip_msfilter) { #ifndef USE_WS_PREFIX #define INET_ADDRSTRLEN 22 #define INET6_ADDRSTRLEN 65 +#define IN6ADDR_ANY_INIT { 0 } +#define IN6ADDR_LOOPBACK_INIT { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } #else #define WS_INET_ADDRSTRLEN 22 #define WS_INET6_ADDRSTRLEN 65 +#define WS_IN6ADDR_ANY_INIT { 0 } +#define WS_IN6ADDR_LOOPBACK_INIT { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } #endif /* USE_WS_PREFIX */ +static inline BOOL WS(IN6_IS_ADDR_LOOPBACK) ( const IN6_ADDR *a ) +{ + return (BOOL)((a->s6_words[0] == 0) && + (a->s6_words[1] == 0) && + (a->s6_words[2] == 0) && + (a->s6_words[3] == 0) && + (a->s6_words[4] == 0) && + (a->s6_words[5] == 0) && + (a->s6_words[6] == 0) && + (a->s6_words[7] == 0x0100)); +} + #endif /* __WS2IPDEF__ */

1 0

David Adam : d3d9: Fix a copy/paste error in test.
by Alexandre Julliard 27 Apr '09

27 Apr '09

Module: wine Branch: master Commit: 758777d1e2ca751409e7c260b6000204399c8e67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=758777d1e2ca751409e7c260b… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sat Apr 25 09:26:44 2009 +0200 d3d9: Fix a copy/paste error in test. --- dlls/d3d9/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 2e0f992..0663a91 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -9603,7 +9603,7 @@ static void yuv_color_test(IDirect3DDevice9 *device) { color = getPixelColor(device, 600, 240); ok(color_match(color, ref_color_right, 16), "Input 0x%08x: Got color 0x%08x for pixel 2/1, expected 0x%08x, format %s\n", - test_data[i].in, color, ref_color_left, fmt_string); + test_data[i].in, color, ref_color_right, fmt_string); } IDirect3DSurface9_Release(surface); }

1 0

Austin English : notepad: Fix date format to match windows.
by Alexandre Julliard 27 Apr '09

27 Apr '09

Module: wine Branch: master Commit: 2a98ea48cd18c5c80dcaa27d336d6367be3ff720 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a98ea48cd18c5c80dcaa27d3… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Apr 24 16:46:47 2009 -0500 notepad: Fix date format to match windows. --- programs/notepad/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index 0595f69..d97e102 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -659,7 +659,7 @@ VOID DIALOG_EditTimeDate(VOID) SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)spaceW); - GetDateFormat(LOCALE_USER_DEFAULT, DATE_LONGDATE, &st, NULL, szDate, MAX_STRING_LEN); + GetDateFormat(LOCALE_USER_DEFAULT, 0, &st, NULL, szDate, MAX_STRING_LEN); SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)szDate); }

1 0

Vincent Povirk : gdiplus: Don' t leak a device context when GdipCreateFromHWND fails.
by Alexandre Julliard 27 Apr '09

27 Apr '09

Module: wine Branch: master Commit: c3d239566929879749a947f377e730d0fd0b859a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3d239566929879749a947f37… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 24 13:34:55 2009 -0500 gdiplus: Don't leak a device context when GdipCreateFromHWND fails. --- dlls/gdiplus/graphics.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index af3968c..36cb324 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -941,11 +941,17 @@ GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **gra GpStatus WINGDIPAPI GdipCreateFromHWND(HWND hwnd, GpGraphics **graphics) { GpStatus ret; + HDC hdc; TRACE("(%p, %p)\n", hwnd, graphics); - if((ret = GdipCreateFromHDC(GetDC(hwnd), graphics)) != Ok) + hdc = GetDC(hwnd); + + if((ret = GdipCreateFromHDC(hdc, graphics)) != Ok) + { + ReleaseDC(hwnd, hdc); return ret; + } (*graphics)->hwnd = hwnd; (*graphics)->owndc = TRUE;

1 0

Vincent Povirk : gdiplus: Only release device contexts created internally.
by Alexandre Julliard 27 Apr '09

27 Apr '09

Module: wine Branch: master Commit: 8a3d9ff773c85a724fab2ede41921b0afacd194f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a3d9ff773c85a724fab2ede4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 24 13:29:56 2009 -0500 gdiplus: Only release device contexts created internally. --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index dbeebe3..a8c49d3 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -91,6 +91,7 @@ struct GpPen{ struct GpGraphics{ HDC hdc; HWND hwnd; + BOOL owndc; SmoothingMode smoothing; CompositingQuality compqual; InterpolationMode interpolation; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 2a98ee5..af3968c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -924,6 +924,7 @@ GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **gra (*graphics)->hdc = hdc; (*graphics)->hwnd = WindowFromDC(hdc); + (*graphics)->owndc = FALSE; (*graphics)->smoothing = SmoothingModeDefault; (*graphics)->compqual = CompositingQualityDefault; (*graphics)->interpolation = InterpolationModeDefault; @@ -947,6 +948,7 @@ GpStatus WINGDIPAPI GdipCreateFromHWND(HWND hwnd, GpGraphics **graphics) return ret; (*graphics)->hwnd = hwnd; + (*graphics)->owndc = TRUE; return Ok; } @@ -1081,7 +1083,7 @@ GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) if(!graphics) return InvalidParameter; if(graphics->busy) return ObjectBusy; - if(graphics->hwnd) + if(graphics->owndc) ReleaseDC(graphics->hwnd, graphics->hdc); GdipDeleteRegion(graphics->clip);

1 0

Hans Leidekker : ws2_32: Implement GetAddrInfoW and FreeAddrInfoW.
by Alexandre Julliard 27 Apr '09

27 Apr '09

Module: wine Branch: master Commit: fea6d0a76413c7285297d6bbeeba81c5481d0147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fea6d0a76413c7285297d6bbe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 24 16:01:56 2009 +0200 ws2_32: Implement GetAddrInfoW and FreeAddrInfoW. --- dlls/ws2_32/socket.c | 140 +++++++++++++++++++++++++++++++++++++++++++++- dlls/ws2_32/tests/sock.c | 27 +++++++++ dlls/ws2_32/ws2_32.spec | 1 + 3 files changed, 166 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9324833..42bab60 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3583,13 +3583,149 @@ outofmem: #endif } +static struct WS_addrinfoW *addrinfo_AtoW(const struct WS_addrinfo *ai) +{ + struct WS_addrinfoW *ret; + + if (!(ret = HeapAlloc(GetProcessHeap(), 0, sizeof(struct WS_addrinfoW)))) return NULL; + ret->ai_flags = ai->ai_flags; + ret->ai_family = ai->ai_family; + ret->ai_socktype = ai->ai_socktype; + ret->ai_protocol = ai->ai_protocol; + ret->ai_addrlen = ai->ai_addrlen; + ret->ai_canonname = NULL; + ret->ai_addr = NULL; + ret->ai_next = NULL; + if (ai->ai_canonname) + { + int len = MultiByteToWideChar(CP_ACP, 0, ai->ai_canonname, -1, NULL, 0); + if (!(ret->ai_canonname = HeapAlloc(GetProcessHeap(), 0, len))) + { + HeapFree(GetProcessHeap(), 0, ret); + return NULL; + } + MultiByteToWideChar(CP_ACP, 0, ai->ai_canonname, -1, ret->ai_canonname, len); + } + if (ai->ai_addr) + { + if (!(ret->ai_addr = HeapAlloc(GetProcessHeap(), 0, sizeof(struct WS_sockaddr)))) + { + HeapFree(GetProcessHeap(), 0, ret->ai_canonname); + HeapFree(GetProcessHeap(), 0, ret); + return NULL; + } + memcpy(ret->ai_addr, ai->ai_addr, sizeof(struct WS_sockaddr)); + } + return ret; +} + +static struct WS_addrinfoW *addrinfo_list_AtoW(const struct WS_addrinfo *info) +{ + struct WS_addrinfoW *ret, *infoW; + + if (!(ret = infoW = addrinfo_AtoW(info))) return NULL; + while (info->ai_next) + { + if (!(infoW->ai_next = addrinfo_AtoW(info->ai_next))) + { + FreeAddrInfoW(ret); + return NULL; + } + infoW = infoW->ai_next; + info = info->ai_next; + } + return ret; +} + +static struct WS_addrinfo *addrinfo_WtoA(const struct WS_addrinfoW *ai) +{ + struct WS_addrinfo *ret; + + if (!(ret = HeapAlloc(GetProcessHeap(), 0, sizeof(struct WS_addrinfo)))) return NULL; + ret->ai_flags = ai->ai_flags; + ret->ai_family = ai->ai_family; + ret->ai_socktype = ai->ai_socktype; + ret->ai_protocol = ai->ai_protocol; + ret->ai_addrlen = ai->ai_addrlen; + ret->ai_canonname = NULL; + ret->ai_addr = NULL; + ret->ai_next = NULL; + if (ai->ai_canonname) + { + int len = WideCharToMultiByte(CP_ACP, 0, ai->ai_canonname, -1, NULL, 0, NULL, NULL); + if (!(ret->ai_canonname = HeapAlloc(GetProcessHeap(), 0, len))) + { + HeapFree(GetProcessHeap(), 0, ret); + return NULL; + } + WideCharToMultiByte(CP_ACP, 0, ai->ai_canonname, -1, ret->ai_canonname, len, NULL, NULL); + } + if (ai->ai_addr) + { + if (!(ret->ai_addr = HeapAlloc(GetProcessHeap(), 0, sizeof(struct WS_sockaddr)))) + { + HeapFree(GetProcessHeap(), 0, ret->ai_canonname); + HeapFree(GetProcessHeap(), 0, ret); + return NULL; + } + memcpy(ret->ai_addr, ai->ai_addr, sizeof(struct WS_sockaddr)); + } + return ret; +} + /*********************************************************************** * GetAddrInfoW (WS2_32.@) */ int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hints, PADDRINFOW *res) { - FIXME("empty stub!\n"); - return EAI_FAIL; + int ret, len; + char *nodenameA, *servnameA = NULL; + struct WS_addrinfo *resA, *hintsA = NULL; + + len = WideCharToMultiByte(CP_ACP, 0, nodename, -1, NULL, 0, NULL, NULL); + if (!(nodenameA = HeapAlloc(GetProcessHeap(), 0, len))) return EAI_MEMORY; + WideCharToMultiByte(CP_ACP, 0, nodename, -1, nodenameA, len, NULL, NULL); + + if (servname) + { + len = WideCharToMultiByte(CP_ACP, 0, servname, -1, NULL, 0, NULL, NULL); + if (!(servnameA = HeapAlloc(GetProcessHeap(), 0, len))) + { + HeapFree(GetProcessHeap(), 0, nodenameA); + return EAI_MEMORY; + } + WideCharToMultiByte(CP_ACP, 0, servname, -1, servnameA, len, NULL, NULL); + } + + if (hints) hintsA = addrinfo_WtoA(hints); + ret = WS_getaddrinfo(nodenameA, servnameA, hintsA, &resA); + WS_freeaddrinfo(hintsA); + + if (!ret) + { + *res = addrinfo_list_AtoW(resA); + WS_freeaddrinfo(resA); + } + + HeapFree(GetProcessHeap(), 0, nodenameA); + HeapFree(GetProcessHeap(), 0, servnameA); + return ret; +} + +/*********************************************************************** + * FreeAddrInfoW (WS2_32.@) + */ +void WINAPI FreeAddrInfoW(PADDRINFOW ai) +{ + while (ai) + { + ADDRINFOW *next; + HeapFree(GetProcessHeap(), 0, ai->ai_canonname); + HeapFree(GetProcessHeap(), 0, ai->ai_addr); + next = ai->ai_next; + HeapFree(GetProcessHeap(), 0, ai); + ai = next; + } } int WINAPI WS_getnameinfo(const SOCKADDR *sa, WS_socklen_t salen, PCHAR host, diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 23aa59c..dbd43d8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2310,6 +2310,32 @@ static void test_WSASendTo(void) "a successful call to WSASendTo()\n"); } +static void test_GetAddrInfoW(void) +{ + static const WCHAR port[] = {'8','0',0}; + static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; + + int ret; + ADDRINFOW *result, hint; + + memset(&hint, 0, sizeof(ADDRINFOW)); + + ret = GetAddrInfoW(NULL, NULL, NULL, &result); + ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + + ret = GetAddrInfoW(localhost, NULL, NULL, &result); + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + FreeAddrInfoW(result); + + ret = GetAddrInfoW(localhost, port, NULL, &result); + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + FreeAddrInfoW(result); + + ret = GetAddrInfoW(localhost, port, &hint, &result); + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + FreeAddrInfoW(result); +} + /**************** Main program ***************/ START_TEST( sock ) @@ -2353,6 +2379,7 @@ START_TEST( sock ) test_WSASendTo(); test_ipv6only(); + test_GetAddrInfoW(); Exit(); } diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index 74e71be..a77c215 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -50,6 +50,7 @@ 500 stub WEP +@ stdcall FreeAddrInfoW(ptr) @ stdcall GetAddrInfoW(wstr wstr ptr ptr) @ stdcall WSApSetPostRoutine(ptr) @ stdcall WPUCompleteOverlappedRequest(long ptr long long ptr)

1 0

Dan Kegel : ntdll: Add missing RtlReAllocateHeap Valgrind hook, add tests.
by Alexandre Julliard 27 Apr '09

27 Apr '09

Module: wine Branch: master Commit: 3e6d0789d0bc2070850156836f0ef13d80b15c8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e6d0789d0bc2070850156836… Author: Dan Kegel <dank(a)kegel.com> Date: Thu Apr 23 06:47:20 2009 -0700 ntdll: Add missing RtlReAllocateHeap Valgrind hook, add tests. --- dlls/kernel32/tests/heap.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/ntdll/heap.c | 4 ++++ 2 files changed, 41 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 39efde9..a674e07 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -34,7 +34,30 @@ static SIZE_T resize_9x(SIZE_T size) return max(dwSizeAligned, 12); /* at least 12 bytes */ } -START_TEST(heap) +static void test_sized_HeapAlloc(int nbytes) +{ + int success; + char *buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nbytes); + ok(buf != NULL, "allocate failed"); + ok(buf[0] == 0, "buffer not zeroed"); + success = HeapFree(GetProcessHeap(), 0, buf); + ok(success, "free failed"); +} + +static void test_sized_HeapReAlloc(int nbytes1, int nbytes2) +{ + int success; + char *buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nbytes1); + ok(buf != NULL, "allocate failed"); + ok(buf[0] == 0, "buffer not zeroed"); + buf = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buf, nbytes2); + ok(buf != NULL, "reallocate failed"); + ok(buf[nbytes2-1] == 0, "buffer not zeroed"); + success = HeapFree(GetProcessHeap(), 0, buf); + ok(success, "free failed"); +} + +static void test_heap(void) { LPVOID mem; LPVOID msecond; @@ -338,3 +361,16 @@ START_TEST(heap) GlobalFree(gbl); } + +START_TEST(heap) +{ + test_heap(); + + /* Test both short and very long blocks */ + test_sized_HeapAlloc(1); + test_sized_HeapAlloc(1 << 20); + test_sized_HeapReAlloc(1, 100); + test_sized_HeapReAlloc(1, (1 << 20)); + test_sized_HeapReAlloc((1 << 20), (2 << 20)); + test_sized_HeapReAlloc((1 << 20), 1); +} diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 255a688..4abd35e 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1535,6 +1535,8 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size { if (!find_large_block( heapPtr, ptr )) goto error; if (!(ret = realloc_large_block( heapPtr, flags, ptr, size ))) goto oom; + notify_free( ptr ); + notify_alloc( ret, size, flags & HEAP_ZERO_MEMORY ); goto done; } if ((char *)pArena < (char *)subheap->base + subheap->headerSize) goto error; @@ -1551,7 +1553,9 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size if (rounded_size >= HEAP_MIN_LARGE_BLOCK_SIZE && (flags & HEAP_GROWABLE)) { if (!(ret = allocate_large_block( heapPtr, flags, size ))) goto oom; + notify_alloc( ret, size, flags & HEAP_ZERO_MEMORY ); memcpy( ret, pArena + 1, oldActualSize ); + /* FIXME: free old memory here! */ goto done; } if ((pNext < (char *)subheap->base + subheap->size) &&

1 0

Alexandre Julliard : Wine release 1.1.20
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: website Branch: master Commit: 66285ac02e5cff471b1aa22061c39134fbeec6a4 URL: http://source.winehq.org/git/website.git/?a=commit;h=66285ac02e5cff471b1aa2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 24 18:58:25 2009 +0200 Wine release 1.1.20 --- news/en/2009042401.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2009042401.xml b/news/en/2009042401.xml new file mode 100644 index 0000000..01d6d51 --- /dev/null +++ b/news/en/2009042401.xml @@ -0,0 +1,16 @@ +<news> +<date>April 24, 2009</date> +<title>Wine 1.1.20 Released</title> +<body> + The Wine development release 1.1.20 is now available. + <a href="{$root}/announce/1.1.20">What's new</a> in this release: +<ul> + <li>Show a dialog on application crashes.</li> + <li>Much improved OLE copy/paste support.</li> + <li>Various listview improvements.</li> + <li>More Direct3D code cleanups.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.20.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.1.20 : Alexandre Julliard : Release 1.1.20
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: refs/tags/wine-1.1.20 Tag: 65ff4a8dbd713b5bae66b44fc3bf040acb78c721 URL: http://source.winehq.org/git/wine.git/?a=tag;h=65ff4a8dbd713b5bae66b44fc3bf… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 24 18:52:05 2009 +0200 Release 1.1.20

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
67
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 April 2009