October 2012 - Wine-commits

Sven Baars : dmusic: Fix a copy and paste error.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 86d589b2e1132a9e02446cc0018c68630b07f232 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86d589b2e1132a9e02446cc00… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Sep 29 17:01:54 2012 +0200 dmusic: Fix a copy and paste error. --- dlls/dmusic/dmusic.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 11968ed..111ff77 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -367,7 +367,7 @@ static void create_system_ports_list(IDirectMusic8Impl* object) port->device = i; port->create = DMUSIC_CreateMidiOutPortImpl; midiOutGetDevCapsW(i, &caps_out, sizeof(caps_out)); - strcpyW(port->caps.wszDescription, caps_in.szPname); + strcpyW(port->caps.wszDescription, caps_out.szPname); strcatW(port->caps.wszDescription, emulated); port->caps.dwFlags = DMUS_PC_SHAREABLE | DMUS_PC_EXTERNAL; port->caps.dwClass = DMUS_PC_OUTPUTCLASS;

1 0

Marcus Meissner : oleaut2: Pass up errors on typelib writeout (Coverity).
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: d8c1507846ce40d9c3d4273f03daea3522292e50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c1507846ce40d9c3d4273f0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Sep 29 17:58:54 2012 +0200 oleaut2: Pass up errors on typelib writeout (Coverity). --- dlls/oleaut32/typelib2.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 78995de..8ea95fe 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -4531,6 +4531,7 @@ static int ctl2_write_chunk(HANDLE hFile, const void *segment, int length) { DWORD dwWritten; if (!WriteFile(hFile, segment, length, &dwWritten, 0)) { + TRACE("Writefile(%p, %d) failed, lasterror %d\n", segment, length, GetLastError()); CloseHandle(hFile); return 0; } @@ -4581,7 +4582,7 @@ static int ctl2_finalize_segment(ICreateTypeLib2Impl *This, int filepos, int seg return This->typelib_segdir[segment].length; } -static void ctl2_write_typeinfos(ICreateTypeLib2Impl *This, HANDLE hFile) +static int ctl2_write_typeinfos(ICreateTypeLib2Impl *This, HANDLE hFile) { ICreateTypeInfo2Impl *typeinfo; @@ -4592,21 +4593,27 @@ static void ctl2_write_typeinfos(ICreateTypeLib2Impl *This, HANDLE hFile) if (!typeinfo->typedata) continue; iter = typeinfo->typedata->next; - ctl2_write_chunk(hFile, &iter->u.val, sizeof(int)); + if (!ctl2_write_chunk(hFile, &iter->u.val, sizeof(int))) + return 0; for(iter=iter->next; iter!=typeinfo->typedata->next; iter=iter->next) - ctl2_write_chunk(hFile, iter->u.data, ctl2_get_record_size(iter)); + if (!ctl2_write_chunk(hFile, iter->u.data, ctl2_get_record_size(iter))) + return 0; for(iter=typeinfo->typedata->next->next; iter!=typeinfo->typedata->next; iter=iter->next) - ctl2_write_chunk(hFile, &iter->indice, sizeof(int)); + if (!ctl2_write_chunk(hFile, &iter->indice, sizeof(int))) + return 0; for(iter=typeinfo->typedata->next->next; iter!=typeinfo->typedata->next; iter=iter->next) - ctl2_write_chunk(hFile, &iter->name, sizeof(int)); + if (!ctl2_write_chunk(hFile, &iter->name, sizeof(int))) + return 0; for(iter=typeinfo->typedata->next->next; iter!=typeinfo->typedata->next; iter=iter->next) { - ctl2_write_chunk(hFile, &offset, sizeof(int)); + if (!ctl2_write_chunk(hFile, &offset, sizeof(int))) + return 0; offset += ctl2_get_record_size(iter); } } + return 1; } /****************************************************************************** @@ -4669,7 +4676,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 * iface) if (!ctl2_write_segment(This, hFile, MSFT_SEG_CUSTDATA )) return retval; if (!ctl2_write_segment(This, hFile, MSFT_SEG_CUSTDATAGUID)) return retval; - ctl2_write_typeinfos(This, hFile); + if (!ctl2_write_typeinfos(This, hFile)) return retval; if (!CloseHandle(hFile)) return retval;

1 0

Francois Gouget : jscript: Make regexp_match() static.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: a809803a929d0e55b0abbebd1f2574c1b1a6e279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a809803a929d0e55b0abbebd1… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Sep 29 18:02:28 2012 +0200 jscript: Make regexp_match() static. --- dlls/jscript/jscript.h | 1 - dlls/jscript/regexp.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 99d3863..214adb2 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -382,7 +382,6 @@ HRESULT create_jscaller(script_ctx_t*) DECLSPEC_HIDDEN; #define REM_NO_CTX_UPDATE 0x0004 HRESULT regexp_match_next(script_ctx_t*,jsdisp_t*,DWORD,const WCHAR*,DWORD,const WCHAR**,match_result_t**, DWORD*,DWORD*,match_result_t*) DECLSPEC_HIDDEN; -HRESULT regexp_match(script_ctx_t*,jsdisp_t*,const WCHAR*,DWORD,BOOL,match_result_t**,DWORD*) DECLSPEC_HIDDEN; HRESULT parse_regexp_flags(const WCHAR*,DWORD,DWORD*) DECLSPEC_HIDDEN; HRESULT regexp_string_match(script_ctx_t*,jsdisp_t*,BSTR,jsval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index b53b848..84aea58 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3448,7 +3448,7 @@ HRESULT regexp_match_next(script_ctx_t *ctx, jsdisp_t *dispex, DWORD rem_flags, return hres; } -HRESULT regexp_match(script_ctx_t *ctx, jsdisp_t *dispex, const WCHAR *str, DWORD len, BOOL gflag, +static HRESULT regexp_match(script_ctx_t *ctx, jsdisp_t *dispex, const WCHAR *str, DWORD len, BOOL gflag, match_result_t **match_result, DWORD *result_cnt) { RegExpInstance *This = (RegExpInstance*)dispex;

1 0

Francois Gouget : include: Fix a typo in the declaration of PCUZZTSTR.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 62d19578509ded2457e466bd1a5ef5661cb01dbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=62d19578509ded2457e466bd1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Sep 29 18:02:36 2012 +0200 include: Fix a typo in the declaration of PCUZZTSTR. --- include/winnt.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 9cb57cf..207adaa 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -517,7 +517,7 @@ typedef PCUNZWCH PCUNZTCH; typedef PZZWSTR PZZTSTR; typedef PCZZWSTR PCZZTSTR; typedef PUZZWSTR PUZZTSTR; -typedef PUCZZWSTR PCUZZTSTR; +typedef PCUZZWSTR PCUZZTSTR; # else /* UNICODE */ # ifndef _TCHAR_DEFINED typedef CHAR TCHAR, *PTCHAR;

