Ros-diffs November 2016

ros-diffs@reactos.org

15 participants
317 discussions

[akhaldi] 73250: [D3DRM] Sync with Wine Staging 1.9.23. CORE-12409
by akhaldi＠svn.reactos.org 17 Nov '16

17 Nov '16

Author: akhaldi Date: Thu Nov 17 21:52:34 2016 New Revision: 73250 URL: http://svn.reactos.org/svn/reactos?rev=73250&view=rev Log: [D3DRM] Sync with Wine Staging 1.9.23. CORE-12409 Modified: trunk/reactos/dll/directx/wine/d3drm/d3drm_private.h trunk/reactos/dll/directx/wine/d3drm/device.c trunk/reactos/dll/directx/wine/d3drm/frame.c trunk/reactos/dll/directx/wine/d3drm/light.c trunk/reactos/dll/directx/wine/d3drm/math.c trunk/reactos/dll/directx/wine/d3drm/meshbuilder.c trunk/reactos/dll/directx/wine/d3drm/texture.c trunk/reactos/dll/directx/wine/d3drm/viewport.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/d3drm/d3drm_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/d3d… ============================================================================== --- trunk/reactos/dll/directx/wine/d3drm/d3drm_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3drm/d3drm_private.h [iso-8859-1] Thu Nov 17 21:52:34 2016 @@ -29,6 +29,7 @@ #define NONAMELESSUNION #include <assert.h> +#include <math.h> #include <windef.h> #include <winbase.h> @@ -156,4 +157,19 @@ extern char templates[] DECLSPEC_HIDDEN; +static inline BYTE d3drm_color_component(float c) +{ + if (c <= 0.0f) + return 0u; + if (c >= 1.0f) + return 0xffu; + return floor(c * 255.0f); +} + +static inline void d3drm_set_color(D3DCOLOR *color, float r, float g, float b, float a) +{ + *color = RGBA_MAKE(d3drm_color_component(r), d3drm_color_component(g), + d3drm_color_component(b), d3drm_color_component(a)); +} + #endif /* __D3DRM_PRIVATE_INCLUDED__ */ Modified: trunk/reactos/dll/directx/wine/d3drm/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/dev… ============================================================================== --- trunk/reactos/dll/directx/wine/d3drm/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3drm/device.c [iso-8859-1] Thu Nov 17 21:52:34 2016 @@ -202,7 +202,7 @@ { IDirectDraw *ddraw; IDirectDrawSurface *surface; - IDirect3DDevice2 *d3d_device2; + IDirect3DDevice2 *d3d_device2 = NULL; DDSURFACEDESC desc; HRESULT hr; @@ -211,9 +211,6 @@ return hr; IDirect3DRM_AddRef(device->d3drm); IDirect3DDevice_AddRef(d3d_device); - - if (device->ddraw) - return D3DRMERR_BADOBJECT; /* Fetch render target and get width/height from there */ if (FAILED(hr = IDirect3DDevice_QueryInterface(d3d_device, &IID_IDirectDrawSurface, (void **)&surface))) @@ -226,16 +223,26 @@ return hr; } + if (device->ddraw) + { + if (d3d_device2) + IDirectDrawSurface_Release(surface); + return D3DRMERR_BADOBJECT; + } + desc.dwSize = sizeof(desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc); - IDirectDrawSurface_Release(surface); if (FAILED(hr)) + { + IDirectDrawSurface_Release(surface); return hr; + } device->ddraw = ddraw; device->width = desc.dwWidth; device->height = desc.dwHeight; device->device = d3d_device; + device->render_target = surface; return hr; } @@ -1128,7 +1135,7 @@ { struct d3drm_device *device = impl_from_IDirect3DRMDevice(iface); - TRACE("iface %p stub!\n", iface); + TRACE("iface %p.\n", iface); return d3drm_device3_GetColorModel(&device->IDirect3DRMDevice3_iface); } @@ -1562,7 +1569,7 @@ { struct d3drm_device *device = impl_from_IDirect3DRMWinDevice(iface); - TRACE("iface %p, size %p, name %p stub!\n", iface, size, name); + TRACE("iface %p, size %p, name %p.\n", iface, size, name); return d3drm_device3_GetName(&device->IDirect3DRMDevice3_iface, size, name); } Modified: trunk/reactos/dll/directx/wine/d3drm/frame.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/fra… ============================================================================== --- trunk/reactos/dll/directx/wine/d3drm/frame.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3drm/frame.c [iso-8859-1] Thu Nov 17 21:52:34 2016 @@ -1329,23 +1329,53 @@ static HRESULT WINAPI d3drm_frame3_GetScene(IDirect3DRMFrame3 *iface, IDirect3DRMFrame3 **scene) { - FIXME("iface %p, scene %p stub!\n", iface, scene); - - return E_NOTIMPL; + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); + + TRACE("iface %p, scene %p.\n", iface, scene); + + if (!scene) + return D3DRMERR_BADVALUE; + + while (frame->parent) + frame = frame->parent; + + *scene = &frame->IDirect3DRMFrame3_iface; + IDirect3DRMFrame3_AddRef(*scene); + + return D3DRM_OK; } static HRESULT WINAPI d3drm_frame2_GetScene(IDirect3DRMFrame2 *iface, IDirect3DRMFrame **scene) { - FIXME("iface %p, scene %p stub!\n", iface, scene); - - return E_NOTIMPL; + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); + IDirect3DRMFrame3 *frame3; + HRESULT hr; + + TRACE("iface %p, scene %p.\n", iface, scene); + + if (!scene) + return D3DRMERR_BADVALUE; + + hr = IDirect3DRMFrame3_GetScene(&frame->IDirect3DRMFrame3_iface, &frame3); + if (FAILED(hr) || !frame3) + { + *scene = NULL; + return hr; + } + + hr = IDirect3DRMFrame3_QueryInterface(frame3, &IID_IDirect3DRMFrame, (void **)scene); + IDirect3DRMFrame3_Release(frame3); + + return hr; } static HRESULT WINAPI d3drm_frame1_GetScene(IDirect3DRMFrame *iface, IDirect3DRMFrame **scene) { - FIXME("iface %p, scene %p stub!\n", iface, scene); - - return E_NOTIMPL; + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface); + + TRACE("iface %p, scene %p.\n", iface, scene); + + return d3drm_frame2_GetScene(&frame->IDirect3DRMFrame2_iface, scene); } static D3DRMSORTMODE WINAPI d3drm_frame3_GetSortMode(IDirect3DRMFrame3 *iface) @@ -1962,10 +1992,9 @@ { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); - TRACE("iface %p, red %.8e, green %.8e, blue %.8e stub!\n", iface, red, green, blue); - - frame->scenebackground = RGBA_MAKE((BYTE)(red * 255.0f), - (BYTE)(green * 255.0f), (BYTE)(blue * 255.0f), 0xff); + TRACE("iface %p, red %.8e, green %.8e, blue %.8e.\n", iface, red, green, blue); + + d3drm_set_color(&frame->scenebackground, red, green, blue, 1.0f); return D3DRM_OK; } @@ -2909,7 +2938,7 @@ object->IDirect3DRMFrame3_iface.lpVtbl = &d3drm_frame3_vtbl; object->d3drm = d3drm; object->ref = 1; - object->scenebackground = RGBA_MAKE(0, 0, 0, 0xff); + d3drm_set_color(&object->scenebackground, 0.0f, 0.0f, 0.0f, 1.0f); memcpy(object->transform, identity, sizeof(D3DRMMATRIX4D)); Modified: trunk/reactos/dll/directx/wine/d3drm/light.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/lig… ============================================================================== --- trunk/reactos/dll/directx/wine/d3drm/light.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3drm/light.c [iso-8859-1] Thu Nov 17 21:52:34 2016 @@ -174,7 +174,7 @@ TRACE("iface %p, red %.8e, green %.8e, blue %.8e.\n", iface, red, green, blue); - light->color = RGBA_MAKE((BYTE)(red * 255.0f), (BYTE)(green * 255.0f), (BYTE)(blue * 255.0f), 0xff); + d3drm_set_color(&light->color, red, green, blue, 1.0f); return D3DRM_OK; } Modified: trunk/reactos/dll/directx/wine/d3drm/math.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/mat… ============================================================================== --- trunk/reactos/dll/directx/wine/d3drm/math.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3drm/math.c [iso-8859-1] Thu Nov 17 21:52:34 2016 @@ -24,25 +24,16 @@ /* Create a RGB color from its components */ D3DCOLOR WINAPI D3DRMCreateColorRGB(D3DVALUE red, D3DVALUE green, D3DVALUE blue) { - return (D3DRMCreateColorRGBA(red, green, blue, 255.0)); + return D3DRMCreateColorRGBA(red, green, blue, 1.0f); } /* Create a RGBA color from its components */ D3DCOLOR WINAPI D3DRMCreateColorRGBA(D3DVALUE red, D3DVALUE green, D3DVALUE blue, D3DVALUE alpha) { - int Red, Green, Blue, Alpha; - Red=floor(red*255); - Green=floor(green*255); - Blue=floor(blue*255); - Alpha=floor(alpha*255); - if (red < 0) Red=0; - if (red > 1) Red=255; - if (green < 0) Green=0; - if (green > 1) Green=255; - if (blue < 0) Blue=0; - if (blue > 1) Blue=255; - if (alpha < 0) Alpha=0; - if (alpha > 1) Alpha=255; - return (RGBA_MAKE(Red, Green, Blue, Alpha)); + D3DCOLOR color; + + d3drm_set_color(&color, red, green, blue, alpha); + + return color; } /* Determine the alpha part of a color */ Modified: trunk/reactos/dll/directx/wine/d3drm/meshbuilder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/mes… ============================================================================== --- trunk/reactos/dll/directx/wine/d3drm/meshbuilder.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3drm/meshbuilder.c [iso-8859-1] Thu Nov 17 21:52:34 2016 @@ -1222,8 +1222,7 @@ values = (float*)ptr; - This->materials[i].color = RGBA_MAKE((BYTE)(values[0] * 255.0f), (BYTE)(values[1] * 255.0f), - (BYTE)(values[2] * 255.0f), (BYTE)(values[3] * 255.0f)); + d3drm_set_color(&This->materials[i].color, values[0], values[1], values[2], values[3]); IDirect3DRMMaterial2_SetAmbient(This->materials[i].material, values[0], values [1], values[2]); /* Alpha ignored */ IDirect3DRMMaterial2_SetPower(This->materials[i].material, values[4]); @@ -1681,7 +1680,7 @@ TRACE("iface %p, red %.8e, green %.8e, blue %.8e.\n", iface, red, green, blue); - mesh_builder->color = RGBA_MAKE((BYTE)(red * 255.0f), (BYTE)(green * 255.0f), (BYTE)(blue * 255.0f), 0xff); + d3drm_set_color(&mesh_builder->color, red, green, blue, 1.0f); return D3DRM_OK; } @@ -2198,7 +2197,7 @@ struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface); DWORD count = mesh_builder->nb_normals - start_idx; - TRACE("iface %p, start_idx %u, normal_count %p, normals %p stub!\n", + TRACE("iface %p, start_idx %u, normal_count %p, normals %p.\n", iface, start_idx, normal_count, normals); if (normal_count) @@ -2582,7 +2581,7 @@ if (id >= mesh->nb_groups) return D3DRMERR_BADVALUE; - mesh->groups[id].color = RGBA_MAKE((BYTE)(red * 255.0f), (BYTE)(green * 255.0f), (BYTE)(blue * 255.0f), 0xff); + d3drm_set_color(&mesh->groups[id].color, red, green, blue, 1.0f); return D3DRM_OK; } Modified: trunk/reactos/dll/directx/wine/d3drm/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/tex… ============================================================================== --- trunk/reactos/dll/directx/wine/d3drm/texture.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3drm/texture.c [iso-8859-1] Thu Nov 17 21:52:34 2016 @@ -213,7 +213,7 @@ { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); - TRACE("iface %p, width %.8e, height %.8e stub!\n", iface, width, height); + TRACE("iface %p, width %.8e, height %.8e.\n", iface, width, height); return IDirect3DRMTexture3_SetDecalSize(&texture->IDirect3DRMTexture3_iface, width, height); } @@ -513,7 +513,7 @@ { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - TRACE("iface %p, width %.8e, height %.8e stub!\n", iface, width, height); + TRACE("iface %p, width %.8e, height %.8e.\n", iface, width, height); return IDirect3DRMTexture3_SetDecalSize(&texture->IDirect3DRMTexture3_iface, width, height); } Modified: trunk/reactos/dll/directx/wine/d3drm/viewport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/vie… ============================================================================== --- trunk/reactos/dll/directx/wine/d3drm/viewport.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3drm/viewport.c [iso-8859-1] Thu Nov 17 21:52:34 2016 @@ -30,6 +30,32 @@ return CONTAINING_RECORD(iface, struct d3drm_viewport, IDirect3DRMViewport2_iface); } +static inline void d3drm_normalize_d3d_color(D3DCOLORVALUE *color_value, D3DCOLOR color) +{ + color_value->u1.r = RGBA_GETRED(color) / 255.0f; + color_value->u2.g = RGBA_GETGREEN(color) / 255.0f; + color_value->u3.b = RGBA_GETBLUE(color) / 255.0f; + color_value->u4.a = RGBA_GETALPHA(color) / 255.0f; +} + +static HRESULT d3drm_update_background_material(struct d3drm_viewport *viewport) +{ + IDirect3DRMFrame *root_frame; + D3DCOLOR color; + D3DMATERIAL mat; + HRESULT hr; + + if (FAILED(hr = IDirect3DRMFrame_GetScene(viewport->camera, &root_frame))) + return hr; + color = IDirect3DRMFrame_GetSceneBackground(root_frame); + + memset(&mat, 0, sizeof(mat)); + mat.dwSize = sizeof(mat); + d3drm_normalize_d3d_color(&mat.u.diffuse, color); + + return IDirect3DMaterial_SetMaterial(viewport->material, &mat); +} + static void d3drm_viewport_destroy(struct d3drm_viewport *viewport) { TRACE("viewport %p releasing attached interfaces.\n", viewport); @@ -275,10 +301,8 @@ D3DVIEWPORT vp; D3DVALUE scale; IDirect3D *d3d1 = NULL; - D3DCOLOR color; IDirect3DDevice *d3d_device = NULL; IDirect3DMaterial *material = NULL; - D3DMATERIAL mat; D3DMATERIALHANDLE hmat; HRESULT hr = D3DRM_OK; @@ -328,19 +352,7 @@ if (FAILED(hr = IDirect3DRMFrame3_QueryInterface(camera, &IID_IDirect3DRMFrame, (void **)&viewport->camera))) goto cleanup; - color = IDirect3DRMFrame3_GetSceneBackground(camera); - /* Create material (ambient/diffuse/emissive?), set material */ if (FAILED(hr = IDirect3D_CreateMaterial(d3d1, &material, NULL))) - goto cleanup; - - memset(&mat, 0, sizeof(mat)); - mat.dwSize = sizeof(mat); - mat.u.diffuse.u1.r = RGBA_GETRED(color) / 255.0f; - mat.u.diffuse.u2.g = RGBA_GETGREEN(color) / 255.0f; - mat.u.diffuse.u3.b = RGBA_GETBLUE(color) / 255.0f; - mat.u.diffuse.u4.a = RGBA_GETALPHA(color) / 255.0f; - - if (FAILED(hr = IDirect3DMaterial_SetMaterial(material, &mat))) goto cleanup; if (FAILED(hr = IDirect3DMaterial_GetHandle(material, d3d_device, &hmat))) @@ -399,16 +411,49 @@ static HRESULT WINAPI d3drm_viewport2_Clear(IDirect3DRMViewport2 *iface, DWORD flags) { - FIXME("iface %p, flags %#x.\n", iface, flags); + struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface); + DDSCAPS caps = { DDSCAPS_ZBUFFER }; + HRESULT hr; + D3DRECT clear_rect; + IDirectDrawSurface *ds; + DWORD clear_flags = 0; + + TRACE("iface %p, flags %#x.\n", iface, flags); + + clear_rect.u1.x1 = clear_rect.u2.y1 = 0; + clear_rect.u3.x2 = viewport->device->width; + clear_rect.u4.y2 = viewport->device->height; + + if (flags & D3DRMCLEAR_TARGET) + { + clear_flags |= D3DCLEAR_TARGET; + d3drm_update_background_material(viewport); + } + if (flags & D3DRMCLEAR_ZBUFFER) + { + hr = IDirectDrawSurface_GetAttachedSurface(viewport->device->render_target, &caps, &ds); + if (SUCCEEDED(hr)) + { + clear_flags |= D3DCLEAR_ZBUFFER; + IDirectDrawSurface_Release(ds); + } + } + if (flags & D3DRMCLEAR_DIRTYRECTS) + FIXME("Flag D3DRMCLEAR_DIRTYRECT not implemented yet.\n"); + + if (FAILED(hr = IDirect3DViewport_Clear(viewport->d3d_viewport, 1, &clear_rect, clear_flags))) + return hr; return D3DRM_OK; } static HRESULT WINAPI d3drm_viewport1_Clear(IDirect3DRMViewport *iface) { - FIXME("iface %p.\n", iface); - - return D3DRM_OK; + struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface); + + TRACE("iface %p.\n", iface); + + return d3drm_viewport2_Clear(&viewport->IDirect3DRMViewport2_iface, D3DRMCLEAR_ALL); } static HRESULT WINAPI d3drm_viewport2_Render(IDirect3DRMViewport2 *iface, IDirect3DRMFrame3 *frame) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Nov 17 21:52:34 2016 @@ -25,7 +25,7 @@ reactos/dll/directx/wine/d3d8 # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3d9 # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.9.4 -reactos/dll/directx/wine/d3drm # Synced to WineStaging-1.9.16 +reactos/dll/directx/wine/d3drm # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.9.16 reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.9.4

