wine-commits March 2019

wine-commits@winehq.org

2 participants
1097 discussions

Louis Lenders : ucrtbase: Add version resource.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: be47c4445f1a0ae38f4fb0c076a14d14c6ff716e URL: https://source.winehq.org/git/wine.git/?a=commit;h=be47c4445f1a0ae38f4fb0c0… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Oct 3 19:35:33 2018 +0200 ucrtbase: Add version resource. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45928 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1622abbb081c1afe052d16769898976e90f98062) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ucrtbase/Makefile.in | 2 ++ dlls/ucrtbase/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/ucrtbase/Makefile.in b/dlls/ucrtbase/Makefile.in index d44b17a..23d8292 100644 --- a/dlls/ucrtbase/Makefile.in +++ b/dlls/ucrtbase/Makefile.in @@ -33,3 +33,5 @@ C_SRCS = \ time.c \ undname.c \ wcs.c + +RC_SRCS = version.rc diff --git a/dlls/ucrtbase/version.rc b/dlls/ucrtbase/version.rc new file mode 100644 index 0000000..f034bc3 --- /dev/null +++ b/dlls/ucrtbase/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2018 Louis Lenders + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine runtime library" +#define WINE_FILENAME_STR "ucrtbase.dll" +#define WINE_FILEVERSION 10,0,14393,2247 +#define WINE_FILEVERSION_STR "10.0.14393.2247" +#define WINE_PRODUCTVERSION 10,0,14393,2247 +#define WINE_PRODUCTVERSION_STR "10.0.14393.2247" + +#include "wine/wine_common_ver.rc"

1 0

Nikolay Sivov : advapi32: Add a name for WinBuiltinAnyPackageSid.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 389c19f135d9116f468c5659a721570b25952b93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=389c19f135d9116f468c5659… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 8 08:06:29 2018 +0300 advapi32: Add a name for WinBuiltinAnyPackageSid. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit afaada7e5f454a428795d9ddc8fc8f53870d9615) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/security.c | 2 +- dlls/advapi32/tests/security.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index bcdb2e4..131e082 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -127,7 +127,7 @@ static const WELLKNOWNSID WellKnownSids[] = { {'M','E'}, WinMediumLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_MEDIUM_RID } } }, { {'H','I'}, WinHighLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_HIGH_RID } } }, { {'S','I'}, WinSystemLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_SYSTEM_RID } } }, - { {0,0}, WinBuiltinAnyPackageSid, { SID_REVISION, 2, { SECURITY_APP_PACKAGE_AUTHORITY }, { SECURITY_APP_PACKAGE_BASE_RID, SECURITY_BUILTIN_PACKAGE_ANY_PACKAGE } } }, + { {'A','C'}, WinBuiltinAnyPackageSid, { SID_REVISION, 2, { SECURITY_APP_PACKAGE_AUTHORITY }, { SECURITY_APP_PACKAGE_BASE_RID, SECURITY_BUILTIN_PACKAGE_ANY_PACKAGE } } }, }; /* these SIDs must be constructed as relative to some domain - only the RID is well-known */ diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a66b844..686e601 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -310,7 +310,7 @@ static void test_sid(void) { "WD", "S-1-1-0" }, { "CO", "S-1-3-0" }, { "CG", "S-1-3-1" }, - { "OW", "S-1-3-4", 1 }, + { "OW", "S-1-3-4", 1 }, /* Vista+ */ { "NU", "S-1-5-2" }, { "IU", "S-1-5-4" }, { "SU", "S-1-5-6" }, @@ -336,6 +336,7 @@ static void test_sid(void) { "RU", "S-1-5-32-554" }, { "RD", "S-1-5-32-555" }, { "NO", "S-1-5-32-556" }, + { "AC", "S-1-15-2-1", 1 }, /* Win8+ */ { "CA", "", 1 }, { "DA", "", 1 }, { "DC", "", 1 },

1 0