1 0

Francois Gouget : gdi32: Make dibdrv_wgl{Describe, Set}PixelFormat() static.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: f77605c76533caadefe50dc05b7143957623e1e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f77605c76533caadefe50dc05… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Sep 29 18:02:40 2012 +0200 gdi32: Make dibdrv_wgl{Describe,Set}PixelFormat() static. --- dlls/gdi32/dibdrv/opengl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/opengl.c b/dlls/gdi32/dibdrv/opengl.c index 740dc50..a6b83f0 100644 --- a/dlls/gdi32/dibdrv/opengl.c +++ b/dlls/gdi32/dibdrv/opengl.c @@ -139,7 +139,7 @@ failed: /********************************************************************** * dibdrv_wglDescribePixelFormat */ -int dibdrv_wglDescribePixelFormat( HDC hdc, int fmt, UINT size, PIXELFORMATDESCRIPTOR *descr ) +static int dibdrv_wglDescribePixelFormat( HDC hdc, int fmt, UINT size, PIXELFORMATDESCRIPTOR *descr ) { int ret = sizeof(pixel_formats) / sizeof(pixel_formats[0]); @@ -289,7 +289,7 @@ static BOOL dibdrv_wglMakeCurrent( HDC hdc, struct wgl_context *context ) /********************************************************************** * dibdrv_wglSetPixelFormat */ -BOOL dibdrv_wglSetPixelFormat( HDC hdc, int fmt, const PIXELFORMATDESCRIPTOR *descr ) +static BOOL dibdrv_wglSetPixelFormat( HDC hdc, int fmt, const PIXELFORMATDESCRIPTOR *descr ) { if (fmt <= 0 || fmt > nb_formats) return FALSE; return GdiSetPixelFormat( hdc, fmt, descr );

1 0

Christian Costa : ntoskrnl.exe: Add stub for MmUnlockPages.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: b1fc2182b18d7535bac5257d4bfd99f6513fa5f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1fc2182b18d7535bac5257d4… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sat Sep 29 22:28:00 2012 +0200 ntoskrnl.exe: Add stub for MmUnlockPages. --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 842ade2..ac15296 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1462,6 +1462,16 @@ void WINAPI MmResetDriverPaging(PVOID AddrInSection) TRACE("%p\n", AddrInSection); } + +/*********************************************************************** + * MmUnlockPages (NTOSKRNL.EXE.@) + */ +void MmUnlockPages(PMDLX MemoryDescriptorList) +{ + FIXME("(%p): stub\n", MemoryDescriptorList); +} + + /*********************************************************************** * MmUnmapIoSpace (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index f452238..676b241 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -717,7 +717,7 @@ @ stub MmSystemRangeStart @ stub MmTrimAllSystemPagableMemory @ stub MmUnlockPagableImageSection -@ stub MmUnlockPages +@ stdcall MmUnlockPages(ptr) @ stdcall MmUnmapIoSpace(ptr long) @ stub MmUnmapLockedPages @ stub MmUnmapReservedMapping

1 0

Christian Costa : ntoskrnl.exe: Add stub for MmProbeAndLockPages.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 0a7ab9841d2b8df2dc9a39715a9b4aaa4f72a07f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a7ab9841d2b8df2dc9a39715… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sat Sep 29 22:28:08 2012 +0200 ntoskrnl.exe: Add stub for MmProbeAndLockPages. --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 12 ++++++++++-- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index ac15296..2de8f13 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1454,6 +1454,16 @@ PVOID WINAPI MmPageEntireDriver(PVOID AddrInSection) return AddrInSection; } + +/*********************************************************************** + * MmProbeAndLockPages (NTOSKRNL.EXE.@) + */ +void MmProbeAndLockPages(PMDLX MemoryDescriptorList, KPROCESSOR_MODE AccessMode, LOCK_OPERATION Operation) +{ + FIXME("(%p, %u, %u): stub\n", MemoryDescriptorList, AccessMode, Operation); +} + + /*********************************************************************** * MmResetDriverPaging (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 676b241..2201d06 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -702,7 +702,7 @@ @ stub MmMarkPhysicalMemoryAsGood @ stdcall MmPageEntireDriver(ptr) @ stub MmPrefetchPages -@ stub MmProbeAndLockPages +@ stdcall MmProbeAndLockPages(ptr long long) @ stub MmProbeAndLockProcessPages @ stub MmProbeAndLockSelectedPages @ stub MmProtectMdlSystemAddress diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 85d3da5..a868e88 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -966,6 +966,8 @@ typedef struct _MDL { ULONG ByteOffset; } MDL, *PMDL; +typedef MDL *PMDLX; + typedef struct _KTIMER { DISPATCHER_HEADER Header; ULARGE_INTEGER DueTime; @@ -1088,10 +1090,16 @@ typedef struct _IO_REMOVE_LOCK_DBG_BLOCK { } IO_REMOVE_LOCK_DBG_BLOCK; typedef struct _IO_REMOVE_LOCK { - IO_REMOVE_LOCK_COMMON_BLOCK Common; - IO_REMOVE_LOCK_DBG_BLOCK Dbg; + IO_REMOVE_LOCK_COMMON_BLOCK Common; + IO_REMOVE_LOCK_DBG_BLOCK Dbg; } IO_REMOVE_LOCK, *PIO_REMOVE_LOCK; +typedef enum { + IoReadAccess, + IoWriteAccess, + IoModifyAccess +} LOCK_OPERATION; + NTSTATUS WINAPI ObCloseHandle(IN HANDLE handle); #ifdef NONAMELESSUNION

1 0

André Hentschel : Wine 1.5.14 freigegeben
by Jeremy Newman 01 Oct '12

01 Oct '12

Module: website Branch: master Commit: bea5e486ba9bab772de6039f863002dd64607a72 URL: http://source.winehq.org/git/website.git/?a=commit;h=bea5e486ba9bab772de603… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Sep 29 18:11:58 2012 +0200 Wine 1.5.14 freigegeben --- news/de/2012092801.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/de/2012092801.xml b/news/de/2012092801.xml new file mode 100644 index 0000000..7f85327 --- /dev/null +++ b/news/de/2012092801.xml @@ -0,0 +1,16 @@ +<news> +<date>28. September 2012</date> +<title>Wine 1.5.14 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.14 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.14">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Viel besseres URL Cache Verhalten.</li> + <li>Verbesserte GIF Bilder Unterstützung.</li> + <li>Mehr Parser Features im Shader Compiler.</li> + <li>Optimierungen in JavaScript.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.14.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.5.14
by Jeremy Newman 01 Oct '12

01 Oct '12

Module: website Branch: master Commit: acdfa85de502eaa5f50e11bd8395b97b2ea3a3bd URL: http://source.winehq.org/git/website.git/?a=commit;h=acdfa85de502eaa5f50e11… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Sep 29 08:12:58 2012 +0200 Polish translation for release 1.5.14 --- news/pl/2012092801.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/pl/2012092801.xml b/news/pl/2012092801.xml new file mode 100644 index 0000000..8ff7d9c --- /dev/null +++ b/news/pl/2012092801.xml @@ -0,0 +1,16 @@ +<news> +<date>Wrzesień 28, 2012</date> +<title>Wydano Wine 1.5.14</title> +<body> + Wydanie rozwojowe Wine 1.5.14 jest już dostępne. + <a href="{$root}/announce/1.5.14">Co nowego</a> w tym wydaniu: +<ul> + <li>Dużo lepsze zachowanie pamięci podręcznej adresów URL.</li> + <li>Ulepszona obsługa obrazów GIF.</li> + <li>Więcej funkcji parsera w kompilatorze jednostki cieniującej.</li> + <li>Optymalizacje w JavaScript.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.14.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.5.14
by Jeremy Newman 01 Oct '12

01 Oct '12

Module: website Branch: master Commit: 08fae55d8b911259e0d0a4702ec19a8b323388f6 URL: http://source.winehq.org/git/website.git/?a=commit;h=08fae55d8b911259e0d0a4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Sep 29 09:24:32 2012 +0200 French translation for release 1.5.14 --- news/fr/2012092801.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/fr/2012092801.xml b/news/fr/2012092801.xml new file mode 100644 index 0000000..1388c83 --- /dev/null +++ b/news/fr/2012092801.xml @@ -0,0 +1,15 @@ +<news> +<date>28 septembre 2012</date> +<title>Sortie de Wine 1.5.14</title> +<body> + La version de développement 1.5.14 de Wine est disponible. + <a href="{$root}/announce/1.5.14">Nouveautés</a> de cette version : +<ul> + <li>Comportement du cache d'URL fortement amélioré.</li> + <li>Prise en charge améliorée des images GIF.</li> + <li>Fonctionnalités supplémentaires dans le compilateur de shaders.</li> + <li>Optimisations dans JavaScript.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.14.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0