March 2015 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Use the "sysval_semantic" field instead of " semantic_name" to recognize SV_POSITION.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: f9fafb36864f8783f00e0e7164dcbf308231e1ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9fafb36864f8783f00e0e716… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 24 09:38:24 2015 +0100 wined3d: Use the "sysval_semantic" field instead of "semantic_name" to recognize SV_POSITION. --- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 2 +- include/wine/wined3d.h | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0b307d3..a61d268 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4167,7 +4167,7 @@ static void shader_glsl_input_pack(const struct wined3d_shader *shader, struct w if (vertexprocessing == vertexshader) { - if (!strcmp(semantic_name, "SV_POSITION") && !semantic_idx) + if (input->sysval_semantic == WINED3D_SV_POSITION) shader_addline(buffer, "ps_in[%u]%s = vpos%s;\n", shader->u.ps.input_reg_map[input->register_idx], reg_mask, reg_mask); else diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f162fb5..31b391b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1045,7 +1045,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st { reg_maps->input_registers |= 1 << input_signature->elements[i].register_idx; if (shader_version.type == WINED3D_SHADER_TYPE_PIXEL - && !strcmp(input_signature->elements[i].semantic_name, "SV_POSITION")) + && input_signature->elements[i].sysval_semantic == WINED3D_SV_POSITION) reg_maps->vpos = 1; } } diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2348be8..dcf7212 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -767,6 +767,8 @@ enum wined3d_decl_usage enum wined3d_sysval_semantic { + WINED3D_SV_POSITION = 1, + WINED3D_SV_DEPTH = 0xffffffff, WINED3D_SV_TARGET0 = 0, WINED3D_SV_TARGET1 = 1,

1 0

André Hentschel : include: Add more header guards.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: 75fc891340daa7c9a06e8c41e545c13989410ce8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75fc891340daa7c9a06e8c41e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 23 21:33:35 2015 +0100 include: Add more header guards. --- include/aviriff.h | 5 +++++ include/knownfolders.h | 5 +++++ include/rasdlg.h | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/include/aviriff.h b/include/aviriff.h index d2cfa41..9fea63a 100644 --- a/include/aviriff.h +++ b/include/aviriff.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef AVIRIFF_H +#define AVIRIFF_H + /* All definitions here are packed structures of on-disk formats */ #include <pshpack2.h> @@ -322,3 +325,5 @@ typedef struct _avifieldindex_chunk { } AVIFIELDINDEX, * PAVIFIELDINDEX; #include <poppack.h> + +#endif /* AVIRIFF_H */ diff --git a/include/knownfolders.h b/include/knownfolders.h index 2fa5664..28e867c 100644 --- a/include/knownfolders.h +++ b/include/knownfolders.h @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef __WINE_KNOWNFOLDERS_H +#define __WINE_KNOWNFOLDERS_H + #ifdef DEFINE_KNOWN_FOLDER #undef DEFINE_KNOWN_FOLDER #endif @@ -140,3 +143,5 @@ DEFINE_KNOWN_FOLDER(FOLDERID_UsersLibraries, 0xa302545d, 0xdeff, 0x464b, DEFINE_KNOWN_FOLDER(FOLDERID_Videos, 0x18989b1d, 0x99b5, 0x455b, 0x84, 0x1c, 0xab, 0x7c, 0x74, 0xe4, 0xdd, 0xfc); DEFINE_KNOWN_FOLDER(FOLDERID_VideosLibrary, 0x491e922f, 0x5643, 0x4af4, 0xa7, 0xeb, 0x4e, 0x7a, 0x13, 0x8d, 0x81, 0x74); DEFINE_KNOWN_FOLDER(FOLDERID_Windows, 0xf38bf404, 0x1d43, 0x42f2, 0x93, 0x05, 0x67, 0xde, 0x0b, 0x28, 0xfc, 0x23); + +#endif /* __WINE_KNOWNFOLDERS_H */ diff --git a/include/rasdlg.h b/include/rasdlg.h index 7f2a6d8..6d2aa85 100644 --- a/include/rasdlg.h +++ b/include/rasdlg.h @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef _RASDLG_H_ +#define _RASDLG_H_ + #include <ras.h> typedef struct tagRASENTRYDLGW @@ -30,3 +33,5 @@ typedef struct tagRASENTRYDLGW ULONG_PTR reserved; ULONG_PTR reserved2; } RASENTRYDLGW; + +#endif /* _RASDLG_H_ */

1 0

Henri Verbeet : d3d10core/tests: Add a test for D3D10_APPEND_ALIGNED_ELEMENT.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: e72845e6483e4e4f29156c2b7ccd9ef154e2c3fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=e72845e6483e4e4f29156c2b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 24 09:38:27 2015 +0100 d3d10core/tests: Add a test for D3D10_APPEND_ALIGNED_ELEMENT. --- dlls/d3d10core/tests/device.c | 247 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 247 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e72845e6483e4e4f29156…

1 0

Vincent Povirk : gdiplus: Apply page scale to pen thickness.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: 6ee26aca16cdfdfa175108d28b49aca6aba7e1e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee26aca16cdfdfa175108d28… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 23 15:05:25 2015 -0500 gdiplus: Apply page scale to pen thickness. --- dlls/gdiplus/graphics.c | 1 + dlls/gdiplus/tests/graphics.c | 123 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 124 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7485a3c..34022cb 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -251,6 +251,7 @@ static INT prepare_dc(GpGraphics *graphics, GpPen *pen) (pt[1].Y - pt[0].Y) * (pt[1].Y - pt[0].Y)) / sqrt(2.0); width *= units_to_pixels(pen->width, pen->unit == UnitWorld ? graphics->unit : pen->unit, graphics->xres); + width *= graphics->scale; } if(pen->dash == DashStyleCustom){ diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index f237090..3ee3363 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3813,6 +3813,128 @@ static void test_transform(void) } } +static void test_pen_thickness(void) +{ + static const struct test_data + { + REAL res_x, res_y, scale; + GpUnit pen_unit, page_unit; + REAL pen_width; + INT cx, cy; + } td[] = + { + { 10.0, 10.0, 1.0, UnitPixel, UnitPixel, 1.0, 1, 1 }, + { 10.0, 10.0, 3.0, UnitPixel, UnitPixel, 2.0, 2, 2 }, + { 10.0, 10.0, 30.0, UnitPixel, UnitInch, 1.0, 1, 1 }, + { 10.0, 10.0, 1.0, UnitWorld, UnitPixel, 1.0, 1, 1 }, + { 10.0, 10.0, 3.0, UnitWorld, UnitPixel, 2.0, 6, 6 }, + { 10.0, 10.0, 2.0, UnitWorld, UnitInch, 1.0, 20, 20 }, + }; + GpStatus status; + int i, j; + GpGraphics *graphics; + union + { + GpBitmap *bitmap; + GpImage *image; + } u; + GpPen *pen; + GpPointF corner; + BitmapData bd; + INT min, max, size; + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + status = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat24bppRGB, NULL, &u.bitmap); + expect(Ok, status); + + status = GdipBitmapSetResolution(u.bitmap, td[i].res_x, td[i].res_y); + expect(Ok, status); + + status = GdipGetImageGraphicsContext(u.image, &graphics); + expect(Ok, status); + + status = GdipSetPageUnit(graphics, td[i].page_unit); + expect(Ok, status); + + status = GdipSetPageScale(graphics, td[i].scale); + expect(Ok, status); + + status = GdipCreatePen1(0xffffffff, td[i].pen_width, td[i].pen_unit, &pen); + expect(Ok, status); + + corner.X = corner.Y = 100.0; + status = GdipTransformPoints(graphics, CoordinateSpaceWorld, CoordinateSpaceDevice, &corner, 1); + expect(Ok, status); + + status = GdipDrawLine(graphics, pen, corner.X/2, 0, corner.X/2, corner.Y); + expect(Ok, status); + + status = GdipDrawLine(graphics, pen, 0, corner.Y/2, corner.X, corner.Y/2); + expect(Ok, status); + + status = GdipBitmapLockBits(u.bitmap, NULL, ImageLockModeRead, PixelFormat24bppRGB, &bd); + expect(Ok, status); + + min = -1; + max = -2; + + for (j=0; j<100; j++) + { + if (((BYTE*)bd.Scan0)[j*3] == 0xff) + { + min = j; + break; + } + } + + for (j=99; j>=0; j--) + { + if (((BYTE*)bd.Scan0)[j*3] == 0xff) + { + max = j; + break; + } + } + + size = max-min+1; + + ok(size == td[i].cx, "%u: expected %d, got %d\n", i, td[i].cx, size); + + min = -1; + max = -2; + + for (j=0; j<100; j++) + { + if (((BYTE*)bd.Scan0)[bd.Stride*j] == 0xff) + { + min = j; + break; + } + } + + for (j=99; j>=0; j--) + { + if (((BYTE*)bd.Scan0)[bd.Stride*j] == 0xff) + { + max = j; + break; + } + } + + size = max-min+1; + + ok(size == td[i].cy, "%u: expected %d, got %d\n", i, td[i].cy, size); + + status = GdipBitmapUnlockBits(u.bitmap, &bd); + expect(Ok, status); + + GdipDeletePen(pen); + GdipDeleteGraphics(graphics); + GdipDisposeImage(u.image); + } +} + /* Many people on the net ask why there is so much difference in rendered * text height between gdiplus and gdi32, this test suggests an answer to * that question. Important: this test assumes that font dpi == device dpi. @@ -5728,6 +5850,7 @@ START_TEST(graphics) test_measure_string(); test_font_height_scaling(); test_transform(); + test_pen_thickness(); test_GdipMeasureString(); test_constructor_destructor(); test_save_restore();

1 0

Jacek Caban : dxgi.idl: Added DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL declaration.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: df904b60f4deb0ceeb1b9f60f7ccdbe8157dcfa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df904b60f4deb0ceeb1b9f60f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 23 18:57:30 2015 +0100 dxgi.idl: Added DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL declaration. --- include/dxgi.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/include/dxgi.idl b/include/dxgi.idl index bc9538e..009a6b5 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -67,6 +67,7 @@ const UINT DXGI_ENUM_MODES_SCALING = 2; typedef enum DXGI_SWAP_EFFECT { DXGI_SWAP_EFFECT_DISCARD = 0, DXGI_SWAP_EFFECT_SEQUENTIAL = 1, + DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL = 3 } DXGI_SWAP_EFFECT; typedef enum DXGI_RESIDENCY {

1 0

Jacek Caban : d3d11_1.idl: Added some missing declarations.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: 824bbb388466b4e01150783e2d9ca9fb826f59bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=824bbb388466b4e01150783e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 23 18:57:23 2015 +0100 d3d11_1.idl: Added some missing declarations. Modified version of patch by Erik van Pienbroek. --- include/d3d11_1.idl | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/include/d3d11_1.idl b/include/d3d11_1.idl index 928548f..1ebfc5a 100644 --- a/include/d3d11_1.idl +++ b/include/d3d11_1.idl @@ -22,6 +22,69 @@ import "dxgi1_2.idl"; import "d3dcommon.idl"; import "d3d11.idl"; +typedef enum D3D11_LOGIC_OP { + D3D11_LOGIC_OP_CLEAR = 0, + D3D11_LOGIC_OP_SET, + D3D11_LOGIC_OP_COPY, + D3D11_LOGIC_OP_COPY_INVERTED, + D3D11_LOGIC_OP_NOOP, + D3D11_LOGIC_OP_INVERT, + D3D11_LOGIC_OP_AND, + D3D11_LOGIC_OP_NAND, + D3D11_LOGIC_OP_OR, + D3D11_LOGIC_OP_NOR, + D3D11_LOGIC_OP_XOR, + D3D11_LOGIC_OP_EQUIV, + D3D11_LOGIC_OP_AND_REVERSE, + D3D11_LOGIC_OP_AND_INVERTED, + D3D11_LOGIC_OP_OR_REVERSE, + D3D11_LOGIC_OP_OR_INVERTED +} D3D11_LOGIC_OP; + +typedef struct _D3D11_RENDER_TARGET_BLEND_DESC1 { + BOOL BlendEnable; + BOOL LogicOpEnable; + D3D11_BLEND SrcBlend; + D3D11_BLEND DestBlend; + D3D11_BLEND_OP BlendOp; + D3D11_BLEND SrcBlendAlpha; + D3D11_BLEND DestBlendAlpha; + D3D11_BLEND_OP BlendOpAlpha; + D3D11_LOGIC_OP LogicOp; + UINT8 RenderTargetWriteMask; +} D3D11_RENDER_TARGET_BLEND_DESC1; + +typedef struct _D3D11_BLEND_DESC1 { + BOOL AlphaToCoverageEnable; + BOOL IndependentBlendEnable; + D3D11_RENDER_TARGET_BLEND_DESC1 RenderTarget[D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT]; +} D3D11_BLEND_DESC1; + +typedef struct _D3D11_RASTERIZER_DESC1 { + D3D11_FILL_MODE FillMode; + D3D11_CULL_MODE CullMode; + BOOL FrontCounterClockwise; + INT DepthBias; + FLOAT DepthBiasClamp; + FLOAT SlopeScaledDepthBias; + BOOL DepthClipEnable; + BOOL ScissorEnable; + BOOL MultisampleEnable; + BOOL AntialiasedLineEnable; + UINT ForcedSampleCount; +} D3D11_RASTERIZER_DESC1; + +[ + uuid(cc86fabe-da55-401d-85e7-e3c9de2877e9), + object, + local, + pointer_default(unique) +] +interface ID3D11BlendState1 : ID3D11BlendState +{ + void GetDesc1(D3D11_BLEND_DESC1 *pDesc); +} + [ uuid(5c1e0d8a-7c23-48f9-8c59-a92958ceff11), object, @@ -177,3 +240,58 @@ interface ID3DUserDefinedAnnotation : IUnknown void SetMarker(LPCWSTR Name); BOOL GetStatus(); } + +[ + uuid(1217d7a6-5039-418c-b042-9cbe256afd6e), + object, + local, + pointer_default(unique) +] +interface ID3D11RasterizerState1 : ID3D11RasterizerState +{ + void GetDesc1(D3D11_RASTERIZER_DESC1 *pDesc); +} + +[ + uuid(a04bfb29-08ef-43d6-a49c-a9bdbdcbe686), + object, + local, + pointer_default(unique) +] +interface ID3D11Device1 : ID3D11Device +{ + void GetImmediateContext1( + ID3D11DeviceContext1 **ppImmediateContext); + + HRESULT CreateDeferredContext1( + UINT ContextFlags, + ID3D11DeviceContext1 **ppDeferredContext); + + HRESULT CreateBlendState1( + const D3D11_BLEND_DESC1 *pBlendStateDesc, + ID3D11BlendState1 **ppBlendState); + + HRESULT CreateRasterizerState1( + const D3D11_RASTERIZER_DESC1 *pRasterizerDesc, + ID3D11RasterizerState1 **ppRasterizerState); + + HRESULT CreateDeviceContextState( + UINT Flags, + const D3D_FEATURE_LEVEL *pFeatureLevels, + UINT FeatureLevels, + UINT SDKVersion, + REFIID EmulatedInterface, + D3D_FEATURE_LEVEL *pChosenFeatureLevel, + ID3DDeviceContextState **ppContextState); + + HRESULT OpenSharedResource1( + HANDLE hResource, + REFIID returnedInterface, + void **ppResource); + + HRESULT OpenSharedResourceByName( + LPCWSTR lpName, + DWORD dwDesiredAccess, + REFIID returnedInterface, + void **ppResource); +}

1 0

Ken Thomases : winemac: Allow the user to attempt to resize a maximized window and try to restore it if they do.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: 8d581d0e489c6bf7d54674adc0ea695e8adc978f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d581d0e489c6bf7d54674adc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Mar 23 18:58:06 2015 -0500 winemac: Allow the user to attempt to resize a maximized window and try to restore it if they do. OS X doesn't have the same concept of maximized windows as Windows does. There's no mode that prevents a normally-resizable window from being resized. If a window is "zoomed", it mostly fills the screen but the user can still move or resize it, at which point it ceases to be in the zoomed state. So, users are confused and frustrated when they can't resize a window that's maximized. To get similar behavior while still respecting Win32 semantics, we now let the user try to resize maximized windows. (The resize cursors are shown at the edges of the window frame.) When they start, a request is submitted to the app to restore the window. Unless and until the window is restored, we don't actually allow the window to change its size. The user expects to resize the window from its current (maximized) position. It should not jump to its normal position upon being restored. So, we set the window's normal position to its current position before restoring it. --- dlls/winemac.drv/cocoa_window.m | 46 +++++++++++++++++++++++++++++++++-------- dlls/winemac.drv/event.c | 2 +- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/macdrv_cocoa.h | 4 ++++ dlls/winemac.drv/window.c | 22 +++++++++++++++++++- 5 files changed, 64 insertions(+), 12 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 7f71fea..1bb99a9 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -650,7 +650,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif - (BOOL) preventResizing { BOOL preventForClipping = cursor_clipping_locks_windows && [[WineApplicationController sharedController] clippingCursor]; - return ([self styleMask] & NSResizableWindowMask) && (disabled || !resizable || maximized || preventForClipping); + return ([self styleMask] & NSResizableWindowMask) && (disabled || !resizable || preventForClipping); } - (void) adjustFeaturesForState @@ -814,6 +814,16 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif macdrv_release_event(event); } + - (void) sendResizeStartQuery + { + macdrv_query* query = macdrv_create_query(); + query->type = QUERY_RESIZE_START; + query->window = (macdrv_window)[self retain]; + + [self.queue query:query timeout:0.3]; + macdrv_release_query(query); + } + - (void) setMacDrvState:(const struct macdrv_window_state*)state { NSWindowCollectionBehavior behavior; @@ -892,6 +902,9 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif { maximized = state->maximized; [self adjustFeaturesForState]; + + if (!maximized && [self inLiveResize]) + [self sendResizeStartQuery]; } behavior = NSWindowCollectionBehaviorDefault; @@ -1797,9 +1810,12 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif - (void) windowDidEndLiveResize:(NSNotification *)notification { - macdrv_event* event = macdrv_create_event(WINDOW_RESIZE_ENDED, self); - [queue postEvent:event]; - macdrv_release_event(event); + if (!maximized) + { + macdrv_event* event = macdrv_create_event(WINDOW_RESIZE_ENDED, self); + [queue postEvent:event]; + macdrv_release_event(event); + } self.liveResizeDisplayTimer = nil; } @@ -1958,6 +1974,9 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif { if ([self inLiveResize]) { + if (maximized) + return self.frame.size; + NSRect rect; macdrv_query* query; @@ -1992,12 +2011,21 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif - (void) windowWillStartLiveResize:(NSNotification *)notification { - macdrv_query* query = macdrv_create_query(); - query->type = QUERY_RESIZE_START; - query->window = (macdrv_window)[self retain]; + if (maximized) + { + macdrv_event* event; + NSRect frame = [self contentRectForFrameRect:self.frame]; - [self.queue query:query timeout:0.3]; - macdrv_release_query(query); + [[WineApplicationController sharedController] flipRect:&frame]; + + event = macdrv_create_event(WINDOW_RESTORE_REQUESTED, self); + event->window_restore_requested.keep_frame = TRUE; + event->window_restore_requested.frame = NSRectToCGRect(frame); + [queue postEvent:event]; + macdrv_release_event(event); + } + else + [self sendResizeStartQuery]; frameAtResizeStart = [self frame]; resizingFromLeft = resizingFromTop = FALSE; diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 8e03080..58b507c 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -280,7 +280,7 @@ void macdrv_handle_event(const macdrv_event *event) macdrv_window_resize_ended(hwnd); break; case WINDOW_RESTORE_REQUESTED: - macdrv_window_restore_requested(hwnd); + macdrv_window_restore_requested(hwnd, event); break; default: TRACE(" ignoring\n"); diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index cf0fc64..a874dfb 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -172,7 +172,7 @@ extern void macdrv_window_minimize_requested(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_did_unminimize(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_brought_forward(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_resize_ended(HWND hwnd) DECLSPEC_HIDDEN; -extern void macdrv_window_restore_requested(HWND hwnd) DECLSPEC_HIDDEN; +extern void macdrv_window_restore_requested(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_window_drag_begin(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_drag_end(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL query_resize_size(HWND hwnd, macdrv_query *query) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 30b6b64..4b68adc 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -291,6 +291,10 @@ typedef struct macdrv_event { unsigned long serial; void *tried_windows; } window_got_focus; + struct { + int keep_frame; + CGRect frame; + } window_restore_requested; }; } macdrv_event; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 54bd56e..7a777e6 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2139,8 +2139,28 @@ void macdrv_window_resize_ended(HWND hwnd) * Handler for WINDOW_RESTORE_REQUESTED events. This is specifically * for restoring from maximized, not from minimized. */ -void macdrv_window_restore_requested(HWND hwnd) +void macdrv_window_restore_requested(HWND hwnd, const macdrv_event *event) { + if (event->window_restore_requested.keep_frame && hwnd) + { + DWORD style = GetWindowLongW(hwnd, GWL_STYLE); + struct macdrv_win_data *data; + + if ((style & WS_MAXIMIZE) && (style & WS_VISIBLE) && (data = get_win_data(hwnd))) + { + RECT rect; + HWND parent = GetAncestor(hwnd, GA_PARENT); + + rect = rect_from_cgrect(event->window_restore_requested.frame); + macdrv_mac_to_window_rect(data, &rect); + MapWindowPoints(0, parent, (POINT *)&rect, 2); + + release_win_data(data); + + SetInternalWindowPos(hwnd, SW_SHOW, &rect, NULL); + } + } + perform_window_command(hwnd, WS_MAXIMIZE, 0, SC_RESTORE, HTMAXBUTTON); }

