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

Eric Pouech : dbghelp: Return proper null value when lookup_type fails.
by Alexandre Julliard 28 Mar '11

28 Mar '11

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

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

28 Mar '11

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 : loader: Protect preloader against ELF file without loadable segments (clang).
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 7b544af170e3a89d606f41ae4b3bd5c5b4f5f167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b544af170e3a89d606f41ae4… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 26 12:16:51 2011 +0100 loader: Protect preloader against ELF file without loadable segments (clang). --- loader/preloader.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index e1c2276..a94c52c 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -788,6 +788,8 @@ static void map_so_lib( const char *name, struct wld_link_map *l) } /* Now process the load commands and map segments into memory. */ + if (!nloadcmds) + fatal_error( "%s: no segments to load\n", name ); c = loadcmds; /* Length of the sections to be loaded. */

1 0

Eric Pouech : winegcc: Check that option argument is within command line parameters.
by Alexandre Julliard 28 Mar '11

28 Mar '11

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

Gregory M. Turner : gdi32: Initialize SetLayout function pointer.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: c7f7848026c47e9a1cf1d5e11246d1aac05e6bf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7f7848026c47e9a1cf1d5e11… Author: Gregory M. Turner <gmturner007(a)ameritech.net> Date: Sat Mar 26 18:31:04 2011 +0000 gdi32: Initialize SetLayout function pointer. --- dlls/gdi32/driver.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index bdbb318..13bd7bd 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -165,6 +165,7 @@ static struct graphics_driver *create_driver( HMODULE module ) GET_FUNC(SetDIBitsToDevice); GET_FUNC(SetDeviceClipping); GET_FUNC(SetDeviceGammaRamp); + GET_FUNC(SetLayout); GET_FUNC(SetMapMode); GET_FUNC(SetMapperFlags); GET_FUNC(SetPixel);

1 0

Marcus Meissner : user32: Added missing break (Coverity).
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 3d44f4c8b35f0d244b59ad133734d3ace0088d85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d44f4c8b35f0d244b59ad133… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Mar 18 22:29:20 2011 +0100 user32: Added missing break (Coverity). --- dlls/user32/combo.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 3fc9112..9c22df6 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -2192,6 +2192,7 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar case CB_LIMITTEXT: if( lphc->wState & CBF_EDIT ) return SendMessageW(lphc->hWndEdit, EM_LIMITTEXT, wParam, lParam); + return TRUE; default: if (message >= WM_USER) WARN("unknown msg WM_USER+%04x wp=%04lx lp=%08lx\n",

1 0

Marcus Meissner : user32: Added missing break.
by Alexandre Julliard 28 Mar '11

28 Mar '11

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

Marcus Meissner : shell32: Missing break in IDOK case.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 97efdc1e0d7501dcccb168c33423d0d30dbe806a URL: http://source.winehq.org/git/wine.git/?a=commit;h=97efdc1e0d7501dcccb168c33… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Mar 18 22:36:10 2011 +0100 shell32: Missing break in IDOK case. --- dlls/shell32/dialogs.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index 8bc8062..84d8799 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -247,6 +247,7 @@ static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPAR EndDialog (hwnd, 0); } } + return TRUE; case IDCANCEL : EndDialog (hwnd, 0) ;

1 0

Marcus Meissner : krnl386.exe16: Added missing break to dma code (Coverity) .
by Alexandre Julliard 28 Mar '11

28 Mar '11

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

Marcus Meissner : dnsapi: Added missing breaks (Coverity).
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 409aae33ddabe413ef9aae5c63e1d994bfcbbcd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=409aae33ddabe413ef9aae5c6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Mar 18 23:18:31 2011 +0100 dnsapi: Added missing breaks (Coverity). --- dlls/dnsapi/record.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 9755a3d..15efbf1 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -376,6 +376,7 @@ static LPVOID dns_strcpyX( LPCVOID src, DNS_CHARSET in, DNS_CHARSET out ) WARN( "unhandled target charset: %d\n", out ); break; } + break; } case DnsCharSetUtf8: switch (out) @@ -387,6 +388,7 @@ static LPVOID dns_strcpyX( LPCVOID src, DNS_CHARSET in, DNS_CHARSET out ) WARN( "unhandled target charset: %d\n", out ); break; } + break; case DnsCharSetAnsi: switch (out) { @@ -397,6 +399,7 @@ static LPVOID dns_strcpyX( LPCVOID src, DNS_CHARSET in, DNS_CHARSET out ) WARN( "unhandled target charset: %d\n", out ); break; } + break; default: WARN( "unhandled source charset: %d\n", in ); break;

1 0