Nikolay Sivov : advapi32: Add WinCreatorOwnerRightsSid to wellknown list.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 233a4a47880043ea0595dc93ad2223fc9ef83204 URL: https://source.winehq.org/git/wine.git/?a=commit;h=233a4a47880043ea0595dc93… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 8 08:06:28 2018 +0300 advapi32: Add WinCreatorOwnerRightsSid to wellknown list. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7c0cd8c7401230ef8a23c5df58c7db0e9c0cfbbf) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/security.c | 1 + dlls/advapi32/tests/security.c | 1 + include/winnt.h | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 31ef4b2..bcdb2e4 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -79,6 +79,7 @@ static const WELLKNOWNSID WellKnownSids[] = { {0,0}, WinLocalSid, { SID_REVISION, 1, { SECURITY_LOCAL_SID_AUTHORITY }, { SECURITY_LOCAL_RID } } }, { {'C','O'}, WinCreatorOwnerSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_OWNER_RID } } }, { {'C','G'}, WinCreatorGroupSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_GROUP_RID } } }, + { {'O','W'}, WinCreatorOwnerRightsSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_OWNER_RIGHTS_RID } } }, { {0,0}, WinCreatorOwnerServerSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_OWNER_SERVER_RID } } }, { {0,0}, WinCreatorGroupServerSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_GROUP_SERVER_RID } } }, { {0,0}, WinNtAuthoritySid, { SID_REVISION, 0, { SECURITY_NT_AUTHORITY }, { SECURITY_NULL_RID } } }, diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 2ee7b4e..a66b844 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -310,6 +310,7 @@ static void test_sid(void) { "WD", "S-1-1-0" }, { "CO", "S-1-3-0" }, { "CG", "S-1-3-1" }, + { "OW", "S-1-3-4", 1 }, { "NU", "S-1-5-2" }, { "IU", "S-1-5-4" }, { "SU", "S-1-5-6" }, diff --git a/include/winnt.h b/include/winnt.h index 1fb09b3..3eac94d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4205,6 +4205,7 @@ typedef struct _SID_AND_ATTRIBUTES { #define SECURITY_CREATOR_GROUP_RID __MSABI_LONG(0x00000001) #define SECURITY_CREATOR_OWNER_SERVER_RID __MSABI_LONG(0x00000002) #define SECURITY_CREATOR_GROUP_SERVER_RID __MSABI_LONG(0x00000003) +#define SECURITY_CREATOR_OWNER_RIGHTS_RID __MSABI_LONG(0x00000004) /* S-1-4 */ #define SECURITY_NON_UNIQUE_AUTHORITY {0,0,0,0,0,4}

1 0

