October 2007 - Wine-Commits

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

Oct. 19, 2007

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 : dimm.idl: Don't import unknwn. idl if DO_NO_IMPORTS is defined.
by Alexandre Julliard Oct. 19, 2007

Oct. 19, 2007

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

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

Oct. 19, 2007

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 : imm32: #ifdef-out some functions in imm.h if wingdi. h was not included first.
by Alexandre Julliard Oct. 19, 2007

Oct. 19, 2007

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

Francois Gouget : ndrtypes.h: Include limits.h.
by Alexandre Julliard Oct. 19, 2007

Oct. 19, 2007

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 : tools/fnt2fon: Remove error() as it is almost unused. Transform errno into a meaningful string for the error message.
by Alexandre Julliard Oct. 19, 2007

Oct. 19, 2007

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

Konstantin Kondratyuk : mpr: Delete a stub trace.
by Alexandre Julliard Oct. 19, 2007

Oct. 19, 2007

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

Aric Stewart : ws2_32: Return proper WSAENOBUFS error when enuming protocols.
by Alexandre Julliard Oct. 19, 2007

Oct. 19, 2007

Module: wine Branch: master Commit: 6c824e8b89dfe3fd55a6046965bd3d3a243b13cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c824e8b89dfe3fd55a604696… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 18 08:40:13 2007 -0500 ws2_32: Return proper WSAENOBUFS error when enuming protocols. --- dlls/ws2_32/protocol.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 2f71d32..7cccecb 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -301,18 +301,16 @@ INT WINAPI WSAEnumProtocolsA( LPINT protocols, LPWSAPROTOCOL_INFOA buffer, LPDWO DWORD size = 0; INT local[] = { WS_IPPROTO_TCP, WS_IPPROTO_UDP, NSPROTO_IPX, NSPROTO_SPX, NSPROTO_SPXII, 0 }; - if (!buffer) - return SOCKET_ERROR; - if (!protocols) protocols = local; while (protocols[i]) i++; size = i * sizeof(WSAPROTOCOL_INFOA); - if (*len < size) + if (*len < size || !buffer) { *len = size; + WSASetLastError(WSAENOBUFS); return SOCKET_ERROR; } @@ -367,18 +365,16 @@ INT WINAPI WSAEnumProtocolsW( LPINT protocols, LPWSAPROTOCOL_INFOW buffer, LPDWO DWORD size = 0; INT local[] = { WS_IPPROTO_TCP, WS_IPPROTO_UDP, NSPROTO_IPX, NSPROTO_SPX, NSPROTO_SPXII, 0 }; - if (!buffer) - return SOCKET_ERROR; - if (!protocols) protocols = local; while (protocols[i]) i++; size = i * sizeof(WSAPROTOCOL_INFOW); - if (*len < size) + if (*len < size || !buffer) { *len = size; + WSASetLastError(WSAENOBUFS); return SOCKET_ERROR; }

1 0

Francois Gouget : wmc: Modify the error and warning functions to behave like all the other Wine tracing methods , that is to not append a '\n' to the message.
by Alexandre Julliard Oct. 19, 2007

Oct. 19, 2007

Module: wine Branch: master Commit: 22076e09cae5cf268f73a3cd4dd00889c97d8eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=22076e09cae5cf268f73a3cd4… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 18 17:11:57 2007 +0200 wmc: Modify the error and warning functions to behave like all the other Wine tracing methods, that is to not append a '\n' to the message. --- tools/wmc/mcl.c | 30 ++++++++++++++-------------- tools/wmc/mcy.y | 56 ++++++++++++++++++++++++++-------------------------- tools/wmc/utils.c | 4 --- tools/wmc/write.c | 12 +++++----- 4 files changed, 49 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=22076e09cae5cf268f73a…

1 0

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

Oct. 19, 2007

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