August 2006 - Wine-Commits - list.winehq.org

H. Verbeet : d3d: Don't crash when SetRenderTarget() is called with a NULL pSurface.
by Alexandre Julliard Aug. 7, 2006

Aug. 7, 2006

Module: wine Branch: refs/heads/master Commit: 7ac5bd67d561ac9921fc7dd9e5072a94301e2a25 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7ac5bd67d561ac9921fc7dd… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sat Aug 5 23:41:29 2006 +0200 d3d: Don't crash when SetRenderTarget() is called with a NULL pSurface. --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 18ea822..1d12290 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -579,7 +579,7 @@ static HRESULT WINAPI IDirect3DDevice8Im IWineD3DDevice_SetDepthStencilSurface(This->WineD3DDevice, NULL == pZSurface ? NULL : (IWineD3DSurface *)pZSurface->wineD3DSurface); - return IWineD3DDevice_SetRenderTarget(This->WineD3DDevice, 0, (IWineD3DSurface *)pSurface->wineD3DSurface); + return IWineD3DDevice_SetRenderTarget(This->WineD3DDevice, 0, pSurface ? (IWineD3DSurface *)pSurface->wineD3DSurface : NULL); } static HRESULT WINAPI IDirect3DDevice8Impl_GetRenderTarget(LPDIRECT3DDEVICE8 iface, IDirect3DSurface8** ppRenderTarget) { diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7aac0e4..ad415a8 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -380,7 +380,7 @@ static HRESULT WINAPI IDirect3DDevice9 IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; IDirect3DSurface9Impl *pSurface = (IDirect3DSurface9Impl*)pRenderTarget; TRACE("(%p) Relay\n" , This); - return IWineD3DDevice_SetRenderTarget(This->WineD3DDevice,RenderTargetIndex,(IWineD3DSurface*)pSurface->wineD3DSurface); + return IWineD3DDevice_SetRenderTarget(This->WineD3DDevice, RenderTargetIndex, pSurface ? (IWineD3DSurface*)pSurface->wineD3DSurface : NULL); } static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderTarget(LPDIRECT3DDEVICE9 iface, DWORD RenderTargetIndex, IDirect3DSurface9 **ppRenderTarget) {

1 0

H. Verbeet : wined3d: Fix D3DCOLOR swizzling in shaders.
by Alexandre Julliard Aug. 7, 2006

Aug. 7, 2006

