June 2010 - Wine-Commits - list.winehq.org

Henri Verbeet : ddraw: Avoid an integer overflow in IDirectDrawSurfaceImpl_BltFast().
by Alexandre Julliard June 24, 2010

June 24, 2010

Module: wine Branch: master Commit: cf39adbaa2ad80980f8d8f03a9d8802ef7cbd4fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf39adbaa2ad80980f8d8f03a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 24 12:10:03 2010 +0200 ddraw: Avoid an integer overflow in IDirectDrawSurfaceImpl_BltFast(). Bug spotted by Iain Arnell, test by Iain Arnell. --- dlls/ddraw/surface.c | 28 ++++++++++++++++------------ dlls/ddraw/tests/dsurface.c | 8 ++++++++ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index bfe83a4..ef7b381 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2077,9 +2077,13 @@ IDirectDrawSurfaceImpl_BltFast(IDirectDrawSurface7 *iface, { IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; IDirectDrawSurfaceImpl *src = (IDirectDrawSurfaceImpl *)Source; + DWORD src_w, src_h, dst_w, dst_h; HRESULT hr; TRACE("(%p)->(%d,%d,%p,%p,%d): Relay\n", This, dstx, dsty, Source, rsrc, trans); + dst_w = This->surface_desc.dwWidth; + dst_h = This->surface_desc.dwHeight; + /* Source must be != NULL, This is not checked by windows. Windows happily throws a 0xc0000005 * in that case */ @@ -2092,21 +2096,21 @@ IDirectDrawSurfaceImpl_BltFast(IDirectDrawSurface7 *iface, WARN("Source rectangle is invalid, returning DDERR_INVALIDRECT\n"); return DDERR_INVALIDRECT; } - if(dstx + rsrc->right - rsrc->left > This->surface_desc.dwWidth || - dsty + rsrc->bottom - rsrc->top > This->surface_desc.dwHeight) - { - WARN("Destination area out of bounds, returning DDERR_INVALIDRECT\n"); - return DDERR_INVALIDRECT; - } + + src_w = rsrc->right - rsrc->left; + src_h = rsrc->bottom - rsrc->top; } else { - if(dstx + src->surface_desc.dwWidth > This->surface_desc.dwWidth || - dsty + src->surface_desc.dwHeight > This->surface_desc.dwHeight) - { - WARN("Destination area out of bounds, returning DDERR_INVALIDRECT\n"); - return DDERR_INVALIDRECT; - } + src_w = src->surface_desc.dwWidth; + src_h = src->surface_desc.dwHeight; + } + + if (src_w > dst_w || dstx > dst_w - src_w + || src_h > dst_h || dsty > dst_h - src_h) + { + WARN("Destination area out of bounds, returning DDERR_INVALIDRECT.\n"); + return DDERR_INVALIDRECT; } EnterCriticalSection(&ddraw_cs); diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index bfd5eae..20e8634 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2537,6 +2537,14 @@ static void BltParamTest(void) ok(hr == DDERR_INVALIDRECT, "BltFast with a rectangle resulting in an off-surface write returned %08x\n", hr); hr = IDirectDrawSurface_BltFast(surface1, 90, 90, surface2, NULL, 0); ok(hr == DDERR_INVALIDRECT, "BltFast with a rectangle resulting in an off-surface write returned %08x\n", hr); + + hr = IDirectDrawSurface_BltFast(surface1, -10, 0, surface2, NULL, 0); + ok(hr == DDERR_INVALIDRECT, "BltFast with an offset resulting in an off-surface write returned %08x\n", hr); + hr = IDirectDrawSurface_BltFast(surface1, 0, -10, surface2, NULL, 0); + ok(hr == DDERR_INVALIDRECT, "BltFast with an offset resulting in an off-surface write returned %08x\n", hr); + hr = IDirectDrawSurface_BltFast(surface2, 20, 20, surface1, &valid, 0); + ok(hr == DD_OK, "BltFast from bigger to smaller surface using a valid rectangle and offset returned %08x\n", hr); + hr = IDirectDrawSurface_BltFast(surface2, 0, 0, surface1, &invalid1, 0); ok(hr == DDERR_INVALIDRECT, "BltFast with invalid rectangle 1 returned %08x\n", hr); hr = IDirectDrawSurface_BltFast(surface2, 0, 0, surface1, &invalid2, 0);

1 0

Michael Stefaniuc : jscript: Update the Romanian translation.
by Alexandre Julliard June 24, 2010

June 24, 2010

Module: wine Branch: master Commit: 8aa9185a52b39eafa8a2980dec27b02c54489074 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aa9185a52b39eafa8a2980de… Author: Michael Stefaniuc <mstefani(a)redhat.com> Date: Thu Jun 24 10:38:13 2010 +0200 jscript: Update the Romanian translation. Based on comments from Octavian Voicu. --- dlls/jscript/jscript_Ro.rc | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/jscript_Ro.rc b/dlls/jscript/jscript_Ro.rc index 066e200..481e629 100644 --- a/dlls/jscript/jscript_Ro.rc +++ b/dlls/jscript/jscript_Ro.rc @@ -32,20 +32,20 @@ STRINGTABLE DISCARDABLE IDS_NO_PROPERTY "Obiectul nu suportă această proprietate sau metodă" IDS_ARG_NOT_OPT "Argumentul nu este opțional" IDS_SYNTAX_ERROR "Eroare de sintaxă" - IDS_SEMICOLON "„;” presupus" - IDS_LBRACKET "„(” presupus" - IDS_RBRACKET "„)” presupus" - IDS_UNTERMINATED_STR "Constantă de șir nedeterminată" - IDS_NOT_FUNC "Funcție presupusă" + IDS_SEMICOLON "Se așteaptă „;”" + IDS_LBRACKET "Se așteaptă „(”" + IDS_RBRACKET "Se așteaptă „)”" + IDS_UNTERMINATED_STR "Șir constant neterminat" + IDS_NOT_FUNC "Se așteaptă o funcție" IDS_NOT_DATE "„[obiect]” nu este un obiect de tip dată" - IDS_NOT_NUM "Număr presupus" - IDS_OBJECT_EXPECTED "Obiect presupus" + IDS_NOT_NUM "Se așteaptă un număr" + IDS_OBJECT_EXPECTED "Se așteaptă un obiect" IDS_ILLEGAL_ASSIGN "Atribuire ilegală" IDS_UNDEFINED "„|” nu este definit" - IDS_NOT_BOOL "Obiect boolean presupus" - IDS_JSCRIPT_EXPECTED "Obiect JScript presupus" - IDS_REGEXP_SYNTAX_ERROR "Eroare de sintaxă în expresie rațională" + IDS_NOT_BOOL "Se așteaptă un obiect boolean" + IDS_JSCRIPT_EXPECTED "Se așteaptă un obiect JScript" + IDS_REGEXP_SYNTAX_ERROR "Eroare de sintaxă în expresia regulată" IDS_URI_INVALID_CHAR "URI care trebuie codificat conține caractere nevalide" IDS_INVALID_LENGTH "Lungimea unei matrice trebuie să fie un număr întreg pozitiv" - IDS_ARRAY_EXPECTED "Obiect matrice presupus" + IDS_ARRAY_EXPECTED "Se așteaptă un obiect matrice" }

