wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Alexandre Julliard : unicode: Generate the NLS file for sortkeys.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 95aeb41c8cd090ff40cc86e7df1e8c94cef67860 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95aeb41c8cd090ff40cc86e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 17 11:26:53 2020 +0100 unicode: Generate the NLS file for sortkeys. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.rgs | 121 +++++++++++++ loader/wine.inf.in | 19 +- nls/Makefile.in | 3 +- nls/sortdefault.nls | Bin 0 -> 3316820 bytes tools/make_makefiles | 13 +- tools/make_unicode | 383 ++++++++++++++++++++++++++++++++++++++++- 6 files changed, 528 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=95aeb41c8cd090ff40cc…

1 0

Alexandre Julliard : unicode: Generate a registry script for Nls keys.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 712839d5816adbbeb2f905971058489193ad2161 URL: https://source.winehq.org/git/wine.git/?a=commit;h=712839d5816adbbeb2f90597… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 17 13:58:18 2020 +0100 unicode: Generate a registry script for Nls keys. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/Makefile.in | 2 + dlls/kernelbase/kernelbase.rc | 20 ++++++++++ dlls/kernelbase/kernelbase.rgs | 91 ++++++++++++++++++++++++++++++++++++++++++ loader/wine.inf.in | 72 --------------------------------- tools/make_unicode | 57 ++++++++++++++++++++++++++ 5 files changed, 170 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=712839d5816adbbeb2f9…

1 0

Alexandre Julliard : unicode: Store data for CT_CTYPE3 types.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: d87d4a4a045653aa03543c2ac122402bb6339def URL: https://source.winehq.org/git/wine.git/?a=commit;h=d87d4a4a045653aa03543c2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 17 11:26:47 2020 +0100 unicode: Store data for CT_CTYPE3 types. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/wctype.c | 4 +- libs/port/wctype.c | 4 +- tools/make_unicode | 105 +++++++++++++++++++++++++++++++++-------------- 3 files changed, 78 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d87d4a4a045653aa0354…

1 0

Alexandre Julliard : unicode: Add separate helper for removing linguistic case mappings.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 57a6033c0abdfb34c7798835f65a1bfb6fd5f7d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57a6033c0abdfb34c7798835… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 17 11:26:41 2020 +0100 unicode: Add separate helper for removing linguistic case mappings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_unicode | 63 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 24 deletions(-) diff --git a/tools/make_unicode b/tools/make_unicode index 8cf1d45108..454dba538f 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -553,6 +553,28 @@ sub compose_hangul(@) return @ret; } +################################################################ +# remove linguistic-only mappings from the case table +sub remove_linguistic_mappings($$) +{ + my ($upper, $lower) = @_; + + # remove case mappings that don't round-trip + + for (my $i = 0; $i < @{$upper}; $i++) + { + next unless defined ${$upper}[$i]; + my $ch = ${$upper}[$i]; + ${$upper}[$i] = undef unless defined ${$lower}[$ch] && ${$lower}[$ch] == $i; + } + for (my $i = 0; $i < @{$lower}; $i++) + { + next unless defined ${$lower}[$i]; + my $ch = ${$lower}[$i]; + ${$lower}[$i] = undef unless defined ${$upper}[$ch] && ${$upper}[$ch] == $i; + } +} + ################################################################ # read in the Unicode database files sub load_data() @@ -672,21 +694,6 @@ sub load_data() foreach my $i (@{$special_categories{$cat}}) { $category_table[$i] |= $flag; } } - # remove case mappings that don't round-trip - - for (my $i = 0; $i < @toupper_table; $i++) - { - next unless defined $toupper_table[$i]; - my $ch = $toupper_table[$i]; - $toupper_table[$i] = undef unless defined $tolower_table[$ch] && $tolower_table[$ch] == $i; - } - for (my $i = 0; $i < @tolower_table; $i++) - { - next unless defined $tolower_table[$i]; - my $ch = $tolower_table[$i]; - $tolower_table[$i] = undef unless defined $toupper_table[$ch] && $toupper_table[$ch] == $i; - } - # load the composition exclusions my $EXCL = open_data_file( $UNIDATA, "CompositionExclusions.txt" ); @@ -1651,9 +1658,13 @@ sub dump_case_mappings($) print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "#include \"windef.h\"\n\n"; - dump_case_table( "wine_casemap_lower", @tolower_table ); + my @upper = @toupper_table; + my @lower = @tolower_table; + remove_linguistic_mappings( \@upper, \@lower ); + + dump_case_table( "wine_casemap_lower", @lower ); print OUTPUT "\n"; - dump_case_table( "wine_casemap_upper", @toupper_table ); + dump_case_table( "wine_casemap_upper", @upper ); close OUTPUT; save_file($filename); } @@ -1793,17 +1804,21 @@ sub dump_binary_case_table(@) my @row_array = compress_array( $level1, 0, @difftable[0..$max_char-1] ); my @array = compress_array( $level2, 0, @row_array[0..$level1-1] ); - for (my $i = $level2; $i < @array; $i++) { $array[$i] += @array - $level1; } - return @array, @row_array[$level1..$#row_array]; + my $offset = @array - $level1; + for (my $i = $level2; $i < @array; $i++) { $array[$i] += $offset; } + return pack "S<*", 1 + $offset + @row_array, @array, @row_array[$level1..$#row_array]; } - ################################################################ # dump case mappings for l_intl.nls sub dump_intl_nls($) { - my @upper = dump_binary_case_table( @toupper_table ); - my @lower = dump_binary_case_table( @tolower_table ); + my @upper_table = @toupper_table; + my @lower_table = @tolower_table; + remove_linguistic_mappings( \@upper_table, \@lower_table ); + + my $upper = dump_binary_case_table( @upper_table ); + my $lower = dump_binary_case_table( @lower_table ); my $filename = shift; open OUTPUT,">$filename.new" or die "Cannot create $filename"; @@ -1811,8 +1826,8 @@ sub dump_intl_nls($) binmode OUTPUT; print OUTPUT pack "S<", 1; # version - print OUTPUT pack "S<*", 1 + scalar @upper, @upper; - print OUTPUT pack "S<*", 1 + scalar @lower, @lower; + print OUTPUT $upper; + print OUTPUT $lower; close OUTPUT; save_file($filename); }

