November 2012 - Wine-commits

Piotr Caban : msvcp60: Added seekoff exports.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: ca88f3624d38cf74747bb5990f02b7725836c7fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca88f3624d38cf74747bb5990… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 27 21:16:05 2012 +0000 msvcp60: Added seekoff exports. --- dlls/msvcp60/ios.c | 34 ++++++++++++++-------------------- dlls/msvcp60/msvcp60.spec | 28 ++++++++++++++-------------- 2 files changed, 28 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca88f3624d38cf74747bb…

1 0

Andrew Talbot : wineps.drv: Remove unused variable.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 393514c11941f8425936eaea506831d466e6bd7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=393514c11941f8425936eaea5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 27 22:22:24 2012 +0000 wineps.drv: Remove unused variable. --- dlls/wineps.drv/driver.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 358f088..70ee2b0 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -333,7 +333,6 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, } -static void (WINAPI *pInitCommonControls) (void); static HPROPSHEETPAGE (WINAPI *pCreatePropertySheetPage) (LPCPROPSHEETPAGEW); static int (WINAPI *pPropertySheet) (LPCPROPSHEETHEADERW); @@ -456,8 +455,6 @@ INT PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput, static const WCHAR SetupW[] = {'S','e','t','u','p','\0'}; hinstComctl32 = LoadLibraryA("comctl32.dll"); - pInitCommonControls = (void*)GetProcAddress(hinstComctl32, - "InitCommonControls"); pCreatePropertySheetPage = (void*)GetProcAddress(hinstComctl32, "CreatePropertySheetPageW"); pPropertySheet = (void*)GetProcAddress(hinstComctl32, "PropertySheetW");

1 0

Andrew Talbot : sensapi: Remove unused variable.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: c562b0e1488c3fe36c8e09122486e22a365db610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c562b0e1488c3fe36c8e09122… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 27 22:22:22 2012 +0000 sensapi: Remove unused variable. --- dlls/sensapi/sensapi.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/sensapi/sensapi.c b/dlls/sensapi/sensapi.c index 86e4a92..75d07a8 100644 --- a/dlls/sensapi/sensapi.c +++ b/dlls/sensapi/sensapi.c @@ -44,8 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(sensapi); -static HMODULE SENSAPI_hModule; - BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); @@ -54,7 +52,6 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: { DisableThreadLibraryCalls(hinstDLL); - SENSAPI_hModule = hinstDLL; break; } case DLL_PROCESS_DETACH:

1 0