1 0

Ken Thomases : winemac: Restore a maximized window if a user tries to move it by dragging its title bar.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: 792b47ad3b89d51f17ef311ccaa62fc2016af793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=792b47ad3b89d51f17ef311cc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Mar 23 18:58:11 2015 -0500 winemac: Restore a maximized window if a user tries to move it by dragging its title bar. OS X doesn't have the same concept of maximized windows as Windows does. There's no mode that prevents a normally-movable window from being moved. If a window is "zoomed", it mostly fills the screen but the user can still move or resize it, at which point it ceases to be in the zoomed state. So, users are confused and frustrated when they can't move a window that's maximized. To get similar behavior while still respecting Win32 semantics, we detect when the user tries to move a maximized window. When they start, a request is submitted to the app to restore the window. Unless and until the window is restored, we don't actually allow the window to move. The user expects to move the window from its current (maximized) position. It should not jump to its normal position upon being restored. So, we set the window's normal position to its current position before restoring it. --- dlls/winemac.drv/cocoa_app.h | 2 + dlls/winemac.drv/cocoa_app.m | 9 +++ dlls/winemac.drv/cocoa_window.h | 4 ++ dlls/winemac.drv/cocoa_window.m | 129 +++++++++++++++++++++++++++++++++++++--- 4 files changed, 135 insertions(+), 9 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index fc6c1ec..6ca3fcb 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -119,6 +119,8 @@ enum { - (void) keyboardSelectionDidChange; - (void) noteKey:(uint16_t)keyCode pressed:(BOOL)pressed; + - (void) window:(WineWindow*)window isBeingDragged:(BOOL)dragged; + - (void) flipRect:(NSRect*)rect; - (WineWindow*) frontWineWindow; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 5afb7f8..82925c8 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1436,6 +1436,15 @@ int macdrv_err_on; pressedKeyCodes[index] &= ~mask; } + - (void) window:(WineWindow*)window isBeingDragged:(BOOL)dragged + { + if (dragged) + [windowsBeingDragged addObject:window]; + else + [windowsBeingDragged removeObject:window]; + [self updateCursorClippingState]; + } + - (void) handleMouseMove:(NSEvent*)anEvent { WineWindow* targetWindow; diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 574ff75..f5ff3b7 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -69,6 +69,10 @@ NSRect nonFullscreenFrame; NSTimeInterval enteredFullScreenTime; + int draggingPhase; + NSPoint dragStartPosition; + NSPoint dragWindowStartPosition; + BOOL ignore_windowDeminiaturize; BOOL ignore_windowResize; BOOL fakingClose; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 1bb99a9..f68a1c5 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -653,6 +653,16 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif return ([self styleMask] & NSResizableWindowMask) && (disabled || !resizable || preventForClipping); } + - (BOOL) allowsMovingWithMaximized:(BOOL)inMaximized + { + if (allow_immovable_windows && (disabled || inMaximized)) + return NO; + else if (cursor_clipping_locks_windows && [[WineApplicationController sharedController] clippingCursor]) + return NO; + else + return YES; + } + - (void) adjustFeaturesForState { NSUInteger style = [self styleMask]; @@ -682,14 +692,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif } if (allow_immovable_windows || cursor_clipping_locks_windows) - { - if (allow_immovable_windows && (disabled || maximized)) - [self setMovable:NO]; - else if (cursor_clipping_locks_windows && [[WineApplicationController sharedController] clippingCursor]) - [self setMovable:NO]; - else - [self setMovable:YES]; - } + [self setMovable:[self allowsMovingWithMaximized:maximized]]; } - (void) adjustFullScreenBehavior:(NSWindowCollectionBehavior)behavior @@ -1543,6 +1546,22 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif [self adjustFeaturesForState]; } + - (void) endWindowDragging + { + if (draggingPhase) + { + if (draggingPhase == 3) + { + macdrv_event* event = macdrv_create_event(WINDOW_DRAG_END, self); + [queue postEvent:event]; + macdrv_release_event(event); + } + + draggingPhase = 0; + [[WineApplicationController sharedController] window:self isBeingDragged:NO]; + } + } + /* * ---------- NSWindow method overrides ---------- @@ -1603,14 +1622,104 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif - (void) sendEvent:(NSEvent*)event { + NSEventType type = event.type; + /* NSWindow consumes certain key-down events as part of Cocoa's keyboard interface control. For example, Control-Tab switches focus among views. We want to bypass that feature, so directly route key-down events to -keyDown:. */ - if ([event type] == NSKeyDown) + if (type == NSKeyDown) [[self firstResponder] keyDown:event]; else + { + if (!draggingPhase && maximized && ![self isMovable] && + ![self allowsMovingWithMaximized:YES] && [self allowsMovingWithMaximized:NO] && + type == NSLeftMouseDown && (self.styleMask & NSTitledWindowMask)) + { + NSRect titleBar = self.frame; + NSRect contentRect = [self contentRectForFrameRect:titleBar]; + titleBar.size.height = NSMaxY(titleBar) - NSMaxY(contentRect); + titleBar.origin.y = NSMaxY(contentRect); + + dragStartPosition = [self convertBaseToScreen:event.locationInWindow]; + + if (NSMouseInRect(dragStartPosition, titleBar, NO)) + { + static const NSWindowButton buttons[] = { + NSWindowCloseButton, + NSWindowMiniaturizeButton, + NSWindowZoomButton, + NSWindowFullScreenButton, + }; + BOOL hitButton = NO; + int i; + + for (i = 0; i < sizeof(buttons) / sizeof(buttons[0]); i++) + { + NSButton* button; + + if (buttons[i] == NSWindowFullScreenButton && ![self respondsToSelector:@selector(toggleFullScreen:)]) + continue; + + button = [self standardWindowButton:buttons[i]]; + if ([button hitTest:[button.superview convertPoint:event.locationInWindow fromView:nil]]) + { + hitButton = YES; + break; + } + } + + if (!hitButton) + { + draggingPhase = 1; + dragWindowStartPosition = NSMakePoint(NSMinX(titleBar), NSMaxY(titleBar)); + [[WineApplicationController sharedController] window:self isBeingDragged:YES]; + } + } + } + else if (draggingPhase && (type == NSLeftMouseDragged || type == NSLeftMouseUp)) + { + if ([self isMovable]) + { + NSPoint point = [self convertBaseToScreen:event.locationInWindow]; + NSPoint newTopLeft = dragWindowStartPosition; + + newTopLeft.x += point.x - dragStartPosition.x; + newTopLeft.y += point.y - dragStartPosition.y; + + if (draggingPhase == 2) + { + macdrv_event* event = macdrv_create_event(WINDOW_DRAG_BEGIN, self); + [queue postEvent:event]; + macdrv_release_event(event); + + draggingPhase = 3; + } + + [self setFrameTopLeftPoint:newTopLeft]; + } + else if (draggingPhase == 1 && type == NSLeftMouseDragged) + { + macdrv_event* event; + NSRect frame = [self contentRectForFrameRect:self.frame]; + + [[WineApplicationController sharedController] flipRect:&frame]; + + event = macdrv_create_event(WINDOW_RESTORE_REQUESTED, self); + event->window_restore_requested.keep_frame = TRUE; + event->window_restore_requested.frame = NSRectToCGRect(frame); + [queue postEvent:event]; + macdrv_release_event(event); + + draggingPhase = 2; + } + + if (type == NSLeftMouseUp) + [self endWindowDragging]; + } + [super sendEvent:event]; + } } - (void) miniaturize:(id)sender @@ -2011,6 +2120,8 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif - (void) windowWillStartLiveResize:(NSNotification *)notification { + [self endWindowDragging]; + if (maximized) { macdrv_event* event;

1 0

Ken Thomases : winmm: For Mac, fix joyGetPosEx() to put number of buttons pressed in dwButtonNumber field.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: edad520235881be74090dfdcca9e8a3d1823c770 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edad520235881be74090dfdcc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Mar 23 16:40:51 2015 -0500 winmm: For Mac, fix joyGetPosEx() to put number of buttons pressed in dwButtonNumber field. Based on behavior of Windows revealed by interactive tests added by Bruno Jesus. --- dlls/winejoystick.drv/joystick_osx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winejoystick.drv/joystick_osx.c b/dlls/winejoystick.drv/joystick_osx.c index cb66c47..da45450 100644 --- a/dlls/winejoystick.drv/joystick_osx.c +++ b/dlls/winejoystick.drv/joystick_osx.c @@ -678,8 +678,7 @@ LRESULT driver_joyGetPosEx(DWORD_PTR device_id, JOYINFOEX* info) if (value) { info->dwButtons |= 1 << i; - if (!info->dwButtonNumber) - info->dwButtonNumber = i + 1; + info->dwButtonNumber++; } } }

