March 2007 - Wine-Commits - list.winehq.org

Andrew Talbot : user32: Replace inline static with static inline.
by Alexandre Julliard March 17, 2007

March 17, 2007

Module: wine Branch: master Commit: 48d740855e339f8d15cea672f3291b88d4c5aa58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48d740855e339f8d15cea672f… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Mar 17 10:34:08 2007 +0000 user32: Replace inline static with static inline. --- dlls/user32/button.c | 14 +++++++------- dlls/user32/class.c | 6 +++--- dlls/user32/driver16.c | 2 +- dlls/user32/hook.c | 6 +++--- dlls/user32/hook16.c | 4 ++-- dlls/user32/listbox.c | 2 +- dlls/user32/menu.c | 2 +- dlls/user32/message.c | 26 +++++++++++++------------- dlls/user32/scroll.c | 2 +- dlls/user32/spy.c | 4 ++-- dlls/user32/sysparams.c | 2 +- dlls/user32/winproc.c | 2 +- dlls/user32/wnd16.c | 2 +- 13 files changed, 37 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=48d740855e339f8d15cea…

1 0

Andrew Talbot : kernel32: Replace inline static with static inline.
by Alexandre Julliard March 17, 2007

March 17, 2007

Module: wine Branch: master Commit: 503b338e8837e93bda86ea2e377dc9224330e0f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=503b338e8837e93bda86ea2e3… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Mar 17 10:22:45 2007 +0000 kernel32: Replace inline static with static inline. --- dlls/kernel32/computername.c | 2 +- dlls/kernel32/except.c | 4 ++-- dlls/kernel32/heap.c | 2 +- dlls/kernel32/instr.c | 8 ++++---- dlls/kernel32/locale.c | 4 ++-- dlls/kernel32/ne_module.c | 2 +- dlls/kernel32/path.c | 4 ++-- dlls/kernel32/process.c | 4 ++-- dlls/kernel32/relay16.c | 4 ++-- dlls/kernel32/selector.c | 2 +- dlls/kernel32/sync.c | 2 +- dlls/kernel32/thunk.c | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/computername.c b/dlls/kernel32/computername.c index 754f86c..d2c0a7c 100644 --- a/dlls/kernel32/computername.c +++ b/dlls/kernel32/computername.c @@ -180,7 +180,7 @@ static BOOL dns_domainname ( char *name, int *size ) /*********************************************************************** * _init_attr (INTERNAL) */ -inline static void _init_attr ( OBJECT_ATTRIBUTES *attr, UNICODE_STRING *name ) +static inline void _init_attr ( OBJECT_ATTRIBUTES *attr, UNICODE_STRING *name ) { attr->Length = sizeof (OBJECT_ATTRIBUTES); attr->RootDirectory = 0; diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index 725e4ec..a21a342 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -393,7 +393,7 @@ static int start_debugger_atomic(PEXCEPTION_POINTERS epointers) * If yes, we unprotect the resources to let broken apps continue * (Windows does this too). */ -inline static BOOL check_resource_write( void *addr ) +static inline BOOL check_resource_write( void *addr ) { void *rsrc; DWORD size; @@ -416,7 +416,7 @@ inline static BOOL check_resource_write( void *addr ) * * Check for executing a protected area. */ -inline static BOOL check_no_exec( void *addr ) +static inline BOOL check_no_exec( void *addr ) { MEMORY_BASIC_INFORMATION info; diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 4297167..11aa580 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -78,7 +78,7 @@ static HANDLE systemHeap; /* globally shared heap */ * * Create the system heap. */ -inline static HANDLE HEAP_CreateSystemHeap(void) +static inline HANDLE HEAP_CreateSystemHeap(void) { int created; void *base; diff --git a/dlls/kernel32/instr.c b/dlls/kernel32/instr.c index 90e065b..a7e60f1 100644 --- a/dlls/kernel32/instr.c +++ b/dlls/kernel32/instr.c @@ -45,7 +45,7 @@ WINE_DECLARE_DEBUG_CHANNEL(io); #define ADD_LOWORD(dw,val) ((dw) = ((dw) & 0xffff0000) | LOWORD((DWORD)(dw)+(val))) #define ISV86(context) ((context)->EFlags & 0x00020000) -inline static void add_stack( CONTEXT86 *context, int offset ) +static inline void add_stack( CONTEXT86 *context, int offset ) { if (ISV86(context) || !IS_SELECTOR_32BIT(context->SegSs)) ADD_LOWORD( context->Esp, offset ); @@ -53,7 +53,7 @@ inline static void add_stack( CONTEXT86 *context, int offset ) context->Esp += offset; } -inline static void *make_ptr( CONTEXT86 *context, DWORD seg, DWORD off, int long_addr ) +static inline void *make_ptr( CONTEXT86 *context, DWORD seg, DWORD off, int long_addr ) { if (ISV86(context)) return (void *)((seg << 4) + LOWORD(off)); if (wine_ldt_is_system(seg)) return (void *)off; @@ -61,7 +61,7 @@ inline static void *make_ptr( CONTEXT86 *context, DWORD seg, DWORD off, int long return (char *) MapSL( MAKESEGPTR( seg, 0 ) ) + off; } -inline static void *get_stack( CONTEXT86 *context ) +static inline void *get_stack( CONTEXT86 *context ) { if (ISV86(context)) return (void *)((context->SegSs << 4) + LOWORD(context->Esp)); return wine_ldt_get_ptr( context->SegSs, context->Esp ); @@ -77,7 +77,7 @@ struct idtr static LDT_ENTRY idt[256]; -inline static struct idtr get_idtr(void) +static inline struct idtr get_idtr(void) { struct idtr ret; #if defined(__i386__) && defined(__GNUC__) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 5b09793..ee6967b 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -173,7 +173,7 @@ static inline void strcpynAtoW( WCHAR *dst, const char *src, size_t n ) * * Retrieve the ANSI codepage for a given locale. */ -inline static UINT get_lcid_codepage( LCID lcid ) +static inline UINT get_lcid_codepage( LCID lcid ) { UINT ret; if (!GetLocaleInfoW( lcid, LOCALE_IDEFAULTANSICODEPAGE|LOCALE_RETURN_NUMBER, (WCHAR *)&ret, @@ -563,7 +563,7 @@ static LCID convert_default_lcid( LCID lcid, LCTYPE lctype ) * * Create the Control Panel\\International registry key. */ -inline static HANDLE create_registry_key(void) +static inline HANDLE create_registry_key(void) { static const WCHAR intlW[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', 'I','n','t','e','r','n','a','t','i','o','n','a','l',0}; diff --git a/dlls/kernel32/ne_module.c b/dlls/kernel32/ne_module.c index 25b0dcf..9e464e4 100644 --- a/dlls/kernel32/ne_module.c +++ b/dlls/kernel32/ne_module.c @@ -91,7 +91,7 @@ static HMODULE16 NE_GetModuleByFilename( LPCSTR name ); /* patch all the flat cs references of the code segment if necessary */ -inline static void patch_code_segment( NE_MODULE *pModule ) +static inline void patch_code_segment( NE_MODULE *pModule ) { #ifdef __i386__ int i; diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 39fc176..b195435 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -47,7 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); /* check if a file name is for an executable file (.exe or .com) */ -inline static BOOL is_executable( const WCHAR *name ) +static inline BOOL is_executable( const WCHAR *name ) { static const WCHAR exeW[] = {'.','e','x','e',0}; static const WCHAR comW[] = {'.','c','o','m',0}; @@ -708,7 +708,7 @@ UINT WINAPI GetTempFileNameW( LPCWSTR path, LPCWSTR prefix, UINT unique, LPWSTR * Check if the file name contains a path; helper for SearchPathW. * A relative path is not considered a path unless it starts with ./ or ../ */ -inline static BOOL contains_pathW (LPCWSTR name) +static inline BOOL contains_pathW (LPCWSTR name) { if (RtlDetermineDosPathNameType_U( name ) != RELATIVE_PATH) return TRUE; if (name[0] != '.') return FALSE; diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 983750e..8b8bd3c 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -102,7 +102,7 @@ extern void SHELL_LoadRegistry(void); /*********************************************************************** * contains_path */ -inline static int contains_path( LPCWSTR name ) +static inline int contains_path( LPCWSTR name ) { return ((*name && (name[1] == ':')) || strchrW(name, '/') || strchrW(name, '\\')); } @@ -114,7 +114,7 @@ inline static int contains_path( LPCWSTR name ) * Check if an environment variable needs to be handled specially when * passed through the Unix environment (i.e. prefixed with "WINE"). */ -inline static int is_special_env_var( const char *var ) +static inline int is_special_env_var( const char *var ) { return (!strncmp( var, "PATH=", sizeof("PATH=")-1 ) || !strncmp( var, "HOME=", sizeof("HOME=")-1 ) || diff --git a/dlls/kernel32/relay16.c b/dlls/kernel32/relay16.c index 6b3f8a0..947ccf6 100644 --- a/dlls/kernel32/relay16.c +++ b/dlls/kernel32/relay16.c @@ -46,14 +46,14 @@ static const WCHAR **debug_snoop_excludelist; static const WCHAR **debug_snoop_includelist; /* compare an ASCII and a Unicode string without depending on the current codepage */ -inline static int strcmpiAW( const char *strA, const WCHAR *strW ) +static inline int strcmpiAW( const char *strA, const WCHAR *strW ) { while (*strA && (toupperW((unsigned char)*strA) == toupperW(*strW))) { strA++; strW++; } return toupperW((unsigned char)*strA) - toupperW(*strW); } /* compare an ASCII and a Unicode string without depending on the current codepage */ -inline static int strncmpiAW( const char *strA, const WCHAR *strW, int n ) +static inline int strncmpiAW( const char *strA, const WCHAR *strW, int n ) { int ret = 0; for ( ; n > 0; n--, strA++, strW++) diff --git a/dlls/kernel32/selector.c b/dlls/kernel32/selector.c index 48b92c7..53ad5b4 100644 --- a/dlls/kernel32/selector.c +++ b/dlls/kernel32/selector.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(selector); #define LDT_SIZE 8192 /* get the number of selectors needed to cover up to the selector limit */ -inline static WORD get_sel_count( WORD sel ) +static inline WORD get_sel_count( WORD sel ) { return (wine_ldt_copy.limit[sel >> __AHSHIFT] >> 16) + 1; } diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index d3f2f4b..a58d983 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -51,7 +51,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(sync); /* check if current version is NT or Win95 */ -inline static int is_version_nt(void) +static inline int is_version_nt(void) { return !(GetVersion() & 0x80000000); } diff --git a/dlls/kernel32/thunk.c b/dlls/kernel32/thunk.c index 631f8a1..5e10a5d 100644 --- a/dlls/kernel32/thunk.c +++ b/dlls/kernel32/thunk.c @@ -1629,7 +1629,7 @@ static SEGPTR ThunkletCallbackGlueSL = 0; /* map a thunk allocated on ThunkletHeap to a 16-bit pointer */ -inline static SEGPTR get_segptr( void *thunk ) +static inline SEGPTR get_segptr( void *thunk ) { if (!thunk) return 0; return MAKESEGPTR( ThunkletCodeSel, (char *)thunk - (char *)ThunkletHeap );

1 0

Andrew Talbot : ntdll: Replace inline static with static inline.
by Alexandre Julliard March 17, 2007

March 17, 2007

Module: wine Branch: master Commit: 0108667754e2c669a9806c94f4b82aa39583f95e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0108667754e2c669a9806c94f… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Mar 17 10:28:32 2007 +0000 ntdll: Replace inline static with static inline. --- dlls/ntdll/critsection.c | 6 +++--- dlls/ntdll/loader.c | 6 +++--- dlls/ntdll/relay.c | 4 ++-- dlls/ntdll/resource.c | 2 +- dlls/ntdll/server.c | 4 ++-- dlls/ntdll/signal_i386.c | 12 ++++++------ dlls/ntdll/signal_powerpc.c | 6 +++--- dlls/ntdll/signal_sparc.c | 2 +- dlls/ntdll/signal_x86_64.c | 2 +- dlls/ntdll/threadpool.c | 4 ++-- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index 2be8af2..e3fb88e 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -37,17 +37,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); WINE_DECLARE_DEBUG_CHANNEL(relay); -inline static LONG interlocked_inc( PLONG dest ) +static inline LONG interlocked_inc( PLONG dest ) { return interlocked_xchg_add( (int *)dest, 1 ) + 1; } -inline static LONG interlocked_dec( PLONG dest ) +static inline LONG interlocked_dec( PLONG dest ) { return interlocked_xchg_add( (int *)dest, -1 ) - 1; } -inline static void small_pause(void) +static inline void small_pause(void) { #ifdef __i386__ __asm__ __volatile__( "rep;nop" : : : "memory" ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 441db92..9e60704 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -111,19 +111,19 @@ static FARPROC find_named_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY * DWORD exp_size, const char *name, int hint ); /* convert PE image VirtualAddress to Real Address */ -inline static void *get_rva( HMODULE module, DWORD va ) +static inline void *get_rva( HMODULE module, DWORD va ) { return (void *)((char *)module + va); } /* check whether the file name contains a path */ -inline static int contains_path( LPCWSTR name ) +static inline int contains_path( LPCWSTR name ) { return ((*name && (name[1] == ':')) || strchrW(name, '/') || strchrW(name, '\\')); } /* convert from straight ASCII to Unicode without depending on the current codepage */ -inline static void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) +static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) { while (len--) *dst++ = (unsigned char)*src++; } diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 6bfd609..75dbe7c 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -83,14 +83,14 @@ static const WCHAR **debug_from_snoop_includelist; static BOOL init_done; /* compare an ASCII and a Unicode string without depending on the current codepage */ -inline static int strcmpAW( const char *strA, const WCHAR *strW ) +static inline int strcmpAW( const char *strA, const WCHAR *strW ) { while (*strA && ((unsigned char)*strA == *strW)) { strA++; strW++; } return (unsigned char)*strA - *strW; } /* compare an ASCII and a Unicode string without depending on the current codepage */ -inline static int strncmpiAW( const char *strA, const WCHAR *strW, int n ) +static inline int strncmpiAW( const char *strA, const WCHAR *strW, int n ) { int ret = 0; for ( ; n > 0; n--, strA++, strW++) diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c index 5660962..9c85e06 100644 --- a/dlls/ntdll/resource.c +++ b/dlls/ntdll/resource.c @@ -56,7 +56,7 @@ static LANGID user_ui_language, system_ui_language; * * Check if a module handle is for a LOAD_LIBRARY_AS_DATAFILE module. */ -inline static int is_data_file_module( HMODULE hmod ) +static inline int is_data_file_module( HMODULE hmod ) { return (ULONG_PTR)hmod & 1; } diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index ce0c3af..3214237 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -283,7 +283,7 @@ static void read_reply_data( void *buffer, size_t size ) * * Wait for a reply from the server. */ -inline static void wait_reply( struct __server_request_info *req ) +static inline void wait_reply( struct __server_request_info *req ) { read_reply_data( &req->u.reply, sizeof(req->u.reply) ); if (req->u.reply.reply_header.reply_size) @@ -473,7 +473,7 @@ struct fd_cache_entry static struct fd_cache_entry *fd_cache[FD_CACHE_ENTRIES]; static struct fd_cache_entry fd_cache_initial_block[FD_CACHE_BLOCK_SIZE]; -inline static unsigned int handle_to_index( obj_handle_t handle, unsigned int *entry ) +static inline unsigned int handle_to_index( obj_handle_t handle, unsigned int *entry ) { unsigned long idx = ((unsigned long)handle >> 2) - 1; *entry = idx / FD_CACHE_BLOCK_SIZE; diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index df7b517..106ebed 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -352,7 +352,7 @@ enum i386_trap_code /*********************************************************************** * dispatch_signal */ -inline static int dispatch_signal(unsigned int sig) +static inline int dispatch_signal(unsigned int sig) { if (handlers[sig] == NULL) return 0; return handlers[sig](sig); @@ -539,7 +539,7 @@ typedef void (WINAPI *raise_func)( EXCEPTION_RECORD *rec, CONTEXT *context ); * * Handler initialization when the full context is not needed. */ -inline static void *init_handler( const SIGCONTEXT *sigcontext, WORD *fs, WORD *gs ) +static inline void *init_handler( const SIGCONTEXT *sigcontext, WORD *fs, WORD *gs ) { void *stack = (void *)(ESP_sig(sigcontext) & ~3); TEB *teb = get_current_teb(); @@ -596,7 +596,7 @@ inline static void *init_handler( const SIGCONTEXT *sigcontext, WORD *fs, WORD * * * Save the thread FPU context. */ -inline static void save_fpu( CONTEXT *context ) +static inline void save_fpu( CONTEXT *context ) { #ifdef __GNUC__ context->ContextFlags |= CONTEXT_FLOATING_POINT; @@ -610,7 +610,7 @@ inline static void save_fpu( CONTEXT *context ) * * Restore the FPU context to a sigcontext. */ -inline static void restore_fpu( const CONTEXT *context ) +static inline void restore_fpu( const CONTEXT *context ) { FLOATING_SAVE_AREA float_status = context->FloatSave; /* reset the current interrupt status */ @@ -626,7 +626,7 @@ inline static void restore_fpu( const CONTEXT *context ) * * Build a context structure from the signal info. */ -inline static void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext, WORD fs, WORD gs ) +static inline void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext, WORD fs, WORD gs ) { struct ntdll_thread_regs * const regs = ntdll_get_thread_regs(); @@ -674,7 +674,7 @@ inline static void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext, * * Restore the signal info from the context. */ -inline static void restore_context( const CONTEXT *context, SIGCONTEXT *sigcontext ) +static inline void restore_context( const CONTEXT *context, SIGCONTEXT *sigcontext ) { struct ntdll_thread_regs * const regs = ntdll_get_thread_regs(); diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 2787786..9b73510 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -167,7 +167,7 @@ static wine_signal_handler handlers[256]; /*********************************************************************** * dispatch_signal */ -inline static int dispatch_signal(unsigned int sig) +static inline int dispatch_signal(unsigned int sig) { if (handlers[sig] == NULL) return 0; return handlers[sig](sig); @@ -239,7 +239,7 @@ static void restore_context( const CONTEXT *context, SIGCONTEXT *sigcontext ) * * Set the FPU context from a sigcontext. */ -inline static void save_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext ) +static inline void save_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext ) { #define C(x) context->Fpr##x = FLOAT_sig(x,sigcontext) C(0); C(1); C(2); C(3); C(4); C(5); C(6); C(7); C(8); C(9); C(10); @@ -256,7 +256,7 @@ inline static void save_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext ) * * Restore the FPU context to a sigcontext. */ -inline static void restore_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext ) +static inline void restore_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext ) { #define C(x) FLOAT_sig(x,sigcontext) = context->Fpr##x C(0); C(1); C(2); C(3); C(4); C(5); C(6); C(7); C(8); C(9); C(10); diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c index 7412a8e..5ea9efc 100644 --- a/dlls/ntdll/signal_sparc.c +++ b/dlls/ntdll/signal_sparc.c @@ -54,7 +54,7 @@ static wine_signal_handler handlers[256]; /*********************************************************************** * dispatch_signal */ -inline static int dispatch_signal(unsigned int sig) +static inline int dispatch_signal(unsigned int sig) { if (handlers[sig] == NULL) return 0; return handlers[sig](sig); diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 69f6272..9f77f5e 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -124,7 +124,7 @@ static wine_signal_handler handlers[256]; /*********************************************************************** * dispatch_signal */ -inline static int dispatch_signal(unsigned int sig) +static inline int dispatch_signal(unsigned int sig) { if (handlers[sig] == NULL) return 0; return handlers[sig](sig); diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 3d06cb4..72ea0cf 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -61,12 +61,12 @@ struct work_item PVOID context; }; -inline static LONG interlocked_inc( PLONG dest ) +static inline LONG interlocked_inc( PLONG dest ) { return interlocked_xchg_add( (int *)dest, 1 ) + 1; } -inline static LONG interlocked_dec( PLONG dest ) +static inline LONG interlocked_dec( PLONG dest ) { return interlocked_xchg_add( (int *)dest, -1 ) - 1; }

1 0

Andrew Talbot : advapi32: Replace inline static with static inline.
by Alexandre Julliard March 17, 2007

March 17, 2007

Module: wine Branch: master Commit: a2e7c325f9bd1dd0347c27a42ddf74668941a9e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2e7c325f9bd1dd0347c27a42… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Mar 17 10:15:11 2007 +0000 advapi32: Replace inline static with static inline. --- dlls/advapi32/registry.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 8a70f56..28689cd 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -86,13 +86,13 @@ static const WCHAR * const root_key_names[NB_SPECIAL_ROOT_KEYS] = /* check if value type needs string conversion (Ansi<->Unicode) */ -inline static int is_string( DWORD type ) +static inline int is_string( DWORD type ) { return (type == REG_SZ) || (type == REG_EXPAND_SZ) || (type == REG_MULTI_SZ); } /* check if current version is NT or Win95 */ -inline static int is_version_nt(void) +static inline int is_version_nt(void) { return !(GetVersion() & 0x80000000); } @@ -136,7 +136,7 @@ static HKEY create_special_root_hkey( HANDLE hkey, DWORD access ) } /* map the hkey from special root to normal key if necessary */ -inline static HKEY get_special_root_hkey( HKEY hkey ) +static inline HKEY get_special_root_hkey( HKEY hkey ) { HKEY ret = hkey;

1 0

Andrew Talbot : comctl32: Replace inline static with static inline.
by Alexandre Julliard March 17, 2007

March 17, 2007

Module: wine Branch: master Commit: 74ab88ca97efc870fc5094d1be825b12fb8fad37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74ab88ca97efc870fc5094d1b… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Mar 17 10:16:06 2007 +0000 comctl32: Replace inline static with static inline. --- dlls/comctl32/comboex.c | 12 +++++----- dlls/comctl32/header.c | 8 +++--- dlls/comctl32/hotkey.c | 4 +- dlls/comctl32/rebar.c | 20 ++++++++-------- dlls/comctl32/status.c | 2 +- dlls/comctl32/toolbar.c | 18 +++++++------- dlls/comctl32/tooltips.c | 18 +++++++------- dlls/comctl32/trackbar.c | 54 +++++++++++++++++++++++----------------------- 8 files changed, 68 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=74ab88ca97efc870fc509…

1 0

Andrew Talbot : comcat: Declare some variables static and const.
by Alexandre Julliard March 17, 2007

March 17, 2007

Module: wine Branch: master Commit: 525b5f4e5975a1fde2ecb3fa38ccd1853bfd775c URL: http://source.winehq.org/git/wine.git/?a=commit;h=525b5f4e5975a1fde2ecb3fa3… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Mar 16 22:11:54 2007 +0000 comcat: Declare some variables static and const. --- dlls/comcat/information.c | 28 ++++++++++++++-------------- dlls/comcat/register.c | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/comcat/information.c b/dlls/comcat/information.c index 1cc6e35..0cbe3a8 100644 --- a/dlls/comcat/information.c +++ b/dlls/comcat/information.c @@ -433,9 +433,9 @@ static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_Clone( IEnumCATEGORYINFO **ppenum) { IEnumCATEGORYINFOImpl *This = (IEnumCATEGORYINFOImpl *)iface; - WCHAR keyname[21] = { 'C', 'o', 'm', 'p', 'o', 'n', 'e', 'n', - 't', ' ', 'C', 'a', 't', 'e', 'g', 'o', - 'r', 'i', 'e', 's', 0 }; + static const WCHAR keyname[] = { 'C', 'o', 'm', 'p', 'o', 'n', 'e', 'n', + 't', ' ', 'C', 'a', 't', 'e', 'g', 'o', + 'r', 'i', 'e', 's', 0 }; IEnumCATEGORYINFOImpl *new_this; TRACE("\n"); @@ -473,9 +473,9 @@ static LPENUMCATEGORYINFO COMCAT_IEnumCATEGORYINFO_Construct(LCID lcid) This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IEnumCATEGORYINFOImpl)); if (This) { - WCHAR keyname[21] = { 'C', 'o', 'm', 'p', 'o', 'n', 'e', 'n', - 't', ' ', 'C', 'a', 't', 'e', 'g', 'o', - 'r', 'i', 'e', 's', 0 }; + static const WCHAR keyname[] = { 'C', 'o', 'm', 'p', 'o', 'n', 'e', 'n', + 't', ' ', 'C', 'a', 't', 'e', 'g', 'o', + 'r', 'i', 'e', 's', 0 }; This->lpVtbl = &COMCAT_IEnumCATEGORYINFO_Vtbl; This->lcid = lcid; @@ -490,7 +490,7 @@ static LPENUMCATEGORYINFO COMCAT_IEnumCATEGORYINFO_Construct(LCID lcid) static HRESULT COMCAT_GetCategoryDesc(HKEY key, LCID lcid, PWCHAR pszDesc, ULONG buf_wchars) { - WCHAR fmt[4] = { '%', 'l', 'X', 0 }; + static const WCHAR fmt[] = { '%', 'l', 'X', 0 }; WCHAR valname[5]; HRESULT res; DWORD type, size = (buf_wchars - 1) * sizeof(WCHAR); @@ -549,12 +549,12 @@ static HRESULT COMCAT_IsClassOfCategories( HKEY key, struct class_categories const* categories) { - WCHAR impl_keyname[23] = { 'I', 'm', 'p', 'l', 'e', 'm', 'e', 'n', - 't', 'e', 'd', ' ', 'C', 'a', 't', 'e', - 'g', 'o', 'r', 'i', 'e', 's', 0 }; - WCHAR req_keyname[20] = { 'R', 'e', 'q', 'u', 'i', 'r', 'e', 'd', - ' ', 'C', 'a', 't', 'e', 'g', 'o', 'r', - 'i', 'e', 's', 0 }; + static const WCHAR impl_keyname[] = { 'I', 'm', 'p', 'l', 'e', 'm', 'e', 'n', + 't', 'e', 'd', ' ', 'C', 'a', 't', 'e', + 'g', 'o', 'r', 'i', 'e', 's', 0 }; + static const WCHAR req_keyname[] = { 'R', 'e', 'q', 'u', 'i', 'r', 'e', 'd', + ' ', 'C', 'a', 't', 'e', 'g', 'o', 'r', + 'i', 'e', 's', 0 }; HKEY subkey; HRESULT res; DWORD index; @@ -735,7 +735,7 @@ static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_Clone( IEnumGUID **ppenum) { CLSID_IEnumGUIDImpl *This = (CLSID_IEnumGUIDImpl *)iface; - WCHAR keyname[6] = { 'C', 'L', 'S', 'I', 'D', 0 }; + static const WCHAR keyname[] = { 'C', 'L', 'S', 'I', 'D', 0 }; CLSID_IEnumGUIDImpl *new_this; DWORD size; diff --git a/dlls/comcat/register.c b/dlls/comcat/register.c index 81bf54e..6b1c598 100644 --- a/dlls/comcat/register.c +++ b/dlls/comcat/register.c @@ -111,7 +111,7 @@ static HRESULT WINAPI COMCAT_ICatRegister_RegisterCategories( if (res != ERROR_SUCCESS) return E_FAIL; for (; cCategories; --cCategories, ++rgci) { - WCHAR fmt[4] = { '%', 'l', 'X', 0 }; + static const WCHAR fmt[] = { '%', 'l', 'X', 0 }; WCHAR keyname[39]; WCHAR valname[9]; HKEY cat_key;

1 0

Joris Huizer : advpack: sign-compare fix.
by Alexandre Julliard March 17, 2007

March 17, 2007

Module: wine Branch: master Commit: 9b0686e4a4a51a25e743b5f286cef512d525817b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b0686e4a4a51a25e743b5f28… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Sat Mar 17 07:08:27 2007 -0700 advpack: sign-compare fix. --- dlls/advpack/reg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/reg.c b/dlls/advpack/reg.c index bfa136f..f456f2c 100644 --- a/dlls/advpack/reg.c +++ b/dlls/advpack/reg.c @@ -221,7 +221,7 @@ static HRESULT write_predefined_strings(HMODULE hm, LPCWSTR ini_path) */ HRESULT WINAPI RegInstallW(HMODULE hm, LPCWSTR pszSection, const STRTABLEW* pstTable) { - int i; + unsigned int i; CABINFOW cabinfo; WCHAR tmp_ini_path[MAX_PATH]; HRESULT hr = E_FAIL;

1 0

Detlef Riekenberg : advapi32/tests: DuplicateTokenEx is not present on all platforms.
by Alexandre Julliard March 17, 2007

March 17, 2007

Module: wine Branch: master Commit: fc453527818389eeedd93cd5b0aa2bcc06743760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc453527818389eeedd93cd5b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Mar 16 22:37:14 2007 +0100 advapi32/tests: DuplicateTokenEx is not present on all platforms. --- dlls/advapi32/tests/security.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 4de2476..7f44203 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -55,6 +55,8 @@ typedef BOOL (WINAPI *fnGetFileSecurityA)(LPCSTR, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, DWORD, LPDWORD); typedef DWORD (WINAPI *fnRtlAdjustPrivilege)(ULONG,BOOLEAN,BOOLEAN,PBOOLEAN); typedef BOOL (WINAPI *fnCreateWellKnownSid)(WELL_KNOWN_SID_TYPE,PSID,PSID,DWORD*); +typedef BOOL (WINAPI *fnDuplicateTokenEx)(HANDLE,DWORD,LPSECURITY_ATTRIBUTES, + SECURITY_IMPERSONATION_LEVEL,TOKEN_TYPE,PHANDLE); typedef NTSTATUS (WINAPI *fnLsaQueryInformationPolicy)(LSA_HANDLE,POLICY_INFORMATION_CLASS,PVOID*); typedef NTSTATUS (WINAPI *fnLsaClose)(LSA_HANDLE); @@ -76,6 +78,7 @@ fnConvertStringSidToSidA pConvertStringSidToSidA; fnGetFileSecurityA pGetFileSecurityA; fnRtlAdjustPrivilege pRtlAdjustPrivilege; fnCreateWellKnownSid pCreateWellKnownSid; +fnDuplicateTokenEx pDuplicateTokenEx; fnLsaQueryInformationPolicy pLsaQueryInformationPolicy; fnLsaClose pLsaClose; fnLsaFreeMemory pLsaFreeMemory; @@ -1592,6 +1595,11 @@ static void test_impersonation_level(void) HKEY hkey; DWORD error; + pDuplicateTokenEx = (fnDuplicateTokenEx) GetProcAddress(hmod, "DuplicateTokenEx"); + if( !pDuplicateTokenEx ) { + skip("DuplicateTokenEx\n"); + return; + } ret = ImpersonateSelf(SecurityAnonymous); ok(ret, "ImpersonateSelf(SecurityAnonymous) failed with error %d\n", GetLastError()); ret = OpenThreadToken(GetCurrentThread(), TOKEN_QUERY | TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY_SOURCE | TOKEN_IMPERSONATE | TOKEN_ADJUST_DEFAULT, TRUE, &Token); @@ -1608,7 +1616,7 @@ static void test_impersonation_level(void) ret = OpenProcessToken(GetCurrentProcess(), TOKEN_DUPLICATE, &ProcessToken); ok(ret, "OpenProcessToken failed with error %d\n", GetLastError()); - ret = DuplicateTokenEx(ProcessToken, + ret = pDuplicateTokenEx(ProcessToken, TOKEN_QUERY | TOKEN_DUPLICATE | TOKEN_IMPERSONATE, NULL, SecurityAnonymous, TokenImpersonation, &Token); ok(ret, "DuplicateTokenEx failed with error %d\n", GetLastError());

1 0

Detlef Riekenberg : kernel32/tests: DuplicateTokenEx is not present on all platforms.
by Alexandre Julliard March 17, 2007

March 17, 2007

Module: wine Branch: master Commit: 439b852dcac6856160a7bd451b2edfb96676b7f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=439b852dcac6856160a7bd451… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Mar 16 22:37:46 2007 +0100 kernel32/tests: DuplicateTokenEx is not present on all platforms. --- dlls/kernel32/tests/pipe.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 2356a96..0cbcafc 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -36,6 +36,9 @@ #define NB_SERVER_LOOPS 8 static HANDLE alarm_event; +static BOOL (WINAPI *pDuplicateTokenEx)(HANDLE,DWORD,LPSECURITY_ATTRIBUTES, + SECURITY_IMPERSONATION_LEVEL,TOKEN_TYPE,PHANDLE); + static void test_CreateNamedPipe(int pipemode) { @@ -907,7 +910,7 @@ static HANDLE make_impersonation_token(DWORD Access, SECURITY_IMPERSONATION_LEVE ret = OpenProcessToken(GetCurrentProcess(), TOKEN_DUPLICATE, &ProcessToken); ok(ret, "OpenProcessToken failed with error %d\n", GetLastError()); - ret = DuplicateTokenEx(ProcessToken, Access, NULL, ImpersonationLevel, TokenImpersonation, &Token); + ret = pDuplicateTokenEx(ProcessToken, Access, NULL, ImpersonationLevel, TokenImpersonation, &Token); ok(ret, "DuplicateToken failed with error %d\n", GetLastError()); CloseHandle(ProcessToken); @@ -1196,6 +1199,11 @@ static void test_impersonation(void) HANDLE hProcessToken; BOOL ret; + if( !pDuplicateTokenEx ) { + skip("DuplicateTokenEx not found\n"); + return; + } + ret = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hProcessToken); if (!ret) { @@ -1246,6 +1254,11 @@ static void test_impersonation(void) START_TEST(pipe) { + HMODULE hmod; + + hmod = GetModuleHandle("advapi32.dll"); + pDuplicateTokenEx = (void *) GetProcAddress(hmod, "DuplicateTokenEx"); + trace("test 1 of 7:\n"); if (test_DisconnectNamedPipe()) return;

1 0

Nicolas Delcros : gdi32: Don' t write a metafile record for escapes that require output.
by Alexandre Julliard March 17, 2007

March 17, 2007

Module: wine Branch: master Commit: 427a7638cb4be2b4ca39e74b0a95755f61f5a43f URL: http://source.winehq.org/git/wine.git/?a=commit;h=427a7638cb4be2b4ca39e74b0… Author: Nicolas Delcros <nicolas(a)dyalog.com> Date: Fri Mar 16 11:47:55 2007 +0000 gdi32: Don't write a metafile record for escapes that require output. --- dlls/gdi32/mfdrv/init.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 036b7b5..e939ce1 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -583,6 +583,8 @@ INT MFDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, DWORD len; INT ret; + if (cbOutput) return 0; /* escapes that require output cannot work in metafiles */ + len = sizeof(*mr) + sizeof(WORD) + ((cbInput + 1) & ~1); mr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); mr->rdSize = len / 2;

1 0