1 0

Alexandre Julliard : winedump: Add dumping of sortkey NLS files.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 8207bdfecbd0d811abfb48a19090e945a4c1c8f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8207bdfecbd0d811abfb48a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 13 10:14:49 2020 +0100 winedump: Add dumping of sortkey NLS files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/dump.c | 28 ++++ tools/winedump/nls.c | 396 ++++++++++++++++++++++++++++++++++++++++++++-- tools/winedump/winedump.h | 1 + 3 files changed, 409 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8207bdfecbd0d811abfb…

1 0

Zebediah Figura : winebus.sys: Use public HID_USAGE_* constants.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 602f20826d3e2f04d5f46778edfe0c178565af5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=602f20826d3e2f04d5f46778… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 16 21:19:38 2020 -0500 winebus.sys: Use public HID_USAGE_* constants. Fix a typo in the process (HID_USAGE_DIGITIZER_Y_TILT is 0x3E, not 0x3F). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 18 +++++++++--------- include/hidusage.h | 33 ++++++++++++++++++--------------- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 24d7961b06..51940ba088 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -139,8 +139,8 @@ static const BYTE ABS_TO_HID_MAP[][2] = { {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_THROTTLE}, /*ABS_THROTTLE*/ {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_RUDDER}, /*ABS_RUDDER*/ {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_WHEEL}, /*ABS_WHEEL*/ - {HID_USAGE_PAGE_SIMULATION, 0xC4}, /*ABS_GAS*/ - {HID_USAGE_PAGE_SIMULATION, 0xC5}, /*ABS_BRAKE*/ + {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_ACCELLERATOR}, /*ABS_GAS*/ + {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_BRAKE}, /*ABS_BRAKE*/ {0,0}, /*ABS_HAT0X*/ {0,0}, /*ABS_HAT0Y*/ {0,0}, /*ABS_HAT1X*/ @@ -149,15 +149,15 @@ static const BYTE ABS_TO_HID_MAP[][2] = { {0,0}, /*ABS_HAT2Y*/ {0,0}, /*ABS_HAT3X*/ {0,0}, /*ABS_HAT3Y*/ - {HID_USAGE_PAGE_DIGITIZER, 0x30}, /*ABS_PRESSURE*/ + {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_TIP_PRESSURE}, /*ABS_PRESSURE*/ {0, 0}, /*ABS_DISTANCE*/ - {HID_USAGE_PAGE_DIGITIZER, 0x3D}, /*ABS_TILT_X*/ - {HID_USAGE_PAGE_DIGITIZER, 0x3F}, /*ABS_TILT_Y*/ + {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_X_TILT}, /*ABS_TILT_X*/ + {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_Y_TILT}, /*ABS_TILT_Y*/ {0, 0}, /*ABS_TOOL_WIDTH*/ {0, 0}, {0, 0}, {0, 0}, - {HID_USAGE_PAGE_CONSUMER, 0xE0} /*ABS_VOLUME*/ + {HID_USAGE_PAGE_CONSUMER, HID_USAGE_CONSUMER_VOLUME} /*ABS_VOLUME*/ }; #define HID_ABS_MAX (ABS_VOLUME+1) #define TOP_ABS_PAGE (HID_USAGE_PAGE_DIGITIZER+1) @@ -245,9 +245,9 @@ static const BYTE* what_am_I(struct udev_device *dev) static const BYTE Keyboard[2] = {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_KEYBOARD}; static const BYTE Gamepad[2] = {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_GAMEPAD}; static const BYTE Keypad[2] = {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_KEYPAD}; - static const BYTE Tablet[2] = {HID_USAGE_PAGE_DIGITIZER, 0x2}; - static const BYTE Touchscreen[2] = {HID_USAGE_PAGE_DIGITIZER, 0x4}; - static const BYTE Touchpad[2] = {HID_USAGE_PAGE_DIGITIZER, 0x5}; + static const BYTE Tablet[2] = {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_PEN}; + static const BYTE Touchscreen[2] = {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_TOUCH_SCREEN}; + static const BYTE Touchpad[2] = {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_TOUCH_PAD}; struct udev_device *parent = dev; diff --git a/include/hidusage.h b/include/hidusage.h index 67d698ed34..c45e2712fc 100644 --- a/include/hidusage.h +++ b/include/hidusage.h @@ -24,6 +24,21 @@ extern "C" { typedef USHORT USAGE, *PUSAGE; +#define HID_USAGE_CONSUMERCTRL ((USAGE) 0x01) + +#define HID_USAGE_CONSUMER_VOLUME ((USAGE) 0xE0) + +#define HID_USAGE_DIGITIZER_PEN ((USAGE) 0x02) +#define HID_USAGE_DIGITIZER_TOUCH_SCREEN ((USAGE) 0x04) +#define HID_USAGE_DIGITIZER_TOUCH_PAD ((USAGE) 0x05) +#define HID_USAGE_DIGITIZER_TIP_PRESSURE ((USAGE) 0x30) +#define HID_USAGE_DIGITIZER_IN_RANGE ((USAGE) 0x32) +#define HID_USAGE_DIGITIZER_X_TILT ((USAGE) 0x3D) +#define HID_USAGE_DIGITIZER_Y_TILT ((USAGE) 0x3E) +#define HID_USAGE_DIGITIZER_AZIMUTH ((USAGE) 0x3F) +#define HID_USAGE_DIGITIZER_TIP_SWITCH ((USAGE) 0x42) +#define HID_USAGE_DIGITIZER_BARREL_SWITCH ((USAGE) 0x44) + #define HID_USAGE_GENERIC_POINTER ((USAGE) 0x01) #define HID_USAGE_GENERIC_MOUSE ((USAGE) 0x02) #define HID_USAGE_GENERIC_JOYSTICK ((USAGE) 0x04) @@ -183,16 +198,11 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_PAGE_UNICODE ((USAGE) 0x10) #define HID_USAGE_PAGE_ALPHANUMERIC ((USAGE) 0x14) -#define HID_USAGE_TELEPHONY_PHONE ((USAGE) 0x01) -#define HID_USAGE_TELEPHONY_ANSWERING_MACHINE ((USAGE) 0x02) -#define HID_USAGE_TELEPHONY_MESSAGE_CONTROLS ((USAGE) 0x03) -#define HID_USAGE_TELEPHONY_HANDSET ((USAGE) 0x04) -#define HID_USAGE_TELEPHONY_HEADSET ((USAGE) 0x05) -#define HID_USAGE_TELEPHONY_KEYPAD ((USAGE) 0x06) -#define HID_USAGE_TELEPHONY_PROGRAMMABLE_BUTTON ((USAGE) 0x07) - #define HID_USAGE_SIMULATION_RUDDER ((USAGE) 0xBA) #define HID_USAGE_SIMULATION_THROTTLE ((USAGE) 0xBB) +#define HID_USAGE_SIMULATION_ACCELLERATOR ((USAGE) 0xC4) +#define HID_USAGE_SIMULATION_BRAKE ((USAGE) 0xC5) +#define HID_USAGE_SIMULATION_STEERING ((USAGE) 0xC8) #define HID_USAGE_TELEPHONY_PHONE ((USAGE) 0x01) #define HID_USAGE_TELEPHONY_ANSWERING_MACHINE ((USAGE) 0x02) @@ -214,13 +224,6 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_MS_BTH_HF_DIALNUMBER ((USAGE) 0x21) #define HID_USAGE_MS_BTH_HF_DIALMEMORY ((USAGE) 0x22) -#define HID_USAGE_CONSUMERCTRL ((USAGE) 0x01) - -#define HID_USAGE_DIGITIZER_PEN ((USAGE) 0x02) -#define HID_USAGE_DIGITIZER_IN_RANGE ((USAGE) 0x32) -#define HID_USAGE_DIGITIZER_TIP_SWITCH ((USAGE) 0x42) -#define HID_USAGE_DIGITIZER_BARREL_SWITCH ((USAGE) 0x44) - #ifdef __cplusplus } #endif

1 0

Francois Gouget : tests: Report all errors when failing to wait for a child process.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: a909baeb4e5ee8050a32832c28ff3ee79c54fbfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=a909baeb4e5ee8050a32832c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 16 23:52:21 2020 +0100 tests: Report all errors when failing to wait for a child process. Report the line number where the test failed to wait for the child so one can identify which child process did not behave as expected. Also wait_child_process() is meant for the general case so report all non-crash error cases as test failures so they are accounted for. Omit the "winetest_" prefix to match the other Wine test functions and so the underlying winetest_wait_child_process() function can be wrapped with the usual line-capturing macros. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48651 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 4 ++-- dlls/dbgeng/tests/dbgeng.c | 4 ++-- dlls/gdi32/tests/font.c | 2 +- dlls/kernel32/tests/actctx.c | 4 ++-- dlls/kernel32/tests/console.c | 2 +- dlls/kernel32/tests/heap.c | 2 +- dlls/kernel32/tests/pipe.c | 6 +++--- dlls/kernel32/tests/toolhelp.c | 2 +- dlls/kernel32/tests/virtual.c | 4 ++-- dlls/mfplat/tests/mfplat.c | 4 ++-- dlls/mscoree/tests/comtest.c | 2 +- dlls/msvcrt/tests/data.c | 2 +- dlls/msvcrt/tests/file.c | 4 ++-- dlls/ntdll/tests/exception.c | 4 ++-- dlls/ole32/tests/marshal.c | 2 +- dlls/oleacc/tests/main.c | 2 +- dlls/qmgr/tests/qmgr.c | 2 +- dlls/rpcrt4/tests/server.c | 6 +++--- dlls/shell32/tests/shellpath.c | 2 +- dlls/shlwapi/tests/ordinal.c | 2 +- dlls/sxs/tests/sxs.c | 2 +- dlls/ucrtbase/tests/misc.c | 2 +- dlls/urlmon/tests/misc.c | 2 +- dlls/urlmon/tests/sec_mgr.c | 2 +- dlls/user32/tests/class.c | 2 +- dlls/user32/tests/clipboard.c | 2 +- dlls/user32/tests/cursoricon.c | 2 +- dlls/user32/tests/msg.c | 2 +- dlls/user32/tests/win.c | 6 +++--- include/wine/test.h | 32 ++++++++++++++++++++++---------- 30 files changed, 64 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a909baeb4e5ee8050a32…

1 0

Vijay Kiran Kamuju : wmvcore: Add semi-stub implementation for WMIsContentProtected.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: f0dbd3addc3140e3b92785ca42c1c1df00469f30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0dbd3addc3140e3b92785ca… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Feb 29 21:55:59 2020 +0100 wmvcore: Add semi-stub implementation for WMIsContentProtected. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48683 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 18 ++++++++++++++++++ dlls/wmvcore/wmvcore.spec | 2 +- dlls/wmvcore/wmvcore_main.c | 12 ++++++++++++ include/wmsdkidl.idl | 1 + 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 8af34e22b6..2b5a4555a3 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -338,6 +338,23 @@ static void test_urlextension(void) todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); } +static void test_iscontentprotected(void) +{ + HRESULT hr; + const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; + BOOL drm; + + hr = WMIsContentProtected(NULL, NULL); + ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08x\n", hr); + hr = WMIsContentProtected(NULL, &drm); + ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08x\n", hr); + hr = WMIsContentProtected(mp3file, NULL); + ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08x\n", hr); + hr = WMIsContentProtected(mp3file, &drm); + ok(hr == S_FALSE, "WMIsContentProtected failed 0x%08x\n", hr); + ok(drm == FALSE, "got %0dx\n", drm); +} + START_TEST(wmvcore) { HRESULT hr; @@ -353,6 +370,7 @@ START_TEST(wmvcore) test_profile_manager_interfaces(); test_WMCreateWriterPriv(); test_urlextension(); + test_iscontentprotected(); CoUninitialize(); } diff --git a/dlls/wmvcore/wmvcore.spec b/dlls/wmvcore/wmvcore.spec index 65e0807b61..8c3e62bbb1 100644 --- a/dlls/wmvcore/wmvcore.spec +++ b/dlls/wmvcore/wmvcore.spec @@ -17,4 +17,4 @@ @ stub WMCreateWriterNetworkSink @ stdcall WMCreateWriterPriv(ptr) @ stub WMCreateWriterPushSink -@ stub WMIsContentProtected +@ stdcall WMIsContentProtected(wstr ptr) diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index af23ab88b8..4dafcf8055 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -86,6 +86,18 @@ HRESULT WINAPI WMCreateBackupRestorer(IUnknown *callback, IWMLicenseBackup **lic return E_NOTIMPL; } +HRESULT WINAPI WMIsContentProtected(const WCHAR *filename, BOOL *protected) +{ + FIXME("(%s %p): semi-stub\n", wine_dbgstr_w(filename), protected); + + if (!filename || !protected) + return E_INVALIDARG; + + *protected = FALSE; + + return S_FALSE; +} + typedef struct { IWMProfileManager2 IWMProfileManager2_iface; LONG ref; diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 4ee166a9d4..d1e0445470 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1896,6 +1896,7 @@ cpp_quote("HRESULT WINAPI WMCreateSyncReader(IUnknown*,DWORD,IWMSyncReader**);") cpp_quote("HRESULT WINAPI WMCreateEditor(IWMMetadataEditor**);") cpp_quote("HRESULT WINAPI WMCreateBackupRestorer(IUnknown*,IWMLicenseBackup**);") cpp_quote("HRESULT WINAPI WMCreateProfileManager(IWMProfileManager**);") +cpp_quote("HRESULT WINAPI WMIsContentProtected(const WCHAR*, BOOL*);") cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_Base, 0x00000000,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);")

