October 2014 - Wine-commits

Henri Verbeet : wined3d: Track texture coordinate normalization per-texture.
by Alexandre Julliard 09 Oct '14

09 Oct '14

Module: wine Branch: master Commit: 180071229802f259fe1a1b099faad8e7154f4194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=180071229802f259fe1a1b099… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 9 11:50:47 2014 +0200 wined3d: Track texture coordinate normalization per-texture. --- dlls/wined3d/surface.c | 4 +--- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8019a11..75f48de 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3299,7 +3299,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st bottom = src_surface->resource.height - src_rect->top; } - if (src_surface->flags & SFLAG_NORMCOORD) + if (src_surface->container->flags & WINED3D_TEXTURE_NORMALIZED_COORDS) { left /= src_surface->pow2Width; right /= src_surface->pow2Width; @@ -5547,8 +5547,6 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text list_init(&surface->overlays); /* Flags */ - if (target != GL_TEXTURE_RECTANGLE_ARB) - surface->flags |= SFLAG_NORMCOORD; if (flags & WINED3D_SURFACE_DISCARD) surface->flags |= SFLAG_DISCARD; if (lockable || desc->format == WINED3DFMT_D16_LOCKABLE) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 1eb2abb..25e2107 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -349,7 +349,7 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, context2 = context_acquire(device, backbuffer); context_apply_blit_state(context2, device); - if (backbuffer->flags & SFLAG_NORMCOORD) + if (backbuffer->container->flags & WINED3D_TEXTURE_NORMALIZED_COORDS) { tex_left /= src_w; tex_right /= src_w; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 420355b..4f962f1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -81,7 +81,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->level_count = level_count; texture->filter_type = (desc->usage & WINED3DUSAGE_AUTOGENMIPMAP) ? WINED3D_TEXF_LINEAR : WINED3D_TEXF_NONE; texture->lod = 0; - texture->flags = WINED3D_TEXTURE_POW2_MAT_IDENT; + texture->flags = WINED3D_TEXTURE_POW2_MAT_IDENT | WINED3D_TEXTURE_NORMALIZED_COORDS; if (surface_flags & WINED3D_SURFACE_PIN_SYSMEM) texture->flags |= WINED3D_TEXTURE_PIN_SYSMEM; @@ -1209,7 +1209,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 texture->pow2_matrix[15] = 1.0f; texture->target = GL_TEXTURE_RECTANGLE_ARB; texture->flags |= WINED3D_TEXTURE_COND_NP2; - texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; + texture->flags &= ~(WINED3D_TEXTURE_POW2_MAT_IDENT | WINED3D_TEXTURE_NORMALIZED_COORDS); if (texture->resource.format->flags & WINED3DFMT_FLAG_FILTERING) texture->min_mip_lookup = minMipLookup_noMip; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d7e8fb4..25d2406 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2131,6 +2131,7 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_CONVERTED 0x00000080 #define WINED3D_TEXTURE_PIN_SYSMEM 0x00000100 #define WINED3D_TEXTURE_DYNAMIC_MAP 0x00000200 +#define WINED3D_TEXTURE_NORMALIZED_COORDS 0x00000400 struct wined3d_texture { @@ -2351,11 +2352,10 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #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). */ +#define SFLAG_LOST 0x00000008 /* Surface lost flag for ddraw. */ #define SFLAG_GLCKEY 0x00000010 /* The GL texture was created with a color key. */ #define SFLAG_CLIENT 0x00000020 /* GL_APPLE_client_storage is used with this surface. */ #define SFLAG_DCINUSE 0x00000040 /* Set between GetDC and ReleaseDC calls. */ -#define SFLAG_LOST 0x00000080 /* Surface lost flag for ddraw. */ struct wined3d_sampler {

1 0

Henri Verbeet : d3d9/tests: Allow a width and height to be passed to create_device().
by Alexandre Julliard 09 Oct '14

09 Oct '14

Module: wine Branch: master Commit: 2291c72caf14cd46d5533d9d2b2742510330e0ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=2291c72caf14cd46d5533d9d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 9 11:50:48 2014 +0200 d3d9/tests: Allow a width and height to be passed to create_device(). --- dlls/d3d9/tests/device.c | 241 ++++++++++++++++++++++++++++------------------- 1 file changed, 143 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2291c72caf14cd46d5533…

1 0

Henri Verbeet : d3d9/tests: Use create_device() in test_scissor_size().
by Alexandre Julliard 09 Oct '14

09 Oct '14

Module: wine Branch: master Commit: 1bec6ab0bc0c16f3b580165f7cb337e9510cce3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bec6ab0bc0c16f3b580165f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 9 11:50:49 2014 +0200 d3d9/tests: Use create_device() in test_scissor_size(). --- dlls/d3d9/tests/device.c | 34 ++++++++-------------------------- 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 16a9177..02c8227 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2938,6 +2938,7 @@ static void test_display_formats(void) static void test_scissor_size(void) { + struct device_desc device_desc; IDirect3D9 *d3d9_ptr; unsigned int i; static struct { @@ -2954,7 +2955,6 @@ static void test_scissor_size(void) for(i=0; i<sizeof(scts)/sizeof(scts[0]); i++) { IDirect3DDevice9 *device_ptr = 0; - D3DPRESENT_PARAMETERS present_parameters; HRESULT hr; HWND hwnd = 0; RECT scissorrect; @@ -2968,30 +2968,14 @@ static void test_scissor_size(void) scts[i].backy = screen_height; } - ZeroMemory(&present_parameters, sizeof(present_parameters)); - present_parameters.Windowed = scts[i].window; - present_parameters.hDeviceWindow = hwnd; - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - present_parameters.BackBufferWidth = scts[i].backx; - present_parameters.BackBufferHeight = scts[i].backy; - present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; - present_parameters.EnableAutoDepthStencil = TRUE; - present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; - - hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); - if(FAILED(hr)) { - present_parameters.AutoDepthStencilFormat = D3DFMT_D16; - hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); - if(FAILED(hr)) { - hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); - } - } - ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D_CreateDevice returned: %08x\n", hr); - - if (!device_ptr) + device_desc.device_window = hwnd; + device_desc.width = scts[i].backx; + device_desc.height = scts[i].backy; + device_desc.windowed = scts[i].window; + if (!(device_ptr = create_device(d3d9_ptr, hwnd, &device_desc))) { + skip("Failed to create a 3D device, skipping test.\n"); DestroyWindow(hwnd); - skip("Creating the device failed\n"); goto err_out; } @@ -3001,9 +2985,7 @@ static void test_scissor_size(void) ok(scissorrect.right == scts[i].backx && scissorrect.bottom == scts[i].backy && scissorrect.top == 0 && scissorrect.left == 0, "Scissorrect missmatch (%d, %d) should be (%d, %d)\n", scissorrect.right, scissorrect.bottom, scts[i].backx, scts[i].backy); /* check the scissorrect values after a reset */ - present_parameters.BackBufferWidth = screen_width; - present_parameters.BackBufferHeight = screen_height; - hr = IDirect3DDevice9_Reset(device_ptr, &present_parameters); + hr = reset_device(device_ptr, hwnd, scts[i].window); ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with %08x\n", hr); hr = IDirect3DDevice9_TestCooperativeLevel(device_ptr); ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successful reset returned %#x\n", hr);

