February 2009 - Wine-commits

Michael Stefaniuc : wintrust/tests: Fix typos in ok() strings.
by Alexandre Julliard 17 Feb '09

17 Feb '09

Module: wine Branch: master Commit: 03f04e15fe9a2f568b8b6be153a3d7788571247a URL: http://source.winehq.org/git/wine.git/?a=commit;h=03f04e15fe9a2f568b8b6be15… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 17 10:53:34 2009 +0100 wintrust/tests: Fix typos in ok() strings. --- dlls/wintrust/tests/crypt.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 6ef3c53..9129fa9 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -469,13 +469,13 @@ static void test_CryptCATAdminAddRemoveCatalog(void) hcatinfo = pCryptCATAdminAddCatalog(NULL, NULL, NULL, 0); error = GetLastError(); ok(hcatinfo == NULL, "CryptCATAdminAddCatalog succeeded\n"); - ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMTER\n", GetLastError()); + ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", GetLastError()); SetLastError(0xdeadbeef); hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, NULL, NULL, 0); error = GetLastError(); ok(hcatinfo == NULL, "CryptCATAdminAddCatalog succeeded\n"); - ok(error == ERROR_INVALID_PARAMETER, "got %u expected INVALID_PARAMTER\n", GetLastError()); + ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", GetLastError()); MultiByteToWideChar(0, 0, tmpfile, -1, tmpfileW, MAX_PATH); @@ -491,7 +491,7 @@ static void test_CryptCATAdminAddRemoveCatalog(void) hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, basenameW, 1); error = GetLastError(); ok(hcatinfo == NULL, "CryptCATAdminAddCatalog succeeded\n"); - ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMTER\n", GetLastError()); + ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", GetLastError()); SetLastError(0xdeadbeef); hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, NULL, 0);

1 0

Alexandre Julliard : shell32: Default to the more modern location for the user profile directory.
by Alexandre Julliard 17 Feb '09

17 Feb '09

