June 2020 - Wine-Commits - list.winehq.org

Jacek Caban : jscript: Throw proper exception in RegExp.prototype.toString when called on non-RegExp object.
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: 6de0a658f1768a72ce1b07b418985991a482d19e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6de0a658f1768a72ce1b07b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 3 16:04:15 2020 +0200 jscript: Throw proper exception in RegExp.prototype.toString when called on non-RegExp object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/error.c | 1 + dlls/jscript/jscript.h | 3 ++- dlls/jscript/jscript.rc | 2 ++ dlls/jscript/jsregexp.c | 4 ++-- dlls/jscript/resource.h | 3 ++- dlls/jscript/tests/api.js | 2 ++ po/ar.po | 40 ++++++++++++++++++++++++++-------------- po/ast.po | 36 ++++++++++++++++++++++-------------- po/bg.po | 36 ++++++++++++++++++++++-------------- po/ca.po | 40 ++++++++++++++++++++++++++-------------- po/cs.po | 40 ++++++++++++++++++++++++++-------------- po/da.po | 40 ++++++++++++++++++++++++++-------------- po/de.po | 40 ++++++++++++++++++++++++++-------------- po/el.po | 36 ++++++++++++++++++++++-------------- po/en.po | 36 ++++++++++++++++++++++-------------- po/en_US.po | 36 ++++++++++++++++++++++-------------- po/eo.po | 36 ++++++++++++++++++++++-------------- po/es.po | 40 ++++++++++++++++++++++++++-------------- po/fa.po | 36 ++++++++++++++++++++++-------------- po/fi.po | 40 ++++++++++++++++++++++++++-------------- po/fr.po | 40 ++++++++++++++++++++++++++-------------- po/he.po | 36 ++++++++++++++++++++++-------------- po/hi.po | 36 ++++++++++++++++++++++-------------- po/hr.po | 40 ++++++++++++++++++++++++++-------------- po/hu.po | 40 ++++++++++++++++++++++++++-------------- po/it.po | 40 ++++++++++++++++++++++++++-------------- po/ja.po | 40 ++++++++++++++++++++++++++-------------- po/ko.po | 40 ++++++++++++++++++++++++++-------------- po/lt.po | 40 ++++++++++++++++++++++++++-------------- po/ml.po | 36 ++++++++++++++++++++++-------------- po/nb_NO.po | 40 ++++++++++++++++++++++++++-------------- po/nl.po | 40 ++++++++++++++++++++++++++-------------- po/or.po | 36 ++++++++++++++++++++++-------------- po/pa.po | 36 ++++++++++++++++++++++-------------- po/pl.po | 40 ++++++++++++++++++++++++++-------------- po/pt_BR.po | 40 ++++++++++++++++++++++++++-------------- po/pt_PT.po | 40 ++++++++++++++++++++++++++-------------- po/rm.po | 36 ++++++++++++++++++++++-------------- po/ro.po | 40 ++++++++++++++++++++++++++-------------- po/ru.po | 40 ++++++++++++++++++++++++++-------------- po/si.po | 40 ++++++++++++++++++++++++++-------------- po/sk.po | 38 ++++++++++++++++++++++++-------------- po/sl.po | 40 ++++++++++++++++++++++++++-------------- po/sr_RS(a)cyrillic.po | 40 ++++++++++++++++++++++++++-------------- po/sr_RS(a)latin.po | 40 ++++++++++++++++++++++++++-------------- po/sv.po | 40 ++++++++++++++++++++++++++-------------- po/ta.po | 36 ++++++++++++++++++++++-------------- po/te.po | 36 ++++++++++++++++++++++-------------- po/th.po | 36 ++++++++++++++++++++++-------------- po/tr.po | 40 ++++++++++++++++++++++++++-------------- po/uk.po | 40 ++++++++++++++++++++++++++-------------- po/wa.po | 36 ++++++++++++++++++++++-------------- po/wine.pot | 36 ++++++++++++++++++++++-------------- po/zh_CN.po | 40 ++++++++++++++++++++++++++-------------- po/zh_TW.po | 40 ++++++++++++++++++++++++++-------------- 55 files changed, 1211 insertions(+), 690 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6de0a658f1768a72ce1b…

1 0

