December 2009 - Wine-commits

Maarten Lankhorst : dsound: Clean up DSPROPERTY_DescriptionW.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 2e95764e76b3cdc2e31549f8b1553f6c8624b009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e95764e76b3cdc2e31549f8b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Dec 9 16:57:59 2009 +0100 dsound: Clean up DSPROPERTY_DescriptionW. --- dlls/dsound/propset.c | 283 ++++++++++++------------------------------------- 1 files changed, 69 insertions(+), 214 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e95764e76b3cdc2e3154…

1 0

Maarten Lankhorst : dsound: Clean up DSPROPERTY_EnumerateW.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 773acf41573cca62e01200b6cd4b5e0208180115 URL: http://source.winehq.org/git/wine.git/?a=commit;h=773acf41573cca62e01200b6c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Dec 9 16:58:00 2009 +0100 dsound: Clean up DSPROPERTY_EnumerateW. --- dlls/dsound/propset.c | 143 +++++++++++++++---------------------------------- 1 files changed, 43 insertions(+), 100 deletions(-) diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index d484839..1dd94c4 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -900,117 +900,60 @@ static HRESULT DSPROPERTY_EnumerateW( PULONG pcbReturned ) { PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA ppd = pPropData; - HRESULT err; + DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA data; + BOOL ret; + int widn, wodn, i; TRACE("(pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", pPropData,cbPropData,pcbReturned); - if (ppd) { - if (ppd->Callback) { - unsigned devs, wod, wid; - DSDRIVERDESC desc; - DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA data; - - devs = waveOutGetNumDevs(); - for (wod = 0; wod < devs; ++wod) { - err = mmErr(waveOutMessage(UlongToHandle(wod),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); - if (err == DS_OK) { - WCHAR * wDescription = HeapAlloc(GetProcessHeap(),0,0x200); - WCHAR * wModule = HeapAlloc(GetProcessHeap(),0,0x200); - if (wDescription && wModule) { - DWORD size; - err = mmErr(waveOutMessage(UlongToHandle(wod),DRV_QUERYDEVICEINTERFACESIZE, (DWORD_PTR)&size, 0)); - if (err == DS_OK) { - WCHAR * wInterface = HeapAlloc(GetProcessHeap(),0,size); - if (wInterface) { - err = mmErr(waveOutMessage(UlongToHandle(wod), DRV_QUERYDEVICEINTERFACE, (DWORD_PTR)wInterface, size)); - if (err == DS_OK) { - PIDSCDRIVER drv; - ZeroMemory(&data, sizeof(data)); - data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER; - data.WaveDeviceId = wod; - data.DeviceId = DSOUND_renderer_guids[wod]; - - MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, wDescription, 0x100 ); - MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, wModule, 0x100 ); - - data.Description = wDescription; - data.Module = wModule; - data.Interface = wInterface; - - data.Type = DIRECTSOUNDDEVICE_TYPE_EMULATED; - err = mmErr(waveOutMessage(UlongToHandle(wod), DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0)); - if (err == DS_OK && drv) - data.Type = DIRECTSOUNDDEVICE_TYPE_VXD; - else - WARN("waveOutMessage(DRV_QUERYDSOUNDIFACE) failed\n"); - - TRACE("calling Callback(%p,%p)\n", &data, ppd->Context); - (ppd->Callback)(&data, ppd->Context); - } - } - HeapFree(GetProcessHeap(),0,wInterface); - } - } - HeapFree(GetProcessHeap(),0,wDescription); - HeapFree(GetProcessHeap(),0,wModule); - } - } - - devs = waveInGetNumDevs(); - for (wid = 0; wid < devs; ++wid) { - err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); - if (err == DS_OK) { - WCHAR * wDescription = HeapAlloc(GetProcessHeap(),0,0x200); - WCHAR * wModule = HeapAlloc(GetProcessHeap(),0,0x200); - if (wDescription && wModule) { - DWORD size; - err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDEVICEINTERFACESIZE, (DWORD_PTR)&size, 0)); - if (err == DS_OK) { - WCHAR * wInterface = HeapAlloc(GetProcessHeap(),0,size); - if (wInterface) { - err = mmErr(waveInMessage(UlongToHandle(wid), DRV_QUERYDEVICEINTERFACE, (DWORD_PTR)wInterface, size)); - if (err == DS_OK) { - PIDSCDRIVER drv; - ZeroMemory(&data, sizeof(data)); - data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE; - data.WaveDeviceId = wid; - data.DeviceId = DSOUND_capture_guids[wid]; - - MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, wDescription, 0x100 ); - MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, wModule, 0x100 ); + if (pcbReturned) + *pcbReturned = 0; - data.Description = wDescription; - data.Module = wModule; - data.Interface = wInterface; - data.Type = DIRECTSOUNDDEVICE_TYPE_EMULATED; - err = mmErr(waveInMessage(UlongToHandle(wid), DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0)); - if (err == DS_OK && drv) - data.Type = DIRECTSOUNDDEVICE_TYPE_VXD; - else - WARN("waveInMessage(DRV_QUERYDSOUNDIFACE) failed\n"); + if (!ppd || !ppd->Callback) + { + WARN("Invalid ppd %p\n", ppd); + return E_PROP_ID_UNSUPPORTED; + } - TRACE("calling Callback(%p,%p)\n", &data, ppd->Context); - (ppd->Callback)(&data, ppd->Context); - } - } - HeapFree(GetProcessHeap(),0,wInterface); - } - } - HeapFree(GetProcessHeap(),0,wDescription); - HeapFree(GetProcessHeap(),0,wModule); - } - } + wodn = waveOutGetNumDevs(); + widn = waveInGetNumDevs(); + data.DeviceId = DSOUND_renderer_guids[0]; + for (i = 0; i < wodn; ++i) + { + HRESULT hr; + data.DeviceId.Data4[7] = i; + hr = DSPROPERTY_DescriptionW(&data, sizeof(data), NULL); + if (FAILED(hr)) + { + ERR("DescriptionW failed!\n"); return S_OK; } + ret = ppd->Callback(&data, ppd->Context); + HeapFree(GetProcessHeap(), 0, data.Module); + HeapFree(GetProcessHeap(), 0, data.Description); + if (!ret) + return S_OK; } - if (pcbReturned) { - *pcbReturned = 0; - FIXME("*pcbReturned=%d\n", *pcbReturned); + data.DeviceId = DSOUND_capture_guids[0]; + for (i = 0; i < widn; ++i) + { + HRESULT hr; + data.DeviceId.Data4[7] = i; + hr = DSPROPERTY_DescriptionW(&data, sizeof(data), NULL); + if (FAILED(hr)) + { + ERR("DescriptionW failed!\n"); + return S_OK; + } + ret = ppd->Callback(&data, ppd->Context); + HeapFree(GetProcessHeap(), 0, data.Module); + HeapFree(GetProcessHeap(), 0, data.Description); + if (!ret) + return S_OK; } - - return E_PROP_ID_UNSUPPORTED; + return S_OK; } static HRESULT WINAPI IKsPrivatePropertySetImpl_Get(

