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

Saulius Krasuckas : comctl32: Increase FILEVERSION up to 5.81.4704.1100.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: ab71fada12b5d80ce40c95e95fc2cb734ba97c88 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ab71fada12b5d80ce40c95e… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Mon May 8 00:42:31 2006 +0300 comctl32: Increase FILEVERSION up to 5.81.4704.1100. --- dlls/comctl32/comctl32.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index 005089d..0733567 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -147,9 +147,9 @@ INT Str_GetPtrWtoA (LPCWSTR lpSrc, LPST BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc); BOOL Str_SetPtrWtoA (LPSTR *lppDest, LPCWSTR lpSrc); -#define COMCTL32_VERSION_MINOR 80 -#define WINE_FILEVERSION 5, COMCTL32_VERSION_MINOR, 0, 0 -#define WINE_FILEVERSIONSTR "5.80" +#define COMCTL32_VERSION_MINOR 81 +#define WINE_FILEVERSION 5, COMCTL32_VERSION_MINOR, 4704, 1100 +#define WINE_FILEVERSIONSTR "5.81" /* Our internal stack structure of the window procedures to subclass */ typedef struct _SUBCLASSPROCS {

1 0

Mikołaj Zalewski : shell32: Don' t use uninitialized item.mask in shlview.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 379460f6daa1573534039c4f5f9fa37fd590f3be URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=379460f6daa1573534039c4… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat May 6 18:50:16 2006 +0200 shell32: Don't use uninitialized item.mask in shlview. --- dlls/shell32/shlview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 46a1168..bb07108 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1510,7 +1510,7 @@ #endif item_index = ListView_GetNextItem(This->hWndList, item_index, LVNI_SELECTED); item.iItem = item_index; - item.mask |= LVIF_PARAM; + item.mask = LVIF_PARAM; SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &item); /* get item pidl */

1 0

Eric Pouech : dbghelp: Stub for SymGetSourceFileToken.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 645134397baef7a036c20c53d0e27b378061782d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=645134397baef7a036c20c5… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun May 7 14:30:12 2006 +0200 dbghelp: Stub for SymGetSourceFileToken. --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/source.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 7318bce..45f3437 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -64,7 +64,7 @@ @ stdcall SymGetOptions() @ stdcall SymGetSearchPath(long str long) @ stub SymGetSourceFileFromToken -@ stub SymGetSourceFileToken +@ stdcall SymGetSourceFileToken(ptr double str ptr ptr) @ stub SymGetSourceVarFromToken @ stub SymGetSymFromAddr64 @ stdcall SymGetSymFromAddr(long long ptr ptr) diff --git a/dlls/dbghelp/source.c b/dlls/dbghelp/source.c index 1620641..a56b7e9 100644 --- a/dlls/dbghelp/source.c +++ b/dlls/dbghelp/source.c @@ -202,3 +202,16 @@ BOOL WINAPI SymEnumLines(HANDLE hProcess } return TRUE; } + +/****************************************************************** + * SymGetSourceFileToken (DBGHELP.@) + * + */ +BOOL WINAPI SymGetSourceFileToken(HANDLE hProcess, ULONG64 base, + PCSTR src, PVOID* token, DWORD* size) +{ + FIXME("%p %s %s %p %p: stub!\n", + hProcess, wine_dbgstr_longlong(base), debugstr_a(src), token, size); + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; +}

1 0

Eric Pouech : dbghelp: Base and symbols.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: a49adbc49e3e498f1ad519505a3af9305131d280 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a49adbc49e3e498f1ad5195… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun May 7 14:29:49 2006 +0200 dbghelp: Base and symbols. - report the correct image base for a symbol which is seen as being in a builtin PE module, whilst its debug information is gotten from an ELF module - module_get_debug now returns a pair of modules (the requested that has to be presented back to the client and the effective one, which contains the debug info) - reworked SymFromName in order to provide also the revelant module base address --- dlls/dbghelp/dbghelp_private.h | 9 ++ dlls/dbghelp/module.c | 37 ++++----- dlls/dbghelp/source.c | 24 +++--- dlls/dbghelp/symbol.c | 165 ++++++++++++++++++++++------------------ dlls/dbghelp/type.c | 16 ++-- 5 files changed, 134 insertions(+), 117 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a49adbc49e3e498f1ad…

