July 2006 - Wine-commits - list.winehq.org

Hwang YunSong(황윤성) : winecfg: Updated Korean resource.
by Alexandre Julliard 10 Jul '06

10 Jul '06

Module: wine Branch: refs/heads/master Commit: 1b9f1e5a34fab2d61f49bb8a8eca2653a6ac8d0f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1b9f1e5a34fab2d61f49bb8… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Sat Jul 8 17:07:30 2006 +0900 winecfg: Updated Korean resource. --- programs/winecfg/Ko.rc | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index ebfa0b8..278adcd 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -54,7 +54,7 @@ BEGIN IDC_STATIC,15,20,227,30 CONTROL "Applications",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS, 15,50,230,150 - PUSHBUTTON "��α׷� ��ϱ�(&A)...",IDC_APP_ADDAPP, 90,204,75,14 + PUSHBUTTON "��α׷� �߰��ϱ�(&A)...",IDC_APP_ADDAPP, 90,204,75,14 PUSHBUTTON "��α׷� ��ϱ�(&R)",IDC_APP_REMOVEAPP, 170,204,75,14 LTEXT "�� (&W):",IDC_STATIC,16,227,75,14 COMBOBOX IDC_WINVER,83,224,163,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -64,31 +64,31 @@ IDD_GRAPHCFG DIALOG DISCARDABLE 0, 0, 2 STYLE WS_CHILD | WS_DISABLED FONT 9, "MS Shell Dlg" BEGIN - GROUPBOX " â �� ",IDC_STATIC,8,25,244,180 + GROUPBOX " â �� ",IDC_STATIC,8,4,244,180 - CONTROL "DirectX ��α׷�� 콺 Ŀ�� ׵�� â�ȿ� ��Ƶΰ� ��",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8 - CONTROL "��ũž �� ۸�� ϰ� ��",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8 + CONTROL "DirectX ��α׷�� 콺 Ŀ�� ׵�� â�ȿ� ��Ƶΰ� ��",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,14,230,8 + CONTROL "��ũž �� ۸�� ϰ� ��",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,24,230,8 LTEXT "Wineâ�� â��ڿ� ��ؼ� ��ȴٸ�, Wineâ�� ǥ�� âƲ�� ̸�, �۾�� ڿ� �� ︱ ��Դϴ�. �׸�� â��Ͽ�� Ÿ�� Դϴ�.\n\n��࿡ Wineâ�� â��ڿ� �� ʴ´ٸ�, Wienâ�� â��ڿ� �� Դϴ�. �̰�� Wineâ�� ũž�� ϰ� ��յ�� ʴ´ٴ� �� ǹ��մϴ�. �� Wine�� 䳻��Ⱑ �� α׷�� ֵ�� ݴϴ�.", - IDC_STATIC,15,58,228,80 - CONTROL "â��ڰ� Wineâ�� ϵ�� ",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,132,230,8 + IDC_STATIC,15,37,228,80 + CONTROL "â��ڰ� Wineâ�� ϵ�� ",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,230,8 /* FIXME: the wording of this explanation could be a lot better */ LTEXT "Wine�� Wineâ�� ϳ�� '�� ȭ��'�� Եǵ��, �� ũž�� 䳻�� ֽ��ϴ�. �Ǵ� Wine�� Wineâ�� ǥ�� ũž �� ġ�ϵ�� ֽ��ϴ�.", - IDC_STATIC,15,146,228,28 - LTEXT "��ũžũ��:",IDC_DESKTOP_SIZE,15,188,44,8,WS_DISABLED - LTEXT "X",IDC_DESKTOP_BY,108,188,8,8,WS_DISABLED + IDC_STATIC,15,121,228,28 + LTEXT "��ũž ũ��:",IDC_DESKTOP_SIZE,15,167,44,8,WS_DISABLED + LTEXT "X",IDC_DESKTOP_BY,108,167,8,8,WS_DISABLED CONTROL "�� ũž �䳻��",IDC_ENABLE_DESKTOP,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,173,230,10 + BS_AUTOCHECKBOX | WS_TABSTOP,15,152,230,10 - EDITTEXT IDC_DESKTOP_WIDTH,64,188,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - EDITTEXT IDC_DESKTOP_HEIGHT,117,188,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_WIDTH,64,167,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_HEIGHT,117,167,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - GROUPBOX " ��̷�Ʈ 3D ",IDC_STATIC,8,210,244,50 + GROUPBOX " ��̷�Ʈ 3D ",IDC_STATIC,8,189,244,50 - LTEXT "��ؽ� ��̴� ��: ",IDC_STATIC,15,220,80,30 - COMBOBOX IDC_D3D_VSHADER_MODE,100,218,146,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "��ؽ� ��̴� ��: ",IDC_STATIC,15,199,80,30 + COMBOBOX IDC_D3D_VSHADER_MODE,100,197,146,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "�ȼ� ��̴� �� (�ϵ���� Ѵٸ�)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,237,230,10 + CONTROL "�ȼ� ��̴� �� (�ϵ���� Ѵٸ�)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,216,230,10 END IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250 @@ -131,7 +131,7 @@ BEGIN LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,18,232,76 PUSHBUTTON "�߰�(&A)...",IDC_BUTTON_ADD,15,98,37,14 PUSHBUTTON "��(&R)",IDC_BUTTON_REMOVE,56,98,37,14 - PUSHBUTTON "�ڵ��(&D)...",IDC_BUTTON_AUTODETECT,195,98,51,14 + PUSHBUTTON "�ڵ� ã��(&D)...",IDC_BUTTON_AUTODETECT,195,98,51,14 /* editing drive details */ LTEXT "��(&P):",IDC_STATIC,15,123,30,10 @@ -168,13 +168,13 @@ BEGIN CONTROL "��ġ",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,60,160,130 PUSHBUTTON "��",IDC_AUDIO_CONTROL_PANEL,180,60,66,13 GROUPBOX " ��̷�Ʈ �� ",IDC_STATIC,8,205,244,60 - LTEXT "�ϵ�� : ",IDC_STATIC,15,215,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,146,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "�ϵ�� : ",IDC_STATIC,14,216,70,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,90,213,160,2,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "�⺻ �� :",IDC_STATIC,15,232,70,8 - COMBOBOX IDC_DSOUND_RATES,90,230,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DSOUND_RATES,90,230,42,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "��ÿ� �� ⺻ ��:",IDC_STATIC,137,232,80,8 - COMBOBOX IDC_DSOUND_BITS,220,230,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "��̹� �䳻��",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,23 + COMBOBOX IDC_DSOUND_BITS,220,230,30,13,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "��̹� �䳻��",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,245,68,18 END IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250 @@ -192,7 +192,7 @@ BEGIN GROUPBOX " �� ",IDC_STATIC,8,114,244,100 CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 - CONTROL "��⿡ ��:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 + CONTROL "�̰�� :",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED PUSHBUTTON "ã��",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED END

