May 2016 - Wine-Devel - list.winehq.org

No commits for a few days
by Alexandre Julliard May 9, 2016

May 9, 2016

Folks, I'll be out for a few days, so there won't be any commits this week. Feel free to still submit patches, I'll try to catch up next weekend, and release 1.9.10 early the week of May 16. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH v2] riched20: Don't call UpdateWindow after setting the background color.
by Huw Davies May 9, 2016

May 9, 2016

On Sun, May 08, 2016 at 11:42:59PM -0600, Alex Henrie wrote: > diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c > index ae9c0a5..a780c2e 100644 > --- a/dlls/riched20/tests/editor.c > +++ b/dlls/riched20/tests/editor.c > @@ -8337,6 +8337,18 @@ static void test_rtf_specials(void) > DestroyWindow( edit ); > } > > +static void test_background(void) > +{ > + HWND hwndRichEdit = new_richedit(NULL); > + > + /* set the background color to black */ > + ValidateRect(hwndRichEdit, NULL); > + SendMessageA(hwndRichEdit, EM_SETBKGNDCOLOR, FALSE, RGB(0, 0, 0)); > + ok(GetUpdateRect(hwndRichEdit, NULL, FALSE), "Update rectangle is empty!\n"); > + > + DestroyWindow(hwndRichEdit); > +} > + Please don't add an extra line after the function. > > START_TEST( editor ) > { Otherwise, this looks good. Thanks, Huw.

2 2

Re: [PATCH 1/6] d3drm: Introduce d3drm_texture_destroy helper (resend).
by Henri Verbeet May 9, 2016

May 9, 2016

On 8 May 2016 at 12:31, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > @@ -44,6 +44,11 @@ static inline struct d3drm_texture *impl_from_IDirect3DRMTexture3(IDirect3DRMTex > return CONTAINING_RECORD(iface, struct d3drm_texture, IDirect3DRMTexture3_iface); > } > > +void d3drm_texture_destroy(struct d3drm_texture *texture) You're not using this outside of texture.c. > @@ -724,7 +729,7 @@ static ULONG WINAPI d3drm_texture3_Release(IDirect3DRMTexture3 *iface) > if (!refcount) > { > d3drm_object_cleanup((IDirect3DRMObject*)iface, &texture->obj); > - HeapFree(GetProcessHeap(), 0, texture); > + d3drm_texture_destroy(texture); > } The d3drm_object_cleanup() call should be part of d3drm_texture_destroy().

1 0

Re: [PATCH 2/2] wined3d: Support WINED3DUSAGE_TEXTURE in debug_d3dusage
by Henri Verbeet May 9, 2016

May 9, 2016

On 7 May 2016 at 12:17, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > @@ -3573,6 +3573,7 @@ const char *debug_d3dusage(DWORD usage) > WINED3DUSAGE_TO_STR(WINED3DUSAGE_DYNAMIC); > WINED3DUSAGE_TO_STR(WINED3DUSAGE_AUTOGENMIPMAP); > WINED3DUSAGE_TO_STR(WINED3DUSAGE_DMAP); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_TEXTURE); > WINED3DUSAGE_TO_STR(WINED3DUSAGE_STATICDECL); > WINED3DUSAGE_TO_STR(WINED3DUSAGE_OVERLAY); > #undef WINED3DUSAGE_TO_STR Please add the other missing values as well.

1 0

Re: wined3d: Fix a typo in FIXME() messages
by Henri Verbeet May 9, 2016

May 9, 2016

On 1 May 2016 at 10:55, Andrey Gusev <andrey.goosev(a)gmail.com> wrote: > - FIXME("Unrecognied FBO status 0x%08x\n", status); > + FIXME("Unrecognized FBO status 0x%08x\n", status); ... > - FIXME("Unrecognied GL error 0x%08x\n", error); > + FIXME("Unrecognized GL error 0x%08x\n", error); Like the d3d9/tests patch.

1 0

Re: d3d9/tests: Fix a typo in skip() message
by Henri Verbeet May 9, 2016

May 9, 2016

On 1 May 2016 at 10:53, Andrey Gusev <andrey.goosev(a)gmail.com> wrote: > - skip("Failed to create a vetex shader\n"); > + skip("Failed to create a vertex shader\n"); The typo fix is fine of course, but if you're going to touch the line please fix the punctuation as well.

1 0

Re: [PATCH v2] d3d11/test: Test for ID3D11InfoQueue interface
by Józef Kucia May 9, 2016

May 9, 2016

On Mon, May 9, 2016 at 11:04 AM, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > Added sign. > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/d3d11/tests/d3d11.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c > index 03b6113..988c83b 100644 > --- a/dlls/d3d11/tests/d3d11.c > +++ b/dlls/d3d11/tests/d3d11.c > @@ -882,6 +882,11 @@ static void test_device_interfaces(void) > "Device should implement ID3D10Multithread interface, hr %#x.\n", hr); > if (SUCCEEDED(hr)) IUnknown_Release(iface); > > + hr = ID3D11Device_QueryInterface(device, &IID_ID3D11InfoQueue, (void **)&iface); > + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, > + "Device should implement ID3D11InfoQueue interface, hr %#x.\n", hr); > + if (SUCCEEDED(hr)) IUnknown_Release(iface); > + > hr = ID3D11Device_QueryInterface(device, &IID_ID3D10Device, (void **)&iface); > todo_wine ok(hr == E_NOINTERFACE, "Device should not implement ID3D10Device interface, hr %#x.\n", hr); > if (SUCCEEDED(hr)) IUnknown_Release(iface); I think this test is wrong. AFAIK ID3D11InfoQueue is only available when you have the debug layer enabled. You can enable the debug layer by creating a device with the D3D11_CREATE_DEVICE_DEBUG flag.

1 0

Re: msi: Do not return success on failure (spotted by clang)
by Hans Leidekker May 9, 2016

May 9, 2016

On Sun, 2016-05-08 at 18:31 +0300, Kirill Smirnov wrote: > Signed-off-by: Kirill K. Smirnov <kirill.k.smirnov(a)gmail.com> > --- > dlls/msi/where.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/msi/where.c b/dlls/msi/where.c > index e3bc9b7..ddd8c07 100644 > --- a/dlls/msi/where.c > +++ b/dlls/msi/where.c > @@ -593,7 +593,7 @@ static UINT WHERE_evaluate( MSIWHEREVIEW *wv, const > UINT rows[], > > default: > ERR("Invalid expression type\n"); > - break; > + return ERROR_FUNCTION_FAILED; > } > > return ERROR_SUCCESS; It doesn't apply here: $ patch -p1 --dry-run < 122148 checking file dlls/msi/where.c patch: **** malformed patch at line 16: UINT rows[], Looks like your mail client wrapped long lines.

1 0

Re: riched20: Properly clear all of a buffer of type WCHAR.
by Huw Davies May 9, 2016

May 9, 2016

On Sun, May 08, 2016 at 10:15:49PM +0200, Gerald Pfeifer wrote: > buf is an array of WCHAR, so this memset falls short. > > If you prefer, I can submit a patch that rather uses sizeof(buf); > just let me know. Hi Gerald, Yes, please use sizeof(buf). Thanks, Huw.

1 0

Re: [Bug 40598] Warframe launcher connection timeout
by Linda Licari May 9, 2016

May 9, 2016

