April 2007 - Wine-Commits - list.winehq.org

lostwages/templates/en/wineconf survey.templat ...
by Jeremy Newman April 30, 2007

April 30, 2007

ChangeSet ID: 31118 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/04/30 12:55:47 Added files: templates/en/wineconf: survey.template survey_done.template survey_form.template Log message: adding a survey for wineconf 2007 Patch: http://cvs.winehq.org/patch.py?id=31118 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/templates/en/wineconf/survey.template Added 1.1 +0 -0 lostwages/templates/en/wineconf/survey_done.template Added 1.1 +0 -0 lostwages/templates/en/wineconf/survey_form.template Index: lostwages/templates/en/wineconf/survey.template diff -u -p /dev/null lostwages/templates/en/wineconf/survey.template:1.1 --- /dev/null 30 Apr 2007 17:55:47 -0000 +++ lostwages/templates/en/wineconf/survey.template 30 Apr 2007 17:55:47 -0000 @@ -0,0 +1,14 @@ + + +<table width="100%"> +<tr> + <td><img src="{$root}/images/wineconf/wineconf_logo.jpg" width="295" height="108" alt="-LOGO-"></td> + <td align="right"></td> +</tr> +</table> + +<hr /> + + + +<p> </p> Index: lostwages/templates/en/wineconf/survey_done.template diff -u -p /dev/null lostwages/templates/en/wineconf/survey_done.template:1.1 --- /dev/null 30 Apr 2007 17:55:47 -0000 +++ lostwages/templates/en/wineconf/survey_done.template 30 Apr 2007 17:55:47 -0000 @@ -0,0 +1,5 @@ +<h3>Thanks!</h3> + +<p>This well help us decide on the next WineConf.</p> + +<p> </p> Index: lostwages/templates/en/wineconf/survey_form.template diff -u -p /dev/null lostwages/templates/en/wineconf/survey_form.template:1.1 --- /dev/null 30 Apr 2007 17:55:47 -0000 +++ lostwages/templates/en/wineconf/survey_form.template 30 Apr 2007 17:55:47 -0000 @@ -0,0 +1,57 @@ +{$error} + +<p></p> + +<form name="survey" action="{$self}" method="post"> + +<p>We have had 3 generous offers to host Wineconf 2007. +However, we don't have a clear consenus of which of these three offers +to proceed with.</p> + +<p>So, we're going to go with a vote. Please only vote if you seriously +intend to attend Wineconf this year.</p> + +<p>The three choices we have are as follows:</p> + +<ol> + <li> + <input type="radio" name="q[where]" value="Zurich" checked="checked" /> + Zurich, Switzerland, hosted by Mike Hearn, with the possibility + of a satellite site near Los Angeles. + </li> + + <li> + <input type="radio" name="q[where]" value="Amsterdam" /> + Amsterdam or Utrech, Netherlands, hosted by Hans Leidekker. + </li> + + <li> + <input type="radio" name="q[where]" value="Bratislava" /> + Bratislava, Slovakia, hosted by Martin Pilka. + </li> +</ol> + +<table> + +<tr> + <th>Name:</th> + <td><input type="text" name="q[name]" size="40" value="{$name}" /></td> +</tr> + +<tr> + <th>Email:</th> + <td><input type="text" name="q[email]" size="40" value="{$email}" /></td> +</tr> + +<tr> + <th>Comments:</th> + <td><textarea name="q[comment]" rows="5" cols="40">{$comment}</textarea></td> +</tr> + +</table> + +<p><input type="submit" name="submit" value=" Submit Survey " class="button" /></p> + +<input type="hidden" name="fields" value="where|name|email|comment" /> + +</form>

1 0

Misha Koshelev : msi: Add OLE automation conformance test.
by Alexandre Julliard April 30, 2007

April 30, 2007

Module: wine Branch: master Commit: 49bb20cf351923cc4307bdd5fd7deb654d8b4d0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=49bb20cf351923cc4307bdd5f… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Sat Apr 28 20:12:09 2007 -0500 msi: Add OLE automation conformance test. --- dlls/msi/tests/Makefile.in | 3 +- dlls/msi/tests/automation.c | 924 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 926 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49bb20cf351923cc4307b…

1 0

