October 2014 - Wine-commits

André Hentschel : slc: Add stub for SLGetWindowsInformation.
by Alexandre Julliard 08 Oct '14

08 Oct '14

Module: wine Branch: master Commit: e97746a538467835db2a278e442d67116dda853b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e97746a538467835db2a278e4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 7 21:27:30 2014 +0200 slc: Add stub for SLGetWindowsInformation. --- dlls/slc/slc.c | 9 ++++++++- dlls/slc/slc.spec | 2 +- include/slpublic.h | 13 ++++++++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/slc/slc.c b/dlls/slc/slc.c index e7416f1..1b02c9b 100644 --- a/dlls/slc/slc.c +++ b/dlls/slc/slc.c @@ -28,7 +28,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(slc); -DWORD WINAPI SLGetWindowsInformationDWORD(LPCWSTR lpszValueName, LPDWORD pdwValue) +HRESULT WINAPI SLGetWindowsInformation(LPCWSTR name, SLDATATYPE *type, UINT *val, LPBYTE *size) +{ + FIXME("(%s %p %p %p) stub\n", debugstr_w(name), type, val, size ); + + return SL_E_RIGHT_NOT_GRANTED; +} + +HRESULT WINAPI SLGetWindowsInformationDWORD(LPCWSTR lpszValueName, LPDWORD pdwValue) { FIXME("(%s) stub\n", debugstr_w(lpszValueName) ); diff --git a/dlls/slc/slc.spec b/dlls/slc/slc.spec index 45cd1ba..af5545c 100644 --- a/dlls/slc/slc.spec +++ b/dlls/slc/slc.spec @@ -25,7 +25,7 @@ @ stub SLGetSAMLicense @ stub SLGetSLIDList @ stub SLGetServiceInformation -@ stub SLGetWindowsInformation +@ stdcall SLGetWindowsInformation(wstr ptr ptr ptr) @ stdcall SLGetWindowsInformationDWORD(wstr ptr) @ stub SLInstallLicense @ stub SLInstallProofOfPurchase diff --git a/include/slpublic.h b/include/slpublic.h index a2c6d42..c8bb559 100644 --- a/include/slpublic.h +++ b/include/slpublic.h @@ -29,7 +29,18 @@ extern "C" { #define SLCAPI DECLSPEC_IMPORT #endif -SLCAPI DWORD WINAPI SLGetWindowsInformationDWORD(LPCWSTR lpszValueName, LPDWORD pdwValue); +typedef enum _tagSLDATATYPE +{ + SL_DATA_NONE = REG_NONE, + SL_DATA_SZ = REG_SZ, + SL_DATA_DWORD = REG_DWORD, + SL_DATA_BINARY = REG_BINARY, + SL_DATA_MULTI_SZ = REG_MULTI_SZ, + SL_DATA_SUM = 100, +} SLDATATYPE; + +SLCAPI HRESULT WINAPI SLGetWindowsInformation(LPCWSTR, SLDATATYPE*, UINT*, LPBYTE*); +SLCAPI HRESULT WINAPI SLGetWindowsInformationDWORD(LPCWSTR, LPDWORD); #ifdef __cplusplus

1 0

André Hentschel : ntdll: Add support for Win 8.1.
by Alexandre Julliard 08 Oct '14

08 Oct '14

Module: wine Branch: master Commit: 778c2ab6f9c7dc1d5ff0d340d8e4571a888cdb8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=778c2ab6f9c7dc1d5ff0d340d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 7 21:27:45 2014 +0200 ntdll: Add support for Win 8.1. --- dlls/ntdll/version.c | 8 ++++++++ programs/winecfg/appdefaults.c | 1 + 2 files changed, 9 insertions(+) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 57e586a..a6340eb 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -57,6 +57,7 @@ typedef enum WIN2K8R2,/* Windows 2008 R2 */ WIN7, /* Windows 7 */ WIN8, /* Windows 8 */ + WIN81, /* Windows 8.1 */ NB_WINDOWS_VERSIONS } WINDOWS_VERSION; @@ -177,6 +178,12 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = {' ',0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, + /* WIN81 */ + { + sizeof(RTL_OSVERSIONINFOEXW), 6, 3, 0x2580, VER_PLATFORM_WIN32_NT, + {' ',0}, + 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 + }, }; @@ -199,6 +206,7 @@ static const char * const WinVersionNames[NB_WINDOWS_VERSIONS] = "win2008r2,win2k8r2", /* WIN2K8R2 */ "win7", /* WIN7 */ "win8", /* WIN8 */ + "win81", /* WIN81 */ }; diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 3b83860..6106b23 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -49,6 +49,7 @@ static const struct const char *szProductType; } win_versions[] = { + { "win81", "Windows 8.1", 6, 3, 0x2580,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, { "win8", "Windows 8", 6, 2, 0x23F0,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, { "win2008r2", "Windows 2008 R2", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"}, { "win7", "Windows 7", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "WinNT"},

1 0

André Hentschel : winetest: Detect real version values.
by Alexandre Julliard 08 Oct '14

08 Oct '14

Module: wine Branch: master Commit: 6d498018cc8d85a7126fe72ef4192cd3480f8405 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d498018cc8d85a7126fe72ef… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 7 19:52:59 2014 +0200 winetest: Detect real version values. --- programs/winetest/main.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index cde618f..2afa813 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -32,6 +32,7 @@ #include <stdio.h> #include <assert.h> #include <windows.h> +#include <winternl.h> #include <mshtml.h> #include "winetest.h" @@ -323,11 +324,14 @@ static void print_version (void) # error CPU unknown #endif OSVERSIONINFOEXA ver; + RTL_OSVERSIONINFOEXW rtlver; BOOL ext; int is_win2k3_r2, is_admin, is_elevated; const char *(CDECL *wine_get_build_id)(void); + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); void (CDECL *wine_get_host_version)( const char **sysname, const char **release ); BOOL (WINAPI *pGetProductInfo)(DWORD, DWORD, DWORD, DWORD, DWORD *); + NTSTATUS (WINAPI *pRtlGetVersion)(RTL_OSVERSIONINFOEXW *); ver.dwOSVersionInfoSize = sizeof(ver); if (!(ext = GetVersionExA ((OSVERSIONINFOA *) &ver))) @@ -336,6 +340,27 @@ static void print_version (void) if (!GetVersionExA ((OSVERSIONINFOA *) &ver)) report (R_FATAL, "Can't get OS version."); } + + /* try to get non-faked values */ + if (ver.dwMajorVersion == 6 && ver.dwMinorVersion == 2) + { + rtlver.dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOEXW); + + pRtlGetVersion = (void *)GetProcAddress(hntdll, "RtlGetVersion"); + pRtlGetVersion(&rtlver); + + ver.dwMajorVersion = rtlver.dwMajorVersion; + ver.dwMinorVersion = rtlver.dwMinorVersion; + ver.dwBuildNumber = rtlver.dwBuildNumber; + ver.dwPlatformId = rtlver.dwPlatformId; + ver.wServicePackMajor = rtlver.wServicePackMajor; + ver.wServicePackMinor = rtlver.wServicePackMinor; + ver.wSuiteMask = rtlver.wSuiteMask; + ver.wProductType = rtlver.wProductType; + + WideCharToMultiByte(CP_ACP, 0, rtlver.szCSDVersion, -1, ver.szCSDVersion, sizeof(ver.szCSDVersion), NULL, NULL); + } + xprintf (" Platform=%s%s\n", platform, is_wow64 ? " (WOW64)" : ""); xprintf (" bRunningUnderWine=%d\n", running_under_wine ()); xprintf (" bRunningOnVisibleDesktop=%d\n", running_on_visible_desktop ()); @@ -358,8 +383,8 @@ static void print_version (void) ver.dwMajorVersion, ver.dwMinorVersion, ver.dwBuildNumber, ver.dwPlatformId, ver.szCSDVersion); - wine_get_build_id = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "wine_get_build_id"); - wine_get_host_version = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "wine_get_host_version"); + wine_get_build_id = (void *)GetProcAddress(hntdll, "wine_get_build_id"); + wine_get_host_version = (void *)GetProcAddress(hntdll, "wine_get_host_version"); if (wine_get_build_id) xprintf( " WineBuild=%s\n", wine_get_build_id() ); if (wine_get_host_version) {

1 0

Alistair Leslie-Hughes : ws2_32: Make SOCKET output consistent.
by Alexandre Julliard 08 Oct '14

08 Oct '14

Module: wine Branch: master Commit: a5df09b4047b11b2534fa699b8b887c8af7f724a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5df09b4047b11b2534fa699b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 8 09:27:19 2014 +1100 ws2_32: Make SOCKET output consistent. --- dlls/ws2_32/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 8b60fb3..0bcce40 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2293,7 +2293,7 @@ static int WS2_register_async_shutdown( SOCKET s, int type ) struct ws2_async *wsa; NTSTATUS status; - TRACE("s %ld type %d\n", s, type); + TRACE("s %04lx type %d\n", s, type); wsa = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( struct ws2_async, iovec[1] )); if ( !wsa ) @@ -3744,7 +3744,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID int fd; DWORD status = 0, total = 0; - TRACE("%ld, %s, %p, %d, %p, %d, %p, %p, %p\n", + TRACE("%04lx, %s, %p, %d, %p, %d, %p, %p, %p\n", s, debugstr_wsaioctl(code), in_buff, in_size, out_buff, out_size, ret_size, overlapped, completion); switch (code)

1 0

Nikolay Sivov : dwrite: Use E_NOT_SUFFICIENT_BUFFER definition.
by Alexandre Julliard 08 Oct '14

08 Oct '14

Module: wine Branch: master Commit: 37a02acc6a727930295178bbcda239b4381bb1c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37a02acc6a727930295178bbc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 7 09:38:34 2014 +0400 dwrite: Use E_NOT_SUFFICIENT_BUFFER definition. --- dlls/dwrite/analyzer.c | 2 +- dlls/dwrite/tests/analyzer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 5851e90..1a05335 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -860,7 +860,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, script = analysis->script > Script_LastId ? Script_Unknown : analysis->script; if (max_glyph_count < length) - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + return E_NOT_SUFFICIENT_BUFFER; if (substitution) FIXME("number substitution is not supported.\n"); diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 1add761..233f072 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1121,7 +1121,7 @@ static void test_GetGlyphs(void) sa.shapes = DWRITE_SCRIPT_SHAPES_DEFAULT; hr = IDWriteTextAnalyzer_GetGlyphs(analyzer, test1W, lstrlenW(test1W), fontface, FALSE, FALSE, &sa, NULL, NULL, NULL, NULL, 0, maxglyphcount, clustermap, props, glyphs1, shapingprops, &actual_count); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "got 0x%08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); if (0) { /* NULL fontface - crashes on Windows */

1 0

Nikolay Sivov : msi: Use E_NOT_SUFFICIENT_BUFFER definition.
by Alexandre Julliard 08 Oct '14

08 Oct '14

Module: wine Branch: master Commit: 8f971bfee6cb88b2f9048e274b701538688b1151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f971bfee6cb88b2f9048e274… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 8 08:27:49 2014 +0400 msi: Use E_NOT_SUFFICIENT_BUFFER definition. --- dlls/msi/assembly.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 2f321db..a25b19d 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -251,7 +251,7 @@ static BOOL is_assembly_installed( IAssemblyCache *cache, const WCHAR *display_n memset( &info, 0, sizeof(info) ); info.cbAssemblyInfo = sizeof(info); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, display_name, &info ); - if (hr == S_OK /* sxs version */ || hr == HRESULT_FROM_WIN32( ERROR_INSUFFICIENT_BUFFER )) + if (hr == S_OK /* sxs version */ || hr == E_NOT_SUFFICIENT_BUFFER) { return (info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED); } @@ -357,7 +357,7 @@ static enum clr_version get_clr_version( const WCHAR *filename ) if (!pGetFileVersion) return CLR_VERSION_V10; hr = pGetFileVersion( filename, NULL, 0, &len ); - if (hr != HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) return CLR_VERSION_V11; + if (hr != E_NOT_SUFFICIENT_BUFFER) return CLR_VERSION_V11; if ((strW = msi_alloc( len * sizeof(WCHAR) ))) { hr = pGetFileVersion( filename, strW, len, &len );

1 0

Nikolay Sivov : propsys: Use E_NOT_SUFFICIENT_BUFFER definition.
by Alexandre Julliard 08 Oct '14

08 Oct '14

Module: wine Branch: master Commit: a7b848f32e981ce044d5b7f7c143f4d27903d1a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7b848f32e981ce044d5b7f7c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 8 08:39:26 2014 +0400 propsys: Use E_NOT_SUFFICIENT_BUFFER definition. --- dlls/propsys/propsys_main.c | 6 +++--- dlls/propsys/tests/propsys.c | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 6713adf..7631023 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -293,12 +293,12 @@ HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY pkey, LPWSTR psz, UINT cch /* GUIDSTRING_MAX accounts for null terminator, +1 for space character. */ if (cch <= GUIDSTRING_MAX + 1) - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + return E_NOT_SUFFICIENT_BUFFER; if (!pkey) { psz[0] = '\0'; - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + return E_NOT_SUFFICIENT_BUFFER; } sprintfW(psz, guid_fmtW, pkey->fmtid.Data1, pkey->fmtid.Data2, @@ -336,7 +336,7 @@ HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY pkey, LPWSTR psz, UINT cch *p++ = *ptr--; } - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + return E_NOT_SUFFICIENT_BUFFER; } } diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index fc595f9..99d1c460 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -108,19 +108,19 @@ static void test_PSStringFromPropertyKey(void) {NULL, NULL, 0, E_POINTER}, {&prop, NULL, 0, E_POINTER}, {&prop, NULL, PKEYSTR_MAX, E_POINTER}, - {NULL, out, 0, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW}, - {NULL, out, PKEYSTR_MAX, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_fillerW, FALSE, 0, TRUE, fillerW}, - {&prop, out, 0, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW}, - {&prop, out, GUIDSTRING_MAX, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW}, - {&prop, out, GUIDSTRING_MAX + 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW}, - {&prop, out, GUIDSTRING_MAX + 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncatedW, TRUE, S_OK, TRUE, truncatedW}, - {&prop, out, PKEYSTR_MAX - 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated2W, TRUE, S_OK, TRUE, truncated2W}, - {&prop, out, PKEYSTR_MAX - 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated3W, TRUE, S_OK, TRUE, truncated3W}, + {NULL, out, 0, E_NOT_SUFFICIENT_BUFFER, fillerW}, + {NULL, out, PKEYSTR_MAX, E_NOT_SUFFICIENT_BUFFER, zero_fillerW, FALSE, 0, TRUE, fillerW}, + {&prop, out, 0, E_NOT_SUFFICIENT_BUFFER, fillerW}, + {&prop, out, GUIDSTRING_MAX, E_NOT_SUFFICIENT_BUFFER, fillerW}, + {&prop, out, GUIDSTRING_MAX + 1, E_NOT_SUFFICIENT_BUFFER, fillerW}, + {&prop, out, GUIDSTRING_MAX + 2, E_NOT_SUFFICIENT_BUFFER, zero_truncatedW, TRUE, S_OK, TRUE, truncatedW}, + {&prop, out, PKEYSTR_MAX - 2, E_NOT_SUFFICIENT_BUFFER, zero_truncated2W, TRUE, S_OK, TRUE, truncated2W}, + {&prop, out, PKEYSTR_MAX - 1, E_NOT_SUFFICIENT_BUFFER, zero_truncated3W, TRUE, S_OK, TRUE, truncated3W}, {&prop, out, PKEYSTR_MAX, S_OK, expectedW}, - {&prop2, out, GUIDSTRING_MAX + 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated4W, TRUE, S_OK, TRUE, truncated4W}, + {&prop2, out, GUIDSTRING_MAX + 2, E_NOT_SUFFICIENT_BUFFER, zero_truncated4W, TRUE, S_OK, TRUE, truncated4W}, {&prop2, out, GUIDSTRING_MAX + 6, S_OK, expected2W}, {&prop2, out, PKEYSTR_MAX, S_OK, expected2W}, - {&prop3, out, GUIDSTRING_MAX + 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW}, + {&prop3, out, GUIDSTRING_MAX + 1, E_NOT_SUFFICIENT_BUFFER, fillerW}, {&prop3, out, GUIDSTRING_MAX + 2, S_OK, expected3W}, {&prop3, out, PKEYSTR_MAX, S_OK, expected3W}, };

1 0

Nikolay Sivov : shell32: Use E_NOT_SUFFICIENT_BUFFER definition.
by Alexandre Julliard 08 Oct '14

08 Oct '14

Module: wine Branch: master Commit: 730e744e3bd6b706612fe0f90a7efb2e600f114f URL: http://source.winehq.org/git/wine.git/?a=commit;h=730e744e3bd6b706612fe0f90… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 8 08:31:10 2014 +0400 shell32: Use E_NOT_SUFFICIENT_BUFFER definition. --- dlls/shell32/shellpath.c | 2 +- dlls/shell32/shfldr_desktop.c | 2 +- dlls/shell32/tests/shellpath.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index e361483..f92d56e 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2097,7 +2097,7 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) DWORD ret = ExpandEnvironmentStringsW(szSrc, szDest, MAX_PATH); if (ret > MAX_PATH) - hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + hr = E_NOT_SUFFICIENT_BUFFER; else if (ret == 0) hr = HRESULT_FROM_WIN32(GetLastError()); else diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 695e558..815a421 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -247,7 +247,7 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, else { /* should never reach here, but for completeness */ - hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + hr = E_NOT_SUFFICIENT_BUFFER; } } } diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index efdfbbd..e2277ec 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -878,7 +878,7 @@ if (0) { /* crashes */ ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); } hr = pSHGetFolderPathEx(&FOLDERID_Desktop, 0, NULL, buffer, len); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "expected 0x8007007a, got 0x%08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "expected E_NOT_SUFFICIENT_BUFFER, got 0x%08x\n", hr); hr = pSHGetFolderPathEx(&FOLDERID_Desktop, 0, NULL, buffer, len + 1); ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr);

1 0

Nikolay Sivov : shlwapi: Use E_NOT_SUFFICIENT_BUFFER definition.
by Alexandre Julliard 08 Oct '14

08 Oct '14

Module: wine Branch: master Commit: 6ebe8d5a2a4006b61eb888ceaa7eb50106ab6312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ebe8d5a2a4006b61eb888cea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 8 08:36:01 2014 +0400 shlwapi: Use E_NOT_SUFFICIENT_BUFFER definition. --- dlls/shlwapi/ordinal.c | 4 ++-- dlls/shlwapi/tests/ordinal.c | 18 +++++++++--------- dlls/shlwapi/tests/string.c | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 21a75e9..8d3f1eb 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -453,7 +453,7 @@ exit: * Success: S_OK. langbuf is set to the language string found. * Failure: E_FAIL, If any arguments are invalid, error occurred, or Explorer * does not contain the setting. - * HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), If the buffer is not big enough + * E_NOT_SUFFICIENT_BUFFER, If the buffer is not big enough */ HRESULT WINAPI GetAcceptLanguagesW( LPWSTR langbuf, LPDWORD buflen) { @@ -506,7 +506,7 @@ HRESULT WINAPI GetAcceptLanguagesW( LPWSTR langbuf, LPDWORD buflen) } *buflen = 0; - return __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + return E_NOT_SUFFICIENT_BUFFER; } /************************************************************************* diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 099907b..d8a4f68 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -290,14 +290,14 @@ static void test_GetAcceptLanguagesA(void) When the buffer is large enough, the default language is returned When the buffer is too small for that fallback, win7_32 and w2k8_64 - fail with HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), win8 fails - with HRESULT_FROM_WIN32(ERROR_MORE_DATA), other versions succeed and - return a partial result while older os succeed and overflow the buffer */ + fail with E_NOT_SUFFICIENT_BUFFER, win8 fails with HRESULT_FROM_WIN32(ERROR_MORE_DATA), + other versions succeed and return a partial result while older os succeed + and overflow the buffer */ ok(((hr == E_INVALIDARG) && (len == 0)) || (((hr == S_OK) && !lstrcmpA(buffer, language) && (len == lstrlenA(language))) || ((hr == S_OK) && !memcmp(buffer, language, len)) || - ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len) || + ((hr == E_NOT_SUFFICIENT_BUFFER) && !len) || ((hr == __HRESULT_FROM_WIN32(ERROR_MORE_DATA)) && len == exactsize)), "==_#%d: got 0x%x with %d and %s\n", i, hr, len, buffer); @@ -309,7 +309,7 @@ static void test_GetAcceptLanguagesA(void) ok(((hr == E_INVALIDARG) && (len == 0)) || (((hr == S_OK) && !lstrcmpA(buffer, language) && (len == lstrlenA(language))) || ((hr == S_OK) && !memcmp(buffer, language, len)) || - ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len) || + ((hr == E_NOT_SUFFICIENT_BUFFER) && !len) || ((hr == __HRESULT_FROM_WIN32(ERROR_MORE_DATA)) && len == exactsize - 1)), "-1_#%d: got 0x%x with %d and %s\n", i, hr, len, buffer); } @@ -321,7 +321,7 @@ static void test_GetAcceptLanguagesA(void) ok(((hr == E_INVALIDARG) && (len == 0)) || (((hr == S_OK) && !lstrcmpA(buffer, language) && (len == lstrlenA(language))) || ((hr == S_OK) && !memcmp(buffer, language, len)) || - ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len) || + ((hr == E_NOT_SUFFICIENT_BUFFER) && !len) || ((hr == __HRESULT_FROM_WIN32(ERROR_MORE_DATA)) && len == 1)), "=1_#%d: got 0x%x with %d and %s\n", i, hr, len, buffer); @@ -353,7 +353,7 @@ static void test_GetAcceptLanguagesA(void) buffer[maxlen] = 0; hr = pGetAcceptLanguagesA( buffer, &len); ok( (((hr == S_OK) || (hr == E_INVALIDARG)) && !memcmp(buffer, language, len)) || - ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len) || + ((hr == E_NOT_SUFFICIENT_BUFFER) && !len) || ((hr == __HRESULT_FROM_WIN32(ERROR_CANNOT_COPY)) && !len), "=2: got 0x%x with %d and %s\n", hr, len, buffer); @@ -362,11 +362,11 @@ static void test_GetAcceptLanguagesA(void) buffer[maxlen] = 0; hr = pGetAcceptLanguagesA( buffer, &len); /* When the buffer is too small, win7_32 and w2k8_64 and above fail with - HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), win8 ERROR_CANNOT_COPY, + E_NOT_SUFFICIENT_BUFFER, win8 ERROR_CANNOT_COPY, other versions succeed and return a partial 0 terminated result while other versions fail with E_INVALIDARG and return a partial unterminated result */ ok( (((hr == S_OK) || (hr == E_INVALIDARG)) && !memcmp(buffer, language, len)) || - ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len) || + ((hr == E_NOT_SUFFICIENT_BUFFER) && !len) || ((hr == __HRESULT_FROM_WIN32(ERROR_CANNOT_COPY)) && !len), "=1: got 0x%x with %d and %s\n", hr, len, buffer); diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index e5f0283..c72b774 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -1058,7 +1058,7 @@ if (0) memset(wbuf, 0xbf, sizeof(wbuf)); strret.uType = STRRET_WSTR; U(strret).pOleStr = StrDupW(wstr1); - expect_eq2(pStrRetToBufW(&strret, NULL, wbuf, 10), S_OK, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) /* Vista */, HRESULT, "%x"); + expect_eq2(pStrRetToBufW(&strret, NULL, wbuf, 10), S_OK, E_NOT_SUFFICIENT_BUFFER /* Vista */, HRESULT, "%x"); expect_eq(wbuf[9], 0, WCHAR, "%x"); expect_eq(wbuf[10], (WCHAR)0xbfbf, WCHAR, "%x"); } @@ -1070,7 +1070,7 @@ if (0) memset(buf, 0xbf, sizeof(buf)); strret.uType = STRRET_CSTR; StrCpyNA(U(strret).cStr, str1, MAX_PATH); - expect_eq2(pStrRetToBufA(&strret, NULL, buf, 10), S_OK, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) /* Vista */, HRESULT, "%x"); + expect_eq2(pStrRetToBufA(&strret, NULL, buf, 10), S_OK, E_NOT_SUFFICIENT_BUFFER /* Vista */, HRESULT, "%x"); expect_eq(buf[9], 0, CHAR, "%x"); expect_eq(buf[10], (CHAR)0xbf, CHAR, "%x"); }

