Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 53119: [WINETESTS] - update rpcrt4 tests to wine 1.3.26 while we're at it.
by jgardou＠svn.reactos.org 07 Aug '11

07 Aug '11

Author: jgardou Date: Sun Aug 7 16:20:27 2011 New Revision: 53119 URL: http://svn.reactos.org/svn/reactos?rev=53119&view=rev Log: [WINETESTS] - update rpcrt4 tests to wine 1.3.26 while we're at it. Modified: trunk/rostests/winetests/rpcrt4/cstub.c trunk/rostests/winetests/rpcrt4/ndr_marshall.c trunk/rostests/winetests/rpcrt4/rpc.c trunk/rostests/winetests/rpcrt4/rpc_async.c trunk/rostests/winetests/rpcrt4/server.c trunk/rostests/winetests/rpcrt4/server.idl Modified: trunk/rostests/winetests/rpcrt4/cstub.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/cstub.c?… ============================================================================== --- trunk/rostests/winetests/rpcrt4/cstub.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/cstub.c [iso-8859-1] Sun Aug 7 16:20:27 2011 @@ -691,9 +691,14 @@ struct dummy_unknown { - const IUnknownVtbl *vtbl; + IUnknown IUnknown_iface; LONG ref; }; + +static inline struct dummy_unknown *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct dummy_unknown, IUnknown_iface); +} static HRESULT WINAPI dummy_QueryInterface(IUnknown *This, REFIID iid, void **ppv) { @@ -703,13 +708,13 @@ static ULONG WINAPI dummy_AddRef(LPUNKNOWN iface) { - struct dummy_unknown *this = (struct dummy_unknown *)iface; + struct dummy_unknown *this = impl_from_IUnknown(iface); return InterlockedIncrement( &this->ref ); } static ULONG WINAPI dummy_Release(LPUNKNOWN iface) { - struct dummy_unknown *this = (struct dummy_unknown *)iface; + struct dummy_unknown *this = impl_from_IUnknown(iface); return InterlockedDecrement( &this->ref ); } @@ -719,7 +724,7 @@ dummy_AddRef, dummy_Release }; -static struct dummy_unknown dummy_unknown = { &dummy_unknown_vtbl, 0 }; +static struct dummy_unknown dummy_unknown = { { &dummy_unknown_vtbl }, 0 }; static void create_proxy_test( IPSFactoryBuffer *ppsf, REFIID iid, const void *expected_vtbl ) { @@ -737,7 +742,8 @@ ok( count == 0, "wrong refcount %u\n", count ); dummy_unknown.ref = 4; - r = IPSFactoryBuffer_CreateProxy(ppsf, (IUnknown *)&dummy_unknown, iid, &proxy, (void **)&iface); + r = IPSFactoryBuffer_CreateProxy(ppsf, &dummy_unknown.IUnknown_iface, iid, &proxy, + (void **)&iface); ok( r == S_OK, "IPSFactoryBuffer_CreateProxy failed %x\n", r ); ok( dummy_unknown.ref == 5, "wrong refcount %u\n", dummy_unknown.ref ); ok( *(void **)iface == expected_vtbl, "wrong iface pointer %p/%p\n", *(void **)iface, expected_vtbl ); @@ -775,6 +781,7 @@ vtbl = &create_stub_test_fail_vtbl; pstub = create_stub(ppsf, &IID_if1, obj, E_NOINTERFACE); + ok(pstub == S_OK, "create_stub failed: %u\n", GetLastError()); } @@ -892,6 +899,7 @@ obj = (IUnknown*)&new_vtbl; r = IRpcStubBuffer_Connect(pstub, obj); + ok(r == S_OK, "r %08x\n", r); ok(connect_test_base_Connect_called == 1, "connect_test_bsae_Connect called %d times\n", connect_test_base_Connect_called); ok(connect_test_orig_release_called == 3, "release called %d\n", connect_test_orig_release_called); Modified: trunk/rostests/winetests/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/ndr_mars… ============================================================================== --- trunk/rostests/winetests/rpcrt4/ndr_marshall.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/ndr_marshall.c [iso-8859-1] Sun Aug 7 16:20:27 2011 @@ -1543,6 +1543,9 @@ my_alloc_called = 0; StubMsg.Buffer = StubMsg.BufferStart; mem = mem_orig = HeapAlloc(GetProcessHeap(), 0, sizeof(memsrc)); + /* Windows apparently checks string length on the output buffer to determine its size... */ + memset( mem, 'x', sizeof(memsrc) - 1 ); + mem[sizeof(memsrc) - 1] = 0; NdrPointerUnmarshall( &StubMsg, &mem, fmtstr_conf_str, 0); ok(mem == mem_orig, "mem not alloced\n"); ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); Modified: trunk/rostests/winetests/rpcrt4/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpc.c?re… ============================================================================== --- trunk/rostests/winetests/rpcrt4/rpc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/rpc.c [iso-8859-1] Sun Aug 7 16:20:27 2011 @@ -120,13 +120,9 @@ for (i1 = 0; i1 < 10; i1++) { Uuid1 = Uuid_Table[i1]; rslt=UuidToStringW(&Uuid1, &wstr); - if (rslt==RPC_S_CANNOT_SUPPORT) { - /* Must be Win9x (no Unicode support), skip the tests */ - break; - } - ok( (rslt == RPC_S_OK), "Simple UUID->WString copy\n" ); - ok( (UuidFromStringW(wstr, &Uuid2) == RPC_S_OK), "Simple WString->UUID copy from generated UUID String\n" ); - ok( UuidEqual(&Uuid1, &Uuid2, &rslt), "Uuid -> WString -> Uuid transform\n" ); + ok( (rslt == RPC_S_OK), "Simple UUID->WString copy\n" ); + ok( (UuidFromStringW(wstr, &Uuid2) == RPC_S_OK), "Simple WString->UUID copy from generated UUID String\n" ); + ok( UuidEqual(&Uuid1, &Uuid2, &rslt), "Uuid -> WString -> Uuid transform\n" ); /* invalid uuid tests -- size of valid UUID string=36 */ for (i2 = 0; i2 < 36; i2++) { wx = wstr[i2]; @@ -266,8 +262,7 @@ status = RpcBindingSetAuthInfo(IFoo_IfHandle, NULL, RPC_C_AUTHN_LEVEL_NONE, RPC_C_AUTHN_WINNT, NULL, RPC_C_AUTHZ_NAME); - ok(status == RPC_S_OK || broken(status == RPC_S_UNKNOWN_AUTHN_SERVICE), /* win9x */ - "RpcBindingSetAuthInfo failed (%u)\n", status); + ok(status == RPC_S_OK, "RpcBindingSetAuthInfo failed (%u)\n", status); status = RpcBindingInqAuthInfo(IFoo_IfHandle, NULL, NULL, NULL, NULL, NULL); ok(status == RPC_S_BINDING_HAS_NO_AUTH, "RpcBindingInqAuthInfo failed (%u)\n", @@ -277,10 +272,6 @@ RPC_C_AUTHN_WINNT, NULL, RPC_C_AUTHZ_NAME); ok(status == RPC_S_OK, "RpcBindingSetAuthInfo failed (%u)\n", status); -if(1) - skip("bug 5778: this test part needs rpcrt4 sync >= 1.2rc6\n"); -else -{ level = authnsvc = authzsvc = 0; principal = (unsigned char *)0xdeadbeef; identity = (RPC_AUTH_IDENTITY_HANDLE *)0xdeadbeef; @@ -288,14 +279,14 @@ &identity, &authzsvc); ok(status == RPC_S_OK, "RpcBindingInqAuthInfo failed (%u)\n", status); - ok(identity == NULL, "expected NULL identity\n"); - ok(principal != (unsigned char *)0xdeadbeef, "expected valid principal\n"); - ok(level == RPC_C_AUTHN_LEVEL_PKT_PRIVACY, "expected RPC_C_AUTHN_LEVEL_PKT_PRIVACY\n"); - ok(authnsvc == RPC_C_AUTHN_WINNT, "expected RPC_C_AUTHN_WINNT\n"); - todo_wine ok(authzsvc == RPC_C_AUTHZ_NAME, "expected RPC_C_AUTHZ_NAME\n"); + ok(identity == NULL, "expected NULL identity, got %p\n", identity); + ok(principal != (unsigned char *)0xdeadbeef, "expected valid principal, got %p\n", principal); + ok(level == RPC_C_AUTHN_LEVEL_PKT_PRIVACY, "expected RPC_C_AUTHN_LEVEL_PKT_PRIVACY, got %d\n", level); + ok(authnsvc == RPC_C_AUTHN_WINNT, "expected RPC_C_AUTHN_WINNT, got %d\n", authnsvc); + todo_wine ok(authzsvc == RPC_C_AUTHZ_NAME, "expected RPC_C_AUTHZ_NAME, got %d\n", authzsvc); RpcStringFree(&principal); -} + status = RpcMgmtStopServerListening(NULL); ok(status == RPC_S_OK, "RpcMgmtStopServerListening failed (%u)\n", status); @@ -441,13 +432,7 @@ { LONG win32status; RPC_STATUS rpc_status; - BOOL on_win9x = FALSE; BOOL w2k3_up = FALSE; - - /* Win9x always returns the given status */ - win32status = I_RpcMapWin32Status(ERROR_ACCESS_DENIED); - if (win32status == ERROR_ACCESS_DENIED) - on_win9x = TRUE; /* Windows 2003 and Vista return STATUS_UNSUCCESSFUL if given an unknown status */ win32status = I_RpcMapWin32Status(9999); @@ -582,9 +567,6 @@ expected_win32status = rpc_status; } - if (on_win9x) - missing = TRUE; - ok(win32status == expected_win32status || broken(missing && win32status == rpc_status), "I_RpcMapWin32Status(%d) should have returned 0x%x instead of 0x%x%s\n", Modified: trunk/rostests/winetests/rpcrt4/rpc_async.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpc_asyn… ============================================================================== --- trunk/rostests/winetests/rpcrt4/rpc_async.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/rpc_async.c [iso-8859-1] Sun Aug 7 16:20:27 2011 @@ -25,8 +25,8 @@ #include <rpc.h> #include <rpcasync.h> -RPC_STATUS (RPC_ENTRY *pRpcAsyncInitializeHandle)(PRPC_ASYNC_STATE,unsigned int); -RPC_STATUS (RPC_ENTRY *pRpcAsyncGetCallStatus)(PRPC_ASYNC_STATE); +static RPC_STATUS (RPC_ENTRY *pRpcAsyncInitializeHandle)(PRPC_ASYNC_STATE,unsigned int); +static RPC_STATUS (RPC_ENTRY *pRpcAsyncGetCallStatus)(PRPC_ASYNC_STATE); static void test_RpcAsyncInitializeHandle(void) { Modified: trunk/rostests/winetests/rpcrt4/server.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/server.c… ============================================================================== --- trunk/rostests/winetests/rpcrt4/server.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/server.c [iso-8859-1] Sun Aug 7 16:20:27 2011 @@ -88,50 +88,77 @@ return d; } -int -s_int_return(void) +int __cdecl s_int_return(void) { return INT_CODE; } -int -s_square(int x) +int __cdecl s_square(int x) { return x * x; } -int -s_sum(int x, int y) +int __cdecl s_sum(int x, int y) { return x + y; } -void -s_square_out(int x, int *y) +signed char __cdecl s_sum_char(signed char x, signed char y) +{ + return x + y; +} + +short __cdecl s_sum_short(short x, short y) +{ + return x + y; +} + +int __cdecl s_sum_float(float x, float y) +{ + return x + y; +} + +int __cdecl s_sum_double_int(int x, double y) +{ + return x + y; +} + +hyper __cdecl s_sum_hyper(hyper x, hyper y) +{ + return x + y; +} + +int __cdecl s_sum_hyper_int(hyper x, hyper y) +{ + return x + y; +} + +int __cdecl s_sum_char_hyper(signed char x, hyper y) +{ + return x + y; +} + +void __cdecl s_square_out(int x, int *y) { *y = s_square(x); } -void -s_square_ref(int *x) +void __cdecl s_square_ref(int *x) { *x = s_square(*x); } -int -s_str_length(const char *s) +int __cdecl s_str_length(const char *s) { return strlen(s); } -int -s_str_t_length(str_t s) +int __cdecl s_str_t_length(str_t s) { return strlen(s); } -int -s_cstr_length(const char *s, int n) +int __cdecl s_cstr_length(const char *s, int n) { int len = 0; while (0 < n-- && *s++) @@ -139,65 +166,55 @@ return len; } -int -s_dot_self(vector_t *v) +int __cdecl s_dot_self(vector_t *v) { return s_square(v->x) + s_square(v->y) + s_square(v->z); } -double -s_square_half(double x, double *y) +double __cdecl s_square_half(double x, double *y) { *y = x / 2.0; return x * x; } -float -s_square_half_float(float x, float *y) +float __cdecl s_square_half_float(float x, float *y) { *y = x / 2.0f; return x * x; } -LONG -s_square_half_long(LONG x, LONG *y) +LONG __cdecl s_square_half_long(LONG x, LONG *y) { *y = x / 2; return x * x; } -int -s_sum_fixed_array(int a[5]) +int __cdecl s_sum_fixed_array(int a[5]) { return a[0] + a[1] + a[2] + a[3] + a[4]; } -int -s_pints_sum(pints_t *pints) +int __cdecl s_pints_sum(pints_t *pints) { return *pints->pi + **pints->ppi + ***pints->pppi; } -double -s_ptypes_sum(ptypes_t *pt) +double __cdecl s_ptypes_sum(ptypes_t *pt) { return *pt->pc + *pt->ps + *pt->pl + *pt->pf + *pt->pd; } -int -s_dot_pvectors(pvectors_t *p) +int __cdecl s_dot_pvectors(pvectors_t *p) { return p->pu->x * (*p->pv)->x + p->pu->y * (*p->pv)->y + p->pu->z * (*p->pv)->z; } -int -s_sum_sp(sp_t *sp) +int __cdecl s_sum_sp(sp_t *sp) { return sp->x + sp->s->x; } -double -s_square_sun(sun_t *su) +double __cdecl s_square_sun(sun_t *su) { switch (su->s) { @@ -210,16 +227,14 @@ } } -int -s_test_list_length(test_list_t *list) +int __cdecl s_test_list_length(test_list_t *list) { return (list->t == TL_LIST ? 1 + s_test_list_length(list->u.tail) : 0); } -int -s_sum_fixed_int_3d(int m[2][3][4]) +int __cdecl s_sum_fixed_int_3d(int m[2][3][4]) { int i, j, k; int sum = 0; @@ -232,8 +247,7 @@ return sum; } -int -s_sum_conf_array(int x[], int n) +int __cdecl s_sum_conf_array(int x[], int n) { int *p = x, *end = p + n; int sum = 0; @@ -244,8 +258,7 @@ return sum; } -int -s_sum_conf_ptr_by_conf_ptr(int n1, int *n2_then_x1, int *x2) +int __cdecl s_sum_conf_ptr_by_conf_ptr(int n1, int *n2_then_x1, int *x2) { int i; int sum = 0; @@ -261,20 +274,17 @@ return sum; } -int -s_sum_unique_conf_array(int x[], int n) +int __cdecl s_sum_unique_conf_array(int x[], int n) { return s_sum_conf_array(x, n); } -int -s_sum_unique_conf_ptr(int *x, int n) +int __cdecl s_sum_unique_conf_ptr(int *x, int n) { return x ? s_sum_conf_array(x, n) : 0; } -int -s_sum_var_array(int x[20], int n) +int __cdecl s_sum_var_array(int x[20], int n) { ok(0 <= n, "RPC sum_var_array\n"); ok(n <= 20, "RPC sum_var_array\n"); @@ -282,8 +292,7 @@ return s_sum_conf_array(x, n); } -int -s_sum_complex_array(int n, refpint_t pi[]) +int __cdecl s_sum_complex_array(int n, refpint_t pi[]) { int total = 0; for (; n > 0; n--) @@ -291,28 +300,24 @@ return total; } -int -s_dot_two_vectors(vector_t vs[2]) +int __cdecl s_dot_two_vectors(vector_t vs[2]) { return vs[0].x * vs[1].x + vs[0].y * vs[1].y + vs[0].z * vs[1].z; } -void -s_get_number_array(int x[20], int *n) +void __cdecl s_get_number_array(int x[20], int *n) { int c[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; memcpy(x, c, sizeof(c)); *n = sizeof(c)/sizeof(c[0]); } -int -s_sum_cs(cs_t *cs) +int __cdecl s_sum_cs(cs_t *cs) { return s_sum_conf_array(cs->ca, cs->n); } -int -s_sum_cps(cps_t *cps) +int __cdecl s_sum_cps(cps_t *cps) { int sum = 0; int i; @@ -326,8 +331,7 @@ return sum; } -int -s_sum_cpsc(cpsc_t *cpsc) +int __cdecl s_sum_cpsc(cpsc_t *cpsc) { int sum = 0; int i; @@ -336,15 +340,13 @@ return sum; } -int -s_square_puint(puint_t p) +int __cdecl s_square_puint(puint_t p) { int n = atoi(p); return n * n; } -int -s_sum_puints(puints_t *p) +int __cdecl s_sum_puints(puints_t *p) { int sum = 0; int i; @@ -353,8 +355,7 @@ return sum; } -int -s_sum_cpuints(cpuints_t *p) +int __cdecl s_sum_cpuints(cpuints_t *p) { int sum = 0; int i; @@ -363,21 +364,18 @@ return sum; } -int -s_dot_copy_vectors(vector_t u, vector_t v) +int __cdecl s_dot_copy_vectors(vector_t u, vector_t v) { return u.x * v.x + u.y * v.y + u.z * v.z; } -int -s_square_test_us(test_us_t *tus) +int __cdecl s_square_test_us(test_us_t *tus) { int n = atoi(tus->us.x); return n * n; } -double -s_square_encu(encu_t *eu) +double __cdecl s_square_encu(encu_t *eu) { switch (eu->t) { @@ -388,8 +386,7 @@ } } -double -s_square_unencu(int t, unencu_t *eu) +double __cdecl s_square_unencu(int t, unencu_t *eu) { switch (t) { @@ -400,20 +397,17 @@ } } -void -s_check_se2(se_t *s) +void __cdecl s_check_se2(se_t *s) { ok(s->f == E2, "check_se2\n"); } -int -s_sum_parr(int *a[3]) +int __cdecl s_sum_parr(int *a[3]) { return s_sum_pcarr(a, 3); } -int -s_sum_pcarr(int *a[], int n) +int __cdecl s_sum_pcarr(int *a[], int n) { int i, s = 0; for (i = 0; i < n; ++i) @@ -421,8 +415,7 @@ return s; } -int -s_enum_ord(e_t e) +int __cdecl s_enum_ord(e_t e) { switch (e) { @@ -435,8 +428,7 @@ } } -double -s_square_encue(encue_t *eue) +double __cdecl s_square_encue(encue_t *eue) { switch (eue->t) { @@ -447,8 +439,7 @@ } } -int -s_sum_toplev_conf_2n(int *x, int n) +int __cdecl s_sum_toplev_conf_2n(int *x, int n) { int sum = 0; int i; @@ -457,8 +448,7 @@ return sum; } -int -s_sum_toplev_conf_cond(int *x, int a, int b, int c) +int __cdecl s_sum_toplev_conf_cond(int *x, int a, int b, int c) { int sum = 0; int n = c ? a : b; @@ -468,26 +458,22 @@ return sum; } -double -s_sum_aligns(aligns_t *a) +double __cdecl s_sum_aligns(aligns_t *a) { return a->c + a->i + a->s + a->d; } -int -s_sum_padded(padded_t *p) +int __cdecl s_sum_padded(padded_t *p) { return p->i + p->c; } -int -s_sum_padded2(padded_t ps[2]) +int __cdecl s_sum_padded2(padded_t ps[2]) { return s_sum_padded(&ps[0]) + s_sum_padded(&ps[1]); } -int -s_sum_padded_conf(padded_t *ps, int n) +int __cdecl s_sum_padded_conf(padded_t *ps, int n) { int sum = 0; int i; @@ -496,32 +482,27 @@ return sum; } -int -s_sum_bogus(bogus_t *b) +int __cdecl s_sum_bogus(bogus_t *b) { return *b->h.p1 + *b->p2 + *b->p3 + b->c; } -void -s_check_null(int *null) +void __cdecl s_check_null(int *null) { ok(!null, "RPC check_null\n"); } -int -s_str_struct_len(str_struct_t *s) +int __cdecl s_str_struct_len(str_struct_t *s) { return lstrlenA(s->s); } -int -s_wstr_struct_len(wstr_struct_t *s) +int __cdecl s_wstr_struct_len(wstr_struct_t *s) { return lstrlenW(s->s); } -int -s_sum_doub_carr(doub_carr_t *dc) +int __cdecl s_sum_doub_carr(doub_carr_t *dc) { int i, j; int sum = 0; @@ -531,8 +512,7 @@ return sum; } -void -s_make_pyramid_doub_carr(unsigned char n, doub_carr_t **dc) +void __cdecl s_make_pyramid_doub_carr(unsigned char n, doub_carr_t **dc) { doub_carr_t *t; int i, j; @@ -549,8 +529,7 @@ *dc = t; } -unsigned -s_hash_bstr(bstr_t b) +unsigned __cdecl s_hash_bstr(bstr_t b) { short n = b[-1]; short *s = b; @@ -561,8 +540,16 @@ return hash; } -void -s_get_name(name_t *name) +void __cdecl s_get_a_bstr(bstr_t *b) +{ + bstr_t bstr; + short str[] = {5, 'W', 'i', 'n', 'e', 0}; + bstr = HeapAlloc(GetProcessHeap(), 0, sizeof(str)); + memcpy(bstr, str, sizeof(str)); + *b = bstr + 1; +} + +void __cdecl s_get_name(name_t *name) { const char bossman[] = "Jeremy White"; memcpy(name->name, bossman, min(name->size, sizeof(bossman))); @@ -571,14 +558,12 @@ name->name[name->size - 1] = 0; } -int -s_sum_pcarr2(int n, int **pa) +int __cdecl s_sum_pcarr2(int n, int **pa) { return s_sum_conf_array(*pa, n); } -int -s_sum_L1_norms(int n, vector_t *vs) +int __cdecl s_sum_L1_norms(int n, vector_t *vs) { int i; int sum = 0; @@ -587,8 +572,7 @@ return sum; } -s123_t * -s_get_s123(void) +s123_t * __cdecl s_get_s123(void) { s123_t *s = MIDL_user_allocate(sizeof *s); s->f1 = 1; @@ -597,24 +581,22 @@ return s; } -str_t -s_get_filename(void) +str_t __cdecl s_get_filename(void) { return (char *)__FILE__; } -int s_echo_ranged_int(int n) +int __cdecl s_echo_ranged_int(int n) { return n; } -void s_get_ranged_enum(renum_t *re) +void __cdecl s_get_ranged_enum(renum_t *re) { *re = RE3; } -void -s_context_handle_test(void) +void __cdecl s_context_handle_test(void) { NDR_SCONTEXT h; RPC_BINDING_HANDLE binding; @@ -714,8 +696,7 @@ } } -void -s_get_numbers(int length, int size, pints_t n[]) +void __cdecl s_get_numbers(int length, int size, pints_t n[]) { int i; for (i = 0; i < length; i++) @@ -727,8 +708,7 @@ } } -void -s_get_numbers_struct(numbers_struct_t **ns) +void __cdecl s_get_numbers_struct(numbers_struct_t **ns) { int i; *ns = midl_user_allocate(FIELD_OFFSET(numbers_struct_t, numbers[5])); @@ -745,23 +725,20 @@ *(*ns)->numbers[0].pi = 5; } -void -s_full_pointer_test(int *a, int *b) +void __cdecl s_full_pointer_test(int *a, int *b) { ok(*a == 42, "Expected *a to be 42 instead of %d\n", *a); ok(*b == 42, "Expected *b to be 42 instead of %d\n", *a); ok(a == b, "Expected a (%p) to point to the same memory as b (%p)\n", a, b); } -void -s_full_pointer_null_test(int *a, int *b) +void __cdecl s_full_pointer_null_test(int *a, int *b) { ok(*a == 42, "Expected *a to be 42 instead of %d\n", *a); ok(b == NULL, "Expected b to be NULL instead of %p\n", b); } -void -s_stop(void) +void __cdecl s_stop(void) { ok(RPC_S_OK == RpcMgmtStopServerListening(NULL), "RpcMgmtStopServerListening\n"); ok(RPC_S_OK == RpcServerUnregisterIf(NULL, NULL, FALSE), "RpcServerUnregisterIf\n"); @@ -815,6 +792,7 @@ short h; char c; int x; + hyper y; str_struct_t ss = {string}; wstr_struct_t ws = {wstring}; str_t str; @@ -824,7 +802,22 @@ ok(int_return() == INT_CODE, "RPC int_return\n"); ok(square(7) == 49, "RPC square\n"); - ok(sum(23, -4) == 19, "RPC sum\n"); + x = sum(23, -4); + ok(x == 19, "RPC sum got %d\n", x); + c = sum_char(-23, 50); + ok(c == 27, "RPC sum_char got %d\n", (int)c); + h = sum_short(1122, -344); + ok(h == 778, "RPC sum_short got %d\n", (int)h); + x = sum_float(123.45, -32.2); + ok(x == 91, "RPC sum_float got %d\n", x); + x = sum_double_int(-78, 148.46); + ok(x == 70, "RPC sum_double_int got %d\n", x); + y = sum_hyper((hyper)0x12345678 << 16, (hyper)0x33557799 << 16); + ok(y == (hyper)0x4589ce11 << 16, "RPC hyper got %x%08x\n", (DWORD)(y >> 32), (DWORD)y); + x = sum_hyper_int((hyper)0x24242424 << 16, -((hyper)0x24241212 << 16)); + ok(x == 0x12120000, "RPC hyper_int got 0x%x\n", x); + x = sum_char_hyper( 12, ((hyper)0x42424242 << 32) | 0x33334444 ); + ok(x == 0x33334450, "RPC char_hyper got 0x%x\n", x); x = 0; square_out(11, &x); @@ -1119,7 +1112,7 @@ puints_t pus; cpuints_t cpus; short bstr_data[] = { 5, 'H', 'e', 'l', 'l', 'o' }; - bstr_t bstr = &bstr_data[1]; + bstr_t bstr = &bstr_data[1], bstr2; name_t name; void *buffer; int *pa2; @@ -1167,6 +1160,12 @@ ok(hash_bstr(bstr) == s_hash_bstr(bstr), "RPC hash_bstr_data\n"); + get_a_bstr(&bstr); + s_get_a_bstr(&bstr2); + ok(!lstrcmpW((LPCWSTR)bstr, (LPCWSTR)bstr2), "bstr mismatch\n"); + HeapFree(GetProcessHeap(), 0, bstr - 1); + HeapFree(GetProcessHeap(), 0, bstr2 - 1); + free_list(list); if (!old_windows_version) @@ -1352,6 +1351,69 @@ HeapFree(GetProcessHeap(), 0, pi); } +void __cdecl s_authinfo_test(unsigned int protseq, int secure) +{ + RPC_BINDING_HANDLE binding; + RPC_STATUS status; + ULONG level, authnsvc; + RPC_AUTHZ_HANDLE privs; + unsigned char *principal; + + binding = I_RpcGetCurrentCallHandle(); + ok(binding != NULL, "I_RpcGetCurrentCallHandle returned NULL\n"); + + level = authnsvc = 0xdeadbeef; + privs = (RPC_AUTHZ_HANDLE)0xdeadbeef; + principal = (unsigned char *)0xdeadbeef; + + if (secure || protseq == RPC_PROTSEQ_LRPC) + { + status = RpcBindingInqAuthClientA(binding, &privs, &principal, &level, &authnsvc, NULL); + if (status == RPC_S_CANNOT_SUPPORT) + { + win_skip("RpcBindingInqAuthClientA not supported\n"); + return; + } + ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); + ok(privs != (RPC_AUTHZ_HANDLE)0xdeadbeef, "privs unchanged\n"); + ok(principal != (unsigned char *)0xdeadbeef, "principal unchanged\n"); + if (protseq != RPC_PROTSEQ_LRPC) + { + todo_wine + ok(principal != NULL, "NULL principal\n"); + } + if (protseq == RPC_PROTSEQ_LRPC && principal && pGetUserNameExA) + { + int len; + char *spn; + + len = WideCharToMultiByte(CP_ACP, 0, (const WCHAR *)privs, -1, NULL, 0, NULL, NULL); + spn = HeapAlloc( GetProcessHeap(), 0, len ); + WideCharToMultiByte(CP_ACP, 0, (const WCHAR *)privs, -1, spn, len, NULL, NULL); + + ok(!strcmp(domain_and_user, spn), "expected %s got %s\n", domain_and_user, spn); + HeapFree( GetProcessHeap(), 0, spn ); + } + ok(level == RPC_C_AUTHN_LEVEL_PKT_PRIVACY, "level unchanged\n"); + ok(authnsvc == RPC_C_AUTHN_WINNT, "authnsvc unchanged\n"); + + status = RpcImpersonateClient(NULL); + ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); + status = RpcRevertToSelf(); + ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); + + } + else + { + status = RpcBindingInqAuthClientA(binding, &privs, &principal, &level, &authnsvc, NULL); + ok(status == RPC_S_BINDING_HAS_NO_AUTH, "expected RPC_S_BINDING_HAS_NO_AUTH got %u\n", status); + ok(privs == (RPC_AUTHZ_HANDLE)0xdeadbeef, "got %p\n", privs); + ok(principal == (unsigned char *)0xdeadbeef, "got %s\n", principal); + ok(level == 0xdeadbeef, "got %u\n", level); + ok(authnsvc == 0xdeadbeef, "got %u\n", authnsvc); + } +} + static void run_tests(void) { Modified: trunk/rostests/winetests/rpcrt4/server.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/server.i… ============================================================================== --- trunk/rostests/winetests/rpcrt4/server.idl [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/server.idl [iso-8859-1] Sun Aug 7 16:20:27 2011 @@ -31,9 +31,7 @@ [ uuid(00000000-4114-0704-2301-000000000000), -#ifndef __midl implicit_handle(handle_t IServer_IfHandle) -#endif ] interface IServer { @@ -81,6 +79,13 @@ int int_return(void); int square(int x); int sum(int x, int y); + signed char sum_char(signed char x, signed char y); + short sum_short(short x, short y); + int sum_float(float x, float y); + int sum_double_int(int x, double y); + hyper sum_hyper(hyper x, hyper y); + int sum_hyper_int(hyper x, hyper y); + int sum_char_hyper(signed char x, hyper y); void square_out(int x, [out] int *y); void square_ref([in, out] int *x); int str_length([string] const char *s); @@ -157,7 +162,7 @@ int sum_cs(cs_t *cs); int sum_cps(cps_t *cps); int sum_cpsc(cpsc_t *cpsc); - int sum_complex_array(int n, refpint_t pi[n]); + int sum_complex_array(int n, [size_is(n)] refpint_t pi[]); typedef [wire_marshal(int)] void *puint_t; int square_puint(puint_t p); @@ -311,7 +316,7 @@ typedef [unique] user_bstr_t *wire_bstr_t; typedef [wire_marshal(wire_bstr_t)] short *bstr_t; unsigned hash_bstr(bstr_t s); - + void get_a_bstr([out]bstr_t *s); typedef struct { [string, size_is(size)] char *name;