1 0

Jacek Caban : dxgi1_2.idl: Added IDXGIFactory2 declaration.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: 0a923299144e84ef8b1acdd81949ef99ad43f581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a923299144e84ef8b1acdd81… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 23 18:57:48 2015 +0100 dxgi1_2.idl: Added IDXGIFactory2 declaration. Modified version of patch by Erik van Pienbroek. --- include/dxgi1_2.idl | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/include/dxgi1_2.idl b/include/dxgi1_2.idl index bba4ab8..775b81c 100644 --- a/include/dxgi1_2.idl +++ b/include/dxgi1_2.idl @@ -130,3 +130,63 @@ interface IDXGISwapChain1 : IDXGISwapChain HRESULT GetRotation( [out] DXGI_MODE_ROTATION *pRotation); } + +[ + object, + uuid(50c83a1c-e072-4c48-87b0-3630fa36a6d0), + local, + pointer_default(unique) +] +interface IDXGIFactory2 : IDXGIFactory1 +{ + BOOL IsWindowedStereoEnabled(); + + HRESULT CreateSwapChainForHwnd( + [in] IUnknown *pDevice, + [in] HWND hWnd, + [in] const DXGI_SWAP_CHAIN_DESC1 *pDesc, + [in] const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *pFullscreenDesc, + [in] IDXGIOutput *pRestrictToOutput, + [out] IDXGISwapChain1 **ppSwapChain); + + HRESULT CreateSwapChainForCoreWindow( + [in] IUnknown *pDevice, + [in] IUnknown *pWindow, + [in] const DXGI_SWAP_CHAIN_DESC1 *pDesc, + [in] IDXGIOutput *pRestrictToOutput, + [out] IDXGISwapChain1 **ppSwapChain); + + HRESULT GetSharedResourceAdapterLuid( + [in] HANDLE hResource, + [out] LUID *pLuid); + + HRESULT RegisterOcclusionStatusWindow( + [in] HWND WindowHandle, + [in] UINT wMsg, + [out] DWORD *pdwCookie); + + HRESULT RegisterStereoStatusEvent( + [in] HANDLE hEvent, + [out] DWORD *pdwCookie); + + void UnregisterStereoStatus( + [in] DWORD dwCookie); + + HRESULT RegisterStereoStatusWindow( + [in] HWND WindowHandle, + [in] UINT wMsg, + [out] DWORD *pdwCookie); + + HRESULT RegisterOcclusionStatusEvent( + [in] HANDLE hEvent, + [out] DWORD *pdwCookie); + + void UnregisterOcclusionStatus( + [in] DWORD dwCookie); + + HRESULT CreateSwapChainForComposition( + [in] IUnknown *pDevice, + [in] const DXGI_SWAP_CHAIN_DESC1 *pDesc, + [in] IDXGIOutput *pRestrictToOutput, + [out] IDXGISwapChain1 **ppSwapChain); +}

1 0