May 2017 - Wine-commits - list.winehq.org

Rosanne DiMesio : Fix database error page
by Jeremy Newman 31 May '17

31 May '17

Module: appdb Branch: master Commit: 55b9d8612f1260a1378525f61b07f9fe18614a32 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=55b9d8612f1260a1378525f6… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed May 31 08:54:21 2017 -0500 Fix database error page The page was showing a redeclare error for the sidebars instead of the database error that triggered it. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/appdb.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/appdb.php b/include/appdb.php index 4130bb0..72de1a9 100644 --- a/include/appdb.php +++ b/include/appdb.php @@ -179,7 +179,7 @@ function appdb_error_handler($errno, $errstr, $errfile, $errline, $errcontext = // display error page and exit appdb_clear_buffer(); header("HTTP/1.1 500 Internal Server Error"); - include(BASE."include/header.php"); + include_once(BASE."include/header.php"); echo "<h1>Ooops! Something has gone terribly wrong!</h1>\n"; echo "<p>Our monkey train has derailed! Worry not, a webmaster gopher help army has been dispatched and is on the way.</p>"; echo "<p>If this error continues to be a problem, please report it to us on our ";

1 0

Nikolay Sivov : mfplat: Return stub IMFSourceResolver from MFCreateSourceResolver().
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: a1d3a7f7bfddba0a1f3df240de5f87c4b054d30c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1d3a7f7bfddba0a1f3df240d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 28 14:42:48 2017 +0300 mfplat: Return stub IMFSourceResolver from MFCreateSourceResolver(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/mf.spec | 2 +- dlls/mfplat/main.c | 168 ++++++++++++++++++++++++++++++++++++++++++++- dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 39 +++++++++++ include/mfidl.idl | 2 + 5 files changed, 210 insertions(+), 3 deletions(-) diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index 10b682a..e04c471 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -57,7 +57,7 @@ @ stub MFCreateSequencerSource @ stub MFCreateSequencerSourceRemoteStream @ stub MFCreateSimpleTypeHandler -@ stub MFCreateSourceResolver +@ stdcall MFCreateSourceResolver(ptr) mfplat.MFCreateSourceResolver @ stub MFCreateStandardQualityManager @ stub MFCreateTopoLoader @ stub MFCreateTopology diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 56bc284..8fd5faf 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -29,6 +29,7 @@ #include "initguid.h" #include "mfapi.h" +#include "mfidl.h" #include "mferror.h" #include "wine/debug.h" @@ -869,7 +870,7 @@ static const IMFAttributesVtbl mfattributes_vtbl = }; /*********************************************************************** - * MFMFCreateAttributes (mfplat.@) + * MFCreateAttributes (mfplat.@) */ HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size) { @@ -887,3 +888,168 @@ HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size) *attributes = &object->IMFAttributes_iface; return S_OK; } + +typedef struct _mfsourceresolver +{ + IMFSourceResolver IMFSourceResolver_iface; + LONG ref; +} mfsourceresolver; + +static inline mfsourceresolver *impl_from_IMFSourceResolver(IMFSourceResolver *iface) +{ + return CONTAINING_RECORD(iface, mfsourceresolver, IMFSourceResolver_iface); +} + +static HRESULT WINAPI mfsourceresolver_QueryInterface(IMFSourceResolver *iface, REFIID riid, void **obj) +{ + mfsourceresolver *This = impl_from_IMFSourceResolver(iface); + + TRACE("(%p->(%s, %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFSourceResolver) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = &This->IMFSourceResolver_iface; + } + else + { + *obj = NULL; + FIXME("unsupported interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*obj); + return S_OK; +} + +static ULONG WINAPI mfsourceresolver_AddRef(IMFSourceResolver *iface) +{ + mfsourceresolver *This = impl_from_IMFSourceResolver(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(%u)\n", This, ref); + + return ref; +} + +static ULONG WINAPI mfsourceresolver_Release(IMFSourceResolver *iface) +{ + mfsourceresolver *This = impl_from_IMFSourceResolver(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%u)\n", This, ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI mfsourceresolver_CreateObjectFromURL(IMFSourceResolver *iface, const WCHAR *url, + DWORD flags, IPropertyStore *props, MF_OBJECT_TYPE *obj_type, IUnknown **object) +{ + mfsourceresolver *This = impl_from_IMFSourceResolver(iface); + + FIXME("(%p)->(%s, %#x, %p, %p, %p): stub\n", This, debugstr_w(url), flags, props, obj_type, object); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsourceresolver_CreateObjectFromByteStream(IMFSourceResolver *iface, IMFByteStream *stream, + const WCHAR *url, DWORD flags, IPropertyStore *props, MF_OBJECT_TYPE *obj_type, IUnknown **object) +{ + mfsourceresolver *This = impl_from_IMFSourceResolver(iface); + + FIXME("(%p)->(%p, %s, %#x, %p, %p, %p): stub\n", This, stream, debugstr_w(url), flags, props, obj_type, object); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsourceresolver_BeginCreateObjectFromURL(IMFSourceResolver *iface, const WCHAR *url, + DWORD flags, IPropertyStore *props, IUnknown **cancel_cookie, IMFAsyncCallback *callback, IUnknown *unk_state) +{ + mfsourceresolver *This = impl_from_IMFSourceResolver(iface); + + FIXME("(%p)->(%s, %#x, %p, %p, %p, %p): stub\n", This, debugstr_w(url), flags, props, cancel_cookie, + callback, unk_state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsourceresolver_EndCreateObjectFromURL(IMFSourceResolver *iface, IMFAsyncResult *result, + MF_OBJECT_TYPE *obj_type, IUnknown **object) +{ + mfsourceresolver *This = impl_from_IMFSourceResolver(iface); + + FIXME("(%p)->(%p, %p, %p): stub\n", This, result, obj_type, object); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsourceresolver_BeginCreateObjectFromByteStream(IMFSourceResolver *iface, IMFByteStream *stream, + const WCHAR *url, DWORD flags, IPropertyStore *props, IUnknown **cancel_cookie, IMFAsyncCallback *callback, + IUnknown *unk_state) +{ + mfsourceresolver *This = impl_from_IMFSourceResolver(iface); + + FIXME("(%p)->(%p, %s, %#x, %p, %p, %p, %p): stub\n", This, stream, debugstr_w(url), flags, props, cancel_cookie, + callback, unk_state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsourceresolver_EndCreateObjectFromByteStream(IMFSourceResolver *iface, IMFAsyncResult *result, + MF_OBJECT_TYPE *obj_type, IUnknown **object) +{ + mfsourceresolver *This = impl_from_IMFSourceResolver(iface); + + FIXME("(%p)->(%p, %p, %p): stub\n", This, result, obj_type, object); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsourceresolver_CancelObjectCreation(IMFSourceResolver *iface, IUnknown *cancel_cookie) +{ + mfsourceresolver *This = impl_from_IMFSourceResolver(iface); + + FIXME("(%p)->(%p): stub\n", This, cancel_cookie); + + return E_NOTIMPL; +} + +static const IMFSourceResolverVtbl mfsourceresolvervtbl = +{ + mfsourceresolver_QueryInterface, + mfsourceresolver_AddRef, + mfsourceresolver_Release, + mfsourceresolver_CreateObjectFromURL, + mfsourceresolver_CreateObjectFromByteStream, + mfsourceresolver_BeginCreateObjectFromURL, + mfsourceresolver_EndCreateObjectFromURL, + mfsourceresolver_BeginCreateObjectFromByteStream, + mfsourceresolver_EndCreateObjectFromByteStream, + mfsourceresolver_CancelObjectCreation, +}; + +/*********************************************************************** + * MFCreateSourceResolver (mfplat.@) + */ +HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver) +{ + mfsourceresolver *object; + + TRACE("%p\n", resolver); + + if (!resolver) + return E_POINTER; + + object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) ); + if (!object) + return E_OUTOFMEMORY; + + object->IMFSourceResolver_iface.lpVtbl = &mfsourceresolvervtbl; + object->ref = 1; + + *resolver = &object->IMFSourceResolver_iface; + return S_OK; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index d96eb51..2d737fb 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -58,7 +58,7 @@ @ stub MFCreateSample @ stub MFCreateSocket @ stub MFCreateSocketListener -@ stub MFCreateSourceResolver +@ stdcall MFCreateSourceResolver(ptr) @ stub MFCreateStreamDescriptor @ stub MFCreateSystemTimeSource @ stub MFCreateSystemUnderlyingClock diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 4a95137..83e1538 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -30,10 +30,13 @@ #include "initguid.h" #include "mfapi.h" +#include "mfidl.h" #include "mferror.h" #include "wine/test.h" +static HRESULT (WINAPI *pMFCreateSourceResolver)(IMFSourceResolver **resolver); + DEFINE_GUID(MFT_CATEGORY_OTHER, 0x90175d57,0xb7ea,0x4901,0xae,0xb3,0x93,0x3a,0x87,0x47,0x75,0x6f); DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19); @@ -154,12 +157,48 @@ if(0) ok(ret == S_OK || broken(ret == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)), "got %x\n", ret); } +static void test_source_resolver(void) +{ + IMFSourceResolver *resolver, *resolver2; + HRESULT hr; + + if (!pMFCreateSourceResolver) + { + win_skip("MFCreateSourceResolver() not found\n"); + return; + } + + hr = pMFCreateSourceResolver(NULL); + ok(hr == E_POINTER, "got %#x\n", hr); + + hr = pMFCreateSourceResolver(&resolver); + ok(hr == S_OK, "got %#x\n", hr); + + hr = pMFCreateSourceResolver(&resolver2); + ok(hr == S_OK, "got %#x\n", hr); + ok(resolver != resolver2, "Expected new instance\n"); + + IMFSourceResolver_Release(resolver); + IMFSourceResolver_Release(resolver2); +} + +static void init_functions(void) +{ + HMODULE mod = GetModuleHandleA("mfplat.dll"); + +#define X(f) if (!(p##f = (void*)GetProcAddress(mod, #f))) return; + X(MFCreateSourceResolver); +#undef X +} START_TEST(mfplat) { CoInitialize(NULL); + init_functions(); + test_register(); + test_source_resolver(); CoUninitialize(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index 2002ad3..925fbcc 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -162,3 +162,5 @@ interface IMFSourceResolver : IUnknown [out] MF_OBJECT_TYPE *obj_type, [out] IUnknown **object); [local] HRESULT CanceObjectCreation([in] IUnknown *cancel_cookie); } + +cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);")

1 0

Hugh McMaster : regedit: Move the listview' s NM_SETFOCUS handling to listview.c.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: fe38c9abad4783a13596e227a29e159ef11d995a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe38c9abad4783a13596e227a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 29 08:20:02 2017 +0000 regedit: Move the listview's NM_SETFOCUS handling to listview.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 12 ++++-------- programs/regedit/listview.c | 3 +++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 34c6a94..6538842 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -471,14 +471,10 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa default: return 0; /* goto def; */ } - } else - if (((int)wParam == LIST_WINDOW) && (g_pChildWnd != NULL)) { - if (((LPNMHDR)lParam)->code == NM_SETFOCUS) { - g_pChildWnd->nFocusPanel = 1; - } else if (!SendMessageW(g_pChildWnd->hListWnd, WM_NOTIFY_REFLECT, wParam, lParam)) { - goto def; - } - } + } else if ((int)wParam == LIST_WINDOW && g_pChildWnd != NULL) { + if (!SendMessageW(g_pChildWnd->hListWnd, WM_NOTIFY_REFLECT, wParam, lParam)) + goto def; + } break; case WM_SIZE: diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 3ebba33..b42af8e 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -420,6 +420,9 @@ static LRESULT CALLBACK ListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR SendMessageW(hFrameWnd, WM_COMMAND, ID_EDIT_MODIFY, 0); } break; + case NM_SETFOCUS: + g_pChildWnd->nFocusPanel = 1; + break; case NM_DBLCLK: { NMITEMACTIVATE* nmitem = (LPNMITEMACTIVATE)lParam; LVHITTESTINFO info;

1 0

Hugh McMaster : regedit: Allow handling of return values from listview notification messages.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: c04f66a59f02ac54cbc5e1f67407509293952012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c04f66a59f02ac54cbc5e1f67… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 29 08:20:13 2017 +0000 regedit: Allow handling of return values from listview notification messages. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 6538842..2f77f2f 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -472,8 +472,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa return 0; /* goto def; */ } } else if ((int)wParam == LIST_WINDOW && g_pChildWnd != NULL) { - if (!SendMessageW(g_pChildWnd->hListWnd, WM_NOTIFY_REFLECT, wParam, lParam)) - goto def; + return SendMessageW(g_pChildWnd->hListWnd, WM_NOTIFY_REFLECT, wParam, lParam); } break;

