wine-commits November 2022

wine-commits@winehq.org

1 participants
1171 discussions

Zhiyi Zhang : dwmapi: Fallback to 60Hz if the display frequency is invalid in get_display_frequency().
by Alexandre Julliard 17 Nov '22

17 Nov '22

Module: wine Branch: master Commit: 6a57ed804a37a3697c1ba9af8caccc2f6a212145 URL: https://gitlab.winehq.org/wine/wine/-/commit/6a57ed804a37a3697c1ba9af8caccc… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 17 15:46:52 2022 +0800 dwmapi: Fallback to 60Hz if the display frequency is invalid in get_display_frequency(). DwmGetCompositionTimingInfo() may throw a zero division exception if the display reports a 0Hz frequency, which can happen when testing under Xephyr without -fakescreenfps option. --- dlls/dwmapi/dwmapi_main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 1a65410c7eb..56730f79cac 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -213,12 +213,16 @@ HRESULT WINAPI DwmRegisterThumbnail(HWND dest, HWND src, PHTHUMBNAIL thumbnail_i static int get_display_frequency(void) { - DEVMODEA mode; + DEVMODEW mode; + BOOL ret; memset(&mode, 0, sizeof(mode)); mode.dmSize = sizeof(mode); - if (EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &mode)) + ret = EnumDisplaySettingsExW(NULL, ENUM_CURRENT_SETTINGS, &mode, 0); + if (ret && mode.dmFields & DM_DISPLAYFREQUENCY && mode.dmDisplayFrequency) + { return mode.dmDisplayFrequency; + } else { WARN("Failed to query display frequency, returning a fallback value.\n");

1 0

Alex Henrie : msi/tests: Correct a couple of failure messages in test_msirecord.
by Alexandre Julliard 17 Nov '22

17 Nov '22

Module: wine Branch: master Commit: 2fde0a3f5c233b0ea1637f409998ce4ee85d28a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/2fde0a3f5c233b0ea1637f409998ce… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 16 23:58:00 2022 -0700 msi/tests: Correct a couple of failure messages in test_msirecord. --- dlls/msi/tests/record.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index fb778104ee1..b0cad8265e8 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -244,11 +244,11 @@ static void test_msirecord(void) i = MsiRecordSetStringA(h,0,"42"); ok(i == ERROR_SUCCESS, "Failed to set string at 0\n"); i = MsiRecordGetInteger(h, 0); - ok(i == 42, "should get invalid integer\n"); + ok(i == 42, "should get 42\n"); i = MsiRecordSetStringA(h,0,"-42"); ok(i == ERROR_SUCCESS, "Failed to set string at 0\n"); i = MsiRecordGetInteger(h, 0); - ok(i == -42, "should get invalid integer\n"); + ok(i == -42, "should get -42\n"); i = MsiRecordSetStringA(h,0," 42"); ok(i == ERROR_SUCCESS, "Failed to set string at 0\n"); i = MsiRecordGetInteger(h, 0);

1 0

Piotr Caban : winspool: Use GetJobW in GetJobA implementation.
by Alexandre Julliard 16 Nov '22

16 Nov '22

