June 2014 - Wine-Commits - list.winehq.org

Akihiro Sagawa : winmm/tests: Activate some mmioSeek tests with todo_wine keyword.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 09a1f81cb4edfda01fdbc2367d37adfd902f7983 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09a1f81cb4edfda01fdbc2367… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jun 16 22:48:21 2014 +0900 winmm/tests: Activate some mmioSeek tests with todo_wine keyword. --- dlls/winmm/tests/mmio.c | 59 ++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 05e8952..0853b8f 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -314,10 +314,11 @@ static void test_mmioOpen(char *fname) ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); - ok(ret == 0, "expected 0, got %d\n", ret); -#endif + if (fname) + ok(ret == 0, "expected 0, got %d\n", ret); + else + todo_wine ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); @@ -345,10 +346,11 @@ static void test_mmioOpen(char *fname) ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); - ok(ret == 0, "expected 0, got %d\n", ret); -#endif + if (fname) + ok(ret == 0, "expected 0, got %d\n", ret); + else + todo_wine ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); @@ -405,10 +407,11 @@ static void test_mmioOpen(char *fname) ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); - ok(ret == 0, "expected 0, got %d\n", ret); -#endif + if (fname) + ok(ret == 0, "expected 0, got %d\n", ret); + else + todo_wine ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); @@ -436,10 +439,11 @@ static void test_mmioOpen(char *fname) ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); - ok(ret == 0, "expected 0, got %d\n", ret); -#endif + if (fname) + ok(ret == 0, "expected 0, got %d\n", ret); + else + todo_wine ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); @@ -532,15 +536,14 @@ static void test_mmioSetBuffer(char *fname) ok(mmio.pchNext == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchNext); ok(mmio.pchEndRead == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndRead); ok(mmio.pchEndWrite == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndWrite); -#if 0 /* remove once passes under Wine */ ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#endif -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); - ok(ret == 0, "expected 0, got %d\n", ret); -#endif + if (fname) + ok(ret == 0, "expected 0, got %d\n", ret); + else + todo_wine ok(ret == 0, "expected 0, got %d\n", ret); ret = mmioSetBuffer(hmmio, NULL, 0, MMIO_ALLOCBUF); ok(ret == MMSYSERR_NOERROR, "mmioSetBuffer error %u\n", ret); @@ -556,15 +559,14 @@ static void test_mmioSetBuffer(char *fname) ok(mmio.pchNext == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchNext); ok(mmio.pchEndRead == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndRead); ok(mmio.pchEndWrite == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndWrite); -#if 0 /* remove once passes under Wine */ ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#endif -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); - ok(ret == 0, "expected 0, got %d\n", ret); -#endif + if (fname) + ok(ret == 0, "expected 0, got %d\n", ret); + else + todo_wine ok(ret == 0, "expected 0, got %d\n", ret); ret = mmioSetBuffer(hmmio, buf, 0, MMIO_ALLOCBUF); ok(ret == MMSYSERR_NOERROR, "mmioSetBuffer error %u\n", ret); @@ -580,15 +582,11 @@ static void test_mmioSetBuffer(char *fname) ok(mmio.pchNext == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchNext); ok(mmio.pchEndRead == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndRead); ok(mmio.pchEndWrite == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndWrite); -#if 0 /* remove once passes under Wine */ ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#endif -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); ok(ret == 0, "expected 0, got %d\n", ret); -#endif ret = mmioSetBuffer(hmmio, NULL, 256, MMIO_WRITE|MMIO_ALLOCBUF); ok(ret == MMSYSERR_NOERROR, "mmioSetBuffer error %u\n", ret); @@ -605,15 +603,14 @@ static void test_mmioSetBuffer(char *fname) ok(mmio.pchNext == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchNext); ok(mmio.pchEndRead == mmio.pchBuffer, "expected %p, got %p\n", buf, mmio.pchEndRead); ok(mmio.pchEndWrite == mmio.pchBuffer + mmio.cchBuffer, "expected %p + %d, got %p\n", mmio.pchBuffer, mmio.cchBuffer, mmio.pchEndWrite); -#if 0 /* remove once passes under Wine */ ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#endif -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); - ok(ret == 0, "expected 0, got %d\n", ret); -#endif + if (fname) + ok(ret == 0, "expected 0, got %d\n", ret); + else + todo_wine ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); }

1 0