1 0

[jgardou] 53118: [RPCRT4] - sync with wine 1.3.26 MAny thanks to Filip Navara for his invaluable help.
by jgardou＠svn.reactos.org 07 Aug '11

07 Aug '11

Author: jgardou Date: Sun Aug 7 16:15:10 2011 New Revision: 53118 URL: http://svn.reactos.org/svn/reactos?rev=53118&view=rev Log: [RPCRT4] - sync with wine 1.3.26 MAny thanks to Filip Navara for his invaluable help. Added: trunk/reactos/dll/win32/rpcrt4/version.rc (with props) Modified: trunk/reactos/dll/win32/rpcrt4/cproxy.c trunk/reactos/dll/win32/rpcrt4/cpsf.c trunk/reactos/dll/win32/rpcrt4/cpsf.h trunk/reactos/dll/win32/rpcrt4/cstub.c trunk/reactos/dll/win32/rpcrt4/msvc.S trunk/reactos/dll/win32/rpcrt4/ndr_es.c trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c trunk/reactos/dll/win32/rpcrt4/ndr_misc.h trunk/reactos/dll/win32/rpcrt4/ndr_ole.c trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c trunk/reactos/dll/win32/rpcrt4/ndr_stubless.h trunk/reactos/dll/win32/rpcrt4/rpc_assoc.c trunk/reactos/dll/win32/rpcrt4/rpc_assoc.h trunk/reactos/dll/win32/rpcrt4/rpc_async.c trunk/reactos/dll/win32/rpcrt4/rpc_binding.c trunk/reactos/dll/win32/rpcrt4/rpc_binding.h trunk/reactos/dll/win32/rpcrt4/rpc_defs.h trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c trunk/reactos/dll/win32/rpcrt4/rpc_message.c trunk/reactos/dll/win32/rpcrt4/rpc_message.h trunk/reactos/dll/win32/rpcrt4/rpc_server.c trunk/reactos/dll/win32/rpcrt4/rpc_server.h trunk/reactos/dll/win32/rpcrt4/rpc_transport.c trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/rpcrt4/cproxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cproxy.c?… Modified: trunk/reactos/dll/win32/rpcrt4/cpsf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cpsf.c?re… Modified: trunk/reactos/dll/win32/rpcrt4/cpsf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cpsf.h?re… Modified: trunk/reactos/dll/win32/rpcrt4/cstub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cstub.c?r… Modified: trunk/reactos/dll/win32/rpcrt4/msvc.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/msvc.S?re… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_es.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_es.c?… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_marsh… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_misc.… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_ole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_ole.c… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_stubl… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_stubless.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_stubl… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_assoc… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_assoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_assoc… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_async.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_async… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_bindi… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_bindi… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_defs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_defs.… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_epmap… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_messa… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_message.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_messa… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_serve… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_server.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_serve… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_trans… Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.rb… Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.sp… Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4_ma… Added: trunk/reactos/dll/win32/rpcrt4/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/version.r…