yes here is a list of messages when run from the development version fixme:olepicture:OleLoadPictureEx (0x16d8524,3270,0,{7bf80980-bf32-101a-8bbb-00aa00300cab},x=0,y=0,f=0,0x32faa0), partially implemented. fixme:ieframe:OleControl_FreezeEvents (0x179240)->(1) fixme:ieframe:PersistStreamInit_Load (0x179240)->(0x16d8524) fixme:ieframe:ViewObject_SetAdvise aspects and/or flags not supported yet fixme:ieframe:WebBrowser_QueryInterface (0x179240)->({55980ba0-35aa-11cf-b671-00aa004cd6d8} 0x32fa4c) interface not supported fixme:nls:GetThreadPreferredUILanguages 00000034, 0x32ef14, 0x32ef84 0x32ef1c fixme:nls:get_dummy_preferred_ui_language (0x34 0x32ef14 0x32ef84 0x32ef1c) returning a dummy value (current locale) fixme:olepicture:OleLoadPictureEx (0x16d8524,4137,1,{7bf80980-bf32-101a-8bbb-00aa00300cab},x=0,y=0,f=0,0x32fa70), partially implemented. fixme:olepicture:OleLoadPictureEx (0x16d8524,359907,1,{7bf80980-bf32-101a-8bbb-00aa00300cab},x=0,y=0,f=0,0x32fa70), partially implemented. fixme:olepicture:OLEPictureImpl_SaveAsFile (0x16b270)->(0x148b48, 0, 0x0), hacked stub. fixme:olepicture:OLEPictureImpl_FindConnectionPoint no connection point for {33ad4ed2-6699-11cf-b70c-00aa0060d393} fixme:olepicture:OLEPictureImpl_FindConnectionPoint no connection point for {33ad4f92-6699-11cf-b70c-00aa0060d393} fixme:olepicture:OLEPictureImpl_FindConnectionPoint no connection point for {33ad4f92-6699-11cf-b70c-00aa0060d393} fixme:ieframe:OleControl_FreezeEvents (0x179240)->(0) fixme:ieframe:OleControl_FreezeEvents (0x179240)->(1) fixme:ieframe:ViewObject_SetAdvise aspects and/or flags not supported yet Regards, Linda Licari On Sun, May 8, 2016 at 5:41 PM <wine-bugs(a)winehq.org> wrote: > https://bugs.winehq.org/show_bug.cgi?id=40598 > > Sebastian Lackner <sebastian(a)fds-team.de> changed: > > What |Removed |Added > > ---------------------------------------------------------------------------- > Component|-unknown |-unknown > Product|Wine-staging |Wine > > --- Comment #1 from Sebastian Lackner <sebastian(a)fds-team.de> --- > Thanks for the bug report. Could you please test if this issue also occurs > with > the development version of Wine? If it occurs in both versions, the "Wine" > product is more appropriate. > > -- > Do not reply to this email, post in Bugzilla using the > above URL to reply. > You are receiving this mail because: > You are watching all bug changes. > > > -- - Try and fail but don't fail to try.

1 0

Re: [PATCH 1/2] riched20: Don't call UpdateWindow after setting the background color.
by Bruno Jesus May 9, 2016

May 9, 2016

On Fri, May 6, 2016 at 11:04 AM, Alex Henrie <alexhenrie24(a)gmail.com> wrote: > +static void test_background(void) > +{ > + HWND hwndRichEdit = new_richedit(NULL); > + RECT updateRect; > + > + /* set the background color to black */ > + ValidateRect(hwndRichEdit, NULL); > + SendMessageA(hwndRichEdit, EM_SETBKGNDCOLOR, FALSE, 0); > + GetUpdateRect(hwndRichEdit, &updateRect, FALSE); > + ok(!IsRectEmpty(&updateRect), "The update rect should not be empty\n"); > + > + DestroyWindow(hwndRichEdit); > +} I believe you should clear updateRect before calling GetUpdateRect, also according to msdn the return value of GetUpdateRect should also reflect if the rect was changed or not so it could be a double test. Best wishes, Bruno

2 1

[PATCH] po: Update Norwegian translation
by Beren Camlost May 8, 2016

May 8, 2016

A couple of my own errors that slipped through the cracks. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> --- po/nb_NO.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 5cc5229..848c720 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-05-04 12:00+0200\n" +"PO-Revision-Date: 2016-05-08 20:00+0200\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -11632,14 +11632,14 @@ msgid "" "occurred.\n" msgstr "" "reg: Kan ikke slette alle registerverdiene i \"%1\". Ett uventet " -"problemoppstod.\n" +"problem oppstod.\n" #: reg.rc:54 msgid "" "reg: Unable to complete the specified operation. An unexpected error " "occurred.\n" msgstr "" -"reg: Kan ikke fullføre den spesifiserte operasjonen. Ett uventetproblem " +"reg: Kan ikke fullføre den spesifiserte operasjonen. Ett uventet problem " "oppstod.\n" #: reg.rc:55 -- 1.9.1

1 1

Re: [PATCH 5/6] d3drm: Implement IDirect3DRMTexture*::InitFromFile.
by Stefan Dösinger May 8, 2016

May 8, 2016

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-05-08 um 11:31 schrieb Aaryaman Vasishta: > + /* d3drm intentionally leaks a reference to IDirect3DRM here if texture has already been initialized. */ > + if (texture->d3drm) > + IDirect3DRM_AddRef(texture->d3drm); > + > + if (texture->image) > + return D3DRMERR_BADOBJECT; > + if (FAILED(hr = d3drm_texture_load(texture, filename, FALSE))) > + return hr; Does it also leak if the file fails to load? It's probably better to create the image and then pass it to InitFromImage instead of re-coding this part. Is there any situation where texture->d3drm would be NULL? The same question applies to the newly introduced check in d3drm_texture_destroy. > + /* Use an internal destroy callback to destroy image struct */ > + hr = IDirect3DRMObject_AddDestroyCallback(&texture->IDirect3DRMTexture3_iface, destroy_image_callback, texture); > + > +cleanup: > + UnmapViewOfFile(buffer); > + CloseHandle(hmapping); > + CloseHandle(hfile); > + > + return hr; You'll leak the image if AddDestroyCallback fails. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXL2hHAAoJEN0/YqbEcdMwezQP/0X9Ik1RbPNFRgvvFRxhrFQE VLstrghPD28bQQ2i7YoVsdNCZMCyIQa+7GVzI/3d5pakyldEr/7OVIvHHGyxa8j/ YP2O0JTNGxVVhNB0pUM6bEPpnUj7BOPm0uCkcPhU42QVevzKBL7jUnl5Jx/j+j0K Dld9+WDh3i2sSsrtFg2MLdsi4oG5ej3eOFuN2jibceK5hLR4UI1vwyyccCsD+Xd3 NmKnG6KMfiQsvVjxW7IoO5qDcmzZsKzdnMHFgL93KKkOkP2SBhODJckiWNNeswcr XFjd6r9NBIZsFGdIBM040ph4gd/cu7h3R/IWw2hG++oQ+qxX0NOH61GNoUasjyQh hKjyVqmjJa6MUPezzqoFv3XRPQGVnz4Q3l7GSp0QQYCJYtZR+8vey3ezkIuvfFNA GszecmBvvi3Bv4Ir6JriJSUjTC73EcluKhS6WmFk+UxABrn0TBGSgFWkMENdxP6F vE90h/a/JumNtdlCibpB/ctFP7NIWDs2Uz7RjrCQUPaXH86+hUtcs92farOi7JzV EuwzXW1a2qgb7O6ZHWSxdCTvmJZy9rjS1gP8aH0gqUWaxr1FjJsPiOvSWU1/P1QX qD/M/kENP4O0tmsI/dwnDRJ6lHf8FH71uNR0kRq2eWJa/clFdC+h5uMHRDx5w+iy jlZ0/xkcdFzzaOJV1Yw0 =cwCD -----END PGP SIGNATURE-----

2 1

Re: [PATCH 3/6] d3drm: Implement IDirect3DRM*_CreateTexture. (v3)
by Stefan Dösinger May 8, 2016

