February 2008 - Wine-commits

Alistair Leslie-Hughes : msxml3: Support functions for typelib.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 4a58bf5cff3cb8c126d890562d9c2c685dc7fd38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a58bf5cff3cb8c126d890562… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 14 20:55:33 2008 +1100 msxml3: Support functions for typelib. --- dlls/msxml3/main.c | 75 +++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/msxml_private.h | 22 ++++++++++++ 2 files changed, 97 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 62bf2b5..5cce644 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -21,11 +21,14 @@ #include "config.h" +#define COBJMACROS + #include <stdarg.h> #include "windef.h" #include "winbase.h" #include "winuser.h" #include "ole2.h" +#include "msxml.h" #include "msxml2.h" #include "wine/debug.h" @@ -34,6 +37,77 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); + +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static REFIID tid_ids[] = { + &IID_IXMLDOMAttribute, + &IID_IXMLDOMCDATASection, + &IID_IXMLDOMComment, + &IID_IXMLDOMDocument2, + &IID_IXMLDOMDocumentFragment, + &IID_IXMLDOMElement, + &IID_IXMLDOMEntityReference, + &IID_IXMLDOMNamedNodeMap, + &IID_IXMLDOMNodeList, + &IID_IXMLDOMParseError, + &IID_IXMLDOMProcessingInstruction, + &IID_IXMLDOMSchemaCollection, + &IID_IXMLDOMText, + &IID_IXMLElement, + &IID_IXMLDOMDocument +}; + +HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo) +{ + HRESULT hres; + + if(!typelib) { + ITypeLib *tl; + + hres = LoadRegTypeLib(&LIBID_MSXML2, 3, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if(FAILED(hres)) { + ERR("LoadRegTypeLib failed: %08x\n", hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) + ITypeLib_Release(tl); + } + + if(!typeinfos[tid]) { + ITypeInfo *typeinfo; + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &typeinfo); + if(FAILED(hres)) { + ERR("GetTypeInfoOfGuid failed: %08x\n", hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), typeinfo, NULL)) + ITypeInfo_Release(typeinfo); + } + + *typeinfo = typeinfos[tid]; + + ITypeInfo_AddRef(typeinfos[tid]); + return S_OK; +} + +static void process_detach(void) +{ + if(typelib) { + unsigned i; + + for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + if(typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + + ITypeLib_Release(typelib); + } +} + HRESULT WINAPI DllCanUnloadNow(void) { FIXME("\n"); @@ -53,6 +127,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) case DLL_PROCESS_DETACH: #ifdef HAVE_LIBXML2 xmlCleanupParser(); + process_detach(); #endif break; } diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 33b2c9e..96bb3de 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -90,4 +90,26 @@ extern HRESULT DOMDocument_create( IUnknown *pUnkOuter, LPVOID *ppObj ); extern HRESULT SchemaCache_create( IUnknown *pUnkOuter, LPVOID *ppObj ); extern HRESULT XMLDocument_create( IUnknown *pUnkOuter, LPVOID *ppObj ); +/* typelibs */ +enum tid_t { + IXMLDOMAttribute_tid, + IXMLDOMCDATASection_tid, + IXMLDOMComment_tid, + IXMLDOMDocument2_tid, + IXMLDOMDocumentFragment_tid, + IXMLDOMElement_tid, + IXMLDOMEntityReference_tid, + IXMLDOMNamedNodeMap_tid, + IXMLDOMNodeList_tid, + IXMLDOMParseError_tid, + IXMLDOMProcessingInstruction_tid, + IXMLDOMSchemaCollection_tid, + IXMLDOMText_tid, + IXMLElement_tid, + IXMLDocument_tid, + LAST_tid +}; + +extern HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo); + #endif /* __MSXML_PRIVATE__ */

1 0

Rob Shearman : msi: Fix the character count passed into RegSetValueExA in test_MsiQueryFeatureState .
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 85fbdfcc9e72fb1e9aa5957036cfad1151cf3394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85fbdfcc9e72fb1e9aa595703… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Feb 16 15:36:40 2008 +0000 msi: Fix the character count passed into RegSetValueExA in test_MsiQueryFeatureState. --- dlls/msi/tests/msi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 6c4a057..2bf1b67 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -643,7 +643,7 @@ static void test_MsiQueryFeatureState(void) state = MsiQueryFeatureStateA(prodcode, "feature"); ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - res = RegSetValueExA(userkey, "feature", 0, REG_SZ, (const BYTE *)"", 8); + res = RegSetValueExA(userkey, "feature", 0, REG_SZ, (const BYTE *)"", 2); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); state = MsiQueryFeatureStateA(prodcode, "feature");

