August 2008 - Wine-Commits - list.winehq.org

Rob Shearman : rpcss: Register the endpoint for the ncalrpc protseq for the endpoint mapper.
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: 257bf68f3d82811dc4db76d1632ccd3e2b40a22e URL: http://source.winehq.org/git/wine.git/?a=commit;h=257bf68f3d82811dc4db76d16… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 10 18:24:09 2008 +0100 rpcss: Register the endpoint for the ncalrpc protseq for the endpoint mapper. --- programs/rpcss/rpcss_main.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/programs/rpcss/rpcss_main.c b/programs/rpcss/rpcss_main.c index 1722d5e..c75138e 100644 --- a/programs/rpcss/rpcss_main.c +++ b/programs/rpcss/rpcss_main.c @@ -68,6 +68,8 @@ static BOOL RPCSS_Initialize(void) static unsigned short irot_endpoint[] = IROT_ENDPOINT; static unsigned short epm_protseq[] = {'n','c','a','c','n','_','n','p',0}; static unsigned short epm_endpoint[] = {'\\','p','i','p','e','\\','e','p','m','a','p','p','e','r',0}; + static unsigned short epm_protseq_lrpc[] = {'n','c','a','l','r','p','c',0}; + static unsigned short epm_endpoint_lrpc[] = {'e','p','m','a','p','p','e','r',0}; RPC_STATUS status; WINE_TRACE("\n"); @@ -87,6 +89,11 @@ static BOOL RPCSS_Initialize(void) if (status != RPC_S_OK) goto fail; + status = RpcServerUseProtseqEpW(epm_protseq_lrpc, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, + epm_endpoint_lrpc, NULL); + if (status != RPC_S_OK) + goto fail; + status = RpcServerUseProtseqEpW(irot_protseq, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, irot_endpoint, NULL); if (status != RPC_S_OK)

1 0

Rob Shearman : rpcss: Warn in ept_insert if TowerExplode fails.
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: a80a6353d7295707928e379c9ad9d3b399cb7e75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a80a6353d7295707928e379c9… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 10 18:24:00 2008 +0100 rpcss: Warn in ept_insert if TowerExplode fails. --- programs/rpcss/epmp.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/rpcss/epmp.c b/programs/rpcss/epmp.c index e731e06..d7712b9 100644 --- a/programs/rpcss/epmp.c +++ b/programs/rpcss/epmp.c @@ -120,6 +120,7 @@ void ept_insert(handle_t h, &entry->address); if (rpc_status != RPC_S_OK) { + WINE_WARN("TowerExplode failed %lu\n", rpc_status); *status = rpc_status; break; /* FIXME: more cleanup? */ }

1 0

