February 2019 - Wine-devel - list.winehq.org

[PATCH v3] ntdll: correct space/mark parity
by Julien D'ascenzio 04 Feb '19

04 Feb '19

When CMSPAR is define, the space and mark parity is reversed: The flag PARODD isn't set correctly Signed-off-by: Julien D'ascenzio <Julien.Dascenzio(a)paratronic.fr> --- dlls/ntdll/serial.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 29e9fafbca..830137c629 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -280,8 +280,8 @@ static NTSTATUS get_line_control(int fd, SERIAL_LINE_CONTROL* slc) case PARENB: slc->Parity = EVENPARITY; break; case PARENB|PARODD: slc->Parity = ODDPARITY; break; #ifdef CMSPAR - case PARENB|CMSPAR: slc->Parity = MARKPARITY; break; - case PARENB|PARODD|CMSPAR: slc->Parity = SPACEPARITY; break; + case PARENB|PARODD|CMSPAR: slc->Parity = MARKPARITY; break; + case PARENB|CMSPAR: slc->Parity = SPACEPARITY; break; #endif } switch (port.c_cflag & CSIZE) @@ -676,8 +676,8 @@ static NTSTATUS set_line_control(int fd, const SERIAL_LINE_CONTROL* slc) case EVENPARITY: port.c_cflag |= PARENB; break; #ifdef CMSPAR /* Linux defines mark/space (stick) parity */ - case MARKPARITY: port.c_cflag |= PARENB | CMSPAR; break; - case SPACEPARITY: port.c_cflag |= PARENB | PARODD | CMSPAR; break; + case MARKPARITY: port.c_cflag |= PARENB | PARODD | CMSPAR; break; + case SPACEPARITY: port.c_cflag |= PARENB | CMSPAR; break; #else /* try the POSIX way */ case MARKPARITY: -- 2.11.0

1 0

[PATCH v2] ntdll: correct space/mark parity
by Julien D'ascenzio 04 Feb '19

04 Feb '19

When CMSPAR is define, the space and mark parity is reversed: The flag PARODD isn't set correctly Signed-off-by: Julien D'Ascenzio <jdascenzio(a)paratronic.fr> --- dlls/ntdll/serial.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 29e9fafbca..b3404d4534 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -280,8 +280,8 @@ static NTSTATUS get_line_control(int fd, SERIAL_LINE_CONTROL* slc) case PARENB: slc->Parity = EVENPARITY; break; case PARENB|PARODD: slc->Parity = ODDPARITY; break; #ifdef CMSPAR - case PARENB|CMSPAR: slc->Parity = MARKPARITY; break; - case PARENB|PARODD|CMSPAR: slc->Parity = SPACEPARITY; break; + case PARENB|PARODD|CMSPAR: slc->Parity = MARKPARITY; break; + case PARENB|CMSPAR: slc->Parity = SPACEPARITY; break; #endif } switch (port.c_cflag & CSIZE) @@ -676,8 +676,8 @@ static NTSTATUS set_line_control(int fd, const SERIAL_LINE_CONTROL* slc) case EVENPARITY: port.c_cflag |= PARENB; break; #ifdef CMSPAR /* Linux defines mark/space (stick) parity */ - case MARKPARITY: port.c_cflag |= PARENB | CMSPAR; break; - case SPACEPARITY: port.c_cflag |= PARENB | PARODD | CMSPAR; break; + case MARKPARITY: port.c_cflag |= PARENB | PARODD | CMSPAR; break; + case SPACEPARITY: port.c_cflag |= PARENB | CMSPAR; break; #else /* try the POSIX way */ case MARKPARITY: -- 2.11.0

2 2

[PATCH v4] po: Update Sinhala translation.
by Isira Seneviratne 02 Feb '19

02 Feb '19

1 0

[PATCH v3] po: Update Sinhala translation.
by Isira Seneviratne 02 Feb '19

02 Feb '19

1 0

[PATCH] ntoskrnl.exe: Implement KeExpandKernelStackAndCallout and KeExpandKernelStackAndCalloutEx.
by Jacek Caban 01 Feb '19

