January 2006 - Wine-commits

appdb/. appsubmit.php
by WineHQ 18 Jan '06

18 Jan '06

ChangeSet ID: 22366 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/01/17 22:18:56 Modified files: . : appsubmit.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Fix appsubmit to display versions for resubmission by calling the correct function Patch: http://cvs.winehq.org/patch.py?id=22366 Old revision New revision Changes Path 1.36 1.37 +2 -2 appdb/appsubmit.php Index: appdb/appsubmit.php diff -u -p appdb/appsubmit.php:1.36 appdb/appsubmit.php:1.37 --- appdb/appsubmit.php:1.36 18 Jan 2006 4:18:56 -0000 +++ appdb/appsubmit.php 18 Jan 2006 4:18:56 -0000 @@ -303,9 +303,9 @@ if ($_REQUEST['sub']) { if(is_numeric($oVersion->iVersionId)) { - echo html_frame_start("Potential duplicate versions in the database","90%","",0); $oAppForVersion = new Application($oVersion->iAppId); - display_versions($oAppForVersion->iAppId, $oAppForVersion->aVersionsIds); + echo html_frame_start("Potential duplicate versions in the database for application: ".$oAppForVersion->sName,"90%","",0); + display_approved_versions($oAppForVersion->aVersionsIds); echo html_frame_end(" "); //help

1 0

Marcus Meissner : msvcrt: _makepath(): operate on target buffer directly.
by Alexandre Julliard 17 Jan '06

17 Jan '06

