August 2013 - Wine-commits - list.winehq.org

Jacek Caban : widl: Increase version number stored in custom data.
by Alexandre Julliard 29 Aug '13

29 Aug '13

Module: wine Branch: master Commit: 2510ec477bba134c753302795d55226a44f42df3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2510ec477bba134c753302795… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 29 15:09:05 2013 +0200 widl: Increase version number stored in custom data. --- tools/widl/write_msft.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index d938d00..dd98486 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2566,7 +2566,7 @@ int create_msft_typelib(typelib_t *typelib) const statement_t *stmt; time_t cur_time; char *time_override; - unsigned int version = 5 << 24 | 1 << 16 | 164; /* 5.01.0164 */ + unsigned int version = 7 << 24 | 555; /* 7.00.0555 */ GUID midl_time_guid = {0xde77ba63,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; GUID midl_version_guid = {0xde77ba64,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; GUID midl_info_guid = {0xde77ba65,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}};

1 0

Jacek Caban : widl: Generate names for imported nameless typedefs.
by Alexandre Julliard 29 Aug '13

29 Aug '13

Module: wine Branch: master Commit: 7e4462e28e9f66b61891683b77180d04148b06f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e4462e28e9f66b61891683b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 29 15:09:21 2013 +0200 widl: Generate names for imported nameless typedefs. --- tools/widl/parser.y | 4 ++-- tools/widl/widl.c | 5 +++-- tools/widl/widl.h | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 5751598..97c3896 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1840,7 +1840,7 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at type_get_type_detect_alias(type) == TYPE_STRUCT || type_get_type_detect_alias(type) == TYPE_UNION || type_get_type_detect_alias(type) == TYPE_ENCAPSULATED_UNION) && - !type->name && !parse_only) + !type->name) { if (! is_attr(attrs, ATTR_PUBLIC) && ! is_attr (attrs, ATTR_HIDDEN)) attrs = append_attr( attrs, make_attr(ATTR_PUBLIC) ); @@ -1980,7 +1980,7 @@ static char *gen_name(void) if (! file_id) { - char *dst = dup_basename(input_name, ".idl"); + char *dst = dup_basename(input_idl_name, ".idl"); file_id = dst; for (; *dst; ++dst) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 2ff1977..b37a0f8 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -118,6 +118,7 @@ int do_rt_extension = 0; static enum stub_mode stub_mode = MODE_Os; char *input_name; +char *input_idl_name; char *header_name; char *local_stubs_name; char *header_token; @@ -488,7 +489,7 @@ void write_id_data(const statement_list_t *stmts) } fprintf(idfile, "/*** Autogenerated by WIDL %s ", PACKAGE_VERSION); - fprintf(idfile, "from %s - Do not edit ***/\n\n", input_name); + fprintf(idfile, "from %s - Do not edit ***/\n\n", input_idl_name); fprintf(idfile, "#include <rpc.h>\n"); fprintf(idfile, "#include <rpcndr.h>\n\n"); fprintf(idfile, "#include <initguid.h>\n\n"); @@ -706,7 +707,7 @@ int main(int argc,char *argv[]) return 1; } else - input_name = xstrdup(argv[optind]); + input_idl_name = input_name = xstrdup(argv[optind]); } else { fprintf(stderr, "%s", usage); diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 91054ad..9e09f76 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -52,6 +52,7 @@ extern int win64_packing; extern int do_rt_extension; extern char *input_name; +extern char *input_idl_name; extern char *header_name; extern char *header_token; extern char *local_stubs_name;

1 0

Jacek Caban : guiddef.h: Better GUID declaration for widl.
by Alexandre Julliard 29 Aug '13

29 Aug '13

Module: wine Branch: master Commit: 21c395cbfac70fafb4cb54da0299efc52cf63868 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21c395cbfac70fafb4cb54da0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 29 15:09:40 2013 +0200 guiddef.h: Better GUID declaration for widl. --- include/guiddef.h | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/include/guiddef.h b/include/guiddef.h index b7de1b1..36c932c 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -18,6 +18,16 @@ #ifndef GUID_DEFINED #define GUID_DEFINED + +#ifdef __WIDL__ +typedef struct +{ + unsigned long Data1; + unsigned short Data2; + unsigned short Data3; + byte Data4[ 8 ]; +} GUID; +#else typedef struct _GUID { #ifdef _MSC_VER @@ -29,6 +39,7 @@ typedef struct _GUID unsigned short Data3; unsigned char Data4[ 8 ]; } GUID; +#endif /* Macros for __uuidof emulation */ #if defined(__cplusplus) && !defined(_MSC_VER)

1 0

Alexandre Julliard : ntdll: Use a RunOnce function to initialize directory lookup options.
by Alexandre Julliard 29 Aug '13

29 Aug '13

Module: wine Branch: master Commit: d191d5bca01c8e517daf3f7c4019cce09ede62bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d191d5bca01c8e517daf3f7c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 29 16:48:23 2013 +0200 ntdll: Use a RunOnce function to initialize directory lookup options. --- dlls/ntdll/directory.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index cf89879..f65cc9f 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -157,7 +157,8 @@ union file_directory_info FILE_ID_FULL_DIRECTORY_INFORMATION id_full; }; -static int show_dot_files = -1; +static BOOL show_dot_files; +static RTL_RUN_ONCE init_once = RTL_RUN_ONCE_INIT; /* at some point we may want to allow Winelib apps to set this */ static const int is_case_sensitive = FALSE; @@ -1036,7 +1037,7 @@ static BOOLEAN get_dir_case_sensitivity( const char *dir ) * * Initialize the show_dot_files options. */ -static void init_options(void) +static DWORD WINAPI init_options( RTL_RUN_ONCE *once, void *param, void **context ) { static const WCHAR WineW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e',0}; static const WCHAR ShowDotFilesW[] = {'S','h','o','w','D','o','t','F','i','l','e','s',0}; @@ -1046,8 +1047,6 @@ static void init_options(void) OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; - show_dot_files = 0; - RtlOpenCurrentUser( KEY_ALL_ACCESS, &root ); attr.Length = sizeof(attr); attr.RootDirectory = root; @@ -1077,6 +1076,7 @@ static void init_options(void) #ifdef linux ignore_file( "/sys" ); #endif + return TRUE; } @@ -1089,7 +1089,8 @@ BOOL DIR_is_hidden_file( const UNICODE_STRING *name ) { WCHAR *p, *end; - if (show_dot_files == -1) init_options(); + RtlRunOnceExecuteOnce( &init_once, init_options, NULL, NULL ); + if (show_dot_files) return FALSE; end = p = name->Buffer + name->Length/sizeof(WCHAR); @@ -2053,9 +2054,9 @@ NTSTATUS WINAPI NtQueryDirectoryFile( HANDLE handle, HANDLE event, io->Information = 0; - RtlEnterCriticalSection( &dir_section ); + RtlRunOnceExecuteOnce( &init_once, init_options, NULL, NULL ); - if (show_dot_files == -1) init_options(); + RtlEnterCriticalSection( &dir_section ); cwd = open( ".", O_RDONLY ); if (fchdir( fd ) != -1)

1 0

Alexandre Julliard : ntdll: Use a RunOnce function to initialize relay debugging options.
by Alexandre Julliard 29 Aug '13

29 Aug '13

Module: wine Branch: master Commit: 3d83da047a06a7a089acb50058255ecd026dd8f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d83da047a06a7a089acb5005… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 29 16:49:43 2013 +0200 ntdll: Use a RunOnce function to initialize relay debugging options. --- dlls/ntdll/relay.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index b6790da..57ad2e1 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -81,7 +81,7 @@ static const WCHAR **debug_from_relay_includelist; static const WCHAR **debug_from_snoop_excludelist; static const WCHAR **debug_from_snoop_includelist; -static BOOL init_done; +static RTL_RUN_ONCE init_once = RTL_RUN_ONCE_INIT; /* compare an ASCII and a Unicode string without depending on the current codepage */ static inline int strcmpAW( const char *strA, const WCHAR *strW ) @@ -172,7 +172,7 @@ static const WCHAR **load_list( HKEY hkey, const WCHAR *value ) * * Build the relay include/exclude function lists. */ -static void init_debug_lists(void) +static DWORD WINAPI init_debug_lists( RTL_RUN_ONCE *once, void *param, void **context ) { OBJECT_ATTRIBUTES attr; UNICODE_STRING name; @@ -189,9 +189,6 @@ static void init_debug_lists(void) static const WCHAR SnoopFromIncludeW[] = {'S','n','o','o','p','F','r','o','m','I','n','c','l','u','d','e',0}; static const WCHAR SnoopFromExcludeW[] = {'S','n','o','o','p','F','r','o','m','E','x','c','l','u','d','e',0}; - if (init_done) return; - init_done = TRUE; - RtlOpenCurrentUser( KEY_ALL_ACCESS, &root ); attr.Length = sizeof(attr); attr.RootDirectory = root; @@ -204,7 +201,7 @@ static void init_debug_lists(void) /* @@ Wine registry key: HKCU\Software\Wine\Debug */ if (NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr )) hkey = 0; NtClose( root ); - if (!hkey) return; + if (!hkey) return TRUE; debug_relay_includelist = load_list( hkey, RelayIncludeW ); debug_relay_excludelist = load_list( hkey, RelayExcludeW ); @@ -216,6 +213,7 @@ static void init_debug_lists(void) debug_from_snoop_excludelist = load_list( hkey, SnoopFromExcludeW ); NtClose( hkey ); + return TRUE; } @@ -698,7 +696,7 @@ void RELAY_SetupDLL( HMODULE module ) struct relay_private_data *data; const WORD *ordptr; - if (!init_done) init_debug_lists(); + RtlRunOnceExecuteOnce( &init_once, init_debug_lists, NULL, NULL ); exports = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &size ); if (!exports) return; @@ -855,7 +853,7 @@ void SNOOP_SetupDLL(HMODULE hmod) ULONG size32; IMAGE_EXPORT_DIRECTORY *exports; - if (!init_done) init_debug_lists(); + RtlRunOnceExecuteOnce( &init_once, init_debug_lists, NULL, NULL ); exports = RtlImageDirectoryEntryToData( hmod, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &size32 ); if (!exports || !exports->NumberOfFunctions) return;

