September 2013 - Wine-Commits

Frédéric Delanoy : winedbg: Fix winedbg --help message formatting.
by Alexandre Julliard Sept. 2, 2013

Sept. 2, 2013

Module: wine Branch: master Commit: 77462fc68dba49b06bfbc70473b69a8ef465724a URL: http://source.winehq.org/git/wine.git/?a=commit;h=77462fc68dba49b06bfbc7047… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Sep 2 11:09:02 2013 +0200 winedbg: Fix winedbg --help message formatting. --- programs/winedbg/winedbg.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index bf1234c..11782fe 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -566,20 +566,20 @@ static int dbg_winedbg_usage(BOOL advanced) if (advanced) { dbg_printf("Usage:\n" - " winedbg cmdline launch process 'cmdline' (as if you were starting\n" + " winedbg <cmdline> launch process <cmdline> (as if you were starting\n" " it with wine) and run WineDbg on it\n" " winedbg <num> attach to running process of wpid <num> and run\n" " WineDbg on it\n" - " winedbg --gdb cmdline launch process 'cmdline' (as if you were starting\n" + " winedbg --gdb <cmdline> launch process <cmdline> (as if you were starting\n" " wine) and run gdb (proxied) on it\n" " winedbg --gdb <num> attach to running process of wpid <num> and run\n" " gdb (proxied) on it\n" - " winedbg file.mdmp reload the minidump file.mdmp into memory and run\n" + " winedbg <file.mdmp> reload the minidump <file.mdmp> into memory and run\n" " WineDbg on it\n" " winedbg --help prints advanced options\n"); } else - dbg_printf("Usage:\n\twinedbg [ [ --gdb ] [ prog-name [ prog-args ] | <num> | file.mdmp | --help ]\n"); + dbg_printf("Usage:\n\twinedbg [ [ --gdb ] [ <prog-name> [ <prog-args> ] | <num> | <file.mdmp> | --help ]\n"); return 0; }

1 0

Bruno Jesus : server: Add a request to get socket information.
by Alexandre Julliard Sept. 2, 2013

Sept. 2, 2013

