wine-commits June 2007

wine-commits@winehq.org

5 participants
856 discussions

H. Verbeet : wined3d: Do not mark texture stages > MAX_TEXTURES dirty, they don't exist.
by Alexandre Julliard 22 Jun '07

22 Jun '07

Module: wine Branch: master Commit: 6d0e14d947263b2ef6cbb6df99a02b551a9675a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d0e14d947263b2ef6cbb6df9… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Jun 22 00:02:16 2007 +0200 wined3d: Do not mark texture stages > MAX_TEXTURES dirty, they don't exist. --- dlls/wined3d/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2fd70bc..ac418d9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3234,7 +3234,9 @@ void IWineD3DDeviceImpl_FindTexUnitMap(IWineD3DDeviceImpl *This) { if(This->texUnitMap[i] != i) { This->texUnitMap[i] = i; IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(i)); - markTextureStagesDirty(This, i); + if (i < MAX_TEXTURES) { + markTextureStagesDirty(This, i); + } } } This->oneToOneTexUnitMap = TRUE;

1 0

H. Verbeet : wined3d: Fix various incorrect uses of GL_LIMITS( texture_stages) and GL_LIMITS(sampler_stages).
by Alexandre Julliard 22 Jun '07

22 Jun '07

Module: wine Branch: master Commit: 440ca84680b5fae2c3eae431881c8b7ad1b27640 URL: http://source.winehq.org/git/wine.git/?a=commit;h=440ca84680b5fae2c3eae4318… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Jun 22 00:02:12 2007 +0200 wined3d: Fix various incorrect uses of GL_LIMITS(texture_stages) and GL_LIMITS(sampler_stages). --- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/stateblock.c | 22 +++++++++++----------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a8eade2..2fd70bc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -526,7 +526,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice* iface, for (i = 0; i < NUM_SAVEDPIXELSTATES_R; i++) { object->changed.renderState[SavedPixelStates_R[i]] = TRUE; } - for (j = 0; j < GL_LIMITS(texture_stages); j++) { + for (j = 0; j < MAX_TEXTURES; j++) { for (i = 0; i < NUM_SAVEDPIXELSTATES_T; i++) { object->changed.textureState[j][SavedPixelStates_T[i]] = TRUE; } @@ -556,7 +556,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice* iface, for (i = 0; i < NUM_SAVEDVERTEXSTATES_R; i++) { object->changed.renderState[SavedVertexStates_R[i]] = TRUE; } - for (j = 0; j < GL_LIMITS(texture_stages); j++) { + for (j = 0; j < MAX_TEXTURES; j++) { for (i = 0; i < NUM_SAVEDVERTEXSTATES_T; i++) { object->changed.textureState[j][SavedVertexStates_T[i]] = TRUE; } @@ -1935,7 +1935,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, D3DCB_D This->cursorTexture = 0; } - for(sampler = 0; sampler < GL_LIMITS(sampler_stages); ++sampler) { + for (sampler = 0; sampler < MAX_SAMPLERS; ++sampler) { IWineD3DDevice_SetTexture(iface, sampler, NULL); } @@ -6245,7 +6245,7 @@ static void WINAPI IWineD3DDeviceImpl_ResourceReleased(IWineD3DDevice *iface, IW case WINED3DRTYPE_TEXTURE: case WINED3DRTYPE_CUBETEXTURE: case WINED3DRTYPE_VOLUMETEXTURE: - for (counter = 0; counter < GL_LIMITS(sampler_stages); counter++) { + for (counter = 0; counter < MAX_SAMPLERS; counter++) { if (This->stateBlock != NULL && This->stateBlock->textures[counter] == (IWineD3DBaseTexture *)resource) { WARN("Texture being released is still by a stateblock, Stage = %u Texture = %p\n", counter, resource); This->stateBlock->textures[counter] = NULL; diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index b996ae2..4a23d13 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1124,7 +1124,7 @@ if(stridedlcl.u.s.type.VBO) { \ { IWineD3DSurface *pSur; int textureNo; - for (textureNo = 0; textureNo < GL_LIMITS(textures); ++textureNo) { + for (textureNo = 0; textureNo < MAX_SAMPLERS; ++textureNo) { if (This->stateBlock->textures[textureNo] != NULL) { sprintf(buffer, "/tmp/texture_%p_%d_%d.tga", This->stateBlock->textures[textureNo], primCounter, textureNo); TRACE("Saving texture %s\n", buffer); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index d186e80..8ff49db 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -257,7 +257,7 @@ static ULONG WINAPI IWineD3DStateBlockImpl_Release(IWineD3DStateBlock *iface) { FIXME("Releasing primary stateblock\n"); /* NOTE: according to MSDN: The application is responsible for making sure the texture references are cleared down */ - for (counter = 0; counter < GL_LIMITS(sampler_stages); counter++) { + for (counter = 0; counter < MAX_SAMPLERS; counter++) { if (This->textures[counter]) { /* release our 'internal' hold on the texture */ if(0 != IWineD3DBaseTexture_Release(This->textures[counter])) { @@ -584,7 +584,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) } /* Texture states */ - for (j = 0; j < GL_LIMITS(texture_stages); j++) { + for (j = 0; j < MAX_TEXTURES; j++) { /* TODO: move over to using memcpy */ for (i = 1; i <= WINED3D_HIGHEST_TEXTURE_STATE ; i++) { if (This->set.textureState[j][i]) { @@ -597,7 +597,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) /* Samplers */ /* TODO: move over to using memcpy */ - for (j = 0; j < GL_LIMITS(sampler_stages); j++) { + for (j = 0; j < MAX_SAMPLERS; j++) { if (This->set.textures[j]) { TRACE("Updating texture %d to %p (was %p)\n", j, targetStateBlock->textures[j], This->textures[j]); This->textures[j] = targetStateBlock->textures[j]; @@ -753,7 +753,7 @@ should really perform a delta so that only the changes get updated*/ } /* Texture states */ - for (j = 0; j < GL_LIMITS(texture_stages); j++) { /* Set The texture first, just in case it resets the states? */ + for (j = 0; j < MAX_TEXTURES; j++) { /* Set The texture first, just in case it resets the states? */ /* TODO: move over to memcpy */ for (i = 1; i <= WINED3D_HIGHEST_TEXTURE_STATE; i++) { if (This->set.textureState[j][i] && This->changed.textureState[j][i]) { /* tb_dx9_10 failes without this test */ @@ -768,7 +768,7 @@ should really perform a delta so that only the changes get updated*/ /* Samplers */ /* TODO: move over to memcpy */ - for (j = 0 ; j < GL_LIMITS(sampler_stages); j++){ + for (j = 0 ; j < MAX_SAMPLERS; j++){ if (This->set.textures[j] && This->changed.textures[j]) { IWineD3DDevice_SetTexture(pDevice, j, This->textures[j]); } @@ -791,14 +791,14 @@ should really perform a delta so that only the changes get updated*/ } - for (j = 0; j < GL_LIMITS(texture_stages); j++) { + for (j = 0; j < MAX_TEXTURES; j++) { for (i = 0; i < NUM_SAVEDPIXELSTATES_T; i++) { ((IWineD3DDeviceImpl *)pDevice)->stateBlock->textureState[j][SavedPixelStates_T[i]] = This->textureState[j][SavedPixelStates_T[i]]; IWineD3DDeviceImpl_MarkStateDirty((IWineD3DDeviceImpl *)pDevice, STATE_TEXTURESTAGE(j, SavedPixelStates_T[i])); } } - for (j = 0; j < GL_LIMITS(sampler_stages); j++) { + for (j = 0; j < MAX_SAMPLERS; j++) { for (i = 0; i < NUM_SAVEDPIXELSTATES_S; i++) { ((IWineD3DDeviceImpl *)pDevice)->stateBlock->samplerState[j][SavedPixelStates_S[i]] = This->samplerState[j][SavedPixelStates_S[i]]; } @@ -811,14 +811,14 @@ should really perform a delta so that only the changes get updated*/ IWineD3DDevice_SetRenderState(pDevice, SavedVertexStates_R[i], This->renderState[SavedVertexStates_R[i]]); } - for (j = 0; j < GL_LIMITS(texture_stages); j++) { + for (j = 0; j < MAX_TEXTURES; j++) { for (i = 0; i < NUM_SAVEDVERTEXSTATES_T; i++) { ((IWineD3DDeviceImpl *)pDevice)->stateBlock->textureState[j][SavedVertexStates_T[i]] = This->textureState[j][SavedVertexStates_T[i]]; IWineD3DDeviceImpl_MarkStateDirty((IWineD3DDeviceImpl *)pDevice, STATE_TEXTURESTAGE(j, SavedVertexStates_T[i])); } } - for (j = 0; j < GL_LIMITS(sampler_stages); j++) { + for (j = 0; j < MAX_SAMPLERS; j++) { for (i = 0; i < NUM_SAVEDVERTEXSTATES_S; i++) { ((IWineD3DDeviceImpl *)pDevice)->stateBlock->samplerState[j][SavedVertexStates_S[i]] = This->samplerState[j][SavedVertexStates_S[i]]; } @@ -1015,7 +1015,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat This->clip_status.ClipIntersection = 0xFFFFFFFF; /* Texture Stage States - Put directly into state block, we will call function below */ - for (i = 0; i < GL_LIMITS(texture_stages); i++) { + for (i = 0; i < MAX_TEXTURES; i++) { TRACE("Setting up default texture states for texture Stage %d\n", i); memcpy(&This->transforms[WINED3DTS_TEXTURE0 + i], &identity, sizeof(identity)); This->textureState[i][WINED3DTSS_COLOROP ] = (i==0)? WINED3DTOP_MODULATE : WINED3DTOP_DISABLE; @@ -1040,7 +1040,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat This->lowest_disabled_stage = 1; /* Sampler states*/ - for (i = 0 ; i < GL_LIMITS(sampler_stages); i++) { + for (i = 0 ; i < MAX_SAMPLERS; i++) { TRACE("Setting up default samplers states for sampler %d\n", i); This->samplerState[i][WINED3DSAMP_ADDRESSU ] = WINED3DTADDRESS_WRAP; This->samplerState[i][WINED3DSAMP_ADDRESSV ] = WINED3DTADDRESS_WRAP;

