wine-commits April 2014

wine-commits@winehq.org

2 participants
500 discussions

Stefan Dösinger : d3d8/tests: Add a test for (sub-) resource types.
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: fffe162f40bf7fd4794eb5e9e6febc4bdb3b5114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fffe162f40bf7fd4794eb5e9e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 4 11:51:02 2014 +0200 d3d8/tests: Add a test for (sub-) resource types. --- dlls/d3d8/tests/device.c | 145 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 145 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index d683a76..37621bf 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -5957,6 +5957,150 @@ static void test_shader_constant_apply(void) DestroyWindow(window); } +static void test_resource_type(void) +{ + IDirect3DDevice8 *device; + IDirect3DSurface8 *surface; + IDirect3DTexture8 *texture; + IDirect3DCubeTexture8 *cube_texture; + IDirect3DVolume8 *volume; + IDirect3DVolumeTexture8 *volume_texture; + D3DSURFACE_DESC surface_desc; + D3DVOLUME_DESC volume_desc; + D3DRESOURCETYPE type; + IDirect3D8 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(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"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateImageSurface(device, 4, 4, D3DFMT_X8R8G8B8, &surface); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + hr = IDirect3DSurface8_GetDesc(surface, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + IDirect3DSurface8_Release(surface); + + hr = IDirect3DDevice8_CreateTexture(device, 2, 8, 4, 0, D3DFMT_X8R8G8B8, + D3DPOOL_SYSTEMMEM, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + type = IDirect3DTexture8_GetType(texture); + ok(type == D3DRTYPE_TEXTURE, "Expected type D3DRTYPE_TEXTURE, got %u.\n", type); + + hr = IDirect3DTexture8_GetSurfaceLevel(texture, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + hr = IDirect3DSurface8_GetDesc(surface, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + ok(surface_desc.Width == 2, "Expected width 2, got %u.\n", surface_desc.Width); + ok(surface_desc.Height == 8, "Expected height 8, got %u.\n", surface_desc.Height); + hr = IDirect3DTexture8_GetLevelDesc(texture, 0, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + ok(surface_desc.Width == 2, "Expected width 2, got %u.\n", surface_desc.Width); + ok(surface_desc.Height == 8, "Expected height 8, got %u.\n", surface_desc.Height); + IDirect3DSurface8_Release(surface); + + hr = IDirect3DTexture8_GetSurfaceLevel(texture, 2, &surface); + ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + hr = IDirect3DSurface8_GetDesc(surface, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + ok(surface_desc.Width == 1, "Expected width 1, got %u.\n", surface_desc.Width); + ok(surface_desc.Height == 2, "Expected height 2, got %u.\n", surface_desc.Height); + hr = IDirect3DTexture8_GetLevelDesc(texture, 2, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + ok(surface_desc.Width == 1, "Expected width 1, got %u.\n", surface_desc.Width); + ok(surface_desc.Height == 2, "Expected height 2, got %u.\n", surface_desc.Height); + IDirect3DSurface8_Release(surface); + IDirect3DTexture8_Release(texture); + + hr = IDirect3DDevice8_CreateCubeTexture(device, 1, 1, 0, D3DFMT_X8R8G8B8, + D3DPOOL_SYSTEMMEM, &cube_texture); + ok(SUCCEEDED(hr), "Failed to create cube texture, hr %#x.\n", hr); + type = IDirect3DCubeTexture8_GetType(cube_texture); + ok(type == D3DRTYPE_CUBETEXTURE, "Expected type D3DRTYPE_CUBETEXTURE, got %u.\n", type); + + hr = IDirect3DCubeTexture8_GetCubeMapSurface(cube_texture, + D3DCUBEMAP_FACE_NEGATIVE_X, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get cube map surface, hr %#x.\n", hr); + hr = IDirect3DSurface8_GetDesc(surface, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + hr = IDirect3DCubeTexture8_GetLevelDesc(cube_texture, 0, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + IDirect3DSurface8_Release(surface); + IDirect3DCubeTexture8_Release(cube_texture); + + hr = IDirect3DDevice8_CreateVolumeTexture(device, 2, 4, 8, 4, 0, D3DFMT_X8R8G8B8, + D3DPOOL_SYSTEMMEM, &volume_texture); + type = IDirect3DVolumeTexture8_GetType(volume_texture); + ok(type == D3DRTYPE_VOLUMETEXTURE, "Expected type D3DRTYPE_VOLUMETEXTURE, got %u.\n", type); + + hr = IDirect3DVolumeTexture8_GetVolumeLevel(volume_texture, 0, &volume); + ok(SUCCEEDED(hr), "Failed to get volume level, hr %#x.\n", hr); + /* IDirect3DVolume8 is not an IDirect3DResource8 and has no GetType method. */ + hr = IDirect3DVolume8_GetDesc(volume, &volume_desc); + ok(SUCCEEDED(hr), "Failed to get volume description, hr %#x.\n", hr); + ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", + volume_desc.Type); + ok(volume_desc.Width == 2, "Expected width 2, got %u.\n", volume_desc.Width); + ok(volume_desc.Height == 4, "Expected height 4, got %u.\n", volume_desc.Height); + ok(volume_desc.Depth == 8, "Expected depth 8, got %u.\n", volume_desc.Depth); + hr = IDirect3DVolumeTexture8_GetLevelDesc(volume_texture, 0, &volume_desc); + ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); + ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", + volume_desc.Type); + ok(volume_desc.Width == 2, "Expected width 2, got %u.\n", volume_desc.Width); + ok(volume_desc.Height == 4, "Expected height 4, got %u.\n", volume_desc.Height); + ok(volume_desc.Depth == 8, "Expected depth 8, got %u.\n", volume_desc.Depth); + IDirect3DVolume8_Release(volume); + + hr = IDirect3DVolumeTexture8_GetVolumeLevel(volume_texture, 2, &volume); + ok(SUCCEEDED(hr), "Failed to get volume level, hr %#x.\n", hr); + hr = IDirect3DVolume8_GetDesc(volume, &volume_desc); + ok(SUCCEEDED(hr), "Failed to get volume description, hr %#x.\n", hr); + ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", + volume_desc.Type); + ok(volume_desc.Width == 1, "Expected width 1, got %u.\n", volume_desc.Width); + ok(volume_desc.Height == 1, "Expected height 1, got %u.\n", volume_desc.Height); + ok(volume_desc.Depth == 2, "Expected depth 2, got %u.\n", volume_desc.Depth); + hr = IDirect3DVolumeTexture8_GetLevelDesc(volume_texture, 2, &volume_desc); + ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); + ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", + volume_desc.Type); + ok(volume_desc.Width == 1, "Expected width 1, got %u.\n", volume_desc.Width); + ok(volume_desc.Height == 1, "Expected height 1, got %u.\n", volume_desc.Height); + ok(volume_desc.Depth == 2, "Expected depth 2, got %u.\n", volume_desc.Depth); + IDirect3DVolume8_Release(volume); + IDirect3DVolumeTexture8_Release(volume_texture); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -6039,6 +6183,7 @@ START_TEST(device) test_pixel_format(); test_begin_end_state_block(); test_shader_constant_apply(); + test_resource_type(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Stefan Dösinger : d3d9/tests: Add a test for (sub-) resource types.
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: af51c679bf52055ccbd14d78268a7fee617a535f URL: http://source.winehq.org/git/wine.git/?a=commit;h=af51c679bf52055ccbd14d782… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 4 11:51:01 2014 +0200 d3d9/tests: Add a test for (sub-) resource types. --- dlls/d3d9/tests/device.c | 161 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index c936364..550c95e 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -7621,6 +7621,166 @@ static void test_vdecl_apply(void) DestroyWindow(window); } +static void test_resource_type(void) +{ + IDirect3DDevice9 *device; + IDirect3DSurface9 *surface; + IDirect3DTexture9 *texture; + IDirect3DCubeTexture9 *cube_texture; + IDirect3DVolume9 *volume; + IDirect3DVolumeTexture9 *volume_texture; + D3DSURFACE_DESC surface_desc; + D3DVOLUME_DESC volume_desc; + D3DRESOURCETYPE type; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 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"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, D3DFMT_X8R8G8B8, + D3DPOOL_SYSTEMMEM, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + type = IDirect3DSurface9_GetType(surface); + ok(type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", type); + hr = IDirect3DSurface9_GetDesc(surface, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + IDirect3DSurface9_Release(surface); + + hr = IDirect3DDevice9_CreateTexture(device, 2, 8, 4, 0, D3DFMT_X8R8G8B8, + D3DPOOL_SYSTEMMEM, &texture, NULL); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + type = IDirect3DTexture9_GetType(texture); + ok(type == D3DRTYPE_TEXTURE, "Expected type D3DRTYPE_TEXTURE, got %u.\n", type); + + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + /* The following code crashes, for the sake of completeness: + * type = texture->lpVtbl->GetType((IDirect3DTexture9 *)surface); + * ok(type == D3DRTYPE_PONIES, "Expected type D3DRTYPE_PONIES, got %u.\n", type); + * + * So applications will not depend on getting the "right" resource type - whatever it + * may be - from the "wrong" vtable. */ + type = IDirect3DSurface9_GetType(surface); + ok(type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", type); + hr = IDirect3DSurface9_GetDesc(surface, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + ok(surface_desc.Width == 2, "Expected width 2, got %u.\n", surface_desc.Width); + ok(surface_desc.Height == 8, "Expected height 8, got %u.\n", surface_desc.Height); + hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + ok(surface_desc.Width == 2, "Expected width 2, got %u.\n", surface_desc.Width); + ok(surface_desc.Height == 8, "Expected height 8, got %u.\n", surface_desc.Height); + IDirect3DSurface9_Release(surface); + + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 2, &surface); + ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + type = IDirect3DSurface9_GetType(surface); + ok(type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", type); + hr = IDirect3DSurface9_GetDesc(surface, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + ok(surface_desc.Width == 1, "Expected width 1, got %u.\n", surface_desc.Width); + ok(surface_desc.Height == 2, "Expected height 2, got %u.\n", surface_desc.Height); + hr = IDirect3DTexture9_GetLevelDesc(texture, 2, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + ok(surface_desc.Width == 1, "Expected width 1, got %u.\n", surface_desc.Width); + ok(surface_desc.Height == 2, "Expected height 2, got %u.\n", surface_desc.Height); + IDirect3DSurface9_Release(surface); + IDirect3DTexture9_Release(texture); + + hr = IDirect3DDevice9_CreateCubeTexture(device, 1, 1, 0, D3DFMT_X8R8G8B8, + D3DPOOL_SYSTEMMEM, &cube_texture, NULL); + ok(SUCCEEDED(hr), "Failed to create cube texture, hr %#x.\n", hr); + type = IDirect3DCubeTexture9_GetType(cube_texture); + ok(type == D3DRTYPE_CUBETEXTURE, "Expected type D3DRTYPE_CUBETEXTURE, got %u.\n", type); + + hr = IDirect3DCubeTexture9_GetCubeMapSurface(cube_texture, + D3DCUBEMAP_FACE_NEGATIVE_X, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get cube map surface, hr %#x.\n", hr); + type = IDirect3DSurface9_GetType(surface); + ok(type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", type); + hr = IDirect3DSurface9_GetDesc(surface, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + hr = IDirect3DCubeTexture9_GetLevelDesc(cube_texture, 0, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + IDirect3DSurface9_Release(surface); + IDirect3DCubeTexture9_Release(cube_texture); + + hr = IDirect3DDevice9_CreateVolumeTexture(device, 2, 4, 8, 4, 0, D3DFMT_X8R8G8B8, + D3DPOOL_SYSTEMMEM, &volume_texture, NULL); + type = IDirect3DVolumeTexture9_GetType(volume_texture); + ok(type == D3DRTYPE_VOLUMETEXTURE, "Expected type D3DRTYPE_VOLUMETEXTURE, got %u.\n", type); + + hr = IDirect3DVolumeTexture9_GetVolumeLevel(volume_texture, 0, &volume); + ok(SUCCEEDED(hr), "Failed to get volume level, hr %#x.\n", hr); + /* IDirect3DVolume9 is not an IDirect3DResource9 and has no GetType method. */ + hr = IDirect3DVolume9_GetDesc(volume, &volume_desc); + ok(SUCCEEDED(hr), "Failed to get volume description, hr %#x.\n", hr); + ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", + volume_desc.Type); + ok(volume_desc.Width == 2, "Expected width 2, got %u.\n", volume_desc.Width); + ok(volume_desc.Height == 4, "Expected height 4, got %u.\n", volume_desc.Height); + ok(volume_desc.Depth == 8, "Expected depth 8, got %u.\n", volume_desc.Depth); + hr = IDirect3DVolumeTexture9_GetLevelDesc(volume_texture, 0, &volume_desc); + ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); + ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", + volume_desc.Type); + ok(volume_desc.Width == 2, "Expected width 2, got %u.\n", volume_desc.Width); + ok(volume_desc.Height == 4, "Expected height 4, got %u.\n", volume_desc.Height); + ok(volume_desc.Depth == 8, "Expected depth 8, got %u.\n", volume_desc.Depth); + IDirect3DVolume9_Release(volume); + + hr = IDirect3DVolumeTexture9_GetVolumeLevel(volume_texture, 2, &volume); + ok(SUCCEEDED(hr), "Failed to get volume level, hr %#x.\n", hr); + /* IDirect3DVolume9 is not an IDirect3DResource9 and has no GetType method. */ + hr = IDirect3DVolume9_GetDesc(volume, &volume_desc); + ok(SUCCEEDED(hr), "Failed to get volume description, hr %#x.\n", hr); + ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", + volume_desc.Type); + ok(volume_desc.Width == 1, "Expected width 1, got %u.\n", volume_desc.Width); + ok(volume_desc.Height == 1, "Expected height 1, got %u.\n", volume_desc.Height); + ok(volume_desc.Depth == 2, "Expected depth 2, got %u.\n", volume_desc.Depth); + hr = IDirect3DVolumeTexture9_GetLevelDesc(volume_texture, 2, &volume_desc); + ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); + ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", + volume_desc.Type); + ok(volume_desc.Width == 1, "Expected width 1, got %u.\n", volume_desc.Width); + ok(volume_desc.Height == 1, "Expected height 1, got %u.\n", volume_desc.Height); + ok(volume_desc.Depth == 2, "Expected depth 2, got %u.\n", volume_desc.Depth); + IDirect3DVolume9_Release(volume); + IDirect3DVolumeTexture9_Release(volume_texture); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -7709,6 +7869,7 @@ START_TEST(device) test_begin_end_state_block(); test_shader_constant_apply(); test_vdecl_apply(); + test_resource_type(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Dmitry Timoshkov : taskschd: Remove registry based task folder management.
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: 7e5bd67fc4348125181716cbb5b82a1e6d9bef54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e5bd67fc4348125181716cbb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 7 13:14:41 2014 +0900 taskschd: Remove registry based task folder management. --- dlls/taskschd/folder.c | 86 +----------------------------------------------- 1 file changed, 1 insertion(+), 85 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index 6bb0c38..14f1430 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -33,8 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(taskschd); -static const char root[] = "Software\\Microsoft\\Windows NT\\CurrentVersion\\Schedule\\TaskCache\\Tree"; - typedef struct { ITaskFolder ITaskFolder_iface; @@ -136,76 +134,6 @@ static HRESULT WINAPI TaskFolder_get_Name(ITaskFolder *iface, BSTR *name) return S_OK; } -static HRESULT reg_create_folder(const WCHAR *path, HKEY *hfolder) -{ - HKEY hroot; - DWORD ret, disposition; - - ret = RegCreateKeyA(HKEY_LOCAL_MACHINE, root, &hroot); - if (ret) return HRESULT_FROM_WIN32(ret); - - while (*path == '\\') path++; - ret = RegCreateKeyExW(hroot, path, 0, NULL, 0, KEY_ALL_ACCESS, NULL, hfolder, &disposition); - if (ret == ERROR_FILE_NOT_FOUND) - ret = ERROR_PATH_NOT_FOUND; - - if (ret == ERROR_SUCCESS && disposition == REG_OPENED_EXISTING_KEY) - { - RegCloseKey(*hfolder); - ret = ERROR_ALREADY_EXISTS; - } - - RegCloseKey(hroot); - - return HRESULT_FROM_WIN32(ret); -} - -static HRESULT reg_open_folder(const WCHAR *path, HKEY *hfolder) -{ - HKEY hroot; - DWORD ret; - - ret = RegCreateKeyA(HKEY_LOCAL_MACHINE, root, &hroot); - if (ret) return HRESULT_FROM_WIN32(ret); - - while (*path == '\\') path++; - ret = RegOpenKeyExW(hroot, path, 0, KEY_ALL_ACCESS, hfolder); - if (ret == ERROR_FILE_NOT_FOUND) - ret = ERROR_PATH_NOT_FOUND; - - RegCloseKey(hroot); - - return HRESULT_FROM_WIN32(ret); -} - -static HRESULT reg_delete_folder(const WCHAR *path, const WCHAR *name) -{ - HKEY hroot, hfolder; - DWORD ret; - - ret = RegCreateKeyA(HKEY_LOCAL_MACHINE, root, &hroot); - if (ret) return HRESULT_FROM_WIN32(ret); - - while (*path == '\\') path++; - ret = RegOpenKeyExW(hroot, path, 0, DELETE, &hfolder); - - RegCloseKey(hroot); - - while (*name == '\\') name++; - if (ret == ERROR_SUCCESS) - { - ret = RegDeleteKeyW(hfolder, name); - RegCloseKey(hfolder); - } - - return HRESULT_FROM_WIN32(ret); -} - -static inline void reg_close_folder(HKEY hfolder) -{ - RegCloseKey(hfolder); -} - static HRESULT WINAPI TaskFolder_get_Path(ITaskFolder *iface, BSTR *path) { TaskFolder *folder = impl_from_ITaskFolder(iface); @@ -328,9 +256,7 @@ static HRESULT WINAPI TaskFolder_DeleteFolder(ITaskFolder *iface, BSTR name, LON hr = SchRpcDelete(folder_path, 0); heap_free(folder_path); - if (hr != S_OK) return hr; - - return reg_delete_folder(folder->path, name); + return hr; } static HRESULT WINAPI TaskFolder_GetTask(ITaskFolder *iface, BSTR name, IRegisteredTask **task) @@ -452,7 +378,6 @@ HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder ** TaskFolder *folder; WCHAR *folder_path; HRESULT hr; - HKEY hfolder; if (path) { @@ -494,15 +419,6 @@ HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder ** return hr; } - hr = create ? reg_create_folder(folder_path, &hfolder) : reg_open_folder(folder_path, &hfolder); - if (hr) - { - heap_free(folder_path); - return hr; - } - - reg_close_folder(hfolder); - folder = heap_alloc(sizeof(*folder)); if (!folder) {

1 0

Dmitry Timoshkov : taskschd: Reimplement ITaskFolderCollection enumeration using SchRpcEnumFolders.
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: de8ce034b8e0a0b84f6e9dd65c1d1e01564fbcee URL: http://source.winehq.org/git/wine.git/?a=commit;h=de8ce034b8e0a0b84f6e9dd65… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 7 13:14:33 2014 +0900 taskschd: Reimplement ITaskFolderCollection enumeration using SchRpcEnumFolders. --- dlls/taskschd/folder_collection.c | 106 +++++-------------------------------- 1 file changed, 12 insertions(+), 94 deletions(-) diff --git a/dlls/taskschd/folder_collection.c b/dlls/taskschd/folder_collection.c index 004a977..47c9620 100644 --- a/dlls/taskschd/folder_collection.c +++ b/dlls/taskschd/folder_collection.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "objbase.h" #include "taskschd.h" +#include "schrpc.h" #include "taskschd_private.h" #include "wine/unicode.h" @@ -31,15 +32,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(taskschd); -static const char root[] = "Software\\Microsoft\\Windows NT\\CurrentVersion\\Schedule\\TaskCache\\Tree"; - typedef struct { ITaskFolderCollection ITaskFolderCollection_iface; LONG ref; WCHAR *path; - LPWSTR *list; - LONG count; + TASK_NAMES list; + DWORD count; } TaskFolderCollection; static HRESULT NewEnum_create(TaskFolderCollection *folders, IUnknown **obj); @@ -55,14 +54,14 @@ static ULONG WINAPI folders_AddRef(ITaskFolderCollection *iface) return InterlockedIncrement(&folders->ref); } -static void free_list(LPWSTR *list, LONG count) +static void free_list(LPWSTR *list, DWORD count) { LONG i; for (i = 0; i < count; i++) - heap_free(list[i]); + MIDL_user_free(list[i]); - heap_free(list); + MIDL_user_free(list); } static ULONG WINAPI folders_Release(ITaskFolderCollection *iface) @@ -216,98 +215,17 @@ static const ITaskFolderCollectionVtbl TaskFolderCollection_vtbl = folders_get__NewEnum }; -static HRESULT reg_open_folder(const WCHAR *path, HKEY *hfolder) -{ - HKEY hroot; - DWORD ret; - - ret = RegCreateKeyA(HKEY_LOCAL_MACHINE, root, &hroot); - if (ret) return HRESULT_FROM_WIN32(ret); - - while (*path == '\\') path++; - ret = RegOpenKeyExW(hroot, path, 0, KEY_ALL_ACCESS, hfolder); - if (ret == ERROR_FILE_NOT_FOUND) - ret = ERROR_PATH_NOT_FOUND; - - RegCloseKey(hroot); - - return HRESULT_FROM_WIN32(ret); -} - -static inline void reg_close_folder(HKEY hfolder) -{ - RegCloseKey(hfolder); -} - -static HRESULT create_folders_list(const WCHAR *path, LPWSTR **folders_list, LONG *folders_count) -{ - HRESULT hr; - HKEY hfolder; - WCHAR name[MAX_PATH]; - LONG ret, idx, allocated, count; - LPWSTR *list; - - *folders_list = NULL; - *folders_count = 0; - - hr = reg_open_folder(path, &hfolder); - if (hr) return hr; - - allocated = 64; - list = heap_alloc(allocated * sizeof(LPWSTR)); - if (!list) - { - reg_close_folder(hfolder); - return E_OUTOFMEMORY; - } - - idx = count = 0; - - while (!(ret = RegEnumKeyW(hfolder, idx++, name, MAX_PATH))) - { - /* FIXME: differentiate between folders and tasks */ - if (count >= allocated) - { - LPWSTR *new_list; - allocated *= 2; - new_list = heap_realloc(list, allocated * sizeof(LPWSTR)); - if (!new_list) - { - reg_close_folder(hfolder); - free_list(list, count); - return E_OUTOFMEMORY; - } - list = new_list; - } - - list[count] = heap_strdupW(name); - if (!list[count]) - { - reg_close_folder(hfolder); - free_list(list, count); - return E_OUTOFMEMORY; - } - - count++; - } - - reg_close_folder(hfolder); - - *folders_list = list; - *folders_count = count; - - return S_OK; -} - HRESULT TaskFolderCollection_create(const WCHAR *path, ITaskFolderCollection **obj) { TaskFolderCollection *folders; HRESULT hr; - LPWSTR *list; - LONG count; + TASK_NAMES list; + DWORD start_index, count; - hr = create_folders_list(path, &list, &count); - if (hr) return hr; + start_index = 0; + list = NULL; + hr = SchRpcEnumFolders(path, 0, &start_index, 0, &count, &list); + if (hr != S_OK) return hr; folders = heap_alloc(sizeof(*folders)); if (!folders)

1 0

Dmitry Timoshkov : taskschd: Make ITaskFolder::CreateFolder, ITaskFolder:: GetFolder and ITaskFolder::DeleteFolder use the RPC API.
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: 39e972b573180ed5f831097bdbc3ce8292cf8506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39e972b573180ed5f831097bd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 7 13:14:19 2014 +0900 taskschd: Make ITaskFolder::CreateFolder, ITaskFolder::GetFolder and ITaskFolder::DeleteFolder use the RPC API. --- dlls/taskschd/folder.c | 97 ++++++++++++++++++++++++++++++--------- dlls/taskschd/tests/scheduler.c | 1 - 2 files changed, 75 insertions(+), 23 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index 7caad77..6bb0c38 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -25,6 +25,7 @@ #include "winreg.h" #include "objbase.h" #include "taskschd.h" +#include "schrpc.h" #include "taskschd_private.h" #include "wine/unicode.h" @@ -273,9 +274,47 @@ static HRESULT WINAPI TaskFolder_CreateFolder(ITaskFolder *iface, BSTR path, VAR return hr; } +static WCHAR *get_full_path(const WCHAR *parent, const WCHAR *path) +{ + static const WCHAR bslash[] = { '\\', 0 }; + WCHAR *folder_path; + int len = 0; + + if (path) len = strlenW(path); + + if (parent) len += strlenW(parent); + + /* +1 if parent is not '\' terminated */ + folder_path = heap_alloc((len + 2) * sizeof(WCHAR)); + if (!folder_path) return NULL; + + folder_path[0] = 0; + + if (parent) + strcpyW(folder_path, parent); + + if (path && *path) + { + len = strlenW(folder_path); + if (!len || folder_path[len - 1] != '\\') + strcatW(folder_path, bslash); + + while (*path == '\\') path++; + strcatW(folder_path, path); + } + + len = strlenW(folder_path); + if (!len) + strcatW(folder_path, bslash); + + return folder_path; +} + static HRESULT WINAPI TaskFolder_DeleteFolder(ITaskFolder *iface, BSTR name, LONG flags) { TaskFolder *folder = impl_from_ITaskFolder(iface); + WCHAR *folder_path; + HRESULT hr; TRACE("%p,%s,%x\n", iface, debugstr_w(name), flags); @@ -284,6 +323,13 @@ static HRESULT WINAPI TaskFolder_DeleteFolder(ITaskFolder *iface, BSTR name, LON if (flags) FIXME("unsupported flags %x\n", flags); + folder_path = get_full_path(folder->path, name); + if (!folder_path) return E_OUTOFMEMORY; + + hr = SchRpcDelete(folder_path, 0); + heap_free(folder_path); + if (hr != S_OK) return hr; + return reg_delete_folder(folder->path, name); } @@ -403,43 +449,50 @@ static const ITaskFolderVtbl TaskFolder_vtbl = HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj, BOOL create) { - static const WCHAR bslash[] = { '\\', 0 }; TaskFolder *folder; WCHAR *folder_path; - int len = 0; HRESULT hr; HKEY hfolder; if (path) { - len = strlenW(path); + int len = strlenW(path); if (len && path[len - 1] == '\\') return ERROR_INVALID_NAME; } - if (parent) len += strlenW(parent); - - /* +1 if parent is not '\' terminated */ - folder_path = heap_alloc((len + 2) * sizeof(WCHAR)); + folder_path = get_full_path(parent, path); if (!folder_path) return E_OUTOFMEMORY; - folder_path[0] = 0; - - if (parent) - strcpyW(folder_path, parent); - - if (path && *path) + if (create) { - len = strlenW(folder_path); - if (!len || folder_path[len - 1] != '\\') - strcatW(folder_path, bslash); - - while (*path == '\\') path++; - strcatW(folder_path, path); + hr = SchRpcCreateFolder(folder_path, NULL, 0); + } + else + { + DWORD start_index, count, i; + TASK_NAMES names; + + start_index = 0; + names = NULL; + hr = SchRpcEnumFolders(folder_path, 0, &start_index, 0, &count, &names); + if (hr == S_OK) + { + for (i = 0; i < count; i++) + MIDL_user_free(names[i]); + MIDL_user_free(names); + } + else + { + if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) + hr = HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND); + } } - len = strlenW(folder_path); - if (!len) - strcatW(folder_path, bslash); + if (FAILED(hr)) + { + heap_free(folder_path); + return hr; + } hr = create ? reg_create_folder(folder_path, &hfolder) : reg_open_folder(folder_path, &hfolder); if (hr) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 0f89021..7f0669b 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -341,7 +341,6 @@ todo_wine ITaskFolder_Release(subfolder); hr = ITaskFolder_DeleteFolder(folder, Wine, 0); -todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_DIR_NOT_EMPTY), "expected ERROR_DIR_NOT_EMPTY, got %#x\n", hr); hr = ITaskFolder_DeleteFolder(folder, Wine_Folder1_Folder2, 0);

1 0

Hans Leidekker : netprofm: Add a couple of tests for INetworkListManager.
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: 3b63733bcbad751763d6f7a067d96aa2bb789152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b63733bcbad751763d6f7a06… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 7 14:58:48 2014 +0200 netprofm: Add a couple of tests for INetworkListManager. --- configure | 1 + configure.ac | 1 + dlls/netprofm/tests/Makefile.in | 5 +++ dlls/netprofm/tests/list.c | 66 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 73 insertions(+) diff --git a/configure b/configure index ceae545..fae5c0a 100755 --- a/configure +++ b/configure @@ -17054,6 +17054,7 @@ wine_fn_config_test dlls/netapi32/tests netapi32_test wine_fn_config_dll netcfgx enable_netcfgx clean wine_fn_config_test dlls/netcfgx/tests netcfgx_test wine_fn_config_dll netprofm enable_netprofm clean +wine_fn_config_test dlls/netprofm/tests netprofm_test wine_fn_config_dll newdev enable_newdev implib wine_fn_config_dll normaliz enable_normaliz implib wine_fn_config_dll npmshtml enable_npmshtml diff --git a/configure.ac b/configure.ac index 3a70159..7e463b9 100644 --- a/configure.ac +++ b/configure.ac @@ -3032,6 +3032,7 @@ WINE_CONFIG_TEST(dlls/netapi32/tests) WINE_CONFIG_DLL(netcfgx,,[clean]) WINE_CONFIG_TEST(dlls/netcfgx/tests) WINE_CONFIG_DLL(netprofm,,[clean]) +WINE_CONFIG_TEST(dlls/netprofm/tests) WINE_CONFIG_DLL(newdev,,[implib]) WINE_CONFIG_DLL(normaliz,,[implib]) WINE_CONFIG_DLL(npmshtml) diff --git a/dlls/netprofm/tests/Makefile.in b/dlls/netprofm/tests/Makefile.in new file mode 100644 index 0000000..45b8809 --- /dev/null +++ b/dlls/netprofm/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = netprofm.dll +IMPORTS = ole32 + +C_SRCS = \ + list.c diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c new file mode 100644 index 0000000..9ac427e --- /dev/null +++ b/dlls/netprofm/tests/list.c @@ -0,0 +1,66 @@ +/* + * Copyright 2014 Hans Leidekker for CodeWeavers + * + * 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 <stdio.h> +#include "windows.h" +#define COBJMACROS +#include "initguid.h" +#include "objbase.h" +#include "netlistmgr.h" +#include "wine/test.h" + +static void test_INetworkListManager( void ) +{ + INetworkListManager *mgr; + NLM_CONNECTIVITY connectivity; + VARIANT_BOOL connected; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_NetworkListManager, NULL, CLSCTX_INPROC_SERVER, + &IID_INetworkListManager, (void **)&mgr ); + if (hr != S_OK) + { + win_skip( "can't create instance of NetworkListManager\n" ); + return; + } + + connectivity = 0xdeadbeef; + hr = INetworkListManager_GetConnectivity( mgr, &connectivity ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( connectivity != 0xdeadbeef, "unchanged value\n" ); + trace( "GetConnectivity: %08x\n", connectivity ); + + connected = 0xdead; + hr = INetworkListManager_IsConnected( mgr, &connected ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( connected == VARIANT_TRUE || connected == VARIANT_FALSE, "expected boolean value\n" ); + + connected = 0xdead; + hr = INetworkListManager_IsConnectedToInternet( mgr, &connected ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( connected == VARIANT_TRUE || connected == VARIANT_FALSE, "expected boolean value\n" ); + + INetworkListManager_Release( mgr ); +} + +START_TEST( list ) +{ + CoInitialize( NULL ); + test_INetworkListManager(); + CoUninitialize(); +}

1 0

Hans Leidekker : netprofm: Register interfaces.
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: 14ab04ab0524552b8dad473957f6b90ccebc1881 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14ab04ab0524552b8dad47395… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 7 14:58:26 2014 +0200 netprofm: Register interfaces. --- configure | 2 +- configure.ac | 2 +- dlls/netprofm/Makefile.in | 2 ++ dlls/netprofm/main.c | 16 ++++++++++++++++ dlls/netprofm/netprofm.idl | 23 +++++++++++++++++++++++ dlls/netprofm/netprofm.spec | 4 ++-- include/netlistmgr.idl | 5 +++++ 7 files changed, 50 insertions(+), 4 deletions(-) diff --git a/configure b/configure index d65c398..ceae545 100755 --- a/configure +++ b/configure @@ -17053,7 +17053,7 @@ wine_fn_config_dll netapi32 enable_netapi32 implib wine_fn_config_test dlls/netapi32/tests netapi32_test wine_fn_config_dll netcfgx enable_netcfgx clean wine_fn_config_test dlls/netcfgx/tests netcfgx_test -wine_fn_config_dll netprofm enable_netprofm +wine_fn_config_dll netprofm enable_netprofm clean wine_fn_config_dll newdev enable_newdev implib wine_fn_config_dll normaliz enable_normaliz implib wine_fn_config_dll npmshtml enable_npmshtml diff --git a/configure.ac b/configure.ac index fbdc269..3a70159 100644 --- a/configure.ac +++ b/configure.ac @@ -3031,7 +3031,7 @@ WINE_CONFIG_DLL(netapi32,,[implib]) WINE_CONFIG_TEST(dlls/netapi32/tests) WINE_CONFIG_DLL(netcfgx,,[clean]) WINE_CONFIG_TEST(dlls/netcfgx/tests) -WINE_CONFIG_DLL(netprofm) +WINE_CONFIG_DLL(netprofm,,[clean]) WINE_CONFIG_DLL(newdev,,[implib]) WINE_CONFIG_DLL(normaliz,,[implib]) WINE_CONFIG_DLL(npmshtml) diff --git a/dlls/netprofm/Makefile.in b/dlls/netprofm/Makefile.in index 133b82a..4dadfb0 100644 --- a/dlls/netprofm/Makefile.in +++ b/dlls/netprofm/Makefile.in @@ -3,3 +3,5 @@ MODULE = netprofm.dll C_SRCS = \ list.c \ main.c + +IDL_SRCS = netprofm.idl diff --git a/dlls/netprofm/main.c b/dlls/netprofm/main.c index ff694d9..4ba3cd5 100644 --- a/dlls/netprofm/main.c +++ b/dlls/netprofm/main.c @@ -144,3 +144,19 @@ HRESULT WINAPI DllCanUnloadNow( void ) { return S_FALSE; } + +/*********************************************************************** + * DllRegisterServer (NETPROFM.@) + */ +HRESULT WINAPI DllRegisterServer( void ) +{ + return __wine_register_resources( instance ); +} + +/*********************************************************************** + * DllUnregisterServer (NETPROFM.@) + */ +HRESULT WINAPI DllUnregisterServer( void ) +{ + return __wine_unregister_resources( instance ); +} diff --git a/dlls/netprofm/netprofm.idl b/dlls/netprofm/netprofm.idl new file mode 100644 index 0000000..31a4565 --- /dev/null +++ b/dlls/netprofm/netprofm.idl @@ -0,0 +1,23 @@ +/* + * COM Classes for netprofm + * + * Copyright 2014 Hans Leidekker for CodeWeavers + * + * 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 + */ + +#pragma makedep register + +#include "netlistmgr.idl" diff --git a/dlls/netprofm/netprofm.spec b/dlls/netprofm/netprofm.spec index c534b4f..b16365d 100644 --- a/dlls/netprofm/netprofm.spec +++ b/dlls/netprofm/netprofm.spec @@ -1,4 +1,4 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/include/netlistmgr.idl b/include/netlistmgr.idl index 51393b9..6adca14 100644 --- a/include/netlistmgr.idl +++ b/include/netlistmgr.idl @@ -19,6 +19,10 @@ import "oaidl.idl"; import "objidl.idl"; +#ifndef __WIDL__ +#define threading(model) +#endif + interface IEnumNetworks; interface IEnumNetworkConnections; interface INetwork; @@ -80,6 +84,7 @@ interface INetworkListManager : IDispatch } [ + threading(both), uuid(dcb00c01-570f-4a9b-8d69-199fdba5723b) ] coclass NetworkListManager { interface INetworkListManager; }

1 0

Hans Leidekker : netprofm: Add a class factory implementation.
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: ff3341210c2beba6ac0efd8e9655355bc277360c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff3341210c2beba6ac0efd8e9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 7 14:57:57 2014 +0200 netprofm: Add a class factory implementation. --- dlls/netprofm/main.c | 108 +++++++++++++++++++++++++++++++++++++++++++ dlls/netprofm/netprofm.spec | 4 +- 2 files changed, 110 insertions(+), 2 deletions(-) diff --git a/dlls/netprofm/main.c b/dlls/netprofm/main.c index 8c9fd27..ff694d9 100644 --- a/dlls/netprofm/main.c +++ b/dlls/netprofm/main.c @@ -20,6 +20,15 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#define COBJMACROS +#include "objbase.h" +#include "rpcproxy.h" +#include "netlistmgr.h" + +#include "wine/debug.h" +#include "netprofm_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(netprofm); static HINSTANCE instance; @@ -36,3 +45,102 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) } return TRUE; } + +struct netprofm_cf +{ + const struct IClassFactoryVtbl *vtbl; + HRESULT (*create_instance)(void **); +}; + +static inline struct netprofm_cf *impl_from_IClassFactory( IClassFactory *iface ) +{ + return (struct netprofm_cf *)((char *)iface - FIELD_OFFSET( struct netprofm_cf, vtbl )); +} + +static HRESULT WINAPI netprofm_cf_QueryInterface( IClassFactory *iface, REFIID riid, LPVOID *ppobj ) +{ + if (IsEqualGUID( riid, &IID_IUnknown ) || IsEqualGUID( riid, &IID_IClassFactory )) + { + IClassFactory_AddRef( iface ); + *ppobj = iface; + return S_OK; + } + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; +} + +static ULONG WINAPI netprofm_cf_AddRef( IClassFactory *iface ) +{ + return 2; +} + +static ULONG WINAPI netprofm_cf_Release( IClassFactory *iface ) +{ + return 1; +} + +static HRESULT WINAPI netprofm_cf_CreateInstance( IClassFactory *iface, LPUNKNOWN outer, + REFIID riid, LPVOID *obj ) +{ + struct netprofm_cf *factory = impl_from_IClassFactory( iface ); + IUnknown *unk; + HRESULT r; + + TRACE( "%p %s %p\n", outer, debugstr_guid(riid), obj ); + + *obj = NULL; + if (outer) return CLASS_E_NOAGGREGATION; + + r = factory->create_instance( (void **)&unk ); + if (FAILED( r )) + return r; + + r = IUnknown_QueryInterface( unk, riid, obj ); + if (FAILED( r )) + return r; + + IUnknown_Release( unk ); + return r; +} + +static HRESULT WINAPI netprofm_cf_LockServer( IClassFactory *iface, BOOL dolock ) +{ + FIXME( "%p, %d\n", iface, dolock ); + return S_OK; +} + +static const struct IClassFactoryVtbl netprofm_cf_vtbl = +{ + netprofm_cf_QueryInterface, + netprofm_cf_AddRef, + netprofm_cf_Release, + netprofm_cf_CreateInstance, + netprofm_cf_LockServer +}; + +static struct netprofm_cf list_manager_cf = { &netprofm_cf_vtbl, list_manager_create }; + +/*********************************************************************** + * DllGetClassObject (NETPROFM.@) + */ +HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) +{ + IClassFactory *cf = NULL; + + TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + + if (IsEqualGUID( rclsid, &CLSID_NetworkListManager )) + { + cf = (IClassFactory *)&list_manager_cf.vtbl; + } + if (!cf) return CLASS_E_CLASSNOTAVAILABLE; + return IClassFactory_QueryInterface( cf, iid, ppv ); +} + +/*********************************************************************** + * DllCanUnloadNow (NETPROFM.@) + */ +HRESULT WINAPI DllCanUnloadNow( void ) +{ + return S_FALSE; +} diff --git a/dlls/netprofm/netprofm.spec b/dlls/netprofm/netprofm.spec index c5fc87a..c534b4f 100644 --- a/dlls/netprofm/netprofm.spec +++ b/dlls/netprofm/netprofm.spec @@ -1,4 +1,4 @@ -@ stub DllCanUnloadNow -@ stub DllGetClassObject +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub DllRegisterServer @ stub DllUnregisterServer

1 0

Hans Leidekker : netprofm: Add a stub implementation of INetworkListManager.
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: 984663ff4a7bf4f4bf793a66b28ca849a666170d URL: http://source.winehq.org/git/wine.git/?a=commit;h=984663ff4a7bf4f4bf793a66b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 7 14:57:34 2014 +0200 netprofm: Add a stub implementation of INetworkListManager. --- dlls/netprofm/Makefile.in | 1 + dlls/netprofm/list.c | 230 ++++++++++++++++++++++++++++++++++++++ dlls/netprofm/netprofm_private.h | 19 ++++ include/Makefile.in | 1 + include/netlistmgr.idl | 85 ++++++++++++++ 5 files changed, 336 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=984663ff4a7bf4f4bf793…

1 0

Hans Leidekker : netprofm: New dll.
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: cb0c5f53568e8a64b9fb1b2559afdd81555fde43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb0c5f53568e8a64b9fb1b255… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 7 14:57:13 2014 +0200 netprofm: New dll. --- configure | 2 ++ configure.ac | 1 + dlls/netprofm/Makefile.in | 4 ++++ dlls/netprofm/main.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/netprofm/netprofm.spec | 4 ++++ 5 files changed, 49 insertions(+) diff --git a/configure b/configure index 5f4a7c5..d65c398 100755 --- a/configure +++ b/configure @@ -1143,6 +1143,7 @@ enable_msxml6 enable_nddeapi enable_netapi32 enable_netcfgx +enable_netprofm enable_newdev enable_normaliz enable_npmshtml @@ -17052,6 +17053,7 @@ wine_fn_config_dll netapi32 enable_netapi32 implib wine_fn_config_test dlls/netapi32/tests netapi32_test wine_fn_config_dll netcfgx enable_netcfgx clean wine_fn_config_test dlls/netcfgx/tests netcfgx_test +wine_fn_config_dll netprofm enable_netprofm wine_fn_config_dll newdev enable_newdev implib wine_fn_config_dll normaliz enable_normaliz implib wine_fn_config_dll npmshtml enable_npmshtml diff --git a/configure.ac b/configure.ac index 44d7224..fbdc269 100644 --- a/configure.ac +++ b/configure.ac @@ -3031,6 +3031,7 @@ WINE_CONFIG_DLL(netapi32,,[implib]) WINE_CONFIG_TEST(dlls/netapi32/tests) WINE_CONFIG_DLL(netcfgx,,[clean]) WINE_CONFIG_TEST(dlls/netcfgx/tests) +WINE_CONFIG_DLL(netprofm) WINE_CONFIG_DLL(newdev,,[implib]) WINE_CONFIG_DLL(normaliz,,[implib]) WINE_CONFIG_DLL(npmshtml) diff --git a/dlls/netprofm/Makefile.in b/dlls/netprofm/Makefile.in new file mode 100644 index 0000000..0368b86 --- /dev/null +++ b/dlls/netprofm/Makefile.in @@ -0,0 +1,4 @@ +MODULE = netprofm.dll + +C_SRCS = \ + main.c diff --git a/dlls/netprofm/main.c b/dlls/netprofm/main.c new file mode 100644 index 0000000..8c9fd27 --- /dev/null +++ b/dlls/netprofm/main.c @@ -0,0 +1,38 @@ +/* + * Copyright 2014 Hans Leidekker for CodeWeavers + * + * 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 "config.h" +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" + +static HINSTANCE instance; + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + instance = hinst; + DisableThreadLibraryCalls( hinst ); + break; + } + return TRUE; +} diff --git a/dlls/netprofm/netprofm.spec b/dlls/netprofm/netprofm.spec new file mode 100644 index 0000000..c5fc87a --- /dev/null +++ b/dlls/netprofm/netprofm.spec @@ -0,0 +1,4 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2014