1 0

[jgardou] 53117: [CMAKE] remove useless file
by jgardou＠svn.reactos.org 07 Aug '11

07 Aug '11

Author: jgardou Date: Sun Aug 7 14:26:36 2011 New Revision: 53117 URL: http://svn.reactos.org/svn/reactos?rev=53117&view=rev Log: [CMAKE] remove useless file Removed: trunk/reactos/include/reactos/idl/CMakeLists.txt Removed: trunk/reactos/include/reactos/idl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/CMakeL… ============================================================================== --- trunk/reactos/include/reactos/idl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/CMakeLists.txt (removed) @@ -1,12 +1,0 @@ - -include_directories(.) - -add_rpc_library(eventlogrpc eventlogrpc.idl) -add_rpc_library(lsarpc lsa.idl) -add_rpc_library(svcctlrpc svcctl.idl) -add_rpc_library(wlansvcrpc wlansvc.idl) - -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) - -add_rpc_library(pnprpc pnp.idl)

1 0

[jgardou] 53116: [CMAKE] - add the possibility to add dependencies to PCH. - Use it to fix advapi32 build
by jgardou＠svn.reactos.org 07 Aug '11

07 Aug '11

Author: jgardou Date: Sun Aug 7 11:13:45 2011 New Revision: 53116 URL: http://svn.reactos.org/svn/reactos?rev=53116&view=rev Log: [CMAKE] - add the possibility to add dependencies to PCH. - Use it to fix advapi32 build Modified: trunk/reactos/cmake/gcc.cmake trunk/reactos/cmake/idl-support.cmake trunk/reactos/dll/win32/advapi32/CMakeLists.txt Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=53116&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Aug 7 11:13:45 2011 @@ -334,7 +334,10 @@ set(__compiler ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}) endif() - add_custom_command(OUTPUT ${_gch_filename} COMMAND ${__compiler} ${_args} IMPLICIT_DEPENDS ${__lang} ${_header_filename}) + add_custom_command(OUTPUT ${_gch_filename} + COMMAND ${__compiler} ${_args} + IMPLICIT_DEPENDS ${__lang} ${_header_filename} + DEPENDS ${_header_filename} ${ARGN}) get_target_property(_src_files ${_target_name} SOURCES) foreach(_item in ${_src_files}) get_source_file_property(__src_lang ${_item} LANGUAGE) Modified: trunk/reactos/cmake/idl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/idl-support.cmake?re… ============================================================================== --- trunk/reactos/cmake/idl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/idl-support.cmake [iso-8859-1] Sun Aug 7 11:13:45 2011 @@ -138,7 +138,6 @@ if(NOT IS_ABSOLUTE ${FILE}) set(FILE ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) endif() - file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${__name}.c ${CMAKE_CURRENT_BINARY_DIR}/${__name}.h) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${__name}.c ${CMAKE_CURRENT_BINARY_DIR}/${__name}.h COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG2} ${CMAKE_CURRENT_BINARY_DIR}/${__name}.h ${__server_client} ${CMAKE_CURRENT_BINARY_DIR}/${__name}.c ${FILE} Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] Sun Aug 7 11:13:45 2011 @@ -65,6 +65,8 @@ add_importlibs(advapi32 rpcrt4 kernel32 ntdll msvcrt) -add_pch(advapi32 advapi32.h) +add_pch(advapi32 advapi32.h + ${CMAKE_CURRENT_BINARY_DIR}/lsa_c.h + ${CMAKE_CURRENT_BINARY_DIR}/eventlogrpc_c.h) add_cd_file(TARGET advapi32 DESTINATION reactos/system32 FOR all) add_importlib_target(advapi32.spec)

