wine-commits January 2020

wine-commits@winehq.org

1 participants
535 discussions

Zebediah Figura : strmbase: Move the IEnumMediaTypes implementation to pin.c.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: 85d411aa24a58647341a6c14a75bd2a61dd6a877 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85d411aa24a58647341a6c14… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 23:36:55 2020 -0600 strmbase: Move the IEnumMediaTypes implementation to pin.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/mediatype.c | 170 ------------------------------------- dlls/strmbase/pin.c | 176 +++++++++++++++++++++++++++++++++++++++ dlls/strmbase/strmbase_private.h | 2 - 3 files changed, 176 insertions(+), 172 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=85d411aa24a58647341a…

1 0

Zebediah Figura : strmbase: Return S_FALSE from IEnumPins::Next() when the pin count changes.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: 0820b125e29b5bfde9a6615e96cbd93efa56932f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0820b125e29b5bfde9a6615e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 23:36:54 2020 -0600 strmbase: Return S_FALSE from IEnumPins::Next() when the pin count changes. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 1 - dlls/quartz/tests/filesource.c | 1 - dlls/quartz/tests/mpegsplit.c | 1 - dlls/quartz/tests/waveparser.c | 1 - dlls/strmbase/filter.c | 2 +- 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 31cb767b60..4af101767d 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -353,7 +353,6 @@ static void test_enum_pins(void) graph = connect_input(filter, filename); hr = IEnumPins_Next(enum1, 1, pins, NULL); -todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IEnumPins_Reset(enum1); diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 3e571fa0e3..918605da6d 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -526,7 +526,6 @@ static void test_enum_pins(void) load_file(filter, filename); hr = IEnumPins_Next(enum1, 1, pins, NULL); -todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IEnumPins_Reset(enum1); diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index c45f982a02..67dd6d312d 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -347,7 +347,6 @@ static void test_enum_pins(void) graph = connect_input(filter, filename); hr = IEnumPins_Next(enum1, 1, pins, NULL); -todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IEnumPins_Reset(enum1); diff --git a/dlls/quartz/tests/waveparser.c b/dlls/quartz/tests/waveparser.c index 61ba2018e4..e9540bc0f5 100644 --- a/dlls/quartz/tests/waveparser.c +++ b/dlls/quartz/tests/waveparser.c @@ -351,7 +351,6 @@ static void test_enum_pins(void) graph = connect_input(filter, filename); hr = IEnumPins_Next(enum1, 1, pins, NULL); -todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IEnumPins_Reset(enum1); diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index a7e5fcd3f0..43da4b3fb9 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -122,7 +122,7 @@ static HRESULT WINAPI enum_pins_Next(IEnumPins *iface, ULONG count, IPin **pins, *ret_count = 0; if (enum_pins->version != enum_pins->filter->pin_version) - return VFW_E_ENUM_OUT_OF_SYNC; + return S_FALSE; for (i = 0; i < count; ++i) {

1 0

Francois Gouget : testbot: Lower the priority of long running mailing list jobs.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: tools Branch: master Commit: 98990095c322bda80a416744f76bc14f0bfdc31f URL: https://source.winehq.org/git/tools.git/?a=commit;h=98990095c322bda80a41674… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 29 12:54:23 2020 +0100 testbot: Lower the priority of long running mailing list jobs. This helps get as many patches tested as possible when a patch (series) requires full rebuilds and keeps the TestBot busy for a long time. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Patches.pm | 11 ++++++++--- testbot/web/Submit.pl | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index d021f9c..ca8d57f 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -152,7 +152,8 @@ sub Submit($$$) # Create a new job for this patch my $Jobs = CreateJobs(); my $NewJob = $Jobs->Add(); - $NewJob->Priority(6); + my $Priority = 5; + $NewJob->Priority($Priority); my $PropertyDescriptor = $Jobs->GetPropertyDescriptorByName("Remarks"); my $Subject = $self->Subject; $Subject =~ s/\[PATCH[^\]]*]//i; @@ -282,8 +283,11 @@ sub Submit($$$) my $Task = $Tasks->Add(); $Task->VM($VM); - $Task->Timeout(GetBuildTimeout($Impacts, $TaskMissions) + - GetTestTimeout($Impacts, $TaskMissions)); + my $Timeout = GetBuildTimeout($Impacts, $TaskMissions) + + GetTestTimeout($Impacts, $TaskMissions); + # Let short-running jobs run first + $Priority = 6 if ($Timeout >= $WineBuildTimeout); + $Task->Timeout($Timeout); $Task->Missions($TaskMissions->{Statement}); } } @@ -320,6 +324,7 @@ sub Submit($$$) # Switch Status to staging to indicate we are done setting up the job $NewJob->Status("staging"); + $NewJob->Priority($Priority); ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 1943b42..f76ca6e 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -1088,7 +1088,7 @@ sub _SubmitJob($$) my $Jobs = CreateJobs(); my $NewJob = $Jobs->Add(); $NewJob->User($self->GetCurrentSession()->User); - $NewJob->Priority(5); + $NewJob->Priority(4); $NewJob->Remarks($self->{Remarks} || $self->{CmdLineArg} || ""); my $Branch = CreateBranches()->GetItem($self->{Branch}); $NewJob->Branch($Branch) if (defined $Branch);

1 0

Francois Gouget : testbot: Share code to access the latest reference WineTest reports.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: tools Branch: master Commit: e8596e5b7a7d9710e367dfa3952cfca99992cd77 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e8596e5b7a7d9710e367dfa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 29 04:00:13 2020 +0100 testbot: Share code to access the latest reference WineTest reports. Also take the latest WineTest reports snapshot when the corresponding task completes rather than when the build task they depend on completes. This way the snapshot is taken closest to when the reference reports are needed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateTaskLogs | 12 ++--- testbot/bin/WineRunBuild.pl | 31 ----------- testbot/bin/WineRunTask.pl | 34 +++++------- testbot/bin/WineRunWineTest.pl | 65 ++++------------------ testbot/lib/WineTestBot/LogUtils.pm | 104 +++++++++++++++++++++++++++++++++++- testbot/lib/WineTestBot/Tasks.pm | 30 +++++++++++ 6 files changed, 160 insertions(+), 116 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=e8596e5b7a7d9710e36…

1 0

Francois Gouget : testbot/UpdateTaskLogs: Delete reference reports that are not supposed to exist.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: tools Branch: master Commit: f8b184aac20305cab757b7b4682e2b39c4867761 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f8b184aac20305cab757b7b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 29 04:01:47 2020 +0100 testbot/UpdateTaskLogs: Delete reference reports that are not supposed to exist. WineRunBuild used to take a snapshot of the reference logs for all the other tasks even if the build failed. Thus there could be reference logs even when the matching log does not exist. This patch ensures that 'UpdateTaskLogs --delete' still finds and deletes those. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateTaskLogs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index 5f858de..93b6504 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -256,11 +256,16 @@ sub ProcessTaskLogs($$$) if (($OptDelete or $OptRebuild) and !$CollectOnly) { - # Save / delete the task's reference reports - foreach my $ReportName (@{GetLogFileNames($TaskDir)}) + # Save / delete the task's reference reports... all of them, + # even if they were not supposed to exist (e.g. failed builds). + my ($ErrMessage, $ReportNames, $_TaskMissions) = $Task->GetReportNames(); + if ($ErrMessage) + { + Error "$ErrMessage\n"; + $Rc = 1; + } + foreach my $ReportName (@$ReportNames) { - next if ($ReportName !~ /\.report$/); - my $RefReportName = $Task->GetRefReportName($ReportName); my $RefReportPath = "$StepDir/$RefReportName";

1 0

Chip Davis : setupapi: Implement CM_Get_DevNode_Property[_Ex]W().
by Alexandre Julliard 28 Jan '20

28 Jan '20

Module: wine Branch: master Commit: 4588f10f8d3895624a8a2087f2e5c3c1b51e576f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4588f10f8d3895624a8a2087… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Sun Jan 26 18:02:37 2020 -0600 setupapi: Implement CM_Get_DevNode_Property[_Ex]W(). Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-devices-config-l1-1-0.spec | 2 +- .../api-ms-win-devices-config-l1-1-1.spec | 2 +- dlls/cfgmgr32/cfgmgr32.spec | 2 + dlls/setupapi/devinst.c | 105 +++++++++++++++------ dlls/setupapi/setupapi.spec | 2 + 5 files changed, 83 insertions(+), 30 deletions(-) diff --git a/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec b/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec index 6fe5ee3b21..59004c997f 100644 --- a/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec +++ b/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec @@ -8,7 +8,7 @@ @ stub CM_Get_Class_Property_Keys @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth -@ stub CM_Get_DevNode_PropertyW +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) setupapi.CM_Get_DevNode_PropertyW @ stub CM_Get_DevNode_Property_Keys @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW @ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status diff --git a/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec b/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec index 33dad4eaac..e10352eda5 100644 --- a/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec +++ b/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec @@ -8,7 +8,7 @@ @ stub CM_Get_Class_Property_Keys @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth -@ stub CM_Get_DevNode_PropertyW +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) setupapi.CM_Get_DevNode_PropertyW @ stub CM_Get_DevNode_Property_Keys @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW @ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 20ede7b13d..8360048421 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -57,6 +57,8 @@ @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth @ stub CM_Get_Depth_Ex +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) setupapi.CM_Get_DevNode_PropertyW +@ stdcall CM_Get_DevNode_Property_ExW(long ptr ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Property_ExW @ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyA @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExA diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 25d4040da0..f8a4e93efc 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4177,47 +4177,26 @@ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, return (have_guid || have_name); } -/*********************************************************************** - * SetupDiGetDevicePropertyW (SETUPAPI.@) - */ -BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_data, - const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, BYTE *prop_buff, - DWORD prop_buff_size, DWORD *required_size, DWORD flags) +static LSTATUS get_device_property(struct device *device, const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, + BYTE *prop_buff, DWORD prop_buff_size, DWORD *required_size, DWORD flags) { - static const WCHAR formatW[] = {'\\', '%', '0', '4', 'X', 0}; - WCHAR key_path[55] = {'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\\'}; + WCHAR key_path[55] = L"Properties\\"; HKEY hkey; DWORD value_type; DWORD value_size = 0; LSTATUS ls; - struct device *device; - - TRACE("%p, %p, %p, %p, %p, %d, %p, %#x\n", devinfo, device_data, prop_key, prop_type, prop_buff, prop_buff_size, - required_size, flags); - - if (!(device = get_device(devinfo, device_data))) - return FALSE; if (!prop_key) - { - SetLastError(ERROR_INVALID_DATA); - return FALSE; - } + return ERROR_INVALID_DATA; if (!prop_type || (!prop_buff && prop_buff_size)) - { - SetLastError(ERROR_INVALID_USER_BUFFER); - return FALSE; - } + return ERROR_INVALID_USER_BUFFER; if (flags) - { - SetLastError(ERROR_INVALID_FLAGS); - return FALSE; - } + return ERROR_INVALID_FLAGS; SETUPDI_GuidToString(&prop_key->fmtid, key_path + 11); - swprintf(key_path + 49, ARRAY_SIZE(key_path) - 49, formatW, prop_key->pid); + swprintf(key_path + 49, ARRAY_SIZE(key_path) - 49, L"\\%04X", prop_key->pid); ls = RegOpenKeyExW(device->key, key_path, 0, KEY_QUERY_VALUE, &hkey); if (!ls) @@ -4248,10 +4227,80 @@ BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_ if (required_size) *required_size = value_size; + return ls; +} + +/*********************************************************************** + * SetupDiGetDevicePropertyW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_data, + const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, BYTE *prop_buff, + DWORD prop_buff_size, DWORD *required_size, DWORD flags) +{ + struct device *device; + LSTATUS ls; + + TRACE("%p, %p, %p, %p, %p, %d, %p, %#x\n", devinfo, device_data, prop_key, prop_type, prop_buff, prop_buff_size, + required_size, flags); + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + ls = get_device_property(device, prop_key, prop_type, prop_buff, prop_buff_size, required_size, flags); + SetLastError(ls); return !ls; } +/*********************************************************************** + * CM_Get_DevNode_Property_ExW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_Property_ExW(DEVINST devnode, const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, + BYTE *prop_buff, ULONG *prop_buff_size, ULONG flags, HMACHINE machine) +{ + struct device *device = get_devnode_device(devnode); + LSTATUS ls; + + TRACE("%u, %p, %p, %p, %p, %#x, %p\n", devnode, prop_key, prop_type, prop_buff, prop_buff_size, + flags, machine); + + if (machine) + return CR_MACHINE_UNAVAILABLE; + + if (!device) + return CR_NO_SUCH_DEVINST; + + if (!prop_buff_size) + return CR_INVALID_POINTER; + + ls = get_device_property(device, prop_key, prop_type, prop_buff, *prop_buff_size, prop_buff_size, flags); + switch (ls) + { + case NO_ERROR: + return CR_SUCCESS; + case ERROR_INVALID_DATA: + return CR_INVALID_DATA; + case ERROR_INVALID_USER_BUFFER: + return CR_INVALID_POINTER; + case ERROR_INVALID_FLAGS: + return CR_INVALID_FLAG; + case ERROR_INSUFFICIENT_BUFFER: + return CR_BUFFER_SMALL; + case ERROR_NOT_FOUND: + return CR_NO_SUCH_VALUE; + } + return CR_FAILURE; +} + +/*********************************************************************** + * CM_Get_DevNode_PropertyW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_PropertyW(DEVINST dev, const DEVPROPKEY *key, DEVPROPTYPE *type, + PVOID buf, PULONG len, ULONG flags) +{ + return CM_Get_DevNode_Property_ExW(dev, key, type, buf, len, flags, NULL); +} + /*********************************************************************** * SetupDiInstallDeviceInterfaces (SETUPAPI.@) */ diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 8c4ebcc101..74c252c6fd 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -67,6 +67,8 @@ @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) @ stub CM_Get_Depth @ stub CM_Get_Depth_Ex +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) +@ stdcall CM_Get_DevNode_Property_ExW(long ptr ptr ptr ptr long ptr) @ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr ptr long) @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr)