1 0

David Heidelberger : dbghelp: Implement DW_TAG_const_type in dwarf2_parse_udt_type.
by Alexandre Julliard 09 Oct '14

09 Oct '14

Module: wine Branch: master Commit: df5ff98b073fd6554fe7399e68ce4c106e483d0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=df5ff98b073fd6554fe7399e6… Author: David Heidelberger <david.heidelberger(a)ixit.cz> Date: Sun Oct 5 16:26:09 2014 +0200 dbghelp: Implement DW_TAG_const_type in dwarf2_parse_udt_type. --- dlls/dbghelp/dwarf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index e7c36b0..a89cf11 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1453,6 +1453,9 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, case DW_TAG_subprogram: dwarf2_parse_subprogram(ctx, child); break; + case DW_TAG_const_type: + dwarf2_parse_const_type(ctx, child); + break; case DW_TAG_structure_type: case DW_TAG_class_type: case DW_TAG_union_type:

1 0

André Hentschel : kernel32/tests: Skip on faked version values.
by Alexandre Julliard 09 Oct '14

09 Oct '14

Module: wine Branch: master Commit: 8e917352e1aaf4734b2175ee04b90c55ed7b6964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e917352e1aaf4734b2175ee0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 6 22:31:43 2014 +0200 kernel32/tests: Skip on faked version values. --- dlls/kernel32/tests/version.c | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index e27ea4c..a47e52c 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -23,23 +23,29 @@ #include "wine/test.h" #include "winbase.h" +#include "winternl.h" static BOOL (WINAPI * pGetProductInfo)(DWORD, DWORD, DWORD, DWORD, DWORD *); static BOOL (WINAPI * pVerifyVersionInfoA)(LPOSVERSIONINFOEXA, DWORD, DWORDLONG); static ULONGLONG (WINAPI * pVerSetConditionMask)(ULONGLONG, DWORD, BYTE); +static NTSTATUS (WINAPI * pRtlGetVersion)(RTL_OSVERSIONINFOEXW *); -#define KERNEL32_GET_PROC(func) \ - p##func = (void *)GetProcAddress(hKernel32, #func); +#define GET_PROC(func) \ + p##func = (void *)GetProcAddress(hmod, #func); static void init_function_pointers(void) { - HMODULE hKernel32; + HMODULE hmod; - hKernel32 = GetModuleHandleA("kernel32.dll"); + hmod = GetModuleHandleA("kernel32.dll"); - KERNEL32_GET_PROC(GetProductInfo); - KERNEL32_GET_PROC(VerifyVersionInfoA); - KERNEL32_GET_PROC(VerSetConditionMask); + GET_PROC(GetProductInfo); + GET_PROC(VerifyVersionInfoA); + GET_PROC(VerSetConditionMask); + + hmod = GetModuleHandleA("ntdll.dll"); + + GET_PROC(RtlGetVersion); } static void test_GetProductInfo(void) @@ -170,6 +176,21 @@ static void test_VerifyVersionInfo(void) info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); GetVersionExA((OSVERSIONINFOA *)&info); servicepack = info.wServicePackMajor; + + /* Win8.1+ returns Win8 version in GetVersionEx when there's no app manifest targeting 8.1 */ + if (info.dwMajorVersion == 6 && info.dwMinorVersion == 2) + { + RTL_OSVERSIONINFOEXW rtlinfo; + rtlinfo.dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOEXW); + ok(SUCCEEDED(pRtlGetVersion(&rtlinfo)), "RtlGetVersion failed\n"); + + if (rtlinfo.dwMajorVersion != 6 || rtlinfo.dwMinorVersion != 2) + { + win_skip("GetVersionEx and VerifyVersionInfo are faking values\n"); + return; + } + } + memset(&info, 0, sizeof(info)); ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION,

