January 2012 - Wine-Commits

Alexandre Julliard : oleaut32/tests: Use a better invalid color for the olepicture icon test.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: 9422c19329c010f9ba07a316f7409bc1b1caafe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9422c19329c010f9ba07a316f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 23 15:14:58 2012 +0100 oleaut32/tests: Use a better invalid color for the olepicture icon test. --- dlls/oleaut32/tests/olepicture.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 7f4d647..ecf88f6 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -675,9 +675,9 @@ static void test_Render(void) IPicture_get_Width(pic, &pWidth); IPicture_get_Height(pic, &pHeight); - SetPixelV(hdc, 0, 0, 0x00F0F0F0); - SetPixelV(hdc, 5, 5, 0x00F0F0F0); - SetPixelV(hdc, 10, 10, 0x00F0F0F0); + SetPixelV(hdc, 0, 0, 0x00223344); + SetPixelV(hdc, 5, 5, 0x00223344); + SetPixelV(hdc, 10, 10, 0x00223344); expected = GetPixel(hdc, 0, 0); hres = IPicture_Render(pic, hdc, 1, 1, 9, 9, 0, 0, pWidth, -pHeight, NULL);

1 0

Austin English : kernel32: Add stubs for GetConsoleCommandHistoryLengthA/W.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: 4110068dc20b1678f772949d3429dc7985425f84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4110068dc20b1678f772949d3… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jan 19 15:48:51 2012 -0600 kernel32: Add stubs for GetConsoleCommandHistoryLengthA/W. --- dlls/kernel32/console.c | 18 ++++++++++++++++++ dlls/kernel32/kernel32.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index b50bce1..7238936 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3157,3 +3157,21 @@ DWORD WINAPI GetConsoleCommandHistoryW(DWORD unknown1, DWORD unknown2, DWORD unk SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } + +/* Undocumented, called by native doskey.exe */ +/* FIXME: Should use CONSOLE_GetHistory() above for full implementation */ +DWORD WINAPI GetConsoleCommandHistoryLengthA(LPCSTR unknown) +{ + FIXME(": (%s) stub!\n", debugstr_a(unknown)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* Undocumented, called by native doskey.exe */ +/* FIXME: Should use CONSOLE_GetHistory() above for full implementation */ +DWORD WINAPI GetConsoleCommandHistoryLengthW(LPCWSTR unknown) +{ + FIXME(": (%s) stub!\n", debugstr_w(unknown)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 9be4f00..456fb1a 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -466,8 +466,8 @@ @ stdcall GetConsoleCP() @ stub GetConsoleCharType @ stdcall GetConsoleCommandHistoryA(long long long) -@ stub GetConsoleCommandHistoryLengthA -@ stub GetConsoleCommandHistoryLengthW +@ stdcall GetConsoleCommandHistoryLengthA(str) +@ stdcall GetConsoleCommandHistoryLengthW(wstr) @ stdcall GetConsoleCommandHistoryW(long long long) @ stdcall GetConsoleCursorInfo(long ptr) @ stub GetConsoleCursorMode

1 0

Austin English : kernel32: Add stubs for GetConsoleAliasesLengthA/W.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: eff816b55ca1a8ad2506e1c0d4fc398f8742ad80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eff816b55ca1a8ad2506e1c0d… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jan 19 15:49:08 2012 -0600 kernel32: Add stubs for GetConsoleAliasesLengthA/W. --- dlls/kernel32/console.c | 14 ++++++++++++++ dlls/kernel32/kernel32.spec | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 7238936..facdf20 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3175,3 +3175,17 @@ DWORD WINAPI GetConsoleCommandHistoryLengthW(LPCWSTR unknown) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } + +DWORD WINAPI GetConsoleAliasesLengthA(LPSTR unknown) +{ + FIXME(": (%s) stub!\n", debugstr_a(unknown)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +DWORD WINAPI GetConsoleAliasesLengthW(LPWSTR unknown) +{ + FIXME(": (%s) stub!\n", debugstr_w(unknown)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 456fb1a..77c54d6 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -460,8 +460,8 @@ @ stub GetConsoleAliasExesW @ stdcall GetConsoleAliasW(wstr ptr long wstr) @ stub GetConsoleAliasesA -@ stub GetConsoleAliasesLengthA -@ stub GetConsoleAliasesLengthW +@ stdcall GetConsoleAliasesLengthA(str) +@ stdcall GetConsoleAliasesLengthW(wstr) @ stub GetConsoleAliasesW @ stdcall GetConsoleCP() @ stub GetConsoleCharType

1 0

Eric Pouech : configure: Remove regex detection.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

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

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

Jan. 23, 2012

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 Jan. 23, 2012

Jan. 23, 2012

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 Jan. 23, 2012

Jan. 23, 2012

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 : makefiles: Define __WINESRC__ when building programs.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

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 : taskmgr: Fix includes order and avoid tchar. h and memory.h.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

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 Jan. 23, 2012

Jan. 23, 2012

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