1 0

Henri Verbeet : d2d1: Pass previous and next vectors to d2d_geometry_outline_add_join().
by Alexandre Julliard 28 Jan '20

28 Jan '20

Module: wine Branch: master Commit: 1fe3f60f68ae5bd47cf22914d15566a77d2e64a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fe3f60f68ae5bd47cf22914… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 27 15:55:27 2020 +0330 d2d1: Pass previous and next vectors to d2d_geometry_outline_add_join(). Instead of the points. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 90 +++++++++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 40 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index e2a44c30b6..a61ce692b9 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2090,7 +2090,7 @@ static BOOL d2d_path_geometry_add_figure(struct d2d_geometry *geometry) static BOOL d2d_geometry_outline_add_join(struct d2d_geometry *geometry, const D2D1_POINT_2F *prev, const D2D1_POINT_2F *p0, const D2D1_POINT_2F *next) { - D2D1_POINT_2F q_prev, q_next; + static const D2D1_POINT_2F origin = {0.0f, 0.0f}; struct d2d_outline_vertex *v; struct d2d_face *f; size_t base_idx; @@ -2113,35 +2113,29 @@ static BOOL d2d_geometry_outline_add_join(struct d2d_geometry *geometry, } f = &geometry->outline.faces[geometry->outline.face_count]; - d2d_point_subtract(&q_prev, p0, prev); - d2d_point_subtract(&q_next, next, p0); - - d2d_point_normalise(&q_prev); - d2d_point_normalise(&q_next); - - ccw = d2d_point_ccw(p0, prev, next); + ccw = d2d_point_ccw(&origin, prev, next); if (ccw == 0.0f) { - d2d_outline_vertex_set(&v[0], p0->x, p0->y, q_prev.x, q_prev.y, q_prev.x, q_prev.y); - d2d_outline_vertex_set(&v[1], p0->x, p0->y, -q_prev.x, -q_prev.y, -q_prev.x, -q_prev.y); - d2d_outline_vertex_set(&v[2], p0->x + 25.0f * q_prev.x, p0->y + 25.0f * q_prev.y, - -q_prev.x, -q_prev.y, -q_prev.x, -q_prev.y); - d2d_outline_vertex_set(&v[3], p0->x + 25.0f * q_prev.x, p0->y + 25.0f * q_prev.y, - q_prev.x, q_prev.y, q_prev.x, q_prev.y); + d2d_outline_vertex_set(&v[0], p0->x, p0->y, -prev->x, -prev->y, -prev->x, -prev->y); + d2d_outline_vertex_set(&v[1], p0->x, p0->y, prev->x, prev->y, prev->x, prev->y); + d2d_outline_vertex_set(&v[2], p0->x + 25.0f * -prev->x, p0->y + 25.0f * -prev->y, + prev->x, prev->y, prev->x, prev->y); + d2d_outline_vertex_set(&v[3], p0->x + 25.0f * -prev->x, p0->y + 25.0f * -prev->y, + -prev->x, -prev->y, -prev->x, -prev->y); } else if (ccw < 0.0f) { - d2d_outline_vertex_set(&v[0], p0->x, p0->y, q_next.x, q_next.y, q_prev.x, q_prev.y); - d2d_outline_vertex_set(&v[1], p0->x, p0->y, -q_next.x, -q_next.y, -q_next.x, -q_next.y); - d2d_outline_vertex_set(&v[2], p0->x, p0->y, -q_next.x, -q_next.y, -q_prev.x, -q_prev.y); - d2d_outline_vertex_set(&v[3], p0->x, p0->y, -q_prev.x, -q_prev.y, -q_prev.x, -q_prev.y); + d2d_outline_vertex_set(&v[0], p0->x, p0->y, next->x, next->y, -prev->x, -prev->y); + d2d_outline_vertex_set(&v[1], p0->x, p0->y, -next->x, -next->y, -next->x, -next->y); + d2d_outline_vertex_set(&v[2], p0->x, p0->y, -next->x, -next->y, prev->x, prev->y); + d2d_outline_vertex_set(&v[3], p0->x, p0->y, prev->x, prev->y, prev->x, prev->y); } else { - d2d_outline_vertex_set(&v[0], p0->x, p0->y, -q_prev.x, -q_prev.y, -q_next.x, -q_next.y); - d2d_outline_vertex_set(&v[1], p0->x, p0->y, q_prev.x, q_prev.y, q_prev.x, q_prev.y); - d2d_outline_vertex_set(&v[2], p0->x, p0->y, q_prev.x, q_prev.y, q_next.x, q_next.y); - d2d_outline_vertex_set(&v[3], p0->x, p0->y, q_next.x, q_next.y, q_next.x, q_next.y); + d2d_outline_vertex_set(&v[0], p0->x, p0->y, prev->x, prev->y, -next->x, -next->y); + d2d_outline_vertex_set(&v[1], p0->x, p0->y, -prev->x, -prev->y, -prev->x, -prev->y); + d2d_outline_vertex_set(&v[2], p0->x, p0->y, -prev->x, -prev->y, next->x, next->y); + d2d_outline_vertex_set(&v[3], p0->x, p0->y, next->x, next->y, next->x, next->y); } geometry->outline.vertex_count += 4; @@ -2304,11 +2298,21 @@ static BOOL d2d_geometry_add_figure_outline(struct d2d_geometry *geometry, else next = &figure->vertices[i + 1]; - if ((figure_end == D2D1_FIGURE_END_CLOSED || (i && i < figure->vertex_count - 1)) - && !d2d_geometry_outline_add_join(geometry, prev, p0, next)) + if (figure_end == D2D1_FIGURE_END_CLOSED || (i && i < figure->vertex_count - 1)) { - ERR("Failed to add join.\n"); - return FALSE; + D2D1_POINT_2F q_next, q_prev; + + d2d_point_subtract(&q_prev, prev, p0); + d2d_point_subtract(&q_next, next, p0); + + d2d_point_normalise(&q_prev); + d2d_point_normalise(&q_next); + + if (!d2d_geometry_outline_add_join(geometry, &q_prev, p0, &q_next)) + { + ERR("Failed to add join.\n"); + return FALSE; + } } if (type == D2D_VERTEX_TYPE_LINE && (figure_end == D2D1_FIGURE_END_CLOSED || i < figure->vertex_count - 1) @@ -4077,9 +4081,24 @@ static const struct ID2D1RectangleGeometryVtbl d2d_rectangle_geometry_vtbl = HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory, const D2D1_RECT_F *rect) { struct d2d_face *f; - D2D1_POINT_2F *v, v0p, v0n, v1p, v1n, v2p, v2n, v3p, v3n; + D2D1_POINT_2F *v; float l, r, t, b; + static const D2D1_POINT_2F prev[] = + { + { 1.0f, 0.0f}, + { 0.0f, -1.0f}, + {-1.0f, 0.0f}, + { 0.0f, 1.0f}, + }; + static const D2D1_POINT_2F next[] = + { + { 0.0f, 1.0f}, + { 1.0f, 0.0f}, + { 0.0f, -1.0f}, + {-1.0f, 0.0f}, + }; + d2d_geometry_init(geometry, factory, &identity, (ID2D1GeometryVtbl *)&d2d_rectangle_geometry_vtbl); geometry->u.rectangle.rect = *rect; @@ -4106,15 +4125,6 @@ HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory d2d_face_set(&f[1], 0, 2, 3); geometry->fill.face_count = 2; - d2d_point_set(&v0p, l+1.0f, t); - d2d_point_set(&v0n, l, t+1.0f); - d2d_point_set(&v1p, l, b-1.0f); - d2d_point_set(&v1n, l+1.0f, b); - d2d_point_set(&v2p, r-1.0f, b); - d2d_point_set(&v2n, r, b-1.0f); - d2d_point_set(&v3p, r, t+1.0f); - d2d_point_set(&v3n, r-1.0f, t); - if (!d2d_geometry_outline_add_line_segment(geometry, &v[0], &v[1])) goto fail; if (!d2d_geometry_outline_add_line_segment(geometry, &v[1], &v[2])) @@ -4124,13 +4134,13 @@ HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory if (!d2d_geometry_outline_add_line_segment(geometry, &v[3], &v[0])) goto fail; - if (!d2d_geometry_outline_add_join(geometry, &v0p, &v[0], &v0n)) + if (!d2d_geometry_outline_add_join(geometry, &prev[0], &v[0], &next[0])) goto fail; - if (!d2d_geometry_outline_add_join(geometry, &v1p, &v[1], &v1n)) + if (!d2d_geometry_outline_add_join(geometry, &prev[1], &v[1], &next[1])) goto fail; - if (!d2d_geometry_outline_add_join(geometry, &v2p, &v[2], &v2n)) + if (!d2d_geometry_outline_add_join(geometry, &prev[2], &v[2], &next[2])) goto fail; - if (!d2d_geometry_outline_add_join(geometry, &v3p, &v[3], &v3n)) + if (!d2d_geometry_outline_add_join(geometry, &prev[3], &v[3], &next[3])) goto fail; return S_OK;

1 0

Zebediah Figura : httpapi: Stub HttpSetRequestQueueProperty().
by Alexandre Julliard 28 Jan '20

28 Jan '20

Module: wine Branch: master Commit: afe9217b57c9077dce20a6c9762ae27813d43b5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=afe9217b57c9077dce20a6c9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 27 10:56:39 2020 -0600 httpapi: Stub HttpSetRequestQueueProperty(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48514 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi.spec | 1 + dlls/httpapi/httpapi_main.c | 11 +++++++++++ include/http.h | 1 + 3 files changed, 13 insertions(+) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index c27d0c96b0..e1a16c39ab 100644 --- a/dlls/httpapi/httpapi.spec +++ b/dlls/httpapi/httpapi.spec @@ -51,6 +51,7 @@ @ stub HttpSetAppPoolInformation @ stub HttpSetConfigGroupInformation @ stub HttpSetControlChannelInformation +@ stdcall HttpSetRequestQueueProperty(ptr long ptr long long ptr) @ stub HttpSetServerContextInformation @ stdcall HttpSetServiceConfiguration(ptr long ptr long ptr) @ stdcall HttpSetUrlGroupProperty(int64 long ptr long) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 8adbd38be5..c24cadfaeb 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -760,3 +760,14 @@ ULONG WINAPI HttpCloseRequestQueue(HANDLE handle) return GetLastError(); return ERROR_SUCCESS; } + +/*********************************************************************** + * HttpSetRequestQueueProperty (HTTPAPI.@) + */ +ULONG WINAPI HttpSetRequestQueueProperty(HANDLE queue, HTTP_SERVER_PROPERTY property, + void *value, ULONG length, ULONG reserved1, void *reserved2) +{ + FIXME("queue %p, property %u, value %p, length %u, reserved1 %#x, reserved2 %p, stub!\n", + queue, property, value, length, reserved1, reserved2); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/include/http.h b/include/http.h index 394167fd68..f569c1ecb5 100644 --- a/include/http.h +++ b/include/http.h @@ -447,6 +447,7 @@ ULONG WINAPI HttpReceiveRequestEntityBody(HANDLE queue, HTTP_REQUEST_ID id, ULON ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url); ULONG WINAPI HttpRemoveUrlFromUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, ULONG flags); ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_RESPONSE *response, HTTP_CACHE_POLICY *cache_policy, ULONG *ret_size, void *reserved1, ULONG reserved2, OVERLAPPED *ovl, HTTP_LOG_DATA *log_data); +ULONG WINAPI HttpSetRequestQueueProperty(HANDLE queue, HTTP_SERVER_PROPERTY property, void *value, ULONG length, ULONG reserved1, void *reserved2); ULONG WINAPI HttpSetServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); ULONG WINAPI HttpSetUrlGroupProperty(HTTP_URL_GROUP_ID id, HTTP_SERVER_PROPERTY property, void *value, ULONG length);

1 0

Zebediah Figura : kernelbase: Implement ReOpenFile().
by Alexandre Julliard 28 Jan '20

28 Jan '20

Module: wine Branch: master Commit: c7019a8887a3b035ce6b1ff6b113a8b5c0cc5e04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7019a8887a3b035ce6b1ff6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 27 11:06:43 2020 -0600 kernelbase: Implement ReOpenFile(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47668 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 101 +++++++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/file.c | 80 ++++++++++++++++++++++++----------- 2 files changed, 158 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c7019a8887a3b035ce6b…

1 0

Zebediah Figura : rpcrt4: Use a critical section for the context handle lock.
by Alexandre Julliard 28 Jan '20

28 Jan '20

Module: wine Branch: master Commit: 76238898fc4ef41b6eb57c5e2589a7579ee6e3c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76238898fc4ef41b6eb57c5e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 27 17:04:11 2020 -0600 rpcrt4: Use a critical section for the context handle lock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_assoc.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/rpc_assoc.c b/dlls/rpcrt4/rpc_assoc.c index 504f4d66c8..ab865c2de1 100644 --- a/dlls/rpcrt4/rpc_assoc.c +++ b/dlls/rpcrt4/rpc_assoc.c @@ -24,7 +24,6 @@ #include "rpc.h" #include "rpcndr.h" -#include "winternl.h" #include "wine/debug.h" @@ -55,7 +54,7 @@ typedef struct _RpcContextHandle NDR_RUNDOWN rundown_routine; void *ctx_guard; UUID uuid; - RTL_RWLOCK rw_lock; + CRITICAL_SECTION lock; unsigned int refs; } RpcContextHandle; @@ -463,12 +462,13 @@ RPC_STATUS RpcServerAssoc_AllocateContextHandle(RpcAssoc *assoc, void *CtxGuard, return RPC_S_OUT_OF_MEMORY; context_handle->ctx_guard = CtxGuard; - RtlInitializeResource(&context_handle->rw_lock); + InitializeCriticalSection(&context_handle->lock); + context_handle->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcContextHandle.lock"); context_handle->refs = 1; /* lock here to mirror unmarshall, so we don't need to special-case the * freeing of a non-marshalled context handle */ - RtlAcquireResourceExclusive(&context_handle->rw_lock, TRUE); + EnterCriticalSection(&context_handle->lock); EnterCriticalSection(&assoc->cs); list_add_tail(&assoc->context_handle_list, &context_handle->entry); @@ -500,7 +500,7 @@ RPC_STATUS RpcServerAssoc_FindContextHandle(RpcAssoc *assoc, const UUID *uuid, { LeaveCriticalSection(&assoc->cs); TRACE("found %p\n", context_handle); - RtlAcquireResourceExclusive(&context_handle->rw_lock, TRUE); + EnterCriticalSection(&context_handle->lock); return RPC_S_OK; } } @@ -555,7 +555,8 @@ static void RpcContextHandle_Destroy(RpcContextHandle *context_handle) context_handle->rundown_routine(context_handle->user_context); } - RtlDeleteResource(&context_handle->rw_lock); + context_handle->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&context_handle->lock); HeapFree(GetProcessHeap(), 0, context_handle); } @@ -566,7 +567,7 @@ unsigned int RpcServerAssoc_ReleaseContextHandle(RpcAssoc *assoc, NDR_SCONTEXT S unsigned int refs; if (release_lock) - RtlReleaseResource(&context_handle->rw_lock); + LeaveCriticalSection(&context_handle->lock); EnterCriticalSection(&assoc->cs); refs = --context_handle->refs;

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
54
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 January 2020