March 2019 - Wine-Devel - list.winehq.org

[PATCH] po: Update Sinhala translation.
by Isira Seneviratne March 25, 2019

March 25, 2019

1 0

[PATCH 0/2] gdiplus: Small DrawImage() resampling fixes.
by Jan Havran March 24, 2019

March 24, 2019

Hello Wine community, this is my first Wine patch. This series fixes some drawing of GDI+ DrawImage() where resampling was applied. I tried to write some unit tests, but it turned out that there is no simple and effective way how to catch all differences between native gdiplus library and Wine lib (without putting significant part of DrawImage() into tests file). At least I wrote relative complex standalone tests for my own testing where I was comparing every pixel drawn by buildin and native lib, and I am pretty sure this series fixes mentioned issues without breaking anything else. There are much more drawing issues I noticed so far, but for some I do not know to fix them without breaking other stuff, for some issues I know what caused them, but I do not know how to fix them, and for some for I have no idea why are they appearing. But I will keep testing. Jan Havran (2): gdiplus: Fix rounding dst_area borders for GdipDrawImagePointsRect(). gdiplus: Fix resample offset for nearest neighbor interpolation. dlls/gdiplus/graphics.c | 46 ++++++++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 8 deletions(-) -- 2.21.0

3 6

[PATCH] d3dx9_36/tests: Add initial tests for dummy skininfo interface.
by Vijay Kiran Kamuju March 24, 2019

March 24, 2019

