April 2014 - Wine-commits - list.winehq.org

Frédéric Delanoy : French translation for release 1.7.16
by Jeremy Newman 07 Apr '14

07 Apr '14

Module: website Branch: master Commit: 8cc2978734be2cf49812a1e4e999dd2b3b8a6136 URL: http://source.winehq.org/git/website.git/?a=commit;h=8cc2978734be2cf49812a1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Apr 5 11:30:59 2014 +0200 French translation for release 1.7.16 --- news/fr/2014040401.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/fr/2014040401.xml b/news/fr/2014040401.xml new file mode 100644 index 0000000..7dc8280 --- /dev/null +++ b/news/fr/2014040401.xml @@ -0,0 +1,14 @@ +<news> +<date>4 avril 2014</date> +<title>Sortie de Wine 1.7.16</title> +<body> + La version de développement 1.7.16 de Wine est disponible. + <a href="{$root}/announce/1.7.16">Nouveautés</a> de cette version : +<ul> + <li>Corrections additionnelles dans les tests de régression.</li> + <li>Meilleure prise en charge des tableaux de chaînes de caractères dans le compilateur IDL.</li> + <li>Squelettes de fonctions initiaux pour DirectX Video Acceleration.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.16.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.16
by Alexandre Julliard 04 Apr '14

04 Apr '14

Module: website Branch: master Commit: 651709a0b321ab9b8967d55c57c40f013e86ba23 URL: http://source.winehq.org/git/website.git/?a=commit;h=651709a0b321ab9b8967d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 4 21:21:26 2014 +0200 Wine release 1.7.16 --- news/en/2014040401.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2014040401.xml b/news/en/2014040401.xml new file mode 100644 index 0000000..e0915d4 --- /dev/null +++ b/news/en/2014040401.xml @@ -0,0 +1,15 @@ +<news> +<date>April 4, 2014</date> +<title>Wine 1.7.16 Released</title> +<body> + The Wine development release 1.7.16 is now available. + <a href="{$root}/announce/1.7.16">What's new</a> in this release: +<ul> + <li>More regression test fixes.</li> + <li>String arrays better supported in the IDL compiler.</li> + <li>Initial stubs for DirectX Video Acceleration.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.16.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.7.16.
by Alexandre Julliard 04 Apr '14

04 Apr '14

Module: wine Branch: master Commit: f820d9723b2725d0fa8cc2012ed50a6869fdb951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f820d9723b2725d0fa8cc2012… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 4 21:13:44 2014 +0200 Release 1.7.16. --- ANNOUNCE | 670 ++++++++++++++++++++++++++++++------------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 4 files changed, 346 insertions(+), 348 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f820d9723b2725d0fa8cc…

1 0

Tag wine-1.7.16 : Alexandre Julliard : Release 1.7.16
by Alexandre Julliard 04 Apr '14

04 Apr '14

Module: wine Branch: refs/tags/wine-1.7.16 Tag: 307da4775f27ab42599311e95d024c096962508f URL: http://source.winehq.org/git/wine.git/?a=tag;h=307da4775f27ab42599311e95d02… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 4 21:13:44 2014 +0200 Release 1.7.16

1 0

Henri Verbeet : d3d9/tests: Use a separate device for yuv_layout_test().
by Alexandre Julliard 04 Apr '14

04 Apr '14

