wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

Frédéric Delanoy : wineserver: Fix French manpage .
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: 23401183166283ecb8763b14a7d8a515e9be9e72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23401183166283ecb8763b14a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Apr 9 01:33:52 2010 +0200 wineserver: Fix French manpage. --- server/wineserver.fr.man.in | 53 ++++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 26 deletions(-) diff --git a/server/wineserver.fr.man.in b/server/wineserver.fr.man.in index 4726fef..c48f734 100644 --- a/server/wineserver.fr.man.in +++ b/server/wineserver.fr.man.in @@ -1,6 +1,6 @@ .\" -*- nroff -*- -.TH WINESERVER 1 "Janvier 2008" "@PACKAGE_STRING@" "Windows sur Unix" -.SH NAME +.TH WINESERVER 1 "avril 2010" "@PACKAGE_STRING@" "Windows sur Unix" +.SH NOM wineserver \- le serveur Wine .SH SYNOPSIS .BI wineserver\ [options] @@ -12,8 +12,8 @@ que le noyau de Windows fournit sous Windows. .B wineserver est normalement exécuté automatiquement lorsque \fBwine\fR(1) est démarré, vous ne devriez donc pas vous en préoccuper. Néanmoins, dans certains cas, il -peut être utile de démarrer \fBwineserver\fR explicitement avec des options différentes, -comme expliqué ci-dessous. +peut être utile de démarrer \fBwineserver\fR explicitement avec certaines options, +comme expliqué ci-après. .SH OPTIONS .TP \fB\-d\fI[n]\fR, \fB--debug\fI[=n] @@ -23,7 +23,7 @@ Définit le niveau de débogage à pour un débogage plus important. Si .I n n'est pas spécifié, la valeur par défaut est 1. La sortie de débogage sera -stderr. \fBwine\fR(1) définit automatiquement le niveau de débogage lorsqu'il +stderr. \fBwine\fR(1) spécifie automatiquement le niveau de débogage lorsqu'il démarre \fBwineserver\fR si l'option +server est indiquée dans la variable WINEDEBUG. .TP @@ -37,19 +37,20 @@ Affiche un message d'aide. \fB\-k\fI[n]\fR, \fB--kill\fI[=n] Termine le .B wineserver -actuellement exécuté en envoyant optionnellement un signal \fIn\fR. Si +actuellement exécuté en envoyant facultativement un signal \fIn\fR. Si aucun signal n'est spécifié, un signal SIGINT est envoyé en premier, puis un signal SIGKILL. L'instance de \fBwineserver\fR qui est terminée est sélectionnée en fonction de la variable d'environnement WINEPREFIX. .TP \fB\-p\fI[n]\fR, \fB--persistent\fI[=n] -Spécifie le délai de persistance de \fBwineserver\fR ; c'est-à-dire le +Spécifie le délai de persistance de \fBwineserver\fR, c'est-à-dire le temps pendant lequel le serveur continuera de tourner après que tous les -processus clients auront été terminés. Ceci évite le coût inhérent à l'arrêt -puis au redémarrage du serveur lorsque des programmes sont lancés successivement. -Le délai d'attente \fIn\fR est exprimé en secondes, la valeur par défaut est -3 secondes. Si \fIn\fR n'est pas spécifié, le serveur reste en permanence. +processus clients se sont terminés. Ceci évite le coût inhérent à l'arrêt +puis au redémarrage du serveur lorsque des programmes sont lancés successivement +à intervalle rapproché. +Le délai d'attente \fIn\fR est exprimé en secondes (3 secondes par défaut). +Si \fIn\fR n'est pas spécifié, le serveur s'exécute indéfiniment. .TP .BR \-v ", " --version Affiche les informations sur la version et quitte. @@ -61,27 +62,27 @@ actuellement exécuté se termine. .SH VARIABLES D'ENVIRONNEMENT .TP .I WINEPREFIX -Si défini, le contenu de cette variable est pris comme le nom du répertoire où +Si définie, le contenu de cette variable est pris comme le nom du répertoire où .B wineserver stocke ses données (la valeur par défaut est \fI$HOME/.wine\fR). Tous les processus .B wine -utilisent le même +utilisant le même .B wineserver -(c'est-à-dire le même utilisateur) et partages certains éléments comme la base de registre, +(c'est-à-dire pour un même utilisateur) partagent certains éléments comme la base de registre, la mémoire partagée et les objets du noyau. -En définissant +En donnant à .I WINEPREFIX -à une valeur différente pour différent processus Wine, il est possible d'exécuter plusieurs -sessions de Wine indépendantes. +une valeur spécifique pour différents processus Wine, il est possible d'exécuter plusieurs +sessions de Wine totalement indépendantes. .TP .I WINESERVER Spécifie le chemin et le nom de l'exécutable .B wineserver -qui sera lancé automatiquement par \fBwine\fR. S'il n'est pas défini, -\fBwine\fR essaiera de charger -.IR @bindir@/wineserver , -et, s'il n'existe pas, il cherchera alors un fichier nommé -\fIwineserver\fR dans le chemin et dans quelques autres emplacements potentiels. +qui sera lancé automatiquement par \fBwine\fR. +Si cette variable n'est pas définie, Wine essaiera de charger +.I @bindir@/wineserver +ou, à défaut, un fichier nommé +\fIwineserver\fR dans le chemin système ou quelques autres emplacements potentiels. .SH FICHIERS .TP .B ~/.wine @@ -89,9 +90,9 @@ Répertoire contenant les données utilisateur gérées par .BR wine . .TP .BI /tmp/.wine- uid -Le répertoire contenant le connecteur Unix et le fichier cadenas. -Ces fichiers sont créés dans un sous-répertoire généré depuis le répertoire -WINEPREFIX et des numéros inode. +Le répertoire contenant le socket de serveur Unix et le fichier de verrouillage. +Ces fichiers sont créés dans un sous-répertoire dont le nom est généré à partir +des périphérique et numéros d'inodes du répertoire WINEPREFIX. .SH AUTEURS L'auteur originel de .B wineserver @@ -99,7 +100,7 @@ est Alexandre Julliard. Beaucoup d'autres personnes ont contribué de nouvelles et des correction d'anomalies. Référez-vous au fichier Changelog dans la distribution de Wine pour les détails complets. .SH ANOMALIES -Si vous rencontrez une anomalie, veuillez soumettre un rapport d'anomalie sur +Si vous détectez une anomalie, veuillez soumettre un rapport d'anomalie sur .UR http://bugs.winehq.org .BR http://bugs.winehq.org . .UE