1 0

Hugh McMaster : regedit: Update a value name without refreshing the listview.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: ebfe566c16e39604eee0abcdd1ca706926e4d304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebfe566c16e39604eee0abcdd… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 29 08:20:23 2017 +0000 regedit: Update a value name without refreshing the listview. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index b42af8e..e485c77 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -400,16 +400,13 @@ static LRESULT CALLBACK ListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR LPNMLVDISPINFOW dispInfo = (LPNMLVDISPINFOW)lParam; LPWSTR oldName = GetItemText(hWnd, dispInfo->item.iItem); LONG ret; - LVITEMW item; if (!oldName) return -1; /* cannot rename a default value */ ret = RenameValue(hWnd, g_currentRootKey, g_currentPath, oldName, dispInfo->item.pszText); if (ret) { - RefreshListView(hWnd, g_currentRootKey, g_currentPath, dispInfo->item.pszText); - item.state = LVIS_FOCUSED | LVIS_SELECTED; - item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; - SendMessageW(hWnd, LVM_SETITEMSTATE, dispInfo->item.iItem, (LPARAM)&item); + dispInfo->item.iSubItem = 0; + SendMessageW(hWnd, LVM_SETITEMTEXTW, dispInfo->item.iItem, (LPARAM)&dispInfo->item); } HeapFree(GetProcessHeap(), 0, oldName); return 0;

