July 2016 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : hnetcfg: Add stubbed INetFwPolicy2 interface.
by Alexandre Julliard July 26, 2016

July 26, 2016

Module: wine Branch: master Commit: 1abf294e1d7ae8001434005aaea5002172d78a68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1abf294e1d7ae8001434005aa… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 22 07:47:13 2016 +0000 hnetcfg: Add stubbed INetFwPolicy2 interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/apps.c | 1 + dlls/hnetcfg/hnetcfg.c | 5 + dlls/hnetcfg/hnetcfg.idl | 8 + dlls/hnetcfg/hnetcfg_private.h | 2 + dlls/hnetcfg/policy.c | 331 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 347 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1abf294e1d7ae80014340…

1 0

Jactry Zeng : shell32: Use remove() instead of rmdir().
by Alexandre Julliard July 26, 2016

July 26, 2016

Module: wine Branch: master Commit: dad2223ad6df1ed8aa358f7a4ee6f6438a5abe91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dad2223ad6df1ed8aa358f7a4… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Jul 22 15:40:55 2016 +0800 shell32: Use remove() instead of rmdir(). rmdir() will fail when target is a symbolic link. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index cb79d6f..2072814 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4318,7 +4318,7 @@ static void _SHCreateSymbolicLinks(void) } /* Replace 'My Documents' directory with a symlink or fail silently if not empty. */ - rmdir(pszPersonal); + remove(pszPersonal); symlink(szPersonalTarget, pszPersonal); } else @@ -4374,7 +4374,7 @@ static void _SHCreateSymbolicLinks(void) strcpy(szMyStuffTarget, szPersonalTarget); break; } - rmdir(pszMyStuff); + remove(pszMyStuff); symlink(szMyStuffTarget, pszMyStuff); HeapFree(GetProcessHeap(), 0, pszMyStuff); } @@ -4395,7 +4395,7 @@ static void _SHCreateSymbolicLinks(void) SHGFP_TYPE_DEFAULT, wszTempPath); if (SUCCEEDED(hr) && (pszDesktop = wine_get_unix_file_name(wszTempPath))) { - rmdir(pszDesktop); + remove(pszDesktop); if (xdg_desktop_dir) symlink(xdg_desktop_dir, pszDesktop); else

1 0

Alistair Leslie-Hughes : include/icftypes.idl: Add more typedefs.
by Alexandre Julliard July 26, 2016

July 26, 2016

Module: wine Branch: master Commit: 77a0623a37e7887b4cf777ad503f2777350a6c04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77a0623a37e7887b4cf777ad5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 22 07:46:44 2016 +0000 include/icftypes.idl: Add more typedefs. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/icftypes.idl | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/icftypes.idl b/include/icftypes.idl index 9cc0b6a..4b44fde 100644 --- a/include/icftypes.idl +++ b/include/icftypes.idl @@ -29,6 +29,14 @@ typedef enum NET_FW_PROFILE_TYPE_ NET_FW_PROFILE_TYPE_MAX } NET_FW_PROFILE_TYPE; +typedef enum NET_FW_PROFILE_TYPE2_ +{ + NET_FW_PROFILE2_DOMAIN = 0x0001, + NET_FW_PROFILE2_PRIVATE = 0x0002, + NET_FW_PROFILE2_PUBLIC = 0x0004, + NET_FW_PROFILE2_ALL = 0x7FFFFFFF +} NET_FW_PROFILE_TYPE2; + typedef enum NET_FW_IP_VERSION_ { NET_FW_IP_VERSION_V4, @@ -67,3 +75,24 @@ typedef enum NET_FW_IP_PROTOCOL_ NET_FW_IP_PROTOCOL_TCP = 6, NET_FW_IP_PROTOCOL_UDP = 17 } NET_FW_IP_PROTOCOL; + +typedef enum NET_FW_RULE_DIRECTION_ +{ + NET_FW_RULE_DIR_IN = 1, + NET_FW_RULE_DIR_OUT, + NET_FW_RULE_DIR_MAX +} NET_FW_RULE_DIRECTION; + +typedef enum NET_FW_ACTION_ +{ + NET_FW_ACTION_BLOCK, + NET_FW_ACTION_ALLOW, + NET_FW_ACTION_MAX +} NET_FW_ACTION; + +typedef enum NET_FW_MODIFY_STATE_ +{ + NET_FW_MODIFY_STATE_OK, + NET_FW_MODIFY_STATE_GP_OVERRIDE, + NET_FW_MODIFY_STATE_INBOUND_BLOCKED +} NET_FW_MODIFY_STATE;

