October 2012 - Wine-commits

Jason Edmeades : cmd: Convert wcmd_for to use WCMD_parameter.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 8fbd65358e0ca6cd4a09a0d1fa6e6716a38db04d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fbd65358e0ca6cd4a09a0d1f… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Wed Sep 26 14:37:56 2012 +0100 cmd: Convert wcmd_for to use WCMD_parameter. --- programs/cmd/builtins.c | 55 ++++++++++++----------------- programs/cmd/tests/test_builtins.cmd.exp | 4 +- 2 files changed, 25 insertions(+), 34 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 57ac339..e54c444 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1080,7 +1080,6 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { WCHAR *firstCmd; int thisDepth; - WCHAR *curPos = p; BOOL expandDirs = FALSE; BOOL useNumbers = FALSE; BOOL doFileset = FALSE; @@ -1088,33 +1087,34 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { LONG numbers[3] = {0,0,0}; /* Defaults to 0 in native */ int itemNum; CMD_LIST *thisCmdStart; - + int parameterNo = 0; /* Handle optional qualifiers (multiple are allowed) */ - while (*curPos && *curPos == '/') { - WINE_TRACE("Processing qualifier at %s\n", wine_dbgstr_w(curPos)); - curPos++; - switch (toupperW(*curPos)) { - case 'D': curPos++; expandDirs = TRUE; break; - case 'L': curPos++; useNumbers = TRUE; break; + WCHAR *thisArg = WCMD_parameter(p, parameterNo++, NULL, NULL, FALSE); + while (thisArg && *thisArg == '/') { + WINE_TRACE("Processing qualifier at %s\n", wine_dbgstr_w(thisArg)); + thisArg++; + switch (toupperW(*thisArg)) { + case 'D': expandDirs = TRUE; break; + case 'L': useNumbers = TRUE; break; /* Recursive is special case - /R can have an optional path following it */ /* filenamesets are another special case - /F can have an optional options following it */ case 'R': case 'F': { - BOOL isRecursive = (*curPos == 'R'); + BOOL isRecursive = (*thisArg == 'R'); if (!isRecursive) doFileset = TRUE; - /* Skip whitespace */ - curPos++; - while (*curPos && (*curPos==' ' || *curPos=='\t')) curPos++; + /* Retrieve next parameter to see if is path/options */ + thisArg = WCMD_parameter(p, parameterNo, NULL, NULL, !isRecursive); /* Next parm is either qualifier, path/options or variable - only care about it if it is the path/options */ - if (*curPos && *curPos != '/' && *curPos != '%') { + if (thisArg && *thisArg != '/' && *thisArg != '%') { + parameterNo++; if (isRecursive) WINE_FIXME("/R needs to handle supplied root\n"); else { static unsigned int once; @@ -1124,38 +1124,29 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { break; } default: - WINE_FIXME("for qualifier '%c' unhandled\n", *curPos); - curPos++; + WINE_FIXME("for qualifier '%c' unhandled\n", *thisArg); } - /* Skip whitespace between qualifiers */ - while (*curPos && (*curPos==' ' || *curPos=='\t')) curPos++; + /* Step to next token */ + thisArg = WCMD_parameter(p, parameterNo++, NULL, NULL, FALSE); } - /* Skip whitespace before variable */ - while (*curPos && (*curPos==' ' || *curPos=='\t')) curPos++; - /* Ensure line continues with variable */ - if (!*curPos || *curPos != '%') { + if (!*thisArg || *thisArg != '%') { WCMD_output_stderr (WCMD_LoadMessage(WCMD_SYNTAXERR)); return; } /* Variable should follow */ - i = 0; - while (curPos[i] && curPos[i]!=' ' && curPos[i]!='\t') i++; - memcpy(&variable[0], curPos, i*sizeof(WCHAR)); - variable[i] = 0x00; + strcpyW(variable, thisArg); WINE_TRACE("Variable identified as %s\n", wine_dbgstr_w(variable)); - curPos = &curPos[i]; - - /* Skip whitespace before IN */ - while (*curPos && (*curPos==' ' || *curPos=='\t')) curPos++; /* Ensure line continues with IN */ - if (!*curPos - || !WCMD_keyword_ws_found(inW, sizeof(inW)/sizeof(inW[0]), curPos)) { - + thisArg = WCMD_parameter(p, parameterNo++, NULL, NULL, FALSE); + if (!thisArg + || !(CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, + thisArg, sizeof(inW)/sizeof(inW[0]), inW, + sizeof(inW)/sizeof(inW[0])) == CSTR_EQUAL)) { WCMD_output_stderr (WCMD_LoadMessage(WCMD_SYNTAXERR)); return; } diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 57bc82a..21440b5 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -630,7 +630,7 @@ c ------ eol option @todo_wine(a)ad @todo_wine(a)z@y -(a)todo_wine@a|d +a|d @todo_wine(a)no output @todo_wine(a)no output ------ delims option @@ -639,7 +639,7 @@ c @todo_wine(a)a d @todo_wine(a)a @todo_wine(a)C r -(a)todo_wine@foo bar baz +foo bar baz @todo_wine(a)c:\ ------ skip option @todo_wine(a)c

1 0

Jason Edmeades : cmd: Add full for /R support.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 9dde62cb96b8f423f8cfe4f095eb10ec65ea7d72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dde62cb96b8f423f8cfe4f09… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Thu Sep 27 19:58:56 2012 +0100 cmd: Add full for /R support. --- programs/cmd/builtins.c | 430 ++++++++++++++++++------------ programs/cmd/tests/test_builtins.cmd | 123 +++++++++ programs/cmd/tests/test_builtins.cmd.exp | 10 + 3 files changed, 397 insertions(+), 166 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9dde62cb96b8f423f8cfe…

1 0

Oleg Bosis : wined3d: Add correct detection of GeForce GT 650M video card.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 81525453f116abbdc368686280ab3b6200d311cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=81525453f116abbdc36868628… Author: Oleg Bosis <olelukoie(a)mail.ru> Date: Sun Sep 30 14:07:21 2012 +0400 wined3d: Add correct detection of GeForce GT 650M video card. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 48a6ef4..1120a9e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1110,6 +1110,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX570, "NVIDIA GeForce GTX 570", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX580, "NVIDIA GeForce GTX 580", DRIVER_NVIDIA_GEFORCE6, 1536}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT630M, "NVIDIA GeForce GT 630M", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT650M, "NVIDIA GeForce GT 650M", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE6, 2048}, @@ -1510,6 +1511,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl { {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ + {"GT 650M", CARD_NVIDIA_GEFORCE_GT650M}, /* Geforce 600 - midend mobile */ {"GT 630M", CARD_NVIDIA_GEFORCE_GT630M}, /* Geforce 600 - midend mobile */ {"GTX 580", CARD_NVIDIA_GEFORCE_GTX580}, /* Geforce 500 - highend */ {"GTX 570", CARD_NVIDIA_GEFORCE_GTX570}, /* Geforce 500 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b5fd4f0..6db495f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1409,6 +1409,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX570 = 0x1081, CARD_NVIDIA_GEFORCE_GTX580 = 0x1080, CARD_NVIDIA_GEFORCE_GT630M = 0x0de9, + CARD_NVIDIA_GEFORCE_GT650M = 0x0fd1, CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180,

1 0

Alexandre Julliard : user32: Create a dummy window surface for windows that shouldn't be painted to.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 72337011db113386ac293ca70768c5a467539cb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72337011db113386ac293ca70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 1 13:08:51 2012 +0200 user32: Create a dummy window surface for windows that shouldn't be painted to. --- dlls/user32/painting.c | 5 +--- dlls/user32/win.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/user32/win.h | 1 + 3 files changed, 65 insertions(+), 6 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 1a6de87..2a634fb 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -191,12 +191,9 @@ static void reset_dce_attrs( struct dce *dce ) */ static void release_dce( struct dce *dce ) { - RECT vis_rect; - if (!dce->hwnd) return; /* already released */ - vis_rect = get_virtual_screen_rect(); - __wine_set_visible_region( dce->hdc, 0, &vis_rect, &vis_rect, NULL ); + __wine_set_visible_region( dce->hdc, 0, &dummy_surface.rect, &dummy_surface.rect, &dummy_surface ); USER_Driver->pReleaseDC( dce->hwnd, dce->hdc ); if (dce->clip_rgn) DeleteObject( dce->clip_rgn ); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 8818868..0faf02d 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -487,6 +487,67 @@ BOOL is_desktop_window( HWND hwnd ) /******************************************************************* + * Dummy window surface for windows that shouldn't get painted. + */ + +static void dummy_surface_lock( struct window_surface *window_surface ) +{ + /* nothing to do */ +} + +static void dummy_surface_unlock( struct window_surface *window_surface ) +{ + /* nothing to do */ +} + +static void *dummy_surface_get_bitmap_info( struct window_surface *window_surface, BITMAPINFO *info ) +{ + static DWORD dummy_data; + + info->bmiHeader.biSize = sizeof( info->bmiHeader ); + info->bmiHeader.biWidth = dummy_surface.rect.right; + info->bmiHeader.biHeight = dummy_surface.rect.bottom; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = 32; + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biSizeImage = 0; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + return &dummy_data; +} + +static RECT *dummy_surface_get_bounds( struct window_surface *window_surface ) +{ + static RECT dummy_bounds; + return &dummy_bounds; +} + +static void dummy_surface_flush( struct window_surface *window_surface ) +{ + /* nothing to do */ +} + +static void dummy_surface_destroy( struct window_surface *window_surface ) +{ + /* nothing to do */ +} + +static const struct window_surface_funcs dummy_surface_funcs = +{ + dummy_surface_lock, + dummy_surface_unlock, + dummy_surface_get_bitmap_info, + dummy_surface_get_bounds, + dummy_surface_flush, + dummy_surface_destroy +}; + +struct window_surface dummy_surface = { &dummy_surface_funcs, { NULL, NULL }, 1, { 0, 0, 1, 1 } }; + + +/******************************************************************* * register_window_surface * * Register a window surface in the global list, possibly replacing another one. @@ -495,8 +556,8 @@ void register_window_surface( struct window_surface *old, struct window_surface { if (old == new) return; EnterCriticalSection( &surfaces_section ); - if (old) list_remove( &old->entry ); - if (new) list_add_tail( &window_surfaces, &new->entry ); + if (old && old != &dummy_surface) list_remove( &old->entry ); + if (new && new != &dummy_surface) list_add_tail( &window_surfaces, &new->entry ); LeaveCriticalSection( &surfaces_section ); } diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 4bbe7ae..b35fc00 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -80,6 +80,7 @@ typedef struct tagWND /* Window functions */ extern HWND get_hwnd_message_parent(void) DECLSPEC_HIDDEN; extern BOOL is_desktop_window( HWND hwnd ) DECLSPEC_HIDDEN; +extern struct window_surface dummy_surface DECLSPEC_HIDDEN; extern void register_window_surface( struct window_surface *old, struct window_surface *new ) DECLSPEC_HIDDEN; extern void flush_window_surfaces( BOOL idle ) DECLSPEC_HIDDEN; extern WND *WIN_GetPtr( HWND hwnd ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : Mark all lexers as never-interactive.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 2763a983fe812a731d654195b76f0ab212bdd756 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2763a983fe812a731d654195b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 1 12:19:25 2012 +0200 Mark all lexers as never-interactive. --- dlls/d3dcompiler_43/asmshader.l | 2 +- dlls/d3dcompiler_43/hlsl.l | 2 +- dlls/msxml3/xslpattern.l | 2 +- programs/winedbg/debug.l | 2 +- programs/winhlp32/macro.lex.l | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/asmshader.l b/dlls/d3dcompiler_43/asmshader.l index 8b3bf49..35a4048 100644 --- a/dlls/d3dcompiler_43/asmshader.l +++ b/dlls/d3dcompiler_43/asmshader.l @@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(asmshader); %option noyywrap %option prefix="asmshader_" -%option noinput nounput +%option noinput nounput never-interactive /* Swizzles and writemasks consist of a dot and up to 4 x, y, z or w characters, * or up to 4 a, r, g, b characters. There are different rules for swizzles and diff --git a/dlls/d3dcompiler_43/hlsl.l b/dlls/d3dcompiler_43/hlsl.l index 1e3b4a9..49fb042 100644 --- a/dlls/d3dcompiler_43/hlsl.l +++ b/dlls/d3dcompiler_43/hlsl.l @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(hlsl_parser); %} -%option noyywrap nounput noinput +%option noyywrap nounput noinput never-interactive %option prefix="hlsl_" %x pp pp_line pp_pragma pp_ignore diff --git a/dlls/msxml3/xslpattern.l b/dlls/msxml3/xslpattern.l index eb84e40..bda3836 100644 --- a/dlls/msxml3/xslpattern.l +++ b/dlls/msxml3/xslpattern.l @@ -58,7 +58,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); %option reentrant bison-bridge %option noyywrap %option prefix="xslpattern_" -%option noinput nounput +%option noinput nounput never-interactive /* From the w3c XML standard * <http://www.w3.org/TR/REC-xml/> */ diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index 30c8aea..ab1f865 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -%option noinput nounput interactive 8bit prefix="dbg_" +%option noinput nounput never-interactive 8bit prefix="dbg_" %{ #include "config.h" diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l index abc04d3..4d679e1 100644 --- a/programs/winhlp32/macro.lex.l +++ b/programs/winhlp32/macro.lex.l @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ %} -%option noinput nounput interactive 8bit +%option noinput nounput never-interactive 8bit %x quote %{ #include "config.h"

1 0

Dmitry Timoshkov : ieframe: Recognize the CGID_ShellDocView command group.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 3dc0d93f4d9a53dcfbeeb0caa00fad9fda53361d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dc0d93f4d9a53dcfbeeb0caa… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 28 20:51:24 2012 +0900 ieframe: Recognize the CGID_ShellDocView command group. --- dlls/ieframe/dochost.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index d966ea0..0449f24 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -597,6 +597,14 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, } } + if(IsEqualGUID(pguidCmdGroup, &CGID_ShellDocView)) { + switch(nCmdID) { + default: + FIXME("Unimplemented cmdid %d of CGID_ShellDocView\n", nCmdID); + return E_NOTIMPL; + } + } + FIXME("Unimplemented cmdid %d of group %s\n", nCmdID, debugstr_guid(pguidCmdGroup)); return E_NOTIMPL; }

1 0

Daniel Jelinski : comctl32: Use GetWindowLong to check for scrollbar.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 0edb0233a46e7105cb8c88093ca07c741123c8c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0edb0233a46e7105cb8c88093… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri Sep 21 21:58:43 2012 +0200 comctl32: Use GetWindowLong to check for scrollbar. dwStyle is updated only in WM_STYLECHANGED, which is not sent when displaying and hiding scrollbars. --- 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 7a11557..0ef8bc4 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10878,7 +10878,7 @@ static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr) * The "2" is there to mimic the native control. I think it may be * related to either padding or edges. (GLA 7/2002) */ - if (!(infoPtr->dwStyle & WS_HSCROLL)) + if (!(GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE) & WS_HSCROLL)) infoPtr->rcList.bottom -= GetSystemMetrics(SM_CYHSCROLL); infoPtr->rcList.bottom = max (infoPtr->rcList.bottom - 2, 0); }

1 0

Daniel Jelinski : comctl32: Clean up listview resizing code.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: ae72b216416f3155ab1f3053bacae6d8b9a5ba4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae72b216416f3155ab1f3053b… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Sep 29 00:20:45 2012 +0200 comctl32: Clean up listview resizing code. --- dlls/comctl32/listview.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 0ef8bc4..2525dfe 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11619,9 +11619,6 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { if (notify_measureitem(infoPtr)) LISTVIEW_InvalidateList(infoPtr); } - - LISTVIEW_UpdateSize(infoPtr); - LISTVIEW_UpdateScroll(infoPtr); } return DefWindowProcW(hwnd, uMsg, wParam, lParam);

1 0

Marcus Meissner : wined3d: Move texture reference decrement to end of usage (Coverity).
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 8ec6ebe4fb3fbd30dca46c28c381209f711c89d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ec6ebe4fb3fbd30dca46c28c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Sep 29 11:14:54 2012 +0200 wined3d: Move texture reference decrement to end of usage (Coverity). --- dlls/wined3d/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6927f9f..fa35105 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3524,8 +3524,6 @@ HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device, { LONG bind_count = InterlockedDecrement(&prev->resource.bind_count); - wined3d_texture_decref(prev); - if (!texture && stage < gl_info->limits.texture_stages) { device_invalidate_state(device, STATE_TEXTURESTAGE(stage, WINED3D_TSS_COLOR_OP)); @@ -3549,6 +3547,8 @@ HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device, } } } + + wined3d_texture_decref(prev); } device_invalidate_state(device, STATE_SAMPLER(stage));

1 0

Christian Costa : ntoskrnl.exe: Add stub for MmMapLockedPagesSpecifyCache.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 59eaf2003b056700e54fbda850a2e63866ab4e56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59eaf2003b056700e54fbda85… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sat Sep 29 22:28:16 2012 +0200 ntoskrnl.exe: Add stub for MmMapLockedPagesSpecifyCache. --- dlls/ntoskrnl.exe/ntoskrnl.c | 13 +++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 20 +++++++++++++------- 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2de8f13..5303ce8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1445,6 +1445,19 @@ PVOID WINAPI MmMapIoSpace( PHYSICAL_ADDRESS PhysicalAddress, DWORD NumberOfBytes return NULL; } + +/*********************************************************************** + * MmMapLockedPagesSpecifyCache (NTOSKRNL.EXE.@) + */ +PVOID MmMapLockedPagesSpecifyCache(PMDLX MemoryDescriptorList, KPROCESSOR_MODE AccessMode, MEMORY_CACHING_TYPE CacheType, + PVOID BaseAddress, ULONG BugCheckOnFailure, MM_PAGE_PRIORITY Priority) +{ + FIXME("(%p, %u, %u, %p, %u, %u): stub\n", MemoryDescriptorList, AccessMode, CacheType, BaseAddress, BugCheckOnFailure, Priority); + + return NULL; +} + + /*********************************************************************** * MmPageEntireDriver (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 2201d06..561c8e1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -690,7 +690,7 @@ @ stub MmLockPagableSectionByHandle @ stdcall MmMapIoSpace(long long long long) @ stub MmMapLockedPages -@ stub MmMapLockedPagesSpecifyCache +@ stdcall MmMapLockedPagesSpecifyCache(ptr long long ptr long long) @ stub MmMapLockedPagesWithReservedMapping @ stub MmMapMemoryDumpMdl @ stub MmMapUserAddressesToPage diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index a868e88..183c950 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1051,15 +1051,21 @@ typedef struct _KUSER_SHARED_DATA { } KSHARED_USER_DATA, *PKSHARED_USER_DATA; typedef enum _MEMORY_CACHING_TYPE { - MmNonCached = 0, - MmCached = 1, - MmWriteCombined = 2, - MmHardwareCoherentCached = 3, - MmNonCachedUnordered = 4, - MmUSWCCached = 5, - MmMaximumCacheType = 6 + MmNonCached = 0, + MmCached = 1, + MmWriteCombined = 2, + MmHardwareCoherentCached = 3, + MmNonCachedUnordered = 4, + MmUSWCCached = 5, + MmMaximumCacheType = 6 } MEMORY_CACHING_TYPE; +typedef enum _MM_PAGE_PRIORITY { + LowPagePriority, + NormalPagePriority = 16, + HighPagePriority = 32 +} MM_PAGE_PRIORITY; + typedef enum _MM_SYSTEM_SIZE { MmSmallSystem,

1 0