March 2018 - Wine-Commits - list.winehq.org

Jarkko Korpi : kernel32: Silence repeated LocaleNameToLCID unsupported flags.
by Alexandre Julliard March 21, 2018

March 21, 2018

Module: wine Branch: master Commit: dc5b22963bac51f796e5f9618b18ae2ab9488325 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc5b22963bac51f796e5f961… Author: Jarkko Korpi <jarkko_korpi(a)hotmail.com> Date: Wed Jul 15 02:38:25 2015 +0300 kernel32: Silence repeated LocaleNameToLCID unsupported flags. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index b305610..c5eeabf 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1396,8 +1396,10 @@ LANGID WINAPI GetSystemDefaultUILanguage(void) LCID WINAPI LocaleNameToLCID( LPCWSTR name, DWORD flags ) { struct locale_name locale_name; + static int once; - if (flags) FIXME( "unsupported flags %x\n", flags ); + if (flags && !once++) + FIXME( "unsupported flags %x\n", flags ); if (name == LOCALE_NAME_USER_DEFAULT) return GetUserDefaultLCID(); @@ -1427,7 +1429,8 @@ LCID WINAPI LocaleNameToLCID( LPCWSTR name, DWORD flags ) */ INT WINAPI LCIDToLocaleName( LCID lcid, LPWSTR name, INT count, DWORD flags ) { - if (flags) FIXME( "unsupported flags %x\n", flags ); + static int once; + if (flags && !once++) FIXME( "unsupported flags %x\n", flags ); return GetLocaleInfoW( lcid, LOCALE_SNAME | LOCALE_NOUSEROVERRIDE, name, count ); }

1 0

Matteo Bruni : d3dx9/tests: Add a test for texture refcounts and OnLostDevice().
by Alexandre Julliard March 21, 2018

March 21, 2018

Module: wine Branch: master Commit: f57d316cd3dc843d13673c378ff6f82d97011f0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f57d316cd3dc843d13673c37… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 20 23:37:30 2018 +0100 d3dx9/tests: Add a test for texture refcounts and OnLostDevice(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 118 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index b7e2d72..bcaf377 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -7368,6 +7368,123 @@ if (hr == D3D_OK) DestroyWindow(window); } +static unsigned int get_texture_refcount(IDirect3DTexture9 *iface) +{ + IDirect3DTexture9_AddRef(iface); + return IDirect3DTexture9_Release(iface); +} + +static void test_refcount(void) +{ + IDirect3DTexture9 *texture, *cur_texture, *managed_texture, *sysmem_texture; + unsigned int passes_count; + IDirect3DDevice9 *device; + ID3DXEffect *effect; + ULONG refcount; + HWND window; + HRESULT hr; + + if (!(device = create_device(&window))) + return; + + hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 1, 0, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &texture, NULL); + ok(hr == D3D_OK, "Failed to create texture, hr %#x.\n", hr); + + hr = D3DXCreateEffect(device, test_effect_preshader_effect_blob, + sizeof(test_effect_preshader_effect_blob), NULL, NULL, + D3DXFX_DONOTSAVESTATE, NULL, &effect, NULL); + ok(hr == D3D_OK, "Failed to create effect, hr %#x.\n", hr); + + hr = effect->lpVtbl->SetTexture(effect, "tex1", (IDirect3DBaseTexture9 *)texture); + ok(hr == D3D_OK, "Failed to set texture parameter, hr %#x.\n", hr); + + hr = effect->lpVtbl->Begin(effect, &passes_count, D3DXFX_DONOTSAVESTATE); + ok(hr == D3D_OK, "Begin() failed, hr %#x.\n", hr); + + hr = effect->lpVtbl->BeginPass(effect, 0); + ok(hr == D3D_OK, "BeginPass() failed, hr %#x.\n", hr); + + IDirect3DDevice9_GetTexture(device, 0, (IDirect3DBaseTexture9 **)&cur_texture); + ok(cur_texture == texture, "Unexpected current texture %p.\n", cur_texture); + IDirect3DTexture9_Release(cur_texture); + + IDirect3DDevice9_SetTexture(device, 0, NULL); + effect->lpVtbl->CommitChanges(effect); + + IDirect3DDevice9_GetTexture(device, 0, (IDirect3DBaseTexture9 **)&cur_texture); + ok(cur_texture == NULL, "Unexpected current texture %p.\n", cur_texture); + + hr = effect->lpVtbl->EndPass(effect); + ok(hr == D3D_OK, "EndPass() failed, hr %#x.\n", hr); + + hr = effect->lpVtbl->BeginPass(effect, 0); + ok(hr == D3D_OK, "BeginPass() failed, hr %#x.\n", hr); + + IDirect3DDevice9_GetTexture(device, 0, (IDirect3DBaseTexture9 **)&cur_texture); + ok(cur_texture == texture, "Unexpected current texture %p.\n", cur_texture); + IDirect3DTexture9_Release(cur_texture); + + hr = effect->lpVtbl->EndPass(effect); + ok(hr == D3D_OK, "EndPass() failed, hr %#x.\n", hr); + hr = effect->lpVtbl->End(effect); + ok(hr == D3D_OK, "End() failed, hr %#x.\n", hr); + + IDirect3DDevice9_GetTexture(device, 0, (IDirect3DBaseTexture9 **)&cur_texture); + ok(cur_texture == texture, "Unexpected current texture %p.\n", cur_texture); + IDirect3DTexture9_Release(cur_texture); + refcount = get_texture_refcount(texture); + ok(refcount == 2, "Unexpected texture refcount %u.\n", refcount); + + hr = effect->lpVtbl->OnLostDevice(effect); + ok(hr == D3D_OK, "OnLostDevice() failed, hr %#x.\n", hr); + refcount = get_texture_refcount(texture); + ok(refcount == 1, "Unexpected texture refcount %u.\n", refcount); + + hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 1, 0, D3DFMT_X8R8G8B8, D3DPOOL_MANAGED, + &managed_texture, NULL); + ok(hr == D3D_OK, "Failed to create texture, hr %#x.\n", hr); + effect->lpVtbl->SetTexture(effect, "tex1", (IDirect3DBaseTexture9 *)managed_texture); + + refcount = get_texture_refcount(managed_texture); + ok(refcount == 2, "Unexpected texture refcount %u.\n", refcount); + hr = effect->lpVtbl->OnLostDevice(effect); + ok(hr == D3D_OK, "OnLostDevice() failed, hr %#x.\n", hr); + refcount = get_texture_refcount(managed_texture); + ok(refcount == 2, "Unexpected texture refcount %u.\n", refcount); + + hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 1, 0, D3DFMT_X8R8G8B8, D3DPOOL_SYSTEMMEM, + &sysmem_texture, NULL); + ok(hr == D3D_OK, "Failed to create texture, hr %#x.\n", hr); + effect->lpVtbl->SetTexture(effect, "tex1", (IDirect3DBaseTexture9 *)sysmem_texture); + + refcount = get_texture_refcount(managed_texture); + ok(refcount == 1, "Unexpected texture refcount %u.\n", refcount); + IDirect3DTexture9_Release(managed_texture); + refcount = get_texture_refcount(sysmem_texture); + ok(refcount == 2, "Unexpected texture refcount %u.\n", refcount); + hr = effect->lpVtbl->OnLostDevice(effect); + ok(hr == D3D_OK, "OnLostDevice() failed, hr %#x.\n", hr); + refcount = get_texture_refcount(sysmem_texture); + ok(refcount == 2, "Unexpected texture refcount %u.\n", refcount); + + effect->lpVtbl->Release(effect); + + refcount = get_texture_refcount(sysmem_texture); + ok(refcount == 1, "Unexpected texture refcount %u.\n", refcount); + IDirect3DTexture9_Release(sysmem_texture); + + IDirect3DDevice9_GetTexture(device, 0, (IDirect3DBaseTexture9 **)&cur_texture); + ok(cur_texture == texture, "Unexpected current texture %p.\n", cur_texture); + IDirect3DTexture9_Release(cur_texture); + refcount = get_texture_refcount(texture); + ok(refcount == 1, "Unexpected texture refcount %u.\n", refcount); + IDirect3DTexture9_Release(texture); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(effect) { IDirect3DDevice9 *device; @@ -7404,4 +7521,5 @@ START_TEST(effect) test_effect_unsupported_shader(); test_effect_null_shader(); test_effect_clone(); + test_refcount(); }

