October 2018 - Wine-Devel - list.winehq.org

[PATCH] ddraw: Get rid of a redundant assignment in ddraw7_GetDisplayMode().
by Henri Verbeet Oct. 12, 2018

Oct. 12, 2018

From: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/ddraw.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e9e06ee486f..43bc36b80ca 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1648,11 +1648,10 @@ static HRESULT WINAPI ddraw7_GetDisplayMode(IDirectDraw7 *iface, DDSURFACEDESC2 memset(DDSD, 0, DDSD->dwSize); DDSD->dwSize = sizeof(*DDSD); - DDSD->dwFlags |= DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT | DDSD_PITCH | DDSD_REFRESHRATE; + DDSD->dwFlags = DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT | DDSD_PITCH | DDSD_REFRESHRATE; DDSD->dwWidth = mode.width; DDSD->dwHeight = mode.height; DDSD->u2.dwRefreshRate = 60; - DDSD->ddsCaps.dwCaps = 0; DDSD->u4.ddpfPixelFormat.dwSize = sizeof(DDSD->u4.ddpfPixelFormat); ddrawformat_from_wined3dformat(&DDSD->u4.ddpfPixelFormat, mode.format_id); DDSD->u1.lPitch = mode.width * DDSD->u4.ddpfPixelFormat.u1.dwRGBBitCount / 8; -- 2.11.0

1 0

[PATCH] wbemdisp: Implement ISWbemPropertySet::get_Count.
by Hans Leidekker Oct. 12, 2018

Oct. 12, 2018

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40534 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemdisp/locator.c | 15 +++++++++++++-- dlls/wbemdisp/tests/wbemdisp.c | 6 ++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 78b81d8551..c307e347cf 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -438,8 +438,19 @@ static HRESULT WINAPI propertyset_Item( ISWbemPropertySet *iface, BSTR name, static HRESULT WINAPI propertyset_get_Count( ISWbemPropertySet *iface, LONG *count ) { - FIXME( "\n" ); - return E_NOTIMPL; + static const WCHAR propcountW[] = {'_','_','P','R','O','P','E','R','T','Y','_','C','O','U','N','T',0}; + struct propertyset *propertyset = impl_from_ISWbemPropertySet( iface ); + HRESULT hr; + VARIANT val; + + TRACE( "%p, %p\n", propertyset, count ); + + hr = IWbemClassObject_Get( propertyset->object, propcountW, 0, &val, NULL, NULL ); + if (SUCCEEDED(hr)) + { + *count = V_I4( &val ); + } + return hr; } static HRESULT WINAPI propertyset_Add( ISWbemPropertySet *iface, BSTR name, WbemCimtypeEnum type, diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index 68c0e3b589..57baf848cc 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -302,6 +302,7 @@ static void test_locator(void) ISWbemProperty *prop; ISWbemSecurity *security; VARIANT var; + LONG count; WbemImpersonationLevelEnum imp_level; WbemAuthenticationLevelEnum auth_level; @@ -379,6 +380,11 @@ static void test_locator(void) ok( hr == S_OK, "got %x\n", hr ); SysFreeString( procid_bstr ); + count = 0; + hr = ISWbemPropertySet_get_Count( prop_set, &count ); + ok( hr == S_OK, "got %x\n", hr ); + ok( count > 0, "got %d\n", count ); + hr = ISWbemProperty_get_Value( prop, &var ); ok( hr == S_OK, "got %x\n", hr ); ok( V_VT(&var) == VT_BSTR, "got %x\n", V_VT(&var) ); -- 2.11.0

1 0

[PATCH 1/5] wined3d: Dump buffer descriptor in wined3d_buffer_create().
by Matteo Bruni Oct. 12, 2018

Oct. 12, 2018

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/buffer.c | 7 +++++-- dlls/wined3d/utils.c | 21 +++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e20d66cc88..e7b05157cc 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1445,8 +1445,11 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct struct wined3d_buffer *object; HRESULT hr; - TRACE("device %p, desc %p, data %p, parent %p, parent_ops %p, buffer %p.\n", - device, desc, data, parent, parent_ops, buffer); + TRACE("device %p, desc byte_width %u, usage %s, bind_flags %s, access %s, data %p, parent %p, " + "parent_ops %p, buffer %p.\n", + device, desc->byte_width, debug_d3dusage(desc->usage), + wined3d_debug_bind_flags(desc->bind_flags), wined3d_debug_resource_access(desc->access), + data, parent, parent_ops, buffer); if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e3df24ade4..d62578bf9f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4447,6 +4447,27 @@ const char *wined3d_debug_resource_access(DWORD access) return wine_dbg_sprintf("%s", buffer.str); } +const char *wined3d_debug_bind_flags(DWORD bind_flags) +{ + struct debug_buffer buffer; + + init_debug_buffer(&buffer, "0"); +#define BIND_FLAG_TO_STR(x) if (bind_flags & x) { debug_append(&buffer, #x, " | "); bind_flags &= ~x; } + BIND_FLAG_TO_STR(WINED3D_BIND_VERTEX_BUFFER); + BIND_FLAG_TO_STR(WINED3D_BIND_INDEX_BUFFER); + BIND_FLAG_TO_STR(WINED3D_BIND_CONSTANT_BUFFER); + BIND_FLAG_TO_STR(WINED3D_BIND_SHADER_RESOURCE); + BIND_FLAG_TO_STR(WINED3D_BIND_STREAM_OUTPUT); + BIND_FLAG_TO_STR(WINED3D_BIND_RENDER_TARGET); + BIND_FLAG_TO_STR(WINED3D_BIND_DEPTH_STENCIL); + BIND_FLAG_TO_STR(WINED3D_BIND_UNORDERED_ACCESS); +#undef BIND_FLAG_TO_STR + if (bind_flags) + FIXME("Unrecognised bind flag(s) %#x.\n", bind_flags); + + return wine_dbg_sprintf("%s", buffer.str); +} + const char *debug_d3dusage(DWORD usage) { struct debug_buffer buffer; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 19945cf30e..dbab1aaf76 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3064,6 +3064,7 @@ static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD sta } const char *wined3d_debug_resource_access(DWORD access) DECLSPEC_HIDDEN; +const char *wined3d_debug_bind_flags(DWORD bind_flags) DECLSPEC_HIDDEN; static inline BOOL wined3d_resource_access_is_managed(unsigned int access) { -- 2.18.1

2 9

[PATCH] ntdll/tests: Use FILE_INFORMATION_CLASS values instead of hardcoded numbers.
by Jacek Caban Oct. 12, 2018

Oct. 12, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-)

1 0

[PATCH 2/2] msi: Fix the remote case for MsiViewModify(MSIMODIFY_UPDATE).
by Hans Leidekker Oct. 12, 2018

Oct. 12, 2018

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45972 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/msipriv.h | 2 +- dlls/msi/msiquery.c | 4 ++-- dlls/msi/record.c | 11 ++++++----- dlls/msi/winemsi.idl | 2 ++ 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 76f532f34c..4e61fdb929 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -141,8 +141,8 @@ typedef struct tagMSIFIELD typedef struct tagMSIRECORD { MSIOBJECTHDR hdr; - MSIQUERY *query; UINT count; /* as passed to MsiCreateRecord */ + UINT64 cookie; MSIFIELD fields[1]; /* nb. array size is count+1 */ } MSIRECORD; diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 544bfc9e9a..701a347a8c 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -379,7 +379,7 @@ UINT MSI_ViewFetch(MSIQUERY *query, MSIRECORD **prec) if (r == ERROR_SUCCESS) { query->row ++; - (*prec)->query = query; + (*prec)->cookie = (UINT64)(ULONG_PTR)query; MSI_RecordSetInteger(*prec, 0, 1); } @@ -693,7 +693,7 @@ UINT MSI_ViewModify( MSIQUERY *query, MSIMODIFY mode, MSIRECORD *rec ) if ( !view || !view->ops->modify) return ERROR_FUNCTION_FAILED; - if ( mode == MSIMODIFY_UPDATE && rec->query != query ) + if ( mode == MSIMODIFY_UPDATE && rec->cookie != (UINT64)(ULONG_PTR)query ) return ERROR_FUNCTION_FAILED; r = view->ops->modify( view, mode, rec, query->row ); diff --git a/dlls/msi/record.c b/dlls/msi/record.c index a7d55888a9..cca63083d1 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -1064,6 +1064,7 @@ UINT copy_remote_record(const struct wire_record *in, MSIHANDLE out) if (!(rec = msihandle2msiinfo(out, MSIHANDLETYPE_RECORD))) return ERROR_INVALID_HANDLE; + rec->cookie = in->cookie; for (i = 0; i <= in->count; i++) { switch (in->fields[i].type) @@ -1114,17 +1115,17 @@ UINT unmarshal_record(const struct wire_record *in, MSIHANDLE *out) struct wire_record *marshal_record(MSIHANDLE handle) { struct wire_record *ret; - unsigned int i, count; + unsigned int i; MSIRECORD *rec; if (!(rec = msihandle2msiinfo(handle, MSIHANDLETYPE_RECORD))) return NULL; - count = MSI_RecordGetFieldCount(rec); - ret = midl_user_allocate(sizeof(*ret) + count * sizeof(ret->fields[0])); - ret->count = count; + ret = midl_user_allocate(sizeof(*ret) + rec->count * sizeof(ret->fields[0])); + ret->count = rec->count; + ret->cookie = rec->cookie; - for (i = 0; i <= count; i++) + for (i = 0; i <= rec->count; i++) { switch (rec->fields[i].type) { diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index ebbca82a16..1658603694 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -51,8 +51,10 @@ struct wire_field { int len; }; +/* compatible with MSIRECORD minus header */ struct wire_record { unsigned int count; + UINT64 cookie; [size_is(count+1)] struct wire_field fields[]; }; -- 2.11.0

1 0

[PATCH 1/2] msi: Fix memory leaks.
by Hans Leidekker Oct. 12, 2018

Oct. 12, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/custom.c | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 97bde52a29..3cb0f3170a 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -538,46 +538,49 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) if (r != ERROR_SUCCESS) return r; + hPackage = alloc_msi_remote_handle( remote_package ); + if (!hPackage) + { + ERR( "failed to create handle for %x\n", remote_package ); + midl_user_free( dll ); + midl_user_free( proc ); + return ERROR_INSTALL_FAILURE; + } + hModule = LoadLibraryW( dll ); if (!hModule) { ERR( "failed to load dll %s (%u)\n", debugstr_w( dll ), GetLastError() ); + midl_user_free( dll ); + midl_user_free( proc ); + MsiCloseHandle( hPackage ); return ERROR_SUCCESS; } fn = (MsiCustomActionEntryPoint) GetProcAddress( hModule, proc ); - if (fn) + if (!fn) WARN( "GetProcAddress(%s) failed\n", debugstr_a(proc) ); + else { - hPackage = alloc_msi_remote_handle( remote_package ); - if (hPackage) + handle_msi_break(proc); + + __TRY { - TRACE("calling %s\n", debugstr_a(proc)); - handle_msi_break(proc); - - __TRY - { - r = custom_proc_wrapper(fn, hPackage); - } - __EXCEPT_PAGE_FAULT - { - ERR("Custom action (%s:%s) caused a page fault: %08x\n", - debugstr_w(dll), debugstr_a(proc), GetExceptionCode()); - r = ERROR_SUCCESS; - } - __ENDTRY; - - MsiCloseHandle( hPackage ); + r = custom_proc_wrapper( fn, hPackage ); } - else - ERR("failed to create handle for %x\n", remote_package ); + __EXCEPT_PAGE_FAULT + { + ERR( "Custom action (%s:%s) caused a page fault: %08x\n", + debugstr_w(dll), debugstr_a(proc), GetExceptionCode() ); + r = ERROR_SUCCESS; + } + __ENDTRY; } - else - ERR("GetProcAddress(%s) failed\n", debugstr_a(proc)); FreeLibrary(hModule); midl_user_free(dll); midl_user_free(proc); + MsiCloseHandle(hPackage); return r; } -- 2.11.0

1 0

[PATCH] credui: Correctly check for duplicated username entries in CredDialogFillUsernameCombo.
by Jacek Caban Oct. 12, 2018

Oct. 12, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/credui/credui_main.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)

1 0

[PATCH] prntvtp: add stub for PTOpenProviderEx
by Louis Lenders Oct. 12, 2018

Oct. 12, 2018

See https://bugs.winehq.org/show_bug.cgi?id=45925, the attached stub makes sure the testapp at least doesn`t crash, but instead pops up a window saying I should intall a printer Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/prntvpt/main.c | 6 ++++++ dlls/prntvpt/prntvpt.spec | 2 +- include/prntvpt.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index 72b1dcf680..cdf1b6c8f0 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -55,3 +55,9 @@ HRESULT WINAPI PTOpenProvider(PCWSTR printer, DWORD version, HPTPROVIDER *provid FIXME("%s, %d, %p: stub\n", debugstr_w(printer), version, provider); return E_NOTIMPL; } + +HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD pref_version, HPTPROVIDER *provider, DWORD *used_version) +{ + FIXME("%s, %d, %d, %p, %p: stub\n", debugstr_w(printer), max_version, pref_version, provider, used_version); + return E_NOTIMPL; +} diff --git a/dlls/prntvpt/prntvpt.spec b/dlls/prntvpt/prntvpt.spec index bf9a8cad6b..5581fa4c50 100644 --- a/dlls/prntvpt/prntvpt.spec +++ b/dlls/prntvpt/prntvpt.spec @@ -1,6 +1,6 @@ @ stdcall PTQuerySchemaVersionSupport(wstr ptr) @ stdcall PTOpenProvider(wstr long ptr) -@ stub PTOpenProviderEx +@ stdcall PTOpenProviderEx(wstr long long ptr ptr) @ stub PTCloseProvider @ stub BindPTProviderThunk @ stub PTGetPrintCapabilities diff --git a/include/prntvpt.h b/include/prntvpt.h index 55ecbbe659..8b873dd0aa 100644 --- a/include/prntvpt.h +++ b/include/prntvpt.h @@ -26,6 +26,7 @@ extern "C" { DECLARE_HANDLE(HPTPROVIDER); HRESULT WINAPI PTOpenProvider(const WCHAR *printer, DWORD version, HPTPROVIDER *provider); +HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD pref_version, HPTPROVIDER *provider, DWORD *used_version); #ifdef __cplusplus } -- 2.17.1

1 0

[PATCH] shell32: Improve semi-stub SHGetStockIconInfo, try find existing iconhandle
by Louis Lenders Oct. 12, 2018

Oct. 12, 2018

v3: try find handle to existing icon this is the best I can come up with for now, on windows afaict all these icons mostly come from imegares.dll so the attached patch is not really how windows does it Fix for bug https://bugs.winehq.org/show_bug.cgi?id=45868 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/shell32/iconcache.c | 158 +++++++++++++++++++++++++++++++-- dlls/shell32/tests/shelllink.c | 15 ++++ 2 files changed, 165 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 6107e0c33b..da3e043d95 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -987,6 +987,119 @@ INT WINAPI SHGetIconOverlayIndexW(LPCWSTR pszIconPath, INT iIconIndex) return -1; } +/**************************************************************************** + * For SHGetStockIconInfo + */ +typedef struct { + SHSTOCKICONID id; + DWORD iconid; +} SI_ENTRY; + +static const SI_ENTRY si_table[] = +{ + [0] = { SIID_DOCNOASSOC, IDI_SHELL_FILE}, + [1] = { SIID_DOCASSOC, IDI_SHELL_DOCUMENT}, + [2] = { SIID_APPLICATION, IDI_SHELL_WINDOW}, + [3] = { SIID_FOLDER, IDI_SHELL_FOLDER}, + [4] = { SIID_FOLDEROPEN, IDI_SHELL_FOLDER_OPEN}, + [5] = { SIID_DRIVE525, 0}, + [6] = { SIID_DRIVE35, 0}, + [7] = { SIID_DRIVERREMOVE, 0}, + [8] = { SIID_DRIVERFIXED, IDI_SHELL_DRIVE}, + [9] = { SIID_DRIVERNET, IDI_SHELL_NETDRIVE}, + [10] = { SIID_DRIVERNETDISABLE, IDI_SHELL_NETDRIVE2}, + [11] = { SIID_DRIVERCD, IDI_SHELL_OPTICAL_DRIVE}, + [12] = { SIID_DRIVERRAM, IDI_SHELL_RAMDISK}, + [13] = { SIID_WORLD, 0}, + /* Missing: 14 */ + [15] = { SIID_SERVER, 0}, + [16] = { SIID_PRINTER, IDI_SHELL_PRINT}, + [17] = { SIID_MYNETWORK, 0}, + /* Missing: 18 - 21 */ + [22] = { SIID_FIND, 0}, + [23] = { SIID_HELP, IDI_SHELL_HELP}, + /* Missing: 24 - 27 */ + [28] = {SIID_SHARE, 0}, + [29] = {SIID_LINK, 0}, + [30] = {SIID_SLOWFILE, 0}, + [31] = {SIID_RECYCLER, IDI_SHELL_TRASH_FOLDER}, + [32] = {SIID_RECYCLERFULL, IDI_SHELL_FULL_RECYCLE_BIN}, + /* Missing: 33 - 39 */ + [40] = {SIID_MEDIACDAUDIO, 0}, + /* Missing: 41 - 46 */ + [47] = {SIID_LOCK, IDI_SHELL_PASSWORDS}, + /* Missing: 48 */ + [49] = {SIID_AUTOLIST, 0}, + [50] = {SIID_PRINTERNET, 0}, + [51] = {SIID_SERVERSHARE, 0}, + [52] = {SIID_PRINTERFAX, 0}, + [53] = {SIID_PRINTERFAXNET, 0}, + [54] = {SIID_PRINTERFILE, 0}, + [55] = {SIID_STACK, 0}, + [56] = {SIID_MEDIASVCD, 0}, + [57] = {SIID_STUFFEDFOLDER, 0}, + [58] = {SIID_DRIVEUNKNOWN, 0}, + [59] = {SIID_DRIVEDVD, 0}, + [60] = {SIID_MEDIADVD, 0}, + [61] = {SIID_MEDIADVDRAM, 0}, + [62] = {SIID_MEDIADVDRW, 0}, + [63] = {SIID_MEDIADVDR, 0}, + [64] = {SIID_MEDIADVDROM, 0}, + [65] = {SIID_MEDIACDAUDIOPLUS, 0}, + [66] = {SIID_MEDIACDRW, 0}, + [67] = {SIID_MEDIACDR, 0}, + [68] = {SIID_MEDIACDBURN, 0}, + [69] = {SIID_MEDIABLANKCD, 0}, + [70] = {SIID_MEDIACDROM, 0}, + [71] = {SIID_AUDIOFILES, IDI_SHELL_AUDIO_FILE}, + [72] = {SIID_IMAGEFILES, IDI_SHELL_IMAGE_FILE}, + [73] = {SIID_VIDEOFILES, IDI_SHELL_VIDEO_FILE}, + [74] = {SIID_MIXEDFILES, 0}, + [75] = {SIID_FOLDERBACK, 0}, + [76] = {SIID_FOLDERFRONT, 0}, + [77] = {SIID_SHIELD, 0}, + [78] = {SIID_WARNING, 0}, + [79] = {SIID_INFO, 0}, + [80] = {SIID_ERROR, 0}, + [81] = {SIID_KEY, 0}, + [82] = {SIID_SOFTWARE, 0}, + [83] = {SIID_RENAME, IDI_SHELL_RENAME}, + [84] = {SIID_DELETE, IDI_SHELL_CONFIRM_DELETE}, + [85] = {SIID_MEDIAAUDIODVD, 0}, + [86] = {SIID_MEDIAMOVIEDVD, 0}, + [87] = {SIID_MEDIAENHANCEDCD, 0}, + [88] = {SIID_MEDIAENHANCEDDVD, 0}, + [89] = {SIID_MEDIAHDDVD, 0}, + [90] = {SIID_MEDIABLUERAY, 0}, + [91] = {SIID_MEDIAVCD, 0}, + [92] = {SIID_MEDIADVDPLUSR, 0}, + [93] = {SIID_MEDIADVDPLUSRW, 0}, + [94] = {SIID_DESKTOPPC, IDI_SHELL_MY_COMPUTER}, + [95] = {SIID_MOBILEPC, 0}, + [96] = {SIID_USERS, IDI_SHELL_USERS}, + [97] = {SIID_MEDIASMARTMEDIA, 0}, + [98] = {SIID_MEDIACOMPACTFLASH, 0}, + [99] = {SIID_DEVICECELLPHONE, 0}, + [100] = {SIID_DEVICECAMERA, 0}, + [101] = {SIID_DEVICEVIDEOCAMERA, 0}, + [102] = {SIID_DEVICEAUDIOPLAYER, 0}, + [103] = {SIID_NETWORKCONNECT, 0}, + [104] = {SIID_INTERNET, IDI_SHELL_WEB_BROWSER}, + [105] = {SIID_ZIPFILE, 0}, + [106] = {SIID_SETTINGS, IDI_SHELL_SETTINGS}, + /* Missing: 107 - 131 */ + [132] = {SIID_DRIVEHDDVD, 0}, + [133] = {SIID_DRIVEBD, 0}, + [134] = {SIID_MEDIAHDDVDROM, 0}, + [135] = {SIID_MEDIAHDDVDR, 0}, + [136] = {SIID_MEDIAHDDVDRAM, 0}, + [137] = {SIID_MEDIABDROM, 0}, + [138] = {SIID_MEDIABDR, 0}, + [139] = {SIID_MEDIABDRE, 0}, + [140] = {SIID_CLUSTEREDDRIVE, 0} + /* Missing: 141 - 180 and SIID_MAX_ICONS = 181*/ + }; + /**************************************************************************** * SHGetStockIconInfo [SHELL32.@] * @@ -1004,25 +1117,54 @@ INT WINAPI SHGetIconOverlayIndexW(LPCWSTR pszIconPath, INT iIconIndex) */ HRESULT WINAPI SHGetStockIconInfo(SHSTOCKICONID id, UINT flags, SHSTOCKICONINFO *sii) { - static const WCHAR shell32dll[] = {'\\','s','h','e','l','l','3','2','.','d','l','l',0}; + static const WCHAR shell32dllW[] = {'s','h','e','l','l','3','2','.','d','l','l',0}; + static const WCHAR slashW[] = {'\\',0}; + HMODULE hmod; - FIXME("(%d, 0x%x, %p) semi-stub\n", id, flags, sii); + TRACE("(%d, 0x%x, %p)\n", id, flags, sii); if ((id < 0) || (id >= SIID_MAX_ICONS) || !sii || (sii->cbSize != sizeof(SHSTOCKICONINFO))) { return E_INVALIDARG; } GetSystemDirectoryW(sii->szPath, MAX_PATH); + lstrcatW(sii->szPath, slashW); + lstrcatW(sii->szPath, shell32dllW); + + sii->hIcon = NULL; + sii->iSysImageIndex = -1; - /* no icons defined: use default */ - sii->iIcon = -IDI_SHELL_FILE; - lstrcatW(sii->szPath, shell32dll); + /* this is not how windows does it, on windows picked mostly from imageres.dll !*/ + if (si_table[id].iconid) + sii->iIcon = sii->iSysImageIndex - si_table[id].id; + else + { + FIXME("Couldn`t find SIID %d, returning default values (IDI_SHELL_FILE)\n", id); + sii->iIcon = sii->iSysImageIndex - IDI_SHELL_FILE; + } + + if (flags & SHGSI_ICON) + { + flags &= ~SHGSI_ICON; + + hmod = GetModuleHandleW(shell32dllW); + if (hmod) + { + if (si_table[id].iconid) + sii->hIcon = LoadIconW(hmod, MAKEINTRESOURCEW(si_table[id].iconid)); + else + sii->hIcon = LoadIconW(hmod, MAKEINTRESOURCEW(IDI_SHELL_FILE)); + } + + if (!sii->hIcon) + { + ERR("failed to get an icon handle\n"); + return E_INVALIDARG; + } + } if (flags) FIXME("flags 0x%x not implemented\n", flags); - sii->hIcon = NULL; - sii->iSysImageIndex = -1; - TRACE("%3d: returning %s (%d)\n", id, debugstr_w(sii->szPath), sii->iIcon); return S_OK; diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 3bfd9cbe38..e7e3dac987 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -1139,6 +1139,21 @@ static void test_SHGetStockIconInfo(void) /* there is a NULL check for the struct */ hr = pSHGetStockIconInfo(SIID_FOLDER, SHGSI_ICONLOCATION, NULL); ok(hr == E_INVALIDARG, "NULL: got 0x%x\n", hr); + + for(i = 0; i < 140; i++) /* highest on wvista, i > 140 gives E_INVALIDARG, win7 can go higher */ + { + memset(buffer, 0, sizeof(buffer)); + sii->cbSize = sizeof(SHSTOCKICONINFO); + hr = pSHGetStockIconInfo(i, SHGSI_ICON | SHGSI_SMALLICON, sii); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + ok(sii->hIcon != NULL, "got NULL, expected an icon handle\n"); + ok(sii->iIcon != 0, "got unexpected 0 for SIID %d\n", i); /* howto find out exact sii->iIcon value??? */ + ok(sii->iSysImageIndex == -1, "got %d (expected -1)\n", sii->iSysImageIndex); + ok(DestroyIcon(sii->hIcon), "DestroyIcon failed\n"); + if (winetest_debug > 1) + trace("%3d: got iSysImageIndex %3d, iIcon %3d and %s\n", i, sii->iSysImageIndex, + sii->iIcon, wine_dbgstr_w(sii->szPath)); + } } static void test_SHExtractIcons(void) -- 2.17.1

1 0

[PATCH 1/3] dibdrv: Refactoring the gray text rendering intensities control code.
by Byeongsik Jeon Oct. 12, 2018

Oct. 12, 2018

r1 = ramp[aa] r2 = ramp[16 - aa] min = text * r1 / 0xff max = r2 + ( 0xff - r2 ) * text / 0xff dst < text: diff = text - dst range = text - min dst = text - diff * range / text = text - ( text - dst ) * ( text - min ) / text = text - ( text - dst ) * ( text - text * r1 / 0xff ) / text = text - ( text - dst ) * ( 0xff - r1 ) / 0xff = ( text * r1 + dst * ( 0xff - r1 )) / 0xff = ( text * ramp[aa] + dst * ( 0xff - ramp[aa] )) / 0xff dst > text: diff = dst - text range = max - text dst = text + diff * range / ( 0xff - text ) = text + ( dst - text ) * ( max - text ) / ( 0xff - text ) = text + ( dst - text ) * (( 0xff - text) * r2 / 0xff ) / ( 0xff - text ) = text + ( dst - text ) * r2 / 0xff = ( dst * r2 + text * ( 0xff - r2 )) / 0xff = ( dst * ramp[16 - aa] + text * ( 0xff - ramp[16 - aa] )) / 0xff Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- I focused on doing equal functions without adding new features. It is a different formula from the usual gamma correction pattern, but it takes a roughly similar graph shape because it is classified as "dst > text". 0.4315 to = 1/2.3: The gamma value is too large, so the rendering quality is bad. This value seems to be related to SPI_SETFONTSMOOTHINGENTRAST. The dibdrv gray text format is limited to GGO_GRAY4_BITMAP, which lowers the quality of text rendering. Is there a special reason? dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/graphics.c | 57 ++---------------------------- dlls/gdi32/dibdrv/primitives.c | 64 ++++++++++++++++++---------------- 3 files changed, 37 insertions(+), 86 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index f79f5b0867..5697645229 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -190,7 +190,7 @@ typedef struct primitive_funcs void (* mask_rect)(const dib_info *dst, const RECT *rc, const dib_info *src, const POINT *origin, int rop2); void (* draw_glyph)(const dib_info *dst, const RECT *rc, const dib_info *glyph, - const POINT *origin, DWORD text_pixel, const struct intensity_range *ranges); + const POINT *origin, DWORD text_pixel); void (* draw_subpixel_glyph)(const dib_info *dst, const RECT *rc, const dib_info *glyph, const POINT *origin, DWORD text_pixel ); DWORD (* get_pixel)(const dib_info *dib, int x, int y); diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 08f8c3d6d2..4387eaa10a 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -474,52 +474,6 @@ done: return ret; } -/* Intensities of the 17 glyph levels when drawn with text component of 0xff on a - black bkgnd. [A log-log plot of these data gives: y = 77.05 * x^0.4315]. */ -static const BYTE ramp[17] = -{ - 0, 0x4d, 0x68, 0x7c, - 0x8c, 0x9a, 0xa7, 0xb2, - 0xbd, 0xc7, 0xd0, 0xd9, - 0xe1, 0xe9, 0xf0, 0xf8, - 0xff -}; - -/* For a give text-color component and a glyph level, calculate the - range of dst intensities, the min/max corresponding to 0/0xff bkgnd - components respectively. - - The minimum is a linear interpolation between 0 and the value in - the ramp table. - - The maximum is a linear interpolation between the value from the - ramp table read in reverse and 0xff. - - To find the resulting pixel intensity, we note that if the text and - bkgnd intensities are the same then the result must be that - intensity. Otherwise we linearly interpolate between either the - min or the max value and this intermediate value depending on which - side of the inequality we lie. -*/ - -static inline void get_range( BYTE aa, DWORD text_comp, BYTE *min_comp, BYTE *max_comp ) -{ - *min_comp = (ramp[aa] * text_comp) / 0xff; - *max_comp = ramp[16 - aa] + ((0xff - ramp[16 - aa]) * text_comp) / 0xff; -} - -static inline void get_aa_ranges( COLORREF col, struct intensity_range intensities[17] ) -{ - int i; - - for (i = 0; i < 17; i++) - { - get_range( i, GetRValue(col), &intensities[i].r_min, &intensities[i].r_max ); - get_range( i, GetGValue(col), &intensities[i].g_min, &intensities[i].g_max ); - get_range( i, GetBValue(col), &intensities[i].b_min, &intensities[i].b_max ); - } -} - static DWORD font_cache_hash( struct cached_font *font ) { DWORD hash = 0, *ptr, two_chars; @@ -683,8 +637,7 @@ static inline void get_text_bkgnd_masks( DC *dc, const dib_info *dib, rop_mask * static void draw_glyph( dib_info *dib, int x, int y, const GLYPHMETRICS *metrics, const dib_info *glyph_dib, DWORD text_color, - const struct intensity_range *ranges, const struct clipped_rects *clipped_rects, - RECT *bounds ) + const struct clipped_rects *clipped_rects, RECT *bounds ) { int i; RECT rect, clipped_rect; @@ -708,7 +661,7 @@ static void draw_glyph( dib_info *dib, int x, int y, const GLYPHMETRICS *metrics text_color ); else dib->funcs->draw_glyph( dib, &clipped_rect, glyph_dib, &src_origin, - text_color, ranges ); + text_color ); } } } @@ -816,7 +769,6 @@ static void render_string( DC *dc, dib_info *dib, struct cached_font *font, INT struct cached_glyph *glyph; dib_info glyph_dib; DWORD text_color; - struct intensity_range ranges[17]; glyph_dib.bit_count = get_glyph_depth( font->aa_flags ); glyph_dib.rect.left = 0; @@ -826,9 +778,6 @@ static void render_string( DC *dc, dib_info *dib, struct cached_font *font, INT text_color = get_pixel_color( dc, dib, dc->textColor, TRUE ); - if (glyph_dib.bit_count == 8) - get_aa_ranges( dib->funcs->pixel_to_colorref( dib, text_color ), ranges ); - for (i = 0; i < count; i++) { if (!(glyph = get_cached_glyph( font, str[i], flags )) && @@ -841,7 +790,7 @@ static void render_string( DC *dc, dib_info *dib, struct cached_font *font, INT glyph_dib.stride = get_dib_stride( glyph->metrics.gmBlackBoxX, glyph_dib.bit_count ); glyph_dib.bits.ptr = glyph->bits; - draw_glyph( dib, x, y, &glyph->metrics, &glyph_dib, text_color, ranges, clipped_rects, bounds ); + draw_glyph( dib, x, y, &glyph->metrics, &glyph_dib, text_color, clipped_rects, bounds ); if (dx) { diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 0d097b2da6..caf2d890b5 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -6039,35 +6039,36 @@ static void mask_rect_null( const dib_info *dst, const RECT *rc, { } -static inline BYTE aa_color( BYTE dst, BYTE text, BYTE min_comp, BYTE max_comp ) +/* Intensities of the 17 glyph levels when drawn with text component of 0xff on a + black bkgnd. [A log-log plot of these data gives: y = 77.05 * x^0.4315]. */ +static const BYTE ramp[17] = +{ + 0, 0x4d, 0x68, 0x7c, + 0x8c, 0x9a, 0xa7, 0xb2, + 0xbd, 0xc7, 0xd0, 0xd9, + 0xe1, 0xe9, 0xf0, 0xf8, + 0xff +}; + +static inline BYTE aa_color( BYTE dst, BYTE text, BYTE alpha ) { if (dst == text) return dst; if (dst > text) - { - DWORD diff = dst - text; - DWORD range = max_comp - text; - dst = text + (diff * range ) / (0xff - text); - return dst; - } + return ( text * ( 0xff - ramp[16 - alpha] ) + dst * ramp[16 - alpha] ) / 0xff; else - { - DWORD diff = text - dst; - DWORD range = text - min_comp; - dst = text - (diff * range) / text; - return dst; - } + return ( text * ramp[alpha] + dst * ( 0xff - ramp[alpha] ) ) / 0xff; } -static inline DWORD aa_rgb( BYTE r_dst, BYTE g_dst, BYTE b_dst, DWORD text, const struct intensity_range *range ) +static inline DWORD aa_rgb( BYTE r_dst, BYTE g_dst, BYTE b_dst, DWORD text, BYTE alpha ) { - return (aa_color( b_dst, text, range->b_min, range->b_max ) | - aa_color( g_dst, text >> 8, range->g_min, range->g_max ) << 8 | - aa_color( r_dst, text >> 16, range->r_min, range->r_max ) << 16); + return (aa_color( b_dst, text, alpha ) | + aa_color( g_dst, text >> 8, alpha ) << 8 | + aa_color( r_dst, text >> 16, alpha ) << 16); } static void draw_glyph_8888( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel, const struct intensity_range *ranges ) + const POINT *origin, DWORD text_pixel ) { DWORD *dst_ptr = get_pixel_ptr_32( dib, rect->left, rect->top ); const BYTE *glyph_ptr = get_pixel_ptr_8( glyph, origin->x, origin->y ); @@ -6079,7 +6080,8 @@ static void draw_glyph_8888( const dib_info *dib, const RECT *rect, const dib_in { if (glyph_ptr[x] <= 1) continue; if (glyph_ptr[x] >= 16) { dst_ptr[x] = text_pixel; continue; } - dst_ptr[x] = aa_rgb( dst_ptr[x] >> 16, dst_ptr[x] >> 8, dst_ptr[x], text_pixel, ranges + glyph_ptr[x] ); + dst_ptr[x] = aa_rgb( dst_ptr[x] >> 16, dst_ptr[x] >> 8, dst_ptr[x], + text_pixel, glyph_ptr[x] ); } dst_ptr += dib->stride / 4; glyph_ptr += glyph->stride; @@ -6087,7 +6089,7 @@ static void draw_glyph_8888( const dib_info *dib, const RECT *rect, const dib_in } static void draw_glyph_32( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel, const struct intensity_range *ranges ) + const POINT *origin, DWORD text_pixel ) { DWORD *dst_ptr = get_pixel_ptr_32( dib, rect->left, rect->top ); const BYTE *glyph_ptr = get_pixel_ptr_8( glyph, origin->x, origin->y ); @@ -6107,7 +6109,7 @@ static void draw_glyph_32( const dib_info *dib, const RECT *rect, const dib_info val = aa_rgb( get_field(dst_ptr[x], dib->red_shift, dib->red_len), get_field(dst_ptr[x], dib->green_shift, dib->green_len), get_field(dst_ptr[x], dib->blue_shift, dib->blue_len), - text, ranges + glyph_ptr[x] ); + text, glyph_ptr[x] ); dst_ptr[x] = rgb_to_pixel_masks( dib, val >> 16, val >> 8, val ); } dst_ptr += dib->stride / 4; @@ -6116,7 +6118,7 @@ static void draw_glyph_32( const dib_info *dib, const RECT *rect, const dib_info } static void draw_glyph_24( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel, const struct intensity_range *ranges ) + const POINT *origin, DWORD text_pixel ) { BYTE *dst_ptr = get_pixel_ptr_24( dib, rect->left, rect->top ); const BYTE *glyph_ptr = get_pixel_ptr_8( glyph, origin->x, origin->y ); @@ -6132,7 +6134,7 @@ static void draw_glyph_24( const dib_info *dib, const RECT *rect, const dib_info val = text_pixel; else val = aa_rgb( dst_ptr[x * 3 + 2], dst_ptr[x * 3 + 1], dst_ptr[x * 3], - text_pixel, ranges + glyph_ptr[x] ); + text_pixel, glyph_ptr[x] ); dst_ptr[x * 3] = val; dst_ptr[x * 3 + 1] = val >> 8; dst_ptr[x * 3 + 2] = val >> 16; @@ -6143,7 +6145,7 @@ static void draw_glyph_24( const dib_info *dib, const RECT *rect, const dib_info } static void draw_glyph_555( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel, const struct intensity_range *ranges ) + const POINT *origin, DWORD text_pixel ) { WORD *dst_ptr = get_pixel_ptr_16( dib, rect->left, rect->top ); const BYTE *glyph_ptr = get_pixel_ptr_8( glyph, origin->x, origin->y ); @@ -6163,7 +6165,7 @@ static void draw_glyph_555( const dib_info *dib, const RECT *rect, const dib_inf val = aa_rgb( ((dst_ptr[x] >> 7) & 0xf8) | ((dst_ptr[x] >> 12) & 0x07), ((dst_ptr[x] >> 2) & 0xf8) | ((dst_ptr[x] >> 7) & 0x07), ((dst_ptr[x] << 3) & 0xf8) | ((dst_ptr[x] >> 2) & 0x07), - text, ranges + glyph_ptr[x] ); + text, glyph_ptr[x] ); dst_ptr[x] = ((val >> 9) & 0x7c00) | ((val >> 6) & 0x03e0) | ((val >> 3) & 0x001f); } dst_ptr += dib->stride / 2; @@ -6172,7 +6174,7 @@ static void draw_glyph_555( const dib_info *dib, const RECT *rect, const dib_inf } static void draw_glyph_16( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel, const struct intensity_range *ranges ) + const POINT *origin, DWORD text_pixel ) { WORD *dst_ptr = get_pixel_ptr_16( dib, rect->left, rect->top ); const BYTE *glyph_ptr = get_pixel_ptr_8( glyph, origin->x, origin->y ); @@ -6192,7 +6194,7 @@ static void draw_glyph_16( const dib_info *dib, const RECT *rect, const dib_info val = aa_rgb( get_field(dst_ptr[x], dib->red_shift, dib->red_len), get_field(dst_ptr[x], dib->green_shift, dib->green_len), get_field(dst_ptr[x], dib->blue_shift, dib->blue_len), - text, ranges + glyph_ptr[x] ); + text, glyph_ptr[x] ); dst_ptr[x] = rgb_to_pixel_masks( dib, val >> 16, val >> 8, val ); } dst_ptr += dib->stride / 2; @@ -6201,7 +6203,7 @@ static void draw_glyph_16( const dib_info *dib, const RECT *rect, const dib_info } static void draw_glyph_8( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel, const struct intensity_range *ranges ) + const POINT *origin, DWORD text_pixel ) { BYTE *dst_ptr = get_pixel_ptr_8( dib, rect->left, rect->top ); const BYTE *glyph_ptr = get_pixel_ptr_8( glyph, origin->x, origin->y ); @@ -6221,7 +6223,7 @@ static void draw_glyph_8( const dib_info *dib, const RECT *rect, const dib_info } static void draw_glyph_4( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel, const struct intensity_range *ranges ) + const POINT *origin, DWORD text_pixel ) { BYTE *dst_ptr = get_pixel_ptr_4( dib, rect->left, rect->top ); const BYTE *glyph_ptr = get_pixel_ptr_8( glyph, origin->x, origin->y ); @@ -6246,7 +6248,7 @@ static void draw_glyph_4( const dib_info *dib, const RECT *rect, const dib_info } static void draw_glyph_1( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel, const struct intensity_range *ranges ) + const POINT *origin, DWORD text_pixel ) { BYTE *dst_ptr = get_pixel_ptr_1( dib, rect->left, rect->top ); const BYTE *glyph_ptr = get_pixel_ptr_8( glyph, origin->x, origin->y ); @@ -6268,7 +6270,7 @@ static void draw_glyph_1( const dib_info *dib, const RECT *rect, const dib_info } static void draw_glyph_null( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel, const struct intensity_range *ranges ) + const POINT *origin, DWORD text_pixel ) { return; } -- 2.19.1

2 7