wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Eric Pouech : configure: Remove regex detection.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 7c7c56e3bf752f5472e35e1540a75b787c8d2b07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c7c56e3bf752f5472e35e154… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jan 22 12:58:10 2012 +0100 configure: Remove regex detection. --- configure | 1 - configure.ac | 1 - include/config.h.in | 3 --- 3 files changed, 0 insertions(+), 5 deletions(-) diff --git a/configure b/configure index ae531d0..fa17bcc 100755 --- a/configure +++ b/configure @@ -5810,7 +5810,6 @@ for ac_header in \ process.h \ pthread.h \ pwd.h \ - regex.h \ sched.h \ scsi/scsi.h \ scsi/scsi_ioctl.h \ diff --git a/configure.ac b/configure.ac index c9f6a63..5810111 100644 --- a/configure.ac +++ b/configure.ac @@ -447,7 +447,6 @@ AC_CHECK_HEADERS(\ process.h \ pthread.h \ pwd.h \ - regex.h \ sched.h \ scsi/scsi.h \ scsi/scsi_ioctl.h \ diff --git a/include/config.h.in b/include/config.h.in index 27c2783..dc1c189 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -656,9 +656,6 @@ /* Define to 1 if you have the `readlink' function. */ #undef HAVE_READLINK -/* Define to 1 if you have the <regex.h> header file. */ -#undef HAVE_REGEX_H - /* Define to 1 if the system has the type `request_sense'. */ #undef HAVE_REQUEST_SENSE

1 0

Eric Pouech : dbghelp: Use new regular expression matcher for files.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: f3107df57631dd56d39e90dcdbe12299b584c250 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3107df57631dd56d39e90dcd… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jan 22 12:58:04 2012 +0100 dbghelp: Use new regular expression matcher for files. --- dlls/dbghelp/symbol.c | 150 ++++++++++++++++++------------------------------ 1 files changed, 56 insertions(+), 94 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 96af50c..439b50e 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -30,9 +30,6 @@ #include <limits.h> #include <sys/types.h> #include <assert.h> -#ifdef HAVE_REGEX_H -# include <regex.h> -#endif #include "wine/debug.h" #include "dbghelp_private.h" @@ -138,101 +135,54 @@ static void symt_add_module_ht(struct module* module, struct symt_ht* ht) } } -#ifdef HAVE_REGEX_H - -static BOOL compile_file_regex(regex_t* re, const char* srcfile) +static WCHAR* file_regex(const char* srcfile) { - char *mask, *p; - BOOL ret; - - if (!srcfile || !*srcfile) return regcomp(re, ".*", REG_NOSUB); + WCHAR* mask; + WCHAR* p; - p = mask = HeapAlloc(GetProcessHeap(), 0, 5 * strlen(srcfile) + 4); - *p++ = '^'; - while (*srcfile) + if (!srcfile || !*srcfile) { - switch (*srcfile) - { - case '\\': - case '/': - *p++ = '['; - *p++ = '\\'; - *p++ = '\\'; - *p++ = '/'; - *p++ = ']'; - break; - case '.': - *p++ = '\\'; - *p++ = '.'; - break; - case '*': - *p++ = '.'; - *p++ = '*'; - break; - default: - *p++ = *srcfile; - break; - } - srcfile++; + if (!(p = mask = HeapAlloc(GetProcessHeap(), 0, 3 * sizeof(WCHAR)))) return NULL; + *p++ = '?'; + *p++ = '#'; } - *p++ = '$'; - *p = 0; - ret = !regcomp(re, mask, REG_NOSUB); - HeapFree(GetProcessHeap(), 0, mask); - if (!ret) + else { - FIXME("Couldn't compile %s\n", mask); - SetLastError(ERROR_INVALID_PARAMETER); - } - return ret; -} - -static int match_regexp( const regex_t *re, const char *str ) -{ - return !regexec( re, str, 0, NULL, 0 ); -} - -#else /* HAVE_REGEX_H */ - -/* if we don't have regexp support, fall back to a simple string comparison */ + DWORD sz = MultiByteToWideChar(CP_ACP, 0, srcfile, -1, NULL, 0); + WCHAR* srcfileW; -typedef struct -{ - char *str; - BOOL icase; -} regex_t; - -static void compile_regex(const char* str, int numchar, regex_t* re, BOOL _case) -{ - if (numchar == -1) numchar = strlen( str ); + /* FIXME: we use here the largest conversion for every char... could be optimized */ + p = mask = HeapAlloc(GetProcessHeap(), 0, (5 * strlen(srcfile) + 1 + sz) * sizeof(WCHAR)); + if (!mask) return NULL; + srcfileW = mask + 5 * strlen(srcfile) + 1; + MultiByteToWideChar(CP_ACP, 0, srcfile, -1, srcfileW, sz); - re->str = HeapAlloc( GetProcessHeap(), 0, numchar + 1 ); - memcpy( re->str, str, numchar ); - re->str[numchar] = 0; - re->icase = _case; -} - -static BOOL compile_file_regex(regex_t* re, const char* srcfile) -{ - if (!srcfile || !*srcfile) re->str = NULL; - else compile_regex( srcfile, -1, re, FALSE ); - return TRUE; -} - -static int match_regexp( const regex_t *re, const char *str ) -{ - if (!re->str) return 1; - if (re->icase) return !lstrcmpiA( re->str, str ); - return !strcmp( re->str, str ); -} - -static void regfree( regex_t *re ) -{ - HeapFree( GetProcessHeap(), 0, re->str ); + while (*srcfileW) + { + switch (*srcfileW) + { + case '\\': + case '/': + *p++ = '['; + *p++ = '\\'; + *p++ = '\\'; + *p++ = '/'; + *p++ = ']'; + break; + case '.': + *p++ = '?'; + break; + default: + *p++ = *srcfileW; + break; + } + srcfileW++; + } + } + *p = 0; + return mask; } -#endif /* HAVE_REGEX_H */ - struct symt_compiland* symt_new_compiland(struct module* module, unsigned long address, unsigned src_idx) { @@ -2136,7 +2086,7 @@ BOOL WINAPI SymEnumLines(HANDLE hProcess, ULONG64 base, PCSTR compiland, struct module_pair pair; struct hash_table_iter hti; struct symt_ht* sym; - regex_t re; + WCHAR* srcmask; struct line_info* dli; void* ptr; SRCCODEINFO sci; @@ -2150,7 +2100,7 @@ BOOL WINAPI SymEnumLines(HANDLE hProcess, ULONG64 base, PCSTR compiland, if (compiland) FIXME("Unsupported yet (filtering on compiland %s)\n", compiland); pair.requested = module_find_by_addr(pair.pcs, base, DMT_UNKNOWN); if (!module_get_debug(&pair)) return FALSE; - if (!compile_file_regex(&re, srcfile)) return FALSE; + if (!(srcmask = file_regex(srcfile))) return FALSE; sci.SizeOfStruct = sizeof(sci); sci.ModBase = base; @@ -2170,8 +2120,20 @@ BOOL WINAPI SymEnumLines(HANDLE hProcess, ULONG64 base, PCSTR compiland, if (dli->is_source_file) { file = source_get(pair.effective, dli->u.source_file); - if (!match_regexp(&re, file)) sci.FileName[0] = '\0'; - else strcpy(sci.FileName, file); + if (!file) sci.FileName[0] = '\0'; + else + { + DWORD sz = MultiByteToWideChar(CP_ACP, 0, file, -1, NULL, 0); + WCHAR* fileW; + + if ((fileW = HeapAlloc(GetProcessHeap(), 0, sz * sizeof(WCHAR)))) + MultiByteToWideChar(CP_ACP, 0, file, -1, fileW, sz); + if (SymMatchStringW(fileW, srcmask, FALSE)) + strcpy(sci.FileName, file); + else + sci.FileName[0] = '\0'; + HeapFree(GetProcessHeap(), 0, fileW); + } } else if (sci.FileName[0]) { @@ -2183,7 +2145,7 @@ BOOL WINAPI SymEnumLines(HANDLE hProcess, ULONG64 base, PCSTR compiland, } } } - regfree(&re); + HeapFree(GetProcessHeap(), 0, srcmask); return TRUE; }

1 0

Eric Pouech : dbghelp: Do all module and symbol names matching using unicode string ( and new regular expression matcher).
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 026ec7f69072476a738279c4abbfabc298c0aa9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=026ec7f69072476a738279c4a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jan 22 12:57:59 2012 +0100 dbghelp: Do all module and symbol names matching using unicode string (and new regular expression matcher). --- dlls/dbghelp/dbghelp_private.h | 3 +- dlls/dbghelp/module.c | 3 - dlls/dbghelp/symbol.c | 242 +++++++++++++++++----------------------- dlls/dbghelp/type.c | 13 ++ 4 files changed, 118 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=026ec7f69072476a73827…

1 0

Eric Pouech : dbghelp: Rewrote a simple regular expression matcher, and use for implementing SymMatchString[AW].
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: be9a7b9b97b5e3a9223be232dfd52ce49c0ec26c URL: http://source.winehq.org/git/wine.git/?a=commit;h=be9a7b9b97b5e3a9223be232d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jan 22 12:57:53 2012 +0100 dbghelp: Rewrote a simple regular expression matcher, and use for implementing SymMatchString[AW]. --- dlls/dbghelp/symbol.c | 176 ++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 152 insertions(+), 24 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index ac1824b..ed2ce01 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1873,50 +1873,178 @@ DWORD WINAPI UnDecorateSymbolName(PCSTR DecoratedName, PSTR UnDecoratedName, return strlen(UnDecoratedName); } +#define WILDCHAR(x) (-(x)) + +static int re_fetch_char(const WCHAR** re) +{ + switch (**re) + { + case '\\': (*re)++; return *(*re)++; + case '*': case '[': case '?': case '+': case '#': case ']': return WILDCHAR(*(*re)++); + default: return *(*re)++; + } +} + +static inline int re_match_char(WCHAR ch1, WCHAR ch2, BOOL _case) +{ + return _case ? ch1 - ch2 : toupperW(ch1) - toupperW(ch2); +} + +static const WCHAR* re_match_one(const WCHAR* string, const WCHAR* elt, BOOL _case) +{ + int ch1, prev = 0; + unsigned state = 0; + + switch (ch1 = re_fetch_char(&elt)) + { + default: + return (ch1 >= 0 && re_match_char(*string, ch1, _case) == 0) ? ++string : NULL; + case WILDCHAR('?'): return *string ? ++string : NULL; + case WILDCHAR('*'): assert(0); + case WILDCHAR('['): break; + } + + for (;;) + { + ch1 = re_fetch_char(&elt); + if (ch1 == WILDCHAR(']')) return NULL; + if (state == 1 && ch1 == '-') state = 2; + else + { + if (re_match_char(*string, ch1, _case) == 0) return ++string; + switch (state) + { + case 0: + state = 1; + prev = ch1; + break; + case 1: + state = 0; + break; + case 2: + if (prev >= 0 && ch1 >= 0 && re_match_char(prev, *string, _case) <= 0 && + re_match_char(*string, ch1, _case) <= 0) + return ++string; + state = 0; + break; + } + } + } +} + +/****************************************************************** + * re_match_multi + * + * match a substring of *pstring according to *pre regular expression + * pstring and pre are only updated in case of successful match + */ +static BOOL re_match_multi(const WCHAR** pstring, const WCHAR** pre, BOOL _case) +{ + const WCHAR* re_end = *pre; + const WCHAR* string_end = *pstring; + const WCHAR* re_beg; + const WCHAR* string_beg; + const WCHAR* next; + int ch; + + while (*re_end && *string_end) + { + string_beg = string_end; + re_beg = re_end; + switch (ch = re_fetch_char(&re_end)) + { + case WILDCHAR(']'): case WILDCHAR('+'): case WILDCHAR('#'): return FALSE; + case WILDCHAR('*'): + /* transform '*' into '?#' */ + {static const WCHAR qmW[] = {'?',0}; re_beg = qmW;} + goto closure; + case WILDCHAR('['): + do + { + if (!(ch = re_fetch_char(&re_end))) return FALSE; + } while (ch != WILDCHAR(']')); + /* fall through */ + case WILDCHAR('?'): + default: + break; + } + + switch (*re_end) + { + case '+': + if (!(next = re_match_one(string_end, re_beg, _case))) return FALSE; + string_beg++; + /* fall through */ + case '#': + re_end++; + closure: + while ((next = re_match_one(string_end, re_beg, _case))) string_end = next; + for ( ; string_end >= string_beg; string_end--) + { + if (re_match_multi(&string_end, &re_end, _case)) goto found; + } + return FALSE; + default: + if (!(next = re_match_one(string_end, re_beg, _case))) return FALSE; + string_end = next; + } + re_beg = re_end; + } + + if (*re_end || *string_end) return FALSE; + +found: + *pre = re_end; + *pstring = string_end; + return TRUE; +} + /****************************************************************** * SymMatchStringA (DBGHELP.@) * */ BOOL WINAPI SymMatchStringA(PCSTR string, PCSTR re, BOOL _case) { - regex_t preg; - BOOL ret; + WCHAR* strW; + WCHAR* reW; + BOOL ret = FALSE; + DWORD sz; + if (!string || !re) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } TRACE("%s %s %c\n", string, re, _case ? 'Y' : 'N'); - compile_regex(re, -1, &preg, _case); - ret = match_regexp(&preg, string); - regfree(&preg); + sz = MultiByteToWideChar(CP_ACP, 0, string, -1, NULL, 0); + if ((strW = HeapAlloc(GetProcessHeap(), 0, sz * sizeof(WCHAR)))) + MultiByteToWideChar(CP_ACP, 0, string, -1, strW, sz); + sz = MultiByteToWideChar(CP_ACP, 0, re, -1, NULL, 0); + if ((reW = HeapAlloc(GetProcessHeap(), 0, sz * sizeof(WCHAR)))) + MultiByteToWideChar(CP_ACP, 0, re, -1, reW, sz); + + if (strW && reW) + ret = SymMatchStringW(strW, reW, _case); + HeapFree(GetProcessHeap(), 0, strW); + HeapFree(GetProcessHeap(), 0, reW); return ret; } /****************************************************************** * SymMatchStringW (DBGHELP.@) * - * FIXME: SymMatchStringA should convert and pass the strings to SymMatchStringW, - * but that needs a unicode RE library. */ BOOL WINAPI SymMatchStringW(PCWSTR string, PCWSTR re, BOOL _case) { - BOOL ret; - LPSTR s, r; - DWORD len; - TRACE("%s %s %c\n", debugstr_w(string), debugstr_w(re), _case ? 'Y' : 'N'); - len = WideCharToMultiByte( CP_ACP, 0, string, -1, NULL, 0, NULL, NULL ); - s = HeapAlloc( GetProcessHeap(), 0, len ); - WideCharToMultiByte( CP_ACP, 0, string, -1, s, len, NULL, NULL ); - - len = WideCharToMultiByte( CP_ACP, 0, re, -1, NULL, 0, NULL, NULL ); - r = HeapAlloc( GetProcessHeap(), 0, len ); - WideCharToMultiByte( CP_ACP, 0, re, -1, r, len, NULL, NULL ); - - ret = SymMatchStringA(s, r, _case); - - HeapFree( GetProcessHeap(), 0, r ); - HeapFree( GetProcessHeap(), 0, s ); - return ret; + if (!string || !re) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + return re_match_multi(&string, &re, _case); } /******************************************************************

1 0

Alexandre Julliard : makefiles: Define __WINESRC__ when building programs.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: c9eee734506f5bec8a8884ed9b3f465b47b51042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9eee734506f5bec8a8884ed9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 23 12:16:36 2012 +0100 makefiles: Define __WINESRC__ when building programs. --- programs/Makeprog.rules.in | 2 +- programs/clock/main.c | 1 + programs/cmd/wcmdmain.c | 2 ++ programs/explorer/appbar.c | 6 +++--- programs/explorer/desktop.c | 1 + programs/explorer/explorer.c | 1 + programs/explorer/systray.c | 1 + programs/iexplore/main.c | 1 + programs/msiexec/msiexec.c | 1 + programs/msiexec/service.c | 3 ++- programs/notepad/dialog.c | 1 + programs/notepad/main.c | 4 +++- programs/oleview/oleview.c | 2 ++ programs/oleview/typelib.c | 1 + programs/plugplay/main.c | 1 + programs/presentationfontcache/main.c | 1 + programs/progman/main.c | 1 + programs/sc/sc.c | 1 + programs/services/utils.c | 1 + programs/spoolsv/main.c | 1 + programs/start/start.c | 4 ++-- programs/taskkill/taskkill.c | 1 + programs/termsv/main.c | 1 + programs/winebrowser/main.c | 1 + programs/winecfg/theme.c | 2 ++ programs/wineconsole/curses.c | 2 ++ programs/winedbg/dbg.y | 3 --- programs/winedbg/debug.l | 3 --- programs/winetest/send.c | 2 +- programs/winhlp32/macro.lex.l | 3 --- programs/winver/winver.c | 1 + programs/wordpad/print.c | 1 + programs/wscript/main.c | 1 + programs/xcopy/xcopy.c | 1 + 34 files changed, 41 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c9eee734506f5bec8a888…

1 0

Alexandre Julliard : winhlp32: Don't use strncpy.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: c0f65cc99bb84d0ac056d8a89e2458f3f617b4d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0f65cc99bb84d0ac056d8a89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 23 12:13:03 2012 +0100 winhlp32: Don't use strncpy. --- programs/winhlp32/winhelp.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index c378649..b905807 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -1182,8 +1182,7 @@ static LRESULT CALLBACK WINHELP_HistoryWndProc(HWND hWnd, UINT msg, WPARAM wPara if (len > sizeof(buffer)) len = sizeof(buffer); memcpy(buffer, ptr1, len); if (len < sizeof(buffer)) buffer[len++] = ':'; - strncpy(&buffer[len], Globals.history.set[i].page->lpszTitle, sizeof(buffer) - len); - buffer[sizeof(buffer) - 1] = '\0'; + lstrcpynA(&buffer[len], Globals.history.set[i].page->lpszTitle, sizeof(buffer) - len); TextOutA(hDc, 0, i * tm.tmHeight, buffer, strlen(buffer)); } }