1 0

Alexandre Julliard : winex11: Use a InitOnce function to initialize GDI device parameters.
by Alexandre Julliard 29 Aug '13

29 Aug '13

Module: wine Branch: master Commit: cf380c9c67f677fb5d3b4005fb5007577a2f2cc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf380c9c67f677fb5d3b4005f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 29 16:49:04 2013 +0200 winex11: Use a InitOnce function to initialize GDI device parameters. --- dlls/winex11.drv/init.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 8f8ff09..6e6ed17 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -39,10 +39,11 @@ static int log_pixels_y; /* pixels per logical inch in y direction */ static int horz_size; /* horz. size of screen in millimeters */ static int vert_size; /* vert. size of screen in millimeters */ static int palette_size; -static int device_init_done; static Pixmap stock_bitmap_pixmap; /* phys bitmap for the default stock bitmap */ +static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + static const WCHAR dpi_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s','\0'}; static const WCHAR dpi_value_name[] = {'L','o','g','P','i','x','e','l','s','\0'}; @@ -79,10 +80,8 @@ static DWORD get_dpi( void ) * * Perform initializations needed upon creation of the first device. */ -static void device_init(void) +static BOOL WINAPI device_init( INIT_ONCE *once, void *param, void **context ) { - device_init_done = TRUE; - /* Initialize XRender */ xrender_funcs = X11DRV_XRender_Init(); @@ -97,6 +96,7 @@ static void device_init(void) log_pixels_x = log_pixels_y = get_dpi(); horz_size = MulDiv( screen_width, 254, log_pixels_x * 10 ); vert_size = MulDiv( screen_height, 254, log_pixels_y * 10 ); + return TRUE; } @@ -104,7 +104,7 @@ static X11DRV_PDEVICE *create_x11_physdev( Drawable drawable ) { X11DRV_PDEVICE *physDev; - if (!device_init_done) device_init(); + InitOnceExecuteOnce( &init_once, device_init, NULL, NULL ); if (!(physDev = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*physDev) ))) return NULL;

