December 2008 - Wine-Commits

Alexandre Julliard : widl: Add support for generating 32-bit and/ or 64-bit code for proxies/clients/servers.
by Alexandre Julliard Dec. 26, 2008

Dec. 26, 2008

Module: wine Branch: master Commit: 53626dbd93427d38e6c229212f5a0795eecc92e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53626dbd93427d38e6c229212… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 26 17:22:25 2008 +0100 widl: Add support for generating 32-bit and/or 64-bit code for proxies/clients/servers. --- tools/widl/client.c | 48 +++++++++++++++++++++++++++++++++------------ tools/widl/parser.y | 7 ++++++ tools/widl/proxy.c | 50 +++++++++++++++++++++++++++++++++++------------ tools/widl/server.c | 48 +++++++++++++++++++++++++++++++++------------ tools/widl/typegen.c | 2 + tools/widl/widltypes.h | 1 + 6 files changed, 117 insertions(+), 39 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 93bf1fc..673b918 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -483,7 +483,7 @@ static void write_client_ifaces(const statement_list_t *stmts, int expr_eval_rou write_stubdescdecl(iface); write_function_stubs(iface, proc_offset); - print_client("#if !defined(__RPC_WIN32__)\n"); + print_client("#if !defined(__RPC_WIN%u__)\n", pointer_size == 8 ? 64 : 32); print_client("#error Invalid build platform for this stub.\n"); print_client("#endif\n"); @@ -496,22 +496,11 @@ static void write_client_ifaces(const statement_list_t *stmts, int expr_eval_rou } } -void write_client(const statement_list_t *stmts) +static void write_client_routines(const statement_list_t *stmts) { unsigned int proc_offset = 0; int expr_eval_routines; - if (!do_client) - return; - if (do_everything && !need_stub_files(stmts)) - return; - - init_client(); - if (!client) - return; - - pointer_size = sizeof(void*); - write_formatstringsdecl(client, indent, stmts, need_stub); expr_eval_routines = write_expr_eval_routines(client, client_token); if (expr_eval_routines) @@ -524,6 +513,39 @@ void write_client(const statement_list_t *stmts) write_procformatstring(client, stmts, need_stub); write_typeformatstring(client, stmts, need_stub); +} + +void write_client(const statement_list_t *stmts) +{ + if (!do_client) + return; + if (do_everything && !need_stub_files(stmts)) + return; + + init_client(); + if (!client) + return; + + if (do_win32 && do_win64) + { + fprintf(client, "\n#ifndef _WIN64\n\n"); + pointer_size = 4; + write_client_routines( stmts ); + fprintf(client, "\n#else /* _WIN64 */\n\n"); + pointer_size = 8; + write_client_routines( stmts ); + fprintf(client, "\n#endif /* _WIN64 */\n"); + } + else if (do_win32) + { + pointer_size = 4; + write_client_routines( stmts ); + } + else if (do_win64) + { + pointer_size = 8; + write_client_routines( stmts ); + } fclose(client); } diff --git a/tools/widl/parser.y b/tools/widl/parser.y index da1d7b3..4d44e2c 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1366,6 +1366,13 @@ void set_all_tfswrite(int val) node->data.tfswrite = val; } +void clear_all_offsets(void) +{ + type_pool_node_t *node; + LIST_FOR_EACH_ENTRY(node, &type_pool, type_pool_node_t, link) + node->data.typestring_offset = node->data.ptrdesc = 0; +} + type_t *make_type(unsigned char type, type_t *ref) { type_t *t = alloc_type(); diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index fdc6cd6..7bb6acd 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -741,21 +741,10 @@ static type_t **sort_interfaces( const statement_list_t *stmts, int *count ) return ifaces; } -void write_proxies(const statement_list_t *stmts) +static void write_proxy_routines(const statement_list_t *stmts) { int expr_eval_routines; - char *file_id = proxy_token; - int i, count, have_baseiid; unsigned int proc_offset = 0; - type_t **interfaces; - - if (!do_proxies) return; - if (do_everything && !need_proxy_file(stmts)) return; - - init_proxy(stmts); - if(!proxy) return; - - pointer_size = sizeof(void*); write_formatstringsdecl(proxy, indent, stmts, need_proxy); write_stubdescproto(); @@ -767,13 +756,48 @@ void write_proxies(const statement_list_t *stmts) write_user_quad_list(proxy); write_stubdesc(expr_eval_routines); - print_proxy( "#if !defined(__RPC_WIN32__)\n"); + print_proxy( "#if !defined(__RPC_WIN%u__)\n", pointer_size == 8 ? 64 : 32); print_proxy( "#error Currently only Wine and WIN32 are supported.\n"); print_proxy( "#endif\n"); print_proxy( "\n"); write_procformatstring(proxy, stmts, need_proxy); write_typeformatstring(proxy, stmts, need_proxy); +} + +void write_proxies(const statement_list_t *stmts) +{ + char *file_id = proxy_token; + int i, count, have_baseiid; + type_t **interfaces; + + if (!do_proxies) return; + if (do_everything && !need_proxy_file(stmts)) return; + + init_proxy(stmts); + if(!proxy) return; + + if (do_win32 && do_win64) + { + fprintf(proxy, "\n#ifndef _WIN64\n\n"); + pointer_size = 4; + write_proxy_routines( stmts ); + fprintf(proxy, "\n#else /* _WIN64 */\n\n"); + pointer_size = 8; + write_proxy_routines( stmts ); + fprintf(proxy, "#endif /* _WIN64 */\n\n"); + } + else if (do_win32) + { + pointer_size = 4; + write_proxy_routines( stmts ); + } + else if (do_win64) + { + pointer_size = 8; + write_proxy_routines( stmts ); + } + interfaces = sort_interfaces(stmts, &count); fprintf(proxy, "static const CInterfaceProxyVtbl* const _%s_ProxyVtblList[] =\n", file_id); fprintf(proxy, "{\n"); diff --git a/tools/widl/server.c b/tools/widl/server.c index 0edee90..20d0e7e 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -424,7 +424,7 @@ static void write_server_stmts(const statement_list_t *stmts, int expr_eval_rout write_function_stubs(iface, proc_offset); - print_server("#if !defined(__RPC_WIN32__)\n"); + print_server("#if !defined(__RPC_WIN%u__)\n", pointer_size == 8 ? 64 : 32); print_server("#error Invalid build platform for this stub.\n"); print_server("#endif\n"); @@ -436,22 +436,11 @@ static void write_server_stmts(const statement_list_t *stmts, int expr_eval_rout } } -void write_server(const statement_list_t *stmts) +static void write_server_routines(const statement_list_t *stmts) { unsigned int proc_offset = 0; int expr_eval_routines; - if (!do_server) - return; - if (do_everything && !need_stub_files(stmts)) - return; - - init_server(); - if (!server) - return; - - pointer_size = sizeof(void*); - write_formatstringsdecl(server, indent, stmts, need_stub); expr_eval_routines = write_expr_eval_routines(server, server_token); if (expr_eval_routines) @@ -464,6 +453,39 @@ void write_server(const statement_list_t *stmts) write_procformatstring(server, stmts, need_stub); write_typeformatstring(server, stmts, need_stub); +} + +void write_server(const statement_list_t *stmts) +{ + if (!do_server) + return; + if (do_everything && !need_stub_files(stmts)) + return; + + init_server(); + if (!server) + return; + + if (do_win32 && do_win64) + { + fprintf(server, "\n#ifndef _WIN64\n\n"); + pointer_size = 4; + write_server_routines( stmts ); + fprintf(server, "\n#else /* _WIN64 */\n\n"); + pointer_size = 8; + write_server_routines( stmts ); + fprintf(server, "\n#endif /* _WIN64 */\n"); + } + else if (do_win32) + { + pointer_size = 4; + write_server_routines( stmts ); + } + else if (do_win64) + { + pointer_size = 8; + write_server_routines( stmts ); + } fclose(server); } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index a452bdf..ed9430c 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -572,6 +572,8 @@ static void write_formatdesc(FILE *f, int indent, const char *str) void write_formatstringsdecl(FILE *f, int indent, const statement_list_t *stmts, type_pred_t pred) { + clear_all_offsets(); + print_file(f, indent, "#define TYPE_FORMAT_STRING_SIZE %d\n", get_size_typeformatstring(stmts, pred)); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index d00a732..4f1fc1c 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -396,6 +396,7 @@ void check_for_additional_prototype_types(const var_list_t *list); void init_types(void); type_t *alloc_type(void); void set_all_tfswrite(int val); +void clear_all_offsets(void); type_t *duptype(type_t *t, int dupname); type_t *alias(type_t *t, const char *name);

1 0

Alexandre Julliard : widl: Add --win32/ --win64 options to select the type of code generated.
by Alexandre Julliard Dec. 26, 2008

Dec. 26, 2008

Module: wine Branch: master Commit: b1ab7d88b3e3bde52e72bea1c2bd8a83524f37a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1ab7d88b3e3bde52e72bea1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 26 17:21:12 2008 +0100 widl: Add --win32/--win64 options to select the type of code generated. --- tools/widl/widl.c | 18 +++++++++++++++++- tools/widl/widl.h | 2 ++ tools/widl/widl.man.in | 4 ++++ 3 files changed, 23 insertions(+), 1 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index c10f4a1..3f03f40 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -78,6 +78,8 @@ static const char usage[] = " -U file Name of interface identifiers file (default is infile_i.c)\n" " -V Print version and exit\n" " -W Enable pedantic warnings\n" +" --win32 Only generate 32-bit code\n" +" --win64 Only generate 64-bit code\n" "Debug level 'n' is a bitmask with following meaning:\n" " * 0x01 Tell which resource is parsed (verbose mode)\n" " * 0x02 Dump internal structures\n" @@ -106,6 +108,8 @@ int do_idfile = 0; int do_dlldata = 0; int no_preprocess = 0; int old_names = 0; +int do_win32 = 1; +int do_win64 = 1; char *input_name; char *header_name; @@ -143,7 +147,9 @@ enum { LOCAL_STUBS_OPTION, PREFIX_ALL_OPTION, PREFIX_CLIENT_OPTION, - PREFIX_SERVER_OPTION + PREFIX_SERVER_OPTION, + WIN32_OPTION, + WIN64_OPTION }; static const char short_options[] = @@ -156,6 +162,8 @@ static const struct option long_options[] = { { "prefix-all", 1, 0, PREFIX_ALL_OPTION }, { "prefix-client", 1, 0, PREFIX_CLIENT_OPTION }, { "prefix-server", 1, 0, PREFIX_SERVER_OPTION }, + { "win32", 0, 0, WIN32_OPTION }, + { "win64", 0, 0, WIN64_OPTION }, { 0, 0, 0, 0 } }; @@ -377,6 +385,14 @@ int main(int argc,char *argv[]) case PREFIX_SERVER_OPTION: prefix_server = xstrdup(optarg); break; + case WIN32_OPTION: + do_win32 = 1; + do_win64 = 0; + break; + case WIN64_OPTION: + do_win32 = 0; + do_win64 = 1; + break; case 'c': do_everything = 0; do_client = 1; diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 07d886a..01de04c 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -45,6 +45,8 @@ extern int do_server; extern int do_idfile; extern int do_dlldata; extern int old_names; +extern int do_win32; +extern int do_win64; extern char *input_name; extern char *header_name; diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index df7d1c0..e275292 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -74,6 +74,10 @@ Prefix to put on the name of server stubs. Generate server stub. .IP "\fB-S \fIfile\fR" Name of server stub file (default is \fIinfile\fR_s.c) +.IP "\fB--win32, --win64\fR" +Only generate 32-bit, respectively 64-bit code (the default is to +generate both 32-bit and 64-bit versions into the same destination +file). .PP .B Dlldata file options: .IP "\fB--dlldata=\fIfile\fR"

1 0

Alexandre Julliard : widl: Store the size of a pointer in a variable instead of hardcoding the value of the host compiler .
by Alexandre Julliard Dec. 26, 2008

Dec. 26, 2008

Module: wine Branch: master Commit: 9ca1382eaeb8f7defe203d97f199e22d93ccb54b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ca1382eaeb8f7defe203d97f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 26 17:20:53 2008 +0100 widl: Store the size of a pointer in a variable instead of hardcoding the value of the host compiler. --- tools/widl/client.c | 2 ++ tools/widl/proxy.c | 6 ++++-- tools/widl/server.c | 2 ++ tools/widl/typegen.c | 3 ++- tools/widl/widl.c | 2 ++ tools/widl/widl.h | 1 + 6 files changed, 13 insertions(+), 3 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 5221e26..93bf1fc 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -510,6 +510,8 @@ void write_client(const statement_list_t *stmts) if (!client) return; + pointer_size = sizeof(void*); + write_formatstringsdecl(client, indent, stmts, need_stub); expr_eval_routines = write_expr_eval_routines(client, client_token); if (expr_eval_routines) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index dc3c1ae..fdc6cd6 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -127,8 +127,6 @@ static void init_proxy(const statement_list_t *stmts) print_proxy( " return (__frame->_StubMsg.dwStubPhase != PROXY_SENDRECEIVE);\n"); print_proxy( "}\n"); print_proxy( "\n"); - write_formatstringsdecl(proxy, indent, stmts, need_proxy); - write_stubdescproto(); } static void clear_output_vars( const var_list_t *args ) @@ -757,6 +755,10 @@ void write_proxies(const statement_list_t *stmts) init_proxy(stmts); if(!proxy) return; + pointer_size = sizeof(void*); + + write_formatstringsdecl(proxy, indent, stmts, need_proxy); + write_stubdescproto(); write_proxy_stmts(stmts, &proc_offset); expr_eval_routines = write_expr_eval_routines(proxy, proxy_token); diff --git a/tools/widl/server.c b/tools/widl/server.c index 9b8edb7..0edee90 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -450,6 +450,8 @@ void write_server(const statement_list_t *stmts) if (!server) return; + pointer_size = sizeof(void*); + write_formatstringsdecl(server, indent, stmts, need_stub); expr_eval_routines = write_expr_eval_routines(server, server_token); if (expr_eval_routines) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 123715c..a452bdf 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1018,7 +1018,8 @@ size_t type_memsize(const type_t *t, unsigned int *align) } else if (is_ptr(t) || is_conformant_array(t)) { - size = sizeof(void *); + assert( pointer_size ); + size = pointer_size; if (size > *align) *align = size; } else switch (t->type) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 9b14de2..c10f4a1 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -132,6 +132,8 @@ FILE *local_stubs; FILE *proxy; FILE *idfile; +size_t pointer_size = 0; + time_t now; enum { diff --git a/tools/widl/widl.h b/tools/widl/widl.h index f08a9ae..07d886a 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -59,6 +59,7 @@ extern char *server_name; extern char *server_token; extern const char *prefix_client; extern const char *prefix_server; +extern size_t pointer_size; extern time_t now; extern int line_number;

1 0

Detlef Riekenberg : shdocvw: Implement ParseURLFromOutsideSource.
by Alexandre Julliard Dec. 26, 2008

Dec. 26, 2008

Module: wine Branch: master Commit: 468da8e26175c5e751347fa21160b679594852a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=468da8e26175c5e751347fa21… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Dec 23 11:42:07 2008 +0100 shdocvw: Implement ParseURLFromOutsideSource. --- dlls/shdocvw/shdocvw.spec | 4 +- dlls/shdocvw/shdocvw_main.c | 101 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec index 1cf297d..f47ecb4 100644 --- a/dlls/shdocvw/shdocvw.spec +++ b/dlls/shdocvw/shdocvw.spec @@ -49,8 +49,8 @@ 164 stub -noname ResetProfileSharing 165 stub -noname URLSubstitution 167 stub -noname IsIEDefaultBrowser -169 stub -noname ParseURLFromOutsideSourceA -170 stub -noname ParseURLFromOutsideSourceW +169 stdcall -noname ParseURLFromOutsideSourceA(str ptr ptr ptr) +170 stdcall -noname ParseURLFromOutsideSourceW(wstr ptr ptr ptr) 171 stub -noname _DeletePidlDPA 172 stub -noname IURLQualify 173 stub -noname SHIsRestricted diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index c9deff1..8640600 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -295,3 +295,104 @@ HRESULT WINAPI URLSubRegQueryA(LPCSTR regpath, LPCSTR name, DWORD type, return E_FAIL; } + +/****************************************************************** + * ParseURLFromOutsideSourceW (SHDOCVW.170) + */ +DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, LPDWORD unknown) +{ + WCHAR buffer_in[INTERNET_MAX_URL_LENGTH]; + WCHAR buffer_out[INTERNET_MAX_URL_LENGTH]; + LPCWSTR ptr = url; + HRESULT hr; + DWORD needed; + DWORD len; + DWORD res = 0; + + + TRACE("(%s, %p, %p, %p) len: %d, unknown: 0x%x\n", debugstr_w(url), out, plen, unknown, + plen ? *plen : 0, unknown ? *unknown : 0); + + if (!PathIsURLW(ptr)) { + len = sizeof(buffer_in) / sizeof(buffer_in[0]); + buffer_in[0] = 0; + hr = UrlApplySchemeW(ptr, buffer_in, &len, URL_APPLY_GUESSSCHEME); + TRACE("got 0x%x with %s\n", hr, debugstr_w(buffer_in)); + if (hr != S_OK) { + /* when we can't guess the scheme, use the default scheme */ + len = sizeof(buffer_in) / sizeof(buffer_in[0]); + hr = UrlApplySchemeW(ptr, buffer_in, &len, URL_APPLY_DEFAULT); + } + + if (hr == S_OK) { + /* we parsed the url to buffer_in */ + ptr = buffer_in; + } + else + { + FIXME("call search hook for %s\n", debugstr_w(ptr)); + } + } + + len = sizeof(buffer_out) / sizeof(buffer_out[0]); + buffer_out[0] = '\0'; + hr = UrlCanonicalizeW(ptr, buffer_out, &len, URL_ESCAPE_SPACES_ONLY); + needed = lstrlenW(buffer_out)+1; + TRACE("got 0x%x with %s (need %d)\n", hr, debugstr_w(buffer_out), needed); + + if (*plen >= needed) { + if (out != NULL) { + lstrcpyW(out, buffer_out); + res++; + } + needed--; + } + + *plen = needed; + + TRACE("=> %d\n", res); + return res; +} + +/****************************************************************** + * ParseURLFromOutsideSourceA (SHDOCVW.169) + * + * See ParseURLFromOutsideSourceW + */ +DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPDWORD unknown) +{ + WCHAR buffer[INTERNET_MAX_URL_LENGTH]; + LPWSTR urlW = NULL; + DWORD needed; + DWORD res; + DWORD len; + + TRACE("(%s, %p, %p, %p) len: %d, unknown: 0x%x\n", debugstr_a(url), out, plen, unknown, + plen ? *plen : 0, unknown ? *unknown : 0); + + if (url) { + len = MultiByteToWideChar(CP_ACP, 0, url, -1, NULL, 0); + urlW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, url, -1, urlW, len); + } + + len = sizeof(buffer) / sizeof(buffer[0]); + res = ParseURLFromOutsideSourceW(urlW, buffer, &len, unknown); + HeapFree(GetProcessHeap(), 0, urlW); + + needed = WideCharToMultiByte(CP_ACP, 0, buffer, -1, NULL, 0, NULL, NULL); + + res = 0; + if (*plen >= needed) { + if (out != NULL) { + WideCharToMultiByte(CP_ACP, 0, buffer, -1, out, *plen, NULL, NULL); + res = needed; + } + needed--; + } + + *plen = needed; + + TRACE("=> %d\n", res); + return res; +}