1 0

Alexandre Julliard : winevdm: Don't use strncpy.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 584bdb18830d23eed55e43b7f9ef57a19d59ea8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=584bdb18830d23eed55e43b7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 23 12:12:36 2012 +0100 winevdm: Don't use strncpy. --- programs/winevdm/winevdm.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 288fa01..0dcc806 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -299,14 +299,13 @@ static BOOL read_pif_file( HANDLE hFile, char *progname, char *title, } } /* prepare the return data */ - strncpy( progname, pifheader.program, sizeof(pifheader.program)); - memcpy( title, pifheader.windowtitle, sizeof(pifheader.windowtitle)); - title[ sizeof(pifheader.windowtitle) ] = '\0'; + lstrcpynA( progname, pifheader.program, sizeof(pifheader.program)+1); + lstrcpynA( title, pifheader.windowtitle, sizeof(pifheader.windowtitle)+1); if( found386rec) - strncpy( optparams, pif386rec.optparams, sizeof( pif386rec.optparams)); + lstrcpynA( optparams, pif386rec.optparams, sizeof( pif386rec.optparams)+1); else - strncpy( optparams, pifheader.optparams, sizeof(pifheader.optparams)); - strncpy( startdir, pifheader.startdir, sizeof(pifheader.startdir)); + lstrcpynA( optparams, pifheader.optparams, sizeof(pifheader.optparams)+1); + lstrcpynA( startdir, pifheader.startdir, sizeof(pifheader.startdir)+1); *closeonexit = pifheader.hdrflags1 & 0x10; *textmode = found386rec ? pif386rec.videoflags & 0x0010 : pifheader.hdrflags1 & 0x0002; @@ -325,8 +324,8 @@ static VOID pif_cmd( char *filename, char *cmdline) char buf[128]; char progname[64]; char title[31]; - char optparams[64]; - char startdir[64]; + char optparams[65]; + char startdir[65]; char *p; int closeonexit; int textmode;