Module: wine Branch: master Commit: 1724de4888256909552c615327a7866fa1d17c0d URL: https://gitlab.winehq.org/wine/wine/-/commit/1724de4888256909552c615327a786… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 16 14:50:59 2022 +0100 winspool: Use GetJobW in GetJobA implementation. --- dlls/winspool.drv/info.c | 61 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 58 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index d790be486c2..6286dc36f3e 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -7725,14 +7725,69 @@ end: return ret; } +static inline const DWORD *job_string_info(DWORD level) +{ + static const DWORD info_1[] = + { + sizeof(JOB_INFO_1W), + FIELD_OFFSET(JOB_INFO_1W, pPrinterName), + FIELD_OFFSET(JOB_INFO_1W, pMachineName), + FIELD_OFFSET(JOB_INFO_1W, pUserName), + FIELD_OFFSET(JOB_INFO_1W, pDocument), + FIELD_OFFSET(JOB_INFO_1W, pDatatype), + FIELD_OFFSET(JOB_INFO_1W, pStatus), + ~0u + }; + static const DWORD info_2[] = + { + sizeof(JOB_INFO_2W), + FIELD_OFFSET(JOB_INFO_2W, pPrinterName), + FIELD_OFFSET(JOB_INFO_2W, pMachineName), + FIELD_OFFSET(JOB_INFO_2W, pUserName), + FIELD_OFFSET(JOB_INFO_2W, pDocument), + FIELD_OFFSET(JOB_INFO_2W, pNotifyName), + FIELD_OFFSET(JOB_INFO_2W, pDatatype), + FIELD_OFFSET(JOB_INFO_2W, pPrintProcessor), + FIELD_OFFSET(JOB_INFO_2W, pParameters), + FIELD_OFFSET(JOB_INFO_2W, pDriverName), + FIELD_OFFSET(JOB_INFO_2W, pStatus), + ~0u + }; + static const DWORD info_3[] = + { + sizeof(JOB_INFO_3), + ~0u + }; + + switch (level) + { + case 1: return info_1; + case 2: return info_2; + case 3: return info_3; + } + + SetLastError( ERROR_INVALID_LEVEL ); + return NULL; +} + /***************************************************************************** * GetJobA [WINSPOOL.@] * */ -BOOL WINAPI GetJobA(HANDLE hPrinter, DWORD JobId, DWORD Level, LPBYTE pJob, - DWORD cbBuf, LPDWORD pcbNeeded) +BOOL WINAPI GetJobA(HANDLE printer, DWORD job_id, DWORD level, BYTE *data, + DWORD size, DWORD *needed) { - return get_job_info(hPrinter, JobId, Level, pJob, cbBuf, pcbNeeded, FALSE); + const DWORD *string_info = job_string_info(level); + + if (!string_info) + return FALSE; + + if (!GetJobW(printer, job_id, level, data, size, needed)) + return FALSE; + packed_struct_WtoA(data, string_info); + if (level == 2) + DEVMODEWtoA(((JOB_INFO_2W *)data)->pDevMode, ((JOB_INFO_2A *)data)->pDevMode); + return TRUE; } /*****************************************************************************

1 0

Piotr Caban : winspool: Allow specifying out buffer in DEVMODEdupWtoA.
by Alexandre Julliard 16 Nov '22

16 Nov '22

