September 2010 - Wine-Commits

Dmitry Timoshkov : user32: Make sure that SendInput always initializes the time field.
by Alexandre Julliard Sept. 22, 2010

Sept. 22, 2010

Module: wine Branch: master Commit: 88900f429a9c2cf7e2c00d085f694a89ff8da77b URL: http://source.winehq.org/git/wine.git/?a=commit;h=88900f429a9c2cf7e2c00d085… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Sep 22 15:49:45 2010 +0900 user32: Make sure that SendInput always initializes the time field. --- dlls/user32/input.c | 4 ++-- dlls/winex11.drv/keyboard.c | 2 ++ dlls/winex11.drv/mouse.c | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 0dccf21..6e1e459 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -167,7 +167,7 @@ void WINAPI keybd_event( BYTE bVk, BYTE bScan, input.u.ki.wVk = bVk; input.u.ki.wScan = bScan; input.u.ki.dwFlags = dwFlags; - input.u.ki.time = GetTickCount(); + input.u.ki.time = 0; input.u.ki.dwExtraInfo = dwExtraInfo; SendInput( 1, &input, sizeof(input) ); } @@ -186,7 +186,7 @@ void WINAPI mouse_event( DWORD dwFlags, DWORD dx, DWORD dy, input.u.mi.dy = dy; input.u.mi.mouseData = dwData; input.u.mi.dwFlags = dwFlags; - input.u.mi.time = GetCurrentTime(); + input.u.mi.time = 0; input.u.mi.dwExtraInfo = dwExtraInfo; SendInput( 1, &input, sizeof(input) ); } diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 02fd6bb..d6054d6 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1158,6 +1158,8 @@ void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD event_flags, DWORD WORD flags, wVkStripped, wVkL, wVkR, vk_hook = wVk; LPARAM lParam = 0; + if (!time) time = GetTickCount(); + wVk = LOBYTE(wVk); flags = LOBYTE(wScan); diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index cf988c9..922df65 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -345,6 +345,8 @@ void X11DRV_send_mouse_input( HWND hwnd, DWORD flags, DWORD x, DWORD y, { POINT pt; + if (!time) time = GetTickCount(); + if (flags & MOUSEEVENTF_MOVE && flags & MOUSEEVENTF_ABSOLUTE) { if (injected_flags & LLMHF_INJECTED)

1 0

Austin English : ntoskrnl.exe: Add stub for KeInitializeDpc.
by Alexandre Julliard Sept. 22, 2010

Sept. 22, 2010

