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

Eric Pouech : dbghelp: In const types, force 'void' type when none is found .
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 6a60266575ebdc501e533f9c814364746c6ef2a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a60266575ebdc501e533f9c8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 26 12:16:45 2011 +0100 dbghelp: In const types, force 'void' type when none is found. --- dlls/dbghelp/dwarf.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index f0eabaf..1f8d4a7 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1317,9 +1317,13 @@ static struct symt* dwarf2_parse_volatile_type(dwarf2_parse_context_t* ctx, if (di->symt) return di->symt; - TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); + TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); - ref_type = dwarf2_lookup_type(ctx, di); + if (!(ref_type = dwarf2_lookup_type(ctx, di))) + { + ref_type = ctx->symt_cache[sc_void]; + assert(ref_type); + } if (dwarf2_get_di_children(ctx, di)) FIXME("Unsupported children\n"); di->symt = ref_type;

1 0

Eric Pouech : kernel32: When testing the debugger activation, don' t use unitialized values (clang).
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 198054505592a40ee8d92e816a36023e90d3b5bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=198054505592a40ee8d92e816… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 26 12:16:58 2011 +0100 kernel32: When testing the debugger activation, don't use unitialized values (clang). --- dlls/kernel32/tests/debugger.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 92e4c43..7f7b052 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -450,6 +450,7 @@ static void test_ExitCode(void) ok(0, "could not open the AeDebug key: %d\n", ret); return; } + else debugger_value.data = NULL; if (debugger_value.data && debugger_value.type == REG_SZ && strstr((char*)debugger_value.data, "winedbg --auto"))

1 0

Eric Pouech : winegcc: Check that option argument is within command line parameters.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: a5cbdcb8bb4dbc7fcf9acc7b8d673ecebe64f496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5cbdcb8bb4dbc7fcf9acc7b8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 26 12:16:51 2011 +0100 winegcc: Check that option argument is within command line parameters. --- tools/winegcc/winegcc.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 9849afd..8a22dfe 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1297,7 +1297,11 @@ int main(int argc, char **argv) next_is_arg = 1; break; } - if (next_is_arg) option_arg = argv[i+1]; + if (next_is_arg) + { + if (i + 1 >= argc) error("option -%c requires an argument\n", argv[i][1]); + option_arg = argv[i+1]; + } /* determine what options go 'as is' to the linker & the compiler */ raw_compiler_arg = raw_linker_arg = 0;

1 0

