wine-devel March 2018

wine-devel@winehq.org

90 participants
798 discussions

[PATCH 3/5] wined3d: Pass a wined3d_box structure to wined3d_surface_upload_data().
by Henri Verbeet 18 Mar '18

18 Mar '18

For consistency with wined3d_texture_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 52 +++++++++++++++++++++++------------------- dlls/wined3d/texture.c | 18 ++++++++------- dlls/wined3d/wined3d_private.h | 6 ++--- 3 files changed, 42 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7f74d4954de..794e2a35869 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -776,17 +776,18 @@ static void texture2d_download_data(struct wined3d_texture *texture, unsigned in * correct texture. */ /* Context activation is done by the caller. */ void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, - unsigned int src_pitch, const POINT *dst_point, BOOL srgb, const struct wined3d_const_bo_address *data) + const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, + const struct wined3d_box *src_box, unsigned int src_pitch, const POINT *dst_point, BOOL srgb, + const struct wined3d_const_bo_address *data) { - UINT update_w = src_rect->right - src_rect->left; - UINT update_h = src_rect->bottom - src_rect->top; + unsigned int update_w = src_box->right - src_box->left; + unsigned int update_h = src_box->bottom - src_box->top; unsigned int level, layer; GLenum target; - TRACE("texure %p, sub_resource_idx %u, gl_info %p, format %s, src_rect %s, " + TRACE("texure %p, sub_resource_idx %u, gl_info %p, format %s, src_box %s, " "src_pitch %u, dst_point %s, srgb %#x, data {%#x:%p}.\n", - texture, sub_resource_idx, gl_info, debug_d3dformat(format->id), wine_dbgstr_rect(src_rect), + texture, sub_resource_idx, gl_info, debug_d3dformat(format->id), debug_box(src_box), src_pitch, wine_dbgstr_point(dst_point), srgb, data->buffer_object, data->addr); if (texture->sub_resources[sub_resource_idx].map_count) @@ -817,8 +818,8 @@ void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int s const BYTE *addr = data->addr; GLenum internal; - addr += (src_rect->top / format->block_height) * src_pitch; - addr += (src_rect->left / format->block_width) * format->block_byte_count; + addr += (src_box->top / format->block_height) * src_pitch; + addr += (src_box->left / format->block_width) * format->block_byte_count; if (srgb) internal = format->glGammaInternal; @@ -878,8 +879,8 @@ void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int s { const BYTE *addr = data->addr; - addr += src_rect->top * src_pitch; - addr += src_rect->left * format->byte_count; + addr += src_box->top * src_pitch; + addr += src_box->left * format->byte_count; TRACE("Uploading data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " "format %#x, type %#x, addr %p.\n", @@ -924,7 +925,7 @@ void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int s static HRESULT texture2d_upload_from_surface(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, const POINT *dst_point, struct wined3d_texture *src_texture, - unsigned int src_sub_resource_idx, const RECT *src_rect) + unsigned int src_sub_resource_idx, const struct wined3d_box *src_box) { unsigned int src_row_pitch, src_slice_pitch; const struct wined3d_gl_info *gl_info; @@ -934,9 +935,9 @@ static HRESULT texture2d_upload_from_surface(struct wined3d_texture *dst_texture UINT update_w, update_h; TRACE("dst_texture %p, dst_sub_resource_idx %u, dst_point %s, " - "src_texture %p, src_sub_resource_idx %u, src_rect %s.\n", + "src_texture %p, src_sub_resource_idx %u, src_box %s.\n", dst_texture, dst_sub_resource_idx, wine_dbgstr_point(dst_point), - src_texture, src_sub_resource_idx, wine_dbgstr_rect(src_rect)); + src_texture, src_sub_resource_idx, debug_box(src_box)); context = context_acquire(dst_texture->resource.device, NULL, 0); gl_info = context->gl_info; @@ -944,8 +945,8 @@ static HRESULT texture2d_upload_from_surface(struct wined3d_texture *dst_texture /* Only load the sub-resource for partial updates. For newly allocated * textures the texture wouldn't be the current location, and we'd upload * zeroes just to overwrite them again. */ - update_w = src_rect->right - src_rect->left; - update_h = src_rect->bottom - src_rect->top; + update_w = src_box->right - src_box->left; + update_h = src_box->bottom - src_box->top; dst_level = dst_sub_resource_idx % dst_texture->level_count; if (update_w == wined3d_texture_get_level_width(dst_texture, dst_level) && update_h == wined3d_texture_get_level_height(dst_texture, dst_level)) @@ -959,8 +960,8 @@ static HRESULT texture2d_upload_from_surface(struct wined3d_texture *dst_texture src_texture->sub_resources[src_sub_resource_idx].locations); wined3d_texture_get_pitch(src_texture, src_level, &src_row_pitch, &src_slice_pitch); - wined3d_surface_upload_data(dst_texture, dst_sub_resource_idx, gl_info, src_texture->resource.format, src_rect, - src_row_pitch, dst_point, FALSE, wined3d_const_bo_address(&data)); + wined3d_surface_upload_data(dst_texture, dst_sub_resource_idx, gl_info, src_texture->resource.format, + src_box, src_row_pitch, dst_point, FALSE, wined3d_const_bo_address(&data)); context_release(context); @@ -1314,7 +1315,7 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr } else { - RECT src_rect = {0, 0, desc.width, desc.height}; + struct wined3d_box src_box = {0, 0, desc.width, desc.height, 0, 1}; POINT dst_point = {0, 0}; TRACE("Using upload conversion.\n"); @@ -1322,7 +1323,7 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr wined3d_texture_prepare_texture(dst_texture, context, FALSE); wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); wined3d_surface_upload_data(dst_texture, 0, gl_info, src_format, - &src_rect, src_row_pitch, &dst_point, FALSE, wined3d_const_bo_address(&src_data)); + &src_box, src_row_pitch, &dst_point, FALSE, wined3d_const_bo_address(&src_data)); wined3d_texture_validate_location(dst_texture, 0, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(dst_texture, 0, ~WINED3D_LOCATION_TEXTURE_RGB); @@ -2147,8 +2148,8 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re struct wined3d_bo_address data; BYTE *src_mem, *dst_mem = NULL; struct wined3d_format format; + struct wined3d_box src_box; POINT dst_point = {0, 0}; - RECT src_rect; BOOL depth; depth = texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL; @@ -2166,7 +2167,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re level = sub_resource_idx % texture->level_count; width = wined3d_texture_get_level_width(texture, level); height = wined3d_texture_get_level_height(texture, level); - SetRect(&src_rect, 0, 0, width, height); + wined3d_box_set(&src_box, 0, 0, width, height, 0, 1); if (!depth && sub_resource->locations & (WINED3D_LOCATION_TEXTURE_SRGB | WINED3D_LOCATION_TEXTURE_RGB) && (texture->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB) @@ -2174,6 +2175,9 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re &texture->resource, WINED3D_LOCATION_TEXTURE_RGB, &texture->resource, WINED3D_LOCATION_TEXTURE_SRGB)) { + RECT src_rect; + + SetRect(&src_rect, 0, 0, width, height); if (srgb) texture2d_blt_fbo(device, context, WINED3D_TEXF_POINT, texture, sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB, &src_rect, @@ -2192,7 +2196,9 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re DWORD src_location = sub_resource->locations & WINED3D_LOCATION_RB_RESOLVED ? WINED3D_LOCATION_RB_RESOLVED : WINED3D_LOCATION_RB_MULTISAMPLE; DWORD dst_location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; + RECT src_rect; + SetRect(&src_rect, 0, 0, width, height); if (fbo_blitter_supported(WINED3D_BLIT_OP_COLOR_BLIT, gl_info, &texture->resource, src_location, &texture->resource, dst_location)) texture2d_blt_fbo(device, context, WINED3D_TEXF_POINT, texture, sub_resource_idx, @@ -2298,7 +2304,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re data.addr = dst_mem; } - wined3d_surface_upload_data(texture, sub_resource_idx, gl_info, &format, &src_rect, + wined3d_surface_upload_data(texture, sub_resource_idx, gl_info, &format, &src_box, src_row_pitch, &dst_point, srgb, wined3d_const_bo_address(&data)); heap_free(dst_mem); @@ -3839,7 +3845,7 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ POINT dst_point = {dst_box->left, dst_box->top}; if (SUCCEEDED(texture2d_upload_from_surface(dst_texture, dst_sub_resource_idx, - &dst_point, src_texture, src_sub_resource_idx, &src_rect))) + &dst_point, src_texture, src_sub_resource_idx, src_box))) { if (!wined3d_resource_is_offscreen(&dst_texture->resource)) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 124aa316e6c..6dd013af37c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1756,29 +1756,31 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int const struct wined3d_context *context, const struct wined3d_box *box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch) { + struct wined3d_box src_box; unsigned int texture_level; POINT dst_point; - RECT src_rect; - src_rect.left = 0; - src_rect.top = 0; + src_box.left = 0; + src_box.top = 0; + src_box.front = 0; + src_box.back = 1; if (box) { dst_point.x = box->left; dst_point.y = box->top; - src_rect.right = box->right - box->left; - src_rect.bottom = box->bottom - box->top; + src_box.right = box->right - box->left; + src_box.bottom = box->bottom - box->top; } else { dst_point.x = dst_point.y = 0; texture_level = sub_resource_idx % texture->level_count; - src_rect.right = wined3d_texture_get_level_width(texture, texture_level); - src_rect.bottom = wined3d_texture_get_level_height(texture, texture_level); + src_box.right = wined3d_texture_get_level_width(texture, texture_level); + src_box.bottom = wined3d_texture_get_level_height(texture, texture_level); } wined3d_surface_upload_data(texture, sub_resource_idx, context->gl_info, - texture->resource.format, &src_rect, row_pitch, &dst_point, FALSE, data); + texture->resource.format, &src_box, row_pitch, &dst_point, FALSE, data); } /* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 302b6ea4c80..6f44dee4f76 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3334,9 +3334,9 @@ struct fbo_entry }; void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, - unsigned int src_pitch, const POINT *dst_point, BOOL srgb, - const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN; + const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, + const struct wined3d_box *src_box, unsigned int src_pitch, const POINT *dst_point, + BOOL srgb, const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN; void draw_textured_quad(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, const RECT *src_rect, const RECT *dst_rect, -- 2.11.0

1 0

[PATCH 2/5] wined3d: Merge texture2d_prepare_texture() and texture3d_prepare_texture().
by Henri Verbeet 18 Mar '18

18 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 126 +++++++++++++++-------------------------- dlls/wined3d/wined3d_private.h | 2 - 2 files changed, 46 insertions(+), 82 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ba0fa63e80d..124aa316e6c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -441,7 +441,7 @@ static void wined3d_texture_allocate_gl_mutable_storage(struct wined3d_texture * const struct wined3d_gl_info *gl_info) { unsigned int level, level_count, layer, layer_count; - GLsizei width, height; + GLsizei width, height, depth; GLenum target; level_count = texture->level_count; @@ -464,10 +464,12 @@ static void wined3d_texture_allocate_gl_mutable_storage(struct wined3d_texture * TRACE("texture %p, layer %u, level %u, target %#x, width %u, height %u.\n", texture, layer, level, target, width, height); - if (texture->target == GL_TEXTURE_2D_ARRAY) + if (target == GL_TEXTURE_3D || target == GL_TEXTURE_2D_ARRAY) { + depth = wined3d_texture_get_level_depth(texture, level); GL_EXTCALL(glTexImage3D(target, level, gl_internal_format, width, height, - texture->layer_count, 0, format->glFormat, format->glType, NULL)); + target == GL_TEXTURE_2D_ARRAY ? texture->layer_count : depth, 0, + format->glFormat, format->glType, NULL)); checkGLcall("glTexImage3D"); } else @@ -491,6 +493,10 @@ static void wined3d_texture_allocate_gl_immutable_storage(struct wined3d_texture switch (texture->target) { + case GL_TEXTURE_3D: + GL_EXTCALL(glTexStorage3D(texture->target, texture->level_count, + gl_internal_format, width, height, wined3d_texture_get_level_depth(texture, 0))); + break; case GL_TEXTURE_2D_ARRAY: GL_EXTCALL(glTexStorage3D(texture->target, texture->level_count, gl_internal_format, width, height, texture->layer_count)); @@ -1556,10 +1562,17 @@ static void wined3d_texture_force_reload(struct wined3d_texture *texture) } } +/* Context activation is done by the caller. */ void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) { DWORD alloc_flag = srgb ? WINED3D_TEXTURE_SRGB_ALLOCATED : WINED3D_TEXTURE_RGB_ALLOCATED; + const struct wined3d_format *format = texture->resource.format; const struct wined3d_d3d_info *d3d_info = context->d3d_info; + const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_color_key_conversion *conversion; + GLenum internal; + + TRACE("texture %p, context %p, format %s.\n", texture, context, debug_d3dformat(format->id)); if (!d3d_info->shader_color_key && !(texture->async.flags & WINED3D_TEXTURE_ASYNC_COLOR_KEY) @@ -1574,7 +1587,36 @@ void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct win if (texture->flags & alloc_flag) return; - texture->texture_ops->texture_prepare_texture(texture, context, srgb); + if (format->conv_byte_count) + { + texture->flags |= WINED3D_TEXTURE_CONVERTED; + } + else if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE))) + { + texture->flags |= WINED3D_TEXTURE_CONVERTED; + format = wined3d_get_format(gl_info, conversion->dst_format, texture->resource.usage); + TRACE("Using format %s for color key conversion.\n", debug_d3dformat(format->id)); + } + + wined3d_texture_bind_and_dirtify(texture, context, srgb); + + if (srgb) + internal = format->glGammaInternal; + else if (texture->resource.usage & WINED3DUSAGE_RENDERTARGET + && wined3d_resource_is_offscreen(&texture->resource)) + internal = format->rtInternal; + else + internal = format->glInternal; + + if (!internal) + FIXME("No GL internal format for format %s.\n", debug_d3dformat(format->id)); + + TRACE("internal %#x, format %#x, type %#x.\n", internal, format->glFormat, format->glType); + + if (wined3d_texture_use_immutable_storage(texture, gl_info)) + wined3d_texture_allocate_gl_immutable_storage(texture, internal, gl_info); + else + wined3d_texture_allocate_gl_mutable_storage(texture, internal, format, gl_info); texture->flags |= alloc_flag; } @@ -1771,53 +1813,10 @@ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned in } } -/* Context activation is done by the caller. */ -static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) -{ - const struct wined3d_format *format = texture->resource.format; - const struct wined3d_gl_info *gl_info = context->gl_info; - const struct wined3d_color_key_conversion *conversion; - GLenum internal; - - TRACE("texture %p, context %p, format %s.\n", texture, context, debug_d3dformat(format->id)); - - if (format->conv_byte_count) - { - texture->flags |= WINED3D_TEXTURE_CONVERTED; - } - else if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE))) - { - texture->flags |= WINED3D_TEXTURE_CONVERTED; - format = wined3d_get_format(gl_info, conversion->dst_format, texture->resource.usage); - TRACE("Using format %s for color key conversion.\n", debug_d3dformat(format->id)); - } - - wined3d_texture_bind_and_dirtify(texture, context, srgb); - - if (srgb) - internal = format->glGammaInternal; - else if (texture->resource.usage & WINED3DUSAGE_RENDERTARGET - && wined3d_resource_is_offscreen(&texture->resource)) - internal = format->rtInternal; - else - internal = format->glInternal; - - if (!internal) - FIXME("No GL internal format for format %s.\n", debug_d3dformat(format->id)); - - TRACE("internal %#x, format %#x, type %#x.\n", internal, format->glFormat, format->glType); - - if (wined3d_texture_use_immutable_storage(texture, gl_info)) - wined3d_texture_allocate_gl_immutable_storage(texture, internal, gl_info); - else - wined3d_texture_allocate_gl_mutable_storage(texture, internal, format, gl_info); -} - static const struct wined3d_texture_ops texture2d_ops = { texture2d_upload_data, texture2d_load_location, - texture2d_prepare_texture, }; struct wined3d_texture * __cdecl wined3d_texture_from_resource(struct wined3d_resource *resource) @@ -2646,43 +2645,10 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in return TRUE; } -static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) -{ - const struct wined3d_format *format = texture->resource.format; - GLenum internal = srgb ? format->glGammaInternal : format->glInternal; - unsigned int sub_count = texture->level_count * texture->layer_count; - const struct wined3d_gl_info *gl_info = context->gl_info; - unsigned int i; - - wined3d_texture_bind_and_dirtify(texture, context, srgb); - - if (wined3d_texture_use_immutable_storage(texture, gl_info)) - { - GL_EXTCALL(glTexStorage3D(GL_TEXTURE_3D, texture->level_count, internal, - wined3d_texture_get_level_width(texture, 0), - wined3d_texture_get_level_height(texture, 0), - wined3d_texture_get_level_depth(texture, 0))); - checkGLcall("glTexStorage3D"); - } - else - { - for (i = 0; i < sub_count; ++i) - { - GL_EXTCALL(glTexImage3D(GL_TEXTURE_3D, i, internal, - wined3d_texture_get_level_width(texture, i), - wined3d_texture_get_level_height(texture, i), - wined3d_texture_get_level_depth(texture, i), - 0, format->glFormat, format->glType, NULL)); - checkGLcall("glTexImage3D"); - } - } -} - static const struct wined3d_texture_ops texture3d_ops = { texture3d_upload_data, texture3d_load_location, - texture3d_prepare_texture, }; HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 718ee63a214..302b6ea4c80 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3088,8 +3088,6 @@ struct wined3d_texture_ops const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch); BOOL (*texture_load_location)(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location); - void (*texture_prepare_texture)(struct wined3d_texture *texture, - struct wined3d_context *context, BOOL srgb); }; #define WINED3D_TEXTURE_COND_NP2 0x00000001 -- 2.11.0