Module: wine Branch: master Commit: 3a8b51d6655c3fdb16bb57b38b8c1b66a78c3643 URL: https://gitlab.winehq.org/wine/wine/-/commit/3a8b51d6655c3fdb16bb57b38b8c1b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 16 14:49:40 2022 +0100 winspool: Allow specifying out buffer in DEVMODEdupWtoA. --- dlls/winspool.drv/info.c | 102 +++++++++++++++++++++++------------------------ 1 file changed, 49 insertions(+), 53 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index c254806c544..d790be486c2 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -250,58 +250,62 @@ static DEVMODEW *dup_devmode( const DEVMODEW *dm ) return ret; } +/* stringWtoA + * Converts Unicode string to Ansi (possibly in place). + */ +static void stringWtoA( const WCHAR *strW, char *strA, size_t size ) +{ + DWORD ret; + char *str; + + str = (char *)strW == strA ? malloc( size ) : strA; + ret = WideCharToMultiByte( CP_ACP, 0, strW, -1, str, size, NULL, NULL ); + if (str != strA) + { + memcpy( strA, str, ret ); + free( str ); + } + memset( strA + ret, 0, size - ret ); +} + /*********************************************************** - * DEVMODEdupWtoA - * Creates an ansi copy of supplied devmode + * DEVMODEWtoA + * Converts DEVMODEW to DEVMODEA (possibly in place). + * Allocates DEVMODEA if needed. */ -static DEVMODEA *DEVMODEdupWtoA( const DEVMODEW *dmW ) +static DEVMODEA *DEVMODEWtoA( const DEVMODEW *dmW, DEVMODEA *dmA ) { - LPDEVMODEA dmA; - DWORD size; + DWORD size, sizeW; if (!dmW) return NULL; - size = dmW->dmSize - CCHDEVICENAME - - ((dmW->dmSize > FIELD_OFFSET( DEVMODEW, dmFormName )) ? CCHFORMNAME : 0); + sizeW = dmW->dmSize; + size = sizeW - CCHDEVICENAME - + ((sizeW > FIELD_OFFSET( DEVMODEW, dmFormName )) ? CCHFORMNAME : 0); - dmA = calloc( 1, size + dmW->dmDriverExtra ); + if (!dmA) + dmA = calloc( 1, size + dmW->dmDriverExtra ); if (!dmA) return NULL; - WideCharToMultiByte( CP_ACP, 0, dmW->dmDeviceName, -1, - (LPSTR)dmA->dmDeviceName, CCHDEVICENAME, NULL, NULL ); + stringWtoA( dmW->dmDeviceName, (char *)dmA->dmDeviceName, CCHDEVICENAME ); - if (FIELD_OFFSET( DEVMODEW, dmFormName ) >= dmW->dmSize) + if (FIELD_OFFSET( DEVMODEW, dmFormName ) >= sizeW) { - memcpy( &dmA->dmSpecVersion, &dmW->dmSpecVersion, - dmW->dmSize - FIELD_OFFSET( DEVMODEW, dmSpecVersion ) ); + memmove( &dmA->dmSpecVersion, &dmW->dmSpecVersion, + sizeW - FIELD_OFFSET( DEVMODEW, dmSpecVersion ) ); } else { - memcpy( &dmA->dmSpecVersion, &dmW->dmSpecVersion, + memmove( &dmA->dmSpecVersion, &dmW->dmSpecVersion, FIELD_OFFSET( DEVMODEW, dmFormName ) - FIELD_OFFSET( DEVMODEW, dmSpecVersion ) ); - WideCharToMultiByte( CP_ACP, 0, dmW->dmFormName, -1, - (LPSTR)dmA->dmFormName, CCHFORMNAME, NULL, NULL ); - - memcpy( &dmA->dmLogPixels, &dmW->dmLogPixels, dmW->dmSize - FIELD_OFFSET( DEVMODEW, dmLogPixels ) ); + stringWtoA( dmW->dmFormName, (char *)dmA->dmFormName, CCHFORMNAME ); + memmove( &dmA->dmLogPixels, &dmW->dmLogPixels, sizeW - FIELD_OFFSET( DEVMODEW, dmLogPixels ) ); } dmA->dmSize = size; - memcpy( (char *)dmA + dmA->dmSize, (const char *)dmW + dmW->dmSize, dmW->dmDriverExtra ); + memmove( (char *)dmA + dmA->dmSize, (const char *)dmW + sizeW, dmW->dmDriverExtra ); return dmA; } -static void packed_string_WtoA( WCHAR *strW ) -{ - DWORD len = wcslen( strW ), size = (len + 1) * sizeof(WCHAR), ret; - char *str; - - if (!len) return; - str = malloc( size ); - ret = WideCharToMultiByte( CP_ACP, 0, strW, len, str, size - 1, NULL, NULL ); - memcpy( strW, str, ret ); - memset( (BYTE *)strW + ret, 0, size - ret ); - free( str ); -} - /********************************************************************* * packed_struct_WtoA * @@ -316,7 +320,7 @@ static void packed_struct_WtoA( BYTE *data, const DWORD *string_info ) while (*string_info != ~0u) { strW = *(WCHAR **)(data + *string_info); - if (strW) packed_string_WtoA( strW ); + if (strW) stringWtoA( strW, (char *)strW, (wcslen(strW) + 1) * sizeof(WCHAR) ); string_info++; } } @@ -894,7 +898,7 @@ static inline DWORD set_reg_szW(HKEY hkey, const WCHAR *keyname, const WCHAR *va static inline DWORD set_reg_devmode( HKEY key, const WCHAR *name, const DEVMODEW *dm ) { - DEVMODEA *dmA = DEVMODEdupWtoA( dm ); + DEVMODEA *dmA = DEVMODEWtoA( dm, NULL ); DWORD ret = ERROR_FILE_NOT_FOUND; /* FIXME: Write DEVMODEA not DEVMODEW into reg. This is what win9x does @@ -1282,7 +1286,6 @@ static void convert_printerinfo_W_to_A(LPBYTE out, LPBYTE pPrintersW, { PRINTER_INFO_2W * piW = (PRINTER_INFO_2W *) pPrintersW; PRINTER_INFO_2A * piA = (PRINTER_INFO_2A *) out; - LPDEVMODEA dmA; TRACE("(%lu) #%lu: %s\n", level, id, debugstr_w(piW->pPrinterName)); if (piW->pServerName) { @@ -1335,17 +1338,16 @@ static void convert_printerinfo_W_to_A(LPBYTE out, LPBYTE pPrintersW, outlen -= len; } - dmA = DEVMODEdupWtoA(piW->pDevMode); - if (dmA) { + if (piW->pDevMode) + { /* align DEVMODEA to a DWORD boundary */ len = (4 - ( (DWORD_PTR) ptr & 3)) & 3; ptr += len; outlen -= len; piA->pDevMode = (LPDEVMODEA) ptr; - len = dmA->dmSize + dmA->dmDriverExtra; - memcpy(ptr, dmA, len); - free(dmA); + DEVMODEWtoA(piW->pDevMode, piA->pDevMode); + len = piA->pDevMode->dmSize + piA->pDevMode->dmDriverExtra; ptr += len; outlen -= len; @@ -1458,25 +1460,22 @@ static void convert_printerinfo_W_to_A(LPBYTE out, LPBYTE pPrintersW, { PRINTER_INFO_9W * piW = (PRINTER_INFO_9W *) pPrintersW; PRINTER_INFO_9A * piA = (PRINTER_INFO_9A *) out; - LPDEVMODEA dmA; TRACE("(%lu) #%lu\n", level, id); - dmA = DEVMODEdupWtoA(piW->pDevMode); - if (dmA) { + if (piW->pDevMode) + { /* align DEVMODEA to a DWORD boundary */ len = (4 - ( (DWORD_PTR) ptr & 3)) & 3; ptr += len; outlen -= len; piA->pDevMode = (LPDEVMODEA) ptr; - len = dmA->dmSize + dmA->dmDriverExtra; - memcpy(ptr, dmA, len); - free(dmA); + DEVMODEWtoA(piW->pDevMode, piA->pDevMode); + len = piA->pDevMode->dmSize + piA->pDevMode->dmDriverExtra; ptr += len; outlen -= len; } - break; } @@ -1890,11 +1889,8 @@ LONG WINAPI DocumentPropertiesA(HWND hwnd, HANDLE printer, char *device_name, DE ret = DocumentPropertiesW(hwnd, printer, device, outputW, inputW, mode); - if (ret >= 0 && outputW && (mode & (DM_COPY | DM_UPDATE))) { - DEVMODEA *dmA = DEVMODEdupWtoA( outputW ); - if (dmA) memcpy(output, dmA, dmA->dmSize + dmA->dmDriverExtra); - free(dmA); - } + if (ret >= 0 && outputW && (mode & (DM_COPY | DM_UPDATE))) + DEVMODEWtoA( outputW, output ); free(device); free(inputW); @@ -7621,7 +7617,7 @@ static BOOL get_job_info_2(job_t *job, JOB_INFO_2W *ji2, LPBYTE buf, DWORD cbBuf { if (!unicode) { - dmA = DEVMODEdupWtoA(job->devmode); + dmA = DEVMODEWtoA(job->devmode, NULL); devmode = (LPDEVMODEW) dmA; if (dmA) size = dmA->dmSize + dmA->dmDriverExtra; }