Module: wine Branch: master Commit: cf6fa1a0365978d9f94ca651eaab972599df5712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf6fa1a0365978d9f94ca651e… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Sep 22 00:06:07 2010 -0700 ntoskrnl.exe: Add stub for KeInitializeDpc. --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 +++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index ab113b0..17990e0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1524,6 +1524,13 @@ MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void) return MmLargeSystem; } +/*********************************************************************** + * KeInitializeDpc (NTOSKRNL.EXE.@) + */ +VOID WINAPI KeInitializeDpc(PRKDPC Dpc, PKDEFERRED_ROUTINE DeferredRoutine, PVOID DeferredContext) +{ + FIXME("stub\n"); +} /***************************************************** * DllMain diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 776fbab..31af18b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -545,7 +545,7 @@ @ stub KeIcacheFlushCount @ stub KeInitializeApc @ stub KeInitializeDeviceQueue -@ stub KeInitializeDpc +@ stdcall KeInitializeDpc(ptr ptr ptr) @ stdcall KeInitializeEvent(ptr long long) @ stub KeInitializeInterrupt @ stub KeInitializeMutant

1 0

Henri Verbeet : wined3d: Move light state to wined3d_state.
by Alexandre Julliard Sept. 22, 2010

Sept. 22, 2010

Module: wine Branch: master Commit: 4546a13d98f03377628ad1370445e51e9e59d437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4546a13d98f03377628ad1370… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 21 21:20:54 2010 +0200 wined3d: Move light state to wined3d_state. --- dlls/wined3d/device.c | 18 +++++++++--------- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/stateblock.c | 24 +++++++++++++----------- dlls/wined3d/wined3d_private.h | 12 ++++++------ 4 files changed, 30 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4546a13d98f03377628ad…

1 0

Austin English : userenv: Add a stub for GetDefaultUserProfileDirectoryA/W.
by Alexandre Julliard Sept. 22, 2010

Sept. 22, 2010

Module: wine Branch: master Commit: 84972be4aa9a136148e7e57ffccf1414b0a1b52f URL: http://source.winehq.org/git/wine.git/?a=commit;h=84972be4aa9a136148e7e57ff… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Sep 21 21:53:08 2010 -0700 userenv: Add a stub for GetDefaultUserProfileDirectoryA/W. --- dlls/userenv/userenv.spec | 2 ++ dlls/userenv/userenv_main.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/userenv/userenv.spec b/dlls/userenv/userenv.spec index bde8c07..6b1e8a7 100644 --- a/dlls/userenv/userenv.spec +++ b/dlls/userenv/userenv.spec @@ -6,6 +6,8 @@ @ stdcall ExpandEnvironmentStringsForUserW(ptr wstr ptr long) @ stdcall GetAllUsersProfileDirectoryA(ptr ptr) @ stdcall GetAllUsersProfileDirectoryW(ptr ptr) +@ stdcall GetDefaultUserProfileDirectoryA(ptr ptr) +@ stdcall GetDefaultUserProfileDirectoryW(ptr ptr) @ stdcall GetProfilesDirectoryA(ptr ptr) @ stdcall GetProfilesDirectoryW(ptr ptr) @ stdcall GetProfileType(ptr) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 9247f44..59b3b1f 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -100,6 +100,18 @@ BOOL WINAPI ExpandEnvironmentStringsForUserW( HANDLE hToken, LPCWSTR lpSrc, return ret; } +BOOL WINAPI GetDefaultUserProfileDirectoryA( LPSTR lpProfileDir, LPDWORD lpcchSize ) +{ + FIXME("%p %p\n", lpProfileDir, lpcchSize ); + return FALSE; +} + +BOOL WINAPI GetDefaultUserProfileDirectoryW( LPWSTR lpProfileDir, LPDWORD lpcchSize ) +{ + FIXME("%p %p\n", lpProfileDir, lpcchSize ); + return FALSE; +} + BOOL WINAPI GetUserProfileDirectoryA( HANDLE hToken, LPSTR lpProfileDir, LPDWORD lpcchSize ) {

1 0

Joerg Schiermeier : Fix intro page layout.
by Alexandre Julliard Sept. 21, 2010

Sept. 21, 2010

Module: bugzilla Branch: master Commit: e55e57cab55fb91d2caf1c3e7f16d1d05b604f1d URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=e55e57cab55fb91d2caf1… Author: Joerg Schiermeier <project(a)Schiermeier-Software.de> Date: Tue Sep 21 02:46:28 2010 +0200 Fix intro page layout. --- skins/custom/index.css | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/skins/custom/index.css b/skins/custom/index.css index 2c40719..2ccc6ce 100644 --- a/skins/custom/index.css +++ b/skins/custom/index.css @@ -7,6 +7,5 @@ } div#login_box { position: relative; - top: 205px; text-align: left; -} \ No newline at end of file +}

1 0

Luca Bennati : taskkill: Add Italian translation.
by Alexandre Julliard Sept. 21, 2010

Sept. 21, 2010

Module: wine Branch: master Commit: 32089dc604ac434eed38b4da26501ae711b6f184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32089dc604ac434eed38b4da2… Author: Luca Bennati <lucak3(a)gmail.com> Date: Tue Sep 21 09:56:08 2010 +0200 taskkill: Add Italian translation. --- programs/taskkill/It.rc | 44 +++++++++++++++++++++++++++++++++++++++++ programs/taskkill/Makefile.in | 3 +- 2 files changed, 46 insertions(+), 1 deletions(-) diff --git a/programs/taskkill/It.rc b/programs/taskkill/It.rc new file mode 100644 index 0000000..05bf2d8 --- /dev/null +++ b/programs/taskkill/It.rc @@ -0,0 +1,44 @@ +/* + * Task termination utility + * Italian language support + * + * Copyright 2010 Luca Bennati + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "taskkill.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_USAGE, "Uso: taskkill [/?] [/f] [/im NomeProcesso | /pid IDProcesso]\n" + STRING_INVALID_OPTION, "Errore: opzione specificata dalla riga di comando sconosciuta o non valida.\n" + STRING_INVALID_PARAM, "Errore: parametro specificato dalla riga di comando non valido.\n" + STRING_MISSING_OPTION, "Errore: una delle opzioni /im o /pid deve essere specificata.\n" + STRING_MISSING_PARAM, "Errore: l'opzione %s richiede un parametro dalla riga di comando.\n" + STRING_MUTUAL_EXCLUSIVE, "Errore: le opzioni /im e /pid si escludono mutualmente.\n" + STRING_CLOSE_PID_SEARCH, "Messaggio di chiusura mandato alle finestre top-level del processo con PID %u.\n" + STRING_CLOSE_PROC_SRCH, "Messaggio di chiusura mandato alle finestre top-level del processo \"%s\" con PID %u.\n" + STRING_TERM_PID_SEARCH, "Il processo con PID %u è stato terminato forzatamente.\n" + STRING_TERM_PROC_SEARCH, "Il processo \"%s\" con PID %u è stato terminato forzatamente.\n" + STRING_SEARCH_FAILED, "Errore: processo non trovato \"%s\".\n" + STRING_ENUM_FAILED, "Errore: impossibile elencare la lista dei processi.\n" + STRING_TERMINATE_FAILED, "Errore: impossibile terminare il processo \"%s\".\n" +} diff --git a/programs/taskkill/Makefile.in b/programs/taskkill/Makefile.in index b3bfff3..53667d2 100644 --- a/programs/taskkill/Makefile.in +++ b/programs/taskkill/Makefile.in @@ -6,6 +6,7 @@ IMPORTS = psapi user32 C_SRCS = taskkill.c RC_SRCS = \ - En.rc + En.rc \ + It.rc @MAKE_PROG_RULES@

1 0

Zach Smith : dinput: OSX joystick driver separate device for each top level HID collection.
by Alexandre Julliard Sept. 21, 2010

Sept. 21, 2010

Module: wine Branch: master Commit: fa5f61f59d6cbd0bbcd12ae7ebdc4098729065bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa5f61f59d6cbd0bbcd12ae7e… Author: Zach Smith <IAmSparticle(a)gmail.com> Date: Mon Sep 20 22:25:27 2010 -0400 dinput: OSX joystick driver separate device for each top level HID collection. --- dlls/dinput/joystick_osx.c | 123 ++++++++++++++++++++++++++++++++++++------- 1 files changed, 103 insertions(+), 20 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index bc6908b..fc218d3 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -119,7 +119,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); #ifdef HAVE_IOHIDMANAGERCREATE static IOHIDManagerRef gIOHIDManagerRef = NULL; -static CFArrayRef gDevices = NULL; +static CFArrayRef gCollections = NULL; typedef struct JoystickImpl JoystickImpl; static const IDirectInputDevice8AVtbl JoystickAvt; @@ -194,6 +194,64 @@ static CFMutableDictionaryRef creates_osx_device_match(int usage) return result; } +static CFIndex find_top_level(IOHIDDeviceRef tIOHIDDeviceRef, CFArrayRef topLevels) +{ + CFArrayRef gElementCFArrayRef; + CFIndex numTops = 0; + + if (!tIOHIDDeviceRef) + return 0; + + gElementCFArrayRef = IOHIDDeviceCopyMatchingElements(tIOHIDDeviceRef, NULL, 0); + + if (gElementCFArrayRef) + { + CFIndex idx, cnt = CFArrayGetCount(gElementCFArrayRef); + for (idx=0; idx<cnt; idx++) + { + IOHIDElementRef tIOHIDElementRef = (IOHIDElementRef)CFArrayGetValueAtIndex(gElementCFArrayRef, idx); + int eleType = IOHIDElementGetType(tIOHIDElementRef); + + /* Check for top-level gaming device collections */ + if (eleType == kIOHIDElementTypeCollection && IOHIDElementGetParent(tIOHIDElementRef) == 0) + { + int tUsagePage = IOHIDElementGetUsagePage(tIOHIDElementRef); + int tUsage = IOHIDElementGetUsage(tIOHIDElementRef); + + if (tUsagePage == kHIDPage_GenericDesktop && + (tUsage == kHIDUsage_GD_Joystick || tUsage == kHIDUsage_GD_GamePad)) + { + CFArrayAppendValue((CFMutableArrayRef)topLevels, tIOHIDElementRef); + numTops++; + } + } + } + } + return numTops; +} + +static void get_element_children(IOHIDElementRef tElement, CFArrayRef childElements) +{ + CFIndex idx, cnt; + CFArrayRef tElementChildrenArray = IOHIDElementGetChildren(tElement); + + cnt = CFArrayGetCount(tElementChildrenArray); + if (cnt < 1) + return; + + /* Either add the element to the array or grab its children */ + for (idx=0; idx<cnt; idx++) + { + IOHIDElementRef tChildElementRef; + + tChildElementRef = (IOHIDElementRef)CFArrayGetValueAtIndex(tElementChildrenArray, idx); + if (IOHIDElementGetType(tChildElementRef) == kIOHIDElementTypeCollection) + get_element_children(tChildElementRef, childElements); + else + CFArrayAppendValue((CFMutableArrayRef)childElements, tChildElementRef); + } +} + static int find_osx_devices(void) { IOReturn tIOReturn; @@ -213,14 +271,14 @@ static int find_osx_devices(void) &kCFTypeArrayCallBacks ); /* build matching dictionary */ - result = creates_osx_device_match(kHIDPage_Sport); + result = creates_osx_device_match(kHIDUsage_GD_Joystick); if (!result) { CFRelease(matching); return 0; } CFArrayAppendValue( ( CFMutableArrayRef )matching, result ); - result = creates_osx_device_match(kHIDPage_Game); + result = creates_osx_device_match(kHIDUsage_GD_GamePad); if (!result) { CFRelease(matching); @@ -232,17 +290,31 @@ static int find_osx_devices(void) devset = IOHIDManagerCopyDevices( gIOHIDManagerRef ); if (devset) { - CFIndex count; - gDevices = CFArrayCreateMutable( kCFAllocatorDefault, 0, - &kCFTypeArrayCallBacks ); + CFIndex countDevices, countCollections, idx; + CFArrayRef gDevices = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); CFSetApplyFunction(devset, CFSetApplierFunctionCopyToCFArray, (void*)gDevices); - count = CFArrayGetCount( gDevices); CFRelease( devset); - count = CFArrayGetCount( gDevices); + countDevices = CFArrayGetCount(gDevices); - TRACE("found %i device(s)\n",(int)count); - return count; + gCollections = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); + if (!gCollections) + return 0; + countCollections = 0; + for (idx = 0; idx < countDevices; idx++) + { + CFIndex tTop; + IOHIDDeviceRef tDevice; + + tDevice = (IOHIDDeviceRef) CFArrayGetValueAtIndex(gDevices, idx); + tTop = find_top_level(tDevice, gCollections); + countCollections += tTop; + } + + CFRelease(gDevices); + + TRACE("found %i device(s), %i collection(s)\n",(int)countDevices,(int)countCollections); + return (int)countCollections; } return 0; } @@ -250,12 +322,21 @@ static int find_osx_devices(void) static int get_osx_device_name(int id, char *name, int length) { CFStringRef str; + IOHIDElementRef tIOHIDElementRef; IOHIDDeviceRef tIOHIDDeviceRef; - if (!gDevices) + if (!gCollections) + return 0; + + tIOHIDElementRef = (IOHIDElementRef)CFArrayGetValueAtIndex(gCollections, id); + + if (!tIOHIDElementRef) + { + ERR("Invalid Element requested %i\n",id); return 0; + } - tIOHIDDeviceRef = ( IOHIDDeviceRef ) CFArrayGetValueAtIndex( gDevices, id ); + tIOHIDDeviceRef = IOHIDElementGetDevice(tIOHIDElementRef); if (name) name[0] = 0; @@ -304,7 +385,7 @@ static void insert_sort_button(int header, IOHIDElementRef tIOHIDElementRef, static void get_osx_device_elements(JoystickImpl *device, int axis_map[8]) { - IOHIDDeviceRef tIOHIDDeviceRef; + IOHIDElementRef tIOHIDElementRef; CFArrayRef gElementCFArrayRef; DWORD axes = 0; DWORD sliders = 0; @@ -313,16 +394,16 @@ static void get_osx_device_elements(JoystickImpl *device, int axis_map[8]) device->elementCFArrayRef = NULL; - if (!gDevices) + if (!gCollections) return; - tIOHIDDeviceRef = ( IOHIDDeviceRef ) CFArrayGetValueAtIndex( gDevices, device->id ); + tIOHIDElementRef = (IOHIDElementRef)CFArrayGetValueAtIndex(gCollections, device->id); - if (!tIOHIDDeviceRef) + if (!tIOHIDElementRef) return; - gElementCFArrayRef = IOHIDDeviceCopyMatchingElements( tIOHIDDeviceRef, - NULL, 0 ); + gElementCFArrayRef = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); + get_element_children(tIOHIDElementRef, gElementCFArrayRef); if (gElementCFArrayRef) { @@ -439,15 +520,17 @@ static void get_osx_device_elements_props(JoystickImpl *device) static void poll_osx_device_state(JoystickGenericImpl *device_in) { JoystickImpl *device = (JoystickImpl*)device_in; + IOHIDElementRef tIOHIDTopElementRef; IOHIDDeviceRef tIOHIDDeviceRef; CFArrayRef gElementCFArrayRef = device->elementCFArrayRef; TRACE("polling device %i\n",device->id); - if (!gDevices) + if (!gCollections) return; - tIOHIDDeviceRef = ( IOHIDDeviceRef ) CFArrayGetValueAtIndex( gDevices, device->id ); + tIOHIDTopElementRef = (IOHIDElementRef) CFArrayGetValueAtIndex(gCollections, device->id); + tIOHIDDeviceRef = IOHIDElementGetDevice(tIOHIDTopElementRef); if (!tIOHIDDeviceRef) return;

1 0

Misha Koshelev : d3dx9_36: Implement D3DXCreateMesh and initial ID3DXMesh methods.
by Alexandre Julliard Sept. 21, 2010

Sept. 21, 2010

Module: wine Branch: master Commit: af0c074d7bbf3cf27cf8dffe1e9007ff3c23d256 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af0c074d7bbf3cf27cf8dffe1… Author: Misha Koshelev <misha680(a)gmail.com> Date: Thu Sep 16 17:02:48 2010 -0500 d3dx9_36: Implement D3DXCreateMesh and initial ID3DXMesh methods. --- dlls/d3dx9_36/d3dx9_36_private.h | 18 ++ dlls/d3dx9_36/mesh.c | 433 +++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/tests/mesh.c | 151 +++++++++++--- 3 files changed, 567 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af0c074d7bbf3cf27cf8d…

1 0

Dmitry Timoshkov : user32: UpdateLayeredWindow() should fail on non-layered or already initialized window.
by Alexandre Julliard Sept. 21, 2010

Sept. 21, 2010

Module: wine Branch: master Commit: a7188842afe7cb35b15980a3ffd1c8fa5aa23391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7188842afe7cb35b15980a3f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Sep 21 16:35:30 2010 +0900 user32: UpdateLayeredWindow() should fail on non-layered or already initialized window. --- dlls/user32/tests/win.c | 36 +++++++++++++++++++++++++++++++++++- dlls/user32/win.c | 7 +++++++ 2 files changed, 42 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 190ca79..1434bc8 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -49,6 +49,7 @@ static BOOL (WINAPI *pGetWindowInfo)(HWND,WINDOWINFO*); static UINT (WINAPI *pGetWindowModuleFileNameA)(HWND,LPSTR,UINT); static BOOL (WINAPI *pGetLayeredWindowAttributes)(HWND,COLORREF*,BYTE*,DWORD*); static BOOL (WINAPI *pSetLayeredWindowAttributes)(HWND,COLORREF,BYTE,DWORD); +static BOOL (WINAPI *pUpdateLayeredWindow)(HWND,HDC,POINT*,SIZE*,HDC,POINT*,COLORREF,BLENDFUNCTION*,DWORD); static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO); static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); static int (WINAPI *pGetWindowRgnBox)(HWND,LPRECT); @@ -5568,16 +5569,29 @@ static void test_layered_window(void) COLORREF key = 0; BYTE alpha = 0; DWORD flags = 0; + POINT pt = { 0, 0 }; + SIZE sz = { 200, 200 }; + HDC hdc; + HBITMAP hbm; BOOL ret; - if (!pGetLayeredWindowAttributes || !pSetLayeredWindowAttributes) + if (!pGetLayeredWindowAttributes || !pSetLayeredWindowAttributes || !pUpdateLayeredWindow) { win_skip( "layered windows not supported\n" ); return; } + + hdc = CreateCompatibleDC( 0 ); + hbm = CreateCompatibleBitmap( hdc, 200, 200 ); + SelectObject( hdc, hbm ); + hwnd = CreateWindowExA(0, "MainWindowClass", "message window", WS_CAPTION, 100, 100, 200, 200, 0, 0, 0, NULL); assert( hwnd ); + SetLastError( 0xdeadbeef ); + ret = pUpdateLayeredWindow( hwnd, 0, NULL, &sz, hdc, &pt, 0, NULL, ULW_OPAQUE ); + ok( !ret, "UpdateLayeredWindow should fail on non-layered window\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError() ); ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags ); ok( !ret, "GetLayeredWindowAttributes should fail on non-layered window\n" ); ret = pSetLayeredWindowAttributes( hwnd, 0, 0, LWA_ALPHA ); @@ -5585,6 +5599,10 @@ static void test_layered_window(void) SetWindowLong( hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED ); ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags ); ok( !ret, "GetLayeredWindowAttributes should fail on layered but not initialized window\n" ); + ret = pUpdateLayeredWindow( hwnd, 0, NULL, &sz, hdc, &pt, 0, NULL, ULW_OPAQUE ); + ok( ret, "UpdateLayeredWindow should succeed on layered window\n" ); + ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags ); + ok( !ret, "GetLayeredWindowAttributes should fail on layered but not initialized window\n" ); ret = pSetLayeredWindowAttributes( hwnd, 0x123456, 44, LWA_ALPHA ); ok( ret, "SetLayeredWindowAttributes should succeed on layered window\n" ); ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags ); @@ -5592,14 +5610,23 @@ static void test_layered_window(void) ok( key == 0x123456 || key == 0, "wrong color key %x\n", key ); ok( alpha == 44, "wrong alpha %u\n", alpha ); ok( flags == LWA_ALPHA, "wrong flags %x\n", flags ); + SetLastError( 0xdeadbeef ); + ret = pUpdateLayeredWindow( hwnd, 0, NULL, &sz, hdc, &pt, 0, NULL, ULW_OPAQUE ); + ok( !ret, "UpdateLayeredWindow should fail on layered but initialized window\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError() ); /* clearing WS_EX_LAYERED resets attributes */ SetWindowLong( hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) & ~WS_EX_LAYERED ); + SetLastError( 0xdeadbeef ); + ret = pUpdateLayeredWindow( hwnd, 0, NULL, &sz, hdc, &pt, 0, NULL, ULW_OPAQUE ); + ok( !ret, "UpdateLayeredWindow should fail on non-layered window\n" ); ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags ); ok( !ret, "GetLayeredWindowAttributes should fail on no longer layered window\n" ); SetWindowLong( hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED ); ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags ); ok( !ret, "GetLayeredWindowAttributes should fail on layered but not initialized window\n" ); + ret = pUpdateLayeredWindow( hwnd, 0, NULL, &sz, hdc, &pt, 0, NULL, ULW_OPAQUE ); + ok( ret, "UpdateLayeredWindow should succeed on layered window\n" ); ret = pSetLayeredWindowAttributes( hwnd, 0x654321, 22, LWA_COLORKEY | LWA_ALPHA ); ok( ret, "SetLayeredWindowAttributes should succeed on layered window\n" ); ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags ); @@ -5607,6 +5634,10 @@ static void test_layered_window(void) ok( key == 0x654321, "wrong color key %x\n", key ); ok( alpha == 22, "wrong alpha %u\n", alpha ); ok( flags == (LWA_COLORKEY | LWA_ALPHA), "wrong flags %x\n", flags ); + SetLastError( 0xdeadbeef ); + ret = pUpdateLayeredWindow( hwnd, 0, NULL, &sz, hdc, &pt, 0, NULL, ULW_OPAQUE ); + ok( !ret, "UpdateLayeredWindow should fail on layered but initialized window\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError() ); ret = pSetLayeredWindowAttributes( hwnd, 0x888888, 33, LWA_COLORKEY ); ok( ret, "SetLayeredWindowAttributes should succeed on layered window\n" ); @@ -5640,6 +5671,8 @@ static void test_layered_window(void) ok( flags == 0, "wrong flags %x\n", flags ); DestroyWindow( hwnd ); + DeleteDC( hdc ); + DeleteObject( hbm ); } static MONITORINFO mi; @@ -6140,6 +6173,7 @@ START_TEST(win) pGetWindowModuleFileNameA = (void *)GetProcAddress( user32, "GetWindowModuleFileNameA" ); pGetLayeredWindowAttributes = (void *)GetProcAddress( user32, "GetLayeredWindowAttributes" ); pSetLayeredWindowAttributes = (void *)GetProcAddress( user32, "SetLayeredWindowAttributes" ); + pUpdateLayeredWindow = (void *)GetProcAddress( user32, "UpdateLayeredWindow" ); pGetMonitorInfoA = (void *)GetProcAddress( user32, "GetMonitorInfoA" ); pMonitorFromPoint = (void *)GetProcAddress( user32, "MonitorFromPoint" ); pGetWindowRgnBox = (void *)GetProcAddress( user32, "GetWindowRgnBox" ); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 63f6689..d691676 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3434,6 +3434,13 @@ BOOL WINAPI UpdateLayeredWindowIndirect( HWND hwnd, const UPDATELAYEREDWINDOWINF { BYTE alpha = 0xff; + if (!(GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYERED) || + GetLayeredWindowAttributes( hwnd, NULL, NULL, NULL )) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (!(info->dwFlags & ULW_EX_NORESIZE) && (info->pptDst || info->psize)) { int x = 0, y = 0, cx = 0, cy = 0;

1 0

Jacek Caban : jscript: Better checks for too old jscript.dll versions.
by Alexandre Julliard Sept. 21, 2010

Sept. 21, 2010

Module: wine Branch: master Commit: a8e969236f057e0741675b47cc9d30e68a555af6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8e969236f057e0741675b47c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 21 15:58:48 2010 +0200 jscript: Better checks for too old jscript.dll versions. --- dlls/jscript/tests/activex.c | 60 ++++++++++++++++++++++++----------------- dlls/jscript/tests/jscript.c | 28 +++++++++++++++---- dlls/jscript/tests/run.c | 7 +++++ 3 files changed, 64 insertions(+), 31 deletions(-) diff --git a/dlls/jscript/tests/activex.c b/dlls/jscript/tests/activex.c index ba3f8bd..faf73d3 100644 --- a/dlls/jscript/tests/activex.c +++ b/dlls/jscript/tests/activex.c @@ -701,7 +701,7 @@ static void _parse_script_a(unsigned line, IActiveScriptParse *parser, const cha ok_(__FILE__,line)(hres == S_OK, "ParseScriptText failed: %08x\n", hres); } -static IActiveScriptParse *create_script(void) +static IActiveScriptParse *create_script(BOOL skip_tests) { IActiveScriptParse *parser; IActiveScript *script; @@ -719,11 +719,13 @@ static IActiveScriptParse *create_script(void) hres = CoCreateInstance(&CLSID_JScript, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IActiveScript, (void**)&script); - ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + if(!skip_tests) + ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); if(FAILED(hres)) return NULL; - set_safety_options((IUnknown*)script); + if(!skip_tests) + set_safety_options((IUnknown*)script); hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParse, (void**)&parser); ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); @@ -743,17 +745,19 @@ static IActiveScriptParse *create_script(void) IActiveScript_Release(script); - parse_script_a(parser, - "function testException(func, type, number) {\n" - "try {\n" - " func();\n" - "}catch(e) {\n" - " ok(e.name === type, 'e.name = ' + e.name + ', expected ' + type)\n" - " ok(e.number === number, 'e.number = ' + e.number + ', expected ' + number);\n" - " return;\n" - "}" - "ok(false, 'exception expected');\n" - "}"); + if(!skip_tests) { + parse_script_a(parser, + "function testException(func, type, number) {\n" + " try {\n" + " func();\n" + " }catch(e) {\n" + " ok(e.name === type, 'e.name = ' + e.name + ', expected ' + type)\n" + " ok(e.number === number, 'e.number = ' + e.number + ', expected ' + number);\n" + " return;\n" + " }\n" + " ok(false, 'exception expected');\n" + "}"); + } return parser; } @@ -800,7 +804,7 @@ static void test_ActiveXObject(void) IActiveScriptParse *parser; IDispatchEx *proc; - parser = create_script(); + parser = create_script(FALSE); SET_EXPECT(Host_QS_SecMgr); SET_EXPECT(ProcessUrlAction); @@ -845,7 +849,7 @@ static void test_ActiveXObject(void) IDispatchEx_Release(proc); IUnknown_Release(parser); - parser = create_script(); + parser = create_script(FALSE); proc = parse_procedure_a(parser, "(new ActiveXObject('Wine.Test')).reportSuccess();"); SET_EXPECT(Host_QS_SecMgr); @@ -867,7 +871,7 @@ static void test_ActiveXObject(void) IDispatchEx_Release(proc); IUnknown_Release(parser); - parser = create_script(); + parser = create_script(FALSE); QS_SecMgr_hres = E_NOINTERFACE; SET_EXPECT(Host_QS_SecMgr); @@ -876,7 +880,7 @@ static void test_ActiveXObject(void) IUnknown_Release(parser); - parser = create_script(); + parser = create_script(FALSE); ProcessUrlAction_hres = E_FAIL; SET_EXPECT(Host_QS_SecMgr); @@ -887,7 +891,7 @@ static void test_ActiveXObject(void) IUnknown_Release(parser); - parser = create_script(); + parser = create_script(FALSE); ProcessUrlAction_policy = URLPOLICY_DISALLOW; SET_EXPECT(Host_QS_SecMgr); @@ -898,7 +902,7 @@ static void test_ActiveXObject(void) IUnknown_Release(parser); - parser = create_script(); + parser = create_script(FALSE); CreateInstance_hres = E_FAIL; SET_EXPECT(Host_QS_SecMgr); @@ -911,7 +915,7 @@ static void test_ActiveXObject(void) IUnknown_Release(parser); - parser = create_script(); + parser = create_script(FALSE); QueryCustomPolicy_hres = E_FAIL; SET_EXPECT(Host_QS_SecMgr); @@ -926,7 +930,7 @@ static void test_ActiveXObject(void) IUnknown_Release(parser); - parser = create_script(); + parser = create_script(FALSE); QueryCustomPolicy_psize = 6; SET_EXPECT(Host_QS_SecMgr); @@ -945,7 +949,7 @@ static void test_ActiveXObject(void) IUnknown_Release(parser); - parser = create_script(); + parser = create_script(FALSE); QueryCustomPolicy_policy = URLPOLICY_DISALLOW; SET_EXPECT(Host_QS_SecMgr); @@ -981,7 +985,7 @@ static void test_ActiveXObject(void) IUnknown_Release(parser); - parser = create_script(); + parser = create_script(FALSE); object_with_site = &ObjectWithSite; SET_EXPECT(Host_QS_SecMgr); @@ -1062,18 +1066,24 @@ static BOOL register_activex(void) static BOOL check_jscript(void) { + IActiveScriptProperty *script_prop; IActiveScriptParse *parser; BSTR str; HRESULT hres; - parser = create_script(); + parser = create_script(TRUE); if(!parser) return FALSE; str = a2bstr("if(!('localeCompare' in String.prototype)) throw 1;"); hres = IActiveScriptParse64_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); SysFreeString(str); + + if(hres == S_OK) + hres = IUnknown_QueryInterface(parser, &IID_IActiveScriptProperty, (void**)&script_prop); IUnknown_Release(parser); + if(hres == S_OK) + IActiveScriptProperty_Release(script_prop); return hres == S_OK; } diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index f7f1e30..ce25781 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -335,10 +335,9 @@ static HRESULT set_script_prop(IActiveScript *engine, DWORD property, VARIANT *v hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptProperty, (void**)&script_prop); - if(FAILED(hres)) { - win_skip("IActiveScriptProperty not supported\n"); - return E_NOTIMPL; - } + ok(hres == S_OK, "Could not get IActiveScriptProperty: %08x\n", hres); + if(FAILED(hres)) + return hres; hres = IActiveScriptProperty_SetProperty(script_prop, property, NULL, val); IActiveScriptProperty_Release(script_prop); @@ -523,12 +522,29 @@ static void test_jscript2(void) ok(!ref, "ref = %d\n", ref); } +static BOOL check_jscript(void) +{ + IActiveScriptProperty *script_prop; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_JScript, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IActiveScriptProperty, (void**)&script_prop); + if(SUCCEEDED(hres)) + IActiveScriptProperty_Release(script_prop); + + return hres == S_OK; +} + START_TEST(jscript) { CoInitialize(NULL); - test_jscript(); - test_jscript2(); + if(check_jscript()) { + test_jscript(); + test_jscript2(); + }else { + win_skip("Broken engine, probably too old\n"); + } CoUninitialize(); } diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 303907e..4df315c 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1090,9 +1090,16 @@ static void run_tests(void) static BOOL check_jscript(void) { + IActiveScriptProperty *script_prop; BSTR str; HRESULT hres; + hres = CoCreateInstance(&CLSID_JScript, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IActiveScriptProperty, (void**)&script_prop); + if(FAILED(hres)) + return FALSE; + IActiveScriptProperty_Release(script_prop); + str = a2bstr("if(!('localeCompare' in String.prototype)) throw 1;"); hres = parse_script(0, str); SysFreeString(str);

1 0