May 2010 - Wine-Commits - list.winehq.org

Alexandre Julliard : comctl32: Store an alpha channel present flag for each image in an imagelist.
by Alexandre Julliard May 14, 2010

May 14, 2010

Module: wine Branch: master Commit: 33e7d0282b926106957c358e000fb566556ba5dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=33e7d0282b926106957c358e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 14 13:44:20 2010 +0200 comctl32: Store an alpha channel present flag for each image in an imagelist. --- dlls/comctl32/imagelist.c | 23 ++++++++++++++++++++++- dlls/comctl32/imagelist.h | 1 + 2 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 1eb3bc6..2083d39 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -207,6 +207,7 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, } else { + if (himl->has_alpha) himl->has_alpha[pos + n] = 1; StretchBlt( himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, hdc, n * width, 0, width, height, SRCCOPY ); } @@ -294,6 +295,18 @@ IMAGELIST_InternalExpandBitmaps(HIMAGELIST himl, INT nImageCount) himl->hbmMask = hbmNewBitmap; } + if (himl->has_alpha) + { + char *new_alpha = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, + himl->has_alpha, himl->cMaxImage ); + if (new_alpha) himl->has_alpha = new_alpha; + else + { + HeapFree( GetProcessHeap(), 0, himl->has_alpha ); + himl->has_alpha = NULL; + } + } + himl->cMaxImage = nNewCount; DeleteDC (hdcBitmap); @@ -728,6 +741,11 @@ ImageList_Create (INT cx, INT cy, UINT flags, else himl->hbmMask = 0; + if (himl->uBitsPixel == 32) + himl->has_alpha = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, himl->cMaxImage ); + else + himl->has_alpha = NULL; + /* create blending brushes */ hbmTemp = CreateBitmap (8, 8, 1, 1, aBitBlend25); himl->hbrBlend25 = CreatePatternBrush (hbmTemp); @@ -1430,7 +1448,7 @@ ImageList_Duplicate (HIMAGELIST himlSrc) } himlDst = ImageList_Create (himlSrc->cx, himlSrc->cy, himlSrc->flags, - himlSrc->cInitial, himlSrc->cGrow); + himlSrc->cCurImage, himlSrc->cGrow); if (himlDst) { @@ -1446,6 +1464,8 @@ ImageList_Duplicate (HIMAGELIST himlSrc) himlDst->cCurImage = himlSrc->cCurImage; himlDst->cMaxImage = himlSrc->cMaxImage; + if (himlSrc->has_alpha && himlDst->has_alpha) + memcpy( himlDst->has_alpha, himlSrc->has_alpha, himlDst->cCurImage ); } return himlDst; } @@ -3132,6 +3152,7 @@ static ULONG WINAPI ImageListImpl_Release(IImageList *iface) if (This->hbrBlend50) DeleteObject (This->hbrBlend50); This->lpVtbl = NULL; + HeapFree(GetProcessHeap(), 0, This->has_alpha); HeapFree(GetProcessHeap(), 0, This); } diff --git a/dlls/comctl32/imagelist.h b/dlls/comctl32/imagelist.h index a979ebf..f6f1d1b 100644 --- a/dlls/comctl32/imagelist.h +++ b/dlls/comctl32/imagelist.h @@ -53,6 +53,7 @@ struct _IMAGELIST HBRUSH hbrBlend50; INT cInitial; UINT uBitsPixel; + char *has_alpha; LONG ref; /* reference count */ };

1 0

Alexandre Julliard : comctl32: Make ImageList_AddMasked call ImageList_Add instead of duplicating the functionality .
by Alexandre Julliard May 14, 2010

May 14, 2010

