October 2014 - Wine-Commits

Alistair Leslie-Hughes : ws2_32: Make SOCKET output consistent.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

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

Austin English : kernel32: Add a stub for SetSystemFileCacheSize.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 96e920e01f90a2d9c343ad57986f8bf0ad1eb63f URL: http://source.winehq.org/git/wine.git/?a=commit;h=96e920e01f90a2d9c343ad579… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 7 14:35:03 2014 -0500 kernel32: Add a stub for SetSystemFileCacheSize. --- .../api-ms-win-core-memory-l1-1-1.spec | 2 +- dlls/kernel32/heap.c | 7 +++++++ dlls/kernel32/kernel32.spec | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec b/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec index f0cd496..5d3eb13 100644 --- a/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec +++ b/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec @@ -16,7 +16,7 @@ @ stdcall ReadProcessMemory(long ptr ptr long ptr) kernel32.ReadProcessMemory @ stdcall ResetWriteWatch(ptr long) kernel32.ResetWriteWatch @ stub SetProcessWorkingSetSizeEx -@ stub SetSystemFileCacheSize +@ stdcall SetSystemFileCacheSize(long long long) kernel32.SetSystemFileCacheSize @ stdcall UnmapViewOfFile(ptr) kernel32.UnmapViewOfFile @ stub UnmapViewOfFileEx @ stdcall VirtualAlloc(ptr long long long) kernel32.VirtualAlloc diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 5a16a12..9037f8e 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1454,3 +1454,10 @@ BOOL WINAPI GetSystemFileCacheSize(PSIZE_T mincache, PSIZE_T maxcache, PDWORD fl SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +BOOL WINAPI SetSystemFileCacheSize(SIZE_T mincache, SIZE_T maxcache, DWORD flags) +{ + FIXME("stub: %ld %ld %d\n", mincache, maxcache, flags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index e82a64d..d08f90c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1167,6 +1167,7 @@ @ stdcall SetProcessShutdownParameters(long long) @ stdcall SetProcessWorkingSetSize(long long long) @ stdcall SetStdHandle(long long) +@ stdcall SetSystemFileCacheSize(long long long) @ stdcall SetSystemPowerState(long long) @ stdcall SetSystemTime(ptr) @ stdcall SetSystemTimeAdjustment(long long)

1 0