01 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 19 +++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 + dlls/ntoskrnl.exe/tests/driver.c | 84 +++++++++++++++++++++++++++-- include/ddk/ntddk.h | 3 ++ 4 files changed, 105 insertions(+), 3 deletions(-)

2 1

[PATCH 2/2] windowscodecs: Add a NULL check to 8bpp gray converter.
by Dmitry Timoshkov 01 Feb '19

01 Feb '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/converter.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index d6b62a60bb..5288a32d13 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -1186,6 +1186,9 @@ static HRESULT copypixels_to_8bppGray(struct FormatConverter *This, const WICRec return hr; } + if (!prc) + return copypixels_to_24bppBGR(This, NULL, cbStride, cbBufferSize, pbBuffer, source_format); + srcstride = 3 * prc->Width; srcdatasize = srcstride * prc->Height; -- 2.20.1

2 1

[PATCH 1/2] windowscodecs: Add support for converting to 8bppIndexed format.
by Dmitry Timoshkov 01 Feb '19

01 Feb '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/converter.c | 163 +++++++++++++++++++++++++++++---- 1 file changed, 146 insertions(+), 17 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 6e7bb8e781..d6b62a60bb 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -76,7 +76,7 @@ typedef struct FormatConverter { const struct pixelformatinfo *dst_format, *src_format; WICBitmapDitherType dither; double alpha_threshold; - WICBitmapPaletteType palette_type; + IWICPalette *palette; CRITICAL_SECTION lock; /* must be held when initialized */ } FormatConverter; @@ -1219,11 +1219,99 @@ static HRESULT copypixels_to_8bppGray(struct FormatConverter *This, const WICRec return hr; } +static UINT rgb_to_palette_index(BYTE bgr[3], WICColor *colors, UINT count) +{ + UINT best_diff, best_index, i; + + best_diff = ~0; + best_index = 0; + + for (i = 0; i < count; i++) + { + BYTE pal_r, pal_g, pal_b; + UINT diff_r, diff_g, diff_b, diff; + + pal_r = colors[i] >> 16; + pal_g = colors[i] >> 8; + pal_b = colors[i]; + + diff_r = bgr[2] - pal_r; + diff_g = bgr[1] - pal_g; + diff_b = bgr[0] - pal_b; + + diff = diff_r * diff_r + diff_g * diff_g + diff_b * diff_b; + if (diff == 0) return i; + + if (diff < best_diff) + { + best_diff = diff; + best_index = i; + } + } + + return best_index; +} + +static HRESULT copypixels_to_8bppIndexed(struct FormatConverter *This, const WICRect *prc, + UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) +{ + HRESULT hr; + BYTE *srcdata; + WICColor colors[256]; + UINT srcstride, srcdatasize, count; + + if (source_format == format_8bppIndexed) + { + if (prc) + return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); + + return S_OK; + } + + if (!prc) + return copypixels_to_24bppBGR(This, NULL, cbStride, cbBufferSize, pbBuffer, source_format); + + if (!This->palette) return WINCODEC_ERR_WRONGSTATE; + + hr = IWICPalette_GetColors(This->palette, 256, colors, &count); + if (hr != S_OK) return hr; + if (!count) return WINCODEC_ERR_WRONGSTATE; + + srcstride = 3 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + hr = copypixels_to_24bppBGR(This, prc, srcstride, srcdatasize, srcdata, source_format); + if (SUCCEEDED(hr) && prc) + { + INT x, y; + BYTE *src = srcdata, *dst = pbBuffer; + + for (y = 0; y < prc->Height; y++) + { + BYTE *bgr = src; + + for (x = 0; x < prc->Width; x++) + { + dst[x] = rgb_to_palette_index(bgr, colors, count); + bgr += 3; + } + src += srcstride; + dst += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + return hr; +} + static const struct pixelformatinfo supported_formats[] = { {format_1bppIndexed, &GUID_WICPixelFormat1bppIndexed, NULL}, {format_2bppIndexed, &GUID_WICPixelFormat2bppIndexed, NULL}, {format_4bppIndexed, &GUID_WICPixelFormat4bppIndexed, NULL}, - {format_8bppIndexed, &GUID_WICPixelFormat8bppIndexed, NULL}, + {format_8bppIndexed, &GUID_WICPixelFormat8bppIndexed, copypixels_to_8bppIndexed}, {format_BlackWhite, &GUID_WICPixelFormatBlackWhite, NULL}, {format_2bppGray, &GUID_WICPixelFormat2bppGray, NULL}, {format_4bppGray, &GUID_WICPixelFormat4bppGray, NULL}, @@ -1300,6 +1388,7 @@ static ULONG WINAPI FormatConverter_Release(IWICFormatConverter *iface) This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); if (This->source) IWICBitmapSource_Release(This->source); + if (This->palette) IWICPalette_Release(This->palette); HeapFree(GetProcessHeap(), 0, This); } @@ -1348,10 +1437,16 @@ static HRESULT WINAPI FormatConverter_GetResolution(IWICFormatConverter *iface, } static HRESULT WINAPI FormatConverter_CopyPalette(IWICFormatConverter *iface, - IWICPalette *pIPalette) + IWICPalette *palette) { - FIXME("(%p,%p): stub\n", iface, pIPalette); - return E_NOTIMPL; + FormatConverter *This = impl_from_IWICFormatConverter(iface); + + TRACE("(%p,%p)\n", iface, palette); + + if (!palette) return E_INVALIDARG; + if (!This->palette) return WINCODEC_ERR_WRONGSTATE; + + return IWICPalette_InitializeFromPalette(palette, This->palette); } static HRESULT WINAPI FormatConverter_CopyPixels(IWICFormatConverter *iface, @@ -1384,19 +1479,52 @@ static HRESULT WINAPI FormatConverter_CopyPixels(IWICFormatConverter *iface, } static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, - IWICBitmapSource *pISource, REFWICPixelFormatGUID dstFormat, WICBitmapDitherType dither, - IWICPalette *pIPalette, double alphaThresholdPercent, WICBitmapPaletteType paletteTranslate) + IWICBitmapSource *source, REFWICPixelFormatGUID dstFormat, WICBitmapDitherType dither, + IWICPalette *palette, double alpha_threshold, WICBitmapPaletteType palette_type) { FormatConverter *This = impl_from_IWICFormatConverter(iface); const struct pixelformatinfo *srcinfo, *dstinfo; - static INT fixme=0; GUID srcFormat; - HRESULT res=S_OK; + HRESULT res; + + TRACE("(%p,%p,%s,%u,%p,%0.3f,%u)\n", iface, source, debugstr_guid(dstFormat), + dither, palette, alpha_threshold, palette_type); + + if (!palette) + { + res = PaletteImpl_Create(&palette); + if (res != S_OK) return res; + + switch (palette_type) + { + case WICBitmapPaletteTypeCustom: + IWICPalette_Release(palette); + palette = NULL; + res = S_OK; + break; + + case WICBitmapPaletteTypeMedianCut: + { + UINT bpp; + res = get_pixelformat_bpp(dstFormat, &bpp); + if (res == S_OK && bpp <= 8) + res = IWICPalette_InitializeFromBitmap(palette, source, 1 << bpp, FALSE); + break; + } - TRACE("(%p,%p,%s,%u,%p,%0.1f,%u)\n", iface, pISource, debugstr_guid(dstFormat), - dither, pIPalette, alphaThresholdPercent, paletteTranslate); + default: + res = IWICPalette_InitializePredefined(palette, palette_type, FALSE); + break; + } - if (pIPalette && !fixme++) FIXME("ignoring palette\n"); + if (res != S_OK) + { + IWICPalette_Release(palette); + return res; + } + } + else + IWICPalette_AddRef(palette); EnterCriticalSection(&This->lock); @@ -1406,7 +1534,7 @@ static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, goto end; } - res = IWICBitmapSource_GetPixelFormat(pISource, &srcFormat); + res = IWICBitmapSource_GetPixelFormat(source, &srcFormat); if (FAILED(res)) goto end; srcinfo = get_formatinfo(&srcFormat); @@ -1427,13 +1555,13 @@ static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, if (dstinfo->copy_function) { - IWICBitmapSource_AddRef(pISource); + IWICBitmapSource_AddRef(source); This->src_format = srcinfo; This->dst_format = dstinfo; This->dither = dither; - This->alpha_threshold = alphaThresholdPercent; - This->palette_type = paletteTranslate; - This->source = pISource; + This->alpha_threshold = alpha_threshold; + This->palette = palette; + This->source = source; } else { @@ -1512,6 +1640,7 @@ HRESULT FormatConverter_CreateInstance(REFIID iid, void** ppv) This->IWICFormatConverter_iface.lpVtbl = &FormatConverter_Vtbl; This->ref = 1; This->source = NULL; + This->palette = NULL; InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": FormatConverter.lock"); -- 2.20.1

