March 2009 - Wine-Commits - list.winehq.org

Christian Costa : d3dxof: Remove limitation on data buffer size.
by Alexandre Julliard March 25, 2009

March 25, 2009

Module: wine Branch: master Commit: 30140d0186ec570857bbcaff6d428753aa3e2b38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30140d0186ec570857bbcaff6… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Mar 24 23:59:37 2009 +0100 d3dxof: Remove limitation on data buffer size. --- dlls/d3dxof/d3dxof.c | 22 +++++++--------------- dlls/d3dxof/d3dxof_private.h | 4 +--- dlls/d3dxof/parsing.c | 36 ++++++++++++++++++++++-------------- 3 files changed, 30 insertions(+), 32 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index f46a82c..6f9b266 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -628,10 +628,11 @@ static ULONG WINAPI IDirectXFileDataImpl_Release(IDirectXFileData* iface) if (!ref) { - if (!This->level) + if (!This->level && !This->from_ref) { - HeapFree(GetProcessHeap(), 0, This->pdata); HeapFree(GetProcessHeap(), 0, This->pstrings); + HeapFree(GetProcessHeap(), 0, This->pobj->pdata); + HeapFree(GetProcessHeap(), 0, This->pobj); } HeapFree(GetProcessHeap(), 0, This); } @@ -1000,10 +1001,7 @@ static ULONG WINAPI IDirectXFileEnumObjectImpl_Release(IDirectXFileEnumObject* i { int i; for (i = 0; i < This->nb_xobjects; i++) - { IDirectXFileData_Release(This->pRefObjects[i]); - HeapFree(GetProcessHeap(), 0, This->xobjects[i]); - } if (This->source == DXFILELOAD_FROMFILE) { UnmapViewOfFile(This->buffer); @@ -1024,7 +1022,6 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE IDirectXFileEnumObjectImpl *This = (IDirectXFileEnumObjectImpl *)iface; IDirectXFileDataImpl* object; HRESULT hr; - LPBYTE pdata = NULL; LPBYTE pstrings = NULL; TRACE("(%p/%p)->(%p)\n", This, iface, ppDataObj); @@ -1056,14 +1053,8 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE } This->buf.pxo = This->xobjects[This->nb_xobjects] = This->buf.pxo_tab; - pdata = HeapAlloc(GetProcessHeap(), 0, MAX_DATA_SIZE); - if (!pdata) - { - ERR("Out of memory\n"); - hr = DXFILEERR_BADALLOC; - goto error; - } - This->buf.pxo->pdata = This->buf.pdata = object->pdata = pdata; + This->buf.pxo->pdata = This->buf.pdata = NULL; + This->buf.capacity = 0; This->buf.cur_pos_data = 0; pstrings = HeapAlloc(GetProcessHeap(), 0, MAX_STRINGS_BUFFER); @@ -1109,8 +1100,9 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE error: HeapFree(GetProcessHeap(), 0, This->buf.pxo_tab); - HeapFree(GetProcessHeap(), 0, pdata); HeapFree(GetProcessHeap(), 0, pstrings); + if (This->buf.pxo->pdata) + HeapFree(GetProcessHeap(), 0, This->buf.pxo->pdata); return hr; } diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 9cbd0e2..13c5f54 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -42,8 +42,6 @@ #define MAX_SUBOBJECTS 500 #define MAX_STRINGS_BUFFER 10000 -#define MAX_DATA_SIZE 400000 - typedef struct { DWORD type; LONG idx_template; @@ -108,7 +106,6 @@ typedef struct { int cur_enum_object; BOOL from_ref; ULONG level; - LPBYTE pdata; LPBYTE pstrings; } IDirectXFileDataImpl; @@ -143,6 +140,7 @@ typedef struct { xtemplate* pxt[MAX_SUBOBJECTS]; ULONG level; LPBYTE pdata; + ULONG capacity; LPBYTE pstrings; } parse_buffer; diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 85c66cb..1205e48 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -995,6 +995,25 @@ BOOL parse_template(parse_buffer * buf) return TRUE; } +static BOOL check_buffer(parse_buffer * buf, ULONG size) +{ + if ((buf->cur_pos_data + size) > buf->capacity) + { + LPBYTE pdata; + ULONG new_capacity = buf->capacity ? 2 * buf->capacity : 100000; + + pdata = HeapAlloc(GetProcessHeap(), 0, new_capacity); + if (!pdata) + return FALSE; + memcpy(pdata, buf->pdata, buf->cur_pos_data); + HeapFree(GetProcessHeap(), 0, buf->pdata); + buf->capacity = new_capacity; + buf->pdata = pdata; + buf->pxo->root->pdata = pdata; + } + return TRUE; +} + static BOOL parse_object_parts(parse_buffer * buf, BOOL allow_optional); static BOOL parse_object_members_list(parse_buffer * buf) { @@ -1076,11 +1095,8 @@ static BOOL parse_object_members_list(parse_buffer * buf) last_dword = *(DWORD*)buf->value; TRACE("%s = %d\n", pt->members[i].name, *(DWORD*)buf->value); /* Assume larger size */ - if ((buf->cur_pos_data + 4) > MAX_DATA_SIZE) - { - FIXME("Buffer too small\n"); + if (!check_buffer(buf, 4)) return FALSE; - } if (pt->members[i].type == TOKEN_WORD) { *(((WORD*)(buf->cur_pos_data + buf->pdata))) = (WORD)(*(DWORD*)buf->value); @@ -1101,12 +1117,8 @@ static BOOL parse_object_members_list(parse_buffer * buf) { get_TOKEN(buf); TRACE("%s = %f\n", pt->members[i].name, *(float*)buf->value); - /* Assume larger size */ - if ((buf->cur_pos_data + 4) > MAX_DATA_SIZE) - { - FIXME("Buffer too small\n"); + if (!check_buffer(buf, 4)) return FALSE; - } if (pt->members[i].type == TOKEN_FLOAT) { *(((float*)(buf->cur_pos_data + buf->pdata))) = (float)(*(float*)buf->value); @@ -1122,12 +1134,8 @@ static BOOL parse_object_members_list(parse_buffer * buf) { get_TOKEN(buf); TRACE("%s = %s\n", pt->members[i].name, (char*)buf->value); - /* Assume larger size */ - if ((buf->cur_pos_data + 4) > MAX_DATA_SIZE) - { - FIXME("Buffer too small\n"); + if (!check_buffer(buf, 4)) return FALSE; - } if (pt->members[i].type == TOKEN_LPSTR) { int len = strlen((char*)buf->value) + 1;

1 0

Andrew Talbot : ntdll: Remove superfluous semicolon.
by Alexandre Julliard March 25, 2009

March 25, 2009

Module: wine Branch: master Commit: 60507cc65199b055f52c0ac84d6ca4e20bb6237e URL: http://source.winehq.org/git/wine.git/?a=commit;h=60507cc65199b055f52c0ac84… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Mar 24 19:54:00 2009 +0000 ntdll: Remove superfluous semicolon. --- dlls/ntdll/tape.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tape.c b/dlls/ntdll/tape.c index 5c83a9d..b8a4ab2 100644 --- a/dlls/ntdll/tape.c +++ b/dlls/ntdll/tape.c @@ -66,7 +66,7 @@ static const char *io2str( DWORD io ) { switch (io) { -#define X(x) case (x): return #x; +#define X(x) case (x): return #x X(IOCTL_TAPE_CHECK_VERIFY); X(IOCTL_TAPE_CREATE_PARTITION); X(IOCTL_TAPE_ERASE);

1 0

Austin English : twain32: Fix a compiler warning on PC-BSD.
by Alexandre Julliard March 25, 2009

March 25, 2009

Module: wine Branch: master Commit: dca3117f036cd9289d4753d3021e89ae531de8d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dca3117f036cd9289d4753d30… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Mar 24 15:40:36 2009 -0400 twain32: Fix a compiler warning on PC-BSD. --- dlls/twain_32/tests/dsm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index 6a53188..0cc8220 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -482,8 +482,8 @@ static void test_supported_sizes(TW_IDENTITY *appid, TW_IDENTITY *source, TW_INT TW_UINT32 val; TW_UINT16 type; TW_INT32 actual_support; - TW_UINT32 orig_value; - TW_UINT32 default_value; + TW_UINT32 orig_value = TWSS_NONE; + TW_UINT32 default_value = TWSS_NONE; TW_UINT32 new_value = TWSS_NONE;

1 0

Alexandre Julliard : avifil32: Make avifile. dll into a stand-alone 16-bit module.
by Alexandre Julliard March 25, 2009

March 25, 2009

Module: wine Branch: master Commit: b91cf321eaf53634bcee959ee6823d487e544e97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b91cf321eaf53634bcee959ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 24 16:56:58 2009 +0100 avifil32: Make avifile.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 9 +++++ configure.ac | 1 + dlls/Makefile.in | 4 -- dlls/avifil32/Makefile.in | 2 - dlls/avifil32/api.c | 32 -------------------- dlls/avifile.dll16/Makefile.in | 13 ++++++++ .../avifile.dll16.spec} | 0 8 files changed, 23 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b91cf321eaf53634bcee9…

1 0

Michael Stefaniuc : gdi32: Use "%p" to TRACE() pointers.
by Alexandre Julliard March 25, 2009

March 25, 2009

Module: wine Branch: master Commit: 4114cea30282fcaf127a3aab02731ea49eaef223 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4114cea30282fcaf127a3aab0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 25 00:17:52 2009 +0100 gdi32: Use "%p" to TRACE() pointers. --- dlls/gdi32/painting.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index c3d8310..fa498e0 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -1243,8 +1243,8 @@ BOOL WINAPI GdiGradientFill( HDC hdc, TRIVERTEX *vert_array, ULONG nvert, { unsigned int i; - TRACE("vert_array:0x%08lx nvert:%d grad_array:0x%08lx ngrad:%d\n", - (long)vert_array, nvert, (long)grad_array, ngrad); + TRACE("vert_array:%p nvert:%d grad_array:%p ngrad:%d\n", + vert_array, nvert, grad_array, ngrad); switch(mode) {

1 0

Paul Vriens : comctl32/tests: Fix a crash on W2K and below.
by Alexandre Julliard March 25, 2009

March 25, 2009

Module: wine Branch: master Commit: 7e7e27f7ff593cb31930f6e52bc4068c87c758e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e7e27f7ff593cb31930f6e52… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Mar 24 17:09:46 2009 +0100 comctl32/tests: Fix a crash on W2K and below. --- dlls/comctl32/tests/ipaddress.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/ipaddress.c b/dlls/comctl32/tests/ipaddress.c index 32ecdc1..d04223c 100644 --- a/dlls/comctl32/tests/ipaddress.c +++ b/dlls/comctl32/tests/ipaddress.c @@ -69,12 +69,13 @@ static int init(void) pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); if (!pInitCommonControlsEx) { - skip("InitCommonControlsEx() is missing. Skipping the tests\n"); + win_skip("InitCommonControlsEx() is missing.\n"); return 0; } iccex.dwSize = sizeof(iccex); - iccex.dwICC = ICC_USEREX_CLASSES; + /* W2K and below need ICC_INTERNET_CLASSES for the IP Address Control */ + iccex.dwICC = ICC_INTERNET_CLASSES; pInitCommonControlsEx(&iccex); return 1;

1 0

Michael Stefaniuc : uninstaller: Add the Romanian translation.
by Alexandre Julliard March 25, 2009

March 25, 2009

Module: wine Branch: master Commit: 19704f45e31d1f66b0210951c45c28af4435ead0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19704f45e31d1f66b0210951c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 25 00:17:38 2009 +0100 uninstaller: Add the Romanian translation. --- programs/uninstaller/Ro.rc | 29 +++++++++++++++++++++++++++++ programs/uninstaller/rsrc.rc | 1 + 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/programs/uninstaller/Ro.rc b/programs/uninstaller/Ro.rc new file mode 100644 index 0000000..5f02488 --- /dev/null +++ b/programs/uninstaller/Ro.rc @@ -0,0 +1,29 @@ +/* + * Copyright 2005 Jonathan Ernst + * Copyright 2009 Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +STRINGTABLE DISCARDABLE { + IDS_APPNAME, "Programul de dezinstalare de aplicații Wine" + IDS_UNINSTALLFAILED, "Execuția comenzi de dezinstalare '%s' a eșuat, probabil din lipsa fișierului executabil.\r\nDoriți să ștergeți înregistrarea de dezinstalare din registru?" +} + +#pragma code_page(default) diff --git a/programs/uninstaller/rsrc.rc b/programs/uninstaller/rsrc.rc index c7105ba..799e3f6 100644 --- a/programs/uninstaller/rsrc.rc +++ b/programs/uninstaller/rsrc.rc @@ -43,6 +43,7 @@ #include "No.rc" #include "Pl.rc" #include "Pt.rc" +#include "Ro.rc" #include "Ru.rc" #include "Si.rc" #include "Sv.rc"

1 0

Francois Gouget : wineesd.drv: Remove esd_host as it is unused.
by Alexandre Julliard March 25, 2009

March 25, 2009

Module: wine Branch: master Commit: 1192c9995c4f150107b0b4cba0f8c207c83c64b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1192c9995c4f150107b0b4cba… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 25 00:51:35 2009 +0100 wineesd.drv: Remove esd_host as it is unused. It is unlikely to ever be used too. The default behavior is to connect to the server specified by $ESPEAKER or to the local one which suits us just fine. --- dlls/wineesd.drv/audio.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/wineesd.drv/audio.c b/dlls/wineesd.drv/audio.c index 237da40..b2691bf 100644 --- a/dlls/wineesd.drv/audio.c +++ b/dlls/wineesd.drv/audio.c @@ -214,8 +214,6 @@ typedef struct { ESD_MSG_RING msgRing; } WINE_WAVEIN; -static char* esd_host; /* the esd host */ - static WINE_WAVEOUT WOutDev [MAX_WAVEOUTDRV]; static WINE_WAVEIN WInDev [MAX_WAVEINDRV]; @@ -439,15 +437,12 @@ LONG ESD_WaveClose(void) LONG ESD_WaveInit(void) { int i; - int fd; + int fd; TRACE("called\n"); - /* FIXME: Maybe usefully to set the esd host. */ - esd_host = NULL; - /* Testing whether the esd host is alive. */ - if ((fd = esd_open_sound(esd_host)) < 0) + if ((fd = esd_open_sound(NULL)) < 0) { WARN("esd_open_sound() failed (%d)\n", errno); return -1; @@ -1257,7 +1252,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) out_rate = (int) wwo->waveFormat.Format.nSamplesPerSec; TRACE("esd output format = 0x%08x, rate = %d\n", out_format, out_rate); - wwo->esd_fd = esd_play_stream(out_format, out_rate, esd_host, "wineesd"); + wwo->esd_fd = esd_play_stream(out_format, out_rate, NULL, "wineesd"); /* clear these so we don't have any confusion ;-) */ wwo->sound_buffer = 0; @@ -1912,9 +1907,9 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) TRACE("esd input format = 0x%08x, rate = %d\n", in_format, in_rate); #ifdef WID_USE_ESDMON - wwi->esd_fd = esd_monitor_stream(in_format, in_rate, esd_host, "wineesd"); + wwi->esd_fd = esd_monitor_stream(in_format, in_rate, NULL, "wineesd"); #else - wwi->esd_fd = esd_record_stream(in_format, in_rate, esd_host, "wineesd"); + wwi->esd_fd = esd_record_stream(in_format, in_rate, NULL, "wineesd"); #endif TRACE("(wwi->esd_fd=%d)\n",wwi->esd_fd); wwi->state = WINE_WS_STOPPED;

1 0

Michael Stefaniuc : setupapi: Update the Romanian translation.
by Alexandre Julliard March 25, 2009

March 25, 2009

Module: wine Branch: master Commit: 4b53e2b6cc880dc08ec6f3e2d7ce618121134346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b53e2b6cc880dc08ec6f3e2d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 25 00:17:28 2009 +0100 setupapi: Update the Romanian translation. --- dlls/setupapi/Ro.rc | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/Ro.rc b/dlls/setupapi/Ro.rc index 8a4cb3e..80f90e8 100644 --- a/dlls/setupapi/Ro.rc +++ b/dlls/setupapi/Ro.rc @@ -21,6 +21,14 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) +STRINGTABLE DISCARDABLE +{ + IDS_PROMPTDISK "Fișierul '%s' de pe %s este necesitat" + IDS_UNKNOWN "Necunoscut" + IDS_COPYFROM "Copiază fișierele din:" + IDS_INFO "Introduceți calea unde fișierul poate fi găsit și apăsați OK." +} + COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "Copiez fișiere..." @@ -34,4 +42,18 @@ BEGIN CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG MOVEABLE DISCARDABLE 0, 0, 250, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Fișiere necesitate" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Introduceți discul de instalare al producătorului și asigurațivă că unitatea corectă a fost selectată mai jos", IDC_FILENEEDED, 10, 10, 175, 32, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copiază fișierele producătorului din:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + PUSHBUTTON "OK", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Renunță", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Navigează...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + #pragma code_page(default)

1 0

Paul Vriens : winspool.drv/tests: Fix a test failure on NT4 and below.
by Alexandre Julliard March 25, 2009

March 25, 2009

Module: wine Branch: master Commit: b0da2a2e481a0588d51f048cbb1efd248e8ddab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0da2a2e481a0588d51f048cb… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Mar 24 16:13:01 2009 +0100 winspool.drv/tests: Fix a test failure on NT4 and below. --- dlls/winspool.drv/tests/info.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 897a622..9a7acf6 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -1222,6 +1222,11 @@ static void test_EnumPrinterDrivers(void) skip("no printer drivers found\n"); return; } + if (GetLastError() == ERROR_INVALID_ENVIRONMENT) + { + win_skip("NT4 and below don't support the 'all' environment value\n"); + return; + } ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "unexpected error %u\n", GetLastError()); buffer = HeapAlloc(GetProcessHeap(), 0, pcbNeeded);

1 0