1 0

Alexandre Julliard : ntdll: Implement the SectionImageInformation class of NtQuerySection.
by Alexandre Julliard July 26, 2016

July 26, 2016

Module: wine Branch: master Commit: 6f0979b9830a303f41ac953013d2805f4b63eccd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f0979b9830a303f41ac95301… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 26 19:38:50 2016 +0900 ntdll: Implement the SectionImageInformation class of NtQuerySection. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 67 +++++++++++++++++++++++++++++++++++++ dlls/kernel32/tests/virtual.c | 11 ++++++ dlls/ntdll/virtual.c | 62 ++++++++++++++++++++++++++-------- include/wine/server_protocol.h | 29 +++++++++++++--- server/mapping.c | 76 +++++++++++++++++++++++++++--------------- server/protocol.def | 26 +++++++++++++-- server/request.h | 8 ++--- server/trace.c | 24 +++++++++++-- 8 files changed, 249 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f0979b9830a303f41ac9…

1 0

Andrey Gusev : cabinet: Use debugstr_a() in TRACE() message.
by Alexandre Julliard July 26, 2016

July 26, 2016

Module: wine Branch: master Commit: c622b461bbb83a196713f7df113fd9b61387c8ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=c622b461bbb83a196713f7df1… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jul 25 11:47:15 2016 +0300 cabinet: Use debugstr_a() in TRACE() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cabinet/cabinet_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index ef6698d..5a1ae06 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -333,7 +333,7 @@ HRESULT WINAPI Extract(SESSION *dest, LPCSTR szCabName) HFDI hfdi; char *str, *end, *path = NULL, *name = NULL; - TRACE("(%p, %s)\n", dest, szCabName); + TRACE("(%p, %s)\n", dest, debugstr_a(szCabName)); hfdi = FDICreate(mem_alloc, mem_free,

1 0

Nikolay Sivov : comctl32/treeview: Set hot item when hovering over item, not entire row.
by Alexandre Julliard July 26, 2016

July 26, 2016

Module: wine Branch: master Commit: d73d6b209353dbb2f6e2e2880c18f6eaf4a137f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d73d6b209353dbb2f6e2e2880… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 25 23:03:19 2016 +0300 comctl32/treeview: Set hot item when hovering over item, not entire row. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index ae17413..a703ae7 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3635,7 +3635,7 @@ TREEVIEW_HitTestPoint(const TREEVIEW_INFO *infoPtr, POINT pt) return item; } -static LRESULT +static TREEVIEW_ITEM * TREEVIEW_HitTest(const TREEVIEW_INFO *infoPtr, LPTVHITTESTINFO lpht) { TREEVIEW_ITEM *item; @@ -3670,14 +3670,14 @@ TREEVIEW_HitTest(const TREEVIEW_INFO *infoPtr, LPTVHITTESTINFO lpht) if (status) { lpht->flags = status; - return 0; + return NULL; } item = TREEVIEW_HitTestPoint(infoPtr, lpht->pt); if (!item) { lpht->flags = TVHT_NOWHERE; - return 0; + return NULL; } if (x >= item->textOffset + item->textWidth) @@ -3708,7 +3708,7 @@ TREEVIEW_HitTest(const TREEVIEW_INFO *infoPtr, LPTVHITTESTINFO lpht) lpht->hItem = item; TRACE("(%d,%d):result 0x%x\n", lpht->pt.x, lpht->pt.y, lpht->flags); - return (LRESULT)item; + return item; } /* Item Label Editing ***************************************************/ @@ -4131,7 +4131,7 @@ TREEVIEW_LButtonDoubleClick(TREEVIEW_INFO *infoPtr, LPARAM lParam) hit.pt.x = (short)LOWORD(lParam); hit.pt.y = (short)HIWORD(lParam); - item = (TREEVIEW_ITEM *)TREEVIEW_HitTest(infoPtr, &hit); + item = TREEVIEW_HitTest(infoPtr, &hit); if (!item) return 0; TRACE("item %d\n", TREEVIEW_GetItemIndex(infoPtr, item)); @@ -5331,9 +5331,9 @@ TREEVIEW_MouseLeave (TREEVIEW_INFO * infoPtr) static LRESULT TREEVIEW_MouseMove (TREEVIEW_INFO * infoPtr, LPARAM lParam) { - POINT pt; TRACKMOUSEEVENT trackinfo; TREEVIEW_ITEM * item; + TVHITTESTINFO ht; if (!(infoPtr->dwStyle & TVS_TRACKSELECT)) return 0; @@ -5358,18 +5358,21 @@ TREEVIEW_MouseMove (TREEVIEW_INFO * infoPtr, LPARAM lParam) _TrackMouseEvent(&trackinfo); } - pt.x = (short)LOWORD(lParam); - pt.y = (short)HIWORD(lParam); - - item = TREEVIEW_HitTestPoint(infoPtr, pt); + ht.pt.x = (short)LOWORD(lParam); + ht.pt.y = (short)HIWORD(lParam); - if (item != infoPtr->hotItem) + item = TREEVIEW_HitTest(infoPtr, &ht); + if ((item != infoPtr->hotItem) || !(ht.flags & TVHT_ONITEM)) { /* redraw old hot item */ TREEVIEW_InvalidateItem(infoPtr, infoPtr->hotItem); - infoPtr->hotItem = item; - /* redraw new hot item */ - TREEVIEW_InvalidateItem(infoPtr, infoPtr->hotItem); + infoPtr->hotItem = NULL; + if (item && (ht.flags & TVHT_ONITEM)) + { + infoPtr->hotItem = item; + /* redraw new hot item */ + TREEVIEW_InvalidateItem(infoPtr, infoPtr->hotItem); + } } return 0; @@ -5508,14 +5511,14 @@ TREEVIEW_StyleChanged(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) static LRESULT TREEVIEW_SetCursor(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { - POINT pt; TREEVIEW_ITEM * item; + TVHITTESTINFO ht; NMMOUSE nmmouse; - GetCursorPos(&pt); - ScreenToClient(infoPtr->hwnd, &pt); + GetCursorPos(&ht.pt); + ScreenToClient(infoPtr->hwnd, &ht.pt); - item = TREEVIEW_HitTestPoint(infoPtr, pt); + item = TREEVIEW_HitTest(infoPtr, &ht); memset(&nmmouse, 0, sizeof(nmmouse)); if (item) @@ -5529,7 +5532,7 @@ TREEVIEW_SetCursor(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) if (TREEVIEW_SendRealNotify(infoPtr, NM_SETCURSOR, &nmmouse.hdr)) return 0; - if (item && (infoPtr->dwStyle & TVS_TRACKSELECT)) + if (item && (infoPtr->dwStyle & TVS_TRACKSELECT) && (ht.flags & TVHT_ONITEM)) { SetCursor(infoPtr->hcurHand); return 0; @@ -5673,7 +5676,7 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TREEVIEW_GetVisibleCount(infoPtr); case TVM_HITTEST: - return TREEVIEW_HitTest(infoPtr, (LPTVHITTESTINFO)lParam); + return (LRESULT)TREEVIEW_HitTest(infoPtr, (TVHITTESTINFO*)lParam); case TVM_INSERTITEMA: case TVM_INSERTITEMW:

1 0

Andrew Eikum : winepulse.drv: Downgrade failed server connection message to WARN.
by Alexandre Julliard July 26, 2016

July 26, 2016

Module: wine Branch: master Commit: 87754283becca7aef8f90af1d584d47ad25d8324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87754283becca7aef8f90af1d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jul 25 13:00:14 2016 -0500 winepulse.drv: Downgrade failed server connection message to WARN. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 5bf534e..32db0d1 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -304,7 +304,7 @@ static void pulse_contextcallback(pa_context *c, void *userdata) break; case PA_CONTEXT_FAILED: - ERR("Context failed: %s\n", pa_strerror(pa_context_errno(c))); + WARN("Context failed: %s\n", pa_strerror(pa_context_errno(c))); break; } pthread_cond_signal(&pulse_cond);

1 0

Andrey Gusev : include: Improve include directives in d3dx9* headers.
by Alexandre Julliard July 26, 2016

July 26, 2016

Module: wine Branch: master Commit: 066330d4938a15765290b33214599520481cb976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=066330d4938a15765290b3321… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jul 22 16:36:24 2016 +0300 include: Improve include directives in d3dx9* headers. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dx9core.h | 2 +- include/d3dx9effect.h | 2 +- include/d3dx9math.h | 4 ++-- include/d3dx9mesh.h | 2 +- include/d3dx9tex.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/d3dx9core.h b/include/d3dx9core.h index 5233317..a04bced 100644 --- a/include/d3dx9core.h +++ b/include/d3dx9core.h @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <d3dx9.h> +#include "d3dx9.h" #ifndef __WINE_D3DX9CORE_H #define __WINE_D3DX9CORE_H diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index 3f527ed..8235794 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <d3dx9.h> +#include "d3dx9.h" #ifndef __D3DX9EFFECT_H__ #define __D3DX9EFFECT_H__ diff --git a/include/d3dx9math.h b/include/d3dx9math.h index 2c41b73..bf03ca3 100644 --- a/include/d3dx9math.h +++ b/include/d3dx9math.h @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <d3dx9.h> +#include "d3dx9.h" #ifndef __D3DX9MATH_H__ #define __D3DX9MATH_H__ @@ -469,6 +469,6 @@ HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, ID3DXMatrixStack **stack); } #endif -#include <d3dx9math.inl> +#include "d3dx9math.inl" #endif /* __D3DX9MATH_H__ */ diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 47b0a3f..c9a2fd5 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <d3dx9.h> +#include "d3dx9.h" #ifndef __WINE_D3DX9MESH_H #define __WINE_D3DX9MESH_H diff --git a/include/d3dx9tex.h b/include/d3dx9tex.h index 77f2d35..3883165 100644 --- a/include/d3dx9tex.h +++ b/include/d3dx9tex.h @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <d3dx9.h> +#include "d3dx9.h" #ifndef __WINE_D3DX9TEX_H #define __WINE_D3DX9TEX_H

1 0

Christian Costa : d3dx9: Implement D3DXCreateTextureShader with stubbed ID3DXTextureShader interface.
by Alexandre Julliard July 26, 2016

July 26, 2016

Module: wine Branch: master Commit: 8e80ee68370c2acf3e7ce1a2f123278595512888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e80ee68370c2acf3e7ce1a2f… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Jul 21 09:06:29 2016 +0000 d3dx9: Implement D3DXCreateTextureShader with stubbed ID3DXTextureShader interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/shader.c | 267 ++++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- 21 files changed, 287 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e80ee68370c2acf3e7ce…

1 0

Alexandre Julliard : server: Store the section flags separately from the protection.
by Alexandre Julliard July 26, 2016

July 26, 2016

Module: wine Branch: master Commit: 1ddc63605110295251d83b595cca58fb5ad864a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ddc63605110295251d83b595… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 26 14:20:02 2016 +0900 server: Store the section flags separately from the protection. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 20 +++++++++----------- include/wine/server_protocol.h | 8 +++++--- include/winnt.h | 3 +++ server/mapping.c | 42 +++++++++++++++++++++++------------------- server/protocol.def | 4 +++- server/request.h | 14 ++++++++------ server/trace.c | 4 +++- 7 files changed, 54 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ddc63605110295251d83…

1 0