November 2014 - Wine-Commits

Matteo Bruni : d3dx9: Improve the scoring for fallback formats.
by Alexandre Julliard Nov. 11, 2014

Nov. 11, 2014

Module: wine Branch: master Commit: beb72c91af85e09ef63c933b7fbfd876c51fc238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beb72c91af85e09ef63c933b7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Nov 10 18:56:14 2014 +0100 d3dx9: Improve the scoring for fallback formats. --- dlls/d3dx9_36/texture.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index e997aa2..de42307 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -302,12 +302,13 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN /* This format can be used, let's evaluate it. Weights chosen quite arbitrarily... */ - score = 16 - 4 * (curchannels - channels); + score = 512 * (curfmt->type == fmt->type); + score -= 32 * (curchannels - channels); for (j = 0; j < 4; j++) { int diff = curfmt->bits[j] - fmt->bits[j]; - score += 16 - (diff < 0 ? -diff * 4 : diff); + score -= (diff < 0 ? -diff * 8 : diff) * (j == 0 ? 1 : 2); } if (score > bestscore)

1 0

Matteo Bruni : d3dx9: Use an alpha-capable format when creating textures with a color key.
by Alexandre Julliard Nov. 11, 2014

Nov. 11, 2014

Module: wine Branch: master Commit: 1569698d9e73b84aa9970c982909900bbc668d22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1569698d9e73b84aa9970c982… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Nov 10 18:56:13 2014 +0100 d3dx9: Use an alpha-capable format when creating textures with a color key. --- dlls/d3dx9_36/tests/texture.c | 113 ++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/texture.c | 30 ++++++++++- 2 files changed, 142 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 61132bb..c90e2d5 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -87,6 +87,16 @@ static const unsigned char dds_volume_map[] = { 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x84,0xef,0x7b,0xaa,0xab,0xab,0xab }; +static const unsigned char png_grayscale[] = +{ + 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, + 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x08, 0x00, + 0x00, 0x00, 0x00, 0x3a, 0x7e, 0x9b, 0x55, 0x00, 0x00, 0x00, 0x0a, 0x49, 0x44, + 0x41, 0x54, 0x08, 0xd7, 0x63, 0xf8, 0x0f, 0x00, 0x01, 0x01, 0x01, 0x00, 0x1b, + 0xb6, 0xee, 0x56, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, + 0x60, 0x82 +}; + #define ADMITTED_ERROR 0.0001f static inline float relative_error(float expected, float got) @@ -1582,6 +1592,109 @@ static void test_D3DXCreateTextureFromFileInMemoryEx(IDirect3DDevice9 *device) D3DUSAGE_DYNAMIC | D3DUSAGE_AUTOGENMIPMAP, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &texture); ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemoryEx returned %#x, expected %#x\n", hr, D3D_OK); if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture); + + /* Checking for color key format overrides. */ + hr = D3DXCreateTextureFromFileInMemoryEx(device, dds_16bit, sizeof(dds_16bit), + D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, + D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &texture); + ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemoryEx returned %#x, expected %#x.\n", hr, D3D_OK); + if (SUCCEEDED(hr)) + { + IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + IDirect3DSurface9_GetDesc(surface, &desc); + ok(desc.Format == D3DFMT_X1R5G5B5, "Returned format %u, expected %u\n", desc.Format, D3DFMT_X1R5G5B5); + IDirect3DTexture9_Release(texture); + } + hr = D3DXCreateTextureFromFileInMemoryEx(device, dds_16bit, sizeof(dds_16bit), + D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, + D3DX_DEFAULT, D3DX_DEFAULT, 0xff000000, NULL, NULL, &texture); + ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemoryEx returned %#x, expected %#x.\n", hr, D3D_OK); + if (SUCCEEDED(hr)) + { + IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + IDirect3DSurface9_GetDesc(surface, &desc); + ok(desc.Format == D3DFMT_A1R5G5B5, "Returned format %u, expected %u\n", desc.Format, D3DFMT_A1R5G5B5); + IDirect3DTexture9_Release(texture); + } + hr = D3DXCreateTextureFromFileInMemoryEx(device, dds_16bit, sizeof(dds_16bit), + D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_X1R5G5B5, D3DPOOL_DEFAULT, + D3DX_DEFAULT, D3DX_DEFAULT, 0xff000000, NULL, NULL, &texture); + ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemoryEx returned %#x, expected %#x.\n", hr, D3D_OK); + if (SUCCEEDED(hr)) + { + IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + IDirect3DSurface9_GetDesc(surface, &desc); + ok(desc.Format == D3DFMT_X1R5G5B5, "Returned format %u, expected %u\n", desc.Format, D3DFMT_X1R5G5B5); + IDirect3DTexture9_Release(texture); + } + + hr = D3DXCreateTextureFromFileInMemoryEx(device, dds_24bit, sizeof(dds_24bit), + D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, + D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &texture); + ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemoryEx returned %#x, expected %#x.\n", hr, D3D_OK); + if (SUCCEEDED(hr)) + { + IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + IDirect3DSurface9_GetDesc(surface, &desc); + ok(desc.Format == D3DFMT_X8R8G8B8, "Returned format %u, expected %u\n", desc.Format, D3DFMT_X8R8G8B8); + IDirect3DTexture9_Release(texture); + } + hr = D3DXCreateTextureFromFileInMemoryEx(device, dds_24bit, sizeof(dds_24bit), + D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, + D3DX_DEFAULT, D3DX_DEFAULT, 0xff000000, NULL, NULL, &texture); + ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemoryEx returned %#x, expected %#x.\n", hr, D3D_OK); + if (SUCCEEDED(hr)) + { + IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + IDirect3DSurface9_GetDesc(surface, &desc); + ok(desc.Format == D3DFMT_A8R8G8B8, "Returned format %u, expected %u\n", desc.Format, D3DFMT_A8R8G8B8); + IDirect3DTexture9_Release(texture); + } + hr = D3DXCreateTextureFromFileInMemoryEx(device, dds_24bit, sizeof(dds_24bit), + D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, + D3DX_DEFAULT, D3DX_DEFAULT, 0xff000000, NULL, NULL, &texture); + ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemoryEx returned %#x, expected %#x.\n", hr, D3D_OK); + if (SUCCEEDED(hr)) + { + IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + IDirect3DSurface9_GetDesc(surface, &desc); + ok(desc.Format == D3DFMT_X8R8G8B8, "Returned format %u, expected %u\n", desc.Format, D3DFMT_X8R8G8B8); + IDirect3DTexture9_Release(texture); + } + + hr = D3DXCreateTextureFromFileInMemoryEx(device, png_grayscale, sizeof(png_grayscale), + D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, + D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &texture); + ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemoryEx returned %#x, expected %#x.\n", hr, D3D_OK); + if (SUCCEEDED(hr)) + { + IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + IDirect3DSurface9_GetDesc(surface, &desc); + ok(desc.Format == D3DFMT_L8, "Returned format %u, expected %u\n", desc.Format, D3DFMT_L8); + IDirect3DTexture9_Release(texture); + } + hr = D3DXCreateTextureFromFileInMemoryEx(device, png_grayscale, sizeof(png_grayscale), + D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, + D3DX_DEFAULT, D3DX_DEFAULT, 0xff000000, NULL, NULL, &texture); + ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemoryEx returned %#x, expected %#x.\n", hr, D3D_OK); + if (SUCCEEDED(hr)) + { + IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + IDirect3DSurface9_GetDesc(surface, &desc); + ok(desc.Format == D3DFMT_A8L8, "Returned format %u, expected %u\n", desc.Format, D3DFMT_A8L8); + IDirect3DTexture9_Release(texture); + } + hr = D3DXCreateTextureFromFileInMemoryEx(device, png_grayscale, sizeof(png_grayscale), + D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_L8, D3DPOOL_DEFAULT, + D3DX_DEFAULT, D3DX_DEFAULT, 0xff000000, NULL, NULL, &texture); + ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemoryEx returned %#x, expected %#x.\n", hr, D3D_OK); + if (SUCCEEDED(hr)) + { + IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + IDirect3DSurface9_GetDesc(surface, &desc); + ok(desc.Format == D3DFMT_L8, "Returned format %u, expected %u\n", desc.Format, D3DFMT_L8); + IDirect3DTexture9_Release(texture); + } } static void test_D3DXCreateCubeTextureFromFileInMemory(IDirect3DDevice9 *device) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 7ebe264..e997aa2 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -538,6 +538,29 @@ HRESULT WINAPI D3DXCreateTexture(struct IDirect3DDevice9 *device, UINT width, UI return IDirect3DDevice9_CreateTexture(device, width, height, miplevels, usage, format, pool, texture, NULL); } +static D3DFORMAT get_alpha_replacement_format(D3DFORMAT format) +{ + static const struct + { + D3DFORMAT orig_format; + D3DFORMAT replacement_format; + } + replacement_formats[] = + { + {D3DFMT_X8R8G8B8, D3DFMT_A8R8G8B8}, + {D3DFMT_X1R5G5B5, D3DFMT_A1R5G5B5}, + {D3DFMT_X4R4G4B4, D3DFMT_A4R4G4B4}, + {D3DFMT_X8B8G8R8, D3DFMT_A8B8G8R8}, + {D3DFMT_L8, D3DFMT_A8L8}, + }; + unsigned int i; + + for (i = 0; i < sizeof(replacement_formats) / sizeof(replacement_formats[0]); ++i) + if (replacement_formats[i].orig_format == format) + return replacement_formats[i].replacement_format; + return format; +} + HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *device, const void *srcdata, UINT srcdatasize, UINT width, UINT height, UINT miplevels, DWORD usage, D3DFORMAT format, D3DPOOL pool, DWORD filter, DWORD mipfilter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo, @@ -546,7 +569,7 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi IDirect3DTexture9 **texptr; IDirect3DTexture9 *buftex; IDirect3DSurface9 *surface; - BOOL dynamic_texture; + BOOL dynamic_texture, format_specified = FALSE; D3DXIMAGE_INFO imginfo; UINT loaded_miplevels, skip_levels; D3DCAPS9 caps; @@ -585,6 +608,8 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi if (format == D3DFMT_UNKNOWN || format == D3DX_DEFAULT) format = imginfo.Format; + else + format_specified = TRUE; if (width == D3DX_FROM_FILE) { @@ -630,6 +655,9 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi return hr; } + if (colorkey && !format_specified) + format = get_alpha_replacement_format(format); + if (imginfo.MipLevels < miplevels && (D3DFMT_DXT1 <= imginfo.Format && imginfo.Format <= D3DFMT_DXT5)) { FIXME("Generation of mipmaps for compressed pixel formats is not implemented yet\n");

1 0

Matteo Bruni : winex11.drv: Add support for GLX_OML_swap_method.
by Alexandre Julliard Nov. 11, 2014

Nov. 11, 2014