1 0

Nikolay Sivov : urlmon: Use E_NOT_SUFFICIENT_BUFFER definition.
by Alexandre Julliard 08 Oct '14

08 Oct '14

Module: wine Branch: master Commit: 8735cfc08693c9552ad98ceec95e2470a739a5d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8735cfc08693c9552ad98ceec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 8 08:42:56 2014 +0400 urlmon: Use E_NOT_SUFFICIENT_BUFFER definition. --- dlls/urlmon/sec_mgr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index e1c7ec8..cfc68de 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -740,7 +740,7 @@ static HRESULT generate_security_id(IUri *uri, BYTE *secid, DWORD *secid_len, DW if(len+sizeof(DWORD) > *secid_len) { SysFreeString(display_uri); - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + return E_NOT_SUFFICIENT_BUFFER; } WideCharToMultiByte(CP_ACP, 0, display_uri, -1, (LPSTR)secid, len, NULL, NULL); @@ -776,7 +776,7 @@ static HRESULT generate_security_id(IUri *uri, BYTE *secid, DWORD *secid_len, DW if(len+sizeof(DWORD) > *secid_len) { SysFreeString(host); SysFreeString(scheme); - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + return E_NOT_SUFFICIENT_BUFFER; } WideCharToMultiByte(CP_ACP, 0, scheme, -1, (LPSTR)secid, len, NULL, NULL);

1 0