May 2012 - Wine-Commits - list.winehq.org

Józef Kucia : d3dx9: Add a WARN to get_image_info_from_dds about too short DDS files.
by Alexandre Julliard May 23, 2012

May 23, 2012

Module: wine Branch: master Commit: 3a944738025b4f608e746b28f9ea747f5755e447 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a944738025b4f608e746b28f… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue May 22 22:35:57 2012 +0200 d3dx9: Add a WARN to get_image_info_from_dds about too short DDS files. --- dlls/d3dx9_36/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 6b0786c..821d51e 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -372,7 +372,10 @@ static HRESULT get_image_info_from_dds(const void *buffer, UINT length, D3DXIMAG expected_length *= faces; expected_length += sizeof(*header); if (length < expected_length) + { + WARN("File is too short %u, expected at least %u bytes\n", length, expected_length); return D3DXERR_INVALIDDATA; + } info->ImageFileFormat = D3DXIFF_DDS;

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard May 23, 2012

May 23, 2012

Module: wine Branch: master Commit: 072c96565dd47c5bbbd5711934936ed000ba7ce3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=072c96565dd47c5bbbd571193… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 23 09:05:38 2012 +0400 po: Update Russian translation. --- po/ru.po | 53 +++++------------------------------------------------ 1 files changed, 5 insertions(+), 48 deletions(-) diff --git a/po/ru.po b/po/ru.po index ed63276..01b747f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -159,21 +159,10 @@ msgid "Cancel" msgstr "Отмена" #: appwiz.rc:112 -#, fuzzy -#| msgid "Wine Gecko Installer" msgid "Wine Mono Installer" -msgstr "Установка Wine Gecko" +msgstr "Установка Wine Mono" #: appwiz.rc:115 -#, fuzzy -#| msgid "" -#| "Wine could not find a Gecko package which is needed for applications " -#| "embedding HTML to work correctly. Wine can automatically download and " -#| "install it for you.\n" -#| "\n" -#| "Note: it is recommended to use your distribution's packages instead. See " -#| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " -#| "for details." msgid "" "Wine could not find a Mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" @@ -182,13 +171,12 @@ msgid "" "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine не может найти пакет Gecko, который необходим для корректной работы " -"приложений с поддержкой HTML. Wine может автоматически загрузить и " -"установить его.\n" +"Wine не может найти пакет Mono, который необходим для корректной работы .NET " +"приложений. Wine может автоматически загрузить и установить его.\n" "\n" "Примечание: рекомендуется использовать пакет, предоставляемый вашим " -"дистрибутивом. Посетите <a href=\"http://wiki.winehq.org/Gecko\">http://wiki." -"winehq.org/Gecko</a> для получения более подробной информации." +"дистрибутивом. Посетите <a href=\"http://wiki.winehq.org/Mono\">http://wiki." +"winehq.org/Mono</a> для получения более подробной информации." #: appwiz.rc:28 msgid "Add/Remove Programs" @@ -6679,37 +6667,6 @@ msgid "insert disk %s" msgstr "вставьте диск %s" #: msi.rc:30 -#, fuzzy -#| msgid "" -#| "Windows Installer %s\n" -#| "\n" -#| "Usage:\n" -#| "msiexec command {required parameter} [optional parameter]\n" -#| "\n" -#| "Install a product:\n" -#| "\t/i {package|product_code} [property]\n" -#| "\t/package {package|product_code} [property]\n" -#| "\t/a package [property]\n" -#| "Repair an installation:\n" -#| "\t/f[p|o|e|d|c|a|u|m|s|v] {package|product_code}\n" -#| "Uninstall a product:\n" -#| "\t/uninstall {package|product_code} [property]\n" -#| "\t/x {package|product_code} [property]\n" -#| "Advertise a product:\n" -#| "\t/j[u|m] package [/t transform] [/g languageid]\n" -#| "Apply a patch:\n" -#| "\t/p patch_package [property]\n" -#| "\t/p patch_package /a package [property]\n" -#| "Log and UI Modifiers for above commands:\n" -#| "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -#| "\t/q{|n|b|r|f|n+|b+|b-}\n" -#| "Register MSI Service:\n" -#| "\t/y\n" -#| "Unregister MSI Service:\n" -#| "\t/z\n" -#| "Display this help:\n" -#| "\t/help\n" -#| "\t/?\n" msgid "" "Windows Installer %s\n" "\n"

1 0

Hans Leidekker : fusion: Add a "v4.0_" prefix to version 4. 0 assembly directories.
by Alexandre Julliard May 23, 2012

May 23, 2012

Module: wine Branch: master Commit: 0b82e284013dafd20f14377dda38820f5645a9b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b82e284013dafd20f14377dd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 23 09:14:58 2012 +0200 fusion: Add a "v4.0_" prefix to version 4.0 assembly directories. --- dlls/fusion/asmcache.c | 10 ++++++++-- dlls/fusion/asmenum.c | 29 ++++++++++++++++------------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index 93047d4..1cba6f6 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -375,7 +375,10 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, LPCWSTR pszManifestFilePath, LPCFUSION_INSTALL_REFERENCE pRefData) { - static const WCHAR format[] = {'%','s','\\','%','s','\\','%','s','_','_','%','s','\\',0}; + static const WCHAR format[] = + {'%','s','\\','%','s','\\','%','s','_','_','%','s','\\',0}; + static const WCHAR format_v40[] = + {'%','s','\\','%','s','\\','v','4','.','0','_','%','s','_','_','%','s','\\',0}; static const WCHAR ext_exe[] = {'.','e','x','e',0}; static const WCHAR ext_dll[] = {'.','d','l','l',0}; IAssemblyCacheImpl *cache = impl_from_IAssemblyCache(iface); @@ -430,7 +433,10 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, architecture = assembly_get_architecture(assembly); get_assembly_directory(asmdir, MAX_PATH, clr_version, architecture); - sprintfW(path, format, asmdir, name, version, token); + if (!strcmp(clr_version, "v4.0.30319")) + sprintfW(path, format_v40, asmdir, name, version, token); + else + sprintfW(path, format, asmdir, name, version, token); create_full_path(path); diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index f4da88a..641ed2f 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -291,17 +291,6 @@ static void insert_assembly(struct list *assemblies, ASMNAME *to_insert) static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, int depth, LPWSTR path) { - WIN32_FIND_DATAW ffd; - WCHAR buf[MAX_PATH]; - WCHAR disp[MAX_PATH]; - WCHAR asmpath[MAX_PATH]; - ASMNAME *asmname; - HANDLE hfind; - LPWSTR ptr; - HRESULT hr = S_OK; - - static WCHAR parent[MAX_PATH]; - static const WCHAR dot[] = {'.',0}; static const WCHAR dotdot[] = {'.','.',0}; static const WCHAR search_fmt[] = {'%','s','\\','*',0}; @@ -311,6 +300,14 @@ static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, 'C','u','l','t','u','r','e','=','n','e','u','t','r','a','l',',',' ', 'P','u','b','l','i','c','K','e','y','T','o','k','e','n','=','%','s',0}; static const WCHAR ss_fmt[] = {'%','s','\\','%','s',0}; + static const WCHAR v40[] = {'v','4','.','0','_'}; + WIN32_FIND_DATAW ffd; + WCHAR buf[MAX_PATH], disp[MAX_PATH], asmpath[MAX_PATH]; + static WCHAR parent[MAX_PATH]; + ASMNAME *asmname; + HANDLE hfind; + WCHAR *ptr; + HRESULT hr = S_OK; if (name) parse_name(name, depth, path, buf); @@ -337,13 +334,19 @@ static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, } else if (depth == 1) { + unsigned int prefix_len = sizeof(v40)/sizeof(WCHAR); + const WCHAR *token, *version = ffd.cFileName; + sprintfW(asmpath, path_fmt, path, ffd.cFileName, parent); ptr = strstrW(ffd.cFileName, dblunder); *ptr = '\0'; - ptr += 2; + token = ptr + 2; + + if (strlenW(ffd.cFileName) >= prefix_len && + !memcmp(ffd.cFileName, v40, sizeof(v40))) version += prefix_len; - sprintfW(disp, fmt, parent, ffd.cFileName, ptr); + sprintfW(disp, fmt, parent, version, token); asmname = HeapAlloc(GetProcessHeap(), 0, sizeof(ASMNAME)); if (!asmname)

1 0

Christian Costa : d3drm: Material object is taken into account when a mesh references it.
by Alexandre Julliard May 23, 2012

May 23, 2012

Module: wine Branch: master Commit: 8f86a0bbddcb3b06a4b521df8f0c527501d34176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f86a0bbddcb3b06a4b521df8… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 22 22:05:40 2012 +0200 d3drm: Material object is taken into account when a mesh references it. --- dlls/d3drm/d3drm.c | 12 +----------- dlls/d3drm/tests/d3drm.c | 14 +++++++++++--- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index be7ba7f..923a05c 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1406,17 +1406,7 @@ static HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPI } else if (IsEqualGUID(guid, &TID_D3DRMMaterial)) { - TRACE("Found TID_D3DRMMaterial\n"); - - for (i = 0; i < nb_GUIDs; i++) - if (IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMaterial) || - IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMaterial2)) - requested = TRUE; - - if (requested) - { - FIXME("Processing material not supported yet\n"); - } + TRACE("Found TID_D3DRMMaterial => Will be taken into account when a mesh will reference it\n"); } else if (IsEqualGUID(guid, &TID_D3DRMFrameTransformMatrix)) { diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 4f7eed6..c0869be 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -165,6 +165,13 @@ static char data_d3drm_load[] = "{\n" " {Object1}\n" " {Object2}\n" +"}\n" +"Material\n" +"{\n" +" 0.1, 0.2, 0.3, 0.4;;\n" +" 0.5;\n" +" 0.6, 0.7, 0.8;;\n" +" 0.9, 1.0, 1.1;;\n" "}\n"; static void test_MeshBuilder(void) @@ -858,7 +865,8 @@ static const GUID* refiids[] = { &IID_IDirect3DRMMeshBuilder, &IID_IDirect3DRMMeshBuilder, - &IID_IDirect3DRMFrame + &IID_IDirect3DRMFrame, + &IID_IDirect3DRMMaterial /* Not taken into account and not notified */ }; static void __cdecl object_load_callback(LPDIRECT3DRMOBJECT object, REFIID objectguid, LPVOID arg) @@ -874,14 +882,14 @@ static void test_d3drm_load(void) HRESULT hr; LPDIRECT3DRM pD3DRM; D3DRMLOADMEMORY info; - const GUID* req_refiids[] = { &IID_IDirect3DRMMeshBuilder, &IID_IDirect3DRMFrame }; + const GUID* req_refiids[] = { &IID_IDirect3DRMMeshBuilder, &IID_IDirect3DRMFrame, &IID_IDirect3DRMMaterial }; hr = pDirect3DRMCreate(&pD3DRM); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); info.lpMemory = data_d3drm_load; info.dSize = strlen(data_d3drm_load); - hr = IDirect3DRM_Load(pD3DRM, &info, NULL, (GUID**)req_refiids, 2, D3DRMLOAD_FROMMEMORY, object_load_callback, (LPVOID)0xdeadbeef, NULL, NULL, NULL); + hr = IDirect3DRM_Load(pD3DRM, &info, NULL, (GUID**)req_refiids, 3, D3DRMLOAD_FROMMEMORY, object_load_callback, (LPVOID)0xdeadbeef, NULL, NULL, NULL); ok(hr == D3DRM_OK, "Cannot load data (hr = %x)\n", hr); ok(nb_objects == 3, "Should have loaded 3 objects (got %d)\n", nb_objects);

