November 2020 - Wine-commits

Michael Stefaniuc : jscript: Use wide-char string literals in struct initialization.
by Alexandre Julliard 05 Nov '20

05 Nov '20

Module: wine Branch: master Commit: a8a03eb35fa3d9d4f7efc8c9f4abca91bf093c44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8a03eb35fa3d9d4f7efc8c9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 3 23:34:40 2020 +0100 jscript: Use wide-char string literals in struct initialization. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/bool.c | 7 +-- dlls/jscript/date.c | 146 +++++++++++++++------------------------------- dlls/jscript/enumerator.c | 13 ++--- dlls/jscript/error.c | 3 +- dlls/jscript/function.c | 20 +++---- dlls/jscript/global.c | 54 ++++++----------- dlls/jscript/json.c | 7 +-- dlls/jscript/jsregexp.c | 72 ++++++++--------------- dlls/jscript/math.c | 79 +++++++++---------------- dlls/jscript/number.c | 19 ++---- dlls/jscript/vbarray.c | 16 ++--- 11 files changed, 143 insertions(+), 293 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a8a03eb35fa3d9d4f7ef…

1 0

Nikolay Sivov : evr/presenter: Create dedicated thread to handle presentation time.
by Alexandre Julliard 05 Nov '20

05 Nov '20

