wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

Alexandre Julliard : makefiles: Generate explicit build rules for message files from makedep.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: da4c49c744b21bb5d15c49a8308f1300b57bd07c URL: http://source.winehq.org/git/wine.git/?a=commit;h=da4c49c744b21bb5d15c49a83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 14 20:18:18 2013 +0200 makefiles: Generate explicit build rules for message files from makedep. --- Make.rules.in | 9 +-------- tools/makedep.c | 21 +++++++++++++++++++-- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index a7da5ef..06dea78 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -36,7 +36,7 @@ CROSSOBJS = $(OBJS:.o=.cross.o) # Implicit rules -.SUFFIXES: .mc .rc .res .idl .tlb .h .ok .man.in .man _c.c _i.c _p.c _s.c _r.res _t.res .cross.o .po .mo @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp +.SUFFIXES: .rc .res .idl .tlb .h .ok .man.in .man _c.c _i.c _p.c _s.c _r.res _t.res .cross.o .po .mo @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp .c.o: $(CC) -c $(ALLCFLAGS) -o $@ $< @@ -47,9 +47,6 @@ CROSSOBJS = $(OBJS:.o=.cross.o) .c.cross.o: $(CROSSCC) -c $(INCLUDES) $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) -o $@ $< -.mc.res: - $(WMC) -U -O res $(PORCFLAGS) -o $@ $< - .rc.res: $(WRC) $(RCFLAGS) -o $@ $< @@ -218,10 +215,6 @@ install install-lib install-dev uninstall:: rsrc.pot: $(WRC) $(WRC) $(RCFLAGS) -O pot -o $@ $(PO_SRCS) -msg.pot: $(WMC) - $(WMC) -O pot -o $@ $(MC_SRCS) - -$(MC_SRCS:.mc=.res): $(WMC) $(ALL_MO_FILES) $(RC_SRCS:.rc=.res): $(WRC) $(PO_SRCS:.rc=.res): $(ALL_MO_FILES) diff --git a/tools/makedep.c b/tools/makedep.c index b7c70d2..db92d53 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -926,7 +926,7 @@ static void output_include( struct incl_file *pFile, struct incl_file *owner, in static void output_sources(void) { struct incl_file *source; - int i, column; + int i, column, mc_srcs = 0; LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) { @@ -966,7 +966,10 @@ static void output_sources(void) } else if (!strcmp( ext, "mc" )) /* message file */ { - column += output( "msg.pot %s.res: %s", obj, source->filename ); + output( "%s.res: $(WMC) $(ALL_MO_FILES) %s\n", obj, source->filename ); + output( "\t$(WMC) -U -O res $(PORCFLAGS) -o $@ %s\n", source->filename ); + mc_srcs++; + column += output( "msg.pot %s.res:", obj ); } else if (!strcmp( ext, "idl" )) /* IDL file */ { @@ -1018,6 +1021,20 @@ static void output_sources(void) if (source->files[i]) output_include( source->files[i], source, &column ); output( "\n" ); } + + /* rules for files that depend on multiple sources */ + + if (mc_srcs) + { + column = output( "msg.pot: $(WMC)" ); + LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) + if (strendswith( source->name, ".mc" )) output_filename( source->filename, &column ); + output( "\n" ); + column = output( "\t$(WMC) -O pot -o $@" ); + LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) + if (strendswith( source->name, ".mc" )) output_filename( source->filename, &column ); + output( "\n" ); + } }

1 0

