June 2016 - Wine-devel - list.winehq.org

Re: [PATCH 3/5] usp10: Arabic numerals are written left-to-right.
by Marvin 07 Jun '16

07 Jun '16

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=23412 Your paranoid android. === w1064 (32 bit usp10) === usp10.c:1473: Test failed: 0: uJustification incorrect (0) usp10.c:1473: Test failed: 1: uJustification incorrect (0) usp10.c:1473: Test failed: 2: uJustification incorrect (0) usp10.c:1473: Test failed: 3: uJustification incorrect (0) usp10.c:1473: Test failed: 4: uJustification incorrect (0) usp10.c:1473: Test failed: 5: uJustification incorrect (0) usp10.c:1473: Test failed: 6: uJustification incorrect (0) usp10.c:1473: Test failed: 7: uJustification incorrect (0) usp10.c:1473: Test failed: 8: uJustification incorrect (0) usp10.c:1473: Test failed: 9: uJustification incorrect (0) usp10.c:1489: Test failed: 3: uJustification incorrect (0) usp10.c:1489: Test failed: 5: fDiacritic incorrect (1) usp10.c:1489: Test failed: 5: fZeroWidth incorrect (1) usp10.c:1489: Test failed: 15: fDiacritic incorrect (1) usp10.c:1489: Test failed: 15: fZeroWidth incorrect (1) === w1064 (64 bit usp10) === usp10.c:1473: Test failed: 0: uJustification incorrect (0) usp10.c:1473: Test failed: 1: uJustification incorrect (0) usp10.c:1473: Test failed: 2: uJustification incorrect (0) usp10.c:1473: Test failed: 3: uJustification incorrect (0) usp10.c:1473: Test failed: 4: uJustification incorrect (0) usp10.c:1473: Test failed: 5: uJustification incorrect (0) usp10.c:1473: Test failed: 6: uJustification incorrect (0) usp10.c:1473: Test failed: 7: uJustification incorrect (0) usp10.c:1473: Test failed: 8: uJustification incorrect (0) usp10.c:1473: Test failed: 9: uJustification incorrect (0) usp10.c:1489: Test failed: 3: uJustification incorrect (0) usp10.c:1489: Test failed: 5: fDiacritic incorrect (1) usp10.c:1489: Test failed: 5: fZeroWidth incorrect (1) usp10.c:1489: Test failed: 15: fDiacritic incorrect (1) usp10.c:1489: Test failed: 15: fZeroWidth incorrect (1)

1 0

Re: [PATCH 1/5] ddraw/tests: Remove A4R4G4B4 ckey tests (v2).
by Henri Verbeet 07 Jun '16

07 Jun '16

On 5 June 2016 at 23:56, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > They're more broken on Nvidia + Win10 than they used to be on Nvidia + > Win7. I can't find a way to detect the problem without putting the driver > into a broken state. > > The annoying part of this is that we lose 4 bit precision tests. X4R4G4B4 > doesn't seem to exist everywhere. > --- I don't suppose there's any chance of getting the driver fixed. Would something along the lines of adapter_is_warp() work here perhaps? With recent Windows versions, I'm getting the impression that there may come a point where we'll have a maximum version to run the ddraw tests on.

2 2

Re: [PATCH 2/5] usp10: Handle C2_ARABICNUMBER as numeric.
by Marvin 07 Jun '16

