March 2018 - Wine-Commits - list.winehq.org

Zebediah Figura : winegstreamer: Hold a reference to the filter in push_data().
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: c4cf5980220c8624bb80de926ab210cb0ff70429 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4cf5980220c8624bb80de92… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 19 20:49:20 2017 -0600 winegstreamer: Hold a reference to the filter in push_data(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 079d63e66c9f00030c94a5cc5e821ea898e83c98) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 759a5db..eb6fca5 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -510,6 +510,8 @@ static DWORD CALLBACK push_data(LPVOID iface) DWORD_PTR user; HRESULT hr; + IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); + if (!This->stop) IAsyncReader_Length(This->pInputPin.pReader, &maxlen, &curlen); else @@ -589,6 +591,9 @@ static DWORD CALLBACK push_data(LPVOID iface) } while (buf); TRACE("Stopping.. %08x\n", hr); + + IBaseFilter_Release(&This->filter.IBaseFilter_iface); + return 0; }

1 0

Martin Payne : user.exe16: Implemented OldExitWindows() user.exe16 function.
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: 51a18f5ea918d2f50c8811ab7e1a328fc46e2771 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51a18f5ea918d2f50c8811ab… Author: Martin Payne <development(a)martinpayne.me.uk> Date: Wed Dec 13 10:23:50 2017 +0000 user.exe16: Implemented OldExitWindows() user.exe16 function. Signed-off-by: Martin Payne <development(a)martinpayne.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7f47234c9b80b038a11da1cff994450f89b90687) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user.exe16/user.c | 9 +++++++++ dlls/user.exe16/user.exe16.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 4a00d58..75de961 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -510,6 +510,15 @@ static void free_clipboard_formats(void) } +/*********************************************************************** + * OldExitWindows (USER.2) + */ +void WINAPI OldExitWindows16(void) +{ + ExitWindows16(0, 0); +} + + /********************************************************************** * InitApp (USER.5) */ diff --git a/dlls/user.exe16/user.exe16.spec b/dlls/user.exe16/user.exe16.spec index 8d928bc..ec57180 100644 --- a/dlls/user.exe16/user.exe16.spec +++ b/dlls/user.exe16/user.exe16.spec @@ -1,5 +1,5 @@ 1 pascal -ret16 MessageBox(word str str word) MessageBox16 -2 stub OldExitWindows +2 pascal -ret16 OldExitWindows() OldExitWindows16 3 stub EnableOEMLayer 4 stub DisableOEMLayer 5 pascal -ret16 InitApp(word) InitApp16

1 0