1 0

Maarten Lankhorst : dsound: Clean up DSPROPERTY_EnumerateA.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 4ecc5e661382c5614a6e4da5ac6dd32d151c3aa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ecc5e661382c5614a6e4da5a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Dec 9 16:58:01 2009 +0100 dsound: Clean up DSPROPERTY_EnumerateA. --- dlls/dsound/propset.c | 173 ++++++++++++++++++------------------------------- 1 files changed, 63 insertions(+), 110 deletions(-) diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 1dd94c4..c257eea 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -784,116 +784,6 @@ static HRESULT DSPROPERTY_Enumerate1( return E_PROP_ID_UNSUPPORTED; } -static HRESULT DSPROPERTY_EnumerateA( - LPVOID pPropData, - ULONG cbPropData, - PULONG pcbReturned ) -{ - PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA ppd = pPropData; - HRESULT err; - TRACE("(pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", - pPropData,cbPropData,pcbReturned); - - if (ppd) { - if (ppd->Callback) { - unsigned devs, wod, wid; - DSDRIVERDESC desc; - DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA data; - - devs = waveOutGetNumDevs(); - for (wod = 0; wod < devs; ++wod) { - err = mmErr(waveOutMessage(UlongToHandle(wod),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); - if (err == DS_OK) { - DWORD size; - err = mmErr(waveOutMessage(UlongToHandle(wod),DRV_QUERYDEVICEINTERFACESIZE,(DWORD_PTR)&size,0)); - if (err == DS_OK) { - WCHAR * nameW = HeapAlloc(GetProcessHeap(),0,size); - if (nameW) { - err = mmErr(waveOutMessage(UlongToHandle(wod),DRV_QUERYDEVICEINTERFACE,(DWORD_PTR)nameW,size)); - if (err == DS_OK) { - CHAR * szInterface = HeapAlloc(GetProcessHeap(),0,size/sizeof(WCHAR)); - if (szInterface) { - PIDSCDRIVER drv; - ZeroMemory(&data, sizeof(data)); - data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER; - data.WaveDeviceId = wod; - data.DeviceId = DSOUND_renderer_guids[wod]; - data.Description = desc.szDesc; - data.Module = desc.szDrvname; - WideCharToMultiByte( CP_ACP, 0, nameW, size/sizeof(WCHAR), szInterface, size/sizeof(WCHAR), NULL, NULL ); - data.Interface = szInterface; - - data.Type = DIRECTSOUNDDEVICE_TYPE_EMULATED; - err = mmErr(waveOutMessage(UlongToHandle(wod), DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0)); - if (err == DS_OK && drv) - data.Type = DIRECTSOUNDDEVICE_TYPE_VXD; - else - WARN("waveOutMessage(DRV_QUERYDSOUNDIFACE) failed\n"); - - TRACE("calling Callback(%p,%p)\n", &data, ppd->Context); - (ppd->Callback)(&data, ppd->Context); - } - HeapFree(GetProcessHeap(),0,szInterface); - } - } - HeapFree(GetProcessHeap(),0,nameW); - } - } - } - - devs = waveInGetNumDevs(); - for (wid = 0; wid < devs; ++wid) { - err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); - if (err == DS_OK) { - DWORD size; - err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDEVICEINTERFACESIZE,(DWORD_PTR)&size,0)); - if (err == DS_OK) { - WCHAR * nameW = HeapAlloc(GetProcessHeap(),0,size); - if (nameW) { - err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDEVICEINTERFACE,(DWORD_PTR)nameW,size)); - if (err == DS_OK) { - CHAR * szInterface = HeapAlloc(GetProcessHeap(),0,size/sizeof(WCHAR)); - if (szInterface) { - PIDSCDRIVER drv; - ZeroMemory(&data, sizeof(data)); - data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE; - data.WaveDeviceId = wid; - data.DeviceId = DSOUND_capture_guids[wid]; - data.Description = desc.szDesc; - data.Module = desc.szDrvname; - WideCharToMultiByte( CP_ACP, 0, nameW, size/sizeof(WCHAR), szInterface, size/sizeof(WCHAR), NULL, NULL ); - data.Interface = szInterface; - - data.Type = DIRECTSOUNDDEVICE_TYPE_EMULATED; - err = mmErr(waveInMessage(UlongToHandle(wid), DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0)); - if (err == DS_OK && drv) - data.Type = DIRECTSOUNDDEVICE_TYPE_VXD; - else - WARN("waveInMessage(DRV_QUERYDSOUNDIFACE) failed\n"); - - TRACE("calling Callback(%p,%p)\n", &data, ppd->Context); - (ppd->Callback)(&data, ppd->Context); - } - HeapFree(GetProcessHeap(),0,szInterface); - } - } - HeapFree(GetProcessHeap(),0,nameW); - } - } - } - - return S_OK; - } - } - - if (pcbReturned) { - *pcbReturned = 0; - FIXME("*pcbReturned=%d\n", *pcbReturned); - } - - return E_PROP_ID_UNSUPPORTED; -} - static HRESULT DSPROPERTY_EnumerateW( LPVOID pPropData, ULONG cbPropData, @@ -956,6 +846,69 @@ static HRESULT DSPROPERTY_EnumerateW( return S_OK; } +static BOOL DSPROPERTY_descWtoA(DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA *dataW, + DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA *dataA) +{ + DWORD modlen, desclen; + static char Interface[] = "Interface"; + + modlen = WideCharToMultiByte(CP_ACP, 0, dataW->Module, -1, NULL, 0, NULL, NULL); + desclen = WideCharToMultiByte(CP_ACP, 0, dataW->Description, -1, NULL, 0, NULL, NULL); + dataA->Type = dataW->Type; + dataA->DataFlow = dataW->DataFlow; + dataA->DeviceId = dataW->DeviceId; + dataA->WaveDeviceId = dataW->WaveDeviceId; + dataA->Interface = Interface; + dataA->Module = HeapAlloc(GetProcessHeap(), 0, modlen); + dataA->Description = HeapAlloc(GetProcessHeap(), 0, desclen); + if (!dataA->Module || !dataA->Description) + { + HeapFree(GetProcessHeap(), 0, dataA->Module); + HeapFree(GetProcessHeap(), 0, dataA->Description); + dataA->Module = dataA->Description = NULL; + return FALSE; + } + + WideCharToMultiByte(CP_ACP, 0, dataW->Module, -1, dataA->Module, modlen, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, dataW->Description, -1, dataA->Description, desclen, NULL, NULL); + return TRUE; +} + +static BOOL CALLBACK DSPROPERTY_enumWtoA(DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA *descW, void *data) +{ + DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA descA; + DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA *ppd = data; + BOOL ret; + + ret = DSPROPERTY_descWtoA(descW, &descA); + if (!ret) + return FALSE; + ret = ppd->Callback(&descA, ppd->Context); + HeapFree(GetProcessHeap(), 0, descA.Module); + HeapFree(GetProcessHeap(), 0, descA.Description); + return ret; +} + +static HRESULT DSPROPERTY_EnumerateA( + LPVOID pPropData, + ULONG cbPropData, + PULONG pcbReturned) +{ + DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA *ppd = pPropData; + DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA data; + + if (!ppd || !ppd->Callback) + { + WARN("Invalid ppd %p\n", ppd); + return E_PROP_ID_UNSUPPORTED; + } + + data.Callback = DSPROPERTY_enumWtoA; + data.Context = ppd; + + return DSPROPERTY_EnumerateW(&data, cbPropData, pcbReturned); +} + static HRESULT WINAPI IKsPrivatePropertySetImpl_Get( LPKSPROPERTYSET iface, REFGUID guidPropSet,

1 0

Nikolay Sivov : comctl32/treeview: Remove some forward declarations.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 6823e0f3ec356dc1b5831685e7b2b48c63e8ad86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6823e0f3ec356dc1b5831685e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Dec 9 23:26:06 2009 +0300 comctl32/treeview: Remove some forward declarations. --- dlls/comctl32/treeview.c | 55 +++++++++++++++++++-------------------------- 1 files changed, 23 insertions(+), 32 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 46923fe..30699c5 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -63,6 +63,8 @@ #include "wine/unicode.h" #include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(treeview); + /* internal structures */ typedef struct _TREEITEM /* HTREEITEM is a _TREEINFO *. */ @@ -153,10 +155,10 @@ typedef struct tagTREEVIEW_INFO int stateImageWidth; HDPA items; - DWORD lastKeyPressTimestamp; /* Added */ - WPARAM charCode; /* Added */ - INT nSearchParamLength; /* Added */ - WCHAR szSearchParam[ MAX_PATH ]; /* Added */ + DWORD lastKeyPressTimestamp; + WPARAM charCode; + INT nSearchParamLength; + WCHAR szSearchParam[ MAX_PATH ]; } TREEVIEW_INFO; @@ -177,14 +179,6 @@ typedef struct tagTREEVIEW_INFO #define TV_EDIT_TIMER 2 #define TV_EDIT_TIMER_SET 2 - -VOID TREEVIEW_Register (VOID); -VOID TREEVIEW_Unregister (VOID); - - -WINE_DEFAULT_DEBUG_CHANNEL(treeview); - - #define TEXT_CALLBACK_SIZE 260 #define TREEVIEW_LEFT_MARGIN 8 @@ -213,8 +207,6 @@ static LRESULT TREEVIEW_RButtonUp(const TREEVIEW_INFO *, const POINT *); static LRESULT TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel); static VOID TREEVIEW_UpdateScrollBars(TREEVIEW_INFO *infoPtr); static LRESULT TREEVIEW_HScroll(TREEVIEW_INFO *, WPARAM); -static INT TREEVIEW_NotifyFormat (TREEVIEW_INFO *infoPtr, HWND wParam, UINT lParam); - /* Random Utilities *****************************************************/ @@ -842,6 +834,23 @@ TREEVIEW_HasChildren(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem) return wineItem->cChildren > 0; } +static INT TREEVIEW_NotifyFormat (TREEVIEW_INFO *infoPtr, HWND hwndFrom, UINT nCommand) +{ + INT format; + + TRACE("(hwndFrom=%p, nCommand=%d)\n", hwndFrom, nCommand); + + if (nCommand != NF_REQUERY) return 0; + + format = SendMessageW(hwndFrom, WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwnd, NF_QUERY); + TRACE("format=%d\n", format); + + if (format != NFR_ANSI && format != NFR_UNICODE) return 0; + + infoPtr->bNtfUnicode = (format == NFR_UNICODE); + + return format; +} /* Item Position ********************************************************/ @@ -5361,24 +5370,6 @@ TREEVIEW_Notify(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) return DefWindowProcW(infoPtr->hwnd, WM_NOTIFY, wParam, lParam); } -static INT TREEVIEW_NotifyFormat (TREEVIEW_INFO *infoPtr, HWND hwndFrom, UINT nCommand) -{ - INT format; - - TRACE("(hwndFrom=%p, nCommand=%d)\n", hwndFrom, nCommand); - - if (nCommand != NF_REQUERY) return 0; - - format = SendMessageW(hwndFrom, WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwnd, NF_QUERY); - TRACE("format=%d\n", format); - - if (format != NFR_ANSI && format != NFR_UNICODE) return 0; - - infoPtr->bNtfUnicode = (format == NFR_UNICODE); - - return format; -} - static LRESULT TREEVIEW_Size(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) {

1 0

Nikolay Sivov : comctl32/tests: Get rid of static handles, split tests finally.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 83f2135e0d3646ac367df3be9c101dfc97be951f URL: http://source.winehq.org/git/wine.git/?a=commit;h=83f2135e0d3646ac367df3be9… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Dec 10 01:01:39 2009 +0300 comctl32/tests: Get rid of static handles, split tests finally. --- dlls/comctl32/tests/treeview.c | 235 +++++++++++++++++++++++++--------------- 1 files changed, 147 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83f2135e0d3646ac367df…

1 0

Nikolay Sivov : comdlg32/filedlg: Fix a lookin combo data leak.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: c0456e2ca7ab96e65137fcfffb2266324cd56eb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0456e2ca7ab96e65137fcfff… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Dec 10 01:35:42 2009 +0300 comdlg32/filedlg: Fix a lookin combo data leak. --- dlls/comdlg32/filedlg.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index afd02dc..908201d 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -3258,6 +3258,7 @@ static int FILEDLG95_LOOKIN_SearchItem(HWND hwnd,WPARAM searchArg,int iSearchMet static void FILEDLG95_LOOKIN_Clean(HWND hwnd) { FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); + LookInInfos *liInfos = GetPropA(fodInfos->DlgInfos.hwndLookInCB,LookInInfosStr); int iPos; int iCount = CBGetCount(fodInfos->DlgInfos.hwndLookInCB); @@ -3276,9 +3277,10 @@ static void FILEDLG95_LOOKIN_Clean(HWND hwnd) } /* LookInInfos structure */ + MemFree(liInfos); RemovePropA(fodInfos->DlgInfos.hwndLookInCB,LookInInfosStr); - } + /*********************************************************************** * FILEDLG95_FILENAME_FillFromSelection *

1 0

Nikolay Sivov : comdlg32/filedlg: Fix a find file handle leak.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: c8f1e9668a97ea7373237969014eb7b910a057a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8f1e9668a97ea73732379690… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Dec 10 02:01:59 2009 +0300 comdlg32/filedlg: Fix a find file handle leak. --- dlls/comdlg32/filedlg.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 908201d..d8908fe 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1527,12 +1527,11 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) if ( win98plus && handledPath == FALSE && fodInfos->filter && *fodInfos->filter) { - BOOL searchMore = TRUE; LPCWSTR lpstrPos = fodInfos->filter; WIN32_FIND_DATAW FindFileData; HANDLE hFind; - while (searchMore) + while (1) { /* filter is a list... title\0ext\0......\0\0 */ @@ -1550,7 +1549,6 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) lpstrPos += lstrlenW(lpstrPos) + 1; } else { - searchMore = FALSE; MemFree(fodInfos->initdir); fodInfos->initdir = MemAlloc(MAX_PATH*sizeof(WCHAR)); @@ -1559,6 +1557,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) handledPath = TRUE; TRACE("No initial dir specified, but files of type %s found in current, so using it\n", debugstr_w(lpstrPos)); + FindClose(hFind); break; } }