1 0

[PATCH 1/5] wined3d: Resource size should always be non-zero in resource_init().
by Henri Verbeet 18 Mar '18

18 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/resource.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 97f7aec4e12..8968c164ed5 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -91,6 +91,9 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * return WINED3DERR_INVALIDCALL; } + if (!size) + ERR("Attempting to create a zero-sized resource.\n"); + for (i = 0; i < ARRAY_SIZE(resource_types); ++i) { if (resource_types[i].type != type @@ -188,17 +191,10 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->resource_ops = resource_ops; resource->map_binding = WINED3D_LOCATION_SYSMEM; - if (size) - { - if (!wined3d_resource_allocate_sysmem(resource)) - { - ERR("Failed to allocate system memory.\n"); - return E_OUTOFMEMORY; - } - } - else + if (!wined3d_resource_allocate_sysmem(resource)) { - resource->heap_memory = NULL; + ERR("Failed to allocate system memory.\n"); + return E_OUTOFMEMORY; } if (!(usage & WINED3DUSAGE_PRIVATE)) -- 2.11.0

1 0

[PATCH v2] iphlpapi: Add support for ConvertLengthToIpv4Mask()
by Dagfinn Reiakvam 18 Mar '18

18 Mar '18

From: Uberdaff <dagfinn(a)reiakvam.no> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 23 +++++++++++++++ dlls/iphlpapi/tests/iphlpapi.c | 64 ++++++++++++++++++++++++++++++++++++++++++ include/netioapi.h | 1 + 4 files changed, 89 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..e7461ce 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3223,6 +3223,29 @@ DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR *name, NET_LUID *luid) } /****************************************************************** + * ConvertLengthToIpv4Mask (IPHLPAPI.@) + */ +DWORD WINAPI ConvertLengthToIpv4Mask(ULONG MaskLength, PULONG Mask) +{ + if(MaskLength > 32) + { + *Mask = INADDR_NONE; + return ERROR_INVALID_PARAMETER; + } + + if(MaskLength == 0) + *Mask = 0; + else + { + IN_ADDR temp; + temp.S_un.S_addr = 0xffffffff << ( 32 - MaskLength); + *Mask = temp.S_un.S_un_b.s_b4 + ( temp.S_un.S_un_b.s_b3 << 8 ) + ( temp.S_un.S_un_b.s_b2 << 16 ) + ( temp.S_un.S_un_b.s_b1 << 24 ); + } + + 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..681cfc4 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,PULONG); 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,67 @@ static void test_GetUnicastIpAddressTable(void) pFreeMibTable(table); } +static void test_ConvertLengthToIpv4Mask(void) +{ + DWORD apiReturn; + ULONG Mask; + + if (!pConvertLengthToIpv4Mask) + { + win_skip( "ConvertLengthToIpv4Mask not available\n" ); + return; + } + + apiReturn = pConvertLengthToIpv4Mask(0, &Mask); + ok(apiReturn == NO_ERROR, + "ConvertLengthToIpv4Mask returned %d, expected NO_ERROR\n", apiReturn); + ok(Mask == 0, + "ConvertLengthToIpv4Mask Mask value %x, expected 0x00000000\n", Mask); + + apiReturn = pConvertLengthToIpv4Mask(1, &Mask); + ok(apiReturn == NO_ERROR, + "ConvertLengthToIpv4Mask returned %d, expected NO_ERROR\n", apiReturn); + ok(Mask == 0x00000080, + "ConvertLengthToIpv4Mask Mask value %x, expected 0x00000080\n", Mask); + + apiReturn = pConvertLengthToIpv4Mask(8, &Mask); + ok(apiReturn == NO_ERROR, + "ConvertLengthToIpv4Mask returned %d, expected NO_ERROR\n", apiReturn); + ok(Mask == 0x000000ff, + "ConvertLengthToIpv4Mask Mask value %x, expected 0x000000ff\n", Mask); + + apiReturn = pConvertLengthToIpv4Mask(16, &Mask); + ok(apiReturn == NO_ERROR, + "ConvertLengthToIpv4Mask returned %d, expected NO_ERROR\n", apiReturn); + ok(Mask == 0x0000ffff, + "ConvertLengthToIpv4Mask Mask value %x, expected 0x0000ffff\n", Mask); + + apiReturn = pConvertLengthToIpv4Mask(24, &Mask); + ok(apiReturn == NO_ERROR, + "ConvertLengthToIpv4Mask returned %d, expected NO_ERROR\n", apiReturn); + ok(Mask == 0x00ffffff, + "ConvertLengthToIpv4Mask Mask value %x, expected 0x00ffffff\n", Mask); + + apiReturn = pConvertLengthToIpv4Mask(31, &Mask); + ok(apiReturn == NO_ERROR, + "ConvertLengthToIpv4Mask returned %d, expected NO_ERROR\n", apiReturn); + ok(Mask == 0xfeffffff, + "ConvertLengthToIpv4Mask Mask value %x, expected 0xfeffffff\n", Mask); + + apiReturn = pConvertLengthToIpv4Mask(32, &Mask); + ok(apiReturn == NO_ERROR, + "ConvertLengthToIpv4Mask returned %d, expected NO_ERROR\n", apiReturn); + ok(Mask == 0xffffffff, + "ConvertLengthToIpv4Mask Mask value %x, expected 0xffffffff\n", Mask); + + apiReturn = pConvertLengthToIpv4Mask(33, &Mask); + ok(apiReturn == ERROR_INVALID_PARAMETER, + "ConvertLengthToIpv4Mask(32, &Mask) returned %d, expected ERROR_INVALID_PARAMETER\n", + apiReturn); + ok(Mask == INADDR_NONE, + "ConvertLengthToIpv4Mask Mask value %x, expected INADDR_NONE\n", Mask); +} + START_TEST(iphlpapi) { @@ -2201,6 +2264,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..beb93d2 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 MaskLength, PULONG Mask); void WINAPI FreeMibTable(void*); DWORD WINAPI GetIfEntry2(MIB_IF_ROW2*); DWORD WINAPI GetIfTable2(MIB_IF_TABLE2**); -- 2.7.4