1 0

Jacek Caban : mshtml: Use correct iexplore.exe path in mshtml.inf.
by Alexandre Julliard June 24, 2010

June 24, 2010

Module: wine Branch: master Commit: eaa227c12d8bb7bd56177c2f2124b046795b0498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa227c12d8bb7bd56177c2f2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 24 16:17:54 2010 +0200 mshtml: Use correct iexplore.exe path in mshtml.inf. --- dlls/mshtml/mshtml.inf | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/mshtml.inf b/dlls/mshtml/mshtml.inf index 7789334..d7d2428 100644 --- a/dlls/mshtml/mshtml.inf +++ b/dlls/mshtml/mshtml.inf @@ -91,7 +91,7 @@ HKCR,"CLSID\%CLSID_CRecalcEngine%\InProcServer32","ThreadingModel",,"Apartment" ;; CrSource HKCR,"CLSID\%CLSID_CrSource%",,,"Microsoft CrSource 4.0" HKCR,"CLSID\%CLSID_CrSource%\BrowseInPlace",,16 -HKCR,"CLSID\%CLSID_CrSource%\DefaultIcon",,0x00020000,"%IEXPLORE%,1" +HKCR,"CLSID\%CLSID_CrSource%\DefaultIcon",,0x00020000,"%16422%\Internet Explorer\iexplore.exe,1" HKCR,"CLSID\%CLSID_CrSource%\EnablePlugin\.css",,,"PointPlus plugin" HKCR,"CLSID\%CLSID_CrSource%\InProcServer32",,,"mshtml.dll" HKCR,"CLSID\%CLSID_CrSource%\InProcServer32","ThreadingModel",,"Apartment" @@ -122,7 +122,7 @@ HKCR,"CLSID\%CLSID_HTADocument%\Version",,,"6.0" ;; HTMLDocument HKCR,"CLSID\%CLSID_HTMLDocument%",,,"HTML Document" HKCR,"CLSID\%CLSID_HTMLDocument%\BrowseInPlace",,16 -HKCR,"CLSID\%CLSID_HTMLDocument%\DefaultIcon",,0x00020000,"%IEXPLORE%,1" +HKCR,"CLSID\%CLSID_HTMLDocument%\DefaultIcon",,0x00020000,"%16422%\Internet Explorer\iexplore.exe,1" HKCR,"CLSID\%CLSID_HTMLDocument%\InProcServer32",,,"mshtml.dll" HKCR,"CLSID\%CLSID_HTMLDocument%\InProcServer32","ThreadingModel",,"Apartment" HKCR,"CLSID\%CLSID_HTMLDocument%\MiscStatus",,,"2228625" @@ -215,7 +215,7 @@ HKCR,"CLSID\%CLSID_MailtoProtocol%\InProcServer32","ThreadingModel",,"Apartment" ;; MHTMLDocument HKCR,"CLSID\%CLSID_MHTMLDocument%",,,"MHTML Document" HKCR,"CLSID\%CLSID_MHTMLDocument%\BrowseInPlace",,16 -HKCR,"CLSID\%CLSID_MHTMLDocument%\DefaultIcon",,0x00020000,"%IEXPLORE%,1" +HKCR,"CLSID\%CLSID_MHTMLDocument%\DefaultIcon",,0x00020000,"%16422%\Internet Explorer\iexplore.exe,1" HKCR,"CLSID\%CLSID_MHTMLDocument%\InProcServer32",,,"mshtml.dll" HKCR,"CLSID\%CLSID_MHTMLDocument%\InProcServer32","ThreadingModel",,"Apartment" HKCR,"CLSID\%CLSID_MHTMLDocument%\MiscStatus",,,"2228625" @@ -236,7 +236,7 @@ HKCR,"CLSID\%CLSID_Scriptlet%\MiscStatus",,,"0" HKCR,"CLSID\%CLSID_Scriptlet%\MiscStatus\1",,,"131473" HKCR,"CLSID\%CLSID_Scriptlet%\ProgID",,,"ScriptBridge.ScriptBridge.1" HKCR,"CLSID\%CLSID_Scriptlet%\Programmable",,16 -HKCR,"CLSID\%CLSID_Scriptlet%\ToolboxBitmap32",,,"%IEXPLORE%,1" +HKCR,"CLSID\%CLSID_Scriptlet%\ToolboxBitmap32",,,"%16422%\Internet Explorer\iexplore.exe,1" HKCR,"CLSID\%CLSID_Scriptlet%\TypeLib",,,"%LIBID_MSHTML%" HKCR,"CLSID\%CLSID_Scriptlet%\Version",,,"4.0" HKCR,"CLSID\%CLSID_Scriptlet%\VersionIndependentProgID",,,"ScriptBridge.ScriptBridge" @@ -312,11 +312,11 @@ HKCR,".gif",,2,"giffile" HKCR,".gif","Content Type",,"image/gif" HKCR,"giffile",,,"GIF Image" HKCR,"giffile\CLSID",,,"%CLSID_HTMLDocument%" -HKCR,"giffile\shell\open\command",,,"""%IEXPLORE%"" -nohome" +HKCR,"giffile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" HKCR,"giffile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"giffile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"giffile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" -;; HKCR,"giffile\DefaultIcon",,,"%IEXPLORE%,9" +;; HKCR,"giffile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,9" ;; GZIP HKCR,"MIME\Database\Content Type\application/x-gzip","Extension",,".gz" @@ -339,7 +339,7 @@ HKCR,"htmlfile\shell\printto\command",,,"rundll32.exe mshtml.dll,PrintHTML ""%%1 HKCR,"htmlfile",,,"HTML Document" HKCR,"htmlfile\BrowseInPlace",,16 HKCR,"htmlfile\CLSID",,,"%CLSID_HTMLDocument%" -HKCR,"htmlfile\DefaultIcon",,0x00020000,"%IEXPLORE%,1" +HKCR,"htmlfile\DefaultIcon",,0x00020000,"%16422%\Internet Explorer\iexplore.exe,1" HKCR,"htmlfile_FullWindowEmbed",,,"HTML Plugin Document" HKCR,"htmlfile_FullWindowEmbed\BrowseInPlace",,16 HKCR,"htmlfile_FullWindowEmbed\CLSID",,,"%CLSID_HTMLPluginDocument%" @@ -359,11 +359,11 @@ HKCR,".jpe",,2,"jpegfile" HKCR,".jpe","Content Type",,"image/jpeg" HKCR,"jpegfile",,,"JPEG Image" HKCR,"jpegfile\CLSID",,,"%CLSID_HTMLDocument%" -HKCR,"jpegfile\shell\open\command",,,"""%IEXPLORE%"" -nohome" +HKCR,"jpegfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" -;; HKCR,"jpegfile\DefaultIcon",,,"%IEXPLORE%,8" +;; HKCR,"jpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8" ;; JPEG HKCR,"MIME\Database\Content Type\image/jpeg","CLSID",,"%CLSID_HTMLDocument%" @@ -374,22 +374,22 @@ HKCR,".jpeg",,2,"jpegfile" HKCR,".jpeg","Content Type",,"image/jpeg" HKCR,"jpegfile",,,"JPEG Image" HKCR,"jpegfile\CLSID",,,"%CLSID_HTMLDocument%" -HKCR,"jpegfile\shell\open\command",,,"""%IEXPLORE%"" -nohome" +HKCR,"jpegfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" -;; HKCR,"jpegfile\DefaultIcon",,,"%IEXPLORE%,8" +;; HKCR,"jpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8" ;; JPG HKCR,".jpg",,2,"jpegfile" HKCR,".jpg","Content Type",,"image/jpeg" HKCR,"jpegfile",,,"JPEG Image" HKCR,"jpegfile\CLSID",,,"%CLSID_HTMLDocument%" -HKCR,"jpegfile\shell\open\command",,,"""%IEXPLORE%"" -nohome" +HKCR,"jpegfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" -;; HKCR,"jpegfile\DefaultIcon",,,"%IEXPLORE%,8" +;; HKCR,"jpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8" ;; MHTML HKCR,"MIME\Database\Content Type\message/rfc822","CLSID",,"%CLSID_MHTMLDocument%" @@ -422,11 +422,11 @@ HKCR,".jfif",,2,"pjpegfile" HKCR,".jfif","Content Type",,"image/jpeg" HKCR,"pjpegfile",,,"JPEG Image" HKCR,"pjpegfile\CLSID",,,"%CLSID_HTMLDocument%" -HKCR,"pjpegfile\shell\open\command",,,"""%IEXPLORE%"" -nohome" +HKCR,"pjpegfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" HKCR,"pjpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"pjpegfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"pjpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" -;; HKCR,"pjpegfile\DefaultIcon",,,"%IEXPLORE%,8" +;; HKCR,"pjpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8" ;; PNG HKCR,"MIME\Database\Content Type\image/png","Extension",,".png" @@ -435,11 +435,11 @@ HKCR,".png",,2,"pngfile" HKCR,".png","Content Type",,"image/png" HKCR,"pngfile",,,"PNG Image" HKCR,"pngfile\CLSID",,,"%CLSID_HTMLDocument%" -HKCR,"pngfile\shell\open\command",,,"""%IEXPLORE%"" -nohome" +HKCR,"pngfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe""" -nohome" HKCR,"pngfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"pngfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"pngfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" -;; HKCR,"pngfile\DefaultIcon",,,"%IEXPLORE%,9" +;; HKCR,"pngfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,9" ;; PS HKCR,"MIME\Database\Content Type\application/postscript","Extension",,".ps" @@ -478,11 +478,11 @@ HKCR,"MIME\Database\Content Type\image/x-xbitmap","CLSID",,"%CLSID_HTMLDocument% HKCR,".xbm","Content Type",,"image/x-xbitmap" HKCR,"xbmfile",,,"XBM Image" HKCR,"xbmfile\CLSID",,,"%CLSID_HTMLDocument%" -HKCR,"xbmfile\shell\open\command",,,"""%IEXPLORE%"" -nohome" +HKCR,"xbmfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" HKCR,"xbmfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"xbmfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"xbmfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" -;; HKCR,"xbmfile\DefaultIcon",,,"%IEXPLORE%,9" +;; HKCR,"xbmfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,9" ;; XML HKCR,"MIME\Database\Content Type\application/xml","CLSID",,"{48123BC4-99D9-11D1-A6B3-00C04FD91555}"