1 0

YongHao Hu : msvcp90/tests: Add cout<< double test.
by Alexandre Julliard 08 Oct '14

08 Oct '14

Module: wine Branch: master Commit: edb68e7b225f6a87cadd3db9fa256dce0e23938e URL: http://source.winehq.org/git/wine.git/?a=commit;h=edb68e7b225f6a87cadd3db9f… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Tue Oct 7 09:47:21 2014 +0800 msvcp90/tests: Add cout<< double test. --- dlls/msvcp90/tests/ios.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 76107b0..6eb23a9 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -1951,6 +1951,46 @@ static void test_ostream_print_ushort(void) call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); } +static void test_ostream_print_double(void) +{ + static const char double_str[] = "3.14159"; + + basic_stringstream_char ss; + basic_string_char pstr; + const char *str; + double val; + val = 3.14159; + + call_func1(p_basic_stringstream_char_ctor, &ss); + call_func2_ptr_dbl(p_basic_ostream_char_print_double, &ss.base.base2, val); + call_func2(p_basic_stringstream_char_str_get, &ss, &pstr); + str = call_func1(p_basic_string_char_cstr, &pstr); + ok(!strcmp(double_str, str), "str = %s\n", str); + + call_func1(p_basic_string_char_dtor, &pstr); + call_func1(p_basic_stringstream_char_vbase_dtor, &ss); +} + +static void test_ostream_wchar_print_double(void) +{ + static const wchar_t double_str[] = { '3', '.', '1', '4', '1', '5', '9', 0 }; + + basic_stringstream_wchar wss; + basic_string_wchar pwstr; + const wchar_t *wstr; + double val; + val = 3.14159; + + call_func1(p_basic_stringstream_wchar_ctor, &wss); + call_func2_ptr_dbl(p_basic_ostream_wchar_print_double, &wss.base.base2, val); + + call_func2(p_basic_stringstream_wchar_str_get, &wss, &pwstr); + wstr = call_func1(p_basic_string_wchar_cstr, &pwstr); + + ok(!lstrcmpW(double_str, wstr), "wstr = %s\n", wine_dbgstr_w(wstr)); + call_func1(p_basic_string_wchar_dtor, &pwstr); + call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); +} START_TEST(ios) { @@ -1968,6 +2008,8 @@ START_TEST(ios) test_istream_tellg(); test_istream_getline(); test_ostream_print_ushort(); + test_ostream_print_double(); + test_ostream_wchar_print_double(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n");