1 0

Jacek Caban : urlmon: Use non heap based objects for class factories.
by Alexandre Julliard 10 Jul '06

10 Jul '06

Module: wine Branch: refs/heads/master Commit: 57bcaf4d31569254ce7bb8f2548a4150c1cdbae8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=57bcaf4d31569254ce7bb8f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 7 20:31:25 2006 +0200 urlmon: Use non heap based objects for class factories. --- dlls/urlmon/urlmon_main.c | 121 ++++++++++++++++++++------------------------- 1 files changed, 54 insertions(+), 67 deletions(-) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 168d9c4..49384e6 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -92,69 +92,51 @@ HRESULT WINAPI DllCanUnloadNow(void) * Urlmon ClassFactory */ typedef struct { - IClassFactory ITF_IClassFactory; + const IClassFactoryVtbl *lpClassFactoryVtbl; - LONG ref; HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); -} IClassFactoryImpl; +} ClassFactory; -struct object_creation_info -{ - const CLSID *clsid; - HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); -}; - -static const struct object_creation_info object_creation[] = -{ - { &CLSID_FileProtocol, FileProtocol_Construct }, - { &CLSID_FtpProtocol, FtpProtocol_Construct }, - { &CLSID_HttpProtocol, HttpProtocol_Construct }, - { &CLSID_InternetSecurityManager, &SecManagerImpl_Construct }, - { &CLSID_InternetZoneManager, ZoneMgrImpl_Construct } -}; +#define CLASSFACTORY(x) ((IClassFactory*) &(x)->lpClassFactoryVtbl) -static HRESULT WINAPI -CF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) +static HRESULT WINAPI CF_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppv) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + *ppv = NULL; + + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + *ppv = iface; + }else if(IsEqualGUID(riid, &IID_IClassFactory)) { + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + *ppv = iface; + } - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IClassFactory)) - { - IClassFactory_AddRef(iface); - *ppobj = This; + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); return S_OK; } - WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + WARN("(%p)->(%s,%p),not found\n", iface, debugstr_guid(riid), ppv); return E_NOINTERFACE; } -static ULONG WINAPI CF_AddRef(LPCLASSFACTORY iface) +static ULONG WINAPI CF_AddRef(IClassFactory *iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - return InterlockedIncrement(&This->ref); + URLMON_LockModule(); + return 2; } -static ULONG WINAPI CF_Release(LPCLASSFACTORY iface) +static ULONG WINAPI CF_Release(IClassFactory *iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - - ULONG ref = InterlockedDecrement(&This->ref); - - if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This); - URLMON_UnlockModule(); - } - - return ref; + URLMON_UnlockModule(); + return 1; } -static HRESULT WINAPI CF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, +static HRESULT WINAPI CF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, REFIID riid, LPVOID *ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + ClassFactory *This = (ClassFactory*)iface; HRESULT hres; LPUNKNOWN punk; @@ -180,7 +162,7 @@ static HRESULT WINAPI CF_LockServer(LPCL return S_OK; } -static const IClassFactoryVtbl CF_Vtbl = +static const IClassFactoryVtbl ClassFactoryVtbl = { CF_QueryInterface, CF_AddRef, @@ -189,6 +171,32 @@ static const IClassFactoryVtbl CF_Vtbl = CF_LockServer }; +static const ClassFactory FileProtocolCF = + { &ClassFactoryVtbl, FileProtocol_Construct}; +static const ClassFactory FtpProtocolCF = + { &ClassFactoryVtbl, FtpProtocol_Construct}; +static const ClassFactory HttpProtocolCF = + { &ClassFactoryVtbl, HttpProtocol_Construct}; +static const ClassFactory SecurityManagerCF = + { &ClassFactoryVtbl, SecManagerImpl_Construct}; +static const ClassFactory ZoneManagerCF = + { &ClassFactoryVtbl, ZoneMgrImpl_Construct}; + +struct object_creation_info +{ + const CLSID *clsid; + IClassFactory *cf; +}; + +static const struct object_creation_info object_creation[] = +{ + { &CLSID_FileProtocol, CLASSFACTORY(&FileProtocolCF) }, + { &CLSID_FtpProtocol, CLASSFACTORY(&FtpProtocolCF) }, + { &CLSID_HttpProtocol, CLASSFACTORY(&HttpProtocolCF) }, + { &CLSID_InternetSecurityManager, CLASSFACTORY(&SecurityManagerCF) }, + { &CLSID_InternetZoneManager, CLASSFACTORY(&ZoneManagerCF) } +}; + /******************************************************************************* * DllGetClassObject [URLMON.@] * Retrieves class object from a DLL object @@ -210,38 +218,17 @@ static const IClassFactoryVtbl CF_Vtbl = HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { int i; - IClassFactoryImpl *factory; TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - if ( !IsEqualGUID( &IID_IClassFactory, riid ) - && ! IsEqualGUID( &IID_IUnknown, riid) ) - return E_NOINTERFACE; - for (i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) { if (IsEqualGUID(object_creation[i].clsid, rclsid)) - break; + return IClassFactory_QueryInterface(object_creation[i].cf, riid, ppv); } - if (i == sizeof(object_creation)/sizeof(object_creation[0])) - { - FIXME("%s: no class found.\n", debugstr_guid(rclsid)); - return CLASS_E_CLASSNOTAVAILABLE; - } - - factory = HeapAlloc(GetProcessHeap(), 0, sizeof(*factory)); - if (factory == NULL) return E_OUTOFMEMORY; - - factory->ITF_IClassFactory.lpVtbl = &CF_Vtbl; - factory->ref = 1; - factory->pfnCreateInstance = object_creation[i].pfnCreateInstance; - - *ppv = &(factory->ITF_IClassFactory); - - URLMON_LockModule(); - - return S_OK; + FIXME("%s: no class found.\n", debugstr_guid(rclsid)); + return CLASS_E_CLASSNOTAVAILABLE; }

