Re: [2/6] wsdapi: Add code to create SOAP envelope from header and body elements.

[Alexandre Julliard]

Owen Rudge  writes:
> +#define WCHAR_URN_COLON                     'u','r','n',':'
> +#define WCHAR_HTTP_COLON_SLASH_SLASH        'h','t','t','p',':','/','/'
> +#define WCHAR_SCHEMAS                       's','c','h','e','m','a','s'
> +#define WCHAR_SOAP                          's','o','a','p'
> +#define WCHAR_XMLSOAP                       'x','m','l',WCHAR_SOAP
> +#define WCHAR_ORG                           'o','r','g'
> +#define WCHAR_WS_SLASH                      'w','s','/'
> +#define WCHAR_SCHEMAS_DOT_XML_SOAP_DOT_ORG  WCHAR_SCHEMAS,'.',WCHAR_XMLSOAP,'.',WCHAR_ORG
> +#define WCHAR_DISCOVERY                     'd','i','s','c','o','v','e','r','y'
> +#define WCHAR_MESSAGE                       'M','e','s','s','a','g','e'
> +#define WCHAR_SEQUENCE                      'S','e','q','u','e','n','c','e'
> -
>
> +static const WCHAR addressingNsUri[] = {
> - WCHAR_HTTP_COLON_SLASH_SLASH,
> - WCHAR_SCHEMAS_DOT_XML_SOAP_DOT_ORG,'/',
> - WCHAR_WS_SLASH,'2','0','0','4','/','0','8','/','a','d','d','r','e','s','s','i','n','g', 0 };
> -
>
> +static const WCHAR discoveryNsUri[] = {
> - WCHAR_HTTP_COLON_SLASH_SLASH,
> - WCHAR_SCHEMAS_DOT_XML_SOAP_DOT_ORG,'/',
> - WCHAR_WS_SLASH,'2','0','0','5','/','0','4','/',WCHAR_DISCOVERY, 0 };
> -
>
> +static const WCHAR envelopeNsUri[] = {
> - WCHAR_HTTP_COLON_SLASH_SLASH,
> - 'w','w','w','.','w','3','.',WCHAR_ORG,'/',
> - '2','0','0','3','/','0','5','/',WCHAR_SOAP,'-','e','n','v','e','l','o','p','e', 0 };
> -
>
> +static const WCHAR addressingPrefix[] = { 'w','s','a', 0 };
> +static const WCHAR discoveryPrefix[] = { 'w','s','d', 0 };
> +static const WCHAR envelopePrefix[] = { WCHAR_SOAP, 0 };
> +static const WCHAR headerString[] = { 'H','e','a','d','e','r', 0 };
> +static const WCHAR actionString[] = { 'A','c','t','i','o','n', 0 };
> +static const WCHAR messageIdString[] = { WCHAR_MESSAGE,'I','D', 0 };
> +static const WCHAR toString[] = { 'T','o', 0 };
> +static const WCHAR relatesToString[] = { 'R','e','l','a','t','e','s','T','o', 0 };
> +static const WCHAR appSequenceString[] = { 'A','p','p',WCHAR_SEQUENCE, 0 };
> +static const WCHAR instanceIdString[] = { 'I','n','s','t','a','n','c','e','I','d', 0 };
> +static const WCHAR messageNumberString[] = { WCHAR_MESSAGE,'N','u','m','b','e','r', 0 };
> +static const WCHAR sequenceIdString[] = { WCHAR_SEQUENCE,'I','d', 0 };
> +static const WCHAR emptyString[] = { 0 };

I think this would be more readable (and more greppable) without the
#defines.