October 2006 - Wine-Commits

Alexandre Julliard : explorer: Split the device management to a separate file to make it usable independently of HAL support .
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

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

Eric Pouech : winedbg: Fixed the auto mode.
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

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

Alexandre Julliard : ws2_32: Avoid retrieving the fd twice in WSAIoctl.
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

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

Marcus Meissner : ws2_32: Implemented FIONBIO and FIONREAD in WSAIoctl.
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

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

Marcus Meissner : ntdll: Clear alignment check flag before entering exception handler.
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

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

Juan Lang : crypt32: Implement CryptSignAndEncodeCertificate.
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

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

Mikołaj Zalewski : regedit: Remove the unused IDD_DIALOG2.
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

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

Mikołaj Zalewski : regedit: Add option to export only a specified branch.
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

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

Mikołaj Zalewski : regedit: Some import/ export dialogs code cleanup.
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

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

Jonathan Ernst : cmdlgtst: Updated French translation.
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

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