February 2010 - Wine-Commits

Hans Leidekker : msi: All stream names starting with 0x0005 are unencoded.
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: ba090ede7bcc174e0ee4cd31e83e071164cfd426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba090ede7bcc174e0ee4cd31e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 22 12:25:21 2010 +0100 msi: All stream names starting with 0x0005 are unencoded. Fixes a regression caused by 1ff992314887d03abeb4098789701ff3bfd5d2d8. --- dlls/msi/streams.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 8ec2ad9..66bda76 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -527,9 +527,9 @@ static INT add_streams_to_table(MSISTREAMSVIEW *sv) break; } - if (!strcmpW(stat.pwcsName, szSumInfo)) + /* these streams appear to be unencoded */ + if (*stat.pwcsName == 0x0005) { - /* summary information stream is not encoded */ r = db_get_raw_stream(sv->db, stat.pwcsName, &stream->stream); } else

1 0

Vincent Povirk : comdlg32: Add a test showing the font dialog ignores printer dpi.
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: 9bb6932e4b50358a6136a34842146b6543a102f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bb6932e4b50358a6136a3484… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Feb 19 16:45:07 2010 -0600 comdlg32: Add a test showing the font dialog ignores printer dpi. --- dlls/comdlg32/tests/Makefile.in | 2 +- dlls/comdlg32/tests/fontdlg.c | 57 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/tests/Makefile.in b/dlls/comdlg32/tests/Makefile.in index 67534d4..82b7cd2 100644 --- a/dlls/comdlg32/tests/Makefile.in +++ b/dlls/comdlg32/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = comdlg32.dll -IMPORTS = comdlg32 user32 gdi32 kernel32 +IMPORTS = comdlg32 winspool user32 gdi32 kernel32 C_SRCS = \ filedlg.c \ diff --git a/dlls/comdlg32/tests/fontdlg.c b/dlls/comdlg32/tests/fontdlg.c index a277e08..d6819fc 100644 --- a/dlls/comdlg32/tests/fontdlg.c +++ b/dlls/comdlg32/tests/fontdlg.c @@ -25,6 +25,7 @@ #include "winbase.h" #include "winerror.h" #include "wingdi.h" +#include "winspool.h" #include "winuser.h" #include "objbase.h" @@ -44,6 +45,30 @@ static int get_dpiy(void) return result; } +static HDC get_printer_ic(void) +{ + PRINTER_INFO_2A *info; + DWORD info_size, num_printers=0; + BOOL ret; + HDC result=NULL; + + EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &info_size, &num_printers); + + if (info_size == 0) + return NULL; + + info = HeapAlloc(GetProcessHeap(), 0, info_size); + + ret = EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 2, (LPBYTE)info, info_size, &info_size, &num_printers); + + if (ret) + result = CreateICA(info->pDriverName, info->pPrinterName, NULL, NULL); + + HeapFree(GetProcessHeap(), 0, info); + + return result; +} + static UINT_PTR CALLBACK CFHookProcOK(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { switch (msg) @@ -63,6 +88,7 @@ static void test_ChooseFontA(void) BOOL ret; int dpiy = get_dpiy(); int expected_pointsize, expected_lfheight; + HDC printer_ic; memset(&lfa, 0, sizeof(LOGFONTA)); lfa.lfHeight = -16; @@ -85,6 +111,37 @@ static void test_ChooseFontA(void) ok(lfa.lfHeight == expected_lfheight, "Expected %i, got %i\n", expected_lfheight, lfa.lfHeight); ok(lfa.lfWeight == FW_NORMAL, "Expected FW_NORMAL, got %i\n", lfa.lfWeight); ok(strcmp(lfa.lfFaceName, "Symbol") == 0, "Expected Symbol, got %s\n", lfa.lfFaceName); + + printer_ic = get_printer_ic(); + if (!printer_ic) + skip("can't get a DC for a local printer\n"); + else + { + memset(&lfa, 0, sizeof(LOGFONTA)); + lfa.lfHeight = -16; + lfa.lfWeight = FW_NORMAL; + strcpy(lfa.lfFaceName, "Symbol"); + + memset(&cfa, 0, sizeof(CHOOSEFONTA)); + cfa.lStructSize = sizeof(cfa); + cfa.lpLogFont = &lfa; + cfa.Flags = CF_ENABLEHOOK|CF_INITTOLOGFONTSTRUCT|CF_PRINTERFONTS; + cfa.hDC = printer_ic; + cfa.lpfnHook = CFHookProcOK; + + ret = ChooseFontA(&cfa); + + expected_pointsize = MulDiv(16, 72, dpiy) * 10; + expected_lfheight = -MulDiv(expected_pointsize, dpiy, 720); + + ok(ret == TRUE, "ChooseFontA returned FALSE\n"); + todo_wine ok(cfa.iPointSize == expected_pointsize, "Expected %i, got %i\n", expected_pointsize, cfa.iPointSize); + todo_wine ok(lfa.lfHeight == expected_lfheight, "Expected %i, got %i\n", expected_lfheight, lfa.lfHeight); + ok(lfa.lfWeight == FW_NORMAL, "Expected FW_NORMAL, got %i\n", lfa.lfWeight); + ok(strcmp(lfa.lfFaceName, "Symbol") == 0, "Expected Symbol, got %s\n", lfa.lfFaceName); + + DeleteDC(printer_ic); + } } START_TEST(fontdlg)

