wine-commits August 2010

wine-commits@winehq.org

2 participants
884 discussions

Thomas Mullaly : urlmon: Implemented IUri_GetFragment.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: dcd2b994db517d814adb603977769fe847070f40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcd2b994db517d814adb60397… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Jul 29 17:59:00 2010 -0400 urlmon: Implemented IUri_GetFragment. --- dlls/urlmon/tests/uri.c | 288 +++++++++++++++++++++++----------------------- dlls/urlmon/uri.c | 26 +++- 2 files changed, 163 insertions(+), 151 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dcd2b994db517d814adb6…

1 0

Thomas Mullaly : urlmon: Implemented canonicalization for URI fragments.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 004e1be6785c891e11870343446b3e08316a403e URL: http://source.winehq.org/git/wine.git/?a=commit;h=004e1be6785c891e118703434… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Jul 29 17:35:00 2010 -0400 urlmon: Implemented canonicalization for URI fragments. --- dlls/urlmon/tests/uri.c | 240 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 64 +++++++++++++ 2 files changed, 304 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=004e1be6785c891e11870…

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@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

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

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

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

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

Henri Verbeet : wined3d: Fix a couple of typos.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: a16cf58494c877e1d5db95ea5cea272bd2a30c22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a16cf58494c877e1d5db95ea5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 15 23:21:49 2010 +0200 wined3d: Fix a couple of typos. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b9948ab..ff9bd00 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4567,7 +4567,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Present(IWineD3DDevice *iface, for(i = 0 ; i < swapchains ; i ++) { IWineD3DDeviceImpl_GetSwapChain(iface, i, &swapChain); - TRACE("presentinng chain %d, %p\n", i, swapChain); + TRACE("Presenting chain %d, %p.\n", i, swapChain); IWineD3DSwapChain_Present(swapChain, pSourceRect, pDestRect, hDestWindowOverride, pDirtyRegion, 0); IWineD3DSwapChain_Release(swapChain); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9ea65ae..25e7b42 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4238,7 +4238,7 @@ void surface_modify_location(IWineD3DSurfaceImpl *surface, DWORD flag, BOOL pers IWineD3DBaseTexture *texture; IWineD3DSurfaceImpl *overlay; - TRACE("surface %p, location %s, persitent %#x.\n", + TRACE("surface %p, location %s, persistent %#x.\n", surface, debug_surflocation(flag), persistent); if (wined3d_settings.offscreen_rendering_mode == ORM_FBO)

1 0

Henri Verbeet : wined3d: Round up to complete compressed blocks in IWineD3DDeviceImpl_UpdateSurface ().
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: b20df2a24c369951532dbcefbd80e7c4fb9607da URL: http://source.winehq.org/git/wine.git/?a=commit;h=b20df2a24c369951532dbcefb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 15 23:21:48 2010 +0200 wined3d: Round up to complete compressed blocks in IWineD3DDeviceImpl_UpdateSurface(). This is mostly an issue for surfaces with dimensions smaller than their format's block width/height. --- dlls/wined3d/device.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 81e63ff..b9948ab 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5304,9 +5304,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, if (dst_format->Flags & WINED3DFMT_FLAG_COMPRESSED) { - UINT row_length = (update_w / src_format->block_width) * src_format->block_byte_count; - UINT row_count = update_h / src_format->block_height; - UINT src_pitch = IWineD3DSurface_GetPitch(src_surface); + UINT row_length = wined3d_format_calculate_size(src_format, 1, update_w, 1); + UINT row_count = (update_h + src_format->block_height - 1) / src_format->block_height; + UINT src_pitch = wined3d_format_calculate_size(src_format, 1, src_w, 1); if (src_rect) {

1 0

Henri Verbeet : wined3d: Rename surface_calculate_size() to wined3d_format_calculate_size().
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: d494dfb6c083295b033d5327df0bcc681b8c19a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d494dfb6c083295b033d5327d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 15 23:21:47 2010 +0200 wined3d: Rename surface_calculate_size() to wined3d_format_calculate_size(). --- dlls/wined3d/surface.c | 27 +-------------------------- dlls/wined3d/surface_base.c | 2 +- dlls/wined3d/utils.c | 24 ++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 28 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index eff5a5e..9ea65ae 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -92,31 +92,6 @@ static void surface_cleanup(IWineD3DSurfaceImpl *This) resource_cleanup((IWineD3DResource *)This); } -UINT surface_calculate_size(const struct wined3d_format_desc *format_desc, UINT alignment, UINT width, UINT height) -{ - UINT size; - - if (format_desc->format == WINED3DFMT_UNKNOWN) - { - size = 0; - } - else if (format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) - { - UINT row_block_count = (width + format_desc->block_width - 1) / format_desc->block_width; - UINT row_count = (height + format_desc->block_height - 1) / format_desc->block_height; - size = row_count * row_block_count * format_desc->block_byte_count; - } - else - { - /* The pitch is a multiple of 4 bytes. */ - size = height * (((width * format_desc->byte_count) + alignment - 1) & ~(alignment - 1)); - } - - if (format_desc->heightscale != 0.0f) size *= format_desc->heightscale; - - return size; -} - struct blt_info { GLenum binding; @@ -356,7 +331,7 @@ HRESULT surface_init(IWineD3DSurfaceImpl *surface, WINED3DSURFTYPE surface_type, /* FIXME: Check that the format is supported by the device. */ - resource_size = surface_calculate_size(format_desc, alignment, width, height); + resource_size = wined3d_format_calculate_size(format_desc, alignment, width, height); /* Look at the implementation and set the correct Vtable. */ switch (surface_type) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index e9e1ff7..6c12155 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -511,7 +511,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetFormat(IWineD3DSurface *iface, WINED3D TRACE("(%p) : Setting texture format to (%d,%s)\n", This, format, debug_d3dformat(format)); - This->resource.size = surface_calculate_size(format_desc, This->resource.device->surface_alignment, + This->resource.size = wined3d_format_calculate_size(format_desc, This->resource.device->surface_alignment, This->pow2Width, This->pow2Height); This->Flags |= (WINED3DFMT_D16_LOCKABLE == format) ? SFLAG_LOCKABLE : 0; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a4ea624..8396513 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1550,6 +1550,30 @@ const struct wined3d_format_desc *getFormatDescEntry(WINED3DFORMAT fmt, const st return &gl_info->gl_formats[idx]; } +UINT wined3d_format_calculate_size(const struct wined3d_format_desc *format, UINT alignment, UINT width, UINT height) +{ + UINT size; + + if (format->format == WINED3DFMT_UNKNOWN) + { + size = 0; + } + else if (format->Flags & WINED3DFMT_FLAG_COMPRESSED) + { + UINT row_block_count = (width + format->block_width - 1) / format->block_width; + UINT row_count = (height + format->block_height - 1) / format->block_height; + size = row_count * (((row_block_count * format->block_byte_count) + alignment - 1) & ~(alignment - 1)); + } + else + { + size = height * (((width * format->byte_count) + alignment - 1) & ~(alignment - 1)); + } + + if (format->heightscale != 0.0f) size *= format->heightscale; + + return size; +} + /***************************************************************************** * Trace formatting of useful values */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 330d92b..e21685e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2068,8 +2068,6 @@ extern const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl DECLSPEC_HIDDEN; extern const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl DECLSPEC_HIDDEN; void surface_add_dirty_rect(IWineD3DSurfaceImpl *surface, const RECT *dirty_rect) DECLSPEC_HIDDEN; -UINT surface_calculate_size(const struct wined3d_format_desc *format_desc, - UINT alignment, UINT width, UINT height) DECLSPEC_HIDDEN; void surface_gdi_cleanup(IWineD3DSurfaceImpl *This) DECLSPEC_HIDDEN; GLenum surface_get_gl_buffer(IWineD3DSurfaceImpl *surface) DECLSPEC_HIDDEN; HRESULT surface_init(IWineD3DSurfaceImpl *surface, WINED3DSURFTYPE surface_type, UINT alignment, @@ -2980,6 +2978,8 @@ struct wined3d_format_desc const struct wined3d_format_desc *getFormatDescEntry(WINED3DFORMAT fmt, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; +UINT wined3d_format_calculate_size(const struct wined3d_format_desc *format, + UINT alignment, UINT width, UINT height) DECLSPEC_HIDDEN; static inline BOOL use_vs(IWineD3DStateBlockImpl *stateblock) {

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2010