September 2011 - Wine-Commits

Francois Gouget : appwiz.cpl: Use a more standard syntax for multi-line RC file strings.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: 99494d5e8efbb67125d41d717154d7958b66d4f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99494d5e8efbb67125d41d717… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 14 00:19:18 2011 +0200 appwiz.cpl: Use a more standard syntax for multi-line RC file strings. --- dlls/appwiz.cpl/Fr.rc | 9 ++++----- dlls/appwiz.cpl/Ru.rc | 8 +++----- dlls/appwiz.cpl/Si.rc | 8 ++++---- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/appwiz.cpl/Fr.rc b/dlls/appwiz.cpl/Fr.rc index f9ed107..57ce9ea 100644 --- a/dlls/appwiz.cpl/Fr.rc +++ b/dlls/appwiz.cpl/Fr.rc @@ -75,11 +75,10 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Programme d'installation de Gecko pour Wine" FONT 8, "MS Shell Dlg" { - LTEXT "Wine n'a pu trouver de paquet Gecko, qui est nécessaire pour que les applications "\ - "incorporant du HTML puissent fonctionner correctement.\nWine peut automatiquement "\ - "le télécharger et l'installer pour vous.\n\n" \ - "Note : il est recommandé d'utiliser le paquet de votre distribution si disponible. " \ - "Consultez http://wiki.winehq.org/Gecko pour plus de détails.", + LTEXT "Wine n'a pu trouver de paquet Gecko, qui est nécessaire pour que les applications incorporant du HTML puissent fonctionner correctement.\n\ +Wine peut automatiquement le télécharger et l'installer pour vous.\n\ +\n\ +Note : il est recommandé d'utiliser le paquet de votre distribution si disponible. Consultez http://wiki.winehq.org/Gecko pour plus de détails.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Progression", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 65, 240, 12 DEFPUSHBUTTON "&Installer", ID_DWL_INSTALL, 200, 85, 50, 15, WS_GROUP | WS_TABSTOP diff --git a/dlls/appwiz.cpl/Ru.rc b/dlls/appwiz.cpl/Ru.rc index 1fcda4f..b87adc5 100644 --- a/dlls/appwiz.cpl/Ru.rc +++ b/dlls/appwiz.cpl/Ru.rc @@ -74,11 +74,9 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Установка Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "Wine не может найти пакет Gecko, который необходим для корректной работы приложений "\ - "с поддержкой HTML. " \ - "Wine может автоматически загрузить и установить его для вас.\n\n" \ - "Примечание: рекомендуется использовать пакет, предоставляемый вашим дистрибутивом. "\ - "Посетите http://wiki.winehq.org/Gecko для получения более подробной информации.", + LTEXT "Wine не может найти пакет Gecko, который необходим для корректной работы приложений с поддержкой HTML. Wine может автоматически загрузить и установить его для вас.\n\ +\n\ +Примечание: рекомендуется использовать пакет, предоставляемый вашим дистрибутивом. Посетите http://wiki.winehq.org/Gecko для получения более подробной информации.", ID_DWL_STATUS, 10, 10, 240, 70, SS_LEFT CONTROL "Прогресс", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 65, 240, 12 DEFPUSHBUTTON "&Установить", ID_DWL_INSTALL, 180, 85, 70, 15, WS_GROUP | WS_TABSTOP diff --git a/dlls/appwiz.cpl/Si.rc b/dlls/appwiz.cpl/Si.rc index 0d68fb7..bfcc62c 100644 --- a/dlls/appwiz.cpl/Si.rc +++ b/dlls/appwiz.cpl/Si.rc @@ -72,10 +72,10 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Namestitev Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "Wine ni našel paketa Gecko, ki ga aplikacije, ki uporabljajo HTML potrebujejo," \ - "da delujejo pravilno. Wine ga lahko avtomatsko prenese in namesti.\n\n" \ - "Opomba: priporočljivo je uporabiti Gecko paket od distribucije. Poglej\n "\ - "http://wiki.winehq.org/Gecko za podrobnost.", + LTEXT "Wine ni našel paketa Gecko, ki ga aplikacije, ki uporabljajo HTML potrebujejo, da delujejo pravilno. Wine ga lahko avtomatsko prenese in namesti.\n\ +\n\ +Opomba: priporočljivo je uporabiti Gecko paket od distribucije. Poglej\n\ +http://wiki.winehq.org/Gecko za podrobnost.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Napredek", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 60, 240, 12 DEFPUSHBUTTON "&Namesti", ID_DWL_INSTALL, 200, 80, 50, 15, WS_GROUP | WS_TABSTOP

