June 2017 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : dmime: Support more interfaces in IDirectMusicAudioPath.GetObjectInPath.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: f62a891385f3f58925787283254171f2a25e215d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f62a891385f3f589257872832… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 28 10:50:52 2017 +0000 dmime: Support more interfaces in IDirectMusicAudioPath.GetObjectInPath. 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/dmime/audiopath.c | 21 ++++++++++----------- dlls/dmime/tests/dmime.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 11 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index 04f0af0..cc7e4d1 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -137,17 +137,16 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud case DMUS_PATH_BUFFER: if (This->pDSBuffer) { - if (IsEqualIID (iidInterface, &IID_IDirectSoundBuffer8)) { - IDirectSoundBuffer8_QueryInterface (This->pDSBuffer, &IID_IDirectSoundBuffer8, ppObject); - TRACE("returning %p\n",*ppObject); - return S_OK; - } else if (IsEqualIID (iidInterface, &IID_IDirectSound3DBuffer)) { - IDirectSoundBuffer8_QueryInterface (This->pDSBuffer, &IID_IDirectSound3DBuffer, ppObject); - TRACE("returning %p\n",*ppObject); - return S_OK; - } else { - FIXME("Bad iid\n"); - } + if (IsEqualIID (iidInterface, &IID_IUnknown) || + IsEqualIID (iidInterface, &IID_IDirectSoundBuffer) || + IsEqualIID (iidInterface, &IID_IDirectSoundBuffer8) || + IsEqualIID (iidInterface, &IID_IDirectSound3DBuffer)) { + return IDirectSoundBuffer8_QueryInterface (This->pDSBuffer, iidInterface, ppObject); + } + + WARN("Unsupported interface %s\n", debugstr_dmguid(iidInterface)); + *ppObject = NULL; + return E_NOINTERFACE; } break; diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index a154eac..62a977e 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -23,6 +23,7 @@ #include <wine/test.h> #include <dmusici.h> #include <audioclient.h> +#include <guiddef.h> #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) @@ -45,8 +46,14 @@ static void test_COM_audiopath(void) IDirectMusicAudioPath *dmap; IUnknown *unk; IDirectMusicPerformance8 *performance; + IDirectSoundBuffer *dsound; + IDirectSoundBuffer8 *dsound8; + IDirectSoundNotify *notify; + IDirectSound3DBuffer *dsound3d; + IKsPropertySet *propset; ULONG refcount; HRESULT hr; + DWORD buffer = 0; hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (void**)&performance); @@ -89,6 +96,39 @@ static void test_COM_audiopath(void) ok(refcount == 5, "refcount == %u, expected 5\n", refcount); refcount = IUnknown_Release(unk); + hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, + 0, &IID_IDirectSoundBuffer, (void**)&dsound); + ok(hr == S_OK, "Failed: %08x\n", hr); + IDirectSoundBuffer_Release(dsound); + + hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, + 0, &IID_IDirectSoundBuffer8, (void**)&dsound8); + ok(hr == S_OK, "Failed: %08x\n", hr); + IDirectSoundBuffer8_Release(dsound8); + + hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, + 0, &IID_IDirectSoundNotify, (void**)&notify); + ok(hr == E_NOINTERFACE, "Failed: %08x\n", hr); + + hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, + 0, &IID_IDirectSound3DBuffer, (void**)&dsound3d); + ok(hr == E_NOINTERFACE, "Failed: %08x\n", hr); + + hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, + 0, &IID_IKsPropertySet, (void**)&propset); + todo_wine ok(hr == S_OK, "Failed: %08x\n", hr); + if (propset) + IKsPropertySet_Release(propset); + + hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, + 0, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "Failed: %08x\n", hr); + IUnknown_Release(unk); + + hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, + 0, &GUID_NULL, (void**)&unk); + ok(hr == E_NOINTERFACE, "Failed: %08x\n", hr); + while (IDirectMusicAudioPath_Release(dmap) > 1); /* performance has a reference too */ IDirectMusicPerformance8_CloseDown(performance); IDirectMusicPerformance8_Release(performance);

1 0