Rob Shearman : rpcrt4: Fix the protid used in ncalrpc tower functions.
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: 1e46fc672a455879d5c276c21b17db89954b2e42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e46fc672a455879d5c276c21… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 10 18:23:50 2008 +0100 rpcrt4: Fix the protid used in ncalrpc tower functions. The epm tower for the ncalrpc protseq should have a floor with a protid of EPM_PROTOCOL_PIPE instead of EPM_PROTOCOL_SMB. --- dlls/rpcrt4/rpc_transport.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 9d70088..a797646 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -688,7 +688,7 @@ static size_t rpcrt4_ncalrpc_get_top_of_tower(unsigned char *tower_data, tower_data += sizeof(*pipe_floor); pipe_floor->count_lhs = sizeof(pipe_floor->protid); - pipe_floor->protid = EPM_PROTOCOL_SMB; + pipe_floor->protid = EPM_PROTOCOL_PIPE; pipe_floor->count_rhs = endpoint_size; memcpy(tower_data, endpoint, endpoint_size); @@ -713,7 +713,7 @@ static RPC_STATUS rpcrt4_ncalrpc_parse_top_of_tower(const unsigned char *tower_d tower_size -= sizeof(*pipe_floor); if ((pipe_floor->count_lhs != sizeof(pipe_floor->protid)) || - (pipe_floor->protid != EPM_PROTOCOL_SMB) || + (pipe_floor->protid != EPM_PROTOCOL_PIPE) || (pipe_floor->count_rhs > tower_size)) return EPT_S_NOT_REGISTERED;

1 0

Rob Shearman : rpcrt4: Fix crash in rpcrt4_ncalrpc_parse_top_of_tower due to unconditionally dereferencing networkaddr and endpoint variables .
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: 498216fc117b56d605339b4cb368bdc1fca20aeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=498216fc117b56d605339b4cb… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 10 18:23:40 2008 +0100 rpcrt4: Fix crash in rpcrt4_ncalrpc_parse_top_of_tower due to unconditionally dereferencing networkaddr and endpoint variables. These can be NULL when parts of the tower are not required. --- dlls/rpcrt4/rpc_transport.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 6e57ee7..9d70088 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -706,9 +706,6 @@ static RPC_STATUS rpcrt4_ncalrpc_parse_top_of_tower(const unsigned char *tower_d TRACE("(%p, %d, %p, %p)\n", tower_data, (int)tower_size, networkaddr, endpoint); - *networkaddr = NULL; - *endpoint = NULL; - if (tower_size < sizeof(*pipe_floor)) return EPT_S_NOT_REGISTERED; @@ -720,6 +717,9 @@ static RPC_STATUS rpcrt4_ncalrpc_parse_top_of_tower(const unsigned char *tower_d (pipe_floor->count_rhs > tower_size)) return EPT_S_NOT_REGISTERED; + if (networkaddr) + *networkaddr = NULL; + if (endpoint) { *endpoint = I_RpcAllocate(pipe_floor->count_rhs);

1 0

Rob Shearman : rpcrt4: Fix crash calculation of tower size in rpcrt4_ncalrpc_get_top_of_tower.
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: 54e904e780e7c6c6b05f818932f684d4f0d46750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54e904e780e7c6c6b05f81893… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 10 18:23:31 2008 +0100 rpcrt4: Fix crash calculation of tower size in rpcrt4_ncalrpc_get_top_of_tower. The size depends on the length of the endpoint string, not the network address string. --- dlls/rpcrt4/rpc_transport.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 86c4e4f..6e57ee7 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -677,7 +677,7 @@ static size_t rpcrt4_ncalrpc_get_top_of_tower(unsigned char *tower_data, TRACE("(%p, %s, %s)\n", tower_data, networkaddr, endpoint); - endpoint_size = strlen(networkaddr) + 1; + endpoint_size = strlen(endpoint) + 1; size = sizeof(*pipe_floor) + endpoint_size; if (!tower_data)

1 0

Rob Shearman : rpcrt4: Fix a typo in the ncalrpc protseq in the epm_endpoints structure.
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: cdb9625dbdad432aa681075bdb1d22feb1c8d063 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdb9625dbdad432aa681075bd… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 10 18:23:17 2008 +0100 rpcrt4: Fix a typo in the ncalrpc protseq in the epm_endpoints structure. --- dlls/rpcrt4/rpc_epmap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_epmap.c b/dlls/rpcrt4/rpc_epmap.c index 19c11f8..f434549 100644 --- a/dlls/rpcrt4/rpc_epmap.c +++ b/dlls/rpcrt4/rpc_epmap.c @@ -71,7 +71,7 @@ static const struct epm_endpoints { "ncacn_np", "\\pipe\\epmapper" }, { "ncacn_ip_tcp", "135" }, { "ncacn_ip_udp", "135" }, - { "ncalprc", "epmapper" }, + { "ncalrpc", "epmapper" }, { "ncacn_http", "593" }, };

1 0

Rob Shearman : rpcrt4: Factorise conformant varying array functions into array_* functions.
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: 9e3260847a595bd7e9f405482535e0c97a8bcf76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e3260847a595bd7e9f405482… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 10 11:14:21 2008 +0100 rpcrt4: Factorise conformant varying array functions into array_* functions. This allows conformant varying array types to be marshalled/unmarshalled when embedded in a complex type. --- dlls/rpcrt4/ndr_marshall.c | 200 ++++++++++++++++++++++++++------------------ 1 files changed, 118 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e3260847a595bd7e9f40…

1 0

Paul Vriens : include/wine/svcctl.idl: Remove duplicate define.
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: 5136b3a10b490d500a29860119dfb5275518c909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5136b3a10b490d500a2986011… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Aug 15 16:33:01 2008 +0200 include/wine/svcctl.idl: Remove duplicate define. --- include/wine/svcctl.idl | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/include/wine/svcctl.idl b/include/wine/svcctl.idl index 65dfb62..7e5a0a6 100644 --- a/include/wine/svcctl.idl +++ b/include/wine/svcctl.idl @@ -63,9 +63,6 @@ interface svcctl /* undocumented access rights */ cpp_quote("#define SERVICE_SET_STATUS 0x8000") - /* undocumented access rights */ - cpp_quote("#define SERVICE_SET_STATUS 0x8000") - cpp_quote("#if 0 /* already defined in winsvc.h */") typedef struct _QUERY_SERVICE_CONFIGW { DWORD dwServiceType;

1 0

Francois Gouget : dplayx/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: 4f597af285dd83d82ee6bb8eaf776d86eedd891a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f597af285dd83d82ee6bb8ea… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 14 02:25:28 2008 +0200 dplayx/tests: Fix compilation on systems that don't support nameless unions. --- dlls/dplayx/tests/dplayx.c | 94 ++++++++++++++++++++++---------------------- 1 files changed, 47 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f597af285dd83d82ee6b…

1 0

Rob Shearman : rpcrt4: Re-implement part of the conformant varying structure processing routines using array_* functions .
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: 2652ddfebab6cee0084cf85a9f418bc9fc66f51b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2652ddfebab6cee0084cf85a9… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 10 11:14:30 2008 +0100 rpcrt4: Re-implement part of the conformant varying structure processing routines using array_* functions. --- dlls/rpcrt4/ndr_marshall.c | 451 ++++++++++++++++++-------------------------- 1 files changed, 179 insertions(+), 272 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2652ddfebab6cee0084cf…

1 0