1 0

Jacek Caban : mshtml: Added IHTMLDOMTextNode::get_length implementation.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 64b651e262e3511b5668565d51512d3a285f3716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64b651e262e3511b5668565d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 10 01:09:54 2009 +0100 mshtml: Added IHTMLDOMTextNode::get_length implementation. --- dlls/mshtml/htmltextnode.c | 25 ++++++++++++++++++++++--- dlls/mshtml/tests/dom.c | 25 +++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index 799a137..1c2c2da 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -35,6 +35,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); struct HTMLDOMTextNode { HTMLDOMNode node; const IHTMLDOMTextNodeVtbl *lpIHTMLDOMTextNodeVtbl; + + nsIDOMText *nstext; }; #define HTMLTEXT(x) (&(x)->lpIHTMLDOMTextNodeVtbl) @@ -119,8 +121,17 @@ static HRESULT WINAPI HTMLDOMTextNode_toString(IHTMLDOMTextNode *iface, BSTR *St static HRESULT WINAPI HTMLDOMTextNode_get_length(IHTMLDOMTextNode *iface, LONG *p) { HTMLDOMTextNode *This = HTMLTEXT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRUint32 length = 0; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMText_GetLength(This->nstext, &length); + if(NS_FAILED(nsres)) + ERR("GetLength failed: %08x\n", nsres); + + *p = length; + return S_OK; } static HRESULT WINAPI HTMLDOMTextNode_splitText(IHTMLDOMTextNode *iface, LONG offset, IHTMLDOMNode **pRetNode) @@ -170,6 +181,9 @@ static void HTMLDOMTextNode_destructor(HTMLDOMNode *iface) { HTMLDOMTextNode *This = HTMLTEXT_NODE_THIS(iface); + if(This->nstext) + IHTMLDOMTextNode_Release(This->nstext); + HTMLDOMNode_destructor(&This->node); } @@ -195,7 +209,8 @@ static dispex_static_data_t HTMLDOMTextNode_dispex = { HTMLDOMNode *HTMLDOMTextNode_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode) { - HTMLDOMTextNode *ret ; + HTMLDOMTextNode *ret; + nsresult nsres; ret = heap_alloc_zero(sizeof(*ret)); ret->node.vtbl = &HTMLDOMTextNodeImplVtbl; @@ -204,5 +219,9 @@ HTMLDOMNode *HTMLDOMTextNode_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode) init_dispex(&ret->node.dispex, (IUnknown*)HTMLTEXT(ret), &HTMLDOMTextNode_dispex); HTMLDOMNode_Init(doc, &ret->node, nsnode); + nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMText, (void**)&ret->nstext); + if(NS_FAILED(nsres)) + ERR("Could not get nsIDOMText iface: %08x\n", nsres); + return &ret->node; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 1c970c8..e32e2fd 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -657,6 +657,17 @@ static IHTMLAnchorElement *_get_anchor_iface(unsigned line, IUnknown *unk) return anchor; } +#define get_text_iface(u) _get_text_iface(__LINE__,u) +static IHTMLDOMTextNode *_get_text_iface(unsigned line, IUnknown *unk) +{ + IHTMLDOMTextNode *text; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLDOMTextNode, (void**)&text); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDOMTextNode: %08x\n", hres); + return text; +} + #define test_node_name(u,n) _test_node_name(__LINE__,u,n) static void _test_node_name(unsigned line, IUnknown *unk, const char *exname) { @@ -1738,6 +1749,19 @@ static void _test_select_get_disabled(unsigned line, IHTMLSelectElement *select, _test_elem3_get_disabled(line, (IUnknown*)select, exb); } +#define test_text_length(u,l) _test_text_length(__LINE__,u,l) +static void _test_text_length(unsigned line, IUnknown *unk, LONG l) +{ + IHTMLDOMTextNode *text = _get_text_iface(line, unk); + LONG length; + HRESULT hres; + + hres = IHTMLDOMTextNode_get_length(text, &length); + ok_(__FILE__,line)(hres == S_OK, "get_length failed: %08x\n", hres); + ok_(__FILE__,line)(length == l, "length = %d, expected %d\n", length, l); + IHTMLDOMTextNode_Release(text); +} + #define test_select_set_disabled(i,b) _test_select_set_disabled(__LINE__,i,b) static void _test_select_set_disabled(unsigned line, IHTMLSelectElement *select, VARIANT_BOOL b) { @@ -5718,6 +5742,7 @@ static void test_create_elems(IHTMLDocument2 *doc) node = test_create_text(doc, "test"); test_ifaces((IUnknown*)node, text_iids); test_disp((IUnknown*)node, &DIID_DispHTMLDOMTextNode, "[object]"); + test_text_length((IUnknown*)node, 4); V_VT(&var) = VT_NULL; node2 = test_node_insertbefore((IUnknown*)body, node, &var);