2 4

Wine staging 3.4 release
by Alistair Leslie-Hughes 18 Mar '18

18 Mar '18

Packages have been published to the following repository. https://repos.wine-staging.com/alesliehughes/ Summary of the past few weeks * Rebased to current wine 3.4 (Over 1000 patches are applied to wine vanilla) * Reviewed and upstreamed patches. Fixes * Anti-alias fonts now work correctly in MS Office. * Fixed a crash in Assassin's Creed Syndicate. * Fixed a Texture issue in Vietcong. New Patches * Stop multiple crashes in the BattlEye service. Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game: Eve Online, Assassin's Creed Syndicate, Tomb Raider to name a few. * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.com Best Regards Alistair.

3 2

GSOC
by Abhishek Kumar 18 Mar '18

18 Mar '18

Who is mentor of Explorer.exe? Please come ahead and start discussing the ideas with me.So that we complete this task on time.

2 1

[PATCH] ntoskrnl.exe: Dont forward some msvcrt functions
by Alistair Leslie-Hughes 18 Mar '18

18 Mar '18

Fixes: https://bugs.winehq.org/show_bug.cgi?id=44496 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 49 +++++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 12 ++++----- 2 files changed, 55 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 5701f856b1..63886583ec 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3303,3 +3303,52 @@ PKEVENT WINAPI IoCreateNotificationEvent(UNICODE_STRING *name, HANDLE *handle) FIXME( "stub: %s %p\n", debugstr_us(name), handle ); return NULL; } + + +/********************************************************************* + * memcpy (NTOSKRNL.@) + * + * NOTES + * Behaves like memmove. + */ +void * __cdecl NTOSKRNL_memcpy( void *dst, const void *src, size_t n ) +{ + return memmove( dst, src, n ); +} + +/********************************************************************* + * memset (NTOSKRNL.@) + */ +void * __cdecl NTOSKRNL_memset( void *dst, int c, size_t n ) +{ + return memset( dst, c, n ); +} + +int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 ) +{ + return strcasecmp( str1, str2 ); +} + +/********************************************************************* + * _strnicmp (NTOSKRNL.@) + */ +int __cdecl _strnicmp( LPCSTR str1, LPCSTR str2, size_t n ) +{ + return strncasecmp( str1, str2, n ); +} + +/********************************************************************* + * _wcsnicmp (NTOSKRNL.@) + */ +INT __cdecl NTOSKRNL__wcsnicmp( LPCWSTR str1, LPCWSTR str2, INT n ) +{ + return strncmpiW( str1, str2, n ); +} + +/********************************************************************* + * wcsncmp (NTOSKRNL.@) + */ +INT __cdecl NTOSKRNL_wcsncmp( LPCWSTR str1, LPCWSTR str2, INT n ) +{ + return strncmpW( str1, str2, n ); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 31c3136b77..8c3057f06e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1424,9 +1424,9 @@ @ cdecl -private _purecall() msvcrt._purecall @ varargs -private _snprintf(ptr long str) msvcrt._snprintf @ varargs -private _snwprintf(ptr long wstr) msvcrt._snwprintf -@ cdecl -private _stricmp(str str) msvcrt._stricmp +@ cdecl -private _stricmp(str str) @ cdecl -private _strlwr(str) msvcrt._strlwr -@ cdecl -private _strnicmp(str str long) msvcrt._strnicmp +@ cdecl -private _strnicmp(str str long) _strnicmp @ cdecl -private _strnset(str long long) msvcrt._strnset @ cdecl -private _strrev(str) msvcrt._strrev @ cdecl -private _strset(str long) msvcrt._strset @@ -1435,7 +1435,7 @@ @ cdecl -private _vsnwprintf(ptr long wstr ptr) msvcrt._vsnwprintf @ cdecl -private _wcsicmp(wstr wstr) msvcrt._wcsicmp @ cdecl -private _wcslwr(wstr) msvcrt._wcslwr -@ cdecl -private _wcsnicmp(wstr wstr long) msvcrt._wcsnicmp +@ cdecl -private _wcsnicmp(wstr wstr long) NTOSKRNL__wcsnicmp @ cdecl -private _wcsnset(wstr long long) msvcrt._wcsnset @ cdecl -private _wcsrev(wstr) msvcrt._wcsrev @ cdecl -private _wcsupr(wstr) msvcrt._wcsupr @@ -1450,9 +1450,9 @@ @ cdecl -private mbstowcs(ptr str long) msvcrt.mbstowcs @ cdecl -private mbtowc(ptr str long) msvcrt.mbtowc @ cdecl -private memchr(ptr long long) msvcrt.memchr -@ cdecl -private memcpy(ptr ptr long) msvcrt.memcpy +@ cdecl -private memcpy(ptr ptr long) NTOSKRNL_memcpy @ cdecl -private memmove(ptr ptr long) msvcrt.memmove -@ cdecl -private memset(ptr long long) msvcrt.memset +@ cdecl -private memset(ptr long long) NTOSKRNL_memset @ cdecl -private qsort(ptr long long ptr) msvcrt.qsort @ cdecl -private rand() msvcrt.rand @ varargs -private sprintf(ptr str) msvcrt.sprintf @@ -1483,7 +1483,7 @@ @ cdecl -private wcscspn(wstr wstr) msvcrt.wcscspn @ cdecl -private wcslen(wstr) msvcrt.wcslen @ cdecl -private wcsncat(wstr wstr long) msvcrt.wcsncat -@ cdecl -private wcsncmp(wstr wstr long) msvcrt.wcsncmp +@ cdecl -private wcsncmp(wstr wstr long) NTOSKRNL_wcsncmp @ cdecl -private wcsncpy(ptr wstr long) msvcrt.wcsncpy @ cdecl -private wcsrchr(wstr long) msvcrt.wcsrchr @ cdecl -private wcsspn(wstr wstr) msvcrt.wcsspn -- 2.16.2