Module: wine Branch: master Commit: 853d993830509c3ecaa4113bed789bf08ec36d76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=853d993830509c3ecaa4113be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 17 13:50:07 2009 +0100 shell32: Default to the more modern location for the user profile directory. --- dlls/shell32/shellpath.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index d9fd6dd..2434e9a 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -801,11 +801,8 @@ static const WCHAR ProfilesDirectoryW[] = {'P','r','o','f','i','l','e','s','D',' static const WCHAR AllUsersProfileValueW[] = {'A','l','l','U','s','e','r','s','P','r','o','f','i','l','e','\0'}; static const WCHAR szSHFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; static const WCHAR szSHUserFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','U','s','e','r',' ','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; -/* This defaults to L"Documents and Settings" on Windows 2000/XP, but we're - * acting more Windows 9x-like for now. - */ -static const WCHAR szDefaultProfileDirW[] = {'p','r','o','f','i','l','e','s','\0'}; -static const WCHAR AllUsersW[] = {'A','l','l',' ','U','s','e','r','s','\0'}; +static const WCHAR szDefaultProfileDirW[] = {'u','s','e','r','s',0}; +static const WCHAR AllUsersW[] = {'P','u','b','l','i','c',0}; typedef enum _CSIDL_Type { CSIDL_Type_User, @@ -1568,13 +1565,14 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) hr = _SHOpenProfilesKey(&key); if (SUCCEEDED(hr)) { - WCHAR szDefaultProfilesPrefix[MAX_PATH]; + WCHAR def_val[MAX_PATH]; + + /* get the system drive */ + GetSystemDirectoryW(def_val, MAX_PATH); + if (def_val[1] == ':') strcpyW( def_val + 3, szDefaultProfileDirW ); + else FIXME("non-drive system paths unsupported\n"); - GetWindowsDirectoryW(szDefaultProfilesPrefix, MAX_PATH); - PathAddBackslashW(szDefaultProfilesPrefix); - PathAppendW(szDefaultProfilesPrefix, szDefaultProfileDirW); - hr = _SHGetProfilesValue(key, ProfilesDirectoryW, szProfilesPrefix, - szDefaultProfilesPrefix); + hr = _SHGetProfilesValue(key, ProfilesDirectoryW, szProfilesPrefix, def_val ); } *szDest = 0;

1 0

Alistair Leslie-Hughes : mshtml: Add VT_I4 support to set_nsstyle_attr_var.
by Alexandre Julliard 17 Feb '09

17 Feb '09

Module: wine Branch: master Commit: 6307522232230a498cdac3c7d428425c1e281634 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6307522232230a498cdac3c7d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 17 20:36:28 2009 +1100 mshtml: Add VT_I4 support to set_nsstyle_attr_var. --- dlls/mshtml/htmlstyle.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 4ff81c0..b9d33f0 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -251,6 +251,13 @@ static HRESULT set_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_ case VT_BSTR: return set_nsstyle_attr(nsstyle, sid, V_BSTR(value), flags); + case VT_I4: { + WCHAR str[14]; + static const WCHAR format[] = {'%','d',0}; + + wsprintfW(str, format, V_I4(value)); + return set_nsstyle_attr(nsstyle, sid, str, flags); + } default: FIXME("not implemented vt %d\n", V_VT(value)); return E_NOTIMPL;

1 0

Stefan Dösinger : wined3d: Add a debug function for surface locations.
by Alexandre Julliard 17 Feb '09

17 Feb '09

Module: wine Branch: master Commit: 68c251f327f89f3eff03ee93f0b00dc557f93241 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c251f327f89f3eff03ee93f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 16 23:30:36 2009 +0100 wined3d: Add a debug function for surface locations. --- dlls/wined3d/surface.c | 7 ++----- dlls/wined3d/utils.c | 11 +++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2998bd1..66fb86d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4197,8 +4197,7 @@ static void WINAPI IWineD3DSurfaceImpl_ModifyLocation(IWineD3DSurface *iface, DW IWineD3DBaseTexture *texture; IWineD3DSurfaceImpl *overlay; - TRACE("(%p)->(%s, %s)\n", iface, - flag == SFLAG_INSYSMEM ? "SFLAG_INSYSMEM" : flag == SFLAG_INDRAWABLE ? "SFLAG_INDRAWABLE" : "SFLAG_INTEXTURE", + TRACE("(%p)->(%s, %s)\n", iface, debug_surflocation(flag), persistent ? "TRUE" : "FALSE"); if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { @@ -4481,9 +4480,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D } } - TRACE("(%p)->(%s, %p)\n", iface, - flag == SFLAG_INSYSMEM ? "SFLAG_INSYSMEM" : flag == SFLAG_INDRAWABLE ? "SFLAG_INDRAWABLE" : "SFLAG_INTEXTURE", - rect); + TRACE("(%p)->(%s, %p)\n", iface, debug_surflocation(flag), rect); if(rect) { TRACE("Rectangle: (%d,%d)-(%d,%d)\n", rect->left, rect->top, rect->right, rect->bottom); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 808b8c7..7937b86 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1220,6 +1220,17 @@ void dump_color_fixup_desc(struct color_fixup_desc fixup) TRACE("\tW: %s%s\n", debug_fixup_channel_source(fixup.w_source), fixup.w_sign_fixup ? ", SIGN_FIXUP" : ""); } +const char *debug_surflocation(DWORD flag) { + char buf[128]; + + buf[0] = 0; + if(flag & SFLAG_INSYSMEM) strcat(buf, " | SFLAG_INSYSMEM"); + if(flag & SFLAG_INDRAWABLE) strcat(buf, " | SFLAG_INDRAWABLE"); + if(flag & SFLAG_INTEXTURE) strcat(buf, " | SFLAG_INTEXTURE"); + if(flag & SFLAG_INSRGBTEX) strcat(buf, " | SFLAG_INSRGBTEX"); + return wine_dbg_sprintf("%s", buf[0] ? buf + 3 : "0"); +} + /***************************************************************************** * Useful functions mapping GL <-> D3D values */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c9f9187..d3e6bf1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2037,6 +2037,7 @@ const char* debug_d3dtop(WINED3DTEXTUREOP d3dtop); const char *debug_fixup_channel_source(enum fixup_channel_source source); const char *debug_yuv_fixup(enum yuv_fixup yuv_fixup); void dump_color_fixup_desc(struct color_fixup_desc fixup); +const char *debug_surflocation(DWORD flag); /* Routines for GL <-> D3D values */ GLenum StencilOp(DWORD op);

1 0

Stefan Dösinger : wined3d: Pass the requested srgb flag to PreLoad.
by Alexandre Julliard 17 Feb '09

17 Feb '09

Module: wine Branch: master Commit: 4386a827e964c1682fd51414e78ffe9e4c76e012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4386a827e964c1682fd51414e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 17 00:25:51 2009 +0100 wined3d: Pass the requested srgb flag to PreLoad. Add a new wined3d-internal PreLoad function to textures and surfaces that takes a parameter specifying wether the rgb or srgb texture should be loaded. --- dlls/wined3d/context.c | 8 ++++++-- dlls/wined3d/cubetexture.c | 19 ++++++++++++++++--- dlls/wined3d/device.c | 8 ++++++-- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/surface.c | 35 ++++++++++++++++++++++------------- dlls/wined3d/texture.c | 19 ++++++++++++++++--- dlls/wined3d/volumetexture.c | 6 +++++- dlls/wined3d/wined3d_private.h | 14 ++++++++++++++ 8 files changed, 87 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4386a827e964c1682fd51…

1 0

Rob Shearman : include: Add WDT_INPROC64_CALL cases to unions in wtypes.idl .
by Alexandre Julliard 17 Feb '09

17 Feb '09

Module: wine Branch: master Commit: 88cb399a28f8f6804bfb038d8147c01c937b7b30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88cb399a28f8f6804bfb038d8… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Feb 17 09:47:44 2009 +0000 include: Add WDT_INPROC64_CALL cases to unions in wtypes.idl. --- include/wtypes.idl | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/wtypes.idl b/include/wtypes.idl index c817d08..bacf4cd 100644 --- a/include/wtypes.idl +++ b/include/wtypes.idl @@ -434,7 +434,7 @@ typedef struct tagRemHGLOBAL { typedef union _userHGLOBAL switch(long fContext) u { case WDT_INPROC_CALL: long hInproc; case WDT_REMOTE_CALL: FLAGGED_BYTE_BLOB *hRemote; - default: long hGlobal; + case WDT_INPROC64_CALL: __int64 hInproc64; } userHGLOBAL; typedef [unique] userHGLOBAL *wireHGLOBAL; @@ -450,7 +450,7 @@ typedef struct tagRemHMETAFILEPICT { typedef union _userHMETAFILE switch(long fContext) u { case WDT_INPROC_CALL: long hInproc; case WDT_REMOTE_CALL: BYTE_BLOB *hRemote; - default: long hGlobal; + case WDT_INPROC64_CALL: __int64 hInproc64; } userHMETAFILE; typedef [unique] userHMETAFILE *wireHMETAFILE; @@ -465,7 +465,7 @@ typedef struct _remoteMETAFILEPICT { typedef union _userHMETAFILEPICT switch(long fContext) u { case WDT_INPROC_CALL: long hInproc; case WDT_REMOTE_CALL: remoteMETAFILEPICT *hRemote; - default: long hGlobal; + case WDT_INPROC64_CALL: __int64 hInproc64; } userHMETAFILEPICT; typedef [unique] userHMETAFILEPICT *wireHMETAFILEPICT; @@ -478,7 +478,7 @@ typedef struct tagRemHENHMETAFILE { typedef union _userHENHMETAFILE switch(long fContext) u { case WDT_INPROC_CALL: long hInproc; case WDT_REMOTE_CALL: BYTE_BLOB *hRemote; - default: long hGlobal; + case WDT_INPROC64_CALL: __int64 hInproc64; } userHENHMETAFILE; typedef [unique] userHENHMETAFILE *wireHENHMETAFILE; @@ -503,7 +503,7 @@ typedef struct _userBITMAP { typedef union _userHBITMAP switch(long fContext) u { case WDT_INPROC_CALL: long hInproc; case WDT_REMOTE_CALL: userBITMAP *hRemote; - default: long hGlobal; + case WDT_INPROC64_CALL: __int64 hInproc64; } userHBITMAP; typedef [unique] userHBITMAP *wireHBITMAP; @@ -522,7 +522,7 @@ typedef struct tagrpcLOGPALETTE { typedef union _userHPALETTE switch(long fContext) u { case WDT_INPROC_CALL: long hInproc; case WDT_REMOTE_CALL: rpcLOGPALETTE *hRemote; - default: long hGlobal; + case WDT_INPROC64_CALL: __int64 hInproc64; } userHPALETTE; typedef [unique] userHPALETTE *wireHPALETTE;

1 0

Rob Shearman : ole32: Round the extected size in the marshal and moniker tests using the results of sizing a global , not a heap pointer.
by Alexandre Julliard 17 Feb '09

17 Feb '09

Module: wine Branch: master Commit: 2803516d26496129226a5a93c91a788cf3f9f140 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2803516d26496129226a5a93c… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Feb 17 09:48:25 2009 +0000 ole32: Round the extected size in the marshal and moniker tests using the results of sizing a global, not a heap pointer. The rounding isn't the same on Win9x, and the size being compared to is that of a global handle. --- dlls/ole32/tests/marshal.c | 18 +++++++++--------- dlls/ole32/tests/moniker.c | 26 +++++++++++++------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 45e9950..8f6a7cc 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2040,17 +2040,17 @@ static void test_WM_QUIT_handling(void) } } -static SIZE_T round_heap_size(SIZE_T size) +static SIZE_T round_global_size(SIZE_T size) { - static SIZE_T heap_size_alignment = -1; - if (heap_size_alignment == -1) + static SIZE_T global_size_alignment = -1; + if (global_size_alignment == -1) { - void *p = HeapAlloc(GetProcessHeap(), 0, 1); - heap_size_alignment = HeapSize(GetProcessHeap(), 0, p); - HeapFree(GetProcessHeap(), 0, p); + void *p = GlobalAlloc(GMEM_FIXED, 1); + global_size_alignment = GlobalSize(p); + GlobalFree(p); } - return ((size + heap_size_alignment - 1) & ~(heap_size_alignment - 1)); + return ((size + global_size_alignment - 1) & ~(global_size_alignment - 1)); } static void test_freethreadedmarshaldata(IStream *pStream, MSHCTX mshctx, void *ptr, DWORD mshlflags) @@ -2069,9 +2069,9 @@ static void test_freethreadedmarshaldata(IStream *pStream, MSHCTX mshctx, void * if (mshctx == MSHCTX_INPROC) { - DWORD expected_size = round_heap_size(3*sizeof(DWORD) + sizeof(GUID)); + DWORD expected_size = round_global_size(3*sizeof(DWORD) + sizeof(GUID)); ok(size == expected_size || - broken(size == round_heap_size(2*sizeof(DWORD))) /* Win9x & NT4 */, + broken(size == round_global_size(2*sizeof(DWORD))) /* Win9x & NT4 */, "size should have been %d instead of %d\n", expected_size, size); ok(*(DWORD *)marshal_data == mshlflags, "expected 0x%x, but got 0x%x for mshctx\n", mshlflags, *(DWORD *)marshal_data); diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 3501aa7..413045a 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -82,17 +82,17 @@ static void UnlockModule(void) InterlockedDecrement(&cLocks); } -static SIZE_T round_heap_size(SIZE_T size) +static SIZE_T round_global_size(SIZE_T size) { - static SIZE_T heap_size_alignment = -1; - if (heap_size_alignment == -1) + static SIZE_T global_size_alignment = -1; + if (global_size_alignment == -1) { - void *p = HeapAlloc(GetProcessHeap(), 0, 1); - heap_size_alignment = HeapSize(GetProcessHeap(), 0, p); - HeapFree(GetProcessHeap(), 0, p); + void *p = GlobalAlloc(GMEM_FIXED, 1); + global_size_alignment = GlobalSize(p); + GlobalFree(p); } - return ((size + heap_size_alignment - 1) & ~(heap_size_alignment - 1)); + return ((size + global_size_alignment - 1) & ~(global_size_alignment - 1)); } static HRESULT WINAPI Test_IClassFactory_QueryInterface( @@ -1220,12 +1220,12 @@ static void test_moniker( moniker_data = GlobalLock(hglobal); /* first check we have the right amount of data */ - ok(moniker_size == round_heap_size(sizeof_expected_moniker_saved_data), + ok(moniker_size == round_global_size(sizeof_expected_moniker_saved_data), "%s: Size of saved data differs (expected %d, actual %d)\n", - testname, (DWORD)round_heap_size(sizeof_expected_moniker_saved_data), moniker_size); + testname, (DWORD)round_global_size(sizeof_expected_moniker_saved_data), moniker_size); /* then do a byte-by-byte comparison */ - for (i = 0; i < min(moniker_size, round_heap_size(sizeof_expected_moniker_saved_data)); i++) + for (i = 0; i < min(moniker_size, round_global_size(sizeof_expected_moniker_saved_data)); i++) { if (expected_moniker_saved_data[i] != moniker_data[i]) { @@ -1266,14 +1266,14 @@ static void test_moniker( moniker_data = GlobalLock(hglobal); /* first check we have the right amount of data */ - ok(moniker_size == round_heap_size(sizeof_expected_moniker_marshal_data), + ok(moniker_size == round_global_size(sizeof_expected_moniker_marshal_data), "%s: Size of marshaled data differs (expected %d, actual %d)\n", - testname, (DWORD)round_heap_size(sizeof_expected_moniker_marshal_data), moniker_size); + testname, (DWORD)round_global_size(sizeof_expected_moniker_marshal_data), moniker_size); /* then do a byte-by-byte comparison */ if (expected_moniker_marshal_data) { - for (i = 0; i < min(moniker_size, round_heap_size(sizeof_expected_moniker_marshal_data)); i++) + for (i = 0; i < min(moniker_size, round_global_size(sizeof_expected_moniker_marshal_data)); i++) { if (expected_moniker_marshal_data[i] != moniker_data[i]) {

1 0

Stefan Dösinger : wined3d: Duplicate GL textures for srgb switching.
by Alexandre Julliard 17 Feb '09

17 Feb '09

Module: wine Branch: master Commit: c585b4de9949ec3cb583de4a3a49768835e4103c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c585b4de9949ec3cb583de4a3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 16 16:22:09 2009 +0100 wined3d: Duplicate GL textures for srgb switching. This reduces the number of srgb switching reloads quite a lot. The only situation in which a reload is needed is if the rgb copy is modified on the GL side and the srgb copy is needed. --- dlls/wined3d/basetexture.c | 125 ++++++++++++++++++++------------- dlls/wined3d/cubetexture.c | 48 +++++-------- dlls/wined3d/device.c | 2 +- dlls/wined3d/state.c | 4 +- dlls/wined3d/surface.c | 149 ++++++++++++++++++++++++--------------- dlls/wined3d/surface_base.c | 2 +- dlls/wined3d/texture.c | 40 ++++------- dlls/wined3d/volume.c | 2 +- dlls/wined3d/volumetexture.c | 10 +-- dlls/wined3d/wined3d_private.h | 43 ++++++------ include/wine/wined3d.idl | 4 +- 11 files changed, 236 insertions(+), 193 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c585b4de9949ec3cb583d…

1 0

David Adam : d3drm: D3DRMQuaternionSlerp should be tested against returned Windows values.
by Alexandre Julliard 17 Feb '09

17 Feb '09

Module: wine Branch: master Commit: 32064cb5532f8056cd90bec2fc05a1dfc862b84c URL: http://source.winehq.org/git/wine.git/?a=commit;h=32064cb5532f8056cd90bec2f… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Mon Feb 16 17:39:12 2009 +0100 d3drm: D3DRMQuaternionSlerp should be tested against returned Windows values. --- dlls/d3drm/tests/vector.c | 21 +++++---------------- 1 files changed, 5 insertions(+), 16 deletions(-) diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c index 533523f..b063d21 100644 --- a/dlls/d3drm/tests/vector.c +++ b/dlls/d3drm/tests/vector.c @@ -242,7 +242,7 @@ static void MatrixTest(void) static void QuaternionTest(void) { D3DVECTOR axis; - D3DVALUE g,h,epsilon,par,theta; + D3DVALUE par,theta; D3DRMQUATERNION q,q1,q2,r; /*_________________QuaternionFromRotation___________________*/ @@ -254,31 +254,20 @@ static void QuaternionTest(void) /*_________________QuaternionSlerp_________________________*/ /* If the angle of the two quaternions is in ]PI/2;3PI/2[, QuaternionSlerp - * interpolates between the first quaternion and the opposite of the second one. The test proves - * this fact. */ + * interpolates between the first quaternion and the opposite of the second one. + * The test proves this fact. */ par=0.31f; q1.s=1.0f; U1(q1.v).x=2.0f; U2(q1.v).y=3.0f; U3(q1.v).z=50.0f; q2.s=-4.0f; U1(q2.v).x=6.0f; U2(q2.v).y=7.0f; U3(q2.v).z=8.0f; /* The angle between q1 and q2 is in [-PI/2,PI/2]. So, one interpolates between q1 and q2. */ - epsilon=1.0f; - g=1.0f-par; h=epsilon*par; -/* Part of the test proving that the interpolation is linear. */ - q.s=g*q1.s+h*q2.s; - U1(q.v).x=g*U1(q1.v).x+h*U1(q2.v).x; - U2(q.v).y=g*U2(q1.v).y+h*U2(q2.v).y; - U3(q.v).z=g*U3(q1.v).z+h*U3(q2.v).z; + q.s = -0.55f; U1(q.v).x=3.24f; U2(q.v).y=4.24f; U3(q.v).z=36.98f; pD3DRMQuaternionSlerp(&r,&q1,&q2,par); expect_quat(q,r); q1.s=1.0f; U1(q1.v).x=2.0f; U2(q1.v).y=3.0f; U3(q1.v).z=50.0f; q2.s=-94.0f; U1(q2.v).x=6.0f; U2(q2.v).y=7.0f; U3(q2.v).z=-8.0f; /* The angle between q1 and q2 is not in [-PI/2,PI/2]. So, one interpolates between q1 and -q2. */ - epsilon=-1.0f; - g=1.0f-par; h=epsilon*par; - q.s=g*q1.s+h*q2.s; - U1(q.v).x=g*U1(q1.v).x+h*U1(q2.v).x; - U2(q.v).y=g*U2(q1.v).y+h*U2(q2.v).y; - U3(q.v).z=g*U3(q1.v).z+h*U3(q2.v).z; + q.s=29.83f; U1(q.v).x=-0.48f; U2(q.v).y=-0.10f; U3(q.v).z=36.98f; pD3DRMQuaternionSlerp(&r,&q1,&q2,par); expect_quat(q,r);

1 0

Dylan Smith : richedit: Removed unused ME_Document structure.
by Alexandre Julliard 17 Feb '09

17 Feb '09

Module: wine Branch: master Commit: 3903a110fbed77b8ab6593e1b9109494060337be URL: http://source.winehq.org/git/wine.git/?a=commit;h=3903a110fbed77b8ab6593e1b… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Feb 16 13:50:26 2009 -0500 richedit: Removed unused ME_Document structure. The ME_TextBuffer structure is what is used to store the document (as a linked list), so the ME_Document structure isn't being used. There was also a document pointer in the ME_Paragraph structure that was also unused, so I removed it because it is probably related to this used structure. --- dlls/riched20/editstr.h | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 889cbd8..a4af8fe 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -164,12 +164,6 @@ typedef struct tagME_Run REOBJECT *ole_obj; /* FIXME: should be a union with strText (at least) */ } ME_Run; -typedef struct tagME_Document { - struct tagME_DisplayItem *def_char_style; - struct tagME_DisplayItem *def_para_style; - int last_wrapped_line; -} ME_Document; - typedef struct tagME_Border { int width; @@ -197,7 +191,7 @@ typedef struct tagME_Paragraph int nHeight, nWidth; int nLastPaintYPos, nLastPaintHeight; int nRows; - struct tagME_DisplayItem *prev_para, *next_para, *document; + struct tagME_DisplayItem *prev_para, *next_para; } ME_Paragraph; typedef struct tagME_Cell /* v4.1 */ @@ -242,7 +236,6 @@ typedef struct tagME_DisplayItem ME_Row row; ME_Cell cell; ME_Paragraph para; - ME_Document doc; /* not used */ ME_Style *ustyle; /* used by diUndoSetCharFormat */ } member; } ME_DisplayItem;

1 0