Module: wine Branch: master Commit: 09be75d2b806b31a9ab24be4332005baa09bcfca URL: http://source.winehq.org/git/wine.git/?a=commit;h=09be75d2b806b31a9ab24be43… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 4 10:28:10 2014 +0200 d3d9/tests: Use a separate device for yuv_layout_test(). --- dlls/d3d9/tests/visual.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 0aad231..e47a864 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11083,7 +11083,7 @@ static void yuv_color_test(IDirect3DDevice9 *device) IDirect3D9_Release(d3d); } -static void yuv_layout_test(IDirect3DDevice9 *device) +static void yuv_layout_test(void) { HRESULT hr; IDirect3DSurface9 *surface, *target; @@ -11096,8 +11096,11 @@ static void yuv_layout_test(IDirect3DDevice9 *device) DWORD ref_color; BYTE *buf, *chroma_buf, *u_buf, *v_buf; UINT width = 20, height = 16; + IDirect3DDevice9 *device; + ULONG refcount; D3DCAPS9 caps; D3DSURFACE_DESC desc; + HWND window; static const struct { @@ -11129,17 +11132,26 @@ static void yuv_layout_test(IDirect3DDevice9 *device) { MAKEFOURCC('N','V','1','2'), "D3DFMT_NV12", }, }; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "GetDeviceCaps failed, hr %#x.\n", hr); if (caps.TextureCaps & D3DPTEXTURECAPS_POW2 && !(caps.TextureCaps & D3DPTEXTURECAPS_NONPOW2CONDITIONAL)) { skip("No NP2 texture support, skipping YUV texture layout test.\n"); - return; + IDirect3DDevice9_Release(device); + goto done; } - hr = IDirect3DDevice9_GetDirect3D(device, &d3d); - ok(hr == D3D_OK, "IDirect3DDevice9_GetDirect3D failed, hr = %#x.\n", hr); hr = IDirect3DDevice9_GetRenderTarget(device, 0, &target); ok(hr == D3D_OK, "IDirect3DDevice9_GetRenderTarget failed, hr = %#x.\n", hr); hr = IDirect3DSurface9_GetDesc(target, &desc); @@ -11254,7 +11266,11 @@ static void yuv_layout_test(IDirect3DDevice9 *device) } IDirect3DSurface9_Release(target); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: IDirect3D9_Release(d3d); + DestroyWindow(window); } static void texop_range_test(void) @@ -16466,11 +16482,11 @@ START_TEST(visual) tssargtemp_test(device_ptr); np2_stretch_rect_test(device_ptr); yuv_color_test(device_ptr); - yuv_layout_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + yuv_layout_test(); zwriteenable_test(); alphatest_test(); viewport_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for yuv_color_test().
by Alexandre Julliard 04 Apr '14

04 Apr '14

Module: wine Branch: master Commit: 2e0e4f91ff1d8c84af423cc3508b093021d43659 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e0e4f91ff1d8c84af423cc35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 4 10:28:11 2014 +0200 d3d9/tests: Use a separate device for yuv_color_test(). --- dlls/d3d9/tests/visual.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e47a864..b4506b2 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10948,7 +10948,7 @@ done: DestroyWindow(window); } -static void yuv_color_test(IDirect3DDevice9 *device) +static void yuv_color_test(void) { HRESULT hr; IDirect3DSurface9 *surface, *target; @@ -10957,7 +10957,10 @@ static void yuv_color_test(IDirect3DDevice9 *device) IDirect3D9 *d3d; D3DCOLOR color; D3DFORMAT skip_once = D3DFMT_UNKNOWN; + IDirect3DDevice9 *device; D3DSURFACE_DESC desc; + ULONG refcount; + HWND window; static const struct { @@ -11007,8 +11010,16 @@ static void yuv_color_test(IDirect3DDevice9 *device) {0x1c6b1cff, D3DFMT_YUY2, "D3DFMT_YUY2", 0x006dff45, 0x0000d500}, }; - hr = IDirect3DDevice9_GetDirect3D(device, &d3d); - ok(SUCCEEDED(hr), "Failed to get d3d9 interface, hr %#x.\n", hr); + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &target); ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); hr = IDirect3DSurface9_GetDesc(target, &desc); @@ -11080,7 +11091,11 @@ static void yuv_color_test(IDirect3DDevice9 *device) } IDirect3DSurface9_Release(target); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: IDirect3D9_Release(d3d); + DestroyWindow(window); } static void yuv_layout_test(void) @@ -16481,11 +16496,11 @@ START_TEST(visual) pointsize_test(device_ptr); tssargtemp_test(device_ptr); np2_stretch_rect_test(device_ptr); - yuv_color_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + yuv_color_test(); yuv_layout_test(); zwriteenable_test(); alphatest_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for np2_stretch_rect_test().
by Alexandre Julliard 04 Apr '14

04 Apr '14

