wine-commits March 2007

wine-commits@winehq.org

3 participants
844 discussions

Rob Shearman : ole32: Fix return codes returned by IBindCtx:: RegisterObjectBound and IBindCtx:: RevokeObjectBound when used on NULL objects.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: c4727fde17c8700e4670f999eb960194034f0f13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4727fde17c8700e4670f999e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Mar 9 09:48:26 2007 +0000 ole32: Fix return codes returned by IBindCtx::RegisterObjectBound and IBindCtx::RevokeObjectBound when used on NULL objects. --- dlls/ole32/bindctx.c | 5 ++++- dlls/ole32/tests/moniker.c | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index 464d02e..1dc702d 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -158,7 +158,7 @@ BindCtxImpl_RegisterObjectBound(IBindCtx* iface,IUnknown* punk) TRACE("(%p,%p)\n",This,punk); if (punk==NULL) - return E_POINTER; + return S_OK; IUnknown_AddRef(punk); @@ -197,6 +197,9 @@ BindCtxImpl_RevokeObjectBound(IBindCtx* iface, IUnknown* punk) TRACE("(%p,%p)\n",This,punk); + if (!punk) + return E_INVALIDARG; + /* check if the object was registered or not */ if (BindCtxImpl_GetObjectIndex(This,punk,NULL,&index)==S_FALSE) return MK_E_NOTBOUND; diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 6b8a35a..aa7c30f 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1510,11 +1510,9 @@ static void test_bind_context(void) ok(!pEnumString, "pEnumString should be NULL\n"); hr = IBindCtx_RegisterObjectBound(pBindCtx, NULL); - todo_wine ok_ole_success(hr, "IBindCtx_RegisterObjectBound(NULL)"); hr = IBindCtx_RevokeObjectBound(pBindCtx, NULL); - todo_wine ok(hr == E_INVALIDARG, "IBindCtx_RevokeObjectBound(NULL) should have return E_INVALIDARG instead of 0x%08x\n", hr); unknown2 = HeapAlloc(GetProcessHeap(), 0, sizeof(*unknown));

1 0

Rob Shearman : ole32: Fix cbStruct handling in IBindCtx:GetBindOptions.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: ba3ceaa4b86e461c95a63fa8499ac4c23dd8649b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba3ceaa4b86e461c95a63fa84… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Mar 9 09:47:43 2007 +0000 ole32: Fix cbStruct handling in IBindCtx:GetBindOptions. --- dlls/ole32/bindctx.c | 10 +++++++--- dlls/ole32/tests/moniker.c | 1 - 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index dc25b25..464d02e 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -267,16 +267,20 @@ static HRESULT WINAPI BindCtxImpl_GetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts) { BindCtxImpl *This = (BindCtxImpl *)iface; + ULONG cbStruct; TRACE("(%p,%p)\n",This,pbindopts); if (pbindopts==NULL) return E_POINTER; - if (pbindopts->cbStruct > sizeof(BIND_OPTS2)) - pbindopts->cbStruct = sizeof(BIND_OPTS2); + cbStruct = pbindopts->cbStruct; + if (cbStruct > sizeof(BIND_OPTS2)) + cbStruct = sizeof(BIND_OPTS2); + + memcpy(pbindopts, &This->bindOption2, cbStruct); + pbindopts->cbStruct = cbStruct; - memcpy(pbindopts, &This->bindOption2, pbindopts->cbStruct); return S_OK; } diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index cca2f67..6b8a35a 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1466,7 +1466,6 @@ static void test_bind_context(void) bind_opts.cbStruct = sizeof(BIND_OPTS); hr = IBindCtx_GetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts); ok_ole_success(hr, "IBindCtx_GetBindOptions"); - todo_wine ok(bind_opts.cbStruct == sizeof(BIND_OPTS), "bind_opts.cbStruct was %d\n", bind_opts.cbStruct); bind_opts.cbStruct = sizeof(bind_opts);

1 0

