January 2006 - Wine-commits

Mike McCormack : comctl32: Invalidate the entire progress bar any time it changes.
by Alexandre Julliard 11 Jan '06

11 Jan '06

Module: wine Branch: refs/heads/master Commit: ab4438e24d055b2b229b954a66f3bc3d9316c977 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ab4438e24d055b2b229b954… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jan 11 12:11:46 2006 +0100 comctl32: Invalidate the entire progress bar any time it changes. --- dlls/comctl32/progress.c | 29 +++-------------------------- 1 files changed, 3 insertions(+), 26 deletions(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index eb0b11a..cfed7ec 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -131,35 +131,12 @@ static inline int get_bar_position( PROG /*********************************************************************** * PROGRESS_Invalidate * - * Invalide the range between old and new pos. + * Don't be too clever about invalidating the progress bar. + * Installshield depends on this simple behaviour. */ static void PROGRESS_Invalidate( PROGRESS_INFO *infoPtr, INT old, INT new ) { - LONG style = GetWindowLongW (infoPtr->Self, GWL_STYLE); - RECT rect; - int oldPos, newPos; - BOOL barSmooth = (style & PBS_SMOOTH) && !GetWindowTheme (infoPtr->Self); - - get_client_rect( infoPtr->Self, &rect ); - - oldPos = get_bar_position( infoPtr, style, &rect, old ); - newPos = get_bar_position( infoPtr, style, &rect, new ); - - if (style & PBS_VERTICAL) - { - rect.top = rect.bottom - max( oldPos, newPos ); - rect.bottom = rect.bottom - min( oldPos, newPos ); - if (!barSmooth) rect.top -= - get_led_size (infoPtr, style, &rect) + get_led_gap (infoPtr); - } - else - { - rect.left = min( oldPos, newPos ); - rect.right = max( oldPos, newPos ); - if (!barSmooth) rect.right += - get_led_size (infoPtr, style, &rect) + get_led_gap (infoPtr); - } - InvalidateRect( infoPtr->Self, &rect, oldPos > newPos ); + InvalidateRect( infoPtr->Self, NULL, old > new ); } /* Information for a progress bar drawing helper */

1 0

Saulius Krasuckas : mscms: Set the last error code to an unusual value.
by Alexandre Julliard 11 Jan '06

11 Jan '06

Module: wine Branch: refs/heads/master Commit: dc2cdf13a4e480f16b7f1c27f25b19920e6f7d6e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dc2cdf13a4e480f16b7f1c2… Author: Saulius Krasuckas <saulius.krasuckas(a)gmail.com> Date: Wed Jan 11 12:10:56 2006 +0100 mscms: Set the last error code to an unusual value. --- dlls/mscms/tests/profile.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 8fd572c..830d6fb 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -495,7 +495,7 @@ static void enum_registered_color_profil #define fail_GSCSPA(pMachName, dwProfID, pProfName, pdwSz, dwSz, GLE_OK) \ do { \ size = dwSz; \ - SetLastError(0); \ + SetLastError(0xfaceabad); \ ret = pGetStandardColorSpaceProfileA(pMachName, dwProfID, pProfName, pdwSz);\ GLE = GetLastError(); \ ok( !ret && GLE_OK, \ @@ -562,7 +562,7 @@ static void test_GetStandardColorSpacePr #define fail_GSCSPW(pMachName, dwProfID, pProfName, pdwSz, dwSz, GLE_OK) \ do { \ size = dwSz; \ - SetLastError(0); \ + SetLastError(0xfaceabad); \ ret = pGetStandardColorSpaceProfileW(pMachName, dwProfID, pProfName, pdwSz);\ GLE = GetLastError(); \ ok( !ret && GLE_OK, \

1 0

Rob Shearman : comctl32: Test the painting behaviour of the progress bar control.
by Alexandre Julliard 11 Jan '06

11 Jan '06

Module: wine Branch: refs/heads/master Commit: 823ba55acaf5a466f78aecdead8bc1fdadc8abf6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=823ba55acaf5a466f78aecd… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jan 11 12:12:06 2006 +0100 comctl32: Test the painting behaviour of the progress bar control. Test the painting behaviour of the progress bar control when the PBM_SETPOS message is sent to it, with respect to whether the background is erased and what part of the control is redrawn. --- dlls/comctl32/tests/progress.c | 49 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 48 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/progress.c b/dlls/comctl32/tests/progress.c index 01b60c5..803055f 100644 --- a/dlls/comctl32/tests/progress.c +++ b/dlls/comctl32/tests/progress.c @@ -48,6 +48,23 @@ LRESULT CALLBACK ProgressTestWndProc(HWN return 0L; } +static WNDPROC progress_wndproc; +static BOOL erased; +static RECT last_paint_rect; + +LRESULT CALLBACK ProgressSubclassProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + if (msg == WM_PAINT) + { + GetUpdateRect(hWnd, &last_paint_rect, FALSE); + } + else if (msg == WM_ERASEBKGND) + { + erased = TRUE; + } + return CallWindowProc(progress_wndproc, hWnd, msg, wParam, lParam); +} + static void update_window(HWND hWnd) { @@ -87,11 +104,12 @@ static void init(void) hProgressParentWnd = CreateWindowExA(0, progressTestClass, "Progress Bar Test", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, GetModuleHandleA(NULL), 0); assert(hProgressParentWnd != NULL); - + GetClientRect(hProgressParentWnd, &rect); hProgressWnd = CreateWindowEx(0, PROGRESS_CLASS, "", WS_CHILD | WS_VISIBLE, 0, 0, rect.right, rect.bottom, hProgressParentWnd, NULL, GetModuleHandleA(NULL), 0); assert(hProgressWnd != NULL); + progress_wndproc = (WNDPROC)SetWindowLongPtr(hProgressWnd, GWLP_WNDPROC, (LPARAM)ProgressSubclassProc); ShowWindow(hProgressParentWnd, SW_SHOWNORMAL); ok(GetUpdateRect(hProgressParentWnd, NULL, FALSE), "GetUpdateRect: There should be a region that needs to be updated\n"); @@ -119,6 +137,8 @@ static void cleanup(void) */ static void test_redraw(void) { + RECT client_rect; + SendMessageA(hProgressWnd, PBM_SETRANGE, 0, MAKELPARAM(0, 100)); SendMessageA(hProgressWnd, PBM_SETPOS, 10, 0); SendMessageA(hProgressWnd, PBM_SETSTEP, 20, 0); @@ -145,6 +165,33 @@ static void test_redraw(void) Usually the progress bar doesn't repaint itself immediately. If the position is not in the new range, it does. Don't test this, it may change in future Windows versions. */ + + SendMessage(hProgressWnd, PBM_SETPOS, 0, 0); + update_window(hProgressWnd); + + /* increase to 10 - no background erase required */ + erased = FALSE; + SetRectEmpty(&last_paint_rect); + SendMessage(hProgressWnd, PBM_SETPOS, 10, 0); + GetClientRect(hProgressWnd, &client_rect); + ok(EqualRect(&last_paint_rect, &client_rect), + "last_paint_rect was { %ld, %ld, %ld, %ld } instead of { %ld, %ld, %ld, %ld }\n", + last_paint_rect.left, last_paint_rect.top, last_paint_rect.right, last_paint_rect.bottom, + client_rect.left, client_rect.top, client_rect.right, client_rect.bottom); + update_window(hProgressWnd); + ok(!erased, "Progress bar shouldn't have erased the background\n"); + + /* decrease to 0 - background erase will be required */ + erased = FALSE; + SetRectEmpty(&last_paint_rect); + SendMessage(hProgressWnd, PBM_SETPOS, 0, 0); + GetClientRect(hProgressWnd, &client_rect); + ok(EqualRect(&last_paint_rect, &client_rect), + "last_paint_rect was { %ld, %ld, %ld, %ld } instead of { %ld, %ld, %ld, %ld }\n", + last_paint_rect.left, last_paint_rect.top, last_paint_rect.right, last_paint_rect.bottom, + client_rect.left, client_rect.top, client_rect.right, client_rect.bottom); + update_window(hProgressWnd); + ok(erased, "Progress bar should have erased the background\n"); }

1 0

Robert Shearman : ole: Implement IEnumSTATDATA for the Ole Advise Holder.
by Alexandre Julliard 11 Jan '06

11 Jan '06

Module: wine Branch: refs/heads/master Commit: 6e6d24e959edf66a5e46a9a173c7ad2b3805aeac URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6e6d24e959edf66a5e46a9a… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jan 11 12:09:32 2006 +0100 ole: Implement IEnumSTATDATA for the Ole Advise Holder. Implement IEnumSTATDATA for the Ole Advise Holder and use it to implement the Send* functions. --- dlls/ole32/oleobj.c | 216 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 205 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index 3943aec..78e1ebc 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -50,6 +50,156 @@ typedef struct OleAdviseHolderImpl } OleAdviseHolderImpl; +static HRESULT EnumOleSTATDATA_Construct(OleAdviseHolderImpl *pOleAdviseHolder, ULONG index, IEnumSTATDATA **ppenum); + +typedef struct +{ + const IEnumSTATDATAVtbl *lpvtbl; + LONG ref; + + ULONG index; + OleAdviseHolderImpl *pOleAdviseHolder; +} EnumOleSTATDATA; + +static HRESULT WINAPI EnumOleSTATDATA_QueryInterface( + IEnumSTATDATA *iface, REFIID riid, void **ppv) +{ + TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IEnumSTATDATA)) + { + IUnknown_AddRef(iface); + *ppv = iface; + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI EnumOleSTATDATA_AddRef( + IEnumSTATDATA *iface) +{ + EnumOleSTATDATA *This = (EnumOleSTATDATA *)iface; + TRACE("()\n"); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI EnumOleSTATDATA_Release( + IEnumSTATDATA *iface) +{ + EnumOleSTATDATA *This = (EnumOleSTATDATA *)iface; + LONG refs = InterlockedDecrement(&This->ref); + TRACE("()\n"); + if (!refs) + { + IOleAdviseHolder_Release((IOleAdviseHolder *)This->pOleAdviseHolder); + HeapFree(GetProcessHeap(), 0, This); + } + return refs; +} + +static HRESULT WINAPI EnumOleSTATDATA_Next( + IEnumSTATDATA *iface, ULONG celt, LPSTATDATA rgelt, + ULONG *pceltFetched) +{ + EnumOleSTATDATA *This = (EnumOleSTATDATA *)iface; + HRESULT hr = S_OK; + + TRACE("(%ld, %p, %p)\n", celt, rgelt, pceltFetched); + + if (pceltFetched) + *pceltFetched = 0; + + for (; celt; celt--, rgelt++) + { + while ((This->index < This->pOleAdviseHolder->maxSinks) && + !This->pOleAdviseHolder->arrayOfSinks[This->index]) + { + This->index++; + } + if (This->index >= This->pOleAdviseHolder->maxSinks) + { + hr = S_FALSE; + break; + } + + memset(&rgelt->formatetc, 0, sizeof(rgelt->formatetc)); + rgelt->advf = 0; + rgelt->pAdvSink = This->pOleAdviseHolder->arrayOfSinks[This->index]; + IAdviseSink_AddRef(rgelt->pAdvSink); + rgelt->dwConnection = This->index; + + if (pceltFetched) + *pceltFetched++; + This->index++; + } + return hr; +} + +static HRESULT WINAPI EnumOleSTATDATA_Skip( + IEnumSTATDATA *iface, ULONG celt) +{ + EnumOleSTATDATA *This = (EnumOleSTATDATA *)iface; + + TRACE("(%ld)\n", celt); + + for (; celt; celt--) + { + while ((This->index < This->pOleAdviseHolder->maxSinks) && + !This->pOleAdviseHolder->arrayOfSinks[This->index]) + { + This->index++; + } + if (This->index >= This->pOleAdviseHolder->maxSinks) + return S_FALSE; + This->index++; + } + return S_OK; +} + +static HRESULT WINAPI EnumOleSTATDATA_Reset( + IEnumSTATDATA *iface) +{ + EnumOleSTATDATA *This = (EnumOleSTATDATA *)iface; + + TRACE("()\n"); + + This->index = 0; + return S_OK; +} + +static HRESULT WINAPI EnumOleSTATDATA_Clone( + IEnumSTATDATA *iface, + IEnumSTATDATA **ppenum) +{ + EnumOleSTATDATA *This = (EnumOleSTATDATA *)iface; + return EnumOleSTATDATA_Construct(This->pOleAdviseHolder, This->index, ppenum); +} + +static const IEnumSTATDATAVtbl EnumOleSTATDATA_VTable = +{ + EnumOleSTATDATA_QueryInterface, + EnumOleSTATDATA_AddRef, + EnumOleSTATDATA_Release, + EnumOleSTATDATA_Next, + EnumOleSTATDATA_Skip, + EnumOleSTATDATA_Reset, + EnumOleSTATDATA_Clone +}; + +static HRESULT EnumOleSTATDATA_Construct(OleAdviseHolderImpl *pOleAdviseHolder, ULONG index, IEnumSTATDATA **ppenum) +{ + EnumOleSTATDATA *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + return E_OUTOFMEMORY; + This->lpvtbl = &EnumOleSTATDATA_VTable; + This->ref = 1; + This->index = index; + This->pOleAdviseHolder = pOleAdviseHolder; + IOleAdviseHolder_AddRef((IOleAdviseHolder *)pOleAdviseHolder); + *ppenum = (IEnumSTATDATA *)&This->lpvtbl; + return S_OK; +} + /************************************************************************** * OleAdviseHolderImpl_Destructor */ @@ -258,11 +408,12 @@ static HRESULT WINAPI OleAdviseHolderImpl_EnumAdvise (LPOLEADVISEHOLDER iface, IEnumSTATDATA **ppenumAdvise) { OleAdviseHolderImpl *This = (OleAdviseHolderImpl *)iface; - FIXME("(%p)->(%p)\n", This, ppenumAdvise); + + TRACE("(%p)->(%p)\n", This, ppenumAdvise); *ppenumAdvise = NULL; - return S_OK; + return EnumOleSTATDATA_Construct(This, 0, ppenumAdvise); } /****************************************************************************** @@ -271,11 +422,25 @@ OleAdviseHolderImpl_EnumAdvise (LPOLEADV static HRESULT WINAPI OleAdviseHolderImpl_SendOnRename (LPOLEADVISEHOLDER iface, IMoniker *pmk) { - OleAdviseHolderImpl *This = (OleAdviseHolderImpl *)iface; - FIXME("(%p)->(%p)\n", This, pmk); + IEnumSTATDATA *pEnum; + HRESULT hr; + TRACE("(%p)->(%p)\n", iface, pmk); - return S_OK; + hr = IOleAdviseHolder_EnumAdvise(iface, &pEnum); + if (SUCCEEDED(hr)) + { + STATDATA statdata; + while (IEnumSTATDATA_Next(pEnum, 1, &statdata, NULL) == S_OK) + { + IAdviseSink_OnRename(statdata.pAdvSink, pmk); + + IAdviseSink_Release(statdata.pAdvSink); + } + IEnumSTATDATA_Release(pEnum); + } + + return hr; } /****************************************************************************** @@ -284,10 +449,25 @@ OleAdviseHolderImpl_SendOnRename (LPOLEA static HRESULT WINAPI OleAdviseHolderImpl_SendOnSave (LPOLEADVISEHOLDER iface) { - OleAdviseHolderImpl *This = (OleAdviseHolderImpl *)iface; - FIXME("(%p)\n", This); + IEnumSTATDATA *pEnum; + HRESULT hr; - return S_OK; + TRACE("(%p)->()\n", iface); + + hr = IOleAdviseHolder_EnumAdvise(iface, &pEnum); + if (SUCCEEDED(hr)) + { + STATDATA statdata; + while (IEnumSTATDATA_Next(pEnum, 1, &statdata, NULL) == S_OK) + { + IAdviseSink_OnSave(statdata.pAdvSink); + + IAdviseSink_Release(statdata.pAdvSink); + } + IEnumSTATDATA_Release(pEnum); + } + + return hr; } /****************************************************************************** @@ -296,11 +476,25 @@ OleAdviseHolderImpl_SendOnSave (LPOLEADV static HRESULT WINAPI OleAdviseHolderImpl_SendOnClose (LPOLEADVISEHOLDER iface) { - OleAdviseHolderImpl *This = (OleAdviseHolderImpl *)iface; - FIXME("(%p)\n", This); + IEnumSTATDATA *pEnum; + HRESULT hr; + TRACE("(%p)->()\n", iface); - return S_OK; + hr = IOleAdviseHolder_EnumAdvise(iface, &pEnum); + if (SUCCEEDED(hr)) + { + STATDATA statdata; + while (IEnumSTATDATA_Next(pEnum, 1, &statdata, NULL) == S_OK) + { + IAdviseSink_OnClose(statdata.pAdvSink); + + IAdviseSink_Release(statdata.pAdvSink); + } + IEnumSTATDATA_Release(pEnum); + } + + return hr; } /**************************************************************************

1 0

Francois Gouget : winemenubuilder: Improve traces.
by Alexandre Julliard 11 Jan '06

11 Jan '06

Module: wine Branch: refs/heads/master Commit: 629889b267c288323c0d7d70c4ded6ba87199d8e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=629889b267c288323c0d7d7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 11 12:09:53 2006 +0100 winemenubuilder: Improve traces. Report the EnumResourceNamesW() and failure to find an icon separately so traces are less misleading. --- programs/winemenubuilder/winemenubuilder.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 50fd615..9c0c3aa 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -291,7 +291,11 @@ static BOOL extract_icon32(LPCWSTR szFil hResInfo=NULL; sEnumRes.pResInfo = &hResInfo; sEnumRes.nIndex = nIndex; - EnumResourceNamesW(hModule, (LPCWSTR)RT_GROUP_ICON, EnumResNameProc, (LONG_PTR)&sEnumRes); + if (!EnumResourceNamesW(hModule, (LPCWSTR)RT_GROUP_ICON, + EnumResNameProc, (LONG_PTR)&sEnumRes)) + { + WINE_TRACE("EnumResourceNamesW failed, error %ld\n", GetLastError()); + } } if (hResInfo) @@ -320,7 +324,7 @@ static BOOL extract_icon32(LPCWSTR szFil } else { - WINE_ERR("ExtractFromEXEDLL failed, error %ld\n", GetLastError()); + WINE_ERR("found no icon\n"); FreeLibrary(hModule); return FALSE; }

1 0

Huw Davies : opengl: Use indirect contexts if the surface is a pixmap.
by Alexandre Julliard 11 Jan '06

11 Jan '06

Module: wine Branch: refs/heads/master Commit: 586ed7d458d443211780ccb27e6d683ac4a01966 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=586ed7d458d443211780ccb… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 11 12:10:04 2006 +0100 opengl: Use indirect contexts if the surface is a pixmap. --- dlls/opengl32/wgl.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 5af2c29..afb4c86 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -537,10 +537,10 @@ BOOL WINAPI wglMakeCurrent(HDC hdc, vis = XGetVisualInfo(ctx->display, VisualIDMask, &template, &num); TRACE(" Creating GLX Context\n"); - ctx->ctx = glXCreateContext(ctx->display, vis, NULL, True); + ctx->ctx = glXCreateContext(ctx->display, vis, NULL, type == OBJ_MEMDC ? False : True); } else { TRACE(" Creating GLX Context\n"); - ctx->ctx = glXCreateContext(ctx->display, ctx->vis, NULL, True); + ctx->ctx = glXCreateContext(ctx->display, ctx->vis, NULL, type == OBJ_MEMDC ? False : True); } TRACE(" created a delayed OpenGL context (%p)\n", ctx->ctx); } @@ -574,8 +574,8 @@ BOOL WINAPI wglMakeContextCurrentARB(HDC Drawable d_read = get_drawable( hReadDC ); if (ctx->ctx == NULL) { - ctx->ctx = glXCreateContext(ctx->display, ctx->vis, NULL, True); - TRACE(" created a delayed OpenGL context (%p)\n", ctx->ctx); + ctx->ctx = glXCreateContext(ctx->display, ctx->vis, NULL, GetObjectType(hDrawDC) == OBJ_MEMDC ? False : True); + TRACE(" created a delayed OpenGL context (%p)\n", ctx->ctx); } ret = wine_glx.p_glXMakeContextCurrent(ctx->display, d_draw, d_read, ctx->ctx); } @@ -648,7 +648,7 @@ BOOL WINAPI wglShareLists(HGLRC hglrc1, if (org->ctx == NULL) { ENTER_GL(); describeContext(org); - org->ctx = glXCreateContext(org->display, org->vis, NULL, True); + org->ctx = glXCreateContext(org->display, org->vis, NULL, GetObjectType(org->hdc) == OBJ_MEMDC ? False : True); LEAVE_GL(); TRACE(" created a delayed OpenGL context (%p) for Wine context %p\n", org->ctx, org); } @@ -656,7 +656,7 @@ BOOL WINAPI wglShareLists(HGLRC hglrc1, ENTER_GL(); describeContext(dest); /* Create the destination context with display lists shared */ - dest->ctx = glXCreateContext(org->display, dest->vis, org->ctx, True); + dest->ctx = glXCreateContext(org->display, dest->vis, org->ctx, GetObjectType(org->hdc) == OBJ_MEMDC ? False : True); LEAVE_GL(); TRACE(" created a delayed OpenGL context (%p) for Wine context %p sharing lists with OpenGL ctx %p\n", dest->ctx, dest, org->ctx); return TRUE;

1 0

Ulrich Czekalla : commdlg: If provided use and update hDevMode in the PAGESETUPDLG struct.
by Alexandre Julliard 11 Jan '06

11 Jan '06

Module: wine Branch: refs/heads/master Commit: 55f7f8b999eabd70aec5d19b238c330fcbf4ec3a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=55f7f8b999eabd70aec5d19… Author: Ulrich Czekalla <ulrich(a)codeweavers.com> Date: Wed Jan 11 12:10:33 2006 +0100 commdlg: If provided use and update hDevMode in the PAGESETUPDLG struct. Update the dmDefaultSourcea return value inside hDevMode. --- dlls/commdlg/printdlg.c | 77 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 55 insertions(+), 22 deletions(-) diff --git a/dlls/commdlg/printdlg.c b/dlls/commdlg/printdlg.c index 30e769e..19aee4b 100644 --- a/dlls/commdlg/printdlg.c +++ b/dlls/commdlg/printdlg.c @@ -2480,18 +2480,29 @@ PRINTDLG_PS_UpdateDlgStructA(HWND hDlg, dn = GlobalLock(pda->pdlg.hDevNames); dm = GlobalLock(pda->pdlg.hDevMode); + + /* Save paper orientation into device context */ if(pda->curdlg.ptPaperSize.x > pda->curdlg.ptPaperSize.y) - dm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE; + dm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE; else - dm->u1.s1.dmOrientation = DMORIENT_PORTRAIT; - + dm->u1.s1.dmOrientation = DMORIENT_PORTRAIT; + + /* Save paper size into the device context */ paperword = SendDlgItemMessageA(hDlg,cmb2,CB_GETITEMDATA, - SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0), 0); + SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0), 0); if (paperword != CB_ERR) - dm->u1.s1.dmPaperSize = paperword; + dm->u1.s1.dmPaperSize = paperword; else - FIXME("could not get dialog text for papersize cmbbox?\n"); - + FIXME("could not get dialog text for papersize cmbbox?\n"); + + /* Save paper source into the device context */ + paperword = SendDlgItemMessageA(hDlg,cmb1,CB_GETITEMDATA, + SendDlgItemMessageA(hDlg, cmb1, CB_GETCURSEL, 0, 0), 0); + if (paperword != CB_ERR) + dm->dmDefaultSource = paperword; + else + FIXME("could not get dialog text for papersize cmbbox?\n"); + GlobalUnlock(pda->pdlg.hDevNames); GlobalUnlock(pda->pdlg.hDevMode); @@ -2510,7 +2521,10 @@ PRINTDLG_PS_UpdateDlgStructW(HWND hDlg, dm = GlobalLock(pda->pdlg.hDevMode); devname = ((WCHAR*)dn)+dn->wDeviceOffset; portname = ((WCHAR*)dn)+dn->wOutputOffset; + + /* Save paper size into device context */ PRINTDLG_SetUpPaperComboBoxW(hDlg,cmb2,devname,portname,dm); + /* Save paper source into device context */ PRINTDLG_SetUpPaperComboBoxW(hDlg,cmb3,devname,portname,dm); if (GetDlgItemTextW(hDlg,cmb2,papername,sizeof(papername))>0) { @@ -3345,20 +3359,26 @@ BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLG return FALSE; } - /* First get default printer data, we need it right after that. */ + /* Initialize default printer struct. If no printer device info is specified + retrieve the default printer data. */ memset(&pdlg,0,sizeof(pdlg)); pdlg.lStructSize = sizeof(pdlg); - pdlg.Flags = PD_RETURNDEFAULT; - bRet = PrintDlgA(&pdlg); - if (!bRet){ - if(!(setupdlg->Flags & PSD_NOWARNING)){ - char errstr[256]; - LoadStringA(COMDLG32_hInstance, PD32_NO_DEFAULT_PRINTER, errstr, 255); - MessageBoxA(setupdlg->hwndOwner, errstr, 0, MB_OK | MB_ICONERROR); - } - return FALSE; + if (setupdlg->hDevMode && setupdlg->hDevNames) { + pdlg.hDevMode = setupdlg->hDevMode; + pdlg.hDevNames = setupdlg->hDevNames; + } else { + pdlg.Flags = PD_RETURNDEFAULT; + bRet = PrintDlgA(&pdlg); + if (!bRet){ + if (!(setupdlg->Flags & PSD_NOWARNING)) { + char errstr[256]; + LoadStringA(COMDLG32_hInstance, PD32_NO_DEFAULT_PRINTER, errstr, 255); + MessageBoxA(setupdlg->hwndOwner, errstr, 0, MB_OK | MB_ICONERROR); + } + return FALSE; + } } - + /* short cut exit, just return default values */ if (setupdlg->Flags & PSD_RETURNDEFAULT) { DEVMODEA *dm; @@ -3427,12 +3447,25 @@ BOOL WINAPI PageSetupDlgW(LPPAGESETUPDLG setupdlg->hInstance, setupdlg->Flags, flagstr); } - /* First get default printer data, we need it right after that. */ + /* Initialize default printer struct. If no printer device info is specified + retrieve the default printer data. */ memset(&pdlg,0,sizeof(pdlg)); pdlg.lStructSize = sizeof(pdlg); - pdlg.Flags = PD_RETURNDEFAULT; - bRet = PrintDlgW(&pdlg); - if (!bRet) return FALSE; + if (setupdlg->hDevMode && setupdlg->hDevNames) { + pdlg.hDevMode = setupdlg->hDevMode; + pdlg.hDevNames = setupdlg->hDevNames; + } else { + pdlg.Flags = PD_RETURNDEFAULT; + bRet = PrintDlgW(&pdlg); + if (!bRet){ + if (!(setupdlg->Flags & PSD_NOWARNING)) { + WCHAR errstr[256]; + LoadStringW(COMDLG32_hInstance, PD32_NO_DEFAULT_PRINTER, errstr, 255); + MessageBoxW(setupdlg->hwndOwner, errstr, 0, MB_OK | MB_ICONERROR); + } + return FALSE; + } + } /* short cut exit, just return default values */ if (setupdlg->Flags & PSD_RETURNDEFAULT) {

1 0

Robert Shearman : ole: Initialise hrref so as not to display garbage in the trace.
by Alexandre Julliard 11 Jan '06

11 Jan '06

Module: wine Branch: refs/heads/master Commit: 781970f001fadfc6fed3e2434af9a18516eb9fc5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=781970f001fadfc6fed3e24… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jan 11 12:09:17 2006 +0100 ole: Initialise hrref so as not to display garbage in the trace. --- dlls/ole32/marshal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 313cbd2..ef3df6e 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -421,7 +421,7 @@ static HRESULT ifproxy_get_public_ref(st hr = proxy_manager_get_remunknown(This->parent, &remunk); if (hr == S_OK) { - HRESULT hrref; + HRESULT hrref = S_OK; REMINTERFACEREF rif; rif.ipid = This->stdobjref.ipid; rif.cPublicRefs = NORMALEXTREFS;

1 0

Robert Shearman : ole: Remove some duplicated code.
by Alexandre Julliard 11 Jan '06

11 Jan '06

Module: wine Branch: refs/heads/master Commit: 92ad2958ac939623f67e3e5a0d514b78b081e164 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=92ad2958ac939623f67e3e5… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jan 11 12:09:11 2006 +0100 ole: Remove some duplicated code. --- dlls/ole32/defaulthandler.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 7f742bc..e2eaf58 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -654,9 +654,6 @@ static HRESULT WINAPI DefaultHandler_Get if (This->pOleDelegate) return IOleObject_GetUserClassID(This->pOleDelegate, pClsid); - if (This->pOleDelegate) - return IOleObject_GetUserClassID(This->pOleDelegate, pClsid); - /* Sanity check. */ if (!pClsid) return E_POINTER; @@ -868,9 +865,6 @@ static HRESULT WINAPI DefaultHandler_Get if (This->pOleDelegate) return IOleObject_GetMiscStatus(This->pOleDelegate, dwAspect, pdwStatus); - if (This->pOleDelegate) - return IOleObject_GetMiscStatus(This->pOleDelegate, dwAspect, pdwStatus); - hres = OleRegGetMiscStatus(&This->clsid, dwAspect, pdwStatus); if (FAILED(hres))

1 0

Rein Klazes : hhctrl.ocx: Report commands in HtmlHelp that are not handled at all.
by Alexandre Julliard 10 Jan '06

10 Jan '06

Module: wine Branch: refs/heads/master Commit: fe57d732492eed1c949d3ddd38d58f12e6ee0973 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fe57d732492eed1c949d3dd… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Tue Jan 10 20:23:56 2006 +0100 hhctrl.ocx: Report commands in HtmlHelp that are not handled at all. --- dlls/hhctrl.ocx/hhctrl.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 7eebbae..88c6bde 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -97,6 +97,8 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWS FIXME("Not all HH cases handled correctly\n"); doWinMain(GetModuleHandleW(NULL), file); break; + default: + FIXME("HH case %s not handled.\n", command_to_string( command )); } HeapFree(GetProcessHeap(), 0, file); return 0;

1 0