1 0

Piotr Caban : winspool: Remove strdupW helper.
by Alexandre Julliard 16 Nov '22

16 Nov '22

Module: wine Branch: master Commit: a3fe33f676aa4b8d6203a6042314574119a2fea2 URL: https://gitlab.winehq.org/wine/wine/-/commit/a3fe33f676aa4b8d6203a604231457… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 16 12:36:38 2022 +0100 winspool: Remove strdupW helper. --- dlls/winspool.drv/info.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 496cf56de3c..c254806c544 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -240,18 +240,6 @@ static inline PWSTR asciitounicode( UNICODE_STRING * usBufferPtr, LPCSTR src ) return NULL; } -static LPWSTR strdupW(LPCWSTR p) -{ - LPWSTR ret; - DWORD len; - - if(!p) return NULL; - len = (wcslen( p ) + 1) * sizeof(WCHAR); - ret = malloc(len); - memcpy(ret, p, len); - return ret; -} - static DEVMODEW *dup_devmode( const DEVMODEW *dm ) { DEVMODEW *ret; @@ -940,7 +928,7 @@ static LPWSTR get_servername_from_name(LPCWSTR name) if (name == NULL) return NULL; if ((name[0] != '\\') || (name[1] != '\\')) return NULL; - server = strdupW(&name[2]); /* skip over both backslash */ + server = wcsdup(&name[2]); /* skip over both backslash */ if (server == NULL) return NULL; /* strip '\' and the printername */ @@ -1083,10 +1071,10 @@ static HANDLE get_opened_printer_entry(LPWSTR name, LPPRINTER_DEFAULTSW pDefault } /* clone the base name. This is NULL for the printserver */ - printer->printername = strdupW(printername); + printer->printername = wcsdup(printername); /* clone the full name */ - printer->name = strdupW(name); + printer->name = wcsdup(name); if (name && (!printer->name)) { handle = 0; goto end; @@ -2566,8 +2554,8 @@ BOOL WINAPI AddJobW(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPD job->filename = malloc((len + 1) * sizeof(WCHAR)); memcpy(job->filename, filename, (len + 1) * sizeof(WCHAR)); job->portname = NULL; - job->document_title = strdupW( L"Local Downlevel Document" ); - job->printer_name = strdupW( printer->name ); + job->document_title = wcsdup( L"Local Downlevel Document" ); + job->printer_name = wcsdup( printer->name ); job->devmode = dup_devmode( printer->devmode ); list_add_tail(&printer->queue->jobs, &job->entry); @@ -3248,14 +3236,14 @@ BOOL WINAPI SetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level, { JOB_INFO_1W *info1 = (JOB_INFO_1W*)pJob; free(job->document_title); - job->document_title = strdupW(info1->pDocument); + job->document_title = wcsdup(info1->pDocument); break; } case 2: { JOB_INFO_2W *info2 = (JOB_INFO_2W*)pJob; free(job->document_title); - job->document_title = strdupW(info2->pDocument); + job->document_title = wcsdup(info2->pDocument); free(job->devmode); job->devmode = dup_devmode( info2->pDevMode ); break; @@ -3421,7 +3409,7 @@ DWORD WINAPI StartDocPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pDocInfo) printer->doc->hf = hf; ret = printer->doc->job_id = addjob->JobId; job = get_job(hPrinter, ret); - job->portname = strdupW(doc->pOutputFile); + job->portname = wcsdup(doc->pOutputFile); end: LeaveCriticalSection(&printer_handles_cs);

