September 2010 - Wine-commits

Nikolay Sivov : msxml3: Fix IXMLDOMNode::get_namespaceURI() for empty URIs.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: 4e94abd71007967f819249652ea0ac511b887418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e94abd71007967f819249652… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 14 09:01:16 2010 +0400 msxml3: Fix IXMLDOMNode::get_namespaceURI() for empty URIs. --- dlls/msxml3/node.c | 18 ++++++++---------- dlls/msxml3/tests/domdoc.c | 4 ++-- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 7e91292..8f3ebc6 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1402,8 +1402,7 @@ static HRESULT WINAPI xmlnode_get_namespaceURI( BSTR* namespaceURI) { xmlnode *This = impl_from_IXMLDOMNode( iface ); - HRESULT hr = S_FALSE; - xmlNsPtr *pNSList; + xmlNsPtr *ns; TRACE("(%p)->(%p)\n", This, namespaceURI ); @@ -1412,16 +1411,15 @@ static HRESULT WINAPI xmlnode_get_namespaceURI( *namespaceURI = NULL; - pNSList = xmlGetNsList(This->node->doc, This->node); - if(pNSList) + if ((ns = xmlGetNsList(This->node->doc, This->node))) { - *namespaceURI = bstr_from_xmlChar( pNSList[0]->href ); - - xmlFree( pNSList ); - hr = S_OK; + if (ns[0]->href) *namespaceURI = bstr_from_xmlChar( ns[0]->href ); + xmlFree(ns); } - return hr; + TRACE("uri: %s\n", debugstr_w(*namespaceURI)); + + return *namespaceURI ? S_OK : S_FALSE; } static HRESULT WINAPI xmlnode_get_prefix( @@ -1444,7 +1442,7 @@ static HRESULT WINAPI xmlnode_get_prefix( xmlFree(ns); } - TRACE("prefix %s\n", debugstr_w(*prefixString)); + TRACE("prefix: %s\n", debugstr_w(*prefixString)); return *prefixString ? S_OK : S_FALSE; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 176ff36..cd789e5 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6163,8 +6163,8 @@ static void test_get_prefix(void) str = (void*)0xdeadbeef; hr = IXMLDOMElement_get_namespaceURI(element, &str); - todo_wine ok( hr == S_FALSE, "got 0x%08x\n", hr); - todo_wine ok( str == 0, "got %p\n", str); + ok( hr == S_FALSE, "got 0x%08x\n", hr); + ok( str == 0, "got %p\n", str); IXMLDOMElement_Release(element);

1 0

Nikolay Sivov : msxml3: Properly set default value for SelectionLanguage property.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: 9c951e752060e2a79cb8b8357721b4f0a43f73dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c951e752060e2a79cb8b8357… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 14 09:15:31 2010 +0400 msxml3: Properly set default value for SelectionLanguage property. --- dlls/msxml3/domdoc.c | 20 ++++-- dlls/msxml3/factory.c | 147 ++++++++++++++++++++++++++++++++----------- dlls/msxml3/msxml_private.h | 10 ++-- dlls/msxml3/tests/domdoc.c | 48 ++++++++++++++- 4 files changed, 176 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c951e752060e2a79cb8b…

1 0

Dmitry Timoshkov : winex11.drv: Avoid copying window bits if the window didn't move.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: c912af04deed53a0d1c06f03e4515ac838a896b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c912af04deed53a0d1c06f03e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Sep 14 14:22:56 2010 +0900 winex11.drv: Avoid copying window bits if the window didn't move. --- dlls/winex11.drv/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 99dbf49..3c0f303 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2339,7 +2339,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags !memcmp( &valid_rects[0], &data->client_rect, sizeof(RECT) )) { /* if we have an X window the bits will be moved by the X server */ - if (!data->whole_window) + if (!data->whole_window && (x_offset != 0 || y_offset != 0)) move_window_bits( data, &old_whole_rect, &data->whole_rect, &old_client_rect ); } else

1 0

Dmitry Timoshkov : winex11.drv: Avoid copying invalid window bits.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: 7864ade5a8306c0078e16ae6d7e40bdece29395b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7864ade5a8306c0078e16ae6d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Sep 14 14:24:11 2010 +0900 winex11.drv: Avoid copying invalid window bits. --- dlls/winex11.drv/window.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 3c0f303..ec9bec2 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1615,6 +1615,8 @@ static void move_window_bits( struct x11drv_win_data *data, const RECT *old_rect hdc_src = hdc_dst = GetDCEx( data->hwnd, 0, DCX_CACHE ); } + ExcludeUpdateRgn( hdc_dst, data->hwnd ); + code = X11DRV_START_EXPOSURES; ExtEscape( hdc_dst, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, 0, NULL );

1 0

Mariusz Pluciński : kernel32: New flags added to LoadLibraryEx.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: dfb88608e330ad3b93bb8a8f6bb1fecd3abe8a90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfb88608e330ad3b93bb8a8f6… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Mon Sep 13 13:39:31 2010 +0200 kernel32: New flags added to LoadLibraryEx. --- dlls/kernel32/module.c | 8 ++++++++ include/winbase.h | 10 +++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 21db5cb..4dded4e 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -848,6 +848,14 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) NTSTATUS nts; HMODULE hModule; WCHAR *load_path; + static const DWORD unsupported_flags = + LOAD_IGNORE_CODE_AUTHZ_LEVEL | + LOAD_LIBRARY_AS_IMAGE_RESOURCE | + LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE | + LOAD_LIBRARY_REQUIRE_SIGNED_TARGET; + + if( flags & unsupported_flags) + FIXME("unsupported flag(s) used (flags: 0x%08x)\n", flags & ~unsupported_flags); load_path = MODULE_get_dll_load_path( flags & LOAD_WITH_ALTERED_SEARCH_PATH ? libname->Buffer : NULL ); diff --git a/include/winbase.h b/include/winbase.h index ea10696..2c4b5d5 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -803,9 +803,13 @@ DECL_WINELIB_TYPE_AW(ENUMRESNAMEPROC) DECL_WINELIB_TYPE_AW(ENUMRESLANGPROC) /* flags that can be passed to LoadLibraryEx */ -#define DONT_RESOLVE_DLL_REFERENCES 0x00000001 -#define LOAD_LIBRARY_AS_DATAFILE 0x00000002 -#define LOAD_WITH_ALTERED_SEARCH_PATH 0x00000008 +#define DONT_RESOLVE_DLL_REFERENCES 0x00000001 +#define LOAD_LIBRARY_AS_DATAFILE 0x00000002 +#define LOAD_WITH_ALTERED_SEARCH_PATH 0x00000008 +#define LOAD_IGNORE_CODE_AUTHZ_LEVEL 0x00000010 +#define LOAD_LIBRARY_AS_IMAGE_RESOURCE 0x00000020 +#define LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE 0x00000040 +#define LOAD_LIBRARY_REQUIRE_SIGNED_TARGET 0x00000080 #define GET_MODULE_HANDLE_EX_FLAG_PIN 1 #define GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT 2

