January 2009 - Wine-commits

Alexandre Julliard : Release 1.1.12.
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: master Commit: bf25837eb7c08dc7faf13b886f6aed79a02506b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf25837eb7c08dc7faf13b886… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 2 17:24:09 2009 +0100 Release 1.1.12. --- ANNOUNCE | 1326 +++++++++++++++++++++++++------------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 543 insertions(+), 803 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf25837eb7c08dc7faf13…

1 0

Tag wine-1.1.12 : Alexandre Julliard : Release 1.1.12
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: refs/tags/wine-1.1.12 Tag: 7000e9aec5cf07fd650c9529764d65e040425dc6 URL: http://source.winehq.org/git/wine.git/?a=tag;h=7000e9aec5cf07fd650c9529764d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 2 17:24:10 2009 +0100 Release 1.1.12

1 0

Andrew Talbot : cabinet: Declare a function static.
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: master Commit: 184dbe7e63c7ed6f15381c6681899cbe731d81aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=184dbe7e63c7ed6f15381c668… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Jan 2 12:54:42 2009 +0000 cabinet: Declare a function static. --- dlls/cabinet/cabinet.h | 1 - dlls/cabinet/fdi.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/cabinet/cabinet.h b/dlls/cabinet/cabinet.h index e786c1f..8b38f9b 100644 --- a/dlls/cabinet/cabinet.h +++ b/dlls/cabinet/cabinet.h @@ -656,6 +656,5 @@ typedef struct { /* from fdi.c */ void QTMupdatemodel(struct QTMmodel *model, int sym); int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits, const cab_UBYTE *length, cab_UWORD *table); -cab_ULONG checksum(const cab_UBYTE *data, cab_UWORD bytes, cab_ULONG csum); #endif /* __WINE_CABINET_H */ diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 2248b9e..e36066d 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -293,7 +293,7 @@ int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits, const cab_UBYTE *length, /************************************************************************* * checksum (internal) */ -cab_ULONG checksum(const cab_UBYTE *data, cab_UWORD bytes, cab_ULONG csum) { +static cab_ULONG checksum(const cab_UBYTE *data, cab_UWORD bytes, cab_ULONG csum) { int len; cab_ULONG ul = 0;

1 0

Andrew Talbot : comctl32: Declare some variables static.
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: master Commit: c8cf4211869ea3de5bbc9b06c23e8b37ce27f319 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8cf4211869ea3de5bbc9b06c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Jan 2 12:54:46 2009 +0000 comctl32: Declare some variables static. --- dlls/comctl32/commctrl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 4e447af..949b62a 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -125,9 +125,9 @@ static const char manifest_filename[] = ARCH "_" NAME "_" PUBLIC_KEY "_" VERSION static LRESULT WINAPI COMCTL32_SubclassProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); -LPWSTR COMCTL32_wSubclass = NULL; +static LPWSTR COMCTL32_wSubclass = NULL; HMODULE COMCTL32_hModule = 0; -LANGID COMCTL32_uiLang = MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL); +static LANGID COMCTL32_uiLang = MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL); HBRUSH COMCTL32_hPattern55AABrush = NULL; COMCTL32_SysColor comctl32_color;

1 0