Hugh McMaster : regedit: Free the binary data buffer after saving the new value (Coverity).
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: b25337e6d6b7bfc9717d2c66f7c9b0b01a04929f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b25337e6d6b7bfc9717d2c66f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 28 10:47:29 2017 +0000 regedit: Free the binary data buffer after saving the new value (Coverity). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 403def4..2c47bdc 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -165,6 +165,7 @@ static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPara { SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, (WPARAM)cbData, (LPARAM)pData); lRet = RegSetValueExW(params->hKey, params->lpszValueName, 0, REG_BINARY, pData, cbData); + HeapFree(GetProcessHeap(), 0, pData); } else lRet = ERROR_OUTOFMEMORY;

1 0

Francois Gouget : testbot/WineRunTask: Always take a screenshot.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: tools Branch: master Commit: 36e720d046620ec65da53adf8ee1593b7bb3906a URL: http://source.winehq.org/git/tools.git/?a=commit;h=36e720d046620ec65da53adf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 28 09:49:04 2017 +0200 testbot/WineRunTask: Always take a screenshot. Even if we were not able to send the test file. Maybe the screenshot will show a helpful Windows error message like "network connection lost". Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 615d898..1663c10 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -64,7 +64,7 @@ sub TakeScreenshot($$) my ($VM, $FullScreenshotFileName) = @_; my ($ErrMessage, $ImageSize, $ImageBytes) = $VM->CaptureScreenImage(); - if (! defined($ErrMessage)) + if (!defined $ErrMessage) { my $OldUMask = umask(002); if (open(my $Screenshot, ">", $FullScreenshotFileName)) @@ -78,9 +78,9 @@ sub TakeScreenshot($$) } umask($OldUMask); } - else + elsif ($VM->IsPoweredOn()) { - Error "Can't capture screenshot: $ErrMessage\n"; + Error "Could not capture a screenshot: $ErrMessage\n"; } } @@ -222,6 +222,9 @@ sub WrapUpAndExit($;$$) my ($Status, $TestFailures, $Retry) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : 'dirty'; + Debug(Elapsed($Start), " Taking a screenshot\n"); + TakeScreenshot($VM, $FullScreenshotFileName); + my $Tries = $Task->TestFailures || 0; if ($Retry) { @@ -755,10 +758,6 @@ elsif (!defined $TAError) } $TA->Disconnect(); - -Debug(Elapsed($Start), " Taking a screenshot\n"); -TakeScreenshot($VM, $FullScreenshotFileName); - FatalTAError(undef, $TAError, $PossibleCrash) if (defined $TAError);

1 0

Paul Gofman : d3dx9: Get rid of constant' s length checking for matrix in set_constants().
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 0029128464922a6d714fd33709b0a2e4a8c5eb71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0029128464922a6d714fd3370… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jun 22 16:11:55 2017 +0300 d3dx9: Get rid of constant's length checking for matrix in set_constants(). When count in const_upload_info is calculated precisely (considering actual constant set length), boolean matrix setting fall in direct copy path, unless transpose is required. The case of incomplete last row for matrix should be handled in set_constants() for transposed boolean constant only. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 46 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 3b06f66..25374a3 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -269,6 +269,7 @@ struct const_upload_info unsigned int major_stride; unsigned int major_count; unsigned int count; + unsigned int minor_remainder; }; static enum pres_value_type table_type_from_param_type(D3DXPARAMETER_TYPE type) @@ -1038,10 +1039,22 @@ static void get_const_upload_info(struct d3dx_const_param_eval_output *const_set info->major = param->rows; info->minor = param->columns; } - info->major_stride = max(info->minor, get_reg_components(table)); - info->major_count = min(info->major * info->major_stride, - get_offset_reg(table, const_set->register_count) + info->major_stride - 1) / info->major_stride; - info->count = info->major_count * info->minor; + + if (get_reg_components(table) == 1) + { + unsigned int const_length = get_offset_reg(table, const_set->register_count); + + info->major_stride = info->minor; + info->major_count = const_length / info->major_stride; + info->minor_remainder = const_length % info->major_stride; + } + else + { + info->major_stride = get_reg_components(table); + info->major_count = const_set->register_count; + info->minor_remainder = 0; + } + info->count = info->major_count * info->minor + info->minor_remainder; } static void pres_int_from_float(void *out, const void *in, unsigned int count) @@ -1172,16 +1185,19 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const { for (j = 0; j < info.minor; ++j) { - unsigned int offset; - - offset = i * info.major_stride + j; - if (get_reg_offset(table, offset) >= const_set->register_count) - break; if (info.transpose) param_offset = i + j * info.major; else param_offset = i * info.minor + j; - out[offset] = data[param_offset]; + out[i * info.major_stride + j] = data[param_offset]; + } + } + if (info.transpose) + { + for (j = 0; j < info.minor_remainder; ++j) + { + param_offset = i + j * info.major; + out[i * info.major_stride + j] = data[param_offset]; } } start_offset += get_offset_reg(table, const_set->register_count); @@ -1417,6 +1433,16 @@ static HRESULT init_set_constants_param(struct d3dx_const_tab *const_tab, ID3DXC && !info.transpose && info.minor == info.major_stride && info.count == get_offset_reg(const_set.table, const_set.register_count) && info.count * sizeof(unsigned int) <= param->bytes; + if (info.minor_remainder && !const_set.direct_copy && !info.transpose) + FIXME("Incomplete last row for not transposed matrix which cannot be directly copied, parameter %s.\n", + debugstr_a(param->name)); + + if (info.major_count > info.major + || (info.major_count == info.major && info.minor_remainder)) + { + WARN("Constant dimensions exceed parameter size.\n"); + return D3DERR_INVALIDCALL; + } if (FAILED(hr = append_const_set(const_tab, &const_set))) return hr;

