wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Henri Verbeet : ddraw/tests: Avoid LPDIRECTDRAW7.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 8fd29034d02f06566358f219e33324cc6076e858 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fd29034d02f06566358f219e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 6 22:13:25 2012 +0100 ddraw/tests: Avoid LPDIRECTDRAW7. --- dlls/ddraw/tests/d3d.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 75d3792..147e48c 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -29,7 +29,7 @@ #include "d3d.h" #include "unknwn.h" -static LPDIRECTDRAW7 lpDD = NULL; +static IDirectDraw7 *lpDD; static LPDIRECT3D7 lpD3D = NULL; static IDirectDrawSurface7 *lpDDS; static IDirectDrawSurface7 *lpDDSdepth;

1 0

Henri Verbeet : ddraw: Avoid LPDIRECTDRAWCLIPPER.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 46524c8d7e21b6b86930a20f806c2c4f2cb5e798 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46524c8d7e21b6b86930a20f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 6 22:13:24 2012 +0100 ddraw: Avoid LPDIRECTDRAWCLIPPER. --- include/ddraw.h | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=46524c8d7e21b6b86930a…

1 0

Henri Verbeet : ddraw: Avoid LPDIRECTDRAWPALETTE.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 6eaf601dcecff03c46ff430733c930a932510aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eaf601dcecff03c46ff43073… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 6 22:13:23 2012 +0100 ddraw: Avoid LPDIRECTDRAWPALETTE. --- include/ddraw.h | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6eaf601dcecff03c46ff4…

1 0

Jacek Caban : mshtml: Ignore one more property change notification to fix some IE installations.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: 42557724400df6260172d7690326cbae606378ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=42557724400df6260172d7690… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 6 16:56:47 2012 +0100 mshtml: Ignore one more property change notification to fix some IE installations. --- dlls/mshtml/tests/htmldoc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 4de1998..849b517 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -940,6 +940,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D case 3000024: case 3000025: case 3000026: + case 3000027: case 3000028: case 3000029: case 3000030:

1 0

Hans Leidekker : msi: Avoid a crash when target paths have not yet been resolved.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: cfadbddcafa2b2ca3f515ac4d10c7e1b460a402b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfadbddcafa2b2ca3f515ac4d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 6 15:20:02 2012 +0100 msi: Avoid a crash when target paths have not yet been resolved. --- dlls/msi/format.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 0bfd566..033f69c 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -221,7 +221,8 @@ static WCHAR *deformat_component( FORMAT *format, FORMSTR *str, int *ret_len ) else ret = strdupW( msi_get_target_folder( format->package, comp->Directory ) ); - *ret_len = strlenW( ret ); + if (ret) *ret_len = strlenW( ret ); + else *ret_len = 0; msi_free( key ); return ret; } @@ -238,14 +239,12 @@ static WCHAR *deformat_file( FORMAT *format, FORMSTR *str, BOOL shortname, int * if (!(file = msi_get_loaded_file( format->package, key ))) goto done; if (!shortname) { - ret = strdupW( file->TargetPath ); - len = strlenW( ret ); + if ((ret = strdupW( file->TargetPath ))) len = strlenW( ret ); goto done; } if ((len = GetShortPathNameW(file->TargetPath, NULL, 0)) <= 0) { - ret = strdupW( file->TargetPath ); - len = strlenW( ret ); + if ((ret = strdupW( file->TargetPath ))) len = strlenW( ret ); goto done; } len++;

1 0

Dmitry Timoshkov : gdiplus: Allocate a copy of the graphics transformation matrix on the stack instead of cloning it .
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: fa184bc2c2ff2b597c797c69bdea1980355df5f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa184bc2c2ff2b597c797c69b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 6 17:39:18 2012 +0800 gdiplus: Allocate a copy of the graphics transformation matrix on the stack instead of cloning it. --- dlls/gdiplus/graphics.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e7b72b7..f364a64 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -312,7 +312,7 @@ static void transform_and_round_points(GpGraphics *graphics, POINT *pti, GpPointF *ptf, INT count) { REAL scale_x, scale_y; - GpMatrix *matrix; + GpMatrix matrix; int i; scale_x = units_to_pixels(1.0, graphics->unit, graphics->xres); @@ -325,10 +325,9 @@ static void transform_and_round_points(GpGraphics *graphics, POINT *pti, scale_y *= graphics->scale; } - GdipCloneMatrix(graphics->worldtrans, &matrix); - GdipScaleMatrix(matrix, scale_x, scale_y, MatrixOrderAppend); - GdipTransformMatrixPoints(matrix, ptf, count); - GdipDeleteMatrix(matrix); + matrix = *graphics->worldtrans; + GdipScaleMatrix(&matrix, scale_x, scale_y, MatrixOrderAppend); + GdipTransformMatrixPoints(&matrix, ptf, count); for(i = 0; i < count; i++){ pti[i].x = gdip_round(ptf[i].X);

1 0

Dmitry Timoshkov : gdiplus: Add support for extra transformation in GdipMeasureDriverString and GdipDrawDriverString .
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: 12340af3f9234186116663a70fa8d1fb85adc013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12340af3f9234186116663a70… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 6 17:38:23 2012 +0800 gdiplus: Add support for extra transformation in GdipMeasureDriverString and GdipDrawDriverString. --- dlls/gdiplus/graphics.c | 34 ++++++++++++++++++---------------- 1 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b3eaa86d..e7b72b7 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2166,7 +2166,8 @@ void get_log_fontW(const GpFont *font, GpGraphics *graphics, LOGFONTW *lf) } static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, - GDIPCONST GpStringFormat *format, HFONT *hfont) + GDIPCONST GpStringFormat *format, HFONT *hfont, + GDIPCONST GpMatrix *matrix) { HDC hdc = CreateCompatibleDC(0); GpPointF pt[3]; @@ -2193,6 +2194,11 @@ static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, pt[1].Y = 0.0; pt[2].X = 0.0; pt[2].Y = 1.0; + if (matrix) + { + GpMatrix xform = *matrix; + GdipTransformMatrixPoints(&xform, pt, 3); + } if (graphics) GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); angle = -gdiplus_atan2((pt[1].Y - pt[0].Y), (pt[1].X - pt[0].X)); @@ -5052,7 +5058,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, if (scaled_rect.Width < 0.5) return Ok; /* doesn't fit */ } - get_font_hfont(graphics, font, stringFormat, &gdifont); + get_font_hfont(graphics, font, stringFormat, &gdifont, NULL); oldfont = SelectObject(hdc, gdifont); for (i=0; i<stringFormat->range_count; i++) @@ -5182,7 +5188,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, if (scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; if (scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; - get_font_hfont(graphics, font, format, &gdifont); + get_font_hfont(graphics, font, format, &gdifont, NULL); oldfont = SelectObject(hdc, gdifont); bounds->X = rect->X; @@ -5369,7 +5375,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string SelectClipRgn(hdc, rgn); } - get_font_hfont(graphics, font, format, &gdifont); + get_font_hfont(graphics, font, format, &gdifont, NULL); SelectObject(hdc, gdifont); args.graphics = graphics; @@ -6325,10 +6331,7 @@ GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics *graphics, GDIPCONST UINT if (flags & unsupported_flags) FIXME("Ignoring flags %x\n", flags & unsupported_flags); - if (matrix) - FIXME("Ignoring matrix\n"); - - get_font_hfont(graphics, font, NULL, &hfont); + get_font_hfont(graphics, font, NULL, &hfont, matrix); hdc = CreateCompatibleDC(0); SelectObject(hdc, hfont); @@ -6341,6 +6344,11 @@ GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics *graphics, GDIPCONST UINT pt[1].Y = 0.0; pt[2].X = 0.0; pt[2].Y = 1.0; + if (matrix) + { + GpMatrix xform = *matrix; + GdipTransformMatrixPoints(&xform, pt, 3); + } GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); @@ -6417,9 +6425,6 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 if (flags & unsupported_flags) FIXME("Ignoring flags %x\n", flags & unsupported_flags); - if (matrix) - FIXME("Ignoring matrix\n"); - if (!(flags & DriverStringOptionsCmapLookup)) eto_flags |= ETO_GLYPH_INDEX; @@ -6430,7 +6435,7 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 pt = positions[0]; GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, &pt, 1); - get_font_hfont(graphics, font, format, &hfont); + get_font_hfont(graphics, font, format, &hfont, matrix); SelectObject(graphics->hdc, hfont); SetTextAlign(graphics->hdc, TA_BASELINE|TA_LEFT); @@ -6476,9 +6481,6 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI if (flags & unsupported_flags) FIXME("Ignoring flags %x\n", flags & unsupported_flags); - if (matrix) - FIXME("Ignoring matrix\n"); - pti = GdipAlloc(sizeof(POINT) * length); if (!pti) return OutOfMemory; @@ -6505,7 +6507,7 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI GdipFree(real_positions); } - get_font_hfont(graphics, font, format, &hfont); + get_font_hfont(graphics, font, format, &hfont, matrix); hdc = CreateCompatibleDC(0); SelectObject(hdc, hfont);