Module: wine Branch: master Commit: f75c7b5f71e4154f98975078db01e01dbc11f624 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f75c7b5f71e4154f98975078d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 14 13:37:04 2010 +0200 comctl32: Make ImageList_AddMasked call ImageList_Add instead of duplicating the functionality. --- dlls/comctl32/imagelist.c | 36 +++++++----------------------------- 1 files changed, 7 insertions(+), 29 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index cf6fe97..d1bf7f6 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -335,12 +335,10 @@ INT WINAPI ImageList_AddMasked (HIMAGELIST himl, HBITMAP hBitmap, COLORREF clrMask) { HDC hdcMask, hdcBitmap; - INT i, nIndex, nImageCount; + INT ret; BITMAP bmp; - HBITMAP hOldBitmap; - HBITMAP hMaskBitmap=0; + HBITMAP hMaskBitmap; COLORREF bkColor; - POINT pt; TRACE("himl=%p hbitmap=%p clrmask=%x\n", himl, hBitmap, clrMask); if (!is_valid(himl)) @@ -349,18 +347,8 @@ ImageList_AddMasked (HIMAGELIST himl, HBITMAP hBitmap, COLORREF clrMask) if (!GetObjectW(hBitmap, sizeof(BITMAP), &bmp)) return -1; - if (himl->cx > 0) - nImageCount = bmp.bmWidth / himl->cx; - else - nImageCount = 0; - - IMAGELIST_InternalExpandBitmaps(himl, nImageCount); - - nIndex = himl->cCurImage; - himl->cCurImage += nImageCount; - hdcBitmap = CreateCompatibleDC(0); - hOldBitmap = SelectObject(hdcBitmap, hBitmap); + SelectObject(hdcBitmap, hBitmap); /* Create a temp Mask so we can remove the background of the Image */ hdcMask = CreateCompatibleDC(0); @@ -389,23 +377,13 @@ ImageList_AddMasked (HIMAGELIST himl, HBITMAP hBitmap, COLORREF clrMask) */ BitBlt(hdcBitmap, 0, 0, bmp.bmWidth, bmp.bmHeight, hdcMask, 0, 0, 0x220326); - /* Copy result to the imagelist */ - for (i=0; i<nImageCount; i++) - { - imagelist_point_from_index( himl, nIndex + i, &pt ); - BitBlt(himl->hdcImage, pt.x, pt.y, himl->cx, bmp.bmHeight, - hdcBitmap, i*himl->cx, 0, SRCCOPY); - BitBlt(himl->hdcMask, pt.x, pt.y, himl->cx, bmp.bmHeight, - hdcMask, i*himl->cx, 0, SRCCOPY); - } - - /* Clean up */ - SelectObject(hdcBitmap, hOldBitmap); DeleteDC(hdcBitmap); - DeleteObject(hMaskBitmap); DeleteDC(hdcMask); - return nIndex; + ret = ImageList_Add( himl, hBitmap, hMaskBitmap ); + + DeleteObject(hMaskBitmap); + return ret; }

1 0

Alexandre Julliard : comctl32: Also generate an alpha channel when replacing an image or icon in an imagelist .
by Alexandre Julliard May 14, 2010

May 14, 2010

Module: wine Branch: master Commit: 528722e4e16ec918d5daf3bee8bbb95fd35a7582 URL: http://source.winehq.org/git/wine.git/?a=commit;h=528722e4e16ec918d5daf3bee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 14 13:41:35 2010 +0200 comctl32: Also generate an alpha channel when replacing an image or icon in an imagelist. --- dlls/comctl32/imagelist.c | 35 +++++++++++++++++++++++++++-------- 1 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index acad6c2..1eb3bc6 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2305,7 +2305,6 @@ ImageList_Replace (HIMAGELIST himl, INT i, HBITMAP hbmImage, { HDC hdcImage; BITMAP bmp; - HBITMAP hOldBitmap; POINT pt; TRACE("%p %d %p %p\n", himl, i, hbmImage, hbmMask); @@ -2326,7 +2325,10 @@ ImageList_Replace (HIMAGELIST himl, INT i, HBITMAP hbmImage, hdcImage = CreateCompatibleDC (0); /* Replace Image */ - hOldBitmap = SelectObject (hdcImage, hbmImage); + SelectObject (hdcImage, hbmImage); + + if (add_with_alpha( himl, hdcImage, i, 1, bmp.bmWidth, bmp.bmHeight, hbmImage, hbmMask )) + goto done; imagelist_point_from_index(himl, i, &pt); StretchBlt (himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, @@ -2351,7 +2353,7 @@ ImageList_Replace (HIMAGELIST himl, INT i, HBITMAP hbmImage, himl->hdcMask, pt.x, pt.y, 0x220326); /* NOTSRCAND */ } - SelectObject (hdcImage, hOldBitmap); +done: DeleteDC (hdcImage); return TRUE; @@ -2378,7 +2380,6 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) { HDC hdcImage; HICON hBestFitIcon; - HBITMAP hbmOldSrc; ICONINFO ii; BITMAP bmp; BOOL ret; @@ -2439,6 +2440,25 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) if (hdcImage == 0) ERR("invalid hdcImage!\n"); + if (himl->uBitsPixel == 32) + { + if (!ii.hbmColor) + { + UINT height = bmp.bmHeight / 2; + HDC hdcMask = CreateCompatibleDC( 0 ); + HBITMAP color = CreateBitmap( bmp.bmWidth, height, 1, 1, NULL ); + SelectObject( hdcImage, color ); + SelectObject( hdcMask, ii.hbmMask ); + BitBlt( hdcImage, 0, 0, bmp.bmWidth, height, hdcMask, 0, height, SRCCOPY ); + add_with_alpha( himl, hdcImage, nIndex, 1, bmp.bmWidth, height, color, ii.hbmMask ); + DeleteDC( hdcMask ); + DeleteObject( color ); + } + else add_with_alpha( himl, hdcImage, nIndex, 1, bmp.bmWidth, bmp.bmHeight, ii.hbmColor, ii.hbmMask ); + + goto done; + } + imagelist_point_from_index(himl, nIndex, &pt); SetTextColor(himl->hdcImage, RGB(0,0,0)); @@ -2446,7 +2466,7 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) if (ii.hbmColor) { - hbmOldSrc = SelectObject (hdcImage, ii.hbmColor); + SelectObject (hdcImage, ii.hbmColor); StretchBlt (himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY); if (himl->hbmMask) @@ -2459,7 +2479,7 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) else { UINT height = bmp.bmHeight / 2; - hbmOldSrc = SelectObject (hdcImage, ii.hbmMask); + SelectObject (hdcImage, ii.hbmMask); StretchBlt (himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, hdcImage, 0, height, bmp.bmWidth, height, SRCCOPY); if (himl->hbmMask) @@ -2467,8 +2487,7 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) hdcImage, 0, 0, bmp.bmWidth, height, SRCCOPY); } - SelectObject (hdcImage, hbmOldSrc); - +done: DestroyIcon(hBestFitIcon); if (hdcImage) DeleteDC (hdcImage);