2 1

[PATCH v9] mscoree: Allow loading of registration free .NET COM objects
by Fabian Maurer 01 Feb '19

01 Feb '19

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/mscoree/corruntimehost.c | 237 +++++++++++++++++++++++++--------- dlls/mscoree/tests/comtest.c | 4 +- 2 files changed, 178 insertions(+), 63 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 5c4e7f1d6e..f6c77be4aa 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -29,6 +29,7 @@ #include "winreg.h" #include "ole2.h" #include "shellapi.h" +#include "shlwapi.h" #include "cor.h" #include "mscoree.h" @@ -40,6 +41,7 @@ #include "wine/debug.h" #include "wine/unicode.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); @@ -68,6 +70,43 @@ struct dll_fixup void *tokens; /* pointer into process heap */ }; +struct comclassredirect_data +{ + ULONG size; + BYTE res; + BYTE miscmask; + BYTE res1[2]; + DWORD model; + GUID clsid; + GUID alias; + GUID clsid2; + GUID tlbid; + ULONG name_len; + ULONG name_offset; + ULONG progid_len; + ULONG progid_offset; + ULONG clrdata_len; + ULONG clrdata_offset; + DWORD miscstatus; + DWORD miscstatuscontent; + DWORD miscstatusthumbnail; + DWORD miscstatusicon; + DWORD miscstatusdocprint; +}; + +struct clrclass_data +{ + ULONG size; + DWORD res[2]; + ULONG module_len; + ULONG module_offset; + ULONG name_len; + ULONG name_offset; + ULONG version_len; + ULONG version_offset; + DWORD res2[2]; +}; + static MonoDomain* domain_attach(MonoDomain *domain) { MonoDomain *prev_domain = mono_domain_get(); @@ -1606,6 +1645,75 @@ HRESULT RuntimeHost_GetInterface(RuntimeHost *This, REFCLSID clsid, REFIID riid, return CLASS_E_CLASSNOTAVAILABLE; } +static BOOL try_create_registration_free_com(REFIID clsid, WCHAR *classname, UINT classname_size, WCHAR *filename, UINT filename_size) +{ + ACTCTX_SECTION_KEYED_DATA guid_info = { sizeof(ACTCTX_SECTION_KEYED_DATA) }; + ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *assembly_info = NULL; + SIZE_T bytes_assembly_info; + struct comclassredirect_data *redirect_data; + struct clrclass_data *class_data; + void *ptr_name; + const WCHAR *ptr_path_start, *ptr_path_end; + WCHAR path[MAX_PATH] = {0}; + WCHAR str_dll[] = {'.','d','l','l',0}; + BOOL ret = FALSE; + + if (!FindActCtxSectionGuid(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, 0, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, clsid, &guid_info)) + { + DWORD error = GetLastError(); + if (error != ERROR_SXS_KEY_NOT_FOUND) + ERR("Failed to find guid: %d\n", error); + goto end; + } + + QueryActCtxW(0, guid_info.hActCtx, &guid_info.ulAssemblyRosterIndex, AssemblyDetailedInformationInActivationContext, NULL, 0, &bytes_assembly_info); + assembly_info = heap_alloc(bytes_assembly_info); + if (!QueryActCtxW(0, guid_info.hActCtx, &guid_info.ulAssemblyRosterIndex, + AssemblyDetailedInformationInActivationContext, assembly_info, bytes_assembly_info, &bytes_assembly_info)) + { + ERR("QueryActCtxW failed: %d!\n", GetLastError()); + goto end; + } + + redirect_data = guid_info.lpData; + class_data = (void *)((char *)redirect_data + redirect_data->clrdata_offset); + + ptr_name = (char *)class_data + class_data->name_offset; + if (lstrlenW(ptr_name) + 1 > classname_size) /* Include null-terminator */ + { + ERR("Buffer is too small\n"); + goto end; + } + strcpyW(classname, ptr_name); + + ptr_path_start = assembly_info->lpAssemblyEncodedAssemblyIdentity; + ptr_path_end = strchrW(ptr_path_start, ','); + memcpy(path, ptr_path_start, (char*)ptr_path_end - (char*)ptr_path_start); + + GetModuleFileNameW(NULL, filename, filename_size); + PathRemoveFileSpecW(filename); + + if (lstrlenW(filename) + lstrlenW(path) + ARRAY_SIZE(str_dll) + 1 > filename_size) /* Include blackslash */ + { + ERR("Buffer is too small\n"); + goto end; + } + + PathAppendW(filename, path); + strcatW(filename, str_dll); + + ret = TRUE; + +end: + if (assembly_info) + heap_free(assembly_info); + + if (guid_info.hActCtx) + ReleaseActCtx(guid_info.hActCtx); + + return ret; +} + #define CHARS_IN_GUID 39 HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) @@ -1640,75 +1748,82 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) TRACE("Registry key: %s\n", debugstr_w(path)); res = RegOpenKeyExW(HKEY_CLASSES_ROOT, path, 0, KEY_READ, &key); - if (res == ERROR_FILE_NOT_FOUND) - return CLASS_E_CLASSNOTAVAILABLE; - - res = RegGetValueW( key, NULL, wszClass, RRF_RT_REG_SZ, NULL, classname, &dwBufLen); - if(res != ERROR_SUCCESS) + if (res != ERROR_FILE_NOT_FOUND) { - WARN("Class value cannot be found.\n"); - hr = CLASS_E_CLASSNOTAVAILABLE; - goto cleanup; - } + res = RegGetValueW( key, NULL, wszClass, RRF_RT_REG_SZ, NULL, classname, &dwBufLen); + if(res != ERROR_SUCCESS) + { + WARN("Class value cannot be found.\n"); + hr = CLASS_E_CLASSNOTAVAILABLE; + goto cleanup; + } - TRACE("classname (%s)\n", debugstr_w(classname)); + TRACE("classname (%s)\n", debugstr_w(classname)); - dwBufLen = MAX_PATH + 8; - res = RegGetValueW( key, NULL, wszCodebase, RRF_RT_REG_SZ, NULL, codebase, &dwBufLen); - if(res == ERROR_SUCCESS) - { - /* Strip file:/// */ - if(strncmpW(codebase, wszFileSlash, strlenW(wszFileSlash)) == 0) - offset = strlenW(wszFileSlash); + dwBufLen = MAX_PATH + 8; + res = RegGetValueW( key, NULL, wszCodebase, RRF_RT_REG_SZ, NULL, codebase, &dwBufLen); + if(res == ERROR_SUCCESS) + { + /* Strip file:/// */ + if(strncmpW(codebase, wszFileSlash, strlenW(wszFileSlash)) == 0) + offset = strlenW(wszFileSlash); - strcpyW(filename, codebase + offset); + strcpyW(filename, codebase + offset); + } + else + { + WCHAR assemblyname[MAX_PATH + 8]; + + hr = CLASS_E_CLASSNOTAVAILABLE; + WARN("CodeBase value cannot be found, trying Assembly.\n"); + /* get the last subkey of InprocServer32 */ + res = RegQueryInfoKeyW(key, 0, 0, 0, &numKeys, 0, 0, 0, 0, 0, 0, 0); + if (res != ERROR_SUCCESS || numKeys == 0) + goto cleanup; + numKeys--; + keyLength = ARRAY_SIZE(subkeyName); + res = RegEnumKeyExW(key, numKeys, subkeyName, &keyLength, 0, 0, 0, 0); + if (res != ERROR_SUCCESS) + goto cleanup; + res = RegOpenKeyExW(key, subkeyName, 0, KEY_READ, &subkey); + if (res != ERROR_SUCCESS) + goto cleanup; + dwBufLen = MAX_PATH + 8; + res = RegGetValueW(subkey, NULL, wszAssembly, RRF_RT_REG_SZ, NULL, assemblyname, &dwBufLen); + RegCloseKey(subkey); + if (res != ERROR_SUCCESS) + goto cleanup; + + hr = get_file_from_strongname(assemblyname, filename, MAX_PATH); + if (FAILED(hr)) + { + /* + * The registry doesn't have a CodeBase entry and it's not in the GAC. + * + * Use the Assembly Key to retrieve the filename. + * Assembly : REG_SZ : AssemblyName, Version=X.X.X.X, Culture=neutral, PublicKeyToken=null + */ + WCHAR *ns; + + WARN("Attempt to load from the application directory.\n"); + GetModuleFileNameW(NULL, filename, MAX_PATH); + ns = strrchrW(filename, '\\'); + *(ns+1) = '\0'; + + ns = strchrW(assemblyname, ','); + *(ns) = '\0'; + strcatW(filename, assemblyname); + *(ns) = '.'; + strcatW(filename, wszDLL); + } + } } else { - WCHAR assemblyname[MAX_PATH + 8]; - - hr = CLASS_E_CLASSNOTAVAILABLE; - WARN("CodeBase value cannot be found, trying Assembly.\n"); - /* get the last subkey of InprocServer32 */ - res = RegQueryInfoKeyW(key, 0, 0, 0, &numKeys, 0, 0, 0, 0, 0, 0, 0); - if (res != ERROR_SUCCESS || numKeys == 0) - goto cleanup; - numKeys--; - keyLength = ARRAY_SIZE(subkeyName); - res = RegEnumKeyExW(key, numKeys, subkeyName, &keyLength, 0, 0, 0, 0); - if (res != ERROR_SUCCESS) - goto cleanup; - res = RegOpenKeyExW(key, subkeyName, 0, KEY_READ, &subkey); - if (res != ERROR_SUCCESS) - goto cleanup; - dwBufLen = MAX_PATH + 8; - res = RegGetValueW(subkey, NULL, wszAssembly, RRF_RT_REG_SZ, NULL, assemblyname, &dwBufLen); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) - goto cleanup; + if (!try_create_registration_free_com(riid, classname, ARRAY_SIZE(classname), filename, ARRAY_SIZE(filename))) + return CLASS_E_CLASSNOTAVAILABLE; - hr = get_file_from_strongname(assemblyname, filename, MAX_PATH); - if (FAILED(hr)) - { - /* - * The registry doesn't have a CodeBase entry and it's not in the GAC. - * - * Use the Assembly Key to retrieve the filename. - * Assembly : REG_SZ : AssemblyName, Version=X.X.X.X, Culture=neutral, PublicKeyToken=null - */ - WCHAR *ns; - - WARN("Attempt to load from the application directory.\n"); - GetModuleFileNameW(NULL, filename, MAX_PATH); - ns = strrchrW(filename, '\\'); - *(ns+1) = '\0'; - - ns = strchrW(assemblyname, ','); - *(ns) = '\0'; - strcatW(filename, assemblyname); - *(ns) = '.'; - strcatW(filename, wszDLL); - } + TRACE("classname (%s)\n", debugstr_w(classname)); } TRACE("filename (%s)\n", debugstr_w(filename)); diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index eec5d9a857..4879e3b762 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -114,7 +114,7 @@ static void run_test(BOOL expect_success) HRESULT result_expected = expect_success ? S_OK : HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); hr = CoCreateInstance(&CLSID_Test, NULL, CLSCTX_INPROC_SERVER, &IID_ITest, (void**)&test); - todo_wine + todo_wine_if(!expect_success) ok(hr == result_expected, "Expected %x, got %x\n", result_expected, hr); if (hr == S_OK) @@ -135,7 +135,7 @@ static void run_test(BOOL expect_success) { ITest *test2 = NULL; hr = IClassFactory_CreateInstance(classFactory, NULL, &IID_ITest, (void **)&test2); - todo_wine + todo_wine_if(!expect_success) ok(hr == S_OK, "Got %x\n", hr); if (hr == S_OK) -- 2.20.1