1 0

Dmitry Timoshkov : user: Improve SetActiveWindow test, add SetForegroundWindow test, make them pass under Wine.
by Alexandre Julliard 10 Jul '06

10 Jul '06

Module: wine Branch: refs/heads/master Commit: 19e7fab981a75cdf0a339db35d36d9c1a6e64494 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=19e7fab981a75cdf0a339db… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Jul 7 23:01:51 2006 +0900 user: Improve SetActiveWindow test, add SetForegroundWindow test, make them pass under Wine. --- dlls/user/focus.c | 3 + dlls/user/tests/win.c | 121 +++++++++++++++++++++++++++++++++++++++++-------- server/queue.c | 19 +++----- server/trace.c | 1 server/window.c | 2 - 5 files changed, 113 insertions(+), 33 deletions(-) diff --git a/dlls/user/focus.c b/dlls/user/focus.c index 18bd035..efc8b8f 100644 --- a/dlls/user/focus.c +++ b/dlls/user/focus.c @@ -299,7 +299,8 @@ HWND WINAPI SetFocus( HWND hwnd ) BOOL WINAPI SetForegroundWindow( HWND hwnd ) { TRACE( "%p\n", hwnd ); - if (hwnd) hwnd = WIN_GetFullHandle( hwnd ); + + hwnd = WIN_GetFullHandle( hwnd ); return set_foreground_window( hwnd, FALSE ); } diff --git a/dlls/user/tests/win.c b/dlls/user/tests/win.c index f291fff..05a9287 100644 --- a/dlls/user/tests/win.c +++ b/dlls/user/tests/win.c @@ -2101,47 +2101,129 @@ static void test_SetFocus(HWND hwnd) DestroyWindow( child ); } +static void check_wnd_state(HWND active, HWND foreground, HWND focus, HWND capture) +{ + ok(active == GetActiveWindow(), "GetActiveWindow() = %p\n", GetActiveWindow()); + if (foreground) + ok(foreground == GetForegroundWindow(), "GetForegroundWindow() = %p\n", GetForegroundWindow()); + ok(focus == GetFocus(), "GetFocus() = %p\n", GetFocus()); + ok(capture == GetCapture(), "GetCapture() = %p\n", GetCapture()); +} + static void test_SetActiveWindow(HWND hwnd) { HWND hwnd2; - ShowWindow(hwnd, SW_SHOW); + ShowWindow(hwnd, SW_HIDE); + SetFocus(0); SetActiveWindow(0); - SetActiveWindow(hwnd); - ok( GetActiveWindow() == hwnd, "Failed to set focus to visible window %p\n", hwnd ); + check_wnd_state(0, 0, 0, 0); + + /*trace("testing SetActiveWindow %p\n", hwnd);*/ + + ShowWindow(hwnd, SW_SHOW); + check_wnd_state(hwnd, hwnd, hwnd, 0); + + hwnd2 = SetActiveWindow(0); + ok(hwnd2 == hwnd, "SetActiveWindow returned %p instead of %p\n", hwnd2, hwnd); + check_wnd_state(0, 0, 0, 0); + + hwnd2 = SetActiveWindow(hwnd); + ok(hwnd2 == 0, "SetActiveWindow returned %p instead of 0\n", hwnd2); + check_wnd_state(hwnd, hwnd, hwnd, 0); + SetWindowPos(hwnd,0,0,0,0,0,SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE|SWP_HIDEWINDOW); - ok( GetActiveWindow() == hwnd, "Window %p no longer active\n", hwnd ); + check_wnd_state(hwnd, hwnd, hwnd, 0); + SetWindowPos(hwnd,0,0,0,0,0,SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE|SWP_SHOWWINDOW); + check_wnd_state(hwnd, hwnd, hwnd, 0); + ShowWindow(hwnd, SW_HIDE); - ok( GetActiveWindow() != hwnd, "Window %p is still active\n", hwnd ); + check_wnd_state(0, 0, 0, 0); - /* trace("**testing an invisible window now\n"); */ + /*trace("testing SetActiveWindow on an invisible window %p\n", hwnd);*/ SetActiveWindow(hwnd); - ok( GetActiveWindow() == hwnd, "Window %p not active\n", hwnd ); - ok( !(GetWindowLong(hwnd,GWL_STYLE) & WS_VISIBLE), "Window %p is visible\n", hwnd ); + check_wnd_state(hwnd, hwnd, hwnd, 0); ShowWindow(hwnd, SW_SHOW); + check_wnd_state(hwnd, hwnd, hwnd, 0); hwnd2 = CreateWindowExA(0, "static", NULL, WS_POPUP|WS_VISIBLE, 0, 0, 0, 0, hwnd, 0, 0, NULL); - ok( GetActiveWindow() == hwnd2, "Window %p is not active\n", hwnd2 ); + check_wnd_state(hwnd2, hwnd2, hwnd2, 0); + DestroyWindow(hwnd2); - ok( GetActiveWindow() != hwnd2, "Window %p is still active\n", hwnd2 ); + check_wnd_state(hwnd, hwnd, hwnd, 0); hwnd2 = CreateWindowExA(0, "static", NULL, WS_POPUP|WS_VISIBLE, 0, 0, 0, 0, hwnd, 0, 0, NULL); - ok( GetActiveWindow() == hwnd2, "Window %p is not active\n", hwnd2 ); + check_wnd_state(hwnd2, hwnd2, hwnd2, 0); + SetWindowPos(hwnd2,0,0,0,0,0,SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE|SWP_HIDEWINDOW); - ok( GetActiveWindow() == hwnd2, "Window %p no longer active (%p)\n", hwnd2, GetActiveWindow() ); + check_wnd_state(hwnd2, hwnd2, hwnd2, 0); + DestroyWindow(hwnd2); - ok( GetActiveWindow() != hwnd2, "Window %p is still active\n", hwnd2 ); + check_wnd_state(hwnd, hwnd, hwnd, 0); } -static void check_wnd_state(HWND active, HWND foreground, HWND focus, HWND capture) +static void test_SetForegroundWindow(HWND hwnd) { - ok(active == GetActiveWindow(), "GetActiveWindow() = %p\n", GetActiveWindow()); - if (foreground) - ok(foreground == GetForegroundWindow(), "GetForegroundWindow() = %p\n", GetForegroundWindow()); - ok(focus == GetFocus(), "GetFocus() = %p\n", GetFocus()); - ok(capture == GetCapture(), "GetCapture() = %p\n", GetCapture()); + BOOL ret; + HWND hwnd2; + + ShowWindow(hwnd, SW_HIDE); + SetFocus(0); + SetActiveWindow(0); + check_wnd_state(0, 0, 0, 0); + + /*trace("testing SetForegroundWindow %p\n", hwnd);*/ + + ShowWindow(hwnd, SW_SHOW); + check_wnd_state(hwnd, hwnd, hwnd, 0); + + hwnd2 = SetActiveWindow(0); + ok(hwnd2 == hwnd, "SetActiveWindow(0) returned %p instead of %p\n", hwnd2, hwnd); + check_wnd_state(0, 0, 0, 0); + + ret = SetForegroundWindow(hwnd); + ok(ret, "SetForegroundWindow returned FALSE instead of TRUE\n"); + check_wnd_state(hwnd, hwnd, hwnd, 0); + + SetLastError(0xdeadbeef); + ret = SetForegroundWindow(0); + ok(!ret, "SetForegroundWindow returned TRUE instead of FALSE\n"); + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "got error %ld expected ERROR_INVALID_WINDOW_HANDLE\n", GetLastError()); + check_wnd_state(hwnd, hwnd, hwnd, 0); + + SetWindowPos(hwnd,0,0,0,0,0,SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE|SWP_HIDEWINDOW); + check_wnd_state(hwnd, hwnd, hwnd, 0); + + SetWindowPos(hwnd,0,0,0,0,0,SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE|SWP_SHOWWINDOW); + check_wnd_state(hwnd, hwnd, hwnd, 0); + + ShowWindow(hwnd, SW_HIDE); + check_wnd_state(0, 0, 0, 0); + + /*trace("testing SetForegroundWindow on an invisible window %p\n", hwnd);*/ + ret = SetForegroundWindow(hwnd); + ok(ret, "SetForegroundWindow returned FALSE instead of TRUE\n"); + check_wnd_state(hwnd, hwnd, hwnd, 0); + + ShowWindow(hwnd, SW_SHOW); + check_wnd_state(hwnd, hwnd, hwnd, 0); + + hwnd2 = CreateWindowExA(0, "static", NULL, WS_POPUP|WS_VISIBLE, 0, 0, 0, 0, hwnd, 0, 0, NULL); + check_wnd_state(hwnd2, hwnd2, hwnd2, 0); + + DestroyWindow(hwnd2); + check_wnd_state(hwnd, hwnd, hwnd, 0); + + hwnd2 = CreateWindowExA(0, "static", NULL, WS_POPUP|WS_VISIBLE, 0, 0, 0, 0, hwnd, 0, 0, NULL); + check_wnd_state(hwnd2, hwnd2, hwnd2, 0); + + SetWindowPos(hwnd2,0,0,0,0,0,SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE|SWP_HIDEWINDOW); + check_wnd_state(hwnd2, hwnd2, hwnd2, 0); + + DestroyWindow(hwnd2); + check_wnd_state(hwnd, hwnd, hwnd, 0); } static WNDPROC old_button_proc; @@ -3794,6 +3876,7 @@ START_TEST(win) test_SetMenu(hwndMain); test_SetFocus(hwndMain); test_SetActiveWindow(hwndMain); + test_SetForegroundWindow(hwndMain); test_children_zorder(hwndMain); test_keyboard_input(hwndMain); diff --git a/server/queue.c b/server/queue.c index 769895a..607c102 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1999,26 +1999,21 @@ DECL_HANDLER(set_key_state) /* set the system foreground window */ DECL_HANDLER(set_foreground_window) { + struct thread *thread; struct msg_queue *queue = get_current_queue(); reply->previous = foreground_input ? foreground_input->active : 0; reply->send_msg_old = (reply->previous && foreground_input != queue->input); reply->send_msg_new = FALSE; - if (req->handle) + if (is_top_level_window( req->handle ) && + ((thread = get_window_thread( req->handle )))) { - struct thread *thread; - - if (is_top_level_window( req->handle ) && - ((thread = get_window_thread( req->handle )))) - { - foreground_input = thread->queue->input; - reply->send_msg_new = (foreground_input != queue->input); - release_object( thread ); - } - else set_error( STATUS_INVALID_HANDLE ); + foreground_input = thread->queue->input; + reply->send_msg_new = (foreground_input != queue->input); + release_object( thread ); } - else foreground_input = NULL; + else set_win32_error( ERROR_INVALID_WINDOW_HANDLE ); } diff --git a/server/trace.c b/server/trace.c index 9b5cc39..6ecdeae 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3933,6 +3933,7 @@ static const struct { "ERROR_CLASS_HAS_WINDOWS", 0xc0010000 | ERROR_CLASS_HAS_WINDOWS }, { "ERROR_CLIPBOARD_NOT_OPEN", 0xc0010000 | ERROR_CLIPBOARD_NOT_OPEN }, { "ERROR_INVALID_INDEX", 0xc0010000 | ERROR_INVALID_INDEX }, + { "ERROR_INVALID_WINDOW_HANDLE", 0xc0010000 | ERROR_INVALID_WINDOW_HANDLE }, { "ERROR_SEEK", 0xc0010000 | ERROR_SEEK }, { "FILE_IS_A_DIRECTORY", STATUS_FILE_IS_A_DIRECTORY }, { "FILE_LOCK_CONFLICT", STATUS_FILE_LOCK_CONFLICT }, diff --git a/server/window.c b/server/window.c index f2017ec..82d709d 100644 --- a/server/window.c +++ b/server/window.c @@ -110,7 +110,7 @@ static struct window *taskman_window; inline static struct window *get_window( user_handle_t handle ) { struct window *ret = get_user_object( handle, USER_WINDOW ); - if (!ret) set_error( STATUS_INVALID_HANDLE ); + if (!ret) set_win32_error( ERROR_INVALID_WINDOW_HANDLE ); return ret; }

