wine-commits May 2023

wine-commits@winehq.org

1 participants
775 discussions

Mohamad Al-Jaf : msmpeg2vdec: Add DllGetClassObject() stub.
by Alexandre Julliard 19 May '23

19 May '23

Module: wine Branch: master Commit: 9c60c34c9458fdc581c0468a3b6a65484fb408c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c60c34c9458fdc581c0468a3b6a65… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Apr 20 21:38:14 2022 -0400 msmpeg2vdec: Add DllGetClassObject() stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54955 --- dlls/msmpeg2vdec/Makefile.in | 3 +++ dlls/msmpeg2vdec/main.c | 27 +++++++++++++++++++++++++++ dlls/msmpeg2vdec/msmpeg2vdec.spec | 2 +- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/msmpeg2vdec/Makefile.in b/dlls/msmpeg2vdec/Makefile.in index d2dbf5adda0..609c6a34f9a 100644 --- a/dlls/msmpeg2vdec/Makefile.in +++ b/dlls/msmpeg2vdec/Makefile.in @@ -1 +1,4 @@ MODULE = msmpeg2vdec.dll + +C_SRCS = \ + main.c diff --git a/dlls/msmpeg2vdec/main.c b/dlls/msmpeg2vdec/main.c new file mode 100644 index 00000000000..0ff52f5d1cb --- /dev/null +++ b/dlls/msmpeg2vdec/main.c @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msmpeg2vdec); + +HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID riid, void **out ) +{ + FIXME( "clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out ); + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/msmpeg2vdec/msmpeg2vdec.spec b/dlls/msmpeg2vdec/msmpeg2vdec.spec index 2ba3ab602f1..b81b77ce108 100644 --- a/dlls/msmpeg2vdec/msmpeg2vdec.spec +++ b/dlls/msmpeg2vdec/msmpeg2vdec.spec @@ -3,6 +3,6 @@ @ stub ?GetSurfaceSize@CVIDEOfilter@@QEAAJHPEAJ@Z @ stub ?LoadSurface@CVIDEOfilter@@QEAAJHPEAEK@Z @ stdcall -private DllCanUnloadNow() -@ stub DllGetClassObject +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer()

1 0

Rémi Bernon : imm32: Remove now unused members from ime_private.
by Alexandre Julliard 19 May '23

19 May '23

Module: wine Branch: master Commit: 65d0f7a75626983bb7cc2b6c7ace41d44d730560 URL: https://gitlab.winehq.org/wine/wine/-/commit/65d0f7a75626983bb7cc2b6c7ace41… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 9 21:58:24 2023 +0200 imm32: Remove now unused members from ime_private. And move its definition to ime.c. --- dlls/imm32/ime.c | 34 +++++++++++++--------------------- include/ntuser.h | 9 --------- 2 files changed, 13 insertions(+), 30 deletions(-) diff --git a/dlls/imm32/ime.c b/dlls/imm32/ime.c index a4cdcade73e..10fd234a2c1 100644 --- a/dlls/imm32/ime.c +++ b/dlls/imm32/ime.c @@ -23,6 +23,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); +struct ime_private +{ + BOOL in_composition; + HFONT hfont; +}; + static const char *debugstr_imn( WPARAM wparam ) { switch (wparam) @@ -139,7 +145,7 @@ static HFONT input_context_select_ui_font( INPUTCONTEXT *ctx, HDC hdc ) struct ime_private *priv; HFONT font = NULL; if (!(priv = ImmLockIMCC( ctx->hPrivate ))) return NULL; - if (priv->textfont) font = SelectObject( hdc, priv->textfont ); + if (priv->hfont) font = SelectObject( hdc, priv->hfont ); ImmUnlockIMCC( ctx->hPrivate ); return font; } @@ -175,9 +181,9 @@ static UINT ime_set_composition_status( HIMC himc, BOOL composition ) if (!(ctx = ImmLockIMC( himc ))) return 0; if ((priv = ImmLockIMCC( ctx->hPrivate ))) { - if (!priv->bInComposition && composition) msg = WM_IME_STARTCOMPOSITION; - else if (priv->bInComposition && !composition) msg = WM_IME_ENDCOMPOSITION; - priv->bInComposition = composition; + if (!priv->in_composition && composition) msg = WM_IME_STARTCOMPOSITION; + else if (priv->in_composition && !composition) msg = WM_IME_ENDCOMPOSITION; + priv->in_composition = composition; ImmUnlockIMCC( ctx->hPrivate ); } ImmUnlockIMC( himc ); @@ -398,7 +404,6 @@ static LRESULT ime_ui_notify( HIMC himc, HWND hwnd, WPARAM wparam, LPARAM lparam static LRESULT WINAPI ime_ui_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { HIMC himc = (HIMC)GetWindowLongPtrW( hwnd, IMMGWL_IMC ); - INPUTCONTEXT *ctx; TRACE( "hwnd %p, himc %p, msg %s, wparam %#Ix, lparam %#Ix\n", hwnd, himc, debugstr_wm_ime(msg), wparam, lparam ); @@ -406,20 +411,7 @@ static LRESULT WINAPI ime_ui_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LP switch (msg) { case WM_CREATE: - { - struct ime_private *priv; - - SetWindowTextA( hwnd, "Wine Ime Active" ); - - if (!(ctx = ImmLockIMC( himc ))) return TRUE; - if ((priv = ImmLockIMCC( ctx->hPrivate ))) - { - priv->hwndDefault = hwnd; - ImmUnlockIMCC( ctx->hPrivate ); - } - ImmUnlockIMC( himc ); return TRUE; - } case WM_PAINT: ime_ui_paint( himc, hwnd ); return FALSE; @@ -468,7 +460,7 @@ BOOL WINAPI ImeInquire( IMEINFO *info, WCHAR *ui_class, DWORD flags ) wcscpy( ui_class, ime_ui_class.lpszClassName ); memset( info, 0, sizeof(*info) ); - info->dwPrivateDataSize = sizeof(IMEPRIVATE); + info->dwPrivateDataSize = sizeof(struct ime_private); info->fdwProperty = IME_PROP_UNICODE | IME_PROP_AT_CARET; info->fdwConversionCaps = IME_CMODE_NATIVE | IME_CMODE_FULLSHAPE; info->fdwSentenceCaps = IME_SMODE_AUTOMATIC; @@ -656,8 +648,8 @@ BOOL WINAPI NotifyIME( HIMC himc, DWORD action, DWORD index, DWORD value ) case IMC_SETCOMPOSITIONFONT: if ((priv = ImmLockIMCC( ctx->hPrivate ))) { - if (priv->textfont) DeleteObject( priv->textfont ); - priv->textfont = CreateFontIndirectW( &ctx->lfFont.W ); + if (priv->hfont) DeleteObject( priv->hfont ); + priv->hfont = CreateFontIndirectW( &ctx->lfFont.W ); ImmUnlockIMCC( ctx->hPrivate ); } break; diff --git a/include/ntuser.h b/include/ntuser.h index dd0d687e416..28ce230334a 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -511,15 +511,6 @@ struct ime_driver_call_params COMPOSITIONSTRING *compstr; }; -/* internal IME private */ -typedef struct ime_private -{ - BOOL bInComposition; - BOOL bInternalState; - HFONT textfont; - HWND hwndDefault; -} IMEPRIVATE, *LPIMEPRIVATE; - #define WM_SYSTIMER 0x0118 /* the various structures that can be sent in messages, in platform-independent layout */

1 0

Rémi Bernon : imm32: Get rid of the graphics driver loading mechanism.
by Alexandre Julliard 19 May '23

19 May '23

Module: wine Branch: master Commit: d61a786461f1b1bfdd6f17125db124cd5e06fa3f URL: https://gitlab.winehq.org/wine/wine/-/commit/d61a786461f1b1bfdd6f17125db124… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 10 23:34:37 2023 +0200 imm32: Get rid of the graphics driver loading mechanism. --- dlls/imm32/imm.c | 100 +++++++++++++++++++++++++------------------------------ 1 file changed, 45 insertions(+), 55 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 2fe355da5bb..aa1881e0918 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -429,31 +429,6 @@ static struct imc *query_imc_data( HIMC handle ) return ret && ret->handle == handle ? ret : NULL; } -static HMODULE load_graphics_driver(void) -{ - static const WCHAR key_pathW[] = L"System\\CurrentControlSet\\Control\\Video\\{"; - static const WCHAR displayW[] = L"}\\0000"; - - HMODULE ret = 0; - HKEY hkey; - DWORD size; - WCHAR path[MAX_PATH]; - WCHAR key[ARRAY_SIZE( key_pathW ) + ARRAY_SIZE( displayW ) + 40]; - UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), L"__wine_display_device_guid" )); - - if (!guid_atom) return 0; - memcpy( key, key_pathW, sizeof(key_pathW) ); - if (!GlobalGetAtomNameW( guid_atom, key + lstrlenW(key), 40 )) return 0; - lstrcatW( key, displayW ); - if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0; - size = sizeof(path); - if (!RegQueryValueExW( hkey, L"GraphicsDriver", NULL, NULL, (BYTE *)path, &size )) - ret = LoadLibraryW( path ); - RegCloseKey( hkey ); - TRACE( "%s %p\n", debugstr_w(path), ret ); - return ret; -} - /* lookup an IME from a HKL, must hold ime_cs */ static struct ime *find_ime_from_hkl( HKL hkl ) { @@ -511,41 +486,54 @@ BOOL WINAPI ImmLoadIME( HKL hkl ) if (use_default_ime) { if (*buffer) WARN( "Failed to load %s, falling back to default.\n", debugstr_w(buffer) ); - if (!(ime->module = load_graphics_driver())) ime->module = LoadLibraryW( L"imm32" ); + ime->module = LoadLibraryW( L"imm32" ); + ime->pImeInquire = (void *)ImeInquire; + ime->pImeDestroy = ImeDestroy; + ime->pImeSelect = ImeSelect; + ime->pImeConfigure = ImeConfigure; + ime->pImeEscape = ImeEscape; + ime->pImeSetActiveContext = ImeSetActiveContext; + ime->pImeToAsciiEx = (void *)ImeToAsciiEx; + ime->pNotifyIME = NotifyIME; + ime->pImeRegisterWord = (void *)ImeRegisterWord; + ime->pImeUnregisterWord = (void *)ImeUnregisterWord; + ime->pImeEnumRegisterWord = (void *)ImeEnumRegisterWord; + ime->pImeSetCompositionString = ImeSetCompositionString; + ime->pImeConversionList = (void *)ImeConversionList; + ime->pImeProcessKey = (void *)ImeProcessKey; + ime->pImeGetRegisterWordStyle = (void *)ImeGetRegisterWordStyle; + ime->pImeGetImeMenuItems = (void *)ImeGetImeMenuItems; } - + else + { #define LOAD_FUNCPTR( f ) \ - if (!(ime->p##f = (void *)GetProcAddress( ime->module, #f )) && \ - !(ime->p##f = use_default_ime ? (void *)f : NULL)) \ - { \ - LeaveCriticalSection( &ime_cs ); \ - WARN( "Can't find function %s in HKL %p IME\n", #f, hkl ); \ - goto failed; \ - } - LOAD_FUNCPTR( ImeInquire ); - LOAD_FUNCPTR( ImeDestroy ); - LOAD_FUNCPTR( ImeSelect ); - LOAD_FUNCPTR( ImeConfigure ); - LOAD_FUNCPTR( ImeEscape ); - LOAD_FUNCPTR( ImeSetActiveContext ); - LOAD_FUNCPTR( ImeToAsciiEx ); - LOAD_FUNCPTR( NotifyIME ); - LOAD_FUNCPTR( ImeRegisterWord ); - LOAD_FUNCPTR( ImeUnregisterWord ); - LOAD_FUNCPTR( ImeEnumRegisterWord ); - LOAD_FUNCPTR( ImeSetCompositionString ); - LOAD_FUNCPTR( ImeConversionList ); - LOAD_FUNCPTR( ImeProcessKey ); - LOAD_FUNCPTR( ImeGetRegisterWordStyle ); - LOAD_FUNCPTR( ImeGetImeMenuItems ); + if (!(ime->p##f = (void *)GetProcAddress( ime->module, #f ))) \ + { \ + WARN( "Can't find function %s in HKL %p IME\n", #f, hkl ); \ + goto failed; \ + } + + LOAD_FUNCPTR( ImeInquire ); + LOAD_FUNCPTR( ImeDestroy ); + LOAD_FUNCPTR( ImeSelect ); + LOAD_FUNCPTR( ImeConfigure ); + LOAD_FUNCPTR( ImeEscape ); + LOAD_FUNCPTR( ImeSetActiveContext ); + LOAD_FUNCPTR( ImeToAsciiEx ); + LOAD_FUNCPTR( NotifyIME ); + LOAD_FUNCPTR( ImeRegisterWord ); + LOAD_FUNCPTR( ImeUnregisterWord ); + LOAD_FUNCPTR( ImeEnumRegisterWord ); + LOAD_FUNCPTR( ImeSetCompositionString ); + LOAD_FUNCPTR( ImeConversionList ); + LOAD_FUNCPTR( ImeProcessKey ); + LOAD_FUNCPTR( ImeGetRegisterWordStyle ); + LOAD_FUNCPTR( ImeGetImeMenuItems ); #undef LOAD_FUNCPTR + } ime->hkl = hkl; - if (!ime->pImeInquire( &ime->info, buffer, 0 )) - { - LeaveCriticalSection( &ime_cs ); - goto failed; - } + if (!ime->pImeInquire( &ime->info, buffer, 0 )) goto failed; if (ime_is_unicode( ime )) lstrcpynW( ime->ui_class, buffer, ARRAY_SIZE(ime->ui_class) ); else MultiByteToWideChar( CP_ACP, 0, (char *)buffer, -1, ime->ui_class, ARRAY_SIZE(ime->ui_class) ); @@ -558,6 +546,8 @@ BOOL WINAPI ImmLoadIME( HKL hkl ) return TRUE; failed: + LeaveCriticalSection( &ime_cs ); + if (ime->module) FreeLibrary( ime->module ); free( ime ); return FALSE;

1 0

Rémi Bernon : winex11: Use the default IME implementation for ImeSelect.
by Alexandre Julliard 19 May '23

19 May '23

Module: wine Branch: master Commit: f7d4eec45920ac18cbd55f85918d9a73b6bd5d0c URL: https://gitlab.winehq.org/wine/wine/-/commit/f7d4eec45920ac18cbd55f85918d9a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Apr 1 22:25:01 2023 +0200 winex11: Use the default IME implementation for ImeSelect. --- dlls/winex11.drv/Makefile.in | 1 - dlls/winex11.drv/ime.c | 72 --------------------------------------- dlls/winex11.drv/winex11.drv.spec | 3 -- 3 files changed, 76 deletions(-) diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index bdc4ebf8aed..1fb38c91144 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -14,7 +14,6 @@ C_SRCS = \ dllmain.c \ event.c \ graphics.c \ - ime.c \ init.c \ keyboard.c \ mouse.c \ diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c deleted file mode 100644 index daf6d89dc7a..00000000000 --- a/dlls/winex11.drv/ime.c +++ /dev/null @@ -1,72 +0,0 @@ -/* - * The IME for interfacing with XIM - * - * Copyright 2008 CodeWeavers, Aric Stewart - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -/* - * Notes: - * The normal flow for IMM/IME Processing is as follows. - * 1) The Keyboard Driver generates key messages which are first passed to - * the IMM and then to IME via ImeProcessKey. If the IME returns 0 then - * it does not want the key and the keyboard driver then generates the - * WM_KEYUP/WM_KEYDOWN messages. However if the IME is going to process the - * key it returns non-zero. - * 2) If the IME is going to process the key then the IMM calls ImeToAsciiEx to - * process the key. the IME modifies the HIMC structure to reflect the - * current state and generates any messages it needs the IMM to process. - * 3) IMM checks the messages and send them to the application in question. From - * here the IMM level deals with if the application is IME aware or not. - * - * This flow does not work well for the X11 driver and XIM. - * (It works fine for Mac) - * As such we will have to reroute step 1. Instead the x11drv driver will - * generate an XIM events and call directly into this IME implementation. - * As such we will have to use the alternative ImmGenerateMessage path to be - * generate the messages that we want the IMM layer to send to the application. - */ - -#include "x11drv_dll.h" -#include "wine/debug.h" -#include "imm.h" -#include "immdev.h" - -WINE_DEFAULT_DEBUG_CHANNEL(imm); - -BOOL WINAPI ImeSelect(HIMC hIMC, BOOL fSelect) -{ - LPINPUTCONTEXT lpIMC; - TRACE("%p %s\n",hIMC,(fSelect)?"TRUE":"FALSE"); - - if (!hIMC || !fSelect) return TRUE; - - /* Initialize our structures */ - lpIMC = ImmLockIMC(hIMC); - if (lpIMC != NULL) - { - LPIMEPRIVATE myPrivate; - myPrivate = ImmLockIMCC(lpIMC->hPrivate); - myPrivate->bInComposition = FALSE; - myPrivate->bInternalState = FALSE; - myPrivate->textfont = NULL; - myPrivate->hwndDefault = NULL; - ImmUnlockIMCC(lpIMC->hPrivate); - ImmUnlockIMC(hIMC); - } - - return TRUE; -} diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index c8d52d07f6d..a7334eef3d9 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -9,6 +9,3 @@ # System tray @ cdecl wine_notify_icon(long ptr) - -#IME Interface -@ stdcall ImeSelect(long long)

1 0

Rémi Bernon : winex11: Remove now unnecessary selected HIMC tracking code.
by Alexandre Julliard 19 May '23

19 May '23

Module: wine Branch: master Commit: cbf719d72d885e9da96acf1fec6fc89ca95660e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/cbf719d72d885e9da96acf1fec6fc8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Apr 1 22:24:19 2023 +0200 winex11: Remove now unnecessary selected HIMC tracking code. --- dlls/winex11.drv/ime.c | 82 ++------------------------------------------------ 1 file changed, 3 insertions(+), 79 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 019312cfd5a..daf6d89dc7a 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -47,91 +47,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); -#define FROM_X11 ((HIMC)0xcafe1337) - -static HIMC *hSelectedFrom = NULL; -static INT hSelectedCount = 0; - -static HIMC RealIMC(HIMC hIMC) -{ - if (hIMC == FROM_X11) - { - INT i; - HWND wnd = GetFocus(); - HIMC winHimc = ImmGetContext(wnd); - for (i = 0; i < hSelectedCount; i++) - if (winHimc == hSelectedFrom[i]) - return winHimc; - return NULL; - } - else - return hIMC; -} - -static LPINPUTCONTEXT LockRealIMC(HIMC hIMC) -{ - HIMC real_imc = RealIMC(hIMC); - if (real_imc) - return ImmLockIMC(real_imc); - else - return NULL; -} - -static BOOL UnlockRealIMC(HIMC hIMC) -{ - HIMC real_imc = RealIMC(hIMC); - if (real_imc) - return ImmUnlockIMC(real_imc); - else - return FALSE; -} - -static BOOL IME_RemoveFromSelected(HIMC hIMC) -{ - int i; - for (i = 0; i < hSelectedCount; i++) - if (hSelectedFrom[i] == hIMC) - { - if (i < hSelectedCount - 1) - memmove(&hSelectedFrom[i], &hSelectedFrom[i+1], (hSelectedCount - i - 1)*sizeof(HIMC)); - hSelectedCount --; - return TRUE; - } - return FALSE; -} - -static void IME_AddToSelected(HIMC hIMC) -{ - hSelectedCount++; - if (hSelectedFrom) - hSelectedFrom = HeapReAlloc(GetProcessHeap(), 0, hSelectedFrom, hSelectedCount*sizeof(HIMC)); - else - hSelectedFrom = HeapAlloc(GetProcessHeap(), 0, sizeof(HIMC)); - hSelectedFrom[hSelectedCount-1] = hIMC; -} - BOOL WINAPI ImeSelect(HIMC hIMC, BOOL fSelect) { LPINPUTCONTEXT lpIMC; TRACE("%p %s\n",hIMC,(fSelect)?"TRUE":"FALSE"); - if (hIMC == FROM_X11) - { - ERR("ImeSelect should never be called from X11\n"); - return FALSE; - } - - if (!hIMC) - return TRUE; - - /* not selected */ - if (!fSelect) - return IME_RemoveFromSelected(hIMC); - - IME_AddToSelected(hIMC); + if (!hIMC || !fSelect) return TRUE; /* Initialize our structures */ - lpIMC = LockRealIMC(hIMC); + lpIMC = ImmLockIMC(hIMC); if (lpIMC != NULL) { LPIMEPRIVATE myPrivate; @@ -141,7 +65,7 @@ BOOL WINAPI ImeSelect(HIMC hIMC, BOOL fSelect) myPrivate->textfont = NULL; myPrivate->hwndDefault = NULL; ImmUnlockIMCC(lpIMC->hPrivate); - UnlockRealIMC(hIMC); + ImmUnlockIMC(hIMC); } return TRUE;

1 0

Rémi Bernon : winex11: Drop the x11drv_ime_update_association user callback.
by Alexandre Julliard 19 May '23

19 May '23

Module: wine Branch: master Commit: 9f05a79bd63795664bcd20f69a81e1437536dad2 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f05a79bd63795664bcd20f69a81e1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat May 13 10:59:32 2023 +0200 winex11: Drop the x11drv_ime_update_association user callback. --- dlls/winex11.drv/dllmain.c | 1 - dlls/winex11.drv/ime.c | 13 ------------- dlls/winex11.drv/unixlib.h | 1 - dlls/winex11.drv/x11drv_dll.h | 1 - dlls/winex11.drv/xim.c | 6 ++---- 5 files changed, 2 insertions(+), 20 deletions(-) diff --git a/dlls/winex11.drv/dllmain.c b/dlls/winex11.drv/dllmain.c index 7c463d4e401..3aa0a9875d0 100644 --- a/dlls/winex11.drv/dllmain.c +++ b/dlls/winex11.drv/dllmain.c @@ -30,7 +30,6 @@ static const callback_func callback_funcs[] = { x11drv_dnd_drop_event, x11drv_dnd_leave_event, - x11drv_ime_update_association, }; C_ASSERT( ARRAYSIZE(callback_funcs) == client_funcs_count ); diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 16357e80548..019312cfd5a 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -146,16 +146,3 @@ BOOL WINAPI ImeSelect(HIMC hIMC, BOOL fSelect) return TRUE; } - -/* Interfaces to XIM and other parts of winex11drv */ - -NTSTATUS x11drv_ime_update_association( UINT arg ) -{ - HWND focus = UlongToHandle( arg ); - - ImmGetContext(focus); - - if (focus && hSelectedFrom) - ImmAssociateContext(focus,RealIMC(FROM_X11)); - return 0; -} diff --git a/dlls/winex11.drv/unixlib.h b/dlls/winex11.drv/unixlib.h index dba2c8e1060..0c812896fbc 100644 --- a/dlls/winex11.drv/unixlib.h +++ b/dlls/winex11.drv/unixlib.h @@ -92,7 +92,6 @@ enum client_callback { client_dnd_drop_event, client_dnd_leave_event, - client_ime_update_association, client_funcs_count }; diff --git a/dlls/winex11.drv/x11drv_dll.h b/dlls/winex11.drv/x11drv_dll.h index fbd2a3e74b2..bab27afce14 100644 --- a/dlls/winex11.drv/x11drv_dll.h +++ b/dlls/winex11.drv/x11drv_dll.h @@ -34,7 +34,6 @@ extern NTSTATUS WINAPI x11drv_systray_change_owner( void *params, ULONG size ) D extern NTSTATUS x11drv_dnd_drop_event( UINT arg ) DECLSPEC_HIDDEN; extern NTSTATUS x11drv_dnd_leave_event( UINT arg ) DECLSPEC_HIDDEN; -extern NTSTATUS x11drv_ime_update_association( UINT arg ) DECLSPEC_HIDDEN; extern LRESULT WINAPI foreign_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index e5cea5941f7..1c3d2dd9875 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -410,8 +410,6 @@ static void xim_open( Display *display, XPointer user, XPointer arg ) TRACE( "display %p, data %p, arg %p\n", display, user, arg ); if (!(data->xim = xim_create( data ))) return; XUnregisterIMInstantiateCallback( display, NULL, NULL, NULL, xim_open, user ); - - x11drv_client_call( client_ime_update_association, 0 ); } static void xim_destroy( XIM xim, XPointer user, XPointer arg ) @@ -434,8 +432,8 @@ void xim_thread_attach( struct x11drv_thread_data *data ) for (i = 0; list && i < count; ++i) TRACE( " %d: %s\n", i, list[i] ); if (list) XFreeStringList( list ); - if ((data->xim = xim_create( data ))) x11drv_client_call( client_ime_update_association, 0 ); - else XRegisterIMInstantiateCallback( display, NULL, NULL, NULL, xim_open, (XPointer)data ); + if ((data->xim = xim_create( data ))) return; + XRegisterIMInstantiateCallback( display, NULL, NULL, NULL, xim_open, (XPointer)data ); } static BOOL xic_destroy( XIC xic, XPointer user, XPointer arg )