3 2

[PATCH] crypt32: Add support for PFX objects in CryptQueryObject.
by Hans Leidekker 01 Feb '19

01 Feb '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/object.c | 53 ++++++++++++++++++++++++++++++++++++-- dlls/crypt32/tests/store.c | 34 ++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 3dc28af0e9..1993a0a879 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -696,6 +696,48 @@ static BOOL CRYPT_QueryEmbeddedMessageObject(DWORD dwObjectType, return ret; } +static BOOL CRYPT_QueryPFXObject(DWORD dwObjectType, const void *pvObject, + DWORD dwExpectedContentTypeFlags, DWORD dwExpectedFormatTypeFlags, + DWORD *pdwMsgAndCertEncodingType, DWORD *pdwContentType, DWORD *pdwFormatType, + HCERTSTORE *phCertStore, HCRYPTMSG *phMsg) +{ + CRYPT_DATA_BLOB blob = {0}, *ptr; + BOOL ret; + + TRACE("(%d, %p, %08x, %08x, %p, %p, %p, %p, %p)\n", dwObjectType, pvObject, + dwExpectedContentTypeFlags, dwExpectedFormatTypeFlags, + pdwMsgAndCertEncodingType, pdwContentType, pdwFormatType, phCertStore, + phMsg); + + switch (dwObjectType) + { + case CERT_QUERY_OBJECT_FILE: + if (!CRYPT_ReadBlobFromFile(pvObject, &blob)) return FALSE; + ptr = &blob; + break; + + case CERT_QUERY_OBJECT_BLOB: + ptr = (CRYPT_DATA_BLOB *)pvObject; + break; + + default: + return FALSE; + } + + ret = PFXIsPFXBlob(ptr); + if (ret) + { + if (pdwMsgAndCertEncodingType) *pdwMsgAndCertEncodingType = X509_ASN_ENCODING; + if (pdwContentType) *pdwContentType = CERT_QUERY_CONTENT_PFX; + if (pdwFormatType) *pdwFormatType = CERT_QUERY_FORMAT_BINARY; + if (phCertStore) *phCertStore = NULL; + if (phMsg) *phMsg = NULL; + } + + CryptMemFree(blob.pbData); + return ret; +} + BOOL WINAPI CryptQueryObject(DWORD dwObjectType, const void *pvObject, DWORD dwExpectedContentTypeFlags, DWORD dwExpectedFormatTypeFlags, DWORD dwFlags, DWORD *pdwMsgAndCertEncodingType, DWORD *pdwContentType, @@ -703,8 +745,7 @@ BOOL WINAPI CryptQueryObject(DWORD dwObjectType, const void *pvObject, const void **ppvContext) { static const DWORD unimplementedTypes = - CERT_QUERY_CONTENT_FLAG_PKCS10 | CERT_QUERY_CONTENT_FLAG_PFX | - CERT_QUERY_CONTENT_FLAG_CERT_PAIR; + CERT_QUERY_CONTENT_FLAG_PKCS10 | CERT_QUERY_CONTENT_FLAG_CERT_PAIR; BOOL ret = TRUE; TRACE("(%08x, %p, %08x, %08x, %08x, %p, %p, %p, %p, %p, %p)\n", @@ -779,6 +820,14 @@ BOOL WINAPI CryptQueryObject(DWORD dwObjectType, const void *pvObject, dwExpectedContentTypeFlags, pdwMsgAndCertEncodingType, pdwContentType, phCertStore, phMsg); } + if (!ret && + (dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_PFX)) + { + ret = CRYPT_QueryPFXObject(dwObjectType, pvObject, + dwExpectedContentTypeFlags, dwExpectedFormatTypeFlags, + pdwMsgAndCertEncodingType, pdwContentType, pdwFormatType, + phCertStore, phMsg); + } if (!ret) SetLastError(CRYPT_E_NO_MATCH); TRACE("returning %d\n", ret); diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index b13fee6cd1..f3fb420140 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -3326,6 +3326,39 @@ static void test_PFXImportCertStore(void) CertCloseStore( store, 0 ); } +static void test_CryptQueryObject(void) +{ + CRYPT_DATA_BLOB pfx; + DWORD encoding_type, content_type, format_type; + HCERTSTORE store; + HCRYPTMSG msg; + const void *ctx; + BOOL ret; + + SetLastError( 0xdeadbeef ); + ret = CryptQueryObject( CERT_QUERY_OBJECT_BLOB, NULL, CERT_QUERY_CONTENT_FLAG_ALL, + CERT_QUERY_FORMAT_FLAG_BINARY, 0, NULL, NULL, NULL, NULL, NULL, NULL ); + ok( !ret, "success\n" ); + ok( GetLastError() == E_INVALIDARG, "got %u\n", GetLastError() ); + + pfx.pbData = (BYTE *)pfxdata; + pfx.cbData = sizeof(pfxdata); + encoding_type = content_type = format_type = 0xdeadbeef; + store = (HCERTSTORE *)0xdeadbeef; + msg = (HCRYPTMSG *)0xdeadbeef; + ctx = (void *)0xdeadbeef; + ret = CryptQueryObject( CERT_QUERY_OBJECT_BLOB, &pfx, CERT_QUERY_CONTENT_FLAG_ALL, + CERT_QUERY_FORMAT_FLAG_BINARY, 0, &encoding_type, &content_type, &format_type, + &store, &msg, &ctx ); + ok( ret, "got %u\n", GetLastError() ); + ok( encoding_type == X509_ASN_ENCODING, "got %08x\n", encoding_type ); + ok( content_type == CERT_QUERY_CONTENT_PFX, "got %08x\n", content_type ); + ok( format_type == CERT_QUERY_FORMAT_BINARY, "got %08x\n", format_type ); + ok( store == NULL, "got %p\n", store ); + ok( msg == NULL, "got %p\n", msg ); + ok( ctx == NULL, "got %p\n", ctx ); +} + START_TEST(store) { /* various combinations of CertOpenStore */ @@ -3357,4 +3390,5 @@ START_TEST(store) test_I_UpdateStore(); test_PFXImportCertStore(); + test_CryptQueryObject(); } -- 2.20.1

2 2

[PATCH] d3dx11: Downgrade ERR() to WARN() in D3DX11CreateAsyncResourceLoader*().
by Matteo Bruni 01 Feb '19

01 Feb '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx11_43/async.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx11_43/async.c b/dlls/d3dx11_43/async.c index ece13e99c2d..f640b6c5766 100644 --- a/dlls/d3dx11_43/async.c +++ b/dlls/d3dx11_43/async.c @@ -348,7 +348,7 @@ HRESULT WINAPI D3DX11CreateAsyncResourceLoaderA(HMODULE module, const char *reso if (!(rsrc = FindResourceA(module, resource, (const char *)RT_RCDATA))) { - ERR("Failed to find resource.\n"); + WARN("Failed to find resource.\n"); HeapFree(GetProcessHeap(), 0, object); return D3DX11_ERR_INVALID_DATA; } @@ -380,7 +380,7 @@ HRESULT WINAPI D3DX11CreateAsyncResourceLoaderW(HMODULE module, const WCHAR *res if (!(rsrc = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA))) { - ERR("Failed to find resource.\n"); + WARN("Failed to find resource.\n"); HeapFree(GetProcessHeap(), 0, object); return D3DX11_ERR_INVALID_DATA; } -- 2.19.2

1 0