December 2006 - Wine-Commits

Dmitry Timoshkov : dmime: Make some data const and static.
by Alexandre Julliard Dec. 14, 2006

Dec. 14, 2006

Module: wine Branch: master Commit: 56e725e152a6a8abb6e13a569b94ed6aaa6aea65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56e725e152a6a8abb6e13a569… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 14 22:46:57 2006 +0800 dmime: Make some data const and static. --- dlls/dmime/audiopath.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index 150e490..3194244 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -622,7 +622,7 @@ static HRESULT WINAPI IDirectMusicAudioP return E_NOTIMPL; } -IPersistStreamVtbl DirectMusicAudioPath_PersistStream_Vtbl = { +static const IPersistStreamVtbl DirectMusicAudioPath_PersistStream_Vtbl = { IDirectMusicAudioPathImpl_IPersistStream_QueryInterface, IDirectMusicAudioPathImpl_IPersistStream_AddRef, IDirectMusicAudioPathImpl_IPersistStream_Release,

1 0

Alexandre Julliard : Revert "msi: Comparisons with null in conditions are special."
by Alexandre Julliard Dec. 14, 2006

Dec. 14, 2006

Module: wine Branch: master Commit: fadc820fe57734587c530abcc06334e80a1a9474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fadc820fe57734587c530abcc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 14 17:02:23 2006 +0100 Revert "msi: Comparisons with null in conditions are special." This reverts commit 9dce96b3155ce07dffa4f5b0712fbcaad9ba3e2c. --- dlls/msi/cond.y | 99 +++++++++++++++---------------------------------------- 1 files changed, 27 insertions(+), 72 deletions(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index d19127b..9cfb001 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -431,104 +431,59 @@ static INT compare_substring( LPCWSTR a, case COND_ISS: return strstriW( a, b ) ? 1 : 0; case COND_LHS: - return 0 == strncmpW( a, b, lstrlenW( b ) ); + return 0 == strncmpW( a, b, lstrlenW( b ) ); case COND_RHS: - return 0 == lstrcmpW( a + (lstrlenW( a ) - lstrlenW( b )), b ); + return 0 == lstrcmpW( a + (lstrlenW( a ) - lstrlenW( b )), b ); case COND_ILHS: - return 0 == strncmpiW( a, b, lstrlenW( b ) ); + return 0 == strncmpiW( a, b, lstrlenW( b ) ); case COND_IRHS: return 0 == lstrcmpiW( a + (lstrlenW( a ) - lstrlenW( b )), b ); default: - ERR("invalid substring operator\n"); + ERR("invalid substring operator\n"); return 0; } return 0; } -static BOOL is_empty( LPCWSTR p ) -{ - return !p || !p[0]; -} - -static BOOL is_alphaless( LPCWSTR p ) -{ - while (*p) - { - if (isalphaW( *p ) || (*p == '_')) - return FALSE; - p++; - } - return TRUE; -} - static INT compare_string( LPCWSTR a, INT operator, LPCWSTR b ) { - int r; - if (operator >= COND_SS && operator <= COND_RHS) return compare_substring( a, operator, b ); + + /* null and empty string are equivalent */ + if (!a) a = szEmpty; + if (!b) b = szEmpty; - if (is_empty( a ) && is_empty( b )) - r = 0; - - else if (is_empty( a ) && is_alphaless( b )) - r = 1; - - else if (is_empty( b ) && is_alphaless( a )) - r = -1; - - else - { - /* null and empty string are equivalent */ - if (!a) a = szEmpty; - if (!b) b = szEmpty; - - switch (operator) - { - case COND_LT: - case COND_GT: - case COND_EQ: - case COND_NE: - case COND_GE: - case COND_LE: - r = lstrcmpW( a, b ); - break; - case COND_ILT: - case COND_IGT: - case COND_IEQ: - case COND_INE: - case COND_IGE: - case COND_ILE: - r = lstrcmpiW( a, b ); - break; - default: - ERR("invalid string operator\n"); - return 0; - } - } - + /* a or b may be NULL */ switch (operator) { case COND_LT: - case COND_ILT: - return -1 == r; + return -1 == lstrcmpW( a, b ); case COND_GT: - case COND_IGT: - return 1 == r; + return 1 == lstrcmpW( a, b ); case COND_EQ: - case COND_IEQ: - return 0 == r; + return 0 == lstrcmpW( a, b ); case COND_NE: - case COND_INE: - return 0 != r; + return 0 != lstrcmpW( a, b ); case COND_GE: - case COND_IGE: - return -1 != r; + return -1 != lstrcmpW( a, b ); case COND_LE: + return 1 != lstrcmpW( a, b ); + case COND_ILT: + return -1 == lstrcmpiW( a, b ); + case COND_IGT: + return 1 == lstrcmpiW( a, b ); + case COND_IEQ: + return 0 == lstrcmpiW( a, b ); + case COND_INE: + return 0 != lstrcmpiW( a, b ); + case COND_IGE: + return -1 != lstrcmpiW( a, b ); case COND_ILE: - return 1 != r; + return 1 != lstrcmpiW( a, b ); default: ERR("invalid string operator\n"); + return 0; } return 0; }

1 0

Alexandre Julliard : msi: Fix the condition test to not assume MsiNetAssemblySupport is empty.
by Alexandre Julliard Dec. 14, 2006

Dec. 14, 2006

Module: wine Branch: master Commit: 598f2be54b5242e56f30d595f74cf6553217b610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=598f2be54b5242e56f30d595f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 14 17:01:35 2006 +0100 msi: Fix the condition test to not assume MsiNetAssemblySupport is empty. --- dlls/msi/tests/package.c | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 112655d..a0a72f0 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1196,23 +1196,25 @@ static void test_condition(void) r = MsiEvaluateCondition(hpkg, "one >> two"); ok( r == MSICONDITION_TRUE, "wrong return val\n"); + MsiSetProperty(hpkg, "MsiNetAssemblySupport", NULL); /* make sure it's empty */ + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1.1.4322\""); - ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport > \"1.1.4322\""); - ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport >= \"1.1.4322\""); - ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport <= \"1.1.4322\""); - ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport <> \"1.1.4322\""); ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport ~< \"1.1.4322\""); - ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"abcd\""); ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); @@ -1224,13 +1226,13 @@ static void test_condition(void) ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"0000001.1.4322\""); - ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1.1.4322.1\""); - ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1.1.4322.1.1\""); - ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateCondition(hpkg, "\"2\" < \"1.1"); ok( r == MSICONDITION_ERROR, "wrong return val (%d)\n", r); @@ -1248,31 +1250,31 @@ static void test_condition(void) ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1.1\""); - ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1\""); - ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"0\""); - ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"-1\""); - ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"a\""); ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"!\""); - ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"!\""); - ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"/\""); - ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \" \""); - ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"azAZ_\""); ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); @@ -1283,22 +1285,20 @@ static void test_condition(void) r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"a[a]a\""); ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); - todo_wine { r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"[a]\""); - ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"[a]a\""); - ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"{a}\""); - ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"{a\""); - ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"[a\""); - ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); - } + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"a{\""); ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);

