wine-commits July 2017

wine-commits@winehq.org

2 participants
632 discussions

Józef Kucia : amstream: Fix compilation on systems that don't support nameless unions.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 1c6e344bbbb2a45983f19d5ec96789c9ad1f84ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c6e344bbbb2a45983f19d5ec… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 10 16:20:52 2017 +0200 amstream: Fix compilation on systems that don't support nameless unions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e8e23114a220bcb3c7966e5fba541a2b3823f0f7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/amstream/mediastream.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 188ab88..53556af 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -18,16 +18,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" - +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #define COBJMACROS +#include <stdarg.h> +#include "windef.h" #include "winbase.h" #include "wingdi.h" #include "amstream_private.h" #include "ddstream.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(amstream); @@ -1021,11 +1024,11 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD desc.dwWidth = 100; desc.ddpfPixelFormat.dwSize = sizeof(desc.ddpfPixelFormat); desc.ddpfPixelFormat.dwFlags = DDPF_RGB; - desc.ddpfPixelFormat.dwRGBBitCount = 32; - desc.ddpfPixelFormat.dwRBitMask = 0xff0000; - desc.ddpfPixelFormat.dwGBitMask = 0x00ff00; - desc.ddpfPixelFormat.dwBBitMask = 0x0000ff; - desc.ddpfPixelFormat.dwRGBAlphaBitMask = 0; + desc.ddpfPixelFormat.u1.dwRGBBitCount = 32; + desc.ddpfPixelFormat.u2.dwRBitMask = 0xff0000; + desc.ddpfPixelFormat.u3.dwGBitMask = 0x00ff00; + desc.ddpfPixelFormat.u4.dwBBitMask = 0x0000ff; + desc.ddpfPixelFormat.u5.dwRGBAlphaBitMask = 0; desc.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY|DDSCAPS_OFFSCREENPLAIN; desc.lpSurface = NULL;

1 0

Nikolay Sivov : dwrite: Fix compilation failure regarding nameless unions.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: b1f22c7a7d2bb1021d5af69d2960d862993e8e78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1f22c7a7d2bb1021d5af69d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 10 17:16:10 2017 +0300 dwrite: Fix compilation failure regarding nameless unions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit af54ed51b00db42be1adade1c8a2fb2dcf837edc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwrite/opentype.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index c829813..2876799 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -19,6 +19,7 @@ */ #define COBJMACROS +#define NONAMELESSUNION #include "dwrite_private.h" #include "winternl.h" @@ -1860,10 +1861,10 @@ HRESULT opentype_get_cpal_entries(const void *cpal, UINT32 palette, UINT32 first first_entry_index += GET_BE_WORD(header->colorRecordIndices[palette]); for (i = 0; i < entry_count; i++) { - entries[i].r = records[first_entry_index + i].red / 255.0f; - entries[i].g = records[first_entry_index + i].green / 255.0f; - entries[i].b = records[first_entry_index + i].blue / 255.0f; - entries[i].a = records[first_entry_index + i].alpha / 255.0f; + entries[i].u1.r = records[first_entry_index + i].red / 255.0f; + entries[i].u2.g = records[first_entry_index + i].green / 255.0f; + entries[i].u3.b = records[first_entry_index + i].blue / 255.0f; + entries[i].u4.a = records[first_entry_index + i].alpha / 255.0f; } return S_OK;

1 0

Hans Leidekker : netprofm: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: d1706e04444870333d0ba3e1ecbe19fbd84f8316 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1706e04444870333d0ba3e1e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 10 14:28:12 2017 +0200 netprofm: Fix compilation on systems that don't support nameless unions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 25d3bc3064da2006210236feb49a388a48a12034) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/netprofm/list.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 33b2fa6..745c8e8 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -18,6 +18,8 @@ */ #define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "config.h" #include <stdarg.h> @@ -1693,7 +1695,7 @@ static void init_networks( struct list_manager *mgr ) struct network *network; struct connection *connection; - id.Data1 = aa->IfIndex; + id.Data1 = aa->u.s.IfIndex; /* assume a one-to-one mapping between networks and connections */ if (!(network = create_network( &id ))) goto done;

1 0

