January 2009 - Wine-commits

Alexandre Julliard : wininet: Use ~0u instead of ~0ul for DWORD values.
by Alexandre Julliard 05 Jan '09

05 Jan '09

Module: wine Branch: master Commit: 97da2e57fb407180a721351bdc7ce8860989b2da URL: http://source.winehq.org/git/wine.git/?a=commit;h=97da2e57fb407180a721351bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 5 12:40:39 2009 +0100 wininet: Use ~0u instead of ~0ul for DWORD values. --- dlls/wininet/http.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 2b9b95f..d4ea219 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1695,7 +1695,7 @@ static DWORD HTTP_ReadChunked(WININETHTTPREQW *req, void *buffer, DWORD size, DW { if (*read == size) break; - if (req->dwContentLength == ~0UL) /* new chunk */ + if (req->dwContentLength == ~0u) /* new chunk */ { buflen = sizeof(reply); if (!NETCON_getNextLine(&req->netConnection, reply, &buflen)) break; @@ -1736,7 +1736,7 @@ static DWORD HTTP_ReadChunked(WININETHTTPREQW *req, void *buffer, DWORD size, DW if (req->dwContentRead == req->dwContentLength) /* chunk complete */ { req->dwContentRead = 0; - req->dwContentLength = ~0UL; + req->dwContentLength = ~0u; buflen = sizeof(reply); if (!NETCON_getNextLine(&req->netConnection, reply, &buflen))

1 0

Dmitry Timoshkov : winex11: Indicate that dmDisplayFlags is also initialized.
by Alexandre Julliard 05 Jan '09

05 Jan '09

