October 2007 - Wine-commits

Francois Gouget : mshtml: Add a missing import directive to mshtml.idl.
by Alexandre Julliard 19 Oct '07

19 Oct '07

Module: wine Branch: master Commit: 4e4f8e4b13fe419efba327e4b93fe6d51d7e5067 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e4f8e4b13fe419efba327e4b… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 18 17:14:53 2007 +0200 mshtml: Add a missing import directive to mshtml.idl. --- include/mshtml.idl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 35bf10d..b25c5e4 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -22,6 +22,7 @@ import "ocidl.idl"; import "dimm.idl"; +import "shtypes.idl"; cpp_quote("#include <olectl.h>")

1 0

Francois Gouget : dimm.idl: Don't import unknwn. idl if DO_NO_IMPORTS is defined.
by Alexandre Julliard 19 Oct '07

19 Oct '07

Module: wine Branch: master Commit: 44fd06f4411190a7e1d08e47852b1a1e021462fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=44fd06f4411190a7e1d08e478… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 18 17:12:03 2007 +0200 dimm.idl: Don't import unknwn.idl if DO_NO_IMPORTS is defined. --- include/dimm.idl | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/dimm.idl b/include/dimm.idl index 528c0c5..ab74d4a 100644 --- a/include/dimm.idl +++ b/include/dimm.idl @@ -16,7 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef DO_NO_IMPORTS import "unknwn.idl"; +#endif cpp_quote("#include <imm.h>")

1 0

Detlef Riekenberg : msi/tests: Do not leak a HKEY when RegQueryValueEx failed.
by Alexandre Julliard 19 Oct '07

19 Oct '07

Module: wine Branch: master Commit: c54219fb40f1f72775c0135d01a34bbe2f283819 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c54219fb40f1f72775c0135d0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Oct 18 17:30:06 2007 +0200 msi/tests: Do not leak a HKEY when RegQueryValueEx failed. --- dlls/msi/tests/install.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index b169886..c00b869 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1006,12 +1006,16 @@ static BOOL get_program_files_dir(LPSTR buf, LPSTR buf2) return FALSE; size = MAX_PATH; - if (RegQueryValueEx(hkey, "ProgramFilesDir", 0, &type, (LPBYTE)buf, &size)) + if (RegQueryValueExA(hkey, "ProgramFilesDir", 0, &type, (LPBYTE)buf, &size)) { + RegCloseKey(hkey); return FALSE; + } size = MAX_PATH; - if (RegQueryValueEx(hkey, "CommonFilesDir", 0, &type, (LPBYTE)buf2, &size)) + if (RegQueryValueExA(hkey, "CommonFilesDir", 0, &type, (LPBYTE)buf2, &size)) { + RegCloseKey(hkey); return FALSE; + } RegCloseKey(hkey); return TRUE;

1 0

Francois Gouget : imm32: #ifdef-out some functions in imm.h if wingdi. h was not included first.
by Alexandre Julliard 19 Oct '07

19 Oct '07

Module: wine Branch: master Commit: cb7decd6f641a7d13ef7749adab562f665d89e91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb7decd6f641a7d13ef7749ad… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 18 17:12:30 2007 +0200 imm32: #ifdef-out some functions in imm.h if wingdi.h was not included first. --- include/imm.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/imm.h b/include/imm.h index 89473ed..85848e6 100644 --- a/include/imm.h +++ b/include/imm.h @@ -493,7 +493,7 @@ DWORD WINAPI ImmGetCandidateListCountA(HIMC, LPDWORD); DWORD WINAPI ImmGetCandidateListCountW(HIMC, LPDWORD); #define ImmGetCandidateListCount WINELIB_NAME_AW(ImmGetCandidateListCount) BOOL WINAPI ImmGetCandidateWindow(HIMC, DWORD, LPCANDIDATEFORM); -#ifndef NOGDI +#if defined(_WINGDI_) && !defined(NOGDI) BOOL WINAPI ImmGetCompositionFontA(HIMC, LPLOGFONTA); BOOL WINAPI ImmGetCompositionFontW(HIMC, LPLOGFONTW); #define ImmGetCompositionFont WINELIB_NAME_AW(ImmGetCompositionFont)

1 0

