May 2023 - Wine-commits - list.winehq.org

Francois Gouget : kernelbase/tests: Use win_skip() for missing APIs.
by Alexandre Julliard 11 May '23

11 May '23

Module: wine Branch: master Commit: c6ab26bd04130f38e8c3c4158ef049f092d985e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/c6ab26bd04130f38e8c3c4158ef049… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 10 17:16:46 2023 +0200 kernelbase/tests: Use win_skip() for missing APIs. --- dlls/kernelbase/tests/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/tests/process.c b/dlls/kernelbase/tests/process.c index b8c3bbb7276..2979af39551 100644 --- a/dlls/kernelbase/tests/process.c +++ b/dlls/kernelbase/tests/process.c @@ -49,7 +49,7 @@ static void test_CompareObjectHandles(void) if (!pCompareObjectHandles) { - skip("CompareObjectHandles is not available.\n"); + win_skip("CompareObjectHandles is not available.\n"); return; }

1 0

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

11 May '23

Module: wine Branch: master Commit: 2c74f4ede1ebb0ac25eb4c1a20ec99c8af4f29e0 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c74f4ede1ebb0ac25eb4c1a20ec99… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 5 14:24:43 2023 +0200 winex11: Use the default IME implementation for ImeSetCompositionString. --- dlls/imm32/ime.c | 70 ++++++++++++++++++++++++++++++++++----- dlls/winex11.drv/ime.c | 70 +-------------------------------------- dlls/winex11.drv/winex11.drv.spec | 1 - 3 files changed, 63 insertions(+), 78 deletions(-) diff --git a/dlls/imm32/ime.c b/dlls/imm32/ime.c index 44b1173b1db..3e5f34d6760 100644 --- a/dlls/imm32/ime.c +++ b/dlls/imm32/ime.c @@ -83,16 +83,51 @@ static WCHAR *input_context_get_comp_str( INPUTCONTEXT *ctx, BOOL result, UINT * return text; } -static void input_context_reset_comp_str( INPUTCONTEXT *ctx ) +static void input_context_set_comp_str( INPUTCONTEXT *ctx, const WCHAR *str, UINT len ) { COMPOSITIONSTRING *compstr; + HIMCC himcc; + UINT size; + BYTE *dst; + + size = sizeof(*compstr); + size += len * sizeof(WCHAR); /* GCS_COMPSTR */ + size += len; /* GCS_COMPSTRATTR */ + size += 2 * sizeof(DWORD); /* GCS_COMPSTRCLAUSE */ - if (!(compstr = ImmLockIMCC( ctx->hCompStr ))) + if (!(himcc = ImmReSizeIMCC( ctx->hCompStr, size ))) + WARN( "Failed to resize input context composition string\n" ); + else if (!(compstr = ImmLockIMCC( (ctx->hCompStr = himcc) ))) WARN( "Failed to lock input context composition string\n" ); else { memset( compstr, 0, sizeof(*compstr) ); compstr->dwSize = sizeof(*compstr); + + if (len) + { + compstr->dwCursorPos = len; + + compstr->dwCompStrLen = len; + compstr->dwCompStrOffset = compstr->dwSize; + dst = (BYTE *)compstr + compstr->dwCompStrOffset; + memcpy( dst, str, compstr->dwCompStrLen * sizeof(WCHAR) ); + compstr->dwSize += compstr->dwCompStrLen * sizeof(WCHAR); + + compstr->dwCompClauseLen = 2 * sizeof(DWORD); + compstr->dwCompClauseOffset = compstr->dwSize; + dst = (BYTE *)compstr + compstr->dwCompClauseOffset; + *((DWORD *)dst + 0) = 0; + *((DWORD *)dst + 1) = compstr->dwCompStrLen; + compstr->dwSize += compstr->dwCompClauseLen; + + compstr->dwCompAttrLen = compstr->dwCompStrLen; + compstr->dwCompAttrOffset = compstr->dwSize; + dst = (BYTE *)compstr + compstr->dwCompAttrOffset; + memset( dst, ATTR_INPUT, compstr->dwCompAttrLen ); + compstr->dwSize += compstr->dwCompAttrLen; + } + ImmUnlockIMCC( ctx->hCompStr ); } } @@ -437,10 +472,29 @@ DWORD WINAPI ImeConversionList( HIMC himc, const WCHAR *source, CANDIDATELIST *d BOOL WINAPI ImeSetCompositionString( HIMC himc, DWORD index, const void *comp, DWORD comp_len, const void *read, DWORD read_len ) { - FIXME( "himc %p, index %lu, comp %p, comp_len %lu, read %p, read_len %lu stub!\n", - himc, index, comp, comp_len, read, read_len ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; + INPUTCONTEXT *ctx; + + FIXME( "himc %p, index %lu, comp %p, comp_len %lu, read %p, read_len %lu semi-stub!\n", + himc, index, comp, comp_len, read, read_len ); + if (read && read_len) FIXME( "Read string unimplemented\n" ); + if (index != SCS_SETSTR && index != SCS_CHANGECLAUSE && index != SCS_CHANGEATTR) return FALSE; + + if (!(ctx = ImmLockIMC( himc ))) return FALSE; + + if (index != SCS_SETSTR) + FIXME( "index %#lx not implemented\n", index ); + else + { + UINT flags = GCS_COMPSTR | GCS_COMPCLAUSE | GCS_COMPATTR | GCS_DELTASTART | GCS_CURSORPOS; + WCHAR wparam = comp && comp_len >= sizeof(WCHAR) ? *(WCHAR *)comp : 0; + input_context_set_comp_str( ctx, comp, comp_len / sizeof(WCHAR) ); + ime_set_composition_status( himc, TRUE ); + ime_send_message( himc, WM_IME_COMPOSITION, wparam, flags ); + } + + ImmUnlockIMC( himc ); + + return TRUE; } BOOL WINAPI NotifyIME( HIMC himc, DWORD action, DWORD index, DWORD value ) @@ -468,7 +522,7 @@ BOOL WINAPI NotifyIME( HIMC himc, DWORD action, DWORD index, DWORD value ) case IMC_SETOPENSTATUS: if (!ctx->fOpen) { - input_context_reset_comp_str( ctx ); + input_context_set_comp_str( ctx, NULL, 0 ); ime_set_composition_status( himc, FALSE ); } NtUserNotifyIMEStatus( ctx->hWnd, ctx->fOpen ); @@ -511,7 +565,7 @@ BOOL WINAPI NotifyIME( HIMC himc, DWORD action, DWORD index, DWORD value ) break; } case CPS_CANCEL: - input_context_reset_comp_str( ctx ); + input_context_set_comp_str( ctx, NULL, 0 ); ImmSetOpenStatus( himc, FALSE ); break; default: diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 3cc73c3974c..b46c2d86892 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -529,74 +529,6 @@ UINT WINAPI ImeToAsciiEx (UINT uVKey, UINT uScanCode, const LPBYTE lpbKeyState, return 0; } -BOOL WINAPI ImeSetCompositionString(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, - DWORD dwCompLen, LPCVOID lpRead, - DWORD dwReadLen) -{ - LPINPUTCONTEXT lpIMC; - DWORD flags = 0; - WCHAR wParam = 0; - - TRACE("(%p, %ld, %p, %ld, %p, %ld):\n", - hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); - - - if (hIMC != FROM_X11) - FIXME("PROBLEM: This only sets the wine level string\n"); - - /* - * Explanation: - * this sets the composition string in the imm32.dll level - * of the composition buffer. we cannot manipulate the xim level - * buffer, which means that once the xim level buffer changes again - * any call to this function from the application will be lost - */ - - if (lpRead && dwReadLen) - FIXME("Reading string unimplemented\n"); - - lpIMC = LockRealIMC(hIMC); - - if (lpIMC == NULL) - return FALSE; - - if (dwIndex == SCS_SETSTR) - { - HIMCC newCompStr; - - ime_set_composition_status( hIMC, TRUE ); - - /* clear existing result */ - newCompStr = updateResultStr(lpIMC->hCompStr, NULL, 0); - ImmDestroyIMCC(lpIMC->hCompStr); - lpIMC->hCompStr = newCompStr; - - flags = GCS_COMPSTR; - - if (dwCompLen && lpComp) - { - newCompStr = updateCompStr(lpIMC->hCompStr, (LPCWSTR)lpComp, dwCompLen / sizeof(WCHAR)); - ImmDestroyIMCC(lpIMC->hCompStr); - lpIMC->hCompStr = newCompStr; - - wParam = ((const WCHAR*)lpComp)[0]; - flags |= GCS_COMPCLAUSE | GCS_COMPATTR | GCS_DELTASTART; - } - else - { - newCompStr = updateCompStr(lpIMC->hCompStr, NULL, 0); - ImmDestroyIMCC(lpIMC->hCompStr); - lpIMC->hCompStr = newCompStr; - } - } - - GenerateIMEMessage(hIMC, WM_IME_COMPOSITION, wParam, flags); - ImmUnlockIMCC(lpIMC->hPrivate); - UnlockRealIMC(hIMC); - - return TRUE; -} - /* Interfaces to XIM and other parts of winex11drv */ NTSTATUS x11drv_ime_set_open_status( UINT open ) @@ -693,7 +625,7 @@ NTSTATUS x11drv_ime_update_association( UINT arg ) NTSTATUS WINAPI x11drv_ime_set_composition_string( void *param, ULONG size ) { - return ImeSetCompositionString(FROM_X11, SCS_SETSTR, param, size, NULL, 0); + return ImmSetCompositionStringW( RealIMC(FROM_X11), SCS_SETSTR, param, size, NULL, 0 ); } NTSTATUS WINAPI x11drv_ime_set_result( void *params, ULONG len ) diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index da502c4832e..64154d709a2 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -13,5 +13,4 @@ #IME Interface @ stdcall ImeSelect(long long) @ stdcall ImeToAsciiEx(long long ptr ptr long long) -@ stdcall ImeSetCompositionString(long long ptr long ptr long) @ stdcall ImeProcessKey(long long long ptr)

1 0

Rémi Bernon : winemac: Use the default IME implementation for ImeSetCompositionString.
by Alexandre Julliard 11 May '23

11 May '23

Module: wine Branch: master Commit: ab98b13480049b3cdb0e842adcde28b8ee9e265e URL: https://gitlab.winehq.org/wine/wine/-/commit/ab98b13480049b3cdb0e842adcde28… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 9 13:44:43 2023 +0200 winemac: Use the default IME implementation for ImeSetCompositionString. --- dlls/winemac.drv/ime.c | 11 ----------- dlls/winemac.drv/winemac.drv.spec | 1 - 2 files changed, 12 deletions(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 668a0ecd6ac..681d93d1e43 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -727,17 +727,6 @@ static BOOL IME_SetCompositionString(void* hIMC, DWORD dwIndex, LPCVOID lpComp, return TRUE; } -BOOL WINAPI ImeSetCompositionString(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, - LPCVOID lpRead, DWORD dwReadLen) -{ - TRACE("(%p, %ld, %p, %ld, %p, %ld):\n", hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); - - if (lpRead && dwReadLen) - FIXME("Reading string unimplemented\n"); - - return IME_SetCompositionString(hIMC, dwIndex, lpComp, dwCompLen, 0, FALSE); -} - static void IME_NotifyComplete(void* hIMC) { ImmNotifyIME(hIMC, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 5a9403c3cf5..aca1c58cf13 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -4,5 +4,4 @@ # IME @ stdcall ImeProcessKey(long long long ptr) @ stdcall ImeSelect(long long) -@ stdcall ImeSetCompositionString(long long ptr long ptr long) @ stdcall ImeToAsciiEx(long long ptr ptr long long)

1 0

Piotr Caban : wineps: Remove gdi_physdev from print_ctx structure.
by Alexandre Julliard 11 May '23

11 May '23

Module: wine Branch: master Commit: faba25c63751cf12a98d35281f23cf0c8fd555af URL: https://gitlab.winehq.org/wine/wine/-/commit/faba25c63751cf12a98d35281f23cf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 8 18:39:15 2023 +0200 wineps: Remove gdi_physdev from print_ctx structure. --- dlls/wineps.drv/bitmap.c | 2 +- dlls/wineps.drv/brush.c | 8 +-- dlls/wineps.drv/builtin.c | 4 +- dlls/wineps.drv/clipping.c | 6 +-- dlls/wineps.drv/download.c | 26 ++++----- dlls/wineps.drv/escape.c | 6 +-- dlls/wineps.drv/font.c | 2 +- dlls/wineps.drv/graphics.c | 52 +++++++++--------- dlls/wineps.drv/init.c | 2 +- dlls/wineps.drv/pen.c | 4 +- dlls/wineps.drv/printproc.c | 126 ++++++++++++++++++++++---------------------- dlls/wineps.drv/ps.c | 4 +- dlls/wineps.drv/psdrv.h | 2 +- dlls/wineps.drv/text.c | 8 +-- dlls/wineps.drv/type1.c | 4 +- dlls/wineps.drv/type42.c | 4 +- 16 files changed, 130 insertions(+), 130 deletions(-)

1 0

Piotr Caban : wineps: Remove unused fields from PSDRV_DEVMODE.
by Alexandre Julliard 11 May '23

11 May '23

Module: wine Branch: master Commit: 919392848adc61f91d290ea57c86755c174f8173 URL: https://gitlab.winehq.org/wine/wine/-/commit/919392848adc61f91d290ea57c8675… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 8 20:27:24 2023 +0200 wineps: Remove unused fields from PSDRV_DEVMODE. --- dlls/wineps.drv/init.c | 6 ------ dlls/wineps.drv/psdrv.h | 13 ------------- 2 files changed, 19 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 96b0b1689fa..2d05d297323 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -82,12 +82,6 @@ static const PSDRV_DEVMODE DefaultDevmode = /* dmPanningWidth */ 0, /* dmPanningHeight */ 0 }, - { /* dmDocPrivate */ - /* dummy */ 0 - }, - { /* dmDrvPrivate */ - /* numInstalledOptions */ 0 - } }; HINSTANCE PSDRV_hInstance = 0; diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 65894c9d75a..e19e8c531a3 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -221,19 +221,6 @@ typedef struct { typedef struct { DEVMODEW dmPublic; - struct _tagdocprivate { - int dummy; - } dmDocPrivate; - struct _tagdrvprivate { - UINT numInstalledOptions; /* Options at end of struct */ - } dmDrvPrivate; - -/* Now comes: - -numInstalledOptions of OPTIONs - -*/ - } PSDRV_DEVMODE; typedef struct

1 0

Piotr Caban : wineps: Use standard DEVMODEW structure instead of PSDRV_DEVMODE when possible.
by Alexandre Julliard 11 May '23

11 May '23

Module: wine Branch: master Commit: 5b166890f0a914a31408cb2c9e9f1ce5c709fe33 URL: https://gitlab.winehq.org/wine/wine/-/commit/5b166890f0a914a31408cb2c9e9f1c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 9 15:49:12 2023 +0200 wineps: Use standard DEVMODEW structure instead of PSDRV_DEVMODE when possible. --- dlls/wineps.drv/driver.c | 142 ++++++++++++++++++++--------------------- dlls/wineps.drv/init.c | 24 +++---- dlls/wineps.drv/printproc.c | 3 +- dlls/wineps.drv/ps.c | 6 +- dlls/wineps.drv/psdrv.h | 10 +-- dlls/wineps.drv/unixlib.c | 152 ++++++++++++++++++++++---------------------- 6 files changed, 169 insertions(+), 168 deletions(-)

1 0

Piotr Caban : wineps: Store data from PPD file used in unixlib in DEVMODE.
by Alexandre Julliard 11 May '23

11 May '23

Module: wine Branch: master Commit: aa3699dd59c96e9f315a2a41e5205b088165e18d URL: https://gitlab.winehq.org/wine/wine/-/commit/aa3699dd59c96e9f315a2a41e5205b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 8 21:03:31 2023 +0200 wineps: Store data from PPD file used in unixlib in DEVMODE. --- dlls/wineps.drv/init.c | 85 ++++++++++++++++++++++++++++++----- dlls/wineps.drv/psdrv.h | 9 +++- dlls/wineps.drv/unixlib.c | 112 +++++++++++++++++++++++----------------------- dlls/wineps.drv/unixlib.h | 32 +++++++++++++ 4 files changed, 169 insertions(+), 69 deletions(-)

1 0

Piotr Caban : wineps: Store font substitution table in DEVMODE.
by Alexandre Julliard 11 May '23

11 May '23

Module: wine Branch: master Commit: 19eab9c0e59201277f359d55ee5747383e014e87 URL: https://gitlab.winehq.org/wine/wine/-/commit/19eab9c0e59201277f359d55ee5747… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 9 17:47:06 2023 +0200 wineps: Store font substitution table in DEVMODE. --- dlls/wineps.drv/init.c | 23 ++++++++++++++++++----- dlls/wineps.drv/psdrv.h | 1 + dlls/wineps.drv/unixlib.c | 37 +++++++++++++++++++------------------ dlls/wineps.drv/unixlib.h | 6 ++++++ 4 files changed, 44 insertions(+), 23 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index c5f97c85073..0da75ac60c9 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -503,10 +503,11 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) WCHAR *ppd_filename = NULL; char *nameA = NULL; BOOL using_default_devmode = FALSE; - int len, input_slots, resolutions, page_sizes, size; + int i, len, input_slots, resolutions, page_sizes, font_subs, size; struct input_slot *dm_slot; struct resolution *dm_res; struct page_size *dm_page; + struct font_sub *dm_sub; INPUTSLOT *slot; RESOLUTION *res; PAGESIZE *page; @@ -544,11 +545,17 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) goto fail; } + pi->FontSubTable = load_font_sub_table( hPrinter, &pi->FontSubTableSize ); + input_slots = list_count( &pi->ppd->InputSlots ); resolutions = list_count( &pi->ppd->Resolutions ); page_sizes = list_count( &pi->ppd->PageSizes ); - size = FIELD_OFFSET(PSDRV_DEVMODE, data[input_slots * sizeof(struct input_slot) + - resolutions * sizeof(struct resolution) + page_sizes * sizeof(struct page_size)]); + font_subs = pi->FontSubTableSize; + size = FIELD_OFFSET(PSDRV_DEVMODE, data[ + input_slots * sizeof(struct input_slot) + + resolutions * sizeof(struct resolution) + + page_sizes * sizeof(struct page_size) + + font_subs * sizeof(struct font_sub)]); pi->Devmode = get_devmode( hPrinter, name, &using_default_devmode, size ); if (!pi->Devmode) goto fail; @@ -622,6 +629,14 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) dm_page->win_page = page->WinPage; dm_page++; } + + dm_sub = (struct font_sub *)dm_page; + for (i = 0; i < font_subs; i++) + { + lstrcpynW(dm_sub->name, pi->FontSubTable[i].pValueName, ARRAY_SIZE(dm_sub->name)); + lstrcpynW(dm_sub->sub, (WCHAR *)pi->FontSubTable[i].pData, ARRAY_SIZE(dm_sub->sub)); + dm_sub++; + } } /* Duplex is indicated by the setting of the DM_DUPLEX bit in dmFields. @@ -640,8 +655,6 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) set_devmode( hPrinter, pi->Devmode ); - pi->FontSubTable = load_font_sub_table( hPrinter, &pi->FontSubTableSize ); - LIST_FOR_EACH_ENTRY( font, &pi->ppd->InstalledFonts, FONTNAME, entry ) { afm = PSDRV_FindAFMinList(PSDRV_AFMFontList, font->Name); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 30ca6755cc6..29ce1e80d9d 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -227,6 +227,7 @@ typedef struct { int input_slots; int resolutions; int page_sizes; + int font_subs; BYTE data[1]; } PSDRV_DEVMODE; diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index 1ca87461d17..792a2ad69d3 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -1050,9 +1050,11 @@ static HFONT CDECL select_font(PHYSDEV dev, HFONT hfont, UINT *aa_flags) { PSDRV_PDEVICE *pdev = get_psdrv_dev(dev); PHYSDEV next = GET_NEXT_PHYSDEV(dev, pSelectFont); + const struct font_sub *font_sub; HFONT ret; LOGFONTW lf; BOOL subst = FALSE; + int i; if (!NtGdiExtGetObjectW(hfont, sizeof(lf), &lf)) return 0; @@ -1097,28 +1099,27 @@ static HFONT CDECL select_font(PHYSDEV dev, HFONT hfont, UINT *aa_flags) } } - if (pdev->pi->pi->FontSubTableSize != 0) + font_sub = (const struct font_sub *)(pdev->devmode->data + + pdev->devmode->input_slots * sizeof(struct input_slot) + + pdev->devmode->resolutions * sizeof(struct resolution) + + pdev->devmode->page_sizes * sizeof(struct page_size)); + for (i = 0; i < pdev->devmode->font_subs; i++) { - DWORD i; - - for (i = 0; i < pdev->pi->pi->FontSubTableSize; ++i) + if (!wcsicmp(lf.lfFaceName, font_sub[i].name)) { - if (!wcsicmp(lf.lfFaceName, pdev->pi->pi->FontSubTable[i].pValueName)) + TRACE("substituting facename %s for %s\n", + debugstr_w(font_sub[i].sub), debugstr_w(lf.lfFaceName)); + if (wcslen(font_sub[i].sub) < LF_FACESIZE) { - TRACE("substituting facename %s for %s\n", - debugstr_w((WCHAR *)pdev->pi->pi->FontSubTable[i].pData), debugstr_w(lf.lfFaceName)); - if (wcslen((WCHAR *)pdev->pi->pi->FontSubTable[i].pData) < LF_FACESIZE) - { - wcscpy(lf.lfFaceName, (WCHAR *)pdev->pi->pi->FontSubTable[i].pData); - subst = TRUE; - } - else - { - WARN("Facename %s is too long; ignoring substitution\n", - debugstr_w((WCHAR *)pdev->pi->pi->FontSubTable[i].pData)); - } - break; + wcscpy(lf.lfFaceName, font_sub[i].sub); + subst = TRUE; } + else + { + WARN("Facename %s is too long; ignoring substitution\n", + debugstr_w(font_sub[i].sub)); + } + break; } } diff --git a/dlls/wineps.drv/unixlib.h b/dlls/wineps.drv/unixlib.h index 1c71d758a91..931bc14c152 100644 --- a/dlls/wineps.drv/unixlib.h +++ b/dlls/wineps.drv/unixlib.h @@ -60,6 +60,12 @@ struct page_size short win_page; }; +struct font_sub +{ + WCHAR name[LF_FACESIZE]; + WCHAR sub[LF_FACESIZE]; +}; + /* Unix calls */ enum wineps_funcs {

1 0

Paul Gofman : ntdll/tests: Add tests for freeing a part of view.
by Alexandre Julliard 11 May '23

11 May '23

Module: wine Branch: master Commit: 1d3c0d738cc8ff37751eaedd75d1a6e9fb04636e URL: https://gitlab.winehq.org/wine/wine/-/commit/1d3c0d738cc8ff37751eaedd75d1a6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Nov 11 17:51:26 2022 -0600 ntdll/tests: Add tests for freeing a part of view. --- dlls/ntdll/tests/virtual.c | 70 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index bfd27f498e2..cc551800811 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -1837,21 +1837,85 @@ static void test_syscalls(void) static void test_NtFreeVirtualMemory(void) { + void *addr1, *addr; NTSTATUS status; - void *addr1; SIZE_T size; size = 0x10000; addr1 = NULL; - status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr1, 0, &size, MEM_RESERVE, PAGE_READWRITE); + status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr1, 0, &size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); size = 0; status = NtFreeVirtualMemory(NULL, &addr1, &size, MEM_RELEASE); ok(status == STATUS_INVALID_HANDLE, "Unexpected status %08lx.\n", status); + addr = (char *)addr1 + 0x1000; + size = 0; + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr, &size, MEM_RELEASE); + ok(status == STATUS_FREE_VM_NOT_AT_BASE, "Unexpected status %08lx.\n", status); + + size = 0x11000; status = NtFreeVirtualMemory(NtCurrentProcess(), &addr1, &size, MEM_RELEASE); - ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + todo_wine ok(status == STATUS_UNABLE_TO_FREE_VM, "Unexpected status %08lx.\n", status); + + addr = (char *)addr1 + 0x1001; + size = 0xffff; + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr, &size, MEM_RELEASE); + todo_wine ok(status == STATUS_UNABLE_TO_FREE_VM, "Unexpected status %08lx.\n", status); + ok(size == 0xffff, "Unexpected size %p.\n", (void *)size); + ok(addr == (char *)addr1 + 0x1001, "Got addr %p, addr1 %p.\n", addr, addr1); + + size = 0xfff; + addr = (char *)addr1 + 0x1001; + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr, &size, MEM_RELEASE); + todo_wine ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + *(volatile char *)addr1 = 1; + *((volatile char *)addr1 + 0x2000) = 1; + todo_wine ok(size == 0x1000, "Unexpected size %p.\n", (void *)size); + todo_wine ok(addr == (char *)addr1 + 0x1000, "Got addr %p, addr1 %p.\n", addr, addr1); + + size = 0xfff; + addr = (char *)addr1 + 1; + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr, &size, MEM_RELEASE); + todo_wine ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + *((volatile char *)addr1 + 0x2000) = 1; + todo_wine ok(size == 0x1000, "Unexpected size %p.\n", (void *)size); + todo_wine ok(addr == addr1, "Got addr %p, addr1 %p.\n", addr, addr1); + + size = 0x1000; + addr = addr1; + status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr, 0, &size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); + todo_wine ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + ok(addr == addr1, "Unexpected addr %p, addr1 %p.\n", addr, addr1); + ok(size == 0x1000, "Unexpected size %p.\n", (void *)size); + + size = 0x10000; + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr1, &size, MEM_DECOMMIT); + todo_wine ok(status == STATUS_UNABLE_TO_FREE_VM, "Unexpected status %08lx.\n", status); + + size = 0x10000; + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr1, &size, MEM_RELEASE); + todo_wine ok(status == STATUS_UNABLE_TO_FREE_VM, "Unexpected status %08lx.\n", status); + + size = 0; + addr = (char *)addr1 + 0x1000; + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr, &size, MEM_RELEASE); + todo_wine ok(status == STATUS_MEMORY_NOT_ALLOCATED, "Unexpected status %08lx.\n", status); + + size = 0x1000; + addr = (char *)addr1 + 0x1000; + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr, &size, MEM_DECOMMIT); + todo_wine ok(status == STATUS_MEMORY_NOT_ALLOCATED, "Unexpected status %08lx.\n", status); + + size = 0; + addr = (char *)addr1 + 0x2000; + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr, &size, MEM_RELEASE); + todo_wine ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + + size = 0x1000; + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr1, &size, MEM_RELEASE); + todo_wine ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); } static void test_prefetch(void)

1 0

Paul Gofman : kernelbase: Validate nonzero size for MEM_RELEASE in VirtualFreeEx().
by Alexandre Julliard 11 May '23

11 May '23

Module: wine Branch: master Commit: d8fc23d86e730e0ff8a2ab8e02285359a27c4a55 URL: https://gitlab.winehq.org/wine/wine/-/commit/d8fc23d86e730e0ff8a2ab8e022853… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Nov 11 17:56:42 2022 -0600 kernelbase: Validate nonzero size for MEM_RELEASE in VirtualFreeEx(). --- dlls/kernelbase/memory.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index c4a484b5a30..4188eebf181 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -457,6 +457,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH VirtualFree( void *addr, SIZE_T size, DWORD type ) */ BOOL WINAPI DECLSPEC_HOTPATCH VirtualFreeEx( HANDLE process, void *addr, SIZE_T size, DWORD type ) { + if (type == MEM_RELEASE && size) + { + WARN( "Trying to release memory with specified size.\n" ); + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } return set_ntstatus( NtFreeVirtualMemory( process, &addr, &size, type )); }

1 0