Andrew Talbot : comdlg32: Declare a function static.
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: master Commit: 8a1a2a95117da62c44b8dcc0c53c50a5e45dd779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a1a2a95117da62c44b8dcc0c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Jan 2 13:12:28 2009 +0000 comdlg32: Declare a function static. --- dlls/comdlg32/cdlg.h | 2 -- dlls/comdlg32/colordlg.c | 2 +- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/cdlg.h b/dlls/comdlg32/cdlg.h index c85f877..5417423 100644 --- a/dlls/comdlg32/cdlg.h +++ b/dlls/comdlg32/cdlg.h @@ -193,8 +193,6 @@ BOOL CC_HookCallChk( const CHOOSECOLORW *lpcc ); int CC_MouseCheckResultWindow( HWND hDlg, LPARAM lParam ); LRESULT CC_WMLButtonDown( HWND hDlg, WPARAM wParam, LPARAM lParam ); LRESULT CC_WMLButtonUp( HWND hDlg, WPARAM wParam, LPARAM lParam ); -LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD - notifyCode, HWND hwndCtl ); LRESULT CC_WMMouseMove( HWND hDlg, LPARAM lParam ); LRESULT CC_WMPaint( HWND hDlg, WPARAM wParam, LPARAM lParam ); void CC_SwitchToFullSize( HWND hDlg, COLORREF result, LPCRECT lprect ); diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index d4a43af..52439d3 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -955,7 +955,7 @@ static LONG CC_WMInitDialog( HWND hDlg, WPARAM wParam, LPARAM lParam ) /*********************************************************************** * CC_WMCommand [internal] */ -LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notifyCode, HWND hwndCtl ) +static LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notifyCode, HWND hwndCtl ) { int r, g, b, i, xx; UINT cokmsg;

1 0

Frans Kool : crypt32: Updated Dutch translations.
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: master Commit: cf47755f2b8913e3006a93828ca75a7a054ffceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf47755f2b8913e3006a93828… Author: Frans Kool <Frans.Kool(a)Gmail.com> Date: Fri Jan 2 13:54:51 2009 +0100 crypt32: Updated Dutch translations. --- dlls/crypt32/crypt32_Nl.rc | 62 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32_Nl.rc b/dlls/crypt32/crypt32_Nl.rc index b98f213..c9857f8 100644 --- a/dlls/crypt32/crypt32_Nl.rc +++ b/dlls/crypt32/crypt32_Nl.rc @@ -172,3 +172,65 @@ STRINGTABLE DISCARDABLE IDS_LOCALIZEDNAME_CA "Certificatie Tussen-Autoriteiten" IDS_LOCALIZEDNAME_ADDRESSBOOK "Overige Personen" } +STRINGTABLE DISCARDABLE +{ + IDS_KEY_ID "SleutelID=" + IDS_CERT_ISSUER "Certificaat verstrekker" + IDS_CERT_SERIAL_NUMBER "Certificaat serienummer=" + IDS_ALT_NAME_OTHER_NAME "Andere naam=" + IDS_ALT_NAME_RFC822_NAME "Email Adres=" + IDS_ALT_NAME_DNS_NAME "DNS naam=" + IDS_ALT_NAME_DIRECTORY_NAME "Directory adres" + IDS_ALT_NAME_URL "URL=" + IDS_ALT_NAME_IP_ADDRESS "IP adres=" + IDS_ALT_NAME_MASK "Masker=" + IDS_ALT_NAME_REGISTERED_ID "Geregistreerd ID=" + IDS_USAGE_UNKNOWN "Onbekend gebruik van sleutel" + IDS_SUBJECT_TYPE "Onderwerp type=" + IDS_SUBJECT_TYPE_CA "CA" + IDS_SUBJECT_TYPE_END_CERT "Eind Entiteit" + IDS_PATH_LENGTH "Lengte van pad beperking=" + IDS_PATH_LENGTH_NONE "Geen" + IDS_INFO_NOT_AVAILABLE "Informatie niet beschikbaar" + IDS_AIA "Authoriteit Informatie Toegang" + IDS_ACCESS_METHOD "Toegang methode=" + IDS_ACCESS_METHOD_OCSP "OCSP" + IDS_ACCESS_METHOD_CA_ISSUERS "CA verstrekkers" + IDS_ACCESS_METHOD_UNKNOWN "Onbekende toegangsmethode" + IDS_ACCESS_LOCATION "Alternatieve Naam" + IDS_CRL_DIST_POINT "CRL Distributie Punt" + IDS_CRL_DIST_POINT_NAME "Naam distributiepunt" + IDS_CRL_DIST_POINT_FULL_NAME "Volledige naam" + IDS_CRL_DIST_POINT_RDN_NAME "RDN naam" + IDS_CRL_DIST_POINT_REASON "CRL reden=" + IDS_CRL_DIST_POINT_ISSUER "CRL verstrekker" + IDS_REASON_KEY_COMPROMISE "Key Compromie" + IDS_REASON_CA_COMPROMISE "CA Compromie" + IDS_REASON_AFFILIATION_CHANGED "Samenwerking gewijzigd" + IDS_REASON_SUPERSEDED "Verouderd" + IDS_REASON_CESSATION_OF_OPERATION "Werkzaamheden gestaakt" + IDS_REASON_CERTIFICATE_HOLD "Certificaat bevroren" + IDS_FINANCIAL_CRITERIA "Financiele informatie=" + IDS_FINANCIAL_CRITERIA_AVAILABLE "Beschikbaar" + IDS_FINANCIAL_CRITERIA_NOT_AVAILABLE "Niet beschikbaar" + IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA "Past bij criteria=" + IDS_YES "Ja" + IDS_NO "Nee" + IDS_DIGITAL_SIGNATURE "Digitale handtekening" + IDS_NON_REPUDIATION "Non-Repudiatie" + IDS_KEY_ENCIPHERMENT "sleutel codering" + IDS_DATA_ENCIPHERMENT "Data codering" + IDS_KEY_AGREEMENT "Sleutel overeenkomst" + IDS_CERT_SIGN "Certificaat tekenen" + IDS_OFFLINE_CRL_SIGN "Off-line CRL Certificeren" + IDS_CRL_SIGN "CRL Certificeren" + IDS_ENCIPHER_ONLY "Codeer alleen" + IDS_DECIPHER_ONLY "Decodeer alleen" + IDS_NETSCAPE_SSL_CLIENT "SSL Client Authentificatie" + IDS_NETSCAPE_SSL_SERVER "SSL Server Authentificatie" + IDS_NETSCAPE_SMIME "S/MIME" + IDS_NETSCAPE_SIGN "Handtekening" + IDS_NETSCAPE_SSL_CA "SSL CA" + IDS_NETSCAPE_SMIME_CA "S/MIME CA" + IDS_NETSCAPE_SIGN_CA "Handtekening CA" +}

