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

Nikolay Sivov : comctl32/tooltip: Compare to special callback pointer value directly.
by Alexandre Julliard April 30, 2018

April 30, 2018

Module: wine Branch: master Commit: 5e7e3cbda6578234099909290482dcedc63cadcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e7e3cbda657823409990929… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 30 14:32:01 2018 +0300 comctl32/tooltip: Compare to special callback pointer value directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tooltips.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 5460101..1aa55d1 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -177,15 +177,6 @@ typedef struct static LRESULT CALLBACK TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uId, DWORD_PTR dwRef); - -static inline BOOL TOOLTIPS_IsCallbackString(LPCWSTR str, BOOL isW) -{ - if (isW) - return str == LPSTR_TEXTCALLBACKW; - else - return (LPCSTR)str == LPSTR_TEXTCALLBACKA; -} - static inline UINT_PTR TOOLTIPS_GetTitleIconIndex(HICON hIcon) { @@ -1091,7 +1082,7 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) toolPtr->lpszText = ti->lpszText; } else if (ti->lpszText) { - if (TOOLTIPS_IsCallbackString(ti->lpszText, isW)) { + if (ti->lpszText == LPSTR_TEXTCALLBACKW) { TRACE("add CALLBACK\n"); toolPtr->lpszText = LPSTR_TEXTCALLBACKW; } @@ -1674,7 +1665,7 @@ TOOLTIPS_SetToolInfoT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) toolPtr->lpszText = ti->lpszText; } else { - if (TOOLTIPS_IsCallbackString(ti->lpszText, isW)) + if (ti->lpszText == LPSTR_TEXTCALLBACKW) toolPtr->lpszText = LPSTR_TEXTCALLBACKW; else { if ( (toolPtr->lpszText) && @@ -1800,7 +1791,7 @@ TOOLTIPS_UpdateTipTextT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW toolPtr->lpszText = ti->lpszText; } else if (ti->lpszText) { - if (TOOLTIPS_IsCallbackString(ti->lpszText, isW)) + if (ti->lpszText == LPSTR_TEXTCALLBACKW) toolPtr->lpszText = LPSTR_TEXTCALLBACKW; else { if ( (toolPtr->lpszText) &&

1 0

Nikolay Sivov : comctl32/toolbar: Fix tooltip notification forwarding.
by Alexandre Julliard April 30, 2018

April 30, 2018

Module: wine Branch: master Commit: 0645fa1373822629ad82d754fc7232d170e14859 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0645fa1373822629ad82d754… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 30 19:29:06 2018 +0300 comctl32/toolbar: Fix tooltip notification forwarding. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 3 +-- dlls/comctl32/toolbar.c | 59 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 54 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index ce5eab3..5fd6133 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -56,7 +56,6 @@ static BOOL g_ResetDispTextPtr; static const struct message ttgetdispinfo_parent_seq[] = { { WM_NOTIFY, sent|id, 0, 0, TBN_GETINFOTIPA }, - /* next line is todo, currently TTN_GETDISPINFOW is raised here */ { WM_NOTIFY, sent|id, 0, 0, TTN_GETDISPINFOA }, { 0 } }; @@ -2026,7 +2025,7 @@ static void test_tooltip(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); SendMessageA(hToolbar, WM_NOTIFY, 0, (LPARAM)&nmtti); ok_sequence(sequences, PARENT_SEQ_INDEX, ttgetdispinfo_parent_seq, - "dispinfo from tooltip", TRUE); + "dispinfo from tooltip", FALSE); g_ResetDispTextPtr = TRUE; SendMessageA(hToolbar, WM_NOTIFY, 0, (LPARAM)&nmtti); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index cc708f0..e1cb7b7 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -6118,6 +6118,9 @@ TOOLBAR_NCPaint (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT TOOLBAR_TTGetDispInfo (TOOLBAR_INFO *infoPtr, NMTTDISPINFOW *lpnmtdi) { int index = TOOLBAR_GetButtonIndex(infoPtr, lpnmtdi->hdr.idFrom, FALSE); + NMTTDISPINFOA nmtdi; + unsigned int len; + LRESULT ret; TRACE("button index = %d\n", index); @@ -6131,7 +6134,6 @@ static LRESULT TOOLBAR_TTGetDispInfo (TOOLBAR_INFO *infoPtr, NMTTDISPINFOW *lpnm { WCHAR wszBuffer[INFOTIPSIZE+1]; NMTBGETINFOTIPW tbgit; - unsigned int len; /* in chars */ wszBuffer[0] = '\0'; wszBuffer[INFOTIPSIZE] = '\0'; @@ -6169,7 +6171,6 @@ static LRESULT TOOLBAR_TTGetDispInfo (TOOLBAR_INFO *infoPtr, NMTTDISPINFOW *lpnm { CHAR szBuffer[INFOTIPSIZE+1]; NMTBGETINFOTIPA tbgit; - unsigned int len; /* in chars */ szBuffer[0] = '\0'; szBuffer[INFOTIPSIZE] = '\0'; @@ -6210,7 +6211,7 @@ static LRESULT TOOLBAR_TTGetDispInfo (TOOLBAR_INFO *infoPtr, NMTTDISPINFOW *lpnm !(infoPtr->buttons[index].fsStyle & BTNS_SHOWTEXT)) { LPWSTR pszText = TOOLBAR_GetText(infoPtr, &infoPtr->buttons[index]); - unsigned int len = pszText ? strlenW(pszText) : 0; + len = pszText ? strlenW(pszText) : 0; TRACE("using button hidden text %s\n", debugstr_w(pszText)); @@ -6236,9 +6237,55 @@ static LRESULT TOOLBAR_TTGetDispInfo (TOOLBAR_INFO *infoPtr, NMTTDISPINFOW *lpnm TRACE("Sending tooltip notification to %p\n", infoPtr->hwndNotify); - /* last resort: send notification on to app */ - /* FIXME: find out what is really used here */ - return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, lpnmtdi->hdr.idFrom, (LPARAM)lpnmtdi); + /* Last resort, forward TTN_GETDISPINFO to the app: + + - NFR_UNICODE gets TTN_GETDISPINFOW, and TTN_GETDISPINFOA if -W returned no text; + - NFR_ANSI gets only TTN_GETDISPINFOA. + */ + if (infoPtr->bUnicode) + { + ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, lpnmtdi->hdr.idFrom, (LPARAM)lpnmtdi); + + TRACE("TTN_GETDISPINFOW - got string %s\n", debugstr_w(lpnmtdi->lpszText)); + + if (lpnmtdi->lpszText && *lpnmtdi->lpszText) + return ret; + } + + nmtdi.hdr.hwndFrom = lpnmtdi->hdr.hwndFrom; + nmtdi.hdr.idFrom = lpnmtdi->hdr.idFrom; + nmtdi.hdr.code = TTN_GETDISPINFOA; + nmtdi.lpszText = nmtdi.szText; + nmtdi.szText[0] = 0; + nmtdi.hinst = lpnmtdi->hinst; + nmtdi.uFlags = lpnmtdi->uFlags; + nmtdi.lParam = lpnmtdi->lParam; + + ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmtdi.hdr.idFrom, (LPARAM)&nmtdi); + + TRACE("TTN_GETDISPINFOA - got string %s\n", debugstr_a(nmtdi.lpszText)); + + if (!nmtdi.lpszText || !*nmtdi.lpszText) + return ret; + + len = MultiByteToWideChar(CP_ACP, 0, nmtdi.lpszText, -1, NULL, 0); + if (len > ARRAY_SIZE(lpnmtdi->szText)) + { + infoPtr->pszTooltipText = Alloc(len * sizeof(WCHAR)); + if (infoPtr->pszTooltipText) + { + MultiByteToWideChar(CP_ACP, 0, nmtdi.lpszText, -1, infoPtr->pszTooltipText, len); + lpnmtdi->lpszText = infoPtr->pszTooltipText; + return 0; + } + } + else + { + MultiByteToWideChar(CP_ACP, 0, nmtdi.lpszText, -1, lpnmtdi->lpszText, ARRAY_SIZE(nmtdi.szText)); + return 0; + } + + return ret; }

1 0

Alistair Leslie-Hughes : mfplat: Return S_OK from MFStartup stub.
by Alexandre Julliard April 30, 2018

April 30, 2018

Module: wine Branch: master Commit: beb3094ca8cdf50b5422e7242cb74354f4e03420 URL: https://source.winehq.org/git/wine.git/?a=commit;h=beb3094ca8cdf50b5422e724… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 30 00:47:18 2018 +0000 mfplat: Return S_OK from MFStartup stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 9 ++++++++- dlls/mfplat/tests/mfplat.c | 5 ++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 7c5be65..df61f3c 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -404,8 +404,15 @@ HRESULT WINAPI MFTUnregister(CLSID clsid) */ HRESULT WINAPI MFStartup(ULONG version, DWORD flags) { +#define MF_VERSION_XP MAKELONG( MF_API_VERSION, 1 ) +#define MF_VERSION_WIN7 MAKELONG( MF_API_VERSION, 2 ) + FIXME("(%u, %u): stub\n", version, flags); - return MF_E_BAD_STARTUP_VERSION; + + if(version != MF_VERSION_XP && version != MF_VERSION_WIN7) + return MF_E_BAD_STARTUP_VERSION; + + return S_OK; } /*********************************************************************** diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f85b00c..f3a4521 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -202,8 +202,11 @@ static void test_MFCreateMediaType(void) HRESULT hr; IMFMediaType *mediatype; + hr = MFStartup(MAKELONG( MF_API_VERSION, 0xdead ), MFSTARTUP_FULL); + ok(hr == MF_E_BAD_STARTUP_VERSION, "got 0x%08x\n", hr); + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); if(0) {

1 0

Zebediah Figura : devenum: Check for null pointer in IMoniker_BindToObject ().
by Alexandre Julliard April 30, 2018

April 30, 2018

Module: wine Branch: master Commit: 8cd4d9fb47021badd0a9747c106dd9a18be207c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cd4d9fb47021badd0a9747c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 28 12:30:09 2018 -0500 devenum: Check for null pointer in IMoniker_BindToObject(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/mediacatenum.c | 3 +++ dlls/devenum/tests/devenum.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index b0cdc6c..a76c7be 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -444,6 +444,9 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_BindToObject(IMoniker *iface, IBi TRACE("(%p)->(%p, %p, %s, %p)\n", This, pbc, pmkToLeft, debugstr_guid(riidResult), ppvResult); + if (!ppvResult) + return E_POINTER; + VariantInit(&var); *ppvResult = NULL; diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 293ba8d..383619c 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -134,6 +134,9 @@ static void test_devenum(IBindCtx *bind_ctx) } } + hr = IMoniker_BindToObject(moniker, bind_ctx, NULL, &IID_IUnknown, NULL); + ok(hr == E_POINTER, "got %#x\n", hr); + IPropertyBag_Release(prop_bag); IMoniker_Release(moniker); }

1 0

Alistair Leslie-Hughes : netapi32: Add DsEnumerateDomainTrustsA/W stubs.
by Alexandre Julliard April 30, 2018

April 30, 2018

Module: wine Branch: master Commit: 07e41e4c9ba913d895e50715ff8cc70bd6f9d855 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07e41e4c9ba913d895e50715… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Apr 29 01:49:57 2018 +0000 netapi32: Add DsEnumerateDomainTrustsA/W stubs. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/netapi32.c | 18 ++++++++++++++++++ dlls/netapi32/netapi32.spec | 3 ++- include/dsgetdc.h | 26 ++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 620df79..ff57c22 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -3544,6 +3544,24 @@ DWORD WINAPI DavGetUNCFromHTTPPath(const WCHAR *http_path, WCHAR *buf, DWORD *bu return ERROR_SUCCESS; } +/************************************************************ + * DsEnumerateDomainTrustsA (NETAPI32.@) + */ +DWORD WINAPI DsEnumerateDomainTrustsA(LPSTR server, ULONG flags, PDS_DOMAIN_TRUSTSA* domains, PULONG count) +{ + FIXME("(%s, 0x%04x, %p, %p): stub\n", debugstr_a(server), flags, domains, count); + return ERROR_NO_LOGON_SERVERS; +} + +/************************************************************ + * DsEnumerateDomainTrustsW (NETAPI32.@) + */ +DWORD WINAPI DsEnumerateDomainTrustsW(LPWSTR server, ULONG flags, PDS_DOMAIN_TRUSTSW* domains, PULONG count) +{ + FIXME("(%s, 0x%04x, %p, %p): stub\n", debugstr_w(server), flags, domains, count); + return ERROR_NO_LOGON_SERVERS; +} + DECLSPEC_HIDDEN void __RPC_FAR *__RPC_USER MIDL_user_allocate(SIZE_T n) { return HeapAlloc(GetProcessHeap(), 0, n); diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index 7b51939..7e83b1a 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -3,7 +3,8 @@ @ stub DsAddressToSiteNames @ stub DsAddressToSiteNamesEx @ stub DsDeregisterDnsHostRecords -@ stub DsEnumerateDomainTrusts +@ stdcall DsEnumerateDomainTrustsA(str long ptr ptr) +@ stdcall DsEnumerateDomainTrustsW(wstr long ptr ptr) @ stub DsGetDcClose @ stdcall DsGetDcNameA(str str ptr str long ptr) @ stdcall DsGetDcNameW(wstr wstr ptr wstr long ptr) diff --git a/include/dsgetdc.h b/include/dsgetdc.h index faae31a..c53fcc2 100644 --- a/include/dsgetdc.h +++ b/include/dsgetdc.h @@ -86,6 +86,28 @@ typedef struct _DOMAIN_CONTROLLER_INFOW { LPWSTR ClientSiteName; } DOMAIN_CONTROLLER_INFOW, *PDOMAIN_CONTROLLER_INFOW; +typedef struct _DS_DOMAIN_TRUSTSA { + LPSTR NetbiosDomainName; + LPSTR DnsDomainName; + ULONG Flags; + ULONG ParentIndex; + ULONG TrustType; + ULONG TrustAttributes; + PSID DomainSid; + GUID DomainGuid; +} DS_DOMAIN_TRUSTSA, *PDS_DOMAIN_TRUSTSA; + +typedef struct _DS_DOMAIN_TRUSTSW { + LPWSTR NetbiosDomainName; + LPWSTR DnsDomainName; + ULONG Flags; + ULONG ParentIndex; + ULONG TrustType; + ULONG TrustAttributes; + PSID DomainSid; + GUID DomainGuid; +} DS_DOMAIN_TRUSTSW, *PDS_DOMAIN_TRUSTSW; + DECL_WINELIB_TYPE_AW(DOMAIN_CONTROLLER_INFO) DWORD WINAPI DsGetDcNameA(LPCSTR,LPCSTR,GUID*,LPCSTR,ULONG,PDOMAIN_CONTROLLER_INFOA*); @@ -96,6 +118,10 @@ DWORD WINAPI DsGetSiteNameA(LPCSTR ComputerName, LPSTR *SiteName); DWORD WINAPI DsGetSiteNameW(LPCWSTR ComputerName, LPWSTR *SiteName); #define DsGetSiteName WINELIB_NAME_AW(DsGetSiteName) +DWORD WINAPI DsEnumerateDomainTrustsA(LPSTR, ULONG, PDS_DOMAIN_TRUSTSA*, PULONG); +DWORD WINAPI DsEnumerateDomainTrustsW(LPWSTR, ULONG, PDS_DOMAIN_TRUSTSW*, PULONG); +#define DsEnumerateDomainTrusts WINELIB_NAME_AW(DsEnumerateDomainTrusts) + #ifdef __cplusplus } #endif

1 0

Francois Gouget : user32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard April 30, 2018

April 30, 2018

Module: wine Branch: master Commit: a66af35ab995683d879cc59f6a1831c27b874090 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a66af35ab995683d879cc59f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 30 04:31:51 2018 +0200 user32/tests: Add a trailing '\n' to an ok() call. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6030121..ac706aa 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -10698,7 +10698,7 @@ static void test_destroy_quit(void) if (done) break; } - ok( WaitForSingleObject( thread1, 10000 ) != WAIT_TIMEOUT, "timeout" ); + ok( WaitForSingleObject( thread1, 10000 ) != WAIT_TIMEOUT, "timeout\n" ); ok( !IsWindow( destroy_data.thread1_wnd ), "window not destroyed\n" ); CloseHandle( thread1 ); }

1 0

Francois Gouget : secur32: Make alloc_lsa_connection() static.
by Alexandre Julliard April 30, 2018

April 30, 2018

Module: wine Branch: master Commit: ec55cd694a6169bfaf295ff50652658acd9b3af8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec55cd694a6169bfaf295ff5… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 30 04:31:35 2018 +0200 secur32: Make alloc_lsa_connection() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/lsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 5fe6f3a..694971d 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -88,7 +88,7 @@ NTSTATUS WINAPI LsaCallAuthenticationPackage(HANDLE lsa_handle, ULONG package_id return STATUS_INVALID_PARAMETER; } -struct lsa_connection *alloc_lsa_connection(void) +static struct lsa_connection *alloc_lsa_connection(void) { struct lsa_connection *ret; if (!(ret = heap_alloc(sizeof(*ret)))) return NULL;

1 0

Louis Lenders : shell32: Handle writing an iconresource entry in SHGetSetFolderCustomSettings.
by Alexandre Julliard April 30, 2018

April 30, 2018

Module: wine Branch: master Commit: 730264609f468d7aa0973edc9a435bd20373c1cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=730264609f468d7aa0973edc… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Apr 30 09:22:42 2018 +0200 shell32: Handle writing an iconresource entry in SHGetSetFolderCustomSettings. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlfolder.c | 38 ++++++++++++++++++++++++++++++++++---- dlls/shell32/tests/shlfolder.c | 4 ++-- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 9143f1e..a25ceae 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -605,14 +605,44 @@ HRESULT WINAPI SHOpenFolderAndSelectItems( PCIDLIST_ABSOLUTE pidlFolder, UINT ci } /*********************************************************************** - * SHGetSetFolderCustomSettings + * SHGetSetFolderCustomSettings (SHELL32.709) * - * Only Unicode above Server 2003 + * Only Unicode above Server 2003, writes/reads from a Desktop.ini */ HRESULT WINAPI SHGetSetFolderCustomSettings( LPSHFOLDERCUSTOMSETTINGS fcs, PCWSTR path, DWORD flag ) { - FIXME("%p %s 0x%x: stub\n", fcs, debugstr_w(path), flag); - return E_NOTIMPL; + static const WCHAR iconresourceW[] = {'I','c','o','n','R','e','s','o','u','r','c','e',0}; + static const WCHAR desktop_iniW[] = {'D','e','s','k','t','o','p','.','i','n','i',0}; + WCHAR bufferW[MAX_PATH]; + HRESULT hr; + + hr = E_FAIL; + bufferW[0] = 0; + + if (!fcs || !path) + return hr; + + if (flag & FCS_FORCEWRITE) + { + if (fcs->dwMask & FCSM_ICONFILE) + { + lstrcpyW(bufferW, path); + PathAddBackslashW(bufferW); + lstrcatW(bufferW, desktop_iniW); + + if (WritePrivateProfileStringW(wszDotShellClassInfo, iconresourceW, fcs->pszIconFile, bufferW)) + { + TRACE("Wrote an iconresource entry %s into %s\n", debugstr_w(fcs->pszIconFile), debugstr_w(bufferW)); + hr = S_OK; + } + else + ERR("Failed to write (to) Desktop.ini file\n"); + } + } + else + FIXME("%p %s 0x%x: stub\n", fcs, debugstr_w(path), flag); + + return hr; } /*********************************************************************** diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 89a01b7..4ce9a4e 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -5278,7 +5278,7 @@ static void test_SHGetSetFolderCustomSettings(void) fcs.pszIconFile = iconpathW; hr = pSHGetSetFolderCustomSettings(&fcs, pathW, FCS_FORCEWRITE); /*creates and writes to a Desktop.ini*/ - todo_wine ok(hr == S_OK, "Expected S_OK, got %#x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %#x\n", hr); memset(&fcs, 0, sizeof(fcs)); fcs.dwSize = sizeof(fcs); @@ -5292,7 +5292,7 @@ static void test_SHGetSetFolderCustomSettings(void) todo_wine ok(!lstrcmpiW(iconpathW, fcs.pszIconFile), "Expected %s, got %s\n", wine_dbgstr_w(iconpathW), wine_dbgstr_w(fcs.pszIconFile)); hr = pSHGetSetFolderCustomSettings(&fcs, NULL, FCS_READ); - todo_wine ok(hr == E_FAIL, "Expected E_FAIL, got %#x\n", hr); + ok(hr == E_FAIL, "Expected E_FAIL, got %#x\n", hr); lstrcpyW(bufferW, pathW); lstrcatW(bufferW, desktop_iniW);

1 0

Matteo Bruni : wined3d: Implement P8 blits in the GLSL blitter.
by Alexandre Julliard April 30, 2018

April 30, 2018

Module: wine Branch: master Commit: a46e47f8d0d023f21d9938901f78c295763341ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=a46e47f8d0d023f21d993890… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sat Apr 28 04:08:48 2018 +0430 wined3d: Implement P8 blits in the GLSL blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 148 +++++++++++++++++++++++++++++++++++---------- dlls/wined3d/utils.c | 2 +- 2 files changed, 118 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a46e47f8d0d023f21d99…

1 0

Alistair Leslie-Hughes : maintainers: Remove previous wine-staging maintainers.
by Alexandre Julliard April 30, 2018

April 30, 2018

Module: wine Branch: master Commit: a8d4b1097594b3d16d76550b5e8fe8ad37104da3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8d4b1097594b3d16d76550b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 30 01:13:28 2018 +0000 maintainers: Remove previous wine-staging maintainers. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 2 -- 1 file changed, 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 7d76e51..e72a9e8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -325,8 +325,6 @@ W: https://wiki.winehq.org/StableRules Staging Branch M: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -M: Sebastian Lackner <sebastian(a)fds-team.de> -M: Michael Müller <michael(a)fds-team.de> P: Zebediah Figura <z.figura12(a)gmail.com> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> W: https://wine-staging.com/

1 0