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

Milko Krachounov : shell32: Update Bulgarian translation.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: 604f60183c2f0b469d5a2eda7433ea3a4d021908 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=604f60183c2f0b469d5a2ed… Author: Milko Krachounov <milko(a)3mhz.net> Date: Fri Jul 14 00:41:42 2006 +0300 shell32: Update Bulgarian translation. --- dlls/shell32/shell32_Bg.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Bg.rc b/dlls/shell32/shell32_Bg.rc index b15ac3a..100b9b6 100644 --- a/dlls/shell32/shell32_Bg.rc +++ b/dlls/shell32/shell32_Bg.rc @@ -164,6 +164,7 @@ STRINGTABLE DISCARDABLE IDS_DELETEFOLDER_CAPTION "�� " IDS_DELETEITEM_TEXT "�� '%1'?" IDS_DELETEMULTIPLE_TEXT "�� %1 ��?" + IDS_DELETESELECTED_TEXT "�� ?" IDS_OVERWRITEFILE_TEXT "�� %1?" IDS_OVERWRITEFILE_CAPTION "�� "

1 0

Robert Reif : include: Add well known sids and quota limits to winnt.h.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: 2a1727a7d93eb322257473e485fb80665042c109 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2a1727a7d93eb322257473e… Author: Robert Reif <reif(a)earthlink.net> Date: Fri Jul 14 14:52:16 2006 -0400 include: Add well known sids and quota limits to winnt.h. --- include/winnt.h | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 118 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 77bf11e..1ee3bd2 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3160,6 +3160,7 @@ #define SID_REVISION (1) /* Current re #define SID_MAX_SUB_AUTHORITIES (15) /* current max subauths */ #define SID_RECOMMENDED_SUB_AUTHORITIES (1) /* recommended subauths */ +#define SECURITY_MAX_SID_SIZE (sizeof(SID) - sizeof(DWORD) + (SID_MAX_SUB_AUTHORITIES * sizeof(DWORD))) /* * ACL @@ -3337,11 +3338,16 @@ #define SECURITY_SERVICE_RID #define SECURITY_ANONYMOUS_LOGON_RID 0x00000007L #define SECURITY_PROXY_RID 0x00000008L #define SECURITY_ENTERPRISE_CONTROLLERS_RID 0x00000009L +#define SECURITY_SERVER_LOGON_RID SECURITY_ENTERPRISE_CONTROLLERS_RID #define SECURITY_PRINCIPAL_SELF_RID 0x0000000AL #define SECURITY_AUTHENTICATED_USER_RID 0x0000000BL #define SECURITY_RESTRICTED_CODE_RID 0x0000000CL #define SECURITY_TERMINAL_SERVER_RID 0x0000000DL +#define SECURITY_REMOTE_LOGON_RID 0x0000000EL +#define SECURITY_THIS_ORGANIZATION_RID 0x0000000FL #define SECURITY_LOCAL_SYSTEM_RID 0x00000012L +#define SECURITY_LOCAL_SERVICE_RID 0x00000013L +#define SECURITY_NETWORK_SERVICE_RID 0x00000014L #define SECURITY_NT_NON_UNIQUE 0x00000015L #define SECURITY_BUILTIN_DOMAIN_RID 0x00000020L @@ -3352,11 +3358,94 @@ #define DOMAIN_GROUP_RID_GUESTS #define DOMAIN_ALIAS_RID_ADMINS 0x00000220L #define DOMAIN_ALIAS_RID_USERS 0x00000221L #define DOMAIN_ALIAS_RID_GUESTS 0x00000222L +#define DOMAIN_ALIAS_RID_POWER_USERS 0x00000223L + +#define DOMAIN_ALIAS_RID_ACCOUNT_OPS 0x00000224L +#define DOMAIN_ALIAS_RID_SYSTEM_OPS 0x00000225L +#define DOMAIN_ALIAS_RID_PRINT_OPS 0x00000226L +#define DOMAIN_ALIAS_RID_BACKUP_OPS 0x00000227L + +#define DOMAIN_ALIAS_RID_REPLICATOR 0x00000228L +#define DOMAIN_ALIAS_RID_RAS_SERVERS 0x00000229L +#define DOMAIN_ALIAS_RID_PREW2KCOMPACCESS 0x0000022AL +#define DOMAIN_ALIAS_RID_REMOTE_DESKTOP_USERS 0x0000022BL +#define DOMAIN_ALIAS_RID_NETWORK_CONFIGURATION_OPS 0x0000022CL +#define DOMAIN_ALIAS_RID_INCOMING_FOREST_TRUST_BUILDERS 0x0000022DL + +#define DOMAIN_ALIAS_RID_MONITORING_USERS 0x0000022EL +#define DOMAIN_ALIAS_RID_LOGGING_USERS 0x0000022FL +#define DOMAIN_ALIAS_RID_AUTHORIZATIONACCESS 0x00000230L +#define DOMAIN_ALIAS_RID_TS_LICENSE_SERVERS 0x00000231L +#define DOMAIN_ALIAS_RID_DCOM_USERS 0x00000232L #define SECURITY_SERVER_LOGON_RID SECURITY_ENTERPRISE_CONTROLLERS_RID #define SECURITY_LOGON_IDS_RID_COUNT (3L) +typedef enum { + WinNullSid = 0, + WinWorldSid = 1, + WinLocalSid = 2, + WinCreatorOwnerSid = 3, + WinCreatorGroupSid = 4, + WinCreatorOwnerServerSid = 5, + WinCreatorGroupServerSid = 6, + WinNtAuthoritySid = 7, + WinDialupSid = 8, + WinNetworkSid = 9, + WinBatchSid = 10, + WinInteractiveSid = 11, + WinServiceSid = 12, + WinAnonymousSid = 13, + WinProxySid = 14, + WinEnterpriseControllersSid = 15, + WinSelfSid = 16, + WinAuthenticatedUserSid = 17, + WinRestrictedCodeSid = 18, + WinTerminalServerSid = 19, + WinRemoteLogonIdSid = 20, + WinLogonIdsSid = 21, + WinLocalSystemSid = 22, + WinLocalServiceSid = 23, + WinNetworkServiceSid = 24, + WinBuiltinDomainSid = 25, + WinBuiltinAdministratorsSid = 26, + WinBuiltinUsersSid = 27, + WinBuiltinGuestsSid = 28, + WinBuiltinPowerUsersSid = 29, + WinBuiltinAccountOperatorsSid = 30, + WinBuiltinSystemOperatorsSid = 31, + WinBuiltinPrintOperatorsSid = 32, + WinBuiltinBackupOperatorsSid = 33, + WinBuiltinReplicatorSid = 34, + WinBuiltinPreWindows2000CompatibleAccessSid = 35, + WinBuiltinRemoteDesktopUsersSid = 36, + WinBuiltinNetworkConfigurationOperatorsSid = 37, + WinAccountAdministratorSid = 38, + WinAccountGuestSid = 39, + WinAccountKrbtgtSid = 40, + WinAccountDomainAdminsSid = 41, + WinAccountDomainUsersSid = 42, + WinAccountDomainGuestsSid = 43, + WinAccountComputersSid = 44, + WinAccountControllersSid = 45, + WinAccountCertAdminsSid = 46, + WinAccountSchemaAdminsSid = 47, + WinAccountEnterpriseAdminsSid = 48, + WinAccountPolicyAdminsSid = 49, + WinAccountRasAndIasServersSid = 50, + WinNTLMAuthenticationSid = 51, + WinDigestAuthenticationSid = 52, + WinSChannelAuthenticationSid = 53, + WinThisOrganizationSid = 54, + WinOtherOrganizationSid = 55, + WinBuiltinIncomingForestTrustBuildersSid = 56, + WinBuiltinPerfMonitoringUsersSid = 57, + WinBuiltinPerfLoggingUsersSid = 58, + WinBuiltinAuthorizationAccessSid = 59, + WinBuiltinTerminalServerLicenseServersSid = 60 +} WELL_KNOWN_SID_TYPE; + /* * TOKEN_USER */ @@ -3700,6 +3789,35 @@ #define THREAD_BASE_PRIORITY_MAX 2 #define THREAD_BASE_PRIORITY_MIN -2 #define THREAD_BASE_PRIORITY_IDLE -15 +typedef struct _QUOTA_LIMITS { + SIZE_T PagedPoolLimit; + SIZE_T NonPagedPoolLimit; + SIZE_T MinimumWorkingSetSize; + SIZE_T MaximumWorkingSetSize; + SIZE_T PagefileLimit; + LARGE_INTEGER TimeLimit; +} QUOTA_LIMITS, *PQUOTA_LIMITS; + +#define QUOTA_LIMITS_HARDWS_MIN_ENABLE 0x00000001 +#define QUOTA_LIMITS_HARDWS_MIN_DISABLE 0x00000002 +#define QUOTA_LIMITS_HARDWS_MAX_ENABLE 0x00000004 +#define QUOTA_LIMITS_HARDWS_MAX_DISABLE 0x00000008 + +typedef struct _QUOTA_LIMITS_EX { + SIZE_T PagedPoolLimit; + SIZE_T NonPagedPoolLimit; + SIZE_T MinimumWorkingSetSize; + SIZE_T MaximumWorkingSetSize; + SIZE_T PagefileLimit; + LARGE_INTEGER TimeLimit; + SIZE_T Reserved1; + SIZE_T Reserved2; + SIZE_T Reserved3; + SIZE_T Reserved4; + DWORD Flags; + DWORD Reserved5; +} QUOTA_LIMITS_EX, *PQUOTA_LIMITS_EX; + #define SECTION_QUERY 0x0001 #define SECTION_MAP_WRITE 0x0002 #define SECTION_MAP_READ 0x0004

