July 2017 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : dmusic/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: 24463315ba026c7802568dea216fdabf99abdfff URL: http://source.winehq.org/git/wine.git/?a=commit;h=24463315ba026c7802568dea2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 29 00:44:33 2017 +0000 dmusic/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/tests/dmusic.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 7da8aab..961e2cd 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -29,16 +29,6 @@ #include "dmusici.h" #include "dmksctrl.h" -static inline const char* debugstr_longlong(ULONGLONG ll) -{ - static char string[17]; - if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) - sprintf(string, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); - else - sprintf(string, "%lx", (unsigned long)ll); - return string; -} - static void test_dmusic(void) { IDirectMusic *dmusic = NULL; @@ -334,7 +324,7 @@ static void test_dmbuffer(void) data += sizeof(DMUS_EVENTHEADER); ok(header->cbEvent == 3, "cbEvent is %u instead of 3\n", header->cbEvent); ok(header->dwChannelGroup == 0, "dwChannelGroup is %u instead of 0\n", header->dwChannelGroup); - ok(header->rtDelta == 0, "rtDelta is %s instead of 0\n", debugstr_longlong(header->rtDelta)); + ok(header->rtDelta == 0, "rtDelta is %s instead of 0\n", wine_dbgstr_longlong(header->rtDelta)); ok(header->dwFlags == DMUS_EVENT_STRUCTURED, "dwFlags is %x instead of %x\n", header->dwFlags, DMUS_EVENT_STRUCTURED); message = *(DWORD*)data & 0xffffff; /* Only 3 bytes are relevant */ data += sizeof(DWORD); @@ -345,7 +335,7 @@ static void test_dmbuffer(void) data += sizeof(DMUS_EVENTHEADER); ok(header->cbEvent == 3, "cbEvent is %u instead of 3\n", header->cbEvent); ok(header->dwChannelGroup == 0, "dwChannelGroup is %u instead of 0\n", header->dwChannelGroup); - ok(header->rtDelta == 10, "rtDelta is %s instead of 0\n", debugstr_longlong(header->rtDelta)); + ok(header->rtDelta == 10, "rtDelta is %s instead of 0\n", wine_dbgstr_longlong(header->rtDelta)); ok(header->dwFlags == DMUS_EVENT_STRUCTURED, "dwFlags is %x instead of %x\n", header->dwFlags, DMUS_EVENT_STRUCTURED); message = *(DWORD*)data & 0xffffff; /* Only 3 bytes are relevant */ ok(message == 0x000080, "Message 2 is %0x instead of 0x000080\n", message);

1 0