1 0

Detlef Riekenberg : mstask/tests: Add tests for GetTargetComputer.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: 48ddbde74683a7a58aa4e73cb7fd60197d1df0c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ddbde74683a7a58aa4e73cb… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 6 00:20:13 2012 +0100 mstask/tests: Add tests for GetTargetComputer. --- dlls/mstask/tests/task_scheduler.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index 2de0e16..98556be 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -102,10 +102,43 @@ static void test_Activate(void) return; } +static void test_GetTargetComputer(void) +{ + HRESULT hres; + WCHAR *oldname; + + /* Create TaskScheduler */ + hres = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, + &IID_ITaskScheduler, (void **) &test_task_scheduler); + ok(hres == S_OK, "CTaskScheduler CoCreateInstance failed: %08x\n", hres); + if (hres != S_OK) + { + skip("Failed to create task scheduler.\n"); + return; + } + + if (0) + { + /* This crashes on w2k */ + hres = ITaskScheduler_GetTargetComputer(test_task_scheduler, NULL); + ok(hres == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hres); + } + + hres = ITaskScheduler_GetTargetComputer(test_task_scheduler, &oldname); + ok((hres == S_OK) && oldname && oldname[0] == '\\' && oldname[1] == '\\' && oldname[2], + "got 0x%x and %s (expected S_OK and an unc name)\n", hres, wine_dbgstr_w(oldname)); + + CoTaskMemFree(oldname); + + ITaskScheduler_Release(test_task_scheduler); + return; +} + START_TEST(task_scheduler) { CoInitialize(NULL); test_NewWorkItem(); test_Activate(); + test_GetTargetComputer(); CoUninitialize(); }

1 0

Detlef Riekenberg : mstask: Implement GetTargetComputer.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: 493d85898889e4d67e1d2e65c8fb6e7abdef7cae URL: http://source.winehq.org/git/wine.git/?a=commit;h=493d85898889e4d67e1d2e65c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 6 00:20:12 2012 +0100 mstask: Implement GetTargetComputer. --- dlls/mstask/task_scheduler.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index 1d2ac21..44609b8 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -93,8 +93,30 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_GetTargetComputer( ITaskScheduler* iface, LPWSTR *ppwszComputer) { - FIXME("%p, %p: stub\n", iface, ppwszComputer); - return E_NOTIMPL; + TaskSchedulerImpl *This = impl_from_ITaskScheduler(iface); + LPWSTR buffer; + DWORD len = MAX_COMPUTERNAME_LENGTH + 1; /* extra space for the zero */ + + TRACE("(%p)->(%p)\n", This, ppwszComputer); + + if (!ppwszComputer) + return E_INVALIDARG; + + /* extra space for two '\' and a zero */ + buffer = CoTaskMemAlloc((MAX_COMPUTERNAME_LENGTH + 3) * sizeof(WCHAR)); + if (buffer) + { + buffer[0] = '\\'; + buffer[1] = '\\'; + if (GetComputerNameW(buffer + 2, &len)) + { + *ppwszComputer = buffer; + return S_OK; + } + CoTaskMemFree(buffer); + } + *ppwszComputer = NULL; + return HRESULT_FROM_WIN32(GetLastError()); } static HRESULT WINAPI MSTASK_ITaskScheduler_Enum(

1 0

