wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Alexandre Julliard : Release 1.5.2.
by Alexandre Julliard 13 Apr '12

13 Apr '12

Module: wine Branch: master Commit: c6a673291da6e9ee956910f35efcde0a8d8437ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a673291da6e9ee956910f35… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 20:15:32 2012 +0200 Release 1.5.2. --- ANNOUNCE | 856 ++++++++++++++++++++++++++++++++----------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 466 insertions(+), 410 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c6a673291da6e9ee95691…

1 0

Jacek Caban : vbscript: Short if statement may have optional 'end if'.
by Alexandre Julliard 13 Apr '12

13 Apr '12

Module: wine Branch: master Commit: cb1a8a3c58e1ba020fa6b8b8196519637d2cb916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb1a8a3c58e1ba020fa6b8b81… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 13 17:40:40 2012 +0200 vbscript: Short if statement may have optional 'end if'. --- dlls/vbscript/parser.y | 6 +++++- dlls/vbscript/tests/lang.vbs | 2 ++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 45e0e8a..2a85272 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -221,9 +221,13 @@ IfStatement : tIF Expression tTHEN tNL StatementsNl ElseIfs_opt Else_opt tEND tIF { $$ = new_if_statement(ctx, $2, $5, $6, $7); CHECK_ERROR; } | tIF Expression tTHEN Statement { $$ = new_if_statement(ctx, $2, $4, NULL, NULL); CHECK_ERROR; } - | tIF Expression tTHEN Statement tELSE Statement + | tIF Expression tTHEN Statement tELSE Statement EndIf_opt { $$ = new_if_statement(ctx, $2, $4, NULL, $6); CHECK_ERROR; } +EndIf_opt + : /* empty */ + | tEND tIF + ElseIfs_opt : /* empty */ { $$ = NULL; } | ElseIfs { $$ = $1; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 0025d69..4380432 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -209,6 +209,8 @@ if false then : if false then x = y : if true then call ok(false, "embedded if called") +if false then x=1 else x=2 end if + if false then ok false, "if false called" end if

1 0

Piotr Caban : wininet: Store correct urlcache file size.
by Alexandre Julliard 13 Apr '12

13 Apr '12

Module: wine Branch: master Commit: fdf2e15b807e5a35e6ab42375d457a1bff88ab05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdf2e15b807e5a35e6ab42375… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 13 17:17:39 2012 +0200 wininet: Store correct urlcache file size. --- dlls/wininet/urlcache.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 8f433ba..81b9fda 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -420,6 +420,7 @@ static DWORD URLCacheContainer_OpenIndex(URLCACHECONTAINER * pContainer, DWORD b { dwError = GetLastError(); } + dwFileSize = new_file_size; CloseHandle(hMapping); } else @@ -438,8 +439,8 @@ static DWORD URLCacheContainer_OpenIndex(URLCACHECONTAINER * pContainer, DWORD b } - pContainer->file_size = new_file_size; - wsprintfW(wszFilePath, wszMappingFormat, pContainer->path, wszIndex, new_file_size); + pContainer->file_size = dwFileSize; + wsprintfW(wszFilePath, wszMappingFormat, pContainer->path, wszIndex, dwFileSize); URLCache_PathToObjectName(wszFilePath, '_'); pContainer->hMapping = OpenFileMappingW(FILE_MAP_WRITE, FALSE, wszFilePath); if (!pContainer->hMapping)

1 0

Carlo Bramini : shlwapi: Don' t remove nonexistent extension in PathRemoveExtension.
by Alexandre Julliard 13 Apr '12

13 Apr '12

Module: wine Branch: master Commit: f9c9ea6343daf1fbd587d4718b48371ad1bef5a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c9ea6343daf1fbd587d4718… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Mon Apr 9 23:55:53 2012 +0200 shlwapi: Don't remove nonexistent extension in PathRemoveExtension. --- dlls/shlwapi/path.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index 92a830b..6f09d22 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -760,6 +760,10 @@ void WINAPI PathRemoveArgsW(LPWSTR lpszPath) * PARAMS * lpszPath [I/O] Path to remove the extension from * + * NOTES + * The NUL terminator must be written only if extension exists + * and if the pointed character is not already NUL. + * * RETURNS * Nothing. */ @@ -770,7 +774,8 @@ void WINAPI PathRemoveExtensionA(LPSTR lpszPath) if (lpszPath) { lpszPath = PathFindExtensionA(lpszPath); - *lpszPath = '\0'; + if (lpszPath && *lpszPath != '\0') + *lpszPath = '\0'; } } @@ -786,7 +791,8 @@ void WINAPI PathRemoveExtensionW(LPWSTR lpszPath) if (lpszPath) { lpszPath = PathFindExtensionW(lpszPath); - *lpszPath = '\0'; + if (lpszPath && *lpszPath != '\0') + *lpszPath = '\0'; } }

1 0

André Hentschel : winedbg: Add partial Thumb disassembler.
by Alexandre Julliard 13 Apr '12

13 Apr '12

Module: wine Branch: master Commit: e94b8302e3e9a7aaffab851a22a00ec6c0158915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e94b8302e3e9a7aaffab851a2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 12 23:36:56 2012 +0200 winedbg: Add partial Thumb disassembler. --- programs/winedbg/be_arm.c | 141 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 139 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 4cee5d2..8600256 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -57,6 +57,14 @@ static char const tbl_dataops[][4] = { "mov", "bic", "mvn" }; +static char const tbl_hiops_t[][4] = { +"add", "cmp", "mov", "bx" +}; + +static char const tbl_immops_t[][4] = { +"mov", "cmp", "add", "sub" +}; + static UINT db_get_inst(void* addr, int size) { UINT result = 0; @@ -249,6 +257,93 @@ static UINT arm_disasm_coprocdatatrans(UINT inst) return 0; } +static WORD thumb_disasm_hireg(WORD inst) +{ + short dst = inst & 0x07; + short src = (inst >> 3) & 0x07; + short h2 = (inst >> 6) & 0x01; + short h1 = (inst >> 7) & 0x01; + short op = (inst >> 8) & 0x03; + + if (h1) dst += 8; + if (h2) src += 8; + + if (op == 3) + dbg_printf("\n\tb%sx\tr%u", h1?"l":"", src); + else + dbg_printf("\n\t%s\tr%u, r%u", tbl_hiops_t[op], dst, src); + + return 0; +} + +static WORD thumb_disasm_blocktrans(WORD inst) +{ + short lrpc = (inst >> 8) & 0x01; + short load = (inst >> 11) & 0x01; + short i; + short last; + + for (i=7;i>=0;i--) + if ((inst>>i) & 1) break; + last = i; + + dbg_printf("\n\t%s\t{", load ? "pop" : "push"); + + for (i=0;i<=7;i++) + if ((inst>>i) & 1) + { + if (i == last) dbg_printf("r%u", i); + else dbg_printf("r%u, ", i); + } + if (lrpc) + dbg_printf(", %s", load ? "pc" : "lr"); + + dbg_printf("}"); + return 0; +} + +static WORD thumb_disasm_swi(WORD inst) +{ + WORD comment = inst & 0x00ff; + dbg_printf("\n\tswi\t#%d", comment); + return 0; +} + +static WORD thumb_disasm_nop(WORD inst) +{ + dbg_printf("\n\tnop"); + return 0; +} + +static WORD thumb_disasm_ldrpcrel(WORD inst) +{ + WORD offset = (inst & 0xff) << 2; + dbg_printf("\n\tldr\tr%u, [pc, #%u]", (inst >> 8) & 0x07, offset); + return 0; +} + +static WORD thumb_disasm_ldrsprel(WORD inst) +{ + WORD offset = (inst & 0xff) << 2; + dbg_printf("\n\t%s\tr%u, [sp, #%u]", (inst & 0x0800)?"ldr":"str", (inst >> 8) & 0x07, offset); + return 0; +} + +static WORD thumb_disasm_ldrimm(WORD inst) +{ + WORD offset = (inst & 0x07c0) >> 6; + dbg_printf("\n\t%s%s\tr%u, [r%u, #%u]", (inst & 0x0800)?"ldr":"str", (inst & 0x1000)?"b":"", + inst & 0x07, (inst >> 3) & 0x07, (inst & 0x1000)?offset:(offset << 2)); + return 0; +} + +static WORD thumb_disasm_immop(WORD inst) +{ + WORD op = (inst >> 11) & 0x03; + dbg_printf("\n\t%s\tr%u, #%u", tbl_immops_t[op], (inst >> 8) & 0x07, inst & 0xff); + return 0; +} + struct inst_arm { UINT mask; @@ -269,6 +364,25 @@ static const struct inst_arm tbl_arm[] = { { 0x00000000, 0x00000000, NULL } }; +struct inst_thumb16 +{ + WORD mask; + WORD pattern; + WORD (*func)(WORD); +}; + +static const struct inst_thumb16 tbl_thumb16[] = { + { 0xfc00, 0x4400, thumb_disasm_hireg }, + { 0xf600, 0xb400, thumb_disasm_blocktrans }, + { 0xf800, 0x4800, thumb_disasm_ldrpcrel }, + { 0xf000, 0x9000, thumb_disasm_ldrsprel }, + { 0xe000, 0x6000, thumb_disasm_ldrimm }, + { 0xe000, 0x2000, thumb_disasm_immop }, + { 0xff00, 0xdf00, thumb_disasm_swi }, + { 0xff00, 0xbf00, thumb_disasm_nop }, + { 0x0000, 0x0000, NULL } +}; + /*********************************************************************** * disasm_one_insn * @@ -278,7 +392,9 @@ static const struct inst_arm tbl_arm[] = { void be_arm_disasm_one_insn(ADDRESS64 *addr, int display) { struct inst_arm *a_ptr = (struct inst_arm *)&tbl_arm; + struct inst_thumb16 *t_ptr = (struct inst_thumb16 *)&tbl_thumb16; UINT inst; + WORD tinst; int size; int matched = 0; @@ -323,8 +439,29 @@ void be_arm_disasm_one_insn(ADDRESS64 *addr, int display) } else { - dbg_printf("\n\tThumb disassembling not yet implemented\n"); - addr->Offset += size; + tinst = inst; + while (t_ptr->func) { + if ((tinst & t_ptr->mask) == t_ptr->pattern) { + matched = 1; + break; + } + t_ptr++; + } + + if (!matched) { + dbg_printf("\n\tUnknown Instruction: %08x\n", tinst); + addr->Offset += size; + return; + } + else + { + if (!t_ptr->func(tinst)) + { + dbg_printf("\n"); + addr->Offset += size; + } + } + return; } }

1 0

Alexander Morozov : kernel32/tests: Add a test for creating named mapping after closing without unmapping.
by Alexandre Julliard 13 Apr '12

13 Apr '12

Module: wine Branch: master Commit: e01643af9c2d6ee61905585d1ae44436efbfbb1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e01643af9c2d6ee61905585d1… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Thu Apr 12 20:14:14 2012 +0400 kernel32/tests: Add a test for creating named mapping after closing without unmapping. --- dlls/kernel32/tests/virtual.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index d502bbf..2c3f22d 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -780,6 +780,38 @@ static void test_MapViewOfFile(void) "got %u, expected ERROR_INVALID_ADDRESS\n", GetLastError()); ok( VirtualFree(addr, 0, MEM_RELEASE), "VirtualFree failed\n" ); + + /* close named mapping handle without unmapping */ + name = "Foo"; + SetLastError(0xdeadbeef); + mapping = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, MAPPING_SIZE, name); + ok( mapping != 0, "CreateFileMappingA failed with error %d\n", GetLastError() ); + SetLastError(0xdeadbeef); + ptr = MapViewOfFile(mapping, FILE_MAP_WRITE, 0, 0, 0); + ok( ptr != NULL, "MapViewOfFile failed with error %d\n", GetLastError() ); + SetLastError(0xdeadbeef); + map2 = OpenFileMappingA(FILE_MAP_READ, FALSE, name); + ok( map2 != 0, "OpenFileMappingA failed with error %d\n", GetLastError() ); + CloseHandle(map2); + CloseHandle(mapping); + + SetLastError(0xdeadbeef); + map2 = OpenFileMappingA(FILE_MAP_READ, FALSE, name); + todo_wine + ok( map2 == 0, "OpenFileMappingA succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_FILE_NOT_FOUND, "OpenFileMappingA set error %d\n", GetLastError() ); + CloseHandle(map2); + SetLastError(0xdeadbeef); + mapping = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, MAPPING_SIZE, name); + ok( mapping != 0, "CreateFileMappingA failed\n" ); + todo_wine + ok( GetLastError() == ERROR_SUCCESS, "CreateFileMappingA set error %d\n", GetLastError() ); + CloseHandle(mapping); + + SetLastError(0xdeadbeef); + ret = UnmapViewOfFile(ptr); + ok( ret, "UnmapViewOfFile failed with error %d\n", GetLastError() ); } static void test_NtMapViewOfSection(void)

1 0

Piotr Caban : msvcrt: Fix months and weekday names in C locale.
by Alexandre Julliard 13 Apr '12

13 Apr '12

Module: wine Branch: master Commit: 2759779990f9a108be82c73f0e2fd48bb1928d8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2759779990f9a108be82c73f0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 13 16:03:56 2012 +0200 msvcrt: Fix months and weekday names in C locale. --- dlls/msvcrt/locale.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index a990d44..97b82ec 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -756,7 +756,7 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) static const MSVCRT_wchar_t cloc_timeW[] = {'H','H',':','m','m',':','s','s',0}; MSVCRT__locale_t loc; - LCID lcid[6] = { 0 }; + LCID lcid[6] = { 0 }, lcid_tmp; char buf[256]; int i, ret, size; @@ -1197,15 +1197,14 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) loc->locinfo->lc_category[MSVCRT_LC_TIME].locale = MSVCRT__strdup("C"); size = sizeof(MSVCRT___lc_time_data); + lcid_tmp = lcid[MSVCRT_LC_TIME] ? lcid[MSVCRT_LC_TIME] : MAKELCID(LANG_ENGLISH, SORT_DEFAULT); for(i=0; i<sizeof(time_data)/sizeof(time_data[0]); i++) { if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { size += sizeof(cloc_short_date) + sizeof(cloc_short_dateW); }else if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { size += sizeof(cloc_long_date) + sizeof(cloc_long_dateW); - }else if(time_data[i]==LOCALE_STIMEFORMAT && !lcid[MSVCRT_LC_TIME]) { - size += sizeof(cloc_time) + sizeof(cloc_timeW); }else { - ret = GetLocaleInfoA(lcid[MSVCRT_LC_TIME], time_data[i] + ret = GetLocaleInfoA(lcid_tmp, time_data[i] |LOCALE_NOUSEROVERRIDE, NULL, 0); if(!ret) { MSVCRT__free_locale(loc); @@ -1213,7 +1212,7 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) } size += ret; - ret = GetLocaleInfoW(lcid[MSVCRT_LC_TIME], time_data[i] + ret = GetLocaleInfoW(lcid_tmp, time_data[i] |LOCALE_NOUSEROVERRIDE, NULL, 0); if(!ret) { MSVCRT__free_locale(loc); @@ -1242,7 +1241,7 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) memcpy(&loc->locinfo->lc_time_curr->data[ret], cloc_time, sizeof(cloc_time)); ret += sizeof(cloc_time); }else { - ret += GetLocaleInfoA(lcid[MSVCRT_LC_TIME], time_data[i]|LOCALE_NOUSEROVERRIDE, + ret += GetLocaleInfoA(lcid_tmp, time_data[i]|LOCALE_NOUSEROVERRIDE, &loc->locinfo->lc_time_curr->data[ret], size-ret); } } @@ -1258,7 +1257,7 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) memcpy(&loc->locinfo->lc_time_curr->data[ret], cloc_timeW, sizeof(cloc_timeW)); ret += sizeof(cloc_timeW); }else { - ret += GetLocaleInfoW(lcid[MSVCRT_LC_TIME], time_data[i]|LOCALE_NOUSEROVERRIDE, + ret += GetLocaleInfoW(lcid_tmp, time_data[i]|LOCALE_NOUSEROVERRIDE, (MSVCRT_wchar_t*)&loc->locinfo->lc_time_curr->data[ret], size-ret)*sizeof(MSVCRT_wchar_t); } }