1 0

Alexandre Julliard : view: Don't use windowsx.h.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: d4989906bd48a58957ef63ec4bbe7d422b7a60e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4989906bd48a58957ef63ec4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 23 12:07:35 2012 +0100 view: Don't use windowsx.h. --- programs/view/view.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/view/view.c b/programs/view/view.c index 535df7f..824f9e1 100644 --- a/programs/view/view.c +++ b/programs/view/view.c @@ -17,7 +17,7 @@ */ #include <windows.h> -#include <windowsx.h> +#include <commdlg.h> #include "resource.h" #include <stdio.h> @@ -230,7 +230,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT uMessage, WPARAM wparam, LPARAM break; case WM_COMMAND: /* message: command from application menu */ - switch (GET_WM_COMMAND_ID(wparam,lparam)) + switch (LOWORD(wparam)) { case IDM_OPEN: {

1 0

Alexandre Julliard : taskmgr: Fix includes order and avoid tchar. h and memory.h.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 58a80473462dd279d3e27aa90354d02c4492b300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58a80473462dd279d3e27aa90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 23 12:04:05 2012 +0100 taskmgr: Fix includes order and avoid tchar.h and memory.h. --- programs/taskmgr/about.c | 12 +++++------- programs/taskmgr/affinity.c | 11 +++++------ programs/taskmgr/applpage.c | 7 +++---- programs/taskmgr/column.c | 9 ++++----- programs/taskmgr/dbgchnl.c | 13 ++++++------- programs/taskmgr/debug.c | 7 +++---- programs/taskmgr/endproc.c | 9 ++++----- programs/taskmgr/graph.c | 11 +++++------ programs/taskmgr/graphctl.c | 11 ++++------- programs/taskmgr/optnmenu.c | 16 ++++------------ programs/taskmgr/perfdata.c | 11 +++++------ programs/taskmgr/perfpage.c | 9 ++++----- programs/taskmgr/priority.c | 11 +++++------ programs/taskmgr/proclist.c | 12 +++++------- programs/taskmgr/procpage.c | 14 ++++++-------- programs/taskmgr/run.c | 12 +++++------- programs/taskmgr/taskmgr.c | 7 +++---- programs/taskmgr/trayicon.c | 9 ++++----- 18 files changed, 80 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=58a80473462dd279d3e27…