Henri Verbeet : wined3d: Track format conversion per-texture.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 710694d9ca654f3d01a74a06240b0c6252b135be URL: http://source.winehq.org/git/wine.git/?a=commit;h=710694d9ca654f3d01a74a062… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 8 08:47:22 2014 +0200 wined3d: Track format conversion per-texture. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/surface.c | 16 +++++++++------- dlls/wined3d/texture.c | 17 ++++++----------- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 52b9d9d..6fbe296 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7469,7 +7469,7 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, struct arbfp_blit_type type; struct arbfp_blit_desc *desc; - if (surface->flags & SFLAG_CONVERTED) + if (surface->container->flags & WINED3D_TEXTURE_CONVERTED) { gl_info->gl_ops.gl.p_glEnable(textype); checkGLcall("glEnable(textype)"); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0967220..527601f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -588,11 +588,12 @@ void surface_prepare_map_memory(struct wined3d_surface *surface) static void surface_evict_sysmem(struct wined3d_surface *surface) { /* In some conditions the surface memory must not be freed: - * SFLAG_CONVERTED: Converting the data back would take too long + * WINED3D_TEXTURE_CONVERTED: Converting the data back would take too long * SFLAG_DYNLOCK: Avoid freeing the data for performance * SFLAG_CLIENT: OpenGL uses our memory as backup */ - if (surface->resource.map_count || surface->flags & (SFLAG_CONVERTED | SFLAG_DYNLOCK - | SFLAG_CLIENT | SFLAG_PIN_SYSMEM)) + if (surface->resource.map_count + || surface->flags & (SFLAG_DYNLOCK | SFLAG_CLIENT | SFLAG_PIN_SYSMEM) + || surface->container->flags & WINED3D_TEXTURE_CONVERTED) return; wined3d_resource_free_sysmem(&surface->resource); @@ -1323,7 +1324,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct struct wined3d_bo_address data; /* Only support read back of converted P8 surfaces. */ - if (surface->flags & SFLAG_CONVERTED && format->id != WINED3DFMT_P8_UINT) + if (surface->container->flags & WINED3D_TEXTURE_CONVERTED && format->id != WINED3DFMT_P8_UINT) { ERR("Trying to read back converted surface %p with format %s.\n", surface, debug_d3dformat(format->id)); return; @@ -4189,8 +4190,8 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, format = *wined3d_get_format(gl_info, conversion->dst_format); /* Don't use PBOs for converted surfaces. During PBO conversion we look at - * SFLAG_CONVERTED but it isn't set (yet) in all cases it is getting - * called. */ + * WINED3D_TEXTURE_CONVERTED but it isn't set (yet) in all cases it is + * getting called. */ if ((format.convert || conversion) && surface->pbo) { TRACE("Removing the pbo attached to surface %p.\n", surface); @@ -5285,7 +5286,8 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC /* We want to avoid invalidating the sysmem location for converted * surfaces, since otherwise we'd have to convert the data back when * locking them. */ - if (dst_surface->flags & SFLAG_CONVERTED || dst_surface->container->resource.format->convert + if (dst_surface->container->flags & WINED3D_TEXTURE_CONVERTED + || dst_surface->container->resource.format->convert || wined3d_format_get_color_key_conversion(dst_surface->container, TRUE)) { WARN_(d3d_perf)("Converted surface, using CPU blit.\n"); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index bc75305..fb0f0e8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -765,7 +765,7 @@ void wined3d_texture_force_reload(struct wined3d_texture *texture) unsigned int sub_count = texture->level_count * texture->layer_count; unsigned int i; - texture->flags &= ~(WINED3D_TEXTURE_RGB_ALLOCATED | WINED3D_TEXTURE_SRGB_ALLOCATED); + texture->flags &= ~(WINED3D_TEXTURE_RGB_ALLOCATED | WINED3D_TEXTURE_SRGB_ALLOCATED | WINED3D_TEXTURE_CONVERTED); for (i = 0; i < sub_count; ++i) { texture->texture_ops->texture_sub_resource_invalidate_location(texture->sub_resources[i], @@ -850,7 +850,6 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi const struct wined3d_format *format = texture->resource.format; const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_color_key_conversion *conversion; - BOOL converted = FALSE; GLenum internal; UINT i; @@ -858,11 +857,11 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi if (format->convert) { - converted = TRUE; + texture->flags |= WINED3D_TEXTURE_CONVERTED; } else if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE))) { - converted = TRUE; + texture->flags |= WINED3D_TEXTURE_CONVERTED; format = wined3d_get_format(gl_info, conversion->dst_format); TRACE("Using format %s for color key conversion.\n", debug_d3dformat(format->id)); } @@ -889,11 +888,6 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi GLsizei width = surface->pow2Width; const BYTE *mem = NULL; - if (converted) - surface->flags |= SFLAG_CONVERTED; - else - surface->flags &= ~SFLAG_CONVERTED; - if (format->flags & WINED3DFMT_FLAG_HEIGHT_SCALE) { height *= format->height_scale.numerator; @@ -905,13 +899,14 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi if (gl_info->supported[APPLE_CLIENT_STORAGE]) { - if (surface->flags & (SFLAG_NONPOW2 | SFLAG_DIBSECTION | SFLAG_CONVERTED) + if (surface->flags & (SFLAG_NONPOW2 | SFLAG_DIBSECTION) + || texture->flags & WINED3D_TEXTURE_CONVERTED || !surface->resource.heap_memory) { /* In some cases we want to disable client storage. * SFLAG_NONPOW2 has a bigger opengl texture than the client memory, and different pitches * SFLAG_DIBSECTION: Dibsections may have read / write protections on the memory. Avoid issues... - * SFLAG_CONVERTED: The conversion destination memory is freed after loading the surface + * WINED3D_TEXTURE_CONVERTED: The conversion destination memory is freed after loading the surface * heap_memory == NULL: Not defined in the extension. Seems to disable client storage effectively */ surface->flags &= ~SFLAG_CLIENT; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5ec5088..810da0f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2128,6 +2128,7 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_RGB_VALID 0x00000010 #define WINED3D_TEXTURE_SRGB_ALLOCATED 0x00000020 #define WINED3D_TEXTURE_SRGB_VALID 0x00000040 +#define WINED3D_TEXTURE_CONVERTED 0x00000080 struct wined3d_texture { @@ -2345,7 +2346,7 @@ void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3 void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) DECLSPEC_HIDDEN; /* Surface flags: */ -#define SFLAG_CONVERTED 0x00000001 /* Converted for color keying or palettized. */ +#define SFLAG_DIBSECTION 0x00000001 /* Has a DIB section attached for GetDC. */ #define SFLAG_DISCARD 0x00000002 /* ??? */ #define SFLAG_NONPOW2 0x00000004 /* Surface sizes are not a power of 2 */ #define SFLAG_NORMCOORD 0x00000008 /* Set if GL texture coordinates are normalized (non-texture rectangle). */ @@ -2355,7 +2356,6 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_LOST 0x00000080 /* Surface lost flag for ddraw. */ #define SFLAG_GLCKEY 0x00000100 /* The GL texture was created with a color key. */ #define SFLAG_CLIENT 0x00000200 /* GL_APPLE_client_storage is used with this surface. */ -#define SFLAG_DIBSECTION 0x00000400 /* Has a DIB section attached for GetDC. */ struct wined3d_sampler {