1 0

Dmitry Timoshkov : gdi32: Add large fonts support for MS Sans Serif.
by Alexandre Julliard 13 Apr '12

13 Apr '12

Module: wine Branch: master Commit: 34608a5108c706784ce9da7ce5e61d1b8904ed14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34608a5108c706784ce9da7ce… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 13 17:56:36 2012 +0900 gdi32: Add large fonts support for MS Sans Serif. --- dlls/gdi32/freetype.c | 63 +++++++++++++++++++++++++++++++------------------ 1 files changed, 40 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=34608a5108c706784ce9d…

1 0

Dmitry Timoshkov : fonts: Generate large pixel size versions of MS Sans Serif.
by Alexandre Julliard 13 Apr '12

13 Apr '12

Module: wine Branch: master Commit: fc42bfe60f3a29c4ce0ed47eb03cc3125be904fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc42bfe60f3a29c4ce0ed47eb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 13 17:56:29 2012 +0900 fonts: Generate large pixel size versions of MS Sans Serif. --- fonts/.gitignore | 9 +++++++++ fonts/Makefile.in | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/fonts/.gitignore b/fonts/.gitignore index a857f0d..e513ad4 100644 --- a/fonts/.gitignore +++ b/fonts/.gitignore @@ -22,11 +22,20 @@ /ssee1256.fon /ssee1257.fon /ssee874.fon +/ssef1255.fon +/ssef1256.fon +/ssef1257.fon +/ssef874.fon /sserife.fon /sserifee.fon /sserifeg.fon /sserifer.fon /sserifet.fon +/sseriff.fon +/sseriffe.fon +/sseriffg.fon +/sseriffr.fon +/sserifft.fon /svgasys.fon /vgas1255.fon /vgas1256.fon diff --git a/fonts/Makefile.in b/fonts/Makefile.in index 50d812c..47fb8aa 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -26,10 +26,19 @@ BITMAP_FONTS = \ sserifeg.fon \ sserifer.fon \ sserifet.fon \ + sseriff.fon \ + sseriffe.fon \ + sseriffg.fon \ + sseriffr.fon \ + sserifft.fon \ ssee1255.fon \ ssee1256.fon \ ssee1257.fon \ ssee874.fon \ + ssef1255.fon \ + ssef1256.fon \ + ssef1257.fon \ + ssef874.fon \ svgasys.fon \ vgasys.fon \ vgasyse.fon \ @@ -80,30 +89,57 @@ coue1257.fon: courier.ttf sserife.fon: ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1252,5 16,1252,7 20,1252,8 +sseriff.fon: ms_sans_serif.ttf + $(LDPATH) $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1252,7 20,1252,8 + sserifee.fon: ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1250,5 16,1250,7 +sseriffe.fon: ms_sans_serif.ttf + $(LDPATH) $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1250,7 + sserifer.fon: ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1251,5 16,1251,7 20,1251,8 +sseriffr.fon: ms_sans_serif.ttf + $(LDPATH) $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1251,7 20,1251,8 + sserifeg.fon: ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1253,5 16,1253,7 20,1253,8 +sseriffg.fon: ms_sans_serif.ttf + $(LDPATH) $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1253,7 20,1253,8 + sserifet.fon: ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1254,5 16,1254,7 20,1254,8 +sserifft.fon: ms_sans_serif.ttf + $(LDPATH) $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1254,7 20,1254,8 + ssee1255.fon: ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1255,5 16,1255,7 20,1255,8 +ssef1255.fon: ms_sans_serif.ttf + $(LDPATH) $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1255,7 20,1255,8 + ssee1256.fon: ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1256,5 16,1256,7 20,1256,8 +ssef1256.fon: ms_sans_serif.ttf + $(LDPATH) $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1256,7 20,1256,8 + ssee1257.fon: ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1257,5 16,1257,7 20,1257,8 +ssef1257.fon: ms_sans_serif.ttf + $(LDPATH) $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1257,7 20,1257,8 + ssee874.fon: ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,874,5 16,874,7 20,874,8 +ssef874.fon: ms_sans_serif.ttf + $(LDPATH) $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,874,7 20,874,8 + smalle.fon: small_fonts.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1252,5