1 0

[jgardou] 53115: [CMAKE] - tentative to fix buildbot cmake build
by jgardou＠svn.reactos.org 07 Aug '11

07 Aug '11

Author: jgardou Date: Sun Aug 7 11:03:24 2011 New Revision: 53115 URL: http://svn.reactos.org/svn/reactos?rev=53115&view=rev Log: [CMAKE] - tentative to fix buildbot cmake build Modified: trunk/reactos/cmake/idl-support.cmake Modified: trunk/reactos/cmake/idl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/idl-support.cmake?re… ============================================================================== --- trunk/reactos/cmake/idl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/idl-support.cmake [iso-8859-1] Sun Aug 7 11:03:24 2011 @@ -138,6 +138,7 @@ if(NOT IS_ABSOLUTE ${FILE}) set(FILE ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) endif() + file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${__name}.c ${CMAKE_CURRENT_BINARY_DIR}/${__name}.h) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${__name}.c ${CMAKE_CURRENT_BINARY_DIR}/${__name}.h COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG2} ${CMAKE_CURRENT_BINARY_DIR}/${__name}.h ${__server_client} ${CMAKE_CURRENT_BINARY_DIR}/${__name}.c ${FILE}

1 0

[jgardou] 53114: [RPCSS] -Fix build
by jgardou＠svn.reactos.org 07 Aug '11