Rob Shearman : ole32: Add more tests of IBindCtx functions.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: e14e464df6e9778d56f3aaf77382435a4ccaf996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e14e464df6e9778d56f3aaf77… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Mar 9 09:46:58 2007 +0000 ole32: Add more tests of IBindCtx functions. Add tests for IBindCtx::GetObjectParam, IBindCtx::RevokeObjectParam and IBindCtx::RevokeObjectBound. --- dlls/ole32/bindctx.c | 2 ++ dlls/ole32/tests/moniker.c | 37 ++++++++++++++++++++++++++++++++++--- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index 7de1986..dc25b25 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -539,6 +539,8 @@ HRESULT WINAPI CreateBindCtx(DWORD reserved, LPBC * ppbc) TRACE("(%d,%p)\n",reserved,ppbc); + if (!ppbc) return E_INVALIDARG; + *ppbc = NULL; if (reserved != 0) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 6bfe330..cca2f67 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1444,8 +1444,13 @@ static void test_bind_context(void) BIND_OPTS2 bind_opts; HeapUnknown *unknown; HeapUnknown *unknown2; + IUnknown *param_obj; ULONG refs; static const WCHAR wszParamName[] = {'G','e','m','m','a',0}; + static const WCHAR wszNonExistant[] = {'N','o','n','E','x','i','s','t','a','n','t',0}; + + hr = CreateBindCtx(0, NULL); + ok(hr == E_INVALIDARG, "CreateBindCtx with NULL ppbc should have returned E_INVALIDARG instead of 0x%08x\n", hr); hr = CreateBindCtx(0xdeadbeef, &pBindCtx); ok(hr == E_INVALIDARG, "CreateBindCtx with reserved value non-zero should have returned E_INVALIDARG instead of 0x%08x\n", hr); @@ -1458,6 +1463,12 @@ static void test_bind_context(void) ok_ole_success(hr, "IBindCtx_GetBindOptions"); ok(bind_opts.cbStruct == sizeof(bind_opts), "bind_opts.cbStruct was %d\n", bind_opts.cbStruct); + bind_opts.cbStruct = sizeof(BIND_OPTS); + hr = IBindCtx_GetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts); + ok_ole_success(hr, "IBindCtx_GetBindOptions"); + todo_wine + ok(bind_opts.cbStruct == sizeof(BIND_OPTS), "bind_opts.cbStruct was %d\n", bind_opts.cbStruct); + bind_opts.cbStruct = sizeof(bind_opts); hr = IBindCtx_GetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts); ok_ole_success(hr, "IBindCtx_GetBindOptions"); @@ -1469,7 +1480,6 @@ static void test_bind_context(void) ok(bind_opts.dwClassContext == (CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER|CLSCTX_REMOTE_SERVER), "bind_opts.dwClassContext should have been 0x15 instead of 0x%x\n", bind_opts.dwClassContext); ok(bind_opts.locale == GetThreadLocale(), "bind_opts.locale should have been 0x%x instead of 0x%x\n", GetThreadLocale(), bind_opts.locale); - ok(bind_opts.pServerInfo == NULL, "bind_opts.pServerInfo should have been NULL instead of %p\n", bind_opts.pServerInfo); bind_opts.cbStruct = -1; @@ -1479,12 +1489,23 @@ static void test_bind_context(void) hr = IBindCtx_RegisterObjectParam(pBindCtx, (WCHAR *)wszParamName, NULL); ok(hr == E_INVALIDARG, "IBindCtx_RegisterObjectParam should have returned E_INVALIDARG instead of 0x%08x\n", hr); - unknown = (HeapUnknown *)HeapAlloc(GetProcessHeap(), 0, sizeof(*unknown)); + unknown = HeapAlloc(GetProcessHeap(), 0, sizeof(*unknown)); unknown->lpVtbl = &HeapUnknown_Vtbl; unknown->refs = 1; hr = IBindCtx_RegisterObjectParam(pBindCtx, (WCHAR *)wszParamName, (IUnknown *)&unknown->lpVtbl); ok_ole_success(hr, "IBindCtx_RegisterObjectParam"); + hr = IBindCtx_GetObjectParam(pBindCtx, (WCHAR *)wszParamName, &param_obj); + ok_ole_success(hr, "IBindCtx_GetObjectParam"); + IUnknown_Release(param_obj); + + hr = IBindCtx_GetObjectParam(pBindCtx, (WCHAR *)wszNonExistant, &param_obj); + ok(hr == E_FAIL, "IBindCtx_GetObjectParam with non-existing key should have failed with E_FAIL instead of 0x%08x\n", hr); + ok(param_obj == NULL, "IBindCtx_GetObjectParam with non-existing key should have set output parameter to NULL instead of %p\n", param_obj); + + hr = IBindCtx_RevokeObjectParam(pBindCtx, (WCHAR *)wszNonExistant); + ok(hr == E_FAIL, "IBindCtx_RevokeObjectParam with non-existing key should have failed with E_FAIL instead of 0x%08x\n", hr); + hr = IBindCtx_EnumObjectParam(pBindCtx, &pEnumString); ok(hr == E_NOTIMPL, "IBindCtx_EnumObjectParam should have returned E_NOTIMPL instead of 0x%08x\n", hr); ok(!pEnumString, "pEnumString should be NULL\n"); @@ -1493,12 +1514,22 @@ static void test_bind_context(void) todo_wine ok_ole_success(hr, "IBindCtx_RegisterObjectBound(NULL)"); - unknown2 = (HeapUnknown *)HeapAlloc(GetProcessHeap(), 0, sizeof(*unknown)); + hr = IBindCtx_RevokeObjectBound(pBindCtx, NULL); + todo_wine + ok(hr == E_INVALIDARG, "IBindCtx_RevokeObjectBound(NULL) should have return E_INVALIDARG instead of 0x%08x\n", hr); + + unknown2 = HeapAlloc(GetProcessHeap(), 0, sizeof(*unknown)); unknown2->lpVtbl = &HeapUnknown_Vtbl; unknown2->refs = 1; hr = IBindCtx_RegisterObjectBound(pBindCtx, (IUnknown *)&unknown2->lpVtbl); ok_ole_success(hr, "IBindCtx_RegisterObjectBound"); + hr = IBindCtx_RevokeObjectBound(pBindCtx, (IUnknown *)&unknown2->lpVtbl); + ok_ole_success(hr, "IBindCtx_RevokeObjectBound"); + + hr = IBindCtx_RevokeObjectBound(pBindCtx, (IUnknown *)&unknown2->lpVtbl); + ok(hr == MK_E_NOTBOUND, "IBindCtx_RevokeObjectBound with not bound object should have returned MK_E_NOTBOUND instead of 0x%08x\n", hr); + IBindCtx_Release(pBindCtx); refs = IUnknown_Release((IUnknown *)&unknown->lpVtbl);

