October 2015 - Wine-Commits

Matteo Bruni : d3d8/tests: Use the new readback helpers in test_pointsize( ).
by Alexandre Julliard Oct. 13, 2015

Oct. 13, 2015

Module: wine Branch: master Commit: 2e4aee0ee74a19f77fce15250ba0d9eade11456c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e4aee0ee74a19f77fce15250… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Oct 12 23:17:07 2015 +0200 d3d8/tests: Use the new readback helpers in test_pointsize(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 772fd96..2748445 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -7197,31 +7197,36 @@ static void test_pointsize(void) } else { - color = getPixelColor(device, 64 - size / 2 + 1, 64 - size / 2 + 1); + struct surface_readback rb; + + get_rt_readback(rt, &rb); + color = get_readback_color(&rb, 64 - size / 2 + 1, 64 - size / 2 + 1); ok(color_match(color, 0x00ff0000, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 + size / 2 - 1, 64 - size / 2 + 1); + color = get_readback_color(&rb, 64 + size / 2 - 1, 64 - size / 2 + 1); ok(color_match(color, 0x00ffff00, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 - size / 2 + 1, 64 + size / 2 - 1); + color = get_readback_color(&rb, 64 - size / 2 + 1, 64 + size / 2 - 1); ok(color_match(color, 0x00000000, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 + size / 2 - 1, 64 + size / 2 - 1); + color = get_readback_color(&rb, 64 + size / 2 - 1, 64 + size / 2 - 1); ok(color_match(color, 0x0000ff00, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 - size / 2 - 1, 64 - size / 2 - 1); - ok(color_match(color, 0x0000ffff, 0), + color = get_readback_color(&rb, 64 - size / 2 - 1, 64 - size / 2 - 1); + ok(color_match(color, 0xff00ffff, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 + size / 2 + 1, 64 - size / 2 - 1); - ok(color_match(color, 0x0000ffff, 0), + color = get_readback_color(&rb, 64 + size / 2 + 1, 64 - size / 2 - 1); + ok(color_match(color, 0xff00ffff, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 - size / 2 - 1, 64 + size / 2 + 1); - ok(color_match(color, 0x0000ffff, 0), + color = get_readback_color(&rb, 64 - size / 2 - 1, 64 + size / 2 + 1); + ok(color_match(color, 0xff00ffff, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 + size / 2 + 1, 64 + size / 2 + 1); - ok(color_match(color, 0x0000ffff, 0), + color = get_readback_color(&rb, 64 + size / 2 + 1, 64 + size / 2 + 1); + ok(color_match(color, 0xff00ffff, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); + + release_surface_readback(&rb); } } IDirect3DDevice8_SetVertexShader(device, 0);

1 0

Nikolay Sivov : dwrite: Return strictly 0/1 for BOOL return type ( PVS-Studio).
by Alexandre Julliard Oct. 13, 2015

Oct. 13, 2015

Module: wine Branch: master Commit: 83d484834d045388b16cc2652ea37d07f654c765 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83d484834d045388b16cc2652… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 23:06:32 2015 +0300 dwrite: Return strictly 0/1 for BOOL return type (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index cfae1af..87ccc7c 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -641,7 +641,7 @@ INT freetype_get_charmap_index(IDWriteFontFace2 *fontface, BOOL *is_symbol) if (os2->version == 0) *is_symbol = pFT_Get_First_Char(face, &dummy) >= 0x100; else - *is_symbol = os2->ulCodePageRange1 & FS_SYMBOL; + *is_symbol = !!(os2->ulCodePageRange1 & FS_SYMBOL); } for (i = 0; i < face->num_charmaps; i++)

1 0

Riccardo Bortolato : d3d8: Replace surface refcounting with parent texture refcounting.
by Alexandre Julliard Oct. 13, 2015

Oct. 13, 2015

Module: wine Branch: master Commit: 2a51e695a1cb95f8a8a43248d7d9155e40fd7f0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a51e695a1cb95f8a8a43248d… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Mon Oct 12 17:23:36 2015 +0200 d3d8: Replace surface refcounting with parent texture refcounting. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 165e048..cce8b87 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -70,7 +70,7 @@ static ULONG WINAPI d3d8_surface_AddRef(IDirect3DSurface8 *iface) wined3d_mutex_lock(); if (surface->wined3d_rtv) wined3d_rendertarget_view_incref(surface->wined3d_rtv); - wined3d_surface_incref(surface->wined3d_surface); + wined3d_texture_incref(surface->wined3d_texture); wined3d_mutex_unlock(); } @@ -100,7 +100,7 @@ static ULONG WINAPI d3d8_surface_Release(IDirect3DSurface8 *iface) wined3d_mutex_lock(); if (surface->wined3d_rtv) wined3d_rendertarget_view_decref(surface->wined3d_rtv); - wined3d_surface_decref(surface->wined3d_surface); + wined3d_texture_decref(surface->wined3d_texture); wined3d_mutex_unlock(); if (parent_device)

1 0

Matteo Bruni : wined3d: Fully initialize partially written varyings in SM3 shaders.
by Alexandre Julliard Oct. 13, 2015

Oct. 13, 2015

Module: wine Branch: master Commit: f4d9f8c212a03166a0ebd258a15e2ebe70632b61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4d9f8c212a03166a0ebd258a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Oct 12 23:17:04 2015 +0200 wined3d: Fully initialize partially written varyings in SM3 shaders. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 5 ++--- dlls/wined3d/shader.c | 17 +++++++++++------ dlls/wined3d/wined3d_private.h | 32 ++++++++++++++++++-------------- 4 files changed, 32 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3dff527..3d65fe0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4317,7 +4317,7 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, const char *one = arb_get_helper_value(WINED3D_SHADER_TYPE_VERTEX, ARB_ONE); for(i = 0; i < MAX_REG_TEXCRD; i++) { - if (reg_maps->texcoord_mask[i] && reg_maps->texcoord_mask[i] != WINED3DSP_WRITEMASK_ALL) + if (reg_maps->u.texcoord_mask[i] && reg_maps->u.texcoord_mask[i] != WINED3DSP_WRITEMASK_ALL) shader_addline(buffer, "MOV result.texcoord[%u].w, %s\n", i, one); } } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 042cd03..9b5b6e8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4858,9 +4858,8 @@ static void handle_ps3_input(struct shader_glsl_priv *priv, continue; if (set[in_idx] == ~0u) - set[in_idx] = mask; - else - set[in_idx] |= mask; + set[in_idx] = 0; + set[in_idx] |= mask & reg_maps_out->u.output_registers_mask[output->register_idx]; shader_glsl_write_mask_to_str(mask, reg_mask); shader_addline(buffer, "%s%s = vs_out[%u]%s;\n", diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f7136a9..c3a842e 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -889,16 +889,15 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st shader_version.type, constf_size)) return WINED3DERR_INVALIDCALL; - /* WINED3DSPR_TEXCRDOUT is the same as WINED3DSPR_OUTPUT. _OUTPUT can be > MAX_REG_TEXCRD and - * is used in >= 3.0 shaders. Filter 3.0 shaders to prevent overflows, and also filter pixel - * shaders because TECRDOUT isn't used in them, but future register types might cause issues */ - if (shader_version.type == WINED3D_SHADER_TYPE_VERTEX && shader_version.major < 3) + if (shader_version.type == WINED3D_SHADER_TYPE_VERTEX) { UINT idx = ins.dst[i].reg.idx[0].offset; switch (ins.dst[i].reg.type) { case WINED3DSPR_RASTOUT: + if (shader_version.major >= 3) + break; switch (idx) { case 0: /* oPos */ @@ -922,6 +921,8 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st break; case WINED3DSPR_ATTROUT: + if (shader_version.major >= 3) + break; if (idx < 2) { idx += 8; @@ -939,8 +940,12 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st break; case WINED3DSPR_TEXCRDOUT: - - reg_maps->texcoord_mask[idx] |= ins.dst[i].write_mask; + if (shader_version.major >= 3) + { + reg_maps->u.output_registers_mask[idx] |= ins.dst[i].write_mask; + break; + } + reg_maps->u.texcoord_mask[idx] |= ins.dst[i].write_mask; if (reg_maps->output_registers & (1u << idx)) { output_signature_elements[idx].mask |= ins.dst[i].write_mask; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d75761e..70a8db8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -609,24 +609,28 @@ struct wined3d_shader_sampler_map struct wined3d_shader_reg_maps { struct wined3d_shader_version shader_version; - BYTE texcoord; /* MAX_REG_TEXCRD, 8 */ - BYTE address; /* MAX_REG_ADDR, 1 */ - WORD labels; /* MAX_LABELS, 16 */ - DWORD temporary; /* MAX_REG_TEMP, 32 */ - DWORD *constf; /* pixel, vertex */ - DWORD texcoord_mask[MAX_REG_TEXCRD]; /* vertex < 3.0 */ - DWORD input_registers; /* max(MAX_REG_INPUT, MAX_ATTRIBS), 32 */ - DWORD output_registers; /* MAX_REG_OUTPUT, 32 */ - WORD integer_constants; /* MAX_CONST_I, 16 */ - WORD boolean_constants; /* MAX_CONST_B, 16 */ - WORD local_int_consts; /* MAX_CONST_I, 16 */ - WORD local_bool_consts; /* MAX_CONST_B, 16 */ + BYTE texcoord; /* MAX_REG_TEXCRD, 8 */ + BYTE address; /* MAX_REG_ADDR, 1 */ + WORD labels; /* MAX_LABELS, 16 */ + DWORD temporary; /* MAX_REG_TEMP, 32 */ + DWORD *constf; /* pixel, vertex */ + union + { + DWORD texcoord_mask[MAX_REG_TEXCRD]; /* vertex < 3.0 */ + BYTE output_registers_mask[MAX_REG_OUTPUT]; /* vertex >= 3.0 */ + } u; + DWORD input_registers; /* max(MAX_REG_INPUT, MAX_ATTRIBS), 32 */ + DWORD output_registers; /* MAX_REG_OUTPUT, 32 */ + WORD integer_constants; /* MAX_CONST_I, 16 */ + WORD boolean_constants; /* MAX_CONST_B, 16 */ + WORD local_int_consts; /* MAX_CONST_I, 16 */ + WORD local_bool_consts; /* MAX_CONST_B, 16 */ UINT cb_sizes[WINED3D_MAX_CBS]; struct wined3d_shader_resource_info resource_info[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; struct wined3d_shader_sampler_map sampler_map; - BYTE bumpmat; /* MAX_TEXTURES, 8 */ - BYTE luminanceparams; /* MAX_TEXTURES, 8 */ + BYTE bumpmat; /* MAX_TEXTURES, 8 */ + BYTE luminanceparams; /* MAX_TEXTURES, 8 */ WORD usesnrm : 1; WORD vpos : 1;

1 0

Dmitry Timoshkov : mshtml: Handle memory allocation failure when creating IOleUndoManager.
by Alexandre Julliard Oct. 12, 2015

Oct. 12, 2015

Module: wine Branch: master Commit: e8b9bda53ac39c913ddc93de0308f0c8b69605fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8b9bda53ac39c913ddc93de0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 12 11:21:20 2015 +0800 mshtml: Handle memory allocation failure when creating IOleUndoManager. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/service.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/mshtml/service.c b/dlls/mshtml/service.c index 56744e6..8b2a6b7 100644 --- a/dlls/mshtml/service.c +++ b/dlls/mshtml/service.c @@ -197,6 +197,8 @@ static IOleUndoManager *create_undomgr(void) { UndoManager *ret = heap_alloc(sizeof(UndoManager)); + if (!ret) return NULL; + ret->IOleUndoManager_iface.lpVtbl = &OleUndoManagerVtbl; ret->ref = 1; @@ -246,6 +248,9 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG if(!This->doc_obj->undomgr) This->doc_obj->undomgr = create_undomgr(); + if (!This->doc_obj->undomgr) + return E_OUTOFMEMORY; + return IOleUndoManager_QueryInterface(This->doc_obj->undomgr, riid, ppv); }

1 0

Bruno Jesus : urlmon: Ignore unsupported flags for CoInternetSetFeatureEnabled.
by Alexandre Julliard Oct. 12, 2015

Oct. 12, 2015

Module: wine Branch: master Commit: 49bdb815bf60a7ac40160da60836be69d9c4beaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=49bdb815bf60a7ac40160da60… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Oct 11 18:32:30 2015 +0800 urlmon: Ignore unsupported flags for CoInternetSetFeatureEnabled. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/internet.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index e5d41b6..d7deccc 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -536,10 +536,8 @@ static HRESULT set_internet_feature(INTERNETFEATURELIST feature, DWORD flags, BO if(feature >= FEATURE_ENTRY_COUNT) return E_FAIL; - if(flags & ~supported_flags) { + if(flags & ~supported_flags) FIXME("Unsupported flags: %08x\n", flags & ~supported_flags); - return E_NOTIMPL; - } if(flags & SET_FEATURE_ON_PROCESS) set_feature_on_process(feature, enable);

1 0

Austin English : fltmgr.sys: Add a stub driver.
by Alexandre Julliard Oct. 12, 2015

Oct. 12, 2015

Module: wine Branch: master Commit: fba70e71d6b798991d07661c284f95608a5e448f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fba70e71d6b798991d07661c2… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Oct 11 12:05:07 2015 -0500 fltmgr.sys: Add a stub driver. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/fltmgr.sys/Makefile.in | 5 ++ dlls/fltmgr.sys/fltmgr.sys.spec | 163 ++++++++++++++++++++++++++++++++++++++++ dlls/fltmgr.sys/main.c | 38 ++++++++++ loader/wine.inf.in | 2 + 6 files changed, 211 insertions(+) diff --git a/configure b/configure index 872db31..80cc812 100755 --- a/configure +++ b/configure @@ -1085,6 +1085,7 @@ enable_explorerframe enable_ext_ms_win_gdi_devcaps_l1_1_0 enable_faultrep enable_fltlib +enable_fltmgr_sys enable_fntcache enable_fontsub enable_fusion @@ -17490,6 +17491,7 @@ wine_fn_config_dll ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l wine_fn_config_dll faultrep enable_faultrep implib wine_fn_config_test dlls/faultrep/tests faultrep_test wine_fn_config_dll fltlib enable_fltlib +wine_fn_config_dll fltmgr.sys enable_fltmgr_sys wine_fn_config_dll fntcache enable_fntcache wine_fn_config_dll fontsub enable_fontsub wine_fn_config_dll fusion enable_fusion diff --git a/configure.ac b/configure.ac index e22b0ef..de8cde5 100644 --- a/configure.ac +++ b/configure.ac @@ -3002,6 +3002,7 @@ WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0) WINE_CONFIG_DLL(faultrep,,[implib]) WINE_CONFIG_TEST(dlls/faultrep/tests) WINE_CONFIG_DLL(fltlib) +WINE_CONFIG_DLL(fltmgr.sys) WINE_CONFIG_DLL(fntcache) WINE_CONFIG_DLL(fontsub) WINE_CONFIG_DLL(fusion) diff --git a/dlls/fltmgr.sys/Makefile.in b/dlls/fltmgr.sys/Makefile.in new file mode 100644 index 0000000..3fefde7 --- /dev/null +++ b/dlls/fltmgr.sys/Makefile.in @@ -0,0 +1,5 @@ +MODULE = fltmgr.sys +EXTRADLLFLAGS = -Wb,--subsystem,native + +C_SRCS = \ + main.c diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec new file mode 100644 index 0000000..5310269 --- /dev/null +++ b/dlls/fltmgr.sys/fltmgr.sys.spec @@ -0,0 +1,163 @@ +@ stub FltAcquirePushLockExclusive +@ stub FltAcquirePushLockShared +@ stub FltAcquireResourceExclusive +@ stub FltAcquireResourceShared +@ stub FltAllocateCallbackData +@ stub FltAllocateContext +@ stub FltAllocateDeferredIoWorkItem +@ stub FltAllocateFileLock +@ stub FltAllocateGenericWorkItem +@ stub FltAllocatePoolAlignedWithTag +@ stub FltAttachVolume +@ stub FltAttachVolumeAtAltitude +@ stub FltBuildDefaultSecurityDescriptor +@ stub FltCancelFileOpen +@ stub FltCancelIo +@ stub FltCbdqDisable +@ stub FltCbdqEnable +@ stub FltCbdqInitialize +@ stub FltCbdqInsertIo +@ stub FltCbdqRemoveIo +@ stub FltCbdqRemoveNextIo +@ stub FltCheckAndGrowNameControl +@ stub FltCheckLockForReadAccess +@ stub FltCheckLockForWriteAccess +@ stub FltCheckOplock +@ stub FltClearCallbackDataDirty +@ stub FltClearCancelCompletion +@ stub FltClose +@ stub FltCloseClientPort +@ stub FltCloseCommunicationPort +@ stub FltCompareInstanceAltitudes +@ stub FltCompletePendedPostOperation +@ stub FltCompletePendedPreOperation +@ stub FltCreateCommunicationPort +@ stub FltCreateFile +@ stub FltCreateFileEx +@ stub FltCreateSystemVolumeInformationFolder +@ stub FltCurrentBatchOplock +@ stub FltDecodeParameters +@ stub FltDeleteContext +@ stub FltDeleteFileContext +@ stub FltDeleteInstanceContext +@ stub FltDeletePushLock +@ stub FltDeleteStreamContext +@ stub FltDeleteStreamHandleContext +@ stub FltDeleteVolumeContext +@ stub FltDetachVolume +@ stub FltDeviceIoControlFile +@ stub FltDoCompletionProcessingWhenSafe +@ stub FltEnumerateFilterInformation +@ stub FltEnumerateFilters +@ stub FltEnumerateInstanceInformationByFilter +@ stub FltEnumerateInstanceInformationByVolume +@ stub FltEnumerateInstances +@ stub FltEnumerateVolumeInformation +@ stub FltEnumerateVolumes +@ stub FltFlushBuffers +@ stub FltFreeCallbackData +@ stub FltFreeDeferredIoWorkItem +@ stub FltFreeFileLock +@ stub FltFreeGenericWorkItem +@ stub FltFreePoolAlignedWithTag +@ stub FltFreeSecurityDescriptor +@ stub FltFsControlFile +@ stub FltGetBottomInstance +@ stub FltGetContexts +@ stub FltGetDestinationFileNameInformation +@ stub FltGetDeviceObject +@ stub FltGetDiskDeviceObject +@ stub FltGetFileContext +@ stub FltGetFileNameInformation +@ stub FltGetFileNameInformationUnsafe +@ stub FltGetFilterFromInstance +@ stub FltGetFilterFromName +@ stub FltGetFilterInformation +@ stub FltGetInstanceContext +@ stub FltGetInstanceInformation +@ stub FltGetIrpName +@ stub FltGetLowerInstance +@ stub FltGetRequestorProcess +@ stub FltGetRequestorProcessId +@ stub FltGetRoutineAddress +@ stub FltGetStreamContext +@ stub FltGetStreamHandleContext +@ stub FltGetSwappedBufferMdlAddress +@ stub FltGetTopInstance +@ stub FltGetTunneledName +@ stub FltGetUpperInstance +@ stub FltGetVolumeContext +@ stub FltGetVolumeFromDeviceObject +@ stub FltGetVolumeFromFileObject +@ stub FltGetVolumeFromInstance +@ stub FltGetVolumeFromName +@ stub FltGetVolumeGuidName +@ stub FltGetVolumeInstanceFromName +@ stub FltGetVolumeName +@ stub FltGetVolumeProperties +@ stub FltInitializeFileLock +@ stub FltInitializeOplock +@ stub FltInitializePushLock +@ stub FltIs32bitProcess +@ stub FltIsCallbackDataDirty +@ stub FltIsDirectory +@ stub FltIsIoCanceled +@ stub FltIsOperationSynchronous +@ stub FltIsVolumeWritable +@ stub FltLoadFilter +@ stub FltLockUserBuffer +@ stub FltNotifyFilterChangeDirectory +@ stub FltObjectDereference +@ stub FltObjectReference +@ stub FltOpenVolume +@ stub FltOplockFsctrl +@ stub FltOplockIsFastIoPossible +@ stub FltParseFileName +@ stub FltParseFileNameInformation +@ stub FltPerformAsynchronousIo +@ stub FltPerformSynchronousIo +@ stub FltProcessFileLock +@ stub FltPurgeFileNameInformationCache +@ stub FltQueryEaFile +@ stub FltQueryInformationFile +@ stub FltQuerySecurityObject +@ stub FltQueryVolumeInformation +@ stub FltQueryVolumeInformationFile +@ stub FltQueueDeferredIoWorkItem +@ stub FltQueueGenericWorkItem +@ stub FltReadFile +@ stub FltReferenceContext +@ stub FltReferenceFileNameInformation +@ stub FltRegisterFilter +@ stub FltReissueSynchronousIo +@ stub FltReleaseContext +@ stub FltReleaseContexts +@ stub FltReleaseFileNameInformation +@ stub FltReleasePushLock +@ stub FltReleaseResource +@ stub FltRequestOperationStatusCallback +@ stub FltRetainSwappedBufferMdlAddress +@ stub FltReuseCallbackData +@ stub FltSendMessage +@ stub FltSetCallbackDataDirty +@ stub FltSetCancelCompletion +@ stub FltSetEaFile +@ stub FltSetFileContext +@ stub FltSetInformationFile +@ stub FltSetInstanceContext +@ stub FltSetSecurityObject +@ stub FltSetStreamContext +@ stub FltSetStreamHandleContext +@ stub FltSetVolumeContext +@ stub FltSetVolumeInformation +@ stub FltStartFiltering +@ stub FltSupportsFileContexts +@ stub FltSupportsStreamContexts +@ stub FltSupportsStreamHandleContexts +@ stub FltTagFile +@ stub FltUninitializeFileLock +@ stub FltUninitializeOplock +@ stub FltUnloadFilter +@ stub FltUnregisterFilter +@ stub FltUntagFile +@ stub FltWriteFile diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c new file mode 100644 index 0000000..7341ef2 --- /dev/null +++ b/dlls/fltmgr.sys/main.c @@ -0,0 +1,38 @@ +/* + * fltmgr.sys + * + * Copyright 2015 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "ddk/wdm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(fltmgr); + +NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) +{ + TRACE( "(%p, %s)\n", driver, debugstr_w(path->Buffer) ); + + return STATUS_SUCCESS; +} diff --git a/loader/wine.inf.in b/loader/wine.inf.in index f30942a..3e512d6 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2499,6 +2499,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,syswow64,stdole2.tlb 11,,iexplore.exe 11,,winetest.exe,- +12,,fltmgr.sys,- 12,,mountmgr.sys,- 12,,ndis.sys,- ; skip .NET fake dlls in Wine Mono package @@ -2537,6 +2538,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,iexplore.exe 11,,notepad.exe 11,,winetest.exe,- +12,,fltmgr.sys 12,,mountmgr.sys 12,,ndis.sys ; skip .NET fake dlls in Wine Mono package

1 0

Bruno Jesus : ws2_32/tests: Add WSAEnumNameSpaceProviders[A|W] tests.
by Alexandre Julliard Oct. 12, 2015

Oct. 12, 2015

Module: wine Branch: master Commit: ad2405daa408e50a2d23e9af58503f40d91fbb94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad2405daa408e50a2d23e9af5… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Oct 11 19:07:17 2015 +0800 ws2_32/tests: Add WSAEnumNameSpaceProviders[A|W] tests. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 160 +++++++++++++++++++++++++++++++++++++++++++++++ include/winsock2.h | 27 ++++++++ 2 files changed, 187 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index a8ee3ce..7fbd67d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -72,6 +72,8 @@ static int (WINAPI *pInetPtonW)(INT,LPWSTR,LPVOID); static int (WINAPI *pWSALookupServiceBeginW)(LPWSAQUERYSETW,DWORD,LPHANDLE); static int (WINAPI *pWSALookupServiceEnd)(HANDLE); static int (WINAPI *pWSALookupServiceNextW)(HANDLE,DWORD,LPDWORD,LPWSAQUERYSETW); +static int (WINAPI *pWSAEnumNameSpaceProvidersA)(LPDWORD,LPWSANAMESPACE_INFOA); +static int (WINAPI *pWSAEnumNameSpaceProvidersW)(LPDWORD,LPWSANAMESPACE_INFOW); /**************** Structs and typedefs ***************/ @@ -1165,6 +1167,8 @@ static void Init (void) pWSALookupServiceBeginW = (void *)GetProcAddress(hws2_32, "WSALookupServiceBeginW"); pWSALookupServiceEnd = (void *)GetProcAddress(hws2_32, "WSALookupServiceEnd"); pWSALookupServiceNextW = (void *)GetProcAddress(hws2_32, "WSALookupServiceNextW"); + pWSAEnumNameSpaceProvidersA = (void *)GetProcAddress(hws2_32, "WSAEnumNameSpaceProvidersA"); + pWSAEnumNameSpaceProvidersW = (void *)GetProcAddress(hws2_32, "WSAEnumNameSpaceProvidersW"); ok ( WSAStartup ( ver, &data ) == 0, "WSAStartup failed\n" ); tls = TlsAlloc(); @@ -8834,6 +8838,160 @@ todo_wine ok(!ret, "WSALookupServiceEnd failed unexpectedly\n"); } +static void test_WSAEnumNameSpaceProvidersA(void) +{ + LPWSANAMESPACE_INFOA name = NULL; + DWORD ret, error, blen = 0, i; + if (!pWSAEnumNameSpaceProvidersA) + { + win_skip("WSAEnumNameSpaceProvidersA not found\n"); + return; + } + + SetLastError(0xdeadbeef); + ret = pWSAEnumNameSpaceProvidersA(&blen, name); + error = WSAGetLastError(); +todo_wine + ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); +todo_wine + ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); + + /* Invalid parameter tests */ + SetLastError(0xdeadbeef); + ret = pWSAEnumNameSpaceProvidersA(NULL, name); + error = WSAGetLastError(); +todo_wine + ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); +todo_wine + ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); + + SetLastError(0xdeadbeef); + ret = pWSAEnumNameSpaceProvidersA(NULL, NULL); + error = WSAGetLastError(); +todo_wine + ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); +todo_wine + ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); + + SetLastError(0xdeadbeef); + ret = pWSAEnumNameSpaceProvidersA(&blen, NULL); + error = WSAGetLastError(); +todo_wine + ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); +todo_wine + ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); + + name = HeapAlloc(GetProcessHeap(), 0, blen); + if (!name) + { + skip("Failed to alloc memory\n"); + return; + } + + ret = pWSAEnumNameSpaceProvidersA(&blen, name); +todo_wine + ok(ret > 0, "Expected more than zero name space providers\n"); + + for (i = 0;i < ret; i++) + { + trace("Name space Identifier (%p): %s\n", name[i].lpszIdentifier, + name[i].lpszIdentifier); + switch (name[i].dwNameSpace) + { + case NS_DNS: + trace("\tName space ID: NS_DNS (%u)\n", name[i].dwNameSpace); + break; + case NS_NLA: + trace("\tName space ID: NS_NLA (%u)\n", name[i].dwNameSpace); + break; + default: + trace("\tName space ID: Unknown (%u)\n", name[i].dwNameSpace); + break; + } + trace("\tActive: %d\n", name[i].fActive); + trace("\tVersion: %d\n", name[i].dwVersion); + } + + HeapFree(GetProcessHeap(), 0, name); +} + +static void test_WSAEnumNameSpaceProvidersW(void) +{ + LPWSANAMESPACE_INFOW name = NULL; + DWORD ret, error, blen = 0, i; + if (!pWSAEnumNameSpaceProvidersW) + { + win_skip("WSAEnumNameSpaceProvidersW not found\n"); + return; + } + + SetLastError(0xdeadbeef); + ret = pWSAEnumNameSpaceProvidersW(&blen, name); + error = WSAGetLastError(); +todo_wine + ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); +todo_wine + ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); + + /* Invalid parameter tests */ + SetLastError(0xdeadbeef); + ret = pWSAEnumNameSpaceProvidersW(NULL, name); + error = WSAGetLastError(); +todo_wine + ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); +todo_wine + ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); + + SetLastError(0xdeadbeef); + ret = pWSAEnumNameSpaceProvidersW(NULL, NULL); + error = WSAGetLastError(); +todo_wine + ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); +todo_wine + ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); + + SetLastError(0xdeadbeef); + ret = pWSAEnumNameSpaceProvidersW(&blen, NULL); + error = WSAGetLastError(); +todo_wine + ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); +todo_wine + ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); + + name = HeapAlloc(GetProcessHeap(), 0, blen); + if (!name) + { + skip("Failed to alloc memory\n"); + return; + } + + ret = pWSAEnumNameSpaceProvidersW(&blen, name); +todo_wine + ok(ret > 0, "Expected more than zero name space providers\n"); + + for (i = 0;i < ret; i++) + { + trace("Name space Identifier (%p): %s\n", name[i].lpszIdentifier, + wine_dbgstr_w(name[i].lpszIdentifier)); + switch (name[i].dwNameSpace) + { + case NS_DNS: + trace("\tName space ID: NS_DNS (%u)\n", name[i].dwNameSpace); + break; + case NS_NLA: + trace("\tName space ID: NS_NLA (%u)\n", name[i].dwNameSpace); + break; + default: + trace("\tName space ID: Unknown (%u)\n", name[i].dwNameSpace); + break; + } + trace("\tActive: %d\n", name[i].fActive); + trace("\tVersion: %d\n", name[i].dwVersion); + } + + HeapFree(GetProcessHeap(), 0, name); +} + /**************** Main program ***************/ START_TEST( sock ) @@ -8905,6 +9063,8 @@ START_TEST( sock ) test_sioAddressListChange(); test_WSALookupService(); + test_WSAEnumNameSpaceProvidersA(); + test_WSAEnumNameSpaceProvidersW(); test_WSAAsyncGetServByPort(); test_WSAAsyncGetServByName(); diff --git a/include/winsock2.h b/include/winsock2.h index fa3d26b..d871a23 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -211,6 +211,33 @@ extern "C" { #define LUP_RETURN_ALL (LUP_RETURN_ADDR|LUP_RETURN_BLOB|LUP_RETURN_ALIASES|LUP_RETURN_QUERY_STRING \ |LUP_RETURN_NAME|LUP_RETURN_TYPE|LUP_RETURN_VERSION|LUP_RETURN_COMMENT) +/* Constants for dwNameSpace from struct WSANAMESPACE_INFO */ +#define NS_ALL 0 +#define NS_SAP 1 +#define NS_NDS 2 +#define NS_PEER_BROWSE 3 +#define NS_SLP 5 +#define NS_DHCP 6 +#define NS_TCPIP_LOCAL 10 +#define NS_TCPIP_HOSTS 11 +#define NS_DNS 12 +#define NS_NETBT 13 +#define NS_WINS 14 +#define NS_NLA 15 +#define NS_BTH 16 +#define NS_NBP 20 +#define NS_MS 30 +#define NS_STDA 31 +#define NS_NTDS 32 +#define NS_EMAIL 37 +#define NS_PNRPNAME 38 +#define NS_PNRPCLOUD 39 +#define NS_X500 40 +#define NS_NIS 41 +#define NS_NISPLUS 42 +#define NS_WRQ 50 +#define NS_NETDES 60 + #ifndef GUID_DEFINED #include <guiddef.h> #endif

1 0

Sebastian Lackner : gdi32: Use RtlIsCriticalSectionLockedByThread to check lock owner.
by Alexandre Julliard Oct. 12, 2015

Oct. 12, 2015

Module: wine Branch: master Commit: 04bd68409afc4751dd9956247327c20062420fb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04bd68409afc4751dd9956247… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Oct 10 05:40:07 2015 +0200 gdi32: Use RtlIsCriticalSectionLockedByThread to check lock owner. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdiobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index a255a4c..e861f24 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -867,7 +867,7 @@ void GDI_ReleaseObj( HGDIOBJ handle ) */ void GDI_CheckNotLock(void) { - if (gdi_section.OwningThread == ULongToHandle(GetCurrentThreadId()) && gdi_section.RecursionCount) + if (RtlIsCriticalSectionLockedByThread(&gdi_section)) { ERR( "BUG: holding GDI lock\n" ); DebugBreak();

1 0

Qian Hong : dbghelp: Parse DW_TAG_const_type inside dwarf2_parse_subprogram_block.
by Alexandre Julliard Oct. 12, 2015

Oct. 12, 2015

Module: wine Branch: master Commit: 62d6a0908576c4a954060cb957cf0024e0750de9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62d6a0908576c4a954060cb95… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Oct 9 19:59:38 2015 +0800 dbghelp: Parse DW_TAG_const_type inside dwarf2_parse_subprogram_block. Signed-off-by: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 9e0c7d1..4c093a3 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1843,6 +1843,9 @@ static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, case DW_TAG_subroutine_type: dwarf2_parse_subroutine_type(subpgm->ctx, di); break; + case DW_TAG_const_type: + dwarf2_parse_const_type(subpgm->ctx, di); + break; case DW_TAG_lexical_block: dwarf2_parse_subprogram_block(subpgm, block, child); break;

1 0