1 0

Christian Costa : d3drm: Implement IDirect3DRMXImpl_CreateMaterial.
by Alexandre Julliard May 23, 2012

May 23, 2012

Module: wine Branch: master Commit: a442fcc9c62ec07d9bcb408483454016061dd129 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a442fcc9c62ec07d9bcb40848… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 22 22:05:32 2012 +0200 d3drm: Implement IDirect3DRMXImpl_CreateMaterial. --- dlls/d3drm/d3drm.c | 28 +++++++++++++++++----------- dlls/d3drm/d3drm_private.h | 1 + 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 292be71..be7ba7f 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -221,13 +221,13 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateLightRGB(IDirect3DRM* iface, D3DRMLI return IDirect3DRM3_CreateLightRGB(&This->IDirect3DRM3_iface, type, red, green, blue, Light); } -static HRESULT WINAPI IDirect3DRMImpl_CreateMaterial(IDirect3DRM* iface, D3DVALUE m, LPDIRECT3DRMMATERIAL * ppMaterial) +static HRESULT WINAPI IDirect3DRMImpl_CreateMaterial(IDirect3DRM* iface, D3DVALUE power, LPDIRECT3DRMMATERIAL * material) { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - FIXME("(%p/%p)->(%f,%p): stub\n", iface, This, m, ppMaterial); + TRACE("(%p/%p)->(%f,%p)\n", iface, This, power, material); - return E_NOTIMPL; + return IDirect3DRM3_CreateMaterial(&This->IDirect3DRM3_iface, power, (LPDIRECT3DRMMATERIAL2*)material); } static HRESULT WINAPI IDirect3DRMImpl_CreateDevice(IDirect3DRM* iface, DWORD width, DWORD height, LPDIRECT3DRMDEVICE * ppDevice) @@ -593,14 +593,14 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateLightRGB(IDirect3DRM2* iface, D3DRM return IDirect3DRM3_CreateLightRGB(&This->IDirect3DRM3_iface, type, red, green, blue, Light); } -static HRESULT WINAPI IDirect3DRM2Impl_CreateMaterial(IDirect3DRM2* iface, D3DVALUE m, - LPDIRECT3DRMMATERIAL * ppMaterial) +static HRESULT WINAPI IDirect3DRM2Impl_CreateMaterial(IDirect3DRM2* iface, D3DVALUE power, + LPDIRECT3DRMMATERIAL * material) { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - FIXME("(%p/%p)->(%f,%p): stub\n", iface, This, m, ppMaterial); + TRACE("(%p/%p)->(%f,%p)\n", iface, This, power, material); - return E_NOTIMPL; + return IDirect3DRM3_CreateMaterial(&This->IDirect3DRM3_iface, power, (LPDIRECT3DRMMATERIAL2*)material); } static HRESULT WINAPI IDirect3DRM2Impl_CreateDevice(IDirect3DRM2* iface, DWORD width, DWORD height, @@ -1036,14 +1036,20 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateLightRGB(IDirect3DRM3* iface, D3DRM return ret; } -static HRESULT WINAPI IDirect3DRM3Impl_CreateMaterial(IDirect3DRM3* iface, D3DVALUE m, - LPDIRECT3DRMMATERIAL2* Material) +static HRESULT WINAPI IDirect3DRM3Impl_CreateMaterial(IDirect3DRM3* iface, D3DVALUE power, + LPDIRECT3DRMMATERIAL2* material) { IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); + HRESULT ret; - FIXME("(%p/%p)->(%f,%p): stub\n", iface, This, m, Material); + TRACE("(%p/%p)->(%f,%p)\n", iface, This, power, material); - return E_NOTIMPL; + ret = Direct3DRMMaterial_create(material); + + if (SUCCEEDED(ret)) + IDirect3DRMMaterial2_SetPower(*material, power); + + return ret; } static HRESULT WINAPI IDirect3DRM3Impl_CreateDevice(IDirect3DRM3* iface, DWORD width, DWORD height, diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index aabb878..ae56124 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -30,6 +30,7 @@ HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent_frame, IUnknown** r HRESULT Direct3DRMLight_create(IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMMeshBuilder_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMViewport_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; +HRESULT Direct3DRMMaterial_create(IDirect3DRMMaterial2** ret_iface) DECLSPEC_HIDDEN; HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) DECLSPEC_HIDDEN;

1 0

Eric Pouech : winedbg: In the gdb remote protocol implementation, correctly manage the size of registers on the wire (esp. for 64bit ones).
by Alexandre Julliard May 23, 2012

May 23, 2012

Module: wine Branch: master Commit: e9eab7bbfc1457ec6bf90a92977aa9484bf6c741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9eab7bbfc1457ec6bf90a929… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue May 22 21:52:03 2012 +0200 winedbg: In the gdb remote protocol implementation, correctly manage the size of registers on the wire (esp. for 64bit ones). --- programs/winedbg/gdbproxy.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 08210e0..58b2202 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1531,6 +1531,7 @@ static enum packet_return packet_read_register(struct gdb_context* gdbctx) if (gdbctx->trace & GDBPXY_TRC_COMMAND) fprintf(stderr, "Read register %x => %08x%08x\n", reg, (unsigned)(cpu_register(pctx, reg) >> 32), (unsigned)cpu_register(pctx, reg)); + packet_reply_open(gdbctx); packet_reply_register_hex_to(gdbctx, reg); packet_reply_close(gdbctx); return packet_done;

1 0

Christian Costa : d3drm: Set vertices data of the created mesh.
by Alexandre Julliard May 23, 2012

May 23, 2012

Module: wine Branch: master Commit: 63f39c9196f57b76bd0aa050990011500a979a58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63f39c9196f57b76bd0aa0509… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 22 22:05:07 2012 +0200 d3drm: Set vertices data of the created mesh. --- dlls/d3drm/meshbuilder.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 9b5e2cc..4d4da0f 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1856,10 +1856,28 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuil } hr = IDirect3DRMMesh_AddGroup(*mesh, This->nb_vertices, This->nb_faces, 0, face_data, &group); + HeapFree(GetProcessHeap(), 0, face_data); + if (SUCCEEDED(hr)) + { + D3DRMVERTEX* vertices; + + vertices = HeapAlloc(GetProcessHeap(), 0, This->nb_vertices * sizeof(D3DRMVERTEX)); + if (vertices) + { + for (i = 0; i < This->nb_vertices; i++) + { + vertices[i].position = This->pVertices[i]; + } + hr = IDirect3DRMMesh_SetVertices(*mesh, 0, 0, This->nb_vertices, vertices); + HeapFree(GetProcessHeap(), 0, vertices); + } + else + { + hr = E_OUTOFMEMORY; + } + } if (FAILED(hr)) IDirect3DRMMesh_Release(*mesh); - - HeapFree(GetProcessHeap(), 0, face_data); } return hr;