Added some more tests for returned dummy skininfo interface From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/d3dx9_36/tests/mesh.c | 168 +++++++++++++++++++++++++++++++++++++ 1 file changed, 168 insertions(+) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index e36ee0adcd..1bc248202d 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -25,6 +25,9 @@ #include <limits.h> #include "wine/test.h" #include "d3dx9.h" +#include "initguid.h" +#include "rmxftmpl.h" +#include "rmxfguid.h" #ifndef NAN /* From wine/port.h */ @@ -2544,6 +2547,170 @@ static void D3DXLoadMeshTest(void) free_test_context(test_context); } +static ID3DXFileData *get_mesh_data(const char *memory, SIZE_T length) +{ + D3DXF_FILELOADMEMORY source; + ID3DXFileEnumObject *enumobj = NULL; + ID3DXFileData *filedata = NULL; + ID3DXFileData *ret = NULL; + ID3DXFile *d3dxfile = NULL; + SIZE_T i, nb_children; + HRESULT hr; + GUID guid; + + hr = D3DXFileCreate(&d3dxfile); + if (FAILED(hr)) return NULL; + + hr = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, D3DRM_XTEMPLATES, D3DRM_XTEMPLATE_BYTES); + if (FAILED(hr)) goto cleanup; + + source.lpMemory = (void *)memory; + source.dSize = length; + + hr = d3dxfile->lpVtbl->CreateEnumObject(d3dxfile, &source, D3DXF_FILELOAD_FROMMEMORY, &enumobj); + if (FAILED(hr)) goto cleanup; + + hr = enumobj->lpVtbl->GetChildren(enumobj, &nb_children); + if (FAILED(hr)) goto cleanup; + + for (i = 0; i < nb_children; i++) + { + hr = enumobj->lpVtbl->GetChild(enumobj, i, &filedata); + if (FAILED(hr)) goto cleanup; + + hr = filedata->lpVtbl->GetType(filedata, &guid); + if (SUCCEEDED(hr) && IsEqualGUID(&guid, &TID_D3DRMMesh)) + { + ret = filedata; + break; + } + else + filedata->lpVtbl->Release(filedata); + } + +cleanup: + if (enumobj) enumobj->lpVtbl->Release(enumobj); + if (d3dxfile) d3dxfile->lpVtbl->Release(d3dxfile); + + return ret; +} + +static void D3DXLoadSkinMeshFromXofTest(void) +{ + static const char simple_xfile[] = + "xof 0303txt 0032" + "Mesh {" + "3;" + "0.0; 0.0; 0.0;," + "0.0; 1.0; 0.0;," + "1.0; 1.0; 0.0;;" + "1;" + "3; 0, 1, 2;;" + "}"; + ID3DXBuffer *adjacency, *materials, *effects; + D3DPRESENT_PARAMETERS d3dpp; + IDirect3DDevice9 *device; + ID3DXFileData *filedata; + ID3DXSkinInfo *skininfo; + ID3DXMesh *mesh; + IDirect3D9 *d3d; + DWORD mat_count; + HRESULT hr; + HWND hwnd; + + if (!(hwnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) + { + skip("Couldn't create application window\n"); + return; + } + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + if (!d3d) + { + skip("Couldn't create IDirect3D9 object\n"); + DestroyWindow(hwnd); + return; + } + + ZeroMemory(&d3dpp, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); + IDirect3D9_Release(d3d); + if (FAILED(hr)) + { + skip("Failed to create IDirect3DDevice9 object %#x\n", hr); + DestroyWindow(hwnd); + return; + } + + filedata = get_mesh_data(simple_xfile, sizeof(simple_xfile) - 1); + ok(filedata != NULL, "Failed to load mesh data\n"); + + adjacency = materials = effects = NULL; + skininfo = NULL; + mesh = NULL; + + hr = D3DXLoadSkinMeshFromXof(filedata, 0, device, &adjacency, &materials, &effects, &mat_count, &skininfo, &mesh); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + ok(skininfo != NULL, "Expected non-null skininfo\n"); + + if (skininfo) + { + DWORD dword_result; + float flt_result; + const char *string_result; + D3DXMATRIX *transform; + D3DVERTEXELEMENT9 declaration_out[MAX_FVF_DECL_SIZE]; + const D3DVERTEXELEMENT9 expect_declaration[] = + { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + D3DDECL_END(), + }; + + hr = skininfo->lpVtbl->GetDeclaration(skininfo, declaration_out); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + if (SUCCEEDED(hr)) + compare_elements(declaration_out, expect_declaration, __LINE__, 0); + + dword_result = skininfo->lpVtbl->GetNumBones(skininfo); + ok(dword_result == 0, "Expected 0, got %u\n", dword_result); + + flt_result = skininfo->lpVtbl->GetMinBoneInfluence(skininfo); + ok(flt_result == 0.0f, "Expected 0.0, got %g\n", flt_result); + + string_result = skininfo->lpVtbl->GetBoneName(skininfo, 0); + ok(string_result == NULL, "Expected NULL, got %p\n", string_result); + + dword_result = skininfo->lpVtbl->GetFVF(skininfo); + ok(dword_result == 2, "Expected 2, got %u\n", dword_result); + + dword_result = skininfo->lpVtbl->GetNumBoneInfluences(skininfo, 0); + ok(dword_result == 0, "Expected 0, got %u\n", dword_result); + + dword_result = skininfo->lpVtbl->GetNumBoneInfluences(skininfo, 1); + ok(dword_result == 0, "Expected 0, got %u\n", dword_result); + + transform = skininfo->lpVtbl->GetBoneOffsetMatrix(skininfo, -1); + ok(transform == NULL, "Expected NULL, got %p\n", transform); + + transform = skininfo->lpVtbl->GetBoneOffsetMatrix(skininfo, 0); + ok(transform == NULL, "Expected NULL, got %p\n", transform); + } + + if (adjacency) adjacency->lpVtbl->Release(adjacency); + if (materials) materials->lpVtbl->Release(materials); + if (effects) effects->lpVtbl->Release(effects); + if (skininfo) skininfo->lpVtbl->Release(skininfo); + if (mesh) mesh->lpVtbl->Release(mesh); + + filedata->lpVtbl->Release(filedata); + IDirect3DDevice9_Release(device); + DestroyWindow(hwnd); +} + static BOOL compute_box(struct mesh *mesh, float width, float height, float depth) { unsigned int i, face; @@ -11201,6 +11368,7 @@ START_TEST(mesh) D3DXCreateMeshTest(); D3DXCreateMeshFVFTest(); D3DXLoadMeshTest(); + D3DXLoadSkinMeshFromXofTest(); D3DXCreateBoxTest(); D3DXCreatePolygonTest(); D3DXCreateSphereTest(); -- 2.21.0

2 1

[PATCH v2] d3dx9_36/tests: Add initial tests for dummy skininfo interface.
by Vijay Kiran Kamuju March 24, 2019

March 24, 2019