1 0

[PATCH] propsys: Add PSGetPropertyKeyFromName stub
by Alistair Leslie-Hughes 18 Mar '18

18 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propsys_main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index f518519276..db20fd39c9 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -83,7 +83,7 @@ @ stub PSGetPropertyDescriptionByName @ stdcall PSGetPropertyDescriptionListFromString(wstr ptr ptr) @ stub PSGetPropertyFromPropertyStorage -@ stub PSGetPropertyKeyFromName +@ stdcall PSGetPropertyKeyFromName(wstr ptr) @ stdcall PSGetPropertySystem(ptr ptr) @ stub PSGetPropertyValue @ stub PSLookupPropertyHandlerCLSID diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 7631023b83..1dbaee433f 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -268,6 +268,12 @@ HRESULT WINAPI PSGetPropertyDescriptionListFromString(LPCWSTR proplist, REFIID r return E_NOTIMPL; } +HRESULT WINAPI PSGetPropertyKeyFromName(PCWSTR name, PROPERTYKEY *key) +{ + FIXME("%s, %p\n", debugstr_w(name), key); + return E_NOTIMPL; +} + HRESULT WINAPI PSRefreshPropertySchema(void) { FIXME("\n"); -- 2.16.2

1 0

[PATCH] ntprint/tests: Abort on missing function/dll
by Mark Jansen 17 Mar '18

17 Mar '18

2 1

[PATCH] iphlpapi: Add support for ConvertLengthToIpv4Mask()
by Dagfinn Reiakvam 17 Mar '18

17 Mar '18

From: Uberdaff <dagfinn(a)reiakvam.no> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 19 +++++++++++++++++ dlls/iphlpapi/tests/iphlpapi.c | 46 ++++++++++++++++++++++++++++++++++++++++++ include/netioapi.h | 1 + 4 files changed, 67 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..8a96236 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 MaskLength, PULONG Mask) +{ + if(MaskLength > 32) + { + *Mask = INADDR_NONE; + return ERROR_INVALID_PARAMETER; + } + + if(MaskLength == 0) + *Mask = 0; + else + *Mask = 0xffffffff << ( 32 - MaskLength); + + 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..59e9246 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,PULONG); 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,49 @@ static void test_GetUnicastIpAddressTable(void) pFreeMibTable(table); } +static void test_ConvertLengthToIpv4Mask(void) +{ + DWORD apiReturn; + ULONG Mask; + + if (!pConvertLengthToIpv4Mask) + { + win_skip( "ConvertLengthToIpv4Mask not available\n" ); + return; + } + + apiReturn = pConvertLengthToIpv4Mask(0, &Mask); + ok(apiReturn == NO_ERROR, + "ConvertLengthToIpv4Mask returned %d, expected NO_ERROR\n", apiReturn); + ok(Mask == 0, + "ConvertLengthToIpv4Mask Mask value %x, expected 0x00000000\n", Mask); + + apiReturn = pConvertLengthToIpv4Mask(1, &Mask); + ok(apiReturn == NO_ERROR, + "ConvertLengthToIpv4Mask returned %d, expected NO_ERROR\n", apiReturn); + ok(Mask == 0x80000000, + "ConvertLengthToIpv4Mask Mask value %x, expected 0x80000000\n", Mask); + + apiReturn = pConvertLengthToIpv4Mask(31, &Mask); + ok(apiReturn == NO_ERROR, + "ConvertLengthToIpv4Mask returned %d, expected NO_ERROR\n", apiReturn); + ok(Mask == 0xfffffffe, + "ConvertLengthToIpv4Mask Mask value %x, expected 0x00000001\n", Mask); + + apiReturn = pConvertLengthToIpv4Mask(32, &Mask); + ok(apiReturn == NO_ERROR, + "ConvertLengthToIpv4Mask returned %d, expected NO_ERROR\n", apiReturn); + ok(Mask == 0xffffffff, + "ConvertLengthToIpv4Mask Mask value %x, expected 0xffffffff\n", Mask); + + apiReturn = pConvertLengthToIpv4Mask(33, &Mask); + ok(apiReturn == ERROR_INVALID_PARAMETER, + "ConvertLengthToIpv4Mask(32, &Mask) returned %d, expected ERROR_INVALID_PARAMETER\n", + apiReturn); + ok(Mask == INADDR_NONE, + "ConvertLengthToIpv4Mask Mask value %x, expected INADDR_NONE\n", Mask); +} + START_TEST(iphlpapi) { @@ -2201,6 +2246,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..beb93d2 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 MaskLength, PULONG Mask); void WINAPI FreeMibTable(void*); DWORD WINAPI GetIfEntry2(MIB_IF_ROW2*); DWORD WINAPI GetIfTable2(MIB_IF_TABLE2**); -- 2.7.4

2 1

← Newer
1
...
35
36
37
38
39
40
41
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel March 2018