1 0

Huw Davies : wineps: Move ppd filename retrieval to a separate function.
by Alexandre Julliard 13 Apr '12

13 Apr '12

Module: wine Branch: master Commit: 72cfc219f0ba2fc3aea19760558f7820f4883176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72cfc219f0ba2fc3aea197605… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 13 12:57:48 2012 +0100 wineps: Move ppd filename retrieval to a separate function. --- dlls/wineps.drv/init.c | 205 ++++++++++++++++++++++++++---------------------- 1 files changed, 112 insertions(+), 93 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 584254c..b2597d7 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -573,6 +573,106 @@ static BOOL set_devmode( HANDLE printer, PSDRV_DEVMODE *dm ) return SetPrinterW( printer, 9, (BYTE *)&info, 0 ); } +static inline char *expand_env_string( char *str, DWORD type ) +{ + if (type == REG_EXPAND_SZ) + { + char *tmp; + DWORD needed = ExpandEnvironmentStringsA( str, NULL, 0 ); + tmp = HeapAlloc( GetProcessHeap(), 0, needed ); + if (tmp) + { + ExpandEnvironmentStringsA( str, tmp, needed ); + HeapFree( GetProcessHeap(), 0, str ); + return tmp; + } + } + return str; +} + +static char *get_ppd_filename( HANDLE printer, const char *nameA, BOOL *needs_unlink ) +{ + char *ret = NULL; + DWORD needed, err, type; + HKEY hkey; + const char *data_dir, *filename; + + *needs_unlink = FALSE; + +#ifdef SONAME_LIBCUPS + if (cupshandle != (void*)-1) + { + typeof(cupsGetPPD) *pcupsGetPPD; + + pcupsGetPPD = wine_dlsym( cupshandle, "cupsGetPPD", NULL, 0 ); + if (pcupsGetPPD) + { + filename = pcupsGetPPD( nameA ); + + if (filename) + { + needed = strlen( filename ) + 1; + ret = HeapAlloc( GetProcessHeap(), 0, needed ); + memcpy( ret, filename, needed ); + *needs_unlink = TRUE; + return ret; + } + else + WARN( "CUPS did not find ppd for %s\n", debugstr_a(nameA) ); + } + } +#endif + + err = GetPrinterDataExA( printer, "PrinterDriverData", "PPD File", NULL, NULL, 0, &needed ); + if (err == ERROR_MORE_DATA) + { + ret = HeapAlloc( GetProcessHeap(), 0, needed ); + if (!ret) return NULL; + GetPrinterDataExA( printer, "PrinterDriverData", "PPD File", &type, + (BYTE *)ret, needed, &needed ); + return expand_env_string( ret, type ); + } + + /* Look for a ppd file for this printer in the config file. + * First look under that printer's name, and then under 'generic' + */ + /* @@ Wine registry key: HKCU\Software\Wine\Printing\PPD Files */ + if (RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Printing\\PPD Files", &hkey ) == ERROR_SUCCESS ) + { + const char *value_name = NULL; + + if (RegQueryValueExA( hkey, nameA, 0, NULL, NULL, &needed ) == ERROR_SUCCESS) + value_name = nameA; + else if (RegQueryValueExA( hkey, "generic", 0, NULL, NULL, &needed ) == ERROR_SUCCESS) + value_name = "generic"; + + if (value_name) + { + ret = HeapAlloc( GetProcessHeap(), 0, needed ); + if (!ret) return NULL; + RegQueryValueExA( hkey, value_name, 0, &type, (BYTE *)ret, &needed ); + } + RegCloseKey( hkey ); + if (ret) return expand_env_string( ret, type ); + } + + if ((data_dir = wine_get_data_dir())) filename = "/generic.ppd"; + else if ((data_dir = wine_get_build_dir())) filename = "/dlls/wineps.drv/generic.ppd"; + else + { + ERR( "Error getting PPD file name for printer '%s'\n", debugstr_a(nameA) ); + return NULL; + } + ret = HeapAlloc( GetProcessHeap(), 0, strlen(data_dir) + strlen(filename) + 1 ); + if (ret) + { + strcpy( ret, data_dir ); + strcat( ret, filename ); + } + + return ret; +} + static struct list printer_list = LIST_INIT( printer_list ); /********************************************************************** @@ -585,11 +685,8 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) FONTNAME *font; const AFM *afm; HANDLE hPrinter = 0; - const char *ppd = NULL; - DWORD ppdType; - char *ppdFileName = NULL, *nameA = NULL; - HKEY hkey; - BOOL using_default_devmode = FALSE; + char *ppd_filename = NULL, *nameA = NULL; + BOOL using_default_devmode = FALSE, needs_unlink = FALSE; int len; TRACE("'%s'\n", debugstr_w(name)); @@ -618,93 +715,14 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) pi->Devmode = get_devmode( hPrinter, name, &using_default_devmode ); if (!pi->Devmode) goto fail; -#ifdef SONAME_LIBCUPS - if (cupshandle != (void*)-1) { - typeof(cupsGetPPD) * pcupsGetPPD = NULL; - - pcupsGetPPD = wine_dlsym(cupshandle, "cupsGetPPD", NULL, 0); - if (pcupsGetPPD) { - ppd = pcupsGetPPD( nameA ); - - if (ppd) { - needed=strlen(ppd)+1; - ppdFileName=HeapAlloc(PSDRV_Heap, 0, needed); - memcpy(ppdFileName, ppd, needed); - ppdType=REG_SZ; - res = ERROR_SUCCESS; - /* we should unlink() that file later */ - } else { - res = ERROR_FILE_NOT_FOUND; - WARN("Did not find ppd for %s\n", debugstr_w(name)); - } - } - } -#endif - if (!ppdFileName) { - res = GetPrinterDataExA(hPrinter, "PrinterDriverData", "PPD File", NULL, NULL, 0, &needed); - if ((res==ERROR_SUCCESS) || (res==ERROR_MORE_DATA)) { - ppdFileName=HeapAlloc(PSDRV_Heap, 0, needed); - res = GetPrinterDataExA(hPrinter, "PrinterDriverData", "PPD File", &ppdType, - (LPBYTE)ppdFileName, needed, &needed); - } - } - /* Look for a ppd file for this printer in the config file. - * First look under that printer's name, and then under 'generic' - */ - /* @@ Wine registry key: HKCU\Software\Wine\Printing\PPD Files */ - if((res != ERROR_SUCCESS) && !RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Printing\\PPD Files", &hkey)) - { - const char* value_name; - - if (RegQueryValueExA(hkey, nameA, 0, NULL, NULL, &needed) == ERROR_SUCCESS) { - value_name=nameA; - } else if (RegQueryValueExA(hkey, "generic", 0, NULL, NULL, &needed) == ERROR_SUCCESS) { - value_name="generic"; - } else { - value_name=NULL; - } - if (value_name) { - HeapFree(PSDRV_Heap, 0, ppdFileName); - ppdFileName=HeapAlloc(PSDRV_Heap, 0, needed); - RegQueryValueExA(hkey, value_name, 0, &ppdType, (LPBYTE)ppdFileName, &needed); - } - RegCloseKey(hkey); - } + ppd_filename = get_ppd_filename( hPrinter, nameA, &needs_unlink ); + if (!ppd_filename) goto fail; - if (!ppdFileName) + pi->ppd = PSDRV_ParsePPD( ppd_filename ); + if (!pi->ppd) { - const char *data_dir, *filename; - - if ((data_dir = wine_get_data_dir())) filename = "/generic.ppd"; - else if ((data_dir = wine_get_build_dir())) filename = "/dlls/wineps.drv/generic.ppd"; - else - { - res = ERROR_FILE_NOT_FOUND; - ERR ("Error %i getting PPD file name for printer '%s'\n", res, debugstr_w(name)); - goto fail; - } - ppdFileName = HeapAlloc( PSDRV_Heap, 0, strlen(data_dir) + strlen(filename) + 1 ); - strcpy( ppdFileName, data_dir ); - strcat( ppdFileName, filename ); - } else { - res = ERROR_SUCCESS; - if (ppdType==REG_EXPAND_SZ) { - char* tmp; - - /* Expand environment variable references */ - needed=ExpandEnvironmentStringsA(ppdFileName,NULL,0); - tmp=HeapAlloc(PSDRV_Heap, 0, needed); - ExpandEnvironmentStringsA(ppdFileName,tmp,needed); - HeapFree(PSDRV_Heap, 0, ppdFileName); - ppdFileName=tmp; - } - } - - pi->ppd = PSDRV_ParsePPD(ppdFileName); - if(!pi->ppd) { - MESSAGE("Couldn't find PPD file '%s', expect a crash now!\n", - ppdFileName); - goto fail; + WARN( "Couldn't parse PPD file '%s'\n", ppd_filename ); + goto fail; } if(using_default_devmode) { @@ -780,19 +798,20 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) } ClosePrinter( hPrinter ); HeapFree( GetProcessHeap(), 0, nameA ); - if (ppd) unlink(ppd); + if (needs_unlink) unlink( ppd_filename ); + HeapFree( GetProcessHeap(), 0, ppd_filename ); list_add_head( &printer_list, &pi->entry ); return pi; fail: if (hPrinter) ClosePrinter( hPrinter ); - HeapFree(PSDRV_Heap, 0, ppdFileName); HeapFree(PSDRV_Heap, 0, pi->FontSubTable); HeapFree(PSDRV_Heap, 0, pi->friendly_name); HeapFree(PSDRV_Heap, 0, pi->Devmode); HeapFree(PSDRV_Heap, 0, pi); HeapFree( GetProcessHeap(), 0, nameA ); - if (ppd) unlink(ppd); + if (needs_unlink) unlink( ppd_filename ); + HeapFree( GetProcessHeap(), 0, ppd_filename ); return NULL; }

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
72
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 April 2012