Piotr Caban : winedump: Add initial support for handling EMF+ records.
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: 26b1c6611e35b59b4b1efc1d9ad123308fb6f432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26b1c6611e35b59b4b1efc1d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 30 18:03:38 2017 +0200 winedump: Add initial support for handling EMF+ records. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/emf.c | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 125 insertions(+), 2 deletions(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index 68f5b41..cce66c8 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -35,6 +35,15 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "gdiplusenums.h" + +typedef struct +{ + WORD Type; + WORD Flags; + DWORD Size; + DWORD DataSize; +} EmfPlusRecordHeader; static const char *debugstr_wn(const WCHAR *wstr, unsigned int n) { @@ -67,6 +76,7 @@ static unsigned int read_int(const unsigned char *buffer) } #define EMRCASE(x) case x: printf("%-20s %08x\n", #x, length); break +#define EMRPLUSCASE(x) case x: printf(" %-20s %04x %08x %08x\n", #x, header->Flags, header->Size, header->DataSize); break static unsigned offset = 0; @@ -162,7 +172,120 @@ static int dump_emfrecord(void) EMRCASE(EMR_WIDENPATH); EMRCASE(EMR_SELECTCLIPPATH); EMRCASE(EMR_ABORTPATH); - EMRCASE(EMR_GDICOMMENT); + + case EMR_GDICOMMENT: + { + printf("%-20s %08x\n", "EMR_GDICOMMENT", length); + + /* Handle EMF+ records */ + if (length >= 16 && !memcmp((char*)PRD(offset + 12, sizeof(unsigned int)), "EMF+", 4)) + { + const EmfPlusRecordHeader *header; + const unsigned int *data_size; + + offset += 8; + length -= 8; + data_size = PRD(offset, sizeof(*data_size)); + printf("data size = %x\n", *data_size); + offset += 8; + length -= 8; + + while (length >= sizeof(*header)) + { + header = PRD(offset, sizeof(*header)); + switch(header->Type) + { + EMRPLUSCASE(EmfPlusRecordTypeInvalid); + EMRPLUSCASE(EmfPlusRecordTypeHeader); + EMRPLUSCASE(EmfPlusRecordTypeEndOfFile); + EMRPLUSCASE(EmfPlusRecordTypeComment); + EMRPLUSCASE(EmfPlusRecordTypeGetDC); + EMRPLUSCASE(EmfPlusRecordTypeMultiFormatStart); + EMRPLUSCASE(EmfPlusRecordTypeMultiFormatSection); + EMRPLUSCASE(EmfPlusRecordTypeMultiFormatEnd); + EMRPLUSCASE(EmfPlusRecordTypeObject); + EMRPLUSCASE(EmfPlusRecordTypeClear); + EMRPLUSCASE(EmfPlusRecordTypeFillRects); + EMRPLUSCASE(EmfPlusRecordTypeDrawRects); + EMRPLUSCASE(EmfPlusRecordTypeFillPolygon); + EMRPLUSCASE(EmfPlusRecordTypeDrawLines); + EMRPLUSCASE(EmfPlusRecordTypeFillEllipse); + EMRPLUSCASE(EmfPlusRecordTypeDrawEllipse); + EMRPLUSCASE(EmfPlusRecordTypeFillPie); + EMRPLUSCASE(EmfPlusRecordTypeDrawPie); + EMRPLUSCASE(EmfPlusRecordTypeDrawArc); + EMRPLUSCASE(EmfPlusRecordTypeFillRegion); + EMRPLUSCASE(EmfPlusRecordTypeFillPath); + EMRPLUSCASE(EmfPlusRecordTypeDrawPath); + EMRPLUSCASE(EmfPlusRecordTypeFillClosedCurve); + EMRPLUSCASE(EmfPlusRecordTypeDrawClosedCurve); + EMRPLUSCASE(EmfPlusRecordTypeDrawCurve); + EMRPLUSCASE(EmfPlusRecordTypeDrawBeziers); + EMRPLUSCASE(EmfPlusRecordTypeDrawImage); + EMRPLUSCASE(EmfPlusRecordTypeDrawImagePoints); + EMRPLUSCASE(EmfPlusRecordTypeDrawString); + EMRPLUSCASE(EmfPlusRecordTypeSetRenderingOrigin); + EMRPLUSCASE(EmfPlusRecordTypeSetAntiAliasMode); + EMRPLUSCASE(EmfPlusRecordTypeSetTextRenderingHint); + EMRPLUSCASE(EmfPlusRecordTypeSetTextContrast); + EMRPLUSCASE(EmfPlusRecordTypeSetInterpolationMode); + EMRPLUSCASE(EmfPlusRecordTypeSetPixelOffsetMode); + EMRPLUSCASE(EmfPlusRecordTypeSetCompositingMode); + EMRPLUSCASE(EmfPlusRecordTypeSetCompositingQuality); + EMRPLUSCASE(EmfPlusRecordTypeSave); + EMRPLUSCASE(EmfPlusRecordTypeRestore); + EMRPLUSCASE(EmfPlusRecordTypeBeginContainer); + EMRPLUSCASE(EmfPlusRecordTypeBeginContainerNoParams); + EMRPLUSCASE(EmfPlusRecordTypeEndContainer); + EMRPLUSCASE(EmfPlusRecordTypeSetWorldTransform); + EMRPLUSCASE(EmfPlusRecordTypeResetWorldTransform); + EMRPLUSCASE(EmfPlusRecordTypeMultiplyWorldTransform); + EMRPLUSCASE(EmfPlusRecordTypeTranslateWorldTransform); + EMRPLUSCASE(EmfPlusRecordTypeScaleWorldTransform); + EMRPLUSCASE(EmfPlusRecordTypeRotateWorldTransform); + EMRPLUSCASE(EmfPlusRecordTypeSetPageTransform); + EMRPLUSCASE(EmfPlusRecordTypeResetClip); + EMRPLUSCASE(EmfPlusRecordTypeSetClipRect); + EMRPLUSCASE(EmfPlusRecordTypeSetClipPath); + EMRPLUSCASE(EmfPlusRecordTypeSetClipRegion); + EMRPLUSCASE(EmfPlusRecordTypeOffsetClip); + EMRPLUSCASE(EmfPlusRecordTypeDrawDriverString); + EMRPLUSCASE(EmfPlusRecordTypeStrokeFillPath); + EMRPLUSCASE(EmfPlusRecordTypeSerializableObject); + EMRPLUSCASE(EmfPlusRecordTypeSetTSGraphics); + EMRPLUSCASE(EmfPlusRecordTypeSetTSClip); + EMRPLUSCASE(EmfPlusRecordTotal); + + default: + printf(" unknown EMF+ record %x %04x %08x\n", header->Type, header->Flags, header->Size); + break; + } + + if (length<sizeof(*header) || header->Size%4) + return -1; + + length -= sizeof(*header); + offset += sizeof(*header); + + for (i=0; i<header->Size-sizeof(*header); i+=4) + { + if (i%16 == 0) + printf(" "); + if (!(ptr = PRD(offset, 4))) return -1; + length -= 4; + offset += 4; + printf("%08x ", read_int(ptr)); + if ((i % 16 == 12) || (i + 4 == header->Size - sizeof(*header))) + printf("\n"); + } + } + + return 0; + } + + break; + } + EMRCASE(EMR_FILLRGN); EMRCASE(EMR_FRAMERGN); EMRCASE(EMR_INVERTRGN); @@ -178,7 +301,7 @@ static int dump_emfrecord(void) if (length >= sizeof(*clip) + sizeof(*data)) rc_count = data->rdh.nCount; - printf("%-20s %08x\n", "EMREXTSELECTCLIPRGN", length); + printf("%-20s %08x\n", "EMR_EXTSELECTCLIPRGN", length); printf("mode %d, rects %d\n", clip->iMode, rc_count); for (i = 0, rc = (const RECT *)data->Buffer; i < rc_count; i++, rc++) printf(" (%d,%d)-(%d,%d)", rc->left, rc->top, rc->right, rc->bottom);

1 0

Hugh McMaster : regedit/tests: Fix another incorrectly named registry key.
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: 55d43d13e44e276618d8723df97e165d189ef053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55d43d13e44e276618d8723df… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 30 13:42:25 2017 +0000 regedit/tests: Fix another incorrectly named registry key. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 4eaaeb3..71d0f14 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -488,12 +488,12 @@ static void test_basic_import(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Wine62a\"=hex(7):4c,69,6e,65,20,\\"); - lr = RegQueryValueExA(hkey, "Wine62a", NULL, NULL, NULL, NULL); + "\"Wine17\"=hex(7):4c,69,6e,65,20,\\"); + lr = RegQueryValueExA(hkey, "Wine17", NULL, NULL, NULL, NULL); todo_wine ok(lr == ERROR_SUCCESS || broken(lr == ERROR_FILE_NOT_FOUND) /* WinXP */, "got %u, expected 0\n", lr); if (lr == ERROR_SUCCESS) - todo_wine verify_reg(hkey, "Wine62a", REG_MULTI_SZ, "Line ", 6, 0); + todo_wine verify_reg(hkey, "Wine17", REG_MULTI_SZ, "Line ", 6, 0); RegCloseKey(hkey);

