wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Zebediah Figura : vkd3d-shader: Forbid storage modifiers on struct fields.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: vkd3d Branch: master Commit: e285fc57d2a86d982dc375f47699d08f303b04ac URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e285fc57d2a86d982dc375f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 22 17:02:35 2021 -0500 vkd3d-shader: Forbid storage modifiers on struct fields. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 1 - libs/vkd3d-shader/hlsl.h | 1 - libs/vkd3d-shader/hlsl.y | 15 +++++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 85859ad..4526348 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -340,7 +340,6 @@ struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, u field->name = vkd3d_strdup(old_field->name); if (old_field->semantic) field->semantic = vkd3d_strdup(old_field->semantic); - field->modifiers = old_field->modifiers; field->reg_offset = reg_size; reg_size += field->type->reg_size; list_add_tail(type->e.elements, &field->entry); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 819b882..523d156 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -134,7 +134,6 @@ struct hlsl_struct_field struct hlsl_type *type; const char *name; const char *semantic; - DWORD modifiers; unsigned int reg_offset; }; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 45767de..4b0ddea 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -721,8 +721,7 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_ return new_type; } -static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *type, - DWORD modifiers, struct list *fields) +static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *type, struct list *fields) { struct parse_variable_def *v, *v_next; struct hlsl_struct_field *field; @@ -748,7 +747,6 @@ static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *ty field->type = hlsl_new_array_type(ctx, field->type, v->arrays.sizes[i]); field->loc = v->loc; field->name = v->name; - field->modifiers = modifiers; field->semantic = v->semantic; if (v->initializer.args_count) { @@ -1937,7 +1935,16 @@ field: if (!(type = apply_type_modifiers(ctx, $2, &modifiers, @1))) YYABORT; - $$ = gen_struct_fields(ctx, type, modifiers, $3); + if (modifiers) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_modifiers_to_string(&ctx->string_buffers, modifiers))) + hlsl_error(ctx, @1, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + "Modifiers '%s' are not allowed on struct fields.", string->buffer); + vkd3d_string_buffer_release(&ctx->string_buffers, string); + } + $$ = gen_struct_fields(ctx, type, $3); } func_declaration:

1 0

Francois Gouget : testbot/reporttest: Remove the revision placeholder from start lines.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: tools Branch: master Commit: 73f7e3c5140f34cfd81e4e5d7441ffc9690ce31a URL: https://source.winehq.org/git/tools.git/?a=commit;h=73f7e3c5140f34cfd81e4e5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 24 14:31:07 2021 +0100 testbot/reporttest: Remove the revision placeholder from start lines. Back in the CVS days the start line contained the revision of the test file. But it has been replaced by a placeholder since the switch to Git. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 99 +++++++++++++++++----------------- testbot/src/reporttest/reporttest.c | 2 +- 2 files changed, 51 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=73f7e3c5140f34cfd81…

1 0

Francois Gouget : testbot/TestLauncher: Remove the revision placeholder from start lines.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: tools Branch: master Commit: 0bcbe8440ec24cc8101d156943304a54d17298c8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0bcbe8440ec24cc8101d156… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 24 14:31:02 2021 +0100 testbot/TestLauncher: Remove the revision placeholder from start lines. Back in the CVS days the start line contained the revision of the test file. But it has been replaced by a placeholder since the switch to Git. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index dd34a76..58eed76 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -231,7 +231,7 @@ int main(int argc, char *argv[]) } Start = GetTickCount(); - printf("%s:%s start - -\n", TestName, Subtest); + printf("%s:%s start -\n", TestName, Subtest); fflush(stdout); StartupInfo.cb = sizeof(STARTUPINFOA);

1 0

Jeremy Newman : load mailman key from file
by Jeremy Newman 24 Mar '21

24 Mar '21