1 0

[akhaldi] 73249: [AMSTREAM] Sync with Wine Staging 1.9.23. CORE-12409
by akhaldi＠svn.reactos.org 17 Nov '16

17 Nov '16

Author: akhaldi Date: Thu Nov 17 21:43:18 2016 New Revision: 73249 URL: http://svn.reactos.org/svn/reactos?rev=73249&view=rev Log: [AMSTREAM] Sync with Wine Staging 1.9.23. CORE-12409 Modified: trunk/reactos/dll/directx/wine/amstream/amstream.c trunk/reactos/dll/directx/wine/amstream/mediastreamfilter.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/amstream/amstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/amstream/… ============================================================================== --- trunk/reactos/dll/directx/wine/amstream/amstream.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/amstream/amstream.c [iso-8859-1] Thu Nov 17 21:43:18 2016 @@ -58,7 +58,7 @@ object->IAMMultiMediaStream_iface.lpVtbl = &AM_Vtbl; object->ref = 1; - *ppObj = object; + *ppObj = &object->IAMMultiMediaStream_iface; return S_OK; } Modified: trunk/reactos/dll/directx/wine/amstream/mediastreamfilter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/amstream/… ============================================================================== --- trunk/reactos/dll/directx/wine/amstream/mediastreamfilter.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/amstream/mediastreamfilter.c [iso-8859-1] Thu Nov 17 21:43:18 2016 @@ -348,7 +348,7 @@ if (!pins) return E_OUTOFMEMORY; This->pins = pins; - info.pFilter = (IBaseFilter*)&This->filter; + info.pFilter = &This->filter.IBaseFilter_iface; info.dir = PINDIR_INPUT; hr = IAMMediaStream_GetInformation(pAMMediaStream, &purpose_id, NULL); if (FAILED(hr)) @@ -362,11 +362,11 @@ return hr; pin = (MediaStreamFilter_InputPin*)This->pins[This->nb_streams]; - pin->pin.pin.pinInfo.pFilter = (LPVOID)This; + pin->pin.pin.pinInfo.pFilter = &This->filter.IBaseFilter_iface; This->streams[This->nb_streams] = (IMediaStream*)pAMMediaStream; This->nb_streams++; - IMediaStream_AddRef((IMediaStream*)pAMMediaStream); + IAMMediaStream_AddRef(pAMMediaStream); return S_OK; } @@ -510,7 +510,7 @@ BaseFilter_Init(&object->filter, (IBaseFilterVtbl*)&MediaStreamFilter_Vtbl, &CLSID_MediaStreamFilter, (DWORD_PTR)(__FILE__ ": MediaStreamFilterImpl.csFilter"), &BaseFuncTable); - *ppObj = object; + *ppObj = &object->filter.IBaseFilter_iface; return S_OK; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Nov 17 21:43:18 2016 @@ -21,7 +21,7 @@ The following libraries are shared with Wine. -reactos/dll/directx/wine/amstream # Synced to WineStaging-1.9.16 +reactos/dll/directx/wine/amstream # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/d3d8 # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3d9 # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.9.4