1 0

Roderick Colenbrander : dinput: Fix Initialize return value.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: bc31b388d1403e77c2066a599af900402dad8aaa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bc31b388d1403e77c2066a5… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat May 6 20:15:15 2006 +0200 dinput: Fix Initialize return value. --- dlls/dinput/dinput_main.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 928bfb2..75170d8 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -368,7 +368,13 @@ static HRESULT WINAPI IDirectInputWImpl_ } static HRESULT WINAPI IDirectInputAImpl_Initialize(LPDIRECTINPUT7A iface, HINSTANCE hinst, DWORD x) { - return DIERR_ALREADYINITIALIZED; + TRACE("(this=%p,%p,%lx)\n",iface, hinst, x); + + /* Initialize can return: DIERR_BETADIRECTINPUTVERSION, DIERR_OLDDIRECTINPUTVERSION and DI_OK. + * Since we already initialized the device, return DI_OK. In the past we returned DIERR_ALREADYINITIALIZED + * which broke applications like Tomb Raider Legend because it isn't a legal return value. + */ + return DI_OK; } static HRESULT WINAPI IDirectInputAImpl_GetDeviceStatus(LPDIRECTINPUT7A iface,

1 0

Marcus Meissner : user32: Added tests for CharUpper and CharLower.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: cf0704bd883ca15a54d4f7eede42349ed2bc4a50 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cf0704bd883ca15a54d4f7e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat May 6 15:18:54 2006 +0200 user32: Added tests for CharUpper and CharLower. --- dlls/user/tests/wsprintf.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/user/tests/wsprintf.c b/dlls/user/tests/wsprintf.c index bbebdd7..d4bcd4c 100644 --- a/dlls/user/tests/wsprintf.c +++ b/dlls/user/tests/wsprintf.c @@ -50,8 +50,51 @@ static void wsprintfWTest(void) "wsprintfW zero padded negative value failure\n"); } +/* Test if the CharUpper / CharLower functions return true 16 bit results, + if the input is a 16 bit input value. Upto Wine 11-2003 the input value + 0xff returns 0xffffffff. */ + +static void CharUpperTest(void) +{ + int i,out,failed; + + failed = 0; + for (i=0;i<256;i++) + { + out = (int) CharUpper((LPTSTR)i); + /* printf("%0x ",out); */ + if ((out >> 16) != 0) + { + failed = 1; + break; + } + } + ok(!failed,"CharUpper failed - 16bit input (0x%0x) returned 32bit result (0x%0x)",i,out); +} + +static void CharLowerTest(void) +{ + int i,out,failed; + + failed = 0; + for (i=0;i<256;i++) + { + out = (int) CharLower((LPTSTR)i); + /* printf("%0x ",out); */ + if ((out >> 16) != 0) + { + failed = 1; + break; + } + } + ok(!failed,"CharLower failed - 16bit input (0x%0x) returned 32bit result (0x%0x)",i,out); +} + + START_TEST(wsprintf) { wsprintfATest(); wsprintfWTest(); + CharUpperTest(); + CharLowerTest(); }

1 0

Marcus Meissner : ole32: Fixed typo in debug statement.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: f937f723089f916c157f03fec7cc30ff310fa897 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f937f723089f916c157f03f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat May 6 15:17:27 2006 +0200 ole32: Fixed typo in debug statement. --- dlls/ole32/compobj.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 35b120f..56c8db8 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1708,7 +1708,7 @@ HRESULT WINAPI CoGetClassObject( } if (FAILED(hres)) - ERR("no class object %s could be created for for context 0x%lx\n", + ERR("no class object %s could be created for context 0x%lx\n", debugstr_guid(rclsid), dwClsContext); return hres; }

