wine-devel November 2018

75 participants
771 discussions

Re: widl: Set name return value (passed by reference) in the alias case alias case in get_user_type.

by Alexandre Julliard

Gerald Pfeifer <gerald(a)pfeifer.com> writes: > So, I admit I don't really know this code, but looking at it (triggered > by a warning issued by GCC development versions), I noticed that this > variable passed by reference is not initialized here. It's initialized when we return a type, and it doesn't need to be initialized on NULL return. The code is correct, but you could probably set the variable to NULL in the caller to silence the warning. -- Alexandre Julliard julliard(a)winehq.org

3 years, 4 months

Error handling in RpcBindingVectorFree (dlls/rpcrt4/rpc_binding.c)

by Gerald Pfeifer

Looking at RPC_STATUS WINAPI RpcBindingVectorFree( RPC_BINDING_VECTOR** BindingVector ) { RPC_STATUS status; ULONG c; TRACE("(%p)\n", BindingVector); for (c=0; c<(*BindingVector)->Count; c++) { status = RpcBindingFree(&(*BindingVector)->BindingH[c]); } HeapFree(GetProcessHeap(), 0, *BindingVector); *BindingVector = NULL; return RPC_S_OK; } we currently always ignore the outcome of RpcBindingFree and return RPC_S_OK. However, there is one case where RpcBindingFree returns something different (which is if *Binding is null when RPC_S_INVALID_BINDING is returned). What is the proper way of handling this? Just keeping the code as is and removing the unused status variable? Breaking the loop once RpcBindingFree returns something different from RPC_S_OK? Continuing and returning the first / the last status different from RPC_S_OK? Gerald

3 years, 4 months

[PATCH v4] msvcr120: Add nexttoward implementation.