Konstantin Kondratyuk : mpr: Delete a stub trace.
by Alexandre Julliard 19 Oct '07

19 Oct '07

Module: wine Branch: master Commit: bcfb9be3704a24a9d8ea58fe1f94fd23e5af5e99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcfb9be3704a24a9d8ea58fe1… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Thu Oct 18 18:54:29 2007 +0400 mpr: Delete a stub trace. --- dlls/mpr/wnet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 2fc8792..36fb93c 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1409,7 +1409,7 @@ DWORD WINAPI WNetGetResourceInformationW( LPNETRESOURCEW lpNetResource, DWORD ret = WN_NO_NETWORK; DWORD index; - TRACE( "(%p, %p, %p, %p): stub\n", + TRACE( "(%p, %p, %p, %p)\n", lpNetResource, lpBuffer, cbBuffer, lplpSystem); if (!(lpBuffer))

1 0

Francois Gouget : tools/fnt2fon: Remove error() as it is almost unused. Transform errno into a meaningful string for the error message.
by Alexandre Julliard 19 Oct '07

19 Oct '07

Module: wine Branch: master Commit: eb9c53a1cb87b6608c3bcf5e2c9ba25b4006c6af URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb9c53a1cb87b6608c3bcf5e2… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 18 17:05:11 2007 +0200 tools/fnt2fon: Remove error() as it is almost unused. Transform errno into a meaningful string for the error message. --- tools/fnt2fon.c | 19 ++++--------------- 1 files changed, 4 insertions(+), 15 deletions(-) diff --git a/tools/fnt2fon.c b/tools/fnt2fon.c index 3f82fd9..87c5ab7 100644 --- a/tools/fnt2fon.c +++ b/tools/fnt2fon.c @@ -28,6 +28,7 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif +#include <errno.h> #include <fcntl.h> #ifdef HAVE_IO_H # include <io.h> @@ -78,19 +79,6 @@ static void usage(char **argv) #define __attribute__(X) #endif -static void error(const char *s, ...) __attribute__((format (printf, 1, 2))); - -static void error(const char *s, ...) -{ - va_list ap; - va_start(ap, s); - fprintf(stderr, "Error: "); - vfprintf(stderr, s, ap); - fprintf(stderr, "\n"); - va_end(ap); - exit(1); -} - int main(int argc, char **argv) { int i, j; @@ -123,13 +111,14 @@ int main(int argc, char **argv) for(i = 0; i < num_files; i++) { fp = fopen(argv[i+1], "rb"); if(!fp) { - fprintf(stderr, "Can't open %s\n", argv[i+1]); + fprintf(stderr, "error: unable to open %s for reading: %s\n", argv[i+1], strerror(errno)); usage(argv); exit(1); } fread(&ver, sizeof(short), 1, fp); if(ver != 0x200 && ver != 0x300) { - error("invalid fnt file %s ver %d", argv[i+1], ver); + fprintf(stderr, "error: invalid fnt file %s ver %d\n", argv[i+1], ver); + exit(1); } fread(file_lens + i, sizeof(int), 1, fp); fseek(fp, 0x44, SEEK_SET);

1 0

Francois Gouget : ndrtypes.h: Include limits.h.
by Alexandre Julliard 19 Oct '07

19 Oct '07

Module: wine Branch: master Commit: dff580e96f1900239d60b08d0536f504dd0494ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=dff580e96f1900239d60b08d0… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 18 17:10:16 2007 +0200 ndrtypes.h: Include limits.h. --- include/ndrtypes.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/ndrtypes.h b/include/ndrtypes.h index 40d8331..5d932fa 100644 --- a/include/ndrtypes.h +++ b/include/ndrtypes.h @@ -21,6 +21,8 @@ #ifndef __NDRTYPES_H__ #define __NDRTYPES_H__ +#include <limits.h> + typedef struct { unsigned short MustSize : 1; /* 0x0001 - client interpreter MUST size this

1 0

Francois Gouget : widl: Add the trailing '\n' to an error message.
by Alexandre Julliard 19 Oct '07

19 Oct '07

Module: wine Branch: master Commit: 599c74296cfdc3ece4af3be0e95b46edd1a0dabb URL: http://source.winehq.org/git/wine.git/?a=commit;h=599c74296cfdc3ece4af3be0e… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 18 17:10:45 2007 +0200 widl: Add the trailing '\n' to an error message. --- tools/widl/typegen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 2245524..6f194b7 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -863,7 +863,7 @@ static unsigned char conf_string_type_of_char_type(unsigned char t) return RPC_FC_C_WSTRING; } - error("string_type_of_char_type: unrecognized type %d", t); + error("string_type_of_char_type: unrecognized type %d\n", t); return 0; }

1 0

Francois Gouget : widl: Modify generic_msg() to behave like all the other Wine tracing methods, that is to not append a '\n' to the message.
by Alexandre Julliard 19 Oct '07

19 Oct '07

Module: wine Branch: master Commit: 4152085af13209a604d39c3b39596dbdcf904c30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4152085af13209a604d39c3b3… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 18 17:11:30 2007 +0200 widl: Modify generic_msg() to behave like all the other Wine tracing methods, that is to not append a '\n' to the message. --- tools/widl/header.c | 2 +- tools/widl/parser.l | 10 +++++----- tools/widl/proxy.c | 2 +- tools/widl/utils.c | 2 -- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 8de9b9f..40fda80 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -839,7 +839,7 @@ static void write_coclass_guid(type_t *cocl) static void write_com_interface(type_t *iface) { if (!iface->funcs && !iface->ref) { - parser_warning("%s has no methods", iface->name); + parser_warning("%s has no methods\n", iface->name); return; } diff --git a/tools/widl/parser.l b/tools/widl/parser.l index e9bfb1f..78ee4b2 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -113,10 +113,10 @@ UUID *parse_uuid(const char *u) yy_pop_state(); lineno = (int)strtol(yytext, &cptr, 10); if(!lineno) - parser_error("Malformed '#...' line-directive; invalid linenumber"); + parser_error("Malformed '#...' line-directive; invalid linenumber\n"); fname = strchr(cptr, '"'); if(!fname) - parser_error("Malformed '#...' line-directive; missing filename"); + parser_error("Malformed '#...' line-directive; missing filename\n"); fname++; cptr = strchr(fname, '"'); if(!cptr) @@ -352,7 +352,7 @@ static void addcchar(char c) cbufalloc += 1024; cbuffer = xrealloc(cbuffer, cbufalloc * sizeof(cbuffer[0])); if(cbufalloc > 65536) - parser_warning("Reallocating string buffer larger than 64kB"); + parser_warning("Reallocating string buffer larger than 64kB\n"); } cbuffer[cbufidx++] = c; } @@ -414,7 +414,7 @@ int do_import(char *fname) first_import = import; if (!(path = wpp_find_include( fname, input_name ))) - parser_error("Unable to open include file %s", fname); + parser_error("Unable to open include file %s\n", fname); import_stack[ptr].temp_name = temp_name; import_stack[ptr].input_name = input_name; @@ -427,7 +427,7 @@ int do_import(char *fname) if (ret) exit(1); if((f = fopen(temp_name, "r")) == NULL) - parser_error("Unable to open %s", temp_name); + parser_error("Unable to open %s\n", temp_name); import_stack[ptr].state = YY_CURRENT_BUFFER; yy_switch_to_buffer(yy_create_buffer(f, YY_BUF_SIZE)); diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 5354c27..0255923 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -509,7 +509,7 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) gen_stub(iface, cur, cname, *proc_offset); *proc_offset += get_size_procformatstring_func( cur ); if (midx == -1) midx = idx; - else if (midx != idx) parser_error("method index mismatch in write_proxy"); + else if (midx != idx) parser_error("method index mismatch in write_proxy\n"); midx++; } } diff --git a/tools/widl/utils.c b/tools/widl/utils.c index 03994d7..1382597 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -62,8 +62,6 @@ static void generic_msg(const char *s, const char *t, const char *n, va_list ap) free(cpy); } } - - fprintf(stderr, "\n"); }

