January 2014 - Wine-Commits

Alexandre Julliard : makefiles: Get rid of the MAKE_TEST_RULES variable.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

1 0

Jacek Caban : msrle32: Use the same default quality as native.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: 1ed45a7416bd377d854c62b8f62c07ae9490c42d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ed45a7416bd377d854c62b8f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 2 14:16:20 2014 +0100 msrle32: Use the same default quality as native. --- dlls/msrle32/msrle_private.h | 2 +- dlls/msrle32/tests/msrle.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/msrle32/msrle_private.h b/dlls/msrle32/msrle_private.h index bf2aed0..1ff6cbe 100644 --- a/dlls/msrle32/msrle_private.h +++ b/dlls/msrle32/msrle_private.h @@ -34,7 +34,7 @@ #define IDS_DESCRIPTION 101 #define IDS_ABOUT 102 -#define MSRLE32_DEFAULTQUALITY (75 * ICQUALITY_HIGH) / 100 +#define MSRLE32_DEFAULTQUALITY (85 * ICQUALITY_HIGH) / 100 #define FOURCC_RLE mmioFOURCC('R','L','E',' ') #define FOURCC_RLE4 mmioFOURCC('R','L','E','4') diff --git a/dlls/msrle32/tests/msrle.c b/dlls/msrle32/tests/msrle.c index 04cf64f..819cb34 100644 --- a/dlls/msrle32/tests/msrle.c +++ b/dlls/msrle32/tests/msrle.c @@ -20,11 +20,13 @@ #include <windows.h> #include <vfw.h> #include <aviriff.h> +#include <stdio.h> #include "wine/test.h" static void test_encode(void) { + DWORD quality; ICINFO info; HIC hic; LRESULT res; @@ -39,6 +41,11 @@ static void test_encode(void) todo_wine ok(info.dwFlags == (VIDCF_QUALITY|VIDCF_CRUNCH|VIDCF_TEMPORAL), "dwFlags = %x\n", info.dwFlags); ok(info.dwVersionICM == ICVERSION, "dwVersionICM = %d\n", info.dwVersionICM); + quality = 0xdeadbeef; + res = ICSendMessage(hic, ICM_GETDEFAULTQUALITY, (DWORD_PTR)&quality, 0); + ok(res == ICERR_OK, "ICSendMessage(ICM_GETDEFAULTQUALITY) failed: %ld\n", res); + ok(quality == 8500, "quality = %d\n", quality); + ICClose(hic); }

1 0

