November 2007 - Wine-commits

Alex Villacís Lasso : user32: DlgDirSelect tacks on a period on filenames without ext.
by Alexandre Julliard 14 Nov '07

14 Nov '07

Module: wine Branch: master Commit: c4a77bd51047fb7c2b6ad1c441db8ea111eae320 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4a77bd51047fb7c2b6ad1c44… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sat Nov 10 18:09:08 2007 -0500 user32: DlgDirSelect tacks on a period on filenames without ext. --- dlls/user32/dialog.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index c716969..e7f55de 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1683,7 +1683,7 @@ static BOOL DIALOG_DlgDirSelect( HWND hwnd, LPWSTR str, INT len, size = SendMessageW(listbox, combo ? CB_GETLBTEXTLEN : LB_GETTEXTLEN, item, 0 ); if (size == LB_ERR) return FALSE; - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, (size+1) * sizeof(WCHAR) ))) return FALSE; + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, (size+2) * sizeof(WCHAR) ))) return FALSE; SendMessageW( listbox, combo ? CB_GETLBTEXT : LB_GETTEXT, item, (LPARAM)buffer ); @@ -1701,7 +1701,16 @@ static BOOL DIALOG_DlgDirSelect( HWND hwnd, LPWSTR str, INT len, ptr = buffer + 1; } } - else ptr = buffer; + else + { + /* Filenames without a dot extension must have one tacked at the end */ + if (strchrW(buffer, '.') == NULL) + { + buffer[strlenW(buffer)+1] = '\0'; + buffer[strlenW(buffer)] = '.'; + } + ptr = buffer; + } if (!unicode) {

1 0

Alex Villacís Lasso : user32: LB_DIR with standalone DDL_DRIVES implies DDL_EXCLUSIVE.
by Alexandre Julliard 14 Nov '07

14 Nov '07

Module: wine Branch: master Commit: 08d945dadd99d74e0f6fb84e32eb53b8c84cb602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08d945dadd99d74e0f6fb84e3… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sat Nov 10 18:08:10 2007 -0500 user32: LB_DIR with standalone DDL_DRIVES implies DDL_EXCLUSIVE. --- dlls/user32/dialog.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 40ac35b..c716969 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1759,6 +1759,8 @@ static INT DIALOG_DlgDirListW( HWND hDlg, LPWSTR spec, INT idLBox, if (idLBox && ((hwnd = GetDlgItem( hDlg, idLBox )) != 0)) { + if (attrib == DDL_DRIVES) attrib |= DDL_EXCLUSIVE; + SENDMSG( combo ? CB_RESETCONTENT : LB_RESETCONTENT, 0, 0 ); if (attrib & DDL_DIRECTORY) {

1 0

Alex Villacís Lasso : user32: Fix returned value of LB_DIR.
by Alexandre Julliard 14 Nov '07

14 Nov '07

Module: wine Branch: master Commit: 873799df246ea107a139ec898686490b20a1de7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=873799df246ea107a139ec898… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sat Nov 10 18:08:06 2007 -0500 user32: Fix returned value of LB_DIR. --- dlls/user32/listbox.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 7ec97dd..5d99670 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1815,6 +1815,7 @@ static LRESULT LISTBOX_Directory( LB_DESCR *descr, UINT attrib, LRESULT ret = LB_OKAY; WIN32_FIND_DATAW entry; int pos; + LRESULT maxinsert = LB_ERR; /* don't scan directory if we just want drives exclusively */ if (attrib != (DDL_DRIVES | DDL_EXCLUSIVE)) { @@ -1860,22 +1861,27 @@ static LRESULT LISTBOX_Directory( LB_DESCR *descr, UINT attrib, pos = LISTBOX_FindFileStrPos( descr, buffer ); if ((ret = LISTBOX_InsertString( descr, pos, buffer )) < 0) break; + if (ret <= maxinsert) maxinsert++; else maxinsert = ret; } while (FindNextFileW( handle, &entry )); FindClose( handle ); } } - - /* scan drives */ - if ((ret >= 0) && (attrib & DDL_DRIVES)) + if (ret >= 0) { - WCHAR buffer[] = {'[','-','a','-',']',0}; - WCHAR root[] = {'A',':','\\',0}; - int drive; - for (drive = 0; drive < 26; drive++, buffer[2]++, root[0]++) + ret = maxinsert; + + /* scan drives */ + if (attrib & DDL_DRIVES) { - if (GetDriveTypeW(root) <= DRIVE_NO_ROOT_DIR) continue; - if ((ret = LISTBOX_InsertString( descr, -1, buffer )) < 0) - break; + WCHAR buffer[] = {'[','-','a','-',']',0}; + WCHAR root[] = {'A',':','\\',0}; + int drive; + for (drive = 0; drive < 26; drive++, buffer[2]++, root[0]++) + { + if (GetDriveTypeW(root) <= DRIVE_NO_ROOT_DIR) continue; + if ((ret = LISTBOX_InsertString( descr, -1, buffer )) < 0) + break; + } } } return ret;

1 0

Alexandre Julliard : comctl32: Fixed handling of monochrome icons in image lists.
by Alexandre Julliard 14 Nov '07

14 Nov '07

Module: wine Branch: master Commit: a4c9d96aca1a6298d75d0c80fc31b0935173af9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4c9d96aca1a6298d75d0c80f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 14 12:38:35 2007 +0100 comctl32: Fixed handling of monochrome icons in image lists. --- dlls/comctl32/imagelist.c | 34 +++++++++++++++++++++++----------- 1 files changed, 23 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index ee1ef0e..c604abc 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2291,8 +2291,6 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) return -1; } - if (ii.hbmColor == 0) - ERR("no color!\n"); ret = GetObjectW (ii.hbmMask, sizeof(BITMAP), (LPVOID)&bmp); if (!ret) { ERR("couldn't get mask bitmap info\n"); @@ -2317,18 +2315,32 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) if (hdcImage == 0) ERR("invalid hdcImage!\n"); + imagelist_point_from_index(himl, nIndex, &pt); + SetTextColor(himl->hdcImage, RGB(0,0,0)); SetBkColor (himl->hdcImage, RGB(255,255,255)); - hbmOldSrc = SelectObject (hdcImage, ii.hbmColor); - - imagelist_point_from_index(himl, nIndex, &pt); - StretchBlt (himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, - hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY); - if (himl->hbmMask) { - SelectObject (hdcImage, ii.hbmMask); - StretchBlt (himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, - hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY); + if (ii.hbmColor) + { + hbmOldSrc = SelectObject (hdcImage, ii.hbmColor); + StretchBlt (himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, + hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY); + if (himl->hbmMask) + { + SelectObject (hdcImage, ii.hbmMask); + StretchBlt (himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, + hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY); + } + } + else + { + UINT height = bmp.bmHeight / 2; + hbmOldSrc = SelectObject (hdcImage, ii.hbmMask); + StretchBlt (himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, + hdcImage, 0, height, bmp.bmWidth, height, SRCCOPY); + if (himl->hbmMask) + StretchBlt (himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, + hdcImage, 0, 0, bmp.bmWidth, height, SRCCOPY); } SelectObject (hdcImage, hbmOldSrc);

1 0

Gerald Pfeifer : ws2_32/tests: Fix error checking.
by Alexandre Julliard 14 Nov '07

14 Nov '07

Module: wine Branch: master Commit: e3b5610825592a1cf6d7c731ee9da6dcd1a767a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3b5610825592a1cf6d7c731e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Nov 13 21:03:33 2007 +0100 ws2_32/tests: Fix error checking. --- dlls/ws2_32/tests/sock.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 858d0b5..80ffa61 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1647,7 +1647,7 @@ static void test_extendedSocketOptions(void) sa.sin_port = htons(0); sa.sin_addr.s_addr = htonl(INADDR_ANY); - if((sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP)) < 0){ + if((sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP)) == INVALID_SOCKET) { trace("Creating the socket failed: %d\n", WSAGetLastError()); WSACleanup(); return; @@ -1673,7 +1673,7 @@ static void test_extendedSocketOptions(void) closesocket(sock); - if((sock = socket(PF_INET, SOCK_STREAM, IPPROTO_IP)) < 0){ + if((sock = socket(PF_INET, SOCK_STREAM, IPPROTO_IP)) == INVALID_SOCKET) { trace("Creating the socket failed: %d\n", WSAGetLastError()); WSACleanup(); return; @@ -1720,7 +1720,7 @@ static void test_getsockname(void) sa_set.sin_port = htons(0); sa_set.sin_addr.s_addr = htonl(INADDR_ANY); - if((sock = socket(PF_INET, SOCK_STREAM, IPPROTO_IP)) < 0){ + if((sock = socket(PF_INET, SOCK_STREAM, IPPROTO_IP)) == INVALID_SOCKET) { trace("Creating the socket failed: %d\n", WSAGetLastError()); WSACleanup(); return;

1 0

Stefan Dösinger : wined3d: Fix ATI video memory detection typo.
by Alexandre Julliard 14 Nov '07

14 Nov '07

Module: wine Branch: master Commit: 73d992050f4db2e43f8f0b0a164ad22a441b2e0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=73d992050f4db2e43f8f0b0a1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Nov 11 00:42:14 2007 +0100 wined3d: Fix ATI video memory detection typo. --- dlls/wined3d/directx.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f62480e..8ed2d92 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1102,9 +1102,10 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { } else if(WINE_D3D7_CAPABLE(gl_info)) { gl_info->gl_card = CARD_ATI_RADEON_7200; /* Radeon 7000/7100/7200/7500 */ vidmem = 32; /* There are models with up to 64MB */ - } else + } else { gl_info->gl_card = CARD_ATI_RAGE_128PRO; vidmem = 16; /* There are 16-32MB models */ + } break; case VENDOR_INTEL: if (strstr(gl_info->gl_renderer, "915GM")) {

1 0

Stefan Dösinger : wined3d: Non power of two texture fixes.
by Alexandre Julliard 14 Nov '07

14 Nov '07

Module: wine Branch: master Commit: 26f7eae9cf474e4f2ec70246e59b599a356fe746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26f7eae9cf474e4f2ec70246e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 13 22:08:13 2007 +0100 wined3d: Non power of two texture fixes. --- dlls/wined3d/cubetexture.c | 34 +--------------------------------- dlls/wined3d/device.c | 19 +++++++++++++++---- dlls/wined3d/state.c | 20 +++++++++++++++----- dlls/wined3d/texture.c | 33 +-------------------------------- dlls/wined3d/wined3d_private.h | 11 +---------- 5 files changed, 33 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=26f7eae9cf474e4f2ec70…

1 0

Stefan Dösinger : wined3d: Apply matrices when switching from transformed vertices to shaders.
by Alexandre Julliard 14 Nov '07

14 Nov '07

Module: wine Branch: master Commit: 0334c1760f98fb9b6609704c736ec51337345422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0334c1760f98fb9b6609704c7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Nov 11 21:46:17 2007 +0100 wined3d: Apply matrices when switching from transformed vertices to shaders. --- dlls/wined3d/state.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 296c5ce..1a49e24 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3426,6 +3426,19 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, W FIXME("Clipping not supported with vertex shaders\n"); warned = TRUE; } + if(wasrhw) { + /* Apply the transform matrices when switching from rhw drawing to vertex shaders. Vertex + * shaders themselves do not need it it, but the matrices are not reapplied automatically when + * switching back from vertex shaders to fixed function processing. So make sure we leave the + * fixed function vertex processing states back in a sane state before switching to shaders + */ + if(!isStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION))) { + transform_projection(STATE_TRANSFORM(WINED3DTS_PROJECTION), stateblock, context); + } + if(!isStateDirty(context, STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(0)))) { + transform_world(STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(0)), stateblock, context); + } + } } }