1 0

Piotr Caban : gdi32: Mark objects as not used before clearing handles table in emf_reset.
by Alexandre Julliard 19 May '23

19 May '23

Module: wine Branch: master Commit: 55b9b2f675af9e45a139cd64947a9fe50463aed1 URL: https://gitlab.winehq.org/wine/wine/-/commit/55b9b2f675af9e45a139cd64947a9f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 19 13:38:27 2023 +0200 gdi32: Mark objects as not used before clearing handles table in emf_reset. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54936 --- dlls/gdi32/emfdc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 5c3d01e43b1..57f39e4c162 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -2521,7 +2521,11 @@ static void emf_reset( DC_ATTR *dc_attr, const RECT *rect ) { struct emf *emf = get_dc_emf( dc_attr ); HDC hdc = dc_attr_handle( dc_attr ); + int i; + for (i = 0; i < emf->handles_size; i++) + if (emf->handles[i]) + GDI_hdc_not_using_object( emf->handles[i], dc_attr_handle( emf->dc_attr )); memset( emf->handles, 0, emf->handles_size * sizeof(emf->handles[0]) ); emf->cur_handles = 1; emf->file = 0;

1 0

Piotr Caban : wineps: Don't store ImageableArea in print_ctx.
by Alexandre Julliard 19 May '23