1 0

Farshad Agah : comctl32: monthcal: Reject out of range dates in MCM_SETCURSEL.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: d0f75b5993d04392e4723f16cbfbcb85cc1a3afa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0f75b5993d04392e4723f16c… Author: Farshad Agah <f_agah(a)yahoo.com> Date: Thu Mar 8 20:48:48 2007 -0800 comctl32: monthcal: Reject out of range dates in MCM_SETCURSEL. --- dlls/comctl32/monthcal.c | 2 ++ dlls/comctl32/tests/monthcal.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 53a8e5c..ded5c5c 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1038,6 +1038,8 @@ MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, LPARAM lParam) if((infoPtr==NULL) ||(lpSel==NULL)) return FALSE; if(GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE) & MCS_MULTISELECT) return FALSE; + if(!MONTHCAL_ValidateTime(*lpSel)) return FALSE; + infoPtr->currentMonth=lpSel->wMonth; infoPtr->currentYear=lpSel->wYear; diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 6de5be8..c8666f3 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -206,7 +206,7 @@ static void test_monthcal_currDate(HWND hwnd) /* Overflow matters, check for wDay */ st_test.wDay += 4; res = SendMessage(hwnd, MCM_SETCURSEL, 0, (LPARAM)&st_test); - todo_wine {expect(0,res);} + expect(0,res); /* correct wDay before checking for wMonth */ st_test.wDay -= 4; @@ -215,7 +215,7 @@ static void test_monthcal_currDate(HWND hwnd) /* Overflow matters, check for wMonth */ st_test.wMonth += 4; res = SendMessage(hwnd, MCM_SETCURSEL, 0, (LPARAM)&st_test); - todo_wine {expect(0,res);} + expect(0,res); /* checking if gets the information right, modify st_new */ st_new.wYear += 4; @@ -231,7 +231,7 @@ static void test_monthcal_currDate(HWND hwnd) /* st_new change to st_origin, above settings with overflow */ /* should not change the current settings */ expect(st_original.wYear, st_new.wYear); - todo_wine {expect(st_original.wMonth, st_new.wMonth);} + expect(st_original.wMonth, st_new.wMonth); expect(st_original.wDay, st_new.wDay); expect(st_original.wHour, st_new.wHour); expect(st_original.wMinute, st_new.wMinute);