1 0

Christian Costa : d3dx9_36: Add stub for D3DXGetShaderConstantTableEx. Implement D3DXGetShaderConstantTable.
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: 88b2892a590dc9203040636ae7a7301395a9e5c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88b2892a590dc9203040636ae… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Feb 21 22:30:27 2010 +0100 d3dx9_36: Add stub for D3DXGetShaderConstantTableEx. Implement D3DXGetShaderConstantTable. --- dlls/d3dx9_36/d3dx9_36.spec | 4 ++-- dlls/d3dx9_36/shader.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 43551b2..d22ab5f 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -157,8 +157,8 @@ @ stdcall D3DXGetImageInfoFromResourceA(long str ptr) @ stdcall D3DXGetImageInfoFromResourceW(long wstr ptr) @ stdcall D3DXGetPixelShaderProfile(ptr) -@ stub D3DXGetShaderConstantTable -@ stub D3DXGetShaderConstantTableEx +@ stdcall D3DXGetShaderConstantTable(ptr ptr) +@ stdcall D3DXGetShaderConstantTableEx(ptr long ptr) @ stub D3DXGetShaderInputSemantics @ stub D3DXGetShaderOutputSemantics @ stub D3DXGetShaderSamplers diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 16fdd78..d8f7325 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -237,3 +237,23 @@ HRESULT WINAPI D3DXCompileShader(LPCSTR pSrcData, pProfile, Flags, ppShader, ppErrorMsgs, ppConstantTable); return D3DERR_INVALIDCALL; } + +HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* pFunction, + DWORD flags, + LPD3DXCONSTANTTABLE* ppConstantTable) +{ + FIXME("(%p, %x, %p): stub\n", pFunction, flags, ppConstantTable); + + if (!pFunction || !ppConstantTable) + return D3DERR_INVALIDCALL; + + return D3DXERR_INVALIDDATA; +} + +HRESULT WINAPI D3DXGetShaderConstantTable(CONST DWORD* pFunction, + LPD3DXCONSTANTTABLE* ppConstantTable) +{ + TRACE("(%p, %p): Forwarded to D3DXGetShaderConstantTableEx\n", pFunction, ppConstantTable); + + return D3DXGetShaderConstantTableEx(pFunction, 0, ppConstantTable); +}

1 0