1 0

Stefan Dösinger : wined3d: Read the framebuffer size from the surface, not the window.
by Alexandre Julliard 14 Nov '07

14 Nov '07

Module: wine Branch: master Commit: 58a761a88b8f236fd923d6d2d4cd562098034c88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58a761a88b8f236fd923d6d2d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Nov 10 22:36:28 2007 +0100 wined3d: Read the framebuffer size from the surface, not the window. --- dlls/wined3d/state.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 559a9fd..296c5ce 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3598,12 +3598,15 @@ static void light(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContex } static void scissorrect(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { - IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *) stateblock->wineD3DDevice->swapchains[0]; RECT *pRect = &stateblock->scissorRect; RECT windowRect; UINT winHeight; - GetClientRect(swapchain->win_handle, &windowRect); + windowRect.left = 0; + windowRect.top = 0; + windowRect.right = ((IWineD3DSurfaceImpl *) stateblock->wineD3DDevice->render_targets[0])->currentDesc.Width; + windowRect.bottom = ((IWineD3DSurfaceImpl *) stateblock->wineD3DDevice->render_targets[0])->currentDesc.Height; + /* Warning: glScissor uses window coordinates, not viewport coordinates, so our viewport correction does not apply * Warning2: Even in windowed mode the coords are relative to the window, not the screen */

1 0

Stefan Dösinger : wined3d: Depth stencil fixes.
by Alexandre Julliard 14 Nov '07

14 Nov '07

Module: wine Branch: master Commit: e4f8a2da2b601964aa4261cb1617ba41f58b5a69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4f8a2da2b601964aa4261cb1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Nov 10 00:19:19 2007 +0100 wined3d: Depth stencil fixes. --- dlls/d3d9/device.c | 1 + dlls/d3d9/tests/device.c | 76 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/device.c | 26 +++++++------- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/state.c | 1 + dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 7 files changed, 93 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e4f8a2da2b601964aa426…

1 0