1 0

qingdoa daoo : gdi: A-to-W conversion should be font-independent.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 1440eb5a35dc95dea1836d9035b51e2b15d83703 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1440eb5a35dc95dea1836d9… Author: qingdoa daoo <qingdao33122(a)yahoo.com> Date: Sat May 6 17:30:25 2006 +0800 gdi: A-to-W conversion should be font-independent. --- dlls/gdi/font.c | 79 ++++++++++++------------------------------------------- 1 files changed, 17 insertions(+), 62 deletions(-) diff --git a/dlls/gdi/font.c b/dlls/gdi/font.c index 817f706..b0d8a98 100644 --- a/dlls/gdi/font.c +++ b/dlls/gdi/font.c @@ -344,59 +344,17 @@ static void FONT_NewTextMetricExWToA(con /*********************************************************************** * FONT_mbtowc * - * Returns a Unicode translation of str using the charset of the - * currently selected font in hdc. If count is -1 then str is assumed - * to be '\0' terminated, otherwise it contains the number of bytes to - * convert. If plenW is non-NULL, on return it will point to the - * number of WCHARs that have been written. If pCP is non-NULL, on - * return it will point to the codepage used in the conversion. The - * caller should free the returned LPWSTR from the process heap - * itself. + * Returns a Unicode translation of str. If count is -1 then str is + * assumed to be '\0' terminated, otherwise it contains the number of + * bytes to convert. If plenW is non-NULL, on return it will point to + * the number of WCHARs that have been written. The caller should free + * the returned LPWSTR from the process heap itself. */ -static LPWSTR FONT_mbtowc(HDC hdc, LPCSTR str, INT count, INT *plenW, UINT *pCP) +static LPWSTR FONT_mbtowc(LPCSTR str, INT count, INT *plenW) { UINT cp = CP_ACP; INT lenW; LPWSTR strW; - CHARSETINFO csi; - int charset = GetTextCharset(hdc); - - /* Hmm, nicely designed api this one! */ - if(TranslateCharsetInfo((DWORD*)charset, &csi, TCI_SRCCHARSET)) - cp = csi.ciACP; - else { - switch(charset) { - case OEM_CHARSET: - cp = GetOEMCP(); - break; - case DEFAULT_CHARSET: - cp = GetACP(); - break; - - case VISCII_CHARSET: - case TCVN_CHARSET: - case KOI8_CHARSET: - case ISO3_CHARSET: - case ISO4_CHARSET: - case ISO10_CHARSET: - case CELTIC_CHARSET: - /* FIXME: These have no place here, but because x11drv - enumerates fonts with these (made up) charsets some apps - might use them and then the FIXME below would become - annoying. Now we could pick the intended codepage for - each of these, but since it's broken anyway we'll just - use CP_ACP and hope it'll go away... - */ - cp = CP_ACP; - break; - - default: - FIXME("Can't find codepage for charset %d\n", charset); - break; - } - } - - TRACE("charset %d => cp %d\n", charset, cp); if(count == -1) count = strlen(str); lenW = MultiByteToWideChar(cp, 0, str, count, NULL, 0); @@ -404,7 +362,6 @@ static LPWSTR FONT_mbtowc(HDC hdc, LPCST MultiByteToWideChar(cp, 0, str, count, strW, lenW); TRACE("mapped %s -> %s\n", debugstr_an(str, count), debugstr_wn(strW, lenW)); if(plenW) *plenW = lenW; - if(pCP) *pCP = cp; return strW; } @@ -1066,7 +1023,7 @@ BOOL WINAPI GetTextExtentPoint32A( HDC h { BOOL ret = FALSE; INT wlen; - LPWSTR p = FONT_mbtowc(hdc, str, count, &wlen, NULL); + LPWSTR p = FONT_mbtowc(str, count, &wlen); if (p) { ret = GetTextExtentPoint32W( hdc, p, wlen, size ); @@ -1187,7 +1144,7 @@ BOOL WINAPI GetTextExtentExPointA( HDC h { BOOL ret; INT wlen; - LPWSTR p = FONT_mbtowc( hdc, str, count, &wlen, NULL); + LPWSTR p = FONT_mbtowc(str, count, &wlen); ret = GetTextExtentExPointW( hdc, p, wlen, maxExt, lpnFit, alpDx, size); if (lpnFit) *lpnFit = WideCharToMultiByte(CP_ACP,0,p,*lpnFit,NULL,0,NULL,NULL); HeapFree( GetProcessHeap(), 0, p ); @@ -1646,7 +1603,7 @@ BOOL WINAPI GetCharWidth32A( HDC hdc, UI for(i = 0; i < count; i++) str[i] = (BYTE)(firstChar + i); - wstr = FONT_mbtowc(hdc, str, count, &wlen, NULL); + wstr = FONT_mbtowc(str, count, &wlen); for(i = 0; i < wlen; i++) { @@ -1674,7 +1631,6 @@ BOOL WINAPI ExtTextOutA( HDC hdc, INT x, const RECT *lprect, LPCSTR str, UINT count, const INT *lpDx ) { INT wlen; - UINT codepage; LPWSTR p; BOOL ret; LPINT lpDxW = NULL; @@ -1682,14 +1638,14 @@ BOOL WINAPI ExtTextOutA( HDC hdc, INT x, if (flags & ETO_GLYPH_INDEX) return ExtTextOutW( hdc, x, y, flags, lprect, (LPCWSTR)str, count, lpDx ); - p = FONT_mbtowc(hdc, str, count, &wlen, &codepage); + p = FONT_mbtowc(str, count, &wlen); if (lpDx) { unsigned int i = 0, j = 0; lpDxW = HeapAlloc( GetProcessHeap(), 0, wlen*sizeof(INT)); while(i < count) { - if(IsDBCSLeadByteEx(codepage, str[i])) { + if(IsDBCSLeadByte(str[i])) { lpDxW[j++] = lpDx[i] + lpDx[i+1]; i = i + 2; } else { @@ -2290,7 +2246,7 @@ BOOL WINAPI GetCharABCWidthsA(HDC hdc, U for(i = 0; i < count; i++) str[i] = (BYTE)(firstChar + i); - wstr = FONT_mbtowc(hdc, str, count, &wlen, NULL); + wstr = FONT_mbtowc(str, count, &wlen); for(i = 0; i < wlen; i++) { @@ -2428,7 +2384,7 @@ DWORD WINAPI GetGlyphOutlineA( HDC hdc, len = 1; mbchs[0] = (uChar & 0xff); } - p = FONT_mbtowc(hdc, mbchs, len, NULL, NULL); + p = FONT_mbtowc(mbchs, len, NULL); c = p[0]; } else c = uChar; @@ -2667,7 +2623,7 @@ DWORD WINAPI GetGlyphIndicesA(HDC hdc, L TRACE("(%p, %s, %d, %p, 0x%lx)\n", hdc, debugstr_an(lpstr, count), count, pgi, flags); - lpstrW = FONT_mbtowc(hdc, lpstr, count, &countW, NULL); + lpstrW = FONT_mbtowc(lpstr, count, &countW); ret = GetGlyphIndicesW(hdc, lpstrW, countW, pgi, flags); HeapFree(GetProcessHeap(), 0, lpstrW); @@ -2712,7 +2668,6 @@ GetCharacterPlacementA(HDC hdc, LPCSTR l INT uCountW; GCP_RESULTSW resultsW; DWORD ret; - UINT font_cp; TRACE("%s, %d, %d, 0x%08lx\n", debugstr_an(lpString, uCount), uCount, nMaxExtent, dwFlags); @@ -2720,7 +2675,7 @@ GetCharacterPlacementA(HDC hdc, LPCSTR l /* both structs are equal in size */ memcpy(&resultsW, lpResults, sizeof(resultsW)); - lpStringW = FONT_mbtowc(hdc, lpString, uCount, &uCountW, &font_cp); + lpStringW = FONT_mbtowc(lpString, uCount, &uCountW); if(lpResults->lpOutString) resultsW.lpOutString = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*uCountW); @@ -2730,7 +2685,7 @@ GetCharacterPlacementA(HDC hdc, LPCSTR l lpResults->nMaxFit = resultsW.nMaxFit; if(lpResults->lpOutString) { - WideCharToMultiByte(font_cp, 0, resultsW.lpOutString, uCountW, + WideCharToMultiByte(CP_ACP, 0, resultsW.lpOutString, uCountW, lpResults->lpOutString, uCount, NULL, NULL ); } @@ -2860,7 +2815,7 @@ BOOL WINAPI GetCharABCWidthsFloatA( HDC for(i = 0; i < count; i++) str[i] = (BYTE)(first + i); - wstr = FONT_mbtowc( hdc, str, count, &wlen, NULL ); + wstr = FONT_mbtowc(str, count, &wlen); for (i = 0; i < wlen; i++) {

1 0

Dmitry Timoshkov : comctl32: Add support for PSP_USEHEADERTITLE, PSP_USEHEADERSUBTITLE
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 308813112e9b9bf510b320cda115d133dd397241 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=308813112e9b9bf510b320c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri May 5 22:58:55 2006 +0900 comctl32: Add support for PSP_USEHEADERTITLE, PSP_USEHEADERSUBTITLE and PSP_HIDEHEADER in CreatePropertySheetPageA/W, handle resource ids. --- dlls/comctl32/propsheet.c | 173 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 135 insertions(+), 38 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index f9d5a48..3985e7d 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2925,26 +2925,69 @@ HPROPSHEETPAGE WINAPI CreatePropertyShee memcpy(ppsp,lpPropSheetPage,min(lpPropSheetPage->dwSize,sizeof(PROPSHEETPAGEA))); ppsp->dwFlags &= ~ PSP_INTERNAL_UNICODE; - if ( !(ppsp->dwFlags & PSP_DLGINDIRECT) && HIWORD( ppsp->u.pszTemplate ) ) - { - int len = strlen(lpPropSheetPage->u.pszTemplate); - ppsp->u.pszTemplate = Alloc( len+1 ); - strcpy( (LPSTR)ppsp->u.pszTemplate, lpPropSheetPage->u.pszTemplate ); - } - if ( (ppsp->dwFlags & PSP_USEICONID) && HIWORD( ppsp->u2.pszIcon ) ) - { - PROPSHEET_AtoW(&ppsp->u2.pszIcon, lpPropSheetPage->u2.pszIcon); - } + if ( !(ppsp->dwFlags & PSP_DLGINDIRECT) ) + { + if (HIWORD( ppsp->u.pszTemplate )) + { + int len = strlen(lpPropSheetPage->u.pszTemplate) + 1; + ppsp->u.pszTemplate = Alloc( len ); + strcpy( (LPSTR)ppsp->u.pszTemplate, lpPropSheetPage->u.pszTemplate ); + } + } - if ((ppsp->dwFlags & PSP_USETITLE) && HIWORD( ppsp->pszTitle )) - { - PROPSHEET_AtoW(&ppsp->pszTitle, lpPropSheetPage->pszTitle); - } - else if ( !(ppsp->dwFlags & PSP_USETITLE) ) - ppsp->pszTitle = NULL; + if (ppsp->dwFlags & PSP_USEICONID) + { + if (HIWORD( ppsp->u2.pszIcon )) + PROPSHEET_AtoW(&ppsp->u2.pszIcon, lpPropSheetPage->u2.pszIcon); + } + + if (ppsp->dwFlags & PSP_USETITLE) + { + if (HIWORD( ppsp->pszTitle )) + PROPSHEET_AtoW( &ppsp->pszTitle, lpPropSheetPage->pszTitle ); + else + { + int len = LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszTitle), NULL, 0 ) + 1; + ppsp->pszTitle = Alloc( len ); + LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszTitle), (LPWSTR)ppsp->pszTitle, len ); + } + } + else + ppsp->pszTitle = NULL; - return (HPROPSHEETPAGE)ppsp; + if (ppsp->dwFlags & PSP_HIDEHEADER) + ppsp->dwFlags &= ~(PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE); + + if (ppsp->dwFlags & PSP_USEHEADERTITLE) + { + if (HIWORD( ppsp->pszHeaderTitle )) + PROPSHEET_AtoW(&ppsp->pszHeaderTitle, lpPropSheetPage->pszHeaderTitle); + else + { + int len = LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszHeaderTitle), NULL, 0 ) + 1; + ppsp->pszHeaderTitle = Alloc( len ); + LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszHeaderTitle), (LPWSTR)ppsp->pszHeaderTitle, len ); + } + } + else + ppsp->pszHeaderTitle = NULL; + + if (ppsp->dwFlags & PSP_USEHEADERSUBTITLE) + { + if (HIWORD( ppsp->pszHeaderSubTitle )) + PROPSHEET_AtoW(&ppsp->pszHeaderSubTitle, lpPropSheetPage->pszHeaderSubTitle); + else + { + int len = LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszHeaderSubTitle), NULL, 0 ) + 1; + ppsp->pszHeaderSubTitle = Alloc( len ); + LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszHeaderSubTitle), (LPWSTR)ppsp->pszHeaderSubTitle, len ); + } + } + else + ppsp->pszHeaderSubTitle = NULL; + + return (HPROPSHEETPAGE)ppsp; } /****************************************************************************** @@ -2960,30 +3003,84 @@ HPROPSHEETPAGE WINAPI CreatePropertyShee ppsp->dwFlags |= PSP_INTERNAL_UNICODE; - if ( !(ppsp->dwFlags & PSP_DLGINDIRECT) && HIWORD( ppsp->u.pszTemplate ) ) - { - int len = strlenW(lpPropSheetPage->u.pszTemplate); + if ( !(ppsp->dwFlags & PSP_DLGINDIRECT) ) + { + if (HIWORD( ppsp->u.pszTemplate )) + { + int len = strlenW(lpPropSheetPage->u.pszTemplate) + 1; + ppsp->u.pszTemplate = Alloc( len * sizeof (WCHAR) ); + strcpyW( (WCHAR *)ppsp->u.pszTemplate, lpPropSheetPage->u.pszTemplate ); + } + } - ppsp->u.pszTemplate = Alloc( (len+1)*sizeof (WCHAR) ); - strcpyW( (WCHAR *)ppsp->u.pszTemplate, lpPropSheetPage->u.pszTemplate ); - } - if ( (ppsp->dwFlags & PSP_USEICONID) && HIWORD( ppsp->u2.pszIcon ) ) - { - int len = strlenW(lpPropSheetPage->u2.pszIcon); - ppsp->u2.pszIcon = Alloc( (len+1)*sizeof (WCHAR) ); - strcpyW( (WCHAR *)ppsp->u2.pszIcon, lpPropSheetPage->u2.pszIcon ); - } + if ( ppsp->dwFlags & PSP_USEICONID ) + { + if (HIWORD( ppsp->u2.pszIcon )) + { + int len = strlenW(lpPropSheetPage->u2.pszIcon) + 1; + ppsp->u2.pszIcon = Alloc( len * sizeof (WCHAR) ); + strcpyW( (WCHAR *)ppsp->u2.pszIcon, lpPropSheetPage->u2.pszIcon ); + } + } - if ((ppsp->dwFlags & PSP_USETITLE) && HIWORD( ppsp->pszTitle )) - { - int len = strlenW(lpPropSheetPage->pszTitle); - ppsp->pszTitle = Alloc( (len+1)*sizeof (WCHAR) ); - strcpyW( (WCHAR *)ppsp->pszTitle, lpPropSheetPage->pszTitle ); - } - else if ( !(ppsp->dwFlags & PSP_USETITLE) ) - ppsp->pszTitle = NULL; + if (ppsp->dwFlags & PSP_USETITLE) + { + if (HIWORD( ppsp->pszTitle )) + { + int len = strlenW(lpPropSheetPage->pszTitle) + 1; + ppsp->pszTitle = Alloc( len * sizeof (WCHAR) ); + strcpyW( (WCHAR *)ppsp->pszTitle, lpPropSheetPage->pszTitle ); + } + else + { + int len = LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszTitle), NULL, 0 ) + 1; + ppsp->pszTitle = Alloc( len ); + LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszTitle), (LPWSTR)ppsp->pszTitle, len ); + } + } + else + ppsp->pszTitle = NULL; + + if (ppsp->dwFlags & PSP_HIDEHEADER) + ppsp->dwFlags &= ~(PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE); + + if (ppsp->dwFlags & PSP_USEHEADERTITLE) + { + if (HIWORD( ppsp->pszHeaderTitle )) + { + int len = strlenW(lpPropSheetPage->pszHeaderTitle) + 1; + ppsp->pszHeaderTitle = Alloc( len * sizeof (WCHAR) ); + strcpyW( (WCHAR *)ppsp->pszHeaderTitle, lpPropSheetPage->pszHeaderTitle ); + } + else + { + int len = LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszHeaderTitle), NULL, 0 ) + 1; + ppsp->pszHeaderTitle = Alloc( len ); + LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszHeaderTitle), (LPWSTR)ppsp->pszHeaderTitle, len ); + } + } + else + ppsp->pszHeaderTitle = NULL; + + if (ppsp->dwFlags & PSP_USEHEADERSUBTITLE) + { + if (HIWORD( ppsp->pszHeaderSubTitle )) + { + int len = strlenW(lpPropSheetPage->pszHeaderSubTitle) + 1; + ppsp->pszHeaderSubTitle = Alloc( len * sizeof (WCHAR) ); + strcpyW( (WCHAR *)ppsp->pszHeaderSubTitle, lpPropSheetPage->pszHeaderSubTitle ); + } + else + { + int len = LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszHeaderSubTitle), NULL, 0 ) + 1; + ppsp->pszHeaderSubTitle = Alloc( len ); + LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszHeaderSubTitle), (LPWSTR)ppsp->pszHeaderSubTitle, len ); + } + } + else + ppsp->pszHeaderSubTitle = NULL; - return (HPROPSHEETPAGE)ppsp; + return (HPROPSHEETPAGE)ppsp; } /******************************************************************************

1 0

Dmitry Timoshkov : comctl32: Make some internal functions and variables static, remove
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 154e54e8e6d8fc23f8ef8b50566250b8f7d348a8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=154e54e8e6d8fc23f8ef8b5… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri May 5 22:59:20 2006 +0900 comctl32: Make some internal functions and variables static, remove some unneeded prototypes. --- dlls/comctl32/propsheet.c | 49 ++++----------------------------------------- 1 files changed, 4 insertions(+), 45 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 3985e7d..c1654dd 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -144,7 +144,7 @@ typedef struct * Defines and global variables */ -const WCHAR PropSheetInfoStr[] = +static const WCHAR PropSheetInfoStr[] = {'P','r','o','p','e','r','t','y','S','h','e','e','t','I','n','f','o',0 }; #define PSP_INTERNAL_UNICODE 0x80000000 @@ -162,59 +162,18 @@ #define WIZARD_HEADER_HEIGHT 36 /****************************************************************************** * Prototypes */ -static INT_PTR PROPSHEET_CreateDialog(PropSheetInfo* psInfo); -static BOOL PROPSHEET_SizeMismatch(HWND hwndDlg, PropSheetInfo* psInfo); -static BOOL PROPSHEET_AdjustSize(HWND hwndDlg, PropSheetInfo* psInfo); -static BOOL PROPSHEET_AdjustButtons(HWND hwndParent, PropSheetInfo* psInfo); -static BOOL PROPSHEET_CollectSheetInfoA(LPCPROPSHEETHEADERA lppsh, - PropSheetInfo * psInfo); -static BOOL PROPSHEET_CollectSheetInfoW(LPCPROPSHEETHEADERW lppsh, - PropSheetInfo * psInfo); -static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, - PropSheetInfo * psInfo, - int index); -static BOOL PROPSHEET_CreateTabControl(HWND hwndParent, - PropSheetInfo * psInfo); -static BOOL PROPSHEET_CreatePage(HWND hwndParent, int index, - const PropSheetInfo * psInfo, - LPCPROPSHEETPAGEW ppshpage); -static BOOL PROPSHEET_ShowPage(HWND hwndDlg, int index, PropSheetInfo * psInfo); static PADDING_INFO PROPSHEET_GetPaddingInfo(HWND hwndDlg); -static BOOL PROPSHEET_Back(HWND hwndDlg); -static BOOL PROPSHEET_Next(HWND hwndDlg); -static BOOL PROPSHEET_Finish(HWND hwndDlg); -static BOOL PROPSHEET_Apply(HWND hwndDlg, LPARAM lParam); -static void PROPSHEET_Cancel(HWND hwndDlg, LPARAM lParam); -static void PROPSHEET_Help(HWND hwndDlg); -static void PROPSHEET_Changed(HWND hwndDlg, HWND hwndDirtyPage); -static void PROPSHEET_UnChanged(HWND hwndDlg, HWND hwndCleanPage); -static void PROPSHEET_PressButton(HWND hwndDlg, int buttonID); -static void PROPSHEET_SetFinishTextA(HWND hwndDlg, LPCSTR lpszText); -static void PROPSHEET_SetFinishTextW(HWND hwndDlg, LPCWSTR lpszText); -static void PROPSHEET_SetTitleA(HWND hwndDlg, DWORD dwStyle, LPCSTR lpszText); static void PROPSHEET_SetTitleW(HWND hwndDlg, DWORD dwStyle, LPCWSTR lpszText); static BOOL PROPSHEET_CanSetCurSel(HWND hwndDlg); static BOOL PROPSHEET_SetCurSel(HWND hwndDlg, int index, int skipdir, HPROPSHEETPAGE hpage); -static void PROPSHEET_SetCurSelId(HWND hwndDlg, int id); -static LRESULT PROPSHEET_QuerySiblings(HWND hwndDlg, - WPARAM wParam, LPARAM lParam); -static BOOL PROPSHEET_AddPage(HWND hwndDlg, - HPROPSHEETPAGE hpage); - -static BOOL PROPSHEET_RemovePage(HWND hwndDlg, - int index, - HPROPSHEETPAGE hpage); -static void PROPSHEET_CleanUp(HWND hwndDlg); static int PROPSHEET_GetPageIndex(HPROPSHEETPAGE hpage, PropSheetInfo* psInfo); -static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags); static PADDING_INFO PROPSHEET_GetPaddingInfoWizard(HWND hwndDlg, const PropSheetInfo* psInfo); -static BOOL PROPSHEET_IsDialogMessage(HWND hwnd, LPMSG lpMsg); static BOOL PROPSHEET_DoCommand(HWND hwnd, WORD wID); -INT_PTR CALLBACK +static INT_PTR CALLBACK PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); WINE_DEFAULT_DEBUG_CHANNEL(propsheet); @@ -443,7 +402,7 @@ static BOOL PROPSHEET_CollectSheetInfoW( * Collect property sheet data. * With code taken from DIALOG_ParseTemplate32. */ -BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, +static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, PropSheetInfo * psInfo, int index) { @@ -3435,7 +3394,7 @@ static LRESULT PROPSHEET_Paint(HWND hwnd /****************************************************************************** * PROPSHEET_DialogProc */ -INT_PTR CALLBACK +static INT_PTR CALLBACK PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { TRACE("hwnd=%p msg=0x%04x wparam=%x lparam=%lx\n",

1 0