1 0

Detlef Riekenberg : shdocvw/tests: Add tests for ParseURLFromOutsideSource.
by Alexandre Julliard Dec. 26, 2008

Dec. 26, 2008

Module: wine Branch: master Commit: e9e12744b52843c16e3c0d4f5375b0073eda7a8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9e12744b52843c16e3c0d4f5… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Dec 23 11:48:12 2008 +0100 shdocvw/tests: Add tests for ParseURLFromOutsideSource. --- dlls/shdocvw/tests/shdocvw.c | 187 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 187 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/tests/shdocvw.c b/dlls/shdocvw/tests/shdocvw.c index a2d9e9e..64a4ca7 100644 --- a/dlls/shdocvw/tests/shdocvw.c +++ b/dlls/shdocvw/tests/shdocvw.c @@ -25,6 +25,7 @@ #include "winbase.h" #include "winreg.h" #include "wininet.h" +#include "winnls.h" #include "wine/test.h" @@ -32,6 +33,8 @@ static HMODULE hshdocvw; static HRESULT (WINAPI *pURLSubRegQueryA)(LPCSTR, LPCSTR, DWORD, LPVOID, DWORD, DWORD); +static DWORD (WINAPI *pParseURLFromOutsideSourceA)(LPCSTR, LPSTR, LPDWORD, LPDWORD); +static DWORD (WINAPI *pParseURLFromOutsideSourceW)(LPCWSTR, LPWSTR, LPDWORD, LPDWORD); static CHAR appdata[] = "AppData"; static CHAR common_appdata[] = "Common AppData"; @@ -43,10 +46,36 @@ static CHAR start_page[] = "Start Page"; /* ################ */ +static const struct { + const char *url; + const char *newurl; + DWORD len; +} ParseURL_table[] = { + {"http://www.winehq.org", "http://www.winehq.org/", 22}, + {"www.winehq.org", "http://www.winehq.org/", 22}, + {"winehq.org", "http://winehq.org/", 18}, + {"ftp.winehq.org", "ftp://ftp.winehq.org/", 21}, + {"http://winehq.org", "http://winehq.org/", 18}, + {"https://winehq.org", "https://winehq.org/", 19}, + {"https://www.winehq.org", "https://www.winehq.org/", 23}, + {"ftp://winehq.org", "ftp://winehq.org/", 17}, + {"ftp://ftp.winehq.org", "ftp://ftp.winehq.org/", 21}, + {"about:blank", "about:blank", 11}, + {"about:home", "about:home", 10}, + {"about:mozilla", "about:mozilla", 13}, + /* a space at the start is not allowed */ + {" http://www.winehq.org", "http://%20http://www.winehq.org", 31} + +}; + +/* ################ */ + static void init_functions(void) { hshdocvw = LoadLibraryA("shdocvw.dll"); pURLSubRegQueryA = (void *) GetProcAddress(hshdocvw, (LPSTR) 151); + pParseURLFromOutsideSourceA = (void *) GetProcAddress(hshdocvw, (LPSTR) 169); + pParseURLFromOutsideSourceW = (void *) GetProcAddress(hshdocvw, (LPSTR) 170); } /* ################ */ @@ -164,8 +193,166 @@ static void test_URLSubRegQueryA(void) /* ################ */ +static void test_ParseURLFromOutsideSourceA(void) +{ + CHAR buffer[INTERNET_MAX_URL_LENGTH]; + DWORD dummy; + DWORD maxlen; + DWORD len; + DWORD res; + int i; + + if (!pParseURLFromOutsideSourceA) { + skip("ParseURLFromOutsideSourceA not found\n"); + return; + } + + for(i = 0; i < sizeof(ParseURL_table)/sizeof(ParseURL_table[0]); i++) { + memset(buffer, '#', sizeof(buffer)-1); + buffer[sizeof(buffer)-1] = '\0'; + len = sizeof(buffer); + dummy = 0; + /* on success, len+1 is returned. No idea, if someone depend on this */ + res = pParseURLFromOutsideSourceA(ParseURL_table[i].url, buffer, &len, &dummy); + /* len does not include the terminating 0, when buffer is large enough */ + ok( res != 0 && len == ParseURL_table[i].len && + !lstrcmpA(buffer, ParseURL_table[i].newurl), + "#%d: got %d and %d with '%s' (expected '!=0' and %d with '%s')\n", + i, res, len, buffer, ParseURL_table[i].len, ParseURL_table[i].newurl); + + + /* use the size test only for the first examples */ + if (i > 4) continue; + + maxlen = len; + + memset(buffer, '#', sizeof(buffer)-1); + buffer[sizeof(buffer)-1] = '\0'; + len = maxlen + 1; + dummy = 0; + res = pParseURLFromOutsideSourceA(ParseURL_table[i].url, buffer, &len, &dummy); + ok( res != 0 && len == ParseURL_table[i].len && + !lstrcmpA(buffer, ParseURL_table[i].newurl), + "#%d (+1): got %d and %d with '%s' (expected '!=0' and %d with '%s')\n", + i, res, len, buffer, ParseURL_table[i].len, ParseURL_table[i].newurl); + + memset(buffer, '#', sizeof(buffer)-1); + buffer[sizeof(buffer)-1] = '\0'; + len = maxlen; + dummy = 0; + res = pParseURLFromOutsideSourceA(ParseURL_table[i].url, buffer, &len, &dummy); + /* len includes the terminating 0, when the buffer is to small */ + ok( res == 0 && len == ParseURL_table[i].len + 1, + "#%d (==): got %d and %d (expected '0' and %d)\n", + i, res, len, ParseURL_table[i].len + 1); + + memset(buffer, '#', sizeof(buffer)-1); + buffer[sizeof(buffer)-1] = '\0'; + len = maxlen-1; + dummy = 0; + res = pParseURLFromOutsideSourceA(ParseURL_table[i].url, buffer, &len, &dummy); + ok( res == 0 && len == ParseURL_table[i].len + 1, + "#%d (-1): got %d and %d (expected '0' and %d)\n", + i, res, len, ParseURL_table[i].len + 1); + + memset(buffer, '#', sizeof(buffer)-1); + buffer[sizeof(buffer)-1] = '\0'; + len = maxlen+1; + dummy = 0; + res = pParseURLFromOutsideSourceA(ParseURL_table[i].url, NULL, &len, &dummy); + /* len does not include the terminating 0, when buffer is NULL */ + ok( res == 0 && len == ParseURL_table[i].len, + "#%d (buffer): got %d and %d (expected '0' and %d)\n", + i, res, len, ParseURL_table[i].len); + + if (0) { + /* that test crash on native shdocvw */ + res = pParseURLFromOutsideSourceA(ParseURL_table[i].url, buffer, NULL, &dummy); + } + + memset(buffer, '#', sizeof(buffer)-1); + buffer[sizeof(buffer)-1] = '\0'; + len = maxlen+1; + dummy = 0; + res = pParseURLFromOutsideSourceA(ParseURL_table[i].url, buffer, &len, NULL); + ok( res != 0 && len == ParseURL_table[i].len && + !lstrcmpA(buffer, ParseURL_table[i].newurl), + "#%d (unknown): got %d and %d with '%s' (expected '!=0' and %d with '%s')\n", + i, res, len, buffer, ParseURL_table[i].len, ParseURL_table[i].newurl); + } +} + +/* ################ */ + +static void test_ParseURLFromOutsideSourceW(void) +{ + WCHAR urlW[INTERNET_MAX_URL_LENGTH]; + WCHAR bufferW[INTERNET_MAX_URL_LENGTH]; + CHAR bufferA[INTERNET_MAX_URL_LENGTH]; + DWORD maxlen; + DWORD dummy; + DWORD len; + DWORD res; + + if (!pParseURLFromOutsideSourceW) { + skip("ParseURLFromOutsideSourceW not found\n"); + return; + } + MultiByteToWideChar(CP_ACP, 0, ParseURL_table[0].url, -1, urlW, INTERNET_MAX_URL_LENGTH); + + memset(bufferA, '#', sizeof(bufferA)-1); + bufferA[sizeof(bufferA) - 1] = '\0'; + MultiByteToWideChar(CP_ACP, 0, bufferA, -1, bufferW, INTERNET_MAX_URL_LENGTH); + + /* len is in characters */ + len = sizeof(bufferW)/sizeof(bufferW[0]); + dummy = 0; + res = pParseURLFromOutsideSourceW(urlW, bufferW, &len, &dummy); + WideCharToMultiByte(CP_ACP, 0, bufferW, -1, bufferA, sizeof(bufferA), NULL, NULL); + ok( res != 0 && len == ParseURL_table[0].len && + !lstrcmpA(bufferA, ParseURL_table[0].newurl), + "got %d and %d with '%s' (expected '!=0' and %d with '%s')\n", + res, len, bufferA, ParseURL_table[0].len, ParseURL_table[0].newurl); + + + maxlen = len; + + memset(bufferA, '#', sizeof(bufferA)-1); + bufferA[sizeof(bufferA) - 1] = '\0'; + MultiByteToWideChar(CP_ACP, 0, bufferA, -1, bufferW, INTERNET_MAX_URL_LENGTH); + len = maxlen+1; + dummy = 0; + res = pParseURLFromOutsideSourceW(urlW, bufferW, &len, &dummy); + WideCharToMultiByte(CP_ACP, 0, bufferW, -1, bufferA, sizeof(bufferA), NULL, NULL); + /* len does not include the terminating 0, when buffer is large enough */ + ok( res != 0 && len == ParseURL_table[0].len && + !lstrcmpA(bufferA, ParseURL_table[0].newurl), + "+1: got %d and %d with '%s' (expected '!=0' and %d with '%s')\n", + res, len, bufferA, ParseURL_table[0].len, ParseURL_table[0].newurl); + + len = maxlen; + dummy = 0; + res = pParseURLFromOutsideSourceW(urlW, bufferW, &len, &dummy); + /* len includes the terminating 0, when the buffer is to small */ + ok( res == 0 && len == ParseURL_table[0].len + 1, + "==: got %d and %d (expected '0' and %d)\n", + res, len, ParseURL_table[0].len + 1); + + len = maxlen - 1; + dummy = 0; + res = pParseURLFromOutsideSourceW(urlW, bufferW, &len, &dummy); + ok( res == 0 && len == ParseURL_table[0].len + 1, + "-1: got %d and %d (expected '0' and %d)\n", + res, len, ParseURL_table[0].len + 1); + +} + +/* ################ */ + START_TEST(shdocvw) { init_functions(); test_URLSubRegQueryA(); + test_ParseURLFromOutsideSourceA(); + test_ParseURLFromOutsideSourceW(); }