1 0

Markus Amsler : d3d8: Release non implicit surfaces only if refcount is 0, with test.
by Alexandre Julliard Dec. 14, 2006

Dec. 14, 2006

Module: wine Branch: master Commit: 5dbd834ca07a38a5aad8a117ca893107284167d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dbd834ca07a38a5aad8a117c… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Thu Dec 14 01:55:48 2006 +0100 d3d8: Release non implicit surfaces only if refcount is 0, with test. --- dlls/d3d8/surface.c | 12 +++++++----- dlls/d3d8/tests/device.c | 3 +++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 848b314..d834460 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -72,11 +72,13 @@ static ULONG WINAPI IDirect3DSurface8Imp ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) : ReleaseRef to %d\n", This, ref); - if (ref == 0 && This->parentDevice) IUnknown_Release(This->parentDevice); - /* Implicit surfaces are destroyed with the device, not if refcount reaches 0. */ - if (ref >= 0 && !This->isImplicit) { - IWineD3DSurface_Release(This->wineD3DSurface); - HeapFree(GetProcessHeap(), 0, This); + if (ref == 0) { + if (This->parentDevice) IUnknown_Release(This->parentDevice); + /* Implicit surfaces are destroyed with the device, not if refcount reaches 0. */ + if (!This->isImplicit) { + IWineD3DSurface_Release(This->wineD3DSurface); + HeapFree(GetProcessHeap(), 0, This); + } } return ref; diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b22759d..3ec0dbd 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -476,10 +476,13 @@ static void test_refcount(void) /* Surfaces */ hr = IDirect3DDevice8_CreateDepthStencilSurface( pDevice, 32, 32, D3DFMT_D24S8, D3DMULTISAMPLE_NONE, &pStencilSurface ); CHECK_CALL( hr, "CreateDepthStencilSurface", pDevice, ++refcount ); + CHECK_REFCOUNT( pStencilSurface, 1); hr = IDirect3DDevice8_CreateImageSurface( pDevice, 32, 32, D3DFMT_X8R8G8B8, &pImageSurface ); CHECK_CALL( hr, "CreateImageSurface", pDevice, ++refcount ); + CHECK_REFCOUNT( pImageSurface, 1); hr = IDirect3DDevice8_CreateRenderTarget( pDevice, 32, 32, D3DFMT_X8R8G8B8, D3DMULTISAMPLE_NONE, TRUE, &pRenderTarget3 ); CHECK_CALL( hr, "CreateRenderTarget", pDevice, ++refcount ); + CHECK_REFCOUNT( pRenderTarget3, 1); /* Misc */ hr = IDirect3DDevice8_CreateStateBlock( pDevice, D3DSBT_ALL, &dStateBlock ); CHECK_CALL( hr, "CreateStateBlock", pDevice, refcount );