1 0

YongHao Hu : msvcp90/tests: Add cout<< float test.
by Alexandre Julliard 08 Oct '14

08 Oct '14

Module: wine Branch: master Commit: d33ce5629f3482a3525316d12e94af21daf43745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d33ce5629f3482a3525316d12… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Tue Oct 7 09:48:06 2014 +0800 msvcp90/tests: Add cout<< float test. --- dlls/msvcp90/tests/ios.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 6eb23a9..470dc37 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -464,6 +464,8 @@ static fpos_int* (*__thiscall p_basic_istream_wchar_tellg)(basic_istr static basic_istream_wchar* (*__cdecl p_basic_istream_wchar_getline_bstr_delim)(basic_istream_wchar*, basic_string_wchar*, wchar_t); /* ostream */ +static basic_ostream_char* (*__thiscall p_basic_ostream_char_print_float)(basic_ostream_char*, float); + static basic_ostream_char* (*__thiscall p_basic_ostream_char_print_double)(basic_ostream_char*, double); static basic_ostream_wchar* (*__thiscall p_basic_ostream_wchar_print_double)(basic_ostream_wchar*, double); @@ -544,6 +546,7 @@ static void * (WINAPI *call_thiscall_func5)( void *func, void *this, const void /* to silence compiler errors */ static void * (WINAPI *call_thiscall_func2_ptr_dbl)( void *func, void *this, double a ); +static void * (WINAPI *call_thiscall_func2_ptr_flt)( void *func, void *this, float a ); static void * (WINAPI *call_thiscall_func2_ptr_fpos)( void *func, void *this, fpos_int a ); static void init_thiscall_thunk(void) @@ -562,6 +565,7 @@ static void init_thiscall_thunk(void) call_thiscall_func5 = (void *)thunk; call_thiscall_func2_ptr_dbl = (void *)thunk; + call_thiscall_func2_ptr_flt = (void *)thunk; call_thiscall_func2_ptr_fpos = (void *)thunk; } @@ -574,6 +578,7 @@ static void init_thiscall_thunk(void) (const void*)(c), (const void *)(d)) #define call_func2_ptr_dbl(func,_this,a) call_thiscall_func2_ptr_dbl(func,_this,a) +#define call_func2_ptr_flt(func,_this,a) call_thiscall_func2_ptr_flt(func,_this,a) #define call_func2_ptr_fpos(func,_this,a) call_thiscall_func2_ptr_fpos(func,_this,a) #else @@ -586,6 +591,7 @@ static void init_thiscall_thunk(void) #define call_func5(func,_this,a,b,c,d) func(_this,a,b,c,d) #define call_func2_ptr_dbl call_func2 +#define call_func2_ptr_flt call_func2 #define call_func2_ptr_fpos call_func2 #endif /* __i386__ */ @@ -682,6 +688,9 @@ static BOOL init(void) SET(p_basic_istream_wchar_getline_bstr_delim, "??$getline(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@YAAEAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AEAV10@AEAV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)_W@Z"); + SET(p_basic_ostream_char_print_float, + "??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)M@Z"); + SET(p_basic_ostream_char_print_double, "??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)N@Z"); @@ -796,6 +805,9 @@ static BOOL init(void) SET(p_basic_istream_wchar_getline_bstr_delim, "??$getline(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@AAV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)_W@Z"); + SET(p_basic_ostream_char_print_float, + "??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAAAAV01(a)M@Z"); + SET(p_basic_ostream_char_print_double, "??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAAAAV01(a)N@Z"); @@ -909,6 +921,9 @@ static BOOL init(void) SET(p_basic_istream_wchar_getline_bstr_delim, "??$getline(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@AAV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)_W@Z"); + SET(p_basic_ostream_char_print_float, + "??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)M@Z"); + SET(p_basic_ostream_char_print_double, "??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)N@Z"); @@ -1951,6 +1966,26 @@ static void test_ostream_print_ushort(void) call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); } +static void test_ostream_print_float(void) +{ + static const char float_str[] = "3.14159"; + + basic_stringstream_char ss; + basic_string_char pstr; + const char *str; + float val; + val = 3.14159; + + call_func1(p_basic_stringstream_char_ctor, &ss); + call_func2_ptr_flt(p_basic_ostream_char_print_float, &ss.base.base2, val); + call_func2(p_basic_stringstream_char_str_get, &ss, &pstr); + str = call_func1(p_basic_string_char_cstr, &pstr); + ok(!strcmp(float_str, str), "str = %s\n", str); + + call_func1(p_basic_string_char_dtor, &pstr); + call_func1(p_basic_stringstream_char_vbase_dtor, &ss); +} + static void test_ostream_print_double(void) { static const char double_str[] = "3.14159"; @@ -2008,6 +2043,7 @@ START_TEST(ios) test_istream_tellg(); test_istream_getline(); test_ostream_print_ushort(); + test_ostream_print_float(); test_ostream_print_double(); test_ostream_wchar_print_double();