1 0

[cfinck] 73248: [WINSPOOL_APITEST] GetPrintProcessorDirectory.c: fix 4 error messages (s/cbNeeded/cbTemp/). By Serge Gautherie
by cfinck＠svn.reactos.org 17 Nov '16

17 Nov '16

Author: cfinck Date: Thu Nov 17 21:30:45 2016 New Revision: 73248 URL: http://svn.reactos.org/svn/reactos?rev=73248&view=rev Log: [WINSPOOL_APITEST] GetPrintProcessorDirectory.c: fix 4 error messages (s/cbNeeded/cbTemp/). By Serge Gautherie Modified: trunk/rostests/apitests/winspool/GetPrintProcessorDirectory.c Modified: trunk/rostests/apitests/winspool/GetPrintProcessorDirectory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winspool/GetPrin… ============================================================================== --- trunk/rostests/apitests/winspool/GetPrintProcessorDirectory.c [iso-8859-1] (original) +++ trunk/rostests/apitests/winspool/GetPrintProcessorDirectory.c [iso-8859-1] Thu Nov 17 21:30:45 2016 @@ -46,13 +46,13 @@ SetLastError(0xDEADBEEF); ok(!GetPrintProcessorDirectoryA(NULL, NULL, 1, NULL, cbNeeded, &cbTemp), "GetPrintProcessorDirectoryA returns TRUE!\n"); ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "GetPrintProcessorDirectoryA returns error %lu!\n", GetLastError()); - ok(cbTemp == 0, "cbNeeded is %lu!\n", cbNeeded); + ok(cbTemp == 0, "cbTemp is %lu!\n", cbTemp); // Same error has to occur with a size too small. SetLastError(0xDEADBEEF); ok(!GetPrintProcessorDirectoryA(NULL, NULL, 1, NULL, 1, &cbTemp), "GetPrintProcessorDirectoryA returns TRUE!\n"); ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "GetPrintProcessorDirectoryA returns error %lu!\n", GetLastError()); - ok(cbTemp == 0, "cbNeeded is %lu!\n", cbNeeded); + ok(cbTemp == 0, "cbTemp is %lu!\n", cbTemp); // Finally use the function as intended and aim for success! pszBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cbNeeded); @@ -97,13 +97,13 @@ SetLastError(0xDEADBEEF); ok(!GetPrintProcessorDirectoryW(NULL, NULL, 1, NULL, cbNeeded, &cbTemp), "GetPrintProcessorDirectoryW returns TRUE!\n"); ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "GetPrintProcessorDirectoryW returns error %lu!\n", GetLastError()); - ok(cbTemp == 0, "cbNeeded is %lu!\n", cbNeeded); + ok(cbTemp == 0, "cbTemp is %lu!\n", cbTemp); // Same error has to occur with a size too small. SetLastError(0xDEADBEEF); ok(!GetPrintProcessorDirectoryW(NULL, NULL, 1, NULL, 1, &cbTemp), "GetPrintProcessorDirectoryW returns TRUE!\n"); ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "GetPrintProcessorDirectoryW returns error %lu!\n", GetLastError()); - ok(cbTemp == 0, "cbNeeded is %lu!\n", cbNeeded); + ok(cbTemp == 0, "cbTemp is %lu!\n", cbTemp); // Finally use the function as intended and aim for success! pwszBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cbNeeded);

1 0