1 0

Frédéric Delanoy : winemaker: Add French translation.
by Alexandre Julliard May 14, 2010

May 14, 2010

Module: wine Branch: master Commit: 0c07c7ba09d8dc04aa6045c077094da0088b7438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c07c7ba09d8dc04aa6045c07… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri May 14 09:49:11 2010 +0200 winemaker: Add French translation. --- .gitignore | 1 + tools/Makefile.in | 10 +- tools/winemaker.fr.man.in | 281 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 289 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c07c7ba09d8dc04aa604…

1 0

Frédéric Delanoy : winemaker: Fix typos in manpage.
by Alexandre Julliard May 14, 2010

May 14, 2010

Module: wine Branch: master Commit: 54b973acadb04840679cbabd3cbba1c2ae8c9eaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b973acadb04840679cbabd3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu May 13 22:10:02 2010 +0200 winemaker: Fix typos in manpage. --- tools/winemaker.man.in | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/winemaker.man.in b/tools/winemaker.man.in index bc9d2b4..1f6bc3c 100644 --- a/tools/winemaker.man.in +++ b/tools/winemaker.man.in @@ -69,7 +69,7 @@ source files, and generate the corresponding Makefile. .PP - winemaker knows about MFC-based project and will generate customized files. .PP -- winemaker can read existing Projectfiles. It supports dsp, dsw, vcproj and sln files. +- winemaker can read existing project files. It supports dsp, dsw, vcproj and sln files. .PP .SH OPTIONS .TP @@ -124,8 +124,9 @@ i.e. for which it does not know whether it is an executable or a library, it should assume it is a library. .TP .B --mfc -Specifies that the targets are MFC based. In such a case winemaker the include -and library paths accordingly, and links the target with the MFC library. +Specifies that the targets are MFC based. In such a case winemaker adapts +the include and library paths accordingly, and links the target with the +MFC library. .TP .B --nomfc Specifies that targets are not MFC-based. This option disables use of MFC libraries @@ -166,7 +167,7 @@ Puts winemaker in interactive mode. In this mode winemaker will ask you to confirm each directory's list of targets, and then to provide directory and target specific options. .TP -.B --single-target name +.BR --single-target " name" Specifies that there is only one target, and that it is called "name". .TP .B --generated-files @@ -176,7 +177,7 @@ Tells winemaker to generate the Makefile. This is the default. Tells winemaker not to generate the Makefile. .TP .B --wine32 -Tells winemaker to generate a 32-bit target. This is useful on a wow64 systems. +Tells winemaker to generate a 32-bit target. This is useful on wow64 systems. Without that option the default architecture is used. .SH EXAMPLES @@ -215,7 +216,7 @@ $ make .SH TODO / BUGS .PP -In some cases you will have to edit the Makefile or sourcefiles by yourself. +In some cases you will have to edit the Makefile or source files by yourself. .PP Assuming that the windows executable/library is available, we could use winedump to determine what kind of executable it is (graphical