May 8, 2016

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-05-08 um 11:31 schrieb Aaryaman Vasishta: > + if (!d3drm_validate_image(image)) > + return D3DRMERR_BADVALUE; Is this necessary? InitFromImage does it anyway I think. > > if (FAILED(hr = d3drm_texture_create(&object))) > return hr; You could call the public CreateObject method here, but I don't have a strong opinion on this. > + object->d3drm = &d3drm->IDirect3DRM_iface; Afaics InitFromImage does it anyway. It also causes problems when InitFromImage fails for some reason - you'll decref the d3drm object in the error path below. > + if (FAILED(hr = IDirect3DRMTexture3_InitFromImage(&object->IDirect3DRMTexture3_iface, image))) > + { > + d3drm_texture_destroy(object); > + return hr; > + } -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXL2HbAAoJEN0/YqbEcdMw9JcP/iXXJN5PuvyuLqki+eKgQHCv fdRtBfdm57foN7+hfOcG9hZGgVWpdPMj5YFZmNhCaWKlnNjcxKDJE/ZsjsRaYXmD pKPb6mLbNcZVBHyNeqbRcwlgJBiDLYIHM8BiT5DwssQK2lo8UmhVGJgmNZNPlGy8 sw/drdMg0lW11N6rOZR/fXcm5NY9F7oIAuI9945uElbOXg3byBvLAQdpPE95yJ5p 8rAQotCsbnqzGFEyRw3E1+0uKplBoaXd6ML+jhDrHK9Eqw0XWUtUsCuWiaYkTDGX 82XXWjhjsxQ84GkSKOweqtum6HjGDSnSZz12YTDMbspLywIpKzSMO5+O/dtxsolI a5scAHlpYQ/bLK3TCWOkwNEsMkXBRjM8+j+PX1I3SQICdl3GmNxVo/b4ZU+0Wqt5 GwzyerUB2an5Dyf/+l7jqH0SxWgcrIiwa/ZTCxttAafDSooFhERwj402WhNQcZLN BD9Jef52AYCJrduV3b3udvTyPuWCrPkkrm3NTSO6dbCIZG9EzMcujJZnA0D52y2E qwfpfsfNNUJ7hkS1322u48i7GaSCZNoK6ISlA9RqtjVoRCGZKG/nGTwQgznrclB1 mvR24DUvAmogeTV0Akm20wUN3/n5sIkz47b0vb9Z5Jjg1v+90nTQ43pcMT0GCJhP cN0YfnUAgpi7yD4yfA1E =JJ9X -----END PGP SIGNATURE-----

2 2

Re: [PATCH 2/6] d3drm: Implement IDirect3DRMTexture{2-3}_InitFromImage. (v3)
by Stefan Dösinger May 8, 2016

May 8, 2016

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-05-08 um 11:31 schrieb Aaryaman Vasishta: > + hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg); > + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %x.\n", hr); > + /* Release leaked reference to d3drm1 */ > + IDirect3DRM_Release(d3drm1); I think it's a good idea to explicitly test the increased refcount after this failing call. > + if (!image > + || !image->rgb > + || !image->red_mask > + || !image->green_mask > + || !image->blue_mask > + || !image->buffer1) > + { > + return FALSE; > + } I guess that there's some way to pass palletized images, e.g. by setting rgb = 0, palette_size != 0 and palette != NULL. This shouldn't be part of this patch though and I am fine with this code as it is. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXL2SsAAoJEN0/YqbEcdMwkCQP/iPRJdsglD3on0uzy9v8iQo9 g0BexNDM4r1AtZASW9yp6dNRLY1oX15dTSM6GjdNlNFGp7jQRVJcJ6X71CJt4EEi oGWtq774F46ewtTjcufP/TOfOed6k6tv/qe6IKRn2rnI7CyusM124jIP4CYZfAlW dk48LOKp9G9kzF3loa6Cx4Eoxmy1jAfXJ5v/ERGqgU/wHwT8Vaim+5URIglfPq0H OUG++D6WTacsh1RWGZaeQqLAVq2zlc5YxNNsgJ7iJcd7DG1EYg6hOFFHebwp5FQP Jq6Dipy1GGB4q+Zt/ygb6HwWsv36taLMVn2erEL2RG6O88QxmM+P3VyxTBNdWKQc 65SHOcq0NjLhT6sO4SSfm5lEsWDBxftzbUuSg9NngrZjmLBa4pfreckYhA+N/p2Y Jd1GBtpvO7w5XTOLYoHWvco2rrRVCmJan/Q/XAensQyFBkkt7+S8Rjjo7KcT1avF Lv7WQqg+2HTHJbiiSp13BsoNZQaDZaDEaINsBv56B+LJjBKf3EwJLCZXpRRN3p0v ByLGPYr7QS3NrukltC9Zb3ZEf2FWBtB8mDBYjh5sHmquujAwlZx85HdaqFEi9ZCb tIzD3O8yO4k5rwM/+fClBLHmeTUEemnG1LrwxgvOR2pAq6/mK67clDmOZJ4CSBBt YjYtXXnjuSBzcnvnvp3J =KSDQ -----END PGP SIGNATURE-----

2 1

Re: [PATCH 4/6] d3drm: Implement IDirect3DRMTexture*_GetImage (resend).
by Stefan Dösinger May 8, 2016

May 8, 2016

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-05-08 um 11:31 schrieb Aaryaman Vasishta: > d3drm_img = NULL; d3drm_img = > IDirect3DRMTexture2_GetImage(texture2); - todo_wine > ok(!!d3drm_img, "Failed to get image.\n"); - todo_wine > ok(d3drm_img == &initimg, "Expected image returned == %p, got > %p.\n", &initimg, d3drm_img); + ok(!!d3drm_img, "Failed to get > image.\n"); + ok(d3drm_img == &initimg, "Expected image returned > == %p, got %p.\n", &initimg, d3drm_img); This is a problem of the exiting code code more than the patch: The d3drm_img = NULL assignment is redundant. Since GetImage returns the image as a return value the destination will be overwritten, no matter how GetImage behaves. The problem of a getter not writing anything can only happen when you pass a pointer and the function writes a value to that pointer. What happens when GetImage is called on an uninitialized Texture? -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXL2QqAAoJEN0/YqbEcdMwYD0P/i4GqKylB9vvWa64h6Hph+li +tVW8KNgbjaPaJJfvEZRG3t1hToqFogSKU0TBBTnhv7zGuU5wKHr4a+UwkFFjQSx ww/jzuQXu7coJ28CZrGBeDqMAadR3RCZHcdKD+czzn5bBy/8LCzrX4Id/1qpdf+Y PZtdtF9R7e1poYjctPJXtcOzJlwtEF3+JkGUiyjcH3kNoammqmpRf6FeSFxXrvUB frVrNHIaLU6Cg8MaoyC6aYOOuf1KHH/5Nym3kAvR7Ty+0PNo38g23/+DMtN5553r IvaYHSsmzK10LsH6/xgkDQk9fpkEX6eTgW/wbd+p++L3fauDMjk6KxMVgPFpEF4g 2hRrKw5TTdvY3LftbC5VZDtnKZeFX5hwiysZZEztFLW/Rk85qgJUo36cq9QR1XE6 fwOH77QYO0+bv2+9TXyyh20RIQshLbN4Pzx5jWxC9Ym9InEWevLKXTQrjt+ve5bl YL+202MXZ1hc/cuCk/HOLrCg2B8XkSN/Sj5ziszhyXJk8kHv/FRyfMa5+p3Ngyrn ZBE464osVWL8pSdJeadb1Nud7aWVfW+RIaun8RgwDAhFpRnStEZyfW0FxrVkfQBY BdDTGORUrFDfsVs8xLsQwKI/xaq3vKZJJ2oZbnnIek0P2q0TVYCP8eXlu2o2ARvd rXSlOmyAYudSsOeqz9ED =mT+3 -----END PGP SIGNATURE-----

1 0

Re: [PATCH 6/6] d3drm: Partially implement IDirect3DRM*::LoadTexture. (v4)
by Aaryaman Vasishta May 8, 2016

May 8, 2016