1 0

Hugh McMaster : regedit: Add listview entries without refreshing the listview.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: f3c4cca7bf8ffa82c36d619e283fd13979ca68dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3c4cca7bf8ffa82c36d619e2… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 29 08:20:34 2017 +0000 regedit: Add listview entries without refreshing the listview. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 10 +++++++++- programs/regedit/framewnd.c | 4 +--- programs/regedit/listview.c | 3 ++- programs/regedit/main.h | 1 + 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 28ea474..97a283f 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -443,8 +443,9 @@ BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPW WCHAR newValue[256]; DWORD valueDword = 0; BOOL result = FALSE; - int valueNum; + int valueNum, index; HKEY hKey; + LVITEMW item; lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey); if (lRet != ERROR_SUCCESS) { @@ -470,6 +471,13 @@ BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPW error_code_messagebox(hwnd, IDS_CREATE_VALUE_FAILED); goto done; } + + /* Add the new item to the listview */ + index = AddEntryToList(g_pChildWnd->hListWnd, valueName, valueType, (BYTE *)&valueDword, sizeof(DWORD)); + item.state = LVIS_FOCUSED | LVIS_SELECTED; + item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; + SendMessageW(g_pChildWnd->hListWnd, LVM_SETITEMSTATE, index, (LPARAM)&item); + result = TRUE; done: diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index a81c174..93a5e4f 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -861,10 +861,8 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { WCHAR* keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); WCHAR newKey[MAX_NEW_KEY_LEN]; - if (CreateValue(hWnd, hKeyRoot, keyPath, valueType, newKey)) { - RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath, newKey); + if (CreateValue(hWnd, hKeyRoot, keyPath, valueType, newKey)) StartValueRename(g_pChildWnd->hListWnd); - } HeapFree(GetProcessHeap(), 0, keyPath); } break; diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index e485c77..123949f 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -109,7 +109,7 @@ static void MakeMULTISZDisplayable(LPWSTR multi) /******************************************************************************* * Local module support methods */ -static void AddEntryToList(HWND hwndLV, LPWSTR Name, DWORD dwValType, void *ValBuf, DWORD dwCount) +int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount) { LINE_INFO* linfo; LVITEMW item; @@ -202,6 +202,7 @@ static void AddEntryToList(HWND hwndLV, LPWSTR Name, DWORD dwValType, void *ValB } } } + return index; } static BOOL InitListViewImageList(HWND hWndListView) diff --git a/programs/regedit/main.h b/programs/regedit/main.h index a8e464e..b4b0307 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -117,6 +117,7 @@ extern void SetupStatusBar(HWND hWnd, BOOL bResize); extern void UpdateStatusBar(void); /* listview.c */ +extern int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount); extern HWND CreateListView(HWND hwndParent, UINT id); extern BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highlightValue); extern HWND StartValueRename(HWND hwndLV);