Jacek Caban : msrle32: Get rid of no longer needed lDist argument in MSRLE32_CompressRLE8Line.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: 331cb13b2f1dbd655c3eb2733ed5db3970e6cf63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=331cb13b2f1dbd655c3eb2733… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 2 14:17:00 2014 +0100 msrle32: Get rid of no longer needed lDist argument in MSRLE32_CompressRLE8Line. --- dlls/msrle32/msrle32.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index d22b412..50b44b2 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -456,8 +456,7 @@ static INT MSRLE32_CompressRLE4Line(const CodecInfo *pi, const WORD *lpP, static INT MSRLE32_CompressRLE8Line(const CodecInfo *pi, const WORD *lpP, const WORD *lpC, LPCBITMAPINFOHEADER lpbi, - const BYTE *lpIn, LONG lDist, - INT x, LPBYTE *ppOut, + const BYTE *lpIn, INT x, LPBYTE *ppOut, DWORD *lpSizeImage) { LPBYTE lpOut = *ppOut; @@ -471,13 +470,13 @@ static INT MSRLE32_CompressRLE8Line(const CodecInfo *pi, const WORD *lpP, pos = x; clr = lpC[pos++]; for (count = 1; pos < lpbi->biWidth; count++) { - if (ColorCmp(clr, lpC[pos++]) > lDist) + if (ColorCmp(clr, lpC[pos++]) > 0) break; } if (count < 2) { /* add some more pixels for absoluting if possible */ - count += countDiffRLE8(lpP, lpC - 1, lpC, pos-1, lDist, lpbi->biWidth); + count += countDiffRLE8(lpP, lpC - 1, lpC, pos-1, 0, lpbi->biWidth); assert(count > 0); @@ -719,7 +718,7 @@ LRESULT MSRLE32_CompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, x = 0; do { - x = MSRLE32_CompressRLE8Line(pi, NULL, lpC, lpbiIn, lpIn, 0, x, + x = MSRLE32_CompressRLE8Line(pi, NULL, lpC, lpbiIn, lpIn, x, &lpOut, &lpbiOut->biSizeImage); assert(lpOut == (lpOutStart + lpbiOut->biSizeImage)); } while (x < lpbiOut->biWidth); @@ -801,7 +800,7 @@ LRESULT MSRLE32_CompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, if (x < lpbiOut->biWidth) { /* skip the 'same' things corresponding to previous frame */ - x = MSRLE32_CompressRLE8Line(pi, lpP, lpC, lpbiIn, lpIn, 0, x, + x = MSRLE32_CompressRLE8Line(pi, lpP, lpC, lpbiIn, lpIn, x, &lpOut, &lpbiOut->biSizeImage); assert(lpOut == (lpOutStart + lpbiOut->biSizeImage)); }

1 0

Jacek Caban : qcap: Added AVICompressorIn_Receive implementation.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: 93722745337761992ca7a5bbf5a4b59aa5e5d826 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93722745337761992ca7a5bbf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 2 15:29:01 2014 +0100 qcap: Added AVICompressorIn_Receive implementation. --- dlls/qcap/avico.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 4720ae3..2e44282 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -489,8 +489,87 @@ static const BasePinFuncTable AVICompressorInputBasePinVtbl = { static HRESULT WINAPI AVICompressorIn_Receive(BaseInputPin *base, IMediaSample *pSample) { AVICompressor *This = impl_from_BasePin(&base->pin); - FIXME("(%p)->(%p)\n", This, pSample); - return E_NOTIMPL; + VIDEOINFOHEADER *src_videoinfo; + REFERENCE_TIME start, stop; + IMediaSample *out_sample; + AM_MEDIA_TYPE *mt; + IMediaSample2 *sample2; + DWORD comp_flags = 0; + BOOL is_preroll; + BOOL sync_point; + BYTE *ptr, *buf; + DWORD res; + HRESULT hres; + + TRACE("(%p)->(%p)\n", base, pSample); + + if(!This->hic) { + FIXME("Driver not loaded\n"); + return E_UNEXPECTED; + } + + hres = IMediaSample_QueryInterface(pSample, &IID_IMediaSample2, (void**)&sample2); + if(SUCCEEDED(hres)) { + FIXME("Use IMediaSample2\n"); + IMediaSample2_Release(sample2); + } + + is_preroll = IMediaSample_IsPreroll(pSample) == S_OK; + sync_point = IMediaSample_IsSyncPoint(pSample) == S_OK; + + hres = IMediaSample_GetTime(pSample, &start, &stop); + if(FAILED(hres)) { + WARN("GetTime failed: %08x\n", hres); + return hres; + } + + hres = IMediaSample_GetMediaType(pSample, &mt); + if(FAILED(hres)) + return hres; + + hres = IMediaSample_GetPointer(pSample, &ptr); + if(FAILED(hres)) { + WARN("GetPointer failed: %08x\n", hres); + return hres; + } + + hres = BaseOutputPinImpl_GetDeliveryBuffer(This->out, &out_sample, &start, &stop, 0); + if(FAILED(hres)) + return hres; + + hres = IMediaSample_GetPointer(out_sample, &buf); + if(FAILED(hres)) + return hres; + + if((This->driver_flags & VIDCF_TEMPORAL) && !(This->driver_flags & VIDCF_FASTTEMPORALC)) + FIXME("Unsupported temporal compression\n"); + + src_videoinfo = (VIDEOINFOHEADER*)This->in->pin.mtCurrent.pbFormat; + res = ICCompress(This->hic, sync_point ? ICCOMPRESS_KEYFRAME : 0, &This->videoinfo->bmiHeader, buf, + &src_videoinfo->bmiHeader, ptr, 0, &comp_flags, This->frame_cnt, 0, 0, NULL, NULL); + if(res != ICERR_OK) { + WARN("ICCompress failed: %d\n", res); + IMediaSample_Release(out_sample); + return E_FAIL; + } + + IMediaSample_SetActualDataLength(out_sample, This->videoinfo->bmiHeader.biSizeImage); + IMediaSample_SetPreroll(out_sample, is_preroll); + IMediaSample_SetSyncPoint(out_sample, (comp_flags&AVIIF_KEYFRAME) != 0); + IMediaSample_SetDiscontinuity(out_sample, (IMediaSample_IsDiscontinuity(pSample) == S_OK)); + + if (IMediaSample_GetMediaTime(pSample, &start, &stop) == S_OK) + IMediaSample_SetMediaTime(out_sample, &start, &stop); + else + IMediaSample_SetMediaTime(out_sample, NULL, NULL); + + hres = BaseOutputPinImpl_Deliver(This->out, out_sample); + if(FAILED(hres)) + WARN("Deliver failed: %08x\n", hres); + + IMediaSample_Release(out_sample); + This->frame_cnt++; + return hres; } static const BaseInputPinFuncTable AVICompressorBaseInputPinVtbl = {

1 0

Dmitry Timoshkov : winebuild: Write actual (not aligned) sizes in the resource headers.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: 8cf8285adda3e6173b1e49396e8b5ddf4cfc735f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cf8285adda3e6173b1e49396… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 2 21:57:19 2014 +0900 winebuild: Write actual (not aligned) sizes in the resource headers. --- tools/winebuild/res32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index 0c39ec1..d459a5f 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -477,7 +477,7 @@ void output_resources( DLLSPEC *spec ) for (i = 0, res = spec->resources; i < spec->nb_resources; i++, res++) output( "\t.long .L__wine_spec_res_%d-.L__wine_spec_rva_base,%u,0,0\n", - i, (res->data_size + 3) & ~3 ); + i, res->data_size ); /* dump the name strings */ @@ -578,7 +578,7 @@ void output_bin_resources( DLLSPEC *spec, unsigned int start_rva ) for (i = 0, res = spec->resources; i < spec->nb_resources; i++, res++) { put_dword( data_offset + start_rva ); - put_dword( (res->data_size + 3) & ~3 ); + put_dword( res->data_size ); put_dword( 0 ); put_dword( 0 ); data_offset += (res->data_size + 3) & ~3;

1 0

Stefan Dösinger : d3dx9_36/tests: Fix calling convention specification.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: 9e3ef4abc63e967e01a5c5aed32b5334ed30840f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e3ef4abc63e967e01a5c5aed… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 2 15:23:52 2014 +0100 d3dx9_36/tests: Fix calling convention specification. Msvc wants __stdcall after the type, otherwise it generates an error. --- dlls/d3dx9_36/tests/mesh.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index c700e43..3a876e5 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1785,7 +1785,7 @@ static char *strdupA(const char *p) return ret; } -static CALLBACK HRESULT ID3DXAllocateHierarchyImpl_DestroyFrame(ID3DXAllocateHierarchy *iface, LPD3DXFRAME frame) +static HRESULT CALLBACK ID3DXAllocateHierarchyImpl_DestroyFrame(ID3DXAllocateHierarchy *iface, LPD3DXFRAME frame) { TRACECALLBACK("ID3DXAllocateHierarchyImpl_DestroyFrame(%p, %p)\n", iface, frame); if (frame) { @@ -1795,7 +1795,7 @@ static CALLBACK HRESULT ID3DXAllocateHierarchyImpl_DestroyFrame(ID3DXAllocateHie return D3D_OK; } -static CALLBACK HRESULT ID3DXAllocateHierarchyImpl_CreateFrame(ID3DXAllocateHierarchy *iface, +static HRESULT CALLBACK ID3DXAllocateHierarchyImpl_CreateFrame(ID3DXAllocateHierarchy *iface, const char *name, D3DXFRAME **new_frame) { D3DXFRAME *frame; @@ -1850,13 +1850,13 @@ static HRESULT destroy_mesh_container(LPD3DXMESHCONTAINER mesh_container) return D3D_OK; } -static CALLBACK HRESULT ID3DXAllocateHierarchyImpl_DestroyMeshContainer(ID3DXAllocateHierarchy *iface, LPD3DXMESHCONTAINER mesh_container) +static HRESULT CALLBACK ID3DXAllocateHierarchyImpl_DestroyMeshContainer(ID3DXAllocateHierarchy *iface, LPD3DXMESHCONTAINER mesh_container) { TRACECALLBACK("ID3DXAllocateHierarchyImpl_DestroyMeshContainer(%p, %p)\n", iface, mesh_container); return destroy_mesh_container(mesh_container); } -static CALLBACK HRESULT ID3DXAllocateHierarchyImpl_CreateMeshContainer(ID3DXAllocateHierarchy *iface, +static HRESULT CALLBACK ID3DXAllocateHierarchyImpl_CreateMeshContainer(ID3DXAllocateHierarchy *iface, const char *name, const D3DXMESHDATA *mesh_data, const D3DXMATERIAL *materials, const D3DXEFFECTINSTANCE *effects, DWORD num_materials, const DWORD *adjacency, ID3DXSkinInfo *skin_info, D3DXMESHCONTAINER **new_mesh_container)

1 0

Nikolay Sivov : scrrun: Store folder path.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: 2ca39611e1e6261771613f3ee312604ff774c014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ca39611e1e6261771613f3ee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 2 21:27:16 2014 +0400 scrrun: Store folder path. --- dlls/scrrun/filesystem.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 0236492..2753ecc 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -39,6 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(scrrun); struct folder { IFolder IFolder_iface; LONG ref; + BSTR path; }; struct file { @@ -371,7 +372,10 @@ static ULONG WINAPI folder_Release(IFolder *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) + { + SysFreeString(This->path); heap_free(This); + } return ref; } @@ -614,15 +618,23 @@ static const IFolderVtbl foldervtbl = { folder_CreateTextFile }; -static HRESULT create_folder(IFolder **folder) +static HRESULT create_folder(BSTR path, IFolder **folder) { struct folder *This; + *folder = NULL; + This = heap_alloc(sizeof(struct folder)); if (!This) return E_OUTOFMEMORY; This->IFolder_iface.lpVtbl = &foldervtbl; This->ref = 1; + This->path = SysAllocString(path); + if (!This->path) + { + heap_free(This); + return E_OUTOFMEMORY; + } *folder = &This->IFolder_iface; @@ -1790,7 +1802,7 @@ static HRESULT WINAPI filesys_CreateFolder(IFileSystem3 *iface, BSTR path, return HRESULT_FROM_WIN32(GetLastError()); } - return create_folder(folder); + return create_folder(path, folder); } static HRESULT WINAPI filesys_CreateTextFile(IFileSystem3 *iface, BSTR FileName,

1 0

Frédéric Delanoy : winspool.drv/tests: Constify some character strings.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: 86f3f622896319d40596972612543546ca6ae0b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86f3f622896319d4059697261… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jan 2 00:51:33 2014 +0100 winspool.drv/tests: Constify some character strings. --- dlls/winspool.drv/tests/info.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 602e6e2..7a6878a 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -56,8 +56,8 @@ static CHAR version_dll[] = "version.dll"; static CHAR winetest[] = "winetest"; static CHAR xcv_localport[] = ",XcvMonitor Local Port"; -static WCHAR cmd_MonitorUIW[] = {'M','o','n','i','t','o','r','U','I',0}; -static WCHAR cmd_PortIsValidW[] = {'P','o','r','t','I','s','V','a','l','i','d',0}; +static const WCHAR cmd_MonitorUIW[] = {'M','o','n','i','t','o','r','U','I',0}; +static const WCHAR cmd_PortIsValidW[] = {'P','o','r','t','I','s','V','a','l','i','d',0}; static WCHAR emptyW[] = {0}; static WCHAR portname_com1W[] = {'C','O','M','1',':',0};

1 0

Frédéric Delanoy : wintrust/tests: Constify some character strings.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: bf1a43e6205cf1a044624795443dcfa2d5406112 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf1a43e6205cf1a0446247954… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jan 2 00:51:34 2014 +0100 wintrust/tests: Constify some character strings. --- dlls/wintrust/tests/crypt.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 7f2fe76..4d9061b 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -489,7 +489,7 @@ static void test_CryptCATCDF_params(void) static void test_CryptCATAdminAddRemoveCatalog(void) { static WCHAR basenameW[] = {'w','i','n','e','t','e','s','t','.','c','a','t',0}; - static CHAR basename[] = "winetest.cat"; + static const char basename[] = "winetest.cat"; HCATADMIN hcatadmin; HCATINFO hcatinfo; CATALOG_INFO info; @@ -645,7 +645,7 @@ cleanup: DeleteFileA(tmpfile); } -static void test_catalog_properties(CHAR *catfile, int attributes, int members) +static void test_catalog_properties(const char *catfile, int attributes, int members) { static const GUID subject = {0xde351a42,0x8e59,0x11d0,{0x8c,0x47,0x00,0xc0,0x4f,0xc2,0x95,0xee}}; @@ -738,8 +738,8 @@ static void test_catalog_properties(CHAR *catfile, int attributes, int members) static void test_create_catalog_file(void) { - static CHAR catfileA[] = "winetest.cat"; - static CHAR cdffileA[] = "winetest.cdf"; + static const char catfileA[] = "winetest.cat"; + static const char cdffileA[] = "winetest.cdf"; static WCHAR cdffileW[] = {'w','i','n','e','t','e','s','t','.','c','d','f',0}; CRYPTCATCDF *catcdf; CRYPTCATATTRIBUTE *catattr; @@ -879,8 +879,8 @@ static void create_cdf_file(const CHAR *filename, const CHAR *contents) static void test_cdf_parsing(void) { - static CHAR catfileA[] = "tempfile.cat"; - static CHAR cdffileA[] = "tempfile.cdf"; + static const char catfileA[] = "tempfile.cat"; + static const char cdffileA[] = "tempfile.cdf"; static WCHAR cdffileW[] = {'t','e','m','p','f','i','l','e','.','c','d','f',0}; CHAR cdf_contents[4096]; CRYPTCATCDF *catcdf; @@ -1203,7 +1203,7 @@ static IMAGE_NT_HEADERS nt_header = static void test_sip(void) { - static WCHAR nameW[] = {'t','e','s','t','.','e','x','e',0}; + static const WCHAR nameW[] = {'t','e','s','t','.','e','x','e',0}; SIP_SUBJECTINFO info; DWORD index, encoding, size; HANDLE file;

1 0

Michael Stefaniuc : dmusic/tests: Change the way of detecting a workable dmusic.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: 393135c3c71748c078a930424ac4d0b4098bb4b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=393135c3c71748c078a930424… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 2 01:50:47 2014 +0100 dmusic/tests: Change the way of detecting a workable dmusic. --- dlls/dmusic/tests/dmusic.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index ced2336..3e67c56 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -323,10 +323,15 @@ static void test_COM_dmcoll(void) static BOOL missing_dmusic(void) { IDirectMusic8 *dm; - HRESULT hr = CoCreateInstance(&CLSID_DirectMusic, (IUnknown*)&dm, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void**)&dm); + HRESULT hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, + (void**)&dm); - return (hr == REGDB_E_CLASSNOTREG || hr == CLASS_E_CLASSNOTAVAILABLE); + if (hr == S_OK && dm) + { + IDirectMusic_Release(dm); + return FALSE; + } + return TRUE; } START_TEST(dmusic)

1 0