October 2009 - Wine-commits

Erich Hoover : user32: Test for 'F10' key events.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: b74c0cc2fea3568d2bd08e42513212e1cc60ed58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b74c0cc2fea3568d2bd08e425… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Oct 12 18:49:57 2009 -0600 user32: Test for 'F10' key events. --- dlls/user32/tests/msg.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 761f3aa..bfc81dc 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6870,6 +6870,36 @@ static const struct message WmVkAppsSeq[] = { { WM_CONTEXTMENU, sent|lparam, /*hwnd*/0, (LPARAM)-1 }, { 0 } }; +static const struct message WmVkF10Seq[] = { + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 1 }, /* XP */ + { WM_SYSKEYDOWN, wparam|lparam, VK_F10, 1 }, + { WM_SYSKEYDOWN, sent|wparam|lparam, VK_F10, 0x00000001 }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 0xc0000001 }, /* XP */ + { WM_SYSKEYUP, wparam|lparam, VK_F10, 0xc0000001 }, + { WM_SYSKEYUP, sent|wparam|lparam, VK_F10, 0xc0000001 }, + { WM_SYSCOMMAND, sent|defwinproc|wparam, SC_KEYMENU }, + { HCBT_SYSCOMMAND, hook }, + { WM_ENTERMENULOOP, sent|defwinproc|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam, 0, 0 }, + { WM_INITMENU, sent|defwinproc }, + { EVENT_SYSTEM_MENUSTART, winevent_hook|wparam|lparam, OBJID_SYSMENU, 0 }, + { WM_MENUSELECT, sent|defwinproc|wparam, MAKEWPARAM(0,MF_SYSMENU|MF_POPUP|MF_HILITE) }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_SYSMENU, 1 }, + + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 0x10000001 }, /* XP */ + + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 1 }, /* XP */ + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_SYSMENU, 0 }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam, 0, 0, }, + { WM_CAPTURECHANGED, sent|defwinproc }, + { WM_MENUSELECT, sent|defwinproc|wparam|optional, MAKEWPARAM(0,0xffff) }, + { EVENT_SYSTEM_MENUEND, winevent_hook|wparam|lparam, OBJID_SYSMENU, 0 }, + { WM_EXITMENULOOP, sent|defwinproc }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 0xc0000001 }, /* XP */ + { WM_SYSKEYUP, wparam|lparam, VK_F10, 0xc0000001 }, + { WM_SYSKEYUP, sent|wparam|lparam, VK_F10, 0xc0000001 }, + { 0 } +}; static void pump_msg_loop(HWND hwnd, HACCEL hAccel) { @@ -7082,6 +7112,14 @@ static void test_accelerators(void) pump_msg_loop(hwnd, 0); ok_sequence(WmVkAppsSeq, "VK_APPS press/release", FALSE); + trace("testing VK_F10 press/release\n"); + keybd_event(VK_F10, 0, 0, 0); + keybd_event(VK_F10, 0, KEYEVENTF_KEYUP, 0); + keybd_event(VK_F10, 0, 0, 0); + keybd_event(VK_F10, 0, KEYEVENTF_KEYUP, 0); + pump_msg_loop(hwnd, 0); + ok_sequence(WmVkF10Seq, "VK_F10 press/release", TRUE); + trace("testing Shift+MouseButton press/release\n"); /* first, move mouse pointer inside of the window client area */ GetClientRect(hwnd, &rc);

1 0

Erich Hoover : winex11: Send WM_SYSKEYDOWN and WM_SYSKEYUP when the 'F10' key is used.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: 8c9a6e9f5cafa3306d9c0024a3e9635081678262 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c9a6e9f5cafa3306d9c0024a… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Oct 12 18:51:19 2009 -0600 winex11: Send WM_SYSKEYDOWN and WM_SYSKEYUP when the 'F10' key is used. --- dlls/winex11.drv/keyboard.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 3da7183..1964d5c 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1197,9 +1197,10 @@ void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD event_flags, DWORD if (event_flags & KEYEVENTF_KEYUP) { message = WM_KEYUP; - if ((key_state_table[VK_MENU] & 0x80) && - ((wVkStripped == VK_MENU) || (wVkStripped == VK_CONTROL) - || !(key_state_table[VK_CONTROL] & 0x80))) + if (((key_state_table[VK_MENU] & 0x80) && + ((wVkStripped == VK_MENU) || (wVkStripped == VK_CONTROL) + || !(key_state_table[VK_CONTROL] & 0x80))) + || (wVkStripped == VK_F10)) { if( TrackSysKey == VK_MENU || /* <ALT>-down/<ALT>-up sequence */ (wVkStripped != VK_MENU)) /* <ALT>-down...<something else>-up */ @@ -1211,8 +1212,9 @@ void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD event_flags, DWORD else { message = WM_KEYDOWN; - if ((key_state_table[VK_MENU] & 0x80 || wVkStripped == VK_MENU) && - !(key_state_table[VK_CONTROL] & 0x80 || wVkStripped == VK_CONTROL)) + if (((key_state_table[VK_MENU] & 0x80 || wVkStripped == VK_MENU) && + !(key_state_table[VK_CONTROL] & 0x80 || wVkStripped == VK_CONTROL)) || + (wVkStripped == VK_F10)) { message = WM_SYSKEYDOWN; TrackSysKey = wVkStripped;

1 0

Ray Hinchliffe : kernel32: Correct ullTotalVirtual for GlobalMemoryStatusEx ().
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: 2c725de6dee07d2cc3c22c7df6d371c2b78e6ddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c725de6dee07d2cc3c22c7df… Author: Ray Hinchliffe <ray(a)rh-software.com> Date: Wed Oct 14 09:23:45 2009 +0100 kernel32: Correct ullTotalVirtual for GlobalMemoryStatusEx(). --- dlls/kernel32/heap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index e85ccc3..ead0778 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1274,7 +1274,7 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) /* FIXME: should do something for other systems */ GetSystemInfo(&si); - lpmemex->ullTotalVirtual = (char*)si.lpMaximumApplicationAddress-(char*)si.lpMinimumApplicationAddress; + lpmemex->ullTotalVirtual = (ULONG_PTR)si.lpMaximumApplicationAddress-(ULONG_PTR)si.lpMinimumApplicationAddress; /* FIXME: we should track down all the already allocated VM pages and substract them, for now arbitrarily remove 64KB so that it matches NT */ lpmemex->ullAvailVirtual = lpmemex->ullTotalVirtual-64*1024;

1 0

Charles Davis : ntdll: Implement CDROM_RawRead() on Mac OS.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: 6368dbbd5939bf71b04f3c441dd3af8cd027b7fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6368dbbd5939bf71b04f3c441… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Tue Oct 13 12:58:59 2009 -0600 ntdll: Implement CDROM_RawRead() on Mac OS. --- dlls/ntdll/cdrom.c | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 149 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 8e334df..c0389f9 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1449,6 +1449,155 @@ static NTSTATUS CDROM_RawRead(int fd, const RAW_READ_INFO* raw, void* buffer, DW FIXME("NIY: %d\n", raw->TrackMode); return STATUS_INVALID_PARAMETER; } +#elif defined(__APPLE__) + switch (raw->TrackMode) + { + case YellowMode2: + { + /* Mac OS, on the other hand, DOES read only one part of the sector + * at a time. Therefore, we have to read each part of the sector, in + * order, to get the whole raw sector in. + * This means that we have to read each sector one at a time, as on + * Linux. + */ + dk_cd_read_t cdrd; + UInt64 lba = raw->DiskOffset.QuadPart >> 11; + PBYTE bp; + int i; + + for (i = 0, bp = buffer; i < raw->SectorCount; + i++, lba++, bp += kCDSectorSizeWhole) + { + cdrd.offset = lba * kCDSectorSizeWhole; + cdrd.sectorType = kCDSectorTypeMode2; + + /* First, the sync area */ + cdrd.sectorArea = kCDSectorAreaSync; + cdrd.buffer = bp; + cdrd.bufferLength = 12; + io = ioctl(fd, DKIOCCDREAD, &cdrd); + if (io != 0) + { + *sz = kCDSectorSizeWhole * i; + return CDROM_GetStatusCode(io); + } + + /* Then the header */ + cdrd.offset += 12; + cdrd.sectorArea = kCDSectorAreaHeader; + cdrd.buffer = (PBYTE)cdrd.buffer + 12; + cdrd.bufferLength = 4; + io = ioctl(fd, DKIOCCDREAD, &cdrd); + if (io != 0) + { + *sz = kCDSectorSizeWhole * i + 12; + return CDROM_GetStatusCode(io); + } + + /* And finally the sector proper */ + cdrd.offset += 4; + cdrd.sectorArea = kCDSectorAreaUser; + cdrd.buffer = (PBYTE)cdrd.buffer + 4; + cdrd.bufferLength = kCDSectorSizeMode2; + io = ioctl(fd, DKIOCCDREAD, &cdrd); + if (io != 0) + { + *sz = kCDSectorSizeWhole * i + 16; + return CDROM_GetStatusCode(io); + } + } + + break; + } + + case XAForm2: + { + /* Same here */ + dk_cd_read_t cdrd; + UInt64 lba = raw->DiskOffset.QuadPart >> 11; + PBYTE bp; + int i; + + for (i = 0, bp = buffer; i < raw->SectorCount; + i++, lba++, bp += kCDSectorSizeWhole) + { + cdrd.offset = lba * kCDSectorSizeWhole; + cdrd.sectorType = kCDSectorTypeMode2Form2; + + /* First, the sync area */ + cdrd.sectorArea = kCDSectorAreaSync; + cdrd.buffer = bp; + cdrd.bufferLength = 12; + io = ioctl(fd, DKIOCCDREAD, &cdrd); + if (io != 0) + { + *sz = kCDSectorSizeWhole * i; + return CDROM_GetStatusCode(io); + } + + /* Then the header */ + cdrd.offset += 12; + cdrd.sectorArea = kCDSectorAreaHeader; + cdrd.buffer = (PBYTE)cdrd.buffer + 12; + cdrd.bufferLength = 4; + io = ioctl(fd, DKIOCCDREAD, &cdrd); + if (io != 0) + { + *sz = kCDSectorSizeWhole * i + 12; + return CDROM_GetStatusCode(io); + } + + /* And the sub-header */ + cdrd.offset += 4; + cdrd.sectorArea = kCDSectorAreaSubHeader; + cdrd.buffer = (PBYTE)cdrd.buffer + 4; + cdrd.bufferLength = 8; + io = ioctl(fd, DKIOCCDREAD, &cdrd); + if (io != 0) + { + *sz = kCDSectorSizeWhole * i + 16; + return CDROM_GetStatusCode(io); + } + + /* And finally the sector proper */ + cdrd.offset += 8; + cdrd.sectorArea = kCDSectorAreaUser; + cdrd.buffer = (PBYTE)cdrd.buffer + 8; + cdrd.bufferLength = kCDSectorSizeMode2; + io = ioctl(fd, DKIOCCDREAD, &cdrd); + if (io != 0) + { + *sz = kCDSectorSizeWhole * i + 24; + return CDROM_GetStatusCode(io); + } + } + + break; + } + + case CDDA: + { + /* With CDDA, the whole raw sector is considered user data, so there's + * no need to read one at a time. + */ + dk_cd_read_t cdrd; + + cdrd.offset = (raw->DiskOffset.QuadPart >> 11) * kCDSectorSizeCDDA; + cdrd.sectorArea = kCDSectorAreaUser; + cdrd.sectorType = kCDSectorTypeCDDA; + cdrd.buffer = buffer; + cdrd.bufferLength = len < raw->SectorCount*kCDSectorSizeCDDA ? len : + raw->SectorCount*kCDSectorSizeCDDA; + + io = ioctl(fd, DKIOCCDREAD, &cdrd); + if (io != 0) return CDROM_GetStatusCode(io); + break; + } + + default: + FIXME("NIY: %d\n", raw->TrackMode); + return STATUS_INVALID_PARAMETER; + } #else switch (raw->TrackMode) {

1 0

Alexander Kochetkov : oleaut32/tests: Checking null terminator in return value of SysReAllocStringLen.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: b6da072551cf6eb88d1500df5127802face30a18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6da072551cf6eb88d1500df5… Author: Alexander Kochetkov <al.kochet(a)gmail.com> Date: Wed Oct 14 11:27:10 2009 +0400 oleaut32/tests: Checking null terminator in return value of SysReAllocStringLen. --- dlls/oleaut32/tests/vartype.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index b7528c4..b50a673 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5397,6 +5397,37 @@ static void test_SysReAllocStringLen(void) SysFreeString(str); } + + /* Windows always returns null terminated strings */ + str = SysAllocStringLen(szTest, 4); + ok (str != NULL, "Expected non-NULL\n"); + if (str) + { + const int CHUNK_SIZE = 64; + const int STRING_SIZE = 24; + int changed; + changed = SysReAllocStringLen(&str, NULL, CHUNK_SIZE); + ok (changed == 1, "Expected 1, got %d\n", changed); + ok (str != NULL, "Expected non-NULL\n"); + if (str) + { + BSTR oldstr = str; + + /* Filling string */ + memset (str, 0xAB, CHUNK_SIZE * sizeof (OLECHAR)); + /* Checking null terminator */ + changed = SysReAllocStringLen(&str, NULL, STRING_SIZE); + ok (changed == 1, "Expected 1, got %d\n", changed); + ok (str != NULL, "Expected non-NULL\n"); + if (str) + { + ok (str == oldstr, "Expected reuse of the old string memory\n"); + todo_wine ok (str[STRING_SIZE] == 0, + "Expected null terminator, got 0x%04X\n", str[STRING_SIZE]); + SysFreeString(str); + } + } + } } static void test_BstrCopy(void)

1 0

Alexander Kochetkov : oleaut32: Fix null terminator in SysReAllocStringLen.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: ae4de9d6956a18b2e8bff0cfd2a3122e30e05fe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae4de9d6956a18b2e8bff0cfd… Author: Alexander Kochetkov <al.kochet(a)gmail.com> Date: Wed Oct 14 11:37:20 2009 +0400 oleaut32: Fix null terminator in SysReAllocStringLen. --- dlls/oleaut32/oleaut.c | 15 ++++++--------- dlls/oleaut32/tests/vartype.c | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 896d6d4..72b70e2 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -298,15 +298,12 @@ int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* str, unsigned int len) DWORD *ptr = HeapReAlloc(GetProcessHeap(),0,((DWORD*)*old)-1,newbytelen+sizeof(WCHAR)+sizeof(DWORD)); *old = (BSTR)(ptr+1); *ptr = newbytelen; - if (str) { - memmove(*old, str, newbytelen); - (*old)[len] = 0; - } else { - /* Subtle hidden feature: The old string data is still there - * when 'in' is NULL! - * Some Microsoft program needs it. - */ - } + /* Subtle hidden feature: The old string data is still there + * when 'in' is NULL! + * Some Microsoft program needs it. + */ + if (str) memmove(*old, str, newbytelen); + (*old)[len] = 0; } else { /* * Allocate the new string diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index b50a673..87f2901 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5422,7 +5422,7 @@ static void test_SysReAllocStringLen(void) if (str) { ok (str == oldstr, "Expected reuse of the old string memory\n"); - todo_wine ok (str[STRING_SIZE] == 0, + ok (str[STRING_SIZE] == 0, "Expected null terminator, got 0x%04X\n", str[STRING_SIZE]); SysFreeString(str); }

1 0

Paul Vriens : winmm/tests: Fix some test failures in Win9x and WinMe.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: 55b3a9c906b01544b0bbb35c1dfa14aed0932944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b3a9c906b01544b0bbb35c1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 14 10:56:36 2009 +0200 winmm/tests: Fix some test failures in Win9x and WinMe. --- dlls/winmm/tests/wave.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 8a9caf2..3e3afbd 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -791,9 +791,11 @@ static void wave_out_test_deviceOut(int device, double duration, } for (i = 0; i < headers; i++) { - ok(frags[i].dwFlags==(WHDR_DONE|WHDR_PREPARED), - "WHDR_DONE WHDR_PREPARED expected, got %s\n", - wave_header_flags(frags[i].dwFlags)); + ok(frags[i].dwFlags==(WHDR_DONE|WHDR_PREPARED) || + broken((flags & CALLBACK_TYPEMASK)==CALLBACK_EVENT && + frags[i].dwFlags==(WHDR_DONE|WHDR_PREPARED|0x1000)), /* < NT4 */ + "(%02d) WHDR_DONE WHDR_PREPARED expected, got %s\n", + i, wave_header_flags(frags[i].dwFlags)); } check_position(device, wout, length * (loops + 1), pwfx); }

