December 2017 - Wine-Commits

Jacek Caban : jscript: Use WARN for exception traces instead of separated debug channel.
by Alexandre Julliard Dec. 20, 2017

Dec. 20, 2017

Module: wine Branch: master Commit: 77e27441b25608bf009a79eed53a9b92704d0bf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e27441b25608bf009a79eed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 20 16:03:37 2017 +0100 jscript: Use WARN for exception traces instead of separated debug channel. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 74d80eb..38d8657 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -28,7 +28,6 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(jscript); -WINE_DECLARE_DEBUG_CHANNEL(jscript_except); static const WCHAR booleanW[] = {'b','o','o','l','e','a','n',0}; static const WCHAR functionW[] = {'f','u','n','c','t','i','o','n',0}; @@ -2666,29 +2665,27 @@ static void print_backtrace(script_ctx_t *ctx) call_frame_t *frame; for(frame = ctx->call_ctx; frame; frame = frame->prev_frame) { - TRACE_(jscript_except)("%u\t", depth); + WARN("%u\t", depth); depth++; if(frame->this_obj && frame->this_obj != to_disp(ctx->global) && frame->this_obj != ctx->host_global) - TRACE_(jscript_except)("%p->", frame->this_obj); - TRACE_(jscript_except)("%s(", frame->function->name ? debugstr_w(frame->function->name) : "[unnamed]"); + WARN("%p->", frame->this_obj); + WARN("%s(", frame->function->name ? debugstr_w(frame->function->name) : "[unnamed]"); if(frame->base_scope && frame->base_scope->frame) { for(i=0; i < frame->argc; i++) { if(i < frame->function->param_cnt) - TRACE_(jscript_except)("%s%s=%s", i ? ", " : "", - debugstr_w(frame->function->params[i]), - debugstr_jsval(ctx->stack[local_off(frame, -i-1)])); + WARN("%s%s=%s", i ? ", " : "", debugstr_w(frame->function->params[i]), + debugstr_jsval(ctx->stack[local_off(frame, -i-1)])); else - TRACE_(jscript_except)("%s%s", i ? ", " : "", - debugstr_jsval(ctx->stack[local_off(frame, -i-1)])); + WARN("%s%s", i ? ", " : "", debugstr_jsval(ctx->stack[local_off(frame, -i-1)])); } }else { - TRACE_(jscript_except)("[detached frame]"); + WARN("[detached frame]"); } - TRACE_(jscript_except)(")\n"); + WARN(")\n"); if(!(frame->flags & EXEC_RETURN_TO_INTERP)) { - TRACE_(jscript_except)("%u\t[native code]\n", depth); + WARN("%u\t[native code]\n", depth); depth++; } } @@ -2702,26 +2699,24 @@ static HRESULT unwind_exception(script_ctx_t *ctx, HRESULT exception_hres) unsigned catch_off; HRESULT hres; - TRACE("%08x\n", exception_hres); - - if(TRACE_ON(jscript_except)) { + if(WARN_ON(jscript)) { jsdisp_t *error_obj; jsval_t msg; static const WCHAR messageW[] = {'m','e','s','s','a','g','e',0}; - TRACE_(jscript_except)("Exception %08x %s", exception_hres, debugstr_jsval(ctx->ei.val)); + WARN("Exception %08x %s", exception_hres, debugstr_jsval(ctx->ei.val)); if(jsval_type(ctx->ei.val) == JSV_OBJECT) { error_obj = to_jsdisp(get_object(ctx->ei.val)); if(error_obj) { hres = jsdisp_propget_name(error_obj, messageW, &msg); if(SUCCEEDED(hres)) { - TRACE_(jscript_except)(" (message %s)", debugstr_jsval(msg)); + WARN(" (message %s)", debugstr_jsval(msg)); jsval_release(msg); } } } - TRACE_(jscript_except)(" in:\n"); + WARN(" in:\n"); print_backtrace(ctx); }

1 0

Zebediah Figura : winegstreamer: Hold a reference to the filter in push_data().
by Alexandre Julliard Dec. 20, 2017

Dec. 20, 2017

Module: wine Branch: master Commit: 079d63e66c9f00030c94a5cc5e821ea898e83c98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=079d63e66c9f00030c94a5cc5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 19 20:49:20 2017 -0600 winegstreamer: Hold a reference to the filter in push_data(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 95a1630..a19c64f 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -510,6 +510,8 @@ static DWORD CALLBACK push_data(LPVOID iface) DWORD_PTR user; HRESULT hr; + IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); + if (!This->stop) IAsyncReader_Length(This->pInputPin.pReader, &maxlen, &curlen); else @@ -589,6 +591,9 @@ static DWORD CALLBACK push_data(LPVOID iface) } while (buf); TRACE("Stopping.. %08x\n", hr); + + IBaseFilter_Release(&This->filter.IBaseFilter_iface); + return 0; }