Shuai Meng : vbscript: Implemented CSng.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: d8135b8243e72a6a1d5db3aac742fe20996baf1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8135b8243e72a6a1d5db3aac… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Fri Jun 13 22:30:29 2014 +0800 vbscript: Implemented CSng. --- dlls/vbscript/global.c | 19 +++++++++++++++-- dlls/vbscript/tests/api.vbs | 48 +++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/tests/run.c | 2 ++ 3 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 294004b..5160374 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -514,8 +514,23 @@ static HRESULT Global_CDbl(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_CSng(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, 0, VT_R4); + if(FAILED(hres)) + return hres; + + if(!res) + return DISP_E_BADVARTYPE; + + *res = v; + return S_OK; } static HRESULT Global_CStr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 2aad761..2cf9bb7 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -797,4 +797,52 @@ MyObject.myval = 1.5 Call ok(CInt(MyObject) = 2, "CInt(MyObject) = " & CInt(MyObject)) Call ok(getVT(CInt(MyObject)) = "VT_I2", "getVT(CInt(MyObject)) = " & getVT(CInt(MyObject))) +Sub testCSngError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CSng(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CSng(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CSng(Empty) = 0, "CSng(Empty) = " & CSng(Empty)) +Call ok(getVT(CSng(Empty)) = "VT_R4", "getVT(CSng(Empty)) = " & getVT(CSng(Empty))) +Call ok(CSng(CByte(0)) = 0, "CSng(CByte(0)) = " & CSng(CByte(0))) +Call ok(getVT(CSng(CCur(0))) = "VT_R4", "getVT(CSng(CCur(0))) = " & getVT(CSng(CCur(0)))) +Call ok(CSng(CCur(0)) = 0, "CSng(CCur(0)) = " & CSng(CCur(0))) +Call ok(getVT(CSng(CCur(0))) = "VT_R4", "getVT(CSng(CCur(0))) = " & getVT(CSng(CCur(0)))) +Call ok(CSng(0) = 0, "CSng(0) = " & CSng(0)) +Call ok(getVT(CSng(0)) = "VT_R4", "getVT(CSng(0)) = " & getVT(CSng(0))) +Call ok(CSng(32768) = 32768, "CSng(32768) = " & CSng(32768)) +Call ok(getVT(CSng(32768)) = "VT_R4", "getVT(CSng(32768)) = " & getVT(CSng(32768))) +Call ok(CSng(0.001 * 0.001) = 0.000001, "CSng(0.001 * 0.001) = " & CSng(0.001 * 0.001)) +Call ok(getVT(CSng(0.001 * 0.001)) = "VT_R4", "getVT(CSng(0.001 * 0.001)) = " & getVT(CSng(0.001 * 0.001))) +Call ok(CSng("-1") = -1, "CSng(""-1"") = " & CSng("-1")) +Call ok(getVT(CSng("-1")) = "VT_R4", "getVT(CSng(""-1"")) = " & getVT(CSng("-1"))) +If isEnglishLang Then + Call ok(CSng("-0.5") = -0.5, "CSng(""-0.5"") = " & CSng("-0.5")) + Call ok(getVT(CSng("-0.5")) = "VT_R4", "getVT(CSng(""-0.5"")) = " & getVT(CSng("-0.5"))) +End If +Call testCSngError("", 13, 13) +Call testCSngError("TRUE", 13, 13) +Call testCSngError("FALSE", 13, 13) +Call testCSngError("#TRue#", 13, 13) +Call testCSngError("#fAlSE#", 13, 13) +Call testCSngError(1, 0, 458) +Call ok(CSng(True) = -1, "CSng(True) = " & CSng(True)) +Call ok(getVT(CSng(True)) = "VT_R4", "getVT(CSng(True)) = " & getVT(CSng(True))) +Call ok(CSng(False) = 0, "CSng(False) = " & CSng(False)) +Call ok(getVT(CSng(False)) = "VT_R4", "getVT(CSng(False)) = " & getVT(CSng(False))) +MyObject.myval = 0.1 +Call ok(CSng(MyObject) = 0.1, "CSng(MyObject) = " & CSng(MyObject)) +Call ok(getVT(CSng(MyObject)) = "VT_R4", "getVT(CSng(MyObject)) = " & getVT(CSng(MyObject))) +MyObject.myval = 0 +Call ok(CSng(MyObject) = 0, "CSng(MyObject) = " & CSng(MyObject)) +Call ok(getVT(CSng(MyObject)) = "VT_R4", "getVT(CSng(MyObject)) = " & getVT(CSng(MyObject))) + Call reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 0188c12..56361bf 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -167,6 +167,8 @@ static const char *vt2a(VARIANT *v) return "VT_I2"; case VT_I4: return "VT_I4"; + case VT_R4: + return "VT_R4"; case VT_R8: return "VT_R8"; case VT_CY:

1 0

Matteo Bruni : d3d9/tests: Test GetData behavior with various size values.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 71628208454d193e9d86713bdf8ddd58c156fc3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=71628208454d193e9d86713bd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 13 15:08:50 2014 +0200 d3d9/tests: Test GetData behavior with various size values. --- dlls/d3d9/tests/device.c | 137 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 110 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71628208454d193e9d867…

1 0

Bruno Jesus : ws2_32: Don't call WS_EnterSingleProtocol[A|W] on unsupported protocols (valgrind).
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 6f47a9d9d83ff53d486cf3c163feb7df7f4bfcd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f47a9d9d83ff53d486cf3c16… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jun 15 18:54:54 2014 -0300 ws2_32: Don't call WS_EnterSingleProtocol[A|W] on unsupported protocols (valgrind). --- dlls/ws2_32/socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e31f396..10857dc 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1822,6 +1822,7 @@ static INT WS_EnumProtocols( BOOL unicode, const INT *protocols, LPWSAPROTOCOL_I for (i = items = 0; protocols[i]; i++) { + if (!supported_protocol(protocols[i])) continue; if (unicode) { if (WS_EnterSingleProtocolW( protocols[i], &info.w[items] ))

1 0

Vincent Povirk : windowscodecs: Support InterlaceOption in PNG encoder.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 3ccaad8b41fe9514b95aa7610a1b33bb745b3c7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ccaad8b41fe9514b95aa7610… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 28 15:04:00 2014 -0500 windowscodecs: Support InterlaceOption in PNG encoder. --- dlls/windowscodecs/pngformat.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index bd5cd3d..6950c07 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -41,6 +41,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +static const WCHAR wszPngInterlaceOption[] = {'I','n','t','e','r','l','a','c','e','O','p','t','i','o','n',0}; + static HRESULT read_png_chunk(IStream *stream, BYTE *type, BYTE **data, ULONG *data_size) { BYTE header[8]; @@ -1060,6 +1062,7 @@ typedef struct PngEncoder { BOOL frame_committed; BOOL committed; CRITICAL_SECTION lock; + BOOL interlace; } PngEncoder; static inline PngEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface) @@ -1111,8 +1114,32 @@ static HRESULT WINAPI PngFrameEncode_Initialize(IWICBitmapFrameEncode *iface, IPropertyBag2 *pIEncoderOptions) { PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); + BOOL interlace; + PROPBAG2 opts[1]= {{0}}; + VARIANT opt_values[1]; + HRESULT opt_hres[1]; + HRESULT hr; + TRACE("(%p,%p)\n", iface, pIEncoderOptions); + opts[0].pstrName = (LPOLESTR)wszPngInterlaceOption; + opts[0].vt = VT_BOOL; + + if (pIEncoderOptions) + { + hr = IPropertyBag2_Read(pIEncoderOptions, 1, opts, NULL, opt_values, opt_hres); + + if (FAILED(hr)) + return hr; + } + else + memset(opt_values, sizeof(opt_values), 0); + + if (V_VT(&opt_values[0]) == VT_EMPTY) + interlace = FALSE; + else + interlace = (V_BOOL(&opt_values[0]) != 0); + EnterCriticalSection(&This->lock); if (This->frame_initialized) @@ -1121,6 +1148,8 @@ static HRESULT WINAPI PngFrameEncode_Initialize(IWICBitmapFrameEncode *iface, return WINCODEC_ERR_WRONGSTATE; } + This->interlace = interlace; + This->frame_initialized = TRUE; LeaveCriticalSection(&This->lock); @@ -1259,7 +1288,8 @@ static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, if (!This->info_written) { ppng_set_IHDR(This->png_ptr, This->info_ptr, This->width, This->height, - This->format->bit_depth, This->format->color_type, PNG_INTERLACE_NONE, + This->format->bit_depth, This->format->color_type, + This->interlace ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); if (This->xres != 0.0 && This->yres != 0.0) @@ -1548,6 +1578,8 @@ static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, { PngEncoder *This = impl_from_IWICBitmapEncoder(iface); HRESULT hr; + PROPBAG2 opts[1]= {{0}}; + TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); EnterCriticalSection(&This->lock); @@ -1564,7 +1596,11 @@ static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, return WINCODEC_ERR_NOTINITIALIZED; } - hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); + opts[0].pstrName = (LPOLESTR)wszPngInterlaceOption; + opts[0].vt = VT_BOOL; + opts[0].dwType = PROPBAG2_TYPE_DATA; + + hr = CreatePropertyBag2(opts, 1, ppIEncoderOptions); if (FAILED(hr)) { LeaveCriticalSection(&This->lock);

1 0

Akihiro Sagawa : winmm: Fix SEEK_END handling for memory files.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 8d9a7247c385753559989ae68755c1402824f80c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d9a7247c385753559989ae68… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jun 16 22:48:28 2014 +0900 winmm: Fix SEEK_END handling for memory files. --- dlls/winmm/mmio.c | 2 +- dlls/winmm/tests/mmio.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index ec282c2..c61c99c 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -896,7 +896,7 @@ LONG WINAPI mmioSeek(HMMIO hmmio, LONG lOffset, INT iOrigin) /* some memory mapped buffers are defined with -1 as a size */ if ((wm->info.cchBuffer > 0) && ((offset < wm->info.lBufOffset) || - (offset >= wm->info.lBufOffset + wm->info.cchBuffer) || + (offset > wm->info.lBufOffset + wm->info.cchBuffer) || (offset > wm->dwFileSize && wm->info.fccIOProc != FOURCC_MEM) || !wm->bBufferLoaded)) { diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index be91b41..5e440b8 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -695,7 +695,16 @@ static void test_mmioSeek(void) if (hmmio != NULL) { /* seek to the end */ end = mmioSeek(hmmio, 0, SEEK_END); - todo_wine ok(end == size, "expected %d, got %d\n", size, end); + ok(end == size, "expected %d, got %d\n", size, end); + + /* test MMIOINFO values */ + res = mmioGetInfo(hmmio, &mmio, 0); + ok(res == MMSYSERR_NOERROR, "expected 0, got %d\n", res); + ok(mmio.pchNext == mmio.pchBuffer + mmio.cchBuffer, "expected %p + %d, got %p\n", mmio.pchBuffer, mmio.cchBuffer, mmio.pchNext); + ok(mmio.pchEndRead == mmio.pchBuffer + mmio.cchBuffer, "expected %p + %d, got %p\n", mmio.pchBuffer, mmio.cchBuffer, mmio.pchEndRead); + ok(mmio.pchEndWrite == mmio.pchBuffer + mmio.cchBuffer, "expected %p + %d, got %p\n", mmio.pchBuffer, mmio.cchBuffer, mmio.pchEndWrite); + ok(mmio.lBufOffset == 0, "expected %d, got %d\n", 0, mmio.lBufOffset); + ok(mmio.lDiskOffset == 0, "expected %d, got %d\n", 0, mmio.lDiskOffset); /* seek backward from the end */ pos = mmioSeek(hmmio, offset, SEEK_END);

1 0

Akihiro Sagawa : winmm: Update lBufOffset after seeking file directly.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 71b8a56c8413e570ecd382dab3da6b4f8a597d6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=71b8a56c8413e570ecd382dab… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jun 16 22:48:26 2014 +0900 winmm: Update lBufOffset after seeking file directly. --- dlls/winmm/mmio.c | 8 ++++++-- dlls/winmm/tests/mmio.c | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index c0e9498..ec282c2 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -871,8 +871,12 @@ LONG WINAPI mmioSeek(HMMIO hmmio, LONG lOffset, INT iOrigin) return MMSYSERR_INVALHANDLE; /* not buffered, direct seek on file */ - if (!wm->info.pchBuffer && wm->info.fccIOProc != FOURCC_MEM) - return send_message(wm->ioProc, &wm->info, MMIOM_SEEK, lOffset, iOrigin, FALSE); + if (!wm->info.pchBuffer && wm->info.fccIOProc != FOURCC_MEM) { + LRESULT ret = send_message(wm->ioProc, &wm->info, MMIOM_SEEK, lOffset, iOrigin, FALSE); + if (ret != -1) + wm->info.lBufOffset = wm->info.lDiskOffset; + return ret; + } switch (iOrigin) { case SEEK_SET: diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index e92700f..be91b41 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -725,7 +725,7 @@ static void test_mmioSeek(void) ok(mmio.pchNext == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchNext); ok(mmio.pchEndRead == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndRead); ok(mmio.pchEndWrite == mmio.pchBuffer + mmio.cchBuffer, "expected %p + %d, got %p\n", mmio.pchBuffer, mmio.cchBuffer, mmio.pchEndWrite); - todo_wine ok(mmio.lBufOffset == size, "expected %d, got %d\n", size, mmio.lBufOffset); + ok(mmio.lBufOffset == size, "expected %d, got %d\n", size, mmio.lBufOffset); ok(mmio.lDiskOffset == size, "expected %d, got %d\n", size, mmio.lDiskOffset); /* seek backward from the end */

1 0

Akihiro Sagawa : winmm: Avoid direct seeking for memory files.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: f7ddc1eb957c96bb25bba0887e262ed15f0b8747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7ddc1eb957c96bb25bba0887… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jun 16 22:48:24 2014 +0900 winmm: Avoid direct seeking for memory files. --- dlls/winmm/mmio.c | 2 +- dlls/winmm/tests/mmio.c | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 8521b87..c0e9498 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -871,7 +871,7 @@ LONG WINAPI mmioSeek(HMMIO hmmio, LONG lOffset, INT iOrigin) return MMSYSERR_INVALHANDLE; /* not buffered, direct seek on file */ - if (!wm->info.pchBuffer) + if (!wm->info.pchBuffer && wm->info.fccIOProc != FOURCC_MEM) return send_message(wm->ioProc, &wm->info, MMIOM_SEEK, lOffset, iOrigin, FALSE); switch (iOrigin) { diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 71efc5d..e92700f 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -315,10 +315,7 @@ static void test_mmioOpen(char *fname) ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); ret = mmioSeek(hmmio, 0, SEEK_CUR); - if (fname) - ok(ret == 0, "expected 0, got %d\n", ret); - else - todo_wine ok(ret == 0, "expected 0, got %d\n", ret); + ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); @@ -531,10 +528,7 @@ static void test_mmioSetBuffer(char *fname) ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); ret = mmioSeek(hmmio, 0, SEEK_CUR); - if (fname) - ok(ret == 0, "expected 0, got %d\n", ret); - else - todo_wine ok(ret == 0, "expected 0, got %d\n", ret); + ok(ret == 0, "expected 0, got %d\n", ret); ret = mmioSetBuffer(hmmio, NULL, 0, MMIO_ALLOCBUF); ok(ret == MMSYSERR_NOERROR, "mmioSetBuffer error %u\n", ret); @@ -554,10 +548,7 @@ static void test_mmioSetBuffer(char *fname) ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); ret = mmioSeek(hmmio, 0, SEEK_CUR); - if (fname) - ok(ret == 0, "expected 0, got %d\n", ret); - else - todo_wine ok(ret == 0, "expected 0, got %d\n", ret); + ok(ret == 0, "expected 0, got %d\n", ret); ret = mmioSetBuffer(hmmio, buf, 0, MMIO_ALLOCBUF); ok(ret == MMSYSERR_NOERROR, "mmioSetBuffer error %u\n", ret);

1 0

Henri Verbeet : ddraw/tests: Properly declare matrices.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 9031adfd5c5b246bc89b1d8f7895c5595fdd05d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9031adfd5c5b246bc89b1d8f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 16 13:13:24 2014 +0200 ddraw/tests: Properly declare matrices. --- dlls/ddraw/tests/d3d.c | 37 ++++++++++++++------------ dlls/ddraw/tests/visual.c | 63 ++++++++++++++++++++++++--------------------- 2 files changed, 54 insertions(+), 46 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index be87e63..209555a 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -2807,27 +2807,32 @@ static void SetMaterialTest(void) static void ComputeSphereVisibility(void) { - D3DMATRIX proj, view, world; + D3DMATRIX proj = + { + 1.810660f, 0.000000f, 0.000000f, 0.000000f, + 0.000000f, 2.414213f, 0.000000f, 0.000000f, + 0.000000f, 0.000000f, 1.020408f, 1.000000f, + 0.000000f, 0.000000f, -0.102041f, 0.000000f, + }; + D3DMATRIX view = + { + 1.000000f, 0.000000f, 0.000000f, 0.000000f, + 0.000000f, 0.768221f, -0.640185f, 0.000000f, + -0.000000f, 0.640185f, 0.768221f, 0.000000f, + -14.852037f, 9.857489f, 11.600972f, 1.000000f, + }; + D3DMATRIX world = + { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }; D3DVALUE radius[3]; D3DVECTOR center[3]; DWORD result[3]; HRESULT rc; - world._11=1.0; world._12=0.0; world._13=0.0; world._14=0.0; - world._21=0.0; world._22=1.0; world._23=0.0; world._24=0.0; - world._31=0.0; world._32=0.0; world._33=1.0; world._34=0.0; - world._41=0.0; world._42=0.0; world._43=0.0; world._44=1.0; - - view._11=1.000000; view._12=0.000000; view._13=0.000000; view._14=0.000000; - view._21=0.000000; view._22=0.768221; view._23=-0.640185; view._24=0.000000; - view._31=-0.000000; view._32=0.640185; view._33=0.768221; view._34=0.000000; - view._41=-14.852037; view._42=9.857489; view._43=11.600972; view._44=1.000000; - - proj._11=1.810660; proj._12=0.000000; proj._13=0.00000; proj._14=0.000000; - proj._21=0.000000; proj._22=2.414213; proj._23=0.000000, proj._24=0.000000; - proj._31=0.000000; proj._32=0.000000; proj._33=1.020408, proj._34=1.000000; - proj._41=0.000000; proj._42=0.000000; proj._43=-0.102041; proj._44=0.000000; - IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_WORLD, &world); IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_VIEW , &view); IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_PROJECTION, &proj); diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 109c24c..7aaf7cd 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -290,11 +290,13 @@ static void lighting_test(IDirect3DDevice7 *device) DWORD nfvf = D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_NORMAL; DWORD color; - float mat[16] = { 1.0f, 0.0f, 0.0f, 0.0f, - 0.0f, 1.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f }; - + D3DMATRIX mat = + { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }; struct vertex unlitquad[] = { {-1.0f, -1.0f, 0.1f, 0xffff0000}, @@ -329,11 +331,11 @@ static void lighting_test(IDirect3DDevice7 *device) ok(hr == D3D_OK, "IDirect3DDevice7_Clear failed with %08x\n", hr); /* Setup some states that may cause issues */ - hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, (D3DMATRIX *) mat); + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, &mat); ok(hr == D3D_OK, "IDirect3DDevice7_SetTransform returned %08x\n", hr); - hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_VIEW, (D3DMATRIX *)mat); + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_VIEW, &mat); ok(hr == D3D_OK, "IDirect3DDevice7_SetTransform returned %08x\n", hr); - hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, (D3DMATRIX *) mat); + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, &mat); ok(hr == D3D_OK, "IDirect3DDevice7_SetTransform returned %08x\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_CLIPPING, FALSE); ok(hr == D3D_OK, "IDirect3DDevice7_SetRenderState returned %08x\n", hr); @@ -491,36 +493,34 @@ static void fog_test(IDirect3DDevice7 *device) {320, 480, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, }; WORD Indices[] = {0, 1, 2, 2, 3, 0}; - - float ident_mat[16] = + D3DMATRIX ident_mat = { 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f + 0.0f, 0.0f, 0.0f, 1.0f, }; - float world_mat1[16] = + D3DMATRIX world_mat1 = { 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, -0.5f, 1.0f + 0.0f, 0.0f, -0.5f, 1.0f, }; - float world_mat2[16] = + D3DMATRIX world_mat2 = { 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 1.0f, 1.0f + 0.0f, 0.0f, 1.0f, 1.0f, }; - float proj_mat[16] = + D3DMATRIX proj_mat = { 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, -1.0f, 1.0f + 0.0f, 0.0f, -1.0f, 1.0f, }; - struct sVertex far_quad1[] = { {-1.0f, -1.0f, 0.5f, 0xffff0000, 0xff000000}, @@ -625,7 +625,7 @@ static void fog_test(IDirect3DDevice7 *device) if (caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_FOGTABLE) { /* A simple fog + non-identity world matrix test */ - hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, (D3DMATRIX *)world_mat1); + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, &world_mat1); ok(hr == D3D_OK, "IDirect3DDevice7_SetTransform returned %#08x\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGTABLEMODE, D3DFOG_LINEAR); @@ -660,9 +660,9 @@ static void fog_test(IDirect3DDevice7 *device) ok(color_match(color, 0x0000ff00, 1), "Fogged out quad has color %08x\n", color); /* Test fog behavior with an orthogonal (but not identity) projection matrix */ - hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, (D3DMATRIX *)world_mat2); + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, &world_mat2); ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); - hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, (D3DMATRIX *)proj_mat); + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, &proj_mat); ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); @@ -691,9 +691,9 @@ static void fog_test(IDirect3DDevice7 *device) color = getPixelColor(device, 160, 120); ok(color_match(color, 0x0000ff00, 1), "Fogged out quad has color %08x\n", color); - hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, (D3DMATRIX *)ident_mat); + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, &ident_mat); ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); - hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, (D3DMATRIX *)ident_mat); + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, &ident_mat); ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); } else @@ -2230,10 +2230,13 @@ static void D3D3_ViewportClearTest(void) D3DVIEWPORT2 vp_data; DWORD color, red, green, blue; D3DRECT rect; - float mat[16] = { 1.0f, 0.0f, 0.0f, 0.0f, - 0.0f, 1.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f }; + D3DMATRIX mat = + { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }; struct vertex quad[] = { {-1.0f, -1.0f, 0.1f, 0xffffffff}, @@ -2335,11 +2338,11 @@ static void D3D3_ViewportClearTest(void) hr = IDirect3DDevice3_BeginScene(Direct3DDevice3); ok(hr == D3D_OK, "IDirect3DDevice3_BeginScene failed with %08x\n", hr); - hr = IDirect3DDevice3_SetTransform(Direct3DDevice3, D3DTRANSFORMSTATE_WORLD, (D3DMATRIX *) mat); + hr = IDirect3DDevice3_SetTransform(Direct3DDevice3, D3DTRANSFORMSTATE_WORLD, &mat); ok(hr == D3D_OK, "IDirect3DDevice3_SetTransform returned %08x\n", hr); - hr = IDirect3DDevice3_SetTransform(Direct3DDevice3, D3DTRANSFORMSTATE_VIEW, (D3DMATRIX *)mat); + hr = IDirect3DDevice3_SetTransform(Direct3DDevice3, D3DTRANSFORMSTATE_VIEW, &mat); ok(hr == D3D_OK, "IDirect3DDevice3_SetTransform returned %08x\n", hr); - hr = IDirect3DDevice3_SetTransform(Direct3DDevice3, D3DTRANSFORMSTATE_PROJECTION, (D3DMATRIX *) mat); + hr = IDirect3DDevice3_SetTransform(Direct3DDevice3, D3DTRANSFORMSTATE_PROJECTION, &mat); ok(hr == D3D_OK, "IDirect3DDevice3_SetTransform returned %08x\n", hr); hr = IDirect3DDevice3_SetRenderState(Direct3DDevice3, D3DRENDERSTATE_CLIPPING, FALSE); ok(hr == D3D_OK, "IDirect3DDevice3_SetRenderState returned %08x\n", hr);

1 0

Henri Verbeet : ddraw/tests: Get rid of some unused assignments.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: b9bfcf2c2a7ff439e8e30e590eeafc9997e17273 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9bfcf2c2a7ff439e8e30e590… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 16 13:13:23 2014 +0200 ddraw/tests: Get rid of some unused assignments. --- dlls/ddraw/tests/ddraw1.c | 14 ++++++-------- dlls/ddraw/tests/ddraw2.c | 18 ++++++++---------- dlls/ddraw/tests/ddraw4.c | 16 +++++++--------- dlls/ddraw/tests/ddraw7.c | 18 ++++++++---------- 4 files changed, 29 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9bfcf2c2a7ff439e8e30…

1 0

Matteo Bruni : wined3d: Validate and handle query size parameter.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: b42fe709d6db16a7f13f708e5a5c9a5d802cabad URL: http://source.winehq.org/git/wine.git/?a=commit;h=b42fe709d6db16a7f13f708e5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 13 15:08:51 2014 +0200 wined3d: Validate and handle query size parameter. --- dlls/d3d9/query.c | 5 +++- dlls/d3d9/tests/device.c | 10 +++---- dlls/wined3d/query.c | 73 +++++++++++++++++++++++++--------------------- 3 files changed, 48 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b42fe709d6db16a7f13f7…

1 0

Nikolay Sivov : kernel32: Added a message for WSAECONNRESET.
by Alexandre Julliard June 16, 2014

June 16, 2014

1 0

Bruno Jesus : ws2_32/tests: Wait for thread test before returning ( valgrind).
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: e3998e39886cbdca012af937b9efe081b83c18a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3998e39886cbdca012af937b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jun 14 14:47:30 2014 -0300 ws2_32/tests: Wait for thread test before returning (valgrind). --- dlls/ws2_32/tests/sock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index fb5ee1d..8a9cbba 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5454,6 +5454,7 @@ static void test_WSARecv(void) send(src, "test message", sizeof("test message"), 0); thread = CreateThread(NULL, 0, recv_thread, &dest, 0, &id); + WaitForSingleObject(thread, 3000); CloseHandle(thread); end:

1 0

Zhenbo Li : mshtml: Added IHTMLTableCell::cellIndex method implementation.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 05f65a9341dedfec77963ed3d59d9a4dfc4edb74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05f65a9341dedfec77963ed3d… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Fri Jun 13 07:29:21 2014 +0800 mshtml: Added IHTMLTableCell::cellIndex method implementation. --- dlls/mshtml/htmltablecell.c | 12 ++++++++++-- dlls/mshtml/tests/dom.c | 26 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmltablecell.c b/dlls/mshtml/htmltablecell.c index 7b8d2fc..e023e31 100644 --- a/dlls/mshtml/htmltablecell.c +++ b/dlls/mshtml/htmltablecell.c @@ -268,8 +268,16 @@ static HRESULT WINAPI HTMLTableCell_get_height(IHTMLTableCell *iface, VARIANT *p static HRESULT WINAPI HTMLTableCell_get_cellIndex(IHTMLTableCell *iface, LONG *p) { HTMLTableCell *This = impl_from_IHTMLTableCell(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + nsres = nsIDOMHTMLTableCellElement_GetCellIndex(This->nscell, p); + if (NS_FAILED(nsres)) { + ERR("Get CellIndex failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static const IHTMLTableCellVtbl HTMLTableCellVtbl = { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4eb02fc..941e87b 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5852,6 +5852,25 @@ static void test_tr_elem(IHTMLElement *elem) IHTMLTableRow_Release(row); } +static void test_td_elem(IHTMLElement *elem) +{ + IHTMLTableCell *cell; + HRESULT hres; + LONG lval; + + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLTableCell, (void**)&cell); + ok(hres == S_OK, "Could not get IHTMLTableRow iface: %08x\n", hres); + if(FAILED(hres)) + return; + + lval = 0xdeadbeef; + hres = IHTMLTableCell_get_cellIndex(cell, &lval); + ok(hres == S_OK, "get cellIndex failed: %08x\n", hres); + ok(lval == 1, "Expected 1, got %d\n", lval); + + IHTMLTableCell_Release(cell); +} + static void test_label_elem(IHTMLElement *elem) { IHTMLLabelElement *label; @@ -6813,6 +6832,13 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + elem = get_doc_elem_by_id(doc, "td2"); + ok(elem != NULL, "elem == NULL\n"); + if(elem) { + test_td_elem(elem); + IHTMLElement_Release(elem); + } + elem = get_doc_elem_by_id(doc, "row2"); ok(elem != NULL, "elem == NULL\n"); if(elem) {

1 0

Nikolay Sivov : windowscodecs/tests: Fixed some leaks on error path ( Valgrind).
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 7e3ab90187a0e7ccf1bfb0604695a91fb781cb96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e3ab90187a0e7ccf1bfb0604… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 15 00:21:53 2014 +0400 windowscodecs/tests: Fixed some leaks on error path (Valgrind). --- dlls/windowscodecs/tests/metadata.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 7f35c42..e42b474 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -845,7 +845,13 @@ static void test_create_reader(void) stream, &reader); todo_wine ok(hr == S_OK, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr); - if (FAILED(hr)) return; + /* NOTE: removed once Wine is fixed */ + if (FAILED(hr)) + { + IStream_Release(stream); + IWICComponentFactory_Release(factory); + return; + } if (SUCCEEDED(hr)) {

1 0

Nikolay Sivov : dsound/tests: Accept another error code.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: d7894955349faac8bdeab3bdf96770ac3ceecc86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7894955349faac8bdeab3bdf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 15 11:48:20 2014 +0400 dsound/tests: Accept another error code. --- dlls/dsound/tests/dsound8.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index b96cded..64b9f62 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -790,7 +790,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Format.cbSize = sizeof(wfxe) - sizeof(wfx) + 1; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL /* 2003 */) && !secondary) + ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL /* 2003 */ || rc==DSERR_INVALIDPARAM) && !secondary) || rc==DS_OK /* driver dependent? */, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); @@ -814,7 +814,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Format.cbSize = sizeof(wfxe); rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - ok((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL || rc==E_INVALIDARG) && !secondary, + ok((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL || rc==DSERR_INVALIDPARAM) && !secondary, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); if (secondary) @@ -836,7 +836,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Format.cbSize = sizeof(wfxe) + 1; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL /* 2003 */) && !secondary) + ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL /* 2003 */ || rc==DSERR_INVALIDPARAM) && !secondary) || rc==DS_OK /* driver dependent? */, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary);