1 0

Rob Shearman : winspool: Fix character count passed to RegQueryValueExW in get_local_monitors.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 6886a49c5953c2cf5c141b1b09f288ce32ced3f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6886a49c5953c2cf5c141b1b0… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Feb 16 15:36:48 2008 +0000 winspool: Fix character count passed to RegQueryValueExW in get_local_monitors. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 4ba9f28..a2f6779 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -763,7 +763,7 @@ static DWORD get_local_monitors(DWORD level, LPBYTE pMonitors, DWORD cbBuf, LPDW /* Scan all Monitor-Registry-Keys */ while (RegEnumKeyExW(hroot, index, buffer, &len, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { TRACE("Monitor_%d: %s\n", numentries, debugstr_w(buffer)); - dllsize = sizeof(dllname); + dllsize = sizeof(dllname)/sizeof(dllname[0]); dllname[0] = '\0'; /* The Monitor must have a Driver-DLL */

1 0

Frans Kool : write: Created Dutch translations.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 275ba2547a4702d0924801f0545fdcf229c7e068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=275ba2547a4702d0924801f05… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Sat Feb 16 23:23:48 2008 +0100 write: Created Dutch translations. --- programs/write/Nl.rc | 26 ++++++++++++++++++++++++++ programs/write/rsrc.rc | 1 + 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/programs/write/Nl.rc b/programs/write/Nl.rc new file mode 100644 index 0000000..5f1611e --- /dev/null +++ b/programs/write/Nl.rc @@ -0,0 +1,26 @@ +/* + * Dutch language support + * + * Copyright (C) 2008 Frans Kool + * + * 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_DUTCH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_FAILED, "Starten van Wordpad mislukt" +} diff --git a/programs/write/rsrc.rc b/programs/write/rsrc.rc index 1c2f133..45067eb 100644 --- a/programs/write/rsrc.rc +++ b/programs/write/rsrc.rc @@ -25,6 +25,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "En.rc" #include "Fr.rc" #include "Ko.rc" +#include "Nl.rc" #include "No.rc" #include "Pl.rc" #include "Ru.rc"

1 0

Frans Kool : wineboot: Created Dutch translations.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 6f68cda74ccb541f173de512ad0c04155cfb35dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f68cda74ccb541f173de512a… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Sat Feb 16 23:45:08 2008 +0100 wineboot: Created Dutch translations. --- programs/wineboot/wineboot.rc | 1 + programs/wineboot/wineboot_Nl.rc | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/wineboot.rc b/programs/wineboot/wineboot.rc index d0f7e2a..377618b 100644 --- a/programs/wineboot/wineboot.rc +++ b/programs/wineboot/wineboot.rc @@ -31,6 +31,7 @@ #include "wineboot_Es.rc" #include "wineboot_Fr.rc" #include "wineboot_Ko.rc" +#include "wineboot_Nl.rc" #include "wineboot_No.rc" #include "wineboot_Pl.rc" #include "wineboot_Sv.rc" diff --git a/programs/wineboot/wineboot_Nl.rc b/programs/wineboot/wineboot_Nl.rc new file mode 100644 index 0000000..86fc337 --- /dev/null +++ b/programs/wineboot/wineboot_Nl.rc @@ -0,0 +1,35 @@ +/* + * Dutch WineBoot resources + * + * Copyright (C) 2008 Frans Kool + * + * 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_DUTCH, SUBLANG_NEUTRAL + +IDD_ENDTASK DIALOG DISCARDABLE 0, 0, 186, 71 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Wachtend op Programma" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Annuleren",IDCANCEL,129,49,50,15 + PUSHBUTTON "Beëindig Proces",IDOK,51,49,71,15 + LTEXT "Een gesimuleerde uitlog- of afsluitactie is bezig, maar dit programma reageert niet.", + IDC_STATIC,7,7,172,19 + LTEXT "Als u het proces beëindigt kun u alle niet-opgeslagen data verliezen.", + IDC_STATIC,7,28,172,15 +END

1 0

Alexandre Julliard : comctl32: Remove unnecessary \n in trace.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 543909958f3efcea3f356c246b82b8e69faef3dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=543909958f3efcea3f356c246… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Feb 17 20:26:13 2008 +0100 comctl32: Remove unnecessary \n in trace. --- dlls/comctl32/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 16bf38a..006991f 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -611,7 +611,7 @@ static const char* debugnmlistview(const NMLISTVIEW *plvnm) { if (!plvnm) return "(null)"; return wine_dbg_sprintf("iItem=%d, iSubItem=%d, uNewState=0x%x," - " uOldState=0x%x, uChanged=0x%x, ptAction=%s, lParam=%ld\n", + " uOldState=0x%x, uChanged=0x%x, ptAction=%s, lParam=%ld", plvnm->iItem, plvnm->iSubItem, plvnm->uNewState, plvnm->uOldState, plvnm->uChanged, wine_dbgstr_point(&plvnm->ptAction), plvnm->lParam); }

1 0

Alexandre Julliard : gdi32: Export the DC hook functions as 32-bit functions.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 50dea3817868f471549107ea992f67ddbd8b05dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=50dea3817868f471549107ea9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Feb 17 20:29:55 2008 +0100 gdi32: Export the DC hook functions as 32-bit functions. --- dlls/gdi32/clipping.c | 11 ++++++----- dlls/gdi32/dc.c | 25 ++++++++++++++++++++++--- dlls/gdi32/gdi16.c | 18 ++++++++++++++++++ dlls/gdi32/gdi32.spec | 5 +++-- dlls/wineps.drv/init.c | 3 +-- dlls/winex11.drv/dce.c | 13 +++++-------- include/wine/wingdi16.h | 9 --------- include/wingdi.h | 16 ++++++++++++++++ 8 files changed, 71 insertions(+), 29 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 2c53dfb..e3a5851 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -163,22 +163,23 @@ INT WINAPI ExtSelectClipRgn( HDC hdc, HRGN hrgn, INT fnMode ) } /*********************************************************************** - * SelectVisRgn (GDI.105) + * SelectVisRgn (GDI32.@) + * + * Note: not exported on Windows, only the 16-bit version is exported. */ -INT16 WINAPI SelectVisRgn16( HDC16 hdc16, HRGN16 hrgn ) +INT WINAPI SelectVisRgn( HDC hdc, HRGN hrgn ) { int retval; - HDC hdc = HDC_32( hdc16 ); DC * dc; if (!hrgn) return ERROR; if (!(dc = get_dc_ptr( hdc ))) return ERROR; - TRACE("%p %04x\n", hdc, hrgn ); + TRACE("%p %p\n", hdc, hrgn ); dc->dirty = 0; - retval = CombineRgn( dc->hVisRgn, HRGN_32(hrgn), 0, RGN_COPY ); + retval = CombineRgn( dc->hVisRgn, hrgn, 0, RGN_COPY ); CLIPPING_UpdateGCRegion( dc ); release_dc_ptr( dc ); return retval; diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index ba59a8d..3678791 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1395,6 +1395,24 @@ BOOL WINAPI SetDCHook( HDC hdc, DCHOOKPROC hookProc, DWORD_PTR dwHookData ) } +/*********************************************************************** + * GetDCHook (GDI32.@) + * + * Note: this doesn't exist in Win32, we add it here because user32 needs it. + */ +DWORD_PTR WINAPI GetDCHook( HDC hdc, DCHOOKPROC *proc ) +{ + DC *dc = get_dc_ptr( hdc ); + DWORD_PTR ret; + + if (!dc) return 0; + if (proc) *proc = dc->hookThunk; + ret = dc->dwHookData; + release_dc_ptr( dc ); + return ret; +} + + /* relay function to call the 16-bit DC hook proc */ static BOOL WINAPI call_dc_hook16( HDC hdc, WORD code, DWORD_PTR data, LPARAM lParam ) { @@ -1454,11 +1472,12 @@ DWORD WINAPI GetDCHook16( HDC16 hdc16, FARPROC16 *phookProc ) /*********************************************************************** - * SetHookFlags (GDI.192) + * SetHookFlags (GDI32.@) + * + * Note: this doesn't exist in Win32, we add it here because user32 needs it. */ -WORD WINAPI SetHookFlags16(HDC16 hdc16, WORD flags) +WORD WINAPI SetHookFlags( HDC hdc, WORD flags ) { - HDC hdc = HDC_32( hdc16 ); DC *dc = get_dc_obj( hdc ); /* not get_dc_ptr, this needs to work from any thread */ LONG ret = 0; diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index 02bb16f..b0cea2e 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -1347,6 +1347,15 @@ BOOL16 WINAPI PtVisible16( HDC16 hdc, INT16 x, INT16 y ) /*********************************************************************** + * SelectVisRgn (GDI.105) + */ +INT16 WINAPI SelectVisRgn16( HDC16 hdc, HRGN16 hrgn ) +{ + return SelectVisRgn( HDC_32(hdc), HRGN_32(hrgn) ); +} + + +/*********************************************************************** * SetBitmapBits (GDI.106) */ LONG WINAPI SetBitmapBits16( HBITMAP16 hbitmap, LONG count, LPCVOID buffer ) @@ -1567,6 +1576,15 @@ void WINAPI PlayMetaFileRecord16( HDC16 hdc, HANDLETABLE16 *ht, METARECORD *mr, /*********************************************************************** + * SetHookFlags (GDI.192) + */ +WORD WINAPI SetHookFlags16( HDC16 hdc, WORD flags ) +{ + return SetHookFlags( HDC_32(hdc), flags ); +} + + +/*********************************************************************** * SetBoundsRect (GDI.193) */ UINT16 WINAPI SetBoundsRect16( HDC16 hdc, const RECT16* rect, UINT16 flags ) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 1a41c20..4738a38 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -515,10 +515,11 @@ @ stdcall CloseJob16(long) @ stdcall DrvGetPrinterData16(str str ptr ptr long ptr) @ stdcall DrvSetPrinterData16(str str long ptr long) +@ stdcall GetDCHook(long ptr) @ stdcall OpenJob16(str str long) -@ stdcall SelectVisRgn16(long long) +@ stdcall SelectVisRgn(long long) @ stdcall SetDCHook(long ptr long) -@ stdcall SetHookFlags16(long long) +@ stdcall SetHookFlags(long long) @ stdcall WriteSpool16(long ptr long) ################################################################ diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 0024640..e492730 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -37,7 +37,6 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "wownt32.h" #include "winreg.h" #include "psdrv.h" #include "winspool.h" @@ -406,7 +405,7 @@ HDC PSDRV_ResetDC( PSDRV_PDEVICE *physDev, const DEVMODEW *lpInitData ) HeapFree(PSDRV_Heap, 0, devmodeA); PSDRV_UpdateDevCaps(physDev); hrgn = CreateRectRgn(0, 0, physDev->horzRes, physDev->vertRes); - SelectVisRgn16(HDC_16(physDev->hdc), HRGN_16(hrgn)); + SelectVisRgn( physDev->hdc, hrgn ); DeleteObject(hrgn); } return physDev->hdc; diff --git a/dlls/winex11.drv/dce.c b/dlls/winex11.drv/dce.c index 11d869e..a60ddb1 100644 --- a/dlls/winex11.drv/dce.c +++ b/dlls/winex11.drv/dce.c @@ -27,10 +27,7 @@ #include "win.h" #include "windef.h" #include "wingdi.h" -#include "wownt32.h" #include "x11drv.h" -#include "wine/winbase16.h" -#include "wine/wingdi16.h" #include "wine/server.h" #include "wine/list.h" #include "wine/debug.h" @@ -170,7 +167,7 @@ static void update_visible_region( struct dce *dce ) OffsetRgn( vis_rgn, -(escape.drawable_rect.left + escape.dc_rect.left), -(escape.drawable_rect.top + escape.dc_rect.top) ); - SelectVisRgn16( HDC_16(dce->hdc), HRGN_16(vis_rgn) ); + SelectVisRgn( dce->hdc, vis_rgn ); DeleteObject( vis_rgn ); } @@ -214,7 +211,7 @@ static void delete_clip_rgn( struct dce *dce ) dce->clip_rgn = 0; /* make it dirty so that the vis rgn gets recomputed next time */ - SetHookFlags16( HDC_16(dce->hdc), DCHF_INVALIDATEVISRGN ); + SetHookFlags( dce->hdc, DCHF_INVALIDATEVISRGN ); } @@ -317,7 +314,7 @@ void alloc_window_dce( struct x11drv_win_data *data ) if (win_style & WS_CLIPCHILDREN) dce->flags |= DCX_CLIPCHILDREN; if (win_style & WS_CLIPSIBLINGS) dce->flags |= DCX_CLIPSIBLINGS; } - SetHookFlags16( HDC_16(dce->hdc), DCHF_INVALIDATEVISRGN ); + SetHookFlags( dce->hdc, DCHF_INVALIDATEVISRGN ); EnterCriticalSection( &dce_section ); list_add_tail( &dce_list, &dce->entry ); @@ -427,7 +424,7 @@ void invalidate_dce( HWND hwnd, const RECT *rect ) /* Set dirty bits in the hDC and DCE structs */ TRACE("\tfixed up %p dce [%p]\n", dce, dce->hwnd); - SetHookFlags16( HDC_16(dce->hdc), DCHF_INVALIDATEVISRGN ); + SetHookFlags( dce->hdc, DCHF_INVALIDATEVISRGN ); } } } /* dce list */ @@ -561,7 +558,7 @@ HDC X11DRV_GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags ) dce->hwnd = hwnd; dce->flags = (dce->flags & ~clip_flags) | (flags & clip_flags); - if (SetHookFlags16( HDC_16(dce->hdc), DCHF_VALIDATEVISRGN )) + if (SetHookFlags( dce->hdc, DCHF_VALIDATEVISRGN )) bUpdateVisRgn = TRUE; /* DC was dirty */ if (bUpdateVisRgn) update_visible_region( dce ); diff --git a/include/wine/wingdi16.h b/include/wine/wingdi16.h index c360d10..c56c7b1 100644 --- a/include/wine/wingdi16.h +++ b/include/wine/wingdi16.h @@ -269,7 +269,6 @@ typedef struct FONTSIGNATURE ntmFontSig; } NEWTEXTMETRICEX16,*LPNEWTEXTMETRICEX16; -typedef BOOL (CALLBACK *DCHOOKPROC)(HDC,WORD,DWORD_PTR,LPARAM); typedef INT16 (CALLBACK *FONTENUMPROC16)(SEGPTR,SEGPTR,UINT16,LPARAM); typedef VOID (CALLBACK *LINEDDAPROC16)(INT16,INT16,LPARAM); typedef INT16 (CALLBACK *GOBJENUMPROC16)(SEGPTR,LPARAM); @@ -343,13 +342,6 @@ struct PATH_INFO { DWORD BkColor; }; -/* DC hook codes */ -#define DCHC_INVALIDVISRGN 0x0001 -#define DCHC_DELETEDC 0x0002 - -#define DCHF_INVALIDATEVISRGN 0x0001 -#define DCHF_VALIDATEVISRGN 0x0002 - /* RenderMode */ #define RENDERMODE_NO_DISPLAY 0 #define RENDERMODE_OPEN 1 @@ -577,7 +569,6 @@ COLORREF WINAPI SetBkColor16(HDC16,COLORREF); INT16 WINAPI SetBkMode16(HDC16,INT16); UINT16 WINAPI SetBoundsRect16(HDC16,const RECT16*,UINT16); DWORD WINAPI SetBrushOrg16(HDC16,INT16,INT16); -BOOL WINAPI SetDCHook(HDC,DCHOOKPROC,DWORD_PTR); BOOL16 WINAPI SetDCHook16(HDC16,FARPROC16,DWORD); DWORD WINAPI SetDCOrg16(HDC16,INT16,INT16); VOID WINAPI SetDCState16(HDC16,HDC16); diff --git a/include/wingdi.h b/include/wingdi.h index 6af58ff..ea65928 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3725,6 +3725,22 @@ WINGDIAPI BOOL WINAPI wglSwapLayerBuffers(HDC,UINT); WINGDIAPI BOOL WINAPI wglUseFontBitmaps(HDC,DWORD,DWORD,DWORD); WINGDIAPI BOOL WINAPI wglUseFontOutlines(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,INT,LPGLYPHMETRICSFLOAT); +#ifdef __WINESRC__ +/* the DC hook support is only exported on Win16, the 32-bit version is a Wine extension */ + +#define DCHC_INVALIDVISRGN 0x0001 +#define DCHC_DELETEDC 0x0002 +#define DCHF_INVALIDATEVISRGN 0x0001 +#define DCHF_VALIDATEVISRGN 0x0002 + +typedef BOOL (CALLBACK *DCHOOKPROC)(HDC,WORD,DWORD_PTR,LPARAM); + +WINGDIAPI DWORD_PTR WINAPI GetDCHook(HDC,DCHOOKPROC*); +WINGDIAPI BOOL WINAPI SetDCHook(HDC,DCHOOKPROC,DWORD_PTR); +WINGDIAPI WORD WINAPI SetHookFlags(HDC,WORD); +WINGDIAPI INT WINAPI SelectVisRgn(HDC,HRGN); +#endif /* __WINESRC__ */ + #ifdef __cplusplus } #endif

1 0

Alexandre Julliard : winex11: Use GetDCHook to retrieve the dce pointer instead of storing it in the physdev structure .
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 3bd142e9070165e20416c2e73ec31f0fbbcfe5f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bd142e9070165e20416c2e73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 18 11:25:14 2008 +0100 winex11: Use GetDCHook to retrieve the dce pointer instead of storing it in the physdev structure. --- dlls/winex11.drv/dce.c | 20 ++------------------ dlls/winex11.drv/init.c | 13 +------------ dlls/winex11.drv/x11drv.h | 6 ++---- 3 files changed, 5 insertions(+), 34 deletions(-) diff --git a/dlls/winex11.drv/dce.c b/dlls/winex11.drv/dce.c index a60ddb1..9c223b6 100644 --- a/dlls/winex11.drv/dce.c +++ b/dlls/winex11.drv/dce.c @@ -222,7 +222,6 @@ static void delete_clip_rgn( struct dce *dce ) */ static struct dce *alloc_cache_dce(void) { - struct x11drv_escape_set_dce escape; struct dce *dce; if (!(dce = HeapAlloc( GetProcessHeap(), 0, sizeof(*dce) ))) return NULL; @@ -245,11 +244,6 @@ static struct dce *alloc_cache_dce(void) EnterCriticalSection( &dce_section ); list_add_head( &dce_list, &dce->entry ); LeaveCriticalSection( &dce_section ); - - escape.code = X11DRV_SET_DCE; - escape.dce = dce; - ExtEscape( dce->hdc, X11DRV_ESCAPE, sizeof(escape), (LPCSTR)&escape, 0, NULL ); - return dce; } @@ -261,7 +255,6 @@ static struct dce *alloc_cache_dce(void) */ void alloc_window_dce( struct x11drv_win_data *data ) { - struct x11drv_escape_set_dce escape; struct dce *dce; void *class_ptr = NULL; LONG style = GetClassLongW( data->hwnd, GCL_STYLE ); @@ -320,10 +313,6 @@ void alloc_window_dce( struct x11drv_win_data *data ) list_add_tail( &dce_list, &dce->entry ); LeaveCriticalSection( &dce_section ); data->dce = dce; - - escape.code = X11DRV_SET_DCE; - escape.dce = dce; - ExtEscape( dce->hdc, X11DRV_ESCAPE, sizeof(escape), (LPCSTR)&escape, 0, NULL ); } @@ -579,15 +568,13 @@ HDC X11DRV_GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags ) */ INT X11DRV_ReleaseDC( HWND hwnd, HDC hdc, BOOL end_paint ) { - enum x11drv_escape_codes escape = X11DRV_GET_DCE; struct dce *dce; BOOL ret = FALSE; TRACE("%p %p\n", hwnd, hdc ); EnterCriticalSection( &dce_section ); - if (!ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape), (LPCSTR)&escape, - sizeof(dce), (LPSTR)&dce )) dce = NULL; + dce = (struct dce *)GetDCHook( hdc, NULL ); if (dce && dce->count) { if (end_paint || (dce->flags & DCX_CACHE)) delete_clip_rgn( dce ); @@ -653,14 +640,11 @@ static BOOL CALLBACK dc_hook( HDC hDC, WORD code, DWORD_PTR data, LPARAM lParam */ HWND X11DRV_WindowFromDC( HDC hdc ) { - enum x11drv_escape_codes escape = X11DRV_GET_DCE; struct dce *dce; HWND hwnd = 0; EnterCriticalSection( &dce_section ); - if (!ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape), (LPCSTR)&escape, - sizeof(dce), (LPSTR)&dce )) dce = NULL; - if (dce) hwnd = dce->hwnd; + if ((dce = (struct dce *)GetDCHook( hdc, NULL ))) hwnd = dce->hwnd; LeaveCriticalSection( &dce_section ); return hwnd; } diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index bcf60e5..ebd9dde 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -408,19 +408,8 @@ INT X11DRV_ExtEscape( X11DRV_PDEVICE *physDev, INT escape, INT in_count, LPCVOID } break; case X11DRV_GET_DCE: - if (out_count >= sizeof(struct dce *)) - { - *(struct dce **)out_data = physDev->dce; - return TRUE; - } - break; case X11DRV_SET_DCE: - if (in_count >= sizeof(struct x11drv_escape_set_dce)) - { - const struct x11drv_escape_set_dce *data = (const struct x11drv_escape_set_dce *)in_data; - physDev->dce = data->dce; - return TRUE; - } + FIXME( "%x escape no longer supported\n", *(const enum x11drv_escape_codes *)in_data ); break; case X11DRV_GET_GLX_DRAWABLE: if (out_count >= sizeof(Drawable)) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index d7fb478..2451e0b 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -65,7 +65,6 @@ typedef int Status; #define MAX_DASHLEN 16 struct tagCURSORICONINFO; -struct dce; extern void wine_tsx11_lock(void); extern void wine_tsx11_unlock(void); @@ -137,7 +136,6 @@ typedef struct int textPixel; int depth; /* bit depth of the DC */ int exposures; /* count of graphics exposures operations */ - struct dce *dce; /* opaque pointer to DCE */ int current_pf; Drawable gl_drawable; Pixmap pixmap; /* Pixmap for a GLXPixmap gl_drawable */ @@ -476,8 +474,8 @@ enum x11drv_escape_codes X11DRV_SET_DRAWABLE, /* set current drawable for a DC */ X11DRV_START_EXPOSURES, /* start graphics exposures */ X11DRV_END_EXPOSURES, /* end graphics exposures */ - X11DRV_GET_DCE, /* get the DCE pointer */ - X11DRV_SET_DCE, /* set the DCE pointer */ + X11DRV_GET_DCE, /* no longer used */ + X11DRV_SET_DCE, /* no longer used */ X11DRV_GET_GLX_DRAWABLE, /* get current glx drawable for a DC */ X11DRV_SYNC_PIXMAP, /* sync the dibsection to its pixmap */ X11DRV_FLUSH_GL_DRAWABLE /* flush changes made to the gl drawable */

1 0

Rob Shearman : cabinet: Replace strcasecmp call with lstrcmpiA as strcasecmp isn' t portable and doesn't take into account the current codepage.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 903a486dc0efce1dfae4bf0f66447f63e6312255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=903a486dc0efce1dfae4bf0f6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Feb 16 15:35:43 2008 +0000 cabinet: Replace strcasecmp call with lstrcmpiA as strcasecmp isn't portable and doesn't take into account the current codepage. --- dlls/cabinet/fdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index a0bb64a..468a68d 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2229,7 +2229,7 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state for (file = cab->firstfile; (file); file = file->next) { if ((file->index & cffileCONTINUED_FROM_PREV) == cffileCONTINUED_FROM_PREV) { /* check to ensure a real match */ - if (strcasecmp(fi->filename, file->filename) == 0) { + if (lstrcmpiA(fi->filename, file->filename) == 0) { success = TRUE; if (PFDI_SEEK(CAB(hfdi), cab->cabhf, cab->firstfol->offset, SEEK_SET) == -1) return DECR_INPUT;

1 0

Rob Shearman : kernel32: Fix handle leak in start_console_renderer_helper.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 7ed33ae7215b5f70ed36ee1bd9b449234ad6b44c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ed33ae7215b5f70ed36ee1bd… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Feb 16 15:35:48 2008 +0000 kernel32: Fix handle leak in start_console_renderer_helper. --- dlls/kernel32/console.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 1d86f8a..a1e2de6 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1161,6 +1161,9 @@ static BOOL start_console_renderer_helper(const char* appname, STARTUPINFOA* CreateProcessA(NULL, buffer, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, si, &pi)) { + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + if (WaitForSingleObject(hEvent, INFINITE) != WAIT_OBJECT_0) return FALSE; TRACE("Started wineconsole pid=%08x tid=%08x\n",

1 0