July 2009 - Wine-commits - list.winehq.org

Paul Vriens : transl: Move the resource parsing out of the makefile parse loop.
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: tools Branch: master Commit: e0d59a8c831d4ad4e94440e6c6cbc7c76fb94965 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e0d59a8c831d4ad4e94440e6… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 21 09:13:51 2009 +0200 transl: Move the resource parsing out of the makefile parse loop. --- transl/scripts/checkmakefile.pl | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/transl/scripts/checkmakefile.pl b/transl/scripts/checkmakefile.pl index ef83bdd..0c91132 100755 --- a/transl/scripts/checkmakefile.pl +++ b/transl/scripts/checkmakefile.pl @@ -433,6 +433,7 @@ if (!@makefiles) @makefiles = split(/\s/,`find $srcdir/ -name Makefile.in -print`); } +my %checks = (); # parse the makefiles foreach my $makefile (@makefiles) { @@ -471,6 +472,15 @@ foreach my $makefile (@makefiles) close MAKEFILE; next unless @files; + $checks{$path}{defines} = $defs; + $checks{$path}{files} = [ @files ]; +} + +foreach my $path (keys %checks) +{ + my $defs = $checks{$path}{defines}; + my @files = @{$checks{$path}{files}}; + if ("$path" eq "dlls/kernel32") { mycheck("nonlocale", $path,$defs,@files);

1 0

Paul Vriens : transl: Rely on kernel32 resources to see if a language is valid.
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: tools Branch: master Commit: fc6ad2b296fb1615b245ab69caf8c6f1d6e9706b URL: http://source.winehq.org/git/tools.git/?a=commit;h=fc6ad2b296fb1615b245ab69… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jul 20 18:10:35 2009 +0200 transl: Rely on kernel32 resources to see if a language is valid. --- transl/php/lib.php | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/transl/php/lib.php b/transl/php/lib.php index ab71631..84bd179 100644 --- a/transl/php/lib.php +++ b/transl/php/lib.php @@ -62,11 +62,13 @@ function enum_locale_names() function validate_lang($id) { - global $DATAROOT; - - $lang = preg_replace("/[^0-9a-f:]/", "-", $id); - if (!file_exists("$DATAROOT/conf/$lang") || !file_exists("$DATAROOT/langs/$lang")) + global $LOCALE_NAMES; + enum_locale_names(); + + if (!isset($LOCALE_NAMES[$id])) die("Invalid lang parameter"); + + $lang = preg_replace("/[^0-9a-f:]/", "-", $id); return $lang; }

1 0

André Hentschel : transl: More valid HTML.
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: tools Branch: master Commit: 0cefbbbbea3c096563cc01853a8dd12c4cf3bbff URL: http://source.winehq.org/git/tools.git/?a=commit;h=0cefbbbbea3c096563cc0185… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jul 17 21:00:12 2009 +0200 transl: More valid HTML. --- transl/php/index.php | 5 +++-- transl/php/lib.php | 6 ++++-- transl/php/resfile.php | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/transl/php/index.php b/transl/php/index.php index a000d70..f49fade 100644 --- a/transl/php/index.php +++ b/transl/php/index.php @@ -20,6 +20,7 @@ while ($line = fgets($summary, 1024)) 'missing' => $m[4], 'errors' => $m[5]); } ?> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> <link rel="stylesheet" href="style.css" type="text/css"/> @@ -53,9 +54,9 @@ function draw_bar($tr, $err, $sum) $miss_len = 300 - $tr_len - $err_len; echo '<td class="bar">'; if ($tr_len > 0) - echo "<img src=\"img/bar0.gif\" height=\"15\" width=\"$tr_len\">"; + echo "<img src=\"img/bar0.gif\" height=\"15\" width=\"$tr_len\" alt=\"translations\">"; if ($err_len > 0) - echo "<img src=\"img/bar1.gif\" height=\"15\" width=\"$err_len\">"; + echo "<img src=\"img/bar1.gif\" height=\"15\" width=\"$err_len\" alt=\"errors\">"; // echo "<img src=\"img/bar6.gif\" height=\"15\" width=\"$miss_len\">"; echo "</td></tr>"; } diff --git a/transl/php/lib.php b/transl/php/lib.php index 400cbf7..ab71631 100644 --- a/transl/php/lib.php +++ b/transl/php/lib.php @@ -272,7 +272,8 @@ function dump_menu_lang($lang, $link = TRUE) if ($link) echo gen_lang_a($lang); echo get_lang_name($lang); - echo "</a>"; + if ($link) + echo "</a>"; } function dump_menu_resfile($lang, $resfile, $link = TRUE) @@ -280,7 +281,8 @@ function dump_menu_resfile($lang, $resfile, $link = TRUE) if ($link) echo gen_resfile_a($lang, $resfile); echo get_resfile_name($resfile); - echo "</a>"; + if ($link) + echo "</a>"; } function dump_menu_resource($lang, $resfile, $type, $id) diff --git a/transl/php/resfile.php b/transl/php/resfile.php index 337dc89..a6fa628 100644 --- a/transl/php/resfile.php +++ b/transl/php/resfile.php @@ -64,7 +64,7 @@ foreach ($msgs as $value) unset($icon); } if (isset($icon)) - echo "<img src=\"img/icon-".$icon."\" width=\"32\">"; + echo "<img src=\"img/icon-".$icon."\" width=\"32\" alt=\"".$value."\">"; $line_lang = $lang; if (preg_match("/@LANG$([0-9a-f]{3}:[0-9a-f]{2})$/", $value, $m))

