wine-commits June 2012

wine-commits@winehq.org

3 participants
827 discussions

Alexandre Julliard : winex11: Use XGetKeyboardMapping instead of XKeycodeToKeysym.
by Alexandre Julliard 01 Jun '12

01 Jun '12

Module: wine Branch: master Commit: c8a22a4d1f13c9b4f91084a2eed5b60083c82c58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8a22a4d1f13c9b4f91084a2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 1 14:29:02 2012 +0200 winex11: Use XGetKeyboardMapping instead of XKeycodeToKeysym. --- dlls/winex11.drv/keyboard.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 7e49ffb..82fd26a 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -61,6 +61,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(keyboard); WINE_DECLARE_DEBUG_CHANNEL(key); static int min_keycode, max_keycode, keysyms_per_keycode; +static KeySym *key_mapping; static WORD keyc2vkey[256], keyc2scan[256]; static int NumLockMask, ScrollLockMask, AltGrMask; /* mask in the XKeyEvent state */ @@ -1106,7 +1107,7 @@ static inline KeySym keycode_to_keysym( Display *display, KeyCode keycode, int i #ifdef HAVE_XKB if (use_xkb) return XkbKeycodeToKeysym(display, keycode, 0, index); #endif - return XKeycodeToKeysym(display, keycode, index); + return key_mapping[(keycode - min_keycode) * keysyms_per_keycode + index]; } /* Returns the Windows virtual key code associated with the X event <e> */ @@ -1612,7 +1613,6 @@ static void set_kbd_layout_preload_key(void) */ void X11DRV_InitKeyboard( Display *display ) { - KeySym *ksp; XModifierKeymap *mmp; KeySym keysym; KeyCode *kcp; @@ -1645,11 +1645,9 @@ void X11DRV_InitKeyboard( Display *display ) wine_tsx11_lock(); XDisplayKeycodes(display, &min_keycode, &max_keycode); - ksp = XGetKeyboardMapping(display, min_keycode, - max_keycode + 1 - min_keycode, &keysyms_per_keycode); - /* We are only interested in keysyms_per_keycode. - There is no need to hold a local copy of the keysyms table */ - XFree(ksp); + if (key_mapping) XFree( key_mapping ); + key_mapping = XGetKeyboardMapping(display, min_keycode, + max_keycode + 1 - min_keycode, &keysyms_per_keycode); mmp = XGetModifierMapping(display); kcp = mmp->modifiermap;

1 0

Dmitry Timoshkov : gdi32/tests: GetGlyphOutline should fail for a bitmap font.
by Alexandre Julliard 01 Jun '12

01 Jun '12

Module: wine Branch: master Commit: 4fa2945544e0ee1e00b5a9ae283a527e023dcb5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fa2945544e0ee1e00b5a9ae2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 1 13:49:05 2012 +0900 gdi32/tests: GetGlyphOutline should fail for a bitmap font. --- dlls/gdi32/tests/font.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index f50d1bc..e15ba6f 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -876,6 +876,7 @@ static void test_bitmap_font_metrics(void) for(bit = 0; bit < 32; bit++) { + GLYPHMETRICS gm; DWORD fs[2]; BOOL bRet; @@ -904,16 +905,11 @@ static void test_bitmap_font_metrics(void) hfont = create_font(lf.lfFaceName, &lf); old_hfont = SelectObject(hdc, hfont); - bRet = GetTextMetrics(hdc, &tm); - ok(bRet, "GetTextMetrics error %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = GetTextFace(hdc, sizeof(face_name), face_name); ok(ret, "GetTextFace error %u\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = GetTextCharset(hdc); - if (lstrcmp(face_name, fd[i].face_name) != 0) { ok(ret != ANSI_CHARSET, "font charset should not be ANSI_CHARSET\n"); @@ -924,6 +920,19 @@ static void test_bitmap_font_metrics(void) continue; } + memset(&gm, 0, sizeof(gm)); + SetLastError(0xdeadbeef); + ret = GetGlyphOutline(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat); + todo_wine { + ok(ret == GDI_ERROR, "GetGlyphOutline should fail for a bitmap font\n"); + ok(GetLastError() == ERROR_CAN_NOT_COMPLETE, "expected ERROR_CAN_NOT_COMPLETE, got %u\n", GetLastError()); + } + + bRet = GetTextMetrics(hdc, &tm); + ok(bRet, "GetTextMetrics error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetTextCharset(hdc); ok(ret == expected_cs, "got charset %d, expected %d\n", ret, expected_cs); trace("created %s, height %d charset %x dpi %d\n", face_name, tm.tmHeight, tm.tmCharSet, tm.tmDigitizedAspectX);

1 0

Stefan Leichter : setupapi: Add stub for SetupAddToSourceListA.
by Alexandre Julliard 01 Jun '12

01 Jun '12

Module: wine Branch: master Commit: b3b78b337ea6ba0cf96ddc37161fe71844440851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3b78b337ea6ba0cf96ddc371… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu May 31 23:31:07 2012 +0200 setupapi: Add stub for SetupAddToSourceListA. --- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 6397ab2..f8f8fab 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -248,7 +248,7 @@ @ stub SetupAddSectionToDiskSpaceListW @ stdcall SetupAddToDiskSpaceListA(long str int64 long ptr long) @ stdcall SetupAddToDiskSpaceListW(long wstr int64 long ptr long) -@ stub SetupAddToSourceListA +@ stdcall SetupAddToSourceListA(long str) @ stub SetupAddToSourceListW @ stub SetupAdjustDiskSpaceListA @ stub SetupAdjustDiskSpaceListW diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index f4e6959..db05e64 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -232,6 +232,15 @@ BOOL WINAPI SetupQueryDrivesInDiskSpaceListW(HDSKSPC disk_space, PWSTR return_bu } /*********************************************************************** + * SetupAddToSourceListA (SETUPAPI.@) + */ +BOOL WINAPI SetupAddToSourceListA(DWORD flags, PCSTR source) +{ + FIXME("0x%08x %s\n", flags, debugstr_a(source)); + return TRUE; +} + +/*********************************************************************** * SetupSetSourceListA (SETUPAPI.@) */ BOOL WINAPI SetupSetSourceListA(DWORD flags, PCSTR *list, UINT count)

1 0

Daniel Jelinski : kernel32: Make SetThreadStackGuarantee stub return TRUE.
by Alexandre Julliard 01 Jun '12

01 Jun '12

Module: wine Branch: master Commit: 53b551440cdf9f79cd56ac7b7cca267f0f6916b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53b551440cdf9f79cd56ac7b7… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Thu May 31 21:43:23 2012 +0200 kernel32: Make SetThreadStackGuarantee stub return TRUE. --- dlls/kernel32/thread.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index bdaaee8..c56e1d3 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -378,8 +378,7 @@ BOOL WINAPI SetThreadPriorityBoost( BOOL WINAPI SetThreadStackGuarantee(PULONG stacksize) { FIXME("(%p): stub\n", stacksize); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + return TRUE; } /**********************************************************************

1 0

Eric Pouech : dbghelp: Use build-id information to locate debug information (and prefer it over . debug_link when both are present).
by Alexandre Julliard 01 Jun '12

01 Jun '12

Module: wine Branch: master Commit: d647bd108c5fa5350887b66353b8d2305f1d38b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d647bd108c5fa5350887b6635… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu May 31 21:41:23 2012 +0200 dbghelp: Use build-id information to locate debug information (and prefer it over .debug_link when both are present). --- dlls/dbghelp/elf_module.c | 163 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 132 insertions(+), 31 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index e18c9ef..80352bc 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -890,25 +890,140 @@ found: } /****************************************************************** - * elf_debuglink_parse + * elf_locate_build_id_target * - * Parses a .gnu_debuglink section and loads the debug info from - * the external file specified there. + * Try to find the .so file containing the debug info out of the build-id note information */ -static BOOL elf_debuglink_parse(struct image_file_map* fmap, const struct module* module, - const BYTE* debuglink) +static BOOL elf_locate_build_id_target(struct image_file_map* fmap, const BYTE* id, unsigned idlen) { - /* The content of a debug link section is: - * 1/ a NULL terminated string, containing the file name for the - * debug info - * 2/ padding on 4 byte boundary - * 3/ CRC of the linked ELF file - */ - const char* dbg_link = (const char*)debuglink; - DWORD crc; + static const WCHAR globalDebugDirW[] = {'/','u','s','r','/','l','i','b','/','d','e','b','u','g','/'}; + static const WCHAR buildidW[] = {'.','b','u','i','l','d','-','i','d','/'}; + static const WCHAR dotDebug0W[] = {'.','d','e','b','u','g',0}; + struct image_file_map* fmap_link = NULL; + WCHAR* p; + WCHAR* z; + const BYTE* idend = id + idlen; + struct elf_map_file_data emfd; + + fmap_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*fmap_link)); + if (!fmap_link) return FALSE; + + p = HeapAlloc(GetProcessHeap(), 0, + sizeof(globalDebugDirW) + sizeof(buildidW) + + (idlen * 2 + 1) * sizeof(WCHAR) + sizeof(dotDebug0W)); + z = p; + memcpy(z, globalDebugDirW, sizeof(globalDebugDirW)); + z += sizeof(globalDebugDirW) / sizeof(WCHAR); + memcpy(z, buildidW, sizeof(buildidW)); + z += sizeof(buildidW) / sizeof(WCHAR); + + if (id < idend) + { + *z++ = "0123456789abcdef"[*id >> 4 ]; + *z++ = "0123456789abcdef"[*id & 0x0F]; + id++; + } + if (id < idend) + *z++ = '/'; + while (id < idend) + { + *z++ = "0123456789abcdef"[*id >> 4 ]; + *z++ = "0123456789abcdef"[*id & 0x0F]; + id++; + } + memcpy(z, dotDebug0W, sizeof(dotDebug0W)); + TRACE("checking %s\n", wine_dbgstr_w(p)); + + emfd.kind = from_file; + emfd.u.file.filename = p; + if (elf_map_file(&emfd, fmap_link)) + { + struct image_section_map buildid_sect; + if (elf_find_section(fmap_link, ".note.gnu.build-id", SHT_NULL, &buildid_sect)) + { + const uint32_t* note; - crc = *(const DWORD*)(dbg_link + ((DWORD_PTR)(strlen(dbg_link) + 4) & ~3)); - return elf_locate_debug_link(fmap, dbg_link, module->module.LoadedImageName, crc); + note = (const uint32_t*)image_map_section(&buildid_sect); + if (note != IMAGE_NO_MAP) + { + /* the usual ELF note structure: name-size desc-size type <name> <desc> */ + if (note[2] == NT_GNU_BUILD_ID) + { + if (note[1] == idlen && + !memcmp(note + 3 + ((note[0] + 3) >> 2), idend - idlen, idlen)) + { + TRACE("Located debug information file at %s\n", debugstr_w(p)); + HeapFree(GetProcessHeap(), 0, p); + fmap->u.elf.alternate = fmap_link; + return TRUE; + } + WARN("mismatch in buildid information for %s\n", wine_dbgstr_w(p)); + } + } + image_unmap_section(&buildid_sect); + } + elf_unmap_file(fmap_link); + } + + TRACE("not found\n"); + HeapFree(GetProcessHeap(), 0, p); + HeapFree(GetProcessHeap(), 0, fmap_link); + return FALSE; +} + +/****************************************************************** + * elf_check_alternate + * + * Load alternate files for a given ELF file, looking at either .note.gnu_build-id + * or .gnu_debuglink sections. + */ +static BOOL elf_check_alternate(struct image_file_map* fmap, const struct module* module) +{ + BOOL ret = FALSE; + BOOL found = FALSE; + struct image_section_map buildid_sect, debuglink_sect; + + /* if present, add the .gnu_debuglink file as an alternate to current one */ + if (elf_find_section(fmap, ".note.gnu.build-id", SHT_NULL, &buildid_sect)) + { + const uint32_t* note; + + found = TRUE; + note = (const uint32_t*)image_map_section(&buildid_sect); + if (note != IMAGE_NO_MAP) + { + /* the usual ELF note structure: name-size desc-size type <name> <desc> */ + if (note[2] == NT_GNU_BUILD_ID) + { + ret = elf_locate_build_id_target(fmap, (const BYTE*)(note + 3 + ((note[0] + 3) >> 2)), note[1]); + } + } + image_unmap_section(&buildid_sect); + } + /* if present, add the .gnu_debuglink file as an alternate to current one */ + if (!ret && elf_find_section(fmap, ".gnu_debuglink", SHT_NULL, &debuglink_sect)) + { + const char* dbg_link; + + found = TRUE; + dbg_link = (const char*)image_map_section(&debuglink_sect); + if (dbg_link != IMAGE_NO_MAP) + { + /* The content of a debug link section is: + * 1/ a NULL terminated string, containing the file name for the + * debug info + * 2/ padding on 4 byte boundary + * 3/ CRC of the linked ELF file + */ + DWORD crc = *(const DWORD*)(dbg_link + ((DWORD_PTR)(strlen(dbg_link) + 4) & ~3)); + ret = elf_locate_debug_link(fmap, dbg_link, module->module.LoadedImageName, crc); + if (!ret) + WARN("Couldn't load linked debug file for %s\n", + debugstr_w(module->module.ModuleName)); + } + image_unmap_section(&debuglink_sect); + } + return found ? ret : TRUE; } /****************************************************************** @@ -949,24 +1064,10 @@ static BOOL elf_load_debug_info_from_map(struct module* module, if (!(dbghelp_options & SYMOPT_PUBLICS_ONLY)) { struct image_section_map stab_sect, stabstr_sect; - struct image_section_map debuglink_sect; - /* if present, add the .gnu_debuglink file as an alternate to current one */ - if (elf_find_section(fmap, ".gnu_debuglink", SHT_NULL, &debuglink_sect)) - { - const BYTE* dbg_link; + /* check if we need an alternate file (from debuglink or build-id) */ + ret = elf_check_alternate(fmap, module); - dbg_link = (const BYTE*)image_map_section(&debuglink_sect); - if (dbg_link != IMAGE_NO_MAP) - { - lret = elf_debuglink_parse(fmap, module, dbg_link); - if (!lret) - WARN("Couldn't load linked debug file for %s\n", - debugstr_w(module->module.ModuleName)); - ret = ret || lret; - } - image_unmap_section(&debuglink_sect); - } if (elf_find_section(fmap, ".stab", SHT_NULL, &stab_sect) && elf_find_section(fmap, ".stabstr", SHT_NULL, &stabstr_sect)) {

1 0

Christian Costa : d3drm: Implement IDirect3DRMMeshImpl_SetGroupMaterial and forward material from mesh builder to created mesh .
by Alexandre Julliard 01 Jun '12

01 Jun '12

Module: wine Branch: master Commit: 38ba9bacd0adff172c1dd7a63647d32d40bcd1fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=38ba9bacd0adff172c1dd7a63… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 31 18:47:58 2012 +0200 d3drm: Implement IDirect3DRMMeshImpl_SetGroupMaterial and forward material from mesh builder to created mesh. --- dlls/d3drm/meshbuilder.c | 19 ++++++++++++++++--- dlls/d3drm/tests/d3drm.c | 2 +- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 146450c..3a6890c 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2011,6 +2011,8 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuil hr = E_OUTOFMEMORY; } } + if (SUCCEEDED(hr)) + hr = IDirect3DRMMesh_SetGroupMaterial(*mesh, 0, (LPDIRECT3DRMMATERIAL)This->material); if (FAILED(hr)) IDirect3DRMMesh_Release(*mesh); } @@ -2652,13 +2654,24 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_SetGroupQuality(IDirect3DRMMesh* iface } static HRESULT WINAPI IDirect3DRMMeshImpl_SetGroupMaterial(IDirect3DRMMesh* iface, - D3DRMGROUPINDEX id, LPDIRECT3DRMMATERIAL value) + D3DRMGROUPINDEX id, LPDIRECT3DRMMATERIAL material) { IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); - FIXME("(%p)->(%u,%p): stub\n", This, id, value); + TRACE("(%p)->(%u,%p)\n", This, id, material); - return E_NOTIMPL; + if (id >= This->nb_groups) + return D3DRMERR_BADVALUE; + + if (This->groups[id].material) + IDirect3DRMMaterial2_Release(This->groups[id].material); + + This->groups[id].material = (LPDIRECT3DRMMATERIAL2)material; + + if (material) + IDirect3DRMMaterial2_AddRef(This->groups[id].material); + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshImpl_SetGroupTexture(IDirect3DRMMesh* iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 8d35802..69aff86 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -372,7 +372,7 @@ static void test_MeshBuilder(void) ok(texture == NULL, "No texture should be present\n"); hr = IDirect3DRMMesh_GetGroupMaterial(mesh, 0, &material); ok(hr == D3DRM_OK, "GetCroupMaterial failed returning hr = %x\n", hr); - todo_wine ok(material != NULL, "No material present\n"); + ok(material != NULL, "No material present\n"); if ((hr == D3DRM_OK) && material) { hr = IDirect3DRMMaterial_GetEmissive(material, &values[0], &values[1], &values[2]);

1 0

Christian Costa : d3drm: Handle material list in mesh.
by Alexandre Julliard 01 Jun '12

01 Jun '12

Module: wine Branch: master Commit: 84f2e0e9ac30fbd2ca2bf9ea3ebca24789908490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84f2e0e9ac30fbd2ca2bf9ea3… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 31 18:47:50 2012 +0200 d3drm: Handle material list in mesh. --- dlls/d3drm/meshbuilder.c | 85 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 84 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 22aec7e..146450c 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -74,6 +74,7 @@ typedef struct { LPVOID pFaceData; DWORD nb_coords2d; Coords2d* pCoords2d; + IDirect3DRMMaterial2* material; } IDirect3DRMMeshBuilderImpl; char templates[] = { @@ -361,6 +362,8 @@ static ULONG WINAPI IDirect3DRMMeshBuilder2Impl_Release(IDirect3DRMMeshBuilder2* if (!ref) { + if (This->material) + IDirect3DRMMaterial2_Release(This->material); HeapFree(GetProcessHeap(), 0, This->name); HeapFree(GetProcessHeap(), 0, This->pVertices); HeapFree(GetProcessHeap(), 0, This->pNormals); @@ -1202,7 +1205,87 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) } else if (IsEqualGUID(pGuid, &TID_D3DRMMeshMaterialList)) { - FIXME("MeshMaterialList not supported yet, ignoring...\n"); + DWORD nb_materials; + DWORD nb_face_indices; + DWORD data_size; + LPDIRECTXFILEOBJECT child; + DWORD i = 0; + float* values; + + TRACE("Process MeshMaterialList\n"); + + hr = IDirectXFileData_GetData(pData2, NULL, &size, (void**)&ptr); + if (hr != DXFILE_OK) + goto end; + + nb_materials = *(DWORD*)ptr; + nb_face_indices = *(DWORD*)(ptr + sizeof(DWORD)); + data_size = 2 * sizeof(DWORD) + nb_face_indices * sizeof(DWORD); + + TRACE("nMaterials = %u, nFaceIndexes = %u\n", nb_materials, nb_face_indices); + + if (size != data_size) + WARN("Returned size %u does not match expected one %u\n", size, data_size); + + if (nb_materials > 2) + { + FIXME("Only one material per mesh supported, first one applies to all faces\n"); + nb_materials = 1; + } + + while (SUCCEEDED(hr = IDirectXFileData_GetNextObject(pData2, &child)) && (i < nb_materials)) + { + LPDIRECTXFILEDATA data; + LPDIRECTXFILEDATAREFERENCE reference; + LPDIRECT3DRMMATERIAL2 material; + + hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileData, (void **)&data); + if (FAILED(hr)) + { + hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileDataReference, (void **)&reference); + if (FAILED(hr)) + goto end; + + hr = IDirectXFileDataReference_Resolve(reference, &data); + IDirectXFileDataReference_Release(reference); + if (FAILED(hr)) + goto end; + } + + hr = Direct3DRMMaterial_create(&material); + if (FAILED(hr)) + { + IDirectXFileData_Release(data); + goto end; + } + + hr = IDirectXFileData_GetData(data, NULL, &size, (void**)&ptr); + if (hr != DXFILE_OK) + { + IDirectXFileData_Release(data); + goto end; + } + + if (size != 44) + WARN("Material size %u does not match expected one %u\n", size, 44); + + values = (float*)ptr; + + 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]); + IDirect3DRMMaterial2_SetEmissive(material, values[8], values[9], values[10]); + + This->material = material; + + IDirectXFileData_Release(data); + i++; + } + if (hr == S_OK) + WARN("Found more sub-objects than expected\n"); + else if (hr != DXFILEERR_NOMOREOBJECTS) + goto end; + hr = S_OK; } else {

1 0

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 June 2012