Andrey Turkin : dbghelp: Zero-terminate module name in minidump.
by Alexandre Julliard April 30, 2007

April 30, 2007

Module: wine Branch: master Commit: 234babeaf05af10e8a4a7eb89464f6f03c964a61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=234babeaf05af10e8a4a7eb89… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sun Apr 29 02:14:15 2007 +0400 dbghelp: Zero-terminate module name in minidump. --- dlls/dbghelp/minidump.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index e2b034f..3bd0f74 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -476,7 +476,7 @@ static void dump_modules(struct dump_context* dc, BOOL dump_elf) mdModule.TimeDateStamp = dc->module[i].timestamp; mdModule.ModuleNameRva = dc->rva; ms->Length -= sizeof(WCHAR); - append(dc, ms, sizeof(ULONG) + ms->Length); + append(dc, ms, sizeof(ULONG) + ms->Length + sizeof(WCHAR)); memset(&mdModule.VersionInfo, 0, sizeof(mdModule.VersionInfo)); /* FIXME */ mdModule.CvRecord.DataSize = 0; /* FIXME */ mdModule.CvRecord.Rva = 0; /* FIXME */

1 0

Andrew Talbot : gdi32: Constify some variables.
by Alexandre Julliard April 30, 2007

April 30, 2007

Module: wine Branch: master Commit: 260deef761dd538247f90008edced37c7c47841f URL: http://source.winehq.org/git/wine.git/?a=commit;h=260deef761dd538247f90008e… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sun Apr 29 13:17:29 2007 +0100 gdi32: Constify some variables. --- dlls/gdi32/font.c | 8 ++------ include/wingdi.h | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 263454d..d9e6e35 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2332,9 +2332,7 @@ BOOL WINAPI TextOutW(HDC hdc, INT x, INT y, LPCWSTR str, INT count) * * See PolyTextOutW. */ -BOOL WINAPI PolyTextOutA ( HDC hdc, /* [in] Handle to device context */ - PPOLYTEXTA pptxt, /* [in] Array of strings */ - INT cStrings ) /* [in] Number of strings in array */ +BOOL WINAPI PolyTextOutA( HDC hdc, const POLYTEXTA *pptxt, INT cStrings ) { for (; cStrings>0; cStrings--, pptxt++) if (!ExtTextOutA( hdc, pptxt->x, pptxt->y, pptxt->uiFlags, &pptxt->rcl, pptxt->lpstr, pptxt->n, pptxt->pdx )) @@ -2353,9 +2351,7 @@ BOOL WINAPI PolyTextOutA ( HDC hdc, /* [in] Handle to device conte * TRUE: Success. * FALSE: Failure. */ -BOOL WINAPI PolyTextOutW ( HDC hdc, /* [in] Handle to device context */ - PPOLYTEXTW pptxt, /* [in] Array of strings */ - INT cStrings ) /* [in] Number of strings in array */ +BOOL WINAPI PolyTextOutW( HDC hdc, const POLYTEXTW *pptxt, INT cStrings ) { for (; cStrings>0; cStrings--, pptxt++) if (!ExtTextOutW( hdc, pptxt->x, pptxt->y, pptxt->uiFlags, &pptxt->rcl, pptxt->lpstr, pptxt->n, pptxt->pdx )) diff --git a/include/wingdi.h b/include/wingdi.h index ca72f33..77ad737 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3660,8 +3660,8 @@ BOOL WINAPI UpdateICMRegKeyA(DWORD,LPSTR,LPSTR,UINT); BOOL WINAPI UpdateICMRegKeyW(DWORD,LPWSTR,LPWSTR,UINT); #define UpdateICMRegKey WINELIB_NAME_AW(UpdateICMRegKey) BOOL WINAPI WidenPath(HDC); -BOOL WINAPI PolyTextOutA(HDC,PPOLYTEXTA,INT); -BOOL WINAPI PolyTextOutW(HDC,PPOLYTEXTW,INT); +BOOL WINAPI PolyTextOutA(HDC,const POLYTEXTA*,INT); +BOOL WINAPI PolyTextOutW(HDC,const POLYTEXTW*,INT); #define PolyTextOut WINELIB_NAME_AW(PolyTextOut) /* These defines are used by wglSwapLayerBuffers */

1 0

Andrew Talbot : gdi32: Constify some variables.
by Alexandre Julliard April 30, 2007

