October 2013 - Wine-Commits

Alexandre Julliard : wrc: Define WINE_UNICODE_API directly in the source.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: 98de631eb1ff9a54369c9adc27f49ff3240fb5dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=98de631eb1ff9a54369c9adc2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 28 14:20:58 2013 +0100 wrc: Define WINE_UNICODE_API directly in the source. --- tools/wrc/Makefile.in | 2 +- tools/wrc/genres.c | 1 - tools/wrc/parser.l | 1 - tools/wrc/parser.y | 1 - tools/wrc/po.c | 1 - tools/wrc/utils.c | 1 - tools/wrc/wrc.h | 2 ++ tools/wrc/writeres.c | 1 - 8 files changed, 3 insertions(+), 7 deletions(-) diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index a017891..e4210c0 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DINCLUDEDIR="\"$(includedir)\"" -DWINE_UNICODE_API="" +EXTRADEFS = -DINCLUDEDIR="\"$(includedir)\"" PROGRAMS = wrc$(EXEEXT) MANPAGE = wrc.man ALL_LIBS = @LIBGETTEXTPO@ $(LIBWPP) $(LIBWINE_STATIC) $(LIBPORT) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index e49d8a5..61b2b29 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -41,7 +41,6 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "wine/unicode.h" #define SetResSize(res, tag) set_dword((res), (tag), (res)->size - get_dword((res), (tag))) diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index 8c50a8a..16a487f 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -112,7 +112,6 @@ cident [a-zA-Z_][0-9a-zA-Z_]* #define YY_NO_UNISTD_H #endif -#include "wine/unicode.h" #include "wrc.h" #include "utils.h" #include "parser.h" diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index ff59327..144ae03 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -135,7 +135,6 @@ #include "newstruc.h" #include "dumpres.h" #include "wine/wpp.h" -#include "wine/unicode.h" #include "parser.h" #include "windef.h" #include "winbase.h" diff --git a/tools/wrc/po.c b/tools/wrc/po.c index d6ea262..1be7650 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -40,7 +40,6 @@ #include "wingdi.h" #include "winuser.h" #include "wine/list.h" -#include "wine/unicode.h" static resource_t *new_top, *new_tail; diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index a45b338..4dc3364 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -28,7 +28,6 @@ #include <string.h> #include <ctype.h> -#include "wine/unicode.h" #include "wrc.h" #include "utils.h" #include "parser.h" diff --git a/tools/wrc/wrc.h b/tools/wrc/wrc.h index 74a65fe..5892daf 100644 --- a/tools/wrc/wrc.h +++ b/tools/wrc/wrc.h @@ -21,6 +21,8 @@ #ifndef __WRC_WRC_H #define __WRC_WRC_H +#define WINE_UNICODE_API /* nothing */ +#include "wine/unicode.h" #include "wrctypes.h" /* From wrc.c */ diff --git a/tools/wrc/writeres.c b/tools/wrc/writeres.c index 0bcad16..07d4f74 100644 --- a/tools/wrc/writeres.c +++ b/tools/wrc/writeres.c @@ -26,7 +26,6 @@ #include <string.h> #include <assert.h> -#include "wine/unicode.h" #include "wrc.h" #include "genres.h" #include "newstruc.h"

1 0

Alexandre Julliard : wrc: Remove an unused variable.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: 54e0c7fe14671a6fefbe68251b7a958933d0e62f URL: http://source.winehq.org/git/wine.git/?a=commit;h=54e0c7fe14671a6fefbe68251… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 28 14:18:56 2013 +0100 wrc: Remove an unused variable. --- tools/wrc/wrc.c | 3 --- tools/wrc/wrc.h | 3 --- 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index ac1fdcc..8c376e0 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -157,7 +157,6 @@ int line_number = 1; /* The current line */ int char_number = 1; /* The current char pos within the line */ char *cmdline; /* The entire commandline */ -time_t now; /* The time of start of wrc */ int parser_debug, yy_flex_debug; @@ -348,8 +347,6 @@ int main(int argc,char *argv[]) signal( SIGHUP, exit_on_signal ); #endif - now = time(NULL); - /* Set the default defined stuff */ set_version_defines(); wpp_add_cmdline_define("RC_INVOKED=1"); diff --git a/tools/wrc/wrc.h b/tools/wrc/wrc.h index a103ea36..74a65fe 100644 --- a/tools/wrc/wrc.h +++ b/tools/wrc/wrc.h @@ -21,8 +21,6 @@ #ifndef __WRC_WRC_H #define __WRC_WRC_H -#include <time.h> /* For time_t */ - #include "wrctypes.h" /* From wrc.c */ @@ -47,7 +45,6 @@ extern int check_utf8; extern char *input_name; extern char *cmdline; -extern time_t now; extern int line_number; extern int char_number;

