December 2007 - Wine-Commits

Luis C. Busquets Pérez : gphoto2: Add Spanish resource.
by Alexandre Julliard Dec. 10, 2007

Dec. 10, 2007

Module: wine Branch: master Commit: 4d30038c73666e551d13655a65c002c827fb8e26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d30038c73666e551d13655a6… Author: Luis C. Busquets Pérez <luis.busquets(a)ilidium.com> Date: Fri Dec 7 18:59:26 2007 +0100 gphoto2: Add Spanish resource. --- dlls/gphoto2.ds/gphoto2_Es.rc | 55 +++++++++++++++++++++++++++++++++++++++++ dlls/gphoto2.ds/rsrc.rc | 1 + 2 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_Es.rc b/dlls/gphoto2.ds/gphoto2_Es.rc new file mode 100644 index 0000000..2a29e9a --- /dev/null +++ b/dlls/gphoto2.ds/gphoto2_Es.rc @@ -0,0 +1,55 @@ +/* + * Spanish resources for Twain + * + * Copyright 2007 Luis Carlos Busquets Pérez + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT + +IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 +STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU +CAPTION "Ficheros de la cámara" +MENU 20545 +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | +WS_TABSTOP,7,7,358,229 + DEFPUSHBUTTON "Importar la selección",IDC_IMPORT,152,252,72,14 + PUSHBUTTON "Previsualización",IDC_FETCH,7,252,64,14 + PUSHBUTTON "Importar todo",IDC_IMPORTALL,80,252,64,14 + CONTROL "Saltarse este diálogo",IDC_SKIP,"Botón", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 + PUSHBUTTON "Salir",IDC_EXIT,315,252,50,14 +END + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "Transfiriendo" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Transfiriendo.... Por favor espere",IDC_STATIC,5,19,176,8, SS_CENTER +END + +IDD_CONNECTING DIALOG DISCARDABLE 0, 0, 280, 116 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER +CAPTION "Conectando a la cámara" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 + LTEXT "Conectando a la cámara... Por favor espere",IDC_STATIC,128,58, + 116,8 +END diff --git a/dlls/gphoto2.ds/rsrc.rc b/dlls/gphoto2.ds/rsrc.rc index 10cc63f..4b44d73 100644 --- a/dlls/gphoto2.ds/rsrc.rc +++ b/dlls/gphoto2.ds/rsrc.rc @@ -28,6 +28,7 @@ #include "gphoto2_De.rc" #include "gphoto2_En.rc" +#include "gphoto2_Es.rc" #include "gphoto2_Fr.rc" #include "gphoto2_Ko.rc" #include "gphoto2_Nl.rc"

1 0

Aric Stewart : fonts: Build the jvgasys.fon from the 18 pixel strike.
by Alexandre Julliard Dec. 10, 2007

Dec. 10, 2007

Module: wine Branch: master Commit: 172a88de10282de2abd9982f76beee82c0a67ba0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=172a88de10282de2abd9982f7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Dec 10 16:32:00 2007 +0900 fonts: Build the jvgasys.fon from the 18 pixel strike. --- fonts/.gitignore | 2 +- fonts/Makefile.in | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fonts/.gitignore b/fonts/.gitignore index c02deec..6eb7207 100644 --- a/fonts/.gitignore +++ b/fonts/.gitignore @@ -84,7 +84,7 @@ /system-1256-96-16.fnt /system-1257-96-16.fnt /system-874-96-16.fnt -/system-932-96-16.fnt +/system-932-96-18.fnt /system-936-96-16.fnt /system-949-96-16.fnt /system-950-96-16.fnt diff --git a/fonts/Makefile.in b/fonts/Makefile.in index 2b49c69..8d7b7bc 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -216,8 +216,8 @@ system-1257-96-16.fnt: system.ttf $(SFNT2FNT) system-874-96-16.fnt: system.ttf $(SFNT2FNT) $(LDPATH) $(SFNT2FNT) system.ttf 16 874 96 128 7 -system-932-96-16.fnt: system.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) system.ttf 16 932 96 128 7 +system-932-96-18.fnt: system.ttf $(SFNT2FNT) + $(LDPATH) $(SFNT2FNT) system.ttf 18 932 96 128 7 system-936-96-16.fnt: system.ttf $(SFNT2FNT) $(LDPATH) $(SFNT2FNT) system.ttf 16 936 96 128 7 @@ -333,8 +333,8 @@ vgas1257.fon: system-1257-96-16.fnt $(FNT2FON) vgas874.fon: system-874-96-16.fnt $(FNT2FON) $(FNT2FON) system-874-96-16.fnt $@ -jvgasys.fon: system-932-96-16.fnt $(FNT2FON) - $(FNT2FON) system-932-96-16.fnt $@ +jvgasys.fon: system-932-96-18.fnt $(FNT2FON) + $(FNT2FON) system-932-96-18.fnt $@ svgasys.fon: system-936-96-16.fnt system-1252-96-16.fnt $(FNT2FON) $(FNT2FON) system-936-96-16.fnt system-1252-96-16.fnt $@

1 0

Aric Stewart : sfnt2fnt: Use code from gdi32/ freetype to do a better job finding the TTAG_EBLC to deal with older version of freetype without having to fall back on unreliable hacks .
by Alexandre Julliard Dec. 10, 2007

Dec. 10, 2007

Module: wine Branch: master Commit: 8be27f68c77c37989f043c54b9360e9b75548747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8be27f68c77c37989f043c54b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Dec 10 16:24:10 2007 +0900 sfnt2fnt: Use code from gdi32/freetype to do a better job finding the TTAG_EBLC to deal with older version of freetype without having to fall back on unreliable hacks. --- tools/sfnt2fnt.c | 95 +++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 70 insertions(+), 25 deletions(-) diff --git a/tools/sfnt2fnt.c b/tools/sfnt2fnt.c index 955f61a..8868c66 100644 --- a/tools/sfnt2fnt.c +++ b/tools/sfnt2fnt.c @@ -36,6 +36,9 @@ #include FT_SFNT_NAMES_H #include FT_TRUETYPE_TABLES_H #include FT_TRUETYPE_TAGS_H +#ifdef HAVE_FREETYPE_INTERNAL_SFNT_H +#include <freetype/internal/sfnt.h> +#endif #include "wine/unicode.h" #include "wine/wingdi16.h" @@ -90,6 +93,14 @@ typedef struct { CHAR flags; } bitmapSizeTable_t; +typedef struct +{ + FT_Int major; + FT_Int minor; + FT_Int patch; +} FT_Version_t; +static FT_Version_t FT_Version; + #define GET_BE_WORD(ptr) MAKEWORD( ((BYTE *)(ptr))[1], ((BYTE *)(ptr))[0] ) #define GET_BE_DWORD(ptr) ((DWORD)MAKELONG( GET_BE_WORD(&((WORD *)(ptr))[1]), \ GET_BE_WORD(&((WORD *)(ptr))[0]) )) @@ -194,9 +205,38 @@ static int get_char(const union cptable *cptable, int enc, int index) return cptable->sbcs.cp2uni[index]; } +/* from gdi32/freetype.c */ +static FT_Error load_sfnt_table(FT_Face ft_face, FT_ULong table, FT_Long offset, FT_Byte *buf, FT_ULong *len) +{ + + FT_Error err; + + /* If the FT_Load_Sfnt_Table function is there we'll use it */ +#ifdef HAVE_FT_LOAD_SFNT_TABLE + err = FT_Load_Sfnt_Table(ft_face, table, offset, buf, len); +#elif defined(HAVE_FREETYPE_INTERNAL_SFNT_H) + TT_Face tt_face = (TT_Face) ft_face; + SFNT_Interface *sfnt; + if (FT_Version.major==2 && FT_Version.minor==0) + { + /* 2.0.x */ + sfnt = *(SFNT_Interface**)((char*)tt_face + 528); + } + else + { + /* A field was added in the middle of the structure in 2.1.x */ + sfnt = *(SFNT_Interface**)((char*)tt_face + 532); + } + err = sfnt->load_any(tt_face, table, offset, buf, len); +#else + err = FT_Err_Unimplemented_Feature; +#endif + return err; +} + static void fill_fontinfo(FT_Face face, int enc, FILE *fp, int dpi, unsigned char def_char, int avg_width) { - int ascent = 0, il, ppem, descent = 0, width_bytes = 0, space_size, max_width = 0; + int ascent = 0, il, el, ppem, descent = 0, width_bytes = 0, space_size, max_width = 0; FNT_HEADER hdr; FONTINFO16 fi; BYTE left_byte, right_byte, byte; @@ -208,13 +248,10 @@ static void fill_fontinfo(FT_Face face, int enc, FILE *fp, int dpi, unsigned cha const union cptable *cptable; FT_SfntName sfntname; TT_OS2 *os2; - -#ifdef HAVE_FT_LOAD_SFNT_TABLE FT_ULong needed; eblcHeader_t *eblc; bitmapSizeTable_t *size_table; int num_sizes; -#endif cptable = wine_cp_get_table(enc); if(!cptable) @@ -229,30 +266,30 @@ static void fill_fontinfo(FT_Face face, int enc, FILE *fp, int dpi, unsigned cha ppem = face->size->metrics.y_ppem; -#ifdef HAVE_FT_LOAD_SFNT_TABLE needed = 0; - if(FT_Load_Sfnt_Table(face, TTAG_EBLC, 0, NULL, &needed)) - error("Can't find EBLC table\n"); - - eblc = malloc(needed); - FT_Load_Sfnt_Table(face, TTAG_EBLC, 0, (FT_Byte *)eblc, &needed); + if (load_sfnt_table(face, TTAG_EBLC, 0, NULL, &needed)) + fprintf(stderr,"Can't find EBLC table\n"); + else + { + eblc = malloc(needed); + load_sfnt_table(face, TTAG_EBLC, 0, (FT_Byte *)eblc, &needed); - num_sizes = GET_BE_DWORD(&eblc->numSizes); + num_sizes = GET_BE_DWORD(&eblc->numSizes); - size_table = (bitmapSizeTable_t *)(eblc + 1); - for(i = 0; i < num_sizes; i++) - { - if(size_table->hori.ascender - size_table->hori.descender == ppem) + size_table = (bitmapSizeTable_t *)(eblc + 1); + for(i = 0; i < num_sizes; i++) { - ascent = size_table->hori.ascender; - descent = -size_table->hori.descender; - break; + if(size_table->hori.ascender - size_table->hori.descender == ppem) + { + ascent = size_table->hori.ascender; + descent = -size_table->hori.descender; + break; + } + size_table++; } - size_table++; - } - free(eblc); -#endif + free(eblc); + } /* Versions of fontforge prior to early 2006 have incorrect ascender values in the eblc table, so we won't find the @@ -272,9 +309,14 @@ static void fill_fontinfo(FT_Face face, int enc, FILE *fp, int dpi, unsigned cha error("Can't find M\n"); il = ascent - (face->glyph->metrics.height >> 6); - /* Hack: Courier has no internal leading, nor do any Chinese fonts */ - if(!strcmp(face->family_name, "Courier") || enc == 936 || enc == 950) + /* Hack: Courier has no internal leading, nor do any Chinese or Japanese fonts */ + if(!strcmp(face->family_name, "Courier") || enc == 936 || enc == 950 || enc == 932) il = 0; + /* Japanese fonts have an external leading */ + if(enc == 932) + el = 2; + else + el = 0; first_char = FT_Get_First_Char(face, &gi); if(first_char == 0xd) /* fontforge's first glyph is 0xd, we'll catch this and skip it */ @@ -331,7 +373,7 @@ static void fill_fontinfo(FT_Face face, int enc, FILE *fp, int dpi, unsigned cha fi.dfHorizRes = dpi; fi.dfAscent = ascent; fi.dfInternalLeading = il; - fi.dfExternalLeading = 0; + fi.dfExternalLeading = el; fi.dfItalic = (face->style_flags & FT_STYLE_FLAG_ITALIC) ? 1 : 0; fi.dfUnderline = 0; fi.dfStrikeOut = 0; @@ -462,6 +504,9 @@ int main(int argc, char **argv) if(FT_Init_FreeType(&lib)) error("ft init failure\n"); + FT_Version.major=FT_Version.minor=FT_Version.patch=-1; + FT_Library_Version(lib,&FT_Version.major,&FT_Version.minor,&FT_Version.patch); + if(FT_New_Face(lib, argv[1], 0, &face)) { fprintf(stderr, "Can't open face\n"); usage(argv);

1 0

Francois Gouget : comctl32/tests: InitCommonControlsEx() is missing on Windows 95 so call InitCommonControls() instead.
by Alexandre Julliard Dec. 10, 2007

Dec. 10, 2007

Module: wine Branch: master Commit: 7a5497b5c06600dc3b58788d0d6132e9f7cb7b87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a5497b5c06600dc3b58788d0… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 10 01:27:50 2007 +0100 comctl32/tests: InitCommonControlsEx() is missing on Windows 95 so call InitCommonControls() instead. --- dlls/comctl32/tests/comboex.c | 5 +---- dlls/comctl32/tests/datetime.c | 6 +----- dlls/comctl32/tests/header.c | 5 +---- dlls/comctl32/tests/listview.c | 6 +----- dlls/comctl32/tests/monthcal.c | 6 ++---- dlls/comctl32/tests/progress.c | 5 +---- dlls/comctl32/tests/rebar.c | 5 +---- dlls/comctl32/tests/treeview.c | 5 +---- 8 files changed, 9 insertions(+), 34 deletions(-) diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index 8f436ca..f3f46b3 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -189,11 +189,8 @@ static LRESULT CALLBACK ComboExTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, L static void init(void) { WNDCLASSA wc; - INITCOMMONCONTROLSEX icex; - icex.dwSize = sizeof(INITCOMMONCONTROLSEX); - icex.dwICC = ICC_USEREX_CLASSES; - InitCommonControlsEx(&icex); + InitCommonControls(); wc.style = CS_HREDRAW | CS_VREDRAW; wc.cbClsExtra = 0; diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 1a8afd1..956f16e 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -560,11 +560,7 @@ static void test_datetime_control(void) START_TEST(datetime) { - INITCOMMONCONTROLSEX icex; - - icex.dwSize = sizeof(icex); - icex.dwICC = ICC_DATE_CLASSES; - InitCommonControlsEx(&icex); + InitCommonControls(); init_msg_sequences(sequences, NUM_MSG_SEQUENCES); test_datetime_control(); diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index e80944f..fa75d49 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1482,11 +1482,8 @@ static LRESULT CALLBACK HeaderTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LP static void init(void) { WNDCLASSA wc; - INITCOMMONCONTROLSEX icex; - icex.dwSize = sizeof(INITCOMMONCONTROLSEX); - icex.dwICC = ICC_USEREX_CLASSES; - InitCommonControlsEx(&icex); + InitCommonControls(); wc.style = CS_HREDRAW | CS_VREDRAW; wc.cbClsExtra = 0; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 9138442..30a81a8 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1040,11 +1040,7 @@ static void test_item_position(void) START_TEST(listview) { - INITCOMMONCONTROLSEX icc; - - icc.dwICC = 0; - icc.dwSize = sizeof icc; - InitCommonControlsEx(&icc); + InitCommonControls(); init_msg_sequences(sequences, NUM_MSG_SEQUENCES); diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index a495919..7fe2bd7 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -313,10 +313,9 @@ static void test_monthcal(void) { HWND hwnd; SYSTEMTIME st[2], st1[2]; - INITCOMMONCONTROLSEX ic = {sizeof(INITCOMMONCONTROLSEX), ICC_DATE_CLASSES}; int res, month_range; - InitCommonControlsEx(&ic); + InitCommonControls(); hwnd = CreateWindowA(MONTHCAL_CLASSA, "MonthCal", WS_POPUP | WS_VISIBLE, CW_USEDEFAULT, 0, 300, 300, 0, 0, NULL, NULL); ok(hwnd != NULL, "Failed to create MonthCal\n"); @@ -478,9 +477,8 @@ static HWND create_monthcal_control(DWORD style, HWND parent_window) { struct subclass_info *info; HWND hwnd; - static const INITCOMMONCONTROLSEX ic = {sizeof(INITCOMMONCONTROLSEX), ICC_DATE_CLASSES}; - InitCommonControlsEx(&ic); + InitCommonControls(); info = HeapAlloc(GetProcessHeap(), 0, sizeof(struct subclass_info)); if (!info) diff --git a/dlls/comctl32/tests/progress.c b/dlls/comctl32/tests/progress.c index 42c1e8d..2716f33 100644 --- a/dlls/comctl32/tests/progress.c +++ b/dlls/comctl32/tests/progress.c @@ -91,12 +91,9 @@ static void update_window(HWND hWnd) static void init(void) { WNDCLASSA wc; - INITCOMMONCONTROLSEX icex; RECT rect; - icex.dwSize = sizeof(INITCOMMONCONTROLSEX); - icex.dwICC = ICC_PROGRESS_CLASS; - InitCommonControlsEx(&icex); + InitCommonControls(); wc.style = CS_HREDRAW | CS_VREDRAW; wc.cbClsExtra = 0; diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 79da16e..6bebeb7 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -786,14 +786,11 @@ static void bandinfo_test(void) START_TEST(rebar) { - INITCOMMONCONTROLSEX icc; WNDCLASSA wc; MSG msg; RECT rc; - icc.dwSize = sizeof(icc); - icc.dwICC = ICC_COOL_CLASSES; - InitCommonControlsEx(&icc); + InitCommonControls(); wc.style = CS_HREDRAW | CS_VREDRAW; wc.cbClsExtra = 0; diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 2981db7..93010d3 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -651,11 +651,8 @@ START_TEST(treeview) { WNDCLASSA wc; MSG msg; - INITCOMMONCONTROLSEX icex; - icex.dwSize = sizeof(INITCOMMONCONTROLSEX); - icex.dwICC = ICC_TREEVIEW_CLASSES; - InitCommonControlsEx(&icex); + InitCommonControls(); init_msg_sequences(MsgSequences, NUM_MSG_SEQUENCES); wc.style = CS_HREDRAW | CS_VREDRAW;

1 0

Aric Stewart : system.sfd: Modify a few 18 pixel glyphs to generate metrics correctly.
by Alexandre Julliard Dec. 10, 2007

Dec. 10, 2007

Module: wine Branch: master Commit: 6a57a55480b46b0a94cafa0fdd889c08f53b1c83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a57a55480b46b0a94cafa0fd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Dec 10 16:17:05 2007 +0900 system.sfd: Modify a few 18 pixel glyphs to generate metrics correctly. --- fonts/system.sfd | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/fonts/system.sfd b/fonts/system.sfd index 64ca415..0d14f24 100644 --- a/fonts/system.sfd +++ b/fonts/system.sfd @@ -3571,7 +3571,7 @@ BDFChar: 473 1168 8 1 7 0 11 BDFChar: 474 1169 6 1 5 0 7 #l)3N^qdb$ EndBitmapFont -BitmapFont: 18 355 14 4 1 +BitmapFont: 18 475 16 2 1 BDFChar: 0 32 6 0 0 0 0 z BDFChar: 1 33 7 3 3 0 13 @@ -3698,7 +3698,7 @@ BDFChar: 61 93 4 1 2 -2 12 ^d(.M5X7S"5X7S"5X<*b BDFChar: 62 94 5 0 4 7 12 +Adjoz -BDFChar: 63 95 8 0 7 -3 -3 +BDFChar: 63 95 8 0 7 -2 -2 rr<$! BDFChar: 64 96 4 1 3 11 13 J3Y4W @@ -3778,9 +3778,9 @@ BDFChar: 101 160 8 1 6 1 14 r;?Kjr;?Kjr;?Kjr;6Np BDFChar: 102 161 8 1 4 0 3 @$$IX -BDFChar: 103 162 7 1 5 8 13 +BDFChar: 103 162 7 1 5 10 15 pjdmFJ:IV" -BDFChar: 104 163 7 1 5 -1 4 +BDFChar: 104 163 7 1 5 -2 3 #RC\A#l"B" BDFChar: 105 164 6 2 3 -1 0 J3X)7 @@ -3938,9 +3938,9 @@ BDFChar: 209 220 9 1 7 0 12 rdo`RJcYuT"9\uA+92BA BDFChar: 210 221 9 1 7 0 11 ^b>`i!WiE+":,QH -BDFChar: 211 222 6 0 4 10 13 +BDFChar: 211 222 6 0 4 12 15 OH<"( -BDFChar: 212 223 5 0 3 10 13 +BDFChar: 212 223 5 0 3 12 15 @$$IX BDFChar: 213 224 8 1 6 0 10 E%i+/Gg$SDbfkG7 @@ -3972,6 +3972,8 @@ BDFChar: 226 237 4 0 3 0 10 E+$H]?smAM?sm(a)B BDFChar: 227 238 4 0 3 0 9 @.4/(?smAM?sis7 +BDFChar: 339 8240 16 0 14 0 9 +E+%>6fmn,D"oo&3)k8h[B(j-4 BDFChar: 348 138 8 1 6 -1 13 r;?Kjr;?Kjr;?Kjr;?Hm BDFChar: 349 140 8 1 6 -1 13

1 0

Francois Gouget : comctl32/tests: Avoid SHDeleteKeyA() because it does not exist on Windows 95.
by Alexandre Julliard Dec. 10, 2007

Dec. 10, 2007

Module: wine Branch: master Commit: b7ae831f00d587de802224d8ef839376485bba73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7ae831f00d587de802224d8e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 10 01:28:08 2007 +0100 comctl32/tests: Avoid SHDeleteKeyA() because it does not exist on Windows 95. --- dlls/comctl32/tests/Makefile.in | 2 +- dlls/comctl32/tests/mru.c | 69 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index 17583cf..45bd219 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = comctl32.dll -IMPORTS = comctl32 ole32 shlwapi user32 gdi32 advapi32 kernel32 +IMPORTS = comctl32 ole32 user32 gdi32 advapi32 kernel32 CTESTS = \ comboex.c \ diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index cf42e9e..d5e1d8a 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -74,6 +74,73 @@ static INT (WINAPI *pFindMRUStringA)(HANDLE,LPCSTR,LPINT); */ +/* Based on RegDeleteTreeW from dlls/advapi32/registry.c */ +static LSTATUS mru_RegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey) +{ + LONG ret; + DWORD dwMaxSubkeyLen, dwMaxValueLen; + DWORD dwMaxLen, dwSize; + CHAR szNameBuf[MAX_PATH], *lpszName = szNameBuf; + HKEY hSubKey = hKey; + + if(lpszSubKey) + { + ret = RegOpenKeyExA(hKey, lpszSubKey, 0, KEY_READ, &hSubKey); + if (ret) return ret; + } + + /* Get highest length for keys, values */ + ret = RegQueryInfoKeyA(hSubKey, NULL, NULL, NULL, NULL, + &dwMaxSubkeyLen, NULL, NULL, &dwMaxValueLen, NULL, NULL, NULL); + if (ret) goto cleanup; + + dwMaxSubkeyLen++; + dwMaxValueLen++; + dwMaxLen = max(dwMaxSubkeyLen, dwMaxValueLen); + if (dwMaxLen > sizeof(szNameBuf)/sizeof(CHAR)) + { + /* Name too big: alloc a buffer for it */ + if (!(lpszName = HeapAlloc( GetProcessHeap(), 0, dwMaxLen*sizeof(CHAR)))) + { + ret = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + } + + + /* Recursively delete all the subkeys */ + while (TRUE) + { + dwSize = dwMaxLen; + if (RegEnumKeyExA(hSubKey, 0, lpszName, &dwSize, NULL, + NULL, NULL, NULL)) break; + + ret = mru_RegDeleteTreeA(hSubKey, lpszName); + if (ret) goto cleanup; + } + + if (lpszSubKey) + ret = RegDeleteKeyA(hKey, lpszSubKey); + else + while (TRUE) + { + dwSize = dwMaxLen; + if (RegEnumValueA(hKey, 0, lpszName, &dwSize, + NULL, NULL, NULL, NULL)) break; + + ret = RegDeleteValueA(hKey, lpszName); + if (ret) goto cleanup; + } + +cleanup: + /* Free buffer if allocated */ + if (lpszName != szNameBuf) + HeapFree( GetProcessHeap(), 0, lpszName); + if(lpszSubKey) + RegCloseKey(hSubKey); + return ret; +} + static BOOL create_reg_entries(void) { HKEY hKey = NULL; @@ -92,7 +159,7 @@ static void delete_reg_entries(void) if (RegOpenKeyExA(HKEY_CURRENT_USER, REG_TEST_BASEKEYA, 0, KEY_ALL_ACCESS, &hKey)) return; - SHDeleteKeyA(hKey, REG_TEST_BASESUBKEYA); + mru_RegDeleteTreeA(hKey, REG_TEST_BASESUBKEYA); RegCloseKey(hKey); }

1 0

Francois Gouget : winealsa.drv: Remove trailing spaces in Wine traces.
by Alexandre Julliard Dec. 10, 2007

Dec. 10, 2007

Module: wine Branch: master Commit: f6bdd7dc6cad981b3ef1c1f751251c5e09160d22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6bdd7dc6cad981b3ef1c1f75… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 10 01:23:19 2007 +0100 winealsa.drv: Remove trailing spaces in Wine traces. --- dlls/winealsa.drv/wavein.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index 200879b..277fa8c 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -201,7 +201,7 @@ static DWORD CALLBACK widRecorder(LPVOID pmt) read = wwi->read(wwi->pcm, lpWaveHdr->lpData + lpWaveHdr->dwBytesRecorded, frames); bytesRead = snd_pcm_frames_to_bytes(wwi->pcm, read); - TRACE("bytesRead=(%d(%d)/(%d)) -> (%d/%d) \n", bytesRead, read, frames, lpWaveHdr->dwBufferLength, lpWaveHdr->dwBufferLength - lpWaveHdr->dwBytesRecorded); + TRACE("bytesRead=(%d(%d)/(%d)) -> (%d/%d)\n", bytesRead, read, frames, lpWaveHdr->dwBufferLength, lpWaveHdr->dwBufferLength - lpWaveHdr->dwBytesRecorded); if (read != (DWORD) -1) { /* update number of bytes recorded in current buffer and by this device */

1 0

Hans Leidekker : usp10: Don't trace char to glyph mappings.
by Alexandre Julliard Dec. 10, 2007

Dec. 10, 2007

Module: wine Branch: master Commit: e19b2360f0d4652dd91b5adf0f9e0c35aa90edd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e19b2360f0d4652dd91b5adf0… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Dec 9 21:39:44 2007 +0100 usp10: Don't trace char to glyph mappings. --- dlls/usp10/usp10.c | 32 +++----------------------------- 1 files changed, 3 insertions(+), 29 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index fb0d4da..5d77829 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1258,28 +1258,14 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, hfont = select_cached_font(psc); - TRACE("Before: "); - for (cnt = 0; cnt < cChars; cnt++) - TRACE("%4x",pwcChars[cnt]); - TRACE("\n"); - if (!psa->fNoGlyphIndex) { /* Glyph translate */ if (!(GetGlyphIndicesW(get_cache_hdc(psc), pwcChars, cChars, pwOutGlyphs, 0))) return S_FALSE; - - TRACE("After: "); - for (cnt = 0; cnt < cChars; cnt++) { - TRACE("%04x",pwOutGlyphs[cnt]); - } - TRACE("\n"); } else { - TRACE("After: "); for (cnt = 0; cnt < cChars; cnt++) { /* no translate so set up */ pwOutGlyphs[cnt] = pwcChars[cnt]; /* copy in to out and */ - TRACE("%04x",pwOutGlyphs[cnt]); } - TRACE("\n"); } /* Set up a valid SCRIPT_VISATTR and LogClust for each char in this run */ @@ -1396,7 +1382,6 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars, int cChars, DWORD dwFlags, WORD *pwOutGlyphs) { - int cnt; HRESULT hr; HFONT hfont; @@ -1406,22 +1391,11 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars if ((hr = get_script_cache(hdc, psc))) return hr; hfont = select_cached_font(psc); - - TRACE("Before: "); - for (cnt = 0; cnt < cChars; cnt++) - TRACE("%4x",pwcInChars[cnt]); - TRACE("\n"); - - GetGlyphIndicesW(get_cache_hdc(psc), pwcInChars, cChars, pwOutGlyphs, 0); - - TRACE("After: "); - for (cnt = 0; cnt < cChars; cnt++) { - TRACE("%04x",pwOutGlyphs[cnt]); - } - TRACE("\n"); + if (GetGlyphIndicesW(get_cache_hdc(psc), pwcInChars, cChars, pwOutGlyphs, 0) == GDI_ERROR) + hr = S_FALSE; unselect_cached_font(psc, hfont); - return S_OK; + return hr; } /***********************************************************************

1 0

Francois Gouget : kernel32/tests: Get the test to run on Windows 95.
by Alexandre Julliard Dec. 10, 2007

Dec. 10, 2007

Module: wine Branch: master Commit: 8ee430d14623c20fefabb0db1d07ab717346e957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ee430d14623c20fefabb0db1… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 10 01:24:49 2007 +0100 kernel32/tests: Get the test to run on Windows 95. --- dlls/kernel32/tests/actctx.c | 5 ++++- dlls/kernel32/tests/file.c | 14 +++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 40f8b6e..21faa68 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -29,6 +29,7 @@ static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); static BOOL (WINAPI *pFindActCtxSectionStringW)(DWORD,const GUID *,ULONG,LPCWSTR,PACTCTX_SECTION_KEYED_DATA); static BOOL (WINAPI *pGetCurrentActCtx)(HANDLE *); +static BOOL (WINAPI *pIsDebuggerPresent)(void); static BOOL (WINAPI *pQueryActCtxW)(DWORD,HANDLE,PVOID,ULONG,PVOID,SIZE_T,SIZE_T*); static VOID (WINAPI *pReleaseActCtx)(HANDLE); @@ -881,8 +882,9 @@ static void test_actctx(void) test_detailed_info(handle, &detailed_info1); test_info_in_assembly(handle, 1, &manifest1_info); - if (!IsDebuggerPresent()) /* CloseHandle will generate an exception if a debugger is present */ + if (pIsDebuggerPresent && !pIsDebuggerPresent()) { + /* CloseHandle will generate an exception if a debugger is present */ b = CloseHandle(handle); ok(!b, "CloseHandle succeeded\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError() == %u\n", GetLastError()); @@ -1137,6 +1139,7 @@ static BOOL init_funcs(void) X(DeactivateActCtx); X(FindActCtxSectionStringW); X(GetCurrentActCtx); + X(IsDebuggerPresent); X(QueryActCtxW); X(ReleaseActCtx); #undef X diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 8b8c5fa..1fac807 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -28,6 +28,9 @@ #include "winbase.h" #include "winerror.h" +static HINSTANCE hkernel32; +static HANDLE (WINAPI *pFindFirstFileExA)(LPCSTR,FINDEX_INFO_LEVELS,LPVOID,FINDEX_SEARCH_OPS,LPVOID,DWORD); + /* keep filename and filenameW the same */ static const char filename[] = "testfile.xxx"; static const WCHAR filenameW[] = { 't','e','s','t','f','i','l','e','.','x','x','x',0 }; @@ -1420,12 +1423,18 @@ static void test_FindFirstFileExA(void) WIN32_FIND_DATAA search_results; HANDLE handle; + if (!pFindFirstFileExA) + { + skip("FindFirstFileExA() is missing\n"); + return; + } + CreateDirectoryA("test-dir", NULL); _lclose(_lcreat("test-dir\\file1", 0)); _lclose(_lcreat("test-dir\\file2", 0)); CreateDirectoryA("test-dir\\dir1", NULL); /* FindExLimitToDirectories is ignored */ - handle = FindFirstFileExA("test-dir\\*", FindExInfoStandard, &search_results, FindExSearchLimitToDirectories, NULL, 0); + handle = pFindFirstFileExA("test-dir\\*", FindExInfoStandard, &search_results, FindExSearchLimitToDirectories, NULL, 0); ok(handle != INVALID_HANDLE_VALUE, "FindFirstFile failed (err=%u)\n", GetLastError()); ok(strcmp(search_results.cFileName, ".") == 0, "First entry should be '.', is %s\n", search_results.cFileName); @@ -1895,6 +1904,9 @@ static void test_RemoveDirectory(void) START_TEST(file) { + hkernel32 = GetModuleHandleA("kernel32.dll"); + pFindFirstFileExA=(void*)GetProcAddress(hkernel32, "FindFirstFileExA"); + test__hread( ); test__hwrite( ); test__lclose( );

1 0

Alexandre Julliard : user32: Keep waiting for posted messages in peek_message after we get an ignored message .
by Alexandre Julliard Dec. 10, 2007

Dec. 10, 2007

Module: wine Branch: master Commit: 55348e5667d6af31efb6261d2da055be5910d8e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55348e5667d6af31efb6261d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 10 12:05:46 2007 +0100 user32: Keep waiting for posted messages in peek_message after we get an ignored message. --- dlls/user32/message.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 53d1c1d..d3f4a3a 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2173,11 +2173,11 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags WMCHAR_MAP_RECVMESSAGE ); reply_message( &info, result, TRUE ); thread_info->receive_info = old_info; - next: - HeapFree( GetProcessHeap(), 0, buffer ); /* if some PM_QS* flags were specified, only handle sent messages from now on */ if (HIWORD(flags)) flags = PM_QS_SENDMESSAGE | LOWORD(flags); + next: + HeapFree( GetProcessHeap(), 0, buffer ); } }

1 0