wine-commits June 2017

wine-commits@winehq.org

2 participants
595 discussions

Francois Gouget : configure: Set PKG_CONFIG_PATH to get the right settings for the target host.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 20d41d9e2810696ca38598abcef6da8e77f9aae7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20d41d9e2810696ca38598abc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 7 11:25:36 2017 +0200 configure: Set PKG_CONFIG_PATH to get the right settings for the target host. Ideally we would use the right <triplet>-pkg-config tool for the target host. However Red Hat and SUSE respectively add '-redhat' and '-suse' to the triplet which makes it hard to find the right tool. Furthermore on Debian and derivatives a lot of development packages do not support multiarch so that the required .pc files would not be found. Setting PKG_CONFIG_PATH side-steps the non-standard Red Hat and SUSE triplets. It also lets pkg-config fall back to the 'wrong' .pc files on Debian which is fine in most cases, while using the right one in cases where it matters (GStreamer 1.0), assuming they are actually present. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 2 ++ 2 files changed, 4 insertions(+) diff --git a/configure b/configure index d17ff5e..d12d186 100755 --- a/configure +++ b/configure @@ -5138,6 +5138,8 @@ rm -f core conftest.err conftest.$ac_objext \ notice_platform="32-bit " TARGETFLAGS="-m32" + PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig} + export PKG_CONFIG_PATH enable_win16=${enable_win16:-yes} else if test "x${GCC}" = "xyes" diff --git a/configure.ac b/configure.ac index 129a8f6..d5e9456 100644 --- a/configure.ac +++ b/configure.ac @@ -151,6 +151,8 @@ case $host in host_cpu="i386" notice_platform="32-bit " AC_SUBST(TARGETFLAGS,"-m32") + PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig} + export PKG_CONFIG_PATH enable_win16=${enable_win16:-yes} else if test "x${GCC}" = "xyes"

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 2b03d20759ef086c229848a192d071764c59d8aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b03d20759ef086c229848a19… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Jun 8 16:25:46 2017 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 60 ++++++++++++++++++++---------------------------------------- 1 file changed, 20 insertions(+), 40 deletions(-) diff --git a/po/fi.po b/po/fi.po index b4895b2..b159f47 100644 --- a/po/fi.po +++ b/po/fi.po @@ -350,7 +350,7 @@ msgstr "&Nollaa" #: progman.rc:202 progman.rc:219 regedit.rc:77 taskmgr.rc:87 winefile.rc:82 #: winemine.rc:51 winhlp32.rc:57 wordpad.rc:102 msgid "&Help" -msgstr "&Apua" +msgstr "&Ohje" #: comctl32.rc:97 msgid "Move &Up" @@ -10257,7 +10257,7 @@ msgstr "Syntaksivirhe\n" #: cmd.rc:365 msgid "No help available for %1\n" -msgstr "Apua ei saatavilla %1:lle\n" +msgstr "Ei ohjetta %1:lle\n" #: cmd.rc:366 msgid "Target to GOTO not found\n" @@ -10995,7 +10995,7 @@ msgstr "&Järjestelmän asetukset" #: oleview.rc:36 msgid "&Run the Registry Editor" -msgstr "&Aja rekisterieditori" +msgstr "Aja &Rekisterieditori" #: oleview.rc:42 msgid "&CoCreateInstance Flag" @@ -11502,7 +11502,7 @@ msgstr "" #: progman.rc:77 msgid "Help not available." -msgstr "Apua ei saatavilla." +msgstr "Ohjetta ei saatavilla." #: progman.rc:78 msgid "Unknown feature in %s" @@ -11548,7 +11548,7 @@ msgstr "" "Tuetut toiminnot:\n" " ADD, DELETE, QUERY\n" "\n" -"Tietystä toiminnosta saa apua komennolla\n" +"Ohjeen kustakin toiminnosta saa komennolla\n" " REG [toiminto] /?\n" "\n" @@ -11663,11 +11663,11 @@ msgstr "reg: Valitsin [%1] ei kelpaa. " #: reg.rc:63 msgid "Type \"REG /?\" for help.\n" -msgstr "Komennolla \"REG /?\" saat apua.\n" +msgstr "Komento \"REG /?\" näyttää ohjeen.\n" #: reg.rc:64 msgid "Type \"REG %1 /?\" for help.\n" -msgstr "Komennolla \"REG %1 /?\" saat apua.\n" +msgstr "Komento \"REG %1 /?\" näyttää ohjeen.\n" #: reg.rc:65 regedit.rc:239 msgid "(value not set)" @@ -11739,17 +11739,15 @@ msgstr "&Poista suosikki..." #: regedit.rc:80 msgid "&About Registry Editor" -msgstr "&Tietoja rekisterieditorista" +msgstr "&Tietoja Rekisterieditorista" #: regedit.rc:89 regedit.rc:96 regedit.rc:229 msgid "Expand" msgstr "Laajenna" #: regedit.rc:134 regedit.rc:232 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." -msgstr "Muuta binääridataa..." +msgstr "Muuta &binääridataa..." #: regedit.rc:266 msgid "Export registry" @@ -11848,14 +11846,10 @@ msgid "Contains commands for accessing frequently used keys" msgstr "Sisältää komentoja, joilla pääsee usein käytettyihin avaimiin" #: regedit.rc:163 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" msgstr "" -"Sisältää komentoja, joilla saa apua ja tietoja koko rekisterieditorista" +"Sisältää komennot, jotka näyttävät ohjeen ja tietoja Rekisterieditorista" #: regedit.rc:164 msgid "Contains commands for creating new keys or values" @@ -12004,7 +11998,7 @@ msgstr "regedit: Virheellinen tai tuntematon valitsin [%1]\n" #: regedit.rc:409 msgid "Type \"regedit /?\" for help.\n" -msgstr "Komennolla \"regedit /?\" saat apua.\n" +msgstr "Komento \"regedit /?\" näyttää ohjeen.\n" #: regedit.rc:410 msgid "regedit: No filename was specified.\n" @@ -12092,10 +12086,8 @@ msgid "regedit: The line contains invalid syntax.\n" msgstr "regedit: Rivin syntaksi on virheellinen.\n" #: regedit.rc:187 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" -msgstr "Sulkee rekisterieditorin" +msgstr "Sulkee Rekisterieditorin" #: regedit.rc:188 msgid "Adds keys to the favorites list" @@ -12110,10 +12102,8 @@ msgid "Shows or hides the status bar" msgstr "Näyttää tai piilottaa tilapalkin" #: regedit.rc:191 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" -msgstr "Muuta kahden kehyksen erottimen paikkaa" +msgstr "Muuttaa kahden kehyksen erottimen paikkaa" #: regedit.rc:192 msgid "Refreshes the window" @@ -12156,10 +12146,8 @@ msgid "Adds a new binary value" msgstr "Lisää uuden binääriarvon" #: regedit.rc:174 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "Lisää uuden binääriarvon" +msgstr "Lisää uuden 32-bittisen arvon" #: regedit.rc:177 msgid "Imports a text file into the registry" @@ -12174,10 +12162,8 @@ msgid "Prints all or part of the registry" msgstr "Tulostaa koko rekisterin tai osan siitä" #: regedit.rc:181 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "Rekisterieditori" +msgstr "Avaa Rekisterieditorin Ohjeen" #: regedit.rc:182 msgid "Displays program information, version number and copyright" @@ -12220,26 +12206,20 @@ msgid "Unable to query the registry key '%1'." msgstr "Rekisteriavaimen '%1' hakeminen ei onnistu." #: regedit.rc:170 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "Muokkaa arvon dataa" +msgstr "Muokkaa arvon dataa binäärimuodossa" #: regedit.rc:175 msgid "Adds a new multi-string value" msgstr "Lisää uuden monen merkkijonon arvon" #: regedit.rc:198 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" msgstr "Vie rekisterin valitun haaran tekstitiedostoon" #: regedit.rc:176 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "Lisää uuden merkkijonon arvon" +msgstr "Lisää uuden laajennettavan merkkijonoarvon" #: regedit.rc:211 msgid "Confirm Key Delete" @@ -14509,7 +14489,7 @@ msgstr "Suuri" #: winhlp32.rc:58 msgid "&Help on help\tF1" -msgstr "Apua &Ohjeeseen\tF1" +msgstr "&Ohjeen ohje\tF1" #: winhlp32.rc:59 msgid "&About Wine Help" @@ -14971,11 +14951,11 @@ msgstr "Wordpadin käynnistys epäonnistui" #: xcopy.rc:30 msgid "Invalid number of parameters - Use xcopy /? for help\n" -msgstr "Parametrien määrä ei kelpaa - Komennolla xcopy /? saat apua\n" +msgstr "Parametrien määrä ei kelpaa - Komento xcopy /? näyttää ohjeen\n" #: xcopy.rc:31 msgid "Invalid parameter '%1' - Use xcopy /? for help\n" -msgstr "Virheellinen parametri '%1' - Komennolla xcopy /? saat apua\n" +msgstr "Virheellinen parametri '%1' - Komento xcopy /? näyttää ohjeen\n" #: xcopy.rc:32 msgid "Press <Enter> to begin copying\n"