by Zebediah Figura

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45631 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- configure.ac | 2 + .../api-ms-win-crt-math-l1-1-0.spec | 6 +- dlls/msvcr120/msvcr120.spec | 6 +- dlls/msvcr120/tests/msvcr120.c | 89 +++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 6 +- dlls/msvcrt/math.c | 30 +++++++ dlls/ucrtbase/ucrtbase.spec | 6 +- 7 files changed, 133 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 1db7af9177..907fac2f71 100644 --- a/configure.ac +++ b/configure.ac @@ -2746,6 +2746,8 @@ AC_CHECK_FUNCS(\ lroundf \ nearbyint \ nearbyintf \ + nexttoward \ + nexttowardf \ powl \ remainder \ remainderf \ 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 0d645e5587..f5e4fb1f8f 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 @@ -297,9 +297,9 @@ @ cdecl nextafter(double double) ucrtbase.nextafter @ cdecl nextafterf(float float) ucrtbase.nextafterf @ cdecl nextafterl(double double) ucrtbase.nextafterl -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) ucrtbase.nexttoward +@ cdecl nexttowardf(float double) ucrtbase.nexttowardf +@ cdecl nexttowardl(double double) ucrtbase.nexttowardl @ stub norm @ stub normf @ stub norml diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c9547bcbdf..e2764dc46e 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2302,9 +2302,9 @@ @ cdecl nextafter(double double) MSVCRT__nextafter @ cdecl nextafterf(float float) MSVCRT__nextafterf @ cdecl nextafterl(double double) MSVCRT__nextafter -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) MSVCRT_nexttoward +@ cdecl nexttowardf(float double) MSVCRT_nexttowardf +@ cdecl nexttowardl(double double) MSVCRT_nexttoward @ stub norm @ stub normf @ stub norml diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 79b667e42b..4115c99503 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -127,6 +127,16 @@ static inline float __port_nan(void) } #define NAN __port_nan() +static inline int isnormal(double d) +{ + return _fpclass(d) & (_FPCLASS_PN | _FPCLASS_NN); +} + +static inline int isinf(double d) +{ + return _fpclass(d) & (_FPCLASS_PINF | _FPCLASS_NINF); +} + struct MSVCRT_lconv { char* decimal_point; @@ -192,6 +202,9 @@ 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); static double (__cdecl *p_creal)(_Dcomplex); +static double (__cdecl *p_nexttoward)(double, double); +static float (__cdecl *p_nexttowardf)(float, double); +static double (__cdecl *p_nexttowardl)(double, double); /* make sure we use the correct errno */ #undef errno @@ -252,6 +265,9 @@ static BOOL init(void) SET(p_vsscanf, "vsscanf"); SET(p__Cbuild, "_Cbuild"); SET(p_creal, "creal"); + SET(p_nexttoward, "nexttoward"); + SET(p_nexttowardf, "nexttowardf"); + SET(p_nexttowardl, "nexttowardl"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_critical_section_ctor, "??0critical_section@Concurrency@@QEAA@XZ"); @@ -964,6 +980,78 @@ static void test__Cbuild(void) ok(d == 3.0, "creal returned %lf\n", d); } +static void test_nexttoward(void) +{ + errno_t e; + double d; + float f; + int i; + + struct + { + double source; + double dir; + float f; + double d; + } + tests[] = + { + {0.0, 0.0, 0.0f, 0.0}, + {0.0, 1.0, 1.0e-45f, 5.0e-324}, + {0.0, -1.0, -1.0e-45f, -5.0e-324}, + {2.2250738585072009e-308, 0.0, 0.0f, 2.2250738585072004e-308}, + {2.2250738585072009e-308, 2.2250738585072010e-308, 1.0e-45f, 2.2250738585072009e-308}, + {2.2250738585072009e-308, 1.0, 1.0e-45f, 2.2250738585072014e-308}, + {2.2250738585072014e-308, 0.0, 0.0f, 2.2250738585072009e-308}, + {2.2250738585072014e-308, 2.2250738585072014e-308, 1.0e-45f, 2.2250738585072014e-308}, + {2.2250738585072014e-308, 1.0, 1.0e-45f, 2.2250738585072019e-308}, + {1.0, 2.0, 1.00000012f, 1.0000000000000002}, + {1.0, 0.0, 0.99999994f, 0.9999999999999999}, + {1.0, 1.0, 1.0f, 1.0}, + {0.0, INFINITY, 1.0e-45f, 5.0e-324}, + {FLT_MAX, INFINITY, INFINITY, 3.402823466385289e+038}, + {DBL_MAX, INFINITY, INFINITY, INFINITY}, + {INFINITY, INFINITY, INFINITY, INFINITY}, + {INFINITY, 0, FLT_MAX, DBL_MAX}, + }; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + f = p_nexttowardf(tests[i].source, tests[i].dir); + ok(f == tests[i].f, "Test %d: expected %0.8ef, got %0.8ef.\n", i, tests[i].f, f); + + errno = -1; + d = p_nexttoward(tests[i].source, tests[i].dir); + e = errno; + ok(d == tests[i].d, "Test %d: expected %0.16e, got %0.16e.\n", i, tests[i].d, d); + if (isnormal(d) || isinf(tests[i].source)) + ok(e == -1, "Test %d: expected no error, got %d.\n", i, e); + else + ok(e == ERANGE, "Test %d: expected ERANGE, got %d.\n", i, e); + + d = p_nexttowardl(tests[i].source, tests[i].dir); + ok(d == tests[i].d, "Test %d: expected %0.16e, got %0.16e.\n", i, tests[i].d, d); + } + + errno = -1; + d = p_nexttoward(NAN, 0); + e = errno; + ok(_isnan(d), "Expected NAN, got %0.16e.\n", d); + ok(e == -1, "Expected errno -1, got %d.\n", e); + + errno = -1; + d = p_nexttoward(NAN, NAN); + e = errno; + ok(_isnan(d), "Expected NAN, got %0.16e.\n", d); + ok(e == -1, "Expected errno ERANGE, got %d.\n", e); + + errno = -1; + d = p_nexttoward(0, NAN); + e = errno; + ok(_isnan(d), "Expected NAN, got %0.16e.\n", d); + ok(e == -1, "Expected errno ERANGE, got %d.\n", e); +} + START_TEST(msvcr120) { if (!init()) return; @@ -983,4 +1071,5 @@ START_TEST(msvcr120) test_wctype(); test_vsscanf(); test__Cbuild(); + test_nexttoward(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index c1f6e0bcf0..706799ce37 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1965,9 +1965,9 @@ @ cdecl nextafter(double double) msvcr120.nextafter @ cdecl nextafterf(float float) msvcr120.nextafterf @ cdecl nextafterl(double double) msvcr120.nextafterl -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) msvcr120.nexttoward +@ cdecl nexttowardf(float double) msvcr120.nexttowardf +@ cdecl nexttowardl(double double) msvcr120.nexttowardl @ stub norm @ stub normf @ stub norml diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d4785d3508..f6050a1c15 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1529,6 +1529,36 @@ float CDECL MSVCRT_nearbyintf(float num) #endif } +/********************************************************************* + * nexttoward (MSVCR120.@) + */ +double CDECL MSVCRT_nexttoward(double num, double next) +{ +#ifdef HAVE_NEXTTOWARD + double ret = nexttoward(num, next); + if (!isnormal(ret) && !isnan(ret) && !isinf(num)) *MSVCRT__errno() = MSVCRT_ERANGE; + return ret; +#else + FIXME("not implemented\n"); + return 0; +#endif +} + +/********************************************************************* + * nexttowardf (MSVCR120.@) + */ +float CDECL MSVCRT_nexttowardf(float num, double next) +{ +#ifdef HAVE_NEXTTOWARDF + float ret = nexttowardf(num, next); + if (!isnormal(ret) && !isnan(ret) && !isinf(num)) *MSVCRT__errno() = MSVCRT_ERANGE; + return ret; +#else + FIXME("not implemented\n"); + return 0; +#endif +} + #endif /* _MSVCR_VER>=120 */ /********************************************************************* diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 6e6cc439d8..3592a569e0 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2438,9 +2438,9 @@ @ cdecl nextafter(double double) MSVCRT__nextafter @ cdecl nextafterf(float float) MSVCRT__nextafterf @ cdecl nextafterl(double double) MSVCRT__nextafter -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) MSVCRT_nexttoward +@ cdecl nexttowardf(float double) MSVCRT_nexttowardf +@ cdecl nexttowardl(double double) MSVCRT_nexttoward @ stub norm @ stub normf @ stub norml -- 2.19.1

