July 2012 - Wine-commits - list.winehq.org

Jacek Caban : jscript: Properly handle builtin properties in Object. prototype.hasOwnProperty implementation.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 10179c210e5a9e09808f6f03009a855cc373b00f URL: http://source.winehq.org/git/wine.git/?a=commit;h=10179c210e5a9e09808f6f030… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 23 15:53:52 2012 +0200 jscript: Properly handle builtin properties in Object.prototype.hasOwnProperty implementation. --- dlls/jscript/dispex.c | 9 ++++----- dlls/jscript/jscript.h | 2 +- dlls/jscript/object.c | 12 +++++++++--- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 909ed37..501ce4a 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1388,16 +1388,15 @@ HRESULT jsdisp_delete_idx(jsdisp_t *obj, DWORD idx) return delete_prop(prop); } -VARIANT_BOOL jsdisp_is_own_prop(jsdisp_t *obj, BSTR name) +HRESULT jsdisp_is_own_prop(jsdisp_t *obj, BSTR name, VARIANT_BOOL *ret) { dispex_prop_t *prop; HRESULT hres; hres = find_prop_name(obj, string_hash(name), name, &prop); if(FAILED(hres)) - return VARIANT_FALSE; - else if(!prop) - return VARIANT_FALSE; + return hres; - return prop->type==PROP_VARIANT ? VARIANT_TRUE : VARIANT_FALSE; + *ret = prop && (prop->type == PROP_VARIANT || prop->type == PROP_BUILTIN) ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 484049c..5d82db0 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -222,7 +222,7 @@ HRESULT jsdisp_propget_name(jsdisp_t*,LPCWSTR,VARIANT*,jsexcept_t*) DECLSPEC_HID HRESULT jsdisp_get_idx(jsdisp_t*,DWORD,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_id(jsdisp_t*,const WCHAR*,DWORD,DISPID*) DECLSPEC_HIDDEN; HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN; -VARIANT_BOOL jsdisp_is_own_prop(jsdisp_t *obj, BSTR name) DECLSPEC_HIDDEN; +HRESULT jsdisp_is_own_prop(jsdisp_t*,BSTR,VARIANT_BOOL*) DECLSPEC_HIDDEN; HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 173c227..6ba253d 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -110,7 +110,6 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl VARIANT *retv, jsexcept_t *ei) { BSTR name; - BOOL result; DISPID id; HRESULT hres; @@ -130,14 +129,21 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl return hres; if(is_jsdisp(jsthis)) { - result = jsdisp_is_own_prop(jsthis->u.jsdisp, name); + VARIANT_BOOL result; + + hres = jsdisp_is_own_prop(jsthis->u.jsdisp, name, &result); + if(FAILED(hres)) + return hres; + if(retv) { V_VT(retv) = VT_BOOL; V_BOOL(retv) = result; } return S_OK; - } else if(is_dispex(jsthis)) { + } + + if(is_dispex(jsthis)) { hres = IDispatchEx_GetDispID(jsthis->u.dispex, name, make_grfdex(ctx, fdexNameCaseSensitive), &id); } else {

1 0