1 0

Nikolay Sivov : d3drm: Implement AddNormal() for mesh builder.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 79b474425af3a4d99001e994deb99711d423ba80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79b474425af3a4d99001e994d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 8 10:46:18 2017 +0300 d3drm: Implement AddNormal() for mesh builder. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/meshbuilder.c | 57 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 19 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index a2e4b6b..647520d 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -72,8 +72,9 @@ struct d3drm_mesh_builder SIZE_T nb_vertices; SIZE_T vertices_size; D3DVECTOR *vertices; - DWORD nb_normals; - D3DVECTOR* pNormals; + SIZE_T nb_normals; + SIZE_T normals_size; + D3DVECTOR *normals; DWORD nb_faces; DWORD face_data_size; void *pFaceData; @@ -365,9 +366,10 @@ static void clean_mesh_builder_data(struct d3drm_mesh_builder *mesh_builder) mesh_builder->vertices = NULL; mesh_builder->nb_vertices = 0; mesh_builder->vertices_size = 0; - HeapFree(GetProcessHeap(), 0, mesh_builder->pNormals); - mesh_builder->pNormals = NULL; + HeapFree(GetProcessHeap(), 0, mesh_builder->normals); + mesh_builder->normals = NULL; mesh_builder->nb_normals = 0; + mesh_builder->normals_size = 0; HeapFree(GetProcessHeap(), 0, mesh_builder->pFaceData); mesh_builder->pFaceData = NULL; mesh_builder->face_data_size = 0; @@ -776,7 +778,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_GetVertices(IDirect3DRMMeshBuilder2 *i if (normal_count) *normal_count = mesh_builder->nb_normals; if (normals && mesh_builder->nb_normals) - memcpy(normals, mesh_builder->pNormals, mesh_builder->nb_normals * sizeof(*normals)); + memcpy(normals, mesh_builder->normals, mesh_builder->nb_normals * sizeof(*normals)); if (face_data && (!face_data_size || (*face_data_size < mesh_builder->face_data_size))) return D3DRMERR_BADVALUE; @@ -812,9 +814,11 @@ static int WINAPI d3drm_mesh_builder2_AddVertex(IDirect3DRMMeshBuilder2 *iface, static int WINAPI d3drm_mesh_builder2_AddNormal(IDirect3DRMMeshBuilder2 *iface, D3DVALUE x, D3DVALUE y, D3DVALUE z) { - FIXME("iface %p, x %.8e, y %.8e, z %.8e stub!\n", iface, x, y, z); + struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface); - return 0; + TRACE("iface %p, x %.8e, y %.8e, z %.8e.\n", iface, x, y, z); + + return IDirect3DRMMeshBuilder3_AddNormal(&mesh_builder->IDirect3DRMMeshBuilder3_iface, x, y, z); } static HRESULT WINAPI d3drm_mesh_builder2_CreateFace(IDirect3DRMMeshBuilder2 *iface, IDirect3DRMFace **face) @@ -1164,12 +1168,17 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, mesh_builder->nb_normals = *(DWORD*)ptr; nb_faces_normals = *(DWORD*)(ptr + sizeof(DWORD) + mesh_builder->nb_normals * sizeof(D3DVECTOR)); - TRACE("MeshNormals: nb_normals = %d, nb_faces_normals = %d\n", mesh_builder->nb_normals, nb_faces_normals); + TRACE("MeshNormals: nb_normals = %lu, nb_faces_normals = %d\n", mesh_builder->nb_normals, nb_faces_normals); if (nb_faces_normals != mesh_builder->nb_faces) - WARN("nb_face_normals (%d) != nb_faces (%d)\n", nb_faces_normals, mesh_builder->nb_normals); + WARN("nb_face_normals (%d) != nb_faces (%d)\n", nb_faces_normals, mesh_builder->nb_faces); - mesh_builder->pNormals = HeapAlloc(GetProcessHeap(), 0, mesh_builder->nb_normals * sizeof(D3DVECTOR)); - memcpy(mesh_builder->pNormals, ptr + sizeof(DWORD), mesh_builder->nb_normals * sizeof(D3DVECTOR)); + if (!d3drm_array_reserve((void **)&mesh_builder->normals, &mesh_builder->normals_size, + mesh_builder->nb_normals, sizeof(*mesh_builder->normals))) + { + hr = E_OUTOFMEMORY; + goto end; + } + memcpy(mesh_builder->normals, ptr + sizeof(DWORD), mesh_builder->nb_normals * sizeof(D3DVECTOR)); faces_normal_idx_size = size - (2 * sizeof(DWORD) + mesh_builder->nb_normals * sizeof(D3DVECTOR)); faces_normal_idx_ptr = faces_normal_idx_data = HeapAlloc(GetProcessHeap(), 0, faces_normal_idx_size); @@ -1187,7 +1196,6 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, mesh_builder->pCoords2d = HeapAlloc(GetProcessHeap(), 0, mesh_builder->nb_coords2d * sizeof(*mesh_builder->pCoords2d)); memcpy(mesh_builder->pCoords2d, ptr + sizeof(DWORD), mesh_builder->nb_coords2d * sizeof(*mesh_builder->pCoords2d)); - } else if (IsEqualGUID(guid, &TID_D3DRMMeshMaterialList)) { @@ -1378,9 +1386,10 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, if (!mesh_builder->nb_normals) { /* Allocate normals, one per vertex */ - mesh_builder->pNormals = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mesh_builder->nb_vertices * sizeof(D3DVECTOR)); - if (!mesh_builder->pNormals) + if (!d3drm_array_reserve((void **)&mesh_builder->normals, &mesh_builder->normals_size, + mesh_builder->nb_vertices, sizeof(*mesh_builder->normals))) goto end; + memset(mesh_builder->normals, 0, mesh_builder->nb_vertices * sizeof(*mesh_builder->normals)); } for (i = 0; i < mesh_builder->nb_faces; i++) @@ -1444,7 +1453,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, } *(faces_data_ptr + faces_data_size++) = vertex_idx; /* Add face normal to vertex normal */ - D3DRMVectorAdd(&mesh_builder->pNormals[vertex_idx], &mesh_builder->pNormals[vertex_idx], &face_normal); + D3DRMVectorAdd(&mesh_builder->normals[vertex_idx], &mesh_builder->normals[vertex_idx], &face_normal); } faces_vertex_idx_ptr++; } @@ -1462,7 +1471,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, /* Normalize all normals */ for (i = 0; i < mesh_builder->nb_vertices; i++) { - D3DRMVectorNormalize(&mesh_builder->pNormals[i]); + D3DRMVectorNormalize(&mesh_builder->normals[i]); } mesh_builder->nb_normals = mesh_builder->nb_vertices; } @@ -1907,9 +1916,19 @@ static int WINAPI d3drm_mesh_builder3_AddVertex(IDirect3DRMMeshBuilder3 *iface, static int WINAPI d3drm_mesh_builder3_AddNormal(IDirect3DRMMeshBuilder3 *iface, D3DVALUE x, D3DVALUE y, D3DVALUE z) { - FIXME("iface %p, x %.8e, y %.8e, z %.8e stub!\n", iface, x, y, z); + struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface); - return 0; + TRACE("iface %p, x %.8e, y %.8e, z %.8e.\n", iface, x, y, z); + + if (!d3drm_array_reserve((void **)&mesh_builder->normals, &mesh_builder->normals_size, + mesh_builder->nb_normals + 1, sizeof(*mesh_builder->normals))) + return 0; + + mesh_builder->normals[mesh_builder->nb_normals].u1.x = x; + mesh_builder->normals[mesh_builder->nb_normals].u2.y = y; + mesh_builder->normals[mesh_builder->nb_normals].u3.z = z; + + return mesh_builder->nb_normals++; } static HRESULT WINAPI d3drm_mesh_builder3_CreateFace(IDirect3DRMMeshBuilder3 *iface, IDirect3DRMFace2 **face) @@ -2263,7 +2282,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetNormals(IDirect3DRMMeshBuilder3 *if if (normal_count) *normal_count = count; if (normals && mesh_builder->nb_normals) - memcpy(normals, mesh_builder->pNormals + start_idx, count * sizeof(*normals)); + memcpy(normals, &mesh_builder->normals[start_idx], count * sizeof(*normals)); return D3DRM_OK; }