1 0

Alexander Morozov : crypt32: Add stub for CryptSignMessage.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 3bea7f943e17faef3094c63b76e6556a2af42db0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bea7f943e17faef3094c63b7… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Fri Jun 25 15:51:25 2010 +0400 crypt32: Add stub for CryptSignMessage. --- dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/message.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 61e4d3d..f531bf6 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -181,7 +181,7 @@ @ stub CryptSignAndEncryptMessage @ stdcall CryptSignCertificate(long long long ptr long ptr ptr ptr ptr) @ stub CryptSignHashU -@ stub CryptSignMessage +@ stdcall CryptSignMessage(ptr long long ptr ptr ptr ptr) @ stub CryptSignMessageWithKey @ stdcall CryptUnprotectData(ptr ptr ptr ptr ptr long ptr) @ stdcall CryptUnregisterDefaultOIDFunction(long str wstr) diff --git a/dlls/crypt32/message.c b/dlls/crypt32/message.c index f06af0e..81eb913 100644 --- a/dlls/crypt32/message.c +++ b/dlls/crypt32/message.c @@ -415,3 +415,12 @@ BOOL WINAPI CryptVerifyMessageHash(PCRYPT_HASH_MESSAGE_PARA pHashPara, } return ret; } + +BOOL WINAPI CryptSignMessage(PCRYPT_SIGN_MESSAGE_PARA pSignPara, + BOOL fDetachedSignature, DWORD cToBeSigned, const BYTE *rgpbToBeSigned[], + DWORD rgcbToBeSigned[], BYTE *pbSignedBlob, DWORD *pcbSignedBlob) +{ + FIXME("(%p, %d, %d, %p, %p, %p, %p): stub\n", pSignPara, fDetachedSignature, + cToBeSigned, rgpbToBeSigned, rgcbToBeSigned, pbSignedBlob, pcbSignedBlob); + return FALSE; +}