1 0

Alistair Leslie-Hughes : oledb32/tests: Add ODBC provider tests.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 639e97388b38691f9af7a4d33b81c3cfe8615cde URL: https://source.winehq.org/git/wine.git/?a=commit;h=639e97388b38691f9af7a4d3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Mar 15 06:26:36 2020 +0000 oledb32/tests: Add ODBC provider tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/tests/database.c | 83 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 83a4767b90..d9811043a8 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -32,6 +32,7 @@ #include "initguid.h" #include "oledb.h" #include "oledberr.h" +#include "msdasql.h" #include "wine/test.h" @@ -967,6 +968,87 @@ static void test_dslocator(void) } } +static void test_odbc_provider(void) +{ + HRESULT hr; + IDBProperties *props; + DBPROPIDSET propidset; + ULONG infocount; + DBPROPINFOSET *propinfoset; + WCHAR *desc; + DBPROPID properties[14] = + { + DBPROP_AUTH_PASSWORD, DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROP_AUTH_USERID, + DBPROP_INIT_DATASOURCE, DBPROP_INIT_HWND, DBPROP_INIT_LOCATION, + DBPROP_INIT_MODE, DBPROP_INIT_PROMPT, DBPROP_INIT_TIMEOUT, + DBPROP_INIT_PROVIDERSTRING, DBPROP_INIT_LCID, DBPROP_INIT_CATALOG, + DBPROP_INIT_OLEDBSERVICES, DBPROP_INIT_GENERALTIMEOUT + }; + + hr = CoCreateInstance( &CLSID_MSDASQL, NULL, CLSCTX_ALL, &IID_IDBProperties, (void **)&props); + todo_wine ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + if (FAILED(hr)) + { + return; + } + + propidset.rgPropertyIDs = NULL; + propidset.cPropertyIDs = 0; + propidset.guidPropertySet = DBPROPSET_DBINITALL; + + infocount = 0; + hr = IDBProperties_GetPropertyInfo(props, 1, &propidset, &infocount, &propinfoset, &desc); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + { + ULONG i; + DBPROPIDSET propidlist; + ULONG propcnt; + DBPROPSET *propset; + + ok(IsEqualGUID(&propinfoset->guidPropertySet, &DBPROPSET_DBINIT), "got %s\n", + debugstr_guid(&propinfoset->guidPropertySet)); + ok(propinfoset->cPropertyInfos == 14, "got %d\n", propinfoset->cPropertyInfos); + + propidlist.guidPropertySet = DBPROPSET_DBINIT; + propidlist.cPropertyIDs = propinfoset->cPropertyInfos; + propidlist.rgPropertyIDs = CoTaskMemAlloc(propinfoset->cPropertyInfos * sizeof(DBPROP)); + + for (i = 0; i < propinfoset->cPropertyInfos; i++) + { + ok(properties[i] == propinfoset->rgPropertyInfos[i].dwPropertyID, "%d, got %d\n", i, + propinfoset->rgPropertyInfos[i].dwPropertyID); + ok(propinfoset->rgPropertyInfos[i].vtType != VT_EMPTY, "%d, got %d\n", i, + propinfoset->rgPropertyInfos[i].vtType); + + propidlist.rgPropertyIDs[i] = propinfoset->rgPropertyInfos[i].dwPropertyID; + } + + for (i = 0; i < propinfoset->cPropertyInfos; i++) + VariantClear(&propinfoset->rgPropertyInfos[i].vValues); + + CoTaskMemFree(propinfoset->rgPropertyInfos); + CoTaskMemFree(propinfoset); + + hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(propidlist.cPropertyIDs == 14, "got %d\n", propinfoset->cPropertyInfos); + + for (i = 0; i < propidlist.cPropertyIDs; i++) + { + ok(properties[i] == propidlist.rgPropertyIDs[i], "%d, got %d\n", i, + propidlist.rgPropertyIDs[i]); + + propidlist.rgPropertyIDs[i] = propinfoset->rgPropertyInfos[i].dwPropertyID; + } + + CoTaskMemFree(propidlist.rgPropertyIDs); + CoTaskMemFree(propset); + } + + IDBProperties_Release(props); +} + START_TEST(database) { OleInitialize(NULL); @@ -975,6 +1057,7 @@ START_TEST(database) test_errorinfo(); test_initializationstring(); test_dslocator(); + test_odbc_provider(); /* row position */ test_rowposition();