1 0

Hans Leidekker : wininet: Replacing a header with an empty value deletes it .
by Alexandre Julliard 29 Aug '13

29 Aug '13

Module: wine Branch: master Commit: 1bf936c900150618717ea3c7aed0bbbfb0d397bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bf936c900150618717ea3c7a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 29 15:26:18 2013 +0200 wininet: Replacing a header with an empty value deletes it. --- dlls/wininet/http.c | 2 +- dlls/wininet/tests/http.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b6ed7df..954c98b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -6062,7 +6062,7 @@ static DWORD HTTP_ProcessHeader(http_request_t *request, LPCWSTR field, LPCWSTR { HTTP_DeleteCustomHeader( request, index ); - if (value) + if (value && value[0]) { HTTPHEADERW hdr; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index f04fc7b..bf57223 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1759,6 +1759,27 @@ static void HttpHeaders_test(void) ok(index == 1, "Index was not incremented\n"); ok(strcmp(buffer,"value3")==0, "incorrect string was returned(%s)\n",buffer); + ok(HttpAddRequestHeaders(hRequest, "Authorization: Basic\r\n", -1, HTTP_ADDREQ_FLAG_ADD), + "unable to add header %u\n", GetLastError()); + + index = 0; + buffer[0] = 0; + len = sizeof(buffer); + ok(HttpQueryInfo(hRequest, HTTP_QUERY_AUTHORIZATION|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &len, &index), + "unable to query header %u\n", GetLastError()); + ok(index == 1, "index was not incremented\n"); + ok(!strcmp(buffer, "Basic"), "incorrect string was returned (%s)\n", buffer); + + ok(HttpAddRequestHeaders(hRequest, "Authorization:\r\n", -1, HTTP_ADDREQ_FLAG_REPLACE), + "unable to remove header %u\n", GetLastError()); + + index = 0; + len = sizeof(buffer); + SetLastError(0xdeadbeef); + ok(!HttpQueryInfo(hRequest, HTTP_QUERY_AUTHORIZATION|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &len, &index), + "header still present\n"); + ok(GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "got %u\n", GetLastError()); + ok(InternetCloseHandle(hRequest), "Close request handle failed\n"); done: ok(InternetCloseHandle(hConnect), "Close connect handle failed\n");

1 0

Alexandre Julliard : ntdll: Implement the RunOnce functions.
by Alexandre Julliard 29 Aug '13

29 Aug '13

Module: wine Branch: master Commit: fcb3e60332b153ce69b579aa33b1074b8cc5295a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcb3e60332b153ce69b579aa3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 28 21:10:50 2013 +0200 ntdll: Implement the RunOnce functions. --- dlls/ntdll/ntdll.spec | 3 + dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/sync.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/thread.c | 2 + include/winnt.h | 2 +- 5 files changed, 122 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index e4ed913..dbef513 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -816,6 +816,9 @@ @ stub RtlRevertMemoryStream @ stub RtlRunDecodeUnicodeString @ stub RtlRunEncodeUnicodeString +@ stdcall RtlRunOnceBeginInitialize(ptr long ptr) +@ stdcall RtlRunOnceComplete(ptr long ptr) +@ stdcall RtlRunOnceExecuteOnce(ptr ptr ptr ptr) @ stdcall RtlRunOnceInitialize(ptr) @ stdcall RtlSecondsSince1970ToTime(long ptr) @ stdcall RtlSecondsSince1980ToTime(long ptr) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 908b72f..3d9264d 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -241,6 +241,7 @@ static inline struct ntdll_thread_data *ntdll_get_thread_data(void) } extern mode_t FILE_umask DECLSPEC_HIDDEN; +extern HANDLE keyed_event DECLSPEC_HIDDEN; /* Register functions */ diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 3198d96..f466dab 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -22,6 +22,7 @@ */ #include "config.h" +#include "wine/port.h" #include <assert.h> #include <errno.h> @@ -60,6 +61,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); +HANDLE keyed_event = NULL; + /* creates a struct security_descriptor and contained information in one contiguous piece of memory */ NTSTATUS NTDLL_create_struct_sd(PSECURITY_DESCRIPTOR nt_sd, struct security_descriptor **server_sd, data_size_t *server_sd_len) @@ -1236,7 +1239,117 @@ NTSTATUS NTDLL_AddCompletion( HANDLE hFile, ULONG_PTR CompletionValue, return status; } -VOID NTAPI RtlRunOnceInitialize(PRTL_RUN_ONCE initonce) +/****************************************************************** + * RtlRunOnceInitialize (NTDLL.@) + */ +void WINAPI RtlRunOnceInitialize( RTL_RUN_ONCE *once ) +{ + once->Ptr = NULL; +} + +/****************************************************************** + * RtlRunOnceBeginInitialize (NTDLL.@) + */ +DWORD WINAPI RtlRunOnceBeginInitialize( RTL_RUN_ONCE *once, ULONG flags, void **context ) +{ + if (flags & RTL_RUN_ONCE_CHECK_ONLY) + { + ULONG_PTR val = (ULONG_PTR)once->Ptr; + + if (flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; + if ((val & 3) != 2) return STATUS_UNSUCCESSFUL; + if (context) *context = (void *)(val & ~3); + return STATUS_SUCCESS; + } + + for (;;) + { + ULONG_PTR next, val = (ULONG_PTR)once->Ptr; + + switch (val & 3) + { + case 0: /* first time */ + if (!interlocked_cmpxchg_ptr( &once->Ptr, + (flags & RTL_RUN_ONCE_ASYNC) ? (void *)3 : (void *)1, 0 )) + return STATUS_PENDING; + break; + + case 1: /* in progress, wait */ + if (flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; + next = val & ~3; + if (interlocked_cmpxchg_ptr( &once->Ptr, (void *)((ULONG_PTR)&next | 1), + (void *)val ) == (void *)val) + NtWaitForKeyedEvent( keyed_event, &next, FALSE, NULL ); + break; + + case 2: /* done */ + if (context) *context = (void *)(val & ~3); + return STATUS_SUCCESS; + + case 3: /* in progress, async */ + if (!(flags & RTL_RUN_ONCE_ASYNC)) return STATUS_INVALID_PARAMETER; + return STATUS_PENDING; + } + } +} + +/****************************************************************** + * RtlRunOnceComplete (NTDLL.@) + */ +DWORD WINAPI RtlRunOnceComplete( RTL_RUN_ONCE *once, ULONG flags, void *context ) +{ + if ((ULONG_PTR)context & 3) return STATUS_INVALID_PARAMETER; + + if (flags & RTL_RUN_ONCE_INIT_FAILED) + { + if (context) return STATUS_INVALID_PARAMETER; + if (flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; + } + else context = (void *)((ULONG_PTR)context | 2); + + for (;;) + { + ULONG_PTR val = (ULONG_PTR)once->Ptr; + + switch (val & 3) + { + case 1: /* in progress */ + if (interlocked_cmpxchg_ptr( &once->Ptr, context, (void *)val ) != (void *)val) break; + val &= ~3; + while (val) + { + ULONG_PTR next = *(ULONG_PTR *)val; + NtReleaseKeyedEvent( keyed_event, (void *)val, FALSE, NULL ); + val = next; + } + return STATUS_SUCCESS; + + case 3: /* in progress, async */ + if (!(flags & RTL_RUN_ONCE_ASYNC)) return STATUS_INVALID_PARAMETER; + if (interlocked_cmpxchg_ptr( &once->Ptr, context, (void *)val ) != (void *)val) break; + return STATUS_SUCCESS; + + default: + return STATUS_UNSUCCESSFUL; + } + } +} + +/****************************************************************** + * RtlRunOnceExecuteOnce (NTDLL.@) + */ +DWORD WINAPI RtlRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_INIT_FN func, + void *param, void **context ) { - initonce->Ptr = NULL; + DWORD ret = RtlRunOnceBeginInitialize( once, 0, context ); + + if (ret != STATUS_PENDING) return ret; + + if (!func( once, param, context )) + { + RtlRunOnceComplete( once, RTL_RUN_ONCE_INIT_FAILED, NULL ); + return STATUS_UNSUCCESSFUL; + } + + return RtlRunOnceComplete( once, 0, context ? *context : NULL ); } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index c93a0cd..703e83c 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -308,6 +308,8 @@ HANDLE thread_init(void) fill_cpu_info(); + NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); + return exe_file; } diff --git a/include/winnt.h b/include/winnt.h index 171141e..1f71423 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5163,7 +5163,7 @@ typedef DWORD WINAPI RTL_RUN_ONCE_INIT_FN(PRTL_RUN_ONCE, PVOID, PVOID*); typedef RTL_RUN_ONCE_INIT_FN *PRTL_RUN_ONCE_INIT_FN; NTSYSAPI VOID WINAPI RtlRunOnceInitialize(PRTL_RUN_ONCE); NTSYSAPI DWORD WINAPI RtlRunOnceExecuteOnce(PRTL_RUN_ONCE,PRTL_RUN_ONCE_INIT_FN,PVOID,PVOID*); -NTSYSAPI DWORD WINAPI RtlRunOnceBeginInitialize(PRTL_RUN_ONCE, DWORD, PBOOL, PVOID*); +NTSYSAPI DWORD WINAPI RtlRunOnceBeginInitialize(PRTL_RUN_ONCE, DWORD, PVOID*); NTSYSAPI DWORD WINAPI RtlRunOnceComplete(PRTL_RUN_ONCE, DWORD, PVOID); #include <pshpack8.h>

1 0

Alexandre Julliard : kernel32: Implement the InitOnce functions.
by Alexandre Julliard 29 Aug '13

29 Aug '13

Module: wine Branch: master Commit: 1992f5005c9765bbf648ac884c8a7f9bfdaa929d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1992f5005c9765bbf648ac884… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 28 21:11:00 2013 +0200 kernel32: Implement the InitOnce functions. --- dlls/kernel32/kernel32.spec | 7 +++++-- dlls/kernel32/sync.c | 29 +++++++++++++++++++++++++++++ dlls/kernel32/tests/sync.c | 2 +- 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c9a4b5d..c0eda71 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -745,12 +745,15 @@ @ stdcall IdnToNameprepUnicode(long wstr long ptr long) @ stdcall IdnToUnicode(long wstr long ptr long) @ stdcall InitAtomTable(long) -@ stdcall InitializeSRWLock(ptr) +@ stdcall InitOnceBeginInitialize(ptr long ptr ptr) +@ stdcall InitOnceComplete(ptr long ptr) +@ stdcall InitOnceExecuteOnce(ptr ptr ptr ptr) +@ stdcall InitOnceInitialize(ptr) ntdll.RtlRunOnceInitialize @ stdcall InitializeCriticalSection(ptr) @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) @ stdcall InitializeCriticalSectionEx(ptr long long) @ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead -@ stdcall InitOnceInitialize(ptr) ntdll.RtlRunOnceInitialize +@ stdcall InitializeSRWLock(ptr) @ 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/sync.c b/dlls/kernel32/sync.c index a8133d4..5cb8e3f 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -2237,6 +2237,35 @@ BOOL WINAPI QueryMemoryResourceNotification(HANDLE handle, PBOOL state) return FALSE; } +/*********************************************************************** + * InitOnceBeginInitialize (KERNEL32.@) + */ +BOOL WINAPI InitOnceBeginInitialize( INIT_ONCE *once, DWORD flags, BOOL *pending, void **context ) +{ + NTSTATUS status = RtlRunOnceBeginInitialize( once, flags, context ); + if (status >= 0) *pending = (status == STATUS_PENDING); + else SetLastError( RtlNtStatusToDosError(status) ); + return status >= 0; +} + +/*********************************************************************** + * InitOnceComplete (KERNEL32.@) + */ +BOOL WINAPI InitOnceComplete( INIT_ONCE *once, DWORD flags, void *context ) +{ + NTSTATUS status = RtlRunOnceComplete( once, flags, context ); + if (status != STATUS_SUCCESS) SetLastError( RtlNtStatusToDosError(status) ); + return !status; +} + +/*********************************************************************** + * InitOnceExecuteOnce (KERNEL32.@) + */ +BOOL WINAPI InitOnceExecuteOnce( INIT_ONCE *once, PINIT_ONCE_FN func, void *param, void **context ) +{ + return !RtlRunOnceExecuteOnce( once, (PRTL_RUN_ONCE_INIT_FN)func, param, context ); +} + #ifdef __i386__ /*********************************************************************** diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 4cbb132..a040c59 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -1164,7 +1164,7 @@ static void test_initonce(void) if (!pInitOnceInitialize || !pInitOnceExecuteOnce) { - todo_wine win_skip("one-time initialization API not supported\n"); + win_skip("one-time initialization API not supported\n"); return; }

1 0

Nikolay Sivov : ntdll: Store all 'comClass' attributes.
by Alexandre Julliard 29 Aug '13

29 Aug '13

Module: wine Branch: master Commit: 52fc0e4e29d07517d987145d7f228572b417ea06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52fc0e4e29d07517d987145d7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 29 09:49:40 2013 +0400 ntdll: Store all 'comClass' attributes. --- dlls/kernel32/tests/actctx.c | 83 +++++++++++------ dlls/ntdll/actctx.c | 218 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 272 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52fc0e4e29d07517d9871…

1 0