October 2007 - Wine-Commits

Rob Shearman : wineboot: Add a timeout dialog when any WM_QUERYENDSESSION or WM_ENDSESSION messages take too long .
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: 5cbdbe629e079015984cfef16205b83bf94afd77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cbdbe629e079015984cfef16… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Sep 26 15:53:55 2007 -0700 wineboot: Add a timeout dialog when any WM_QUERYENDSESSION or WM_ENDSESSION messages take too long. --- .gitignore | 1 + programs/wineboot/Makefile.in | 2 + programs/wineboot/resource.h | 20 ++++ programs/wineboot/shutdown.c | 207 ++++++++++++++++++++++++++++++++++--- programs/wineboot/wineboot.rc | 30 ++++++ programs/wineboot/wineboot_En.rc | 35 +++++++ 6 files changed, 278 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5cbdbe629e079015984cf…

1 0

Konstantin Kondratyuk : mpr: Implement WNetGetResourceInformation functions .
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: 7fb98bfba55ca7114d4c5ab352d6de4eff4050cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fb98bfba55ca7114d4c5ab35… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Mon Oct 1 11:58:59 2007 +0400 mpr: Implement WNetGetResourceInformation functions. --- dlls/mpr/wnet.c | 146 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- include/npapi.h | 2 + 2 files changed, 141 insertions(+), 7 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 6d08692..16ac984 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -52,6 +52,7 @@ typedef struct _WNetProvider PF_NPOpenEnum openEnum; PF_NPEnumResource enumResource; PF_NPCloseEnum closeEnum; + PF_NPGetResourceInformation getResourceInformation; } WNetProvider, *PWNetProvider; typedef struct _WNetProviderTable @@ -182,6 +183,10 @@ static void _tryLoadProvider(PCWSTR provider) provider->closeEnum = (PF_NPCloseEnum) GetProcAddress(hLib, "NPCloseEnum"); TRACE("closeEnum is %p\n", provider->closeEnum); + provider->getResourceInformation = (PF_NPGetResourceInformation) + GetProcAddress(hLib, "NPGetResourceInformation"); + TRACE("getResourceInformation is %p\n", + provider->getResourceInformation); if (!provider->openEnum || !provider->enumResource || !provider->closeEnum) { @@ -1281,30 +1286,157 @@ DWORD WINAPI WNetCloseEnum( HANDLE hEnum ) /********************************************************************* * WNetGetResourceInformationA [MPR.@] + * + * See WNetGetResourceInformationW */ DWORD WINAPI WNetGetResourceInformationA( LPNETRESOURCEA lpNetResource, LPVOID lpBuffer, LPDWORD cbBuffer, LPSTR *lplpSystem ) { - FIXME( "(%p, %p, %p, %p): stub\n", + DWORD ret; + + TRACE( "(%p, %p, %p, %p)\n", lpNetResource, lpBuffer, cbBuffer, lplpSystem ); - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + if (!providerTable || providerTable->numProviders == 0) + ret = WN_NO_NETWORK; + else if (lpNetResource) + { + LPNETRESOURCEW lpNetResourceW = NULL; + DWORD size = 1024, count = 1; + DWORD len; + + lpNetResourceW = HeapAlloc(GetProcessHeap(), 0, size); + ret = _thunkNetResourceArrayAToW(lpNetResource, &count, lpNetResourceW, &size); + if (ret == WN_MORE_DATA) + { + lpNetResourceW = HeapAlloc(GetProcessHeap(), 0, size); + if (lpNetResourceW) + ret = _thunkNetResourceArrayAToW(lpNetResource, + &count, lpNetResourceW, &size); + else + ret = WN_OUT_OF_MEMORY; + } + if (ret == WN_SUCCESS) + { + LPWSTR lpSystemW; + LPVOID lpBufferW; + size = 1024; + lpBufferW = HeapAlloc(GetProcessHeap(), 0, size); + if (lpBufferW) + { + ret = WNetGetResourceInformationW(lpNetResourceW, + lpBufferW, &size, &lpSystemW); + if (ret == WN_MORE_DATA) + { + HeapFree(GetProcessHeap(), 0, lpBufferW); + lpBufferW = HeapAlloc(GetProcessHeap(), 0, size); + if (lpBufferW) + ret = WNetGetResourceInformationW(lpNetResourceW, + lpBufferW, &size, &lpSystemW); + else + ret = WN_OUT_OF_MEMORY; + } + if (ret == WN_SUCCESS) + { + ret = _thunkNetResourceArrayWToA(lpBufferW, + &count, lpBuffer, cbBuffer); + lpNetResourceW = lpBufferW; + size = sizeof(NETRESOURCEA); + size += WideCharToMultiByte(CP_ACP, 0, lpNetResourceW->lpRemoteName, + -1, NULL, 0, NULL, NULL); + size += WideCharToMultiByte(CP_ACP, 0, lpNetResourceW->lpProvider, + -1, NULL, 0, NULL, NULL); + + len = WideCharToMultiByte(CP_ACP, 0, lpSystemW, + -1, NULL, 0, NULL, NULL); + if ((len) && ( size + len < *cbBuffer)) + { + *lplpSystem = (char*)lpBuffer + *cbBuffer - len; + WideCharToMultiByte(CP_ACP, 0, lpSystemW, -1, + *lplpSystem, len, NULL, NULL); + ret = WN_SUCCESS; + } + else + ret = WN_MORE_DATA; + } + else + ret = WN_OUT_OF_MEMORY; + HeapFree(GetProcessHeap(), 0, lpBufferW); + } + else + ret = WN_OUT_OF_MEMORY; + HeapFree(GetProcessHeap(), 0, lpSystemW); + } + HeapFree(GetProcessHeap(), 0, lpNetResourceW); + } + else + ret = WN_NO_NETWORK; + + if (ret) + SetLastError(ret); + TRACE("Returning %d\n", ret); + return ret; } /********************************************************************* * WNetGetResourceInformationW [MPR.@] + * + * WNetGetResourceInformationW function identifies the network provider + * that owns the resource and gets information about the type of the resource. + * + * PARAMS: + * lpNetResource [ I] the pointer to NETRESOURCEW structure, that + * defines a network resource. + * lpBuffer [ O] the pointer to buffer, containing result. It + * contains NETRESOURCEW structure and strings to + * which the members of the NETRESOURCEW structure + * point. + * cbBuffer [I/O] the pointer to DWORD number - size of buffer + * in bytes. + * lplpSystem [ O] the pointer to string in the output buffer, + * containing the part of the resource name without + * names of the server and share. + * + * RETURNS: + * NO_ERROR if the function succeeds. System error code if the function fails. */ + DWORD WINAPI WNetGetResourceInformationW( LPNETRESOURCEW lpNetResource, LPVOID lpBuffer, LPDWORD cbBuffer, LPWSTR *lplpSystem ) { - FIXME( "(%p, %p, %p, %p): stub\n", - lpNetResource, lpBuffer, cbBuffer, lplpSystem ); + DWORD ret = WN_NO_NETWORK; + DWORD index; - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + TRACE( "(%p, %p, %p, %p): stub\n", + lpNetResource, lpBuffer, cbBuffer, lplpSystem); + + if (!(lpBuffer)) + ret = WN_OUT_OF_MEMORY; + else + { + /* FIXME: For function value of a variable is indifferent, it does + * search of all providers in a network. + */ + for (index = 0; index < providerTable->numProviders; index++) + { + if(providerTable->table[index].getCaps(WNNC_DIALOG) & + WNNC_DLG_GETRESOURCEINFORMATION) + { + if (providerTable->table[index].getResourceInformation) + ret = providerTable->table[index].getResourceInformation( + lpNetResource, lpBuffer, cbBuffer, lplpSystem); + else + ret = WN_NO_NETWORK; + if (ret == WN_SUCCESS) + break; + } + } + } + if (ret) + SetLastError(ret); + return ret; } /********************************************************************* diff --git a/include/npapi.h b/include/npapi.h index e84bfe4..47aa2e3 100644 --- a/include/npapi.h +++ b/include/npapi.h @@ -70,6 +70,8 @@ typedef DWORD (APIENTRY *PF_NPOpenEnum)(DWORD dwScope, DWORD dwType, DWORD dwUsa typedef DWORD (APIENTRY *PF_NPEnumResource)(HANDLE hEnum, LPDWORD lpcCount, LPVOID lpBuffer, LPDWORD lpBufferSize); typedef DWORD (APIENTRY *PF_NPCloseEnum)(HANDLE hEnum); +typedef DWORD (APIENTRY *PF_NPGetResourceInformation)(LPNETRESOURCEW lpNetResource, + LPVOID lpBuffer, LPDWORD lpcbBuffer, LPWSTR* lplpSystem); /* connection-related */ typedef DWORD (APIENTRY *PF_NPAddConnection)(LPNETRESOURCEW lpNetResource,

1 0

Stefan Leichter : gdi32: Define WINE_FILEVERSION in version resource of gdi .exe.
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: 87a9a4d44b37956a008a22745d7710f3f8967ca0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87a9a4d44b37956a008a22745… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sat Sep 29 23:14:22 2007 +0200 gdi32: Define WINE_FILEVERSION in version resource of gdi.exe. --- dlls/gdi32/version16.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/version16.rc b/dlls/gdi32/version16.rc index 3770dc0..9a4bce7 100644 --- a/dlls/gdi32/version16.rc +++ b/dlls/gdi32/version16.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WINE_FILEVERSION 1,0,0,0 #define WINE_FILEVERSION_STR "1.0" #define WINE_FILEDESCRIPTION_STR "Wine core dll" #define WINE_FILENAME_STR "gdi.exe"

1 0

Roderick Colenbrander : ddraw: Fix RegDeleteTreeA/ W compile issues when building ddraw for Windows.
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: 03fa9f8730a6f576c70ce5ec6160496348b829d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03fa9f8730a6f576c70ce5ec6… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Sep 29 21:06:40 2007 +0200 ddraw: Fix RegDeleteTreeA/W compile issues when building ddraw for Windows. --- dlls/ddraw/regsvr.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/regsvr.c b/dlls/ddraw/regsvr.c index 4371e62..0a1f7a7 100644 --- a/dlls/ddraw/regsvr.c +++ b/dlls/ddraw/regsvr.c @@ -34,6 +34,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); +static typeof(RegDeleteTreeW) * pRegDeleteTreeW; +static typeof(RegDeleteTreeA) * pRegDeleteTreeA; + /* * Near the bottom of this file are the exported DllRegisterServer and * DllUnregisterServer, which make all this worthwhile. @@ -193,7 +196,7 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = RegDeleteTreeW(interface_key, buf); + res = pRegDeleteTreeW(interface_key, buf); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } @@ -304,12 +307,12 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = RegDeleteTreeW(coclass_key, buf); + res = pRegDeleteTreeW(coclass_key, buf); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + res = pRegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } @@ -422,6 +425,12 @@ HRESULT WINAPI DllUnregisterServer(void) { HRESULT hr; + HMODULE advapi32 = GetModuleHandleA("advapi32"); + if (!advapi32) return E_FAIL; + pRegDeleteTreeA = (typeof(RegDeleteTreeA)*) GetProcAddress(advapi32, "RegDeleteTreeA"); + pRegDeleteTreeW = (typeof(RegDeleteTreeW)*) GetProcAddress(advapi32, "RegDeleteTreeW"); + if (!pRegDeleteTreeA || !pRegDeleteTreeW) return E_FAIL; + TRACE("\n"); hr = unregister_coclasses(coclass_list);

1 0

Stefan Leichter : ole32: Define WINE_FILEVERSION in version resource of ole2nls.dll too.
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: b511912446ca57ce7be94ab239df8791bfe682e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b511912446ca57ce7be94ab23… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sat Sep 29 23:09:14 2007 +0200 ole32: Define WINE_FILEVERSION in version resource of ole2nls.dll too. --- dlls/ole32/version16.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/version16.rc b/dlls/ole32/version16.rc index ee94ef9..3cabba9 100644 --- a/dlls/ole32/version16.rc +++ b/dlls/ole32/version16.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WINE_FILEVERSION 2,10,3050,1 #define WINE_FILEVERSION_STR "2.10.3050.1" #define WINE_FILEDESCRIPTION_STR "Wine OLE dll" #define WINE_FILENAME_STR "OLE2NLS.DLL"

1 0

Stefan Dösinger : wined3d: Enable the mNxN implementation for pixel shaders.
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: 822030e329c50888387303098d09d0fd3c0c2c8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=822030e329c50888387303098… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 5 20:01:53 2007 +0200 wined3d: Enable the mNxN implementation for pixel shaders. --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/pixelshader.c | 10 +++++----- dlls/wined3d/vertexshader.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 9f77446..20d338e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1449,8 +1449,8 @@ void pshader_hw_texm3x2depth(SHADER_OPCODE_ARG* arg) { } /** Handles transforming all WINED3DSIO_M?x? opcodes for - Vertex shaders to ARB_vertex_program codes */ -void vshader_hw_mnxn(SHADER_OPCODE_ARG* arg) { + Vertex/Pixel shaders to ARB_vertex_program codes */ +void shader_hw_mnxn(SHADER_OPCODE_ARG* arg) { int i; int nComponents = 0; diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 512badc..7b9a2c4 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -182,11 +182,11 @@ CONST SHADER_OPCODE IWineD3DPixelShaderImpl_shader_ins[] = { {WINED3DSIO_SINCOS, "sincos", "SCS", 1, 2, shader_hw_sincos, shader_glsl_sincos, WINED3DPS_VERSION(3,0), -1}, {WINED3DSIO_DP2ADD, "dp2add", NULL, 1, 4, pshader_hw_dp2add, pshader_glsl_dp2add, WINED3DPS_VERSION(2,0), -1}, /* Matrix */ - {WINED3DSIO_M4x4, "m4x4", "undefined", 1, 3, NULL, shader_glsl_mnxn, 0, 0}, - {WINED3DSIO_M4x3, "m4x3", "undefined", 1, 3, NULL, shader_glsl_mnxn, 0, 0}, - {WINED3DSIO_M3x4, "m3x4", "undefined", 1, 3, NULL, shader_glsl_mnxn, 0, 0}, - {WINED3DSIO_M3x3, "m3x3", "undefined", 1, 3, NULL, shader_glsl_mnxn, 0, 0}, - {WINED3DSIO_M3x2, "m3x2", "undefined", 1, 3, NULL, shader_glsl_mnxn, 0, 0}, + {WINED3DSIO_M4x4, "m4x4", "undefined", 1, 3, shader_hw_mnxn, shader_glsl_mnxn, 0, 0}, + {WINED3DSIO_M4x3, "m4x3", "undefined", 1, 3, shader_hw_mnxn, shader_glsl_mnxn, 0, 0}, + {WINED3DSIO_M3x4, "m3x4", "undefined", 1, 3, shader_hw_mnxn, shader_glsl_mnxn, 0, 0}, + {WINED3DSIO_M3x3, "m3x3", "undefined", 1, 3, shader_hw_mnxn, shader_glsl_mnxn, 0, 0}, + {WINED3DSIO_M3x2, "m3x2", "undefined", 1, 3, shader_hw_mnxn, shader_glsl_mnxn, 0, 0}, /* Register declarations */ {WINED3DSIO_DCL, "dcl", NULL, 0, 2, NULL, NULL, 0, 0}, /* Flow control - requires GLSL or software shaders */ diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index e4b8088..45065a6 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -118,11 +118,11 @@ CONST SHADER_OPCODE IWineD3DVertexShaderImpl_shader_ins[] = { {WINED3DSIO_SINCOS, "sincos", NULL, 1, 4, shader_hw_sincos, shader_glsl_sincos, WINED3DVS_VERSION(2,0), WINED3DVS_VERSION(2,1)}, {WINED3DSIO_SINCOS, "sincos", "SCS", 1, 2, shader_hw_sincos, shader_glsl_sincos, WINED3DVS_VERSION(3,0), -1}, /* Matrix */ - {WINED3DSIO_M4x4, "m4x4", "undefined", 1, 3, vshader_hw_mnxn, shader_glsl_mnxn, 0, 0}, - {WINED3DSIO_M4x3, "m4x3", "undefined", 1, 3, vshader_hw_mnxn, shader_glsl_mnxn, 0, 0}, - {WINED3DSIO_M3x4, "m3x4", "undefined", 1, 3, vshader_hw_mnxn, shader_glsl_mnxn, 0, 0}, - {WINED3DSIO_M3x3, "m3x3", "undefined", 1, 3, vshader_hw_mnxn, shader_glsl_mnxn, 0, 0}, - {WINED3DSIO_M3x2, "m3x2", "undefined", 1, 3, vshader_hw_mnxn, shader_glsl_mnxn, 0, 0}, + {WINED3DSIO_M4x4, "m4x4", "undefined", 1, 3, shader_hw_mnxn, shader_glsl_mnxn, 0, 0}, + {WINED3DSIO_M4x3, "m4x3", "undefined", 1, 3, shader_hw_mnxn, shader_glsl_mnxn, 0, 0}, + {WINED3DSIO_M3x4, "m3x4", "undefined", 1, 3, shader_hw_mnxn, shader_glsl_mnxn, 0, 0}, + {WINED3DSIO_M3x3, "m3x3", "undefined", 1, 3, shader_hw_mnxn, shader_glsl_mnxn, 0, 0}, + {WINED3DSIO_M3x2, "m3x2", "undefined", 1, 3, shader_hw_mnxn, shader_glsl_mnxn, 0, 0}, /* Declare registers */ {WINED3DSIO_DCL, "dcl", NULL, 0, 2, NULL, NULL, 0, 0}, /* Constant definitions */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b5230c7..9457615 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1793,10 +1793,10 @@ extern void pshader_hw_texreg2rgb(SHADER_OPCODE_ARG* arg); /* ARB vertex / pixel shader common prototypes */ extern void shader_hw_nrm(SHADER_OPCODE_ARG* arg); extern void shader_hw_sincos(SHADER_OPCODE_ARG* arg); +extern void shader_hw_mnxn(SHADER_OPCODE_ARG* arg); /* ARB vertex shader prototypes */ extern void vshader_hw_map2gl(SHADER_OPCODE_ARG* arg); -extern void vshader_hw_mnxn(SHADER_OPCODE_ARG* arg); extern void vshader_hw_rsq_rcp(SHADER_OPCODE_ARG* arg); /* GLSL helper functions */

1 0

Damjan Jovanovic : ole32: Implement win16 COCREATEGUID.
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: b9bdb2a6c2640d0aecc0681c5cf719c376ddadbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9bdb2a6c2640d0aecc0681c5… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Sep 28 14:18:25 2007 +0200 ole32: Implement win16 COCREATEGUID. --- dlls/ole32/compobj.c | 1 + dlls/ole32/compobj.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index b4022e7..1904313 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1197,6 +1197,7 @@ HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved ) /****************************************************************************** * CoCreateGuid [OLE32.@] + * CoCreateGuid [COMPOBJ.17] * * Simply forwards to UuidCreate in RPCRT4. * diff --git a/dlls/ole32/compobj.spec b/dlls/ole32/compobj.spec index 078dfc2..3ac8568 100644 --- a/dlls/ole32/compobj.spec +++ b/dlls/ole32/compobj.spec @@ -70,7 +70,7 @@ 70 stub _IID_ISTDMARSHALINFO 71 pascal CoCreateStandardMalloc(long ptr) CoCreateStandardMalloc16 72 stub _IID_IEXTERNALCONNECTION -73 stub COCREATEGUID +73 pascal CoCreateGuid(ptr) CoCreateGuid 75 stub FNASSERT 76 pascal StringFromGUID2(ptr ptr word) StringFromGUID2 77 stub COGETCLASSEXT

1 0

Stefan Dösinger : wined3d: Bem is an instruction and uses registers.
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: c5eb5312496f226312b3f8d6d87f3974870a7c93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5eb5312496f226312b3f8d6d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 5 20:12:06 2007 +0200 wined3d: Bem is an instruction and uses registers. --- dlls/wined3d/baseshader.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 555929c..6533810 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -315,14 +315,6 @@ HRESULT shader_get_registers_used( reg_maps->labels[snum] = 1; pToken += curOpcode->num_params; - } else if(WINED3DSIO_BEM == curOpcode->opcode) { - DWORD regnum = *pToken & WINED3DSP_REGNUM_MASK; - if(reg_maps->bumpmat != -1 && reg_maps->bumpmat != regnum) { - FIXME("Pixel shader uses bem or texbem instruction on more than 1 sampler\n"); - } else { - reg_maps->bumpmat = regnum; - } - /* Set texture, address, temporary registers */ } else { int i, limit; @@ -383,6 +375,13 @@ HRESULT shader_get_registers_used( } if(WINED3DSIO_NRM == curOpcode->opcode) { reg_maps->usesnrm = 1; + } else if(WINED3DSIO_BEM == curOpcode->opcode) { + DWORD regnum = *pToken & WINED3DSP_REGNUM_MASK; + if(reg_maps->bumpmat != -1 && reg_maps->bumpmat != regnum) { + FIXME("Pixel shader uses bem or texbem instruction on more than 1 sampler\n"); + } else { + reg_maps->bumpmat = regnum; + } } /* This will loop over all the registers and try to

1 0

Stefan Dösinger : wined3d: Implement texbeml in arb shaders.
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: d4019780b59c43ffc7bd8f57bc674eb2a42f21d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4019780b59c43ffc7bd8f57b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 5 17:55:36 2007 +0200 wined3d: Implement texbeml in arb shaders. --- dlls/wined3d/arb_program_shader.c | 28 +++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 526e435..9f77446 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -161,13 +161,23 @@ void shader_arb_load_constants( GL_LIMITS(pshader_constantsF), stateBlock->pixelShaderConstantF, &stateBlock->set_pconstantsF); - if(((IWineD3DPixelShaderImpl *) pshader)->bumpenvmatconst) { + if(((IWineD3DPixelShaderImpl *) pshader)->bumpenvmatconst != -1) { /* needsbumpmat stores the stage number from where to load the matrix. bumpenvmatconst stores the * number of the constant to load the matrix into. * The state manager takes care that this function is always called if the bump env matrix changes */ float *data = (float *) &stateBlock->textureState[(int) psi->needsbumpmat][WINED3DTSS_BUMPENVMAT00]; GL_EXTCALL(glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, psi->bumpenvmatconst, data)); + + if(((IWineD3DPixelShaderImpl *) pshader)->luminanceconst != -1) { + /* WINED3DTSS_BUMPENVLSCALE and WINED3DTSS_BUMPENVLOFFSET are next to each other. + * point gl to the scale, and load 4 floats. x = scale, y = offset, z and w are junk, we + * don't care about them. The pointers are valid for sure because the stateblock is bigger. + * (they're WINED3DTSS_TEXTURETRANSFORMFLAGS and WINED3DTSS_ADDRESSW, so most likely 0 or NaN + */ + float *scale = (float *) &stateBlock->textureState[(int) psi->needsbumpmat][WINED3DTSS_BUMPENVLSCALE]; + GL_EXTCALL(glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, psi->luminanceconst, scale)); + } } if(((IWineD3DPixelShaderImpl *) pshader)->srgb_enabled && !((IWineD3DPixelShaderImpl *) pshader)->srgb_mode_hardcoded) { @@ -233,6 +243,8 @@ void shader_generate_arb_declarations( shader_addline(buffer, "MOV T%u, fragment.texcoord[%u];\n", i, i); } + ((IWineD3DPixelShaderImpl *)This)->bumpenvmatconst = -1; + ((IWineD3DPixelShaderImpl *)This)->luminanceconst = -1; if(reg_maps->bumpmat != -1 /* Only a pshader can use texbem */) { /* If the shader does not use all available constants, use the next free constant to load the bump mapping environment matrix from * the stateblock into the shader. If no constant is available don't load, texbem will then just sample the texture without applying @@ -241,6 +253,14 @@ void shader_generate_arb_declarations( if(max_constantsF < GL_LIMITS(pshader_constantsF)) { ((IWineD3DPixelShaderImpl *)This)->bumpenvmatconst = max_constantsF; shader_addline(buffer, "PARAM bumpenvmat = program.env[%d];\n", ((IWineD3DPixelShaderImpl *)This)->bumpenvmatconst); + + if(reg_maps->luminanceparams != -1 && max_constantsF +1 < GL_LIMITS(pshader_constantsF)) { + extra_constants_needed += 1; + ((IWineD3DPixelShaderImpl *)This)->luminanceconst = max_constantsF + 1; + shader_addline(buffer, "PARAM luminance = program.env[%d];\n", ((IWineD3DPixelShaderImpl *)This)->luminanceconst); + } else if(reg_maps->luminanceparams != -1) { + FIXME("No free constant to load the luminance parameters\n"); + } } else { FIXME("No free constant found to load environemnt bump mapping matrix into the shader. texbem instruction will not apply bump mapping\n"); } @@ -1172,6 +1192,12 @@ void pshader_hw_texbem(SHADER_OPCODE_ARG* arg) { } shader_hw_sample(arg, reg_dest_code, reg_coord, "TMP", FALSE, FALSE); + + if(arg->opcode->opcode == WINED3DSIO_TEXBEML && This->luminanceconst != -1) { + shader_addline(buffer, "MAD TMP, T%u.z, luminance.x, luminance.y;\n", src); + shader_addline(buffer, "MUL %s, %s, TMP;\n", reg_coord, reg_coord); + } + } else { DWORD tf; if(reg_dest_code < MAX_TEXTURES) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ddea219..b5230c7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2078,6 +2078,7 @@ typedef struct IWineD3DPixelShaderImpl { /* Some information about the shader behavior */ char needsbumpmat; UINT bumpenvmatconst; + UINT luminanceconst; char srgb_enabled; char srgb_mode_hardcoded; UINT srgb_low_const;

1 0

Stefan Dösinger : wined3d: Add proper input register handling to texreg2ar/gb.
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: 1c18112339cdeba99acad928894ada743ef69a83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c18112339cdeba99acad9288… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 5 17:13:04 2007 +0200 wined3d: Add proper input register handling to texreg2ar/gb. --- dlls/wined3d/arb_program_shader.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1fc3338..526e435 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1090,12 +1090,13 @@ void pshader_hw_texreg2ar(SHADER_OPCODE_ARG* arg) { DWORD flags; DWORD reg1 = arg->dst & WINED3DSP_REGNUM_MASK; - DWORD reg2 = arg->src[0] & WINED3DSP_REGNUM_MASK; char dst_str[8]; + char src_str[50]; sprintf(dst_str, "T%u", reg1); - shader_addline(buffer, "MOV TMP.r, T%u.a;\n", reg2); - shader_addline(buffer, "MOV TMP.g, T%u.r;\n", reg2); + pshader_gen_input_modifier_line(buffer, arg->src[0], 0, src_str); + shader_addline(buffer, "MOV TMP.r, %s.a;\n", src_str); + shader_addline(buffer, "MOV TMP.g, %s.r;\n", src_str); flags = reg1 < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg1][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; shader_hw_sample(arg, reg1, dst_str, "TMP", flags & WINED3DTTFF_PROJECTED, FALSE); } @@ -1108,12 +1109,13 @@ void pshader_hw_texreg2gb(SHADER_OPCODE_ARG* arg) { DWORD flags; DWORD reg1 = arg->dst & WINED3DSP_REGNUM_MASK; - DWORD reg2 = arg->src[0] & WINED3DSP_REGNUM_MASK; char dst_str[8]; + char src_str[50]; sprintf(dst_str, "T%u", reg1); - shader_addline(buffer, "MOV TMP.r, T%u.g;\n", reg2); - shader_addline(buffer, "MOV TMP.g, T%u.b;\n", reg2); + pshader_gen_input_modifier_line(buffer, arg->src[0], 0, src_str); + shader_addline(buffer, "MOV TMP.r, %s.g;\n", src_str); + shader_addline(buffer, "MOV TMP.g, %s.b;\n", src_str); flags = reg1 < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg1][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; shader_hw_sample(arg, reg1, dst_str, "TMP", FALSE, FALSE); }

1 0