Andrew Talbot : netapi32: Remove unused variable.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 9205f02ac589681cb53b8ead56a08550811aa920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9205f02ac589681cb53b8ead5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 27 22:22:19 2012 +0000 netapi32: Remove unused variable. --- dlls/netapi32/netapi32.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index f6c6d20..a24320c 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -25,8 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(netbios); -static HMODULE NETAPI32_hModule; - BOOL NETAPI_IsLocalComputer(LMCSTR ServerName); BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) @@ -37,7 +35,6 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: { DisableThreadLibraryCalls(hinstDLL); - NETAPI32_hModule = hinstDLL; NetBIOSInit(); NetBTInit(); break;

1 0

Andrew Talbot : gdiplus: Remove superfluous braces.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: f8da0d3a1efeaf066122b042c94593d5be4f7a7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8da0d3a1efeaf066122b042c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 27 22:22:16 2012 +0000 gdiplus: Remove superfluous braces. --- dlls/gdiplus/graphicspath.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index ca96bda..1fbebba 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1724,7 +1724,6 @@ static void widen_joint(const GpPointF *p1, const GpPointF *p2, const GpPointF * { case LineJoinMiter: case LineJoinMiterClipped: - { if ((p2->X - p1->X) * (p3->Y - p1->Y) > (p2->Y - p1->Y) * (p3->X - p1->X)) { float distance = pen->width/2.0; @@ -1752,7 +1751,6 @@ static void widen_joint(const GpPointF *p1, const GpPointF *p2, const GpPointF * /* else fall-through */ } /* else fall-through */ - } default: case LineJoinBevel: add_bevel_point(p2, p1, pen, 1, last_point);

1 0

Alistair Leslie-Hughes : include: Add IGlobalOptions interface.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 9478e1e113567edcbc0aca1cd01b4d2246882919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9478e1e113567edcbc0aca1cd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 26 13:31:10 2012 +1100 include: Add IGlobalOptions interface. --- include/objidl.idl | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/include/objidl.idl b/include/objidl.idl index a3896e9..ecae70e 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -2407,6 +2407,39 @@ interface IThumbnailExtractor : IUnknown [in] IStorage *pStg); } +typedef enum tagGLOBALOPT_PROPERTIES +{ + COMGLB_EXCEPTION_HANDLING = 1, + COMGLB_APPID = 2, + COMGLB_RPC_THREADPOOL_SETTING = 3 +} GLOBALOPT_PROPERTIES; + +typedef enum tagGLOBALOPT_EH_VALUES +{ + COMGLB_EXCEPTION_HANDLE = 0, + COMGLB_EXCEPTION_DONOT_HANDLE_FATAL = 1, + COMGLB_EXCEPTION_DONOT_HANDLE = COMGLB_EXCEPTION_DONOT_HANDLE_FATAL, + COMGLB_EXCEPTION_DONOT_HANDLE_ANY = 2 +} GLOBALOPT_EH_VALUES; + +typedef enum tagGLOBALOPT_RPCTP_VALUES +{ + COMGLB_RPC_THREADPOOL_SETTING_DEFAULT_POOL = 0, + COMGLB_RPC_THREADPOOL_SETTING_PRIVATE_POOL = 1 +} GLOBALOPT_RPCTP_VALUES; + + +[ + object, + local, + pointer_default(unique), + uuid(0000015B-0000-0000-C000-000000000046) +] +interface IGlobalOptions : IUnknown +{ + HRESULT Set([in] GLOBALOPT_PROPERTIES property, [in] ULONG_PTR value); + HRESULT Query([in] GLOBALOPT_PROPERTIES property, [out ] ULONG_PTR *value); +} cpp_quote("#ifdef USE_COM_CONTEXT_DEF")

1 0

Christian Costa : cabinet: Remove useless ERR and turn one ERR into a WARN.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 8b6f9175182f1124d6e1df1c567a3d8f9e7319e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b6f9175182f1124d6e1df1c5… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Nov 28 09:02:57 2012 +0100 cabinet: Remove useless ERR and turn one ERR into a WARN. --- dlls/cabinet/fdi.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index d36178d..25156c3 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -710,7 +710,7 @@ static BOOL FDI_read_entries( } /*********************************************************************** - * FDIIsCabinet (CABINET.21) + * FDIIsCabinet (CABINET.21) * * Informs the caller as to whether or not the provided file handle is * really a cabinet or not, filling out the provided PFDICABINETINFO @@ -725,7 +725,7 @@ static BOOL FDI_read_entries( * be filled out with information about the cabinet * file indicated by hf if, indeed, it is determined * to be a cabinet. - * + * * RETURNS * TRUE if the file is a cabinet. The info pointed to by pfdici will * be provided. @@ -736,10 +736,7 @@ static BOOL FDI_read_entries( * INCLUDES * fdi.c */ -BOOL __cdecl FDIIsCabinet( - HFDI hfdi, - INT_PTR hf, - PFDICABINETINFO pfdici) +BOOL __cdecl FDIIsCabinet(HFDI hfdi, INT_PTR hf, PFDICABINETINFO pfdici) { BOOL rv; FDI_Int *fdi = get_fdi_ptr( hfdi ); @@ -749,13 +746,11 @@ BOOL __cdecl FDIIsCabinet( if (!fdi) return FALSE; if (!hf) { - ERR("(!hf)!\n"); SetLastError(ERROR_INVALID_HANDLE); return FALSE; } if (!pfdici) { - ERR("(!pfdici)!\n"); SetLastError(ERROR_BAD_ARGUMENTS); return FALSE; } @@ -2533,7 +2528,7 @@ BOOL __cdecl FDICopy( /* check if it's really a cabfile. Note that this doesn't implement the bug */ if (!FDI_read_entries(fdi, cabhf, &fdici, &(CAB(mii)))) { - ERR("FDIIsCabinet failed: %u.\n", fdi->perf->erfOper); + WARN("FDI_read_entries failed: %u\n", fdi->perf->erfOper); fdi->free(decomp_state); fdi->close(cabhf); return FALSE;

1 0

Christian Costa : cabinet: Simplify concatenation of path and filename.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 94bfd24f671677468913b9a09a32ca983aff7fb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94bfd24f671677468913b9a09… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Nov 27 09:14:30 2012 +0100 cabinet: Simplify concatenation of path and filename. --- dlls/cabinet/fdi.c | 39 +++++++++++++++++++-------------------- 1 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 25156c3..fb675fc 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2041,7 +2041,7 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state /* outlen=0 means this block was the last contiguous part of a split block, continued in the next cabinet */ if (outlen == 0) { - int pathlen, filenamelen, idx, i; + int pathlen, filenamelen, i; INT_PTR cabhf; char fullpath[MAX_PATH], userpath[256]; FDINOTIFICATION fdin; @@ -2060,23 +2060,21 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state if (!((cab->next = CAB(fdi)->alloc(sizeof(fdi_decomp_state))))) return DECR_NOMEMORY; - + ZeroMemory(cab->next, sizeof(fdi_decomp_state)); /* copy pszCabPath to userpath */ ZeroMemory(userpath, 256); - pathlen = (pszCabPath) ? strlen(pszCabPath) : 0; + pathlen = pszCabPath ? strlen(pszCabPath) : 0; if (pathlen) { - if (pathlen < 256) { - for (i = 0; i <= pathlen; i++) - userpath[i] = pszCabPath[i]; - } /* else we are in a weird place... let's leave it blank and see if the user fixes it */ - } + if (pathlen < 256) /* else we are in a weird place... let's leave it blank and see if the user fixes it */ + strcpy(userpath, pszCabPath); + } /* initial fdintNEXT_CABINET notification */ ZeroMemory(&fdin, sizeof(FDINOTIFICATION)); - fdin.psz1 = (cab->mii.nextname) ? cab->mii.nextname : &emptystring; - fdin.psz2 = (cab->mii.nextinfo) ? cab->mii.nextinfo : &emptystring; + fdin.psz1 = cab->mii.nextname ? cab->mii.nextname : &emptystring; + fdin.psz2 = cab->mii.nextinfo ? cab->mii.nextinfo : &emptystring; fdin.psz3 = userpath; fdin.fdie = FDIERROR_NONE; fdin.pv = pvUser; @@ -2086,7 +2084,7 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state do { pathlen = strlen(userpath); - filenamelen = (cab->mii.nextname) ? strlen(cab->mii.nextname) : 0; + filenamelen = cab->mii.nextname ? strlen(cab->mii.nextname) : 0; /* slight overestimation here to save CPU cycles in the developer's brain */ if ((pathlen + filenamelen + 3) > MAX_PATH) { @@ -2095,16 +2093,17 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state } /* paste the path and filename together */ - idx = 0; + fullpath[0] = '\0'; if (pathlen) { - for (i = 0; i < pathlen; i++) fullpath[idx++] = userpath[i]; - if (fullpath[idx - 1] != '\\') fullpath[idx++] = '\\'; + strcpy(fullpath, userpath); + if (fullpath[pathlen - 1] != '\\') + strcat(fullpath, "\\"); } - if (filenamelen) for (i = 0; i < filenamelen; i++) fullpath[idx++] = cab->mii.nextname[i]; - fullpath[idx] = '\0'; - + if (filenamelen) + strcat(fullpath, cab->mii.nextname); + TRACE("full cab path/file name: %s\n", debugstr_a(fullpath)); - + /* try to get a handle to the cabfile */ cabhf = CAB(fdi)->open(fullpath, _O_RDONLY|_O_BINARY, _S_IREAD | _S_IWRITE); if (cabhf == -1) { @@ -2113,14 +2112,14 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state if (((*pfnfdin)(fdintNEXT_CABINET, &fdin))) return DECR_USERABORT; continue; } - + if (cabhf == 0) { ERR("PFDI_OPEN returned zero for %s.\n", fullpath); fdin.fdie = FDIERROR_CABINET_NOT_FOUND; if (((*pfnfdin)(fdintNEXT_CABINET, &fdin))) return DECR_USERABORT; continue; } - + /* check if it's really a cabfile. Note that this doesn't implement the bug */ if (!FDI_read_entries(CAB(fdi), cabhf, &fdici, &(cab->next->mii))) { WARN("FDIIsCabinet failed.\n");

1 0

Huw Davies : sane.ds: Add a missing break.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 0f95508936fdf6706b5d99a17a4a485bfdfd6ff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f95508936fdf6706b5d99a17… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 28 09:26:49 2012 +0000 sane.ds: Add a missing break. --- dlls/sane.ds/ui.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 815478d..07d5a59 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -1009,6 +1009,7 @@ static INT_PTR CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM InitializeDialog(hwndDlg); break; } + break; } case WM_COMMAND: switch (HIWORD(wParam))

1 0

Nikolay Sivov : xmllite: Support standalone declaration.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 8b8fb88e4ba32e62d5f3c3ff62ae1c54d1e7484c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b8fb88e4ba32e62d5f3c3ff6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 28 07:59:57 2012 -0500 xmllite: Support standalone declaration. --- dlls/xmllite/reader.c | 64 +++++++++++++++++++++++++++++++++++++++--- dlls/xmllite/tests/reader.c | 3 +- 2 files changed, 60 insertions(+), 7 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 87d7936..ee6a4d7 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -510,7 +510,7 @@ static HRESULT reader_parse_versionnum(xmlreader *reader) ptr++; if (ptr2 == ptr) return WC_E_DIGIT; - TRACE("version=%s", debugstr_wn(start, ptr-start)); + TRACE("version=%s\n", debugstr_wn(start, ptr-start)); reader_skipn(reader, ptr-ptr2); return S_OK; } @@ -592,7 +592,7 @@ static HRESULT reader_parse_encdecl(xmlreader *reader) if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; - if (reader_cmp(reader, encodingW)) return S_OK; + if (reader_cmp(reader, encodingW)) return S_FALSE; /* skip 'encoding' */ reader_skipn(reader, 8); @@ -617,14 +617,55 @@ static HRESULT reader_parse_encdecl(xmlreader *reader) return S_OK; } +/* [32] SDDecl ::= S 'standalone' Eq (("'" ('yes' | 'no') "'") | ('"' ('yes' | 'no') '"')) */ +static HRESULT reader_parse_sddecl(xmlreader *reader) +{ + static const WCHAR standaloneW[] = {'s','t','a','n','d','a','l','o','n','e',0}; + static const WCHAR yesW[] = {'y','e','s',0}; + static const WCHAR noW[] = {'n','o',0}; + const WCHAR *start, *ptr; + + if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; + + if (reader_cmp(reader, standaloneW)) return S_FALSE; + /* skip 'standalone' */ + reader_skipn(reader, 10); + + if (reader_cmp(reader, eqW)) return WC_E_EQUAL; + /* skip '=' */ + reader_skipn(reader, 1); + + if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) + return WC_E_QUOTE; + /* skip "'"|'"' */ + reader_skipn(reader, 1); + + if (reader_cmp(reader, yesW) && reader_cmp(reader, noW)) + return WC_E_XMLDECL; + + start = reader_get_cur(reader); + /* skip 'yes'|'no' */ + reader_skipn(reader, reader_cmp(reader, yesW) ? 2 : 3); + ptr = reader_get_cur(reader); + TRACE("standalone=%s\n", debugstr_wn(start, ptr-start)); + + if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) + return WC_E_QUOTE; + /* skip "'"|'"' */ + reader_skipn(reader, 1); + + return S_OK; +} + /* [23] XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>' */ static HRESULT reader_parse_xmldecl(xmlreader *reader) { static const WCHAR xmldeclW[] = {'<','?','x','m','l',0}; + static const WCHAR declcloseW[] = {'?','>',0}; HRESULT hr; /* check if we have "<?xml" */ - if (reader_cmp(reader, xmldeclW)) return S_OK; + if (reader_cmp(reader, xmldeclW)) return S_FALSE; reader_skipn(reader, 5); hr = reader_parse_versioninfo(reader); @@ -635,7 +676,15 @@ static HRESULT reader_parse_xmldecl(xmlreader *reader) if (FAILED(hr)) return hr; - return E_NOTIMPL; + hr = reader_parse_sddecl(reader); + if (FAILED(hr)) + return hr; + + reader_skipspaces(reader); + if (reader_cmp(reader, declcloseW)) return WC_E_XMLDECL; + reader_skipn(reader, 2); + + return S_OK; } static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, void** ppvObject) @@ -803,7 +852,12 @@ static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *node_type) hr = reader_parse_xmldecl(This); if (FAILED(hr)) return hr; - This->state = XmlReadState_Interactive; + if (hr == S_OK) + { + This->state = XmlReadState_Interactive; + This->nodetype = *node_type = XmlNodeType_XmlDeclaration; + return S_OK; + } } return E_NOTIMPL; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 729d134..af0ea62 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -611,13 +611,12 @@ static void test_read_xmldeclaration(void) type = -1; hr = IXmlReader_Read(reader, &type); -todo_wine { ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(type == XmlNodeType_XmlDeclaration, "Expected XmlNodeType_XmlDeclaration, got %s\n", type_to_str(type)); -} /* new version 1.2.x and 1.3.x properly update position for <?xml ?> */ ok_pos(reader, 1, 3, -1, 55, TRUE); + test_read_state(reader, XmlReadState_Interactive, -1, 0); /* check attributes */ hr = IXmlReader_MoveToNextAttribute(reader);

1 0