November 2008 - Wine-Commits

Lei Zhang : comctl32: Process WM_CHAR instead of WM_KEYDOWN for numbers in datetime.
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: 40bbe3da6ffd68f584b441069197584029a4fd63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40bbe3da6ffd68f584b441069… Author: Lei Zhang <thestig(a)google.com> Date: Tue Nov 25 14:03:36 2008 -0800 comctl32: Process WM_CHAR instead of WM_KEYDOWN for numbers in datetime. --- dlls/comctl32/datetime.c | 165 ++++++++++++++++++++++++--------------------- 1 files changed, 88 insertions(+), 77 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 2d44540..e953178 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -902,83 +902,6 @@ DATETIME_KeyDown (DATETIME_INFO *infoPtr, DWORD vkCode) FIXME ("Callbacks not implemented yet\n"); } - if (vkCode >= '0' && vkCode <= '9') { - /* this is a somewhat simplified version of what Windows does */ - SYSTEMTIME *date = &infoPtr->date; - switch (infoPtr->fieldspec[fieldNum]) { - case ONEDIGITYEAR: - case TWODIGITYEAR: - date->wYear = date->wYear - (date->wYear%100) + - (date->wYear%10)*10 + (vkCode-'0'); - date->wDayOfWeek = DATETIME_CalculateDayOfWeek( - date->wDay,date->wMonth,date->wYear); - DATETIME_SendDateTimeChangeNotify (infoPtr); - break; - case INVALIDFULLYEAR: - case FULLYEAR: - date->wYear = (date->wYear%1000)*10 + (vkCode-'0'); - date->wDayOfWeek = DATETIME_CalculateDayOfWeek( - date->wDay,date->wMonth,date->wYear); - DATETIME_SendDateTimeChangeNotify (infoPtr); - break; - case ONEDIGITMONTH: - case TWODIGITMONTH: - if ((date->wMonth%10) > 1 || (vkCode-'0') > 2) - date->wMonth = vkCode-'0'; - else - date->wMonth = (date->wMonth%10)*10+vkCode-'0'; - date->wDayOfWeek = DATETIME_CalculateDayOfWeek( - date->wDay,date->wMonth,date->wYear); - DATETIME_SendDateTimeChangeNotify (infoPtr); - break; - case ONEDIGITDAY: - case TWODIGITDAY: - /* probably better checking here would help */ - if ((date->wDay%10) >= 3 && (vkCode-'0') > 1) - date->wDay = vkCode-'0'; - else - date->wDay = (date->wDay%10)*10+vkCode-'0'; - date->wDayOfWeek = DATETIME_CalculateDayOfWeek( - date->wDay,date->wMonth,date->wYear); - DATETIME_SendDateTimeChangeNotify (infoPtr); - break; - case ONEDIGIT12HOUR: - case TWODIGIT12HOUR: - if ((date->wHour%10) > 1 || (vkCode-'0') > 2) - date->wHour = vkCode-'0'; - else - date->wHour = (date->wHour%10)*10+vkCode-'0'; - DATETIME_SendDateTimeChangeNotify (infoPtr); - break; - case ONEDIGIT24HOUR: - case TWODIGIT24HOUR: - if ((date->wHour%10) > 2) - date->wHour = vkCode-'0'; - else if ((date->wHour%10) == 2 && (vkCode-'0') > 3) - date->wHour = vkCode-'0'; - else - date->wHour = (date->wHour%10)*10+vkCode-'0'; - DATETIME_SendDateTimeChangeNotify (infoPtr); - break; - case ONEDIGITMINUTE: - case TWODIGITMINUTE: - if ((date->wMinute%10) > 5) - date->wMinute = vkCode-'0'; - else - date->wMinute = (date->wMinute%10)*10+vkCode-'0'; - DATETIME_SendDateTimeChangeNotify (infoPtr); - break; - case ONEDIGITSECOND: - case TWODIGITSECOND: - if ((date->wSecond%10) > 5) - date->wSecond = vkCode-'0'; - else - date->wSecond = (date->wSecond%10)*10+vkCode-'0'; - DATETIME_SendDateTimeChangeNotify (infoPtr); - break; - } - } - switch (vkCode) { case VK_ADD: case VK_UP: @@ -1026,6 +949,91 @@ DATETIME_KeyDown (DATETIME_INFO *infoPtr, DWORD vkCode) static LRESULT +DATETIME_Char (DATETIME_INFO *infoPtr, WPARAM vkCode, LPARAM keyData) +{ + int fieldNum = infoPtr->select & DTHT_DATEFIELD; + + if (vkCode >= '0' && vkCode <= '9') { + /* this is a somewhat simplified version of what Windows does */ + SYSTEMTIME *date = &infoPtr->date; + switch (infoPtr->fieldspec[fieldNum]) { + case ONEDIGITYEAR: + case TWODIGITYEAR: + date->wYear = date->wYear - (date->wYear%100) + + (date->wYear%10)*10 + (vkCode-'0'); + date->wDayOfWeek = DATETIME_CalculateDayOfWeek( + date->wDay,date->wMonth,date->wYear); + DATETIME_SendDateTimeChangeNotify (infoPtr); + break; + case INVALIDFULLYEAR: + case FULLYEAR: + date->wYear = (date->wYear%1000)*10 + (vkCode-'0'); + date->wDayOfWeek = DATETIME_CalculateDayOfWeek( + date->wDay,date->wMonth,date->wYear); + DATETIME_SendDateTimeChangeNotify (infoPtr); + break; + case ONEDIGITMONTH: + case TWODIGITMONTH: + if ((date->wMonth%10) > 1 || (vkCode-'0') > 2) + date->wMonth = vkCode-'0'; + else + date->wMonth = (date->wMonth%10)*10+vkCode-'0'; + date->wDayOfWeek = DATETIME_CalculateDayOfWeek( + date->wDay,date->wMonth,date->wYear); + DATETIME_SendDateTimeChangeNotify (infoPtr); + break; + case ONEDIGITDAY: + case TWODIGITDAY: + /* probably better checking here would help */ + if ((date->wDay%10) >= 3 && (vkCode-'0') > 1) + date->wDay = vkCode-'0'; + else + date->wDay = (date->wDay%10)*10+vkCode-'0'; + date->wDayOfWeek = DATETIME_CalculateDayOfWeek( + date->wDay,date->wMonth,date->wYear); + DATETIME_SendDateTimeChangeNotify (infoPtr); + break; + case ONEDIGIT12HOUR: + case TWODIGIT12HOUR: + if ((date->wHour%10) > 1 || (vkCode-'0') > 2) + date->wHour = vkCode-'0'; + else + date->wHour = (date->wHour%10)*10+vkCode-'0'; + DATETIME_SendDateTimeChangeNotify (infoPtr); + break; + case ONEDIGIT24HOUR: + case TWODIGIT24HOUR: + if ((date->wHour%10) > 2) + date->wHour = vkCode-'0'; + else if ((date->wHour%10) == 2 && (vkCode-'0') > 3) + date->wHour = vkCode-'0'; + else + date->wHour = (date->wHour%10)*10+vkCode-'0'; + DATETIME_SendDateTimeChangeNotify (infoPtr); + break; + case ONEDIGITMINUTE: + case TWODIGITMINUTE: + if ((date->wMinute%10) > 5) + date->wMinute = vkCode-'0'; + else + date->wMinute = (date->wMinute%10)*10+vkCode-'0'; + DATETIME_SendDateTimeChangeNotify (infoPtr); + break; + case ONEDIGITSECOND: + case TWODIGITSECOND: + if ((date->wSecond%10) > 5) + date->wSecond = vkCode-'0'; + else + date->wSecond = (date->wSecond%10)*10+vkCode-'0'; + DATETIME_SendDateTimeChangeNotify (infoPtr); + break; + } + } + return 0; +} + + +static LRESULT DATETIME_VScroll (DATETIME_INFO *infoPtr, WORD wScroll) { int fieldNum = infoPtr->select & DTHT_DATEFIELD; @@ -1341,6 +1349,9 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_KEYDOWN: return DATETIME_KeyDown (infoPtr, wParam); + case WM_CHAR: + return DATETIME_Char (infoPtr, wParam, lParam); + case WM_KILLFOCUS: return DATETIME_KillFocus (infoPtr, (HWND)wParam);

1 0

Juan Lang : crypt32: Accept any string format as the display text of a user notice policy qualifier .
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: 93aed4b078ebf689a62a680909661112ab317f8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=93aed4b078ebf689a62a68090… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 21 15:37:46 2008 -0800 crypt32: Accept any string format as the display text of a user notice policy qualifier. --- dlls/crypt32/decode.c | 129 ++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 102 insertions(+), 27 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index a93f33d..632369f 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -2392,54 +2392,129 @@ static BOOL CRYPT_AsnDecodeNoticeReference(const BYTE *pbEncoded, return ret; } -static BOOL CRYPT_AsnDecodeBMPString(const BYTE *pbEncoded, +static BOOL CRYPT_AsnDecodeUnicodeString(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) { BOOL ret = TRUE; DWORD dataLen; - LPWSTR *pStr = pvStructInfo; if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) { BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); - DWORD bytesNeeded = sizeof(LPWSTR) + sizeof(WCHAR); + DWORD bytesNeeded = sizeof(LPWSTR); - if (pbEncoded[0] != ASN_BMPSTRING) + switch (pbEncoded[0]) { - SetLastError(CRYPT_E_ASN1_CORRUPT); + case ASN_NUMERICSTRING: + if (dataLen) + bytesNeeded += (dataLen + 1) * 2; + break; + case ASN_PRINTABLESTRING: + if (dataLen) + bytesNeeded += (dataLen + 1) * 2; + break; + case ASN_IA5STRING: + if (dataLen) + bytesNeeded += (dataLen + 1) * 2; + break; + case ASN_T61STRING: + if (dataLen) + bytesNeeded += (dataLen + 1) * 2; + break; + case ASN_VIDEOTEXSTRING: + if (dataLen) + bytesNeeded += (dataLen + 1) * 2; + break; + case ASN_GRAPHICSTRING: + if (dataLen) + bytesNeeded += (dataLen + 1) * 2; + break; + case ASN_VISIBLESTRING: + if (dataLen) + bytesNeeded += (dataLen + 1) * 2; + break; + case ASN_GENERALSTRING: + if (dataLen) + bytesNeeded += (dataLen + 1) * 2; + break; + case ASN_UNIVERSALSTRING: + if (dataLen) + bytesNeeded += dataLen / 2 + sizeof(WCHAR); + break; + case ASN_BMPSTRING: + if (dataLen) + bytesNeeded += dataLen + sizeof(WCHAR); + break; + case ASN_UTF8STRING: + if (dataLen) + bytesNeeded += (MultiByteToWideChar(CP_UTF8, 0, + (LPCSTR)pbEncoded + 1 + lenBytes, dataLen, NULL, 0) + 1) * 2; + break; + default: + SetLastError(CRYPT_E_ASN1_BADTAG); + return FALSE; + } + + if (pcbDecoded) + *pcbDecoded = 1 + lenBytes + dataLen; + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if (*pcbStructInfo < bytesNeeded) + { + *pcbStructInfo = bytesNeeded; + SetLastError(ERROR_MORE_DATA); ret = FALSE; } else { - bytesNeeded += dataLen; - if (pcbDecoded) - *pcbDecoded = 1 + lenBytes + dataLen; - if (!pvStructInfo) - *pcbStructInfo = bytesNeeded; - else if (*pcbStructInfo < bytesNeeded) - { - *pcbStructInfo = bytesNeeded; - SetLastError(ERROR_MORE_DATA); - ret = FALSE; - } - else + LPWSTR *pStr = pvStructInfo; + + *pcbStructInfo = bytesNeeded; + if (dataLen) { - *pcbStructInfo = bytesNeeded; - if (dataLen) - { - DWORD i; - LPWSTR str = *pStr; + DWORD i; + LPWSTR str = *(LPWSTR *)pStr; - assert(str); + assert(str); + switch (pbEncoded[0]) + { + case ASN_NUMERICSTRING: + case ASN_PRINTABLESTRING: + case ASN_IA5STRING: + case ASN_T61STRING: + case ASN_VIDEOTEXSTRING: + case ASN_GRAPHICSTRING: + case ASN_VISIBLESTRING: + case ASN_GENERALSTRING: + for (i = 0; i < dataLen; i++) + str[i] = pbEncoded[1 + lenBytes + i]; + str[i] = 0; + break; + case ASN_UNIVERSALSTRING: + for (i = 0; i < dataLen / 4; i++) + str[i] = (pbEncoded[1 + lenBytes + 2 * i + 2] << 8) + | pbEncoded[1 + lenBytes + 2 * i + 3]; + str[i] = 0; + break; + case ASN_BMPSTRING: for (i = 0; i < dataLen / 2; i++) str[i] = (pbEncoded[1 + lenBytes + 2 * i] << 8) | pbEncoded[1 + lenBytes + 2 * i + 1]; str[i] = 0; + break; + case ASN_UTF8STRING: + { + int len = MultiByteToWideChar(CP_UTF8, 0, + (LPCSTR)pbEncoded + 1 + lenBytes, dataLen, + str, bytesNeeded - sizeof(CERT_NAME_VALUE)) * 2; + str[len] = 0; + break; + } } - else - *pStr = NULL; } + else + *pStr = NULL; } } return ret; @@ -2455,8 +2530,8 @@ static BOOL CRYPT_AsnDecodePolicyQualifierUserNoticeInternal( pNoticeReference), CRYPT_AsnDecodeNoticeReference, sizeof(PCERT_POLICY_QUALIFIER_NOTICE_REFERENCE), TRUE, TRUE, offsetof(CERT_POLICY_QUALIFIER_USER_NOTICE, pNoticeReference), 0 }, - { ASN_BMPSTRING, offsetof(CERT_POLICY_QUALIFIER_USER_NOTICE, - pszDisplayText), CRYPT_AsnDecodeBMPString, sizeof(LPWSTR), TRUE, TRUE, + { 0, offsetof(CERT_POLICY_QUALIFIER_USER_NOTICE, pszDisplayText), + CRYPT_AsnDecodeUnicodeString, sizeof(LPWSTR), TRUE, TRUE, offsetof(CERT_POLICY_QUALIFIER_USER_NOTICE, pszDisplayText), 0 }, }; PCERT_POLICY_QUALIFIER_USER_NOTICE notice = pvStructInfo;

1 0

Francois Gouget : Straighten out some ellipses.
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: b3bf746ff942c153fa578fd7230207de7e10c6f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3bf746ff942c153fa578fd72… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 25 17:42:38 2008 +0100 Straighten out some ellipses. --- dlls/dplayx/name_server.c | 2 +- dlls/dsound/sound3d.c | 2 +- dlls/kernel32/format_msg.c | 2 +- dlls/ole32/storage32.c | 2 +- dlls/riched20/run.c | 2 +- dlls/uxtheme/system.c | 2 +- dlls/winmm/mci.c | 2 +- programs/cmdlgtst/cmdlgtst.c | 4 ++-- tools/winedump/debug.c | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c index 3527877..928e082 100644 --- a/dlls/dplayx/name_server.c +++ b/dlls/dplayx/name_server.c @@ -169,7 +169,7 @@ LPVOID NS_GetNSAddr( LPVOID lpNSInfo ) /* Ok. Cheat and don't search for the correct stuff just take the first. * FIXME: In the future how are we to know what is _THE_ enum we used? * This is going to have to go into dplay somehow. Perhaps it - * comes back with app server id for the join command! Oh...that + * comes back with app server id for the join command! Oh... that * must be it. That would make this method obsolete once that's * in place. */ diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 2397f52..252c763 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -106,7 +106,7 @@ static inline D3DVALUE RadToDeg (D3DVALUE angle) static inline D3DVALUE AngleBetweenVectorsRad (const D3DVECTOR *a, const D3DVECTOR *b) { D3DVALUE la, lb, product, angle, cos; - /* definition of scalar product: a*b = |a|*|b|*cos...therefore: */ + /* definition of scalar product: a*b = |a|*|b|*cos... therefore: */ product = ScalarProduct (a,b); la = VectorMagnitude (a); lb = VectorMagnitude (b); diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index c983c95..0920d66 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(resource); -/* Messages...used by FormatMessage (KERNEL32.something) +/* Messages used by FormatMessage * * They can be specified either directly or using a message ID and * loading them from the resource. diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 3c88a36..fe84804 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -6606,7 +6606,7 @@ static HRESULT OLECONVERT_LoadOLE10(LPOLESTREAM pOleStream, OLECONVERT_OLESTREAM if(hRes == S_OK) { - /* Get the TypeID...more info needed for this field */ + /* Get the TypeID... more info needed for this field */ dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)&(pData->dwTypeID), sizeof(pData->dwTypeID)); if(dwSize != sizeof(pData->dwTypeID)) { diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 133219d..e2fde47 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -813,7 +813,7 @@ void ME_SetCharFormat(ME_TextEditor *editor, int nOfs, int nChars, CHARFORMAT2W undo->nStart = tmp.pRun->member.run.nCharOfs+para->member.para.nCharOfs; undo->nLen = tmp.pRun->member.run.strText->nLen; undo->di.member.ustyle = tmp.pRun->member.run.style; - /* we'd have to addref undo..ustyle and release tmp...style + /* we'd have to addref undo...ustyle and release tmp...style but they'd cancel each other out so we can do nothing instead */ } else diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index d213ba2..c1e26c8 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -916,7 +916,7 @@ HRESULT WINAPI CloseThemeFile(HTHEMEFILE hThemeFile) * char b[] = "\0"; where \0 can be one or more of any character, makes no difference * the theme is applied smoothly (screen does not flicker) * char *b = "\0" or NULL; where \0 can be zero or more of any character, makes no difference - * the function fails returning invalid parameter...very strange + * the function fails returning invalid parameter... very strange */ HRESULT WINAPI ApplyTheme(HTHEMEFILE hThemeFile, char *unknown, HWND hWnd) { diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index d6ca7f0..a3d679f 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1121,7 +1121,7 @@ static DWORD MCI_ParseOptArgs(LPDWORD data, int _offset, LPCWSTR lpCmd, } break; case MCI_RECT: - /* store rect in data (offset...offset+3) */ + /* store rect in data (offset..offset+3) */ *dwFlags |= flg; if (!MCI_GetDWord(&(data[offset+0]), &args) || !MCI_GetDWord(&(data[offset+1]), &args) || diff --git a/programs/cmdlgtst/cmdlgtst.c b/programs/cmdlgtst/cmdlgtst.c index d19c119..0c8b2b1 100644 --- a/programs/cmdlgtst/cmdlgtst.c +++ b/programs/cmdlgtst/cmdlgtst.c @@ -885,8 +885,8 @@ static LRESULT CALLBACK EXPORT mainWindowDispatcher( else switch(uMsg) { case WM_CREATE: /* - * this is always the first message...at least as far as - * we are concerned. + * this is always the first message... at least as far + * as we are concerned. */ mwi_InitAll(hWnd); break; diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c index 0920786..be8150f 100644 --- a/tools/winedump/debug.c +++ b/tools/winedump/debug.c @@ -69,7 +69,7 @@ * (hdr) IMAGE_SECTION_HEADER - list of COFF sections copied verbatim from .EXE; * although this directory contains file offsets, these offsets are meaningless * in the context of the .DBG file, because only the section headers are copied - * to the .DBG file...not the binary data it points to. + * to the .DBG file... not the binary data it points to. * (hdr) IMAGE_DEBUG_DIRECTORY - list of different formats of debug info contained in file * (see IMAGE_DEBUG_TYPE_* descriptions below); tells where each section starts * (hdr) OMFSignature (CV) - Contains "NBxx" signature, plus file offset telling how far

1 0

Francois Gouget : shell32: Remove WINAPI/ CALLBACK on static functions where not needed.
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: 36e195a18568c65d42cae6bf4a35006102e6c959 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36e195a18568c65d42cae6bf4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 25 16:41:52 2008 +0100 shell32: Remove WINAPI/CALLBACK on static functions where not needed. --- dlls/shell32/pidl.c | 2 +- dlls/shell32/shlfileop.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index af299d5..12e148c 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -985,7 +985,7 @@ LPITEMIDLIST WINAPI ILCreateFromPathAW (LPCVOID path) * is used to avoid having to verify the current path element on disk, so * that creating an ItemIDList from a nonexistent path still can work. */ -static HRESULT WINAPI _ILParsePathW(LPCWSTR path, LPWIN32_FIND_DATAW lpFindFile, +static HRESULT _ILParsePathW(LPCWSTR path, LPWIN32_FIND_DATAW lpFindFile, BOOL bBindCtx, LPITEMIDLIST *ppidl, LPDWORD prgfInOut) { LPSHELLFOLDER pSF = NULL; diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index d2514f0..77402ca 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -112,7 +112,7 @@ static void confirm_msg_move_button(HWND hDlg, INT iId, INT *xPos, INT yOffset, /* Note: we paint the text manually and don't use the static control to make * sure the text has the same height as the one computed in WM_INITDIALOG */ -static INT_PTR CALLBACK ConfirmMsgBox_Paint(HWND hDlg) +static INT_PTR ConfirmMsgBox_Paint(HWND hDlg) { PAINTSTRUCT ps; HFONT hOldFont; @@ -132,7 +132,7 @@ static INT_PTR CALLBACK ConfirmMsgBox_Paint(HWND hDlg) return TRUE; } -static INT_PTR CALLBACK ConfirmMsgBox_Init(HWND hDlg, LPARAM lParam) +static INT_PTR ConfirmMsgBox_Init(HWND hDlg, LPARAM lParam) { struct confirm_msg_info *info = (struct confirm_msg_info *)lParam; INT xPos, yOffset;

1 0

Francois Gouget : ole32: Remove WINAPI on static functions where not needed .
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: 66063ae4a4d86a0c019fbecb3a7b95c362fc379f URL: http://source.winehq.org/git/wine.git/?a=commit;h=66063ae4a4d86a0c019fbecb3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 25 16:41:41 2008 +0100 ole32: Remove WINAPI on static functions where not needed. --- dlls/ole32/classmoniker.c | 4 ++-- dlls/ole32/compobj.c | 2 +- dlls/ole32/errorinfo.c | 4 ++-- dlls/ole32/filemoniker.c | 9 ++++----- dlls/ole32/itemmoniker.c | 8 ++++---- dlls/ole32/moniker.c | 6 +++--- dlls/ole32/stg_bigblockfile.c | 4 ++-- 7 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 5c95b0a..5629c5a 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -116,7 +116,7 @@ static ULONG WINAPI ClassMoniker_AddRef(IMoniker* iface) /****************************************************************************** * ClassMoniker_Destroy (local function) *******************************************************************************/ -static HRESULT WINAPI ClassMoniker_Destroy(ClassMoniker* This) +static HRESULT ClassMoniker_Destroy(ClassMoniker* This) { TRACE("(%p)\n",This); @@ -693,7 +693,7 @@ static const IROTDataVtbl ROTDataVtbl = /****************************************************************************** * ClassMoniker_Construct (local function) *******************************************************************************/ -static HRESULT WINAPI ClassMoniker_Construct(ClassMoniker* This, REFCLSID rclsid) +static HRESULT ClassMoniker_Construct(ClassMoniker* This, REFCLSID rclsid) { TRACE("(%p,%s)\n",This,debugstr_guid(rclsid)); diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 37907ec..bc03914 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1267,7 +1267,7 @@ HRESULT WINAPI CoCreateGuid(GUID *pguid) * SEE ALSO * StringFromCLSID */ -static HRESULT WINAPI __CLSIDFromString(LPCWSTR s, CLSID *id) +static HRESULT __CLSIDFromString(LPCWSTR s, CLSID *id) { int i; BYTE table[256]; diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c index e4a1c47..0009ebe 100644 --- a/dlls/ole32/errorinfo.c +++ b/dlls/ole32/errorinfo.c @@ -42,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); /* this code is from SysAllocStringLen (ole2disp.c in oleaut32) */ -static BSTR WINAPI ERRORINFO_SysAllocString(const OLECHAR* in) +static BSTR ERRORINFO_SysAllocString(const OLECHAR* in) { DWORD bufferSize; DWORD* newBuffer; @@ -99,7 +99,7 @@ static BSTR WINAPI ERRORINFO_SysAllocString(const OLECHAR* in) } /* this code is from SysFreeString (ole2disp.c in oleaut32)*/ -static VOID WINAPI ERRORINFO_SysFreeString(BSTR in) +static VOID ERRORINFO_SysFreeString(BSTR in) { DWORD* bufferPointer; diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 3dae139..0da643f 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -63,8 +63,8 @@ static inline IMoniker *impl_from_IROTData( IROTData *iface ) } /* Local function used by filemoniker implementation */ -static HRESULT WINAPI FileMonikerImpl_Construct(FileMonikerImpl* iface, LPCOLESTR lpszPathName); -static HRESULT WINAPI FileMonikerImpl_Destroy(FileMonikerImpl* iface); +static HRESULT FileMonikerImpl_Construct(FileMonikerImpl* iface, LPCOLESTR lpszPathName); +static HRESULT FileMonikerImpl_Destroy(FileMonikerImpl* iface); /******************************************************************************* * FileMoniker_QueryInterface @@ -456,7 +456,7 @@ FileMonikerImpl_GetSizeMax(IMoniker* iface, ULARGE_INTEGER* pcbSize) /****************************************************************************** * FileMoniker_Destroy (local function) *******************************************************************************/ -HRESULT WINAPI FileMonikerImpl_Destroy(FileMonikerImpl* This) +HRESULT FileMonikerImpl_Destroy(FileMonikerImpl* This) { TRACE("(%p)\n",This); @@ -1333,8 +1333,7 @@ static const IROTDataVtbl VT_ROTDataImpl = /****************************************************************************** * FileMoniker_Construct (local function) */ -static HRESULT WINAPI -FileMonikerImpl_Construct(FileMonikerImpl* This, LPCOLESTR lpszPathName) +static HRESULT FileMonikerImpl_Construct(FileMonikerImpl* This, LPCOLESTR lpszPathName) { int nb=0,i; int sizeStr=lstrlenW(lpszPathName); diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 1a8822a..08b1fe4 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -97,8 +97,8 @@ static HRESULT WINAPI ItemMonikerImpl_ParseDisplayName(IMoniker* iface,IBindCtx* static HRESULT WINAPI ItemMonikerImpl_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys); /* Local function used by ItemMoniker implementation */ -static HRESULT WINAPI ItemMonikerImpl_Construct(ItemMonikerImpl* iface, LPCOLESTR lpszDelim,LPCOLESTR lpszPathName); -static HRESULT WINAPI ItemMonikerImpl_Destroy(ItemMonikerImpl* iface); +static HRESULT ItemMonikerImpl_Construct(ItemMonikerImpl* iface, LPCOLESTR lpszDelim,LPCOLESTR lpszPathName); +static HRESULT ItemMonikerImpl_Destroy(ItemMonikerImpl* iface); /********************************************************************************/ /* IROTData prototype functions */ @@ -391,7 +391,7 @@ HRESULT WINAPI ItemMonikerImpl_GetSizeMax(IMoniker* iface, /****************************************************************************** * ItemMoniker_Construct (local function) *******************************************************************************/ -static HRESULT WINAPI ItemMonikerImpl_Construct(ItemMonikerImpl* This, LPCOLESTR lpszDelim,LPCOLESTR lpszItem) +static HRESULT ItemMonikerImpl_Construct(ItemMonikerImpl* This, LPCOLESTR lpszDelim,LPCOLESTR lpszItem) { int sizeStr1=lstrlenW(lpszItem), sizeStr2; @@ -429,7 +429,7 @@ static HRESULT WINAPI ItemMonikerImpl_Construct(ItemMonikerImpl* This, LPCOLESTR /****************************************************************************** * ItemMoniker_Destroy (local function) *******************************************************************************/ -static HRESULT WINAPI ItemMonikerImpl_Destroy(ItemMonikerImpl* This) +static HRESULT ItemMonikerImpl_Destroy(ItemMonikerImpl* This) { TRACE("(%p)\n",This); diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 4e56462..c5b5c2f 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -93,7 +93,7 @@ typedef struct EnumMonikerImpl /* IEnumMoniker Local functions*/ -static HRESULT WINAPI EnumMonikerImpl_CreateEnumROTMoniker(InterfaceList *moniker_list, +static HRESULT EnumMonikerImpl_CreateEnumROTMoniker(InterfaceList *moniker_list, ULONG pos, IEnumMoniker **ppenumMoniker); static IrotHandle get_irot_handle(void) @@ -342,7 +342,7 @@ RunningObjectTableImpl_AddRef(IRunningObjectTable* iface) /*********************************************************************** * RunningObjectTable_Initialize */ -static HRESULT WINAPI +static HRESULT RunningObjectTableImpl_Destroy(void) { struct list *cursor, *cursor2; @@ -1463,7 +1463,7 @@ static const IEnumMonikerVtbl VT_EnumMonikerImpl = * Used by EnumRunning to create the structure and EnumClone * to copy the structure */ -static HRESULT WINAPI EnumMonikerImpl_CreateEnumROTMoniker(InterfaceList *moniker_list, +static HRESULT EnumMonikerImpl_CreateEnumROTMoniker(InterfaceList *moniker_list, ULONG current_pos, IEnumMoniker **ppenumMoniker) { diff --git a/dlls/ole32/stg_bigblockfile.c b/dlls/ole32/stg_bigblockfile.c index b0e54e5..a2ee1de 100644 --- a/dlls/ole32/stg_bigblockfile.c +++ b/dlls/ole32/stg_bigblockfile.c @@ -725,7 +725,7 @@ static DWORD BIGBLOCKFILE_GetProtectMode(DWORD openFlags) * * See the documentation of ILockBytes for more info. */ -static HRESULT WINAPI ImplBIGBLOCKFILE_ReadAt( +static HRESULT ImplBIGBLOCKFILE_ReadAt( BigBlockFile* const This, ULARGE_INTEGER ulOffset, /* [in] */ void* pv, /* [length_is][size_is][out] */ @@ -812,7 +812,7 @@ static HRESULT WINAPI ImplBIGBLOCKFILE_ReadAt( * * See the documentation of ILockBytes for more info. */ -static HRESULT WINAPI ImplBIGBLOCKFILE_WriteAt( +static HRESULT ImplBIGBLOCKFILE_WriteAt( BigBlockFile* const This, ULARGE_INTEGER ulOffset, /* [in] */ const void* pv, /* [size_is][in] */

1 0

Alistair Leslie-Hughes : version: Stop crash under vista and 2k8.
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: d026b74d79e06e3eb1a72db3520374f168376a7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d026b74d79e06e3eb1a72db35… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 26 10:44:16 2008 +1100 version: Stop crash under vista and 2k8. --- dlls/version/tests/info.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index fa120df..a4f969e 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -400,8 +400,11 @@ static void test_32bit_win(void) if (is_unicode_enabled) { - retW = VerQueryValueW( pVersionInfoW, NULL, (LPVOID *)&pBufW, &uiLengthW ); - ok (retW, "VerQueryValueW failed: GetLastError = %u\n", GetLastError()); + if(0) + { /* This causes Vista and w2k8 to crash */ + retW = VerQueryValueW( pVersionInfoW, NULL, (LPVOID *)&pBufW, &uiLengthW ); + ok (retW, "VerQueryValueW failed: GetLastError = %u\n", GetLastError()); + } retW = VerQueryValueW( pVersionInfoW, emptyW, (LPVOID *)&pBufW, &uiLengthW ); ok (retW, "VerQueryValueW failed: GetLastError = %u\n", GetLastError());

1 0

Paul Vriens : aclocal.m4: Add i686-pc-mingw32 to the cross-compiler prefixes.
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: 1598779b10e981e94e9db1e14307eb1ab0300525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1598779b10e981e94e9db1e14… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 25 20:27:45 2008 +0100 aclocal.m4: Add i686-pc-mingw32 to the cross-compiler prefixes. --- aclocal.m4 | 2 +- configure | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index f3a5848..b5beeb7 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -141,7 +141,7 @@ dnl AC_DEFUN([WINE_CHECK_MINGW_PROG], [AC_CHECK_PROGS([$1], m4_foreach([ac_wine_prefix], - [i586-mingw32msvc, i386-mingw32msvc, i686-mingw32, i586-mingw32, i486-mingw32, i386-mingw32, mingw32, mingw], + [i586-mingw32msvc, i386-mingw32msvc, i686-mingw32, i586-mingw32, i486-mingw32, i386-mingw32, mingw32, i686-pc-mingw32, mingw], [ac_wine_prefix-$2 ]), [$3],[$4])]) diff --git a/configure b/configure index 5b4c30c..8158ab9 100755 --- a/configure +++ b/configure @@ -9707,7 +9707,7 @@ fi if test "$cross_compiling" = "no" -a "$LIBEXT" != "dll" then - for ac_prog in i586-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc mingw32-gcc mingw-gcc + for ac_prog in i586-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc mingw32-gcc i686-pc-mingw32-gcc mingw-gcc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -9750,7 +9750,7 @@ fi done test -n "$CROSSCC" || CROSSCC="false" - for ac_prog in i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i686-mingw32-dlltool i586-mingw32-dlltool i486-mingw32-dlltool i386-mingw32-dlltool mingw32-dlltool mingw-dlltool + for ac_prog in i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i686-mingw32-dlltool i586-mingw32-dlltool i486-mingw32-dlltool i386-mingw32-dlltool mingw32-dlltool i686-pc-mingw32-dlltool mingw-dlltool do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -9793,7 +9793,7 @@ fi done test -n "$DLLTOOL" || DLLTOOL="false" - for ac_prog in i586-mingw32msvc-windres i386-mingw32msvc-windres i686-mingw32-windres i586-mingw32-windres i486-mingw32-windres i386-mingw32-windres mingw32-windres mingw-windres + for ac_prog in i586-mingw32msvc-windres i386-mingw32msvc-windres i686-mingw32-windres i586-mingw32-windres i486-mingw32-windres i386-mingw32-windres mingw32-windres i686-pc-mingw32-windres mingw-windres do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -9836,7 +9836,7 @@ fi done test -n "$CROSSWINDRES" || CROSSWINDRES="false" - for ac_prog in i586-mingw32msvc-ar i386-mingw32msvc-ar i686-mingw32-ar i586-mingw32-ar i486-mingw32-ar i386-mingw32-ar mingw32-ar mingw-ar + for ac_prog in i586-mingw32msvc-ar i386-mingw32msvc-ar i686-mingw32-ar i586-mingw32-ar i486-mingw32-ar i386-mingw32-ar mingw32-ar i686-pc-mingw32-ar mingw-ar do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2

1 0

Paul Vriens : rsaenh/tests: Fix a test failure on W2K and below.
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: 489e59f83d3b7f1f5a9c94a0a419a00ddfd089d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=489e59f83d3b7f1f5a9c94a0a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 25 17:13:06 2008 +0100 rsaenh/tests: Fix a test failure on W2K and below. --- dlls/rsaenh/tests/rsaenh.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 9e14558..05f4cdf 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1080,8 +1080,10 @@ static void test_mac(void) { /* Provoke errors */ if (!derive_key(CALG_RC4, &hKey, 56)) return; + SetLastError(0xdeadbeef); result = CryptCreateHash(hProv, CALG_MAC, hKey, 0, &hHash); - ok(!result && (GetLastError() == NTE_BAD_KEY || GetLastError() == NTE_FAIL), + ok((!result && GetLastError() == NTE_BAD_KEY) || + broken(result), /* Win9x, WinMe, NT4, W2K */ "%08x\n", GetLastError()); result = CryptDestroyKey(hKey);

1 0

Paul Vriens : rsaenh/tests: Use a 40-bit session key instead of 56-bit.
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: 6d9bca7d94f471056b79d2495779837a63c36b31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d9bca7d94f471056b79d2495… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 25 17:02:48 2008 +0100 rsaenh/tests: Use a 40-bit session key instead of 56-bit. --- dlls/rsaenh/tests/rsaenh.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index a2636b5..9e14558 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1046,13 +1046,13 @@ static void test_mac(void) { BOOL result; DWORD dwLen; BYTE abData[256], abEnc[264]; - static const BYTE mac[8] = { 0x0d, 0x3e, 0x15, 0x6b, 0x85, 0x63, 0x5c, 0x11 }; + static const BYTE mac_40[8] = { 0xb7, 0xa2, 0x46, 0xe9, 0x11, 0x31, 0xe0, 0xad}; int i; for (i=0; i<sizeof(abData)/sizeof(BYTE); i++) abData[i] = (BYTE)i; for (i=0; i<sizeof(abData)/sizeof(BYTE); i++) abEnc[i] = (BYTE)i; - if (!derive_key(CALG_RC2, &hKey, 56)) return; + if (!derive_key(CALG_RC2, &hKey, 40)) return; dwLen = 256; result = CryptEncrypt(hKey, 0, TRUE, 0, abEnc, &dwLen, 264); @@ -1069,7 +1069,7 @@ static void test_mac(void) { result = CryptGetHashParam(hHash, HP_HASHVAL, abData, &dwLen, 0); ok(result && dwLen == 8, "%08x, dwLen: %d\n", GetLastError(), dwLen); - ok(!memcmp(abData, mac, sizeof(mac)), "MAC failed!\n"); + ok(!memcmp(abData, mac_40, sizeof(mac_40)), "MAC failed!\n"); result = CryptDestroyHash(hHash); ok(result, "%08x\n", GetLastError());

1 0

Paul Vriens : rsaenh/tests: Fix a test failure on W2K and below.
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: 87e7c72f267858ad0238c0234db8bb80565ca72a URL: http://source.winehq.org/git/wine.git/?a=commit;h=87e7c72f267858ad0238c0234… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 25 16:50:38 2008 +0100 rsaenh/tests: Fix a test failure on W2K and below. --- dlls/rsaenh/tests/rsaenh.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 1bb4ad2..a2636b5 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -831,8 +831,11 @@ static void test_rc2(void) ok(result, "setting salt failed for size %d: %08x\n", i, GetLastError()); } salt.cbData = 25; + SetLastError(0xdeadbeef); result = CryptSetKeyParam(hKey, KP_SALT_EX, (BYTE *)&salt, 0); - ok(!result, "%08x\n", GetLastError()); + ok(!result || + broken(result), /* Win9x, WinMe, NT4, W2K */ + "%08x\n", GetLastError()); result = CryptDestroyKey(hKey); ok(result, "%08x\n", GetLastError());

1 0