March 2006 - Wine-commits - list.winehq.org

Mike McCormack : WININET: Clean up HttpQueryInfo.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: ae300883faa29ddad5c65aeac5cad682380e4cd3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ae300883faa29ddad5c65ae… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Mar 30 18:01:48 2006 +0900 WININET: Clean up HttpQueryInfo. Fixes another return FALSE without SetLastError. --- dlls/wininet/http.c | 76 ++++++++++++++++++--------------------------------- 1 files changed, 27 insertions(+), 49 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 48026a0..70dfc38 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1291,28 +1291,18 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( LPHTTPHEADERW lphttpHdr = NULL; BOOL bSuccess = FALSE; BOOL request_only = dwInfoLevel & HTTP_QUERY_FLAG_REQUEST_HEADERS; - + INT requested_index = lpdwIndex ? *lpdwIndex : 0; + INT level = (dwInfoLevel & ~HTTP_QUERY_MODIFIER_FLAGS_MASK); + INT index = -1; /* Find requested header structure */ - if ((dwInfoLevel & ~HTTP_QUERY_MODIFIER_FLAGS_MASK) == HTTP_QUERY_CUSTOM) + switch (level) { - INT requested_index = (lpdwIndex)?(*lpdwIndex):0; - INT index = HTTP_GetCustomHeaderIndex(lpwhr, (LPWSTR)lpBuffer, - requested_index,request_only); + case HTTP_QUERY_CUSTOM: + index = HTTP_GetCustomHeaderIndex(lpwhr, lpBuffer, requested_index, request_only); + break; - if (index < 0) - return bSuccess; - else - lphttpHdr = &lpwhr->pCustHeaders[index]; - - if (lpdwIndex) - (*lpdwIndex)++; - } - else - { - INT index = dwInfoLevel & ~HTTP_QUERY_MODIFIER_FLAGS_MASK; - - if (index == HTTP_QUERY_RAW_HEADERS_CRLF) + case HTTP_QUERY_RAW_HEADERS_CRLF: { DWORD len = strlenW(lpwhr->lpszRawHeaders); if (len + 1 > *lpdwBufferLength/sizeof(WCHAR)) @@ -1328,7 +1318,7 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( return TRUE; } - else if (index == HTTP_QUERY_RAW_HEADERS) + case HTTP_QUERY_RAW_HEADERS: { static const WCHAR szCrLf[] = {'\r','\n',0}; LPWSTR * ppszRawHeaderLines = HTTP_Tokenize(lpwhr->lpszRawHeaders, szCrLf); @@ -1361,7 +1351,7 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( return TRUE; } - else if (index == HTTP_QUERY_STATUS_TEXT) + case HTTP_QUERY_STATUS_TEXT: { DWORD len = strlenW(lpwhr->lpszStatusText); if (len + 1 > *lpdwBufferLength/sizeof(WCHAR)) @@ -1377,7 +1367,7 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( return TRUE; } - else if (index == HTTP_QUERY_VERSION) + case HTTP_QUERY_VERSION: { DWORD len = strlenW(lpwhr->lpszVersion); if (len + 1 > *lpdwBufferLength/sizeof(WCHAR)) @@ -1393,50 +1383,38 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( return TRUE; } - else if (index >= 0 && index <= HTTP_QUERY_MAX ) - { + default: + if (level >= 0 && level <= HTTP_QUERY_MAX ) + { int i; - for (i = 0; i < sizeof(SORTED_STANDARD_HEADERS)/sizeof(std_hdr_data) ; i++) + for (i = 0; i < sizeof(SORTED_STANDARD_HEADERS)/sizeof(std_hdr_data) ; i++) { - if (SORTED_STANDARD_HEADERS[i].hdrIndex == index) + if (SORTED_STANDARD_HEADERS[i].hdrIndex == level) { - INT requested_index = (lpdwIndex)?(*lpdwIndex):0; - INT index = HTTP_GetCustomHeaderIndex(lpwhr, + index = HTTP_GetCustomHeaderIndex(lpwhr, (LPWSTR)SORTED_STANDARD_HEADERS[i].hdrStr, requested_index,request_only); - - if (index < 0) - break; - lphttpHdr = &lpwhr->pCustHeaders[index]; - - if (lpdwIndex) - (*lpdwIndex)++; - break; } } - - if (!lphttpHdr) - { - SetLastError(ERROR_HTTP_HEADER_NOT_FOUND); - return bSuccess; - } - } - else - { - SetLastError(ERROR_HTTP_HEADER_NOT_FOUND); - return bSuccess; } } + if (index >= 0) + lphttpHdr = &lpwhr->pCustHeaders[index]; + /* Ensure header satisifies requested attributes */ - if ((dwInfoLevel & HTTP_QUERY_FLAG_REQUEST_HEADERS) && - (~lphttpHdr->wFlags & HDR_ISREQUEST)) + if (!lphttpHdr || + ((dwInfoLevel & HTTP_QUERY_FLAG_REQUEST_HEADERS) && + (~lphttpHdr->wFlags & HDR_ISREQUEST))) { SetLastError(ERROR_HTTP_HEADER_NOT_FOUND); - return bSuccess; + return bSuccess; } + if (lpdwIndex) + (*lpdwIndex)++; + /* coalesce value to reuqested type */ if (dwInfoLevel & HTTP_QUERY_FLAG_NUMBER) {

1 0

Alexandre Julliard : x11drv: Replace the SWP_WINE_NOHOSTMOVE flag by a lock count.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: 3217e534fe20dcc19088229ce7cf82937a32b490 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3217e534fe20dcc19088229… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 29 18:27:01 2006 +0200 x11drv: Replace the SWP_WINE_NOHOSTMOVE flag by a lock count. --- dlls/x11drv/window.c | 4 ++-- dlls/x11drv/winpos.c | 25 +++++++++++++++++-------- dlls/x11drv/x11drv.h | 1 + include/winpos.h | 3 --- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/x11drv/window.c b/dlls/x11drv/window.c index 592d874..a3fff6f 100644 --- a/dlls/x11drv/window.c +++ b/dlls/x11drv/window.c @@ -602,8 +602,7 @@ void X11DRV_sync_window_position( Displa data->client_rect = *new_client_rect; OffsetRect( &data->client_rect, -data->whole_rect.left, -data->whole_rect.top ); - if (!data->whole_window) return; - if (swp_flags & SWP_WINE_NOHOSTMOVE) return; + if (!data->whole_window || data->lock_changes) return; mask = get_window_changes( &changes, &old_whole_rect, &data->whole_rect ); @@ -837,6 +836,7 @@ static struct x11drv_win_data *alloc_win data->xic = 0; data->managed = FALSE; data->dce = NULL; + data->lock_changes = 0; data->hWMIconBitmap = 0; data->hWMIconMask = 0; diff --git a/dlls/x11drv/winpos.c b/dlls/x11drv/winpos.c index 331d6d4..5bf9368 100644 --- a/dlls/x11drv/winpos.c +++ b/dlls/x11drv/winpos.c @@ -567,7 +567,7 @@ BOOL X11DRV_set_window_pos( HWND hwnd, H { req->handle = hwnd; req->previous = insert_after; - req->flags = swp_flags & ~SWP_WINE_NOHOSTMOVE; + req->flags = swp_flags; req->window.left = rectWindow->left; req->window.top = rectWindow->top; req->window.right = rectWindow->right; @@ -625,7 +625,7 @@ BOOL X11DRV_set_window_pos( HWND hwnd, H /* FIXME: copy the valid bits */ - if (data->whole_window && !(swp_flags & SWP_WINE_NOHOSTMOVE)) + if (data->whole_window && !data->lock_changes) { if ((old_style & WS_VISIBLE) && !(new_style & WS_VISIBLE)) { @@ -647,7 +647,7 @@ BOOL X11DRV_set_window_pos( HWND hwnd, H X11DRV_sync_window_position( display, data, swp_flags, rectClient, &new_whole_rect ); - if (data->whole_window && !(swp_flags & SWP_WINE_NOHOSTMOVE)) + if (data->whole_window && !data->lock_changes) { if ((new_style & WS_VISIBLE) && !(new_style & WS_MINIMIZE) && X11DRV_is_window_rect_mapped( rectWindow )) @@ -694,7 +694,6 @@ BOOL X11DRV_SetWindowPos( WINDOWPOS *win winpos->cx, winpos->cy, winpos->flags); orig_flags = winpos->flags; - winpos->flags &= ~SWP_WINE_NOHOSTMOVE; /* First make sure that coordinates are valid for WM_WINDOWPOSCHANGING */ if (!(winpos->flags & SWP_NOMOVE)) @@ -1107,8 +1106,10 @@ void X11DRV_MapNotify( HWND hwnd, XEvent WIN_ReleasePtr( win ); SendMessageA( hwnd, WM_SHOWWINDOW, SW_RESTORE, 0 ); + data->lock_changes++; SetWindowPos( hwnd, 0, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, - SWP_NOZORDER | SWP_WINE_NOHOSTMOVE ); + SWP_NOZORDER ); + data->lock_changes--; } else WIN_ReleasePtr( win ); if (hwndFocus && IsChild( hwnd, hwndFocus )) X11DRV_SetFocus(hwndFocus); /* FIXME */ @@ -1140,8 +1141,10 @@ void X11DRV_UnmapNotify( HWND hwnd, XEve EndMenu(); SendMessageA( hwnd, WM_SHOWWINDOW, SW_MINIMIZE, 0 ); + data->lock_changes++; SetWindowPos( hwnd, 0, 0, 0, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), - SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER | SWP_WINE_NOHOSTMOVE ); + SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER ); + data->lock_changes--; } else WIN_ReleasePtr( win ); } @@ -1154,12 +1157,16 @@ void X11DRV_handle_desktop_resize( unsig { RECT rect; HWND hwnd = GetDesktopWindow(); + struct x11drv_win_data *data; + if (!(data = X11DRV_get_win_data( hwnd ))) return; screen_width = width; screen_height = height; TRACE("desktop %p change to (%dx%d)\n", hwnd, width, height); SetRect( &rect, 0, 0, width, height ); - X11DRV_set_window_pos( hwnd, 0, &rect, &rect, SWP_NOZORDER|SWP_NOMOVE|SWP_WINE_NOHOSTMOVE, NULL ); + data->lock_changes++; + X11DRV_set_window_pos( hwnd, 0, &rect, &rect, SWP_NOZORDER|SWP_NOMOVE, NULL ); + data->lock_changes--; SendMessageTimeoutW( HWND_BROADCAST, WM_DISPLAYCHANGE, screen_depth, MAKELPARAM( width, height ), SMTO_ABORTIFHUNG, 2000, NULL ); } @@ -1202,7 +1209,7 @@ void X11DRV_ConfigureNotify( HWND hwnd, y = rect.top; cx = rect.right - rect.left; cy = rect.bottom - rect.top; - flags = SWP_NOACTIVATE | SWP_NOZORDER | SWP_WINE_NOHOSTMOVE; + flags = SWP_NOACTIVATE | SWP_NOZORDER; /* Compare what has changed */ @@ -1223,7 +1230,9 @@ void X11DRV_ConfigureNotify( HWND hwnd, TRACE( "%p resizing from (%ldx%ld) to (%dx%d)\n", hwnd, rect.right - rect.left, rect.bottom - rect.top, cx, cy ); + data->lock_changes++; SetWindowPos( hwnd, 0, x, y, cx, cy, flags ); + data->lock_changes--; } diff --git a/dlls/x11drv/x11drv.h b/dlls/x11drv/x11drv.h index c528c99..0ba4fce 100644 --- a/dlls/x11drv/x11drv.h +++ b/dlls/x11drv/x11drv.h @@ -643,6 +643,7 @@ struct x11drv_win_data XIC xic; /* X input context */ BOOL managed; /* is window managed? */ struct dce *dce; /* DCE for CS_OWNDC or CS_CLASSDC windows */ + unsigned int lock_changes; /* lock count for X11 change requests */ HBITMAP hWMIconBitmap; HBITMAP hWMIconMask; }; diff --git a/include/winpos.h b/include/winpos.h index 27a950c..e480efc 100644 --- a/include/winpos.h +++ b/include/winpos.h @@ -31,9 +31,6 @@ #define SWP_NOCLIENTSIZE 0x0800 #define SWP_NOCLIENTMOVE 0x1000 -/* Wine extra SWP flag */ -#define SWP_WINE_NOHOSTMOVE 0x80000000 - extern BOOL WINPOS_RedrawIconTitle( HWND hWnd ); extern BOOL WINPOS_ShowIconTitle( HWND hwnd, BOOL bShow ); extern void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos, POINT *minTrack,

1 0

Petr Tesarik : ntdll: Fix CDROM raw reads.
by Alexandre Julliard 29 Mar '06

29 Mar '06

Module: wine Branch: refs/heads/master Commit: 4c777d7466ea5fbe04899bf945f097bcc30a7dcb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4c777d7466ea5fbe04899bf… Author: Petr Tesarik <hat(a)tesarici.cz> Date: Mon Mar 27 10:20:39 2006 +0200 ntdll: Fix CDROM raw reads. - Fix incorrect data sizes. - Fix CDDA addressing. - Implement XAForm2 mode on Linux. --- dlls/ntdll/cdrom.c | 152 ++++++++++++++++++++++++++++------------------------ 1 files changed, 82 insertions(+), 70 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index a5cf6cd..8838949 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1192,101 +1192,113 @@ static NTSTATUS CDROM_SetVolume(int fd, /****************************************************************** * CDROM_RawRead * + * Some features of this IOCTL are rather poorly documented and + * not really intuitive either: + * + * 1. Although the DiskOffset parameter is meant to be a + * byte offset into the disk, it is in fact the sector + * number multiplied by 2048 regardless of the actual + * sector size. + * + * 2. The least significant 11 bits of DiskOffset are ignored. + * + * 3. The TrackMode parameter has no effect on the sector + * size. The entire raw sector (i.e. 2352 bytes of data) + * is always returned. IMO the TrackMode is only used + * to check the correct sector type. * */ static NTSTATUS CDROM_RawRead(int fd, const RAW_READ_INFO* raw, void* buffer, DWORD len, DWORD* sz) { - int ret = STATUS_NOT_SUPPORTED; + int ret = STATUS_NOT_SUPPORTED; int io = -1; - DWORD sectSize; TRACE("RAW_READ_INFO: DiskOffset=%li,%li SectorCount=%li TrackMode=%i\n buffer=%p len=%li sz=%p\n", raw->DiskOffset.u.HighPart, raw->DiskOffset.u.LowPart, raw->SectorCount, raw->TrackMode, buffer, len, sz); + if (len < raw->SectorCount * 2352) return STATUS_BUFFER_TOO_SMALL; + +#if defined(linux) + if (raw->DiskOffset.u.HighPart & ~2047) { + WARN("DiskOffset points to a sector >= 2**32\n"); + return ret; + } + switch (raw->TrackMode) { - case YellowMode2: sectSize = 2336; break; - case XAForm2: sectSize = 2328; break; - case CDDA: sectSize = 2352; break; - default: return STATUS_INVALID_PARAMETER; - } - if (len < raw->SectorCount * sectSize) return STATUS_BUFFER_TOO_SMALL; - /* strangely enough, it seems that sector offsets are always indicated with a size of 2048, - * even if a larger size if read... - */ -#if defined(linux) + case YellowMode2: + case XAForm2: { - struct cdrom_read_audio cdra; + DWORD lba = raw->DiskOffset.QuadPart >> 11; struct cdrom_msf* msf; + PBYTE *bp; /* current buffer pointer */ int i; - LONGLONG t = ((LONGLONG)raw->DiskOffset.u.HighPart << 32) + - raw->DiskOffset.u.LowPart + CD_MSF_OFFSET; - switch (raw->TrackMode) + if ((lba + raw->SectorCount) > + ((1 << 8*sizeof(msf->cdmsf_min0)) * CD_SECS * CD_FRAMES + - CD_MSF_OFFSET)) { + WARN("DiskOffset not accessible with MSF\n"); + return ret; + } + + /* Linux reads only one sector at a time. + * ioctl CDROMREADRAW takes struct cdrom_msf as an argument + * on the contrary to what header comments state. + */ + lba += CD_MSF_OFFSET; + for (i = 0, bp = buffer; i < raw->SectorCount; + i++, lba++, bp += 2352) { - case YellowMode2: - /* Linux reads only one sector at a time. - * ioctl CDROMREADMODE2 takes struct cdrom_msf as an argument - * on the contrary to what header comments state. - */ - for (i = 0; i < raw->SectorCount; i++, t += sectSize) + msf = (struct cdrom_msf*)bp; + msf->cdmsf_min0 = lba / CD_FRAMES / CD_SECS; + msf->cdmsf_sec0 = lba / CD_FRAMES % CD_SECS; + msf->cdmsf_frame0 = lba % CD_FRAMES; + io = ioctl(fd, CDROMREADRAW, msf); + if (io != 0) { - msf = (struct cdrom_msf*)buffer + i * sectSize; - msf->cdmsf_min0 = t / CD_FRAMES / CD_SECS; - msf->cdmsf_sec0 = t / CD_FRAMES % CD_SECS; - msf->cdmsf_frame0 = t % CD_FRAMES; - io = ioctl(fd, CDROMREADMODE2, msf); - if (io != 0) - { - *sz = sectSize * i; - return CDROM_GetStatusCode(io); - } + *sz = 2352 * i; + return CDROM_GetStatusCode(io); } - break; - case XAForm2: - FIXME("XAForm2: NIY\n"); - return ret; - case CDDA: - /* FIXME: the output doesn't seem 100% correct... in fact output is shifted - * between by NT2K box and this... should check on the same drive... - * otherwise, I fear a 2352/2368 mismatch somewhere in one of the drivers - * (linux/NT). - * Anyway, that's not critical at all. We're talking of 16/32 bytes, we're - * talking of 0.2 ms of sound - */ - /* 2048 = 2 ** 11 */ - if (raw->DiskOffset.u.HighPart & ~2047) FIXME("Unsupported value\n"); - cdra.addr.lba = ((raw->DiskOffset.u.LowPart >> 11) | - (raw->DiskOffset.u.HighPart << (32 - 11))) - 1; - FIXME("reading at %u\n", cdra.addr.lba); - cdra.addr_format = CDROM_LBA; - cdra.nframes = raw->SectorCount; - cdra.buf = buffer; - io = ioctl(fd, CDROMREADAUDIO, &cdra); - break; - default: - FIXME("NIY: %d\n", raw->TrackMode); - return ret; } + break; + } + + case CDDA: + { + struct cdrom_read_audio cdra; + + cdra.addr.lba = raw->DiskOffset.QuadPart >> 11; + TRACE("reading at %u\n", cdra.addr.lba); + cdra.addr_format = CDROM_LBA; + cdra.nframes = raw->SectorCount; + cdra.buf = buffer; + io = ioctl(fd, CDROMREADAUDIO, &cdra); + break; + } + + default: + FIXME("NIY: %d\n", raw->TrackMode); + return STATUS_INVALID_PARAMETER; } #else + switch (raw->TrackMode) { - switch (raw->TrackMode) - { - case YellowMode2: - FIXME("YellowMode2: NIY\n"); - return ret; - case XAForm2: - FIXME("XAForm2: NIY\n"); - return ret; - case CDDA: - FIXME("CDDA: NIY\n"); - return ret; - } + case YellowMode2: + FIXME("YellowMode2: NIY\n"); + return ret; + case XAForm2: + FIXME("XAForm2: NIY\n"); + return ret; + case CDDA: + FIXME("CDDA: NIY\n"); + return ret; + default: + FIXME("NIY: %d\n", raw->TrackMode); + return STATUS_INVALID_PARAMETER; } #endif - *sz = sectSize * raw->SectorCount; + *sz = 2352 * raw->SectorCount; ret = CDROM_GetStatusCode(io); return ret; }

1 0

Alexandre Julliard : winecfg: Disable the desktop option when configuring a specific application.
by Alexandre Julliard 29 Mar '06

29 Mar '06

Module: wine Branch: refs/heads/master Commit: d74a62cfd796c07f9fb93e28c2bbf7f1ffa395ea URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d74a62cfd796c07f9fb93e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 29 13:49:36 2006 +0200 winecfg: Disable the desktop option when configuring a specific application. --- programs/winecfg/x11drvdlg.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index 4b35b25..36ec846 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -53,7 +53,18 @@ static void update_gui_for_desktop_mode( WINE_TRACE("\n"); updating_ui = TRUE; - + + if (current_app) + { + disable(IDC_ENABLE_DESKTOP); + disable(IDC_DESKTOP_WIDTH); + disable(IDC_DESKTOP_HEIGHT); + disable(IDC_DESKTOP_SIZE); + disable(IDC_DESKTOP_BY); + return; + } + enable(IDC_ENABLE_DESKTOP); + /* do we have desktop mode enabled? */ if (reg_key_exists(config_key, keypath("X11 Driver"), "Desktop")) {

1 0

H. Verbeet : wined3d: Create an IWineD3DBaseShader class.
by Alexandre Julliard 29 Mar '06

29 Mar '06

Module: wine Branch: refs/heads/master Commit: 1e1a708e8ab5827deb5dd6ea5bfeb195e7482f11 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1e1a708e8ab5827deb5dd6e… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Mar 28 21:10:51 2006 +0200 wined3d: Create an IWineD3DBaseShader class. --- dlls/wined3d/pixelshader.c | 10 +++++--- dlls/wined3d/vertexshader.c | 9 +++++-- include/wine/wined3d_interface.h | 50 +++++++++++++++++++++++++++++++++----- 3 files changed, 55 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 89fe4b9..05ca70e 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -52,6 +52,7 @@ HRESULT WINAPI IWineD3DPixelShaderImpl_Q TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppobj); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IWineD3DBase) + || IsEqualGUID(riid, &IID_IWineD3DBaseShader) || IsEqualGUID(riid, &IID_IWineD3DPixelShader)) { IUnknown_AddRef(iface); *ppobj = This; @@ -1825,10 +1826,11 @@ const IWineD3DPixelShaderVtbl IWineD3DPi IWineD3DPixelShaderImpl_QueryInterface, IWineD3DPixelShaderImpl_AddRef, IWineD3DPixelShaderImpl_Release, - /*** IWineD3DPixelShader methods ***/ + /*** IWineD3DBase methods ***/ IWineD3DPixelShaderImpl_GetParent, + /*** IWineD3DBaseShader methods ***/ + IWineD3DPixelShaderImpl_SetFunction, + /*** IWineD3DPixelShader methods ***/ IWineD3DPixelShaderImpl_GetDevice, - IWineD3DPixelShaderImpl_GetFunction, - /* not part of d3d */ - IWineD3DPixelShaderImpl_SetFunction + IWineD3DPixelShaderImpl_GetFunction }; diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 0fd74e3..24059d0 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -2035,6 +2035,7 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppobj); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IWineD3DBase) + || IsEqualGUID(riid, &IID_IWineD3DBaseShader) || IsEqualGUID(riid, &IID_IWineD3DVertexShader)) { IUnknown_AddRef(iface); *ppobj = This; @@ -2214,9 +2215,11 @@ const IWineD3DVertexShaderVtbl IWineD3DV IWineD3DVertexShaderImpl_QueryInterface, IWineD3DVertexShaderImpl_AddRef, IWineD3DVertexShaderImpl_Release, - /*** IWineD3DVertexShader methods ***/ + /*** IWineD3DBase methods ***/ IWineD3DVertexShaderImpl_GetParent, + /*** IWineD3DBaseShader methods ***/ + IWineD3DVertexShaderImpl_SetFunction, + /*** IWineD3DVertexShader methods ***/ IWineD3DVertexShaderImpl_GetDevice, - IWineD3DVertexShaderImpl_GetFunction, - IWineD3DVertexShaderImpl_SetFunction + IWineD3DVertexShaderImpl_GetFunction }; diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 2921da5..de0eee5 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -56,6 +56,7 @@ struct IWineD3DStateBlock; struct IWineD3DSurface; struct IWineD3DVolume; struct IWineD3DVertexDeclaration; +struct IWineD3DBaseShader; struct IWineD3DVertexShader; struct IWineD3DPixelShader; struct IWineD3DQuery; @@ -120,6 +121,10 @@ DEFINE_GUID(IID_IWineD3DVolumeTexture, DEFINE_GUID(IID_IWineD3DVertexDeclaration, 0x7cd55be6, 0x6f30, 0x11d9, 0xc6, 0x87, 0x0, 0x4, 0x61, 0x42, 0xc1, 0x4f); +/* {EAC93065-A4DF-446F-86A1-9EF2BCA40A3C} */ +DEFINE_GUID(IID_IWineD3DBaseShader, +0xeac93065, 0xa4df, 0x446f, 0x86, 0xa1, 0x9e, 0xf2, 0xbc, 0xa4, 0x0a, 0x3c); + /* {7F7A2B60-6F30-11d9-C687-00046142C14F} */ DEFINE_GUID(IID_IWineD3DVertexShader, 0x7f7a2b60, 0x6f30, 0x11d9, 0xc6, 0x87, 0x0, 0x4, 0x61, 0x42, 0xc1, 0x4f); @@ -1317,10 +1322,38 @@ DECLARE_INTERFACE_(IWineD3DSwapChain,IWi #endif /***************************************************************************** + * IWineD3DBaseShader interface + */ +#define INTERFACE IWineD3DBaseShader +DECLARE_INTERFACE_(IWineD3DBaseShader,IWineD3DBase) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IWineD3DBase methods ***/ + STDMETHOD(GetParent)(THIS_ IUnknown **pParent) PURE; + /*** IWineD3DBaseShader methods ***/ + STDMETHOD(SetFunction)(THIS_ CONST DWORD *pFunction) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define IWineD3DBaseShader_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IWineD3DBaseShader_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IWineD3DBaseShader_Release(p) (p)->lpVtbl->Release(p) +/*** IWineD3DBase methods ***/ +#define IWineD3DBaseShader_GetParent(p,a) (p)->lpVtbl->GetParent(p,a) +/*** IWineD3DBaseShader methods ***/ +#define IWineD3DBaseShader_SetFunction(p,a) (p)->lpVtbl->SetFunction(p,a) +#endif + +/***************************************************************************** * IWineD3DVertexShader interface */ #define INTERFACE IWineD3DVertexShader -DECLARE_INTERFACE_(IWineD3DVertexShader,IWineD3DBase) +DECLARE_INTERFACE_(IWineD3DVertexShader,IWineD3DBaseShader) { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -1328,10 +1361,11 @@ DECLARE_INTERFACE_(IWineD3DVertexShader, STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IWineD3DBase methods ***/ STDMETHOD(GetParent)(THIS_ IUnknown **pParent) PURE; + /*** IWineD3DBaseShader methods ***/ + STDMETHOD(SetFunction)(THIS_ CONST DWORD *pFunction) PURE; /*** IWineD3DVertexShader methods ***/ STDMETHOD(GetDevice)(THIS_ IWineD3DDevice** ppDevice) PURE; STDMETHOD(GetFunction)(THIS_ VOID *pData, UINT *pSizeOfData) PURE; - STDMETHOD(SetFunction)(THIS_ CONST DWORD *pFunction) PURE; STDMETHOD(SetConstantB)(THIS_ UINT StartRegister, CONST BOOL* pConstantData, UINT BoolCount) PURE; STDMETHOD(SetConstantI)(THIS_ UINT StartRegister, CONST INT* pConstantData, UINT Vector4iCount) PURE; STDMETHOD(SetConstantF)(THIS_ UINT StartRegister, CONST FLOAT* pConstantData, UINT Vector4fCount) PURE; @@ -1350,10 +1384,11 @@ DECLARE_INTERFACE_(IWineD3DVertexShader, #define IWineD3DVertexShader_Release(p) (p)->lpVtbl->Release(p) /*** IWineD3DBase methods ***/ #define IWineD3DVertexShader_GetParent(p,a) (p)->lpVtbl->GetParent(p,a) +/*** IWineD3DBaseShader methods ***/ +#define IWineD3DVertexShader_SetFunction(p,a) (p)->lpVtbl->SetFunction(p,a) /*** IWineD3DVertexShader methods ***/ #define IWineD3DVertexShader_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) #define IWineD3DVertexShader_GetFunction(p,a,b) (p)->lpVtbl->GetFunction(p,a,b) -#define IWineD3DVertexShader_SetFunction(p,a) (p)->lpVtbl->SetFunction(p,a) #define IWineD3DVertexShader_SetConstantB(p,a,b,c) (p)->lpVtbl->SetConstantB(p,a,b,c) #define IWineD3DVertexShader_SetConstantI(p,a,b,c) (p)->lpVtbl->SetConstantI(p,a,b,c) #define IWineD3DVertexShader_SetConstantF(p,a,b,c) (p)->lpVtbl->SetConstantF(p,a,b,c) @@ -1367,7 +1402,7 @@ DECLARE_INTERFACE_(IWineD3DVertexShader, * IWineD3DPixelShader interface */ #define INTERFACE IWineD3DPixelShader -DECLARE_INTERFACE_(IWineD3DPixelShader,IWineD3DBase) +DECLARE_INTERFACE_(IWineD3DPixelShader,IWineD3DBaseShader) { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -1375,11 +1410,11 @@ DECLARE_INTERFACE_(IWineD3DPixelShader,I STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IWineD3DBase methods ***/ STDMETHOD(GetParent)(THIS_ IUnknown **pParent) PURE; + /*** IWineD3DBaseShader methods ***/ + STDMETHOD(SetFunction)(THIS_ CONST DWORD *pFunction) PURE; /*** IWineD3DPixelShader methods ***/ STDMETHOD(GetDevice)(THIS_ IWineD3DDevice** ppDevice) PURE; STDMETHOD(GetFunction)(THIS_ VOID* pData, UINT* pSizeOfData) PURE; - /* Internal Interfaces */ - STDMETHOD(SetFunction)(THIS_ CONST DWORD *pFunction) PURE; }; #undef INTERFACE @@ -1390,10 +1425,11 @@ DECLARE_INTERFACE_(IWineD3DPixelShader,I #define IWineD3DPixelShader_Release(p) (p)->lpVtbl->Release(p) /*** IWineD3DBase methods ***/ #define IWineD3DPixelShader_GetParent(p,a) (p)->lpVtbl->GetParent(p,a) +/*** IWineD3DBaseShader methods ***/ +#define IWineD3DPixelShader_SetFunction(p,a) (p)->lpVtbl->SetFunction(p,a) /*** IWineD3DPixelShader methods ***/ #define IWineD3DPixelShader_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) #define IWineD3DPixelShader_GetFunction(p,a,b) (p)->lpVtbl->GetFunction(p,a,b) -#define IWineD3DPixelShader_SetFunction(p,a) (p)->lpVtbl->SetFunction(p,a) #endif #if 0 /* FIXME: During porting in from d3d8 - the following will be used */

1 0

H. Verbeet : wined3d: Move the vshader_ins and pshader_ins arrays into their respective objects.
by Alexandre Julliard 29 Mar '06

29 Mar '06

Module: wine Branch: refs/heads/master Commit: d4132cf7d7b336469f6780052a4142bfafe28d84 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d4132cf7d7b336469f67800… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Mar 28 21:10:44 2006 +0200 wined3d: Move the vshader_ins and pshader_ins arrays into their respective objects. --- dlls/wined3d/device.c | 2 ++ dlls/wined3d/pixelshader.c | 14 ++++++++------ dlls/wined3d/vertexshader.c | 20 +++++++++++--------- dlls/wined3d/wined3d_private.h | 4 ++++ 4 files changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 16eac5f..d322e82 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1620,6 +1620,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Create IWineD3DVertexShaderImpl *object; /* NOTE: impl usage is ok, this is a create */ HRESULT hr = D3D_OK; D3DCREATEOBJECTINSTANCE(object, VertexShader) + object->shader_ins = IWineD3DVertexShaderImpl_shader_ins; TRACE("(%p) : Created Vertex shader %p\n", This, *ppVertexShader); @@ -1664,6 +1665,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Create HRESULT hr = D3D_OK; D3DCREATEOBJECTINSTANCE(object, PixelShader) + object->shader_ins = IWineD3DPixelShaderImpl_shader_ins; hr = IWineD3DPixelShader_SetFunction(*ppPixelShader, pFunction); if (D3D_OK == hr) { TRACE("(%p) : Created Pixel shader %p\n", This, *ppPixelShader); diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 64fe501..89fe4b9 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -629,7 +629,7 @@ void pshader_breakp(WINED3DSHADERVECTOR* /** * log, exp, frc, m*x* seems to be macros ins ... to see */ -static CONST SHADER_OPCODE pshader_ins [] = { +CONST SHADER_OPCODE IWineD3DPixelShaderImpl_shader_ins[] = { {D3DSIO_NOP, "nop", "NOP", 0, pshader_nop, 0, 0}, {D3DSIO_MOV, "mov", "MOV", 2, pshader_mov, 0, 0}, {D3DSIO_ADD, "add", "ADD", 3, pshader_add, 0, 0}, @@ -746,12 +746,14 @@ inline static const SHADER_OPCODE* pshad DWORD i = 0; DWORD version = This->version; DWORD hex_version = D3DPS_VERSION(version/10, version%10); + const SHADER_OPCODE *shader_ins = This->shader_ins; + /** TODO: use dichotomic search */ - while (NULL != pshader_ins[i].name) { - if (((code & D3DSI_OPCODE_MASK) == pshader_ins[i].opcode) && - (((hex_version >= pshader_ins[i].min_version) && (hex_version <= pshader_ins[i].max_version)) || - ((pshader_ins[i].min_version == 0) && (pshader_ins[i].max_version == 0)))) { - return &pshader_ins[i]; + while (NULL != shader_ins[i].name) { + if (((code & D3DSI_OPCODE_MASK) == shader_ins[i].opcode) && + (((hex_version >= shader_ins[i].min_version) && (hex_version <= shader_ins[i].max_version)) || + ((shader_ins[i].min_version == 0) && (shader_ins[i].max_version == 0)))) { + return &shader_ins[i]; } ++i; } diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index cfa8f2e..0fd74e3 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -582,7 +582,7 @@ void vshader_breakp(WINED3DSHADERVECTOR* /** * log, exp, frc, m*x* seems to be macros ins ... to see */ -static CONST SHADER_OPCODE vshader_ins [] = { +CONST SHADER_OPCODE IWineD3DVertexShaderImpl_shader_ins[] = { {D3DSIO_NOP, "nop", "NOP", 0, vshader_nop, 0, 0}, {D3DSIO_MOV, "mov", "MOV", 2, vshader_mov, 0, 0}, {D3DSIO_ADD, "add", "ADD", 3, vshader_add, 0, 0}, @@ -691,12 +691,14 @@ static CONST SHADER_OPCODE vshader_ins [ }; -inline static const SHADER_OPCODE* vshader_program_get_opcode(const DWORD code) { +inline static const SHADER_OPCODE* vshader_program_get_opcode(IWineD3DVertexShaderImpl *This, const DWORD code) { DWORD i = 0; + const SHADER_OPCODE *shader_ins = This->shader_ins; + /** TODO: use dichotomic search or hash table */ - while (NULL != vshader_ins[i].name) { - if ((code & D3DSI_OPCODE_MASK) == vshader_ins[i].opcode) { - return &vshader_ins[i]; + while (NULL != shader_ins[i].name) { + if ((code & D3DSI_OPCODE_MASK) == shader_ins[i].opcode) { + return &shader_ins[i]; } ++i; } @@ -1305,7 +1307,7 @@ inline static VOID IWineD3DVertexShaderI pToken += comment_len; continue; } - curOpcode = vshader_program_get_opcode(*pToken); + curOpcode = vshader_program_get_opcode(This, *pToken); ++pToken; /* TODO: dcl's */ /* TODO: Consts */ @@ -1485,7 +1487,7 @@ inline static VOID IWineD3DVertexShaderI continue; } - curOpcode = vshader_program_get_opcode(*pToken); + curOpcode = vshader_program_get_opcode(This, *pToken); ++pToken; if (NULL == curOpcode) { /* unknown current opcode ... (shouldn't be any!) */ @@ -1781,7 +1783,7 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ pToken += comment_len; continue ; } - curOpcode = vshader_program_get_opcode(*pToken); + curOpcode = vshader_program_get_opcode(This, *pToken); ++pToken; if (NULL == curOpcode) { i = 0; @@ -2129,7 +2131,7 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ len += comment_len + 1; continue; } - curOpcode = vshader_program_get_opcode(*pToken); + curOpcode = vshader_program_get_opcode(This, *pToken); ++pToken; ++len; if (NULL == curOpcode) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cff1ac9..dad25f6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1181,6 +1181,7 @@ typedef struct IWineD3DVertexShaderImpl IWineD3DDeviceImpl *wineD3DDevice; /* IWineD3DVertexShaderImpl */ + CONST SHADER_OPCODE *shader_ins; CONST DWORD *function; UINT functionLength; @@ -1204,6 +1205,7 @@ typedef struct IWineD3DVertexShaderImpl VSHADEROUTPUTDATA output; #endif } IWineD3DVertexShaderImpl; +extern const SHADER_OPCODE IWineD3DVertexShaderImpl_shader_ins[]; extern const IWineD3DVertexShaderVtbl IWineD3DVertexShader_Vtbl; /***************************************************************************** @@ -1218,6 +1220,7 @@ typedef struct IWineD3DPixelShaderImpl { IWineD3DDeviceImpl *wineD3DDevice; /* IWineD3DPixelShaderImpl */ + const SHADER_OPCODE *shader_ins; CONST DWORD *function; UINT functionLength; DWORD version; @@ -1233,5 +1236,6 @@ typedef struct IWineD3DPixelShaderImpl { #endif } IWineD3DPixelShaderImpl; +extern const SHADER_OPCODE IWineD3DPixelShaderImpl_shader_ins[]; extern const IWineD3DPixelShaderVtbl IWineD3DPixelShader_Vtbl; #endif

1 0

H. Verbeet : wined3d: Move the SHADER_OPCODE definition to wined3d_private. h.
by Alexandre Julliard 29 Mar '06

29 Mar '06

Module: wine Branch: refs/heads/master Commit: 3ee642bb09629ada8ba4d9f30fd3b0d7f263b055 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3ee642bb09629ada8ba4d9f… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Mar 28 21:10:32 2006 +0200 wined3d: Move the SHADER_OPCODE definition to wined3d_private.h. --- dlls/wined3d/pixelshader.c | 11 ----------- dlls/wined3d/vertexshader.c | 12 ------------ dlls/wined3d/wined3d_private.h | 12 ++++++++++++ 3 files changed, 12 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 381a828..64fe501 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -41,17 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); #define PGMSIZE 65535 #define REGMASK 0x00001FFF -typedef void (*shader_fct_t)(); - -typedef struct SHADER_OPCODE { - unsigned int opcode; - const char* name; - const char* glname; - CONST UINT num_params; - shader_fct_t soft_fct; - DWORD min_version; - DWORD max_version; -} SHADER_OPCODE; #define GLNAME_REQUIRE_GLSL ((const char *)1) /* ******************************************* diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 13da61c..cfa8f2e 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -78,18 +78,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); /* TODO: Vertex and Pixel shaders are almost identicle, the only exception being the way that some of the data is looked up or the availablity of some of the data i.e. some instructions are only valid for pshaders and some for vshaders because of this the bulk of the software pipeline can be shared between pixel and vertex shaders... and it wouldn't supprise me if the programes can be cross compiled using a large body body shared code */ -typedef void (*shader_fct_t)(); - -typedef struct SHADER_OPCODE { - unsigned int opcode; - const char* name; - const char* glname; - CONST UINT num_params; - shader_fct_t soft_fct; - DWORD min_version; - DWORD max_version; -} SHADER_OPCODE; - #define GLNAME_REQUIRE_GLSL ((const char *)1) /******************************* diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 86a1002..cff1ac9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1157,6 +1157,18 @@ enum vsConstantsEnum { VS_CONSTANT_FLOAT }; +typedef void (*shader_fct_t)(); + +typedef struct SHADER_OPCODE { + unsigned int opcode; + const char* name; + const char* glname; + CONST UINT num_params; + shader_fct_t soft_fct; + DWORD min_version; + DWORD max_version; +} SHADER_OPCODE; + /***************************************************************************** * IDirect3DVertexShader implementation structure */

1 0

H. Verbeet : wined3d: Pass the correct number of parameters for texld with ps version >= 2.
by Alexandre Julliard 29 Mar '06

29 Mar '06

Module: wine Branch: refs/heads/master Commit: 0ac9c473d642f68b7dec57294c17f5777f6ca9d8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0ac9c473d642f68b7dec572… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Mar 28 21:10:22 2006 +0200 wined3d: Pass the correct number of parameters for texld with ps version >= 2. --- dlls/wined3d/pixelshader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index e5311c7..381a828 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -715,6 +715,7 @@ static CONST SHADER_OPCODE pshader_ins [ {D3DSIO_TEXKILL, "texkill", "KIL", 1, pshader_texkill, D3DPS_VERSION(1,0), D3DPS_VERSION(1,4)}, {D3DSIO_TEX, "tex", "undefined", 1, pshader_tex, 0, D3DPS_VERSION(1,3)}, {D3DSIO_TEX, "texld", GLNAME_REQUIRE_GLSL, 2, pshader_texld, D3DPS_VERSION(1,4), D3DPS_VERSION(1,4)}, + {D3DSIO_TEX, "texld", GLNAME_REQUIRE_GLSL, 3, pshader_texld, D3DPS_VERSION(2,0), -1}, {D3DSIO_TEXBEM, "texbem", "undefined", 2, pshader_texbem, 0, D3DPS_VERSION(1,3)}, {D3DSIO_TEXBEML, "texbeml", GLNAME_REQUIRE_GLSL, 2, pshader_texbeml, D3DPS_VERSION(1,0), D3DPS_VERSION(1,3)}, {D3DSIO_TEXREG2AR,"texreg2ar","undefined", 2, pshader_texreg2ar, D3DPS_VERSION(1,1), D3DPS_VERSION(1,3)},

1 0

Mike McCormack : user32: Fix SPI_GETLISTBOXSMOOTHSCROLLING, and implement SPI_SETLISTBOXSMOOTHSCROLLING.
by Alexandre Julliard 29 Mar '06

29 Mar '06

Module: wine Branch: refs/heads/master Commit: 8398f6e9e94ef78cbf0af9a89672a42ca9a312a7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8398f6e9e94ef78cbf0af9a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 29 15:56:55 2006 +0900 user32: Fix SPI_GETLISTBOXSMOOTHSCROLLING, and implement SPI_SETLISTBOXSMOOTHSCROLLING. --- dlls/user/sysparams.c | 26 ++++---------------------- 1 files changed, 4 insertions(+), 22 deletions(-) diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c index 1ba3946..3aa7a27 100644 --- a/dlls/user/sysparams.c +++ b/dlls/user/sysparams.c @@ -298,7 +298,6 @@ static BOOL lowpoweractive = FALSE; static BOOL poweroffactive = FALSE; static BOOL show_sounds = FALSE; static BOOL swap_buttons = FALSE; -static BOOL listbox_smoothscrolling = FALSE; static UINT caret_width = 1; static BYTE user_prefs[4]; @@ -2125,29 +2124,12 @@ BOOL WINAPI SystemParametersInfoW( UINT break; case SPI_GETLISTBOXSMOOTHSCROLLING: /* 0x1006 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - if (!pvParam) return FALSE; - - spi_idx = SPI_SETLISTBOXSMOOTHSCROLLING_IDX; - if (!spi_loaded[spi_idx]) - { - WCHAR buf[5]; - - if (SYSPARAMS_Load( SPI_SETLISTBOXSMOOTHSCROLLING_REGKEY, - SPI_SETLISTBOXSMOOTHSCROLLING_VALNAME, buf, sizeof(buf) )) - { - if ((buf[0]&0x01) == 0x01) - { - listbox_smoothscrolling = TRUE; - } - } - spi_loaded[spi_idx] = TRUE; - } - - *(BOOL *)pvParam = listbox_smoothscrolling; - + ret = get_user_pref_param( 0, 0x08, pvParam ); break; - WINE_SPI_FIXME(SPI_SETLISTBOXSMOOTHSCROLLING);/* 0x1007 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + case SPI_SETLISTBOXSMOOTHSCROLLING: /* 0x1007 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = set_user_pref_param( 0, 0x08, (BOOL)pvParam, fWinIni ); + break; case SPI_GETGRADIENTCAPTIONS: ret = get_user_pref_param( 0, 0x10, pvParam );

1 0

Mike McCormack : user32: Implement SPI_[GS]ETUIEFFECTS.
by Alexandre Julliard 29 Mar '06

29 Mar '06

Module: wine Branch: refs/heads/master Commit: 964509df9cc8a2888272d22cfcb4b372cc5fdf81 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=964509df9cc8a2888272d22… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 29 15:58:26 2006 +0900 user32: Implement SPI_[GS]ETUIEFFECTS. --- dlls/user/sysparams.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c index bd1e99d..1ba3946 100644 --- a/dlls/user/sysparams.c +++ b/dlls/user/sysparams.c @@ -2227,8 +2227,15 @@ BOOL WINAPI SystemParametersInfoW( UINT WINE_SPI_FIXME(SPI_SETDROPSHADOW); /* 0x1025 _WIN32_WINNT >= 0x510 */ WINE_SPI_FIXME(SPI_GETBLOCKSENDINPUTRESETS); WINE_SPI_FIXME(SPI_SETBLOCKSENDINPUTRESETS); - WINE_SPI_FIXME(SPI_GETUIEFFECTS); - WINE_SPI_FIXME(SPI_SETUIEFFECTS); + case SPI_GETUIEFFECTS: + ret = get_user_pref_param( 3, 0x80, pvParam ); + break; + + case SPI_SETUIEFFECTS: + /* FIXME: this probably should mask other UI effect values when unset */ + ret = set_user_pref_param( 3, 0x80, (BOOL)pvParam, fWinIni ); + break; + WINE_SPI_FIXME(SPI_GETFOREGROUNDLOCKTIMEOUT);/* 0x2000 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_SETFOREGROUNDLOCKTIMEOUT);/* 0x2001 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_GETACTIVEWNDTRKTIMEOUT); /* 0x2002 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */

1 0