Eric Pouech : dbghelp: Return proper null value when lookup_type fails.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 96a38c93d54751c5593e5780e1722322cb498e1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=96a38c93d54751c5593e5780e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 26 12:16:39 2011 +0100 dbghelp: Return proper null value when lookup_type fails. --- dlls/dbghelp/dwarf.c | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 5596c45..f0eabaf 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -941,22 +941,24 @@ static BOOL dwarf2_compute_location_attr(dwarf2_parse_context_t* ctx, static struct symt* dwarf2_lookup_type(dwarf2_parse_context_t* ctx, const dwarf2_debug_info_t* di) { - struct attribute attr; + struct attribute attr; + dwarf2_debug_info_t* type; - if (dwarf2_find_attribute(ctx, di, DW_AT_type, &attr)) + if (!dwarf2_find_attribute(ctx, di, DW_AT_type, &attr)) + return NULL; + if (!(type = sparse_array_find(&ctx->debug_info_table, attr.u.uvalue))) { - dwarf2_debug_info_t* type; - - type = sparse_array_find(&ctx->debug_info_table, attr.u.uvalue); - if (!type) FIXME("Unable to find back reference to type %lx\n", attr.u.uvalue); + FIXME("Unable to find back reference to type %lx\n", attr.u.uvalue); + return NULL; + } + if (!type->symt) + { + /* load the debug info entity */ + dwarf2_load_one_entry(ctx, type); if (!type->symt) - { - /* load the debug info entity */ - dwarf2_load_one_entry(ctx, type); - } - return type->symt; + FIXME("Unable to load forward reference for tag %lx\n", type->abbrev->tag); } - return NULL; + return type->symt; } static const char* dwarf2_get_cpp_name(dwarf2_parse_context_t* ctx, dwarf2_debug_info_t* di, const char* name)

1 0

Dmitry Timoshkov : server: Add excute permission when read file access is allowed.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 1b5602e59cbd72bceb173e2dba4d214f8ef97ac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b5602e59cbd72bceb173e2db… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Mar 24 16:57:21 2011 +0800 server: Add excute permission when read file access is allowed. --- dlls/advapi32/tests/security.c | 12 ++++-------- server/file.c | 12 +++--------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 5409c35..7040add 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -881,10 +881,9 @@ cleanup: SetLastError(0xdeadbeef); rc = AccessCheck(sd, token, FILE_EXECUTE, &mapping, &priv_set, &priv_set_len, &granted, &status); ok(rc, "AccessCheck error %d\n", GetLastError()); -todo_wine { ok(status == 1, "expected 1, got %d\n", status); ok(granted == FILE_EXECUTE, "expected FILE_EXECUTE, got %#x\n", granted); -} + granted = 0xdeadbeef; status = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -906,19 +905,17 @@ todo_wine { SetLastError(0xdeadbeef); rc = AccessCheck(sd, token, 0x1ff, &mapping, &priv_set, &priv_set_len, &granted, &status); ok(rc, "AccessCheck error %d\n", GetLastError()); -todo_wine { ok(status == 1, "expected 1, got %d\n", status); ok(granted == 0x1ff, "expected 0x1ff, got %#x\n", granted); -} + granted = 0xdeadbeef; status = 0xdeadbeef; SetLastError(0xdeadbeef); rc = AccessCheck(sd, token, FILE_ALL_ACCESS, &mapping, &priv_set, &priv_set_len, &granted, &status); ok(rc, "AccessCheck error %d\n", GetLastError()); -todo_wine { ok(status == 1, "expected 1, got %d\n", status); ok(granted == FILE_ALL_ACCESS, "expected FILE_ALL_ACCESS, got %#x\n", granted); -} + SetLastError(0xdeadbeef); rc = AccessCheck(sd, token, 0xffffffff, &mapping, &priv_set, &priv_set_len, &granted, &status); ok(!rc, "AccessCheck should fail\n"); @@ -995,10 +992,9 @@ todo_wine { SetLastError(0xdeadbeef); rc = AccessCheck(sd, token, FILE_EXECUTE, &mapping, &priv_set, &priv_set_len, &granted, &status); ok(rc, "AccessCheck error %d\n", GetLastError()); -todo_wine { ok(status == 1, "expected 1, got %d\n", status); ok(granted == FILE_EXECUTE, "expected FILE_EXECUTE, got %#x\n", granted); -} + granted = 0xdeadbeef; status = 0xdeadbeef; SetLastError(0xdeadbeef); diff --git a/server/file.c b/server/file.c index cca2633..ee7202b 100644 --- a/server/file.c +++ b/server/file.c @@ -358,11 +358,9 @@ struct security_descriptor *mode_to_sd( mode_t mode, const SID *user, const SID FIELD_OFFSET(SID, SubAuthority[user->SubAuthorityCount]); aaa->Mask = WRITE_DAC | WRITE_OWNER; if (mode & S_IRUSR) - aaa->Mask |= FILE_GENERIC_READ; + aaa->Mask |= FILE_GENERIC_READ | FILE_GENERIC_EXECUTE; if (mode & S_IWUSR) aaa->Mask |= FILE_GENERIC_WRITE | DELETE | FILE_DELETE_CHILD; - if (mode & S_IXUSR) - aaa->Mask |= FILE_GENERIC_EXECUTE; sid = (SID *)&aaa->SidStart; memcpy( sid, user, FIELD_OFFSET(SID, SubAuthority[user->SubAuthorityCount]) ); } @@ -379,11 +377,9 @@ struct security_descriptor *mode_to_sd( mode_t mode, const SID *user, const SID FIELD_OFFSET(SID, SubAuthority[user->SubAuthorityCount]); ada->Mask = 0; if (!(mode & S_IRUSR) && (mode & (S_IRGRP|S_IROTH))) - ada->Mask |= FILE_GENERIC_READ; + ada->Mask |= FILE_GENERIC_READ | FILE_GENERIC_EXECUTE; if (!(mode & S_IWUSR) && (mode & (S_IWGRP|S_IROTH))) ada->Mask |= FILE_GENERIC_WRITE | DELETE | FILE_DELETE_CHILD; - if (!(mode & S_IXUSR) && (mode & (S_IXGRP|S_IXOTH))) - ada->Mask |= FILE_GENERIC_EXECUTE; ada->Mask &= ~STANDARD_RIGHTS_ALL; /* never deny standard rights */ sid = (SID *)&ada->SidStart; memcpy( sid, user, FIELD_OFFSET(SID, SubAuthority[user->SubAuthorityCount]) ); @@ -399,11 +395,9 @@ struct security_descriptor *mode_to_sd( mode_t mode, const SID *user, const SID FIELD_OFFSET(SID, SubAuthority[world_sid->SubAuthorityCount]); aaa->Mask = 0; if (mode & S_IROTH) - aaa->Mask |= FILE_GENERIC_READ; + aaa->Mask |= FILE_GENERIC_READ | FILE_GENERIC_EXECUTE; if (mode & S_IWOTH) aaa->Mask |= FILE_GENERIC_WRITE | DELETE | FILE_DELETE_CHILD; - if (mode & S_IXOTH) - aaa->Mask |= FILE_GENERIC_EXECUTE; sid = (SID *)&aaa->SidStart; memcpy( sid, world_sid, FIELD_OFFSET(SID, SubAuthority[world_sid->SubAuthorityCount]) ); }

1 0

Austin English : traffic: Add a stub for TcDeregisterClient.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 570f446f8c19a9b56b7d26773390d7b426852c9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=570f446f8c19a9b56b7d26773… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Mar 19 16:59:47 2011 -0500 traffic: Add a stub for TcDeregisterClient. --- dlls/traffic/traffic.spec | 2 +- dlls/traffic/traffic_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/traffic/traffic.spec b/dlls/traffic/traffic.spec index 4638af3..ad4bce0 100644 --- a/dlls/traffic/traffic.spec +++ b/dlls/traffic/traffic.spec @@ -4,7 +4,7 @@ @ stub TcCloseInterface @ stub TcDeleteFilter @ stub TcDeleteFlow -@ stub TcDeregisterClient +@ stdcall TcDeregisterClient(ptr) @ stub TcEnumerateFlows @ stub TcEnumerateInterfaces @ stub TcGetFlowNameA diff --git a/dlls/traffic/traffic_main.c b/dlls/traffic/traffic_main.c index 6efea89..6b8a975 100644 --- a/dlls/traffic/traffic_main.c +++ b/dlls/traffic/traffic_main.c @@ -54,3 +54,12 @@ ULONG WINAPI TcRegisterClient(ULONG version, HANDLE context, if(buffer) *buffer = INVALID_HANDLE_VALUE; return ERROR_CALL_NOT_IMPLEMENTED; } + +/***************************************************************************** + * TcDeregisterClient [TRAFFIC.@] + */ +ULONG WINAPI TcDeregisterClient(HANDLE ClientHandle) +{ + FIXME("%p: stub\n", ClientHandle); + return ERROR_CALL_NOT_IMPLEMENTED; +}

1 0

Marcus Meissner : user32: Added missing break.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 81ed81517381b2dd0572734cee224789cd506df4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81ed81517381b2dd0572734ce… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Mar 18 22:32:27 2011 +0100 user32: Added missing break. --- dlls/user32/class.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 91409e2..8b5060a 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -136,6 +136,7 @@ static BOOL set_server_info( HWND hwnd, INT offset, LONG_PTR newval, UINT size ) case GCW_ATOM: req->flags = SET_CLASS_ATOM; req->atom = LOWORD(newval); + break; case GCL_STYLE: req->flags = SET_CLASS_STYLE; req->style = newval;

1 0

Stefan Leichter : ntoskrnl.exe: Add stub for PsSetLoadImageNotifyRoutine.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: c643aec1759c82ab3c187ff1fe518e2dda1dc8bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c643aec1759c82ab3c187ff1f… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sat Mar 19 10:26:58 2011 +0100 ntoskrnl.exe: Add stub for PsSetLoadImageNotifyRoutine. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 22 ++++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a697751..6fc0fb2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1596,6 +1596,15 @@ NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT DeviceObject, ULONG Acti } /***************************************************** + * PsSetLoadImageNotifyRoutine (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE routine) +{ + FIXME("(%p) stub\n", routine); + return STATUS_SUCCESS; +} + +/***************************************************** * DllMain */ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index ed0059e..7e4918f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -911,7 +911,7 @@ @ stdcall PsSetCreateThreadNotifyRoutine(ptr) @ stub PsSetJobUIRestrictionsClass @ stub PsSetLegoNotifyRoutine -@ stub PsSetLoadImageNotifyRoutine +@ stdcall PsSetLoadImageNotifyRoutine(ptr) @ stub PsSetProcessPriorityByClass @ stub PsSetProcessPriorityClass @ stub PsSetProcessSecurityPort diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 1ea8d05..df58951 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -107,7 +107,28 @@ typedef enum _CONFIGURATION_TYPE MaximunType } CONFIGURATION_TYPE, *PCONFIGURATION_TYPE; +typedef struct _IMAGE_INFO +{ + union + { + ULONG Properties; + struct + { + ULONG ImageAddressingMode : 8; + ULONG SystemModeImage : 1; + ULONG ImageMappedToAllPids : 1; + ULONG ExtendedInfoPresent : 1; + ULONG Reserved : 21; + }; + }; + PVOID ImageBase; + ULONG ImageSelector; + SIZE_T ImageSize; + ULONG ImageSectionNumber; +} IMAGE_INFO, *PIMAGE_INFO; + typedef VOID (WINAPI *PDRIVER_REINITIALIZE)(PDRIVER_OBJECT,PVOID,ULONG); +typedef VOID (WINAPI *PLOAD_IMAGE_NOTIFY_ROUTINE)(PUNICODE_STRING,HANDLE,PIMAGE_INFO); typedef NTSTATUS (WINAPI *PIO_QUERY_DEVICE_ROUTINE)(PVOID,PUNICODE_STRING,INTERFACE_TYPE,ULONG, PKEY_VALUE_FULL_INFORMATION*,CONFIGURATION_TYPE,ULONG,PKEY_VALUE_FULL_INFORMATION*); @@ -115,5 +136,6 @@ NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_ PCONFIGURATION_TYPE,PULONG,PIO_QUERY_DEVICE_ROUTINE,PVOID); void WINAPI IoRegisterDriverReinitialization(PDRIVER_OBJECT,PDRIVER_REINITIALIZE,PVOID); NTSTATUS WINAPI IoRegisterShutdownNotification(PDEVICE_OBJECT); +NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); #endif