1 0

Alexander Nicolaysen Sørnes : Revert " Add support for application-wide notes & how-tos"
by Alexander Nicolaysen Sørnes 21 Jul '09

21 Jul '09

Module: appdb Branch: master Commit: 0339fa60c2a467e49649e5bbc563eec81e6f9a39 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0339fa60c2a467e49649e5bb… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jul 21 16:02:05 2009 +0200 Revert "Add support for application-wide notes & how-tos" This reverts commit e546738913abf539bc6bb0f0249e60db194b5b12. --- include/application.php | 5 -- include/html.php | 17 ------- include/note.php | 107 +++++++++------------------------------------- include/version.php | 10 ++++- runonce | 1 - runonce.php | 28 ------------ tables/appdb_tables.sql | 1 - 7 files changed, 30 insertions(+), 139 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=0339fa60c2a467e49649…

1 0

Alexander Nicolaysen Sørnes : Revert " Run necessary SQL command for app how-to support"
by Alexander Nicolaysen Sørnes 21 Jul '09

21 Jul '09

Module: appdb Branch: master Commit: e7b71b52fe802307aa84ea88308db059a2d80fbb URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e7b71b52fe802307aa84ea88… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jul 21 16:01:13 2009 +0200 Revert "Run necessary SQL command for app how-to support" This reverts commit 9f97de53021a0054ede40129f4de66d959474085. --- runonce | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/runonce b/runonce index 8b13789..56a6051 100755 --- a/runonce +++ b/runonce @@ -1 +1 @@ - +1 \ No newline at end of file

1 0

Alexander Nicolaysen Sørnes : Run necessary SQL command for app how-to support
by Alexander Nicolaysen Sørnes 21 Jul '09

21 Jul '09

Module: appdb Branch: master Commit: 9f97de53021a0054ede40129f4de66d959474085 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9f97de53021a0054ede40129… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jul 21 15:54:29 2009 +0200 Run necessary SQL command for app how-to support --- runonce | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/runonce b/runonce index 56a6051..8b13789 100755 --- a/runonce +++ b/runonce @@ -1 +1 @@ -1 \ No newline at end of file +

1 0

Alexander Nicolaysen Sørnes : Add support for application-wide notes & how-tos
by Alexander Nicolaysen Sørnes 21 Jul '09

21 Jul '09

Module: appdb Branch: master Commit: e546738913abf539bc6bb0f0249e60db194b5b12 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e546738913abf539bc6bb0f0… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.site> Date: Tue Jul 21 03:09:48 2009 +0200 Add support for application-wide notes & how-tos --- include/application.php | 5 ++ include/html.php | 17 +++++++ include/note.php | 107 +++++++++++++++++++++++++++++++++++++--------- include/version.php | 10 +---- runonce | 1 + runonce.php | 28 ++++++++++++ tables/appdb_tables.sql | 1 + 7 files changed, 139 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=e546738913abf539bc6b…

1 0

Alexander Nicolaysen Sørnes : AppDB FAQ: Improve text for submitting new applications
by Alexander Nicolaysen Sørnes 20 Jul '09

20 Jul '09

Module: appdb Branch: master Commit: 9ed113f6dc22bb6cbb03c7b97f91e8de7e69b104 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9ed113f6dc22bb6cbb03c7b9… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Jul 20 19:19:36 2009 +0200 AppDB FAQ: Improve text for submitting new applications --- help/appdb_faq.help | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/help/appdb_faq.help b/help/appdb_faq.help index 7cdd832..bc66693 100644 --- a/help/appdb_faq.help +++ b/help/appdb_faq.help @@ -51,12 +51,7 @@ work in Wine, and also what are the tricks to get it working best. Q: How does a new application get added to the database? <blockquote> -A: In order to ensure consistency, only authorized application database -maintainers are permitted to add new applications to the database. -Any application database can comment on a particular application. -Anyone can request that an application be added to the database, -but the application is not actually added until after it has been -reviewed by a maintainer or administrator. +A: Any registered user can submit an application. Use the <a href="../objectManager.php?sClass=application_queue&sTitle=Submit+Application&sAction=add">Submit App</a> link in the AppDB sidebar to add an entry; it will be processed by an admin before becoming visible to all users. You can make changes to your queued entries by visiting the <a href="../queueditems.php">Your Queued Items</a> page. </blockquote> Q: How can I submit screenshots?