Alexandre Julliard : user32: Force refreshing the non-client area when the window surface is changed.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: d2607ff6c9390d47e591657074188700fadfece6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2607ff6c9390d47e59165707… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 6 14:52:28 2012 +0100 user32: Force refreshing the non-client area when the window surface is changed. --- dlls/user32/winpos.c | 6 +++--- server/window.c | 8 -------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 5a2f1f2..eda5b78 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2025,6 +2025,8 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, } old_width = win->rectClient.right - win->rectClient.left; old_visible_rect = win->visible_rect; + old_surface = win->surface; + if (old_surface != new_surface) swp_flags |= SWP_FRAMECHANGED; /* force refreshing non-client area */ SERVER_START_REQ( set_window_pos ) { @@ -2055,7 +2057,6 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, win->rectWindow = *window_rect; win->rectClient = *client_rect; win->visible_rect = visible_rect; - old_surface = win->surface; win->surface = new_surface; surface_win = wine_server_ptr_handle( reply->surface_win ); if (GetWindowLongW( win->parent, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) @@ -2076,8 +2077,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, if (ret) { if (surface_win) update_surface_region( surface_win ); - if (old_surface != new_surface || - ((swp_flags & SWP_AGG_NOPOSCHANGE) != SWP_AGG_NOPOSCHANGE) || + if (((swp_flags & SWP_AGG_NOPOSCHANGE) != SWP_AGG_NOPOSCHANGE) || (swp_flags & (SWP_HIDEWINDOW | SWP_SHOWWINDOW | SWP_STATECHANGED | SWP_FRAMECHANGED))) invalidate_dce( win, &old_window_rect ); } diff --git a/server/window.c b/server/window.c index 368171f..fc40d55 100644 --- a/server/window.c +++ b/server/window.c @@ -1724,14 +1724,6 @@ static void set_window_pos( struct window *win, struct window *previous, client_rect->bottom - old_client_rect.bottom != y_offset || !valid_rects || memcmp( &valid_rects[0], client_rect, sizeof(*client_rect) )); - /* if part of the non-client area was exposed, consider it changed */ - if (exposed_rgn && !frame_changed) - { - get_region_extents( exposed_rgn, &rect ); - offset_rect( &rect, client_rect->left, client_rect->top ); - frame_changed = (rect.left < client_rect->left || rect.top < client_rect->top || - rect.right > client_rect->right || rect.bottom > client_rect->bottom); - } } if (frame_changed || client_changed)

1 0

Jason Edmeades : attrib: Remove redundant code.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: 458e573584801dee7d7f961d212ffda698a11960 URL: http://source.winehq.org/git/wine.git/?a=commit;h=458e573584801dee7d7f961d2… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Mon Nov 5 22:17:21 2012 +0000 attrib: Remove redundant code. --- programs/attrib/attrib.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index e2cec36..443a0c0 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -289,8 +289,6 @@ int wmain(int argc, WCHAR *argv[]) } else if (param[0] == '/') { if (((param[1] == 'D') || (param[1] == 'd')) && !param[2]) { attrib_includedirs = TRUE; - } else if (((param[1] == 'R') || (param[1] == 'r')) && !param[2]) { - WINE_FIXME("Option /R not yet supported\n"); } else if (((param[1] == 'S') || (param[1] == 's')) && !param[2]) { attrib_recurse = TRUE; } else {

1 0

Jason Edmeades : xcopy: Fix resource leak (coverity).
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: 4a1349023743b42fda02e96cdc0a6c5f4d716581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a1349023743b42fda02e96cd… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Mon Nov 5 21:53:39 2012 +0000 xcopy: Fix resource leak (coverity). --- programs/xcopy/xcopy.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index cec0828..ffd2c56 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -627,6 +627,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, /* Find next one */ findres = FindNextFileW(h, finddata); } + FindClose(h); } cleanup:

1 0

Jason Edmeades : cmd: Fix for loops within for loops.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: ae4571fb796dc03d91a63d6c5c2a80a08f587578 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae4571fb796dc03d91a63d6c5… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Mon Nov 5 21:43:08 2012 +0000 cmd: Fix for loops within for loops. --- programs/cmd/batch.c | 35 ++++++++----- programs/cmd/builtins.c | 77 ++++++++++++++++++++------- programs/cmd/tests/test_builtins.cmd.exp | 20 ++++---- programs/cmd/wcmd.h | 17 +++++-- programs/cmd/wcmdmain.c | 84 +++++++++++++---------------- 5 files changed, 141 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ae4571fb796dc03d91a63…

1 0

