wine-commits May 2007

wine-commits@winehq.org

3 participants
715 discussions

Hans Leidekker : setupapi: Add a partial implementation for SetupScanFileQueue{A, W}.
by Alexandre Julliard 18 May '07

18 May '07

Module: wine Branch: master Commit: 6cc0b4e88e34ac61cf45c7caac6a0be8b5cfec9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cc0b4e88e34ac61cf45c7caa… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri May 18 11:39:04 2007 +0200 setupapi: Add a partial implementation for SetupScanFileQueue{A, W}. --- dlls/setupapi/queue.c | 77 +++++++++++++++++++++++++++++++++++++++++++------ include/setupapi.h | 7 ++++ 2 files changed, 75 insertions(+), 9 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index 0014a54..f9647ef 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -216,6 +216,7 @@ UINT CALLBACK QUEUE_callback_WtoA( void *context, UINT notification, case SPFILENOTIFY_RENAMEERROR: case SPFILENOTIFY_STARTCOPY: case SPFILENOTIFY_ENDCOPY: + case SPFILENOTIFY_QUEUESCAN_EX: { FILEPATHS_W *pathsW = (FILEPATHS_W *)param1; FILEPATHS_A pathsA; @@ -249,8 +250,18 @@ UINT CALLBACK QUEUE_callback_WtoA( void *context, UINT notification, } break; - case SPFILENOTIFY_NEEDMEDIA: case SPFILENOTIFY_QUEUESCAN: + { + LPWSTR targetW = (LPWSTR)param1; + LPSTR target = strdupWtoA( targetW ); + + ret = callback_ctx->orig_handler( callback_ctx->orig_context, notification, + (UINT_PTR)target, param2 ); + HeapFree( GetProcessHeap(), 0, target ); + } + break; + + case SPFILENOTIFY_NEEDMEDIA: FIXME("mapping for %d not implemented\n",notification); case SPFILENOTIFY_STARTQUEUE: case SPFILENOTIFY_ENDQUEUE: @@ -1203,22 +1214,70 @@ BOOL WINAPI SetupCommitFileQueueW( HWND owner, HSPFILEQ handle, PSP_FILE_CALLBAC /*********************************************************************** * SetupScanFileQueueA (SETUPAPI.@) */ -BOOL WINAPI SetupScanFileQueueA( HSPFILEQ queue, DWORD flags, HWND window, - PSP_FILE_CALLBACK_A callback, PVOID context, PDWORD result ) +BOOL WINAPI SetupScanFileQueueA( HSPFILEQ handle, DWORD flags, HWND window, + PSP_FILE_CALLBACK_A handler, PVOID context, PDWORD result ) { - FIXME("stub\n"); - return FALSE; + struct callback_WtoA_context ctx; + + TRACE("%p %x %p %p %p %p\n", handle, flags, window, handler, context, result); + + ctx.orig_context = context; + ctx.orig_handler = handler; + + return SetupScanFileQueueW( handle, flags, window, QUEUE_callback_WtoA, &ctx, result ); } /*********************************************************************** * SetupScanFileQueueW (SETUPAPI.@) */ -BOOL WINAPI SetupScanFileQueueW( HSPFILEQ queue, DWORD flags, HWND window, - PSP_FILE_CALLBACK_W callback, PVOID context, PDWORD result ) +BOOL WINAPI SetupScanFileQueueW( HSPFILEQ handle, DWORD flags, HWND window, + PSP_FILE_CALLBACK_W handler, PVOID context, PDWORD result ) { - FIXME("stub\n"); - return FALSE; + struct file_queue *queue = handle; + struct file_op *op; + FILEPATHS_W paths; + UINT notification = 0; + BOOL ret = FALSE; + + TRACE("%p %x %p %p %p %p\n", handle, flags, window, handler, context, result); + + if (!queue->copy_queue.count) return TRUE; + + if (flags & SPQ_SCAN_USE_CALLBACK) notification = SPFILENOTIFY_QUEUESCAN; + else if (flags & SPQ_SCAN_USE_CALLBACKEX) notification = SPFILENOTIFY_QUEUESCAN_EX; + + if (flags & ~(SPQ_SCAN_USE_CALLBACK | SPQ_SCAN_USE_CALLBACKEX)) + { + FIXME("flags %x not fully implemented\n", flags); + } + + paths.Source = paths.Target = NULL; + + for (op = queue->copy_queue.head; op; op = op->next) + { + build_filepathsW( op, &paths ); + switch (notification) + { + case SPFILENOTIFY_QUEUESCAN: + /* FIXME: handle delay flag */ + if (handler( context, notification, (UINT_PTR)paths.Target, 0 )) goto done; + break; + case SPFILENOTIFY_QUEUESCAN_EX: + if (handler( context, notification, (UINT_PTR)&paths, 0 )) goto done; + break; + default: + ret = TRUE; goto done; + } + } + + ret = TRUE; + + done: + if (result) *result = 0; + HeapFree( GetProcessHeap(), 0, (void *)paths.Source ); + HeapFree( GetProcessHeap(), 0, (void *)paths.Target ); + return ret; } diff --git a/include/setupapi.h b/include/setupapi.h index 475ad75..2434639 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -437,6 +437,13 @@ DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_ORIGINAL_FILE_INFO) #define SPOST_URL 2 #define SPOST_MAX 3 +#define SPQ_SCAN_FILE_PRESENCE 0x00000001 +#define SPQ_SCAN_FILE_VALIDITY 0x00000002 +#define SPQ_SCAN_USE_CALLBACK 0x00000004 +#define SPQ_SCAN_USE_CALLBACKEX 0x00000008 +#define SPQ_SCAN_INFORM_USER 0x00000010 +#define SPQ_SCAN_PRUNE_COPY_QUEUE 0x00000020 + #define FLG_ADDREG_DELREG_BIT 0x00008000 #define FLG_ADDREG_BINVALUETYPE 0x00000001 #define FLG_ADDREG_NOCLOBBER 0x00000002

1 0

Hans Leidekker : setupapi: Correctly handle an empty filename in SetupGetSourceFileLocationA.
by Alexandre Julliard 18 May '07

18 May '07

Module: wine Branch: master Commit: 108288ec3af19a10e152a18bd60240ad17430b69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=108288ec3af19a10e152a18bd… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri May 18 11:38:53 2007 +0200 setupapi: Correctly handle an empty filename in SetupGetSourceFileLocationA. --- dlls/setupapi/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index 8699264..3a74717 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -320,7 +320,7 @@ BOOL WINAPI SetupGetSourceFileLocationA( HINF hinf, PINFCONTEXT context, PCSTR f TRACE("%p, %p, %s, %p, %p, 0x%08x, %p\n", hinf, context, debugstr_a(filename), source_id, buffer, buffer_size, required_size); - if (filename && !(filenameW = strdupAtoW( filename ))) + if (filename && *filename && !(filenameW = strdupAtoW( filename ))) return FALSE; if (!SetupGetSourceFileLocationW( hinf, context, filenameW, source_id, NULL, 0, &required ))

1 0

Hans Leidekker : setupapi: Implement pSetup{Get, Set}QueueFlags.
by Alexandre Julliard 18 May '07

18 May '07

Module: wine Branch: master Commit: d060160b7a045337507a2398c8f20c90b486580a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d060160b7a045337507a2398c… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri May 18 11:38:30 2007 +0200 setupapi: Implement pSetup{Get, Set}QueueFlags. --- dlls/setupapi/queue.c | 19 +++++++++++++++++++ dlls/setupapi/setupapi.spec | 4 ++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index 063e8c0..0014a54 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -1527,3 +1527,22 @@ UINT WINAPI SetupCopyErrorW( HWND parent, PCWSTR dialogTitle, PCWSTR diskname, w32error, debugstr_w(sourcefile), debugstr_w(sourcepath) ,debugstr_w(targetpath)); return DPROMPT_SKIPFILE; } + +/*********************************************************************** + * pSetupGetQueueFlags (SETUPAPI.@) + */ +DWORD WINAPI pSetupGetQueueFlags( HSPFILEQ handle ) +{ + struct file_queue *queue = handle; + return queue->flags; +} + +/*********************************************************************** + * pSetupSetQueueFlags (SETUPAPI.@) + */ +BOOL WINAPI pSetupSetQueueFlags( HSPFILEQ handle, DWORD flags ) +{ + struct file_queue *queue = handle; + queue->flags = flags; + return TRUE; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 006f1fc..d6a6b6e 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -545,13 +545,13 @@ @ stdcall pSetupGetField(ptr long) @ stdcall pSetupGetGlobalFlags() @ stub pSetupGetOsLoaderDriveAndPath -@ stub pSetupGetQueueFlags +@ stdcall pSetupGetQueueFlags(ptr) @ stub pSetupGetVersionDatum @ stub pSetupGuidFromString @ stub pSetupIsGuidNull @ stub pSetupMakeSurePathExists @ stdcall pSetupSetGlobalFlags(long) -@ stub pSetupSetQueueFlags +@ stdcall pSetupSetQueueFlags(ptr long) @ stub pSetupSetSystemSourceFlags @ stub pSetupStringFromGuid @ stdcall pSetupStringTableAddString(ptr wstr long) StringTableAddString

1 0

Dmitry Timoshkov : kernel32: Add an overflow test for MultiByteToWideChar.
by Alexandre Julliard 18 May '07

18 May '07

Module: wine Branch: master Commit: e690916f68d651147653ffae3be1c17fa5edfdbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=e690916f68d651147653ffae3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri May 18 20:21:35 2007 +0900 kernel32: Add an overflow test for MultiByteToWideChar. --- dlls/kernel32/tests/codepage.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 89b6ef0..bde9f82 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -137,6 +137,12 @@ static void test_negative_source_length(void) len = MultiByteToWideChar(CP_ACP, 0, "foobar", -2002, bufW, 10); ok(len == 7 && !mylstrcmpW(bufW, foobarW) && GetLastError() == 0xdeadbeef, "MultiByteToWideChar(-2002): len=%d error=%u\n", len, GetLastError()); + + SetLastError(0xdeadbeef); + memset(bufW, 'x', sizeof(bufW)); + len = MultiByteToWideChar(CP_ACP, 0, "foobar", -1, bufW, 6); + ok(len == 0 && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "MultiByteToWideChar(-1): len=%d error=%u\n", len, GetLastError()); } static void test_overlapped_buffers(void)

1 0

Dmitry Timoshkov : kernel32: Print last error value as unsigned, printing error in hex is useless.
by Alexandre Julliard 18 May '07

18 May '07

Module: wine Branch: master Commit: 90bafb3cc1b5b7081ae1157c6b450234b422141a URL: http://source.winehq.org/git/wine.git/?a=commit;h=90bafb3cc1b5b7081ae1157c6… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri May 18 20:18:56 2007 +0900 kernel32: Print last error value as unsigned, printing error in hex is useless. --- dlls/kernel32/tests/codepage.c | 37 ++++++++++++++++++------------------- 1 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 2cd0557..89b6ef0 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -36,8 +36,8 @@ static void test_destination_buffer(void) SetLastError(0xdeadbeef); needed = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, NULL, 0, NULL, NULL); - ok( (needed > 0), "returned %d with 0x%x/%d (expected '> 0')\n", - needed, GetLastError(), GetLastError()); + ok( (needed > 0), "returned %d with %u (expected '> 0')\n", + needed, GetLastError()); maxsize = needed*2; buffer = HeapAlloc(GetProcessHeap(), 0, maxsize); @@ -48,45 +48,44 @@ static void test_destination_buffer(void) buffer[maxsize] = '\0'; SetLastError(0xdeadbeef); len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, buffer, needed+1, NULL, NULL); - ok( (len > 0), "returned %d with 0x%x/%d and '%s' (expected '> 0')\n", - len, GetLastError(), GetLastError(), buffer); + ok( (len > 0), "returned %d with %u and '%s' (expected '> 0')\n", + len, GetLastError(), buffer); memset(buffer, 'x', maxsize); buffer[maxsize] = '\0'; SetLastError(0xdeadbeef); len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, buffer, needed, NULL, NULL); - ok( (len > 0), "returned %d with 0x%x/%d and '%s' (expected '> 0')\n", - len, GetLastError(), GetLastError(), buffer); + ok( (len > 0), "returned %d with %u and '%s' (expected '> 0')\n", + len, GetLastError(), buffer); memset(buffer, 'x', maxsize); buffer[maxsize] = '\0'; SetLastError(0xdeadbeef); len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, buffer, needed-1, NULL, NULL); ok( !len && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), - "returned %d with 0x%x/%d and '%s' (expected '0' with " - "ERROR_INSUFFICIENT_BUFFER)\n", len, GetLastError(), GetLastError(), buffer); + "returned %d with %u and '%s' (expected '0' with " + "ERROR_INSUFFICIENT_BUFFER)\n", len, GetLastError(), buffer); memset(buffer, 'x', maxsize); buffer[maxsize] = '\0'; SetLastError(0xdeadbeef); len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, buffer, 1, NULL, NULL); ok( !len && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), - "returned %d with 0x%x/%d and '%s' (expected '0' with " - "ERROR_INSUFFICIENT_BUFFER)\n", len, GetLastError(), GetLastError(), buffer); + "returned %d with %u and '%s' (expected '0' with " + "ERROR_INSUFFICIENT_BUFFER)\n", len, GetLastError(), buffer); SetLastError(0xdeadbeef); len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, buffer, 0, NULL, NULL); - ok( (len > 0), "returned %d with 0x%x/%d (expected '> 0')\n", - len, GetLastError(), GetLastError()); + ok( (len > 0), "returned %d with %u (expected '> 0')\n", + len, GetLastError()); SetLastError(0xdeadbeef); len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, NULL, needed, NULL, NULL); ok( !len && (GetLastError() == ERROR_INVALID_PARAMETER), - "returned %d with 0x%x/%d (expected '0' with " - "ERROR_INVALID_PARAMETER)\n", len, GetLastError(), GetLastError()); + "returned %d with %u (expected '0' with " + "ERROR_INVALID_PARAMETER)\n", len, GetLastError()); HeapFree(GetProcessHeap(), 0, buffer); - } @@ -99,14 +98,14 @@ static void test_null_source(void) len = WideCharToMultiByte(CP_ACP, 0, NULL, 0, NULL, 0, NULL, NULL); GLE = GetLastError(); ok(!len && GLE == ERROR_INVALID_PARAMETER, - "WideCharToMultiByte returned %d with GLE=%d (expected 0 with ERROR_INVALID_PARAMETER)\n", + "WideCharToMultiByte returned %d with GLE=%u (expected 0 with ERROR_INVALID_PARAMETER)\n", len, GLE); SetLastError(0); len = WideCharToMultiByte(CP_ACP, 0, NULL, -1, NULL, 0, NULL, NULL); GLE = GetLastError(); ok(!len && GLE == ERROR_INVALID_PARAMETER, - "WideCharToMultiByte returned %d with GLE=%d (expected 0 with ERROR_INVALID_PARAMETER)\n", + "WideCharToMultiByte returned %d with GLE=%u (expected 0 with ERROR_INVALID_PARAMETER)\n", len, GLE); } @@ -131,13 +130,13 @@ static void test_negative_source_length(void) memset(buf,'x',sizeof(buf)); len = WideCharToMultiByte(CP_ACP, 0, foobarW, -2002, buf, 10, NULL, NULL); ok(len == 7 && !lstrcmpA(buf, "foobar") && GetLastError() == 0xdeadbeef, - "WideCharToMultiByte(-2002): len=%d error=%d\n",len,GetLastError()); + "WideCharToMultiByte(-2002): len=%d error=%u\n", len, GetLastError()); SetLastError( 0xdeadbeef ); memset(bufW,'x',sizeof(bufW)); len = MultiByteToWideChar(CP_ACP, 0, "foobar", -2002, bufW, 10); ok(len == 7 && !mylstrcmpW(bufW, foobarW) && GetLastError() == 0xdeadbeef, - "MultiByteToWideChar(-2002): len=%d error=%d\n",len,GetLastError()); + "MultiByteToWideChar(-2002): len=%d error=%u\n", len, GetLastError()); } static void test_overlapped_buffers(void)

1 0

Rob Shearman : server: Add the logon SID to the default admin token' s groups.
by Alexandre Julliard 18 May '07

18 May '07

Module: wine Branch: master Commit: fa074bc544f02912b706091c99241586afe77b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa074bc544f02912b706091c9… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri May 18 10:51:50 2007 +0100 server: Add the logon SID to the default admin token's groups. --- server/token.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/server/token.c b/server/token.c index 8bbe29e..9472cf5 100644 --- a/server/token.c +++ b/server/token.c @@ -575,8 +575,11 @@ struct token *token_create_admin( void ) static const SID_IDENTIFIER_AUTHORITY nt_authority = { SECURITY_NT_AUTHORITY }; static const unsigned int alias_admins_subauth[] = { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS }; static const unsigned int alias_users_subauth[] = { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS }; + /* on Windows, this value changes every time the user logs on */ + static const unsigned int logon_subauth[] = { SECURITY_LOGON_IDS_RID, 0, 1 /* FIXME: should be randomly generated when tokens are inherited by new processes */ }; PSID alias_admins_sid; PSID alias_users_sid; + PSID logon_sid; /* note: should be the owner specified in the token */ ACL *default_dacl = create_default_dacl( &interactive_sid ); @@ -584,8 +587,10 @@ struct token *token_create_admin( void ) alias_admins_subauth ); alias_users_sid = security_sid_alloc( &nt_authority, sizeof(alias_users_subauth)/sizeof(alias_users_subauth[0]), alias_users_subauth ); + logon_sid = security_sid_alloc( &nt_authority, sizeof(logon_subauth)/sizeof(logon_subauth[0]), + logon_subauth ); - if (alias_admins_sid && alias_users_sid && default_dacl) + if (alias_admins_sid && alias_users_sid && logon_sid && default_dacl) { const LUID_AND_ATTRIBUTES admin_privs[] = { @@ -620,6 +625,7 @@ struct token *token_create_admin( void ) { security_authenticated_user_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, { alias_admins_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_OWNER }, { alias_users_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, + { logon_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_LOGON_ID }, }; static const TOKEN_SOURCE admin_source = {"SeMgr", {0, 0}}; /* note: we just set the user sid to be the interactive builtin sid - @@ -632,6 +638,7 @@ struct token *token_create_admin( void ) assert( token->primary_group ); } + free( logon_sid ); free( alias_admins_sid ); free( alias_users_sid ); free( default_dacl );

1 0

Andrew Talbot : riched20: Exclude unused headers.
by Alexandre Julliard 18 May '07

18 May '07

Module: wine Branch: master Commit: 5588233957ecca3b8af7e9c7c1e3de4b7733295e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5588233957ecca3b8af7e9c7c… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu May 17 21:07:32 2007 +0100 riched20: Exclude unused headers. --- dlls/riched20/editor.c | 2 -- dlls/riched20/txtsrv.c | 1 - 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 83541f2..b5a26eb 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -226,8 +226,6 @@ #include "winreg.h" #define NO_SHLWAPI_STREAM #include "shlwapi.h" -#include "imm.h" -#include "textserv.h" #include "rtf.h" #define STACK_SIZE_DEFAULT 100 diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 069c916..95d6f7c 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -28,7 +28,6 @@ #include "editor.h" #include "ole2.h" #include "richole.h" -#include "winreg.h" #include "imm.h" #include "textserv.h" #include "wine/debug.h"

1 0

Andrew Talbot : rsaenh: Exclude unused header.
by Alexandre Julliard 18 May '07

18 May '07

Module: wine Branch: master Commit: 42fd48f38e19f85a55dcd1647c21e519fdec4460 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42fd48f38e19f85a55dcd1647… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu May 17 21:07:39 2007 +0100 rsaenh: Exclude unused header. --- dlls/rsaenh/rsaenh.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index ca9e4a9..101eb8c 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -33,7 +33,6 @@ #include "winbase.h" #include "winreg.h" #include "wincrypt.h" -#include "lmcons.h" #include "handle.h" #include "implglue.h" #include "objbase.h"

1 0

Andrew Talbot : rpcrt4: Exclude unused headers.
by Alexandre Julliard 18 May '07

18 May '07

Module: wine Branch: master Commit: d5d056ef75dbd38315e1801eafa1e981ff7a060a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5d056ef75dbd38315e1801ea… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu May 17 21:07:35 2007 +0100 rpcrt4: Exclude unused headers. --- dlls/rpcrt4/ndr_clientserver.c | 1 - dlls/rpcrt4/ndr_marshall.c | 1 - dlls/rpcrt4/ndr_ole.c | 1 - dlls/rpcrt4/ndr_stubless.c | 1 - dlls/rpcrt4/rpc_binding.c | 1 - dlls/rpcrt4/rpc_epmap.c | 1 - dlls/rpcrt4/rpc_message.c | 1 - dlls/rpcrt4/rpc_server.c | 1 - dlls/rpcrt4/rpc_transport.c | 1 - 9 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/rpcrt4/ndr_clientserver.c b/dlls/rpcrt4/ndr_clientserver.c index 1745b90..fe424a6 100644 --- a/dlls/rpcrt4/ndr_clientserver.c +++ b/dlls/rpcrt4/ndr_clientserver.c @@ -32,7 +32,6 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "winreg.h" #include "objbase.h" diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index ad95b53..84d502b 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -39,7 +39,6 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "winreg.h" #include "ndr_misc.h" #include "rpcndr.h" diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index b65e18b..0a8c1f2 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -33,7 +33,6 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "winreg.h" #include "objbase.h" diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index dbe500e..6a581a0 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -33,7 +33,6 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "winreg.h" #include "objbase.h" #include "rpc.h" diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index ad96ac6..4f276ae 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -30,7 +30,6 @@ #include "winbase.h" #include "winnls.h" #include "winerror.h" -#include "winreg.h" #include "winternl.h" #include "wine/unicode.h" diff --git a/dlls/rpcrt4/rpc_epmap.c b/dlls/rpcrt4/rpc_epmap.c index 45471c1..cac3f62 100644 --- a/dlls/rpcrt4/rpc_epmap.c +++ b/dlls/rpcrt4/rpc_epmap.c @@ -29,7 +29,6 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "winreg.h" #include "rpc.h" diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index a30c925..dd37f33 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -27,7 +27,6 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "winreg.h" #include "rpc.h" #include "rpcndr.h" diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 7152453..fd277b3 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -33,7 +33,6 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "winreg.h" #include "rpc.h" #include "rpcndr.h" diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index b4af8e9..c3d1ef3 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -60,7 +60,6 @@ #include "winbase.h" #include "winnls.h" #include "winerror.h" -#include "winreg.h" #include "winternl.h" #include "wine/unicode.h"

1 0

Juan Lang : oleaut32: Don't mix allocation routines.
by Alexandre Julliard 18 May '07

18 May '07

Module: wine Branch: master Commit: 37386dba7ab69e545121cfc2bc45129374e9bd55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37386dba7ab69e545121cfc2b… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu May 17 11:40:04 2007 -0700 oleaut32: Don't mix allocation routines. --- dlls/oleaut32/ungif.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/ungif.c b/dlls/oleaut32/ungif.c index e80f8ab..415e7bf 100644 --- a/dlls/oleaut32/ungif.c +++ b/dlls/oleaut32/ungif.c @@ -65,6 +65,11 @@ static void *ungif_calloc( size_t num, size_t sz ) return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, num*sz ); } +static void *ungif_realloc( void *ptr, size_t sz ) +{ + return HeapReAlloc( GetProcessHeap(), 0, ptr, sz ); +} + static void ungif_free( void *ptr ) { HeapFree( GetProcessHeap(), 0, ptr ); @@ -194,7 +199,7 @@ AddExtensionBlock(SavedImage * New, if (New->ExtensionBlocks == NULL) New->ExtensionBlocks = ungif_alloc(sizeof(ExtensionBlock)); else - New->ExtensionBlocks = realloc(New->ExtensionBlocks, + New->ExtensionBlocks = ungif_realloc(New->ExtensionBlocks, sizeof(ExtensionBlock) * (New->ExtensionBlockCount + 1)); @@ -387,7 +392,7 @@ DGifGetImageDesc(GifFileType * GifFile) { } if (GifFile->SavedImages) { - if ((GifFile->SavedImages = realloc(GifFile->SavedImages, + if ((GifFile->SavedImages = ungif_realloc(GifFile->SavedImages, sizeof(SavedImage) * (GifFile->ImageCount + 1))) == NULL) { return GIF_ERROR;

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2007