07 Jun '16

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=23411 Your paranoid android. === w1064 (32 bit usp10) === usp10.c:1473: Test failed: 0: uJustification incorrect (0) usp10.c:1473: Test failed: 1: uJustification incorrect (0) usp10.c:1473: Test failed: 2: uJustification incorrect (0) usp10.c:1473: Test failed: 3: uJustification incorrect (0) usp10.c:1473: Test failed: 4: uJustification incorrect (0) usp10.c:1473: Test failed: 5: uJustification incorrect (0) usp10.c:1473: Test failed: 6: uJustification incorrect (0) usp10.c:1473: Test failed: 7: uJustification incorrect (0) usp10.c:1473: Test failed: 8: uJustification incorrect (0) usp10.c:1473: Test failed: 9: uJustification incorrect (0) usp10.c:1489: Test failed: 3: uJustification incorrect (0) usp10.c:1489: Test failed: 5: fDiacritic incorrect (1) usp10.c:1489: Test failed: 5: fZeroWidth incorrect (1) usp10.c:1489: Test failed: 15: fDiacritic incorrect (1) usp10.c:1489: Test failed: 15: fZeroWidth incorrect (1) === w1064 (64 bit usp10) === usp10.c:1473: Test failed: 0: uJustification incorrect (0) usp10.c:1473: Test failed: 1: uJustification incorrect (0) usp10.c:1473: Test failed: 2: uJustification incorrect (0) usp10.c:1473: Test failed: 3: uJustification incorrect (0) usp10.c:1473: Test failed: 4: uJustification incorrect (0) usp10.c:1473: Test failed: 5: uJustification incorrect (0) usp10.c:1473: Test failed: 6: uJustification incorrect (0) usp10.c:1473: Test failed: 7: uJustification incorrect (0) usp10.c:1473: Test failed: 8: uJustification incorrect (0) usp10.c:1473: Test failed: 9: uJustification incorrect (0) usp10.c:1489: Test failed: 3: uJustification incorrect (0) usp10.c:1489: Test failed: 5: fDiacritic incorrect (1) usp10.c:1489: Test failed: 5: fZeroWidth incorrect (1) usp10.c:1489: Test failed: 15: fDiacritic incorrect (1) usp10.c:1489: Test failed: 15: fZeroWidth incorrect (1)

1 0

Re: [PATCH 1/5] usp10/tests: Add an itemisation test for Arabic numerals and punctuation.
by Marvin 07 Jun '16

07 Jun '16

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=23410 Your paranoid android. === w1064 (32 bit usp10) === usp10.c:1473: Test failed: 0: uJustification incorrect (0) usp10.c:1473: Test failed: 1: uJustification incorrect (0) usp10.c:1473: Test failed: 2: uJustification incorrect (0) usp10.c:1473: Test failed: 3: uJustification incorrect (0) usp10.c:1473: Test failed: 4: uJustification incorrect (0) usp10.c:1473: Test failed: 5: uJustification incorrect (0) usp10.c:1473: Test failed: 6: uJustification incorrect (0) usp10.c:1473: Test failed: 7: uJustification incorrect (0) usp10.c:1473: Test failed: 8: uJustification incorrect (0) usp10.c:1473: Test failed: 9: uJustification incorrect (0) usp10.c:1489: Test failed: 3: uJustification incorrect (0) usp10.c:1489: Test failed: 5: fDiacritic incorrect (1) usp10.c:1489: Test failed: 5: fZeroWidth incorrect (1) usp10.c:1489: Test failed: 15: fDiacritic incorrect (1) usp10.c:1489: Test failed: 15: fZeroWidth incorrect (1) === w1064 (64 bit usp10) === usp10.c:1473: Test failed: 0: uJustification incorrect (0) usp10.c:1473: Test failed: 1: uJustification incorrect (0) usp10.c:1473: Test failed: 2: uJustification incorrect (0) usp10.c:1473: Test failed: 3: uJustification incorrect (0) usp10.c:1473: Test failed: 4: uJustification incorrect (0) usp10.c:1473: Test failed: 5: uJustification incorrect (0) usp10.c:1473: Test failed: 6: uJustification incorrect (0) usp10.c:1473: Test failed: 7: uJustification incorrect (0) usp10.c:1473: Test failed: 8: uJustification incorrect (0) usp10.c:1473: Test failed: 9: uJustification incorrect (0) usp10.c:1489: Test failed: 3: uJustification incorrect (0) usp10.c:1489: Test failed: 5: fDiacritic incorrect (1) usp10.c:1489: Test failed: 5: fZeroWidth incorrect (1) usp10.c:1489: Test failed: 15: fDiacritic incorrect (1) usp10.c:1489: Test failed: 15: fZeroWidth incorrect (1)