André Hentschel : winebus.sys: Fix compilation on systems that don't support nameless structs.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: d6a45f2ce6543bc06f5bd2f007bd4472b7827f85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6a45f2ce6543bc06f5bd2f00… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 25 22:14:58 2017 +0100 winebus.sys: Fix compilation on systems that don't support nameless structs. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1afcfc77d376916466035ab5c085dcb8201ecd03) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winebus.sys/main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index ed95435..978540b 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -21,6 +21,7 @@ #include <stdarg.h> #define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS @@ -303,7 +304,7 @@ void bus_remove_hid_device(DEVICE_OBJECT *device) EnterCriticalSection(&ext->report_cs); while ((entry = RemoveHeadList(&ext->irp_queue)) != &ext->irp_queue) { - irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); irp->IoStatus.u.Status = STATUS_CANCELLED; irp->IoStatus.Information = 0; IoCompleteRequest(irp, IO_NO_INCREMENT); @@ -525,7 +526,7 @@ NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) } else { - InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.ListEntry); + InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.s.ListEntry); status = STATUS_PENDING; } LeaveCriticalSection(&ext->report_cs); @@ -613,7 +614,7 @@ void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) { IO_STACK_LOCATION *irpsp; TRACE_(hid_report)("Processing Request\n"); - irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); irpsp = IoGetCurrentIrpStackLocation(irp); irp->IoStatus.u.Status = deliver_last_report(ext, irpsp->Parameters.DeviceIoControl.OutputBufferLength,

1 0

André Hentschel : hidclass.sys: Fix compilation on systems that don't support nameless structs.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 403458720e1520e260cec50caa27ed7485a4b1a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=403458720e1520e260cec50ca… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 25 22:14:54 2017 +0100 hidclass.sys: Fix compilation on systems that don't support nameless structs. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 902b8a2b6d3393c5af52af5b84166634153436a1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hidclass.sys/device.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index b241016..fe79212 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -22,6 +22,7 @@ #include <stdarg.h> #define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "hid.h" #include "wine/unicode.h" #include "winreg.h" @@ -184,7 +185,7 @@ void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device entry = RemoveHeadList(&ext->irp_queue); while(entry != &ext->irp_queue) { - irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); irp->IoStatus.u.Status = STATUS_DEVICE_REMOVED; IoCompleteRequest(irp, IO_NO_INCREMENT); entry = RemoveHeadList(&ext->irp_queue); @@ -237,7 +238,7 @@ static void HID_Device_processQueue(DEVICE_OBJECT *device) while(entry != &ext->irp_queue) { int ptr; - irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); ptr = PtrToUlong( irp->Tail.Overlay.OriginalFileObject->FsContext ); RingBuffer_Read(ext->ring_buffer, ptr, packet, &buffer_size); @@ -680,7 +681,7 @@ NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp) else { TRACE_(hid_report)("Queue irp\n"); - InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.ListEntry); + InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.s.ListEntry); rc = STATUS_PENDING; } HeapFree(GetProcessHeap(), 0, packet);

1 0