Module: website Branch: master Commit: 692a99ed0750a01f6db35a0d630c555242d5b508 URL: https://source.winehq.org/git/website.git/?a=commit;h=692a99ed0750a01f6db35… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Mar 24 13:34:51 2021 -0500 load mailman key from file --- include/plugins/mailman_key.php | 14 ++++++++++++++ include/winehq.conf.sample | 3 +++ templates/en/forums.template | 9 ++++++--- templates/nl/forums.template | 2 +- templates/zh-cn/forums.template | 7 ++++--- 5 files changed, 28 insertions(+), 7 deletions(-) diff --git a/include/plugins/mailman_key.php b/include/plugins/mailman_key.php new file mode 100644 index 00000000..89de3fee --- /dev/null +++ b/include/plugins/mailman_key.php @@ -0,0 +1,14 @@ +<?php + +/* + WineHQ Mailman Key + by Jeremy Newman <jnewman(a)codeweavers.com> +*/ + +if (file_exists($config->mailman_key)) + echo base64_encode(trim(file_get_contents($config->mailman_key))); +else + echo "ERROR: Unable to load key!"; + +// done +?> diff --git a/include/winehq.conf.sample b/include/winehq.conf.sample index 7cbc760f..d301675f 100644 --- a/include/winehq.conf.sample +++ b/include/winehq.conf.sample @@ -40,3 +40,6 @@ bug_system: https://bugs.winehq.org/show_bug.cgi?id= # URL for git tree git_tree: https://source.winehq.org/git + +# Filename of Mailman Key for forums page +mailman_key: \ No newline at end of file diff --git a/templates/en/forums.template b/templates/en/forums.template index 62cd68eb..81d333dd 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -39,12 +39,15 @@ or just use <a href="//www.winehq.org/mailman/listinfo">the Mailman web interfac </p> <p> <b>Username:</b> <code>mailman</code><br> - <b>Password:</b> <code class="getForumKey bold cursor" data-code="RnljREw3S2tDdmhXUmJiRQ== + <b>Password:</b> <code class="getForumKey bold cursor" data-code=" ">**********************</code> </p> <p> - Click the code to reveal the actual password.<br> - This password may change from time to time, so check back here for changes. + Click the code to reveal the actual password. + </p> + <p> + <b>Note:</b> This password updates regularly, so check back here for changes.<br> + <b>Warning:</b> Entering the password wrong multiple times will result in a 24 hour ban from the website. </p> </div> diff --git a/templates/nl/forums.template b/templates/nl/forums.template index 41ee86fe..ffe6e2d4 100644 --- a/templates/nl/forums.template +++ b/templates/nl/forums.template @@ -45,7 +45,7 @@ Mailman gebruikersomgeving</a> website.</p> </tr> <tr> <td><b>Wachtwoord:</b></td> - <td><code class="getForumKey bold cursor" data-code="RnljREw3S2tDdmhXUmJiRQ== + <td><code class="getForumKey bold cursor" data-code=" ">**********************</code></td> <tr> </table> diff --git a/templates/zh-cn/forums.template b/templates/zh-cn/forums.template index 7304801e..b38cafe8 100644 --- a/templates/zh-cn/forums.template +++ b/templates/zh-cn/forums.template @@ -32,7 +32,8 @@ WWW</a>，或者发送一封标题为 <code>"subscribe"</code> 的邮件到 <cod </p> <p> <b>用户名：</b> <code>mailman</code><br> - <b>密码：</b> <code>getalist</code> + <b>密码：</b> <code class="getForumKey bold cursor" data-code=" +">**********************</code> </p> <p>密码会时不时更新，请从这里获取最新的密码。</p> </div> @@ -42,8 +43,8 @@ WWW</a>，或者发送一封标题为 <code>"subscribe"</code> 的邮件到 <cod <ul class="roomy"> <li> <b><a href="mailto:wine-announce@winehq.org">wine-announce(a)winehq.org</a></b><br> - [<a href="//www.winehq.org/mailman/listinfo/wine-announce">（取消）订阅</a>] - [<a href="//www.winehq.org/pipermail/wine-announce/">存档 1</a>] + [<a href="//www.winehq.org/mailman/listinfo/wine-announce">（取消）订阅</a>] + [<a href="//www.winehq.org/pipermail/wine-announce/">存档 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.announce">存档 2</a>]<br> 一个低流量（2封/月）的只读列表，用于宣布发布和其他主要的 Wine 或者 WineHQ 消息。 </li>

1 0

Jeremy Newman : remove google analytics
by Jeremy Newman 24 Mar '21

24 Mar '21

