February 2008 - Wine-commits

Detlef Riekenberg : url: Add a stub for AddMIMEFileTypesPS.
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: 8776e5deaa48fec903ff542b5f19e82899aa5f83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8776e5deaa48fec903ff542b5… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Feb 5 23:18:16 2008 +0100 url: Add a stub for AddMIMEFileTypesPS. --- dlls/url/url.spec | 2 +- dlls/url/url_main.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/url/url.spec b/dlls/url/url.spec index 4577a6d..cedd9e4 100644 --- a/dlls/url/url.spec +++ b/dlls/url/url.spec @@ -1,4 +1,4 @@ -@ stub AddMIMEFileTypesPS +@ stdcall AddMIMEFileTypesPS(ptr ptr) @ stub AutodialHookCallback @ stub DllCanUnloadNow @ stub DllGetClassObject diff --git a/dlls/url/url_main.c b/dlls/url/url_main.c index d7e1711..69b46ea 100644 --- a/dlls/url/url_main.c +++ b/dlls/url/url_main.c @@ -24,6 +24,9 @@ #include "shellapi.h" #include "shlwapi.h" #include "intshcut.h" +#include "winuser.h" +#include "commctrl.h" +#include "prsht.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(url); @@ -45,6 +48,25 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) } /*********************************************************************** + * AddMIMEFileTypesPS (URL.@) + * + * Build and Manage a Filetype-Association Property Sheet + * + * PARAMS + * unknown1 [I] Pointer to an Read-Only Area + * lppsh [I] PTR to the target PropertySheetHeader (ANSI) + * + * RETURNS + * Success: 0 + * + */ +DWORD WINAPI AddMIMEFileTypesPS(VOID * unknown1, LPPROPSHEETHEADERA lppsh) +{ + FIXME("(%p, %p): stub!\n", unknown1, lppsh); + return 0; +} + +/*********************************************************************** * InetIsOffline (URL.@) * */

1 0

Andrey Esin : cmd: Additions to Russian translation.
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: 001e711b530083073b4a4f19f04c91c191cabf74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=001e711b530083073b4a4f19f… Author: Andrey Esin <andrey(a)esin.name> Date: Tue Feb 5 23:13:45 2008 +0300 cmd: Additions to Russian translation. --- programs/cmd/Ru.rc | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/cmd/Ru.rc b/programs/cmd/Ru.rc index 7e08480..acc8394 100644 --- a/programs/cmd/Ru.rc +++ b/programs/cmd/Ru.rc @@ -202,10 +202,10 @@ VERIFY �� : ON �� OFF.\n\ WCMD_VOL, "�� VOL\n" - WCMD_PUSHD, "PUSHD <directoryname> saves the current directory onto a\n\ -stack, and then changes the current directory to the supplied one.\n" + WCMD_PUSHD, "PUSHD <directoryname> �� ,\n\ +� �� .\n" - WCMD_POPD, "POPD changes current directory to the last one saved with\n\ + WCMD_POPD, "POPD �� , �� \n\ PUSHD.\n" WCMD_MORE, "MORE displays output of files or piped input in pages.\n" @@ -225,13 +225,13 @@ DATE\t\t�� \n\ DEL (ERASE)\t�� \n\ DIR\t\t�� \n\ ECHO\t\t�� \n\ -HELP\t\t�� \n\ +HELP\t\t�� \n\ MD (MKDIR)\t�� \n\ -MORE\t\tDisplay output in pages\n\ +MORE\t\t�� \n\ MOVE\t\t�� , �� \n\ PATH\t\t�� \n\ -POPD\t\tRestores the directory to the last one saved with PUSHD\n\ -PUSHD\t\tChanges to a new directory, saving the current one\n\ +POPD\t\t�� , �� PUSHD\n\ +PUSHD\t\t�� \n\ PROMPT\t\t�� \n\ REN (RENAME)\t�� \n\ RD (RMDIR)\t�� \n\ @@ -277,5 +277,5 @@ EXIT\t\t�� CMD\n\n\ WCMD_ANYKEY,"�� : " WCMD_CONSTITLE,"�� Wine" WCMD_VERSION,"�� CMD %s\n\n" - WCMD_MOREPROMPT, "More? " + WCMD_MOREPROMPT, "��? " }

1 0

