November 2009 - Wine-Commits

Rob Shearman : widl: Enhance the IDL grammar to support unnamed arguments to functions.
by Alexandre Julliard Nov. 9, 2009

Nov. 9, 2009

Module: wine Branch: master Commit: c3676245348b0222b1c2b61dc24b26ad35a23b07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3676245348b0222b1c2b61dc… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Nov 7 15:54:24 2009 +0100 widl: Enhance the IDL grammar to support unnamed arguments to functions. --- tools/widl/parser.y | 64 ++++++++++++++++++++++++++++++++++++------------ tools/widl/typetree.c | 56 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 103 insertions(+), 17 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index b12741c..64f92b0 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -121,7 +121,7 @@ static type_t *find_type_or_error2(char *name, int t); static var_t *reg_const(var_t *var); static char *gen_name(void); -static void check_arg(var_t *arg); +static void check_arg_attrs(const var_t *arg); static void check_statements(const statement_list_t *stmts, int is_inside_library); static void check_all_user_types(const statement_list_t *stmts); static attr_list_t *check_iface_attrs(const char *name, attr_list_t *attrs); @@ -292,9 +292,10 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s %type <ifref> coclass_int %type <ifref_list> coclass_ints %type <var> arg ne_union_field union_field s_field case enum declaration -%type <var_list> m_args no_args args fields ne_union_fields cases enums enum_list dispint_props field +%type <var_list> m_args args fields ne_union_fields cases enums enum_list dispint_props field %type <var> m_ident ident %type <declarator> declarator direct_declarator init_declarator +%type <declarator> m_any_declarator any_declarator any_declarator_no_ident any_direct_declarator %type <declarator_list> declarator_list %type <func> funcdef %type <type> coclass coclasshdr coclassdef @@ -425,23 +426,19 @@ m_args: { $$ = NULL; } | args ; -no_args: tVOID { $$ = NULL; } - ; - -args: arg { check_arg($1); $$ = append_var( NULL, $1 ); } - | args ',' arg { check_arg($3); $$ = append_var( $1, $3); } - | no_args +args: arg { check_arg_attrs($1); $$ = append_var( NULL, $1 ); } + | args ',' arg { check_arg_attrs($3); $$ = append_var( $1, $3); } ; /* split into two rules to get bison to resolve a tVOID conflict */ -arg: attributes decl_spec declarator { $$ = $3->var; +arg: attributes decl_spec m_any_declarator { $$ = $3->var; $$->attrs = $1; if ($2->stgclass != STG_NONE && $2->stgclass != STG_REGISTER) error_loc("invalid storage class for function parameter\n"); set_type($$, $2, $3, TRUE); free($3); } - | decl_spec declarator { $$ = $2->var; + | decl_spec m_any_declarator { $$ = $2->var; if ($1->stgclass != STG_NONE && $1->stgclass != STG_REGISTER) error_loc("invalid storage class for function parameter\n"); set_type($$, $1, $2, TRUE); @@ -945,6 +942,45 @@ direct_declarator: } ; +/* abstract or non-abstract declarator */ +any_declarator: + '*' m_type_qual_list m_any_declarator %prec PPTR + { $$ = $3; $$->type = append_ptrchain_type($$->type, type_new_pointer(pointer_default, NULL, $2)); } + | callconv m_any_declarator { $$ = $2; $$->type->attrs = append_attr($$->type->attrs, make_attrp(ATTR_CALLCONV, $1)); } + | any_direct_declarator + ; + +/* abstract or non-abstract declarator without accepting idents */ +any_declarator_no_ident: + '*' m_type_qual_list m_any_declarator %prec PPTR + { $$ = $3; $$->type = append_ptrchain_type($$->type, type_new_pointer(pointer_default, NULL, $2)); } + | callconv m_any_declarator { $$ = $2; $$->type->attrs = append_attr($$->type->attrs, make_attrp(ATTR_CALLCONV, $1)); } + ; + +/* abstract or non-abstract declarator or empty */ +m_any_declarator: { $$ = make_declarator(NULL); } + | any_declarator + ; + +/* abstract or non-abstract direct declarator. note: idents aren't accepted + * inside brackets to avoid ambiguity with the rule for function arguments */ +any_direct_declarator: + ident { $$ = make_declarator($1); } + | '(' any_declarator_no_ident ')' { $$ = $2; } + | any_direct_declarator array { $$ = $1; $$->array = append_array($$->array, $2); } + | array { $$ = make_declarator(NULL); $$->array = append_array($$->array, $1); } + | '(' m_args ')' + { $$ = make_declarator(NULL); + $$->func_type = append_ptrchain_type($$->type, type_new_function($2)); + $$->type = NULL; + } + | any_direct_declarator '(' m_args ')' + { $$ = $1; + $$->func_type = append_ptrchain_type($$->type, type_new_function($3)); + $$->type = NULL; + } + ; + declarator_list: declarator { $$ = append_declarator( NULL, $1 ); } | declarator_list ',' declarator { $$ = append_declarator( $1, $3 ); } @@ -1532,7 +1568,7 @@ static declarator_list_t *append_declarator(declarator_list_t *list, declarator_ static declarator_t *make_declarator(var_t *var) { declarator_t *d = xmalloc(sizeof(*d)); - d->var = var; + d->var = var ? var : make_var(NULL); d->type = NULL; d->func_type = NULL; d->array = NULL; @@ -1979,14 +2015,10 @@ static attr_list_t *check_function_attrs(const char *name, attr_list_t *attrs) return attrs; } -static void check_arg(var_t *arg) +static void check_arg_attrs(const var_t *arg) { - const type_t *t = arg->type; const attr_t *attr; - if (type_get_type(t) == TYPE_VOID) - error_loc("argument '%s' has void type\n", arg->name); - if (arg->attrs) { LIST_FOR_EACH_ENTRY(attr, arg->attrs, const attr_t, entry) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 4359d92..07393f4 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -63,9 +63,63 @@ type_t *make_type(enum type_type type) return t; } +static const var_t *find_arg(const var_list_t *args, const char *name) +{ + const var_t *arg; + + if (args) LIST_FOR_EACH_ENTRY(arg, args, const var_t, entry) + { + if (arg->name && !strcmp(name, arg->name)) + return arg; + } + + return NULL; +} + type_t *type_new_function(var_list_t *args) { - type_t *t = make_type(TYPE_FUNCTION); + var_t *arg; + type_t *t; + unsigned int i = 0; + + if (args) + { + arg = LIST_ENTRY(list_head(args), var_t, entry); + if (list_count(args) == 1 && !arg->name && arg->type && type_get_type(arg->type) == TYPE_VOID) + { + list_remove(&arg->entry); + free(arg); + free(args); + args = NULL; + } + } + if (args) LIST_FOR_EACH_ENTRY(arg, args, var_t, entry) + { + if (arg->type && type_get_type(arg->type) == TYPE_VOID) + error_loc("argument '%s' has void type\n", arg->name); + if (!arg->name) + { + if (i > 26 * 26) + error_loc("too many unnamed arguments\n"); + else + { + int unique; + do + { + char name[3]; + name[0] = i > 26 ? 'a' + i / 26 : 'a' + i; + name[1] = i > 26 ? 'a' + i % 26 : 0; + name[2] = 0; + unique = !find_arg(args, name); + if (unique) + arg->name = xstrdup(name); + i++; + } while (!unique); + } + } + } + + t = make_type(TYPE_FUNCTION); t->details.function = xmalloc(sizeof(*t->details.function)); t->details.function->args = args; t->details.function->idx = -1;

1 0

Rob Shearman : Revert "widl: A structure that contains an embedded interface ptr in an array is a BOGUS_STRUCT .".
by Alexandre Julliard Nov. 9, 2009

Nov. 9, 2009

Module: wine Branch: master Commit: d59ff2007d67e150eb85511c2c522b9bb39d51e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d59ff2007d67e150eb85511c2… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Nov 7 13:29:19 2009 +0100 Revert "widl: A structure that contains an embedded interface ptr in an array is a BOGUS_STRUCT.". This reverts commit e4e21193c049085dffe9475c9c9bdf9ae6807401. The IDBProperties test shows that this special case is not needed to for these types to be marshalled correctly. --- tools/widl/typegen.c | 62 +------------------------------------------------- 1 files changed, 1 insertions(+), 61 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index b41dcbe..1f8e4fe 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -229,64 +229,6 @@ enum typegen_type typegen_detect_type(const type_t *type, const attr_list_t *att return TGT_INVALID; } -static type_t *get_user_type(const type_t *t, const char **pname); - -static int type_contains_iface(const type_t *type) -{ - enum typegen_type typegen_type; - var_list_t *fields; - const var_t *field; - - typegen_type = typegen_detect_type(type, type->attrs, TDT_IGNORE_STRINGS); - - switch(typegen_type) - { - case TGT_USER_TYPE: - return type_contains_iface(get_user_type(type, NULL)); - - case TGT_BASIC: - case TGT_ENUM: - return FALSE; - - case TGT_POINTER: - return type_contains_iface(type_pointer_get_ref(type)); - - case TGT_ARRAY: - return type_contains_iface(type_array_get_element(type)); - - case TGT_IFACE_POINTER: - return TRUE; - - case TGT_STRUCT: - fields = type_struct_get_fields(type); - if (fields) LIST_FOR_EACH_ENTRY( field, fields, const var_t, entry ) - { - if(type_contains_iface(field->type)) - return TRUE; - } - return FALSE; - - case TGT_UNION: - fields = type_union_get_cases(type); - if (fields) LIST_FOR_EACH_ENTRY( field, fields, const var_t, entry ) - { - if(field->type && type_contains_iface(field->type)) - return TRUE; - } - return FALSE; - - case TGT_STRING: - /* shouldn't get here because of TDT_IGNORE_STRINGS above. fall through */ - case TGT_INVALID: - case TGT_CTXT_HANDLE: - case TGT_CTXT_HANDLE_POINTER: - /* checking after parsing should mean that we don't get here. if we do, - * it's a checker bug */ - assert(0); - } - return FALSE; -} - unsigned char get_struct_fc(const type_t *type) { int has_pointer = 0; @@ -345,10 +287,8 @@ unsigned char get_struct_fc(const type_t *type) if (get_enum_fc(t) == RPC_FC_ENUM16) return RPC_FC_BOGUS_STRUCT; break; - case TGT_ARRAY: - if(type_contains_iface(type_array_get_element(t))) - return RPC_FC_BOGUS_STRUCT; case TGT_POINTER: + case TGT_ARRAY: if (get_pointer_fc(t, field->attrs, FALSE) == RPC_FC_RP || pointer_size != 4) return RPC_FC_BOGUS_STRUCT; has_pointer = 1;

1 0

Marcus Meissner : crypt32: Pass the correct pointer into CertificateFindStore.
by Alexandre Julliard Nov. 9, 2009

Nov. 9, 2009

Module: wine Branch: master Commit: c25753ece29f8b65fa49a80f983735ddf0a9c3b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c25753ece29f8b65fa49a80f9… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Nov 9 13:44:22 2009 +0100 crypt32: Pass the correct pointer into CertificateFindStore. --- dlls/crypt32/tests/cert.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 4dc8846..e1c8262 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1089,7 +1089,7 @@ static void testFindCert(void) * the issuer, not the subject */ context = CertFindCertificateInStore(store, X509_ASN_ENCODING, 0, - CERT_FIND_SUBJECT_CERT, &certInfo.Subject, NULL); + CERT_FIND_SUBJECT_CERT, &certInfo, NULL); ok(context == NULL, "Expected no certificate\n"); certInfo.Subject.pbData = NULL; certInfo.Subject.cbData = 0; @@ -1102,7 +1102,7 @@ static void testFindCert(void) if (context) { context = CertFindCertificateInStore(store, X509_ASN_ENCODING, 0, - CERT_FIND_SUBJECT_CERT, &certInfo.Subject, context); + CERT_FIND_SUBJECT_CERT, &certInfo, context); ok(context == NULL, "Expected one cert only\n"); } /* A non-matching serial number will not match. */

1 0

Rob Shearman : oledb32: Add test for marshalling IDBProperties.
by Alexandre Julliard Nov. 9, 2009

Nov. 9, 2009

Module: wine Branch: master Commit: d5ef09409d202eb9f4437e33bea5ae2242d85ecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5ef09409d202eb9f4437e33b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Nov 7 13:29:11 2009 +0100 oledb32: Add test for marshalling IDBProperties. --- dlls/oledb32/tests/Makefile.in | 5 +- dlls/oledb32/tests/marshal.c | 271 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 274 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d5ef09409d202eb9f4437…

1 0

Eric Pouech : mmsystem.dll16: Correctly send messages up to winmm.dll.
by Alexandre Julliard Nov. 9, 2009

Nov. 9, 2009

Module: wine Branch: master Commit: 8575935f610bafd3b3529d4243ca36b9a7fc6deb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8575935f610bafd3b3529d424… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Nov 8 15:09:46 2009 +0100 mmsystem.dll16: Correctly send messages up to winmm.dll. Spotted by Christian Costa. --- dlls/mmsystem.dll16/message16.c | 40 +++++++++++++++++++++++++++++++++++--- 1 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/mmsystem.dll16/message16.c b/dlls/mmsystem.dll16/message16.c index af1c6c9..ce25b9c 100644 --- a/dlls/mmsystem.dll16/message16.c +++ b/dlls/mmsystem.dll16/message16.c @@ -979,10 +979,42 @@ DWORD MMSYSTDRV_Message(void* h, UINT msg, DWORD_PTR param1, DWORD_PTR param2) switch (thunk->kind) { case MMSYSTDRV_MIXER: ret = mixerMessage (h, msg, param1, param2); break; - case MMSYSTDRV_MIDIIN: ret = midiInMessage (h, msg, param1, param2); break; - case MMSYSTDRV_MIDIOUT: ret = midiOutMessage(h, msg, param1, param2); break; - case MMSYSTDRV_WAVEIN: ret = waveInMessage (h, msg, param1, param2); break; - case MMSYSTDRV_WAVEOUT: ret = waveOutMessage(h, msg, param1, param2); break; + case MMSYSTDRV_MIDIIN: + switch (msg) + { + case MIDM_ADDBUFFER: ret = midiInAddBuffer(h, (LPMIDIHDR)param1, param2); break; + case MIDM_PREPARE: ret = midiInPrepareHeader(h, (LPMIDIHDR)param1, param2); break; + case MIDM_UNPREPARE: ret = midiInUnprepareHeader(h, (LPMIDIHDR)param1, param2); break; + default: ret = midiInMessage(h, msg, param1, param2); break; + } + break; + case MMSYSTDRV_MIDIOUT: + switch (msg) + { + case MODM_PREPARE: ret = midiOutPrepareHeader(h, (LPMIDIHDR)param1, param2); break; + case MODM_UNPREPARE: ret = midiOutUnprepareHeader(h, (LPMIDIHDR)param1, param2); break; + case MODM_LONGDATA: ret = midiOutLongMsg(h, (LPMIDIHDR)param1, param2); break; + default: ret = midiOutMessage(h, msg, param1, param2); break; + } + break; + case MMSYSTDRV_WAVEIN: + switch (msg) + { + case WIDM_ADDBUFFER: ret = waveInAddBuffer(h, (LPWAVEHDR)param1, param2); break; + case WIDM_PREPARE: ret = waveInPrepareHeader(h, (LPWAVEHDR)param1, param2); break; + case WIDM_UNPREPARE: ret = waveInUnprepareHeader(h, (LPWAVEHDR)param1, param2); break; + default: ret = waveInMessage(h, msg, param1, param2); break; + } + break; + case MMSYSTDRV_WAVEOUT: + switch (msg) + { + case WODM_PREPARE: ret = waveOutPrepareHeader(h, (LPWAVEHDR)param1, param2); break; + case WODM_UNPREPARE: ret = waveOutUnprepareHeader(h, (LPWAVEHDR)param1, param2); break; + case WODM_WRITE: ret = waveOutWrite(h, (LPWAVEHDR)param1, param2); break; + default: ret = waveOutMessage(h, msg, param1, param2); break; + } + break; default: ret = MMSYSERR_INVALHANDLE; break; /* should never be reached */ } if (map == MMSYSTEM_MAP_OKMEM)

1 0

Eric Pouech : winhlp32: Added support for macros as hotspots' target.
by Alexandre Julliard Nov. 9, 2009

Nov. 9, 2009

Module: wine Branch: master Commit: 3fac812bd9019a98f27aa13f0e84b1ba524845a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fac812bd9019a98f27aa13f0… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Nov 8 15:04:59 2009 +0100 winhlp32: Added support for macros as hotspots' target. --- programs/winhlp32/hlpfile.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index f6c1137..2d685ae 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -797,29 +797,35 @@ static void HLPFILE_AddHotSpotLinks(struct RtfData* rd, HLPFILE* file, */ str += strlen(str) + 1; /* skip hotspot name */ + hslink = NULL; switch (start[7 + 15 * i + 0]) /* The next two chars always look like 0x04 0x00 ??? * What are they for ? */ { + case 0xC8: + hslink = (HLPFILE_HOTSPOTLINK*) + HLPFILE_AllocLink(rd, hlp_link_macro, str, -1, 0, 0, 1, -1); + break; + case 0xE6: case 0xE7: hslink = (HLPFILE_HOTSPOTLINK*) HLPFILE_AllocLink(rd, (start[7 + 15 * i + 0] & 1) ? hlp_link_link : hlp_link_popup, file->lpszPath, -1, HLPFILE_Hash(str), 0, 1, -1); - if (hslink) - { - hslink->x = GET_USHORT(start, 7 + 15 * i + 3); - hslink->y = GET_USHORT(start, 7 + 15 * i + 5); - hslink->width = GET_USHORT(start, 7 + 15 * i + 7); - hslink->height = GET_USHORT(start, 7 + 15 * i + 9); - /* target = GET_UINT(start, 7 + 15 * i + 11); */ - } break; default: WINE_FIXME("unknown hotsport target 0x%x\n", start[7 + 15 * i + 0]); } + if (hslink) + { + hslink->x = GET_USHORT(start, 7 + 15 * i + 3); + hslink->y = GET_USHORT(start, 7 + 15 * i + 5); + hslink->width = GET_USHORT(start, 7 + 15 * i + 7); + hslink->height = GET_USHORT(start, 7 + 15 * i + 9); + /* target = GET_UINT(start, 7 + 15 * i + 11); */ + } str += strlen(str) + 1; } }

1 0

Stefan Dösinger : d3d9: Make the visual test read the backbuffer.
by Alexandre Julliard Nov. 9, 2009

Nov. 9, 2009

Module: wine Branch: master Commit: 69612bb24191a9bfe858284624daecb2eb7e2e0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=69612bb24191a9bfe85828462… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Nov 7 15:53:42 2009 +0100 d3d9: Make the visual test read the backbuffer. --- dlls/d3d9/tests/visual.c | 417 +++++++++++++++++++++++++--------------------- 1 files changed, 226 insertions(+), 191 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69612bb24191a9bfe8582…

1 0

Stefan Dösinger : d3d9: Run the visual tests in a window.
by Alexandre Julliard Nov. 9, 2009

Nov. 9, 2009

Module: wine Branch: master Commit: b49a9cbfd218faade32f3bd1675d5e001975ba64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b49a9cbfd218faade32f3bd16… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Nov 7 15:54:11 2009 +0100 d3d9: Run the visual tests in a window. --- dlls/d3d9/tests/visual.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index bf0503c..55de959 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -43,7 +43,8 @@ static HWND create_window(void) RegisterClass(&wc); ret = CreateWindow("d3d9_test_wc", "d3d9_test", - WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, 640, 480, 0, 0, 0, 0); + WS_SYSMENU | WS_POPUP , 0, 0, 640, 480, 0, 0, 0, 0); + ShowWindow(ret, SW_SHOW); return ret; } @@ -177,7 +178,7 @@ static IDirect3DDevice9 *init_d3d9(void) } ZeroMemory(&present_parameters, sizeof(present_parameters)); - present_parameters.Windowed = FALSE; + present_parameters.Windowed = TRUE; present_parameters.hDeviceWindow = create_window(); present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; present_parameters.BackBufferWidth = 640;

1 0

Eric Pouech : richedit: When inserting an OLE object from an RTF stream, don't force update as the stream is not fully read.
by Alexandre Julliard Nov. 9, 2009

Nov. 9, 2009

Module: wine Branch: master Commit: 38df8cfb048c55fe6545ec278f0fe3ff4c0b4c72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38df8cfb048c55fe6545ec278… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Nov 8 15:04:53 2009 +0100 richedit: When inserting an OLE object from an RTF stream, don't force update as the stream is not fully read. --- dlls/riched20/editor.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b5ad21c..4bc901e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1149,8 +1149,8 @@ static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE hemf, HBITMAP hbm reobject.dwFlags = 0; /* FIXME */ reobject.dwUser = 0; - /* FIXME: could be simpler */ - ret = IRichEditOle_InsertObject(info->lpRichEditOle, &reobject) == S_OK; + ME_InsertOLEFromCursor(info->editor, &reobject, 0); + ret = TRUE; } if (lpObject) IOleObject_Release(lpObject);

1 0

Eric Pouech : winedbg: In proxy mode, correctly init the wine_segs fields.
by Alexandre Julliard Nov. 9, 2009

Nov. 9, 2009

Module: wine Branch: master Commit: a116f78dedaf05a8b3f44bf5d56a5b76faaccacc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a116f78dedaf05a8b3f44bf5d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Nov 8 15:08:11 2009 +0100 winedbg: In proxy mode, correctly init the wine_segs fields. --- programs/winedbg/gdbproxy.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 8afabe4..4794b06 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1776,10 +1776,7 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) { char buf[64]; - if (gdbctx->wine_segs[0] == 0 && gdbctx->wine_segs[1] == 0 && - gdbctx->wine_segs[2] == 0) - return packet_error; - snprintf(buf, sizeof(buf), + snprintf(buf, sizeof(buf), "Text=%08lx;Data=%08lx;Bss=%08lx", gdbctx->wine_segs[0], gdbctx->wine_segs[1], gdbctx->wine_segs[2]); @@ -2284,6 +2281,8 @@ static BOOL gdb_init_context(struct gdb_context* gdbctx, unsigned flags) gdbctx->process = NULL; for (i = 0; i < NUM_XPOINT; i++) gdbctx->Xpoints[i].type = -1; + for (i = 0; i < sizeof(gdbctx->wine_segs) / sizeof(gdbctx->wine_segs[0]); i++) + gdbctx->wine_segs[i] = 0; /* wait for first trap */ while (WaitForDebugEvent(&de, INFINITE))

1 0