Jacek Caban : jscript: Added more tests.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: de6e95213ae988c7accc4e04bce5ecc97d83a15d URL: http://source.winehq.org/git/wine.git/?a=commit;h=de6e95213ae988c7accc4e04b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 23 15:54:01 2012 +0200 jscript: Added more tests. --- dlls/jscript/tests/api.js | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index f6b22d3..f8885dd 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -198,6 +198,19 @@ tmp = "aA1~`!@#$%^&*()_+=-][{}';:/.,<>?\|"; ok(escape(tmp) === "aA1%7E%60%21@%23%24%25%5E%26*%28%29_+%3D-%5D%5B%7B%7D%27%3B%3A/.%2C%3C%3E%3F%7C", "escape('" + tmp + "') = " + escape(tmp)); ok(unescape(escape(tmp)) === tmp, "unescape(escape('" + tmp + "')) = " + unescape(escape(tmp))); +ok(Object.prototype.hasOwnProperty('toString'), "Object.prototype.hasOwnProperty('toString') is false"); +ok(Object.prototype.hasOwnProperty('isPrototypeOf'), "Object.prototype.hasOwnProperty('isPrototypeOf') is false"); +ok(Function.prototype.hasOwnProperty('call'), "Function.prototype.hasOwnProperty('call') is false"); + +obj = new Object(); + +ok(!obj.hasOwnProperty('toString'), "obj.hasOwnProperty('toString') is true"); +ok(!obj.hasOwnProperty('isPrototypeOf'), "obj.hasOwnProperty('isPrototypeOf') is true"); +ok(!Object.hasOwnProperty('toString'), "Object.hasOwnProperty('toString') is true"); +ok(!Object.hasOwnProperty('isPrototypeOf'), "Object.hasOwnProperty('isPrototypeOf') is true"); +ok(!parseFloat.hasOwnProperty('call'), "parseFloat.hasOwnProperty('call') is true"); +ok(!Function.hasOwnProperty('call'), "Function.hasOwnProperty('call') is true"); + tmp = "" + new Object(); ok(tmp === "[object Object]", "'' + new Object() = " + tmp); (tmp = new Array).f = Object.prototype.toString; @@ -225,6 +238,11 @@ ok(tmp === "[object Object]", "toString.call(arguments) = " + tmp); tmp = Object.prototype.toString.call(new VBArray(createArray())); ok(tmp === "[object Object]", "toString.call(new VBArray()) = " + tmp); +function TSTestConstr() {} +TSTestConstr.prototype = { toString: function() { return "test"; } }; +obj = new TSTestConstr(); +ok(obj.toString() === "test", "obj.toString() = " + obj.toString()); + ok(Object(1) instanceof Number, "Object(1) is not instance of Number"); ok(Object("") instanceof String, "Object('') is not instance of String"); ok(Object(false) instanceof Boolean, "Object(false) is not instance of Boolean");

1 0

Francois Gouget : winex11.drv: Don't include wgl_driver. h if OpenGL is not supported.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: baf0a74b11ef955b367522bcacbe226c0c7a489d URL: http://source.winehq.org/git/wine.git/?a=commit;h=baf0a74b11ef955b367522bca… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jul 23 18:40:09 2012 +0200 winex11.drv: Don't include wgl_driver.h if OpenGL is not supported. --- dlls/winex11.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index c4b364e..e958132 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -48,7 +48,6 @@ #include "x11drv.h" #include "winternl.h" -#include "wine/wgl_driver.h" #include "wine/library.h" #include "wine/debug.h" @@ -59,6 +58,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wgl); WINE_DECLARE_DEBUG_CHANNEL(winediag); WINE_DECLARE_DEBUG_CHANNEL(fps); +#include "wine/wgl_driver.h" #include "wine/wglext.h" /* For compatibility with old Mesa headers */

1 0

Francois Gouget : d3dcompiler_43: Add a trailing '\n' to a couple of Wine traces.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 28e06e3fb08c3ada75f4acf0eca83d013323089a URL: http://source.winehq.org/git/wine.git/?a=commit;h=28e06e3fb08c3ada75f4acf0e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jul 23 18:40:29 2012 +0200 d3dcompiler_43: Add a trailing '\n' to a couple of Wine traces. --- dlls/d3dcompiler_43/utils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 2072a66..915871d 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1442,7 +1442,7 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assig type = left->data_type; else { - FIXME("Assignments with writemasks not supported yet."); + FIXME("Assignments with writemasks not supported yet.\n"); type = NULL; } assign->node.type = HLSL_IR_ASSIGNMENT; @@ -1478,7 +1478,7 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assig converted_rhs = implicit_conversion(rhs, type, &rhs->loc); if (!converted_rhs) { - ERR("Couldn't implicitly convert expression to %s.", debug_hlsl_type(type)); + ERR("Couldn't implicitly convert expression to %s.\n", debug_hlsl_type(type)); free_instr(lhs); free_instr(rhs); return NULL;

1 0