Nikolay Sivov : advapi32/tests: Test return SIDs for wellknown two-character names.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 97c6f00508736fc372450a03fb5618ebab97dacb URL: https://source.winehq.org/git/wine.git/?a=commit;h=97c6f00508736fc372450a03… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 8 08:06:27 2018 +0300 advapi32/tests: Test return SIDs for wellknown two-character names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7f30ad1e47f5a5ce8920efedee04a3d475279966) Conflicts: dlls/advapi32/tests/security.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/tests/security.c | 113 +++++++++++++++++++++++------------------ 1 file changed, 64 insertions(+), 49 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 727ca6b..2ee7b4e 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -139,14 +139,6 @@ static HMODULE hmod; static int myARGC; static char** myARGV; -struct strsid_entry -{ - const char *str; - DWORD flags; -}; -#define STRSID_OK 0 -#define STRSID_OPT 1 - #define SID_SLOTS 4 static char debugsid_str[SID_SLOTS][256]; static int debugsid_index = 0; @@ -307,23 +299,59 @@ static void test_sid(void) { { {0x00,0x00,0x00,0x00,0x00,0x02} }, "S-1-2-1" }, { { {0x00,0x00,0x00,0x00,0x00,0x0c} }, "S-1-12-1" }, }; - struct strsid_entry strsid_table[] = { - {"AO", STRSID_OK}, {"RU", STRSID_OK}, {"AN", STRSID_OK}, {"AU", STRSID_OK}, - {"BA", STRSID_OK}, {"BG", STRSID_OK}, {"BO", STRSID_OK}, {"BU", STRSID_OK}, - {"CA", STRSID_OPT}, {"CG", STRSID_OK}, {"CO", STRSID_OK}, {"DA", STRSID_OPT}, - {"DC", STRSID_OPT}, {"DD", STRSID_OPT}, {"DG", STRSID_OPT}, {"DU", STRSID_OPT}, - {"EA", STRSID_OPT}, {"ED", STRSID_OK}, {"WD", STRSID_OK}, {"PA", STRSID_OPT}, - {"IU", STRSID_OK}, {"LA", STRSID_OK}, {"LG", STRSID_OK}, {"LS", STRSID_OK}, - {"SY", STRSID_OK}, {"NU", STRSID_OK}, {"NO", STRSID_OK}, {"NS", STRSID_OK}, - {"PO", STRSID_OK}, {"PS", STRSID_OK}, {"PU", STRSID_OK}, {"RS", STRSID_OPT}, - {"RD", STRSID_OK}, {"RE", STRSID_OK}, {"RC", STRSID_OK}, {"SA", STRSID_OPT}, - {"SO", STRSID_OK}, {"SU", STRSID_OK}}; + static const struct + { + const char *name; + const char *sid; + unsigned int optional; + } + str_to_sid_tests[] = + { + { "WD", "S-1-1-0" }, + { "CO", "S-1-3-0" }, + { "CG", "S-1-3-1" }, + { "NU", "S-1-5-2" }, + { "IU", "S-1-5-4" }, + { "SU", "S-1-5-6" }, + { "AN", "S-1-5-7" }, + { "ED", "S-1-5-9" }, + { "PS", "S-1-5-10" }, + { "AU", "S-1-5-11" }, + { "RC", "S-1-5-12" }, + { "SY", "S-1-5-18" }, + { "LS", "S-1-5-19" }, + { "NS", "S-1-5-20" }, + { "LA", "S-1-5-21-*-*-*-500" }, + { "LG", "S-1-5-21-*-*-*-501" }, + { "BO", "S-1-5-32-551" }, + { "BA", "S-1-5-32-544" }, + { "BU", "S-1-5-32-545" }, + { "BG", "S-1-5-32-546" }, + { "PU", "S-1-5-32-547" }, + { "AO", "S-1-5-32-548" }, + { "SO", "S-1-5-32-549" }, + { "PO", "S-1-5-32-550" }, + { "RE", "S-1-5-32-552" }, + { "RU", "S-1-5-32-554" }, + { "RD", "S-1-5-32-555" }, + { "NO", "S-1-5-32-556" }, + { "CA", "", 1 }, + { "DA", "", 1 }, + { "DC", "", 1 }, + { "DD", "", 1 }, + { "DG", "", 1 }, + { "DU", "", 1 }, + { "EA", "", 1 }, + { "PA", "", 1 }, + { "RS", "", 1 }, + { "SA", "", 1 }, + }; const char noSubAuthStr[] = "S-1-5"; unsigned int i; PSID psid = NULL; SID *pisid; - BOOL r; + BOOL r, ret; LPSTR str = NULL; if( !pConvertStringSidToSidA ) @@ -403,43 +431,30 @@ static void test_sid(void) LocalFree( psid ); } - /* string constant format not supported before XP */ - r = pConvertStringSidToSidA(strsid_table[0].str, &psid); - if(!r) + for (i = 0; i < ARRAY_SIZE(str_to_sid_tests); i++) { - win_skip("String constant format not supported\n"); - return; - } - LocalFree(psid); - - for(i = 0; i < sizeof(strsid_table) / sizeof(strsid_table[0]); i++) - { - char *temp; - - SetLastError(0xdeadbeef); - r = pConvertStringSidToSidA(strsid_table[i].str, &psid); + char *str; - if (!(strsid_table[i].flags & STRSID_OPT)) + ret = ConvertStringSidToSidA(str_to_sid_tests[i].name, &psid); + if (!ret && str_to_sid_tests[i].optional) { - ok(r, "%s: got %u\n", strsid_table[i].str, GetLastError()); + skip("%u: failed to convert %s.\n", i, str_to_sid_tests[i].name); + continue; } + ok(ret, "%u: failed to convert string to sid.\n", i); - if (r) + if (str_to_sid_tests[i].optional || !strcmp(str_to_sid_tests[i].name, "LA") || + !strcmp(str_to_sid_tests[i].name, "LG")) { - if ((winetest_debug > 1) && (ConvertSidToStringSidA(psid, &temp))) - { - trace(" %s: %s\n", strsid_table[i].str, temp); - LocalFree(temp); - } LocalFree(psid); + continue; } - else - { - if (GetLastError() != ERROR_INVALID_SID) - trace(" %s: couldn't be converted, returned %d\n", strsid_table[i].str, GetLastError()); - else - trace(" %s: couldn't be converted\n", strsid_table[i].str); - } + + ret = ConvertSidToStringSidA(psid, &str); + ok(ret, "%u: failed to convert SID to string.\n", i); + ok(!strcmp(str, str_to_sid_tests[i].sid), "%u: unexpected sid %s.\n", i, str); + LocalFree(psid); + LocalFree(str); } }

1 0