1 0

Christian Costa : d3drm: Fix method name Material to CreateMaterial.
by Alexandre Julliard May 23, 2012

May 23, 2012

Module: wine Branch: master Commit: bbbe6d3e71fbded910d7e6476cb7ecc4f539dfde URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbbe6d3e71fbded910d7e6476… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 22 22:05:16 2012 +0200 d3drm: Fix method name Material to CreateMaterial. --- dlls/d3drm/d3drm.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 31edd46..292be71 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -221,7 +221,7 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateLightRGB(IDirect3DRM* iface, D3DRMLI return IDirect3DRM3_CreateLightRGB(&This->IDirect3DRM3_iface, type, red, green, blue, Light); } -static HRESULT WINAPI IDirect3DRMImpl_Material(IDirect3DRM* iface, D3DVALUE m, LPDIRECT3DRMMATERIAL * ppMaterial) +static HRESULT WINAPI IDirect3DRMImpl_CreateMaterial(IDirect3DRM* iface, D3DVALUE m, LPDIRECT3DRMMATERIAL * ppMaterial) { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); @@ -446,7 +446,7 @@ static const struct IDirect3DRMVtbl Direct3DRM_Vtbl = IDirect3DRMImpl_CreateTexture, IDirect3DRMImpl_CreateLight, IDirect3DRMImpl_CreateLightRGB, - IDirect3DRMImpl_Material, + IDirect3DRMImpl_CreateMaterial, IDirect3DRMImpl_CreateDevice, IDirect3DRMImpl_CreateDeviceFromSurface, IDirect3DRMImpl_CreateDeviceFromD3D, @@ -593,8 +593,8 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateLightRGB(IDirect3DRM2* iface, D3DRM return IDirect3DRM3_CreateLightRGB(&This->IDirect3DRM3_iface, type, red, green, blue, Light); } -static HRESULT WINAPI IDirect3DRM2Impl_Material(IDirect3DRM2* iface, D3DVALUE m, - LPDIRECT3DRMMATERIAL * ppMaterial) +static HRESULT WINAPI IDirect3DRM2Impl_CreateMaterial(IDirect3DRM2* iface, D3DVALUE m, + LPDIRECT3DRMMATERIAL * ppMaterial) { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); @@ -871,7 +871,7 @@ static const struct IDirect3DRM2Vtbl Direct3DRM2_Vtbl = IDirect3DRM2Impl_CreateTexture, IDirect3DRM2Impl_CreateLight, IDirect3DRM2Impl_CreateLightRGB, - IDirect3DRM2Impl_Material, + IDirect3DRM2Impl_CreateMaterial, IDirect3DRM2Impl_CreateDevice, IDirect3DRM2Impl_CreateDeviceFromSurface, IDirect3DRM2Impl_CreateDeviceFromD3D, @@ -1036,8 +1036,8 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateLightRGB(IDirect3DRM3* iface, D3DRM return ret; } -static HRESULT WINAPI IDirect3DRM3Impl_Material(IDirect3DRM3* iface, D3DVALUE m, - LPDIRECT3DRMMATERIAL2* Material) +static HRESULT WINAPI IDirect3DRM3Impl_CreateMaterial(IDirect3DRM3* iface, D3DVALUE m, + LPDIRECT3DRMMATERIAL2* Material) { IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); @@ -1646,7 +1646,7 @@ static const struct IDirect3DRM3Vtbl Direct3DRM3_Vtbl = IDirect3DRM3Impl_CreateTexture, IDirect3DRM3Impl_CreateLight, IDirect3DRM3Impl_CreateLightRGB, - IDirect3DRM3Impl_Material, + IDirect3DRM3Impl_CreateMaterial, IDirect3DRM3Impl_CreateDevice, IDirect3DRM3Impl_CreateDeviceFromSurface, IDirect3DRM3Impl_CreateDeviceFromD3D,