1 0

Hugh McMaster : regedit: Update the data in a listview subitem without refreshing the listview.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: 9cd1fc3fc4a38d8280bf81af220c75f811748502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cd1fc3fc4a38d8280bf81af2… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 29 08:20:44 2017 +0000 regedit: Update the data in a listview subitem without refreshing the listview. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 9 +++++ programs/regedit/framewnd.c | 3 +- programs/regedit/listview.c | 98 +++++++++++++++++++++++---------------------- programs/regedit/main.h | 1 + 4 files changed, 61 insertions(+), 50 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 97a283f..fcf2a60 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -373,6 +373,15 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) error_code_messagebox(hwnd, IDS_UNSUPPORTED_TYPE, type); } + /* Update the listview item with the new data string */ + if (result) + { + int index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, + MAKELPARAM(LVNI_FOCUSED | LVNI_SELECTED, 0)); + stringValueData = read_value(hwnd, hKey, valueName, &type, &len); + format_value_data(g_pChildWnd->hListWnd, index, type, stringValueData, len); + } + done: HeapFree(GetProcessHeap(), 0, stringValueData); stringValueData = NULL; diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 93a5e4f..0978cbc 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -778,8 +778,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { LPCWSTR valueName = GetValueName(g_pChildWnd->hListWnd); WCHAR* keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); - if (ModifyValue(hWnd, hKeyRoot, keyPath, valueName)) - RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath, valueName); + ModifyValue(hWnd, hKeyRoot, keyPath, valueName); HeapFree(GetProcessHeap(), 0, keyPath); break; } diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 123949f..caa9a23 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -109,6 +109,54 @@ static void MakeMULTISZDisplayable(LPWSTR multi) /******************************************************************************* * Local module support methods */ +void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD size) +{ + switch (type) + { + case REG_SZ: + case REG_EXPAND_SZ: + ListView_SetItemTextW(hwndLV, index, 2, data ? data : g_szValueNotSet); + break; + case REG_DWORD: + case REG_DWORD_BIG_ENDIAN: + { + DWORD value = *(DWORD *)data; + WCHAR buf[64]; + WCHAR format[] = {'0','x','%','0','8','x',' ','(','%','u',')',0}; + if (type == REG_DWORD_BIG_ENDIAN) + value = RtlUlongByteSwap(value); + wsprintfW(buf, format, value, value); + ListView_SetItemTextW(hwndLV, index, 2, buf); + break; + } + case REG_BINARY: + case REG_NONE: + { + unsigned int i; + BYTE *pData = data; + WCHAR *strBinary = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR) * 3 + sizeof(WCHAR)); + WCHAR format[] = {'%','0','2','X',' ',0}; + for (i = 0; i < size; i++) + wsprintfW( strBinary + i*3, format, pData[i] ); + strBinary[size * 3] = 0; + ListView_SetItemTextW(hwndLV, index, 2, strBinary); + HeapFree(GetProcessHeap(), 0, strBinary); + break; + } + case REG_MULTI_SZ: + MakeMULTISZDisplayable(data); + ListView_SetItemTextW(hwndLV, index, 2, data); + break; + default: + { + WCHAR szText[128]; + LoadStringW(hInst, IDS_REGISTRY_VALUE_CANT_DISPLAY, szText, COUNT_OF(szText)); + ListView_SetItemTextW(hwndLV, index, 2, szText); + break; + } + } +} + int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount) { LINE_INFO* linfo; @@ -154,54 +202,8 @@ int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWOR item.iIndent = 0; #endif - index = ListView_InsertItemW(hwndLV, &item); - if (index != -1) { - switch (dwValType) { - case REG_SZ: - case REG_EXPAND_SZ: - if (ValBuf) { - ListView_SetItemTextW(hwndLV, index, 2, ValBuf); - } else { - ListView_SetItemTextW(hwndLV, index, 2, g_szValueNotSet); - } - break; - case REG_DWORD: - case REG_DWORD_BIG_ENDIAN: { - DWORD value = *(DWORD*)ValBuf; - WCHAR buf[64]; - WCHAR format[] = {'0','x','%','0','8','x',' ','(','%','u',')',0}; - if (dwValType == REG_DWORD_BIG_ENDIAN) - value = RtlUlongByteSwap(value); - wsprintfW(buf, format, value, value); - ListView_SetItemTextW(hwndLV, index, 2, buf); - } - break; - case REG_BINARY: - case REG_NONE: { - unsigned int i; - LPBYTE pData = ValBuf; - LPWSTR strBinary = HeapAlloc(GetProcessHeap(), 0, dwCount * sizeof(WCHAR) * 3 + sizeof(WCHAR)); - WCHAR format[] = {'%','0','2','X',' ',0}; - for (i = 0; i < dwCount; i++) - wsprintfW( strBinary + i*3, format, pData[i] ); - strBinary[dwCount * 3] = 0; - ListView_SetItemTextW(hwndLV, index, 2, strBinary); - HeapFree(GetProcessHeap(), 0, strBinary); - } - break; - case REG_MULTI_SZ: - MakeMULTISZDisplayable(ValBuf); - ListView_SetItemTextW(hwndLV, index, 2, ValBuf); - break; - default: - { - WCHAR szText[128]; - LoadStringW(hInst, IDS_REGISTRY_VALUE_CANT_DISPLAY, szText, COUNT_OF(szText)); - ListView_SetItemTextW(hwndLV, index, 2, szText); - break; - } - } - } + if ((index = ListView_InsertItemW(hwndLV, &item)) != -1) + format_value_data(hwndLV, index, dwValType, ValBuf, dwCount); return index; } diff --git a/programs/regedit/main.h b/programs/regedit/main.h index b4b0307..f09de34 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -117,6 +117,7 @@ extern void SetupStatusBar(HWND hWnd, BOOL bResize); extern void UpdateStatusBar(void); /* listview.c */ +extern void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD size); extern int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount); extern HWND CreateListView(HWND hwndParent, UINT id); extern BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highlightValue);

1 0

Hugh McMaster : regedit: Delete a listview item without refreshing the listview.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: 06eceb3af2d56f158dab2db5a7bc768cc2b1c391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06eceb3af2d56f158dab2db5a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 29 08:20:55 2017 +0000 regedit: Delete a listview item without refreshing the listview. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 0978cbc..8e9f604 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -699,8 +699,6 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { HKEY hKeyRoot = 0; DWORD valueType; - int curIndex; - BOOL firstItem = TRUE; if (LOWORD(wParam) >= ID_FAVORITE_FIRST && LOWORD(wParam) <= ID_FAVORITE_LAST) { HKEY hKey; @@ -744,29 +742,35 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } HeapFree(GetProcessHeap(), 0, keyPath); } else if (hWndDelete == g_pChildWnd->hListWnd) { - WCHAR* keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); - curIndex = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_SELECTED, 0)); - while(curIndex != -1) { - WCHAR* valueName = GetItemText(g_pChildWnd->hListWnd, curIndex); - - curIndex = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, curIndex, MAKELPARAM(LVNI_SELECTED, 0)); - if(curIndex != -1 && firstItem) { - if (MessageBoxW(hWnd, MAKEINTRESOURCEW(IDS_DELETE_VALUE_TEXT_MULTIPLE), - MAKEINTRESOURCEW(IDS_DELETE_VALUE_TITLE), - MB_YESNO | MB_ICONEXCLAMATION) != IDYES) + unsigned int num_selected, index; + WCHAR *keyPath; + + if (!(num_selected = SendMessageW(g_pChildWnd->hListWnd, LVM_GETSELECTEDCOUNT, 0, 0L))) + break; + + if (num_selected > 1) + { + if (messagebox(hWnd, MB_YESNO | MB_ICONEXCLAMATION, IDS_DELETE_VALUE_TITLE, + IDS_DELETE_VALUE_TEXT_MULTIPLE) != IDYES) break; } - if (!DeleteValue(hWnd, hKeyRoot, keyPath, valueName, curIndex==-1 && firstItem)) + keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); + + index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_SELECTED, 0)); + while (index != -1) { + WCHAR *valueName = GetItemText(g_pChildWnd->hListWnd, index); + if (!DeleteValue(hWnd, hKeyRoot, keyPath, valueName, num_selected == 1)) + { + HeapFree(GetProcessHeap(), 0, valueName); + break; + } HeapFree(GetProcessHeap(), 0, valueName); - break; + SendMessageW(g_pChildWnd->hListWnd, LVM_DELETEITEM, index, 0L); + index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_SELECTED, 0)); } - firstItem = FALSE; - HeapFree(GetProcessHeap(), 0, valueName); - } - RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath, NULL); - HeapFree(GetProcessHeap(), 0, keyPath); + HeapFree(GetProcessHeap(), 0, keyPath); } else if (IsChild(g_pChildWnd->hTreeWnd, hWndDelete) || IsChild(g_pChildWnd->hListWnd, hWndDelete)) { SendMessageW(hWndDelete, WM_KEYDOWN, VK_DELETE, 0);

1 0

Sebastian Lackner : kernel32: Add missing WINAPI to SetThreadIdealProcessorEx implementation.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: dc43ed435f7f0dc9713f4c7e62f78832cc56bda4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc43ed435f7f0dc9713f4c7e6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon May 29 21:51:24 2017 +0200 kernel32: Add missing WINAPI to SetThreadIdealProcessorEx implementation. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index ac2c368..a30428f 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -474,7 +474,7 @@ DWORD WINAPI SetThreadIdealProcessor( /*********************************************************************** * SetThreadIdealProcessorEx (KERNEL32.@) */ -BOOL SetThreadIdealProcessorEx( HANDLE thread, PROCESSOR_NUMBER *ideal, PROCESSOR_NUMBER *previous ) +BOOL WINAPI SetThreadIdealProcessorEx( HANDLE thread, PROCESSOR_NUMBER *ideal, PROCESSOR_NUMBER *previous ) { FIXME("(%p %p %p): stub\n", thread, ideal, previous); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);

1 0

Nikolay Sivov : dwrite: Grab font data reference when adding replacement.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: 7524db8937ec6ae94e690dda41cd363d4c37925a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7524db8937ec6ae94e690dda4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 30 10:10:59 2017 +0300 dwrite: Grab font data reference when adding replacement. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index a877ad0..0332587 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -405,6 +405,11 @@ static inline void* get_fontface_colr(struct dwrite_fontface *fontface) return get_fontface_table(&fontface->IDWriteFontFace4_iface, MS_COLR_TAG, &fontface->colr); } +static void addref_font_data(struct dwrite_font_data *data) +{ + InterlockedIncrement(&data->ref); +} + static void release_font_data(struct dwrite_font_data *data) { int i; @@ -1762,7 +1767,7 @@ static HRESULT create_font(struct dwrite_fontfamily *family, UINT32 index, IDWri IDWriteFontFamily1_AddRef(&family->IDWriteFontFamily1_iface); This->data = family->data->fonts[index]; This->style = This->data->style; - InterlockedIncrement(&This->data->ref); + addref_font_data(This->data); *font = &This->IDWriteFont3_iface; @@ -2135,7 +2140,7 @@ static HRESULT WINAPI dwritefontfamily_GetMatchingFonts(IDWriteFontFamily1 *ifac for (i = 0; i < This->data->font_count; i++) { if (!func || func(This->data->fonts[i])) { fonts->fonts[fonts->font_count] = This->data->fonts[i]; - InterlockedIncrement(&This->data->fonts[i]->ref); + addref_font_data(This->data->fonts[i]); fonts->font_count++; } } @@ -3554,8 +3559,10 @@ static BOOL fontcollection_add_replacement(struct dwrite_fontcollection *collect struct dwrite_fontfamily_data *replacement = collection->family_data[i]; WCHAR nameW[255]; - for (i = 0; i < replacement->font_count; i++) + for (i = 0; i < replacement->font_count; i++) { fontfamily_add_font(target, replacement->fonts[i]); + addref_font_data(replacement->fonts[i]); + } fontcollection_add_family(collection, target); fontstrings_get_en_string(replacement->familyname, nameW, sizeof(nameW)/sizeof(WCHAR));

1 0