Bang Jun-young : comctl32: Fix invalid syntax.
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: c5083961b3211a7ee72d064a43be0211789f0481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5083961b3211a7ee72d064a4… Author: Bang Jun-young <junyoung(a)mogua.com> Date: Sun Feb 3 17:09:02 2008 +0900 comctl32: Fix invalid syntax. --- dlls/comctl32/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 3c74033..16bf38a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7763,7 +7763,7 @@ static BOOL LISTVIEW_DrawTrackLine(const LISTVIEW_INFO *infoPtr) * RETURN: * None. */ -static CALLBACK VOID LISTVIEW_DelayedEditItem(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) +static VOID CALLBACK LISTVIEW_DelayedEditItem(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) { DELAYED_ITEM_EDIT *editItem = (DELAYED_ITEM_EDIT *)idEvent; LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongPtrW(hwnd, 0);

1 0

Christopher Harvey : winex11: Added WGL_BIND_TO_TEXTURE_DEPTH_NV to ConvertAttribWGLtoGLX.
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: 210363e4646e1b9b5cc34547aa08e2634a93cc32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=210363e4646e1b9b5cc34547a… Author: Christopher Harvey <arbuckle911(a)gmail.com> Date: Tue Feb 5 17:09:09 2008 -0500 winex11: Added WGL_BIND_TO_TEXTURE_DEPTH_NV to ConvertAttribWGLtoGLX. --- dlls/winex11.drv/opengl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index d297002..3531918 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -758,6 +758,7 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf nvfloatattrib = iWGLAttr[++cur]; TRACE("pAttr[%d] = WGL_FLOAT_COMPONENTS_NV: %x\n", cur, nvfloatattrib); break ; + case WGL_BIND_TO_TEXTURE_DEPTH_NV: case WGL_BIND_TO_TEXTURE_RGB_ARB: case WGL_BIND_TO_TEXTURE_RGBA_ARB: case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV: @@ -1692,7 +1693,7 @@ BOOL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) { if (!has_opengl()) { ERR("No libGL on this box - disabling OpenGL support !\n"); - return 0; + return FALSE; } wine_tsx11_lock();

1 0

Alexander Nicolaysen Sørnes : shell32: Use LocalFree in CommandLineToArgvW.
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: 0f0678aa6047747cb7be9c55c74a377520d11994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f0678aa6047747cb7be9c55c… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jan 29 22:04:25 2008 +0100 shell32: Use LocalFree in CommandLineToArgvW. --- dlls/shell32/shell32_main.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 37694ba..a64381f 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -97,20 +97,20 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) /* Return the path to the executable */ DWORD len, size=16; - hargv=GlobalAlloc(0, size); - argv=GlobalLock(hargv); + hargv=LocalAlloc(0, size); + argv=LocalLock(hargv); for (;;) { len = GetModuleFileNameW(0, (LPWSTR)(argv+1), (size-sizeof(LPWSTR))/sizeof(WCHAR)); if (!len) { - GlobalFree(hargv); + LocalFree(hargv); return NULL; } if (len < size) break; size*=2; - hargv=GlobalReAlloc(hargv, size, 0); - argv=GlobalLock(hargv); + hargv=LocalReAlloc(hargv, size, 0); + argv=LocalLock(hargv); } argv[0]=(LPWSTR)(argv+1); if (numargs)

1 0

Eric Pouech : dbghelp: Disable the S_PUB_FUNC_XXX msc symbols until we know what they do ( the first guess is wrong anyway).
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: 62634b802523fa967a9584a851d13da9abc59e0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=62634b802523fa967a9584a85… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Feb 6 21:56:18 2008 +0100 dbghelp: Disable the S_PUB_FUNC_XXX msc symbols until we know what they do (the first guess is wrong anyway). --- dlls/dbghelp/msc.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 242fa93..af09f1f 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1719,6 +1719,8 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root break; case S_PUB_FUNC1_V3: case S_PUB_FUNC2_V3: /* using a data_v3 isn't what we'd expect */ +#if 0 + /* FIXME: this is plain wrong (from a simple test) */ if (!(dbghelp_options & SYMOPT_NO_PUBLICS)) { symt_new_public(msc_dbg->module, compiland, @@ -1726,6 +1728,7 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root codeview_get_address(msc_dbg, sym->data_v3.segment, sym->data_v3.offset), 1, TRUE /* FIXME */, TRUE); } +#endif break; case S_MSTOOL_V3: /* just to silence a few warnings */

1 0