1 0

Santino Mazza : kernel32: Forward MapViewOfFileFromApp kernel32 to kernelbase.
by Alexandre Julliard 16 Nov '22

16 Nov '22

Module: wine Branch: master Commit: 2581d48e5f2457ceae1d5729c2ff02f434b484bc URL: https://gitlab.winehq.org/wine/wine/-/commit/2581d48e5f2457ceae1d5729c2ff02… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Tue Nov 15 20:18:54 2022 -0300 kernel32: Forward MapViewOfFileFromApp kernel32 to kernelbase. --- dlls/kernel32/kernel32.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index d14a4741be7..89c2511c3cf 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1095,6 +1095,7 @@ @ stdcall -import MapViewOfFile(long long long long long) @ stdcall -import MapViewOfFileEx(long long long long long ptr) @ stdcall -import MapViewOfFileExNuma(long long long long long ptr long) +@ stdcall MapViewOfFileFromApp(long long int64 long) kernelbase.MapViewOfFileFromApp @ stdcall Module32First(long ptr) @ stdcall Module32FirstW(long ptr) @ stdcall Module32Next(long ptr)

1 0

Santino Mazza : kernel32: Forward CreateFileMappingFromApp kernel32 to kernelbase.
by Alexandre Julliard 16 Nov '22

16 Nov '22

Module: wine Branch: master Commit: 663e533e7e36f14df97a21dc70f2c58dc20ed110 URL: https://gitlab.winehq.org/wine/wine/-/commit/663e533e7e36f14df97a21dc70f2c5… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Tue Nov 15 20:18:15 2022 -0300 kernel32: Forward CreateFileMappingFromApp kernel32 to kernelbase. --- dlls/kernel32/kernel32.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a4bba1c6848..d14a4741be7 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -285,6 +285,7 @@ @ stdcall -import CreateFileA(str long long ptr long long long) @ stdcall CreateFileMappingA(long ptr long long long str) # @ stub CreateFileMappingNumaA +@ stdcall CreateFileMappingFromApp(long ptr long int64 wstr) kernelbase.CreateFileMappingFromApp @ stdcall -import CreateFileMappingNumaW(long ptr long long long wstr long) @ stdcall -import CreateFileMappingW(long ptr long long long wstr) @ stdcall -import CreateFileW(wstr long long ptr long long long)