1 0

Zebediah Figura : user32/tests: Add more tests for SetActiveWindow().
by Alexandre Julliard Dec. 20, 2017

Dec. 20, 2017

Module: wine Branch: master Commit: e188d66251e6f9693629fe3e1bfa4bd2e9a534cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e188d66251e6f9693629fe3e1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 19 18:29:30 2017 -0600 user32/tests: Add more tests for SetActiveWindow(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index ea9fac2..a692a06 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3152,7 +3152,7 @@ todo_wine static void test_SetActiveWindow(HWND hwnd) { - HWND hwnd2; + HWND hwnd2, ret; flush_events( TRUE ); ShowWindow(hwnd, SW_HIDE); @@ -3165,13 +3165,13 @@ static void test_SetActiveWindow(HWND hwnd) ShowWindow(hwnd, SW_SHOW); check_wnd_state(hwnd, hwnd, hwnd, 0); - hwnd2 = SetActiveWindow(0); - ok(hwnd2 == hwnd, "SetActiveWindow returned %p instead of %p\n", hwnd2, hwnd); + ret = SetActiveWindow(0); + ok(ret == hwnd, "SetActiveWindow returned %p instead of %p\n", ret, hwnd); if (!GetActiveWindow()) /* doesn't always work on vista */ { check_wnd_state(0, 0, 0, 0); - hwnd2 = SetActiveWindow(hwnd); - ok(hwnd2 == 0, "SetActiveWindow returned %p instead of 0\n", hwnd2); + ret = SetActiveWindow(hwnd); + ok(ret == 0, "SetActiveWindow returned %p instead of 0\n", ret); } check_wnd_state(hwnd, hwnd, hwnd, 0); @@ -3194,6 +3194,9 @@ static void test_SetActiveWindow(HWND hwnd) hwnd2 = CreateWindowExA(0, "static", NULL, WS_POPUP|WS_VISIBLE, 0, 0, 0, 0, hwnd, 0, 0, NULL); check_wnd_state(hwnd2, hwnd2, hwnd2, 0); + SetActiveWindow(hwnd); + check_wnd_state(hwnd, hwnd, hwnd, 0); + DestroyWindow(hwnd2); check_wnd_state(hwnd, hwnd, hwnd, 0); @@ -3205,6 +3208,31 @@ static void test_SetActiveWindow(HWND hwnd) DestroyWindow(hwnd2); check_wnd_state(hwnd, hwnd, hwnd, 0); + + /* try to activate the desktop */ + SetLastError(0xdeadbeef); + ret = SetActiveWindow(GetDesktopWindow()); + ok(ret == NULL, "expected NULL, got %p\n", ret); + todo_wine + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", GetLastError()); + check_wnd_state(hwnd, hwnd, hwnd, 0); + + /* activating a child should activate the parent */ + hwnd2 = CreateWindowExA(0, "MainWindowClass", "Child window", WS_CHILD, 0, 0, 0, 0, hwnd, 0, GetModuleHandleA(NULL), NULL); + check_wnd_state(hwnd, hwnd, hwnd, 0); + ret = SetActiveWindow(hwnd2); + ok(ret == hwnd, "expected %p, got %p\n", hwnd, ret); + check_wnd_state(hwnd, hwnd, hwnd, 0); + ret = SetActiveWindow(0); + ok(ret == hwnd, "expected %p, got %p\n", hwnd, ret); + if (!GetActiveWindow()) + { + ret = SetActiveWindow(hwnd2); + ok(ret == NULL, "expected NULL, got %p\n", ret); + todo_wine + check_active_state(hwnd, hwnd, hwnd); + } + DestroyWindow(hwnd2); } struct create_window_thread_params

1 0

Zebediah Figura : user32/tests: Don't leave hwndMain in a topmost state.
by Alexandre Julliard Dec. 20, 2017

Dec. 20, 2017

Module: wine Branch: master Commit: 51f555a517be91348ac6a7c73862a54c13a1dc1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=51f555a517be91348ac6a7c73… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 19 18:29:29 2017 -0600 user32/tests: Don't leave hwndMain in a topmost state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index db27b6b..ea9fac2 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4011,6 +4011,8 @@ done: if (child) DestroyWindow(child); DestroyWindow(popup); + + SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); } static void test_validatergn(HWND hwnd)

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard Dec. 20, 2017

Dec. 20, 2017

Module: wine Branch: master Commit: 0ec9ecacdc78abf855f461f5264b8e933f8b1951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ec9ecacdc78abf855f461f52… Author: Kim Malmo <berencamlost(a)msn.com> Date: Tue Dec 19 23:07:25 2017 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 68 +++++++++++++------------------------------------------------ 1 file changed, 14 insertions(+), 54 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 605b7e8..d00e67a 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -6998,7 +6998,7 @@ msgstr "Publiserer produktinformasjon" #: msi.rc:118 msgid "Registering Class servers" -msgstr "" +msgstr "Registrerer Klassetjenere" #: msi.rc:119 msgid "Registering COM+ Applications and Components" @@ -7102,7 +7102,7 @@ msgstr "Avpubliserer produktinformasjon" #: msi.rc:145 msgid "Unregister Class servers" -msgstr "" +msgstr "Avregistrerer Klassetjenere" #: msi.rc:146 msgid "Unregistering COM+ Applications and Components" @@ -7162,7 +7162,7 @@ msgstr "Tjeneste: [1]" #: msi.rc:166 msi.rc:169 msi.rc:173 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "Fil: [1], Mappe: [9], Størrelse: [6]" +msgstr "Fil: [1], Katalog: [9], Størrelse: [6]" #: msi.rc:167 msgid "Found application: [1]" @@ -7170,7 +7170,7 @@ msgstr "Funnet program: [1]" #: msi.rc:168 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "Fil: [1], Mappe: [9], Størrelse: [6]" +msgstr "Fil: [1], Katalog: [9], Størrelse: [6]" #: msi.rc:170 msgid "Service: [2]" @@ -7186,11 +7186,11 @@ msgstr "Program: [1]" #: msi.rc:174 msi.rc:175 msgid "Application Context:[1], Assembly Name:[2]" -msgstr "Programkontekst:[1], Assemblynavn:[2]" +msgstr "Programkontekst:[1], Assembly-navn:[2]" #: msi.rc:176 msgid "File: [1], Directory: [2], Size: [3]" -msgstr "Fil: [1], Mappe: [2], Størrelse: [6]" +msgstr "Fil: [1], Katalog: [2], Størrelse: [6]" #: msi.rc:177 msi.rc:198 msgid "Component ID: [1], Qualifier: [2]" @@ -7202,7 +7202,7 @@ msgstr "Egenskap: [1]" #: msi.rc:179 msi.rc:200 msgid "Class Id: [1]" -msgstr "Klasse ID: [1]" +msgstr "Klasse Id: [1]" #: msi.rc:180 msgid "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" @@ -7222,15 +7222,15 @@ msgstr "MIME innholdstype: [1], Utvidelse: [2]" #: msi.rc:184 msi.rc:205 msgid "ProgId: [1]" -msgstr "" +msgstr "ProgId: [1]" #: msi.rc:185 msi.rc:206 msgid "LibID: [1]" -msgstr "" +msgstr "LibID: [1]" #: msi.rc:186 msi.rc:189 msgid "File: [1], Directory: [9]" -msgstr "Fil: [1], Mappe: [2]" +msgstr "Fil: [1], Katalog: [2]" #: msi.rc:187 msi.rc:207 msgid "Name: [1], Value: [2], Action [3]" @@ -7254,7 +7254,7 @@ msgstr "Fil: [1], Mappe: [2]" #: msi.rc:201 msgid "AppId: [1]{{, AppType: [2]}}" -msgstr "" +msgstr "AppId: [1]{{, AppType: [2]}}" #: msi.rc:209 msgid "Key: [1], Name: [2], Value: [3]" @@ -7282,7 +7282,7 @@ msgid "" "This may indicate a problem with this package. The error code is [1]. {{The " "arguments are: [2], [3], [4]}}" msgstr "" -"Installeren har truffet på ett eventet problem under installeringen av denne " +"Installeren har truffet på ett uventet problem under installeringen av denne " "pakken. Dette kan skyldes ett problem med denne pakken. Errorkoden er [1]. " "{{Argumentene er: [2], [3], [4]}}" @@ -10601,47 +10601,6 @@ msgstr "" "eller skallet CMD ble startet fra.\n" #: cmd.rc:364 -#, fuzzy -#| msgid "" -#| "CMD built-in commands are:\n" -#| "ASSOC\t\tShow or modify file extension associations\n" -#| "ATTRIB\t\tShow or change DOS file attributes\n" -#| "CALL\t\tInvoke a batch file from inside another\n" -#| "CD (CHDIR)\tChange current default directory\n" -#| "CHOICE\t\tWait for an keypress from a selectable list\n" -#| "CLS\t\tClear the console screen\n" -#| "COPY\t\tCopy file\n" -#| "CTTY\t\tChange input/output device\n" -#| "DATE\t\tShow or change the system date\n" -#| "DEL (ERASE)\tDelete a file or set of files\n" -#| "DIR\t\tList the contents of a directory\n" -#| "ECHO\t\tCopy text directly to the console output\n" -#| "ENDLOCAL\tEnd localization of environment changes in a batch file\n" -#| "FTYPE\t\tShow or modify open commands associated with file types\n" -#| "HELP\t\tShow brief help details on a topic\n" -#| "MD (MKDIR)\tCreate a subdirectory\n" -#| "MORE\t\tDisplay output in pages\n" -#| "MOVE\t\tMove a file, set of files or directory tree\n" -#| "PATH\t\tSet or show the search path\n" -#| "PAUSE\t\tSuspend execution of a batch file\n" -#| "POPD\t\tRestore the directory to the last one saved with PUSHD\n" -#| "PROMPT\t\tChange the command prompt\n" -#| "PUSHD\t\tChange to a new directory, saving the current one\n" -#| "REN (RENAME)\tRename a file\n" -#| "RD (RMDIR)\tDelete a subdirectory\n" -#| "SET\t\tSet or show environment variables\n" -#| "SETLOCAL\tStart localization of environment changes in a batch file\n" -#| "START\t\tStart a program, or open a document in the associated program\n" -#| "TIME\t\tSet or show the current system time\n" -#| "TITLE\t\tSet the window title for the CMD session\n" -#| "TYPE\t\tType the contents of a text file\n" -#| "VER\t\tShow the current version of CMD\n" -#| "VOL\t\tShow the volume label of a disk device\n" -#| "XCOPY\t\tCopy source files or directory trees to a destination\n" -#| "EXIT\t\tClose down CMD\n" -#| "\n" -#| "Enter HELP <command> for further information on any of the above " -#| "commands.\n" msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -10701,6 +10660,7 @@ msgstr "" "FTYPE\t\tViser eller endrer kommandoer for åpning av ulike filtyper\n" "HELP\t\tViser en kort hjelpebeskrivelse om et emne\n" "MD (MKDIR)\tLager en underkatalog\n" +"MKLINK\tOpprett en symbolsk lenke\n" "MORE\t\tViser utdata i sider\n" "MOVE\t\tFlytter én eller flere filer, eller et katalogtre\n" "PATH\t\tEndrer eller viser søkestien\n" @@ -12531,7 +12491,7 @@ msgstr "" "Brukseksempler:\n" " regedit \"import.reg\"\n" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" #: regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n"

1 0

Nikolay Sivov : comctl32/tooltips: Remove window subclass right before window is destroyed.
by Alexandre Julliard Dec. 20, 2017

Dec. 20, 2017

Module: wine Branch: master Commit: b68dbf4ea1294a98ca653f32e88b07be632a5bae URL: http://source.winehq.org/git/wine.git/?a=commit;h=b68dbf4ea1294a98ca653f32e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 20 01:21:44 2017 +0300 comctl32/tooltips: Remove window subclass right before window is destroyed. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tooltips.c | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index bbf1693..405b1e9 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1888,16 +1888,12 @@ TOOLTIPS_Destroy (TOOLTIPS_INFO *infoPtr) } } - /* remove subclassing */ - if (toolPtr->uInternalFlags & TTF_SUBCLASS) { - if (toolPtr->uInternalFlags & TTF_IDISHWND) { - RemoveWindowSubclass((HWND)toolPtr->uId, TOOLTIPS_SubclassProc, 1); - } - else { - RemoveWindowSubclass(toolPtr->hwnd, TOOLTIPS_SubclassProc, 1); - } + /* Reset subclassing data. */ + if (toolPtr->uInternalFlags & TTF_SUBCLASS) + SetWindowSubclass(toolPtr->uInternalFlags & TTF_IDISHWND ? (HWND)toolPtr->uId : toolPtr->hwnd, + TOOLTIPS_SubclassProc, 1, 0); } - } + Free (infoPtr->tools); } @@ -2117,12 +2113,13 @@ TOOLTIPS_WinIniChange (TOOLTIPS_INFO *infoPtr) static LRESULT CALLBACK -TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uID, DWORD_PTR dwRef) +TOOLTIPS_SubclassProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, UINT_PTR uID, DWORD_PTR dwRef) { TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr ((HWND)dwRef); MSG msg; - switch(uMsg) { + switch (message) + { case WM_MOUSEMOVE: case WM_LBUTTONDOWN: case WM_LBUTTONUP: @@ -2130,17 +2127,23 @@ TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_ case WM_MBUTTONUP: case WM_RBUTTONDOWN: case WM_RBUTTONUP: - msg.hwnd = hwnd; - msg.message = uMsg; - msg.wParam = wParam; - msg.lParam = lParam; - TOOLTIPS_RelayEvent(infoPtr, &msg); - break; - + if (infoPtr) + { + msg.hwnd = hwnd; + msg.message = message; + msg.wParam = wParam; + msg.lParam = lParam; + TOOLTIPS_RelayEvent(infoPtr, &msg); + } + break; + case WM_NCDESTROY: + RemoveWindowSubclass(hwnd, TOOLTIPS_SubclassProc, 1); + break; default: break; } - return DefSubclassProc(hwnd, uMsg, wParam, lParam); + + return DefSubclassProc(hwnd, message, wParam, lParam); }

1 0

Zebediah Figura : user32/tests: Add activation tests for hiding windows.
by Alexandre Julliard Dec. 20, 2017

Dec. 20, 2017

Module: wine Branch: master Commit: 2f0d573be79d9b8fcbd616a702d993847e7cedd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0d573be79d9b8fcbd616a70… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 19 18:29:31 2017 -0600 user32/tests: Add activation tests for hiding windows. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index a692a06..6a6a765 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -9856,6 +9856,102 @@ static void test_LockWindowUpdate(HWND parent) DestroyWindow(child); } +static void test_hide_window(void) +{ + HWND hwnd, hwnd2, hwnd3; + + hwnd = CreateWindowExA(0, "MainWindowClass", "Main window", WS_POPUP | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, GetModuleHandleA(NULL), NULL); + hwnd2 = CreateWindowExA(0, "MainWindowClass", "Main window 2", WS_POPUP | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, GetModuleHandleA(NULL), NULL); + trace("hwnd = %p, hwnd2 = %p\n", hwnd, hwnd2); + check_active_state(hwnd2, hwnd2, hwnd2); + ok(GetWindow(hwnd2, GW_HWNDNEXT) == hwnd, "expected %p, got %p\n", hwnd, GetWindow(hwnd2, GW_HWNDNEXT)); + + /* test hiding two normal windows */ + ShowWindow(hwnd2, SW_HIDE); + check_active_state(hwnd, hwnd, hwnd); + todo_wine + ok(GetWindow(hwnd, GW_HWNDNEXT) == hwnd2, "expected %p, got %p\n", hwnd2, GetWindow(hwnd, GW_HWNDNEXT)); + + ShowWindow(hwnd, SW_HIDE); + check_active_state(hwndMain, 0, hwndMain); + ok(GetWindow(hwnd, GW_HWNDNEXT) == hwnd2, "expected %p, got %p\n", hwnd2, GetWindow(hwnd, GW_HWNDNEXT)); + + ShowWindow(hwnd, SW_SHOW); + check_active_state(hwnd, hwnd, hwnd); + + ShowWindow(hwnd2, SW_SHOW); + check_active_state(hwnd2, hwnd2, hwnd2); + ok(GetWindow(hwnd2, GW_HWNDNEXT) == hwnd, "expected %p, got %p\n", hwnd, GetWindow(hwnd2, GW_HWNDNEXT)); + + /* hide a non-active window */ + ShowWindow(hwnd, SW_HIDE); + check_active_state(hwnd2, hwnd2, hwnd2); + todo_wine + ok(GetWindow(hwnd2, GW_HWNDNEXT) == hwnd, "expected %p, got %p\n", hwnd, GetWindow(hwnd2, GW_HWNDNEXT)); + + /* hide a window in the middle */ + ShowWindow(hwnd, SW_SHOW); + ShowWindow(hwnd2, SW_SHOW); + hwnd3 = CreateWindowExA(0, "MainWindowClass", "Main window 3", WS_POPUP | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, GetModuleHandleA(NULL), NULL); + SetActiveWindow(hwnd2); + ShowWindow(hwnd2, SW_HIDE); + check_active_state(hwnd3, hwnd3, hwnd3); + todo_wine { + ok(GetWindow(hwnd3, GW_HWNDNEXT) == hwnd2, "expected %p, got %p\n", hwnd2, GetWindow(hwnd3, GW_HWNDNEXT)); + ok(GetWindow(hwnd2, GW_HWNDNEXT) == hwnd, "expected %p, got %p\n", hwnd, GetWindow(hwnd2, GW_HWNDNEXT)); + } + + DestroyWindow(hwnd3); + + /* hide a normal window when there is a topmost window */ + hwnd3 = CreateWindowExA(WS_EX_TOPMOST, "MainWindowClass", "Topmost window 3", WS_POPUP|WS_VISIBLE, + 100, 100, 200, 200, 0, 0, GetModuleHandleA(NULL), NULL); + ShowWindow(hwnd, SW_SHOW); + ShowWindow(hwnd2, SW_SHOW); + check_active_state(hwnd2, hwnd2, hwnd2); + ShowWindow(hwnd2, SW_HIDE); + todo_wine + check_active_state(hwnd3, hwnd3, hwnd3); + ok(GetWindow(hwnd2, GW_HWNDNEXT) == hwnd, "expected %p, got %p\n", hwnd, GetWindow(hwnd2, GW_HWNDNEXT)); + + /* hide a topmost window */ + ShowWindow(hwnd2, SW_SHOW); + ShowWindow(hwnd3, SW_SHOW); + ShowWindow(hwnd3, SW_HIDE); + check_active_state(hwnd2, hwnd2, hwnd2); + ok(GetWindow(hwnd2, GW_HWNDNEXT) == hwnd, "expected %p, got %p\n", hwnd, GetWindow(hwnd2, GW_HWNDNEXT)); + + DestroyWindow(hwnd3); + + /* hiding an owned window activates its owner */ + ShowWindow(hwnd, SW_SHOW); + ShowWindow(hwnd2, SW_SHOW); + hwnd3 = CreateWindowExA(0, "MainWindowClass", "Owned window 3", WS_POPUP|WS_VISIBLE, + 100, 100, 200, 200, hwnd, 0, GetModuleHandleA(NULL), NULL); + ShowWindow(hwnd3, SW_HIDE); + check_active_state(hwnd, hwnd, hwnd); + todo_wine { + ok(GetWindow(hwnd3, GW_HWNDNEXT) == hwnd, "expected %p, got %p\n", hwnd, GetWindow(hwnd3, GW_HWNDNEXT)); + ok(GetWindow(hwnd, GW_HWNDNEXT) == hwnd2, "expected %p, got %p\n", hwnd2, GetWindow(hwnd, GW_HWNDNEXT)); + } + + /* hide an owner window */ + ShowWindow(hwnd, SW_SHOW); + ShowWindow(hwnd2, SW_SHOW); + ShowWindow(hwnd3, SW_SHOW); + ShowWindow(hwnd, SW_HIDE); + check_active_state(hwnd3, hwnd3, hwnd3); + ok(GetWindow(hwnd3, GW_HWNDNEXT) == hwnd, "expected %p, got %p\n", hwnd, GetWindow(hwnd3, GW_HWNDNEXT)); + ok(GetWindow(hwnd, GW_HWNDNEXT) == hwnd2, "expected %p, got %p\n", hwnd2, GetWindow(hwnd, GW_HWNDNEXT)); + + DestroyWindow(hwnd3); + DestroyWindow(hwnd2); + DestroyWindow(hwnd); +} + static void test_desktop( void ) { HWND desktop = GetDesktopWindow(); @@ -10433,6 +10529,7 @@ START_TEST(win) test_deferwindowpos(); test_LockWindowUpdate(hwndMain); test_desktop(); + test_hide_window(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook);

1 0

Nikolay Sivov : mfplat: Implement MFGetService().
by Alexandre Julliard Dec. 20, 2017

Dec. 20, 2017

Module: wine Branch: master Commit: 42b04e2cf4561f67e4c8d540ba5ddfdef2bb546e URL: http://source.winehq.org/git/wine.git/?a=commit;h=42b04e2cf4561f67e4c8d540b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 20 17:42:23 2017 +0300 mfplat: Implement MFGetService(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/main.c | 23 ++++++++++ dlls/mf/mf.spec | 2 +- dlls/mf/tests/mf.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/mfidl.idl | 1 + 4 files changed, 153 insertions(+), 1 deletion(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 2ad2e5d..73cd6aa 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -20,6 +20,8 @@ #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "mfidl.h" @@ -51,3 +53,24 @@ HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *array) return E_NOTIMPL; } + +/*********************************************************************** + * MFGetService (mf.@) + */ +HRESULT WINAPI MFGetService(IUnknown *object, REFGUID service, REFIID riid, void **obj) +{ + IMFGetService *gs; + HRESULT hr; + + TRACE("(%p, %s, %s, %p)\n", object, debugstr_guid(service), debugstr_guid(riid), obj); + + if (!object) + return E_POINTER; + + if (FAILED(hr = IUnknown_QueryInterface(object, &IID_IMFGetService, (void **)&gs))) + return hr; + + hr = IMFGetService_GetService(gs, service, riid, obj); + IMFGetService_Release(gs); + return hr; +} diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index 54fa1f3..deb9057 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -72,7 +72,7 @@ @ stub MFCreateWMVEncoderActivate @ stub MFEnumDeviceSources @ stub MFGetMultipleServiceProviders -@ stub MFGetService +@ stdcall MFGetService(ptr ptr ptr ptr) @ stdcall MFGetSupportedMimeTypes(ptr) @ stub MFGetSupportedSchemes @ stub MFGetTopoNodeCurrentType diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index f28c6e0..76e092a 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" +#include "initguid.h" #include "mfidl.h" #include "wine/test.h" @@ -43,7 +44,134 @@ static void test_topology(void) IMFTopology_Release(topology); } +static HRESULT WINAPI test_getservice_QI(IMFGetService *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFGetService) || IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI test_getservice_AddRef(IMFGetService *iface) +{ + return 2; +} + +static ULONG WINAPI test_getservice_Release(IMFGetService *iface) +{ + return 1; +} + +static HRESULT WINAPI test_getservice_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) +{ + *obj = (void *)0xdeadbeef; + return 0x83eddead; +} + +static const IMFGetServiceVtbl testmfgetservicevtbl = +{ + test_getservice_QI, + test_getservice_AddRef, + test_getservice_Release, + test_getservice_GetService, +}; + +static IMFGetService test_getservice = { &testmfgetservicevtbl }; + +static HRESULT WINAPI testservice_QI(IUnknown *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + return S_OK; + } + + *obj = NULL; + + if (IsEqualIID(riid, &IID_IMFGetService)) + return 0x82eddead; + + return E_NOINTERFACE; +} + +static HRESULT WINAPI testservice2_QI(IUnknown *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + return S_OK; + } + + if (IsEqualIID(riid, &IID_IMFGetService)) + { + *obj = &test_getservice; + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI testservice_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI testservice_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl testservicevtbl = +{ + testservice_QI, + testservice_AddRef, + testservice_Release, +}; + +static const IUnknownVtbl testservice2vtbl = +{ + testservice2_QI, + testservice_AddRef, + testservice_Release, +}; + +static IUnknown testservice = { &testservicevtbl }; +static IUnknown testservice2 = { &testservice2vtbl }; + +static void test_MFGetService(void) +{ + IUnknown *unk; + HRESULT hr; + + hr = MFGetService(NULL, NULL, NULL, NULL); + ok(hr == E_POINTER, "Unexpected return value %#x.\n", hr); + + unk = (void *)0xdeadbeef; + hr = MFGetService(NULL, NULL, NULL, (void **)&unk); + ok(hr == E_POINTER, "Unexpected return value %#x.\n", hr); + ok(unk == (void *)0xdeadbeef, "Unexpected out object.\n"); + + hr = MFGetService(&testservice, NULL, NULL, NULL); + ok(hr == 0x82eddead, "Unexpected return value %#x.\n", hr); + + unk = (void *)0xdeadbeef; + hr = MFGetService(&testservice, NULL, NULL, (void **)&unk); + ok(hr == 0x82eddead, "Unexpected return value %#x.\n", hr); + ok(unk == (void *)0xdeadbeef, "Unexpected out object.\n"); + + unk = NULL; + hr = MFGetService(&testservice2, NULL, NULL, (void **)&unk); + ok(hr == 0x83eddead, "Unexpected return value %#x.\n", hr); + ok(unk == (void *)0xdeadbeef, "Unexpected out object.\n"); +} + START_TEST(mf) { test_topology(); + test_MFGetService(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index 2792d38..12b351d 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -256,3 +256,4 @@ cpp_quote("HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD cMedi cpp_quote(" IMFMediaType **types, IMFStreamDescriptor **descriptor);") cpp_quote("HRESULT WINAPI MFCreateTopology(IMFTopology **topology);") cpp_quote("HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *array);") +cpp_quote("HRESULT WINAPI MFGetService(IUnknown *object, REFGUID service, REFIID iid, void **obj);")

1 0

Alex Henrie : netapi32/tests: Print NetWkstaTransportEnum error code on test failure.
by Alexandre Julliard Dec. 20, 2017

Dec. 20, 2017

Module: wine Branch: master Commit: fb3c1da6bad0590e04e4b78f7011e3924ef013ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb3c1da6bad0590e04e4b78f7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 19 23:02:06 2017 -0700 netapi32/tests: Print NetWkstaTransportEnum error code on test failure. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/tests/wksta.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/netapi32/tests/wksta.c b/dlls/netapi32/tests/wksta.c index ee3004e..418a1ad 100644 --- a/dlls/netapi32/tests/wksta.c +++ b/dlls/netapi32/tests/wksta.c @@ -168,7 +168,8 @@ static void run_wkstatransportenum_tests(void) /* 4th check: is param 6 passed? */ apiReturn = pNetWkstaTransportEnum(NULL, 0, &bufPtr, MAX_PREFERRED_LENGTH, &entriesRead, NULL, NULL); - ok(apiReturn == RPC_X_NULL_REF_POINTER, "null pointer\n"); + ok(apiReturn == RPC_X_NULL_REF_POINTER, + "NetWkstaTransportEnum returned %d\n", apiReturn); /* final check: valid return, actually get data back */ apiReturn = pNetWkstaTransportEnum(NULL, 0, &bufPtr, MAX_PREFERRED_LENGTH,

1 0

Nikolay Sivov : include: Add newer definitions for user controls.
by Alexandre Julliard Dec. 20, 2017

Dec. 20, 2017

Module: wine Branch: master Commit: 6fb250e584544c01871b2d66773a18f99fc07a77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fb250e584544c01871b2d667… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 20 14:59:05 2017 +0300 include: Add newer definitions for user controls. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 70 insertions(+), 1 deletion(-) diff --git a/include/commctrl.h b/include/commctrl.h index 587caae..e3c166b 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1032,7 +1032,51 @@ static const WCHAR WC_BUTTONW[] = { 'B','u','t','t','o','n',0 }; #define BCN_FIRST (0U-1250U) #define BCN_LAST (0U-1350U) -#define BCN_HOTITEMCHANGE (BCN_FIRST + 0x0001) +#define BCN_HOTITEMCHANGE (BCN_FIRST + 1) +#define BCN_DROPDOWN (BCN_FIRST + 2) + +#define BCM_FIRST 0x1600 +#define BCM_GETIDEALSIZE (BCM_FIRST + 1) +#define BCM_SETIMAGELIST (BCM_FIRST + 2) +#define BCM_GETIMAGELIST (BCM_FIRST + 3) +#define BCM_SETTEXTMARGIN (BCM_FIRST + 4) +#define BCM_GETTEXTMARGIN (BCM_FIRST + 5) +#define BCM_SETDROPDOWNSTATE (BCM_FIRST + 6) +#define BCM_SETSPLITINFO (BCM_FIRST + 7) +#define BCM_GETSPLITINFO (BCM_FIRST + 8) +#define BCM_SETNOTE (BCM_FIRST + 9) +#define BCM_GETNOTE (BCM_FIRST + 10) +#define BCM_GETNOTELENGTH (BCM_FIRST + 11) +#define BCM_SETSHIELD (BCM_FIRST + 12) + +#define BUTTON_IMAGELIST_ALIGN_LEFT 0 +#define BUTTON_IMAGELIST_ALIGN_RIGHT 1 +#define BUTTON_IMAGELIST_ALIGN_TOP 2 +#define BUTTON_IMAGELIST_ALIGN_BOTTOM 3 +#define BUTTON_IMAGELIST_ALIGN_CENTER 4 + +#define BCCL_NOGLYPH (HIMAGELIST)(-1) + +typedef struct +{ + HIMAGELIST himl; + RECT margin; + UINT uAlign; +} BUTTON_IMAGELIST, *PBUTTON_IMAGELIST; + +typedef struct tagBUTTON_SPLITINFO +{ + UINT mask; + HIMAGELIST himlGlyph; + UINT uSplitStyle; + SIZE size; +} BUTTON_SPLITINFO, *PBUTTON_SPLITINFO; + +typedef struct tagNMBCDROPDOWN +{ + NMHDR hdr; + RECT rcButton; +} NMBCDROPDOWN; typedef struct tagNMBCHOTITEM { @@ -1041,6 +1085,7 @@ typedef struct tagNMBCHOTITEM } NMBCHOTITEM, *LPNMBCHOTITEM; #define BST_HOT 0x0200 +#define BST_DROPDOWNPUSHED 0x0400 /* Button control styles for _WIN32_WINNT >= 0x600 */ #define BS_SPLITBUTTON 0x0000000C @@ -5147,6 +5192,12 @@ static const WCHAR WC_COMBOBOXW[] = { 'C','o','m','b','o','B','o','x',0 }; #endif #define WC_COMBOBOX WINELIB_NAME_AW(WC_COMBOBOX) +#define CBM_FIRST 0x1700 +#define CB_SETMINVISIBLE (CBM_FIRST + 1) +#define CB_GETMINVISIBLE (CBM_FIRST + 2) +#define CB_SETCUEBANNER (CBM_FIRST + 3) +#define CB_GETCUEBANNER (CBM_FIRST + 4) + /************************************************************************** * Edit control */ @@ -5161,6 +5212,24 @@ static const WCHAR WC_EDITW[] = { 'E','d','i','t',0 }; #endif #define WC_EDIT WINELIB_NAME_AW(WC_EDIT) +typedef struct _tagEDITBALLOONTIP +{ + DWORD cbStruct; + LPCWSTR pszTitle; + LPCWSTR pszText; + INT ttiIcon; +} EDITBALLOONTIP, *PEDITBALLOONTIP; + +#define ECM_FIRSP 0x1500 +#define EM_SETCUEBANNER (ECM_FIRST + 1) +#define EM_GETCUEBANNER (ECM_FIRST + 2) +#define EM_SHOWBALLOONTIP (ECM_FIRST + 3) +#define EM_HIDEBALLOONTIP (ECM_FIRST + 4) +#define EM_SETHILITE (ECM_FIRST + 5) +#define EM_GETHILITE (ECM_FIRST + 6) +#define EM_NOSETFOCUS (ECM_FIRST + 7) +#define EM_TAKEFOCUS (ECM_FIRST + 8) + /************************************************************************** * Listbox control */

1 0