September 2011 - Wine-Commits

Nikolay Sivov : comctl32/monthcal: Store calendars matrix dimensions instead of overall count.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: e716421393ca0e1315fbc718eb5fcba02e4f1616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e716421393ca0e1315fbc718e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 13 21:45:07 2011 +0400 comctl32/monthcal: Store calendars matrix dimensions instead of overall count. --- dlls/comctl32/monthcal.c | 52 ++++++++++++++++++++++++--------------------- 1 files changed, 28 insertions(+), 24 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index ae9bdcd..07a8783 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -151,7 +151,7 @@ typedef struct WNDPROC EditWndProc; /* original Edit window procedure */ CALENDAR_INFO *calendars; - INT cal_num; + SIZE dim; /* [cx,cy] - dimensions of calendars matrix, row/column count */ } MONTHCAL_INFO, *LPMONTHCAL_INFO; static const WCHAR themeClass[] = { 'S','c','r','o','l','l','b','a','r',0 }; @@ -170,6 +170,10 @@ enum nav_direction }; /* helper functions */ +static inline INT MONTHCAL_GetCalCount(const MONTHCAL_INFO *infoPtr) +{ + return infoPtr->dim.cx * infoPtr->dim.cy; +} /* send a single MCN_SELCHANGE notification */ static inline void MONTHCAL_NotifySelectionChange(const MONTHCAL_INFO *infoPtr) @@ -517,7 +521,7 @@ static void MONTHCAL_GetMinDate(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *date) static void MONTHCAL_GetMaxDate(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *date) { /* the latest date is in latest calendar */ - SYSTEMTIME st, lt_month = infoPtr->calendars[infoPtr->cal_num-1].month; + SYSTEMTIME st, lt_month = infoPtr->calendars[MONTHCAL_GetCalCount(infoPtr)-1].month; *date = lt_month; MONTHCAL_GetNextMonth(date); @@ -571,7 +575,7 @@ static void MONTHCAL_GetDayPos(const MONTHCAL_INFO *infoPtr, const SYSTEMTIME *d st.wDay = 1; first = (MONTHCAL_CalculateDayOfWeek(&st, FALSE) + 6 - infoPtr->firstDay) % 7; - if (calIdx == 0 || calIdx == infoPtr->cal_num-1) { + if (calIdx == 0 || calIdx == MONTHCAL_GetCalCount(infoPtr)-1) { const SYSTEMTIME *cal = &infoPtr->calendars[calIdx].month; LONG cmp = MONTHCAL_CompareMonths(date, &st); @@ -618,12 +622,12 @@ static inline void MONTHCAL_GetDayRect(const MONTHCAL_INFO *infoPtr, const SYSTE calIdx = 0; else { - cmp = MONTHCAL_CompareMonths(date, &infoPtr->calendars[infoPtr->cal_num-1].month); + cmp = MONTHCAL_CompareMonths(date, &infoPtr->calendars[MONTHCAL_GetCalCount(infoPtr)-1].month); if (cmp >= 0) - calIdx = infoPtr->cal_num-1; + calIdx = MONTHCAL_GetCalCount(infoPtr)-1; else { - for (calIdx = 1; calIdx < infoPtr->cal_num-1; calIdx++) + for (calIdx = 1; calIdx < MONTHCAL_GetCalCount(infoPtr)-1; calIdx++) if (MONTHCAL_CompareMonths(date, &infoPtr->calendars[calIdx].month) == 0) break; } @@ -1006,7 +1010,7 @@ static void MONTHCAL_PaintLeadTrailMonths(const MONTHCAL_INFO *infoPtr, HDC hdc, } /* draw next month */ - st = infoPtr->calendars[infoPtr->cal_num-1].month; + st = infoPtr->calendars[MONTHCAL_GetCalCount(infoPtr)-1].month; st.wDay = 1; MONTHCAL_GetNextMonth(&st); MONTHCAL_GetMaxDate(infoPtr, &st_max); @@ -1088,7 +1092,7 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT old_bk_clr = GetBkColor(hdc); old_font = GetCurrentObject(hdc, OBJ_FONT); - for (i = 0; i < infoPtr->cal_num; i++) + for (i = 0; i < MONTHCAL_GetCalCount(infoPtr); i++) { RECT *title = &infoPtr->calendars[i].title; RECT r; @@ -1310,7 +1314,7 @@ MONTHCAL_GetMonthRange(const MONTHCAL_INFO *infoPtr, DWORD flag, SYSTEMTIME *st) case GMR_VISIBLE: { st[0] = infoPtr->calendars[0].month; - st[1] = infoPtr->calendars[infoPtr->cal_num-1].month; + st[1] = infoPtr->calendars[MONTHCAL_GetCalCount(infoPtr)-1].month; if (st[0].wMonth == min_allowed_date.wMonth && st[0].wYear == min_allowed_date.wYear) @@ -1324,7 +1328,7 @@ MONTHCAL_GetMonthRange(const MONTHCAL_INFO *infoPtr, DWORD flag, SYSTEMTIME *st) st[1].wDay = MONTHCAL_MonthLength(st[1].wMonth, st[1].wYear); MONTHCAL_CalculateDayOfWeek(&st[1], TRUE); - return infoPtr->cal_num; + return MONTHCAL_GetCalCount(infoPtr); } case GMR_DAYSTATE: { @@ -1634,7 +1638,7 @@ static INT MONTHCAL_GetCalendarFromPoint(const MONTHCAL_INFO *infoPtr, const POI RECT r; INT i; - for (i = 0; i < infoPtr->cal_num; i++) + for (i = 0; i < MONTHCAL_GetCalCount(infoPtr); i++) { /* whole bounding rectangle allows some optimization to compute */ r.left = infoPtr->calendars[i].title.left; @@ -1836,7 +1840,7 @@ static void MONTHCAL_Scroll(MONTHCAL_INFO *infoPtr, INT delta) { INT i, selIdx = -1; - for(i = 0; i < infoPtr->cal_num; i++) + for(i = 0; i < MONTHCAL_GetCalCount(infoPtr); i++) { /* save selection position to shift it later */ if (selIdx == -1 && MONTHCAL_CompareMonths(&infoPtr->minSel, &infoPtr->calendars[i].month) == 0) @@ -1866,7 +1870,7 @@ static void MONTHCAL_Scroll(MONTHCAL_INFO *infoPtr, INT delta) static void MONTHCAL_GoToMonth(MONTHCAL_INFO *infoPtr, enum nav_direction direction) { - INT delta = infoPtr->delta ? infoPtr->delta : infoPtr->cal_num; + INT delta = infoPtr->delta ? infoPtr->delta : MONTHCAL_GetCalCount(infoPtr); SYSTEMTIME st; TRACE("%s\n", direction == DIRECTION_BACKWARD ? "back" : "fwd"); @@ -1879,7 +1883,7 @@ static void MONTHCAL_GoToMonth(MONTHCAL_INFO *infoPtr, enum nav_direction direct } else { - st = infoPtr->calendars[infoPtr->cal_num-1].month; + st = infoPtr->calendars[MONTHCAL_GetCalCount(infoPtr)-1].month; MONTHCAL_GetMonth(&st, delta); } @@ -2067,7 +2071,7 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) /* check if change allowed by range set */ st = delta < 0 ? infoPtr->calendars[0].month : - infoPtr->calendars[infoPtr->cal_num-1].month; + infoPtr->calendars[MONTHCAL_GetCalCount(infoPtr)-1].month; MONTHCAL_GetMonth(&st, delta); if (MONTHCAL_IsDateInValidRange(infoPtr, &st, FALSE)) @@ -2349,10 +2353,10 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) TEXTMETRICW tm; HFONT currentFont; INT xdiv, dx, dy, i; - RECT rcClient; + RECT client; WCHAR buff[80]; - GetClientRect(infoPtr->hwndSelf, &rcClient); + GetClientRect(infoPtr->hwndSelf, &client); currentFont = SelectObject(hdc, infoPtr->hFont); @@ -2433,8 +2437,8 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) todayrect->bottom = days->bottom + infoPtr->height_increment; /* offset all rectangles to center in client area */ - dx = (rcClient.right - title->right) / 2; - dy = (rcClient.bottom - todayrect->bottom) / 2; + dx = (client.right - title->right) / 2; + dy = (client.bottom - todayrect->bottom) / 2; /* if calendar doesn't fit client area show it at left/top bounds */ if (title->left + dx < 0) dx = 0; @@ -2453,9 +2457,12 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) OffsetRect(todayrect, dx, dy); } + /* TODO: update calendars count */ + infoPtr->dim.cx = infoPtr->dim.cy = 1; + TRACE("dx=%d dy=%d client[%s] title[%s] wdays[%s] days[%s] today[%s]\n", infoPtr->width_increment,infoPtr->height_increment, - wine_dbgstr_rect(&rcClient), + wine_dbgstr_rect(&client), wine_dbgstr_rect(title), wine_dbgstr_rect(wdays), wine_dbgstr_rect(days), @@ -2569,8 +2576,6 @@ MONTHCAL_Create(HWND hwnd, LPCREATESTRUCTW lpcs) infoPtr->calendars = Alloc(sizeof(CALENDAR_INFO)); if (!infoPtr->calendars) goto fail; - infoPtr->cal_num = 1; - MONTHCAL_SetFont(infoPtr, GetStockObject(DEFAULT_GUI_FONT), FALSE); /* initialize info structure */ @@ -2604,8 +2609,7 @@ MONTHCAL_Create(HWND hwnd, LPCREATESTRUCTW lpcs) infoPtr->calendars[0].month = infoPtr->todaysDate; infoPtr->isUnicode = TRUE; - /* call MONTHCAL_UpdateSize to set all of the dimensions */ - /* of the control */ + /* set all control dimensions */ MONTHCAL_UpdateSize(infoPtr); /* today auto update timer, to be freed only on control destruction */

1 0

Stefan Dösinger : d3d9/tests: Range fog is not used with table fog.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: f708da1c1c4bc9e66fa9bf14fe8e6404df7f622f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f708da1c1c4bc9e66fa9bf14f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 3 17:24:36 2011 +0200 d3d9/tests: Range fog is not used with table fog. --- dlls/d3d9/tests/visual.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 92 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 1857e2e..f583a89 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1284,6 +1284,98 @@ static void fog_test(IDirect3DDevice9 *device) skip("D3DPRASTERCAPS_FOGTABLE not supported, skipping some fog tests\n"); } + /* Test RANGEFOG vs FOGTABLEMODE */ + if ((caps.RasterCaps & (D3DPRASTERCAPS_FOGTABLE | D3DPRASTERCAPS_FOGRANGE)) == + (D3DPRASTERCAPS_FOGTABLE | D3DPRASTERCAPS_FOGRANGE)) + { + struct sVertex untransformed_3[] = + { + {-1.0,-1.0, 0.4999f, 0xFFFF0000, 0xFF000000 }, + {-1.0, 1.0, 0.4999f, 0xFFFF0000, 0xFF000000 }, + { 1.0,-1.0, 0.4999f, 0xFFFF0000, 0xFF000000 }, + { 1.0, 1.0, 0.4999f, 0xFFFF0000, 0xFF000000 }, + }; + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); + ok(SUCCEEDED(hr), "IDirect3DDevice9_Clear failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetFVF failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_RANGEFOGENABLE, TRUE); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); + + /* z=0.4999, set the fogstart to 0.5 and fogend slightly higher. If range fog + * is not used, the fog coordinate will be equal to fogstart and the quad not + * fogged. If range fog is used the fog coordinate will be slightly higher and + * the fog coordinate will be > fogend, so we get a fully fogged quad. The fog + * is calculated per vertex and interpolated, so even the center of the screen + * where the difference doesn't matter will be fogged, but check the corners in + * case a d3d/gl implementation decides to calculate the fog factor per fragment */ + start = 0.5f; + end = 0.50001f; + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, *((DWORD *) &start)); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGEND, *((DWORD *) &end)); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); + + /* Table fog: Range fog is not used */ + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "IDirect3DDevice9_BeginScene failed, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_LINEAR); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, untransformed_3, sizeof(*untransformed_3)); + ok(SUCCEEDED(hr), "IDirect3DDevice9_DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "IDirect3DDevice9_EndScene failed, hr %#x.\n", hr); + } + color = getPixelColor(device, 10, 10); + ok(color == 0x00ff0000, "Rangefog with table fog returned color 0x%08x\n", color); + color = getPixelColor(device, 630, 10); + ok(color == 0x00ff0000, "Rangefog with table fog returned color 0x%08x\n", color); + color = getPixelColor(device, 10, 470); + ok(color == 0x00ff0000, "Rangefog with table fog returned color 0x%08x\n", color); + color = getPixelColor(device, 630, 470); + ok(color == 0x00ff0000, "Rangefog with table fog returned color 0x%08x\n", color); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice9_Present failed, hr %#x.\n", hr); + + /* Vertex fog: Rangefog is used */ + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitiveUP returned %#08x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_NONE); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGVERTEXMODE, D3DFOG_LINEAR); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, untransformed_3, sizeof(*untransformed_3)); + ok(SUCCEEDED(hr), "IDirect3DDevice9_DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "IDirect3DDevice9_EndScene failed, hr %#x.\n", hr); + } + color = getPixelColor(device, 10, 10); + ok(color == 0x0000ff00, "Rangefog with vertex fog returned color 0x%08x\n", color); + color = getPixelColor(device, 630, 10); + ok(color == 0x0000ff00, "Rangefog with vertex fog returned color 0x%08x\n", color); + color = getPixelColor(device, 10, 470); + ok(color == 0x0000ff00, "Rangefog with vertex fog returned color 0x%08x\n", color); + color = getPixelColor(device, 630, 470); + ok(color == 0x0000ff00, "Rangefog with vertex fog returned color 0x%08x\n", color); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice9_Present failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_RANGEFOGENABLE, FALSE); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); + } + else + { + skip("Range fog or table fog not supported, skipping range fog tests\n"); + } + /* Turn off the fog master switch to avoid confusing other tests */ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE); ok(hr == D3D_OK, "Turning off fog calculations returned %08x\n", hr);

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_ps_consts_b() const.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: fc488f49494303e0054cfb4d8360f1bdbffdb2f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc488f49494303e0054cfb4d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 14 20:17:31 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_ps_consts_b() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bb4969c..0bcdf8d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3117,7 +3117,7 @@ HRESULT CDECL wined3d_device_set_ps_consts_b(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_ps_consts_b(struct wined3d_device *device, +HRESULT CDECL wined3d_device_get_ps_consts_b(const struct wined3d_device *device, UINT start_register, BOOL *constants, UINT bool_count) { UINT count = min(bool_count, MAX_CONST_B - start_register); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 940246c..f439f73 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2231,7 +2231,7 @@ HRESULT __cdecl wined3d_device_get_palette_entries(struct wined3d_device *device UINT palette_idx, PALETTEENTRY *entries); struct wined3d_shader * __cdecl wined3d_device_get_pixel_shader(const struct wined3d_device *device); void __cdecl wined3d_device_get_primitive_type(struct wined3d_device *device, WINED3DPRIMITIVETYPE *primitive_topology); -HRESULT __cdecl wined3d_device_get_ps_consts_b(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_ps_consts_b(const struct wined3d_device *device, UINT start_register, BOOL *constants, UINT bool_count); HRESULT __cdecl wined3d_device_get_ps_consts_f(struct wined3d_device *device, UINT start_register, float *constants, UINT vector4f_count);

1 0

Henri Verbeet : ddraw: Get rid of some unused macros.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: b741cd02c3645cbc18eb59a04d3c04447a08d8b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b741cd02c3645cbc18eb59a04… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 14 20:17:29 2011 +0200 ddraw: Get rid of some unused macros. --- dlls/ddraw/ddraw_private.h | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 7737b12..9721915 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -242,10 +242,6 @@ IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface7(IDirectDrawSurface7 IDirectDrawSurfaceImpl *unsafe_impl_from_IDirect3DTexture(IDirect3DTexture *iface) DECLSPEC_HIDDEN; IDirectDrawSurfaceImpl *unsafe_impl_from_IDirect3DTexture2(IDirect3DTexture2 *iface) DECLSPEC_HIDDEN; -/* Get the number of bytes per pixel for a given surface */ -#define PFGET_BPP(pf) (pf.dwFlags&DDPF_PALETTEINDEXED8?1:((pf.dwRGBBitCount+7)/8)) -#define GET_BPP(desc) PFGET_BPP(desc.ddpfPixelFormat) - #define DDRAW_INVALID_HANDLE ~0U enum ddraw_handle_type

1 0

Francois Gouget : po: Remove English strings from the Portuguese (Portugal) translation.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: 1a0b723876ddcbf00a1af1d6adf76b518335f9ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a0b723876ddcbf00a1af1d6a… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 15 10:54:24 2011 +0200 po: Remove English strings from the Portuguese (Portugal) translation. --- po/pt_PT.po | 152 ++++++++++++++++++++++------------------------------------- 1 files changed, 56 insertions(+), 96 deletions(-) diff --git a/po/pt_PT.po b/po/pt_PT.po index 428fef2..f4fc864 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -3508,7 +3508,7 @@ msgstr "Login do serviço falhou\n" #: winerror.mc:1226 msgid "Service start-hang\n" -msgstr "Service start-hang\n" +msgstr "" #: winerror.mc:1231 msgid "Invalid service lock\n" @@ -5181,7 +5181,7 @@ msgstr "Erro RPCInternal\n" #: winerror.mc:3251 msgid "RPC divide-by-zero\n" -msgstr "RPC divide-by-zero\n" +msgstr "" #: winerror.mc:3256 msgid "Address error\n" @@ -5189,15 +5189,15 @@ msgstr "Erro de endereço\n" #: winerror.mc:3261 msgid "Floating-point divide-by-zero\n" -msgstr "Floating-point divide-by-zero\n" +msgstr "" #: winerror.mc:3266 msgid "Floating-point underflow\n" -msgstr "Floating-point underflow\n" +msgstr "" #: winerror.mc:3271 msgid "Floating-point overflow\n" -msgstr "Floating-point overflow\n" +msgstr "" #: winerror.mc:3276 msgid "No more entries\n" @@ -5221,7 +5221,7 @@ msgstr "Handle de contexto estragado\n" #: winerror.mc:3301 msgid "Binding handle mismatch\n" -msgstr "Binding handle mismatch\n" +msgstr "" #: winerror.mc:3306 msgid "Cannot get call handle\n" @@ -5643,8 +5643,6 @@ msgid "" "The specified installation package could not be opened. Please check the " "file path and try again." msgstr "" -"The specified installation package could not be opened. Please check the " -"file path and try again." #: msi.rc:28 msgid "path %s not found" @@ -5655,7 +5653,6 @@ msgid "insert disk %s" msgstr "insira o disco %s" #: msi.rc:30 -#, fuzzy msgid "" "Windows Installer %s\n" "\n" @@ -5687,35 +5684,6 @@ msgid "" "\t/help\n" "\t/?\n" msgstr "" -"Windows Installer %s\n" -"\n" -"Usage:\n" -"msiexec command {required parameter} [optional parammeter]\n" -"\n" -"Install a product:\n" -"\t/i {package|productcode} [property]\n" -"\t/package {package|productcode} [property]\n" -"\t/a package [property]\n" -"Repair an installation:\n" -"\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" -"Uninstall a product:\n" -"\t/uninstall {package|productcode} [property]\n" -"\t/x {package|productcode} [property]\n" -"Advertise a product:\n" -"\t/j[u|m] package [/t transform] [/g languageid]\n" -"Apply a patch:\n" -"\t/p patchpackage [property]\n" -"\t/p patchpackage /a package [property]\n" -"Log and UI Modifiers for above commands:\n" -"\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -"\t/q{|n|b|r|f|n+|b+|b-}\n" -"Register MSI Service:\n" -"\t/y\n" -"Unregister MSI Service:\n" -"\t/z\n" -"Display this help:\n" -"\t/help\n" -"\t/?\n" #: msi.rc:57 msgid "enter which folder contains %s" @@ -6487,7 +6455,7 @@ msgstr "Explorador de Internet Wine" #: shdoclc.rc:30 msgid "&w&bPage &p" -msgstr "&w&bPage &p" +msgstr "" #: shell32.rc:27 shell32.rc:42 shell32.rc:119 shell32.rc:159 taskmgr.rc:65 #: taskmgr.rc:110 taskmgr.rc:252 @@ -8017,13 +7985,10 @@ msgid "" "Not Yet Implemented\n" "\n" msgstr "" -"Not Yet Implemented\n" -"\n" #: attrib.rc:28 cmd.rc:301 -#, fuzzy msgid "%s: File Not Found\n" -msgstr "%s : File Not Found\n" +msgstr "" #: attrib.rc:47 msgid "" @@ -8512,16 +8477,12 @@ msgid "" "PUSHD <directoryname> saves the current directory onto a\n" "stack, and then changes the current directory to the supplied one.\n" msgstr "" -"PUSHD <directoryname> saves the current directory onto a\n" -"stack, and then changes the current directory to the supplied one.\n" #: cmd.rc:223 msgid "" "POPD changes current directory to the last one saved with\n" "PUSHD.\n" msgstr "" -"POPD changes current directory to the last one saved with\n" -"PUSHD.\n" #: cmd.rc:231 msgid "" @@ -8551,7 +8512,7 @@ msgstr "" #: cmd.rc:244 msgid "MORE displays output of files or piped input in pages.\n" -msgstr "MORE displays output of files or piped input in pages.\n" +msgstr "" #: cmd.rc:248 msgid "" @@ -8642,7 +8603,7 @@ msgstr "" #: cmd.rc:290 msgid "Are you sure" -msgstr "Are you sure" +msgstr "" #: cmd.rc:291 xcopy.rc:40 msgctxt "Yes key" @@ -8656,59 +8617,59 @@ msgstr "N" #: cmd.rc:293 msgid "File association missing for extension %s\n" -msgstr "File association missing for extension %s\n" +msgstr "" #: cmd.rc:294 msgid "No open command associated with file type '%s'\n" -msgstr "No open command associated with file type '%s'\n" +msgstr "" #: cmd.rc:295 msgid "Overwrite %s" -msgstr "Overwrite %s" +msgstr "" #: cmd.rc:296 msgid "More..." -msgstr "More..." +msgstr "" #: cmd.rc:297 msgid "Line in Batch processing possibly truncated. Using:\n" -msgstr "Line in Batch processing possibly truncated. Using:\n" +msgstr "" #: cmd.rc:299 msgid "Argument missing\n" -msgstr "Argument missing\n" +msgstr "" #: cmd.rc:300 msgid "Syntax error\n" -msgstr "Syntax error\n" +msgstr "" #: cmd.rc:302 msgid "No help available for %s\n" -msgstr "No help available for %s\n" +msgstr "" #: cmd.rc:303 msgid "Target to GOTO not found\n" -msgstr "Target to GOTO not found\n" +msgstr "" #: cmd.rc:304 msgid "Current Date is %s\n" -msgstr "Current Date is %s\n" +msgstr "" #: cmd.rc:305 msgid "Current Time is %s\n" -msgstr "Current Time is %s\n" +msgstr "" #: cmd.rc:306 msgid "Enter new date: " -msgstr "Enter new date: " +msgstr "" #: cmd.rc:307 msgid "Enter new time: " -msgstr "Enter new time: " +msgstr "" #: cmd.rc:308 msgid "Environment variable %s not defined\n" -msgstr "Environment variable %s not defined\n" +msgstr "" #: cmd.rc:309 xcopy.rc:38 msgid "Failed to open '%s'\n" @@ -8716,7 +8677,7 @@ msgstr "Falhou ao abrir '%s'\n" #: cmd.rc:310 msgid "Cannot call batch label outside of a batch script\n" -msgstr "Cannot call batch label outside of a batch script\n" +msgstr "" #: cmd.rc:311 xcopy.rc:42 msgctxt "All key" @@ -8725,23 +8686,23 @@ msgstr "A" #: cmd.rc:312 msgid "%s, Delete" -msgstr "%s, Delete" +msgstr "" #: cmd.rc:313 msgid "Echo is %s\n" -msgstr "Echo is %s\n" +msgstr "" #: cmd.rc:314 msgid "Verify is %s\n" -msgstr "Verify is %s\n" +msgstr "" #: cmd.rc:315 msgid "Verify must be ON or OFF\n" -msgstr "Verify must be ON or OFF\n" +msgstr "" #: cmd.rc:316 msgid "Parameter error\n" -msgstr "Parameter error\n" +msgstr "" #: cmd.rc:317 msgid "" @@ -8749,21 +8710,18 @@ msgid "" "Volume Serial Number is %04x-%04x\n" "\n" msgstr "" -"Volume in drive %c is %s\n" -"Volume Serial Number is %04x-%04x\n" -"\n" #: cmd.rc:318 msgid "Volume label (11 characters, ENTER for none)?" -msgstr "Volume label (11 characters, ENTER for none)?" +msgstr "" #: cmd.rc:319 msgid "PATH not found\n" -msgstr "PATH not found\n" +msgstr "" #: cmd.rc:320 msgid "Press Return key to continue: " -msgstr "Press Return key to continue: " +msgstr "" #: cmd.rc:321 msgid "Wine Command Prompt" @@ -8771,15 +8729,15 @@ msgstr "Wine Command Prompt" #: cmd.rc:322 msgid "CMD Version %s\n" -msgstr "CMD Version %s\n" +msgstr "" #: cmd.rc:323 msgid "More? " -msgstr "More? " +msgstr "" #: cmd.rc:324 msgid "The input line is too long.\n" -msgstr "The input line is too long.\n" +msgstr "" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" @@ -10049,6 +10007,7 @@ msgstr "" "condições; execute 'start /L' para detalhes.\n" #: start.rc:64 +#, fuzzy msgid "" "start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" "This program is free software; you can redistribute it and/or\n" @@ -10096,7 +10055,7 @@ msgstr "" #: start.rc:68 msgid "Could not translate the specified Unix filename to a DOS filename." -msgstr "Could not translate the specified Unix filename to a DOS filename." +msgstr "" #: taskkill.rc:27 msgid "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID]\n" @@ -11023,63 +10982,63 @@ msgstr "Texto da Caixa de Mensagem" #: winecfg.rc:112 msgid "Application Workspace" -msgstr "Application Workspace" +msgstr "" #: winecfg.rc:113 msgid "Window Frame" -msgstr "Window Frame" +msgstr "" #: winecfg.rc:114 msgid "Active Border" -msgstr "Active Border" +msgstr "" #: winecfg.rc:115 msgid "Inactive Border" -msgstr "Inactive Border" +msgstr "" #: winecfg.rc:116 msgid "Controls Shadow" -msgstr "Controls Shadow" +msgstr "" #: winecfg.rc:117 msgid "Gray Text" -msgstr "Gray Text" +msgstr "" #: winecfg.rc:118 msgid "Controls Highlight" -msgstr "Controls Highlight" +msgstr "" #: winecfg.rc:119 msgid "Controls Dark Shadow" -msgstr "Controls Dark Shadow" +msgstr "" #: winecfg.rc:120 msgid "Controls Light" -msgstr "Controls Light" +msgstr "" #: winecfg.rc:121 msgid "Controls Alternate Background" -msgstr "Controls Alternate Background" +msgstr "" #: winecfg.rc:122 msgid "Hot Tracked Item" -msgstr "Hot Tracked Item" +msgstr "" #: winecfg.rc:123 msgid "Active Title Bar Gradient" -msgstr "Active Title Bar Gradient" +msgstr "" #: winecfg.rc:124 msgid "Inactive Title Bar Gradient" -msgstr "Inactive Title Bar Gradient" +msgstr "" #: winecfg.rc:125 msgid "Menu Highlight" -msgstr "Menu Highlight" +msgstr "" #: winecfg.rc:126 msgid "Menu Bar" -msgstr "Menu Bar" +msgstr "" #: wineconsole.rc:26 msgid "Set &Defaults" @@ -11309,6 +11268,7 @@ msgid "Error while selecting new font." msgstr "Erro ao seleccionar novo tipo de letra." #: winefile.rc:99 +#, fuzzy msgid "Wine File Manager" msgstr "Winefile" @@ -11671,11 +11631,11 @@ msgstr "Uma página" #: wordpad.rc:167 msgid "Zoom in" -msgstr "Zoom in" +msgstr "" #: wordpad.rc:168 msgid "Zoom out" -msgstr "Zoom out" +msgstr "" #: wordpad.rc:170 msgid "Page"

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_ps_consts_i() const.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: 73a4deb0b84f6fcd66e3155b73e818e59f5740c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73a4deb0b84f6fcd66e3155b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 14 20:17:32 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_ps_consts_i() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0bcdf8d..ed43810 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3160,7 +3160,7 @@ HRESULT CDECL wined3d_device_set_ps_consts_i(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_ps_consts_i(struct wined3d_device *device, +HRESULT CDECL wined3d_device_get_ps_consts_i(const struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count) { UINT count = min(vector4i_count, MAX_CONST_I - start_register); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f439f73..6c31e14 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2235,7 +2235,7 @@ HRESULT __cdecl wined3d_device_get_ps_consts_b(const struct wined3d_device *devi UINT start_register, BOOL *constants, UINT bool_count); HRESULT __cdecl wined3d_device_get_ps_consts_f(struct wined3d_device *device, UINT start_register, float *constants, UINT vector4f_count); -HRESULT __cdecl wined3d_device_get_ps_consts_i(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_ps_consts_i(const struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count); HRESULT __cdecl wined3d_device_get_raster_status(struct wined3d_device *device, UINT swapchain_idx, WINED3DRASTER_STATUS *raster_status);

1 0

Frédéric Delanoy : cmd/tests: Add RENAME tests.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: cf826fe010f297eb1899591d60bf437677f5ca69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf826fe010f297eb1899591d6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 14 23:39:10 2011 +0200 cmd/tests: Add RENAME tests. --- programs/cmd/tests/test_builtins.cmd | 32 +++++++++++++++++++++++++++++- programs/cmd/tests/test_builtins.cmd.exp | 12 ++++++++++- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index cd30e4f..35ab181 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -879,7 +879,37 @@ rmdir "foo:" cd .. rmdir "foo bar" -echo ----------- Testing mkdir ----------- +echo ------------ Testing rename ------------ +mkdir foobar & cd foobar +echo ... ren and rename are synonymous ... +echo > foo +rename foo bar +if exist foo echo foo should be renamed! +if exist bar echo foo renamed to bar +ren bar foo +if exist bar echo bar should be renamed! +if exist foo echo bar renamed to foo +echo ... name collision ... +echo foo>foo +echo bar>bar +ren foo bar 2> nul +type foo +type bar +rem no-op +ren foo foo +mkdir baz +ren foo baz\abc +echo ... rename in other directory ... +if not exist baz\abc ( + echo rename impossible in other directory + if exist foo echo original file still present +) else ( + echo shouldn't rename in other directory! + if not exist foo echo original file not present anymore +) +cd .. & rd /s/q foobar + +echo ------------ Testing mkdir ------------ call :setError 0 echo ... md and mkdir are synonymous ... mkdir foobar diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 19536fe..31b1780 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -594,7 +594,17 @@ r.test not found after delete, good del /q * succeeded on file1 del /q * succeeded on file2.dat ------------ Testing del /s -------------- ------------ Testing mkdir ----------- +------------ Testing rename ------------ +... ren and rename are synonymous ... +foo renamed to bar +bar renamed to foo +... name collision ... +foo +bar +... rename in other directory ... +(a)todo_wine@rename impossible in other directory +(a)todo_wine@original file still present +------------ Testing mkdir ------------ ... md and mkdir are synonymous ... 0 0

1 0

Henri Verbeet : wined3d: Flush after surface updates.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: 8009a4947b35ef69923531039f5c7c159f6203c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8009a4947b35ef69923531039… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 14 20:17:30 2011 +0200 wined3d: Flush after surface updates. This is similar to 5d1d07abcf3deab4397a0008ae8c44493a721c6a. We need to flush to ensure resource updates are visible in other contexts, since otherwise GL doesn't make any ordering guarantees between contexts. --- dlls/wined3d/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9116f5f..22f194a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2436,6 +2436,9 @@ void surface_upload_data(const struct wined3d_surface *surface, const struct win LEAVE_GL(); + if (wined3d_settings.strict_draw_ordering) + wglFlush(); + if (gl_info->quirks & WINED3D_QUIRK_FBO_TEX_UPDATE) { struct wined3d_device *device = surface->resource.device;

1 0

Henri Verbeet : ddraw: Get rid of the surfaces field in IDirectDrawImpl.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: f60b54d952d85e300eeb7142a80320436fa18c8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f60b54d952d85e300eeb7142a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 14 20:17:28 2011 +0200 ddraw: Get rid of the surfaces field in IDirectDrawImpl. --- dlls/ddraw/ddraw.c | 1 - dlls/ddraw/ddraw_private.h | 1 - dlls/ddraw/main.c | 5 ++--- dlls/ddraw/surface.c | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f981cf5..53230cb 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2633,7 +2633,6 @@ static HRESULT ddraw_create_surface(IDirectDrawImpl *This, DDSURFACEDESC2 *pDDSD } /* Increase the surface counter, and attach the surface */ - InterlockedIncrement(&This->surfaces); list_add_head(&This->surface_list, &(*ppSurf)->surface_list_entry); TRACE("Created surface %p.\n", *ppSurf); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index e0706fc..7737b12 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -114,7 +114,6 @@ struct IDirectDrawImpl * because of IParent */ struct list surface_list; - LONG surfaces; /* FVF management */ struct FvfToDecl *decls; diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 38f4814..b3c19e7 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -960,9 +960,8 @@ DllMain(HINSTANCE hInstDLL, ERR("(%p) EnumSurfaces failed, prepare for trouble\n", ddraw); } - /* Check the surface count */ - if(ddraw->surfaces > 0) - ERR("DDraw %p still has %d surfaces attached\n", ddraw, ddraw->surfaces); + if (!list_empty(&ddraw->surface_list)) + ERR("DDraw %p still has surfaces attached.\n", ddraw); /* Release all hanging references to destroy the objects. This * restores the screen mode too diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 10d9dc4..1b6d6ff 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5098,7 +5098,6 @@ static void STDMETHODCALLTYPE ddraw_surface_wined3d_object_destroyed(void *paren ddraw_free_handle(&surface->ddraw->d3ddevice->handle_table, surface->Handle - 1, DDRAW_HANDLE_SURFACE); /* Reduce the ddraw surface count. */ - InterlockedDecrement(&surface->ddraw->surfaces); list_remove(&surface->surface_list_entry); HeapFree(GetProcessHeap(), 0, surface);

1 0

Alexandre Julliard : winex11: Remove the XRender support in the X11 driver StretchBlt implementation.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: 498e3cf2a1653a5519ab77b8022f3ac23d11ce10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=498e3cf2a1653a5519ab77b80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 15 13:22:31 2011 +0200 winex11: Remove the XRender support in the X11 driver StretchBlt implementation. --- dlls/winex11.drv/bitblt.c | 11 ++--- dlls/winex11.drv/x11drv.h | 3 - dlls/winex11.drv/xrender.c | 106 -------------------------------------------- 3 files changed, 4 insertions(+), 116 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index ebd3f38..baf5f89 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1404,13 +1404,10 @@ BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, if (physDevDst != physDevSrc) X11DRV_CoerceDIBSection( physDevSrc, DIB_Status_GdiMod ); - if(!X11DRV_XRender_GetSrcAreaStretch( physDevSrc, physDevDst, src_pixmap, tmpGC, src, dst )) - { - if (fStretch) - BITBLT_GetSrcAreaStretch( physDevSrc, physDevDst, src_pixmap, tmpGC, src, dst ); - else - BITBLT_GetSrcArea( physDevSrc, physDevDst, src_pixmap, tmpGC, &src->visrect ); - } + if (fStretch) + BITBLT_GetSrcAreaStretch( physDevSrc, physDevDst, src_pixmap, tmpGC, src, dst ); + else + BITBLT_GetSrcArea( physDevSrc, physDevDst, src_pixmap, tmpGC, &src->visrect ); execute_rop( physDevDst, src_pixmap, tmpGC, &dst->visrect, rop ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index c38ed78..b7b99e8 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -305,9 +305,6 @@ extern const struct gdi_dc_funcs *X11DRV_XRender_Init(void) DECLSPEC_HIDDEN; extern void X11DRV_XRender_Finalize(void) DECLSPEC_HIDDEN; extern void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *physBitmap, int width, int height) DECLSPEC_HIDDEN; extern BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, int bits_pixel, const DIBSECTION *dib) DECLSPEC_HIDDEN; -BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst, - Pixmap pixmap, GC gc, - const struct bitblt_coords *src, const struct bitblt_coords *dst ) DECLSPEC_HIDDEN; extern Drawable get_glxdrawable(X11DRV_PDEVICE *physDev) DECLSPEC_HIDDEN; extern BOOL destroy_glxpixmap(Display *display, XID glxpixmap) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 036ab39..ae3940d 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2662,106 +2662,6 @@ void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *physBitmap, wine_tsx11_unlock(); } -BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst, - Pixmap pixmap, GC gc, - const struct bitblt_coords *src, const struct bitblt_coords *dst ) -{ - BOOL stretch = (src->width != dst->width) || (src->height != dst->height); - int width = dst->visrect.right - dst->visrect.left; - int height = dst->visrect.bottom - dst->visrect.top; - int x_src = physDevSrc->dc_rect.left + src->visrect.left; - int y_src = physDevSrc->dc_rect.top + src->visrect.top; - struct xrender_info *src_info = get_xrender_info(physDevSrc); - const WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(physDevDst->depth, physDevDst->color_shifts); - Picture src_pict=0, dst_pict=0, mask_pict=0; - BOOL use_repeat; - double xscale, yscale; - - XRenderPictureAttributes pa; - pa.subwindow_mode = IncludeInferiors; - pa.repeat = RepeatNone; - - TRACE("src depth=%d widthSrc=%d heightSrc=%d xSrc=%d ySrc=%d\n", - physDevSrc->depth, src->width, src->height, x_src, y_src); - TRACE("dst depth=%d widthDst=%d heightDst=%d\n", physDevDst->depth, dst->width, dst->height); - - if(!X11DRV_XRender_Installed) - { - TRACE("Not using XRender since it is not available or disabled\n"); - return FALSE; - } - - /* XRender can't handle palettes, so abort */ - if(X11DRV_PALETTE_XPixelToPalette) - return FALSE; - - /* XRender is of no use in this case */ - if((physDevDst->depth == 1) && (physDevSrc->depth > 1)) - return FALSE; - - /* Just use traditional X copy when the formats match and we don't need stretching */ - if((src_info->format->format == dst_format->format) && !stretch) - { - TRACE("Source and destination depth match and no stretching needed falling back to XCopyArea\n"); - wine_tsx11_lock(); - XCopyArea( gdi_display, physDevSrc->drawable, pixmap, gc, x_src, y_src, width, height, 0, 0); - wine_tsx11_unlock(); - return TRUE; - } - - use_repeat = use_source_repeat( physDevSrc ); - if (!use_repeat) - { - xscale = src->width / (double)dst->width; - yscale = src->height / (double)dst->height; - } - else xscale = yscale = 1; /* no scaling needed with a repeating source */ - - /* mono -> color */ - if(physDevSrc->depth == 1 && physDevDst->depth > 1) - { - XRenderColor fg, bg; - get_xrender_color(dst_format, physDevDst->textPixel, &fg); - get_xrender_color(dst_format, physDevDst->backgroundPixel, &bg); - - /* We use the source drawable as a mask */ - mask_pict = get_xrender_picture_source( physDevSrc, use_repeat ); - - /* Use backgroundPixel as the foreground color */ - EnterCriticalSection( &xrender_cs ); - src_pict = get_tile_pict(dst_format, &bg); - - /* Create a destination picture and fill it with textPixel color as the background color */ - wine_tsx11_lock(); - dst_pict = pXRenderCreatePicture(gdi_display, pixmap, dst_format->pict_format, CPSubwindowMode|CPRepeat, &pa); - pXRenderFillRectangle(gdi_display, PictOpSrc, dst_pict, &fg, 0, 0, width, height); - - xrender_mono_blit(src_pict, mask_pict, dst_pict, x_src, y_src, 0, 0, - xscale, yscale, width, height); - - if(dst_pict) pXRenderFreePicture(gdi_display, dst_pict); - wine_tsx11_unlock(); - LeaveCriticalSection( &xrender_cs ); - } - else /* color -> color (can be at different depths) or mono -> mono */ - { - if (physDevDst->depth == 32 && physDevSrc->depth < 32) mask_pict = get_no_alpha_mask(); - src_pict = get_xrender_picture_source( physDevSrc, use_repeat ); - - wine_tsx11_lock(); - dst_pict = pXRenderCreatePicture(gdi_display, - pixmap, dst_format->pict_format, - CPSubwindowMode|CPRepeat, &pa); - - xrender_blit(PictOpSrc, src_pict, mask_pict, dst_pict, - x_src, y_src, 0, 0, xscale, yscale, width, height); - - if(dst_pict) pXRenderFreePicture(gdi_display, dst_pict); - wine_tsx11_unlock(); - } - return TRUE; -} - static const struct gdi_dc_funcs xrender_funcs = { NULL, /* pAbortDoc */ @@ -2913,10 +2813,4 @@ BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, int bits_pixel, return FALSE; } -BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst, - Pixmap pixmap, GC gc, - const struct bitblt_coords *src, const struct bitblt_coords *dst ) -{ - return FALSE; -} #endif /* SONAME_LIBXRENDER */

1 0