Module: wine Branch: master Commit: 48973dad53f9292204cd5a193a56cff65d3eba2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=48973dad53f9292204cd5a193… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jan 5 17:53:50 2009 +0800 winex11: Indicate that dmDisplayFlags is also initialized. --- dlls/winex11.drv/settings.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 6bd804a..e2aafbc 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -299,7 +299,8 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo devmode->dmPelsHeight = dd_modes[n].dwHeight; devmode->dmBitsPerPel = dd_modes[n].dwBPP; devmode->dmDisplayFrequency = dd_modes[n].wRefreshRate; - devmode->dmFields = (DM_PELSWIDTH|DM_PELSHEIGHT|DM_BITSPERPEL); + devmode->dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | + DM_DISPLAYFLAGS; if (devmode->dmDisplayFrequency) { devmode->dmFields |= DM_DISPLAYFREQUENCY;

1 0

Henri Verbeet : wined3d: Convert transform to a bitmap in struct SAVEDSTATES.
by Alexandre Julliard 05 Jan '09

05 Jan '09

Module: wine Branch: master Commit: fc39831e4cc46615b71ad81d74183bfae96b1f31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc39831e4cc46615b71ad81d7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 5 10:10:16 2009 +0100 wined3d: Convert transform to a bitmap in struct SAVEDSTATES. --- dlls/wined3d/device.c | 15 ++++++++++----- dlls/wined3d/stateblock.c | 12 ++++++++++-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1ce2287..8c98962 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2669,7 +2669,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTransform(IWineD3DDevice *iface, W /* Handle recording of state blocks */ if (This->isRecordingState) { TRACE("Recording... not performing anything\n"); - This->updateStateBlock->changed.transform[d3dts] = TRUE; + This->updateStateBlock->changed.transform[d3dts >> 5] |= 1 << (d3dts & 0x1f); This->updateStateBlock->transforms[d3dts] = *lpmatrix; return WINED3D_OK; } @@ -4752,10 +4752,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_EndStateBlock(IWineD3DDevice *iface, IW object->num_contained_render_states++; } } - for(i = 1; i <= HIGHEST_TRANSFORMSTATE; i++) { - if(object->changed.transform[i]) { - object->contained_transform_states[object->num_contained_transform_states] = i; - object->num_contained_transform_states++; + + for (i = 0; i <= HIGHEST_TRANSFORMSTATE >> 5; ++i) + { + DWORD map = object->changed.transform[i]; + for (j = 0; map; map >>= 1, ++j) + { + if (!(map & 1)) continue; + + object->contained_transform_states[object->num_contained_transform_states++] = (i << 5) | j; } } for(i = 0; i < GL_LIMITS(vshader_constantsF); i++) { diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 1ffdabe..d5206c7 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -89,7 +89,7 @@ static void stateblock_savedstates_copy(IWineD3DStateBlock* iface, SAVEDSTATES * dest->streamSource = source->streamSource; dest->streamFreq = source->streamFreq; dest->textures = source->textures; - memcpy(dest->transform, source->transform, bsize * (HIGHEST_TRANSFORMSTATE + 1)); + memcpy(dest->transform, source->transform, sizeof(source->transform)); memcpy(dest->renderState, source->renderState, bsize * (WINEHIGHEST_RENDER_STATE + 1)); memcpy(dest->textureState, source->textureState, bsize * MAX_TEXTURES * (WINED3D_HIGHEST_TEXTURE_STATE + 1)); memcpy(dest->samplerState, source->samplerState, bsize * MAX_COMBINED_SAMPLERS * (WINED3D_HIGHEST_SAMPLER_STATE + 1)); @@ -104,6 +104,13 @@ static void stateblock_savedstates_copy(IWineD3DStateBlock* iface, SAVEDSTATES * memcpy(dest->vertexShaderConstantsF, source->vertexShaderConstantsF, bsize * GL_LIMITS(vshader_constantsF)); } +static inline void stateblock_set_bits(DWORD *map, UINT map_size) +{ + DWORD mask = (1 << (map_size & 0x1f)) - 1; + memset(map, 0xff, (map_size >> 5) * sizeof(*map)); + if (mask) map[map_size >> 5] = mask; +} + /** Set all members of a stateblock savedstate to the given value */ void stateblock_savedstates_set( IWineD3DStateBlock* iface, @@ -126,7 +133,8 @@ void stateblock_savedstates_set( states->streamSource = value ? 0xffff : 0; states->streamFreq = value ? 0xffff : 0; states->textures = value ? 0xfffff : 0; - memset(states->transform, value, bsize * (HIGHEST_TRANSFORMSTATE + 1)); + if (value) stateblock_set_bits(states->transform, HIGHEST_TRANSFORMSTATE + 1); + else memset(states->transform, 0, sizeof(states->transform)); memset(states->renderState, value, bsize * (WINEHIGHEST_RENDER_STATE + 1)); memset(states->textureState, value, bsize * MAX_TEXTURES * (WINED3D_HIGHEST_TEXTURE_STATE + 1)); memset(states->samplerState, value, bsize * MAX_COMBINED_SAMPLERS * (WINED3D_HIGHEST_SAMPLER_STATE + 1)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 90f8ee1..b974077 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1758,10 +1758,10 @@ extern const IWineD3DVertexDeclarationVtbl IWineD3DVertexDeclaration_Vtbl; /* Note: Very long winded but gl Lists are not flexible enough */ /* to resolve everything we need, so doing it manually for now */ typedef struct SAVEDSTATES { + DWORD transform[(HIGHEST_TRANSFORMSTATE >> 5) + 1]; WORD streamSource; /* MAX_STREAMS, 16 */ WORD streamFreq; /* MAX_STREAMS, 16 */ DWORD textures; /* MAX_COMBINED_SAMPLERS, 20 */ - BOOL transform[HIGHEST_TRANSFORMSTATE + 1]; BOOL renderState[WINEHIGHEST_RENDER_STATE + 1]; BOOL textureState[MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; BOOL samplerState[MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1];

1 0

Alexandre Julliard : dinput: Fix pointer cast warnings on 64-bit.
by Alexandre Julliard 05 Jan '09

05 Jan '09

Module: wine Branch: master Commit: fffcd23cce0f3553323206cf4cd151b1f83450d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fffcd23cce0f3553323206cf4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 5 12:39:44 2009 +0100 dinput: Fix pointer cast warnings on 64-bit. --- dlls/dinput/device.c | 6 +++--- dlls/dinput/joystick_linux.c | 12 ++++++------ dlls/dinput/joystick_linuxinput.c | 16 ++++++++-------- dlls/dinput/keyboard.c | 2 +- dlls/dinput/mouse.c | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 20a577b..91449f8 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -876,7 +876,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetProperty( switch (LOWORD(rguid)) { - case (DWORD) DIPROP_BUFFERSIZE: + case (DWORD_PTR) DIPROP_BUFFERSIZE: { LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph; @@ -910,7 +910,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SetProperty( switch (LOWORD(rguid)) { - case (DWORD) DIPROP_AXISMODE: + case (DWORD_PTR) DIPROP_AXISMODE: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)pdiph; @@ -930,7 +930,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SetProperty( LeaveCriticalSection(&This->crit); break; } - case (DWORD) DIPROP_BUFFERSIZE: + case (DWORD_PTR) DIPROP_BUFFERSIZE: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)pdiph; diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 00bc3bd..faef24f 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -795,7 +795,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty( if (!HIWORD(rguid)) { switch (LOWORD(rguid)) { - case (DWORD)DIPROP_RANGE: { + case (DWORD_PTR)DIPROP_RANGE: { LPCDIPROPRANGE pr = (LPCDIPROPRANGE)ph; if (ph->dwHow == DIPH_DEVICE) { TRACE("proprange(%d,%d) all\n", pr->lMin, pr->lMax); @@ -815,7 +815,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty( } break; } - case (DWORD)DIPROP_DEADZONE: { + case (DWORD_PTR)DIPROP_DEADZONE: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; if (ph->dwHow == DIPH_DEVICE) { TRACE("deadzone(%d) all\n", pd->dwData); @@ -832,7 +832,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty( } break; } - case (DWORD)DIPROP_SATURATION: { + case (DWORD_PTR)DIPROP_SATURATION: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; if (ph->dwHow == DIPH_DEVICE) { TRACE("saturation(%d) all\n", pd->dwData); @@ -919,7 +919,7 @@ static HRESULT WINAPI JoystickAImpl_GetProperty( if (!HIWORD(rguid)) { switch (LOWORD(rguid)) { - case (DWORD) DIPROP_RANGE: { + case (DWORD_PTR) DIPROP_RANGE: { LPDIPROPRANGE pr = (LPDIPROPRANGE)pdiph; int obj = find_property(&This->base.data_format, pdiph); @@ -933,7 +933,7 @@ static HRESULT WINAPI JoystickAImpl_GetProperty( } break; } - case (DWORD) DIPROP_DEADZONE: { + case (DWORD_PTR) DIPROP_DEADZONE: { LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph; int obj = find_property(&This->base.data_format, pdiph); @@ -944,7 +944,7 @@ static HRESULT WINAPI JoystickAImpl_GetProperty( } break; } - case (DWORD) DIPROP_SATURATION: { + case (DWORD_PTR) DIPROP_SATURATION: { LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph; int obj = find_property(&This->base.data_format, pdiph); diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 2511750..6f5b362 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -852,7 +852,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, if (!HIWORD(rguid)) { switch (LOWORD(rguid)) { - case (DWORD)DIPROP_RANGE: { + case (DWORD_PTR)DIPROP_RANGE: { LPCDIPROPRANGE pr = (LPCDIPROPRANGE)ph; if (ph->dwHow == DIPH_DEVICE) { @@ -880,7 +880,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, fake_current_js_state(This); break; } - case (DWORD)DIPROP_DEADZONE: { + case (DWORD_PTR)DIPROP_DEADZONE: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; if (ph->dwHow == DIPH_DEVICE) { DWORD i; @@ -899,18 +899,18 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, fake_current_js_state(This); break; } - case (DWORD)DIPROP_CALIBRATIONMODE: { + case (DWORD_PTR)DIPROP_CALIBRATIONMODE: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; FIXME("DIPROP_CALIBRATIONMODE(%d)\n", pd->dwData); break; } - case (DWORD)DIPROP_AUTOCENTER: { + case (DWORD_PTR)DIPROP_AUTOCENTER: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; FIXME("DIPROP_AUTOCENTER(%d)\n", pd->dwData); break; } - case (DWORD)DIPROP_SATURATION: { + case (DWORD_PTR)DIPROP_SATURATION: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; if (ph->dwHow == DIPH_DEVICE) { @@ -999,7 +999,7 @@ static HRESULT WINAPI JoystickAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, if (HIWORD(rguid)) return DI_OK; switch (LOWORD(rguid)) { - case (DWORD) DIPROP_RANGE: + case (DWORD_PTR) DIPROP_RANGE: { LPDIPROPRANGE pr = (LPDIPROPRANGE) pdiph; int obj = find_property(&This->base.data_format, pdiph); @@ -1011,7 +1011,7 @@ static HRESULT WINAPI JoystickAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, TRACE("range(%d, %d) obj=%d\n", pr->lMin, pr->lMax, obj); break; } - case (DWORD) DIPROP_DEADZONE: + case (DWORD_PTR) DIPROP_DEADZONE: { LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph; int obj = find_property(&This->base.data_format, pdiph); @@ -1022,7 +1022,7 @@ static HRESULT WINAPI JoystickAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, TRACE("deadzone(%d) obj=%d\n", pd->dwData, obj); break; } - case (DWORD) DIPROP_SATURATION: + case (DWORD_PTR) DIPROP_SATURATION: { LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph; int obj = find_property(&This->base.data_format, pdiph); diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 46d82fc..47536f7 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -443,7 +443,7 @@ static HRESULT WINAPI SysKeyboardAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, switch (LOWORD(rguid)) { - case (DWORD)DIPROP_KEYNAME: + case (DWORD_PTR)DIPROP_KEYNAME: { HRESULT hr; LPDIPROPSTRING ps = (LPDIPROPSTRING)pdiph; diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 1572784..178b8fb 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -585,7 +585,7 @@ static HRESULT WINAPI SysMouseAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, if (!HIWORD(rguid)) { switch (LOWORD(rguid)) { - case (DWORD) DIPROP_GRANULARITY: { + case (DWORD_PTR) DIPROP_GRANULARITY: { LPDIPROPDWORD pr = (LPDIPROPDWORD) pdiph; /* We'll just assume that the app asks about the Z axis */ @@ -594,7 +594,7 @@ static HRESULT WINAPI SysMouseAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, break; } - case (DWORD) DIPROP_RANGE: { + case (DWORD_PTR) DIPROP_RANGE: { LPDIPROPRANGE pr = (LPDIPROPRANGE) pdiph; if ((pdiph->dwHow == DIPH_BYID) &&

1 0

Alexandre Julliard : cabinet: Add CDECL to the cabinet callback functions.
by Alexandre Julliard 05 Jan '09

05 Jan '09

Module: wine Branch: master Commit: 98f89d460dc6c8700bde4d197e89ff101821e1c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98f89d460dc6c8700bde4d197… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 5 12:39:02 2009 +0100 cabinet: Add CDECL to the cabinet callback functions. --- dlls/cabinet/cabinet_main.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index 4748a99..fde5d9a 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -69,17 +69,17 @@ HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi) /* FDI callback functions */ -static void *mem_alloc(ULONG cb) +static void * CDECL mem_alloc(ULONG cb) { return HeapAlloc(GetProcessHeap(), 0, cb); } -static void mem_free(void *memory) +static void CDECL mem_free(void *memory) { HeapFree(GetProcessHeap(), 0, memory); } -static INT_PTR fdi_open(char *pszFile, int oflag, int pmode) +static INT_PTR CDECL fdi_open(char *pszFile, int oflag, int pmode) { HANDLE handle; DWORD dwAccess = 0; @@ -120,7 +120,7 @@ static INT_PTR fdi_open(char *pszFile, int oflag, int pmode) return (INT_PTR) handle; } -static UINT fdi_read(INT_PTR hf, void *pv, UINT cb) +static UINT CDECL fdi_read(INT_PTR hf, void *pv, UINT cb) { HANDLE handle = (HANDLE) hf; DWORD dwRead; @@ -131,7 +131,7 @@ static UINT fdi_read(INT_PTR hf, void *pv, UINT cb) return 0; } -static UINT fdi_write(INT_PTR hf, void *pv, UINT cb) +static UINT CDECL fdi_write(INT_PTR hf, void *pv, UINT cb) { HANDLE handle = (HANDLE) hf; DWORD dwWritten; @@ -142,13 +142,13 @@ static UINT fdi_write(INT_PTR hf, void *pv, UINT cb) return 0; } -static int fdi_close(INT_PTR hf) +static int CDECL fdi_close(INT_PTR hf) { HANDLE handle = (HANDLE) hf; return CloseHandle(handle) ? 0 : -1; } -static long fdi_seek(INT_PTR hf, long dist, int seektype) +static long CDECL fdi_seek(INT_PTR hf, long dist, int seektype) { HANDLE handle = (HANDLE) hf; return SetFilePointer(handle, dist, NULL, seektype); @@ -182,7 +182,7 @@ static BOOL file_in_list(struct FILELIST *pNode, LPCSTR szFilename, return FALSE; } -static INT_PTR fdi_notify_extract(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) +static INT_PTR CDECL fdi_notify_extract(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) { switch (fdint) {

1 0

Alexandre Julliard : setupapi: Add CDECL to the cabinet callback functions.
by Alexandre Julliard 05 Jan '09

05 Jan '09

Module: wine Branch: master Commit: bc778b99f96c3ae5bda9173c46a2353b187d4f2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc778b99f96c3ae5bda9173c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 5 12:39:13 2009 +0100 setupapi: Add CDECL to the cabinet callback functions. --- dlls/setupapi/setupcab.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index f01c3d5..a2a7a5f 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -121,17 +121,17 @@ static void UnloadCABINETDll(void) /* FDICreate callbacks */ -static void *sc_cb_alloc(ULONG cb) +static void * CDECL sc_cb_alloc(ULONG cb) { return HeapAlloc(GetProcessHeap(), 0, cb); } -static void sc_cb_free(void *pv) +static void CDECL sc_cb_free(void *pv) { HeapFree(GetProcessHeap(), 0, pv); } -static INT_PTR sc_cb_open(char *pszFile, int oflag, int pmode) +static INT_PTR CDECL sc_cb_open(char *pszFile, int oflag, int pmode) { DWORD creation = 0, sharing = 0; int ioflag = 0; @@ -202,7 +202,7 @@ static INT_PTR sc_cb_open(char *pszFile, int oflag, int pmode) return ret; } -static UINT sc_cb_read(INT_PTR hf, void *pv, UINT cb) +static UINT CDECL sc_cb_read(INT_PTR hf, void *pv, UINT cb) { DWORD num_read; BOOL rslt; @@ -222,7 +222,7 @@ static UINT sc_cb_read(INT_PTR hf, void *pv, UINT cb) return num_read; } -static UINT sc_cb_write(INT_PTR hf, void *pv, UINT cb) +static UINT CDECL sc_cb_write(INT_PTR hf, void *pv, UINT cb) { DWORD num_written; /* BOOL rv; */ @@ -240,7 +240,7 @@ static UINT sc_cb_write(INT_PTR hf, void *pv, UINT cb) } } -static int sc_cb_close(INT_PTR hf) +static int CDECL sc_cb_close(INT_PTR hf) { /* TRACE("(hf == %d)\n", hf); */ @@ -250,7 +250,7 @@ static int sc_cb_close(INT_PTR hf) return -1; } -static long sc_cb_lseek(INT_PTR hf, long dist, int seektype) +static long CDECL sc_cb_lseek(INT_PTR hf, long dist, int seektype) { DWORD ret; @@ -272,7 +272,7 @@ static long sc_cb_lseek(INT_PTR hf, long dist, int seektype) /* FDICopy callbacks */ -static INT_PTR sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) +static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) { FILE_IN_CABINET_INFO_A fici; PSC_HSC_A phsc; @@ -391,7 +391,7 @@ static INT_PTR sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) } } -static INT_PTR sc_FNNOTIFY_W(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) +static INT_PTR CDECL sc_FNNOTIFY_W(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) { FILE_IN_CABINET_INFO_W fici; PSC_HSC_W phsc;

1 0

Michael Stefaniuc : comctl32/tests: Do not cast the IDC_* defines to a LPSTR.
by Alexandre Julliard 05 Jan '09

05 Jan '09

Module: wine Branch: master Commit: ac37f1b7fb4566d31ae11e39ae6a917c05009eab URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac37f1b7fb4566d31ae11e39a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 4 22:58:57 2009 +0100 comctl32/tests: Do not cast the IDC_* defines to a LPSTR. --- dlls/comctl32/tests/header.c | 2 +- dlls/comctl32/tests/imagelist.c | 4 ++-- dlls/comctl32/tests/listview.c | 2 +- dlls/comctl32/tests/monthcal.c | 2 +- dlls/comctl32/tests/propsheet.c | 2 +- dlls/comctl32/tests/tab.c | 2 +- dlls/comctl32/tests/trackbar.c | 2 +- dlls/comctl32/tests/updown.c | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index c0ff7cd..5598e58 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -466,7 +466,7 @@ static BOOL register_parent_wnd_class(void) cls.cbWndExtra = 0; cls.hInstance = GetModuleHandleA(NULL); cls.hIcon = 0; - cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW); + cls.hCursor = LoadCursorA(0, IDC_ARROW); cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "Header test parent class"; diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 4b4964f..3fe249f 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -136,8 +136,8 @@ static HWND create_a_window(void) cls.cbClsExtra = 0; cls.cbWndExtra = 0; cls.hInstance = 0; - cls.hIcon = LoadIconA (0, (LPSTR)IDI_APPLICATION); - cls.hCursor = LoadCursorA (0, (LPSTR)IDC_ARROW); + cls.hIcon = LoadIconA (0, IDI_APPLICATION); + cls.hCursor = LoadCursorA (0, IDC_ARROW); cls.hbrBackground = GetStockObject (WHITE_BRUSH); cls.lpszMenuName = 0; cls.lpszClassName = className; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 4d8028a..4033e9e 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -194,7 +194,7 @@ static BOOL register_parent_wnd_class(void) cls.cbWndExtra = 0; cls.hInstance = GetModuleHandleA(NULL); cls.hIcon = 0; - cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW); + cls.hCursor = LoadCursorA(0, IDC_ARROW); cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "Listview test parent class"; diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index a8861fd..33f41d0 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -422,7 +422,7 @@ static BOOL register_parent_wnd_class(void) cls.cbWndExtra = 0; cls.hInstance = GetModuleHandleA(NULL); cls.hIcon = 0; - cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW); + cls.hCursor = LoadCursorA(0, IDC_ARROW); cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "Month-Cal test parent class"; diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 45c8d97..4164f68 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -158,7 +158,7 @@ static void register_parent_wnd_class(void) cls.cbWndExtra = 0; cls.hInstance = GetModuleHandleA(NULL); cls.hIcon = 0; - cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW); + cls.hCursor = LoadCursorA(0, IDC_ARROW); cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "parent class"; diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 61bab44..b39f52e 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -350,7 +350,7 @@ static BOOL registerParentWindowClass(void) cls.cbWndExtra = 0; cls.hInstance = GetModuleHandleA(NULL); cls.hIcon = 0; - cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW); + cls.hCursor = LoadCursorA(0, IDC_ARROW); cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "Tab test parent class"; diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index f54e32e..26cdeac 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -432,7 +432,7 @@ static BOOL register_parent_wnd_class(void){ cls.cbWndExtra = 0; cls.hInstance = GetModuleHandleA(NULL); cls.hIcon = 0; - cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW); + cls.hCursor = LoadCursorA(0, IDC_ARROW); cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "Trackbar test parent class"; diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index 86b72cc..2d6d437 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -234,7 +234,7 @@ static BOOL register_parent_wnd_class(void) cls.cbWndExtra = 0; cls.hInstance = GetModuleHandleA(NULL); cls.hIcon = 0; - cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW); + cls.hCursor = LoadCursorA(0, IDC_ARROW); cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "Up-Down test parent class";

1 0

Henri Verbeet : ntdll: Add a small test for FPU exceptions.
by Alexandre Julliard 05 Jan '09

05 Jan '09

Module: wine Branch: master Commit: 0b511b9ad8965749ce10e85288963eea7e05a2f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b511b9ad8965749ce10e8528… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Sun Jan 4 20:38:58 2009 +0100 ntdll: Add a small test for FPU exceptions. --- dlls/ntdll/tests/exception.c | 77 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index b0cb554..0632f2d 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -841,6 +841,82 @@ static void test_simd_exceptions(void) ok( got_exception == 1, "got exception: %i, should be 1\n", got_exception); } +struct fpu_exception_info +{ + DWORD exception_code; + DWORD exception_offset; + DWORD eip_offset; +}; + +static DWORD fpu_exception_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher) +{ + struct fpu_exception_info *info = *(struct fpu_exception_info **)(frame + 1); + + info->exception_code = rec->ExceptionCode; + info->exception_offset = (BYTE *)rec->ExceptionAddress - (BYTE *)code_mem; + info->eip_offset = context->Eip - (DWORD)code_mem; + + ++context->Eip; + return ExceptionContinueExecution; +} + +static void test_fpu_exceptions(void) +{ + static const BYTE fpu_exception_test_ie[] = + { + 0x83, 0xec, 0x04, /* sub $0x4,%esp */ + 0x66, 0xc7, 0x04, 0x24, 0xfe, 0x03, /* movw $0x3fe,(%esp) */ + 0x9b, 0xd9, 0x7c, 0x24, 0x02, /* fstcw 0x2(%esp) */ + 0xd9, 0x2c, 0x24, /* fldcw (%esp) */ + 0xd9, 0xee, /* fldz */ + 0xd9, 0xe8, /* fld1 */ + 0xde, 0xf1, /* fdivp */ + 0xdd, 0xd8, /* fstp %st(0) */ + 0xdd, 0xd8, /* fstp %st(0) */ + 0x9b, /* fwait */ + 0xdb, 0xe2, /* fnclex */ + 0xd9, 0x6c, 0x24, 0x02, /* fldcw 0x2(%esp) */ + 0x83, 0xc4, 0x04, /* add $0x4,%esp */ + 0xc3, /* ret */ + }; + + static const BYTE fpu_exception_test_de[] = + { + 0x83, 0xec, 0x04, /* sub $0x4,%esp */ + 0x66, 0xc7, 0x04, 0x24, 0xfb, 0x03, /* movw $0x3fb,(%esp) */ + 0x9b, 0xd9, 0x7c, 0x24, 0x02, /* fstcw 0x2(%esp) */ + 0xd9, 0x2c, 0x24, /* fldcw (%esp) */ + 0xdd, 0xd8, /* fstp %st(0) */ + 0xd9, 0xee, /* fldz */ + 0xd9, 0xe8, /* fld1 */ + 0xde, 0xf1, /* fdivp */ + 0x9b, /* fwait */ + 0xdb, 0xe2, /* fnclex */ + 0xdd, 0xd8, /* fstp %st(0) */ + 0xdd, 0xd8, /* fstp %st(0) */ + 0xd9, 0x6c, 0x24, 0x02, /* fldcw 0x2(%esp) */ + 0x83, 0xc4, 0x04, /* add $0x4,%esp */ + 0xc3, /* ret */ + }; + + struct fpu_exception_info info; + + memset(&info, 0, sizeof(info)); + run_exception_test(fpu_exception_handler, &info, fpu_exception_test_ie, sizeof(fpu_exception_test_ie)); + ok(info.exception_code == EXCEPTION_FLT_STACK_CHECK, + "Got exception code %#x, expected EXCEPTION_FLT_STACK_CHECK\n", info.exception_code); + ok(info.exception_offset == 0x19, "Got exception offset %#x, expected 0x19\n", info.exception_offset); + ok(info.eip_offset == 0x1b, "Got EIP offset %#x, expected 0x1b\n", info.eip_offset); + + memset(&info, 0, sizeof(info)); + run_exception_test(fpu_exception_handler, &info, fpu_exception_test_de, sizeof(fpu_exception_test_de)); + ok(info.exception_code == EXCEPTION_FLT_DIVIDE_BY_ZERO, + "Got exception code %#x, expected EXCEPTION_FLT_DIVIDE_BY_ZERO\n", info.exception_code); + ok(info.exception_offset == 0x17, "Got exception offset %#x, expected 0x17\n", info.exception_offset); + ok(info.eip_offset == 0x19, "Got EIP offset %#x, expected 0x19\n", info.eip_offset); +} + #endif /* __i386__ */ START_TEST(exception) @@ -918,6 +994,7 @@ START_TEST(exception) test_rtlraiseexception(); test_debugger(); test_simd_exceptions(); + test_fpu_exceptions(); VirtualFree(code_mem, 1024, MEM_RELEASE); #endif

1 0

Andrey Turkin : shell32: Fix typo.
by Alexandre Julliard 05 Jan '09

05 Jan '09

Module: wine Branch: master Commit: 8cebd3bb8652733316441c0ee1e4a5b41567ca7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cebd3bb8652733316441c0ee… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Mon Jan 5 04:53:41 2009 +0300 shell32: Fix typo. --- dlls/shell32/shres.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shres.rc b/dlls/shell32/shres.rc index 03349cc..65c15a0 100644 --- a/dlls/shell32/shres.rc +++ b/dlls/shell32/shres.rc @@ -100,16 +100,16 @@ IDI_SHELL_MY_DOCUMENTS ICON mydocs.ico IDI_SHELL_MY_NETWORK_PLACES ICON mydocs.ico /* @makedep: idb_tb_large.bmp */ -IDB_TB_LG_LIGHT BITMAP idb_tb_large.bmp +IDB_TB_LARGE_LIGHT BITMAP idb_tb_large.bmp /* @makedep: idb_tb_large.bmp */ -IDB_TB_LG_DARK BITMAP idb_tb_large.bmp +IDB_TB_LARGE_DARK BITMAP idb_tb_large.bmp /* @makedep: idb_tb_small.bmp */ -IDB_TB_SM_LIGHT BITMAP idb_tb_small.bmp +IDB_TB_SMALL_LIGHT BITMAP idb_tb_small.bmp /* @makedep: idb_tb_small.bmp */ -IDB_TB_SM_DARK BITMAP idb_tb_small.bmp +IDB_TB_SMALL_DARK BITMAP idb_tb_small.bmp /* @makedep: searching.avi */ IDR_AVI_SEARCHING AVI searching.avi

1 0

Henri Verbeet : ntdll: Fix ExceptionAddress for FPU exceptions.
by Alexandre Julliard 05 Jan '09

05 Jan '09

Module: wine Branch: master Commit: 5e418a907208f62a2b1f68da483a8137568f4a1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e418a907208f62a2b1f68da4… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Sun Jan 4 20:38:57 2009 +0100 ntdll: Fix ExceptionAddress for FPU exceptions. ExceptionAddress isn't the same as EIP for FPU exceptions, since the exception will be thrown on the next FPU instruction, rather than the instruction that caused the exception. --- dlls/ntdll/signal_i386.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index bd1e52b..08013fb 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1452,6 +1452,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) case TRAP_x86_ARITHTRAP: /* Floating point exception */ case TRAP_x86_UNKNOWN: /* Unknown fault code */ rec->ExceptionCode = get_fpu_code( win_context ); + rec->ExceptionAddress = (LPVOID)win_context->FloatSave.ErrorOffset; break; case TRAP_x86_CACHEFLT: /* SIMD exception */ /* TODO:

1 0