wine-commits June 2007

wine-commits@winehq.org

5 participants
856 discussions

Jason Edmeades : cmd.exe: GOTO throws away any preloaded multi part/ line command.
by Alexandre Julliard 18 Jun '07

18 Jun '07

Module: wine Branch: master Commit: 929a92f3c4808d36ce8e381e1dc4e2cb9a304952 URL: http://source.winehq.org/git/wine.git/?a=commit;h=929a92f3c4808d36ce8e381e1… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Fri Jun 15 20:59:22 2007 +0100 cmd.exe: GOTO throws away any preloaded multi part/line command. --- programs/cmd/batch.c | 2 +- programs/cmd/builtins.c | 5 ++++- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index b2a07cb..cc9d835 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -97,7 +97,7 @@ void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HAN /* If processing a call :label, 'goto' the label in question */ if (startLabel) { strcpyW(param1, startLabel); - WCMD_goto(); + WCMD_goto(NULL); } /* diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 665a043..6901cd3 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -686,10 +686,13 @@ void WCMD_give_help (WCHAR *command) { * FIXME: DOS is supposed to allow labels with spaces - we don't. */ -void WCMD_goto (void) { +void WCMD_goto (CMD_LIST **cmdList) { WCHAR string[MAX_PATH]; + /* Do not process any more parts of a processed multipart or multilines command */ + *cmdList = NULL; + if (param1[0] == 0x00) { WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); return; diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index b6258e5..c1af0bd 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -53,7 +53,7 @@ void WCMD_enter_paged_mode(const WCHAR *); void WCMD_exit (void); void WCMD_for (WCHAR *, CMD_LIST **cmdList); void WCMD_give_help (WCHAR *command); -void WCMD_goto (void); +void WCMD_goto (CMD_LIST **cmdList); void WCMD_if (WCHAR *, CMD_LIST **cmdList); void WCMD_leave_paged_mode(void); void WCMD_more (WCHAR *); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index fdb8089..30c1921 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -712,7 +712,7 @@ void WCMD_process_command (WCHAR *command, CMD_LIST **cmdList) WCMD_for (p, cmdList); break; case WCMD_GOTO: - WCMD_goto (); + WCMD_goto (cmdList); break; case WCMD_HELP: WCMD_give_help (p);

1 0

Jason Edmeades : cmd.exe: Pass the command list through so it is available to built in commands.
by Alexandre Julliard 18 Jun '07

18 Jun '07