1 0

Rein Klazes : user32: Ignore the MFT_BITMAP flag when testing menu items for 'magic' bitmap handles.
by Alexandre Julliard 20 Jul '09

20 Jul '09

Module: wine Branch: master Commit: c2ada6409716f06f1953f4be3ba1f862d55df78c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ada6409716f06f1953f4be3… Author: Rein Klazes <wijn(a)online.nl> Date: Sun Jul 19 09:12:38 2009 +0200 user32: Ignore the MFT_BITMAP flag when testing menu items for 'magic' bitmap handles. --- dlls/user32/menu.c | 3 +- dlls/user32/tests/menu.c | 92 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 86 insertions(+), 9 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index ab473ea..e35372b 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -2164,8 +2164,7 @@ static MENUITEM *MENU_InsertItem( HMENU hMenu, UINT pos, UINT flags ) * Note: XP treats only bitmap handles 1 - 6 as "magic" ones * regardless of their id. */ - while (pos > 0 && (menu->items[pos - 1].fType & MFT_BITMAP) && - (INT_PTR)menu->items[pos - 1].hbmpItem >= (INT_PTR)HBMMENU_SYSTEM && + while (pos > 0 && (INT_PTR)menu->items[pos - 1].hbmpItem >= (INT_PTR)HBMMENU_SYSTEM && (INT_PTR)menu->items[pos - 1].hbmpItem <= (INT_PTR)HBMMENU_MBAR_CLOSE_D) pos--; diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 868fd9a..878decf 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -2451,6 +2451,48 @@ static HMENU create_menu_from_data(const struct menu_data *item, INT item_count) return hmenu; } +/* use InsertMenuItem: does not set the MFT_BITMAP flag, + * and does not accept non-magic bitmaps with invalid + * bitmap handles */ +static HMENU create_menuitem_from_data(const struct menu_data *item, INT item_count) +{ + HMENU hmenu; + INT i; + BOOL ret; + MENUITEMINFO mii = { sizeof( MENUITEMINFO)}; + + hmenu = CreateMenu(); + assert(hmenu != 0); + + for (i = 0; i < item_count; i++) + { + SetLastError(0xdeadbeef); + + mii.fMask = MIIM_FTYPE | MIIM_ID | MIIM_STATE; + mii.fType = 0; + if( item[i].type & MFT_BITMAP) + { + mii.fMask |= MIIM_BITMAP; + mii.hbmpItem = (HBITMAP)item[i].str; + } + else if( item[i].type & MFT_SEPARATOR) + mii.fType = MFT_SEPARATOR; + else + { + mii.fMask |= MIIM_STRING; + mii.dwTypeData = (LPSTR)item[i].str; + mii.cch = strlen( item[i].str); + } + mii.fState = 0; + if( item[i].type & MF_HELP) mii.fType |= MF_HELP; + mii.wID = item[i].id; + ret = InsertMenuItem( hmenu, -1, TRUE, &mii); + ok(ret, "%d: InsertMenuItem(%04x, %04x, %p) error %u\n", + i, item[i].type, item[i].id, item[i].str, GetLastError()); + } + return hmenu; +} + static void compare_menu_data(HMENU hmenu, const struct menu_data *item, INT item_count) { INT count, i; @@ -2479,14 +2521,12 @@ static void compare_menu_data(HMENU hmenu, const struct menu_data *item, INT ite "%u: expected fType %04x, got %04x\n", i, item[i].type, mii.fType); ok(mii.wID == item[i].id, "%u: expected wID %04x, got %04x\n", i, item[i].id, mii.wID); - if (item[i].type & (MF_BITMAP | MF_SEPARATOR)) - { + if (mii.hbmpItem || !item[i].str) /* For some reason Windows sets high word to not 0 for * not "magic" ids. */ ok(LOWORD(mii.hbmpItem) == LOWORD(item[i].str), "%u: expected hbmpItem %p, got %p\n", i, item[i].str, mii.hbmpItem); - } else { ok(mii.cch == strlen(item[i].str), @@ -2499,6 +2539,7 @@ static void compare_menu_data(HMENU hmenu, const struct menu_data *item, INT ite static void test_InsertMenu(void) { + HBITMAP hbm = CreateBitmap(1,1,1,1,NULL); /* Note: XP treats only bitmap handles 1 - 6 as "magic" ones * regardless of their id. */ @@ -2514,16 +2555,28 @@ static void test_InsertMenu(void) { MF_STRING|MF_HELP, 2, "Help" }, { MF_BITMAP|MF_HELP, SC_CLOSE, MAKEINTRESOURCE(1) } }; - static const struct menu_data in2[] = + static const struct menu_data out1a[] = + { + { MF_STRING, 1, "File" }, + { MF_STRING|MF_HELP, 2, "Help" }, + { MF_HELP, SC_CLOSE, MAKEINTRESOURCE(1) } + }; + const struct menu_data in2[] = { { MF_STRING, 1, "File" }, - { MF_BITMAP|MF_HELP, SC_CLOSE, MAKEINTRESOURCE(100) }, + { MF_BITMAP|MF_HELP, SC_CLOSE, (char*)hbm }, { MF_STRING|MF_HELP, 2, "Help" } }; - static const struct menu_data out2[] = + const struct menu_data out2[] = { { MF_STRING, 1, "File" }, - { MF_BITMAP|MF_HELP, SC_CLOSE, MAKEINTRESOURCE(100) }, + { MF_BITMAP|MF_HELP, SC_CLOSE, (char*)hbm }, + { MF_STRING|MF_HELP, 2, "Help" } + }; + const struct menu_data out2a[] = + { + { MF_STRING, 1, "File" }, + { MF_HELP, SC_CLOSE, (char*)hbm }, { MF_STRING|MF_HELP, 2, "Help" } }; static const struct menu_data in3[] = @@ -2550,9 +2603,16 @@ static void test_InsertMenu(void) { MF_STRING|MF_HELP, 2, "Help" }, { MF_BITMAP|MF_HELP, 1, MAKEINTRESOURCE(1) } }; + static const struct menu_data out4a[] = + { + { MF_STRING, 1, "File" }, + { MF_STRING|MF_HELP, 2, "Help" }, + { MF_HELP, 1, MAKEINTRESOURCE(1) } + }; HMENU hmenu; #define create_menu(a) create_menu_from_data((a), sizeof(a)/sizeof((a)[0])) +#define create_menuitem(a) create_menuitem_from_data((a), sizeof(a)/sizeof((a)[0])) #define compare_menu(h, a) compare_menu_data((h), (a), sizeof(a)/sizeof((a)[0])) hmenu = create_menu(in1); @@ -2571,7 +2631,25 @@ static void test_InsertMenu(void) compare_menu(hmenu, out4); DestroyMenu(hmenu); + /* now using InsertMenuItemInfo */ + hmenu = create_menuitem(in1); + compare_menu(hmenu, out1a); + DestroyMenu(hmenu); + + hmenu = create_menuitem(in2); + compare_menu(hmenu, out2a); + DestroyMenu(hmenu); + + hmenu = create_menuitem(in3); + compare_menu(hmenu, out3); + DestroyMenu(hmenu); + + hmenu = create_menuitem(in4); + compare_menu(hmenu, out4a); + DestroyMenu(hmenu); + #undef create_menu +#undef create_menuitem #undef compare_menu }

1 0

Stefan Leichter : advapi32: Fix parameter types of CreateServiceA/ W in spec file.
by Alexandre Julliard 20 Jul '09

20 Jul '09

Module: wine Branch: master Commit: 6ee1b0607305faf384f4499ab6670ea34031f42b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee1b0607305faf384f4499ab… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sat Jul 18 09:49:05 2009 +0200 advapi32: Fix parameter types of CreateServiceA/W in spec file. --- dlls/advapi32/advapi32.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index d641efd..e9168aa 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -98,8 +98,8 @@ @ stdcall CreateProcessAsUserW(long str str ptr ptr long long ptr str ptr ptr) @ stdcall CreateProcessWithLogonW(wstr wstr wstr long wstr wstr long ptr wstr ptr ptr) @ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr) -@ stdcall CreateServiceA(long ptr ptr long long long long ptr ptr ptr ptr ptr ptr) -@ stdcall CreateServiceW (long ptr ptr long long long long ptr ptr ptr ptr ptr ptr) +@ stdcall CreateServiceA(long str str long long long long str str ptr str str str) +@ stdcall CreateServiceW(long wstr wstr long long long long wstr wstr ptr wstr wstr wstr) # @ stub CreateTraceInstanceId @ stdcall CreateWellKnownSid(long ptr ptr ptr) @ stdcall CredDeleteA(str long long)

1 0