October 2016 - Wine-commits

Jacek Caban : mshtml: Fixed OnStopBinding if it' s called called after we aborted document binding.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: 9a82df1863dbb366446d299e029c670623c76b31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a82df1863dbb366446d299e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 27 13:43:32 2016 +0200 mshtml: Fixed OnStopBinding if it's called called after we aborted document binding. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b0c759a3b91e2c7b5934b18f0faaecdcc6254bf7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/navigate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index ed61ab0..38220ac 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1388,10 +1388,10 @@ static HRESULT nsChannelBSC_stop_binding(BSCallback *bsc, HRESULT result) { nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); - if(result != E_ABORT) { + if(result != E_ABORT && This->is_doc_channel && This->bsc.window) { if(FAILED(result)) handle_navigation_error(This, result); - else if(This->is_doc_channel && This->nschannel) { + else if(This->nschannel) { result = async_stop_request(This); if(SUCCEEDED(result)) return S_OK;

1 0

Nikolay Sivov : dbghelp: Recognize DW_FORM_flag_present.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: 23c24693ddee41b5c758f2e9e3ddc9ea1d4252a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23c24693ddee41b5c758f2e9e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 26 03:08:17 2016 +0300 dbghelp: Recognize DW_FORM_flag_present. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 99f56bf78d68684bd066d599792cec19885c9bee) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dbghelp/dwarf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 655c586..dcbcf0a 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -462,6 +462,7 @@ static void dwarf2_swallow_attribute(dwarf2_traverse_context_t* ctx, switch (abbrev_attr->form) { + case DW_FORM_flag_present: step = 0; break; case DW_FORM_ref_addr: case DW_FORM_addr: step = ctx->word_size; break; case DW_FORM_flag: @@ -509,6 +510,11 @@ static void dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, TRACE("flag<0x%lx>\n", attr->u.uvalue); break; + case DW_FORM_flag_present: + attr->u.uvalue = 1; + TRACE("flag_present\n"); + break; + case DW_FORM_data1: attr->u.uvalue = dwarf2_get_byte(data); TRACE("data1<%lu>\n", attr->u.uvalue);

1 0

André Hentschel : winspool: Implement SetPrinterW for level 8.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: 1f09831eb0744204e8bb4430c81c3cfb1707ef33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f09831eb0744204e8bb4430c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 25 21:08:54 2016 +0200 winspool: Implement SetPrinterW for level 8. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 88c77da35d2a4e443886e89be7ee16994d1605e7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winspool.drv/info.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 8ad9756..c3dd2f9 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3488,6 +3488,10 @@ BOOL WINAPI SetPrinterW( HANDLE printer, DWORD level, LPBYTE data, DWORD command break; } + case 8: + /* 8 is the global default printer info and 9 already sets it instead of the per-user one */ + /* still, PRINTER_INFO_8W is the same as PRINTER_INFO_9W */ + /* fall through */ case 9: { PRINTER_INFO_9W *pi = (PRINTER_INFO_9W *)data;

1 0

André Hentschel : hal: Add WRITE_PORT_UCHAR stub.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: 1e5bc9090a599a8c41633773eca725c0f6a817f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e5bc9090a599a8c41633773e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 16 22:30:20 2016 +0200 hal: Add WRITE_PORT_UCHAR stub. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9087404a13d92dc6cd559a2cedaba853ed651a08) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hal/hal.c | 5 +++++ dlls/hal/hal.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 0b2e422..9cae67e 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -168,6 +168,11 @@ ULONG WINAPI READ_PORT_ULONG(ULONG *port) return 0; } +void WINAPI WRITE_PORT_UCHAR(UCHAR *port, UCHAR value) +{ + FIXME("(%p %d) stub!\n", port, value); +} + void WINAPI WRITE_PORT_ULONG(ULONG *port, ULONG value) { FIXME("(%p %d) stub!\n", port, value); diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index c21806c..bd6bc35 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -87,6 +87,6 @@ @ stub WRITE_PORT_BUFFER_UCHAR @ stub WRITE_PORT_BUFFER_ULONG @ stub WRITE_PORT_BUFFER_USHORT -@ stub WRITE_PORT_UCHAR +@ stdcall WRITE_PORT_UCHAR(ptr long) @ stdcall WRITE_PORT_ULONG(ptr long) @ stub WRITE_PORT_USHORT

1 0

Nikolay Sivov : oledb32: Support quoted values in initialisation strings.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: 2a88eb97161901535c06c0384b53b0bf74bd4eaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a88eb97161901535c06c0384… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 9 10:36:22 2016 +0300 oledb32: Support quoted values in initialisation strings. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 85c6afe4cec71a26dbfce7c6ac8d66205a2deb43) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oledb32/datainit.c | 24 ++++++++++++++++++++---- dlls/oledb32/tests/database.c | 4 ++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 1ba0cb1..42d5dae 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -401,17 +401,33 @@ static HRESULT parse_init_string(const WCHAR *initstring, struct dbprops *props) while (start && (eq = strchrW(start, '='))) { static const WCHAR providerW[] = {'P','r','o','v','i','d','e','r',0}; - WCHAR *scol = strchrW(eq+1, ';'); BSTR value, name; + WCHAR *delim; name = SysAllocStringLen(start, eq - start); /* skip equal sign to get value */ eq++; - value = SysAllocStringLen(eq, scol ? scol - eq : -1); + + if (*eq == '"') + { + /* for quoted value string, skip opening mark, look for terminating one */ + eq++; + delim = strchrW(eq, '"'); + } + else + delim = strchrW(eq, ';'); + + value = SysAllocStringLen(eq, delim ? delim - eq : -1); /* skip semicolon if present */ - if (scol) scol++; - start = scol; + if (delim) + { + if (*delim == '"') + delim++; + if (*delim == ';') + delim++; + } + start = delim; if (!strcmpiW(name, providerW)) { diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 483454e..8c531e4 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -291,6 +291,9 @@ static void test_database(void) static WCHAR initstring_lower[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','d','u','m','m','y',';',0}; static WCHAR customprop[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','d','u','m','m','y',';', 'c','u','s','t','o','m','p','r','o','p','=','1','2','3','.','4',';',0}; + static WCHAR extended_prop[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','d','u','m','m','y',';', + 'E','x','t','e','n','d','e','d',' ','P','r','o','p','e','r','t','i','e','s','=','\"','D','R','I','V','E','R','=','A', + ' ','W','i','n','e',' ','O','D','B','C',' ','d','r','i','v','e','r',';','U','I','D','=','w','i','n','e',';','\"',';',0}; IDataInitialize *datainit = NULL; HRESULT hr; @@ -307,6 +310,7 @@ static void test_database(void) test_GetDataSource(initstring_default); test_GetDataSource(initstring_lower); test_GetDataSource2(customprop); + test_GetDataSource2(extended_prop); } static void test_errorinfo(void)

1 0

Nikolay Sivov : setupapi: Added CM_Get_Version().
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: 5fd513741b3aa0d93b307e393ecddf86de67f792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd513741b3aa0d93b307e393… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 11 00:30:51 2016 +0300 setupapi: Added CM_Get_Version(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit af533d1eebd382d7ee72eaaef1cf7461356da9e5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/cfgmgr32/cfgmgr32.spec | 2 +- dlls/setupapi/misc.c | 9 +++++++++ dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/tests/misc.c | 10 ++++++++++ include/cfgmgr32.h | 1 + 5 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 90a05ab..116180c 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -114,7 +114,7 @@ @ stub CM_Get_Res_Des_Data_Size_Ex @ stub CM_Get_Sibling @ stub CM_Get_Sibling_Ex -@ stub CM_Get_Version +@ stdcall CM_Get_Version() setupapi.CM_Get_Version @ stub CM_Get_Version_Ex @ stub CM_Intersect_Range_List @ stub CM_Invert_Range_List diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index de73966..98a6ed7 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -1751,3 +1751,12 @@ BOOL WINAPI SetupLogErrorW(LPCWSTR message, LogSeverity severity) HeapFree(GetProcessHeap(), 0, msg); return ret; } + +/*********************************************************************** + * CM_Get_Version (SETUPAPI.@) + */ +WORD WINAPI CM_Get_Version(void) +{ + TRACE("()\n"); + return 0x0400; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 29065fc..9e4ad7c 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -125,7 +125,7 @@ @ stub CM_Get_Res_Des_Data_Size_Ex @ stub CM_Get_Sibling @ stub CM_Get_Sibling_Ex -@ stub CM_Get_Version +@ stdcall CM_Get_Version() @ stub CM_Get_Version_Ex @ stub CM_Intersect_Range_List @ stub CM_Invert_Range_List diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 09e0fb8..04b2171 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -29,6 +29,7 @@ #include "winuser.h" #include "winreg.h" #include "setupapi.h" +#include "cfgmgr32.h" #include "wine/test.h" @@ -816,6 +817,14 @@ static void test_SetupLogError(void) SetupCloseLog(); } +static void test_CM_Get_Version(void) +{ + WORD ret; + + ret = CM_Get_Version(); + ok(ret == 0x0400, "got version %#x\n", ret); +} + START_TEST(misc) { HMODULE hsetupapi = GetModuleHandleA("setupapi.dll"); @@ -849,4 +858,5 @@ START_TEST(misc) test_defaultcallback(); test_SetupLogError(); + test_CM_Get_Version(); } diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index e3966f9..7dc31e1 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -192,6 +192,7 @@ CMAPI CONFIGRET WINAPI CM_Get_Device_ID_List_ExW(PCWSTR,PWCHAR,ULONG,ULONG,HMACH #define CM_Get_Device_ID_List_Ex WINELIB_NAME_AW(CM_Get_Device_ID_List_Ex) CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size(PULONG,DEVINST,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex(PULONG,DEVINST,ULONG,HMACHINE); +CMAPI WORD WINAPI CM_Get_Version(void); CMAPI CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST,DEVINSTID_A,ULONG); CMAPI CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST,DEVINSTID_W,ULONG); #define CM_Locate_DevNode WINELIB_NAME_AW(CM_Locate_DevNode)

1 0

Matt Robinson : ntdll: Catch page fault in RtlWow64EnableFsRedirectionEx.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: 36932d220f08c475819f6b189be4bdfe4bfda786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36932d220f08c475819f6b189… Author: Matt Robinson <git(a)nerdoftheherd.com> Date: Sat Aug 6 23:00:21 2016 +0100 ntdll: Catch page fault in RtlWow64EnableFsRedirectionEx. Signed-off-by: Matt Robinson <git(a)nerdoftheherd.com> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4a6bd3d2008f6ab4d91fcbeb6c410099932c97e7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/directory.c | 13 +++++++++++-- dlls/ntdll/tests/directory.c | 2 ++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 0902759..49855dd 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -106,6 +106,7 @@ #include "wine/list.h" #include "wine/library.h" #include "wine/debug.h" +#include "wine/exception.h" WINE_DEFAULT_DEBUG_CHANNEL(file); @@ -3242,9 +3243,17 @@ NTSTATUS WINAPI RtlWow64EnableFsRedirection( BOOLEAN enable ) NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx( ULONG disable, ULONG *old_value ) { if (!is_wow64) return STATUS_NOT_IMPLEMENTED; - if (((ULONG_PTR)old_value >> 16) == 0) return STATUS_ACCESS_VIOLATION; - *old_value = !ntdll_get_thread_data()->wow64_redir; + __TRY + { + *old_value = !ntdll_get_thread_data()->wow64_redir; + } + __EXCEPT_PAGE_FAULT + { + return STATUS_ACCESS_VIOLATION; + } + __ENDTRY + ntdll_get_thread_data()->wow64_redir = !disable; return STATUS_SUCCESS; } diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index 7b1002a..ec170b2 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -444,6 +444,8 @@ static void test_redirection(void) ok( status == STATUS_ACCESS_VIOLATION, "RtlWow64EnableFsRedirectionEx failed with status %x\n", status ); status = pRtlWow64EnableFsRedirectionEx( TRUE, (void*)1 ); ok( status == STATUS_ACCESS_VIOLATION, "RtlWow64EnableFsRedirectionEx failed with status %x\n", status ); + status = pRtlWow64EnableFsRedirectionEx( TRUE, (void*)0xDEADBEEF ); + ok( status == STATUS_ACCESS_VIOLATION, "RtlWow64EnableFsRedirectionEx failed with status %x\n", status ); status = pRtlWow64EnableFsRedirection( FALSE ); ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status );

1 0

Joerg Schiermeier : loader/wine.inf: Correct wrong symlink.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: d2d979cb290d81487cea1a847e3964bdfaba423f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d979cb290d81487cea1a847… Author: Joerg Schiermeier <mywine(a)Schiermeier-IT.de> Date: Wed Aug 10 15:07:05 2016 +0200 loader/wine.inf: Correct wrong symlink. Signed-off-by: Joerg Schiermeier <mywine(a)Schiermeier-IT.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 989bb04495ba6069552727995b333abc15f0e62f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index ce51168..2039798 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3311,7 +3311,7 @@ HKLM,Software\Wow6432Node\Microsoft\Notepad\DefaultFonts,"SymbolicLinkValue",0x6 HKLM,Software\Wow6432Node\Microsoft\OLE,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\OLE" HKLM,Software\Wow6432Node\Microsoft\RAS,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\RAS" HKLM,Software\Wow6432Node\Microsoft\RPC,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\RPC" -HKLM,Software\Wow6432Node\Microsoft\Software\Microsoft\Shared Tools\MSInfo,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Software\Microsoft\Shared Tools\MSInfo" +HKLM,Software\Wow6432Node\Microsoft\Software\Microsoft\Shared Tools\MSInfo,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Shared Tools\MSInfo" HKLM,Software\Wow6432Node\Microsoft\SystemCertificates,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\SystemCertificates" HKLM,Software\Wow6432Node\Microsoft\TermServLicensing,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\TermServLicensing" HKLM,Software\Wow6432Node\Microsoft\Transaction Server,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Transaction Server"

1 0

Nikolay Sivov : user32: Handle invalid dialog handles in IsDialogMessage() .
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: ca8f2d9e0e46b9cf8bbb2d2da74ed5d843db32cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca8f2d9e0e46b9cf8bbb2d2da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 16 10:38:32 2016 +0300 user32: Handle invalid dialog handles in IsDialogMessage(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 17987c589fc4587b0adfb9de841adf1201efa111) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/dialog.c | 3 +++ dlls/user32/tests/dialog.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 8df38c9..38e4053 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1176,6 +1176,9 @@ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) { INT dlgCode = 0; + if (!IsWindow( hwndDlg )) + return FALSE; + if (CallMsgFilterW( msg, MSGF_DIALOGBOX )) return TRUE; hwndDlg = WIN_GetFullHandle( hwndDlg ); diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 3488f31..bbe8e47 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -719,8 +719,23 @@ static void test_WM_NEXTDLGCTL(void) DestroyWindow(g_hwndTestDlg); } +static LRESULT CALLBACK hook_proc(INT code, WPARAM wParam, LPARAM lParam) +{ + ok(0, "unexpected hook called, code %d\n", code); + return CallNextHookEx(NULL, code, wParam, lParam); +} + +static BOOL g_MSGF_DIALOGBOX; +static LRESULT CALLBACK hook_proc2(INT code, WPARAM wParam, LPARAM lParam) +{ + ok(code == MSGF_DIALOGBOX, "unexpected hook called, code %d\n", code); + g_MSGF_DIALOGBOX = code == MSGF_DIALOGBOX; + return CallNextHookEx(NULL, code, wParam, lParam); +} + static void test_IsDialogMessage(void) { + HHOOK hook; MSG msg; g_hwndMain = CreateWindowA("IsDialogMessageWindowClass", "IsDialogMessageWindowClass", @@ -732,11 +747,34 @@ static void test_IsDialogMessage(void) assert (g_hwndButton1); assert (g_hwndButtonCancel); + if (0) + { + /* crashes on Windows */ + IsDialogMessageA(NULL, NULL); + IsDialogMessageA(g_hwndMain, NULL); + } + /* The focus should initially be nowhere. The first TAB should take it * to the first button. The second TAB should take it to the Cancel * button. */ + + /* valid window, invalid message window */ + hook = SetWindowsHookExA(WH_MSGFILTER, hook_proc2, NULL, GetCurrentThreadId()); + FormTabMsg (&msg, (HWND)0xbeefbeef); + ok (!IsDialogMessageA(g_hwndMain, &msg), "expected failure\n"); + ok(g_MSGF_DIALOGBOX, "hook wasn't called\n"); + g_MSGF_DIALOGBOX = FALSE; + UnhookWindowsHookEx(hook); + + hook = SetWindowsHookExA(WH_MSGFILTER, hook_proc, NULL, GetCurrentThreadId()); FormTabMsg (&msg, g_hwndMain); + + ok (!IsDialogMessageA(NULL, &msg), "expected failure\n"); + ok (!IsDialogMessageA((HWND)0xbeefbeef, &msg), "expected failure\n"); + + UnhookWindowsHookEx(hook); + ok (IsDialogMessageA(g_hwndMain, &msg), "Did not handle first TAB\n"); ok ((GetFocus() == g_hwndButton1), "Focus did not move to first button\n"); FormTabMsg (&msg, g_hwndButton1); @@ -746,6 +784,18 @@ static void test_IsDialogMessage(void) FormEnterMsg (&msg, g_hwndButtonCancel); ok (IsDialogMessageA(g_hwndMain, &msg), "Did not handle the ENTER\n"); ok (g_terminated, "ENTER did not terminate\n"); + + /* matching but invalid window handles, NULL */ + hook = SetWindowsHookExA(WH_MSGFILTER, hook_proc, NULL, GetCurrentThreadId()); + + FormTabMsg (&msg, NULL); + ok (!IsDialogMessageA(msg.hwnd, &msg), "expected failure\n"); + + /* matching but invalid window handles, not NULL */ + FormTabMsg (&msg, (HWND)0xbeefbeef); + ok (!IsDialogMessageA(msg.hwnd, &msg), "expected failure\n"); + + UnhookWindowsHookEx(hook); }

1 0

Kenneth Haley : v4 resend: Riched20: allow setting background text color.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: 486752a5fe14d66c0bc36f7a551c251943a1b3fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=486752a5fe14d66c0bc36f7a5… Author: Kenneth Haley <haleykd(a)users.sf.net> Date: Mon Aug 15 13:03:07 2016 -0600 v4 resend: Riched20: allow setting background text color. Signed-off-by: Kenneth Haley <haleykd(a)users.sf.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fc1b2e0473d26ecb37575edae139e3a684e3d1c8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/riched20/editor.c | 2 +- dlls/riched20/paint.c | 43 ++++++++++++++++++++++++++++++++++++------- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 49cfbb8..d6c606e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -489,7 +489,7 @@ void ME_RTFCharAttrHook(RTF_Info *info) { RTFColor *c = RTFGetColor(info, info->rtfParam); if (c && c->rtfCBlue >= 0) - fmt.crTextColor = (c->rtfCBlue<<16)|(c->rtfCGreen<<8)|(c->rtfCRed); + fmt.crBackColor = (c->rtfCBlue<<16)|(c->rtfCGreen<<8)|(c->rtfCRed); else fmt.dwEffects = CFE_AUTOBACKCOLOR; } diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index f893061..be6e5d2 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -201,6 +201,21 @@ static COLORREF get_text_color( ME_Context *c, ME_Style *style, BOOL highlight ) return color; } +static COLORREF get_back_color( ME_Context *c, ME_Style *style, BOOL highlight ) +{ + COLORREF color; + + if (highlight) + color = ITextHost_TxGetSysColor( c->editor->texthost, COLOR_HIGHLIGHT ); + else if ( (style->fmt.dwMask & CFM_BACKCOLOR) + && !(style->fmt.dwEffects & CFE_AUTOBACKCOLOR) ) + color = style->fmt.crBackColor; + else + color = ITextHost_TxGetSysColor( c->editor->texthost, COLOR_WINDOW ); + + return color; +} + static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen ) { *pen = NULL; @@ -313,14 +328,17 @@ static void get_selection_rect( ME_Context *c, ME_Run *run, int from, int to, in return; } - static void draw_text( ME_Context *c, ME_Run *run, int x, int y, BOOL selected, RECT *sel_rect ) { COLORREF text_color = get_text_color( c, run->style, selected ); - COLORREF back_color = selected ? ITextHost_TxGetSysColor( c->editor->texthost, COLOR_HIGHLIGHT ) : 0; + COLORREF back_color = get_back_color( c, run->style, selected ); COLORREF old_text, old_back = 0; const WCHAR *text = get_text( run, 0 ); ME_String *masked = NULL; + const BOOL paint_bg = ( selected + || ( ( run->style->fmt.dwMask & CFM_BACKCOLOR ) + && !(CFE_AUTOBACKCOLOR & run->style->fmt.dwEffects) ) + ); if (c->editor->cPasswordMask) { @@ -329,16 +347,16 @@ static void draw_text( ME_Context *c, ME_Run *run, int x, int y, BOOL selected, } old_text = SetTextColor( c->hDC, text_color ); - if (selected) old_back = SetBkColor( c->hDC, back_color ); + if (paint_bg) old_back = SetBkColor( c->hDC, back_color ); if (run->para->nFlags & MEPF_COMPLEX) - ScriptTextOut( c->hDC, &run->style->script_cache, x, y, selected ? ETO_OPAQUE : 0, sel_rect, + ScriptTextOut( c->hDC, &run->style->script_cache, x, y, paint_bg ? ETO_OPAQUE : 0, sel_rect, &run->script_analysis, NULL, 0, run->glyphs, run->num_glyphs, run->advances, NULL, run->offsets ); else - ExtTextOutW( c->hDC, x, y, selected ? ETO_OPAQUE : 0, sel_rect, text, run->len, NULL ); + ExtTextOutW( c->hDC, x, y, paint_bg ? ETO_OPAQUE : 0, sel_rect, text, run->len, NULL ); - if (selected) SetBkColor( c->hDC, old_back ); + if (paint_bg) SetBkColor( c->hDC, old_back ); SetTextColor( c->hDC, old_text ); draw_underline( c, run, x, y, text_color ); @@ -387,7 +405,18 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, hOldFont = ME_SelectStyleFont( c, run->style ); if (sel_rgn) ExtSelectClipRgn( hDC, sel_rgn, RGN_DIFF ); - draw_text( c, run, x, y - yOffset, FALSE, NULL ); + + if (!(run->style->fmt.dwEffects & CFE_AUTOBACKCOLOR) + && (run->style->fmt.dwMask & CFM_BACKCOLOR) ) + { + RECT tmp_rect; + get_selection_rect( c, run, 0, run->len, cy, &tmp_rect ); + OffsetRect( &tmp_rect, x, ymin ); + draw_text( c, run, x, y - yOffset, FALSE, &tmp_rect ); + } + else + draw_text( c, run, x, y - yOffset, FALSE, NULL ); + if (sel_rgn) { ExtSelectClipRgn( hDC, clip, RGN_COPY );

1 0