December 2006 - Wine-commits

Kai Blin : ws2_32: Rewrite getsockopt to make it more readable.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 2a4df5654848b65e5a423e78616e7ec45ec196ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a4df5654848b65e5a423e786… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Dec 4 09:46:10 2006 +0100 ws2_32: Rewrite getsockopt to make it more readable. --- dlls/ws2_32/socket.c | 386 ++++++++++++++++++++++++++++++++------------- dlls/ws2_32/tests/sock.c | 35 ++++- 2 files changed, 308 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a4df5654848b65e5a423…

1 0

Detlef Riekenberg : spoolss: Forward EnumPortsW to winspool.drv.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: d9d6732170ae92dc566c8a77b26441a61589178e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d6732170ae92dc566c8a77b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Dec 3 14:07:30 2006 +0100 spoolss: Forward EnumPortsW to winspool.drv. --- dlls/spoolss/Makefile.in | 2 +- dlls/spoolss/spoolss.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/spoolss/Makefile.in b/dlls/spoolss/Makefile.in index e344f9c..5cca32e 100644 --- a/dlls/spoolss/Makefile.in +++ b/dlls/spoolss/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = spoolss.dll -IMPORTS = kernel32 +IMPORTS = winspool kernel32 C_SRCS = \ spoolss_main.c diff --git a/dlls/spoolss/spoolss.spec b/dlls/spoolss/spoolss.spec index c96c9c2..e0b8513 100644 --- a/dlls/spoolss/spoolss.spec +++ b/dlls/spoolss/spoolss.spec @@ -47,7 +47,7 @@ @ stub EnumJobsW @ stub EnumMonitorsW @ stub EnumPerMachineConnectionsW -@ stub EnumPortsW +@ stdcall EnumPortsW(wstr long ptr ptr ptr ptr) winspool.drv.EnumPortsW @ stub EnumPrintProcessorDatatypesW @ stub EnumPrintProcessorsW @ stub EnumPrinterDataExW

1 0