1 0

Michael Stefaniuc : winedos: Check a file handle against INVALID_HANDLE_VALUE, not 0.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: 9a5c5178c2f59d0f03a9ea90be5698ffd76fbd7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a5c5178c2f59d0f03a9ea90b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 8 23:21:07 2007 +0100 winedos: Check a file handle against INVALID_HANDLE_VALUE, not 0. --- dlls/winedos/int2f.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winedos/int2f.c b/dlls/winedos/int2f.c index dcb19c4..7bbf5e4 100644 --- a/dlls/winedos/int2f.c +++ b/dlls/winedos/int2f.c @@ -564,7 +564,7 @@ static void MSCDEX_Request(BYTE *driver_request, BOOL dorealmode) PTR_AT(driver_request, 3, WORD) = 0; devName[4] = 'A' + CDROM_GetHeap()->hdr.drive + driver_request[1]; h = CreateFileA(devName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); - if (!h) { + if (h == INVALID_HANDLE_VALUE) { WARN("Couldn't open cdrom handle\n"); driver_request[4] |= 0x80; driver_request[3] = 1; /* unknown unit */

1 0

Andrew Talbot : serialui: Replace const pointer type with correct pointer to const.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: 9890cb788488776e61dffe929adb8925bb23ad62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9890cb788488776e61dffe929… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Mar 8 22:15:27 2007 +0000 serialui: Replace const pointer type with correct pointer to const. --- dlls/serialui/confdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/serialui/confdlg.c b/dlls/serialui/confdlg.c index 6b5dbe2..52dcaf0 100644 --- a/dlls/serialui/confdlg.c +++ b/dlls/serialui/confdlg.c @@ -112,7 +112,7 @@ typedef struct tagPARAM2STR DWORD dwSize; LPPARAM2STRDATA data; } PARAM2STR, *LPPARAM2STR; -typedef const LPPARAM2STR LPCPARAM2STR; +typedef const PARAM2STR *LPCPARAM2STR; #define SERIALUI_TABLESIZE(x) ((sizeof (x))/(sizeof (x[0])))

1 0

Byeong-Sik Jeon : winecfg: Fix typo.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: ff8b9336d55dc44e7219e02de01cc682d498a996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff8b9336d55dc44e7219e02de… Author: Byeong-Sik Jeon <wjsqudtlr(a)gmail.com> Date: Fri Mar 9 08:50:50 2007 +0900 winecfg: Fix typo. --- programs/winecfg/Ko.rc | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index 4ab3de3..16590d7 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -6,7 +6,6 @@ * Copyright 2003 Dimitrie O. Paun * Copyright 2003-2004 Mike Hearn * Copyright 2005,2006 YunSong Hwang - * Copyright 2006 Byeong-Sik Jeon * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -67,7 +66,7 @@ BEGIN GROUPBOX " â �� ",IDC_STATIC,8,4,244,180 CONTROL "DirectX ��α׷�� 콺 Ŀ�� ׵�� â�ȿ� ��Ƶΰ� ��",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,14,230,8 - LTEXT "Wineâ�� â��ڿ� ��ؼ� ��ȴٸ�, Wineâ�� ǥ�� âƲ�� ̸�, �۾�� ڿ� �� ︱ ��Դϴ�. �׸�� â��Ͽ�� Ÿ�� Դϴ�.\n\n��࿡ Wineâ�� â��ڿ� �� ʴ´ٸ�, Wienâ�� â��ڿ� �� Դϴ�. �̰�� Wineâ�� ũž�� ϰ� ��յ�� ʴ´ٴ� �� ǹ��մϴ�. �� Wine�� 䳻��Ⱑ �� α׷�� ֵ�� ݴϴ�.", + LTEXT "Wineâ�� â��ڿ� ��ؼ� ��ȴٸ�, Wineâ�� ǥ�� âƲ�� ̸�, �۾�� ڿ� �� ︱ ��Դϴ�. �׸�� â��Ͽ�� Ÿ�� Դϴ�.\n\n��࿡ Wineâ�� â��ڿ� �� ʴ´ٸ�, Wineâ�� â��ڿ� �� Դϴ�. �̰�� Wineâ�� ũž�� ϰ� ��յ�� ʴ´ٴ� �� ǹ��մϴ�. �� Wine�� 䳻��Ⱑ �� α׷�� ֵ�� ݴϴ�.", IDC_STATIC,15,37,228,80 CONTROL "â��ڰ� Wineâ�� ϵ�� ",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,230,8 LTEXT "�� α׷�� 󵥽�ũž�� ൿ�� ϰ� �� , �� ٸ� �ൿ�� ϰ� �� ֽ��ϴ�.",

1 0

Michael Stefaniuc : winecfg: Initial Romanian translation.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: 6e1a0dea44fdbcde701ef9c5702d8f52c344927a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e1a0dea44fdbcde701ef9c57… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 8 22:04:08 2007 +0100 winecfg: Initial Romanian translation. --- programs/winecfg/Ro.rc | 309 +++++++++++++++++++++++++++++++++++++++++++ programs/winecfg/winecfg.rc | 1 + 2 files changed, 310 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e1a0dea44fdbcde701ef…

1 0

Alexandre Julliard : kernel32: Implemented GetSystemInfo() for Solaris.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: 82274f8b1631312893d3052b06ccb2e264e674d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82274f8b1631312893d3052b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 8 23:01:03 2007 +0100 kernel32: Implemented GetSystemInfo() for Solaris. --- dlls/kernel32/cpu.c | 125 +++++++++++++++++++++++++++++---------------------- 1 files changed, 71 insertions(+), 54 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 9f21132..9fbf165 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -64,7 +64,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg); /* Calls cpuid with an eax of 'ax' and returns the 16 bytes in *p * We are compiled with -fPIC, so we can't clobber ebx. */ -static inline void do_cpuid(int ax, int *p) +static inline void do_cpuid(unsigned int ax, unsigned int *p) { #ifdef __i386__ __asm__("pushl %%ebx\n\t" @@ -244,6 +244,57 @@ static void create_env_registry_keys( const SYSTEM_INFO *info ) NtClose( env_key ); } +static inline void get_cpuinfo( SYSTEM_INFO *info ) +{ + unsigned int regs[4], regs2[4]; + + if (!have_cpuid()) return; + + do_cpuid(0x00000000, regs); /* get standard cpuid level and vendor name */ + if (regs[0]>=0x00000001) /* Check for supported cpuid version */ + { + do_cpuid(0x00000001, regs2); /* get cpu features */ + switch ((regs2[0] >> 8) & 0xf) /* cpu family */ + { + case 3: + info->dwProcessorType = PROCESSOR_INTEL_386; + info->wProcessorLevel = 3; + break; + case 4: + info->dwProcessorType = PROCESSOR_INTEL_486; + info->wProcessorLevel = 4; + break; + case 5: + info->dwProcessorType = PROCESSOR_INTEL_PENTIUM; + info->wProcessorLevel = 5; + break; + case 6: + case 15: /* PPro/2/3/4 has same info as P1 */ + info->dwProcessorType = PROCESSOR_INTEL_PENTIUM; + info->wProcessorLevel = 6; + break; + default: + FIXME("unknown cpu family %d, please report! (-> setting to 386)\n", + (regs2[0] >> 8)&0xf); + break; + } + PF[PF_FLOATING_POINT_EMULATED] = !(regs2[3] & 1); + PF[PF_RDTSC_INSTRUCTION_AVAILABLE] = (regs2[3] & (1 << 4 )) >> 4; + PF[PF_COMPARE_EXCHANGE_DOUBLE] = (regs2[3] & (1 << 8 )) >> 8; + PF[PF_MMX_INSTRUCTIONS_AVAILABLE] = (regs2[3] & (1 << 23)) >> 23; + + if (regs[1] == AUTH && + regs[3] == ENTI && + regs[2] == CAMD) { + do_cpuid(0x80000000, regs); /* get vendor cpuid level */ + if (regs[0]>=0x80000001) { + do_cpuid(0x80000001, regs2); /* get vendor features */ + PF[PF_3DNOW_INSTRUCTIONS_AVAILABLE] = (regs2[3] & (1 << 31 )) >> 31; + } + } + } +} + /**************************************************************************** * QueryPerformanceCounter (KERNEL32.@) * @@ -500,7 +551,6 @@ VOID WINAPI GetSystemInfo( } fclose (f); } - memcpy(si,&cachedsi,sizeof(*si)); #elif defined (__NetBSD__) { int mib[2]; @@ -590,65 +640,31 @@ VOID WINAPI GetSystemInfo( } } - memcpy(si,&cachedsi,sizeof(*si)); #elif defined(__FreeBSD__) { - unsigned int regs[4], regs2[4]; int ret, len, num; - if (!have_cpuid()) - regs[0] = 0; /* No cpuid support -- skip the rest */ - else - do_cpuid(0x00000000, regs); /* get standard cpuid level and vendor name */ - if (regs[0]>=0x00000001) { /* Check for supported cpuid version */ - do_cpuid(0x00000001, regs2); /* get cpu features */ - switch ((regs2[0] >> 8)&0xf) { /* cpu family */ - case 3: cachedsi.dwProcessorType = PROCESSOR_INTEL_386; - cachedsi.wProcessorLevel = 3; - break; - case 4: cachedsi.dwProcessorType = PROCESSOR_INTEL_486; - cachedsi.wProcessorLevel = 4; - break; - case 5: - cachedsi.dwProcessorType = PROCESSOR_INTEL_PENTIUM; - cachedsi.wProcessorLevel = 5; - break; - case 6: - case 15: /* PPro/2/3/4 has same info as P1 */ - cachedsi.dwProcessorType = PROCESSOR_INTEL_PENTIUM; - cachedsi.wProcessorLevel = 6; - break; - default: - FIXME("unknown FreeBSD cpu family %d, please report! (-> setting to 386)\n", - (regs2[0] >> 8)&0xf); - break; - } - PF[PF_FLOATING_POINT_EMULATED] = !(regs2[3] & 1); - PF[PF_RDTSC_INSTRUCTION_AVAILABLE] = (regs2[3] & (1 << 4 )) >> 4; - PF[PF_COMPARE_EXCHANGE_DOUBLE] = (regs2[3] & (1 << 8 )) >> 8; - PF[PF_MMX_INSTRUCTIONS_AVAILABLE] = (regs2[3] & (1 << 23)) >> 23; - /* Check for OS support of SSE -- Is this used, and should it be sse1 or sse2? */ - /*len = sizeof(num); - ret = sysctlbyname("hw.instruction_sse", &num, &len, NULL, 0); - if (!ret) - PF[PF_XMMI_INSTRUCTIONS_AVAILABLE] = num;*/ - - if (regs[1] == AUTH && - regs[3] == ENTI && - regs[2] == CAMD) { - do_cpuid(0x80000000, regs); /* get vendor cpuid level */ - if (regs[0]>=0x80000001) { - do_cpuid(0x80000001, regs2); /* get vendor features */ - PF[PF_3DNOW_INSTRUCTIONS_AVAILABLE] = - (regs2[3] & (1 << 31 )) >> 31; - } - } - } + + get_cpuinfo( &cachedsi ); + + /* Check for OS support of SSE -- Is this used, and should it be sse1 or sse2? */ + /*len = sizeof(num); + ret = sysctlbyname("hw.instruction_sse", &num, &len, NULL, 0); + if (!ret) + PF[PF_XMMI_INSTRUCTIONS_AVAILABLE] = num;*/ + len = sizeof(num); ret = sysctlbyname("hw.ncpu", &num, &len, NULL, 0); if (!ret) cachedsi.dwNumberOfProcessors = num; } - memcpy(si,&cachedsi,sizeof(*si)); +#elif defined(__sun) + { + int num = sysconf( _SC_NPROCESSORS_ONLN ); + + if (num == -1) num = 1; + get_cpuinfo( &cachedsi ); + cachedsi.dwNumberOfProcessors = num; + } #elif defined (__APPLE__) { size_t valSize; @@ -766,10 +782,11 @@ VOID WINAPI GetSystemInfo( if (!sysctlbyname("hw.cpufrequency", &longVal, &valSize, NULL, 0)) cpuHz = longVal; } - memcpy(si,&cachedsi,sizeof(*si)); #else FIXME("not yet supported on this system\n"); #endif + memcpy(si,&cachedsi,sizeof(*si)); + TRACE("<- CPU arch %d, res'd %d, pagesize %d, minappaddr %p, maxappaddr %p," " act.cpumask %08x, numcpus %d, CPU type %d, allocgran. %d, CPU level %d, CPU rev %d\n", si->u.s.wProcessorArchitecture, si->u.s.wReserved, si->dwPageSize,

1 0

appdb/include util.php
by WineHQ 09 Mar '07

09 Mar '07

ChangeSet ID: 30945 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/08 19:37:33 Modified files: include : util.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix top 10 vote lists so they don't display the same version twice Patch: http://cvs.winehq.org/patch.py?id=30945 Old revision New revision Changes Path 1.80 1.81 +13 -14 appdb/include/util.php Index: appdb/include/util.php diff -u -p appdb/include/util.php:1.80 appdb/include/util.php:1.81 --- appdb/include/util.php:1.80 9 Mar 2007 1:37:33 -0000 +++ appdb/include/util.php 9 Mar 2007 1:37:33 -0000 @@ -269,15 +269,15 @@ function outputTopXRow($oRow) } /* Output the rows for the Top-X tables on the main page */ -function outputTopXRowAppsFromRating($rating, $iNum_apps) +function outputTopXRowAppsFromRating($sRating, $iNumApps) { /* clean the input values so we can continue to use query_appdb() */ - $rating = mysql_real_escape_string($rating); - $iNum_apps = mysql_real_escape_string($iNum_apps); + $sRating = mysql_real_escape_string($sRating); + $iNumApps = mysql_real_escape_string($iNumApps); - /* list of appIds we've already output, so we don't output */ + /* list of versionIds we've already output, so we don't output */ /* them again when filling in any empty spots in the list */ - $appIdArray = array(); + $aVersionId = array(); $sQuery = "SELECT appVotes.versionId, COUNT( appVotes.versionId ) AS c FROM appVotes, appVersion @@ -286,37 +286,36 @@ function outputTopXRowAppsFromRating($ra GROUP BY appVotes.versionId ORDER BY c DESC LIMIT ?"; - $hResult = query_parameters($sQuery, $rating, $iNum_apps); - $iNum_apps-=mysql_num_rows($hResult); /* take away the rows we are outputting here */ + $hResult = query_parameters($sQuery, $sRating, $iNumApps); + $iNumApps -= mysql_num_rows($hResult); /* take away the rows we are outputting here */ while($oRow = mysql_fetch_object($hResult)) { - array_push($appIdArray, $oRow->appId); /* keep track of the apps we've already output */ + /* keep track of the apps we've already output */ + $aVersionId[] = $oRow->versionId; outputTopXRow($oRow); } /* if we have no more app entries we should stop now and save ourselves a query */ - if(!$iNum_apps) return; + if(!$iNumApps) return; /* if we have any empty spots in the list, get these from applications with images */ $sQuery = "SELECT DISTINCT appVersion.versionId FROM appVersion, appData - WHERE appVersion.maintainer_rating = '$rating' + WHERE appVersion.maintainer_rating = '$sRating' AND appVersion.versionId = appData.versionId AND appData.type = 'image' AND appData.queued = 'false'"; /* make sure we exclude any apps we've already output */ - foreach($appIdArray as $key=>$value) + foreach($aVersionId as $key=>$value) $sQuery.="AND appVersion.versionId != '".$value."' "; - $sQuery.=" LIMIT $iNum_apps"; + $sQuery .= " LIMIT $iNumApps"; /* get the list that will fill the empty spots */ $hResult = query_appdb($sQuery); while($oRow = mysql_fetch_object($hResult)) - { outputTopXRow($oRow); - } } /* return true if this word is in the list of words to ignore */

1 0

← Newer
1
...
58
59
60
61
62
63
64
...
85
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2007