winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
October 2006
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
1032 discussions
Start a n
N
ew thread
Alexandre Julliard : explorer: Split the device management to a separate file to make it usable independently of HAL support .
by Alexandre Julliard
03 Oct '06
03 Oct '06
Module: wine Branch: master Commit: dde935d1111d6f87c452ef91cc9283a6d1bc296c URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=dde935d1111d6f87c452ef9…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 3 12:40:27 2006 +0200 explorer: Split the device management to a separate file to make it usable independently of HAL support. --- programs/explorer/Makefile.in | 1 programs/explorer/device.c | 250 ++++++++++++++++++++++++++++++++++ programs/explorer/explorer_private.h | 4 + programs/explorer/hal.c | 211 ----------------------------- 4 files changed, 257 insertions(+), 209 deletions(-) Diff:
http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=dde935d1111d6f87c45…
1
0
0
0
Eric Pouech : winedbg: Fixed the auto mode.
by Alexandre Julliard
03 Oct '06
03 Oct '06
Module: wine Branch: master Commit: 28dc896b284ed61b513b0c35cfb15e225365d6ed URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=28dc896b284ed61b513b0c3…
Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Oct 2 22:30:11 2006 +0200 winedbg: Fixed the auto mode. --- programs/winedbg/info.c | 2 +- programs/winedbg/tgt_active.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index d2042bf..c5b7b1e 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -204,7 +204,7 @@ void info_win32_module(DWORD base) int i, j, num_printed = 0; DWORD opt; - if (!dbg_curr_process || !dbg_curr_thread) + if (!dbg_curr_process) { dbg_printf("Cannot get info on module while no process is loaded\n"); return; diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 8dbca97..d87f4c2 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -927,6 +927,9 @@ enum dbg_start dbg_active_auto(int argc, else return start_error_parse; if (hFile == INVALID_HANDLE_VALUE) return start_error_parse; + if (dbg_curr_process->active_debuggee) + dbg_active_wait_for_first_exception(); + dbg_interactiveP = TRUE; parser_handle(hFile);
1
0
0
0
Alexandre Julliard : ws2_32: Avoid retrieving the fd twice in WSAIoctl.
by Alexandre Julliard
03 Oct '06
03 Oct '06
Module: wine Branch: master Commit: 85230942e8fef89a964d373ea9bd0c8c1bfafa7e URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=85230942e8fef89a964d373…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 3 11:46:11 2006 +0200 ws2_32: Avoid retrieving the fd twice in WSAIoctl. --- dlls/ws2_32/socket.c | 35 +++++++++-------------------------- 1 files changed, 9 insertions(+), 26 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 37a1de7..59b50b9 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2113,11 +2113,6 @@ INT WINAPI WSAIoctl(SOCKET s, LPWSAOVERLAPPED lpOverlapped, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) { - int fd = get_sock_fd( s, 0, NULL ); - INT ret; - - if (fd == -1) return SOCKET_ERROR; - TRACE("%d, 0x%08lx, %p, %ld, %p, %ld, %p, %p, %p\n", s, dwIoControlCode, lpvInBuffer, cbInBuffer, lpbOutBuffer, cbOutBuffer, lpcbBytesReturned, lpOverlapped, lpCompletionRoutine); @@ -2126,50 +2121,40 @@ INT WINAPI WSAIoctl(SOCKET s, { case WS_FIONBIO: if (cbInBuffer != sizeof(u_long)) { - release_sock_fd( s, fd ); WSASetLastError(WSAEFAULT); return SOCKET_ERROR; } - ret = WS_ioctlsocket( s, WS_FIONBIO, lpvInBuffer); - if (ret == SOCKET_ERROR) { - release_sock_fd( s, fd ); - /* last error already set by WS_ioctlsocket */ - return ret; - } - break; + return WS_ioctlsocket( s, WS_FIONBIO, lpvInBuffer); + case WS_FIONREAD: if (cbOutBuffer != sizeof(u_long)) { - release_sock_fd( s, fd ); WSASetLastError(WSAEFAULT); return SOCKET_ERROR; } - ret = WS_ioctlsocket( s, WS_FIONREAD, lpbOutBuffer); - if (ret == SOCKET_ERROR) { - release_sock_fd( s, fd ); - /* last error already set by WS_ioctlsocket */ - return ret; - } - break; + return WS_ioctlsocket( s, WS_FIONREAD, lpbOutBuffer); + case SIO_GET_INTERFACE_LIST: { INTERFACE_INFO* intArray = (INTERFACE_INFO*)lpbOutBuffer; DWORD size, numInt, apiReturn; + int fd; TRACE("-> SIO_GET_INTERFACE_LIST request\n"); if (!lpbOutBuffer) { - release_sock_fd( s, fd ); WSASetLastError(WSAEFAULT); return SOCKET_ERROR; } if (!lpcbBytesReturned) { - release_sock_fd( s, fd ); WSASetLastError(WSAEFAULT); return SOCKET_ERROR; } + fd = get_sock_fd( s, 0, NULL ); + if (fd == -1) return SOCKET_ERROR; + apiReturn = GetAdaptersInfo(NULL, &size); if (apiReturn == ERROR_NO_DATA) { @@ -2273,6 +2258,7 @@ #endif } /* Calculate the size of the array being returned */ *lpcbBytesReturned = sizeof(INTERFACE_INFO) * numInt; + release_sock_fd( s, fd ); break; } @@ -2288,13 +2274,10 @@ #endif default: FIXME("unsupported WS_IOCTL cmd (%08lx)\n", dwIoControlCode); - release_sock_fd( s, fd ); WSASetLastError(WSAEOPNOTSUPP); return SOCKET_ERROR; } - /* Function executed with no errors */ - release_sock_fd( s, fd ); return 0; }
1
0
0
0
Marcus Meissner : ws2_32: Implemented FIONBIO and FIONREAD in WSAIoctl.
by Alexandre Julliard
03 Oct '06
03 Oct '06
Module: wine Branch: master Commit: 971d5f3f89b2113f4b1b4e05e3c2312860c13fe3 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=971d5f3f89b2113f4b1b4e0…
Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Oct 2 14:08:25 2006 +0200 ws2_32: Implemented FIONBIO and FIONREAD in WSAIoctl. --- dlls/ws2_32/socket.c | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index c752b39..37a1de7 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2102,8 +2102,6 @@ char* WINAPI WS_inet_ntoa(struct WS_in_a /********************************************************************** * WSAIoctl (WS2_32.50) * - * - * FIXME: Only SIO_GET_INTERFACE_LIST option implemented. */ INT WINAPI WSAIoctl(SOCKET s, DWORD dwIoControlCode, @@ -2116,6 +2114,7 @@ INT WINAPI WSAIoctl(SOCKET s, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) { int fd = get_sock_fd( s, 0, NULL ); + INT ret; if (fd == -1) return SOCKET_ERROR; @@ -2125,6 +2124,32 @@ INT WINAPI WSAIoctl(SOCKET s, switch( dwIoControlCode ) { + case WS_FIONBIO: + if (cbInBuffer != sizeof(u_long)) { + release_sock_fd( s, fd ); + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + ret = WS_ioctlsocket( s, WS_FIONBIO, lpvInBuffer); + if (ret == SOCKET_ERROR) { + release_sock_fd( s, fd ); + /* last error already set by WS_ioctlsocket */ + return ret; + } + break; + case WS_FIONREAD: + if (cbOutBuffer != sizeof(u_long)) { + release_sock_fd( s, fd ); + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + ret = WS_ioctlsocket( s, WS_FIONREAD, lpbOutBuffer); + if (ret == SOCKET_ERROR) { + release_sock_fd( s, fd ); + /* last error already set by WS_ioctlsocket */ + return ret; + } + break; case SIO_GET_INTERFACE_LIST: { INTERFACE_INFO* intArray = (INTERFACE_INFO*)lpbOutBuffer; @@ -2257,6 +2282,10 @@ #endif * with WSA_FLAG_OVERLAPPED, but there is no easy way to get this */ break; + case SIO_FLUSH: + FIXME("SIO_FLUSH: stub.\n"); + break; + default: FIXME("unsupported WS_IOCTL cmd (%08lx)\n", dwIoControlCode); release_sock_fd( s, fd );
1
0
0
0
Marcus Meissner : ntdll: Clear alignment check flag before entering exception handler.
by Alexandre Julliard
03 Oct '06
03 Oct '06
Module: wine Branch: master Commit: 86c0bb3be5d5c0ff6a9b03128ba3b3addab6fa57 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=86c0bb3be5d5c0ff6a9b031…
Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Oct 2 22:16:26 2006 +0200 ntdll: Clear alignment check flag before entering exception handler. --- dlls/ntdll/signal_i386.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 21d4d24..e616f50 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -924,7 +924,8 @@ #endif /* now modify the sigcontext to return to the raise function */ ESP_sig(sigcontext) = (DWORD)stack; EIP_sig(sigcontext) = (DWORD)func; - EFL_sig(sigcontext) &= ~0x100; /* clear single-step flag */ + /* clear single-step and align check flag */ + EFL_sig(sigcontext) &= ~(0x100|0x40000); CS_sig(sigcontext) = wine_get_cs(); DS_sig(sigcontext) = wine_get_ds(); ES_sig(sigcontext) = wine_get_es();
1
0
0
0
Juan Lang : crypt32: Implement CryptSignAndEncodeCertificate.
by Alexandre Julliard
03 Oct '06
03 Oct '06
Module: wine Branch: master Commit: 2868977995dcd334982e63dc3bb56be51c9e5b0a URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=2868977995dcd334982e63d…
Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Oct 2 21:46:08 2006 -0700 crypt32: Implement CryptSignAndEncodeCertificate. --- dlls/crypt32/cert.c | 107 ++++++++++++++++++++++++++++++++++++++++----- dlls/crypt32/crypt32.spec | 2 - dlls/crypt32/tests/cert.c | 92 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 188 insertions(+), 13 deletions(-) Diff:
http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=2868977995dcd334982…
1
0
0
0
Mikołaj Zalewski : regedit: Remove the unused IDD_DIALOG2.
by Alexandre Julliard
03 Oct '06
03 Oct '06
Module: wine Branch: master Commit: a9436ea85f727b3d7b393b9290373a9b74ff1b31 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=a9436ea85f727b3d7b393b9…
Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Oct 3 10:08:58 2006 +0200 regedit: Remove the unused IDD_DIALOG2. --- programs/regedit/Bg.rc | 15 --------------- programs/regedit/Cs.rc | 15 --------------- programs/regedit/De.rc | 15 --------------- programs/regedit/En.rc | 15 --------------- programs/regedit/Es.rc | 15 --------------- programs/regedit/Fr.rc | 15 --------------- programs/regedit/Hu.rc | 15 --------------- programs/regedit/It.rc | 15 --------------- programs/regedit/Ja.rc | 15 --------------- programs/regedit/Ko.rc | 15 --------------- programs/regedit/Nl.rc | 15 --------------- programs/regedit/No.rc | 15 --------------- programs/regedit/Pl.rc | 15 --------------- programs/regedit/Pt.rc | 17 ----------------- programs/regedit/Ru.rc | 15 --------------- programs/regedit/Si.rc | 15 --------------- programs/regedit/Tr.rc | 15 --------------- programs/regedit/resource.h | 1 - 18 files changed, 0 insertions(+), 258 deletions(-) Diff:
http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a9436ea85f727b3d7b3…
1
0
0
0
Mikołaj Zalewski : regedit: Add option to export only a specified branch.
by Alexandre Julliard
03 Oct '06
03 Oct '06
Module: wine Branch: master Commit: 22665d9d5499f88814c7b2fa56c1270235bbbf3d URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=22665d9d5499f88814c7b2f…
Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Oct 3 10:07:34 2006 +0200 regedit: Add option to export only a specified branch. --- programs/regedit/Bg.rc | 7 ------- programs/regedit/Cs.rc | 7 ------- programs/regedit/De.rc | 7 ------- programs/regedit/En.rc | 18 +++++++++++------- programs/regedit/Es.rc | 7 ------- programs/regedit/Fr.rc | 7 ------- programs/regedit/Hu.rc | 7 ------- programs/regedit/It.rc | 7 ------- programs/regedit/Ja.rc | 7 ------- programs/regedit/Ko.rc | 7 ------- programs/regedit/Nl.rc | 7 ------- programs/regedit/No.rc | 7 ------- programs/regedit/Pl.rc | 7 ------- programs/regedit/Pt.rc | 10 ---------- programs/regedit/Ru.rc | 7 ------- programs/regedit/Si.rc | 7 ------- programs/regedit/Tr.rc | 7 ------- programs/regedit/framewnd.c | 42 +++++++++++++++++++++++++++++++++++------- programs/regedit/resource.h | 7 ++++++- 19 files changed, 52 insertions(+), 130 deletions(-) Diff:
http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=22665d9d5499f88814c…
1
0
0
0
Mikołaj Zalewski : regedit: Some import/ export dialogs code cleanup.
by Alexandre Julliard
03 Oct '06
03 Oct '06
Module: wine Branch: master Commit: b0c4b88943c24ee558ed284b46056f5ad2acf26a URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=b0c4b88943c24ee558ed284…
Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Oct 3 10:05:05 2006 +0200 regedit: Some import/export dialogs code cleanup. --- programs/regedit/framewnd.c | 57 +++---------------------------------------- 1 files changed, 4 insertions(+), 53 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index a04b0c0..f4b3c39 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -239,7 +239,7 @@ static BOOL CheckCommDlgError(HWND hWnd) return TRUE; } -static UINT_PTR CALLBACK ImportRegistryFile_OFNHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam) +static UINT_PTR CALLBACK ExportRegistryFile_OFNHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam) { OPENFILENAME* pOpenFileName; OFNOTIFY* pOfNotify; @@ -277,18 +277,8 @@ static BOOL InitOpenFileName(HWND hWnd, pofn->nMaxFile = _MAX_PATH; pofn->lpstrFileTitle = FileTitleBuffer; pofn->nMaxFileTitle = _MAX_PATH; - /* pofn->lpstrInitialDir = _T("");*/ - /* pofn->lpstrTitle = _T("Import Registry File");*/ - /* pofn->Flags = OFN_ENABLETEMPLATE + OFN_EXPLORER + OFN_ENABLESIZING;*/ pofn->Flags = OFN_HIDEREADONLY; - /* pofn->nFileOffset = ;*/ - /* pofn->nFileExtension = ;*/ - /* pofn->lpstrDefExt = _T("");*/ - /* pofn->lCustData = ;*/ - /* pofn->lpfnHook = ImportRegistryFile_OFNHookProc;*/ - /* pofn->lpTemplateName = _T("ID_DLG_IMPORT_REGFILE");*/ - /* pofn->lpTemplateName = MAKEINTRESOURCE(IDD_DIALOG1);*/ - /* pofn->FlagsEx = ;*/ + /* some other fields may be set by the caller */ return TRUE; } @@ -300,30 +290,11 @@ static BOOL ImportRegistryFile(HWND hWnd InitOpenFileName(hWnd, &ofn); LoadString(hInst, IDS_FILEDIALOG_IMPORT_TITLE, title, COUNT_OF(title)); ofn.lpstrTitle = title; - /* ofn.lCustData = ;*/ if (GetOpenFileName(&ofn)) { if (!import_registry_file(ofn.lpstrFile)) { /*printf("Can't open file \"%s\"\n", ofn.lpstrFile);*/ return FALSE; } -#if 0 - get_file_name(&s, filename, MAX_PATH); - if (!filename[0]) { - printf("No file name is specified\n%s", usage); - return FALSE; - /*exit(1);*/ - } - while (filename[0]) { - if (!import_registry_file(filename)) { - perror(""); - printf("Can't open file \"%s\"\n", filename); - return FALSE; - /*exit(1);*/ - } - get_file_name(&s, filename, MAX_PATH); - } -#endif - } else { CheckCommDlgError(hWnd); } @@ -342,36 +313,16 @@ static BOOL ExportRegistryFile(HWND hWnd LoadString(hInst, IDS_FILEDIALOG_EXPORT_TITLE, title, COUNT_OF(title)); ofn.lpstrTitle = title; /* ofn.lCustData = ;*/ - ofn.Flags = OFN_ENABLETEMPLATE + OFN_EXPLORER; - ofn.lpfnHook = ImportRegistryFile_OFNHookProc; + ofn.Flags = OFN_ENABLETEMPLATE | OFN_EXPLORER | OFN_HIDEREADONLY; + ofn.lpfnHook = ExportRegistryFile_OFNHookProc; ofn.lpTemplateName = MAKEINTRESOURCE(IDD_DIALOG1); if (GetSaveFileName(&ofn)) { BOOL result; result = export_registry_key(ofn.lpstrFile, ExportKeyPath); - /*result = export_registry_key(ofn.lpstrFile, NULL);*/ - /*if (!export_registry_key(ofn.lpstrFile, NULL)) {*/ if (!result) { /*printf("Can't open file \"%s\"\n", ofn.lpstrFile);*/ return FALSE; } -#if 0 - TCHAR filename[MAX_PATH]; - filename[0] = '\0'; - get_file_name(&s, filename, MAX_PATH); - if (!filename[0]) { - printf("No file name is specified\n%s", usage); - return FALSE; - /*exit(1);*/ - } - if (s[0]) { - TCHAR reg_key_name[KEY_MAX_LEN]; - get_file_name(&s, reg_key_name, KEY_MAX_LEN); - export_registry_key(filename, reg_key_name); - } else { - export_registry_key(filename, NULL); - } -#endif - } else { CheckCommDlgError(hWnd); }
1
0
0
0
Jonathan Ernst : cmdlgtst: Updated French translation.
by Alexandre Julliard
03 Oct '06
03 Oct '06
Module: wine Branch: master Commit: 8d8837595de040966a90b64b46b6ddb10ca7fa08 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=8d8837595de040966a90b64…
Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Tue Oct 3 10:00:25 2006 +0200 cmdlgtst: Updated French translation. --- programs/cmdlgtst/Fr.rc | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 deletions(-) diff --git a/programs/cmdlgtst/Fr.rc b/programs/cmdlgtst/Fr.rc index 03610a6..a41e766 100644 --- a/programs/cmdlgtst/Fr.rc +++ b/programs/cmdlgtst/Fr.rc @@ -4,6 +4,7 @@ * * Copyright (c) 1999 Eric Williams. * Copyright (c) 2003 Vincent B�ron. + * Copyright (c) 2006 Jonathan�Ernst. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -213,7 +214,7 @@ FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 72, 96, 50, 14 LTEXT "Gabarit de test des bo�tes de dialogue standards, version 1.20", -1, 13, 36, 168, 12 - LTEXT "(c) 1999-2000, Eric Williams. Droits tels qu'accord�s par la licence de Wine. N'accumulez pas du code tout seul... partagez-le!", -1, 18, 60, 157, 24 + LTEXT "(c) 1999-2000, Eric Williams. Droits tels qu'accord�s par la licence de Wine. N'accumulez pas du code tout seul... partagez-le�!", -1, 18, 60, 157, 24 ICON "AboutIcon", -1, 84, 12, 18, 20 } @@ -229,7 +230,38 @@ FONT 8, "MS Shell Dlg" LTEXT "La bo�te de dialogue de choix de la couleur change la couleur de l'arri�re-plan.", -1, 12, 120, 168, 12 LTEXT "La bo�te de dialogue de choix de la police change toutes les polices, et la couleur de la police si CF_EFFECTS est s�lectionn�.", -1, 12, 144, 168, 24 LTEXT "Le nom complet et le titre de la derni�re op�ration r�ussie d'ouverture ou d'enregistrement se trouvent dans le coin en haut � gauche.", -1, 12, 180, 168, 24 - LTEXT "(c) 1999-2000, Eric Williams. Droits tels qu'accord�s par la licence de Wine. N'accumulez pas du code tout seul... partagez-le!", -1, 12, 228, 168, 36 + LTEXT "(c) 1999-2000, Eric Williams. Droits tels qu'accord�s par la licence de Wine. N'accumulez pas du code tout seul... partagez-le�!", -1, 12, 228, 168, 36 ICON "AboutIcon", -1, 86, 12, 18, 20 CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 216, 168, 2 } + +PAGESETUPDLGORD_CSTM DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "TFT test dialog" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 + CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 + CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 + GROUPBOX "Papier", grp2, 8, 96, 224, 56, BS_GROUPBOX + LTEXT "&Taille�:", stc2, 16, 112, 36, 8 + COMBOBOX cmb2, 64, 110, 80, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + COMBOBOX cmb1, 150, 110, 80, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + LTEXT "&Bac�:", stc3, 16, 132, 36, 8 + COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + GROUPBOX "Orientation", grp1, 8, 156, 64, 56, BS_GROUPBOX + AUTORADIOBUTTON "&Portrait", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Paysage", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "Bordures", grp4, 80, 156, 152, 56, BS_GROUPBOX + LTEXT "&Gauche�:", stc15, 88, 172, 21, 8 + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "&Droite�:", stc16, 159, 172, 27, 8 + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "&Haut�:", stc17, 88, 192, 21, 8 + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "&Bas�:", stc18, 159, 192, 23, 8 + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON + PUSHBUTTON "Annuler", IDCANCEL, 126, 220, 50, 14 + PUSHBUTTON "&Imprimante...", psh3, 184, 220, 48, 14 +END
1
0
0
0
← Newer
1
...
93
94
95
96
97
98
99
...
104
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
Results per page:
10
25
50
100
200