Hans Leidekker : msi: Make msi_reset_folders static.
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: ec5ae81c8d1bc6c7440d5206efe6b903e9519e60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec5ae81c8d1bc6c7440d5206e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 22 12:24:45 2010 +0100 msi: Make msi_reset_folders static. --- dlls/msi/helpers.c | 19 ------------------- dlls/msi/msipriv.h | 1 - dlls/msi/package.c | 19 +++++++++++++++++++ 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index e763a11..2c472dd 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -156,25 +156,6 @@ MSIFOLDER *get_loaded_folder( MSIPACKAGE *package, LPCWSTR dir ) return NULL; } -void msi_reset_folders( MSIPACKAGE *package, BOOL source ) -{ - MSIFOLDER *folder; - - LIST_FOR_EACH_ENTRY( folder, &package->folders, MSIFOLDER, entry ) - { - if ( source ) - { - msi_free( folder->ResolvedSource ); - folder->ResolvedSource = NULL; - } - else - { - msi_free( folder->ResolvedTarget ); - folder->ResolvedTarget = NULL; - } - } -} - static LPWSTR get_source_root( MSIPACKAGE *package ) { LPWSTR path, p; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 2278ff7..e18f02d 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -975,7 +975,6 @@ extern MSICOMPONENT *get_loaded_component( MSIPACKAGE* package, LPCWSTR Componen extern MSIFEATURE *get_loaded_feature( MSIPACKAGE* package, LPCWSTR Feature ); extern MSIFILE *get_loaded_file( MSIPACKAGE* package, LPCWSTR file ); extern MSIFOLDER *get_loaded_folder( MSIPACKAGE *package, LPCWSTR dir ); -extern void msi_reset_folders( MSIPACKAGE *package, BOOL source ); extern int track_tempfile(MSIPACKAGE *package, LPCWSTR path); extern UINT schedule_action(MSIPACKAGE *package, UINT script, LPCWSTR action); extern void msi_free_action_script(MSIPACKAGE *package, UINT script); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index ad6d4c6..b1741ae 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1621,6 +1621,25 @@ end: return r; } +static void msi_reset_folders( MSIPACKAGE *package, BOOL source ) +{ + MSIFOLDER *folder; + + LIST_FOR_EACH_ENTRY( folder, &package->folders, MSIFOLDER, entry ) + { + if ( source ) + { + msi_free( folder->ResolvedSource ); + folder->ResolvedSource = NULL; + } + else + { + msi_free( folder->ResolvedTarget ); + folder->ResolvedTarget = NULL; + } + } +} + UINT MSI_SetPropertyW( MSIPACKAGE *package, LPCWSTR szName, LPCWSTR szValue) { MSIQUERY *view;

1 0

Christian Costa : d3dx9_36: Fix AddRef and Release macros and add IID for ID3DXConstantTable.
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: 3138ba0d5cfcd37d3b457916240a7e20a08f047c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3138ba0d5cfcd37d3b4579162… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Feb 21 22:30:33 2010 +0100 d3dx9_36: Fix AddRef and Release macros and add IID for ID3DXConstantTable. --- include/d3dx9shader.h | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h index 78abec8..a0df2a8 100644 --- a/include/d3dx9shader.h +++ b/include/d3dx9shader.h @@ -112,6 +112,8 @@ typedef struct _D3DXCONSTANT_DESC LPCVOID DefaultValue; } D3DXCONSTANT_DESC, *LPD3DXCONSTANT_DESC; +DEFINE_GUID(IID_ID3DXConstantTable, 0x9dca3190, 0x38b9, 0x4fc3, 0x92, 0xe3, 0x39, 0xc6, 0xdd, 0xfb, 0x35, 0x8b); + #undef INTERFACE #define INTERFACE ID3DXConstantTable @@ -151,8 +153,8 @@ DECLARE_INTERFACE_(ID3DXConstantTable, ID3DXBuffer) #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define ID3DXConstantTable_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define ID3DXConstantTable_AddRef(p) (p)->lpVtbl->AddRef(p,a) -#define ID3DXConstantTable_Release(p) (p)->lpVtbl->Release(p,a) +#define ID3DXConstantTable_AddRef(p) (p)->lpVtbl->AddRef(p) +#define ID3DXConstantTable_Release(p) (p)->lpVtbl->Release(p) /*** ID3DXBuffer methods ***/ #define ID3DXConstantTable_GetBufferPointer(p) (p)->lpVtbl->GetBufferPointer(p) #define ID3DXConstantTable_GetBufferSize(p) (p)->lpVtbl->GetBufferSize(p) @@ -181,8 +183,8 @@ DECLARE_INTERFACE_(ID3DXConstantTable, ID3DXBuffer) #else /*** IUnknown methods ***/ #define ID3DXConstantTable_QueryInterface(p,a,b) (p)->QueryInterface(a,b) -#define ID3DXConstantTable_AddRef(p) (p)->AddRef(a) -#define ID3DXConstantTable_Release(p) (p)->Release(a) +#define ID3DXConstantTable_AddRef(p) (p)->AddRef() +#define ID3DXConstantTable_Release(p) (p)->Release() /*** ID3DXBuffer methods ***/ #define ID3DXConstantTable_GetBufferPointer(p) (p)->GetBufferPointer() #define ID3DXConstantTable_GetBufferSize(p) (p)->GetBufferSize()

1 0

Vincent Povirk : comdlg32: Always use screen dpi in the font dialog, even with a printer dc.
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: a19536587be143cf1f208e62062fb35abfbd4f5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a19536587be143cf1f208e620… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Feb 19 16:50:22 2010 -0600 comdlg32: Always use screen dpi in the font dialog, even with a printer dc. --- dlls/comdlg32/fontdlg.c | 31 +++++++++++++++++++------------ dlls/comdlg32/tests/fontdlg.c | 4 ++-- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index db8ad62..3865d1a 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -456,6 +456,21 @@ static inline HDC CFn_GetDC(const CHOOSEFONTW *lpcf) } /************************************************************************* + * GetScreenDPI [internal] + */ +static inline int GetScreenDPI(void) +{ + HDC hdc; + int result; + + hdc = GetDC(0); + result = GetDeviceCaps(hdc, LOGPIXELSY); + ReleaseDC(0, hdc); + + return result; +} + +/************************************************************************* * CFn_ReleaseDC [internal] */ static inline void CFn_ReleaseDC(const CHOOSEFONTW *lpcf, HDC hdc) @@ -486,10 +501,8 @@ static INT AddFontStyle( const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW * if (nFontType & RASTER_FONTTYPE) { INT points; - if(!(hdc = CFn_GetDC(lpcf))) return 0; points = MulDiv( lpNTM->ntmTm.tmHeight - lpNTM->ntmTm.tmInternalLeading, - 72, GetDeviceCaps(hdc, LOGPIXELSY)); - CFn_ReleaseDC(lpcf, hdc); + 72, GetScreenDPI()); i = AddFontSizeToCombo3(hcmb3, points, lpcf); if(i) return 0; } else if (SetFontSizesToCombo3(hcmb3, lpcf)) return 0; @@ -705,7 +718,7 @@ static LRESULT CFn_WMInitDialog(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOS lpxx->lfHeight; INT points; int charset = lpxx->lfCharSet; - points = MulDiv( height, 72, GetDeviceCaps(hdc, LOGPIXELSY)); + points = MulDiv( height, 72, GetScreenDPI()); pstyle = MAKELONG(lpxx->lfWeight > FW_MEDIUM ? FW_BOLD: FW_NORMAL,lpxx->lfItalic !=0); SendDlgItemMessageW(hDlg, cmb1, CB_SETCURSEL, j, 0); @@ -982,14 +995,8 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO CB_GETITEMDATA , i, 0)); else lpcf->iPointSize = 100; - hdc = CFn_GetDC(lpcf); - if( hdc) - { - lpxx->lfHeight = - MulDiv( lpcf->iPointSize , - GetDeviceCaps(hdc, LOGPIXELSY), 720); - CFn_ReleaseDC(lpcf, hdc); - } else - lpxx->lfHeight = -lpcf->iPointSize / 10; + lpxx->lfHeight = - MulDiv( lpcf->iPointSize , + GetScreenDPI(), 720); i=SendDlgItemMessageW(hDlg, cmb5, CB_GETCURSEL, 0, 0); if (i!=CB_ERR) lpxx->lfCharSet=SendDlgItemMessageW(hDlg, cmb5, CB_GETITEMDATA, i, 0); diff --git a/dlls/comdlg32/tests/fontdlg.c b/dlls/comdlg32/tests/fontdlg.c index d6819fc..57c1d90 100644 --- a/dlls/comdlg32/tests/fontdlg.c +++ b/dlls/comdlg32/tests/fontdlg.c @@ -135,8 +135,8 @@ static void test_ChooseFontA(void) expected_lfheight = -MulDiv(expected_pointsize, dpiy, 720); ok(ret == TRUE, "ChooseFontA returned FALSE\n"); - todo_wine ok(cfa.iPointSize == expected_pointsize, "Expected %i, got %i\n", expected_pointsize, cfa.iPointSize); - todo_wine ok(lfa.lfHeight == expected_lfheight, "Expected %i, got %i\n", expected_lfheight, lfa.lfHeight); + ok(cfa.iPointSize == expected_pointsize, "Expected %i, got %i\n", expected_pointsize, cfa.iPointSize); + ok(lfa.lfHeight == expected_lfheight, "Expected %i, got %i\n", expected_lfheight, lfa.lfHeight); ok(lfa.lfWeight == FW_NORMAL, "Expected FW_NORMAL, got %i\n", lfa.lfWeight); ok(strcmp(lfa.lfFaceName, "Symbol") == 0, "Expected Symbol, got %s\n", lfa.lfFaceName);