1 0

Francois Gouget : winegcc: Modify error() to behave like all the other Wine tracing methods, that is to not append a '\n' to the message.
by Alexandre Julliard 19 Oct '07

19 Oct '07

Module: wine Branch: master Commit: dc3feef055e823690c54abf9f41fa8f0615028ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc3feef055e823690c54abf9f… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 18 17:11:47 2007 +0200 winegcc: Modify error() to behave like all the other Wine tracing methods, that is to not append a '\n' to the message. --- tools/winegcc/utils.c | 11 +++++------ tools/winegcc/winegcc.c | 14 +++++++------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index c5b46a4..225062d 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -43,7 +43,6 @@ void error(const char* s, ...) va_start(ap, s); fprintf(stderr, "winegcc: "); vfprintf(stderr, s, ap); - fprintf(stderr, "\n"); va_end(ap); exit(2); } @@ -53,7 +52,7 @@ void* xmalloc(size_t size) void* p; if ((p = malloc (size)) == NULL) - error("Could not malloc %d bytes.", size); + error("Could not malloc %d bytes\n", size); return p; } @@ -62,7 +61,7 @@ void *xrealloc(void* p, size_t size) { void* p2 = realloc (p, size); if (size && !p2) - error("Could not realloc %d bytes.", size); + error("Could not realloc %d bytes\n", size); return p2; } @@ -120,7 +119,7 @@ void strarray_add(strarray* arr, const char* str) void strarray_del(strarray* arr, unsigned int i) { - if (i >= arr->size) error("Invalid index i=%d", i); + if (i >= arr->size) error("Invalid index i=%d\n", i); memmove(&arr->base[i], &arr->base[i + 1], (arr->size - i - 1) * sizeof(arr->base[0])); arr->size--; } @@ -195,7 +194,7 @@ void create_file(const char* name, int mode, const char* fmt, ...) if (verbose) printf("Creating file %s\n", name); va_start(ap, fmt); if ( !(file = fopen(name, "w")) ) - error("Unable to open %s for writing.", name); + error("Unable to open %s for writing\n", name); vfprintf(file, fmt, ap); va_end(ap); fclose(file); @@ -327,7 +326,7 @@ void spawn(const strarray* prefix, const strarray* args, int ignore_errors) if ((status = spawnvp( _P_WAIT, argv[0], argv)) && !ignore_errors) { - if (status > 0) error("%s failed.", argv[0]); + if (status > 0) error("%s failed\n", argv[0]); else perror("winegcc"); exit(3); } diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 3955276..38a1f5e 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -201,7 +201,7 @@ static char* get_temp_file(const char* prefix, const char* suffix) free(tmp); tmp = strmake("/tmp/%s-XXXXXX%s", prefix, suffix); fd = mkstemps( tmp, strlen(suffix) ); - if (fd == -1) error( "could not create temp file" ); + if (fd == -1) error( "could not create temp file\n" ); } close( fd ); strarray_add(tmp_files, tmp); @@ -233,7 +233,7 @@ static const strarray* get_translator(enum processor processor) if (!as) as = strarray_fromstring(AS, " "); return as; } - error("Unknown processor"); + error("Unknown processor\n"); } static void compile(struct options* opts, const char* lang) @@ -507,12 +507,12 @@ static void build(struct options* opts) case file_def: case file_spec: if (spec_file) - error("Only one spec file can be specified."); + error("Only one spec file can be specified\n"); spec_file = file; break; case file_rc: /* FIXME: invoke wrc to build it */ - error("Can't compile .rc file at the moment: %s", file); + error("Can't compile .rc file at the moment: %s\n", file); break; case file_res: strarray_add(files, strmake("-r%s", file)); @@ -527,7 +527,7 @@ static void build(struct options* opts) strarray_add(files, strmake("-s%s", file)); break; case file_na: - error("File does not exist: %s", file); + error("File does not exist: %s\n", file); break; default: file = compile_to_object(opts, file, lang); @@ -541,7 +541,7 @@ static void build(struct options* opts) lang = file; } if (opts->shared && !spec_file) - error("A spec file is currently needed in shared mode"); + error("A spec file is currently needed in shared mode\n"); /* add the default libraries, if needed */ if (!opts->nostdlib && opts->use_msvcrt) add_library(lib_dirs, files, "msvcrt"); @@ -1020,7 +1020,7 @@ int main(int argc, char **argv) } if (opts.processor == proc_cpp) linking = 0; - if (linking == -1) error("Static linking is not supported."); + if (linking == -1) error("Static linking is not supported\n"); if (opts.files->size == 0) forward(argc, argv, &opts); else if (linking) build(&opts);

1 0