Michael Stefaniuc : include: Make ARRAY_SIZE() available in wine/test.h.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 04643db34f4cb911d8dbb9a08bdd93a73a3aac19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04643db34f4cb911d8dbb9a0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu May 24 23:46:27 2018 +0200 include: Make ARRAY_SIZE() available in wine/test.h. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7b5668a6e7bccdaefb69e099345fc7c3855a5cec) Conflicts: dlls/ddraw/tests/ddraw1.c dlls/ddraw/tests/ddraw2.c dlls/dmcompos/tests/dmcompos.c dlls/dmloader/tests/loader.c dlls/dmstyle/tests/dmstyle.c dlls/xmllite/tests/reader.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comdlg32/tests/filedlg.c | 2 -- dlls/d2d1/tests/d2d1.c | 4 ---- dlls/d3d10core/tests/device.c | 4 ---- dlls/d3d11/tests/d3d11.c | 4 ---- dlls/d3d8/tests/device.c | 2 -- dlls/d3d9/tests/device.c | 2 -- dlls/d3dx9_36/tests/effect.c | 2 -- dlls/d3dx9_36/tests/math.c | 2 -- dlls/d3dx9_36/tests/mesh.c | 2 -- dlls/ddraw/tests/ddraw1.c | 4 ---- dlls/ddraw/tests/ddraw2.c | 4 ---- dlls/ddraw/tests/ddraw4.c | 4 ---- dlls/ddraw/tests/ddraw7.c | 4 ---- dlls/dmcompos/tests/dmcompos.c | 2 -- dlls/dmime/tests/dmime.c | 2 -- dlls/dmloader/tests/loader.c | 2 -- dlls/dmstyle/tests/dmstyle.c | 2 -- dlls/shell32/tests/shellpath.c | 4 ---- dlls/user32/tests/cursoricon.c | 2 -- include/wine/test.h | 2 ++ 20 files changed, 2 insertions(+), 54 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index ff973a7..5544cf7 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -1028,8 +1028,6 @@ static UINT_PTR WINAPI test_extension_wndproc(HWND dlg, UINT msg, WPARAM wParam, return FALSE; } -#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) - static void test_extension_helper(OPENFILENAMEA* ofn, const char *filter, const char *expected_filename) { diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 9bd9e2b..9892bcc 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -26,10 +26,6 @@ #include "dwrite.h" #include "wincodec.h" -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) -#endif - struct resource_readback { ID3D10Resource *resource; diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index ca0fd8b..824b874 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -23,10 +23,6 @@ #include "wine/test.h" #include <limits.h> -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) -#endif - #define BITS_NNAN 0xffc00000 #define BITS_NAN 0x7fc00000 #define BITS_NINF 0xff800000 diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 74c0488..4d50e79 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -27,10 +27,6 @@ #include "d3d11_1.h" #include "wine/test.h" -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) -#endif - #define BITS_NNAN 0xffc00000 #define BITS_NAN 0x7fc00000 #define BITS_NINF 0xff800000 diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a9188f0..c9e12f2 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -28,8 +28,6 @@ #include <d3d8.h> #include "wine/test.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - struct vec3 { float x, y, z; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index a9fd4e4..325084e 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -27,8 +27,6 @@ #include <d3d9.h> #include "wine/test.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - struct vec3 { float x, y, z; diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 1900f3e..2d6f339 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -41,8 +41,6 @@ static float get_nan(void) #define NAN get_nan() #endif -#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(*arr)) - /* helper functions */ static BOOL compare_float(FLOAT f, FLOAT g, UINT ulps) { diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index b687e5d..e433b1f 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -23,8 +23,6 @@ #include "d3dx9.h" #include <math.h> -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 82ae90e..8b7f9cd 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -42,8 +42,6 @@ static inline float __port_nan(void) #define admitted_error 0.0001f -#define ARRAY_SIZE(array) (sizeof(array)/sizeof(*array)) - #define compare_vertex_sizes(type, exp) \ got=D3DXGetFVFVertexSize(type); \ ok(got==exp, "Expected: %d, Got: %d\n", exp, got); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 3e7b535..c5bb753 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -29,10 +29,6 @@ static DEVMODEW registry_mode; static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL *); -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) -#endif - struct vec4 { float x, y, z, w; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index faf7cef..c62b913 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -31,10 +31,6 @@ static DEVMODEW registry_mode; static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL *); -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) -#endif - struct vec4 { float x, y, z, w; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 1f0b01b..38d364d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -31,10 +31,6 @@ static DEVMODEW registry_mode; static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL *); -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) -#endif - struct vec2 { float x, y; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 2e41ff3..2a76d8c 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -32,10 +32,6 @@ static DEVMODEW registry_mode; static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL *); -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) -#endif - struct vec2 { float x, y; diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index 26c6e1f..408c266 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -24,8 +24,6 @@ #include <wine/test.h> #include <dmusici.h> -#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) - static BOOL missing_dmcompos(void) { IDirectMusicComposer *dmc; diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 62a977e..0ed3b10 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -25,8 +25,6 @@ #include <audioclient.h> #include <guiddef.h> -#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) - static BOOL missing_dmime(void) { IDirectMusicSegment8 *dms; diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index ff084b6..bad001d 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -22,8 +22,6 @@ #include "dmusici.h" #include "wine/test.h" -#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) - static unsigned char mp3file[] = "\xFF\xFB\x92\x04"; /* MP3 header */ static unsigned char rifffile[8+4+8+16+8+256] = "RIFF\x24\x01\x00\x00WAVE" /* header: 4 ("WAVE") + (8 + 16) (format segment) + (8 + 256) (data segment) = 0x124 */ "fmt \x10\x00\x00\x00\x01\x00\x20\x00\xAC\x44\x00\x00\x10\xB1\x02\x00\x04\x00\x10\x00" /* format segment: PCM, 2 chan, 44100 Hz, 16 bits */ diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 664b208..b0fc590 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -24,8 +24,6 @@ #include <wine/test.h> #include <dmusici.h> -#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) - static BOOL missing_dmstyle(void) { IDirectMusicStyle *dms; diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index f667431..613c4eb 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -43,10 +43,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(x) ( sizeof(x) / sizeof((x)[0]) ) -#endif - /* from pidl.h, not included here: */ #ifndef PT_CPL /* Guess, Win7 uses this for CSIDL_CONTROLS */ #define PT_CPL 0x01 /* no path */ diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 5099c08..95a6878 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1053,8 +1053,6 @@ static const DWORD biSize_tests[] = { 0xffffffff }; -#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) - static void test_LoadImageBitmap(const char * test_desc, HBITMAP hbm) { BITMAP bm; diff --git a/include/wine/test.h b/include/wine/test.h index 4ec66d5..d3ccd09 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -127,6 +127,8 @@ extern void __winetest_cdecl winetest_trace( const char *msg, ... ) WINETEST_PRI #define todo_wine_if(is_todo) todo_if((is_todo) && !strcmp(winetest_platform, "wine")) +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + #ifdef NONAMELESSUNION # define U(x) (x).u # define U1(x) (x).u1