Module: wine Branch: master Commit: bf8a9613c500689206448760bd3d20aa707225d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf8a9613c500689206448760… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 5 18:37:23 2020 +0300 evr/presenter: Create dedicated thread to handle presentation time. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 54ad9fee994..01623815dd3 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -40,6 +40,18 @@ enum presenter_state PRESENTER_STATE_PAUSED, }; +enum streaming_thread_message +{ + EVRM_STOP = WM_USER, +}; + +struct streaming_thread +{ + HANDLE hthread; + HANDLE ready_event; + DWORD tid; +}; + struct video_presenter { IMFVideoPresenter IMFVideoPresenter_iface; @@ -58,6 +70,7 @@ struct video_presenter IMediaEventSink *event_sink; IDirect3DDeviceManager9 *device_manager; + struct streaming_thread thread; UINT reset_token; HWND video_window; MFVideoNormalizedRect src_rect; @@ -184,6 +197,80 @@ static HRESULT video_presenter_invalidate_media_type(struct video_presenter *pre return hr; } +static DWORD CALLBACK video_presenter_streaming_thread(void *arg) +{ + struct video_presenter *presenter = arg; + BOOL stop_thread = FALSE; + MSG msg; + + PeekMessageW(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE); + + SetEvent(presenter->thread.ready_event); + + while (!stop_thread) + { + MsgWaitForMultipleObjects(0, NULL, FALSE, INFINITE, QS_POSTMESSAGE); + + while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) + { + switch (msg.message) + { + case EVRM_STOP: + stop_thread = TRUE; + break; + + default: + ; + } + } + } + + return 0; +} + +static HRESULT video_presenter_start_streaming(struct video_presenter *presenter) +{ + if (presenter->thread.hthread) + return S_OK; + + if (!(presenter->thread.ready_event = CreateEventW(NULL, FALSE, FALSE, NULL))) + return HRESULT_FROM_WIN32(GetLastError()); + + if (!(presenter->thread.hthread = CreateThread(NULL, 0, video_presenter_streaming_thread, + presenter, 0, &presenter->thread.tid))) + { + WARN("Failed to create streaming thread.\n"); + CloseHandle(presenter->thread.ready_event); + presenter->thread.ready_event = NULL; + return E_FAIL; + } + + WaitForSingleObject(presenter->thread.ready_event, INFINITE); + CloseHandle(presenter->thread.ready_event); + presenter->thread.ready_event = NULL; + + TRACE("Started streaming thread, tid %#x.\n", presenter->thread.tid); + + return S_OK; +} + +static HRESULT video_presenter_end_streaming(struct video_presenter *presenter) +{ + if (!presenter->thread.hthread) + return S_OK; + + PostThreadMessageW(presenter->thread.tid, EVRM_STOP, 0, 0); + + WaitForSingleObject(presenter->thread.hthread, INFINITE); + CloseHandle(presenter->thread.hthread); + + TRACE("Terminated streaming thread tid %#x.\n", presenter->thread.tid); + + memset(&presenter->thread, 0, sizeof(presenter->thread)); + + return S_OK; +} + static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { struct video_presenter *presenter = impl_from_IUnknown(iface); @@ -266,6 +353,7 @@ static ULONG WINAPI video_presenter_inner_Release(IUnknown *iface) if (!refcount) { + video_presenter_end_streaming(presenter); video_presenter_clear_container(presenter); DeleteCriticalSection(&presenter->cs); if (presenter->device_manager) @@ -374,6 +462,12 @@ static HRESULT WINAPI video_presenter_ProcessMessage(IMFVideoPresenter *iface, M case MFVP_MESSAGE_INVALIDATEMEDIATYPE: hr = video_presenter_invalidate_media_type(presenter); break; + case MFVP_MESSAGE_BEGINSTREAMING: + hr = video_presenter_start_streaming(presenter); + break; + case MFVP_MESSAGE_ENDSTREAMING: + hr = video_presenter_end_streaming(presenter); + break; default: FIXME("Unsupported message %u.\n", message); hr = E_NOTIMPL;

1 0

Nikolay Sivov : evr/presenter: Implement GetCurrentMediaType().
by Alexandre Julliard 05 Nov '20

05 Nov '20

Module: wine Branch: master Commit: 813596f64c688ea2b0084ee7727e8c8bbc59a930 URL: https://source.winehq.org/git/wine.git/?a=commit;h=813596f64c688ea2b0084ee7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 5 18:37:24 2020 +0300 evr/presenter: Implement GetCurrentMediaType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 71 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 61 insertions(+), 10 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 01623815dd3..1b98e63a49a 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -71,6 +71,7 @@ struct video_presenter IDirect3DDeviceManager9 *device_manager; struct streaming_thread thread; + IMFMediaType *media_type; UINT reset_token; HWND video_window; MFVideoNormalizedRect src_rect; @@ -168,6 +169,38 @@ static void video_presenter_get_native_video_size(struct video_presenter *presen IMFMediaType_Release(media_type); } +static void video_presenter_reset_media_type(struct video_presenter *presenter) +{ + if (presenter->media_type) + IMFMediaType_Release(presenter->media_type); + presenter->media_type = NULL; + + /* FIXME: release samples pool */ +} + +static HRESULT video_presenter_set_media_type(struct video_presenter *presenter, IMFMediaType *media_type) +{ + unsigned int flags; + + if (!media_type) + { + video_presenter_reset_media_type(presenter); + return S_OK; + } + + if (presenter->media_type && IMFMediaType_IsEqual(presenter->media_type, media_type, &flags) == S_OK) + return S_OK; + + video_presenter_reset_media_type(presenter); + + /* FIXME: allocate samples pool */ + + presenter->media_type = media_type; + IMFMediaType_AddRef(presenter->media_type); + + return S_OK; +} + static HRESULT video_presenter_invalidate_media_type(struct video_presenter *presenter) { IMFMediaType *media_type; @@ -182,16 +215,16 @@ static HRESULT video_presenter_invalidate_media_type(struct video_presenter *pre /* FIXME: potentially adjust frame size */ - if (SUCCEEDED(IMFTransform_SetOutputType(presenter->mixer, 0, media_type, MFT_SET_TYPE_TEST_ONLY))) - { - /* FIXME: should keep a copy internally too */ + hr = IMFTransform_SetOutputType(presenter->mixer, 0, media_type, MFT_SET_TYPE_TEST_ONLY); - hr = IMFTransform_SetOutputType(presenter->mixer, 0, media_type, 0); - IMFMediaType_Release(media_type); - break; - } + if (SUCCEEDED(hr)) + hr = video_presenter_set_media_type(presenter, media_type); + hr = IMFTransform_SetOutputType(presenter->mixer, 0, media_type, 0); IMFMediaType_Release(media_type); + + if (SUCCEEDED(hr)) + break; } return hr; @@ -478,11 +511,29 @@ static HRESULT WINAPI video_presenter_ProcessMessage(IMFVideoPresenter *iface, M return hr; } -static HRESULT WINAPI video_presenter_GetCurrentMediaType(IMFVideoPresenter *iface, IMFVideoMediaType **media_type) +static HRESULT WINAPI video_presenter_GetCurrentMediaType(IMFVideoPresenter *iface, + IMFVideoMediaType **media_type) { - FIXME("%p, %p.\n", iface, media_type); + struct video_presenter *presenter = impl_from_IMFVideoPresenter(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, media_type); + + EnterCriticalSection(&presenter->cs); + + if (presenter->state == PRESENTER_STATE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (!presenter->media_type) + hr = MF_E_NOT_INITIALIZED; + else + { + hr = IMFMediaType_QueryInterface(presenter->media_type, &IID_IMFVideoMediaType, + (void **)media_type); + } + + LeaveCriticalSection(&presenter->cs); + + return hr; } static const IMFVideoPresenterVtbl video_presenter_vtbl =

1 0

Nikolay Sivov : mfmediaengine: Implement GetVideoAspectRatio().
by Alexandre Julliard 05 Nov '20

05 Nov '20

Module: wine Branch: master Commit: ef8bf642c716983317badb799e20eb6419be374c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef8bf642c716983317badb79… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 5 19:04:55 2020 +0300 mfmediaengine: Implement GetVideoAspectRatio(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 69 +++++++++++++++++++++++++++----- dlls/mfmediaengine/tests/mfmediaengine.c | 1 - 2 files changed, 59 insertions(+), 11 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index cbea4263702..27f6a26d6b7 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -74,7 +74,8 @@ enum media_engine_flags struct video_frame { LONGLONG pts; - UINT64 size; + SIZE size; + SIZE ratio; TOPOID node_id; }; @@ -252,15 +253,34 @@ static struct media_engine *impl_from_IMFSampleGrabberSinkCallback(IMFSampleGrab return CONTAINING_RECORD(iface, struct media_engine, grabber_callback); } +static unsigned int get_gcd(unsigned int a, unsigned int b) +{ + unsigned int m; + + while (b) + { + m = a % b; + a = b; + b = m; + } + + return a; +} + static void media_engine_get_frame_size(struct media_engine *engine, IMFTopology *topology) { IMFMediaTypeHandler *handler; IMFMediaType *media_type; IMFStreamDescriptor *sd; IMFTopologyNode *node; + unsigned int gcd; + UINT64 size; HRESULT hr; - engine->video_frame.size = 0; + engine->video_frame.size.cx = 0; + engine->video_frame.size.cy = 0; + engine->video_frame.ratio.cx = 1; + engine->video_frame.ratio.cy = 1; if (FAILED(IMFTopology_GetNodeByID(topology, engine->video_frame.node_id, &node))) return; @@ -284,7 +304,17 @@ static void media_engine_get_frame_size(struct media_engine *engine, IMFTopology return; } - IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &engine->video_frame.size); + IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &size); + + engine->video_frame.size.cx = size >> 32; + engine->video_frame.size.cy = size; + + if ((gcd = get_gcd(engine->video_frame.size.cx, engine->video_frame.size.cy))) + { + engine->video_frame.ratio.cx = engine->video_frame.size.cx / gcd; + engine->video_frame.ratio.cy = engine->video_frame.size.cy / gcd; + } + IMFMediaType_Release(media_type); } @@ -533,8 +563,7 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi UINT64 duration; HRESULT hr; - engine->video_frame.node_id = 0; - engine->video_frame.size = 0; + memset(&engine->video_frame, 0, sizeof(engine->video_frame)); if (FAILED(hr = IMFMediaSource_CreatePresentationDescriptor(source, &pd))) return hr; @@ -1309,12 +1338,12 @@ static HRESULT WINAPI media_engine_GetNativeVideoSize(IMFMediaEngine *iface, DWO EnterCriticalSection(&engine->cs); - if (!engine->video_frame.size) + if (!engine->video_frame.size.cx && !engine->video_frame.size.cy) hr = E_FAIL; else { - if (cx) *cx = engine->video_frame.size >> 32; - if (cy) *cy = engine->video_frame.size; + if (cx) *cx = engine->video_frame.size.cx; + if (cy) *cy = engine->video_frame.size.cy; } LeaveCriticalSection(&engine->cs); @@ -1324,9 +1353,29 @@ static HRESULT WINAPI media_engine_GetNativeVideoSize(IMFMediaEngine *iface, DWO static HRESULT WINAPI media_engine_GetVideoAspectRatio(IMFMediaEngine *iface, DWORD *cx, DWORD *cy) { - FIXME("(%p, %p, %p): stub.\n", iface, cx, cy); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, cx, cy); + + if (!cx && !cy) + return E_INVALIDARG; + + EnterCriticalSection(&engine->cs); + + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (!engine->video_frame.size.cx && !engine->video_frame.size.cy) + hr = E_FAIL; + else + { + if (cx) *cx = engine->video_frame.ratio.cx; + if (cy) *cy = engine->video_frame.ratio.cy; + } + + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_Shutdown(IMFMediaEngine *iface) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 21ead1b0afa..2f062741f60 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -383,7 +383,6 @@ todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFMediaEngine_GetVideoAspectRatio(media_engine, &cx, &cy); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); IMFMediaEngine_Release(media_engine);

1 0

Nikolay Sivov : mfmediaengine: Handle shutdown state in GetNativeVideoSize().
by Alexandre Julliard 05 Nov '20

05 Nov '20

Module: wine Branch: master Commit: 86a72e055e6ca9a35ebb21de7d3325b219cfe215 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86a72e055e6ca9a35ebb21de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 5 19:04:56 2020 +0300 mfmediaengine: Handle shutdown state in GetNativeVideoSize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 4 +++- dlls/mfmediaengine/tests/mfmediaengine.c | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 27f6a26d6b7..55585b8b826 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1338,7 +1338,9 @@ static HRESULT WINAPI media_engine_GetNativeVideoSize(IMFMediaEngine *iface, DWO EnterCriticalSection(&engine->cs); - if (!engine->video_frame.size.cx && !engine->video_frame.size.cy) + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (!engine->video_frame.size.cx && !engine->video_frame.size.cy) hr = E_FAIL; else { diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 2f062741f60..f9f8fed4a74 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -379,7 +379,6 @@ todo_wine ok(!state, "Unexpected state.\n"); hr = IMFMediaEngine_GetNativeVideoSize(media_engine, &cx, &cy); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFMediaEngine_GetVideoAspectRatio(media_engine, &cx, &cy);

1 0

Jacek Caban : mshtml: Ignore attempts to set read only builtin properties in IE9+ mode.
by Alexandre Julliard 05 Nov '20

05 Nov '20

Module: wine Branch: master Commit: a1d04f704d44229726bd72904ce765b08c4837b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1d04f704d44229726bd7290… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 5 17:50:32 2020 +0100 mshtml: Ignore attempts to set read only builtin properties in IE9+ mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 4 ++++ dlls/mshtml/tests/es5.js | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index dab44991bf5..f4cc2b76f2a 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1101,6 +1101,10 @@ static HRESULT builtin_propput(DispatchEx *This, func_info_t *func, DISPPARAMS * } if(!func->put_vtbl_off) { + if(dispex_compat_mode(This) >= COMPAT_MODE_IE9) { + WARN("No setter\n"); + return S_OK; + } FIXME("No setter\n"); return E_FAIL; } diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index ded25df5128..09ea9e0d657 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -949,3 +949,8 @@ sync_test("preventExtensions", function() { ok(Object.preventExtensions.length === 1, "Object.preventExtensions.length = " + Object.preventExtensions.length); }); + +sync_test("head_setter", function() { + document.head = ""; + ok(typeof(document.head) === "object", "typeof(document.head) = " + typeof(document.head)); +});

1 0

Francois Gouget : oleacc/tests: Fix the window name and keyboard shortcut tests.
by Alexandre Julliard 05 Nov '20

05 Nov '20

Module: wine Branch: master Commit: 0c3bb475899ad392eb426e6c28d802ca7ef64b56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c3bb475899ad392eb426e6c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 5 16:03:06 2020 +0100 oleacc/tests: Fix the window name and keyboard shortcut tests. Unlike button names and static messages, window titles don't contain keyboard shortcuts so they should be returned as is. Windows did not make any distinction between these cases before Windows 10 1607. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 75 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 63 insertions(+), 12 deletions(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index e4ef0e78bf2..ce44e06abe4 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -715,12 +715,17 @@ static void test_AccessibleChildren(IAccessible *acc) ok(V_VT(children) == VT_I4, "V_VT(children) = %d\n", V_VT(children)); ok(V_I4(children) == 1, "V_I4(children) = %d\n", V_I4(children)); + + ok(count == 1, "count = %d\n", count); + ok(V_VT(children+1) == VT_EMPTY, "V_VT(children+1) = %d\n", V_VT(children+1)); }else { ok(V_VT(children) == VT_DISPATCH, "V_VT(children) = %d\n", V_VT(children)); IDispatch_Release(V_DISPATCH(children)); + + ok(count == 2, "count = %d\n", count); + ok(V_VT(children+1) == VT_DISPATCH, "V_VT(children+1) = %d\n", V_VT(children+1)); + IDispatch_Release(V_DISPATCH(children+1)); } - ok(count == 1, "count = %d\n", count); - ok(V_VT(children+1) == VT_EMPTY, "V_VT(children+1) = %d\n", V_VT(children+1)); ok(V_VT(children+2) == VT_EMPTY, "V_VT(children+2) = %d\n", V_VT(children+2)); } @@ -730,7 +735,7 @@ static void test_default_client_accessible_object(void) IDispatch *disp; IOleWindow *ow; IEnumVARIANT *ev; - HWND chld, hwnd, hwnd2; + HWND chld, btn, hwnd, hwnd2; HRESULT hr; VARIANT vid, v; BSTR str; @@ -739,16 +744,59 @@ static void test_default_client_accessible_object(void) LONG l, left, top, width, height; ULONG fetched; - hwnd = CreateWindowA("oleacc_test", "test &t &junk", WS_OVERLAPPEDWINDOW, + hwnd = CreateWindowA("oleacc_test", "wnd &t &junk", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "CreateWindow failed\n"); - chld = CreateWindowA("static", "message", WS_CHILD | WS_VISIBLE, + chld = CreateWindowA("static", "static &t &junk", WS_CHILD | WS_VISIBLE, 0, 0, 50, 50, hwnd, NULL, NULL, NULL); ok(chld != NULL, "CreateWindow failed\n"); + btn = CreateWindowA("BUTTON", "btn &t &junk", WS_TABSTOP | WS_VISIBLE | WS_CHILD | BS_DEFPUSHBUTTON, + 50, 0, 50, 50, hwnd, NULL, NULL, NULL); + ok(btn != NULL, "CreateWindow failed\n"); hr = CreateStdAccessibleObject(NULL, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); ok(hr == E_FAIL, "got %x\n", hr); + + /* Test the static message */ + hr = CreateStdAccessibleObject(chld, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); + ok(hr == S_OK, "got %x\n", hr); + + V_VT(&vid) = VT_I4; + V_I4(&vid) = CHILDID_SELF; + hr = IAccessible_get_accName(acc, vid, &str); + ok(hr == S_OK, "got %x\n", hr); + ok(!lstrcmpW(str, L"static t &junk"), "name = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = IAccessible_get_accKeyboardShortcut(acc, vid, &str); + ok(hr == S_OK, "got %x\n", hr); + ok(!lstrcmpW(str, L"Alt+t"), "str = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IAccessible_Release(acc); + + + /* Test the button */ + hr = CreateStdAccessibleObject(btn, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); + ok(hr == S_OK, "got %x\n", hr); + + V_VT(&vid) = VT_I4; + V_I4(&vid) = CHILDID_SELF; + hr = IAccessible_get_accName(acc, vid, &str); + ok(hr == S_OK, "got %x\n", hr); + ok(!lstrcmpW(str, L"btn t &junk"), "name = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = IAccessible_get_accKeyboardShortcut(acc, vid, &str); + ok(hr == S_OK, "got %x\n", hr); + ok(!lstrcmpW(str, L"Alt+t"), "str = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IAccessible_Release(acc); + + + /* Now we can test and destroy the top-level window */ hr = CreateStdAccessibleObject(hwnd, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); ok(hr == S_OK, "got %x\n", hr); @@ -764,7 +812,7 @@ static void test_default_client_accessible_object(void) hr = IAccessible_get_accChildCount(acc, &l); ok(hr == S_OK, "got %x\n", hr); - ok(l == 1, "l = %d\n", l); + ok(l == 2, "l = %d\n", l); V_VT(&vid) = VT_I4; V_I4(&vid) = CHILDID_SELF; @@ -810,7 +858,15 @@ static void test_default_client_accessible_object(void) V_I4(&vid) = CHILDID_SELF; hr = IAccessible_get_accName(acc, vid, &str); ok(hr == S_OK, "got %x\n", hr); - ok(!lstrcmpW(str, L"test t &junk"), "name = %s\n", wine_dbgstr_w(str)); + /* Window names don't have keyboard shortcuts */ + todo_wine ok(!lstrcmpW(str, L"wnd &t &junk") || + broken(!lstrcmpW(str, L"wnd t &junk")), /* Windows < 10 1607 */ + "name = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = IAccessible_get_accKeyboardShortcut(acc, vid, &str); + todo_wine ok(hr == S_FALSE || broken(hr == S_OK), "got %x\n", hr); + todo_wine ok(str == NULL || broken(!lstrcmpW(str, L"Alt+t")), "str = %s\n", wine_dbgstr_w(str)); SysFreeString(str); V_I4(&vid) = 1; @@ -850,11 +906,6 @@ static void test_default_client_accessible_object(void) ok(hr == S_FALSE, "got %x\n", hr); ok(!str, "str != NULL\n"); - hr = IAccessible_get_accKeyboardShortcut(acc, vid, &str); - ok(hr == S_OK, "got %x\n", hr); - ok(!lstrcmpW(str, L"Alt+t"), "str = %s\n", wine_dbgstr_w(str)); - SysFreeString(str); - str = (void*)0xdeadbeef; hr = IAccessible_get_accDefaultAction(acc, vid, &str); ok(hr == S_FALSE, "got %x\n", hr);

1 0

Anton Baskanov : amstream: Implement MediaStreamFilter::Flush.
by Alexandre Julliard 05 Nov '20

05 Nov '20

Module: wine Branch: master Commit: 4919b9b99fe20cfb8599b7b827811fdd7937ea9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4919b9b99fe20cfb8599b7b8… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Oct 29 11:41:01 2020 +0700 amstream: Implement MediaStreamFilter::Flush. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/filter.c | 23 ++++++++++++++++++++--- dlls/amstream/tests/amstream.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 7531265cb8e..5fd5b2afdbc 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -750,11 +750,28 @@ static HRESULT WINAPI filter_WaitUntil(IMediaStreamFilter *iface, REFERENCE_TIME return hr; } -static HRESULT WINAPI filter_Flush(IMediaStreamFilter *iface, BOOL bCancelEOS) +static HRESULT WINAPI filter_Flush(IMediaStreamFilter *iface, BOOL cancel_eos) { - FIXME("(%p)->(%d): Stub!\n", iface, bCancelEOS); + struct filter *filter = impl_from_IMediaStreamFilter(iface); + struct event *event; - return E_NOTIMPL; + TRACE("filter %p, cancel_eos %d.\n", iface, cancel_eos); + + EnterCriticalSection(&filter->cs); + + LIST_FOR_EACH_ENTRY(event, &filter->used_events, struct event, entry) + { + if (!event->interrupted) + { + event->interrupted = TRUE; + IReferenceClock_Unadvise(filter->clock, event->cookie); + SetEvent(event->event); + } + } + + LeaveCriticalSection(&filter->cs); + + return S_OK; } static HRESULT WINAPI filter_EndOfStream(IMediaStreamFilter *iface) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 2f156538e4c..da5ef8f56a1 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -6839,6 +6839,35 @@ static void test_mediastreamfilter_wait_until(void) ok(!WaitForSingleObject(cookie2.advise_time_called_event, 2000), "Expected AdviseTime to be called.\n"); ok(WaitForSingleObject(thread2, 100) == WAIT_TIMEOUT, "WaitUntil returned prematurely.\n"); + hr = IMediaStreamFilter_Flush(filter, FALSE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(cookie1.unadvise_called, "Expected Unadvise to be called.\n"); + ok(cookie2.unadvise_called, "Expected Unadvise to be called.\n"); + + ok(!WaitForSingleObject(thread1, 2000), "Wait timed out.\n"); + CloseHandle(thread1); + ok(!WaitForSingleObject(thread2, 2000), "Wait timed out.\n"); + CloseHandle(thread2); + + clock.advise_time_cookie = &cookie1; + + params1.filter = filter; + params1.time = 23456789; + params1.expected_hr = S_FALSE; + thread1 = CreateThread(NULL, 0, mediastreamfilter_wait_until, &params1, 0, NULL); + ok(!WaitForSingleObject(cookie1.advise_time_called_event, 2000), "Expected AdviseTime to be called.\n"); + ok(WaitForSingleObject(thread1, 100) == WAIT_TIMEOUT, "WaitUntil returned prematurely.\n"); + + clock.advise_time_cookie = &cookie2; + + params2.filter = filter; + params2.time = 23456789; + params2.expected_hr = S_FALSE; + thread2 = CreateThread(NULL, 0, mediastreamfilter_wait_until, &params2, 0, NULL); + ok(!WaitForSingleObject(cookie2.advise_time_called_event, 2000), "Expected AdviseTime to be called.\n"); + ok(WaitForSingleObject(thread2, 100) == WAIT_TIMEOUT, "WaitUntil returned prematurely.\n"); + hr = IMediaStreamFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Michael Stefaniuc : pdh: Use wide-char string literals.
by Alexandre Julliard 05 Nov '20

05 Nov '20

Module: wine Branch: master Commit: 7fb6c7a034a2cf740fa7bda6c2320da704444ed4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fb6c7a034a2cf740fa7bda6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 5 02:07:33 2020 +0100 pdh: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pdh/pdh_main.c | 31 +++++++++---------------------- dlls/pdh/tests/pdh.c | 36 +++++++++++------------------------- 2 files changed, 20 insertions(+), 47 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index daa0e2d3395..d3bf6ab8706 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -174,12 +174,6 @@ struct source LONGLONG base; /* samples per second */ }; -static const WCHAR path_processor_time[] = - {'\\','P','r','o','c','e','s','s','o','r','(','_','T','o','t','a','l',')', - '\\','%',' ','P','r','o','c','e','s','s','o','r',' ','T','i','m','e',0}; -static const WCHAR path_uptime[] = - {'\\','S','y','s','t','e','m', '\\', 'S','y','s','t','e','m',' ','U','p',' ','T','i','m','e',0}; - static void CALLBACK collect_processor_time( struct counter *counter ) { counter->two.largevalue = 500000; /* FIXME */ @@ -202,8 +196,8 @@ static void CALLBACK collect_uptime( struct counter *counter ) /* counter source registry */ static const struct source counter_sources[] = { - { 6, path_processor_time, collect_processor_time, TYPE_PROCESSOR_TIME, -5, 10000000 }, - { 674, path_uptime, collect_uptime, TYPE_UPTIME, -3, 1000 } + { 6, L"\\Processor(_Total)\\% Processor Time", collect_processor_time, TYPE_PROCESSOR_TIME, -5, 10000000 }, + { 674, L"\\System\\System Up Time", collect_uptime, TYPE_UPTIME, -3, 1000 } }; static BOOL is_local_machine( const WCHAR *name, DWORD len ) @@ -1181,12 +1175,6 @@ done: PDH_STATUS WINAPI PdhMakeCounterPathW( PDH_COUNTER_PATH_ELEMENTS_W *e, LPWSTR buffer, LPDWORD buflen, DWORD flags ) { - static const WCHAR bslash[] = {'\\',0}; - static const WCHAR fslash[] = {'/',0}; - static const WCHAR lparen[] = {'(',0}; - static const WCHAR rparen[] = {')',0}; - static const WCHAR fmt[] = {'#','%','u',0}; - WCHAR path[PDH_MAX_COUNTER_NAME], instance[12]; PDH_STATUS ret = ERROR_SUCCESS; DWORD len; @@ -1201,26 +1189,25 @@ PDH_STATUS WINAPI PdhMakeCounterPathW( PDH_COUNTER_PATH_ELEMENTS_W *e, LPWSTR bu path[0] = 0; if (e->szMachineName) { - lstrcatW(path, bslash); - lstrcatW(path, bslash); + lstrcatW(path, L"\\\\"); lstrcatW(path, e->szMachineName); } - lstrcatW(path, bslash); + lstrcatW(path, L"\\"); lstrcatW(path, e->szObjectName); if (e->szInstanceName) { - lstrcatW(path, lparen); + lstrcatW(path, L"("); if (e->szParentInstance) { lstrcatW(path, e->szParentInstance); - lstrcatW(path, fslash); + lstrcatW(path, L"/"); } lstrcatW(path, e->szInstanceName); - swprintf(instance, ARRAY_SIZE(instance), fmt, e->dwInstanceIndex); + swprintf(instance, ARRAY_SIZE(instance), L"#%u", e->dwInstanceIndex); lstrcatW(path, instance); - lstrcatW(path, rparen); + lstrcatW(path, L")"); } - lstrcatW(path, bslash); + lstrcatW(path, L"\\"); lstrcatW(path, e->szCounterName); len = lstrlenW(path) + 1; diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 0a17906afbd..71603f8c6ba 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -71,18 +71,12 @@ static void init_function_ptrs( void ) GETFUNCPTR( PdhValidatePathExW ) } -static const WCHAR processor_time[] = - {'%',' ','P','r','o','c','e','s','s','o','r',' ','T','i','m','e',0}; -static const WCHAR uptime[] = - {'S','y','s','t','e','m',' ','U','p',' ','T','i','m','e',0}; - -static const WCHAR system_uptime[] = - {'\\','S','y','s','t','e','m','\\','S','y','s','t','e','m',' ','U','p',' ','T','i','m','e',0}; -static const WCHAR nonexistent_counter[] = - {'\\','S','y','s','t','e','m','\\','S','y','s','t','e','m',' ','D','o','w','n',' ','T','i','m','e',0}; -static const WCHAR percentage_processor_time[] = - {'\\','P','r','o','c','e','s','s','o','r','(','_','T','o','t','a','l',')', - '\\','%',' ','P','r','o','c','e','s','s','o','r',' ','T','i','m','e',0}; +static const WCHAR processor_time[] = L"% Processor Time"; +static const WCHAR uptime[] = L"System Up Time"; + +static const WCHAR system_uptime[] = L"\\System\\System Up Time"; +static const WCHAR nonexistent_counter[] = L"\\System\\System Down Time"; +static const WCHAR percentage_processor_time[] = L"\\Processor(_Total)\\% Processor Time"; static void test_PdhOpenQueryA( void ) { @@ -630,15 +624,13 @@ static void test_PdhLookupPerfIndexByNameW( void ) PDH_STATUS ret; DWORD index; - static const WCHAR no_counter[] = {'N','o',' ','C','o','u','n','t','e','r',0}; - ret = PdhLookupPerfIndexByNameW( NULL, NULL, NULL ); ok(ret == PDH_INVALID_ARGUMENT, "PdhLookupPerfIndexByNameW failed 0x%08x\n", ret); ret = PdhLookupPerfIndexByNameW( NULL, NULL, &index ); ok(ret == PDH_INVALID_ARGUMENT, "PdhLookupPerfIndexByNameW failed 0x%08x\n", ret); - ret = PdhLookupPerfIndexByNameW( NULL, no_counter, &index ); + ret = PdhLookupPerfIndexByNameW( NULL, L"No Counter", &index ); ok(ret == PDH_STRING_NOT_FOUND, "PdhLookupPerfIndexByNameW failed 0x%08x\n", ret); ret = PdhLookupPerfIndexByNameW( NULL, processor_time, NULL ); @@ -744,16 +736,13 @@ static void test_PdhValidatePathW( void ) { PDH_STATUS ret; - static const WCHAR empty[] = {0}; - static const WCHAR system[] = {'\\','S','y','s','t','e','m',0}; - ret = PdhValidatePathW( NULL ); ok(ret == PDH_INVALID_ARGUMENT, "PdhValidatePathW failed 0x%08x\n", ret); - ret = PdhValidatePathW( empty ); + ret = PdhValidatePathW( L"" ); ok(ret == PDH_INVALID_ARGUMENT, "PdhValidatePathW failed 0x%08x\n", ret); - ret = PdhValidatePathW( system ); + ret = PdhValidatePathW( L"\\System" ); ok(ret == PDH_CSTATUS_BAD_COUNTERNAME, "PdhValidatePathW failed 0x%08x\n", ret); ret = PdhValidatePathW( uptime ); @@ -793,16 +782,13 @@ static void test_PdhValidatePathExW( void ) { PDH_STATUS ret; - static const WCHAR empty[] = {0}; - static const WCHAR system[] = {'\\','S','y','s','t','e','m',0}; - ret = pPdhValidatePathExW( NULL, NULL ); ok(ret == PDH_INVALID_ARGUMENT, "PdhValidatePathExW failed 0x%08x\n", ret); - ret = pPdhValidatePathExW( NULL, empty ); + ret = pPdhValidatePathExW( NULL, L"" ); ok(ret == PDH_INVALID_ARGUMENT, "PdhValidatePathExW failed 0x%08x\n", ret); - ret = pPdhValidatePathExW( NULL, system ); + ret = pPdhValidatePathExW( NULL, L"\\System" ); ok(ret == PDH_CSTATUS_BAD_COUNTERNAME, "PdhValidatePathExW failed 0x%08x\n", ret); ret = pPdhValidatePathExW( NULL, uptime );

1 0

Michael Stefaniuc : mpr: Use wide-char string literals.
by Alexandre Julliard 05 Nov '20

05 Nov '20

Module: wine Branch: master Commit: 2a9407dd1521fed6ba3183ef70a994b902162580 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a9407dd1521fed6ba3183ef… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 5 02:17:10 2020 +0100 mpr: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/tests/mpr.c | 4 ++-- dlls/mpr/wnet.c | 68 +++++++++++++++++++--------------------------------- 2 files changed, 26 insertions(+), 46 deletions(-) diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c index 3e5ca099eb7..578853eb12a 100644 --- a/dlls/mpr/tests/mpr.c +++ b/dlls/mpr/tests/mpr.c @@ -31,7 +31,7 @@ static void test_WNetGetUniversalName(void) DWORD drive_type, info_size, fail_size; char driveA[] = "A:\\"; char driveandpathA[] = "A:\\file.txt"; - WCHAR driveW[] = {'A',':','\\',0}; + WCHAR driveW[] = L"A:\\"; for(; *driveA <= 'Z'; ++*driveA, ++*driveandpathA, ++*driveW){ drive_type = GetDriveTypeW(driveW); @@ -96,7 +96,7 @@ static void test_WNetGetRemoteName(void) DWORD drive_type, info_size, fail_size; char driveA[] = "A:\\"; char driveandpathA[] = "A:\\file.txt"; - WCHAR driveW[] = {'A',':','\\',0}; + WCHAR driveW[] = L"A:\\"; for(; *driveA <= 'Z'; ++*driveA, ++*driveandpathA, ++*driveW){ drive_type = GetDriveTypeW(driveW); diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 1333082705b..27dd1be15b5 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -126,29 +126,22 @@ static PWNetProviderTable providerTable; static void _tryLoadProvider(PCWSTR provider) { - static const WCHAR servicePrefix[] = { 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'S','e','r','v','i','c','e','s','\\',0 }; - static const WCHAR serviceFmt[] = { '%','s','%','s','\\', - 'N','e','t','w','o','r','k','P','r','o','v','i','d','e','r',0 }; WCHAR serviceName[MAX_PATH]; HKEY hKey; TRACE("%s\n", debugstr_w(provider)); - swprintf(serviceName, ARRAY_SIZE(serviceName), serviceFmt, servicePrefix, provider); + swprintf(serviceName, ARRAY_SIZE(serviceName), L"%s%s\\NetworkProvider", + L"System\\CurrentControlSet\\Services\\", provider); serviceName[ARRAY_SIZE(serviceName) - 1] = '\0'; if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, serviceName, 0, KEY_READ, &hKey) == ERROR_SUCCESS) { - static const WCHAR szProviderPath[] = { 'P','r','o','v','i','d','e','r', - 'P','a','t','h',0 }; WCHAR providerPath[MAX_PATH]; DWORD type, size = sizeof(providerPath); - if (RegQueryValueExW(hKey, szProviderPath, NULL, &type, - (LPBYTE)providerPath, &size) == ERROR_SUCCESS && (type == REG_SZ || type == REG_EXPAND_SZ)) + if (RegQueryValueExW(hKey, L"ProviderPath", NULL, &type, (BYTE *)providerPath, &size) == ERROR_SUCCESS + && (type == REG_SZ || type == REG_EXPAND_SZ)) { - static const WCHAR szProviderName[] = { 'N','a','m','e',0 }; PWSTR name = NULL; if (type == REG_EXPAND_SZ) @@ -158,12 +151,12 @@ static void _tryLoadProvider(PCWSTR provider) } size = 0; - RegQueryValueExW(hKey, szProviderName, NULL, NULL, NULL, &size); + RegQueryValueExW(hKey, L"Name", NULL, NULL, NULL, &size); if (size) { name = HeapAlloc(GetProcessHeap(), 0, size); - if (RegQueryValueExW(hKey, szProviderName, NULL, &type, - (LPBYTE)name, &size) != ERROR_SUCCESS || type != REG_SZ) + if (RegQueryValueExW(hKey, L"Name", NULL, &type, (BYTE *)name, &size) != ERROR_SUCCESS + || type != REG_SZ) { HeapFree(GetProcessHeap(), 0, name); name = NULL; @@ -252,7 +245,7 @@ static void _tryLoadProvider(PCWSTR provider) } } else - WARN("Couldn't open value %s\n", debugstr_w(szProviderPath)); + WARN("Couldn't open value ProviderPath\n"); RegCloseKey(hKey); } else @@ -262,21 +255,14 @@ static void _tryLoadProvider(PCWSTR provider) void wnetInit(HINSTANCE hInstDll) { - static const WCHAR providerOrderKey[] = { 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'N','e','t','w','o','r','k','P','r','o','v','i','d','e','r','\\', - 'O','r','d','e','r',0 }; - static const WCHAR providerOrder[] = { 'P','r','o','v','i','d','e','r', - 'O','r','d','e','r',0 }; HKEY hKey; - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, providerOrderKey, 0, KEY_READ, &hKey) - == ERROR_SUCCESS) + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\NetworkProvider\\Order", + 0, KEY_READ, &hKey) == ERROR_SUCCESS) { DWORD size = 0; - RegQueryValueExW(hKey, providerOrder, NULL, NULL, NULL, &size); + RegQueryValueExW(hKey, L"ProviderOrder", NULL, NULL, NULL, &size); if (size) { PWSTR providers = HeapAlloc(GetProcessHeap(), 0, size); @@ -285,8 +271,8 @@ void wnetInit(HINSTANCE hInstDll) { DWORD type; - if (RegQueryValueExW(hKey, providerOrder, NULL, &type, - (LPBYTE)providers, &size) == ERROR_SUCCESS && type == REG_SZ) + if (RegQueryValueExW(hKey, L"ProviderOrder", NULL, &type, (BYTE *)providers, &size) + == ERROR_SUCCESS && type == REG_SZ) { PWSTR ptr; DWORD numToAllocate; @@ -1391,10 +1377,6 @@ static DWORD _enumerateConnectedW(PWNetEnumerator enumerator, DWORD* user_count, return ret; } -static const WCHAR connectionType[] = { 'C','o','n','n','e','c','t','i','o','n','T','y','p','e',0 }; -static const WCHAR providerName[] = { 'P','r','o','v','i','d','e','r','N','a','m','e',0 }; -static const WCHAR remotePath[] = { 'R','e','m','o','t','e','P','a','t','h',0 }; - static WCHAR *get_reg_str(HKEY hkey, const WCHAR *value, DWORD *len) { DWORD type; @@ -1457,7 +1439,7 @@ static DWORD _enumeratorRememberedW(PWNetEnumerator enumerator, DWORD* user_coun if (size_left > 0) { size = sizeof(DWORD); - RegQueryValueExW(connection, connectionType, NULL, NULL, (BYTE *)&net_buffer->dwType, &size); + RegQueryValueExW(connection, L"ConnectionType", NULL, NULL, (BYTE *)&net_buffer->dwType, &size); if (type != RESOURCETYPE_ANY && net_buffer->dwType != type) { size_left += sizeof(NETRESOURCEW); @@ -1485,7 +1467,7 @@ static DWORD _enumeratorRememberedW(PWNetEnumerator enumerator, DWORD* user_coun } registry_size = 0; - registry_string = get_reg_str(connection, providerName, &registry_size); + registry_string = get_reg_str(connection, L"ProviderName", &registry_size); if (registry_string) { full_size += registry_size; @@ -1504,7 +1486,7 @@ static DWORD _enumeratorRememberedW(PWNetEnumerator enumerator, DWORD* user_coun } registry_size = 0; - registry_string = get_reg_str(connection, remotePath, &registry_size); + registry_string = get_reg_str(connection, L"RemotePath", &registry_size); if (registry_string) { full_size += registry_size; @@ -2003,9 +1985,6 @@ static DWORD wnet_use_provider( struct use_connection_context *ctxt, NETRESOURCE return ret; } -static const WCHAR providerType[] = { 'P','r','o','v','i','d','e','r','T','y','p','e',0 }; -static const WCHAR userName[] = { 'U','s','e','r','N','a','m','e',0 }; - static DWORD wnet_use_connection( struct use_connection_context *ctxt ) { WNetProvider *provider = NULL; @@ -2082,15 +2061,16 @@ static DWORD wnet_use_connection( struct use_connection_context *ctxt ) { DWORD dword_arg = RESOURCETYPE_DISK; DWORD len = (lstrlenW(provider->name) + 1) * sizeof(WCHAR); - static const WCHAR empty[1] = {0}; - RegSetValueExW(network, connectionType, 0, REG_DWORD, (const BYTE *)&dword_arg, sizeof(DWORD)); - RegSetValueExW(network, providerName, 0, REG_SZ, (const BYTE *)provider->name, len); - RegSetValueExW(network, providerType, 0, REG_DWORD, (const BYTE *)&provider->dwNetType, sizeof(DWORD)); + RegSetValueExW(network, L"ConnectionType", 0, REG_DWORD, (const BYTE *)&dword_arg, + sizeof(DWORD)); + RegSetValueExW(network, L"ProviderName", 0, REG_SZ, (const BYTE *)provider->name, len); + RegSetValueExW(network, L"ProviderType", 0, REG_DWORD, + (const BYTE *)&provider->dwNetType, sizeof(DWORD)); len = (lstrlenW(netres.lpRemoteName) + 1) * sizeof(WCHAR); - RegSetValueExW(network, remotePath, 0, REG_SZ, (const BYTE *)netres.lpRemoteName, len); - len = sizeof(empty); - RegSetValueExW(network, userName, 0, REG_SZ, (const BYTE *)empty, len); + RegSetValueExW(network, L"RemotePath", 0, REG_SZ, (const BYTE *)netres.lpRemoteName, len); + len = sizeof(L""); + RegSetValueExW(network, L"UserName", 0, REG_SZ, (const BYTE *) L"", len); RegCloseKey(network); }

1 0