1 0

Austin English : wsnmp32: Add stub for SnmpOpen.
by Alexandre Julliard 08 Oct '14

08 Oct '14

Module: wine Branch: master Commit: 80c3a8f8bc58fff8725f52e23a4f9860af0f95e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80c3a8f8bc58fff8725f52e23… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 7 11:12:16 2014 -0500 wsnmp32: Add stub for SnmpOpen. --- dlls/wsnmp32/wsnmp32.c | 6 ++++++ dlls/wsnmp32/wsnmp32.spec | 2 +- include/winsnmp.h | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/wsnmp32/wsnmp32.c b/dlls/wsnmp32/wsnmp32.c index 721842f..3dc54cb 100644 --- a/dlls/wsnmp32/wsnmp32.c +++ b/dlls/wsnmp32/wsnmp32.c @@ -45,6 +45,12 @@ SNMPAPI_STATUS WINAPI SnmpCleanup( void ) return SNMPAPI_SUCCESS; } +HSNMP_SESSION WINAPI SnmpOpen( HWND hwnd, UINT msg ) +{ + FIXME( "%p %u\n", hwnd, msg ); + return SNMPAPI_FAILURE; +} + SNMPAPI_STATUS WINAPI SnmpSetRetransmitMode( smiUINT32 retransmit_mode ) { FIXME( "%u\n", retransmit_mode ); diff --git a/dlls/wsnmp32/wsnmp32.spec b/dlls/wsnmp32/wsnmp32.spec index 197092a..61e48ba 100644 --- a/dlls/wsnmp32/wsnmp32.spec +++ b/dlls/wsnmp32/wsnmp32.spec @@ -11,7 +11,7 @@ 120 stub SnmpGetVendorInfo 200 stdcall SnmpStartup(ptr ptr ptr ptr ptr) 201 stdcall SnmpCleanup() -202 stub SnmpOpen +202 stdcall SnmpOpen(ptr long) 203 stub SnmpClose 204 stub SnmpSendMsg 205 stub SnmpRecvMsg diff --git a/include/winsnmp.h b/include/winsnmp.h index 64765de..79a5e88 100644 --- a/include/winsnmp.h +++ b/include/winsnmp.h @@ -27,6 +27,7 @@ typedef int smiINT, *smiLPINT; typedef smiINT smiINT32, *smiLPINT32; typedef unsigned int smiUINT32, *smiLPUINT32; typedef smiUINT32 SNMPAPI_STATUS; +typedef HANDLE HSNMP_SESSION; #define SNMPAPI_NO_SUPPORT 0 #define SNMPAPI_V1_SUPPORT 1 @@ -44,6 +45,7 @@ typedef smiUINT32 SNMPAPI_STATUS; #define SNMPAPI_SUCCESS 1 SNMPAPI_STATUS WINAPI SnmpCleanup(void); +HSNMP_SESSION WINAPI SnmpOpen(HWND,UINT); SNMPAPI_STATUS WINAPI SnmpSetRetransmitMode(smiUINT32); SNMPAPI_STATUS WINAPI SnmpSetTranslateMode(smiUINT32); SNMPAPI_STATUS WINAPI SnmpStartup(smiLPUINT32,smiLPUINT32,smiLPUINT32,smiLPUINT32,smiLPUINT32);

1 0

Austin English : ntdsapi: Add stubs for DsBindA/W.
by Alexandre Julliard 08 Oct '14

08 Oct '14

Module: wine Branch: master Commit: 35b90ece93aeaec2affc571b1420a9ec569125f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35b90ece93aeaec2affc571b1… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 7 11:46:05 2014 -0500 ntdsapi: Add stubs for DsBindA/W. --- dlls/ntdsapi/ntdsapi.c | 18 ++++++++++++++++++ dlls/ntdsapi/ntdsapi.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/ntdsapi/ntdsapi.c b/dlls/ntdsapi/ntdsapi.c index 1ffbd9d..4ca3b09 100644 --- a/dlls/ntdsapi/ntdsapi.c +++ b/dlls/ntdsapi/ntdsapi.c @@ -48,6 +48,24 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) } /*********************************************************************** + * DsBindA (NTDSAPI.@) + */ +DWORD WINAPI DsBindA(LPCSTR controller, LPCSTR domain, HANDLE *handle) + { + FIXME("(%s,%s, %p): stub!\n", debugstr_a(controller), debugstr_a(domain), handle); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * DsBindW (NTDSAPI.@) + */ +DWORD WINAPI DsBindW(LPCWSTR controller, LPCWSTR domain, HANDLE *handle) + { + FIXME("(%s,%s, %p): stub!\n", debugstr_w(controller), debugstr_w(domain), handle); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** * DsMakeSpnW (NTDSAPI.@) */ DWORD WINAPI DsMakeSpnW(LPCWSTR svc_class, LPCWSTR svc_name, diff --git a/dlls/ntdsapi/ntdsapi.spec b/dlls/ntdsapi/ntdsapi.spec index f4ae6f8..b3ed8be 100644 --- a/dlls/ntdsapi/ntdsapi.spec +++ b/dlls/ntdsapi/ntdsapi.spec @@ -1,7 +1,7 @@ @ stub DsAddSidHistoryA @ stub DsAddSidHistoryW -@ stub DsBindA -@ stub DsBindW +@ stdcall DsBindA(str str ptr) +@ stdcall DsBindW(wstr wstr ptr) @ stub DsBindWithCredA @ stub DsBindWithCredW @ stub DsBindWithSpnA

1 0

André Hentschel : setupapi: Add stubs for CM_Get_Device_Interface_List_SizeA/W.
by Alexandre Julliard 08 Oct '14

08 Oct '14

Module: wine Branch: master Commit: f272c126072dc96da2c1fce1118b09e9126c3013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f272c126072dc96da2c1fce11… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 7 21:27:27 2014 +0200 setupapi: Add stubs for CM_Get_Device_Interface_List_SizeA/W. --- dlls/cfgmgr32/cfgmgr32.spec | 4 ++-- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index e38f720..f442157 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -84,8 +84,8 @@ @ stub CM_Get_Device_Interface_ListW @ stub CM_Get_Device_Interface_List_ExA @ stub CM_Get_Device_Interface_List_ExW -@ stub CM_Get_Device_Interface_List_SizeA -@ stub CM_Get_Device_Interface_List_SizeW +@ stdcall CM_Get_Device_Interface_List_SizeA(ptr ptr str long) setupapi.CM_Get_Device_Interface_List_SizeA +@ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) setupapi.CM_Get_Device_Interface_List_SizeW @ stdcall CM_Get_Device_Interface_List_Size_ExA(ptr ptr str long ptr) setupapi.CM_Get_Device_Interface_List_Size_ExA @ stdcall CM_Get_Device_Interface_List_Size_ExW(ptr ptr wstr long ptr) setupapi.CM_Get_Device_Interface_List_Size_ExW @ stub CM_Get_First_Log_Conf diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 48ab1e4..4fcf298 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -95,8 +95,8 @@ @ stub CM_Get_Device_Interface_ListW @ stub CM_Get_Device_Interface_List_ExA @ stub CM_Get_Device_Interface_List_ExW -@ stub CM_Get_Device_Interface_List_SizeA -@ stub CM_Get_Device_Interface_List_SizeW +@ stdcall CM_Get_Device_Interface_List_SizeA(ptr ptr str long) +@ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) @ stdcall CM_Get_Device_Interface_List_Size_ExA(ptr ptr str long ptr) @ stdcall CM_Get_Device_Interface_List_Size_ExW(ptr ptr wstr long ptr) @ stub CM_Get_First_Log_Conf diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index c07278e..673bbbf 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -367,6 +367,26 @@ CONFIGRET WINAPI CM_Locate_DevNode_ExW(PDEVINST pdnDevInst, DEVINSTID_W pDeviceI } /*********************************************************************** + * CM_Get_Device_Interface_List_SizeA (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_Device_Interface_List_SizeA(PULONG len, LPGUID class, DEVINSTID_A id, + ULONG flags) +{ + FIXME("%p %p %s 0x%08x: stub\n", len, class, debugstr_a(id), flags); + return CR_FAILURE; +} + +/*********************************************************************** + * CM_Get_Device_Interface_List_SizeW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_Device_Interface_List_SizeW(PULONG len, LPGUID class, DEVINSTID_W id, + ULONG flags) +{ + FIXME("%p %p %s 0x%08x: stub\n", len, class, debugstr_w(id), flags); + return CR_FAILURE; +} + +/*********************************************************************** * CM_Get_Device_Interface_List_Size_ExA (SETUPAPI.@) */ CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExA(PULONG len, LPGUID class, DEVINSTID_A id,

1 0