1 0

Piotr Caban : msvcr120: Added _Cbuild implementation.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: a5f505d12ff33f13b9a1057dcc092fde6e6682cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5f505d12ff33f13b9a1057d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 1 19:50:39 2018 +0200 msvcr120: Added _Cbuild implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 84f5d8a619c599dbacff499989500e653abec0fa) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-math-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120/tests/msvcr120.c | 23 ++++++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 7 +++++++ dlls/msvcrt/msvcrt.h | 1 + dlls/ucrtbase/ucrtbase.spec | 2 +- 7 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 7bae4ff..ec85a53 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -14,7 +14,7 @@ @ cdecl -arch=i386 _CIsqrt() ucrtbase._CIsqrt @ cdecl -arch=i386 _CItan() ucrtbase._CItan @ cdecl -arch=i386 _CItanh() ucrtbase._CItanh -@ stub _Cbuild +@ cdecl _Cbuild(ptr double double) ucrtbase._Cbuild @ stub _Cmulcc @ stub _Cmulcr @ stub _FCbuild diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 53a99f3..4d611d1 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -824,7 +824,7 @@ @ cdecl -arch=i386 _CItanh() @ cdecl _CRT_RTC_INIT(ptr ptr long long long) @ cdecl _CRT_RTC_INITW(ptr ptr long long long) -@ stub _Cbuild +@ cdecl _Cbuild(ptr double double) MSVCR120__Cbuild @ cdecl _CreateFrameInfo(ptr ptr) @ stdcall _CxxThrowException(ptr ptr) @ cdecl -arch=i386 -norelay _EH_prolog() diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 152bfdf..1b5d409 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -163,6 +163,12 @@ typedef struct unsigned int status; } fenv_t; +typedef struct +{ + double r; + double i; +} _Dcomplex; + static char* (CDECL *p_setlocale)(int category, const char* locale); static struct MSVCRT_lconv* (CDECL *p_localeconv)(void); static size_t (CDECL *p_wcstombs_s)(size_t *ret, char* dest, size_t sz, const wchar_t* src, size_t max); @@ -184,6 +190,7 @@ static _locale_t (__cdecl *p_wcreate_locale)(int, const wchar_t *); static void (__cdecl *p_free_locale)(_locale_t); static unsigned short (__cdecl *p_wctype)(const char*); static int (__cdecl *p_vsscanf)(const char*, const char *, __ms_va_list valist); +static _Dcomplex* (__cdecl *p__Cbuild)(_Dcomplex*, double, double); /* make sure we use the correct errno */ #undef errno @@ -242,6 +249,7 @@ static BOOL init(void) SET(p_fegetenv, "fegetenv"); SET(p__clearfp, "_clearfp"); SET(p_vsscanf, "vsscanf"); + SET(p__Cbuild, "_Cbuild"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_critical_section_ctor, "??0critical_section@Concurrency@@QEAA@XZ"); @@ -936,6 +944,20 @@ static void test_vsscanf(void) ok(v == 10, "got %d.\n", v); } +static void test__Cbuild(void) +{ + _Dcomplex c; + + memset(&c, 0, sizeof(c)); + p__Cbuild(&c, 1.0, 2.0); + ok(c.r == 1.0, "c.r = %lf\n", c.r); + ok(c.i == 2.0, "c.i = %lf\n", c.i); + + p__Cbuild(&c, 3.0, NAN); + ok(c.r == 3.0, "c.r = %lf\n", c.r); + ok(_isnan(c.i), "c.i = %lf\n", c.i); +} + START_TEST(msvcr120) { if (!init()) return; @@ -954,4 +976,5 @@ START_TEST(msvcr120) test__Condition_variable(); test_wctype(); test_vsscanf(); + test__Cbuild(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index fa5711f..d5658c9 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -818,7 +818,7 @@ @ cdecl -arch=i386 _CIsqrt() msvcr120._CIsqrt @ cdecl -arch=i386 _CItan() msvcr120._CItan @ cdecl -arch=i386 _CItanh() msvcr120._CItanh -@ stub _Cbuild +@ cdecl _Cbuild(ptr double double) msvcr120._Cbuild @ cdecl _CreateFrameInfo(ptr ptr) msvcr120._CreateFrameInfo @ stdcall _CxxThrowException(ptr ptr) msvcr120._CxxThrowException @ cdecl -arch=i386 -norelay _EH_prolog() msvcr120._EH_prolog diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index a3af78a..b1669ce 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3392,4 +3392,11 @@ double CDECL _except1(DWORD fpe, _FP_OPERATION_CODE op, double arg, double res, return res; } +_Dcomplex* CDECL MSVCR120__Cbuild(_Dcomplex *ret, double r, double i) +{ + ret->x = r; + ret->y = i; + return ret; +} + #endif /* _MSVCR_VER>=120 */ diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index a380613..d4a542f 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -455,6 +455,7 @@ struct MSVCRT__complex { double x; /* Real part */ double y; /* Imaginary part */ }; +typedef struct MSVCRT__complex _Dcomplex; typedef struct MSVCRT__div_t { int quot; /* quotient */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 504b27d..4e935dc 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -14,7 +14,7 @@ @ cdecl -arch=i386 _CIsqrt() @ cdecl -arch=i386 _CItan() @ cdecl -arch=i386 _CItanh() -@ stub _Cbuild +@ cdecl _Cbuild(ptr double double) MSVCR120__Cbuild @ stub _Cmulcc @ stub _Cmulcr @ cdecl _CreateFrameInfo(ptr ptr)