1 0

Alexandre Julliard : widl: Move determination of the exact type of structures and array to the code generation phase .
by Alexandre Julliard Dec. 26, 2008

Dec. 26, 2008

Module: wine Branch: master Commit: a011f0cd5b1248dbc109f7712153f579248537fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=a011f0cd5b1248dbc109f7712… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 26 16:26:59 2008 +0100 widl: Move determination of the exact type of structures and array to the code generation phase. The exact type can depend on the size of the type in memory, and that can vary depending on whether we are generating 32-bit or 64-bit code. --- tools/widl/parser.y | 196 +-------------------------------------- tools/widl/typegen.c | 253 ++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 225 insertions(+), 224 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a011f0cd5b1248dbc109f…

1 0

Detlef Riekenberg : shdocvw/tests: Fix a test on IE 5.x.
by Alexandre Julliard Dec. 26, 2008

Dec. 26, 2008

Module: wine Branch: master Commit: 1a0f1f5db824c91ab10c45ddf1dc7e813a280abc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a0f1f5db824c91ab10c45ddf… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Dec 23 11:24:31 2008 +0100 shdocvw/tests: Fix a test on IE 5.x. --- dlls/shdocvw/tests/shdocvw.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/tests/shdocvw.c b/dlls/shdocvw/tests/shdocvw.c index f3a75d4..a2d9e9e 100644 --- a/dlls/shdocvw/tests/shdocvw.c +++ b/dlls/shdocvw/tests/shdocvw.c @@ -112,12 +112,16 @@ static void test_URLSubRegQueryA(void) ok((hr == S_OK) && !used, "got 0x%x and %d (expected S_OK and 0)\n", hr, used); - /* size of buffer is 0, but the function still succeed */ + /* size of buffer is 0, but the function still succeed. + buffer[0] is cleared in IE 5.01 and IE 5.5 (Buffer Overflow) */ memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; hr = pURLSubRegQueryA(regpath_iemain, start_page, REG_SZ, buffer, 0, -1); used = lstrlenA(buffer); - ok((hr == S_OK) && (used == INTERNET_MAX_URL_LENGTH - 1), "got 0x%x and %d\n", hr, used); + ok( (hr == S_OK) && + ((used == INTERNET_MAX_URL_LENGTH - 1) || broken(used == 0)) , + "got 0x%x and %d (expected S_OK and INTERNET_MAX_URL_LENGTH - 1)\n", + hr, used); /* still succeed without a buffer for the result */ hr = pURLSubRegQueryA(regpath_iemain, start_page, REG_SZ, NULL, 0, -1);

