January 2011 - Wine-commits

Alexandre Julliard : wrc: Remove the context prefix when generating the po file for English.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: 36bc86bfb3d40d68ffcb23a31ae6586a32cb9465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36bc86bfb3d40d68ffcb23a31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 14 12:49:41 2011 +0100 wrc: Remove the context prefix when generating the po file for English. --- tools/wrc/po.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index e47bda2..d7aabc5 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -301,6 +301,11 @@ static void po_xerror2( int severity, po_message_t message1, static const struct po_xerror_handler po_xerror_handler = { po_xerror, po_xerror2 }; +static int is_english( const language_t *lan ) +{ + return lan->id == LANG_ENGLISH && lan->sub == SUBLANG_DEFAULT; +} + static char *convert_string_utf8( const string_t *str, int codepage ) { string_t *newstr = convert_string( str, str_unicode, codepage ); @@ -371,7 +376,7 @@ static void add_po_string( po_file_t po, const string_t *msgid, const string_t * po_message_t msg; po_message_iterator_t iterator; int codepage; - char *id, *id_buffer, *context, *str_buffer = NULL; + char *id, *id_buffer, *context, *str = NULL, *str_buffer = NULL; if (!msgid->size) return; @@ -383,13 +388,14 @@ static void add_po_string( po_file_t po, const string_t *msgid, const string_t * if (lang) codepage = get_language_codepage( lang->id, lang->sub ); else codepage = get_language_codepage( 0, 0 ); assert( codepage != -1 ); - str_buffer = convert_string_utf8( msgstr, codepage ); + str_buffer = str = convert_string_utf8( msgstr, codepage ); + if (is_english( lang )) get_message_context( &str ); } if (!(msg = find_message( po, id, context, &iterator ))) { msg = po_message_create(); po_message_set_msgid( msg, id ); - po_message_set_msgstr( msg, str_buffer ? str_buffer : "" ); + po_message_set_msgstr( msg, str ? str : "" ); if (context) po_message_set_msgctxt( msg, context ); po_message_insert( iterator, msg ); } @@ -631,11 +637,6 @@ static void add_po_menu( const resource_t *english, const resource_t *res ) add_po_menu_items( po, english_items, items, res->res.men->lvc.language ); } -static int is_english( const language_t *lan ) -{ - return lan->id == LANG_ENGLISH && lan->sub == SUBLANG_DEFAULT; -} - static resource_t *find_english_resource( resource_t *res ) { resource_t *ptr;

1 0

Alexandre Julliard : mshtml: Remove a leftover string table.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: 61cf2d35ae97576597aaa2dd9c39a27ba5ef952a URL: http://source.winehq.org/git/wine.git/?a=commit;h=61cf2d35ae97576597aaa2dd9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 14 12:57:41 2011 +0100 mshtml: Remove a leftover string table. --- dlls/mshtml/Sr.rc | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/Sr.rc b/dlls/mshtml/Sr.rc index 2c7efd1..87148e6 100644 --- a/dlls/mshtml/Sr.rc +++ b/dlls/mshtml/Sr.rc @@ -50,18 +50,6 @@ FONT 8, "MS Shell Dlg" LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN -STRINGTABLE -{ - IDS_STATUS_DONE "Završeno" - IDS_STATUS_DOWNLOADINGFROM "Preuzimanje iz %s..." -} - -STRINGTABLE -{ - IDS_HTMLDISABLED "HTML iscrtavanje je onemogućeno." - IDS_HTMLDOCUMENT "HTML dokument" -} - IDD_HYPERLINK DIALOG 0, 0, 250, 65 STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Hiperveza"

1 0

Alexandre Julliard : regedit: Convert menu and string tables resources to po files.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: 30b5e22def83d83bd7cdae8908259787e2302980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30b5e22def83d83bd7cdae890… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 13 22:24:00 2011 +0100 regedit: Convert menu and string tables resources to po files. --- configure | 2 +- configure.ac | 2 +- po/ar.po | 337 ++++++++++++++++++++++++++++++++++--- po/bg.po | 369 ++++++++++++++++++++++++++++++++++++---- po/ca.po | 334 ++++++++++++++++++++++++++++++++++--- po/cs.po | 379 +++++++++++++++++++++++++++++++++++++---- po/da.po | 358 +++++++++++++++++++++++++++++++++++---- po/de.po | 354 ++++++++++++++++++++++++++++++++++++--- po/el.po | 338 ++++++++++++++++++++++++++++++++++--- po/en.po | 361 +++++++++++++++++++++++++++++++++++---- po/en_US.po | 336 ++++++++++++++++++++++++++++++++++--- po/eo.po | 349 +++++++++++++++++++++++++++++++++++--- po/es.po | 370 ++++++++++++++++++++++++++++++++++++---- po/fa.po | 337 ++++++++++++++++++++++++++++++++++--- po/fi.po | 352 ++++++++++++++++++++++++++++++++++++--- po/fr.po | 377 +++++++++++++++++++++++++++++++++++++---- po/he.po | 368 +++++++++++++++++++++++++++++++++++++--- po/hi.po | 334 ++++++++++++++++++++++++++++++++++--- po/hu.po | 383 ++++++++++++++++++++++++++++++++++++++---- po/it.po | 357 ++++++++++++++++++++++++++++++++++++--- po/ja.po | 382 +++++++++++++++++++++++++++++++++++++----- po/ko.po | 373 +++++++++++++++++++++++++++++++++++++--- po/lt.po | 353 ++++++++++++++++++++++++++++++++++++--- po/ml.po | 334 ++++++++++++++++++++++++++++++++++--- po/nb_NO.po | 350 +++++++++++++++++++++++++++++++++++---- po/nl.po | 376 +++++++++++++++++++++++++++++++++++++---- po/or.po | 334 ++++++++++++++++++++++++++++++++++--- po/pa.po | 334 ++++++++++++++++++++++++++++++++++--- po/pl.po | 359 ++++++++++++++++++++++++++++++++++++--- po/pt_BR.po | 350 +++++++++++++++++++++++++++++++++++--- po/pt_PT.po | 359 ++++++++++++++++++++++++++++++++++++--- po/rm.po | 339 ++++++++++++++++++++++++++++++++++--- po/ro.po | 373 +++++++++++++++++++++++++++++++++++++---- po/ru.po | 382 +++++++++++++++++++++++++++++++++++++----- po/sk.po | 340 ++++++++++++++++++++++++++++++++++--- po/sl.po | 375 ++++++++++++++++++++++++++++++++++++++---- po/sr_RS(a)cyrillic.po | 349 +++++++++++++++++++++++++++++++++++--- po/sr_RS(a)latin.po | 355 ++++++++++++++++++++++++++++++++++++--- po/sv.po | 360 ++++++++++++++++++++++++++++++++++++--- po/te.po | 334 ++++++++++++++++++++++++++++++++++--- po/th.po | 341 ++++++++++++++++++++++++++++++++++--- po/tr.po | 366 ++++++++++++++++++++++++++++++++++++---- po/uk.po | 372 ++++++++++++++++++++++++++++++++++++---- po/wa.po | 344 +++++++++++++++++++++++++++++++++++--- po/wine.pot | 333 ++++++++++++++++++++++++++++++++++--- po/zh_CN.po | 361 ++++++++++++++++++++++++++++++++++++---- po/zh_TW.po | 370 +++++++++++++++++++++++++++++++++++++---- programs/regedit/Bg.rc | 171 ------------------- programs/regedit/Cs.rc | 170 ------------------- programs/regedit/Da.rc | 189 --------------------- programs/regedit/De.rc | 196 --------------------- programs/regedit/En.rc | 271 +---------------------------- programs/regedit/Es.rc | 189 --------------------- programs/regedit/Fr.rc | 189 --------------------- programs/regedit/He.rc | 189 --------------------- programs/regedit/Hu.rc | 132 --------------- programs/regedit/It.rc | 188 --------------------- programs/regedit/Ja.rc | 189 --------------------- programs/regedit/Ko.rc | 190 --------------------- programs/regedit/Lt.rc | 188 --------------------- programs/regedit/Makefile.in | 4 +- programs/regedit/Nl.rc | 189 --------------------- programs/regedit/No.rc | 189 --------------------- programs/regedit/Pl.rc | 189 --------------------- programs/regedit/Pt.rc | 360 --------------------------------------- programs/regedit/Ro.rc | 189 --------------------- programs/regedit/Ru.rc | 189 --------------------- programs/regedit/Si.rc | 189 --------------------- programs/regedit/Sv.rc | 189 --------------------- programs/regedit/Tr.rc | 169 ------------------- programs/regedit/Uk.rc | 189 --------------------- programs/regedit/Zh.rc | 364 --------------------------------------- programs/regedit/regedit.rc | 245 +++++++++++++++++++++++++++ programs/regedit/rsrc.rc | 66 ------- 74 files changed, 14972 insertions(+), 6194 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=30b5e22def83d83bd7cda…

1 0

Alexandre Julliard : winecfg: Convert menu and string tables resources to po files.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: a2be59a3f64bed34e4f3b5752e7473a9b6319b90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2be59a3f64bed34e4f3b5752… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 13 22:44:59 2011 +0100 winecfg: Convert menu and string tables resources to po files. --- configure | 2 +- configure.ac | 2 +- po/ar.po | 406 ++++++++++++++++++++++++++++++++++++++- po/bg.po | 430 ++++++++++++++++++++++++++++++++++++++++- po/ca.po | 399 +++++++++++++++++++++++++++++++++++++- po/cs.po | 433 ++++++++++++++++++++++++++++++++++++++++- po/da.po | 415 +++++++++++++++++++++++++++++++++++++++- po/de.po | 427 ++++++++++++++++++++++++++++++++++++++++- po/el.po | 401 +++++++++++++++++++++++++++++++++++++- po/en.po | 409 ++++++++++++++++++++++++++++++++++++++- po/en_US.po | 416 +++++++++++++++++++++++++++++++++++++++- po/eo.po | 413 +++++++++++++++++++++++++++++++++++++++- po/es.po | 417 +++++++++++++++++++++++++++++++++++++++- po/fa.po | 406 ++++++++++++++++++++++++++++++++++++++- po/fi.po | 422 +++++++++++++++++++++++++++++++++++++++- po/fr.po | 419 +++++++++++++++++++++++++++++++++++++++- po/he.po | 438 +++++++++++++++++++++++++++++++++++++++++- po/hi.po | 396 +++++++++++++++++++++++++++++++++++++- po/hu.po | 432 ++++++++++++++++++++++++++++++++++++++++- po/it.po | 417 +++++++++++++++++++++++++++++++++++++++- po/ja.po | 433 +++++++++++++++++++++++++++++++++++++++-- po/ko.po | 424 +++++++++++++++++++++++++++++++++++++++- po/lt.po | 417 +++++++++++++++++++++++++++++++++++++++- po/ml.po | 396 +++++++++++++++++++++++++++++++++++++- po/nb_NO.po | 415 +++++++++++++++++++++++++++++++++++++++- po/nl.po | 427 +++++++++++++++++++++++++++++++++++++++- po/or.po | 396 +++++++++++++++++++++++++++++++++++++- po/pa.po | 396 +++++++++++++++++++++++++++++++++++++- po/pl.po | 417 +++++++++++++++++++++++++++++++++++++++- po/pt_BR.po | 417 +++++++++++++++++++++++++++++++++++++++- po/pt_PT.po | 418 +++++++++++++++++++++++++++++++++++++++- po/rm.po | 400 +++++++++++++++++++++++++++++++++++++- po/ro.po | 418 +++++++++++++++++++++++++++++++++++++++- po/ru.po | 430 ++++++++++++++++++++++++++++++++++++++++- po/sk.po | 405 ++++++++++++++++++++++++++++++++++++++- po/sl.po | 416 +++++++++++++++++++++++++++++++++++++++- po/sr_RS(a)cyrillic.po | 426 ++++++++++++++++++++++++++++++++++++++++- po/sr_RS(a)latin.po | 437 ++++++++++++++++++++++++++++++++++++++++- po/sv.po | 416 +++++++++++++++++++++++++++++++++++++++- po/te.po | 396 +++++++++++++++++++++++++++++++++++++- po/th.po | 402 ++++++++++++++++++++++++++++++++++++++- po/tr.po | 434 ++++++++++++++++++++++++++++++++++++++++- po/uk.po | 417 +++++++++++++++++++++++++++++++++++++++- po/wa.po | 405 ++++++++++++++++++++++++++++++++++++++- po/wine.pot | 395 +++++++++++++++++++++++++++++++++++++- po/zh_CN.po | 416 +++++++++++++++++++++++++++++++++++++++- po/zh_TW.po | 442 +++++++++++++++++++++++++++++++++++++++++- programs/winecfg/Bg.rc | 90 --------- programs/winecfg/Cs.rc | 111 ----------- programs/winecfg/Da.rc | 126 ------------ programs/winecfg/De.rc | 126 ------------ programs/winecfg/En.rc | 163 ---------------- programs/winecfg/Es.rc | 126 ------------ programs/winecfg/Fi.rc | 89 --------- programs/winecfg/Fr.rc | 126 ------------ programs/winecfg/Hu.rc | 90 --------- programs/winecfg/It.rc | 126 ------------ programs/winecfg/Ja.rc | 126 ------------ programs/winecfg/Ko.rc | 126 ------------ programs/winecfg/Lt.rc | 126 ------------ programs/winecfg/Makefile.in | 2 + programs/winecfg/Nl.rc | 126 ------------ programs/winecfg/No.rc | 126 ------------ programs/winecfg/Pl.rc | 126 ------------ programs/winecfg/Pt.rc | 277 -------------------------- programs/winecfg/Ro.rc | 126 ------------ programs/winecfg/Ru.rc | 126 ------------ programs/winecfg/Si.rc | 126 ------------ programs/winecfg/Sr.rc | 126 ------------ programs/winecfg/Sv.rc | 126 ------------ programs/winecfg/Tr.rc | 90 --------- programs/winecfg/Uk.rc | 126 ------------ programs/winecfg/Zh.rc | 236 ---------------------- programs/winecfg/winecfg.rc | 130 ++++++++++++ 74 files changed, 18674 insertions(+), 3457 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a2be59a3f64bed34e4f3b…

1 0

Alexandre Julliard : oleview: Convert menu and string tables resources to po files.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: 4c934cfe698d70419a309ba46238ebe40cbb3171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c934cfe698d70419a309ba46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 13 21:45:59 2011 +0100 oleview: Convert menu and string tables resources to po files. --- configure | 2 +- configure.ac | 2 +- po/ar.po | 330 +++++++++++++++++++++++++++++++++++--- po/bg.po | 337 ++++++++++++++++++++++++++++++++++++--- po/ca.po | 324 +++++++++++++++++++++++++++++++++++--- po/cs.po | 343 +++++++++++++++++++++++++++++++++++++--- po/da.po | 348 ++++++++++++++++++++++++++++++++++++---- po/de.po | 338 ++++++++++++++++++++++++++++++++++++--- po/el.po | 330 +++++++++++++++++++++++++++++++++++--- po/en.po | 343 +++++++++++++++++++++++++++++++++++++--- po/en_US.po | 325 +++++++++++++++++++++++++++++++++++--- po/eo.po | 334 ++++++++++++++++++++++++++++++++++++--- po/es.po | 342 +++++++++++++++++++++++++++++++++++++--- po/fa.po | 330 +++++++++++++++++++++++++++++++++++--- po/fi.po | 347 +++++++++++++++++++++++++++++++++++++--- po/fr.po | 352 +++++++++++++++++++++++++++++++++++++---- po/he.po | 343 ++++++++++++++++++++++++++++++++++++---- po/hi.po | 324 +++++++++++++++++++++++++++++++++++--- po/hu.po | 353 +++++++++++++++++++++++++++++++++++++---- po/it.po | 342 ++++++++++++++++++++++++++++++++++++--- po/ja.po | 334 ++++++++++++++++++++++++++++++++++++--- po/ko.po | 336 ++++++++++++++++++++++++++++++++++++--- po/lt.po | 347 +++++++++++++++++++++++++++++++++++++--- po/ml.po | 324 +++++++++++++++++++++++++++++++++++--- po/nb_NO.po | 331 +++++++++++++++++++++++++++++++++++--- po/nl.po | 349 +++++++++++++++++++++++++++++++++++++--- po/or.po | 324 +++++++++++++++++++++++++++++++++++--- po/pa.po | 324 +++++++++++++++++++++++++++++++++++--- po/pl.po | 330 +++++++++++++++++++++++++++++++++++--- po/pt_BR.po | 339 ++++++++++++++++++++++++++++++++++++---- po/pt_PT.po | 341 ++++++++++++++++++++++++++++++++++++---- po/rm.po | 328 +++++++++++++++++++++++++++++++++++--- po/ro.po | 360 +++++++++++++++++++++++++++++++++++++----- po/ru.po | 361 ++++++++++++++++++++++++++++++++++++++---- po/sk.po | 331 +++++++++++++++++++++++++++++++++++--- po/sl.po | 361 ++++++++++++++++++++++++++++++++++++++---- po/sr_RS(a)cyrillic.po | 343 +++++++++++++++++++++++++++++++++++++--- po/sr_RS(a)latin.po | 351 ++++++++++++++++++++++++++++++++++++++--- po/sv.po | 335 ++++++++++++++++++++++++++++++++++++--- po/te.po | 324 +++++++++++++++++++++++++++++++++++--- po/th.po | 328 +++++++++++++++++++++++++++++++++++--- po/tr.po | 356 ++++++++++++++++++++++++++++++++++++++---- po/uk.po | 358 +++++++++++++++++++++++++++++++++++++----- po/wa.po | 329 +++++++++++++++++++++++++++++++++++--- po/wine.pot | 323 ++++++++++++++++++++++++++++++++++--- po/zh_CN.po | 334 +++++++++++++++++++++++++++++++++++---- po/zh_TW.po | 337 +++++++++++++++++++++++++++++++++++---- programs/oleview/Da.rc | 127 --------------- programs/oleview/De.rc | 127 --------------- programs/oleview/En.rc | 127 --------------- programs/oleview/Fr.rc | 127 --------------- programs/oleview/He.rc | 127 --------------- programs/oleview/It.rc | 127 --------------- programs/oleview/Ja.rc | 127 --------------- programs/oleview/Ko.rc | 128 --------------- programs/oleview/Lt.rc | 127 --------------- programs/oleview/Makefile.in | 4 +- programs/oleview/Nl.rc | 127 --------------- programs/oleview/No.rc | 127 --------------- programs/oleview/Pl.rc | 127 --------------- programs/oleview/Pt.rc | 268 ------------------------------- programs/oleview/Ro.rc | 127 --------------- programs/oleview/Ru.rc | 127 --------------- programs/oleview/Sv.rc | 127 --------------- programs/oleview/Uk.rc | 127 --------------- programs/oleview/Zh.rc | 254 ----------------------------- programs/oleview/oleview.rc | 160 +++++++++++++++++++ programs/oleview/rsrc.rc | 31 ---- 68 files changed, 14202 insertions(+), 3775 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c934cfe698d70419a309…

1 0

Alexandre Julliard : libwine: Fall back to normal exec if the preloader doesn't exist.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: 06f76236d1a9ee2f9136b0088cd0ba883437f5f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06f76236d1a9ee2f9136b0088… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 13 19:56:12 2011 +0100 libwine: Fall back to normal exec if the preloader doesn't exist. --- libs/wine/config.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 4a2bced..fdd4700 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -482,7 +482,6 @@ static void preloader_exec( char **argv, int use_preloader ) execv( full_name, new_argv ); free( new_argv ); free( full_name ); - return; } #endif execv( argv[0], argv );

1 0

Alexandre Julliard : dbghelp: Support pointer types of various sizes.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: cf1cd335701c099943530add958141fa75193426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf1cd335701c099943530add9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 13 20:09:44 2011 +0100 dbghelp: Support pointer types of various sizes. --- dlls/dbghelp/dbghelp_private.h | 4 +- dlls/dbghelp/dwarf.c | 6 +- dlls/dbghelp/msc.c | 116 ++++++++++++++++++---------------------- dlls/dbghelp/stabs.c | 2 +- dlls/dbghelp/type.c | 5 +- 5 files changed, 62 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf1cd335701c099943530…

1 0

Alexandre Julliard : winevdm: Try to exec dosbox if DOS is not supported natively.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: 56193df2fd4719fd6d2a0214f42a7574e7600cb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56193df2fd4719fd6d2a0214f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 13 20:41:27 2011 +0100 winevdm: Try to exec dosbox if DOS is not supported natively. --- programs/winevdm/winevdm.c | 94 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 94 insertions(+), 0 deletions(-) diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 65f4bf2..ca55d80 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -18,14 +18,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include <stdio.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" #include "wine/winbase16.h" #include "winuser.h" #include "wincon.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(winevdm); @@ -102,6 +107,93 @@ typedef struct { #include "poppack.h" /*********************************************************************** + * find_dosbox + */ +static char *find_dosbox(void) +{ + const char *envpath = getenv( "PATH" ); + struct stat st; + char *path, *p, *buffer, *dir; + + if (!envpath) return NULL; + path = HeapAlloc( GetProcessHeap(), 0, strlen(envpath) ); + buffer = HeapAlloc( GetProcessHeap(), 0, strlen(path) + sizeof("/dosbox") ); + strcpy( path, envpath ); + p = path; + while (*p) + { + while (*p == ':') p++; + if (!*p) break; + dir = p; + while (*p && *p != ':') p++; + *p++ = 0; + strcpy( buffer, dir ); + strcat( buffer, "/dosbox" ); + if (!stat( buffer, &st )) + { + HeapFree( GetProcessHeap(), 0, path ); + return buffer; + } + } + HeapFree( GetProcessHeap(), 0, buffer ); + HeapFree( GetProcessHeap(), 0, path ); + return NULL; +} + + +/*********************************************************************** + * start_dosbox + */ +static void start_dosbox( const char *appname, const char *args ) +{ + static const WCHAR cfgW[] = {'c','f','g',0}; + const char *config_dir = wine_get_config_dir(); + WCHAR path[MAX_PATH], config[MAX_PATH]; + HANDLE file; + char *p, *buffer; + int i; + int ret = 1; + DWORD written, drives = GetLogicalDrives(); + char *dosbox = find_dosbox(); + + if (!dosbox) return; + if (!GetTempPathW( MAX_PATH, path )) return; + if (!GetTempFileNameW( path, cfgW, 0, config )) return; + if (!GetCurrentDirectoryW( MAX_PATH, path )) return; + file = CreateFileW( config, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + if (file == INVALID_HANDLE_VALUE) return; + + buffer = HeapAlloc( GetProcessHeap(), 0, sizeof("[autoexec]") + + 25 * (strlen(config_dir) + sizeof("mount c /dosdevices/c:")) + + 4 * strlenW( path ) + + 6 + strlen( appname ) + strlen( args ) + 20 ); + p = buffer; + p += sprintf( p, "[autoexec]\n" ); + for (i = 0; i < 25; i++) + if (drives & (1 << i)) + p += sprintf( p, "mount %c %s/dosdevices/%c:\n", 'a' + i, config_dir, 'a' + i ); + p += sprintf( p, "%c:\ncd ", path[0] ); + p += WideCharToMultiByte( CP_UNIXCP, 0, path + 2, -1, p, 4 * strlenW(path), NULL, NULL ) - 1; + p += sprintf( p, "\n%s %s\n", appname, args ); + p += sprintf( p, "exit\n" ); + if (WriteFile( file, buffer, strlen(buffer), &written, NULL ) && written == strlen(buffer)) + { + const char *args[4]; + char *config_file = wine_get_unix_file_name( config ); + args[0] = dosbox; + args[1] = "-conf"; + args[2] = config_file; + args[3] = NULL; + ret = spawnvp( _P_WAIT, args[0], args ); + } + CloseHandle( file ); + DeleteFileW( config ); + HeapFree( GetProcessHeap(), 0, buffer ); + ExitProcess( ret ); +} + + +/*********************************************************************** * start_dos_exe */ static void start_dos_exe( LPCSTR filename, LPCSTR cmdline ) @@ -119,6 +211,8 @@ static void start_dos_exe( LPCSTR filename, LPCSTR cmdline ) } else reason = "because the DOS memory range is unavailable"; + start_dosbox( filename, cmdline ); + WINE_MESSAGE( "winevdm: Cannot start DOS application %s\n", filename ); WINE_MESSAGE( " %s.\n", reason ); WINE_MESSAGE( " Try running this application with DOSBox.\n" );

1 0

Alexandre Julliard : oleview: Build the file filter by hand instead of hardcoding it in resource strings .
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: bfd56391b6a0c844784de134b12a75d9d514d2a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfd56391b6a0c844784de134b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 13 21:01:23 2011 +0100 oleview: Build the file filter by hand instead of hardcoding it in resource strings. --- programs/oleview/Da.rc | 3 ++- programs/oleview/De.rc | 3 ++- programs/oleview/En.rc | 3 ++- programs/oleview/Fr.rc | 3 ++- programs/oleview/He.rc | 3 ++- programs/oleview/It.rc | 3 ++- programs/oleview/Ja.rc | 3 ++- programs/oleview/Ko.rc | 3 ++- programs/oleview/Lt.rc | 3 ++- programs/oleview/Nl.rc | 3 ++- programs/oleview/No.rc | 3 ++- programs/oleview/Pl.rc | 3 ++- programs/oleview/Pt.rc | 6 ++++-- programs/oleview/Ro.rc | 3 ++- programs/oleview/Ru.rc | 3 ++- programs/oleview/Sv.rc | 3 ++- programs/oleview/Uk.rc | 3 ++- programs/oleview/Zh.rc | 6 ++++-- programs/oleview/oleview.c | 10 +++++++--- programs/oleview/resource.h | 3 ++- 20 files changed, 49 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bfd56391b6a0c844784de…

1 0

Alexandre Julliard : regedit: Build the file filter by hand instead of hardcoding it in resource strings .
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: de10568061d2fd517cef9122dd1eaa569d099084 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de10568061d2fd517cef9122d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 13 21:09:47 2011 +0100 regedit: Build the file filter by hand instead of hardcoding it in resource strings. --- programs/regedit/Da.rc | 4 +++- programs/regedit/De.rc | 4 +++- programs/regedit/En.rc | 4 +++- programs/regedit/Es.rc | 4 +++- programs/regedit/Fr.rc | 4 +++- programs/regedit/He.rc | 4 +++- programs/regedit/It.rc | 4 +++- programs/regedit/Ja.rc | 4 +++- programs/regedit/Ko.rc | 4 +++- programs/regedit/Lt.rc | 4 +++- programs/regedit/Nl.rc | 4 +++- programs/regedit/No.rc | 4 +++- programs/regedit/Pl.rc | 4 +++- programs/regedit/Pt.rc | 8 ++++++-- programs/regedit/Ro.rc | 4 +++- programs/regedit/Ru.rc | 4 +++- programs/regedit/Si.rc | 4 +++- programs/regedit/Sv.rc | 4 +++- programs/regedit/Uk.rc | 4 +++- programs/regedit/Zh.rc | 8 ++++++-- programs/regedit/framewnd.c | 10 +++++++++- programs/regedit/resource.h | 4 +++- 22 files changed, 78 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de10568061d2fd517cef9…

1 0