Module: wine Branch: master Commit: ec49a574deb154b324ec69e0f31c297b148a9acc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec49a574deb154b324ec69e0f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Aug 31 00:14:47 2013 -0300 server: Add a request to get socket information. --- include/wine/server_protocol.h | 21 ++++++++++++++++++++- server/protocol.def | 10 ++++++++++ server/request.h | 8 ++++++++ server/sock.c | 14 ++++++++++++++ server/trace.c | 15 +++++++++++++++ 5 files changed, 67 insertions(+), 1 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 086aca9..4919579 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1529,6 +1529,22 @@ struct get_socket_event_reply +struct get_socket_info_request +{ + struct request_header __header; + obj_handle_t handle; +}; +struct get_socket_info_reply +{ + struct reply_header __header; + int family; + int type; + int protocol; + char __pad_20[4]; +}; + + + struct enable_socket_event_request { struct request_header __header; @@ -5082,6 +5098,7 @@ enum request REQ_accept_into_socket, REQ_set_socket_event, REQ_get_socket_event, + REQ_get_socket_info, REQ_enable_socket_event, REQ_set_socket_deferred, REQ_alloc_console, @@ -5341,6 +5358,7 @@ union generic_request struct accept_into_socket_request accept_into_socket_request; struct set_socket_event_request set_socket_event_request; struct get_socket_event_request get_socket_event_request; + struct get_socket_info_request get_socket_info_request; struct enable_socket_event_request enable_socket_event_request; struct set_socket_deferred_request set_socket_deferred_request; struct alloc_console_request alloc_console_request; @@ -5598,6 +5616,7 @@ union generic_reply struct accept_into_socket_reply accept_into_socket_reply; struct set_socket_event_reply set_socket_event_reply; struct get_socket_event_reply get_socket_event_reply; + struct get_socket_info_reply get_socket_info_reply; struct enable_socket_event_reply enable_socket_event_reply; struct set_socket_deferred_reply set_socket_deferred_reply; struct alloc_console_reply alloc_console_reply; @@ -5802,6 +5821,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 447 +#define SERVER_PROTOCOL_VERSION 448 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index c9be72e..9164e3e 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1236,6 +1236,16 @@ enum server_fd_type @END +/* Get socket info */ +(a)REQ(get_socket_info) + obj_handle_t handle; /* handle to the socket */ +(a)REPLY + int family; /* family, see socket manpage */ + int type; /* type, see socket manpage */ + int protocol; /* protocol, see socket manpage */ +(a)END + + /* Re-enable pending socket events */ @REQ(enable_socket_event) obj_handle_t handle; /* handle to the socket */ diff --git a/server/request.h b/server/request.h index 0777161..e6e2c40 100644 --- a/server/request.h +++ b/server/request.h @@ -156,6 +156,7 @@ DECL_HANDLER(accept_socket); DECL_HANDLER(accept_into_socket); DECL_HANDLER(set_socket_event); DECL_HANDLER(get_socket_event); +DECL_HANDLER(get_socket_info); DECL_HANDLER(enable_socket_event); DECL_HANDLER(set_socket_deferred); DECL_HANDLER(alloc_console); @@ -414,6 +415,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_accept_into_socket, (req_handler)req_set_socket_event, (req_handler)req_get_socket_event, + (req_handler)req_get_socket_info, (req_handler)req_enable_socket_event, (req_handler)req_set_socket_deferred, (req_handler)req_alloc_console, @@ -972,6 +974,12 @@ C_ASSERT( FIELD_OFFSET(struct get_socket_event_reply, mask) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_socket_event_reply, pmask) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_socket_event_reply, state) == 16 ); C_ASSERT( sizeof(struct get_socket_event_reply) == 24 ); +C_ASSERT( FIELD_OFFSET(struct get_socket_info_request, handle) == 12 ); +C_ASSERT( sizeof(struct get_socket_info_request) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_socket_info_reply, family) == 8 ); +C_ASSERT( FIELD_OFFSET(struct get_socket_info_reply, type) == 12 ); +C_ASSERT( FIELD_OFFSET(struct get_socket_info_reply, protocol) == 16 ); +C_ASSERT( sizeof(struct get_socket_info_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct enable_socket_event_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct enable_socket_event_request, mask) == 16 ); C_ASSERT( FIELD_OFFSET(struct enable_socket_event_request, sstate) == 20 ); diff --git a/server/sock.c b/server/sock.c index 13cef61..d6a228e 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1073,3 +1073,17 @@ DECL_HANDLER(set_socket_deferred) sock->deferred = acceptsock; release_object( sock ); } + +DECL_HANDLER(get_socket_info) +{ + struct sock *sock; + + sock = (struct sock *)get_handle_obj( current->process, req->handle, FILE_READ_ATTRIBUTES, &sock_ops ); + if (!sock) return; + + reply->family = sock->family; + reply->type = sock->type; + reply->protocol = sock->proto; + + release_object( &sock->obj ); +} diff --git a/server/trace.c b/server/trace.c index cf211a0..5b51e05 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1712,6 +1712,18 @@ static void dump_get_socket_event_reply( const struct get_socket_event_reply *re dump_varargs_ints( ", errors=", cur_size ); } +static void dump_get_socket_info_request( const struct get_socket_info_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); +} + +static void dump_get_socket_info_reply( const struct get_socket_info_reply *req ) +{ + fprintf( stderr, " family=%d", req->family ); + fprintf( stderr, ", type=%d", req->type ); + fprintf( stderr, ", protocol=%d", req->protocol ); +} + static void dump_enable_socket_event_request( const struct enable_socket_event_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -4107,6 +4119,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_accept_into_socket_request, (dump_func)dump_set_socket_event_request, (dump_func)dump_get_socket_event_request, + (dump_func)dump_get_socket_info_request, (dump_func)dump_enable_socket_event_request, (dump_func)dump_set_socket_deferred_request, (dump_func)dump_alloc_console_request, @@ -4362,6 +4375,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, NULL, (dump_func)dump_get_socket_event_reply, + (dump_func)dump_get_socket_info_reply, NULL, NULL, (dump_func)dump_alloc_console_reply, @@ -4617,6 +4631,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "accept_into_socket", "set_socket_event", "get_socket_event", + "get_socket_info", "enable_socket_event", "set_socket_deferred", "alloc_console",

1 0

Michael Müller : d3d9: Add headers for IDirect3DSwapChain9Ex interface.
by Alexandre Julliard Sept. 2, 2013

Sept. 2, 2013

Module: wine Branch: master Commit: 3c759894970f6692605108d5e0df1eeed2f0e5bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c759894970f6692605108d5e… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Aug 30 14:45:51 2013 +0200 d3d9: Add headers for IDirect3DSwapChain9Ex interface. --- include/d3d9.h | 77 +++++++++++++++++++++++++++++++++++++++++++++----- include/d3d9types.h | 10 ++++++ 2 files changed, 79 insertions(+), 8 deletions(-) diff --git a/include/d3d9.h b/include/d3d9.h index 382b241..ce39c10 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -394,17 +394,17 @@ DECLARE_INTERFACE_(IDirect3DVolume9,IUnknown) DECLARE_INTERFACE_(IDirect3DSwapChain9,IUnknown) { /*** IUnknown methods ***/ - STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void **ppvObject) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DSwapChain9 methods ***/ - STDMETHOD(Present)(THIS_ CONST RECT* pSourceRect, CONST RECT* pDestRect, HWND hDestWindowOverride, CONST RGNDATA* pDirtyRegion, DWORD dwFlags) PURE; - STDMETHOD(GetFrontBufferData)(THIS_ struct IDirect3DSurface9* pDestSurface) PURE; - STDMETHOD(GetBackBuffer)(THIS_ UINT iBackBuffer, D3DBACKBUFFER_TYPE Type, struct IDirect3DSurface9** ppBackBuffer) PURE; - STDMETHOD(GetRasterStatus)(THIS_ D3DRASTER_STATUS* pRasterStatus) PURE; - STDMETHOD(GetDisplayMode)(THIS_ D3DDISPLAYMODE* pMode) PURE; - STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9** ppDevice) PURE; - STDMETHOD(GetPresentParameters)(THIS_ D3DPRESENT_PARAMETERS* pPresentationParameters) PURE; + STDMETHOD(Present)(THIS_ CONST RECT *pSourceRect, CONST RECT *pDestRect, HWND hDestWindowOverride, CONST RGNDATA *pDirtyRegion, DWORD dwFlags) PURE; + STDMETHOD(GetFrontBufferData)(THIS_ struct IDirect3DSurface9 *pDestSurface) PURE; + STDMETHOD(GetBackBuffer)(THIS_ UINT iBackBuffer, D3DBACKBUFFER_TYPE Type, struct IDirect3DSurface9 **ppBackBuffer) PURE; + STDMETHOD(GetRasterStatus)(THIS_ D3DRASTER_STATUS *pRasterStatus) PURE; + STDMETHOD(GetDisplayMode)(THIS_ D3DDISPLAYMODE *pMode) PURE; + STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9 **ppDevice) PURE; + STDMETHOD(GetPresentParameters)(THIS_ D3DPRESENT_PARAMETERS *pPresentationParameters) PURE; }; #undef INTERFACE @@ -437,6 +437,67 @@ DECLARE_INTERFACE_(IDirect3DSwapChain9,IUnknown) #endif /***************************************************************************** + * IDirect3DSwapChain9Ex interface + */ +#define INTERFACE IDirect3DSwapChain9Ex +DECLARE_INTERFACE_(IDirect3DSwapChain9Ex,IDirect3DSwapChain9) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void **ppvObject) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IDirect3DSwapChain9 methods ***/ + STDMETHOD(Present)(THIS_ CONST RECT *pSourceRect, CONST RECT *pDestRect, HWND hDestWindowOverride, CONST RGNDATA *pDirtyRegion, DWORD dwFlags) PURE; + STDMETHOD(GetFrontBufferData)(THIS_ struct IDirect3DSurface9 *pDestSurface) PURE; + STDMETHOD(GetBackBuffer)(THIS_ UINT iBackBuffer, D3DBACKBUFFER_TYPE Type, struct IDirect3DSurface9 **ppBackBuffer) PURE; + STDMETHOD(GetRasterStatus)(THIS_ D3DRASTER_STATUS *pRasterStatus) PURE; + STDMETHOD(GetDisplayMode)(THIS_ D3DDISPLAYMODE *pMode) PURE; + STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9 **ppDevice) PURE; + STDMETHOD(GetPresentParameters)(THIS_ D3DPRESENT_PARAMETERS *pPresentationParameters) PURE; + /*** IDirect3DSwapChain9Ex methods ***/ + STDMETHOD(GetLastPresentCount)(THIS_ UINT *pLastPresentCount) PURE; + STDMETHOD(GetPresentStats)(THIS_ D3DPRESENTSTATS *pPresentationStatistics) PURE; + STDMETHOD(GetDisplayModeEx)(THIS_ D3DDISPLAYMODEEX *pMode, D3DDISPLAYROTATION *pRotation) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define IDirect3DSwapChain9Ex_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3DSwapChain9Ex_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3DSwapChain9Ex_Release(p) (p)->lpVtbl->Release(p) +/*** IDirect3DSwapChain9 methods ***/ +#define IDirect3DSwapChain9Ex_Present(p,a,b,c,d,e) (p)->lpVtbl->Present(p,a,b,c,d,e) +#define IDirect3DSwapChain9Ex_GetFrontBufferData(p,a) (p)->lpVtbl->GetFrontBufferData(p,a) +#define IDirect3DSwapChain9EX_GetBackBuffer(p,a,b,c) (p)->lpVtbl->GetBackBuffer(p,a,b,c) +#define IDirect3DSwapChain9EX_GetRasterStatus(p,a) (p)->lpVtbl->GetRasterStatus(p,a) +#define IDirect3DSwapChain9Ex_GetDisplayMode(p,a) (p)->lpVtbl->GetDisplayMode(p,a) +#define IDirect3DSwapChain9Ex_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) +#define IDirect3DSwapChain9Ex_GetPresentParameters(p,a) (p)->lpVtbl->GetPresentParameters(p,a) +/*** IDirect3DSwapChain9Ex methods ***/ +#define IDirect3DSwapChain9Ex_GetLastPresentCount(p,a) (p)->lpVtbl->GetLastPresentCount(p,a) +#define IDirect3DSwapChain9Ex_GetPresentStats(p,a) (p)->lpVtbl->GetPresentStats(p,a) +#define IDirect3DSwapChain9Ex_GetDisplayModeEx(p,a,b) (p)->lpVtbl->GetDisplayModeEx(p,a,b) +#else +/*** IUnknown methods ***/ +#define IDirect3DSwapChain9Ex_QueryInterface(p,a,b) (p)->QueryInterface(a,b) +#define IDirect3DSwapChain9Ex_AddRef(p) (p)->AddRef() +#define IDirect3DSwapChain9Ex_Release(p) (p)->Release() +/*** IDirect3DSwapChain9 methods ***/ +#define IDirect3DSwapChain9Ex_Present(p,a,b,c,d,e) (p)->Present(a,b,c,d,e) +#define IDirect3DSwapChain9Ex_GetFrontBufferData(p,a) (p)->GetFrontBufferData(a) +#define IDirect3DSwapChain9Ex_GetBackBuffer(p,a,b,c) (p)->GetBackBuffer(a,b,c) +#define IDirect3DSwapChain9Ex_GetRasterStatus(p,a) (p)->GetRasterStatus(a) +#define IDirect3DSwapChain9Ex_GetDisplayMode(p,a) (p)->GetDisplayMode(a) +#define IDirect3DSwapChain9Ex_GetDevice(p,a) (p)->GetDevice(a) +#define IDirect3DSwapChain9Ex_GetPresentParameters(p,a) (p)->GetPresentParameters(a) +/*** IDirect3DSwapChain9Ex methods ***/ +#define IDirect3DSwapChain9Ex_GetLastPresentCount(p,a) (p)->GetLastPresentCount(a) +#define IDirect3DSwapChain9Ex_GetPresentStats(p,a) (p)->GetPresentStats(a) +#define IDirect3DSwapChain9Ex_GetDisplayModeEx(p,a,b) (p)->GetDisplayModeEx(a,b) +#endif + +/***************************************************************************** * IDirect3DResource9 interface */ #define INTERFACE IDirect3DResource9 diff --git a/include/d3d9types.h b/include/d3d9types.h index cdd3ada..4cc1195 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -1559,6 +1559,16 @@ typedef enum _D3DCOMPOSERECTSOP{ D3DCOMPOSERECTS_NEG, D3DCOMPOSERECTS_FORCE_DWORD = 0x7fffffff } D3DCOMPOSERECTSOP; + +typedef struct _D3DPRESENTSTATS +{ + UINT PresentCount; + UINT PresentRefreshCount; + UINT SyncRefreshCount; + LARGE_INTEGER SyncQPCTime; + LARGE_INTEGER SyncGPUTime; +} D3DPRESENTSTATS; + #endif /* D3D_DISABLE_9EX */ typedef enum _D3DSHADER_COMPARISON