1 0

Re: [PATCH 1/2] d3drm/tests: Add tests for IDirect3DRM*::CreateViewport. (v2)
by Henri Verbeet 07 Jun '16

07 Jun '16

On 6 June 2016 at 15:40, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > + /* Test all failures together */ > + hr = IDirect3DRM_CreateViewport(d3drm1, NULL, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); > + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); > + hr = IDirect3DRM_CreateViewport(d3drm1, device1, NULL, rc.left, rc.top, rc.right, rc.bottom, &viewport); > + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); > + hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom + 1, &viewport); > + todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); > + hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom, &viewport); > + todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); > + hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport); > + todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); Am I missing something, or is this test just going to leak a lot of viewport objects on Wine? > + if (FAILED(hr)) > + { > + hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom, NULL); > + todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); > + } Why the "if (FAILED(hr))"? If it's just to keep the test from crashing on Wine, it's probably easier to just fix Direct3DRMViewport_create().

1 0

Re: [PATCH 2/3] shell32/tests: Use wine_dbgstr_rect() to print RECTs.
by Marvin 07 Jun '16

07 Jun '16

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=23394 Your paranoid android. === w1064 (32 bit ebrowser) === ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {2e228ba3-ea25-4378-97b6-d574faeba356}, riid: {2e228ba3-ea25-4378-97b6-d574faeba356} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {42f85136-db7e-439c-85f1-e4075d135fc8} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {42f85136-db7e-439c-85f1-e4075d135fc8} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {42f85136-db7e-439c-85f1-e4075d135fc8} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} === w1064 (64 bit ebrowser) === ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {2e228ba3-ea25-4378-97b6-d574faeba356}, riid: {2e228ba3-ea25-4378-97b6-d574faeba356} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {42f85136-db7e-439c-85f1-e4075d135fc8} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {42f85136-db7e-439c-85f1-e4075d135fc8} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {42f85136-db7e-439c-85f1-e4075d135fc8} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832}

2 1

Re: [PATCH 2/2] msscript: Implement SetClientSite()/GetClientSite()
by Marvin 07 Jun '16

07 Jun '16

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=23391 Your paranoid android. === w2003std (32 bit msscript) === msscript: unhandled exception c0000005 at 5738B8CA

1 0

Re: [PATCH 1/2] msscript: Implement GetMiscStatus()
by Marvin 07 Jun '16

07 Jun '16

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=23390 Your paranoid android. === w2003std (32 bit msscript) === msscript: unhandled exception c0000005 at 5738B8CA

1 0

Re: [PATCH 2/2] advapi32: add some advapi32 wmi functions (try 2)
by Sebastian Lackner 06 Jun '16

06 Jun '16