1 0

Stefan Dösinger : configure: Check for ms_hook_prologue attribute support.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: fdac5e57d3fd8ebe5044a076ff27566d6122e93e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdac5e57d3fd8ebe5044a076f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 12 14:08:53 2009 +0200 configure: Check for ms_hook_prologue attribute support. --- configure | 38 ++++++++++++++++++++++++++++++++++++++ configure.ac | 15 +++++++++++++++ include/config.h.in | 3 +++ 3 files changed, 56 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 72251ba..dae14db 100755 --- a/configure +++ b/configure @@ -11702,6 +11702,44 @@ if test $ac_cv_cflags__Werror = yes; then : EXTRACFLAGS="$EXTRACFLAGS -Werror" fi fi + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ms_hook_prologue attribute" >&5 +$as_echo_n "checking for ms_hook_prologue attribute... " >&6; } +if test "${ac_cv_have_ms_hook_prologue+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int __attribute__((__ms_hook_prologue__)) test(void) { return 0; } +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_have_ms_hook_prologue="yes" +else + ac_cv_have_ms_hook_prologue="no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_ms_hook_prologue" >&5 +$as_echo "$ac_cv_have_ms_hook_prologue" >&6; } + CFLAGS="$saved_CFLAGS" + if test "$ac_cv_have_ms_hook_prologue" = "yes" + then + +$as_echo "#define DECLSPEC_HOTPATCH __attribute__((__ms_hook_prologue__))" >>confdefs.h + + else + $as_echo "#define DECLSPEC_HOTPATCH /* */" >>confdefs.h + + fi fi diff --git a/configure.ac b/configure.ac index 813b198..5210c35 100644 --- a/configure.ac +++ b/configure.ac @@ -1505,6 +1505,21 @@ then then WINE_TRY_CFLAGS([-Werror]) fi + + dnl Check for ms_hook_prologue support + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror" + AC_CACHE_CHECK([for ms_hook_prologue attribute], ac_cv_have_ms_hook_prologue, + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[int __attribute__((__ms_hook_prologue__)) test(void) { return 0; }]])], + [ac_cv_have_ms_hook_prologue="yes"],[ac_cv_have_ms_hook_prologue="no"])) + CFLAGS="$saved_CFLAGS" + if test "$ac_cv_have_ms_hook_prologue" = "yes" + then + AC_DEFINE(DECLSPEC_HOTPATCH, [__attribute__((__ms_hook_prologue__))], + [Define to a function attribute for Microsoft hotpatch assembly prefix.]) + else + AC_DEFINE(DECLSPEC_HOTPATCH, [/* */]) + fi fi dnl **** Check for underscore on external symbols **** diff --git a/include/config.h.in b/include/config.h.in index 0be8f4d..16b2e90 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -2,6 +2,9 @@ #define __WINE_CONFIG_H +/* Define to a function attribute for Microsoft hotpatch assembly prefix. */ +#undef DECLSPEC_HOTPATCH + /* Define to the file extension for executables. */ #undef EXEEXT