1 0

George Stephanos : advapi32/tests: HKCR mask tests fix for WinNT.
by Alexandre Julliard Sept. 2, 2013

Sept. 2, 2013

Module: wine Branch: master Commit: 8aa205fbcf9195396d554ce9189b56a15ccebc11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aa205fbcf9195396d554ce91… Author: George Stephanos <gaf.stephanos(a)gmail.com> Date: Fri Aug 30 00:15:56 2013 +0200 advapi32/tests: HKCR mask tests fix for WinNT. --- dlls/advapi32/tests/registry.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index fd5d373..981ac93 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -2130,7 +2130,6 @@ static void test_classesroot(void) todo_wine ok(res == ERROR_SUCCESS || broken(res == ERROR_FILE_NOT_FOUND /* WinNT */), "test key not found in hkcr: %d\n", res); - todo_wine ok(IS_HKCR(hkcr), "hkcr mask not set in %p\n", hkcr); if (res) { skip("HKCR key merging not supported\n"); @@ -2139,6 +2138,8 @@ static void test_classesroot(void) return; } + todo_wine ok(IS_HKCR(hkcr), "hkcr mask not set in %p\n", hkcr); + /* set a value in user's classes */ res = RegSetValueExA(hkey, "val1", 0, REG_SZ, (const BYTE *)"user", sizeof("user")); ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); @@ -2583,7 +2584,8 @@ static void test_classesroot_mask(void) res = RegOpenKeyA( HKEY_CLASSES_ROOT, "CLSID", &hkey ); ok(res == ERROR_SUCCESS, "RegOpenKeyA failed: %d\n", res); - todo_wine ok(IS_HKCR(hkey), "hkcr mask not set in %p\n", hkey); + todo_wine ok(IS_HKCR(hkey) || broken(!IS_HKCR(hkey)) /* WinNT */, + "hkcr mask not set in %p\n", hkey); RegCloseKey( hkey ); res = RegOpenKeyA( HKEY_CURRENT_USER, "Software", &hkey );