1 0

Jacek Caban : shdoclc: Added print template strings.
by Alexandre Julliard Dec. 14, 2006

Dec. 14, 2006

Module: wine Branch: master Commit: 1adf857afc34b90f97164923463be5bd02b2162b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1adf857afc34b90f971649234… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 14 00:20:19 2006 +0100 shdoclc: Added print template strings. --- dlls/shdoclc/En.rc | 6 ++++++ dlls/shdoclc/shdoclc.h | 3 +++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/shdoclc/En.rc b/dlls/shdoclc/En.rc index 95e5384..d237c51 100644 --- a/dlls/shdoclc/En.rc +++ b/dlls/shdoclc/En.rc @@ -24,6 +24,12 @@ STRINGTABLE DISCARDABLE IDS_MESSAGE_BOX_TITLE, "Wine Internet Explorer" } +STRINGTABLE DISCARDABLE +{ + IDS_PRINT_HEADER_TEMPLATE "&w&bPage &p" /* FIXME: should be "&w&bPage &p of &P" */ + IDS_PRINT_FOOTER_TEMPLATE "&u&b&d" +} + IDR_BROWSE_CONTEXT_MENU MENU { POPUP "Default" diff --git a/dlls/shdoclc/shdoclc.h b/dlls/shdoclc/shdoclc.h index 6df37af..2bc7626 100644 --- a/dlls/shdoclc/shdoclc.h +++ b/dlls/shdoclc/shdoclc.h @@ -18,6 +18,9 @@ #define IDS_MESSAGE_BOX_TITLE 2213 +#define IDS_PRINT_HEADER_TEMPLATE 8403 +#define IDS_PRINT_FOOTER_TEMPLATE 8404 + #define IDR_BROWSE_CONTEXT_MENU 24641 #define IDM_TRACETAGS 6004

1 0

Jacek Caban : mshtml: Set default print template in exec_print.
by Alexandre Julliard Dec. 14, 2006

Dec. 14, 2006

Module: wine Branch: master Commit: cc6e4e2525a8adf8506ffe5427590dde415b93c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc6e4e2525a8adf8506ffe542… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 14 00:21:50 2006 +0100 mshtml: Set default print template in exec_print. --- dlls/mshtml/olecmd.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/resource.h | 3 + 2 files changed, 127 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 1e78f66..8de5e0d 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -37,6 +37,7 @@ #include "wine/unicode.h" #include "mshtml_private.h" +#include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -95,10 +96,126 @@ static HRESULT exec_save_copy_as(HTMLDoc return E_NOTIMPL; } +static nsresult set_head_text(nsIPrintSettings *settings, LPCWSTR template, BOOL head, int pos) +{ + if(head) { + switch(pos) { + case 0: + return nsIPrintSettings_SetHeaderStrLeft(settings, template); + case 1: + return nsIPrintSettings_SetHeaderStrRight(settings, template); + case 2: + return nsIPrintSettings_SetHeaderStrCenter(settings, template); + } + }else { + switch(pos) { + case 0: + return nsIPrintSettings_SetFooterStrLeft(settings, template); + case 1: + return nsIPrintSettings_SetFooterStrRight(settings, template); + case 2: + return nsIPrintSettings_SetFooterStrCenter(settings, template); + } + } + + return NS_OK; +} + +static void set_print_template(nsIPrintSettings *settings, LPCWSTR template, BOOL head) +{ + PRUnichar nstemplate[200]; /* FIXME: Use dynamic allocation */ + PRUnichar *p = nstemplate; + LPCWSTR ptr=template; + int pos=0; + + while(*ptr) { + if(*ptr != '&') { + *p++ = *ptr++; + continue; + } + + switch(*++ptr) { + case '&': + *p++ = '&'; + *p++ = '&'; + ptr++; + break; + case 'b': /* change align */ + ptr++; + *p = 0; + set_head_text(settings, nstemplate, head, pos); + p = nstemplate; + pos++; + break; + case 'd': { /* short date */ + SYSTEMTIME systime; + GetLocalTime(&systime); + GetDateFormatW(LOCALE_SYSTEM_DEFAULT, 0, &systime, NULL, p, + sizeof(nstemplate)-(p-nstemplate)*sizeof(WCHAR)); + p += strlenW(p); + ptr++; + break; + } + case 'p': /* page number */ + *p++ = '&'; + *p++ = 'P'; + ptr++; + break; + case 'P': /* page count */ + *p++ = '?'; /* FIXME */ + ptr++; + break; + case 'u': + *p++ = '&'; + *p++ = 'U'; + ptr++; + break; + case 'w': + /* FIXME: set window title */ + ptr++; + break; + default: + *p++ = '&'; + *p++ = *ptr++; + } + } + + *p = 0; + set_head_text(settings, nstemplate, head, pos); + + while(++pos < 3) + set_head_text(settings, p, head, pos); +} + +static void set_default_templates(nsIPrintSettings *settings) +{ + WCHAR buf[64]; + + static const PRUnichar empty[] = {0}; + + nsIPrintSettings_SetHeaderStrLeft(settings, empty); + nsIPrintSettings_SetHeaderStrRight(settings, empty); + nsIPrintSettings_SetHeaderStrCenter(settings, empty); + nsIPrintSettings_SetFooterStrLeft(settings, empty); + nsIPrintSettings_SetFooterStrRight(settings, empty); + nsIPrintSettings_SetFooterStrCenter(settings, empty); + + if(LoadStringW(get_shdoclc(), IDS_PRINT_HEADER_TEMPLATE, buf, + sizeof(buf)/sizeof(WCHAR))) + set_print_template(settings, buf, TRUE); + + + if(LoadStringW(get_shdoclc(), IDS_PRINT_FOOTER_TEMPLATE, buf, + sizeof(buf)/sizeof(WCHAR))) + set_print_template(settings, buf, FALSE); + +} + static HRESULT exec_print(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { nsIInterfaceRequestor *iface_req; nsIWebBrowserPrint *nsprint; + nsIPrintSettings *settings; nsresult nsres; TRACE("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut); @@ -126,7 +243,13 @@ static HRESULT exec_print(HTMLDocument * return S_OK; } - nsres = nsIWebBrowserPrint_Print(nsprint, NULL, NULL); + nsres = nsIWebBrowserPrint_GetGlobalPrintSettings(nsprint, &settings); + if(NS_FAILED(nsres)) + ERR("GetCurrentPrintSettings failed: %08x\n", nsres); + + set_default_templates(settings); + + nsres = nsIWebBrowserPrint_Print(nsprint, settings, NULL); if(NS_FAILED(nsres)) ERR("Print failed: %08x\n", nsres); diff --git a/dlls/mshtml/resource.h b/dlls/mshtml/resource.h index 5dfbc42..27dae83 100644 --- a/dlls/mshtml/resource.h +++ b/dlls/mshtml/resource.h @@ -28,6 +28,9 @@ #define IDS_MESSAGE_BOX_TITLE 2213 +#define IDS_PRINT_HEADER_TEMPLATE 8403 +#define IDS_PRINT_FOOTER_TEMPLATE 8404 + #define IDR_BROWSE_CONTEXT_MENU 24641 #define IDM_TRACETAGS 6004

1 0

Jacek Caban : mshtml: Fixed handling chrome protocol.
by Alexandre Julliard Dec. 14, 2006

Dec. 14, 2006

Module: wine Branch: master Commit: bf3e5bb3087d4d4add984b5be18e4f1ae681ab8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf3e5bb3087d4d4add984b5be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 14 00:21:16 2006 +0100 mshtml: Fixed handling chrome protocol. --- dlls/mshtml/nsio.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 256a436..4b48511 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1711,6 +1711,8 @@ static nsresult NSAPI nsIOService_NewURI nsACString base_uri_str; const char *base_uri = NULL; + static const char szChrome[] = "chrome:"; + nsACString_Init(&base_uri_str, NULL); nsres = nsIURI_GetSpec(aBaseURI, &base_uri_str); @@ -1722,6 +1724,9 @@ static nsresult NSAPI nsIOService_NewURI } nsACString_Finish(&base_uri_str); + + if(!strncmp(spec, szChrome, sizeof(szChrome)-1)) + aBaseURI = NULL; } nsres = nsIIOService_NewURI(nsio, aSpec, aOriginCharset, aBaseURI, &uri);