Module: wine Branch: refs/heads/master Commit: 219ca7c2a0adbe36fdcbe294aab1298d63e9ae9d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=219ca7c2a0adbe36fdcbe29… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sat Aug 5 18:15:42 2006 +0200 wined3d: Fix D3DCOLOR swizzling in shaders. --- dlls/wined3d/vertexshader.c | 30 ++++++++++++++++++++++++------ 1 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index e837772..3427dff 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -661,13 +661,31 @@ BOOL vshader_input_is_color( IWineD3DVertexShaderImpl* This = (IWineD3DVertexShaderImpl*) iface; DWORD usage_token = This->semantics_in[regnum].usage; DWORD usage = (usage_token & D3DSP_DCL_USAGE_MASK) >> D3DSP_DCL_USAGE_SHIFT; + DWORD usage_idx = (usage_token & D3DSP_DCL_USAGEINDEX_MASK) >> D3DSP_DCL_USAGEINDEX_SHIFT; - /* FIXME: D3D8 shader: the semantics token is not the way to - * determine color info, since it is just a fake map to shader inputs */ - if (This->vertexDeclaration != NULL) - return FALSE; - else - return usage == D3DDECLUSAGE_COLOR; + IWineD3DVertexDeclarationImpl *vertexDeclaration = NULL; + if (This->vertexDeclaration) { + /* D3D8 declaration */ + vertexDeclaration = (IWineD3DVertexDeclarationImpl *)This->vertexDeclaration; + } else { + /* D3D9 declaration */ + vertexDeclaration = (IWineD3DVertexDeclarationImpl *)((IWineD3DDeviceImpl *)This->wineD3DDevice)->stateBlock->vertexDecl; + } + + if (vertexDeclaration) { + int i; + /* Find the declaration element that matches our register, then check + * if it has D3DCOLOR as it's type. This works for both d3d8 and d3d9. */ + for (i = 0; i < vertexDeclaration->declarationWNumElements-1; ++i) { + WINED3DVERTEXELEMENT *element = vertexDeclaration->pDeclarationWine + i; + if ((element->Usage == usage && element->UsageIndex == usage_idx)) { + return element->Type == WINED3DDECLTYPE_D3DCOLOR; + } + } + } + + ERR("Either no vertexdeclaration present, or register not matched. This should never happen.\n"); + return FALSE; } /** Generate a vertex shader string using either GL_VERTEX_PROGRAM_ARB

1 0

H. Verbeet : wined3d: Delay vertex shader compilation until the shader is first used.
by Alexandre Julliard Aug. 7, 2006

Aug. 7, 2006

Module: wine Branch: refs/heads/master Commit: ef87a40c728f8aefdfb3847c158a334f8c375102 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ef87a40c728f8aefdfb3847… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sat Aug 5 18:15:35 2006 +0200 wined3d: Delay vertex shader compilation until the shader is first used. --- dlls/wined3d/drawprim.c | 4 ++++ dlls/wined3d/pixelshader.c | 39 ++++++++++++++++++++++++++++++-------- dlls/wined3d/vertexshader.c | 38 +++++++++++++++++++++++++++++++------ dlls/wined3d/wined3d_private.h | 2 ++ include/wine/wined3d_interface.h | 6 ++++++ 5 files changed, 75 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ef87a40c728f8aefdfb…

1 0

Tijl Coosemans : ntdll: Add FreeBSD default serial port device.
by Alexandre Julliard Aug. 7, 2006

Aug. 7, 2006

Module: wine Branch: refs/heads/master Commit: e548d4083177125559f752d902907187cea60474 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e548d4083177125559f752d… Author: Tijl Coosemans <tijl(a)ulyssis.org> Date: Sat Aug 5 23:12:22 2006 +0200 ntdll: Add FreeBSD default serial port device. --- dlls/ntdll/directory.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 47d018a..84624a8 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -175,6 +175,13 @@ #ifdef linux strcpy( ret, "/dev/ttyS0" ); ret[strlen(ret) - 1] = '0' + num - 1; } +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + ret = RtlAllocateHeap( GetProcessHeap(), 0, sizeof("/dev/cuad0") ); + if (ret) + { + strcpy( ret, "/dev/cuad0" ); + ret[strlen(ret) - 1] = '0' + num - 1; + } #else FIXME( "no known default for device com%d\n", num ); #endif

1 0

Tijl Coosemans : oleaut32/tests: Test relative error, not absolute.
by Alexandre Julliard Aug. 7, 2006

Aug. 7, 2006

Module: wine Branch: refs/heads/master Commit: 48e1faff1e425f6253bd065dbeeb7c31ac22b2c3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=48e1faff1e425f6253bd065… Author: Tijl Coosemans <tijl(a)ulyssis.org> Date: Sat Aug 5 23:00:14 2006 +0200 oleaut32/tests: Test relative error, not absolute. --- dlls/oleaut32/tests/vartype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 5e2de4d..3db68f7 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -91,7 +91,7 @@ #define EXPECT_LT EXPECTRES(VARCMP #define EXPECT_GT EXPECTRES(VARCMP_GT, VARCMP_GT) #define EXPECT_EQ EXPECTRES(VARCMP_EQ, VARCMP_EQ) #define EXPECT_DBL(x) \ - ok(hres == S_OK && fabs(out-(x))<1e-14, "expected " #x ", got %16.16g; hres=0x%08lx\n", out, hres) + ok(hres == S_OK && fabs(out-(x))<=1e-14*(x), "expected %16.16g, got %16.16g; hres=0x%08lx\n", (x), out, hres) #define CONVERT(func, val) in = val; hres = p##func(in, &out) #define CONVERTRANGE(func,start,end) for (i = start; i < end; i+=1) { CONVERT(func, i); EXPECT(i); };

1 0

Andrew Talbot : setupapi/tests: Write-strings warnings fix.
by Alexandre Julliard Aug. 7, 2006

Aug. 7, 2006

Module: wine Branch: refs/heads/master Commit: 259d6b50772674fdf01d7cec623e120a4af96c7b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=259d6b50772674fdf01d7ce… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Aug 5 17:28:04 2006 +0100 setupapi/tests: Write-strings warnings fix. --- dlls/setupapi/tests/devinst.c | 3 ++- dlls/setupapi/tests/query.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index b2f3a52..bef1315 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -36,11 +36,12 @@ static void test_SetupDiCreateDeviceInfo HDEVINFO devlist; BOOL ret; DWORD error; + static CHAR notnull[] = "NotNull"; static const WCHAR machine[] = { 'd','u','m','m','y',0 }; SetLastError(0xdeadbeef); /* create empty DeviceInfoList, but set Reserved to a value, which is not NULL */ - devlist = SetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, "NotNull"); + devlist = SetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, notnull); error = GetLastError(); ok(devlist == INVALID_HANDLE_VALUE, "SetupDiCreateDeviceInfoListExW failed : %p %ld (expected %p)\n", devlist, error, INVALID_HANDLE_VALUE); diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c index be7f154..e823e7d 100644 --- a/dlls/setupapi/tests/query.c +++ b/dlls/setupapi/tests/query.c @@ -107,7 +107,7 @@ static BOOL check_info_filename(PSP_INF_ return ret; } -static PSP_INF_INFORMATION alloc_inf_info(LPSTR filename, DWORD search, PDWORD size) +static PSP_INF_INFORMATION alloc_inf_info(LPCSTR filename, DWORD search, PDWORD size) { PSP_INF_INFORMATION info; BOOL ret;

1 0

Andrew Talbot : secur32/tests: Write-strings warnings fix.
by Alexandre Julliard Aug. 7, 2006

Aug. 7, 2006

Module: wine Branch: refs/heads/master Commit: 8e2d28dd2590db53f657669d4e016a98fb20b2bb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8e2d28dd2590db53f657669… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Aug 5 15:51:13 2006 +0100 secur32/tests: Write-strings warnings fix. --- dlls/secur32/tests/main.c | 20 +++++++++------ dlls/secur32/tests/schannel.c | 55 +++++++++++++++++++++-------------------- 2 files changed, 40 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=8e2d28dd2590db53f65…

1 0

Stefan Leichter : msvcrt: Some more exports requested from msvcr80.dll.
by Alexandre Julliard Aug. 7, 2006

Aug. 7, 2006

Module: wine Branch: refs/heads/master Commit: aefdcd13e572f6e49c8e379fae97109d54f7a492 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aefdcd13e572f6e49c8e379… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sat Aug 5 16:19:05 2006 +0200 msvcrt: Some more exports requested from msvcr80.dll. --- dlls/msvcrt/msvcrt.spec | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 117014e..83b9580 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -90,6 +90,7 @@ # msvcrt.dll - MS VC++ Run Time Library @ cdecl __dllonexit(ptr ptr ptr) @ cdecl __doserrno() MSVCRT___doserrno @ cdecl __fpecode() +@ stub __get_app_type @ cdecl __getmainargs(ptr ptr ptr long ptr) @ extern __initenv MSVCRT___initenv @ cdecl __isascii(long) MSVCRT___isascii @@ -249,6 +250,8 @@ # extern _fileinfo @ cdecl _gcvt(double long str) @ cdecl _get_osfhandle(long) @ cdecl _get_sbh_threshold() +@ stub _get_terminate +@ stub _get_unexpected @ cdecl _getch() @ cdecl _getche() @ cdecl _getcwd(str long)

1 0

Robert Reif : winnt.h: Add some more RIDs.
by Alexandre Julliard Aug. 7, 2006

Aug. 7, 2006

Module: wine Branch: refs/heads/master Commit: 1b2b2bd78e02135024c726651b163eee713ded6b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1b2b2bd78e02135024c7266… Author: Robert Reif <reif(a)earthlink.net> Date: Sat Aug 5 15:54:14 2006 -0400 winnt.h: Add some more RIDs. --- include/winnt.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index f212ddd..05e0276 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3369,6 +3369,12 @@ #define DOMAIN_USER_RID_MAX #define DOMAIN_GROUP_RID_ADMINS 0x00000200L #define DOMAIN_GROUP_RID_USERS 0x00000201L #define DOMAIN_GROUP_RID_GUESTS 0x00000202L +#define DOMAIN_GROUP_RID_COMPUTERS 0x00000203L +#define DOMAIN_GROUP_RID_CONTROLLERS 0x00000204L +#define DOMAIN_GROUP_RID_CERT_ADMINS 0x00000205L +#define DOMAIN_GROUP_RID_SCHEMA_ADMINS 0x00000206L +#define DOMAIN_GROUP_RID_ENTERPRISE_ADMINS 0x00000207L +#define DOMAIN_GROUP_RID_POLICY_ADMINS 0x00000208L #define DOMAIN_ALIAS_RID_ADMINS 0x00000220L #define DOMAIN_ALIAS_RID_USERS 0x00000221L

1 0

Krzysztof Foltman : riched20: Ensure text is wrapped before invalidating selection.
by Alexandre Julliard Aug. 7, 2006

Aug. 7, 2006

Module: wine Branch: refs/heads/master Commit: 3a0c15e939a5a02f91142f34829a61ee74203dd6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3a0c15e939a5a02f91142f3… Author: Krzysztof Foltman <wdev(a)foltman.com> Date: Fri Aug 4 23:40:06 2006 +0200 riched20: Ensure text is wrapped before invalidating selection. --- dlls/riched20/caret.c | 1 + dlls/riched20/paint.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index da52288..5124822 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -118,6 +118,7 @@ ME_GetCursorCoordinates(ME_TextEditor *e assert(!pCursor->nOffset || !editor->bCaretAtEnd); assert(height && x && y); + assert(!(ME_GetParagraph(pCursorRun)->member.para.nFlags & MEPF_REWRAP)); if (pCursorRun->type == diRun) { ME_DisplayItem *row = ME_FindItemBack(pCursorRun, diStartRowOrParagraph); diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index f26583c..899f2d0 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -505,6 +505,7 @@ ME_InvalidateFromOfs(ME_TextEditor *edit void ME_InvalidateSelection(ME_TextEditor *editor) { + ME_WrapMarkedParagraphs(editor); if (ME_IsSelection(editor) || editor->nLastSelStart != editor->nLastSelEnd) { int x, y, height;

1 0