Module: wine Branch: master Commit: 8f12d8bde33b6bc22415d0b278454a817215c096 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f12d8bde33b6bc22415d0b27… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Fri Jun 15 20:59:21 2007 +0100 cmd.exe: Pass the command list through so it is available to built in commands. --- programs/cmd/builtins.c | 18 +++++++++--------- programs/cmd/wcmd.h | 6 +++--- programs/cmd/wcmdmain.c | 16 ++++++++-------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index a7cc2b1..665a043 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -40,7 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); -void WCMD_execute (WCHAR *orig_command, WCHAR *parameter, WCHAR *substitution); +void WCMD_execute (WCHAR *orig_command, WCHAR *parameter, WCHAR *substitution, CMD_LIST **cmdList); struct env_stack *saved_environment; struct env_stack *pushd_directories; @@ -575,7 +575,7 @@ void WCMD_echo (const WCHAR *command) { * will probably work here, but the reverse is not necessarily the case... */ -void WCMD_for (WCHAR *p) { +void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { WIN32_FIND_DATA fd; HANDLE hff; @@ -609,12 +609,12 @@ void WCMD_for (WCHAR *p) { return; } do { - WCMD_execute (cmd, param, fd.cFileName); + WCMD_execute (cmd, param, fd.cFileName, cmdList); } while (FindNextFile(hff, &fd) != 0); FindClose (hff); -} + } else { - WCMD_execute (cmd, param, item); + WCMD_execute (cmd, param, item, cmdList); } i++; } @@ -626,7 +626,7 @@ void WCMD_for (WCHAR *p) { * Execute a command after substituting variable text for the supplied parameter */ -void WCMD_execute (WCHAR *orig_cmd, WCHAR *param, WCHAR *subst) { +void WCMD_execute (WCHAR *orig_cmd, WCHAR *param, WCHAR *subst, CMD_LIST **cmdList) { WCHAR *new_cmd, *p, *s, *dup; int size; @@ -644,7 +644,7 @@ void WCMD_execute (WCHAR *orig_cmd, WCHAR *param, WCHAR *subst) { s = p + strlenW (param); } strcatW (new_cmd, s); - WCMD_process_command (new_cmd); + WCMD_process_command (new_cmd, cmdList); free (dup); LocalFree ((HANDLE)new_cmd); } @@ -790,7 +790,7 @@ void WCMD_popd (void) { * FIXME: Much more syntax checking needed! */ -void WCMD_if (WCHAR *p) { +void WCMD_if (WCHAR *p, CMD_LIST **cmdList) { int negate = 0, test = 0; WCHAR condition[MAX_PATH], *command, *s; @@ -834,7 +834,7 @@ void WCMD_if (WCHAR *p) { } if (test != negate) { command = WCMD_strdupW(command); - WCMD_process_command (command); + WCMD_process_command (command, cmdList); free (command); } } diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index fa8d785..b6258e5 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -51,10 +51,10 @@ void WCMD_echo (const WCHAR *); void WCMD_endlocal (void); void WCMD_enter_paged_mode(const WCHAR *); void WCMD_exit (void); -void WCMD_for (WCHAR *); +void WCMD_for (WCHAR *, CMD_LIST **cmdList); void WCMD_give_help (WCHAR *command); void WCMD_goto (void); -void WCMD_if (WCHAR *); +void WCMD_if (WCHAR *, CMD_LIST **cmdList); void WCMD_leave_paged_mode(void); void WCMD_more (WCHAR *); void WCMD_move (void); @@ -65,7 +65,7 @@ void WCMD_pause (void); void WCMD_pipe (CMD_LIST **command); void WCMD_popd (void); void WCMD_print_error (void); -void WCMD_process_command (WCHAR *command); +void WCMD_process_command (WCHAR *command, CMD_LIST **cmdList); void WCMD_pushd (WCHAR *); int WCMD_read_console (WCHAR *string, int str_len); void WCMD_remove_dir (WCHAR *command); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index ba5f7df..fdb8089 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -463,7 +463,7 @@ int wmain (int argc, WCHAR *argvW[]) */ -void WCMD_process_command (WCHAR *command) +void WCMD_process_command (WCHAR *command, CMD_LIST **cmdList) { WCHAR *cmd, *p, *s, *t, *redir; int status, i; @@ -709,7 +709,7 @@ void WCMD_process_command (WCHAR *command) WCMD_echo(&whichcmd[count]); break; case WCMD_FOR: - WCMD_for (p); + WCMD_for (p, cmdList); break; case WCMD_GOTO: WCMD_goto (); @@ -718,7 +718,7 @@ void WCMD_process_command (WCHAR *command) WCMD_give_help (p); break; case WCMD_IF: - WCMD_if (p); + WCMD_if (p, cmdList); break; case WCMD_LABEL: WCMD_volume (1, p); @@ -1503,19 +1503,19 @@ void WCMD_pipe (CMD_LIST **cmdEntry) { p = strchrW(command, '|'); *p++ = '\0'; wsprintf (temp_cmd, redirOut, command, temp_file); - WCMD_process_command (temp_cmd); + WCMD_process_command (temp_cmd, cmdEntry); command = p; while ((p = strchrW(command, '|'))) { *p++ = '\0'; GetTempFileName (temp_path, cmdW, 0, temp_file2); wsprintf (temp_cmd, redirBoth, command, temp_file, temp_file2); - WCMD_process_command (temp_cmd); + WCMD_process_command (temp_cmd, cmdEntry); DeleteFile (temp_file); strcpyW (temp_file, temp_file2); command = p; } wsprintf (temp_cmd, redirIn, command, temp_file); - WCMD_process_command (temp_cmd); + WCMD_process_command (temp_cmd, cmdEntry); DeleteFile (temp_file); } @@ -2080,10 +2080,10 @@ void WCMD_process_commands(CMD_LIST *thisCmd) { if (strchrW(thisCmd->command,'|') != NULL) { WCMD_pipe (&thisCmd); } else { - WCMD_process_command (thisCmd->command); + WCMD_process_command (thisCmd->command, &thisCmd); } } - thisCmd = thisCmd->nextcommand; + if (thisCmd) thisCmd = thisCmd->nextcommand; } }

1 0

Jason Edmeades : cmd.exe: Pass command structure into WCMD_pipe, not command line itself.
by Alexandre Julliard 18 Jun '07

18 Jun '07

Module: wine Branch: master Commit: aad1d8ce243993ec67646c833ce47ca71c56f910 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aad1d8ce243993ec67646c833… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Fri Jun 15 20:59:20 2007 +0100 cmd.exe: Pass command structure into WCMD_pipe, not command line itself. --- programs/cmd/wcmd.h | 20 ++++++++++---------- programs/cmd/wcmdmain.c | 5 +++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 4ab365c..fa8d785 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -28,6 +28,15 @@ #include <ctype.h> #include <wine/unicode.h> +/* Data structure to hold commands to be processed */ + +typedef struct _CMD_LIST { + WCHAR *command; /* Command string to execute */ + struct _CMD_LIST *nextcommand; /* Next command string to execute */ + BOOL isAmphersand;/* Whether follows && */ + int bracketDepth;/* How deep bracketing have we got to */ +} CMD_LIST; + void WCMD_assoc (WCHAR *, BOOL); void WCMD_batch (WCHAR *, WCHAR *, int, WCHAR *, HANDLE); void WCMD_call (WCHAR *command); @@ -53,7 +62,7 @@ void WCMD_output (const WCHAR *format, ...); void WCMD_output_asis (const WCHAR *message); void WCMD_parse (WCHAR *s, WCHAR *q, WCHAR *p1, WCHAR *p2); void WCMD_pause (void); -void WCMD_pipe (WCHAR *command); +void WCMD_pipe (CMD_LIST **command); void WCMD_popd (void); void WCMD_print_error (void); void WCMD_process_command (WCHAR *command); @@ -92,15 +101,6 @@ WCHAR *WCMD_strdupW(WCHAR *input); BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, LPDWORD charsRead, const LPOVERLAPPED unused); -/* Data structure to hold commands to be processed */ - -typedef struct _CMD_LIST { - WCHAR *command; /* Command string to execute */ - struct _CMD_LIST *nextcommand; /* Next command string to execute */ - BOOL isAmphersand;/* Whether follows && */ - int bracketDepth;/* How deep bracketing have we got to */ -} CMD_LIST; - WCHAR *WCMD_ReadAndParseLine(WCHAR *initialcmd, CMD_LIST **output, HANDLE readFrom); void WCMD_process_commands(CMD_LIST *thisCmd); void WCMD_free_commands(CMD_LIST *cmds); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 245556e..ba5f7df 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1487,9 +1487,10 @@ void WCMD_opt_s_strip_quotes(WCHAR *cmd) { * Handle pipes within a command - the DOS way using temporary files. */ -void WCMD_pipe (WCHAR *command) { +void WCMD_pipe (CMD_LIST **cmdEntry) { WCHAR *p; + WCHAR *command = (*cmdEntry)->command; WCHAR temp_path[MAX_PATH], temp_file[MAX_PATH], temp_file2[MAX_PATH], temp_cmd[1024]; static const WCHAR redirOut[] = {'%','s',' ','>',' ','%','s','\0'}; static const WCHAR redirIn[] = {'%','s',' ','<',' ','%','s','\0'}; @@ -2077,7 +2078,7 @@ void WCMD_process_commands(CMD_LIST *thisCmd) { if (thisCmd->command && thisCmd->command[0] != ':') { WINE_TRACE("Executing command: '%s'\n", wine_dbgstr_w(thisCmd->command)); if (strchrW(thisCmd->command,'|') != NULL) { - WCMD_pipe (thisCmd->command); + WCMD_pipe (&thisCmd); } else { WCMD_process_command (thisCmd->command); }

1 0

Jason Edmeades : cmd.exe: Add basic support for && and (...) syntax.
by Alexandre Julliard 18 Jun '07

18 Jun '07

Module: wine Branch: master Commit: a88a6c802a1586602065b5f0b4aa86fc6622d216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a88a6c802a1586602065b5f0b… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Fri Jun 15 20:59:19 2007 +0100 cmd.exe: Add basic support for && and (...) syntax. --- programs/cmd/Cs.rc | 1 + programs/cmd/De.rc | 1 + programs/cmd/En.rc | 1 + programs/cmd/Es.rc | 1 + programs/cmd/Fr.rc | 1 + programs/cmd/Ja.rc | 1 + programs/cmd/Ko.rc | 1 + programs/cmd/Nl.rc | 1 + programs/cmd/No.rc | 1 + programs/cmd/Pl.rc | 1 + programs/cmd/Pt.rc | 1 + programs/cmd/Ru.rc | 1 + programs/cmd/Si.rc | 1 + programs/cmd/Tr.rc | 1 + programs/cmd/batch.c | 16 +-- programs/cmd/wcmd.h | 16 +++- programs/cmd/wcmdmain.c | 292 +++++++++++++++++++++++++++++++++++++++++++---- 17 files changed, 308 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a88a6c802a1586602065b…

1 0

Rob Shearman : rpcrt4: Implement encapsulated union NDR functions.
by Alexandre Julliard 18 Jun '07

18 Jun '07

Module: wine Branch: master Commit: 0871ab9130f779bc006189471cc2050f98ada16d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0871ab9130f779bc006189471… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jun 18 11:47:49 2007 +0100 rpcrt4: Implement encapsulated union NDR functions. --- dlls/rpcrt4/ndr_marshall.c | 522 ++++++++++++++++++++++++++++++-------------- 1 files changed, 355 insertions(+), 167 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0871ab9130f779bc00618…

1 0

Huw Davies : wineps.drv: Ignore ExtTextOut calls that occur before the job has started.
by Alexandre Julliard 18 Jun '07

18 Jun '07

Module: wine Branch: master Commit: 4b8c1c46d2911d1ca1c13306fc51705ebab3f3ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b8c1c46d2911d1ca1c13306f… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 18 11:29:51 2007 +0100 wineps.drv: Ignore ExtTextOut calls that occur before the job has started. --- dlls/wineps.drv/text.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/text.c b/dlls/wineps.drv/text.c index 4422da4..88579a1 100644 --- a/dlls/wineps.drv/text.c +++ b/dlls/wineps.drv/text.c @@ -47,6 +47,8 @@ BOOL PSDRV_ExtTextOut( PSDRV_PDEVICE *physDev, INT x, INT y, UINT flags, TRACE("(x=%d, y=%d, flags=0x%08x, str=%s, count=%d, lpDx=%p)\n", x, y, flags, debugstr_wn(str, count), count, lpDx); + if(physDev->job.hJob == 0) return FALSE; + /* write font if not already written */ PSDRV_SetFont(physDev);

1 0

Alexander Nicolaysen Sørnes : wordpad: Use Unicode functions in more places.
by Alexandre Julliard 18 Jun '07

18 Jun '07

Module: wine Branch: master Commit: d9a4a3bf46b886011192e35854b7d32eb6bb542b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9a4a3bf46b886011192e3585… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jun 14 20:03:04 2007 +0200 wordpad: Use Unicode functions in more places. --- programs/wordpad/wordpad.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 7c54fcb..1dd869b 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -85,7 +85,7 @@ static void AddButton(HWND hwndToolBar, int nImage, int nCommand) button.fsStyle = TBSTYLE_BUTTON; button.dwData = 0; button.iString = -1; - SendMessage(hwndToolBar, TB_ADDBUTTONS, 1, (LPARAM)&button); + SendMessageW(hwndToolBar, TB_ADDBUTTONSW, 1, (LPARAM)&button); } static void AddSeparator(HWND hwndToolBar) @@ -99,7 +99,7 @@ static void AddSeparator(HWND hwndToolBar) button.fsStyle = TBSTYLE_SEP; button.dwData = 0; button.iString = -1; - SendMessage(hwndToolBar, TB_ADDBUTTONS, 1, (LPARAM)&button); + SendMessageW(hwndToolBar, TB_ADDBUTTONSW, 1, (LPARAM)&button); } static DWORD CALLBACK stream_in(DWORD_PTR cookie, LPBYTE buffer, LONG cb, LONG *pcb) @@ -323,7 +323,7 @@ static void DoDefaultFont(void) lstrcpyW(fmt.szFaceName, szFaceName); - SendMessage(hEditorWnd, EM_SETCHARFORMAT, SCF_DEFAULT, (LPARAM)&fmt); + SendMessageW(hEditorWnd, EM_SETCHARFORMAT, SCF_DEFAULT, (LPARAM)&fmt); } static void update_window(void)

1 0

Detlef Riekenberg : printui: Add stub for printui.dll.
by Alexandre Julliard 18 Jun '07

18 Jun '07

Module: wine Branch: master Commit: 3fd4a536fc8d8bb8ce0f08a7c396366aebe52d35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fd4a536fc8d8bb8ce0f08a7c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jun 18 00:32:12 2007 +0200 printui: Add stub for printui.dll. --- Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/printui/Makefile.in | 13 ++++++++ dlls/printui/printui.c | 70 +++++++++++++++++++++++++++++++++++++++++++++ dlls/printui/printui.spec | 23 +++++++++++++++ 7 files changed, 113 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index fbf9268..763851f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -329,6 +329,7 @@ ALL_MAKEFILES = \ dlls/opengl32/Makefile \ dlls/pdh/Makefile \ dlls/powrprof/Makefile \ + dlls/printui/Makefile \ dlls/psapi/Makefile \ dlls/psapi/tests/Makefile \ dlls/pstorec/Makefile \ @@ -682,6 +683,7 @@ dlls/olesvr32/Makefile: dlls/olesvr32/Makefile.in dlls/Makedll.rules dlls/opengl32/Makefile: dlls/opengl32/Makefile.in dlls/Makedll.rules dlls/pdh/Makefile: dlls/pdh/Makefile.in dlls/Makedll.rules dlls/powrprof/Makefile: dlls/powrprof/Makefile.in dlls/Makedll.rules +dlls/printui/Makefile: dlls/printui/Makefile.in dlls/Makedll.rules dlls/psapi/Makefile: dlls/psapi/Makefile.in dlls/Makedll.rules dlls/psapi/tests/Makefile: dlls/psapi/tests/Makefile.in dlls/Maketest.rules dlls/pstorec/Makefile: dlls/pstorec/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 13e43e2..d6abf81 100755 --- a/configure +++ b/configure @@ -20722,6 +20722,8 @@ ac_config_files="$ac_config_files dlls/pdh/Makefile" ac_config_files="$ac_config_files dlls/powrprof/Makefile" +ac_config_files="$ac_config_files dlls/printui/Makefile" + ac_config_files="$ac_config_files dlls/psapi/Makefile" ac_config_files="$ac_config_files dlls/psapi/tests/Makefile" @@ -21793,6 +21795,7 @@ do "dlls/opengl32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/opengl32/Makefile" ;; "dlls/pdh/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/pdh/Makefile" ;; "dlls/powrprof/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/powrprof/Makefile" ;; + "dlls/printui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/printui/Makefile" ;; "dlls/psapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/psapi/Makefile" ;; "dlls/psapi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/psapi/tests/Makefile" ;; "dlls/pstorec/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/pstorec/Makefile" ;; diff --git a/configure.ac b/configure.ac index 72359fe..96b2c5c 100644 --- a/configure.ac +++ b/configure.ac @@ -1612,6 +1612,7 @@ AC_CONFIG_FILES([dlls/olesvr32/Makefile]) AC_CONFIG_FILES([dlls/opengl32/Makefile]) AC_CONFIG_FILES([dlls/pdh/Makefile]) AC_CONFIG_FILES([dlls/powrprof/Makefile]) +AC_CONFIG_FILES([dlls/printui/Makefile]) AC_CONFIG_FILES([dlls/psapi/Makefile]) AC_CONFIG_FILES([dlls/psapi/tests/Makefile]) AC_CONFIG_FILES([dlls/pstorec/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 9a56e3b..f1366f6 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -143,6 +143,7 @@ BASEDIRS = \ olesvr32 \ pdh \ powrprof \ + printui \ psapi \ pstorec \ qcap \ diff --git a/dlls/printui/Makefile.in b/dlls/printui/Makefile.in new file mode 100644 index 0000000..20fde18 --- /dev/null +++ b/dlls/printui/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = printui.dll +IMPORTS = kernel32 + +C_SRCS = \ + printui.c + +@MAKE_DLL_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/printui/printui.c b/dlls/printui/printui.c new file mode 100644 index 0000000..06cbaa2 --- /dev/null +++ b/dlls/printui/printui.c @@ -0,0 +1,70 @@ +/* + * Implementation of the Printer User Interface Dialogs + * + * Copyright 2006 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS +#define NONAMELESSUNION + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "winver.h" +#include "winnls.h" + +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(printui); + +HINSTANCE PRINTUI_hInstance = NULL; + +/***************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(%p, %d, %p)\n",hinstDLL, fdwReason, lpvReserved); + + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + + case DLL_PROCESS_ATTACH: + PRINTUI_hInstance = hinstDLL; + DisableThreadLibraryCalls( hinstDLL ); + break; + } + return TRUE; +} + + +/***************************************************** + * PrintUIEntryW [printui.@] + * Commandline-Interface for using printui.dll with rundll32.exe + * + */ +void WINAPI PrintUIEntryW(HWND hWnd, HINSTANCE hInst, LPCWSTR pCommand, DWORD nCmdShow) +{ + FIXME("(%p, %p, %s, 0x%x) stub\n", hWnd, hInst, debugstr_w(pCommand), nCmdShow); +} diff --git a/dlls/printui/printui.spec b/dlls/printui/printui.spec new file mode 100644 index 0000000..dcea8dc --- /dev/null +++ b/dlls/printui/printui.spec @@ -0,0 +1,23 @@ +@ stub ConnectToPrinterDlg +@ stub ConnectToPrinterPropertyPage +@ stub ConstructPrinterFriendlyName +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DocumentPropertiesWrap +@ stub PnPInterface +@ stub PrintNotifyTray_Exit +@ stub PrintNotifyTray_Init +@ stdcall PrintUIEntryW(ptr ptr wstr long) +@ stub PrinterPropPageProvider +@ stub RegisterPrintNotify +@ stub ShowErrorMessageHR +@ stub ShowErrorMessageSC +@ stub UnregisterPrintNotify +@ stub bFolderEnumPrinters +@ stub bFolderGetPrinter +@ stub bFolderRefresh +@ stub bPrinterSetup +@ stub vDocumentDefaults +@ stub vPrinterPropPages +@ stub vQueueCreate +@ stub vServerPropPages

1 0

Detlef Riekenberg : localspl/tests: Add tests for AddPortEx.
by Alexandre Julliard 18 Jun '07

18 Jun '07

Module: wine Branch: master Commit: b7a7cc6b57b465c3eff55c0e2046a75aef2a764d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7a7cc6b57b465c3eff55c0e2… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jun 17 23:47:20 2007 +0200 localspl/tests: Add tests for AddPortEx. --- dlls/localspl/tests/localmon.c | 129 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 129 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 2fed52e..ff358ca 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -78,6 +78,7 @@ static WCHAR cmd_PortIsValidW[] = {'P','o','r','t','I','s','V','a','l','i','d',0 static WCHAR does_not_existW[] = {'d','o','e','s','_','n','o','t','_','e','x','i','s','t',0}; static CHAR emptyA[] = ""; static WCHAR emptyW[] = {0}; +static WCHAR LocalPortW[] = {'L','o','c','a','l',' ','P','o','r','t',0}; static WCHAR Monitors_LocalPortW[] = { 'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', @@ -115,6 +116,23 @@ static WCHAR wineW[] = {'W','i','n','e',0}; static WCHAR tempdirW[MAX_PATH]; static WCHAR tempfileW[MAX_PATH]; + +/* ########################### */ + +static DWORD delete_port(LPWSTR portname) +{ + DWORD res; + + if (pDeletePort) { + res = pDeletePort(NULL, 0, portname); + } + else + { + res = pXcvDataPort(hXcv, cmd_DeletePortW, (PBYTE) portname, (lstrlenW(portname) + 1) * sizeof(WCHAR), NULL, 0, NULL); + } + return res; +} + /* ########################### */ static void test_AddPort(void) @@ -146,6 +164,116 @@ static void test_AddPort(void) } /* ########################### */ + +static void test_AddPortEx(void) +{ + PORT_INFO_2W pi; + DWORD res; + + if (!pAddPortEx) { + skip("AddPortEx\n"); + return; + } + if ((!pDeletePort) && (!hXcv)) { + skip("No API to delete a Port\n"); + return; + } + + /* start test with clean ports */ + delete_port(tempfileW); + + pi.pPortName = tempfileW; + if (0) { + /* tests crash with native localspl.dll in w2k, + but works with native localspl.dll in wine */ + SetLastError(0xdeadbeef); + res = pAddPortEx(NULL, 1, (LPBYTE) &pi, LocalPortW); + trace("returned %u with %u\n", res, GetLastError() ); + ok( res, "got %u with %u (expected '!= 0')\n", res, GetLastError()); + + /* port already exists: */ + SetLastError(0xdeadbeef); + res = pAddPortEx(NULL, 1, (LPBYTE) &pi, LocalPortW); + trace("returned %u with %u\n", res, GetLastError() ); + ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), + "got %u with %u (expected '0' with ERROR_INVALID_PARAMETER)\n", + res, GetLastError()); + delete_port(tempfileW); + + + /* NULL for pMonitorName is documented for Printmonitors, but + localspl.dll fails always with ERROR_INVALID_PARAMETER */ + SetLastError(0xdeadbeef); + res = pAddPortEx(NULL, 1, (LPBYTE) &pi, NULL); + trace("returned %u with %u\n", res, GetLastError() ); + ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), + "got %u with %u (expected '0' with ERROR_INVALID_PARAMETER)\n", + res, GetLastError()); + if (res) delete_port(tempfileW); + + + SetLastError(0xdeadbeef); + res = pAddPortEx(NULL, 1, (LPBYTE) &pi, emptyW); + trace("returned %u with %u\n", res, GetLastError() ); + ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), + "got %u with %u (expected '0' with ERROR_INVALID_PARAMETER)\n", + res, GetLastError()); + if (res) delete_port(tempfileW); + + + SetLastError(0xdeadbeef); + res = pAddPortEx(NULL, 1, (LPBYTE) &pi, does_not_existW); + trace("returned %u with %u\n", res, GetLastError() ); + ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), + "got %u with %u (expected '0' with ERROR_INVALID_PARAMETER)\n", + res, GetLastError()); + if (res) delete_port(tempfileW); + } + + pi.pPortName = NULL; + SetLastError(0xdeadbeef); + res = pAddPortEx(NULL, 1, (LPBYTE) &pi, LocalPortW); + ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), + "got %u with %u (expected '0' with ERROR_INVALID_PARAMETER)\n", + res, GetLastError()); + + /* level 2 is documented as supported for Printmonitors, + but localspl.dll fails always with ERROR_INVALID_LEVEL */ + + pi.pPortName = tempfileW; + pi.pMonitorName = LocalPortW; + pi.pDescription = wineW; + pi.fPortType = PORT_TYPE_WRITE; + + SetLastError(0xdeadbeef); + res = pAddPortEx(NULL, 2, (LPBYTE) &pi, LocalPortW); + ok( !res && (GetLastError() == ERROR_INVALID_LEVEL), + "got %u with %u (expected '0' with ERROR_INVALID_LEVEL)\n", + res, GetLastError()); + if (res) delete_port(tempfileW); + + + /* invalid levels */ + SetLastError(0xdeadbeef); + res = pAddPortEx(NULL, 0, (LPBYTE) &pi, LocalPortW); + ok( !res && (GetLastError() == ERROR_INVALID_LEVEL), + "got %u with %u (expected '0' with ERROR_INVALID_LEVEL)\n", + res, GetLastError()); + if (res) delete_port(tempfileW); + + + SetLastError(0xdeadbeef); + res = pAddPortEx(NULL, 3, (LPBYTE) &pi, LocalPortW); + ok( !res && (GetLastError() == ERROR_INVALID_LEVEL), + "got %u with %u (expected '0' with ERROR_INVALID_LEVEL)\n", + res, GetLastError()); + if (res) delete_port(tempfileW); + + /* cleanup */ + delete_port(tempfileW); +} + +/* ########################### */ static void test_ConfigurePort(void) { @@ -1021,6 +1149,7 @@ START_TEST(localmon) test_InitializePrintMonitor(); test_AddPort(); + test_AddPortEx(); test_ConfigurePort(); test_DeletePort(); test_EnumPorts();

1 0

Detlef Riekenberg : winspool/tests: Add tests for AddPortEx.
by Alexandre Julliard 18 Jun '07

18 Jun '07

Module: wine Branch: master Commit: 4307f6428f1dc8bc579ae39cffc048df5c45dc86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4307f6428f1dc8bc579ae39cf… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jun 18 00:58:49 2007 +0200 winspool/tests: Add tests for AddPortEx. --- dlls/winspool.drv/info.c | 21 +++---- dlls/winspool.drv/tests/info.c | 117 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+), 12 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index d78964b..822fde4 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -6144,29 +6144,26 @@ BOOL WINAPI AddPortExW(LPWSTR pName, DWORD level, LPBYTE pBuffer, LPWSTR pMonito return FALSE; } - if (!pi2) { + if ((!pi2) || (!pMonitorName) || (!pMonitorName[0])) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - /* we need a valid Monitorname */ - if (!pMonitorName) { - SetLastError(RPC_X_NULL_REF_POINTER); - return FALSE; - } - if (!pMonitorName[0]) { - SetLastError(ERROR_NOT_SUPPORTED); - return FALSE; - } - /* load the Monitor */ pm = monitor_load(pMonitorName, NULL); - if (!pm) return FALSE; + if (!pm) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } if (pm->monitor && pm->monitor->pfnAddPortEx) { res = pm->monitor->pfnAddPortEx(pName, level, pBuffer, pMonitorName); TRACE("got %u with %u\n", res, GetLastError()); } + else + { + FIXME("not implemented for %s (%p)\n", debugstr_w(pMonitorName), pm->monitor); + } monitor_unload(pm); return res; } diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index a1dafe6..c743768 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -45,6 +45,7 @@ static CHAR env_x86[] = "Windows NT x86"; static CHAR env_win9x_case[] = "windowS 4.0"; static CHAR illegal_name[] = "illegal,name"; static CHAR invalid_env[] = "invalid_env"; +static CHAR LocalPortA[] = "Local Port"; static CHAR portname_com1[] = "COM1:"; static CHAR portname_file[] = "FILE:"; static CHAR portname_lpt1[] = "LPT1:"; @@ -67,6 +68,7 @@ static HANDLE hwinspool; static FARPROC pGetDefaultPrinterA; static FARPROC pSetDefaultPrinterA; static DWORD (WINAPI * pXcvDataW)(HANDLE, LPCWSTR, PBYTE, DWORD, PBYTE, DWORD, PDWORD, PDWORD); +static BOOL (WINAPI * pAddPortExA)(LPSTR, DWORD, LPBYTE, LPSTR); /* ################################ */ @@ -461,6 +463,119 @@ static void test_AddPort(void) /* ########################### */ +static void test_AddPortEx(void) +{ + PORT_INFO_2A pi; + DWORD res; + + + if (!pAddPortExA) { + skip("AddPortEx not supported\n"); + return; + } + + /* start test with a clean system */ + DeletePortA(NULL, 0, tempfileA); + + pi.pPortName = tempfileA; + SetLastError(0xdeadbeef); + res = pAddPortExA(NULL, 1, (LPBYTE) &pi, LocalPortA); + RETURN_ON_DEACTIVATED_SPOOLER(res) + + /* Allowed only for (Printer-)Administrators. + W2K+XP: ERROR_INVALID_PARAMETER */ + if (!res && (GetLastError() == ERROR_INVALID_PARAMETER)) { + skip("ACCESS_DENIED (ERROR_INVALID_PARAMETER)\n"); + return; + } + ok( res, "got %u with %u (expected '!= 0')\n", res, GetLastError()); + + /* Add a port, that already exist */ + SetLastError(0xdeadbeef); + res = pAddPortExA(NULL, 1, (LPBYTE) &pi, LocalPortA); + ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), + "got %u with %u (expected '0' with ERROR_INVALID_PARAMETER)\n", + res, GetLastError()); + DeletePortA(NULL, 0, tempfileA); + + + /* the Monitorname must match */ + SetLastError(0xdeadbeef); + res = pAddPortExA(NULL, 1, (LPBYTE) &pi, NULL); + ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), + "got %u with %u (expected '0' with ERROR_INVALID_PARAMETER)\n", + res, GetLastError()); + if (res) DeletePortA(NULL, 0, tempfileA); + + SetLastError(0xdeadbeef); + res = pAddPortExA(NULL, 1, (LPBYTE) &pi, empty); + ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), + "got %u with %u (expected '0' with ERROR_INVALID_PARAMETER)\n", + res, GetLastError()); + if (res) DeletePortA(NULL, 0, tempfileA); + + SetLastError(0xdeadbeef); + res = pAddPortExA(NULL, 1, (LPBYTE) &pi, does_not_exist); + ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), + "got %u with %u (expected '0' with ERROR_INVALID_PARAMETER)\n", + res, GetLastError()); + if (res) DeletePortA(NULL, 0, tempfileA); + + + /* We need a Portname */ + SetLastError(0xdeadbeef); + res = pAddPortExA(NULL, 1, NULL, LocalPortA); + ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), + "got %u with %u (expected '0' with ERROR_INVALID_PARAMETER)\n", + res, GetLastError()); + + pi.pPortName = NULL; + SetLastError(0xdeadbeef); + res = pAddPortExA(NULL, 1, (LPBYTE) &pi, LocalPortA); + ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), + "got %u with %u (expected '0' with ERROR_INVALID_PARAMETER)\n", + res, GetLastError()); + if (res) DeletePortA(NULL, 0, tempfileA); + + + /* level 2 is documented as supported for Printmonitors, + but that is not supported for "Local Port" (localspl.dll) and + AddPortEx fails with ERROR_INVALID_LEVEL */ + + pi.pPortName = tempfileA; + pi.pMonitorName = LocalPortA; + pi.pDescription = winetest; + pi.fPortType = PORT_TYPE_WRITE; + + SetLastError(0xdeadbeef); + res = pAddPortExA(NULL, 2, (LPBYTE) &pi, LocalPortA); + ok( !res && (GetLastError() == ERROR_INVALID_LEVEL), + "got %u with %u (expected '0' with ERROR_INVALID_LEVEL)\n", + res, GetLastError()); + if (res) DeletePortA(NULL, 0, tempfileA); + + + /* invalid levels */ + SetLastError(0xdeadbeef); + res = pAddPortExA(NULL, 0, (LPBYTE) &pi, LocalPortA); + ok( !res && (GetLastError() == ERROR_INVALID_LEVEL), + "got %u with %u (expected '0' with ERROR_INVALID_LEVEL)\n", + res, GetLastError()); + + SetLastError(0xdeadbeef); + res = pAddPortExA(NULL, 3, (LPBYTE) &pi, LocalPortA); + ok( !res && (GetLastError() == ERROR_INVALID_LEVEL), + "got %u with %u (expected '0' with ERROR_INVALID_LEVEL)\n", + res, GetLastError()); + + + /* cleanup */ + DeletePortA(NULL, 0, tempfileA); + +} + +/* ########################### */ + static void test_ConfigurePort(void) { DWORD res; @@ -2113,6 +2228,7 @@ START_TEST(info) pGetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "GetDefaultPrinterA"); pSetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "SetDefaultPrinterA"); pXcvDataW = (void *) GetProcAddress(hwinspool, "XcvDataW"); + pAddPortExA = (void *) GetProcAddress(hwinspool, "AddPortExA"); find_default_printer(); find_local_server(); @@ -2120,6 +2236,7 @@ START_TEST(info) test_AddMonitor(); test_AddPort(); + test_AddPortEx(); test_ConfigurePort(); test_DeleteMonitor(); test_DeletePort();

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2007