August 2010 - Wine-commits - list.winehq.org

Aric Stewart : usp10: Factor out script ranges in an more expandable way.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 8c0e5483d815c7349552cbe5f03f1cf9901500d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c0e5483d815c7349552cbe5f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Aug 12 14:57:06 2010 -0500 usp10: Factor out script ranges in an more expandable way. --- dlls/usp10/shape.c | 7 +- dlls/usp10/usp10.c | 205 ++++++++++++++++++++++++++----------------- dlls/usp10/usp10_internal.h | 15 ++-- 3 files changed, 139 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c0e5483d815c7349552c…

1 0

Aric Stewart : usp10: Report accurate information about our currently known scripts.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 08c6d79d45eb180eefbb37bba89b30d5fea59779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08c6d79d45eb180eefbb37bba… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Aug 12 14:57:29 2010 -0500 usp10: Report accurate information about our currently known scripts. --- dlls/usp10/tests/usp10.c | 2 +- dlls/usp10/usp10.c | 103 +++------------------------------------------- 2 files changed, 7 insertions(+), 98 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index efc0569..815c943 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -407,7 +407,7 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 trace("number of script properties %d\n", iMaxProps); ok (iMaxProps > 0, "Number of scripts returned should not be 0\n"); if (iMaxProps > 0) - ok( ppSp[5]->langid == 9, "Langid[5] not = to 9\n"); /* Check a known value to ensure */ + ok( ppSp[0]->langid == 0, "Langid[0] not = to 0\n"); /* Check a known value to ensure */ /* ptrs work */ /* This is a valid test that will cause parsing to take place */ diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index ccdd874..0ea7ac1 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -122,105 +122,14 @@ static const scriptData scriptInformation[] = { {LANG_PERSIAN, 1, 1, 0, 0, ARABIC_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, }; -static const SCRIPT_PROPERTIES props[] = -{ - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 9, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 8, 0, 0, 0, 0, 161, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 25, 0, 0, 0, 0, 204, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 42, 0, 0, 0, 0, 163, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 9, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 18, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 18, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 13, 0, 1, 0, 1, 177, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 13, 0, 1, 0, 0, 177, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 1, 0, 1, 0, 0, 178, 0, 0, 0, 0, 0, 0, 1, 1, 0 }, - { 1, 1, 1, 0, 0, 178, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 41, 1, 1, 0, 0, 178, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 32, 1, 1, 0, 0, 178, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 90, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0 }, - { 30, 0, 1, 1, 1, 222, 0, 0, 1, 0, 1, 0, 0, 0, 1 }, - { 30, 1, 1, 0, 0, 222, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 30, 0, 1, 0, 0, 222, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 57, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 57, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 73, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 73, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 69, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 69, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 69, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 70, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 70, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 71, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 71, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 72, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 72, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 74, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 74, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 75, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 75, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 76, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 76, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 81, 0, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0 }, - { 81, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 84, 0, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0 }, - { 84, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 83, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 83, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 85, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 85, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 80, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 80, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 94, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 94, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 101, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 93, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 92, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 9, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 91, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 9, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0 }, - { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, -}; - static const SCRIPT_PROPERTIES *script_props[] = { - &props[0], &props[1], &props[2], &props[3], - &props[4], &props[5], &props[6], &props[7], - &props[8], &props[9], &props[11], &props[12], - &props[13], &props[14], &props[15], &props[16], - &props[17], &props[18], &props[19], &props[20], - &props[21], &props[22], &props[23], &props[24], - &props[25], &props[26], &props[27], &props[28], - &props[29], &props[30], &props[31], &props[32], - &props[33], &props[34], &props[35], &props[36], - &props[37], &props[38], &props[39], &props[40], - &props[41], &props[42], &props[43], &props[44], - &props[45], &props[46], &props[47], &props[48], - &props[49], &props[50], &props[51], &props[52], - &props[53], &props[54], &props[55], &props[56], - &props[57], &props[58], &props[59], &props[60], - &props[61], &props[62], &props[63], &props[64], - &props[65], &props[66], &props[67], &props[68], - &props[69], &props[70], &props[71], &props[72], - &props[73] + &scriptInformation[0].props, &scriptInformation[1].props, + &scriptInformation[2].props, &scriptInformation[3].props, + &scriptInformation[4].props, &scriptInformation[5].props, + &scriptInformation[6].props, &scriptInformation[7].props, + &scriptInformation[8].props, &scriptInformation[9].props, + &scriptInformation[10].props }; typedef struct {

1 0

Maarten Lankhorst : mciqtz32: Fix window visibility.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 1583057fc876949cfbfee4119fb597313657808e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1583057fc876949cfbfee4119… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Aug 9 14:24:31 2010 +0200 mciqtz32: Fix window visibility. --- dlls/mciqtz32/mciqtz.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 35a2f17..fef27e7 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -330,8 +330,7 @@ static DWORD MCIQTZ_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms return MCIERR_INTERNAL; } - if (!wma->parent) - IVideoWindow_put_Visible(wma->vidwin, OATRUE); + IVideoWindow_put_Visible(wma->vidwin, OATRUE); if (dwFlags & MCI_NOTIFY) mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), wDevID, MCI_NOTIFY_SUCCESSFUL); @@ -770,8 +769,10 @@ static DWORD MCIQTZ_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMS return 0; if (dwFlags & MCI_DGV_WINDOW_HWND && (IsWindow(lpParms->hWnd) || !lpParms->hWnd)) { + LONG visible = OATRUE; LONG style = 0; TRACE("Setting hWnd to %p\n", lpParms->hWnd); + IVideoWindow_get_Visible(wma->vidwin, &visible); IVideoWindow_put_Visible(wma->vidwin, OAFALSE); IVideoWindow_get_WindowStyle(wma->vidwin, &style); style &= ~WS_CHILD; @@ -781,7 +782,7 @@ static DWORD MCIQTZ_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMS IVideoWindow_put_WindowStyle(wma->vidwin, style); IVideoWindow_put_Owner(wma->vidwin, (OAHWND)lpParms->hWnd); IVideoWindow_put_MessageDrain(wma->vidwin, (OAHWND)lpParms->hWnd); - IVideoWindow_put_Visible(wma->vidwin, OATRUE); + IVideoWindow_put_Visible(wma->vidwin, visible); wma->parent = lpParms->hWnd; } if (dwFlags & MCI_DGV_WINDOW_STATE) { @@ -818,12 +819,15 @@ static DWORD MCIQTZ_mciUpdate(UINT wDevID, DWORD dwFlags, LPMCI_DGV_UPDATE_PARMS BITMAPINFO *info; HRESULT hr; RECT src, dest; + LONG visible = OATRUE; res = MCIERR_INTERNAL; /* If in stopped state, nothing has been drawn to screen * moving to pause, which is needed for the old dib renderer, will result * in a single frame drawn, so hide the window here */ - IVideoWindow_put_Visible(wma->vidwin, OAFALSE); + IVideoWindow_get_Visible(wma->vidwin, &visible); + if (wma->parent) + IVideoWindow_put_Visible(wma->vidwin, OAFALSE); /* FIXME: Should we check the original state and restore it? */ IMediaControl_Pause(wma->pmctrl); IMediaControl_GetState(wma->pmctrl, -1, &state); @@ -846,7 +850,7 @@ static DWORD MCIQTZ_mciUpdate(UINT wDevID, DWORD dwFlags, LPMCI_DGV_UPDATE_PARMS res = 0; out: if (wma->parent) - IVideoWindow_put_Visible(wma->vidwin, OATRUE); + IVideoWindow_put_Visible(wma->vidwin, visible); } else if (dwFlags) FIXME("Unhandled flags %x\n", dwFlags);

1 0

André Hentschel : dwmapi: Add stub for DwmDefWindowProc.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: a0e75874193acc0bdeb22c873a32a85d194e1131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0e75874193acc0bdeb22c873… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 9 18:50:12 2010 +0200 dwmapi: Add stub for DwmDefWindowProc. --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 12 ++++++++++++ include/dwmapi.h | 1 + 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index ea41e0c..33d062f 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -21,7 +21,7 @@ 120 stub @ @ stub DwmAttachMilContent -@ stub DwmDefWindowProc +@ stdcall DwmDefWindowProc(long long long long ptr) @ stub DwmDetachMilContent @ stdcall DwmEnableBlurBehindWindow(ptr ptr) @ stdcall DwmEnableMMCSS(long) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index fcc52c3..fc0a792 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -176,3 +176,15 @@ HRESULT WINAPI DwmEnableBlurBehindWindow(HWND hWnd, const DWM_BLURBEHIND *pBlurB return E_NOTIMPL; } + +/********************************************************************** + * DwmDefWindowProc (DWMAPI.@) + */ +BOOL WINAPI DwmDefWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT *plResult) +{ + static int i; + + if (!i++) FIXME("stub\n"); + + return FALSE; +} diff --git a/include/dwmapi.h b/include/dwmapi.h index 2cf5d6d..ecc515c 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -53,6 +53,7 @@ typedef struct _DWM_BLURBEHIND BOOL fTransitionOnMaximized; } DWM_BLURBEHIND, *PDWM_BLURBEHIND; +DWMAPI DwmDefWindowProc(HWND, UINT, WPARAM, LPARAM, LRESULT*); DWMAPI DwmEnableBlurBehindWindow(HWND, const DWM_BLURBEHIND *); DWMAPI DwmEnableComposition(UINT); DWMAPI DwmEnableMMCSS(BOOL);