Jacek Caban : mshtml/tests: Introduce sync_test helper.
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: 0c9f9efda0b947d51efff74a8b277f5633ac52b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c9f9efda0b947d51efff74a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 3 16:04:28 2020 +0200 mshtml/tests: Introduce sync_test helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/es5.js | 132 ++++++++++++------------------------------ dlls/mshtml/tests/winetest.js | 18 +++++- 2 files changed, 54 insertions(+), 96 deletions(-) diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 2a8549ba1d..dca5821c0c 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -21,18 +21,18 @@ var JS_E_INVALID_WRITABLE_PROP_DESC = 0x800a13ac; var JS_E_NONCONFIGURABLE_REDEFINED = 0x800a13d6; var JS_E_NONWRITABLE_MODIFIED = 0x800a13d7; -function test_date_now() { +var tests = []; + +sync_test("date_now", function() { var now = Date.now(); var time = (new Date()).getTime(); ok(time >= now && time-now < 50, "unexpected Date.now() result " + now + " expected " + time); Date.now(1, 2, 3); +}); - next_test(); -} - -function test_toISOString() { +sync_test("toISOString", function() { function expect(date, expected) { var s = date.toISOString(); ok(s === expected, "toISOString returned " + s + " expected " + expected); @@ -58,11 +58,9 @@ function test_toISOString() { expect_exception(function() { new Date(NaN).toISOString(); }); expect_exception(function() { new Date(31494784780800001).toISOString(); }); +}); - next_test(); -} - -function test_indexOf() { +sync_test("indexOf", function() { function expect(array, args, exr) { var r = Array.prototype.indexOf.apply(array, args); ok(r == exr, "indexOf returned " + r + " expected " + exr); @@ -86,11 +84,9 @@ function test_indexOf() { expect({"4": 4, length: 3}, [4], -1); expect({"test": true}, [true], -1); expect([1,2,3], [2, 1.9], 1); +}); - next_test(); -} - -function test_array_forEach() { +sync_test("forEach", function() { ok(Array.prototype.forEach.length === 1, "forEach.length = " + Array.prototype.forEach.length); function test(array, expect) { @@ -121,11 +117,9 @@ function test_array_forEach() { ok(array === a, "array != a"); ok(this === o, "this != o"); }, o); +}); - next_test(); -} - -function test_isArray() { +sync_test("isArray", function() { function expect_array(a, exr) { var r = Array.isArray(a); ok(r === exr, "isArray returned " + r + " expected " + exr); @@ -139,11 +133,9 @@ function test_isArray() { function C() {} C.prototype = Array.prototype; expect_array(new C(), false); +}); - next_test(); -} - -function test_array_map() { +sync_test("array_map", function() { var calls, m, arr, ctx; /* basic map call with context */ @@ -190,11 +182,9 @@ function test_array_map() { [1,2].map(function() { ok(this === window, "this != window"); }, undefined); +}); - next_test(); -} - -function test_array_sort() { +sync_test("array_sort", function() { var r; r = [3,1,2].sort(function(x,y) { return y-x; }, 1, 2, 3, true, undefined ).join(); @@ -209,11 +199,9 @@ function test_array_sort() { }catch(e) { ok(e.name === "TypeError", "got exception " + e.name); } +}); - next_test(); -} - -function test_identifier_keywords() { +sync_test("identifier_keywords", function() { var o = { if: 1, default: 2, @@ -249,9 +237,7 @@ function test_identifier_keywords() { ok(o.if === 1, "o.if = " + o.if); ok(ro().default === 2, "ro().default = " + ro().default); ok(o.false === true, "o.false = " + o.false); - - next_test(); -} +}); function test_own_data_prop_desc(obj, prop, expected_writable, expected_enumerable, expected_configurable) { @@ -266,7 +252,7 @@ function test_own_data_prop_desc(obj, prop, expected_writable, expected_enumerab + " expected " + expected_configurable); } -function test_getOwnPropertyDescriptor() { +sync_test("getOwnPropertyDescriptor", function() { var obj; obj = { test: 1 }; @@ -304,11 +290,9 @@ function test_getOwnPropertyDescriptor() { test_own_data_prop_desc(function(){}, "prototype", true, false, false); test_own_data_prop_desc(Function, "prototype", false, false, false); test_own_data_prop_desc(String.prototype, "constructor", true, false, true); +}); - next_test(); -} - -function test_defineProperty() { +sync_test("defineProperty", function() { function test_accessor_prop_desc(obj, prop, orig_desc) { var expected_enumerable = "enumerable" in orig_desc && !!orig_desc.enumerable; var expected_configurable = "configurable" in orig_desc && !!orig_desc.configurable; @@ -529,11 +513,9 @@ function test_defineProperty() { test_accessor_prop_desc(obj, "no_setter", desc); obj.no_setter = false; ok(obj.no_setter === true, "no_setter = " + obj.no_setter); +}); - next_test(); -} - -function test_defineProperties() { +sync_test("defineProperties", function() { var o, defined, descs; descs = { @@ -571,11 +553,9 @@ function test_defineProperties() { descs = Object.create(desc_proto); o = Object.create(null, descs); ok(!("proto_prop" in o), "proto_prop is in o"); +}); - next_test(); -} - -function test_property_definitions() { +sync_test("property_definitions", function() { var obj, val, i, arr; function test_accessor_prop_desc(obj, prop, have_getter, have_setter) { @@ -636,11 +616,9 @@ function test_property_definitions() { ok(obj.prop === 6, "obj.prop = " + obj.prop); test_accessor_prop_desc(obj, "0", true, false); ok(obj[0] === 7, "obj.prop = " + obj[0]); +}); - next_test(); -} - -function test_string_trim() { +sync_test("string_trim", function() { function test_trim(value, expected) { var r = String.prototype.trim.call(value); ok(r === expected, "trim(" + value + ") = " + r); @@ -652,11 +630,9 @@ function test_string_trim() { test_trim({ toString: function() { return " test "; } }, "test"); test_trim("", ""); test_trim(" \t\n", ""); +}); - next_test(); -} - -function test_global_properties() { +sync_test("global_properties", function() { var o; /* Make sure that global properties are not writable. */ @@ -669,17 +645,14 @@ function test_global_properties() { o = Infinity; Infinity = 1; ok(Infinity === o, "Infinity = " + NaN); +}); - next_test(); -} - -function test_string_split() { +sync_test("string_split", function() { var r; /* IE9 got this wrong*/ if("1undefined2".split(undefined).length != 1) { win_skip("detected broken String.prototype.split implementation"); - next_test(); return; } @@ -749,11 +722,9 @@ function test_string_split() { ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); ok(r.length === 1, "r.length = " + r.length); ok(r[0] === "", "r[0] = " + r[0]); +}); - next_test(); -} - -function test_getPrototypeOf() { +sync_test("getPrototypeOf", function() { ok(Object.create.length === 2, "Object.create.length = " + Object.create.length); ok(Object.getPrototypeOf.length === 1, "Object.getPrototypeOf.length = " + Object.getPrototypeOf.length); @@ -788,11 +759,9 @@ function test_getPrototypeOf() { obj = Object.create(null); ok(!("toString" in obj), "toString is in obj"); ok(Object.getPrototypeOf(obj) === null, "Object.getPrototypeOf(obj) = " + Object.getPrototypeOf(obj)); +}); - next_test(); -} - -function test_toString() { +sync_test("toString", function() { var tmp, obj; (function () { tmp = Object.prototype.toString.call(arguments); })(); @@ -817,11 +786,9 @@ function test_toString() { obj = Object.create(Number.prototype); tmp = Object.prototype.toString.call(obj); ok(tmp === "[object Object]", "toString.call(Object.create(Number.prototype)) = " + tmp); +}); - next_test(); -} - -function test_bind() { +sync_test("bind", function() { var f, r; var o = new Object(), o2 = new Object(); @@ -897,27 +864,4 @@ function test_bind() { ok(t != a, "t == a"); ok(Function.prototype.bind.length === 1, "Function.prototype.bind.length = " + Function.prototype.bind.length); - - next_test(); -} - -var tests = [ - test_date_now, - test_toISOString, - test_indexOf, - test_array_forEach, - test_isArray, - test_array_map, - test_array_sort, - test_identifier_keywords, - test_getOwnPropertyDescriptor, - test_defineProperty, - test_defineProperties, - test_property_definitions, - test_string_trim, - test_global_properties, - test_string_split, - test_getPrototypeOf, - test_toString, - test_bind -]; +}); diff --git a/dlls/mshtml/tests/winetest.js b/dlls/mshtml/tests/winetest.js index 2af1b33414..7e8cbfc9b2 100644 --- a/dlls/mshtml/tests/winetest.js +++ b/dlls/mshtml/tests/winetest.js @@ -70,8 +70,22 @@ function todo_wine_if(expr) { var file_prefix = document.location.pathname; if(document.location.search) file_prefix += document.location.search; -file_prefix += ": "; +file_prefix += ":"; + +var test_name; function format_message(msg) { - return file_prefix + msg; + var p = file_prefix; + if(test_name) p += test_name + ":"; + return p + " " + msg; +} + +function sync_test(name, f) +{ + tests.push(function() { + test_name = name; + f(); + test_name = undefined; + next_test(); + }); }

1 0

Ziqing Hui : windowscodecs: Add tests for DdsFrameDecode_Dds_CopyBlocks().
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: b3eabfdd93ae867075ad8a4b8edc21438379c987 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3eabfdd93ae867075ad8a4b… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jun 3 18:45:57 2020 +0800 windowscodecs: Add tests for DdsFrameDecode_Dds_CopyBlocks(). Some code in test_dds_decoder_frame_properties() are moved to test_dds_decoder_frame() bacause there are some same code in test_dds_decoder_frame_properties() and test_dds_decoder_frame_data(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 124 ++++++++++++++++++++++++++--------- 1 file changed, 93 insertions(+), 31 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 9b14bed52c..327701f22c 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -121,7 +121,7 @@ static BYTE test_dds_array[] = { }; static struct test_data { - void *data; + BYTE *data; UINT size; UINT expected_frame_count; WICDdsParameters expected_parameters; @@ -212,6 +212,11 @@ static UINT get_bytes_per_block(DXGI_FORMAT format) } } +static BOOL has_extended_header(const BYTE *data) +{ + return data[84] == 'D' && data[85] == 'X' && data[86] == '1' && data[87] == '0'; +} + static void test_dds_decoder_initialize(void) { static BYTE test_dds_bad_magic[sizeof(test_dds_image)]; @@ -387,27 +392,14 @@ static void test_dds_decoder_image_parameters(void) } } -static void test_dds_decoder_frame_properties(IWICBitmapDecoder *decoder, IWICBitmapFrameDecode *frame_decode, - UINT frame_count, int i, int frame_index) +static void test_dds_decoder_frame_properties(IWICBitmapFrameDecode *frame_decode, IWICDdsFrameDecode *dds_frame, + UINT frame_count, WICDdsParameters *params, int i, int frame_index) { HRESULT hr; - WICDdsParameters params; - IWICDdsDecoder *dds_decoder = NULL; - IWICDdsFrameDecode *dds_frame = NULL; UINT width, height ,expected_width, expected_height, slice_index, depth; UINT width_in_blocks, height_in_blocks, expected_width_in_blocks, expected_height_in_blocks; WICDdsFormatInfo format_info; - hr = IWICBitmapDecoder_QueryInterface(decoder, &IID_IWICDdsDecoder, (void **)&dds_decoder); - ok(hr == S_OK, "%d: QueryInterface failed, hr=%x\n", i, hr); - if (hr != S_OK) goto end; - hr = IWICBitmapFrameDecode_QueryInterface(frame_decode, &IID_IWICDdsFrameDecode, (void **)&dds_frame); - ok(hr == S_OK, "%d: [frame %d] QueryInterface failed, hr=%x\n", i, frame_index, hr); - if (hr != S_OK) goto end; - hr = IWICDdsDecoder_GetParameters(dds_decoder, &params); - ok (hr == S_OK, "%d: GetParameters failed, hr=%x\n", i, hr); - if (hr != S_OK) goto end; - /* frame size tests */ hr = IWICBitmapFrameDecode_GetSize(frame_decode, NULL, NULL); @@ -418,12 +410,12 @@ static void test_dds_decoder_frame_properties(IWICBitmapDecoder *decoder, IWICBi ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); hr = IWICBitmapFrameDecode_GetSize(frame_decode, &width, &height); ok (hr == S_OK, "%d: GetSize failed for frame %d, hr=%x\n", i, frame_index, hr); - if (hr != S_OK) goto end; + if (hr != S_OK) return; - depth = params.Depth; - expected_width = params.Width; - expected_height = params.Height; - slice_index = frame_index % (frame_count / params.ArraySize); + depth = params->Depth; + expected_width = params->Width; + expected_height = params->Height; + slice_index = frame_index % (frame_count / params->ArraySize); while (slice_index >= depth) { if (expected_width > 1) expected_width /= 2; @@ -440,7 +432,7 @@ static void test_dds_decoder_frame_properties(IWICBitmapDecoder *decoder, IWICBi ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); hr = IWICDdsFrameDecode_GetFormatInfo(dds_frame, &format_info); ok (hr == S_OK, "%d: [frame %d] GetFormatInfo failed, hr=%x\n", i, frame_index, hr); - if (hr != S_OK) goto end; + if (hr != S_OK) return; ok (format_info.DxgiFormat == test_data[i].expected_parameters.DxgiFormat, "%d: [frame %d] Expected DXGI format 0x%x, got 0x%x\n", @@ -463,7 +455,7 @@ static void test_dds_decoder_frame_properties(IWICBitmapDecoder *decoder, IWICBi ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); hr = IWICDdsFrameDecode_GetSizeInBlocks(dds_frame, &width_in_blocks, &height_in_blocks); ok (hr == S_OK, "%d: [frame %d] GetSizeInBlocks failed, hr=%x\n", i, frame_index, hr); - if (hr != S_OK) goto end; + if (hr != S_OK) return; expected_width_in_blocks = (expected_width + format_info.BlockWidth - 1) / format_info.BlockWidth; expected_height_in_blocks = (expected_height + format_info.BlockHeight - 1) / format_info.BlockHeight; @@ -472,33 +464,103 @@ static void test_dds_decoder_frame_properties(IWICBitmapDecoder *decoder, IWICBi ok (height_in_blocks == expected_height_in_blocks, "%d: [frame %d] Expected height in blocks %d, got %d\n", i, frame_index, expected_height_in_blocks, height_in_blocks); -end: - if (dds_decoder) IWICDdsDecoder_Release(dds_decoder); - if (dds_frame) IWICDdsFrameDecode_Release(dds_frame); +} + +static void test_dds_decoder_frame_data(IWICDdsFrameDecode *dds_frame, UINT frame_count, WICDdsParameters *params, + int i, int frame_index) +{ + HRESULT hr; + WICDdsFormatInfo format_info; + WICRect rect = { 0, 0, 1, 1 }; + BYTE buffer[32]; + UINT stride, width_in_blocks, height_in_blocks; + UINT width, height, depth, array_index; + UINT block_offset; + int slice_index; + + hr = IWICDdsFrameDecode_GetSizeInBlocks(dds_frame, &width_in_blocks, &height_in_blocks); + ok (hr == S_OK, "%d: [frame %d] GetSizeInBlocks failed, hr=%x\n", i, frame_index, hr); + if (hr != S_OK) return; + hr = IWICDdsFrameDecode_GetFormatInfo(dds_frame, &format_info); + ok (hr == S_OK, "%d: [frame %d] GetFormatInfo failed, hr=%x\n", i, frame_index, hr); + if (hr != S_OK) return; + stride = width_in_blocks * format_info.BytesPerBlock; + + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, 0, 0, NULL); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, 0, 0, buffer); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, 0, 32, buffer); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, stride, 32, buffer); + todo_wine ok (hr == S_OK, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, 32, buffer); + todo_wine ok (hr == S_OK, "%d: [frame %d] CopyBlocks failed, hr=%x\n", i, frame_index, hr); + if (hr != S_OK) return; + + block_offset = 128; /* DDS magic and header */ + if (has_extended_header(test_data[i].data)) block_offset += 20; /* DDS extended header */ + width = params->Width; + height = params->Height; + depth = params->Depth; + slice_index = frame_index % (frame_count / params->ArraySize); + array_index = frame_index / (frame_count / params->ArraySize); + block_offset += (test_data[i].size - block_offset) / params->ArraySize * array_index; + while (slice_index >= 0) + { + width_in_blocks = (width + format_info.BlockWidth - 1) / format_info.BlockWidth; + height_in_blocks = (width + format_info.BlockWidth - 1) / format_info.BlockWidth; + block_offset += (slice_index >= depth) ? + (width_in_blocks * height_in_blocks * format_info.BytesPerBlock * depth) : + (width_in_blocks * height_in_blocks * format_info.BytesPerBlock * slice_index); + if (width > 1) width /= 2; + if (height > 1) height /= 2; + slice_index -= depth; + if (depth > 1) depth /= 2; + } + ok (!strncmp((const char *)test_data[i].data + block_offset, (const char *)buffer, format_info.BytesPerBlock), + "%d: [frame %d] Block data mismatch\n", i, frame_index); } static void test_dds_decoder_frame(IWICBitmapDecoder *decoder, int i) { HRESULT hr; + IWICDdsDecoder *dds_decoder = NULL; UINT frame_count, j; + WICDdsParameters params; hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); ok (hr == S_OK, "%d: GetFrameCount failed, hr=%x\n", i, hr); if (hr != S_OK) return; + hr = IWICBitmapDecoder_QueryInterface(decoder, &IID_IWICDdsDecoder, (void **)&dds_decoder); + ok(hr == S_OK, "%d: QueryInterface failed, hr=%x\n", i, hr); + if (hr != S_OK) goto end; + hr = IWICDdsDecoder_GetParameters(dds_decoder, &params); + ok (hr == S_OK, "%d: GetParameters failed, hr=%x\n", i, hr); + if (hr != S_OK) goto end; for (j = 0; j < frame_count; j++) { IWICBitmapFrameDecode *frame_decode = NULL; + IWICDdsFrameDecode *dds_frame = NULL; hr = IWICBitmapDecoder_GetFrame(decoder, j, &frame_decode); ok (hr == S_OK, "%d: GetFrame failed for frame %d, hr=%x\n", i, j, hr); - if (hr != S_OK) { - IWICBitmapFrameDecode_Release(frame_decode); - continue; - } + if (hr != S_OK) goto next; + hr = IWICBitmapFrameDecode_QueryInterface(frame_decode, &IID_IWICDdsFrameDecode, (void **)&dds_frame); + ok(hr == S_OK, "%d: [frame %d] QueryInterface failed, hr=%x\n", i, j, hr); + if (hr != S_OK) goto next; + + test_dds_decoder_frame_properties(frame_decode, dds_frame, frame_count, &params, i, j); + test_dds_decoder_frame_data(dds_frame, frame_count, &params, i, j); - test_dds_decoder_frame_properties(decoder, frame_decode, frame_count, i, j); + next: + if (frame_decode) IWICBitmapFrameDecode_Release(frame_decode); + if (dds_frame) IWICDdsFrameDecode_Release(dds_frame); } + +end: + if (dds_decoder) IWICDdsDecoder_Release(dds_decoder); } static void test_dds_decoder(void)

1 0

Jacek Caban : winmm: Introduce compare_uint helper.
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: 12f6e8086b7dcf7738953d4d2eeb63d310654447 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12f6e8086b7dcf7738953d4d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 27 23:55:50 2020 +0200 winmm: Introduce compare_uint helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/joystick.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index e844be1837..2b1811d377 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -55,6 +55,12 @@ typedef struct tagWINE_JOYSTICK { static WINE_JOYSTICK JOY_Sticks[MAXJOYSTICK]; +static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + return diff <= max_diff; +} + /************************************************************************** * JOY_LoadDriver [internal] */ @@ -106,14 +112,14 @@ static void CALLBACK JOY_Timer(HWND hWnd, UINT wMsg, UINT_PTR wTimer, DWORD dwTi pos = MAKELONG(ji.wXpos, ji.wYpos); if (!joy->bChanged || - abs(joy->ji.wXpos - ji.wXpos) > joy->threshold || - abs(joy->ji.wYpos - ji.wYpos) > joy->threshold) { + !compare_uint(joy->ji.wXpos, ji.wXpos, joy->threshold) || + !compare_uint(joy->ji.wYpos, ji.wYpos, joy->threshold)) { SendMessageA(joy->hCapture, MM_JOY1MOVE + i, ji.wButtons, pos); joy->ji.wXpos = ji.wXpos; joy->ji.wYpos = ji.wYpos; } if (!joy->bChanged || - abs(joy->ji.wZpos - ji.wZpos) > joy->threshold) { + !compare_uint(joy->ji.wZpos, ji.wZpos, joy->threshold)) { SendMessageA(joy->hCapture, MM_JOY1ZMOVE + i, ji.wButtons, pos); joy->ji.wZpos = ji.wZpos; }

1 0

Paul Gofman : netio.sys: Add stub for WskReleaseProviderNPI().
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: 8a9bbe4963fc480a3dad778a291df773ae9161f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a9bbe4963fc480a3dad778a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 3 00:11:38 2020 +0300 netio.sys: Add stub for WskReleaseProviderNPI(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netio.sys/netio.c | 5 +++++ dlls/netio.sys/netio.sys.spec | 2 +- include/ddk/wsk.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index 539ea012e0..839a06d30d 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -43,6 +43,11 @@ NTSTATUS WINAPI WskCaptureProviderNPI(WSK_REGISTRATION *wsk_registration, ULONG return STATUS_NOT_IMPLEMENTED; } +void WINAPI WskReleaseProviderNPI(WSK_REGISTRATION *wsk_registration) +{ + FIXME("wsk_registration %p stub.\n", wsk_registration); +} + NTSTATUS WINAPI WskRegister(WSK_CLIENT_NPI *wsk_client_npi, WSK_REGISTRATION *wsk_registration) { FIXME("wsk_client_npi %p, wsk_registration %p stub.\n", wsk_client_npi, wsk_registration); diff --git a/dlls/netio.sys/netio.sys.spec b/dlls/netio.sys/netio.sys.spec index 53891a7d27..facd8ab999 100644 --- a/dlls/netio.sys/netio.sys.spec +++ b/dlls/netio.sys/netio.sys.spec @@ -388,4 +388,4 @@ @ stdcall WskDeregister(ptr) @ stub WskQueryProviderCharacteristics @ stdcall WskRegister(ptr ptr) -@ stub WskReleaseProviderNPI +@ stdcall WskReleaseProviderNPI(ptr) diff --git a/include/ddk/wsk.h b/include/ddk/wsk.h index ead8f830a2..d19da999be 100644 --- a/include/ddk/wsk.h +++ b/include/ddk/wsk.h @@ -114,6 +114,7 @@ NTSTATUS WINAPI WskRegister(WSK_CLIENT_NPI *wsk_client_npi, WSK_REGISTRATION *ws void WINAPI WskDeregister(WSK_REGISTRATION *wsk_registration); NTSTATUS WINAPI WskCaptureProviderNPI(WSK_REGISTRATION *wsk_registration, ULONG wait_timeout, WSK_PROVIDER_NPI *wsk_provider_npi); +void WINAPI WskReleaseProviderNPI(WSK_REGISTRATION *wsk_registration); #ifdef __cplusplus }

1 0

Paul Gofman : netio.sys: Add stub for WskRegister().
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: 392e4437d8e4e5c61e970344ea4e896764c48e57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=392e4437d8e4e5c61e970344… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 3 00:11:35 2020 +0300 netio.sys: Add stub for WskRegister(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netio.sys/netio.c | 8 ++++++++ dlls/netio.sys/netio.sys.spec | 2 +- include/ddk/wsk.h | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index 5cd847dfcd..6a8a002ebe 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -29,10 +29,18 @@ #include "winioctl.h" #include "winternl.h" #include "ddk/wdm.h" +#include "ddk/wsk.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(netio); +NTSTATUS WINAPI WskRegister(WSK_CLIENT_NPI *wsk_client_npi, WSK_REGISTRATION *wsk_registration) +{ + FIXME("wsk_client_npi %p, wsk_registration %p stub.\n", wsk_client_npi, wsk_registration); + + return STATUS_NOT_IMPLEMENTED; +} + static void WINAPI driver_unload(DRIVER_OBJECT *driver) { TRACE("driver %p.\n", driver); diff --git a/dlls/netio.sys/netio.sys.spec b/dlls/netio.sys/netio.sys.spec index a390f96674..d886ab8db9 100644 --- a/dlls/netio.sys/netio.sys.spec +++ b/dlls/netio.sys/netio.sys.spec @@ -387,5 +387,5 @@ @ stub WskCaptureProviderNPI @ stub WskDeregister @ stub WskQueryProviderCharacteristics -@ stub WskRegister +@ stdcall WskRegister(ptr ptr) @ stub WskReleaseProviderNPI diff --git a/include/ddk/wsk.h b/include/ddk/wsk.h index c7100bb799..835adbba9d 100644 --- a/include/ddk/wsk.h +++ b/include/ddk/wsk.h @@ -110,6 +110,8 @@ typedef struct _WSK_PROVIDER_NPI const WSK_PROVIDER_DISPATCH *Dispatch; } WSK_PROVIDER_NPI, *PWSK_PROVIDER_NPI; +NTSTATUS WINAPI WskRegister(WSK_CLIENT_NPI *wsk_client_npi, WSK_REGISTRATION *wsk_registration); + #ifdef __cplusplus } #endif

1 0

Paul Gofman : netio.sys: Add driver stub.
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: 8fe1c9e1bb39aabd8e4e25278952a6ead96531d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fe1c9e1bb39aabd8e4e2527… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 3 00:11:33 2020 +0300 netio.sys: Add driver stub. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/netio.sys/Makefile.in | 7 + dlls/netio.sys/netio.c | 47 +++++ dlls/netio.sys/netio.sys.spec | 391 ++++++++++++++++++++++++++++++++++++++++++ loader/wine.inf.in | 2 + 6 files changed, 450 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8fe1c9e1bb39aabd8e4e…

1 0

Alistair Leslie-Hughes : include/ddk: Add wsk.h file.
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: 7382ec9071b5fd2d36d96e79db59b0d02e56a43e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7382ec9071b5fd2d36d96e79… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 3 00:11:34 2020 +0300 include/ddk: Add wsk.h file. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/ddk/wsk.h | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 9796dd8e5d..a4563920f6 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -188,6 +188,7 @@ SOURCES = \ ddk/wdm.h \ ddk/winddiui.h \ ddk/winsplp.h \ + ddk/wsk.h \ ddraw.h \ ddrawgdi.h \ ddrawi.h \ diff --git a/include/ddk/wsk.h b/include/ddk/wsk.h new file mode 100644 index 0000000000..c7100bb799 --- /dev/null +++ b/include/ddk/wsk.h @@ -0,0 +1,116 @@ +/* + * Copyright 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef _INC_WSK +#define _INC_WSK + +#include <winsock2.h> + +#ifdef __cplusplus +extern "C" +{ +#endif + +struct _WSK_CLIENT; +typedef struct _WSK_CLIENT WSK_CLIENT, *PWSK_CLIENT; +typedef struct _WSK_CLIENT_CONNECTION_DISPATCH WSK_CLIENT_CONNECTION_DISPATCH, *PWSK_CLIENT_CONNECTION_DISPATCH; + +typedef struct _WSK_BUF +{ + PMDL Mdl; + ULONG Offset; + SIZE_T Length; +} WSK_BUF, *PWSK_BUF; + +typedef struct _WSK_DATA_INDICATION +{ + struct _WSK_DATA_INDICATION *Next; + WSK_BUF Buffer; +} WSK_DATA_INDICATION, *PWSK_DATA_INDICATION; + +typedef NTSTATUS (WINAPI *PFN_WSK_CLIENT_EVENT)(void *context, ULONG event, void *info, SIZE_T length); +typedef NTSTATUS (WINAPI *PFN_WSK_DISCONNECT_EVENT)(void *context, ULONG flags); +typedef NTSTATUS (WINAPI *PFN_WSK_SEND_BACKLOG_EVENT)(void *socket_context, SIZE_T ideal_backlog_size); +typedef NTSTATUS (WINAPI *PFN_WSK_SOCKET)(WSK_CLIENT *client, ADDRESS_FAMILY family, + USHORT type, ULONG protocol, ULONG flags, void *context, const void *dispatch, + PEPROCESS process, PETHREAD thread, SECURITY_DESCRIPTOR *security, IRP *irp); +typedef NTSTATUS (WINAPI *PFN_WSK_SOCKET_CONNECT)(WSK_CLIENT *client, USHORT type, + ULONG protocol, SOCKADDR *local, SOCKADDR *remote, ULONG flags, void *context, + const WSK_CLIENT_CONNECTION_DISPATCH *dispatch, PEPROCESS process, PETHREAD owning, + SECURITY_DESCRIPTOR *descriptor, IRP *irp); +typedef NTSTATUS (WINAPI *PFN_WSK_CONTROL_CLIENT)(WSK_CLIENT *client, ULONG control, + SIZE_T input_size, void *input, SIZE_T output_size, void *output, SIZE_T *returned, + IRP *irp); +typedef NTSTATUS (WINAPI *PFN_WSK_GET_ADDRESS_INFO)(WSK_CLIENT *client, UNICODE_STRING *node_name, + UNICODE_STRING *service_name, ULONG name_space, GUID *provider, ADDRINFOEXW *hints, + ADDRINFOEXW **result, PEPROCESS process, PETHREAD thread, IRP *irp); +typedef void (WINAPI *PFN_WSK_FREE_ADDRESS_INFO)(WSK_CLIENT *client, ADDRINFOEXW *addrinfo); +typedef NTSTATUS (WINAPI *PFN_WSK_GET_NAME_INFO)(WSK_CLIENT *client, SOCKADDR *addr, + ULONG length, UNICODE_STRING *node_name, UNICODE_STRING *service_name, + ULONG flags, PEPROCESS process, PETHREAD thread, IRP *irp); +typedef NTSTATUS (WINAPI* PFN_WSK_RECEIVE_EVENT)(void *context, ULONG flags, + WSK_DATA_INDICATION *indication, SIZE_T size, SIZE_T *accepted); + +typedef struct _WSK_PROVIDER_DISPATCH +{ + USHORT Version; + USHORT Reserved; + PFN_WSK_SOCKET WskSocket; + PFN_WSK_SOCKET_CONNECT WskSocketConnect; + PFN_WSK_CONTROL_CLIENT WskControlClient; + PFN_WSK_GET_ADDRESS_INFO WskGetAddressInfo; + PFN_WSK_FREE_ADDRESS_INFO WskFreeAddressInfo; + PFN_WSK_GET_NAME_INFO WskGetNameInfo; +} WSK_PROVIDER_DISPATCH, *PWSK_PROVIDER_DISPATCH; + +typedef struct _WSK_CLIENT_CONNECTION_DISPATCH +{ + PFN_WSK_RECEIVE_EVENT WskReceiveEvent; + PFN_WSK_DISCONNECT_EVENT WskDisconnectEvent; + PFN_WSK_SEND_BACKLOG_EVENT WskSendBacklogEvent; +} WSK_CLIENT_CONNECTION_DISPATCH, *PWSK_CLIENT_CONNECTION_DISPATCH; + +typedef struct _WSK_CLIENT_DISPATCH +{ + USHORT Version; + USHORT Reserved; + PFN_WSK_CLIENT_EVENT WskClientEvent; +} WSK_CLIENT_DISPATCH, *PWSK_CLIENT_DISPATCH; + +typedef struct _WSK_CLIENT_NPI +{ + void *ClientContext; + const WSK_CLIENT_DISPATCH *Dispatch; +} WSK_CLIENT_NPI, *PWSK_CLIENT_NPI; + +typedef struct _WSK_REGISTRATION +{ + ULONGLONG ReservedRegistrationState; + void *ReservedRegistrationContext; + KSPIN_LOCK ReservedRegistrationLock; +} WSK_REGISTRATION, *PWSK_REGISTRATION; + +typedef struct _WSK_PROVIDER_NPI +{ + PWSK_CLIENT Client; + const WSK_PROVIDER_DISPATCH *Dispatch; +} WSK_PROVIDER_NPI, *PWSK_PROVIDER_NPI; + +#ifdef __cplusplus +} +#endif +#endif

1 0

Paul Gofman : netio.sys: Add stub for WskCaptureProviderNPI().
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: bdb4d8225110c5a3c4acdea86f17a0aae0b7a059 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdb4d8225110c5a3c4acdea8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 3 00:11:37 2020 +0300 netio.sys: Add stub for WskCaptureProviderNPI(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netio.sys/netio.c | 9 +++++++++ dlls/netio.sys/netio.sys.spec | 2 +- include/ddk/wsk.h | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index ef4089c68e..539ea012e0 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -34,6 +34,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(netio); +NTSTATUS WINAPI WskCaptureProviderNPI(WSK_REGISTRATION *wsk_registration, ULONG wait_timeout, + WSK_PROVIDER_NPI *wsk_provider_npi) +{ + FIXME("wsk_registration %p, wait_timeout %u, wsk_provider_npi %p stub.\n", + wsk_registration, wait_timeout, wsk_provider_npi); + + return STATUS_NOT_IMPLEMENTED; +} + NTSTATUS WINAPI WskRegister(WSK_CLIENT_NPI *wsk_client_npi, WSK_REGISTRATION *wsk_registration) { FIXME("wsk_client_npi %p, wsk_registration %p stub.\n", wsk_client_npi, wsk_registration); diff --git a/dlls/netio.sys/netio.sys.spec b/dlls/netio.sys/netio.sys.spec index 915259c6f4..53891a7d27 100644 --- a/dlls/netio.sys/netio.sys.spec +++ b/dlls/netio.sys/netio.sys.spec @@ -384,7 +384,7 @@ @ stub WfpStreamInspectSend @ stub WfpStreamIsFilterPresent @ stub WfpUninitializeLeastRecentlyUsedList -@ stub WskCaptureProviderNPI +@ stdcall WskCaptureProviderNPI(ptr long ptr) @ stdcall WskDeregister(ptr) @ stub WskQueryProviderCharacteristics @ stdcall WskRegister(ptr ptr) diff --git a/include/ddk/wsk.h b/include/ddk/wsk.h index e990d054bd..ead8f830a2 100644 --- a/include/ddk/wsk.h +++ b/include/ddk/wsk.h @@ -112,6 +112,8 @@ typedef struct _WSK_PROVIDER_NPI NTSTATUS WINAPI WskRegister(WSK_CLIENT_NPI *wsk_client_npi, WSK_REGISTRATION *wsk_registration); void WINAPI WskDeregister(WSK_REGISTRATION *wsk_registration); +NTSTATUS WINAPI WskCaptureProviderNPI(WSK_REGISTRATION *wsk_registration, ULONG wait_timeout, + WSK_PROVIDER_NPI *wsk_provider_npi); #ifdef __cplusplus }

1 0

Paul Gofman : netio.sys: Add stub for WskDeregister().
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: 1e3ef06d3724aaef8880734617fc84b749588c7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e3ef06d3724aaef88807346… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 3 00:11:36 2020 +0300 netio.sys: Add stub for WskDeregister(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netio.sys/netio.c | 5 +++++ dlls/netio.sys/netio.sys.spec | 2 +- include/ddk/wsk.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index 6a8a002ebe..ef4089c68e 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -41,6 +41,11 @@ NTSTATUS WINAPI WskRegister(WSK_CLIENT_NPI *wsk_client_npi, WSK_REGISTRATION *ws return STATUS_NOT_IMPLEMENTED; } +void WINAPI WskDeregister(WSK_REGISTRATION *wsk_registration) +{ + FIXME("wsk_registration %p stub.\n", wsk_registration); +} + static void WINAPI driver_unload(DRIVER_OBJECT *driver) { TRACE("driver %p.\n", driver); diff --git a/dlls/netio.sys/netio.sys.spec b/dlls/netio.sys/netio.sys.spec index d886ab8db9..915259c6f4 100644 --- a/dlls/netio.sys/netio.sys.spec +++ b/dlls/netio.sys/netio.sys.spec @@ -385,7 +385,7 @@ @ stub WfpStreamIsFilterPresent @ stub WfpUninitializeLeastRecentlyUsedList @ stub WskCaptureProviderNPI -@ stub WskDeregister +@ stdcall WskDeregister(ptr) @ stub WskQueryProviderCharacteristics @ stdcall WskRegister(ptr ptr) @ stub WskReleaseProviderNPI diff --git a/include/ddk/wsk.h b/include/ddk/wsk.h index 835adbba9d..e990d054bd 100644 --- a/include/ddk/wsk.h +++ b/include/ddk/wsk.h @@ -111,6 +111,7 @@ typedef struct _WSK_PROVIDER_NPI } WSK_PROVIDER_NPI, *PWSK_PROVIDER_NPI; NTSTATUS WINAPI WskRegister(WSK_CLIENT_NPI *wsk_client_npi, WSK_REGISTRATION *wsk_registration); +void WINAPI WskDeregister(WSK_REGISTRATION *wsk_registration); #ifdef __cplusplus }

1 0