1 0

Christian Costa : d3d8: Display FIXME only once in ValidatePixelShader and ValidateVertexShader.
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: 11a015070c986bd96d847587c56c869b27d6cbd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11a015070c986bd96d847587c… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Feb 19 15:37:23 2010 +0100 d3d8: Display FIXME only once in ValidatePixelShader and ValidateVertexShader. --- dlls/d3d8/d3d8_main.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index e5f44e7..c471049 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -79,7 +79,12 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD* reserved2, BOOL bool, DWORD* toto) { HRESULT ret; - FIXME("(%p %p %p %d %p): stub\n", vertexshader, reserved1, reserved2, bool, toto); + static BOOL warned; + + if (TRACE_ON(d3d8) || !warned) { + FIXME("(%p %p %p %d %p): stub\n", vertexshader, reserved1, reserved2, bool, toto); + warned = TRUE; + } if (!vertexshader) return E_FAIL; @@ -109,7 +114,12 @@ HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD HRESULT WINAPI ValidatePixelShader(DWORD* pixelshader, DWORD* reserved1, BOOL bool, DWORD* toto) { HRESULT ret; - FIXME("(%p %p %d %p): stub\n", pixelshader, reserved1, bool, toto); + static BOOL warned; + + if (TRACE_ON(d3d8) || !warned) { + FIXME("(%p %p %d %p): stub\n", pixelshader, reserved1, bool, toto); + warned = TRUE; + } if (!pixelshader) return E_FAIL;

1 0

Dylan Smith : wordpad: Don't waste time getting the number of preview pages .
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: 20dea9a8900a238a18f5e525b24bab837f71b8c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20dea9a8900a238a18f5e525b… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Feb 22 03:18:35 2010 -0500 wordpad: Don't waste time getting the number of preview pages. For print preview it will take more time to wait for the whole text to be wrapped for EM_FORMATRANGE than to wait for just the first page. Trying to get the total number of pages will cause the whole test to be wrapped. Instead all that is needed is to just determine if a page is the last page, which can be determined by it's page end offset compared to the text length. --- programs/wordpad/print.c | 69 +++++++++++++++++---------------------------- 1 files changed, 26 insertions(+), 43 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index 5c679ea..e8f86d7 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -27,7 +27,6 @@ typedef struct _previewinfo { int page; - int pages; int pages_shown; int *pageEnds, pageCapacity; int textlength; @@ -247,42 +246,6 @@ static LPWSTR dialog_print_to_file(HWND hMainWnd) return FALSE; } -static int get_num_pages(HWND hEditorWnd, FORMATRANGE fr) -{ - int page = 0; - fr.chrg.cpMin = 0; - - if (!preview.pageEnds) - { - preview.pageCapacity = 32; - preview.pageEnds = HeapAlloc(GetProcessHeap(), 0, - sizeof(int) * preview.pageCapacity); - if (!preview.pageEnds) return 0; - } - - do - { - int bottom = fr.rc.bottom; - fr.chrg.cpMin = SendMessageW(hEditorWnd, EM_FORMATRANGE, FALSE, - (LPARAM)&fr); - if (page >= preview.pageCapacity) - { - int *new_buffer; - new_buffer = HeapReAlloc(GetProcessHeap(), 0, preview.pageEnds, - sizeof(int) * preview.pageCapacity * 2); - if (!new_buffer) return page; - preview.pageCapacity *= 2; - preview.pageEnds = new_buffer; - } - preview.pageEnds[page] = fr.chrg.cpMin; - page++; - fr.rc.bottom = bottom; - } - while(fr.chrg.cpMin && fr.chrg.cpMin < fr.chrg.cpMax); - - return page; -} - static void char_from_pagenum(HWND hEditorWnd, FORMATRANGE *fr, int page) { int i; @@ -645,7 +608,6 @@ LRESULT CALLBACK preview_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) fr.hdcTarget = hdcTarget; fr.chrg.cpMin = 0; fr.chrg.cpMax = preview.textlength; - preview.pages = get_num_pages(hEditorWnd, fr); DeleteDC(fr.hdc); DeleteDC(hdcTarget); ReleaseDC(hWnd, hdc); @@ -747,7 +709,6 @@ void close_preview(HWND hMainWnd) preview.window.right = 0; preview.window.bottom = 0; preview.page = 0; - preview.pages = 0; HeapFree(GetProcessHeap(), 0, preview.pageEnds); preview.pageEnds = NULL; preview.pageCapacity = 0; @@ -966,23 +927,45 @@ static void draw_preview(HWND hEditorWnd, FORMATRANGE* lpFr, RECT* paper, int pa { int bottom; + if (!preview.pageEnds) + { + preview.pageCapacity = 32; + preview.pageEnds = HeapAlloc(GetProcessHeap(), 0, + sizeof(int) * preview.pageCapacity); + if (!preview.pageEnds) return; + } else if (page >= preview.pageCapacity) { + int *new_buffer; + new_buffer = HeapReAlloc(GetProcessHeap(), 0, preview.pageEnds, + sizeof(int) * preview.pageCapacity * 2); + if (!new_buffer) return; + preview.pageCapacity *= 2; + preview.pageEnds = new_buffer; + } + lpFr->chrg.cpMin = page <= 1 ? 0 : preview.pageEnds[page-2]; FillRect(lpFr->hdc, paper, GetStockObject(WHITE_BRUSH)); bottom = lpFr->rc.bottom; - SendMessageW(hEditorWnd, EM_FORMATRANGE, TRUE, (LPARAM)lpFr); + preview.pageEnds[page-1] = SendMessageW(hEditorWnd, EM_FORMATRANGE, TRUE, (LPARAM)lpFr); + /* EM_FORMATRANGE sets fr.rc.bottom to indicate the area printed in, * but we want to keep the original for drawing margins */ lpFr->rc.bottom = bottom; SendMessageW(hEditorWnd, EM_FORMATRANGE, FALSE, 0); } +static BOOL is_last_preview_page(int page) +{ + return preview.pageEnds[page - 1] >= preview.textlength; +} + static void update_preview_buttons(HWND hMainWnd) { HWND hReBar = GetDlgItem(hMainWnd, IDC_REBAR); EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_PREVPAGE), preview.page > 1); EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_NEXTPAGE), - preview.page + preview.pages_shown - 1 < preview.pages); - EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_NUMPAGES), preview.pages > 1 && preview.zoomlevel == 0); + !is_last_preview_page(preview.page + preview.pages_shown - 1)); + EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_NUMPAGES), + !is_last_preview_page(1) && preview.zoomlevel == 0); EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_ZOOMIN), preview.zoomlevel < 2); EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_ZOOMOUT), preview.zoomlevel > 0); } @@ -1100,7 +1083,7 @@ static void toggle_num_pages(HWND hMainWnd) { preview.pages_shown = 1; } else { - if(preview.page == preview.pages) + if(is_last_preview_page(preview.page)) preview.page--; preview.pages_shown = 2; }

