January 2008 - Wine-Commits

Jeremy Newman : Fix some wwn typos
by Jeremy Newman Jan. 7, 2008

Jan. 7, 2008

Module: website Branch: master Commit: 4e8de5d8074ac4b5ac70f290277451a7c7c2baa7 URL: http://source.winehq.org/git/website.git/?a=commit;h=4e8de5d8074ac4b5ac70f2… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Jan 7 10:43:49 2008 -0600 Fix some wwn typos Author: Zachary Goldberg <zgs(a)seas.upenn.edu> --- wwn/wn20080106_338.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wwn/wn20080106_338.xml b/wwn/wn20080106_338.xml index bad7594..289d33e 100644 --- a/wwn/wn20080106_338.xml +++ b/wwn/wn20080106_338.xml @@ -242,7 +242,7 @@ Kai Blin - Wine and Samba Martin Pilka - CxTest <a href="http://www.youtube.com/watch?v=VBZNOTngyeo">http://www.youtube.com/watch?v=VBZNOTngyeo</a> -Marteen Lankhorst - Wine and Sound +Maarten Lankhorst - Wine and Sound <a href="http://www.youtube.com/watch?v=qKaYqsm4I_Q">http://www.youtube.com/watch?v=qKaYqsm4I_Q</a> Stefan Dösinger - Wine and Direct3D @@ -251,7 +251,7 @@ Stefan Dösinger - Wine and Direct3D </pre></p> </quote> <p> -Most of the videos are actually quiet long and worth watching. I watched most of them, but only took notes on the keynote. Here is my summary of the keynote: +Most of the videos are actually quite long and worth watching. I watched most of them, but only took notes on the keynote. Here is my summary of the keynote: </p> <p> <pre>

1 0

Zachary Goldberg : WWN 338
by Jeremy Newman Jan. 7, 2008

Jan. 7, 2008

Module: website Branch: master Commit: 833a6de3c995690e55a392ef5d347a46ba6e89fe URL: http://source.winehq.org/git/website.git/?a=commit;h=833a6de3c995690e55a392… Author: Zachary Goldberg <zgs(a)seas.upenn.edu> Date: Sun Jan 6 15:29:44 2008 -0500 WWN 338 --- news/2008010601.xml | 7 + wwn/wn20080106_338.xml | 1253 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1260 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=833a6de3c995690e55…

1 0

Alexandre Julliard : configure: Add --without options for all optional dependencies.
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: a41f0f1b45f6b52e94c07bc367aa7cc7cc3c2d2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a41f0f1b45f6b52e94c07bc36… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 7 14:51:44 2008 +0100 configure: Add --without options for all optional dependencies. --- aclocal.m4 | 24 ++- configure | 603 +++++++++++++++++++++++++++++++++++++++++++++++++--------- configure.ac | 272 +++++++++++++++++---------- 3 files changed, 698 insertions(+), 201 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a41f0f1b45f6b52e94c07…

1 0