5 years, 4 months

[PATCH 1/4] msvcrt/tests: Add tests for C locale.

by Daniel Lehman

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/msvcrt/tests/string.c | 80 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 0568bcf5df..e80a51824b 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -89,6 +89,12 @@ static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements static int (__cdecl *p_wctob)(wint_t); static size_t (__cdecl *p_wcrtomb)(char*, wchar_t, mbstate_t*); static int (__cdecl *p_tolower)(int); +static int (__cdecl *p_towlower)(wint_t); +static int (__cdecl *p__towlower_l)(wint_t, _locale_t); +static int (__cdecl *p_towupper)(wint_t); +static int (__cdecl *p__towupper_l)(wint_t, _locale_t); +static _locale_t(__cdecl *p__create_locale)(int, const char*); +static void(__cdecl *p__free_locale)(_locale_t); static size_t (__cdecl *p_mbrlen)(const char*, size_t, mbstate_t*); static size_t (__cdecl *p_mbrtowc)(wchar_t*, const char*, size_t, mbstate_t*); static int (__cdecl *p__atodbl_l)(_CRT_DOUBLE*,char*,_locale_t); @@ -3603,6 +3609,73 @@ static void test___strncnt(void) } } +static void test_C_locale(void) +{ + int i, j; + wint_t ret, exp; + _locale_t locale; + static const char *locales[] = { NULL, "C" }; + + /* C locale only converts case for [a-zA-Z] */ + setlocale(LC_ALL, "C"); + for (i = 0; i <= 0xffff; i++) + { + ret = p_towlower(i); + if (i >= 'A' && i <= 'Z') + { + exp = i + 'a' - 'A'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + todo_wine_if(ret != i) + ok(ret == i, "expected self %x, got %x for C locale\n", i, ret); + + ret = p_towupper(i); + if (i >= 'a' && i <= 'z') + { + exp = i + 'A' - 'a'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + todo_wine_if(ret != i) + ok(ret == i, "expected self %x, got %x for C locale\n", i, ret); + } + + if (!p__towlower_l || !p__towupper_l || !p__create_locale) + { + win_skip("_towlower_l/_towupper_l/_create_locale not available\n"); + return; + } + + for (i = 0; i < ARRAY_SIZE(locales); i++) { + locale = locales[i] ? p__create_locale(LC_ALL, locales[i]) : NULL; + + for (j = 0; j <= 0xffff; j++) { + ret = p__towlower_l(j, locale); + if (j >= 'A' && j <= 'Z') + { + exp = j + 'a' - 'A'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + todo_wine_if(ret != j) + ok(ret == j, "expected self %x, got %x for C locale\n", j, ret); + + ret = p__towupper_l(j, locale); + if (j >= 'a' && j <= 'z') + { + exp = j + 'A' - 'a'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + todo_wine_if(ret != j) + ok(ret == j, "expected self %x, got %x for C locale\n", j, ret); + } + + p__free_locale(locale); + } +} + START_TEST(string) { char mem[100]; @@ -3648,6 +3721,12 @@ START_TEST(string) p_wctob = (void*)GetProcAddress(hMsvcrt, "wctob"); p_wcrtomb = (void*)GetProcAddress(hMsvcrt, "wcrtomb"); p_tolower = (void*)GetProcAddress(hMsvcrt, "tolower"); + p_towlower = (void*)GetProcAddress(hMsvcrt, "towlower"); + p__towlower_l = (void*)GetProcAddress(hMsvcrt, "_towlower_l"); + p_towupper = (void*)GetProcAddress(hMsvcrt, "towupper"); + p__towupper_l = (void*)GetProcAddress(hMsvcrt, "_towupper_l"); + p__create_locale = (void*)GetProcAddress(hMsvcrt, "_create_locale"); + p__free_locale = (void*)GetProcAddress(hMsvcrt, "_free_locale"); p_mbrlen = (void*)GetProcAddress(hMsvcrt, "mbrlen"); p_mbrtowc = (void*)GetProcAddress(hMsvcrt, "mbrtowc"); p_mbsrtowcs = (void*)GetProcAddress(hMsvcrt, "mbsrtowcs"); @@ -3730,4 +3809,5 @@ START_TEST(string) test__tcsncoll(); test__tcsnicoll(); test___strncnt(); + test_C_locale(); } -- 2.17.1

5 years, 4 months

[PATCH v3 1/3] comctl32/tests: Test status bar size grip behavior and bounds.

by Waritnan Sookbuntherng

Signed-off-by: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> --- v2: Add tests. v3: Cover more points. --- dlls/comctl32/tests/status.c | 85 ++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index d78bd20262..074e637801 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -20,6 +20,7 @@ #include <windows.h> #include <commctrl.h> +#include <uxtheme.h> #include "wine/test.h" @@ -586,6 +587,89 @@ static void test_notify(void) ok(g_got_contextmenu, "WM_RBUTTONUP did not activate the context menu!\n"); } +static void test_sizegrip(void) +{ + HWND hwndStatus; + LONG style; + RECT rcClient, rcGripper; + POINT pt; + int width, r; + + hwndStatus = CreateWindowA(SUBCLASS_NAME, "", WS_CHILD|WS_VISIBLE|SBARS_SIZEGRIP, + 0, 0, 100, 100, g_hMainWnd, NULL, NULL, NULL); + + style = GetWindowLongPtrA(g_hMainWnd, GWL_STYLE); + GetClientRect(hwndStatus, &rcClient); + + width = GetSystemMetrics(SM_CXVSCROLL); + + rcGripper = rcClient; + rcGripper.left = rcClient.right - width; + +#define SETWNDLONG(MAXIMIZE, RTL) \ + do \ + { \ + SetWindowLongA(g_hMainWnd, GWL_STYLE, (MAXIMIZE) ? style|WS_MAXIMIZE : style); \ + SetWindowLongA(hwndStatus, GWL_EXSTYLE, (RTL) ? WS_EX_LAYOUTRTL : 0); \ + } while (0) + +#define TEST_NCHITTEST(X, Y, EXPECT) \ + do \ + { \ + pt.x = (X); \ + pt.y = (Y); \ + ClientToScreen(hwndStatus, &pt); \ + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(pt.x, pt.y)); \ + ok((EXPECT) == r, "expect WM_NCHITTEST " #EXPECT " got %#x\n", r); \ + } while (0) + + /* check bounds when not maximized */ + SETWNDLONG(FALSE, FALSE); + todo_wine TEST_NCHITTEST(rcGripper.left, rcGripper.top, HTBOTTOMRIGHT); + TEST_NCHITTEST(rcGripper.left - 1, rcGripper.top, HTCLIENT); + todo_wine TEST_NCHITTEST(rcGripper.left, rcGripper.top - 1, HTBOTTOMRIGHT); + todo_wine TEST_NCHITTEST(rcGripper.right, rcGripper.bottom, HTBOTTOMRIGHT); + todo_wine TEST_NCHITTEST(rcGripper.right + 1, rcGripper.bottom, HTBOTTOMRIGHT); + todo_wine TEST_NCHITTEST(rcGripper.right, rcGripper.bottom + 1, HTBOTTOMRIGHT); + TEST_NCHITTEST(rcGripper.right - 1, rcGripper.bottom - 1, HTBOTTOMRIGHT); + + /* maximized */ + SETWNDLONG(TRUE, FALSE); + TEST_NCHITTEST(rcGripper.left, rcGripper.top, HTCLIENT); + TEST_NCHITTEST(rcGripper.left - 1, rcGripper.top, HTCLIENT); + TEST_NCHITTEST(rcGripper.left, rcGripper.top - 1, HTNOWHERE); + TEST_NCHITTEST(rcGripper.right, rcGripper.bottom, HTNOWHERE); + TEST_NCHITTEST(rcGripper.right + 1, rcGripper.bottom, HTNOWHERE); + TEST_NCHITTEST(rcGripper.right, rcGripper.bottom + 1, HTNOWHERE); + todo_wine TEST_NCHITTEST(rcGripper.right - 1, rcGripper.bottom - 1, HTCLIENT); + + /* not maximized and right-to-left */ + SETWNDLONG(FALSE, TRUE); + todo_wine TEST_NCHITTEST(rcGripper.left, rcGripper.top, HTBOTTOMLEFT); + TEST_NCHITTEST(rcGripper.left - 1, rcGripper.top, HTCLIENT); + todo_wine TEST_NCHITTEST(rcGripper.left, rcGripper.top - 1, HTBOTTOMLEFT); + todo_wine TEST_NCHITTEST(rcGripper.right, rcGripper.bottom, HTBOTTOMLEFT); + todo_wine TEST_NCHITTEST(rcGripper.right + 1, rcGripper.bottom, HTBOTTOMLEFT); + todo_wine TEST_NCHITTEST(rcGripper.right, rcGripper.bottom + 1, HTBOTTOMLEFT); + TEST_NCHITTEST(rcGripper.right - 1, rcGripper.bottom - 1, HTBOTTOMLEFT); + + /* maximized with right-to-left */ + SETWNDLONG(TRUE, TRUE); + TEST_NCHITTEST(rcGripper.left, rcGripper.top, HTCLIENT); + TEST_NCHITTEST(rcGripper.left - 1, rcGripper.top, HTCLIENT); + TEST_NCHITTEST(rcGripper.left, rcGripper.top - 1, HTNOWHERE); + TEST_NCHITTEST(rcGripper.right, rcGripper.bottom, HTNOWHERE); + TEST_NCHITTEST(rcGripper.right + 1, rcGripper.bottom, HTNOWHERE); + TEST_NCHITTEST(rcGripper.right, rcGripper.bottom + 1, HTNOWHERE); + todo_wine TEST_NCHITTEST(rcGripper.right - 1, rcGripper.bottom - 1, HTCLIENT); + +#undef TEST_NCHITTEST +#undef SETWNDLONG + + SetWindowLongA(g_hMainWnd, GWL_STYLE, style); + DestroyWindow(hwndStatus); +} + static void init_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); @@ -620,4 +704,5 @@ START_TEST(status) test_status_ownerdraw(); test_gettext(); test_notify(); + test_sizegrip(); } -- 2.19.1

5 years, 4 months

[PATCH] advapi32: Turn several string variables into static constants

by Alex Henrie

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/advapi32/security.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 16512d094c..70e2da40e7 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -440,10 +440,10 @@ static inline DWORD get_security_service( LPWSTR full_service_name, DWORD access /* helper function for SE_REGISTRY_KEY objects in [Get|Set]NamedSecurityInfo */ static inline DWORD get_security_regkey( LPWSTR full_key_name, DWORD access, HANDLE *key ) { - WCHAR classes_rootW[] = {'C','L','A','S','S','E','S','_','R','O','O','T',0}; - WCHAR current_userW[] = {'C','U','R','R','E','N','T','_','U','S','E','R',0}; - WCHAR machineW[] = {'M','A','C','H','I','N','E',0}; - WCHAR usersW[] = {'U','S','E','R','S',0}; + static const WCHAR classes_rootW[] = {'C','L','A','S','S','E','S','_','R','O','O','T',0}; + static const WCHAR current_userW[] = {'C','U','R','R','E','N','T','_','U','S','E','R',0}; + static const WCHAR machineW[] = {'M','A','C','H','I','N','E',0}; + static const WCHAR usersW[] = {'U','S','E','R','S',0}; LPWSTR p = strchrW(full_key_name, '\\'); int len = p-full_key_name; HKEY hParent; @@ -4997,9 +4997,9 @@ static void DumpString(LPCWSTR string, int cch, WCHAR **pwptr, ULONG *plen) static BOOL DumpSidNumeric(PSID psid, WCHAR **pwptr, ULONG *plen) { + static const WCHAR fmt[] = { 'S','-','%','u','-','%','d',0 }; + static const WCHAR subauthfmt[] = { '-','%','u',0 }; DWORD i; - WCHAR fmt[] = { 'S','-','%','u','-','%','d',0 }; - WCHAR subauthfmt[] = { '-','%','u',0 }; WCHAR buf[26]; SID *pisid = psid; -- 2.19.2

5 years, 4 months

[PATCH 1/6] wined3d: Introduce WINED3DUSAGE_MANAGED.

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3d8/buffer.c | 4 ++++ dlls/d3d8/device.c | 2 ++ dlls/d3d8/texture.c | 6 ++++++ dlls/d3d9/buffer.c | 4 ++++ dlls/d3d9/device.c | 2 ++ dlls/d3d9/texture.c | 6 ++++++ dlls/ddraw/surface.c | 1 + dlls/wined3d/buffer.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/resource.c | 9 ++++++++- dlls/wined3d/texture.c | 12 +++++------- dlls/wined3d/utils.c | 2 ++ dlls/wined3d/wined3d_private.h | 5 ----- include/wine/wined3d.h | 1 + 14 files changed, 43 insertions(+), 15 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 9534c33932d..2f0d1679c22 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -288,6 +288,8 @@ HRESULT vertexbuffer_init(struct d3d8_vertexbuffer *buffer, struct d3d8_device * desc.byte_width = size; desc.usage = usage & WINED3DUSAGE_MASK; + if (pool == D3DPOOL_MANAGED) + desc.usage |= WINED3DUSAGE_MANAGED; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; @@ -577,6 +579,8 @@ HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *de desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; + if (pool == D3DPOOL_MANAGED) + desc.usage |= WINED3DUSAGE_MANAGED; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index b05df7e2914..b60e00cce1f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1165,6 +1165,8 @@ static HRESULT d3d8_device_create_surface(struct d3d8_device *device, UINT width desc.usage = usage & WINED3DUSAGE_MASK; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; + if (pool == D3DPOOL_MANAGED) + desc.usage |= WINED3DUSAGE_MANAGED; desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage); desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index c952579ce61..d9e68f87035 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1110,6 +1110,8 @@ HRESULT texture_init(struct d3d8_texture *texture, struct d3d8_device *device, desc.usage |= WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; + if (pool == D3DPOOL_MANAGED) + desc.usage |= WINED3DUSAGE_MANAGED; desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; @@ -1159,6 +1161,8 @@ HRESULT cubetexture_init(struct d3d8_texture *texture, struct d3d8_device *devic desc.usage |= WINED3DUSAGE_LEGACY_CUBEMAP | WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; + if (pool == D3DPOOL_MANAGED) + desc.usage |= WINED3DUSAGE_MANAGED; desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; @@ -1207,6 +1211,8 @@ HRESULT volumetexture_init(struct d3d8_texture *texture, struct d3d8_device *dev desc.usage |= WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; + if (pool == D3DPOOL_MANAGED) + desc.usage |= WINED3DUSAGE_MANAGED; desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = width; diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index ea98ef4242f..0c4a1262ff1 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -289,6 +289,8 @@ HRESULT vertexbuffer_init(struct d3d9_vertexbuffer *buffer, struct d3d9_device * desc.byte_width = size; desc.usage = usage & WINED3DUSAGE_MASK; + if (pool == D3DPOOL_MANAGED) + desc.usage |= WINED3DUSAGE_MANAGED; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; @@ -576,6 +578,8 @@ HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *de desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; + if (pool == D3DPOOL_MANAGED) + desc.usage |= WINED3DUSAGE_MANAGED; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1e7c0ea0f45..d641b94221e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1392,6 +1392,8 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width desc.usage = usage & WINED3DUSAGE_MASK; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; + if (pool == D3DPOOL_MANAGED) + desc.usage |= WINED3DUSAGE_MANAGED; desc.bind_flags = wined3d_bind_flags_from_d3d9_usage(usage); desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 70d35fc50c1..a4db0e9dec8 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1314,6 +1314,8 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, desc.usage |= WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; + if (pool == D3DPOOL_MANAGED) + desc.usage |= WINED3DUSAGE_MANAGED; desc.bind_flags = wined3d_bind_flags_from_d3d9_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; @@ -1401,6 +1403,8 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *devic desc.usage |= WINED3DUSAGE_LEGACY_CUBEMAP | WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; + if (pool == D3DPOOL_MANAGED) + desc.usage |= WINED3DUSAGE_MANAGED; desc.bind_flags = wined3d_bind_flags_from_d3d9_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; @@ -1473,6 +1477,8 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev desc.usage |= WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; + if (pool == D3DPOOL_MANAGED) + desc.usage |= WINED3DUSAGE_MANAGED; desc.bind_flags = wined3d_bind_flags_from_d3d9_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = width; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 6bb92d5d399..dfa740833b7 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6191,6 +6191,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; /* Managed textures have the system memory flag set. */ desc->ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; + wined3d_desc.usage |= WINED3DUSAGE_MANAGED; } else if (desc->ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) { diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 020116da7f6..ff81044fcff 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1393,7 +1393,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d debug_d3dformat(buffer->resource.format->id), buffer->resource.heap_memory); if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING - || wined3d_resource_access_is_managed(desc->access)) + || desc->usage & WINED3DUSAGE_MANAGED) { /* SWvp and managed buffers always return the same pointer in buffer * maps and retain data in DISCARD maps. Keep a system memory copy of diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1af76f235c8..14e2260c023 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4744,7 +4744,7 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) { TRACE("Checking resource %p for eviction.\n", resource); - if (wined3d_resource_access_is_managed(resource->access) && !resource->map_count) + if (resource->usage & WINED3DUSAGE_MANAGED && !resource->map_count) { TRACE("Evicting %p.\n", resource); wined3d_cs_emit_unload_resource(device->cs, resource); diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 58caccc7305..299202e6d31 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -36,6 +36,7 @@ static void resource_check_usage(DWORD usage) | WINED3DUSAGE_STATICDECL | WINED3DUSAGE_OVERLAY | WINED3DUSAGE_SCRATCH + | WINED3DUSAGE_MANAGED | WINED3DUSAGE_PRIVATE | WINED3DUSAGE_LEGACY_CUBEMAP | WINED3DUSAGE_TEXTURE @@ -92,6 +93,12 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * wined3d_debug_resource_access(access)); return WINED3DERR_INVALIDCALL; } + if (usage & WINED3DUSAGE_MANAGED && ~access & (WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU)) + { + ERR("Trying to create a managed resource with access flags %s.\n", + wined3d_debug_resource_access(access)); + return WINED3DERR_INVALIDCALL; + } if (!size) ERR("Attempting to create a zero-sized resource.\n"); @@ -258,7 +265,7 @@ DWORD CDECL wined3d_resource_set_priority(struct wined3d_resource *resource, DWO { DWORD prev; - if (!wined3d_resource_access_is_managed(resource->access)) + if (~resource->usage & WINED3DUSAGE_MANAGED) { WARN("Called on non-managed resource %p, ignoring.\n", resource); return 0; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e01becd44f8..9c19e4e9fb6 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1410,10 +1410,9 @@ DWORD CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod) /* The d3d9:texture test shows that SetLOD is ignored on non-managed * textures. The call always returns 0, and GetLOD always returns 0. */ resource = &texture->resource; - if (!wined3d_resource_access_is_managed(resource->access)) + if (~resource->usage & WINED3DUSAGE_MANAGED) { - TRACE("Ignoring LOD on texture with resource access %s.\n", - wined3d_debug_resource_access(resource->access)); + TRACE("Ignoring LOD on texture with resource usage %s.\n", debug_d3dusage(resource->usage)); return 0; } @@ -2898,11 +2897,10 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc } format = wined3d_get_format(device->adapter, desc->format, desc->bind_flags); - if (desc->usage & WINED3DUSAGE_DYNAMIC && (wined3d_resource_access_is_managed(desc->access) - || desc->usage & WINED3DUSAGE_SCRATCH)) + if (desc->usage & WINED3DUSAGE_DYNAMIC + && desc->usage & (WINED3DUSAGE_MANAGED | WINED3DUSAGE_SCRATCH)) { - WARN("Attempted to create a dynamic texture with access %s and usage %s.\n", - wined3d_debug_resource_access(desc->access), debug_d3dusage(desc->usage)); + WARN("Attempted to create a dynamic texture with usage %s.\n", debug_d3dusage(desc->usage)); return WINED3DERR_INVALIDCALL; } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a7b1b10f9ac..5edea43c510 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4524,6 +4524,8 @@ const char *debug_d3dusage(DWORD usage) WINED3DUSAGE_TO_STR(WINED3DUSAGE_RESTRICT_SHARED_RESOURCE); WINED3DUSAGE_TO_STR(WINED3DUSAGE_DMAP); WINED3DUSAGE_TO_STR(WINED3DUSAGE_TEXTAPI); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_MANAGED); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_PRIVATE); WINED3DUSAGE_TO_STR(WINED3DUSAGE_LEGACY_CUBEMAP); WINED3DUSAGE_TO_STR(WINED3DUSAGE_TEXTURE); WINED3DUSAGE_TO_STR(WINED3DUSAGE_OWNDC); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5b7ddfce10d..d53f0ccc192 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3083,11 +3083,6 @@ const char *wined3d_debug_bind_flags(DWORD bind_flags) DECLSPEC_HIDDEN; const char *wined3d_debug_view_desc(const struct wined3d_view_desc *d, const struct wined3d_resource *resource) DECLSPEC_HIDDEN; -static inline BOOL wined3d_resource_access_is_managed(unsigned int access) -{ - return !(~access & (WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU)); -} - struct wined3d_resource_ops { ULONG (*resource_incref)(struct wined3d_resource *resource); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index fd907578c2d..4fd80dca27d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -930,6 +930,7 @@ enum wined3d_shader_type #define WINED3DUSAGE_MASK 0x10007bfa #define WINED3DUSAGE_SCRATCH 0x00200000 +#define WINED3DUSAGE_MANAGED 0x00000004 #define WINED3DUSAGE_PRIVATE 0x00400000 #define WINED3DUSAGE_LEGACY_CUBEMAP 0x00800000 #define WINED3DUSAGE_TEXTURE 0x01000000 -- 2.18.1

5 years, 4 months

[PATCH 1/4] setupapi: Implement SetupDiRemoveDeviceInterface().

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 28 ++++++++++++++++++++++++---- dlls/setupapi/tests/devinst.c | 2 -- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 55fca897c3..479b8297b0 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -556,6 +556,19 @@ static BOOL SETUPDI_SetDeviceRegistryPropertyW(struct device *device, return FALSE; } +static void remove_device_iface(struct device_iface *iface) +{ + RegDeleteTreeW(iface->refstr_key, NULL); + RegDeleteKeyW(iface->refstr_key, emptyW); + RegCloseKey(iface->refstr_key); + iface->refstr_key = NULL; + /* Also remove the class key if it's empty. */ + RegDeleteKeyW(iface->class_key, emptyW); + RegCloseKey(iface->class_key); + iface->class_key = NULL; + iface->flags |= SPINT_REMOVED; +} + static void SETUPDI_RemoveDevice(struct device *device) { struct device_iface *iface, *next; @@ -1537,11 +1550,18 @@ BOOL WINAPI SetupDiRemoveDevice( /*********************************************************************** * SetupDiRemoveDeviceInterface (SETUPAPI.@) */ -BOOL WINAPI SetupDiRemoveDeviceInterface(HDEVINFO info, PSP_DEVICE_INTERFACE_DATA data) +BOOL WINAPI SetupDiRemoveDeviceInterface(HDEVINFO devinfo, SP_DEVICE_INTERFACE_DATA *iface_data) { - FIXME("(%p, %p): stub\n", info, data); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + struct device_iface *iface; + + TRACE("devinfo %p, iface_data %p.\n", devinfo, iface_data); + + if (!(iface = get_device_iface(devinfo, iface_data))) + return FALSE; + + remove_device_iface(iface); + + return TRUE; } /*********************************************************************** diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 338393e5f2..fbc62dcbb9 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -552,7 +552,6 @@ static void check_device_iface_(int line, HDEVINFO set, SP_DEVINFO_DATA *device, ok_(__FILE__, line)(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); ok_(__FILE__, line)(IsEqualGUID(&iface.InterfaceClassGuid, class), "Got unexpected class %s.\n", wine_dbgstr_guid(&iface.InterfaceClassGuid)); -todo_wine_if(flags & SPINT_REMOVED) ok_(__FILE__, line)(iface.Flags == flags, "Got unexpected flags %#x.\n", iface.Flags); ret = SetupDiGetDeviceInterfaceDetailA(set, &iface, detail, sizeof(buffer), NULL, NULL); ok_(__FILE__, line)(ret, "Failed to get interface detail, error %#x.\n", GetLastError()); @@ -656,7 +655,6 @@ static void test_device_iface(void) ret = SetupDiEnumDeviceInterfaces(set, &device, &guid2, 0, &iface); ok(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); ret = SetupDiRemoveDeviceInterface(set, &iface); -todo_wine ok(ret, "Failed to remove interface, error %#x.\n", GetLastError()); check_device_iface(set, &device, &guid2, 0, SPINT_REMOVED, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A5-3F65-11DB-B704-0011955C2BDB}"); -- 2.14.1

5 years, 4 months

[PATCH 4/4] jscript: Add interpreter support for getters and setters in object initializer.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/compile.c | 9 ++---- dlls/jscript/engine.c | 24 +++++++++++++- dlls/jscript/engine.h | 2 +- dlls/mshtml/tests/es5.js | 69 +++++++++++++++++++++++++++++++++++++++- 4 files changed, 95 insertions(+), 9 deletions(-)

5 years, 4 months

[PATCH 3/4] jscript: Add parser support for getters and setters in object initializer.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/engine.h | 6 ++++++ dlls/jscript/lex.c | 17 ++++++++++++++--- dlls/jscript/parser.h | 1 + dlls/jscript/parser.y | 29 +++++++++++++++++++++-------- dlls/jscript/tests/lang.js | 2 ++ 5 files changed, 44 insertions(+), 11 deletions(-)

5 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel November 2018