1 0

Alistair Leslie-Hughes : include: Add msdasql.h.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 65a15589d56d73001eed2e3520febafef61d801b URL: https://source.winehq.org/git/wine.git/?a=commit;h=65a15589d56d73001eed2e35… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Mar 15 06:26:34 2020 +0000 include: Add msdasql.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/msdasql.h | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index adcd173a14..a3b8774dc0 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -407,6 +407,7 @@ SOURCES = \ msdadc.idl \ msdaguid.h \ msdasc.idl \ + msdasql.h \ mshtmcid.h \ mshtmdid.h \ mshtmhst.idl \ diff --git a/include/msdasql.h b/include/msdasql.h new file mode 100644 index 0000000000..8093420a40 --- /dev/null +++ b/include/msdasql.h @@ -0,0 +1,81 @@ +/* + * Copyright (C) 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 _MSDASQL_H_ +#define _MSDASQL_H_ + +DEFINE_GUID(IID_ISQLRequestDiagFields, 0x228972f0, 0xb5ff, 0x11d0, 0x8a, 0x80, 0x00, 0xc0, 0x4f, 0xd6, 0x11, 0xcd); +DEFINE_GUID(IID_ISQLGetDiagField, 0x228972f1, 0xb5ff, 0x11d0, 0x8a, 0x80, 0x00, 0xc0, 0x4f, 0xd6, 0x11, 0xcd); + +DEFINE_GUID(IID_IRowsetChangeExtInfo, 0x0c733a8f, 0x2a1c, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + +DEFINE_GUID(CLSID_MSDASQL, 0xc8b522cb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(CLSID_MSDASQL_ENUMERATOR, 0xc8b522cd, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + +DEFINE_GUID(DBPROPSET_PROVIDERDATASOURCEINFO, 0x497c60e0, 0x7123, 0x11cf, 0xb1, 0x71, 0x00, 0xaa, 0x00, 0x57, 0x59, 0x9e); +DEFINE_GUID(DBPROPSET_PROVIDERROWSET, 0x497c60e1, 0x7123, 0x11cf, 0xb1, 0x71, 0x00, 0xaa, 0x00, 0x57, 0x59, 0x9e); +DEFINE_GUID(DBPROPSET_PROVIDERDBINIT, 0x497c60e2, 0x7123, 0x11cf, 0xb1, 0x71, 0x00, 0xaa, 0x00, 0x57, 0x59, 0x9e); +DEFINE_GUID(DBPROPSET_PROVIDERSTMTATTR, 0x497c60e3, 0x7123, 0x11cf, 0xb1, 0x71, 0x00, 0xaa, 0x00, 0x57, 0x59, 0x9e); +DEFINE_GUID(DBPROPSET_PROVIDERCONNATTR, 0x497c60e4, 0x7123, 0x11cf, 0xb1, 0x71, 0x00, 0xaa, 0x00, 0x57, 0x59, 0x9e); + +#define KAGPROP_QUERYBASEDUPDATES 2 +#define KAGPROP_MARSHALLABLE 3 +#define KAGPROP_POSITIONONNEWROW 4 +#define KAGPROP_IRowsetChangeExtInfo 5 +#define KAGPROP_CURSOR 6 +#define KAGPROP_CONCURRENCY 7 +#define KAGPROP_BLOBSONFOCURSOR 8 +#define KAGPROP_INCLUDENONEXACT 9 +#define KAGPROP_FORCESSFIREHOSEMODE 10 +#define KAGPROP_FORCENOPARAMETERREBIND 11 +#define KAGPROP_FORCENOPREPARE 12 +#define KAGPROP_FORCENOREEXECUTE 13 + +#define KAGPROP_ACCESSIBLEPROCEDURES 2 +#define KAGPROP_ACCESSIBLETABLES 3 +#define KAGPROP_ODBCSQLOPTIEF 4 +#define KAGPROP_OJCAPABILITY 5 +#define KAGPROP_PROCEDURES 6 +#define KAGPROP_DRIVERNAME 7 +#define KAGPROP_DRIVERVER 8 +#define KAGPROP_DRIVERODBCVER 9 +#define KAGPROP_LIKEESCAPECLAUSE 10 +#define KAGPROP_SPECIALCHARACTERS 11 +#define KAGPROP_MAXCOLUMNSINGROUPBY 12 +#define KAGPROP_MAXCOLUMNSININDEX 13 +#define KAGPROP_MAXCOLUMNSINORDERBY 14 +#define KAGPROP_MAXCOLUMNSINSELECT 15 +#define KAGPROP_MAXCOLUMNSINTABLE 16 +#define KAGPROP_NUMERICFUNCTIONS 17 +#define KAGPROP_ODBCSQLCONFORMANCE 18 +#define KAGPROP_OUTERJOINS 19 +#define KAGPROP_STRINGFUNCTIONS 20 +#define KAGPROP_SYSTEMFUNCTIONS 21 +#define KAGPROP_TIMEDATEFUNCTIONS 22 +#define KAGPROP_FILEUSAGE 23 +#define KAGPROP_ACTIVESTATEMENTS 24 + +#define KAGPROP_AUTH_TRUSTEDCONNECTION 2 +#define KAGPROP_AUTH_SERVERINTEGRATED 3 + +#define KAGPROPVAL_CONCUR_ROWVER 0x00000001 +#define KAGPROPVAL_CONCUR_VALUES 0x00000002 +#define KAGPROPVAL_CONCUR_LOCK 0x00000004 +#define KAGPROPVAL_CONCUR_READ_ONLY 0x00000008 + +#endif

1 0

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-commits March 2020