07 Aug '11

Author: jgardou Date: Sun Aug 7 01:25:31 2011 New Revision: 53114 URL: http://svn.reactos.org/svn/reactos?rev=53114&view=rev Log: [RPCSS] -Fix build Modified: trunk/reactos/base/services/rpcss/irotp.c trunk/reactos/base/services/rpcss/rpcss_main.c Modified: trunk/reactos/base/services/rpcss/irotp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/irotp.… ============================================================================== --- trunk/reactos/base/services/rpcss/irotp.c [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/irotp.c [iso-8859-1] Sun Aug 7 01:25:31 2011 @@ -25,7 +25,7 @@ #include "windef.h" #include "winbase.h" -#include "irot.h" +#include "irot_s.h" #include "wine/list.h" #include "wine/debug.h" Modified: trunk/reactos/base/services/rpcss/rpcss_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss_… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss_main.c [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/rpcss_main.c [iso-8859-1] Sun Aug 7 01:25:31 2011 @@ -51,8 +51,8 @@ #define NONAMELESSSTRUCT #include "rpcss.h" #include "winnt.h" -#include "irot.h" -#include "epm.h" +#include "irot_s.h" +#include "epm_s.h" #include "wine/debug.h"

1 0

[jgardou] 53113: [ROSTESTS/CMAKE] - fix rpcrt4 winetest build file according to r53112
by jgardou＠svn.reactos.org 07 Aug '11

07 Aug '11

Author: jgardou Date: Sun Aug 7 00:54:26 2011 New Revision: 53113 URL: http://svn.reactos.org/svn/reactos?rev=53113&view=rev Log: [ROSTESTS/CMAKE] - fix rpcrt4 winetest build file according to r53112 Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/CMakeLis… ============================================================================== --- trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] Sun Aug 7 00:54:26 2011 @@ -6,7 +6,8 @@ -D__ROS_LONG64__ -D_DLL -D__USE_CRTIMP) -add_rpc_library(serverrpc server.idl) +add_rpc_files(client server.idl) +add_rpc_files(server server.idl) list(APPEND SOURCE cstub.c @@ -16,13 +17,14 @@ rpc_async.c rpc_protseq.c server.c - testlist.c) + testlist.c + ${CMAKE_CURRENT_BINARY_DIR}/server_c.c + ${CMAKE_CURRENT_BINARY_DIR}/server_s.c) add_executable(rpcrt4_winetest ${SOURCE}) target_link_libraries(rpcrt4_winetest uuid wine - serverrpc ${PSEH_LIB}) set_module_type(rpcrt4_winetest win32cui)

1 0

[jgardou] 53112: [CMAKE][CMAKE] - turn most macros in function 2/x. - separate rpc server and client stubs, and generate them directly instead of using a library, so they got the flags that the mod...
by jgardou＠svn.reactos.org 07 Aug '11

07 Aug '11