Added todo_wine and some more tests for returned dummy skininfo interface From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/d3dx9_36/tests/mesh.c | 168 +++++++++++++++++++++++++++++++++++++ 1 file changed, 168 insertions(+) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index e36ee0adcd..d9008f3624 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -25,6 +25,9 @@ #include <limits.h> #include "wine/test.h" #include "d3dx9.h" +#include "initguid.h" +#include "rmxftmpl.h" +#include "rmxfguid.h" #ifndef NAN /* From wine/port.h */ @@ -2544,6 +2547,170 @@ static void D3DXLoadMeshTest(void) free_test_context(test_context); } +static ID3DXFileData *get_mesh_data(const char *memory, SIZE_T length) +{ + D3DXF_FILELOADMEMORY source; + ID3DXFileEnumObject *enumobj = NULL; + ID3DXFileData *filedata = NULL; + ID3DXFileData *ret = NULL; + ID3DXFile *d3dxfile = NULL; + SIZE_T i, nb_children; + HRESULT hr; + GUID guid; + + hr = D3DXFileCreate(&d3dxfile); + if (FAILED(hr)) return NULL; + + hr = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, D3DRM_XTEMPLATES, D3DRM_XTEMPLATE_BYTES); + if (FAILED(hr)) goto cleanup; + + source.lpMemory = (void *)memory; + source.dSize = length; + + hr = d3dxfile->lpVtbl->CreateEnumObject(d3dxfile, &source, D3DXF_FILELOAD_FROMMEMORY, &enumobj); + if (FAILED(hr)) goto cleanup; + + hr = enumobj->lpVtbl->GetChildren(enumobj, &nb_children); + if (FAILED(hr)) goto cleanup; + + for (i = 0; i < nb_children; i++) + { + hr = enumobj->lpVtbl->GetChild(enumobj, i, &filedata); + if (FAILED(hr)) goto cleanup; + + hr = filedata->lpVtbl->GetType(filedata, &guid); + if (SUCCEEDED(hr) && IsEqualGUID(&guid, &TID_D3DRMMesh)) + { + ret = filedata; + break; + } + else + filedata->lpVtbl->Release(filedata); + } + +cleanup: + if (enumobj) enumobj->lpVtbl->Release(enumobj); + if (d3dxfile) d3dxfile->lpVtbl->Release(d3dxfile); + + return ret; +} + +static void D3DXLoadSkinMeshFromXofTest(void) +{ + static const char simple_xfile[] = + "xof 0303txt 0032" + "Mesh {" + "3;" + "0.0; 0.0; 0.0;," + "0.0; 1.0; 0.0;," + "1.0; 1.0; 0.0;;" + "1;" + "3; 0, 1, 2;;" + "}"; + ID3DXBuffer *adjacency, *materials, *effects; + D3DPRESENT_PARAMETERS d3dpp; + IDirect3DDevice9 *device; + ID3DXFileData *filedata; + ID3DXSkinInfo *skininfo; + ID3DXMesh *mesh; + IDirect3D9 *d3d; + DWORD mat_count; + HRESULT hr; + HWND hwnd; + + if (!(hwnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) + { + skip("Couldn't create application window\n"); + return; + } + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + if (!d3d) + { + skip("Couldn't create IDirect3D9 object\n"); + DestroyWindow(hwnd); + return; + } + + ZeroMemory(&d3dpp, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); + IDirect3D9_Release(d3d); + if (FAILED(hr)) + { + skip("Failed to create IDirect3DDevice9 object %#x\n", hr); + DestroyWindow(hwnd); + return; + } + + filedata = get_mesh_data(simple_xfile, sizeof(simple_xfile) - 1); + ok(filedata != NULL, "Failed to load mesh data\n"); + + adjacency = materials = effects = NULL; + skininfo = NULL; + mesh = NULL; + + hr = D3DXLoadSkinMeshFromXof(filedata, 0, device, &adjacency, &materials, &effects, &mat_count, &skininfo, &mesh); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + todo_wine ok(skininfo != NULL, "Expected non-null skininfo\n"); + + if (skininfo) + { + DWORD dword_result; + float flt_result; + const char *string_result; + D3DXMATRIX *transform; + D3DVERTEXELEMENT9 declaration_out[MAX_FVF_DECL_SIZE]; + const D3DVERTEXELEMENT9 expect_declaration[] = + { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + D3DDECL_END(), + }; + + hr = skininfo->lpVtbl->GetDeclaration(skininfo, declaration_out); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + if (SUCCEEDED(hr)) + compare_elements(declaration_out, expect_declaration, __LINE__, 0); + + dword_result = skininfo->lpVtbl->GetNumBones(skininfo); + ok(dword_result == 0, "Expected 0, got %u\n", dword_result); + + flt_result = skininfo->lpVtbl->GetMinBoneInfluence(skininfo); + ok(flt_result == 0.0f, "Expected 0.0, got %g\n", flt_result); + + string_result = skininfo->lpVtbl->GetBoneName(skininfo, 0); + ok(string_result == NULL, "Expected NULL, got %p\n", string_result); + + dword_result = skininfo->lpVtbl->GetFVF(skininfo); + ok(dword_result == 2, "Expected 2, got %u\n", dword_result); + + dword_result = skininfo->lpVtbl->GetNumBoneInfluences(skininfo, 0); + ok(dword_result == 0, "Expected 0, got %u\n", dword_result); + + dword_result = skininfo->lpVtbl->GetNumBoneInfluences(skininfo, 1); + ok(dword_result == 0, "Expected 0, got %u\n", dword_result); + + transform = skininfo->lpVtbl->GetBoneOffsetMatrix(skininfo, -1); + ok(transform == NULL, "Expected NULL, got %p\n", transform); + + transform = skininfo->lpVtbl->GetBoneOffsetMatrix(skininfo, 0); + ok(transform == NULL, "Expected NULL, got %p\n", transform); + } + + if (adjacency) adjacency->lpVtbl->Release(adjacency); + if (materials) materials->lpVtbl->Release(materials); + if (effects) effects->lpVtbl->Release(effects); + if (skininfo) skininfo->lpVtbl->Release(skininfo); + if (mesh) mesh->lpVtbl->Release(mesh); + + filedata->lpVtbl->Release(filedata); + IDirect3DDevice9_Release(device); + DestroyWindow(hwnd); +} + static BOOL compute_box(struct mesh *mesh, float width, float height, float depth) { unsigned int i, face; @@ -11201,6 +11368,7 @@ START_TEST(mesh) D3DXCreateMeshTest(); D3DXCreateMeshFVFTest(); D3DXLoadMeshTest(); + D3DXLoadSkinMeshFromXofTest(); D3DXCreateBoxTest(); D3DXCreatePolygonTest(); D3DXCreateSphereTest(); -- 2.21.0