1 0

Nikolay Sivov : d3drm/tests: Some tests for animation keys handling.
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: 31763493873e9991e2e0af5b6660ffb7da30366f URL: http://source.winehq.org/git/wine.git/?a=commit;h=31763493873e9991e2e0af5b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 30 10:41:22 2017 +0300 d3drm/tests: Some tests for animation keys handling. 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/tests/d3drm.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 950edb1..dcc6dd2 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -6708,10 +6708,15 @@ static void test_animation(void) IDirect3DRMAnimation *animation; D3DRMANIMATIONOPTIONS options; IDirect3DRMObject *obj, *obj2; + D3DRMANIMATIONKEY keys[10]; IDirect3DRMFrame3 *frame3; IDirect3DRMFrame *frame; + D3DRMANIMATIONKEY key; IDirect3DRM *d3drm1; + D3DRMQUATERNION q; + DWORD count, i; HRESULT hr; + D3DVECTOR v; hr = Direct3DRMCreate(&d3drm1); ok(SUCCEEDED(hr), "Failed to create IDirect3DRM instance, hr 0x%08x.\n", hr); @@ -6829,6 +6834,141 @@ static void test_animation(void) options = IDirect3DRMAnimation_GetOptions(animation); ok(options == D3DRMANIMATION_OPEN, "Unexpected options %#x.\n", options); + /* Key management. */ + hr = IDirect3DRMAnimation_AddPositionKey(animation, 0.0f, 1.0f, 0.0f, 0.0f); +todo_wine + ok(SUCCEEDED(hr), "Failed to add position key, hr %#x.\n", hr); + +if (hr == S_OK) +{ + hr = IDirect3DRMAnimation_AddScaleKey(animation, 0.0f, 1.0f, 2.0f, 1.0f); + ok(SUCCEEDED(hr), "Failed to add scale key, hr %#x.\n", hr); + + hr = IDirect3DRMAnimation_AddPositionKey(animation, 0.0f, 2.0f, 0.0f, 0.0f); + ok(SUCCEEDED(hr), "Failed to add position key, hr %#x.\n", hr); + + hr = IDirect3DRMAnimation_AddPositionKey(animation, 99.0f, 3.0f, 1.0f, 0.0f); + ok(SUCCEEDED(hr), "Failed to add position key, hr %#x.\n", hr); + + hr = IDirect3DRMAnimation_AddPositionKey(animation, 80.0f, 4.0f, 1.0f, 0.0f); + ok(SUCCEEDED(hr), "Failed to add position key, hr %#x.\n", hr); + + v.x = 1.0f; + v.y = 0.0f; + v.z = 0.0f; + D3DRMQuaternionFromRotation(&q, &v, 1.0f); + + hr = IDirect3DRMAnimation_AddRotateKey(animation, 0.0f, &q); + ok(SUCCEEDED(hr), "Failed to add rotation key, hr %#.x\n", hr); + + count = 0; + memset(keys, 0, sizeof(keys)); + hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 99.0f, &count, keys); + ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#x.\n", hr); + ok(count == 6, "Unexpected key count %u.\n", count); + + ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %u.\n", keys[0].dwKeyType); + ok(keys[1].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[1].dwKeyType); + ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[2].dwKeyType); + ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[3].dwKeyType); + ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[4].dwKeyType); + ok(keys[5].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %u.\n", keys[5].dwKeyType); + + /* Relative order, keys are returned sorted by time. */ + ok(keys[1].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[1].dvTime); + ok(keys[2].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[2].dvTime); + ok(keys[3].dvTime == 80.0f, "Unexpected key time %.8e.\n", keys[3].dvTime); + ok(keys[4].dvTime == 99.0f, "Unexpected key time %.8e.\n", keys[4].dvTime); + + /* For keys with same time, order they were added in is kept. */ + ok(keys[1].dvPositionKey.x == 1.0f, "Unexpected key position x %.8e.\n", keys[1].dvPositionKey.x); + ok(keys[2].dvPositionKey.x == 2.0f, "Unexpected key position x %.8e.\n", keys[2].dvPositionKey.x); + ok(keys[3].dvPositionKey.x == 4.0f, "Unexpected key position x %.8e.\n", keys[3].dvPositionKey.x); + ok(keys[4].dvPositionKey.x == 3.0f, "Unexpected key position x %.8e.\n", keys[4].dvPositionKey.x); + + for (i = 0; i < count; i++) + { + ok(keys[i].dwSize == sizeof(*keys), "%u: unexpected dwSize value %u.\n", i, keys[i].dwSize); + + switch (keys[i].dwKeyType) + { + case D3DRMANIMATION_ROTATEKEY: + ok((keys[i].dwID & 0xf0000000) == 0x40000000, "%u: unexpected id mask %#x.\n", i, keys[i].dwID); + break; + case D3DRMANIMATION_POSITIONKEY: + ok((keys[i].dwID & 0xf0000000) == 0x80000000, "%u: unexpected id mask %#x.\n", i, keys[i].dwID); + break; + case D3DRMANIMATION_SCALEKEY: + ok((keys[i].dwID & 0xf0000000) == 0xc0000000, "%u: unexpected id mask %#x.\n", i, keys[i].dwID); + break; + default: + ok(0, "%u: unknown key type %d.\n", i, keys[i].dwKeyType); + } + } + + /* No keys in this range. */ + count = 10; + hr = IDirect3DRMAnimation2_GetKeys(animation2, 100.0f, 200.0f, &count, NULL); + ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#x.\n", hr); + ok(count == 0, "Unexpected key count %u.\n", count); + + count = 10; + hr = IDirect3DRMAnimation2_GetKeys(animation2, 100.0f, 200.0f, &count, keys); + ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#x.\n", hr); + ok(count == 0, "Unexpected key count %u.\n", count); + + count = 10; + hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 0.0f, &count, NULL); + ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get animation keys, hr %#x.\n", hr); + ok(count == 4, "Unexpected key count %u.\n", count); + + hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 100.0f, NULL, NULL); + ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr); + + /* Time is 0-based. */ + count = 123; + hr = IDirect3DRMAnimation2_GetKeys(animation2, -100.0f, -50.0f, NULL, NULL); + ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr); + ok(count == 123, "Unexpected key count %u.\n", count); + + count = 10; + hr = IDirect3DRMAnimation2_GetKeys(animation2, -100.0f, -50.0f, &count, NULL); + ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#x.\n", hr); + ok(count == 0, "Unexpected key count %u.\n", count); + + count = 10; + hr = IDirect3DRMAnimation2_GetKeys(animation2, -100.0f, 100.0f, &count, NULL); + ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#x.\n", hr); + ok(count == 6, "Unexpected key count %u.\n", count); + + /* AddKey() tests. */ + hr = IDirect3DRMAnimation2_AddKey(animation2, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + memset(&key, 0, sizeof(key)); + key.dwKeyType = D3DRMANIMATION_POSITIONKEY; + hr = IDirect3DRMAnimation2_AddKey(animation2, &key); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + memset(&key, 0, sizeof(key)); + key.dwSize = sizeof(key) - 1; + key.dwKeyType = D3DRMANIMATION_POSITIONKEY; + hr = IDirect3DRMAnimation2_AddKey(animation2, &key); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + memset(&key, 0, sizeof(key)); + key.dwSize = sizeof(key) + 1; + key.dwKeyType = D3DRMANIMATION_POSITIONKEY; + hr = IDirect3DRMAnimation2_AddKey(animation2, &key); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + memset(&key, 0, sizeof(key)); + key.dwSize = sizeof(key); + key.dwKeyType = D3DRMANIMATION_POSITIONKEY; + hr = IDirect3DRMAnimation2_AddKey(animation2, &key); + ok(SUCCEEDED(hr), "Failed to add key, hr %#x.\n", hr); +} IDirect3DRMAnimation2_Release(animation2); IDirect3DRMAnimation_Release(animation);

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: 4c85b8e37cf59d5e113ea001e8357553c82d577a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c85b8e37cf59d5e113ea001e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 30 10:41:02 2017 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 280 +++++++++++++++++++++++---------------------------------------- 1 file changed, 100 insertions(+), 180 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c85b8e37cf59d5e113ea…