Module: wine Branch: refs/heads/master Commit: 71908c41c38c188260dd8bfdb33d29b39421fa34 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=71908c41c38c188260dd8bf… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Jan 17 16:20:37 2006 +0100 msvcrt: _makepath(): operate on target buffer directly. --- dlls/msvcrt/dir.c | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index fa757ac..926d5dd 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -857,40 +857,37 @@ VOID _makepath(char * path, const char * const char * extension) { char ch; - char tmpPath[MAX_PATH]; - TRACE("got %s %s %s %s\n", debugstr_a(drive), debugstr_a(directory), + + TRACE("(%s %s %s %s)\n", debugstr_a(drive), debugstr_a(directory), debugstr_a(filename), debugstr_a(extension) ); if ( !path ) return; - tmpPath[0] = '\0'; + path[0] = '\0'; if (drive && drive[0]) { - tmpPath[0] = drive[0]; - tmpPath[1] = ':'; - tmpPath[2] = 0; + path[0] = drive[0]; + path[1] = ':'; + path[2] = 0; } if (directory && directory[0]) { - strcat(tmpPath, directory); - ch = tmpPath[strlen(tmpPath)-1]; + strcat(path, directory); + ch = path[strlen(path)-1]; if (ch != '/' && ch != '\\') - strcat(tmpPath,"\\"); + strcat(path,"\\"); } if (filename && filename[0]) { - strcat(tmpPath, filename); + strcat(path, filename); if (extension && extension[0]) { if ( extension[0] != '.' ) - strcat(tmpPath,"."); - strcat(tmpPath,extension); + strcat(path,"."); + strcat(path,extension); } } - - strcpy( path, tmpPath ); - TRACE("returning %s\n",path); }

1 0

Robert Reif : dsound: Primary buffer size change tests.
by Alexandre Julliard 17 Jan '06

17 Jan '06

Module: wine Branch: refs/heads/master Commit: c82a63ba97d080e43aa61e408fc92f2fcc7222a8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c82a63ba97d080e43aa61e4… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Jan 17 16:19:54 2006 +0100 dsound: Primary buffer size change tests. It looks like Windows doesn't change the primary buffer length when changing formats so make the tests fail now. This means the current ALSA implementation is broken when hardware acceleration is set to full and the primary buffer format is changed. --- dlls/dsound/tests/ds3d.c | 20 +++++++++----------- dlls/dsound/tests/ds3d8.c | 18 ++++++++---------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index ea0a57c..ce7be84 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -410,20 +410,18 @@ void test_buffer(LPDIRECTSOUND dso, LPDI trace(" new Caps: flags=0x%08lx size=%ld\n",new_dsbcaps.dwFlags, new_dsbcaps.dwBufferBytes); } - + /* Check for primary buffer size change */ - if (new_dsbcaps.dwBufferBytes != dsbcaps.dwBufferBytes) { - trace(" buffer size changed after SetFormat() - " - "previous size was %lu, current size is %lu\n", - dsbcaps.dwBufferBytes, new_dsbcaps.dwBufferBytes); - } + ok(new_dsbcaps.dwBufferBytes == dsbcaps.dwBufferBytes, + " buffer size changed after SetFormat() - " + "previous size was %lu, current size is %lu\n", + dsbcaps.dwBufferBytes, new_dsbcaps.dwBufferBytes); /* Check for primary buffer flags change */ - if (new_dsbcaps.dwFlags != dsbcaps.dwFlags) { - trace(" flags changed after SetFormat() - " - "previous flags were %08lx, current flags are %08lx\n", - dsbcaps.dwFlags, new_dsbcaps.dwFlags); - } + ok(new_dsbcaps.dwFlags == dsbcaps.dwFlags, + " flags changed after SetFormat() - " + "previous flags were %08lx, current flags are %08lx\n", + dsbcaps.dwFlags, new_dsbcaps.dwFlags); /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index b01e4d0..6d440e2 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -304,18 +304,16 @@ void test_buffer8(LPDIRECTSOUND8 dso, LP } /* Check for primary buffer size change */ - if (new_dsbcaps.dwBufferBytes != dsbcaps.dwBufferBytes) { - trace(" buffer size changed after SetFormat() - " - "previous size was %lu, current size is %lu\n", - dsbcaps.dwBufferBytes, new_dsbcaps.dwBufferBytes); - } + ok(new_dsbcaps.dwBufferBytes == dsbcaps.dwBufferBytes, + " buffer size changed after SetFormat() - " + "previous size was %lu, current size is %lu\n", + dsbcaps.dwBufferBytes, new_dsbcaps.dwBufferBytes); /* Check for primary buffer flags change */ - if (new_dsbcaps.dwFlags != dsbcaps.dwFlags) { - trace(" flags changed after SetFormat() - " - "previous flags were %08lx, current flags are %08lx\n", - dsbcaps.dwFlags, new_dsbcaps.dwFlags); - } + ok(new_dsbcaps.dwFlags == dsbcaps.dwFlags, + " flags changed after SetFormat() - " + "previous flags were %08lx, current flags are %08lx\n", + dsbcaps.dwFlags, new_dsbcaps.dwFlags); /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */

1 0

Robert Reif : dsound: Add full duplex tests.
by Alexandre Julliard 17 Jan '06

17 Jan '06

Module: wine Branch: refs/heads/master Commit: 03b8fca7e2662d1b6a4b5dd35b067cd6518d6d9f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=03b8fca7e2662d1b6a4b5dd… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Jan 17 16:19:14 2006 +0100 dsound: Add full duplex tests. --- dlls/dsound/tests/.gitignore | 1 dlls/dsound/tests/Makefile.in | 1 dlls/dsound/tests/duplex.c | 258 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 260 insertions(+), 0 deletions(-) create mode 100644 dlls/dsound/tests/duplex.c

1 0

Robert Reif : dsound: Add full duplex support.
by Alexandre Julliard 17 Jan '06

17 Jan '06

Module: wine Branch: refs/heads/master Commit: 27e591959f28badf1b3a68c71d6c278eb49d84df URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=27e591959f28badf1b3a68c… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Jan 17 16:13:58 2006 +0100 dsound: Add full duplex support. --- dlls/dsound/dsound_private.h | 63 +++ dlls/dsound/duplex.c | 799 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 808 insertions(+), 54 deletions(-)

1 0

Robert Reif : dsound: Convert IDirectSoundImpl from a COM class to a regular class
by Alexandre Julliard 17 Jan '06

17 Jan '06

Module: wine Branch: refs/heads/master Commit: 3a4e11cd24436ea8232a097a9a69948b0bff01cd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3a4e11cd24436ea8232a097… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Jan 17 16:10:15 2006 +0100 dsound: Convert IDirectSoundImpl from a COM class to a regular class and move most of the COM functions to the DirectSoundDevice class. --- dlls/dsound/dsound.c | 2403 ++++++++++++++++++++---------------------- dlls/dsound/dsound_private.h | 34 + 2 files changed, 1201 insertions(+), 1236 deletions(-)

1 0

Michael Kaufmann : static control: Immediately repaint the control.
by Alexandre Julliard 17 Jan '06

17 Jan '06

Module: wine Branch: refs/heads/master Commit: 73a23606a9bdbcc027c432b2205d860a01f85176 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=73a23606a9bdbcc027c432b… Author: Michael Kaufmann <hallo(a)michael-kaufmann.ch> Date: Tue Jan 17 16:09:32 2006 +0100 static control: Immediately repaint the control. --- dlls/user/static.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user/static.c b/dlls/user/static.c index fb083b4..b830a61 100644 --- a/dlls/user/static.c +++ b/dlls/user/static.c @@ -419,7 +419,7 @@ static LRESULT StaticWndProc_common( HWN case WM_SYSCOLORCHANGE: STATIC_InitColours(); - InvalidateRect(hwnd, NULL, TRUE); + STATIC_TryPaintFcn( hwnd, full_style ); break; case WM_NCCREATE: @@ -544,13 +544,13 @@ static LRESULT StaticWndProc_common( HWN FIXME("STM_SETIMAGE: Unhandled type %x\n", wParam); break; } - InvalidateRect( hwnd, NULL, TRUE ); + STATIC_TryPaintFcn( hwnd, full_style ); break; case STM_SETICON16: case STM_SETICON: lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)wParam, full_style ); - InvalidateRect( hwnd, NULL, TRUE ); + STATIC_TryPaintFcn( hwnd, full_style ); break; default:

1 0

Michael Kaufmann : static control: Don't load OEM bitmaps.
by Alexandre Julliard 17 Jan '06

17 Jan '06

Module: wine Branch: refs/heads/master Commit: 97be4fa91dda4d5a6efd8b1c04e3c8a63810cac8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=97be4fa91dda4d5a6efd8b1… Author: Michael Kaufmann <hallo(a)michael-kaufmann.ch> Date: Tue Jan 17 16:07:10 2006 +0100 static control: Don't load OEM bitmaps. --- dlls/user/static.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/user/static.c b/dlls/user/static.c index 212f4c6..4898b91 100644 --- a/dlls/user/static.c +++ b/dlls/user/static.c @@ -278,10 +278,8 @@ static HICON STATIC_LoadIconW( HWND hwnd static HBITMAP STATIC_LoadBitmapA( HWND hwnd, LPCSTR name ) { HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE ); - HBITMAP hbitmap = LoadBitmapA( hInstance, name ); - if (!hbitmap) /* Try OEM icon (FIXME: is this right?) */ - hbitmap = LoadBitmapA( 0, name ); - return hbitmap; + /* Windows doesn't try to load OEM Bitmaps (hInstance == NULL) */ + return LoadBitmapA( hInstance, name ); } /*********************************************************************** @@ -292,10 +290,8 @@ static HBITMAP STATIC_LoadBitmapA( HWND static HBITMAP STATIC_LoadBitmapW( HWND hwnd, LPCWSTR name ) { HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE ); - HBITMAP hbitmap = LoadBitmapW( hInstance, name ); - if (!hbitmap) /* Try OEM icon (FIXME: is this right?) */ - hbitmap = LoadBitmapW( 0, name ); - return hbitmap; + /* Windows doesn't try to load OEM Bitmaps (hInstance == NULL) */ + return LoadBitmapW( hInstance, name ); } /***********************************************************************

1 0

Michael Kaufmann : static control: Separate WM_NCCREATE and WM_SETTEXT.
by Alexandre Julliard 17 Jan '06

17 Jan '06

Module: wine Branch: refs/heads/master Commit: 6ca3e6365a4c307dbb1e5e3cf01c90a297e25d9d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6ca3e6365a4c307dbb1e5e3… Author: Michael Kaufmann <hallo(a)michael-kaufmann.ch> Date: Tue Jan 17 16:08:59 2006 +0100 static control: Separate WM_NCCREATE and WM_SETTEXT. - Separate WM_NCCREATE and WM_SETTEXT. - WM_SETTEXT and WM_SETFONT are ignored for static controls that don't display text. - WM_SETTEXT must not be used to change the icon/bitmap/metafile. - Immediately repaint the control on all occasions. --- dlls/user/static.c | 143 +++++++++++++++++++++++++++++----------------------- 1 files changed, 81 insertions(+), 62 deletions(-) diff --git a/dlls/user/static.c b/dlls/user/static.c index 4898b91..fb083b4 100644 --- a/dlls/user/static.c +++ b/dlls/user/static.c @@ -336,6 +336,27 @@ static VOID STATIC_InitColours(void) } /*********************************************************************** + * hasTextStyle + * + * Tests if the control displays text. + */ +static BOOL hasTextStyle( DWORD style ) +{ + switch(style & SS_TYPEMASK) + { + case SS_SIMPLE: + case SS_LEFT: + case SS_LEFTNOWORDWRAP: + case SS_CENTER: + case SS_RIGHT: + case SS_OWNERDRAW: + return TRUE; + } + + return FALSE; +} + +/*********************************************************************** * StaticWndProc_common */ static LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, @@ -402,76 +423,74 @@ static LRESULT StaticWndProc_common( HWN break; case WM_NCCREATE: - if (full_style & SS_SUNKEN) - SetWindowLongW( hwnd, GWL_EXSTYLE, - GetWindowLongW( hwnd, GWL_EXSTYLE ) | WS_EX_STATICEDGE ); - - if(unicode) - lParam = (LPARAM)(((LPCREATESTRUCTW)lParam)->lpszName); - else - lParam = (LPARAM)(((LPCREATESTRUCTA)lParam)->lpszName); - /* fall through */ - case WM_SETTEXT: - switch (style) { - case SS_ICON: - { - HICON hIcon; - if(unicode) - hIcon = STATIC_LoadIconW(hwnd, (LPCWSTR)lParam, full_style); - else - hIcon = STATIC_LoadIconA(hwnd, (LPCSTR)lParam, full_style); - /* FIXME : should we also return the previous hIcon here ??? */ - STATIC_SetIcon(hwnd, hIcon, full_style); - break; - } - case SS_BITMAP: - { - HBITMAP hBitmap; - if(unicode) - hBitmap = STATIC_LoadBitmapW(hwnd, (LPCWSTR)lParam); - else - hBitmap = STATIC_LoadBitmapA(hwnd, (LPCSTR)lParam); - STATIC_SetBitmap(hwnd, hBitmap, full_style); - break; - } - /* SS_ENHMETAFILE: Despite what MSDN says, Windows does not load - the enhanced metafile that was specified as the window text. */ + { + LPCSTR textA; + LPCWSTR textW; + + if (full_style & SS_SUNKEN) + SetWindowLongW( hwnd, GWL_EXSTYLE, + GetWindowLongW( hwnd, GWL_EXSTYLE ) | WS_EX_STATICEDGE ); + + if(unicode) + { + textA = NULL; + textW = ((LPCREATESTRUCTW)lParam)->lpszName; + } + else + { + textA = ((LPCREATESTRUCTA)lParam)->lpszName; + textW = NULL; + } + + switch (style) { + case SS_ICON: + { + HICON hIcon; + if(unicode) + hIcon = STATIC_LoadIconW(hwnd, textW, full_style); + else + hIcon = STATIC_LoadIconA(hwnd, textA, full_style); + STATIC_SetIcon(hwnd, hIcon, full_style); + } + break; + case SS_BITMAP: + { + HBITMAP hBitmap; + if(unicode) + hBitmap = STATIC_LoadBitmapW(hwnd, textW); + else + hBitmap = STATIC_LoadBitmapA(hwnd, textA); + STATIC_SetBitmap(hwnd, hBitmap, full_style); + } + break; + } + /* SS_ENHMETAFILE: Despite what MSDN says, Windows does not load + the enhanced metafile that was specified as the window text. */ + } + return unicode ? DefWindowProcW(hwnd, uMsg, wParam, lParam) : + DefWindowProcA(hwnd, uMsg, wParam, lParam); - case SS_LEFT: - case SS_CENTER: - case SS_RIGHT: - case SS_SIMPLE: - case SS_LEFTNOWORDWRAP: + case WM_SETTEXT: + if (hasTextStyle( full_style )) { if (HIWORD(lParam)) { - if(unicode) - lResult = DefWindowProcW( hwnd, WM_SETTEXT, wParam, lParam ); - else - lResult = DefWindowProcA( hwnd, WM_SETTEXT, wParam, lParam ); - } - if (uMsg == WM_SETTEXT) - STATIC_TryPaintFcn( hwnd, full_style ); - break; - } - default: - if (HIWORD(lParam)) - { - if(unicode) - lResult = DefWindowProcW( hwnd, WM_SETTEXT, wParam, lParam ); - else - lResult = DefWindowProcA( hwnd, WM_SETTEXT, wParam, lParam ); + if(unicode) + lResult = DefWindowProcW( hwnd, uMsg, wParam, lParam ); + else + lResult = DefWindowProcA( hwnd, uMsg, wParam, lParam ); + STATIC_TryPaintFcn( hwnd, full_style ); } - if(uMsg == WM_SETTEXT) - InvalidateRect(hwnd, NULL, TRUE); } - return 1; /* success. FIXME: check text length */ + break; case WM_SETFONT: - if ((style == SS_ICON) || (style == SS_BITMAP)) return 0; - SetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET, wParam ); - if (LOWORD(lParam)) - InvalidateRect( hwnd, NULL, TRUE ); + if (hasTextStyle( full_style )) + { + SetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET, wParam ); + if (LOWORD(lParam)) + STATIC_TryPaintFcn( hwnd, full_style ); + } break; case WM_GETFONT:

1 0

Michael Kaufmann : static control: Support SS_REALSIZEIMAGE.
by Alexandre Julliard 17 Jan '06

17 Jan '06

Module: wine Branch: refs/heads/master Commit: 46d007cedb89b37122217c50f8cc8fe17edb25a6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=46d007cedb89b37122217c5… Author: Michael Kaufmann <hallo(a)michael-kaufmann.ch> Date: Tue Jan 17 16:04:40 2006 +0100 static control: Support SS_REALSIZEIMAGE. - Support SS_REALSIZEIMAGE (this flag means "it's not necessary to load icons in the default icon size"). - SS_ICON: Ability to display cursors. --- dlls/user/static.c | 43 ++++++++++++++++++++++++++++++++----------- 1 files changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/user/static.c b/dlls/user/static.c index 0b8cb29..4281a6a 100644 --- a/dlls/user/static.c +++ b/dlls/user/static.c @@ -29,7 +29,6 @@ * TODO: * * Styles - * - SS_REALSIZEIMAGE * - SS_RIGHTJUST * * Notifications @@ -206,12 +205,23 @@ static HENHMETAFILE STATIC_SetEnhMetaFil * * Load the icon for an SS_ICON control. */ -static HICON STATIC_LoadIconA( HWND hwnd, LPCSTR name ) +static HICON STATIC_LoadIconA( HWND hwnd, LPCSTR name, DWORD style ) { HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE ); - HICON hicon = LoadIconA( hInstance, name ); - if (!hicon) hicon = LoadIconA( 0, name ); - return hicon; + if ((style & SS_REALSIZEIMAGE) != 0) + { + return LoadImageA(hInstance, name, IMAGE_ICON, 0, 0, LR_SHARED); + } + else + { + HICON hicon = LoadIconA( hInstance, name ); + if (!hicon) hicon = LoadCursorA( hInstance, name ); + if (!hicon) hicon = LoadIconA( 0, name ); + /* Windows doesn't try to load a standard cursor, + probably because most IDs for standard cursors conflict + with the IDs for standard icons anyway */ + return hicon; + } } /*********************************************************************** @@ -219,12 +229,23 @@ static HICON STATIC_LoadIconA( HWND hwnd * * Load the icon for an SS_ICON control. */ -static HICON STATIC_LoadIconW( HWND hwnd, LPCWSTR name ) +static HICON STATIC_LoadIconW( HWND hwnd, LPCWSTR name, DWORD style ) { HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE ); - HICON hicon = LoadIconW( hInstance, name ); - if (!hicon) hicon = LoadIconW( 0, name ); - return hicon; + if ((style & SS_REALSIZEIMAGE) != 0) + { + return LoadImageW(hInstance, name, IMAGE_ICON, 0, 0, LR_SHARED); + } + else + { + HICON hicon = LoadIconW( hInstance, name ); + if (!hicon) hicon = LoadCursorW( hInstance, name ); + if (!hicon) hicon = LoadIconW( 0, name ); + /* Windows doesn't try to load a standard cursor, + probably because most IDs for standard cursors conflict + with the IDs for standard icons anyway */ + return hicon; + } } /*********************************************************************** @@ -368,9 +389,9 @@ static LRESULT StaticWndProc_common( HWN { HICON hIcon; if(unicode) - hIcon = STATIC_LoadIconW(hwnd, (LPCWSTR)lParam); + hIcon = STATIC_LoadIconW(hwnd, (LPCWSTR)lParam, full_style); else - hIcon = STATIC_LoadIconA(hwnd, (LPCSTR)lParam); + hIcon = STATIC_LoadIconA(hwnd, (LPCSTR)lParam, full_style); /* FIXME : should we also return the previous hIcon here ??? */ STATIC_SetIcon(hwnd, hIcon, full_style); break;

1 0