Module: website Branch: master Commit: da6f641ceca7502e6a7f667feb108072e67515ac URL: https://source.winehq.org/git/website.git/?a=commit;h=da6f641ceca7502e6a7f6… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Mar 24 13:13:25 2021 -0500 remove google analytics --- include/plugins/google_analytics.php | 19 ------------------- templates/en/global/google_analytics.template | 8 -------- templates/en/global/layout/content.template | 6 ++---- templates/zh-cn/global/layout/content.template | 6 ++---- 4 files changed, 4 insertions(+), 35 deletions(-) diff --git a/include/plugins/google_analytics.php b/include/plugins/google_analytics.php deleted file mode 100644 index 2850afb7..00000000 --- a/include/plugins/google_analytics.php +++ /dev/null @@ -1,19 +0,0 @@ -<?php - -/* - * WineHQ.org - * by Jeremy Newman <jnewman(a)codeweavers.com> - */ - -/* - Loads Google Analytics Statistics -*/ - -if (!empty($config->google_analytics)) -{ - // display the google analytics code - echo $html->template("local", "global/google_analytics", array('gcode' => $config->google_analytics)); -} - -// done -?> diff --git a/templates/en/global/google_analytics.template b/templates/en/global/google_analytics.template deleted file mode 100644 index 9b55ba3f..00000000 --- a/templates/en/global/google_analytics.template +++ /dev/null @@ -1,8 +0,0 @@ - <script> - (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ - (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), - m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) - })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); - ga('create', '{$gcode}', 'auto'); - ga('send', 'pageview'); - </script> diff --git a/templates/en/global/layout/content.template b/templates/en/global/layout/content.template index 03961319..9641b1ec 100644 --- a/templates/en/global/layout/content.template +++ b/templates/en/global/layout/content.template @@ -1,8 +1,8 @@ <!doctype html> <html lang="{$html_lang}">  - <link rel="shortcut icon" type="image/png" href="https://dl.winehq.org/share/images/winehq_logo_16.png"> {$rss_link} </head> diff --git a/templates/zh-cn/global/layout/content.template b/templates/zh-cn/global/layout/content.template index 715f36e4..a7705992 100644 --- a/templates/zh-cn/global/layout/content.template +++ b/templates/zh-cn/global/layout/content.template @@ -1,8 +1,8 @@ <!doctype html> <html lang="{$html_lang}">  - <link rel="shortcut icon" type="image/png" href="https://dl.winehq.org/share/images/winehq_logo_16.png"> {$rss_link} </head>

1 0

Jeremy Newman : update with latest defaults
by Jeremy Newman 24 Mar '21

24 Mar '21

Module: website Branch: master Commit: 375867c364da53377241b55bee1804b7c5386046 URL: https://source.winehq.org/git/website.git/?a=commit;h=375867c364da53377241b… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Mar 24 13:13:06 2021 -0500 update with latest defaults --- include/winehq.conf.sample | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/include/winehq.conf.sample b/include/winehq.conf.sample index 4d3376a5..7cbc760f 100644 --- a/include/winehq.conf.sample +++ b/include/winehq.conf.sample @@ -20,13 +20,13 @@ site_name: WineHQ lang: en # available languages -@languages: en, de, es, fr, ko, pl, pt, tr, uk, zh-cn +@languages: en, de, es, fr, ko, nl, pl, pt, tr, uk, zh-cn # pages that use PATH_INFO @stop_pages: announce, interview, lang, news, wwn # default base URLS -base_root: +base_root: base_url: https://www.winehq.org{$base_root}/ # Path to WWN XML files @@ -36,10 +36,7 @@ news_xml_path: ./news wwn_xml_path: ./wwn # URL for bugs -bug_system: http://bugs.winehq.org/show_bug.cgi?id= +bug_system: https://bugs.winehq.org/show_bug.cgi?id= # URL for git tree -git_tree: http://source.winehq.org/git - -# Google Analytics Tracking Code -google_analytics: +git_tree: https://source.winehq.org/git

1 0

Jeremy Newman : base_url: detect https
by Jeremy Newman 24 Mar '21

24 Mar '21

Module: website Branch: master Commit: 8fb5a208ca5b78e43d5a017ae6eb803cabcd70fb URL: https://source.winehq.org/git/website.git/?a=commit;h=8fb5a208ca5b78e43d5a0… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Mar 24 13:12:12 2021 -0500 base_url: detect https --- include/html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/html.php b/include/html.php index eb65ed4f..ca744580 100644 --- a/include/html.php +++ b/include/html.php @@ -257,7 +257,7 @@ class html } // return constructed URL - if (!empty($GLOBALS['config']->use_https)) + if (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off') return "https://{$url_domain}{$this->_web_root}"; else return "http://{$url_domain}{$this->_web_root}";