1 0

Nikolay Sivov : vbscript: Implement FormatNumber().
by Alexandre Julliard 16 Nov '22

16 Nov '22

Module: wine Branch: master Commit: fffdb2b2b9948fe4f677c56313f8ab2db10dca86 URL: https://gitlab.winehq.org/wine/wine/-/commit/fffdb2b2b9948fe4f677c56313f8ab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 16 17:25:01 2022 +0300 vbscript: Implement FormatNumber(). --- dlls/vbscript/global.c | 32 +++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index f6995cb55d7..d60374f9e87 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2945,10 +2945,36 @@ static HRESULT Global_ScriptEngineBuildVersion(BuiltinDisp *This, VARIANT *arg, return return_int(res, VBSCRIPT_BUILD_VERSION); } -static HRESULT Global_FormatNumber(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_FormatNumber(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + union + { + struct + { + int num_dig, inc_lead, use_parens, group; + } s; + int val[4]; + } int_args = { .s.num_dig = -1, .s.inc_lead = -2, .s.use_parens = -2, .s.group = -2 }; + HRESULT hres; + BSTR str; + int i; + + TRACE("\n"); + + assert(1 <= args_cnt && args_cnt <= 5); + + for (i = 1; i < args_cnt; ++i) + { + if (V_VT(args+i) == VT_ERROR) continue; + if (V_VT(args+i) == VT_NULL) return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + if (FAILED(hres = to_int(args+i, &int_args.val[i-1]))) return hres; + } + + hres = VarFormatNumber(args, int_args.s.num_dig, int_args.s.inc_lead, int_args.s.use_parens, + int_args.s.group, 0, &str); + if (FAILED(hres)) return hres; + + return return_bstr(res, str); } static HRESULT Global_FormatCurrency(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 01e034bd73e..459d3ace33e 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -2436,4 +2436,40 @@ end sub call testFormatDateTime() call testFormatDateTimeError() +sub testFormatNumberError() + on error resume next + dim x + call Err.clear() + x = FormatNumber(null) + call ok(Err.number = 13, "Err.number = " & Err.number) + call ok(getVT(x) = "VT_EMPTY*", "getVT = " & getVT(x)) + call Err.clear() + x = FormatNumber(.10,null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call ok(getVT(x) = "VT_EMPTY*", "getVT = " & getVT(x)) + call Err.clear() + x = FormatNumber(.10,0,null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call ok(getVT(x) = "VT_EMPTY*", "getVT = " & getVT(x)) + call Err.clear() + x = FormatNumber(.10,0,0,null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call ok(getVT(x) = "VT_EMPTY*", "getVT = " & getVT(x)) + call Err.clear() + x = FormatNumber(.10,0,0,0,null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call ok(getVT(x) = "VT_EMPTY*", "getVT = " & getVT(x)) +end sub + +sub testFormatNumber() + dim x + + x = FormatNumber(0) + x = FormatNumber(.12,,,-1) + call ok(getVT(x) = "VT_BSTR*", "getVT = " & getVT(x)) +end sub + +call testFormatNumber() +call testFormatNumberError() + Call reportSuccess()

1 0

Nikolay Sivov : vbscript: Implement FormatDateTime().
by Alexandre Julliard 16 Nov '22

16 Nov '22