19 May '23

Module: wine Branch: master Commit: 410b0f4d51babc8aed1d0f2427df3ce340a473fc URL: https://gitlab.winehq.org/wine/wine/-/commit/410b0f4d51babc8aed1d0f2427df3c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 17 19:19:13 2023 +0200 wineps: Don't store ImageableArea in print_ctx. --- dlls/wineps.drv/init.c | 53 ++++-------------------------------------- dlls/wineps.drv/ps.c | 61 ++++++++++++++++++++++++++++++++++--------------- dlls/wineps.drv/psdrv.h | 5 ---- 3 files changed, 47 insertions(+), 72 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 649b6ecb41b..b38c1e1ac43 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -408,50 +408,6 @@ static void dump_devmode(const DEVMODEW *dm) TRACE("dmPelsHeight %lu\n", dm->dmPelsHeight); } -static void PSDRV_UpdateDevCaps( print_ctx *ctx ) -{ - int log_pixels_x = GetDeviceCaps(ctx->hdc, ASPECTX); - int log_pixels_y = GetDeviceCaps(ctx->hdc, ASPECTY); - PAGESIZE *page; - - dump_devmode(&ctx->Devmode->dmPublic); - - if(ctx->Devmode->dmPublic.dmFields & DM_PAPERSIZE) { - LIST_FOR_EACH_ENTRY(page, &ctx->pi->ppd->PageSizes, PAGESIZE, entry) { - if(page->WinPage == ctx->Devmode->dmPublic.dmPaperSize) - break; - } - - if(&page->entry == &ctx->pi->ppd->PageSizes) { - FIXME("Can't find page\n"); - SetRectEmpty(&ctx->ImageableArea); - } else if(page->ImageableArea) { - /* ctx sizes in device units; ppd sizes in 1/72" */ - SetRect(&ctx->ImageableArea, page->ImageableArea->llx * log_pixels_x / 72, - page->ImageableArea->ury * log_pixels_y / 72, - page->ImageableArea->urx * log_pixels_x / 72, - page->ImageableArea->lly * log_pixels_y / 72); - } else { - ctx->ImageableArea.left = ctx->ImageableArea.bottom = 0; - ctx->ImageableArea.right = page->PaperDimension->x * log_pixels_x / 72; - ctx->ImageableArea.top = page->PaperDimension->y * log_pixels_y / 72; - } - } else if((ctx->Devmode->dmPublic.dmFields & DM_PAPERLENGTH) && - (ctx->Devmode->dmPublic.dmFields & DM_PAPERWIDTH)) { - /* ctx sizes in device units; Devmode sizes in 1/10 mm */ - ctx->ImageableArea.left = ctx->ImageableArea.bottom = 0; - ctx->ImageableArea.right = - ctx->Devmode->dmPublic.dmPaperWidth * log_pixels_x / 254; - ctx->ImageableArea.top = - ctx->Devmode->dmPublic.dmPaperLength * log_pixels_y / 254; - } else { - FIXME("Odd dmFields %lx\n", ctx->Devmode->dmPublic.dmFields); - SetRectEmpty(&ctx->ImageableArea); - } - - TRACE("ImageableArea = %s\n", wine_dbgstr_rect(&ctx->ImageableArea)); -} - print_ctx *create_print_ctx( HDC hdc, const WCHAR *device, const DEVMODEW *devmode ) { @@ -494,7 +450,6 @@ print_ctx *create_print_ctx( HDC hdc, const WCHAR *device, PSDRV_MergeDevmodes( ctx->Devmode, devmode, pi ); } - PSDRV_UpdateDevCaps( ctx ); SelectObject( hdc, GetStockObject( DEVICE_DEFAULT_FONT )); return ctx; } @@ -502,12 +457,12 @@ print_ctx *create_print_ctx( HDC hdc, const WCHAR *device, /********************************************************************** * ResetDC (WINEPS.@) */ -BOOL CDECL PSDRV_ResetDC( print_ctx *ctx, const DEVMODEW *lpInitData ) +BOOL CDECL PSDRV_ResetDC( print_ctx *ctx, const DEVMODEW *devmode ) { - if (lpInitData) + if (devmode) { - PSDRV_MergeDevmodes(ctx->Devmode, lpInitData, ctx->pi); - PSDRV_UpdateDevCaps(ctx); + dump_devmode( devmode ); + PSDRV_MergeDevmodes( ctx->Devmode, devmode, ctx->pi ); } return TRUE; } diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 751a5097034..a8050abe19b 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -400,7 +400,7 @@ INT PSDRV_WriteHeader( print_ctx *ctx, LPCWSTR title ) INPUTSLOT *slot = find_slot( ctx->pi->ppd, &ctx->Devmode->dmPublic ); PAGESIZE *page = find_pagesize( ctx->pi->ppd, &ctx->Devmode->dmPublic ); DUPLEX *duplex = find_duplex( ctx->pi->ppd, &ctx->Devmode->dmPublic ); - int llx, lly, urx, ury, log_pixels_x, log_pixels_y; + int llx, lly, urx, ury; int ret, len; const char * dmOrientation; @@ -429,12 +429,34 @@ INT PSDRV_WriteHeader( print_ctx *ctx, LPCWSTR title ) /* BBox co-ords are in default user co-ord system so urx < ury even in landscape mode */ - log_pixels_x = GetDeviceCaps(ctx->hdc, ASPECTX); - log_pixels_y = GetDeviceCaps(ctx->hdc, ASPECTY); - llx = ctx->ImageableArea.left * 72.0 / log_pixels_x; - lly = ctx->ImageableArea.bottom * 72.0 / log_pixels_y; - urx = ctx->ImageableArea.right * 72.0 / log_pixels_x; - ury = ctx->ImageableArea.top * 72.0 / log_pixels_y; + if ((ctx->Devmode->dmPublic.dmFields & DM_PAPERSIZE) && page) + { + if (page->ImageableArea) + { + llx = page->ImageableArea->llx; + lly = page->ImageableArea->lly; + urx = page->ImageableArea->urx; + ury = page->ImageableArea->ury; + } + else + { + llx = lly = 0; + urx = page->PaperDimension->x; + ury = page->PaperDimension->y; + } + } + else if ((ctx->Devmode->dmPublic.dmFields & DM_PAPERLENGTH) && + (ctx->Devmode->dmPublic.dmFields & DM_PAPERWIDTH)) + { + /* Devmode sizes in 1/10 mm */ + llx = lly = 0; + urx = ctx->Devmode->dmPublic.dmPaperWidth * 72.0 / 254.0; + ury = ctx->Devmode->dmPublic.dmPaperLength * 72.0 / 254.0; + } + else + { + llx = lly = urx = ury = 0; + } /* FIXME should do something better with BBox */ dmOrientation = (ctx->Devmode->dmPublic.dmOrientation == DMORIENT_LANDSCAPE ? "Landscape" : "Portrait"); @@ -519,18 +541,21 @@ INT PSDRV_WriteNewPage( print_ctx *ctx ) if(ctx->Devmode->dmPublic.dmOrientation == DMORIENT_LANDSCAPE) { if(ctx->pi->ppd->LandscapeOrientation == -90) { - xtrans = ctx->ImageableArea.right; - ytrans = ctx->ImageableArea.top; - rotation = 90; - } else { - xtrans = ctx->ImageableArea.left; - ytrans = ctx->ImageableArea.bottom; - rotation = -90; - } + xtrans = GetDeviceCaps(ctx->hdc, PHYSICALHEIGHT) - + GetDeviceCaps(ctx->hdc, PHYSICALOFFSETY); + ytrans = GetDeviceCaps(ctx->hdc, PHYSICALWIDTH) - + GetDeviceCaps(ctx->hdc, PHYSICALOFFSETX); + rotation = 90; + } else { + xtrans = GetDeviceCaps(ctx->hdc, PHYSICALOFFSETY); + ytrans = GetDeviceCaps(ctx->hdc, PHYSICALOFFSETX); + rotation = -90; + } } else { - xtrans = ctx->ImageableArea.left; - ytrans = ctx->ImageableArea.top; - rotation = 0; + xtrans = GetDeviceCaps(ctx->hdc, PHYSICALOFFSETX); + ytrans = GetDeviceCaps(ctx->hdc, PHYSICALHEIGHT) - + GetDeviceCaps(ctx->hdc, PHYSICALOFFSETY); + rotation = 0; } sprintf(buf, psnewpage, name, ctx->job.PageNo, diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 20e80e9f1aa..389c6a5b562 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -341,11 +341,6 @@ typedef struct JOB job; PSDRV_DEVMODE *Devmode; PRINTERINFO *pi; - RECT ImageableArea; /* Imageable area in device units */ - /* NB both PageSize and ImageableArea - are not rotated in landscape mode, - so PageSize.cx is generally - < PageSize.cy */ int pathdepth; } print_ctx;