1 0

Austin English : netcfgx: Add stub dll.
by Alexandre Julliard Sept. 2, 2013

Sept. 2, 2013

Module: wine Branch: master Commit: 478db5bcd54a61f677d9b363e2d1e30a1ae99088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=478db5bcd54a61f677d9b363e… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Aug 26 16:09:01 2013 -0700 netcfgx: Add stub dll. --- configure | 1 + configure.ac | 1 + dlls/netcfgx/Makefile.in | 6 ++++++ dlls/netcfgx/main.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/netcfgx/netcfgx.spec | 16 ++++++++++++++++ 5 files changed, 68 insertions(+), 0 deletions(-) diff --git a/configure b/configure index d0f15d0..0ca39bc 100755 --- a/configure +++ b/configure @@ -16243,6 +16243,7 @@ wine_fn_config_dll msxml6 enable_msxml6 wine_fn_config_dll nddeapi enable_nddeapi implib wine_fn_config_dll netapi32 enable_netapi32 implib wine_fn_config_test dlls/netapi32/tests netapi32_test +wine_fn_config_dll netcfgx enable_netcfgx wine_fn_config_dll newdev enable_newdev implib wine_fn_config_dll normaliz enable_normaliz implib wine_fn_config_dll npmshtml enable_npmshtml diff --git a/configure.ac b/configure.ac index d8033cf..9b21643 100644 --- a/configure.ac +++ b/configure.ac @@ -2925,6 +2925,7 @@ WINE_CONFIG_DLL(msxml6) WINE_CONFIG_DLL(nddeapi,,[implib]) WINE_CONFIG_DLL(netapi32,,[implib]) WINE_CONFIG_TEST(dlls/netapi32/tests) +WINE_CONFIG_DLL(netcfgx) WINE_CONFIG_DLL(newdev,,[implib]) WINE_CONFIG_DLL(normaliz,,[implib]) WINE_CONFIG_DLL(npmshtml) diff --git a/dlls/netcfgx/Makefile.in b/dlls/netcfgx/Makefile.in new file mode 100644 index 0000000..8ad17e1 --- /dev/null +++ b/dlls/netcfgx/Makefile.in @@ -0,0 +1,6 @@ +MODULE = netcfgx.dll + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/netcfgx/main.c b/dlls/netcfgx/main.c new file mode 100644 index 0000000..6cd1894 --- /dev/null +++ b/dlls/netcfgx/main.c @@ -0,0 +1,44 @@ +/* + * Network Configuration Objects implementation + * + * Copyright 2013 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 "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(netcfgx); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + default: + break; + } + + return TRUE; +} diff --git a/dlls/netcfgx/netcfgx.spec b/dlls/netcfgx/netcfgx.spec new file mode 100644 index 0000000..38ce927 --- /dev/null +++ b/dlls/netcfgx/netcfgx.spec @@ -0,0 +1,16 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stub HrDiAddComponentToINetCfg +@ stub LanaCfgFromCommandArgs +@ stub ModemClassCoInstaller +@ stub NetCfgDiagFromCommandArgs +@ stub NetCfgDiagRepairRegistryBindings +@ stub NetClassInstaller +@ stub NetPropPageProvider +@ stub RasAddBindings +@ stub RasCountBindings +@ stub RasRemoveBindings +@ stub SvchostChangeSvchostGroup +@ stub UpdateLanaConfigUsingAnswerfile

1 0

Frédéric Delanoy : winedbg: Use consistently wpid in documentation.
by Alexandre Julliard Sept. 2, 2013

Sept. 2, 2013

Module: wine Branch: master Commit: 903562e104a744a75d3b49f6a983b831b5a461aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=903562e104a744a75d3b49f6a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Sep 2 11:09:01 2013 +0200 winedbg: Use consistently wpid in documentation. --- programs/winedbg/info.c | 1 + programs/winedbg/winedbg.c | 4 ++-- programs/winedbg/winedbg.man.in | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index c0b86ba..08ac938 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -49,6 +49,7 @@ void print_help(void) "subset of the commands that gdb accepts.", "The commands currently are:", " help quit", + " attach <wpid> detach", " break [*<addr>] watch | rwatch *<addr>", " delete break bpnum disable bpnum", " enable bpnum condition <bpnum> [<expr>]", diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index ba72916..bf1234c 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -568,11 +568,11 @@ static int dbg_winedbg_usage(BOOL advanced) dbg_printf("Usage:\n" " winedbg cmdline launch process 'cmdline' (as if you were starting\n" " it with wine) and run WineDbg on it\n" - " winedbg <num> attach to running process of pid <num> and run\n" + " winedbg <num> attach to running process of wpid <num> and run\n" " WineDbg on it\n" " winedbg --gdb cmdline launch process 'cmdline' (as if you were starting\n" " wine) and run gdb (proxied) on it\n" - " winedbg --gdb <num> attach to running process of pid <num> and run\n" + " winedbg --gdb <num> attach to running process of wpid <num> and run\n" " gdb (proxied) on it\n" " winedbg file.mdmp reload the minidump file.mdmp into memory and run\n" " WineDbg on it\n" diff --git a/programs/winedbg/winedbg.man.in b/programs/winedbg/winedbg.man.in index 9e1731a..b5beba2 100644 --- a/programs/winedbg/winedbg.man.in +++ b/programs/winedbg/winedbg.man.in @@ -3,15 +3,15 @@ winedbg \- Wine debugger .SH SYNOPSIS .B winedbg -.RI "[ " options " ] [ " program_name " [ " program_arguments " ] | " pid " ]" +.RI "[ " options " ] [ " program_name " [ " program_arguments " ] | " wpid " ]" .PP .B winedbg --gdb -.RI "[ " options " ] [ " program_name " [ " program_arguments " ] | " pid " ]" +.RI "[ " options " ] [ " program_name " [ " program_arguments " ] | " wpid " ]" .PP -.BI "winedbg --auto " pid +.BI "winedbg --auto " wpid .PP .B winedbg --minidump -.RI "[ " file.mdmp " ] " pid +.RI "[ " file.mdmp " ] " wpid .PP .BI "winedbg " file.mdmp .SH DESCRIPTION @@ -84,10 +84,10 @@ This is the name of an executable to start for a debugging session. \fBwinedbg\fR will actually create a process with this executable. If \fIprograms_arguments\fR are also given, they will be used as arguments for creating the process to be debugged. -.IP \fIpid\fR -\fBwinedbg\fR will attach to the process which pid is \fIpid\fR (pids -refer to Win32 pids, not Unix pids). Use the \fBinfo proc\fR command -within \fBwinedbg\fR to list running processes and their Win32 pids. +.IP \fIwpid\fR +\fBwinedbg\fR will attach to the process which Windows pid is \fIwpid\fR. +Use the \fBinfo proc\fR command within \fBwinedbg\fR to list running processes +and their Windows pids. .IP \fBdefault\fR If nothing is specified, you will enter the debugger without any run nor attached process. You'll have to do the job yourself. @@ -106,7 +106,7 @@ Aborts the debugger. .IP \fBquit\fR Exits the debugger. .IP \fBattach\ \fIN\fR -Attach to a Wine process (\fIN\fR is its ID, numeric or hexadecimal). +Attach to a Wine process (\fIN\fR is its Windows ID, numeric or hexadecimal). IDs can be obtained using the \fBinfo\ process\fR command. Note the \fBinfo\ process\fR command returns hexadecimal values .IP @@ -346,7 +346,7 @@ Prints the values on top of the stack .IP \fBinfo\ map\fR Lists all virtual mappings used by the debugged program .IP \fBinfo\ map\ \fIN\fR -Lists all virtual mappings used by the program of pid \fIN\fR +Lists all virtual mappings used by the program of Windows pid \fIN\fR .IP \fBinfo\ wnd\fR Displays the window hierarchy starting from the desktop window .IP \fBinfo\ wnd\ \fIN\fR

1 0

Frédéric Delanoy : winedbg: Fix manpage formatting.
by Alexandre Julliard Sept. 2, 2013

Sept. 2, 2013

Module: wine Branch: master Commit: 7a12ebca0e899031ea92e122d0effc161859302e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a12ebca0e899031ea92e122d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Sep 2 11:09:00 2013 +0200 winedbg: Fix manpage formatting. --- programs/winedbg/winedbg.man.in | 56 ++++++++++++++------------------------ 1 files changed, 21 insertions(+), 35 deletions(-) diff --git a/programs/winedbg/winedbg.man.in b/programs/winedbg/winedbg.man.in index 758aa7d..9e1731a 100644 --- a/programs/winedbg/winedbg.man.in +++ b/programs/winedbg/winedbg.man.in @@ -2,32 +2,18 @@ .SH NAME winedbg \- Wine debugger .SH SYNOPSIS -.BR "winedbg " -.RI "[" " options " "] [" -.BI "program name" -.RI "[ program arguments ] |" -.BI "pid" -.RI "]" -.PP -.BR "winedbg " -.BI "--gdb" -.RI "[" " options " "] [" -.BI "program name" -.RI "[ program arguments ] |" -.BI "pid" -.RI "]" -.PP -.BR "winedbg " -.BI "--auto " -.BI "pid" -.PP -.BR "winedbg " -.BI "--minidump " -.RI "[ file.mdmp ]" -.BI "pid" -.PP -.BR "winedbg" -.BI "file.mdmp" +.B winedbg +.RI "[ " options " ] [ " program_name " [ " program_arguments " ] | " pid " ]" +.PP +.B winedbg --gdb +.RI "[ " options " ] [ " program_name " [ " program_arguments " ] | " pid " ]" +.PP +.BI "winedbg --auto " pid +.PP +.B winedbg --minidump +.RI "[ " file.mdmp " ] " pid +.PP +.BI "winedbg " file.mdmp .SH DESCRIPTION .B winedbg is a debugger for Wine. It allows: @@ -93,15 +79,15 @@ Unix console for textual display. .PP In all modes, the rest of the command line, when passed, is used to identify which programs, if any, has to debugged: -.IP \fBprogram\ name\fR +.IP \fIprogram_name\fR This is the name of an executable to start for a debugging session. \fBwinedbg\fR will actually create a process with this -executable. If \fBprograms arguments\fR are also given, they will be +executable. If \fIprograms_arguments\fR are also given, they will be used as arguments for creating the process to be debugged. -.IP \fBpid\fR -\fBwinedbg\fR will attach to the process which pid is \fBpid\fR (pids -refer to Win32 pids, not Unix pids). Use the \fIinfo proc\fR -\fBwinedbg\fR command to list running processes and their Win32 pids. +.IP \fIpid\fR +\fBwinedbg\fR will attach to the process which pid is \fIpid\fR (pids +refer to Win32 pids, not Unix pids). Use the \fBinfo proc\fR command +within \fBwinedbg\fR to list running processes and their Win32 pids. .IP \fBdefault\fR If nothing is specified, you will enter the debugger without any run nor attached process. You'll have to do the job yourself. @@ -333,9 +319,9 @@ use. Pick up the one you want from its number. .PP \fIMisc.\fR .PP -.IP \fBminidump\ file.mdmp\fR +.BI "minidump " file.mdmp saves the debugging context of the debuggee into a minidump file called -file.mdmp +\fIfile.mdmp\fR. .PP \fIInformation on Wine internals\fR .IP \fBinfo\ class\fR @@ -406,7 +392,7 @@ Since no user input is possible, no commands are available. .SH ENVIRONMENT .IP \fBWINE_GDB\fR When used in \fBgdb\fR proxy mode, \fBWINE_GDB\fR specifies the name -(and the path) of the executable to be used for \fBgdb\fR. \fB"gdb"\fR +(and the path) of the executable to be used for \fBgdb\fR. "gdb" is used by default. .SH AUTHORS The first version was written by Eric Youngdale.

1 0

Piotr Caban : winedump: Improve TLB string table handling.
by Alexandre Julliard Sept. 2, 2013

Sept. 2, 2013

Module: wine Branch: master Commit: 156206592a7ff8a157f5413b9036475c2346967b URL: http://source.winehq.org/git/wine.git/?a=commit;h=156206592a7ff8a157f5413b9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Aug 31 12:45:42 2013 +0200 winedump: Improve TLB string table handling. --- tools/winedump/tlb.c | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index d12831e..a65c76e 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -428,14 +428,35 @@ static int dump_msft_nametab(seg_t *seg) return -1; } -static int dump_msft_stringtab(seg_t *seg) +static void dump_msft_string(int n) { - print_begin_block("StringTab"); + int len; - dump_binary(seg->length); /* FIXME */ + print_begin_block_id("String", n); + + len = print_short_hex("stringlen"); + + print_offset(); + printf("string = "); + dump_string(len, 2); + + if(len < 3) { + for(len = 0; len < 4; len++) + printf("\\%2.2x", tlb_read_byte()); + } + printf("\n"); print_end_block(); +} + +static int dump_msft_stringtab(seg_t *seg) +{ + int i; + + for(i = 0; offset < seg->offset+seg->length; i++) + dump_msft_string(i); + assert(offset == seg->offset+seg->length); return -1; }

