- Wine-Devel - list.winehq.org

[PATCH v6] msvcrt/tests: Add test for fopen/_open access hints
by Piotr Caban Aug. 18, 2021

Aug. 18, 2021

From: Luke Deller <luke(a)deller.id.au> Signed-off-by: Luke Deller <luke(a)deller.id.au> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v6: - move test file to temp directory - remove tests that doesn't test anything - reorganize the code dlls/msvcrt/tests/file.c | 78 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+)

1 0

[PATCH 1/2] dsound: Commit next audio chunk between play cursor and write cursor to playing.
by Eduard Permyakov Aug. 18, 2021

Aug. 18, 2021

This region of the audio buffer is forbidden to be written to by the DirectSound specification. The documentation states: "The write cursor is the point after which it is safe to write data into the buffer. The block between the play cursor and the write cursor is already committed to be played, and cannot be changed safely." However, some applications still do this, which has lead to audio glitches only when using the Wine DirectSound implementation. Experiments showed that the native DirctSound implementation will still play the old audio the first time around when the buffer region gets overwritten. Use an approach of copying the next forbidden region into a "committed buffer" to add the same behavior to the Wine implementation. Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> --- dlls/dsound/buffer.c | 8 ++++++++ dlls/dsound/dsound_convert.c | 30 ++++++++++++++++++++---------- dlls/dsound/dsound_private.h | 5 ++++- dlls/dsound/mixer.c | 19 +++++++++++++++++++ 4 files changed, 51 insertions(+), 11 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index dc3b54906ce..df8962f1c0f 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -1081,6 +1081,13 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds /* calculate fragment size and write lead */ DSOUND_RecalcFormat(dsb); + dsb->committedbuff = HeapAlloc(GetProcessHeap(), 0, dsb->writelead); + if(!dsb->committedbuff) { + IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); + return DSERR_OUTOFMEMORY; + } + FillMemory(dsb->committedbuff, dsb->writelead, dsbd->lpwfxFormat->wBitsPerSample == 8 ? 128 : 0); + if (dsb->dsbd.dwFlags & DSBCAPS_CTRL3D) { dsb->ds3db_ds3db.dwSize = sizeof(DS3DBUFFER); dsb->ds3db_ds3db.vPosition.x = 0.0; @@ -1135,6 +1142,7 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) HeapFree(GetProcessHeap(), 0, This->notifies); HeapFree(GetProcessHeap(), 0, This->pwfx); + HeapFree(GetProcessHeap(), 0, This->committedbuff); if (This->filters) { int i; diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 4735178a9a8..fc2b0cd0797 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -55,17 +55,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); #define le32(x) (x) #endif +static BYTE *buff_byte(const IDirectSoundBufferImpl *dsb, DWORD offset) +{ + if(offset >= dsb->sec_mixpos && offset < dsb->sec_mixpos + dsb->writelead) { + return (BYTE*)dsb->committedbuff + (offset - dsb->sec_mixpos); + }else if(offset < (dsb->sec_mixpos + dsb->writelead) % dsb->buflen) { + return (BYTE*)dsb->committedbuff + (dsb->buflen - dsb->sec_mixpos + offset); + }else{ + return dsb->buffer->memory + offset; + } +} + static float get8(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - buf += pos + channel; + const BYTE *buf = buff_byte(dsb, pos + channel); return (buf[0] - 0x80) / (float)0x80; } static float get16(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - const SHORT *sbuf = (const SHORT*)(buf + pos + 2 * channel); + const BYTE *buf = buff_byte(dsb, pos + 2 * channel); + const SHORT *sbuf = (const SHORT*)(buf); SHORT sample = (SHORT)le16(*sbuf); return sample / (float)0x8000; } @@ -73,8 +83,8 @@ static float get16(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) static float get24(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { LONG sample; - const BYTE* buf = dsb->buffer->memory; - buf += pos + 3 * channel; + const BYTE *buf = buff_byte(dsb, pos + 3 * channel); + /* The next expression deliberately has an overflow for buf[2] >= 0x80, this is how negative values are made. */ @@ -84,16 +94,16 @@ static float get24(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) static float get32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - const LONG *sbuf = (const LONG*)(buf + pos + 4 * channel); + const BYTE *buf = buff_byte(dsb, pos + 4 * channel); + const LONG *sbuf = (const LONG*)(buf); LONG sample = le32(*sbuf); return sample / (float)0x80000000U; } static float getieee32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - const float *sbuf = (const float*)(buf + pos + 4 * channel); + const BYTE *buf = buff_byte(dsb, pos + 4 * channel); + const float *sbuf = (const float*)(buf); /* The value will be clipped later, when put into some non-float buffer */ return *sbuf; } diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index bdb9ebee544..a79d62c54da 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -153,7 +153,10 @@ struct IDirectSoundBufferImpl LONG64 freqAccNum; /* used for mixing */ DWORD sec_mixpos; - + /* Holds a copy of the next 'writelead' bytes, to be used for mixing. This makes it + * so that these bytes get played once even if this region of the buffer gets overwritten, + * which is more in-line with native DirectSound behavior. */ + LPVOID committedbuff; /* IDirectSoundNotify fields */ LPDSBPOSITIONNOTIFY notifies; int nrofnotifies; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 124d1e4fba1..32656fbd618 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -391,6 +391,18 @@ static void cp_fields(IDirectSoundBufferImpl *dsb, UINT count, LONG64 *freqAccNu dsb->sec_mixpos = ipos; } +static void copy_circular(VOID *dstbuff, VOID *srcbuff, DWORD srcoff, DWORD srcsize, DWORD cpysize) +{ + DWORD overflow; + if(cpysize > srcsize - srcoff) { + overflow = cpysize - (srcsize - srcoff); + memcpy(dstbuff, (BYTE*)srcbuff + srcoff, srcsize - srcoff); + memcpy((BYTE*)dstbuff + (srcsize - srcoff), srcbuff, overflow); + }else{ + memcpy(dstbuff, (BYTE*)srcbuff + srcoff, cpysize); + } +} + /** * Calculate the distance between two buffer offsets, taking wraparound * into account. @@ -518,6 +530,8 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, float *mix_buffer, INT ilen = DSOUND_BufPtrDiff(dsb->buflen, dsb->sec_mixpos, oldpos); DSOUND_CheckEvent(dsb, oldpos, ilen); } + TRACE("committing %u bytes from offset %u\n", dsb->writelead, dsb->sec_mixpos); + copy_circular(dsb->committedbuff, dsb->buffer->memory, dsb->sec_mixpos, dsb->buflen, dsb->writelead); return frames; } @@ -551,6 +565,11 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD } } + if(dsb->leadin) { + TRACE("committing %u bytes from offset %u\n", dsb->writelead, dsb->sec_mixpos); + copy_circular(dsb->committedbuff, dsb->buffer->memory, dsb->sec_mixpos, dsb->buflen, dsb->writelead); + } + dsb->leadin = FALSE; TRACE("frames (primary) = %i\n", frames); -- 2.17.1