See patch 5/6 for the v4 changes. Cheers, Aaryaman On Sun, May 8, 2016 at 4:01 PM, Aaryaman Vasishta <jem456.vasishta(a)gmail.com > wrote: > v4: Removed various leaks, avoided redundant usage of HEAP_ZERO_MEMORY. > > Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> > --- > dlls/d3drm/d3drm.c | 32 +++++++++++++++++++++++++------- > dlls/d3drm/tests/d3drm.c | 33 +++++++++++++-------------------- > 2 files changed, 38 insertions(+), 27 deletions(-) > > diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c > index 6c6007d..c74d5d8 100644 > --- a/dlls/d3drm/d3drm.c > +++ b/dlls/d3drm/d3drm.c > @@ -418,11 +418,18 @@ static HRESULT WINAPI d3drm1_LoadTexture(IDirect3DRM > *iface, > struct d3drm_texture *object; > HRESULT hr; > > - FIXME("iface %p, filename %s, texture %p stub!\n", iface, > debugstr_a(filename), texture); > + TRACE("iface %p, filename %s, texture %p.\n", iface, > debugstr_a(filename), texture); > > if (FAILED(hr = d3drm_texture_create(&object))) > return hr; > > + object->d3drm = iface; > + if (FAILED(hr = > IDirect3DRMTexture_InitFromFile(&object->IDirect3DRMTexture_iface, > filename))) > + { > + d3drm_texture_destroy(object); > + return hr; > + } > + > *texture = &object->IDirect3DRMTexture_iface; > > return D3DRM_OK; > @@ -861,17 +868,19 @@ static HRESULT WINAPI > d3drm2_CreateUserVisual(IDirect3DRM2 *iface, > static HRESULT WINAPI d3drm2_LoadTexture(IDirect3DRM2 *iface, > const char *filename, IDirect3DRMTexture2 **texture) > { > - struct d3drm_texture *object; > + struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); > + IDirect3DRMTexture3 *texture3; > HRESULT hr; > > - FIXME("iface %p, filename %s, texture %p stub!\n", iface, > debugstr_a(filename), texture); > + TRACE("iface %p, filename %s, texture %p.\n", iface, > debugstr_a(filename), texture); > > - if (FAILED(hr = d3drm_texture_create(&object))) > + if (FAILED(hr = IDirect3DRM3_LoadTexture(&d3drm->IDirect3DRM3_iface, > filename, &texture3))) > return hr; > > - *texture = &object->IDirect3DRMTexture2_iface; > + hr = IDirect3DRMTexture3_QueryInterface(texture3, > &IID_IDirect3DRMTexture2, (void **)texture); > + IDirect3DRMTexture3_Release(texture3); > > - return D3DRM_OK; > + return hr; > } > > static HRESULT WINAPI d3drm2_LoadTextureFromResource(IDirect3DRM2 *iface, > HMODULE module, > @@ -1413,14 +1422,23 @@ static HRESULT WINAPI > d3drm3_CreateUserVisual(IDirect3DRM3 *iface, > static HRESULT WINAPI d3drm3_LoadTexture(IDirect3DRM3 *iface, > const char *filename, IDirect3DRMTexture3 **texture) > { > + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); > struct d3drm_texture *object; > HRESULT hr; > > - FIXME("iface %p, filename %s, texture %p stub!\n", iface, > debugstr_a(filename), texture); > + TRACE("iface %p, filename %s, texture %p.\n", iface, > debugstr_a(filename), texture); > > if (FAILED(hr = d3drm_texture_create(&object))) > return hr; > > + object->d3drm = &d3drm->IDirect3DRM_iface; > + if (FAILED(hr = > IDirect3DRMTexture3_InitFromFile(&object->IDirect3DRMTexture3_iface, > filename))) > + { > + d3drm_texture_destroy(object); > + return hr; > + } > + > + object->d3drm = &d3drm->IDirect3DRM_iface; > *texture = &object->IDirect3DRMTexture3_iface; > > return D3DRM_OK; > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c > index e6311d8..4cf3ba7 100644 > --- a/dlls/d3drm/tests/d3drm.c > +++ b/dlls/d3drm/tests/d3drm.c > @@ -4510,18 +4510,16 @@ static void test_load_texture(void) > hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1); > ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", > i, hr); > ref2 = get_refcount((IUnknown *)d3drm1); > - todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got > ref1 = %u, ref2 = %u.\n", i, ref1, ref2); > + ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, > ref2 = %u.\n", i, ref1, ref2); > > hr = IDirect3DRMTexture_InitFromFile(texture1, filename); > - todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == > D3DRMERR_BADOBJECT, got %#x.\n", i, hr); > + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == > D3DRMERR_BADOBJECT, got %#x.\n", i, hr); > /* InitFromFile seems to AddRef IDirect3DRM even if it fails. */ > - if (FAILED(hr)) > - IDirect3DRM_Release(d3drm1); > + IDirect3DRM_Release(d3drm1); > > d3drm_img = IDirect3DRMTexture_GetImage(texture1); > ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); > - if (d3drm_img) > - test_bitmap_data(i * 7, d3drm_img, FALSE, tests[i].w, > tests[i].h, tests[i].palettized); > + test_bitmap_data(i * 7, d3drm_img, FALSE, tests[i].w, tests[i].h, > tests[i].palettized); > IDirect3DRMTexture_Release(texture1); > ref2 = get_refcount((IUnknown *)d3drm1); > ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, > ref2 = %u.\n", i, ref1, ref2); > @@ -4537,17 +4535,15 @@ static void test_load_texture(void) > hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2); > ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", > i, hr); > ref2 = get_refcount((IUnknown *)d3drm1); > - todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got > ref1 = %u, ref2 = %u.\n", i, ref1, ref2); > + ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, > ref2 = %u.\n", i, ref1, ref2); > > hr = IDirect3DRMTexture2_InitFromFile(texture2, filename); > - todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == > D3DRMERR_BADOBJECT, got %#x.\n", i, hr); > - if (FAILED(hr)) > - IDirect3DRM_Release(d3drm1); > + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == > D3DRMERR_BADOBJECT, got %#x.\n", i, hr); > + IDirect3DRM_Release(d3drm1); > > d3drm_img = IDirect3DRMTexture2_GetImage(texture2); > ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); > - if (d3drm_img) > - test_bitmap_data(i * 7 + 2, d3drm_img, TRUE, tests[i].w, > tests[i].h, tests[i].palettized); > + test_bitmap_data(i * 7 + 2, d3drm_img, TRUE, tests[i].w, > tests[i].h, tests[i].palettized); > IDirect3DRMTexture2_Release(texture2); > ref2 = get_refcount((IUnknown *)d3drm1); > ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, > ref2 = %u.\n", i, ref1, ref2); > @@ -4563,25 +4559,22 @@ static void test_load_texture(void) > hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3); > ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", > i, hr); > ref2 = get_refcount((IUnknown *)d3drm1); > - todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got > ref1 = %u, ref2 = %u.\n", i, ref1, ref2); > + ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, > ref2 = %u.\n", i, ref1, ref2); > > hr = IDirect3DRMTexture3_InitFromFile(texture3, filename); > - todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == > D3DRMERR_BADOBJECT, got %#x.\n", i, hr); > - if (FAILED(hr)) > - IDirect3DRM_Release(d3drm1); > + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == > D3DRMERR_BADOBJECT, got %#x.\n", i, hr); > + IDirect3DRM_Release(d3drm1); > > d3drm_img = IDirect3DRMTexture3_GetImage(texture3); > ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); > - if (d3drm_img) > - test_bitmap_data(i * 7 + 4, d3drm_img, TRUE, tests[i].w, > tests[i].h, tests[i].palettized); > + test_bitmap_data(i * 7 + 4, d3drm_img, TRUE, tests[i].w, > tests[i].h, tests[i].palettized); > /* Test whether querying a version 1 texture from version 3 > causes a > * change in the loading behavior. */ > hr = IDirect3DRMTexture3_QueryInterface(texture3, > &IID_IDirect3DRMTexture, (void **)&texture1); > ok(SUCCEEDED(hr), "Failed to get IDirect3DRMTexture interface, hr > %#x.\n", hr); > d3drm_img = IDirect3DRMTexture_GetImage(texture1); > ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); > - if (d3drm_img) > - test_bitmap_data(i * 7 + 5, d3drm_img, TRUE, tests[i].w, > tests[i].h, tests[i].palettized); > + test_bitmap_data(i * 7 + 5, d3drm_img, TRUE, tests[i].w, > tests[i].h, tests[i].palettized); > IDirect3DRMTexture_Release(texture1); > IDirect3DRMTexture3_Release(texture3); > ref2 = get_refcount((IUnknown *)d3drm1); > -- > 2.3.2 (Apple Git-55) > >