1 0

Jacek Caban : winhttp/tests: Get rid of unneeded Sleep() call.
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: fc33e982d79a9e791e0b22accf7fc72934076dd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc33e982d79a9e791e0b22acc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 30 18:04:22 2017 +0200 winhttp/tests: Get rid of unneeded Sleep() call. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/notification.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 5d76d12..0f0f7b8 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -604,6 +604,5 @@ START_TEST (notification) { test_connection_cache(); test_redirect(); - Sleep(2000); /* make sure previous connection is evicted from cache */ test_async(); }

1 0

Nikolay Sivov : d3drm: Use AddKey() method internally to add all types of keys.
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: 9ba36da7111b696bfd75637b6068f4435f3a7fa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ba36da7111b696bfd75637b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 30 10:41:23 2017 +0300 d3drm: Use AddKey() method internally to add all types of keys. 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/frame.c | 106 +++++++++++++++++++++++++++++++---------------- dlls/d3drm/tests/d3drm.c | 1 + 2 files changed, 71 insertions(+), 36 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 79a3cb0..a2643fb 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -3272,27 +3272,91 @@ static HRESULT WINAPI d3drm_animation1_SetOptions(IDirect3DRMAnimation *iface, D return d3drm_animation2_SetOptions(&animation->IDirect3DRMAnimation2_iface, options); } -static HRESULT WINAPI d3drm_animation1_AddRotateKey(IDirect3DRMAnimation *iface, D3DVALUE time, D3DRMQUATERNION *q) +static HRESULT WINAPI d3drm_animation2_AddKey(IDirect3DRMAnimation2 *iface, D3DRMANIMATIONKEY *key) { - FIXME("iface %p, time %.8e, q %p.\n", iface, time, q); + FIXME("iface %p, key %p.\n", iface, key); return E_NOTIMPL; } +static HRESULT WINAPI d3drm_animation2_AddRotateKey(IDirect3DRMAnimation2 *iface, D3DVALUE time, D3DRMQUATERNION *q) +{ + D3DRMANIMATIONKEY key; + + TRACE("iface %p, time %.8e, q %p.\n", iface, time, q); + + key.dwSize = sizeof(key); + key.dwKeyType = D3DRMANIMATION_ROTATEKEY; + key.dvTime = time; + key.dwID = 0; + key.u.dqRotateKey = *q; + + return d3drm_animation2_AddKey(iface, &key); +} + +static HRESULT WINAPI d3drm_animation1_AddRotateKey(IDirect3DRMAnimation *iface, D3DVALUE time, D3DRMQUATERNION *q) +{ + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation(iface); + + TRACE("iface %p, time %.8e, q %p.\n", iface, time, q); + + return d3drm_animation2_AddRotateKey(&animation->IDirect3DRMAnimation2_iface, time, q); +} + +static HRESULT WINAPI d3drm_animation2_AddPositionKey(IDirect3DRMAnimation2 *iface, D3DVALUE time, + D3DVALUE x, D3DVALUE y, D3DVALUE z) +{ + D3DRMANIMATIONKEY key; + + TRACE("iface %p, time %.8e, x %.8e, y %.8e, z %.8e.\n", iface, time, x, y, z); + + key.dwSize = sizeof(key); + key.dwKeyType = D3DRMANIMATION_POSITIONKEY; + key.dvTime = time; + key.dwID = 0; + key.u.dvPositionKey.u1.x = x; + key.u.dvPositionKey.u2.y = y; + key.u.dvPositionKey.u3.z = z; + + return d3drm_animation2_AddKey(iface, &key); +} + static HRESULT WINAPI d3drm_animation1_AddPositionKey(IDirect3DRMAnimation *iface, D3DVALUE time, D3DVALUE x, D3DVALUE y, D3DVALUE z) { - FIXME("iface %p, time %.8e, x %.8e, y %.8e, z %.8e.\n", iface, time, x, y, z); + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation(iface); - return E_NOTIMPL; + TRACE("iface %p, time %.8e, x %.8e, y %.8e, z %.8e.\n", iface, time, x, y, z); + + return d3drm_animation2_AddPositionKey(&animation->IDirect3DRMAnimation2_iface, time, x, y, z); +} + +static HRESULT WINAPI d3drm_animation2_AddScaleKey(IDirect3DRMAnimation2 *iface, D3DVALUE time, + D3DVALUE x, D3DVALUE y, D3DVALUE z) +{ + D3DRMANIMATIONKEY key; + + TRACE("iface %p, time %.8e, x %.8e, y %.8e, z %.8e.\n", iface, time, x, y, z); + + key.dwSize = sizeof(key); + key.dwKeyType = D3DRMANIMATION_SCALEKEY; + key.dvTime = time; + key.dwID = 0; + key.u.dvScaleKey.u1.x = x; + key.u.dvScaleKey.u2.y = y; + key.u.dvScaleKey.u3.z = z; + + return d3drm_animation2_AddKey(iface, &key); } static HRESULT WINAPI d3drm_animation1_AddScaleKey(IDirect3DRMAnimation *iface, D3DVALUE time, D3DVALUE x, D3DVALUE y, D3DVALUE z) { - FIXME("iface %p, time %.8e, x %.8e, y %.8e, z %.8e.\n", iface, time, x, y, z); + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation(iface); - return E_NOTIMPL; + TRACE("iface %p, time %.8e, x %.8e, y %.8e, z %.8e.\n", iface, time, x, y, z); + + return d3drm_animation2_AddScaleKey(&animation->IDirect3DRMAnimation2_iface, time, x, y, z); } static HRESULT WINAPI d3drm_animation1_DeleteKey(IDirect3DRMAnimation *iface, D3DVALUE time) @@ -3346,29 +3410,6 @@ static D3DRMANIMATIONOPTIONS WINAPI d3drm_animation1_GetOptions(IDirect3DRMAnima return d3drm_animation2_GetOptions(&animation->IDirect3DRMAnimation2_iface); } -static HRESULT WINAPI d3drm_animation2_AddRotateKey(IDirect3DRMAnimation2 *iface, D3DVALUE time, D3DRMQUATERNION *q) -{ - FIXME("iface %p, time %.8e, q %p.\n", iface, time, q); - - return E_NOTIMPL; -} - -static HRESULT WINAPI d3drm_animation2_AddPositionKey(IDirect3DRMAnimation2 *iface, D3DVALUE time, - D3DVALUE x, D3DVALUE y, D3DVALUE z) -{ - FIXME("iface %p, time %.8e, x %.8e, y %.8e, z %.8e.\n", iface, time, x, y, z); - - return E_NOTIMPL; -} - -static HRESULT WINAPI d3drm_animation2_AddScaleKey(IDirect3DRMAnimation2 *iface, D3DVALUE time, - D3DVALUE x, D3DVALUE y, D3DVALUE z) -{ - FIXME("iface %p, time %.8e, x %.8e, y %.8e, z %.8e.\n", iface, time, x, y, z); - - return E_NOTIMPL; -} - static HRESULT WINAPI d3drm_animation2_DeleteKey(IDirect3DRMAnimation2 *iface, D3DVALUE time) { FIXME("iface %p, time %.8e.\n", iface, time); @@ -3417,13 +3458,6 @@ static HRESULT WINAPI d3drm_animation2_DeleteKeyByID(IDirect3DRMAnimation2 *ifac return E_NOTIMPL; } -static HRESULT WINAPI d3drm_animation2_AddKey(IDirect3DRMAnimation2 *iface, D3DRMANIMATIONKEY *key) -{ - FIXME("iface %p, key %p.\n", iface, key); - - return E_NOTIMPL; -} - static HRESULT WINAPI d3drm_animation2_ModifyKey(IDirect3DRMAnimation2 *iface, D3DRMANIMATIONKEY *key) { FIXME("iface %p, key %p.\n", iface, key); diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index dcc6dd2..3613b57 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -6858,6 +6858,7 @@ if (hr == S_OK) v.z = 0.0f; D3DRMQuaternionFromRotation(&q, &v, 1.0f); + /* NULL quaternion pointer leads to a crash on Windows. */ hr = IDirect3DRMAnimation_AddRotateKey(animation, 0.0f, &q); ok(SUCCEEDED(hr), "Failed to add rotation key, hr %#.x\n", hr);

1 0

Pierre Schweitzer : mpr: Implement WNetConnectionDialog().
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: 26192671700360859cd8a0133dabcd96ec1a786b URL: http://source.winehq.org/git/wine.git/?a=commit;h=26192671700360859cd8a0133… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Sun Jul 2 11:52:59 2017 +0200 mpr: Implement WNetConnectionDialog(). Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index bfe6275..7b24693 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -2440,10 +2440,18 @@ DWORD WINAPI WNetGetUserW( LPCWSTR lpName, LPWSTR lpUserID, LPDWORD lpBufferSize */ DWORD WINAPI WNetConnectionDialog( HWND hwnd, DWORD dwType ) { - FIXME( "(%p, %08X): stub\n", hwnd, dwType ); + CONNECTDLGSTRUCTW conn_dlg; + NETRESOURCEW net_res; - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + ZeroMemory(&conn_dlg, sizeof(conn_dlg)); + ZeroMemory(&net_res, sizeof(net_res)); + + conn_dlg.cbStructure = sizeof(conn_dlg); + conn_dlg.lpConnRes = &net_res; + conn_dlg.hwndOwner = hwnd; + net_res.dwType = dwType; + + return WNetConnectionDialog1W(&conn_dlg); } /*********************************************************************

1 0

Hugh McMaster : reg/tests: Test the effect of whitespace-only lines during hex data concatenation.
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: 499cce6e765b71cd03f98f7382a09f9042d74e2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=499cce6e765b71cd03f98f738… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 30 13:42:16 2017 +0000 reg/tests: Test the effect of whitespace-only lines during hex data concatenation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 9a974b4..316a3f6 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -2065,6 +2065,16 @@ static void test_import(void) test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine60f\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,\\\n \n" + " 63,61,74,\\\n\t\n\t\n" + " 65,6e,\\\n\t \t\n\t \t\n\t \t\n" + " 61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine60f", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine61a\"=hex(0):25,48,4f,4d,45,25,5c,/\n" " 25,50,41,54,48,25,00\n" "\"Wine61b\"=hex(0):25,48,4f,4d,45,25,5c/\n" @@ -3349,6 +3359,16 @@ static void test_unicode_import(void) test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine60f\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" + " 63,00,6f,00,6e,00,\\\n \n" + " 63,00,61,00,74,00,\\\n\t\n\t\n" + " 65,00,6e,00,\\\n\t \t\n\t \t\n\t \t\n" + " 61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine60f", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine61a\"=hex(0):25,48,4f,4d,45,25,5c,/\n" " 25,50,41,54,48,25,00\n" "\"Wine61b\"=hex(0):25,48,4f,4d,45,25,5c/\n"

1 0

Nikolay Sivov : d3drm/tests: Additional test for SetOptions().
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: 84d340683e2cef51f719765d4f6f195c3f1cc84e URL: http://source.winehq.org/git/wine.git/?a=commit;h=84d340683e2cef51f719765d4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 30 10:41:21 2017 +0300 d3drm/tests: Additional test for SetOptions(). 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/tests/d3drm.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 9b166aa..950edb1 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -6804,6 +6804,13 @@ static void test_animation(void) ok(options == (D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION), "Unexpected default options %#x.\n", options); + /* Mask contains undefined bits together with valid one. */ + hr = IDirect3DRMAnimation_SetOptions(animation, 0xf0000000 | D3DRMANIMATION_OPEN); + ok(SUCCEEDED(hr), "Failed to set animation options, hr %#x.\n", hr); + + options = IDirect3DRMAnimation_GetOptions(animation); + ok(options == (0xf0000000 | D3DRMANIMATION_OPEN), "Unexpected animation options %#x.\n", options); + hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_SCALEANDROTATION); ok(SUCCEEDED(hr), "Failed to set animation options, hr %#x.\n", hr);

1 0