Martin Payne : krnl386.exe16: Shared libraries have a ".exe" rather than " .dll" extension on Windows < 3.0.
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: 785222246adaf13a98465a00d8cb9e78bb711ba6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=785222246adaf13a98465a00… Author: Martin Payne <development(a)martinpayne.me.uk> Date: Wed Dec 13 10:23:08 2017 +0000 krnl386.exe16: Shared libraries have a ".exe" rather than ".dll" extension on Windows < 3.0. Signed-off-by: Martin Payne <development(a)martinpayne.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4a8834f6ce6ac183faf773c968ad4359cc9fd02e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/krnl386.exe16/ne_module.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 70f8a46..14f8075 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -788,9 +788,9 @@ static BOOL NE_LoadDLLs( NE_MODULE *pModule ) /* its handle in the list of DLLs to initialize. */ HMODULE16 hDLL; - /* Append .DLL to name if no extension present */ + /* Append .DLL (Windows >= 3.00) or .EXE (Windows < 3.00) to name if no extension present */ if (!(p = strrchr( buffer, '.')) || strchr( p, '/' ) || strchr( p, '\\')) - strcat( buffer, ".DLL" ); + strcat( buffer, (GetExeVersion16() >= 0x0300) ? ".DLL" : ".EXE" ); if ((hDLL = MODULE_LoadModule16( buffer, TRUE, TRUE )) < 32) { @@ -988,7 +988,7 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ strcpy( dllname, basename ); q = strrchr( dllname, '.' ); - if (!q) strcat( dllname, ".dll" ); + if (!q) strcat( dllname, (GetExeVersion16() >= 0x0300) ? ".dll" : ".exe" ); for (q = dllname; *q; q++) if (*q >= 'A' && *q <= 'Z') *q += 32; strcpy( q, "16" );

1 0

Alistair Leslie-Hughes : oleaut32/tests: Add more VarCat tests.
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: 35a29e00a244c4553cd17c1e1fa96a69c09b9e99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35a29e00a244c4553cd17c1e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 23 00:41:00 2017 +0000 oleaut32/tests: Add more VarCat tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e0b5496ccbafa33a5b2e78b12fa9d445804a57e8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 206 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 206 insertions(+) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 0e86ffb..a271c50 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -97,6 +97,150 @@ static BOOL has_i8; #define R8_MAX DBL_MAX #define R8_MIN DBL_MIN +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + do { called_ ## func = FALSE; expect_ ## func = TRUE; } while(0) + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT(func) \ + do { \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +DEFINE_EXPECT(dispatch_invoke); + +typedef struct +{ + IDispatch IDispatch_iface; + VARTYPE vt; + HRESULT result; +} DummyDispatch; + +static inline DummyDispatch *impl_from_IDispatch(IDispatch *iface) +{ + return CONTAINING_RECORD(iface, DummyDispatch, IDispatch_iface); +} + +static ULONG WINAPI DummyDispatch_AddRef(IDispatch *iface) +{ + return 2; +} + +static ULONG WINAPI DummyDispatch_Release(IDispatch *iface) +{ + return 1; +} + +static HRESULT WINAPI DummyDispatch_QueryInterface(IDispatch *iface, + REFIID riid, + void** ppvObject) +{ + *ppvObject = NULL; + + if (IsEqualIID(riid, &IID_IDispatch) || + IsEqualIID(riid, &IID_IUnknown)) + { + *ppvObject = iface; + IDispatch_AddRef(iface); + } + + return *ppvObject ? S_OK : E_NOINTERFACE; +} + +static HRESULT WINAPI DummyDispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DummyDispatch_GetTypeInfo(IDispatch *iface, UINT tinfo, LCID lcid, ITypeInfo **ti) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DummyDispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOLESTR *names, + UINT cnames, LCID lcid, DISPID *dispid) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DummyDispatch_Invoke(IDispatch *iface, + DISPID dispid, REFIID riid, + LCID lcid, WORD wFlags, + DISPPARAMS *params, + VARIANT *res, + EXCEPINFO *ei, + UINT *arg_err) +{ + DummyDispatch *This = impl_from_IDispatch(iface); + + CHECK_EXPECT(dispatch_invoke); + + ok(dispid == DISPID_VALUE, "got dispid %d\n", dispid); + ok(IsEqualIID(riid, &IID_NULL), "go riid %s\n", wine_dbgstr_guid(riid)); + ok(wFlags == DISPATCH_PROPERTYGET, "Flags wrong\n"); + + ok(params->rgvarg == NULL, "got %p\n", params->rgvarg); + ok(params->rgdispidNamedArgs == NULL, "got %p\n", params->rgdispidNamedArgs); + ok(params->cArgs == 0, "got %d\n", params->cArgs); + ok(params->cNamedArgs == 0, "got %d\n", params->cNamedArgs); + + ok(res != NULL, "got %p\n", res); + ok(V_VT(res) == VT_EMPTY, "got %d\n", V_VT(res)); + ok(ei == NULL, "got %p\n", ei); + ok(arg_err == NULL, "got %p\n", arg_err); + + if (FAILED(This->result)) + return This->result; + + V_VT(res) = This->vt; + if (This->vt == VT_UI1) + V_UI1(res) = 34; + else if (This->vt == VT_NULL) + { + V_VT(res) = VT_NULL; + V_BSTR(res) = NULL; + } + else + memset(res, 0, sizeof(*res)); + + return S_OK; +} + +static const IDispatchVtbl DummyDispatch_VTable = +{ + DummyDispatch_QueryInterface, + DummyDispatch_AddRef, + DummyDispatch_Release, + DummyDispatch_GetTypeInfoCount, + DummyDispatch_GetTypeInfo, + DummyDispatch_GetIDsOfNames, + DummyDispatch_Invoke +}; + +static void init_test_dispatch(VARTYPE vt, DummyDispatch *dispatch) +{ + dispatch->IDispatch_iface.lpVtbl = &DummyDispatch_VTable; + dispatch->vt = vt; + dispatch->result = S_OK; +} + typedef struct IRecordInfoImpl { IRecordInfo IRecordInfo_iface; @@ -5607,6 +5751,7 @@ static void test_VarCat(void) HRESULT hres; HRESULT expected_error_num; int cmp; + DummyDispatch dispatch; CHECKPTR(VarCat); @@ -5941,6 +6086,67 @@ static void test_VarCat(void) VariantClear(&result); VariantClear(&expected); + /* Dispatch conversion */ + init_test_dispatch(VT_NULL, &dispatch); + V_VT(&left) = VT_DISPATCH; + V_DISPATCH(&left) = &dispatch.IDispatch_iface; + + SET_EXPECT(dispatch_invoke); + hres = VarCat(&left, &right, &result); + todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); + ok(V_VT(&result) == VT_BSTR, "got %d\n", V_VT(&result)); + ok(SysStringLen(V_BSTR(&result)) == 0, "got %d\n", SysStringLen(V_BSTR(&result))); + CHECK_CALLED(dispatch_invoke); + + VariantClear(&left); + VariantClear(&right); + VariantClear(&result); + + init_test_dispatch(VT_NULL, &dispatch); + V_VT(&right) = VT_DISPATCH; + V_DISPATCH(&right) = &dispatch.IDispatch_iface; + + SET_EXPECT(dispatch_invoke); + hres = VarCat(&left, &right, &result); + todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); + ok(V_VT(&result) == VT_BSTR, "got %d\n", V_VT(&result)); + ok(SysStringLen(V_BSTR(&result)) == 0, "got %d\n", SysStringLen(V_BSTR(&result))); + CHECK_CALLED(dispatch_invoke); + + VariantClear(&left); + VariantClear(&right); + VariantClear(&result); + + init_test_dispatch(VT_UI1, &dispatch); + V_VT(&right) = VT_DISPATCH; + V_DISPATCH(&right) = &dispatch.IDispatch_iface; + + V_VT(&left) = VT_BSTR; + V_BSTR(&left) = SysAllocString(sz12); + SET_EXPECT(dispatch_invoke); + hres = pVarCat(&left,&right,&result); + ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); + CHECK_CALLED(dispatch_invoke); + ok(!strcmp_wa(V_BSTR(&result), "1234"), "got %s\n", wine_dbgstr_w(V_BSTR(&result))); + + VariantClear(&left); + VariantClear(&right); + VariantClear(&result); + + init_test_dispatch(VT_NULL, &dispatch); + dispatch.result = E_OUTOFMEMORY; + V_VT(&right) = VT_DISPATCH; + V_DISPATCH(&right) = &dispatch.IDispatch_iface; + + SET_EXPECT(dispatch_invoke); + hres = VarCat(&left, &right, &result); + todo_wine ok(hres == E_OUTOFMEMORY, "got 0x%08x\n", hres); + CHECK_CALLED(dispatch_invoke); + + VariantClear(&left); + VariantClear(&right); + VariantClear(&result); + /* Test boolean conversion */ V_VT(&left) = VT_BOOL; V_BOOL(&left) = VARIANT_TRUE;

1 0

Zebediah Figura : imaadp32.acm: Fix nibble ordering.
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: d6ae6df9a4530beb2ad5261db1bcab0f0450650b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6ae6df9a4530beb2ad5261d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 8 10:15:21 2017 -0500 imaadp32.acm: Fix nibble ordering. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0f0fb984985aa08146996e04baf2b3d6e58abf46) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/imaadp32.acm/imaadp32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index 78a0ac4..aafd114 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -445,7 +445,7 @@ static void cvtSS16imaK(PACMDRVSTREAMINSTANCE adsi, &stepIndexL, &sampleL); code2 = generate_nibble(R16(src + (4 * i + 2) * 2), &stepIndexL, &sampleL); - *dst++ = (code1 << 4) | code2; + *dst++ = (code2 << 4) | code1; } for (i = 0; i < 4; i++) { @@ -453,7 +453,7 @@ static void cvtSS16imaK(PACMDRVSTREAMINSTANCE adsi, &stepIndexR, &sampleR); code2 = generate_nibble(R16(src + (4 * i + 3) * 2), &stepIndexR, &sampleR); - *dst++ = (code1 << 4) | code2; + *dst++ = (code2 << 4) | code1; } src += 32; } @@ -509,7 +509,7 @@ static void cvtMM16imaK(PACMDRVSTREAMINSTANCE adsi, src += 2; code2 = generate_nibble(R16(src), &stepIndex, &sample); src += 2; - *dst++ = (code1 << 4) | code2; + *dst++ = (code2 << 4) | code1; } dst = in_dst + adsi->pwfxDst->nBlockAlign; }