1 0

Jacek Caban : mshtml: Don' t do anything in SetNSContainer if new container is the same as previous.
by Alexandre Julliard Dec. 14, 2006

Dec. 14, 2006

Module: wine Branch: master Commit: 6b48198d3c24b665ec7af4a21d2f152fb6f5d531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b48198d3c24b665ec7af4a21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 14 00:21:04 2006 +0100 mshtml: Don't do anything in SetNSContainer if new container is the same as previous. --- dlls/mshtml/nsio.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 122b599..256a436 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1524,6 +1524,8 @@ static nsresult NSAPI nsURI_SetNSContain TRACE("(%p)->(%p)\n", This, aContainer); if(This->container) { + if(This->container == aContainer) + return NS_OK; WARN("Container already set: %p\n", This->container); nsIWebBrowserChrome_Release(NSWBCHROME(This->container)); }

1 0

Jacek Caban : mshtml: Fix loading pages in containers without document.
by Alexandre Julliard Dec. 14, 2006

Dec. 14, 2006

Module: wine Branch: master Commit: d8a761c0ab5a93c6bc822a5c56c1f5e5ecbc44c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8a761c0ab5a93c6bc822a5c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 14 00:20:34 2006 +0100 mshtml: Fix loading pages in containers without document. --- dlls/mshtml/nsio.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 3c4b04e..122b599 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -636,7 +636,7 @@ static nsresult NSAPI nsChannel_AsyncOpe return WINE_NS_LOAD_FROM_MONIKER; } - }else { + }else if(container->doc) { BOOL cont = before_async_open(This, container); nsIWebBrowserChrome_Release(NSWBCHROME(container)); @@ -644,6 +644,11 @@ static nsresult NSAPI nsChannel_AsyncOpe TRACE("canceled\n"); return NS_ERROR_UNEXPECTED; } + }else { + nsIWebBrowserChrome_Release(NSWBCHROME(container)); + return This->channel + ? nsIChannel_AsyncOpen(This->channel, aListener, aContext) + : NS_ERROR_UNEXPECTED; } }