1 0

Matteo Bruni : d3dx9/tests: Improve a few ok() messages.
by Alexandre Julliard March 21, 2018

March 21, 2018

Module: wine Branch: master Commit: 50453644f63a6a0a5ebeb4edea5206f5d3c3b29e URL: https://source.winehq.org/git/wine.git/?a=commit;h=50453644f63a6a0a5ebeb4ed… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 20 23:37:27 2018 +0100 d3dx9/tests: Improve a few ok() messages. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index ced6c8e..b7e2d72 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -5374,13 +5374,13 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) ok(hr == D3D_OK, "Got result %#x, i %u, j %u.\n", hr, i, j); } param = effect->lpVtbl->GetParameterByName(effect, NULL, check_op_parameters[i].param_name); - ok(!!param, "GetParameterByName failed.\n"); + ok(!!param, "Failed to get parameter (test %u).\n", i); hr = effect->lpVtbl->GetValue(effect, param, &fvect, sizeof(fvect)); - ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(hr == D3D_OK, "Failed to get parameter value, hr %#x (test %u).\n", hr, i); hr = effect->lpVtbl->SetValue(effect, param, &fvect, sizeof(fvect)); - ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(hr == D3D_OK, "Failed to set parameter value, hr %#x (test %u).\n", hr, i); hr = effect->lpVtbl->CommitChanges(effect); - ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(hr == D3D_OK, "Failed to commit changes, hr %#x (test %u).\n", hr, i); test_effect_preshader_op_results(device, check_op_parameters[i].state_updated, check_op_parameters[i].param_name);