Module: wine Branch: master Commit: 12743d5709704ac3ba6a1e2906b6f9f3a91e6b21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12743d5709704ac3ba6a1e290… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 4 10:28:12 2014 +0200 d3d9/tests: Use a separate device for np2_stretch_rect_test(). --- dlls/d3d9/tests/visual.c | 53 ++++++++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 18 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b4506b2..7377348 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10696,22 +10696,39 @@ done: DestroyWindow(window); } -static void np2_stretch_rect_test(IDirect3DDevice9 *device) { +static void np2_stretch_rect_test(void) +{ IDirect3DSurface9 *src = NULL, *dst = NULL, *backbuffer = NULL; IDirect3DTexture9 *dsttex = NULL; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; HRESULT hr; - DWORD color; - D3DRECT r1 = {0, 0, 50, 50 }; - D3DRECT r2 = {50, 0, 100, 50 }; - D3DRECT r3 = {50, 50, 100, 100}; - D3DRECT r4 = {0, 50, 50, 100}; - const float quad[] = { - -1.0, -1.0, 0.1, 0.0, 0.0, - 1.0, -1.0, 0.1, 1.0, 0.0, - -1.0, 1.0, 0.1, 0.0, 1.0, - 1.0, 1.0, 0.1, 1.0, 1.0, + + static const D3DRECT r1 = {0, 0, 50, 50 }; + static const D3DRECT r2 = {50, 0, 100, 50 }; + static const D3DRECT r3 = {50, 50, 100, 100}; + static const D3DRECT r4 = {0, 50, 50, 100}; + static const float quad[] = + { + -1.0f, -1.0f, 0.1f, 0.0f, 0.0f, + -1.0f, 1.0f, 0.1f, 0.0f, 1.0f, + 1.0f, -1.0f, 0.1f, 1.0f, 0.0f, + 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, }; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); ok(hr == D3D_OK, "IDirect3DDevice9_GetBackBuffer failed with %08x\n", hr); @@ -10728,7 +10745,7 @@ static void np2_stretch_rect_test(IDirect3DDevice9 *device) { hr = IDirect3DTexture9_GetSurfaceLevel(dsttex, 0, &dst); ok(hr == D3D_OK, "IDirect3DTexture9_GetSurfaceLevel failed with %08x\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ffff, 0.0, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff00ffff, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %08x\n", hr); /* Clear the StretchRect destination for debugging */ @@ -10788,15 +10805,15 @@ static void np2_stretch_rect_test(IDirect3DDevice9 *device) { hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %08x\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %08x\n", hr); - cleanup: if(src) IDirect3DSurface9_Release(src); if(backbuffer) IDirect3DSurface9_Release(backbuffer); if(dsttex) IDirect3DTexture9_Release(dsttex); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void texop_test(void) @@ -16495,11 +16512,11 @@ START_TEST(visual) fixed_function_bumpmap_test(device_ptr); pointsize_test(device_ptr); tssargtemp_test(device_ptr); - np2_stretch_rect_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + np2_stretch_rect_test(); yuv_color_test(); yuv_layout_test(); zwriteenable_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for tssargtemp_test().
by Alexandre Julliard 04 Apr '14

04 Apr '14

Module: wine Branch: master Commit: 7980b8d8334d92baf3dcdc1d7a6a6c88cf862027 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7980b8d8334d92baf3dcdc1d7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 4 10:28:13 2014 +0200 d3d9/tests: Use a separate device for tssargtemp_test(). --- dlls/d3d9/tests/visual.c | 57 ++++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 7377348..af93c80 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10318,27 +10318,44 @@ out: } } -static void tssargtemp_test(IDirect3DDevice9 *device) +static void tssargtemp_test(void) { + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + D3DCOLOR color; + ULONG refcount; + D3DCAPS9 caps; + HWND window; HRESULT hr; - DWORD color; - static const struct vertex quad[] = { - {-1.0, -1.0, 0.1, 0x00ff0000}, - { 1.0, -1.0, 0.1, 0x00ff0000}, - {-1.0, 1.0, 0.1, 0x00ff0000}, - { 1.0, 1.0, 0.1, 0x00ff0000} + + static const struct vertex quad[] = + { + {-1.0f, -1.0f, 0.1f, 0x00ff0000}, + {-1.0f, 1.0f, 0.1f, 0x00ff0000}, + { 1.0f, -1.0f, 0.1f, 0x00ff0000}, + { 1.0f, 1.0f, 0.1f, 0x00ff0000}, }; - D3DCAPS9 caps; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } memset(&caps, 0, sizeof(caps)); hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(hr == D3D_OK, "IDirect3DDevice9_GetDeviceCaps failed with %08x\n", hr); if(!(caps.PrimitiveMiscCaps & D3DPMISCCAPS_TSSARGTEMP)) { skip("D3DPMISCCAPS_TSSARGTEMP not supported\n"); - return; + IDirect3DDevice9_Release(device); + goto done; } - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 0.0, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff000000, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %08x\n", hr); hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); @@ -10365,6 +10382,8 @@ static void tssargtemp_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetRenderState(device, D3DRS_TEXTUREFACTOR, 0x0000ff00); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed, hr = %08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed, hr = %08x\n", hr); @@ -10380,17 +10399,11 @@ static void tssargtemp_test(IDirect3DDevice9 *device) ok(color == 0x00ffff00, "TSSARGTEMP test returned color 0x%08x, expected 0x00ffff00\n", color); IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - /* Set stage 1 back to default */ - hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_RESULTARG, D3DTA_CURRENT); - ok(hr == D3D_OK, "SetTextureStageState failed, hr = %08x\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(hr == D3D_OK, "SetTextureStageState failed, hr = %08x\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(hr == D3D_OK, "SetTextureStageState failed, hr = %08x\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 2, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(hr == D3D_OK, "SetTextureStageState failed, hr = %08x\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 3, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(hr == D3D_OK, "SetTextureStageState failed, hr = %08x\n", hr); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } /* Drawing Indexed Geometry with instances*/ @@ -16511,11 +16524,11 @@ START_TEST(visual) conditional_np2_repeat_test(device_ptr); fixed_function_bumpmap_test(device_ptr); pointsize_test(device_ptr); - tssargtemp_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + tssargtemp_test(); np2_stretch_rect_test(); yuv_color_test(); yuv_layout_test();

1 0

Dmitry Timoshkov : schedsvc: Implement SchRpcEnumFolders.
by Alexandre Julliard 04 Apr '14

04 Apr '14

Module: wine Branch: master Commit: 1f717504cbfcd17b14ecf5752e622f2d4f5bad84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f717504cbfcd17b14ecf5752… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 4 15:15:24 2014 +0900 schedsvc: Implement SchRpcEnumFolders. --- dlls/schedsvc/schedsvc.c | 129 +++++++++++++++++++++++++++++++++++++- dlls/schedsvc/schedsvc_private.h | 6 ++ 2 files changed, 133 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index 5c7d359..a1fa4e0 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -326,11 +326,136 @@ HRESULT __cdecl SchRpcGetSecurity(const WCHAR *path, DWORD flags, WCHAR **sddl) return E_NOTIMPL; } +static void free_list(TASK_NAMES list, LONG count) +{ + LONG i; + + for (i = 0; i < count; i++) + heap_free(list[i]); + + heap_free(list); +} + +static inline BOOL is_directory(const WIN32_FIND_DATAW *data) +{ + if (data->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + if (data->cFileName[0] == '.') + { + if (!data->cFileName[1] || (data->cFileName[1] == '.' && !data->cFileName[2])) + return FALSE; + } + return TRUE; + } + return FALSE; +} + HRESULT __cdecl SchRpcEnumFolders(const WCHAR *path, DWORD flags, DWORD *start_index, DWORD n_requested, DWORD *n_names, TASK_NAMES *names) { - FIXME("%s,%#x,%p,%u,%p,%p: stub\n", debugstr_w(path), flags, start_index, n_requested, n_names, names); - return E_NOTIMPL; + static const WCHAR allW[] = {'\\','*',0}; + HRESULT hr = S_OK; + WCHAR *full_name; + WCHAR pathW[MAX_PATH]; + WIN32_FIND_DATAW data; + HANDLE handle; + DWORD allocated, count, index; + TASK_NAMES list; + + TRACE("%s,%#x,%u,%u,%p,%p\n", debugstr_w(path), flags, *start_index, n_requested, n_names, names); + + *n_names = 0; + *names = NULL; + + if (flags & ~TASK_ENUM_HIDDEN) return E_INVALIDARG; + + if (!n_requested) n_requested = ~0u; + + full_name = get_full_name(path, NULL); + if (!full_name) return E_OUTOFMEMORY; + + if (strlenW(full_name) + 2 > MAX_PATH) + { + heap_free(full_name); + return HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE); + } + + strcpyW(pathW, full_name); + strcatW(pathW, allW); + + heap_free(full_name); + + allocated = 64; + list = heap_alloc(allocated * sizeof(list[0])); + if (!list) return E_OUTOFMEMORY; + + index = count = 0; + + handle = FindFirstFileW(pathW, &data); + if (handle == INVALID_HANDLE_VALUE) + { + heap_free(list); + if (GetLastError() == ERROR_PATH_NOT_FOUND) + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + return HRESULT_FROM_WIN32(GetLastError()); + } + + do + { + if (is_directory(&data) && index++ >= *start_index) + { + if (count >= allocated) + { + TASK_NAMES new_list; + allocated *= 2; + new_list = heap_realloc(list, allocated * sizeof(list[0])); + if (!new_list) + { + hr = E_OUTOFMEMORY; + break; + } + list = new_list; + } + + TRACE("adding %s\n", debugstr_w(data.cFileName)); + + list[count] = heap_strdupW(data.cFileName); + if (!list[count]) + { + hr = E_OUTOFMEMORY; + break; + } + + count++; + + if (count >= n_requested) + { + hr = S_FALSE; + break; + } + } + } while (FindNextFileW(handle, &data)); + + FindClose(handle); + + if (FAILED(hr)) + { + free_list(list, count); + return hr; + } + + *n_names = count; + + if (count) + { + *names = list; + *start_index = index; + return hr; + } + + heap_free(list); + *names = NULL; + return *start_index ? S_FALSE : S_OK; } HRESULT __cdecl SchRpcEnumTasks(const WCHAR *path, DWORD flags, DWORD *start_index, DWORD n_requested, diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index fd0225f..4138aa0 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -37,6 +37,12 @@ static inline void *heap_alloc(SIZE_T size) return MIDL_user_allocate(size); } +static void *heap_realloc(void *ptr, SIZE_T size) __WINE_ALLOC_SIZE(2); +static inline void *heap_realloc(void *ptr, SIZE_T size) +{ + return HeapReAlloc(GetProcessHeap(), 0, ptr, size); +} + static inline void heap_free(void *ptr) { MIDL_user_free(ptr);

1 0

Dmitry Timoshkov : schedsvc: Implement SchRpcEnumTasks.
by Alexandre Julliard 04 Apr '14

04 Apr '14

Module: wine Branch: master Commit: a67565edc48629723535ebd30d22d731d116bd83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a67565edc48629723535ebd30… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 4 15:15:29 2014 +0900 schedsvc: Implement SchRpcEnumTasks. --- dlls/schedsvc/schedsvc.c | 110 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 108 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index a1fa4e0..1b62b94 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -350,6 +350,11 @@ static inline BOOL is_directory(const WIN32_FIND_DATAW *data) return FALSE; } +static inline BOOL is_file(const WIN32_FIND_DATAW *data) +{ + return !(data->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); +} + HRESULT __cdecl SchRpcEnumFolders(const WCHAR *path, DWORD flags, DWORD *start_index, DWORD n_requested, DWORD *n_names, TASK_NAMES *names) { @@ -461,8 +466,109 @@ HRESULT __cdecl SchRpcEnumFolders(const WCHAR *path, DWORD flags, DWORD *start_i HRESULT __cdecl SchRpcEnumTasks(const WCHAR *path, DWORD flags, DWORD *start_index, DWORD n_requested, DWORD *n_names, TASK_NAMES *names) { - FIXME("%s,%#x,%p,%u,%p,%p: stub\n", debugstr_w(path), flags, start_index, n_requested, n_names, names); - return E_NOTIMPL; + static const WCHAR allW[] = {'\\','*',0}; + HRESULT hr = S_OK; + WCHAR *full_name; + WCHAR pathW[MAX_PATH]; + WIN32_FIND_DATAW data; + HANDLE handle; + DWORD allocated, count, index; + TASK_NAMES list; + + TRACE("%s,%#x,%u,%u,%p,%p\n", debugstr_w(path), flags, *start_index, n_requested, n_names, names); + + *n_names = 0; + *names = NULL; + + if (flags & ~TASK_ENUM_HIDDEN) return E_INVALIDARG; + + if (!n_requested) n_requested = ~0u; + + full_name = get_full_name(path, NULL); + if (!full_name) return E_OUTOFMEMORY; + + if (strlenW(full_name) + 2 > MAX_PATH) + { + heap_free(full_name); + return HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE); + } + + strcpyW(pathW, full_name); + strcatW(pathW, allW); + + heap_free(full_name); + + allocated = 64; + list = heap_alloc(allocated * sizeof(list[0])); + if (!list) return E_OUTOFMEMORY; + + index = count = 0; + + handle = FindFirstFileW(pathW, &data); + if (handle == INVALID_HANDLE_VALUE) + { + heap_free(list); + if (GetLastError() == ERROR_PATH_NOT_FOUND) + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + return HRESULT_FROM_WIN32(GetLastError()); + } + + do + { + if (is_file(&data) && index++ >= *start_index) + { + if (count >= allocated) + { + TASK_NAMES new_list; + allocated *= 2; + new_list = heap_realloc(list, allocated * sizeof(list[0])); + if (!new_list) + { + hr = E_OUTOFMEMORY; + break; + } + list = new_list; + } + + TRACE("adding %s\n", debugstr_w(data.cFileName)); + + list[count] = heap_strdupW(data.cFileName); + if (!list[count]) + { + hr = E_OUTOFMEMORY; + break; + } + + count++; + + if (count >= n_requested) + { + hr = S_FALSE; + break; + } + } + } while (FindNextFileW(handle, &data)); + + FindClose(handle); + + if (FAILED(hr)) + { + free_list(list, count); + return hr; + } + + *n_names = count; + + if (count) + { + *names = list; + *start_index = index; + return hr; + } + + heap_free(list); + *names = NULL; + return *start_index ? S_FALSE : S_OK; } HRESULT __cdecl SchRpcEnumInstances(const WCHAR *path, DWORD flags, DWORD *n_guids, GUID **guids)

1 0