February 2007 - Wine-commits

Marcus Meissner : configure: Generate stand alone AC_CONFIG_FILES() lines.
by Alexandre Julliard 27 Feb '07

27 Feb '07

Module: wine Branch: master Commit: fbc80d79b32c59063250d7969d83856d136746e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbc80d79b32c59063250d7969… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Feb 27 07:48:58 2007 +0100 configure: Generate stand alone AC_CONFIG_FILES() lines. --- configure | 648 +++++++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 649 +++++++++++++++++++++++++------------------------- tools/make_makefiles | 12 +- 3 files changed, 979 insertions(+), 330 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fbc80d79b32c59063250d…

1 0

Rob Shearman : user32: Send WM_GETTEXT to get the window caption when drawing the nonclient caption bar .
by Alexandre Julliard 27 Feb '07

27 Feb '07

Module: wine Branch: master Commit: 3a66a787bcaec4c07f8873ae5da39f880a7ccc05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a66a787bcaec4c07f8873ae5… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Feb 27 04:18:25 2007 +0000 user32: Send WM_GETTEXT to get the window caption when drawing the nonclient caption bar. --- dlls/user32/nonclient.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index cc3e66c..b4cb46c 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -968,7 +968,7 @@ static void NC_DrawCaption( HDC hdc, RECT *rect, HWND hwnd, DWORD style, } } - if (InternalGetWindowText( hwnd, buffer, sizeof(buffer)/sizeof(WCHAR) )) + if (GetWindowTextW( hwnd, buffer, sizeof(buffer)/sizeof(WCHAR) )) { NONCLIENTMETRICSW nclm; HFONT hFont, hOldFont;

1 0

Detlef Riekenberg : kernel32: Remove duplicate code (use serialui instead).
by Alexandre Julliard 27 Feb '07

27 Feb '07

Module: wine Branch: master Commit: ade9fd6400099207e3a4240f6ad433c3539d2daf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ade9fd6400099207e3a4240f6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Feb 26 22:16:07 2007 +0100 kernel32: Remove duplicate code (use serialui instead). --- dlls/kernel32/comm.c | 42 +++++++++++++++--------------------------- 1 files changed, 15 insertions(+), 27 deletions(-) diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index 07caa83..8fc1033 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -1388,35 +1388,23 @@ BOOL WINAPI GetDefaultCommConfigW( afterwards the number of bytes copied to the buffer or the needed size of the buffer. */ { - LPDCB lpdcb = &(lpCC->dcb); - WCHAR temp[40]; - static const WCHAR comW[] = {'C','O','M',0}; - static const WCHAR formatW[] = {'C','O','M','%','c',':','3','8','4','0','0',',','n',',','8',',','1',0}; - - TRACE("(%s, %p, %p) *lpdwSize: %u\n", debugstr_w(lpszName), lpCC, lpdwSize, lpdwSize ? *lpdwSize : 0 ); - - if (strncmpiW(lpszName,comW,3)) { - ERR("not implemented for <%s>\n", debugstr_w(lpszName)); - return FALSE; - } - - if (*lpdwSize < sizeof(COMMCONFIG)) { - *lpdwSize = sizeof(COMMCONFIG); - return FALSE; - } - - *lpdwSize = sizeof(COMMCONFIG); + FARPROC pGetDefaultCommConfig; + HMODULE hConfigModule; + DWORD res = ERROR_INVALID_PARAMETER; - lpCC->dwSize = sizeof(COMMCONFIG); - lpCC->wVersion = 1; - lpCC->dwProviderSubType = PST_RS232; - lpCC->dwProviderOffset = 0L; - lpCC->dwProviderSize = 0L; + TRACE("(%s, %p, %p) *lpdwSize: %u\n", debugstr_w(lpszName), lpCC, lpdwSize, lpdwSize ? *lpdwSize : 0 ); + hConfigModule = LoadLibraryW(lpszSerialUI); - sprintfW( temp, formatW, lpszName[3]); - FIXME("setting %s as default\n", debugstr_w(temp)); + if (hConfigModule) { + pGetDefaultCommConfig = GetProcAddress(hConfigModule, "drvGetDefaultCommConfigW"); + if (pGetDefaultCommConfig) { + res = pGetDefaultCommConfig(lpszName, lpCC, lpdwSize); + } + FreeLibrary(hConfigModule); + } - return BuildCommDCBW( temp, lpdcb); + if (res) SetLastError(res); + return (res == ERROR_SUCCESS); } /************************************************************************** @@ -1443,7 +1431,7 @@ BOOL WINAPI GetDefaultCommConfigA( if(lpszName) RtlCreateUnicodeStringFromAsciiz(&lpszNameW,lpszName); else lpszNameW.Buffer = NULL; - if(lpszNameW.Buffer) ret = GetDefaultCommConfigW(lpszNameW.Buffer,lpCC,lpdwSize); + ret = GetDefaultCommConfigW(lpszNameW.Buffer,lpCC,lpdwSize); RtlFreeUnicodeString(&lpszNameW); return ret;

1 0

Alexander Nicolaysen Sørnes : wordpad: Small cosmetic fixes.
by Alexandre Julliard 27 Feb '07

27 Feb '07

Module: wine Branch: master Commit: b42fcee0b1c316b46350b03e1841065526c4d8ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=b42fcee0b1c316b46350b03e1… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Feb 27 03:10:36 2007 +0100 wordpad: Small cosmetic fixes. - Clear title bar when creating new document. - Remove newline from statusbar. - Add horizontal line to toolbar. --- programs/wordpad/wordpad.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index dccbfef..2c650e0 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -290,7 +290,7 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) if(!SendMessage(hReBarWnd, RB_SETBARINFO, 0, (LPARAM)&rbi)) return -1; - hToolBarWnd = CreateToolbarEx(hReBarWnd, CCS_NOPARENTALIGN|CCS_NODIVIDER|CCS_NOMOVEY|WS_VISIBLE|WS_CHILD|TBSTYLE_TOOLTIPS|TBSTYLE_BUTTON, + hToolBarWnd = CreateToolbarEx(hReBarWnd, CCS_NOPARENTALIGN|CCS_NOMOVEY|WS_VISIBLE|WS_CHILD|TBSTYLE_TOOLTIPS|TBSTYLE_BUTTON, IDC_TOOLBAR, 3, hInstance, IDB_TOOLBAR, NULL, 0, @@ -396,7 +396,7 @@ static LRESULT OnNotify( HWND hWnd, WPARAM wParam, LPARAM lParam) SELCHANGE *pSC = (SELCHANGE *)lParam; char buf[128]; - sprintf( buf,"selection = %d..%d, line count=%ld\n", + sprintf( buf,"selection = %d..%d, line count=%ld", pSC->chrg.cpMin, pSC->chrg.cpMax, SendMessage(hwndEditor, EM_GETLINECOUNT, 0, 0)); SetWindowText(GetDlgItem(hWnd, IDC_STATUSBAR), buf); @@ -421,6 +421,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) case ID_FILE_NEW: SetWindowTextA(hwndEditor, ""); + SetWindowTextW(hMainWnd, wszAppTitle); /* FIXME: set default format too */ break;

1 0

Detlef Riekenberg : serialui: Use RS232 as default ProviderSubType.
by Alexandre Julliard 27 Feb '07

27 Feb '07

Module: wine Branch: master Commit: 9258c40181e782682c0ccd3c7a3b9503c7316982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9258c40181e782682c0ccd3c7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Feb 26 22:14:46 2007 +0100 serialui: Use RS232 as default ProviderSubType. --- dlls/serialui/confdlg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/serialui/confdlg.c b/dlls/serialui/confdlg.c index 4be0317..4de730d 100644 --- a/dlls/serialui/confdlg.c +++ b/dlls/serialui/confdlg.c @@ -569,6 +569,7 @@ DWORD WINAPI drvGetDefaultCommConfigW( memset(lpCommConfig, 0 , sizeof (COMMCONFIG)); lpCommConfig->dwSize = sizeof (COMMCONFIG); lpCommConfig->wVersion = 1; + lpCommConfig->dwProviderSubType = PST_RS232; r = RegConnectRegistryW(NULL, HKEY_LOCAL_MACHINE, &hKeyReg); if(r != ERROR_SUCCESS) return r;

1 0

Paul Vriens : wininet/tests: Add another test.
by Alexandre Julliard 27 Feb '07

27 Feb '07

Module: wine Branch: master Commit: 443ae2290a0d3e5e2e763c1a17baf7f1d281f30e URL: http://source.winehq.org/git/wine.git/?a=commit;h=443ae2290a0d3e5e2e763c1a1… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Feb 26 19:47:24 2007 +0100 wininet/tests: Add another test. --- dlls/wininet/tests/ftp.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index fc86bb1..b10e8d1 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -236,6 +236,7 @@ static void test_getfile(void) { BOOL bRet; HINTERNET hInternet, hFtp, hConnect; + HANDLE hFile; /* The order of checking is: * @@ -317,7 +318,29 @@ static void test_getfile(void) "Local file should not have been created\n"); DeleteFileA("should_be_non_existing_deadbeef"); - /* Remote file doesn't exist */ + /* Remote file doesn't exist (and local doesn't exist as well) */ + SetLastError(0xdeadbeef); + bRet = FtpGetFileA(hFtp, "should_be_non_existing_deadbeef", "should_also_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0); + ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n"); + todo_wine + { + ok ( GetLastError() == ERROR_INTERNET_EXTENDED_ERROR, + "Expected ERROR_INTERNET_EXTENDED_ERROR, got %d\n", GetLastError()); + /* Currently Wine always creates the local file (even on failure) which is not correct, hence the test */ + ok (GetFileAttributesA("should_also_be_non_existing_deadbeef") == INVALID_FILE_ATTRIBUTES, + "Local file should not have been created\n"); + } + DeleteFileA("should_also_be_non_existing_deadbeef"); + + /* Same call as the previous but now the local file does exists. Windows just removes the file if the call fails + * even if the local existed before! + */ + + /* Create a temporary local file */ + SetLastError(0xdeadbeef); + hFile = CreateFileA("should_also_be_non_existing_deadbeef", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok ( hFile != NULL, "Error creating a local file : %d\n", GetLastError()); + CloseHandle(hFile); SetLastError(0xdeadbeef); bRet = FtpGetFileA(hFtp, "should_be_non_existing_deadbeef", "should_also_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0); ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n");

1 0

Stefan Dösinger : wined3d: More Clear fixes.
by Alexandre Julliard 27 Feb '07

27 Feb '07

Module: wine Branch: master Commit: 4a16dbbbec5a44d4835952cf5612d30d7b546a27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a16dbbbec5a44d4835952cf5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 26 13:42:25 2007 +0100 wined3d: More Clear fixes. Test for rectangles with x1 > x2 and y1 > y2. Empire earth passes such rects. --- dlls/d3d8/tests/visual.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/visual.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/visual.c | 47 +++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 49 ++++++++++++++++++++++++++------------------ 4 files changed, 174 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a16dbbbec5a44d483595…

1 0

Stefan Dösinger : wined3d: Index buffer creation adjustments.
by Alexandre Julliard 27 Feb '07

27 Feb '07

Module: wine Branch: master Commit: 74d2632756e83b581ea38525735fb7475aab57a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74d2632756e83b581ea385257… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 26 13:38:17 2007 +0100 wined3d: Index buffer creation adjustments. Index buffer creation changes the bound gl buffer, thus the state has to be dirtified, similar to locking. In an error case the function returned without calling LEAVE_GL(). --- dlls/wined3d/device.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b1e9c2d..500a857 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -447,6 +447,11 @@ static void CreateIndexBufferVBO(IWineD3DDeviceImpl *This, IWineD3DIndexBufferIm GLenum error, glUsage; TRACE("Creating VBO for Index Buffer %p\n", object); + /* The following code will modify the ELEMENT_ARRAY_BUFFER binding, make sure it is + * restored on the next draw + */ + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_INDEXBUFFER); + ENTER_GL(); while(glGetError()); @@ -454,8 +459,7 @@ static void CreateIndexBufferVBO(IWineD3DDeviceImpl *This, IWineD3DIndexBufferIm error = glGetError(); if(error != GL_NO_ERROR || object->vbo == 0) { ERR("Creating a vbo failed, continueing without vbo for this buffer\n"); - object->vbo = 0; - return; + goto out; } GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, object->vbo));

1 0

Stefan Dösinger : winex11.drv: Ignore depth mismatch when using a virtual desktop.
by Alexandre Julliard 27 Feb '07

27 Feb '07

Module: wine Branch: master Commit: 8b70b91cba18a46e91dc4cf2d3784f2bf7ca8472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b70b91cba18a46e91dc4cf2d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 26 13:38:49 2007 +0100 winex11.drv: Ignore depth mismatch when using a virtual desktop. --- dlls/winex11.drv/desktop.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 7f27566..9bcb334 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -124,7 +124,11 @@ static LONG X11DRV_desktop_SetCurrentMode(int mode) if (dwBpp != dd_modes[mode].dwBPP) { FIXME("Cannot change screen BPP from %d to %d\n", dwBpp, dd_modes[mode].dwBPP); - return DISP_CHANGE_BADMODE; + /* Ignore the depth missmatch + * + * Some (older) applications require a specific bit depth, this will allow them + * to run. X11drv performs a color depth conversion if needed. + */ } TRACE("Resizing Wine desktop window to %dx%d\n", dd_modes[mode].dwWidth, dd_modes[mode].dwHeight); X11DRV_resize_desktop(dd_modes[mode].dwWidth, dd_modes[mode].dwHeight);

1 0

lostwages/ news/2007022601.xml wwn/wn20070226_ ...
by WineHQ 27 Feb '07

27 Feb '07

ChangeSet ID: 30936 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2007/02/26 21:12:53 Added files: news : 2007022601.xml wwn : wn20070226_323.xml Log message: WWN #323 Patch: http://cvs.winehq.org/patch.py?id=30936 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2007022601.xml Added 1.1 +0 -0 lostwages/wwn/wn20070226_323.xml

1 0