1 0

Marcus Meissner : kernel32: Added missing break (Coverity).
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 7cd22f7037514187a97ff18a1a7147c1745d26c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cd22f7037514187a97ff18a1… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Mar 18 23:21:35 2011 +0100 kernel32: Added missing break (Coverity). --- dlls/kernel32/computername.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/computername.c b/dlls/kernel32/computername.c index dabaae8..8650440 100644 --- a/dlls/kernel32/computername.c +++ b/dlls/kernel32/computername.c @@ -131,8 +131,10 @@ static BOOL dns_fqdn ( char *name, int *size ) { case ENAMETOOLONG: SetLastError ( ERROR_MORE_DATA ); + break; default: SetLastError ( ERROR_INVALID_PARAMETER ); + break; } return FALSE; }

1 0

Marcus Meissner : krnl386.exe16: Added missing break to dma code (Coverity) .
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: a9c5c3d6c949f6149aeadcf6b4afdfb83a246b40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c5c3d6c949f6149aeadcf6b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Mar 18 23:01:39 2011 +0100 krnl386.exe16: Added missing break to dma code (Coverity). --- dlls/krnl386.exe16/dma.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/krnl386.exe16/dma.c b/dlls/krnl386.exe16/dma.c index c356ac9..a0c4050 100644 --- a/dlls/krnl386.exe16/dma.c +++ b/dlls/krnl386.exe16/dma.c @@ -373,6 +373,7 @@ BYTE DMA_ioport_in( WORD port ) /* Status */ TRACE("Status Register Read\n"); res = DMA_Status[(port==0x08)?0:1]; + break; case 0x0D: case 0xDA:

1 0