1 0

Gerald Pfeifer : comctl32/tests: Remove some dead code from TaskManager_OnRestoreMainWindow.
by Alexandre Julliard May 14, 2010

May 14, 2010

Module: wine Branch: master Commit: 3e2ff7e5fe4b2ff5a5f15ffebcb2b13fbf643628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e2ff7e5fe4b2ff5a5f15ffeb… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu May 13 22:10:04 2010 +0200 comctl32/tests: Remove some dead code from TaskManager_OnRestoreMainWindow. --- programs/taskmgr/taskmgr.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index a9c6278..542555f 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -502,11 +502,8 @@ static void SaveSettings(void) static void TaskManager_OnRestoreMainWindow(void) { - HMENU hMenu, hOptionsMenu; BOOL OnTop; - hMenu = GetMenu(hMainWnd); - hOptionsMenu = GetSubMenu(hMenu, OPTIONS_MENU_INDEX); OnTop = ((GetWindowLong(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0); OpenIcon(hMainWnd);

1 0

Gerald Pfeifer : winecfg: Remove variable lRes which is not really used from configureAudioDriver.
by Alexandre Julliard May 14, 2010

May 14, 2010

Module: wine Branch: master Commit: a8acdac7801290d937cc01ff89241eaa04a14a10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8acdac7801290d937cc01ff8… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 14 03:03:36 2010 +0200 winecfg: Remove variable lRes which is not really used from configureAudioDriver. --- programs/winecfg/audio.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 9f8a0a2..5cf2b34 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -124,11 +124,10 @@ static void configureAudioDriver(HWND hDlg) if (SendDriverMessage(hdrvr, DRV_QUERYCONFIGURE, 0, 0) != 0) { DRVCONFIGINFO dci; - LONG lRes; dci.dwDCISize = sizeof (dci); dci.lpszDCISectionName = NULL; dci.lpszDCIAliasName = NULL; - lRes = SendDriverMessage(hdrvr, DRV_CONFIGURE, 0, (LONG_PTR)&dci); + SendDriverMessage(hdrvr, DRV_CONFIGURE, 0, (LONG_PTR)&dci); } CloseDriver(hdrvr, 0, 0); }

1 0

Gerald Pfeifer : comctl32/tests: Check for the outcome of the SendMessage calls in test_monthcal_size.
by Alexandre Julliard May 14, 2010

May 14, 2010

Module: wine Branch: master Commit: 29cc4c919343380c42e81e158890643388a57651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29cc4c919343380c42e81e158… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu May 13 23:44:25 2010 +0200 comctl32/tests: Check for the outcome of the SendMessage calls in test_monthcal_size. --- dlls/comctl32/tests/monthcal.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index d1fa8de..30f682f 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1503,10 +1503,12 @@ static void test_monthcal_size(void) /* initialize to a font we can compare against */ SendMessage(hwnd, WM_SETFONT, (WPARAM)hFont1, 0); res = SendMessage(hwnd, MCM_GETMINREQRECT, 0, (LPARAM)&r1); + ok(res, "SendMessage(MCM_GETMINREQRECT) failed\n"); /* check that setting a larger font results in an larger rect */ SendMessage(hwnd, WM_SETFONT, (WPARAM)hFont2, 0); res = SendMessage(hwnd, MCM_GETMINREQRECT, 0, (LPARAM)&r2); + ok(res, "SendMessage(MCM_GETMINREQRECT) failed\n"); OffsetRect(&r1, -r1.left, -r1.top); OffsetRect(&r2, -r2.left, -r2.top);

1 0

Gerald Pfeifer : quartz: Fix return value of DSoundRender_GetState.
by Alexandre Julliard May 14, 2010

May 14, 2010

Module: wine Branch: master Commit: cb469fec8b16b5ea7be52252694477ba038dbf44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb469fec8b16b5ea7be522526… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 14 03:10:32 2010 +0200 quartz: Fix return value of DSoundRender_GetState. --- dlls/quartz/dsoundrender.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 1d87a7f..115577c 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -677,7 +677,7 @@ static HRESULT WINAPI DSoundRender_GetState(IBaseFilter * iface, DWORD dwMilliSe } LeaveCriticalSection(&This->csFilter); - return S_OK; + return hr; } static HRESULT WINAPI DSoundRender_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock)

