November 2007 - Wine-Commits

Gerald Pfeifer : user32: Reduce scope of variable in ICO_ExtractIconExW() and initialize it.
by Alexandre Julliard Nov. 29, 2007

Nov. 29, 2007

Module: wine Branch: master Commit: 2ff2d88510fea8c7be40b2fe9cfb105b3a35620d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ff2d88510fea8c7be40b2fe9… Author: Gerald Pfeifer <pfeifer(a)dbai.tuwien.ac.at> Date: Wed Nov 28 23:59:45 2007 +0100 user32: Reduce scope of variable in ICO_ExtractIconExW() and initialize it. --- dlls/user32/exticon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c index 8b70309..2b54df4 100644 --- a/dlls/user32/exticon.c +++ b/dlls/user32/exticon.c @@ -338,7 +338,6 @@ static UINT ICO_ExtractIconExW( UINT16 iconDirCount = 0,iconCount = 0; LPBYTE peimage; HANDLE fmapping; - ULONG uSize; DWORD fsizeh,fsizel; WCHAR szExePath[MAX_PATH]; DWORD dwSearchReturn; @@ -420,6 +419,7 @@ static UINT ICO_ExtractIconExW( NE_NAMEINFO *pIconStorage = NULL; NE_NAMEINFO *pIconDir = NULL; LPicoICONDIR lpiID = NULL; + ULONG uSize = 0; TRACE("-- OS2/icon Signature (0x%08x)\n", sig);

1 0

Gerald Pfeifer : kernel32: Handle default case in Local32_FromHandle().
by Alexandre Julliard Nov. 29, 2007

Nov. 29, 2007

Module: wine Branch: master Commit: 3ce295a1efb96de2992f79dd114c276a16429c66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ce295a1efb96de2992f79dd1… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Nov 28 23:26:10 2007 +0100 kernel32: Handle default case in Local32_FromHandle(). --- dlls/kernel32/local16.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/local16.c b/dlls/kernel32/local16.c index 87f11ed..36bd774 100644 --- a/dlls/kernel32/local16.c +++ b/dlls/kernel32/local16.c @@ -1930,6 +1930,7 @@ static VOID Local32_ToHandle( LOCAL32HEADER *header, INT16 type, static VOID Local32_FromHandle( LOCAL32HEADER *header, INT16 type, DWORD *addr, LPDWORD handle, LPBYTE ptr ) { + *addr = 0; switch (type) { case -2: /* 16:16 pointer */

1 0

Alexandre Julliard : libwine: Work around the Mac OS dynamic loader support for PE files.
by Alexandre Julliard Nov. 29, 2007

Nov. 29, 2007

Module: wine Branch: master Commit: 6475603985c511c29fd027079286bb99d60a6a4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6475603985c511c29fd027079… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 29 15:32:49 2007 +0100 libwine: Work around the Mac OS dynamic loader support for PE files. --- libs/wine/loader.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 2f78248..13eb84a 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -668,6 +668,25 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize #ifdef HAVE_DLOPEN void *ret; const char *s; + +#ifdef __APPLE__ + /* the Mac OS loader pretends to be able to load PE files, so avoid them here */ + unsigned char magic[2]; + int fd = open( filename, O_RDONLY ); + if (fd != -1) + { + if (pread( fd, magic, 2, 0 ) == 2 && magic[0] == 'M' && magic[1] == 'Z') + { + static const char msg[] = "MZ format"; + size_t len = min( errorsize, sizeof(msg) ); + memcpy( error, msg, len ); + error[len - 1] = 0; + close( fd ); + return NULL; + } + close( fd ); + } +#endif dlerror(); dlerror(); #ifdef __sun if (strchr( filename, ':' ))

1 0

Aric Stewart : coreaudio: Verify valid lineId in MIXER_GETLINECONTROLSF_ONEBYTYPE.
by Alexandre Julliard Nov. 29, 2007

Nov. 29, 2007

Module: wine Branch: master Commit: b314f1321939eee9187f092d13bb089e5b7d787a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b314f1321939eee9187f092d1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Nov 29 13:42:39 2007 +0900 coreaudio: Verify valid lineId in MIXER_GETLINECONTROLSF_ONEBYTYPE. --- dlls/winecoreaudio.drv/mixer.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/mixer.c b/dlls/winecoreaudio.drv/mixer.c index 25f3d55..66db8cb 100644 --- a/dlls/winecoreaudio.drv/mixer.c +++ b/dlls/winecoreaudio.drv/mixer.c @@ -760,6 +760,11 @@ static DWORD MIX_GetLineControls(WORD wDevID, LPMIXERLINECONTROLSW lpMlc, DWORD_ break; case MIXER_GETLINECONTROLSF_ONEBYTYPE: TRACE("dwLineID=%d MIXER_GETLINECONTROLSF_ONEBYTYPE (%s)\n", lpMlc->dwLineID, getControlType(lpMlc->u.dwControlType)); + if ( (lpMlc->dwLineID < 0) || (lpMlc->dwLineID >= mixer.caps.cDestinations) ) + { + ret = MIXERR_INVALLINE; + break; + } if (lpMlc->u.dwControlType == MIXERCONTROL_CONTROLTYPE_VOLUME) { ctrl = (lpMlc->dwLineID * ControlsPerLine) + IDControlVolume;

1 0

Aric Stewart : winmm: Correct check for MIXER_GETLINECONTROLSF_ONEBYTYPE in mixerGetLineControlsA .
by Alexandre Julliard Nov. 29, 2007

Nov. 29, 2007

Module: wine Branch: master Commit: 35ecb1b6ee117a3bb97a7352a056f4532fc86dd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35ecb1b6ee117a3bb97a7352a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Nov 29 13:34:06 2007 +0900 winmm: Correct check for MIXER_GETLINECONTROLSF_ONEBYTYPE in mixerGetLineControlsA. --- dlls/winmm/winmm.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 6ead107..1f3602c 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -521,7 +521,7 @@ UINT WINAPI mixerGetLineControlsA(HMIXEROBJ hmix, LPMIXERLINECONTROLSA lpmlcA, /* Debugging on Windows shows for MIXER_GETLINECONTROLSF_ONEBYTYPE only, the control count is assumed to be 1 - This is relied upon by a game, "Dynomite Deluze" */ - if (MIXER_GETLINECONTROLSF_ONEBYTYPE == fdwControls) { + if (MIXER_GETLINECONTROLSF_ONEBYTYPE == (fdwControls & MIXER_GETLINECONTROLSF_QUERYMASK)) { mlcW.cControls = 1; } else { mlcW.cControls = lpmlcA->cControls; @@ -536,7 +536,6 @@ UINT WINAPI mixerGetLineControlsA(HMIXEROBJ hmix, LPMIXERLINECONTROLSA lpmlcA, lpmlcA->dwLineID = mlcW.dwLineID; lpmlcA->u.dwControlID = mlcW.u.dwControlID; lpmlcA->u.dwControlType = mlcW.u.dwControlType; - lpmlcA->cControls = mlcW.cControls; for (i = 0; i < mlcW.cControls; i++) { lpmlcA->pamxctrl[i].cbStruct = sizeof(MIXERCONTROLA);

1 0

Marco Schuster : wined3d: Added a card ID for a 8600 Mobile GT.
by Alexandre Julliard Nov. 29, 2007

Nov. 29, 2007

Module: wine Branch: master Commit: 15e1c571417d57216f13a08c1dd93783d41b0417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15e1c571417d57216f13a08c1… Author: Marco Schuster <marco(a)harddisk.is-a-geek.org> Date: Wed Nov 28 22:34:03 2007 +0100 wined3d: Added a card ID for a 8600 Mobile GT. --- dlls/wined3d/directx.c | 5 +++++ include/wine/wined3d_gl.h | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9700ae3..e4b5bdf 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -957,6 +957,11 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { gl_info->gl_card = CARD_NVIDIA_GEFORCE_8600GT; vidmem = 256; } + /* Geforce8 - midend mobile */ + else if(strstr(gl_info->gl_renderer, "8600 M")) { + gl_info->gl_card = CARD_NVIDIA_GEFORCE_8600MGT; + vidmem = 512; + } /* Geforce8 - lowend */ else if(strstr(gl_info->gl_renderer, "8300") || strstr(gl_info->gl_renderer, "8400") || diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 9c26950..ec2edaf 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -3118,6 +3118,7 @@ typedef enum _GL_Cards { CARD_NVIDIA_GEFORCE_7800GT = 0x0092, CARD_NVIDIA_GEFORCE_8300GS = 0x0423, CARD_NVIDIA_GEFORCE_8600GT = 0x0402, + CARD_NVIDIA_GEFORCE_8600MGT = 0x0407, CARD_NVIDIA_GEFORCE_8800GTS = 0x0193, CARD_INTEL_845G = 0x2562,

1 0

Andrew Talbot : advapi32: Fix a typo.
by Alexandre Julliard Nov. 29, 2007

Nov. 29, 2007

Module: wine Branch: master Commit: fd03f4ae86d40350f7d6af5350f462e1000ea1c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd03f4ae86d40350f7d6af535… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 28 22:17:05 2007 +0000 advapi32: Fix a typo. --- dlls/advapi32/registry.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 030dfa8..4b9f29d 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1401,7 +1401,7 @@ static VOID ADVAPI_ApplyRestrictions( DWORD dwFlags, DWORD dwType, if ((dwFlags & RRF_RT_DWORD) == RRF_RT_DWORD) cbExpect = 4; - else if ((dwFlags & RRF_RT_DWORD) == RRF_RT_QWORD) + else if ((dwFlags & RRF_RT_QWORD) == RRF_RT_QWORD) cbExpect = 8; if (cbExpect && cbData != cbExpect)

1 0

James Hawkins : msi: Don' t check for the media or cabinet if the cabinet is internal.
by Alexandre Julliard Nov. 29, 2007

Nov. 29, 2007

Module: wine Branch: master Commit: 33a4fe19de185b273fc85cc316e7d55de280a0bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=33a4fe19de185b273fc85cc31… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Nov 28 14:56:53 2007 -0600 msi: Don't check for the media or cabinet if the cabinet is internal. --- dlls/msi/files.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 229525e..8d5321c 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -617,6 +617,10 @@ static UINT ready_media(MSIPACKAGE *package, MSIFILE *file, struct media_info *m return ERROR_FUNCTION_FAILED; } + /* cabinet is internal, no checks needed */ + if (!mi->cabinet || mi->cabinet[0] == '#') + return ERROR_SUCCESS; + /* package should be downloaded */ if (file->IsCompressed && GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES && @@ -647,7 +651,6 @@ static UINT ready_media(MSIPACKAGE *package, MSIFILE *file, struct media_info *m } if (file->IsCompressed && - mi->cabinet && mi->cabinet[0] != '#' && GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES) { ERR("Cabinet not found: %s\n", debugstr_w(mi->source));

1 0

James Hawkins : msi: Make sure attr is valid before checking for the directory bit.
by Alexandre Julliard Nov. 29, 2007

Nov. 29, 2007

Module: wine Branch: master Commit: 32d3ffc5c51901bab829ecf66d45177cab4be732 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32d3ffc5c51901bab829ecf66… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Nov 28 14:55:48 2007 -0600 msi: Make sure attr is valid before checking for the directory bit. --- dlls/msi/appsearch.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 5baaa76..64b2d48 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -677,14 +677,15 @@ static UINT ACTION_RecurseSearchDirectory(MSIPACKAGE *package, LPWSTR *appValue, static UINT ACTION_CheckDirectory(MSIPACKAGE *package, LPCWSTR dir, LPWSTR *appValue) { - UINT rc = ERROR_SUCCESS; + DWORD attr = GetFileAttributesW(dir); - if (GetFileAttributesW(dir) & FILE_ATTRIBUTE_DIRECTORY) + if (attr != INVALID_FILE_ATTRIBUTES && (attr & FILE_ATTRIBUTE_DIRECTORY)) { TRACE("directory exists, returning %s\n", debugstr_w(dir)); *appValue = strdupW(dir); } - return rc; + + return ERROR_SUCCESS; } static BOOL ACTION_IsFullPath(LPCWSTR path)

1 0

Stefan Dösinger : wined3d: Activate GL_ARB_texture_rectangle.
by Alexandre Julliard Nov. 29, 2007

Nov. 29, 2007

Module: wine Branch: master Commit: d09cbcec91561186bee77aaba55b29cbf2d7e7ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=d09cbcec91561186bee77aaba… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 28 20:35:04 2007 +0100 wined3d: Activate GL_ARB_texture_rectangle. --- dlls/wined3d/device.c | 18 ++++++++++++++---- dlls/wined3d/surface.c | 8 ++++++++ dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 33c7628..6d9e7bb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -891,10 +891,20 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, U /** FIXME: add support for real non-power-two if it's provided by the video card **/ /* Precalculated scaling for 'faked' non power of two texture coords */ - object->baseTexture.pow2Matrix[0] = (((float)Width) / ((float)pow2Width)); - object->baseTexture.pow2Matrix[5] = (((float)Height) / ((float)pow2Height)); - object->baseTexture.pow2Matrix[10] = 1.0; - object->baseTexture.pow2Matrix[15] = 1.0; + if(GL_SUPPORT(ARB_TEXTURE_RECTANGLE) && + (Width != pow2Width || Height != pow2Height)) { + object->baseTexture.pow2Matrix[0] = (float)Width; + object->baseTexture.pow2Matrix[5] = (float)Height; + object->baseTexture.pow2Matrix[10] = 1.0; + object->baseTexture.pow2Matrix[15] = 1.0; + object->target = GL_TEXTURE_RECTANGLE_ARB; + } else { + object->baseTexture.pow2Matrix[0] = (((float)Width) / ((float)pow2Width)); + object->baseTexture.pow2Matrix[5] = (((float)Height) / ((float)pow2Height)); + object->baseTexture.pow2Matrix[10] = 1.0; + object->baseTexture.pow2Matrix[15] = 1.0; + object->target = GL_TEXTURE_2D; + } TRACE(" xf(%f) yf(%f)\n", object->baseTexture.pow2Matrix[0], object->baseTexture.pow2Matrix[5]); /* Calculate levels for mip mapping */ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 89f8e93..2030f95 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3505,6 +3505,14 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) { This->glRect.right = 0; This->glRect.bottom = 0; } else { + /* Check this after the oversize check - do not make an oversized surface a texture_rectangle one */ + if(This->Flags & SFLAG_NONPOW2 && GL_SUPPORT(ARB_TEXTURE_RECTANGLE)) { + This->glDescription.target = GL_TEXTURE_RECTANGLE_ARB; + This->pow2Width = This->currentDesc.Width; + This->pow2Height = This->currentDesc.Height; + This->Flags &= ~SFLAG_NONPOW2; + } + /* No oversize, gl rect is the full texture size */ This->Flags &= ~SFLAG_OVERSIZE; This->glRect.left = 0; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1bdd664..c96d35d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -207,7 +207,7 @@ static UINT WINAPI IWineD3DTextureImpl_GetTextureDimensions(IWineD3DTexture *ifa IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; TRACE("(%p)\n", This); - return GL_TEXTURE_2D; + return This->target; } static void WINAPI IWineD3DTextureImpl_ApplyStateChanges(IWineD3DTexture *iface, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f1a4287..a06083d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -948,6 +948,7 @@ typedef struct IWineD3DTextureImpl UINT width; UINT height; + UINT target; } IWineD3DTextureImpl;

1 0