1 0

Paul Gofman : d3dx9: Move transpose 'if' outside of the inner loop in set_constants().
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 08df007e802dfa2845a5b4f33bbf8a04202258bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=08df007e802dfa2845a5b4f33… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jun 22 16:11:56 2017 +0300 d3dx9: Move transpose 'if' outside of the inner loop in set_constants(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 25374a3..911ca79 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1141,7 +1141,6 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const unsigned int table = const_set->table; struct d3dx_parameter *param = const_set->param; unsigned int element, i, j, start_offset; - unsigned int param_offset; struct const_upload_info info; unsigned int *data = param->data; enum pres_value_type param_type; @@ -1181,24 +1180,20 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const /* Store reshaped but (possibly) not converted yet data temporarily in the same constants buffer. * All the supported types of parameters and table values have the same size. */ - for (i = 0; i < info.major_count; ++i) - { - for (j = 0; j < info.minor; ++j) - { - if (info.transpose) - param_offset = i + j * info.major; - else - param_offset = i * info.minor + j; - out[i * info.major_stride + j] = data[param_offset]; - } - } if (info.transpose) { + for (i = 0; i < info.major_count; ++i) + for (j = 0; j < info.minor; ++j) + out[i * info.major_stride + j] = data[i + j * info.major]; + for (j = 0; j < info.minor_remainder; ++j) - { - param_offset = i + j * info.major; - out[i * info.major_stride + j] = data[param_offset]; - } + out[i * info.major_stride + j] = data[i + j * info.major]; + } + else + { + for (i = 0; i < info.major_count; ++i) + for (j = 0; j < info.minor; ++j) + out[i * info.major_stride + j] = data[i * info.minor + j]; } start_offset += get_offset_reg(table, const_set->register_count); data += param->rows * param->columns;

1 0

Zebediah Figura : msi: Implement UI messages in MsiOpenPackage().
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 9032279c728186d81d4d965b769f7de7eaf634c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9032279c728186d81d4d965b7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 26 20:28:02 2017 -0500 msi: Implement UI messages in MsiOpenPackage(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msi.rc | 2 + dlls/msi/package.c | 53 +++++++++++++ dlls/msi/resource.h | 2 + dlls/msi/tests/format.c | 18 +++++ po/ar.po | 196 +++++++++++++++++++++++++----------------------- po/bg.po | 196 +++++++++++++++++++++++++----------------------- po/ca.po | 196 +++++++++++++++++++++++++----------------------- po/cs.po | 196 +++++++++++++++++++++++++----------------------- po/da.po | 196 +++++++++++++++++++++++++----------------------- po/de.po | 196 +++++++++++++++++++++++++----------------------- po/el.po | 196 +++++++++++++++++++++++++----------------------- po/en.po | 196 +++++++++++++++++++++++++----------------------- po/en_US.po | 196 +++++++++++++++++++++++++----------------------- po/eo.po | 196 +++++++++++++++++++++++++----------------------- po/es.po | 196 +++++++++++++++++++++++++----------------------- po/fa.po | 196 +++++++++++++++++++++++++----------------------- po/fi.po | 196 +++++++++++++++++++++++++----------------------- po/fr.po | 196 +++++++++++++++++++++++++----------------------- po/he.po | 196 +++++++++++++++++++++++++----------------------- po/hi.po | 196 +++++++++++++++++++++++++----------------------- po/hr.po | 196 +++++++++++++++++++++++++----------------------- po/hu.po | 196 +++++++++++++++++++++++++----------------------- po/it.po | 196 +++++++++++++++++++++++++----------------------- po/ja.po | 196 +++++++++++++++++++++++++----------------------- po/ko.po | 196 +++++++++++++++++++++++++----------------------- po/lt.po | 196 +++++++++++++++++++++++++----------------------- po/ml.po | 196 +++++++++++++++++++++++++----------------------- po/nb_NO.po | 196 +++++++++++++++++++++++++----------------------- po/nl.po | 196 +++++++++++++++++++++++++----------------------- po/or.po | 196 +++++++++++++++++++++++++----------------------- po/pa.po | 196 +++++++++++++++++++++++++----------------------- po/pl.po | 196 +++++++++++++++++++++++++----------------------- po/pt_BR.po | 196 +++++++++++++++++++++++++----------------------- po/pt_PT.po | 196 +++++++++++++++++++++++++----------------------- po/rm.po | 196 +++++++++++++++++++++++++----------------------- po/ro.po | 196 +++++++++++++++++++++++++----------------------- po/ru.po | 196 +++++++++++++++++++++++++----------------------- po/sk.po | 196 +++++++++++++++++++++++++----------------------- po/sl.po | 196 +++++++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 196 +++++++++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 196 +++++++++++++++++++++++++----------------------- po/sv.po | 196 +++++++++++++++++++++++++----------------------- po/te.po | 196 +++++++++++++++++++++++++----------------------- po/th.po | 196 +++++++++++++++++++++++++----------------------- po/tr.po | 196 +++++++++++++++++++++++++----------------------- po/uk.po | 196 +++++++++++++++++++++++++----------------------- po/wa.po | 196 +++++++++++++++++++++++++----------------------- po/wine.pot | 196 +++++++++++++++++++++++++----------------------- po/zh_CN.po | 196 +++++++++++++++++++++++++----------------------- po/zh_TW.po | 196 +++++++++++++++++++++++++----------------------- 50 files changed, 4767 insertions(+), 4324 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9032279c728186d81d4d9…

1 0

Alexandre Julliard : secur32/tests: Add some braces to silence a clang warning.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 9d38b8ee6f85e3241b58619fed7bd89025201958 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d38b8ee6f85e3241b58619fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 27 12:12:40 2017 +0200 secur32/tests: Add some braces to silence a clang warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/ntlm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index d11cef7..254b668 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -574,7 +574,7 @@ static void testInitializeSecurityContextFlags(void) { SECURITY_STATUS sec_status; PSecPkgInfoA pkg_info = NULL; - SspiData client = {0}; + SspiData client = {{0}}; SEC_WINNT_AUTH_IDENTITY_A id; ULONG req_attr, ctxt_attr; TimeStamp ttl; @@ -794,7 +794,7 @@ static void testAuth(ULONG data_rep, BOOL fake) SECURITY_STATUS sec_status; PSecPkgInfoA pkg_info = NULL; BOOL first = TRUE; - SspiData client = {0}, server = {0}; + SspiData client = {{0}}, server = {{0}}; SEC_WINNT_AUTH_IDENTITY_A id; SecPkgContext_Sizes ctxt_sizes; @@ -923,7 +923,7 @@ static void testSignSeal(void) SECURITY_STATUS sec_status; PSecPkgInfoA pkg_info = NULL; BOOL first = TRUE; - SspiData client = {0}, server = {0}; + SspiData client = {{0}}, server = {{0}}; SEC_WINNT_AUTH_IDENTITY_A id; static char sec_pkg_name[] = "NTLM"; SecBufferDesc crypt;

1 0

Alexandre Julliard : ws2_32/tests: Print IP addresses as unsigned.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 33a4d90138c10345e68a98c6af7460a77b28e2d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33a4d90138c10345e68a98c6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 27 19:12:10 2017 +0200 ws2_32/tests: Print IP addresses as unsigned. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 23464ac..f3ba11c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4757,7 +4757,7 @@ static void test_gethostbyname_hack(void) } ok(memcmp(he->h_addr_list[0], loopback, he->h_length) == 0, - "gethostbyname(\"localhost\") returned %d.%d.%d.%d\n", + "gethostbyname(\"localhost\") returned %u.%u.%u.%u\n", he->h_addr_list[0][0], he->h_addr_list[0][1], he->h_addr_list[0][2], he->h_addr_list[0][3]); } @@ -4781,7 +4781,7 @@ static void test_gethostbyname_hack(void) if (he->h_addr_list[0][0] == 127) { ok(memcmp(he->h_addr_list[0], magic_loopback, he->h_length) == 0, - "gethostbyname(\"%s\") returned %d.%d.%d.%d not 127.12.34.56\n", + "gethostbyname(\"%s\") returned %u.%u.%u.%u not 127.12.34.56\n", name, he->h_addr_list[0][0], he->h_addr_list[0][1], he->h_addr_list[0][2], he->h_addr_list[0][3]); }

1 0

Alexandre Julliard : winetest: Don' t require a tag or email address when only running a few tests.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 8e3d381419319b32692086947aae97471aad460a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e3d381419319b32692086947… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 27 19:12:23 2017 +0200 winetest: Don't require a tag or email address when only running a few tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index c8ff102..bfac17b 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -1405,6 +1405,12 @@ int main( int argc, char *argv[] ) SetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", "0" ); } + if (nb_filters && !exclude_tests) + { + run_tests( logname, outdir ); + exit(0); + } + while (!tag) { if (!interactive) report (R_FATAL, "Please specify a tag (-t option) if "

1 0

Hugh McMaster : reg/tests: Test backslashes with whitespace variations and comma placement.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 5e0d406120e00e8415df1fd789cfaac169f74065 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e0d406120e00e8415df1fd78… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 09:05:45 2017 +0000 reg/tests: Test backslashes with whitespace variations and comma placement. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 6262635..5076ad1 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1822,6 +1822,28 @@ static void test_import(void) todo_wine verify_reg_nonexist(hkey, "Wine52k"); todo_wine verify_reg(hkey, "Wine52l", REG_EXPAND_SZ, "%HOME%", 7, 0); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine53a\"=hex(2):25,48,4f,4d,45,25,5c,\\\n" + " 25,50,41,54,48,25,00\n" + "\"Wine53b\"=hex(2):25,48,4f,4d,45,25,5c\\\n" + " 25,50,41,54,48,25,00\n" + "\"Wine53c\"=hex(2):25,48,4f,4d,45,25,5c, \\ ;comment\n" + " 25,50,41,54,48,25,00\n" + "\"Wine53d\"=hex(2):25,48,4f,4d,45,25,5c \\ ;comment\n" + " 25,50,41,54,48,25,00\n" + "\"Wine53e\"=hex(2):25,48,4f,4d,45,25,5c,\\\t ;comment\n" + " 25,50,41,54,48,25,00\n" + "\"Wine53f\"=hex(2):25,48,4f,4d,45,25,5c\\\t ;comment\n" + " 25,50,41,54,48,25,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine53a", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + todo_wine verify_reg_nonexist(hkey, "Wine53b"); + todo_wine verify_reg(hkey, "Wine53c", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + todo_wine verify_reg_nonexist(hkey, "Wine53d"); + todo_wine verify_reg(hkey, "Wine53e", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + todo_wine verify_reg_nonexist(hkey, "Wine53f"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -2829,6 +2851,28 @@ static void test_unicode_import(void) todo_wine verify_reg_nonexist(hkey, "Wine52k"); todo_wine verify_reg(hkey, "Wine52l", REG_EXPAND_SZ, "%HOME%", 7, 0); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine53a\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00,\\\n" + " 25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine53b\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00\\\n" + " 25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine53c\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00, \\ ;comment\n" + " 25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine53d\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00 \\ ;comment\n" + " 25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine53e\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00,\\\t ;comment\n" + " 25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine53f\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00\\\t ;comment\n" + " 25,00,50,00,41,00,54,00,48,00,25,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, "Wine53a", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + todo_wine verify_reg_nonexist(hkey, "Wine53b"); + todo_wine verify_reg(hkey, "Wine53c", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + todo_wine verify_reg_nonexist(hkey, "Wine53d"); + todo_wine verify_reg(hkey, "Wine53e", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + todo_wine verify_reg_nonexist(hkey, "Wine53f"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0