1 0

Stefan Dösinger : kernel32: Make some functions hookable.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: 282cc71aedaa8feb5207e73bd748fd422f147b42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=282cc71aedaa8feb5207e73bd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 12 14:10:20 2009 +0200 kernel32: Make some functions hookable. --- dlls/kernel32/module.c | 10 +++++----- dlls/kernel32/process.c | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index fc75475..05d5add 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -919,7 +919,7 @@ done: * ignore the parameter because it would be extremely difficult to * integrate this with different types of module representations. */ -HMODULE WINAPI LoadLibraryExA(LPCSTR libname, HANDLE hfile, DWORD flags) +HMODULE WINAPI DECLSPEC_HOTPATCH LoadLibraryExA(LPCSTR libname, HANDLE hfile, DWORD flags) { WCHAR *libnameW; @@ -932,7 +932,7 @@ HMODULE WINAPI LoadLibraryExA(LPCSTR libname, HANDLE hfile, DWORD flags) * * Unicode version of LoadLibraryExA. */ -HMODULE WINAPI LoadLibraryExW(LPCWSTR libnameW, HANDLE hfile, DWORD flags) +HMODULE WINAPI DECLSPEC_HOTPATCH LoadLibraryExW(LPCWSTR libnameW, HANDLE hfile, DWORD flags) { UNICODE_STRING wstr; HMODULE res; @@ -974,7 +974,7 @@ HMODULE WINAPI LoadLibraryExW(LPCWSTR libnameW, HANDLE hfile, DWORD flags) * NOTES * See LoadLibraryExA(). */ -HMODULE WINAPI LoadLibraryA(LPCSTR libname) +HMODULE WINAPI DECLSPEC_HOTPATCH LoadLibraryA(LPCSTR libname) { return LoadLibraryExA(libname, 0, 0); } @@ -984,7 +984,7 @@ HMODULE WINAPI LoadLibraryA(LPCSTR libname) * * Unicode version of LoadLibraryA. */ -HMODULE WINAPI LoadLibraryW(LPCWSTR libnameW) +HMODULE WINAPI DECLSPEC_HOTPATCH LoadLibraryW(LPCWSTR libnameW) { return LoadLibraryExW(libnameW, 0, 0); } @@ -1001,7 +1001,7 @@ HMODULE WINAPI LoadLibraryW(LPCWSTR libnameW) * Success: TRUE. The dll is removed if it is not still in use. * Failure: FALSE. Use GetLastError() to determine the cause. */ -BOOL WINAPI FreeLibrary(HINSTANCE hLibModule) +BOOL WINAPI DECLSPEC_HOTPATCH FreeLibrary(HINSTANCE hLibModule) { BOOL retv = FALSE; NTSTATUS nts; diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index df09558..eca9e38 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1895,10 +1895,10 @@ static LPWSTR get_file_name( LPCWSTR appname, LPWSTR cmdline, LPWSTR buffer, /********************************************************************** * CreateProcessA (KERNEL32.@) */ -BOOL WINAPI CreateProcessA( LPCSTR app_name, LPSTR cmd_line, LPSECURITY_ATTRIBUTES process_attr, - LPSECURITY_ATTRIBUTES thread_attr, BOOL inherit, - DWORD flags, LPVOID env, LPCSTR cur_dir, - LPSTARTUPINFOA startup_info, LPPROCESS_INFORMATION info ) +BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessA( LPCSTR app_name, LPSTR cmd_line, LPSECURITY_ATTRIBUTES process_attr, + LPSECURITY_ATTRIBUTES thread_attr, BOOL inherit, + DWORD flags, LPVOID env, LPCSTR cur_dir, + LPSTARTUPINFOA startup_info, LPPROCESS_INFORMATION info ) { BOOL ret = FALSE; WCHAR *app_nameW = NULL, *cmd_lineW = NULL, *cur_dirW = NULL; @@ -1937,10 +1937,10 @@ done: /********************************************************************** * CreateProcessW (KERNEL32.@) */ -BOOL WINAPI CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIBUTES process_attr, - LPSECURITY_ATTRIBUTES thread_attr, BOOL inherit, DWORD flags, - LPVOID env, LPCWSTR cur_dir, LPSTARTUPINFOW startup_info, - LPPROCESS_INFORMATION info ) +BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIBUTES process_attr, + LPSECURITY_ATTRIBUTES thread_attr, BOOL inherit, DWORD flags, + LPVOID env, LPCWSTR cur_dir, LPSTARTUPINFOW startup_info, + LPPROCESS_INFORMATION info ) { BOOL retv = FALSE; HANDLE hFile = 0;

1 0

Stefan Dösinger : user32: Make some functions hookable .
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: acebc001b724870629db681cbd5e19d98ab4b9bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=acebc001b724870629db681cb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 12 14:10:56 2009 +0200 user32: Make some functions hookable. --- dlls/user32/cursoricon.c | 8 ++++---- dlls/user32/input.c | 18 +++++++++--------- dlls/user32/message.c | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 2ed1138..1ae33aa 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1803,7 +1803,7 @@ DWORD WINAPI DumpIcon16( SEGPTR pInfo, WORD *lpLen, * RETURNS * A handle to the previous cursor shape. */ -HCURSOR WINAPI SetCursor( HCURSOR hCursor /* [in] Handle of cursor to show */ ) +HCURSOR WINAPI DECLSPEC_HOTPATCH SetCursor( HCURSOR hCursor /* [in] Handle of cursor to show */ ) { struct user_thread_info *thread_info = get_user_thread_info(); HCURSOR hOldCursor; @@ -1824,7 +1824,7 @@ HCURSOR WINAPI SetCursor( HCURSOR hCursor /* [in] Handle of cursor to show */ ) /*********************************************************************** * ShowCursor (USER32.@) */ -INT WINAPI ShowCursor( BOOL bShow ) +INT WINAPI DECLSPEC_HOTPATCH ShowCursor( BOOL bShow ) { struct user_thread_info *thread_info = get_user_thread_info(); @@ -1858,7 +1858,7 @@ HCURSOR WINAPI GetCursor(void) /*********************************************************************** * ClipCursor (USER32.@) */ -BOOL WINAPI ClipCursor( const RECT *rect ) +BOOL WINAPI DECLSPEC_HOTPATCH ClipCursor( const RECT *rect ) { RECT virt; @@ -1881,7 +1881,7 @@ BOOL WINAPI ClipCursor( const RECT *rect ) /*********************************************************************** * GetClipCursor (USER32.@) */ -BOOL WINAPI GetClipCursor( RECT *rect ) +BOOL WINAPI DECLSPEC_HOTPATCH GetClipCursor( RECT *rect ) { /* If this is first time - initialize the rect */ if (IsRectEmpty( &CURSOR_ClipRect )) ClipCursor( NULL ); diff --git a/dlls/user32/input.c b/dlls/user32/input.c index dc0ce56..bfe80c4 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -192,7 +192,7 @@ void WINAPI mouse_event( DWORD dwFlags, DWORD dx, DWORD dy, /*********************************************************************** * GetCursorPos (USER32.@) */ -BOOL WINAPI GetCursorPos( POINT *pt ) +BOOL WINAPI DECLSPEC_HOTPATCH GetCursorPos( POINT *pt ) { if (!pt) return FALSE; return USER_Driver->pGetCursorPos( pt ); @@ -215,7 +215,7 @@ BOOL WINAPI GetCursorInfo( PCURSORINFO pci ) /*********************************************************************** * SetCursorPos (USER32.@) */ -BOOL WINAPI SetCursorPos( INT x, INT y ) +BOOL WINAPI DECLSPEC_HOTPATCH SetCursorPos( INT x, INT y ) { return USER_Driver->pSetCursorPos( x, y ); } @@ -224,7 +224,7 @@ BOOL WINAPI SetCursorPos( INT x, INT y ) /********************************************************************** * SetCapture (USER32.@) */ -HWND WINAPI SetCapture( HWND hwnd ) +HWND WINAPI DECLSPEC_HOTPATCH SetCapture( HWND hwnd ) { HWND previous; @@ -236,7 +236,7 @@ HWND WINAPI SetCapture( HWND hwnd ) /********************************************************************** * ReleaseCapture (USER32.@) */ -BOOL WINAPI ReleaseCapture(void) +BOOL WINAPI DECLSPEC_HOTPATCH ReleaseCapture(void) { BOOL ret = set_capture_window( 0, 0, NULL ); @@ -271,7 +271,7 @@ HWND WINAPI GetCapture(void) * bit set to 1 if currently pressed, low-order bit set to 1 if key has * been pressed. */ -SHORT WINAPI GetAsyncKeyState(INT nKey) +SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState(INT nKey) { if (nKey < 0 || nKey > 256) return 0; @@ -370,7 +370,7 @@ UINT WINAPI GetRawInputDeviceList(PRAWINPUTDEVICELIST pRawInputDeviceList, PUINT /****************************************************************** * RegisterRawInputDevices (USER32.@) */ -BOOL WINAPI RegisterRawInputDevices(PRAWINPUTDEVICE pRawInputDevices, UINT uiNumDevices, UINT cbSize) +BOOL WINAPI DECLSPEC_HOTPATCH RegisterRawInputDevices(PRAWINPUTDEVICE pRawInputDevices, UINT uiNumDevices, UINT cbSize) { FIXME("(pRawInputDevices=%p, uiNumDevices=%d, cbSize=%d) stub!\n", pRawInputDevices, uiNumDevices, cbSize); @@ -393,7 +393,7 @@ UINT WINAPI GetRawInputData(HRAWINPUT hRawInput, UINT uiCommand, LPVOID pData, P /****************************************************************** * GetRawInputBuffer (USER32.@) */ -UINT WINAPI GetRawInputBuffer(PRAWINPUT pData, PUINT pcbSize, UINT cbSizeHeader) +UINT WINAPI DECLSPEC_HOTPATCH GetRawInputBuffer(PRAWINPUT pData, PUINT pcbSize, UINT cbSizeHeader) { FIXME("(pData=%p, pcbSize=%p, cbSizeHeader=%d) stub!\n", pData, pcbSize, cbSizeHeader); @@ -474,7 +474,7 @@ BOOL WINAPI AttachThreadInput( DWORD from, DWORD to, BOOL attach ) * keyboard-input message. This function retrieves the state of the key * at the time the input message was generated. */ -SHORT WINAPI GetKeyState(INT vkey) +SHORT WINAPI DECLSPEC_HOTPATCH GetKeyState(INT vkey) { SHORT retval = 0; @@ -493,7 +493,7 @@ SHORT WINAPI GetKeyState(INT vkey) /********************************************************************** * GetKeyboardState (USER32.@) */ -BOOL WINAPI GetKeyboardState( LPBYTE state ) +BOOL WINAPI DECLSPEC_HOTPATCH GetKeyboardState( LPBYTE state ) { BOOL ret; diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 4e9a62c..80eadec 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3059,7 +3059,7 @@ BOOL WINAPI TranslateMessage( const MSG *msg ) * * See DispatchMessageW. */ -LRESULT WINAPI DispatchMessageA( const MSG* msg ) +LRESULT WINAPI DECLSPEC_HOTPATCH DispatchMessageA( const MSG* msg ) { LRESULT retval; @@ -3130,7 +3130,7 @@ LRESULT WINAPI DispatchMessageA( const MSG* msg ) * ECMA-234, Win32 * */ -LRESULT WINAPI DispatchMessageW( const MSG* msg ) +LRESULT WINAPI DECLSPEC_HOTPATCH DispatchMessageW( const MSG* msg ) { LRESULT retval;

1 0