1 0

Ricardo Filipe : cfgmgr32: Forward CM_Locate_DevNodeA/W to setupapi.
by Alexandre Julliard Dec. 26, 2008

Dec. 26, 2008

Module: wine Branch: master Commit: 7130f9770be9a4f0bacb2cea2df7faf2a49d3f86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7130f9770be9a4f0bacb2cea2… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Wed Dec 24 20:31:38 2008 +0000 cfgmgr32: Forward CM_Locate_DevNodeA/W to setupapi. --- dlls/cfgmgr32/cfgmgr32.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index dec3940..3db32c0 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -117,8 +117,8 @@ @ stub CM_Intersect_Range_List @ stub CM_Invert_Range_List @ stub CM_Is_Dock_Station_Present -@ stub CM_Locate_DevNodeA -@ stub CM_Locate_DevNodeW +@ stdcall CM_Locate_DevNodeA(ptr str long) setupapi.CM_Locate_DevNodeA +@ stdcall CM_Locate_DevNodeW(ptr wstr long) setupapi.CM_Locate_DevNodeW @ stub CM_Locate_DevNode_ExA @ stub CM_Locate_DevNode_ExW @ stub CM_Merge_Range_List

1 0

Ricardo Filipe : setupapi: Add stubs for CM_Locate_DevNodeA/W.
by Alexandre Julliard Dec. 26, 2008

