March 2008 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : msxml3: Implement IXMLDOMCDATASection_appendData.
by Alexandre Julliard 10 Mar '08

10 Mar '08

Module: wine Branch: master Commit: 675ed5a9b464a82b55bd6096c1744f863e38fdfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=675ed5a9b464a82b55bd6096c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 10 15:52:48 2008 +1100 msxml3: Implement IXMLDOMCDATASection_appendData. --- dlls/msxml3/cdata.c | 28 ++++++++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 15 +++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 38a429e..4593257 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -584,8 +584,32 @@ static HRESULT WINAPI domcdata_appendData( IXMLDOMCDATASection *iface, BSTR p) { - FIXME("\n"); - return E_NOTIMPL; + domcdata *This = impl_from_IXMLDOMCDATASection( iface ); + xmlnode *pDOMNode = impl_from_IXMLDOMNode( (IXMLDOMNode*)This->element ); + xmlChar *pContent; + HRESULT hr = S_FALSE; + + TRACE("%p\n", iface); + + /* Nothing to do if NULL or an Empty string passed in. */ + if(p == NULL || SysStringLen(p) == 0) + return S_OK; + + pContent = xmlChar_from_wchar( (WCHAR*)p ); + if(pContent) + { + if(xmlTextConcat(pDOMNode->node, pContent, SysStringLen(p) ) == 0) + hr = S_OK; + else + { + hr = E_FAIL; + xmlFree(pContent); + } + } + else + hr = E_FAIL; + + return hr; } static HRESULT WINAPI domcdata_insertData( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index a503d79..3c11be8 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2500,6 +2500,21 @@ static void test_xmlTypes(void) ok( !lstrcmpW( str, _bstr_("\\") ), "incorrect substringData string\n"); SysFreeString(str); + /* test appendData */ + hr = IXMLDOMCDATASection_appendData(pCDataSec, NULL); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMCDATASection_appendData(pCDataSec, _bstr_("")); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMCDATASection_appendData(pCDataSec, _bstr_("Append")); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMCDATASection_get_text(pCDataSec, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\Append") ), "incorrect get_text string\n"); + SysFreeString(str); + IXMLDOMCDATASection_Release(pCDataSec); }

1 0

Paul Vriens : advpack/tests: Free the library after use.
by Alexandre Julliard 10 Mar '08

10 Mar '08

Module: wine Branch: master Commit: d1a3bad7230b1229ac6a5c885c2fa8f368919e8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1a3bad7230b1229ac6a5c885… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sun Mar 9 12:15:05 2008 +0100 advpack/tests: Free the library after use. --- dlls/advpack/tests/advpack.c | 5 ++++- dlls/advpack/tests/files.c | 2 ++ dlls/advpack/tests/install.c | 5 ++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index 4232f76..b90df2d 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -35,6 +35,7 @@ #define REG_VAL_EXISTS(key, value) !RegQueryValueEx(key, value, NULL, NULL, NULL, NULL) #define OPEN_GUID_KEY() !RegOpenKey(HKEY_LOCAL_MACHINE, GUID_KEY, &guid) +static HMODULE hAdvPack; static HRESULT (WINAPI *pCloseINFEngine)(HINF); static HRESULT (WINAPI *pDelNode)(LPCSTR,DWORD); static HRESULT (WINAPI *pGetVersionFromFile)(LPCSTR,LPDWORD,LPDWORD,BOOL); @@ -66,7 +67,7 @@ static void get_progfiles_dir(void) static BOOL init_function_pointers(void) { - HMODULE hAdvPack = LoadLibraryA("advpack.dll"); + hAdvPack = LoadLibraryA("advpack.dll"); if (!hAdvPack) return FALSE; @@ -594,4 +595,6 @@ START_TEST(advpack) setperusersecvalues_test(); translateinfstring_test(); translateinfstringex_test(); + + FreeLibrary(hAdvPack); } diff --git a/dlls/advpack/tests/files.c b/dlls/advpack/tests/files.c index 71c1741..e109a88 100644 --- a/dlls/advpack/tests/files.c +++ b/dlls/advpack/tests/files.c @@ -560,4 +560,6 @@ START_TEST(files) test_AdvInstallFile(); delete_test_files(); + + FreeLibrary(hAdvPack); } diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index 6075963..564ecda 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -23,6 +23,7 @@ #include <advpub.h> #include "wine/test.h" +static HMODULE hAdvPack; /* function pointers */ static HRESULT (WINAPI *pRunSetupCommand)(HWND, LPCSTR, LPCSTR, LPCSTR, LPCSTR, HANDLE*, DWORD, LPVOID); static HRESULT (WINAPI *pLaunchINFSection)(HWND, HINSTANCE, LPSTR, INT); @@ -32,7 +33,7 @@ static char CURR_DIR[MAX_PATH]; static BOOL init_function_pointers(void) { - HMODULE hAdvPack = LoadLibraryA("advpack.dll"); + hAdvPack = LoadLibraryA("advpack.dll"); if (!hAdvPack) return FALSE; @@ -273,4 +274,6 @@ START_TEST(install) test_RunSetupCommand(); test_LaunchINFSection(); test_LaunchINFSectionEx(); + + FreeLibrary(hAdvPack); }

1 0

Paul Vriens : comctl32/tests: Don't use FreeLibrary with GetModuleHandle.
by Alexandre Julliard 10 Mar '08

10 Mar '08

Module: wine Branch: master Commit: 6c63ebefc3a80ea995301e9e13d8da5c15617555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c63ebefc3a80ea995301e9e1… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sun Mar 9 13:09:59 2008 +0100 comctl32/tests: Don't use FreeLibrary with GetModuleHandle. --- dlls/comctl32/tests/dpa.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index c718789..552387f 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -453,6 +453,4 @@ START_TEST(dpa) test_dpa(); else trace("skipping tests\n"); - - FreeLibrary(hcomctl32); }

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLDOMComment_substringData.
by Alexandre Julliard 10 Mar '08

10 Mar '08

Module: wine Branch: master Commit: 777aa3382d09dface66f89532a6fcfd2f1bd75e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=777aa3382d09dface66f89532… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 10 15:58:30 2008 +1100 msxml3: Implement IXMLDOMComment_substringData. --- dlls/msxml3/comment.c | 41 +++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 203faae..be2beb2 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -538,8 +538,45 @@ static HRESULT WINAPI domcomment_substringData( IXMLDOMComment *iface, long offset, long count, BSTR *p) { - FIXME("\n"); - return E_NOTIMPL; + domcomment *This = impl_from_IXMLDOMComment( iface ); + xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); + xmlChar *pContent; + long nLength = 0; + HRESULT hr = S_FALSE; + + TRACE("%p\n", iface); + + if(!p) + return E_INVALIDARG; + + *p = NULL; + if(offset < 0 || count < 0) + return E_INVALIDARG; + + if(count == 0) + return hr; + + pContent = xmlNodeGetContent(pDOMNode->node); + if(pContent) + { + nLength = xmlStrlen(pContent); + + if( offset < nLength) + { + BSTR sContent = bstr_from_xmlChar(pContent); + if(offset + count > nLength) + *p = SysAllocString(&sContent[offset]); + else + *p = SysAllocStringLen(&sContent[offset], count); + + SysFreeString(sContent); + hr = S_OK; + } + + xmlFree(pContent); + } + + return hr; } static HRESULT WINAPI domcomment_appendData( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index e34872e..dc94c13 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2189,6 +2189,52 @@ static void test_xmlTypes(void) ok(hr == S_OK, "ret %08x\n", hr ); ok(len == 21, "expected 21 got %ld\n", len); + /* test substringData */ + hr = IXMLDOMComment_substringData(pComment, 0, 4, NULL); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + /* test substringData - Invalid offset */ + str = (BSTR)&szElement; + hr = IXMLDOMComment_substringData(pComment, -1, 4, &str); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + ok( str == NULL, "incorrect string\n"); + + /* test substringData - Invalid offset */ + str = (BSTR)&szElement; + hr = IXMLDOMComment_substringData(pComment, 30, 0, &str); + ok(hr == S_FALSE, "ret %08x\n", hr ); + ok( str == NULL, "incorrect string\n"); + + /* test substringData - Invalid size */ + str = (BSTR)&szElement; + hr = IXMLDOMComment_substringData(pComment, 0, -1, &str); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + ok( str == NULL, "incorrect string\n"); + + /* test substringData - Invalid size */ + str = (BSTR)&szElement; + hr = IXMLDOMComment_substringData(pComment, 2, 0, &str); + ok(hr == S_FALSE, "ret %08x\n", hr ); + ok( str == NULL, "incorrect string\n"); + + /* test substringData - Start of string */ + hr = IXMLDOMComment_substringData(pComment, 0, 4, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_("This") ), "incorrect substringData string\n"); + SysFreeString(str); + + /* test substringData - Middle of string */ + hr = IXMLDOMComment_substringData(pComment, 13, 4, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_("test") ), "incorrect substringData string\n"); + SysFreeString(str); + + /* test substringData - End of string */ + hr = IXMLDOMComment_substringData(pComment, 20, 4, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_("\\") ), "incorrect substringData string\n"); + SysFreeString(str); + IXMLDOMComment_Release(pComment); }

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLDOMCDATASection_substringData.
by Alexandre Julliard 10 Mar '08