1 0

Arkadiusz Hiler : ntoskrnl.exe: Use correct name format when sending WM_DEVICECHANGE.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: master Commit: f69c8f018188af49d5a3916f7bb7e3ab984fd3ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=f69c8f018188af49d5a3916f… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Mar 23 20:10:10 2021 +0200 ntoskrnl.exe: Use correct name format when sending WM_DEVICECHANGE. This fixes controller hotplug with FarCry Primal. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 4a1fbf001a4..6652be73c47 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -776,6 +776,7 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable broadcast->dbcc_reserved = 0; broadcast->dbcc_classguid = iface->interface_class; lstrcpynW( broadcast->dbcc_name, name->Buffer, namelen + 1 ); + if (namelen > 1) broadcast->dbcc_name[1] = '\\'; send_devicechange( enable ? DBT_DEVICEARRIVAL : DBT_DEVICEREMOVECOMPLETE, broadcast, len ); heap_free( broadcast ); }

1 0

Arkadiusz Hiler : dinput: Implement device creation using product GUID.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: master Commit: 0a82d891fc0b5b7f8b176e5e52d8858bab8d28bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a82d891fc0b5b7f8b176e5e… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Mar 23 20:00:36 2021 +0200 dinput: Implement device creation using product GUID. This fixes Far Cry Primal controller discovery. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick.c | 4 ++-- dlls/dinput/joystick_linux.c | 10 ++++++++++ dlls/dinput/joystick_linuxinput.c | 10 ++++++++++ dlls/dinput/joystick_osx.c | 16 ++++++++++++++++ dlls/dinput/tests/device.c | 22 ++++++++++++++++++++++ 5 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 2eab4d3a33d..f9b89d2d70c 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -717,7 +717,7 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceInfo( index = pd.dwData; /* Return joystick */ - pdidi->guidInstance = This->guidInstance; + pdidi->guidInstance = This->base.guid; pdidi->guidProduct = This->guidProduct; /* we only support traditional joysticks for now */ pdidi->dwDevType = This->devcaps.dwDevType; @@ -761,7 +761,7 @@ HRESULT WINAPI JoystickWGenericImpl_GetDeviceInfo( index = pd.dwData; /* Return joystick */ - pdidi->guidInstance = This->guidInstance; + pdidi->guidInstance = This->base.guid; pdidi->guidProduct = This->guidProduct; /* we only support traditional joysticks for now */ pdidi->dwDevType = This->devcaps.dwDevType; diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 2b26eb806d3..79a077a027c 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -598,6 +598,7 @@ static unsigned short get_joystick_index(REFGUID guid) { GUID wine_joystick = DInput_Wine_Joystick_GUID; GUID dev_guid = *guid; + INT i; wine_joystick.Data3 = 0; dev_guid.Data3 = 0; @@ -608,6 +609,9 @@ static unsigned short get_joystick_index(REFGUID guid) /* for the wine joystick GUIDs use the index stored in Data3 */ if(IsEqualGUID(&wine_joystick, &dev_guid)) return guid->Data3; + for(i = 0; i < joystick_devices_count; i++) + if(IsEqualGUID(&joystick_devices[i].guid_product, guid)) return i; + return MAX_JOYSTICKS; } @@ -790,6 +794,9 @@ static HRESULT WINAPI JoystickLinuxAImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8A ifa fill_joystick_dideviceinstanceA( ddi, This->generic.base.dinput->dwVersion, get_joystick_index(&This->generic.base.guid) ); + + ddi->guidInstance = This->generic.base.guid; + return DI_OK; } @@ -806,6 +813,9 @@ static HRESULT WINAPI JoystickLinuxWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W ifa fill_joystick_dideviceinstanceW( ddi, This->generic.base.dinput->dwVersion, get_joystick_index(&This->generic.base.guid) ); + + ddi->guidInstance = This->generic.base.guid; + return DI_OK; } diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 102de8269b9..f0d2e0dc32b 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -612,6 +612,7 @@ static unsigned short get_joystick_index(REFGUID guid) { GUID wine_joystick = DInput_Wine_Joystick_Base_GUID; GUID dev_guid = *guid; + INT i; wine_joystick.Data3 = 0; dev_guid.Data3 = 0; @@ -622,6 +623,9 @@ static unsigned short get_joystick_index(REFGUID guid) /* for the wine joystick GUIDs use the index stored in Data3 */ if(IsEqualGUID(&wine_joystick, &dev_guid)) return guid->Data3 - DInput_Wine_Joystick_Base_GUID.Data3; + for(i = 0; i < have_joydevs; i++) + if(IsEqualGUID(&joydevs[i].guid_product, guid)) return i; + return MAX_JOYDEV; } @@ -1450,6 +1454,9 @@ static HRESULT WINAPI JoystickAImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8A iface, fill_joystick_dideviceinstanceA(pdidi, This->generic.base.dinput->dwVersion, get_joystick_index(&This->generic.base.guid)); + + pdidi->guidInstance = This->generic.base.guid; + return DI_OK; } @@ -1467,6 +1474,9 @@ static HRESULT WINAPI JoystickWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface, fill_joystick_dideviceinstanceW(pdidi, This->generic.base.dinput->dwVersion, get_joystick_index(&This->generic.base.guid)); + + pdidi->guidInstance = This->generic.base.guid; + return DI_OK; } diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 805b75639fe..e27357efb32 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -1322,6 +1322,10 @@ static unsigned short get_joystick_index(REFGUID guid) { GUID wine_joystick = DInput_Wine_OsX_Joystick_GUID; GUID dev_guid = *guid; + GUID prod_guid = *guid; + IOHIDDeviceRef device; + int joystick_devices_count; + INT i; wine_joystick.Data3 = 0; dev_guid.Data3 = 0; @@ -1332,6 +1336,18 @@ static unsigned short get_joystick_index(REFGUID guid) /* for the wine joystick GUIDs use the index stored in Data3 */ if(IsEqualGUID(&wine_joystick, &dev_guid)) return guid->Data3; + prod_guid.Data1 = 0; + if(IsEqualGUID(&DInput_PIDVID_Product_GUID, &prod_guid)) + { + joystick_devices_count = find_joystick_devices(); + for(i = 0; i < joystick_devices_count; i++) + { + device = get_device_ref(i); + if(guid->Data1 == make_vid_pid(device)) + return i; + } + } + return 0xffff; } diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index dcf8a373348..fd212bf2514 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -197,12 +197,14 @@ struct enum_data { IDirectInputA *pDI; HWND hwnd; + BOOL tested_product_creation; }; static BOOL CALLBACK enum_devices(const DIDEVICEINSTANCEA *lpddi, void *pvRef) { struct enum_data *data = pvRef; IDirectInputDeviceA *device, *obj = NULL; + DIDEVICEINSTANCEA ddi2; HRESULT hr; hr = IDirectInput_GetDeviceStatus(data->pDI, &lpddi->guidInstance); @@ -226,6 +228,24 @@ static BOOL CALLBACK enum_devices(const DIDEVICEINSTANCEA *lpddi, void *pvRef) IUnknown_Release(obj); IUnknown_Release(device); + + if (!IsEqualGUID(&lpddi->guidInstance, &lpddi->guidProduct)) + { + data->tested_product_creation = TRUE; + hr = IDirectInput_CreateDevice(data->pDI, &lpddi->guidProduct, &device, NULL); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); + + ddi2.dwSize = sizeof(ddi2); + hr = IDirectInputDevice_GetDeviceInfo(device, &ddi2); + ok(SUCCEEDED(hr), "IDirectInput_GetDeviceInfo failed: %08x\n", hr); + + ok(IsEqualGUID(&lpddi->guidProduct, &ddi2.guidProduct), "Product GUIDs do not match. Expected %s, got %s\n", debugstr_guid(&lpddi->guidProduct), debugstr_guid(&ddi2.guidProduct)); + ok(IsEqualGUID(&ddi2.guidProduct, &ddi2.guidInstance), "Instance GUID should equal product GUID. Expected %s, got %s\n", debugstr_guid(&ddi2.guidProduct), debugstr_guid(&ddi2.guidInstance)); + /* we cannot compare guidInstances as we may get a different device */ + + IUnknown_Release(device); + } + } return DIENUM_CONTINUE; } @@ -263,9 +283,11 @@ static void device_tests(void) data.pDI = pDI; data.hwnd = hwnd; + data.tested_product_creation = FALSE; hr = IDirectInput_EnumDevices(pDI, 0, enum_devices, &data, DIEDFL_ALLDEVICES); ok(SUCCEEDED(hr), "IDirectInput_EnumDevices() failed: %08x\n", hr); + if (!data.tested_product_creation) winetest_skip("Device creation using product GUID not tested\n"); /* If GetDeviceStatus returns DI_OK the device must exist */ hr = IDirectInput_GetDeviceStatus(pDI, &GUID_Joystick);