Lei Zhang : comctl32: Use wine_dbgstr_rect() in traces.
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: 398040123177368fc37dd20345dd3888a29a5b93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=398040123177368fc37dd2034… Author: Lei Zhang <thestig(a)google.com> Date: Thu Jan 24 15:06:37 2008 -0800 comctl32: Use wine_dbgstr_rect() in traces. --- dlls/comctl32/comboex.c | 74 ++++++++++++++++++-------------------------- dlls/comctl32/monthcal.c | 2 +- dlls/comctl32/pager.c | 5 +-- dlls/comctl32/propsheet.c | 15 +++----- dlls/comctl32/rebar.c | 75 +++++++++++++++++---------------------------- dlls/comctl32/status.c | 8 ++-- dlls/comctl32/tab.c | 70 +++++++++++++++--------------------------- dlls/comctl32/toolbar.c | 19 ++++------- dlls/comctl32/trackbar.c | 3 +- dlls/comctl32/treeview.c | 8 ++--- 10 files changed, 107 insertions(+), 172 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=398040123177368fc37dd…

1 0

Lei Zhang : user32: Use wine_dbgstr_rect() in traces.
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: 6c1cdc71869ba175e30730ebbc6a86cef5ff89d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c1cdc71869ba175e30730ebb… Author: Lei Zhang <thestig(a)google.com> Date: Thu Jan 24 14:18:36 2008 -0800 user32: Use wine_dbgstr_rect() in traces. --- dlls/user32/combo.c | 9 +++------ dlls/user32/defwnd.c | 4 ++-- dlls/user32/listbox.c | 8 ++++---- dlls/user32/nonclient.c | 10 +++------- dlls/user32/painting.c | 5 ++--- dlls/user32/spy.c | 16 ++++++---------- dlls/user32/uitools.c | 3 +-- dlls/user32/winpos.c | 3 +-- 8 files changed, 22 insertions(+), 36 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index c39d08b..cd78891 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -435,14 +435,11 @@ static void CBCalcPlacement( if (lprEdit->right < lprEdit->left) lprEdit->right = lprEdit->left; - TRACE("\ttext\t= (%d,%d-%d,%d)\n", - lprEdit->left, lprEdit->top, lprEdit->right, lprEdit->bottom); + TRACE("\ttext\t= (%s)\n", wine_dbgstr_rect(lprEdit)); - TRACE("\tbutton\t= (%d,%d-%d,%d)\n", - lprButton->left, lprButton->top, lprButton->right, lprButton->bottom); + TRACE("\tbutton\t= (%s)\n", wine_dbgstr_rect(lprButton)); - TRACE("\tlbox\t= (%d,%d-%d,%d)\n", - lprLB->left, lprLB->top, lprLB->right, lprLB->bottom ); + TRACE("\tlbox\t= (%s)\n", wine_dbgstr_rect(lprLB)); } /*********************************************************************** diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 2bde5ad..53caf12 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -421,8 +421,8 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa GetClientRect( hwnd, &rc ); x = (rc.right - rc.left - GetSystemMetrics(SM_CXICON))/2; y = (rc.bottom - rc.top - GetSystemMetrics(SM_CYICON))/2; - TRACE("Painting class icon: vis rect=(%d,%d - %d,%d)\n", - ps.rcPaint.left, ps.rcPaint.top, ps.rcPaint.right, ps.rcPaint.bottom ); + TRACE("Painting class icon: vis rect=(%s)\n", + wine_dbgstr_rect(&ps.rcPaint)); DrawIcon( hdc, x, y, hIcon ); } EndPaint( hwnd, &ps ); diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index d819684..7232644 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -581,9 +581,9 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, if (!IsWindowEnabled(descr->self)) dis.itemState |= ODS_DISABLED; dis.itemData = item->data; dis.rcItem = *rect; - TRACE("[%p]: drawitem %d (%s) action=%02x state=%02x rect=%d,%d-%d,%d\n", + TRACE("[%p]: drawitem %d (%s) action=%02x state=%02x rect=%s\n", descr->self, index, item ? debugstr_w(item->str) : "", action, - dis.itemState, rect->left, rect->top, rect->right, rect->bottom ); + dis.itemState, wine_dbgstr_rect(rect) ); SendMessageW(descr->owner, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); } else @@ -601,9 +601,9 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, oldText = SetTextColor( hdc, GetSysColor(COLOR_HIGHLIGHTTEXT)); } - TRACE("[%p]: painting %d (%s) action=%02x rect=%d,%d-%d,%d\n", + TRACE("[%p]: painting %d (%s) action=%02x rect=%s\n", descr->self, index, item ? debugstr_w(item->str) : "", action, - rect->left, rect->top, rect->right, rect->bottom ); + wine_dbgstr_rect(rect) ); if (!item) ExtTextOutW( hdc, rect->left + 1, rect->top, ETO_OPAQUE | ETO_CLIPPED, rect, NULL, 0, NULL ); diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 58671c5..503f7c1 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -396,9 +396,7 @@ BOOL WINAPI AdjustWindowRectEx( LPRECT rect, DWORD style, BOOL menu, DWORD exSty WS_EX_STATICEDGE | WS_EX_TOOLWINDOW); if (exStyle & WS_EX_DLGMODALFRAME) style &= ~WS_THICKFRAME; - TRACE("(%d,%d)-(%d,%d) %08x %d %08x\n", - rect->left, rect->top, rect->right, rect->bottom, - style, menu, exStyle ); + TRACE("(%s) %08x %d %08x\n", wine_dbgstr_rect(rect), style, menu, exStyle ); NC_AdjustRectOuter( rect, style, menu, exStyle ); NC_AdjustRectInner( rect, style, exStyle ); @@ -1065,14 +1063,12 @@ static void NC_DoNCPaint( HWND hwnd, HRGN clip, BOOL suppress_menupaint ) RECT r = rect; r.bottom = rect.top + GetSystemMetrics(SM_CYMENU); - TRACE("Calling DrawMenuBar with rect (%d, %d)-(%d, %d)\n", - r.left, r.top, r.right, r.bottom); + TRACE("Calling DrawMenuBar with rect (%s)\n", wine_dbgstr_rect(&r)); rect.top += MENU_DrawMenuBar( hdc, &r, hwnd, suppress_menupaint ) + 1; } - TRACE("After MenuBar, rect is (%d, %d)-(%d, %d).\n", - rect.left, rect.top, rect.right, rect.bottom ); + TRACE("After MenuBar, rect is (%s).\n", wine_dbgstr_rect(&rect)); if (dwExStyle & WS_EX_CLIENTEDGE) DrawEdge (hdc, &rect, EDGE_SUNKEN, BF_RECT | BF_ADJUST); diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 9ba4a7a..93fe97c 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -444,9 +444,8 @@ HDC WINAPI BeginPaint( HWND hwnd, PAINTSTRUCT *lps ) lps->fErase = send_erase( hwnd, flags, hrgn, &lps->rcPaint, &lps->hdc ); - TRACE("hdc = %p box = (%d,%d - %d,%d), fErase = %d\n", - lps->hdc, lps->rcPaint.left, lps->rcPaint.top, lps->rcPaint.right, lps->rcPaint.bottom, - lps->fErase); + TRACE("hdc = %p box = (%s), fErase = %d\n", + lps->hdc, wine_dbgstr_rect(&lps->rcPaint), lps->fErase); return lps->hdc; } diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 22a4d5c..b0a93ba 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -2321,10 +2321,8 @@ static void SPY_DumpStructure(const SPY_INSTANCE *sp_e, BOOL enter) case LVM_GETSUBITEMRECT: { LPRECT rc = (LPRECT) sp_e->lParam; - if (rc) { - TRACE("lParam rect (%d,%d)-(%d,%d)\n", - rc->left, rc->top, rc->right, rc->bottom); - } + if (rc) + TRACE("lParam rect (%s)\n", wine_dbgstr_rect(rc)); break; } case LVM_SETITEMPOSITION32: @@ -2404,10 +2402,9 @@ static void SPY_DumpStructure(const SPY_INSTANCE *sp_e, BOOL enter) lpdis->CtlType, lpdis->CtlID); TRACE("itemID=0x%08x itemAction=0x%08x itemState=0x%08x\n", lpdis->itemID, lpdis->itemAction, lpdis->itemState); - TRACE("hWnd=%p hDC=%p (%d,%d)-(%d,%d) itemData=0x%08lx\n", - lpdis->hwndItem, lpdis->hDC, lpdis->rcItem.left, - lpdis->rcItem.top, lpdis->rcItem.right, - lpdis->rcItem.bottom, lpdis->itemData); + TRACE("hWnd=%p hDC=%p (%s) itemData=0x%08lx\n", + lpdis->hwndItem, lpdis->hDC, + wine_dbgstr_rect(&lpdis->rcItem), lpdis->itemData); } break; case WM_MEASUREITEM: @@ -2463,8 +2460,7 @@ static void SPY_DumpStructure(const SPY_INSTANCE *sp_e, BOOL enter) case WM_NCCALCSIZE: { RECT *rc = (RECT *)sp_e->lParam; - TRACE("Rect (%d,%d)-(%d,%d)\n", - rc->left, rc->top, rc->right, rc->bottom); + TRACE("Rect (%s)\n", wine_dbgstr_rect(rc)); } break; case WM_NOTIFY: diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index b2e1239..9e2c106 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -576,8 +576,7 @@ static BOOL UITOOLS95_DrawRectEdge(HDC hdc, LPRECT rc, */ BOOL WINAPI DrawEdge( HDC hdc, LPRECT rc, UINT edge, UINT flags ) { - TRACE("%p %d,%d-%d,%d %04x %04x\n", - hdc, rc->left, rc->top, rc->right, rc->bottom, edge, flags ); + TRACE("%p %s %04x %04x\n", hdc, wine_dbgstr_rect(rc), edge, flags ); if(flags & BF_DIAGONAL) return UITOOLS95_DrawDiagEdge(hdc, rc, edge, flags); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 1eb15d6..40ff927 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -170,8 +170,7 @@ BOOL WINAPI GetWindowRect( HWND hwnd, LPRECT rect ) if (ret) { MapWindowPoints( GetAncestor( hwnd, GA_PARENT ), 0, (POINT *)rect, 2 ); - TRACE( "hwnd %p (%d,%d)-(%d,%d)\n", - hwnd, rect->left, rect->top, rect->right, rect->bottom); + TRACE( "hwnd %p (%s)\n", hwnd, wine_dbgstr_rect(rect) ); } return ret; }