1 0

Alexandre Julliard : wmc: Don't put timestamps in generated files.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: f775f3e105f3c923368114aa839140d173f1f4d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f775f3e105f3c923368114aa8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 28 14:18:37 2013 +0100 wmc: Don't put timestamps in generated files. --- tools/wmc/wmc.c | 2 -- tools/wmc/wmc.h | 3 --- tools/wmc/write.c | 17 +++++------------ 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index a08d733..9d34a40 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -174,8 +174,6 @@ int main(int argc,char *argv[]) signal( SIGHUP, exit_on_signal ); #endif - now = time(NULL); - /* First rebuild the commandline to put in destination */ /* Could be done through env[], but not all OS-es support it */ cmdlen = 5; /* for "wmc " and \0 */ diff --git a/tools/wmc/wmc.h b/tools/wmc/wmc.h index cf6d430..9ef9ac7 100644 --- a/tools/wmc/wmc.h +++ b/tools/wmc/wmc.h @@ -21,8 +21,6 @@ #ifndef __WMC_WMC_H #define __WMC_WMC_H -#include <time.h> /* For time_t */ - #include "wmctypes.h" /* @@ -51,7 +49,6 @@ extern char *output_name; extern char *input_name; extern char *header_name; extern char *cmdline; -extern time_t now; extern int line_number; extern int char_number; diff --git a/tools/wmc/write.c b/tools/wmc/write.c index cf170d4..19cd5b3 100644 --- a/tools/wmc/write.c +++ b/tools/wmc/write.c @@ -91,7 +91,6 @@ static const char str_header[] = "/* This file is generated with wmc version " PACKAGE_VERSION ". Do not edit! */\n" "/* Source : %s */\n" "/* Cmdline: %s */\n" - "/* Date : %s */\n" "\n" ; @@ -178,11 +177,9 @@ void write_h_file(const char *fname) perror(fname); exit(1); } - cptr = ctime(&now); - killnl(cptr, 0); - fprintf(fp, str_header, input_name ? input_name : "<stdin>", cmdline, cptr); - fprintf(fp, "#ifndef __WMCGENERATED_%08lx_H\n", (long)now); - fprintf(fp, "#define __WMCGENERATED_%08lx_H\n", (long)now); + fprintf(fp, str_header, input_name ? input_name : "<stdin>", cmdline); + fprintf(fp, "#ifndef __WMCGENERATED_H\n"); + fprintf(fp, "#define __WMCGENERATED_H\n"); fprintf(fp, "\n"); /* Write severity and facility aliases */ @@ -501,18 +498,14 @@ static void write_rcinline(FILE *fp) void write_rc_file(const char *fname) { - FILE *fp; - char *cptr; + FILE *fp = fopen(fname, "w"); - fp = fopen(fname, "w"); if(!fp) { perror(fname); exit(1); } - cptr = ctime(&now); - killnl(cptr, 0); - fprintf(fp, str_header, input_name ? input_name : "<stdin>", cmdline, cptr); + fprintf(fp, str_header, input_name ? input_name : "<stdin>", cmdline); if(rcinline) write_rcinline(fp);

1 0

Dmitry Timoshkov : kernel32/tests: Update trace message to report actually used timeout value.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: d97a36c51fece853884fe873af06af3f5a43973f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d97a36c51fece853884fe873a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 28 17:27:57 2013 +0900 kernel32/tests: Update trace message to report actually used timeout value. --- dlls/kernel32/tests/comm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index dc9f587..455ee89 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -882,7 +882,7 @@ static void test_waittxempty(void) CloseHandle(ovl_wait.hEvent); timediff = after - before; - trace("WaitCommEvent for EV_TXEMPTY took %d ms (timeout %d)\n", timediff, TIMEOUT); + trace("WaitCommEvent for EV_TXEMPTY took %d ms (timeout 1500)\n", timediff); ok(timediff < 1200, "WaitCommEvent used %d ms for waiting\n", timediff); res = WaitForSingleObject(ovl_write.hEvent, 0);