1 0

Piotr Caban : wineps: Don't store logPixels in print_ctx.
by Alexandre Julliard 19 May '23

19 May '23

Module: wine Branch: master Commit: cdb57c524c6d6f55e022bd976c43aa9912e5f455 URL: https://gitlab.winehq.org/wine/wine/-/commit/cdb57c524c6d6f55e022bd976c43aa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 17 18:47:57 2023 +0200 wineps: Don't store logPixels in print_ctx. --- dlls/wineps.drv/init.c | 61 +++++++++---------------------------------------- dlls/wineps.drv/ps.c | 18 ++++++++------- dlls/wineps.drv/psdrv.h | 3 --- 3 files changed, 21 insertions(+), 61 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 9d59830c60d..649b6ecb41b 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -410,47 +410,12 @@ static void dump_devmode(const DEVMODEW *dm) static void PSDRV_UpdateDevCaps( print_ctx *ctx ) { + int log_pixels_x = GetDeviceCaps(ctx->hdc, ASPECTX); + int log_pixels_y = GetDeviceCaps(ctx->hdc, ASPECTY); PAGESIZE *page; - RESOLUTION *res; - INT resx = 0, resy = 0; dump_devmode(&ctx->Devmode->dmPublic); - if (ctx->Devmode->dmPublic.dmFields & (DM_PRINTQUALITY | DM_YRESOLUTION | DM_LOGPIXELS)) - { - if (ctx->Devmode->dmPublic.dmFields & DM_PRINTQUALITY) - resx = resy = ctx->Devmode->dmPublic.dmPrintQuality; - - if (ctx->Devmode->dmPublic.dmFields & DM_YRESOLUTION) - resy = ctx->Devmode->dmPublic.dmYResolution; - - if (ctx->Devmode->dmPublic.dmFields & DM_LOGPIXELS) - resx = resy = ctx->Devmode->dmPublic.dmLogPixels; - - LIST_FOR_EACH_ENTRY(res, &ctx->pi->ppd->Resolutions, RESOLUTION, entry) - { - if (res->resx == resx && res->resy == resy) - { - ctx->logPixelsX = resx; - ctx->logPixelsY = resy; - break; - } - } - - if (&res->entry == &ctx->pi->ppd->Resolutions) - { - WARN("Requested resolution %dx%d is not supported by device\n", resx, resy); - ctx->logPixelsX = ctx->pi->ppd->DefaultResolution; - ctx->logPixelsY = ctx->logPixelsX; - } - } - else - { - WARN("Using default device resolution %d\n", ctx->pi->ppd->DefaultResolution); - ctx->logPixelsX = ctx->pi->ppd->DefaultResolution; - ctx->logPixelsY = ctx->logPixelsX; - } - if(ctx->Devmode->dmPublic.dmFields & DM_PAPERSIZE) { LIST_FOR_EACH_ENTRY(page, &ctx->pi->ppd->PageSizes, PAGESIZE, entry) { if(page->WinPage == ctx->Devmode->dmPublic.dmPaperSize) @@ -462,25 +427,23 @@ static void PSDRV_UpdateDevCaps( print_ctx *ctx ) SetRectEmpty(&ctx->ImageableArea); } else if(page->ImageableArea) { /* ctx sizes in device units; ppd sizes in 1/72" */ - SetRect(&ctx->ImageableArea, page->ImageableArea->llx * ctx->logPixelsX / 72, - page->ImageableArea->ury * ctx->logPixelsY / 72, - page->ImageableArea->urx * ctx->logPixelsX / 72, - page->ImageableArea->lly * ctx->logPixelsY / 72); + SetRect(&ctx->ImageableArea, page->ImageableArea->llx * log_pixels_x / 72, + page->ImageableArea->ury * log_pixels_y / 72, + page->ImageableArea->urx * log_pixels_x / 72, + page->ImageableArea->lly * log_pixels_y / 72); } else { ctx->ImageableArea.left = ctx->ImageableArea.bottom = 0; - ctx->ImageableArea.right = - page->PaperDimension->x * ctx->logPixelsX / 72; - ctx->ImageableArea.top = - page->PaperDimension->y * ctx->logPixelsY / 72; + ctx->ImageableArea.right = page->PaperDimension->x * log_pixels_x / 72; + ctx->ImageableArea.top = page->PaperDimension->y * log_pixels_y / 72; } } else if((ctx->Devmode->dmPublic.dmFields & DM_PAPERLENGTH) && (ctx->Devmode->dmPublic.dmFields & DM_PAPERWIDTH)) { /* ctx sizes in device units; Devmode sizes in 1/10 mm */ ctx->ImageableArea.left = ctx->ImageableArea.bottom = 0; ctx->ImageableArea.right = - ctx->Devmode->dmPublic.dmPaperWidth * ctx->logPixelsX / 254; + ctx->Devmode->dmPublic.dmPaperWidth * log_pixels_x / 254; ctx->ImageableArea.top = - ctx->Devmode->dmPublic.dmPaperLength * ctx->logPixelsY / 254; + ctx->Devmode->dmPublic.dmPaperLength * log_pixels_y / 254; } else { FIXME("Odd dmFields %lx\n", ctx->Devmode->dmPublic.dmFields); SetRectEmpty(&ctx->ImageableArea); @@ -523,8 +486,7 @@ print_ctx *create_print_ctx( HDC hdc, const WCHAR *device, memcpy( ctx->Devmode, pi->Devmode, pi->Devmode->dmPublic.dmSize + pi->Devmode->dmPublic.dmDriverExtra ); ctx->pi = pi; - ctx->logPixelsX = pi->ppd->DefaultResolution; - ctx->logPixelsY = pi->ppd->DefaultResolution; + ctx->hdc = hdc; if (devmode) { @@ -533,7 +495,6 @@ print_ctx *create_print_ctx( HDC hdc, const WCHAR *device, } PSDRV_UpdateDevCaps( ctx ); - ctx->hdc = hdc; SelectObject( hdc, GetStockObject( DEVICE_DEFAULT_FONT )); return ctx; } diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 421f01302bf..751a5097034 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -400,7 +400,7 @@ INT PSDRV_WriteHeader( print_ctx *ctx, LPCWSTR title ) INPUTSLOT *slot = find_slot( ctx->pi->ppd, &ctx->Devmode->dmPublic ); PAGESIZE *page = find_pagesize( ctx->pi->ppd, &ctx->Devmode->dmPublic ); DUPLEX *duplex = find_duplex( ctx->pi->ppd, &ctx->Devmode->dmPublic ); - int llx, lly, urx, ury; + int llx, lly, urx, ury, log_pixels_x, log_pixels_y; int ret, len; const char * dmOrientation; @@ -429,10 +429,12 @@ INT PSDRV_WriteHeader( print_ctx *ctx, LPCWSTR title ) /* BBox co-ords are in default user co-ord system so urx < ury even in landscape mode */ - llx = ctx->ImageableArea.left * 72.0 / ctx->logPixelsX; - lly = ctx->ImageableArea.bottom * 72.0 / ctx->logPixelsY; - urx = ctx->ImageableArea.right * 72.0 / ctx->logPixelsX; - ury = ctx->ImageableArea.top * 72.0 / ctx->logPixelsY; + log_pixels_x = GetDeviceCaps(ctx->hdc, ASPECTX); + log_pixels_y = GetDeviceCaps(ctx->hdc, ASPECTY); + llx = ctx->ImageableArea.left * 72.0 / log_pixels_x; + lly = ctx->ImageableArea.bottom * 72.0 / log_pixels_y; + urx = ctx->ImageableArea.right * 72.0 / log_pixels_x; + ury = ctx->ImageableArea.top * 72.0 / log_pixels_y; /* FIXME should do something better with BBox */ dmOrientation = (ctx->Devmode->dmPublic.dmOrientation == DMORIENT_LANDSCAPE ? "Landscape" : "Portrait"); @@ -532,7 +534,7 @@ INT PSDRV_WriteNewPage( print_ctx *ctx ) } sprintf(buf, psnewpage, name, ctx->job.PageNo, - ctx->logPixelsX, ctx->logPixelsY, + GetDeviceCaps(ctx->hdc, ASPECTX), GetDeviceCaps(ctx->hdc, ASPECTY), xtrans, ytrans, rotation); if( write_spool( ctx, buf, strlen(buf) ) != strlen(buf) ) { @@ -981,8 +983,8 @@ BOOL PSDRV_WriteDIBPatternDict(print_ctx *ctx, const BITMAPINFO *bmi, BYTE *bits PSDRV_WriteIndexColorSpaceEnd(ctx); /* Windows seems to scale patterns so that a one pixel corresponds to 1/300" */ - w_mult = (ctx->logPixelsX + 150) / 300; - h_mult = (ctx->logPixelsY + 150) / 300; + w_mult = (GetDeviceCaps(ctx->hdc, ASPECTX) + 150) / 300; + h_mult = (GetDeviceCaps(ctx->hdc, ASPECTY) + 150) / 300; sprintf(buf, do_pattern, w * w_mult, h * h_mult, w * w_mult, h * h_mult, w * w_mult, h * h_mult); PSDRV_WriteSpool(ctx, buf, strlen(buf)); HeapFree( GetProcessHeap(), 0, buf ); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index dd63c0000cf..20e80e9f1aa 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -346,9 +346,6 @@ typedef struct are not rotated in landscape mode, so PageSize.cx is generally < PageSize.cy */ - int logPixelsX; - int logPixelsY; - int pathdepth; } print_ctx;