1 0

Henri Verbeet : wined3d: Rename "wineD3DDevice" to "device".
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: b3defd4c8058d451a606eebee297ac4d93ee9779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3defd4c8058d451a606eebee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 9 20:32:08 2009 +0100 wined3d: Rename "wineD3DDevice" to "device". --- dlls/wined3d/arb_program_shader.c | 20 ++-- dlls/wined3d/ati_fragment_shader.c | 6 +- dlls/wined3d/basetexture.c | 8 +- dlls/wined3d/buffer.c | 26 +++--- dlls/wined3d/context.c | 16 ++-- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/device.c | 10 +- dlls/wined3d/glsl_shader.c | 4 +- dlls/wined3d/nvidia_texture_shader.c | 12 +- dlls/wined3d/palette.c | 3 +- dlls/wined3d/query.c | 24 +++--- dlls/wined3d/resource.c | 8 +- dlls/wined3d/state.c | 177 +++++++++++++++++---------------- dlls/wined3d/stateblock.c | 28 +++--- dlls/wined3d/surface.c | 80 ++++++++------- dlls/wined3d/surface_base.c | 15 +-- dlls/wined3d/surface_gdi.c | 2 +- dlls/wined3d/swapchain.c | 80 +++++++++------- dlls/wined3d/swapchain_base.c | 4 +- dlls/wined3d/swapchain_gdi.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/utils.c | 6 +- dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/volume.c | 8 +- dlls/wined3d/volumetexture.c | 2 +- dlls/wined3d/wined3d_private.h | 17 ++-- 26 files changed, 290 insertions(+), 274 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b3defd4c8058d451a606e…

