June 2012 - Wine-commits - list.winehq.org

Jacek Caban : wininet: Added support for undocumented InternetQueryOption( 98).
by Alexandre Julliard 05 Jun '12

05 Jun '12

Module: wine Branch: master Commit: 0133683c46bea6f1d22dbb4c66b8d95442abd6ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=0133683c46bea6f1d22dbb4c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 4 18:01:19 2012 +0200 wininet: Added support for undocumented InternetQueryOption(98). --- dlls/wininet/http.c | 3 +++ dlls/wininet/tests/http.c | 7 +++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 54ac0d5..b123283 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1987,6 +1987,9 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe return ERROR_SUCCESS; } + case 98: + TRACE("Queried undocumented option 98, forwarding to INTERNET_OPTION_SECURITY_FLAGS\n"); + /* fall through */ case INTERNET_OPTION_SECURITY_FLAGS: { DWORD flags; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 204c5b7..fbb7ab6 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2928,6 +2928,13 @@ static void _test_secflags_option(unsigned line, HINTERNET req, DWORD ex_flags) res = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_FLAGS, &flags, &size); ok_(__FILE__,line)(res, "InternetQueryOptionW(INTERNET_OPTION_SECURITY_FLAGS) failed: %u\n", GetLastError()); ok_(__FILE__,line)(flags == ex_flags, "INTERNET_OPTION_SECURITY_FLAGS flags = %x, expected %x\n", flags, ex_flags); + + /* Option 98 is undocumented and seems to be the same as INTERNET_OPTION_SECURITY_FLAGS */ + flags = 0xdeadbeef; + size = sizeof(flags); + res = InternetQueryOptionW(req, 98, &flags, &size); + ok_(__FILE__,line)(res, "InternetQueryOptionW(INTERNET_OPTION_SECURITY_FLAGS) failed: %u\n", GetLastError()); + ok_(__FILE__,line)(flags == ex_flags, "INTERNET_OPTION_SECURITY_FLAGS flags = %x, expected %x\n", flags, ex_flags); } #define set_secflags(a,b) _set_secflags(__LINE__,a,b)

1 0

Aric Stewart : usp10: Correct glyph caching beyond the BMP.
by Alexandre Julliard 05 Jun '12

05 Jun '12