1 0

Alexandre Julliard : kernel32: Properly detect ELF binaries that are position independent executables.
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: 5fd469171f29422e30b48ca4f60d63231e6940f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fd469171f29422e30b48ca4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 18 11:16:13 2017 +0100 kernel32: Properly detect ELF binaries that are position independent executables. Based on a patch by Sebastian Lackner. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 21149e63313797a1603ca496a4c876418605d495) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/module.c | 64 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 57 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 3179b67..ebe6d43 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -238,13 +238,29 @@ void MODULE_get_binary_info( HANDLE hfile, struct binary_info *info ) unsigned char magic[4]; unsigned char class; unsigned char data; - unsigned char version; - unsigned char ignored[9]; + unsigned char ignored1[10]; unsigned short type; unsigned short machine; + unsigned char ignored2[8]; + unsigned int phoff; + unsigned char ignored3[12]; + unsigned short phnum; } elf; struct { + unsigned char magic[4]; + unsigned char class; + unsigned char data; + unsigned char ignored1[10]; + unsigned short type; + unsigned short machine; + unsigned char ignored2[12]; + unsigned __int64 phoff; + unsigned char ignored3[16]; + unsigned short phnum; + } elf64; + struct + { unsigned int magic; unsigned int cputype; unsigned int cpusubtype; @@ -263,20 +279,54 @@ void MODULE_get_binary_info( HANDLE hfile, struct binary_info *info ) if (!memcmp( header.elf.magic, "\177ELF", 4 )) { - if (header.elf.class == 2) info->flags |= BINARY_FLAG_64BIT; #ifdef WORDS_BIGENDIAN - if (header.elf.data == 1) + BOOL byteswap = (header.elf.data == 1); #else - if (header.elf.data == 2) + BOOL byteswap = (header.elf.data == 2); #endif + if (header.elf.class == 2) info->flags |= BINARY_FLAG_64BIT; + if (byteswap) { header.elf.type = RtlUshortByteSwap( header.elf.type ); header.elf.machine = RtlUshortByteSwap( header.elf.machine ); } switch(header.elf.type) { - case 2: info->type = BINARY_UNIX_EXE; break; - case 3: info->type = BINARY_UNIX_LIB; break; + case 2: + info->type = BINARY_UNIX_EXE; + break; + case 3: + { + LARGE_INTEGER phoff; + unsigned short phnum; + unsigned int type; + if (header.elf.class == 2) + { + phoff.QuadPart = byteswap ? RtlUlonglongByteSwap( header.elf64.phoff ) : header.elf64.phoff; + phnum = byteswap ? RtlUshortByteSwap( header.elf64.phnum ) : header.elf64.phnum; + } + else + { + phoff.QuadPart = byteswap ? RtlUlongByteSwap( header.elf.phoff ) : header.elf.phoff; + phnum = byteswap ? RtlUshortByteSwap( header.elf.phnum ) : header.elf.phnum; + } + while (phnum--) + { + if (SetFilePointerEx( hfile, phoff, NULL, FILE_BEGIN ) == -1) return; + if (!ReadFile( hfile, &type, sizeof(type), &len, NULL ) || len < sizeof(type)) return; + if (byteswap) type = RtlUlongByteSwap( type ); + if (type == 3) + { + info->type = BINARY_UNIX_EXE; + break; + } + phoff.QuadPart += (header.elf.class == 2) ? 56 : 32; + } + if (!info->type) info->type = BINARY_UNIX_LIB; + break; + } + default: + return; } switch(header.elf.machine) {

1 0

Vincent Povirk : windowscodecs: Fix 32bppGrayFloat to 8bppGray conversion.
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: 0491ab2f1281bee645c656109e9415b6923d1b1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0491ab2f1281bee645c65610… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 14 14:58:59 2017 -0500 windowscodecs: Fix 32bppGrayFloat to 8bppGray conversion. Based on Dmitry Timoshkov's patch. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8bae21302f88bd6b3360334355d9d7a5c6a1ad38) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/windowscodecs/converter.c | 37 ++++++++++++++++++++++++++++++++++++ dlls/windowscodecs/tests/converter.c | 1 + 2 files changed, 38 insertions(+) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index e5d61e1..42ba260 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -1149,6 +1149,43 @@ static HRESULT copypixels_to_8bppGray(struct FormatConverter *This, const WICRec return S_OK; } + if (source_format == format_32bppGrayFloat) + { + hr = S_OK; + + if (prc) + { + srcstride = 4 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + hr = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + if (SUCCEEDED(hr)) + { + INT x, y; + BYTE *src = srcdata, *dst = pbBuffer; + + for (y=0; y < prc->Height; y++) + { + float *srcpixel = (float*)src; + BYTE *dstpixel = dst; + + for (x=0; x < prc->Width; x++) + *dstpixel++ = (BYTE)floorf(to_sRGB_component(*srcpixel++) * 255.0f + 0.51f); + + src += srcstride; + dst += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + } + + return hr; + } + srcstride = 3 * prc->Width; srcdatasize = srcstride * prc->Height; diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 2af9857..e88810d 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -804,6 +804,7 @@ START_TEST(converter) test_conversion(&testdata_24bppBGR, &testdata_8bppGray, "24bppBGR -> 8bppGray", FALSE); test_conversion(&testdata_32bppBGR, &testdata_8bppGray, "32bppBGR -> 8bppGray", FALSE); test_conversion(&testdata_32bppGrayFloat, &testdata_24bppBGR_gray, "32bppGrayFloat -> 24bppBGR gray", FALSE); + test_conversion(&testdata_32bppGrayFloat, &testdata_8bppGray, "32bppGrayFloat -> 8bppGray", FALSE); test_invalid_conversion(); test_default_converter();

1 0

Alexandre Julliard : libport: Add a replacement implementation for strnlen.
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: 322f430f2d6eaf2e731a25cd7d16ea052029acf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=322f430f2d6eaf2e731a25cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 10:48:48 2017 +0100 libport: Add a replacement implementation for strnlen. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9d36aad4571b288f5208d35425e1720c6f145376) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 1 + configure.ac | 1 + include/config.h.in | 3 +++ include/wine/port.h | 5 +++++ libs/port/Makefile.in | 1 + libs/port/strnlen.c | 31 +++++++++++++++++++++++++++++++ 6 files changed, 42 insertions(+) diff --git a/configure b/configure index 9ae516f..caa68be 100755 --- a/configure +++ b/configure @@ -15280,6 +15280,7 @@ for ac_func in \ strdup \ strerror \ strncasecmp \ + strnlen \ strtold \ strtoll \ strtoull \ diff --git a/configure.ac b/configure.ac index acf9349..c507d7d 100644 --- a/configure.ac +++ b/configure.ac @@ -2050,6 +2050,7 @@ AC_CHECK_FUNCS(\ strdup \ strerror \ strncasecmp \ + strnlen \ strtold \ strtoll \ strtoull \ diff --git a/include/config.h.in b/include/config.h.in index 99906bd..76664df 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -906,6 +906,9 @@ /* Define to 1 if you have the `strncasecmp' function. */ #undef HAVE_STRNCASECMP +/* Define to 1 if you have the `strnlen' function. */ +#undef HAVE_STRNLEN + /* Define to 1 if you have the <stropts.h> header file. */ #undef HAVE_STROPTS_H diff --git a/include/wine/port.h b/include/wine/port.h index addece0..fb7251e 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -344,6 +344,10 @@ int strncasecmp(const char *str1, const char *str2, size_t n); # endif #endif /* !defined(HAVE_STRNCASECMP) */ +#ifndef HAVE_STRNLEN +size_t strnlen( const char *str, size_t maxlen ); +#endif /* !defined(HAVE_STRNLEN) */ + #ifndef HAVE_STRERROR const char *strerror(int err); #endif /* !defined(HAVE_STRERROR) */ @@ -538,6 +542,7 @@ extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compa #define strcasecmp __WINE_NOT_PORTABLE(strcasecmp) #define strerror __WINE_NOT_PORTABLE(strerror) #define strncasecmp __WINE_NOT_PORTABLE(strncasecmp) +#define strnlen __WINE_NOT_PORTABLE(strnlen) #define usleep __WINE_NOT_PORTABLE(usleep) #endif /* NO_LIBWINE_PORT */ diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 7fefda1..c87b99de 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -102,6 +102,7 @@ C_SRCS = \ strcasecmp.c \ strerror.c \ strncasecmp.c \ + strnlen.c \ symlink.c \ usleep.c \ utf8.c \ diff --git a/libs/port/strnlen.c b/libs/port/strnlen.c new file mode 100644 index 0000000..ab6668d --- /dev/null +++ b/libs/port/strnlen.c @@ -0,0 +1,31 @@ +/* + * strnlen function + * + * Copyright 2017 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#ifndef HAVE_STRNLEN +size_t strnlen( const char *str, size_t maxlen ) +{ + const char *ptr = memchr( str, 0, maxlen ); + if (!ptr) return maxlen; + return ptr - str; +} +#endif /* HAVE_STRNLEN */

1 0

Zebediah Figura : compobj.dll16: Implement CoGetClassObject16().
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: 412d7c8699f7cdb168b3397a209e58c9ded47d27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=412d7c8699f7cdb168b3397a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 17 16:32:12 2017 -0600 compobj.dll16: Implement CoGetClassObject16(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6c2a5ee9172511ed26e5512bd3104771f46a0672) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/compobj.dll16/compobj.c | 69 ++++++++++++++++++++++++++++++++--- dlls/compobj.dll16/compobj.dll16.spec | 2 +- 2 files changed, 65 insertions(+), 6 deletions(-) diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c index b934a06..af69bf8 100644 --- a/dlls/compobj.dll16/compobj.c +++ b/dlls/compobj.dll16/compobj.c @@ -714,15 +714,74 @@ HRESULT WINAPI CoFileTimeNow16( FILETIME *lpFileTime ) * */ HRESULT WINAPI CoGetClassObject16( - REFCLSID rclsid, DWORD dwClsContext, COSERVERINFO *pServerInfo, - REFIID iid, LPVOID *ppv) + SEGPTR rclsid, DWORD dwClsContext, COSERVERINFO *pServerInfo, + SEGPTR riid, SEGPTR ppv) { - FIXME(", stub!\n\tCLSID:\t%s,\n\tIID:\t%s\n", debugstr_guid(rclsid), debugstr_guid(iid)); + LPVOID *ppvl = MapSL(ppv); + + TRACE("CLSID: %s, IID: %s\n", debugstr_guid(MapSL(rclsid)), debugstr_guid(MapSL(riid))); + + *ppvl = NULL; if (pServerInfo) { - FIXME("\tpServerInfo: name=%s\n",debugstr_w(pServerInfo->pwszName)); - FIXME("\t\tpAuthInfo=%p\n",pServerInfo->pAuthInfo); + FIXME("pServerInfo->name=%s pAuthInfo=%p\n", + debugstr_w(pServerInfo->pwszName), pServerInfo->pAuthInfo); + } + + if (CLSCTX_INPROC_SERVER & dwClsContext) + { + char idstr[CHARS_IN_GUID]; + char buf_key[CHARS_IN_GUID+19], dllpath[MAX_PATH+1]; + LONG dllpath_len = sizeof(dllpath); + + HMODULE16 dll; + FARPROC16 DllGetClassObject; + + WORD args[6]; + DWORD dwRet; + + StringFromGUID216(MapSL(rclsid), idstr, CHARS_IN_GUID); + sprintf(buf_key, "CLSID\\%s\\InprocServer", idstr); + if (RegQueryValueA(HKEY_CLASSES_ROOT, buf_key, dllpath, &dllpath_len)) + { + ERR("class %s not registered\n", debugstr_guid(MapSL(rclsid))); + return REGDB_E_CLASSNOTREG; + } + + dll = LoadLibrary16(dllpath); + if (!dll) + { + ERR("couldn't load in-process dll %s\n", debugstr_a(dllpath)); + return E_ACCESSDENIED; /* FIXME: or should this be CO_E_DLLNOTFOUND? */ + } + + DllGetClassObject = GetProcAddress16(dll, "DllGetClassObject"); + if (!DllGetClassObject) + { + ERR("couldn't find function DllGetClassObject in %s\n", debugstr_a(dllpath)); + FreeLibrary16(dll); + return CO_E_DLLNOTFOUND; + } + + TRACE("calling DllGetClassObject %p\n", DllGetClassObject); + args[5] = SELECTOROF(rclsid); + args[4] = OFFSETOF(rclsid); + args[3] = SELECTOROF(riid); + args[2] = OFFSETOF(riid); + args[1] = SELECTOROF(ppv); + args[0] = OFFSETOF(ppv); + WOWCallback16Ex((DWORD) DllGetClassObject, WCB16_PASCAL, sizeof(args), args, &dwRet); + if (dwRet != S_OK) + { + ERR("DllGetClassObject returned error 0x%08x\n", dwRet); + FreeLibrary16(dll); + return dwRet; + } + + return S_OK; } + + FIXME("semi-stub\n"); return E_NOTIMPL; } diff --git a/dlls/compobj.dll16/compobj.dll16.spec b/dlls/compobj.dll16/compobj.dll16.spec index 85dfc42..71dba80 100644 --- a/dlls/compobj.dll16/compobj.dll16.spec +++ b/dlls/compobj.dll16/compobj.dll16.spec @@ -4,7 +4,7 @@ 4 pascal CoGetMalloc(long ptr) CoGetMalloc16 5 pascal CoRegisterClassObject(ptr ptr long long ptr) CoRegisterClassObject16 6 pascal CoRevokeClassObject(long) CoRevokeClassObject16 -7 pascal CoGetClassObject(ptr long ptr ptr ptr) CoGetClassObject16 +7 pascal CoGetClassObject(segptr long ptr segptr segptr) CoGetClassObject16 8 stub COMARSHALINTERFACE 9 stub COUNMARSHALINTERFACE 10 stub COLOADLIBRARY

1 0

Martin Payne : kernel32: Don't report valid non-Win16 NE executables ( e.g. OS/2) as broken.
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: 372f00d2dd6c902b08e74d7a07e1d989600fd2f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=372f00d2dd6c902b08e74d7a… Author: Martin Payne <development(a)martinpayne.me.uk> Date: Wed Dec 13 10:21:00 2017 +0000 kernel32: Don't report valid non-Win16 NE executables (e.g. OS/2) as broken. Signed-off-by: Martin Payne <development(a)martinpayne.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e562d4de81432f7206217b066514953b553f90ae) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/module.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index ebe6d43..72cc172 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -178,8 +178,8 @@ BOOL WINAPI DisableThreadLibraryCalls( HMODULE hModule ) /* Check whether a file is an OS/2 or a very old Windows executable * by testing on import of KERNEL. * - * FIXME: is reading the module imports the only way of discerning - * old Windows binaries from OS/2 ones ? At least it seems so... + * Reading the module imports is the only reasonable way of discerning + * old Windows binaries from OS/2 ones. */ static DWORD MODULE_Decide_OS2_OldWin(HANDLE hfile, const IMAGE_DOS_HEADER *mz, const IMAGE_OS2_HEADER *ne) { @@ -195,31 +195,28 @@ static DWORD MODULE_Decide_OS2_OldWin(HANDLE hfile, const IMAGE_DOS_HEADER *mz, || (!(modtab = HeapAlloc( GetProcessHeap(), 0, ne->ne_cmod*sizeof(WORD)))) || (!(ReadFile(hfile, modtab, ne->ne_cmod*sizeof(WORD), &len, NULL))) || (len != ne->ne_cmod*sizeof(WORD)) ) - goto broken; + goto done; /* read imported names table */ if ( (SetFilePointer( hfile, mz->e_lfanew + ne->ne_imptab, NULL, SEEK_SET ) == -1) || (!(nametab = HeapAlloc( GetProcessHeap(), 0, ne->ne_enttab - ne->ne_imptab))) || (!(ReadFile(hfile, nametab, ne->ne_enttab - ne->ne_imptab, &len, NULL))) || (len != ne->ne_enttab - ne->ne_imptab) ) - goto broken; + goto done; for (i=0; i < ne->ne_cmod; i++) { - LPSTR module = &nametab[modtab[i]]; - TRACE("modref: %.*s\n", module[0], &module[1]); - if (!(strncmp(&module[1], "KERNEL", module[0]))) - { /* very old Windows file */ - MESSAGE("This seems to be a very old (pre-3.0) Windows executable. Expect crashes, especially if this is a real-mode binary !\n"); + LPSTR module = &nametab[modtab[i]]; + TRACE("modref: %.*s\n", module[0], &module[1]); + if (!(strncmp(&module[1], "KERNEL", module[0]))) + { /* very old Windows file */ + MESSAGE("This seems to be a very old (pre-3.0) Windows executable. Expect crashes, especially if this is a real-mode binary !\n"); ret = BINARY_WIN16; - goto good; - } + break; + } } -broken: - ERR("Hmm, an error occurred. Is this binary file broken?\n"); - -good: +done: HeapFree( GetProcessHeap(), 0, modtab); HeapFree( GetProcessHeap(), 0, nametab); SetFilePointer( hfile, currpos, NULL, SEEK_SET); /* restore filepos */

1 0