On 03.06.2016 03:53, Austin English wrote: > -- -Austin GPG: 14FB D7EA A041 937B > > > 0002-advapi32-add-some-advapi32-wmi-functions-try-2.patch > > > From 43b496fab6de5cfa6521555d2c09c9d970a0e7ec Mon Sep 17 00:00:00 2001 > From: Austin English <austinenglish(a)gmail.com> > Date: Wed, 1 Jun 2016 23:02:02 -0500 > Subject: [PATCH 2/2] advapi32: add some advapi32 wmi functions (try 2) > > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > dlls/advapi32/Makefile.in | 3 +- > dlls/advapi32/advapi32.spec | 30 ++++---- > dlls/advapi32/eventlog.c | 9 --- > dlls/advapi32/wmi.c | 174 ++++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 191 insertions(+), 25 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 > > IDL_SRCS = svcctl.idl > > diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec > index 3f32aa3..d278d67 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(long str long long ptr ptr ptr) > +@ stdcall WmiExecuteMethodW(long wstr long long ptr ptr 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 WmiOpenBlock(ptr long ptr) > +@ stdcall WmiMofEnumerateResourcesA(long ptr ptr) > +@ stdcall WmiMofEnumerateResourcesW(long ptr ptr) > +@ stdcall WmiNotificationRegistrationA(ptr long ptr ptr long) > +@ stdcall WmiNotificationRegistrationW(ptr long ptr ptr long) > +@ stdcall WmiOpenBlock(ptr long long) > # @ stub WmiOpenTraceWithCursor > # @ stub WmiParseTraceEvent > -# @ stub WmiQueryAllDataA > +@ stdcall WmiQueryAllDataA(long ptr ptr) > # @ stub WmiQueryAllDataMultipleA > # @ stub WmiQueryAllDataMultipleW > -# @ stub WmiQueryAllDataW > -# @ stub WmiQueryGuidInformation > +@ stdcall WmiQueryAllDataW(long ptr ptr) > +@ stdcall WmiQueryGuidInformation(long ptr) > # @ stub WmiQuerySingleInstanceA > # @ stub WmiQuerySingleInstanceMultipleA > # @ stub WmiQuerySingleInstanceMultipleW > @ stub WmiQuerySingleInstanceW > # @ stub WmiReceiveNotificationsA > # @ stub WmiReceiveNotificationsW > -# @ stub WmiSetSingleInstanceA > -@ stub WmiSetSingleInstanceW > -# @ stub WmiSetSingleItemA > -# @ stub WmiSetSingleItemW > +@ stdcall WmiSetSingleInstanceA(long str long long ptr) > +@ stdcall WmiSetSingleInstanceW(long wstr long long ptr) > +@ stdcall WmiSetSingleItemA(long str long long long ptr) > +@ stdcall WmiSetSingleItemW(long wstr long long long ptr) > # @ stub Wow64Win32ApiEntry > @ stdcall WriteEncryptedFileRaw(ptr ptr ptr) > diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c > index 93c164d..7274d98 100644 > --- a/dlls/advapi32/eventlog.c > +++ b/dlls/advapi32/eventlog.c > @@ -964,12 +964,3 @@ ULONG WINAPI EnumerateTraceGuids(PTRACE_GUID_PROPERTIES *propertiesarray, > FIXME("%p %d %p: stub\n", propertiesarray, arraycount, guidcount); > return ERROR_INVALID_PARAMETER; > } > - > -/****************************************************************************** > - * WmiOpenBlock [ADVAPI32.@] > - */ > -NTSTATUS WINAPI WmiOpenBlock(GUID *guid, ULONG access, PVOID *datablock) > -{ > - FIXME("%s %d %p: stub\n", debugstr_guid(guid), access, datablock); > - return ERROR_SUCCESS; > -} > diff --git a/dlls/advapi32/wmi.c b/dlls/advapi32/wmi.c > new file mode 100644 > index 0000000..16b6094 > --- /dev/null > +++ b/dlls/advapi32/wmi.c > @@ -0,0 +1,174 @@ > +/* > + * 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" You should define _WMI_SOURCE_ before including the wmium header file. > +#include "wmium.h" > + > +#include "wine/unicode.h" > +#include "wine/debug.h" > + > +#include "advapi32_misc.h" > + > +WINE_DEFAULT_DEBUG_CHANNEL(wmi); > + > +/****************************************************************************** > + * WmiExecuteMethodA [ADVAPI32.@] > + */ > +ULONG WMIAPI WmiExecuteMethodA(WMIHANDLE handle, const char *instance, ULONG method, ULONG inputsize, > + 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; > +} > + > +/****************************************************************************** > + * WmiExecuteMethodW [ADVAPI32.@] > + */ > +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; > +} > + > +/****************************************************************************** > + * WmiFreeBuffer [ADVAPI32.@] > + */ > +void WMIAPI WmiFreeBuffer(void *buffer) > +{ > + HeapFree(GetProcessHeap(), 0, buffer); Currently there are no functions to allocate memory, so a stub here would probably be preferred. > +} > + > +/****************************************************************************** > + * WmiMofEnumerateResourcesA [ADVAPI32.@] > + */ > +ULONG WMIAPI WmiMofEnumerateResourcesA(MOFHANDLE handle, ULONG *count, MOFRESOURCEINFOA **resource) > +{ > + FIXME(": %p %p %p stub\n", handle, count, resource); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +/****************************************************************************** > + * WmiMofEnumerateResourcesW [ADVAPI32.@] > + */ > +ULONG WMIAPI WmiMofEnumerateResourcesW(MOFHANDLE handle, ULONG *count, MOFRESOURCEINFOW **resource) > +{ > + FIXME(": %p %p %p stub\n", handle, count, resource); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +/****************************************************************************** > + * WmiNotificationRegistrationA [ADVAPI32.@] > + */ > +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; > +} > + > +/****************************************************************************** > + * WmiNotificationRegistrationW [ADVAPI32.@] > + */ > +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; > +} > + > +/****************************************************************************** > + * WmiOpenBlock [ADVAPI32.@] > + */ > +ULONG WINAPI WmiOpenBlock(GUID *guid, ULONG access, WMIHANDLE *handle) > +{ > + FIXME("%s %d %p: stub\n", debugstr_guid(guid), access, handle); > + return ERROR_SUCCESS; > +} > + > +/****************************************************************************** > + * WmiQueryAllDataA [ADVAPI32.@] > + */ > +ULONG WMIAPI WmiQueryAllDataA(WMIHANDLE handle, ULONG *buffersize, void *buffer) > +{ > + FIXME(": %p %p %p stub\n", handle, buffersize, buffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +/****************************************************************************** > + * WmiQueryAllDataW [ADVAPI32.@] > + */ > +ULONG WMIAPI WmiQueryAllDataW(WMIHANDLE handle, ULONG *buffersize, void *buffer) > +{ > + FIXME(": %p %p %p stub\n", handle, buffersize, buffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +/****************************************************************************** > + * WmiQueryGuidInformation [ADVAPI32.@] > + */ > +ULONG WMIAPI WmiQueryGuidInformation(WMIHANDLE handle, WMIGUIDINFORMATION *guidinfo) > +{ > + FIXME(": %p %p stub\n", handle, guidinfo); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +/****************************************************************************** > + * WmiSetSingleInstanceA [ADVAPI32.@] > + */ > +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; > +} > + > +/****************************************************************************** > + * WmiSetSingleInstanceW [ADVAPI32.@] > + */ > +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; > +} > + > +/****************************************************************************** > + * WmiSetSingleItemA [ADVAPI32.@] > + */ > +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; > +} > + > +/****************************************************************************** > + * WmiSetSingleItemW [ADVAPI32.@] > + */ > +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: [PATCH 1/2] include: add wmium.h (try 2)
by Sebastian Lackner 06 Jun '16

06 Jun '16

On 03.06.2016 03:52, Austin English wrote: > -- -Austin GPG: 14FB D7EA A041 937B > > > 0001-include-add-wmium.h-try-2.patch > > > From 9e8d9cfd169c5233958ba0f6a1b7ec0a0559ec92 Mon Sep 17 00:00:00 2001 > From: Austin English <austinenglish(a)gmail.com> > Date: Wed, 1 Jun 2016 22:57:12 -0500 > Subject: [PATCH 1/2] include: add wmium.h (try 2) > > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > include/Makefile.in | 1 + > include/wmium.h | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 117 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..cb75ae0 > --- /dev/null > +++ b/include/wmium.h > @@ -0,0 +1,116 @@ > +/* > + * 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_ > + > +#ifdef _WMI_SOURCE_ > +#define WMIAPI __stdcall > +#else > +#define WMIAPI DECLSPEC_IMPORT __stdcall > +#endif > + > +#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 Based on my header files, the "reserved" should be uppercase here. > + > +typedef struct > +{ > + char *ImagePath; > + char *ResourceName; > + ULONG ResourceSize; > + UCHAR *Resourcebuffer; Buffer should start with an uppercase letter here. > +} MOFRESOURCEINFOA, *PMOFRESOURCEINFOA; > + > +typedef struct > +{ > + WCHAR *ImagePath; > + WCHAR *ResourceName; > + ULONG ResourceSize; > + UCHAR *Resourcebuffer; Here too. > +} MOFRESOURCEINFOW, *PMOFRESOURCEINFOW; > + > +DECL_WINELIB_TYPE_AW(MOFRESOURCEINFO); > +DECL_WINELIB_TYPE_AW(PMOFRESOURCEINFO); > + > +#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 *, UINT_PTR); > + > +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); > +ULONG WMIAPI WmiDevInstToInstanceNameA(char *, ULONG, char *, ULONG); > +ULONG WMIAPI WmiDevInstToInstanceNameW(WCHAR *, ULONG, WCHAR *, ULONG); > +ULONG WMIAPI WmiEnumerateGuids(LPGUID, ULONG *); > +ULONG WMIAPI WmiExecuteMethodA(WMIHANDLE, const char *, ULONG, ULONG, void *, ULONG *, void *); > +ULONG WMIAPI WmiExecuteMethodW(WMIHANDLE, const WCHAR *, ULONG, ULONG, void *, ULONG *, void *); > +ULONG WMIAPI WmiFileHandleToInstanceNameA(WMIHANDLE, HANDLE, ULONG *, char *); > +ULONG WMIAPI WmiFileHandleToInstanceNameW(WMIHANDLE, HANDLE, ULONG *, WCHAR *); > +void WMIAPI WmiFreeBuffer(void *); > +#define WmiInsertTimestamp(WnodeHeader) GetSystemTimeAsFileTime((FILETIME *)&((*WNODE_HEADER)WnodeHeader)->TimeStamp) I believe you wanted to write "WNODE_HEADER *" instead of "*WNODE_HEADER". > +ULONG WMIAPI WmiMofEnumerateResourcesA(MOFHANDLE, ULONG *, PMOFRESOURCEINFOA *); > +ULONG WMIAPI WmiMofEnumerateResourcesW(MOFHANDLE, ULONG *, PMOFRESOURCEINFOW *); > +ULONG WMIAPI WmiNotificationRegistrationA(LPGUID, BOOLEAN, void *, ULONG_PTR *, ULONG); > +ULONG WMIAPI WmiNotificationRegistrationW(LPGUID, BOOLEAN, void *, ULONG_PTR *, ULONG); The ULONG_PTR argument is no pointer here. > +ULONG WMIAPI WmiOpenBlock(GUID *, ULONG, WMIHANDLE *); > +ULONG WMIAPI WmiQueryAllDataA(WMIHANDLE, ULONG *, void *); > +ULONG WMIAPI WmiQueryAllDataW(WMIHANDLE, ULONG *, void *); > +ULONG WMIAPI WmiQueryGuidInformation(WMIHANDLE, PWMIGUIDINFORMATION); > +ULONG WMIAPI WmiQuerySingleInstanceA(WMIHANDLE, const char *, ULONG *, void *); > +ULONG WMIAPI WmiQuerySingleInstanceW(WMIHANDLE, const WCHAR *, ULONG *, void *); > +ULONG WMIAPI WmiSetSingleInstanceA(WMIHANDLE, const char *, ULONG, ULONG, void *); > +ULONG WMIAPI WmiSetSingleInstanceW(WMIHANDLE, const WCHAR *, ULONG, ULONG, void *); > +ULONG WMIAPI WmiSetSingleItemA(WMIHANDLE, const char *, ULONG, ULONG, ULONG, void *); > +ULONG WMIAPI WmiSetSingleItemW(WMIHANDLE, const WCHAR *, ULONG, ULONG, ULONG, void *); > + > +DECL_WINELIB_TYPE_AW(WmiDevInstToInstanceName) > +DECL_WINELIB_TYPE_AW(WmiExecuteMethod) > +DECL_WINELIB_TYPE_AW(WmiFileHandleToInstanceName) > +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