wine-commits December 2008

wine-commits@winehq.org

2 participants
1225 discussions

Vitaliy Margolen : dinput: snprintf zero-terminates string no need to do it explicitly.
by Alexandre Julliard 27 Dec '08

27 Dec '08

Module: wine Branch: master Commit: e0152e85e9acbea33591190470e78127a5825d66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0152e85e9acbea3359119047… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Dec 27 11:23:11 2008 -0700 dinput: snprintf zero-terminates string no need to do it explicitly. --- dlls/dinput/joystick_linuxinput.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 8df143a..95666e8 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -221,15 +221,15 @@ static void find_joydevs(void) /* Someone beat us to it */ return; - for (i=0;i<MAX_JOYDEV;i++) { - char buf[MAX_PATH]; - struct JoyDev joydev = {0}; - int fd; - int no_ff_check = 0; - int j; - - snprintf(buf,MAX_PATH,EVDEVPREFIX"%d",i); - buf[MAX_PATH-1] = 0; + for (i = 0; i < MAX_JOYDEV; i++) + { + char buf[MAX_PATH]; + struct JoyDev joydev = {0}; + int fd; + int no_ff_check = 0; + int j; + + snprintf(buf, sizeof(buf), EVDEVPREFIX"%d", i); if ((fd=open(buf, O_RDWR))==-1) { fd = open(buf, O_RDONLY);

1 0

Vitaliy Margolen : dinput: Make find_joydevs re-entrant.
by Alexandre Julliard 27 Dec '08

27 Dec '08

Module: wine Branch: master Commit: ae26ca6c286d6508b45c4348adc69d038a997707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae26ca6c286d6508b45c4348a… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Dec 27 11:23:08 2008 -0700 dinput: Make find_joydevs re-entrant. --- dlls/dinput/joystick_linuxinput.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 4dcd61e..8df143a 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -215,13 +215,11 @@ static struct JoyDev *joydevs = NULL; static void find_joydevs(void) { - int i; - - if (have_joydevs!=-1) { - return; - } + int i; - have_joydevs = 0; + if (InterlockedCompareExchange(&have_joydevs, 0, -1) != -1) + /* Someone beat us to it */ + return; for (i=0;i<MAX_JOYDEV;i++) { char buf[MAX_PATH];

1 0

Rob Shearman : widl: Structures and arrays with pointers should be complex when generating code for 64-bit platforms .
by Alexandre Julliard 27 Dec '08

27 Dec '08

Module: wine Branch: master Commit: 2e0aefc1fd60e0e9f800e68eaaa905f031e3b544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e0aefc1fd60e0e9f800e68ea… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Dec 27 17:35:50 2008 +0000 widl: Structures and arrays with pointers should be complex when generating code for 64-bit platforms. The non-complex variants depend on the wire size of the structure/array matching the buffer size, but this no longer applies when pointers are 8 bytes instead of 4. --- tools/widl/typegen.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index ed9430c..0406eb9 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -212,14 +212,28 @@ static int get_struct_type(const type_t *type) break; case RPC_FC_RP: + return RPC_FC_BOGUS_STRUCT; + case RPC_FC_UP: case RPC_FC_FP: case RPC_FC_OP: + if (pointer_size != 4) + return RPC_FC_BOGUS_STRUCT; + has_pointer = 1; + break; + case RPC_FC_CARRAY: case RPC_FC_CVARRAY: case RPC_FC_BOGUS_ARRAY: + { + unsigned int ptr_type = get_attrv(field->attrs, ATTR_POINTERTYPE); + if (!ptr_type || ptr_type == RPC_FC_RP) + return RPC_FC_BOGUS_STRUCT; + else if (pointer_size != 4) + return RPC_FC_BOGUS_STRUCT; has_pointer = 1; break; + } /* * Propagate member attributes

1 0

Rob Shearman : mshtml: Check for the container' s doc being NULL in nsTooltipListener_OnShowTooltip and nsTooltipListener_OnHideTooltip .
by Alexandre Julliard 27 Dec '08

27 Dec '08

Module: wine Branch: master Commit: 07e8ab45c96ac2387919674446252044c1e6c8c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07e8ab45c96ac238791967444… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Dec 27 17:28:42 2008 +0000 mshtml: Check for the container's doc being NULL in nsTooltipListener_OnShowTooltip and nsTooltipListener_OnHideTooltip. They could be called after NSContainer_Release is called. --- dlls/mshtml/nsembed.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index a653e24..c7756ae 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1496,7 +1496,8 @@ static nsresult NSAPI nsTooltipListener_OnShowTooltip(nsITooltipListener *iface, { NSContainer *This = NSTOOLTIP_THIS(iface); - show_tooltip(This->doc, aXCoord, aYCoord, aTipText); + if (This->doc) + show_tooltip(This->doc, aXCoord, aYCoord, aTipText); return NS_OK; } @@ -1505,7 +1506,8 @@ static nsresult NSAPI nsTooltipListener_OnHideTooltip(nsITooltipListener *iface) { NSContainer *This = NSTOOLTIP_THIS(iface); - hide_tooltip(This->doc); + if (This->doc) + hide_tooltip(This->doc); return NS_OK; }

1 0

Damjan Jovanovic : winemenubuilder: Improve icon generation.
by Alexandre Julliard 27 Dec '08

27 Dec '08

Module: wine Branch: master Commit: 83b081f73c6d0bfda680ffa32fe77c7523ea43dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=83b081f73c6d0bfda680ffa32… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Dec 27 14:37:48 2008 +0200 winemenubuilder: Improve icon generation. --- programs/winemenubuilder/winemenubuilder.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index ec7a162..56eac5a 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -494,14 +494,13 @@ static BOOL extract_icon32(LPCWSTR szFileName, int nIndex, char *szXPMFileName) { for (i = 0; i < pIconDir->idCount; i++) { - if ((pIconDir->idEntries[i].wBitCount >= nMaxBits) && (pIconDir->idEntries[i].wBitCount <= 8)) + if (pIconDir->idEntries[i].wBitCount >= nMaxBits) { - nMaxBits = pIconDir->idEntries[i].wBitCount; - if ((pIconDir->idEntries[i].bHeight * pIconDir->idEntries[i].bWidth) >= nMax) { lpName = MAKEINTRESOURCEW(pIconDir->idEntries[i].nID); nMax = pIconDir->idEntries[i].bHeight * pIconDir->idEntries[i].bWidth; + nMaxBits = pIconDir->idEntries[i].wBitCount; } } }

1 0

Huw Davies : comdlg32: Use [G|S]etPropW instead of [G|S]etPropA.
by Alexandre Julliard 27 Dec '08

27 Dec '08

Module: wine Branch: master Commit: c50a368e4664974f032ff1662d6b7f3e5cd8ac08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c50a368e4664974f032ff1662… Author: Huw Davies <huw(a)codeweavers.com> Date: Sat Dec 27 12:21:19 2008 +0000 comdlg32: Use [G|S]etPropW instead of [G|S]etPropA. --- dlls/comdlg32/printdlg.c | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index bdc2a0d..69767e7 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -79,7 +79,9 @@ static const WCHAR pd32_collateW[] = { 'P', 'D', '3', '2', '_', 'C', 'O', 'L', ' static const WCHAR pd32_nocollateW[] = { 'P', 'D', '3', '2', '_', 'N', 'O', 'C', 'O', 'L', 'L', 'A', 'T', 'E', 0 }; static const WCHAR pd32_portraitW[] = { 'P', 'D', '3', '2', '_', 'P', 'O', 'R', 'T', 'R', 'A', 'I', 'T', 0 }; static const WCHAR pd32_landscapeW[] = { 'P', 'D', '3', '2', '_', 'L', 'A', 'N', 'D', 'S', 'C', 'A', 'P', 'E', 0 }; -static const WCHAR propW[] = {'_','_','W','I','N','E','_','P','R','I','N','T','D','L','G','D','A','T','A',0}; +static const WCHAR printdlg_prop[] = {'_','_','W','I','N','E','_','P','R','I','N','T','D','L','G','D','A','T','A',0}; +static const WCHAR pagesetupdlg_prop[] = { '_', '_', 'W', 'I', 'N', 'E', '_', 'P', 'A', 'G', 'E', + 'S', 'E', 'T', 'U', 'P', 'D', 'L', 'G', 'D', 'A', 'T', 'A', 0 }; /*********************************************************************** * PRINTDLG_OpenDefaultPrinter @@ -1854,12 +1856,12 @@ static INT_PTR CALLBACK PrintDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, INT_PTR res = FALSE; if (uMsg!=WM_INITDIALOG) { - PrintStructures = GetPropA(hDlg,"__WINE_PRINTDLGDATA"); + PrintStructures = GetPropW(hDlg, printdlg_prop); if (!PrintStructures) return FALSE; } else { PrintStructures = (PRINT_PTRA*) lParam; - SetPropA(hDlg,"__WINE_PRINTDLGDATA",PrintStructures); + SetPropW(hDlg, printdlg_prop, PrintStructures); if(!check_printer_setup(hDlg)) { EndDialog(hDlg,FALSE); @@ -1903,12 +1905,12 @@ static INT_PTR CALLBACK PrintDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, INT_PTR res = FALSE; if (uMsg!=WM_INITDIALOG) { - PrintStructures = GetPropW(hDlg, propW); + PrintStructures = GetPropW(hDlg, printdlg_prop); if (!PrintStructures) return FALSE; } else { PrintStructures = (PRINT_PTRW*) lParam; - SetPropW(hDlg, propW, PrintStructures); + SetPropW(hDlg, printdlg_prop, PrintStructures); if(!check_printer_setup(hDlg)) { EndDialog(hDlg,FALSE); @@ -3215,7 +3217,7 @@ PRINTDLG_PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return CallWindowProcA(lpfnStaticWndProc, hWnd, uMsg, wParam, lParam); /* Processing WM_PAINT message */ - pda = GetPropA(hWnd, "__WINE_PAGESETUPDLGDATA"); + pda = GetPropW(hWnd, pagesetupdlg_prop); if (!pda) { WARN("__WINE_PAGESETUPDLGDATA prop not set?\n"); return FALSE; @@ -3311,8 +3313,8 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) hDrawWnd = GetDlgItem(hDlg, rct1); TRACE("set property to %p\n", pda); - SetPropA(hDlg, "__WINE_PAGESETUPDLGDATA", pda); - SetPropA(hDrawWnd, "__WINE_PAGESETUPDLGDATA", pda); + SetPropW(hDlg, pagesetupdlg_prop, pda); + SetPropW(hDrawWnd, pagesetupdlg_prop, pda); GetWindowRect(hDrawWnd, &pda->rtDrawRect); /* Calculating rect in client coordinates where paper draws */ ScreenToClient(hDlg, (LPPOINT)&pda->rtDrawRect); ScreenToClient(hDlg, (LPPOINT)(&pda->rtDrawRect.right)); @@ -3404,7 +3406,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) PRINTDLG_PS_ChangePaperPrev(pda); return TRUE; } else { - pda = GetPropA(hDlg,"__WINE_PAGESETUPDLGDATA"); + pda = GetPropW(hDlg, pagesetupdlg_prop); if (!pda) { WARN("__WINE_PAGESETUPDLGDATA prop not set?\n"); return FALSE; @@ -3424,9 +3426,6 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) static INT_PTR CALLBACK PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { - static const WCHAR __WINE_PAGESETUPDLGDATA[] = - { '_', '_', 'W', 'I', 'N', 'E', '_', 'P', 'A', 'G', 'E', - 'S', 'E', 'T', 'U', 'P', 'D', 'L', 'G', 'D', 'A', 'T', 'A', 0 }; PageSetupDataW *pdw; BOOL res = FALSE; @@ -3434,7 +3433,7 @@ PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) res = TRUE; pdw = (PageSetupDataW*)lParam; pdw->curdlg = *pdw->dlgw; - SetPropW(hDlg, __WINE_PAGESETUPDLGDATA, pdw); + SetPropW(hDlg, pagesetupdlg_prop, pdw); if (pdw->dlgw->Flags & PSD_ENABLEPAGESETUPHOOK) { res = pdw->dlgw->lpfnPageSetupHook(hDlg,uMsg,wParam,(LPARAM)pdw->dlgw); if (!res) { @@ -3490,7 +3489,7 @@ PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) return TRUE; } else { - pdw = GetPropW(hDlg, __WINE_PAGESETUPDLGDATA); + pdw = GetPropW(hDlg, pagesetupdlg_prop); if (!pdw) { WARN("__WINE_PAGESETUPDLGDATA prop not set?\n"); return FALSE;

1 0

Christian Costa : d3dxof: Initialize object member names correctly.
by Alexandre Julliard 27 Dec '08

27 Dec '08

Module: wine Branch: master Commit: 00c574d117e1a304cc4745a1b805ca908ba6e82d URL: http://source.winehq.org/git/wine.git/?a=commit;h=00c574d117e1a304cc4745a1b… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sat Dec 27 12:01:00 2008 +0100 d3dxof: Initialize object member names correctly. --- dlls/d3dxof/d3dxof.c | 1 + dlls/d3dxof/d3dxof_private.h | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 616cea5..493735b 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -1938,6 +1938,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) int k; int nb_elems = 1; + buf->pxo->members[i].name = pt->members[i].name; buf->pxo->members[i].start = buf->cur_pdata; for (k = 0; k < pt->members[i].nb_dims; k++) diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index bc78bc0..1a66006 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -63,7 +63,7 @@ typedef struct { } xtemplate; typedef struct { - char name[MAX_NAME_LEN]; + char* name; LPBYTE start; ULONG size; } xobject_member;

1 0

Dylan Smith : richedit: Prevented a dereference of a freed pointer.
by Alexandre Julliard 27 Dec '08

27 Dec '08

Module: wine Branch: master Commit: c9977df85306f0403c7eeeee7fd041d9b3ac88f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9977df85306f0403c7eeeee7… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Dec 27 00:06:40 2008 -0500 richedit: Prevented a dereference of a freed pointer. On WM_DESTROY the editor was getting freed, then it was used to obtain a handle to the editor. This patch moves it just before the editor is freed within ME_DestroyEditor. --- dlls/riched20/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index c93a1e4..b5a69f7 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2685,6 +2685,7 @@ void ME_DestroyEditor(ME_TextEditor *editor) DeleteObject(editor->hbrBackground); if(editor->lpOleCallback) IUnknown_Release(editor->lpOleCallback); + SetWindowLongPtrW(editor->hWnd, 0, 0); OleUninitialize(); FREE_OBJ(editor->pBuffer); @@ -3821,7 +3822,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case WM_DESTROY: ME_DestroyEditor(editor); - SetWindowLongPtrW(editor->hWnd, 0, 0); return 0; case WM_SETCURSOR: {

1 0

Aleksey Bragin : ntdll: Fix memory corruption in RtlSetBits.
by Alexandre Julliard 27 Dec '08

27 Dec '08

Module: wine Branch: master Commit: a8a97091fe3875b589db3612bec8377e30ad4199 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8a97091fe3875b589db3612b… Author: Aleksey Bragin <aleksey(a)reactos.org> Date: Fri Dec 26 23:52:25 2008 +0300 ntdll: Fix memory corruption in RtlSetBits. --- dlls/ntdll/rtlbitmap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/rtlbitmap.c b/dlls/ntdll/rtlbitmap.c index 3656d24..ef033b2 100644 --- a/dlls/ntdll/rtlbitmap.c +++ b/dlls/ntdll/rtlbitmap.c @@ -170,7 +170,8 @@ VOID WINAPI RtlSetBits(PRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount) } /* Set remaining bits, if any */ - *lpOut |= NTDLL_maskBits[ulCount & 0x7]; + if (ulCount & 0x7) + *lpOut |= NTDLL_maskBits[ulCount & 0x7]; } /*************************************************************************

1 0

Alexandre Julliard : libport: Check for ENOTSUP being defined before using it.
by Alexandre Julliard 27 Dec '08

27 Dec '08

Module: wine Branch: master Commit: e5ad41bce36372ebfd3b02bcb7b403d0df457622 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5ad41bce36372ebfd3b02bcb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 27 20:06:28 2008 +0100 libport: Check for ENOTSUP being defined before using it. --- libs/port/spawn.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/libs/port/spawn.c b/libs/port/spawn.c index 490abb3..38c2944 100644 --- a/libs/port/spawn.c +++ b/libs/port/spawn.c @@ -43,7 +43,10 @@ int spawnvp(int mode, const char *cmdname, const char *const argv[]) { execvp(cmdname, (char **)argv); /* if we get here it failed */ - if (errno != ENOTSUP) return -1; /* exec fails on MacOS if the process has multiple threads */ +#ifdef ENOTSUP + if (errno != ENOTSUP) /* exec fails on MacOS if the process has multiple threads */ +#endif + return -1; } dfl_act.sa_handler = SIG_DFL;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2008