1 0

Matteo Bruni : d3dx9: Add input dcl instruction support to the shader assembler.
by Alexandre Julliard May 13, 2010

May 13, 2010

Module: wine Branch: master Commit: 6cbd5114758bd8c55f4bd60aa58b631fef146167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cbd5114758bd8c55f4bd60aa… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Thu May 13 17:21:58 2010 +0200 d3dx9: Add input dcl instruction support to the shader assembler. --- dlls/d3dx9_36/asmparser.c | 10 ++++++++++ dlls/d3dx9_36/asmshader.y | 24 ++++++++++++++++++++++++ dlls/d3dx9_36/bytecodewriter.c | 1 + dlls/d3dx9_36/d3dx9_36_private.h | 2 ++ 4 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/asmparser.c b/dlls/d3dx9_36/asmparser.c index f1360cb..bee92f6 100644 --- a/dlls/d3dx9_36/asmparser.c +++ b/dlls/d3dx9_36/asmparser.c @@ -51,6 +51,15 @@ static void asmparser_dcl_output(struct asm_parser *This, DWORD usage, DWORD num } } +static void asmparser_dcl_input(struct asm_parser *This, DWORD usage, DWORD num, + const struct shader_reg *reg) { + if(!This->shader) return; + if(!record_declaration(This->shader, usage, num, FALSE, reg->regnum, reg->writemask)) { + ERR("Out of memory\n"); + set_parse_status(This, PARSE_ERR); + } +} + static void asmparser_instr(struct asm_parser *This, DWORD opcode, DWORD mod, DWORD shift, BWRITER_COMPARISON_TYPE comp, @@ -149,6 +158,7 @@ static const struct asmparser_backend parser_vs_3 = { asmparser_coissue_unsupported, asmparser_dcl_output, + asmparser_dcl_input, asmparser_end, diff --git a/dlls/d3dx9_36/asmshader.y b/dlls/d3dx9_36/asmshader.y index 8231c3a..ca4d24c 100644 --- a/dlls/d3dx9_36/asmshader.y +++ b/dlls/d3dx9_36/asmshader.y @@ -522,6 +522,30 @@ instruction: INSTR_ADD omods dreg ',' sregs reg.writemask = $4; asm_ctx.funcs->dcl_output(&asm_ctx, $2.dclusage, $2.regnum, &reg); } + | INSTR_DCL dclusage REG_INPUT + { + struct shader_reg reg; + TRACE("Input reg declaration\n"); + ZeroMemory(&reg, sizeof(reg)); + reg.type = BWRITERSPR_INPUT; + reg.regnum = $3; + reg.rel_reg = NULL; + reg.srcmod = 0; + reg.writemask = BWRITERSP_WRITEMASK_ALL; + asm_ctx.funcs->dcl_input(&asm_ctx, $2.dclusage, $2.regnum, &reg); + } + | INSTR_DCL dclusage REG_INPUT writemask + { + struct shader_reg reg; + TRACE("Input reg declaration\n"); + ZeroMemory(&reg, sizeof(reg)); + reg.type = BWRITERSPR_INPUT; + reg.regnum = $3; + reg.rel_reg = NULL; + reg.srcmod = 0; + reg.writemask = $4; + asm_ctx.funcs->dcl_input(&asm_ctx, $2.dclusage, $2.regnum, &reg); + } | INSTR_REP sregs { TRACE("REP\n"); diff --git a/dlls/d3dx9_36/bytecodewriter.c b/dlls/d3dx9_36/bytecodewriter.c index ff6393f..4d62465 100644 --- a/dlls/d3dx9_36/bytecodewriter.c +++ b/dlls/d3dx9_36/bytecodewriter.c @@ -284,6 +284,7 @@ static void sm_3_header(struct bc_writer *This, const struct bwriter_shader *sha /* Declare the shader type and version */ put_dword(buffer, This->version); + write_declarations(buffer, TRUE, shader->inputs, shader->num_inputs, D3DSPR_INPUT); write_declarations(buffer, TRUE, shader->outputs, shader->num_outputs, D3DSPR_OUTPUT); return; } diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 19b1921..344bdbf 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -255,6 +255,8 @@ struct asmparser_backend { void (*dcl_output)(struct asm_parser *This, DWORD usage, DWORD num, const struct shader_reg *reg); + void (*dcl_input)(struct asm_parser *This, DWORD usage, DWORD num, + const struct shader_reg *reg); void (*end)(struct asm_parser *This);

1 0