1 0

Dylan Smith : wordpad: Avoid unnecessary deletion of hdcSized.
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: f235c48cae7cf27c5e5a44972856f1ce6caf2c8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f235c48cae7cf27c5e5a44972… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Feb 22 03:18:29 2010 -0500 wordpad: Avoid unnecessary deletion of hdcSized. --- programs/wordpad/print.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index 868f992..5c679ea 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -927,16 +927,20 @@ LRESULT CALLBACK ruler_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) static void draw_preview_page(HDC hdc, HDC* hdcSized, FORMATRANGE* lpFr, float ratio, int bmNewWidth, int bmNewHeight, int bmWidth, int bmHeight) { HBITMAP hBitmapScaled = CreateCompatibleBitmap(hdc, bmNewWidth, bmNewHeight); + HBITMAP oldbm; HPEN hPen, oldPen; int TopMargin = (int)((float)twips_to_pixels(lpFr->rc.top, GetDeviceCaps(hdc, LOGPIXELSX)) * ratio); int BottomMargin = (int)((float)twips_to_pixels(lpFr->rc.bottom, GetDeviceCaps(hdc, LOGPIXELSX)) * ratio); int LeftMargin = (int)((float)twips_to_pixels(lpFr->rc.left, GetDeviceCaps(hdc, LOGPIXELSY)) * ratio); int RightMargin = (int)((float)twips_to_pixels(lpFr->rc.right, GetDeviceCaps(hdc, LOGPIXELSY)) * ratio); - if(*hdcSized) - DeleteDC(*hdcSized); - *hdcSized = CreateCompatibleDC(hdc); - SelectObject(*hdcSized, hBitmapScaled); + if(*hdcSized) { + oldbm = SelectObject(*hdcSized, hBitmapScaled); + DeleteObject(oldbm); + } else { + *hdcSized = CreateCompatibleDC(hdc); + SelectObject(*hdcSized, hBitmapScaled); + } StretchBlt(*hdcSized, 0, 0, bmNewWidth, bmNewHeight, hdc, 0, 0, bmWidth, bmHeight, SRCCOPY);

1 0

Dylan Smith : wordpad: Cache text length.
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: 8f19111325bc49bd17f2e5e78f75c9d105f7898a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f19111325bc49bd17f2e5e78… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Feb 22 03:18:23 2010 -0500 wordpad: Cache text length. --- programs/wordpad/print.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index 0dfce24..868f992 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -30,6 +30,7 @@ typedef struct _previewinfo int pages; int pages_shown; int *pageEnds, pageCapacity; + int textlength; HDC hdc; HDC hdc2; HDC hdcSized; @@ -638,10 +639,12 @@ LRESULT CALLBACK preview_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) preview.bmSize.cx = twips_to_pixels(preview.rcPage.right, GetDeviceCaps(hdc, LOGPIXELSX)); preview.bmSize.cy = twips_to_pixels(preview.rcPage.bottom, GetDeviceCaps(hdc, LOGPIXELSY)); + preview.textlength = SendMessageW(hEditorWnd, EM_GETTEXTLENGTHEX, (WPARAM)&gt, 0); + fr.hdc = CreateCompatibleDC(hdc); fr.hdcTarget = hdcTarget; fr.chrg.cpMin = 0; - fr.chrg.cpMax = SendMessageW(hEditorWnd, EM_GETTEXTLENGTHEX, (WPARAM)&gt, 0); + fr.chrg.cpMax = preview.textlength; preview.pages = get_num_pages(hEditorWnd, fr); DeleteDC(fr.hdc); DeleteDC(hdcTarget); @@ -1031,7 +1034,6 @@ LRESULT print_preview(HWND hwndPreview) /* Update for page changes. */ static void update_preview(HWND hMainWnd) { - GETTEXTLENGTHEX gt; RECT paper; HWND hEditorWnd = GetDlgItem(hMainWnd, IDC_EDITOR); HWND hwndPreview = GetDlgItem(hMainWnd, IDC_PREVIEW); @@ -1046,10 +1048,8 @@ static void update_preview(HWND hMainWnd) fr.rc.bottom -= margins.bottom; fr.rc.right -= margins.right; - gt.flags = GTL_DEFAULT; - gt.codepage = 1200; fr.chrg.cpMin = 0; - fr.chrg.cpMax = SendMessageW(hEditorWnd, EM_GETTEXTLENGTHEX, (WPARAM)&gt, 0); + fr.chrg.cpMax = preview.textlength; paper.left = 0; paper.right = preview.bmSize.cx;

1 0