1 0

Henri Verbeet : ddraw/tests: Add a helper function to setup execute buffers .
by Alexandre Julliard May 23, 2012

May 23, 2012

Module: wine Branch: master Commit: 89d561e6f8b4d27d00ad09d835feb9554db27df0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89d561e6f8b4d27d00ad09d83… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 23 18:14:30 2012 +0200 ddraw/tests: Add a helper function to setup execute buffers. --- dlls/ddraw/tests/ddraw1.c | 40 +++++++++++++++++----------------------- 1 files changed, 17 insertions(+), 23 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index b5c50c5..158f92d 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -186,6 +186,20 @@ static void emit_end(void **ptr) *ptr = inst + 1; } +static void set_execute_data(IDirect3DExecuteBuffer *execute_buffer, UINT vertex_count, UINT offset, UINT len) +{ + D3DEXECUTEDATA exec_data; + HRESULT hr; + + memset(&exec_data, 0, sizeof(exec_data)); + exec_data.dwSize = sizeof(exec_data); + exec_data.dwVertexCount = vertex_count; + exec_data.dwInstructionOffset = offset; + exec_data.dwInstructionLength = len; + hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data); + ok(SUCCEEDED(hr), "Failed to set execute data, hr %#x.\n", hr); +} + static HRESULT CALLBACK enum_z_fmt(GUID *guid, char *description, char *name, D3DDEVICEDESC *hal_desc, D3DDEVICEDESC *hel_desc, void *ctx) { @@ -997,7 +1011,6 @@ static void test_zenable(void) D3DEXECUTEBUFFERDESC exec_desc; IDirect3DMaterial *background; IDirect3DViewport *viewport; - D3DEXECUTEDATA exec_data; IDirect3DDevice *device; IDirectDrawSurface *rt; IDirectDraw *ddraw; @@ -1050,18 +1063,11 @@ static void test_zenable(void) hr = IDirect3DExecuteBuffer_Unlock(execute_buffer); ok(SUCCEEDED(hr), "Failed to unlock execute buffer, hr %#x.\n", hr); - memset(&exec_data, 0, sizeof(exec_data)); - exec_data.dwSize = sizeof(exec_data); - exec_data.dwVertexCount = 4; - exec_data.dwInstructionOffset = sizeof(tquad); - exec_data.dwInstructionLength = inst_length; - hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data); - ok(SUCCEEDED(hr), "Failed to set execute data, hr %#x.\n", hr); - hr = IDirect3DViewport_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); hr = IDirect3DDevice_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + set_execute_data(execute_buffer, 4, sizeof(tquad), inst_length); hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED); ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#x.\n", hr); hr = IDirect3DDevice_EndScene(device); @@ -1197,7 +1203,6 @@ static void test_ck_rgba(void) for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) { UINT draw1_len, draw2_len; - D3DEXECUTEDATA exec_data; void *ptr; hr = IDirect3DExecuteBuffer_Lock(execute_buffer, &exec_desc); @@ -1227,18 +1232,11 @@ static void test_ck_rgba(void) hr = IDirectDrawSurface_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Failed to fill texture, hr %#x.\n", hr); - memset(&exec_data, 0, sizeof(exec_data)); - exec_data.dwSize = sizeof(exec_data); - exec_data.dwVertexCount = 8; - exec_data.dwInstructionOffset = sizeof(tquad); - exec_data.dwInstructionLength = draw1_len; - hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data); - ok(SUCCEEDED(hr), "Failed to set execute data, hr %#x.\n", hr); - hr = IDirect3DViewport_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER); ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); hr = IDirect3DDevice_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + set_execute_data(execute_buffer, 8, sizeof(tquad), draw1_len); hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED); ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#x.\n", hr); hr = IDirect3DDevice_EndScene(device); @@ -1256,13 +1254,9 @@ static void test_ck_rgba(void) hr = IDirectDrawSurface_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Failed to fill texture, hr %#x.\n", hr); - exec_data.dwInstructionOffset = sizeof(tquad) + draw1_len; - exec_data.dwInstructionLength = draw2_len; - hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data); - ok(SUCCEEDED(hr), "Failed to set execute data, hr %#x.\n", hr); - hr = IDirect3DDevice_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + set_execute_data(execute_buffer, 8, sizeof(tquad) + draw1_len, draw2_len); hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED); ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#x.\n", hr); hr = IDirect3DDevice_EndScene(device);