1 0

Nikolay Sivov : d3drm: Implement AddVertex() for mesh builder.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 837ddde132ac5fabc2fd584dbcc9fe97c05d3a4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=837ddde132ac5fabc2fd584db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 8 10:46:17 2017 +0300 d3drm: Implement AddVertex() for mesh builder. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/meshbuilder.c | 91 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 71 insertions(+), 20 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index deaab1c..a2e4b6b 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -69,8 +69,9 @@ struct d3drm_mesh_builder IDirect3DRMMeshBuilder3 IDirect3DRMMeshBuilder3_iface; LONG ref; char* name; - DWORD nb_vertices; - D3DVECTOR* pVertices; + SIZE_T nb_vertices; + SIZE_T vertices_size; + D3DVECTOR *vertices; DWORD nb_normals; D3DVECTOR* pNormals; DWORD nb_faces; @@ -307,6 +308,38 @@ char templates[] = { "}" }; +static BOOL d3drm_array_reserve(void **elements, SIZE_T *capacity, SIZE_T element_count, SIZE_T element_size) +{ + SIZE_T new_capacity, max_capacity; + void *new_elements; + + if (element_count <= *capacity) + return TRUE; + + max_capacity = ~(SIZE_T)0 / element_size; + if (max_capacity < element_count) + return FALSE; + + new_capacity = max(*capacity, 4); + while (new_capacity < element_count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + + if (new_capacity < element_count) + new_capacity = max_capacity; + + if (*elements) + new_elements = HeapReAlloc(GetProcessHeap(), 0, *elements, new_capacity * element_size); + else + new_elements = HeapAlloc(GetProcessHeap(), 0, new_capacity * element_size); + + if (!new_elements) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + return TRUE; +} + static inline struct d3drm_mesh *impl_from_IDirect3DRMMesh(IDirect3DRMMesh *iface) { return CONTAINING_RECORD(iface, struct d3drm_mesh, IDirect3DRMMesh_iface); @@ -328,9 +361,10 @@ static void clean_mesh_builder_data(struct d3drm_mesh_builder *mesh_builder) HeapFree(GetProcessHeap(), 0, mesh_builder->name); mesh_builder->name = NULL; - HeapFree(GetProcessHeap(), 0, mesh_builder->pVertices); - mesh_builder->pVertices = NULL; + HeapFree(GetProcessHeap(), 0, mesh_builder->vertices); + mesh_builder->vertices = NULL; mesh_builder->nb_vertices = 0; + mesh_builder->vertices_size = 0; HeapFree(GetProcessHeap(), 0, mesh_builder->pNormals); mesh_builder->pNormals = NULL; mesh_builder->nb_normals = 0; @@ -735,7 +769,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_GetVertices(IDirect3DRMMeshBuilder2 *i if (vertex_count) *vertex_count = mesh_builder->nb_vertices; if (vertices && mesh_builder->nb_vertices) - memcpy(vertices, mesh_builder->pVertices, mesh_builder->nb_vertices * sizeof(*vertices)); + memcpy(vertices, mesh_builder->vertices, mesh_builder->nb_vertices * sizeof(*vertices)); if (normals && (!normal_count || (*normal_count < mesh_builder->nb_normals))) return D3DRMERR_BADVALUE; @@ -768,9 +802,11 @@ static HRESULT WINAPI d3drm_mesh_builder2_GetTextureCoordinates(IDirect3DRMMeshB static int WINAPI d3drm_mesh_builder2_AddVertex(IDirect3DRMMeshBuilder2 *iface, D3DVALUE x, D3DVALUE y, D3DVALUE z) { - FIXME("iface %p, x %.8e, y %.8e, z %.8e stub!\n", iface, x, y, z); + struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface); - return 0; + TRACE("iface %p, x %.8e, y %.8e, z %.8e.\n", iface, x, y, z); + + return IDirect3DRMMeshBuilder3_AddVertex(&mesh_builder->IDirect3DRMMeshBuilder3_iface, x, y, z); } static int WINAPI d3drm_mesh_builder2_AddNormal(IDirect3DRMMeshBuilder2 *iface, @@ -1073,11 +1109,16 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, mesh_builder->nb_faces = *(DWORD*)(ptr + sizeof(DWORD) + mesh_builder->nb_vertices * sizeof(D3DVECTOR)); faces_vertex_idx_size = size - sizeof(DWORD) - mesh_builder->nb_vertices * sizeof(D3DVECTOR) - sizeof(DWORD); - TRACE("Mesh: nb_vertices = %d, nb_faces = %d, faces_vertex_idx_size = %d\n", mesh_builder->nb_vertices, + TRACE("Mesh: nb_vertices = %lu, nb_faces = %d, faces_vertex_idx_size = %d\n", mesh_builder->nb_vertices, mesh_builder->nb_faces, faces_vertex_idx_size); - mesh_builder->pVertices = HeapAlloc(GetProcessHeap(), 0, mesh_builder->nb_vertices * sizeof(D3DVECTOR)); - memcpy(mesh_builder->pVertices, ptr + sizeof(DWORD), mesh_builder->nb_vertices * sizeof(D3DVECTOR)); + if (!d3drm_array_reserve((void **)&mesh_builder->vertices, &mesh_builder->vertices_size, mesh_builder->nb_vertices, + sizeof(*mesh_builder->vertices))) + { + hr = E_OUTOFMEMORY; + goto end; + } + memcpy(mesh_builder->vertices, ptr + sizeof(DWORD), mesh_builder->nb_vertices * sizeof(D3DVECTOR)); faces_vertex_idx_ptr = faces_vertex_idx_data = HeapAlloc(GetProcessHeap(), 0, faces_vertex_idx_size); memcpy(faces_vertex_idx_data, ptr + sizeof(DWORD) + mesh_builder->nb_vertices * sizeof(D3DVECTOR) + sizeof(DWORD), @@ -1369,8 +1410,8 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, { D3DVECTOR a, b; - D3DRMVectorSubtract(&a, &mesh_builder->pVertices[faces_vertex_idx_ptr[2]], &mesh_builder->pVertices[faces_vertex_idx_ptr[1]]); - D3DRMVectorSubtract(&b, &mesh_builder->pVertices[faces_vertex_idx_ptr[0]], &mesh_builder->pVertices[faces_vertex_idx_ptr[1]]); + D3DRMVectorSubtract(&a, &mesh_builder->vertices[faces_vertex_idx_ptr[2]], &mesh_builder->vertices[faces_vertex_idx_ptr[1]]); + D3DRMVectorSubtract(&b, &mesh_builder->vertices[faces_vertex_idx_ptr[0]], &mesh_builder->vertices[faces_vertex_idx_ptr[1]]); D3DRMVectorCrossProduct(&face_normal, &a, &b); D3DRMVectorNormalize(&face_normal); } @@ -1397,7 +1438,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, DWORD vertex_idx = *faces_vertex_idx_ptr; if (vertex_idx >= mesh_builder->nb_vertices) { - WARN("Found vertex index %u but only %u vertices available => use index 0\n", vertex_idx, + WARN("Found vertex index %u but only %lu vertices available => use index 0\n", vertex_idx, mesh_builder->nb_vertices); vertex_idx = 0; } @@ -1586,9 +1627,9 @@ static HRESULT WINAPI d3drm_mesh_builder3_Scale(IDirect3DRMMeshBuilder3 *iface, for (i = 0; i < mesh_builder->nb_vertices; ++i) { - mesh_builder->pVertices[i].u1.x *= sx; - mesh_builder->pVertices[i].u2.y *= sy; - mesh_builder->pVertices[i].u3.z *= sz; + mesh_builder->vertices[i].u1.x *= sx; + mesh_builder->vertices[i].u2.y *= sy; + mesh_builder->vertices[i].u3.z *= sz; } /* Normals are not affected by Scale */ @@ -1848,9 +1889,19 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetTextureCoordinates(IDirect3DRMMeshB static int WINAPI d3drm_mesh_builder3_AddVertex(IDirect3DRMMeshBuilder3 *iface, D3DVALUE x, D3DVALUE y, D3DVALUE z) { - FIXME("iface %p, x %.8e, y %.8e, z %.8e stub!\n", iface, x, y, z); + struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface); - return 0; + TRACE("iface %p, x %.8e, y %.8e, z %.8e.\n", iface, x, y, z); + + if (!d3drm_array_reserve((void **)&mesh_builder->vertices, &mesh_builder->vertices_size, + mesh_builder->nb_vertices + 1, sizeof(*mesh_builder->vertices))) + return 0; + + mesh_builder->vertices[mesh_builder->nb_vertices].u1.x = x; + mesh_builder->vertices[mesh_builder->nb_vertices].u2.y = y; + mesh_builder->vertices[mesh_builder->nb_vertices].u3.z = z; + + return mesh_builder->nb_vertices++; } static int WINAPI d3drm_mesh_builder3_AddNormal(IDirect3DRMMeshBuilder3 *iface, @@ -1937,7 +1988,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_CreateMesh(IDirect3DRMMeshBuilder3 *if return E_OUTOFMEMORY; } for (i = 0; i < mesh_builder->nb_vertices; i++) - vertices[i].position = mesh_builder->pVertices[i]; + vertices[i].position = mesh_builder->vertices[i]; hr = IDirect3DRMMesh_SetVertices(*mesh, 0, 0, mesh_builder->nb_vertices, vertices); HeapFree(GetProcessHeap(), 0, vertices); @@ -2186,7 +2237,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetVertices(IDirect3DRMMeshBuilder3 *i if (vertex_count) *vertex_count = count; if (vertices && mesh_builder->nb_vertices) - memcpy(vertices, mesh_builder->pVertices + start_idx, count * sizeof(*vertices)); + memcpy(vertices, mesh_builder->vertices + start_idx, count * sizeof(*vertices)); return D3DRM_OK; }

1 0

Nikolay Sivov : d3drm: Use consistent naming for mesh builder implementation pointers.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: c0c08a428ecbe1c9f98f23d79ac000cc712346fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0c08a428ecbe1c9f98f23d79… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 8 10:46:16 2017 +0300 d3drm: Use consistent naming for mesh builder implementation pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/meshbuilder.c | 186 ++++++++++++++++++++++++----------------------- 1 file changed, 95 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0c08a428ecbe1c9f98f2…

1 0

Jacek Caban : rpcrt4: Change RPCRT4_ReleaseConnection return type to void.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 2cb32b2f3b55fbb3e749da964d828b38cbbdab77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cb32b2f3b55fbb3e749da964… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 8 14:16:56 2017 +0200 rpcrt4: Change RPCRT4_ReleaseConnection return type to void. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_binding.c | 7 +++---- dlls/rpcrt4/rpc_binding.h | 2 +- dlls/rpcrt4/rpc_transport.c | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index f2b1d59..ec38b86 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -297,14 +297,13 @@ RPC_STATUS RPCRT4_CloseBinding(RpcBinding* Binding, RpcConnection* Connection) if (!Connection) return RPC_S_OK; if (Binding->server) { /* don't destroy a connection that is cached in the binding */ - if (Binding->FromConn == Connection) - return RPC_S_OK; - return RPCRT4_ReleaseConnection(Connection); + if (Binding->FromConn != Connection) + RPCRT4_ReleaseConnection(Connection); } else { RpcAssoc_ReleaseIdleConnection(Binding->Assoc, Connection); - return RPC_S_OK; } + return RPC_S_OK; } static LPSTR RPCRT4_strconcatA(LPSTR dst, LPCSTR src) diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index a679b0e..ca53887 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -163,7 +163,7 @@ RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, LPCS LPCSTR NetworkAddr, LPCSTR Endpoint, LPCWSTR NetworkOptions, RpcAuthInfo* AuthInfo, RpcQualityOfService *QOS, LPCWSTR CookieAuth) DECLSPEC_HIDDEN; RpcConnection *RPCRT4_GrabConnection( RpcConnection *conn ) DECLSPEC_HIDDEN; -RPC_STATUS RPCRT4_ReleaseConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; +void RPCRT4_ReleaseConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_OpenClientConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_CloseConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_IsServerListening(const char *protseq, const char *endpoint) DECLSPEC_HIDDEN; diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 909fec1..48def49 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -3380,7 +3380,7 @@ RpcConnection *RPCRT4_GrabConnection(RpcConnection *connection) return connection; } -RPC_STATUS RPCRT4_ReleaseConnection(RpcConnection *connection) +void RPCRT4_ReleaseConnection(RpcConnection *connection) { LONG ref = InterlockedDecrement(&connection->ref); @@ -3416,7 +3416,6 @@ RPC_STATUS RPCRT4_ReleaseConnection(RpcConnection *connection) HeapFree(GetProcessHeap(), 0, connection); } - return RPC_S_OK; } RPC_STATUS RPCRT4_IsServerListening(const char *protseq, const char *endpoint)

1 0

Jacek Caban : rpcrt4: Fix a race when server grabs a connection from the list of active connections.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: e889b027efa99fdc783fcf48c59adfe119e0d65c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e889b027efa99fdc783fcf48c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 8 14:16:50 2017 +0200 rpcrt4: Fix a race when server grabs a connection from the list of active connections. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 58 ++++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 0ae7125..909fec1 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -3373,40 +3373,50 @@ void rpcrt4_conn_release_and_wait(RpcConnection *connection) } } -RpcConnection *RPCRT4_GrabConnection( RpcConnection *conn ) +RpcConnection *RPCRT4_GrabConnection(RpcConnection *connection) { - InterlockedIncrement( &conn->ref ); - return conn; + LONG ref = InterlockedIncrement(&connection->ref); + TRACE("%p ref=%u\n", connection, ref); + return connection; } -RPC_STATUS RPCRT4_ReleaseConnection(RpcConnection* Connection) +RPC_STATUS RPCRT4_ReleaseConnection(RpcConnection *connection) { - if (InterlockedDecrement( &Connection->ref ) > 0) return RPC_S_OK; + LONG ref = InterlockedDecrement(&connection->ref); - TRACE("destroying connection %p\n", Connection); + if (!ref && connection->protseq) + { + /* protseq stores a list of active connections, but does not own references to them. + * It may need to grab a connection from the list, which could lead to a race if + * connection is being released, but not yet removed from the list. We handle that + * by synchronizing on CS here. */ + EnterCriticalSection(&connection->protseq->cs); + ref = connection->ref; + if (!ref) + list_remove(&connection->protseq_entry); + LeaveCriticalSection(&connection->protseq->cs); + } - RPCRT4_CloseConnection(Connection); - RPCRT4_strfree(Connection->Endpoint); - RPCRT4_strfree(Connection->NetworkAddr); - HeapFree(GetProcessHeap(), 0, Connection->NetworkOptions); - HeapFree(GetProcessHeap(), 0, Connection->CookieAuth); - if (Connection->AuthInfo) RpcAuthInfo_Release(Connection->AuthInfo); - if (Connection->QOS) RpcQualityOfService_Release(Connection->QOS); + TRACE("%p ref=%u\n", connection, ref); - /* server-only */ - if (Connection->server_binding) RPCRT4_ReleaseBinding(Connection->server_binding); + if (!ref) + { + RPCRT4_CloseConnection(connection); + RPCRT4_strfree(connection->Endpoint); + RPCRT4_strfree(connection->NetworkAddr); + HeapFree(GetProcessHeap(), 0, connection->NetworkOptions); + HeapFree(GetProcessHeap(), 0, connection->CookieAuth); + if (connection->AuthInfo) RpcAuthInfo_Release(connection->AuthInfo); + if (connection->QOS) RpcQualityOfService_Release(connection->QOS); - if (Connection->protseq) - { - EnterCriticalSection(&Connection->protseq->cs); - list_remove(&Connection->protseq_entry); - LeaveCriticalSection(&Connection->protseq->cs); - } + /* server-only */ + if (connection->server_binding) RPCRT4_ReleaseBinding(connection->server_binding); - if (Connection->wait_release) SetEvent(Connection->wait_release); + if (connection->wait_release) SetEvent(connection->wait_release); - HeapFree(GetProcessHeap(), 0, Connection); - return RPC_S_OK; + HeapFree(GetProcessHeap(), 0, connection); + } + return RPC_S_OK; } RPC_STATUS RPCRT4_IsServerListening(const char *protseq, const char *endpoint)

1 0

Zebediah Figura : msacm32: Try to suggest PCM to PCM conversion first.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: ab2760ec339e6499fc31870c5b5862c8acd8c63d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab2760ec339e6499fc31870c5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 7 16:07:53 2017 -0500 msacm32: Try to suggest PCM to PCM conversion first. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/format.c | 16 ++++++++++++++++ dlls/msacm32/tests/msacm.c | 2 -- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index d7a2cc9..f3c5155 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -733,6 +733,22 @@ MMRESULT WINAPI acmFormatSuggest(HACMDRIVER had, PWAVEFORMATEX pwfxSrc, ACM_FORMATSUGGESTF_WBITSPERSAMPLE|ACM_FORMATSUGGESTF_WFORMATTAG)) return MMSYSERR_INVALFLAG; + /* if we were given PCM, try to convert to PCM */ + if (pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && !had && + !(fdwSuggest & ACM_FORMATSUGGESTF_WFORMATTAG)) + { + ACMFORMATDETAILSW afd = {0}; + afd.cbStruct = sizeof(afd); + afd.dwFormatTag = WAVE_FORMAT_PCM; + afd.pwfx = pwfxSrc; + afd.cbwfx = sizeof(PCMWAVEFORMAT); + if (!acmFormatDetailsW(had, &afd, ACM_FORMATDETAILSF_FORMAT)) + { + memcpy(pwfxDst, pwfxSrc, sizeof(PCMWAVEFORMAT)); + return MMSYSERR_NOERROR; + } + } + aftd.cbStruct = sizeof(aftd); if (fdwSuggest & ACM_FORMATSUGGESTF_WFORMATTAG) aftd.dwFormatTag = pwfxDst->wFormatTag; diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 31262a3..13494a6 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -1062,7 +1062,6 @@ static void test_acmFormatSuggest(void) suggest = 0; memset(&dst, 0, sizeof(dst)); rc = acmFormatSuggest(NULL, &src, &dst, sizeof(PCMWAVEFORMAT), suggest); - todo_wine { ok(rc == MMSYSERR_NOERROR, "failed with error 0x%x\n", rc); ok(src.wFormatTag == dst.wFormatTag, "expected %d, got %d\n", src.wFormatTag, dst.wFormatTag); ok(src.nChannels == dst.nChannels, "expected %d, got %d\n", src.nChannels, dst.nChannels); @@ -1070,7 +1069,6 @@ static void test_acmFormatSuggest(void) ok(src.nAvgBytesPerSec == dst.nAvgBytesPerSec, "expected %d, got %d\n", src.nAvgBytesPerSec, dst.nAvgBytesPerSec); ok(src.nBlockAlign == dst.nBlockAlign, "expected %d, got %d\n", src.nBlockAlign, dst.nBlockAlign); ok(src.wBitsPerSample == dst.wBitsPerSample, "expected %d, got %d\n", src.wBitsPerSample, dst.wBitsPerSample); - } /* All parameters from destination are valid */ suggest = ACM_FORMATSUGGESTF_NCHANNELS

1 0

Zebediah Figura : msacm32: Add more invalid parameter checks for acmFormatSuggest().
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 8e88af31cd455743991a6e40dddc8fd0c676e783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e88af31cd455743991a6e40d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 7 16:07:52 2017 -0500 msacm32: Add more invalid parameter checks for acmFormatSuggest(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/format.c | 11 ++ dlls/msacm32/tests/msacm.c | 246 ++++++++++++++++++++++++++++++++++++--------- 2 files changed, 210 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e88af31cd455743991a6…

1 0

Zebediah Figura : msacm32: Add invalid parameter checks for acmFormatDetails().
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 1e30f79b70c5717ef9b710bf81e4e12d1cc46534 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e30f79b70c5717ef9b710bf8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 7 16:07:51 2017 -0500 msacm32: Add invalid parameter checks for acmFormatDetails(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/format.c | 37 +++++++++++-- dlls/msacm32/tests/msacm.c | 131 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 165 insertions(+), 3 deletions(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index 902807c..05d4fbe 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -68,7 +68,7 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, HACMDRIVER had; if (acmDriverOpen(&had, hadid, 0) == MMSYSERR_NOERROR) { - ACMFORMATDETAILSW afd; + ACMFORMATDETAILSW afd = {0}; unsigned int i, len; MMRESULT mmr; WCHAR buffer[ACMFORMATDETAILS_FORMAT_CHARS+16]; @@ -87,6 +87,7 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, int j; afd.dwFormatIndex = i; + afd.fdwSupport = 0; mmr = acmFormatDetailsW(had, &afd, ACM_FORMATDETAILSF_INDEX); if (mmr == MMSYSERR_NOERROR) { lstrcpynW(buffer, afd.szFormat, ACMFORMATTAGDETAILS_FORMATTAG_CHARS + 1); @@ -112,7 +113,7 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, HACMDRIVER had; if (acmDriverOpen(&had, hadid, 0) == MMSYSERR_NOERROR) { - ACMFORMATDETAILSW afd; + ACMFORMATDETAILSW afd = {0}; afd.cbStruct = sizeof(afd); afd.dwFormatTag = paftd->dwFormatTag; @@ -376,10 +377,14 @@ MMRESULT WINAPI acmFormatDetailsA(HACMDRIVER had, PACMFORMATDETAILSA pafd, ACMFORMATDETAILSW afdw; MMRESULT mmr; + if (!pafd) + return MMSYSERR_INVALPARAM; + memset(&afdw, 0, sizeof(afdw)); afdw.cbStruct = sizeof(afdw); afdw.dwFormatIndex = pafd->dwFormatIndex; afdw.dwFormatTag = pafd->dwFormatTag; + afdw.fdwSupport = pafd->fdwSupport; afdw.pwfx = pafd->pwfx; afdw.cbwfx = pafd->cbwfx; @@ -401,11 +406,27 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD MMRESULT mmr; static const WCHAR fmt1[] = {'%','d',' ','H','z',0}; static const WCHAR fmt2[] = {';',' ','%','d',' ','b','i','t','s',0}; + ACMFORMATTAGDETAILSW aftd = {0}; TRACE("(%p, %p, %d)\n", had, pafd, fdwDetails); + if (!pafd) + return MMSYSERR_INVALPARAM; + if (pafd->cbStruct < sizeof(*pafd)) return MMSYSERR_INVALPARAM; + if (!pafd->pwfx) + return MMSYSERR_INVALPARAM; + + if (pafd->cbwfx < sizeof(PCMWAVEFORMAT)) + return MMSYSERR_INVALPARAM; + + if (pafd->fdwSupport) + return MMSYSERR_INVALPARAM; + + if (pafd->pwfx->wFormatTag == WAVE_FORMAT_UNKNOWN) + return MMSYSERR_INVALPARAM; + switch (fdwDetails) { case ACM_FORMATDETAILSF_FORMAT: if (pafd->dwFormatTag != pafd->pwfx->wFormatTag) { @@ -430,7 +451,16 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD } break; case ACM_FORMATDETAILSF_INDEX: - /* should check pafd->dwFormatIndex < aftd->cStandardFormats */ + aftd.cbStruct = sizeof(aftd); + aftd.dwFormatTag = pafd->dwFormatTag; + mmr = acmFormatTagDetailsW(had, &aftd, ACM_FORMATTAGDETAILSF_FORMATTAG); + if (mmr != MMSYSERR_NOERROR) + break; + if (pafd->dwFormatIndex >= aftd.cStandardFormats) + { + mmr = MMSYSERR_INVALPARAM; + break; + } mmr = MSACM_Message(had, ACMDM_FORMAT_DETAILS, (LPARAM)pafd, fdwDetails); break; default: @@ -581,6 +611,7 @@ static BOOL MSACM_FormatEnumHelper(PWINE_ACMDRIVERID padid, HACMDRIVER had, for (j = 0; j < aftd.cStandardFormats; j++) { pafd->dwFormatIndex = j; pafd->dwFormatTag = aftd.dwFormatTag; + pafd->fdwSupport = 0; if (acmFormatDetailsW(had, pafd, ACM_FORMATDETAILSF_INDEX) != MMSYSERR_NOERROR) continue; diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index f5ab168..894dd53 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -38,9 +38,109 @@ static BOOL CALLBACK FormatTagEnumProc(HACMDRIVERID hadid, DWORD_PTR dwInstance, DWORD fdwSupport) { + MMRESULT rc; + HACMDRIVER had; + if (winetest_interactive) trace(" Format 0x%04x: %s\n", paftd->dwFormatTag, paftd->szFormatTag); + rc = acmDriverOpen(&had, hadid, 0); + ok(rc == MMSYSERR_NOERROR || rc == MMSYSERR_NODRIVER, + "acmDriverOpen(): rc = %08x, should be %08x\n", + rc, MMSYSERR_NOERROR); + + if (rc == MMSYSERR_NOERROR) + { + ACMFORMATDETAILSA fd = {0}; + WAVEFORMATEX *pwfx; + DWORD i; + + fd.cbStruct = sizeof(fd); + if (paftd->cbFormatSize < sizeof(WAVEFORMATEX)) + pwfx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WAVEFORMATEX)); + else + pwfx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, paftd->cbFormatSize); + fd.pwfx = pwfx; + fd.cbwfx = paftd->cbFormatSize; + fd.dwFormatTag = paftd->dwFormatTag; + + /* try bad pwfx */ + fd.pwfx = NULL; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.pwfx = pwfx; + + /* try bad wFormatTag */ + fd.pwfx->wFormatTag = WAVE_FORMAT_UNKNOWN; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.pwfx->wFormatTag = paftd->dwFormatTag; + + /* try bad fdwSupport */ + fd.fdwSupport = 0xdeadbeef; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.fdwSupport = 0; + + /* try bad pwfx structure size */ + fd.cbwfx = sizeof(PCMWAVEFORMAT)-1; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.cbwfx = paftd->cbFormatSize; + + /* test bad parameters (all zero) */ + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); + ok(rc == ACMERR_NOTPOSSIBLE, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, ACMERR_NOTPOSSIBLE); + + /* test index */ + for (i = 0; i < paftd->cStandardFormats; i++) + { + fd.dwFormatIndex = i; + + fd.fdwSupport = 0; + fd.cbwfx = paftd->cbFormatSize; + fd.pwfx->cbSize = 0xbeef; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_NOERROR, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_NOERROR); + + /* Windows will write cbSize (and other data) even if the + * given cbwfx is not large enough */ + fd.fdwSupport = 0; + fd.cbwfx = sizeof(PCMWAVEFORMAT); + fd.pwfx->cbSize = 0xbeef; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + todo_wine_if(rc != MMSYSERR_NOERROR) /* remove when fixed */ + ok(rc == MMSYSERR_NOERROR, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_NOERROR); + if (paftd->dwFormatTag != WAVE_FORMAT_PCM) + todo_wine_if(fd.pwfx->cbSize != paftd->cbFormatSize - sizeof(WAVEFORMATEX)) /* remove when fixed */ + ok(fd.pwfx->cbSize == paftd->cbFormatSize - sizeof(WAVEFORMATEX), + "got %d\n", fd.pwfx->cbSize); + } + + /* one more */ + fd.dwFormatIndex = paftd->cStandardFormats; + fd.fdwSupport = 0; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + HeapFree(GetProcessHeap(), 0, pwfx); + } return TRUE; } @@ -411,6 +511,37 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, "acmFormatTagEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); + /* try bad pointer */ + rc = acmFormatDetailsA(had, NULL, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + /* try bad structure size */ + ZeroMemory(&fd, sizeof(fd)); + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + fd.cbStruct = sizeof(fd) - 1; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + fd.cbStruct = sizeof(fd); + fd.pwfx = pwfx; + ZeroMemory(fd.pwfx, dwSize); + fd.cbwfx = dwSize; + fd.dwFormatTag = WAVE_FORMAT_UNKNOWN; + + /* try WAVE_FORMAT_UNKNOWN */ + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + HeapFree(GetProcessHeap(), 0, pwfx); /* try invalid handle */

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
60
Older →

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 2017