1 0

Eric Pouech : winedbg: Use standard Wine lists for threads.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: e4c29f908759d3567fbfd5982780bc133ba2a2b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4c29f908759d3567fbfd5982… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 12 21:18:37 2010 +0200 winedbg: Use standard Wine lists for threads. --- programs/winedbg/debugger.h | 5 ++--- programs/winedbg/gdbproxy.c | 10 +++++----- programs/winedbg/tgt_active.c | 3 +-- programs/winedbg/winedbg.c | 23 ++++++++++------------- 4 files changed, 18 insertions(+), 23 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 2965389..8ebac1e 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -171,6 +171,7 @@ typedef struct tagTHREADNAME_INFO struct dbg_thread { + struct list entry; struct dbg_process* process; HANDLE handle; DWORD tid; @@ -181,8 +182,6 @@ struct dbg_thread int stopped_xpoint; /* xpoint on which the thread has stopped (-1 if none) */ struct dbg_breakpoint step_over_bp; char name[9]; - struct dbg_thread* next; - struct dbg_thread* prev; BOOL in_exception; /* TRUE if thread stopped with an exception */ EXCEPTION_RECORD excpt_record; /* only valid when in_exception is TRUE */ struct @@ -224,7 +223,7 @@ struct dbg_process const struct be_process_io* process_io; void* pio_data; const WCHAR* imageName; - struct dbg_thread* threads; + struct list threads; unsigned continue_on_first_exception : 1, active_debuggee : 1; struct dbg_breakpoint bp[MAX_BREAKPOINTS]; diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index c1dac01..3d8ccd5 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1105,7 +1105,7 @@ static enum packet_return packet_verbose(struct gdb_context* gdbctx) /* Now, I have this default action thing that needs to be applied to all non counted threads */ /* go through all the threads and stick their ids in the to be done list. */ - for (thd = gdbctx->process->threads; thd; thd = thd->next) + LIST_FOR_EACH_ENTRY(thd, &gdbctx->process->threads, struct dbg_thread, entry) { threadIDs[threadCount++] = thd->tid; /* check to see if we have more threads than I counted on, and tell the user what to do @@ -1725,10 +1725,10 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) packet_reply_open(gdbctx); packet_reply_add(gdbctx, "m", 1); - for (thd = gdbctx->process->threads; thd; thd = thd->next) + LIST_FOR_EACH_ENTRY(thd, &gdbctx->process->threads, struct dbg_thread, entry) { packet_reply_val(gdbctx, thd->tid, 4); - if (thd->next != NULL) + if (list_next(&gdbctx->process->threads, &thd->entry) != NULL) packet_reply_add(gdbctx, ",", 1); } packet_reply_close(gdbctx); @@ -1764,8 +1764,8 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) struct dbg_thread* thd; /* FIXME: doc says 16 bit val ??? */ /* grab first created thread, aka last in list */ - assert(gdbctx->process && gdbctx->process->threads); - for (thd = gdbctx->process->threads; thd->next; thd = thd->next); + assert(gdbctx->process && !list_empty(&gdbctx->process->threads)); + thd = LIST_ENTRY(list_tail(&gdbctx->process->threads), struct dbg_thread, entry); packet_reply_open(gdbctx); packet_reply_add(gdbctx, "QC", 2); packet_reply_val(gdbctx, thd->tid, 4); diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index c612615..0511063 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -46,8 +46,7 @@ static void dbg_init_current_thread(void* start) { if (start) { - if (dbg_curr_process->threads && - !dbg_curr_process->threads->next && /* first thread ? */ + if (list_count(&dbg_curr_process->threads) == 1 /* first thread ? */ && DBG_IVAR(BreakAllThreadsStartup)) { ADDRESS64 addr; diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 60a15ee..3e64506 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -79,7 +79,6 @@ * every function call to catch the errors * + BTW check also whether the exception mechanism is the best way to return * errors (or find a proper fix for MinGW port) - * + use Wine standard list mechanism for all list handling */ WINE_DEFAULT_DEBUG_CHANNEL(winedbg); @@ -305,7 +304,7 @@ struct dbg_process* dbg_add_process(const struct be_process_io* pio, DWORD pid, p->process_io = pio; p->pio_data = NULL; p->imageName = NULL; - p->threads = NULL; + list_init(&p->threads); p->continue_on_first_exception = FALSE; p->active_debuggee = FALSE; p->next_bp = 1; /* breakpoint 0 is reserved for step-over */ @@ -334,9 +333,12 @@ void dbg_set_process_name(struct dbg_process* p, const WCHAR* imageName) void dbg_del_process(struct dbg_process* p) { + struct dbg_thread* t; + struct dbg_thread* t2; int i; - while (p->threads) dbg_del_thread(p->threads); + LIST_FOR_EACH_ENTRY_SAFE(t, t2, &p->threads, struct dbg_thread, entry) + dbg_del_thread(t); for (i = 0; i < p->num_delayed_bp; i++) if (p->delayed_bp[i].is_symbol) @@ -447,9 +449,9 @@ struct dbg_thread* dbg_get_thread(struct dbg_process* p, DWORD tid) struct dbg_thread* t; if (!p) return NULL; - for (t = p->threads; t; t = t->next) - if (t->tid == tid) break; - return t; + LIST_FOR_EACH_ENTRY(t, &p->threads, struct dbg_thread, entry) + if (t->tid == tid) return t; + return NULL; } struct dbg_thread* dbg_add_thread(struct dbg_process* p, DWORD tid, @@ -477,10 +479,7 @@ struct dbg_thread* dbg_add_thread(struct dbg_process* p, DWORD tid, snprintf(t->name, sizeof(t->name), "%04x", tid); - t->next = p->threads; - t->prev = NULL; - if (p->threads) p->threads->prev = t; - p->threads = t; + list_add_head(&p->threads, &t->entry); return t; } @@ -488,9 +487,7 @@ struct dbg_thread* dbg_add_thread(struct dbg_process* p, DWORD tid, void dbg_del_thread(struct dbg_thread* t) { HeapFree(GetProcessHeap(), 0, t->frames); - if (t->prev) t->prev->next = t->next; - if (t->next) t->next->prev = t->prev; - if (t == t->process->threads) t->process->threads = t->next; + list_remove(&t->entry); if (t == dbg_curr_thread) dbg_curr_thread = NULL; HeapFree(GetProcessHeap(), 0, t); }

1 0

Eric Pouech : winedbg: Use standard Wine lists for processes.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: d9e42e87f2bfa4458190b915e0b08bd1ef984283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9e42e87f2bfa4458190b915e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 12 21:18:31 2010 +0200 winedbg: Use standard Wine lists for processes. --- programs/winedbg/debugger.h | 4 +- programs/winedbg/winedbg.c | 47 +++++++++++++++++++----------------------- 2 files changed, 23 insertions(+), 28 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index bb3c131..2965389 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -37,6 +37,7 @@ #include "cvconst.h" #include "objbase.h" #include "oaidl.h" +#include <wine/list.h> #define ADDRSIZE (be_cpu->pointer_size) #define ADDRWIDTH (ADDRSIZE * 2) @@ -217,6 +218,7 @@ struct dbg_delayed_bp #define MAX_BREAKPOINTS 100 struct dbg_process { + struct list entry; HANDLE handle; DWORD pid; const struct be_process_io* process_io; @@ -234,8 +236,6 @@ struct dbg_process char source_current_file[MAX_PATH]; int source_start_line; int source_end_line; - struct dbg_process* next; - struct dbg_process* prev; }; /* describes the way the debugger interacts with a given process */ diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 7a37805..60a15ee 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -91,7 +91,7 @@ DWORD_PTR dbg_curr_pid = 0; CONTEXT dbg_context; BOOL dbg_interactiveP = FALSE; -static struct dbg_process* dbg_process_list = NULL; +static struct list dbg_process_list = LIST_INIT(dbg_process_list); struct dbg_internal_var dbg_internal_vars[DBG_IV_LAST]; static HANDLE dbg_houtput; @@ -259,30 +259,25 @@ const struct dbg_internal_var* dbg_get_internal_var(const char* name) unsigned dbg_num_processes(void) { - struct dbg_process* p; - unsigned num = 0; - - for (p = dbg_process_list; p; p = p->next) - num++; - return num; + return list_count(&dbg_process_list); } struct dbg_process* dbg_get_process(DWORD pid) { struct dbg_process* p; - for (p = dbg_process_list; p; p = p->next) - if (p->pid == pid) break; - return p; + LIST_FOR_EACH_ENTRY(p, &dbg_process_list, struct dbg_process, entry) + if (p->pid == pid) return p; + return NULL; } struct dbg_process* dbg_get_process_h(HANDLE h) { struct dbg_process* p; - for (p = dbg_process_list; p; p = p->next) - if (p->handle == h) break; - return p; + LIST_FOR_EACH_ENTRY(p, &dbg_process_list, struct dbg_process, entry) + if (p->handle == h) return p; + return NULL; } struct dbg_process* dbg_add_process(const struct be_process_io* pio, DWORD pid, HANDLE h) @@ -323,10 +318,7 @@ struct dbg_process* dbg_add_process(const struct be_process_io* pio, DWORD pid, p->source_start_line = -1; p->source_end_line = -1; - p->next = dbg_process_list; - p->prev = NULL; - if (dbg_process_list) dbg_process_list->prev = p; - dbg_process_list = p; + list_add_head(&dbg_process_list, &p->entry); return p; } @@ -353,9 +345,7 @@ void dbg_del_process(struct dbg_process* p) HeapFree(GetProcessHeap(), 0, p->delayed_bp); source_nuke_path(p); source_free_files(p); - if (p->prev) p->prev->next = p->next; - if (p->next) p->next->prev = p->prev; - if (p == dbg_process_list) dbg_process_list = p->next; + list_remove(&p->entry); if (p == dbg_curr_process) dbg_curr_process = NULL; HeapFree(GetProcessHeap(), 0, (char*)p->imageName); HeapFree(GetProcessHeap(), 0, p); @@ -541,14 +531,16 @@ void dbg_set_option(const char* option, const char* val) BOOL dbg_interrupt_debuggee(void) { - if (!dbg_process_list) return FALSE; + struct dbg_process* p; + if (list_empty(&dbg_process_list)) return FALSE; /* FIXME: since we likely have a single process, signal the first process * in list */ - if (dbg_process_list->next) dbg_printf("Ctrl-C: only stopping the first process\n"); + p = LIST_ENTRY(list_head(&dbg_process_list), struct dbg_process, entry); + if (list_next(&dbg_process_list, &p->entry)) dbg_printf("Ctrl-C: only stopping the first process\n"); else dbg_printf("Ctrl-C: stopping debuggee\n"); - dbg_process_list->continue_on_first_exception = FALSE; - return DebugBreakProcess(dbg_process_list->handle); + p->continue_on_first_exception = FALSE; + return DebugBreakProcess(p->handle); } static BOOL WINAPI ctrl_c_handler(DWORD dwCtrlType) @@ -596,6 +588,9 @@ static int dbg_winedbg_usage(BOOL advanced) void dbg_start_interactive(HANDLE hFile) { + struct dbg_process* p; + struct dbg_process* p2; + if (dbg_curr_process) { dbg_printf("WineDbg starting on pid %04lx\n", dbg_curr_pid); @@ -605,8 +600,8 @@ void dbg_start_interactive(HANDLE hFile) dbg_interactiveP = TRUE; parser_handle(hFile); - while (dbg_process_list) - dbg_process_list->process_io->close_process(dbg_process_list, FALSE); + LIST_FOR_EACH_ENTRY_SAFE(p, p2, &dbg_process_list, struct dbg_process, entry) + p->process_io->close_process(p, FALSE); dbg_save_internal_vars(); }

1 0

Eric Pouech : winedbg: Merge pointer deref and array index functions into a single one.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: 2becd3349de5d7b4f1f1a428e5bc08294ba0f8a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2becd3349de5d7b4f1f1a428e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 12 21:18:25 2010 +0200 winedbg: Merge pointer deref and array index functions into a single one. --- programs/winedbg/debugger.h | 1 - programs/winedbg/expr.c | 4 +- programs/winedbg/memory.c | 2 +- programs/winedbg/types.c | 86 ++++++++++++++++++------------------------ programs/winedbg/winedbg.c | 2 - 5 files changed, 40 insertions(+), 55 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index b38d6bd..bb3c131 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -434,7 +434,6 @@ extern int print_types(void); extern long int types_extract_as_integer(const struct dbg_lvalue*); extern LONGLONG types_extract_as_longlong(const struct dbg_lvalue*, unsigned* psize); extern void types_extract_as_address(const struct dbg_lvalue*, ADDRESS64*); -extern BOOL types_deref(const struct dbg_lvalue* value, struct dbg_lvalue* result); extern BOOL types_udt_find_element(struct dbg_lvalue* value, const char* name, long int* tmpbuf); extern BOOL types_array_index(const struct dbg_lvalue* value, int index, struct dbg_lvalue* result); extern BOOL types_get_info(const struct dbg_type*, IMAGEHLP_SYMBOL_TYPE_INFO, void*); diff --git a/programs/winedbg/expr.c b/programs/winedbg/expr.c index 6b8c46f..66cd701 100644 --- a/programs/winedbg/expr.c +++ b/programs/winedbg/expr.c @@ -375,7 +375,7 @@ struct dbg_lvalue expr_eval(struct expr* exp) break; case EXPR_TYPE_PSTRUCT: exp1 = expr_eval(exp->un.structure.exp1); - if (exp1.type.id == dbg_itype_none || !types_deref(&exp1, &rtn) || + if (exp1.type.id == dbg_itype_none || !types_array_index(&exp1, 0, &rtn) || rtn.type.id == dbg_itype_none) RaiseException(DEBUG_STATUS_BAD_TYPE, 0, 0, NULL); if (!types_udt_find_element(&rtn, exp->un.structure.element_name, @@ -626,7 +626,7 @@ struct dbg_lvalue expr_eval(struct expr* exp) exp->un.unop.result = ~types_extract_as_integer(&exp1); break; case EXP_OP_DEREF: - if (!types_deref(&exp1, &rtn)) + if (!types_array_index(&exp1, 0, &rtn)) RaiseException(DEBUG_STATUS_BAD_TYPE, 0, 0, NULL); break; case EXP_OP_FORCE_DEREF: diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 76a103a..6560062 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -416,7 +416,7 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) } break; case SymTagPointerType: - if (!types_deref(lvalue, &sub_lvalue)) + if (!types_array_index(lvalue, 0, &sub_lvalue)) { dbg_printf("Internal symbol error: unable to access memory location %p", memory_to_linear_addr(&lvalue->addr)); diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 414bb9f..6d50c81 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -155,45 +155,6 @@ void types_extract_as_address(const struct dbg_lvalue* lvalue, ADDRESS64* addr) } /****************************************************************** - * types_deref - * - */ -BOOL types_deref(const struct dbg_lvalue* lvalue, struct dbg_lvalue* result) -{ - struct dbg_type type = lvalue->type; - DWORD tag; - - memset(result, 0, sizeof(*result)); - result->type.id = dbg_itype_none; - result->type.module = 0; - - /* - * Make sure that this really makes sense. - */ - if (!types_get_real_type(&type, &tag) || tag != SymTagPointerType || - !memory_read_value(lvalue, sizeof(result->addr.Offset), &result->addr.Offset) || - !types_get_info(&type, TI_GET_TYPE, &result->type.id)) - return FALSE; - result->type.module = type.module; - result->cookie = DLV_TARGET; - /* FIXME: this is currently buggy. - * there is no way to tell were the deref:ed value is... - * for example: - * x is a pointer to struct s, x being on the stack - * => lvalue is in debuggee, result is in debugger - * x is a pointer to struct s, x being optimized into a reg - * => lvalue is debugger, result is debuggee - * x is a pointer to internal variable x - * => lvalue is debugger, result is debuggee - * so we force debuggee address space, because dereferencing pointers to - * internal variables is very unlikely. A correct fix would be - * rather large. - */ - result->addr.Mode = AddrModeFlat; - return TRUE; -} - -/****************************************************************** * types_get_udt_element_lvalue * * Implement a structure derefencement @@ -301,24 +262,32 @@ BOOL types_udt_find_element(struct dbg_lvalue* lvalue, const char* name, long in * * Grab an element from an array */ -BOOL types_array_index(const struct dbg_lvalue* lvalue, int index, - struct dbg_lvalue* result) +BOOL types_array_index(const struct dbg_lvalue* lvalue, int index, struct dbg_lvalue* result) { struct dbg_type type = lvalue->type; DWORD tag, count; - DWORD64 length; + + memset(result, 0, sizeof(*result)); + result->type.id = dbg_itype_none; + result->type.module = 0; if (!types_get_real_type(&type, &tag)) return FALSE; - /* Contents of array share same data (addr mode, module...) */ - *result = *lvalue; switch (tag) { case SymTagArrayType: - types_get_info(&type, TI_GET_COUNT, &count); + if (!types_get_info(&type, TI_GET_COUNT, &count)) return FALSE; if (index < 0 || index >= count) return FALSE; + result->addr = lvalue->addr; break; case SymTagPointerType: - memory_read_value(lvalue, sizeof(result->addr.Offset), &result->addr.Offset); + if (!memory_read_value(lvalue, be_cpu->pointer_size, &result->addr.Offset)) return FALSE; + result->addr.Mode = AddrModeFlat; + switch (be_cpu->pointer_size) + { + case 4: result->addr.Offset = (DWORD)result->addr.Offset; break; + case 8: break; + default: assert(0); + } break; default: assert(FALSE); @@ -326,9 +295,28 @@ BOOL types_array_index(const struct dbg_lvalue* lvalue, int index, /* * Get the base type, so we know how much to index by. */ - types_get_info(&type, TI_GET_TYPE, &result->type.id); - types_get_info(&result->type, TI_GET_LENGTH, &length); - result->addr.Offset += index * (DWORD)length; + if (!types_get_info(&type, TI_GET_TYPE, &result->type.id)) return FALSE; + result->type.module = type.module; + if (index) + { + DWORD64 length; + if (!types_get_info(&result->type, TI_GET_LENGTH, &length)) return FALSE; + result->addr.Offset += index * (DWORD)length; + } + /* FIXME: the following statement is not always true (and can lead to buggy behavior). + * There is no way to tell were the deref:ed value is... + * For example: + * x is a pointer to struct s, x being on the stack + * => lvalue is in debuggee, result is in debugger + * x is a pointer to struct s, x being optimized into a reg + * => lvalue is debugger, result is debuggee + * x is a pointer to internal variable x + * => lvalue is debugger, result is debuggee + * So we always force debuggee address space, because dereferencing pointers to + * internal variables is very unlikely. A correct fix would be + * rather large. + */ + result->cookie = DLV_TARGET; return TRUE; } diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 6ce6db4..7a37805 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -55,8 +55,6 @@ * + all computations should be made on long long * o expr computations are in int:s * o bitfield size is on a 4-bytes - * + array_index and deref should be the same function (or should share the same - * core) * - execution: * + set a better fix for gdb (proxy mode) than the step-mode hack * + implement function call in debuggee

1 0

Eric Pouech : winedbg: Describe pointer size in CPU backend structure.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: 0d7a6f13a8c235a8bf10adb13c1a16e1347b919f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d7a6f13a8c235a8bf10adb13… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 12 21:18:18 2010 +0200 winedbg: Describe pointer size in CPU backend structure. --- programs/winedbg/be_alpha.c | 1 + programs/winedbg/be_cpu.h | 3 ++- programs/winedbg/be_i386.c | 1 + programs/winedbg/be_ppc.c | 1 + programs/winedbg/be_x86_64.c | 1 + programs/winedbg/debugger.h | 2 +- 6 files changed, 7 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_alpha.c b/programs/winedbg/be_alpha.c index 3c470e7..76cddb5 100644 --- a/programs/winedbg/be_alpha.c +++ b/programs/winedbg/be_alpha.c @@ -146,6 +146,7 @@ static int be_alpha_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, struct backend_cpu be_alpha = { IMAGE_FILE_MACHINE_ALPHA, + 8, be_cpu_linearize, be_cpu_build_addr, be_alpha_get_addr, diff --git a/programs/winedbg/be_cpu.h b/programs/winedbg/be_cpu.h index a08f8f0..005494d 100644 --- a/programs/winedbg/be_cpu.h +++ b/programs/winedbg/be_cpu.h @@ -23,7 +23,8 @@ enum be_xpoint_type {be_xpoint_break, be_xpoint_watch_exec, be_xpoint_watch_read be_xpoint_watch_write}; struct backend_cpu { - DWORD machine; + const DWORD machine; + const DWORD pointer_size; /* ------------------------------------------------------------------------------ * address manipulation * ------------------------------------------------------------------------------ */ diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 74676dd..d6111bd 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -738,6 +738,7 @@ static int be_i386_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, struct backend_cpu be_i386 = { IMAGE_FILE_MACHINE_I386, + 4, be_i386_linearize, be_i386_build_addr, be_i386_get_addr, diff --git a/programs/winedbg/be_ppc.c b/programs/winedbg/be_ppc.c index 22becf2..2377648 100644 --- a/programs/winedbg/be_ppc.c +++ b/programs/winedbg/be_ppc.c @@ -170,6 +170,7 @@ static int be_ppc_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, struct backend_cpu be_ppc = { IMAGE_FILE_MACHINE_POWERPC, + 4, be_cpu_linearize, be_cpu_build_addr, be_ppc_get_addr, diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 514310b..6099a78 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -547,6 +547,7 @@ static int be_x86_64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, struct backend_cpu be_x86_64 = { IMAGE_FILE_MACHINE_AMD64, + 8, be_cpu_linearize, be_cpu_build_addr, be_x86_64_get_addr, diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index d8e1ef4..b38d6bd 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -38,7 +38,7 @@ #include "objbase.h" #include "oaidl.h" -#define ADDRSIZE ((unsigned)sizeof(void*)) +#define ADDRSIZE (be_cpu->pointer_size) #define ADDRWIDTH (ADDRSIZE * 2) /* the debugger uses these exceptions for it's internal use */

1 0

Eric Pouech : winedbg: Properly guard against setting a watchpoint against a variable stored in a register .
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: e9a31f277019e620c716409c259b553b8ce3a6fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9a31f277019e620c716409c2… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 12 21:18:12 2010 +0200 winedbg: Properly guard against setting a watchpoint against a variable stored in a register. --- programs/winedbg/break.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index 6413c43..b1cef6a 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -373,6 +373,11 @@ static void break_add_watch(const struct dbg_lvalue* lvalue, BOOL is_write) int num; DWORD64 l = 4; + if (lvalue->cookie == DLV_HOST) + { + dbg_printf("Cannot set a watch point on register or register-based variable\n"); + return; + } num = init_xpoint((is_write) ? be_xpoint_watch_write : be_xpoint_watch_read, &lvalue->addr); if (num == -1) return;

1 0

Eric Pouech : winedbg: Fix buffer size for 8-byte watchpoint.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: a1986b20e77cfa0676a00782bb283b4e461b4aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1986b20e77cfa0676a00782b… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 12 21:18:05 2010 +0200 winedbg: Fix buffer size for 8-byte watchpoint. --- programs/winedbg/break.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index e35250c..6413c43 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -139,7 +139,7 @@ static int init_xpoint(int type, const ADDRESS64* addr) */ static BOOL get_watched_value(int num, DWORD64* val) { - BYTE buf[4]; + DWORD64 buf[1]; if (!dbg_read_memory(memory_to_linear_addr(&dbg_curr_process->bp[num].addr), buf, dbg_curr_process->bp[num].w.len + 1))

1 0

Damjan Jovanovic : ntoskrnl.exe: Stub out KeResetEvent and KeSetEvent.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: fcd33d6877917500426c918e89eca18c7800a3f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcd33d6877917500426c918e8… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Apr 12 20:35:19 2010 +0200 ntoskrnl.exe: Stub out KeResetEvent and KeSetEvent. --- dlls/ntoskrnl.exe/ntoskrnl.c | 20 ++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a6c79d3..e71f692 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1176,6 +1176,26 @@ ULONG WINAPI KeQueryTimeIncrement(void) /*********************************************************************** + * KeResetEvent (NTOSKRNL.EXE.@) + */ +LONG WINAPI KeResetEvent( PRKEVENT Event ) +{ + FIXME("(%p): stub\n", Event); + return 0; +} + + +/*********************************************************************** + * KeSetEvent (NTOSKRNL.EXE.@) + */ +LONG WINAPI KeSetEvent( PRKEVENT Event, KPRIORITY Increment, BOOLEAN Wait ) +{ + FIXME("(%p, %d, %d): stub\n", Event, Increment, Wait); + return 0; +} + + +/*********************************************************************** * KeSetPriorityThread (NTOSKRNL.EXE.@) */ KPRIORITY WINAPI KeSetPriorityThread( PKTHREAD Thread, KPRIORITY Priority ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 24b228e..1722393 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -597,7 +597,7 @@ @ stub KeRemoveQueue @ stub KeRemoveQueueDpc @ stub KeRemoveSystemServiceTable -@ stub KeResetEvent +@ stdcall KeResetEvent(ptr) @ stub KeRestoreFloatingPointState @ stub KeRevertToUserAffinityThread @ stub KeRundownQueue @@ -607,7 +607,7 @@ @ stub KeSetAffinityThread @ stub KeSetBasePriorityThread @ stub KeSetDmaIoCoherency -@ stub KeSetEvent +@ stdcall KeSetEvent(ptr long long) @ stub KeSetEventBoostPriority @ stub KeSetIdealProcessorThread @ stub KeSetImportanceDpc

1 0

Damjan Jovanovic : wdm.h: Define KeResetEvent and KeSetEvent.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: aadd2ac33f23c98c0e0a515dc4debd06825e238a URL: http://source.winehq.org/git/wine.git/?a=commit;h=aadd2ac33f23c98c0e0a515dc… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Apr 12 20:33:01 2010 +0200 wdm.h: Define KeResetEvent and KeSetEvent. --- include/ddk/wdm.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index b086ef7..e57be4b 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1082,6 +1082,8 @@ void WINAPI KeQuerySystemTime(LARGE_INTEGER*); void WINAPI KeQueryTickCount(LARGE_INTEGER*); ULONG WINAPI KeQueryTimeIncrement(void); LONG WINAPI KeReleaseSemaphore(PRKSEMAPHORE,KPRIORITY,LONG,BOOLEAN); +LONG WINAPI KeResetEvent(PRKEVENT); +LONG WINAPI KeSetEvent(PRKEVENT,KPRIORITY,BOOLEAN); KPRIORITY WINAPI KeSetPriorityThread(PKTHREAD,KPRIORITY); PVOID WINAPI MmAllocateContiguousMemory(SIZE_T,PHYSICAL_ADDRESS);

1 0

Vincent Povirk : ole32: Create storage files with 4096-byte blocks when asked.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: 0b149df98789a327afb38b982d7298fc6e4b677c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b149df98789a327afb38b982… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 12 14:01:01 2010 -0500 ole32: Create storage files with 4096-byte blocks when asked. --- dlls/ole32/storage32.c | 99 ++++++++++++++++++++++++++++++----------------- dlls/ole32/storage32.h | 2 + 2 files changed, 65 insertions(+), 36 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 9d36820..434d8b2 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2583,6 +2583,7 @@ static HRESULT StorageImpl_Construct( DWORD openFlags, BOOL fileBased, BOOL create, + ULONG sector_size, StorageImpl** result) { StorageImpl* This; @@ -2634,7 +2635,7 @@ static HRESULT StorageImpl_Construct( /* * Initialize the big block cache. */ - This->bigBlockSize = DEF_BIG_BLOCK_SIZE; + This->bigBlockSize = sector_size; This->smallBlockSize = DEF_SMALL_BLOCK_SIZE; This->bigBlockFile = BIGBLOCKFILE_Construct(hFile, pLkbyt, @@ -2667,7 +2668,10 @@ static HRESULT StorageImpl_Construct( This->rootStartBlock = 1; This->smallBlockLimit = LIMIT_TO_USE_SMALL_BLOCK; This->smallBlockDepotStart = BLOCK_END_OF_CHAIN; - This->bigBlockSizeBits = DEF_BIG_BLOCK_SIZE_BITS; + if (sector_size == 4096) + This->bigBlockSizeBits = MAX_BIG_BLOCK_SIZE_BITS; + else + This->bigBlockSizeBits = MIN_BIG_BLOCK_SIZE_BITS; This->smallBlockSizeBits = DEF_SMALL_BLOCK_SIZE_BITS; This->extBigBlockDepotStart = BLOCK_END_OF_CHAIN; This->extBigBlockDepotCount = 0; @@ -4355,13 +4359,14 @@ static HRESULT Storage_Construct( DWORD openFlags, BOOL fileBased, BOOL create, + ULONG sector_size, StorageBaseImpl** result) { StorageImpl *newStorage; StorageBaseImpl *newTransactedStorage; HRESULT hr; - hr = StorageImpl_Construct(hFile, pwcsName, pLkbyt, openFlags, fileBased, create, &newStorage); + hr = StorageImpl_Construct(hFile, pwcsName, pLkbyt, openFlags, fileBased, create, sector_size, &newStorage); if (FAILED(hr)) goto end; if (openFlags & STGM_TRANSACTED) @@ -6311,30 +6316,13 @@ static ULARGE_INTEGER SmallBlockChainStream_GetSize(SmallBlockChainStream* This) return chainEntry.size; } -/****************************************************************************** - * StgCreateDocfile [OLE32.@] - * Creates a new compound file storage object - * - * PARAMS - * pwcsName [ I] Unicode string with filename (can be relative or NULL) - * grfMode [ I] Access mode for opening the new storage object (see STGM_ constants) - * reserved [ ?] unused?, usually 0 - * ppstgOpen [IO] A pointer to IStorage pointer to the new onject - * - * RETURNS - * S_OK if the file was successfully created - * some STG_E_ value if error - * NOTES - * if pwcsName is NULL, create file with new unique name - * the function can returns - * STG_S_CONVERTED if the specified file was successfully converted to storage format - * (unrealized now) - */ -HRESULT WINAPI StgCreateDocfile( +static HRESULT create_storagefile( LPCOLESTR pwcsName, DWORD grfMode, - DWORD reserved, - IStorage **ppstgOpen) + DWORD grfAttrs, + STGOPTIONS* pStgOptions, + REFIID riid, + void** ppstgOpen) { StorageBaseImpl* newStorage = 0; HANDLE hFile = INVALID_HANDLE_VALUE; @@ -6345,13 +6333,10 @@ HRESULT WINAPI StgCreateDocfile( DWORD fileAttributes; WCHAR tempFileName[MAX_PATH]; - TRACE("(%s, %x, %d, %p)\n", - debugstr_w(pwcsName), grfMode, - reserved, ppstgOpen); - if (ppstgOpen == 0) return STG_E_INVALIDPOINTER; - if (reserved != 0) + + if (pStgOptions->ulSectorSize != MIN_BIG_BLOCK_SIZE && pStgOptions->ulSectorSize != MAX_BIG_BLOCK_SIZE) return STG_E_INVALIDPARAMETER; /* if no share mode given then DENY_NONE is the default */ @@ -6453,6 +6438,7 @@ HRESULT WINAPI StgCreateDocfile( grfMode, TRUE, TRUE, + pStgOptions->ulSectorSize, &newStorage); if (FAILED(hr)) @@ -6460,10 +6446,9 @@ HRESULT WINAPI StgCreateDocfile( goto end; } - /* - * Get an "out" pointer for the caller. - */ - *ppstgOpen = (IStorage*)newStorage; + hr = IStorage_QueryInterface((IStorage*)newStorage, riid, ppstgOpen); + + IStorage_Release((IStorage*)newStorage); end: TRACE("<-- %p r = %08x\n", *ppstgOpen, hr); @@ -6472,6 +6457,45 @@ end: } /****************************************************************************** + * StgCreateDocfile [OLE32.@] + * Creates a new compound file storage object + * + * PARAMS + * pwcsName [ I] Unicode string with filename (can be relative or NULL) + * grfMode [ I] Access mode for opening the new storage object (see STGM_ constants) + * reserved [ ?] unused?, usually 0 + * ppstgOpen [IO] A pointer to IStorage pointer to the new onject + * + * RETURNS + * S_OK if the file was successfully created + * some STG_E_ value if error + * NOTES + * if pwcsName is NULL, create file with new unique name + * the function can returns + * STG_S_CONVERTED if the specified file was successfully converted to storage format + * (unrealized now) + */ +HRESULT WINAPI StgCreateDocfile( + LPCOLESTR pwcsName, + DWORD grfMode, + DWORD reserved, + IStorage **ppstgOpen) +{ + STGOPTIONS stgoptions = {1, 0, 512}; + + TRACE("(%s, %x, %d, %p)\n", + debugstr_w(pwcsName), grfMode, + reserved, ppstgOpen); + + if (ppstgOpen == 0) + return STG_E_INVALIDPOINTER; + if (reserved != 0) + return STG_E_INVALIDPARAMETER; + + return create_storagefile(pwcsName, grfMode, 0, &stgoptions, &IID_IStorage, (void**)ppstgOpen); +} + +/****************************************************************************** * StgCreateStorageEx [OLE32.@] */ HRESULT WINAPI StgCreateStorageEx(const WCHAR* pwcsName, DWORD grfMode, DWORD stgfmt, DWORD grfAttrs, STGOPTIONS* pStgOptions, void* reserved, REFIID riid, void** ppObjectOpen) @@ -6499,10 +6523,10 @@ HRESULT WINAPI StgCreateStorageEx(const WCHAR* pwcsName, DWORD grfMode, DWORD st if (stgfmt == STGFMT_STORAGE || stgfmt == STGFMT_DOCFILE) { - FIXME("Stub: calling StgCreateDocfile, but ignoring pStgOptions and grfAttrs\n"); - return StgCreateDocfile(pwcsName, grfMode, 0, (IStorage **)ppObjectOpen); + return create_storagefile(pwcsName, grfMode, grfAttrs, pStgOptions, riid, ppObjectOpen); } + ERR("Invalid stgfmt argument\n"); return STG_E_INVALIDPARAMETER; } @@ -6725,6 +6749,7 @@ HRESULT WINAPI StgOpenStorage( grfMode, TRUE, FALSE, + 512, &newStorage); if (FAILED(hr)) @@ -6772,6 +6797,7 @@ HRESULT WINAPI StgCreateDocfileOnILockBytes( grfMode, FALSE, TRUE, + 512, &newStorage); if (FAILED(hr)) @@ -6819,6 +6845,7 @@ HRESULT WINAPI StgOpenStorageOnILockBytes( grfMode, FALSE, FALSE, + 512, &newStorage); if (FAILED(hr)) diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 98ec6d1..36a7d67 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -66,6 +66,8 @@ static const ULONG OFFSET_PS_MTIMEHIGH = 0x00000070; static const ULONG OFFSET_PS_STARTBLOCK = 0x00000074; static const ULONG OFFSET_PS_SIZE = 0x00000078; static const WORD DEF_BIG_BLOCK_SIZE_BITS = 0x0009; +static const WORD MIN_BIG_BLOCK_SIZE_BITS = 0x0009; +static const WORD MAX_BIG_BLOCK_SIZE_BITS = 0x000c; static const WORD DEF_SMALL_BLOCK_SIZE_BITS = 0x0006; static const WORD DEF_BIG_BLOCK_SIZE = 0x0200; static const WORD DEF_SMALL_BLOCK_SIZE = 0x0040;

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
90
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 April 2010