1 0

Lars-Ake Fredlund : winex11: Don' t create a mapping if X11DRV_PALETTE_VIRTUAL is set.
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: c4041ae81534253d4b5a935619e47891a98b7273 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4041ae81534253d4b5a93561… Author: Lars-Ake Fredlund <fred(a)babel.ls.fi.upm.es> Date: Wed Jan 30 13:23:28 2008 +0100 winex11: Don't create a mapping if X11DRV_PALETTE_VIRTUAL is set. --- dlls/winex11.drv/palette.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index a2a4046..1b74e2c 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -251,15 +251,15 @@ int X11DRV_PALETTE_Init(void) GetPaletteEntries( GetStockObject(DEFAULT_PALETTE), 0, NB_RESERVED_COLORS, sys_pal_template ); - if ((mapping = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(int) * NB_RESERVED_COLORS ))) - palette_set_mapping( GetStockObject(DEFAULT_PALETTE), mapping ); - if( X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_VIRTUAL ) { palette_size = 0; } else { + if ((mapping = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(int) * NB_RESERVED_COLORS ))) + palette_set_mapping( GetStockObject(DEFAULT_PALETTE), mapping ); + if (X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_PRIVATE) X11DRV_PALETTE_BuildPrivateMap( sys_pal_template ); else

1 0