Module: wine Branch: master Commit: 7ba434b4fafa351b1792183d58d59b6dc33850dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ba434b4fafa351b1792183d5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Nov 10 18:56:11 2014 +0100 winex11.drv: Add support for GLX_OML_swap_method. --- dlls/winex11.drv/opengl.c | 61 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 55 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 1481034..cf5d440 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -145,6 +145,10 @@ typedef XID GLXPbuffer; #define GLX_PBUFFER 0x8023 #define GLX_PBUFFER_HEIGHT 0x8040 #define GLX_PBUFFER_WIDTH 0x8041 +#define GLX_SWAP_METHOD_OML 0x8060 +#define GLX_SWAP_EXCHANGE_OML 0x8061 +#define GLX_SWAP_COPY_OML 0x8062 +#define GLX_SWAP_UNDEFINED_OML 0x8063 #define GLX_RGBA_BIT 0x00000001 #define GLX_COLOR_INDEX_BIT 0x00000002 #define GLX_PBUFFER_CLOBBER_MASK 0x08000000 @@ -285,6 +289,7 @@ static BOOL use_render_texture_emulation = TRUE; static enum glx_swap_control_method swap_control_method = GLX_SWAP_CONTROL_NONE; /* Set when GLX_EXT_swap_control_tear is supported, requires GLX_SWAP_CONTROL_EXT */ static BOOL has_swap_control_tear = FALSE; +static BOOL has_swap_method = FALSE; static CRITICAL_SECTION context_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -878,8 +883,30 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ case WGL_SWAP_METHOD_ARB: pop = iWGLAttr[++cur]; - /* For now we ignore this and just return SWAP_EXCHANGE */ TRACE("pAttr[%d] = WGL_SWAP_METHOD_ARB: %#x\n", cur, pop); + if (has_swap_method) + { + switch (pop) + { + case WGL_SWAP_EXCHANGE_ARB: + pop = GLX_SWAP_EXCHANGE_OML; + break; + case WGL_SWAP_COPY_ARB: + pop = GLX_SWAP_COPY_OML; + break; + case WGL_SWAP_UNDEFINED_ARB: + pop = GLX_SWAP_UNDEFINED_OML; + break; + default: + ERR("Unexpected swap method %#x.\n", pop); + pop = GLX_DONT_CARE; + } + PUSH2(oGLXAttr, GLX_SWAP_METHOD_OML, pop); + } + else + { + WARN("GLX_OML_swap_method not supported, ignoring attribute.\n"); + } break; case WGL_PBUFFER_LARGEST_ARB: @@ -2737,11 +2764,30 @@ static BOOL X11DRV_wglGetPixelFormatAttribivARB( HDC hdc, int iPixelFormat, int continue; case WGL_SWAP_METHOD_ARB: - /* For now return SWAP_EXCHANGE_ARB which is the best type of buffer switch available. - * Later on we can also use GLX_OML_swap_method on drivers which support this. At this - * point only ATI offers this. - */ - piValues[i] = WGL_SWAP_EXCHANGE_ARB; + if (has_swap_method) + { + hTest = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &tmp); + if (hTest) goto get_error; + switch (tmp) + { + case GLX_SWAP_EXCHANGE_OML: + piValues[i] = WGL_SWAP_EXCHANGE_ARB; + break; + case GLX_SWAP_COPY_OML: + piValues[i] = WGL_SWAP_COPY_ARB; + break; + case GLX_SWAP_UNDEFINED_OML: + piValues[i] = WGL_SWAP_UNDEFINED_ARB; + break; + default: + ERR("Unexpected swap method %x.\n", tmp); + } + } + else + { + WARN("GLX_OML_swap_method not supported, returning WGL_SWAP_EXCHANGE_ARB.\n"); + piValues[i] = WGL_SWAP_EXCHANGE_ARB; + } continue; case WGL_PBUFFER_LARGEST_ARB: @@ -3167,6 +3213,9 @@ static void X11DRV_WineGL_LoadExtensions(void) opengl_funcs.ext.p_wglFreeMemoryNV = pglXFreeMemoryNV; } + if (has_extension(WineGLInfo.glxExtensions, "GLX_OML_swap_method")) + has_swap_method = TRUE; + /* WINE-specific WGL Extensions */ /* In WineD3D we need the ability to set the pixel format more than once (e.g. after a device reset).

1 0

Qian Hong : user32/tests: Test exception handling for timer callbacks.
by Alexandre Julliard Nov. 11, 2014

Nov. 11, 2014