[cfinck] 73247: [WINPRINT_APITEST] Load all functions to test dynamically from either winprint.dll in the Print Processor Directory (for ReactOS and NT6) or localspl.dll in the system path (for NT5...
by cfinck＠svn.reactos.org 17 Nov '16

17 Nov '16

Author: cfinck Date: Thu Nov 17 21:24:07 2016 New Revision: 73247 URL: http://svn.reactos.org/svn/reactos?rev=73247&view=rev Log: [WINPRINT_APITEST] Load all functions to test dynamically from either winprint.dll in the Print Processor Directory (for ReactOS and NT6) or localspl.dll in the system path (for NT5). Should fix winprint_apitest on ReactOS and Windows Server 2003. Added: trunk/rostests/apitests/winprint/main.c (with props) Modified: trunk/rostests/apitests/winprint/CMakeLists.txt trunk/rostests/apitests/winprint/EnumPrintProcessorDatatypesW.c trunk/rostests/apitests/winprint/testlist.c Modified: trunk/rostests/apitests/winprint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winprint/CMakeLi… ============================================================================== --- trunk/rostests/apitests/winprint/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/winprint/CMakeLists.txt [iso-8859-1] Thu Nov 17 21:24:07 2016 @@ -1,10 +1,11 @@ list(APPEND SOURCE EnumPrintProcessorDatatypesW.c + main.c testlist.c) add_executable(winprint_apitest ${SOURCE}) target_link_libraries(winprint_apitest wine ${PSEH_LIB}) set_module_type(winprint_apitest win32cui) -add_importlibs(winprint_apitest winprint msvcrt kernel32 ntdll) +add_importlibs(winprint_apitest winspool msvcrt kernel32 ntdll) add_cd_file(TARGET winprint_apitest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/apitests/winprint/EnumPrintProcessorDatatypesW.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winprint/EnumPri… ============================================================================== --- trunk/rostests/apitests/winprint/EnumPrintProcessorDatatypesW.c [iso-8859-1] (original) +++ trunk/rostests/apitests/winprint/EnumPrintProcessorDatatypesW.c [iso-8859-1] Thu Nov 17 21:24:07 2016 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Standard Print Processor API Tests * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Tests for EnumPrintProcessorDatatypesW - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2016 Colin Finck <colin(a)reactos.org> */ #include <apitest.h> @@ -13,61 +13,70 @@ #include <wingdi.h> #include <winspool.h> +typedef BOOL (WINAPI *PEnumPrintProcessorDatatypesW)(LPWSTR, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD); +extern PVOID GetWinprintFunc(const char* FunctionName); + START_TEST(EnumPrintProcessorDatatypesW) { DWORD cbNeeded; DWORD cbTemp; DWORD dwReturned; PDATATYPES_INFO_1W pDatatypesInfo1; + PEnumPrintProcessorDatatypesW pEnumPrintProcessorDatatypesW; + + // Get the function we want to test from one of the possible Print Processor DLLs. + pEnumPrintProcessorDatatypesW = (PEnumPrintProcessorDatatypesW)GetWinprintFunc("EnumPrintProcessorDatatypesW"); + if (!pEnumPrintProcessorDatatypesW) + return; // Try with an invalid level. The error needs to be set by winspool, but not by the Print Processor. SetLastError(0xDEADBEEF); - ok(!EnumPrintProcessorDatatypesW(NULL, NULL, 0, NULL, 0, NULL, NULL), "EnumPrintProcessorDatatypesW returns TRUE!\n"); + ok(!pEnumPrintProcessorDatatypesW(NULL, NULL, 0, NULL, 0, NULL, NULL), "EnumPrintProcessorDatatypesW returns TRUE!\n"); ok(GetLastError() == 0xDEADBEEF, "EnumPrintProcessorDatatypesW returns error %lu!\n", GetLastError()); // Now try with valid level, but no pcbNeeded and no pcReturned. The error needs to be set by RPC. SetLastError(0xDEADBEEF); - ok(!EnumPrintProcessorDatatypesW(NULL, NULL, 1, NULL, 0, NULL, NULL), "EnumPrintProcessorDatatypesW returns TRUE!\n"); + ok(!pEnumPrintProcessorDatatypesW(NULL, NULL, 1, NULL, 0, NULL, NULL), "EnumPrintProcessorDatatypesW returns TRUE!\n"); ok(GetLastError() == 0xDEADBEEF, "EnumPrintProcessorDatatypesW returns error %lu!\n", GetLastError()); // Now try with pcbNeeded and pcReturned, but give no Print Processor. Show that winprint actually ignores the given Print Processor. SetLastError(0xDEADBEEF); - ok(!EnumPrintProcessorDatatypesW(NULL, NULL, 1, NULL, 0, &cbNeeded, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n"); + ok(!pEnumPrintProcessorDatatypesW(NULL, NULL, 1, NULL, 0, &cbNeeded, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "EnumPrintProcessorDatatypesW returns error %lu!\n", GetLastError()); ok(cbNeeded > 0, "cbNeeded is 0!\n"); ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned); // Same error has to occur when looking for an invalid Print Processor. SetLastError(0xDEADBEEF); - ok(!EnumPrintProcessorDatatypesW(NULL, L"invalid", 1, NULL, 0, &cbNeeded, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n"); + ok(!pEnumPrintProcessorDatatypesW(NULL, L"invalid", 1, NULL, 0, &cbNeeded, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "EnumPrintProcessorDatatypesW returns error %lu!\n", GetLastError()); ok(cbNeeded > 0, "cbNeeded is 0!\n"); ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned); // Now get the required buffer size by supplying all information. This needs to fail with ERROR_INSUFFICIENT_BUFFER. SetLastError(0xDEADBEEF); - ok(!EnumPrintProcessorDatatypesW(NULL, L"winprint", 1, NULL, 0, &cbNeeded, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n"); + ok(!pEnumPrintProcessorDatatypesW(NULL, L"winprint", 1, NULL, 0, &cbNeeded, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "EnumPrintProcessorDatatypesW returns error %lu!\n", GetLastError()); ok(cbNeeded > 0, "cbNeeded is 0!\n"); ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned); // Same error has to occur with a size to small. SetLastError(0xDEADBEEF); - ok(!EnumPrintProcessorDatatypesW(NULL, L"winprint", 1, NULL, 1, &cbNeeded, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n"); + ok(!pEnumPrintProcessorDatatypesW(NULL, L"winprint", 1, NULL, 1, &cbNeeded, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "EnumPrintersW returns error %lu!\n", GetLastError()); ok(cbNeeded > 0, "cbNeeded is 0!\n"); ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned); // Now provide the demanded size, but no buffer. Show that winprint returns a different error than the same function in winspool. SetLastError(0xDEADBEEF); - ok(!EnumPrintProcessorDatatypesW(NULL, L"winprint", 1, NULL, cbNeeded, &cbTemp, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n"); + ok(!pEnumPrintProcessorDatatypesW(NULL, L"winprint", 1, NULL, cbNeeded, &cbTemp, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "EnumPrintProcessorDatatypesW returns error %lu!\n", GetLastError()); ok(cbTemp == cbNeeded, "cbTemp is %lu!\n", cbTemp); ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned); // This also has to fail the same way when no Print Processor was given at all. SetLastError(0xDEADBEEF); - ok(!EnumPrintProcessorDatatypesW(NULL, NULL, 1, NULL, cbNeeded, &cbTemp, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n"); + ok(!pEnumPrintProcessorDatatypesW(NULL, NULL, 1, NULL, cbNeeded, &cbTemp, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "EnumPrintProcessorDatatypesW returns error %lu!\n", GetLastError()); ok(cbTemp == cbNeeded, "cbTemp is %lu!\n", cbTemp); ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned); @@ -75,7 +84,7 @@ // Finally use the function as intended and aim for success! Show that winprint doesn't modify the error code at all. pDatatypesInfo1 = HeapAlloc(GetProcessHeap(), 0, cbNeeded); SetLastError(0xDEADBEEF); - ok(EnumPrintProcessorDatatypesW(NULL, L"winprint", 1, (PBYTE)pDatatypesInfo1, cbNeeded, &cbNeeded, &dwReturned), "EnumPrintProcessorDatatypesW returns FALSE!\n"); + ok(pEnumPrintProcessorDatatypesW(NULL, L"winprint", 1, (PBYTE)pDatatypesInfo1, cbNeeded, &cbNeeded, &dwReturned), "EnumPrintProcessorDatatypesW returns FALSE!\n"); ok(GetLastError() == 0xDEADBEEF, "EnumPrintProcessorDatatypesW returns error %lu!\n", GetLastError()); HeapFree(GetProcessHeap(), 0, pDatatypesInfo1); } Added: trunk/rostests/apitests/winprint/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winprint/main.c?… ============================================================================== --- trunk/rostests/apitests/winprint/main.c (added) +++ trunk/rostests/apitests/winprint/main.c [iso-8859-1] Thu Nov 17 21:24:07 2016 @@ -0,0 +1,62 @@ +/* + * PROJECT: ReactOS Standard Print Processor API Tests + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Main functions + * COPYRIGHT: Copyright 2016 Colin Finck <colin(a)reactos.org> + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winspool.h> + +PVOID +GetWinprintFunc(const char* FunctionName) +{ + DWORD cbNeeded; + HMODULE hWinprint; + PVOID pFunc; + WCHAR wszWinprintPath[MAX_PATH]; + + // Build the path to the default Print Processor winprint.dll in the Print Processor directory. + if (!GetPrintProcessorDirectoryW(NULL, NULL, 1, (LPBYTE)wszWinprintPath, sizeof(wszWinprintPath), &cbNeeded)) + { + skip("Could not determine the path to the Print Processor directory, last error is %lu!\n", GetLastError()); + return NULL; + } + + wcscat(wszWinprintPath, L"\\winprint.dll"); + + // Try loading it. + hWinprint = LoadLibraryW(wszWinprintPath); + if (!hWinprint) + { + if (GetLastError() != ERROR_MOD_NOT_FOUND) + { + skip("LoadLibraryW failed for %S with error %lu!\n", wszWinprintPath, GetLastError()); + return NULL; + } + + // winprint.dll does not exist prior to NT6. + // The default Print Processor is implemented in localspl.dll instead. + hWinprint = LoadLibraryW(L"localspl.dll"); + if (!hWinprint) + { + skip("LoadLibraryW failed for localspl.dll with error %lu!\n", GetLastError()); + return NULL; + } + } + + // Get the function we are looking for. + pFunc = GetProcAddress(hWinprint, FunctionName); + if (!pFunc) + { + skip("GetProcAddress failed for %s with error %lu!\n", FunctionName, GetLastError()); + return NULL; + } + + return pFunc; +} Propchange: trunk/rostests/apitests/winprint/main.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/winprint/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winprint/testlis… ============================================================================== --- trunk/rostests/apitests/winprint/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/winprint/testlist.c [iso-8859-1] Thu Nov 17 21:24:07 2016 @@ -2,16 +2,13 @@ * PROJECT: ReactOS Standard Print Processor API Tests * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Test list - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2016 Colin Finck <colin(a)reactos.org> */ /* * These tests are developed and tested against the Windows Server 2003 counterpart of winprint. * While ReactOS implements the Standard Print Processor in a separate module winprint.dll, * Windows Server 2003 puts it into the Local Print Spooler localspl.dll. - * - * To test against Windows, simply run these tests under Windows Server 2003, but copy its - * localspl.dll to winprint.dll in advance. * * winspool.drv also provides functions that go into winprint.dll, but as these tests show, * they behave slightly different in terms of error codes due to the involved RPC and routing.

1 0

[mjansen] 73246: [CMD] Wait for the spawned application to exit while executing a batch script. Patch by Joachim Henze. CORE-12402
by mjansen＠svn.reactos.org 17 Nov '16

17 Nov '16

Author: mjansen Date: Thu Nov 17 20:47:23 2016 New Revision: 73246 URL: http://svn.reactos.org/svn/reactos?rev=73246&view=rev Log: [CMD] Wait for the spawned application to exit while executing a batch script. Patch by Joachim Henze. CORE-12402 Modified: trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=7… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Thu Nov 17 20:47:23 2016 @@ -442,8 +442,9 @@ if (prci.hProcess != NULL) { - if (IsConsoleProcess(prci.hProcess)) - { + if (bc != NULL || IsConsoleProcess(prci.hProcess)) + { + /* when processing a batch file or starting console processes: execute synchronously */ EnterCriticalSection(&ChildProcessRunningLock); dwChildProcessId = prci.dwProcessId;

1 0

[mjansen] 73245: [SHELL32] Don't crash on an empty shortcut. CORE-12331 #resolve
by mjansen＠svn.reactos.org 17 Nov '16

17 Nov '16

Author: mjansen Date: Thu Nov 17 19:50:45 2016 New Revision: 73245 URL: http://svn.reactos.org/svn/reactos?rev=73245&view=rev Log: [SHELL32] Don't crash on an empty shortcut. CORE-12331 #resolve Modified: trunk/reactos/dll/win32/shell32/CShellLink.cpp Modified: trunk/reactos/dll/win32/shell32/CShellLink.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CShellLi… ============================================================================== --- trunk/reactos/dll/win32/shell32/CShellLink.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CShellLink.cpp [iso-8859-1] Thu Nov 17 19:50:45 2016 @@ -1916,7 +1916,7 @@ sei.lpVerb = L"open"; // HACK for ShellExecuteExW - if (wcsstr(sPath, L".cpl")) + if (sPath && wcsstr(sPath, L".cpl")) sei.lpVerb = L"cplopen"; if (ShellExecuteExW(&sei))

1 0

[gadamopoulos] 73244: [PSDK] - shlobj.h: Add some flags that are needed to let shell32 compile.
by gadamopoulos＠svn.reactos.org 17 Nov '16

17 Nov '16

Author: gadamopoulos Date: Thu Nov 17 14:51:02 2016 New Revision: 73244 URL: http://svn.reactos.org/svn/reactos?rev=73244&view=rev Log: [PSDK] - shlobj.h: Add some flags that are needed to let shell32 compile. Modified: trunk/reactos/sdk/include/psdk/shlobj.h Modified: trunk/reactos/sdk/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/shlobj.h?… ============================================================================== --- trunk/reactos/sdk/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/shlobj.h [iso-8859-1] Thu Nov 17 14:51:02 2016 @@ -2211,6 +2211,23 @@ _In_reads_opt_(nKeys) const HKEY *, _Outptr_ IContextMenu **); +#define DFM_MERGECONTEXTMENU 1 +#define DFM_INVOKECOMMAND 2 + +#define DFM_CMD_DELETE ((UINT)-1) +#define DFM_CMD_MOVE ((UINT)-2) +#define DFM_CMD_COPY ((UINT)-3) +#define DFM_CMD_LINK ((UINT)-4) +#define DFM_CMD_PROPERTIES ((UINT)-5) +#define DFM_CMD_NEWFOLDER ((UINT)-6) +#define DFM_CMD_PASTE ((UINT)-7) +#define DFM_CMD_VIEWLIST ((UINT)-8) +#define DFM_CMD_VIEWDETAILS ((UINT)-9) +#define DFM_CMD_PASTELINK ((UINT)-10) +#define DFM_CMD_PASTESPECIAL ((UINT)-11) +#define DFM_CMD_MODALPROP ((UINT)-12) +#define DFM_CMD_RENAME ((UINT)-13) + /**************************************************************************** * SHCreateDefaultExtractIcon API */

1 0

[gadamopoulos] 73243: [SHELL32] - CDefaultContextMenu: Add rudimentary support for callbacks so as to let folders have item specific commands and remove all item specific code from this class. - Im...
by gadamopoulos＠svn.reactos.org 17 Nov '16

17 Nov '16

Author: gadamopoulos Date: Thu Nov 17 14:35:19 2016 New Revision: 73243 URL: http://svn.reactos.org/svn/reactos?rev=73243&view=rev Log: [SHELL32] - CDefaultContextMenu: Add rudimentary support for callbacks so as to let folders have item specific commands and remove all item specific code from this class. - Implement context menu callbacks for CFSFolder, CRegFolder, CDrivesFolder in order to let them handle the properties item and let the CDrivesFolder add and handle the Format item itself. Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp trunk/reactos/dll/win32/shell32/dialogs/drive.cpp trunk/reactos/dll/win32/shell32/dialogs/fprop.cpp trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp trunk/reactos/dll/win32/shell32/folders/CFSFolder.h trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp trunk/reactos/dll/win32/shell32/shfldr.h trunk/reactos/dll/win32/shell32/shlfolder.cpp trunk/reactos/dll/win32/shell32/wine/shell32_main.h Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefault… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] Thu Nov 17 14:35:19 2016 @@ -61,6 +61,8 @@ private: CComPtr<IUnknown> m_site; CComPtr<IShellFolder> m_psf; + CComPtr<IContextMenuCB> m_pmcb; + LPFNDFMCALLBACK m_pfnmcb; UINT m_cidl; PCUITEMID_CHILD_ARRAY m_apidl; CComPtr<IDataObject> m_pDataObj; @@ -75,6 +77,7 @@ UINT m_iIdSCMFirst; /* first static used id */ UINT m_iIdSCMLast; /* last static used id */ + HRESULT _DoCallback(UINT uMsg, WPARAM wParam, LPVOID lParam); void AddStaticEntry(const HKEY hkeyClass, const WCHAR *szVerb); void AddStaticEntriesForKey(HKEY hKey); BOOL IsShellExtensionAlreadyLoaded(const CLSID *pclsid); @@ -93,7 +96,6 @@ HRESULT DoCopyOrCut(LPCMINVOKECOMMANDINFO lpcmi, BOOL bCopy); HRESULT DoRename(LPCMINVOKECOMMANDINFO lpcmi); HRESULT DoProperties(LPCMINVOKECOMMANDINFO lpcmi); - HRESULT DoFormat(LPCMINVOKECOMMANDINFO lpcmi); HRESULT DoCreateNewFolder(LPCMINVOKECOMMANDINFO lpici); HRESULT DoDynamicShellExtensions(LPCMINVOKECOMMANDINFO lpcmi); HRESULT DoStaticShellExtensions(LPCMINVOKECOMMANDINFO lpcmi); @@ -106,7 +108,7 @@ public: CDefaultContextMenu(); ~CDefaultContextMenu(); - HRESULT WINAPI Initialize(const DEFCONTEXTMENU *pdcm); + HRESULT WINAPI Initialize(const DEFCONTEXTMENU *pdcm, LPFNDFMCALLBACK lpfn); // IContextMenu virtual HRESULT WINAPI QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); @@ -133,6 +135,8 @@ CDefaultContextMenu::CDefaultContextMenu() : m_psf(NULL), + m_pmcb(NULL), + m_pfnmcb(NULL), m_cidl(0), m_apidl(NULL), m_pDataObj(NULL), @@ -180,7 +184,7 @@ _ILFreeaPidl(const_cast<PITEMID_CHILD *>(m_apidl), m_cidl); } -HRESULT WINAPI CDefaultContextMenu::Initialize(const DEFCONTEXTMENU *pdcm) +HRESULT WINAPI CDefaultContextMenu::Initialize(const DEFCONTEXTMENU *pdcm, LPFNDFMCALLBACK lpfn) { TRACE("cidl %u\n", pdcm->cidl); @@ -189,6 +193,8 @@ if (m_cidl && !m_apidl) return E_OUTOFMEMORY; m_psf = pdcm->psf; + m_pmcb = pdcm->pcmcb; + m_pfnmcb = lpfn; m_cKeys = pdcm->cKeys; if (pdcm->cKeys) @@ -214,6 +220,20 @@ ERR("GetCurFolder failed\n"); } TRACE("pidlFolder %p\n", m_pidlFolder); + } + + return S_OK; +} + +HRESULT CDefaultContextMenu::_DoCallback(UINT uMsg, WPARAM wParam, LPVOID lParam) +{ + if (m_pmcb) + { + return m_pmcb->CallBack(m_psf, NULL, m_pDataObj, uMsg, wParam, (LPARAM)lParam); + } + else if(m_pfnmcb) + { + return m_pfnmcb(m_psf, NULL, m_pDataObj, uMsg, wParam, (LPARAM)lParam); } return S_OK; @@ -712,23 +732,15 @@ IndexMenu = InsertMenuItemsOfDynamicContextMenuExtension(hMenu, IndexMenu, iIdCmdFirst, iIdCmdLast); TRACE("IndexMenu %d\n", IndexMenu); - if (_ILIsDrive(m_apidl[0])) - { - char szDrive[8] = {0}; - DWORD dwFlags; - - _ILGetDrive(m_apidl[0], szDrive, sizeof(szDrive)); - if (GetVolumeInformationA(szDrive, NULL, 0, NULL, NULL, &dwFlags, NULL, 0)) - { - /* Disable format if read only */ - if (!(dwFlags & FILE_READ_ONLY_VOLUME)) - { - _InsertMenuItemW(hMenu, IndexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); - _InsertMenuItemW(hMenu, IndexMenu++, TRUE, 0x7ABC, MFT_STRING, MAKEINTRESOURCEW(IDS_FORMATDRIVE), MFS_ENABLED); - bAddSep = TRUE; - } - } - } + /* Now let the callback add its own items */ + QCMINFO qcminfo; + qcminfo.hmenu = hMenu; + qcminfo.indexMenu = IndexMenu; + qcminfo.idCmdFirst = iIdCmdFirst; + qcminfo.idCmdLast = iIdCmdLast; + qcminfo.pIdMap = NULL; + _DoCallback(DFM_MERGECONTEXTMENU, uFlags, &qcminfo); + IndexMenu = GetMenuItemCount(hMenu); BOOL bClipboardData = (HasClipboardData() && (rfg & SFGAO_FILESYSTEM)); if (rfg & (SFGAO_CANCOPY | SFGAO_CANMOVE) || bClipboardData) @@ -971,105 +983,8 @@ CDefaultContextMenu::DoProperties( LPCMINVOKECOMMANDINFO lpcmi) { - HRESULT hr = S_OK; - const ITEMIDLIST *pidlParent = m_pidlFolder, *pidlChild; - - if (!pidlParent) - { - CComPtr<IPersistFolder2> pf; - - /* pidlFolder is optional */ - if (SUCCEEDED(m_psf->QueryInterface(IID_PPV_ARG(IPersistFolder2, &pf)))) - { - pf->GetCurFolder((_ITEMIDLIST**)&pidlParent); - } - } - - if (m_cidl > 0) - pidlChild = m_apidl[0]; - else - { - /* Set pidlChild to last pidl of current folder */ - if (pidlParent == m_pidlFolder) - pidlParent = (ITEMIDLIST*)ILClone(pidlParent); - - pidlChild = (ITEMIDLIST*)ILClone(ILFindLastID(pidlParent)); - ILRemoveLastID((ITEMIDLIST*)pidlParent); - } - - if (_ILIsMyComputer(pidlChild)) - { - if (32 >= (UINT)ShellExecuteW(lpcmi->hwnd, L"open", L"rundll32.exe shell32.dll,Control_RunDLL sysdm.cpl", NULL, NULL, SW_SHOWNORMAL)) - hr = E_FAIL; - } - else if (_ILIsDesktop(pidlChild)) - { - if (32 >= (UINT)ShellExecuteW(lpcmi->hwnd, L"open", L"rundll32.exe shell32.dll,Control_RunDLL desk.cpl", NULL, NULL, SW_SHOWNORMAL)) - hr = E_FAIL; - } - else if (_ILIsDrive(pidlChild)) - { - WCHAR wszBuf[MAX_PATH]; - ILGetDisplayName(pidlChild, wszBuf); - if (!SH_ShowDriveProperties(wszBuf, pidlParent, &pidlChild)) - hr = E_FAIL; - } - else if (_ILIsNetHood(pidlChild)) - { - // FIXME path! - if (32 >= (UINT)ShellExecuteW(NULL, L"open", L"explorer.exe", - L"::{7007ACC7-3202-11D1-AAD2-00805FC1270E}", - NULL, SW_SHOWDEFAULT)) - hr = E_FAIL; - } - else if (_ILIsBitBucket(pidlChild)) - { - /* FIXME: detect the drive path of bitbucket if appropiate */ - if (!SH_ShowRecycleBinProperties(L'C')) - hr = E_FAIL; - } - else - { - if (m_cidl > 1) - WARN("SHMultiFileProperties is not yet implemented\n"); - - STRRET strFile; - hr = m_psf->GetDisplayNameOf(pidlChild, SHGDN_FORPARSING, &strFile); - if (SUCCEEDED(hr)) - { - WCHAR wszBuf[MAX_PATH]; - hr = StrRetToBufW(&strFile, pidlChild, wszBuf, _countof(wszBuf)); - if (SUCCEEDED(hr)) - hr = SH_ShowPropertiesDialog(wszBuf, pidlParent, &pidlChild); - else - ERR("StrRetToBufW failed\n"); - } - else - ERR("IShellFolder_GetDisplayNameOf failed for apidl\n"); - } - - /* Free allocated PIDLs */ - if (pidlParent != m_pidlFolder) - ILFree((ITEMIDLIST*)pidlParent); - if (m_cidl < 1 || pidlChild != m_apidl[0]) - ILFree((ITEMIDLIST*)pidlChild); - - return hr; -} - -HRESULT -CDefaultContextMenu::DoFormat( - LPCMINVOKECOMMANDINFO lpcmi) -{ - char szDrive[8] = {0}; - - if (!_ILGetDrive(m_apidl[0], szDrive, sizeof(szDrive))) - { - ERR("pidl is not a drive\n"); - return E_FAIL; - } - - SHFormatDrive(lpcmi->hwnd, szDrive[0] - 'A', SHFMT_ID_DEFAULT, 0); + _DoCallback(DFM_INVOKECOMMAND, DFM_CMD_PROPERTIES, NULL); + return S_OK; } @@ -1411,13 +1326,13 @@ case FCIDM_SHVIEW_PROPERTIES: Result = DoProperties(&LocalInvokeInfo); break; - case 0x7ABC: - Result = DoFormat(&LocalInvokeInfo); - break; case FCIDM_SHVIEW_NEWFOLDER: Result = DoCreateNewFolder(&LocalInvokeInfo); break; default: + + _DoCallback(DFM_INVOKECOMMAND, LOWORD(LocalInvokeInfo.lpVerb), NULL); + Result = E_UNEXPECTED; break; } @@ -1561,9 +1476,9 @@ static HRESULT -CDefaultContextMenu_CreateInstance(const DEFCONTEXTMENU *pdcm, REFIID riid, void **ppv) -{ - return ShellObjectCreatorInit<CDefaultContextMenu>(pdcm, riid, ppv); +CDefaultContextMenu_CreateInstance(const DEFCONTEXTMENU *pdcm, LPFNDFMCALLBACK lpfn, REFIID riid, void **ppv) +{ + return ShellObjectCreatorInit<CDefaultContextMenu>(pdcm, lpfn, riid, ppv); } /************************************************************************* @@ -1575,7 +1490,7 @@ WINAPI SHCreateDefaultContextMenu(const DEFCONTEXTMENU *pdcm, REFIID riid, void **ppv) { - HRESULT hr = CDefaultContextMenu_CreateInstance(pdcm, riid, ppv); + HRESULT hr = CDefaultContextMenu_CreateInstance(pdcm, NULL, riid, ppv); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -1600,20 +1515,20 @@ const HKEY *ahkeyClsKeys, IContextMenu **ppcm) { - DEFCONTEXTMENU pdcm; - pdcm.hwnd = hwnd; - pdcm.pcmcb = NULL; - pdcm.pidlFolder = pidlFolder; - pdcm.psf = psf; - pdcm.cidl = cidl; - pdcm.apidl = apidl; - pdcm.punkAssociationInfo = NULL; - pdcm.cKeys = nKeys; - pdcm.aKeys = ahkeyClsKeys; - - HRESULT hr = SHCreateDefaultContextMenu(&pdcm, IID_PPV_ARG(IContextMenu, ppcm)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - return S_OK; -} + DEFCONTEXTMENU dcm; + dcm.hwnd = hwnd; + dcm.pcmcb = NULL; + dcm.pidlFolder = pidlFolder; + dcm.psf = psf; + dcm.cidl = cidl; + dcm.apidl = apidl; + dcm.punkAssociationInfo = NULL; + dcm.cKeys = nKeys; + dcm.aKeys = ahkeyClsKeys; + + HRESULT hr = CDefaultContextMenu_CreateInstance(&dcm, lpfn, IID_PPV_ARG(IContextMenu, ppcm)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return S_OK; +} Modified: trunk/reactos/dll/win32/shell32/dialogs/drive.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/drive.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/drive.cpp [iso-8859-1] Thu Nov 17 14:35:19 2016 @@ -123,7 +123,7 @@ } DRIVE_PROP_PAGE; BOOL -SH_ShowDriveProperties(WCHAR *pwszDrive, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST *apidl) +SH_ShowDriveProperties(WCHAR *pwszDrive, LPCITEMIDLIST pidlFolder, PCUITEMID_CHILD_ARRAY apidl) { HPSXA hpsx = NULL; HPROPSHEETPAGE hpsp[MAX_PROPERTY_SHEET_PAGE]; Modified: trunk/reactos/dll/win32/shell32/dialogs/fprop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/fprop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/fprop.cpp [iso-8859-1] Thu Nov 17 14:35:19 2016 @@ -95,7 +95,7 @@ */ BOOL -SH_ShowPropertiesDialog(LPCWSTR pwszPath, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST *apidl) +SH_ShowPropertiesDialog(LPCWSTR pwszPath, LPCITEMIDLIST pidlFolder, PCUITEMID_CHILD_ARRAY apidl) { HPSXA hpsxa[3] = {NULL, NULL, NULL}; CComObject<CFileDefExt> *pFileDefExt = NULL; Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] Thu Nov 17 14:35:19 2016 @@ -133,8 +133,8 @@ CComPtr<IDefaultExtractIconInit> initIcon; HRESULT hr = SHCreateDefaultExtractIcon(IID_PPV_ARG(IDefaultExtractIconInit, &initIcon)); - if (FAILED(hr)) - return NULL; + if (FAILED_UNEXPECTEDLY(hr)) + return hr; initIcon->SetNormalIcon(pData->szName, (int)pData->iconIdx != -1 ? pData->iconIdx : 0); Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] Thu Nov 17 14:35:19 2016 @@ -39,6 +39,69 @@ * IShellFolder implementation */ +HRESULT CALLBACK DrivesContextMenuCallback(IShellFolder *psf, + HWND hwnd, + IDataObject *pdtobj, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + if (uMsg != DFM_MERGECONTEXTMENU && uMsg != DFM_INVOKECOMMAND) + return S_OK; + + PIDLIST_ABSOLUTE pidlFolder; + PUITEMID_CHILD *apidl; + UINT cidl; + HRESULT hr = SH_GetApidlFromDataObject(pdtobj, &pidlFolder, &apidl, &cidl); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + char szDrive[8] = {0}; + if (!_ILGetDrive(apidl[0], szDrive, sizeof(szDrive))) + { + ERR("pidl is not a drive\n"); + SHFree(pidlFolder); + _ILFreeaPidl(apidl, cidl); + return E_FAIL; + } + + if (uMsg == DFM_MERGECONTEXTMENU) + { + QCMINFO *pqcminfo = (QCMINFO *)lParam; + DWORD dwFlags; + + if (GetVolumeInformationA(szDrive, NULL, 0, NULL, NULL, &dwFlags, NULL, 0)) + { + /* Disable format if read only */ + if (!(dwFlags & FILE_READ_ONLY_VOLUME) && GetDriveTypeA(szDrive) != DRIVE_REMOTE) + { + _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); + _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, 0x7ABC, MFT_STRING, MAKEINTRESOURCEW(IDS_FORMATDRIVE), MFS_ENABLED); + } + } + } + else if (uMsg == DFM_INVOKECOMMAND) + { + if(wParam == 0x7ABC) + { + SHFormatDrive(hwnd, szDrive[0] - 'A', SHFMT_ID_DEFAULT, 0); + } + else if (wParam == DFM_CMD_PROPERTIES) + { + WCHAR wszBuf[4]; + wcscpy(wszBuf, L"A:\\"); + wszBuf[0] = (WCHAR)szDrive[0]; + if (!SH_ShowDriveProperties(wszBuf, pidlFolder, apidl)) + hr = E_FAIL; + } + } + + SHFree(pidlFolder); + _ILFreeaPidl(apidl, cidl); + + return hr; +} + HRESULT CDrivesContextMenu_CreateInstance(PCIDLIST_ABSOLUTE pidlFolder, HWND hwnd, UINT cidl, @@ -51,16 +114,15 @@ AddClassKeyToArray(L"Drive", hKeys, &cKeys); AddClassKeyToArray(L"Folder", hKeys, &cKeys); - /* TODO: also pass a callback here */ - return CDefFolderMenu_Create2(pidlFolder, hwnd, cidl, apidl, psf, NULL, cKeys, hKeys, ppcm); + return CDefFolderMenu_Create2(pidlFolder, hwnd, cidl, apidl, psf, DrivesContextMenuCallback, cKeys, hKeys, ppcm); } HRESULT CDrivesExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl, REFIID riid, LPVOID * ppvOut) { CComPtr<IDefaultExtractIconInit> initIcon; HRESULT hr = SHCreateDefaultExtractIcon(IID_PPV_ARG(IDefaultExtractIconInit, &initIcon)); - if (FAILED(hr)) - return NULL; + if (FAILED_UNEXPECTEDLY(hr)) + return hr; CHAR* pszDrive = _ILGetDataPointer(pidl)->u.drive.szDriveName; WCHAR wTemp[MAX_PATH]; Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Thu Nov 17 14:35:19 2016 @@ -489,12 +489,21 @@ if (IsEqualIID(riid, IID_IContextMenu) && (cidl >= 1)) { - IContextMenu * pCm = NULL; HKEY hKeys[16]; UINT cKeys = 0; AddFSClassKeysToArray(apidl[0], hKeys, &cKeys); - hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, static_cast<IShellFolder*>(this), NULL, cKeys, hKeys, &pCm); - pObj = pCm; + + DEFCONTEXTMENU dcm; + dcm.hwnd = hwndOwner; + dcm.pcmcb = this; + dcm.pidlFolder = pidlRoot; + dcm.psf = this; + dcm.cidl = cidl; + dcm.apidl = apidl; + dcm.cKeys = cKeys; + dcm.aKeys = hKeys; + dcm.punkAssociationInfo = NULL; + hr = SHCreateDefaultContextMenu (&dcm, riid, &pObj); } else if (IsEqualIID (riid, IID_IDataObject)) { @@ -1088,4 +1097,38 @@ return hr; } return hr; -} +} + +HRESULT WINAPI CFSFolder::CallBack(IShellFolder *psf, HWND hwndOwner, IDataObject *pdtobj, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + if (uMsg != DFM_INVOKECOMMAND || wParam != DFM_CMD_PROPERTIES) + return S_OK; + + PIDLIST_ABSOLUTE pidlFolder; + PUITEMID_CHILD *apidl; + UINT cidl; + HRESULT hr = SH_GetApidlFromDataObject(pdtobj, &pidlFolder, &apidl, &cidl); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + if (cidl > 1) + ERR("SHMultiFileProperties is not yet implemented\n"); + + STRRET strFile; + hr = GetDisplayNameOf(apidl[0], SHGDN_FORPARSING, &strFile); + if (SUCCEEDED(hr)) + { + hr = SH_ShowPropertiesDialog(strFile.pOleStr, pidlFolder, apidl); + if (FAILED(hr)) + ERR("SH_ShowPropertiesDialog failed\n"); + } + else + { + ERR("Failed to get display name\n"); + } + + SHFree(pidlFolder); + _ILFreeaPidl(apidl, cidl); + + return hr; +} Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.h [iso-8859-1] Thu Nov 17 14:35:19 2016 @@ -27,7 +27,8 @@ public CComCoClass<CFSFolder, &CLSID_ShellFSFolder>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IShellFolder2, - public IPersistFolder3 + public IPersistFolder3, + public IContextMenuCB { private: CLSID *pclsid; @@ -80,6 +81,9 @@ virtual HRESULT WINAPI InitializeEx(IBindCtx *pbc, LPCITEMIDLIST pidlRoot, const PERSIST_FOLDER_TARGET_INFO *ppfti); virtual HRESULT WINAPI GetFolderTargetInfo(PERSIST_FOLDER_TARGET_INFO *ppfti); + // IContextMenuCB + virtual HRESULT WINAPI CallBack(IShellFolder *psf, HWND hwndOwner, IDataObject *pdtobj, UINT uMsg, WPARAM wParam, LPARAM lParam); + DECLARE_REGISTRY_RESOURCEID(IDR_SHELLFSFOLDER) DECLARE_NOT_AGGREGATABLE(CFSFolder) Modified: trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] Thu Nov 17 14:35:19 2016 @@ -53,8 +53,8 @@ { CComPtr<IDefaultExtractIconInit> initIcon; HRESULT hr = SHCreateDefaultExtractIcon(IID_PPV_ARG(IDefaultExtractIconInit, &initIcon)); - if (FAILED(hr)) - return NULL; + if (FAILED_UNEXPECTEDLY(hr)) + return hr; initIcon->SetNormalIcon(swShell32Name, -IDI_SHELL_NETWORK_FOLDER); Modified: trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] Thu Nov 17 14:35:19 2016 @@ -67,8 +67,8 @@ { CComPtr<IDefaultExtractIconInit> initIcon; HRESULT hr = SHCreateDefaultExtractIcon(IID_PPV_ARG(IDefaultExtractIconInit, &initIcon)); - if (FAILED(hr)) - return NULL; + if (FAILED_UNEXPECTEDLY(hr)) + return hr; /* FIXME: This is completely unimplemented */ initIcon->SetNormalIcon(swShell32Name, 0); Modified: trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp [iso-8859-1] Thu Nov 17 14:35:19 2016 @@ -22,6 +22,54 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); +HRESULT CALLBACK RegFolderContextMenuCallback(IShellFolder *psf, + HWND hwnd, + IDataObject *pdtobj, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + if (uMsg != DFM_INVOKECOMMAND || wParam != DFM_CMD_PROPERTIES) + return S_OK; + + PIDLIST_ABSOLUTE pidlFolder; + PUITEMID_CHILD *apidl; + UINT cidl; + HRESULT hr = SH_GetApidlFromDataObject(pdtobj, &pidlFolder, &apidl, &cidl); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + if (_ILIsMyComputer(apidl[0])) + { + if (32 >= (UINT)ShellExecuteW(hwnd, L"open", L"rundll32.exe shell32.dll,Control_RunDLL sysdm.cpl", NULL, NULL, SW_SHOWNORMAL)) + hr = E_FAIL; + } + else if (_ILIsDesktop(apidl[0])) + { + if (32 >= (UINT)ShellExecuteW(hwnd, L"open", L"rundll32.exe shell32.dll,Control_RunDLL desk.cpl", NULL, NULL, SW_SHOWNORMAL)) + hr = E_FAIL; + } + else if (_ILIsNetHood(apidl[0])) + { + // FIXME path! + if (32 >= (UINT)ShellExecuteW(NULL, L"open", L"explorer.exe", + L"::{7007ACC7-3202-11D1-AAD2-00805FC1270E}", + NULL, SW_SHOWDEFAULT)) + hr = E_FAIL; + } + else if (_ILIsBitBucket(apidl[0])) + { + /* FIXME: detect the drive path of bitbucket if appropiate */ + if (!SH_ShowRecycleBinProperties(L'C')) + hr = E_FAIL; + } + + SHFree(pidlFolder); + _ILFreeaPidl(apidl, cidl); + + return hr; +} + HRESULT CGuidItemContextMenu_CreateInstance(PCIDLIST_ABSOLUTE pidlFolder, HWND hwnd, UINT cidl, @@ -48,7 +96,7 @@ } AddClassKeyToArray(L"Folder", hKeys, &cKeys); - return CDefFolderMenu_Create2(pidlFolder, hwnd, cidl, apidl, psf, NULL, cKeys, hKeys, ppcm); + return CDefFolderMenu_Create2(pidlFolder, hwnd, cidl, apidl, psf, RegFolderContextMenuCallback, cKeys, hKeys, ppcm); } HRESULT CGuidItemExtractIcon_CreateInstance(LPCITEMIDLIST pidl, REFIID iid, LPVOID * ppvOut) @@ -397,6 +445,10 @@ } hr = CGuidItemContextMenu_CreateInstance(m_pidlRoot, hwndOwner, cidl, apidl, static_cast<IShellFolder*>(this), (IContextMenu**)&pObj); + } + else if (IsEqualIID (riid, IID_IDataObject) && (cidl >= 1)) + { + hr = IDataObject_Constructor (hwndOwner, m_pidlRoot, apidl, cidl, (IDataObject **)&pObj); } else { Modified: trunk/reactos/dll/win32/shell32/shfldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr.h… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] Thu Nov 17 14:35:19 2016 @@ -63,6 +63,8 @@ void AddFSClassKeysToArray(PCUITEMID_CHILD pidl, HKEY* array, UINT* cKeys); +HRESULT SH_GetApidlFromDataObject(IDataObject *pDataObject, PIDLIST_ABSOLUTE* ppidlfolder, PUITEMID_CHILD **apidlItems, UINT *pcidl); + static __inline int SHELL32_GUIDToStringA (REFGUID guid, LPSTR str) { return sprintf(str, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Thu Nov 17 14:35:19 2016 @@ -547,6 +547,49 @@ } } +HRESULT SH_GetApidlFromDataObject(IDataObject *pDataObject, PIDLIST_ABSOLUTE* ppidlfolder, PUITEMID_CHILD **apidlItems, UINT *pcidl) +{ + UINT cfShellIDList = RegisterClipboardFormatW(CFSTR_SHELLIDLIST); + if (!cfShellIDList) + return E_FAIL; + + FORMATETC fmt; + InitFormatEtc (fmt, cfShellIDList, TYMED_HGLOBAL); + + HRESULT hr = pDataObject->QueryGetData(&fmt); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + STGMEDIUM medium; + hr = pDataObject->GetData(&fmt, &medium); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + /* lock the handle */ + LPIDA lpcida = (LPIDA)GlobalLock(medium.hGlobal); + if (!lpcida) + { + ReleaseStgMedium(&medium); + return E_FAIL; + } + + /* convert the data into pidl */ + LPITEMIDLIST pidl; + LPITEMIDLIST *apidl = _ILCopyCidaToaPidl(&pidl, lpcida); + if (!apidl) + { + ReleaseStgMedium(&medium); + return E_OUTOFMEMORY; + } + + *ppidlfolder = pidl; + *apidlItems = apidl; + *pcidl = lpcida->cidl; + + ReleaseStgMedium(&medium); + return S_OK; +} + /*********************************************************************** * SHCreateLinks * Modified: trunk/reactos/dll/win32/shell32/wine/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shell32_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shell32_main.h [iso-8859-1] Thu Nov 17 14:35:19 2016 @@ -189,10 +189,9 @@ INT_PTR CALLBACK SH_FileGeneralDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK SH_FileVersionDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); HPROPSHEETPAGE SH_CreatePropertySheetPage(WORD wDialogId, DLGPROC pfnDlgProc, LPARAM lParam, LPCWSTR pwszTitle); -BOOL SH_ShowDriveProperties(WCHAR *drive, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST *apidl); +BOOL SH_ShowDriveProperties(WCHAR *drive, LPCITEMIDLIST pidlFolder, PCUITEMID_CHILD_ARRAY apidl); BOOL SH_ShowRecycleBinProperties(WCHAR sDrive); -BOOL SH_ShowPropertiesDialog(LPCWSTR pwszPath, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST *apidl); -BOOL SH_ShowFolderProperties(LPWSTR pwszFolder, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST *apidl); +BOOL SH_ShowPropertiesDialog(LPCWSTR pwszPath, LPCITEMIDLIST pidlFolder, PCUITEMID_CHILD_ARRAY apidl); LPWSTR SH_FormatFileSizeWithBytes(PULARGE_INTEGER lpQwSize, LPWSTR pszBuf, UINT cchBuf); HRESULT WINAPI DoRegisterServer(void);

1 0

[akhaldi] 73242: [WLANAPI_APITEST] Bring these tests back home.
by akhaldi＠svn.reactos.org 17 Nov '16

17 Nov '16

Author: akhaldi Date: Thu Nov 17 13:46:36 2016 New Revision: 73242 URL: http://svn.reactos.org/svn/reactos?rev=73242&view=rev Log: [WLANAPI_APITEST] Bring these tests back home. Added: trunk/rostests/apitests/wlanapi/ - copied from r73241, trunk/rostests/winetests/wlanapi/ Removed: trunk/rostests/winetests/wlanapi/ Modified: trunk/rostests/apitests/CMakeLists.txt trunk/rostests/apitests/wlanapi/CMakeLists.txt trunk/rostests/apitests/wlanapi/testlist.c trunk/rostests/apitests/wlanapi/wlanapi.c trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Thu Nov 17 13:46:36 2016 @@ -37,4 +37,5 @@ add_subdirectory(wininet) add_subdirectory(winprint) add_subdirectory(winspool) +add_subdirectory(wlanapi) add_subdirectory(ws2_32) Modified: trunk/rostests/apitests/wlanapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/wlanapi/CMakeLis… ============================================================================== --- trunk/rostests/apitests/wlanapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/wlanapi/CMakeLists.txt [iso-8859-1] Thu Nov 17 13:46:36 2016 @@ -1,5 +1,5 @@ -add_executable(wlanapi_winetest wlanapi.c testlist.c) -set_module_type(wlanapi_winetest win32cui) -add_importlibs(wlanapi_winetest wlanapi msvcrt kernel32) -add_cd_file(TARGET wlanapi_winetest DESTINATION reactos/bin FOR all) +add_executable(wlanapi_apitest wlanapi.c testlist.c) +set_module_type(wlanapi_apitest win32cui) +add_importlibs(wlanapi_apitest wlanapi msvcrt kernel32) +add_cd_file(TARGET wlanapi_apitest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/apitests/wlanapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/wlanapi/testlist… ============================================================================== --- trunk/rostests/apitests/wlanapi/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/wlanapi/testlist.c [iso-8859-1] Thu Nov 17 13:46:36 2016 @@ -1,10 +1,7 @@ -/* Automatically generated file; DO NOT EDIT!! */ - -#define WIN32_LEAN_AND_MEAN -#include <windows.h> +#define __ROS_LONG64__ #define STANDALONE -#include "wine/test.h" +#include <apitest.h> extern void func_wlanapi(void); Modified: trunk/rostests/apitests/wlanapi/wlanapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/wlanapi/wlanapi.… ============================================================================== --- trunk/rostests/apitests/wlanapi/wlanapi.c [iso-8859-1] (original) +++ trunk/rostests/apitests/wlanapi/wlanapi.c [iso-8859-1] Thu Nov 17 13:46:36 2016 @@ -18,15 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> - -#include "windef.h" -#include "winbase.h" -#include "wlanapi.h" - -#include "wine/test.h" +#include <apitest.h> + +#include <wlanapi.h> static const GUID InterfaceGuid = {0x439b20af, 0x8955, 0x405b, {0x99, 0xf0, 0xa6, 0x2a, 0xf0, 0xc6, 0x8d, 0x43}}; @@ -43,20 +37,20 @@ skip("Skipping wlanapi tests, WlanSvc is not running\n"); return; } - ok(ret == ERROR_SUCCESS, "WlanOpenHandle failed, error %d\n", ret); + ok(ret == ERROR_SUCCESS, "WlanOpenHandle failed, error %ld\n", ret); WlanCloseHandle(hClientHandle, NULL); /* invalid pdwNegotiatedVersion */ ret = WlanOpenHandle(1, NULL, NULL, &hClientHandle); - ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); /* invalid hClientHandle */ ret = WlanOpenHandle(1, NULL, &dwNegotiatedVersion, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); /* invalid pReserved */ ret = WlanOpenHandle(1, (PVOID) 1, &dwNegotiatedVersion, &hClientHandle); - ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); } static void WlanCloseHandle_test(void) Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Thu Nov 17 13:46:36 2016 @@ -114,7 +114,6 @@ add_subdirectory(winmm) #add_subdirectory(winspool) add_subdirectory(wintrust) -add_subdirectory(wlanapi) add_subdirectory(wldap32) add_subdirectory(wmiutils) add_subdirectory(ws2_32)

1 0

[phater] 73241: [MSAFD] Fix WSPSelect heap corruption and don't repeat sockets if they are in different fd_sets. CORE-12324
by phater＠svn.reactos.org 17 Nov '16

17 Nov '16

Author: phater Date: Thu Nov 17 12:57:32 2016 New Revision: 73241 URL: http://svn.reactos.org/svn/reactos?rev=73241&view=rev Log: [MSAFD] Fix WSPSelect heap corruption and don't repeat sockets if they are in different fd_sets. CORE-12324 Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Thu Nov 17 12:57:32 2016 @@ -1045,13 +1045,34 @@ PSOCKET_INFORMATION Socket; SOCKET Handle; ULONG Events; + fd_set selectfds; /* Find out how many sockets we have, and how large the buffer needs * to be */ - - HandleCount = ( readfds ? readfds->fd_count : 0 ) + - ( writefds ? writefds->fd_count : 0 ) + - ( exceptfds ? exceptfds->fd_count : 0 ); + FD_ZERO(&selectfds); + if (readfds != NULL) + { + for (i = 0; i < readfds->fd_count; i++) + { + FD_SET(readfds->fd_array[i], &selectfds); + } + } + if (writefds != NULL) + { + for (i = 0; i < writefds->fd_count; i++) + { + FD_SET(writefds->fd_array[i], &selectfds); + } + } + if (exceptfds != NULL) + { + for (i = 0; i < exceptfds->fd_count; i++) + { + FD_SET(exceptfds->fd_array[i], &selectfds); + } + } + + HandleCount = selectfds.fd_count; if ( HandleCount == 0 ) { @@ -1082,7 +1103,7 @@ if (Timeout.QuadPart > 0) { if (lpErrno) *lpErrno = WSAEINVAL; - return SOCKET_ERROR; + return SOCKET_ERROR; } TRACE("Timeout: Orig %d.%06d kernel %d\n", timeout->tv_sec, timeout->tv_usec, @@ -1123,9 +1144,26 @@ PollInfo->Exclusive = FALSE; PollInfo->Timeout = Timeout; + for (i = 0; i < selectfds.fd_count; i++) + { + PollInfo->Handles[i].Handle = selectfds.fd_array[i]; + } if (readfds != NULL) { - for (i = 0; i < readfds->fd_count; i++, j++) - { + for (i = 0; i < readfds->fd_count; i++) + { + for (j = 0; j < HandleCount; j++) + { + if (PollInfo->Handles[j].Handle == readfds->fd_array[i]) + break; + } + if (j >= HandleCount) + { + ERR("Error while counting readfds %ld > %ld\n", j, HandleCount); + if (lpErrno) *lpErrno = WSAEFAULT; + HeapFree(GlobalHeap, 0, PollBuffer); + NtClose(SockEvent); + return SOCKET_ERROR; + } Socket = GetSocketStructure(readfds->fd_array[i]); if (!Socket) { @@ -1135,20 +1173,32 @@ NtClose(SockEvent); return SOCKET_ERROR; } - PollInfo->Handles[j].Handle = readfds->fd_array[i]; - PollInfo->Handles[j].Events = AFD_EVENT_RECEIVE | - AFD_EVENT_DISCONNECT | - AFD_EVENT_ABORT | - AFD_EVENT_CLOSE | - AFD_EVENT_ACCEPT; - if (Socket->SharedData->OobInline != 0) - PollInfo->Handles[j].Events |= AFD_EVENT_OOB_RECEIVE; + PollInfo->Handles[j].Events |= AFD_EVENT_RECEIVE | + AFD_EVENT_DISCONNECT | + AFD_EVENT_ABORT | + AFD_EVENT_CLOSE | + AFD_EVENT_ACCEPT; + //if (Socket->SharedData->OobInline != 0) + // PollInfo->Handles[j].Events |= AFD_EVENT_OOB_RECEIVE; } } if (writefds != NULL) { - for (i = 0; i < writefds->fd_count; i++, j++) - { + for (i = 0; i < writefds->fd_count; i++) + { + for (j = 0; j < HandleCount; j++) + { + if (PollInfo->Handles[j].Handle == writefds->fd_array[i]) + break; + } + if (j >= HandleCount) + { + ERR("Error while counting writefds %ld > %ld\n", j, HandleCount); + if (lpErrno) *lpErrno = WSAEFAULT; + HeapFree(GlobalHeap, 0, PollBuffer); + NtClose(SockEvent); + return SOCKET_ERROR; + } Socket = GetSocketStructure(writefds->fd_array[i]); if (!Socket) { @@ -1159,15 +1209,28 @@ return SOCKET_ERROR; } PollInfo->Handles[j].Handle = writefds->fd_array[i]; - PollInfo->Handles[j].Events = AFD_EVENT_SEND; + PollInfo->Handles[j].Events |= AFD_EVENT_SEND; if (Socket->SharedData->NonBlocking != 0) PollInfo->Handles[j].Events |= AFD_EVENT_CONNECT; } } if (exceptfds != NULL) { - for (i = 0; i < exceptfds->fd_count; i++, j++) - { + for (i = 0; i < exceptfds->fd_count; i++) + { + for (j = 0; j < HandleCount; j++) + { + if (PollInfo->Handles[j].Handle == exceptfds->fd_array[i]) + break; + } + if (j > HandleCount) + { + ERR("Error while counting exceptfds %ld > %ld\n", j, HandleCount); + if (lpErrno) *lpErrno = WSAEFAULT; + HeapFree(GlobalHeap, 0, PollBuffer); + NtClose(SockEvent); + return SOCKET_ERROR; + } Socket = GetSocketStructure(exceptfds->fd_array[i]); if (!Socket) { @@ -1178,20 +1241,14 @@ return SOCKET_ERROR; } PollInfo->Handles[j].Handle = exceptfds->fd_array[i]; - PollInfo->Handles[j].Events = 0; if (Socket->SharedData->OobInline == 0) PollInfo->Handles[j].Events |= AFD_EVENT_OOB_RECEIVE; if (Socket->SharedData->NonBlocking != 0) PollInfo->Handles[j].Events |= AFD_EVENT_CONNECT_FAIL; - if (PollInfo->Handles[j].Events == 0) - { - TRACE("No events can be checked for exceptfds %d. It is nonblocking and OOB line is disabled. Skipping it.", exceptfds->fd_array[i]); - j--; - } - } - } - - PollInfo->HandleCount = j; + } + } + + PollInfo->HandleCount = HandleCount; PollBufferSize = FIELD_OFFSET(AFD_POLL_INFO, Handles) + PollInfo->HandleCount * sizeof(AFD_HANDLE); /* Send IOCTL */

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
32
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2016