Alexandre Julliard : makefiles: Generate explicit build rules for bison files from makedep.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: c00cc015f827d255b6e239b63e45acff01e19525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c00cc015f827d255b6e239b63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 14 19:52:52 2013 +0200 makefiles: Generate explicit build rules for bison files from makedep. --- Make.rules.in | 8 +------- tools/makedep.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 430e91b..a7da5ef 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -36,7 +36,7 @@ CROSSOBJS = $(OBJS:.o=.cross.o) # Implicit rules -.SUFFIXES: .mc .rc .res .idl .tlb .h .y .tab.c .tab.h .ok .man.in .man _c.c _i.c _p.c _s.c _r.res _t.res .cross.o .po .mo @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp +.SUFFIXES: .mc .rc .res .idl .tlb .h .ok .man.in .man _c.c _i.c _p.c _s.c _r.res _t.res .cross.o .po .mo @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp .c.o: $(CC) -c $(ALLCFLAGS) -o $@ $< @@ -47,12 +47,6 @@ CROSSOBJS = $(OBJS:.o=.cross.o) .c.cross.o: $(CROSSCC) -c $(INCLUDES) $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) -o $@ $< -.y.tab.c: - $(BISON) $(BISONFLAGS) -p $*_ -o $@ $< - -.y.tab.h: - $(BISON) $(BISONFLAGS) -p $*_ -o $*.tab.c -d $< - .mc.res: $(WMC) -U -O res $(PORCFLAGS) -o $@ $< diff --git a/tools/makedep.c b/tools/makedep.c index d49c90a..b7c70d2 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -941,9 +941,18 @@ static void output_sources(void) { /* add source file dependency for parallel makes */ char *header = strmake( "%s.tab.h", obj ); - if (find_include_file( header )) output( "%s.tab.c: %s\n", obj, header ); - free( header ); + if (find_include_file( header )) + { + output( "%s.tab.h: %s\n", obj, source->filename ); + output( "\t$(BISON) $(BISONFLAGS) -p %s_ -o %s.tab.c -d %s\n", + obj, obj, source->filename ); + output( "%s.tab.c: %s %s\n", obj, source->filename, header ); + } + else output( "%s.tab.c: %s\n", obj, source->filename ); + + output( "\t$(BISON) $(BISONFLAGS) -p %s_ -o $@ %s\n", obj, source->filename ); column += output( "%s.tab.o: %s.tab.c", obj, obj ); + free( header ); } else if (!strcmp( ext, "l" )) /* lex file */ {

1 0

Alexandre Julliard : makefiles: Generate explicit build rules for lex files from makedep.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: efef36c05abfffbe36d82e6e3f78133d8d88c53d URL: http://source.winehq.org/git/wine.git/?a=commit;h=efef36c05abfffbe36d82e6e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 14 19:49:29 2013 +0200 makefiles: Generate explicit build rules for lex files from makedep. --- Make.rules.in | 5 +---- tools/makedep.c | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 30a72fa..430e91b 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -36,7 +36,7 @@ CROSSOBJS = $(OBJS:.o=.cross.o) # Implicit rules -.SUFFIXES: .mc .rc .res .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .man.in .man _c.c _i.c _p.c _s.c _r.res _t.res .cross.o .po .mo @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp +.SUFFIXES: .mc .rc .res .idl .tlb .h .y .tab.c .tab.h .ok .man.in .man _c.c _i.c _p.c _s.c _r.res _t.res .cross.o .po .mo @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp .c.o: $(CC) -c $(ALLCFLAGS) -o $@ $< @@ -53,9 +53,6 @@ CROSSOBJS = $(OBJS:.o=.cross.o) .y.tab.h: $(BISON) $(BISONFLAGS) -p $*_ -o $*.tab.c -d $< -.l.yy.c: - $(FLEX) $(LEXFLAGS) -o$@ $< - .mc.res: $(WMC) -U -O res $(PORCFLAGS) -o $@ $< diff --git a/tools/makedep.c b/tools/makedep.c index 498a05d..d49c90a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -947,6 +947,8 @@ static void output_sources(void) } else if (!strcmp( ext, "l" )) /* lex file */ { + output( "%s.yy.c: %s\n", obj, source->filename ); + output( "\t$(FLEX) $(LEXFLAGS) -o$@ %s\n", source->filename ); column += output( "%s.yy.o: %s.yy.c", obj, obj ); } else if (!strcmp( ext, "rc" )) /* resource file */

1 0

Adam Bolte : wined3d: Add support for nVidia GTX 660M.
by Alexandre Julliard 14 Oct '13