Detlef Riekenberg : gdi32: Add stub for GdiInitSpool and GdiGetSpoolMessage .
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: cbb85daa8fead5dd6f161d54c6a79b850d59d961 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbb85daa8fead5dd6f161d54c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Feb 1 16:13:57 2008 +0100 gdi32: Add stub for GdiInitSpool and GdiGetSpoolMessage. --- dlls/gdi32/gdi32.spec | 4 ++-- dlls/gdi32/printdrv.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 2e79346..1a41c20 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -189,9 +189,9 @@ # @ stub GdiGetPageCount # @ stub GdiGetPageHandle # @ stub GdiGetSpoolFileHandle -# @ stub GdiGetSpoolMessage +@ stdcall GdiGetSpoolMessage(ptr long ptr long) @ stdcall GdiGradientFill(long ptr long ptr long long) -# @ stub GdiInitSpool +@ stdcall GdiInitSpool() # @ stub GdiInitializeLanguagePack @ stdcall GdiIsMetaFileDC(long) @ stdcall GdiIsMetaPrintDC(long) diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c index 5bfabb9..8524388 100644 --- a/dlls/gdi32/printdrv.c +++ b/dlls/gdi32/printdrv.c @@ -57,6 +57,28 @@ static const char DefaultDevMode[] = "Default DevMode"; static const char PrinterDriverData[] = "PrinterDriverData"; static const char Printers[] = "System\\CurrentControlSet\\Control\\Print\\Printers\\"; +/****************************************************************** + * GdiGetSpoolMessage [GDI32.@] + * + */ +DWORD WINAPI GdiGetSpoolMessage(LPVOID ptr1, DWORD data2, LPVOID ptr3, DWORD data4) +{ + TRACE("(%p 0x%x %p 0x%x) stub\n", ptr1, data2, ptr3, data4); + /* avoid 100% cpu usage with spoolsv.exe from w2k + (spoolsv.exe from xp does Sleep 1000/1500/2000 in a loop) */ + Sleep(500); + return 0; +} + +/****************************************************************** + * GdiInitSpool [GDI32.@] + * + */ +DWORD WINAPI GdiInitSpool(void) +{ + FIXME("stub\n"); + return TRUE; +} /****************************************************************** * StartDocA [GDI32.@]

1 0