10 Mar '08

Module: wine Branch: master Commit: c7f3dfc1a1ea92c3b5cbeaa571b7a285a65d055a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7f3dfc1a1ea92c3b5cbeaa57… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Mar 9 15:18:40 2008 +1100 msxml3: Implement IXMLDOMCDATASection_substringData. --- dlls/msxml3/cdata.c | 41 +++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 21c8433..38a429e 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -539,8 +539,45 @@ static HRESULT WINAPI domcdata_substringData( IXMLDOMCDATASection *iface, long offset, long count, BSTR *p) { - FIXME("\n"); - return E_NOTIMPL; + domcdata *This = impl_from_IXMLDOMCDATASection( iface ); + xmlnode *pDOMNode = impl_from_IXMLDOMNode( (IXMLDOMNode*)This->element ); + xmlChar *pContent; + long nLength = 0; + HRESULT hr = S_FALSE; + + TRACE("%p\n", iface); + + if(!p) + return E_INVALIDARG; + + *p = NULL; + if(offset < 0 || count < 0) + return E_INVALIDARG; + + if(count == 0) + return hr; + + pContent = xmlNodeGetContent(pDOMNode->node); + if(pContent) + { + nLength = xmlStrlen(pContent); + + if( offset < nLength) + { + BSTR sContent = bstr_from_xmlChar(pContent); + if(offset + count > nLength) + *p = SysAllocString(&sContent[offset]); + else + *p = SysAllocStringLen(&sContent[offset], count); + + SysFreeString(sContent); + hr = S_OK; + } + + xmlFree(pContent); + } + + return hr; } static HRESULT WINAPI domcdata_appendData( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index dc94c13..a503d79 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2454,6 +2454,52 @@ static void test_xmlTypes(void) ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\") ), "incorrect text string\n"); SysFreeString(str); + /* test substringData */ + hr = IXMLDOMCDATASection_substringData(pCDataSec, 0, 4, NULL); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + /* test substringData - Invalid offset */ + str = (BSTR)&szElement; + hr = IXMLDOMCDATASection_substringData(pCDataSec, -1, 4, &str); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + ok( str == NULL, "incorrect string\n"); + + /* test substringData - Invalid offset */ + str = (BSTR)&szElement; + hr = IXMLDOMCDATASection_substringData(pCDataSec, 30, 0, &str); + ok(hr == S_FALSE, "ret %08x\n", hr ); + ok( str == NULL, "incorrect string\n"); + + /* test substringData - Invalid size */ + str = (BSTR)&szElement; + hr = IXMLDOMCDATASection_substringData(pCDataSec, 0, -1, &str); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + ok( str == NULL, "incorrect string\n"); + + /* test substringData - Invalid size */ + str = (BSTR)&szElement; + hr = IXMLDOMCDATASection_substringData(pCDataSec, 2, 0, &str); + ok(hr == S_FALSE, "ret %08x\n", hr ); + ok( str == NULL, "incorrect string\n"); + + /* test substringData - Start of string */ + hr = IXMLDOMCDATASection_substringData(pCDataSec, 0, 4, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_("This") ), "incorrect substringData string\n"); + SysFreeString(str); + + /* test substringData - Middle of string */ + hr = IXMLDOMCDATASection_substringData(pCDataSec, 13, 4, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_("test") ), "incorrect substringData string\n"); + SysFreeString(str); + + /* test substringData - End of string */ + hr = IXMLDOMCDATASection_substringData(pCDataSec, 20, 4, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_("\\") ), "incorrect substringData string\n"); + SysFreeString(str); + IXMLDOMCDATASection_Release(pCDataSec); }

1 0

Detlef Riekenberg : winspool: Implement SpoolerInit.
by Alexandre Julliard 10 Mar '08

10 Mar '08

Module: wine Branch: master Commit: 94a878414fed691489a95e23fcd82c5b9fe5bae6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94a878414fed691489a95e23f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Mar 7 23:49:57 2008 +0100 winspool: Implement SpoolerInit. --- dlls/winspool.drv/info.c | 20 ++++++++++++++++++++ dlls/winspool.drv/winspool.drv.spec | 2 +- 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 7622582..d15afca 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -7117,6 +7117,26 @@ emW_cleanup: } /****************************************************************************** + * SpoolerInit (WINSPOOL.@) + * + * Initialize the Spooler + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * NOTES + * The function fails on windows, when the spooler service is not running + * + */ +BOOL WINAPI SpoolerInit(void) +{ + + if ((backend == NULL) && !load_backend()) return FALSE; + return TRUE; +} + +/****************************************************************************** * XcvDataW (WINSPOOL.@) * * Execute commands in the Printmonitor DLL diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec index 59af7e7..f5994b8 100644 --- a/dlls/winspool.drv/winspool.drv.spec +++ b/dlls/winspool.drv/winspool.drv.spec @@ -167,7 +167,7 @@ @ stdcall SetPrinterDataW(long wstr long ptr long) @ stdcall SetPrinterW(long long ptr long) @ stub SpoolerDevQueryPrintW -@ stub SpoolerInit +@ stdcall SpoolerInit() @ stub SpoolerPrinterEvent @ stdcall StartDocDlgA(ptr ptr) @ stdcall StartDocDlgW(ptr ptr)

1 0

Detlef Riekenberg : winspool: Cleanup for DEVMODEdupWtoA.
by Alexandre Julliard 10 Mar '08

10 Mar '08

Module: wine Branch: master Commit: 741fa21f952d0f1f53271548f1936d9703b40139 URL: http://source.winehq.org/git/wine.git/?a=commit;h=741fa21f952d0f1f53271548f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Mar 9 00:38:49 2008 +0100 winspool: Cleanup for DEVMODEdupWtoA. --- dlls/winspool.drv/info.c | 52 ++++++++++++++++++++++++--------------------- 1 files changed, 28 insertions(+), 24 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index d15afca..7d49d2c 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1693,36 +1693,40 @@ static LPDEVMODEW DEVMODEcpyAtoW(DEVMODEW *dmW, const DEVMODEA *dmA) } /*********************************************************** - * DEVMODEdupWtoA - * Creates an ascii copy of supplied devmode on heap + * DEVMODEdupWtoA + * Creates an ansi copy of supplied devmode */ -static LPDEVMODEA DEVMODEdupWtoA(HANDLE heap, const DEVMODEW *dmW) +static LPDEVMODEA DEVMODEdupWtoA(const DEVMODEW *dmW) { LPDEVMODEA dmA; DWORD size; - BOOL Formname; - ptrdiff_t off_formname = (const char *)dmW->dmFormName - (const char *)dmW; - if(!dmW) return NULL; - Formname = (dmW->dmSize > off_formname); - size = dmW->dmSize - CCHDEVICENAME - (Formname ? CCHFORMNAME : 0); - dmA = HeapAlloc(heap, HEAP_ZERO_MEMORY, size + dmW->dmDriverExtra); + if (!dmW) return NULL; + size = dmW->dmSize - CCHDEVICENAME - + ((dmW->dmSize > FIELD_OFFSET(DEVMODEW, dmFormName)) ? CCHFORMNAME : 0); + + dmA = HeapAlloc(GetProcessHeap(), 0, size + dmW->dmDriverExtra); + if (!dmA) return NULL; + WideCharToMultiByte(CP_ACP, 0, dmW->dmDeviceName, -1, (LPSTR)dmA->dmDeviceName, CCHDEVICENAME, NULL, NULL); - if(!Formname) { - memcpy(&dmA->dmSpecVersion, &dmW->dmSpecVersion, - dmW->dmSize - CCHDEVICENAME * sizeof(WCHAR)); - } else { - memcpy(&dmA->dmSpecVersion, &dmW->dmSpecVersion, - off_formname - CCHDEVICENAME * sizeof(WCHAR)); - WideCharToMultiByte(CP_ACP, 0, dmW->dmFormName, -1, - (LPSTR)dmA->dmFormName, CCHFORMNAME, NULL, NULL); - memcpy(&dmA->dmLogPixels, &dmW->dmLogPixels, dmW->dmSize - - (off_formname + CCHFORMNAME * sizeof(WCHAR))); + + if (FIELD_OFFSET(DEVMODEW, dmFormName) >= dmW->dmSize) { + memcpy(&dmA->dmSpecVersion, &dmW->dmSpecVersion, + dmW->dmSize - FIELD_OFFSET(DEVMODEW, dmSpecVersion)); } + else + { + memcpy(&dmA->dmSpecVersion, &dmW->dmSpecVersion, + FIELD_OFFSET(DEVMODEW, dmFormName) - FIELD_OFFSET(DEVMODEW, dmSpecVersion)); + WideCharToMultiByte(CP_ACP, 0, dmW->dmFormName, -1, + (LPSTR)dmA->dmFormName, CCHFORMNAME, NULL, NULL); + + memcpy(&dmA->dmLogPixels, &dmW->dmLogPixels, dmW->dmSize - FIELD_OFFSET(DEVMODEW, dmLogPixels)); + } + dmA->dmSize = size; - memcpy((char *)dmA + dmA->dmSize, (const char *)dmW + dmW->dmSize, - dmW->dmDriverExtra); + memcpy((char *)dmA + dmA->dmSize, (const char *)dmW + dmW->dmSize, dmW->dmDriverExtra); return dmA; } @@ -1823,7 +1827,7 @@ INT WINAPI DeviceCapabilitiesW(LPCWSTR pDevice, LPCWSTR pPort, WORD fwCapability, LPWSTR pOutput, const DEVMODEW *pDevMode) { - LPDEVMODEA dmA = DEVMODEdupWtoA(GetProcessHeap(), pDevMode); + LPDEVMODEA dmA = DEVMODEdupWtoA(pDevMode); LPSTR pDeviceA = strdupWtoA(pDevice); LPSTR pPortA = strdupWtoA(pPort); INT ret; @@ -1921,7 +1925,7 @@ LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter, { LPSTR pDeviceNameA = strdupWtoA(pDeviceName); - LPDEVMODEA pDevModeInputA = DEVMODEdupWtoA(GetProcessHeap(),pDevModeInput); + LPDEVMODEA pDevModeInputA = DEVMODEdupWtoA(pDevModeInput); LPDEVMODEA pDevModeOutputA = NULL; LONG ret; @@ -2884,7 +2888,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) drivers */ if (dmW) { - dmA = DEVMODEdupWtoA(GetProcessHeap(), dmW); + dmA = DEVMODEdupWtoA(dmW); RegSetValueExW(hkeyPrinter, default_devmodeW, 0, REG_BINARY, (LPBYTE)dmA, dmA->dmSize + dmA->dmDriverExtra); HeapFree(GetProcessHeap(), 0, dmA);

1 0

Nathan Beckmann : gdiplus: Update bitmap state in GdipUnlockBitmapBits.
by Alexandre Julliard 10 Mar '08

10 Mar '08

Module: wine Branch: master Commit: eabc62db003b371eac1c2f6e03dcd258195608bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=eabc62db003b371eac1c2f6e0… Author: Nathan Beckmann <nathan.beckmann(a)gmail.com> Date: Fri Mar 7 01:19:04 2008 -0800 gdiplus: Update bitmap state in GdipUnlockBitmapBits. --- dlls/gdiplus/image.c | 1 + dlls/gdiplus/tests/image.c | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 6b827ba..3ffb7c7 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -226,6 +226,7 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, GdipFree(bitmap->bitmapbits); bitmap->bitmapbits = NULL; + bitmap->lockmode = 0; return Ok; } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 4047fee..d40f6c6 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -237,10 +237,8 @@ static void test_LockBits(void) } /* write, consecutive */ - todo_wine { - stat = GdipBitmapLockBits(bm, &rect, ImageLockModeWrite, PixelFormat24bppRGB, &bd); - expect(Ok, stat); - } + stat = GdipBitmapLockBits(bm, &rect, ImageLockModeWrite, PixelFormat24bppRGB, &bd); + expect(Ok, stat); if (stat == Ok) { stat = GdipBitmapUnlockBits(bm, &bd);

1 0

Nathan Beckmann : gdiplus: Return an error for consecutive GdipLockBitmapBit calls.
by Alexandre Julliard 10 Mar '08

10 Mar '08

Module: wine Branch: master Commit: e3f8f30a21349bb4f97554adb1f8ae81044e269e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3f8f30a21349bb4f97554adb… Author: Nathan Beckmann <nathan.beckmann(a)gmail.com> Date: Fri Mar 7 01:19:05 2008 -0800 gdiplus: Return an error for consecutive GdipLockBitmapBit calls. --- dlls/gdiplus/image.c | 3 +-- dlls/gdiplus/tests/image.c | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 3ffb7c7..4f05ba0 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -114,8 +114,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, if(flags & ImageLockModeUserInputBuf) return NotImplemented; - if((bitmap->lockmode & ImageLockModeWrite) || (bitmap->lockmode && - (flags & ImageLockModeWrite))) + if(bitmap->lockmode) return WrongState; IPicture_get_Handle(bitmap->image.picture, &hbm); diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index d40f6c6..d51d94a 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -214,10 +214,8 @@ static void test_LockBits(void) /* read x2 */ stat = GdipBitmapLockBits(bm, &rect, ImageLockModeRead, PixelFormat24bppRGB, &bd); expect(Ok, stat); - todo_wine { - stat = GdipBitmapLockBits(bm, &rect, ImageLockModeRead, PixelFormat24bppRGB, &bd); - expect(WrongState, stat); - } + stat = GdipBitmapLockBits(bm, &rect, ImageLockModeRead, PixelFormat24bppRGB, &bd); + expect(WrongState, stat); stat = GdipBitmapUnlockBits(bm, &bd); expect(Ok, stat);

1 0

Detlef Riekenberg : winspool: Export ConvertAnsiDevModeToUnicodeDevMode and ConvertUnicodeDevModeToAnsiDevMode .
by Alexandre Julliard 10 Mar '08

10 Mar '08

Module: wine Branch: master Commit: f11b5831b96d7ae8975395f6fa0402e99492da43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f11b5831b96d7ae8975395f6f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Mar 7 23:07:05 2008 +0100 winspool: Export ConvertAnsiDevModeToUnicodeDevMode and ConvertUnicodeDevModeToAnsiDevMode. --- dlls/winspool.drv/winspool.drv.spec | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec index 0ad97df..59af7e7 100644 --- a/dlls/winspool.drv/winspool.drv.spec +++ b/dlls/winspool.drv/winspool.drv.spec @@ -68,6 +68,8 @@ @ stdcall ConfigurePortA(str long str) @ stdcall ConfigurePortW(wstr long wstr) @ stdcall ConnectToPrinterDlg(long long) +@ stub ConvertAnsiDevModeToUnicodeDevMode +@ stub ConvertUnicodeDevModeToAnsiDevMode @ stub CreatePrinterIC @ stub DEVICECAPABILITIES @ stub DEVICEMODE

1 0