Module: wine Branch: master Commit: b0915dfb5737fc2665fe897e27ed538689ad973c URL: https://gitlab.winehq.org/wine/wine/-/commit/b0915dfb5737fc2665fe897e27ed53… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 16 17:06:33 2022 +0300 vbscript: Implement FormatDateTime(). --- dlls/vbscript/global.c | 28 +++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 25 +++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 73049a5e77f..f6995cb55d7 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -3015,10 +3015,32 @@ static HRESULT Global_FormatPercent(BuiltinDisp *This, VARIANT *args, unsigned a return return_bstr(res, str); } -static HRESULT Global_FormatDateTime(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_FormatDateTime(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + int format = 0; + HRESULT hres; + BSTR str; + + TRACE("\n"); + + assert(1 <= args_cnt && args_cnt <= 2); + + if (V_VT(args) == VT_NULL) + return MAKE_VBSERROR(VBSE_TYPE_MISMATCH); + + if (args_cnt == 2) + { + if (V_VT(args+1) == VT_NULL) return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + if (V_VT(args+1) != VT_ERROR) + { + if (FAILED(hres = to_int(args+1, &format))) return hres; + } + } + + hres = VarFormatDateTime(args, format, 0, &str); + if (FAILED(hres)) return hres; + + return return_bstr(res, str); } static HRESULT Global_WeekdayName(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index ecae726d229..01e034bd73e 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -2411,4 +2411,29 @@ end sub call testFormatPercent() call testFormatPercentError() +sub testFormatDateTimeError() + on error resume next + dim x + call Err.clear() + x = FormatDateTime(null) + call ok(Err.number = 13, "Err.number = " & Err.number) + call ok(getVT(x) = "VT_EMPTY*", "getVT = " & getVT(x)) + call Err.clear() + x = FormatDateTime(.10,null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call ok(getVT(x) = "VT_EMPTY*", "getVT = " & getVT(x)) +end sub + +sub testFormatDateTime() + dim x + + x = FormatDateTime(0) + call ok(getVT(x) = "VT_BSTR*", "getVT = " & getVT(x)) + x = FormatDateTime(0.1,1) + call ok(getVT(x) = "VT_BSTR*", "getVT = " & getVT(x)) +end sub + +call testFormatDateTime() +call testFormatDateTimeError() + Call reportSuccess()

1 0

Nikolay Sivov : vbscript: Implement FormatPercent().
by Alexandre Julliard 16 Nov '22

16 Nov '22

Module: wine Branch: master Commit: fd6cf181f6760e630d6505c6a4624a3af2e59297 URL: https://gitlab.winehq.org/wine/wine/-/commit/fd6cf181f6760e630d6505c6a4624a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 16 16:33:39 2022 +0300 vbscript: Implement FormatPercent(). --- dlls/vbscript/global.c | 32 +++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 471523c0c8f..73049a5e77f 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2983,10 +2983,36 @@ static HRESULT Global_FormatCurrency(BuiltinDisp *This, VARIANT *args, unsigned return return_bstr(res, str); } -static HRESULT Global_FormatPercent(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_FormatPercent(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + union + { + struct + { + int num_dig, inc_lead, use_parens, group; + } s; + int val[4]; + } int_args = { .s.num_dig = -1, .s.inc_lead = -2, .s.use_parens = -2, .s.group = -2 }; + HRESULT hres; + BSTR str; + int i; + + TRACE("\n"); + + assert(1 <= args_cnt && args_cnt <= 5); + + for (i = 1; i < args_cnt; ++i) + { + if (V_VT(args+i) == VT_ERROR) continue; + if (V_VT(args+i) == VT_NULL) return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + if (FAILED(hres = to_int(args+i, &int_args.val[i-1]))) return hres; + } + + hres = VarFormatPercent(args, int_args.s.num_dig, int_args.s.inc_lead, int_args.s.use_parens, + int_args.s.group, 0, &str); + if (FAILED(hres)) return hres; + + return return_bstr(res, str); } static HRESULT Global_FormatDateTime(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 391aa0b63fb..ecae726d229 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -2375,4 +2375,40 @@ end sub call testFormatCurrency() call testFormatCurrencyError() +sub testFormatPercentError() + on error resume next + dim x + call Err.clear() + x = FormatPercent(null) + call ok(Err.number = 13, "Err.number = " & Err.number) + call ok(getVT(x) = "VT_EMPTY*", "getVT = " & getVT(x)) + call Err.clear() + x = FormatPercent(.10,null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call ok(getVT(x) = "VT_EMPTY*", "getVT = " & getVT(x)) + call Err.clear() + x = FormatPercent(.10,0,null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call ok(getVT(x) = "VT_EMPTY*", "getVT = " & getVT(x)) + call Err.clear() + x = FormatPercent(.10,0,0,null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call ok(getVT(x) = "VT_EMPTY*", "getVT = " & getVT(x)) + call Err.clear() + x = FormatPercent(.10,0,0,0,null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call ok(getVT(x) = "VT_EMPTY*", "getVT = " & getVT(x)) +end sub + +sub testFormatPercent() + dim x + + x = FormatPercent(0) + x = FormatPercent(.12,,,-1) + call ok(getVT(x) = "VT_BSTR*", "getVT = " & getVT(x)) +end sub + +call testFormatPercent() +call testFormatPercentError() + Call reportSuccess()

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2022