April 30, 2007

Module: wine Branch: master Commit: 7bdba1b63a522835304921681e42d006e3714106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bdba1b63a522835304921681… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sun Apr 29 13:17:26 2007 +0100 gdi32: Constify some variables. --- dlls/gdi32/brush.c | 2 +- dlls/gdi32/enhmetafile.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 8e636ae..f8f4847 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -57,7 +57,7 @@ static const struct gdi_obj_funcs brush_funcs = BRUSH_DeleteObject /* pDeleteObject */ }; -static HGLOBAL16 dib_copy(BITMAPINFO *info, UINT coloruse) +static HGLOBAL16 dib_copy(const BITMAPINFO *info, UINT coloruse) { BITMAPINFO *newInfo; HGLOBAL16 hmem; diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 5c1294f..c822b28 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -516,7 +516,7 @@ typedef struct enum_emh_data #define IS_WIN9X() (GetVersion()&0x80000000) -static void EMF_Update_MF_Xform(HDC hdc, enum_emh_data *info) +static void EMF_Update_MF_Xform(HDC hdc, const enum_emh_data *info) { XFORM mapping_mode_trans, final_trans; FLOAT scaleX, scaleY;

1 0

Detlef Riekenberg : winspool: Avoid crash on NULL parameter ( XcvOpenPort in OpenPrinter).
by Alexandre Julliard April 30, 2007

April 30, 2007

Module: wine Branch: master Commit: 6b7c482cb6736017e2e4ddf46448f6a89bfb4419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b7c482cb6736017e2e4ddf46… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Apr 30 10:41:02 2007 +0200 winspool: Avoid crash on NULL parameter (XcvOpenPort in OpenPrinter). --- dlls/winspool.drv/info.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index a469f5b..e19c82c 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1441,7 +1441,9 @@ static HANDLE get_opened_printer_entry(LPCWSTR name, LPPRINTER_DEFAULTSW pDefaul if (printer->pm) { if ((printer->pm->monitor) && (printer->pm->monitor->pfnXcvOpenPort)) { - printer->pm->monitor->pfnXcvOpenPort(&printername[len], pDefault->DesiredAccess, &printer->hXcv); + printer->pm->monitor->pfnXcvOpenPort(&printername[len], + pDefault ? pDefault->DesiredAccess : 0, + &printer->hXcv); } if (printer->hXcv == NULL) { SetLastError(ERROR_INVALID_PARAMETER);

1 0

Detlef Riekenberg : winspool: Return the correct errorcode in OpenPrinter ( Xcv).
by Alexandre Julliard April 30, 2007

April 30, 2007

Module: wine Branch: master Commit: fc78034638778b99ce50511badf4846f7532ad14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc78034638778b99ce50511ba… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Apr 30 10:37:58 2007 +0200 winspool: Return the correct errorcode in OpenPrinter (Xcv). --- dlls/winspool.drv/info.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index a6d65ea..a469f5b 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1419,7 +1419,7 @@ static HANDLE get_opened_printer_entry(LPCWSTR name, LPPRINTER_DEFAULTSW pDefaul TRACE(",XcvMonitor: %s\n", debugstr_w(&printername[len])); printer->pm = monitor_load(&printername[len], NULL); if (printer->pm == NULL) { - SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_UNKNOWN_PORT); handle = 0; goto end; } @@ -1432,7 +1432,7 @@ static HANDLE get_opened_printer_entry(LPCWSTR name, LPPRINTER_DEFAULTSW pDefaul TRACE(",XcvPort: %s\n", debugstr_w(&printername[len])); printer->pm = monitor_load_by_port(&printername[len]); if (printer->pm == NULL) { - SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_UNKNOWN_PORT); handle = 0; goto end; }

1 0

Detlef Riekenberg : localspl: Code cleanup for XcvDataPort_AddPort.
by Alexandre Julliard April 30, 2007

April 30, 2007

Module: wine Branch: master Commit: 174d050bb7ffec66cdebc0713409498bd68454b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=174d050bb7ffec66cdebc0713… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Apr 30 10:35:50 2007 +0200 localspl: Code cleanup for XcvDataPort_AddPort. --- dlls/localspl/localmon.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 0dc128c..fda2c91 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -401,7 +401,7 @@ BOOL WINAPI localmon_XcvClosePort(HANDLE hXcv) * * RETURNS * Success: ERROR_SUCCESS - * Failure: win32 error code (same value is returned by GetLastError) + * Failure: win32 error code * * NOTES * @@ -431,13 +431,13 @@ DWORD WINAPI localmon_XcvDataPort(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInput if (res == ERROR_SUCCESS) { if (does_port_exist((LPWSTR) pInputData)) { RegCloseKey(hroot); + TRACE("=> %u\n", ERROR_ALREADY_EXISTS); return ERROR_ALREADY_EXISTS; } res = RegSetValueExW(hroot, (LPWSTR) pInputData, 0, REG_SZ, (const BYTE *) emptyW, sizeof(emptyW)); RegCloseKey(hroot); - SetLastError(ERROR_SUCCESS); - return res; } + TRACE("=> %u\n", res); return res; } @@ -509,7 +509,8 @@ DWORD WINAPI localmon_XcvDataPort(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInput /* names, that we have recognized, are valid */ if (res) return ERROR_SUCCESS; - /* ERROR_ACCESS_DENIED, ERROR_PATH_NOT_FOUND ore something else */ + /* ERROR_ACCESS_DENIED, ERROR_PATH_NOT_FOUND or something else */ + TRACE("=> %u\n", GetLastError()); return GetLastError(); }

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard April 30, 2007

April 30, 2007

Module: wine Branch: master Commit: 5a8fc3403317877cf78a0fa0be4244a4da09d1d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a8fc3403317877cf78a0fa0b… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 30 02:06:11 2007 +0200 Assorted spelling fixes. --- dlls/d3d9/device.c | 2 +- dlls/ddraw/ddraw.c | 2 +- dlls/dnsapi/query.c | 2 +- dlls/iphlpapi/iphlpapi_main.c | 2 +- dlls/odbccp32/tests/misc.c | 2 +- dlls/winealsa.drv/mixer.c | 8 ++++---- dlls/winecoreaudio.drv/coremidi.c | 2 +- dlls/winecoreaudio.drv/coremidi.h | 2 +- dlls/winecoreaudio.drv/midi.c | 2 +- programs/cmd/builtins.c | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 682cb90..af4f3ad 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -827,7 +827,7 @@ IDirect3DVertexDeclaration9 *getConvertedDecl(IDirect3DDevice9Impl *This, DWORD convertedDecls[low] = pDecl; This->numConvertedDecls++; - /* Will prevent the decl from beeing destroyed */ + /* Will prevent the decl from being destroyed */ ((IDirect3DVertexDeclaration9Impl *) pDecl)->convFVF = fvf; IDirect3DVertexDeclaration9_Release(pDecl); /* Does not destroy now */ diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 0f6b6db..25b02d8 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3076,7 +3076,7 @@ const IDirectDraw7Vtbl IDirectDraw7_Vtbl = * * This function is in ddraw.c and the DDraw object space because D3D7 * vertex buffers are created using the IDirect3D interface to the ddraw - * object, so they can be valid accross D3D devices(theoretically. The ddraw + * object, so they can be valid across D3D devices(theoretically. The ddraw * object also owns the wined3d device * * Parameters: diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 1366b0b..9522929 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -67,7 +67,7 @@ static CRITICAL_SECTION resolver_cs = { &resolver_cs_debug, -1, 0, 0, 0, 0 }; static int resolver_initialised; -/* call res_init() just once because of a bug in Mac OSX 10.4 */ +/* call res_init() just once because of a bug in Mac OS X 10.4 */ static void initialise_resolver( void ) { if (!resolver_initialised) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index c80e1e0..6b7fa62 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -52,7 +52,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); static int resolver_initialised; -/* call res_init() just once because of a bug in Mac OSX 10.4 */ +/* call res_init() just once because of a bug in Mac OS X 10.4 */ static void initialise_resolver(void) { if (!resolver_initialised) diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index fdfecc0..cffbd9c 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -120,7 +120,7 @@ static void test_SQLInstallDriverManager(void) sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); ok(bool_ret, "SQLInstallDriverManager unexpectedly failed\n"); ok(sql_ret == SQL_NO_DATA, "Expected SQL_NO_DATA, got %d\n", sql_ret); - /* path_out should in practice be less then 0xcafe */ + /* path_out should in practice be less than 0xcafe */ ok(path_out != 0xcafe, "Expected path_out to show the correct amount of bytes\n"); } diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index 84701f6..ad87916 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -67,7 +67,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mixer); * Mute is optional * * For capture controls, it is needed that there is a capture switch and a volume switch, - * It doesn't matter wether it is a playback volume switch or a capture volume switch. + * It doesn't matter whether it is a playback volume switch or a capture volume switch. * The code will first try to get/adjust capture volume, if that fails it tries playback volume * It is not pretty, but under my 3 test cards it seems that there is no other choice: * Most capture controls don't have a capture volume setting @@ -305,7 +305,7 @@ static void fillcontrols(mixer *mmixer) } /* get amount of channels for elem */ -/* Officially we should keep capture/playback seperated, +/* Officially we should keep capture/playback separated, * but that's not going to work in the alsa api */ static int chans(mixer *mmixer, snd_mixer_elem_t * elem, DWORD capt) { @@ -371,7 +371,7 @@ static void ALSA_MixerInit(void) err = snd_mixer_open(&mixdev[mixnum].mix,0); if (err < 0) { - WARN("Error occured opening mixer: %s\n", snd_strerror(err)); + WARN("Error occurred opening mixer: %s\n", snd_strerror(err)); continue; } @@ -504,7 +504,7 @@ static void ALSA_MixerInit(void) continue; eclose: - WARN("Error occured initialising mixer: %s\n", snd_strerror(err)); + WARN("Error occurred initialising mixer: %s\n", snd_strerror(err)); HeapFree(GetProcessHeap(), 0, mixdev[mixnum].lines); HeapFree(GetProcessHeap(), 0, mixdev[mixnum].controls); snd_mixer_close(mixdev[mixnum].mix); diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index a127aff..6c47c87 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -1,5 +1,5 @@ /* - * Wine Midi driver for MacOSX + * Wine Midi driver for Mac OS X * * Copyright 2006 Emmanuel Maillard * diff --git a/dlls/winecoreaudio.drv/coremidi.h b/dlls/winecoreaudio.drv/coremidi.h index 7cc7f08..405f999 100644 --- a/dlls/winecoreaudio.drv/coremidi.h +++ b/dlls/winecoreaudio.drv/coremidi.h @@ -1,5 +1,5 @@ /* - * Wine Midi driver for MacOSX + * Wine Midi driver for Mac OS X * * Copyright 2006 Emmanuel Maillard * diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 7baf73b..f10f5f0 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -1,5 +1,5 @@ /* - * Sample MIDI Wine Driver for MacOSX (based on OSS midi driver) + * Sample MIDI Wine Driver for Mac OS X (based on OSS midi driver) * * Copyright 1994 Martin Ayotte * Copyright 1998 Luiz Otavio L. Zorzella (init procedures) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 4d0fd5e..53aa742 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -414,7 +414,7 @@ BOOL WCMD_delete (char *command, BOOL expectDir) { FindClose (hff); } - /* Now recurse into all subdirectories handling the paramater in the same way */ + /* Now recurse into all subdirectories handling the parameter in the same way */ if (strstr (quals, "/S") != NULL) { char thisDir[MAX_PATH];

1 0

Francois Gouget : msi/tests: Add missing '\n' to ok() call.
by Alexandre Julliard April 30, 2007

April 30, 2007

Module: wine Branch: master Commit: 4017334ed45db36bb1afc681ab30ab70f3fae35b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4017334ed45db36bb1afc681a… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 30 02:06:41 2007 +0200 msi/tests: Add missing '\n' to ok() call. --- dlls/msi/tests/db.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 1d24f5d..9f98540 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1265,7 +1265,7 @@ static void test_streamtable(void) memset(buf, 0, MAX_PATH); r = MsiRecordReadStream( rec, 2, buf, &size ); ok( r == ERROR_SUCCESS, "Failed to get stream: %d\n", r); - ok( !lstrcmp(buf, "test.txt\n"), "Expected 'test.txt\\n', got %s", buf); + ok( !lstrcmp(buf, "test.txt\n"), "Expected 'test.txt\\n', got %s\n", buf); MsiCloseHandle( rec );

1 0