1 0

Christian Costa : mciavi: Implement MCI_DGV_PUT_WINDOW in MCIAVI_mciPut.
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: master Commit: 2f913efa830bece55aa90641dc2e5236f4ccba15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f913efa830bece55aa90641d… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Jan 2 12:17:10 2009 +0100 mciavi: Implement MCI_DGV_PUT_WINDOW in MCIAVI_mciPut. --- dlls/mciavi32/wnd.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mciavi32/wnd.c b/dlls/mciavi32/wnd.c index f447798..682a311 100644 --- a/dlls/mciavi32/wnd.c +++ b/dlls/mciavi32/wnd.c @@ -187,9 +187,8 @@ DWORD MCIAVI_mciPut(UINT wDevID, DWORD dwFlags, LPMCI_DGV_PUT_PARMS lpParms) return MCIERR_UNRECOGNIZED_COMMAND; } if (dwFlags & MCI_DGV_PUT_WINDOW) { - FIXME("PUT_WINDOW %s\n", wine_dbgstr_rect(&rc)); - LeaveCriticalSection(&wma->cs); - return MCIERR_UNRECOGNIZED_COMMAND; + TRACE("PUT_WINDOW %s\n", wine_dbgstr_rect(&rc)); + SetWindowPos(wma->hWndPaint, NULL, rc.left, rc.top, rc.right, rc.bottom, SWP_NOZORDER); } LeaveCriticalSection(&wma->cs); return 0;

1 0