Module: wine Branch: master Commit: 8a9115d91ea7d421144dd5b2c6f912aedab5293f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a9115d91ea7d421144dd5b2c… Author: Qian Hong <qhong(a)codeweavers.com> Date: Mon Nov 10 16:28:23 2014 +0800 user32/tests: Test exception handling for timer callbacks. --- dlls/user32/tests/msg.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a55852b..9b7453f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8448,6 +8448,13 @@ static void CALLBACK callback_count(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWOR count++; } +static DWORD exception; +static void CALLBACK callback_exception(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) +{ + count++; + RaiseException(exception, 0, 0, NULL); +} + static DWORD WINAPI timer_thread_proc(LPVOID x) { struct timer_info *info = x; @@ -8578,6 +8585,41 @@ static void test_timers_no_wnd(void) /* Note: SetSystemTimer doesn't support a NULL window, see test_timers */ } +static void test_timers_exception(DWORD code) +{ + UINT_PTR id; + MSG msg; + + exception = code; + id = SetTimer(NULL, 0, 1000, callback_exception); + ok(id != 0, "did not get id from SetTimer.\n"); + + memset(&msg, 0, sizeof(msg)); + msg.message = WM_TIMER; + msg.wParam = id; + msg.lParam = (LPARAM)callback_exception; + + count = 0; + DispatchMessageA(&msg); + ok(count == 1, "did not get one count as expected (%i).\n", count); + + KillTimer(NULL, id); +} + +static void test_timers_exceptions(void) +{ + test_timers_exception(EXCEPTION_ACCESS_VIOLATION); + test_timers_exception(EXCEPTION_DATATYPE_MISALIGNMENT); + test_timers_exception(EXCEPTION_BREAKPOINT); + test_timers_exception(EXCEPTION_SINGLE_STEP); + test_timers_exception(EXCEPTION_ARRAY_BOUNDS_EXCEEDED); + test_timers_exception(EXCEPTION_FLT_DENORMAL_OPERAND); + test_timers_exception(EXCEPTION_FLT_DIVIDE_BY_ZERO); + test_timers_exception(EXCEPTION_FLT_INEXACT_RESULT); + test_timers_exception(EXCEPTION_ILLEGAL_INSTRUCTION); + test_timers_exception(0xE000BEEF); /* customer exception */ +} + /* Various win events with arbitrary parameters */ static const struct message WmWinEventsSeq[] = { { EVENT_SYSTEM_SOUND, winevent_hook|wparam|lparam, OBJID_WINDOW, 0 }, @@ -14619,6 +14661,7 @@ START_TEST(msg) test_accelerators(); test_timers(); test_timers_no_wnd(); + test_timers_exceptions(); if (hCBT_hook) test_set_hook(); test_DestroyWindow(); test_DispatchMessage();

1 0

André Hentschel : user32/tests: Clarify ok() condition (PVS-Studio).
by Alexandre Julliard Nov. 11, 2014

Nov. 11, 2014

Module: wine Branch: master Commit: 4ac08080222c2c59c9dda09b100f0f3ac204688e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ac08080222c2c59c9dda09b1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 10 21:06:26 2014 +0100 user32/tests: Clarify ok() condition (PVS-Studio). --- dlls/user32/tests/dde.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 3824081..b1a9391 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -1591,7 +1591,7 @@ static void test_dde_aw_transaction( BOOL client_unicode, BOOL server_unicode ) info.cb = sizeof(info); ret = DdeQueryConvInfo(hconv, QID_SYNC, &info); ok(ret, "wrong info size %d, DdeQueryConvInfo error %x\n", ret, DdeGetLastError(dde_inst)); - ok(info.ConvCtxt.iCodePage == client_unicode ? CP_WINUNICODE : CP_WINANSI, + ok(info.ConvCtxt.iCodePage == (client_unicode ? CP_WINUNICODE : CP_WINANSI), "wrong iCodePage %d\n", info.ConvCtxt.iCodePage); ok(!info.hConvPartner, "unexpected info.hConvPartner: %p\n", info.hConvPartner); todo_wine {

1 0

Jacek Caban : mshtml: Added support for IDispatchEx to HTMLSelectionObject object.
by Alexandre Julliard Nov. 11, 2014

Nov. 11, 2014

Module: wine Branch: master Commit: b84bc52b71f82e1407a833ad06bba47a4d2a0bd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b84bc52b71f82e1407a833ad0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 11 10:55:53 2014 +0100 mshtml: Added support for IDispatchEx to HTMLSelectionObject object. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/selection.c | 56 +++++++++++++++++++++++++++----------------- dlls/mshtml/tests/dom.c | 2 ++ 3 files changed, 38 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 6346dac..011fa9a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -174,6 +174,7 @@ typedef struct event_target_t event_target_t; XIID(IHTMLScreen) \ XIID(IHTMLScriptElement) \ XIID(IHTMLSelectElement) \ + XIID(IHTMLSelectionObject) \ XIID(IHTMLStorage) \ XIID(IHTMLStyle) \ XIID(IHTMLStyle2) \ diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index db3b7b3..f34154b 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { + DispatchEx dispex; IHTMLSelectionObject IHTMLSelectionObject_iface; LONG ref; @@ -52,26 +53,24 @@ static HRESULT WINAPI HTMLSelectionObject_QueryInterface(IHTMLSelectionObject *i { HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); - *ppv = NULL; + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLSelectionObject_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLSelectionObject_iface; }else if(IsEqualGUID(&IID_IHTMLSelectionObject, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLSelectionObject_iface; + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; + }else { + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; } - if(*ppv) { - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI HTMLSelectionObject_AddRef(IHTMLSelectionObject *iface) @@ -96,6 +95,7 @@ static ULONG WINAPI HTMLSelectionObject_Release(IHTMLSelectionObject *iface) nsISelection_Release(This->nsselection); if(This->doc) list_remove(&This->entry); + release_dispex(&This->dispex); heap_free(This); } @@ -105,16 +105,16 @@ static ULONG WINAPI HTMLSelectionObject_Release(IHTMLSelectionObject *iface) static HRESULT WINAPI HTMLSelectionObject_GetTypeInfoCount(IHTMLSelectionObject *iface, UINT *pctinfo) { HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI HTMLSelectionObject_GetTypeInfo(IHTMLSelectionObject *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLSelectionObject_GetIDsOfNames(IHTMLSelectionObject *iface, REFIID riid, @@ -122,9 +122,9 @@ static HRESULT WINAPI HTMLSelectionObject_GetIDsOfNames(IHTMLSelectionObject *if LCID lcid, DISPID *rgDispId) { HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, + cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLSelectionObject_Invoke(IHTMLSelectionObject *iface, DISPID dispIdMember, @@ -132,9 +132,10 @@ static HRESULT WINAPI HTMLSelectionObject_Invoke(IHTMLSelectionObject *iface, DI VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLSelectionObject_createRange(IHTMLSelectionObject *iface, IDispatch **range) @@ -233,6 +234,17 @@ static const IHTMLSelectionObjectVtbl HTMLSelectionObjectVtbl = { HTMLSelectionObject_get_type }; +static const tid_t HTMLSelectionObject_iface_tids[] = { + IHTMLSelectionObject_tid, + 0 +}; +static dispex_static_data_t HTMLSelectionObject_dispex = { + NULL, + IHTMLSelectionObject_tid, + NULL, + HTMLSelectionObject_iface_tids +}; + HRESULT HTMLSelectionObject_Create(HTMLDocumentNode *doc, nsISelection *nsselection, IHTMLSelectionObject **ret) { HTMLSelectionObject *selection; @@ -241,6 +253,8 @@ HRESULT HTMLSelectionObject_Create(HTMLDocumentNode *doc, nsISelection *nsselect if(!selection) return E_OUTOFMEMORY; + init_dispex(&selection->dispex, (IUnknown*)&selection->IHTMLSelectionObject_iface, &HTMLSelectionObject_dispex); + selection->IHTMLSelectionObject_iface.lpVtbl = &HTMLSelectionObjectVtbl; selection->ref = 1; selection->nsselection = nsselection; /* We shouldn't call AddRef here */ diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c4766dc..5dc0c4c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4975,6 +4975,8 @@ static void test_txtrange(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_selection(doc, &selection); ok(hres == S_OK, "IHTMLDocument2_get_selection failed: %08x\n", hres); + test_disp((IUnknown*)selection, &IID_IHTMLSelectionObject, "[object]"); + hres = IHTMLSelectionObject_createRange(selection, &disp_range); ok(hres == S_OK, "IHTMLSelectionObject_createRange failed: %08x\n", hres); IHTMLSelectionObject_Release(selection);

1 0

Jacek Caban : mshtml: Added IDispatchEx support to HTMLTxtRange object.
by Alexandre Julliard Nov. 11, 2014

Nov. 11, 2014

Module: wine Branch: master Commit: dcfa250cd2486cb3eddc6010f0ce681563a036e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcfa250cd2486cb3eddc6010f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 11 10:55:34 2014 +0100 mshtml: Added IDispatchEx support to HTMLTxtRange object. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 2 ++ dlls/mshtml/txtrange.c | 58 ++++++++++++++++++++++++++------------------ 3 files changed, 37 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index abe7995..6346dac 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -193,6 +193,7 @@ typedef struct event_target_t event_target_t; XIID(IHTMLTextAreaElement) \ XIID(IHTMLTextContainer) \ XIID(IHTMLTitleElement) \ + XIID(IHTMLTxtRange) \ XIID(IHTMLUniqueName) \ XIID(IHTMLWindow2) \ XIID(IHTMLWindow3) \ diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f0f03b8..c4766dc 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4827,6 +4827,8 @@ static void test_txtrange(IHTMLDocument2 *doc) body_range = test_create_body_range(doc); + test_disp((IUnknown*)body_range, &IID_IHTMLTxtRange, "[object]"); + test_range_text(body_range, "test abc 123\r\nit's text"); hres = IHTMLTxtRange_duplicate(body_range, &range); diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index e88d960..6b57eb2 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -36,6 +36,7 @@ static const WCHAR brW[] = {'b','r',0}; static const WCHAR hrW[] = {'h','r',0}; typedef struct { + DispatchEx dispex; IHTMLTxtRange IHTMLTxtRange_iface; IOleCommandTarget IOleCommandTarget_iface; @@ -1004,29 +1005,24 @@ static HRESULT WINAPI HTMLTxtRange_QueryInterface(IHTMLTxtRange *iface, REFIID r { HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); - *ppv = NULL; + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IHTMLTxtRange_iface; - }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = &This->IHTMLTxtRange_iface; }else if(IsEqualGUID(&IID_IHTMLTxtRange, riid)) { - TRACE("(%p)->(IID_IHTMLTxtRange %p)\n", This, ppv); *ppv = &This->IHTMLTxtRange_iface; }else if(IsEqualGUID(&IID_IOleCommandTarget, riid)) { - TRACE("(%p)->(IID_IOleCommandTarget %p)\n", This, ppv); *ppv = &This->IOleCommandTarget_iface; + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; + }else { + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; } - if(*ppv) { - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI HTMLTxtRange_AddRef(IHTMLTxtRange *iface) @@ -1051,6 +1047,7 @@ static ULONG WINAPI HTMLTxtRange_Release(IHTMLTxtRange *iface) nsIDOMRange_Release(This->nsrange); if(This->doc) list_remove(&This->entry); + release_dispex(&This->dispex); heap_free(This); } @@ -1060,16 +1057,16 @@ static ULONG WINAPI HTMLTxtRange_Release(IHTMLTxtRange *iface) static HRESULT WINAPI HTMLTxtRange_GetTypeInfoCount(IHTMLTxtRange *iface, UINT *pctinfo) { HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI HTMLTxtRange_GetTypeInfo(IHTMLTxtRange *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLTxtRange_GetIDsOfNames(IHTMLTxtRange *iface, REFIID riid, @@ -1077,9 +1074,9 @@ static HRESULT WINAPI HTMLTxtRange_GetIDsOfNames(IHTMLTxtRange *iface, REFIID ri LCID lcid, DISPID *rgDispId) { HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, + cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLTxtRange_Invoke(IHTMLTxtRange *iface, DISPID dispIdMember, @@ -1087,9 +1084,9 @@ static HRESULT WINAPI HTMLTxtRange_Invoke(IHTMLTxtRange *iface, DISPID dispIdMem VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLTxtRange_get_htmlText(IHTMLTxtRange *iface, BSTR *p) @@ -1850,6 +1847,17 @@ static const IOleCommandTargetVtbl OleCommandTargetVtbl = { RangeCommandTarget_Exec }; +static const tid_t HTMLTxtRange_iface_tids[] = { + IHTMLTxtRange_tid, + 0 +}; +static dispex_static_data_t HTMLTxtRange_dispex = { + NULL, + IHTMLTxtRange_tid, + NULL, + HTMLTxtRange_iface_tids +}; + HRESULT HTMLTxtRange_Create(HTMLDocumentNode *doc, nsIDOMRange *nsrange, IHTMLTxtRange **p) { HTMLTxtRange *ret; @@ -1858,6 +1866,8 @@ HRESULT HTMLTxtRange_Create(HTMLDocumentNode *doc, nsIDOMRange *nsrange, IHTMLTx if(!ret) return E_OUTOFMEMORY; + init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLTxtRange_iface, &HTMLTxtRange_dispex); + ret->IHTMLTxtRange_iface.lpVtbl = &HTMLTxtRangeVtbl; ret->IOleCommandTarget_iface.lpVtbl = &OleCommandTargetVtbl; ret->ref = 1;

1 0

Sebastian Lackner : d3dx9_36/tests: Remove code to skip test which should never fail.
by Alexandre Julliard Nov. 11, 2014

Nov. 11, 2014

Module: wine Branch: master Commit: fc0392a24e219161d2c9ec2d43304819853cc817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc0392a24e219161d2c9ec2d4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 5 18:50:45 2014 +0100 d3dx9_36/tests: Remove code to skip test which should never fail. --- dlls/d3dx9_36/tests/mesh.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 2a617f5..870f62a 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -2579,24 +2579,17 @@ static void D3DXCreateBoxTest(void) hr = D3DXCreateBox(device,10.9f,20.0f,4.9f,&box, &ppBuffer); ok(hr==D3D_OK, "Expected D3D_OK, received %#x\n", hr); - if (FAILED(hr)) - { - skip("D3DXCreateBox failed\n"); - goto end; - } - buffer = ID3DXBuffer_GetBufferPointer(ppBuffer); for(i=0; i<36; i++) ok(adjacency[i]==buffer[i], "expected adjacency %d: %#x, received %#x\n",i,adjacency[i], buffer[i]); box->lpVtbl->Release(box); + ID3DXBuffer_Release(ppBuffer); test_box(device, 10.9f, 20.0f, 4.9f); -end: IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d); - if (ppBuffer) ID3DXBuffer_Release(ppBuffer); DestroyWindow(wnd); }

1 0

André Hentschel : xmllite/tests: Clarify ok() condition (PVS-Studio).
by Alexandre Julliard Nov. 11, 2014

Nov. 11, 2014

Module: wine Branch: master Commit: b91084a992fdf1554b5ed68654705677c9a31681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b91084a992fdf1554b5ed6865… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 10 21:06:31 2014 +0100 xmllite/tests: Clarify ok() condition (PVS-Studio). --- dlls/xmllite/tests/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 0108027..f7c576f 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -758,7 +758,7 @@ static void test_read_xmldeclaration(void) ok(!lstrcmpW(name_val[i].val, val), "expected %s, got %s\n", wine_dbgstr_w(name_val[i].val), wine_dbgstr_w(val)); hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == (i < count - 1) ? S_OK : S_FALSE, "got %08x\n", hr); + ok(hr == ((i < count - 1) ? S_OK : S_FALSE), "got %08x\n", hr); } hr = IXmlReader_GetDepth(reader, &count);

1 0

André Hentschel : ntdll/tests: Clarify ok() conditions (PVS-Studio).
by Alexandre Julliard Nov. 11, 2014

Nov. 11, 2014

Module: wine Branch: master Commit: d978dcedd5a376a02ecc734720fe7afc92e81cfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d978dcedd5a376a02ecc73472… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 10 21:06:15 2014 +0100 ntdll/tests: Clarify ok() conditions (PVS-Studio). --- dlls/ntdll/tests/string.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 56b7584..adaa7c3 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1083,8 +1083,8 @@ static void test_atoi64(void) result = p_atoi64(str2longlong[test_num].str); if (str2longlong[test_num].overflow) ok(result == str2longlong[test_num].value || - (result == (str2longlong[test_num].overflow == -1) ? - ULL(0x80000000,0x00000000) : ULL(0x7fffffff,0xffffffff)), + (result == ((str2longlong[test_num].overflow == -1) ? + ULL(0x80000000,0x00000000) : ULL(0x7fffffff,0xffffffff))), "(test %d): call failed: _atoi64(\"%s\") has result 0x%x%08x, expected: 0x%x%08x\n", test_num, str2longlong[test_num].str, (DWORD)(result >> 32), (DWORD)result, (DWORD)(str2longlong[test_num].value >> 32), (DWORD)str2longlong[test_num].value); @@ -1108,8 +1108,8 @@ static void test_wtoi64(void) result = p_wtoi64(uni.Buffer); if (str2longlong[test_num].overflow) ok(result == str2longlong[test_num].value || - (result == (str2longlong[test_num].overflow == -1) ? - ULL(0x80000000,0x00000000) : ULL(0x7fffffff,0xffffffff)), + (result == ((str2longlong[test_num].overflow == -1) ? + ULL(0x80000000,0x00000000) : ULL(0x7fffffff,0xffffffff))), "(test %d): call failed: _atoi64(\"%s\") has result 0x%x%08x, expected: 0x%x%08x\n", test_num, str2longlong[test_num].str, (DWORD)(result >> 32), (DWORD)result, (DWORD)(str2longlong[test_num].value >> 32), (DWORD)str2longlong[test_num].value);

1 0

André Hentschel : urlmon/tests: Clarify ok() condition (PVS-Studio).
by Alexandre Julliard Nov. 11, 2014

Nov. 11, 2014

Module: wine Branch: master Commit: 388ff35a1817975d78a43ea5f355a74a39b8ad86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=388ff35a1817975d78a43ea5f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 10 21:06:21 2014 +0100 urlmon/tests: Clarify ok() condition (PVS-Studio). --- dlls/urlmon/tests/protocol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index df3c364..9aadf1e 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -2927,7 +2927,7 @@ static void test_protocol_terminate(IInternetProtocol *protocol) ok(hres == S_OK, "LockRequest failed: %08x\n", hres); hres = IInternetProtocol_Read(protocol, buf, 1, &cb); - ok(hres == test_abort ? S_OK : S_FALSE, "Read failed: %08x\n", hres); + ok(hres == (test_abort ? S_OK : S_FALSE), "Read failed: %08x\n", hres); hres = IInternetProtocol_Terminate(protocol, 0); ok(hres == S_OK, "Terminate failed: %08x\n", hres);

1 0

Matteo Bruni : d3dx9: Handle GUID_WICPixelFormat8bppGray format.
by Alexandre Julliard Nov. 11, 2014

Nov. 11, 2014

Module: wine Branch: master Commit: fb9c01f1dcc4cf7fb5b2229e47bdec49920598cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb9c01f1dcc4cf7fb5b2229e4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Nov 10 18:56:12 2014 +0100 d3dx9: Handle GUID_WICPixelFormat8bppGray format. --- dlls/d3dx9_36/surface.c | 1 + dlls/d3dx9_36/tests/surface.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index c91048b..f187031 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -40,6 +40,7 @@ static const struct { &GUID_WICPixelFormat8bppIndexed, D3DFMT_P8 }, { &GUID_WICPixelFormat1bppIndexed, D3DFMT_P8 }, { &GUID_WICPixelFormat4bppIndexed, D3DFMT_P8 }, + { &GUID_WICPixelFormat8bppGray, D3DFMT_L8 }, { &GUID_WICPixelFormat16bppBGR555, D3DFMT_X1R5G5B5 }, { &GUID_WICPixelFormat16bppBGR565, D3DFMT_R5G6B5 }, { &GUID_WICPixelFormat24bppBGR, D3DFMT_R8G8B8 }, diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 2ddc704..4490dc3 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -80,6 +80,16 @@ static const unsigned char bmp_8bpp[] = { 0x00,0x00 }; +static const unsigned char png_grayscale[] = +{ + 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, + 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x08, 0x00, + 0x00, 0x00, 0x00, 0x3a, 0x7e, 0x9b, 0x55, 0x00, 0x00, 0x00, 0x0a, 0x49, 0x44, + 0x41, 0x54, 0x08, 0xd7, 0x63, 0xf8, 0x0f, 0x00, 0x01, 0x01, 0x01, 0x00, 0x1b, + 0xb6, 0xee, 0x56, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, + 0x60, 0x82 +}; + /* 2x2 A8R8G8B8 pixel data */ static const unsigned char pixdata[] = { 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff @@ -493,6 +503,12 @@ static void test_D3DXGetImageInfo(void) ok(info.Depth == 1, "Got depth %u, expected 1\n", info.Depth); ok(info.Format == D3DFMT_P8, "Got format %u, expected %u\n", info.Format, D3DFMT_P8); + /* Grayscale PNG */ + hr = D3DXGetImageInfoFromFileInMemory(png_grayscale, sizeof(png_grayscale), &info); + ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); + ok(info.Depth == 1, "Got depth %u, expected 1\n", info.Depth); + ok(info.Format == D3DFMT_L8, "Got format %u, expected %u\n", info.Format, D3DFMT_L8); + /* test DDS support */ hr = D3DXGetImageInfoFromFileInMemory(dds_24bit, sizeof(dds_24bit), &info); ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK);

1 0

Matteo Bruni : winex11.drv: Actually report WGL_SWAP_EXCHANGE_ARB as the swap method.
by Alexandre Julliard Nov. 11, 2014

Nov. 11, 2014

Module: wine Branch: master Commit: 3ac85842d34cce334305d2165bc7c50159dfc8cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ac85842d34cce334305d2165… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Nov 10 18:56:10 2014 +0100 winex11.drv: Actually report WGL_SWAP_EXCHANGE_ARB as the swap method. --- dlls/winex11.drv/opengl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 71af3db..1481034 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2742,7 +2742,7 @@ static BOOL X11DRV_wglGetPixelFormatAttribivARB( HDC hdc, int iPixelFormat, int * point only ATI offers this. */ piValues[i] = WGL_SWAP_EXCHANGE_ARB; - break; + continue; case WGL_PBUFFER_LARGEST_ARB: curGLXAttr = GLX_LARGEST_PBUFFER;

1 0

Qian Hong : user32: Add more exception handlings for timer callbacks.
by Alexandre Julliard Nov. 11, 2014

Nov. 11, 2014

Module: wine Branch: master Commit: cd21d2dbda3722374d7eed372ed914712216a0cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd21d2dbda3722374d7eed372… Author: Qian Hong <qhong(a)codeweavers.com> Date: Mon Nov 10 16:27:54 2014 +0800 user32: Add more exception handlings for timer callbacks. --- dlls/user32/message.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index b75c7e9..eac4e4d 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3934,7 +3934,7 @@ LRESULT WINAPI DECLSPEC_HOTPATCH DispatchMessageA( const MSG* msg ) retval = CallWindowProcA( (WNDPROC)msg->lParam, msg->hwnd, msg->message, msg->wParam, GetTickCount() ); } - __EXCEPT_PAGE_FAULT + __EXCEPT_ALL { retval = 0; } @@ -4005,7 +4005,7 @@ LRESULT WINAPI DECLSPEC_HOTPATCH DispatchMessageW( const MSG* msg ) retval = CallWindowProcW( (WNDPROC)msg->lParam, msg->hwnd, msg->message, msg->wParam, GetTickCount() ); } - __EXCEPT_PAGE_FAULT + __EXCEPT_ALL { retval = 0; }

1 0

Michael Stefaniuc : wininet: Simplify the check for an empty string ( PVS-Studio).
by Alexandre Julliard Nov. 11, 2014

Nov. 11, 2014

Module: wine Branch: master Commit: 51302e011af440eada59bf09759e0ad06a42d1f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51302e011af440eada59bf097… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 10 23:41:51 2014 +0100 wininet: Simplify the check for an empty string (PVS-Studio). --- dlls/wininet/ftp.c | 2 +- dlls/wininet/tests/internet.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 855aee0..f45e495 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2496,7 +2496,7 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, if(hIC->proxyBypass) FIXME("Proxy bypass is ignored.\n"); } - if (!lpszUserName || !strlenW(lpszUserName)) { + if (!lpszUserName || !lpszUserName[0]) { HKEY key; WCHAR szPassword[MAX_PATH]; DWORD len = sizeof(szPassword); diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 1548615..5e09525 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1578,7 +1578,7 @@ static void test_InternetGetConnectedStateExA(void) res = pInternetGetConnectedStateExA(&flags, buffer, 1, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(strlen(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenA(buffer)); + ok(!buffer[0], "Expected 0 bytes, got %u\n", lstrlenA(buffer)); buffer[0] = 0; flags = 0; @@ -1592,7 +1592,7 @@ static void test_InternetGetConnectedStateExA(void) res = pInternetGetConnectedStateExA(&flags, buffer, 1, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(strlen(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenA(buffer)); + ok(!buffer[0], "Expected 0 bytes, got %u\n", lstrlenA(buffer)); } static void test_InternetGetConnectedStateExW(void) @@ -1667,7 +1667,7 @@ static void test_InternetGetConnectedStateExW(void) res = pInternetGetConnectedStateExW(&flags, buffer, 1, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(lstrlenW(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenW(buffer)); + ok(!buffer[0], "Expected 0 bytes, got %u\n", lstrlenW(buffer)); buffer[0] = 0; flags = 0; @@ -1681,7 +1681,7 @@ static void test_InternetGetConnectedStateExW(void) res = pInternetGetConnectedStateExW(&flags, buffer, 1, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(lstrlenW(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenW(buffer)); + ok(!buffer[0], "Expected 0 bytes, got %u\n", lstrlenW(buffer)); } /* ############################### */

1 0

André Hentschel : Add WWN 379
by Jeremy Newman Nov. 10, 2014

Nov. 10, 2014

Module: website Branch: master Commit: 680a724a5b9d43fc2614bf949656c0f026328627 URL: http://source.winehq.org/git/website.git/?a=commit;h=680a724a5b9d43fc2614bf… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 10 23:24:57 2014 +0100 Add WWN 379 --- news/de/2014111001.xml | 10 + news/en/2014111001.xml | 10 + wwn/en/wn20141110_379.xml | 666 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 686 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=680a724a5b9d43fc26…

1 0

Rosanne DiMesio : Ubuntu download: Correct Ubuntu downloads instructions
by Jeremy Newman Nov. 10, 2014

Nov. 10, 2014

Module: website Branch: master Commit: 12827e3b0d4ba1fc1a13a27c3a1c1cb25cd79df1 URL: http://source.winehq.org/git/website.git/?a=commit;h=12827e3b0d4ba1fc1a13a2… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Nov 10 10:01:07 2014 -0600 Ubuntu download: Correct Ubuntu downloads instructions Revises instructions to no longer identify the PPA as WineHQ's and to clarify the support status of Ubuntu derivatives. Fixes bugs 34299 and 33549. --- templates/en/download/ubuntu.template | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/templates/en/download/ubuntu.template b/templates/en/download/ubuntu.template index 8ae3f9d..0fbd4d1 100644 --- a/templates/en/download/ubuntu.template +++ b/templates/en/download/ubuntu.template @@ -2,16 +2,18 @@  <h1 class="title"><a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a> -Wine for Ubuntu and Ubuntu derivatives +Wine for Ubuntu and Ubuntu flavors <a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a></h1> -<p>Ubuntu and Ubuntu derivatives (such as Kubuntu) obtain software from +<p>Ubuntu and Ubuntu flavors (such as Kubuntu) obtain software from <i>packages</i> which are stored in <i>repositories</i>. Ubuntu's default -repository includes Wine, however if you want to stay up to date with the -latest Wine package you can use WineHQ's by following these instructions. +repository includes a Wine package built from the stable branch, however if you want to stay up to date with the +latest development release you can obtain it by following these instructions. </p> -<h2>Adding the WineHQ PPA Repository:</h2> +<p><b>Ubuntu Derivatives:</b> These packages and instructions are designed for Ubuntu and <a href="http://wiki.ubuntu.com/UbuntuFlavors">recognized flavors</a>. Users of Ubuntu derivatives are welcome to use these packages, but should keep in mind that problems caused by differences between the derivative distro and mainline Ubuntu are neither Wine bugs nor packaging bugs, and should be reported to the distro in question.</p> + +<h2>Adding the PPA Repository:</h2> <p>Open the Software Sources menu by launching the <b>Ubuntu Software Center</b> and selecting <b>Edit->Software Sources</b>. Choose the <b>Other @@ -33,7 +35,7 @@ for you, then you may not want to use these beta packages.</i></p> <h2>Installing Wine:</h2> -<p>Once you have added the WineHQ PPA Repository, you are ready to install.</p> +<p>Once you have added the repository, you are ready to install.</p> <p><i>To get the most recent Wine 1.7 beta, <a href="apt://wine1.7">click this link to install the wine1.7 package</a>.</i></p> @@ -49,8 +51,8 @@ The built in update manager will not switch the Wine repository automatically. <h2>Alternative Command Line Instructions for Installing Wine:</h2> -<p>It is also possible to add the Wine PPA and install via the terminal. This -may be useful on Kubuntu, Xubuntu, and other Ubuntu derivatives.</p> +<p>It is also possible to add the PPA and install via the terminal. This +may be useful on Ubuntu flavors and derivatives.</p> <p><i>sudo add-apt-repository ppa:ubuntu-wine/ppa</i></p>

1 0

Julian Rüger : German translation for release 1.7.30
by Jeremy Newman Nov. 10, 2014

Nov. 10, 2014

Module: website Branch: master Commit: 5e5924965be4ed954ef2bfc1a76c64dc61a1991a URL: http://source.winehq.org/git/website.git/?a=commit;h=5e5924965be4ed954ef2bf… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Nov 10 12:21:49 2014 +0100 German translation for release 1.7.30 --- news/de/2014103101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2014103101.xml b/news/de/2014103101.xml new file mode 100644 index 0000000..1eb06b7 --- /dev/null +++ b/news/de/2014103101.xml @@ -0,0 +1,16 @@ +<news> +<date>31. Oktober 2014</date> +<title>Wine 1.7.30 freigegeben</title> +<body> +<p> Die Entwicklungsversion 1.7.30 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/1.7.30">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Mehr Unterstützung für Schriftarten in DirectWrite.</li> + <li>Verbesserte ATL-Thunk-Unterstützung.</li> + <li>Einige zusätzliche C-Laufzeitfunktionen.</li> + <li>Regedit Import/Export-Korrekturen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +<p>Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.30.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</p></body></news>

1 0

Piotr Caban : msvcp110: Add codecvt::length export.
by Alexandre Julliard Nov. 10, 2014

Nov. 10, 2014

Module: wine Branch: master Commit: 688d4140a7b90ca4029ec3c6b27600a567ec1deb URL: http://source.winehq.org/git/wine.git/?a=commit;h=688d4140a7b90ca4029ec3c6b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 7 13:20:50 2014 +0100 msvcp110: Add codecvt::length export. --- dlls/msvcp110/msvcp110.spec | 36 ++++++++++++++++++------------------ dlls/msvcp70/msvcp70.spec | 7 ++++--- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 6d3118a..a2c5ac9 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -2120,15 +2120,15 @@ @ cdecl -arch=arm ?do_is@?$ctype(a)_W@std@@MBA_NF_W(a)Z(ptr long long) ctype_wchar_do_is_ch @ thiscall -arch=i386 ?do_is@?$ctype(a)_W@std@@MBE_NF_W(a)Z(ptr long long) ctype_wchar_do_is_ch @ cdecl -arch=win64 ?do_is@?$ctype(a)_W@std@@MEBA_NF_W(a)Z(ptr long long) ctype_wchar_do_is_ch -@ stub -arch=arm ?do_length@?$codecvt(a)DDH@std@@MBAHAAHPBD1I(a)Z -@ stub -arch=i386 ?do_length@?$codecvt(a)DDH@std@@MBEHAAHPBD1I(a)Z -@ stub -arch=win64 ?do_length@?$codecvt(a)DDH@std@@MEBAHAEAHPEBD1_K(a)Z -@ stub -arch=arm ?do_length@?$codecvt(a)GDH@std@@MBAHAAHPBD1I(a)Z -@ stub -arch=i386 ?do_length@?$codecvt(a)GDH@std@@MBEHAAHPBD1I(a)Z -@ stub -arch=win64 ?do_length@?$codecvt(a)GDH@std@@MEBAHAEAHPEBD1_K(a)Z -@ stub -arch=arm ?do_length@?$codecvt(a)_WDH@std@@MBAHAAHPBD1I(a)Z -@ stub -arch=i386 ?do_length@?$codecvt(a)_WDH@std@@MBEHAAHPBD1I(a)Z -@ stub -arch=win64 ?do_length@?$codecvt(a)_WDH@std@@MEBAHAEAHPEBD1_K(a)Z +@ cdecl -arch=arm ?do_length@?$codecvt(a)DDH@std@@MBAHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_char_do_length +@ thiscall -arch=i386 ?do_length@?$codecvt(a)DDH@std@@MBEHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_char_do_length +@ cdecl -arch=win64 ?do_length@?$codecvt(a)DDH@std@@MEBAHAEAHPEBD1_K(a)Z(ptr ptr str str long) codecvt_char_do_length +@ cdecl -arch=arm ?do_length@?$codecvt(a)GDH@std@@MBAHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_wchar_do_length +@ thiscall -arch=i386 ?do_length@?$codecvt(a)GDH@std@@MBEHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_wchar_do_length +@ cdecl -arch=win64 ?do_length@?$codecvt(a)GDH@std@@MEBAHAEAHPEBD1_K(a)Z(ptr ptr str str long) codecvt_wchar_do_length +@ cdecl -arch=arm ?do_length@?$codecvt(a)_WDH@std@@MBAHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_wchar_do_length +@ thiscall -arch=i386 ?do_length@?$codecvt(a)_WDH@std@@MBEHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_wchar_do_length +@ cdecl -arch=win64 ?do_length@?$codecvt(a)_WDH@std@@MEBAHAEAHPEBD1_K(a)Z(ptr ptr str str long) codecvt_wchar_do_length @ cdecl -arch=arm ?do_max_length@?$codecvt(a)GDH@std@@MBAHXZ(ptr) codecvt_wchar_do_max_length @ thiscall -arch=i386 ?do_max_length@?$codecvt(a)GDH@std@@MBEHXZ(ptr) codecvt_wchar_do_max_length @ cdecl -arch=win64 ?do_max_length@?$codecvt(a)GDH@std@@MEBAHXZ(ptr) codecvt_wchar_do_max_length @@ -2846,15 +2846,15 @@ @ cdecl -arch=arm ?iword(a)ios_base@std@@QAAAAJH(a)Z(ptr long) ios_base_iword @ thiscall -arch=i386 ?iword(a)ios_base@std@@QAEAAJH(a)Z(ptr long) ios_base_iword @ cdecl -arch=win64 ?iword(a)ios_base@std@@QEAAAEAJH(a)Z(ptr long) ios_base_iword -@ stub -arch=arm ?length@?$codecvt(a)DDH@std@@QBAHAAHPBD1I(a)Z -@ stub -arch=i386 ?length@?$codecvt(a)DDH@std@@QBEHAAHPBD1I(a)Z -@ stub -arch=win64 ?length@?$codecvt(a)DDH@std@@QEBAHAEAHPEBD1_K(a)Z -@ stub -arch=arm ?length@?$codecvt(a)GDH@std@@QBAHAAHPBD1I(a)Z -@ stub -arch=i386 ?length@?$codecvt(a)GDH@std@@QBEHAAHPBD1I(a)Z -@ stub -arch=win64 ?length@?$codecvt(a)GDH@std@@QEBAHAEAHPEBD1_K(a)Z -@ stub -arch=arm ?length@?$codecvt(a)_WDH@std@@QBAHAAHPBD1I(a)Z -@ stub -arch=i386 ?length@?$codecvt(a)_WDH@std@@QBEHAAHPBD1I(a)Z -@ stub -arch=win64 ?length@?$codecvt(a)_WDH@std@@QEBAHAEAHPEBD1_K(a)Z +@ cdecl -arch=arm ?length@?$codecvt(a)DDH@std@@QBAHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_char_length +@ thiscall -arch=i386 ?length@?$codecvt(a)DDH@std@@QBEHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_char_length +@ cdecl -arch=win64 ?length@?$codecvt(a)DDH@std@@QEBAHAEAHPEBD1_K(a)Z(ptr ptr str str long) codecvt_char_length +@ cdecl -arch=arm ?length@?$codecvt(a)GDH@std@@QBAHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_wchar_length +@ thiscall -arch=i386 ?length@?$codecvt(a)GDH@std@@QBEHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_wchar_length +@ cdecl -arch=win64 ?length@?$codecvt(a)GDH@std@@QEBAHAEAHPEBD1_K(a)Z(ptr ptr str str long) codecvt_wchar_length +@ cdecl -arch=arm ?length@?$codecvt(a)_WDH@std@@QBAHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_wchar_length +@ thiscall -arch=i386 ?length@?$codecvt(a)_WDH@std@@QBEHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_wchar_length +@ cdecl -arch=win64 ?length@?$codecvt(a)_WDH@std@@QEBAHAEAHPEBD1_K(a)Z(ptr ptr str str long) codecvt_wchar_length @ cdecl -arch=arm ?max_length(a)codecvt_base@std@@QBAHXZ(ptr) codecvt_base_max_length @ thiscall -arch=i386 ?max_length(a)codecvt_base@std@@QBEHXZ(ptr) codecvt_base_max_length @ cdecl -arch=win64 ?max_length(a)codecvt_base@std@@QEBAHXZ(ptr) codecvt_base_max_length diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index f2022dd..749e64a 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -2855,11 +2855,12 @@ @ cdecl -arch=win64 ?do_is@?$ctype(a)_W@std@@MEBAPEB_WPEB_W0PEAF(a)Z(ptr ptr ptr ptr) ctype_wchar_do_is @ thiscall -arch=i386 ?do_is@?$ctype(a)_W@std@@MBE_NF_W(a)Z(ptr long long) ctype_wchar_do_is_ch @ cdecl -arch=win64 ?do_is@?$ctype(a)_W@std@@MEBA_NF_W(a)Z(ptr long long) ctype_wchar_do_is_ch -@ stub -arch=win32 ?do_length@?$codecvt(a)DDH@std@@MBEHAAHPBD1I(a)Z -@ stub -arch=win64 ?do_length@?$codecvt(a)DDH@std@@MEBAHAEAHPEBD1_K(a)Z +@ thiscall -arch=i386 ?do_length@?$codecvt(a)DDH@std@@MBEHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_char_do_length +@ cdecl -arch=win64 ?do_length@?$codecvt(a)DDH@std@@MEBAHAEAHPEBD1_K(a)Z(ptr ptr str str long) codecvt_char_do_length @ thiscall -arch=win32 ?do_length@?$codecvt(a)DDH@std@@MBEHABHPBD1I(a)Z(ptr ptr str str long) codecvt_char_do_length @ cdecl -arch=win64 ?do_length@?$codecvt(a)DDH@std@@MEBAHAEBHPEBD1_K(a)Z(ptr ptr str str long) codecvt_char_do_length -@ stub -arch=win32 ?do_length@?$codecvt(a)GDH@std@@MBEHAAHPBD1I(a)Z +@ thiscall -arch=i386 ?do_length@?$codecvt(a)GDH@std@@MBEHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_wchar_do_length +@ cdecl -arch=win64 ?do_length@?$codecvt(a)GDH@std@@MEBAHAEAHPEBD1_K(a)Z(ptr ptr str str long) codecvt_wchar_do_length @ thiscall -arch=win32 ?do_length@?$codecvt(a)GDH@std@@MBEHABHPBD1I(a)Z(ptr ptr str str long) codecvt_wchar_do_length @ cdecl -arch=win64 ?do_length@?$codecvt(a)GDH@std@@MEBAHAEBHPEBD1_K(a)Z(ptr ptr str str long) codecvt_wchar_do_length @ thiscall -arch=win32 ?do_length@?$codecvt(a)_WDH@std@@MBEHABHPBD1I(a)Z(ptr ptr str str long) codecvt_wchar_do_length

1 0

YongHao Hu : msvcp90: Add std_Ctraits::Isnan implementation.
by Alexandre Julliard Nov. 10, 2014

Nov. 10, 2014

Module: wine Branch: master Commit: 6fe4d9e71ba0e9adfca240eeffea5720f03afef8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fe4d9e71ba0e9adfca240eef… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Sat Nov 8 10:15:21 2014 +0800 msvcp90: Add std_Ctraits::Isnan implementation. --- dlls/msvcp70/msvcp70.spec | 6 +++--- dlls/msvcp71/msvcp71.spec | 6 +++--- dlls/msvcp80/msvcp80.spec | 6 +++--- dlls/msvcp90/math.c | 9 +++++++++ dlls/msvcp90/msvcp90.spec | 6 +++--- dlls/msvcp90/tests/misc.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 69 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index 749e64a..7067efa 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -2103,9 +2103,9 @@ @ stub ?_Isinf@?$_Ctraits(a)M@std@@SA_NM(a)Z @ stub ?_Isinf@?$_Ctraits(a)N@std@@SA_NN(a)Z @ stub ?_Isinf@?$_Ctraits(a)O@std@@SA_NO(a)Z -@ stub ?_Isnan@?$_Ctraits(a)M@std@@SA_NM(a)Z -@ stub ?_Isnan@?$_Ctraits(a)N@std@@SA_NN(a)Z -@ stub ?_Isnan@?$_Ctraits(a)O@std@@SA_NO(a)Z +@ cdecl ?_Isnan@?$_Ctraits(a)M@std@@SA_NM(a)Z(float) std_Ctraits_float__Isnan +@ cdecl ?_Isnan@?$_Ctraits(a)N@std@@SA_NN(a)Z(double) std_Ctraits_double__Isnan +@ cdecl ?_Isnan@?$_Ctraits(a)O@std@@SA_NO(a)Z(double) std_Ctraits_long_double__Isnan @ stub -arch=win32 ?_Loc_atexit(a)std@@YA_NP6AXXZ(a)Z @ stub -arch=win32 ?_Makpat@?$_Mpunct(a)D@std@@AAEXAAUpattern(a)money_base@2(a)III@Z @ stub -arch=win64 ?_Makpat@?$_Mpunct(a)D@std@@AEAAXAEAUpattern(a)money_base@2(a)III@Z diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 1b56e17..0bac67c 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -2300,9 +2300,9 @@ @ stub ?_Isinf@?$_Ctraits(a)M@std@@SA_NM(a)Z @ stub ?_Isinf@?$_Ctraits(a)N@std@@SA_NN(a)Z @ stub ?_Isinf@?$_Ctraits(a)O@std@@SA_NO(a)Z -@ stub ?_Isnan@?$_Ctraits(a)M@std@@SA_NM(a)Z -@ stub ?_Isnan@?$_Ctraits(a)N@std@@SA_NN(a)Z -@ stub ?_Isnan@?$_Ctraits(a)O@std@@SA_NO(a)Z +@ cdecl ?_Isnan@?$_Ctraits(a)M@std@@SA_NM(a)Z(float) std_Ctraits_float__Isnan +@ cdecl ?_Isnan@?$_Ctraits(a)N@std@@SA_NN(a)Z(double) std_Ctraits_double__Isnan +@ cdecl ?_Isnan@?$_Ctraits(a)O@std@@SA_NO(a)Z(double) std_Ctraits_long_double__Isnan @ thiscall -arch=win32 ?_Lock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ(ptr) basic_streambuf_char__Lock @ cdecl -arch=win64 ?_Lock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAAXXZ(ptr) basic_streambuf_char__Lock @ thiscall -arch=win32 ?_Lock@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAEXXZ(ptr) basic_streambuf_wchar__Lock diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 31e5e60..1165491 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -2557,9 +2557,9 @@ @ stub ?_Isinf@?$_Ctraits(a)M@std@@SA_NM(a)Z @ stub ?_Isinf@?$_Ctraits(a)N@std@@SA_NN(a)Z @ stub ?_Isinf@?$_Ctraits(a)O@std@@SA_NO(a)Z -@ stub ?_Isnan@?$_Ctraits(a)M@std@@SA_NM(a)Z -@ stub ?_Isnan@?$_Ctraits(a)N@std@@SA_NN(a)Z -@ stub ?_Isnan@?$_Ctraits(a)O@std@@SA_NO(a)Z +@ cdecl ?_Isnan@?$_Ctraits(a)M@std@@SA_NM(a)Z(float) std_Ctraits_float__Isnan +@ cdecl ?_Isnan@?$_Ctraits(a)N@std@@SA_NN(a)Z(double) std_Ctraits_double__Isnan +@ cdecl ?_Isnan@?$_Ctraits(a)O@std@@SA_NO(a)Z(double) std_Ctraits_long_double__Isnan @ cdecl -arch=win32 ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPAV123(a)PAVfacet@23(a)I@Z(ptr ptr long) locale__Locimp__Locimp_Addfac @ cdecl -arch=win64 ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPEAV123(a)PEAVfacet@23(a)_K@Z(ptr ptr long) locale__Locimp__Locimp_Addfac @ cdecl -arch=win32 ?_Locimp_ctor(a)_Locimp@locale(a)std@@CAXPAV123(a)ABV123@@Z(ptr ptr) locale__Locimp__Locimp_ctor diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index 7ea6b69..439865a 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -815,6 +815,15 @@ std_Ctraits * __thiscall std_Ctraits_op_assign( std_Ctraits *this, std_Ctraits * return this; } +/* ?_Isnan@?$_Ctraits(a)M@std@@SA_NM(a)Z -> public: static bool __cdecl std::_Ctraits<float>::_Isnan(float) */ +BOOLEAN __cdecl std_Ctraits_float__Isnan( float x ) { return _isnan(x); } + +/* ?_Isnan@?$_Ctraits(a)N@std@@SA_NN(a)Z -> public: static bool __cdecl std::_Ctraits<double>::_Isnan(double) */ +BOOLEAN __cdecl std_Ctraits_double__Isnan( double x ) { return _isnan(x); } + +/* ?_Isnan@?$_Ctraits(a)O@std@@SA_NO(a)Z -> public: static bool __cdecl std::_Ctraits<long double>::_Isnan(long double) */ +BOOLEAN __cdecl std_Ctraits_long_double__Isnan( LDOUBLE x ) { return _isnan(x); } + /* ?atan2@?$_Ctraits(a)M@std@@SAMMM(a)Z -> public: static float __cdecl std::_Ctraits<float>::atan2(float,float) */ float __cdecl std_Ctraits_float_atan2( float y, float x ) { return atan2f( y, x ); } diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 5271737..edb984b 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2878,9 +2878,9 @@ @ stub ?_Isinf@?$_Ctraits(a)M@std@@SA_NM(a)Z @ stub ?_Isinf@?$_Ctraits(a)N@std@@SA_NN(a)Z @ stub ?_Isinf@?$_Ctraits(a)O@std@@SA_NO(a)Z -@ stub ?_Isnan@?$_Ctraits(a)M@std@@SA_NM(a)Z -@ stub ?_Isnan@?$_Ctraits(a)N@std@@SA_NN(a)Z -@ stub ?_Isnan@?$_Ctraits(a)O@std@@SA_NO(a)Z +@ cdecl ?_Isnan@?$_Ctraits(a)M@std@@SA_NM(a)Z(float) std_Ctraits_float__Isnan +@ cdecl ?_Isnan@?$_Ctraits(a)N@std@@SA_NN(a)Z(double) std_Ctraits_double__Isnan +@ cdecl ?_Isnan@?$_Ctraits(a)O@std@@SA_NO(a)Z(double) std_Ctraits_long_double__Isnan @ cdecl -arch=win32 ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPAV123(a)PAVfacet@23(a)I@Z(ptr ptr long) locale__Locimp__Locimp_Addfac @ cdecl -arch=win64 ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPEAV123(a)PEAVfacet@23(a)_K@Z(ptr ptr long) locale__Locimp__Locimp_Addfac @ cdecl -arch=win32 ?_Locimp_ctor(a)_Locimp@locale(a)std@@CAXPAV123(a)ABV123@@Z(ptr ptr) locale__Locimp__Locimp_ctor diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 26cafc9..a4e07d7 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -19,6 +19,7 @@ #include <stdio.h> #include <locale.h> #include <wctype.h> +#include <math.h> #include <float.h> #include <errno.h> @@ -26,6 +27,8 @@ #include <winbase.h> #include "wine/test.h" +typedef double LDOUBLE; /* long double is just a double */ + typedef struct { LCID handle; unsigned page; @@ -110,6 +113,10 @@ static void (__thiscall *p_basic_ostringstream_char_dtor)(/*basic_ostringstream_ static void (__thiscall *p_basic_ostringstream_char_vbase_dtor)(/*basic_ostringstream_char*/void*); static void (__thiscall *p_basic_ios_char_dtor)(/*basic_ios_char*/void*); +static BOOL (__cdecl *p_std_Ctraits_float__Isnan)(float); +static BOOL (__cdecl *p_std_Ctraits_double__Isnan)(double); +static BOOL (__cdecl *p_std_Ctraits_long_double__Isnan)(LDOUBLE); + static complex_float* (__thiscall *p_complex_float_ctor)(complex_float*, const float*, const float*); static complex_float* (__cdecl *p_complex_float_add)(complex_float*, const complex_float*, const complex_float*); static complex_float* (__cdecl *p_complex_float_div)(complex_float*, const complex_float*, const complex_float*); @@ -216,6 +223,11 @@ static BOOL init(void) SET(p_wctrans, "wctrans"); SET(p_towctrans, "towctrans"); SET(basic_ostringstream_char_vbtable, "??_8?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@7B@"); + + SET(p_std_Ctraits_float__Isnan, "?_Isnan@?$_Ctraits(a)M@std@@SA_NM(a)Z"); + SET(p_std_Ctraits_double__Isnan, "?_Isnan@?$_Ctraits(a)N@std@@SA_NN(a)Z"); + SET(p_std_Ctraits_long_double__Isnan, "?_Isnan@?$_Ctraits(a)O@std@@SA_NO(a)Z"); + if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_char_assign, "?assign@?$char_traits(a)D@std@@SAXAEADAEBD(a)Z"); SET(p_wchar_assign, "?assign@?$char_traits(a)_W@std@@SAXAEA_WAEB_W(a)Z"); @@ -688,6 +700,41 @@ static BOOL almost_eq(float f1, float f2) return f1 < 0.0001; } +static void test_Ctraits_math_functions(void) +{ + BYTE ret; + + ret = p_std_Ctraits_float__Isnan(0.0); + ok(ret == FALSE, "ret = %d\n", ret); + + ret = p_std_Ctraits_float__Isnan(0.0 / 0.0); + ok(ret == TRUE, "ret = %d\n", ret); + + ret = p_std_Ctraits_float__Isnan(1.0 / 0.0); + ok(ret == FALSE, "ret = %d\n", ret); + + ret = p_std_Ctraits_float__Isnan(-1.0 / 0.0); + ok(ret == FALSE, "ret = %d\n", ret); + + ret = p_std_Ctraits_float__Isnan(log(-1.0)); + ok(ret == TRUE, "ret = %d\n", ret); + + ret = p_std_Ctraits_float__Isnan(sqrt(-1.0)); + ok(ret == TRUE, "ret = %d\n", ret); + + ret = p_std_Ctraits_double__Isnan(3.14159 / 0.0); + ok(ret == FALSE, "ret = %d\n", ret); + + ret = p_std_Ctraits_double__Isnan(log(-3.14159)); + ok(ret == TRUE, "ret = %d\n", ret); + + ret = p_std_Ctraits_long_double__Isnan(3.14159 / 0.0); + ok(ret == FALSE, "ret = %d\n", ret); + + ret = p_std_Ctraits_long_double__Isnan(sqrt(-3.14159)); + ok(ret == TRUE, "ret = %d\n", ret); +} + static void test_complex(void) { complex_float c1, c2, c3; @@ -935,6 +982,7 @@ START_TEST(misc) test_virtual_call(); test_virtual_base_dtors(); test_allocator_char(); + test_Ctraits_math_functions(); test_complex(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n");

1 0

Alexandre Julliard : msvcp60: Add some missing exports.
by Alexandre Julliard Nov. 10, 2014

Nov. 10, 2014

Module: wine Branch: master Commit: 0e21f80b4b58bf0078c3ee7752308c8fe91e8efb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e21f80b4b58bf0078c3ee775… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 10 19:38:33 2014 +0900 msvcp60: Add some missing exports. --- dlls/msvcp60/locale.c | 10 ++++++++++ dlls/msvcp60/msvcp60.spec | 16 ++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index 4828dd3..53de64c 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -2715,6 +2715,16 @@ int __thiscall codecvt_char_do_length(const codecvt_char *this, const int *state return (from_end-from > max ? max : from_end-from); } +/* ?length@?$codecvt(a)DDH@std@@QBEHABHPBD1I(a)Z */ +/* ?length@?$codecvt(a)DDH@std@@QEBAHAEBHPEBD1_K(a)Z */ +DEFINE_THISCALL_WRAPPER(codecvt_char_length, 20) +int __thiscall codecvt_char_length(const codecvt_char *this, const int *state, + const char *from, const char *from_end, MSVCP_size_t max) +{ + TRACE("(%p %p %p %p %lu)\n", this, state, from, from_end, max); + return call_codecvt_char_do_length(this, state, from, from_end, max); +} + /* ?id@?$codecvt(a)_WDH@std@@2V0locale(a)2@A */ static locale_id codecvt_wchar_id = {0}; /* ?id@?$codecvt(a)GDH@std@@2V0locale(a)2@A */ diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index b9c94a4..b3c5604 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2,10 +2,10 @@ @ stub -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAC(a)Z @ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAD(a)Z(ptr ptr) basic_istream_char_read_ch @ cdecl -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAD(a)Z(ptr ptr) basic_istream_char_read_ch -@ stub -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAE(a)Z -@ stub -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAE(a)Z -@ stub -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PAC(a)Z -@ stub -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEAC(a)Z +@ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAE(a)Z(ptr ptr) basic_istream_char_read_ch +@ cdecl -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAE(a)Z(ptr ptr) basic_istream_char_read_ch +@ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PAC(a)Z(ptr ptr) basic_istream_char_read_ch +@ cdecl -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEAC(a)Z(ptr ptr) basic_istream_char_read_ch @ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PAD(a)Z(ptr ptr) basic_istream_char_read_str @ cdecl -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEAD(a)Z(ptr ptr) basic_istream_char_read_str @ stub -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PAE(a)Z @@ -2769,8 +2769,8 @@ @ cdecl -arch=win64 ?do_is@?$ctype(a)G@std@@MEBAPEBGPEBG0PEAF(a)Z(ptr ptr ptr ptr) ctype_wchar_do_is @ thiscall -arch=win32 ?do_is@?$ctype(a)G@std@@MBE_NFG(a)Z(ptr long long) ctype_wchar_do_is_ch @ cdecl -arch=win64 ?do_is@?$ctype(a)G@std@@MEBA_NFG(a)Z(ptr long long) ctype_wchar_do_is_ch -@ stub -arch=win32 ?do_length@?$codecvt(a)DDH@std@@MBEHAAHPBD1I(a)Z -@ stub -arch=win64 ?do_length@?$codecvt(a)DDH@std@@MEBAHAEAHPEBD1_K(a)Z +@ thiscall -arch=i386 ?do_length@?$codecvt(a)DDH@std@@MBEHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_char_do_length +@ cdecl -arch=win64 ?do_length@?$codecvt(a)DDH@std@@MEBAHAEAHPEBD1_K(a)Z(ptr ptr str str long) codecvt_char_do_length @ stub -arch=win32 ?do_length@?$codecvt(a)GDH@std@@MBEHAAHPBG1I(a)Z @ stub -arch=win64 ?do_length@?$codecvt(a)GDH@std@@MEBAHAEAHPEBG1_K(a)Z @ thiscall -arch=win32 ?do_max_length@?$codecvt(a)GDH@std@@MBEHXZ(ptr) codecvt_wchar_do_max_length @@ -3402,8 +3402,8 @@ @ cdecl -arch=win64 ?length@?$char_traits(a)D@std@@SA_KPEBD(a)Z(ptr) msvcp90.?length@?$char_traits(a)D@std@@SA_KPEBD(a)Z @ cdecl -arch=win32 ?length@?$char_traits(a)G@std@@SAIPBG(a)Z(ptr) msvcp90.?length@?$char_traits(a)G@std@@SAIPBG(a)Z @ cdecl -arch=win64 ?length@?$char_traits(a)G@std@@SA_KPEBG(a)Z(ptr) msvcp90.?length@?$char_traits(a)G@std@@SA_KPEBG(a)Z -@ stub -arch=win32 ?length@?$codecvt(a)DDH@std@@QBEHAAHPBD1I(a)Z -@ stub -arch=win64 ?length@?$codecvt(a)DDH@std@@QEBAHAEAHPEBD1_K(a)Z +@ thiscall -arch=i386 ?length@?$codecvt(a)DDH@std@@QBEHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_char_length +@ cdecl -arch=win64 ?length@?$codecvt(a)DDH@std@@QEBAHAEAHPEBD1_K(a)Z(ptr ptr str str long) codecvt_char_length @ stub -arch=win32 ?length@?$codecvt(a)GDH@std@@QBEHAAHPBG1I(a)Z @ stub -arch=win64 ?length@?$codecvt(a)GDH@std@@QEBAHAEAHPEBG1_K(a)Z @ stub -arch=win32 ?log10(a)std@@YA?AV?$complex(a)M@1(a)ABV21@@Z

1 0

Iván Matellanes : msvcrt: Add missing declarations in wchar.h.
by Alexandre Julliard Nov. 10, 2014

Nov. 10, 2014

Module: wine Branch: master Commit: e4f9f53719b2bb381ebef8c3f680971fbc151133 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4f9f53719b2bb381ebef8c3f… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Sun Nov 9 20:17:31 2014 +0100 msvcrt: Add missing declarations in wchar.h. --- include/msvcrt/wchar.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index d936dc3..702fa67 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -313,12 +313,18 @@ int __cdecl _wstat64(const wchar_t*,struct _stat64*); #ifndef _WSTDIO_DEFINED #define _WSTDIO_DEFINED +wint_t __cdecl _fgetwc_nolock(FILE*); wint_t __cdecl _fgetwchar(void); +wint_t __cdecl _fputwc_nolock(wint_t,FILE*); wint_t __cdecl _fputwchar(wint_t); +wint_t __cdecl _getwc_nolock(FILE*); wchar_t* __cdecl _getws(wchar_t*); +wint_t __cdecl _putwc_nolock(wint_t,FILE*); int __cdecl _putws(const wchar_t*); int __cdecl _snwprintf(wchar_t*,size_t,const wchar_t*,...); int __cdecl _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...); +int __cdecl _scwprintf(const wchar_t*,...); +wint_t __cdecl _ungetwc_nolock(wint_t,FILE*); int __cdecl _vscwprintf(const wchar_t*,__ms_va_list); int __cdecl _vscwprintf_p_l(const wchar_t*,_locale_t,__ms_va_list); int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list);

1 0

Nikolay Sivov : dwrite: Remove OpenType language id from cache.
by Alexandre Julliard Nov. 10, 2014

Nov. 10, 2014

Module: wine Branch: master Commit: 53209e70170437dddbcad8662ca5b2754d549bbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=53209e70170437dddbcad8662… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 10 10:03:28 2014 +0300 dwrite: Remove OpenType language id from cache. --- dlls/dwrite/analyzer.c | 21 +++++++++++++++++---- dlls/dwrite/dwrite_private.h | 20 ++++++++++++++++---- dlls/dwrite/shape.c | 26 +++++++++----------------- 3 files changed, 42 insertions(+), 25 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 82e9fa5..3670e46 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -844,6 +844,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, DWRITE_SHAPING_GLYPH_PROPERTIES* glyph_props, UINT32* actual_glyph_count) { const struct dwritescript_properties *scriptprops; + struct scriptshaping_context context; struct scriptshaping_cache *cache; WCHAR *string; BOOL update_cluster; @@ -924,13 +925,25 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, } *actual_glyph_count = g; - hr = create_scriptshaping_cache(fontface, locale, &cache); + hr = create_scriptshaping_cache(fontface, &cache); if (FAILED(hr)) goto done; + context.cache = cache; + context.text = text; + context.length = length; + context.is_rtl = is_rtl; + context.max_glyph_count = max_glyph_count; + context.language_tag = DWRITE_MAKE_OPENTYPE_TAG('d','f','l','t'); + if (locale) { + WCHAR tag[5]; + if (GetLocaleInfoEx(locale, LOCALE_SOPENTYPELANGUAGETAG, tag, sizeof(tag)/sizeof(WCHAR))) + context.language_tag = DWRITE_MAKE_OPENTYPE_TAG(tag[0],tag[1],tag[2],tag[3]); + } + scriptprops = &dwritescripts_properties[script]; if (scriptprops->ops && scriptprops->ops->contextual_shaping) { - hr = scriptprops->ops->contextual_shaping(cache, is_rtl, string, length, max_glyph_count, clustermap, glyph_indices, actual_glyph_count); + hr = scriptprops->ops->contextual_shaping(&context, clustermap, glyph_indices, actual_glyph_count); if (FAILED(hr)) goto done; } @@ -938,9 +951,9 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, /* FIXME: apply default features */ if (scriptprops->ops && scriptprops->ops->set_text_glyphs_props) - hr = scriptprops->ops->set_text_glyphs_props(cache, string, length, clustermap, glyph_indices, *actual_glyph_count, text_props, glyph_props); + hr = scriptprops->ops->set_text_glyphs_props(&context, clustermap, glyph_indices, *actual_glyph_count, text_props, glyph_props); else - hr = default_shaping_ops.set_text_glyphs_props(cache, string, length, clustermap, glyph_indices, *actual_glyph_count, text_props, glyph_props); + hr = default_shaping_ops.set_text_glyphs_props(&context, clustermap, glyph_indices, *actual_glyph_count, text_props, glyph_props); done: release_scriptshaping_cache(cache); diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 57983ed..d1c42ce 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -143,14 +143,26 @@ enum SCRIPT_JUSTIFY }; struct scriptshaping_cache; -extern HRESULT create_scriptshaping_cache(IDWriteFontFace*,const WCHAR*,struct scriptshaping_cache**) DECLSPEC_HIDDEN; + +struct scriptshaping_context +{ + struct scriptshaping_cache *cache; + UINT32 language_tag; + + const WCHAR *text; + UINT32 length; + BOOL is_rtl; + + UINT32 max_glyph_count; +}; + +extern HRESULT create_scriptshaping_cache(IDWriteFontFace*,struct scriptshaping_cache**) DECLSPEC_HIDDEN; extern void release_scriptshaping_cache(struct scriptshaping_cache*) DECLSPEC_HIDDEN; struct scriptshaping_ops { - HRESULT (*contextual_shaping)(struct scriptshaping_cache *cache, BOOL is_rtl, const WCHAR *text, UINT32 len, UINT32 max_glyph_count, - UINT16 *clustermap, UINT16 *glyph_indices, UINT32* actual_glyph_count); - HRESULT (*set_text_glyphs_props)(struct scriptshaping_cache *cache, const WCHAR *text, UINT32 len, UINT16 *clustermap, UINT16 *glyph_indices, + HRESULT (*contextual_shaping)(struct scriptshaping_context *context, UINT16 *clustermap, UINT16 *glyph_indices, UINT32* actual_glyph_count); + HRESULT (*set_text_glyphs_props)(struct scriptshaping_context *context, UINT16 *clustermap, UINT16 *glyph_indices, UINT32 glyphcount, DWRITE_SHAPING_TEXT_PROPERTIES *text_props, DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props); }; diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 00c9548..c1ae452 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -28,10 +28,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); struct scriptshaping_cache { IDWriteFontFace *fontface; - UINT32 language_tag; }; -HRESULT create_scriptshaping_cache(IDWriteFontFace *fontface, const WCHAR *locale, struct scriptshaping_cache **cache) +HRESULT create_scriptshaping_cache(IDWriteFontFace *fontface, struct scriptshaping_cache **cache) { struct scriptshaping_cache *ret; @@ -42,13 +41,6 @@ HRESULT create_scriptshaping_cache(IDWriteFontFace *fontface, const WCHAR *local ret->fontface = fontface; IDWriteFontFace_AddRef(fontface); - ret->language_tag = DWRITE_MAKE_OPENTYPE_TAG('d','f','l','t'); - if (locale) { - WCHAR tag[5]; - if (GetLocaleInfoEx(locale, LOCALE_SOPENTYPELANGUAGETAG, tag, sizeof(tag)/sizeof(WCHAR))) - ret->language_tag = DWRITE_MAKE_OPENTYPE_TAG(tag[0],tag[1],tag[2],tag[3]); - } - *cache = ret; return S_OK; @@ -122,7 +114,7 @@ static INT32 map_glyph_to_text_pos(const UINT16 *clustermap, UINT32 len, UINT16 return k; } -static HRESULT default_set_text_glyphs_props(struct scriptshaping_cache *cache, const WCHAR *text, UINT32 len, UINT16 *clustermap, UINT16 *glyph_indices, +static HRESULT default_set_text_glyphs_props(struct scriptshaping_context *context, UINT16 *clustermap, UINT16 *glyph_indices, UINT32 glyphcount, DWRITE_SHAPING_TEXT_PROPERTIES *text_props, DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props) { UINT32 i; @@ -132,36 +124,36 @@ static HRESULT default_set_text_glyphs_props(struct scriptshaping_cache *cache, UINT32 char_count = 0; INT32 k; - k = map_glyph_to_text_pos(clustermap, len, i); + k = map_glyph_to_text_pos(clustermap, context->length, i); if (k >= 0) { - for (; k < len && clustermap[k] == i; k++) + for (; k < context->length && clustermap[k] == i; k++) char_index[char_count++] = k; } if (char_count == 0) continue; - if (char_count == 1 && isspaceW(text[char_index[0]])) { + if (char_count == 1 && isspaceW(context->text[char_index[0]])) { glyph_props[i].justification = SCRIPT_JUSTIFY_BLANK; - text_props[char_index[0]].isShapedAlone = text[char_index[0]] == ' '; + text_props[char_index[0]].isShapedAlone = context->text[char_index[0]] == ' '; } else glyph_props[i].justification = SCRIPT_JUSTIFY_CHARACTER; } /* FIXME: update properties using GDEF table */ - shape_update_clusters_from_glyphprop(glyphcount, len, clustermap, glyph_props); + shape_update_clusters_from_glyphprop(glyphcount, context->length, clustermap, glyph_props); return S_OK; } -static HRESULT latn_set_text_glyphs_props(struct scriptshaping_cache *cache, const WCHAR *text, UINT32 len, UINT16 *clustermap, UINT16 *glyph_indices, +static HRESULT latn_set_text_glyphs_props(struct scriptshaping_context *context, UINT16 *clustermap, UINT16 *glyph_indices, UINT32 glyphcount, DWRITE_SHAPING_TEXT_PROPERTIES *text_props, DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props) { HRESULT hr; UINT32 i; - hr = default_set_text_glyphs_props(cache, text, len, clustermap, glyph_indices, glyphcount, text_props, glyph_props); + hr = default_set_text_glyphs_props(context, clustermap, glyph_indices, glyphcount, text_props, glyph_props); for (i = 0; i < glyphcount; i++) if (glyph_props[i].isZeroWidthSpace)

1 0

Iván Matellanes : msvcrt: Added _fread_nolock_s implementation.
by Alexandre Julliard Nov. 10, 2014

Nov. 10, 2014

Module: wine Branch: master Commit: bcbd83d1543a345fca994266eff224fb7fd9be9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcbd83d1543a345fca994266e… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Sun Nov 9 20:17:45 2014 +0100 msvcrt: Added _fread_nolock_s implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr100/tests/msvcr100.c | 35 +++++++++++++++++++++++++++++++++++ dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 26 ++++++++++++++++++++++++-- dlls/msvcrt/msvcrt.h | 1 + include/msvcrt/stdio.h | 2 ++ 9 files changed, 67 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index cb45506..a6e7771 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -835,7 +835,7 @@ @ cdecl _fputwc_nolock(long ptr) MSVCRT__fputwc_nolock @ cdecl _fputwchar(long) MSVCRT__fputwchar @ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock -@ stub _fread_nolock_s +@ cdecl _fread_nolock_s(ptr long long long ptr) MSVCRT__fread_nolock_s @ cdecl _free_locale(ptr) MSVCRT__free_locale @ stub _freea @ stub _freea_s diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index a998fb5..4c66ed5 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -140,6 +140,8 @@ static int (__cdecl *p_wmemmove_s)(wchar_t *dest, size_t numberOfElements, const static FILE* (__cdecl *p_fopen)(const char*,const char*); static int (__cdecl *p_fclose)(FILE*); static size_t (__cdecl *p_fread_s)(void*,size_t,size_t,size_t,FILE*); +static void (__cdecl *p_lock_file)(FILE*); +static void (__cdecl *p_unlock_file)(FILE*); static void* (__cdecl *p__aligned_offset_malloc)(size_t, size_t, size_t); static void (__cdecl *p__aligned_free)(void*); static size_t (__cdecl *p__aligned_msize)(void*, size_t, size_t); @@ -178,6 +180,8 @@ static BOOL init(void) SET(p_fopen, "fopen"); SET(p_fclose, "fclose"); SET(p_fread_s, "fread_s"); + SET(p_lock_file, "_lock_file"); + SET(p_unlock_file, "_unlock_file"); SET(p__aligned_offset_malloc, "_aligned_offset_malloc"); SET(p__aligned_free, "_aligned_free"); SET(p__aligned_msize, "_aligned_msize"); @@ -357,11 +361,30 @@ static void test_wmemmove_s(void) "Cannot reset invalid parameter handler\n"); } +struct block_file_arg +{ + FILE *test_file; + HANDLE init; + HANDLE finish; +}; + +static DWORD WINAPI block_file(void *arg) +{ + struct block_file_arg *files = arg; + p_lock_file(files->test_file); + SetEvent(files->init); + WaitForSingleObject(files->finish, INFINITE); + p_unlock_file(files->test_file); + return 0; +} + static void test_fread_s(void) { static const char test_file[] = "fread_s.tst"; int ret; char buf[10]; + HANDLE thread; + struct block_file_arg arg; FILE *f = fopen(test_file, "w"); if(!f) { @@ -382,6 +405,12 @@ static void test_fread_s(void) CHECK_CALLED(invalid_parameter_handler); f = p_fopen(test_file, "r"); + arg.test_file = f; + arg.init = CreateEventW(NULL, FALSE, FALSE, NULL); + arg.finish = CreateEventW(NULL, FALSE, FALSE, NULL); + thread = CreateThread(NULL, 0, block_file, (void*)&arg, 0, NULL); + WaitForSingleObject(arg.init, INFINITE); + errno = 0xdeadbeef; ret = p_fread_s(NULL, sizeof(buf), 0, 1, f); ok(ret == 0, "fread_s returned %d, expected 0\n", ret); @@ -390,6 +419,9 @@ static void test_fread_s(void) ok(ret == 0, "fread_s returned %d, expected 0\n", ret); ok(errno == 0xdeadbeef, "errno = %d, expected 0xdeadbeef\n", errno); + SetEvent(arg.finish); + WaitForSingleObject(thread, INFINITE); + SET_EXPECT(invalid_parameter_handler); errno = 0xdeadbeef; ret = p_fread_s(NULL, sizeof(buf), 1, 1, f); @@ -426,6 +458,9 @@ static void test_fread_s(void) ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, "Cannot reset invalid parameter handler\n"); + CloseHandle(arg.init); + CloseHandle(arg.finish); + CloseHandle(thread); unlink(test_file); } diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index d41699d..141697c 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1183,7 +1183,7 @@ @ cdecl _fputwc_nolock(long ptr) MSVCRT__fputwc_nolock @ cdecl _fputwchar(long) MSVCRT__fputwchar @ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock -@ stub _fread_nolock_s +@ cdecl _fread_nolock_s(ptr long long long ptr) MSVCRT__fread_nolock_s @ cdecl _free_locale(ptr) MSVCRT__free_locale @ stub _freea @ stub _freea_s diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index fbf688e..1b8dc28 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1181,7 +1181,7 @@ @ cdecl _fputwc_nolock(long ptr) MSVCRT__fputwc_nolock @ cdecl _fputwchar(long) MSVCRT__fputwchar @ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock -@ stub _fread_nolock_s +@ cdecl _fread_nolock_s(ptr long long long ptr) MSVCRT__fread_nolock_s @ cdecl _free_locale(ptr) MSVCRT__free_locale @ stub _freea @ stub _freea_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index efb4539..fcad7cd 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -502,7 +502,7 @@ @ cdecl _fputwc_nolock(long ptr) MSVCRT__fputwc_nolock @ cdecl _fputwchar(long) MSVCRT__fputwchar @ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock -@ stub _fread_nolock_s +@ cdecl _fread_nolock_s(ptr long long long ptr) MSVCRT__fread_nolock_s @ cdecl _free_locale(ptr) MSVCRT__free_locale @ stub _freea @ stub _freea_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index fa62366..7328b46 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -484,7 +484,7 @@ @ cdecl _fputwc_nolock(long ptr) MSVCRT__fputwc_nolock @ cdecl _fputwchar(long) MSVCRT__fputwchar @ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock -@ stub _fread_nolock_s +@ cdecl _fread_nolock_s(ptr long long long ptr) MSVCRT__fread_nolock_s @ cdecl _free_locale(ptr) MSVCRT__free_locale @ stub _freea @ stub _freea_s diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 491942d..5049605 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4130,9 +4130,31 @@ MSVCRT_size_t CDECL MSVCRT__fread_nolock(void *ptr, MSVCRT_size_t size, MSVCRT_s MSVCRT_size_t CDECL MSVCRT_fread_s(void *buf, MSVCRT_size_t buf_size, MSVCRT_size_t elem_size, MSVCRT_size_t count, MSVCRT_FILE *stream) { + MSVCRT_size_t ret; + + if(!MSVCRT_CHECK_PMT(stream != NULL)) { + if(buf && buf_size) + memset(buf, 0, buf_size); + return 0; + } + if(!elem_size || !count) return 0; + + MSVCRT__lock_file(stream); + ret = MSVCRT__fread_nolock_s(buf, buf_size, elem_size, count, stream); + MSVCRT__unlock_file(stream); + + return ret; +} + +/********************************************************************* + * _fread_nolock_s (MSVCR80.@) + */ +MSVCRT_size_t CDECL MSVCRT__fread_nolock_s(void *buf, MSVCRT_size_t buf_size, MSVCRT_size_t elem_size, + MSVCRT_size_t count, MSVCRT_FILE *stream) +{ size_t bytes_left, buf_pos; - TRACE("(%p %lu %lu %lu %p\n", buf, buf_size, elem_size, count, stream); + TRACE("(%p %lu %lu %lu %p)\n", buf, buf_size, elem_size, count, stream); if(!MSVCRT_CHECK_PMT(stream != NULL)) { if(buf && buf_size) @@ -4154,7 +4176,7 @@ MSVCRT_size_t CDECL MSVCRT_fread_s(void *buf, MSVCRT_size_t buf_size, MSVCRT_siz return 0; } - MSVCRT_fread((char*)buf+buf_pos, 1, size, stream); + MSVCRT__fread_nolock((char*)buf+buf_pos, 1, size, stream); buf_pos += size; bytes_left -= size; }else { diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 70ac68b..72d529d 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -934,6 +934,7 @@ MSVCRT_ulong* __cdecl MSVCRT___doserrno(void); int* __cdecl MSVCRT__errno(void); char* __cdecl MSVCRT_getenv(const char*); MSVCRT_size_t __cdecl MSVCRT__fread_nolock(void*,MSVCRT_size_t,MSVCRT_size_t,MSVCRT_FILE*); +MSVCRT_size_t __cdecl MSVCRT__fread_nolock_s(void*,MSVCRT_size_t,MSVCRT_size_t,MSVCRT_size_t,MSVCRT_FILE*); MSVCRT_size_t __cdecl MSVCRT__fwrite_nolock(const void*,MSVCRT_size_t,MSVCRT_size_t,MSVCRT_FILE*); int __cdecl MSVCRT_fclose(MSVCRT_FILE*); int __cdecl MSVCRT__fclose_nolock(MSVCRT_FILE*); diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index eda89e6..0606d07 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -128,6 +128,7 @@ int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list); int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); size_t __cdecl _fread_nolock(void*,size_t,size_t,FILE*); +size_t __cdecl _fread_nolock_s(void*,size_t,size_t,size_t,FILE*); size_t __cdecl _fwrite_nolock(const void*,size_t,size_t,FILE*); int __cdecl _fclose_nolock(FILE*); int __cdecl _fflush_nolock(FILE*); @@ -156,6 +157,7 @@ int __cdecl fprintf_s(FILE*,const char*,...); int __cdecl fputc(int,FILE*); int __cdecl fputs(const char*,FILE*); size_t __cdecl fread(void*,size_t,size_t,FILE*); +size_t __cdecl fread_s(void*,size_t,size_t,size_t,FILE*); FILE* __cdecl freopen(const char*,const char*,FILE*); int __cdecl fscanf(FILE*,const char*,...); int __cdecl fscanf_s(FILE*,const char*,...);

1 0

Nikolay Sivov : include: Add a couple more defines for D3DPRESENT_* flags.
by Alexandre Julliard Nov. 10, 2014

Nov. 10, 2014

Module: wine Branch: master Commit: d0ad33c219b58cbc133524001abef4163c2a3747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0ad33c219b58cbc133524001… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 8 18:58:20 2014 +0300 include: Add a couple more defines for D3DPRESENT_* flags. --- include/d3d9.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/d3d9.h b/include/d3d9.h index d5107db..712104b 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -62,6 +62,8 @@ #define D3D_SDK_VERSION 32 #define D3DADAPTER_DEFAULT 0 #define D3DENUM_NO_WHQL_LEVEL __MSABI_LONG(0x00000002) +#define D3DPRESENT_DONOTWAIT __MSABI_LONG(1) +#define D3DPRESENT_LINEAR_CONTENT __MSABI_LONG(2) #define D3DPRESENT_BACK_BUFFERS_MAX __MSABI_LONG(3) #define D3DSGR_NO_CALIBRATION __MSABI_LONG(0x00000000) #define D3DSGR_CALIBRATE __MSABI_LONG(0x00000001)

1 0