1 0

Robert Reif : advapi32: Add CreateWellKnownSid and IsWellKnownSid.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: c4ac8c5b165d516f0e6e4af58bdb29aa9f891dff URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c4ac8c5b165d516f0e6e4af… Author: Robert Reif <reif(a)earthlink.net> Date: Sun Jul 16 07:21:00 2006 -0400 advapi32: Add CreateWellKnownSid and IsWellKnownSid. --- dlls/advapi32/advapi32.spec | 4 + dlls/advapi32/security.c | 129 +++++++++++++++++++++++++++++++++++++------ include/winbase.h | 2 + 3 files changed, 115 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=c4ac8c5b165d516f0e6…

1 0

Robert Shearman : ole32: Free the buffer allocated in local_server_thread ( found by Smatch).
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: 352d9e2d677af6dcabd61cb3b6256773142adc8d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=352d9e2d677af6dcabd61cb… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jul 14 17:14:04 2006 +0100 ole32: Free the buffer allocated in local_server_thread (found by Smatch). --- dlls/ole32/rpc.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index cf49698..8decc2c 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -976,8 +976,6 @@ static DWORD WINAPI local_server_thread( hres = IStream_Stat(pStm,&ststg,0); if (hres) return hres; - buflen = ststg.cbSize.u.LowPart; - buffer = HeapAlloc(GetProcessHeap(),0,buflen); seekto.u.LowPart = 0; seekto.u.HighPart = 0; hres = IStream_Seek(pStm,seekto,SEEK_SET,&newpos); @@ -985,14 +983,20 @@ static DWORD WINAPI local_server_thread( FIXME("IStream_Seek failed, %lx\n",hres); return hres; } + + buflen = ststg.cbSize.u.LowPart; + buffer = HeapAlloc(GetProcessHeap(),0,buflen); hres = IStream_Read(pStm,buffer,buflen,&res); if (hres) { FIXME("Stream Read failed, %lx\n",hres); + HeapFree(GetProcessHeap(),0,buffer); return hres; } WriteFile(hPipe,buffer,buflen,&res,NULL); + HeapFree(GetProcessHeap(),0,buffer); + FlushFileBuffers(hPipe); DisconnectNamedPipe(hPipe);

1 0

Robert Shearman : ole32: Improve CoRegisterMessageFilter and add tests for it.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: fac6bedda9e78f8cd4e015f8afcf551b52adb411 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fac6bedda9e78f8cd4e015f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jul 14 17:13:58 2006 +0100 ole32: Improve CoRegisterMessageFilter and add tests for it. --- dlls/ole32/compobj.c | 44 +++++++++++++++- dlls/ole32/tests/compobj.c | 119 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 160 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index db0fcbe..c89d8ce 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2410,15 +2410,53 @@ DWORD WINAPI CoGetCurrentProcess(void) * RETURNS * Success: S_OK. * Failure: HRESULT code. + * + * NOTES + * Both lpMessageFilter and lplpMessageFilter are optional. Passing in a NULL + * lpMessageFilter removes the message filter. + * + * If lplpMessageFilter is not NULL the previous message filter will be + * returned in the memory pointer to this parameter and the caller is + * responsible for releasing the object. + * + * The current thread be in an apartment otherwise the function will crash. */ HRESULT WINAPI CoRegisterMessageFilter( LPMESSAGEFILTER lpMessageFilter, LPMESSAGEFILTER *lplpMessageFilter) { - FIXME("stub\n"); - if (lplpMessageFilter) { - *lplpMessageFilter = NULL; + struct apartment *apt; + IMessageFilter *lpOldMessageFilter; + + TRACE("(%p, %p)\n", lpMessageFilter, lplpMessageFilter); + + apt = COM_CurrentApt(); + + /* can't set a message filter in a multi-threaded apartment */ + if (apt->multi_threaded) + { + ERR("can't set message filter in MTA\n"); + return CO_E_NOT_SUPPORTED; } + + if (lpMessageFilter) + IMessageFilter_AddRef(lpMessageFilter); + + EnterCriticalSection(&apt->cs); + + lpOldMessageFilter = apt->filter; + apt->filter = lpMessageFilter; + + LeaveCriticalSection(&apt->cs); + + if (lplpMessageFilter) + *lplpMessageFilter = lpOldMessageFilter; + else if (lpOldMessageFilter) + IMessageFilter_Release(lpOldMessageFilter); + + if (lpMessageFilter) + FIXME("message filter has been registered, but will not be used\n"); + return S_OK; } diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 9164be8..19a6faa 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -29,6 +29,9 @@ #include "shlguid.h" #include "wine/test.h" +/* functions that are not present on all versions of Windows */ +HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit); + #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08lx\n", hr) static const CLSID CLSID_non_existent = { 0x12345678, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; @@ -142,12 +145,128 @@ static void test_ole_menu(void) DestroyWindow(hwndFrame); } + +static HRESULT WINAPI MessageFilter_QueryInterface(IMessageFilter *iface, REFIID riid, void ** ppvObj) +{ + if (ppvObj == NULL) return E_POINTER; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IClassFactory)) + { + *ppvObj = (LPVOID)iface; + IMessageFilter_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI MessageFilter_AddRef(IMessageFilter *iface) +{ + return 2; /* non-heap object */ +} + +static ULONG WINAPI MessageFilter_Release(IMessageFilter *iface) +{ + return 1; /* non-heap object */ +} + +static DWORD WINAPI MessageFilter_HandleInComingCall( + IMessageFilter *iface, + DWORD dwCallType, + HTASK threadIDCaller, + DWORD dwTickCount, + LPINTERFACEINFO lpInterfaceInfo) +{ + trace("HandleInComingCall\n"); + return SERVERCALL_ISHANDLED; +} + +static DWORD WINAPI MessageFilter_RetryRejectedCall( + IMessageFilter *iface, + HTASK threadIDCallee, + DWORD dwTickCount, + DWORD dwRejectType) +{ + trace("RetryRejectedCall\n"); + return 0; +} + +static DWORD WINAPI MessageFilter_MessagePending( + IMessageFilter *iface, + HTASK threadIDCallee, + DWORD dwTickCount, + DWORD dwPendingType) +{ + trace("MessagePending\n"); + return PENDINGMSG_WAITNOPROCESS; +} + +static const IMessageFilterVtbl MessageFilter_Vtbl = +{ + MessageFilter_QueryInterface, + MessageFilter_AddRef, + MessageFilter_Release, + MessageFilter_HandleInComingCall, + MessageFilter_RetryRejectedCall, + MessageFilter_MessagePending +}; + +static IMessageFilter MessageFilter = { &MessageFilter_Vtbl }; + +static void test_CoRegisterMessageFilter(void) +{ + HRESULT hr; + IMessageFilter *prev_filter; + +#if 0 /* crashes without an apartment! */ + hr = CoRegisterMessageFilter(&MessageFilter, &prev_filter); +#endif + + pCoInitializeEx(NULL, COINIT_MULTITHREADED); + prev_filter = (IMessageFilter *)0xdeadbeef; + hr = CoRegisterMessageFilter(&MessageFilter, &prev_filter); + ok(hr == CO_E_NOT_SUPPORTED, + "CoRegisterMessageFilter should have failed with CO_E_NOT_SUPPORTED instead of 0x%08lx\n", + hr); + ok(prev_filter == (IMessageFilter *)0xdeadbeef, + "prev_filter should have been set to %p\n", prev_filter); + CoUninitialize(); + + pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hr = CoRegisterMessageFilter(NULL, NULL); + ok_ole_success(hr, "CoRegisterMessageFilter"); + + prev_filter = (IMessageFilter *)0xdeadbeef; + hr = CoRegisterMessageFilter(NULL, &prev_filter); + ok_ole_success(hr, "CoRegisterMessageFilter"); + ok(prev_filter == NULL, "prev_filter should have been set to NULL instead of %p\n", prev_filter); + + hr = CoRegisterMessageFilter(&MessageFilter, &prev_filter); + ok_ole_success(hr, "CoRegisterMessageFilter"); + ok(prev_filter == NULL, "prev_filter should have been set to NULL instead of %p\n", prev_filter); + + hr = CoRegisterMessageFilter(NULL, NULL); + ok_ole_success(hr, "CoRegisterMessageFilter"); + + CoUninitialize(); +} + START_TEST(compobj) { + HMODULE hOle32 = GetModuleHandle("ole32"); + if (!(pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx"))) + { + trace("You need DCOM95 installed to run this test\n"); + return; + } + test_ProgIDFromCLSID(); test_CLSIDFromProgID(); test_CLSIDFromString(); test_CoCreateInstance(); test_ole_menu(); test_CoGetClassObject(); + test_CoRegisterMessageFilter(); }

1 0

Krzysztof Foltman : riched20: WM_SETFONT support.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: d17591fdf918568201ce52221c178df7ef114eb3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d17591fdf918568201ce522… Author: Krzysztof Foltman <wdev(a)foltman.com> Date: Fri Jul 14 19:43:00 2006 +0200 riched20: WM_SETFONT support. --- dlls/riched20/editor.c | 26 +++++++++++++++++++++++--- dlls/riched20/editor.h | 1 + dlls/riched20/style.c | 19 +++++++++++++++++++ 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 9a2b966..eaab0f7 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -92,7 +92,7 @@ - EM_SELECTIONTYPE - EM_SETBIDIOPTIONS 3.0 + EM_SETBKGNDCOLOR - - EM_SETCHARFORMAT (partly done, no ANSI) + + EM_SETCHARFORMAT (partly done, no ANSI) - EM_SETEDITSTYLE + EM_SETEVENTMASK (few notifications supported) - EM_SETFONTSIZE @@ -135,7 +135,7 @@ + WM_GETTEXT (ANSI&Unicode) + WM_GETTEXTLENGTH (ANSI version sucks) + WM_PASTE - - WM_SETFONT + + WM_SETFONT + WM_SETTEXT (resets undo stack !) (proper style?) ANSI&Unicode - WM_STYLECHANGING - WM_STYLECHANGED (things like read-only flag) @@ -1434,7 +1434,6 @@ LRESULT WINAPI RichEditANSIWndProc(HWND UNSUPPORTED_MSG(EM_SETTYPOGRAPHYOPTIONS) UNSUPPORTED_MSG(EM_SETWORDBREAKPROCEX) UNSUPPORTED_MSG(EM_SHOWSCROLLBAR) - UNSUPPORTED_MSG(WM_SETFONT) UNSUPPORTED_MSG(WM_STYLECHANGING) UNSUPPORTED_MSG(WM_STYLECHANGED) /* UNSUPPORTED_MSG(WM_UNICHAR) FIXME missing in Wine headers */ @@ -1836,6 +1835,27 @@ LRESULT WINAPI RichEditANSIWndProc(HWND return 0; } + case WM_SETFONT: + { + LOGFONTW lf; + CHARFORMAT2W fmt; + HDC hDC; + BOOL bRepaint = LOWORD(lParam); + + if (!wParam) + wParam = (WPARAM)GetStockObject(DEFAULT_GUI_FONT); + GetObjectW((HGDIOBJ)wParam, sizeof(LOGFONTW), &lf); + hDC = GetDC(hWnd); + ME_CharFormatFromLogFont(hDC, &lf, &fmt); + ReleaseDC(hWnd, hDC); + ME_SetCharFormat(editor, 0, ME_GetTextLength(editor), &fmt); + ME_SetDefaultCharFormat(editor, &fmt); + + ME_CommitUndo(editor); + if (bRepaint) + ME_UpdateRepaint(editor); + return 0; + } case WM_SETTEXT: { ME_InternalDeleteText(editor, 0, ME_GetTextLength(editor)); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 33b7626..a4d4980 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -55,6 +55,7 @@ void ME_CopyToCF2W(CHARFORMAT2W *to, CHA CHARFORMAT2W *ME_ToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from); void ME_CopyToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from); void ME_CopyCharFormat(CHARFORMAT2W *pDest, CHARFORMAT2W *pSrc); /* only works with 2W structs */ +void ME_CharFormatFromLogFont(HDC hDC, LOGFONTW *lf, CHARFORMAT2W *fmt); /* ditto */ /* list.c */ void ME_InsertBefore(ME_DisplayItem *diWhere, ME_DisplayItem *diWhat); diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index f420f09..6104a0c 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -286,6 +286,25 @@ ME_LogFontFromStyle(HDC hDC, LOGFONTW *l lf->lfCharSet = s->fmt.bCharSet; } +void ME_CharFormatFromLogFont(HDC hDC, LOGFONTW *lf, CHARFORMAT2W *fmt) +{ + int rx, ry; + + ME_InitCharFormat2W(fmt); + rx = GetDeviceCaps(hDC, LOGPIXELSX); + ry = GetDeviceCaps(hDC, LOGPIXELSY); + lstrcpyW(fmt->szFaceName, lf->lfFaceName); + fmt->dwEffects = 0; + fmt->dwMask = CFM_WEIGHT|CFM_BOLD|CFM_ITALIC|CFM_UNDERLINE|CFM_STRIKEOUT|CFM_SIZE|CFM_FACE|CFM_CHARSET; + fmt->wWeight = lf->lfWeight; + fmt->yHeight = -lf->lfHeight*1440/ry; + if (lf->lfWeight>400) fmt->dwEffects |= CFM_BOLD; + if (lf->lfItalic) fmt->dwEffects |= CFM_ITALIC; + if (lf->lfUnderline) fmt->dwEffects |= CFM_UNDERLINE; + if (lf->lfStrikeOut) fmt->dwEffects |= CFM_STRIKEOUT; + fmt->bPitchAndFamily = lf->lfPitchAndFamily; + fmt->bCharSet = lf->lfCharSet; +} BOOL ME_IsFontEqual(LOGFONTW *p1, LOGFONTW *p2) {

1 0

Aric Stewart : comcat: cImplemented or cRequired of -1 means to match everything
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: 9c3b12bd54a77a8a9859c4fe23c95c6ad975018d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9c3b12bd54a77a8a9859c4f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jul 13 14:16:59 2006 -0500 comcat: cImplemented or cRequired of -1 means to match everything regardless of the implementation or categories. --- configure | 3 + configure.ac | 1 dlls/comcat/Makefile.in | 2 + dlls/comcat/information.c | 5 ++ dlls/comcat/tests/Makefile.in | 14 ++++ dlls/comcat/tests/comcat.c | 129 +++++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 + 7 files changed, 156 insertions(+), 1 deletions(-) create mode 100644 dlls/comcat/tests/Makefile.in create mode 100644 dlls/comcat/tests/comcat.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=9c3b12bd54a77a8a985…

1 0

appdb/include user.php
by WineHQ 16 Jul '06

16 Jul '06

ChangeSet ID: 26553 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/16 12:37:23 Modified files: include : user.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix table name case difference 'Appversion' -> 'appVersion' that was breaking a query Patch: http://cvs.winehq.org/patch.py?id=26553 Old revision New revision Changes Path 1.78 1.79 +1 -1 appdb/include/user.php Index: appdb/include/user.php diff -u -p appdb/include/user.php:1.78 appdb/include/user.php:1.79 --- appdb/include/user.php:1.78 16 Jul 2006 17:37:23 -0000 +++ appdb/include/user.php 16 Jul 2006 17:37:23 -0000 @@ -438,7 +438,7 @@ class User { { /* find all queued versions of applications that the user is a super maintainer of */ $hResult = query_parameters("SELECT count(*) as queued_versions FROM appVersion, appMaintainers - WHERE Appversion.queued='true' AND appMaintainers.superMaintainer ='1' + WHERE appVersion.queued='true' AND appMaintainers.superMaintainer ='1' AND appVersion.appId = appMaintainers.appId AND appMaintainers.userId ='?'", $this->iUserId); }

1 0

appdb/ ./maintainersubmit.php admin/adminMaint ...
by WineHQ 16 Jul '06

16 Jul '06

ChangeSet ID: 26552 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/16 11:53:08 Modified files: . : maintainersubmit.php admin : adminMaintainerQueue.php adminMaintainers.php include : maintainer.php user.php util.php tables : maintainers.sql unit_test : test_user.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Merge appMaintainerQueue table into appMaintainers table. This simplifies the handling of queued vs. unqueued maintainers and removes a table from the database Patch: http://cvs.winehq.org/patch.py?id=26552 Old revision New revision Changes Path 1.31 1.32 +8 -5 appdb/maintainersubmit.php 1.32 1.33 +15 -15 appdb/admin/adminMaintainerQueue.php 1.26 1.27 +1 -1 appdb/admin/adminMaintainers.php 1.12 1.13 +3 -3 appdb/include/maintainer.php 1.77 1.78 +27 -26 appdb/include/user.php 1.71 1.72 +3 -3 appdb/include/util.php 1.2 1.3 +5 -15 appdb/tables/maintainers.sql 1.4 1.5 +41 -5 appdb/unit_test/test_user.php

1 0

appdb/ ./testResults.php include/version.php
by WineHQ 16 Jul '06

16 Jul '06

ChangeSet ID: 26551 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/16 00:39:56 Modified files: . : testResults.php include : version.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Stop allowing anonymous test results Patch: http://cvs.winehq.org/patch.py?id=26551 Old revision New revision Changes Path 1.15 1.16 +4 -0 appdb/testResults.php 1.77 1.78 +12 -4 appdb/include/version.php Index: appdb/testResults.php diff -u -p appdb/testResults.php:1.15 appdb/testResults.php:1.16 --- appdb/testResults.php:1.15 16 Jul 2006 5:39:56 -0000 +++ appdb/testResults.php 16 Jul 2006 5:39:56 -0000 @@ -18,6 +18,10 @@ $aClean['iVersionId'] = makeSafe($_REQUE $aClean['iDistributionId'] = makeSafe($_REQUEST['iDistributionId']); $aClean['sDistribution'] = makeSafe($_REQUEST['sDistribution']); +//deny access if not logged on +if(!$_SESSION['current']->isLoggedIn()) + util_show_error_page_and_exit("Insufficient privileges to create test results. Are you sure you are logged in?"); + if ($aClean['sSub']) { Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.77 appdb/include/version.php:1.78 --- appdb/include/version.php:1.77 16 Jul 2006 5:39:56 -0000 +++ appdb/include/version.php 16 Jul 2006 5:39:56 -0000 @@ -802,10 +802,18 @@ class Version { $oTest->ShowVersionsTestingTable($_SERVER['PHP_SELF']."?iVersionId=".$this->iVersionId."&iTestingId=", 5); } - echo '<form method=post name=sMessage action=testResults.php?sSub=view&iVersionId='.$this->iVersionId.'>'; - echo '<input type=submit value="Add Testing Data" class="button" />'; - echo '</form>'; - + if($_SESSION['current']->isLoggedIn()) + { + echo '<form method=post name=sMessage action=testResults.php?sSub=view&iVersionId='.$this->iVersionId.'>'; + echo '<input type=submit value="Add Testing Data" class="button" />'; + echo '</form>'; + } else + { + echo '<form method="post" name="sMessage" action="account.php">'; + echo '<input type="hidden" name="sCmd" value="login">'; + echo '<input type=submit value="Log in add Testing Data" class="button">'; + echo '</form>'; + } echo "</td></tr>"; /* close the table */

1 0