1 0

Piotr Caban : msvcp90: Don't overwrite string length in basic_string::_Grow .
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: 3fbabbfd75d240724d1fbfaccd1b5f205eeb69d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fbabbfd75d240724d1fbfacc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 13 19:26:28 2011 +0200 msvcp90: Don't overwrite string length in basic_string::_Grow. --- dlls/msvcp90/string.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index d8a7728..a2cebec 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -589,7 +589,7 @@ MSVCP_bool __thiscall basic_string_char_grow( basic_string_char *this, MSVCP_size_t new_size, MSVCP_bool trim) { if(this->res < new_size) { - MSVCP_size_t new_res = new_size; + MSVCP_size_t new_res = new_size, len = this->size; char *ptr; new_res |= 0xf; @@ -613,7 +613,7 @@ MSVCP_bool __thiscall basic_string_char_grow( basic_string_char_tidy(this, TRUE, 0); this->data.ptr = ptr; this->res = new_size; - basic_string_char_eos(this, this->size); + basic_string_char_eos(this, len); } else if(trim && new_size < BUF_SIZE_CHAR) basic_string_char_tidy(this, TRUE, new_size<this->size ? new_size : this->size); @@ -1609,7 +1609,7 @@ MSVCP_bool __thiscall basic_string_wchar_grow( basic_string_wchar *this, MSVCP_size_t new_size, MSVCP_bool trim) { if(this->res < new_size) { - MSVCP_size_t new_res = new_size; + MSVCP_size_t new_res = new_size, len = this->size; wchar_t *ptr; new_res |= 0xf; @@ -1633,7 +1633,7 @@ MSVCP_bool __thiscall basic_string_wchar_grow( basic_string_wchar_tidy(this, TRUE, 0); this->data.ptr = ptr; this->res = new_size; - basic_string_wchar_eos(this, this->size); + basic_string_wchar_eos(this, len); } else if(trim && new_size < BUF_SIZE_WCHAR) basic_string_wchar_tidy(this, TRUE, new_size<this->size ? new_size : this->size);

1 0