1 0

Francois Gouget : wineboot: Remove a space before an ellipsis in the Norwegian (Bokmal) translation.
by Alexandre Julliard June 24, 2010

June 24, 2010

Module: wine Branch: master Commit: 78dca6d6164b5902d101216b6bc5f46b61fc54ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=78dca6d6164b5902d101216b6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 24 10:25:22 2010 +0200 wineboot: Remove a space before an ellipsis in the Norwegian (Bokmal) translation. --- programs/wineboot/wineboot_No.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineboot/wineboot_No.rc b/programs/wineboot/wineboot_No.rc index 1e7b90a..ce7a3bf 100644 --- a/programs/wineboot/wineboot_No.rc +++ b/programs/wineboot/wineboot_No.rc @@ -44,6 +44,6 @@ CAPTION "Wine" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_WAITICON, 3, 3, 10, 10 - LTEXT "Vent mes Wine-oppsettet i «%s» blir oppdatert ...", + LTEXT "Vent mes Wine-oppsettet i «%s» blir oppdatert...", IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX END

1 0

Francois Gouget : Assorted typo and spelling fixes.
by Alexandre Julliard June 24, 2010

June 24, 2010

Module: wine Branch: master Commit: 7649c75b40506221179296388c5d38891cda03e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7649c75b40506221179296388… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 24 10:18:34 2010 +0200 Assorted typo and spelling fixes. --- dlls/d3dx9_36/tests/asm.c | 6 +++--- dlls/dbghelp/cpu_x86_64.c | 2 +- dlls/ddraw/ddraw.c | 2 +- dlls/mmdevapi/audio.c | 2 +- dlls/mmdevapi/audiovolume.c | 2 +- dlls/mmdevapi/tests/capture.c | 4 ++-- dlls/msvcrt/tests/misc.c | 2 +- dlls/oleaut32/tests/olepicture.c | 4 ++-- dlls/setupx.dll16/setupx_main.c | 2 +- dlls/shell32/tests/shellpath.c | 2 +- dlls/urlmon/tests/uri.c | 2 +- dlls/usp10/bidi.c | 2 +- dlls/wined3d/surface.c | 2 +- dlls/winejoystick.drv/joystick.c | 4 ++-- dlls/winex11.drv/xim.c | 2 +- 15 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 276a6e2..23ec484 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -1362,13 +1362,13 @@ static void failure_test(void) { /* shader 42: no modifiers with vs dcl sampler instruction */ "vs_3_0\n" "dcl_2d_pp s0\n", - /* shader 43: can't explicitely declare input registers in ps_2_0 */ + /* shader 43: can't explicitly declare input registers in ps_2_0 */ "ps_2_0\n" "dcl_texcoord0 t0\n", - /* shader 44: can't implicitely declare registers in vs */ + /* shader 44: can't implicitly declare registers in vs */ "vs_2_0\n" "dcl o0\n", - /* shader 45: can't implicitely declare samplers in vs */ + /* shader 45: can't implicitly declare samplers in vs */ "vs_3_0\n" "dcl s2\n", /* shader 46: no tx registers in ps_3_0 */ diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index f07d8e4..7b719ce 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -238,7 +238,7 @@ static void dump_unwind_info(HANDLE hProcess, ULONG64 base, RUNTIME_FUNCTION *fu } } -/* highly derivated from dlls/ntdlls/signal_x86_64.c */ +/* highly derived from dlls/ntdll/signal_x86_64.c */ static ULONG64 get_int_reg(CONTEXT *context, int reg) { return *(&context->Rax + reg); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 7d6558d..d5511ad 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -345,7 +345,7 @@ IDirectDrawImpl_Release(IDirectDraw7 *iface) * DDSCL_SETDEVICEWINDOW: Sets a window specially used for rendering (I don't * expect any difference to a normal window for wine) * DDSCL_CREATEDEVICEWINDOW: Tells ddraw to create its own window for - * rendering (Possible test case: Half-life) + * rendering (Possible test case: Half-Life) * * Unsure about these: DDSCL_FPUSETUP DDSCL_FPURESERVE * diff --git a/dlls/mmdevapi/audio.c b/dlls/mmdevapi/audio.c index e0a7ac5..ddd97e8 100644 --- a/dlls/mmdevapi/audio.c +++ b/dlls/mmdevapi/audio.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 Maarten Lankhorst for Codeweavers + * Copyright 2010 Maarten Lankhorst for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c index 61cbed4..5e8994a 100644 --- a/dlls/mmdevapi/audiovolume.c +++ b/dlls/mmdevapi/audiovolume.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 Maarten Lankhorst for Codeweavers + * Copyright 2010 Maarten Lankhorst for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index b5c4883..1bedfc6 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 Maarten Lankhorst for Codeweavers + * Copyright 2010 Maarten Lankhorst for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -244,7 +244,7 @@ static void test_audioclient(IAudioClient *ac) ok(hr == E_INVALIDARG, "Initialize with invalid flags returns %08x\n", hr); /* It seems that if length > 2s or periodicity != 0 the length is ignored and call succeeds - * Since we can only initialize succesfully once skip those tests + * Since we can only initialize successfully once skip those tests */ hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, NULL, NULL); ok(hr == E_POINTER, "Initialize with null format returns %08x\n", hr); diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index 82dda5d..0e45eba 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -96,7 +96,7 @@ static void test_memcpy_s(void) ret = pmemcpy_s(data, 10, data, 10); ok(ret == 0, "ret = %x\n", ret); ok(errno == 0xdeadbeef, "errno = %x\n", errno); - ok(!memcmp(dest, data, 5), "data was destroyed during overwritting\n"); + ok(!memcmp(dest, data, 5), "data was destroyed during overwriting\n"); errno = 0xdeadbeef; dest[0] = 'x'; diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 3208368..ab4fb48 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -829,7 +829,7 @@ static void test_OleLoadPicturePath(void) DeleteFileA(temp_file); - /* Try with a non-existent file. */ + /* Try with a nonexistent file. */ hres = OleLoadPicturePath(temp_fileW + 8, NULL, 0, 0, &IID_IPicture, (void **)&pic); ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ hres == E_UNEXPECTED || /* NT4/Win95 */ @@ -865,7 +865,7 @@ static void test_OleLoadPicturePath(void) DeleteFileA(temp_file); - /* Try with a non-existent file. */ + /* Try with a nonexistent file. */ hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic); ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ hres == E_UNEXPECTED || /* NT4/Win95 */ diff --git a/dlls/setupx.dll16/setupx_main.c b/dlls/setupx.dll16/setupx_main.c index 3c37e1e..adc5900 100644 --- a/dlls/setupx.dll16/setupx_main.c +++ b/dlls/setupx.dll16/setupx_main.c @@ -29,7 +29,7 @@ * Stuff tested with: * - rs405deu.exe (German Acroread 4.05 setup) * - ie5setup.exe - * - Netmeeting + * - NetMeeting * * FIXME: * - string handling is... weird ;) (buflen etc.) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 33e0789..b874b5a 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -727,7 +727,7 @@ static void doChild(const char *arg) trace("CSIDL_FAVORITES was changed to %s\n", path); ret = CreateDirectoryA(path, NULL); - ok(!ret, "expected failure with with ERROR_ALREADY_EXISTS\n"); + ok(!ret, "expected failure with ERROR_ALREADY_EXISTS\n"); if (!ret) ok(GetLastError() == ERROR_ALREADY_EXISTS, "got %d, expected ERROR_ALREADY_EXISTS\n", GetLastError()); diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 6a3f306..31f22a5 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -1254,7 +1254,7 @@ static void test_IUri_GetPropertyLength(void) { expectedLen = lstrlen(prop.value); - /* This won't be neccessary once GetPropertyLength is implemented. */ + /* This won't be necessary once GetPropertyLength is implemented. */ receivedLen = -1; hr = IUri_GetPropertyLength(uri, j, &receivedLen, 0); diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 8af28e7..0538fa5 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -851,7 +851,7 @@ int BIDI_ReorderV2lLevel(int level, int *pIndexs, const BYTE* plevel, int cch, B return ich; } -/* Applies the reorder in reverse. Taking an already reordered string and returing the original */ +/* Applies the reorder in reverse. Taking an already reordered string and returning the original */ int BIDI_ReorderL2vLevel(int level, int *pIndexs, const BYTE* plevel, int cch, BOOL fReverse) { int ich = 0; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 08835a8..e21086f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3276,7 +3276,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface, && dst_surface == dstSwapchain->front_buffer && src_surface == dstSwapchain->back_buffers[0]) { - /* Half-life does a Blt from the back buffer to the front buffer, + /* Half-Life does a Blt from the back buffer to the front buffer, * Full surface size, no flags... Use present instead * * This path will only be entered for d3d7 and ddraw apps, because d3d8/9 offer no way to blit TO the front buffer diff --git a/dlls/winejoystick.drv/joystick.c b/dlls/winejoystick.drv/joystick.c index 9a6902e..95d9c32 100644 --- a/dlls/winejoystick.drv/joystick.c +++ b/dlls/winejoystick.drv/joystick.c @@ -230,10 +230,10 @@ static const WCHAR ini[] = {'W','i','n','e',' ','J','o','y','s','t','i','c','k', lpCaps->wZmin = 0; lpCaps->wZmax = (nrOfAxes >= 3) ? 0xFFFF : 0; #ifdef BODGE_THE_HAT - /* HalfLife won't allow you to map an axis event to things like + /* Half-Life won't allow you to map an axis event to things like "next weapon" and "use". Linux reports the hat on my stick as axis U and V. So, IFF BODGE_THE_HAT is defined, lie through our - teeth and say we have 32 buttons, and we will map the axises to + teeth and say we have 32 buttons, and we will map the axes to the high buttons. Really, perhaps this should be a registry entry, or even a parameter to the Linux joystick driver (which would completely remove the need for this.) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 6daa075..791139e 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -51,7 +51,7 @@ static DWORD dwCompStringSize = 0; #define STYLE_ROOT (XIMPreeditNothing | XIMStatusNothing) /* this uses all the callbacks to utilize full IME support */ #define STYLE_CALLBACK (XIMPreeditCallbacks | XIMStatusNothing) -/* inorder to enable deadkey support */ +/* in order to enable deadkey support */ #define STYLE_NONE (XIMPreeditNothing | XIMStatusNothing) static XIMStyle ximStyle = 0;

1 0

Francois Gouget : winhlp32: Remove a space before an ellipsis in the Dutch translation.
by Alexandre Julliard June 24, 2010

June 24, 2010

Module: wine Branch: master Commit: 6724fc2604effd59dcc23cf8ee070e30c7c009d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6724fc2604effd59dcc23cf8e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 24 10:24:06 2010 +0200 winhlp32: Remove a space before an ellipsis in the Dutch translation. --- programs/winhlp32/Nl.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhlp32/Nl.rc b/programs/winhlp32/Nl.rc index 0a4594a..9294856 100644 --- a/programs/winhlp32/Nl.rc +++ b/programs/winhlp32/Nl.rc @@ -113,7 +113,7 @@ BEGIN BEGIN MENUITEM "Annotering...", MNID_CTXT_ANNOTATE MENUITEM "Kopiëren", MNID_CTXT_COPY - MENUITEM "Afdrukken ...", MNID_CTXT_PRINT + MENUITEM "Afdrukken...", MNID_CTXT_PRINT POPUP "Lettertype" BEGIN MENUITEM "Klein", MNID_CTXT_FONTS_SMALL

1 0

Alexandre Julliard : kernel32: Avoid returning the same name when GetTempFileName is called twice in a short interval .
by Alexandre Julliard June 24, 2010

June 24, 2010

Module: wine Branch: master Commit: 9f7bc109d20a07367875fcd6044dbaad41d9eb7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f7bc109d20a07367875fcd60… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 24 11:01:56 2010 +0200 kernel32: Avoid returning the same name when GetTempFileName is called twice in a short interval. --- dlls/kernel32/path.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index f0da96c..0e69f91 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -684,7 +684,10 @@ UINT WINAPI GetTempFileNameW( LPCWSTR path, LPCWSTR prefix, UINT unique, LPWSTR /* get a "random" unique number and try to create the file */ HANDLE handle; UINT num = GetTickCount() & 0xffff; + static UINT last; + /* avoid using the same name twice in a short interval */ + if (last - num < 10) num = last + 1; if (!num) num = 1; unique = num; do @@ -696,6 +699,7 @@ UINT WINAPI GetTempFileNameW( LPCWSTR path, LPCWSTR prefix, UINT unique, LPWSTR { /* We created it */ TRACE("created %s\n", debugstr_w(buffer) ); CloseHandle( handle ); + last = unique; break; } if (GetLastError() != ERROR_FILE_EXISTS &&

1 0

Francois Gouget : programs: Add a space before ellipses in the Slovenian translation.
by Alexandre Julliard June 24, 2010

June 24, 2010

Module: wine Branch: master Commit: e5a19a51631d6e3d02374152392cd758ad31dcc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5a19a51631d6e3d023741523… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 24 10:26:30 2010 +0200 programs: Add a space before ellipses in the Slovenian translation. --- programs/taskmgr/Si.rc | 2 +- programs/wineboot/wineboot_Si.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/Si.rc b/programs/taskmgr/Si.rc index 496c94a..c6cc43d 100644 --- a/programs/taskmgr/Si.rc +++ b/programs/taskmgr/Si.rc @@ -497,7 +497,7 @@ BEGIN IDS_VIEW_SMALL "M&ale ikone" IDS_VIEW_DETAILS "Po&drobnosti" IDS_WINDOWS "&Okna" - IDS_VIEW_SELECTCOLUMNS "&Izbiranje stolcev..." + IDS_VIEW_SELECTCOLUMNS "&Izbiranje stolcev ..." IDS_OPTIONS_SHOW16BITTASKS "&Prikaz 16-bitnih opravil" IDS_VIEW_CPUHISTORY "&Zgodovina procesorja" IDS_VIEW_CPUHISTORY_ONEGRAPHALL "&En grafikon za vse procesorje" diff --git a/programs/wineboot/wineboot_Si.rc b/programs/wineboot/wineboot_Si.rc index bb210f9..82e061b 100644 --- a/programs/wineboot/wineboot_Si.rc +++ b/programs/wineboot/wineboot_Si.rc @@ -44,6 +44,6 @@ CAPTION "Wine" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_WAITICON, 3, 3, 10, 10 - LTEXT "Konfiguracija programa Wine v %s se posodablja, prosimo počkajte...", + LTEXT "Konfiguracija programa Wine v %s se posodablja, prosimo počkajte ...", IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX END

1 0

Alexandre Julliard : ntdll: Add a WINEARCH environment variable that allows forcing a specific 32- or 64-bit architecture .
by Alexandre Julliard June 24, 2010

June 24, 2010

Module: wine Branch: master Commit: a49891f1e2e9852a113fcb8cbd365f477b686f03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a49891f1e2e9852a113fcb8cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 24 15:10:58 2010 +0200 ntdll: Add a WINEARCH environment variable that allows forcing a specific 32- or 64-bit architecture. --- dlls/ntdll/server.c | 22 ++++++++++++++++++++++ loader/wine.man.in | 18 ++++++++++++++++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 08ee784..8564c0a 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -752,6 +752,18 @@ static void setup_config_dir(void) mkdir( config_dir, 0777 ); if (chdir( config_dir ) == -1) fatal_perror( "chdir to %s\n", config_dir ); + + if ((p = getenv( "WINEARCH" )) && !strcmp( p, "win32" )) + { + /* force creation of a 32-bit prefix */ + int fd = open( "system.reg", O_WRONLY | O_CREAT | O_EXCL, 0666 ); + if (fd != -1) + { + static const char regfile[] = "WINE REGISTRY Version 2\n\n#arch=win32\n"; + write( fd, regfile, sizeof(regfile) - 1 ); + close( fd ); + } + } MESSAGE( "wine: created the configuration directory '%s'\n", config_dir ); } @@ -1040,6 +1052,7 @@ NTSTATUS server_init_process_done(void) size_t server_init_thread( void *entry_point ) { static const int is_win64 = (sizeof(void *) > sizeof(int)); + const char *arch = getenv( "WINEARCH" ); int ret; int reply_pipe[2]; struct sigaction sig_act; @@ -1090,6 +1103,15 @@ size_t server_init_thread( void *entry_point ) switch (ret) { case STATUS_SUCCESS: + if (arch) + { + if (!strcmp( arch, "win32" ) && (is_win64 || is_wow64)) + fatal_error( "WINEARCH set to win32 but '%s' is a 64-bit installation.\n", + wine_get_config_dir() ); + if (!strcmp( arch, "win64" ) && !is_wow64) + fatal_error( "WINEARCH set to win64 but '%s' is a 32-bit installation.\n", + wine_get_config_dir() ); + } return info_size; case STATUS_NOT_REGISTRY_FILE: fatal_error( "'%s' is a 32-bit installation, it cannot support 64-bit applications.\n", diff --git a/loader/wine.man.in b/loader/wine.man.in index 7d6953c..6779b44 100644 --- a/loader/wine.man.in +++ b/loader/wine.man.in @@ -142,8 +142,9 @@ on all relay messages (API calls). .TP WINEDEBUG=relay will turn on all relay messages. For more control on including or excluding -functions and dlls from the relay trace look into the [Debug] section -of the wine configuration file. +functions and dlls from the relay trace, look into the +.B HKEY_CURRENT_USER\\\\Software\\\\Wine\\\\Debug +registry key. .PP For more information on debugging messages, see the .I Running Wine @@ -204,6 +205,19 @@ the builtin load fails; load shell32 always as builtin and comctl32 always as native. Oleaut32 will be disabled. .RE .TP +.I WINEARCH +Specifies the Windows architecture to support. It can be set either to +.B win32 +(support only 32-bit applications), or to +.B win64 +(support both 64-bit applications and 32-bit ones in WoW64 mode). +.br +The architecture supported by a given Wine prefix is set at prefix +creation time and cannot be changed afterwards. When running with an +existing prefix, Wine will refuse to start if +.I WINEARCH +doesn't match the prefix architecture. +.TP .I DISPLAY Specifies the X11 display to use. .TP

1 0

Francois Gouget : programs: Remove spaces before '\n's in the resources.
by Alexandre Julliard June 24, 2010

June 24, 2010

Module: wine Branch: master Commit: c59b791b855e3632eec7056073dec7cc0b7a8ed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c59b791b855e3632eec705607… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 24 10:22:43 2010 +0200 programs: Remove spaces before '\n's in the resources. --- programs/notepad/Si.rc | 2 +- programs/taskmgr/Si.rc | 4 ++-- programs/xcopy/Ro.rc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/notepad/Si.rc b/programs/notepad/Si.rc index 531e9fa..1947286 100644 --- a/programs/notepad/Si.rc +++ b/programs/notepad/Si.rc @@ -133,7 +133,7 @@ STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ Ta datoteka vsebuje Unicode znake, ki bodo izgubljeni,\n\ -če datoteko shranite v %s kodiranju. \n\ +če datoteko shranite v %s kodiranju.\n\ Da bi te znake obdržali, kliknite Prekliči in izberite\n\ eno izmed Unicode možnosti v seznamu kodiranj.\n\ Nadaljujem?" diff --git a/programs/taskmgr/Si.rc b/programs/taskmgr/Si.rc index 858e9d2..496c94a 100644 --- a/programs/taskmgr/Si.rc +++ b/programs/taskmgr/Si.rc @@ -547,9 +547,9 @@ BEGIN nezaželjene posledice, vključno z nesabilnostjo sistema. Ali ste\n\ prepričani, da želite spremeniti prioriteto?" IDS_PRIORITY_UNABLE2CHANGE "Ne morem spremeniti prioritete" - IDS_TERMINATE_MESSAGE "OPOZORILO: Prekinjanje procesa lahko povzroči nezaželjene \n\ + IDS_TERMINATE_MESSAGE "OPOZORILO: Prekinjanje procesa lahko povzroči nezaželjene\n\ posledice, vključno z izgubo podatkov in nestabilnostjo sistema.\n\ - Pred prekinitvijo proces ne bo imel možnosti shraniti svojega \n\ + Pred prekinitvijo proces ne bo imel možnosti shraniti svojega\n\ stanja ali podatkov. Ali ste prepričani, da želite\n\ prekiniti proces?" IDS_TERMINATE_UNABLE2TERMINATE "Ne morem prekiniti procesa" diff --git a/programs/xcopy/Ro.rc b/programs/xcopy/Ro.rc index 3e8a655..bf4f5eb 100644 --- a/programs/xcopy/Ro.rc +++ b/programs/xcopy/Ro.rc @@ -64,7 +64,7 @@ XCOPY sursă [destinație] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ [/T] Creează o structură de directoare goale, dar nu copiază fișiere\n\ [/Y] Nu solicita confirmarea la suprascrierea fișierelor\n\ [/-Y] Solicită confirmarea la suprascrierea fișierelor\n\ -[/P] Solicită confirmarea înainte de copierea fiecărui fișier sursă \n\ +[/P] Solicită confirmarea înainte de copierea fiecărui fișier sursă\n\ [/N] Copiază utilizând prescurtări de nume\n\ [/U] Copiază numai fișierele care există deja în destinație\n\ [/R] Suprascrie orice fișiere cu protecție la modificări\n\

1 0