1 0

Juan Lang : shdocvw: Add Close menu item.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: d354316c434e91c9350f36a7325a86b65dfb8011 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d354316c434e91c9350f36a73… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 20 12:38:29 2010 -0700 shdocvw: Add Close menu item. --- dlls/shdocvw/En.rc | 1 + dlls/shdocvw/iexplore.c | 4 ++++ dlls/shdocvw/resource.h | 1 + 3 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/En.rc b/dlls/shdocvw/En.rc index 0d55909..7a4fe78 100644 --- a/dlls/shdocvw/En.rc +++ b/dlls/shdocvw/En.rc @@ -49,6 +49,7 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM "Print previe&w...", ID_BROWSE_PRINT_PREVIEW MENUITEM SEPARATOR MENUITEM "&Properties...", ID_BROWSE_PROPERTIES + MENUITEM "&Close", ID_BROWSE_QUIT } POPUP "&View" { diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index 45b7b70..a9fda76 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -587,6 +587,10 @@ static LRESULT iewnd_OnCommand(InternetExplorer *This, HWND hwnd, UINT msg, WPAR ie_dialog_about(hwnd); break; + case ID_BROWSE_QUIT: + iewnd_OnDestroy(This); + break; + default: if(LOWORD(wparam) >= ID_BROWSE_GOTOFAV_FIRST && LOWORD(wparam) <= ID_BROWSE_GOTOFAV_MAX) { diff --git a/dlls/shdocvw/resource.h b/dlls/shdocvw/resource.h index e18a9c0..6f5c777 100644 --- a/dlls/shdocvw/resource.h +++ b/dlls/shdocvw/resource.h @@ -38,6 +38,7 @@ #define ID_BROWSE_PRINT 260 #define ID_BROWSE_PRINT_PREVIEW 277 #define ID_BROWSE_PROPERTIES 262 +#define ID_BROWSE_QUIT 278 #define ID_BROWSE_ABOUT 336 #define ID_BROWSE_ADDFAV 1200

1 0

Juan Lang : winex11.drv: ImeInquire' s second parameter is an output parameter.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 6d20893b1e0d2d8b1968b5693410b8df9e956907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d20893b1e0d2d8b1968b5693… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 9 12:44:11 2010 -0700 winex11.drv: ImeInquire's second parameter is an output parameter. --- dlls/winex11.drv/winex11.drv.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index ffd90ad..323da2c 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -145,7 +145,7 @@ @ cdecl wglUseFontBitmapsW(ptr long long long) X11DRV_wglUseFontBitmapsW #IME Interface -@ stdcall ImeInquire(ptr wstr wstr) +@ stdcall ImeInquire(ptr ptr wstr) @ stdcall ImeConfigure(long long long ptr) @ stdcall ImeDestroy(long) @ stdcall ImeEscape(long long ptr)

1 0

Alexandre Goujon : odbccp32: Fix SQLInstallDriverManager{,W}.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: b234bb49ff8f67acc287e9601739632ab743c03f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b234bb49ff8f67acc287e9601… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Mon Sep 13 13:56:56 2010 +0200 odbccp32: Fix SQLInstallDriverManager{,W}. --- dlls/odbccp32/odbccp32.c | 12 ++++++++++-- dlls/odbccp32/tests/misc.c | 5 ----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 0d4662b..d349203 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -522,9 +522,13 @@ BOOL WINAPI SQLInstallDriverManagerW(LPWSTR lpszPath, WORD cbPathMax, UINT len; WCHAR path[MAX_PATH]; - clear_errors(); TRACE("(%p %d %p)\n", lpszPath, cbPathMax, pcbPathOut); + if (cbPathMax < MAX_PATH) + return FALSE; + + clear_errors(); + len = GetSystemDirectoryW(path, MAX_PATH); if (pcbPathOut) @@ -545,9 +549,13 @@ BOOL WINAPI SQLInstallDriverManager(LPSTR lpszPath, WORD cbPathMax, WORD len, cbOut = 0; WCHAR path[MAX_PATH]; - clear_errors(); TRACE("(%p %d %p)\n", lpszPath, cbPathMax, pcbPathOut); + if (cbPathMax < MAX_PATH) + return FALSE; + + clear_errors(); + ret = SQLInstallDriverManagerW(path, MAX_PATH, &cbOut); if (ret) { diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index 044846c..40846e5 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -86,28 +86,23 @@ static void test_SQLInstallDriverManager(void) bool_ret = SQLInstallDriverManager(NULL, 0, NULL); sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); ok(!bool_ret, "SQLInstallDriverManager unexpectedly succeeded\n"); - todo_wine ok(sql_ret == SQL_SUCCESS_WITH_INFO && error_code == ODBC_ERROR_INVALID_BUFF_LEN, "Expected SQLInstallDriverManager to fail with ODBC_ERROR_INVALID_BUFF_LEN\n"); /* Length smaller than MAX_PATH */ bool_ret = SQLInstallDriverManager(target_path, MAX_PATH / 2, NULL); sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); - todo_wine { ok(!bool_ret, "SQLInstallDriverManager unexpectedly succeeded\n"); ok(sql_ret == SQL_SUCCESS_WITH_INFO && error_code == ODBC_ERROR_INVALID_BUFF_LEN, "Expected SQLInstallDriverManager to fail with ODBC_ERROR_INVALID_BUFF_LEN\n"); - } path_out = 0xcafe; bool_ret = SQLInstallDriverManager(target_path, MAX_PATH / 2, &path_out); sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); - todo_wine { ok(!bool_ret, "SQLInstallDriverManager unexpectedly succeeded\n"); ok(sql_ret == SQL_SUCCESS_WITH_INFO && error_code == ODBC_ERROR_INVALID_BUFF_LEN, "Expected SQLInstallDriverManager to fail with ODBC_ERROR_INVALID_BUFF_LEN\n"); ok(path_out == 0xcafe, "Expected path_out to not have changed\n"); - } /* Length OK */ bool_ret = SQLInstallDriverManager(target_path, MAX_PATH, NULL);

1 0

Vitaly Perov : winspool.drv: Set the printer name in AddJobW.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: e1b9a5c8925d0e453da9f3e1a09a9a1a9ad535f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1b9a5c8925d0e453da9f3e1a… Author: Vitaly Perov <vitperov(a)etersoft.ru> Date: Mon Sep 13 19:28:56 2010 +0400 winspool.drv: Set the printer name in AddJobW. --- dlls/winspool.drv/info.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 8c6486b..7f6d12c 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -99,6 +99,7 @@ typedef struct { WCHAR *filename; WCHAR *portname; WCHAR *document_title; + WCHAR *printer_name; } job_t; @@ -2296,6 +2297,7 @@ BOOL WINAPI AddJobW(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPD job->filename = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); memcpy(job->filename, filename, (len + 1) * sizeof(WCHAR)); job->document_title = strdupW(default_doc_title); + job->printer_name = strdupW(printer->name); list_add_tail(&printer->queue->jobs, &job->entry); *pcbNeeded = (len + 1) * sizeof(WCHAR) + sizeof(*addjob); @@ -7073,6 +7075,20 @@ static BOOL get_job_info_1(job_t *job, JOB_INFO_1W *ji1, LPBYTE buf, DWORD cbBuf space = FALSE; *pcbNeeded += size; + if (job->printer_name) + { + string_to_buf(job->printer_name, ptr, left, &size, unicode); + if(space && size <= left) + { + ji1->pPrinterName = (LPWSTR)ptr; + ptr += size; + left -= size; + } + else + space = FALSE; + *pcbNeeded += size; + } + return space; } @@ -7104,6 +7120,20 @@ static BOOL get_job_info_2(job_t *job, JOB_INFO_2W *ji2, LPBYTE buf, DWORD cbBuf space = FALSE; *pcbNeeded += size; + if (job->printer_name) + { + string_to_buf(job->printer_name, ptr, left, &size, unicode); + if(space && size <= left) + { + ji2->pPrinterName = (LPWSTR)ptr; + ptr += size; + left -= size; + } + else + space = FALSE; + *pcbNeeded += size; + } + return space; } @@ -7537,6 +7567,7 @@ BOOL WINAPI ScheduleJob( HANDLE hPrinter, DWORD dwJobID ) } list_remove(cursor); HeapFree(GetProcessHeap(), 0, job->document_title); + HeapFree(GetProcessHeap(), 0, job->printer_name); HeapFree(GetProcessHeap(), 0, job->portname); HeapFree(GetProcessHeap(), 0, job->filename); HeapFree(GetProcessHeap(), 0, job);

1 0