1 0

Nikolay Sivov : wmp: Implement get_versionInfo().
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 99449fc8d41c852aa60da710570e956578665783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99449fc8d41c852aa60da7105… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 14 09:11:29 2014 +0400 wmp: Implement get_versionInfo(). --- dlls/wmp/Makefile.in | 2 +- dlls/wmp/player.c | 13 ++++++++++--- dlls/wmp/rsrc.rc | 2 ++ dlls/wmp/tests/Makefile.in | 2 +- dlls/wmp/tests/oleobj.c | 14 ++++++++++++++ 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/wmp/Makefile.in b/dlls/wmp/Makefile.in index a82cc36..71ca0e5 100644 --- a/dlls/wmp/Makefile.in +++ b/dlls/wmp/Makefile.in @@ -1,5 +1,5 @@ MODULE = wmp.dll -IMPORTS = user32 gdi32 +IMPORTS = user32 gdi32 oleaut32 C_SRCS = \ oleobj.c \ diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index e8c349b..4c11c88 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -159,11 +159,18 @@ static HRESULT WINAPI WMPPlayer4_get_playlistCollection(IWMPPlayer4 *iface, IWMP return E_NOTIMPL; } -static HRESULT WINAPI WMPPlayer4_get_versionInfo(IWMPPlayer4 *iface, BSTR *pbstrVersionInfo) +static HRESULT WINAPI WMPPlayer4_get_versionInfo(IWMPPlayer4 *iface, BSTR *version) { + static const WCHAR versionW[] = {'1','2','.','0','.','7','6','0','1','.','1','6','9','8','2',0}; WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); - FIXME("(%p)->(%p)\n", This, pbstrVersionInfo); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, version); + + if (!version) + return E_POINTER; + + *version = SysAllocString(versionW); + return *version ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI WMPPlayer4_launchURL(IWMPPlayer4 *iface, BSTR url) diff --git a/dlls/wmp/rsrc.rc b/dlls/wmp/rsrc.rc index ced1a64..3585d12 100644 --- a/dlls/wmp/rsrc.rc +++ b/dlls/wmp/rsrc.rc @@ -23,6 +23,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: wmp.rgs */ 2 WINE_REGISTRY wmp.rgs +/* NOTE: when changing version value, update a string returned by + get_versionInfo() as well */ #define WINE_FILEDESCRIPTION_STR "Wine Media Player" #define WINE_FILENAME_STR "wmp.dll" #define WINE_FILEVERSION 12,0,7601,16982 diff --git a/dlls/wmp/tests/Makefile.in b/dlls/wmp/tests/Makefile.in index 52da0d7..465b878 100644 --- a/dlls/wmp/tests/Makefile.in +++ b/dlls/wmp/tests/Makefile.in @@ -1,4 +1,4 @@ TESTDLL = wmp.dll -IMPORTS = ole32 user32 +IMPORTS = ole32 oleaut32 user32 C_SRCS = oleobj.c diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 31087f5..875fc77 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -864,12 +864,14 @@ static void test_wmp(void) IOleInPlaceObject *ipobj; IPersistStreamInit *psi; IOleObject *oleobj; + IWMPCore *wmpcore; DWORD misc_status; RECT pos = {0,0,100,100}; HWND hwnd; GUID guid; LONG ref; HRESULT hres; + BSTR str; hres = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IOleObject, (void**)&oleobj); if(hres == REGDB_E_CLASSNOTREG) { @@ -878,6 +880,18 @@ static void test_wmp(void) } ok(hres == S_OK, "Coult not create CLSID_WindowsMediaPlayer instance: %08x\n", hres); + hres = IOleObject_QueryInterface(oleobj, &IID_IWMPCore, (void**)&wmpcore); + ok(hres == S_OK, "got 0x%08x\n", hres); + + hres = IWMPCore_get_versionInfo(wmpcore, NULL); + ok(hres == E_POINTER, "got 0x%08x\n", hres); + + hres = IWMPCore_get_versionInfo(wmpcore, &str); + ok(hres == S_OK, "got 0x%08x\n", hres); + SysFreeString(str); + + IWMPCore_Release(wmpcore); + hres = IOleObject_QueryInterface(oleobj, &IID_IProvideClassInfo2, (void**)&class_info); ok(hres == S_OK, "Could not get IProvideClassInfo2 iface: %08x\n", hres);