14 Oct '13

Module: wine Branch: master Commit: 66a559328a03632069d2d209872ccbe3f0bfe2f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66a559328a03632069d2d2098… Author: Adam Bolte <abolte(a)systemsaviour.com> Date: Sat Oct 12 10:57:33 2013 +1100 wined3d: Add support for nVidia GTX 660M. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4a65993..7d4f859 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1251,6 +1251,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX650, "NVIDIA GeForce GTX 650", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX650TI, "NVIDIA GeForce GTX 650 Ti", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX660, "NVIDIA GeForce GTX 660", DRIVER_NVIDIA_GEFORCE6, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX660M, "NVIDIA GeForce GTX 660M", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX660TI, "NVIDIA GeForce GTX 660 Ti", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670MX, "NVIDIA GeForce GTX 670MX", DRIVER_NVIDIA_GEFORCE6, 3072}, @@ -1665,6 +1666,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GTX 670MX", CARD_NVIDIA_GEFORCE_GTX670MX}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ {"GTX 660 Ti", CARD_NVIDIA_GEFORCE_GTX660TI}, /* Geforce 600 - midend high */ + {"GTX 660M", CARD_NVIDIA_GEFORCE_GTX660M}, /* Geforce 600 - midend high mobile */ {"GTX 660", CARD_NVIDIA_GEFORCE_GTX660}, /* Geforce 600 - midend high */ {"GTX 650 Ti", CARD_NVIDIA_GEFORCE_GTX650TI}, /* Geforce 600 - lowend */ {"GTX 650", CARD_NVIDIA_GEFORCE_GTX650}, /* Geforce 600 - lowend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 03c7353..fc92e53 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1463,6 +1463,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX650 = 0x0fc6, CARD_NVIDIA_GEFORCE_GTX650TI = 0x11c6, CARD_NVIDIA_GEFORCE_GTX660 = 0x11c0, + CARD_NVIDIA_GEFORCE_GTX660M = 0x0fd4, CARD_NVIDIA_GEFORCE_GTX660TI = 0x1183, CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_NVIDIA_GEFORCE_GTX670MX = 0x11a1,

1 0

Jacek Caban : vbscript: Compile tests with -D__WINESRC__.
by Alexandre Julliard 14 Oct '13

14 Oct '13