Alexandre Julliard : ntdll: Allow module with extensions in forward specifications.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 84fb1e1f3f9a2ef488fda47c1256b9ce5f1fd4ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=84fb1e1f3f9a2ef488fda47c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 4 13:37:32 2006 +0100 ntdll: Allow module with extensions in forward specifications. --- dlls/ntdll/loader.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 87767e5..99c90c4 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -328,13 +328,18 @@ static FARPROC find_forwarded_export( HM DWORD exp_size; WINE_MODREF *wm; WCHAR mod_name[32]; - const char *end = strchr(forward, '.'); + const char *end = strrchr(forward, '.'); FARPROC proc = NULL; if (!end) return NULL; - if ((end - forward) * sizeof(WCHAR) >= sizeof(mod_name) - sizeof(dllW)) return NULL; + if ((end - forward) * sizeof(WCHAR) >= sizeof(mod_name)) return NULL; ascii_to_unicode( mod_name, forward, end - forward ); - memcpy( mod_name + (end - forward), dllW, sizeof(dllW) ); + mod_name[end - forward] = 0; + if (!strchrW( mod_name, '.' )) + { + if ((end - forward) * sizeof(WCHAR) >= sizeof(mod_name) - sizeof(dllW)) return NULL; + memcpy( mod_name + (end - forward), dllW, sizeof(dllW) ); + } if (!(wm = find_basename_module( mod_name ))) {

1 0

Mike McCormack : msi: Double quotes are not valid in queries.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 08d1398d97a1bff3261861c120bbd8c530e68600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08d1398d97a1bff3261861c12… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Dec 4 16:52:18 2006 +0900 msi: Double quotes are not valid in queries. --- dlls/msi/tests/db.c | 2 +- dlls/msi/tokenize.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index fd11e40..83bc811 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -672,7 +672,7 @@ static void test_msibadqueries(void) ok(r == ERROR_BAD_QUERY_SYNTAX, "query failed\n"); r = try_query( hdb, "select * from c where b = \"x\""); - todo_wine ok(r == ERROR_BAD_QUERY_SYNTAX, "query failed\n"); + ok(r == ERROR_BAD_QUERY_SYNTAX, "query failed\n"); r = try_query( hdb, "select * from c where b = 'x'"); ok(r == ERROR_SUCCESS, "query failed\n"); diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c index 1404c34..5a5172b 100644 --- a/dlls/msi/tokenize.c +++ b/dlls/msi/tokenize.c @@ -255,7 +255,7 @@ int sqliteGetToken(const WCHAR *z, int * case ',': *tokenType = TK_COMMA; return 1; - case '`': case '\'': case '"': { + case '`': case '\'': { int delim = z[0]; for(i=1; z[i]; i++){ if( z[i]==delim ){

1 0

Markus Amsler : d3d: Pass the superior creating object down to the callback functions.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: a60d4b2d2f10043c311227e4f4960197927a51a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a60d4b2d2f10043c311227e4f… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Sun Dec 3 21:52:03 2006 +0100 d3d: Pass the superior creating object down to the callback functions. --- dlls/d3d8/d3d8_private.h | 16 ++++++++-------- dlls/d3d8/device.c | 2 +- dlls/d3d8/directx.c | 8 ++++---- dlls/d3d8/volume.c | 2 +- dlls/d3d9/d3d9_private.h | 12 ++++++------ dlls/d3d9/device.c | 4 ++-- dlls/d3d9/directx.c | 4 ++-- dlls/d3d9/volume.c | 4 ++-- dlls/ddraw/ddraw.c | 5 ++++- dlls/wined3d/device.c | 9 ++++++--- include/wine/wined3d_interface.h | 24 ++++++++++++++---------- 11 files changed, 50 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a60d4b2d2f10043c31122…

1 0

Mike McCormack : msi: Add tests for quoting in queries.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: ef1af6ada76f0a33b37a3a27d14fcb284bfb9e60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef1af6ada76f0a33b37a3a27d… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Dec 4 16:52:05 2006 +0900 msi: Add tests for quoting in queries. --- dlls/msi/tests/db.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 441d6f5..fd11e40 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -656,6 +656,39 @@ static void test_msibadqueries(void) r = try_query( hdb, "CREATE TABLE `c` (`b` CHAR NOT NULL PRIMARY KEY `b`)"); ok(r == ERROR_SUCCESS , "query 8 failed\n"); + r = try_query( hdb, "select * from c"); + ok(r == ERROR_SUCCESS , "query failed\n"); + + r = try_query( hdb, "select * from c where b = 'x"); + todo_wine ok(r == ERROR_BAD_QUERY_SYNTAX, "query failed\n"); + + r = try_query( hdb, "select * from 'c'"); + ok(r == ERROR_BAD_QUERY_SYNTAX, "query failed\n"); + + r = try_query( hdb, "select * from ''"); + ok(r == ERROR_BAD_QUERY_SYNTAX, "query failed\n"); + + r = try_query( hdb, "select * from c where b = x"); + ok(r == ERROR_BAD_QUERY_SYNTAX, "query failed\n"); + + r = try_query( hdb, "select * from c where b = \"x\""); + todo_wine ok(r == ERROR_BAD_QUERY_SYNTAX, "query failed\n"); + + r = try_query( hdb, "select * from c where b = 'x'"); + ok(r == ERROR_SUCCESS, "query failed\n"); + + r = try_query( hdb, "select * from c where b = '\"x'"); + ok(r == ERROR_SUCCESS, "query failed\n"); + + if (0) /* FIXME: this query causes trouble with other tests */ + { + r = try_query( hdb, "select * from c where b = '\\\'x'"); + ok(r == ERROR_BAD_QUERY_SYNTAX, "query failed\n"); + } + + r = try_query( hdb, "select * from 'c'"); + ok(r == ERROR_BAD_QUERY_SYNTAX, "query failed\n"); + r = MsiCloseHandle( hdb ); ok(r == ERROR_SUCCESS , "Failed to close database transact\n");

1 0

Konstantin Kondratyuk : fonts: Add Ukrainian and Byelorussian symbols in Small fonts.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 50168577fa30f27bf840a08871f23e0b5a39f665 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50168577fa30f27bf840a0887… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Fri Dec 1 15:05:34 2006 +0300 fonts: Add Ukrainian and Byelorussian symbols in Small fonts. --- fonts/small_fonts.sfd | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 deletions(-) diff --git a/fonts/small_fonts.sfd b/fonts/small_fonts.sfd index 733ea5d..1f6ee40 100644 --- a/fonts/small_fonts.sfd +++ b/fonts/small_fonts.sfd @@ -56,7 +56,7 @@ FitToEm: 1 WinInfo: 704 32 21 OnlyBitmaps: 1 TeXData: 1 0 0 189792 94896 63264 0 1048576 63264 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 65536 412 +BeginChars: 65536 416 StartChar: A Encoding: 65 65 0 Width: 7 @@ -2520,11 +2520,35 @@ EndChar StartChar: afii10056 Encoding: 1031 1031 411 Width: 11 +Flags: W +TeX: 0 0 0 0 +EndChar +StartChar: afii10050 +Encoding: 1168 1168 412 +Width: 11 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10098 +Encoding: 1169 1169 413 +Width: 11 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10110 +Encoding: 1118 1118 414 +Width: 11 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10062 +Encoding: 1038 1038 415 +Width: 11 Flags: HW TeX: 0 0 0 0 EndChar EndChars -BitmapFont: 11 412 9 2 1 +BitmapFont: 11 416 9 2 1 BDFChar: 0 65 7 1 6 0 6 0JH$gG_C_M BDFChar: 1 33 2 1 1 0 6 @@ -3349,5 +3373,13 @@ BDFChar: 410 1030 2 1 1 0 6 J:N0#J:N.M BDFChar: 411 1031 3 0 2 0 8 TE"sW5X7S"5QCca +BDFChar: 412 1168 6 1 5 0 7 +#l&q#J:N0# +BDFChar: 413 1169 4 1 3 0 5 ++Q.d#J:IV" +BDFChar: 414 1118 4 1 3 -2 7 +TKiLMTV.rc+M[sW +BDFChar: 415 1038 6 1 5 0 8 +:`tRMLj02]Du]k< EndBitmapFont EndSplineFont

1 0

Konstantin Kondratyuk : fonts: Add Ukrainian and Byelorussian symbols in MS Sans Serif font.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 281e0f1c861bf64488adcfad48929d27b93aa26f URL: http://source.winehq.org/git/wine.git/?a=commit;h=281e0f1c861bf64488adcfad4… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Fri Dec 1 15:05:23 2006 +0300 fonts: Add Ukrainian and Byelorussian symbols in MS Sans Serif font. --- fonts/ms_sans_serif.sfd | 60 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 54 insertions(+), 6 deletions(-) diff --git a/fonts/ms_sans_serif.sfd b/fonts/ms_sans_serif.sfd index 8e374c0..b529ff2 100644 --- a/fonts/ms_sans_serif.sfd +++ b/fonts/ms_sans_serif.sfd @@ -43,12 +43,12 @@ LangName: 1033 "" "" "" "FontForge 1.0 : Encoding: UnicodeBmp UnicodeInterp: none NameList: Adobe Glyph List -DisplaySize: 20 +DisplaySize: 13 AntiAlias: 0 FitToEm: 1 -WinInfo: 754 29 22 +WinInfo: 870 29 21 OnlyBitmaps: 1 -BeginChars: 65536 360 +BeginChars: 65536 364 StartChar: space Encoding: 32 32 0 Width: 2 @@ -1978,11 +1978,35 @@ EndChar StartChar: afii10056 Encoding: 1031 1031 359 Width: 13 +Flags: W +TeX: 0 0 0 0 +EndChar +StartChar: afii10062 +Encoding: 1038 1038 360 +Width: 13 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10110 +Encoding: 1118 1118 361 +Width: 13 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10050 +Encoding: 1168 1168 362 +Width: 13 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10098 +Encoding: 1169 1169 363 +Width: 13 Flags: HW TeX: 0 0 0 0 EndChar EndChars -BitmapFont: 13 360 11 2 1 +BitmapFont: 13 364 11 2 1 BDFChar: 0 32 3 0 0 0 0 z BDFChar: 1 33 3 1 1 0 8 @@ -2701,8 +2725,16 @@ BDFChar: 358 1030 3 1 1 0 8 J:N0#J:N0#J,fQL BDFChar: 359 1031 3 0 2 0 10 TE%5B5X7S"5X7R7 +BDFChar: 360 1038 8 0 6 0 10 +,T),b6mO#p#RE*a +BDFChar: 361 1118 5 1 4 -2 9 +OC/%gOH>QcODkch +BDFChar: 362 1168 6 1 5 0 9 +#l&q#J:N0#J:IV" +BDFChar: 363 1169 5 1 4 0 6 +&Fb4#J:N.M EndBitmapFont -BitmapFont: 16 360 13 3 1 FontForge +BitmapFont: 16 364 13 3 1 FontForge BDFChar: 0 32 3 0 0 0 0 z BDFChar: 1 33 3 1 1 0 9 @@ -3421,8 +3453,16 @@ BDFChar: 358 1030 3 1 1 0 9 J:N0#J:N0#J:IV" BDFChar: 359 1031 3 0 2 0 11 TE%5B5X7S"5X7S" +BDFChar: 360 1038 9 1 8 0 12 ++rgT6JO2[K,T$du?iU0, +BDFChar: 361 1118 8 0 6 -3 10 +6oY/HJq?BY-n#W<+M[sW +BDFChar: 362 1168 7 1 6 0 11 +"9eXQJ:N0#J:N0# +BDFChar: 363 1169 6 1 5 0 7 +#l&q#J:N0# EndBitmapFont -BitmapFont: 20 360 16 4 1 FontForge +BitmapFont: 20 364 16 4 1 FontForge BDFChar: 0 32 4 0 0 0 0 z BDFChar: 1 33 4 2 2 0 11 @@ -4041,5 +4081,13 @@ BDFChar: 358 1030 5 2 2 0 11 J:N0#J:N0#J:N0# BDFChar: 359 1031 5 1 3 0 13 TE%5B5X7S"5X7S"5X5;L +BDFChar: 360 1038 10 1 9 0 15 ++oiS_zJ:N0#5la1N+oiee)up*A#QP,1&--)< +BDFChar: 361 1118 7 0 6 -4 12 +6oY/HJqASB6msGp&.fs,^]4?7 +BDFChar: 362 1168 9 2 8 0 13 +!Wr(a)OJ:N0#J:N0#J:IV" +BDFChar: 363 1169 7 1 6 0 9 +"T3e#J:N0#J:IV" EndBitmapFont EndSplineFont

1 0

Konstantin Kondratyuk : fonts: Add Ukrainian and Byelorussian symbols in Courier font.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 40fb1687c93c207fd09a972c6d1a5d9b86c623f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40fb1687c93c207fd09a972c6… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Fri Dec 1 15:05:13 2006 +0300 fonts: Add Ukrainian and Byelorussian symbols in Courier font. --- fonts/courier.sfd | 38 +++++++++++++++++++++++++++++++++++--- 1 files changed, 35 insertions(+), 3 deletions(-) diff --git a/fonts/courier.sfd b/fonts/courier.sfd index e419eea..7ca7c79 100644 --- a/fonts/courier.sfd +++ b/fonts/courier.sfd @@ -43,10 +43,10 @@ NameList: Adobe Glyph List DisplaySize: 13 AntiAlias: 0 FitToEm: 1 -WinInfo: 814 22 21 +WinInfo: 946 22 21 OnlyBitmaps: 1 TeXData: 1 0 0 346030 173015 115343 0 1048576 115343 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 65536 358 +BeginChars: 65536 362 StartChar: space Encoding: 32 32 0 Width: 8 @@ -1864,11 +1864,35 @@ EndChar StartChar: afii10104 Encoding: 1111 1111 357 Width: 8 +Flags: W +TeX: 0 0 0 0 +EndChar +StartChar: afii10062 +Encoding: 1038 1038 358 +Width: 8 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10110 +Encoding: 1118 1118 359 +Width: 8 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10050 +Encoding: 1168 1168 360 +Width: 8 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10098 +Encoding: 1169 1169 361 +Width: 8 Flags: HW TeX: 0 0 0 0 EndChar EndChars -BitmapFont: 13 358 11 2 1 +BitmapFont: 13 362 11 2 1 BDFChar: 0 32 8 0 0 0 0 z BDFChar: 1 33 8 4 4 0 8 @@ -2585,5 +2609,13 @@ BDFChar: 356 1110 8 2 6 0 8 +92E"+<VdLp](9o BDFChar: 357 1111 8 2 6 0 8 O8o:=+<VdLp](9o +BDFChar: 358 1038 8 1 7 0 10 +6oY276psF*":-[] +BDFChar: 359 1118 8 1 7 -2 9 +6oY/HmR0H24;9%X +BDFChar: 360 1168 8 2 7 0 10 +"9eWf5X7S"5X=6- +BDFChar: 361 1169 8 1 5 0 6 +#l&q#J:N.M EndBitmapFont EndSplineFont

1 0

Konstantin Kondratyuk : fonts: Add Ukrainian and Byelorussian symbols in System font.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 0aa75cfc59939e7e23d3add6015f9edb4a46c606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aa75cfc59939e7e23d3add60… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Fri Dec 1 15:05:42 2006 +0300 fonts: Add Ukrainian and Byelorussian symbols in System font. --- fonts/system.sfd | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 deletions(-) diff --git a/fonts/system.sfd b/fonts/system.sfd index 2597bb4..c36fb95 100644 --- a/fonts/system.sfd +++ b/fonts/system.sfd @@ -45,7 +45,7 @@ AntiAlias: 0 FitToEm: 1 WinInfo: 960 20 13 OnlyBitmaps: 1 -BeginChars: 65536 471 +BeginChars: 65536 475 StartChar: space Encoding: 32 32 0 Width: 4 @@ -2591,11 +2591,35 @@ EndChar StartChar: afii10053 Encoding: 1028 1028 470 Width: 16 +Flags: W +TeX: 0 0 0 0 +EndChar +StartChar: afii10110 +Encoding: 1118 1118 471 +Width: 16 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10062 +Encoding: 1038 1038 472 +Width: 16 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10050 +Encoding: 1168 1168 473 +Width: 16 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10098 +Encoding: 1169 1169 474 +Width: 16 Flags: HW TeX: 0 0 0 0 EndChar EndChars -BitmapFont: 16 471 13 3 1 +BitmapFont: 16 475 13 3 1 BDFChar: 0 32 4 14 14 0 0 z BDFChar: 1 33 4 1 2 0 9 @@ -3538,5 +3562,13 @@ BDFChar: 469 1108 7 0 5 0 6 Gg*tm^s%$' BDFChar: 470 1028 9 1 8 0 9 4D)LHpqX\_Aip%n +BDFChar: 471 1118 8 0 7 -3 10 +,T$L]_o$(u4?OGt0OOk\ +BDFChar: 472 1038 9 1 7 0 12 +,T$O$`o_)R4?OJ5Du]k< +BDFChar: 473 1168 8 1 7 0 11 +!WrA:^qdb$^qdb$ +BDFChar: 474 1169 6 1 5 0 7 +#l)3N^qdb$ EndBitmapFont EndSplineFont

1 0