1 0

Nikolay Sivov : d3dx9: Trace out parameters as pointers (Valgrind).
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 9475dc58d169efc2a546d37226144b2dabc5a3ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=9475dc58d169efc2a546d3722… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 14 09:33:46 2014 +0400 d3dx9: Trace out parameters as pointers (Valgrind). --- dlls/d3dx9_36/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index d2bc4bc..014fa95 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -147,8 +147,8 @@ static HDC WINAPI ID3DXFontImpl_GetDC(ID3DXFont *iface) static HRESULT WINAPI ID3DXFontImpl_GetGlyphData(ID3DXFont *iface, UINT glyph, IDirect3DTexture9 **texture, RECT *blackbox, POINT *cellinc) { - FIXME("iface %p, glyph %#x, texture %p, blackbox %s, cellinc %s stub!\n", - iface, glyph, texture, wine_dbgstr_rect(blackbox), wine_dbgstr_point(cellinc)); + FIXME("iface %p, glyph %#x, texture %p, blackbox %p, cellinc %p stub!\n", + iface, glyph, texture, blackbox, cellinc); return E_NOTIMPL; }

1 0

Nikolay Sivov : dwrite: Recognize more Unicode ranges in script analyzer.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: b5184df5df0fb10e9fab94d747aac0815b81c8d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5184df5df0fb10e9fab94d74… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 15 22:38:14 2014 +0400 dwrite: Recognize more Unicode ranges in script analyzer. --- dlls/dwrite/analyzer.c | 43 ++++++++++++++++++++++++++++++++ dlls/dwrite/tests/analyzer.c | 56 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 97 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 5c692d1..2b7056e 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -41,6 +41,7 @@ enum scriptcode { Script_Devanagari = 18, Script_Ethiopic = 19, Script_Georgian = 20, + Script_Glagolitic = 22, Script_Greek = 23, Script_Gujarati = 24, Script_Gurmukhi = 25, @@ -70,6 +71,7 @@ enum scriptcode { Script_Thaana = 70, Script_Thai = 71, Script_Tibetan = 72, + Script_Tifinagh = 73, Script_Symbol = 77, Script_Unknown = (UINT16)-1 }; @@ -204,6 +206,47 @@ static const struct script_range script_ranges[] = { { Script_Devanagari, 0x1cd0, 0x1cff }, /* Phonetic Extensions: U+1D00–U+1DBF */ { Script_Latin, 0x1d00, 0x1dbf }, + /* Combining Diacritical Marks Supplement: U+1DC0–U+1DFF */ + { Script_Symbol, 0x1dc0, 0x1dff }, + /* Latin Extended Additional: U+1E00–U+1EFF */ + { Script_Latin, 0x1e00, 0x1eff }, + /* Greek Extended: U+1F00–U+1F00 */ + { Script_Greek, 0x1f00, 0x1fff }, + /* General Punctuation: U+2000–U+206f */ + /* Superscripts and Subscripts: U+2070–U+209f */ + /* Currency Symbols: U+20A0–U+20CF */ + /* Combining Diacritical Marks for Symbols: U+20D0–U+20FF */ + /* Letterlike Symbols: U+2100–U+214F */ + /* Number Forms: U+2150–U+218F */ + /* Arrows: U+2190–U+21FF */ + /* Mathematical Operators: U+2200–U+22FF */ + /* Miscellaneous Technical: U+2300–U+23FF */ + /* Control Pictures: U+2400–U+243F */ + /* Optical Character Recognition: U+2440–U+245F */ + /* Enclosed Alphanumerics: U+2460–U+24FF */ + /* Box Drawing: U+2500–U+25FF */ + /* Block Elements: U+2580–U+259F */ + /* Geometric Shapes: U+25A0–U+25FF */ + /* Miscellaneous Symbols: U+2600–U+26FF */ + /* Dingbats: U+2700–U+27BF */ + /* Miscellaneous Mathematical Symbols-A: U+27C0–U+27EF */ + /* Supplemental Arrows-A: U+27F0–U+27FF */ + /* Braille Patterns: U+2800–U+28FF */ + /* Supplemental Arrows-B: U+2900–U+297F */ + /* Miscellaneous Mathematical Symbols-B: U+2980–U+29FF */ + /* Supplemental Mathematical Operators: U+2A00–U+2AFF */ + /* Miscellaneous Symbols and Arrows: U+2B00–U+2BFF */ + { Script_Symbol, 0x2000, 0x2bff }, + /* Glagolitic: U+2C00–U+2C5F */ + { Script_Glagolitic, 0x2c00, 0x2c5f }, + /* Latin Extended-C: U+2C60–U+2C7F */ + { Script_Latin, 0x2c60, 0x2c7f }, + /* Coptic: U+2C80–U+2CFF */ + { Script_Coptic, 0x2c80, 0x2cff }, + /* Georgian Supplement: U+2D00–U+2D2F */ + { Script_Georgian, 0x2d00, 0x2d2f }, + /* Tifinagh: U+2D30–U+2D7F */ + { Script_Tifinagh, 0x2d30, 0x2d7f }, /* unsupported range */ { Script_Unknown } }; diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 7ff6e56..e504a22 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -621,8 +621,8 @@ static struct sa_test sa_tests[] = { }, { /* Georgian */ - {0x10a0,0x10d0,0x10da,0x10f1,0x10fb,'.',0}, 1, - { { 0, 6, DWRITE_SCRIPT_SHAPES_DEFAULT }} + {0x10a0,0x10d0,0x10da,0x10f1,0x10fb,0x2d00,'.',0}, 1, + { { 0, 7, DWRITE_SCRIPT_SHAPES_DEFAULT }} }, { /* Hangul */ @@ -724,6 +724,58 @@ static struct sa_test sa_tests[] = { {0x1d00,0x1d40,0x1d70,0}, 1, { { 0, 3, DWRITE_SCRIPT_SHAPES_DEFAULT }} }, + { + /* Combining diacritical marks */ + {0x1dc0,0x300,0x1ddf,0}, 1, + { { 0, 3, DWRITE_SCRIPT_SHAPES_DEFAULT }} + }, + { + /* Latin Extended Additional, Extended-C */ + {0x1e00,0x1d00,0x2c60,0}, 1, + { { 0, 3, DWRITE_SCRIPT_SHAPES_DEFAULT }} + }, + { + /* Greek Extended */ + {0x3f0,0x1f00,0}, 1, + { { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT }} + }, + { + /* General Punctuation */ + {0x1dc0,0x2000,0}, 1, + { { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT }} + }, + { + /* Superscripts and Subscripts */ + {0x2070,0x2086,0x2000,0}, 1, + { { 0, 3, DWRITE_SCRIPT_SHAPES_DEFAULT }} + }, + { + /* Currency, Combining Diacritical Marks for Symbols. Letterlike Symbols.. */ + {0x20a0,0x20b8,0x2000,0x20d0,0x2100,0x2150,0x2190,0x2200,0x2300,0x2400,0x2440,0x2460,0x2500,0x2580,0x25a0,0x2600, + 0x2700,0x27c0,0x27f0,0x2900,0x2980,0x2a00,0x2b00,0}, 1, + { { 0, 23, DWRITE_SCRIPT_SHAPES_DEFAULT }} + }, + { + /* Braille */ + {0x2800,0x2070,0x2000,0}, 1, + { { 0, 3, DWRITE_SCRIPT_SHAPES_DEFAULT }} + }, + { + /* Glagolitic */ + {0x2c00,0x2c12,0}, 1, + { { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT }} + }, + { + /* Coptic */ + {0x2c80,0x3e2,0x1f00,0}, 2, + { { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT }, + { 2, 1, DWRITE_SCRIPT_SHAPES_DEFAULT } } + }, + { + /* Tifinagh */ + {0x2d30,0x2d4a,0}, 1, + { { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT }} + }, /* keep this as end marker */ { {0} } };

1 0

Nikolay Sivov : msxml3/tests: Accept Stat() method called on test stream.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 45b90272589bb71e5bd1fce24a250886866c89ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=45b90272589bb71e5bd1fce24… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 15 12:35:37 2014 +0400 msxml3/tests: Accept Stat() method called on test stream. --- dlls/msxml3/tests/saxreader.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 6c6a1b8..882e855 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1989,7 +1989,6 @@ static HRESULT WINAPI istream_UnlockRegion(IStream *iface, ULARGE_INTEGER libOff static HRESULT WINAPI istream_Stat(IStream *iface, STATSTG *pstatstg, DWORD grfStatFlag) { - ok(0, "unexpected call\n"); return E_NOTIMPL; }

1 0

Nikolay Sivov : xmllite/writer: Maintain a stack of written elements to write end tags.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: af46bab5947e826816280e5f95e94e2faabf1147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af46bab5947e826816280e5f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 14 22:46:09 2014 +0400 xmllite/writer: Maintain a stack of written elements to write end tags. Xmllite helps in a way that user doesn't have to specify closing tag name (like it has to in case of MXWriter). So when closing current level element qname is used for a closing tag; later this stack will also hold namespace definitions that element is carrying to check if nested element uses defined prefix. --- dlls/xmllite/tests/writer.c | 50 ++++++++++++++-- dlls/xmllite/writer.c | 139 +++++++++++++++++++++++++++++++++++-------- 2 files changed, 161 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af46bab5947e826816280…

1 0

Nikolay Sivov : msctf/tests: Fix crash when ITfInputProcessorProfileMgr is not supported.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: d3980cdcf26c040cd8feccb8931e8a699248919a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3980cdcf26c040cd8feccb89… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 15 11:56:20 2014 +0400 msctf/tests: Fix crash when ITfInputProcessorProfileMgr is not supported. --- dlls/msctf/tests/inputprocessor.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 8a052b3..dfa8731 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -2193,6 +2193,11 @@ static void test_profile_mgr(void) HRESULT hres; hres = ITfInputProcessorProfiles_QueryInterface(g_ipp, &IID_ITfInputProcessorProfileMgr, (void**)&ipp_mgr); + if (hres != S_OK) + { + win_skip("ITfInputProcessorProfileMgr is not supported.\n"); + return; + } ok(hres == S_OK, "Could not get ITfInputProcessorProfileMgr iface: %08x\n", hres); hres = ITfInputProcessorProfileMgr_EnumProfiles(ipp_mgr, 0, &enum_profiles);

1 0

Nikolay Sivov : shell32: Release cached desktop folder on process detach.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: d3a034e3482637ad28dc2d36eba27d2c94b8a6ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3a034e3482637ad28dc2d36e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 14 23:56:45 2014 +0400 shell32: Release cached desktop folder on process detach. --- dlls/shell32/shell32_main.c | 1 + dlls/shell32/shell32_main.h | 1 + dlls/shell32/shfldr_desktop.c | 12 ++++++++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 091c6e1..679ebec 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1281,6 +1281,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) if (fImpLoad) break; SIC_Destroy(); FreeChangeNotifications(); + release_desktop_folder(); release_typelib(); break; } diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index e7765eb..954f1e4 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -230,5 +230,6 @@ BOOL AddToEnumList(IEnumIDListImpl *list, LPITEMIDLIST pidl) DECLSPEC_HIDDEN; BOOL CreateFolderEnumList(IEnumIDListImpl *list, LPCWSTR lpszPath, DWORD dwFlags) DECLSPEC_HIDDEN; void release_typelib(void) DECLSPEC_HIDDEN; +void release_desktop_folder(void) DECLSPEC_HIDDEN; #endif diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 2910106..695e558 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -57,7 +57,6 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); /* Undocumented functions from shdocvw */ extern HRESULT WINAPI IEParseDisplayNameWithBCW(DWORD codepage, LPCWSTR lpszDisplayName, LPBC pbc, LPITEMIDLIST *ppidl); - /*********************************************************************** * Desktopfolder implementation */ @@ -75,6 +74,8 @@ typedef struct { BOOL fAcceptFmt; /* flag for pending Drop */ } IDesktopFolderImpl; +static IDesktopFolderImpl *cached_sf; + static inline IDesktopFolderImpl *impl_from_IShellFolder2(IShellFolder2 *iface) { return CONTAINING_RECORD(iface, IDesktopFolderImpl, IShellFolder2_iface); @@ -934,13 +935,20 @@ static const IPersistFolder2Vtbl vt_IPersistFolder2 = ISF_Desktop_IPersistFolder2_fnGetCurFolder }; +void release_desktop_folder(void) +{ + if (!cached_sf) return; + SHFree(cached_sf->pidlRoot); + SHFree(cached_sf->sPathTarget); + LocalFree(cached_sf); +} + /************************************************************************** * ISF_Desktop_Constructor */ HRESULT WINAPI ISF_Desktop_Constructor ( IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) { - static IDesktopFolderImpl *cached_sf; WCHAR szMyPath[MAX_PATH]; TRACE ("unkOut=%p %s\n", pUnkOuter, shdebugstr_guid (riid));