Module: wine Branch: master Commit: 7fbf72c40083f7f97a12e60de247d94b635f400d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fbf72c40083f7f97a12e60de… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 4 11:14:27 2012 -0500 usp10: Correct glyph caching beyond the BMP. --- dlls/usp10/usp10.c | 23 ++++++++++++++++++----- dlls/usp10/usp10_internal.h | 6 +++++- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index ff842b0..8942a42 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -746,18 +746,24 @@ static inline BYTE get_cache_pitch_family(SCRIPT_CACHE *psc) static inline WORD get_cache_glyph(SCRIPT_CACHE *psc, DWORD c) { - WORD *block = ((ScriptCache *)*psc)->glyphs[c >> GLYPH_BLOCK_SHIFT]; + CacheGlyphPage *page = ((ScriptCache *)*psc)->page[c / 0x10000]; + WORD *block; + if (!page) return 0; + block = page->glyphs[(c % 0x10000) >> GLYPH_BLOCK_SHIFT]; if (!block) return 0; - return block[c & GLYPH_BLOCK_MASK]; + return block[(c % 0x10000) & GLYPH_BLOCK_MASK]; } static inline WORD set_cache_glyph(SCRIPT_CACHE *psc, WCHAR c, WORD glyph) { - WORD **block = &((ScriptCache *)*psc)->glyphs[c >> GLYPH_BLOCK_SHIFT]; + CacheGlyphPage **page = &((ScriptCache *)*psc)->page[c / 0x10000]; + WORD **block; + if (!*page && !(*page = heap_alloc_zero(sizeof(CacheGlyphPage)))) return 0; + block = &(*page)->glyphs[(c % 0x10000) >> GLYPH_BLOCK_SHIFT]; if (!*block && !(*block = heap_alloc_zero(sizeof(WORD) * GLYPH_BLOCK_SIZE))) return 0; - return ((*block)[c & GLYPH_BLOCK_MASK] = glyph); + return ((*block)[(c % 0x10000) & GLYPH_BLOCK_MASK] = glyph); } static inline BOOL get_cache_glyph_widths(SCRIPT_CACHE *psc, WORD glyph, ABC *abc) @@ -965,9 +971,16 @@ HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc) unsigned int i; for (i = 0; i < GLYPH_MAX / GLYPH_BLOCK_SIZE; i++) { - heap_free(((ScriptCache *)*psc)->glyphs[i]); heap_free(((ScriptCache *)*psc)->widths[i]); } + for (i = 0; i < 0x10; i++) + { + int j; + if (((ScriptCache *)*psc)->page[i]) + for (j = 0; j < GLYPH_MAX / GLYPH_BLOCK_SIZE; j++) + heap_free(((ScriptCache *)*psc)->page[i]->glyphs[j]); + heap_free(((ScriptCache *)*psc)->page[i]); + } heap_free(((ScriptCache *)*psc)->GSUB_Table); heap_free(((ScriptCache *)*psc)->GDEF_Table); heap_free(((ScriptCache *)*psc)->CMAP_Table); diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 558eb55..013e383 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -151,10 +151,14 @@ typedef struct { } LoadedScript; typedef struct { + WORD *glyphs[GLYPH_MAX / GLYPH_BLOCK_SIZE]; +} CacheGlyphPage; + +typedef struct { LOGFONTW lf; TEXTMETRICW tm; BOOL sfnt; - WORD *glyphs[GLYPH_MAX / GLYPH_BLOCK_SIZE]; + CacheGlyphPage *page[0x10]; ABC *widths[GLYPH_MAX / GLYPH_BLOCK_SIZE]; LPVOID GSUB_Table; LPVOID GDEF_Table;

1 0

André Hentschel : libwine: Improve bin directory detection on kFreeBSD and DragonFly BSD.
by Alexandre Julliard 05 Jun '12

05 Jun '12

Module: wine Branch: master Commit: 57de68e8763fbc4cccd8eba22196f93179f8689b URL: http://source.winehq.org/git/wine.git/?a=commit;h=57de68e8763fbc4cccd8eba22… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 4 22:14:14 2012 +0200 libwine: Improve bin directory detection on kFreeBSD and DragonFly BSD. --- libs/wine/config.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 031850b..349fb7d 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -53,9 +53,9 @@ static void fatal_error( const char *err, ... ) __attribute__((noreturn,format( static void fatal_perror( const char *err, ... ) __attribute__((noreturn,format(printf,1,2))); #endif -#ifdef __linux__ +#if defined(__linux__) || defined(__FreeBSD_kernel__ ) #define EXE_LINK "/proc/self/exe" -#elif defined (__FreeBSD__) +#elif defined (__FreeBSD__) || defined(__DragonFly__) #define EXE_LINK "/proc/curproc/file" #endif

1 0

Vincent Povirk : wine.inf: Add .NET keys to the 64-bit registry.
by Alexandre Julliard 05 Jun '12

05 Jun '12

Module: wine Branch: master Commit: c1279a6b03ed78a65ddf87755aff15700e086a12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1279a6b03ed78a65ddf87755… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 4 15:22:08 2012 -0500 wine.inf: Add .NET keys to the 64-bit registry. --- tools/wine.inf.in | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 03a748a..f39b929 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -89,6 +89,7 @@ AddReg=\ CurrentVersion,\ CurrentVersionWow64,\ Debugger,\ + Dotnet,\ DirectX,\ Fonts,\ MCI,\ @@ -510,6 +511,42 @@ HKCU,Control Panel\Desktop\WindowMetrics,SmCaptionHeight,2,"15" HKCU,Control Panel\Desktop\WindowMetrics,SmCaptionWidth,2,"13" HKCU,Control Panel\Mouse,Beep,2,"No" +[DotNet] +HKLM,Software\Microsoft\.NETFramework,"InstallRoot",2,"%10%\Microsoft.NET\Framework\" +HKLM,Software\Microsoft\.NETFramework\policy\v1.0,,16 +HKLM,Software\Microsoft\.NETFramework\policy\v1.1,,16 +HKLM,Software\Microsoft\.NETFramework\policy\v2.0,"50727",2,"50727-50727" +HKLM,Software\Microsoft\.NETFramework\policy\v3.0,,16 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v1.1.4322,Install,0x10003,1 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v1.1.4322,SP,0x10003,1 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v2.0.50727,Install,0x10003,1 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v2.0.50727,SP,0x10003,2 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v2.0.50727,Version,2,2.2.30729 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0,Install,0x10003,1 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0,SP,0x10003,2 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0,Version,2,3.2.30729 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0\Setup,InstallSuccess,0x10003,1 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,Install,0x10003,1 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,SP,0x10003,1 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,Version,2,3.5.30729.01 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5\1033,Install,0x10003,1 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Client,Install,0x10003,1 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Client,Version,2,4.0.30319 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Client,TargetVersion,2,4.0.0 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,Install,0x10003,1 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,Version,2,4.0.30319 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,TargetVersion,2,4.0.0 + +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},,2,".NET Framework" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},"ComponentID",2,".NETFramework" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},"Locale",2,"" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},"Version",2,"2,0,50727,0" + +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},,2,".NET Framework" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},"ComponentID",2,".NETFramework" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},"Locale",2,"" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},"Version",2,"1,0,4322,1" + [DirectX] HKLM,Software\Microsoft\DirectX,"Version",,"4.09.00.0904" HKLM,Software\Microsoft\DirectX,"InstalledVersion",1,00,00,00,09,00,00,00,00

1 0

Austin English : kernel32: Add a stub for SetConsoleIcon.
by Alexandre Julliard 05 Jun '12

05 Jun '12

Module: wine Branch: master Commit: e8c283c0096b30c6624865e0233821f0793a22d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8c283c0096b30c6624865e02… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jun 5 02:59:49 2012 -0500 kernel32: Add a stub for SetConsoleIcon. --- dlls/kernel32/console.c | 8 ++++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 4410a31..4218c29 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3216,3 +3216,11 @@ BOOL WINAPI AddConsoleAliasW(LPWSTR source, LPWSTR target, LPWSTR exename) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + + +BOOL WINAPI SetConsoleIcon(HICON icon) +{ + FIXME(": (%p) stub!\n", icon); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ec865cc..bad71a9 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1080,7 +1080,7 @@ @ stdcall SetConsoleDisplayMode(long long ptr) @ stub SetConsoleFont @ stub SetConsoleHardwareState -@ stub SetConsoleIcon +@ stdcall SetConsoleIcon(ptr) @ stdcall SetConsoleInputExeNameA(ptr) @ stdcall SetConsoleInputExeNameW(ptr) @ stub SetConsoleKeyShortcuts

1 0

Michael Stefaniuc : include: Move "inline" right after the storage specifier.
by Alexandre Julliard 05 Jun '12

05 Jun '12

Module: wine Branch: master Commit: 2e3c0d86cfe573ae686ad134fdc55dede54a5b2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e3c0d86cfe573ae686ad134f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 5 11:35:34 2012 +0200 include: Move "inline" right after the storage specifier. --- include/wine/port.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index 705716e..4b653c7 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -200,7 +200,7 @@ struct statvfs #endif #ifndef NAN -static float inline __port_nan(void) +static inline float __port_nan(void) { static const unsigned __nan_bytes = 0x7fc00000; return *(const float *)&__nan_bytes;

1 0

Christian Costa : d3drm: Implement IDirect3DRMMeshBuilderX_SetColor and IDirect3DRMMeshBuilderX_SetColorRGB .
by Alexandre Julliard 05 Jun '12

05 Jun '12

Module: wine Branch: master Commit: 08cfdc1191f50d3e9a1464d6193c4fef995d22e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08cfdc1191f50d3e9a1464d61… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jun 4 19:30:33 2012 +0200 d3drm: Implement IDirect3DRMMeshBuilderX_SetColor and IDirect3DRMMeshBuilderX_SetColorRGB. --- dlls/d3drm/d3drm_private.h | 2 ++ dlls/d3drm/light.c | 2 -- dlls/d3drm/meshbuilder.c | 23 +++++++++++++++-------- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 3a8982d..939304c 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -24,6 +24,8 @@ #include "d3drm.h" #include "dxfile.h" +#define D3DCOLOR_ARGB(a,r,g,b) ((D3DCOLOR)((((a)&0xff)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff))) + HRESULT Direct3DRM_create(IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMDevice_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent_frame, IUnknown** ret_iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 1326b6a..12c8623 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -29,8 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); -#define D3DCOLOR_ARGB(a,r,g,b) ((D3DCOLOR)((((a)&0xff)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff))) - typedef struct { IDirect3DRMLight IDirect3DRMLight_iface; LONG ref; diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 3a6890c..c14dee0 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -74,6 +74,7 @@ typedef struct { LPVOID pFaceData; DWORD nb_coords2d; Coords2d* pCoords2d; + D3DCOLOR color; IDirect3DRMMaterial2* material; } IDirect3DRMMeshBuilderImpl; @@ -615,9 +616,9 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetColorRGB(IDirect3DRMMeshBui { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - FIXME("(%p)->(%f,%f,%f): stub\n", This, red, green, blue); + TRACE("(%p)->(%f,%f,%f)\n", This, red, green, blue); - return E_NOTIMPL; + return IDirect3DRMMeshBuilder3_SetColorRGB(&This->IDirect3DRMMeshBuilder3_iface, red, green, blue); } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetColor(IDirect3DRMMeshBuilder2* iface, @@ -625,9 +626,9 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetColor(IDirect3DRMMeshBuilde { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - FIXME("(%p)->(%x): stub\n", This, color); + TRACE("(%p)->(%x)\n", This, color); - return E_NOTIMPL; + return IDirect3DRMMeshBuilder3_SetColor(&This->IDirect3DRMMeshBuilder3_iface, color); } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetTexture(IDirect3DRMMeshBuilder2* iface, @@ -1702,9 +1703,13 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetColorRGB(IDirect3DRMMeshBui { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - FIXME("(%p)->(%f,%f,%f): stub\n", This, red, green, blue); + TRACE("(%p)->(%f,%f,%f)\n", This, red, green, blue); - return E_NOTIMPL; + This->color = D3DCOLOR_ARGB(0xff, (BYTE)(red * 255.0f), + (BYTE)(green * 255.0f), + (BYTE)(blue * 255.0f)); + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetColor(IDirect3DRMMeshBuilder3* iface, @@ -1712,9 +1717,11 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetColor(IDirect3DRMMeshBuilde { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - FIXME("(%p)->(%x): stub\n", This, color); + TRACE("(%p)->(%x)\n", This, color); - return E_NOTIMPL; + This->color = color; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetTexture(IDirect3DRMMeshBuilder3* iface,

1 0

Christian Costa : d3drm: Implement IDirect3DRMMesh_GetGroupColor.
by Alexandre Julliard 05 Jun '12

05 Jun '12

Module: wine Branch: master Commit: ab8619e92063729e16835e46e5c15e5b4e20ef4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab8619e92063729e16835e46e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jun 4 19:30:41 2012 +0200 d3drm: Implement IDirect3DRMMesh_GetGroupColor. --- dlls/d3drm/meshbuilder.c | 5 +++-- dlls/d3drm/tests/d3drm.c | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index c14dee0..c46b1a0 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -43,6 +43,7 @@ typedef struct { unsigned vertex_per_face; DWORD face_data_size; unsigned* face_data; + D3DCOLOR color; IDirect3DRMMaterial2* material; IDirect3DRMTexture3* texture; } mesh_group; @@ -2750,9 +2751,9 @@ static D3DCOLOR WINAPI IDirect3DRMMeshImpl_GetGroupColor(IDirect3DRMMesh* iface, { IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); - FIXME("(%p)->(%u): stub\n", This, id); + TRACE("(%p)->(%u)\n", This, id); - return 0; + return This->groups[id].color; } static D3DRMMAPPING WINAPI IDirect3DRMMeshImpl_GetGroupMapping(IDirect3DRMMesh* iface, D3DRMGROUPINDEX id) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 0cc9c83..54a356a 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -189,6 +189,7 @@ static void test_MeshBuilder(void) DWORD f[8]; char name[10]; DWORD size; + D3DCOLOR color; hr = pDirect3DRMCreate(&pD3DRM); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); @@ -367,6 +368,8 @@ static void test_MeshBuilder(void) ok(nb_faces == 1, "Wrong number of faces %u (must be 1)\n", nb_faces); todo_wine ok(nb_face_vertices == 3, "Wrong number of vertices per face %u (must be 3)\n", nb_face_vertices); todo_wine ok(data_size == 3, "Wrong number of face data bytes %u (must be 3)\n", data_size); + color = IDirect3DRMMesh_GetGroupColor(mesh, 0); + todo_wine ok(color == 0xff00ff00, "Wrong color returned %#x instead of %#x\n", color, 0xff00ff00); hr = IDirect3DRMMesh_GetGroupTexture(mesh, 0, &texture); ok(hr == D3DRM_OK, "GetCroupTexture failed returning hr = %x\n", hr); ok(texture == NULL, "No texture should be present\n");

1 0

Christian Costa : d3drm: Load mesh color to mesh builder.
by Alexandre Julliard 05 Jun '12

05 Jun '12

Module: wine Branch: master Commit: ab08e5938a4161aad35e7b5498041990f44ec900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab08e5938a4161aad35e7b549… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jun 4 19:30:49 2012 +0200 d3drm: Load mesh color to mesh builder. --- dlls/d3drm/meshbuilder.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index c46b1a0..fdab66f 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1273,6 +1273,8 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) values = (float*)ptr; + IDirect3DRMMeshBuilder3_SetColorRGB(iface, values[0], values [1], values[2]); /* Alpha ignored */ + IDirect3DRMMaterial2_SetAmbient(material, values[0], values [1], values[2]); /* Alpha ignored */ IDirect3DRMMaterial2_SetPower(material, values[4]); IDirect3DRMMaterial2_SetSpecular(material, values[5], values[6], values[7]);

1 0

Christian Costa : d3drm: Implement IDirect3DRMMeshImpl_SetGroupColor.
by Alexandre Julliard 05 Jun '12

05 Jun '12

Module: wine Branch: master Commit: b7a74b0204989da3615f981c2e326f91b0da900c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7a74b0204989da3615f981c2… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jun 4 19:30:59 2012 +0200 d3drm: Implement IDirect3DRMMeshImpl_SetGroupColor. --- dlls/d3drm/meshbuilder.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index fdab66f..dabea1f 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2624,13 +2624,18 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_SetVertices(IDirect3DRMMesh* iface, } static HRESULT WINAPI IDirect3DRMMeshImpl_SetGroupColor(IDirect3DRMMesh* iface, - D3DRMGROUPINDEX id, D3DCOLOR value) + D3DRMGROUPINDEX id, D3DCOLOR color) { IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); - FIXME("(%p)->(%u,%x): stub\n", This, id, value); + TRACE("(%p)->(%u,%x)\n", This, id, color); - return E_NOTIMPL; + if (id >= This->nb_groups) + return D3DRMERR_BADVALUE; + + This->groups[id].color = color; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshImpl_SetGroupColorRGB(IDirect3DRMMesh* iface,

1 0