1 0

Nikolay Sivov : gdiplus/metafile: Implement DrawArc() recording.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: master Commit: c17cd0fcabeb644d256d616cf0fab85f2d9bb4c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c17cd0fcabeb644d256d616c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 23 19:08:15 2021 +0300 gdiplus/metafile: Implement DrawArc() recording. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 2 ++ dlls/gdiplus/graphics.c | 7 +++++++ dlls/gdiplus/metafile.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index f777595e810..25672530313 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -115,6 +115,8 @@ extern GpStatus METAFILE_FillEllipse(GpMetafile *metafile, GpBrush *brush, GpRec extern GpStatus METAFILE_DrawRectangles(GpMetafile *metafile, GpPen *pen, const GpRectF *rects, INT count) DECLSPEC_HIDDEN; extern GpStatus METAFILE_FillPie(GpMetafile *metafile, GpBrush *brush, const GpRectF *rect, REAL startAngle, REAL sweepAngle) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_DrawArc(GpMetafile *metafile, GpPen *pen, const GpRectF *rect, + REAL startAngle, REAL sweepAngle) DECLSPEC_HIDDEN; extern void calc_curve_bezier(const GpPointF *pts, REAL tension, REAL *x1, REAL *y1, REAL *x2, REAL *y2) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 9d16d7c3cdb..e292afdfb2c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2595,6 +2595,7 @@ GpStatus WINGDIPAPI GdipDrawArc(GpGraphics *graphics, GpPen *pen, REAL x, { GpStatus status; GpPath *path; + GpRectF rect; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f)\n", graphics, pen, x, y, width, height, startAngle, sweepAngle); @@ -2605,6 +2606,12 @@ GpStatus WINGDIPAPI GdipDrawArc(GpGraphics *graphics, GpPen *pen, REAL x, if(graphics->busy) return ObjectBusy; + if (is_metafile_graphics(graphics)) + { + set_rect(&rect, x, y, width, height); + return METAFILE_DrawArc((GpMetafile *)graphics->image, pen, &rect, startAngle, sweepAngle); + } + status = GdipCreatePath(FillModeAlternate, &path); if (status != Ok) return status; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 06d1a9ccbf4..41950eb31c7 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -5205,3 +5205,49 @@ GpStatus METAFILE_DrawRectangles(GpMetafile *metafile, GpPen *pen, const GpRectF return Ok; } + +GpStatus METAFILE_DrawArc(GpMetafile *metafile, GpPen *pen, const GpRectF *rect, REAL startAngle, REAL sweepAngle) +{ + EmfPlusDrawArc *record; + GpStatus stat; + BOOL integer_rect; + DWORD pen_id; + + if (metafile->metafile_type == MetafileTypeEmf) + { + FIXME("stub!\n"); + return NotImplemented; + } + + stat = METAFILE_AddPenObject(metafile, pen, &pen_id); + if (stat != Ok) return stat; + + integer_rect = is_integer_rect(rect); + + stat = METAFILE_AllocateRecord(metafile, FIELD_OFFSET(EmfPlusDrawArc, RectData) + + integer_rect ? sizeof(record->RectData.rect) : sizeof(record->RectData.rectF), + (void **)&record); + if (stat != Ok) + return stat; + + record->Header.Type = EmfPlusRecordTypeDrawArc; + record->Header.Flags = pen_id; + if (integer_rect) + record->Header.Flags |= 0x4000; + record->StartAngle = startAngle; + record->SweepAngle = sweepAngle; + + if (integer_rect) + { + record->RectData.rect.X = (SHORT)rect->X; + record->RectData.rect.Y = (SHORT)rect->Y; + record->RectData.rect.Width = (SHORT)rect->Width; + record->RectData.rect.Height = (SHORT)rect->Height; + } + else + memcpy(&record->RectData.rectF, rect, sizeof(*rect)); + + METAFILE_WriteRecords(metafile); + + return Ok; +}

1 0

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 March 2021