2 3

[PATCH v2] programs/winecfg: Disable virtual desktop when using macdrv.
by Gijs Vermeulen Aug. 18, 2021

Aug. 18, 2021

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- programs/winecfg/x11drvdlg.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index fbc6716e94e..34b194d04a6 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -111,17 +111,44 @@ static void update_gui_for_desktop_mode(HWND dialog) updating_ui = FALSE; } +static BOOL can_enable_desktop(void) +{ + char *value; + UINT guid_atom; + BOOL ret = FALSE; + char key[sizeof("System\\CurrentControlSet\\Control\\Video\\{}\\0000") + 40]; + + guid_atom = HandleToULong(GetPropA(GetDesktopWindow(), "__wine_display_device_guid")); + strcpy( key, "System\\CurrentControlSet\\Control\\Video\\{" ); + if (!GlobalGetAtomNameA(guid_atom, key + strlen(key), 40)) return ret; + strcat( key, "}\\0000" ); + if ((value = get_reg_key(HKEY_LOCAL_MACHINE, key, "GraphicsDriver", NULL))) + { + if(strcmp(value, "winemac.drv")) + ret = TRUE; + HeapFree(GetProcessHeap(), 0, value); + } + return ret; +} + static void init_dialog(HWND dialog) { char* buf; + BOOL enable_desktop; convert_x11_desktop_key(); - update_gui_for_desktop_mode(dialog); + if ((enable_desktop = can_enable_desktop())) + update_gui_for_desktop_mode(dialog); + else + disable(IDC_ENABLE_DESKTOP); updating_ui = TRUE; - SendDlgItemMessageW(dialog, IDC_DESKTOP_WIDTH, EM_LIMITTEXT, RES_MAXLEN, 0); - SendDlgItemMessageW(dialog, IDC_DESKTOP_HEIGHT, EM_LIMITTEXT, RES_MAXLEN, 0); + if (enable_desktop) + { + SendDlgItemMessageW(dialog, IDC_DESKTOP_WIDTH, EM_LIMITTEXT, RES_MAXLEN, 0); + SendDlgItemMessageW(dialog, IDC_DESKTOP_HEIGHT, EM_LIMITTEXT, RES_MAXLEN, 0); + } buf = get_reg_key(config_key, keypath("X11 Driver"), "GrabFullscreen", "N"); if (IS_OPTION_TRUE(*buf)) -- 2.33.0

1 0

[PATCH v4] conhost: Use font face length as number of characters, not size
by Hugh McMaster Aug. 18, 2021

Aug. 18, 2021

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- Changes in v4: * Don't recalculate length of face_name in get_first_font_sub_enum() when face_name is not null-terminated (bug in original code). programs/conhost/conhost.c | 10 +++++++--- programs/conhost/window.c | 28 +++++++++++----------------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 9bfc5f84242..dcb847421f7 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -97,9 +97,13 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->popup_attr = console->active->attr; screen_buffer->font = console->active->font; - if (!(screen_buffer->font.face_name = malloc( screen_buffer->font.face_len ))) return NULL; - memcpy( screen_buffer->font.face_name, console->active->font.face_name, - screen_buffer->font.face_len ); + if (screen_buffer->font.face_len) + { + size_t size = screen_buffer->font.face_len * sizeof(WCHAR); + + if (!(screen_buffer->font.face_name = malloc(size))) return NULL; + memcpy(screen_buffer->font.face_name, console->active->font.face_name, size); + } } else { diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 3ce36fe2c3d..8e57c7ed2b8 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -242,7 +242,6 @@ static void load_config( const WCHAR *key_name, struct console_config *config ) TRACE("loading %s registry settings.\n", wine_dbgstr_w( key_name )); memcpy( config->color_map, color_map, sizeof(color_map) ); - memset( config->face_name, 0, sizeof(config->face_name) ); config->cursor_size = 25; config->cursor_visible = 1; config->font_pitch_family = FIXED_PITCH | FF_DONTCARE; @@ -675,6 +674,7 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) struct font_info *font_info = &console->active->font; HFONT font, old_font; TEXTMETRICW tm; + size_t face_name_size; CPINFO cpinfo; HDC dc; @@ -683,9 +683,7 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) if (console->window->font && logfont->lfHeight == console->active->font.height && logfont->lfWeight == console->active->font.weight && !logfont->lfItalic && !logfont->lfUnderline && !logfont->lfStrikeOut && - console->active->font.face_len == wcslen( logfont->lfFaceName ) * sizeof(WCHAR) && - !memcmp( logfont->lfFaceName, console->active->font.face_name, - console->active->font.face_len )) + !wcsncmp(logfont->lfFaceName, console->active->font.face_name, console->active->font.face_len)) { TRACE( "equal to current\n" ); return TRUE; @@ -708,9 +706,10 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) font_info->weight = tm.tmWeight; free( font_info->face_name ); - font_info->face_len = wcslen( logfont->lfFaceName ) * sizeof(WCHAR); - font_info->face_name = malloc( font_info->face_len ); - memcpy( font_info->face_name, logfont->lfFaceName, font_info->face_len ); + font_info->face_len = wcslen(logfont->lfFaceName); + face_name_size = font_info->face_len * sizeof(WCHAR); + font_info->face_name = malloc(face_name_size); + memcpy(font_info->face_name, logfont->lfFaceName, face_name_size); /* FIXME: use maximum width for DBCS codepages since some chars take two cells */ if (GetCPInfo( console->output_cp, &cpinfo ) && cpinfo.MaxCharSize > 1) @@ -819,9 +818,9 @@ static int WINAPI get_first_font_sub_enum( const LOGFONTW *lf, const TEXTMETRICW load_config( fc->console->window->config_key, &config ); config.cell_width = fc->console->active->font.width; config.cell_height = fc->console->active->font.height; - fc->console->active->font.face_len = wcslen( config.face_name ) * sizeof(WCHAR); - memcpy( fc->console->active->font.face_name, config.face_name, - fc->console->active->font.face_len ); + lstrcpynW(config.face_name, fc->console->active->font.face_name, + fc->console->active->font.face_len +1); + /* Force also its writing back to the registry so that we can get it * the next time. */ @@ -1895,8 +1894,7 @@ static void apply_config( struct console *console, const struct console_config * console->active->font.height != config->cell_height || console->active->font.weight != config->font_weight || console->active->font.pitch_family != config->font_pitch_family || - console->active->font.face_len != wcslen( config->face_name ) * sizeof(WCHAR) || - memcmp( console->active->font.face_name, config->face_name, console->active->font.face_len )) + wcsncmp(console->active->font.face_name, config->face_name, console->active->font.face_len)) { update_console_font( console, config->face_name, config->cell_height, config->font_weight ); } @@ -1908,8 +1906,6 @@ static void apply_config( struct console *console, const struct console_config * static void current_config( struct console *console, struct console_config *config ) { - size_t len; - config->menu_mask = console->window->menu_mask; config->quick_edit = console->window->quick_edit; @@ -1930,9 +1926,7 @@ static void current_config( struct console *console, struct console_config *conf config->cell_height = console->active->font.height; config->font_weight = console->active->font.weight; config->font_pitch_family = console->active->font.pitch_family; - len = min( ARRAY_SIZE(config->face_name) - 1, console->active->font.face_len / sizeof(WCHAR) ); - if (len) memcpy( config->face_name, console->active->font.face_name, len * sizeof(WCHAR) ); - config->face_name[len] = 0; + lstrcpynW(config->face_name, console->active->font.face_name, console->active->font.face_len + 1); config->sb_width = console->active->width; config->sb_height = console->active->height; -- 2.32.0

1 0

[PATCH] programs/winecfg: Disable virtual desktop when using macdrv.
by Gijs Vermeulen Aug. 18, 2021

Aug. 18, 2021

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- programs/winecfg/x11drvdlg.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index fbc6716e94e..74ccfb77bf5 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -77,6 +77,21 @@ static void update_gui_for_desktop_mode(HWND dialog) WINE_TRACE("\n"); updating_ui = TRUE; +#ifdef __APPLE__ + { + char *tmp; + + tmp = get_reg_key(HKEY_CURRENT_USER, "Software\\Wine\\Drivers", "Graphics", NULL); + if (!tmp || (tmp && !strncmp(tmp, "mac", 3))) + { + disable(IDC_ENABLE_DESKTOP); + if (tmp) HeapFree(GetProcessHeap(), 0, tmp); + updating_ui = FALSE; + return; + } + } +#endif + buf = get_reg_keyW(config_key, explorer_desktopsW, desktop_name, NULL); if (buf && (bufindex = strchrW(buf, 'x'))) { -- 2.33.0

1 0

[PATCH 10/10] gdi32: Remove no longer used driver entry points.
by Jacek Caban Aug. 18, 2021

Aug. 18, 2021

2 1

[PATCH 09/10] gdi32: Use NtGdiFlattenPath for FlattenPath.
by Jacek Caban Aug. 18, 2021

Aug. 18, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 5 ++--- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 12 ++++++++++ dlls/gdi32/path.c | 33 +++++++++++----------------- 6 files changed, 29 insertions(+), 25 deletions(-)

2 1

[PATCH 08/10] gdi32: Use NtGdiSelectClipPath for SelectClipPath.
by Jacek Caban Aug. 18, 2021

Aug. 18, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 16 +++------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 12 ++++++++++++ dlls/gdi32/path.c | 23 +++++++---------------- 6 files changed, 24 insertions(+), 31 deletions(-)

2 1

[PATCH 07/10] gdi32: Use NtGdiFillPath for FillPath.
by Jacek Caban Aug. 18, 2021

Aug. 18, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/graphics.c | 11 ++++++++++- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 12 ++++++++++++ dlls/gdi32/path.c | 7 ++----- 4 files changed, 25 insertions(+), 6 deletions(-)

2 1

[PATCH 06/10] gdi32: Merge mfdrv/text.c into metadc.c.
by Jacek Caban Aug. 18, 2021

Aug. 18, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/metadc.c | 159 +++++++++++++++++++++++++++++---- dlls/gdi32/mfdrv/metafiledrv.h | 65 -------------- dlls/gdi32/mfdrv/text.c | 153 ------------------------------- 4 files changed, 143 insertions(+), 235 deletions(-) delete mode 100644 dlls/gdi32/mfdrv/metafiledrv.h delete mode 100644 dlls/gdi32/mfdrv/text.c

2 1