1 0

Nikolay Sivov : quartz/tests: Fix couple of test failures running with limited user.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 1f92df77a83df58404dc93e6a25e9f382712ad7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f92df77a83df58404dc93e6a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 14 14:51:50 2014 +0400 quartz/tests: Fix couple of test failures running with limited user. --- dlls/quartz/tests/filtermapper.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index a67df1d..d21509d 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -87,7 +87,7 @@ static void test_fm2_enummatchingfilters(void) CLSID clsidFilter1; CLSID clsidFilter2; IEnumMoniker *pEnum = NULL; - BOOL found; + BOOL found, registered = TRUE; ZeroMemory(&rgf2, sizeof(rgf2)); @@ -121,7 +121,10 @@ static void test_fm2_enummatchingfilters(void) hr = IFilterMapper2_RegisterFilter(pMapper, &clsidFilter1, wszFilterName1, NULL, &CLSID_LegacyAmFilterCategory, NULL, &rgf2); if (hr == E_ACCESSDENIED) + { + registered = FALSE; skip("Not authorized to register filters\n"); + } else { ok(hr == S_OK, "IFilterMapper2_RegisterFilter failed with %x\n", hr); @@ -192,13 +195,16 @@ static void test_fm2_enummatchingfilters(void) ok(!found, "EnumMatchingFilters should not return the test filter 2\n"); } - hr = IFilterMapper2_UnregisterFilter(pMapper, &CLSID_LegacyAmFilterCategory, NULL, - &clsidFilter1); - ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); + if (registered) + { + hr = IFilterMapper2_UnregisterFilter(pMapper, &CLSID_LegacyAmFilterCategory, NULL, + &clsidFilter1); + ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); - hr = IFilterMapper2_UnregisterFilter(pMapper, &CLSID_LegacyAmFilterCategory, NULL, - &clsidFilter2); - ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); + hr = IFilterMapper2_UnregisterFilter(pMapper, &CLSID_LegacyAmFilterCategory, NULL, + &clsidFilter2); + ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); + } out:

1 0

Nikolay Sivov : d3drm/tests: Release frame instance (Valgrind).
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 023e885156d9c0e1e5da4b5aeef97e99de708b77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=023e885156d9c0e1e5da4b5ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 14 09:25:46 2014 +0400 d3drm/tests: Release frame instance (Valgrind). --- dlls/d3drm/tests/d3drm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 9990d2c..ee01b91 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1560,6 +1560,7 @@ static void test_frame_transform(void) ok(hr == D3DRM_OK, "IDirect3DRMFrame_GetTransform returned hr = %x\n", hr); ok(!memcmp(matrix, identity, sizeof(D3DRMMATRIX4D)), "Returned matrix is not identity\n"); + IDirect3DRMFrame_Release(frame); IDirect3DRM_Release(d3drm); }

1 0