1 0

Józef Kucia : d3d8: Return D3DERR_INVALIDCALL when IDirect3DCubeTexture8:: GetCubeMapSurface is called with invalid level.
by Alexandre Julliard May 23, 2012

May 23, 2012

Module: wine Branch: master Commit: 707c3559a209441b1e585b46d41eafc0c18b7ba8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=707c3559a209441b1e585b46d… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue May 22 22:19:32 2012 +0200 d3d8: Return D3DERR_INVALIDCALL when IDirect3DCubeTexture8::GetCubeMapSurface is called with invalid level. --- dlls/d3d8/texture.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 6b5f95c..14f8207 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -656,11 +656,19 @@ static HRESULT WINAPI d3d8_texture_cube_GetCubeMapSurface(IDirect3DCubeTexture8 struct wined3d_resource *sub_resource; struct d3d8_surface *surface_impl; UINT sub_resource_idx; + DWORD level_count; TRACE("iface %p, face %#x, level %u, surface %p.\n", iface, face, level, surface); wined3d_mutex_lock(); - sub_resource_idx = wined3d_texture_get_level_count(texture->wined3d_texture) * face + level; + level_count = wined3d_texture_get_level_count(texture->wined3d_texture); + if (level >= level_count) + { + wined3d_mutex_unlock(); + return D3DERR_INVALIDCALL; + } + + sub_resource_idx = level_count * face + level; if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, sub_resource_idx))) { wined3d_mutex_unlock();

1 0