1 0

Jacek Caban : mshtml: Added nsACString_SetData function and use it instead of nsACString_Init when we return string value .
by Alexandre Julliard Dec. 14, 2006

Dec. 14, 2006

Module: wine Branch: master Commit: f609a768e726772f00d26568c87e04bbaa23281f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f609a768e726772f00d26568c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 14 00:20:26 2006 +0100 mshtml: Added nsACString_SetData function and use it instead of nsACString_Init when we return string value. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsembed.c | 7 ++++++- dlls/mshtml/nsio.c | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b7bfb36..d23a967 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -332,6 +332,7 @@ void *nsalloc(size_t); void nsfree(void*); void nsACString_Init(nsACString*,const char*); +void nsACString_SetData(nsACString*,const char*); PRUint32 nsACString_GetData(const nsACString*,const char**,PRBool*); void nsACString_Finish(nsACString*); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index e5c46c2..f1c2dd2 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -422,7 +422,12 @@ void nsACString_Init(nsACString *str, co { NS_CStringContainerInit(str); if(data) - NS_CStringSetData(str, data, PR_UINT32_MAX); + nsACString_SetData(str, data); +} + +void nsACString_SetData(nsACString *str, const char *data) +{ + NS_CStringSetData(str, data, PR_UINT32_MAX); } PRUint32 nsACString_GetData(const nsACString *str, const char **data, PRBool *termited) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 568434d..3c4b04e 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -475,7 +475,7 @@ static nsresult NSAPI nsChannel_GetConte TRACE("(%p)->(%p)\n", This, aContentType); if(This->content) { - nsACString_Init(aContentType, This->content); + nsACString_SetData(aContentType, This->content); return S_OK; } @@ -483,7 +483,7 @@ static nsresult NSAPI nsChannel_GetConte return nsIChannel_GetContentType(This->channel, aContentType); TRACE("returning default text/html\n"); - nsACString_Init(aContentType, "text/html"); + nsACString_SetData(aContentType, "text/html"); return NS_OK; } @@ -1154,7 +1154,7 @@ static nsresult NSAPI nsURI_GetSpec(nsIW return nsIURI_GetSpec(This->uri, aSpec); if(This->spec) { - nsACString_Init(aSpec, This->spec); + nsACString_SetData(aSpec, This->spec); return NS_OK; }

1 0