Module: wine Branch: master Commit: b1cf39d0814aac3d307b4ccee2b1f9cd06e1c9bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1cf39d0814aac3d307b4ccee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 14 16:05:48 2013 +0200 vbscript: Compile tests with -D__WINESRC__. --- dlls/vbscript/tests/Makefile.in | 1 - dlls/vbscript/tests/createobj.c | 2 +- dlls/vbscript/tests/run.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/tests/Makefile.in b/dlls/vbscript/tests/Makefile.in index 6cd59d6..88a57f7 100644 --- a/dlls/vbscript/tests/Makefile.in +++ b/dlls/vbscript/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = vbscript.dll IMPORTS = oleaut32 ole32 advapi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ createobj.c \ diff --git a/dlls/vbscript/tests/createobj.c b/dlls/vbscript/tests/createobj.c index 4ae4208..fd59827 100644 --- a/dlls/vbscript/tests/createobj.c +++ b/dlls/vbscript/tests/createobj.c @@ -1042,7 +1042,7 @@ static BOOL init_key(const char *key_name, const char *def_value, BOOL init) DWORD res; if(!init) { - RegDeleteKey(HKEY_CLASSES_ROOT, key_name); + RegDeleteKeyA(HKEY_CLASSES_ROOT, key_name); return TRUE; } diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 37bbba4..7762323 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -1726,7 +1726,7 @@ static BSTR get_script_from_file(const char *filename) size = GetFileSize(file, NULL); - map = CreateFileMapping(file, NULL, PAGE_READONLY, 0, 0, NULL); + map = CreateFileMappingW(file, NULL, PAGE_READONLY, 0, 0, NULL); CloseHandle(file); if(map == INVALID_HANDLE_VALUE) { trace("Could not create file mapping: %u\n", GetLastError());

1 0

Jacek Caban : jscript: Compile tests with -D__WINESRC__.
by Alexandre Julliard 14 Oct '13

14 Oct '13

Module: wine Branch: master Commit: 71d1df73b5e87bc6490ac4798ad8816ec824be45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d1df73b5e87bc6490ac4798… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 14 16:05:34 2013 +0200 jscript: Compile tests with -D__WINESRC__. --- dlls/jscript/tests/Makefile.in | 1 - dlls/jscript/tests/activex.c | 2 +- dlls/jscript/tests/run.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/tests/Makefile.in b/dlls/jscript/tests/Makefile.in index 65fc985..a3ad0ea 100644 --- a/dlls/jscript/tests/Makefile.in +++ b/dlls/jscript/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = jscript.dll IMPORTS = oleaut32 ole32 advapi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ activex.c \ diff --git a/dlls/jscript/tests/activex.c b/dlls/jscript/tests/activex.c index a04d27c..b4a8bdc 100644 --- a/dlls/jscript/tests/activex.c +++ b/dlls/jscript/tests/activex.c @@ -1088,7 +1088,7 @@ static BOOL init_key(const char *key_name, const char *def_value, BOOL init) DWORD res; if(!init) { - RegDeleteKey(HKEY_CLASSES_ROOT, key_name); + RegDeleteKeyA(HKEY_CLASSES_ROOT, key_name); return TRUE; } diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 82d9310..0db3660 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1739,7 +1739,7 @@ static BSTR get_script_from_file(const char *filename) size = GetFileSize(file, NULL); - map = CreateFileMapping(file, NULL, PAGE_READONLY, 0, 0, NULL); + map = CreateFileMappingW(file, NULL, PAGE_READONLY, 0, 0, NULL); CloseHandle(file); if(map == INVALID_HANDLE_VALUE) { trace("Could not create file mapping: %u\n", GetLastError());

1 0

Hans Leidekker : winhttp/tests: Compile with -D__WINESRC__.
by Alexandre Julliard 14 Oct '13

14 Oct '13

Module: wine Branch: master Commit: ceeff119a209af4557bb25071ca43adb8b611d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceeff119a209af4557bb25071… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 14 15:58:44 2013 +0200 winhttp/tests: Compile with -D__WINESRC__. --- dlls/winhttp/tests/Makefile.in | 1 - dlls/winhttp/tests/notification.c | 2 +- dlls/winhttp/tests/winhttp.c | 5 ++--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/tests/Makefile.in b/dlls/winhttp/tests/Makefile.in index 9e76c6c..01f5779 100644 --- a/dlls/winhttp/tests/Makefile.in +++ b/dlls/winhttp/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = winhttp.dll IMPORTS = winhttp oleaut32 ole32 crypt32 advapi32 ws2_32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ notification.c \ diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index b9f4b2f..4643193 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -420,7 +420,7 @@ static void test_async( void ) info.test = async_test; info.count = sizeof(async_test) / sizeof(async_test[0]); info.index = 0; - info.wait = CreateEvent( NULL, FALSE, FALSE, NULL ); + info.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); ses = WinHttpOpen( user_agent, 0, NULL, NULL, WINHTTP_FLAG_ASYNC ); ok(ses != NULL, "failed to open session %u\n", GetLastError()); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 19bd429..ab8b94c 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -28,7 +28,6 @@ #include <winhttp.h> #include <wincrypt.h> #include <winreg.h> -#include <winsock.h> #include "initguid.h" #include <httprequest.h> @@ -350,7 +349,7 @@ static void test_SendRequest (void) ret = WinHttpReadData(request, buffer, sizeof(buffer) - 1, &bytes_rw); ok(ret == TRUE, "WinHttpReadData failed: %u.\n", GetLastError()); - ok(bytes_rw == strlen(test_post), "Read %u bytes instead of %d.\n", bytes_rw, lstrlen(test_post)); + ok(bytes_rw == strlen(test_post), "Read %u bytes instead of %d.\n", bytes_rw, lstrlenA(test_post)); ok(strncmp(buffer, test_post, bytes_rw) == 0, "Data read did not match, got '%s'.\n", buffer); ret = WinHttpCloseHandle(request); @@ -3023,7 +3022,7 @@ START_TEST (winhttp) test_WinHttpGetProxyForUrl(); test_chunked_read(); - si.event = CreateEvent(NULL, 0, 0, NULL); + si.event = CreateEventW(NULL, 0, 0, NULL); si.port = 7532; thread = CreateThread(NULL, 0, server_thread, (LPVOID)&si, 0, NULL);

1 0

Hans Leidekker : winhttp: Fix a test failure on Windows 8 and conform to the more recent behavior.
by Alexandre Julliard 14 Oct '13

14 Oct '13

Module: wine Branch: master Commit: 8946346f51b9d788e39a53b6bf615d13bb3a6f51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8946346f51b9d788e39a53b6b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 14 15:57:59 2013 +0200 winhttp: Fix a test failure on Windows 8 and conform to the more recent behavior. --- dlls/winhttp/session.c | 6 +++++- dlls/winhttp/tests/winhttp.c | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 660eae5..97e763e 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1365,7 +1365,11 @@ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) FIXME("getaddrinfo not found at build time\n"); #endif } - if (!ret) set_last_error( ERROR_WINHTTP_AUTODETECTION_FAILED ); + if (!ret) + { + set_last_error( ERROR_WINHTTP_AUTODETECTION_FAILED ); + *url = NULL; + } return ret; } diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 3157a44..19bd429 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2759,7 +2759,7 @@ if (0) /* crashes on some win2k systems */ if (!ret) { ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error ); - ok( url == (WCHAR *)0xdeadbeef, "got %p\n", url ); + ok( !url || broken(url == (WCHAR *)0xdeadbeef), "got %p\n", url ); } else { @@ -2774,7 +2774,7 @@ if (0) /* crashes on some win2k systems */ if (!ret) { ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error ); - ok( url == (WCHAR *)0xdeadbeef, "got %p\n", url ); + ok( !url || broken(url == (WCHAR *)0xdeadbeef), "got %p\n", url ); } else {