1 0

Piotr Caban : wineps: Remove unused fields from print_ctx.
by Alexandre Julliard 19 May '23

19 May '23

Module: wine Branch: master Commit: 3fca78fbe42907e74fa3397246904863e759ffda URL: https://gitlab.winehq.org/wine/wine/-/commit/3fca78fbe42907e74fa33972469048… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 17 18:20:52 2023 +0200 wineps: Remove unused fields from print_ctx. --- dlls/wineps.drv/color.c | 28 ---------------------------- dlls/wineps.drv/init.c | 42 ++++++------------------------------------ dlls/wineps.drv/ps.c | 1 - dlls/wineps.drv/psdrv.h | 7 ------- 4 files changed, 6 insertions(+), 72 deletions(-) diff --git a/dlls/wineps.drv/color.c b/dlls/wineps.drv/color.c index 26c235a8c6c..db14319cbd6 100644 --- a/dlls/wineps.drv/color.c +++ b/dlls/wineps.drv/color.c @@ -24,34 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); -/********************************************************************** - * PSDRV_CopyColor - * - * Copies col2 into col1. Return FALSE on error. - */ -BOOL PSDRV_CopyColor(PSCOLOR *col1, PSCOLOR *col2) -{ - - switch(col2->type) { - case PSCOLOR_GRAY: - col1->value.gray.i = col2->value.gray.i; - break; - - case PSCOLOR_RGB: - col1->value.rgb.r = col2->value.rgb.r; - col1->value.rgb.g = col2->value.rgb.g; - col1->value.rgb.b = col2->value.rgb.b; - break; - - default: - ERR("Unknown colour type %d\n", col1->type); - return FALSE; - } - - col1->type = col2->type; - return TRUE; -} - PSRGB rgb_to_grayscale_scale( void ) { static const PSRGB scale = {0.3, 0.59, 0.11}; diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 9cbea031d48..9d59830c60d 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -412,7 +412,7 @@ static void PSDRV_UpdateDevCaps( print_ctx *ctx ) { PAGESIZE *page; RESOLUTION *res; - INT width = 0, height = 0, resx = 0, resy = 0; + INT resx = 0, resy = 0; dump_devmode(&ctx->Devmode->dmPublic); @@ -460,63 +460,33 @@ static void PSDRV_UpdateDevCaps( print_ctx *ctx ) if(&page->entry == &ctx->pi->ppd->PageSizes) { FIXME("Can't find page\n"); SetRectEmpty(&ctx->ImageableArea); - ctx->PageSize.cx = 0; - ctx->PageSize.cy = 0; } else if(page->ImageableArea) { /* ctx sizes in device units; ppd sizes in 1/72" */ SetRect(&ctx->ImageableArea, page->ImageableArea->llx * ctx->logPixelsX / 72, page->ImageableArea->ury * ctx->logPixelsY / 72, page->ImageableArea->urx * ctx->logPixelsX / 72, page->ImageableArea->lly * ctx->logPixelsY / 72); - ctx->PageSize.cx = page->PaperDimension->x * - ctx->logPixelsX / 72; - ctx->PageSize.cy = page->PaperDimension->y * - ctx->logPixelsY / 72; } else { ctx->ImageableArea.left = ctx->ImageableArea.bottom = 0; - ctx->ImageableArea.right = ctx->PageSize.cx = + ctx->ImageableArea.right = page->PaperDimension->x * ctx->logPixelsX / 72; - ctx->ImageableArea.top = ctx->PageSize.cy = + ctx->ImageableArea.top = page->PaperDimension->y * ctx->logPixelsY / 72; } } else if((ctx->Devmode->dmPublic.dmFields & DM_PAPERLENGTH) && (ctx->Devmode->dmPublic.dmFields & DM_PAPERWIDTH)) { /* ctx sizes in device units; Devmode sizes in 1/10 mm */ ctx->ImageableArea.left = ctx->ImageableArea.bottom = 0; - ctx->ImageableArea.right = ctx->PageSize.cx = + ctx->ImageableArea.right = ctx->Devmode->dmPublic.dmPaperWidth * ctx->logPixelsX / 254; - ctx->ImageableArea.top = ctx->PageSize.cy = + ctx->ImageableArea.top = ctx->Devmode->dmPublic.dmPaperLength * ctx->logPixelsY / 254; } else { FIXME("Odd dmFields %lx\n", ctx->Devmode->dmPublic.dmFields); SetRectEmpty(&ctx->ImageableArea); - ctx->PageSize.cx = 0; - ctx->PageSize.cy = 0; } - TRACE("ImageableArea = %s: PageSize = %ldx%ld\n", wine_dbgstr_rect(&ctx->ImageableArea), - ctx->PageSize.cx, ctx->PageSize.cy); - - /* these are in device units */ - width = ctx->ImageableArea.right - ctx->ImageableArea.left; - height = ctx->ImageableArea.top - ctx->ImageableArea.bottom; - - if(ctx->Devmode->dmPublic.dmOrientation == DMORIENT_PORTRAIT) { - ctx->horzRes = width; - ctx->vertRes = height; - } else { - ctx->horzRes = height; - ctx->vertRes = width; - } - - /* these are in mm */ - ctx->horzSize = (ctx->horzRes * 25.4) / ctx->logPixelsX; - ctx->vertSize = (ctx->vertRes * 25.4) / ctx->logPixelsY; - - TRACE("devcaps: horzSize = %dmm, vertSize = %dmm, " - "horzRes = %d, vertRes = %d\n", - ctx->horzSize, ctx->vertSize, - ctx->horzRes, ctx->vertRes); + TRACE("ImageableArea = %s\n", wine_dbgstr_rect(&ctx->ImageableArea)); } print_ctx *create_print_ctx( HDC hdc, const WCHAR *device, diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 007250e55db..421f01302bf 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -635,7 +635,6 @@ BOOL PSDRV_WriteSetColor(print_ctx *ctx, PSCOLOR *color) { char buf[256]; - PSDRV_CopyColor(&ctx->inkColor, color); switch(color->type) { case PSCOLOR_RGB: push_lc_numeric("C"); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index afeaa5fec0c..dd63c0000cf 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -338,20 +338,14 @@ typedef struct PSPEN pen; PSBRUSH brush; PSCOLOR bkColor; - PSCOLOR inkColor; /* Last colour set */ JOB job; PSDRV_DEVMODE *Devmode; PRINTERINFO *pi; - SIZE PageSize; /* Physical page size in device units */ RECT ImageableArea; /* Imageable area in device units */ /* NB both PageSize and ImageableArea are not rotated in landscape mode, so PageSize.cx is generally < PageSize.cy */ - int horzRes; /* device caps */ - int vertRes; - int horzSize; - int vertSize; int logPixelsX; int logPixelsY; @@ -446,7 +440,6 @@ extern void PSDRV_AddClip( print_ctx *ctx, HRGN hrgn ) DECLSPEC_HIDDEN; extern void PSDRV_SetClip( print_ctx *ctx ) DECLSPEC_HIDDEN; extern void PSDRV_ResetClip( print_ctx *ctx ) DECLSPEC_HIDDEN; -extern BOOL PSDRV_CopyColor(PSCOLOR *col1, PSCOLOR *col2) DECLSPEC_HIDDEN; extern void PSDRV_CreateColor( print_ctx *ctx, PSCOLOR *pscolor, COLORREF wincolor ) DECLSPEC_HIDDEN; extern PSRGB rgb_to_grayscale_scale( void ) DECLSPEC_HIDDEN;

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2023