1 0

[PATCH] mstask: Avoid using the comma operator
by Michael Stefaniuc March 24, 2019

March 24, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mstask/task.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 9a39fc9402..6ab9263462 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -345,7 +345,7 @@ static HRESULT WINAPI MSTASK_ITask_CreateTrigger(ITask *iface, WORD *idx, ITaskT new_trigger->wStartHour = time.wHour; new_trigger->wStartMinute = time.wMinute; new_trigger->rgFlags = TASK_TRIGGER_FLAG_DISABLED; - new_trigger->TriggerType = TASK_TIME_TRIGGER_DAILY, + new_trigger->TriggerType = TASK_TIME_TRIGGER_DAILY; new_trigger->Type.Daily.DaysInterval = 1; *idx = This->trigger_count++; -- 2.20.1

2 1

[PATCH] dswave: Use HIWORD / LOWORD instead of open coding them
by Michael Stefaniuc March 24, 2019

March 24, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dswave/dswave_main.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index f01e1705af..a136bb839d 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -193,11 +193,13 @@ const char *debugstr_fourcc (DWORD fourcc) { } /* DMUS_VERSION struct to string conversion for debug messages */ -static const char *debugstr_dmversion (const DMUS_VERSION *version) { - if (!version) return "'null'"; - return wine_dbg_sprintf ("\'%i,%i,%i,%i\'", - (int)((version->dwVersionMS & 0xFFFF0000) >> 8), (int)(version->dwVersionMS & 0x0000FFFF), - (int)((version->dwVersionLS & 0xFFFF0000) >> 8), (int)(version->dwVersionLS & 0x0000FFFF)); +static const char *debugstr_dmversion(const DMUS_VERSION *version) +{ + if (!version) + return "'null'"; + return wine_dbg_sprintf("'%hu,%hu,%hu,%hu'", + HIWORD(version->dwVersionMS), LOWORD(version->dwVersionMS), + HIWORD(version->dwVersionLS), LOWORD(version->dwVersionLS)); } /* returns name of given GUID */ -- 2.20.1

1 0

[PATCH] dmusic: Use dump_DMUS_OBJECTDESC() instead of open coding it
by Michael Stefaniuc March 24, 2019

March 24, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmusic/collection.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 28202228bc..b7eb37593a 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -499,13 +499,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, struct list *listEntry; TRACE("*** IDirectMusicCollection (%p) ***\n", &This->IDirectMusicCollection_iface); - if (This->dmobj.desc.dwValidData & DMUS_OBJ_OBJECT) - TRACE(" - GUID = %s\n", debugstr_dmguid(&This->dmobj.desc.guidObject)); - if (This->dmobj.desc.dwValidData & DMUS_OBJ_VERSION) - TRACE(" - Version = %i,%i,%i,%i\n", (This->dmobj.desc.vVersion.dwVersionMS >> 8) & 0x0000FFFF, This->dmobj.desc.vVersion.dwVersionMS & 0x0000FFFF, - (This->dmobj.desc.vVersion.dwVersionLS >> 8) & 0x0000FFFF, This->dmobj.desc.vVersion.dwVersionLS & 0x0000FFFF); - if (This->dmobj.desc.dwValidData & DMUS_OBJ_NAME) - TRACE(" - Name = %s\n", debugstr_w(This->dmobj.desc.wszName)); + dump_DMUS_OBJECTDESC(&This->dmobj.desc); TRACE(" - Collection header:\n"); TRACE(" - cInstruments: %d\n", This->pHeader->cInstruments); -- 2.20.1

1 0

[PATCH] dmusic: Use HIWORD / LOWORD instead of open coding them
by Michael Stefaniuc March 24, 2019

March 24, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmusic/dmusic_main.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index 9eb53640ca..3956dc2d5f 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -226,11 +226,13 @@ const char *debugstr_fourcc (DWORD fourcc) { } /* DMUS_VERSION struct to string conversion for debug messages */ -static const char *debugstr_dmversion (const DMUS_VERSION *version) { - if (!version) return "'null'"; - return wine_dbg_sprintf ("\'%i,%i,%i,%i\'", - (int)((version->dwVersionMS & 0xFFFF0000) >> 8), (int)(version->dwVersionMS & 0x0000FFFF), - (int)((version->dwVersionLS & 0xFFFF0000) >> 8), (int)(version->dwVersionLS & 0x0000FFFF)); +static const char *debugstr_dmversion(const DMUS_VERSION *version) +{ + if (!version) + return "'null'"; + return wine_dbg_sprintf("'%hu,%hu,%hu,%hu'", + HIWORD(version->dwVersionMS), LOWORD(version->dwVersionMS), + HIWORD(version->dwVersionLS), LOWORD(version->dwVersionLS)); } /* returns name of given GUID */ -- 2.20.1

1 0

[PATCH] dmscript: Use HIWORD / LOWORD instead of open coding them
by Michael Stefaniuc March 24, 2019

March 24, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmscript/dmscript_main.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index fd25b00c67..ec9026bc5e 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -254,11 +254,13 @@ const char *debugstr_fourcc (DWORD fourcc) { } /* DMUS_VERSION struct to string conversion for debug messages */ -static const char *debugstr_dmversion (const DMUS_VERSION *version) { - if (!version) return "'null'"; - return wine_dbg_sprintf ("\'%i,%i,%i,%i\'", - (int)((version->dwVersionMS & 0xFFFF0000) >> 8), (int)(version->dwVersionMS & 0x0000FFFF), - (int)((version->dwVersionLS & 0xFFFF0000) >> 8), (int)(version->dwVersionLS & 0x0000FFFF)); +static const char *debugstr_dmversion(const DMUS_VERSION *version) +{ + if (!version) + return "'null'"; + return wine_dbg_sprintf("'%hu,%hu,%hu,%hu'", + HIWORD(version->dwVersionMS), LOWORD(version->dwVersionMS), + HIWORD(version->dwVersionLS), LOWORD(version->dwVersionLS)); } /* returns name of given GUID */ -- 2.20.1

1 0

[PATCH] dmcompos: Use HIWORD / LOWORD instead of open coding them
by Michael Stefaniuc March 24, 2019

March 24, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmcompos/dmcompos_main.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index 2e68775084..bcd6662013 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -224,11 +224,13 @@ const char *debugstr_fourcc (DWORD fourcc) { } /* DMUS_VERSION struct to string conversion for debug messages */ -static const char *debugstr_dmversion (const DMUS_VERSION *version) { - if (!version) return "'null'"; - return wine_dbg_sprintf ("\'%i,%i,%i,%i\'", - (int)((version->dwVersionMS & 0xFFFF0000) >> 8), (int)(version->dwVersionMS & 0x0000FFFF), - (int)((version->dwVersionLS & 0xFFFF0000) >> 8), (int)(version->dwVersionLS & 0x0000FFFF)); +static const char *debugstr_dmversion(const DMUS_VERSION *version) +{ + if (!version) + return "'null'"; + return wine_dbg_sprintf("'%hu,%hu,%hu,%hu'", + HIWORD(version->dwVersionMS), LOWORD(version->dwVersionMS), + HIWORD(version->dwVersionLS), LOWORD(version->dwVersionLS)); } /* returns name of given GUID */ -- 2.20.1

1 0