Jason Edmeades : attrib: Add attrib /d support.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: f2699f9f6007ecaf019ec456fc09e274e3f136b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2699f9f6007ecaf019ec456f… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Fri Oct 26 00:25:30 2012 +0100 attrib: Add attrib /d support. --- programs/attrib/attrib.c | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index bce9c06..e2cec36 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -132,13 +132,15 @@ static int __cdecl ATTRIB_wprintf(const WCHAR *format, ...) * filespec [I] The filespec to search for * recurse [I] Whether to recurse (search subdirectories before * current directory) + * includedirs [I] Whether to set directory attributes as well * attrib_set [I] Attributes to set * attrib_clear [I] Attributes to clear * * Returns TRUE if at least one file displayed / modified * ========================================================================= */ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, - BOOL recurse, DWORD attrib_set, DWORD attrib_clear) + BOOL recurse, BOOL includedirs, + DWORD attrib_set, DWORD attrib_clear) { BOOL found = FALSE; WCHAR buffer[MAX_PATH]; @@ -174,7 +176,8 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, strcpyW(buffer, rootdir); strcatW(buffer, fd.cFileName); strcatW(buffer, slashW); - ATTRIB_processdirectory(buffer, filespec, recurse, attrib_set, attrib_clear); + ATTRIB_processdirectory(buffer, filespec, recurse, includedirs, + attrib_set, attrib_clear); } while (FindNextFileW(hff, &fd) != 0); } @@ -198,6 +201,9 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, if (!strcmpW(fd.cFileName, dot) || !strcmpW(fd.cFileName, dotdot)) continue; + if (!includedirs && (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + continue; + if (attrib_set || attrib_clear) { fd.dwFileAttributes &= ~attrib_clear; fd.dwFileAttributes |= attrib_set; @@ -248,7 +254,9 @@ int wmain(int argc, WCHAR *argv[]) DWORD attrib_set = 0; DWORD attrib_clear = 0; BOOL attrib_recurse = 0; - const WCHAR help_option[] = {'/','?','\0'}; + BOOL attrib_includedirs = FALSE; + static const WCHAR help_option[] = {'/','?','\0'}; + static const WCHAR wildcardsW[] = {'*','?','\0'}; int i = 1; BOOL found = FALSE; @@ -280,7 +288,7 @@ int wmain(int argc, WCHAR *argv[]) } } else if (param[0] == '/') { if (((param[1] == 'D') || (param[1] == 'd')) && !param[2]) { - WINE_FIXME("Option /D not yet supported\n"); + attrib_includedirs = TRUE; } else if (((param[1] == 'R') || (param[1] == 'r')) && !param[2]) { WINE_FIXME("Option /R not yet supported\n"); } else if (((param[1] == 'S') || (param[1] == 's')) && !param[2]) { @@ -305,9 +313,13 @@ int wmain(int argc, WCHAR *argv[]) name[0] = 0; } + /* If a directory is explicitly supplied on the command line, and no + wildcards are in the name, then allow it to be changed/displayed */ + if (strpbrkW(originalname, wildcardsW) == NULL) attrib_includedirs = TRUE; + /* Do all the processing based on the filename arg */ found = ATTRIB_processdirectory(curdir, name, attrib_recurse, - attrib_set, attrib_clear); + attrib_includedirs, attrib_set, attrib_clear); if (!found) { ATTRIB_wprintf(ATTRIB_LoadMessage(STRING_FILENOTFOUND), originalname); }

1 0

Jason Edmeades : attrib: Add support for attrib /s.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: e26c2a5691bdc86156ee4768ae121e79cc05802f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e26c2a5691bdc86156ee4768a… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Fri Oct 26 00:22:56 2012 +0100 attrib: Add support for attrib /s. --- programs/attrib/attrib.c | 191 +++++++++++++++++++++--------- programs/cmd/tests/test_builtins.cmd.exp | 4 +- 2 files changed, 136 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e26c2a5691bdc86156ee4…

1 0

Jason Edmeades : attrib: Support relative paths as args.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: 8e575940ad81688fe8cffc500f256a18ab8630c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e575940ad81688fe8cffc500… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Thu Oct 25 22:42:46 2012 +0100 attrib: Support relative paths as args. --- programs/attrib/attrib.c | 19 ++++++++++++++----- programs/cmd/tests/test_builtins.cmd.exp | 4 ++-- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index ca15980..25117cc 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -129,11 +129,11 @@ int wmain(int argc, WCHAR *argv[]) WIN32_FIND_DATAW fd; WCHAR flags[] = {' ',' ',' ',' ',' ',' ',' ',' ','\0'}; WCHAR name[MAX_PATH]; + WCHAR *namepart; WCHAR curdir[MAX_PATH]; DWORD attrib_set = 0; DWORD attrib_clear = 0; const WCHAR help_option[] = {'/','?','\0'}; - const WCHAR slash[] = {'\\','\0'}; const WCHAR start[] = {'*','\0'}; int i = 1; @@ -143,13 +143,11 @@ int wmain(int argc, WCHAR *argv[]) } /* By default all files from current directory are taken into account */ - GetCurrentDirectoryW(sizeof(curdir)/sizeof(WCHAR), curdir); - strcatW(curdir, slash); - strcpyW(name, curdir); - strcatW(name, start); + strcpyW(name, start); while (i < argc) { WCHAR *param = argv[i++]; + WINE_TRACE("Processing arg: '%s'\n", wine_dbgstr_w(param)); if ((param[0] == '+') || (param[0] == '-')) { DWORD attrib = 0; switch (param[1]) { @@ -178,6 +176,15 @@ int wmain(int argc, WCHAR *argv[]) } } + /* Name may be a relative or explicit path, so calculate curdir based on + current locations, stripping off the filename */ + WINE_TRACE("Supplied name: '%s'\n", wine_dbgstr_w(name)); + GetFullPathNameW(name, sizeof(curdir)/sizeof(WCHAR), curdir, &namepart); + WINE_TRACE("Result: '%s'\n", wine_dbgstr_w(curdir)); + strcpyW(name, curdir); + if (namepart) *namepart = 0x00; + + /* Search for files based on the location and filespec supplied */ hff = FindFirstFileW(name, &fd); if (hff == INVALID_HANDLE_VALUE) { ATTRIB_wprintf(ATTRIB_LoadMessage(STRING_FILENOTFOUND), name); @@ -195,6 +202,8 @@ int wmain(int argc, WCHAR *argv[]) fd.dwFileAttributes |= attrib_set; if (!fd.dwFileAttributes) fd.dwFileAttributes |= FILE_ATTRIBUTE_NORMAL; + strcpyW(name, curdir); + strcatW(name, fd.cFileName); SetFileAttributesW(name, fd.dwFileAttributes); } else { static const WCHAR fmt[] = {'%','1',' ',' ',' ',' ',' ','%','2','\n','\0'}; diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 8a7e3fa..42f578d 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -959,14 +959,14 @@ foo original contents Read-only file not deleted Read-only file forcibly deleted --- recursive behaviour -@todo_wine@A @pwd@\foobar\baz\level2@or_broken@A @pwd@\foobar\baz\level2@or_broken@A I @pwd@\foobar\baz\level2 +A @pwd@\foobar\baz\level2@or_broken@A @pwd@\foobar\baz\level2@or_broken@A I @pwd@\foobar\baz\level2 @todo_wine@A R @pwd@\foobar\level1@or_broken@A R @pwd@\foobar\level1@or_broken@A R I @pwd@\foobar\level1 @todo_wine@A R @pwd@\foobar\baz\level2@or_broken@A R @pwd@\foobar\baz\level2@or_broken@A R I @pwd@\foobar\baz\level2 A @pwd@\foobar\bar@or_broken@A @pwd@\foobar\bar@or_broken@A I @pwd@\foobar\bar --- folders processing @pwd@\foobar@or_broken@ @pwd@\foobar@or_broken@ I @pwd@\foobar @todo_wine@ R @pwd@\foobar\baz@or_broken@ R @pwd@\foobar\baz@or_broken@ @pwd@\foobar\baz@or_broken@ R I @pwd@\foobar\baz -@todo_wine@A @pwd@\foobar\baz\toto@or_broken@A @pwd@\foobar\baz\toto@or_broken@A I @pwd@\foobar\baz\toto +A @pwd@\foobar\baz\toto@or_broken@A @pwd@\foobar\baz\toto@or_broken@A I @pwd@\foobar\baz\toto toto lulu file created in read-only dir

1 0

Jason Edmeades : cmd: Don' t overflow parameter length when copying substring.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: 7c3f3d09dd589430060f3f0bee6d813e213c65f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c3f3d09dd589430060f3f0be… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Thu Oct 25 21:17:13 2012 +0100 cmd: Don't overflow parameter length when copying substring. --- programs/cmd/tests/test_builtins.cmd.exp | 2 +- programs/cmd/wcmdmain.c | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index aeaa14d..8a7e3fa 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -275,7 +275,7 @@ P0S q qwe er -@todo_wine@'ty'@or_broken@'' +'ty'@or_broken@'' 't'@or_broken@'' ert@or_broken@qwerty e@or_broken@qwerty diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 89c1327..534e5a6 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -730,6 +730,7 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, else if (copybytes < 0) copybytes = 0; WCMD_strsubstW(start, endOfVar + 1, startCopy, copybytes); } else { + substrlength = min(substrlength, len - (startCopy- thisVarContents + 1)); WCMD_strsubstW(start, endOfVar + 1, startCopy, substrlength); }

1 0

Detlef Riekenberg : schtasks: Add a stub schtasks.exe.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: 37035e53cd0f4dec9b89ffbee87f480abaae25c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37035e53cd0f4dec9b89ffbee… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Nov 4 23:02:06 2012 +0100 schtasks: Add a stub schtasks.exe. --- configure | 1 + configure.ac | 1 + programs/schtasks/Makefile.in | 7 +++++++ programs/schtasks/schtasks.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 3cd967c..bc31918 100755 --- a/configure +++ b/configure @@ -15933,6 +15933,7 @@ wine_fn_config_program rpcss enable_rpcss install wine_fn_config_program rundll.exe16 enable_win16 install wine_fn_config_program rundll32 enable_rundll32 install wine_fn_config_program sc enable_sc install +wine_fn_config_program schtasks enable_schtasks install wine_fn_config_program secedit enable_secedit install wine_fn_config_program servicemodelreg enable_servicemodelreg install wine_fn_config_program services enable_services install diff --git a/configure.ac b/configure.ac index d527c73..1adb6fd 100644 --- a/configure.ac +++ b/configure.ac @@ -3156,6 +3156,7 @@ WINE_CONFIG_PROGRAM(rpcss,,[install]) WINE_CONFIG_PROGRAM(rundll.exe16,enable_win16,[install]) WINE_CONFIG_PROGRAM(rundll32,,[install]) WINE_CONFIG_PROGRAM(sc,,[install]) +WINE_CONFIG_PROGRAM(schtasks,,[install]) WINE_CONFIG_PROGRAM(secedit,,[install]) WINE_CONFIG_PROGRAM(servicemodelreg,,[install]) WINE_CONFIG_PROGRAM(services,,[install]) diff --git a/programs/schtasks/Makefile.in b/programs/schtasks/Makefile.in new file mode 100644 index 0000000..e1747eb --- /dev/null +++ b/programs/schtasks/Makefile.in @@ -0,0 +1,7 @@ +MODULE = schtasks.exe +APPMODE = -mconsole -municode + +C_SRCS = \ + schtasks.c + +@MAKE_PROG_RULES@ diff --git a/programs/schtasks/schtasks.c b/programs/schtasks/schtasks.c new file mode 100644 index 0000000..a3af346 --- /dev/null +++ b/programs/schtasks/schtasks.c @@ -0,0 +1,33 @@ +/* + * Copyright 2012 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(schtasks); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Piotr Caban : msvcrt: Improved strtod_l precision.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: cbb94b1fcc73f50d1ec00121cb86060ab44b5bb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbb94b1fcc73f50d1ec00121c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 6 10:33:51 2012 +0100 msvcrt: Improved strtod_l precision. --- dlls/msvcrt/string.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 2a6a8ca..ad33f6a 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -291,7 +291,8 @@ double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t loca int exp=0, sign=1; const char *p; double ret; - BOOL found_digit = FALSE; + long double lret=1, expcnt = 10; + BOOL found_digit = FALSE, negexp; if (!MSVCRT_CHECK_PMT(str != NULL)) return 0; @@ -378,10 +379,16 @@ double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t loca _control87(MSVCRT__EM_DENORMAL|MSVCRT__EM_INVALID|MSVCRT__EM_ZERODIVIDE |MSVCRT__EM_OVERFLOW|MSVCRT__EM_UNDERFLOW|MSVCRT__EM_INEXACT, 0xffffffff); - if(exp>0) - ret = (double)sign*d*pow(10, exp); - else - ret = (double)sign*d/pow(10, -exp); + negexp = (exp < 0); + if(negexp) + exp = -exp; + while(exp) { + if(exp & 1) + lret *= expcnt; + exp /= 2; + expcnt = expcnt*expcnt; + } + ret = (long double)sign * (negexp ? d/lret : d*lret); _control87(fpcontrol, 0xffffffff);

1 0

Piotr Caban : msvcrt: Improved _wcstod_l precision.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: 505e5a162fb94e5a3789191121e5b5fd32687d11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=505e5a162fb94e5a378919112… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 6 10:33:40 2012 +0100 msvcrt: Improved _wcstod_l precision. --- dlls/msvcrt/wcs.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 32ee76b..08628d4 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -202,7 +202,8 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, int exp=0, sign=1; const MSVCRT_wchar_t *p; double ret; - BOOL found_digit = FALSE; + long double lret=1, expcnt = 10; + BOOL found_digit = FALSE, negexp; if (!MSVCRT_CHECK_PMT(str != NULL)) return 0; @@ -287,10 +288,16 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, _control87(MSVCRT__EM_DENORMAL|MSVCRT__EM_INVALID|MSVCRT__EM_ZERODIVIDE |MSVCRT__EM_OVERFLOW|MSVCRT__EM_UNDERFLOW|MSVCRT__EM_INEXACT, 0xffffffff); - if(exp>0) - ret = (double)sign*d*pow(10, exp); - else - ret = (double)sign*d/pow(10, -exp); + negexp = (exp < 0); + if(negexp) + exp = -exp; + while(exp) { + if(exp & 1) + lret *= expcnt; + exp /= 2; + expcnt = expcnt*expcnt; + } + ret = (long double)sign * (negexp ? d/lret : d*lret); _control87(fpcontrol, 0xffffffff);

1 0

Piotr Caban : msvcrt: Improved _atoflt_l precision.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: a3035679d5a43898b3bcb52bcebb716156040b8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3035679d5a43898b3bcb52bc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 6 10:33:20 2012 +0100 msvcrt: Improved _atoflt_l precision. --- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/string.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 77d30b2..da8e0a8 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -983,6 +983,7 @@ int pf_printf_w(puts_clbk_w, void*, const MSVCRT_wchar_t*, MSVCRT__locale_t, BOOL, BOOL, args_clbk, void*, __ms_va_list*) DECLSPEC_HIDDEN; printf_arg arg_clbk_valist(void*, int, int, __ms_va_list*) DECLSPEC_HIDDEN; +#define MSVCRT_FLT_MIN 1.175494351e-38F #define MSVCRT__OVERFLOW 3 #define MSVCRT__UNDERFLOW 4 diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 55e652f..2a6a8ca 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -514,13 +514,13 @@ int CDECL MSVCRT__atoflt_l( MSVCRT__CRT_FLOAT *value, char *str, MSVCRT__locale_ |MSVCRT__EM_OVERFLOW|MSVCRT__EM_UNDERFLOW|MSVCRT__EM_INEXACT, 0xffffffff); if(exp>0) - value->f = (float)sign*d*powf(10, exp); + value->f = (double)sign*d*pow(10, exp); else - value->f = (float)sign*d/powf(10, -exp); + value->f = (double)sign*d/pow(10, -exp); _control87(fpcontrol, 0xffffffff); - if((d && value->f==0.0) || isinf(value->f)) + if((d && value->f>-MSVCRT_FLT_MIN && value->f<MSVCRT_FLT_MIN) || isinf(value->f)) ret = exp > 0 ? MSVCRT__OVERFLOW : MSVCRT__UNDERFLOW; return ret;

1 0

Henri Verbeet : wined3d: Introduce a separate structure for the vs specific fields in struct glsl_shader_prog_link .
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: ffd5e3eb81193c1b9dbfe7be19faf25eccbb0e3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffd5e3eb81193c1b9dbfe7be1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 5 21:38:25 2012 +0100 wined3d: Introduce a separate structure for the vs specific fields in struct glsl_shader_prog_link. --- dlls/wined3d/glsl_shader.c | 70 ++++++++++++++++++++++++------------------- 1 files changed, 39 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 75fb7e4..192eba3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -100,24 +100,30 @@ struct shader_glsl_priv { const struct fragment_pipeline *fragment_pipe; }; +struct glsl_vs_program +{ + struct list shader_entry; + GLhandleARB id; + GLenum vertex_color_clamp; + GLint *uniform_f_locations; + GLint uniform_i_locations[MAX_CONST_I]; + GLint pos_fixup_location; +}; + /* Struct to maintain data about a linked GLSL program */ -struct glsl_shader_prog_link { - struct wine_rb_entry program_lookup_entry; - struct list vshader_entry; +struct glsl_shader_prog_link +{ + struct wine_rb_entry program_lookup_entry; + struct glsl_vs_program vs; struct list pshader_entry; GLhandleARB programId; - GLint *vuniformF_locations; GLint *puniformF_locations; - GLint vuniformI_locations[MAX_CONST_I]; GLint puniformI_locations[MAX_CONST_I]; - GLint posFixup_location; GLint np2Fixup_location; GLint bumpenvmat_location[MAX_TEXTURES]; GLint luminancescale_location[MAX_TEXTURES]; GLint luminanceoffset_location[MAX_TEXTURES]; GLint ycorrection_location; - GLenum vertex_color_clamp; - GLhandleARB vs_id; GLhandleARB ps_id; UINT constant_version; const struct ps_np2fixup_info *np2Fixup_info; @@ -737,10 +743,10 @@ static void shader_glsl_load_constants(const struct wined3d_context *context, /* Load DirectX 9 float constants/uniforms for vertex shader */ shader_glsl_load_constantsF(vshader, gl_info, state->vs_consts_f, - prog->vuniformF_locations, &priv->vconst_heap, priv->stack, constant_version); + prog->vs.uniform_f_locations, &priv->vconst_heap, priv->stack, constant_version); /* Load DirectX 9 integer constants/uniforms for vertex shader */ - shader_glsl_load_constantsI(vshader, gl_info, prog->vuniformI_locations, state->vs_consts_i, + shader_glsl_load_constantsI(vshader, gl_info, prog->vs.uniform_i_locations, state->vs_consts_i, stateBlock->changed.vertexShaderConstantsI & vshader->reg_maps.integer_constants); /* Load DirectX 9 boolean constants/uniforms for vertex shader */ @@ -749,7 +755,7 @@ static void shader_glsl_load_constants(const struct wined3d_context *context, /* Upload the position fixup params */ shader_get_position_fixup(context, state, position_fixup); - GL_EXTCALL(glUniform4fvARB(prog->posFixup_location, 1, position_fixup)); + GL_EXTCALL(glUniform4fvARB(prog->vs.pos_fixup_location, 1, position_fixup)); checkGLcall("glUniform4fvARB"); } @@ -4100,7 +4106,7 @@ static void add_glsl_program_entry(struct shader_glsl_priv *priv, struct glsl_sh { struct glsl_program_key key; - key.vs_id = entry->vs_id; + key.vs_id = entry->vs.id; key.ps_id = entry->ps_id; if (wine_rb_put(&priv->program_lookup, &key, &entry->program_lookup_entry) == -1) @@ -4128,16 +4134,16 @@ static void delete_glsl_program_entry(struct shader_glsl_priv *priv, const struc { struct glsl_program_key key; - key.vs_id = entry->vs_id; + key.vs_id = entry->vs.id; key.ps_id = entry->ps_id; wine_rb_remove(&priv->program_lookup, &key); GL_EXTCALL(glDeleteObjectARB(entry->programId)); - if (entry->vs_id) - list_remove(&entry->vshader_entry); + if (entry->vs.id) + list_remove(&entry->vs.shader_entry); if (entry->ps_id) list_remove(&entry->pshader_entry); - HeapFree(GetProcessHeap(), 0, entry->vuniformF_locations); + HeapFree(GetProcessHeap(), 0, entry->vs.uniform_f_locations); HeapFree(GetProcessHeap(), 0, entry->puniformF_locations); HeapFree(GetProcessHeap(), 0, entry); } @@ -4744,7 +4750,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, /* Create the entry */ entry = HeapAlloc(GetProcessHeap(), 0, sizeof(struct glsl_shader_prog_link)); entry->programId = programId; - entry->vs_id = vs_id; + entry->vs.id = vs_id; entry->ps_id = ps_id; entry->constant_version = 0; entry->np2Fixup_info = np2fixup_info; @@ -4791,7 +4797,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, } checkGLcall("glBindAttribLocationARB"); - list_add_head(&vshader->linked_programs, &entry->vshader_entry); + list_add_head(&vshader->linked_programs, &entry->vs.shader_entry); } /* Attach GLSL pshader */ @@ -4809,17 +4815,17 @@ static void set_glsl_shader_program(const struct wined3d_context *context, GL_EXTCALL(glLinkProgramARB(programId)); shader_glsl_validate_link(gl_info, programId); - entry->vuniformF_locations = HeapAlloc(GetProcessHeap(), 0, + entry->vs.uniform_f_locations = HeapAlloc(GetProcessHeap(), 0, sizeof(GLhandleARB) * gl_info->limits.glsl_vs_float_constants); for (i = 0; i < gl_info->limits.glsl_vs_float_constants; ++i) { snprintf(glsl_name, sizeof(glsl_name), "vs_c[%u]", i); - entry->vuniformF_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); + entry->vs.uniform_f_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); } for (i = 0; i < MAX_CONST_I; ++i) { snprintf(glsl_name, sizeof(glsl_name), "vs_i[%u]", i); - entry->vuniformI_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); + entry->vs.uniform_i_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); } entry->puniformF_locations = HeapAlloc(GetProcessHeap(), 0, sizeof(GLhandleARB) * gl_info->limits.glsl_ps_float_constants); @@ -4855,7 +4861,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, } } - entry->posFixup_location = GL_EXTCALL(glGetUniformLocationARB(programId, "posFixup")); + entry->vs.pos_fixup_location = GL_EXTCALL(glGetUniformLocationARB(programId, "posFixup")); entry->ycorrection_location = GL_EXTCALL(glGetUniformLocationARB(programId, "ycorrection")); checkGLcall("Find glsl program uniform locations"); @@ -4863,9 +4869,11 @@ static void set_glsl_shader_program(const struct wined3d_context *context, && pshader->u.ps.declared_in_count > vec4_varyings(3, gl_info)) { TRACE("Shader %d needs vertex color clamping disabled\n", programId); - entry->vertex_color_clamp = GL_FALSE; - } else { - entry->vertex_color_clamp = GL_FIXED_ONLY_ARB; + entry->vs.vertex_color_clamp = GL_FALSE; + } + else + { + entry->vs.vertex_color_clamp = GL_FIXED_ONLY_ARB; } /* Set the shader to allow uniform loading on it */ @@ -5015,13 +5023,13 @@ static void shader_glsl_select(const struct wined3d_context *context, enum wined BOOL useVS = vertex_mode == WINED3D_SHADER_MODE_SHADER; BOOL usePS = fragment_mode == WINED3D_SHADER_MODE_SHADER; - old_vertex_color_clamp = priv->glsl_program ? priv->glsl_program->vertex_color_clamp : GL_FIXED_ONLY_ARB; + old_vertex_color_clamp = priv->glsl_program ? priv->glsl_program->vs.vertex_color_clamp : GL_FIXED_ONLY_ARB; priv->fragment_pipe->enable_extension(gl_info, fragment_mode == WINED3D_SHADER_MODE_FFP); if (useVS || usePS) set_glsl_shader_program(context, device, usePS, useVS); else priv->glsl_program = NULL; - current_vertex_color_clamp = priv->glsl_program ? priv->glsl_program->vertex_color_clamp : GL_FIXED_ONLY_ARB; + current_vertex_color_clamp = priv->glsl_program ? priv->glsl_program->vs.vertex_color_clamp : GL_FIXED_ONLY_ARB; if (old_vertex_color_clamp != current_vertex_color_clamp) { @@ -5150,7 +5158,7 @@ static void shader_glsl_destroy(struct wined3d_shader *shader) struct glsl_vs_compiled_shader *gl_shaders = shader_data->gl_shaders.vs; LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, linked_programs, - struct glsl_shader_prog_link, vshader_entry) + struct glsl_shader_prog_link, vs.shader_entry) { delete_glsl_program_entry(priv, gl_info, entry); } @@ -5158,7 +5166,7 @@ static void shader_glsl_destroy(struct wined3d_shader *shader) for (i = 0; i < shader_data->num_gl_shaders; ++i) { TRACE("Deleting vertex shader %u.\n", gl_shaders[i].prgId); - if (priv->glsl_program && priv->glsl_program->vs_id == gl_shaders[i].prgId) + if (priv->glsl_program && priv->glsl_program->vs.id == gl_shaders[i].prgId) shader_glsl_select(context, WINED3D_SHADER_MODE_NONE, WINED3D_SHADER_MODE_NONE); GL_EXTCALL(glDeleteObjectARB(gl_shaders[i].prgId)); checkGLcall("glDeleteObjectARB"); @@ -5188,8 +5196,8 @@ static int glsl_program_key_compare(const void *key, const struct wine_rb_entry const struct glsl_shader_prog_link *prog = WINE_RB_ENTRY_VALUE(entry, const struct glsl_shader_prog_link, program_lookup_entry); - if (k->vs_id > prog->vs_id) return 1; - else if (k->vs_id < prog->vs_id) return -1; + if (k->vs_id > prog->vs.id) return 1; + else if (k->vs_id < prog->vs.id) return -1; if (k->ps_id > prog->ps_id) return 1; else if (k->ps_id < prog->ps_id) return -1;

1 0

Henri Verbeet : wined3d: Use the shader object ids as program key.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: b8bb2a4f85b0e36a033a0964a59080c2ec1e9592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8bb2a4f85b0e36a033a0964a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 5 21:38:24 2012 +0100 wined3d: Use the shader object ids as program key. --- dlls/wined3d/glsl_shader.c | 114 +++++++++++++++++++++---------------------- 1 files changed, 56 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8bb2a4f85b0e36a033a0…

1 0

Henri Verbeet : ddraw: Avoid LPDIRECTDRAWSURFACE.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: 2889ec6bb0b30b454cc13b6121cadf8e6110e623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2889ec6bb0b30b454cc13b612… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 5 21:38:23 2012 +0100 ddraw: Avoid LPDIRECTDRAWSURFACE. --- dlls/ddraw/tests/ddrawmodes.c | 4 +- dlls/ddraw/tests/dsurface.c | 16 ++++---- include/d3d.h | 21 ++++++----- include/ddraw.h | 74 +++++++++++++++++++++++----------------- 4 files changed, 63 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2889ec6bb0b30b454cc13…

1 0

Henri Verbeet : ddraw: Avoid LPDIRECTDRAWSURFACE2.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: b146861c362f163a8c3f6ee74ae9ac1f5779f0b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b146861c362f163a8c3f6ee74… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 5 21:38:22 2012 +0100 ddraw: Avoid LPDIRECTDRAWSURFACE2. --- dlls/ddraw/tests/dsurface.c | 6 +++--- include/ddraw.h | 19 +++++++++++-------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 513183f..400f2ea 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -776,8 +776,8 @@ static ULONG getref(IUnknown *iface) static void GetDDInterface_1(void) { + IDirectDrawSurface2 *dsurface2; LPDIRECTDRAWSURFACE dsurface; - LPDIRECTDRAWSURFACE2 dsurface2; DDSURFACEDESC surface; HRESULT ret; IDirectDraw2 *dd2; @@ -840,8 +840,8 @@ static void GetDDInterface_1(void) static void GetDDInterface_2(void) { + IDirectDrawSurface2 *dsurface2; LPDIRECTDRAWSURFACE dsurface; - LPDIRECTDRAWSURFACE2 dsurface2; DDSURFACEDESC surface; HRESULT ret; IDirectDraw2 *dd2; @@ -902,7 +902,7 @@ static void GetDDInterface_2(void) static void GetDDInterface_4(void) { IDirectDrawSurface4 *dsurface4; - LPDIRECTDRAWSURFACE2 dsurface2; + IDirectDrawSurface2 *dsurface2; DDSURFACEDESC2 surface; HRESULT ret; IDirectDraw2 *dd2; diff --git a/include/ddraw.h b/include/ddraw.h index 2ab7826..df4589c 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -1990,16 +1990,18 @@ DECLARE_INTERFACE_(IDirectDrawSurface2,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirectDrawSurface2 methods ***/ - STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE2 lpDDSAttachedSurface) PURE; + STDMETHOD(AddAttachedSurface)(THIS_ IDirectDrawSurface2 *attachment) PURE; STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE; - STDMETHOD(Blt)(THIS_ LPRECT lpDestRect, LPDIRECTDRAWSURFACE2 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE; + STDMETHOD(Blt)(THIS_ RECT *dst_rect, IDirectDrawSurface2 *src_surface, RECT *src_rect, + DWORD flags, DDBLTFX *fx) PURE; STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE; - STDMETHOD(BltFast)(THIS_ DWORD dwX, DWORD dwY, LPDIRECTDRAWSURFACE2 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans) PURE; - STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE2 lpDDSAttachedSurface) PURE; + STDMETHOD(BltFast)(THIS_ DWORD x, DWORD y, IDirectDrawSurface2 *src_surface, + RECT *src_rect, DWORD flags) PURE; + STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD flags, IDirectDrawSurface2 *attachment) PURE; STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE; STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD dwFlags, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpfnCallback) PURE; - STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE2 lpDDSurfaceTargetOverride, DWORD dwFlags) PURE; - STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS lpDDSCaps, LPDIRECTDRAWSURFACE2 *lplpDDAttachedSurface) PURE; + STDMETHOD(Flip)(THIS_ IDirectDrawSurface2 *dst_surface, DWORD flags) PURE; + STDMETHOD(GetAttachedSurface)(THIS_ DDSCAPS *caps, IDirectDrawSurface2 **attachment) PURE; STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE; STDMETHOD(GetCaps)(THIS_ LPDDSCAPS lpDDSCaps) PURE; STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER *lplpDDClipper) PURE; @@ -2020,9 +2022,10 @@ DECLARE_INTERFACE_(IDirectDrawSurface2,IUnknown) STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE; STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE; STDMETHOD(Unlock)(THIS_ LPVOID lpSurfaceData) PURE; - STDMETHOD(UpdateOverlay)(THIS_ LPRECT lpSrcRect, LPDIRECTDRAWSURFACE2 lpDDDestSurface, LPRECT lpDestRect, DWORD dwFlags, LPDDOVERLAYFX lpDDOverlayFx) PURE; + STDMETHOD(UpdateOverlay)(THIS_ RECT *src_rect, IDirectDrawSurface2 *dst_surface, RECT *dst_rect, + DWORD flags, DDOVERLAYFX *fx) PURE; STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD dwFlags) PURE; - STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE2 lpDDSReference) PURE; + STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD flags, IDirectDrawSurface2 *reference_surface) PURE; /* added in v2 */ STDMETHOD(GetDDInterface)(THIS_ LPVOID *lplpDD) PURE; STDMETHOD(PageLock)(THIS_ DWORD dwFlags) PURE;

1 0

← Newer
1
...
21
22
23
24
25
26
27
28
29
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 November 2012