winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
July 2022
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
1 participants
639 discussions
Start a n
N
ew thread
Zhiyi Zhang : shell32: Correctly check SVSI_EDIT.
by Alexandre Julliard
15 Jul '22
15 Jul '22
Module: wine Branch: master Commit: 1ee38eafd88db8d396195dee81bf3cf9d54ef013 URL:
https://gitlab.winehq.org/wine/wine/-/commit/1ee38eafd88db8d396195dee81bf3c…
Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 8 16:59:17 2022 +0800 shell32: Correctly check SVSI_EDIT. The value of SVSI_EDIT is 0x3. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/shell32/shlview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 2e557d79622..e2b4ae4c9ca 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -2873,7 +2873,7 @@ static HRESULT WINAPI FolderView_SelectItem(IFolderView2 *iface, int item, DWORD SendMessageW(This->hWndList, LVM_SETITEMSTATE, item, (LPARAM)&lvItem); - if (flags & SVSI_EDIT) + if ((flags & SVSI_EDIT) == SVSI_EDIT) SendMessageW(This->hWndList, LVM_EDITLABELW, item, 0); return S_OK;
1
0
0
0
Dmitry Timoshkov : winspool.drv: Implement OpenPrinter2.
by Alexandre Julliard
15 Jul '22
15 Jul '22
Module: wine Branch: master Commit: f81c82d49ecc0d98881cd22b02f11a76f501148c URL:
https://gitlab.winehq.org/wine/wine/-/commit/f81c82d49ecc0d98881cd22b02f11a…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 15 13:53:58 2022 +0300 winspool.drv: Implement OpenPrinter2. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 96 ++++++++++++++++++++++++------------- dlls/winspool.drv/winspool.drv.spec | 2 + include/winspool.h | 29 ++++++++++- 3 files changed, 92 insertions(+), 35 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 482f70a2235..e1cd0338207 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1990,32 +1990,9 @@ BOOL WINAPI IsValidDevmodeW(PDEVMODEW dm, SIZE_T size) * See OpenPrinterW. * */ -BOOL WINAPI OpenPrinterA(LPSTR lpPrinterName,HANDLE *phPrinter, - LPPRINTER_DEFAULTSA pDefault) +BOOL WINAPI OpenPrinterA(LPSTR name, HANDLE *printer, PRINTER_DEFAULTSA *defaults) { - UNICODE_STRING lpPrinterNameW; - UNICODE_STRING usBuffer; - PRINTER_DEFAULTSW DefaultW, *pDefaultW = NULL; - PWSTR pwstrPrinterNameW; - BOOL ret; - - TRACE("%s,%p,%p\n", debugstr_a(lpPrinterName), phPrinter, pDefault); - - pwstrPrinterNameW = asciitounicode(&lpPrinterNameW,lpPrinterName); - - if(pDefault) { - DefaultW.pDatatype = asciitounicode(&usBuffer,pDefault->pDatatype); - DefaultW.pDevMode = pDefault->pDevMode ? GdiConvertToDevmodeW(pDefault->pDevMode) : NULL; - DefaultW.DesiredAccess = pDefault->DesiredAccess; - pDefaultW = &DefaultW; - } - ret = OpenPrinterW(pwstrPrinterNameW, phPrinter, pDefaultW); - if(pDefault) { - RtlFreeUnicodeString(&usBuffer); - HeapFree(GetProcessHeap(), 0, DefaultW.pDevMode); - } - RtlFreeUnicodeString(&lpPrinterNameW); - return ret; + return OpenPrinter2A(name, printer, defaults, NULL); } /****************************************************************** @@ -2045,22 +2022,73 @@ BOOL WINAPI OpenPrinterA(LPSTR lpPrinterName,HANDLE *phPrinter, *| pDefaults is ignored * */ -BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAULTSW pDefault) +BOOL WINAPI OpenPrinterW(LPWSTR name, HANDLE *printer, PRINTER_DEFAULTSW *defaults) +{ + return OpenPrinter2W(name, printer, defaults, NULL); +} + +BOOL WINAPI OpenPrinter2A(LPSTR name, HANDLE *printer, + PRINTER_DEFAULTSA *defaults, PRINTER_OPTIONSA *options) +{ + UNICODE_STRING nameU; + UNICODE_STRING datatypeU; + PRINTER_DEFAULTSW defaultsW, *p_defaultsW = NULL; + PRINTER_OPTIONSW optionsW, *p_optionsW = NULL; + WCHAR *nameW; + BOOL ret; + + TRACE("(%s,%p,%p,%p)\n", debugstr_a(name), printer, defaults, options); + + nameW = asciitounicode(&nameU, name); + + if (options) + { + optionsW.cbSize = sizeof(optionsW); + optionsW.dwFlags = options->dwFlags; + p_optionsW = &optionsW; + } + + if (defaults) + { + defaultsW.pDatatype = asciitounicode(&datatypeU, defaults->pDatatype); + defaultsW.pDevMode = defaults->pDevMode ? GdiConvertToDevmodeW(defaults->pDevMode) : NULL; + defaultsW.DesiredAccess = defaults->DesiredAccess; + p_defaultsW = &defaultsW; + } + + ret = OpenPrinter2W(nameW, printer, p_defaultsW, p_optionsW); + + if (p_defaultsW) + { + RtlFreeUnicodeString(&datatypeU); + HeapFree(GetProcessHeap(), 0, defaultsW.pDevMode); + } + RtlFreeUnicodeString(&nameU); + + return ret; +} + +BOOL WINAPI OpenPrinter2W(LPWSTR name, HANDLE *printer, + PRINTER_DEFAULTSW *defaults, PRINTER_OPTIONSW *options) { HKEY key; - TRACE("(%s, %p, %p)\n", debugstr_w(lpPrinterName), phPrinter, pDefault); + TRACE("(%s,%p,%p,%p)\n", debugstr_w(name), printer, defaults, options); - if(!phPrinter) { + if (options) + FIXME("flags %08lx ignored\n", options->dwFlags); + + if(!printer) + { /* NT: FALSE with ERROR_INVALID_PARAMETER, 9x: TRUE */ - SetLastError(ERROR_INVALID_PARAMETER); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } /* Get the unique handle of the printer or Printserver */ - *phPrinter = get_opened_printer_entry(lpPrinterName, pDefault); + *printer = get_opened_printer_entry( name, defaults ); - if (*phPrinter && WINSPOOL_GetOpenedPrinterRegKey( *phPrinter, &key ) == ERROR_SUCCESS) + if (*printer && WINSPOOL_GetOpenedPrinterRegKey( *printer, &key ) == ERROR_SUCCESS) { DWORD deleting = 0, size = sizeof( deleting ), type; DWORD status; @@ -2070,12 +2098,12 @@ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAU set_reg_DWORD( key, L"Status", status & ~PRINTER_STATUS_DRIVER_UPDATE_NEEDED ); ReleaseMutex( init_mutex ); if (!deleting && (status & PRINTER_STATUS_DRIVER_UPDATE_NEEDED)) - update_driver( *phPrinter ); + update_driver( *printer ); RegCloseKey( key ); } - TRACE("returning %d with %lu and %p\n", *phPrinter != NULL, GetLastError(), *phPrinter); - return (*phPrinter != 0); + TRACE("returning %d with %lu and %p\n", *printer != NULL, GetLastError(), *printer); + return (*printer != NULL); } /****************************************************************** diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec index d7bb49bd34b..39c2613a4a0 100644 --- a/dlls/winspool.drv/winspool.drv.spec +++ b/dlls/winspool.drv/winspool.drv.spec @@ -149,6 +149,8 @@ @ stdcall IsValidDevmodeW(ptr long) @ stdcall OpenPrinterA(str ptr ptr) @ stdcall OpenPrinterW(wstr ptr ptr) +@ stdcall OpenPrinter2A(str ptr ptr ptr) +@ stdcall OpenPrinter2W(wstr ptr ptr ptr) @ stdcall PerfClose() @ stdcall PerfCollect(wstr ptr ptr ptr) @ stdcall PerfOpen(wstr) diff --git a/include/winspool.h b/include/winspool.h index db8773ec418..ef39104ea30 100644 --- a/include/winspool.h +++ b/include/winspool.h @@ -1143,6 +1143,30 @@ typedef struct _BIDI_RESPONSE_CONTAINER { BIDI_RESPONSE_DATA aData[1]; } BIDI_RESPONSE_CONTAINER, *LPBIDI_RESPONSE_CONTAINER, *PBIDI_RESPONSE_CONTAINER; +typedef enum _PRINTER_OPTION_FLAGS +{ + PRINTER_OPTION_NO_CACHE = 1 << 0, + PRINTER_OPTION_CACHE = 1 << 1, + PRINTER_OPTION_CLIENT_CHANGE = 1 << 2, + PRINTER_OPTION_NO_CLIENT_DATA = 1 << 3, +} PRINTER_OPTION_FLAGS; + +typedef struct _PRINTER_OPTIONSA +{ + UINT cbSize; + DWORD dwFlags; +} PRINTER_OPTIONSA, *PPRINTER_OPTIONSA, *LPPRINTER_OPTIONSA; + +typedef struct _PRINTER_OPTIONSW +{ + UINT cbSize; + DWORD dwFlags; +} PRINTER_OPTIONSW, *PPRINTER_OPTIONSW, *LPPRINTER_OPTIONSW; + +DECL_WINELIB_TYPE_AW(PRINTER_OPTIONS) +DECL_WINELIB_TYPE_AW(PPRINTER_OPTIONS) +DECL_WINELIB_TYPE_AW(LPPRINTER_OPTIONS) + /* string constants */ #define SPLREG_DEFAULT_SPOOL_DIRECTORYA "DefaultSpoolDirectory" @@ -1400,9 +1424,12 @@ BOOL WINAPI OpenPrinterA(LPSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAULTSA pDefault); BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAULTSW pDefault); - #define OpenPrinter WINELIB_NAME_AW(OpenPrinter) +BOOL WINAPI OpenPrinter2A(LPSTR,HANDLE *,PRINTER_DEFAULTSA *,PRINTER_OPTIONSA *); +BOOL WINAPI OpenPrinter2W(LPWSTR,HANDLE *,PRINTER_DEFAULTSW *,PRINTER_OPTIONSW *); +#define OpenPrinter2 WINELIB_NAME_AW(OpenPrinter2) + BOOL WINAPI ResetPrinterA(HANDLE hPrinter, LPPRINTER_DEFAULTSA pDefault); BOOL WINAPI ResetPrinterW(HANDLE hPrinter, LPPRINTER_DEFAULTSW pDefault); #define ResetPrinter WINELIB_NAME_AW(ResetPrinter)
1
0
0
0
Jacek Caban : win32u: Move default window proc to IME window forwarding implementation from user32.
by Alexandre Julliard
15 Jul '22
15 Jul '22
Module: wine Branch: master Commit: 70ad65d8d19fa354e3bdfdab362cb7a154f75f75 URL:
https://gitlab.winehq.org/wine/wine/-/commit/70ad65d8d19fa354e3bdfdab362cb7…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 15 13:00:51 2022 +0200 win32u: Move default window proc to IME window forwarding implementation from user32. --- dlls/user32/defwnd.c | 35 ----------------------------------- dlls/win32u/defwnd.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 35 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 70d62c4f718..9e258e5d3c0 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -147,23 +147,6 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam } } /* fall through */ - case WM_IME_STARTCOMPOSITION: - case WM_IME_ENDCOMPOSITION: - case WM_IME_SELECT: - case WM_IME_NOTIFY: - case WM_IME_CONTROL: - { - HWND hwndIME = ImmGetDefaultIMEWnd( hwnd ); - if (hwndIME) - result = SendMessageA( hwndIME, msg, wParam, lParam ); - } - break; - case WM_IME_SETCONTEXT: - { - HWND hwndIME = ImmGetDefaultIMEWnd( hwnd ); - if (hwndIME) result = ImmIsUIMessageA( hwndIME, msg, wParam, lParam ); - } - break; default: result = NtUserMessageCall( hwnd, msg, wParam, lParam, 0, NtUserDefWindowProc, TRUE ); @@ -220,13 +203,6 @@ LRESULT WINAPI DefWindowProcW( result = PostMessageW( hwnd, WM_KEYUP, wParam, lParam ); break; - case WM_IME_SETCONTEXT: - { - HWND hwndIME = ImmGetDefaultIMEWnd( hwnd ); - if (hwndIME) result = ImmIsUIMessageW( hwndIME, msg, wParam, lParam ); - } - break; - case WM_IME_COMPOSITION: if (lParam & GCS_RESULTSTR) { @@ -249,17 +225,6 @@ LRESULT WINAPI DefWindowProcW( } } /* fall through */ - case WM_IME_STARTCOMPOSITION: - case WM_IME_ENDCOMPOSITION: - case WM_IME_SELECT: - case WM_IME_NOTIFY: - case WM_IME_CONTROL: - { - HWND hwndIME = ImmGetDefaultIMEWnd( hwnd ); - if (hwndIME) - result = SendMessageW( hwndIME, msg, wParam, lParam ); - } - break; default: result = NtUserMessageCall( hwnd, msg, wParam, lParam, 0, NtUserDefWindowProc, FALSE ); diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 3e42e3b1e22..d271b5b9670 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -2901,6 +2901,21 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, free( win_array ); break; } + + case WM_IME_SETCONTEXT: + case WM_IME_COMPOSITION: + case WM_IME_STARTCOMPOSITION: + case WM_IME_ENDCOMPOSITION: + case WM_IME_SELECT: + case WM_IME_NOTIFY: + case WM_IME_CONTROL: + { + HWND ime_hwnd = get_default_ime_window( hwnd ); + if (ime_hwnd) + result = NtUserMessageCall( ime_hwnd, msg, wparam, lparam, + 0, NtUserSendMessage, ansi ); + } + break; } return result;
1
0
0
0
Jacek Caban : imm32: Select default IME when creating its data.
by Alexandre Julliard
15 Jul '22
15 Jul '22
Module: wine Branch: master Commit: 51f414bdc2dcb07b97570ebffec96369e9e2086f URL:
https://gitlab.winehq.org/wine/wine/-/commit/51f414bdc2dcb07b97570ebffec963…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 15 12:50:30 2022 +0200 imm32: Select default IME when creating its data. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=53348
--- dlls/imm32/imm.c | 55 +++++++++++++++++++++++++------------------------------ 1 file changed, 25 insertions(+), 30 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 89541612ea2..bfbf3b2ad78 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -806,7 +806,7 @@ BOOL WINAPI ImmConfigureIMEW( return FALSE; } -static InputContextData *alloc_input_context_data(void) +static InputContextData *create_input_context(HIMC default_imc) { InputContextData *new_context; LPGUIDELINE gl; @@ -816,6 +816,7 @@ static InputContextData *alloc_input_context_data(void) new_context = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(InputContextData)); /* Load the IME */ + new_context->threadDefault = !!default_imc; new_context->immKbd = IMM_GetImmHkl(GetKeyboardLayout(0)); if (!new_context->immKbd->hIME) @@ -848,6 +849,27 @@ static InputContextData *alloc_input_context_data(void) new_context->IMC.fdwConversion = new_context->immKbd->imeInfo.fdwConversionCaps; new_context->IMC.fdwSentence = new_context->immKbd->imeInfo.fdwSentenceCaps; + if (!default_imc) + new_context->handle = NtUserCreateInputContext((UINT_PTR)new_context); + else if (NtUserUpdateInputContext(default_imc, NtUserInputContextClientPtr, (UINT_PTR)new_context)) + new_context->handle = default_imc; + if (!new_context->handle) + { + free_input_context_data(new_context); + return 0; + } + + if (!new_context->immKbd->pImeSelect(new_context->handle, TRUE)) + { + TRACE("Selection of IME failed\n"); + IMM_DestroyContext(new_context); + return 0; + } + new_context->threadID = GetCurrentThreadId(); + SendMessageW(GetFocus(), WM_IME_SELECT, TRUE, (LPARAM)new_context->immKbd); + + new_context->immKbd->uSelected++; + TRACE("Created context %p\n", new_context); return new_context; } @@ -856,16 +878,7 @@ static InputContextData* get_imc_data(HIMC handle) InputContextData *ret; if ((ret = query_imc_data(handle)) || !handle) return ret; - if (!(ret = alloc_input_context_data())) return NULL; - ret->threadID = NtUserQueryInputContext(handle, NtUserInputContextThreadId); - ret->handle = handle; - ret->threadDefault = TRUE; - if (!NtUserUpdateInputContext(handle, NtUserInputContextClientPtr, (UINT_PTR)ret)) - { - free_input_context_data(ret); - return NULL; - } - return ret; + return create_input_context(handle); } /*********************************************************************** @@ -875,25 +888,7 @@ HIMC WINAPI ImmCreateContext(void) { InputContextData *new_context; - if (!(new_context = alloc_input_context_data())) return 0; - if (!(new_context->handle = NtUserCreateInputContext((UINT_PTR)new_context))) - { - free_input_context_data(new_context); - return 0; - } - - if (!new_context->immKbd->pImeSelect(new_context->handle, TRUE)) - { - TRACE("Selection of IME failed\n"); - IMM_DestroyContext(new_context); - return 0; - } - new_context->threadID = GetCurrentThreadId(); - SendMessageW(GetFocus(), WM_IME_SELECT, TRUE, (LPARAM)new_context->immKbd); - - new_context->immKbd->uSelected++; - TRACE("Created context %p\n",new_context); - + if (!(new_context = create_input_context(0))) return 0; return new_context->handle; }
1
0
0
0
Ziqing Hui : d2d1/tests: Test ID2D1BorderTransform.
by Alexandre Julliard
15 Jul '22
15 Jul '22
Module: wine Branch: master Commit: c850336cdbb4e07e64b5a0d2ff771729aad69438 URL:
https://gitlab.winehq.org/wine/wine/-/commit/c850336cdbb4e07e64b5a0d2ff7717…
Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jul 7 12:53:37 2022 +0800 d2d1/tests: Test ID2D1BorderTransform. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index fbb35dd0e1b..bbca9139711 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -12328,6 +12328,101 @@ done: release_test_context(&ctx); } +static void test_border_transform(BOOL d3d11) +{ + ID2D1BorderTransform *transform = NULL; + ID2D1EffectContext *effect_context; + D2D1_PROPERTY_BINDING binding; + struct d2d1_test_context ctx; + ID2D1Factory1 *factory; + D2D1_EXTEND_MODE mode; + ID2D1Effect *effect; + UINT input_count; + HRESULT hr; + + if (!init_test_context(&ctx, d3d11)) + return; + + factory = ctx.factory1; + if (!factory) + { + win_skip("ID2D1Factory1 is not supported.\n"); + release_test_context(&ctx); + return; + } + + binding.propertyName = L"Context"; + binding.setFunction = NULL; + binding.getFunction = effect_impl_get_context; + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + effect_xml_b, &binding, 1, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1DeviceContext_CreateEffect(ctx.context, &CLSID_TestEffect, &effect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Effect_GetValueByName(effect, L"Context", + D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Create transform with invalid extend mode */ + hr = ID2D1EffectContext_CreateBorderTransform(effect_context, 0xdeadbeef, 0xdeadbeef, &transform); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr != S_OK) + goto done; + mode = ID2D1BorderTransform_GetExtendModeX(transform); + ok(mode == 0xdeadbeef, "Got unexpected extend mode %u.\n", mode); + mode = ID2D1BorderTransform_GetExtendModeY(transform); + ok(mode == 0xdeadbeef, "Got unexpected extend mode %u.\n", mode); + ID2D1BorderTransform_Release(transform); + + /* Create transform */ + hr = ID2D1EffectContext_CreateBorderTransform(effect_context, D2D1_EXTEND_MODE_CLAMP, D2D1_EXTEND_MODE_WRAP, &transform); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Get extend mode */ + mode = ID2D1BorderTransform_GetExtendModeX(transform); + ok(mode == D2D1_EXTEND_MODE_CLAMP, "Got unexpected extend mode %u.\n", mode); + mode = ID2D1BorderTransform_GetExtendModeY(transform); + ok(mode == D2D1_EXTEND_MODE_WRAP, "Got unexpected extend mode %u.\n", mode); + + /* Input count */ + input_count = ID2D1BorderTransform_GetInputCount(transform); + ok(input_count == 1, "Got unexpected input count %u.\n", input_count); + + /* Set output buffer */ + hr = ID2D1BorderTransform_SetOutputBuffer(transform, 0xdeadbeef, D2D1_CHANNEL_DEPTH_DEFAULT); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1BorderTransform_SetOutputBuffer(transform, D2D1_BUFFER_PRECISION_UNKNOWN, 0xdeadbeef); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1BorderTransform_SetOutputBuffer(transform, D2D1_BUFFER_PRECISION_UNKNOWN, D2D1_CHANNEL_DEPTH_DEFAULT); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Set extend mode */ + ID2D1BorderTransform_SetExtendModeX(transform, D2D1_EXTEND_MODE_MIRROR); + mode = ID2D1BorderTransform_GetExtendModeX(transform); + ok(mode == D2D1_EXTEND_MODE_MIRROR, "Got unexpected extend mode %u.\n", mode); + ID2D1BorderTransform_SetExtendModeY(transform, D2D1_EXTEND_MODE_CLAMP); + mode = ID2D1BorderTransform_GetExtendModeY(transform); + ok(mode == D2D1_EXTEND_MODE_CLAMP, "Got unexpected extend mode %u.\n", mode); + + /* Set extend mode with invalid value */ + ID2D1BorderTransform_SetExtendModeX(transform, 0xdeadbeef); + mode = ID2D1BorderTransform_GetExtendModeX(transform); + ok(mode == D2D1_EXTEND_MODE_MIRROR, "Got unexpected extend mode %u.\n", mode); + ID2D1BorderTransform_SetExtendModeY(transform, 0xdeadbeef); + mode = ID2D1BorderTransform_GetExtendModeY(transform); + ok(mode == D2D1_EXTEND_MODE_CLAMP, "Got unexpected extend mode %u.\n", mode); + +done: + if (transform) + ID2D1BorderTransform_Release(transform); + ID2D1Effect_Release(effect); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + release_test_context(&ctx); +} + static void test_stroke_contains_point(BOOL d3d11) { ID2D1TransformedGeometry *transformed_geometry; @@ -13146,6 +13241,7 @@ START_TEST(d2d1) queue_test(test_transform_graph); queue_test(test_offset_transform); queue_test(test_blend_transform); + queue_test(test_border_transform); queue_d3d10_test(test_stroke_contains_point); queue_test(test_image_bounds); queue_test(test_bitmap_map);
1
0
0
0
Ziqing Hui : d2d1/tests: Test ID2D1BlendTransform.
by Alexandre Julliard
15 Jul '22
15 Jul '22
Module: wine Branch: master Commit: 27b64c75193443771dfc5570cbac125dbd4530e0 URL:
https://gitlab.winehq.org/wine/wine/-/commit/27b64c75193443771dfc5570cbac12…
Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jul 7 12:36:19 2022 +0800 d2d1/tests: Test ID2D1BlendTransform. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index ea056ac017b..fbb35dd0e1b 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -12204,6 +12204,130 @@ done: release_test_context(&ctx); } +#define check_blend_desc(blend_desc, expected) check_blend_desc_(__LINE__, blend_desc, expected) +static void check_blend_desc_(unsigned int line, + const D2D1_BLEND_DESCRIPTION *blend_desc, const D2D1_BLEND_DESCRIPTION *expected) +{ + ok_(__FILE__, line)(blend_desc->sourceBlend == expected->sourceBlend, + "Got unexpected source blend %u, expected %u.\n", + blend_desc->sourceBlend, expected->sourceBlend); + ok_(__FILE__, line)(blend_desc->destinationBlend == expected->destinationBlend, + "Got unexpected destination blend %u, expected %u.\n", + blend_desc->destinationBlend, expected->destinationBlend); + ok_(__FILE__, line)(blend_desc->blendOperation == expected->blendOperation, + "Got unexpected blend operation %u, expected %u.\n", + blend_desc->blendOperation, expected->blendOperation); + ok_(__FILE__, line)(blend_desc->sourceBlendAlpha == expected->sourceBlendAlpha, + "Got unexpected source blend alpha %u, expected %u.\n", + blend_desc->sourceBlendAlpha, expected->sourceBlendAlpha); + ok_(__FILE__, line)(blend_desc->destinationBlendAlpha == expected->destinationBlendAlpha, + "Got unexpected destination blend alpha %u, expected %u.\n", + blend_desc->destinationBlendAlpha, expected->destinationBlendAlpha); + ok_(__FILE__, line)(blend_desc->blendOperationAlpha == expected->blendOperationAlpha, + "Got unexpected blend operation alpha %u, expected %u.\n", + blend_desc->blendOperationAlpha, expected->blendOperationAlpha); + ok_(__FILE__, line)(blend_desc->blendFactor[0] == expected->blendFactor[0], + "Got unexpected blendFactor[0] %.8e, expected %.8e.\n", + blend_desc->blendFactor[0], expected->blendFactor[0]); + ok_(__FILE__, line)(blend_desc->blendFactor[1] == expected->blendFactor[1], + "Got unexpected blendFactor[1] %.8e, expected %.8e.\n", + blend_desc->blendFactor[1], expected->blendFactor[1]); + ok_(__FILE__, line)(blend_desc->blendFactor[2] == expected->blendFactor[2], + "Got unexpected blendFactor[2] %.8e, expected %.8e.\n", + blend_desc->blendFactor[2], expected->blendFactor[2]); + ok_(__FILE__, line)(blend_desc->blendFactor[3] == expected->blendFactor[3], + "Got unexpected blendFactor[3] %.8e, expected %.8e.\n", + blend_desc->blendFactor[3], expected->blendFactor[3]); +} + +static void test_blend_transform(BOOL d3d11) +{ + D2D1_BLEND_DESCRIPTION blend_desc, expected= {0}; + ID2D1BlendTransform *transform = NULL; + ID2D1EffectContext *effect_context; + D2D1_PROPERTY_BINDING binding; + struct d2d1_test_context ctx; + ID2D1Factory1 *factory; + ID2D1Effect *effect; + UINT input_count; + HRESULT hr; + + if (!init_test_context(&ctx, d3d11)) + return; + + factory = ctx.factory1; + if (!factory) + { + win_skip("ID2D1Factory1 is not supported.\n"); + release_test_context(&ctx); + return; + } + + binding.propertyName = L"Context"; + binding.setFunction = NULL; + binding.getFunction = effect_impl_get_context; + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + effect_xml_b, &binding, 1, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1DeviceContext_CreateEffect(ctx.context, &CLSID_TestEffect, &effect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Effect_GetValueByName(effect, L"Context", + D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Create transform */ + hr = ID2D1EffectContext_CreateBlendTransform(effect_context, 0, &expected, &transform); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1EffectContext_CreateBlendTransform(effect_context, 1, &expected, &transform); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr != S_OK) + goto done; + ID2D1BlendTransform_Release(transform); + hr = ID2D1EffectContext_CreateBlendTransform(effect_context, 4, &expected, &transform); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Get description */ + ID2D1BlendTransform_GetDescription(transform, &blend_desc); + check_blend_desc(&blend_desc, &expected); + + /* Input count */ + input_count = ID2D1BlendTransform_GetInputCount(transform); + ok(input_count == 4, "Got unexpected input count %u.\n", input_count); + + /* Set output buffer */ + hr = ID2D1BlendTransform_SetOutputBuffer(transform, 0xdeadbeef, D2D1_CHANNEL_DEPTH_DEFAULT); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1BlendTransform_SetOutputBuffer(transform, D2D1_BUFFER_PRECISION_UNKNOWN, 0xdeadbeef); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1BlendTransform_SetOutputBuffer(transform, D2D1_BUFFER_PRECISION_UNKNOWN, D2D1_CHANNEL_DEPTH_DEFAULT); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Set description */ + expected.sourceBlend = D2D1_BLEND_ZERO; + expected.destinationBlend = D2D1_BLEND_ZERO; + expected.blendOperation = D2D1_BLEND_OPERATION_ADD; + expected.sourceBlendAlpha = 0xdeadbeef; + expected.destinationBlendAlpha = 0; + expected.blendOperationAlpha = 12345678; + expected.blendFactor[0] = 0.0f; + expected.blendFactor[1] = 0.0f; + expected.blendFactor[2] = 0.0f; + expected.blendFactor[3] = 0.0f; + ID2D1BlendTransform_SetDescription(transform, &expected); + ID2D1BlendTransform_GetDescription(transform, &blend_desc); + check_blend_desc(&blend_desc, &expected); + +done: + if (transform) + ID2D1BlendTransform_Release(transform); + ID2D1Effect_Release(effect); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + release_test_context(&ctx); +} + static void test_stroke_contains_point(BOOL d3d11) { ID2D1TransformedGeometry *transformed_geometry; @@ -13021,6 +13145,7 @@ START_TEST(d2d1) queue_test(test_registered_effects); queue_test(test_transform_graph); queue_test(test_offset_transform); + queue_test(test_blend_transform); queue_d3d10_test(test_stroke_contains_point); queue_test(test_image_bounds); queue_test(test_bitmap_map);
1
0
0
0
Ziqing Hui : d2d1/tests: Add tests for ID2D1OffsetTransform.
by Alexandre Julliard
15 Jul '22
15 Jul '22
Module: wine Branch: master Commit: 60118154d07136c07d475e185101081d5b920495 URL:
https://gitlab.winehq.org/wine/wine/-/commit/60118154d07136c07d475e18510108…
Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jul 6 15:44:01 2022 +0800 d2d1/tests: Add tests for ID2D1OffsetTransform. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 5be8cdb707d..ea056ac017b 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -12137,6 +12137,73 @@ done: release_test_context(&ctx); } +static void test_offset_transform(BOOL d3d11) +{ + ID2D1OffsetTransform *transform = NULL; + ID2D1EffectContext *effect_context; + D2D1_PROPERTY_BINDING binding; + struct d2d1_test_context ctx; + ID2D1Factory1 *factory; + D2D1_POINT_2L offset; + ID2D1Effect *effect; + UINT input_count; + HRESULT hr; + + if (!init_test_context(&ctx, d3d11)) + return; + + factory = ctx.factory1; + if (!factory) + { + win_skip("ID2D1Factory1 is not supported.\n"); + release_test_context(&ctx); + return; + } + + binding.propertyName = L"Context"; + binding.setFunction = NULL; + binding.getFunction = effect_impl_get_context; + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + effect_xml_b, &binding, 1, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1DeviceContext_CreateEffect(ctx.context, &CLSID_TestEffect, &effect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Effect_GetValueByName(effect, L"Context", + D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Create transform */ + offset.x = 1; + offset.y = 2; + hr = ID2D1EffectContext_CreateOffsetTransform(effect_context, offset, &transform); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr != S_OK) + goto done; + offset = ID2D1OffsetTransform_GetOffset(transform); + ok(offset.x == 1 && offset.y == 2, "Got unexpected offset {%ld, %ld}.\n", offset.x, offset.y); + + /* Input count */ + input_count = ID2D1OffsetTransform_GetInputCount(transform); + ok(input_count == 1, "Got unexpected input count %u.\n", input_count); + + /* Set offset */ + offset.x = -10; + offset.y = 20; + ID2D1OffsetTransform_SetOffset(transform, offset); + offset = ID2D1OffsetTransform_GetOffset(transform); + ok(offset.x == -10 && offset.y == 20, "Got unexpected offset {%ld, %ld}.\n", offset.x, offset.y); + +done: + if (transform) + ID2D1OffsetTransform_Release(transform); + ID2D1Effect_Release(effect); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + release_test_context(&ctx); +} + static void test_stroke_contains_point(BOOL d3d11) { ID2D1TransformedGeometry *transformed_geometry; @@ -12953,6 +13020,7 @@ START_TEST(d2d1) queue_test(test_effect_grayscale); queue_test(test_registered_effects); queue_test(test_transform_graph); + queue_test(test_offset_transform); queue_d3d10_test(test_stroke_contains_point); queue_test(test_image_bounds); queue_test(test_bitmap_map);
1
0
0
0
Ziqing Hui : d2d1/tests: Add tests for ID2D1TransformGraph.
by Alexandre Julliard
15 Jul '22
15 Jul '22
Module: wine Branch: master Commit: ccf8c01804c7b9a485b2ce2e33c1995d9a2c6fb4 URL:
https://gitlab.winehq.org/wine/wine/-/commit/ccf8c01804c7b9a485b2ce2e33c199…
Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jul 6 14:51:18 2022 +0800 d2d1/tests: Add tests for ID2D1TransformGraph. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 143 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 142 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 3a38d593625..5be8cdb707d 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -132,6 +132,9 @@ L"<?xml version='1.0'?> \ <Property name='Integer' type='uint32'> \ <Property name='DisplayName' type='string' value='Integer'/> \ </Property> \ + <Property name='Graph' type='iunknown'> \ + <Property name='DisplayName' type='string' value='Graph'/> \ + </Property> \ </Effect> \ "; @@ -350,6 +353,7 @@ struct effect_impl LONG refcount; UINT integer; ID2D1EffectContext *effect_context; + ID2D1TransformGraph *transform_graph; }; static void queue_d3d1x_test(void (*test)(BOOL d3d11), BOOL d3d11) @@ -10690,6 +10694,7 @@ static HRESULT STDMETHODCALLTYPE effect_impl_Initialize(ID2D1EffectImpl *iface, { struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl(iface); ID2D1EffectContext_AddRef(effect_impl->effect_context = context); + ID2D1TransformGraph_AddRef(effect_impl->transform_graph = graph); return S_OK; } @@ -10724,6 +10729,7 @@ static HRESULT STDMETHODCALLTYPE effect_impl_create(IUnknown **effect_impl) object->refcount = 1; object->integer = 10; object->effect_context = NULL; + object->transform_graph = NULL; *effect_impl = (IUnknown *)&object->ID2D1EffectImpl_iface; return S_OK; @@ -10771,6 +10777,21 @@ static HRESULT STDMETHODCALLTYPE effect_impl_get_context(const IUnknown *iface, return S_OK; } +static HRESULT STDMETHODCALLTYPE effect_impl_get_graph(const IUnknown *iface, + BYTE *data, UINT32 data_size, UINT32 *actual_size) +{ + struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl((ID2D1EffectImpl *)iface); + + if (!data) + return E_INVALIDARG; + + *((ID2D1TransformGraph **)data) = effect_impl->transform_graph; + if (actual_size) + *actual_size = sizeof(effect_impl->transform_graph); + + return S_OK; +} + static void test_effect_register(BOOL d3d11) { ID2D1DeviceContext *device_context; @@ -11400,7 +11421,7 @@ static void test_effect_properties(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); count = ID2D1Effect_GetPropertyCount(effect); - ok(count == 2, "Got unexpected property count %u.\n", count); + ok(count == 3, "Got unexpected property count %u.\n", count); index = ID2D1Effect_GetPropertyIndex(effect, L"Context"); ok(index == 0, "Got unexpected index %u.\n", index); @@ -11997,6 +12018,125 @@ static void test_registered_effects(BOOL d3d11) release_test_context(&ctx); } +static void test_transform_graph(BOOL d3d11) +{ + ID2D1OffsetTransform *offset_transform = NULL; + ID2D1BlendTransform *blend_transform = NULL; + D2D1_BLEND_DESCRIPTION blend_desc = {0}; + ID2D1EffectContext *effect_context; + struct d2d1_test_context ctx; + ID2D1TransformGraph *graph; + ID2D1Factory1 *factory; + POINT point = {0 ,0}; + ID2D1Effect *effect; + UINT i, count; + HRESULT hr; + + const D2D1_PROPERTY_BINDING binding[] = + { + {L"Context", NULL, effect_impl_get_context}, + {L"Graph", NULL, effect_impl_get_graph}, + }; + + if (!init_test_context(&ctx, d3d11)) + return; + + factory = ctx.factory1; + if (!factory) + { + win_skip("ID2D1Factory1 is not supported.\n"); + release_test_context(&ctx); + return; + } + + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + effect_xml_c, binding, ARRAY_SIZE(binding), effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1DeviceContext_CreateEffect(ctx.context, &CLSID_TestEffect, &effect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Effect_GetValueByName(effect, L"Graph", D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&graph, sizeof(graph)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_GetValueByName(effect, L"Context", + D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Create transforms */ + hr = ID2D1EffectContext_CreateOffsetTransform(effect_context, point, &offset_transform); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1EffectContext_CreateBlendTransform(effect_context, 2, &blend_desc, &blend_transform); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (!offset_transform || !blend_transform) + goto done; + + /* Add nodes */ + hr = ID2D1TransformGraph_AddNode(graph, (ID2D1TransformNode *)offset_transform); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1TransformGraph_AddNode(graph, (ID2D1TransformNode *)offset_transform); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1TransformGraph_AddNode(graph, (ID2D1TransformNode *)blend_transform); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Remove nodes */ + hr = ID2D1TransformGraph_RemoveNode(graph, (ID2D1TransformNode *)offset_transform); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1TransformGraph_RemoveNode(graph, (ID2D1TransformNode *)offset_transform); + ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "Got unexpected hr %#lx.\n", hr); + hr = ID2D1TransformGraph_RemoveNode(graph, (ID2D1TransformNode *)blend_transform); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Connect nodes which are both un-added */ + ID2D1TransformGraph_Clear(graph); + hr = ID2D1TransformGraph_ConnectNode(graph, + (ID2D1TransformNode *)offset_transform, (ID2D1TransformNode *)blend_transform, 0); + ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "Got unexpected hr %#lx.\n", hr); + + /* Connect added node to un-added node */ + hr = ID2D1TransformGraph_AddNode(graph, (ID2D1TransformNode *)offset_transform); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1TransformGraph_ConnectNode(graph, + (ID2D1TransformNode *)offset_transform, (ID2D1TransformNode *)blend_transform, 0); + ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "Got unexpected hr %#lx.\n", hr); + + /* Connect un-added node to added node */ + ID2D1TransformGraph_Clear(graph); + hr = ID2D1TransformGraph_AddNode(graph, (ID2D1TransformNode *)blend_transform); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1TransformGraph_ConnectNode(graph, + (ID2D1TransformNode *)offset_transform, (ID2D1TransformNode *)blend_transform, 0); + ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "Got unexpected hr %#lx.\n", hr); + + /* Connect nodes */ + ID2D1TransformGraph_Clear(graph); + hr = ID2D1TransformGraph_AddNode(graph, (ID2D1TransformNode *)offset_transform); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1TransformGraph_AddNode(graph, (ID2D1TransformNode *)blend_transform); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + count = ID2D1BlendTransform_GetInputCount(blend_transform); + for (i = 0; i < count; ++i) + { + hr = ID2D1TransformGraph_ConnectNode(graph, + (ID2D1TransformNode *)offset_transform, (ID2D1TransformNode *)blend_transform, i); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + } + + /* Connect node to out-of-bounds index */ + hr = ID2D1TransformGraph_ConnectNode(graph, + (ID2D1TransformNode *)offset_transform, (ID2D1TransformNode *)blend_transform, count); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + +done: + if (blend_transform) + ID2D1BlendTransform_Release(blend_transform); + if (offset_transform) + ID2D1OffsetTransform_Release(offset_transform); + ID2D1Effect_Release(effect); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + release_test_context(&ctx); +} + static void test_stroke_contains_point(BOOL d3d11) { ID2D1TransformedGeometry *transformed_geometry; @@ -12812,6 +12952,7 @@ START_TEST(d2d1) queue_test(test_effect_crop); queue_test(test_effect_grayscale); queue_test(test_registered_effects); + queue_test(test_transform_graph); queue_d3d10_test(test_stroke_contains_point); queue_test(test_image_bounds); queue_test(test_bitmap_map);
1
0
0
0
Byeongsik Jeon : po: Update Korean translation.
by Alexandre Julliard
15 Jul '22
15 Jul '22
Module: wine Branch: master Commit: 15347f30e18c03c4cf9ce33a9386cbac2761d92c URL:
https://gitlab.winehq.org/wine/wine/-/commit/15347f30e18c03c4cf9ce33a9386cb…
Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Sat Jul 9 19:40:25 2022 +0900 po: Update Korean translation. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- po/ko.po | 70 ++++++---------------------------------------------------------- 1 file changed, 6 insertions(+), 64 deletions(-) diff --git a/po/ko.po b/po/ko.po index b5afc3b292b..6876b9cf2b6 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To:
https://bugs.winehq.org\n
" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-04-02 01:13+0900\n" +"PO-Revision-Date: 2022-07-15 15:16+0900\n" "Last-Translator: Byeongsik Jeon <bsjeon(a)hanmail.net>\n" "Language-Team: Korean\n" "Language: ko\n" @@ -3972,10 +3972,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "쓰기 가능하지 않은 속성 '|'을(를) 수정할 수 없습니다" #: dlls/jscript/jscript.rc:79 -#, fuzzy -#| msgid "'this' is not a Map object" msgid "'this' is not a | object" -msgstr "'this'는 Map 개체가 아닙니다" +msgstr "'this'는 '|' 개체가 아닙니다" #: dlls/jscript/jscript.rc:80 msgid "Property cannot have both accessors and a value" @@ -15795,56 +15793,6 @@ msgstr "" "\n" #: programs/reg/reg.rc:67 -#, fuzzy -#| msgid "" -#| "REG ADD <key> [/v value_name | /ve] [/t type] [/s separator] [/d data] [/" -#| "f]\n" -#| "\n" -#| " Adds a key to the registry or adds a new value to a given registry " -#| "key.\n" -#| "\n" -#| " <key>\n" -#| " The registry key to add or, if either [/v] or [/ve] is specified,\n" -#| " the key in which to add the new registry data.\n" -#| "\n" -#| " Format: ROOT\\Subkey\n" -#| "\n" -#| " ROOT: A predefined registry key. This must be one of the following:\n" -#| "\n" -#| " HKEY_LOCAL_MACHINE | HKLM\n" -#| " HKEY_CURRENT_USER | HKCU\n" -#| " HKEY_CLASSES_ROOT | HKCR\n" -#| " HKEY_USERS | HKU\n" -#| " HKEY_CURRENT_CONFIG | HKCC\n" -#| "\n" -#| " Subkey: The full path to a registry key under a given ROOT key.\n" -#| "\n" -#| " /v <value_name>\n" -#| " The name of the registry value to add.\n" -#| "\n" -#| " /ve\n" -#| " Add an unnamed registry value. This option modifies the (Default)\n" -#| " registry value.\n" -#| "\n" -#| " /t <type>\n" -#| " The type of data to add to the registry. If [/t] is specified,\n" -#| " <type> must be one of the following:\n" -#| "\n" -#| " REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" -#| " REG_DWORD | REG_BINARY | REG_NONE\n" -#| "\n" -#| " If [/t] is not specified, the default data type is REG_SZ.\n" -#| "\n" -#| " /s <separator>\n" -#| " The character used to separate strings in REG_MULTI_SZ data.\n" -#| " If [/s] is not specified, the default separator is \\0.\n" -#| "\n" -#| " /d <data>\n" -#| " The data to add to the new registry value.\n" -#| "\n" -#| " /f\n" -#| " Modify the registry without prompting for confirmation.\n" -#| "\n" msgid "" "REG ADD <key> [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n" "\n" @@ -15925,7 +15873,7 @@ msgstr "" " <type>은 다음 중 하나여야 합니다:\n" "\n" " REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" -" REG_DWORD | REG_BINARY | REG_NONE\n" +" REG_DWORD | REG_QWORD | REG_BINARY | REG_NONE\n" "\n" " [/t]가 지정되지 않은 경우 기본 데이터 유형은 REG_SZ입니다.\n" "\n" @@ -16366,10 +16314,8 @@ msgstr "DWORD 값(&D)" #: programs/regedit/regedit.rc:52 programs/regedit/regedit.rc:105 #: programs/regedit/regedit.rc:128 -#, fuzzy -#| msgid "&DWORD Value" msgid "&QWORD Value" -msgstr "DWORD 값(&D)" +msgstr "QWORD 값(&Q)" #: programs/regedit/regedit.rc:53 programs/regedit/regedit.rc:106 #: programs/regedit/regedit.rc:129 @@ -16921,16 +16867,12 @@ msgid "Collapse" msgstr "축소" #: programs/regedit/regedit.rc:178 -#, fuzzy -#| msgid "Adds a new 32-bit value" msgid "Adds a new 64-bit value" -msgstr "새 32비트 값 추가" +msgstr "새 64비트 값 추가" #: programs/regedit/regedit.rc:221 -#, fuzzy -#| msgid "Edit DWORD" msgid "Edit QWORD" -msgstr "DWORD 편집" +msgstr "QWORD 편집" #: programs/regsvr32/regsvr32.rc:33 msgid ""
1
0
0
0
Zhiyi Zhang : winefile: Use 10 DLUs for check box height.
by Alexandre Julliard
15 Jul '22
15 Jul '22
Module: wine Branch: master Commit: 975b11be9cbcef3e65009bc10df9febf791fa6db URL:
https://gitlab.winehq.org/wine/wine/-/commit/975b11be9cbcef3e65009bc10df9fe…
Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 15 15:59:02 2022 +0800 winefile: Use 10 DLUs for check box height. 10 DLUs is the recommended height for check boxes on Windows. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/winefile/winefile.rc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/winefile/winefile.rc b/programs/winefile/winefile.rc index 8d0f9940787..30760e5ab81 100644 --- a/programs/winefile/winefile.rc +++ b/programs/winefile/winefile.rc @@ -145,7 +145,7 @@ BEGIN CONTROL "&Other files",IDC_VIEW_TYPE_OTHERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,70,70,10 CONTROL "Show Hidden/&System Files",IDC_VIEW_TYPE_HIDDEN, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,140,9 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,140,10 DEFPUSHBUTTON "OK",IDOK,104,7,50,14 PUSHBUTTON "Cancel",IDCANCEL,104,24,50,14 END @@ -168,11 +168,11 @@ BEGIN LTEXT "Size:",-1,7,62,59,9 EDITTEXT IDC_STATIC_PROP_SIZE,71,62,170,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP GROUPBOX "Attributes",-1,7,79,158,46 - CONTROL "&Read Only",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 - CONTROL "H&idden",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 - CONTROL "&Archive",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 - CONTROL "&System",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 - CONTROL "&Compressed",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + CONTROL "&Read Only",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,10 + CONTROL "H&idden",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,10 + CONTROL "&Archive",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,10 + CONTROL "&System",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,10 + CONTROL "&Compressed",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,10 GROUPBOX "Version information",-1,7,129,234,79 LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL
1
0
0
0
← Newer
1
...
28
29
30
31
32
33
34
...
64
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
Results per page:
10
25
50
100
200