Francois Gouget : d3dcompiler_43: Make some functions static.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 285b9340f13be94ee649cc3b66bd6ee7a438a09a URL: http://source.winehq.org/git/wine.git/?a=commit;h=285b9340f13be94ee649cc3b6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jul 23 18:41:05 2012 +0200 d3dcompiler_43: Make some functions static. --- dlls/d3dcompiler_43/utils.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 915871d..9c4f6ca 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -952,7 +952,7 @@ static BOOL convertible_data_type(struct hlsl_type *type) return type->type != HLSL_CLASS_OBJECT; } -BOOL implicit_compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t2) +static BOOL implicit_compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t2) { if (!convertible_data_type(t1) || !convertible_data_type(t2)) return FALSE; @@ -1043,7 +1043,7 @@ static BOOL expr_compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t return FALSE; } -enum hlsl_base_type expr_common_base_type(enum hlsl_base_type t1, enum hlsl_base_type t2) +static enum hlsl_base_type expr_common_base_type(enum hlsl_base_type t1, enum hlsl_base_type t2) { enum hlsl_base_type types[] = { @@ -1740,7 +1740,7 @@ static void debug_dump_ir_constant(const struct hlsl_ir_constant *constant) TRACE("}"); } -const char *debug_expr_op(const struct hlsl_ir_expr *expr) +static const char *debug_expr_op(const struct hlsl_ir_expr *expr) { static const char *op_names[] = { @@ -1843,7 +1843,7 @@ static void debug_dump_ir_constructor(const struct hlsl_ir_constructor *construc TRACE(")"); } -const char *debug_writemask(DWORD writemask) +static const char *debug_writemask(DWORD writemask) { char string[5], components[] = {'x', 'y', 'z', 'w'}; unsigned int i = 0, pos = 0; @@ -1859,7 +1859,7 @@ const char *debug_writemask(DWORD writemask) return wine_dbg_sprintf(".%s", string); } -void debug_dump_ir_assignment(const struct hlsl_ir_assignment *assign) +static void debug_dump_ir_assignment(const struct hlsl_ir_assignment *assign) { TRACE("= ("); debug_dump_instr(assign->lhs); @@ -1870,7 +1870,7 @@ void debug_dump_ir_assignment(const struct hlsl_ir_assignment *assign) TRACE(")"); } -void debug_dump_instr(const struct hlsl_ir_node *instr) +static void debug_dump_instr(const struct hlsl_ir_node *instr) { switch (instr->type) {

1 0