Dec. 26, 2008

Module: wine Branch: master Commit: ae8a07d93453abd2ff3ff0ea816a382100762d3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae8a07d93453abd2ff3ff0ea8… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Wed Dec 24 20:28:31 2008 +0000 setupapi: Add stubs for CM_Locate_DevNodeA/W. --- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 20 ++++++++++++++++++++ include/cfgmgr32.h | 3 +++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 75cb7c8..d08b4d3 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -128,8 +128,8 @@ @ stub CM_Intersect_Range_List @ stub CM_Invert_Range_List @ stub CM_Is_Dock_Station_Present -@ stub CM_Locate_DevNodeA -@ stub CM_Locate_DevNodeW +@ stdcall CM_Locate_DevNodeA(ptr str long) +@ stdcall CM_Locate_DevNodeW(ptr wstr long) @ stub CM_Locate_DevNode_ExA @ stub CM_Locate_DevNode_ExW @ stub CM_Merge_Range_List diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 33240ce..9a56fd0 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -228,3 +228,23 @@ UINT WINAPI SetupPromptForDiskW(HWND hwndParent, PCWSTR DialogTitle, PCWSTR Disk PathRequiredSize); return 0; } + +/*********************************************************************** + * CM_Locate_DevNodeA (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, ULONG ulFlags) +{ + FIXME("%p %s 0x%08x: stub\n", pdnDevInst, debugstr_a(pDeviceID), ulFlags); + + return CR_FAILURE; +} + +/*********************************************************************** + * CM_Locate_DevNodeW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST pdnDevInst, DEVINSTID_W pDeviceID, ULONG ulFlags) +{ + FIXME("%p %s 0x%08x: stub\n", pdnDevInst, debugstr_w(pDeviceID), ulFlags); + + return CR_FAILURE; +} diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index 635ac98..9dedc4e 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -129,6 +129,9 @@ CMAPI CONFIGRET WINAPI CM_Get_Device_ID_List_ExW(PCWSTR,PWCHAR,ULONG,ULONG,HMACH #define CM_Get_Device_ID_List_Ex WINELIB_NAME_AW(CM_Get_Device_ID_List_Ex) CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size(PULONG,DEVINST,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex(PULONG,DEVINST,ULONG,HMACHINE); +CMAPI CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST,DEVINSTID_A,ULONG); +CMAPI CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST,DEVINSTID_W,ULONG); +#define CM_Locate_DevNode WINELIB_NAME_AW(CM_Locate_DevNode) #ifdef __cplusplus }

1 0

Nick Burns : ddraw: Fix surface version setting.
by Alexandre Julliard Dec. 26, 2008

Dec. 26, 2008

Module: wine Branch: master Commit: a537fb0a93e4c4bdab7769e3a748524ea5a11919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a537fb0a93e4c4bdab7769e3a… Author: Nick Burns <adger44(a)hotmail.com> Date: Wed Dec 24 17:01:02 2008 -0800 ddraw: Fix surface version setting. --- dlls/ddraw/ddraw.c | 1 + dlls/ddraw/ddraw_thunks.c | 25 +++++++++++++++++++++---- dlls/ddraw/surface.c | 7 +++++-- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 919d995..8033b15 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2084,6 +2084,7 @@ IDirectDrawImpl_CreateNewSurface(IDirectDrawImpl *This, ICOM_INIT_INTERFACE(*ppSurf, IDirect3DTexture, IDirect3DTexture1_Vtbl); (*ppSurf)->ref = 1; (*ppSurf)->version = 7; + TRACE("%p->version = %d\n", (*ppSurf), (*ppSurf)->version); (*ppSurf)->ddraw = This; (*ppSurf)->surface_desc.dwSize = sizeof(DDSURFACEDESC2); (*ppSurf)->surface_desc.u4.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); diff --git a/dlls/ddraw/ddraw_thunks.c b/dlls/ddraw/ddraw_thunks.c index b748ad4..da61e1f 100644 --- a/dlls/ddraw/ddraw_thunks.c +++ b/dlls/ddraw/ddraw_thunks.c @@ -377,6 +377,23 @@ IDirectDraw4Impl_CreatePalette(LPDIRECTDRAW4 This, DWORD dwFlags, return hr; } +/* Must set all attached surfaces (e.g. mipmaps) versions as well */ +static void set_surf_version(IDirectDrawSurfaceImpl *surf, int version) +{ + int i; + TRACE("%p->version(%d) = %d\n", surf, surf->version, version); + surf->version = version; + for(i = 0; i < MAX_COMPLEX_ATTACHED; i++) + { + if(!surf->complex_array[i]) break; + set_surf_version(surf->complex_array[i], version); + } + while( (surf = surf->next_attached) ) + { + set_surf_version(surf, version); + } +} + static HRESULT WINAPI IDirectDrawImpl_CreateSurface(LPDIRECTDRAW This, LPDDSURFACEDESC pSDesc, LPDIRECTDRAWSURFACE *ppSurface, @@ -407,7 +424,7 @@ IDirectDrawImpl_CreateSurface(LPDIRECTDRAW This, LPDDSURFACEDESC pSDesc, impl = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirectDrawSurface7, pSurface7); if(SUCCEEDED(hr) && impl) { - impl->version = 1; + set_surf_version(impl, 1); IDirectDraw7_Release(COM_INTERFACE_CAST(IDirectDrawImpl, IDirectDraw, IDirectDraw7, @@ -442,7 +459,7 @@ IDirectDraw2Impl_CreateSurface(LPDIRECTDRAW2 This, LPDDSURFACEDESC pSDesc, impl = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirectDrawSurface7, pSurface7); if(SUCCEEDED(hr) && impl) { - impl->version = 2; + set_surf_version(impl, 2); IDirectDraw7_Release(COM_INTERFACE_CAST(IDirectDrawImpl, IDirectDraw2, IDirectDraw7, @@ -477,7 +494,7 @@ IDirectDraw3Impl_CreateSurface(LPDIRECTDRAW3 This, LPDDSURFACEDESC pSDesc, impl = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirectDrawSurface7, pSurface7); if(SUCCEEDED(hr) && impl) { - impl->version = 3; + set_surf_version(impl, 3); IDirectDraw7_Release(COM_INTERFACE_CAST(IDirectDrawImpl, IDirectDraw3, IDirectDraw7, @@ -507,7 +524,7 @@ IDirectDraw4Impl_CreateSurface(LPDIRECTDRAW4 This, LPDDSURFACEDESC2 pSDesc, impl = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirectDrawSurface7, *ppSurface); if(SUCCEEDED(hr) && impl) { - impl->version = 4; + set_surf_version(impl, 4); IDirectDraw7_Release(COM_INTERFACE_CAST(IDirectDrawImpl, IDirectDraw4, IDirectDraw7, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d263f67..f184111 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -475,15 +475,18 @@ IDirectDrawSurfaceImpl_GetAttachedSurface(IDirectDrawSurface7 *iface, TRACE("(%p)->(%p,%p)\n", This, Caps, Surface); EnterCriticalSection(&ddraw_cs); - our_caps = *Caps; - if(This->version < 7) { /* Earlier dx apps put garbage into these members, clear them */ + our_caps.dwCaps = Caps->dwCaps; our_caps.dwCaps2 = 0; our_caps.dwCaps3 = 0; our_caps.dwCaps4 = 0; } + else + { + our_caps = *Caps; + } TRACE("(%p): Looking for caps: %x,%x,%x,%x\n", This, our_caps.dwCaps, our_caps.dwCaps2, our_caps.dwCaps3, our_caps.dwCaps4); /* FIXME: Better debugging */

1 0