1 0

Jacek Caban : crypt32: Use CertificateChainEngine instead of HCERTCHAINENGINE in a few more places .
by Alexandre Julliard Sept. 2, 2013

Sept. 2, 2013

Module: wine Branch: master Commit: 2584e49bf65f3e6fe29c06d65ceebbe9089533bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2584e49bf65f3e6fe29c06d65… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 2 14:35:53 2013 +0200 crypt32: Use CertificateChainEngine instead of HCERTCHAINENGINE in a few more places. --- dlls/crypt32/chain.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index b2bee4b..90ca0be 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -477,7 +477,7 @@ static void CRYPT_CheckTrustedStatus(HCERTSTORE hRoot, CertFreeCertificateContext(trustedRoot); } -static void CRYPT_CheckRootCert(HCERTCHAINENGINE hRoot, +static void CRYPT_CheckRootCert(HCERTSTORE hRoot, PCERT_CHAIN_ELEMENT rootElement) { PCCERT_CONTEXT root = rootElement->pCertContext; @@ -2171,11 +2171,10 @@ static BOOL CRYPT_GetSimpleChainForCert(CertificateChainEngine *engine, return ret; } -static BOOL CRYPT_BuildCandidateChainFromCert(HCERTCHAINENGINE hChainEngine, +static BOOL CRYPT_BuildCandidateChainFromCert(CertificateChainEngine *engine, PCCERT_CONTEXT cert, LPFILETIME pTime, HCERTSTORE hAdditionalStore, PCertificateChain *ppChain) { - CertificateChainEngine *engine = (CertificateChainEngine*)hChainEngine; PCERT_SIMPLE_CHAIN simpleChain = NULL; HCERTSTORE world; BOOL ret; @@ -2362,13 +2361,12 @@ static PCertificateChain CRYPT_CopyChainToElement(PCertificateChain chain, } static PCertificateChain CRYPT_BuildAlternateContextFromChain( - HCERTCHAINENGINE hChainEngine, LPFILETIME pTime, HCERTSTORE hAdditionalStore, + CertificateChainEngine *engine, LPFILETIME pTime, HCERTSTORE hAdditionalStore, PCertificateChain chain) { - CertificateChainEngine *engine = (CertificateChainEngine*)hChainEngine; PCertificateChain alternate; - TRACE("(%p, %s, %p, %p)\n", hChainEngine, debugstr_filetime(pTime), + TRACE("(%p, %s, %p, %p)\n", engine, debugstr_filetime(pTime), hAdditionalStore, chain); /* Always start with the last "lower quality" chain to ensure a consistent @@ -2799,10 +2797,11 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, PCERT_CHAIN_PARA pChainPara, DWORD dwFlags, LPVOID pvReserved, PCCERT_CHAIN_CONTEXT* ppChainContext) { + CertificateChainEngine *engine = (CertificateChainEngine*)hChainEngine; BOOL ret; PCertificateChain chain = NULL; - TRACE("(%p, %p, %s, %p, %p, %08x, %p, %p)\n", hChainEngine, pCertContext, + TRACE("(%p, %p, %s, %p, %p, %08x, %p, %p)\n", engine, pCertContext, debugstr_filetime(pTime), hAdditionalStore, pChainPara, dwFlags, pvReserved, ppChainContext); @@ -2819,12 +2818,12 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, return FALSE; } - if (!hChainEngine) - hChainEngine = CRYPT_GetDefaultChainEngine(); + if (!engine) + engine = CRYPT_GetDefaultChainEngine(); if (TRACE_ON(chain)) dump_chain_para(pChainPara); /* FIXME: what about HCCE_LOCAL_MACHINE? */ - ret = CRYPT_BuildCandidateChainFromCert(hChainEngine, pCertContext, pTime, + ret = CRYPT_BuildCandidateChainFromCert(engine, pCertContext, pTime, hAdditionalStore, &chain); if (ret) { @@ -2832,7 +2831,7 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, PCERT_CHAIN_CONTEXT pChain; do { - alternate = CRYPT_BuildAlternateContextFromChain(hChainEngine, + alternate = CRYPT_BuildAlternateContextFromChain(engine, pTime, hAdditionalStore, chain); /* Alternate contexts are added as "lower quality" contexts of

1 0

Stefan Dösinger : ddraw/tests: Test WM_ACTIVATEAPP messages generated by SetCooperativeLevel.
by Alexandre Julliard Sept. 2, 2013

Sept. 2, 2013

Module: wine Branch: master Commit: 91fa7c07c9deadf77f449b8ce26c637bf9cfb28a URL: http://source.winehq.org/git/wine.git/?a=commit;h=91fa7c07c9deadf77f449b8ce… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 2 11:22:31 2013 +0200 ddraw/tests: Test WM_ACTIVATEAPP messages generated by SetCooperativeLevel. --- dlls/ddraw/tests/ddraw1.c | 139 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 139 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 139 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 139 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 556 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=91fa7c07c9deadf77f449…

1 0