1 0

Nikolay Sivov : msxml3/tests: Fix test failures on newer systems.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: 32f56af204aaf5122635ae1b5395ac1d0b296337 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32f56af204aaf5122635ae1b5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 27 22:01:55 2013 +0400 msxml3/tests: Fix test failures on newer systems. --- dlls/msxml3/tests/httpreq.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 58abec9..ad074de 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1150,16 +1150,11 @@ static HRESULT WINAPI sp_QueryService(IServiceProvider *iface, REFGUID service, { /* FIXME: unidentified service id */ } - else if (IsEqualGUID(service, &IID_IInternetProtocol) && - IsEqualGUID(riid, &IID_IInternetProtocol)) - { - } - else if (IsEqualGUID(service, &IID_IHttpNegotiate2) && - IsEqualGUID(riid, &IID_IHttpNegotiate2)) - { - } - else if (IsEqualGUID(service, &IID_IGetBindHandle) && - IsEqualGUID(riid, &IID_IGetBindHandle)) + else if ((IsEqualGUID(service, &IID_IInternetProtocol) && IsEqualGUID(riid, &IID_IInternetProtocol)) || + (IsEqualGUID(service, &IID_IHttpNegotiate2) && IsEqualGUID(riid, &IID_IHttpNegotiate2)) || + (IsEqualGUID(service, &IID_IGetBindHandle) && IsEqualGUID(riid, &IID_IGetBindHandle)) || + (IsEqualGUID(service, &IID_IBindStatusCallback) && IsEqualGUID(riid, &IID_IBindStatusCallback)) || + (IsEqualGUID(service, &IID_IWindowForBindingUI) && IsEqualGUID(riid, &IID_IWindowForBindingUI))) { } else

1 0

Nikolay Sivov : advapi32/tests: Remove string constants redefinition that are not needed anymore.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: 26c2dc93cb1078f9b2ff96ba7884328b351df3aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=26c2dc93cb1078f9b2ff96ba7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 26 23:09:51 2013 +0400 advapi32/tests: Remove string constants redefinition that are not needed anymore. --- dlls/advapi32/tests/registry.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 1423d88..47de094 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -31,11 +31,6 @@ #include "winerror.h" #include "aclapi.h" -#undef SE_BACKUP_NAME -#undef SE_RESTORE_NAME -#define SE_BACKUP_NAME "SeBackupPrivilege" -#define SE_RESTORE_NAME "SeRestorePrivilege" - #define IS_HKCR(hk) ((UINT_PTR)hk > 0 && ((UINT_PTR)hk & 3) == 2) static HKEY hkey_main;

1 0

Alistair Leslie-Hughes : include: Add more CLR_E_SHIM defines.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: 57f5e14196567281ef46b08be0c222df992312e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57f5e14196567281ef46b08be… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 28 11:32:47 2013 +1100 include: Add more CLR_E_SHIM defines. --- include/corerror.h | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/include/corerror.h b/include/corerror.h index 3ddfe47..6419ea1 100644 --- a/include/corerror.h +++ b/include/corerror.h @@ -126,5 +126,9 @@ #define CLR_E_SHIM_RUNTIME EMAKEHR(0x1700) #define CLR_E_SHIM_RUNTIMEEXPORT EMAKEHR(0x1701) +#define CLR_E_SHIM_INSTALLROOT EMAKEHR(0x1702) +#define CLR_E_SHIM_INSTALLCOMP EMAKEHR(0x1703) +#define CLR_E_SHIM_LEGACYRUNTIMEALREADYBOUND EMAKEHR(0x1704) +#define CLR_E_SHIM_SHUTDOWNINPROGRESS EMAKEHR(0x1705) -#endif /* __WINE_CORERROR_H */ +#endif /* __WINE_CORERROR_H */

1 0

Piotr Caban : comctl32: Fix a typo in UPDOWN_OffsetVal that breaks UDS_WRAP flag support.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: 22a132938229e9fcb33a905787318a96bee4c33c URL: http://source.winehq.org/git/wine.git/?a=commit;h=22a132938229e9fcb33a90578… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 28 09:56:18 2013 +0100 comctl32: Fix a typo in UPDOWN_OffsetVal that breaks UDS_WRAP flag support. --- dlls/comctl32/updown.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 0761774..23a633e 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -150,7 +150,7 @@ static BOOL UPDOWN_OffsetVal(UPDOWN_INFO *infoPtr, int delta) (infoPtr->MaxVal < infoPtr->MinVal ? -1 : 1) * (infoPtr->MinVal - infoPtr->MaxVal) + (delta < 0 ? 1 : -1); - } if ((infoPtr->MaxVal > infoPtr->MinVal && infoPtr->CurVal+delta > infoPtr->MaxVal) + } else if ((infoPtr->MaxVal > infoPtr->MinVal && infoPtr->CurVal+delta > infoPtr->MaxVal) || (infoPtr->MaxVal < infoPtr->MinVal && infoPtr->CurVal+delta < infoPtr->MaxVal)) { delta = infoPtr->MaxVal - infoPtr->CurVal; } else {

1 0

Francois Gouget : mscoree: RuntimeHost_Destroy() is not used anymore so remove it.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: fbe912d73bda27f69cba0ac62fc2726d12706ce6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe912d73bda27f69cba0ac62… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 27 10:43:09 2013 +0100 mscoree: RuntimeHost_Destroy() is not used anymore so remove it. --- dlls/mscoree/corruntimehost.c | 17 ----------------- dlls/mscoree/mscoree_private.h | 2 -- 2 files changed, 0 insertions(+), 19 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 5cea669..554f4c5 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1269,23 +1269,6 @@ HRESULT RuntimeHost_GetInterface(RuntimeHost *This, REFCLSID clsid, REFIID riid, return CLASS_E_CLASSNOTAVAILABLE; } -HRESULT RuntimeHost_Destroy(RuntimeHost *This) -{ - struct DomainEntry *cursor, *cursor2; - - This->lock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&This->lock); - - LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &This->domains, struct DomainEntry, entry) - { - list_remove(&cursor->entry); - HeapFree(GetProcessHeap(), 0, cursor); - } - - HeapFree( GetProcessHeap(), 0, This ); - return S_OK; -} - #define CHARS_IN_GUID 39 #define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 820d081..f76dd78 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -175,8 +175,6 @@ extern HRESULT RuntimeHost_GetIUnknownForObject(RuntimeHost *This, MonoObject *o extern HRESULT RuntimeHost_CreateManagedInstance(RuntimeHost *This, LPCWSTR name, MonoDomain *domain, MonoObject **result) DECLSPEC_HIDDEN; -extern HRESULT RuntimeHost_Destroy(RuntimeHost *This) DECLSPEC_HIDDEN; - HRESULT WINAPI CLRMetaHost_ExitProcess(ICLRMetaHost* iface, INT32 iExitCode) DECLSPEC_HIDDEN; HRESULT WINAPI CLRMetaHost_GetRuntime(ICLRMetaHost* iface, LPCWSTR pwzVersion, REFIID iid, LPVOID *ppRuntime) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : wmc: Define WINE_UNICODE_API directly in the source.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: b647703774392a23cebda3f907db0946f8e9b8ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=b647703774392a23cebda3f90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 28 14:20:53 2013 +0100 wmc: Define WINE_UNICODE_API directly in the source. --- tools/wmc/Makefile.in | 1 - tools/wmc/lang.h | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index c302c22..c8ccbed 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_UNICODE_API="" PROGRAMS = wmc$(EXEEXT) MANPAGE = wmc.man ALL_LIBS = @LIBGETTEXTPO@ $(LIBWINE_STATIC) $(LIBPORT) diff --git a/tools/wmc/lang.h b/tools/wmc/lang.h index 5a11c5b..337d661 100644 --- a/tools/wmc/lang.h +++ b/tools/wmc/lang.h @@ -21,6 +21,7 @@ #ifndef __WMC_LANG_H #define __WMC_LANG_H +#define WINE_UNICODE_API /* nothing */ #include "wine/unicode.h" typedef struct language {

1 0