Björn Bidar : wined3d: Add NVIDIA GTX 1080 Ti to the GPU list.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 52af66141b04b8fec24fcc44351cd2e6180d7595 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52af66141b04b8fec24fcc443… Author: Björn Bidar <theodorstormgrade(a)googlemail.com> Date: Fri May 5 19:28:26 2017 +0200 wined3d: Add NVIDIA GTX 1080 Ti to the GPU list. Signed-off-by: Björn Bidar <theodorstormgrade(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5f0fd6c063e2ed4d5d8f0d798625adf1966909fe) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 175013e..2dff531 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1334,6 +1334,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060, "NVIDIA GeForce GTX 1060", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1070, "NVIDIA GeForce GTX 1070", DRIVER_NVIDIA_GEFORCE8, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080, "NVIDIA GeForce GTX 1080", DRIVER_NVIDIA_GEFORCE8, 8192}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080TI, "NVIDIA GeForce GTX 1080 Ti", DRIVER_NVIDIA_GEFORCE8, 11264}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANX_PASCAL, "NVIDIA TITAN X (Pascal)", DRIVER_NVIDIA_GEFORCE8, 12288}, /* AMD cards */ @@ -1819,6 +1820,7 @@ cards_nvidia_binary[] = { /* Direct 3D 11 */ {"TITAN X (Pascal)", CARD_NVIDIA_TITANX_PASCAL}, /* GeForce 1000 - highend */ + {"GTX 1080 Ti", CARD_NVIDIA_GEFORCE_GTX1080TI}, /* GeForce 1000 - highend */ {"GTX 1080", CARD_NVIDIA_GEFORCE_GTX1080}, /* GeForce 1000 - highend */ {"GTX 1070", CARD_NVIDIA_GEFORCE_GTX1070}, /* GeForce 1000 - highend */ {"GTX 1060", CARD_NVIDIA_GEFORCE_GTX1060}, /* GeForce 1000 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d38bb55..6a01715 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2032,6 +2032,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX1060 = 0x1c03, CARD_NVIDIA_GEFORCE_GTX1070 = 0x1b81, CARD_NVIDIA_GEFORCE_GTX1080 = 0x1b80, + CARD_NVIDIA_GEFORCE_GTX1080TI = 0x1b06, CARD_NVIDIA_TITANX_PASCAL = 0x1b00, CARD_VMWARE_SVGA3D = 0x0405,

1 0

Christopher Berner : wined3d: Add Nvidia TitanX (Pascal).
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 03ea90e2b4f0b6ec52a1cbd5f036b132aa60569c URL: http://source.winehq.org/git/wine.git/?a=commit;h=03ea90e2b4f0b6ec52a1cbd5f… Author: Christopher Berner <christopherberner(a)gmail.com> Date: Sun Apr 23 12:12:05 2017 -0700 wined3d: Add Nvidia TitanX (Pascal). Signed-off-by: Christopher Berner <christopherberner(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dad06728ce75e0422218bff06168e0c6328b9b7e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fbae9c1..175013e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1334,6 +1334,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060, "NVIDIA GeForce GTX 1060", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1070, "NVIDIA GeForce GTX 1070", DRIVER_NVIDIA_GEFORCE8, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080, "NVIDIA GeForce GTX 1080", DRIVER_NVIDIA_GEFORCE8, 8192}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANX_PASCAL, "NVIDIA TITAN X (Pascal)", DRIVER_NVIDIA_GEFORCE8, 12288}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -1817,6 +1818,7 @@ static const struct wined3d_renderer_table cards_nvidia_binary[] = { /* Direct 3D 11 */ + {"TITAN X (Pascal)", CARD_NVIDIA_TITANX_PASCAL}, /* GeForce 1000 - highend */ {"GTX 1080", CARD_NVIDIA_GEFORCE_GTX1080}, /* GeForce 1000 - highend */ {"GTX 1070", CARD_NVIDIA_GEFORCE_GTX1070}, /* GeForce 1000 - highend */ {"GTX 1060", CARD_NVIDIA_GEFORCE_GTX1060}, /* GeForce 1000 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3579e21..d38bb55 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2032,6 +2032,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX1060 = 0x1c03, CARD_NVIDIA_GEFORCE_GTX1070 = 0x1b81, CARD_NVIDIA_GEFORCE_GTX1080 = 0x1b80, + CARD_NVIDIA_TITANX_PASCAL = 0x1b00, CARD_VMWARE_SVGA3D = 0x0405,

1 0

Alex Henrie : comctl32: Return TRUE from LVM_REDRAWITEMS with bad indices.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 03215c684bf503e84f6faaea15d0f3bed11f6995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03215c684bf503e84f6faaea1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Feb 20 00:06:12 2017 -0700 comctl32: Return TRUE from LVM_REDRAWITEMS with bad indices. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 690022c61b6dfc3af59bd3afdc53b33cc51201b4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/listview.c | 8 ++------ dlls/comctl32/tests/listview.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 56e2563..c01d816 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7989,12 +7989,8 @@ static BOOL LISTVIEW_IsItemVisible(const LISTVIEW_INFO *infoPtr, INT nItem) static BOOL LISTVIEW_RedrawItems(const LISTVIEW_INFO *infoPtr, INT nFirst, INT nLast) { INT i; - - if (nLast < nFirst || min(nFirst, nLast) < 0 || - max(nFirst, nLast) >= infoPtr->nItemCount) - return FALSE; - - for (i = nFirst; i <= nLast; i++) + + for (i = max(nFirst, 0); i <= min(nLast, infoPtr->nItemCount - 1); i++) LISTVIEW_InvalidateItem(infoPtr, i); return TRUE; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6d21b05..f497673 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -5529,6 +5529,43 @@ static void test_LVM_SETITEMTEXT(void) DestroyWindow(hwnd); } +static void test_LVM_REDRAWITEMS(void) +{ + HWND list; + DWORD ret; + + list = create_listview_control(LVS_ICON); + ok(list != NULL, "failed to create listview window\n"); + + ret = SendMessageA(list, LVM_REDRAWITEMS, 0, 0); + expect(TRUE, ret); + + insert_item(list, 0); + + ret = SendMessageA(list, LVM_REDRAWITEMS, -1, 0); + expect(TRUE, ret); + + ret = SendMessageA(list, LVM_REDRAWITEMS, 0, -1); + expect(TRUE, ret); + + ret = SendMessageA(list, LVM_REDRAWITEMS, 0, 0); + expect(TRUE, ret); + + ret = SendMessageA(list, LVM_REDRAWITEMS, 0, 1); + expect(TRUE, ret); + + ret = SendMessageA(list, LVM_REDRAWITEMS, 0, 2); + expect(TRUE, ret); + + ret = SendMessageA(list, LVM_REDRAWITEMS, 1, 0); + expect(TRUE, ret); + + ret = SendMessageA(list, LVM_REDRAWITEMS, 2, 3); + expect(TRUE, ret); + + DestroyWindow(list); +} + static void test_imagelists(void) { HWND hwnd, header; @@ -5903,6 +5940,7 @@ START_TEST(listview) test_createdragimage(); test_dispinfo(); test_LVM_SETITEMTEXT(); + test_LVM_REDRAWITEMS(); test_imagelists(); test_deleteitem(); test_insertitem();

1 0

Peter Hater : comctl32/propsheet: Added PSM_INSERTPAGE implementation.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 0f134bca6623dbd3049df560386b72a2919c9d3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f134bca6623dbd3049df5603… Author: Peter Hater <7element(a)mail.bg> Date: Sun Feb 12 21:16:31 2017 +0300 comctl32/propsheet: Added PSM_INSERTPAGE implementation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a6661ba9ad70dcde95272b48c8dba9d30005056f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/propsheet.c | 108 +++++++++++++++++++++++++--------------- dlls/comctl32/tests/propsheet.c | 18 +++---- 2 files changed, 77 insertions(+), 49 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index f575e16..caf7181 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -32,7 +32,6 @@ * - Wizard 97 header resizing * - Enforcing of minimal wizard size * - Messages: - * o PSM_INSERTPAGE * o PSM_RECALCPAGESIZES * o PSM_SETHEADERSUBTITLE * o PSM_SETHEADERTITLE @@ -2244,70 +2243,111 @@ static LRESULT PROPSHEET_QuerySiblings(HWND hwndDlg, return msgResult; } - /****************************************************************************** - * PROPSHEET_AddPage + * PROPSHEET_InsertPage */ -static BOOL PROPSHEET_AddPage(HWND hwndDlg, - HPROPSHEETPAGE hpage) +static BOOL PROPSHEET_InsertPage(HWND hwndDlg, HPROPSHEETPAGE hpageInsertAfter, HPROPSHEETPAGE hpage) { - PropPageInfo * ppi; - PropSheetInfo * psInfo = GetPropW(hwndDlg, PropSheetInfoStr); + PropSheetInfo *psInfo = GetPropW(hwndDlg, PropSheetInfoStr); + PropPageInfo *ppi, *prev_ppi = psInfo->proppage; HWND hwndTabControl = GetDlgItem(hwndDlg, IDC_TABCONTROL); - TCITEMW item; LPCPROPSHEETPAGEW ppsp = (LPCPROPSHEETPAGEW)hpage; + TCITEMW item; + int index; - TRACE("hpage %p\n", hpage); - /* - * Allocate and fill in a new PropPageInfo entry. - */ - ppi = ReAlloc(psInfo->proppage, sizeof(PropPageInfo) * (psInfo->nPages + 1)); + TRACE("hwndDlg %p, hpageInsertAfter %p, hpage %p\n", hwndDlg, hpageInsertAfter, hpage); + + if (IS_INTRESOURCE(hpageInsertAfter)) + index = LOWORD(hpageInsertAfter); + else + { + index = PROPSHEET_GetPageIndex(hpageInsertAfter, psInfo, -1); + if (index < 0) + { + TRACE("Could not find page to insert after!\n"); + return FALSE; + } + index++; + } + + if (index > psInfo->nPages) + index = psInfo->nPages; + + ppi = Alloc(sizeof(PropPageInfo) * (psInfo->nPages + 1)); if (!ppi) return FALSE; + /* + * Fill in a new PropPageInfo entry. + */ + if (index > 0) + memcpy(ppi, prev_ppi, index * sizeof(PropPageInfo)); + memset(&ppi[index], 0, sizeof(PropPageInfo)); + if (index < psInfo->nPages) + memcpy(&ppi[index + 1], &prev_ppi[index], (psInfo->nPages - index) * sizeof(PropPageInfo)); psInfo->proppage = ppi; - if (!PROPSHEET_CollectPageInfo(ppsp, psInfo, psInfo->nPages, FALSE)) - return FALSE; - psInfo->proppage[psInfo->nPages].hpage = hpage; + if (!PROPSHEET_CollectPageInfo(ppsp, psInfo, index, FALSE)) + { + psInfo->proppage = prev_ppi; + Free(ppi); + return FALSE; + } + + psInfo->proppage[index].hpage = hpage; if (ppsp->dwFlags & PSP_PREMATURE) { /* Create the page but don't show it */ - if(!PROPSHEET_CreatePage(hwndDlg, psInfo->nPages, psInfo, ppsp)) - return FALSE; + if (!PROPSHEET_CreatePage(hwndDlg, index, psInfo, ppsp)) + { + psInfo->proppage = prev_ppi; + Free(ppi); + return FALSE; + } } + Free(prev_ppi); + psInfo->nPages++; + if (index <= psInfo->active_page) + psInfo->active_page++; + /* * Add a new tab to the tab control. */ item.mask = TCIF_TEXT; - item.pszText = (LPWSTR) psInfo->proppage[psInfo->nPages].pszText; + item.pszText = (LPWSTR) psInfo->proppage[index].pszText; item.cchTextMax = MAX_TABTEXT_LENGTH; if (psInfo->hImageList) - { SendMessageW(hwndTabControl, TCM_SETIMAGELIST, 0, (LPARAM)psInfo->hImageList); - } - if ( psInfo->proppage[psInfo->nPages].hasIcon ) + if (psInfo->proppage[index].hasIcon) { item.mask |= TCIF_IMAGE; - item.iImage = psInfo->nPages; + item.iImage = index; } - SendMessageW(hwndTabControl, TCM_INSERTITEMW, psInfo->nPages + 1, - (LPARAM)&item); - - psInfo->nPages++; + SendMessageW(hwndTabControl, TCM_INSERTITEMW, index, (LPARAM)&item); /* If it is the only page - show it */ - if(psInfo->nPages == 1) + if (psInfo->nPages == 1) PROPSHEET_SetCurSel(hwndDlg, 0, 1, 0); + return TRUE; } /****************************************************************************** + * PROPSHEET_AddPage + */ +static BOOL PROPSHEET_AddPage(HWND hwndDlg, HPROPSHEETPAGE hpage) +{ + PropSheetInfo * psInfo = GetPropW(hwndDlg, PropSheetInfoStr); + TRACE("hwndDlg %p, hpage %p\n", hwndDlg, hpage); + return PROPSHEET_InsertPage(hwndDlg, UlongToPtr(psInfo->nPages), hpage); +} + +/****************************************************************************** * PROPSHEET_RemovePage */ static BOOL PROPSHEET_RemovePage(HWND hwndDlg, @@ -2461,18 +2501,6 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags) } /****************************************************************************** - * PROPSHEET_InsertPage - */ -static BOOL PROPSHEET_InsertPage(HWND hwndDlg, HPROPSHEETPAGE hpageInsertAfter, HPROPSHEETPAGE hpage) -{ - if (IS_INTRESOURCE(hpageInsertAfter)) - FIXME("(%p, %d, %p): stub\n", hwndDlg, LOWORD(hpageInsertAfter), hpage); - else - FIXME("(%p, %p, %p): stub\n", hwndDlg, hpageInsertAfter, hpage); - return FALSE; -} - -/****************************************************************************** * PROPSHEET_SetHeaderTitleW */ static void PROPSHEET_SetHeaderTitleW(HWND hwndDlg, int iPageIndex, LPCWSTR pszHeaderTitle) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 1c284ff..7547e79 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -935,7 +935,7 @@ static void test_PSM_INSERTPAGE(void) /* add pages one by one */ ret = SendMessageA(hdlg, PSM_INSERTPAGE, 5, (LPARAM)hpsp[1]); - todo_wine ok(ret == TRUE, "got %d\n", ret); + ok(ret == TRUE, "got %d\n", ret); /* try with invalid values */ ret = SendMessageA(hdlg, PSM_INSERTPAGE, 0, 0); @@ -954,34 +954,34 @@ if (0) tab = (HWND)SendMessageA(hdlg, PSM_GETTABCONTROL, 0, 0); r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); - todo_wine ok(r == 2, "got %d\n", r); + ok(r == 2, "got %d\n", r); ret = SendMessageA(hdlg, PSM_INSERTPAGE, (WPARAM)hpsp[1], (LPARAM)hpsp[2]); - todo_wine ok(ret == TRUE, "got %d\n", ret); + ok(ret == TRUE, "got %d\n", ret); r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); - todo_wine ok(r == 3, "got %d\n", r); + ok(r == 3, "got %d\n", r); /* add property sheet page that can't be created */ ret = SendMessageA(hdlg, PSM_INSERTPAGE, 1, (LPARAM)hpsp[3]); - todo_wine ok(ret == TRUE, "got %d\n", ret); + ok(ret == TRUE, "got %d\n", ret); r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); - todo_wine ok(r == 4, "got %d\n", r); + ok(r == 4, "got %d\n", r); /* select page that can't be created */ ret = SendMessageA(hdlg, PSM_SETCURSEL, 1, 0); - todo_wine ok(ret == TRUE, "got %d\n", ret); + ok(ret == TRUE, "got %d\n", ret); r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); - todo_wine ok(r == 3, "got %d\n", r); + ok(r == 3, "got %d\n", r); /* test PSP_PREMATURE flag with incorrect property sheet page */ ret = SendMessageA(hdlg, PSM_INSERTPAGE, 0, (LPARAM)hpsp[4]); ok(ret == FALSE, "got %d\n", ret); r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); - todo_wine ok(r == 3, "got %d\n", r); + ok(r == 3, "got %d\n", r); DestroyPropertySheetPage(hpsp[4]); DestroyWindow(hdlg);