1 0

Austin English : winscard: Add SCardCancel stub.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 483549a32952a27733ebd31cb841be8eca06e2a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=483549a32952a27733ebd31c… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Sep 25 15:46:46 2018 -0500 winscard: Add SCardCancel stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45880 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit eb68dc963325607dc38d469ff637babaf58676f1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winscard/winscard.c | 7 +++++++ dlls/winscard/winscard.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index a8a1735..91fdfd3 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -141,3 +141,10 @@ LONG WINAPI SCardListReadersW(SCARDCONTEXT context, const WCHAR *groups, WCHAR * FIXME("(%lx, %s, %p, %p) stub\n", context, debugstr_w(groups), readers, buflen); return SCARD_E_NO_READERS_AVAILABLE; } + +LONG WINAPI SCardCancel(SCARDCONTEXT context) +{ + FIXME("(%lx) stub\n", context); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_INTERNAL_ERROR; +} diff --git a/dlls/winscard/winscard.spec b/dlls/winscard/winscard.spec index d2ae62a..037d3be 100644 --- a/dlls/winscard/winscard.spec +++ b/dlls/winscard/winscard.spec @@ -6,7 +6,7 @@ @ stdcall SCardAddReaderToGroupA(long str str) @ stdcall SCardAddReaderToGroupW(long wstr wstr) @ stub SCardBeginTransaction -@ stub SCardCancel +@ stdcall SCardCancel(long) @ stub SCardConnectA @ stub SCardConnectW @ stub SCardControl

1 0