1 0

Nikolay Sivov : shell32: Add SHIL_JUMBO list.
by Alexandre Julliard March 21, 2018

March 21, 2018

Module: wine Branch: master Commit: e51c9b47b8bc9f8518084c0896d0eb451c316260 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e51c9b47b8bc9f8518084c08… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 21 09:27:16 2018 +0300 shell32: Add SHIL_JUMBO list. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/iconcache.c | 10 +++++----- dlls/shell32/tests/shelllink.c | 4 +--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index f26ff0e..d55bde9 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -61,7 +61,7 @@ typedef struct static HDPA sic_hdpa; static INIT_ONCE sic_init_once = INIT_ONCE_STATIC_INIT; -static HIMAGELIST shell_imagelists[SHIL_SYSSMALL+1]; +static HIMAGELIST shell_imagelists[SHIL_LAST+1]; static CRITICAL_SECTION SHELL32_SicCS; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -454,6 +454,7 @@ static BOOL WINAPI SIC_Initialize( INIT_ONCE *once, void *param, void **context sizes[SHIL_EXTRALARGE].cy = (GetSystemMetrics( SM_CYICON ) * 3) / 2; sizes[SHIL_SYSSMALL].cx = GetSystemMetrics( SM_CXSMICON ); sizes[SHIL_SYSSMALL].cy = GetSystemMetrics( SM_CYSMICON ); + sizes[SHIL_JUMBO].cx = sizes[SHIL_JUMBO].cy = 256; TRACE("large %dx%d small %dx%d\n", sizes[SHIL_LARGE].cx, sizes[SHIL_LARGE].cy, sizes[SHIL_SMALL].cx, sizes[SHIL_SMALL].cy); @@ -1039,11 +1040,10 @@ HRESULT WINAPI SHGetStockIconInfo(SHSTOCKICONID id, UINT flags, SHSTOCKICONINFO */ HRESULT WINAPI SHGetImageList(int iImageList, REFIID riid, void **ppv) { - if (iImageList < 0 || iImageList > SHIL_SYSSMALL) - { - FIXME("Unsupported image list %i requested\n", iImageList); + TRACE("(%d, %s, %p)\n", iImageList, debugstr_guid(riid), ppv); + + if (iImageList < 0 || iImageList > SHIL_LAST) return E_FAIL; - } InitOnceExecuteOnce( &sic_init_once, SIC_Initialize, NULL, NULL ); return HIMAGELIST_QueryInterface(shell_imagelists[iImageList], riid, ppv); diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 2486c96..1e07090 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -1417,9 +1417,7 @@ static void test_SHGetImageList(void) for (i = 0; i <= SHIL_LAST; i++) { hr = SHGetImageList( i, &IID_IImageList, (void **)&list ); - todo_wine_if(i == SHIL_JUMBO) - ok( hr == S_OK || - broken( i == SHIL_JUMBO && hr == E_INVALIDARG ), /* XP and 2003 */ + ok( hr == S_OK || broken( i == SHIL_JUMBO && hr == E_INVALIDARG ), /* XP and 2003 */ "%d: got %08x\n", i, hr ); if (FAILED(hr)) continue; IImageList_GetIconSize( list, &width, &height );

1 0

Nikolay Sivov : shell32: Add support for SHIL_SYSSMALL list.
by Alexandre Julliard March 21, 2018

March 21, 2018

Module: wine Branch: master Commit: 7db6885da74d183104db52e9bd9065ebdf5e4e11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7db6885da74d183104db52e9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 21 09:27:15 2018 +0300 shell32: Add support for SHIL_SYSSMALL list. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/iconcache.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index c6baf60..f26ff0e 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -61,7 +61,7 @@ typedef struct static HDPA sic_hdpa; static INIT_ONCE sic_init_once = INIT_ONCE_STATIC_INIT; -static HIMAGELIST shell_imagelists[SHIL_EXTRALARGE+1]; +static HIMAGELIST shell_imagelists[SHIL_SYSSMALL+1]; static CRITICAL_SECTION SHELL32_SicCS; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -452,6 +452,8 @@ static BOOL WINAPI SIC_Initialize( INIT_ONCE *once, void *param, void **context sizes[SHIL_EXTRALARGE].cx = (GetSystemMetrics( SM_CXICON ) * 3) / 2; sizes[SHIL_EXTRALARGE].cy = (GetSystemMetrics( SM_CYICON ) * 3) / 2; + sizes[SHIL_SYSSMALL].cx = GetSystemMetrics( SM_CXSMICON ); + sizes[SHIL_SYSSMALL].cy = GetSystemMetrics( SM_CYSMICON ); TRACE("large %dx%d small %dx%d\n", sizes[SHIL_LARGE].cx, sizes[SHIL_LARGE].cy, sizes[SHIL_SMALL].cx, sizes[SHIL_SMALL].cy); @@ -1044,9 +1046,5 @@ HRESULT WINAPI SHGetImageList(int iImageList, REFIID riid, void **ppv) } InitOnceExecuteOnce( &sic_init_once, SIC_Initialize, NULL, NULL ); - - if (iImageList == SHIL_SYSSMALL) - iImageList = SHIL_SMALL; - return HIMAGELIST_QueryInterface(shell_imagelists[iImageList], riid, ppv); }

1 0

Nikolay Sivov : comdlg32: Use shell API directly.
by Alexandre Julliard March 21, 2018

March 21, 2018

Module: wine Branch: master Commit: 725c02614b9f94d67ad73fcc5f6ab05167bc27dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=725c02614b9f94d67ad73fcc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 21 08:59:42 2018 +0300 comdlg32: Use shell API directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/cdlg.h | 12 ------- dlls/comdlg32/cdlg32.c | 32 ----------------- dlls/comdlg32/filedlg.c | 79 +++++++++++++++++++++--------------------- dlls/comdlg32/filedlgbrowser.c | 24 ++++++------- 4 files changed, 50 insertions(+), 97 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=725c02614b9f94d67ad7…

1 0

Henri Verbeet : wined3d: Don' t bother removing PBOs for formats with upload/ download conversion in texture2d_load_texture().
by Alexandre Julliard March 21, 2018

March 21, 2018

Module: wine Branch: master Commit: faf4559a761c13d1783b768a6479fe5af290510f URL: https://source.winehq.org/git/wine.git/?a=commit;h=faf4559a761c13d1783b768a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 21 13:18:50 2018 +0330 wined3d: Don't bother removing PBOs for formats with upload/download conversion in texture2d_load_texture(). We don't use PBOs for those in the first place. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3760abb..8f4e1ee 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2087,7 +2087,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re /* Don't use PBOs for converted surfaces. During PBO conversion we look at * WINED3D_TEXTURE_CONVERTED but it isn't set (yet) in all cases it is * getting called. */ - if ((format.conv_byte_count || conversion) && texture->sub_resources[sub_resource_idx].buffer_object) + if (conversion && sub_resource->buffer_object) { TRACE("Removing the pbo attached to texture %p, %u.\n", texture, sub_resource_idx);

1 0

Dagfinn Reiakvam : iphlpapi: Add support for ConvertLengthToIpv4Mask().
by Alexandre Julliard March 21, 2018

March 21, 2018

Module: wine Branch: master Commit: 1d82495ba154b0f0fd5e2fe493d15290d22d2637 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d82495ba154b0f0fd5e2fe4… Author: Dagfinn Reiakvam <dagfinn(a)reiakvam.no> Date: Tue Mar 20 18:27:04 2018 +0100 iphlpapi: Add support for ConvertLengthToIpv4Mask(). Signed-off-by: Dagfinn Reiakvam <dagfinn(a)reiakvam.no> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 19 +++++++++++++++++++ dlls/iphlpapi/tests/iphlpapi.c | 36 ++++++++++++++++++++++++++++++++++++ include/netioapi.h | 1 + 4 files changed, 57 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index b6c9aef..bbd1ed8 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -23,7 +23,7 @@ @ stdcall ConvertInterfaceNameToLuidW( wstr ptr ) #@ stub ConvertInterfacePhysicalAddressToLuid #@ stub ConvertIpv4MaskToLength -#@ stub ConvertLengthToIpv4Mask +@ stdcall ConvertLengthToIpv4Mask( long ptr ) #@ stub ConvertRemoteInterfaceAliasToLuid #@ stub ConvertRemoteInterfaceGuidToLuid #@ stub ConvertRemoteInterfaceIndexToLuid diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 97284ed..604470a 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3223,6 +3223,25 @@ DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR *name, NET_LUID *luid) } /****************************************************************** + * ConvertLengthToIpv4Mask (IPHLPAPI.@) + */ +DWORD WINAPI ConvertLengthToIpv4Mask(ULONG mask_len, ULONG *mask) +{ + if (mask_len > 32) + { + *mask = INADDR_NONE; + return ERROR_INVALID_PARAMETER; + } + + if (mask_len == 0) + *mask = 0; + else + *mask = htonl(~0u << (32 - mask_len)); + + return NO_ERROR; +} + +/****************************************************************** * if_nametoindex (IPHLPAPI.@) */ IF_INDEX WINAPI IPHLP_if_nametoindex(const char *name) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 873612d..3509005 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -96,6 +96,7 @@ static DWORD (WINAPI *pConvertInterfaceLuidToNameW)(const NET_LUID*,WCHAR*,SIZE_ static DWORD (WINAPI *pConvertInterfaceLuidToNameA)(const NET_LUID*,char*,SIZE_T); static DWORD (WINAPI *pConvertInterfaceNameToLuidA)(const char*,NET_LUID*); static DWORD (WINAPI *pConvertInterfaceNameToLuidW)(const WCHAR*,NET_LUID*); +static DWORD (WINAPI *pConvertLengthToIpv4Mask)(ULONG,ULONG*); static PCHAR (WINAPI *pif_indextoname)(NET_IFINDEX,PCHAR); static NET_IFINDEX (WINAPI *pif_nametoindex)(const char*); @@ -149,6 +150,7 @@ static void loadIPHlpApi(void) pConvertInterfaceLuidToNameW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceLuidToNameW"); pConvertInterfaceNameToLuidA = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidA"); pConvertInterfaceNameToLuidW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidW"); + pConvertLengthToIpv4Mask = (void *)GetProcAddress(hLibrary, "ConvertLengthToIpv4Mask"); pif_indextoname = (void *)GetProcAddress(hLibrary, "if_indextoname"); pif_nametoindex = (void *)GetProcAddress(hLibrary, "if_nametoindex"); } @@ -2174,6 +2176,39 @@ static void test_GetUnicastIpAddressTable(void) pFreeMibTable(table); } +static void test_ConvertLengthToIpv4Mask(void) +{ + DWORD ret; + DWORD n; + ULONG mask; + ULONG expected; + + if (!pConvertLengthToIpv4Mask) + { + win_skip( "ConvertLengthToIpv4Mask not available\n" ); + return; + } + + for (n = 0; n <= 32; n++) + { + mask = 0xdeadbeef; + if (n > 0) + expected = htonl( ~0u << (32 - n) ); + else + expected = 0; + + ret = pConvertLengthToIpv4Mask( n, &mask ); + ok( ret == NO_ERROR, "ConvertLengthToIpv4Mask returned 0x%08x, expected 0x%08x\n", ret, NO_ERROR ); + ok( mask == expected, "ConvertLengthToIpv4Mask mask value 0x%08x, expected 0x%08x\n", mask, expected ); + } + + /* Testing for out of range. In this case both mask and return are changed to indicate error. */ + mask = 0xdeadbeef; + ret = pConvertLengthToIpv4Mask( 33, &mask ); + ok( ret == ERROR_INVALID_PARAMETER, "ConvertLengthToIpv4Mask returned 0x%08x, expected 0x%08x\n", ret, ERROR_INVALID_PARAMETER ); + ok( mask == INADDR_NONE, "ConvertLengthToIpv4Mask mask value 0x%08x, expected 0x%08x\n", mask, INADDR_NONE ); +} + START_TEST(iphlpapi) { @@ -2201,6 +2236,7 @@ START_TEST(iphlpapi) test_GetIfTable2Ex(); test_GetUnicastIpAddressEntry(); test_GetUnicastIpAddressTable(); + test_ConvertLengthToIpv4Mask(); freeIPHlpApi(); } } diff --git a/include/netioapi.h b/include/netioapi.h index 1095888..4bd64e8 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -170,6 +170,7 @@ DWORD WINAPI ConvertInterfaceLuidToNameA(const NET_LUID*,char*,SIZE_T); DWORD WINAPI ConvertInterfaceLuidToNameW(const NET_LUID*,WCHAR*,SIZE_T); DWORD WINAPI ConvertInterfaceNameToLuidA(const char*,NET_LUID*); DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR*,NET_LUID*); +DWORD WINAPI ConvertLengthToIpv4Mask(ULONG,ULONG*); void WINAPI FreeMibTable(void*); DWORD WINAPI GetIfEntry2(MIB_IF_ROW2*); DWORD WINAPI GetIfTable2(MIB_IF_TABLE2**);

1 0

Matteo Bruni : d3dx9: Add a comment about a specific preshader parsing failure mode.
by Alexandre Julliard March 21, 2018

March 21, 2018

Module: wine Branch: master Commit: 633ad47b29180f92d9c4f99177462bd975892087 URL: https://source.winehq.org/git/wine.git/?a=commit;h=633ad47b29180f92d9c4f991… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 20 23:37:28 2018 +0100 d3dx9: Add a comment about a specific preshader parsing failure mode. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 78e4868..8551d2f 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1209,7 +1209,8 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u } if (reg_idx >= pres->regs.table_sizes[table]) { - FIXME("Out of bounds register index, i %u, j %u, table %u, reg_idx %u.\n", + /* Native accepts these broken preshaders. */ + FIXME("Out of bounds register index, i %u, j %u, table %u, reg_idx %u, preshader parsing failed.\n", i, j, table, reg_idx); return D3DXERR_INVALIDDATA; }

1 0

Matteo Bruni : d3dx9: Introduce a parameter rbtree to speed up get_parameter_by_name().
by Alexandre Julliard March 21, 2018

March 21, 2018

Module: wine Branch: master Commit: f335932a81bc220d4c8e8944521f9cd2c85346ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=f335932a81bc220d4c8e8944… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 20 23:37:26 2018 +0100 d3dx9: Introduce a parameter rbtree to speed up get_parameter_by_name(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 12 ++++ dlls/d3dx9_36/effect.c | 156 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 155 insertions(+), 13 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f335932a81bc220d4c8e…

1 0