1 0

Józef Kucia : wined3d: Implement buffer samplers.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 8be01c226e2819957b9656b123dc4e180a8cbdcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8be01c226e2819957b9656b12… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 26 13:07:33 2017 +0100 wined3d: Implement buffer samplers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 63b8360e4daeb6a1b86be1a400db9c32ad042be4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fedc216..78e1764 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -59,7 +59,7 @@ static const struct resource_type_info[] = { {0, 0, ""}, /* WINED3D_SHADER_RESOURCE_NONE */ - {1, 1, ""}, /* WINED3D_SHADER_RESOURCE_BUFFER */ + {1, 1, "Buffer"}, /* WINED3D_SHADER_RESOURCE_BUFFER */ {1, 1, "1D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_1D */ {2, 2, "2D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2D */ {2, 2, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMS */ @@ -2032,6 +2032,10 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont shadow_sampler = glsl_is_shadow_sampler(shader, ps_args, entry->resource_idx, entry->sampler_idx); switch (reg_maps->resource_info[entry->resource_idx].type) { + case WINED3D_SHADER_RESOURCE_BUFFER: + sampler_type = "samplerBuffer"; + break; + case WINED3D_SHADER_RESOURCE_TEXTURE_1D: if (shadow_sampler) sampler_type = "sampler1DShadow";

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
64
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 July 2017