Author: jgardou Date: Sun Aug 7 00:53:19 2011 New Revision: 53112 URL: http://svn.reactos.org/svn/reactos?rev=53112&view=rev Log: [CMAKE][CMAKE] - turn most macros in function 2/x. - separate rpc server and client stubs, and generate them directly instead of using a library, so they got the flags that the module uses. - commit forgotten file from r53088 - get rid of winesdk target, it's useless now Modified: trunk/reactos/CMakeLists.txt trunk/reactos/base/services/eventlog/CMakeLists.txt trunk/reactos/base/services/rpcss/CMakeLists.txt trunk/reactos/base/services/umpnpmgr/CMakeLists.txt trunk/reactos/base/services/wlansvc/CMakeLists.txt trunk/reactos/base/system/services/CMakeLists.txt trunk/reactos/boot/bootdata/packages/CMakeLists.txt trunk/reactos/cmake/idl-support.cmake trunk/reactos/dll/win32/advapi32/CMakeLists.txt trunk/reactos/dll/win32/lsasrv/CMakeLists.txt trunk/reactos/dll/win32/ole32/CMakeLists.txt trunk/reactos/dll/win32/qmgrprxy/CMakeLists.txt trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt trunk/reactos/dll/win32/setupapi/CMakeLists.txt trunk/reactos/dll/win32/wlanapi/CMakeLists.txt trunk/reactos/include/reactos/wine/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=53112&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Sun Aug 7 00:53:19 2011 @@ -202,7 +202,6 @@ add_subdirectory(include/psdk) add_subdirectory(include/dxsdk) - add_subdirectory(include/reactos/idl) add_subdirectory(include/reactos/wine) add_subdirectory(include/reactos/mc) add_subdirectory(include/asm) Modified: trunk/reactos/base/services/eventlog/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/CMa… ============================================================================== --- trunk/reactos/base/services/eventlog/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/CMakeLists.txt [iso-8859-1] Sun Aug 7 00:53:19 2011 @@ -1,5 +1,8 @@ -include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl + ${CMAKE_CURRENT_BINARY_DIR}) + +add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/eventlogrpc.idl) set_unicode() @@ -9,11 +12,14 @@ logport.c eventlog.rc rpc.c - file.c) + file.c + ${CMAKE_CURRENT_BINARY_DIR}/eventlogrpc_s.c) add_executable(eventlog ${SOURCE}) -target_link_libraries(eventlog eventlogrpc ${PSEH_LIB}) +if(NOT MSVC) + target_link_libraries(eventlog pseh) +endif() set_module_type(eventlog win32cui) add_importlibs(eventlog advapi32 rpcrt4 msvcrt kernel32 ntdll) Modified: trunk/reactos/base/services/rpcss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/CMakeL… ============================================================================== --- trunk/reactos/base/services/rpcss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/CMakeLists.txt [iso-8859-1] Sun Aug 7 00:53:19 2011 @@ -1,4 +1,8 @@ +add_rpc_files(server + ${REACTOS_SOURCE_DIR}/include/reactos/wine/epm.idl + ${REACTOS_SOURCE_DIR}/include/reactos/wine/irot.idl) + set_unicode() list(APPEND SOURCE @@ -6,16 +10,19 @@ irotp.c rpcss_main.c service_main.c - rpcss.rc) + rpcss.rc + ${CMAKE_CURRENT_BINARY_DIR}/epm_s.c + ${CMAKE_CURRENT_BINARY_DIR}/irot_s.c) include_directories(${REACTOS_BINARY_DIR}/include/reactos/wine) add_executable(rpcss ${SOURCE}) -target_link_libraries(rpcss epmrpc irotrpc ${PSEH_LIB} wine) +target_link_libraries(rpcss + ${PSEH_LIB} + wine) set_module_type(rpcss win32cui) add_importlibs(rpcss advapi32 rpcrt4 msvcrt kernel32 ntdll) add_cd_file(TARGET rpcss DESTINATION reactos/system32 FOR all) -add_dependencies(rpcss winesdk) Modified: trunk/reactos/base/services/umpnpmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/CMa… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/CMakeLists.txt [iso-8859-1] Sun Aug 7 00:53:19 2011 @@ -1,13 +1,21 @@ -set_unicode() - -include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -add_executable(umpnpmgr umpnpmgr.c umpnpmgr.rc) -target_link_libraries(umpnpmgr pnprpc wdmguid ${PSEH_LIB}) +add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/pnp.idl) + +set_unicode() + +add_executable(umpnpmgr + umpnpmgr.c + umpnpmgr.rc + ${CMAKE_CURRENT_BINARY_DIR}/pnp_s.c) + +target_link_libraries(umpnpmgr + wdmguid + ${PSEH_LIB}) set_module_type(umpnpmgr win32cui) add_importlibs(umpnpmgr advapi32 rpcrt4 userenv msvcrt kernel32 ntdll) Modified: trunk/reactos/base/services/wlansvc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wlansvc/CMak… ============================================================================== --- trunk/reactos/base/services/wlansvc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/wlansvc/CMakeLists.txt [iso-8859-1] Sun Aug 7 00:53:19 2011 @@ -1,10 +1,18 @@ + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl) + +add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/wlansvc.idl) set_unicode() -include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl) -add_executable(wlansvc wlansvc.c rpcserver.c) +add_executable(wlansvc + wlansvc.c + rpcserver.c + ${CMAKE_CURRENT_BINARY_DIR}/wlansvc_s.c) -target_link_libraries(wlansvc wlansvcrpc ${PSEH_LIB}) +if(NOT MSVC) + target_link_libraries(wlansvc pseh) +endif() set_module_type(wlansvc win32cui) add_importlibs(wlansvc advapi32 rpcrt4 iphlpapi msvcrt kernel32 ntdll) Modified: trunk/reactos/base/system/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/CMake… ============================================================================== --- trunk/reactos/base/system/services/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/services/CMakeLists.txt [iso-8859-1] Sun Aug 7 00:53:19 2011 @@ -1,9 +1,11 @@ + +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/subsys + ${REACTOS_SOURCE_DIR}/include/reactos/idl) + +add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/svcctl.idl) set_unicode() - -include_directories( - ${REACTOS_BINARY_DIR}/include/reactos/idl - ${REACTOS_SOURCE_DIR}/include/reactos/subsys) list(APPEND SOURCE config.c @@ -12,13 +14,14 @@ groupdb.c rpcserver.c services.c - services.rc) + services.rc + ${CMAKE_CURRENT_BINARY_DIR}/svcctl_s.c) add_executable(services ${SOURCE}) -target_link_libraries(services - svcctlrpc - ${PSEH_LIB}) +if(NOT MSVC) + target_link_libraries(services pseh) +endif() set_module_type(services win32cui) add_importlibs(services user32 advapi32 rpcrt4 msvcrt kernel32 ntdll) Modified: trunk/reactos/boot/bootdata/packages/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/CMa… ============================================================================== --- trunk/reactos/boot/bootdata/packages/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/CMakeLists.txt [iso-8859-1] Sun Aug 7 00:53:19 2011 @@ -31,11 +31,11 @@ add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -L ${CMAKE_CURRENT_BINARY_DIR} -I -P ${REACTOS_SOURCE_DIR} - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff) + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff native-cabman) # Then we create the actual cab file using a custom target add_custom_target(reactos_cab COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -RC ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf -L ${CMAKE_CURRENT_BINARY_DIR} -N -P ${REACTOS_SOURCE_DIR} - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf) + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf native-cabman) add_cd_file(TARGET reactos_cab FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf DESTINATION reactos NO_CAB FOR bootcd regtest) Modified: trunk/reactos/cmake/idl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/idl-support.cmake?re… ============================================================================== --- trunk/reactos/cmake/idl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/idl-support.cmake [iso-8859-1] Sun Aug 7 00:53:19 2011 @@ -37,23 +37,23 @@ endif() -macro(get_includes OUTPUT_VAR) - set(${OUTPUT_VAR} "") +function(get_includes OUTPUT_VAR) get_directory_property(_includes INCLUDE_DIRECTORIES) foreach(arg ${_includes}) - set(${OUTPUT_VAR} -I${arg} ${${OUTPUT_VAR}}) + list(APPEND __tmp_var -I${arg}) endforeach() -endmacro() + set(${OUTPUT_VAR} ${__tmp_var} PARENT_SCOPE) +endfunction() -macro(get_defines OUTPUT_VAR) - set(${OUTPUT_VAR} "") +function(get_defines OUTPUT_VAR) get_directory_property(_defines COMPILE_DEFINITIONS) foreach(arg ${_defines}) - set(${OUTPUT_VAR} ${${OUTPUT_VAR}} -D${arg}) + list(APPEND __tmp_var -D${arg}) endforeach() -endmacro() + set(${OUTPUT_VAR} ${__tmp_var} PARENT_SCOPE) +endfunction() -macro(add_typelib TARGET) +function(add_typelib TARGET) get_includes(INCLUDES) get_defines(DEFINES) foreach(FILE ${ARGN}) @@ -65,9 +65,9 @@ list(APPEND OBJECTS ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.tlb) endforeach() add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS}) -endmacro() +endfunction() -macro(add_idl_headers TARGET) +function(add_idl_headers TARGET) get_includes(INCLUDES) get_defines(DEFINES) foreach(FILE ${ARGN}) @@ -79,10 +79,10 @@ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${IDL_DEPENDS}) list(APPEND HEADERS ${HEADER}) endforeach() - add_custom_target(${TARGET} ALL DEPENDS ${HEADERS}) -endmacro() + add_custom_target(${TARGET} DEPENDS ${HEADERS}) +endfunction() -macro(add_rpcproxy_files) +function(add_rpcproxy_files) get_includes(INCLUDES) get_defines(DEFINES) @@ -117,30 +117,35 @@ COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} --dlldata-only -o ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c ${IDLS} DEPENDS ${IDLS} ${IDL_DEPENDS}) endif() -endmacro() +endfunction() -macro(add_rpc_library TARGET) +function(add_rpc_files __type) get_includes(INCLUDES) get_defines(DEFINES) + # Is it a client or server module? + if(__type STREQUAL server) + set(__server_client ${IDL_SERVER_ARG}) + set(__suffix _s) + elseif(__type STREQUAL client) + set(__server_client ${IDL_CLIENT_ARG}) + set(__suffix _c) + else() + message(FATAL_ERROR "Please pass either server or client as argument to add_rpc_files") + endif() foreach(FILE ${ARGN}) - get_filename_component(NAME ${FILE} NAME_WE) + get_filename_component(__name ${FILE} NAME_WE) + set(__name ${__name}${__suffix}) + if(NOT IS_ABSOLUTE ${FILE}) + set(FILE ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) + endif() add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.c ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.h - COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG2} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.h ${IDL_SERVER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${IDL_DEPENDS}) - list(APPEND server_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.c) + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${__name}.c ${CMAKE_CURRENT_BINARY_DIR}/${__name}.h + COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG2} ${CMAKE_CURRENT_BINARY_DIR}/${__name}.h ${__server_client} ${CMAKE_CURRENT_BINARY_DIR}/${__name}.c ${FILE} + DEPENDS ${FILE} ${IDL_DEPENDS}) + endforeach() +endfunction() - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.c ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.h - COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG2} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.h ${IDL_CLIENT_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${IDL_DEPENDS}) - list(APPEND client_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.c) - endforeach() - add_library(${TARGET} ${client_SOURCES} ${server_SOURCES}) - add_dependencies(${TARGET} psdk) -endmacro() - -macro(generate_idl_iids IDL_FILE) +function(generate_idl_iids IDL_FILE) get_filename_component(FILE ${IDL_FILE} NAME) if(FILE STREQUAL "${IDL_FILE}") set(IDL_FILE_FULL "${CMAKE_CURRENT_SOURCE_DIR}/${IDL_FILE}") @@ -155,9 +160,9 @@ COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_INTERFACE_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_i.c ${IDL_FILE_FULL} DEPENDS ${IDL_FILE_FULL} ${IDL_DEPENDS}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${NAME}_i.c PROPERTIES GENERATED TRUE) -endmacro() +endfunction() -macro(add_iid_library TARGET) +function(add_iid_library TARGET) foreach(IDL_FILE ${ARGN}) get_filename_component(NAME ${IDL_FILE} NAME_WE) generate_idl_iids(${IDL_FILE}) @@ -165,4 +170,5 @@ endforeach() add_library(${TARGET} ${IID_SOURCES}) add_dependencies(${TARGET} psdk) -endmacro() + set_target_properties(${TARGET} PROPERTIES EXCLUDE_FROM_ALL TRUE) +endfunction() Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] Sun Aug 7 00:53:19 2011 @@ -1,5 +1,3 @@ - -set_unicode() spec2def(advapi32.dll advapi32.spec) @@ -8,7 +6,16 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl) +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/idl + ${CMAKE_CURRENT_BINARY_DIR}) + +add_rpc_files(client + ${REACTOS_SOURCE_DIR}/include/reactos/idl/eventlogrpc.idl + ${REACTOS_SOURCE_DIR}/include/reactos/idl/lsa.idl + ${REACTOS_SOURCE_DIR}/include/reactos/idl/svcctl.idl) + +set_unicode() list(APPEND SOURCE crypt/crypt.c @@ -43,16 +50,16 @@ token/token.c advapi32.rc ${CMAKE_CURRENT_BINARY_DIR}/advapi32_stubs.c - ${CMAKE_CURRENT_BINARY_DIR}/advapi32.def) + ${CMAKE_CURRENT_BINARY_DIR}/advapi32.def + ${CMAKE_CURRENT_BINARY_DIR}/eventlogrpc_c.c + ${CMAKE_CURRENT_BINARY_DIR}/lsa_c.c + ${CMAKE_CURRENT_BINARY_DIR}/svcctl_c.c) add_library(advapi32 SHARED ${SOURCE}) set_module_type(advapi32 win32dll) target_link_libraries(advapi32 - svcctlrpc - lsarpc - eventlogrpc wine ${PSEH_LIB}) Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] Sun Aug 7 00:53:19 2011 @@ -1,9 +1,11 @@ + +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/idl + ${REACTOS_SOURCE_DIR}/include/reactos/subsys/lsass) + +add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/lsa.idl) set_unicode() - -include_directories( - ${REACTOS_BINARY_DIR}/include/reactos/idl - ${REACTOS_SOURCE_DIR}/include/reactos/subsys/lsass) set_rc_compiler() @@ -17,14 +19,14 @@ sids.c lsasrv.rc ${CMAKE_CURRENT_BINARY_DIR}/lsasrv_stubs.c - ${CMAKE_CURRENT_BINARY_DIR}/lsasrv.def) + ${CMAKE_CURRENT_BINARY_DIR}/lsasrv.def + ${CMAKE_CURRENT_BINARY_DIR}/lsa_s.c) add_library(lsasrv SHARED ${SOURCE}) set_entrypoint(lsasrv 0) target_link_libraries(lsasrv - lsarpc wine ${PSEH_LIB}) Modified: trunk/reactos/dll/win32/ole32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/ole32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/CMakeLists.txt [iso-8859-1] Sun Aug 7 00:53:19 2011 @@ -16,9 +16,9 @@ -DREGISTER_PROXY_DLL -DCOM_NO_WINDOWS_H) -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_rpc_files(client irot.idl) add_rpcproxy_files( dcom.idl @@ -66,6 +66,7 @@ ole32res.rc ${CMAKE_CURRENT_BINARY_DIR}/dcom_i.c ${CMAKE_CURRENT_BINARY_DIR}/dcom_p.c + ${CMAKE_CURRENT_BINARY_DIR}/irot_c.c ${CMAKE_CURRENT_BINARY_DIR}/ole32_unknwn_p.c ${CMAKE_CURRENT_BINARY_DIR}/ole32_objidl_p.c ${CMAKE_CURRENT_BINARY_DIR}/ole32_oleidl_p.c @@ -79,7 +80,6 @@ target_link_libraries(ole32 wine - irotrpc uuid ${PSEH_LIB}) Modified: trunk/reactos/dll/win32/qmgrprxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgrprxy/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/qmgrprxy/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgrprxy/CMakeLists.txt [iso-8859-1] Sun Aug 7 00:53:19 2011 @@ -9,6 +9,8 @@ spec2def(qmgrprxy.dll qmgrprxy.spec) +add_rpcproxy_files(qmgrprxy.idl) + list(APPEND SOURCE version.rc ${CMAKE_CURRENT_BINARY_DIR}/qmgrprxy_i.c @@ -16,8 +18,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c ${CMAKE_CURRENT_BINARY_DIR}/qmgrprxy.def) -add_rpcproxy_files(qmgrprxy.idl) - add_library(qmgrprxy SHARED ${SOURCE}) set_module_type(qmgrprxy win32dll) Modified: trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] Sun Aug 7 00:53:19 2011 @@ -1,3 +1,5 @@ + +add_rpc_files(client epm.idl) list(APPEND SOURCE cproxy.c @@ -20,6 +22,7 @@ rpc_server.c rpc_transport.c unix_func.c + ${CMAKE_CURRENT_BINARY_DIR}/epm_c.c ${CMAKE_CURRENT_BINARY_DIR}/rpcrt4_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/rpcrt4.def) @@ -34,6 +37,8 @@ -D_RPCRT4_ -DCOM_NO_WINDOWS_H -DMSWMSG) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(rpcrt4.dll rpcrt4.spec) @@ -41,17 +46,12 @@ set_module_type(rpcrt4 win32dll) -include_directories( - ${REACTOS_SOURCE_DIR}/include/reactos/wine - ${REACTOS_BINARY_DIR}/include/reactos/wine) - target_link_libraries(rpcrt4 wine uuid - epmrpc ${PSEH_LIB}) add_importlibs(rpcrt4 msvcrt user32 advapi32 secur32 iphlpapi ws2_32 kernel32 ntdll) -add_dependencies(rpcrt4 winesdk) +add_delay_importlibs(rpcrt4 wininet) add_cd_file(TARGET rpcrt4 DESTINATION reactos/system32 FOR all) add_importlib_target(rpcrt4.spec) Modified: trunk/reactos/dll/win32/setupapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/setupapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/CMakeLists.txt [iso-8859-1] Sun Aug 7 00:53:19 2011 @@ -1,14 +1,17 @@ -set_unicode() - +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/wine + ${REACTOS_SOURCE_DIR}/include/reactos/idl + ${CMAKE_CURRENT_BINARY_DIR}) + add_definitions( -D_SETUPAPI_ -D_CFGMGR32_ -Dwcsnicmp=_wcsnicmp) -include_directories( - ${REACTOS_SOURCE_DIR}/include/reactos/wine - ${REACTOS_BINARY_DIR}/include/reactos/idl) +add_rpc_files(client ${REACTOS_SOURCE_DIR}/include/reactos/idl/pnp.idl) + +set_unicode() set_rc_compiler() @@ -33,14 +36,14 @@ rpc.c setupapi.rc ${CMAKE_CURRENT_BINARY_DIR}/setupapi_stubs.c - ${CMAKE_CURRENT_BINARY_DIR}/setupapi.def) + ${CMAKE_CURRENT_BINARY_DIR}/setupapi.def + ${CMAKE_CURRENT_BINARY_DIR}/pnp_c.c) add_library(setupapi SHARED ${SOURCE}) set_module_type(setupapi win32dll) target_link_libraries(setupapi - pnprpc uuid wine ${PSEH_LIB}) Modified: trunk/reactos/dll/win32/wlanapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] Sun Aug 7 00:53:19 2011 @@ -1,19 +1,21 @@ -include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl) +include_directories( ${REACTOS_SOURCE_DIR}/include/reactos/idl) + +add_rpc_files(client ${REACTOS_SOURCE_DIR}/include/reactos/idl/wlansvc.idl) spec2def(wlanapi.dll wlanapi.spec) list(APPEND SOURCE main.c ${CMAKE_CURRENT_BINARY_DIR}/wlanapi_stubs.c - ${CMAKE_CURRENT_BINARY_DIR}/wlanapi.def) + ${CMAKE_CURRENT_BINARY_DIR}/wlanapi.def + ${CMAKE_CURRENT_BINARY_DIR}/wlansvc_c.c) add_library(wlanapi SHARED ${SOURCE}) set_entrypoint(wlanapi 0) target_link_libraries(wlanapi - wlansvcrpc wine ${PSEH_LIB}) Modified: trunk/reactos/include/reactos/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/CMake… ============================================================================== --- trunk/reactos/include/reactos/wine/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/CMakeLists.txt [iso-8859-1] Sun Aug 7 00:53:19 2011 @@ -1,8 +1,4 @@ add_idl_headers(wineheaders itss.idl) -add_idl_headers(winesdk epm.idl irot.idl) - -add_rpc_library(epmrpc epm.idl) -add_rpc_library(irotrpc irot.idl) add_iid_library(itss_guid itss.idl)