1 0

Henri Verbeet : wined3d: Only prepare the texture in device_update_volume( ).
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 4c454fd4abc29a8a45ef35c97a52dfe5070993cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c454fd4abc29a8a45ef35c97… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 8 08:47:21 2014 +0200 wined3d: Only prepare the texture in device_update_volume(). --- dlls/wined3d/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index aa97c7d..ee3636e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3481,7 +3481,8 @@ static HRESULT device_update_volume(struct wined3d_device *device, context = context_acquire(device, NULL); - wined3d_volume_load(dst_volume, context, FALSE); + /* Only a prepare, since we're uploading the entire volume. */ + wined3d_texture_prepare_texture(dst_volume->container, context, FALSE); data.buffer_object = 0; data.addr = src.data;

1 0

Henri Verbeet : wined3d: Track texture allocation per-texture.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: ee8a5b7dd1e554ef32229c766715f23ba17c9f6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee8a5b7dd1e554ef32229c766… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 8 08:47:20 2014 +0200 wined3d: Track texture allocation per-texture. --- dlls/wined3d/surface.c | 13 +++--------- dlls/wined3d/texture.c | 47 +++++++++++++++++++++++++++++++----------- dlls/wined3d/volume.c | 8 +++---- dlls/wined3d/wined3d_private.h | 14 ++++++------- 4 files changed, 49 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee8a5b7dd1e554ef32229…

1 0

Henri Verbeet : wined3d: Handle GL texture allocation in the texture code.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 0c0a2adc71a288cef99e2a08627ef7ab11c2f3ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c0a2adc71a288cef99e2a086… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 8 08:47:19 2014 +0200 wined3d: Handle GL texture allocation in the texture code. --- dlls/wined3d/context.c | 4 +- dlls/wined3d/surface.c | 127 +------------------------------- dlls/wined3d/texture.c | 161 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/volume.c | 62 +--------------- dlls/wined3d/wined3d_private.h | 11 ++- 5 files changed, 180 insertions(+), 185 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c0a2adc71a288cef99e2…

1 0

Henri Verbeet : wined3d: Move the color key conversion helpers to util.c.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 77646173a0a6e12a6a52857aa34029228f82d959 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77646173a0a6e12a6a52857aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 8 08:47:18 2014 +0200 wined3d: Move the color key conversion helpers to util.c. --- dlls/wined3d/surface.c | 215 +---------------------------------------- dlls/wined3d/utils.c | 201 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 9 ++ 3 files changed, 214 insertions(+), 211 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=77646173a0a6e12a6a528…

1 0

Nikolay Sivov : shlwapi: Use E_NOT_SUFFICIENT_BUFFER definition.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

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 : shell32: Use E_NOT_SUFFICIENT_BUFFER definition.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

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 : propsys: Use E_NOT_SUFFICIENT_BUFFER definition.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

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