Peter Dons Tychsen : devenum: Fix the implementation of IEnumMoniker::Skip( ), to match the MSDN specs.
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: 787ccc8032f986477b69a340d877ff0a80ffa5b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=787ccc8032f986477b69a340d… Author: Peter Dons Tychsen <donpedro(a)dhcppc4> Date: Sat Jan 5 00:05:34 2008 +0100 devenum: Fix the implementation of IEnumMoniker::Skip(), to match the MSDN specs. --- dlls/devenum/mediacatenum.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index d230ce1..331130b 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -800,9 +800,21 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(LPENUMMONIKER iface, ULONG celt, static HRESULT WINAPI DEVENUM_IEnumMoniker_Skip(LPENUMMONIKER iface, ULONG celt) { EnumMonikerImpl *This = (EnumMonikerImpl *)iface; + DWORD subKeys; TRACE("(%p)->(%d)\n", iface, celt); + /* Before incrementing, check if there are any more values to run thru. + Some programs use the Skip() function to get the amount of devices */ + if(RegQueryInfoKeyW(This->hkey, NULL, NULL, NULL, &subKeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) + { + return S_FALSE; + } + if((This->index + celt) >= subKeys) + { + return S_FALSE; + } + This->index += celt; return S_OK;

1 0

Rico Schüller : mshtml: Fix memory leak ( found by Smatch).
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: 066ccd12752a830f44d22c3f1d4c6a48814aabde URL: http://source.winehq.org/git/wine.git/?a=commit;h=066ccd12752a830f44d22c3f1… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Dec 31 00:51:04 2007 +0100 mshtml: Fix memory leak (found by Smatch). --- dlls/mshtml/install.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index 731af60..1f5777d 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -236,8 +236,10 @@ static BOOL install_from_registered_dir(void) res = RegQueryValueExA(hkey, "GeckoCabDir", NULL, &type, (PBYTE)file_name, &size); } RegCloseKey(hkey); - if(res != ERROR_SUCCESS || type != REG_SZ) + if(res != ERROR_SUCCESS || type != REG_SZ) { + heap_free(file_name); return FALSE; + } strcat(file_name, GECKO_FILE_NAME);

1 0

Rico Schüller : msi: Fix memory leaks (found by Smatch ).
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: 63c5e152a1b02dddee3cc7964d0b3e80c297dd9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=63c5e152a1b02dddee3cc7964… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Dec 31 01:04:56 2007 +0100 msi: Fix memory leaks (found by Smatch). --- dlls/msi/dialog.c | 3 +++ dlls/msi/source.c | 7 +++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 4417d4b..4ab25f9 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2268,7 +2268,10 @@ static UINT msi_dialog_list_box( msi_dialog *dialog, MSIRECORD *rec ) control = msi_dialog_add_control( dialog, rec, WC_LISTBOXW, style ); if (!control) + { + msi_free(info); return ERROR_FUNCTION_FAILED; + } control->handler = msi_dialog_listbox_handler; diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 68f94b5..fcdd35d 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -605,7 +605,10 @@ static UINT fill_source_list(struct list *sourcelist, HKEY sourcekey, DWORD *cou entry->path = msi_alloc(val_size); if (!entry->path) + { + msi_free(entry); goto error; + } lstrcpyW(entry->szIndex, name); entry->index = atoiW(name); @@ -614,7 +617,11 @@ static UINT fill_source_list(struct list *sourcelist, HKEY sourcekey, DWORD *cou r = RegEnumValueW(sourcekey, index, name, &size, NULL, NULL, (LPBYTE)entry->path, &val_size); if (r != ERROR_SUCCESS) + { + msi_free(entry->path); + msi_free(entry); goto error; + } index = ++(*count); add_source_to_list(sourcelist, entry);

1 0

Alexander Nicolaysen Sørnes : comdlg32: PageSetupDlgW: Set orientation in printer dialog.
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: 9a96ac0dcc59d265ce7ce2e896551c84a937e09e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a96ac0dcc59d265ce7ce2e89… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jan 6 14:06:23 2008 +0100 comdlg32: PageSetupDlgW: Set orientation in printer dialog. --- dlls/comdlg32/printdlg.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 6b8ed15..8439c31 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2701,6 +2701,23 @@ static void PRINTDLG_PS_SetOrientationW(HWND hDlg, PageSetupDataW* pda) } } +static void PRINTDLG_PS_UpdatePrintDlgW(PageSetupDataW* pda) +{ + DEVMODEW* dm; + + dm = GlobalLock(pda->pdlg.hDevMode); + + if(!dm) + return; + + if(pda->curdlg.ptPaperSize.y > pda->curdlg.ptPaperSize.x) + dm->u1.s1.dmOrientation = DMORIENT_PORTRAIT; + else + dm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE; + + GlobalUnlock(pda->pdlg.hDevMode); +} + static BOOL PRINTDLG_PS_ChangePrinterW(HWND hDlg, PageSetupDataW *pda) { DEVNAMES *dn; @@ -2985,6 +3002,7 @@ PRINTDLG_PS_WMCommandW( case psh3: { pda->pdlg.Flags = 0; pda->pdlg.hwndOwner = hDlg; + PRINTDLG_PS_UpdatePrintDlgW(pda); if (PrintDlgW(&(pda->pdlg))) PRINTDLG_PS_ChangePrinterW(hDlg,pda); return TRUE;

1 0

Peter Dons Tychsen : dinput: Silence incorrect warning and move it to a valid place.
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: 53f64a09cf696edcc6c346bab2a46585c6acabe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53f64a09cf696edcc6c346bab… Author: Peter Dons Tychsen <donpedro(a)dhcppc4> Date: Fri Jan 4 22:34:41 2008 +0100 dinput: Silence incorrect warning and move it to a valid place. --- dlls/dinput/dinput_main.c | 5 +++++ dlls/dinput/joystick_linux.c | 1 - dlls/dinput/joystick_linuxinput.c | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index fc3c90a..2638710 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -464,6 +464,11 @@ static HRESULT WINAPI IDirectInput7AImpl_CreateDeviceEx(LPDIRECTINPUT7A iface, R ret_value = DIERR_NOINTERFACE; } + if (ret_value == DIERR_NOINTERFACE) + { + WARN("invalid device GUID %s\n", debugstr_guid(rguid)); + } + return ret_value; } diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 90f20d6..4b0085c 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -574,7 +574,6 @@ static HRESULT joydev_create_deviceA(IDirectInputImpl *dinput, REFGUID rguid, RE return DIERR_NOINTERFACE; } - WARN("invalid device GUID %s\n",debugstr_guid(rguid)); return DIERR_DEVICENOTREG; } diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 13e413b..18a7e54 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -565,7 +565,6 @@ static HRESULT joydev_create_deviceA(IDirectInputImpl *dinput, REFGUID rguid, RE return DIERR_NOINTERFACE; } - WARN("invalid device GUID\n"); return DIERR_DEVICENOTREG; }

1 0

Rico Schüller : cabinet: Fix memory leak ( found by Smatch).
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: 2dd29b107e9741b6322f26c2005b89435bdcc3b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dd29b107e9741b6322f26c20… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Dec 31 00:24:26 2007 +0100 cabinet: Fix memory leak (found by Smatch). --- dlls/cabinet/cabinet_main.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index 9e2c18a..7ebe63c 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -229,7 +229,11 @@ static INT_PTR fdi_notify_extract(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pf file_in_list(pDestination->FileList, pfdin->psz1, &node); if (node && !node->DoExtract) + { + HeapFree(GetProcessHeap(), 0, szFullPath); + HeapFree(GetProcessHeap(), 0, szDirectory); return 0; + } /* create the destination directory if it doesn't exist */ if (GetFileAttributesA(szDirectory) == INVALID_FILE_ATTRIBUTES)

1 0

Austin English : Spelling fixes.
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: 0e4adae9732434188923fe2c9b24c82a7a9cb4f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e4adae9732434188923fe2c9… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jan 4 13:37:14 2008 -0600 Spelling fixes. --- dlls/winemp3.acm/dct64_i386.c | 4 ++-- dlls/winemp3.acm/decode_i386.c | 4 ++-- dlls/winemp3.acm/huffman.h | 4 ++-- dlls/winemp3.acm/layer3.c | 2 +- dlls/winenas.drv/audio.c | 2 +- dlls/wineoss.drv/audio.c | 2 +- dlls/wineoss.drv/midi.c | 8 ++++---- dlls/wineoss.drv/midipatch.c | 2 +- dlls/winex11.drv/bitblt.c | 2 +- dlls/winex11.drv/desktop.c | 2 +- dlls/winex11.drv/dib.c | 4 ++-- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/opengl.c | 4 ++-- dlls/winex11.drv/winpos.c | 4 ++-- dlls/winex11.drv/wintab.c | 4 ++-- dlls/winex11.drv/xdnd.c | 2 +- dlls/winex11.drv/xrender.c | 2 +- dlls/wininet/ftp.c | 4 ++-- dlls/wininet/http.c | 8 ++++---- dlls/wininet/internet.c | 2 +- dlls/wininet/tests/generated.c | 2 +- dlls/wininet/tests/url.c | 6 +++--- dlls/wininet/urlcache.c | 4 ++-- 23 files changed, 40 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e4adae9732434188923f…

1 0