1 0

Dmitry Timoshkov : winex11.drv: Protect X11 calls by a critical section.
by Alexandre Julliard 10 Jul '06

10 Jul '06

Module: wine Branch: refs/heads/master Commit: 2280f1af79307b945e250f78586ffa5dada00fdb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2280f1af79307b945e250f7… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Jul 7 23:54:00 2006 +0900 winex11.drv: Protect X11 calls by a critical section. --- dlls/winex11.drv/event.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index aa9c1d6..92300c5 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -453,8 +453,10 @@ static void handle_wm_protocols( HWND hw xev = *event; TRACE("NET_WM Ping\n"); + wine_tsx11_lock(); xev.window = DefaultRootWindow(xev.display); XSendEvent(xev.display, xev.window, False, SubstructureRedirectMask | SubstructureNotifyMask, (XEvent*)&xev); + wine_tsx11_unlock(); /* this line is semi-stolen from gtk2 */ TRACE("NET_WM Pong\n"); }

1 0

Ivan Gyurdiev : wined3d: Fix typo breaking 3.0 pshaders color input.
by Alexandre Julliard 10 Jul '06

10 Jul '06

Module: wine Branch: refs/heads/master Commit: c58e06548e1c3ae491cce50d4a84674a8a9fc8ba URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c58e06548e1c3ae491cce50… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Fri Jul 7 11:01:27 2006 -0600 wined3d: Fix typo breaking 3.0 pshaders color input. --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 215090c..46965bf 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1401,7 +1401,7 @@ void pshader_glsl_input_pack( if (usage_idx == 0) shader_addline(buffer, "IN%lu%s = vec4(gl_Color)%s;\n", i, reg_mask, reg_mask); - if (usage_idx == 1) + else if (usage_idx == 1) shader_addline(buffer, "IN%lu%s = vec4(gl_SecondaryColor)%s;\n", i, reg_mask, reg_mask); else

1 0

lostwages/ templates/en/download.template news ...
by WineHQ 10 Jul '06

10 Jul '06

ChangeSet ID: 26366 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/07/10 01:29:12 Modified files: templates/en : download.template Added files: news : 2006071001.xml wwn : wn20060710_318.xml Log message: WWN #318 Patch: http://cvs.winehq.org/patch.py?id=26366 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2006071001.xml 1.82 1.83 +8 -3 lostwages/templates/en/download.template Added 1.1 +0 -0 lostwages/wwn/wn20060710_318.xml

1 0

appdb/include testResults.php
by WineHQ 10 Jul '06

10 Jul '06

ChangeSet ID: 26365 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/09 22:46:48 Modified files: include : testResults.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Show tested rating and use its color when displaying the list of test results Patch: http://cvs.winehq.org/patch.py?id=26365 Old revision New revision Changes Path 1.30 1.31 +5 -5 appdb/include/testResults.php Index: appdb/include/testResults.php diff -u -p appdb/include/testResults.php:1.30 appdb/include/testResults.php:1.31 --- appdb/include/testResults.php:1.30 10 Jul 2006 3:46:48 -0000 +++ appdb/include/testResults.php 10 Jul 2006 3:46:48 -0000 @@ -636,10 +636,10 @@ class testData{ <td>Application</td> <td>Version</td> <td>Release</td> + <td>Rating</td> <td align=\"center\">Action</td> </tr>"; - - $c = 1; + while($oRow = mysql_fetch_object($hResult)) { $oTest = new testData($oRow->testingId); @@ -649,8 +649,8 @@ class testData{ { $oApp = new application($oVersion->iAppId); $oSubmitter = new User($oTest->iSubmitterId); - if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; } - echo "<tr class=\"$bgcolor\">\n"; + $bgcolor = $oTest->sTestedRating; + echo '<tr class='.$bgcolor.'>',"\n"; echo " <td>".print_date(mysqltimestamp_to_unixtimestamp($oTest->sSubmitTime))."</td>\n"; echo " <td>\n"; echo $oSubmitter->sEmail ? "<a href=\"mailto:".$oSubmitter->sEmail."\">":""; @@ -660,9 +660,9 @@ class testData{ echo " <td>".$oApp->sName."</td>\n"; echo " <td>".$oVersion->sName."</td>\n"; echo " <td>".$oTest->sTestedRelease."</td>\n"; + echo " <td>".$oTest->sTestedRating."</td>\n"; echo " <td align=\"center\">[<a href=".$_SERVER['PHP_SELF']."?sSub=view&iTestingId=".$oTest->iTestingId.">process</a>]</td>\n"; echo "</tr>\n\n"; - $c++; } } echo "</table>","\n";

1 0

appdb/include form_edit.php
by WineHQ 10 Jul '06

10 Jul '06

ChangeSet ID: 26364 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/09 21:21:47 Modified files: include : form_edit.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Fix editing of a users administrative rights Patch: http://cvs.winehq.org/patch.py?id=26364 Old revision New revision Changes Path 1.9 1.10 +2 -2 appdb/include/form_edit.php Index: appdb/include/form_edit.php diff -u -p appdb/include/form_edit.php:1.9 appdb/include/form_edit.php:1.10 --- appdb/include/form_edit.php:1.9 10 Jul 2006 2:21:47 -0000 +++ appdb/include/form_edit.php 10 Jul 2006 2:21:47 -0000 @@ -3,7 +3,7 @@ require_once(BASE."include/util.php"); $aClean = array(); //array of filtered user input -$aClean['userId'] = makeSafe($_REQUEST['userId']); +$aClean['iUserId'] = makeSafe($_REQUEST['iUserId']); /*********************/ /* Edit Account Form */ /*********************/ @@ -28,7 +28,7 @@ $aClean['userId'] = makeSafe($_REQUEST[' </tr> <?php // if we manage another user we can give him administrator rights -if($oUser->iUserId == $aClean['userId']) +if($oUser->iUserId == $aClean['iUserId']) { ?> <tr>

1 0

appdb/include bugs.php
by WineHQ 09 Jul '06

09 Jul '06

ChangeSet ID: 26363 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/09 17:59:42 Modified files: include : bugs.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Require include/application.php to get the name of the application for email Patch: http://cvs.winehq.org/patch.py?id=26363 Old revision New revision Changes Path 1.13 1.14 +1 -0 appdb/include/bugs.php Index: appdb/include/bugs.php diff -u -p appdb/include/bugs.php:1.13 appdb/include/bugs.php:1.14 --- appdb/include/bugs.php:1.13 9 Jul 2006 22:59:42 -0000 +++ appdb/include/bugs.php 9 Jul 2006 22:59:42 -0000 @@ -1,5 +1,6 @@ <?php require_once(BASE."include/util.php"); +require_once(BASE."include/application.php"); /******************************************/ /* bug class and related functions */ /******************************************/

1 0

appdb/admin adminBugs.php
by WineHQ 09 Jul '06

09 Jul '06

ChangeSet ID: 26362 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/09 17:57:44 Modified files: admin : adminBugs.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Fix spelling of iPage in redirect Patch: http://cvs.winehq.org/patch.py?id=26362 Old revision New revision Changes Path 1.11 1.12 +2 -1 appdb/admin/adminBugs.php Index: appdb/admin/adminBugs.php diff -u -p appdb/admin/adminBugs.php:1.11 appdb/admin/adminBugs.php:1.12 --- appdb/admin/adminBugs.php:1.11 9 Jul 2006 22:57:44 -0000 +++ appdb/admin/adminBugs.php 9 Jul 2006 22:57:44 -0000 @@ -35,7 +35,8 @@ if ($aClean['sSub']) $oBuglink = new bug($aClean['iBuglinkId']); $oBuglink->unqueue(); } - util_redirect_and_exit($_SERVER['PHP_SELF']."?iItemsPerPage=".$aClean['iItemsPerPage']."&sQueuedOnly=".$aClean['sQueuedOnly']."&ipage=".$aClean['iPage']); + util_redirect_and_exit($_SERVER['PHP_SELF']."?iItemsPerPage=".$aClean['iItemsPerPage']."&sQueuedOnly=".$aClean['sQueuedOnly']."&iPage=".$aClean['iPage']); + } {

1 0