1 0

Michael Stefaniuc : dmloader: Do not use wide character constants.
by Alexandre Julliard 22 Jun '07

22 Jun '07

Module: wine Branch: master Commit: 4a0ad1d0c5ce32410c63b779edf43c1a469781b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a0ad1d0c5ce32410c63b779e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 21 23:03:27 2007 +0200 dmloader: Do not use wide character constants. --- dlls/dmloader/loaderstream.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dmloader/loaderstream.c b/dlls/dmloader/loaderstream.c index bbaf0d2..2a1938f 100644 --- a/dlls/dmloader/loaderstream.c +++ b/dlls/dmloader/loaderstream.c @@ -86,7 +86,7 @@ void WINAPI IDirectMusicLoaderFileStream_Detach (LPSTREAM iface) { if (This->hFile != INVALID_HANDLE_VALUE) { CloseHandle(This->hFile); } - This->wzFileName[0] = (L'\0'); + This->wzFileName[0] = '\0'; }

1 0

Michael Stefaniuc : comctl32: Do not use wide character constants.
by Alexandre Julliard 22 Jun '07

22 Jun '07

Module: wine Branch: master Commit: 585f863c24ab212d559e7d7df5b30b29faec8d1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=585f863c24ab212d559e7d7df… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 21 22:58:50 2007 +0200 comctl32: Do not use wide character constants. --- dlls/comctl32/commctrl.c | 4 ++-- dlls/comctl32/string.c | 4 ++-- dlls/comctl32/tooltips.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 1e74afd..5d75d79 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -442,10 +442,10 @@ void WINAPI DrawStatusTextW (HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style) if (text) { int oldbkmode = SetBkMode (hdc, TRANSPARENT); UINT align = DT_LEFT; - if (*text == L'\t') { + if (*text == '\t') { text++; align = DT_CENTER; - if (*text == L'\t') { + if (*text == '\t') { text++; align = DT_RIGHT; } diff --git a/dlls/comctl32/string.c b/dlls/comctl32/string.c index 00f72ad..654c467 100644 --- a/dlls/comctl32/string.c +++ b/dlls/comctl32/string.c @@ -240,7 +240,7 @@ INT WINAPI Str_GetPtrW (LPCWSTR lpSrc, LPWSTR lpDest, INT nMaxLen) return 0; if (lpSrc == NULL) { - lpDest[0] = L'\0'; + lpDest[0] = '\0'; return 0; } @@ -249,7 +249,7 @@ INT WINAPI Str_GetPtrW (LPCWSTR lpSrc, LPWSTR lpDest, INT nMaxLen) len = nMaxLen - 1; RtlMoveMemory (lpDest, lpSrc, len*sizeof(WCHAR)); - lpDest[len] = L'\0'; + lpDest[len] = '\0'; return len; } diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 032ef25..4e11c5c 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -427,7 +427,7 @@ TOOLTIPS_GetTipText (HWND hwnd, TOOLTIPS_INFO *infoPtr, INT nTool) } else { /* no text available */ - infoPtr->szTipText[0] = L'\0'; + infoPtr->szTipText[0] = '\0'; } TRACE("%s\n", debugstr_w(infoPtr->szTipText)); @@ -515,7 +515,7 @@ TOOLTIPS_Show (HWND hwnd, TOOLTIPS_INFO *infoPtr) TOOLTIPS_GetTipText (hwnd, infoPtr, infoPtr->nCurrentTool); - if (infoPtr->szTipText[0] == L'\0') { + if (infoPtr->szTipText[0] == '\0') { infoPtr->nCurrentTool = -1; return; } @@ -734,7 +734,7 @@ TOOLTIPS_TrackShow (HWND hwnd, TOOLTIPS_INFO *infoPtr) TOOLTIPS_GetTipText (hwnd, infoPtr, infoPtr->nTrackTool); - if (infoPtr->szTipText[0] == L'\0') { + if (infoPtr->szTipText[0] == '\0') { infoPtr->nTrackTool = -1; return; }

1 0

Michael Stefaniuc : ole32: Do not use wide character constants.
by Alexandre Julliard 22 Jun '07

22 Jun '07

Module: wine Branch: master Commit: 717cccb5ce53e49e405e89862f9f84b35037243d URL: http://source.winehq.org/git/wine.git/?a=commit;h=717cccb5ce53e49e405e89862… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 21 22:57:32 2007 +0200 ole32: Do not use wide character constants. --- dlls/ole32/ole2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 3ae9f55..e58385b 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2597,7 +2597,7 @@ BSTR WINAPI PropSysAllocString(LPCOLESTR str) * string. */ stringBuffer = (WCHAR*)newBuffer; - stringBuffer[len] = L'\0'; + stringBuffer[len] = '\0'; return (LPWSTR)stringBuffer; }

1 0

Michael Stefaniuc : oleaut32: Do not use wide character constants.
by Alexandre Julliard 22 Jun '07

22 Jun '07

Module: wine Branch: master Commit: 34b45b311e766cd86b2b016deb2e98f788e6e7fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=34b45b311e766cd86b2b016de… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 21 22:57:21 2007 +0200 oleaut32: Do not use wide character constants. --- dlls/oleaut32/oleaut.c | 2 +- dlls/oleaut32/typelib.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 6778af1..202db67 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -266,7 +266,7 @@ BSTR WINAPI SysAllocStringLen(const OLECHAR *str, unsigned int len) * string. */ stringBuffer = (WCHAR*)newBuffer; - stringBuffer[len] = L'\0'; + stringBuffer[len] = '\0'; return (LPWSTR)stringBuffer; } diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 1558593..5a6fc16 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1636,7 +1636,7 @@ static void MSFT_ReadValue( VARIANT * pVar, int offset, TLBContext *pcx ) MSFT_Read(ptr, size, pcx, DO_NOT_SEEK);/* read string (ANSI) */ V_BSTR(pVar)=SysAllocStringLen(NULL,size); /* FIXME: do we need a AtoW conversion here? */ - V_UNION(pVar, bstrVal[size])=L'\0'; + V_UNION(pVar, bstrVal[size])='\0'; while(size--) V_UNION(pVar, bstrVal[size])=ptr[size]; TLB_Free(ptr); }

1 0

Michael Stefaniuc : setupapi: Do not use wide character constants.
by Alexandre Julliard 22 Jun '07

22 Jun '07

Module: wine Branch: master Commit: 67ed76e685ec89b243af11fdb892e38929de0110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67ed76e685ec89b243af11fdb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 21 22:56:32 2007 +0200 setupapi: Do not use wide character constants. --- dlls/setupapi/devinst.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index e2a2dfe..0ec10dc 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -271,7 +271,7 @@ BOOL WINAPI SetupDiBuildClassInfoListExW( TRACE("Guid: %p\n", szKeyName); if (dwGuidListIndex < ClassGuidListSize) { - if (szKeyName[0] == L'{' && szKeyName[37] == L'}') + if (szKeyName[0] == '{' && szKeyName[37] == '}') { szKeyName[37] = 0; } @@ -447,7 +447,7 @@ BOOL WINAPI SetupDiClassGuidsFromNameExW( TRACE("Guid: %p\n", szKeyName); if (dwGuidListIndex < ClassGuidListSize) { - if (szKeyName[0] == L'{' && szKeyName[37] == L'}') + if (szKeyName[0] == '{' && szKeyName[37] == '}') { szKeyName[37] = 0; }

1 0

Michael Stefaniuc : riched20: Do not use wide character constants.
by Alexandre Julliard 22 Jun '07

22 Jun '07

Module: wine Branch: master Commit: df01f671759c74fb9293d701882637a96ae35c5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=df01f671759c74fb9293d7018… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 21 22:56:17 2007 +0200 riched20: Do not use wide character constants. --- dlls/riched20/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index 2f60810..10f6239 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -130,7 +130,7 @@ ME_String *ME_VSplitString(ME_String *orig, int charidx) s = ME_MakeString(orig->szData+charidx); orig->nLen = charidx; - orig->szData[charidx] = L'\0'; + orig->szData[charidx] = '\0'; return s; }

1 0

Michael Stefaniuc : shlwapi: Remove more wide character constants.
by Alexandre Julliard 22 Jun '07

22 Jun '07

Module: wine Branch: master Commit: 14077f67c89105de8776cf2accce3a949bad2932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14077f67c89105de8776cf2ac… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 21 22:56:09 2007 +0200 shlwapi: Remove more wide character constants. --- dlls/shlwapi/url.c | 138 ++++++++++++++++++++++++++-------------------------- 1 files changed, 69 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14077f67c89105de8776c…

1 0

Michael Stefaniuc : winmm: Do not dump the version info when loading drivers.
by Alexandre Julliard 22 Jun '07

22 Jun '07

Module: wine Branch: master Commit: cc2773008e4f844a5a8cd26eca002fd3b988a613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc2773008e4f844a5a8cd26ec… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 21 21:32:28 2007 +0200 winmm: Do not dump the version info when loading drivers. --- dlls/winmm/lolvldrv.c | 69 ------------------------------------------------- 1 files changed, 0 insertions(+), 69 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index 55ed500..f508395 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -103,68 +103,6 @@ BOOL MMDRV_Is32(unsigned int idx) } /************************************************************************** - * MMDRV_GetDescription32 [internal] - */ -static BOOL MMDRV_GetDescription32(const char* fname, char* buf, int buflen) -{ - OFSTRUCT ofs; - DWORD h; - LPVOID ptr = 0; - LPVOID val; - DWORD dw; - BOOL ret = FALSE; - UINT u; - FARPROC pGetFileVersionInfoSizeA; - FARPROC pGetFileVersionInfoA; - FARPROC pVerQueryValueA; - HMODULE hmodule = 0; - TRACE("(%p, %p, %d)\n", fname, buf, buflen); - -#define E(_x) do {TRACE _x;goto theEnd;} while(0) - - if (OpenFile(fname, &ofs, OF_EXIST)==HFILE_ERROR) E(("Can't find file %s\n", fname)); - - if (!(hmodule = LoadLibraryA( "version.dll" ))) goto theEnd; - if (!(pGetFileVersionInfoSizeA = GetProcAddress( hmodule, "GetFileVersionInfoSizeA" ))) - goto theEnd; - if (!(pGetFileVersionInfoA = GetProcAddress( hmodule, "GetFileVersionInfoA" ))) - goto theEnd; - if (!(pVerQueryValueA = GetProcAddress( hmodule, "VerQueryValueA" ))) - goto theEnd; - - if (!(dw = pGetFileVersionInfoSizeA(ofs.szPathName, &h))) E(("Can't get FVIS\n")); - if (!(ptr = HeapAlloc(GetProcessHeap(), 0, dw))) E(("OOM\n")); - if (!pGetFileVersionInfoA(ofs.szPathName, h, dw, ptr)) E(("Can't get FVI\n")); - -#define A(_x) if (pVerQueryValueA(ptr, "\\StringFileInfo\\040904B0\\" #_x, &val, &u)) \ - TRACE(#_x " => %s\n", (LPSTR)val); else TRACE(#_x " @\n") - - A(CompanyName); - A(FileDescription); - A(FileVersion); - A(InternalName); - A(LegalCopyright); - A(OriginalFilename); - A(ProductName); - A(ProductVersion); - A(Comments); - A(LegalTrademarks); - A(PrivateBuild); - A(SpecialBuild); -#undef A - - if (!pVerQueryValueA(ptr, "\\StringFileInfo\\040904B0\\ProductName", &val, &u)) E(("Can't get product name\n")); - lstrcpynA(buf, val, buflen); - -#undef E - ret = TRUE; -theEnd: - HeapFree(GetProcessHeap(), 0, ptr); - if (hmodule) FreeLibrary( hmodule ); - return ret; -} - -/************************************************************************** * MMDRV_GetNum [internal] */ UINT MMDRV_GetNum(UINT type) @@ -666,7 +604,6 @@ static BOOL MMDRV_Install(LPCSTR drvRegName, LPCSTR drvFileName, BOOL bIsMapper) if (lpDrv->bIs32) { WINEMM_msgFunc32 func; - char buffer[128]; if (d->d.d32.hModule) { #define A(_x,_y) AA(d->d.d32.hModule,_x,_y,32,GetProcAddress) @@ -678,12 +615,6 @@ static BOOL MMDRV_Install(LPCSTR drvRegName, LPCSTR drvFileName, BOOL bIsMapper) A(MMDRV_WAVEOUT, wodMessage); #undef A } - if (TRACE_ON(winmm)) { - if (MMDRV_GetDescription32(drvFileName, buffer, sizeof(buffer))) - TRACE("%s => %s\n", drvFileName, buffer); - else - TRACE("%s => No description\n", drvFileName); - } } else if (WINMM_CheckForMMSystem() && pFnLoadMMDrvFunc16) { count += pFnLoadMMDrvFunc16(drvFileName, d, lpDrv); }

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2007