1 0

Hans Leidekker : dnsapi/tests: Compile with -D__WINESRC__.
by Alexandre Julliard 14 Oct '13

14 Oct '13

Module: wine Branch: master Commit: 2b5888cc9652e6a4dcb7e48f87495549e9e60013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5888cc9652e6a4dcb7e48f8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 14 15:56:54 2013 +0200 dnsapi/tests: Compile with -D__WINESRC__. --- dlls/dnsapi/tests/Makefile.in | 1 - dlls/dnsapi/tests/record.c | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/dnsapi/tests/Makefile.in b/dlls/dnsapi/tests/Makefile.in index 18a4398..8702a9d 100644 --- a/dlls/dnsapi/tests/Makefile.in +++ b/dlls/dnsapi/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = dnsapi.dll IMPORTS = dnsapi -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ name.c \ diff --git a/dlls/dnsapi/tests/record.c b/dlls/dnsapi/tests/record.c index 4e97d85..8d7b497 100644 --- a/dlls/dnsapi/tests/record.c +++ b/dlls/dnsapi/tests/record.c @@ -28,12 +28,12 @@ #include "wine/test.h" -static char name1[] = "localhost"; -static char name2[] = "LOCALHOST"; +static WCHAR name1[] = {'l','o','c','a','l','h','o','s','t',0}; +static WCHAR name2[] = {'L','O','C','A','L','H','O','S','T',0}; -static DNS_RECORDA r1 = { NULL, name1, DNS_TYPE_A, sizeof(DNS_A_DATA), { 0 }, 1200, 0, { { 0xffffffff } } }; -static DNS_RECORDA r2 = { NULL, name1, DNS_TYPE_A, sizeof(DNS_A_DATA), { 0 }, 1200, 0, { { 0xffffffff } } }; -static DNS_RECORDA r3 = { NULL, name1, DNS_TYPE_A, sizeof(DNS_A_DATA), { 0 }, 1200, 0, { { 0xffffffff } } }; +static DNS_RECORDW r1 = { NULL, name1, DNS_TYPE_A, sizeof(DNS_A_DATA), { 0 }, 1200, 0, { { 0xffffffff } } }; +static DNS_RECORDW r2 = { NULL, name1, DNS_TYPE_A, sizeof(DNS_A_DATA), { 0 }, 1200, 0, { { 0xffffffff } } }; +static DNS_RECORDW r3 = { NULL, name1, DNS_TYPE_A, sizeof(DNS_A_DATA), { 0 }, 1200, 0, { { 0xffffffff } } }; static void test_DnsRecordCompare( void ) { @@ -43,10 +43,10 @@ static void test_DnsRecordCompare( void ) ok( DnsRecordCompare( &r1, &r2 ) == TRUE, "failed unexpectedly\n" ); r2.Flags.S.CharSet = DnsCharSetUnicode; - ok( DnsRecordCompare( &r1, &r2 ) == FALSE, "succeeded unexpectedly\n" ); + ok( DnsRecordCompare( &r1, &r2 ) == TRUE, "failed unexpectedly\n" ); r2.Flags.S.CharSet = DnsCharSetAnsi; - ok( DnsRecordCompare( &r1, &r2 ) == FALSE, "succeeded unexpectedly\n" ); + ok( DnsRecordCompare( &r1, &r2 ) == TRUE, "failed unexpectedly\n" ); r1.Flags.S.CharSet = DnsCharSetAnsi; ok( DnsRecordCompare( &r1, &r2 ) == TRUE, "failed unexpectedly\n" ); @@ -60,8 +60,8 @@ static void test_DnsRecordCompare( void ) static void test_DnsRecordSetCompare( void ) { - DNS_RECORD *diff1; - DNS_RECORD *diff2; + DNS_RECORDW *diff1; + DNS_RECORDW *diff2; DNS_RRSET rr1, rr2; r1.Flags.DW = 0x2019; @@ -120,7 +120,7 @@ static void test_DnsRecordSetCompare( void ) static void test_DnsRecordSetDetach( void ) { DNS_RRSET rr; - DNS_RECORDA *r, *s; + DNS_RECORDW *r, *s; DNS_RRSET_INIT( rr ); DNS_RRSET_ADD( rr, &r1 );