1 0

[jgardou] 53111: [CMAKE] - fix "use of uninitialized variables" warning. Yes, cmake got this to!
by jgardou＠svn.reactos.org 07 Aug '11

07 Aug '11

Author: jgardou Date: Sun Aug 7 00:46:46 2011 New Revision: 53111 URL: http://svn.reactos.org/svn/reactos?rev=53111&view=rev Log: [CMAKE] - fix "use of uninitialized variables" warning. Yes, cmake got this to! Modified: trunk/reactos/cmake/compilerflags.cmake trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/compilerflags.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/compilerflags.cmake?… ============================================================================== --- trunk/reactos/cmake/compilerflags.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/compilerflags.cmake [iso-8859-1] Sun Aug 7 00:46:46 2011 @@ -1,5 +1,6 @@ function(add_compiler_flags) + set(flags_list "") # Adds the compiler flag to both CMAKE_C_FLAGS and CMAKE_CXX_FLAGS foreach(flag ${ARGN}) set(flags_list "${flags_list} ${flag}") Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=53111… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sun Aug 7 00:46:46 2011 @@ -156,6 +156,7 @@ # Add neccessary importlibs for redirections set(_libraries "") + set(_dependencies "") foreach(_lib ${ARGN}) list(APPEND _libraries "${CMAKE_BINARY_DIR}/importlibs/${_lib}.lib") list(APPEND _dependencies ${_lib})