Hans Leidekker : wbemprox: Implement StdRegProv.CreateKey.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: ddd55cb00669d65226da4b149646087ef0ce171e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddd55cb00669d65226da4b14… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 28 10:58:40 2018 +0200 wbemprox: Implement StdRegProv.CreateKey. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 05cdc07d4431cbce14887d901d92d6243495bd1e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/builtin.c | 7 ++++- dlls/wbemprox/reg.c | 61 ++++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/tests/query.c | 42 +++++++++++++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 2 ++ 4 files changed, 111 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index a6ff4b9..c6db0df 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -674,6 +674,7 @@ static const struct column col_sounddevice[] = }; static const struct column col_stdregprov[] = { + { method_createkeyW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, { method_enumkeyW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, { method_enumvaluesW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, { method_getstringvalueW, CIM_FLAG_ARRAY|COL_FLAG_METHOD } @@ -1078,6 +1079,7 @@ struct record_sounddevice }; struct record_stdregprov { + class_method *createkey; class_method *enumkey; class_method *enumvalues; class_method *getstringvalue; @@ -1138,6 +1140,9 @@ static const struct record_param data_param[] = { class_serviceW, method_resumeserviceW, -1, param_returnvalueW, CIM_UINT32, VT_I4 }, { class_serviceW, method_startserviceW, -1, param_returnvalueW, CIM_UINT32, VT_I4 }, { class_serviceW, method_stopserviceW, -1, param_returnvalueW, CIM_UINT32, VT_I4 }, + { class_stdregprovW, method_createkeyW, 1, param_defkeyW, CIM_SINT32, 0, 0x80000002 }, + { class_stdregprovW, method_createkeyW, 1, param_subkeynameW, CIM_STRING }, + { class_stdregprovW, method_createkeyW, -1, param_returnvalueW, CIM_UINT32, VT_I4 }, { class_stdregprovW, method_enumkeyW, 1, param_defkeyW, CIM_SINT32, 0, 0x80000002 }, { class_stdregprovW, method_enumkeyW, 1, param_subkeynameW, CIM_STRING }, { class_stdregprovW, method_enumkeyW, -1, param_returnvalueW, CIM_UINT32, VT_I4 }, @@ -1176,7 +1181,7 @@ static const struct record_sounddevice data_sounddevice[] = }; static const struct record_stdregprov data_stdregprov[] = { - { reg_enum_key, reg_enum_values, reg_get_stringvalue } + { reg_create_key, reg_enum_key, reg_enum_values, reg_get_stringvalue } }; static UINT16 systemenclosure_chassistypes[] = { diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index 9232db7..396c000 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -76,6 +76,67 @@ static HRESULT to_i4_array( DWORD *values, DWORD count, VARIANT *var ) return S_OK; } +static HRESULT create_key( HKEY root, const WCHAR *subkey, VARIANT *retval ) +{ + LONG res; + HKEY hkey; + + TRACE("%p, %s\n", root, debugstr_w(subkey)); + + res = RegCreateKeyExW( root, subkey, 0, NULL, 0, 0, NULL, &hkey, NULL ); + set_variant( VT_UI4, res, NULL, retval ); + if (!res) + { + RegCloseKey( hkey ); + return S_OK; + } + return HRESULT_FROM_WIN32( res ); +} + +HRESULT reg_create_key( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + VARIANT defkey, subkey, retval; + IWbemClassObject *sig, *out_params = NULL; + HRESULT hr; + + TRACE("%p, %p\n", in, out); + + hr = IWbemClassObject_Get( in, param_defkeyW, 0, &defkey, NULL, NULL ); + if (hr != S_OK) return hr; + hr = IWbemClassObject_Get( in, param_subkeynameW, 0, &subkey, NULL, NULL ); + if (hr != S_OK) return hr; + + hr = create_signature( class_stdregprovW, method_createkeyW, PARAM_OUT, &sig ); + if (hr != S_OK) + { + VariantClear( &subkey ); + return hr; + } + if (out) + { + hr = IWbemClassObject_SpawnInstance( sig, 0, &out_params ); + if (hr != S_OK) + { + VariantClear( &subkey ); + IWbemClassObject_Release( sig ); + return hr; + } + } + hr = create_key( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), &retval ); + if (hr == S_OK && out_params) + hr = IWbemClassObject_Put( out_params, param_returnvalueW, 0, &retval, CIM_UINT32 ); + + VariantClear( &subkey ); + IWbemClassObject_Release( sig ); + if (hr == S_OK && out) + { + *out = out_params; + IWbemClassObject_AddRef( out_params ); + } + if (out_params) IWbemClassObject_Release( out_params ); + return hr; +} + static HRESULT enum_key( HKEY root, const WCHAR *subkey, VARIANT *names, VARIANT *retval ) { HKEY hkey; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 7f2e864..a1ca7a9 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -686,6 +686,7 @@ static void test_Win32_SystemEnclosure( IWbemServices *services ) static void test_StdRegProv( IWbemServices *services ) { + static const WCHAR createkeyW[] = {'C','r','e','a','t','e','K','e','y',0}; static const WCHAR enumkeyW[] = {'E','n','u','m','K','e','y',0}; static const WCHAR enumvaluesW[] = {'E','n','u','m','V','a','l','u','e','s',0}; static const WCHAR getstringvalueW[] = {'G','e','t','S','t','r','i','n','g','V','a','l','u','e',0}; @@ -701,11 +702,14 @@ static void test_StdRegProv( IWbemServices *services ) static const WCHAR windowsW[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n',0}; + static const WCHAR regtestW[] = + {'S','o','f','t','w','a','r','e','\\','S','t','d','R','e','g','P','r','o','v','T','e','s','t',0}; BSTR class = SysAllocString( stdregprovW ), method; IWbemClassObject *reg, *sig_in, *in, *out; VARIANT defkey, subkey, retval, names, types, value, valuename; CIMTYPE type; HRESULT hr; + LONG res; hr = IWbemServices_GetObject( services, class, 0, NULL, &reg, NULL ); if (hr != S_OK) @@ -713,6 +717,44 @@ static void test_StdRegProv( IWbemServices *services ) win_skip( "StdRegProv not available\n" ); return; } + hr = IWbemClassObject_GetMethod( reg, createkeyW, 0, &sig_in, NULL ); + ok( hr == S_OK, "failed to get CreateKey method %08x\n", hr ); + + hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); + ok( hr == S_OK, "failed to spawn instance %08x\n", hr ); + + V_VT( &defkey ) = VT_I4; + V_I4( &defkey ) = 0x80000001; + hr = IWbemClassObject_Put( in, defkeyW, 0, &defkey, 0 ); + ok( hr == S_OK, "failed to set root %08x\n", hr ); + + V_VT( &subkey ) = VT_BSTR; + V_BSTR( &subkey ) = SysAllocString( regtestW ); + hr = IWbemClassObject_Put( in, subkeynameW, 0, &subkey, 0 ); + ok( hr == S_OK, "failed to set subkey %08x\n", hr ); + + out = NULL; + method = SysAllocString( createkeyW ); + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); + ok( hr == S_OK, "failed to execute method %08x\n", hr ); + SysFreeString( method ); + + type = 0xdeadbeef; + VariantInit( &retval ); + hr = IWbemClassObject_Get( out, returnvalueW, 0, &retval, &type, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); + ok( !V_I4( &retval ), "unexpected error %u\n", V_UI4( &retval ) ); + ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); + + res = RegDeleteKeyW( HKEY_CURRENT_USER, regtestW ); + ok( !res, "got %d\n", res ); + + VariantClear( &subkey ); + IWbemClassObject_Release( in ); + IWbemClassObject_Release( out ); + IWbemClassObject_Release( sig_in ); + hr = IWbemClassObject_GetMethod( reg, enumkeyW, 0, &sig_in, NULL ); ok( hr == S_OK, "failed to get EnumKey method %08x\n", hr ); diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 15ea9c6..ef7c8ba 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -217,6 +217,7 @@ HRESULT EnumWbemClassObject_create(struct query *, LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemQualifierSet_create(const WCHAR *, const WCHAR *, LPVOID *) DECLSPEC_HIDDEN; HRESULT process_get_owner(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT reg_create_key(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT reg_enum_key(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT reg_enum_values(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT reg_get_stringvalue(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; @@ -262,6 +263,7 @@ static const WCHAR class_systemsecurityW[] = {'_','_','S','y','s','t','e','m','S static const WCHAR prop_nameW[] = {'N','a','m','e',0}; +static const WCHAR method_createkeyW[] = {'C','r','e','a','t','e','K','e','y',0}; static const WCHAR method_enumkeyW[] = {'E','n','u','m','K','e','y',0}; static const WCHAR method_enumvaluesW[] = {'E','n','u','m','V','a','l','u','e','s',0}; static const WCHAR method_getownerW[] = {'G','e','t','O','w','n','e','r',0};

1 0

Dmitry Timoshkov : user32: Fix the pointer to custom dialog control data.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 1d7c98bcc143860a4ea09ce0df1fac8a868d7b39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d7c98bcc143860a4ea09ce0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 1 14:47:45 2018 +0800 user32: Fix the pointer to custom dialog control data. Suggested by vendor2013(a)herdsoft.com. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5277aa8f64ae614c75fb32e3db135a49f3f83b3a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/dialog.c | 2 +- dlls/user32/tests/dialog.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 46220b0..eeb5146 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -197,7 +197,7 @@ static const WORD *DIALOG_GetControl32( const WORD *p, DLG_CONTROL_INFO *info, TRACE("\n"); TRACE(" END\n" ); } - info->data = p + 1; + info->data = p; p += GET_WORD(p) / sizeof(WORD); } else info->data = NULL; diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 8d30377..f57271c 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -548,7 +548,6 @@ static LRESULT CALLBACK test_control_procA(HWND hwnd, UINT msg, WPARAM wparam, L static const short sample[] = { 10,1,2,3,4,5 }; CREATESTRUCTA *cs = (CREATESTRUCTA *)lparam; short *data = cs->lpCreateParams; -todo_wine ok(!memcmp(data, sample, sizeof(sample)), "data mismatch: %d,%d,%d,%d,%d\n", data[0], data[1], data[2], data[3], data[4]); } return 0;

1 0

Dmitry Timoshkov : wrc: Fix generation of custom dialog control data.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 108ed0da8fa98866bfe043ca66142b6361b55168 URL: https://source.winehq.org/git/wine.git/?a=commit;h=108ed0da8fa98866bfe043ca… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 1 14:47:42 2018 +0800 wrc: Fix generation of custom dialog control data. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d8607c57b09341291b150afbb2998f3dc9267f6b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/wrc/genres.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 8c2f280..939d265 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -726,8 +726,7 @@ static res_t *dialog2res(name_id_t *name, dialog_t *dlg) put_word(res, 0); if(ctrl->extra) { - put_word(res, ctrl->extra->size+2); - put_pad(res); + put_word(res, ctrl->extra->size); put_raw_data(res, ctrl->extra, 0); } else

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 2019