Alexandre Julliard : include: Fix alignment of cabinet structures on 64-bit .
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 6576986e37ba0efe4f5562b334169a8203d19af7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6576986e37ba0efe4f5562b33… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 23 12:47:57 2012 +0200 include: Fix alignment of cabinet structures on 64-bit. --- include/fci.h | 4 ++++ include/fdi.h | 8 ++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/fci.h b/include/fci.h index 6e1899d..da736bd 100644 --- a/include/fci.h +++ b/include/fci.h @@ -25,7 +25,9 @@ extern "C" { #endif /* defined(__cplusplus) */ +#ifndef _WIN64 #include <pshpack4.h> +#endif #ifndef INCLUDED_TYPES_FCI_FDI #define INCLUDED_TYPES_FCI_FDI 1 @@ -250,7 +252,9 @@ BOOL __cdecl FCIDestroy(HFCI hfci); /**********************************************************************/ +#ifndef _WIN64 #include <poppack.h> +#endif #ifdef __cplusplus } /* extern "C" */ diff --git a/include/fdi.h b/include/fdi.h index f36baaf..2044c59 100644 --- a/include/fdi.h +++ b/include/fdi.h @@ -25,7 +25,9 @@ extern "C" { #endif /* defined(__cplusplus) */ +#ifndef _WIN64 #include <pshpack4.h> +#endif #ifndef INCLUDED_TYPES_FCI_FDI #define INCLUDED_TYPES_FCI_FDI 1 @@ -259,14 +261,18 @@ typedef INT_PTR (__cdecl *PFNFDINOTIFY)(FDINOTIFICATIONTYPE fdint, #define FNFDINOTIFY(fn) INT_PTR __cdecl fn(FDINOTIFICATIONTYPE fdint, \ PFDINOTIFICATION pfdin) +#ifndef _WIN64 #include <pshpack1.h> +#endif typedef struct { char ach[2]; /* Set to { '*', '\0' } */ LONG cbFile; /* Required spill file size */ } FDISPILLFILE, *PFDISPILLFILE; +#ifndef _WIN64 #include <poppack.h> +#endif #define cpuUNKNOWN (-1) /* FDI does detection */ #define cpu80286 (0) /* '286 opcodes only */ @@ -284,7 +290,9 @@ BOOL __cdecl FDITruncateCabinet(HFDI, char *, USHORT); /**********************************************************************/ +#ifndef _WIN64 #include <poppack.h> +#endif #ifdef __cplusplus } /* extern "C" */

1 0

Nikolay Sivov : advapi32/tests: Add some more well known SIDs to tests.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: a56f3c665e436f5faf819a7146da419efe309858 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a56f3c665e436f5faf819a714… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 22 20:13:14 2012 +0400 advapi32/tests: Add some more well known SIDs to tests. --- dlls/advapi32/tests/security.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 3fc9930..28e43ec 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1655,7 +1655,8 @@ static const struct well_known_sid_value /* 66 */ {TRUE, "S-1-16-4096"}, {TRUE, "S-1-16-8192"}, {TRUE, "S-1-16-12288"}, /* 69 */ {TRUE, "S-1-16-16384"}, {TRUE, "S-1-5-33"}, {TRUE, "S-1-3-4"}, /* 72 */ {FALSE, "S-1-5-21-12-23-34-45-56-571"}, {FALSE, "S-1-5-21-12-23-34-45-56-572"}, -/* 74 */ {TRUE, "S-1-5-22"}, {FALSE, "S-1-5-21-12-23-34-45-56-521"}, {TRUE, "S-1-5-32-573"} +/* 74 */ {TRUE, "S-1-5-22"}, {FALSE, "S-1-5-21-12-23-34-45-56-521"}, {TRUE, "S-1-5-32-573"}, +/* 77 */ {FALSE, "S-1-5-21-12-23-34-45-56-498"}, {TRUE, "S-1-5-32-574"}, {TRUE, "S-1-16-8448"} }; static void test_CreateWellKnownSid(void) @@ -1720,7 +1721,7 @@ static void test_CreateWellKnownSid(void) expect_eq(GetSidLengthRequired(*GetSidSubAuthorityCount(sid_buffer)), cb, DWORD, "%d"); ok(IsValidSid(sid_buffer), "The sid is not valid\n"); ok(pConvertSidToStringSidA(sid_buffer, &str), "Couldn't convert SID to string\n"); - ok(strcmp(str, value->sid_string) == 0, "SID mismatch - expected %s, got %s\n", + ok(strcmp(str, value->sid_string) == 0, "%d: SID mismatch - expected %s, got %s\n", i, value->sid_string, str); LocalFree(str);

1 0

Nikolay Sivov : kernel32: Added GetSystemDefaultLocaleName().
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: b586be515ccb404e481393066d83839d5ecc34b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b586be515ccb404e481393066… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 22 11:41:20 2012 +0400 kernel32: Added GetSystemDefaultLocaleName(). --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 8 ++++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c5518ce..5906ca3 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -634,6 +634,7 @@ @ stdcall GetStringTypeW(long wstr long ptr) @ stdcall GetSystemDefaultLCID() @ stdcall GetSystemDefaultLangID() +@ stdcall GetSystemDefaultLocaleName(ptr long) @ stdcall GetSystemDefaultUILanguage() @ stdcall GetSystemDEPPolicy() @ stdcall GetSystemDirectoryA(ptr long) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index d627bdb..ac708c3 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -931,6 +931,14 @@ LCID WINAPI GetSystemDefaultLCID(void) return lcid; } +/*********************************************************************** + * GetSystemDefaultLocaleName (KERNEL32.@) + */ +INT WINAPI GetSystemDefaultLocaleName(LPWSTR localename, INT len) +{ + LCID lcid = GetSystemDefaultLCID(); + return LCIDToLocaleName(lcid, localename, len, 0); +} /*********************************************************************** * GetUserDefaultUILanguage (KERNEL32.@)

1 0

Nikolay Sivov : kernel32: Forward GetLocaleInfoEx() to GetLocaleInfoW().
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 77ad893a7bb9797fb81a236cc3f915b5a86da4e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77ad893a7bb9797fb81a236cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 22 11:43:08 2012 +0400 kernel32: Forward GetLocaleInfoEx() to GetLocaleInfoW(). --- dlls/kernel32/locale.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index ac708c3..0afe89d 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1416,14 +1416,10 @@ INT WINAPI GetLocaleInfoW( LCID lcid, LCTYPE lctype, LPWSTR buffer, INT len ) /****************************************************************************** * GetLocaleInfoEx (KERNEL32.@) - * - * FIXME: Should probably be a wrapper around GetLocaleInfo() (or vice-versa). */ INT WINAPI GetLocaleInfoEx(LPCWSTR locale, LCTYPE info, LPWSTR buffer, INT len) { - FIXME("(locale=%s,info=0x%x,%p,%d): stub!\n", debugstr_w(locale), info, buffer, len); - SetLastError(ERROR_INVALID_PARAMETER); - return 0; + return GetLocaleInfoW(LocaleNameToLCID(locale, 0), info, buffer, len); } /******************************************************************************

1 0

Nikolay Sivov : kernel32: Added InitOnceInitialize() implementation.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: b1c3c8c898669a1d1c0b927a158116ce2172e5f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1c3c8c898669a1d1c0b927a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 22 18:33:14 2012 +0400 kernel32: Added InitOnceInitialize() implementation. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/tests/sync.c | 18 ++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/sync.c | 5 +++++ include/winbase.h | 7 +++++++ include/winnt.h | 7 +++++++ 6 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 5906ca3..a916309 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -747,6 +747,7 @@ @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) @ stdcall InitializeCriticalSectionEx(ptr long long) @ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead +@ stdcall InitOnceInitialize(ptr) ntdll.RtlRunOnceInitialize @ stdcall -arch=i386 InterlockedCompareExchange (ptr long long) @ stdcall -arch=i386 -ret64 InterlockedCompareExchange64(ptr int64 int64) ntdll.RtlInterlockedCompareExchange64 @ stdcall -arch=i386 InterlockedDecrement(ptr) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 4068b22..ccb21bb 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -37,6 +37,7 @@ static BOOL (WINAPI *pDeleteTimerQueueTimer)(HANDLE, HANDLE, HANDLE); static HANDLE (WINAPI *pOpenWaitableTimerA)(DWORD,BOOL,LPCSTR); static HANDLE (WINAPI *pCreateMemoryResourceNotification)(MEMORY_RESOURCE_NOTIFICATION_TYPE); static BOOL (WINAPI *pQueryMemoryResourceNotification)(HANDLE, PBOOL); +static VOID (WINAPI *pInitOnceInitialize)(PINIT_ONCE); static void test_signalandwait(void) { @@ -1135,6 +1136,21 @@ static void test_WaitForMultipleObjects(void) if (maxevents[i]) CloseHandle(maxevents[i]); } +static void test_initonce(void) +{ + INIT_ONCE initonce; + + if (!pInitOnceInitialize) + { + win_skip("one-time initialization API not supported\n"); + return; + } + + initonce.Ptr = (void*)0xdeadbeef; + pInitOnceInitialize(&initonce); + ok(initonce.Ptr == NULL, "got %p\n", initonce.Ptr); +} + START_TEST(sync) { HMODULE hdll = GetModuleHandle("kernel32"); @@ -1147,6 +1163,7 @@ START_TEST(sync) pOpenWaitableTimerA = (void*)GetProcAddress(hdll, "OpenWaitableTimerA"); pCreateMemoryResourceNotification = (void *)GetProcAddress(hdll, "CreateMemoryResourceNotification"); pQueryMemoryResourceNotification = (void *)GetProcAddress(hdll, "QueryMemoryResourceNotification"); + pInitOnceInitialize = (void *)GetProcAddress(hdll, "InitOnceInitialize"); test_signalandwait(); test_mutex(); @@ -1158,4 +1175,5 @@ START_TEST(sync) test_timer_queue(); test_WaitForSingleObject(); test_WaitForMultipleObjects(); + test_initonce(); } diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 8de353f..4ace865 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -815,6 +815,7 @@ @ stub RtlRevertMemoryStream @ stub RtlRunDecodeUnicodeString @ stub RtlRunEncodeUnicodeString +@ stdcall RtlRunOnceInitialize(ptr) @ stdcall RtlSecondsSince1970ToTime(long ptr) @ stdcall RtlSecondsSince1980ToTime(long ptr) # @ stub RtlSeekMemoryStream diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index f759ce6..09151a9 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1463,3 +1463,8 @@ NTSTATUS NTDLL_AddCompletion( HANDLE hFile, ULONG_PTR CompletionValue, SERVER_END_REQ; return status; } + +VOID NTAPI RtlRunOnceInitialize(PRTL_RUN_ONCE initonce) +{ + initonce->Ptr = NULL; +} diff --git a/include/winbase.h b/include/winbase.h index 8b5805c..532dbcd 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1316,6 +1316,12 @@ typedef struct _WIN32_STREAM_ID { #define LOGON_NETCREDENTIALS_ONLY 0x00000002 #define LOGON_ZERO_PASSWORD_BUFFER 0x80000000 +/* one-time initialisation API */ +typedef RTL_RUN_ONCE INIT_ONCE; +typedef PRTL_RUN_ONCE PINIT_ONCE; +typedef PRTL_RUN_ONCE LPINIT_ONCE; +#define INIT_ONCE_STATIC_INIT RTL_RUN_ONCE_INIT + WINBASEAPI BOOL WINAPI ActivateActCtx(HANDLE,ULONG_PTR *); WINADVAPI BOOL WINAPI AddAccessAllowedAce(PACL,DWORD,DWORD,PSID); WINADVAPI BOOL WINAPI AddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID); @@ -1876,6 +1882,7 @@ WINADVAPI BOOL WINAPI InitializeSecurityDescriptor(PSECURITY_DESCRIPTOR, WINADVAPI BOOL WINAPI InitializeSid(PSID,PSID_IDENTIFIER_AUTHORITY,BYTE); WINBASEAPI VOID WINAPI InitializeSListHead(PSLIST_HEADER); WINBASEAPI VOID WINAPI InitializeSRWLock(PSRWLOCK); +WINBASEAPI VOID WINAPI InitOnceInitialize(PINIT_ONCE); WINBASEAPI PSLIST_ENTRY WINAPI InterlockedFlushSList(PSLIST_HEADER); WINBASEAPI PSLIST_ENTRY WINAPI InterlockedPopEntrySList(PSLIST_HEADER); WINBASEAPI PSLIST_ENTRY WINAPI InterlockedPushEntrySList(PSLIST_HEADER, PSLIST_ENTRY); diff --git a/include/winnt.h b/include/winnt.h index 16cc4e9..d65e2f6 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5087,6 +5087,13 @@ typedef struct _RTL_SRWLOCK { typedef VOID (NTAPI * WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN ); typedef VOID (NTAPI * PFLS_CALLBACK_FUNCTION) ( PVOID ); +#define RTL_RUN_ONCE_INIT {0} +typedef union _RTL_RUN_ONCE { + PVOID Ptr; +} RTL_RUN_ONCE, *PRTL_RUN_ONCE; + +NTSYSAPI VOID NTAPI RtlRunOnceInitialize(PRTL_RUN_ONCE); + #include <pshpack8.h> typedef struct _IO_COUNTERS { ULONGLONG DECLSPEC_ALIGN(8) ReadOperationCount;

1 0