1 0

Gerald Pfeifer : comctl32: Merge is_textT and is_textW into a single is_text.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: ab575718cee653f3ff120ddc30d27a61b497b308 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab575718cee653f3ff120ddc3… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Aug 16 00:05:39 2010 +0200 comctl32: Merge is_textT and is_textW into a single is_text. --- dlls/comctl32/listview.c | 34 ++++++++++++++-------------------- 1 files changed, 14 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index efc200f..6dbcf4a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -474,20 +474,14 @@ static BOOL LISTVIEW_Scroll(LISTVIEW_INFO *, INT, INT); * W: Unicode, T: ANSI/Unicode - function of isW */ -static inline BOOL is_textW(LPCWSTR text) +static inline BOOL is_text(LPCWSTR text) { return text != NULL && text != LPSTR_TEXTCALLBACKW; } -static inline BOOL is_textT(LPCWSTR text, BOOL isW) -{ - /* we can ignore isW since LPSTR_TEXTCALLBACKW == LPSTR_TEXTCALLBACKA */ - return is_textW(text); -} - static inline int textlenT(LPCWSTR text, BOOL isW) { - return !is_textT(text, isW) ? 0 : + return !is_text(text) ? 0 : isW ? lstrlenW(text) : lstrlenA((LPCSTR)text); } @@ -505,7 +499,7 @@ static inline LPWSTR textdupTtoW(LPCWSTR text, BOOL isW) { LPWSTR wstr = (LPWSTR)text; - if (!isW && is_textT(text, isW)) + if (!isW && is_text(text)) { INT len = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)text, -1, NULL, 0); wstr = Alloc(len * sizeof(WCHAR)); @@ -517,7 +511,7 @@ static inline LPWSTR textdupTtoW(LPCWSTR text, BOOL isW) static inline void textfreeT(LPWSTR wstr, BOOL isW) { - if (!isW && is_textT(wstr, isW)) Free (wstr); + if (!isW && is_text(wstr)) Free (wstr); } /* @@ -530,7 +524,7 @@ static BOOL textsetptrT(LPWSTR *dest, LPCWSTR src, BOOL isW) if (src == LPSTR_TEXTCALLBACKW) { - if (is_textW(*dest)) Free(*dest); + if (is_text(*dest)) Free(*dest); *dest = LPSTR_TEXTCALLBACKW; } else @@ -946,7 +940,7 @@ static BOOL notify_dispinfoT(const LISTVIEW_INFO *infoPtr, UINT notificationCode UINT realNotifCode; LPWSTR pszTempBuf = NULL, savPszText = NULL; - if ((pdi->item.mask & LVIF_TEXT) && is_textT(pdi->item.pszText, isW)) + if ((pdi->item.mask & LVIF_TEXT) && is_text(pdi->item.pszText)) { convertToAnsi = (isW && infoPtr->notifyFormat == NFR_ANSI); convertToUnicode = (!isW && infoPtr->notifyFormat == NFR_UNICODE); @@ -2325,7 +2319,7 @@ static void LISTVIEW_GetItemMetrics(const LISTVIEW_INFO *infoPtr, const LVITEMW /* we need the text in non owner draw mode */ assert(lpLVItem->mask & LVIF_TEXT); - if (is_textT(lpLVItem->pszText, TRUE)) + if (is_text(lpLVItem->pszText)) { HFONT hFont = infoPtr->hFont ? infoPtr->hFont : infoPtr->hDefaultFont; HDC hdc = GetDC(infoPtr->hwndSelf); @@ -4320,7 +4314,7 @@ static BOOL LISTVIEW_SetItemT(LISTVIEW_INFO *infoPtr, LVITEMW *lpLVItem, BOOL is return FALSE; /* For efficiency, we transform the lpLVItem->pszText to Unicode here */ - if ((lpLVItem->mask & LVIF_TEXT) && is_textW(lpLVItem->pszText)) + if ((lpLVItem->mask & LVIF_TEXT) && is_text(lpLVItem->pszText)) { pszText = lpLVItem->pszText; lpLVItem->pszText = textdupTtoW(lpLVItem->pszText, isW); @@ -5309,7 +5303,7 @@ static BOOL LISTVIEW_DeleteAllItems(LISTVIEW_INFO *infoPtr, BOOL destroy) for (j = 0; j < DPA_GetPtrCount(hdpaSubItems); j++) { hdrItem = DPA_GetPtr(hdpaSubItems, j); - if (is_textW(hdrItem->pszText)) Free(hdrItem->pszText); + if (is_text(hdrItem->pszText)) Free(hdrItem->pszText); Free(hdrItem); } DPA_Destroy(hdpaSubItems); @@ -5451,7 +5445,7 @@ static BOOL LISTVIEW_DeleteColumn(LISTVIEW_INFO *infoPtr, INT nColumn) if (nSubItem > 0) { /* free string */ - if (is_textW(lpDelItem->hdr.pszText)) + if (is_text(lpDelItem->hdr.pszText)) Free(lpDelItem->hdr.pszText); /* free item */ @@ -5600,7 +5594,7 @@ static BOOL LISTVIEW_DeleteItem(LISTVIEW_INFO *infoPtr, INT nItem) for (i = 0; i < DPA_GetPtrCount(hdpaSubItems); i++) { hdrItem = DPA_GetPtr(hdpaSubItems, i); - if (is_textW(hdrItem->pszText)) Free(hdrItem->pszText); + if (is_text(hdrItem->pszText)) Free(hdrItem->pszText); Free(hdrItem); } DPA_Destroy(hdpaSubItems); @@ -6600,7 +6594,7 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, /* Apps depend on calling back for text if it is NULL or LPSTR_TEXTCALLBACKW */ if ((lpLVItem->mask & LVIF_TEXT) && !(lpLVItem->mask & LVIF_NORECOMPUTE) && - !is_textW(pItemHdr->pszText)) + !is_text(pItemHdr->pszText)) { dispInfo.item.mask |= LVIF_TEXT; dispInfo.item.pszText = lpLVItem->pszText; @@ -6648,7 +6642,7 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, else if (lpLVItem->mask & LVIF_TEXT) { /* if LVN_GETDISPINFO's disabled with LVIF_NORECOMPUTE return callback placeholder */ - if (isW || !is_textW(pItemHdr->pszText)) lpLVItem->pszText = pItemHdr->pszText; + if (isW || !is_text(pItemHdr->pszText)) lpLVItem->pszText = pItemHdr->pszText; else textcpynT(lpLVItem->pszText, isW, pItemHdr->pszText, TRUE, lpLVItem->cchTextMax); } @@ -7355,7 +7349,7 @@ static INT LISTVIEW_GetStringWidthT(const LISTVIEW_INFO *infoPtr, LPCWSTR lpszTe SIZE stringSize; stringSize.cx = 0; - if (is_textT(lpszText, isW)) + if (is_text(lpszText)) { HFONT hFont = infoPtr->hFont ? infoPtr->hFont : infoPtr->hDefaultFont; HDC hdc = GetDC(infoPtr->hwndSelf);

1 0

Konrad Wartke : wineboot: Added more architectures in create_enviroment_registry_keys.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 8ac60d56b6d02a773b915e6e1389c5c070bfa633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ac60d56b6d02a773b915e6e1… Author: Konrad Wartke <kwartke(a)gmail.com> Date: Sun Aug 15 18:54:47 2010 +0200 wineboot: Added more architectures in create_enviroment_registry_keys. --- programs/wineboot/wineboot.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 02d3746..90dd779 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -261,6 +261,8 @@ static void create_environment_registry_keys( void ) static const WCHAR NumProcW[] = {'N','U','M','B','E','R','_','O','F','_','P','R','O','C','E','S','S','O','R','S',0}; static const WCHAR ProcArchW[] = {'P','R','O','C','E','S','S','O','R','_','A','R','C','H','I','T','E','C','T','U','R','E',0}; static const WCHAR x86W[] = {'x','8','6',0}; + static const WCHAR IA64W[] = {'I','A','6','4',0}; + static const WCHAR AMD64W[] = {'A','M','D','6','4',0}; static const WCHAR ProcIdW[] = {'P','R','O','C','E','S','S','O','R','_','I','D','E','N','T','I','F','I','E','R',0}; static const WCHAR ProcLvlW[] = {'P','R','O','C','E','S','S','O','R','_','L','E','V','E','L',0}; static const WCHAR ProcRevW[] = {'P','R','O','C','E','S','S','O','R','_','R','E','V','I','S','I','O','N',0}; @@ -280,8 +282,19 @@ static void create_environment_registry_keys( void ) sprintfW( buffer, PercentDW, NtCurrentTeb()->Peb->NumberOfProcessors ); set_reg_value( env_key, NumProcW, buffer ); - /* TODO: currently hardcoded x86, add different processors */ - set_reg_value( env_key, ProcArchW, x86W ); + switch(sci.Architecture) + { + case PROCESSOR_ARCHITECTURE_AMD64: + set_reg_value( env_key, ProcArchW, AMD64W ); + break; + case PROCESSOR_ARCHITECTURE_IA64: + set_reg_value( env_key, ProcArchW, IA64W ); + break; + case PROCESSOR_ARCHITECTURE_INTEL: + default: + set_reg_value( env_key, ProcArchW, x86W ); + break; + } /* TODO: currently hardcoded Intel, add different processors */ sprintfW( buffer, IntelCpuDescrW, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) );

1 0

Thomas Mullaly : urlmon: Implemented a fragment parser.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 27ec56ea6bb15e5b8686baec186890f82035f35e URL: http://source.winehq.org/git/wine.git/?a=commit;h=27ec56ea6bb15e5b8686baec1… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Jul 29 16:36:39 2010 -0400 urlmon: Implemented a fragment parser. --- dlls/urlmon/tests/uri.c | 34 +++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 77 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index ab0125d..196e4d8 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -3160,6 +3160,36 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_HTTP,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE}, } + }, + /* Unknown scheme types can have invalid % encoded data in fragments. */ + { "zip://www.winehq.org/tests/#Te%xx", 0, S_OK, FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_AUTHORITY|Uri_HAS_DISPLAY_URI|Uri_HAS_DOMAIN|Uri_HAS_FRAGMENT| + Uri_HAS_HOST|Uri_HAS_DOMAIN|Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY|Uri_HAS_RAW_URI| + Uri_HAS_SCHEME_NAME|Uri_HAS_HOST_TYPE|Uri_HAS_SCHEME, + TRUE, + { + {"zip://www.winehq.org/tests/#Te%xx",S_OK,TRUE}, + {"www.winehq.org",S_OK,FALSE}, + {"zip://www.winehq.org/tests/#Te%xx",S_OK,TRUE}, + {"winehq.org",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"#Te%xx",S_OK,TRUE}, + {"www.winehq.org",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"/tests/",S_OK,FALSE}, + {"/tests/",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"zip://www.winehq.org/tests/#Te%xx",S_OK,FALSE}, + {"zip",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_DNS,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_UNKNOWN,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE}, + } } }; @@ -3214,7 +3244,9 @@ static const invalid_uri invalid_uri_tests[] = { {"news:test%XX",0,FALSE}, {"mailto:wine(a)winehq%G8.com",0,FALSE}, /* Known scheme types can't have invalid % encoded data in query string. */ - {"http://google.com/?query=te%xx",0,FALSE} + {"http://google.com/?query=te%xx",0,FALSE}, + /* Invalid % encoded data in fragment of know scheme type. */ + {"ftp://google.com/#Test%xx",0,FALSE} }; typedef struct _uri_equality { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 51e58d5..ecf6922 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -126,6 +126,9 @@ typedef struct { const WCHAR *query; DWORD query_len; + + const WCHAR *fragment; + DWORD fragment_len; } parse_data; static const CHAR hexDigits[] = "0123456789ABCDEF"; @@ -1783,6 +1786,45 @@ static BOOL parse_query(const WCHAR **ptr, parse_data *data, DWORD flags) { return TRUE; } +/* Attempts to parse the fragment from the URI. + * + * NOTES: + * If NO_DECODE_EXTRA_INFO flag is set, then invalid percent encoded + * data is allowed appear in the query string. For unknown scheme types + * invalid percent encoded data is allowed to appear reguardless. + */ +static BOOL parse_fragment(const WCHAR **ptr, parse_data *data, DWORD flags) { + const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; + + if(**ptr != '#') { + TRACE("(%p %p %x): URI didn't contain a fragment.\n", ptr, data, flags); + return TRUE; + } + + data->fragment = *ptr; + + ++(*ptr); + while(**ptr) { + if(**ptr == '%' && known_scheme && + !(flags & Uri_CREATE_NO_DECODE_EXTRA_INFO)) { + if(!check_pct_encoded(ptr)) { + *ptr = data->fragment; + data->fragment = NULL; + return FALSE; + } else + continue; + } + + ++(*ptr); + } + + data->fragment_len = *ptr - data->fragment; + + TRACE("(%p %p %x): Parsed fragment %s len=%d\n", ptr, data, flags, + debugstr_wn(data->fragment, data->fragment_len), data->fragment_len); + return TRUE; +} + /* Parses and validates the components of the specified by data->uri * and stores the information it parses into 'data'. * @@ -1806,7 +1848,8 @@ static BOOL parse_uri(parse_data *data, DWORD flags) { if(!parse_query(pptr, data, flags)) return FALSE; - /* TODO: Parse fragment (if the URI has one). */ + if(!parse_fragment(pptr, data, flags)) + return FALSE; TRACE("(%p %x): FINISHED PARSING URI.\n", data, flags); return TRUE;

1 0

Henri Verbeet : wined3d: Fix some misspellings of "surface".
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: e1188b0c8e8734abdce9b2cdcc92d5708f6e0bb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1188b0c8e8734abdce9b2cdc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 15 23:21:43 2010 +0200 wined3d: Fix some misspellings of "surface". --- dlls/wined3d/device.c | 99 ++++++++++++++------------ dlls/wined3d/surface.c | 58 +++++++++------- dlls/wined3d/surface_base.c | 151 ++++++++++++++++++---------------------- dlls/wined3d/swapchain_base.c | 7 +- dlls/wined3d/wined3d_private.h | 6 +- 5 files changed, 159 insertions(+), 162 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e1188b0c8e8734abdce9b…

1 0

Henri Verbeet : wined3d: Cleanup IWineD3DBaseSwapChainImpl_GetBackBuffer() a bit.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 81603f18d89be5bedeb8a929f1c4bb32faf27dad URL: http://source.winehq.org/git/wine.git/?a=commit;h=81603f18d89be5bedeb8a929f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 15 23:21:44 2010 +0200 wined3d: Cleanup IWineD3DBaseSwapChainImpl_GetBackBuffer() a bit. --- dlls/wined3d/swapchain_base.c | 40 +++++++++++++++++++--------------------- 1 files changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/swapchain_base.c b/dlls/wined3d/swapchain_base.c index f13e085..917a8b6 100644 --- a/dlls/wined3d/swapchain_base.c +++ b/dlls/wined3d/swapchain_base.c @@ -90,36 +90,34 @@ HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetFrontBufferData(IWineD3DSwapChain *i return WINED3D_OK; } -HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetBackBuffer(IWineD3DSwapChain *iface, UINT iBackBuffer, WINED3DBACKBUFFER_TYPE Type, IWineD3DSurface **ppBackBuffer) { +HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetBackBuffer(IWineD3DSwapChain *iface, + UINT back_buffer_idx, WINED3DBACKBUFFER_TYPE type, IWineD3DSurface **back_buffer) +{ + IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)iface; - IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface; + TRACE("iface %p, back_buffer_idx %u, type %#x, back_buffer %p.\n", + iface, back_buffer_idx, type, back_buffer); - if (iBackBuffer > This->presentParms.BackBufferCount - 1) { - TRACE("Back buffer count out of range\n"); - /* Native d3d9 doesn't set NULL here, just as wine's d3d9. But set it - * here in wined3d to avoid problems in other libs - */ - *ppBackBuffer = NULL; - return WINED3DERR_INVALIDCALL; - } - - /* Return invalid if there is no backbuffer array, otherwise it will crash when ddraw is - * used (there This->backBuffer is always NULL). We need this because this function has - * to be called from IWineD3DStateBlockImpl_InitStartupStateBlock to get the default + /* Return invalid if there is no backbuffer array, otherwise it will + * crash when ddraw is used (there swapchain->back_buffers is always NULL). + * We need this because this function is called from + * IWineD3DStateBlockImpl_InitStartupStateBlock() to get the default * scissorrect dimensions. */ - if (!This->back_buffers) + if (!swapchain->back_buffers || back_buffer_idx >= swapchain->presentParms.BackBufferCount) { - *ppBackBuffer = NULL; + WARN("Invalid back buffer index.\n"); + /* Native d3d9 doesn't set NULL here, just as wine's d3d9. But set it + * here in wined3d to avoid problems in other libs. */ + *back_buffer = NULL; return WINED3DERR_INVALIDCALL; } - *ppBackBuffer = (IWineD3DSurface *)This->back_buffers[iBackBuffer]; - TRACE("(%p) : BackBuf %d Type %d returning %p\n", This, iBackBuffer, Type, *ppBackBuffer); + *back_buffer = (IWineD3DSurface *)swapchain->back_buffers[back_buffer_idx]; + if (*back_buffer) IWineD3DSurface_AddRef(*back_buffer); - /* Note inc ref on returned surface */ - if(*ppBackBuffer) IWineD3DSurface_AddRef(*ppBackBuffer); - return WINED3D_OK; + TRACE("Returning back buffer %p.\n", *back_buffer); + return WINED3D_OK; } HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetRasterStatus(IWineD3DSwapChain *iface, WINED3DRASTER_STATUS *pRasterStatus) {

1 0

Henri Verbeet : wined3d: Print the correct resource location in surface_set_texture_name().
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 3a36013065b1f8e6158ff1d5f50c3476c8e44928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a36013065b1f8e6158ff1d5f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 15 23:21:45 2010 +0200 wined3d: Print the correct resource location in surface_set_texture_name(). --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 324695b..eff5a5e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -485,7 +485,7 @@ void surface_set_texture_name(IWineD3DSurfaceImpl *surface, GLuint new_name, BOO /* FIXME: We shouldn't need to remove SFLAG_INTEXTURE if the * surface has no texture name yet. See if we can get rid of this. */ if (surface->Flags & flag) - ERR("Surface has SFLAG_INTEXTURE set, but no texture name\n"); + ERR("Surface has %s set, but no texture name.\n", debug_surflocation(flag)); surface_modify_location(surface, flag, FALSE); }

1 0