1 0

Alexandre Julliard : regedit: Don't use tchar.h.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 65dfc51b2e771ad5e0adb1314905c60dd95e6400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65dfc51b2e771ad5e0adb1314… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 23 12:02:39 2012 +0100 regedit: Don't use tchar.h. --- programs/regedit/about.c | 1 - programs/regedit/edit.c | 3 +-- programs/regedit/framewnd.c | 1 - programs/regedit/main.c | 1 - programs/regedit/regedit.c | 1 + programs/regedit/regproc.c | 1 + 6 files changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/regedit/about.c b/programs/regedit/about.c index 89960ad..e0e469e 100644 --- a/programs/regedit/about.c +++ b/programs/regedit/about.c @@ -22,7 +22,6 @@ #include <windows.h> #include <commctrl.h> #include <shellapi.h> -#include <tchar.h> #include "main.h" diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 57edbb5..e211ff8 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -21,7 +21,6 @@ #define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #include <windows.h> -#include <tchar.h> #include <commctrl.h> #include <commdlg.h> #include <cderr.h> @@ -320,7 +319,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) if (DialogBoxW(0, MAKEINTRESOURCEW(IDD_EDIT_DWORD), hwnd, modify_dlgproc) == IDOK) { DWORD val; CHAR* valueA = GetMultiByteString(stringValueData); - if (_stscanf(valueA, isDecimal ? "%u" : "%x", &val)) { + if (sscanf(valueA, isDecimal ? "%u" : "%x", &val)) { lRet = RegSetValueExW(hKey, valueName, 0, type, (BYTE*)&val, sizeof(val)); if (lRet == ERROR_SUCCESS) result = TRUE; else error_code_messagebox(hwnd, lRet); diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 0cdedec..b3ca594 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -21,7 +21,6 @@ #define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #include <windows.h> -#include <tchar.h> #include <commctrl.h> #include <commdlg.h> #include <cderr.h> diff --git a/programs/regedit/main.c b/programs/regedit/main.c index d764702..593ffef 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -22,7 +22,6 @@ #include <windows.h> #include <commctrl.h> #include <stdlib.h> -#include <tchar.h> #include <stdio.h> #include <fcntl.h> diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index fe08501..acff701 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -20,6 +20,7 @@ #include <ctype.h> #include <stdio.h> +#include <stdlib.h> #include <windows.h> #include "regproc.h" diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index e566c5d..1a87442 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -23,6 +23,7 @@ #include <limits.h> #include <stdio.h> +#include <stdlib.h> #include <fcntl.h> #include <io.h> #include <windows.h>

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
98
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 January 2012