1 0

Hans Leidekker : dnsapi: Perform a wide character string comparison if the character set is unknown .
by Alexandre Julliard 14 Oct '13

14 Oct '13

Module: wine Branch: master Commit: 98c64a4be3350b977ae63ee72d54b5528940c9cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=98c64a4be3350b977ae63ee72… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 14 15:56:30 2013 +0200 dnsapi: Perform a wide character string comparison if the character set is unknown. --- dlls/dnsapi/record.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 3316f05..7882b22 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -131,12 +131,15 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) TRACE( "(%p,%p)\n", r1, r2 ); - if (r1->wType != r2->wType || - r1->wDataLength != r2->wDataLength || - r1->Flags.DW != r2->Flags.DW || - r1->dwReserved != r2->dwReserved) return FALSE; - - wide = r1->Flags.S.CharSet == DnsCharSetUnicode; + if (r1->wType != r2->wType || + r1->wDataLength != r2->wDataLength || + r1->Flags.S.Section != r2->Flags.S.Section || + r1->Flags.S.Delete != r2->Flags.S.Delete || + r1->Flags.S.Unused != r2->Flags.S.Unused || + r1->Flags.S.Reserved != r2->Flags.S.Reserved || + r1->dwReserved != r2->dwReserved) return FALSE; + + wide = (r1->Flags.S.CharSet == DnsCharSetUnicode || r1->Flags.S.CharSet == DnsCharSetUnknown); if (dns_strcmpX( r1->pName, r2->pName, wide )) return FALSE; switch (r1->wType)

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2013