1 0

Re: [2/2] shlwapi: Fix crash in wvnsprintfW when buffer or spec is NULL
by Sebastian Lackner May 7, 2016

May 7, 2016

On 06.05.2016 03:56, 谢威 wrote: > Crashes on windows and wine when buffer == NULL && maxlen > 0 > > > 0002-shlwapi-Fix-crash-in-wvnsprintfW-when-buffer-or-spec.patch > > > From f60bd9a76cfc91cb873a15c69f35cea0c7950a68 Mon Sep 17 00:00:00 2001 > From: XieWei <xiewei(a)linuxdeepin.com> > Date: Fri, 6 May 2016 09:49:34 +0800 > Subject: shlwapi: Fix crash in wvnsprintfW when buffer or spec is NULL > > Signed-off-by: XieWei <xiewei(a)linuxdeepin.com> > --- > dlls/shlwapi/wsprintf.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/dlls/shlwapi/wsprintf.c b/dlls/shlwapi/wsprintf.c > index 6a36b6a..ceca82e 100644 > --- a/dlls/shlwapi/wsprintf.c > +++ b/dlls/shlwapi/wsprintf.c > @@ -439,6 +439,9 @@ INT WINAPI wvnsprintfW( LPWSTR buffer, INT maxlen, LPCWSTR spec, __ms_va_list ar > > TRACE("%p %u %s\n", buffer, maxlen, debugstr_w(spec)); > > + if (maxlen <= 0 || (spec == NULL && buffer != NULL)) > + return -1; The first part looks fine, but the second part is not really covered by tests. In fact, you even added a comment that it crashes on Windows XP under a similar situation. Do you really have an application which depends on it? > + > while (*spec && (maxlen > 1)) > { > if (*spec != '%') { *p++ = *spec++; maxlen--; continue; } > -- 2.7.0 > > >

1 0

Re: [1/2] shlwapi/tests: Add wvnsprintfW comformance test
by Sebastian Lackner May 7, 2016

May 7, 2016

Hi, thanks for your contribution. I have a couple of remarks below: On 06.05.2016 03:55, 谢威 wrote: > > 0001-shlwapi-Add-wvnsprintfW-comformance-test.patch > > > From cdaeba38efb4d2edcdff5e6ec7b75fa5b56d52d7 Mon Sep 17 00:00:00 2001 > From: XieWei <xiewei(a)linuxdeepin.com> > Date: Fri, 6 May 2016 09:42:05 +0800 > Subject: shlwapi: Add wvnsprintfW comformance test > > Signed-off-by: XieWei <xiewei(a)linuxdeepin.com> The Wine project requires all contributors to submit patches with their full first and last name. If this isn't your full name, please fix it in your git settings. > --- > dlls/shlwapi/tests/string.c | 78 +++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 78 insertions(+) > > diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c > index ac14db0..7896827 100644 > --- a/dlls/shlwapi/tests/string.c > +++ b/dlls/shlwapi/tests/string.c > @@ -68,6 +68,7 @@ static INT (WINAPIV *pwnsprintfW)(LPWSTR,INT,LPCWSTR, ...); > static LPWSTR (WINAPI *pStrChrNW)(LPCWSTR,WCHAR,UINT); > static BOOL (WINAPI *pStrToInt64ExA)(LPCSTR,DWORD,LONGLONG*); > static BOOL (WINAPI *pStrToInt64ExW)(LPCWSTR,DWORD,LONGLONG*); > +static INT (WINAPI *pwvnsprintfW)(LPWSTR,INT,LPCWSTR,__ms_va_list); > > static int strcmpW(const WCHAR *str1, const WCHAR *str2) > { > @@ -1601,6 +1602,81 @@ static void test_StrCatChainW(void) > ok(buf[5] == 'e', "Expected buf[5] = 'e', got %x\n", buf[5]); > } > > +static INT _wvnsprintfW_p_wrapper(LPWSTR pdest, INT maxlen, LPCWSTR format, ...) Please declare the function with WINAPIV calling convention. Also please note that a "p" or "lp" prefix is usually omitted new Wine code. > +{ > + INT ret; > + __ms_va_list valist; > + __ms_va_start(valist, format); > + ret = pwvnsprintfW(pdest, maxlen, format, valist); > + __ms_va_end(valist); > + return ret; > +} > + > +static void test_wvnsprintfW(void) > +{ > + INT ret = 0; > + WCHAR buffer[10] = {0}; > + const WCHAR fmt[] = {'1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 0}; > + const WCHAR emptyfmt[] = {0}; > + const WCHAR result1[] = {'1', '2', '3', '4', '5', '6', '7', '8', 0}; > + const WCHAR result2[] = {'1', '2', '3', '4', '5', '6', '7', '8', '9', 0}; > + const WCHAR result3[] = {'1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 0}; > + > + if (!pwvnsprintfW) > + { > + win_skip("wvnsprintfW not available\n"); > + return; > + } Its a matter of taste, but you usually don't need such a check unless you are aware of a specific Windows version where it does not exist. > + > + /* crashes on wine */ > + ret = _wvnsprintfW_p_wrapper(NULL, 0, fmt); > + ok(broken(ret == 0) || ret == -1 /* win7 */, > + "Expected wvnsprintfW to return %d, expected 0 or -1\n", ret); As you also noticed, those tests will crash on Wine, which means you can't really add them until the implementation is fixed. You can either move those tests to your second patch, or change the order of your patches. Also, I think the current ok() message is a bit misleading. Something like "Expected wvnsprintfW to return 0 or -1, got %d\n" would be more clear. This also affects a couple of places below. > + > + if (0) > + { > + /* crashes on wine and XP and win7 */ Wrong indentation in the line above. > + ret = _wvnsprintfW_p_wrapper(NULL, 3/* >0 */, fmt); > + ok(ret == -1, "Expected wvnsprintfW to return -1, got %d\n", ret); > + } > + > + /* crashes on wine */ > + ret = _wvnsprintfW_p_wrapper(buffer, 0, NULL); > + ok(broken(ret == 0) || ret == -1 /* win7 */, > + "Expected wvnsprintfW to return %d, expected 0 or -1\n", ret); > + > + ret = _wvnsprintfW_p_wrapper(buffer, 0, fmt); > + ok(broken(ret == 0) || ret == -1 /* win7 */, > + "Expected wvnsprintfW to return %d, expected 0 or -1\n", ret); > + > + if (0) > + { > + /* crashes on wine and XP */ > + ret = _wvnsprintfW_p_wrapper(buffer, 10, NULL); > + ok(ret == -1, "Expected wvnsprintfW to return -1, got %d\n", ret); > + } > + > + ret = _wvnsprintfW_p_wrapper(buffer, 1, emptyfmt); > + ok(ret == 0, "Expected wvnsprintfW to return 0, got %d\n", ret); This test fails in Wine, which means it should be marked with todo_wine. > + > + ret = _wvnsprintfW_p_wrapper(buffer, 10, emptyfmt); > + ok(ret == 0, "Expected wvnsprintfW to return 0, got %d\n", ret); > + > + ret = _wvnsprintfW_p_wrapper(buffer, sizeof(buffer)/sizeof(buffer[0])-1, fmt); > + ok(broken(ret == 8) || ret == -1 /* win7 */, > + "Expected wvnsprintfW to return %d, expected 8 or -1\n", ret); > + ok(lstrcmpW(buffer, result1) == 0, "Wrong result [%s]\n", wine_dbgstr_w(buffer)); You can omit the "[" and "]" here. wine_dbgstr_w will add quotation marks around the string. > + > + ret = _wvnsprintfW_p_wrapper(buffer, sizeof(buffer)/sizeof(buffer[0]), fmt); > + ok(broken(ret == 9) || ret == -1 /* win7 */, > + "Expected wvnsprintfW to return %d, expected 9 or -1\n", ret); > + ok(lstrcmpW(buffer, result2) == 0, "Wrong result [%s]\n", wine_dbgstr_w(buffer)); > + > + ret = _wvnsprintfW_p_wrapper(buffer, sizeof(buffer)/sizeof(buffer[0])+1, fmt); > + ok(ret == 10, "Expected wvnsprintfW to return 10, got %d\n", ret); > + ok(lstrcmpW(buffer, result3) == 0, "Wrong result [%s]\n", wine_dbgstr_w(buffer)); Those two tests above also fail in Wine, so they should be marked with todo_wine. > +} > + > START_TEST(string) > { > HMODULE hShlwapi; > @@ -1640,6 +1716,7 @@ START_TEST(string) > pwnsprintfW = (void *)GetProcAddress(hShlwapi, "wnsprintfW"); > pStrToInt64ExA = (void *)GetProcAddress(hShlwapi, "StrToInt64ExA"); > pStrToInt64ExW = (void *)GetProcAddress(hShlwapi, "StrToInt64ExW"); > + pwvnsprintfW = (void *)GetProcAddress(hShlwapi, "wvnsprintfW"); > > test_StrChrA(); > test_StrChrW(); > @@ -1687,6 +1764,7 @@ START_TEST(string) > test_StrStrNW(); > test_StrStrNIW(); > test_StrCatChainW(); > + test_wvnsprintfW(); > > CoUninitialize(); > } > -- 2.7.0 > > >

1 0

Re: [PATCH] winemac: Add support for a high-resolution ("Retina") rendering mode.
by Jacek Caban May 6, 2016

May 6, 2016

Hi Ken, On 05/05/16 20:53, Ken Thomases wrote: > This is intended to be combined with increasing the Windows DPI, as via winecfg. > If that is doubled to 192, then, in theory, graphical elements will remain the > same visual size on screen but be rendered with finer detail. Unfortunately, > many Windows programs don't correctly handle non-standard DPI so the results > are not always perfect. > > The registry setting to enable Retina mode is: > > [HKEY_CURRENT_USER\Software\Wine\Mac Driver] > "RetinaMode"="y" > > Note that this setting is not looked for in the AppDefaults\<exe name> key > because it doesn't make sense for only some processes in a Wine session to see > the high-resolution sizes and coordinates. Would it make sense to follow what Windows does in this case? Something like SetProcessDPIAware and manifest support feels related. Thanks, Jacek

2 1

Re: jscript: Properly handle function expressions with identifiers.
by Marvin May 6, 2016

May 6, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=22883 Your paranoid android. === wxppro (32 bit) === Found no trace of the test summary line or of a crash === w2003std (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (32 bit) === Found no trace of the test summary line or of a crash === w2008s64 (32 bit) === Found no trace of the test summary line or of a crash === w7u (32 bit) === Found no trace of the test summary line or of a crash === w7pro64 (32 bit) === Found no trace of the test summary line or of a crash === w8 (32 bit) === Found no trace of the test summary line or of a crash === w864 (32 bit) === Found no trace of the test summary line or of a crash === w1064 (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (64 bit) === Found no trace of the test summary line or of a crash === w2008s64 (64 bit) === Found no trace of the test summary line or of a crash === w7pro64 (64 bit) === Found no trace of the test summary line or of a crash === w864 (64 bit) === Found no trace of the test summary line or of a crash === w1064 (64 bit) === Found no trace of the test summary line or of a crash

1 0

Re: [PATCH 2/2] riched20: Only call InvalidateRect if the background color changes.
by Alex Henrie May 6, 2016

May 6, 2016

Please ignore this patch. After sending it, I noticed that the backgrounds in Word Viewer changed from gray to white after leaving the tab and returning to it, when on Windows they stay gray the whole time. More tests are needed to determine when exactly InvalidateRect should be called. The first patch is still good, and does not appear to cause any negative side effects. -Alex

1 0

Re: (2/2) advapi32: add some advapi32 wmi functions
by Sebastian Lackner May 5, 2016

May 5, 2016

On 04.05.2016 06:47, Austin English wrote: > -- -Austin > > > 0002-advapi32-add-some-advapi32-wmi-functions.patch > > > From dcdc8a38a72921f17c15c4e39ca0dd6fdb578a0f Mon Sep 17 00:00:00 2001 > From: Austin English <austinenglish(a)gmail.com> > Date: Tue, 3 May 2016 02:17:15 -0500 > Subject: [PATCH 2/2] advapi32: add some advapi32 wmi functions > > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > dlls/advapi32/Makefile.in | 3 +- > dlls/advapi32/advapi32.spec | 28 +++++----- > dlls/advapi32/wmi.c | 123 ++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 139 insertions(+), 15 deletions(-) > create mode 100644 dlls/advapi32/wmi.c > > diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in > index 6b54295..ff6452a 100644 > --- a/dlls/advapi32/Makefile.in > +++ b/dlls/advapi32/Makefile.in > @@ -18,7 +18,8 @@ C_SRCS = \ > lsa.c \ > registry.c \ > security.c \ > - service.c > + service.c \ > + wmi.c In general adding a new file for all those Wmi commands is probably fine, but please move the existing ones there, too. (for example "WmiOpenBlock") > > IDL_SRCS = svcctl.idl > > diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec > index 3f32aa3..af5286b 100644 > --- a/dlls/advapi32/advapi32.spec > +++ b/dlls/advapi32/advapi32.spec > @@ -795,35 +795,35 @@ > # @ stub WmiDevInstToInstanceNameA > # @ stub WmiDevInstToInstanceNameW > # @ stub WmiEnumerateGuids > -# @ stub WmiExecuteMethodA > -# @ stub WmiExecuteMethodW > +@ stdcall WmiExecuteMethodA(ptr str long long ptr long ptr) Handles should still be traced as "long", not as "ptr". ;) Also, the "outputsize" parameter is traced wrong (should be "ptr"). > +@ stdcall WmiExecuteMethodW(ptr wstr long long ptr long ptr) > # @ stub WmiFileHandleToInstanceNameA > # @ stub WmiFileHandleToInstanceNameW > -# @ stub WmiFreeBuffer > +@ stdcall WmiFreeBuffer(ptr) > # @ stub WmiGetFirstTraceOffset > # @ stub WmiGetNextEvent > # @ stub WmiGetTraceHeader > -# @ stub WmiMofEnumerateResourcesA > -# @ stub WmiMofEnumerateResourcesW > -# @ stub WmiNotificationRegistrationA > -# @ stub WmiNotificationRegistrationW > +@ stdcall WmiMofEnumerateResourcesA(ptr ptr ptr) > +@ stdcall WmiMofEnumerateResourcesW(ptr ptr ptr) > +@ stdcall WmiNotificationRegistrationA(ptr long ptr ptr long) > +@ stdcall WmiNotificationRegistrationW(ptr long ptr ptr long) > @ stdcall WmiOpenBlock(ptr long ptr) > # @ stub WmiOpenTraceWithCursor > # @ stub WmiParseTraceEvent > -# @ stub WmiQueryAllDataA > +@ stdcall WmiQueryAllDataA(ptr ptr ptr) > # @ stub WmiQueryAllDataMultipleA > # @ stub WmiQueryAllDataMultipleW > -# @ stub WmiQueryAllDataW > -# @ stub WmiQueryGuidInformation > +@ stdcall WmiQueryAllDataW(ptr ptr ptr) > +@ stdcall WmiQueryGuidInformation(ptr ptr) > # @ stub WmiQuerySingleInstanceA > # @ stub WmiQuerySingleInstanceMultipleA > # @ stub WmiQuerySingleInstanceMultipleW > @ stub WmiQuerySingleInstanceW > # @ stub WmiReceiveNotificationsA > # @ stub WmiReceiveNotificationsW > -# @ stub WmiSetSingleInstanceA > -@ stub WmiSetSingleInstanceW > -# @ stub WmiSetSingleItemA > -# @ stub WmiSetSingleItemW > +@ stdcall WmiSetSingleInstanceA(ptr str long long ptr) > +@ stdcall WmiSetSingleInstanceW(ptr wstr long long ptr) > +@ stdcall WmiSetSingleItemA(ptr str long long long ptr) > +@ stdcall WmiSetSingleItemW(ptr wstr long long long ptr) > # @ stub Wow64Win32ApiEntry > @ stdcall WriteEncryptedFileRaw(ptr ptr ptr) > diff --git a/dlls/advapi32/wmi.c b/dlls/advapi32/wmi.c > new file mode 100644 > index 0000000..de3f8fa > --- /dev/null > +++ b/dlls/advapi32/wmi.c > @@ -0,0 +1,123 @@ > +/* > + * Win32 advapi/wmi functions > + * > + * Copyright 2016 Austin English > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > + */ > + > +#include <stdarg.h> > + > +#include "windef.h" > +#include "winbase.h" > +#include "winerror.h" > +#include "winternl.h" > +#include "wmistr.h" > +#include "ddk/wmium.h" > + > +#include "wine/unicode.h" > +#include "wine/debug.h" > + > +#include "advapi32_misc.h" > + > +WINE_DEFAULT_DEBUG_CHANNEL(wmi); > + > +ULONG WMIAPI WmiExecuteMethodA(WMIHANDLE handle, const CHAR *instance, ULONG method, ULONG inputsize, Please use lowercase 'char' instead of CHAR. > + void *inputbuffer, ULONG *outputsize, void *outputbuffer) > +{ > + FIXME(": %p %s %u %u %p %p %p stub\n", handle, debugstr_a(instance), method, inputsize, inputbuffer, > + outputsize, outputbuffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiExecuteMethodW(WMIHANDLE handle, const WCHAR *instance, ULONG method, ULONG inputsize, > + void *inputbuffer, ULONG *outputsize, void *outputbuffer) > +{ > + FIXME(": %p %s %u %u %p %p %p stub\n", handle, debugstr_w(instance), method, inputsize, inputbuffer, > + outputsize, outputbuffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +VOID WMIAPI WmiFreeBuffer(void *buffer) Lowercase 'void' is usually preferred. > +{ > + HeapFree(GetProcessHeap(), 0, buffer); It doesn't really make sense to implement it unless we have at least one function which returns a buffer. > +} > + > +ULONG WMIAPI WmiMofEnumerateResourcesA(MOFHANDLE handle, ULONG *count, MOFRESOURCEINFOA **resource) > +{ > + FIXME(": %p %p %p stub\n", handle, count, *resource); Why do you dereference the pointer here? It looks like count and resource are output parameters here. > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiMofEnumerateResourcesW(MOFHANDLE handle, ULONG *count, MOFRESOURCEINFOW **resource) > +{ > + FIXME(": %p %p %p stub\n", handle, count, *resource); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiNotificationRegistrationA(GUID *guid, BOOLEAN enable, void *info, ULONG_PTR *context, ULONG flags) > +{ > + FIXME(": %p %u %p %p 0x%08x stub\n", guid, enable, info, context, flags); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiNotificationRegistrationW(GUID *guid, BOOLEAN enable, void *info, ULONG_PTR *context, ULONG flags) > +{ > + FIXME(": %p %u %p %p 0x%08x stub\n", guid, enable, info, context, flags); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiQueryAllDataA(WMIHANDLE handle, ULONG *buffersize, void *buffer) > +{ > + FIXME(": %p %p %p stub\n", handle, buffersize, buffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiQueryAllDataW(WMIHANDLE handle, ULONG *buffersize, void *buffer) > +{ > + FIXME(": %p %p %p stub\n", handle, buffersize, buffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiQueryGuidInformation(WMIHANDLE handle, WMIGUIDINFORMATION *guidinfo) > +{ > + FIXME(": %p %p stub\n", handle, guidinfo); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiSetSingleInstanceA(WMIHANDLE handle, const CHAR *name, ULONG reserved, ULONG size, void *buffer) > +{ > + FIXME(": %p %s %u %u %p stub\n", handle, debugstr_a(name), reserved, size, buffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiSetSingleInstanceW(WMIHANDLE handle, const WCHAR *name, ULONG reserved, ULONG size, void *buffer) > +{ > + FIXME(": %p %s %u %u %p stub\n", handle, debugstr_w(name), reserved, size, buffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiSetSingleItemA(WMIHANDLE handle, const CHAR *name, ULONG id, ULONG reserved, ULONG size, void *buffer) > +{ > + FIXME(": %p %s %u %u %p stub\n", handle, debugstr_a(name), reserved, size, buffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiSetSingleItemW(WMIHANDLE handle, const WCHAR *name, ULONG id, ULONG reserved, ULONG size, void *buffer) > +{ > + FIXME(": %p %s %u %u %p stub\n", handle, debugstr_w(name), reserved, size, buffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > -- 2.7.3 > > >

1 0

Re: (1/2) include/ddk: add wmium.h
by Sebastian Lackner May 5, 2016

May 5, 2016

On 04.05.2016 06:45, Austin English wrote: > This is from the XP DDK. > > For https://bugs.winehq.org/show_bug.cgi?id=37429 > > -- -Austin > > > 0001-include-add-wmium.h.patch > > > From 2f6b569db167a01c074d7655b2a285db313a5d83 Mon Sep 17 00:00:00 2001 > From: Austin English <austinenglish(a)gmail.com> > Date: Tue, 3 May 2016 00:59:30 -0500 > Subject: [PATCH] include: add wmium.h > > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > include/Makefile.in | 1 + > include/wmium.h | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 120 insertions(+) > create mode 100644 include/wmium.h > > diff --git a/include/Makefile.in b/include/Makefile.in > index 250166d..a9e0565 100644 > --- a/include/Makefile.in > +++ b/include/Makefile.in > @@ -666,6 +666,7 @@ HEADER_SRCS = \ > winver.h \ > wlanapi.h \ > wmistr.h \ > + wmium.h \ > wnaspi32.h \ > wownt32.h \ > ws2def.h \ > diff --git a/include/wmium.h b/include/wmium.h > new file mode 100644 > index 0000000..b69f205 > --- /dev/null > +++ b/include/wmium.h > @@ -0,0 +1,119 @@ > +/* > + * Copyright (C) 2016 Austin English > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > + */ > +#ifndef _WMIUM_ > +#define _WMIUM_ > + > +#define WMIAPI DECLSPEC_IMPORT __stdcall There should be an #ifdef, DECLSPEC_IMPORT should not be added for the implementation itself. > + > +#include <guiddef.h> > +#include <basetsd.h> > +#include <wmistr.h> > + > +typedef PVOID WMIHANDLE, *PWMIHANDLE, MOFHANDLE, *PMOFHANDLE; > + > +#define MOFCI_reserved0 0x00000001 > +#define MOFCI_reserved1 0x00000002 > +#define MOFCI_reserved2 0x00000004 > + > +typedef struct > +{ > + char *ImagePath; Shouldn't this be a WCHAR pointer? > + WCHAR *ResourceName; > + ULONG ResourceSize; > + UCHAR *Resourcebuffer; > +} MOFRESOURCEINFOW, *PMOFRESOURCEINFOW; > + > +typedef struct > +{ > + char *ImagePath; > + char *ResourceName; > + ULONG ResourceSize; > + UCHAR *Resourcebuffer; > +} MOFRESOURCEINFOA, *PMOFRESOURCEINFOA; > + > +#ifdef UNICODE > +typedef MOFRESOURCEINFOW MOFRESOURCEINFO; > +typedef PMOFRESOURCEINFOW PMOFRESOURCEINFO; > +#else > +typedef MOFRESOURCEINFOA MOFRESOURCEINFO; > +typedef PMOFRESOURCEINFOA PMOFRESOURCEINFO; > +#endif > + > +#ifdef __cplusplus > +extern "C" { > +#endif > + > +#define NOTIFICATION_TRACE_FLAG 0x00010000 > +#define NOTIFICATION_CALLBACK_DIRECT 0x00000004 > +#define NOTIFICATION_CHECK_ACCESS 0x00000008 > + > +typedef void (WINAPI *NOTIFICATIONCALLBACK)(WNODE_HEADER *Wnode, UINT_PTR NotificationContext); There is no need to keep the original parameter names here. > + > +typedef struct _WMIGUIDINFORMATION > +{ > + ULONG Size; > + BOOLEAN IsExpensive; > + BOOLEAN IsEventOnly; > +} WMIGUIDINFORMATION, *PWMIGUIDINFORMATION; > + > +DEFINE_GUID(GUID_REGISTRATION_CHANGE_NOTIFICATION, 0xb48d49a1, 0xe777, 0x11d0, 0xa5, 0xc, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0x10); > +DEFINE_GUID(GUID_MOF_RESOURCE_ADDED_NOTIFICATION, 0xb48d49a2, 0xe777, 0x11d0, 0xa5, 0xc, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0x10); > +DEFINE_GUID(GUID_MOF_RESOURCE_REMOVED_NOTIFICATION, 0xb48d49a3, 0xe777, 0x11d0, 0xa5, 0xc, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0x10); > + > +ULONG WMIAPI WmiCloseBlock(WMIHANDLE handle); > +ULONG WMIAPI WmiDevInstTonameA(char *instance, ULONG length, char *dev, ULONG index); > +ULONG WMIAPI WmiDevInstTonameW(WCHAR *instance, ULONG length, WCHAR *dev, ULONG index); Those two functions above do not exist in any of my header files. Did you maybe mean WmiDevInstToInstanceNameA/W ? > +ULONG WMIAPI WmiEnumerateGuids(LPGUID list, ULONG *count); > +ULONG WMIAPI WmiExecuteMethodA(WMIHANDLE handle, const char *instance, ULONG method, ULONG inputsize, > + void *inputbuffer, ULONG *outputsize, void *outputbuffer); > +ULONG WMIAPI WmiExecuteMethodW(WMIHANDLE handle, const WCHAR *instance, ULONG method, ULONG inputsize, > + void *inputbuffer, ULONG *outputsize, void *outputbuffer); > +ULONG WMIAPI WmiFileHandleTonameA(WMIHANDLE handle, HANDLE filehandle, ULONG *num, char *names); > +ULONG WMIAPI WmiFileHandleTonameW(WMIHANDLE handle, HANDLE filehandle, ULONG *num, WCHAR *names); Those two functions also not exist. Did you mean WmiFileHandleToInstanceNameA/W? > +void WMIAPI WmiFreeBuffer(void *buffer); > +#define WmiInsertTimestamp(WnodeHeader) GetSystemTimeAsFileTime((FILETIME *)&((*WNODE_HEADER)WnodeHeader)->TimeStamp) > +ULONG WMIAPI WmiMofEnumerateResourcesA(MOFHANDLE handle, ULONG *count, PMOFRESOURCEINFOA *resource); > +ULONG WMIAPI WmiMofEnumerateResourcesW(MOFHANDLE handle, ULONG *count, PMOFRESOURCEINFOW *resource); > +ULONG WMIAPI WmiNotificationRegistrationA(LPGUID guid, BOOLEAN enable, void *info, ULONG_PTR context, ULONG flags); > +ULONG WMIAPI WmiNotificationRegistrationW(LPGUID guid, BOOLEAN enable, void *info, ULONG_PTR context, ULONG flags); > +ULONG WMIAPI WmiOpenBlock(GUID *guid, ULONG access, WMIHANDLE *handle); > +ULONG WMIAPI WmiQueryAllDataA(WMIHANDLE handle, ULONG *bufferSize, void *buffer); > +ULONG WMIAPI WmiQueryAllDataW(WMIHANDLE handle, ULONG *buffferSize, void *buffer); > +ULONG WMIAPI WmiQueryGuidInformation(WMIHANDLE handle, PWMIGUIDINFORMATION guidinfo); > +ULONG WMIAPI WmiQuerySingleInstanceA(WMIHANDLE handle, const char *name, ULONG *bufferSize, void *buffer); > +ULONG WMIAPI WmiQuerySingleInstanceW(WMIHANDLE handle, const WCHAR *name, ULONG *bufferSize, void *buffer); > +ULONG WMIAPI WmiSetSingleInstanceA(WMIHANDLE handle, const char *name, ULONG reserved, ULONG size, void *buffer); > +ULONG WMIAPI WmiSetSingleInstanceW(WMIHANDLE handle, const WCHAR *name, ULONG reserved, ULONG size, void *buffer); > +ULONG WMIAPI WmiSetSingleItemA(WMIHANDLE handle, const char *name, ULONG id, ULONG reserved, ULONG size, void *buffer); > +ULONG WMIAPI WmiSetSingleItemW(WMIHANDLE handle, const WCHAR *name, ULONG id, ULONG reserved, ULONG size, void *buffer); > + > +DECL_WINELIB_TYPE_AW(WmiDevInstToname) > +DECL_WINELIB_TYPE_AW(WmiExecuteMethod) > +DECL_WINELIB_TYPE_AW(WmiFileHandleToname) > +DECL_WINELIB_TYPE_AW(WmiMofEnumerateResources) > +DECL_WINELIB_TYPE_AW(WmiNotificationRegistration) > +DECL_WINELIB_TYPE_AW(WmiQueryAllData) > +DECL_WINELIB_TYPE_AW(WmiQuerySingleInstance) > +DECL_WINELIB_TYPE_AW(WmiSetSingleInstance) > +DECL_WINELIB_TYPE_AW(WmiSetSingleItem) > + > +#ifdef __cplusplus > +} > +#endif > + > +#endif /* _WMIUM_ */ > -- 2.7.3 > > >

1 0

GPU detection logic in wined3d
by Ken Thomases May 5, 2016

May 5, 2016

Hi, Now that the WGL_WINE_query_renderer extension is implemented for Mesa and OS X, I want to reconsider the logic for detecting the GPU in wined3d. See wined3d_adapter_init_gl_caps() and query_gpu_description() in dlls/wined3d/directx.c. First, let's assume that query_renderer is available and the user has not overridden the vendor or device IDs via the registry: If query_renderer provides vendor and device IDs, I think that those should carry a lot of weight. They are almost certainly the real values. So, if that combination isn't found in wined3d's tables, it should emit a winediag ERR. We want to update the tables to account for the devices, especially for Macs where there are relatively few GPUs and they're common to a lot of machines. Currently, the failure to find them is just silently ignored. If the combination isn't found or if query_renderer provided a vendor but no device, and the vendor is one of the known ones (i.e. from card_vendor_table), then it should be used to constrain the guessing. Wined3d should not attempt to guess the vendor. Currently, the vendor provided by query_renderer is just ignored in that case. If query_renderer provides a device ID but no vendor, then that's basically useless and should be ignored. If the user has overridden both the vendor and device in the registry but that combination is not in the tables, then we should go back to the values from query_renderer. Basically, this is user error to specify useless values in the override and it should be ignored. Currently, the overrides replace the values from query_renderer and they are lost. If the user has overridden just the vendor, then it should be used iff it's one of the known ones. This is the user telling us the vendor of their GPU. If it doesn't match the vendor provided by query_renderer, then any device provided by query_renderer should be ignored. It doesn't make sense to combine a device ID from one vendor with a different vendor. Wined3d will have to guess the device. If the user has overridden just the device, then it should be used with the vendor from query_renderer. If that combination is not found, then it should be ignored. The user presumably saw on some previous occasion that wined3d determined the right vendor but the wrong device and just corrected the device. If the combination is not found, then either the vendor has changed or the user did it wrong by specifying a device that's not known to wined3d. If people (mostly Henri) generally like the above proposed logic, I can work up a patch. -Ken

1 0