1 0

Henri Verbeet : wined3d: Support more formats for display mode enumeration.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: b85a070598196da2de7cbbf7f30ffca94f2c7a42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b85a070598196da2de7cbbf7f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 9 20:32:09 2009 +0100 wined3d: Support more formats for display mode enumeration. ddraw/d3d8/d3d9 only support a limited number of formats, but those already limit the supported formats themselves. --- dlls/wined3d/directx.c | 62 +++++++++++++-------------------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 22 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 405ae97..a29b90c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2199,6 +2199,8 @@ static UINT WINAPI IWineD3DImpl_GetAdapterModeCount(IWineD3D *iface, UINT Ad /* TODO: Store modes per adapter and read it from the adapter structure */ if (Adapter == 0) { /* Display */ + const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(Format, &This->adapters[Adapter].gl_info); + UINT format_bits = format_desc->byte_count * CHAR_BIT; unsigned int i = 0; unsigned int j = 0; DEVMODEW mode; @@ -2209,28 +2211,15 @@ static UINT WINAPI IWineD3DImpl_GetAdapterModeCount(IWineD3D *iface, UINT Ad while (EnumDisplaySettingsExW(NULL, j, &mode, 0)) { ++j; - switch (Format) + + if (Format == WINED3DFMT_UNKNOWN) + { + /* This is for D3D8, do not enumerate P8 here */ + if (mode.dmBitsPerPel == 32 || mode.dmBitsPerPel == 16) ++i; + } + else if (mode.dmBitsPerPel == format_bits) { - case WINED3DFMT_UNKNOWN: - /* This is for D3D8, do not enumerate P8 here */ - if (mode.dmBitsPerPel == 32 || mode.dmBitsPerPel == 16) ++i; - break; - - case WINED3DFMT_B8G8R8X8_UNORM: - if (mode.dmBitsPerPel == 32) ++i; - break; - - case WINED3DFMT_B5G6R5_UNORM: - if (mode.dmBitsPerPel == 16) ++i; - break; - - case WINED3DFMT_P8_UINT: - if (mode.dmBitsPerPel == 8) ++i; - break; - - default: - /* Skip other modes as they do not match the requested format */ - break; + ++i; } } @@ -2257,6 +2246,8 @@ static HRESULT WINAPI IWineD3DImpl_EnumAdapterModes(IWineD3D *iface, UINT Adapte /* TODO: Store modes per adapter and read it from the adapter structure */ if (Adapter == 0) { + const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(Format, &This->adapters[Adapter].gl_info); + UINT format_bits = format_desc->byte_count * CHAR_BIT; DEVMODEW DevModeW; int ModeIdx = 0; UINT i = 0; @@ -2268,27 +2259,16 @@ static HRESULT WINAPI IWineD3DImpl_EnumAdapterModes(IWineD3D *iface, UINT Adapte /* If we are filtering to a specific format (D3D9), then need to skip all unrelated modes, but if mode is irrelevant (D3D8), then we can just count through the ones with valid bit depths */ - while ((i<=Mode) && EnumDisplaySettingsExW(NULL, j++, &DevModeW, 0)) { - switch (Format) + while ((i<=Mode) && EnumDisplaySettingsExW(NULL, j++, &DevModeW, 0)) + { + if (Format == WINED3DFMT_UNKNOWN) + { + /* This is for D3D8, do not enumerate P8 here */ + if (DevModeW.dmBitsPerPel == 32 || DevModeW.dmBitsPerPel == 16) ++i; + } + else if (DevModeW.dmBitsPerPel == format_bits) { - case WINED3DFMT_UNKNOWN: - /* This is D3D8. Do not enumerate P8 here */ - if (DevModeW.dmBitsPerPel == 32 || - DevModeW.dmBitsPerPel == 16) i++; - break; - case WINED3DFMT_B8G8R8X8_UNORM: - if (DevModeW.dmBitsPerPel == 32) i++; - break; - case WINED3DFMT_B5G6R5_UNORM: - if (DevModeW.dmBitsPerPel == 16) i++; - break; - case WINED3DFMT_P8_UINT: - if (DevModeW.dmBitsPerPel == 8) i++; - break; - default: - /* Modes that don't match what we support can get an early-out */ - TRACE_(d3d_caps)("Searching for %s, returning D3DERR_INVALIDCALL\n", debug_d3dformat(Format)); - return WINED3DERR_INVALIDCALL; + ++i; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6c97888..35887f7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -26,6 +26,7 @@ #include <stdarg.h> #include <math.h> +#include <limits.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT #define COBJMACROS

1 0