Alexandre Julliard : winecoreaudio: Fix a redefinition warning.
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: master Commit: ab1040b35d595a395140d7013fc053ee5de327d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab1040b35d595a395140d7013… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 2 13:54:49 2009 +0100 winecoreaudio: Fix a redefinition warning. --- dlls/winecoreaudio.drv/audiounit.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index 7654454..08e2607 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -25,6 +25,7 @@ #include <AudioUnit/AudioUnit.h> #include <AudioToolbox/AudioToolbox.h> +#undef DPRINTF #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wave);

1 0

Rob Shearman : winecoreaudio: Remove some unnecessary text conversions by using snprintfW instead of snprintf .
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: master Commit: a4644e5a876f08a1c0102e231f8ca4e198dc5c8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4644e5a876f08a1c0102e231… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Jan 2 12:13:47 2009 +0000 winecoreaudio: Remove some unnecessary text conversions by using snprintfW instead of snprintf. Change the remaining text conversions to use the Unix CP as the strings come from system library functions. --- dlls/winecoreaudio.drv/audio.c | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 549b69e..1d5df02 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -452,7 +452,7 @@ BOOL CoreAudio_GetDevCaps (void) memcpy(CoreAudio_DefaultDevice.ds_desc.szDesc, name, sizeof(name)); strcpy(CoreAudio_DefaultDevice.ds_desc.szDrvname, "winecoreaudio.drv"); - MultiByteToWideChar(CP_ACP, 0, name, sizeof(name), + MultiByteToWideChar(CP_UNIXCP, 0, name, sizeof(name), CoreAudio_DefaultDevice.out_caps.szPname, sizeof(CoreAudio_DefaultDevice.out_caps.szPname) / sizeof(WCHAR)); memcpy(CoreAudio_DefaultDevice.dev_name, name, 32); @@ -506,7 +506,6 @@ LONG CoreAudio_WaveInit(void) { OSStatus status; UInt32 propertySize; - CHAR szPname[MAXPNAMELEN]; int i; CFStringRef messageThreadPortName; CFMessagePortRef port_ReceiveInMessageThread; @@ -538,10 +537,13 @@ LONG CoreAudio_WaveInit(void) return DRV_FAILURE; CoreAudio_DefaultDevice.interface_name=HeapAlloc(GetProcessHeap(),0,strlen(CoreAudio_DefaultDevice.dev_name)+1); - sprintf(CoreAudio_DefaultDevice.interface_name, "%s", CoreAudio_DefaultDevice.dev_name); + strcpy(CoreAudio_DefaultDevice.interface_name, CoreAudio_DefaultDevice.dev_name); for (i = 0; i < MAX_WAVEOUTDRV; ++i) { + static const WCHAR wszWaveOutFormat[] = + {'C','o','r','e','A','u','d','i','o',' ','W','a','v','e','I','n',' ','%','d',0}; + WOutDev[i].state = WINE_WS_CLOSED; WOutDev[i].cadev = &CoreAudio_DefaultDevice; WOutDev[i].woID = i; @@ -550,8 +552,7 @@ LONG CoreAudio_WaveInit(void) WOutDev[i].caps.wMid = 0xcafe; /* Manufac ID */ WOutDev[i].caps.wPid = 0x0001; /* Product ID */ - snprintf(szPname, sizeof(szPname), "CoreAudio WaveOut %d", i); - MultiByteToWideChar(CP_ACP, 0, szPname, -1, WOutDev[i].caps.szPname, sizeof(WOutDev[i].caps.szPname)/sizeof(WCHAR)); + snprintfW(WOutDev[i].caps.szPname, sizeof(WOutDev[i].caps.szPname)/sizeof(WCHAR), wszWaveOutFormat, i); snprintf(WOutDev[i].interface_name, sizeof(WOutDev[i].interface_name), "winecoreaudio: %d", i); WOutDev[i].caps.vDriverVersion = 0x0001; @@ -590,6 +591,9 @@ LONG CoreAudio_WaveInit(void) for (i = 0; i < MAX_WAVEINDRV; ++i) { + static const WCHAR wszWaveInFormat[] = + {'C','o','r','e','A','u','d','i','o',' ','W','a','v','e','I','n',' ','%','d',0}; + memset(&WInDev[i], 0, sizeof(WInDev[i])); WInDev[i].wiID = i; @@ -602,8 +606,7 @@ LONG CoreAudio_WaveInit(void) WInDev[i].caps.wPid = 0x0001; /* Product ID */ WInDev[i].caps.vDriverVersion = 0x0001; - snprintf(szPname, sizeof(szPname), "CoreAudio WaveIn %d", i); - MultiByteToWideChar(CP_ACP, 0, szPname, -1, WInDev[i].caps.szPname, sizeof(WInDev[i].caps.szPname)/sizeof(WCHAR)); + snprintfW(WInDev[i].caps.szPname, sizeof(WInDev[i].caps.szPname)/sizeof(WCHAR), wszWaveInFormat, i); snprintf(WInDev[i].interface_name, sizeof(WInDev[i].interface_name), "winecoreaudio in: %d", i); if (inputSampleRate == 96000) @@ -1416,7 +1419,7 @@ static DWORD wodDevInterfaceSize(UINT wDevID, LPDWORD dwParam1) { TRACE("(%u, %p)\n", wDevID, dwParam1); - *dwParam1 = MultiByteToWideChar(CP_ACP, 0, WOutDev[wDevID].cadev->interface_name, -1, + *dwParam1 = MultiByteToWideChar(CP_UNIXCP, 0, WOutDev[wDevID].cadev->interface_name, -1, NULL, 0 ) * sizeof(WCHAR); return MMSYSERR_NOERROR; } @@ -1427,10 +1430,10 @@ static DWORD wodDevInterfaceSize(UINT wDevID, LPDWORD dwParam1) static DWORD wodDevInterface(UINT wDevID, PWCHAR dwParam1, DWORD dwParam2) { TRACE("\n"); - if (dwParam2 >= MultiByteToWideChar(CP_ACP, 0, WOutDev[wDevID].cadev->interface_name, -1, + if (dwParam2 >= MultiByteToWideChar(CP_UNIXCP, 0, WOutDev[wDevID].cadev->interface_name, -1, NULL, 0 ) * sizeof(WCHAR)) { - MultiByteToWideChar(CP_ACP, 0, WOutDev[wDevID].cadev->interface_name, -1, + MultiByteToWideChar(CP_UNIXCP, 0, WOutDev[wDevID].cadev->interface_name, -1, dwParam1, dwParam2 / sizeof(WCHAR)); return MMSYSERR_NOERROR; } @@ -2238,7 +2241,7 @@ static DWORD widDevInterfaceSize(UINT wDevID, LPDWORD dwParam1) { TRACE("(%u, %p)\n", wDevID, dwParam1); - *dwParam1 = MultiByteToWideChar(CP_ACP, 0, WInDev[wDevID].interface_name, -1, + *dwParam1 = MultiByteToWideChar(CP_UNIXCP, 0, WInDev[wDevID].interface_name, -1, NULL, 0 ) * sizeof(WCHAR); return MMSYSERR_NOERROR; } @@ -2249,10 +2252,10 @@ static DWORD widDevInterfaceSize(UINT wDevID, LPDWORD dwParam1) */ static DWORD widDevInterface(UINT wDevID, PWCHAR dwParam1, DWORD dwParam2) { - if (dwParam2 >= MultiByteToWideChar(CP_ACP, 0, WInDev[wDevID].interface_name, -1, + if (dwParam2 >= MultiByteToWideChar(CP_UNIXCP, 0, WInDev[wDevID].interface_name, -1, NULL, 0 ) * sizeof(WCHAR)) { - MultiByteToWideChar(CP_ACP, 0, WInDev[wDevID].interface_name, -1, + MultiByteToWideChar(CP_UNIXCP, 0, WInDev[wDevID].interface_name, -1, dwParam1, dwParam2 / sizeof(WCHAR)); return MMSYSERR_NOERROR; }

1 0

Rob Shearman : comctl32: Add names for now documented toolbar messages.
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: master Commit: 76b805dad48680ab6653f953748b9acb9376ae86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76b805dad48680ab6653f9537… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Jan 2 12:14:30 2009 +0000 comctl32: Add names for now documented toolbar messages. --- dlls/comctl32/toolbar.c | 51 +++++++++++++++++++++------------------------- dlls/user32/spy.c | 7 +++-- include/commctrl.h | 10 +++++--- 3 files changed, 33 insertions(+), 35 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 2437d97..a233b39 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5242,12 +5242,11 @@ static LRESULT TOOLBAR_Unkwn45D(HWND hwnd, WPARAM wParam, LPARAM lParam) } -/* UNDOCUMENTED MESSAGE: This is an extended version of the - * TB_SETHOTITEM message. It allows the caller to specify a reason why the - * hot item changed (rather than just the HICF_OTHER that TB_SETHOTITEM - * sends). */ +/* This is an extended version of the TB_SETHOTITEM message. It allows the + * caller to specify a reason why the hot item changed (rather than just the + * HICF_OTHER that TB_SETHOTITEM sends). */ static LRESULT -TOOLBAR_Unkwn45E (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_SetHotItem2 (HWND hwnd, WPARAM wParam, LPARAM lParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(hwnd); INT nOldHotItem = infoPtr->nHotItem; @@ -5268,18 +5267,15 @@ TOOLBAR_Unkwn45E (HWND hwnd, WPARAM wParam, LPARAM lParam) return (nOldHotItem < 0) ? -1 : (LRESULT)nOldHotItem; } -/* UNDOCUMENTED MESSAGE: This sets the toolbar global iListGap parameter - * which controls the amount of spacing between the image and the text - * of buttons for TBSTYLE_LIST toolbars. */ -static LRESULT TOOLBAR_Unkwn460(HWND hwnd, WPARAM wParam, LPARAM lParam) +/* Sets the toolbar global iListGap parameter which controls the amount of + * spacing between the image and the text of buttons for TBSTYLE_LIST + * toolbars. */ +static LRESULT TOOLBAR_SetListGap(HWND hwnd, WPARAM wParam, LPARAM lParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(hwnd); TRACE("hwnd=%p iListGap=%ld\n", hwnd, wParam); - if (lParam != 0) - FIXME("lParam = 0x%08lx. Please report\n", lParam); - infoPtr->iListGap = (INT)wParam; InvalidateRect(hwnd, NULL, TRUE); @@ -5287,9 +5283,9 @@ static LRESULT TOOLBAR_Unkwn460(HWND hwnd, WPARAM wParam, LPARAM lParam) return 0; } -/* UNDOCUMENTED MESSAGE: This returns the number of maximum number - * of image lists associated with the various states. */ -static LRESULT TOOLBAR_Unkwn462(HWND hwnd, WPARAM wParam, LPARAM lParam) +/* Returns the number of maximum number of image lists associated with the + * various states. */ +static LRESULT TOOLBAR_GetImageListCount(HWND hwnd, WPARAM wParam, LPARAM lParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(hwnd); @@ -5299,7 +5295,7 @@ static LRESULT TOOLBAR_Unkwn462(HWND hwnd, WPARAM wParam, LPARAM lParam) } static LRESULT -TOOLBAR_Unkwn463 (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_GetIdealSize (HWND hwnd, WPARAM wParam, LPARAM lParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); LPSIZE lpsize = (LPSIZE)lParam; @@ -5314,7 +5310,7 @@ TOOLBAR_Unkwn463 (HWND hwnd, WPARAM wParam, LPARAM lParam) * lParam pointer to SIZE structure * */ - TRACE("[0463] wParam %ld, lParam 0x%08lx -> 0x%08x 0x%08x\n", + TRACE("wParam %ld, lParam 0x%08lx -> 0x%08x 0x%08x\n", wParam, lParam, lpsize->cx, lpsize->cy); switch(wParam) { @@ -5341,11 +5337,10 @@ TOOLBAR_Unkwn463 (HWND hwnd, WPARAM wParam, LPARAM lParam) lpsize->cy = infoPtr->rcBound.bottom - infoPtr->rcBound.top; break; default: - ERR("Unknown wParam %ld for Toolbar message [0463]. Please report\n", - wParam); + FIXME("Unknown wParam %ld\n", wParam); return 0; } - TRACE("[0463] set to -> 0x%08x 0x%08x\n", + TRACE("set to -> 0x%08x 0x%08x\n", lpsize->cx, lpsize->cy); return 1; } @@ -6920,17 +6915,17 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case TB_UNKWN45D: return TOOLBAR_Unkwn45D(hwnd, wParam, lParam); - case TB_UNKWN45E: - return TOOLBAR_Unkwn45E (hwnd, wParam, lParam); + case TB_SETHOTITEM2: + return TOOLBAR_SetHotItem2 (hwnd, wParam, lParam); - case TB_UNKWN460: - return TOOLBAR_Unkwn460(hwnd, wParam, lParam); + case TB_SETLISTGAP: + return TOOLBAR_SetListGap(hwnd, wParam, lParam); - case TB_UNKWN462: - return TOOLBAR_Unkwn462(hwnd, wParam, lParam); + case TB_GETIMAGELISTCOUNT: + return TOOLBAR_GetImageListCount(hwnd, wParam, lParam); - case TB_UNKWN463: - return TOOLBAR_Unkwn463 (hwnd, wParam, lParam); + case TB_GETIDEALSIZE: + return TOOLBAR_GetIdealSize (hwnd, wParam, lParam); case TB_UNKWN464: return TOOLBAR_Unkwn464(hwnd, wParam, lParam); diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 59fa410..beb21fc 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -1511,9 +1511,10 @@ static const USER_MSG toolbar_array[] = { USM(TB_GETSTRINGW ,0), USM(TB_GETSTRINGA ,0), USM(TB_UNKWN45D ,8), - USM(TB_UNKWN45E ,0), - USM(TB_UNKWN460 ,0), - USM(TB_UNKWN463 ,8), + USM(TB_SETHOTITEM2 ,0), + USM(TB_SETLISTGAP ,0), + USM(TB_GETIMAGELISTCOUNT ,0), + USM(TB_GETIDEALSIZE ,8), USM(TB_UNKWN464 ,0), {0,0,0} }; diff --git a/include/commctrl.h b/include/commctrl.h index 046e13f..9f68edd 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1213,12 +1213,14 @@ static const WCHAR TOOLBARCLASSNAMEW[] = { 'T','o','o','l','b','a','r', #define TB_GETSTRING WINELIB_NAME_AW(TB_GETSTRING) /* undocumented messages in Toolbar */ +#ifdef __WINESRC__ #define TB_UNKWN45D (WM_USER+93) -#define TB_UNKWN45E (WM_USER+94) -#define TB_UNKWN460 (WM_USER+96) -#define TB_UNKWN462 (WM_USER+98) -#define TB_UNKWN463 (WM_USER+99) +#define TB_SETHOTITEM2 (WM_USER+94) +#define TB_SETLISTGAP (WM_USER+96) +#define TB_GETIMAGELISTCOUNT (WM_USER+98) +#define TB_GETIDEALSIZE (WM_USER+99) #define TB_UNKWN464 (WM_USER+100) +#endif #define TB_GETMETRICS (WM_USER+101) #define TB_SETMETRICS (WM_USER+102)

1 0