Henri Verbeet : ddraw: Just use a static variable for scanline emulation.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: 60f6c41a6700133cb6b91019cc118319063af8ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=60f6c41a6700133cb6b91019c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 13 20:02:23 2011 +0200 ddraw: Just use a static variable for scanline emulation. Tracking it per ddraw object doesn't add much. --- dlls/ddraw/ddraw.c | 11 ++++++----- dlls/ddraw/ddraw_private.h | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index faa4125..4cf7c16 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1880,29 +1880,30 @@ static HRESULT WINAPI ddraw1_WaitForVerticalBlank(IDirectDraw *iface, DWORD flag static HRESULT WINAPI ddraw7_GetScanLine(IDirectDraw7 *iface, DWORD *Scanline) { IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); + static DWORD cur_scanline; static BOOL hide = FALSE; WINED3DDISPLAYMODE Mode; TRACE("iface %p, line %p.\n", iface, Scanline); /* This function is called often, so print the fixme only once */ - EnterCriticalSection(&ddraw_cs); if(!hide) { FIXME("iface %p, line %p partial stub!\n", iface, Scanline); hide = TRUE; } + EnterCriticalSection(&ddraw_cs); wined3d_device_get_display_mode(This->wined3d_device, 0, &Mode); + LeaveCriticalSection(&ddraw_cs); /* Fake the line sweeping of the monitor */ /* FIXME: We should synchronize with a source to keep the refresh rate */ - *Scanline = This->cur_scanline++; + *Scanline = cur_scanline++; /* Assume 20 scan lines in the vertical blank */ - if (This->cur_scanline >= Mode.Height + 20) - This->cur_scanline = 0; + if (cur_scanline >= Mode.Height + 20) + cur_scanline = 0; - LeaveCriticalSection(&ddraw_cs); return DD_OK; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 09e9aed..0731eb0 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -89,7 +89,6 @@ struct IDirectDrawImpl BOOL d3d_initialized; /* Misc ddraw fields */ - DWORD cur_scanline; BOOL fake_vblank; BOOL initialized;

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_pixel_shader() const.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: 65064a09ce539f06d1642ba5a8b5b6df9d7b3ed5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65064a09ce539f06d1642ba5a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 13 20:02:27 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_pixel_shader() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 43d51e7..bb4969c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3078,7 +3078,7 @@ HRESULT CDECL wined3d_device_set_pixel_shader(struct wined3d_device *device, str return WINED3D_OK; } -struct wined3d_shader * CDECL wined3d_device_get_pixel_shader(struct wined3d_device *device) +struct wined3d_shader * CDECL wined3d_device_get_pixel_shader(const struct wined3d_device *device) { struct wined3d_shader *shader; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 26edff1..940246c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2229,7 +2229,7 @@ HRESULT __cdecl wined3d_device_get_material(const struct wined3d_device *device, float __cdecl wined3d_device_get_npatch_mode(struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_palette_entries(struct wined3d_device *device, UINT palette_idx, PALETTEENTRY *entries); -struct wined3d_shader * __cdecl wined3d_device_get_pixel_shader(struct wined3d_device *device); +struct wined3d_shader * __cdecl wined3d_device_get_pixel_shader(const struct wined3d_device *device); void __cdecl wined3d_device_get_primitive_type(struct wined3d_device *device, WINED3DPRIMITIVETYPE *primitive_topology); HRESULT __cdecl wined3d_device_get_ps_consts_b(struct wined3d_device *device, UINT start_register, BOOL *constants, UINT bool_count);

1 0

Francois Gouget : shell32: Use a more standard syntax for multi-line RC file strings.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: dbf15a9a2991cd617ae0b37214cbd84e496cfadc URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbf15a9a2991cd617ae0b3721… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 14 00:20:59 2011 +0200 shell32: Use a more standard syntax for multi-line RC file strings. --- dlls/shell32/shell32.rc | 9 ++-- po/ar.po | 138 +++++++++++++++++++++++----------------------- po/bg.po | 138 +++++++++++++++++++++++----------------------- po/ca.po | 138 +++++++++++++++++++++++----------------------- po/cs.po | 138 +++++++++++++++++++++++----------------------- po/da.po | 138 +++++++++++++++++++++++----------------------- po/de.po | 138 +++++++++++++++++++++++----------------------- po/el.po | 138 +++++++++++++++++++++++----------------------- po/en.po | 138 +++++++++++++++++++++++----------------------- po/en_US.po | 138 +++++++++++++++++++++++----------------------- po/eo.po | 138 +++++++++++++++++++++++----------------------- po/es.po | 138 +++++++++++++++++++++++----------------------- po/fa.po | 138 +++++++++++++++++++++++----------------------- po/fi.po | 138 +++++++++++++++++++++++----------------------- po/fr.po | 138 +++++++++++++++++++++++----------------------- po/he.po | 138 +++++++++++++++++++++++----------------------- po/hi.po | 138 +++++++++++++++++++++++----------------------- po/hu.po | 138 +++++++++++++++++++++++----------------------- po/it.po | 138 +++++++++++++++++++++++----------------------- po/ja.po | 138 +++++++++++++++++++++++----------------------- po/ko.po | 138 +++++++++++++++++++++++----------------------- po/lt.po | 138 +++++++++++++++++++++++----------------------- po/ml.po | 138 +++++++++++++++++++++++----------------------- po/nb_NO.po | 138 +++++++++++++++++++++++----------------------- po/nl.po | 138 +++++++++++++++++++++++----------------------- po/or.po | 138 +++++++++++++++++++++++----------------------- po/pa.po | 138 +++++++++++++++++++++++----------------------- po/pl.po | 138 +++++++++++++++++++++++----------------------- po/pt_BR.po | 138 +++++++++++++++++++++++----------------------- po/pt_PT.po | 138 +++++++++++++++++++++++----------------------- po/rm.po | 138 +++++++++++++++++++++++----------------------- po/ro.po | 138 +++++++++++++++++++++++----------------------- po/ru.po | 138 +++++++++++++++++++++++----------------------- po/sk.po | 138 +++++++++++++++++++++++----------------------- po/sl.po | 138 +++++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 138 +++++++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 138 +++++++++++++++++++++++----------------------- po/sv.po | 138 +++++++++++++++++++++++----------------------- po/te.po | 138 +++++++++++++++++++++++----------------------- po/th.po | 138 +++++++++++++++++++++++----------------------- po/tr.po | 138 +++++++++++++++++++++++----------------------- po/uk.po | 138 +++++++++++++++++++++++----------------------- po/wa.po | 138 +++++++++++++++++++++++----------------------- po/wine.pot | 138 +++++++++++++++++++++++----------------------- po/zh_CN.po | 138 +++++++++++++++++++++++----------------------- po/zh_TW.po | 138 +++++++++++++++++++++++----------------------- 46 files changed, 3110 insertions(+), 3109 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dbf15a9a2991cd617ae0b…

1 0

Henri Verbeet : wined3d: Make the device parameter to device_unit_free_for_vs() const.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: 8a12e951e63fafc52546b84e53491cbdf8c98d9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a12e951e63fafc52546b84e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 13 20:02:26 2011 +0200 wined3d: Make the device parameter to device_unit_free_for_vs() const. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1dc6cbc..43d51e7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2954,7 +2954,7 @@ static void device_map_psamplers(struct wined3d_device *device, const struct win } } -static BOOL device_unit_free_for_vs(struct wined3d_device *device, +static BOOL device_unit_free_for_vs(const struct wined3d_device *device, const WINED3DSAMPLER_TEXTURE_TYPE *pshader_sampler_tokens, const WINED3DSAMPLER_TEXTURE_TYPE *vshader_sampler_tokens, DWORD unit) {

1 0

Piotr Caban : wininet: Make it possible to ignore CERT_TRUST_IS_PARTIAL_CHAIN error in netconn_verify_cert .
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: e80e73586d91ffeeba68c8737d82b6321b91290d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e80e73586d91ffeeba68c8737… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 13 19:27:04 2011 +0200 wininet: Make it possible to ignore CERT_TRUST_IS_PARTIAL_CHAIN error in netconn_verify_cert. --- dlls/wininet/netconnection.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 060acc6..dd887eb 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -238,6 +238,7 @@ static DWORD netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, static const DWORD supportedErrors = CERT_TRUST_IS_NOT_TIME_VALID | CERT_TRUST_IS_UNTRUSTED_ROOT | + CERT_TRUST_IS_PARTIAL_CHAIN | CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN | CERT_TRUST_IS_REVOKED | @@ -247,7 +248,7 @@ static DWORD netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, !(security_flags & SECURITY_FLAG_IGNORE_CERT_DATE_INVALID)) err = ERROR_INTERNET_SEC_CERT_DATE_INVALID; else if (chain->TrustStatus.dwErrorStatus & - CERT_TRUST_IS_UNTRUSTED_ROOT && + (CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_PARTIAL_CHAIN) && !(security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) err = ERROR_INTERNET_INVALID_CA; else if (!(security_flags & SECURITY_FLAG_IGNORE_REVOCATION) &&

1 0

Henri Verbeet : ddraw: Just use a static variable for vblank emulation.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: 8173e6f539ebd4f34919a523d3148fef38cf5bcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8173e6f539ebd4f34919a523d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 13 20:02:24 2011 +0200 ddraw: Just use a static variable for vblank emulation. --- dlls/ddraw/ddraw.c | 13 ++++--------- dlls/ddraw/ddraw_private.h | 1 - 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 4cf7c16..3e3bf60 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1520,21 +1520,16 @@ static HRESULT WINAPI ddraw1_GetMonitorFrequency(IDirectDraw *iface, DWORD *freq *****************************************************************************/ static HRESULT WINAPI ddraw7_GetVerticalBlankStatus(IDirectDraw7 *iface, BOOL *status) { - IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); + static BOOL fake_vblank; TRACE("iface %p, status %p.\n", iface, status); - /* This looks sane, the MSDN suggests it too */ - EnterCriticalSection(&ddraw_cs); if(!status) - { - LeaveCriticalSection(&ddraw_cs); return DDERR_INVALIDPARAMS; - } - *status = This->fake_vblank; - This->fake_vblank = !This->fake_vblank; - LeaveCriticalSection(&ddraw_cs); + *status = fake_vblank; + fake_vblank = !fake_vblank; + return DD_OK; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 0731eb0..80dd53d 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -89,7 +89,6 @@ struct IDirectDrawImpl BOOL d3d_initialized; /* Misc ddraw fields */ - BOOL fake_vblank; BOOL initialized; /* DirectDraw things, which are not handled by WineD3D */

1 0

Frédéric Delanoy : cmd/tests: Segment mkdir tests for an easier read.
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

Module: wine Branch: master Commit: 8fff969ce6ba55568e8002ce48896b2c0a333402 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fff969ce6ba55568e8002ce4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Sep 12 20:28:03 2011 +0200 cmd/tests: Segment mkdir tests for an easier read. --- programs/cmd/tests/test_builtins.cmd | 12 ++++++------ programs/cmd/tests/test_builtins.cmd.exp | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 046e6e4..7551e57 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -881,14 +881,14 @@ rmdir "foo bar" echo ----------- Testing mkdir ----------- call :setError 0 -rem md and mkdir are synonymous +echo ... md and mkdir are synonymous ... mkdir foobar echo %ErrorLevel% rmdir foobar md foobar echo %ErrorLevel% rmdir foobar -rem Creating an already existing directory/file must fail +echo ... creating an already existing directory/file must fail ... mkdir foobar md foobar echo %ErrorLevel% @@ -897,7 +897,7 @@ echo > foobar mkdir foobar echo %ErrorLevel% del foobar -rem Multi-level path creation +echo ... multilevel path creation ... mkdir foo echo %ErrorLevel% mkdir foo\bar\baz @@ -922,13 +922,13 @@ rmdir bar cd .. rmdir foo echo %ErrorLevel% -rem Trailing backslashes +echo ... trailing backslashes ... mkdir foo\\\\ echo %ErrorLevel% if exist foo (rmdir foo & echo dir created ) else ( echo dir not created ) echo %ErrorLevel% -rem Invalid chars +echo ... invalid chars ... mkdir ? echo mkdir ? gives errorlevel %ErrorLevel% call :setError 0 @@ -954,7 +954,7 @@ if not exist foo ( cd .. rmdir foo ) -rem multiples directories at once +echo ... multiple directories at once ... mkdir foobaz & cd foobaz mkdir foo bar\baz foobar if exist foo (echo foo created) else echo foo not created! diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 1e2e3df..733e1d5 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -595,10 +595,13 @@ del /q * succeeded on file1 del /q * succeeded on file2.dat ------------ Testing del /s -------------- ----------- Testing mkdir ----------- +... md and mkdir are synonymous ... 0 0 +... creating an already existing directory/file must fail ... 1 1 +... multilevel path creation ... 0 0 0 @@ -607,15 +610,18 @@ del /q * succeeded on file2.dat 1 0 0 +... trailing backslashes ... 0 dir created 0 +... invalid chars ... mkdir ? gives errorlevel 1 mkdir ?\foo gives errorlevel 1 mkdir foo\? gives errorlevel 1 ok, foo created mkdir foo\bar\? gives errorlevel 1 ok, foo\bar created +... multiple directories at once ... foo created bar created foobar created

1 0

Nikolay Sivov : shell32/tests: Make test explicit about return pointer.
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

Module: wine Branch: master Commit: c03f813c872d790a7c77d81810aa0cac425f4abc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c03f813c872d790a7c77d8181… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 11 20:19:35 2011 +0400 shell32/tests: Make test explicit about return pointer. --- dlls/shell32/tests/shelldispatch.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index a2b649a..2ccc364 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -84,10 +84,12 @@ static void test_namespace(void) V_VT(&var) = VT_I4; V_I4(&var) = -1; + folder = (void*)0xdeadbeef; r = IShellDispatch_NameSpace(sd, var, &folder); - todo_wine + todo_wine { ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); - + ok(folder == NULL, "got %p\n", folder); +} V_VT(&var) = VT_I4; V_I4(&var) = ssfPROGRAMFILES; r = IShellDispatch_NameSpace(sd, var, &folder);

1 0