- wine-devel - winehq.org

[PATCH] user32: Fix event queue congestion can cause WINPOS_WindowFromPoint is null.
by Chao Long 21 Oct '21

21 Oct '21

Signed-off-by: Chao Long <longchao(a)uniontech.com> --- dlls/user32/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index b4e3579f5e8..b19fadbf195 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1815,7 +1815,7 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme) tracking_info.tme.dwHoverTime = 0; } - if (ptme->hwndTrack == hwnd) + if (ptme->hwndTrack == hwnd || (ptme->dwFlags & TME_LEAVE && hittest==HTNOWHERE)) { /* Adding new mouse event to the tracking list */ tracking_info.tme = *ptme; -- 2.20.1

2 1

[PATCH 2/2] uxtheme: Check LoadedBefore registry key before loading theme.
by Zhiyi Zhang 21 Oct '21

21 Oct '21

Only save unthemed system metrics to the registry when the LoadedBefore registry key value is '0'. This avoids saving themed system metrics when two processes are trying to activate theming at the same time. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/system.c | 37 +++++++++++++++++++++++++------------ dlls/uxtheme/uxthemedll.h | 4 ++++ 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index d9eedf6543b..0298fe61d4a 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -185,7 +185,7 @@ static void UXTHEME_LoadTheme(void) lstrcpynW(szCurrentColor, pt->pszSelectedColor, ARRAY_SIZE(szCurrentColor)); lstrcpynW(szCurrentSize, pt->pszSelectedSize, ARRAY_SIZE(szCurrentSize)); - MSSTYLES_SetActiveTheme(pt, FALSE); + UXTHEME_SetActiveTheme(pt); TRACE("Theme active: %s %s %s\n", debugstr_w(szCurrentTheme), debugstr_w(szCurrentColor), debugstr_w(szCurrentSize)); MSSTYLES_CloseThemeFile(pt); @@ -419,27 +419,38 @@ static void UXTHEME_SaveSystemMetrics(struct system_metrics *metrics, BOOL send_ * * Change the current active theme */ -static HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) +HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) { + BOOL ret, loaded_before = FALSE; struct system_metrics metrics; + DWORD size; HKEY hKey; WCHAR tmp[2]; HRESULT hr; - if (tf && !bThemeActive) - { - if (UXTHEME_GetSystemMetrics(&metrics)) - UXTHEME_SaveUnthemedSystemMetrics(&metrics); - } - - hr = MSSTYLES_SetActiveTheme(tf, TRUE); - if(FAILED(hr)) - return hr; if(tf) { bThemeActive = TRUE; lstrcpynW(szCurrentTheme, tf->szThemeFile, ARRAY_SIZE(szCurrentTheme)); lstrcpynW(szCurrentColor, tf->pszSelectedColor, ARRAY_SIZE(szCurrentColor)); lstrcpynW(szCurrentSize, tf->pszSelectedSize, ARRAY_SIZE(szCurrentSize)); + + ret = UXTHEME_GetSystemMetrics(&metrics); + + /* Check if theming is already active */ + if (!RegOpenKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey)) + { + size = sizeof(tmp); + if (!RegQueryValueExW(hKey, L"LoadedBefore", NULL, NULL, (BYTE *)tmp, &size)) + loaded_before = (tmp[0] != '0'); + else + WARN("Failed to get LoadedBefore: %d\n", GetLastError()); + RegCloseKey(hKey); + } + if (loaded_before) + return MSSTYLES_SetActiveTheme(tf, FALSE); + + if (ret) + UXTHEME_SaveUnthemedSystemMetrics(&metrics); } else { bThemeActive = FALSE; @@ -460,18 +471,20 @@ static HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) (lstrlenW(szCurrentSize)+1)*sizeof(WCHAR)); RegSetValueExW(hKey, L"DllName", 0, REG_SZ, (const BYTE*)szCurrentTheme, (lstrlenW(szCurrentTheme)+1)*sizeof(WCHAR)); + RegSetValueExW(hKey, L"LoadedBefore", 0, REG_SZ, (const BYTE *)tmp, sizeof(WCHAR) * 2); } else { RegDeleteValueW(hKey, L"ColorName"); RegDeleteValueW(hKey, L"SizeName"); RegDeleteValueW(hKey, L"DllName"); - + RegDeleteValueW(hKey, L"LoadedBefore"); } RegCloseKey(hKey); } else TRACE("Failed to open theme registry key\n"); + hr = MSSTYLES_SetActiveTheme(tf, TRUE); if (bThemeActive) { if (UXTHEME_GetSystemMetrics(&metrics)) diff --git a/dlls/uxtheme/uxthemedll.h b/dlls/uxtheme/uxthemedll.h index 4b8f95764d6..67130774392 100644 --- a/dlls/uxtheme/uxthemedll.h +++ b/dlls/uxtheme/uxthemedll.h @@ -21,7 +21,10 @@ #ifndef __WINE_UXTHEMEDLL_H #define __WINE_UXTHEMEDLL_H +#include <wingdi.h> #include <winuser.h> +#include <uxtheme.h> +#include <msstyles.h> typedef HANDLE HTHEMEFILE; @@ -99,6 +102,7 @@ BOOL WINAPI ThemeHooksInstall(void) DECLSPEC_HIDDEN; BOOL WINAPI ThemeHooksRemove(void) DECLSPEC_HIDDEN; extern void UXTHEME_InitSystem(HINSTANCE hInst) DECLSPEC_HIDDEN; +extern HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) DECLSPEC_HIDDEN; extern void UXTHEME_UninitSystem(void) DECLSPEC_HIDDEN; extern struct user_api_hook user_api DECLSPEC_HIDDEN; -- 2.32.0

1 0

[PATCH 1/2] uxtheme: Save temporary system metrics to a struct in memory.
by Zhiyi Zhang 21 Oct '21

21 Oct '21

So that temporary system metrics are not saved in the registry. Saving them to the registry creates a race condition when two processes are trying to activate theming at the same time, one process might save themed system metrics instead of unthemed system metrics to the registry. The race condition will be more apparent when initializing a wine prefix after theming is turned on by default in wine.inf. This patch refactors the system metric helper functions to use an in-memory struct and is a prerequisite to remove the race condition. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/system.c | 344 ++++++++++++++++++++---------------------- 1 file changed, 161 insertions(+), 183 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 628bd9bfdc4..d9eedf6543b 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -236,217 +236,182 @@ static const WCHAR * const SysColorsNames[] = static const WCHAR strColorKey[] = L"Control Panel\\Colors"; -static const struct BackupSysParam -{ - int spiGet, spiSet; - const WCHAR* keyName; -} backupSysParams[] = -{ - {SPI_GETFLATMENU, SPI_SETFLATMENU, L"FlatMenu"}, - {SPI_GETGRADIENTCAPTIONS, SPI_SETGRADIENTCAPTIONS, L"GradientCaption"}, - {-1, -1, 0} -}; - #define NUM_SYS_COLORS (COLOR_MENUBAR+1) -static void save_sys_colors (HKEY baseKey) +struct system_metrics { - WCHAR colorStr[13]; - HKEY hKey; - int i, length; + COLORREF system_colors[NUM_SYS_COLORS]; + NONCLIENTMETRICSW non_client_metrics; + LOGFONTW icon_title_font; + DWORD gradient_caption; + DWORD flat_menu; +}; - if (RegCreateKeyExW( baseKey, strColorKey, - 0, 0, 0, KEY_ALL_ACCESS, - 0, &hKey, 0 ) == ERROR_SUCCESS) - { - for (i = 0; i < NUM_SYS_COLORS; i++) - { - COLORREF col = GetSysColor (i); - - length = swprintf(colorStr, ARRAY_SIZE(colorStr), L"%d %d %d", GetRValue(col), - GetGValue(col), GetBValue(col)); - RegSetValueExW(hKey, SysColorsNames[i], 0, REG_SZ, (BYTE *)colorStr, - (length + 1) * sizeof(WCHAR)); - } - RegCloseKey (hKey); - } -} - -/* Before activating a theme, query current system colors, certain settings - * and backup them in the registry, so they can be restored when the theme - * is deactivated */ -static void UXTHEME_BackupSystemMetrics(void) +static BOOL UXTHEME_GetSystemMetrics(struct system_metrics *metrics) { DPI_AWARENESS_CONTEXT old_context; - HKEY hKey; - const struct BackupSysParam* bsp = backupSysParams; + BOOL ret = FALSE; + int i; + + for (i = 0; i < NUM_SYS_COLORS; ++i) + metrics->system_colors[i] = GetSysColor(i); old_context = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE); - if (RegCreateKeyExW( HKEY_CURRENT_USER, szThemeManager, - 0, 0, 0, KEY_ALL_ACCESS, - 0, &hKey, 0) == ERROR_SUCCESS) - { - NONCLIENTMETRICSW ncm; - LOGFONTW iconTitleFont; - - /* back up colors */ - save_sys_colors (hKey); - - /* back up "other" settings */ - while (bsp->spiGet >= 0) - { - DWORD value; - - SystemParametersInfoW (bsp->spiGet, 0, &value, 0); - RegSetValueExW (hKey, bsp->keyName, 0, REG_DWORD, - (LPBYTE)&value, sizeof (value)); - - bsp++; - } - - /* back up non-client metrics */ - memset (&ncm, 0, sizeof (ncm)); - ncm.cbSize = sizeof (ncm); - SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, sizeof (ncm), &ncm, 0); - RegSetValueExW (hKey, L"NonClientMetrics", 0, REG_BINARY, (BYTE*)&ncm, - sizeof (ncm)); - memset (&iconTitleFont, 0, sizeof (iconTitleFont)); - SystemParametersInfoW (SPI_GETICONTITLELOGFONT, sizeof (iconTitleFont), - &iconTitleFont, 0); - RegSetValueExW (hKey, L"IconTitleFont", 0, REG_BINARY, - (LPBYTE)&iconTitleFont, sizeof (iconTitleFont)); - - RegCloseKey (hKey); - } + memset(&metrics->non_client_metrics, 0, sizeof(metrics->non_client_metrics)); + metrics->non_client_metrics.cbSize = sizeof(metrics->non_client_metrics); + if (!SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(metrics->non_client_metrics), + &metrics->non_client_metrics, 0)) + goto done; + memset(&metrics->icon_title_font, 0, sizeof(metrics->icon_title_font)); + if (!SystemParametersInfoW(SPI_GETICONTITLELOGFONT, sizeof(metrics->icon_title_font), + &metrics->icon_title_font, 0)) + goto done; + if (!SystemParametersInfoW(SPI_GETGRADIENTCAPTIONS, 0, &metrics->gradient_caption, 0)) + goto done; + if (!SystemParametersInfoW(SPI_GETFLATMENU, 0, &metrics->flat_menu, 0)) + goto done; + ret = TRUE; +done: SetThreadDpiAwarenessContext(old_context); + return ret; } /* Read back old settings after a theme was deactivated */ -static void UXTHEME_RestoreSystemMetrics(void) +static BOOL UXTHEME_GetUnthemedSystemMetrics(struct system_metrics *metrics) { - DPI_AWARENESS_CONTEXT old_context; - HKEY hKey; - const struct BackupSysParam* bsp = backupSysParams; + HKEY theme_manager_key = NULL, color_key = NULL; + BOOL ret = FALSE; + WCHAR string[13]; + int i, r, g, b; + DWORD size; - old_context = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE); + if (RegOpenKeyExW(HKEY_CURRENT_USER, szThemeManager, 0, KEY_QUERY_VALUE, &theme_manager_key)) + goto done; - if (RegOpenKeyExW (HKEY_CURRENT_USER, szThemeManager, - 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + if (RegOpenKeyExW(theme_manager_key, strColorKey, 0, KEY_QUERY_VALUE, &color_key)) + goto done; + + for (i = 0; i < NUM_SYS_COLORS; ++i) { - HKEY colorKey; - - /* read backed-up colors */ - if (RegOpenKeyExW (hKey, strColorKey, - 0, KEY_QUERY_VALUE, &colorKey) == ERROR_SUCCESS) - { - int i; - COLORREF sysCols[NUM_SYS_COLORS]; - int sysColsIndices[NUM_SYS_COLORS]; - int sysColCount = 0; - - for (i = 0; i < NUM_SYS_COLORS; i++) - { - DWORD type; - WCHAR colorStr[13]; - DWORD count = sizeof(colorStr); + size = sizeof(string); + if (RegQueryValueExW(color_key, SysColorsNames[i], 0, NULL, (BYTE *)string, &size)) + goto done; - if (RegQueryValueExW(colorKey, SysColorsNames[i], 0, &type, (LPBYTE)colorStr, - &count) == ERROR_SUCCESS) - { - int r, g, b; - if (swscanf(colorStr, L"%d %d %d", &r, &g, &b) == 3) - { - sysColsIndices[sysColCount] = i; - sysCols[sysColCount] = RGB(r, g, b); - sysColCount++; - } - } - } - RegCloseKey (colorKey); - - SetSysColors (sysColCount, sysColsIndices, sysCols); - } - - /* read backed-up other settings */ - while (bsp->spiGet >= 0) - { - DWORD value; - DWORD count = sizeof(value); - DWORD type; - - if (RegQueryValueExW (hKey, bsp->keyName, 0, - &type, (LPBYTE)&value, &count) == ERROR_SUCCESS) - { - SystemParametersInfoW (bsp->spiSet, 0, UlongToPtr(value), SPIF_UPDATEINIFILE); - } - - bsp++; - } - - /* read backed-up non-client metrics */ - { - NONCLIENTMETRICSW ncm; - LOGFONTW iconTitleFont; - DWORD count = sizeof(ncm); - DWORD type; + if (swscanf(string, L"%d %d %d", &r, &g, &b) != 3) + goto done; - if (RegQueryValueExW (hKey, L"NonClientMetrics", 0, - &type, (LPBYTE)&ncm, &count) == ERROR_SUCCESS) - { - SystemParametersInfoW (SPI_SETNONCLIENTMETRICS, - count, &ncm, SPIF_UPDATEINIFILE); - } - - count = sizeof(iconTitleFont); - - if (RegQueryValueExW (hKey, L"IconTitleFont", 0, - &type, (LPBYTE)&iconTitleFont, &count) == ERROR_SUCCESS) - { - SystemParametersInfoW (SPI_SETICONTITLELOGFONT, - count, &iconTitleFont, SPIF_UPDATEINIFILE); - } - } - - RegCloseKey (hKey); + metrics->system_colors[i] = RGB(r, g, b); } - SetThreadDpiAwarenessContext(old_context); + size = sizeof(metrics->non_client_metrics); + if (RegQueryValueExW(theme_manager_key, L"NonClientMetrics", 0, NULL, + (BYTE *)&metrics->non_client_metrics, &size)) + goto done; + size = sizeof(metrics->icon_title_font); + if (RegQueryValueExW(theme_manager_key, L"IconTitleFont", 0, NULL, + (BYTE *)&metrics->icon_title_font, &size)) + goto done; + size = sizeof(metrics->gradient_caption); + if (RegQueryValueExW(theme_manager_key, L"GradientCaption", 0, NULL, + (BYTE *)&metrics->gradient_caption, &size)) + goto done; + size = sizeof(metrics->flat_menu); + if (RegQueryValueExW(theme_manager_key, L"FlatMenu", 0, NULL, (BYTE *)&metrics->flat_menu, + &size)) + goto done; + + ret = TRUE; +done: + RegCloseKey(color_key); + RegCloseKey(theme_manager_key); + return ret; +} + +static void UXTHEME_SaveUnthemedSystemMetrics(struct system_metrics *metrics) +{ + HKEY theme_manager_key, color_key; + WCHAR string[13]; + DWORD length; + int i; + + if (!RegCreateKeyExW(HKEY_CURRENT_USER, szThemeManager, 0, 0, 0, KEY_ALL_ACCESS, 0, + &theme_manager_key, 0)) + { + if (!RegCreateKeyExW(theme_manager_key, strColorKey, 0, 0, 0, KEY_ALL_ACCESS, 0, &color_key, + 0)) + { + for (i = 0; i < NUM_SYS_COLORS; ++i) + { + length = swprintf(string, ARRAY_SIZE(string), L"%d %d %d", + GetRValue(metrics->system_colors[i]), + GetGValue(metrics->system_colors[i]), + GetBValue(metrics->system_colors[i])); + RegSetValueExW(color_key, SysColorsNames[i], 0, REG_SZ, (BYTE *)string, + (length + 1) * sizeof(WCHAR)); + } + + RegCloseKey(color_key); + } + + RegSetValueExW(theme_manager_key, L"NonClientMetrics", 0, REG_BINARY, + (BYTE *)&metrics->non_client_metrics, sizeof(metrics->non_client_metrics)); + RegSetValueExW(theme_manager_key, L"IconTitleFont", 0, REG_BINARY, + (BYTE *)&metrics->icon_title_font, sizeof(metrics->icon_title_font)); + RegSetValueExW(theme_manager_key, L"GradientCaption", 0, REG_DWORD, + (BYTE *)&metrics->gradient_caption, sizeof(metrics->gradient_caption)); + RegSetValueExW(theme_manager_key, L"FlatMenu", 0, REG_DWORD, (BYTE *)&metrics->flat_menu, + sizeof(metrics->flat_menu)); + RegCloseKey(theme_manager_key); + } } /* Make system settings persistent, so they're in effect even w/o uxtheme * loaded. * For efficiency reasons, only the last SystemParametersInfoW sets * SPIF_SENDWININICHANGE */ -static void UXTHEME_SaveSystemMetrics(void) +static void UXTHEME_SaveSystemMetrics(struct system_metrics *metrics, BOOL send_syscolor_change) { - const struct BackupSysParam* bsp = backupSysParams; - NONCLIENTMETRICSW ncm; - LOGFONTW iconTitleFont; + int i, length, index[NUM_SYS_COLORS]; + DPI_AWARENESS_CONTEXT old_context; + WCHAR string[13]; + HKEY hkey; - save_sys_colors (HKEY_CURRENT_USER); - - while (bsp->spiGet >= 0) + if (!RegCreateKeyExW(HKEY_CURRENT_USER, strColorKey, 0, 0, 0, KEY_ALL_ACCESS, 0, &hkey, 0)) { - DWORD value; - - SystemParametersInfoW (bsp->spiGet, 0, &value, 0); - SystemParametersInfoW (bsp->spiSet, 0, UlongToPtr(value), SPIF_UPDATEINIFILE); - bsp++; + for (i = 0; i < NUM_SYS_COLORS; ++i) + { + length = swprintf(string, ARRAY_SIZE(string), L"%d %d %d", + GetRValue(metrics->system_colors[i]), + GetGValue(metrics->system_colors[i]), + GetBValue(metrics->system_colors[i])); + RegSetValueExW(hkey, SysColorsNames[i], 0, REG_SZ, (BYTE *)string, + (length + 1) * sizeof(WCHAR)); + } + RegCloseKey(hkey); } - - memset (&ncm, 0, sizeof (ncm)); - ncm.cbSize = sizeof (ncm); - SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, sizeof (ncm), &ncm, 0); - SystemParametersInfoW (SPI_SETNONCLIENTMETRICS, sizeof (ncm), &ncm, - SPIF_UPDATEINIFILE); - memset (&iconTitleFont, 0, sizeof (iconTitleFont)); - SystemParametersInfoW (SPI_GETICONTITLELOGFONT, sizeof (iconTitleFont), - &iconTitleFont, 0); - SystemParametersInfoW (SPI_SETICONTITLELOGFONT, sizeof (iconTitleFont), - &iconTitleFont, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); + if (send_syscolor_change) + { + for (i = 0; i < NUM_SYS_COLORS; ++i) + index[i] = i; + + SetSysColors(NUM_SYS_COLORS, index, metrics->system_colors); + } + + old_context = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE); + + SystemParametersInfoW(SPI_SETNONCLIENTMETRICS, sizeof(metrics->non_client_metrics), + &metrics->non_client_metrics, SPIF_UPDATEINIFILE); + SystemParametersInfoW(SPI_SETICONTITLELOGFONT, sizeof(metrics->icon_title_font), + &metrics->icon_title_font, SPIF_UPDATEINIFILE); + SystemParametersInfoW(SPI_SETGRADIENTCAPTIONS, 0, (void *)(INT_PTR)metrics->gradient_caption, + SPIF_UPDATEINIFILE); + SystemParametersInfoW(SPI_SETFLATMENU, 0, (void *)(INT_PTR)metrics->flat_menu, + SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); + + SetThreadDpiAwarenessContext(old_context); } /*********************************************************************** @@ -456,11 +421,17 @@ static void UXTHEME_SaveSystemMetrics(void) */ static HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) { + struct system_metrics metrics; HKEY hKey; WCHAR tmp[2]; HRESULT hr; - if(tf && !bThemeActive) UXTHEME_BackupSystemMetrics(); + if (tf && !bThemeActive) + { + if (UXTHEME_GetSystemMetrics(&metrics)) + UXTHEME_SaveUnthemedSystemMetrics(&metrics); + } + hr = MSSTYLES_SetActiveTheme(tf, TRUE); if(FAILED(hr)) return hr; @@ -471,7 +442,6 @@ static HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) lstrcpynW(szCurrentSize, tf->pszSelectedSize, ARRAY_SIZE(szCurrentSize)); } else { - UXTHEME_RestoreSystemMetrics(); bThemeActive = FALSE; szCurrentTheme[0] = '\0'; szCurrentColor[0] = '\0'; @@ -501,9 +471,17 @@ static HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) } else TRACE("Failed to open theme registry key\n"); - - UXTHEME_SaveSystemMetrics (); - + + if (bThemeActive) + { + if (UXTHEME_GetSystemMetrics(&metrics)) + UXTHEME_SaveSystemMetrics(&metrics, FALSE); + } + else + { + if (UXTHEME_GetUnthemedSystemMetrics(&metrics)) + UXTHEME_SaveSystemMetrics(&metrics, TRUE); + } return hr; } -- 2.32.0

1 0

[PATCH] ntdll: Fix size comparison in NtQuerySystemInformation(SystemCodeIntegrityInformation).
by Paul Gofman 20 Oct '21

20 Oct '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 82c9f0da492..9d518719942 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -3061,7 +3061,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, len = sizeof(SYSTEM_CODEINTEGRITY_INFORMATION); - if (size < len) + if (size >= len) integrity_info->CodeIntegrityOptions = CODEINTEGRITY_OPTION_ENABLED; else ret = STATUS_INFO_LENGTH_MISMATCH; -- 2.31.1

1 0

[PATCH] gdiplus: Switch to STRETCH_HALFTONE mode before playing a blit record.
by Huw Davies 20 Oct '21

20 Oct '21

This is done even if the emf contains a previous EMR_SETSTRETCHBLTMODE record. Thanks to Sebastián Aedo for some of the testing. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdiplus/metafile.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index d79c939218c..1b4bba18048 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2486,6 +2486,9 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, record->nSize = dataSize + 8; memcpy(record->dParm, data, dataSize); + if (record->iType == EMR_BITBLT || record->iType == EMR_STRETCHBLT) + SetStretchBltMode(metafile->playback_dc, STRETCH_HALFTONE); + if(PlayEnhMetaFileRecord(metafile->playback_dc, metafile->handle_table, record, metafile->handle_count) == 0) ERR("PlayEnhMetaFileRecord failed\n"); -- 2.23.0

2 1

[PATCH] kernelbase: Add RaiseFailFastException stub.
by Brendan Shanks 20 Oct '21

20 Oct '21

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- Fixes Essential Objects EO.WebBrowser, used by Quicken. dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/debug.c | 8 ++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 90b503af19f..71f33a72862 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1195,7 +1195,7 @@ @ stdcall -import QueueUserAPC(ptr long long) @ stdcall -import QueueUserWorkItem(ptr ptr long) @ stdcall -import RaiseException(long long long ptr) -# @ stub RaiseFailFastException +@ stdcall -import RaiseFailFastException(ptr ptr long) @ stdcall -import ReadConsoleA(long ptr long ptr ptr) @ stdcall -import ReadConsoleInputA(long ptr long ptr) @ stub ReadConsoleInputExA diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 45bb6c019e9..53b8b44f270 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -303,6 +303,14 @@ void WINAPI DECLSPEC_HOTPATCH RaiseException( DWORD code, DWORD flags, DWORD cou } __ASM_STDCALL_IMPORT(RaiseException,16) +/******************************************************************* + * RaiseFailFastException (kernelbase.@) + */ +void WINAPI DECLSPEC_HOTPATCH RaiseFailFastException( EXCEPTION_RECORD *record, CONTEXT *context, DWORD flags ) +{ + FIXME( "(%p, %p, %d) stub\n", record, context, flags ); + TerminateProcess( GetCurrentProcess(), STATUS_FAIL_FAST_EXCEPTION ); +} /*********************************************************************** * SetUnhandledExceptionFilter (kernelbase.@) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index dd9f4a8ddce..c47e681edfa 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1236,7 +1236,7 @@ # @ stub QuirkIsEnabledForPackage4 # @ stub QuirkIsEnabledForProcess @ stdcall RaiseException(long long long ptr) -# @ stub RaiseFailFastException +@ stdcall RaiseFailFastException(ptr ptr long) @ stdcall ReOpenFile(ptr long long long) @ stdcall ReadConsoleA(long ptr long ptr ptr) @ stdcall ReadConsoleInputA(long ptr long ptr) -- 2.30.1 (Apple Git-130)

1 0

[PATCH] msvcrt: support I width modifier in *scanf* family
by Eric Pouech 20 Oct '21

20 Oct '21

Despite what msdn states, I and I32 are supported width modifiers. V2: - better code structure - added support and tests for I32 v3: - fix 'test & copy & paste & don't test' error v4: - move the tests in ucrtbase instead of msvcrt (as Piotr suggestion) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvcrt/scanf.h | 10 ++++++++-- dlls/ucrtbase/tests/scanf.c | 25 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 3ab2efef13d..02284379854 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -279,13 +279,19 @@ _FUNCTION_ { *(format + 2) == '4') { I64_prefix = 1; format += 2; + break; } - break; + else if (*(format + 1) == '3' && + *(format + 2) == '2') { + format += 2; + break; + } + /* fall through */ #if _MSVCR_VER == 0 || _MSVCR_VER >= 140 case 'z': +#endif if (sizeof(void *) == sizeof(LONGLONG)) I64_prefix = 1; break; -#endif default: prefix_finished = 1; } diff --git a/dlls/ucrtbase/tests/scanf.c b/dlls/ucrtbase/tests/scanf.c index 3d77746d23b..12a08864642 100644 --- a/dlls/ucrtbase/tests/scanf.c +++ b/dlls/ucrtbase/tests/scanf.c @@ -43,6 +43,7 @@ static void test_sscanf(void) char buffer[100], buffer1[100]; int result, ret, hour, min, count; LONGLONG result64; + DWORD_PTR result_ptr; char c; void *ptr; float ret_float1, ret_float2; @@ -296,6 +297,30 @@ static void test_sscanf(void) ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); ok(ret_size == 1, "got wrong size_t %s for flags %#x\n", wine_dbgstr_longlong((LONGLONG)ret_size), tests[i]); + + result64 = 0; + ret = vsscanf_wrapper(tests[i], "12345678901234", -1, "%I64d", &result64); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result64 == 12345678901234ll, "got wrong number 0x%s for flags %#x\n", + wine_dbgstr_longlong(result64), tests[i]); + + result = 0; + ret = vsscanf_wrapper(tests[i], "12345678901234", -1, "%I32d", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == (int)12345678901234ll, /* this is always truncated to 32bit */ + "got wrong number 0x%d for flags %#x\n", result, tests[i]); + + result_ptr = 0; + ret = vsscanf_wrapper(tests[i], "0x87654321", -1, "%Ix", &result_ptr); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result_ptr == 0x87654321, + "got wrong number %Ix for flags %#x\n", result_ptr, tests[i]); + + result_ptr = 0; + ret = vsscanf_wrapper(tests[i], "0x123456789", -1, "%Ix", &result_ptr); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result_ptr == (DWORD_PTR)0x123456789ull, /* this is truncated on 32bit systems */ + "got wrong number %Ix for flags %#x\n", result_ptr, tests[i]); } }

2 1

[PATCH 1/5] winegstreamer: Move the IWMProfile3 implementation to a separate object.
by Zebediah Figura 20 Oct '21

20 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/Makefile.in | 3 +- dlls/winegstreamer/gst_private.h | 17 + dlls/winegstreamer/main.c | 6 +- dlls/winegstreamer/mfplat.c | 3 +- dlls/winegstreamer/wm_asyncreader.c | 471 +++++----------------------- dlls/winegstreamer/wm_reader.c | 308 ++++++++++++++++++ dlls/winegstreamer/wm_syncreader.c | 2 - 7 files changed, 418 insertions(+), 392 deletions(-) create mode 100644 dlls/winegstreamer/wm_reader.c diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index 17311cd663c..76e6aeed54d 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -1,7 +1,7 @@ MODULE = winegstreamer.dll UNIXLIB = winegstreamer.so IMPORTLIB = winegstreamer -IMPORTS = strmbase strmiids uuid ole32 mfuuid +IMPORTS = strmbase ole32 DELAYIMPORTS = mfplat EXTRAINCL = $(GSTREAMER_CFLAGS) EXTRALIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS) @@ -14,6 +14,7 @@ C_SRCS = \ quartz_parser.c \ wg_parser.c \ wm_asyncreader.c \ + wm_reader.c \ wm_syncreader.c IDL_SRCS = \ diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 986c8ca695d..6c86031897e 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -33,6 +33,7 @@ #define NONAMELESSUNION #include "dshow.h" #include "mfidl.h" +#include "wmsdk.h" #include "wine/debug.h" #include "wine/strmbase.h" @@ -112,4 +113,20 @@ HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HI HRESULT audio_converter_create(REFIID riid, void **ret) DECLSPEC_HIDDEN; +struct wm_reader +{ + IWMProfile3 IWMProfile3_iface; + LONG refcount; + + const struct wm_reader_ops *ops; +}; + +struct wm_reader_ops +{ + void *(*query_interface)(struct wm_reader *reader, REFIID iid); + void (*destroy)(struct wm_reader *reader); +}; + +void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops); + #endif /* __GST_PRIVATE_INCLUDED__ */ diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index d6f19fb4ad1..ac9a3201792 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -20,17 +20,19 @@ #define WINE_NO_NAMELESS_EXTENSION +#define EXTERN_GUID DEFINE_GUID +#include "initguid.h" #include "gst_private.h" #include "winternl.h" #include "rpcproxy.h" - -#include "initguid.h" #include "gst_guids.h" static unixlib_handle_t unix_handle; WINE_DEFAULT_DEBUG_CHANNEL(quartz); +DEFINE_GUID(GUID_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + bool array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { unsigned int new_capacity, max_capacity; diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 93f4b8d5bd7..58200dc409a 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -19,9 +19,10 @@ #include "gst_private.h" -#include "mfapi.h" #include "ks.h" #include "ksmedia.h" +#include "initguid.h" +#include "mfapi.h" #include "wine/debug.h" diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index b4ef4851c33..3e341ec41e9 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -17,12 +17,13 @@ */ #include "gst_private.h" -#include "wmsdk.h" WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); struct async_reader { + struct wm_reader reader; + IWMReader IWMReader_iface; IWMReaderAdvanced6 IWMReaderAdvanced6_iface; IWMReaderAccelerator IWMReaderAccelerator_iface; @@ -34,9 +35,7 @@ struct async_reader IWMHeaderInfo3 IWMHeaderInfo3_iface; IWMLanguageList IWMLanguageList_iface; IReferenceClock IReferenceClock_iface; - IWMProfile3 IWMProfile3_iface; IWMPacketSize2 IWMPacketSize2_iface; - LONG ref; }; static struct async_reader *impl_from_IWMReader(IWMReader *iface) @@ -44,116 +43,25 @@ static struct async_reader *impl_from_IWMReader(IWMReader *iface) return CONTAINING_RECORD(iface, struct async_reader, IWMReader_iface); } -static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID riid, void **ppv) +static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID iid, void **out) { - struct async_reader *This = impl_from_IWMReader(iface); + struct async_reader *reader = impl_from_IWMReader(iface); - if(IsEqualGUID(riid, &IID_IUnknown)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IWMReader_iface; - }else if(IsEqualGUID(riid, &IID_IWMReader)) { - TRACE("(%p)->(IID_IWMReader %p)\n", This, ppv); - *ppv = &This->IWMReader_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced)) { - TRACE("(%p)->(IID_IWMReaderAdvanced %p)\n", This, ppv); - *ppv = &This->IWMReaderAdvanced6_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced2)) { - TRACE("(%p)->(IID_IWMReaderAdvanced2 %p)\n", This, ppv); - *ppv = &This->IWMReaderAdvanced6_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced3)) { - TRACE("(%p)->(IID_IWMReaderAdvanced3 %p)\n", This, ppv); - *ppv = &This->IWMReaderAdvanced6_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced4)) { - TRACE("(%p)->(IID_IWMReaderAdvanced4 %p)\n", This, ppv); - *ppv = &This->IWMReaderAdvanced6_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced5)) { - TRACE("(%p)->(IID_IWMReaderAdvanced5 %p)\n", This, ppv); - *ppv = &This->IWMReaderAdvanced6_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced6)) { - TRACE("(%p)->(IID_IWMReaderAdvanced6 %p)\n", This, ppv); - *ppv = &This->IWMReaderAdvanced6_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderAccelerator)) { - TRACE("(%p)->(IID_IWMReaderAccelerator %p)\n", This, ppv); - *ppv = &This->IWMReaderAccelerator_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderNetworkConfig)) { - TRACE("(%p)->(IWMReaderNetworkConfig %p)\n", This, ppv); - *ppv = &This->IWMReaderNetworkConfig2_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderNetworkConfig2)) { - TRACE("(%p)->(IWMReaderNetworkConfig2 %p)\n", This, ppv); - *ppv = &This->IWMReaderNetworkConfig2_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderStreamClock)) { - TRACE("(%p)->(IWMReaderStreamClock %p)\n", This, ppv); - *ppv = &This->IWMReaderStreamClock_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderTypeNegotiation)) { - TRACE("(%p)->(IWMReaderTypeNegotiation %p)\n", This, ppv); - *ppv = &This->IWMReaderTypeNegotiation_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderTimecode)) { - TRACE("(%p)->(IWMReaderTimecode %p)\n", This, ppv); - *ppv = &This->IWMReaderTimecode_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderPlaylistBurn)) { - TRACE("(%p)->(IWMReaderPlaylistBurn %p)\n", This, ppv); - *ppv = &This->IWMReaderPlaylistBurn_iface; - }else if(IsEqualGUID(riid, &IID_IWMHeaderInfo)) { - TRACE("(%p)->(IWMHeaderInfo %p)\n", This, ppv); - *ppv = &This->IWMHeaderInfo3_iface; - }else if(IsEqualGUID(riid, &IID_IWMHeaderInfo2)) { - TRACE("(%p)->(IWMHeaderInfo2 %p)\n", This, ppv); - *ppv = &This->IWMHeaderInfo3_iface; - }else if(IsEqualGUID(riid, &IID_IWMHeaderInfo3)) { - TRACE("(%p)->(IWMHeaderInfo3 %p)\n", This, ppv); - *ppv = &This->IWMHeaderInfo3_iface; - }else if(IsEqualGUID(riid, &IID_IWMLanguageList)) { - TRACE("(%p)->(IWMLanguageList %p)\n", This, ppv); - *ppv = &This->IWMLanguageList_iface; - }else if(IsEqualGUID(riid, &IID_IReferenceClock)) { - TRACE("(%p)->(IWMLanguageList %p)\n", This, ppv); - *ppv = &This->IReferenceClock_iface; - }else if(IsEqualGUID(riid, &IID_IWMProfile)) { - TRACE("(%p)->(IWMProfile %p)\n", This, ppv); - *ppv = &This->IWMProfile3_iface; - }else if(IsEqualGUID(riid, &IID_IWMProfile2)) { - TRACE("(%p)->(IWMProfile2 %p)\n", This, ppv); - *ppv = &This->IWMProfile3_iface; - }else if(IsEqualGUID(riid, &IID_IWMProfile3)) { - TRACE("(%p)->(IWMProfile3 %p)\n", This, ppv); - *ppv = &This->IWMProfile3_iface; - }else if(IsEqualGUID(riid, &IID_IWMPacketSize)) { - TRACE("(%p)->(IWMPacketSize %p)\n", This, ppv); - *ppv = &This->IWMPacketSize2_iface; - }else if(IsEqualGUID(riid, &IID_IWMPacketSize2)) { - TRACE("(%p)->(IWMPacketSize2 %p)\n", This, ppv); - *ppv = &This->IWMPacketSize2_iface; - }else { - *ppv = NULL; - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + return IWMProfile3_QueryInterface(&reader->reader.IWMProfile3_iface, iid, out); } static ULONG WINAPI WMReader_AddRef(IWMReader *iface) { - struct async_reader *This = impl_from_IWMReader(iface); - LONG ref = InterlockedIncrement(&This->ref); + struct async_reader *reader = impl_from_IWMReader(iface); - TRACE("(%p) ref=%d\n", This, ref); - - return ref; + return IWMProfile3_AddRef(&reader->reader.IWMProfile3_iface); } static ULONG WINAPI WMReader_Release(IWMReader *iface) { - struct async_reader *This = impl_from_IWMReader(iface); - LONG ref = InterlockedDecrement(&This->ref); + struct async_reader *reader = impl_from_IWMReader(iface); - TRACE("(%p) ref=%d\n", This, ref); - - if(!ref) - free(This); - - return ref; + return IWMProfile3_Release(&reader->reader.IWMProfile3_iface); } static HRESULT WINAPI WMReader_Open(IWMReader *iface, const WCHAR *url, IWMReaderCallback *callback, void *context) @@ -1692,289 +1600,6 @@ static const IReferenceClockVtbl ReferenceClockVtbl = refclock_Unadvise }; -static struct async_reader *impl_from_IWMProfile3(IWMProfile3 *iface) -{ - return CONTAINING_RECORD(iface, struct async_reader, IWMProfile3_iface); -} - -static HRESULT WINAPI profile3_QueryInterface(IWMProfile3 *iface, REFIID riid, void **ppv) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI profile3_AddRef(IWMProfile3 *iface) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI profile3_Release(IWMProfile3 *iface) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI profile3_GetVersion(IWMProfile3 *iface, WMT_VERSION *version) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, version); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetName(IWMProfile3 *iface, WCHAR *name, DWORD *length) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p, %p\n", This, name, length); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_SetName(IWMProfile3 *iface, const WCHAR *name) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %s\n", This, debugstr_w(name)); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetDescription(IWMProfile3 *iface, WCHAR *description, DWORD *length) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p, %p\n", This, description, length); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_SetDescription(IWMProfile3 *iface, const WCHAR *description) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %s\n", This, debugstr_w(description)); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetStreamCount(IWMProfile3 *iface, DWORD *count) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, count); - - if (!count) - return E_INVALIDARG; - - *count = 0; - return S_OK; -} - -static HRESULT WINAPI profile3_GetStream(IWMProfile3 *iface, DWORD index, IWMStreamConfig **config) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %d, %p\n", This, index, config); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetStreamByNumber(IWMProfile3 *iface, WORD stream, IWMStreamConfig **config) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %d, %p\n", This, stream, config); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_RemoveStream(IWMProfile3 *iface, IWMStreamConfig *config) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, config); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_RemoveStreamByNumber(IWMProfile3 *iface, WORD stream) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %d\n", This, stream); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_AddStream(IWMProfile3 *iface, IWMStreamConfig *config) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, config); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_ReconfigStream(IWMProfile3 *iface, IWMStreamConfig *config) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, config); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_CreateNewStream(IWMProfile3 *iface, REFGUID type, IWMStreamConfig **config) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %s, %p\n", This, debugstr_guid(type), config); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetMutualExclusionCount(IWMProfile3 *iface, DWORD *count) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, count); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetMutualExclusion(IWMProfile3 *iface, DWORD index, IWMMutualExclusion **mutual) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %d, %p\n", This, index, mutual); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_RemoveMutualExclusion(IWMProfile3 *iface, IWMMutualExclusion *mutual) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, mutual); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_AddMutualExclusion(IWMProfile3 *iface, IWMMutualExclusion *mutual) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, mutual); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_CreateNewMutualExclusion(IWMProfile3 *iface, IWMMutualExclusion **mutual) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, mutual); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetProfileID(IWMProfile3 *iface, GUID *guid) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, guid); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetStorageFormat(IWMProfile3 *iface, WMT_STORAGE_FORMAT *storage) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, storage); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_SetStorageFormat(IWMProfile3 *iface, WMT_STORAGE_FORMAT storage) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %d\n", This, storage); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetBandwidthSharingCount(IWMProfile3 *iface, DWORD *count) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, count); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetBandwidthSharing(IWMProfile3 *iface, DWORD index, IWMBandwidthSharing **bandwidth) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %d, %p\n", This, index, bandwidth); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_RemoveBandwidthSharing( IWMProfile3 *iface, IWMBandwidthSharing *bandwidth) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, bandwidth); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_AddBandwidthSharing(IWMProfile3 *iface, IWMBandwidthSharing *bandwidth) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, bandwidth); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_CreateNewBandwidthSharing( IWMProfile3 *iface, IWMBandwidthSharing **bandwidth) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, bandwidth); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetStreamPrioritization(IWMProfile3 *iface, IWMStreamPrioritization **stream) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, stream); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_SetStreamPrioritization(IWMProfile3 *iface, IWMStreamPrioritization *stream) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, stream); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_RemoveStreamPrioritization(IWMProfile3 *iface) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_CreateNewStreamPrioritization(IWMProfile3 *iface, IWMStreamPrioritization **stream) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, stream); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetExpectedPacketCount(IWMProfile3 *iface, QWORD duration, QWORD *packets) -{ - struct async_reader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %s, %p\n", This, wine_dbgstr_longlong(duration), packets); - return E_NOTIMPL; -} - -static const IWMProfile3Vtbl WMProfile3Vtbl = -{ - profile3_QueryInterface, - profile3_AddRef, - profile3_Release, - profile3_GetVersion, - profile3_GetName, - profile3_SetName, - profile3_GetDescription, - profile3_SetDescription, - profile3_GetStreamCount, - profile3_GetStream, - profile3_GetStreamByNumber, - profile3_RemoveStream, - profile3_RemoveStreamByNumber, - profile3_AddStream, - profile3_ReconfigStream, - profile3_CreateNewStream, - profile3_GetMutualExclusionCount, - profile3_GetMutualExclusion, - profile3_RemoveMutualExclusion, - profile3_AddMutualExclusion, - profile3_CreateNewMutualExclusion, - profile3_GetProfileID, - profile3_GetStorageFormat, - profile3_SetStorageFormat, - profile3_GetBandwidthSharingCount, - profile3_GetBandwidthSharing, - profile3_RemoveBandwidthSharing, - profile3_AddBandwidthSharing, - profile3_CreateNewBandwidthSharing, - profile3_GetStreamPrioritization, - profile3_SetStreamPrioritization, - profile3_RemoveStreamPrioritization, - profile3_CreateNewStreamPrioritization, - profile3_GetExpectedPacketCount -}; - static struct async_reader *impl_from_IWMPacketSize2(IWMPacketSize2 *iface) { return CONTAINING_RECORD(iface, struct async_reader, IWMPacketSize2_iface); @@ -2037,6 +1662,80 @@ static const IWMPacketSize2Vtbl WMPacketSize2Vtbl = packetsize_SetMinPacketSize }; +static struct async_reader *impl_from_wm_reader(struct wm_reader *iface) +{ + return CONTAINING_RECORD(iface, struct async_reader, reader); +} + +static void *async_reader_query_interface(struct wm_reader *iface, REFIID iid) +{ + struct async_reader *reader = impl_from_wm_reader(iface); + + TRACE("reader %p, iid %s.\n", reader, debugstr_guid(iid)); + + if (IsEqualIID(iid, &IID_IReferenceClock)) + return &reader->IReferenceClock_iface; + + if (IsEqualIID(iid, &IID_IWMHeaderInfo) + || IsEqualIID(iid, &IID_IWMHeaderInfo2) + || IsEqualIID(iid, &IID_IWMHeaderInfo3)) + return &reader->IWMHeaderInfo3_iface; + + if (IsEqualIID(iid, &IID_IWMLanguageList)) + return &reader->IWMLanguageList_iface; + + if (IsEqualIID(iid, &IID_IWMPacketSize) + || IsEqualIID(iid, &IID_IWMPacketSize2)) + return &reader->IWMPacketSize2_iface; + + if (IsEqualIID(iid, &IID_IWMReader)) + return &reader->IWMReader_iface; + + if (IsEqualIID(iid, &IID_IWMReaderAccelerator)) + return &reader->IWMReaderAccelerator_iface; + + if (IsEqualIID(iid, &IID_IWMReaderAdvanced) + || IsEqualIID(iid, &IID_IWMReaderAdvanced2) + || IsEqualIID(iid, &IID_IWMReaderAdvanced3) + || IsEqualIID(iid, &IID_IWMReaderAdvanced4) + || IsEqualIID(iid, &IID_IWMReaderAdvanced5) + || IsEqualIID(iid, &IID_IWMReaderAdvanced6)) + return &reader->IWMReaderAdvanced6_iface; + + if (IsEqualIID(iid, &IID_IWMReaderNetworkConfig) + || IsEqualIID(iid, &IID_IWMReaderNetworkConfig2)) + return &reader->IWMReaderNetworkConfig2_iface; + + if (IsEqualIID(iid, &IID_IWMReaderPlaylistBurn)) + return &reader->IWMReaderPlaylistBurn_iface; + + if (IsEqualIID(iid, &IID_IWMReaderStreamClock)) + return &reader->IWMReaderStreamClock_iface; + + if (IsEqualIID(iid, &IID_IWMReaderTimecode)) + return &reader->IWMReaderTimecode_iface; + + if (IsEqualIID(iid, &IID_IWMReaderTypeNegotiation)) + return &reader->IWMReaderTypeNegotiation_iface; + + return NULL; +} + +static void async_reader_destroy(struct wm_reader *iface) +{ + struct async_reader *reader = impl_from_wm_reader(iface); + + TRACE("reader %p.\n", reader); + + free(reader); +} + +static const struct wm_reader_ops async_reader_ops = +{ + .query_interface = async_reader_query_interface, + .destroy = async_reader_destroy, +}; + HRESULT WINAPI winegstreamer_create_wm_async_reader(IWMReader **reader) { struct async_reader *object; @@ -2046,11 +1745,12 @@ HRESULT WINAPI winegstreamer_create_wm_async_reader(IWMReader **reader) if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; + wm_reader_init(&object->reader, &async_reader_ops); + object->IReferenceClock_iface.lpVtbl = &ReferenceClockVtbl; object->IWMHeaderInfo3_iface.lpVtbl = &WMHeaderInfo3Vtbl; object->IWMLanguageList_iface.lpVtbl = &WMLanguageListVtbl; object->IWMPacketSize2_iface.lpVtbl = &WMPacketSize2Vtbl; - object->IWMProfile3_iface.lpVtbl = &WMProfile3Vtbl; object->IWMReader_iface.lpVtbl = &WMReaderVtbl; object->IWMReaderAdvanced6_iface.lpVtbl = &WMReaderAdvanced6Vtbl; object->IWMReaderAccelerator_iface.lpVtbl = &WMReaderAcceleratorVtbl; @@ -2059,7 +1759,6 @@ HRESULT WINAPI winegstreamer_create_wm_async_reader(IWMReader **reader) object->IWMReaderStreamClock_iface.lpVtbl = &WMReaderStreamClockVtbl; object->IWMReaderTimecode_iface.lpVtbl = &WMReaderTimecodeVtbl; object->IWMReaderTypeNegotiation_iface.lpVtbl = &WMReaderTypeNegotiationVtbl; - object->ref = 1; TRACE("Created async reader %p.\n", object); *reader = (IWMReader *)&object->IWMReader_iface; diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c new file mode 100644 index 00000000000..2bab6eb462d --- /dev/null +++ b/dlls/winegstreamer/wm_reader.c @@ -0,0 +1,308 @@ +/* + * Copyright 2012 Austin English + * + * reader 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. + * + * reader 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 "gst_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); + +static struct wm_reader *impl_from_IWMProfile3(IWMProfile3 *iface) +{ + return CONTAINING_RECORD(iface, struct wm_reader, IWMProfile3_iface); +} + +static HRESULT WINAPI profile_QueryInterface(IWMProfile3 *iface, REFIID iid, void **out) +{ + struct wm_reader *reader = impl_from_IWMProfile3(iface); + + TRACE("reader %p, iid %s, out %p.\n", reader, debugstr_guid(iid), out); + + if (IsEqualIID(iid, &IID_IUnknown) + || IsEqualIID(iid, &IID_IWMProfile) + || IsEqualIID(iid, &IID_IWMProfile2) + || IsEqualIID(iid, &IID_IWMProfile3)) + { + *out = &reader->IWMProfile3_iface; + } + else if (!(*out = reader->ops->query_interface(reader, iid))) + { + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static ULONG WINAPI profile_AddRef(IWMProfile3 *iface) +{ + struct wm_reader *reader = impl_from_IWMProfile3(iface); + ULONG refcount = InterlockedIncrement(&reader->refcount); + + TRACE("%p increasing refcount to %u.\n", reader, refcount); + + return refcount; +} + +static ULONG WINAPI profile_Release(IWMProfile3 *iface) +{ + struct wm_reader *reader = impl_from_IWMProfile3(iface); + ULONG refcount = InterlockedDecrement(&reader->refcount); + + TRACE("%p decreasing refcount to %u.\n", reader, refcount); + + if (!refcount) + reader->ops->destroy(reader); + + return refcount; +} + +static HRESULT WINAPI profile_GetVersion(IWMProfile3 *iface, WMT_VERSION *version) +{ + FIXME("iface %p, version %p, stub!\n", iface, version); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_GetName(IWMProfile3 *iface, WCHAR *name, DWORD *length) +{ + FIXME("iface %p, name %p, length %p, stub!\n", iface, name, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_SetName(IWMProfile3 *iface, const WCHAR *name) +{ + FIXME("iface %p, name %s, stub!\n", iface, debugstr_w(name)); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_GetDescription(IWMProfile3 *iface, WCHAR *description, DWORD *length) +{ + FIXME("iface %p, description %p, length %p, stub!\n", iface, description, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_SetDescription(IWMProfile3 *iface, const WCHAR *description) +{ + FIXME("iface %p, description %s, stub!\n", iface, debugstr_w(description)); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_GetStreamCount(IWMProfile3 *iface, DWORD *count) +{ + FIXME("iface %p, count %p, stub!\n", iface, count); + + if (!count) + return E_INVALIDARG; + + *count = 0; + return S_OK; +} + +static HRESULT WINAPI profile_GetStream(IWMProfile3 *iface, DWORD index, IWMStreamConfig **config) +{ + FIXME("iface %p, index %d, config %p, stub!\n", iface, index, config); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_GetStreamByNumber(IWMProfile3 *iface, WORD stream_number, IWMStreamConfig **config) +{ + FIXME("iface %p, stream_number %u, config %p, stub!\n", iface, stream_number, config); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_RemoveStream(IWMProfile3 *iface, IWMStreamConfig *config) +{ + FIXME("iface %p, config %p, stub!\n", iface, config); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_RemoveStreamByNumber(IWMProfile3 *iface, WORD stream_number) +{ + FIXME("iface %p, stream_number %u, stub!\n", iface, stream_number); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_AddStream(IWMProfile3 *iface, IWMStreamConfig *config) +{ + FIXME("iface %p, config %p, stub!\n", iface, config); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_ReconfigStream(IWMProfile3 *iface, IWMStreamConfig *config) +{ + FIXME("iface %p, config %p, stub!\n", iface, config); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_CreateNewStream(IWMProfile3 *iface, REFGUID type, IWMStreamConfig **config) +{ + FIXME("iface %p, type %s, config %p, stub!\n", iface, debugstr_guid(type), config); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_GetMutualExclusionCount(IWMProfile3 *iface, DWORD *count) +{ + FIXME("iface %p, count %p, stub!\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_GetMutualExclusion(IWMProfile3 *iface, DWORD index, IWMMutualExclusion **excl) +{ + FIXME("iface %p, index %u, excl %p, stub!\n", iface, index, excl); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_RemoveMutualExclusion(IWMProfile3 *iface, IWMMutualExclusion *excl) +{ + FIXME("iface %p, excl %p, stub!\n", iface, excl); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_AddMutualExclusion(IWMProfile3 *iface, IWMMutualExclusion *excl) +{ + FIXME("iface %p, excl %p, stub!\n", iface, excl); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_CreateNewMutualExclusion(IWMProfile3 *iface, IWMMutualExclusion **excl) +{ + FIXME("iface %p, excl %p, stub!\n", iface, excl); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_GetProfileID(IWMProfile3 *iface, GUID *id) +{ + FIXME("iface %p, id %p, stub!\n", iface, id); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_GetStorageFormat(IWMProfile3 *iface, WMT_STORAGE_FORMAT *format) +{ + FIXME("iface %p, format %p, stub!\n", iface, format); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_SetStorageFormat(IWMProfile3 *iface, WMT_STORAGE_FORMAT format) +{ + FIXME("iface %p, format %#x, stub!\n", iface, format); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_GetBandwidthSharingCount(IWMProfile3 *iface, DWORD *count) +{ + FIXME("iface %p, count %p, stub!\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_GetBandwidthSharing(IWMProfile3 *iface, DWORD index, IWMBandwidthSharing **sharing) +{ + FIXME("iface %p, index %d, sharing %p, stub!\n", iface, index, sharing); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_RemoveBandwidthSharing( IWMProfile3 *iface, IWMBandwidthSharing *sharing) +{ + FIXME("iface %p, sharing %p, stub!\n", iface, sharing); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_AddBandwidthSharing(IWMProfile3 *iface, IWMBandwidthSharing *sharing) +{ + FIXME("iface %p, sharing %p, stub!\n", iface, sharing); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_CreateNewBandwidthSharing( IWMProfile3 *iface, IWMBandwidthSharing **sharing) +{ + FIXME("iface %p, sharing %p, stub!\n", iface, sharing); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_GetStreamPrioritization(IWMProfile3 *iface, IWMStreamPrioritization **stream) +{ + FIXME("iface %p, stream %p, stub!\n", iface, stream); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_SetStreamPrioritization(IWMProfile3 *iface, IWMStreamPrioritization *stream) +{ + FIXME("iface %p, stream %p, stub!\n", iface, stream); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_RemoveStreamPrioritization(IWMProfile3 *iface) +{ + FIXME("iface %p, stub!\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_CreateNewStreamPrioritization(IWMProfile3 *iface, IWMStreamPrioritization **stream) +{ + FIXME("iface %p, stream %p, stub!\n", iface, stream); + return E_NOTIMPL; +} + +static HRESULT WINAPI profile_GetExpectedPacketCount(IWMProfile3 *iface, QWORD duration, QWORD *count) +{ + FIXME("iface %p, duration %s, count %p, stub!\n", iface, debugstr_time(duration), count); + return E_NOTIMPL; +} + +static const IWMProfile3Vtbl profile_vtbl = +{ + profile_QueryInterface, + profile_AddRef, + profile_Release, + profile_GetVersion, + profile_GetName, + profile_SetName, + profile_GetDescription, + profile_SetDescription, + profile_GetStreamCount, + profile_GetStream, + profile_GetStreamByNumber, + profile_RemoveStream, + profile_RemoveStreamByNumber, + profile_AddStream, + profile_ReconfigStream, + profile_CreateNewStream, + profile_GetMutualExclusionCount, + profile_GetMutualExclusion, + profile_RemoveMutualExclusion, + profile_AddMutualExclusion, + profile_CreateNewMutualExclusion, + profile_GetProfileID, + profile_GetStorageFormat, + profile_SetStorageFormat, + profile_GetBandwidthSharingCount, + profile_GetBandwidthSharing, + profile_RemoveBandwidthSharing, + profile_AddBandwidthSharing, + profile_CreateNewBandwidthSharing, + profile_GetStreamPrioritization, + profile_SetStreamPrioritization, + profile_RemoveStreamPrioritization, + profile_CreateNewStreamPrioritization, + profile_GetExpectedPacketCount, +}; + +void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops) +{ + reader->IWMProfile3_iface.lpVtbl = &profile_vtbl; + reader->refcount = 1; + reader->ops = ops; +} diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/winegstreamer/wm_syncreader.c index 1d65820aa02..f4a5c9503ca 100644 --- a/dlls/winegstreamer/wm_syncreader.c +++ b/dlls/winegstreamer/wm_syncreader.c @@ -17,8 +17,6 @@ */ #include "gst_private.h" -#include "initguid.h" -#include "wmsdk.h" WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); -- 2.33.0

1 4

[PATCH] ws2_32: Support setting SO_ERROR
by Alex Henrie 20 Oct '21

20 Oct '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Qt sets this option, see https://code.qt.io/cgit/qt/qtbase.git/tree/src/network/socket/qnativesocket… --- dlls/ws2_32/socket.c | 4 +--- dlls/ws2_32/tests/sock.c | 10 ++++++++-- include/wine/afd.h | 1 + server/sock.c | 38 +++++++++++++++++++++++++++----------- 4 files changed, 37 insertions(+), 16 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2db441bee3c..2c2eabc09fa 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2750,9 +2750,7 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int } case SO_ERROR: - FIXME( "SO_ERROR, stub!\n" ); - SetLastError( WSAENOPROTOOPT ); - return -1; + return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_ERROR, optval, optlen ); case SO_KEEPALIVE: return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_KEEPALIVE, optval, optlen ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 02713a7c625..76f4f1ef8a2 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1289,7 +1289,6 @@ static void test_set_getsockopt(void) SetLastError(0xdeadbeef); i = 1234; err = setsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, size); -todo_wine ok( !err && !WSAGetLastError(), "got %d with %d (expected 0 with 0)\n", err, WSAGetLastError()); @@ -1300,7 +1299,14 @@ todo_wine ok( !err && !WSAGetLastError(), "got %d with %d (expected 0 with 0)\n", err, WSAGetLastError()); -todo_wine + ok (i == 1234, "got %d (expected 1234)\n", i); + + SetLastError(0xdeadbeef); + i = 4321; + err = getsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, &size); + ok( !err && !WSAGetLastError(), + "got %d with %d (expected 0 with 0)\n", + err, WSAGetLastError()); ok (i == 1234, "got %d (expected 1234)\n", i); /* Test invalid optlen */ diff --git a/include/wine/afd.h b/include/wine/afd.h index 3b8bdcb9e5d..9382e2acf2f 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -238,6 +238,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IP_RECVTTL WINE_AFD_IOC(294) #define IOCTL_AFD_WINE_GET_IP_RECVTOS WINE_AFD_IOC(295) #define IOCTL_AFD_WINE_SET_IP_RECVTOS WINE_AFD_IOC(296) +#define IOCTL_AFD_WINE_SET_SO_ERROR WINE_AFD_IOC(297) struct afd_create_params { diff --git a/server/sock.c b/server/sock.c index 4cb5503ad25..9829b876ff2 100644 --- a/server/sock.c +++ b/server/sock.c @@ -193,6 +193,7 @@ struct sock unsigned int message; /* message to send */ obj_handle_t wparam; /* message wparam (socket handle) */ int errors[AFD_POLL_BIT_COUNT]; /* event errors */ + unsigned int last_error; /* most recent error code */ timeout_t connect_time;/* time the socket was connected */ struct sock *deferred; /* socket that waits for a deferred accept */ struct async_queue read_q; /* queue for asynchronous reads */ @@ -965,6 +966,7 @@ static void post_socket_event( struct sock *sock, enum afd_poll_bit event_bit, i sock->pending_events |= event; sock->reported_events |= event; sock->errors[event_bit] = error; + sock->last_error = sock_get_error( error ); } } @@ -980,6 +982,7 @@ static void sock_dispatch_events( struct sock *sock, enum connection_state prevs { post_socket_event( sock, AFD_POLL_BIT_CONNECT, 0 ); sock->errors[AFD_POLL_BIT_CONNECT_ERR] = 0; + sock->last_error = 0; } if (event & (POLLERR | POLLHUP)) post_socket_event( sock, AFD_POLL_BIT_CONNECT_ERR, error ); @@ -1443,6 +1446,7 @@ static struct sock *create_socket(void) init_async_queue( &sock->connect_q ); init_async_queue( &sock->poll_q ); memset( sock->errors, 0, sizeof(sock->errors) ); + sock->last_error = 0; list_init( &sock->accept_list ); return sock; } @@ -2677,7 +2681,6 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { int error; socklen_t len = sizeof(error); - unsigned int i; if (get_reply_max_size() < sizeof(error)) { @@ -2691,19 +2694,32 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return; } - if (!error) + if (error) + sock->last_error = sock_get_error( error ); + + set_reply_data( &sock->last_error, sizeof(sock->last_error) ); + return; + } + + case IOCTL_AFD_WINE_SET_SO_ERROR: + { + int error; + socklen_t len = sizeof(error); + + if (get_req_data_size() < sizeof(sock->last_error)) { - for (i = 0; i < ARRAY_SIZE( sock->errors ); ++i) - { - if (sock->errors[i]) - { - error = sock_get_error( sock->errors[i] ); - break; - } - } + set_error( STATUS_BUFFER_TOO_SMALL ); + return; + } + + /* clear the native error, if any */ + if (getsockopt( unix_fd, SOL_SOCKET, SO_ERROR, (char *)&error, &len ) < 0) + { + set_error( sock_get_ntstatus( errno ) ); + return; } - set_reply_data( &error, sizeof(error) ); + sock->last_error = *(unsigned int *)get_req_data(); return; } -- 2.33.1

1 0

[PATCH 1/2] winebus.sys: Treat udev actions other than "remove" as "add".
by Rémi Bernon 20 Oct '21

20 Oct '21

From: Simon McVittie <smcv(a)collabora.com> As per https://github.com/systemd/systemd/blob/v247-rc1/NEWS#L5 there are more kernel uevent types than just "add" and "remove", and we should be treating everything other than "remove" as being potentially an "add". To cope with this, try_add_device() now checks whether the same device was already added. If so, we ignore it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Two patches from Proton, which should help the udev backend when running Wine within a container. There was some container detection too but that seemed a bit specific, and the new option should be enough. dlls/winebus.sys/bus_udev.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 1cad63f0275..59bb2564def 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1411,16 +1411,14 @@ static void process_monitor_event(struct udev_monitor *monitor) if (!action) WARN("No action received\n"); - else if (strcmp(action, "add") == 0) + else if (strcmp(action, "remove")) udev_add_device(dev); - else if (strcmp(action, "remove") == 0) + else { impl = find_device_from_udev(dev); if (impl) bus_event_queue_device_removed(&event_queue, &impl->unix_device); else WARN("failed to find device for udev device %p\n", dev); } - else - WARN("Unhandled action %s\n", debugstr_a(action)); udev_device_unref(dev); } -- 2.33.0

2 3

[PATCH] winebus.sys: Add a trailing linefeed to a couple of FIXME()s.
by Francois Gouget 20 Oct '21

20 Oct '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winebus.sys/bus_sdl.c | 2 +- dlls/winebus.sys/bus_udev.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index f1c20692b29..403c4821f24 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -629,7 +629,7 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT break; case PID_USAGE_ET_CUSTOM_FORCE_DATA: - FIXME("not implemented!"); + FIXME("not implemented!\n"); break; } diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 1dfce05e4bc..45421c3fe12 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1084,7 +1084,7 @@ static NTSTATUS lnxev_device_physical_effect_update(struct unix_device *iface, B break; case PID_USAGE_ET_CUSTOM_FORCE_DATA: - FIXME("not implemented!"); + FIXME("not implemented!\n"); break; } -- 2.30.2

2 1

[PATCH] wrc: Add a trailing linefeed to a couple of error() messages.
by Francois Gouget 20 Oct '21

20 Oct '21

Unlike most of the other wrc error functions, error() does not append a trailing linefeed. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- tools/wrc/ppl.l | 2 +- tools/wrc/wpp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/wrc/ppl.l b/tools/wrc/ppl.l index d4df76f7950..ee5a4f97a1e 100644 --- a/tools/wrc/ppl.l +++ b/tools/wrc/ppl.l @@ -1192,7 +1192,7 @@ static void push_buffer(pp_entry_t *ppp, char *filename, char *incname, int pop) if(ppy_debug) printf("push_buffer(%d): %p %p %p %d\n", bufferstackidx, ppp, filename, incname, pop); if(bufferstackidx >= MAXBUFFERSTACK) - error("Buffer stack overflow"); + error("Buffer stack overflow\n"); memset(&bufferstack[bufferstackidx], 0, sizeof(bufferstack[0])); bufferstack[bufferstackidx].bufferstate = YY_CURRENT_BUFFER; diff --git a/tools/wrc/wpp.c b/tools/wrc/wpp.c index 9ad09f25da2..18a7b015be0 100644 --- a/tools/wrc/wpp.c +++ b/tools/wrc/wpp.c @@ -421,7 +421,7 @@ static const char * const pp_if_state_str[] = { void pp_push_if(pp_if_state_t s) { if(if_stack_idx >= MAXIFSTACK) - error("#if-stack overflow; #{if,ifdef,ifndef} nested too deeply (> %d)", MAXIFSTACK); + error("#if-stack overflow; #{if,ifdef,ifndef} nested too deeply (> %d)\n", MAXIFSTACK); if(pp_flex_debug) fprintf(stderr, "Push if %s:%d: %s(%d) -> %s(%d)\n", pp_status.input, pp_status.line_number, pp_if_state_str[pp_if_state()], if_stack_idx, pp_if_state_str[s], if_stack_idx+1); -- 2.30.2

1 0

[PATCH v2 1/2] oleaut32: Allow the registration of 64bit typelibs from a 32bit context.
by Bernhard Kölbl 20 Oct '21

20 Oct '21

Windows allows the registration of 64bit typelibs from 32bit programs even on a pure Win32 install. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51864 Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- v2: Handle insufficient privileges in the testcase. --- dlls/oleaut32/tests/typelib.c | 180 ++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 4 - 2 files changed, 180 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 825851c948e..78290c94dfe 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -6848,6 +6848,185 @@ static void test_register_typelib(BOOL system_registration) DeleteFileW(filename); } +static void test_register_typelib_64(void) +{ + ICreateTypeInfo *createti, *createti_co; + ELEMDESC elemdesc[5], elemdesc2[5]; + FUNCDESC funcdesc, funcdesc2; + ITypeInfo *unknown, *tinfo; + ITypeLib *stdole, *typelib; + ICreateTypeLib2 *createtl; + WCHAR filename[MAX_PATH]; + HREFTYPE hreftype; + HRESULT hr; + + static const WCHAR wszStdOle2[] = { 's','t','d','o','l','e','2','.','t','l','b',0 }; + + static OLECHAR typelibW[] = { 'W','i','n','e','T','e','s','t','T','y','p','e','L','i','b',0}; + static OLECHAR helpfileW[] = { 'C',':','\\','b','o','g','u','s','.','h','l','p',0 }; + static OLECHAR dllfileW[] = { 'C',':','\\','b','o','g','u','s','.','d','l','l',0 }; + static OLECHAR interface1W[] = { 'I','T','e','s','t','W','i','n','e','6', '4', 0}; + static OLECHAR coclassW[] = {'W','i','n','e','T','e','s','t','C','o','c','l','a','s','s',0 }; + static OLECHAR func1W[] = { 'f','u','n','c','1',0 }; + static OLECHAR func2W[] = { 'f','u','n','c','2',0 }; + static OLECHAR param1W[] = { 'p','a','r','a','m','1',0 }; + static OLECHAR param2W[] = { 'p','a','r','a','m','2',0 }; + static OLECHAR *names1[] = { func1W, param1W, param2W }; + static OLECHAR *names2[] = { func2W, param1W }; + static const GUID tlcustguid = { 0x512d2fec,0xcaf6,0x4c33,{0xbc,0x38,0x84,0x2f,0x2e,0x37,0x0d,0x7b} }; + static const GUID coclassguid = { 0x317cd4dd,0x0ce0,0x4525,{0x8d,0x33,0x68,0x14,0x4c,0x53,0x60,0xe9} }; + static const GUID interfaceguid = { 0x35cc5cea,0x11cc,0x4bca,{0x89,0x8c,0xf8,0x92,0x8e,0xb8,0xda,0x24} }; + + static const SYSKIND sys = SYS_WIN64; + + hr = LoadTypeLib(wszStdOle2, &stdole); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ITypeLib_GetTypeInfoOfGuid(stdole, &IID_IDispatch, &unknown); + ok(hr == S_OK, "got %08x\n", hr); + + GetTempFileNameW(L".", L"tlb", 0, filename); + + hr = CreateTypeLib2(sys, filename, &createtl); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetName(createtl, typelibW); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetHelpFileName(createtl, helpfileW); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetHelpStringDll(createtl, dllfileW); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetGuid(createtl, &tlcustguid); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetVersion(createtl, 1, 0); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_CreateTypeInfo(createtl, coclassW, TKIND_COCLASS, &createti_co); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_LayOut(createti); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetGuid(createti, &interfaceguid); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetVersion(createti, 1, 0); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_AddRefTypeInfo(createti, unknown, &hreftype); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_AddImplType(createti, 0, hreftype); + ok(hr == S_OK, "got %08x\n", hr); + + elemdesc[0].tdesc.vt = VT_UINT; + U(elemdesc[0]).idldesc.dwReserved = 0; + U(elemdesc[0]).idldesc.wIDLFlags = IDLFLAG_FIN; + + elemdesc[1].tdesc.vt = VT_DECIMAL; + U(elemdesc[1]).idldesc.dwReserved = 0; + U(elemdesc[1]).idldesc.wIDLFlags = IDLFLAG_FIN; + + memset(&funcdesc, 0, sizeof(FUNCDESC)); + funcdesc.funckind = FUNC_PUREVIRTUAL; + funcdesc.invkind = INVOKE_FUNC; + funcdesc.callconv = CC_STDCALL; + funcdesc.cParams = 2; + funcdesc.memid = 0x1; + funcdesc.elemdescFunc.tdesc.vt = VT_HRESULT; + funcdesc.lprgelemdescParam = elemdesc; + + hr = ICreateTypeInfo_AddFuncDesc(createti, 0, &funcdesc); + ok(hr == S_OK, "got %08x\n", hr); + + elemdesc2[0].tdesc.vt = VT_UINT; + U(elemdesc2[0]).idldesc.dwReserved = 0; + U(elemdesc2[0]).idldesc.wIDLFlags = IDLFLAG_FIN | IDLFLAG_FOUT; + + memset(&funcdesc2, 0, sizeof(FUNCDESC)); + funcdesc2.funckind = FUNC_PUREVIRTUAL; + funcdesc2.invkind = INVOKE_FUNC; + funcdesc.callconv = CC_STDCALL; + funcdesc2.cParams = 1; + funcdesc2.memid = 0x2; + funcdesc2.elemdescFunc.tdesc.vt = VT_HRESULT; + funcdesc2.lprgelemdescParam = elemdesc2; + + hr = ICreateTypeInfo_AddFuncDesc(createti, 1, &funcdesc2); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetFuncHelpContext(createti, 0, 0xabcdefab); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetFuncHelpContext(createti, 1, 0xabcdefab); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetFuncAndParamNames(createti, 0, names1, 3); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetFuncAndParamNames(createti, 1, names2, 2); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetTypeFlags(createti, TYPEFLAG_FOLEAUTOMATION | TYPEFLAG_FNONEXTENSIBLE | TYPEFLAG_FDUAL); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_QueryInterface(createti, &IID_ITypeInfo, (void**)&tinfo); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ITypeInfo_GetRefTypeOfImplType(tinfo, 0, &hreftype); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetGuid(createti_co, &coclassguid); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_AddRefTypeInfo(createti_co, tinfo, &hreftype); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_AddImplType(createti_co, 0, hreftype); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetImplTypeFlags(createti_co, 0, IMPLTYPEFLAG_FDEFAULT); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_Release(createti_co); + ok(hr == S_OK, "got %08x\n", hr); + + ICreateTypeInfo_Release(createti); + + hr = ICreateTypeLib2_SaveAllChanges(createtl); + ok(hr == S_OK, "got %08x\n", hr); + + ICreateTypeLib2_Release(createtl); + + trace("TypeLib to load: %ls\n", filename); + hr = LoadTypeLibEx(filename, REGKIND_NONE, &typelib); + ok(hr == S_OK, "got: %08x\n", hr); + + if(typelib) + { + hr = RegisterTypeLib(typelib, filename, NULL); + if (hr == TYPE_E_REGISTRYACCESS) + { + win_skip("Insufficient privileges to register typelib in the registry\n"); + ITypeLib_Release(typelib); + DeleteFileW(filename); + return; + } + ok(hr == S_OK, "got: %08x\n", hr); + + ITypeLib_Release(typelib); + } + + DeleteFileW(filename); +} + static void test_LoadTypeLib(void) { ITypeLib *tl; @@ -8351,6 +8530,7 @@ START_TEST(typelib) test_register_typelib(TRUE); test_register_typelib(FALSE); + test_register_typelib_64(); test_create_typelibs(); test_LoadTypeLib(); test_TypeInfo2_GetContainingTypeLib(); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 70f15679811..ef546379174 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -629,10 +629,6 @@ HRESULT WINAPI RegisterTypeLib(ITypeLib *ptlib, const WCHAR *szFullPath, const W if (FAILED(ITypeLib_GetLibAttr(ptlib, &attr))) return E_FAIL; -#ifndef _WIN64 - if (attr->syskind == SYS_WIN64) return TYPE_E_BADMODULEKIND; -#endif - get_typelib_key( &attr->guid, attr->wMajorVerNum, attr->wMinorVerNum, keyName ); res = S_OK; -- 2.33.0

1 1

[PATCH] po: Update Traditional Chinese translation.
by Chan Chilung 20 Oct '21

20 Oct '21

Signed-off-by: Chan Chilung <eason066(a)gmail.com> --- po/zh_TW.po | 1081 +++++++++++++++++++++------------------------------ 1 file changed, 454 insertions(+), 627 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index a8312e8bcec..45f7be06f2e 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,9 +5,9 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-07-28 00:06+0800\n" -"Last-Translator: Wei-Lun Chao <bluebat(a)member.fsf.org>\n" -"Language-Team: Chinese (traditional) <zh-l10n(a)linux.org.tw>\n" +"PO-Revision-Date: 2021-10-20 19:13+0800\n" +"Last-Translator: Chan Chilung <eason066(a)gmail.com>\n" +"Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,30 +20,24 @@ msgid "Security" msgstr "安全性" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "使用者名稱(&U)：" +msgstr "群組或使用者名稱(&U)：" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "黃色" +msgstr "允許" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "拒絕" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Access denied.\n" msgid "Permissions for %1" -msgstr "存取被拒。\n" +msgstr "%1 的權限" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" -msgstr "安裝/移除" +msgstr "安裝/解除安裝" #: dlls/appwiz.cpl/appwiz.rc:61 msgid "" @@ -61,8 +55,8 @@ msgid "" "to modify its installed components, select it from the list and click Modify/" "Remove." msgstr "" -"下列軟體可以自動解除安裝。從清單中選取它並按下「新增/移除」，可以移除程式或" -"者調整已安裝元件。" +"下列軟體可以自動解除安裝。要移除程式或者調整已安裝元件，請從清單中選取程式" +"並按下「修改/移除」。" #: dlls/appwiz.cpl/appwiz.rc:67 msgid "&Support Information" @@ -123,11 +117,11 @@ msgstr "確定" #: dlls/appwiz.cpl/appwiz.rc:79 msgid "The following information can be used to get technical support for %s:" -msgstr "%s 技術支援資訊：" +msgstr "以下資訊可協助取得 %s 的技術支援：" #: dlls/appwiz.cpl/appwiz.rc:80 msgid "Publisher:" -msgstr "生產商：" +msgstr "發行者：" #: dlls/appwiz.cpl/appwiz.rc:81 programs/winefile/winefile.rc:165 msgid "Version:" @@ -175,7 +169,7 @@ msgstr "" "幫您下載並安裝 Gecko。\n" "\n" "備註：建議您使用發行版所附的套件。詳情請見 <a href=\"https://wiki.winehq.org/" -"Gecko\">https://wiki.winehq.org/Gecko</a>" +"Gecko\">https://wiki.winehq.org/Gecko</a>。" #: dlls/appwiz.cpl/appwiz.rc:109 dlls/appwiz.cpl/appwiz.rc:124 msgid "&Install" @@ -242,7 +236,7 @@ msgstr "" "並安裝它。\n" "\n" "備註：建議您使用發行版所附的套件。詳情請見 <a href=\"https://wiki.winehq.org/" -"Mono\">https://wiki.winehq.org/Mono</a>" +"Mono\">https://wiki.winehq.org/Mono</a>。" #: dlls/appwiz.cpl/appwiz.rc:31 msgid "Add/Remove Programs" @@ -263,7 +257,7 @@ msgstr "應用程式" msgid "" "Unable to execute the uninstaller, '%s'. Do you want to remove the uninstall " "entry for this program from the registry?" -msgstr "無法執行移除程式 %s。您想將這個移除程式從註冊表中刪除嗎？" +msgstr "無法執行移除程式「%s」。您想將這個移除程式從註冊表中移除嗎？" #: dlls/appwiz.cpl/appwiz.rc:36 msgid "Not specified" @@ -277,7 +271,7 @@ msgstr "名稱" #: dlls/appwiz.cpl/appwiz.rc:39 msgid "Publisher" -msgstr "生產商" +msgstr "發行者" #: dlls/appwiz.cpl/appwiz.rc:40 dlls/cryptui/cryptui.rc:54 msgid "Version" @@ -331,7 +325,7 @@ msgstr "選項(&O)..." #: dlls/avifil32/avifil32.rc:49 msgid "&Interleave every" -msgstr "交錯(&I)" +msgstr "交錯(&I)：每隔" #: dlls/avifil32/avifil32.rc:51 dlls/msvfw32/msvfw32.rc:51 msgid "frames" @@ -363,7 +357,7 @@ msgstr "音訊" #: dlls/avifil32/avifil32.rc:36 msgid "Wine AVI-default-filehandler" -msgstr "Wine AVI-預設處理器" +msgstr "Wine AVI 預設處理器" #: dlls/avifil32/avifil32.rc:37 msgid "uncompressed" @@ -375,29 +369,27 @@ msgstr "正在取消..." #: dlls/browseui/browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "剩餘 %1!u! %2" #: dlls/browseui/browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "剩餘 %1!u! %2 %3!u! %4" #: dlls/browseui/browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "秒(&S)" +msgstr "秒" #: dlls/browseui/browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "分" #: dlls/browseui/browseui.rc:33 msgid "hours" -msgstr "" +msgstr "小時" #: dlls/comctl32/comctl32.rc:68 programs/winefile/winefile.rc:156 msgid "Properties for %s" -msgstr "屬性 %s" +msgstr "%s 的內容" #: dlls/comctl32/comctl32.rc:73 dlls/comdlg32/comdlg32.rc:265 msgid "&Apply" @@ -438,7 +430,7 @@ msgstr "關閉(&C)" #: dlls/comctl32/comctl32.rc:101 msgid "R&eset" -msgstr "重置(&e)" +msgstr "重置(&E)" #: dlls/comctl32/comctl32.rc:102 dlls/comdlg32/comdlg32.rc:173 #: dlls/comdlg32/comdlg32.rc:195 dlls/comdlg32/comdlg32.rc:266 @@ -458,7 +450,7 @@ msgstr "重置(&e)" #: programs/winemine/winemine.rc:53 programs/winhlp32/winhlp32.rc:57 #: programs/wordpad/wordpad.rc:102 msgid "&Help" -msgstr "求助(&H)" +msgstr "說明(&H)" #: dlls/comctl32/comctl32.rc:103 msgid "Move &Up" @@ -508,16 +500,12 @@ msgid "&Retry" msgstr "重試(&R)" #: dlls/comctl32/comctl32.rc:62 -#, fuzzy -#| msgid "Hide &Tabs" msgid "Hide details" -msgstr "隱藏分頁(&T)" +msgstr "隱藏詳細資訊" #: dlls/comctl32/comctl32.rc:63 -#, fuzzy -#| msgid "Details" msgid "See details" -msgstr "詳細資料" +msgstr "顯示詳細資訊" #: dlls/comctl32/comctl32.rc:31 dlls/cryptui/cryptui.rc:235 #: programs/regedit/regedit.rc:286 programs/taskmgr/taskmgr.rc:434 @@ -641,7 +629,7 @@ msgstr "[無]" #: dlls/comdlg32/comdlg32.rc:231 msgid "Specific &Printer" -msgstr "特定的印表機(&P)" +msgstr "指定的印表機(&P)" #: dlls/comdlg32/comdlg32.rc:236 dlls/comdlg32/comdlg32.rc:419 #: dlls/comdlg32/comdlg32.rc:443 dlls/wineps.drv/wineps.rc:34 @@ -701,7 +689,7 @@ msgstr "底線(&U)" #: dlls/comdlg32/comdlg32.rc:270 programs/winecfg/winecfg.rc:290 msgid "&Color:" -msgstr "配色(&C)：" +msgstr "色彩(&C)：" #: dlls/comdlg32/comdlg32.rc:273 msgid "Sample" @@ -721,11 +709,11 @@ msgstr "基本色彩(&B)：" #: dlls/comdlg32/comdlg32.rc:287 msgid "&Custom Colors:" -msgstr "自定色彩(&C)：" +msgstr "自訂色彩(&C)：" #: dlls/comdlg32/comdlg32.rc:289 msgid "|S&olid" -msgstr "" +msgstr "|純色(&O)" #: dlls/comdlg32/comdlg32.rc:290 msgid "&Red:" @@ -755,18 +743,16 @@ msgstr "亮度(&L)：" #: dlls/comdlg32/comdlg32.rc:310 msgid "&Add to Custom Colors" -msgstr "新增自定色彩(&A)" +msgstr "新增自訂色彩(&A)" #: dlls/comdlg32/comdlg32.rc:311 msgid "&Define Custom Colors >>" -msgstr "定義自定色彩(&D) >>" +msgstr "定義自訂色彩(&D) >>" #: dlls/comdlg32/comdlg32.rc:312 -#, fuzzy -#| msgid "&No" msgctxt "Solid" msgid "&o" -msgstr "否(&N)" +msgstr "&o" #: dlls/comdlg32/comdlg32.rc:318 programs/regedit/regedit.rc:275 #: programs/regedit/regedit.rc:285 @@ -822,7 +808,7 @@ msgstr "取代全部(&A)" #: dlls/shell32/shell32.rc:108 programs/clock/clock.rc:31 #: programs/conhost/conhost.rc:34 msgid "&Properties" -msgstr "屬性(&P)" +msgstr "內容(&P)" #: dlls/comdlg32/comdlg32.rc:364 msgid "Print to fi&le" @@ -961,7 +947,7 @@ msgstr "找不到檔案" #: dlls/comdlg32/comdlg32.rc:34 msgid "Please verify that the correct file name was given" -msgstr "請檢查是否給予正確的檔案名稱。" +msgstr "請檢查是否給予正確的檔案名稱" #: dlls/comdlg32/comdlg32.rc:35 msgid "" @@ -977,23 +963,23 @@ msgid "" "Do you want to replace it?" msgstr "" "檔案已經存在。\n" -"要取代嗎？" +"您要取代它嗎？" #: dlls/comdlg32/comdlg32.rc:37 msgid "Invalid character(s) in path" -msgstr "檔案名稱中存在無效的字元" +msgstr "路徑中存在無效的字元" #: dlls/comdlg32/comdlg32.rc:38 msgid "" "A filename cannot contain any of the following characters:\n" " / : < > |" msgstr "" -"檔案名中不能包含任何一下字元:\n" +"檔案名稱中不能包含以下任何一個字元：\n" " / : < > |" #: dlls/comdlg32/comdlg32.rc:39 msgid "Path does not exist" -msgstr "資料夾不存在" +msgstr "路徑不存在" #: dlls/comdlg32/comdlg32.rc:40 msgid "File does not exist" @@ -1001,7 +987,7 @@ msgstr "檔案不存在" #: dlls/comdlg32/comdlg32.rc:41 msgid "The selection contains a non-folder object" -msgstr "" +msgstr "已選項目包含非資料夾對象" #: dlls/comdlg32/comdlg32.rc:46 msgid "Up One Level" @@ -1118,15 +1104,15 @@ msgstr "" #: dlls/comdlg32/comdlg32.rc:61 msgid "The 'from' entry cannot exceed the 'to' entry." -msgstr "起始值不能大於終點值。" +msgstr "「從」項的值不能大於「到」項的值。" #: dlls/comdlg32/comdlg32.rc:63 msgid "" "Margins overlap or fall outside Paper boundaries.\n" "Please reenter margins." msgstr "" -"邊緣空白重疊或落於邊界外，\n" -"請重新輸入邊緣空白。" +"頁面邊距重疊或落於邊界外，\n" +"請重新輸入頁面邊距。" #: dlls/comdlg32/comdlg32.rc:65 msgid "The 'Number of copies' field cannot be empty." @@ -1137,8 +1123,8 @@ msgid "" "This large number of copies is not supported by your printer.\n" "Please enter a value between 1 and %d." msgstr "" -"您的印表機不支持這麼大的份數。\n" -"請輸入一個 1 和 %d 之間的數。" +"您的印表機不支援列印這麼大的份數。\n" +"請輸入一個 1 和 %d 之間的數值。" #: dlls/comdlg32/comdlg32.rc:68 msgid "A printer error occurred." @@ -1169,12 +1155,12 @@ msgid "" "Before you can perform printer-related tasks such as page setup or printing " "a document, you need to install a printer. Please install one and retry." msgstr "" -"在使用與印表機有關功能(版面設定, 列印檔案)之前, 您必須先安裝印表機。請安裝一" -"個印表機後再試。" +"您必須先安裝印表機才能使用與印表機有關的功能（如：版面設定、列印檔案）。" +"請安裝印表機後再試一次。" #: dlls/comdlg32/comdlg32.rc:142 msgid "Select a font size between %1!d! and %2!d! points." -msgstr "選取介於 %1!d! 和 %2!d! 點的字型尺寸。" +msgstr "選取介於 %1!d! 和 %2!d! 點的字型大小。" #: dlls/comdlg32/comdlg32.rc:143 dlls/ieframe/ieframe.rc:35 msgid "&Save" @@ -1193,14 +1179,12 @@ msgid "Open File" msgstr "開啟檔案" #: dlls/comdlg32/comdlg32.rc:148 -#, fuzzy -#| msgid "New Folder" msgid "Select Folder" -msgstr "新資料夾" +msgstr "選擇資料夾" #: dlls/comdlg32/comdlg32.rc:149 msgid "Font size has to be a number." -msgstr "" +msgstr "字型大小必須是數字。" #: dlls/comdlg32/comdlg32.rc:84 programs/oleview/oleview.rc:98 msgid "Ready" @@ -1260,7 +1244,7 @@ msgstr "不可用；" #: dlls/comdlg32/comdlg32.rc:98 msgid "Waiting; " -msgstr "等待；" +msgstr "正在等待；" #: dlls/comdlg32/comdlg32.rc:99 msgid "Processing; " @@ -1288,7 +1272,7 @@ msgstr "頁處理記憶體超支；" #: dlls/comdlg32/comdlg32.rc:105 msgid "Interrupted by user; " -msgstr "已被使用者中斷；" +msgstr "被使用者中斷；" #: dlls/comdlg32/comdlg32.rc:106 msgid "Out of memory; " @@ -1296,7 +1280,7 @@ msgstr "記憶體不足；" #: dlls/comdlg32/comdlg32.rc:107 msgid "The printer door is open; " -msgstr "印表機蓋是打開的；" +msgstr "印表機蓋已打開；" #: dlls/comdlg32/comdlg32.rc:108 msgid "Print server unknown; " @@ -1316,11 +1300,11 @@ msgstr "有 %d 個文件正在等待列印" #: dlls/comdlg32/comdlg32.rc:80 msgid "Margins [inches]" -msgstr "邊緣空白 [英寸]" +msgstr "頁面邊距 [英寸]" #: dlls/comdlg32/comdlg32.rc:81 msgid "Margins [mm]" -msgstr "邊緣空白 [毫米]" +msgstr "頁面邊距 [毫米]" #: dlls/comdlg32/comdlg32.rc:82 dlls/sane.ds/sane.rc:33 msgctxt "unit: millimeters" @@ -1369,8 +1353,7 @@ msgid "" msgstr "" "開啟大寫鎖定可能導致您輸入錯誤的密碼。\n" "\n" -"請在輸入密碼前按下 Caps Lock 鍵，解除\n" -"大寫鎖定。" +"您可以按下 Caps Lock 鍵以解除大寫鎖定，然後再輸入密碼。" #: dlls/credui/credui.rc:34 msgid "Caps Lock is On" @@ -1378,7 +1361,7 @@ msgstr "大寫鎖定已開啟" #: dlls/crypt32/crypt32.rc:30 msgid "Authority Key Identifier" -msgstr "授權金鑰識別碼" +msgstr "授權金鑰識別號" #: dlls/crypt32/crypt32.rc:31 msgid "Key Attributes" @@ -1410,7 +1393,7 @@ msgstr "憑證策略" #: dlls/crypt32/crypt32.rc:38 msgid "Subject Key Identifier" -msgstr "主體金鑰識別碼" +msgstr "主體金鑰識別號" #: dlls/crypt32/crypt32.rc:39 msgid "CRL Reason Code" @@ -1446,7 +1429,7 @@ msgstr "電子郵件地址" #: dlls/crypt32/crypt32.rc:47 msgid "Unstructured Name" -msgstr "無結構的名稱" +msgstr "非結構化名稱" #: dlls/crypt32/crypt32.rc:48 msgid "Content Type" @@ -1462,15 +1445,15 @@ msgstr "簽署時間" #: dlls/crypt32/crypt32.rc:51 msgid "Counter Sign" -msgstr "計數器符號" +msgstr "副署" #: dlls/crypt32/crypt32.rc:52 msgid "Challenge Password" -msgstr "挑戰密碼" +msgstr "要求密碼" #: dlls/crypt32/crypt32.rc:53 msgid "Unstructured Address" -msgstr "無結構的位址" +msgstr "非結構化位址" #: dlls/crypt32/crypt32.rc:54 msgid "S/MIME Capabilities" @@ -1478,7 +1461,7 @@ msgstr "S/MIME 能力" #: dlls/crypt32/crypt32.rc:55 msgid "Prefer Signed Data" -msgstr "偏好已簽署資料" +msgstr "已簽署資料優先" #: dlls/crypt32/crypt32.rc:56 dlls/cryptdlg/cryptdlg.rc:34 msgctxt "Certification Practice Statement" @@ -1527,7 +1510,7 @@ msgstr "Netscape CA 廢止網址" #: dlls/crypt32/crypt32.rc:67 msgid "Netscape Cert Renewal URL" -msgstr "Netscape 憑證重申網址" +msgstr "Netscape 憑證續約網址" #: dlls/crypt32/crypt32.rc:68 msgid "Netscape CA Policy URL" @@ -1615,7 +1598,7 @@ msgstr "Windows 產品更新" #: dlls/crypt32/crypt32.rc:89 msgid "Enrollment Name Value Pair" -msgstr "註冊名稱值對" +msgstr "註冊名稱值配對" #: dlls/crypt32/crypt32.rc:90 msgid "OS Version" @@ -1627,7 +1610,7 @@ msgstr "註冊 CSP" #: dlls/crypt32/crypt32.rc:92 msgid "CRL Number" -msgstr "CRL 數字" +msgstr "CRL 號碼" #: dlls/crypt32/crypt32.rc:93 msgid "Delta CRL Indicator" @@ -1635,7 +1618,7 @@ msgstr "Delta CRL 指示器" #: dlls/crypt32/crypt32.rc:94 msgid "Issuing Distribution Point" -msgstr "議題發布點" +msgstr "發證發布點" #: dlls/crypt32/crypt32.rc:95 msgid "Freshest CRL" @@ -1751,7 +1734,7 @@ msgstr "虛設簽署人" #: dlls/crypt32/crypt32.rc:123 msgid "Encrypted Private Key" -msgstr "加密的私鑰" +msgstr "已加密的私鑰" #: dlls/crypt32/crypt32.rc:124 msgid "Published CRL Locations" @@ -1767,11 +1750,11 @@ msgstr "異動作業識別號" #: dlls/crypt32/crypt32.rc:127 msgid "Sender Nonce" -msgstr "當前傳送者" +msgstr "發送者的一次性隨機數" #: dlls/crypt32/crypt32.rc:128 msgid "Recipient Nonce" -msgstr "當前收件者" +msgstr "收件者的一次性隨機數" #: dlls/crypt32/crypt32.rc:129 msgid "Reg Info" @@ -1807,7 +1790,7 @@ msgstr "私鑰使用週期" #: dlls/crypt32/crypt32.rc:137 msgid "Client Information" -msgstr "客戶端資訊" +msgstr "用戶端資訊" #: dlls/crypt32/crypt32.rc:138 msgid "Server Authentication" @@ -1815,7 +1798,7 @@ msgstr "伺服器認證" #: dlls/crypt32/crypt32.rc:139 msgid "Client Authentication" -msgstr "客戶端認證" +msgstr "用戶端認證" #: dlls/crypt32/crypt32.rc:140 msgid "Code Signing" @@ -1843,7 +1826,7 @@ msgstr "IP 安全終端系統" #: dlls/crypt32/crypt32.rc:146 msgid "IP security tunnel termination" -msgstr "IP 安全遂道終端" +msgstr "IP 安全隧道終端" #: dlls/crypt32/crypt32.rc:147 msgid "IP security user" @@ -1923,7 +1906,7 @@ msgstr "憑證請求代理程式" #: dlls/crypt32/crypt32.rc:166 dlls/cryptui/cryptui.rc:141 msgid "Lifetime Signing" -msgstr "生命期簽署" +msgstr "永久簽署" #: dlls/crypt32/crypt32.rc:167 msgid "All issuance policies" @@ -2050,7 +2033,7 @@ msgstr "不明存取方法" #: dlls/crypt32/crypt32.rc:205 msgid "Alternative Name" -msgstr "另類名稱" +msgstr "其他名稱" #: dlls/crypt32/crypt32.rc:206 msgid "CRL Distribution Point" @@ -2094,11 +2077,11 @@ msgstr "已取代" #: dlls/crypt32/crypt32.rc:216 msgid "Operation Ceased" -msgstr "作業終了" +msgstr "作業已停止" #: dlls/crypt32/crypt32.rc:217 msgid "Certificate Hold" -msgstr "憑證暫停" +msgstr "持有的憑證" #: dlls/crypt32/crypt32.rc:218 msgid "Financial Information=" @@ -2110,11 +2093,11 @@ msgstr "可用" #: dlls/crypt32/crypt32.rc:220 msgid "Not Available" -msgstr "無法使用" +msgstr "不可用" #: dlls/crypt32/crypt32.rc:221 msgid "Meets Criteria=" -msgstr "會面準則=" +msgstr "符合準則=" #: dlls/crypt32/crypt32.rc:222 dlls/cryptui/cryptui.rc:166 #: dlls/oleaut32/oleaut32.rc:32 dlls/wininet/wininet.rc:94 @@ -2138,7 +2121,7 @@ msgstr "不可否認性" #: dlls/crypt32/crypt32.rc:226 msgid "Key Encipherment" -msgstr "金鑰編密" +msgstr "金鑰加密" #: dlls/crypt32/crypt32.rc:227 msgid "Data Encipherment" @@ -2162,15 +2145,15 @@ msgstr "CRL 簽署" #: dlls/crypt32/crypt32.rc:232 msgid "Encipher Only" -msgstr "只譯為密文" +msgstr "僅加密者" #: dlls/crypt32/crypt32.rc:233 msgid "Decipher Only" -msgstr "只解開密文" +msgstr "僅解密者" #: dlls/crypt32/crypt32.rc:234 msgid "SSL Client Authentication" -msgstr "SSL 客戶端認證" +msgstr "SSL 用戶端認證" #: dlls/crypt32/crypt32.rc:235 msgid "SSL Server Authentication" @@ -2202,7 +2185,7 @@ msgstr "憑證策略" #: dlls/cryptdlg/cryptdlg.rc:31 msgid "Policy Identifier: " -msgstr "策略識別碼：" +msgstr "策略識別號：" #: dlls/cryptdlg/cryptdlg.rc:32 msgid "Policy Qualifier Info" @@ -2252,7 +2235,7 @@ msgstr "顯示(&S)：" #: dlls/cryptui/cryptui.rc:210 msgid "&Edit Properties..." -msgstr "編輯屬性(&E)..." +msgstr "編輯內容(&E)..." #: dlls/cryptui/cryptui.rc:211 msgid "&Copy to File..." @@ -2305,20 +2288,20 @@ msgstr "停用這個憑證的全部目的(&I)" #: dlls/cryptui/cryptui.rc:253 msgid "Enable &only the following purposes for this certificate:" -msgstr "只有啟用這個憑證的下列目的(&O)：" +msgstr "只啟用這個憑證的下列目的(&O)：" #: dlls/cryptui/cryptui.rc:258 msgid "Add &Purpose..." -msgstr "加入目的(&P)..." +msgstr "新增目的(&P)..." #: dlls/cryptui/cryptui.rc:262 msgid "Add Purpose" -msgstr "加入目的" +msgstr "新增目的" #: dlls/cryptui/cryptui.rc:265 msgid "" "Add the object identifier (OID) for the certificate purpose you wish to add:" -msgstr "加入您所希望的憑證目的物件識別符號 (OID)：" +msgstr "新增您希望加入的憑證目的的物件識別號 (OID)：" #: dlls/cryptui/cryptui.rc:273 dlls/cryptui/cryptui.rc:69 msgid "Select Certificate Store" @@ -2330,7 +2313,7 @@ msgstr "選取您要使用的憑證儲存處：" #: dlls/cryptui/cryptui.rc:279 msgid "&Show physical stores" -msgstr "顯示實體儲存(&S)" +msgstr "顯示實體儲存裝置(&S)" #: dlls/cryptui/cryptui.rc:285 dlls/cryptui/cryptui.rc:296 #: dlls/cryptui/cryptui.rc:313 dlls/cryptui/cryptui.rc:327 @@ -2356,10 +2339,10 @@ msgid "" msgstr "" "這個精靈協助您從檔案匯入憑證、憑證撤銷清單以及憑證信賴清單到憑證儲存處。\n" "\n" -"憑證可用於識別您或您正在通訊的電腦。它也可以用於認證以及對訊息簽署。憑證儲" -"存處收藏了憑證、憑證撤銷清單以及憑證信賴清單。\n" +"憑證可用於識別您或您用以通訊的電腦。它也可以用於認證以及簽署訊息。" +"憑證儲存處收藏了憑證、憑證撤銷清單以及憑證信賴清單。\n" "\n" -"要繼續，請按下一步。" +"請按下一步繼續。" #: dlls/cryptui/cryptui.rc:299 dlls/cryptui/cryptui.rc:435 msgid "&File name:" @@ -2402,7 +2385,7 @@ msgstr "自動選取憑證儲存處(&A)" #: dlls/cryptui/cryptui.rc:320 msgid "&Place all certificates in the following store:" -msgstr "將所有憑證放置於下列儲存(&P)：" +msgstr "將所有憑證放置於下列儲存處(&P)：" #: dlls/cryptui/cryptui.rc:330 msgid "Completing the Certificate Import Wizard" @@ -2410,7 +2393,7 @@ msgstr "正在完成憑證匯入精靈" #: dlls/cryptui/cryptui.rc:332 msgid "You have successfully completed the Certificate Import Wizard." -msgstr "您已經成功地完成憑證匯入精靈。" +msgstr "您已經成功完成憑證匯入精靈。" #: dlls/cryptui/cryptui.rc:334 dlls/cryptui/cryptui.rc:448 msgid "You have specified the following settings:" @@ -2462,7 +2445,7 @@ msgstr "憑證目的" #: dlls/cryptui/cryptui.rc:364 msgid "" "Select one or more purposes to be listed when Advanced Purposes is selected." -msgstr "當進階目的已選時選取一或多個要列出的目的。" +msgstr "選取一個或多個在進階目的已選取時要列出的目的。" #: dlls/cryptui/cryptui.rc:366 msgid "&Certificate purposes:" @@ -2493,10 +2476,10 @@ msgid "" msgstr "" "這個精靈協助您從憑證儲存處匯出憑證、憑證撤銷清單以及憑證信賴清單到檔案。\n" "\n" -"憑證可用於識別您或您用以通訊的電腦。它也可以被用於認證以及簽署訊息。憑證儲存" -"處收藏了憑證、憑證撤銷清單以及憑證信賴清單。\n" +"憑證可用於識別您或您用以通訊的電腦。它也可以用於認證以及簽署訊息。" +"憑證儲存處收藏了憑證、憑證撤銷清單以及憑證信賴清單。\n" "\n" -"要繼續請按下一步。" +"請按下一步繼續。" #: dlls/cryptui/cryptui.rc:389 msgid "" @@ -2510,11 +2493,11 @@ msgstr "您要匯出私鑰嗎？" #: dlls/cryptui/cryptui.rc:391 msgid "&Yes, export the private key" -msgstr "是(&Y)，匯出私鑰。" +msgstr "是，匯出私鑰(&Y)" #: dlls/cryptui/cryptui.rc:393 msgid "N&o, do not export the private key" -msgstr "否(&N)，不要匯出私鑰。" +msgstr "否，不要匯出私鑰(&O)" #: dlls/cryptui/cryptui.rc:404 msgid "&Confirm password:" @@ -2562,19 +2545,15 @@ msgstr "正在完成憑證匯出精靈" #: dlls/cryptui/cryptui.rc:446 msgid "You have successfully completed the Certificate Export Wizard." -msgstr "您已經成功地完成憑證匯出精靈" +msgstr "您已經成功完成憑證匯出精靈。" #: dlls/cryptui/cryptui.rc:456 dlls/cryptui/cryptui.rc:179 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select Certificate" -msgstr "選取憑證儲存處" +msgstr "選取憑證" #: dlls/cryptui/cryptui.rc:459 -#, fuzzy -#| msgid "Select the certificate store you want to use:" msgid "Select a certificate you want to use" -msgstr "選取您要使用的憑證儲存處：" +msgstr "選取您要使用的憑證" #: dlls/cryptui/cryptui.rc:30 dlls/cryptui/cryptui.rc:93 msgid "Certificate" @@ -2594,7 +2573,7 @@ msgstr "這個憑證的簽名無效。憑證也許已被改變或已損壞。" msgid "" "This root certificate is not trusted. To trust it, add it to your system's " "trusted root certificate store." -msgstr "這個根憑證未被信賴。要信賴它，就將它加入您系統的信賴根憑證儲存處。" +msgstr "這個根憑證未被信賴。要信賴它，就要將它加入到系統的信賴根憑證儲存處。" #: dlls/cryptui/cryptui.rc:34 msgid "This certificate could not be validated to a trusted root certificate." @@ -2614,11 +2593,11 @@ msgstr "這個憑證是適用於下列目的：" #: dlls/cryptui/cryptui.rc:38 msgid "Issued to: " -msgstr "發證對象：" +msgstr "發證予：" #: dlls/cryptui/cryptui.rc:39 msgid "Issued by: " -msgstr "發證來源：" +msgstr "發證者：" #: dlls/cryptui/cryptui.rc:40 msgid "Valid from " @@ -2638,7 +2617,7 @@ msgstr "這個憑證已過期或尚未生效。" #: dlls/cryptui/cryptui.rc:44 msgid "This certificate's validity period exceeds that of its issuer." -msgstr "這個憑證的有效期限超過它的發證者。" +msgstr "這個憑證的有效期限超過發證者的有效期限。" #: dlls/cryptui/cryptui.rc:45 msgid "This certificate was revoked by its issuer." @@ -2663,19 +2642,19 @@ msgstr "<所有>" #: dlls/cryptui/cryptui.rc:50 msgid "Version 1 Fields Only" -msgstr "只有版本 1 欄位" +msgstr "僅版本 1 欄位" #: dlls/cryptui/cryptui.rc:51 msgid "Extensions Only" -msgstr "只有進階屬性" +msgstr "僅進階屬性" #: dlls/cryptui/cryptui.rc:52 msgid "Critical Extensions Only" -msgstr "只有關鍵進階屬性" +msgstr "僅重要進階屬性" #: dlls/cryptui/cryptui.rc:53 msgid "Properties Only" -msgstr "只有屬性" +msgstr "僅屬性" #: dlls/cryptui/cryptui.rc:55 msgid "Serial number" @@ -2703,7 +2682,7 @@ msgstr "公鑰" #: dlls/cryptui/cryptui.rc:61 msgid "%1 (%2!d! bits)" -msgstr "%1 (%2!d! 位元)" +msgstr "%1（%2!d! 位元）" #: dlls/cryptui/cryptui.rc:62 msgid "SHA1 hash" @@ -2711,7 +2690,7 @@ msgstr "SHA1 雜湊" #: dlls/cryptui/cryptui.rc:63 msgid "Enhanced key usage (property)" -msgstr "進階金鑰用法 (內容)" +msgstr "進階金鑰用法（內容）" #: dlls/cryptui/cryptui.rc:64 msgid "Friendly name" @@ -2724,11 +2703,11 @@ msgstr "描述" #: dlls/cryptui/cryptui.rc:66 msgid "Certificate Properties" -msgstr "憑證屬性" +msgstr "憑證內容" #: dlls/cryptui/cryptui.rc:67 msgid "Please enter an OID in the form 1.2.3.4" -msgstr "請以 1.2.3.4 的形式輸入 OID" +msgstr "請以 1.2.3.4 的格式輸入 OID" #: dlls/cryptui/cryptui.rc:68 msgid "The OID you entered already exists." @@ -2742,7 +2721,7 @@ msgstr "請選取憑證儲存處。" msgid "" "The file contains objects that do not match the given criteria. Please " "select another file." -msgstr "檔案含有不匹配給定準則的物件。請選取另一個檔案。" +msgstr "檔案含有不符合給定準則的物件。請選取另一個檔案。" #: dlls/cryptui/cryptui.rc:73 msgid "File to Import" @@ -2804,7 +2783,7 @@ msgstr "請選取儲存處" #: dlls/cryptui/cryptui.rc:89 msgid "Certificate Store Selected" -msgstr "憑證儲存處已選" +msgstr "已選取憑證儲存處" #: dlls/cryptui/cryptui.rc:90 msgid "Automatically determined by the program" @@ -2832,7 +2811,7 @@ msgstr "個人資訊交換" #: dlls/cryptui/cryptui.rc:99 msgid "The import was successful." -msgstr "已成功匯入。" +msgstr "匯入成功。" #: dlls/cryptui/cryptui.rc:100 msgid "The import failed." @@ -2848,11 +2827,11 @@ msgstr "<進階目的>" #: dlls/cryptui/cryptui.rc:104 msgid "Issued To" -msgstr "發證對象" +msgstr "發證予" #: dlls/cryptui/cryptui.rc:105 msgid "Issued By" -msgstr "發證來源" +msgstr "發證者" #: dlls/cryptui/cryptui.rc:106 dlls/wininet/wininet.rc:36 msgid "Expiration Date" @@ -2894,11 +2873,6 @@ msgstr "" "確定要移除這個憑證？" #: dlls/cryptui/cryptui.rc:113 -#, fuzzy -#| msgid "" -#| "You will no longer be able to encrypt messages with these certificates, " -#| "or verify messages signed with it.\n" -#| "Are you sure you want to remove these certificates?" msgid "" "You will no longer be able to encrypt messages with these certificates, or " "verify messages signed with them.\n" @@ -2913,7 +2887,7 @@ msgid "" "trusted.\n" "Are you sure you want to remove this certificate?" msgstr "" -"由這個憑證授權者所發的憑證將不再被信賴。\n" +"將不再信賴由這個憑證授權者所發的憑證。\n" "確定要移除這個憑證？" #: dlls/cryptui/cryptui.rc:115 @@ -2922,7 +2896,7 @@ msgid "" "trusted.\n" "Are you sure you want to remove these certificates?" msgstr "" -"由這些憑證授權者所發的憑證將不再被信賴。\n" +"將不再信賴由這些憑證授權者所發的憑證。\n" "確定要移除這些憑證？" #: dlls/cryptui/cryptui.rc:116 @@ -2931,7 +2905,7 @@ msgid "" "certification authorities it issued, will no longer be trusted.\n" "Are you sure you want to remove this trusted root certificate?" msgstr "" -"由這個憑證授權者所發的憑證，或是任何由它發證的憑證授權者，將不再被信賴。\n" +"將不再信賴由這個憑證授權者所發的憑證或憑證授權者。\n" "確定要移除這個信賴的根憑證？" #: dlls/cryptui/cryptui.rc:117 @@ -2940,7 +2914,7 @@ msgid "" "certification authorities they issued, will no longer be trusted.\n" "Are you sure you want to remove these trusted root certificates?" msgstr "" -"由這些憑證授權者所發的憑證，或是任何由它們發證的憑證授權者，將不再被信賴。\n" +"將不再信賴由這些憑證授權者所發的憑證或憑證授權者。\n" "確定要移除這些信賴的根憑證？" #: dlls/cryptui/cryptui.rc:118 @@ -2948,7 +2922,7 @@ msgid "" "Software signed by this publisher will no longer be trusted.\n" "Are you sure you want to remove this certificate?" msgstr "" -"由這個發行者簽署的軟體將不再被信賴。\n" +"將不再信賴由這個發行者簽署的軟體。\n" "確定要移除這個憑證？" #: dlls/cryptui/cryptui.rc:119 @@ -2956,7 +2930,7 @@ msgid "" "Software signed by these publishers will no longer be trusted.\n" "Are you sure you want to remove these certificates?" msgstr "" -"由這些發行者簽署的軟體將不再被信賴。\n" +"將不再信賴由這些發行者簽署的軟體。\n" "確定要移除這些憑證？" #: dlls/cryptui/cryptui.rc:120 @@ -2969,7 +2943,7 @@ msgstr "確定要移除這些憑證？" #: dlls/cryptui/cryptui.rc:124 msgid "Ensures the identity of a remote computer" -msgstr "確保遠端電腦的身分" +msgstr "確認遠端電腦的身分" #: dlls/cryptui/cryptui.rc:125 msgid "Proves your identity to a remote computer" @@ -2980,8 +2954,8 @@ msgid "" "Ensures software came from software publisher\n" "Protects software from alteration after publication" msgstr "" -"請確認軟體是來自軟體發行者\n" -"保護軟體以避免發行之後的變更" +"確認軟體是來自軟體發行者\n" +"確保軟體在發行之後未被修改" #: dlls/cryptui/cryptui.rc:127 msgid "Protects e-mail messages" @@ -3001,11 +2975,11 @@ msgstr "允許您數位簽署憑證信賴清單" #: dlls/cryptui/cryptui.rc:131 msgid "Allows data on disk to be encrypted" -msgstr "允許磁碟上的資料被加密" +msgstr "允許加密磁碟上的資料" #: dlls/cryptui/cryptui.rc:147 msgid "Private Key Archival" -msgstr "私鑰檔案的" +msgstr "私鑰檔案封存" #: dlls/cryptui/cryptui.rc:151 msgid "Export Format" @@ -3017,7 +2991,7 @@ msgstr "選擇將用來儲存內容的格式。" #: dlls/cryptui/cryptui.rc:153 msgid "Export Filename" -msgstr "匯出檔名" +msgstr "匯出檔案名稱" #: dlls/cryptui/cryptui.rc:154 msgid "Specify the name of the file in which the content will be saved." @@ -3025,7 +2999,7 @@ msgstr "指定將會儲存內容的檔案名稱。" #: dlls/cryptui/cryptui.rc:155 msgid "The specified file already exists. Do you want to replace it?" -msgstr "檔案已經存在。您要取代嗎？" +msgstr "檔案已經存在。您要取代它嗎？" #: dlls/cryptui/cryptui.rc:156 msgid "DER-Encoded Binary X.509 (*.cer)" @@ -3057,7 +3031,7 @@ msgstr "匯出密鑰" #: dlls/cryptui/cryptui.rc:168 msgid "The export was successful." -msgstr "已成功匯出。" +msgstr "匯出成功。" #: dlls/cryptui/cryptui.rc:169 msgid "The export failed." @@ -3079,11 +3053,11 @@ msgstr "輸入密碼" #: dlls/cryptui/cryptui.rc:173 msgid "You may password-protect a private key." -msgstr "您可以以密碼保護私鑰。" +msgstr "您可以使用密碼來保護私鑰。" #: dlls/cryptui/cryptui.rc:174 msgid "The passwords do not match." -msgstr "密碼不匹配。" +msgstr "密碼不相符。" #: dlls/cryptui/cryptui.rc:175 msgid "Note: The private key for this certificate could not be opened." @@ -3094,20 +3068,16 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "註記：用於這個憑證的私鑰不可匯出。" #: dlls/cryptui/cryptui.rc:177 -#, fuzzy -#| msgid "I&ntended purpose:" msgid "Intended Use" -msgstr "預定目的(&N)：" +msgstr "預定目的" #: dlls/cryptui/cryptui.rc:178 dlls/shell32/shell32.rc:150 msgid "Location" msgstr "位置" #: dlls/cryptui/cryptui.rc:180 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select a certificate" -msgstr "選取憑證儲存處" +msgstr "選取憑證" #: dlls/cryptui/cryptui.rc:181 programs/winefile/winefile.rc:101 #: programs/winhlp32/winhlp32.rc:110 programs/winhlp32/winhlp32.rc:85 @@ -3120,11 +3090,11 @@ msgstr "裝置設定" #: dlls/dinput/dinput.rc:39 msgid "Reset" -msgstr "重置" +msgstr "重設" #: dlls/dinput/dinput.rc:42 msgid "Player" -msgstr "玩家" +msgstr "播放器" #: dlls/dinput/dinput.rc:43 programs/winecfg/winecfg.rc:88 msgid "Device" @@ -3168,55 +3138,55 @@ msgstr "中歐語言" #: dlls/gdi32/gdi32.rc:30 msgid "Cyrillic" -msgstr "斯拉夫語" +msgstr "斯拉夫文" #: dlls/gdi32/gdi32.rc:31 msgid "Greek" -msgstr "希臘語" +msgstr "希臘文" #: dlls/gdi32/gdi32.rc:32 msgid "Turkish" -msgstr "土耳其語" +msgstr "土耳其文" #: dlls/gdi32/gdi32.rc:33 msgid "Hebrew" -msgstr "希伯來語" +msgstr "希伯來文" #: dlls/gdi32/gdi32.rc:34 msgid "Arabic" -msgstr "阿拉伯語" +msgstr "阿拉伯文" #: dlls/gdi32/gdi32.rc:35 msgid "Baltic" -msgstr "波羅的海語" +msgstr "波羅的海語言" #: dlls/gdi32/gdi32.rc:36 msgid "Vietnamese" -msgstr "越南語" +msgstr "越南文" #: dlls/gdi32/gdi32.rc:37 msgid "Thai" -msgstr "泰語" +msgstr "泰文" #: dlls/gdi32/gdi32.rc:38 msgid "Japanese" -msgstr "日語" +msgstr "日文" #: dlls/gdi32/gdi32.rc:39 msgid "CHINESE_GB2312" -msgstr "簡化字漢語" +msgstr "中文（GB2312）" #: dlls/gdi32/gdi32.rc:40 msgid "Hangul" -msgstr "韓語諺文" +msgstr "韓文" #: dlls/gdi32/gdi32.rc:41 msgid "CHINESE_BIG5" -msgstr "傳統字漢語" +msgstr "中文（BIG5）" #: dlls/gdi32/gdi32.rc:42 msgid "Hangul(Johab)" -msgstr "韓語諺文(組合型)" +msgstr "韓文（Johab）" #: dlls/gdi32/gdi32.rc:43 msgid "Symbol" @@ -3237,7 +3207,7 @@ msgstr "照相機中的檔案" #: dlls/gphoto2.ds/gphoto2.rc:34 msgid "Import Selected" -msgstr "匯入選擇的檔案" +msgstr "匯入已選取檔案" #: dlls/gphoto2.ds/gphoto2.rc:35 msgid "Preview" @@ -3265,7 +3235,7 @@ msgstr "正在傳輸... 請稍候" #: dlls/gphoto2.ds/gphoto2.rc:51 msgid "Connecting to camera" -msgstr "連接照相機" +msgstr "正在連接照相機" #: dlls/gphoto2.ds/gphoto2.rc:55 msgid "Connecting to camera... Please Wait" @@ -3278,11 +3248,11 @@ msgstr "同步(&Y)" #: dlls/hhctrl.ocx/hhctrl.rc:60 dlls/hhctrl.ocx/hhctrl.rc:73 #: dlls/shdoclc/shdoclc.rc:41 programs/winhlp32/winhlp32.rc:89 msgid "&Back" -msgstr "返回(&B)" +msgstr "上一頁(&B)" #: dlls/hhctrl.ocx/hhctrl.rc:61 dlls/hhctrl.ocx/hhctrl.rc:74 msgid "&Forward" -msgstr "向前" +msgstr "下一頁(&F)" #: dlls/hhctrl.ocx/hhctrl.rc:62 msgctxt "table of contents" @@ -3314,10 +3284,8 @@ msgid "&View Source" msgstr "檢視原始碼(&V)" #: dlls/hhctrl.ocx/hhctrl.rc:83 -#, fuzzy -#| msgid "Properties" msgid "Proper&ties" -msgstr "屬性" +msgstr "內容(&T)" #: dlls/hhctrl.ocx/hhctrl.rc:87 dlls/shdoclc/shdoclc.rc:79 #: dlls/shdoclc/shdoclc.rc:93 dlls/shdoclc/shdoclc.rc:117 @@ -3388,7 +3356,7 @@ msgstr "重新整理" #: dlls/hhctrl.ocx/hhctrl.rc:46 dlls/ieframe/ieframe.rc:66 msgid "Back" -msgstr "返回" +msgstr "上一頁" #: dlls/hhctrl.ocx/hhctrl.rc:47 msgctxt "table of contents" @@ -3406,7 +3374,7 @@ msgstr "選項" #: dlls/hhctrl.ocx/hhctrl.rc:51 dlls/ieframe/ieframe.rc:67 msgid "Forward" -msgstr "向前" +msgstr "下一頁" #: dlls/iccvid/iccvid.rc:28 dlls/iccvid/iccvid.rc:29 msgid "Cinepak Video codec" @@ -3438,7 +3406,7 @@ msgstr "開啟(&O)..." #: dlls/ieframe/ieframe.rc:36 programs/notepad/notepad.rc:33 #: programs/wordpad/wordpad.rc:34 msgid "Save &as..." -msgstr "另存為(&A)..." +msgstr "另存新檔(&A)..." #: dlls/ieframe/ieframe.rc:38 msgid "Print &format..." @@ -3478,7 +3446,7 @@ msgstr "關於 Internet Explorer(&A)" #: dlls/ieframe/ieframe.rc:90 msgid "Open URL" -msgstr "開啟連結(&O)" +msgstr "開啟連結" #: dlls/ieframe/ieframe.rc:93 msgid "Specify the URL you wish to open in Internet Explorer" @@ -3539,11 +3507,11 @@ msgstr "空白頁面(&B)" #: dlls/inetcpl.cpl/inetcpl.rc:56 msgid "Browsing history" -msgstr "瀏覽歷程" +msgstr "瀏覽歷史" #: dlls/inetcpl.cpl/inetcpl.rc:57 msgid "You can delete cached pages, cookies and other data." -msgstr "您可以刪除網頁快取、訊餅和其他資料。" +msgstr "您可以刪除網頁快取、Cookie 和其他資料。" #: dlls/inetcpl.cpl/inetcpl.rc:59 msgid "Delete &files..." @@ -3555,7 +3523,7 @@ msgstr "設定(&S)..." #: dlls/inetcpl.cpl/inetcpl.rc:68 msgid "Delete browsing history" -msgstr "刪除瀏覽歷程" +msgstr "刪除瀏覽歷史" #: dlls/inetcpl.cpl/inetcpl.rc:71 msgid "" @@ -3571,7 +3539,7 @@ msgid "" "Files saved on your computer by websites, which store things like user " "preferences and login information." msgstr "" -"訊餅\n" +"Cookies\n" "由網站儲存於您電腦的檔案，其存有諸如使用者偏好設定和登入資訊。" #: dlls/inetcpl.cpl/inetcpl.rc:75 @@ -3579,7 +3547,7 @@ msgid "" "History\n" "List of websites you have accessed." msgstr "" -"歷程\n" +"歷史\n" "您曾存取過的網站清單。" #: dlls/inetcpl.cpl/inetcpl.rc:77 @@ -3617,16 +3585,12 @@ msgid "Publishers..." msgstr "發行者..." #: dlls/inetcpl.cpl/inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "區域網路連線" +msgstr "連線" #: dlls/inetcpl.cpl/inetcpl.rc:125 -#, fuzzy -#| msgid "Wine configuration" msgid "Automatic configuration" -msgstr "Wine 設定" +msgstr "自動設定" #: dlls/inetcpl.cpl/inetcpl.rc:126 msgid "Use Web Proxy Auto-Discovery (WPAD)" @@ -3637,26 +3601,20 @@ msgid "Use Proxy Auto-Config (PAC) script" msgstr "" #: dlls/inetcpl.cpl/inetcpl.rc:128 dlls/inetcpl.cpl/inetcpl.rc:132 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "位址" +msgstr "位址：" #: dlls/inetcpl.cpl/inetcpl.rc:130 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "本機伺服器(&L)" +msgstr "代理伺服器" #: dlls/inetcpl.cpl/inetcpl.rc:131 msgid "Use a proxy server" -msgstr "" +msgstr "使用代理伺服器" #: dlls/inetcpl.cpl/inetcpl.rc:134 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "無連接埠" +msgstr "連接埠：" #: dlls/inetcpl.cpl/inetcpl.rc:31 msgid "Internet Settings" @@ -3668,7 +3626,7 @@ msgstr "設定 Wine 網際網路瀏覽器和相關的設定。" #: dlls/inetcpl.cpl/inetcpl.rc:33 msgid "Security settings for zone: " -msgstr "區域的安全設定：" +msgstr "此區域的安全設定：" #: dlls/inetcpl.cpl/inetcpl.rc:34 msgid "Custom" @@ -3680,7 +3638,7 @@ msgstr "非常低" #: dlls/inetcpl.cpl/inetcpl.rc:36 dlls/wininet/wininet.rc:42 msgid "Low" -msgstr "慢" +msgstr "低" #: dlls/inetcpl.cpl/inetcpl.rc:37 msgid "Medium" @@ -3688,7 +3646,7 @@ msgstr "中" #: dlls/inetcpl.cpl/inetcpl.rc:38 msgid "Increased" -msgstr "已增加" +msgstr "稍高" #: dlls/inetcpl.cpl/inetcpl.rc:39 dlls/wininet/wininet.rc:41 msgid "High" @@ -3703,30 +3661,24 @@ msgid "&Disable" msgstr "停用(&D)" #: dlls/joy.cpl/joy.rc:41 -#, fuzzy -#| msgid "Reset" msgid "&Reset" -msgstr "重置" +msgstr "重設(&R)" #: dlls/joy.cpl/joy.rc:42 msgid "&Enable" msgstr "啟用(&E)" #: dlls/joy.cpl/joy.rc:43 -#, fuzzy -#| msgid "Edit Override" msgid "&Override" -msgstr "編輯覆載設定" +msgstr "覆寫(&O)" #: dlls/joy.cpl/joy.rc:44 msgid "Connected" -msgstr "已連線" +msgstr "已連接" #: dlls/joy.cpl/joy.rc:46 -#, fuzzy -#| msgid "Voice input device:" msgid "Connected (xinput device)" -msgstr "語音輸入裝置：" +msgstr "已連接（Xinput 裝置）" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled" @@ -3736,7 +3688,7 @@ msgstr "已停用" msgid "" "After disabling or enabling a device, the connected joysticks won't be " "updated here until you restart this applet." -msgstr "停用或啟用裝置之後，已連線的搖桿將無法更新，直到您重新啟動這個小程式。" +msgstr "停用或啟用裝置之後，已連接的搖桿將無法更新，直到您重新啟動這個程式。" #: dlls/joy.cpl/joy.rc:55 msgid "Test Joystick" @@ -3759,8 +3711,8 @@ msgid "" "Press any button in the controller to activate the chosen effect. The effect " "direction can be changed with the controller axis." msgstr "" -"請按下控制器中的任何按鈕以啟用所選的效果。效果的方向可以利用控制器的軸向來變" -"更。" +"請按下控制器中的任何按鈕以啟用所選的效果。" +"效果的方向可以利用控制器的軸向來變更。" #: dlls/joy.cpl/joy.rc:31 msgid "Game Controllers" @@ -3768,7 +3720,7 @@ msgstr "遊戲控制器" #: dlls/joy.cpl/joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "測試和設定遊戲控制器。" #: dlls/jscript/jscript.rc:28 msgid "Error converting object to primitive type" @@ -3783,10 +3735,8 @@ msgid "Subscript out of range" msgstr "註標超出範圍" #: dlls/jscript/jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "無紙；" +msgstr "堆疊空間不足" #: dlls/jscript/jscript.rc:32 msgid "Object required" @@ -3802,7 +3752,7 @@ msgstr "物件不支援這個屬性或方法" #: dlls/jscript/jscript.rc:35 dlls/vbscript/vbscript.rc:50 msgid "Object doesn't support this action" -msgstr "物件不支援此動作" +msgstr "物件不支援這個動作" #: dlls/jscript/jscript.rc:36 msgid "Argument not optional" @@ -3814,27 +3764,23 @@ msgstr "語法錯誤" #: dlls/jscript/jscript.rc:38 msgid "Expected ';'" -msgstr "預期為 ;" +msgstr "預期為 ';'" #: dlls/jscript/jscript.rc:39 msgid "Expected '('" -msgstr "預期為 (" +msgstr "預期為 '('" #: dlls/jscript/jscript.rc:40 msgid "Expected ')'" -msgstr "預期為 )" +msgstr "預期為 ')'" #: dlls/jscript/jscript.rc:41 -#, fuzzy -#| msgid "Subject Key Identifier" msgid "Expected identifier" -msgstr "主體金鑰識別碼" +msgstr "預期為識別號" #: dlls/jscript/jscript.rc:42 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '='" -msgstr "預期為 ;" +msgstr "預期為 '='" #: dlls/jscript/jscript.rc:43 msgid "Invalid character" @@ -3846,15 +3792,15 @@ msgstr "未終結的字串常數" #: dlls/jscript/jscript.rc:45 msgid "'return' statement outside of function" -msgstr "return 敘述位於函式之外" +msgstr "'return' 敘述位於函式之外" #: dlls/jscript/jscript.rc:46 msgid "Can't have 'break' outside of loop" -msgstr "在迴圈之外不可有 break" +msgstr "在迴圈之外不可有 'break'" #: dlls/jscript/jscript.rc:47 msgid "Can't have 'continue' outside of loop" -msgstr "在迴圈之外不可有 continue" +msgstr "在迴圈之外不可有 'continue'" #: dlls/jscript/jscript.rc:48 msgid "Label redefined" @@ -3865,38 +3811,32 @@ msgid "Label not found" msgstr "找不到標貼" #: dlls/jscript/jscript.rc:50 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@end'" -msgstr "預期為 ;" +msgstr "預期為 '@end'" #: dlls/jscript/jscript.rc:51 msgid "Conditional compilation is turned off" -msgstr "條件編譯已被關閉" +msgstr "條件編譯已關閉" #: dlls/jscript/jscript.rc:52 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@'" -msgstr "預期為 ;" +msgstr "預期為 '@'" #: dlls/jscript/jscript.rc:80 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Microsoft JScript 編譯錯誤" #: dlls/jscript/jscript.rc:81 msgid "Microsoft JScript runtime error" -msgstr "" +msgstr "Microsoft JScript 執行期錯誤" #: dlls/jscript/jscript.rc:82 dlls/vbscript/vbscript.rc:64 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown runtime error" -msgstr "未知錯誤" +msgstr "不明執行期錯誤" #: dlls/jscript/jscript.rc:55 msgid "Number expected" -msgstr "預期為編號" +msgstr "預期為數字" #: dlls/jscript/jscript.rc:53 msgid "Function expected" @@ -3904,7 +3844,7 @@ msgstr "預期為函式" #: dlls/jscript/jscript.rc:54 msgid "'[object]' is not a date object" -msgstr "[object] 並非日期物件" +msgstr "'[object]' 並非日期物件" #: dlls/jscript/jscript.rc:56 msgid "Object expected" @@ -3916,11 +3856,11 @@ msgstr "不合法的指派" #: dlls/jscript/jscript.rc:58 msgid "'|' is undefined" -msgstr "| 未定義" +msgstr "'|' 未定義" #: dlls/jscript/jscript.rc:59 msgid "Boolean object expected" -msgstr "預期為布林物件" +msgstr "預期為布林值物件" #: dlls/jscript/jscript.rc:60 msgid "Cannot delete '|'" @@ -3935,16 +3875,12 @@ msgid "JScript object expected" msgstr "預期為 JScript 物件" #: dlls/jscript/jscript.rc:63 -#, fuzzy -#| msgid "Array object expected" msgid "Enumerator object expected" -msgstr "預期為陣列物件" +msgstr "預期為列舉器物件" #: dlls/jscript/jscript.rc:64 -#, fuzzy -#| msgid "Boolean object expected" msgid "Regular Expression object expected" -msgstr "預期為布林物件" +msgstr "預期為正規表示式" #: dlls/jscript/jscript.rc:65 msgid "Syntax error in regular expression" @@ -3952,7 +3888,7 @@ msgstr "正規表示式語法發生錯誤" #: dlls/jscript/jscript.rc:66 msgid "Exception thrown and not caught" -msgstr "" +msgstr "發生異常且未被捕捉" #: dlls/jscript/jscript.rc:68 msgid "URI to be encoded contains invalid characters" @@ -3982,25 +3918,23 @@ msgstr "預期為陣列物件" msgid "" "'writable' attribute on the property descriptor cannot be set to 'true' on " "this object" -msgstr "" +msgstr "無法在這個物件更改屬性描述符中的 'writable' 屬性為 'true'" #: dlls/jscript/jscript.rc:74 msgid "Cannot define property '|': object is not extensible" -msgstr "" +msgstr "無法定義屬性 '|'：物件不能擴展" #: dlls/jscript/jscript.rc:75 msgid "Cannot redefine non-configurable property '|'" -msgstr "" +msgstr "無法重新定義不可設定的屬性 '|'" #: dlls/jscript/jscript.rc:76 msgid "Cannot modify non-writable property '|'" -msgstr "" +msgstr "無法修改不可寫入的屬性 '|'" #: dlls/jscript/jscript.rc:77 -#, fuzzy -#| msgid "'[object]' is not a date object" msgid "'this' is not a Map object" -msgstr "[object] 並非日期物件" +msgstr "'this' 不是 Map 物件" #: dlls/jscript/jscript.rc:78 msgid "Property cannot have both accessors and a value" @@ -4008,7 +3942,7 @@ msgstr "" #: include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" -msgstr "" +msgstr "Wine 核心 DLL" #: include/wine/wine_common_ver.rc:134 dlls/winemac.drv/winemac.rc:32 #: programs/wineboot/wineboot.rc:42 programs/winecfg/winecfg.rc:137 @@ -4081,7 +4015,7 @@ msgstr "無效的儲存裝置。\n" #: dlls/kernel32/winerror.mc:108 msgid "Can't delete current directory.\n" -msgstr "無法刪除現行目錄。\n" +msgstr "無法刪除目前的目錄。\n" #: dlls/kernel32/winerror.mc:113 msgid "Not same device.\n" @@ -4093,7 +4027,7 @@ msgstr "沒有檔案了。\n" #: dlls/kernel32/winerror.mc:123 msgid "Write protected.\n" -msgstr "防止寫入的。\n" +msgstr "已設定寫入保護。\n" #: dlls/kernel32/winerror.mc:128 msgid "Bad unit.\n" @@ -4245,7 +4179,7 @@ msgstr "太多網路名稱。\n" #: dlls/kernel32/winerror.mc:313 msgid "Too many network sessions.\n" -msgstr "太多網路執行期間。\n" +msgstr "太多網路工作階段。\n" #: dlls/kernel32/winerror.mc:318 msgid "Sharing paused.\n" @@ -4293,7 +4227,7 @@ msgstr "網路寫入錯誤。\n" #: dlls/kernel32/winerror.mc:373 msgid "No process slots.\n" -msgstr "沒有行程插槽。\n" +msgstr "沒有線程插槽。\n" #: dlls/kernel32/winerror.mc:378 msgid "Too many semaphores.\n" @@ -4301,7 +4235,7 @@ msgstr "太多號誌。\n" #: dlls/kernel32/winerror.mc:383 msgid "Exclusive semaphore already owned.\n" -msgstr "已擁有互斥號誌。\n" +msgstr "已擁有專屬號誌。\n" #: dlls/kernel32/winerror.mc:388 msgid "Semaphore is set.\n" @@ -4317,7 +4251,7 @@ msgstr "於插斷時間無效。\n" #: dlls/kernel32/winerror.mc:403 msgid "Semaphore owner died.\n" -msgstr "號誌擁有者已死。\n" +msgstr "號誌擁有者已終止。\n" #: dlls/kernel32/winerror.mc:408 msgid "Semaphore user limit.\n" @@ -4329,7 +4263,7 @@ msgstr "插入磁碟於儲存裝置 %1。\n" #: dlls/kernel32/winerror.mc:418 msgid "Drive locked.\n" -msgstr "已鎖定儲存裝置。\n" +msgstr "儲存裝置已鎖定。\n" #: dlls/kernel32/winerror.mc:423 msgid "Broken pipe.\n" @@ -4385,7 +4319,7 @@ msgstr "無效的層級。\n" #: dlls/kernel32/winerror.mc:493 msgid "No volume label.\n" -msgstr "沒有卷冊標貼。\n" +msgstr "沒有磁碟區代號。\n" #: dlls/kernel32/winerror.mc:498 msgid "Module not found.\n" @@ -4433,19 +4367,19 @@ msgstr "儲存裝置未被 SUBST。\n" #: dlls/kernel32/winerror.mc:558 msgid "Attempt to JOIN onto a JOINed drive.\n" -msgstr "試圖 JOIN 到已被 JOIN 的儲存裝置。\n" +msgstr "嘗試 JOIN 到已被 JOIN 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:563 msgid "Attempt to SUBST onto a SUBSTed drive.\n" -msgstr "試圖 SUBST 到已被 SUBST 的儲存裝置。\n" +msgstr "嘗試 SUBST 到已被 SUBST 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:568 msgid "Attempt to JOIN to a SUBSTed drive.\n" -msgstr "試圖 JOIN 到已被 SUBST 的儲存裝置。\n" +msgstr "嘗試 JOIN 到已被 SUBST 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:573 msgid "Attempt to SUBST to a JOINed drive.\n" -msgstr "試圖 SUBST 到已被 JOIN 的儲存裝置。\n" +msgstr "嘗試 SUBST 到已被 JOIN 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:578 msgid "Drive is busy.\n" @@ -4489,7 +4423,7 @@ msgstr "用於 DosMuxSemWait 的事件計數不正確。\n" #: dlls/kernel32/winerror.mc:628 msgid "Too many waiters for DosMuxSemWait.\n" -msgstr "太多 DosMuxSemWait 的等待者。\n" +msgstr "太多 DosMuxSemWait 的等待項。\n" #: dlls/kernel32/winerror.mc:633 msgid "DosSemMuxWait list invalid.\n" @@ -4497,7 +4431,7 @@ msgstr "DosSemMuxWait 清單無效。\n" #: dlls/kernel32/winerror.mc:638 msgid "Volume label too long.\n" -msgstr "卷冊標貼太長。\n" +msgstr "磁碟區代號太長。\n" #: dlls/kernel32/winerror.mc:643 msgid "Too many TCBs.\n" @@ -4673,7 +4607,7 @@ msgstr "不允許巢狀 LoadModule 呼叫。\n" #: dlls/kernel32/winerror.mc:858 msgid "Machine type mismatch.\n" -msgstr "機器型態不匹配。\n" +msgstr "機器類型不相符。\n" #: dlls/kernel32/winerror.mc:863 msgid "Bad pipe.\n" @@ -4681,11 +4615,11 @@ msgstr "不當的管線。\n" #: dlls/kernel32/winerror.mc:868 msgid "Pipe busy.\n" -msgstr "管線忙碌。\n" +msgstr "管線忙碌中。\n" #: dlls/kernel32/winerror.mc:873 msgid "Pipe closed.\n" -msgstr "管線關閉。\n" +msgstr "管線已關閉。\n" #: dlls/kernel32/winerror.mc:878 msgid "Pipe not connected.\n" @@ -4693,11 +4627,11 @@ msgstr "管線未連接。\n" #: dlls/kernel32/winerror.mc:883 msgid "More data available.\n" -msgstr "更多資料可用。\n" +msgstr "有更多可用資料。\n" #: dlls/kernel32/winerror.mc:888 msgid "Session canceled.\n" -msgstr "已取消工作階段。\n" +msgstr "工作階段已取消。\n" #: dlls/kernel32/winerror.mc:893 msgid "Invalid extended attribute name.\n" @@ -4753,7 +4687,7 @@ msgstr "讀取/寫入行程記憶體已部分完成。\n" #: dlls/kernel32/winerror.mc:958 msgid "The oplock wasn't granted.\n" -msgstr "未被授與 oplock。\n" +msgstr "未授權 oplock。\n" #: dlls/kernel32/winerror.mc:963 msgid "Invalid oplock message received.\n" @@ -4821,7 +4755,7 @@ msgstr "無效的旗標。\n" #: dlls/kernel32/winerror.mc:1043 msgid "Unrecognized volume.\n" -msgstr "無法辨識的卷冊。\n" +msgstr "無法辨識的磁碟區。\n" #: dlls/kernel32/winerror.mc:1048 msgid "File invalid.\n" @@ -4833,7 +4767,7 @@ msgstr "無法全螢幕運行。\n" #: dlls/kernel32/winerror.mc:1058 msgid "Nonexistent token.\n" -msgstr "不存在的字組。\n" +msgstr "不存在的權杖。\n" #: dlls/kernel32/winerror.mc:1063 msgid "Registry corrupt.\n" @@ -4885,7 +4819,7 @@ msgstr "註冊表索引鍵有子項。\n" #: dlls/kernel32/winerror.mc:1123 msgid "Subkey must be volatile.\n" -msgstr "子項必須是易變的。\n" +msgstr "子項必須是可變的。\n" #: dlls/kernel32/winerror.mc:1128 msgid "Notify change request in progress.\n" @@ -4937,7 +4871,7 @@ msgstr "服務無法接受控制訊息。\n" #: dlls/kernel32/winerror.mc:1188 msgid "Service not active.\n" -msgstr "服務現未啟用。\n" +msgstr "服務尚未啟用。\n" #: dlls/kernel32/winerror.mc:1193 msgid "Service controller connect failed.\n" @@ -4985,7 +4919,7 @@ msgstr "服務已存在。\n" #: dlls/kernel32/winerror.mc:1248 msgid "System running last-known-good config.\n" -msgstr "系統執行最後已知正常的組配。\n" +msgstr "系統執行最近已知正常的組配。\n" #: dlls/kernel32/winerror.mc:1253 msgid "Service dependency deleted.\n" @@ -4993,7 +4927,7 @@ msgstr "服務相依性已刪除。\n" #: dlls/kernel32/winerror.mc:1258 msgid "Boot already accepted as last-good config.\n" -msgstr "開機已被接受為最後正常的組配。\n" +msgstr "開機已接受為最近正常的組配。\n" #: dlls/kernel32/winerror.mc:1263 msgid "Service not started since last boot.\n" @@ -5017,7 +4951,7 @@ msgstr "無法偵測到行程中止。\n" #: dlls/kernel32/winerror.mc:1288 msgid "No recovery program for service.\n" -msgstr "沒有復原程式用於服務。\n" +msgstr "服務沒有復原程式。\n" #: dlls/kernel32/winerror.mc:1293 msgid "Service not implemented by exe.\n" @@ -5080,8 +5014,6 @@ msgid "No Unicode translation.\n" msgstr "沒有萬國碼轉譯。\n" #: dlls/kernel32/winerror.mc:1368 -#, fuzzy -#| msgid "DLL init failed.\n" msgid "DLL initialization failed.\n" msgstr "動態連結函式庫初始失敗。\n" @@ -5123,7 +5055,7 @@ msgstr "軟碟回報錯誤的磁柱。\n" #: dlls/kernel32/winerror.mc:1418 msgid "Unknown floppy error.\n" -msgstr "未知的軟碟錯誤。\n" +msgstr "不明的軟碟錯誤。\n" #: dlls/kernel32/winerror.mc:1423 msgid "Floppy registers inconsistent.\n" @@ -5167,7 +5099,7 @@ msgstr "設定電源狀態失敗。\n" #: dlls/kernel32/winerror.mc:1473 msgid "Too many links.\n" -msgstr "太多鏈結。\n" +msgstr "太多連結。\n" #: dlls/kernel32/winerror.mc:1478 msgid "Newer Windows version needed.\n" @@ -5231,7 +5163,7 @@ msgstr "裝置需要重新初始化。\n" #: dlls/kernel32/winerror.mc:1553 msgid "The device requires cleaning.\n" -msgstr "裝置需要清潔。\n" +msgstr "裝置需要清理。\n" #: dlls/kernel32/winerror.mc:1558 msgid "The device door is open.\n" @@ -5259,11 +5191,11 @@ msgstr "找不到點。\n" #: dlls/kernel32/winerror.mc:1588 msgid "No running tracking service.\n" -msgstr "沒在執行追蹤服務。\n" +msgstr "沒有執行中的追蹤服務。\n" #: dlls/kernel32/winerror.mc:1593 msgid "No such volume ID.\n" -msgstr "沒有此類卷冊識別號。\n" +msgstr "沒有此類磁碟區識別號。\n" #: dlls/kernel32/winerror.mc:1598 msgid "Unable to remove the file to be replaced.\n" @@ -5283,11 +5215,11 @@ msgstr "正在刪除日誌。\n" #: dlls/kernel32/winerror.mc:1618 msgid "The journal is not active.\n" -msgstr "日誌現未啟用。\n" +msgstr "日誌尚未啟用。\n" #: dlls/kernel32/winerror.mc:1623 msgid "Potential matching file found.\n" -msgstr "找到可能的匹配檔案。\n" +msgstr "找到可能的相符檔案。\n" #: dlls/kernel32/winerror.mc:1628 msgid "The journal entry was deleted.\n" @@ -5299,7 +5231,7 @@ msgstr "無效的裝置名稱。\n" #: dlls/kernel32/winerror.mc:1638 msgid "Connection unavailable.\n" -msgstr "連接不得使用。\n" +msgstr "連接無法使用。\n" #: dlls/kernel32/winerror.mc:1643 msgid "Device already remembered.\n" @@ -5315,11 +5247,11 @@ msgstr "無效的網路提供者名稱。\n" #: dlls/kernel32/winerror.mc:1658 msgid "Cannot open network connection profile.\n" -msgstr "無法開啟網路連線側寫檔。\n" +msgstr "無法開啟網路連線配置檔案。\n" #: dlls/kernel32/winerror.mc:1663 msgid "Corrupt network connection profile.\n" -msgstr "損壞的網路連線側寫檔。\n" +msgstr "損壞的網路連線配置檔案。\n" #: dlls/kernel32/winerror.mc:1668 msgid "Not a container.\n" @@ -5327,7 +5259,7 @@ msgstr "不是一個容器。\n" #: dlls/kernel32/winerror.mc:1673 msgid "Extended error.\n" -msgstr "進階錯誤。\n" +msgstr "延伸錯誤。\n" #: dlls/kernel32/winerror.mc:1678 msgid "Invalid group name.\n" @@ -5367,11 +5299,11 @@ msgstr "無效的訊息目的地。\n" #: dlls/kernel32/winerror.mc:1728 msgid "Session credential conflict.\n" -msgstr "作業階段憑據發生衝突。\n" +msgstr "工作階段憑據發生衝突。\n" #: dlls/kernel32/winerror.mc:1733 msgid "Remote session limit exceeded.\n" -msgstr "已超出遠端作業階段限制。\n" +msgstr "已超出遠端工作階段限制。\n" #: dlls/kernel32/winerror.mc:1738 msgid "Duplicate domain or workgroup name.\n" @@ -5395,7 +5327,7 @@ msgstr "連線被拒。\n" #: dlls/kernel32/winerror.mc:1763 msgid "Connection gracefully closed.\n" -msgstr "已平順關閉連接。\n" +msgstr "已順利關閉連線。\n" #: dlls/kernel32/winerror.mc:1768 msgid "Address already associated with transport endpoint.\n" @@ -5411,23 +5343,23 @@ msgstr "連線無效。\n" #: dlls/kernel32/winerror.mc:1783 msgid "Connection is active.\n" -msgstr "連接現正使用。\n" +msgstr "連線現正使用。\n" #: dlls/kernel32/winerror.mc:1788 msgid "Network unreachable.\n" -msgstr "無法連線網路。\n" +msgstr "網路無法連線。\n" #: dlls/kernel32/winerror.mc:1793 msgid "Host unreachable.\n" -msgstr "無法連線主機。\n" +msgstr "主機無法連線。\n" #: dlls/kernel32/winerror.mc:1798 msgid "Protocol unreachable.\n" -msgstr "無法連線協定。\n" +msgstr "協定無法連線。\n" #: dlls/kernel32/winerror.mc:1803 msgid "Port unreachable.\n" -msgstr "無法連線通訊埠。\n" +msgstr "通訊埠無法連線。\n" #: dlls/kernel32/winerror.mc:1808 msgid "Request aborted.\n" @@ -5435,7 +5367,7 @@ msgstr "已放棄要求。\n" #: dlls/kernel32/winerror.mc:1813 msgid "Connection aborted.\n" -msgstr "已放棄連接。\n" +msgstr "已放棄連線。\n" #: dlls/kernel32/winerror.mc:1818 msgid "Please retry operation.\n" @@ -5471,7 +5403,7 @@ msgstr "使用者未被認證。\n" #: dlls/kernel32/winerror.mc:1858 msgid "User not logged on.\n" -msgstr "使用者未被記錄。\n" +msgstr "使用者未登入。\n" #: dlls/kernel32/winerror.mc:1863 msgid "Continue work in progress.\n" @@ -5503,7 +5435,7 @@ msgstr "即使沒有變更任何東西時也進行作業。\n" #: dlls/kernel32/winerror.mc:1898 msgid "The user profile is invalid.\n" -msgstr "使用者側寫檔無效。\n" +msgstr "使用者配置檔案無效。\n" #: dlls/kernel32/winerror.mc:1903 msgid "Not supported on Small Business Server.\n" @@ -5547,7 +5479,7 @@ msgstr "無效的主要群組。\n" #: dlls/kernel32/winerror.mc:1953 msgid "No impersonation token.\n" -msgstr "沒有假冒字組。\n" +msgstr "沒有模擬權杖。\n" #: dlls/kernel32/winerror.mc:1958 msgid "Can't disable mandatory group.\n" @@ -5555,11 +5487,11 @@ msgstr "無法停用必要群組。\n" #: dlls/kernel32/winerror.mc:1963 msgid "No logon servers available.\n" -msgstr "沒有可用的登錄伺服器。\n" +msgstr "沒有可用的登入伺服器。\n" #: dlls/kernel32/winerror.mc:1968 msgid "No such logon session.\n" -msgstr "沒有此類登錄作業階段。\n" +msgstr "沒有此類登入工作階段。\n" #: dlls/kernel32/winerror.mc:1973 msgid "No such privilege.\n" @@ -5623,7 +5555,7 @@ msgstr "帳號限制。\n" #: dlls/kernel32/winerror.mc:2048 msgid "Invalid logon hours.\n" -msgstr "無效的登錄時數。\n" +msgstr "無效的登入時數。\n" #: dlls/kernel32/winerror.mc:2053 msgid "Invalid workstation.\n" @@ -5691,11 +5623,11 @@ msgstr "無效的群組屬性。\n" #: dlls/kernel32/winerror.mc:2133 msgid "Bad impersonation level.\n" -msgstr "不當的假冒等級。\n" +msgstr "不當的模擬等級。\n" #: dlls/kernel32/winerror.mc:2138 msgid "Can't open anonymous security token.\n" -msgstr "無法開啟匿名安全性代表字組。\n" +msgstr "無法開啟匿名的安全權杖。\n" #: dlls/kernel32/winerror.mc:2143 msgid "Bad validation class.\n" @@ -5703,7 +5635,7 @@ msgstr "不當的驗證類別。\n" #: dlls/kernel32/winerror.mc:2148 msgid "Bad token type.\n" -msgstr "不當的字組型態。\n" +msgstr "不當的權杖類型。\n" #: dlls/kernel32/winerror.mc:2153 msgid "No security on object.\n" @@ -5755,11 +5687,11 @@ msgstr "不當的描述元格式。\n" #: dlls/kernel32/winerror.mc:2213 msgid "Not a logon process.\n" -msgstr "不是個登錄行程。\n" +msgstr "不是登入工作階段。\n" #: dlls/kernel32/winerror.mc:2218 msgid "Logon session ID exists.\n" -msgstr "登錄期間識別碼已存在。\n" +msgstr "登入工作階段識別號已存在。\n" #: dlls/kernel32/winerror.mc:2223 msgid "Unknown authentication package.\n" @@ -5767,19 +5699,19 @@ msgstr "不明認證套件。\n" #: dlls/kernel32/winerror.mc:2228 msgid "Bad logon session state.\n" -msgstr "不當的登錄作業階段狀態。\n" +msgstr "不當的登入工作階段狀態。\n" #: dlls/kernel32/winerror.mc:2233 msgid "Logon session ID collision.\n" -msgstr "登錄期間識別碼產生碰撞。\n" +msgstr "登入工作階段識別號發生衝突。\n" #: dlls/kernel32/winerror.mc:2238 msgid "Invalid logon type.\n" -msgstr "無效的登錄型態。\n" +msgstr "無效的登入類型。\n" #: dlls/kernel32/winerror.mc:2243 msgid "Cannot impersonate.\n" -msgstr "無法假冒。\n" +msgstr "無法模擬。\n" #: dlls/kernel32/winerror.mc:2248 msgid "Invalid transaction state.\n" @@ -5807,7 +5739,7 @@ msgstr "其為使用者的主要群組。\n" #: dlls/kernel32/winerror.mc:2278 msgid "Token already in use.\n" -msgstr "字組已使用中。\n" +msgstr "權杖已在使用中。\n" #: dlls/kernel32/winerror.mc:2283 msgid "No such local group.\n" @@ -5827,7 +5759,7 @@ msgstr "本地群組已存在。\n" #: dlls/kernel32/winerror.mc:2303 dlls/kernel32/winerror.mc:2328 msgid "Logon type not granted.\n" -msgstr "登錄型態未授與。\n" +msgstr "登錄類型未授與。\n" #: dlls/kernel32/winerror.mc:2308 msgid "Too many secrets.\n" @@ -5843,7 +5775,7 @@ msgstr "內部安全資料庫錯誤。\n" #: dlls/kernel32/winerror.mc:2323 msgid "Too many context IDs.\n" -msgstr "太多文脈識別號。\n" +msgstr "太多內容識別號。\n" #: dlls/kernel32/winerror.mc:2333 msgid "Cross-encrypted NT password required.\n" @@ -5879,7 +5811,7 @@ msgstr "磁碟已損壞。\n" #: dlls/kernel32/winerror.mc:2373 msgid "No user session key.\n" -msgstr "沒有使用者作業階段金鑰。\n" +msgstr "沒有使用者工作階段金鑰。\n" #: dlls/kernel32/winerror.mc:2378 msgid "License quota exceeded.\n" @@ -5895,7 +5827,7 @@ msgstr "相互認證失敗。\n" #: dlls/kernel32/winerror.mc:2393 msgid "Time skew between client and server.\n" -msgstr "客戶端與伺服端的時間偏斜。\n" +msgstr "用戶端與伺服器的時間存在偏移。\n" #: dlls/kernel32/winerror.mc:2398 msgid "Invalid window handle.\n" @@ -5935,7 +5867,7 @@ msgstr "視窗由另外的執行緒所擁有。\n" #: dlls/kernel32/winerror.mc:2443 msgid "Hotkey already registered.\n" -msgstr "熱鍵已被註冊。\n" +msgstr "快捷鍵已被註冊。\n" #: dlls/kernel32/winerror.mc:2448 msgid "Class already exists.\n" @@ -5967,7 +5899,7 @@ msgstr "找不到清單方塊識別號。\n" #: dlls/kernel32/winerror.mc:2483 msgid "No wildcard characters.\n" -msgstr "沒有萬用字元字元。\n" +msgstr "沒有萬用字元。\n" #: dlls/kernel32/winerror.mc:2488 msgid "Clipboard not open.\n" @@ -5975,7 +5907,7 @@ msgstr "未開啟剪貼簿。\n" #: dlls/kernel32/winerror.mc:2493 msgid "Hotkey not registered.\n" -msgstr "快速鍵未註冊。\n" +msgstr "快捷鍵未註冊。\n" #: dlls/kernel32/winerror.mc:2498 msgid "Not a dialog window.\n" @@ -6039,7 +5971,7 @@ msgstr "這個清單方塊沒有定位停駐點。\n" #: dlls/kernel32/winerror.mc:2573 msgid "Can't destroy object owned by another thread.\n" -msgstr "無法銷毀由另外執行緒所擁有的物件。\n" +msgstr "無法銷毀由其他執行緒所擁有的物件。\n" #: dlls/kernel32/winerror.mc:2578 msgid "Child window menus not allowed.\n" @@ -6107,7 +6039,7 @@ msgstr "沒有非置換頁的系統資源。\n" #: dlls/kernel32/winerror.mc:2658 msgid "No paged system resources.\n" -msgstr "非置換頁的系統資源。\n" +msgstr "沒有置換頁的系統資源。\n" #: dlls/kernel32/winerror.mc:2663 msgid "No working set quota.\n" @@ -6131,7 +6063,7 @@ msgstr "無效的鍵盤控柄。\n" #: dlls/kernel32/winerror.mc:2688 msgid "Hook type not allowed.\n" -msgstr "不允許攔截型態。\n" +msgstr "不允許的攔截類型。\n" #: dlls/kernel32/winerror.mc:2693 msgid "Interactive window station required.\n" @@ -6171,11 +6103,11 @@ msgstr "使用者已放棄安裝。\n" #: dlls/kernel32/winerror.mc:2738 msgid "Installation failure.\n" -msgstr "安裝已失敗。\n" +msgstr "安裝失敗。\n" #: dlls/kernel32/winerror.mc:2743 msgid "Installation suspended.\n" -msgstr "安裝已懸置。\n" +msgstr "安裝擱置。\n" #: dlls/kernel32/winerror.mc:2748 msgid "Unknown product.\n" @@ -6183,15 +6115,15 @@ msgstr "不明產品。\n" #: dlls/kernel32/winerror.mc:2753 msgid "Unknown feature.\n" -msgstr "不明特徵。\n" +msgstr "不明功能。\n" #: dlls/kernel32/winerror.mc:2758 msgid "Unknown component.\n" -msgstr "未知的元件。\n" +msgstr "不明元件。\n" #: dlls/kernel32/winerror.mc:2763 msgid "Unknown property.\n" -msgstr "未知的屬性。\n" +msgstr "不明屬性。\n" #: dlls/kernel32/winerror.mc:2768 msgid "Invalid handle state.\n" @@ -6251,7 +6183,7 @@ msgstr "開啟安裝記錄檔時失敗。\n" #: dlls/kernel32/winerror.mc:2838 msgid "Installation language not supported.\n" -msgstr "不受支援的安裝語言。\n" +msgstr "不支援的安裝語言。\n" #: dlls/kernel32/winerror.mc:2843 msgid "Installation transform failed to apply.\n" @@ -6275,11 +6207,11 @@ msgstr "無效的表格。\n" #: dlls/kernel32/winerror.mc:2868 msgid "Data type mismatch.\n" -msgstr "資料類型不匹配。\n" +msgstr "資料類型不相符。\n" #: dlls/kernel32/winerror.mc:2873 dlls/kernel32/winerror.mc:3083 msgid "Unsupported type.\n" -msgstr "不受支援的型態。\n" +msgstr "不支援的類型。\n" #: dlls/kernel32/winerror.mc:2878 msgid "Creation failed.\n" @@ -6291,7 +6223,7 @@ msgstr "無法寫入暫存資料夾。\n" #: dlls/kernel32/winerror.mc:2888 msgid "Installation platform not supported.\n" -msgstr "不受支援的安裝平臺。\n" +msgstr "不支援的安裝平臺。\n" #: dlls/kernel32/winerror.mc:2893 msgid "Installer not used.\n" @@ -6307,7 +6239,7 @@ msgstr "無效的更新套件。\n" #: dlls/kernel32/winerror.mc:2908 msgid "Unsupported patch package.\n" -msgstr "不受支援的修補程式套件。\n" +msgstr "不支援的修補程式套件。\n" #: dlls/kernel32/winerror.mc:2913 msgid "Another version is installed.\n" @@ -6391,7 +6323,7 @@ msgstr "RPC 伺服器未傾聽。\n" #: dlls/kernel32/winerror.mc:3013 msgid "Unknown manager type.\n" -msgstr "不明管理員型態。\n" +msgstr "不明管理員類型。\n" #: dlls/kernel32/winerror.mc:3018 msgid "Unknown interface.\n" @@ -6415,7 +6347,7 @@ msgstr "資源不足。\n" #: dlls/kernel32/winerror.mc:3043 msgid "RPC server unavailable.\n" -msgstr "RPC 伺服器不得使用。\n" +msgstr "RPC 伺服器不可用。\n" #: dlls/kernel32/winerror.mc:3048 msgid "RPC server too busy.\n" @@ -6427,7 +6359,7 @@ msgstr "無效的網路選項。\n" #: dlls/kernel32/winerror.mc:3058 msgid "No RPC call active.\n" -msgstr "沒有現用的 RPC 呼叫。\n" +msgstr "沒有可用的 RPC 呼叫。\n" #: dlls/kernel32/winerror.mc:3063 msgid "RPC call failed.\n" @@ -6443,7 +6375,7 @@ msgstr "RPC 協定發生錯誤。\n" #: dlls/kernel32/winerror.mc:3078 msgid "Unsupported transfer syntax.\n" -msgstr "不受支援的轉送語法。\n" +msgstr "不支援的轉送語法。\n" #: dlls/kernel32/winerror.mc:3088 msgid "Invalid tag.\n" @@ -6463,7 +6395,7 @@ msgstr "無效的名稱語法。\n" #: dlls/kernel32/winerror.mc:3108 msgid "Unsupported name syntax.\n" -msgstr "不受支援的名稱語法。\n" +msgstr "不支援的名稱語法。\n" #: dlls/kernel32/winerror.mc:3113 msgid "No network address.\n" @@ -6479,7 +6411,7 @@ msgstr "不明認證類型。\n" #: dlls/kernel32/winerror.mc:3128 msgid "Maximum calls too low.\n" -msgstr "太低的呼叫數最大值。\n" +msgstr "呼叫數的最大值太低。\n" #: dlls/kernel32/winerror.mc:3133 msgid "String too long.\n" @@ -6543,7 +6475,7 @@ msgstr "已無更多成員。\n" #: dlls/kernel32/winerror.mc:3208 msgid "Not all objects unexported.\n" -msgstr "並非所有物件被取消匯出。\n" +msgstr "並非所有物件未被匯出。\n" #: dlls/kernel32/winerror.mc:3213 msgid "Interface not found.\n" @@ -6559,7 +6491,7 @@ msgstr "找不到條目。\n" #: dlls/kernel32/winerror.mc:3228 msgid "Name service unavailable.\n" -msgstr "名稱服務不得使用。\n" +msgstr "名稱服務不可用。\n" #: dlls/kernel32/winerror.mc:3233 msgid "Invalid network address family.\n" @@ -6571,7 +6503,7 @@ msgstr "操作不受支援。\n" #: dlls/kernel32/winerror.mc:3243 msgid "No security context available.\n" -msgstr "沒有可用安全文脈。\n" +msgstr "沒有可用的安全內容。\n" #: dlls/kernel32/winerror.mc:3248 msgid "RPCInternal error.\n" @@ -6611,15 +6543,15 @@ msgstr "字元翻譯表格檔案太小。\n" #: dlls/kernel32/winerror.mc:3293 msgid "Null context handle.\n" -msgstr "空值文脈控柄。\n" +msgstr "內容控柄為空值。\n" #: dlls/kernel32/winerror.mc:3298 msgid "Context handle damaged.\n" -msgstr "文脈控柄受損害。\n" +msgstr "內容控柄已損壞。\n" #: dlls/kernel32/winerror.mc:3303 msgid "Binding handle mismatch.\n" -msgstr "繫結控柄不匹配。\n" +msgstr "繫結控柄不相符。\n" #: dlls/kernel32/winerror.mc:3308 msgid "Cannot get call handle.\n" @@ -6627,7 +6559,7 @@ msgstr "無法提取呼叫控柄。\n" #: dlls/kernel32/winerror.mc:3313 msgid "Null reference pointer.\n" -msgstr "空值參考指標。\n" +msgstr "參考指標為空值。\n" #: dlls/kernel32/winerror.mc:3318 msgid "Enumeration value out of range.\n" @@ -6667,15 +6599,15 @@ msgstr "信賴的關聯性失敗。\n" #: dlls/kernel32/winerror.mc:3363 msgid "Trust logon failure.\n" -msgstr "信賴登錄失敗。\n" +msgstr "信賴登入失敗。\n" #: dlls/kernel32/winerror.mc:3368 msgid "RPC call already in progress.\n" -msgstr "RPC 呼叫已正進行。\n" +msgstr "RPC 呼叫已在進行。\n" #: dlls/kernel32/winerror.mc:3373 msgid "NETLOGON is not started.\n" -msgstr "NETLOGON 未被啟始。\n" +msgstr "NETLOGON 未被啟動。\n" #: dlls/kernel32/winerror.mc:3378 msgid "Account expired.\n" @@ -6695,7 +6627,7 @@ msgstr "不明通訊埠。\n" #: dlls/kernel32/winerror.mc:3398 msgid "Unknown printer driver.\n" -msgstr "未知的印表機驅動程式。\n" +msgstr "不明印表機驅動程式。\n" #: dlls/kernel32/winerror.mc:3403 msgid "Unknown print processor.\n" @@ -6735,15 +6667,15 @@ msgstr "已無更多繫結。\n" #: dlls/kernel32/winerror.mc:3448 msgid "Can't log on with inter-domain trust account.\n" -msgstr "無法以網域間信賴帳號登錄。\n" +msgstr "無法以網域間信賴帳號登入。\n" #: dlls/kernel32/winerror.mc:3453 msgid "Can't log on with workstation trust account.\n" -msgstr "無法以工作站信賴帳號登錄。\n" +msgstr "無法以工作站信賴帳號登入。\n" #: dlls/kernel32/winerror.mc:3458 msgid "Can't log on with server trust account.\n" -msgstr "無法以伺服器信賴帳號登錄。\n" +msgstr "無法以伺服器信賴帳號登入。\n" #: dlls/kernel32/winerror.mc:3463 msgid "Domain trust information inconsistent.\n" @@ -6791,7 +6723,7 @@ msgstr "RPC 指令失敗。\n" #: dlls/kernel32/winerror.mc:3518 msgid "Unsupported authorization level.\n" -msgstr "不受支援的授權等級。\n" +msgstr "不支援的授權等級。\n" #: dlls/kernel32/winerror.mc:3523 msgid "No principal name registered.\n" @@ -6935,7 +6867,7 @@ msgstr "無法解析檔名。\n" #: dlls/kernel32/winerror.mc:3698 msgid "RPC entry type mismatch.\n" -msgstr "RPC 條目型態不匹配。\n" +msgstr "RPC 條目類型不匹配。\n" #: dlls/kernel32/winerror.mc:3703 msgid "Not all objects could be exported.\n" @@ -6947,15 +6879,15 @@ msgstr "無法匯出介面。\n" #: dlls/kernel32/winerror.mc:3713 msgid "The profile could not be added.\n" -msgstr "無法加入側寫檔。\n" +msgstr "無法加入配置檔案。\n" #: dlls/kernel32/winerror.mc:3718 msgid "The profile element could not be added.\n" -msgstr "無法加入側寫檔元件。\n" +msgstr "無法加入配置檔案元件。\n" #: dlls/kernel32/winerror.mc:3723 msgid "The profile element could not be removed.\n" -msgstr "無法移除側寫檔元件。\n" +msgstr "無法移除配置檔案元件。\n" #: dlls/kernel32/winerror.mc:3728 msgid "The group element could not be added.\n" @@ -6970,610 +6902,505 @@ msgid "The username could not be found.\n" msgstr "無法找到使用者名稱。\n" #: dlls/kernel32/winerror.mc:3743 -#, fuzzy -#| msgid "The site does not exist.\n" msgid "This network connection does not exist.\n" -msgstr "站臺不存在。\n" +msgstr "這個網路連線不存在。\n" #: dlls/kernel32/winerror.mc:3748 -#, fuzzy -#| msgid "Connection refused.\n" msgid "Connection reset by peer.\n" -msgstr "連線被拒。\n" +msgstr "連線被同儕節點重設。\n" #: dlls/kernel32/winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "未實作" +msgstr "未實作。\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "RPC call failed.\n" msgid "Call failed.\n" -msgstr "RPC 呼叫失敗。\n" +msgstr "呼叫失敗。\n" #: dlls/kernel32/winerror.mc:3760 -#, fuzzy -#| msgid "Message 0x%1 not found in file %2.\n" msgid "No Signature found in file.\n" -msgstr "在檔案 %2 中找不到訊息 0x%1。\n" +msgstr "無法在檔案中找到簽名。\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "無效的層級。\n" +msgstr "無效的呼叫。\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Help not available." msgid "Resource is not currently available.\n" -msgstr "沒有可用的說明資訊。" +msgstr "資源目前不可用。\n" #: dlls/light.msstyles/light.rc:30 dlls/light.msstyles/light.rc:37 -#, fuzzy -#| msgid "Class Name:" msgid "Classic Blue" -msgstr "類別名稱:" +msgstr "經典藍" #: dlls/light.msstyles/light.rc:43 dlls/light.msstyles/light.rc:49 #: programs/winhlp32/winhlp32.rc:53 programs/winhlp32/winhlp32.rc:73 msgid "Normal" -msgstr "中" +msgstr "標準" #: dlls/localspl/localspl.rc:37 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter" -msgstr "代號" +msgstr "Letter" #: dlls/localspl/localspl.rc:38 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Small" -msgstr "代號" +msgstr "Letter Small" #: dlls/localspl/localspl.rc:39 -#, fuzzy -#| msgid "&Table" msgid "Tabloid" -msgstr "表格(&T)" +msgstr "Tabloid" #: dlls/localspl/localspl.rc:40 msgid "Ledger" -msgstr "" +msgstr "Ledger" #: dlls/localspl/localspl.rc:41 msgid "Legal" -msgstr "" +msgstr "Legal" #: dlls/localspl/localspl.rc:42 -#, fuzzy -#| msgid "State" msgid "Statement" -msgstr "狀態" +msgstr "Statement" #: dlls/localspl/localspl.rc:43 -#, fuzzy -#| msgid "&Execute..." msgid "Executive" -msgstr "執行(&E)..." +msgstr "Executive" #: dlls/localspl/localspl.rc:44 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A3" -msgstr "A" +msgstr "A3" #: dlls/localspl/localspl.rc:45 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A4" -msgstr "A" +msgstr "A4" #: dlls/localspl/localspl.rc:46 -#, fuzzy -#| msgid "Small" msgid "A4 Small" -msgstr "小" +msgstr "A4 Small" #: dlls/localspl/localspl.rc:47 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A5" -msgstr "A" +msgstr "A5" #: dlls/localspl/localspl.rc:48 msgid "B4 (JIS)" -msgstr "" +msgstr "B4 (JIS)" #: dlls/localspl/localspl.rc:49 msgid "B5 (JIS)" -msgstr "" +msgstr "B5 (JIS)" #: dlls/localspl/localspl.rc:50 msgid "Folio" -msgstr "" +msgstr "Folio" #: dlls/localspl/localspl.rc:51 msgid "Quarto" -msgstr "" +msgstr "Quarto" #: dlls/localspl/localspl.rc:52 msgid "10x14" -msgstr "" +msgstr "10x14" #: dlls/localspl/localspl.rc:53 msgid "11x17" -msgstr "" +msgstr "11x17" #: dlls/localspl/localspl.rc:54 -#, fuzzy -#| msgid "Notepad" msgid "Note" -msgstr "記事本" +msgstr "Note" #: dlls/localspl/localspl.rc:55 msgid "Envelope #9" -msgstr "" +msgstr "信封 #9" #: dlls/localspl/localspl.rc:56 msgid "Envelope #10" -msgstr "" +msgstr "信封 #10" #: dlls/localspl/localspl.rc:57 msgid "Envelope #11" -msgstr "" +msgstr "信封 #11" #: dlls/localspl/localspl.rc:58 msgid "Envelope #12" -msgstr "" +msgstr "信封 #12" #: dlls/localspl/localspl.rc:59 msgid "Envelope #14" -msgstr "" +msgstr "信封 #14" #: dlls/localspl/localspl.rc:60 msgid "C size sheet" -msgstr "" +msgstr "C 尺寸紙張" #: dlls/localspl/localspl.rc:61 msgid "D size sheet" -msgstr "" +msgstr "D 尺寸紙張" #: dlls/localspl/localspl.rc:62 msgid "E size sheet" -msgstr "" +msgstr "E 尺寸紙張" #: dlls/localspl/localspl.rc:63 msgid "Envelope DL" -msgstr "" +msgstr "信封 DL" #: dlls/localspl/localspl.rc:64 msgid "Envelope C5" -msgstr "" +msgstr "信封 C5" #: dlls/localspl/localspl.rc:65 msgid "Envelope C3" -msgstr "" +msgstr "信封 C3" #: dlls/localspl/localspl.rc:66 msgid "Envelope C4" -msgstr "" +msgstr "信封 C4" #: dlls/localspl/localspl.rc:67 msgid "Envelope C6" -msgstr "" +msgstr "信封 C6" #: dlls/localspl/localspl.rc:68 msgid "Envelope C65" -msgstr "" +msgstr "信封 C65" #: dlls/localspl/localspl.rc:69 msgid "Envelope B4" -msgstr "" +msgstr "信封 B4" #: dlls/localspl/localspl.rc:70 msgid "Envelope B5" -msgstr "" +msgstr "信封 B5" #: dlls/localspl/localspl.rc:71 msgid "Envelope B6" -msgstr "" +msgstr "信封 B6" #: dlls/localspl/localspl.rc:72 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "Envelope" -msgstr "PKCS 7 封套" +msgstr "信封" #: dlls/localspl/localspl.rc:73 msgid "Envelope Monarch" -msgstr "" +msgstr "信封 Monarch" #: dlls/localspl/localspl.rc:74 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "6 3/4 Envelope" -msgstr "PKCS 7 封套" +msgstr "6 3/4 信封" #: dlls/localspl/localspl.rc:75 msgid "US Std Fanfold" -msgstr "" +msgstr "美國標準 Fanfold" #: dlls/localspl/localspl.rc:76 msgid "German Std Fanfold" -msgstr "" +msgstr "德國標準 Fanfold" #: dlls/localspl/localspl.rc:77 msgid "German Legal Fanfold" -msgstr "" +msgstr "德國法定 Fanfold" #: dlls/localspl/localspl.rc:78 msgid "B4 (ISO)" -msgstr "" +msgstr "B4 (ISO)" #: dlls/localspl/localspl.rc:79 -#, fuzzy -#| msgid "Japanese" msgid "Japanese Postcard" -msgstr "日語" +msgstr "明信片" #: dlls/localspl/localspl.rc:80 msgid "9x11" -msgstr "" +msgstr "9x11" #: dlls/localspl/localspl.rc:81 msgid "10x11" -msgstr "" +msgstr "10x11" #: dlls/localspl/localspl.rc:82 msgid "15x11" -msgstr "" +msgstr "15x11" #: dlls/localspl/localspl.rc:83 msgid "Envelope Invite" -msgstr "" +msgstr "信封 Invite" #: dlls/localspl/localspl.rc:84 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Extra" -msgstr "代號" +msgstr "Letter Extra" #: dlls/localspl/localspl.rc:85 msgid "Legal Extra" -msgstr "" +msgstr "Legal Extra" #: dlls/localspl/localspl.rc:86 msgid "Tabloid Extra" -msgstr "" +msgstr "Tabloid Extra" #: dlls/localspl/localspl.rc:87 -#, fuzzy -#| msgid "E&xtras" msgid "A4 Extra" -msgstr "其他(&X)" +msgstr "A4 Extra" #: dlls/localspl/localspl.rc:88 msgid "Letter Transverse" -msgstr "" +msgstr "Letter Transverse" #: dlls/localspl/localspl.rc:89 msgid "A4 Transverse" -msgstr "" +msgstr "A4 Transverse" #: dlls/localspl/localspl.rc:90 msgid "Letter Extra Transverse" -msgstr "" +msgstr "Letter Extra Transverse" #: dlls/localspl/localspl.rc:91 msgid "Super A" -msgstr "" +msgstr "Super A" #: dlls/localspl/localspl.rc:92 msgid "Super B" -msgstr "" +msgstr "Super B" #: dlls/localspl/localspl.rc:93 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Plus" -msgstr "代號" +msgstr "Letter Plus" #: dlls/localspl/localspl.rc:94 msgid "A4 Plus" -msgstr "" +msgstr "A4 Plus" #: dlls/localspl/localspl.rc:95 msgid "A5 Transverse" -msgstr "" +msgstr "A5 Transverse" #: dlls/localspl/localspl.rc:96 msgid "B5 (JIS) Transverse" -msgstr "" +msgstr "B5 (JIS) Transverse" #: dlls/localspl/localspl.rc:97 -#, fuzzy -#| msgid "E&xtras" msgid "A3 Extra" -msgstr "其他(&X)" +msgstr "A3 Extra" #: dlls/localspl/localspl.rc:98 -#, fuzzy -#| msgid "E&xtras" msgid "A5 Extra" -msgstr "其他(&X)" +msgstr "A5 Extra" #: dlls/localspl/localspl.rc:99 msgid "B5 (ISO) Extra" -msgstr "" +msgstr "B5 (ISO) Extra" #: dlls/localspl/localspl.rc:100 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A2" -msgstr "A" +msgstr "A2" #: dlls/localspl/localspl.rc:101 msgid "A3 Transverse" -msgstr "" +msgstr "A3 Transverse" #: dlls/localspl/localspl.rc:102 msgid "A3 Extra Transverse" -msgstr "" +msgstr "A3 Extra Transverse" #: dlls/localspl/localspl.rc:103 msgid "Japanese Double Postcard" -msgstr "" +msgstr "雙面明信片" #: dlls/localspl/localspl.rc:104 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A6" -msgstr "A" +msgstr "A6" #: dlls/localspl/localspl.rc:105 msgid "Japanese Envelope Kaku #2" -msgstr "" +msgstr "日本角形信封 #2" #: dlls/localspl/localspl.rc:106 msgid "Japanese Envelope Kaku #3" -msgstr "" +msgstr "日本角形信封 #3" #: dlls/localspl/localspl.rc:107 msgid "Japanese Envelope Chou #3" -msgstr "" +msgstr "日本長形信封 #3" #: dlls/localspl/localspl.rc:108 msgid "Japanese Envelope Chou #4" -msgstr "" +msgstr "日本長形信封 #4" #: dlls/localspl/localspl.rc:109 msgid "Letter Rotated" -msgstr "" +msgstr "Letter 橫向" #: dlls/localspl/localspl.rc:110 msgid "A3 Rotated" -msgstr "" +msgstr "A3 橫向" #: dlls/localspl/localspl.rc:111 msgid "A4 Rotated" -msgstr "" +msgstr "A4 橫向" #: dlls/localspl/localspl.rc:112 msgid "A5 Rotated" -msgstr "" +msgstr "A5 橫向" #: dlls/localspl/localspl.rc:113 msgid "B4 (JIS) Rotated" -msgstr "" +msgstr "B4 (JIS) 橫向" #: dlls/localspl/localspl.rc:114 msgid "B5 (JIS) Rotated" -msgstr "" +msgstr "B5 (JIS) 橫向" #: dlls/localspl/localspl.rc:115 msgid "Japanese Postcard Rotated" -msgstr "" +msgstr "明信片橫向" #: dlls/localspl/localspl.rc:116 msgid "Double Japan Postcard Rotated" -msgstr "" +msgstr "雙面明信片橫向" #: dlls/localspl/localspl.rc:117 msgid "A6 Rotated" -msgstr "" +msgstr "A6 橫向" #: dlls/localspl/localspl.rc:118 msgid "Japan Envelope Kaku #2 Rotated" -msgstr "" +msgstr "日本角形信封 #2 橫向" #: dlls/localspl/localspl.rc:119 msgid "Japan Envelope Kaku #3 Rotated" -msgstr "" +msgstr "日本角形信封 #3 橫向" #: dlls/localspl/localspl.rc:120 msgid "Japan Envelope Chou #3 Rotated" -msgstr "" +msgstr "日本長形信封 #3 橫向" #: dlls/localspl/localspl.rc:121 msgid "Japan Envelope Chou #4 Rotated" -msgstr "" +msgstr "日本長形信封 #4 橫向" #: dlls/localspl/localspl.rc:122 msgid "B6 (JIS)" -msgstr "" +msgstr "B6 (JIS)" #: dlls/localspl/localspl.rc:123 msgid "B6 (JIS) Rotated" -msgstr "" +msgstr "B6 (JIS) 橫向" #: dlls/localspl/localspl.rc:124 msgid "12x11" -msgstr "" +msgstr "12x11" #: dlls/localspl/localspl.rc:125 msgid "Japan Envelope You #4" -msgstr "" +msgstr "日本洋形信封 #4" #: dlls/localspl/localspl.rc:126 msgid "Japan Envelope You #4 Rotated" -msgstr "" +msgstr "日本洋形信封 #4 橫向" #: dlls/localspl/localspl.rc:127 msgid "PRC 16K" -msgstr "" +msgstr "中國 16K" #: dlls/localspl/localspl.rc:128 msgid "PRC 32K" -msgstr "" +msgstr "中國 32K" #: dlls/localspl/localspl.rc:129 msgid "PRC 32K(Big)" -msgstr "" +msgstr "PRC 32K（大）" #: dlls/localspl/localspl.rc:130 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1" -msgstr "PKCS 7 封套" +msgstr "中國信封 #1" #: dlls/localspl/localspl.rc:131 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2" -msgstr "PKCS 7 封套" +msgstr "中國信封 #2" #: dlls/localspl/localspl.rc:132 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3" -msgstr "PKCS 7 封套" +msgstr "中國信封 #3" #: dlls/localspl/localspl.rc:133 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4" -msgstr "PKCS 7 封套" +msgstr "中國信封 #4" #: dlls/localspl/localspl.rc:134 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5" -msgstr "PKCS 7 封套" +msgstr "中國信封 #5" #: dlls/localspl/localspl.rc:135 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6" -msgstr "PKCS 7 封套" +msgstr "中國信封 #6" #: dlls/localspl/localspl.rc:136 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7" -msgstr "PKCS 7 封套" +msgstr "中國信封 #7" #: dlls/localspl/localspl.rc:137 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8" -msgstr "PKCS 7 封套" +msgstr "中國信封 #8" #: dlls/localspl/localspl.rc:138 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9" -msgstr "PKCS 7 封套" +msgstr "中國信封 #9" #: dlls/localspl/localspl.rc:139 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10" -msgstr "PKCS 7 封套" +msgstr "中國信封 #10" #: dlls/localspl/localspl.rc:140 msgid "PRC 16K Rotated" -msgstr "" +msgstr "中國 16K 橫向" #: dlls/localspl/localspl.rc:141 msgid "PRC 32K Rotated" -msgstr "" +msgstr "中國 32K 橫向" #: dlls/localspl/localspl.rc:142 msgid "PRC 32K(Big) Rotated" -msgstr "" +msgstr "PRC 32K（大）橫向" #: dlls/localspl/localspl.rc:143 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #1 橫向" #: dlls/localspl/localspl.rc:144 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #2 橫向" #: dlls/localspl/localspl.rc:145 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #3 橫向" #: dlls/localspl/localspl.rc:146 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #4 橫向" #: dlls/localspl/localspl.rc:147 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #5 橫向" #: dlls/localspl/localspl.rc:148 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #6 橫向" #: dlls/localspl/localspl.rc:149 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #7 橫向" #: dlls/localspl/localspl.rc:150 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #8 橫向" #: dlls/localspl/localspl.rc:151 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #9 橫向" #: dlls/localspl/localspl.rc:152 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #10 橫向" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -7590,7 +7417,7 @@ msgstr "新增本機連接埠" #: dlls/localui/localui.rc:42 msgid "&Enter the port name to add:" -msgstr "輸入要新增的本機連接埠名稱(&E):" +msgstr "輸入要新增的本機連接埠名稱(&E)：" #: dlls/localui/localui.rc:51 msgid "Configure LPT Port" @@ -7598,15 +7425,15 @@ msgstr "設定並列埠" #: dlls/localui/localui.rc:54 msgid "Timeout (seconds)" -msgstr "超時(秒)" +msgstr "超時（秒）" #: dlls/localui/localui.rc:55 msgid "&Transmission Retry:" -msgstr "重試傳送(&T):" +msgstr "重試傳送(&T)：" #: dlls/localui/localui.rc:32 msgid "'%s' is not a valid port name" -msgstr "%s 不是有效的連接埠名稱" +msgstr "「%s」不是有效的連接埠名稱" #: dlls/localui/localui.rc:33 msgid "Port %s already exists" @@ -7626,7 +7453,7 @@ msgstr "傳送郵件" #: dlls/mferror/mferror.mc:249 dlls/mferror/mferror.mc:256 msgid "Begin request has already been made.\n" -msgstr "" +msgstr "已建立開始要求。\n" #: dlls/mferror/mferror.mc:599 #, fuzzy -- 2.33.0.windows.2

1 0

[PATCH v2 1/5] dinput: Factor object enumeration checks and offset mapping.
by Rémi Bernon 20 Oct '21

20 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Fix keyboard test failure: check for acquired state before checking for data format in GetDeviceState. dlls/dinput/device.c | 39 ++++++++++++++++++++++++++++++++------ dlls/dinput/joystick_hid.c | 26 +++++++------------------ dlls/dinput/keyboard.c | 19 ++----------------- dlls/dinput/mouse.c | 20 ++----------------- 4 files changed, 44 insertions(+), 60 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index cdaa76cd504..2b2c4646e31 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1186,6 +1186,24 @@ HRESULT WINAPI IDirectInputDevice2WImpl_EnumObjects( IDirectInputDevice8W *iface return DI_OK; } +static HRESULT enum_object_filter_init( IDirectInputDeviceImpl *impl, DIPROPHEADER *filter ) +{ + DIDATAFORMAT *format = impl->data_format.wine_df; + int i, *offsets = impl->data_format.offsets; + + if (filter->dwHow > DIPH_BYUSAGE) return DIERR_INVALIDPARAM; + if (filter->dwHow == DIPH_BYUSAGE && !(impl->instance.dwDevType & DIDEVTYPE_HID)) return DIERR_UNSUPPORTED; + if (filter->dwHow != DIPH_BYOFFSET) return DI_OK; + + if (!offsets) return DIERR_NOTFOUND; + + for (i = 0; i < format->dwNumObjs; ++i) if (offsets[i] == filter->dwObj) break; + if (i == format->dwNumObjs) return DIERR_NOTFOUND; + + filter->dwObj = format->rgodf[i].dwOfs; + return DI_OK; +} + static BOOL CALLBACK find_object( const DIDEVICEOBJECTINSTANCEW *instance, void *context ) { *(DIDEVICEOBJECTINSTANCEW *)context = *instance; @@ -1198,6 +1216,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty( IDirectInputDevice8W *iface IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8W( iface ); DWORD object_mask = DIDFT_AXIS | DIDFT_BUTTON | DIDFT_POV; DIDEVICEOBJECTINSTANCEW instance; + DIPROPHEADER filter; HRESULT hr; TRACE( "iface %p, guid %s, header %p\n", iface, debugstr_guid( guid ), header ); @@ -1206,6 +1225,9 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty( IDirectInputDevice8W *iface if (header->dwHeaderSize != sizeof(DIPROPHEADER)) return DIERR_INVALIDPARAM; if (!IS_DIPROP( guid )) return DI_OK; + filter = *header; + if (FAILED(hr = enum_object_filter_init( impl, &filter ))) return hr; + switch (LOWORD( guid )) { case (DWORD_PTR)DIPROP_PRODUCTNAME: @@ -1228,7 +1250,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty( IDirectInputDevice8W *iface case (DWORD_PTR)DIPROP_RANGE: if (header->dwSize != sizeof(DIPROPRANGE)) return DIERR_INVALIDPARAM; if (header->dwHow == DIPH_DEVICE) return DIERR_UNSUPPORTED; - hr = impl->vtbl->enum_objects( iface, header, object_mask, find_object, &instance ); + hr = impl->vtbl->enum_objects( iface, &filter, object_mask, find_object, &instance ); if (FAILED(hr)) return hr; if (hr == DIENUM_CONTINUE) return DIERR_NOTFOUND; if (!(instance.dwType & DIDFT_AXIS)) return DIERR_UNSUPPORTED; @@ -1239,7 +1261,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty( IDirectInputDevice8W *iface case (DWORD_PTR)DIPROP_GRANULARITY: if (header->dwSize != sizeof(DIPROPDWORD)) return DIERR_INVALIDPARAM; if (header->dwHow == DIPH_DEVICE) return DIERR_UNSUPPORTED; - hr = impl->vtbl->enum_objects( iface, header, object_mask, find_object, &instance ); + hr = impl->vtbl->enum_objects( iface, &filter, object_mask, find_object, &instance ); if (FAILED(hr)) return hr; if (hr == DIENUM_CONTINUE) return DIERR_NOTFOUND; if (!(instance.dwType & DIDFT_AXIS)) return DIERR_UNSUPPORTED; @@ -1247,7 +1269,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty( IDirectInputDevice8W *iface case (DWORD_PTR)DIPROP_KEYNAME: if (header->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM; - hr = impl->vtbl->enum_objects( iface, header, object_mask, find_object, &instance ); + hr = impl->vtbl->enum_objects( iface, &filter, object_mask, find_object, &instance ); if (FAILED(hr)) return hr; if (hr == DIENUM_CONTINUE) return DIERR_NOTFOUND; if (!(instance.dwType & DIDFT_BUTTON)) return DIERR_UNSUPPORTED; @@ -1317,6 +1339,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( IDirectInputDevice8W *iface { struct set_object_property_params params = {.iface = iface, .header = header, .property = LOWORD( guid )}; IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8W( iface ); + DIPROPHEADER filter; HRESULT hr; TRACE( "iface %p, guid %s, header %p\n", iface, debugstr_guid( guid ), header ); @@ -1325,6 +1348,9 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( IDirectInputDevice8W *iface if (header->dwHeaderSize != sizeof(DIPROPHEADER)) return DIERR_INVALIDPARAM; if (!IS_DIPROP( guid )) return DI_OK; + filter = *header; + if (FAILED(hr = enum_object_filter_init( impl, &filter ))) return hr; + switch (LOWORD( guid )) { case (DWORD_PTR)DIPROP_RANGE: @@ -1332,7 +1358,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( IDirectInputDevice8W *iface const DIPROPRANGE *value = (const DIPROPRANGE *)header; if (header->dwSize != sizeof(DIPROPRANGE)) return DIERR_INVALIDPARAM; if (value->lMin > value->lMax) return DIERR_INVALIDPARAM; - hr = impl->vtbl->enum_objects( iface, header, DIDFT_AXIS, set_object_property, &params ); + hr = impl->vtbl->enum_objects( iface, &filter, DIDFT_AXIS, set_object_property, &params ); if (FAILED(hr)) return hr; return DI_OK; } @@ -1342,7 +1368,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( IDirectInputDevice8W *iface const DIPROPDWORD *value = (const DIPROPDWORD *)header; if (header->dwSize != sizeof(DIPROPDWORD)) return DIERR_INVALIDPARAM; if (value->dwData > 10000) return DIERR_INVALIDPARAM; - hr = impl->vtbl->enum_objects( iface, header, DIDFT_AXIS, set_object_property, &params ); + hr = impl->vtbl->enum_objects( iface, &filter, DIDFT_AXIS, set_object_property, &params ); if (FAILED(hr)) return hr; return DI_OK; } @@ -1473,7 +1499,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetObjectInfo( IDirectInputDevice8W *ifa DWORD obj, DWORD how ) { IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8W( iface ); - const DIPROPHEADER filter = + DIPROPHEADER filter = { .dwSize = sizeof(filter), .dwHeaderSize = sizeof(filter), @@ -1488,6 +1514,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetObjectInfo( IDirectInputDevice8W *ifa if (instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3W) && instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCEW)) return DIERR_INVALIDPARAM; if (how == DIPH_DEVICE) return DIERR_INVALIDPARAM; + if (FAILED(hr = enum_object_filter_init( impl, &filter ))) return hr; hr = impl->vtbl->enum_objects( iface, &filter, DIDFT_ALL, get_object_info, instance ); if (FAILED(hr)) return hr; diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 3dc43c450e4..2dec33e3ccd 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -392,28 +392,16 @@ static void set_axis_type( DIDEVICEOBJECTINSTANCEW *instance, BOOL *seen, DWORD seen[i] = TRUE; } -static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, DWORD flags, +static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, DWORD flags, enum_object_callback callback, void *data ) { - DWORD collection = 0, object = 0, axis = 0, button = 0, pov = 0, value_ofs = 0, button_ofs = 0, i, j; + DWORD collection = 0, object = 0, axis = 0, button = 0, pov = 0, value_ofs = 0, button_ofs = 0, j; struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)impl->preparsed; DIDEVICEOBJECTINSTANCEW instance = {.dwSize = sizeof(DIDEVICEOBJECTINSTANCEW)}; struct hid_value_caps *caps, *caps_end, *nary, *nary_end, *effect_caps; - DIDATAFORMAT *format = impl->base.data_format.wine_df; - int *offsets = impl->base.data_format.offsets; struct hid_collection_node *node, *node_end; - DIPROPHEADER filter = *header; BOOL ret, seen_axis[6] = {0}; - if (filter.dwHow == DIPH_BYOFFSET) - { - if (!offsets) return DIENUM_CONTINUE; - for (i = 0; i < format->dwNumObjs; ++i) - if (offsets[i] == filter.dwObj) break; - if (i == format->dwNumObjs) return DIENUM_CONTINUE; - filter.dwObj = format->rgodf[i].dwOfs; - } - button_ofs += impl->caps.NumberInputValueCaps * sizeof(LONG); button_ofs += impl->caps.NumberOutputValueCaps * sizeof(LONG); button_ofs += impl->caps.NumberFeatureValueCaps * sizeof(LONG); @@ -489,7 +477,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.dwDimension = caps->units; instance.wExponent = caps->units_exp; check_pid_effect_axis_caps( impl, &instance ); - ret = enum_object( impl, &filter, flags, callback, caps, &instance, data ); + ret = enum_object( impl, filter, flags, callback, caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; value_ofs += sizeof(LONG); object++; @@ -532,7 +520,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.wCollectionNumber = caps->link_collection; instance.dwDimension = caps->units; instance.wExponent = caps->units_exp; - ret = enum_object( impl, &filter, flags, callback, caps, &instance, data ); + ret = enum_object( impl, filter, flags, callback, caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; button_ofs++; object++; @@ -567,7 +555,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.wCollectionNumber = nary->link_collection; instance.dwDimension = caps->units; instance.wExponent = caps->units_exp; - ret = enum_object( impl, &filter, flags, callback, nary, &instance, data ); + ret = enum_object( impl, filter, flags, callback, nary, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; button_ofs++; } @@ -586,7 +574,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.wCollectionNumber = caps->link_collection; instance.dwDimension = caps->units; instance.wExponent = caps->units_exp; - ret = enum_object( impl, &filter, flags, callback, caps, &instance, data ); + ret = enum_object( impl, filter, flags, callback, caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; if (caps->flags & HID_VALUE_CAPS_IS_BUTTON) button_ofs++; @@ -612,7 +600,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.wCollectionNumber = node->parent; instance.dwDimension = 0; instance.wExponent = 0; - ret = enum_object( impl, &filter, flags, callback, NULL, &instance, data ); + ret = enum_object( impl, filter, flags, callback, NULL, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; } } diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 0c2a1b839ff..ad91c948fbc 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -302,7 +302,7 @@ static BOOL try_enum_object( const DIPROPHEADER *filter, DWORD flags, LPDIENUMDE return DIENUM_CONTINUE; } -static HRESULT keyboard_internal_enum_objects( IDirectInputDevice8W *iface, const DIPROPHEADER *header, DWORD flags, +static HRESULT keyboard_internal_enum_objects( IDirectInputDevice8W *iface, const DIPROPHEADER *filter, DWORD flags, LPDIENUMDEVICEOBJECTSCALLBACKW callback, void *context ) { SysKeyboardImpl *impl = impl_from_IDirectInputDevice8W( iface ); @@ -314,31 +314,16 @@ static HRESULT keyboard_internal_enum_objects( IDirectInputDevice8W *iface, cons .dwOfs = DIK_ESCAPE, .dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( DIK_ESCAPE ), }; - DIDATAFORMAT *format = impl->base.data_format.wine_df; - int *offsets = impl->base.data_format.offsets; - DIPROPHEADER filter = *header; DWORD i, dik; BOOL ret; - if (header->dwHow != DIPH_DEVICE && header->dwHow != DIPH_BYOFFSET && header->dwHow != DIPH_BYID) - return DIERR_UNSUPPORTED; - - if (filter.dwHow == DIPH_BYOFFSET) - { - if (!offsets) return DIENUM_CONTINUE; - for (i = 0; i < format->dwNumObjs; ++i) - if (offsets[i] == filter.dwObj) break; - if (i == format->dwNumObjs) return DIENUM_CONTINUE; - filter.dwObj = format->rgodf[i].dwOfs; - } - for (i = 0; i < 512; ++i) { if (!GetKeyNameTextW( i << 16, instance.tszName, ARRAY_SIZE(instance.tszName) )) continue; if (!(dik = map_dik_code( i, 0, subtype, impl->base.dinput->dwVersion ))) continue; instance.dwOfs = dik; instance.dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( dik ); - ret = try_enum_object( &filter, flags, callback, &instance, context ); + ret = try_enum_object( filter, flags, callback, &instance, context ); if (ret != DIENUM_CONTINUE) return DIENUM_STOP; } diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 3553a5af94d..5b3ec2d1f20 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -575,7 +575,7 @@ static BOOL try_enum_object( const DIPROPHEADER *filter, DWORD flags, LPDIENUMDE return DIENUM_CONTINUE; } -static HRESULT mouse_internal_enum_objects( IDirectInputDevice8W *iface, const DIPROPHEADER *header, DWORD flags, +static HRESULT mouse_internal_enum_objects( IDirectInputDevice8W *iface, const DIPROPHEADER *filter, DWORD flags, LPDIENUMDEVICEOBJECTSCALLBACKW callback, void *context ) { DIDEVICEOBJECTINSTANCEW instances[] = @@ -640,28 +640,12 @@ static HRESULT mouse_internal_enum_objects( IDirectInputDevice8W *iface, const D .tszName = L"Button 4", }, }; - SysMouseImpl *impl = impl_from_IDirectInputDevice8W( iface ); - DIDATAFORMAT *format = impl->base.data_format.wine_df; - int *offsets = impl->base.data_format.offsets; - DIPROPHEADER filter = *header; BOOL ret; DWORD i; - if (header->dwHow != DIPH_DEVICE && header->dwHow != DIPH_BYOFFSET && header->dwHow != DIPH_BYID) - return DIERR_UNSUPPORTED; - - if (filter.dwHow == DIPH_BYOFFSET) - { - if (!offsets) return DIENUM_CONTINUE; - for (i = 0; i < format->dwNumObjs; ++i) - if (offsets[i] == filter.dwObj) break; - if (i == format->dwNumObjs) return DIENUM_CONTINUE; - filter.dwObj = format->rgodf[i].dwOfs; - } - for (i = 0; i < ARRAY_SIZE(instances); ++i) { - ret = try_enum_object( &filter, flags, callback, instances + i, context ); + ret = try_enum_object( filter, flags, callback, instances + i, context ); if (ret != DIENUM_CONTINUE) return DIENUM_STOP; } -- 2.33.0

1 4

[PATCH 1/5] dinput: Factor object enumeration checks and offset mapping.
by Rémi Bernon 20 Oct '21

20 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/device.c | 39 ++++++++++++++++++++++++++++++++------ dlls/dinput/joystick_hid.c | 26 +++++++------------------ dlls/dinput/keyboard.c | 19 ++----------------- dlls/dinput/mouse.c | 20 ++----------------- 4 files changed, 44 insertions(+), 60 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index cdaa76cd504..2b2c4646e31 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1186,6 +1186,24 @@ HRESULT WINAPI IDirectInputDevice2WImpl_EnumObjects( IDirectInputDevice8W *iface return DI_OK; } +static HRESULT enum_object_filter_init( IDirectInputDeviceImpl *impl, DIPROPHEADER *filter ) +{ + DIDATAFORMAT *format = impl->data_format.wine_df; + int i, *offsets = impl->data_format.offsets; + + if (filter->dwHow > DIPH_BYUSAGE) return DIERR_INVALIDPARAM; + if (filter->dwHow == DIPH_BYUSAGE && !(impl->instance.dwDevType & DIDEVTYPE_HID)) return DIERR_UNSUPPORTED; + if (filter->dwHow != DIPH_BYOFFSET) return DI_OK; + + if (!offsets) return DIERR_NOTFOUND; + + for (i = 0; i < format->dwNumObjs; ++i) if (offsets[i] == filter->dwObj) break; + if (i == format->dwNumObjs) return DIERR_NOTFOUND; + + filter->dwObj = format->rgodf[i].dwOfs; + return DI_OK; +} + static BOOL CALLBACK find_object( const DIDEVICEOBJECTINSTANCEW *instance, void *context ) { *(DIDEVICEOBJECTINSTANCEW *)context = *instance; @@ -1198,6 +1216,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty( IDirectInputDevice8W *iface IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8W( iface ); DWORD object_mask = DIDFT_AXIS | DIDFT_BUTTON | DIDFT_POV; DIDEVICEOBJECTINSTANCEW instance; + DIPROPHEADER filter; HRESULT hr; TRACE( "iface %p, guid %s, header %p\n", iface, debugstr_guid( guid ), header ); @@ -1206,6 +1225,9 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty( IDirectInputDevice8W *iface if (header->dwHeaderSize != sizeof(DIPROPHEADER)) return DIERR_INVALIDPARAM; if (!IS_DIPROP( guid )) return DI_OK; + filter = *header; + if (FAILED(hr = enum_object_filter_init( impl, &filter ))) return hr; + switch (LOWORD( guid )) { case (DWORD_PTR)DIPROP_PRODUCTNAME: @@ -1228,7 +1250,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty( IDirectInputDevice8W *iface case (DWORD_PTR)DIPROP_RANGE: if (header->dwSize != sizeof(DIPROPRANGE)) return DIERR_INVALIDPARAM; if (header->dwHow == DIPH_DEVICE) return DIERR_UNSUPPORTED; - hr = impl->vtbl->enum_objects( iface, header, object_mask, find_object, &instance ); + hr = impl->vtbl->enum_objects( iface, &filter, object_mask, find_object, &instance ); if (FAILED(hr)) return hr; if (hr == DIENUM_CONTINUE) return DIERR_NOTFOUND; if (!(instance.dwType & DIDFT_AXIS)) return DIERR_UNSUPPORTED; @@ -1239,7 +1261,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty( IDirectInputDevice8W *iface case (DWORD_PTR)DIPROP_GRANULARITY: if (header->dwSize != sizeof(DIPROPDWORD)) return DIERR_INVALIDPARAM; if (header->dwHow == DIPH_DEVICE) return DIERR_UNSUPPORTED; - hr = impl->vtbl->enum_objects( iface, header, object_mask, find_object, &instance ); + hr = impl->vtbl->enum_objects( iface, &filter, object_mask, find_object, &instance ); if (FAILED(hr)) return hr; if (hr == DIENUM_CONTINUE) return DIERR_NOTFOUND; if (!(instance.dwType & DIDFT_AXIS)) return DIERR_UNSUPPORTED; @@ -1247,7 +1269,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty( IDirectInputDevice8W *iface case (DWORD_PTR)DIPROP_KEYNAME: if (header->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM; - hr = impl->vtbl->enum_objects( iface, header, object_mask, find_object, &instance ); + hr = impl->vtbl->enum_objects( iface, &filter, object_mask, find_object, &instance ); if (FAILED(hr)) return hr; if (hr == DIENUM_CONTINUE) return DIERR_NOTFOUND; if (!(instance.dwType & DIDFT_BUTTON)) return DIERR_UNSUPPORTED; @@ -1317,6 +1339,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( IDirectInputDevice8W *iface { struct set_object_property_params params = {.iface = iface, .header = header, .property = LOWORD( guid )}; IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8W( iface ); + DIPROPHEADER filter; HRESULT hr; TRACE( "iface %p, guid %s, header %p\n", iface, debugstr_guid( guid ), header ); @@ -1325,6 +1348,9 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( IDirectInputDevice8W *iface if (header->dwHeaderSize != sizeof(DIPROPHEADER)) return DIERR_INVALIDPARAM; if (!IS_DIPROP( guid )) return DI_OK; + filter = *header; + if (FAILED(hr = enum_object_filter_init( impl, &filter ))) return hr; + switch (LOWORD( guid )) { case (DWORD_PTR)DIPROP_RANGE: @@ -1332,7 +1358,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( IDirectInputDevice8W *iface const DIPROPRANGE *value = (const DIPROPRANGE *)header; if (header->dwSize != sizeof(DIPROPRANGE)) return DIERR_INVALIDPARAM; if (value->lMin > value->lMax) return DIERR_INVALIDPARAM; - hr = impl->vtbl->enum_objects( iface, header, DIDFT_AXIS, set_object_property, &params ); + hr = impl->vtbl->enum_objects( iface, &filter, DIDFT_AXIS, set_object_property, &params ); if (FAILED(hr)) return hr; return DI_OK; } @@ -1342,7 +1368,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( IDirectInputDevice8W *iface const DIPROPDWORD *value = (const DIPROPDWORD *)header; if (header->dwSize != sizeof(DIPROPDWORD)) return DIERR_INVALIDPARAM; if (value->dwData > 10000) return DIERR_INVALIDPARAM; - hr = impl->vtbl->enum_objects( iface, header, DIDFT_AXIS, set_object_property, &params ); + hr = impl->vtbl->enum_objects( iface, &filter, DIDFT_AXIS, set_object_property, &params ); if (FAILED(hr)) return hr; return DI_OK; } @@ -1473,7 +1499,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetObjectInfo( IDirectInputDevice8W *ifa DWORD obj, DWORD how ) { IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8W( iface ); - const DIPROPHEADER filter = + DIPROPHEADER filter = { .dwSize = sizeof(filter), .dwHeaderSize = sizeof(filter), @@ -1488,6 +1514,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetObjectInfo( IDirectInputDevice8W *ifa if (instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3W) && instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCEW)) return DIERR_INVALIDPARAM; if (how == DIPH_DEVICE) return DIERR_INVALIDPARAM; + if (FAILED(hr = enum_object_filter_init( impl, &filter ))) return hr; hr = impl->vtbl->enum_objects( iface, &filter, DIDFT_ALL, get_object_info, instance ); if (FAILED(hr)) return hr; diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 3dc43c450e4..2dec33e3ccd 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -392,28 +392,16 @@ static void set_axis_type( DIDEVICEOBJECTINSTANCEW *instance, BOOL *seen, DWORD seen[i] = TRUE; } -static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, DWORD flags, +static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, DWORD flags, enum_object_callback callback, void *data ) { - DWORD collection = 0, object = 0, axis = 0, button = 0, pov = 0, value_ofs = 0, button_ofs = 0, i, j; + DWORD collection = 0, object = 0, axis = 0, button = 0, pov = 0, value_ofs = 0, button_ofs = 0, j; struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)impl->preparsed; DIDEVICEOBJECTINSTANCEW instance = {.dwSize = sizeof(DIDEVICEOBJECTINSTANCEW)}; struct hid_value_caps *caps, *caps_end, *nary, *nary_end, *effect_caps; - DIDATAFORMAT *format = impl->base.data_format.wine_df; - int *offsets = impl->base.data_format.offsets; struct hid_collection_node *node, *node_end; - DIPROPHEADER filter = *header; BOOL ret, seen_axis[6] = {0}; - if (filter.dwHow == DIPH_BYOFFSET) - { - if (!offsets) return DIENUM_CONTINUE; - for (i = 0; i < format->dwNumObjs; ++i) - if (offsets[i] == filter.dwObj) break; - if (i == format->dwNumObjs) return DIENUM_CONTINUE; - filter.dwObj = format->rgodf[i].dwOfs; - } - button_ofs += impl->caps.NumberInputValueCaps * sizeof(LONG); button_ofs += impl->caps.NumberOutputValueCaps * sizeof(LONG); button_ofs += impl->caps.NumberFeatureValueCaps * sizeof(LONG); @@ -489,7 +477,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.dwDimension = caps->units; instance.wExponent = caps->units_exp; check_pid_effect_axis_caps( impl, &instance ); - ret = enum_object( impl, &filter, flags, callback, caps, &instance, data ); + ret = enum_object( impl, filter, flags, callback, caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; value_ofs += sizeof(LONG); object++; @@ -532,7 +520,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.wCollectionNumber = caps->link_collection; instance.dwDimension = caps->units; instance.wExponent = caps->units_exp; - ret = enum_object( impl, &filter, flags, callback, caps, &instance, data ); + ret = enum_object( impl, filter, flags, callback, caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; button_ofs++; object++; @@ -567,7 +555,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.wCollectionNumber = nary->link_collection; instance.dwDimension = caps->units; instance.wExponent = caps->units_exp; - ret = enum_object( impl, &filter, flags, callback, nary, &instance, data ); + ret = enum_object( impl, filter, flags, callback, nary, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; button_ofs++; } @@ -586,7 +574,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.wCollectionNumber = caps->link_collection; instance.dwDimension = caps->units; instance.wExponent = caps->units_exp; - ret = enum_object( impl, &filter, flags, callback, caps, &instance, data ); + ret = enum_object( impl, filter, flags, callback, caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; if (caps->flags & HID_VALUE_CAPS_IS_BUTTON) button_ofs++; @@ -612,7 +600,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.wCollectionNumber = node->parent; instance.dwDimension = 0; instance.wExponent = 0; - ret = enum_object( impl, &filter, flags, callback, NULL, &instance, data ); + ret = enum_object( impl, filter, flags, callback, NULL, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; } } diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 0c2a1b839ff..ad91c948fbc 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -302,7 +302,7 @@ static BOOL try_enum_object( const DIPROPHEADER *filter, DWORD flags, LPDIENUMDE return DIENUM_CONTINUE; } -static HRESULT keyboard_internal_enum_objects( IDirectInputDevice8W *iface, const DIPROPHEADER *header, DWORD flags, +static HRESULT keyboard_internal_enum_objects( IDirectInputDevice8W *iface, const DIPROPHEADER *filter, DWORD flags, LPDIENUMDEVICEOBJECTSCALLBACKW callback, void *context ) { SysKeyboardImpl *impl = impl_from_IDirectInputDevice8W( iface ); @@ -314,31 +314,16 @@ static HRESULT keyboard_internal_enum_objects( IDirectInputDevice8W *iface, cons .dwOfs = DIK_ESCAPE, .dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( DIK_ESCAPE ), }; - DIDATAFORMAT *format = impl->base.data_format.wine_df; - int *offsets = impl->base.data_format.offsets; - DIPROPHEADER filter = *header; DWORD i, dik; BOOL ret; - if (header->dwHow != DIPH_DEVICE && header->dwHow != DIPH_BYOFFSET && header->dwHow != DIPH_BYID) - return DIERR_UNSUPPORTED; - - if (filter.dwHow == DIPH_BYOFFSET) - { - if (!offsets) return DIENUM_CONTINUE; - for (i = 0; i < format->dwNumObjs; ++i) - if (offsets[i] == filter.dwObj) break; - if (i == format->dwNumObjs) return DIENUM_CONTINUE; - filter.dwObj = format->rgodf[i].dwOfs; - } - for (i = 0; i < 512; ++i) { if (!GetKeyNameTextW( i << 16, instance.tszName, ARRAY_SIZE(instance.tszName) )) continue; if (!(dik = map_dik_code( i, 0, subtype, impl->base.dinput->dwVersion ))) continue; instance.dwOfs = dik; instance.dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( dik ); - ret = try_enum_object( &filter, flags, callback, &instance, context ); + ret = try_enum_object( filter, flags, callback, &instance, context ); if (ret != DIENUM_CONTINUE) return DIENUM_STOP; } diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 3553a5af94d..5b3ec2d1f20 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -575,7 +575,7 @@ static BOOL try_enum_object( const DIPROPHEADER *filter, DWORD flags, LPDIENUMDE return DIENUM_CONTINUE; } -static HRESULT mouse_internal_enum_objects( IDirectInputDevice8W *iface, const DIPROPHEADER *header, DWORD flags, +static HRESULT mouse_internal_enum_objects( IDirectInputDevice8W *iface, const DIPROPHEADER *filter, DWORD flags, LPDIENUMDEVICEOBJECTSCALLBACKW callback, void *context ) { DIDEVICEOBJECTINSTANCEW instances[] = @@ -640,28 +640,12 @@ static HRESULT mouse_internal_enum_objects( IDirectInputDevice8W *iface, const D .tszName = L"Button 4", }, }; - SysMouseImpl *impl = impl_from_IDirectInputDevice8W( iface ); - DIDATAFORMAT *format = impl->base.data_format.wine_df; - int *offsets = impl->base.data_format.offsets; - DIPROPHEADER filter = *header; BOOL ret; DWORD i; - if (header->dwHow != DIPH_DEVICE && header->dwHow != DIPH_BYOFFSET && header->dwHow != DIPH_BYID) - return DIERR_UNSUPPORTED; - - if (filter.dwHow == DIPH_BYOFFSET) - { - if (!offsets) return DIENUM_CONTINUE; - for (i = 0; i < format->dwNumObjs; ++i) - if (offsets[i] == filter.dwObj) break; - if (i == format->dwNumObjs) return DIENUM_CONTINUE; - filter.dwObj = format->rgodf[i].dwOfs; - } - for (i = 0; i < ARRAY_SIZE(instances); ++i) { - ret = try_enum_object( &filter, flags, callback, instances + i, context ); + ret = try_enum_object( filter, flags, callback, instances + i, context ); if (ret != DIENUM_CONTINUE) return DIENUM_STOP; } -- 2.33.0

2 6

[PATCH 0/6] Allow using external static libraries for PE dependencies
by Zebediah Figura 20 Oct '21

20 Oct '21

It's not actually clear if the ZLIB_PE_CFLAGS and ZLIB_PE_LIBS introduced in 2929aa3c74 were meant for this purpose, given the number of ways in which they're broken. Nevertheless, it would be really quite nice to have, so this series aims to provide that. After these patches I'm able to compile wine using distribution static libraries, with the following configure flags: configure ZLIB_PE_CFLAGS="$(x86_64-w64-mingw32-pkg-config --cflags zlib)" ZLIB_PE_LIBS="-Wl,-Bstatic $(x86_64-w64-mingw32-pkg-config --static --libs zlib) -Wl,-Bdynamic" PNG_PE_CFLAGS="$(x86_64-w64-mingw32-pkg-config --cflags libpng16)" PNG_PE_LIBS="-Wl,-Bstatic $(x86_64-w64-mingw32-pkg-config --static --libs libpng16) -lmingwex -lmingw32 -Wl,-Bdynamic" Patches 5-6 are necessary to allow static linking of libpng16. Patch 4 is probably desirable on its own anyway. This is also a first step to actually acquiescing to what distributions have asked for. After this I intend to submit patches to: * allow automatic detection of distribution packages via MinGW pkg-config, which is pretty well standardized; * allow the use of dynamic libraries using the approach demonstrated in [1]. [1] https://www.winehq.org/pipermail/wine-devel/2021-September/195543.html Zebediah Figura (6): makefiles: Allow using external system headers in PE libraries. winegcc: Allow explicit static and dynamic linking. makefiles: Allow using *_PE_LIBS to specify linker flags to external static libraries. include: Add DECLSPEC_RETURNS_TWICE. ucrtbase: Export _setjmp() from the import library. ucrtbase: Export atexit() from the import library. aclocal.m4 | 5 ++++- configure.ac | 2 +- dlls/cabinet/Makefile.in | 3 ++- dlls/dbghelp/Makefile.in | 3 ++- dlls/opcservices/Makefile.in | 3 ++- dlls/ucrtbase/Makefile.in | 2 ++ dlls/ucrtbase/atexit.c | 31 +++++++++++++++++++++++++++++++ dlls/ucrtbase/setjmp.c | 32 ++++++++++++++++++++++++++++++++ dlls/user32/Makefile.in | 3 ++- dlls/windowscodecs/Makefile.in | 3 ++- dlls/wininet/Makefile.in | 3 ++- include/msvcrt/corecrt.h | 18 ++++++++++++++++++ include/msvcrt/setjmp.h | 8 ++------ include/wine/exception.h | 4 ++-- include/wine/unixlib.h | 4 ++-- include/winnt.h | 8 ++++++++ tools/makedep.c | 14 ++------------ tools/winegcc/winegcc.c | 16 ++++++++++++---- 18 files changed, 128 insertions(+), 34 deletions(-) create mode 100644 dlls/ucrtbase/atexit.c create mode 100644 dlls/ucrtbase/setjmp.c -- 2.33.0

4 14

[PATCH v2 1/2] winebus.sys: Treat udev actions other than "remove" as "add".
by Rémi Bernon 20 Oct '21

20 Oct '21

From: Simon McVittie <smcv(a)collabora.com> As per https://github.com/systemd/systemd/blob/v247-rc1/NEWS#L5 there are more kernel uevent types than just "add" and "remove", and we should be treating everything other than "remove" as being potentially an "add". To cope with this, try_add_device() now checks whether the same device was already added. If so, we ignore it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Fix compilation when HAVE_SYS_INOTIFY_H is not defined. dlls/winebus.sys/bus_udev.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 1cad63f0275..59bb2564def 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1411,16 +1411,14 @@ static void process_monitor_event(struct udev_monitor *monitor) if (!action) WARN("No action received\n"); - else if (strcmp(action, "add") == 0) + else if (strcmp(action, "remove")) udev_add_device(dev); - else if (strcmp(action, "remove") == 0) + else { impl = find_device_from_udev(dev); if (impl) bus_event_queue_device_removed(&event_queue, &impl->unix_device); else WARN("failed to find device for udev device %p\n", dev); } - else - WARN("Unhandled action %s\n", debugstr_a(action)); udev_device_unref(dev); } -- 2.33.0

1 1

[PATCH] user32: Change the position and size of layered windows before flushing their surfaces.
by Zhiyi Zhang 20 Oct '21

20 Oct '21

When UpdateLayeredWindow() is called to paint a window and update its size, USER_Driver->pUpdateLayeredWindow() needs to be called after the window position and size are updated. Otherwise, UpdateLayeredWindow() may flush the painted content to a smaller window and then enlarge it, losing the painted result. Fix Word 2016 window frame corruption after restoring from maximized state. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/win.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index e07b7d39e4b..4d0240f21a8 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -4134,10 +4134,8 @@ BOOL WINAPI UpdateLayeredWindowIndirect( HWND hwnd, const UPDATELAYEREDWINDOWINF TRACE( "window %p win %s client %s\n", hwnd, wine_dbgstr_rect(&window_rect), wine_dbgstr_rect(&client_rect) ); - if (!USER_Driver->pUpdateLayeredWindow( hwnd, info, &window_rect )) return FALSE; - set_window_pos( hwnd, 0, flags, &window_rect, &client_rect, NULL ); - return TRUE; + return USER_Driver->pUpdateLayeredWindow( hwnd, info, &window_rect ); } -- 2.32.0

2 1

[PATCH] winex11.drv: Maintain a backing store for layered windows.
by Zhiyi Zhang 20 Oct '21

20 Oct '21

Copy the window content to a pixmap and set it as the background because the X server may discard the window content at any time, even when the backing store attribute is set to TRUE when creating a X11 window. Layered windows don't get repainted in X11DRV_Expose() like normal windows do and their content should always be kept. The window surface may be recreated when handling position and changes. So for most of the time, there is only one backing store for a window with this patch. It's possible that the we can reuse window surfaces but it's a much bigger change and risk breaking things. Fix Word 2016 frame window corruption after it's moved off-screen. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/window.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7ec2639e309..c639b9d06d2 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2706,6 +2706,9 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO HDC hdc = 0; HBITMAP dib; BOOL ret = FALSE; + int width, height; + Pixmap pixmap; + GC gc; if (!(data = get_win_data( hwnd ))) return FALSE; @@ -2726,11 +2729,15 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO else set_surface_color_key( surface, color_key ); if (surface) window_surface_add_ref( surface ); - release_win_data( data ); - if (!surface) return FALSE; + if (!surface) + { + release_win_data( data ); + return FALSE; + } if (!info->hdcSrc) { + release_win_data( data ); window_surface_release( surface ); return TRUE; } @@ -2767,7 +2774,24 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO surface->funcs->unlock( surface ); surface->funcs->flush( surface ); + /* Copy the window content to a pixmap and set it as the background because the X server may + * discard the window content at any time, even when the backing store attribute is set to TRUE + * when creating a X11 window. Layered windows don't get repainted in X11DRV_Expose() like + * normal windows do and their content should always be kept. */ + width = data->whole_rect.right - data->whole_rect.left; + height = data->whole_rect.bottom - data->whole_rect.top; + if (width > 0 && height > 0) + { + pixmap = XCreatePixmap( data->display, data->whole_window, width, height, 32 ); + gc = XCreateGC( data->display, pixmap, 0, NULL ); + XCopyArea( data->display, data->whole_window, pixmap, gc, 0, 0, width, height, 0, 0 ); + XFreeGC( data->display, gc ); + XSetWindowBackgroundPixmap( data->display, data->whole_window, pixmap ); + XFreePixmap( data->display, pixmap ); + } + done: + release_win_data( data ); window_surface_release( surface ); if (hdc) DeleteDC( hdc ); if (dib) DeleteObject( dib ); -- 2.32.0

1 0

[PATCH 6/6] winefile: Set size before calling RegQueryValueExW().
by Zhiyi Zhang 20 Oct '21

20 Oct '21

The value in size may be invalid if previous RegQueryValueExW() calls failed. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/winefile/winefile.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index fa78237cccf..8ad785b924a 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -1220,20 +1220,22 @@ static windowOptions load_registry_settings(void) RegOpenKeyExW( HKEY_CURRENT_USER, registry_key, 0, KEY_QUERY_VALUE, &hKey ); - size = sizeof(DWORD); - + size = sizeof(opts.start_x); if( RegQueryValueExW( hKey, reg_start_x, NULL, &type, (LPBYTE) &opts.start_x, &size ) != ERROR_SUCCESS ) opts.start_x = CW_USEDEFAULT; + size = sizeof(opts.start_y); if( RegQueryValueExW( hKey, reg_start_y, NULL, &type, (LPBYTE) &opts.start_y, &size ) != ERROR_SUCCESS ) opts.start_y = CW_USEDEFAULT; + size = sizeof(opts.width); if( RegQueryValueExW( hKey, reg_width, NULL, &type, (LPBYTE) &opts.width, &size ) != ERROR_SUCCESS ) opts.width = CW_USEDEFAULT; + size = sizeof(opts.height); if( RegQueryValueExW( hKey, reg_height, NULL, &type, (LPBYTE) &opts.height, &size ) != ERROR_SUCCESS ) opts.height = CW_USEDEFAULT; -- 2.32.0

1 0

[PATCH 5/6] winecfg: Pass size in bytes to RegQueryValueExW().
by Zhiyi Zhang 20 Oct '21

20 Oct '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/winecfg/drive.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index bee5be3af34..b4b4239c003 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -140,7 +140,7 @@ static DWORD get_drive_type( char letter ) else { WCHAR buffer[80]; - DWORD size = ARRAY_SIZE(buffer); + DWORD size = sizeof(buffer); if (!RegQueryValueExW( hKey, driveValue, NULL, NULL, (LPBYTE)buffer, &size )) { -- 2.32.0

1 0

[PATCH 4/6] cmd: Pass size in bytes to RegQueryValueExW().
by Zhiyi Zhang 20 Oct '21

20 Oct '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/cmd/builtins.c | 5 +++-- programs/cmd/wcmdmain.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index a55ce6e0244..d0a954d90fa 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4763,7 +4763,7 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) { WCHAR *newValue; LONG rc = ERROR_SUCCESS; WCHAR keyValue[MAXSTRING]; - DWORD valueLen = MAXSTRING; + DWORD valueLen; HKEY readKey; /* See if parameter includes '=' */ @@ -4803,7 +4803,7 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) { if (RegOpenKeyExW(key, subkey, 0, accessOptions, &readKey) == ERROR_SUCCESS) { - valueLen = ARRAY_SIZE(keyValue); + valueLen = sizeof(keyValue); rc = RegQueryValueExW(readKey, NULL, NULL, NULL, (LPBYTE)keyValue, &valueLen); WCMD_output_asis(keyName); WCMD_output_asis(L"="); @@ -4836,6 +4836,7 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) { if (RegOpenKeyExW(key, subkey, 0, accessOptions, &readKey) == ERROR_SUCCESS) { + valueLen = sizeof(keyValue); rc = RegQueryValueExW(readKey, NULL, NULL, NULL, (LPBYTE)keyValue, &valueLen); WCMD_output_asis(args); WCMD_output_asis(L"="); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 8c6ed1c057c..4ed1c96a9c2 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2700,7 +2700,7 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) size = sizeof(DWORD); RegQueryValueExW(key, L"DefaultColor", NULL, NULL, (BYTE *)&value, &size); } else if (type == REG_SZ) { - size = ARRAY_SIZE(strvalue); + size = sizeof(strvalue); RegQueryValueExW(key, L"DefaultColor", NULL, NULL, (BYTE *)strvalue, &size); value = wcstoul(strvalue, NULL, 10); } @@ -2719,7 +2719,7 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) size = sizeof(DWORD); RegQueryValueExW(key, L"DefaultColor", NULL, NULL, (BYTE *)&value, &size); } else if (type == REG_SZ) { - size = ARRAY_SIZE(strvalue); + size = sizeof(strvalue); RegQueryValueExW(key, L"DefaultColor", NULL, NULL, (BYTE *)strvalue, &size); value = wcstoul(strvalue, NULL, 10); } -- 2.32.0

1 0

[PATCH 3/6] winex11.drv: Pass size in bytes to RegQueryValueExW().
by Zhiyi Zhang 20 Oct '21

20 Oct '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 57091522078..7f03f94db90 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -434,7 +434,7 @@ static BOOL link_device(const WCHAR *instance, const GUID *guid) if (lr) continue; - length = ARRAY_SIZE(device_instance); + length = sizeof(device_instance); lr = RegQueryValueExW(device_key, device_instanceW, NULL, NULL, (BYTE *)device_instance, &length); if (lr || lstrcmpiW(device_instance, instance)) { -- 2.32.0

1 0

[PATCH 2/6] winemac.drv: Pass size in bytes to RegQueryValueExW().
by Zhiyi Zhang 20 Oct '21

20 Oct '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 4a3b1ff39cb..99c852d7ffe 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1475,7 +1475,7 @@ static BOOL link_device(const WCHAR *instance, const GUID *guid) if (lr) continue; - length = ARRAY_SIZE(device_instance); + length = sizeof(device_instance); lr = RegQueryValueExW(device_key, device_instanceW, NULL, NULL, (BYTE *)device_instance, &length); if (lr || lstrcmpiW(device_instance, instance)) { -- 2.32.0

1 0

[PATCH 1/6] uxtheme: Pass size in bytes to RegQueryValueExW().
by Zhiyi Zhang 20 Oct '21

20 Oct '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/system.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 18b93435e4c..628bd9bfdc4 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -85,7 +85,7 @@ static BOOL CALLBACK UXTHEME_broadcast_msg (HWND hWnd, LPARAM msg) static DWORD query_reg_path (HKEY hKey, LPCWSTR lpszValue, LPVOID pvData) { - DWORD dwRet, dwType, dwUnExpDataLen = MAX_PATH, dwExpDataLen; + DWORD dwRet, dwType, dwUnExpDataLen = MAX_PATH * sizeof(WCHAR), dwExpDataLen; TRACE("(hkey=%p,%s,%p)\n", hKey, debugstr_w(lpszValue), pvData); @@ -147,7 +147,7 @@ static void UXTHEME_LoadTheme(void) /* Get current theme configuration */ if(!RegOpenKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey)) { TRACE("Loading theme config\n"); - buffsize = ARRAY_SIZE(tmp); + buffsize = sizeof(tmp); if (!RegQueryValueExW(hKey, L"ThemeActive", NULL, NULL, (BYTE*)tmp, &buffsize)) { bThemeActive = (tmp[0] != '0'); } @@ -155,10 +155,10 @@ static void UXTHEME_LoadTheme(void) bThemeActive = FALSE; TRACE("Failed to get ThemeActive: %d\n", GetLastError()); } - buffsize = ARRAY_SIZE(szCurrentColor); + buffsize = sizeof(szCurrentColor); if (RegQueryValueExW(hKey, L"ColorName", NULL, NULL, (BYTE*)szCurrentColor, &buffsize)) szCurrentColor[0] = '\0'; - buffsize = ARRAY_SIZE(szCurrentSize); + buffsize = sizeof(szCurrentSize); if (RegQueryValueExW(hKey, L"SizeName", NULL, NULL, (BYTE*)szCurrentSize, &buffsize)) szCurrentSize[0] = '\0'; if (query_reg_path (hKey, L"DllName", szCurrentTheme)) -- 2.32.0

1 0

[PATCH] dinput: Avoid negating FAILED()
by Michael Stefaniuc 19 Oct '21

19 Oct '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/joystick_hid.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index a6715463690..3e515f11fec 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2720,7 +2720,7 @@ static HRESULT WINAPI hid_joystick_effect_Start( IDirectInputEffect *iface, DWOR hr = DIERR_NOTEXCLUSIVEACQUIRED; else if ((flags & DIES_NODOWNLOAD) && !impl->index) hr = DIERR_NOTDOWNLOADED; - else if ((flags & DIES_NODOWNLOAD) || !FAILED(hr = IDirectInputEffect_Download( iface ))) + else if ((flags & DIES_NODOWNLOAD) || SUCCEEDED(hr = IDirectInputEffect_Download( iface ))) { count = 1; status = HidP_InitializeReportForID( HidP_Output, effect_control->id, preparsed, @@ -2865,7 +2865,7 @@ static HRESULT WINAPI hid_joystick_effect_Download( IDirectInputEffect *iface ) hr = DIERR_NOTEXCLUSIVEACQUIRED; else if ((impl->flags & complete_mask) != complete_mask) hr = DIERR_INCOMPLETEEFFECT; - else if (!impl->index && !FAILED(hr = find_next_effect_id( impl->joystick, &impl->index ))) + else if (!impl->index && SUCCEEDED(hr = find_next_effect_id( impl->joystick, &impl->index ))) { if (!impl->type_specific_buf[0][0]) status = HIDP_STATUS_SUCCESS; else status = HidP_SetUsageValue( HidP_Output, HID_USAGE_PAGE_PID, 0, PID_USAGE_EFFECT_BLOCK_INDEX, @@ -3030,7 +3030,7 @@ static HRESULT WINAPI hid_joystick_effect_Unload( IDirectInputEffect *iface ) EnterCriticalSection( &joystick->base.crit ); if (!impl->index) hr = DI_NOEFFECT; - else if (!FAILED(hr = IDirectInputEffect_Stop( iface ))) + else if (SUCCEEDED(hr = IDirectInputEffect_Stop( iface ))) { impl->joystick->effect_inuse[impl->index - 1] = FALSE; impl->index = 0; -- 2.31.1

2 2

[PATCH v2 1/2] ws2_32: Validate pointers in select().
by Torge Matthies 19 Oct '21

19 Oct '21

The documentation says that SOCKET_ERROR is returned and the error is set to WSAEFAULT if any of the input pointers point to unmapped memory. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/ws2_32/socket.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b3dab22ae6e..7b7a985c40d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2384,6 +2384,14 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, TRACE( "read %p, write %p, except %p, timeout %p\n", read_ptr, write_ptr, except_ptr, timeout ); + if ((read_ptr && IsBadWritePtr(read_ptr, sizeof(*read_ptr))) + || (write_ptr && IsBadWritePtr(write_ptr, sizeof(*write_ptr))) + || (except_ptr && IsBadWritePtr(except_ptr, sizeof(*except_ptr)))) + { + SetLastError( WSAEFAULT ); + return -1; + } + FD_ZERO( &read ); FD_ZERO( &write ); FD_ZERO( &except ); @@ -2393,11 +2401,6 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, if (!(sync_event = get_sync_event())) return -1; - if (timeout) - params->timeout = timeout->tv_sec * -10000000 + timeout->tv_usec * -10; - else - params->timeout = TIMEOUT_INFINITE; - for (i = 0; i < read.fd_count; ++i) { params->sockets[params->count].socket = read.fd_array[i]; @@ -2428,6 +2431,18 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, return -1; } + if (timeout) + { + if (IsBadReadPtr(timeout, sizeof(*timeout))) + { + SetLastError( WSAEFAULT ); + return -1; + } + params->timeout = timeout->tv_sec * -10000000 + timeout->tv_usec * -10; + } + else + params->timeout = TIMEOUT_INFINITE; + params_size = offsetof( struct afd_poll_params, sockets[params->count] ); status = NtDeviceIoControlFile( (HANDLE)poll_socket, sync_event, NULL, NULL, &io, -- 2.33.1

3 7

[PATCH v2 1/5] winemac.drv: Simplify cursor clipping code paths.
by Tim Clem 19 Oct '21

19 Oct '21

Centralizes all clipping behavior into -startClippingCursor: and -stopClippingCursor. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> --- The current methods are confusingly named and, in some cases, broken. -updateCursorClippingState has an incomplete picture of when clipping should be enabled or disabled. Worse, -deactivateCursorClipping just disables the event tap without calling CGAssociateMouseAndMouseCursorPosition(true), so it will lock up the cursor if called while the app is active. There are two main scenarios where -updateCursorClippingState is called: when a window is being dragged and when the app is (de)activated. The drag-related calls can be removed entirely because the handlers in window.c call ClipCursor(NULL) when a window is being dragged. (This is in fact the only reason that the cursor doesn't get locked up when windows are dragged right now.) As for app (de)activation, the tap already ignores events if the app isn't active, so the -updateCursorClippingState calls there can be removed as well. (Moreover, Windows will cancel cursor clipping if the app loses focus; the next patch calls -stopClippingCursor when the app resigns active.) dlls/winemac.drv/cocoa_app.m | 52 +++++++++++------------------------- 1 file changed, 15 insertions(+), 37 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 2d18da7f99a8..806252651613 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1456,33 +1456,6 @@ - (BOOL) setCursorPosition:(CGPoint)pos return ret; } - - (void) activateCursorClipping - { - if (cursorClippingEventTap && !CGEventTapIsEnabled(cursorClippingEventTap)) - { - CGEventTapEnable(cursorClippingEventTap, TRUE); - [self setCursorPosition:NSPointToCGPoint([self flippedMouseLocation:[NSEvent mouseLocation]])]; - } - } - - - (void) deactivateCursorClipping - { - if (cursorClippingEventTap && CGEventTapIsEnabled(cursorClippingEventTap)) - { - CGEventTapEnable(cursorClippingEventTap, FALSE); - [warpRecords removeAllObjects]; - lastSetCursorPositionTime = [[NSProcessInfo processInfo] systemUptime]; - } - } - - - (void) updateCursorClippingState - { - if (clippingCursor && [NSApp isActive] && ![windowsBeingDragged count]) - [self activateCursorClipping]; - else - [self deactivateCursorClipping]; - } - - (void) updateWindowsForCursorClipping { WineWindow* window; @@ -1510,7 +1483,10 @@ - (BOOL) startClippingCursor:(CGRect)rect clippingCursor = TRUE; cursorClipRect = rect; - [self updateCursorClippingState]; + + CGEventTapEnable(cursorClippingEventTap, TRUE); + [self setCursorPosition:NSPointToCGPoint([self flippedMouseLocation:[NSEvent mouseLocation]])]; + [self updateWindowsForCursorClipping]; return TRUE; @@ -1518,12 +1494,21 @@ - (BOOL) startClippingCursor:(CGRect)rect - (BOOL) stopClippingCursor { - CGError err = CGAssociateMouseAndMouseCursorPosition(true); + CGError err; + + if (!clippingCursor) + return TRUE; + + err = CGAssociateMouseAndMouseCursorPosition(true); if (err != kCGErrorSuccess) return FALSE; clippingCursor = FALSE; - [self updateCursorClippingState]; + + CGEventTapEnable(cursorClippingEventTap, FALSE); + [warpRecords removeAllObjects]; + lastSetCursorPositionTime = [[NSProcessInfo processInfo] systemUptime]; + [self updateWindowsForCursorClipping]; return TRUE; @@ -1554,7 +1539,6 @@ - (void) window:(WineWindow*)window isBeingDragged:(BOOL)dragged [windowsBeingDragged addObject:window]; else [windowsBeingDragged removeObject:window]; - [self updateCursorClippingState]; } - (void) windowWillOrderOut:(WineWindow*)window @@ -1584,7 +1568,6 @@ - (void) handleWindowDrag:(WineWindow*)window begin:(BOOL)begin [windowsBeingDragged removeObject:window]; eventType = WINDOW_DRAG_END; } - [self updateCursorClippingState]; event = macdrv_create_event(eventType, window); if (eventType == WINDOW_DRAG_BEGIN) @@ -2161,7 +2144,6 @@ - (void) setupObservations }); } [windowsBeingDragged removeObject:window]; - [self updateCursorClippingState]; }]; if (useDragNotifications) { @@ -2305,8 +2287,6 @@ - (void)applicationDidBecomeActive:(NSNotification *)notification [self setMode:mode forDisplay:[displayID unsignedIntValue]]; } - [self updateCursorClippingState]; - [self updateFullscreenWindows]; [self adjustWindowLevels:YES]; @@ -2349,8 +2329,6 @@ - (void)applicationDidResignActive:(NSNotification *)notification macdrv_event* event; WineEventQueue* queue; - [self updateCursorClippingState]; - [self invalidateGotFocusEvents]; event = macdrv_create_event(APP_DEACTIVATED, nil); -- 2.33.0

1 4

[PATCH] msvcrt: support I width modifier in *scanf* family
by Eric Pouech 19 Oct '21

19 Oct '21

Despite what msdn states, I and I32 are supported width modifiers. V2: - better code structure - added support and tests for I32 v3: - fix 'test & copy & paste & don't test' error Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvcrt/scanf.h | 10 ++++++++-- dlls/msvcrt/tests/scanf.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 3ab2efef13d..02284379854 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -279,13 +279,19 @@ _FUNCTION_ { *(format + 2) == '4') { I64_prefix = 1; format += 2; + break; } - break; + else if (*(format + 1) == '3' && + *(format + 2) == '2') { + format += 2; + break; + } + /* fall through */ #if _MSVCR_VER == 0 || _MSVCR_VER >= 140 case 'z': +#endif if (sizeof(void *) == sizeof(LONGLONG)) I64_prefix = 1; break; -#endif default: prefix_finished = 1; } diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index e175342796b..a87b3b3d59e 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -74,6 +74,7 @@ static void test_sscanf( void ) int hour=21,min=59,sec=20; int number,number_so_far; HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + DWORD_PTR result_ptr; p_sprintf = (void *)GetProcAddress( hmod, "sprintf" ); p_sscanf = (void *)GetProcAddress( hmod, "sscanf" ); @@ -264,6 +265,45 @@ static void test_sscanf( void ) if(ret == 14) ok(!strcmp(buffer, buffer1), "got %s, expected %s\n", buffer1, buffer); + strcpy(buffer,"12345678901234"); + ret = p_sscanf(buffer, "%I64d", &result64); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ret = p_sprintf(buffer1, "%I64d", result64); + ok(ret==14 || broken(ret==10), "sprintf returned %d\n", ret); + if(ret == 14) + ok(!strcmp(buffer, buffer1), "got %s, expected %s\n", buffer1, buffer); + + result = 0; + strcpy(buffer,"0x123456789"); + ret = p_sscanf(buffer, "%I32x", &result); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(result == 0x23456789, "got %x, expected 0x23456789\n", result); + + result_ptr = 0; + strcpy(buffer,"0x87654321"); + ret = p_sscanf(buffer, "%Ix", &result_ptr); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ret = p_sprintf(buffer1, "%#Ix", result_ptr); + ok(ret==10, "sprintf returned %d\n", ret); + if(ret == 10) + ok(!strcmp(buffer, buffer1), "got %s, expected %s\n", buffer1, buffer); + + result_ptr = 0; + strcpy(buffer,"0x123456789"); + ret = p_sscanf(buffer, "%Ix", &result_ptr); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + if (sizeof(void*) == sizeof(LONGLONG)) + { + ret = p_sprintf(buffer1, "%#Ix", result_ptr); + ok(ret==11, "sprintf returned %d\n", ret); + if(ret == 11) + ok(!strcmp(buffer, buffer1), "got %s, expected %s\n", buffer1, buffer); + } + else + { + ok(result_ptr == 0x23456789, "got %x, expected 0x23456789\n", result); + } + /* Check %i according to bug 1878 */ strcpy(buffer,"123"); ret = p_sscanf(buffer, "%i", &result);

1 0

[PATCH] d3d11: Correctly handle optional arguments in OMGetDepthStencilState().
by Nikolay Sivov 19 Oct '21

19 Oct '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 11 ++++++++++ dlls/d3d11/device.c | 37 ++++++++++++++++++++++---------- dlls/d3d11/tests/d3d11.c | 10 +++++++++ 3 files changed, 47 insertions(+), 11 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index c1178749345..f4aff519745 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -5696,6 +5696,17 @@ float4 main(float4 color : COLOR) : SV_TARGET ok(tmp_ds_state == ds_state, "Got unexpected depth stencil state %p, expected %p.\n", tmp_ds_state, ds_state); ID3D10DepthStencilState_Release(tmp_ds_state); ok(stencil_ref == 3, "Got unexpected stencil ref %u.\n", stencil_ref); + /* For OMGetDepthStencilState() both arguments are optional. */ + ID3D10Device_OMGetDepthStencilState(device, NULL, NULL); + stencil_ref = 0; + ID3D10Device_OMGetDepthStencilState(device, NULL, &stencil_ref); + ok(stencil_ref == 3, "Got unexpected stencil ref %u.\n", stencil_ref); + tmp_ds_state = NULL; + ID3D10Device_OMGetDepthStencilState(device, &tmp_ds_state, NULL); + ok(stencil_ref == 3, "Got unexpected stencil ref %u.\n", stencil_ref); + ok(tmp_ds_state == ds_state, "Got unexpected depth stencil state %p, expected %p.\n", tmp_ds_state, ds_state); + ID3D10DepthStencilState_Release(tmp_ds_state); + ID3D10Device_OMGetRenderTargets(device, D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT, tmp_rtv, &tmp_dsv); for (i = 0; i < D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) { diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 248634a245d..6d125e06ace 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2216,19 +2216,25 @@ static void STDMETHODCALLTYPE d3d11_device_context_OMGetDepthStencilState(ID3D11 struct d3d11_device_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_depth_stencil_state *wined3d_state; struct d3d_depthstencil_state *state_impl; + UINT stencil_ref_tmp; TRACE("iface %p, depth_stencil_state %p, stencil_ref %p.\n", iface, depth_stencil_state, stencil_ref); wined3d_mutex_lock(); - if ((wined3d_state = wined3d_device_context_get_depth_stencil_state(context->wined3d_context, stencil_ref))) + if (!stencil_ref) stencil_ref = &stencil_ref_tmp; + wined3d_state = wined3d_device_context_get_depth_stencil_state(context->wined3d_context, stencil_ref); + if (depth_stencil_state) { - state_impl = wined3d_depth_stencil_state_get_parent(wined3d_state); - ID3D11DepthStencilState_AddRef(*depth_stencil_state = &state_impl->ID3D11DepthStencilState_iface); - } - else - { - *depth_stencil_state = NULL; + if (wined3d_state) + { + state_impl = wined3d_depth_stencil_state_get_parent(wined3d_state); + ID3D11DepthStencilState_AddRef(*depth_stencil_state = &state_impl->ID3D11DepthStencilState_iface); + } + else + { + *depth_stencil_state = NULL; + } } wined3d_mutex_unlock(); } @@ -5554,7 +5560,7 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetDepthStencilState(ID3D10Device1 ID3D10DepthStencilState **depth_stencil_state, UINT *stencil_ref) { struct d3d_device *device = impl_from_ID3D10Device(iface); - ID3D11DepthStencilState *d3d11_iface; + ID3D11DepthStencilState *d3d11_iface = NULL; TRACE("iface %p, depth_stencil_state %p, stencil_ref %p.\n", iface, depth_stencil_state, stencil_ref); @@ -5562,10 +5568,19 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetDepthStencilState(ID3D10Device1 d3d11_device_context_OMGetDepthStencilState(&device->immediate_context.ID3D11DeviceContext1_iface, &d3d11_iface, stencil_ref); + if (depth_stencil_state) + { + if (d3d11_iface) + { + *depth_stencil_state = &impl_from_ID3D11DepthStencilState(d3d11_iface)->ID3D10DepthStencilState_iface; + ID3D10DepthStencilState_AddRef(*depth_stencil_state); + } + else + *depth_stencil_state = NULL; + } + if (d3d11_iface) - *depth_stencil_state = &impl_from_ID3D11DepthStencilState(d3d11_iface)->ID3D10DepthStencilState_iface; - else - *depth_stencil_state = NULL; + ID3D11DepthStencilState_Release(d3d11_iface); } static void STDMETHODCALLTYPE d3d10_device_SOGetTargets(ID3D10Device1 *iface, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index eb8cde40dcc..e9a4cef211d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12599,6 +12599,16 @@ static void test_clear_state(void) ok(tmp_ds_state == ds_state, "Got unexpected depth stencil state %p, expected %p.\n", tmp_ds_state, ds_state); ID3D11DepthStencilState_Release(tmp_ds_state); ok(stencil_ref == 3, "Got unexpected stencil ref %u.\n", stencil_ref); + /* For OMGetDepthStencilState() both arguments are optional. */ + ID3D11DeviceContext_OMGetDepthStencilState(context, NULL, NULL); + stencil_ref = 0; + ID3D11DeviceContext_OMGetDepthStencilState(context, NULL, &stencil_ref); + ok(stencil_ref == 3, "Got unexpected stencil ref %u.\n", stencil_ref); + tmp_ds_state = NULL; + ID3D11DeviceContext_OMGetDepthStencilState(context, &tmp_ds_state, NULL); + ok(tmp_ds_state == ds_state, "Got unexpected depth stencil state %p, expected %p.\n", tmp_ds_state, ds_state); + ID3D11DepthStencilState_Release(tmp_ds_state); + ID3D11DeviceContext_OMGetRenderTargets(context, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT, tmp_rtv, &tmp_dsv); for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT - 1; ++i) { -- 2.33.0

2 1

[PATCH v2 1/3] wined3d: End transform feedback on SO buffer destruction even if the d3d buffer isn't bound.
by Zebediah Figura 19 Oct '21

19 Oct '21

From: Matteo Bruni <mbruni(a)codeweavers.com> It might still be bound in GL. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/buffer.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index d259b64bfaf..1d0d4d23cc5 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -145,12 +145,16 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu if (!buffer_gl->b.buffer_object) return; - if (context_gl->c.transform_feedback_active && resource->bind_count - && resource->bind_flags & WINED3D_BIND_STREAM_OUTPUT) + if (context_gl->c.transform_feedback_active && (resource->bind_flags & WINED3D_BIND_STREAM_OUTPUT) + && isStateDirty(&context_gl->c, STATE_STREAM_OUTPUT)) { - /* We have to make sure that transform feedback is not active - * when deleting a potentially bound transform feedback buffer. - * This may happen when the device is being destroyed. */ + /* It's illegal to (un)bind GL_TRANSFORM_FEEDBACK_BUFFER while transform + * feedback is active. Deleting a buffer implicitly unbinds it, so we + * meed to end transform feedback here if this buffer was bound. + * + * This should only be possible if STATE_STREAM_OUTPUT is dirty; if we + * do a draw call before destroying this buffer then the draw call will + * already rebind the GL target. */ WARN("Deleting buffer object for buffer %p, disabling transform feedback.\n", buffer_gl); wined3d_context_gl_end_transform_feedback(context_gl); } -- 2.33.0

3 6

[PATCH] wined3d: End transform feedback on SO buffer destruction even if the D3D buffer isn't bound.
by Henri Verbeet 19 Oct '21

19 Oct '21

From: Matteo Bruni <mbruni(a)codeweavers.com> It might still be bound in GL. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v3: - Invalidate state in wined3d_device_uninit_3d(). In some sense that's redundant, because the device is subsequently going to be destroyed. However, we now rely on STATE_STREAM_OUTPUT being invalidated during device destruction. (As shown by the test_index_buffer_offset() test.) - Avoid (deprecated) isStateDirty(). - Minor spelling fix. This supersedes patch 217693. dlls/wined3d/buffer.c | 16 ++++++++++------ dlls/wined3d/device.c | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index d259b64bfaf..854fa71aefe 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -145,12 +145,16 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu if (!buffer_gl->b.buffer_object) return; - if (context_gl->c.transform_feedback_active && resource->bind_count - && resource->bind_flags & WINED3D_BIND_STREAM_OUTPUT) - { - /* We have to make sure that transform feedback is not active - * when deleting a potentially bound transform feedback buffer. - * This may happen when the device is being destroyed. */ + if (context_gl->c.transform_feedback_active && (resource->bind_flags & WINED3D_BIND_STREAM_OUTPUT) + && wined3d_context_is_graphics_state_dirty(&context_gl->c, STATE_STREAM_OUTPUT)) + { + /* It's illegal to (un)bind GL_TRANSFORM_FEEDBACK_BUFFER while transform + * feedback is active. Deleting a buffer implicitly unbinds it, so we + * need to end transform feedback here if this buffer was bound. + * + * This should only be possible if STATE_STREAM_OUTPUT is dirty; if we + * do a draw call before destroying this buffer then the draw call will + * already rebind the GL target. */ WARN("Deleting buffer object for buffer %p, disabling transform feedback.\n", buffer_gl); wined3d_context_gl_end_transform_feedback(context_gl); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 86945485e20..1c584b93fe0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1182,7 +1182,7 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) wined3d_texture_decref(texture); } - wined3d_device_context_emit_reset_state(&device->cs->c, false); + wined3d_device_context_emit_reset_state(&device->cs->c, true); state_cleanup(state); wine_rb_clear(&device->samplers, device_free_sampler, NULL); -- 2.20.1

1 0

[PATCH v2] winex11.drv: Add VRAM size to GPU hardware information if available.
by Paul Gofman 19 Oct '21

19 Oct '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - add device local heap sizes instead of taking maximum (matches wined3d behaviour). dlls/winex11.drv/display.c | 11 +++++++++++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xrandr.c | 11 +++++++++++ 3 files changed, 23 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index bf32e82cb3e..c1d405ae951 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -464,6 +464,8 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g WCHAR *driver, LUID *gpu_luid) { static const WCHAR adapter_stringW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','A','d','a','p','t','e','r','S','t','r','i','n','g',0}; + static const WCHAR qw_mem_sizeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','q','w','M','e','m','o','r','y','S','i','z','e',0}; + static const WCHAR mem_sizeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','M','e','m','o','r','y','S','i','z','e',0}; static const WCHAR bios_stringW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','B','i','o','s','S','t','r','i','n','g',0}; static const WCHAR chip_typeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','C','h','i','p','T','y','p','e',0}; static const WCHAR dac_typeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','D','a','c','T','y','p','e',0}; @@ -566,6 +568,15 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g if (RegSetValueExW(hkey, dac_typeW, 0, REG_BINARY, (const BYTE *)ramdacW, sizeof(ramdacW))) goto done; + if (gpu->vram_size) + { + size = min(0xfff00000, gpu->vram_size); + if (RegSetValueExW(hkey, mem_sizeW, 0, REG_DWORD, (const BYTE *)&size, sizeof(size))) + goto done; + if (RegSetValueExW(hkey, qw_mem_sizeW, 0, REG_QWORD, (const BYTE *)&gpu->vram_size, sizeof(gpu->vram_size))) + goto done; + } + RegCloseKey(hkey); /* Retrieve driver value for adapters */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e82ee921830..07f83b6a5fc 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -732,6 +732,7 @@ struct x11drv_gpu UINT revision_id; /* Vulkan device UUID */ GUID vulkan_uuid; + UINT64 vram_size; }; /* Represent an adapter in EnumDisplayDevices context */ diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 8faece9023a..0ced47d4e57 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -650,8 +650,10 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro }; const struct vulkan_funcs *vulkan_funcs = get_vulkan_driver( WINE_VULKAN_DRIVER_VERSION ); VkResult (*pvkGetRandROutputDisplayEXT)( VkPhysicalDevice, Display *, RROutput, VkDisplayKHR * ); + PFN_vkGetPhysicalDeviceMemoryProperties pvkGetPhysicalDeviceMemoryProperties; PFN_vkGetPhysicalDeviceProperties2KHR pvkGetPhysicalDeviceProperties2KHR; PFN_vkEnumeratePhysicalDevices pvkEnumeratePhysicalDevices; + VkPhysicalDeviceMemoryProperties memory_properties; uint32_t device_count, device_idx, output_idx; VkPhysicalDevice *vk_physical_devices = NULL; VkPhysicalDeviceProperties2 properties2; @@ -660,6 +662,7 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro VkInstance vk_instance = NULL; VkDisplayKHR vk_display; BOOL ret = FALSE; + unsigned int i; VkResult vr; if (!vulkan_funcs) @@ -686,6 +689,7 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro LOAD_VK_FUNC(vkEnumeratePhysicalDevices) LOAD_VK_FUNC(vkGetPhysicalDeviceProperties2KHR) + LOAD_VK_FUNC(vkGetPhysicalDeviceMemoryProperties) LOAD_VK_FUNC(vkGetRandROutputDisplayEXT) #undef LOAD_VK_FUNC @@ -724,6 +728,13 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro pvkGetPhysicalDeviceProperties2KHR( vk_physical_devices[device_idx], &properties2 ); memcpy( &gpu->vulkan_uuid, id.deviceUUID, sizeof(id.deviceUUID) ); + pvkGetPhysicalDeviceMemoryProperties( vk_physical_devices[device_idx], &memory_properties ); + gpu->vram_size = 0; + for (i = 0; i < memory_properties.memoryHeapCount; ++i) + { + if (memory_properties.memoryHeaps[i].flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) + gpu->vram_size += memory_properties.memoryHeaps[i].size; + } /* Ignore Khronos vendor IDs */ if (properties2.properties.vendorID < 0x10000) { -- 2.31.1

1 0

[PATCH] winex11.drv: Add VRAM size to GPU hardware information if available.
by Paul Gofman 19 Oct '21

19 Oct '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winex11.drv/display.c | 11 +++++++++++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xrandr.c | 11 +++++++++++ 3 files changed, 23 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index bf32e82cb3e..c1d405ae951 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -464,6 +464,8 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g WCHAR *driver, LUID *gpu_luid) { static const WCHAR adapter_stringW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','A','d','a','p','t','e','r','S','t','r','i','n','g',0}; + static const WCHAR qw_mem_sizeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','q','w','M','e','m','o','r','y','S','i','z','e',0}; + static const WCHAR mem_sizeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','M','e','m','o','r','y','S','i','z','e',0}; static const WCHAR bios_stringW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','B','i','o','s','S','t','r','i','n','g',0}; static const WCHAR chip_typeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','C','h','i','p','T','y','p','e',0}; static const WCHAR dac_typeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','D','a','c','T','y','p','e',0}; @@ -566,6 +568,15 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g if (RegSetValueExW(hkey, dac_typeW, 0, REG_BINARY, (const BYTE *)ramdacW, sizeof(ramdacW))) goto done; + if (gpu->vram_size) + { + size = min(0xfff00000, gpu->vram_size); + if (RegSetValueExW(hkey, mem_sizeW, 0, REG_DWORD, (const BYTE *)&size, sizeof(size))) + goto done; + if (RegSetValueExW(hkey, qw_mem_sizeW, 0, REG_QWORD, (const BYTE *)&gpu->vram_size, sizeof(gpu->vram_size))) + goto done; + } + RegCloseKey(hkey); /* Retrieve driver value for adapters */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e82ee921830..07f83b6a5fc 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -732,6 +732,7 @@ struct x11drv_gpu UINT revision_id; /* Vulkan device UUID */ GUID vulkan_uuid; + UINT64 vram_size; }; /* Represent an adapter in EnumDisplayDevices context */ diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 8faece9023a..3ce9d930784 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -650,8 +650,10 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro }; const struct vulkan_funcs *vulkan_funcs = get_vulkan_driver( WINE_VULKAN_DRIVER_VERSION ); VkResult (*pvkGetRandROutputDisplayEXT)( VkPhysicalDevice, Display *, RROutput, VkDisplayKHR * ); + PFN_vkGetPhysicalDeviceMemoryProperties pvkGetPhysicalDeviceMemoryProperties; PFN_vkGetPhysicalDeviceProperties2KHR pvkGetPhysicalDeviceProperties2KHR; PFN_vkEnumeratePhysicalDevices pvkEnumeratePhysicalDevices; + VkPhysicalDeviceMemoryProperties memory_properties; uint32_t device_count, device_idx, output_idx; VkPhysicalDevice *vk_physical_devices = NULL; VkPhysicalDeviceProperties2 properties2; @@ -660,6 +662,7 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro VkInstance vk_instance = NULL; VkDisplayKHR vk_display; BOOL ret = FALSE; + unsigned int i; VkResult vr; if (!vulkan_funcs) @@ -686,6 +689,7 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro LOAD_VK_FUNC(vkEnumeratePhysicalDevices) LOAD_VK_FUNC(vkGetPhysicalDeviceProperties2KHR) + LOAD_VK_FUNC(vkGetPhysicalDeviceMemoryProperties) LOAD_VK_FUNC(vkGetRandROutputDisplayEXT) #undef LOAD_VK_FUNC @@ -724,6 +728,13 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro pvkGetPhysicalDeviceProperties2KHR( vk_physical_devices[device_idx], &properties2 ); memcpy( &gpu->vulkan_uuid, id.deviceUUID, sizeof(id.deviceUUID) ); + pvkGetPhysicalDeviceMemoryProperties( vk_physical_devices[device_idx], &memory_properties ); + gpu->vram_size = 0; + for (i = 0; i < memory_properties.memoryHeapCount; ++i) + { + if (memory_properties.memoryHeaps[i].flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) + gpu->vram_size = max( gpu->vram_size, memory_properties.memoryHeaps[i].size ); + } /* Ignore Khronos vendor IDs */ if (properties2.properties.vendorID < 0x10000) { -- 2.31.1

2 3

[PATCH] server: ifdefs guards for unistd.h and sys/types.h
by Craig Andrews 19 Oct '21

19 Oct '21

unistd.h and sys/types.h should have ifdef HAVE_UNISTD_H and ifdef HAVE_SYS_TYPES_H guards, respectively. These includes were added in commit 8184bcc9 Signed-off-by: Craig Andrews <candrews(a)integralblue.com> --- server/token.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/server/token.c b/server/token.c index 820a7a0e07d..aec5aca12ac 100644 --- a/server/token.c +++ b/server/token.c @@ -26,8 +26,15 @@ #include <stdio.h> #include <stdlib.h> #include <stdarg.h> + +#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> +#endif + +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif + #include "ntstatus.h" #define WIN32_NO_STATUS -- 2.32.0

2 3

[PATCH 00/11] Preparing for inline site support in dbghelp
by Eric Pouech 19 Oct '21

19 Oct '21

The following series starts implementing inline site support in dbghelp. Nothing fancy for now, just the definitions & stubs, and a couple of fixes and code improvements as well. A+ --- Eric Pouech (11): dbghelp: use wide string literals dbghelp: handle some more error conditions in SymGetTypeInfo() include/dbghelp.h: update for inline related APIs and structures dbghelp: added stubs for inline related APIs dbghelp: start implementing StackWalkEx dbgHelp: added stub implementation of SymFromInlineContext(W) dbghelp: added stub implementations of SymGetLineFromInlineContext(W) dbghelp: added stubs implementation for the SymSetScope* functions dbghelp: improved error handling in SymSetContext() dbghelp: factorize SymUnloadModule and SymUnloadModule64 dbghelp/dwarf: properly handle error cases while computing frame_cfa dlls/dbghelp/dbghelp.c | 63 +++++++++++++++++++++----- dlls/dbghelp/dbghelp.spec | 12 ++++- dlls/dbghelp/dbghelp_private.h | 1 - dlls/dbghelp/dwarf.c | 4 +- dlls/dbghelp/elf_module.c | 8 +--- dlls/dbghelp/macho_module.c | 15 +++---- dlls/dbghelp/minidump.c | 3 +- dlls/dbghelp/module.c | 43 +++++------------- dlls/dbghelp/path.c | 19 +++----- dlls/dbghelp/stack.c | 75 +++++++++++++++++++++++++++++++ dlls/dbghelp/symbol.c | 82 ++++++++++++++++++++++++++-------- dlls/dbghelp/type.c | 3 ++ include/dbghelp.h | 53 +++++++++++++++++++++- 13 files changed, 283 insertions(+), 98 deletions(-)

1 11

[PATCH] msvcrt: support I width modifier in *scanf* family
by Eric Pouech 19 Oct '21

19 Oct '21

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvcrt/scanf.h | 4 ++-- dlls/msvcrt/tests/scanf.c | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 3ab2efef13d..c4697da0c44 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -280,12 +280,12 @@ _FUNCTION_ { I64_prefix = 1; format += 2; } - break; + /* fall through */ #if _MSVCR_VER == 0 || _MSVCR_VER >= 140 case 'z': if (sizeof(void *) == sizeof(LONGLONG)) I64_prefix = 1; - break; #endif + break; default: prefix_finished = 1; } diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index e175342796b..ea897c3e09a 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -74,6 +74,7 @@ static void test_sscanf( void ) int hour=21,min=59,sec=20; int number,number_so_far; HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + DWORD_PTR result_ptr; p_sprintf = (void *)GetProcAddress( hmod, "sprintf" ); p_sscanf = (void *)GetProcAddress( hmod, "sscanf" ); @@ -264,6 +265,31 @@ static void test_sscanf( void ) if(ret == 14) ok(!strcmp(buffer, buffer1), "got %s, expected %s\n", buffer1, buffer); + strcpy(buffer,"12345678901234"); + ret = p_sscanf(buffer, "%I64d", &result64); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ret = p_sprintf(buffer1, "%I64d", result64); + ok(ret==14 || broken(ret==10), "sprintf returned %d\n", ret); + if(ret == 14) + ok(!strcmp(buffer, buffer1), "got %s, expected %s\n", buffer1, buffer); + + strcpy(buffer,"0x123456789"); + ret = p_sscanf(buffer, "%Ix", &result_ptr); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ret = p_sprintf(buffer1, "%#Ix", result_ptr); + if (sizeof(void*) == sizeof(LONGLONG)) + { + ok(ret==11, "sprintf returned %d\n", ret); + if(ret == 11) + ok(!strcmp(buffer, buffer1), "got %s, expected %s\n", buffer1, buffer); + } + else + { + ok(ret==10, "sprintf returned %d\n", ret); + if(ret == 10) + ok(!strcmp("0x23456789", buffer1), "got %s, expected %s\n", buffer1, buffer); + } + /* Check %i according to bug 1878 */ strcpy(buffer,"123"); ret = p_sscanf(buffer, "%i", &result);

1 0

[PATCH v2 1/8] jscript: Implement proxy objects along with a private interface.
by Gabriel Ivăncescu 19 Oct '21

19 Oct '21

Native mshtml objects act like JS objects in IE9 modes and up (the JS engine is implemented in mshtml). This implements proxy JS objects for certain dispatch objects that export a new private (internal to Wine) interface in versions ES5 and up, to achieve the same behavior. It delegates as much as possible to mshtml to implement all quirks there. Props are queried by the underlying dispatch and accesses to them forwarded to the dispatch object. Since it's purely internal, the private interface is not part of any typelib, and for simplicity, it extends (inherits from) IDispatchEx, so we can just cast it as needed. Given certain conditions, we query IDispatch objects on demand for the interface. If it's available, we either create a JS proxy object that is associated with the dispatch object exposing the interface, or re-acquire another one (possibly dangling). It is also associated on the other end, so that we keep a 1:1 mapping between the JS proxy object and the actual dispatch object, to avoid having multiple JS proxy objects for the same mshtml object (which would result in different dispids on them, and subtle bugs). This keeps them both in sync at all times, on demand, without having to pre-create any objects, and deals with dynamic props and such automatically. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- There's only one caveat here: since the JS proxy object references the dispatch object, while the dispatch object is also associated to the JS proxy object, the JS proxy object must be kept alive even when its refcount is zero. We can't hold a reference from the dispatch object, because that would create a circular reference. In effect, we *need* to know *when* the JS proxy object has no references from jscript part, to release the dispatch object. But the dispatch object itself might still remain alive (if kept alive by mshtml refs), and the JS proxy object must also remain associated in this case, hence we keep it alive even when refcount == 0, but remove the proxy association on its side. This is slightly ugly, but it is the best approach I could think of, to avoid bugs or having to rely on more complicated hash table lookups. Keep in mind that we have to keep the JS proxy object alive as long as it is associated with the dispatch object, because it could have proxy props retrieved, and they must always match among multiple references of this object, if they refer to the same underlying mshtml object (we can't have different dispids or "reset" them). dlls/jscript/dispex.c | 210 +++++++++++++++++++++++++++++++++++--- dlls/jscript/engine.c | 17 ++- dlls/jscript/enumerator.c | 10 +- dlls/jscript/function.c | 98 +++++++++++++++++- dlls/jscript/jscript.h | 27 +++++ dlls/jscript/jsutils.c | 21 ++-- dlls/jscript/jsval.h | 2 +- dlls/jscript/object.c | 22 ++-- dlls/jscript/vbarray.c | 4 +- 9 files changed, 368 insertions(+), 43 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index c7e4ba9..0b834d8 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -33,6 +33,7 @@ static const GUID GUID_JScriptTypeInfo = {0xc59c6b12,0xf6c1,0x11cf,{0x88,0x35,0x typedef enum { PROP_JSVAL, PROP_BUILTIN, + PROP_PROXY, PROP_PROTREF, PROP_ACCESSOR, PROP_DELETED, @@ -50,6 +51,10 @@ struct _dispex_prop_t { const builtin_prop_t *p; DWORD ref; unsigned idx; + struct { + DISPID id; + DWORD flags; + } proxy; struct { jsdisp_t *getter; jsdisp_t *setter; @@ -199,6 +204,30 @@ static inline dispex_prop_t* alloc_prop(jsdisp_t *This, const WCHAR *name, prop_ return prop; } +static inline dispex_prop_t* alloc_proxy_prop(jsdisp_t *This, dispex_prop_t *prop, const WCHAR *name, DISPID id) +{ + unsigned flags, prop_flags; + + flags = prop_flags = This->proxy->lpVtbl->GetPropFlags(This->proxy, id); + + if(flags & PROPF_METHOD) + flags |= PROPF_WRITABLE | PROPF_CONFIGURABLE; + flags &= PROPF_ALL; + + if(prop) { + prop->type = PROP_PROXY; + prop->flags = flags; + }else { + prop = alloc_prop(This, name, PROP_PROXY, flags); + if(!prop) + return NULL; + } + + prop->u.proxy.id = id; + prop->u.proxy.flags = prop_flags; + return prop; +} + static dispex_prop_t *alloc_protref(jsdisp_t *This, const WCHAR *name, DWORD ref) { dispex_prop_t *ret; @@ -235,6 +264,23 @@ static HRESULT find_prop_name(jsdisp_t *This, unsigned hash, const WCHAR *name, pos = This->props[pos].bucket_next; } + if(This->proxy) { + DISPID id; + + if(FAILED(IDispatchEx_GetDispID((IDispatchEx*)This->proxy, (WCHAR*)name, make_grfdex(This->ctx, fdexNameCaseSensitive), &id))) + id = DISPID_UNKNOWN; + if(id == DISPID_UNKNOWN) { + *ret = NULL; + return S_OK; + } + prop = alloc_proxy_prop(This, NULL, name, id); + if(!prop) + return E_OUTOFMEMORY; + + *ret = prop; + return S_OK; + } + builtin = find_builtin_prop(This, name); if(builtin) { unsigned flags = builtin->flags; @@ -314,11 +360,28 @@ static HRESULT find_prop_name_prot(jsdisp_t *This, unsigned hash, const WCHAR *n static HRESULT ensure_prop_name(jsdisp_t *This, const WCHAR *name, DWORD create_flags, dispex_prop_t **ret) { + unsigned hash = string_hash(name); dispex_prop_t *prop; HRESULT hres; - hres = find_prop_name_prot(This, string_hash(name), name, &prop); + hres = find_prop_name_prot(This, hash, name, &prop); if(SUCCEEDED(hres) && (!prop || prop->type == PROP_DELETED)) { + if(This->proxy) { + DWORD fdex = make_grfdex(This->ctx, fdexNameEnsure | fdexNameCaseSensitive); + DISPID id; + + TRACE("creating proxy prop %s\n", debugstr_w(name)); + + hres = IDispatchEx_GetDispID((IDispatchEx*)This->proxy, (WCHAR*)name, fdex, &id); + if(FAILED(hres)) + return hres; + prop = alloc_proxy_prop(This, prop, name, id); + if(!prop) + return E_OUTOFMEMORY; + *ret = prop; + return S_OK; + } + TRACE("creating prop %s flags %x\n", debugstr_w(name), create_flags); if(prop) { @@ -356,7 +419,7 @@ static IDispatch *get_this(DISPPARAMS *dp) return NULL; } -static HRESULT convert_params(const DISPPARAMS *dp, jsval_t *buf, unsigned *argc, jsval_t **ret) +static HRESULT convert_params(script_ctx_t *ctx, const DISPPARAMS *dp, jsval_t *buf, unsigned *argc, jsval_t **ret) { jsval_t *argv; unsigned cnt; @@ -374,7 +437,7 @@ static HRESULT convert_params(const DISPPARAMS *dp, jsval_t *buf, unsigned *argc } for(i = 0; i < cnt; i++) { - hres = variant_to_jsval(dp->rgvarg+dp->cArgs-i-1, argv+i); + hres = variant_to_jsval(ctx, dp->rgvarg+dp->cArgs-i-1, argv+i); if(FAILED(hres)) { while(i--) jsval_release(argv[i]); @@ -419,6 +482,23 @@ static HRESULT prop_get(jsdisp_t *This, dispex_prop_t *prop, jsval_t *r) *r = jsval_obj(obj); } break; + case PROP_PROXY: + if(!(prop->u.proxy.flags & PROPF_METHOD)) { + hres = disp_propget(This->ctx, (IDispatch*)prop_obj->proxy, prop->u.proxy.id, r); + }else { + jsdisp_t *obj; + + hres = create_proxy_function(This->ctx, (IDispatchEx*)prop_obj->proxy, prop->u.proxy.id, prop->u.proxy.flags, &obj); + if(FAILED(hres)) + break; + + prop->type = PROP_JSVAL; + prop->u.val = jsval_obj(obj); + + jsdisp_addref(obj); + *r = jsval_obj(obj); + } + break; case PROP_JSVAL: hres = jsval_copy(prop->u.val, r); break; @@ -438,6 +518,8 @@ static HRESULT prop_get(jsdisp_t *This, dispex_prop_t *prop, jsval_t *r) ERR("type %d\n", prop->type); return E_FAIL; } + if(SUCCEEDED(hres)) + hres = convert_to_proxy(This->ctx, r); if(FAILED(hres)) { TRACE("fail %08x\n", hres); @@ -472,6 +554,10 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val) return S_OK; } return prop->u.p->setter(This->ctx, This, val); + case PROP_PROXY: + if(!(prop->flags & PROPF_WRITABLE)) + return S_OK; + return disp_propput(This->ctx, (IDispatch*)This->proxy, prop->u.proxy.id, val); case PROP_PROTREF: case PROP_DELETED: if(!This->extensible) @@ -521,7 +607,8 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t HRESULT hres; switch(prop->type) { - case PROP_BUILTIN: { + case PROP_BUILTIN: + case PROP_PROXY: if(flags == DISPATCH_CONSTRUCT && (prop->flags & PROPF_METHOD)) { WARN("%s is not a constructor\n", debugstr_w(prop->name)); return E_INVALIDARG; @@ -530,6 +617,17 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t if(prop->name || This->builtin_info->class != JSCLASS_FUNCTION) { vdisp_t vthis; + if(prop->type == PROP_PROXY) { + jsdisp_t *jsdisp = to_jsdisp(jsthis); + if(jsdisp) + jsthis = (IDispatch*)jsdisp->proxy; + if(jsthis != (IDispatch*)This->proxy) { + WARN("Incompatible this %p for proxy %p, id %d\n", jsthis, This->proxy, prop->u.proxy.id); + return E_UNEXPECTED; + } + return disp_call(This->ctx, jsthis, prop->u.proxy.id, flags & ~DISPATCH_JSCRIPT_INTERNAL_MASK, argc, argv, r); + } + if(This->builtin_info->class != JSCLASS_FUNCTION && prop->u.p->invoke != JSGlobal_eval) flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; if(jsthis) @@ -542,8 +640,9 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t /* Function object calls are special case */ hres = Function_invoke(This, jsthis, flags, argc, argv, r); } + if(SUCCEEDED(hres)) + hres = convert_to_proxy(This->ctx, r); return hres; - } case PROP_PROTREF: return invoke_prop_func(This->prototype, jsthis ? jsthis : (IDispatch *)&This->IDispatchEx_iface, This->prototype->props+prop->u.ref, flags, argc, argv, r, caller); @@ -1563,7 +1662,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc jsval_t *argv, buf[6], r; unsigned argc; - hres = convert_params(pdp, buf, &argc, &argv); + hres = convert_params(This->ctx, pdp, buf, &argc, &argv); if(FAILED(hres)) break; @@ -1601,7 +1700,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc break; } - hres = variant_to_jsval(pdp->rgvarg+i, &val); + hres = variant_to_jsval(This->ctx, pdp->rgvarg+i, &val); if(FAILED(hres)) break; @@ -1618,8 +1717,19 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return leave_script(This->ctx, hres); } -static HRESULT delete_prop(dispex_prop_t *prop, BOOL *ret) +static HRESULT delete_prop(jsdisp_t *prop_obj, dispex_prop_t *prop, BOOL *ret) { + if(prop->type == PROP_PROXY) { + BOOL deleted; + HRESULT hres = prop_obj->proxy->lpVtbl->DeleteProp(prop_obj->proxy, prop->u.proxy.id, &deleted); + if(SUCCEEDED(hres)) { + *ret = (hres == S_OK); + if(deleted) + prop->type = PROP_DELETED; + } + return hres; + } + if(!(prop->flags & PROPF_CONFIGURABLE)) { *ret = FALSE; return S_OK; @@ -1656,7 +1766,7 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bst return S_OK; } - return delete_prop(prop, &b); + return delete_prop(This, prop, &b); } static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID id) @@ -1673,7 +1783,7 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID return DISP_E_MEMBERNOTFOUND; } - return delete_prop(prop, &b); + return delete_prop(This, prop, &b); } static HRESULT WINAPI DispatchEx_GetMemberProperties(IDispatchEx *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex) @@ -1808,10 +1918,73 @@ HRESULT create_dispex(script_ctx_t *ctx, const builtin_info_t *builtin_info, jsd return S_OK; } +static const builtin_info_t proxy_dispex_info = { + JSCLASS_OBJECT, + {NULL, NULL, 0}, + 0, NULL, + NULL, + NULL +}; + +HRESULT convert_to_proxy(script_ctx_t *ctx, jsval_t *val) +{ + IWineDispatchProxyPrivate *proxy; + jsdisp_t **jsdisp_ref; + IDispatch *obj; + HRESULT hres; + + if(ctx->version < SCRIPTLANGUAGEVERSION_ES5 || !val || !is_object_instance(*val)) + return S_OK; + obj = get_object(*val); + if(!obj || to_jsdisp(obj)) + return S_OK; + + if(FAILED(IDispatch_QueryInterface(obj, &IID_IWineDispatchProxyPrivate, (void**)&proxy)) || !proxy) + return S_OK; + IDispatch_Release(obj); + + jsdisp_ref = proxy->lpVtbl->GetProxyFieldRef(proxy); + + if(*jsdisp_ref) { + /* Re-acquire the proxy if it's an old dangling proxy */ + if((*jsdisp_ref)->ref == 0) + (*jsdisp_ref)->proxy = proxy; + else + IDispatchEx_Release((IDispatchEx*)proxy); + + *val = jsval_obj(jsdisp_addref(*jsdisp_ref)); + return S_OK; + } + + hres = create_dispex(ctx, &proxy_dispex_info, ctx->object_prototype, jsdisp_ref); + if(FAILED(hres)) { + IDispatchEx_Release((IDispatchEx*)proxy); + return hres; + } + + (*jsdisp_ref)->props[0].type = PROP_PROXY; + (*jsdisp_ref)->props[0].u.proxy.id = DISPID_VALUE; + (*jsdisp_ref)->props[0].u.proxy.flags = proxy->lpVtbl->GetPropFlags(proxy, DISPID_VALUE); + (*jsdisp_ref)->proxy = proxy; + + *val = jsval_obj(*jsdisp_ref); + return S_OK; +} + void jsdisp_free(jsdisp_t *obj) { dispex_prop_t *prop; + /* If we are a proxy, stay alive and keep it associated with the disp, since + we can be re-acquired at some later point. When the underlying disp is + actually destroyed, it should let go and destroy us for real. */ + if(obj->proxy) { + IDispatchEx *disp = (IDispatchEx*)obj->proxy; + obj->proxy = NULL; + IDispatchEx_Release(disp); + return; + } + TRACE("(%p)\n", obj); for(prop = obj->props; prop < obj->props+obj->prop_cnt; prop++) { @@ -1931,6 +2104,8 @@ HRESULT jsdisp_call_value(jsdisp_t *jsfunc, IDispatch *jsthis, WORD flags, unsig if(is_class(jsfunc, JSCLASS_FUNCTION)) { hres = Function_invoke(jsfunc, jsthis, flags, argc, argv, r); + }else if(jsfunc->proxy) { + hres = disp_call_value(jsfunc->ctx, (IDispatch*)jsfunc->proxy, jsthis, flags, argc, argv, r); }else { vdisp_t vdisp; @@ -1944,6 +2119,8 @@ HRESULT jsdisp_call_value(jsdisp_t *jsfunc, IDispatch *jsthis, WORD flags, unsig hres = jsfunc->builtin_info->value_prop.invoke(jsfunc->ctx, &vdisp, flags, argc, argv, r); vdisp_release(&vdisp); } + if(SUCCEEDED(hres)) + hres = convert_to_proxy(jsfunc->ctx, r); return hres; } @@ -2082,7 +2259,7 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, uns heap_free(dp.rgvarg); if(SUCCEEDED(hres) && ret) - hres = variant_to_jsval(&retv, ret); + hres = variant_to_jsval(ctx, &retv, ret); VariantClear(&retv); return hres; } @@ -2148,7 +2325,7 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W if(!r) return S_OK; - hres = variant_to_jsval(&retv, r); + hres = variant_to_jsval(ctx, &retv, r); VariantClear(&retv); return hres; } @@ -2316,7 +2493,7 @@ HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t *val V_VT(&var) = VT_EMPTY; hres = disp_invoke(ctx, disp, id, INVOKE_PROPERTYGET, &dp, &var); if(SUCCEEDED(hres)) { - hres = variant_to_jsval(&var, val); + hres = variant_to_jsval(ctx, &var, val); VariantClear(&var); } return hres; @@ -2335,7 +2512,7 @@ HRESULT jsdisp_delete_idx(jsdisp_t *obj, DWORD idx) if(FAILED(hres) || !prop) return hres; - hres = delete_prop(prop, &b); + hres = delete_prop(obj, prop, &b); if(FAILED(hres)) return hres; return b ? S_OK : JS_E_INVALID_ACTION; @@ -2353,7 +2530,7 @@ HRESULT disp_delete(IDispatch *disp, DISPID id, BOOL *ret) prop = get_prop(jsdisp, id); if(prop) - hres = delete_prop(prop, ret); + hres = delete_prop(jsdisp, prop, ret); else hres = DISP_E_MEMBERNOTFOUND; @@ -2424,7 +2601,7 @@ HRESULT disp_delete_name(script_ctx_t *ctx, IDispatch *disp, jsstr_t *name, BOOL hres = find_prop_name(jsdisp, string_hash(ptr), ptr, &prop); if(prop) { - hres = delete_prop(prop, ret); + hres = delete_prop(jsdisp, prop, ret); }else { *ret = TRUE; hres = S_OK; @@ -2480,6 +2657,7 @@ HRESULT jsdisp_get_own_property(jsdisp_t *obj, const WCHAR *name, BOOL flags_onl switch(prop->type) { case PROP_BUILTIN: + case PROP_PROXY: case PROP_JSVAL: desc->mask |= PROPF_WRITABLE; desc->explicit_value = TRUE; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 47b4e56..4ff4297 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -491,15 +491,24 @@ static HRESULT disp_cmp(IDispatch *disp1, IDispatch *disp2, BOOL *ret) { IObjectIdentity *identity; IUnknown *unk1, *unk2; + jsdisp_t *jsdisp; HRESULT hres; - if(disp1 == disp2) { - *ret = TRUE; + if(!disp1 || !disp2) { + *ret = (disp1 == disp2); return S_OK; } - if(!disp1 || !disp2) { - *ret = FALSE; + jsdisp = to_jsdisp(disp1); + if(jsdisp && jsdisp->proxy) + disp1 = (IDispatch*)jsdisp->proxy; + + jsdisp = to_jsdisp(disp2); + if(jsdisp && jsdisp->proxy) + disp2 = (IDispatch*)jsdisp->proxy; + + if(disp1 == disp2) { + *ret = TRUE; return S_OK; } diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c index dea1940..eb6baf6 100644 --- a/dlls/jscript/enumerator.c +++ b/dlls/jscript/enumerator.c @@ -48,7 +48,7 @@ static inline EnumeratorInstance *enumerator_this(vdisp_t *jsthis) return is_vclass(jsthis, JSCLASS_ENUMERATOR) ? enumerator_from_vdisp(jsthis) : NULL; } -static inline HRESULT enumvar_get_next_item(EnumeratorInstance *This) +static inline HRESULT enumvar_get_next_item(EnumeratorInstance *This, script_ctx_t *ctx) { HRESULT hres; VARIANT nextitem; @@ -64,7 +64,7 @@ static inline HRESULT enumvar_get_next_item(EnumeratorInstance *This) hres = IEnumVARIANT_Next(This->enumvar, 1, &nextitem, NULL); if (hres == S_OK) { - hres = variant_to_jsval(&nextitem, &This->item); + hres = variant_to_jsval(ctx, &nextitem, &This->item); VariantClear(&nextitem); if (FAILED(hres)) { @@ -138,7 +138,7 @@ static HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla return hres; This->atend = FALSE; - hres = enumvar_get_next_item(This); + hres = enumvar_get_next_item(This, ctx); if(FAILED(hres)) return hres; } @@ -161,7 +161,7 @@ static HRESULT Enumerator_moveNext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag if (This->enumvar) { - hres = enumvar_get_next_item(This); + hres = enumvar_get_next_item(This, ctx); if (FAILED(hres)) return hres; } @@ -276,7 +276,7 @@ static HRESULT create_enumerator(script_ctx_t *ctx, jsval_t *argv, jsdisp_t **re enumerator->enumvar = enumvar; enumerator->atend = !enumvar; - hres = enumvar_get_next_item(enumerator); + hres = enumvar_get_next_item(enumerator, ctx); if (FAILED(hres)) { jsdisp_release(&enumerator->dispex); diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 318d6be..7cd83a3 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -54,6 +54,12 @@ typedef struct { const WCHAR *name; } NativeFunction; +typedef struct { + FunctionInstance function; + IDispatchEx *proxy; + DISPID id; +} ProxyFunction; + typedef struct { FunctionInstance function; FunctionInstance *target; @@ -340,7 +346,7 @@ static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un TRACE("\n"); - if(!(function = function_this(jsthis)) && (jsthis->flags & VDISP_JSDISP)) + if(!(function = function_this(jsthis)) && is_jsdisp(jsthis) && !get_jsdisp(jsthis)->proxy) return JS_E_FUNCTION_EXPECTED; if(argc) { @@ -707,6 +713,96 @@ HRESULT create_builtin_constructor(script_ctx_t *ctx, builtin_invoke_t value_pro return S_OK; } +static HRESULT ProxyFunction_call(script_ctx_t *ctx, FunctionInstance *func, IDispatch *this_disp, unsigned flags, + unsigned argc, jsval_t *argv, jsval_t *r) +{ + ProxyFunction *function = (ProxyFunction*)func; + jsdisp_t *jsdisp; + + if(!this_disp) + this_disp = lookup_global_host(ctx); + + jsdisp = to_jsdisp(this_disp); + if(jsdisp) + this_disp = (IDispatch*)jsdisp->proxy; + if(this_disp != (IDispatch*)function->proxy) { + WARN("Incompatible this %p for proxy %p, id %d\n", this_disp, function->proxy, function->id); + return E_UNEXPECTED; + } + + return disp_call(ctx, this_disp, function->id, flags & ~DISPATCH_JSCRIPT_INTERNAL_MASK, argc, argv, r); +} + +static HRESULT ProxyFunction_toString(FunctionInstance *func, jsstr_t **ret) +{ + ProxyFunction *function = (ProxyFunction*)func; + BSTR name = NULL; + DWORD name_len; + jsstr_t *str; + WCHAR *ptr; + + static const WCHAR proxy_prefixW[] = L"\nfunction "; + static const WCHAR proxy_suffixW[] = L"() {\n [native code]\n}\n"; + + if(FAILED(IDispatchEx_GetMemberName(function->proxy, function->id, &name))) + name = NULL; + + name_len = name ? SysStringLen(name) : 0; + str = jsstr_alloc_buf(ARRAY_SIZE(proxy_prefixW) + ARRAY_SIZE(proxy_suffixW) + name_len - 2, &ptr); + if(!str) + return E_OUTOFMEMORY; + + memcpy(ptr, proxy_prefixW, sizeof(proxy_prefixW)); + ptr += ARRAY_SIZE(proxy_prefixW) - 1; + memcpy(ptr, name, name_len*sizeof(WCHAR)); + ptr += name_len; + memcpy(ptr, proxy_suffixW, sizeof(proxy_suffixW)); + + SysFreeString(name); + *ret = str; + return S_OK; +} + +static function_code_t *ProxyFunction_get_code(FunctionInstance *func) +{ + return NULL; +} + +static void ProxyFunction_destructor(FunctionInstance *func) +{ + ProxyFunction *function = (ProxyFunction*)func; + IDispatchEx_Release(function->proxy); +} + +static const function_vtbl_t ProxyFunctionVtbl = { + ProxyFunction_call, + ProxyFunction_toString, + ProxyFunction_get_code, + ProxyFunction_destructor +}; + +HRESULT create_proxy_function(script_ctx_t *ctx, IDispatchEx *proxy, DISPID id, DWORD flags, jsdisp_t **ret) +{ + ProxyFunction *function; + HRESULT hres; + + hres = create_function(ctx, NULL, &ProxyFunctionVtbl, sizeof(ProxyFunction), flags, FALSE, NULL, (void**)&function); + if(FAILED(hres)) + return hres; + + if(FAILED(hres)) { + jsdisp_release(&function->function.dispex); + return hres; + } + + function->proxy = proxy; + function->id = id; + IDispatchEx_AddRef(function->proxy); + + *ret = &function->function.dispex; + return S_OK; +} + static HRESULT InterpretedFunction_call(script_ctx_t *ctx, FunctionInstance *func, IDispatch *this_obj, unsigned flags, unsigned argc, jsval_t *argv, jsval_t *r) { diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 90a5e15..59f7cfc 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -47,6 +47,29 @@ #define SCRIPTLANGUAGEVERSION_ES5 0x102 #define SCRIPTLANGUAGEVERSION_ES6 0x103 +/* + * This is Wine jscript extension, used for mshtml objects so they act like JS objects. + * Extends IDispatchEx. + * + * NOTE: Keep in sync with mshtml_private.h in mshtml.dll + */ +DEFINE_GUID(IID_IWineDispatchProxyPrivate, 0xd359f2fe,0x5531,0x741b,0xa4,0x1a,0x5c,0xf9,0x2e,0xdc,0x97,0x1b); +typedef struct _IWineDispatchProxyPrivate IWineDispatchProxyPrivate; + +typedef struct { + IDispatchExVtbl dispex; + void* (STDMETHODCALLTYPE *GetProxyFieldRef)(IWineDispatchProxyPrivate *This); + DWORD (STDMETHODCALLTYPE *GetPropFlags)(IWineDispatchProxyPrivate *This, DISPID id); + HRESULT (STDMETHODCALLTYPE *DeleteProp)(IWineDispatchProxyPrivate *This, DISPID id, BOOL *deleted); + HRESULT (STDMETHODCALLTYPE *ToString)(IWineDispatchProxyPrivate *This, BSTR *string); +} IWineDispatchProxyPrivateVtbl; + +struct _IWineDispatchProxyPrivate { + const IWineDispatchProxyPrivateVtbl *lpVtbl; +}; + + + typedef struct _jsval_t jsval_t; typedef struct _jsstr_t jsstr_t; typedef struct _jsexcept_t jsexcept_t; @@ -91,6 +114,7 @@ typedef struct jsdisp_t jsdisp_t; extern HINSTANCE jscript_hinstance DECLSPEC_HIDDEN; HRESULT get_dispatch_typeinfo(ITypeInfo**) DECLSPEC_HIDDEN; +/* NOTE: Keep in sync with mshtml_private.h in mshtml.dll */ #define PROPF_ARGMASK 0x00ff #define PROPF_METHOD 0x0100 #define PROPF_CONSTR 0x0200 @@ -253,6 +277,7 @@ struct jsdisp_t { BOOL extensible; jsdisp_t *prototype; + IWineDispatchProxyPrivate *proxy; const builtin_info_t *builtin_info; }; @@ -302,6 +327,7 @@ enum jsdisp_enum_type { HRESULT create_dispex(script_ctx_t*,const builtin_info_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT init_dispex(jsdisp_t*,script_ctx_t*,const builtin_info_t*,jsdisp_t*) DECLSPEC_HIDDEN; HRESULT init_dispex_from_constr(jsdisp_t*,script_ctx_t*,const builtin_info_t*,jsdisp_t*) DECLSPEC_HIDDEN; +HRESULT convert_to_proxy(script_ctx_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT disp_call_value(script_ctx_t*,IDispatch*,IDispatch*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; @@ -333,6 +359,7 @@ HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,cons jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_builtin_constructor(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; +HRESULT create_proxy_function(script_ctx_t*,IDispatchEx*,DISPID,DWORD,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT Function_invoke(jsdisp_t*,IDispatch*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT Function_value(script_ctx_t*,vdisp_t*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 3c3cd01..1b1b904 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -246,7 +246,7 @@ HRESULT jsval_copy(jsval_t v, jsval_t *r) return E_FAIL; } -HRESULT variant_to_jsval(VARIANT *var, jsval_t *r) +HRESULT variant_to_jsval(script_ctx_t *ctx, VARIANT *var, jsval_t *r) { if(V_VT(var) == (VT_VARIANT|VT_BYREF)) var = V_VARIANTREF(var); @@ -285,7 +285,7 @@ HRESULT variant_to_jsval(VARIANT *var, jsval_t *r) if(V_DISPATCH(var)) IDispatch_AddRef(V_DISPATCH(var)); *r = jsval_disp(V_DISPATCH(var)); - return S_OK; + return convert_to_proxy(ctx, r); } case VT_I1: *r = jsval_number(V_I1(var)); @@ -329,7 +329,7 @@ HRESULT variant_to_jsval(VARIANT *var, jsval_t *r) hres = IUnknown_QueryInterface(V_UNKNOWN(var), &IID_IDispatch, (void**)&disp); if(SUCCEEDED(hres)) { *r = jsval_disp(disp); - return S_OK; + return convert_to_proxy(ctx, r); } }else { *r = jsval_disp(NULL); @@ -343,6 +343,8 @@ HRESULT variant_to_jsval(VARIANT *var, jsval_t *r) HRESULT jsval_to_variant(jsval_t val, VARIANT *retv) { + IDispatch *disp; + switch(jsval_type(val)) { case JSV_UNDEFINED: V_VT(retv) = VT_EMPTY; @@ -352,9 +354,14 @@ HRESULT jsval_to_variant(jsval_t val, VARIANT *retv) return S_OK; case JSV_OBJECT: V_VT(retv) = VT_DISPATCH; - if(get_object(val)) - IDispatch_AddRef(get_object(val)); - V_DISPATCH(retv) = get_object(val); + disp = get_object(val); + if(disp) { + jsdisp_t *jsdisp = to_jsdisp(disp); + if(jsdisp && jsdisp->proxy) + disp = (IDispatch*)jsdisp->proxy; + IDispatch_AddRef(disp); + } + V_DISPATCH(retv) = disp; return S_OK; case JSV_STRING: V_VT(retv) = VT_BSTR; @@ -884,7 +891,7 @@ HRESULT variant_change_type(script_ctx_t *ctx, VARIANT *dst, VARIANT *src, VARTY jsval_t val; HRESULT hres; - hres = variant_to_jsval(src, &val); + hres = variant_to_jsval(ctx, src, &val); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jsval.h b/dlls/jscript/jsval.h index 9f451b1..c79bef4 100644 --- a/dlls/jscript/jsval.h +++ b/dlls/jscript/jsval.h @@ -241,7 +241,7 @@ static inline BOOL get_bool(jsval_t v) return __JSVAL_BOOL(v); } -HRESULT variant_to_jsval(VARIANT*,jsval_t*) DECLSPEC_HIDDEN; +HRESULT variant_to_jsval(script_ctx_t*,VARIANT*,jsval_t*) DECLSPEC_HIDDEN; HRESULT jsval_to_variant(jsval_t,VARIANT*) DECLSPEC_HIDDEN; void jsval_release(jsval_t) DECLSPEC_HIDDEN; HRESULT jsval_copy(jsval_t,jsval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 169b47c..c107ed7 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -29,6 +29,8 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u { jsdisp_t *jsdisp; const WCHAR *str; + BSTR bstr = NULL; + jsstr_t *ret; /* Keep in sync with jsclass_t enum */ static const WCHAR *names[] = { @@ -54,9 +56,17 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u TRACE("\n"); + if(!r) + return S_OK; + jsdisp = get_jsdisp(jsthis); if(!jsdisp) { str = L"[object Object]"; + }else if(jsdisp->proxy) { + HRESULT hres = jsdisp->proxy->lpVtbl->ToString(jsdisp->proxy, &bstr); + if(FAILED(hres)) + return hres; + str = bstr; }else if(names[jsdisp->builtin_info->class]) { str = names[jsdisp->builtin_info->class]; }else { @@ -65,13 +75,11 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u return E_FAIL; } - if(r) { - jsstr_t *ret; - ret = jsstr_alloc(str); - if(!ret) - return E_OUTOFMEMORY; - *r = jsval_string(ret); - } + ret = jsstr_alloc(str); + SysFreeString(bstr); + if(!ret) + return E_OUTOFMEMORY; + *r = jsval_string(ret); return S_OK; } diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c index 69a77f1..3294ee6 100644 --- a/dlls/jscript/vbarray.c +++ b/dlls/jscript/vbarray.c @@ -96,7 +96,7 @@ static HRESULT VBArray_getItem(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, un return hres; if(r) { - hres = variant_to_jsval(&out, r); + hres = variant_to_jsval(ctx, &out, r); VariantClear(&out); } return hres; @@ -166,7 +166,7 @@ static HRESULT VBArray_toArray(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, un } for(i=0; i<size; i++) { - hres = variant_to_jsval(v, &val); + hres = variant_to_jsval(ctx, v, &val); if(SUCCEEDED(hres)) { hres = jsdisp_propput_idx(array, i, val); jsval_release(val); -- 2.31.1

3 13

[PATCH] ctype.h: Add _isctype_l() declaration.
by Francois Gouget 19 Oct '21

19 Oct '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- include/msvcrt/ctype.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msvcrt/ctype.h b/include/msvcrt/ctype.h index be99f7409e4..312888c3cfc 100644 --- a/include/msvcrt/ctype.h +++ b/include/msvcrt/ctype.h @@ -24,6 +24,7 @@ _ACRTIMP int __cdecl __iscsymf(int); _ACRTIMP int __cdecl __toascii(int); _ACRTIMP int __cdecl _isblank_l(int,_locale_t); _ACRTIMP int __cdecl _isctype(int,int); +_ACRTIMP int __cdecl _isctype_l(int,int,_locale_t); _ACRTIMP int __cdecl _tolower(int); _ACRTIMP int __cdecl _tolower_l(int,_locale_t); _ACRTIMP int __cdecl _toupper(int); -- 2.30.2

2 1

[PATCH 3/5] msi: Pass size in bytes to RegQueryValueExW().
by Zhiyi Zhang 19 Oct '21

19 Oct '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/msi/package.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 23e938f1759..7488c095080 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -527,7 +527,7 @@ static LPWSTR get_fusion_filename(MSIPACKAGE *package) if (!RegCreateKeyExW(netsetup, L"v4\\Client", 0, NULL, 0, KEY_QUERY_VALUE, NULL, &hkey, NULL)) { - size = ARRAY_SIZE(path); + size = sizeof(path); if (!RegQueryValueExW(hkey, L"InstallPath", NULL, &type, (BYTE *)path, &size)) { len = lstrlenW(path) + lstrlenW(L"fusion.dll") + 2; @@ -782,12 +782,12 @@ static VOID set_installer_properties(MSIPACKAGE *package) PathAddBackslashW( pth ); msi_set_property( package->db, L"SystemFolder", pth, -1 ); - len = MAX_PATH; + len = sizeof(pth); RegQueryValueExW(hkey, L"ProgramFilesDir", 0, &type, (BYTE *)pth, &len); PathAddBackslashW( pth ); msi_set_property( package->db, L"ProgramFilesFolder", pth, -1 ); - len = MAX_PATH; + len = sizeof(pth); RegQueryValueExW(hkey, L"CommonFilesDir", 0, &type, (BYTE *)pth, &len); PathAddBackslashW( pth ); msi_set_property( package->db, L"CommonFilesFolder", pth, -1 ); @@ -806,22 +806,22 @@ static VOID set_installer_properties(MSIPACKAGE *package) PathAddBackslashW( pth ); msi_set_property( package->db, L"SystemFolder", pth, -1 ); - len = MAX_PATH; + len = sizeof(pth); RegQueryValueExW(hkey, L"ProgramFilesDir", 0, &type, (BYTE *)pth, &len); PathAddBackslashW( pth ); msi_set_property( package->db, L"ProgramFiles64Folder", pth, -1 ); - len = MAX_PATH; + len = sizeof(pth); RegQueryValueExW(hkey, L"ProgramFilesDir (x86)", 0, &type, (BYTE *)pth, &len); PathAddBackslashW( pth ); msi_set_property( package->db, L"ProgramFilesFolder", pth, -1 ); - len = MAX_PATH; + len = sizeof(pth); RegQueryValueExW(hkey, L"CommonFilesDir", 0, &type, (BYTE *)pth, &len); PathAddBackslashW( pth ); msi_set_property( package->db, L"CommonFiles64Folder", pth, -1 ); - len = MAX_PATH; + len = sizeof(pth); RegQueryValueExW(hkey, L"CommonFilesDir (x86)", 0, &type, (BYTE *)pth, &len); PathAddBackslashW( pth ); msi_set_property( package->db, L"CommonFilesFolder", pth, -1 ); -- 2.32.0

2 1

[PATCH 5/5] shell32: Pass size in bytes to RegLoadMUIStringW() and RegQueryValueExW().
by Zhiyi Zhang 19 Oct '21

19 Oct '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/shell32/classes.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c index 0087cc3c276..84784733853 100644 --- a/dlls/shell32/classes.c +++ b/dlls/shell32/classes.c @@ -212,11 +212,11 @@ static BOOL HCR_RegOpenClassIDKey(REFIID riid, HKEY *hkey) static BOOL HCR_RegGetDefaultIconW(HKEY hkey, LPWSTR szDest, DWORD len, int* picon_idx) { - DWORD dwType; + DWORD dwType, size = len * sizeof(WCHAR); WCHAR sTemp[MAX_PATH]; WCHAR sNum[5]; - if (!RegQueryValueExW(hkey, NULL, 0, &dwType, (LPBYTE)szDest, &len)) + if (!RegQueryValueExW(hkey, NULL, 0, &dwType, (LPBYTE)szDest, &size)) { if (dwType == REG_EXPAND_SZ) { @@ -316,13 +316,13 @@ BOOL HCR_GetClassNameW(REFIID riid, LPWSTR szDest, DWORD len) { HKEY hkey; BOOL ret = FALSE; - DWORD buflen = len; + DWORD buflen = len * sizeof(WCHAR); szDest[0] = 0; if (HCR_RegOpenClassIDKey(riid, &hkey)) { - if (!RegLoadMUIStringW(hkey, L"LocalizedString", szDest, len, NULL, 0, NULL) || - !RegQueryValueExW(hkey, L"", 0, NULL, (LPBYTE)szDest, &len)) + if (!RegLoadMUIStringW(hkey, L"LocalizedString", szDest, buflen, NULL, 0, NULL) || + !RegQueryValueExW(hkey, L"", 0, NULL, (LPBYTE)szDest, &buflen)) { ret = TRUE; } @@ -333,12 +333,12 @@ BOOL HCR_GetClassNameW(REFIID riid, LPWSTR szDest, DWORD len) { if(IsEqualIID(riid, &CLSID_ShellDesktop)) { - if (LoadStringW(shell32_hInstance, IDS_DESKTOP, szDest, buflen)) + if (LoadStringW(shell32_hInstance, IDS_DESKTOP, szDest, len)) ret = TRUE; } else if (IsEqualIID(riid, &CLSID_MyComputer)) { - if(LoadStringW(shell32_hInstance, IDS_MYCOMPUTER, szDest, buflen)) + if(LoadStringW(shell32_hInstance, IDS_MYCOMPUTER, szDest, len)) ret = TRUE; } } -- 2.32.0

1 0

[PATCH 4/5] mshtml: Pass size in bytes to RegQueryValueExW().
by Zhiyi Zhang 19 Oct '21

19 Oct '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/mshtml/nsembed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index ae94f224fac..4224d6a2ac4 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -707,7 +707,7 @@ static WCHAR *find_wine_gecko_reg(void) if(res != ERROR_SUCCESS) return NULL; - size = ARRAY_SIZE(buffer); + size = sizeof(buffer); res = RegQueryValueExW(hkey, L"GeckoPath", NULL, &type, (LPBYTE)buffer, &size); RegCloseKey(hkey); if(res != ERROR_SUCCESS || type != REG_SZ) -- 2.32.0

1 0

[PATCH 2/5] msctf: Set size before calling RegQueryValueExW().
by Zhiyi Zhang 19 Oct '21

19 Oct '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/msctf/inputprocessor.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index ac7fad67548..5e687f5ccc9 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -432,6 +432,7 @@ static HRESULT WINAPI InputProcessorProfiles_GetDefaultLanguageProfile( } CLSIDFromString(buf,pclsid); + count = sizeof(buf); res = RegQueryValueExW(hkey, szwProfile, 0, NULL, (LPBYTE)buf, &count); if (res == ERROR_SUCCESS) CLSIDFromString(buf,pguidProfile); -- 2.32.0

1 0

[PATCH 1/5] appwiz.cpl: Pass size in bytes to RegQueryValueExW().
by Zhiyi Zhang 19 Oct '21

19 Oct '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/appwiz.cpl/appwiz.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 2bc108b63c6..410de81043d 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -542,7 +542,7 @@ static void SetInfoDialogText(HKEY hKey, LPCWSTR lpKeyName, LPCWSTR lpAltMessage } else { - buflen = MAX_STRING_LEN; + buflen = sizeof(buf); if ((RegQueryValueExW(hKey, lpKeyName, 0, 0, (LPBYTE) buf, &buflen) == ERROR_SUCCESS) && buf[0]) -- 2.32.0

1 0

[PATCH 1/2] localspl: Add ARM print environments.
by Esme Povirk 19 Oct '21

19 Oct '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51815 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- This supersedes 217514. I took some liberties with the ARM environments. I haven't found an actual Windows machine with a 32-bit ARM print environment, but MS_RPRN implies that "Windows ARM" is a valid environment name. My Windows 10 machine does have a "Windows ARM64" environment but it only has driver version 4 in the registry, not 3. dlls/localspl/provider.c | 8 +++++++- dlls/winspool.drv/info.c | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index c17983e3037..d7c1464ef2c 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -245,10 +245,16 @@ static const printenv_t env_x86 = {x86_envnameW, L"w32x86", 3, static const printenv_t env_x64 = {L"Windows x64", L"x64", 3, L"\\Version-3", L"\\3"}; +static const printenv_t env_arm = {L"Windows ARM", L"arm", 3, + L"\\Version-3", L"\\3"}; + +static const printenv_t env_arm64 = {L"Windows ARM64", L"arm64", 3, + L"\\Version-3", L"\\3"}; + static const printenv_t env_win40 = {L"Windows 4.0", L"win40", 0, L"\\Version-0", L"\\0"}; -static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_ia64, &env_win40}; +static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_ia64, &env_arm, &env_arm64, &env_win40}; static const DWORD di_sizeof[] = {0, sizeof(DRIVER_INFO_1W), sizeof(DRIVER_INFO_2W), diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index edfdab218c4..74617537a6b 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -232,9 +232,13 @@ static const WCHAR WinNT_CV_PrinterPortsW[] = { 'S','o','f','t','w','a','r','e', static WCHAR envname_win40W[] = {'W','i','n','d','o','w','s',' ','4','.','0',0}; static const WCHAR envname_x64W[] = {'W','i','n','d','o','w','s',' ','x','6','4',0}; static WCHAR envname_x86W[] = {'W','i','n','d','o','w','s',' ','N','T',' ','x','8','6',0}; +static const WCHAR envname_armW[] = {'W','i','n','d','o','w','s',' ','A','R','M',0}; +static const WCHAR envname_arm64W[] = {'W','i','n','d','o','w','s',' ','A','R','M','6','4',0}; static const WCHAR subdir_win40W[] = {'w','i','n','4','0',0}; static const WCHAR subdir_x64W[] = {'x','6','4',0}; static const WCHAR subdir_x86W[] = {'w','3','2','x','8','6',0}; +static const WCHAR subdir_armW[] = {'a','r','m',0}; +static const WCHAR subdir_arm64W[] = {'a','r','m','6','4',0}; static const WCHAR Version0_RegPathW[] = {'\\','V','e','r','s','i','o','n','-','0',0}; static const WCHAR Version0_SubdirW[] = {'\\','0',0}; static const WCHAR Version3_RegPathW[] = {'\\','V','e','r','s','i','o','n','-','3',0}; @@ -310,9 +314,11 @@ static const DWORD pi_sizeof[] = {0, sizeof(PRINTER_INFO_1W), sizeof(PRINTER_INF static const printenv_t env_x64 = {envname_x64W, subdir_x64W, 3, Version3_RegPathW, Version3_SubdirW}; static const printenv_t env_x86 = {envname_x86W, subdir_x86W, 3, Version3_RegPathW, Version3_SubdirW}; +static const printenv_t env_arm = {envname_armW, subdir_armW, 3, Version3_RegPathW, Version3_SubdirW}; +static const printenv_t env_arm64 = {envname_arm64W, subdir_arm64W, 3, Version3_RegPathW, Version3_SubdirW}; static const printenv_t env_win40 = {envname_win40W, subdir_win40W, 0, Version0_RegPathW, Version0_SubdirW}; -static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_win40}; +static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_arm, &env_arm64, &env_win40}; /****************************************************************** * validate the user-supplied printing-environment [internal] -- 2.30.2

2 3

[PATCH 1/6] dinput: Use object instance offset to access extra value caps.
by Rémi Bernon 19 Oct '21

19 Oct '21

Value objects are always enumerated first, so offset / sizeof(LONG) can be safely used to index input_extra_caps array. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/joystick_hid.c | 89 ++++++++++++++++++++++---------------- 1 file changed, 52 insertions(+), 37 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index a6715463690..9c1f75ec9ee 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -73,6 +73,11 @@ static inline const char *debugstr_hid_collection_node( struct hid_collection_no struct extra_caps { + LONG bit_size; + LONG logical_min; + LONG logical_max; + LONG range_min; + LONG range_max; LONG deadzone; LONG saturation; }; @@ -659,19 +664,18 @@ static ULONG WINAPI hid_joystick_Release( IDirectInputDevice8W *iface ) static BOOL get_property_prop_range( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { + struct extra_caps *extra = impl->input_extra_caps + instance->dwOfs / sizeof(LONG); DIPROPRANGE *value = data; - value->lMin = caps->physical_min; - value->lMax = caps->physical_max; + value->lMin = extra->range_min; + value->lMax = extra->range_max; return DIENUM_STOP; } static BOOL get_property_prop_deadzone( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { - struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)impl->preparsed; - struct extra_caps *extra; + struct extra_caps *extra = impl->input_extra_caps + instance->dwOfs / sizeof(LONG); DIPROPDWORD *deadzone = data; - extra = impl->input_extra_caps + (caps - HID_INPUT_VALUE_CAPS( preparsed )); deadzone->dwData = extra->deadzone; return DIENUM_STOP; } @@ -679,10 +683,8 @@ static BOOL get_property_prop_deadzone( struct hid_joystick *impl, struct hid_va static BOOL get_property_prop_saturation( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { - struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)impl->preparsed; - struct extra_caps *extra; + struct extra_caps *extra = impl->input_extra_caps + instance->dwOfs / sizeof(LONG); DIPROPDWORD *saturation = data; - extra = impl->input_extra_caps + (caps - HID_INPUT_VALUE_CAPS( preparsed )); saturation->dwData = extra->saturation; return DIENUM_STOP; } @@ -781,22 +783,23 @@ static HRESULT WINAPI hid_joystick_GetProperty( IDirectInputDevice8W *iface, con static BOOL set_property_prop_range( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { + struct extra_caps *extra = impl->input_extra_caps + instance->dwOfs / sizeof(LONG); DIPROPRANGE *value = data; LONG tmp; - caps->physical_min = value->lMin; - caps->physical_max = value->lMax; + extra->range_min = value->lMin; + extra->range_max = value->lMax; if (instance->dwType & DIDFT_AXIS) { - if (!caps->physical_min) tmp = caps->physical_max / 2; - else tmp = round( (caps->physical_min + caps->physical_max) / 2.0 ); + if (!extra->range_min) tmp = extra->range_max / 2; + else tmp = round( (extra->range_min + extra->range_max) / 2.0 ); *(LONG *)(impl->base.device_state + instance->dwOfs) = tmp; } else if (instance->dwType & DIDFT_POV) { - tmp = caps->logical_max - caps->logical_min; - if (tmp > 0) caps->physical_max -= value->lMax / (tmp + 1); + tmp = extra->logical_max - extra->logical_min; + if (tmp > 0) extra->range_max -= value->lMax / (tmp + 1); *(LONG *)(impl->base.device_state + instance->dwOfs) = -1; } return DIENUM_CONTINUE; @@ -805,10 +808,8 @@ static BOOL set_property_prop_range( struct hid_joystick *impl, struct hid_value static BOOL set_property_prop_deadzone( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { - struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)impl->preparsed; - struct extra_caps *extra; + struct extra_caps *extra = impl->input_extra_caps + instance->dwOfs / sizeof(LONG); DIPROPDWORD *deadzone = data; - extra = impl->input_extra_caps + (caps - HID_INPUT_VALUE_CAPS( preparsed )); extra->deadzone = deadzone->dwData; return DIENUM_CONTINUE; } @@ -816,10 +817,8 @@ static BOOL set_property_prop_deadzone( struct hid_joystick *impl, struct hid_va static BOOL set_property_prop_saturation( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { - struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)impl->preparsed; - struct extra_caps *extra; + struct extra_caps *extra = impl->input_extra_caps + instance->dwOfs / sizeof(LONG); DIPROPDWORD *saturation = data; - extra = impl->input_extra_caps + (caps - HID_INPUT_VALUE_CAPS( preparsed )); extra->saturation = saturation->dwData; return DIENUM_CONTINUE; } @@ -1357,29 +1356,34 @@ static BOOL check_device_state_button( struct hid_joystick *impl, struct hid_val return DIENUM_CONTINUE; } -static LONG sign_extend( ULONG value, struct hid_value_caps *caps ) +static LONG sign_extend( ULONG value, struct extra_caps *caps ) { UINT sign = 1 << (caps->bit_size - 1); if (sign <= 1 || caps->logical_min >= 0) return value; return value - ((value & sign) << 1); } -static LONG scale_value( ULONG value, struct hid_value_caps *caps, LONG min, LONG max ) +static LONG scale_value( ULONG value, struct extra_caps *caps ) { - LONG tmp = sign_extend( value, caps ); - if (caps->logical_min > tmp || caps->logical_max < tmp) return -1; /* invalid / null value */ - return min + MulDiv( tmp - caps->logical_min, max - min, caps->logical_max - caps->logical_min ); + LONG tmp = sign_extend( value, caps ), log_min, log_max, phy_min, phy_max; + log_min = caps->logical_min; + log_max = caps->logical_max; + phy_min = caps->range_min; + phy_max = caps->range_max; + + if (log_min > tmp || log_max < tmp) return -1; /* invalid / null value */ + return phy_min + MulDiv( tmp - log_min, phy_max - phy_min, log_max - log_min ); } -static LONG scale_axis_value( ULONG value, struct hid_value_caps *caps, struct extra_caps *extra ) +static LONG scale_axis_value( ULONG value, struct extra_caps *caps ) { LONG tmp = sign_extend( value, caps ), log_ctr, log_min, log_max, phy_ctr, phy_min, phy_max; ULONG bit_max = (1 << caps->bit_size) - 1; log_min = caps->logical_min; log_max = caps->logical_max; - phy_min = caps->physical_min; - phy_max = caps->physical_max; + phy_min = caps->range_min; + phy_max = caps->range_max; /* xinput HID gamepad have bogus logical value range, let's use the bit range instead */ if (log_min == 0 && log_max == -1) log_max = bit_max; @@ -1391,14 +1395,14 @@ static LONG scale_axis_value( ULONG value, struct hid_value_caps *caps, struct e tmp -= log_ctr; if (tmp <= 0) { - log_max = MulDiv( log_min - log_ctr, extra->deadzone, 10000 ); - log_min = MulDiv( log_min - log_ctr, extra->saturation, 10000 ); + log_max = MulDiv( log_min - log_ctr, caps->deadzone, 10000 ); + log_min = MulDiv( log_min - log_ctr, caps->saturation, 10000 ); phy_max = phy_ctr; } else { - log_min = MulDiv( log_max - log_ctr, extra->deadzone, 10000 ); - log_max = MulDiv( log_max - log_ctr, extra->saturation, 10000 ); + log_min = MulDiv( log_max - log_ctr, caps->deadzone, 10000 ); + log_max = MulDiv( log_max - log_ctr, caps->saturation, 10000 ); phy_min = phy_ctr; } @@ -1410,24 +1414,22 @@ static LONG scale_axis_value( ULONG value, struct hid_value_caps *caps, struct e static BOOL read_device_state_value( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { - struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)impl->preparsed; + struct extra_caps *extra = impl->input_extra_caps + instance->dwOfs / sizeof(LONG); IDirectInputDevice8W *iface = &impl->base.IDirectInputDevice8W_iface; ULONG logical_value, report_len = impl->caps.InputReportByteLength; struct parse_device_state_params *params = data; char *report_buf = impl->input_report_buf; - struct extra_caps *extra; LONG old_value, value; NTSTATUS status; if (instance->wReportId != impl->base.device_state_report_id) return DIENUM_CONTINUE; - extra = impl->input_extra_caps + (caps - HID_INPUT_VALUE_CAPS( preparsed )); status = HidP_GetUsageValue( HidP_Input, instance->wUsagePage, 0, instance->wUsage, &logical_value, impl->preparsed, report_buf, report_len ); if (status != HIDP_STATUS_SUCCESS) WARN( "HidP_GetUsageValue %04x:%04x returned %#x\n", instance->wUsagePage, instance->wUsage, status ); - if (instance->dwType & DIDFT_AXIS) value = scale_axis_value( logical_value, caps, extra ); - else value = scale_value( logical_value, caps, caps->physical_min, caps->physical_max ); + if (instance->dwType & DIDFT_AXIS) value = scale_axis_value( logical_value, extra ); + else value = scale_value( logical_value, extra ); old_value = *(LONG *)(params->old_state + instance->dwOfs); *(LONG *)(impl->base.device_state + instance->dwOfs) = value; @@ -1807,6 +1809,18 @@ static HRESULT hid_joystick_enum_device( DWORD type, DWORD flags, DIDEVICEINSTAN return DI_OK; } +static BOOL init_extra_caps( struct hid_joystick *impl, struct hid_value_caps *caps, + DIDEVICEOBJECTINSTANCEW *instance, void *data ) +{ + struct extra_caps *extra = impl->input_extra_caps + instance->dwOfs / sizeof(LONG); + extra->bit_size = caps->bit_size; + extra->logical_min = caps->logical_min; + extra->logical_max = caps->logical_max; + extra->range_min = caps->physical_min; + extra->range_max = caps->physical_max; + return DIENUM_CONTINUE; +} + static BOOL init_pid_reports( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { @@ -2124,6 +2138,7 @@ static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID size = preparsed->input_caps_count * sizeof(struct extra_caps); if (!(extra = calloc( 1, size ))) goto failed; impl->input_extra_caps = extra; + enum_objects( impl, &filter, DIDFT_AXIS | DIDFT_POV, init_extra_caps, NULL ); size = impl->caps.InputReportByteLength; if (!(buffer = malloc( size ))) goto failed; -- 2.33.0

1 5

[PATCH] ws2_32/tests: Correct name of IPV6_V6ONLY socket option in messages
by Alex Henrie 19 Oct '21

19 Oct '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 63f8149f160..02713a7c625 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5650,7 +5650,7 @@ static void test_ipv6only(void) enabled = 2; ret = getsockopt(v6, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); - ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "getsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); ok(enabled == 1, "expected 1, got %d\n", enabled); ret = bind(v6, (struct sockaddr*)&sin6, sizeof(sin6)); @@ -5662,26 +5662,26 @@ static void test_ipv6only(void) todo_wine { enabled = 2; ret = getsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); - ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "getsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); ok(enabled == 1, "expected 1, got %d\n", enabled); } enabled = 0; len = sizeof(enabled); ret = setsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, len); - ok(!ret, "setsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "setsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); todo_wine { enabled = 2; ret = getsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); - ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "getsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); ok(!enabled, "expected 0, got %d\n", enabled); } enabled = 1; len = sizeof(enabled); ret = setsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, len); - ok(!ret, "setsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "setsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); /* bind on IPv4 socket should succeed - IPV6_V6ONLY is enabled by default */ ret = bind(v4, (struct sockaddr*)&sin4, sizeof(sin4)); @@ -5690,26 +5690,26 @@ todo_wine { todo_wine { enabled = 2; ret = getsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); - ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "getsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); ok(enabled == 1, "expected 1, got %d\n", enabled); } enabled = 0; len = sizeof(enabled); ret = setsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, len); - ok(ret, "setsockopt(IPV6_ONLY) succeeded (LastError: %d)\n", WSAGetLastError()); + ok(ret, "setsockopt(IPV6_V6ONLY) succeeded (LastError: %d)\n", WSAGetLastError()); todo_wine { enabled = 0; ret = getsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); - ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "getsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); ok(enabled == 1, "expected 1, got %d\n", enabled); } enabled = 1; len = sizeof(enabled); ret = setsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, len); - ok(ret, "setsockopt(IPV6_ONLY) succeeded (LastError: %d)\n", WSAGetLastError()); + ok(ret, "setsockopt(IPV6_V6ONLY) succeeded (LastError: %d)\n", WSAGetLastError()); closesocket(v4); closesocket(v6); @@ -5728,7 +5728,7 @@ todo_wine { enabled = 2; ret = getsockopt(v6, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); - ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "getsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); ok(!enabled, "expected 0, got %d\n", enabled); /* @@ -5749,7 +5749,7 @@ todo_wine { enabled = 2; len = sizeof(enabled); getsockopt(v6, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); - ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "getsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); ok(!enabled, "IPV6_V6ONLY is enabled after bind\n"); v4 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); -- 2.33.1

2 1

[PATCH] comctl32/combo: Invalidate child edit control after painting themed background.
by Zhiyi Zhang 19 Oct '21

19 Oct '21

Fix the edit control in a themed combo control not displaying text when clicking the combo control dropdown button. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/combo.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 074f54f0937..4208ff8b9c9 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -789,6 +789,8 @@ static LRESULT COMBO_ThemedPaint(HTHEME theme, HEADCOMBO *lphc, HDC hdc) if ((lphc->dwStyle & CBS_DROPDOWNLIST) == CBS_DROPDOWNLIST) CBPaintText(lphc, hdc); + else + InvalidateRect(lphc->hWndEdit, NULL, TRUE); return 0; } -- 2.32.0

1 0

[PATCH 3/3] winemac.drv: Set hkey to NULL after RegCloseKey() in macdrv_init_gpu().
by Zhiyi Zhang 19 Oct '21

19 Oct '21

Although it's unlikely, RegCloseKey() may close an already closed key if the following SetupDiGetDeviceRegistryPropertyW() failed. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/display.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index b32c553d411..4a3b1ff39cb 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1601,6 +1601,7 @@ static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_gpu *gpu, int if (RegSetValueExW(hkey, dac_typeW, 0, REG_BINARY, (const BYTE *)ramdacW, sizeof(ramdacW))) goto done; RegCloseKey(hkey); + hkey = NULL; /* Retrieve driver value for adapters */ if (!SetupDiGetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, sizeof(bufferW), -- 2.32.0

1 0

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-devel