1 0

[jgardou] 53110: [CMAKE] - turn most macros in function 1/x. This avoids defining a truckload of variables in the global space, and some of these variables would collapse themselves in certain cases.
by jgardou＠svn.reactos.org 07 Aug '11

07 Aug '11

Author: jgardou Date: Sun Aug 7 00:45:23 2011 New Revision: 53110 URL: http://svn.reactos.org/svn/reactos?rev=53110&view=rev Log: [CMAKE] - turn most macros in function 1/x. This avoids defining a truckload of variables in the global space, and some of these variables would collapse themselves in certain cases. Modified: trunk/reactos/cmake/CMakeMacros.cmake Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Sun Aug 7 00:45:23 2011 @@ -7,34 +7,34 @@ -DNATIVE_C_INCLUDE=${REACTOS_SOURCE_DIR}/include/crt) endmacro() -macro(add_dependency_node _node) +function(add_dependency_node _node) if(GENERATE_DEPENDENCY_GRAPH) get_target_property(_type ${_node} TYPE) if(_type MATCHES SHARED_LIBRARY OR ${_node} MATCHES ntoskrnl) file(APPEND ${REACTOS_BINARY_DIR}/dependencies.graphml " <node id=\"${_node}\"/>\n") endif() endif() -endmacro() - -macro(add_dependency_edge _source _target) +endfunction() + +function(add_dependency_edge _source _target) if(GENERATE_DEPENDENCY_GRAPH) get_target_property(_type ${_source} TYPE) if(_type MATCHES SHARED_LIBRARY) file(APPEND ${REACTOS_BINARY_DIR}/dependencies.graphml " <edge source=\"${_source}\" target=\"${_target}\"/>\n") endif() endif() -endmacro() - -macro(add_dependency_header) +endfunction() + +function(add_dependency_header) file(APPEND ${REACTOS_BINARY_DIR}/dependencies.graphml "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<graphml>\n <graph id=\"ReactOS dependencies\" edgedefault=\"directed\">\n") -endmacro() - -macro(add_dependency_footer) +endfunction() + +function(add_dependency_footer) add_dependency_node(ntdll) file(APPEND ${REACTOS_BINARY_DIR}/dependencies.graphml " </graph>\n</graphml>\n") -endmacro() - -macro(add_message_headers) +endfunction() + +function(add_message_headers) foreach(_in_FILE ${ARGN}) get_filename_component(FILE ${_in_FILE} NAME_WE) macro_mc(${FILE}) @@ -47,7 +47,7 @@ PROPERTIES GENERATED TRUE) add_custom_target(${FILE} ALL DEPENDS ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.rc) endforeach() -endmacro() +endfunction() macro(dir_to_num dir var) if(${dir} STREQUAL reactos/system32) @@ -207,7 +207,7 @@ string(REPLACE "/" "\\" ${_native_path} "${_cmake_path}") endmacro() - macro(concatenate_files _file1 _file2 _output) + function(concatenate_files _file1 _file2 _output) to_win_path("${_file1}" _real_file1) to_win_path("${_file2}" _real_file2) to_win_path("${_output}" _real_output) @@ -216,7 +216,7 @@ COMMAND cmd.exe /C "copy /Y /B ${_real_file1} + ${_real_file2} ${_real_output} > nul" DEPENDS ${_file1} DEPENDS ${_file2}) - endmacro() + endfunction() else() macro(concatenate_files _file1 _file2 _output) add_custom_command(

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs