November 2007 - Wine-Commits

Jonathan Ernst : shell32: Updated French translation.
by Alexandre Julliard Nov. 14, 2007

Nov. 14, 2007

Module: wine Branch: master Commit: 4ec05f831f2e0d2915cdcaca7c17cdcd6ff76377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ec05f831f2e0d2915cdcaca7… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Tue Nov 13 13:53:30 2007 +0100 shell32: Updated French translation. --- dlls/shell32/shell32_Fr.rc | 51 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 41 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shell32_Fr.rc b/dlls/shell32/shell32_Fr.rc index 246045c..9d7e7cd 100644 --- a/dlls/shell32/shell32_Fr.rc +++ b/dlls/shell32/shell32_Fr.rc @@ -3,7 +3,7 @@ * French language support * * Copyright 1998 Juergen Schmied - * Copyright 2006 Jonathan Ernst + * Copyright 2006-2007 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -95,7 +95,7 @@ END SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK -CAPTION "Parcourir" +CAPTION "Parcourir les dossiers" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP @@ -108,6 +108,37 @@ FONT 8, "MS Shell Dlg" 4, 40, 180, 120 } +SHNEWBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 218, 196 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "Parcourir les dossiers" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDD_TITLE, 10, 8, 198, 24 + LTEXT "", IDD_STATUS, 10, 25, 198, 12 + LTEXT "Dossier�:", IDD_FOLDER, 10, 156, 40, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + WS_BORDER | WS_TABSTOP, + 12, 38, 194, 105 + EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Cr�er un nouveau dossier", IDD_MAKENEWFOLDER, 12, 174, 70, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annuler", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP +} + +SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Message" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "&Oui", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Oui pour &tous", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Non", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Annuler", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP + ICON "", IDD_ICON, 10, 10, 16, 16 + LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 +} + SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "� propos de %s" @@ -118,7 +149,7 @@ FONT 10, "MS Shell Dlg" ICON "", 1088, 10, 10, 14, 16 LTEXT "", 100, 30, 10, 137, 10 LTEXT "", 101, 30, 22, 137, 10 - LTEXT "Wine est une r�alisation de :", 98, 8, 55, 137, 10 + LTEXT "Wine est une r�alisation de�:", 98, 8, 55, 137, 10 } SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -128,7 +159,7 @@ FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE LTEXT "Entrez le nom d'un programme, d'un dossier, d'un document ou d'une ressource Internet, et Wine l'ouvrira pour vous.", 12289, 36, 11, 182, 18 - LTEXT "&Ouvrir :", 12305, 7, 39, 24, 10 + LTEXT "&Ouvrir�:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Annuler", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP @@ -165,7 +196,7 @@ STRINGTABLE DISCARDABLE IDS_SELECT "S�lectionner" IDS_OPEN "Ouvrir" - IDS_CREATEFOLDER_DENIED "Impossible de cr�er le nouveau dossier : permission refus�e." + IDS_CREATEFOLDER_DENIED "Impossible de cr�er le nouveau dossier�: permission refus�e." IDS_CREATEFOLDER_CAPTION "Erreur lors de la cr�ation du nouveau dossier" IDS_DELETEITEM_CAPTION "Confirmer la suppression du fichier" IDS_DELETEFOLDER_CAPTION "Confirmer la suppression du dossier" @@ -176,12 +207,12 @@ STRINGTABLE DISCARDABLE IDS_TRASHFOLDER_TEXT "�tes-vous s�r de vouloir mettre ��%1�� et tout ce qu'il contient dans la corbeille�?" IDS_TRASHMULTIPLE_TEXT "�tes-vous s�r de vouloir mettre ces %1 �l�ments dans la corbeille�?" IDS_CANTTRASH_TEXT "L'�l�ment ��%1�� ne peut pas �tre mis dans la corbeille. Souhaitez-vous le supprimer � la place�?" - IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" + IDS_OVERWRITEFILE_TEXT "Ce dossier contient d�j� un fichier nomm� ��%1��.\n\nVoulez-vous le remplacer�?" IDS_OVERWRITEFILE_CAPTION "Confirmer l'�crasement du fichier" - IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ - "If the files in the destination folder have the same names as files in the\n"\ - "selected folder they will be replaced. Do you still want to move or copy\n"\ - "the folder?" + IDS_OVERWRITEFOLDER_TEXT "Ce dossier contient d�j� un dossier nomm� ��%1��.\n\n"\ + "Si des fichiers dans le dossier de destination ont le m�me nom que ceux dans le dossier\n"\ + "s�lectionn�, ils seront remplac�s. Voulez-vous quand m�me d�placer ou copier\n"\ + "le dossier�?" /* message box strings */ IDS_RESTART_TITLE "Red�marrer"

1 0

Dmitry Timoshkov : server: Make timer id allocation algorithm conform to the Windows one.
by Alexandre Julliard Nov. 14, 2007

Nov. 14, 2007

Module: wine Branch: master Commit: b4227d7207424823b787feddc3a7fba095594974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4227d7207424823b787feddc… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Nov 13 20:41:01 2007 +0800 server: Make timer id allocation algorithm conform to the Windows one. --- server/queue.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/queue.c b/server/queue.c index 51315fd..f6d6ca4 100644 --- a/server/queue.c +++ b/server/queue.c @@ -269,7 +269,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ queue->paint_count = 0; queue->quit_message = 0; queue->recv_result = NULL; - queue->next_timer_id = 1; + queue->next_timer_id = 0x7fff; queue->timeout = NULL; queue->input = (struct thread_input *)grab_object( input ); queue->hooks = NULL; @@ -1950,7 +1950,7 @@ DECL_HANDLER(set_win_timer) do { id = queue->next_timer_id; - if (++queue->next_timer_id >= 0x10000) queue->next_timer_id = 1; + if (--queue->next_timer_id <= 0x100) queue->next_timer_id = 0x7fff; } while (find_timer( queue, 0, req->msg, id )); }

1 0

Alexandre Julliard : winedbg: Print a backtrace in --auto mode.
by Alexandre Julliard Nov. 14, 2007

Nov. 14, 2007

Module: wine Branch: master Commit: c77bc840de65c916a082a4fda8c34693f5d375b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c77bc840de65c916a082a4fda… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 13 21:35:30 2007 +0100 winedbg: Print a backtrace in --auto mode. --- programs/winedbg/tgt_active.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 42bc9d6..f75f744 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -893,7 +893,7 @@ enum dbg_start dbg_active_auto(int argc, char* argv[]) if (ds != start_ok) return ds; hFile = parser_generate_command_file("echo Modules:", "info share", "echo Threads:", "info threads", - "detach", NULL); + "backtrace", "detach", NULL); } else if (!strcmp(argv[0], "--minidump")) {

1 0

Alexandre Julliard : shell32: Don' t wait for the command to terminate in ShellLink_InvokeCommand.
by Alexandre Julliard Nov. 14, 2007

Nov. 14, 2007

Module: wine Branch: master Commit: db500aad2d65497e9a8e41d96345de7469dc7c15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db500aad2d65497e9a8e41d96… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 13 21:34:52 2007 +0100 shell32: Don't wait for the command to terminate in ShellLink_InvokeCommand. --- dlls/shell32/shelllink.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index a3a850e..d19d726 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -2573,14 +2573,7 @@ ShellLink_InvokeCommand( IContextMenu* iface, LPCMINVOKECOMMANDINFO lpici ) sei.lpVerb = szOpen; if( ShellExecuteExW( &sei ) ) - { - if ( sei.hProcess ) - { - WaitForSingleObject( sei.hProcess, 10000 ); - CloseHandle( sei.hProcess ); - } r = S_OK; - } else r = E_FAIL;

1 0

Alexandre Julliard : shell32: Pass some of the ShellExecute flags through InvokeCommand.
by Alexandre Julliard Nov. 14, 2007

Nov. 14, 2007

Module: wine Branch: master Commit: 14eb294a484989daedf60ff598f9593f12416c8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=14eb294a484989daedf60ff59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 13 21:34:28 2007 +0100 shell32: Pass some of the ShellExecute flags through InvokeCommand. --- dlls/shell32/shelllink.c | 2 +- dlls/shell32/shlexec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 4268fe9..a3a850e 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -2564,7 +2564,7 @@ ShellLink_InvokeCommand( IContextMenu* iface, LPCMINVOKECOMMANDINFO lpici ) memset( &sei, 0, sizeof sei ); sei.cbSize = sizeof sei; - sei.fMask = SEE_MASK_UNICODE | SEE_MASK_NOCLOSEPROCESS; + sei.fMask = SEE_MASK_UNICODE | (lpici->fMask & (SEE_MASK_NOASYNC|SEE_MASK_ASYNCOK|SEE_MASK_FLAG_NO_UI)); sei.lpFile = path; sei.nShow = This->iShowCmd; sei.lpIDList = This->pPidl; diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 743d495..9800043 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1172,7 +1172,7 @@ static HRESULT shellex_run_context_menu_default( IShellExtInit *obj, memset( &ici, 0, sizeof ici ); ici.cbSize = sizeof ici; - ici.fMask = CMIC_MASK_UNICODE; + ici.fMask = CMIC_MASK_UNICODE | (sei->fMask & (SEE_MASK_NOASYNC|SEE_MASK_ASYNCOK|SEE_MASK_FLAG_NO_UI)); ici.nShow = sei->nShow; ici.lpVerb = MAKEINTRESOURCEA( def ); ici.hwnd = sei->hwnd;

1 0

Alexandre Julliard : include: Added definition for SEE_MASK_NOASYNC.
by Alexandre Julliard Nov. 14, 2007

Nov. 14, 2007

Module: wine Branch: master Commit: 74572e43bec5110423da4362603389ebc0be3884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74572e43bec5110423da43626… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 13 21:33:37 2007 +0100 include: Added definition for SEE_MASK_NOASYNC. --- include/shellapi.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/shellapi.h b/include/shellapi.h index 46083e7..5b77e53 100644 --- a/include/shellapi.h +++ b/include/shellapi.h @@ -265,7 +265,8 @@ HINSTANCE WINAPI ShellExecuteW(HWND,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,INT); #define SEE_MASK_HOTKEY 0x00000020 #define SEE_MASK_NOCLOSEPROCESS 0x00000040 #define SEE_MASK_CONNECTNETDRV 0x00000080 -#define SEE_MASK_FLAG_DDEWAIT 0x00000100 +#define SEE_MASK_NOASYNC 0x00000100 +#define SEE_MASK_FLAG_DDEWAIT SEE_MASK_NOASYNC #define SEE_MASK_DOENVSUBST 0x00000200 #define SEE_MASK_FLAG_NO_UI 0x00000400 #define SEE_MASK_UNICODE 0x00004000

1 0

Alexander Nicolaysen Sørnes : Allwoing becoming a monitor when submitting versiosn
by Chris Morgan Nov. 14, 2007

Nov. 14, 2007

Module: appdb Branch: master Commit: 480a08fecd36c1e1e2b1e166e68452c15bdc5b1a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=480a08fecd36c1e1e2b1e166… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Nov 13 21:09:38 2007 +0100 Allwoing becoming a monitor when submitting versiosn --- include/application.php | 1 + include/version.php | 30 ++++++++++++++++++++---------- include/version_queue.php | 33 ++++++++++++++++++++++----------- 3 files changed, 43 insertions(+), 21 deletions(-) diff --git a/include/application.php b/include/application.php index 7f46efc..79fc182 100644 --- a/include/application.php +++ b/include/application.php @@ -20,6 +20,7 @@ define("GARBAGE_RATING", "Garbage"); define("MAINTAINER_REQUEST", 1); define("SUPERMAINTAINER_REQUEST", 2); +define('MONITOR_REQUEST', 3); /** * Application class for handling applications. diff --git a/include/version.php b/include/version.php index 371a947..1caeaa4 100644 --- a/include/version.php +++ b/include/version.php @@ -42,7 +42,7 @@ class version { version its votes should be moved to. */ var $iMaintainerRequest; /* Temporary variable for version submisson. Indicates whether the user wants to become a - maintainer of the version being submitted. + maintainer or monitor of the version being submitted. Value denotes type of request. */ /** @@ -115,16 +115,26 @@ class version { $this->SendNotificationMail(); /* Submit maintainer request if asked to */ - if($this->iMaintainerRequest == MAINTAINER_REQUEST) + switch($this->iMaintainerRequest) { - $oMaintainer = new Maintainer(); - $oMaintainer->iAppId = $this->iAppId; - $oMaintainer->iVersionId = $this->iVersionId; - $oMaintainer->iUserId = $_SESSION['current']->iUserId; - $oMaintainer->sMaintainReason = "This user submitted the version;". - "auto-queued."; - $oMaintainer->bSuperMaintainer = 0; - $oMaintainer->create(); + case MAINTAINER_REQUEST; + $oMaintainer = new Maintainer(); + $oMaintainer->iAppId = $this->iAppId; + $oMaintainer->iVersionId = $this->iVersionId; + $oMaintainer->iUserId = $_SESSION['current']->iUserId; + $oMaintainer->sMaintainReason = "This user submitted the version;". + "auto-queued."; + $oMaintainer->bSuperMaintainer = 0; + $oMaintainer->create(); + break; + + case MONITOR_REQUEST: + $oMonitor = new Monitor(); + $oMonitor->iVersionId = $this->iVersionId; + $oMonitor->iUserId = $_SESSION['current']->iUserId; + $oMonitor->iAppId = $this->iAppId; + $oMonitor->create(); + break; } return true; } diff --git a/include/version_queue.php b/include/version_queue.php index 725f8b0..1e8799a 100644 --- a/include/version_queue.php +++ b/include/version_queue.php @@ -133,20 +133,31 @@ class version_queue if(!$this->oVersion->iVersionId && $this->oVersion->iAppId && !$_SESSION['current']->isSuperMaintainer($this->oVersion->iAppId)) { - echo html_frame_start("Become Maintainer", "90%"); + echo html_frame_start("Become Maintainer or Monitor Changes", "90%"); echo "<div style='padding:5px;' class='color0'>\n"; - echo "<table width='100%' cellpadding=0 cellspacing=0>"; + $oTable = new Table(); if($this->oVersion->iMaintainerRequest == MAINTAINER_REQUEST) - $sRequestMaintainerChecked = 'checked="checked"'; - echo html_tr(array( - array("<b>Become maintainer?</b>", ""), - array( - "<input type=\"checkbox\" $sRequestMaintainerChecked". + $sRequestMaintainerChecked = 'checked="checked" '; + else + $sRequestMaintainerChecked = ''; + if($this->oVersion->iMaintainerRequest == MONITOR_REQUEST) + $sRequestMonitorChecked = 'checked="checked"' ; + else + $sRequestMonitorChecked = ''; + + $oTableRow = new TableRow(); + $oTableRow->AddTextCell(' '); + $oTableRow->AddTextCell("<input type=\"radio\" $sRequestMaintainerChecked". "name=\"iMaintainerRequest\" value=\"".MAINTAINER_REQUEST."\" /> ". - "Check this box to request being a maintainer for this version", - "") - )); - echo "</table>"; + "Request being a maintainer for this version, allowing you to edit it later"); + $oTable->AddRow($oTableRow); + $oTableRow = new TableRow(); + $oTableRow->AddTextCell(' '); + $oTableRow->AddTextCell("<input type=\"radio\" $sRequestMonitorChecked". + "name=\"iMaintainerRequest\" value=\"".MONITOR_REQUEST."\" /> ". + "Monitor changes to this version, also after it has been accepted"); + $oTable->AddRow($oTableRow); + echo $oTable->GetString(); echo "</div\n"; echo html_frame_end(); }

1 0

Alexander Nicolaysen Sørnes : application: Allow sorting by vendor name
by Chris Morgan Nov. 14, 2007

Nov. 14, 2007

Module: appdb Branch: master Commit: 43af0708c9347e8e40911ff1696d128b5b7f784a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=43af0708c9347e8e40911ff1… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Nov 13 19:51:23 2007 +0100 application: Allow sorting by vendor name --- include/application.php | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/application.php b/include/application.php index 9d723dd..7f46efc 100644 --- a/include/application.php +++ b/include/application.php @@ -899,7 +899,9 @@ class Application { $iRows = maintainer::objectGetEntriesCount($bQueued, $bRejected); } - $sQuery = "SELECT * FROM appFamily WHERE + $sQuery = "SELECT appFamily.*, vendor.vendorName AS vendorName FROM appFamily, user_list, vendor WHERE + appFamily.vendorId = vendor.vendorId + AND appFamily.queued = '?'"; $sQueued = objectManager::getQueueString($bQueued, $bRejected); @@ -943,16 +945,16 @@ class Application { public static function objectGetSortableFields() { - return array('submitTime', 'appName', 'appId'); + return array('submitTime', 'appName', 'appId', 'userName', 'vendorName'); } public static function objectGetHeader() { $oTableRow = new TableRowSortable(); - $oTableRow->AddSortableTextCell("Submission Date", "submitTime"); - $oTableRow->AddTextCell("Submitter"); - $oTableRow->AddTextCell("Vendor"); - $oTableRow->AddSortableTextCell("Application", "appName"); + $oTableRow->AddSortableTextCell('Submission Date', 'submitTime'); + $oTableRow->AddTextCell('Submitter'); + $oTableRow->AddSortableTextCell('Vendor', 'vendorName'); + $oTableRow->AddSortableTextCell('Application', 'appName'); return $oTableRow; }

1 0

EA Durbin : kernel32: Add stub for GetConsoleKeyboardLayoutNameW.
by Alexandre Julliard Nov. 13, 2007

Nov. 13, 2007

Module: wine Branch: master Commit: 661755b69f1fe2261b1e27199cfd45c44605a803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=661755b69f1fe2261b1e27199… Author: EA Durbin <ead1234(a)hotmail.com> Date: Sun Nov 11 12:30:38 2007 -0600 kernel32: Add stub for GetConsoleKeyboardLayoutNameW. --- dlls/kernel32/console.c | 9 +++++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index adbce45..ec9c15c 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -974,6 +974,15 @@ BOOL WINAPI GetConsoleKeyboardLayoutNameA(LPSTR layoutName) } /*********************************************************************** + * GetConsoleKeyboardLayoutNameW (KERNEL32.@) + */ +BOOL WINAPI GetConsoleKeyboardLayoutNameW(LPWSTR layoutName) +{ + FIXME( "stub %p\n", layoutName); + return TRUE; +} + +/*********************************************************************** * GetConsoleInputExeNameA (KERNEL32.@) */ DWORD WINAPI GetConsoleInputExeNameA(DWORD BufferLength, LPSTR lpBuffer) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 07afbe7..c9912fa 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -461,7 +461,7 @@ @ stdcall GetConsoleInputExeNameW(long ptr) @ stdcall GetConsoleInputWaitHandle() @ stdcall GetConsoleKeyboardLayoutNameA(ptr) -@ stub GetConsoleKeyboardLayoutNameW +@ stdcall GetConsoleKeyboardLayoutNameW(ptr) @ stdcall GetConsoleMode(long ptr) @ stub GetConsoleNlsMode @ stdcall GetConsoleOutputCP()

1 0

EA Durbin : kernel32: Add stub implementation of GetConsoleInputExeNameW.
by Alexandre Julliard Nov. 13, 2007

Nov. 13, 2007

Module: wine Branch: master Commit: 6e6a2a58566e1bbb9287f3fc6d34c1183accae54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e6a2a58566e1bbb9287f3fc6… Author: EA Durbin <ead1234(a)hotmail.com> Date: Sun Nov 11 12:26:41 2007 -0600 kernel32: Add stub implementation of GetConsoleInputExeNameW. --- dlls/kernel32/console.c | 10 ++++++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index d8b46d1..f77de14 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -974,6 +974,16 @@ DWORD WINAPI GetConsoleInputExeNameA(DWORD BufferLength, LPSTR lpBuffer) } /*********************************************************************** + * GetConsoleInputExeNameW (KERNEL32.@) + */ +DWORD WINAPI GetConsoleInputExeNameW(DWORD BufferLength, LPWSTR lpBuffer) +{ + DWORD ret = 0; + FIXME( "stub %u %p\n", BufferLength, lpBuffer); + return ret; +} + +/*********************************************************************** * GetConsoleTitleA (KERNEL32.@) * * See GetConsoleTitleW. diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f996988..c6b0d9c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -458,7 +458,7 @@ @ stub GetConsoleFontSize @ stub GetConsoleHardwareState @ stdcall GetConsoleInputExeNameA(long ptr) -@ stub GetConsoleInputExeNameW +@ stdcall GetConsoleInputExeNameW(long ptr) @ stdcall GetConsoleInputWaitHandle() @ stub GetConsoleKeyboardLayoutNameA @ stub GetConsoleKeyboardLayoutNameW

1 0