March 2006 - wine-commits

Aric Stewart : twain: Add a property sheet UI for scanning.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: 8358c63e15b64f7e11a238e2b375121108148479 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8358c63e15b64f7e11a238e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 22 13:34:22 2006 -0600 twain: Add a property sheet UI for scanning. --- dlls/twain/.gitignore | 1 dlls/twain/Makefile.in | 8 dlls/twain/ds_ctrl.c | 17 + dlls/twain/ds_image.c | 10 dlls/twain/dsm_ctrl.c | 1 dlls/twain/resource.h | 23 + dlls/twain/rsrc.rc | 28 + dlls/twain/twain32_main.c | 1 dlls/twain/twain_En.rc | 40 ++ dlls/twain/twain_i.h | 8 dlls/twain/ui.c | 1074 +++++++++++++++++++++++++++++++++++++++++++++ 11 files changed, 1205 insertions(+), 6 deletions(-) create mode 100644 dlls/twain/resource.h create mode 100644 dlls/twain/rsrc.rc create mode 100644 dlls/twain/twain_En.rc create mode 100644 dlls/twain/ui.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=8358c63e15b64f7e11a…

1 0

Alexandre Julliard : x11drv: Reinitialize the display settings when using a desktop window.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: bec4990cab64f9deb72705656d4f83b2a79c41c9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bec4990cab64f9deb727056… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 28 16:55:03 2006 +0200 x11drv: Reinitialize the display settings when using a desktop window. --- dlls/x11drv/desktop.c | 42 ++++++++++++++++++++++++++---------------- dlls/x11drv/window.c | 13 +++++++------ dlls/x11drv/x11drv.h | 1 + 3 files changed, 34 insertions(+), 22 deletions(-) diff --git a/dlls/x11drv/desktop.c b/dlls/x11drv/desktop.c index ee76168..75b2194 100644 --- a/dlls/x11drv/desktop.c +++ b/dlls/x11drv/desktop.c @@ -131,6 +131,31 @@ static void X11DRV_desktop_SetCurrentMod } /*********************************************************************** + * X11DRV_init_desktop + * + * Setup the desktop when not using the root window. + */ +void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) +{ + root_window = win; + max_width = screen_width; + max_height = screen_height; + screen_width = width; + screen_height = height; + + /* initialize the available resolutions */ + dd_modes = X11DRV_Settings_SetHandlers("desktop", + X11DRV_desktop_GetCurrentMode, + X11DRV_desktop_SetCurrentMode, + NUM_DESKTOP_MODES+2, 1); + make_modes(); + X11DRV_Settings_AddDepthModes(); + dd_mode_count = X11DRV_Settings_GetModeCount(); + X11DRV_Settings_SetDefaultMode(0); +} + + +/*********************************************************************** * X11DRV_create_desktop * * Create the X11 desktop window for the desktop mode. @@ -142,10 +167,6 @@ Window X11DRV_create_desktop( UINT width Display *display = thread_display(); wine_tsx11_lock(); - max_width = screen_width; - max_height = screen_height; - screen_width = width; - screen_height = height; /* Create window */ win_attr.event_mask = ExposureMask | KeyPressMask | KeyReleaseMask | @@ -163,17 +184,6 @@ Window X11DRV_create_desktop( UINT width CWEventMask | CWCursor | CWColormap, &win_attr ); XFlush( display ); wine_tsx11_unlock(); - if (win == None) return None; - - /* initialize the available resolutions */ - dd_modes = X11DRV_Settings_SetHandlers("desktop", - X11DRV_desktop_GetCurrentMode, - X11DRV_desktop_SetCurrentMode, - NUM_DESKTOP_MODES+2, 1); - make_modes(); - X11DRV_Settings_AddDepthModes(); - dd_mode_count = X11DRV_Settings_GetModeCount(); - X11DRV_Settings_SetDefaultMode(0); - root_window = win; + if (win != None) X11DRV_init_desktop( win, width, height ); return win; } diff --git a/dlls/x11drv/window.c b/dlls/x11drv/window.c index 67be435..592d874 100644 --- a/dlls/x11drv/window.c +++ b/dlls/x11drv/window.c @@ -858,18 +858,19 @@ static void get_desktop_xwin( Display *d if (win) { + unsigned int width, height; + /* retrieve the real size of the desktop */ SERVER_START_REQ( get_window_rectangles ) { req->handle = data->hwnd; - if (!wine_server_call( req )) - { - screen_width = reply->window.right - reply->window.left; - screen_height = reply->window.bottom - reply->window.top; - } + wine_server_call( req ); + width = reply->window.right - reply->window.left; + height = reply->window.bottom - reply->window.top; } SERVER_END_REQ; - data->whole_window = root_window = win; + data->whole_window = win; + if (win != root_window) X11DRV_init_desktop( win, width, height ); } else { diff --git a/dlls/x11drv/x11drv.h b/dlls/x11drv/x11drv.h index fea2721..c528c99 100644 --- a/dlls/x11drv/x11drv.h +++ b/dlls/x11drv/x11drv.h @@ -684,6 +684,7 @@ extern BOOL X11DRV_set_window_pos( HWND const RECT *rectClient, UINT swp_flags, const RECT *validRects ); extern void X11DRV_set_wm_hints( Display *display, struct x11drv_win_data *data ); +extern void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ); extern void X11DRV_handle_desktop_resize(unsigned int width, unsigned int height); extern void X11DRV_Settings_AddDepthModes(void); extern void X11DRV_Settings_AddOneMode(unsigned int width, unsigned int height, unsigned int bpp, unsigned int freq);

1 0

Aric Stewart : twain: A few cleanups, using some consts from sane.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: 0bcc992162a5ce4a338c9210ef90e6a98dcf3254 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0bcc992162a5ce4a338c921… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 22 13:34:44 2006 -0600 twain: A few cleanups, using some consts from sane. --- dlls/twain/ds_image.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/twain/ds_image.c b/dlls/twain/ds_image.c index 07ebad8..dd37cf0 100644 --- a/dlls/twain/ds_image.c +++ b/dlls/twain/ds_image.c @@ -120,7 +120,7 @@ TW_UINT16 TWAIN_ImageInfoGet (pTW_IDENTI TRACE("Bits per Sample %i\n",pSource->sane_param.depth); TRACE("Frame Format %i\n",pSource->sane_param.format); - if (pSource->sane_param.format == 1 /*RGB*/ ) + if (pSource->sane_param.format == SANE_FRAME_RGB ) { pImageInfo->BitsPerPixel = pSource->sane_param.depth * 3; pImageInfo->Compression = TWCP_NONE; @@ -131,9 +131,18 @@ TW_UINT16 TWAIN_ImageInfoGet (pTW_IDENTI pImageInfo->BitsPerSample[2] = pSource->sane_param.depth; pImageInfo->PixelType = TWPT_RGB; } + else if (pSource->sane_param.format == SANE_FRAME_GRAY) + { + pImageInfo->BitsPerPixel = pSource->sane_param.depth; + pImageInfo->Compression = TWCP_NONE; + pImageInfo->Planar = TRUE; + pImageInfo->SamplesPerPixel = 1; + pImageInfo->BitsPerSample[0] = pSource->sane_param.depth; + pImageInfo->PixelType = TWPT_GRAY; + } else { - ERR("Unhandled source frame type\n"); + ERR("Unhandled source frame type %i\n",pSource->sane_param.format); twRC = TWRC_FAILURE; pSource->twCC = TWCC_SEQERROR; }

1 0

Eric Kohl : widl: Implement support for pointers to base types.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: 1a5c6ef47d7dd3f6ba222949b2849a56ed0b956d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1a5c6ef47d7dd3f6ba22294… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Fri Mar 24 17:40:17 2006 +0100 widl: Implement support for pointers to base types. --- tools/widl/client.c | 41 +++++++++++++++++---- tools/widl/server.c | 92 ++++++++++++++++++++++++++++++++++++++--------- tools/widl/typegen.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 202 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=1a5c6ef47d7dd3f6ba2…

1 0

Alexandre Julliard : advapi32: Fixed compiler warnings.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: e97a1afbab0013d40c46946125d42aa712ae6458 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e97a1afbab0013d40c46946… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 28 14:43:18 2006 +0200 advapi32: Fixed compiler warnings. --- dlls/advapi32/security.c | 2 +- dlls/advapi32/tests/security.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 78b864b..0c7327d 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2093,7 +2093,7 @@ VOID WINAPI BuildTrusteeWithObjectsAndNa pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; pTrustee->TrusteeForm = TRUSTEE_IS_OBJECTS_AND_NAME; pTrustee->TrusteeType = TRUSTEE_IS_UNKNOWN; - pTrustee->ptstrName = pObjName; + pTrustee->ptstrName = (LPSTR)pObjName; } /****************************************************************************** diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 057f545..1c9ab5d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -173,11 +173,10 @@ static void test_trustee(void) char szObjectTypeName[] = "ObjectTypeName"; char szInheritedObjectTypeName[] = "InheritedObjectTypeName"; char szTrusteeName[] = "szTrusteeName"; + SID_IDENTIFIER_AUTHORITY auth = { {0x11,0x22,0,0,0, 0} }; memset( &ZeroGuid, 0x00, sizeof (ZeroGuid) ); - SID_IDENTIFIER_AUTHORITY auth = { {0x11,0x22,0,0,0, 0} }; - pBuildTrusteeWithSidA = (fnBuildTrusteeWithSidA) GetProcAddress( hmod, "BuildTrusteeWithSidA" ); pBuildTrusteeWithNameA = (fnBuildTrusteeWithNameA)

1 0

Thomas Weidenmueller : advapi32: Fixed building TRUSTEEs with objects.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: ae8b835d8517c5b7b28fd0b1204fd181f7f74019 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ae8b835d8517c5b7b28fd0b… Author: Thomas Weidenmueller <wine-patches(a)reactsoft.com> Date: Sun Mar 26 13:39:58 2006 +0200 advapi32: Fixed building TRUSTEEs with objects. Fill the TRUSTEE structure properly in BuildTrusteeWithObjectsAndName and BuildTrusteeWithObjectsAndSid, including regression tests. --- dlls/advapi32/security.c | 104 +++++++++++++++++++++++++++++- dlls/advapi32/tests/security.c | 137 ++++++++++++++++++++++++++++++++++++++-- include/winnt.h | 3 + 3 files changed, 234 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ae8b835d8517c5b7b28…

1 0

Thomas Weidenmueller : comctl32: Rebar size fix.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: 870d37ff607ec640efd49bf22e2453d9b6f443db URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=870d37ff607ec640efd49bf… Author: Thomas Weidenmueller <wine-patches(a)reactsoft.com> Date: Sun Mar 26 13:30:03 2006 +0200 comctl32: Rebar size fix. Rebars without any bands should have a height/width of 0. --- dlls/comctl32/rebar.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 81633d6..1eb76e1 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1920,7 +1920,7 @@ REBAR_Layout (REBAR_INFO *infoPtr, LPREC y = clientcy; } if (infoPtr->dwStyle & CCS_VERT) { - if( x < REBAR_MINSIZE ) + if( infoPtr->uNumBands != 0 && x < REBAR_MINSIZE ) x = REBAR_MINSIZE; infoPtr->calcSize.cx = x; infoPtr->calcSize.cy = clientcy; @@ -1929,7 +1929,7 @@ REBAR_Layout (REBAR_INFO *infoPtr, LPREC if (notify && (x != origheight)) infoPtr->fStatus |= NTF_HGHTCHG; } else { - if( y < REBAR_MINSIZE ) + if( infoPtr->uNumBands != 0 && y < REBAR_MINSIZE ) y = REBAR_MINSIZE; infoPtr->calcSize.cx = clientcx; infoPtr->calcSize.cy = y;

1 0

Vitaly Lipatov : wineshelllink: Remove quotes from Path=<workdir>.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: 5072fd440ae2a6c22a3e96eeb2ee212724d87893 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5072fd440ae2a6c22a3e96e… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sun Mar 26 19:06:54 2006 +0400 wineshelllink: Remove quotes from Path=<workdir>. --- tools/wineshelllink | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wineshelllink b/tools/wineshelllink index 10fa80b..1a80ca7 100755 --- a/tools/wineshelllink +++ b/tools/wineshelllink @@ -107,7 +107,7 @@ Exec=wine "$path" $args Type=Application Comment=$descr EOF - [ -z "$workdir" ] || echo "Path=\"$workdir\"" + [ -z "$workdir" ] || echo "Path=$workdir" [ -z "$xpmicon" ] || echo "Icon=$xpmicon" }

1 0

Jonathan Ernst : wine.inf: Add some more fake dlls to the system directory.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: 1e408c954c451e5b43beaa33bac26e47e6aa9593 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1e408c954c451e5b43beaa3… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Tue Mar 28 11:36:30 2006 +0200 wine.inf: Add some more fake dlls to the system directory. --- tools/wine.inf | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 7177761..c6b1e4c 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2115,6 +2115,7 @@ HKLM,%CurrentVersion%\Telephony\Country 11,,comdlg32.dll 11,,control.exe 11,,crypt32.dll +11,,ddraw.dll 11,,gdi32.dll 11,,help.exe,winhelp.exe 11,,kernel32.dll @@ -2122,6 +2123,7 @@ HKLM,%CurrentVersion%\Telephony\Country 11,,msvcrt.dll 11,,notepad.exe 11,,ntdll.dll +11,,opengl32.dll 11,,progman.exe 11,,regsvr32.exe 11,,rpcrt4.dll

1 0

Mike McCormack : mpr: Improve the stub for WNetGetUniversalNameW.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: fbab61c4053314388f9d87fd5b0c6f56213106a6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fbab61c4053314388f9d87f… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Mar 28 14:42:33 2006 +0900 mpr: Improve the stub for WNetGetUniversalNameW. --- dlls/mpr/wnet.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index a0f0bd3..0f148e2 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1711,11 +1711,36 @@ DWORD WINAPI WNetGetUniversalNameA ( LPC DWORD WINAPI WNetGetUniversalNameW ( LPCWSTR lpLocalPath, DWORD dwInfoLevel, LPVOID lpBuffer, LPDWORD lpBufferSize ) { + LPUNIVERSAL_NAME_INFOW uniw; + DWORD err, len; + FIXME( "(%s, 0x%08lX, %p, %p): stub\n", debugstr_w(lpLocalPath), dwInfoLevel, lpBuffer, lpBufferSize); - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + switch (dwInfoLevel) + { + case UNIVERSAL_NAME_INFO_LEVEL: + err = WN_MORE_DATA; + len = sizeof (*uniw) + lstrlenW(lpLocalPath); + if (*lpBufferSize <= len) + break; + uniw = lpBuffer; + uniw->lpUniversalName = (LPWSTR) &uniw[1]; + lstrcpyW(uniw->lpUniversalName, lpLocalPath); + *lpBufferSize = len; + err = WN_NO_ERROR; + break; + + case REMOTE_NAME_INFO_LEVEL: + err = WN_NO_NETWORK; + break; + + default: + err = WN_BAD_VALUE; + } + + SetLastError(err); + return err; }

1 0

Mike McCormack : server: Fix a race condition in the delivery of change notifications.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: f5c1381e065bfab1903eebd7596f670b82c28509 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f5c1381e065bfab1903eebd… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Mar 28 17:58:07 2006 +0900 server: Fix a race condition in the delivery of change notifications. --- server/change.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/change.c b/server/change.c index 4349d7e..eec1241 100644 --- a/server/change.c +++ b/server/change.c @@ -591,11 +591,6 @@ static void inotify_do_change_notify( st if (!list_empty( &dir->change_q )) async_terminate_head( &dir->change_q, STATUS_ALERTED ); - else - { - dir->signaled++; - dir_signal_changed( dir ); - } } static unsigned int filter_from_event( struct inotify_event *ie ) @@ -1133,6 +1128,11 @@ DECL_HANDLER(read_directory_changes) if (event) reset_event( event ); + /* if there's already a change in the queue, send it */ + if (!list_empty( &dir->change_q ) && + !list_empty( &dir->change_records )) + async_terminate_head( &dir->change_q, STATUS_ALERTED ); + /* setup the real notification */ if (!inotify_adjust_changes( dir )) dnotify_adjust_changes( dir );

1 0

Alexandre Julliard : x11drv: Avoid setting text or WM hints of the X root window.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: c44410d1e358b9690cdabd9e55f076ffc926d180 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c44410d1e358b9690cdabd9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 28 12:21:37 2006 +0200 x11drv: Avoid setting text or WM hints of the X root window. --- dlls/x11drv/window.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/x11drv/window.c b/dlls/x11drv/window.c index ccb5d4a..67be435 100644 --- a/dlls/x11drv/window.c +++ b/dlls/x11drv/window.c @@ -122,7 +122,10 @@ BOOL X11DRV_is_window_rect_mapped( const static int get_window_attributes( Display *display, struct x11drv_win_data *data, XSetWindowAttributes *attr ) { - if (!data->managed && (root_window == DefaultRootWindow( display )) && is_window_managed( data->hwnd )) + if (!data->managed && + root_window == DefaultRootWindow( display ) && + data->whole_window != root_window && + is_window_managed( data->hwnd )) { data->managed = TRUE; SetPropA( data->hwnd, managed_prop, (HANDLE)1 ); @@ -378,6 +381,7 @@ void X11DRV_set_wm_hints( Display *displ if (data->hwnd == GetDesktopWindow()) { + if (data->whole_window == DefaultRootWindow(display)) return; /* force some styles for the desktop to get the correct decorations */ style |= WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX; owner = 0; @@ -508,7 +512,7 @@ void X11DRV_set_iconic_state( HWND hwnd BOOL iconic = (style & WS_MINIMIZE) != 0; if (!(data = X11DRV_get_win_data( hwnd ))) return; - if (!data->whole_window) return; + if (!data->whole_window || data->whole_window == DefaultRootWindow(display)) return; GetWindowRect( hwnd, &rect ); @@ -754,7 +758,7 @@ void X11DRV_SetWindowText( HWND hwnd, LP Window win; XTextProperty prop; - if ((win = X11DRV_get_whole_window( hwnd ))) + if ((win = X11DRV_get_whole_window( hwnd )) && win != DefaultRootWindow(display)) { /* allocate new buffer for window text */ count = WideCharToMultiByte(CP_UNIXCP, 0, text, -1, NULL, 0, NULL, NULL);

1 0

Alexandre Julliard : winemp3: Renamed the dlls/msacm/ winemp3 directory to dlls/winemp3.acm.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: 25d134071f4e1c8ea78486b4e562a813c55519c3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=25d134071f4e1c8ea78486b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 27 23:19:50 2006 +0200 winemp3: Renamed the dlls/msacm/winemp3 directory to dlls/winemp3.acm. --- configure | 4 configure.ac | 2 dlls/Makefile.in | 8 dlls/msacm/winemp3/.gitignore | 1 dlls/msacm/winemp3/Makefile.in | 21 dlls/msacm/winemp3/common.c | 259 ---- dlls/msacm/winemp3/dct64_i386.c | 329 ------ dlls/msacm/winemp3/decode_i386.c | 166 --- dlls/msacm/winemp3/huffman.h | 346 ------ dlls/msacm/winemp3/interface.c | 244 ---- dlls/msacm/winemp3/l2tables.h | 175 --- dlls/msacm/winemp3/layer1.c | 159 --- dlls/msacm/winemp3/layer2.c | 300 ----- dlls/msacm/winemp3/layer3.c | 2023 ----------------------------------- dlls/msacm/winemp3/mpegl3.c | 628 ----------- dlls/msacm/winemp3/mpg123.h | 209 ---- dlls/msacm/winemp3/mpglib.h | 69 - dlls/msacm/winemp3/tabinit.c | 95 -- dlls/msacm/winemp3/winemp3.acm.spec | 1 dlls/winemp3.acm/.gitignore | 1 dlls/winemp3.acm/Makefile.in | 21 dlls/winemp3.acm/common.c | 259 ++++ dlls/winemp3.acm/dct64_i386.c | 329 ++++++ dlls/winemp3.acm/decode_i386.c | 166 +++ dlls/winemp3.acm/huffman.h | 346 ++++++ dlls/winemp3.acm/interface.c | 244 ++++ dlls/winemp3.acm/l2tables.h | 175 +++ dlls/winemp3.acm/layer1.c | 159 +++ dlls/winemp3.acm/layer2.c | 300 +++++ dlls/winemp3.acm/layer3.c | 2023 +++++++++++++++++++++++++++++++++++ dlls/winemp3.acm/mpegl3.c | 628 +++++++++++ dlls/winemp3.acm/mpg123.h | 209 ++++ dlls/winemp3.acm/mpglib.h | 69 + dlls/winemp3.acm/tabinit.c | 95 ++ dlls/winemp3.acm/winemp3.acm.spec | 1 35 files changed, 5030 insertions(+), 5034 deletions(-) delete mode 100644 dlls/msacm/winemp3/.gitignore delete mode 100644 dlls/msacm/winemp3/Makefile.in delete mode 100644 dlls/msacm/winemp3/common.c delete mode 100644 dlls/msacm/winemp3/dct64_i386.c delete mode 100644 dlls/msacm/winemp3/decode_i386.c delete mode 100644 dlls/msacm/winemp3/huffman.h delete mode 100644 dlls/msacm/winemp3/interface.c delete mode 100644 dlls/msacm/winemp3/l2tables.h delete mode 100644 dlls/msacm/winemp3/layer1.c delete mode 100644 dlls/msacm/winemp3/layer2.c delete mode 100644 dlls/msacm/winemp3/layer3.c delete mode 100644 dlls/msacm/winemp3/mpegl3.c delete mode 100644 dlls/msacm/winemp3/mpg123.h delete mode 100644 dlls/msacm/winemp3/mpglib.h delete mode 100644 dlls/msacm/winemp3/tabinit.c delete mode 100644 dlls/msacm/winemp3/winemp3.acm.spec create mode 100644 dlls/winemp3.acm/.gitignore create mode 100644 dlls/winemp3.acm/Makefile.in create mode 100644 dlls/winemp3.acm/common.c create mode 100644 dlls/winemp3.acm/dct64_i386.c create mode 100644 dlls/winemp3.acm/decode_i386.c create mode 100644 dlls/winemp3.acm/huffman.h create mode 100644 dlls/winemp3.acm/interface.c create mode 100644 dlls/winemp3.acm/l2tables.h create mode 100644 dlls/winemp3.acm/layer1.c create mode 100644 dlls/winemp3.acm/layer2.c create mode 100644 dlls/winemp3.acm/layer3.c create mode 100644 dlls/winemp3.acm/mpegl3.c create mode 100644 dlls/winemp3.acm/mpg123.h create mode 100644 dlls/winemp3.acm/mpglib.h create mode 100644 dlls/winemp3.acm/tabinit.c create mode 100644 dlls/winemp3.acm/winemp3.acm.spec Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=25d134071f4e1c8ea78…

1 0

Alexandre Julliard : msg711: Renamed the dlls/msacm/ msg711 directory to dlls/msg711.acm.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: 66a5c739c8884f3161338dc4f5ff2da0dbc6a27a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=66a5c739c8884f3161338dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 27 23:18:48 2006 +0200 msg711: Renamed the dlls/msacm/msg711 directory to dlls/msg711.acm. --- configure | 4 configure.ac | 2 dlls/Makefile.in | 8 dlls/msacm/msg711/.gitignore | 1 dlls/msacm/msg711/Makefile.in | 12 dlls/msacm/msg711/msg711.acm.spec | 1 dlls/msacm/msg711/msg711.c | 1164 ------------------------------------- dlls/msg711.acm/.gitignore | 1 dlls/msg711.acm/Makefile.in | 12 dlls/msg711.acm/msg711.acm.spec | 1 dlls/msg711.acm/msg711.c | 1164 +++++++++++++++++++++++++++++++++++++ 11 files changed, 1183 insertions(+), 1187 deletions(-) delete mode 100644 dlls/msacm/msg711/.gitignore delete mode 100644 dlls/msacm/msg711/Makefile.in delete mode 100644 dlls/msacm/msg711/msg711.acm.spec delete mode 100644 dlls/msacm/msg711/msg711.c create mode 100644 dlls/msg711.acm/.gitignore create mode 100644 dlls/msg711.acm/Makefile.in create mode 100644 dlls/msg711.acm/msg711.acm.spec create mode 100644 dlls/msg711.acm/msg711.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=66a5c739c8884f31613…

1 0

Alexandre Julliard : msadp32: Renamed the dlls/msacm/ msadp32 directory to dlls/msadp32.acm.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: 3fa4fc51aaec04b9eb3fe388748631a77e000896 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3fa4fc51aaec04b9eb3fe38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 27 23:18:08 2006 +0200 msadp32: Renamed the dlls/msacm/msadp32 directory to dlls/msadp32.acm. --- configure | 4 configure.ac | 2 dlls/Makefile.in | 8 dlls/msacm/msadp32/.gitignore | 1 dlls/msacm/msadp32/Makefile.in | 12 - dlls/msacm/msadp32/msadp32.acm.spec | 1 dlls/msacm/msadp32/msadp32.c | 780 ----------------------------------- dlls/msadp32.acm/.gitignore | 1 dlls/msadp32.acm/Makefile.in | 12 + dlls/msadp32.acm/msadp32.acm.spec | 1 dlls/msadp32.acm/msadp32.c | 780 +++++++++++++++++++++++++++++++++++ 11 files changed, 799 insertions(+), 803 deletions(-) delete mode 100644 dlls/msacm/msadp32/.gitignore delete mode 100644 dlls/msacm/msadp32/Makefile.in delete mode 100644 dlls/msacm/msadp32/msadp32.acm.spec delete mode 100644 dlls/msacm/msadp32/msadp32.c create mode 100644 dlls/msadp32.acm/.gitignore create mode 100644 dlls/msadp32.acm/Makefile.in create mode 100644 dlls/msadp32.acm/msadp32.acm.spec create mode 100644 dlls/msadp32.acm/msadp32.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=3fa4fc51aaec04b9eb3…

1 0

Alexandre Julliard : imaadp32: Renamed the dlls/msacm/ imaadp32 directory to dlls/imaadp32.acm.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: ff0d10983c9ae7c6b225c7b81f2cb56e738cded7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ff0d10983c9ae7c6b225c7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 27 23:17:19 2006 +0200 imaadp32: Renamed the dlls/msacm/imaadp32 directory to dlls/imaadp32.acm. --- configure | 4 configure.ac | 2 dlls/Makefile.in | 8 dlls/imaadp32.acm/.gitignore | 1 dlls/imaadp32.acm/Makefile.in | 12 dlls/imaadp32.acm/imaadp32.acm.spec | 1 dlls/imaadp32.acm/imaadp32.c | 937 +++++++++++++++++++++++++++++++++ dlls/msacm/imaadp32/.gitignore | 1 dlls/msacm/imaadp32/Makefile.in | 12 dlls/msacm/imaadp32/imaadp32.acm.spec | 1 dlls/msacm/imaadp32/imaadp32.c | 937 --------------------------------- 11 files changed, 956 insertions(+), 960 deletions(-) create mode 100644 dlls/imaadp32.acm/.gitignore create mode 100644 dlls/imaadp32.acm/Makefile.in create mode 100644 dlls/imaadp32.acm/imaadp32.acm.spec create mode 100644 dlls/imaadp32.acm/imaadp32.c delete mode 100644 dlls/msacm/imaadp32/.gitignore delete mode 100644 dlls/msacm/imaadp32/Makefile.in delete mode 100644 dlls/msacm/imaadp32/imaadp32.acm.spec delete mode 100644 dlls/msacm/imaadp32/imaadp32.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ff0d10983c9ae7c6b22…

1 0

Alexandre Julliard : x11drv: Moved desktop mode handling to the explorer process.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: db6608ac9f9bbc2ddd7f8bf201d1387d079dfd5f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=db6608ac9f9bbc2ddd7f8bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 27 22:43:03 2006 +0200 x11drv: Moved desktop mode handling to the explorer process. Per-application desktop mode settings are no longer supported. Apps can be launched in a specific desktop window by using: explorer /desktop=name[,widthxheight] app.exe [args] If the named desktop already exists the app is launched inside it. The default desktop is cleverly named "default". --- dlls/x11drv/desktop.c | 123 ++--------------------------- dlls/x11drv/window.c | 60 +++++++++++--- dlls/x11drv/winex11.drv.spec | 3 + dlls/x11drv/x11drv.h | 2 dlls/x11drv/x11drv_main.c | 17 ---- programs/explorer/desktop.c | 144 +++++++++++++++++++++++++++++++--- programs/explorer/explorer.c | 10 -- programs/explorer/explorer_private.h | 2 8 files changed, 190 insertions(+), 171 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=db6608ac9f9bbc2ddd7…

1 0

Alexandre Julliard : x11drv: Allow setting WM hints for the desktop window.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: ba1517fa80458d4cdf4a54e56d8178ac4d2918cf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ba1517fa80458d4cdf4a54e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 27 22:16:04 2006 +0200 x11drv: Allow setting WM hints for the desktop window. --- dlls/x11drv/window.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/x11drv/window.c b/dlls/x11drv/window.c index e8c376d..0c36b01 100644 --- a/dlls/x11drv/window.c +++ b/dlls/x11drv/window.c @@ -301,10 +301,15 @@ static void set_size_hints( Display *dis if ((size_hints = XAllocSizeHints())) { - size_hints->win_gravity = StaticGravity; - size_hints->x = data->whole_rect.left; - size_hints->y = data->whole_rect.top; - size_hints->flags = PWinGravity | PPosition; + size_hints->flags = 0; + + if (data->hwnd != GetDesktopWindow()) /* don't force position of desktop */ + { + size_hints->win_gravity = StaticGravity; + size_hints->x = data->whole_rect.left; + size_hints->y = data->whole_rect.top; + size_hints->flags |= PWinGravity | PPosition; + } if ( !(style & WS_THICKFRAME) ) { @@ -371,6 +376,13 @@ void X11DRV_set_wm_hints( Display *displ HWND owner = GetWindow( data->hwnd, GW_OWNER ); char *process_name = get_process_name(); + if (data->hwnd == GetDesktopWindow()) + { + /* force some styles for the desktop to get the correct decorations */ + style |= WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX; + owner = 0; + } + /* transient for hint */ if (owner) {

1 0

Alexandre Julliard : x11drv: Support SetWindowPos and ShowWindow on the desktop window.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 1625b385c8011ebda63c0790fd9edb14f403d619 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1625b385c8011ebda63c079… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 27 21:45:47 2006 +0200 x11drv: Support SetWindowPos and ShowWindow on the desktop window. --- dlls/x11drv/winpos.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/x11drv/winpos.c b/dlls/x11drv/winpos.c index 96b1004..331d6d4 100644 --- a/dlls/x11drv/winpos.c +++ b/dlls/x11drv/winpos.c @@ -133,7 +133,8 @@ static BOOL SWP_DoWinPosChanging( WINDOW if (!(pWinpos->flags & SWP_NOSENDCHANGING)) SendMessageW( pWinpos->hwnd, WM_WINDOWPOSCHANGING, 0, (LPARAM)pWinpos ); - if (!(wndPtr = WIN_GetPtr( pWinpos->hwnd )) || wndPtr == WND_OTHER_PROCESS) return FALSE; + if (!(wndPtr = WIN_GetPtr( pWinpos->hwnd )) || + wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) return FALSE; /* Calculate new position and size */ @@ -695,9 +696,6 @@ BOOL X11DRV_SetWindowPos( WINDOWPOS *win orig_flags = winpos->flags; winpos->flags &= ~SWP_WINE_NOHOSTMOVE; - /* Check window handle */ - if (winpos->hwnd == GetDesktopWindow()) return FALSE; - /* First make sure that coordinates are valid for WM_WINDOWPOSCHANGING */ if (!(winpos->flags & SWP_NOMOVE)) { @@ -936,6 +934,7 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT BOOL X11DRV_ShowWindow( HWND hwnd, INT cmd ) { WND *wndPtr; + HWND parent; LONG style = GetWindowLongW( hwnd, GWL_STYLE ); BOOL wasVisible = (style & WS_VISIBLE) != 0; BOOL showFlag = TRUE; @@ -1004,7 +1003,8 @@ BOOL X11DRV_ShowWindow( HWND hwnd, INT c if (!IsWindow( hwnd )) return wasVisible; } - if (!IsWindowVisible( GetAncestor( hwnd, GA_PARENT ))) + parent = GetAncestor( hwnd, GA_PARENT ); + if (parent && !IsWindowVisible( parent )) { /* if parent is not visible simply toggle WS_VISIBLE and return */ if (showFlag) WIN_SetStyle( hwnd, WS_VISIBLE, 0 );

1 0

Jacek Caban : mshtml: Added tooltip implementation.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 5f009f2540759d767f4fa696d855edfd21bc3dcd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5f009f2540759d767f4fa69… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 27 21:02:28 2006 +0200 mshtml: Added tooltip implementation. --- dlls/mshtml/htmldoc.c | 4 + dlls/mshtml/mshtml_private.h | 23 ++++-- dlls/mshtml/nsembed.c | 172 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/nsiface.idl | 51 ++++++++++++ dlls/mshtml/nsservice.c | 114 ++++++++++++++++++++++++++++ dlls/mshtml/view.c | 83 ++++++++++++++++++++ 6 files changed, 435 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5f009f2540759d767f4…

1 0

Ulrich Czekalla : commdlg: Properly set and retrieve colour value from combo box .
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: a6431c3868f798fcf1d1f75d0e019e2cd5facefd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a6431c3868f798fcf1d1f75… Author: Ulrich Czekalla <ulrich(a)codeweavers.com> Date: Mon Mar 27 11:33:56 2006 -0500 commdlg: Properly set and retrieve colour value from combo box . --- dlls/commdlg/fontdlg.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/commdlg/fontdlg.c b/dlls/commdlg/fontdlg.c index b85bcae..a80e3c1 100644 --- a/dlls/commdlg/fontdlg.c +++ b/dlls/commdlg/fontdlg.c @@ -632,9 +632,9 @@ LRESULT CFn_WMInitDialog(HWND hDlg, WPAR memcpy(name, strColorName, sizeof(strColorName)); } j=SendDlgItemMessageW(hDlg, cmb4, CB_ADDSTRING, 0, (LPARAM)name); - SendDlgItemMessageW(hDlg, cmb4, CB_SETITEMDATA, j, textcolors[j]); + SendDlgItemMessageW(hDlg, cmb4, CB_SETITEMDATA, j, textcolors[i]); /* look for a fitting value in color combobox */ - if (textcolors[j]==lpcf->rgbColors) + if (textcolors[i]==lpcf->rgbColors) SendDlgItemMessageW(hDlg,cmb4, CB_SETCURSEL,j,0); } } @@ -994,7 +994,7 @@ LRESULT CFn_WMCommand(HWND hDlg, WPARAM { WINDOWINFO wininfo; - lpcf->rgbColors=textcolors[i]; + lpcf->rgbColors = SendDlgItemMessageW(hDlg, cmb4, CB_GETITEMDATA, i, 0); wininfo.cbSize=sizeof(wininfo); if( GetWindowInfo( GetDlgItem( hDlg, stc5), &wininfo ) )

1 0

Robert Shearman : shell32: Adding a systray item with an invalid icon handle is allowed.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: e8fe7004c7385f1df3335401300691926c6e0d80 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e8fe7004c7385f1df333540… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Mar 27 16:55:37 2006 +0100 shell32: Adding a systray item with an invalid icon handle is allowed. --- dlls/shell32/systray.c | 12 +++++++++--- programs/explorer/systray.c | 8 +------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c index a99912f..32213cb 100644 --- a/dlls/shell32/systray.c +++ b/dlls/shell32/systray.c @@ -99,21 +99,26 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMe LONG cbColourBits; if (!GetIconInfo(nid->hIcon, &iconinfo)) - return FALSE; + goto noicon; if (!GetObjectW(iconinfo.hbmMask, sizeof(bmMask), &bmMask) || !GetObjectW(iconinfo.hbmColor, sizeof(bmColour), &bmColour)) { DeleteObject(iconinfo.hbmMask); DeleteObject(iconinfo.hbmColor); - return FALSE; + goto noicon; } cbMaskBits = (bmMask.bmPlanes * bmMask.bmWidth * bmMask.bmHeight * bmMask.bmBitsPixel) / 8; cbColourBits = (bmColour.bmPlanes * bmColour.bmWidth * bmColour.bmHeight * bmColour.bmBitsPixel) / 8; cds.cbData = sizeof(*nid) + 2*sizeof(BITMAP) + cbMaskBits + cbColourBits; buffer = HeapAlloc(GetProcessHeap(), 0, cds.cbData); - if (!buffer) return FALSE; + if (!buffer) + { + DeleteObject(iconinfo.hbmMask); + DeleteObject(iconinfo.hbmColor); + return FALSE; + } cds.lpData = buffer; memcpy(buffer, nid, sizeof(*nid)); @@ -132,6 +137,7 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMe } else { +noicon: cds.cbData = sizeof(*nid); cds.lpData = nid; } diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index adf8460..00036ff 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -259,7 +259,7 @@ static void handle_incoming(HWND hwndSou /* FIXME: if statement only needed because we don't support interprocess * icon handles */ - if (nid.uFlags & NIF_ICON) + if ((nid.uFlags & NIF_ICON) && (cds->cbData >= sizeof(nid) + 2 * sizeof(BITMAP))) { LONG cbMaskBits; LONG cbColourBits; @@ -269,12 +269,6 @@ static void handle_incoming(HWND hwndSou buffer += sizeof(nid); - if (cds->cbData < sizeof(nid) + 2 * sizeof(BITMAP)) - { - WINE_ERR("buffer underflow\n"); - return; - } - memcpy(&bmMask, buffer, sizeof(bmMask)); buffer += sizeof(bmMask); memcpy(&bmColour, buffer, sizeof(bmColour));

1 0

Huw Davies : riched20: Take a ref on text host.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: d6ce9db80fa044b424046e2f3ed09d6fff88a025 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d6ce9db80fa044b424046e2… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 27 14:10:37 2006 +0100 riched20: Take a ref on text host. --- dlls/riched20/txtsrv.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 6bb0b9d..65dc54d 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -79,6 +79,7 @@ HRESULT WINAPI CreateTextServices(IUnkno return E_OUTOFMEMORY; InitializeCriticalSection(&ITextImpl->csTxtSrv); ITextImpl->ref = 1; + ITextHost_AddRef(pITextHost); ITextImpl->pMyHost = pITextHost; ITextImpl->lpVtbl = &textservices_Vtbl;

1 0

Mike McCormack : user32: Send a fake mouse movement event after releasing capture.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 4ce100aa64ed7d95c32250aef42c02c1d053f9a0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4ce100aa64ed7d95c32250a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Mar 27 21:23:17 2006 +0900 user32: Send a fake mouse movement event after releasing capture. --- dlls/user/input.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/user/input.c b/dlls/user/input.c index 63f7ca6..a4312d5 100644 --- a/dlls/user/input.c +++ b/dlls/user/input.c @@ -195,6 +195,10 @@ BOOL WINAPI ReleaseCapture(void) SERVER_END_REQ; if (previous) SendMessageW( previous, WM_CAPTURECHANGED, 0, 0 ); + + /* Somebody may have missed some mouse movements */ + mouse_event( MOUSEEVENTF_MOVE, 0, 0, 0, 0 ); + return ret; }

1 0

Alexandre Julliard : ntdll: Limit header_size to the file size.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 18d7980fd8557199d2162ab14c963b9b51f3cb5b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=18d7980fd8557199d2162ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 27 21:29:46 2006 +0200 ntdll: Limit header_size to the file size. --- dlls/ntdll/virtual.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d17c58d..17f9081 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -868,7 +868,8 @@ static NTSTATUS map_image( HANDLE hmappi goto error; } status = STATUS_INVALID_IMAGE_FORMAT; /* generic error */ - if (header_size > st.st_size) goto error; + if (!st.st_size) goto error; + header_size = min( header_size, st.st_size ); if (map_file_into_view( view, fd, 0, header_size, 0, VPROT_COMMITTED | VPROT_READ, removable ) != STATUS_SUCCESS) goto error; dos = (IMAGE_DOS_HEADER *)ptr;

1 0

Alexandre Julliard : x11drv: Get rid of the using_wine_desktop flag.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 6bb18e24e9e3c17e514cc899a59d7237676ccedb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6bb18e24e9e3c17e514cc89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 27 15:33:43 2006 +0200 x11drv: Get rid of the using_wine_desktop flag. --- dlls/x11drv/window.c | 9 +++++---- dlls/x11drv/x11drv.h | 1 - dlls/x11drv/x11drv_main.c | 2 -- dlls/x11drv/xrandr.c | 2 +- dlls/x11drv/xvidmode.c | 8 ++++---- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/x11drv/window.c b/dlls/x11drv/window.c index 5cac2ed..e8c376d 100644 --- a/dlls/x11drv/window.c +++ b/dlls/x11drv/window.c @@ -119,9 +119,10 @@ BOOL X11DRV_is_window_rect_mapped( const * * Fill the window attributes structure for an X window. */ -static int get_window_attributes( struct x11drv_win_data *data, XSetWindowAttributes *attr ) +static int get_window_attributes( Display *display, struct x11drv_win_data *data, + XSetWindowAttributes *attr ) { - if (!data->managed && !using_wine_desktop && is_window_managed( data->hwnd )) + if (!data->managed && (root_window == DefaultRootWindow( display )) && is_window_managed( data->hwnd )) { data->managed = TRUE; SetPropA( data->hwnd, managed_prop, (HANDLE)1 ); @@ -142,7 +143,7 @@ static int get_window_attributes( struct void X11DRV_sync_window_style( Display *display, struct x11drv_win_data *data ) { XSetWindowAttributes attr; - int mask = get_window_attributes( data, &attr ); + int mask = get_window_attributes( display, data, &attr ); wine_tsx11_lock(); if (data->whole_window != DefaultRootWindow(display)) @@ -654,7 +655,7 @@ static Window create_whole_window( Displ if (!(cx = rect.right - rect.left)) cx = 1; if (!(cy = rect.bottom - rect.top)) cy = 1; - mask = get_window_attributes( data, &attr ); + mask = get_window_attributes( display, data, &attr ); /* set the attributes that don't change over the lifetime of the window */ attr.bit_gravity = NorthWestGravity; diff --git a/dlls/x11drv/x11drv.h b/dlls/x11drv/x11drv.h index 98c0e93..5976c7e 100644 --- a/dlls/x11drv/x11drv.h +++ b/dlls/x11drv/x11drv.h @@ -262,7 +262,6 @@ extern int client_side_with_render; extern int client_side_antialias_with_core; extern int client_side_antialias_with_render; extern int using_client_side_fonts; -extern int using_wine_desktop; extern void X11DRV_XRender_Init(void); extern void X11DRV_XRender_Finalize(void); extern BOOL X11DRV_XRender_SelectFont(X11DRV_PDEVICE*, HFONT); diff --git a/dlls/x11drv/x11drv_main.c b/dlls/x11drv/x11drv_main.c index 55226d4..757eff7 100644 --- a/dlls/x11drv/x11drv_main.c +++ b/dlls/x11drv/x11drv_main.c @@ -82,7 +82,6 @@ int client_side_with_core = 1; int client_side_with_render = 1; int client_side_antialias_with_core = 1; int client_side_antialias_with_render = 1; -int using_wine_desktop = 0; int copy_default_colors = 128; int alloc_system_colors = 256; DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES; @@ -424,7 +423,6 @@ static BOOL process_attach(void) if (desktop_geometry) { root_window = X11DRV_create_desktop( desktop_vi, desktop_geometry ); - using_wine_desktop = 1; } if(desktop_vi) XFree(desktop_vi); diff --git a/dlls/x11drv/xrandr.c b/dlls/x11drv/xrandr.c index 96b5a7a..fbe4350 100644 --- a/dlls/x11drv/xrandr.c +++ b/dlls/x11drv/xrandr.c @@ -254,7 +254,7 @@ void X11DRV_XRandR_Init(void) if (xrandr_major) return; /* already initialized? */ if (!usexrandr) return; /* disabled in config */ - if (using_wine_desktop) return; /* not compatible with desktop mode */ + if (root_window != DefaultRootWindow( gdi_display )) return; if (!load_xrandr()) return; /* can't load the Xrandr library */ /* see if Xrandr is available */ diff --git a/dlls/x11drv/xvidmode.c b/dlls/x11drv/xvidmode.c index 20af410..c32bd59 100644 --- a/dlls/x11drv/xvidmode.c +++ b/dlls/x11drv/xvidmode.c @@ -172,14 +172,14 @@ void X11DRV_XF86VM_Init(void) #endif /* X_XF86VidModeSetGammaRamp */ /* retrieve modes */ - if (!using_wine_desktop) ok = XF86VidModeGetAllModeLines(gdi_display, DefaultScreen(gdi_display), &nmodes, &real_xf86vm_modes); + if (root_window == DefaultRootWindow( gdi_display )) + ok = XF86VidModeGetAllModeLines(gdi_display, DefaultScreen(gdi_display), &nmodes, &real_xf86vm_modes); + else + ok = FALSE; /* In desktop mode, do not switch resolution... But still use the Gamma ramp stuff */ } wine_tsx11_unlock(); if (!ok) return; - /* In desktop mode, do not switch resolution... But still use the Gamma ramp stuff */ - if (using_wine_desktop) return; - TRACE("XVidMode modes: count=%d\n", nmodes); real_xf86vm_mode_count = nmodes;

1 0

Alexandre Julliard : server: Connect to the window station and desktop specified by startup info.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 90af5a0d178991dc1ed79899d9b764a6352133f6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=90af5a0d178991dc1ed7989… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 27 12:57:17 2006 +0200 server: Connect to the window station and desktop specified by startup info. If window station and desktop aren't inherited from the parent, don't connect to them from the server, but from the USER init code where we can get the proper values from the startup info structure. --- dlls/user/user_main.c | 47 ++++++++++++++++++++++ server/process.c | 6 +-- server/user.h | 5 +- server/window.c | 1 server/winstation.c | 106 +++++++++++++++++++++++++++---------------------- 5 files changed, 111 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=90af5a0d178991dc1ed…

1 0

Alexandre Julliard : server: Store window properties in the global atom table instead of
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 641e9e382f8b8ae04296eb94673066e5e5566170 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=641e9e382f8b8ae04296eb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 27 12:50:26 2006 +0200 server: Store window properties in the global atom table instead of the per-winstation table. --- server/window.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/server/window.c b/server/window.c index 6b876af..24db2c9 100644 --- a/server/window.c +++ b/server/window.c @@ -226,7 +226,7 @@ static void set_property( struct window } /* need to add an entry */ - if (!grab_global_atom( win->desktop->winstation, atom )) return; + if (!grab_global_atom( NULL, atom )) return; if (free == -1) { /* no free entry */ @@ -237,7 +237,7 @@ static void set_property( struct window sizeof(*new_props) * (win->prop_alloc + 16) ))) { set_error( STATUS_NO_MEMORY ); - release_global_atom( win->desktop->winstation, atom ); + release_global_atom( NULL, atom ); return; } win->prop_alloc += 16; @@ -260,7 +260,7 @@ static obj_handle_t remove_property( str if (win->properties[i].type == PROP_TYPE_FREE) continue; if (win->properties[i].atom == atom) { - release_global_atom( win->desktop->winstation, atom ); + release_global_atom( NULL, atom ); win->properties[i].type = PROP_TYPE_FREE; return win->properties[i].handle; } @@ -292,7 +292,7 @@ inline static void destroy_properties( s for (i = 0; i < win->prop_inuse; i++) { if (win->properties[i].type == PROP_TYPE_FREE) continue; - release_global_atom( win->desktop->winstation, win->properties[i].atom ); + release_global_atom( NULL, win->properties[i].atom ); } free( win->properties ); } @@ -1966,12 +1966,11 @@ DECL_HANDLER(set_window_property) if (get_req_data_size()) { - atom_t atom = add_global_atom( win->desktop->winstation, - get_req_data(), get_req_data_size() / sizeof(WCHAR) ); + atom_t atom = add_global_atom( NULL, get_req_data(), get_req_data_size() / sizeof(WCHAR) ); if (atom) { set_property( win, atom, req->handle, PROP_TYPE_STRING ); - release_global_atom( win->desktop->winstation, atom ); + release_global_atom( NULL, atom ); } } else set_property( win, req->atom, req->handle, PROP_TYPE_ATOM ); @@ -1986,7 +1985,7 @@ DECL_HANDLER(remove_window_property) if (win) { atom_t atom = req->atom; - if (get_req_data_size()) atom = find_global_atom( win->desktop->winstation, get_req_data(), + if (get_req_data_size()) atom = find_global_atom( NULL, get_req_data(), get_req_data_size() / sizeof(WCHAR) ); if (atom) reply->handle = remove_property( win, atom ); } @@ -2001,7 +2000,7 @@ DECL_HANDLER(get_window_property) if (win) { atom_t atom = req->atom; - if (get_req_data_size()) atom = find_global_atom( win->desktop->winstation, get_req_data(), + if (get_req_data_size()) atom = find_global_atom( NULL, get_req_data(), get_req_data_size() / sizeof(WCHAR) ); if (atom) reply->handle = get_property( win, atom ); }

1 0

Louis. Lenders : shell32: Add an uncompressed AVI displaying the word searching.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 5094cfa6eb2f8f9d17cbca0e9ed06884212e8998 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5094cfa6eb2f8f9d17cbca0… Author: Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sat Mar 25 11:21:55 2006 +0000 shell32: Add an uncompressed AVI displaying the word searching. --- dlls/shell32/.gitignore | 1 dlls/shell32/Makefile.in | 1 dlls/shell32/shres.rc | 1285 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shresdef.h | 2 4 files changed, 1289 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5094cfa6eb2f8f9d17c…

1 0

James Hawkins : advpack: Implement the launching of executables in RunSetupCommand.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 480b64950b9c9212a10d62dcec5c8a733fef6171 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=480b64950b9c9212a10d62d… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 26 22:05:58 2006 -0600 advpack: Implement the launching of executables in RunSetupCommand. --- dlls/advpack/install.c | 42 +++++++++++++++++++++++++++++++++++++++--- dlls/advpack/tests/install.c | 16 +++++----------- 2 files changed, 44 insertions(+), 14 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index ecf8a18..c6bc6c5 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -156,6 +156,39 @@ HRESULT WINAPI LaunchINFSectionExA( HWND return E_FAIL; } +static HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE) +{ + STARTUPINFOW si; + PROCESS_INFORMATION pi; + + if (phEXE) *phEXE = NULL; + + ZeroMemory(&pi, sizeof(pi)); + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); + + if (!CreateProcessW(NULL, (LPWSTR)cmd, NULL, NULL, FALSE, + CREATE_DEFAULT_ERROR_MODE | CREATE_NEW_PROCESS_GROUP, + NULL, dir, &si, &pi)) + { + return HRESULT_FROM_WIN32(GetLastError()); + } + + CloseHandle(pi.hThread); + + if (phEXE) + { + *phEXE = pi.hProcess; + return S_ASYNCHRONOUS; + } + + /* wait for the child process to finish */ + WaitForSingleObject(pi.hProcess, INFINITE); + CloseHandle(pi.hProcess); + + return S_OK; +} + /*********************************************************************** * RunSetupCommandA (ADVPACK.@) * @@ -220,23 +253,26 @@ HRESULT WINAPI RunSetupCommandA(HWND hWn * HRESULT_FROM_WIN32(GetLastError()) Some other error * * BUGS - * Unimplemented + * INF install unimplemented. */ HRESULT WINAPI RunSetupCommandW(HWND hWnd, LPCWSTR szCmdName, LPCWSTR szInfSection, LPCWSTR szDir, LPCWSTR lpszTitle, HANDLE *phEXE, DWORD dwFlags, LPVOID pvReserved ) { - FIXME("(%p, %s, %s, %s, %s, %p, 0x%08lx, %p): stub\n", + TRACE("(%p, %s, %s, %s, %s, %p, 0x%08lx, %p)\n", hWnd, debugstr_w(szCmdName), debugstr_w(szInfSection), debugstr_w(szDir), debugstr_w(lpszTitle), phEXE, dwFlags, pvReserved); + if (dwFlags) + FIXME("Unhandled flags: 0x%08lx\n", dwFlags); + if (!szCmdName || !szDir) return E_INVALIDARG; if (!(dwFlags & RSC_FLAG_INF)) - *phEXE = NULL; + return launch_exe(szCmdName, szDir, phEXE); return E_UNEXPECTED; } diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index 4810868..26f0fa4 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -56,22 +56,16 @@ static void test_RunSetupCommand() /* try to run a non-existent exe */ hexe = (HANDLE)0xdeadbeef; hr = pRunSetupCommand(NULL, "idontexist.exe", "Install", "c:\\windows\\system32", "Title", &hexe, 0, NULL); - todo_wine - { - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), - "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %ld\n", hr); - } + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), + "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %ld\n", hr); ok(hexe == NULL, "Expcted hexe to be NULL\n"); ok(!TerminateProcess(hexe, 0), "Expected TerminateProcess to fail\n"); /* try a bad directory */ hexe = (HANDLE)0xdeadbeef; - hr = pRunSetupCommand(NULL, "winve.exe", "Install", "", "Title", &hexe, 0, NULL); - todo_wine - { - ok(hr == HRESULT_FROM_WIN32(ERROR_DIRECTORY), - "Expected HRESULT_FROM_WIN32(ERROR_DIRECTORY), got %ld\n", hr); - } + hr = pRunSetupCommand(NULL, "winver.exe", "Install", "non\\existent\\directory", "Title", &hexe, 0, NULL); + ok(hr == HRESULT_FROM_WIN32(ERROR_DIRECTORY), + "Expected HRESULT_FROM_WIN32(ERROR_DIRECTORY), got %ld\n", hr); ok(hexe == NULL, "Expcted hexe to be NULL\n"); ok(!TerminateProcess(hexe, 0), "Expected TerminateProcess to fail\n");

1 0

James Hawkins : advpack: Define S_ASYNCHRONOUS in advpub.h.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: e4b31800ab84d0ea28bc66363ae70bcf19f7a166 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e4b31800ab84d0ea28bc663… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 26 21:40:26 2006 -0600 advpack: Define S_ASYNCHRONOUS in advpub.h. --- dlls/advpack/tests/install.c | 12 ++++-------- include/advpub.h | 4 ++++ include/urlmon.idl | 2 ++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index 6d0daae..4810868 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -21,7 +21,6 @@ #include <stdio.h> #include <windows.h> #include <advpub.h> -#include <urlmon.h> #include "wine/test.h" /* function pointers */ @@ -67,7 +66,7 @@ static void test_RunSetupCommand() /* try a bad directory */ hexe = (HANDLE)0xdeadbeef; - hr = pRunSetupCommand(NULL, "winver.exe", "Install", "windows\\system32", "Title", &hexe, 0, NULL); + hr = pRunSetupCommand(NULL, "winve.exe", "Install", "", "Title", &hexe, 0, NULL); todo_wine { ok(hr == HRESULT_FROM_WIN32(ERROR_DIRECTORY), @@ -89,12 +88,9 @@ static void test_RunSetupCommand() /* run winver.exe */ hexe = (HANDLE)0xdeadbeef; hr = pRunSetupCommand(NULL, "winver.exe", "Install", "c:\\windows\\system32", "Title", &hexe, 0, NULL); - todo_wine - { - ok(hr == S_ASYNCHRONOUS, "Expected S_ASYNCHRONOUS, got %ld\n", hr); - ok(hexe != NULL, "Expected hexe to be non-NULL\n"); - ok(TerminateProcess(hexe, 0), "Expected TerminateProcess to succeed\n"); - } + ok(hr == S_ASYNCHRONOUS, "Expected S_ASYNCHRONOUS, got %ld\n", hr); + ok(hexe != NULL, "Expected hexe to be non-NULL\n"); + ok(TerminateProcess(hexe, 0), "Expected TerminateProcess to succeed\n"); } START_TEST(install) diff --git a/include/advpub.h b/include/advpub.h index 442e8e2..6b38ffe 100644 --- a/include/advpub.h +++ b/include/advpub.h @@ -25,6 +25,10 @@ extern "C" { #endif +#ifndef S_ASYNCHRONOUS +#define S_ASYNCHRONOUS _HRESULT_TYPEDEF_(0x401E8L) +#endif + typedef struct _CabInfoA { LPSTR pszCab; diff --git a/include/urlmon.idl b/include/urlmon.idl index 96f665b..37fddf0 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1146,7 +1146,9 @@ cpp_quote("DEFINE_GUID(CLSID_MkProtocol, cpp_quote("#define MK_S_ASYNCHRONOUS 0x000401E8") +cpp_quote("#ifndef S_ASYNCHRONOUS") cpp_quote("#define S_ASYNCHRONOUS MK_S_ASYNCHRONOUS") +cpp_quote("#endif") cpp_quote("#define INET_E_ERROR_FIRST 0x800C0002") cpp_quote("#define INET_E_INVALID_URL 0x800C0002")

1 0

Alexandre Julliard : server: Fixed process exit code on FreeBSD.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 0a3646292a120c8cd67826858df43b27830866ca URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0a3646292a120c8cd678268… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 27 12:14:24 2006 +0200 server: Fixed process exit code on FreeBSD. --- server/process.c | 2 +- server/request.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/server/process.c b/server/process.c index 393a65a..c119ed1 100644 --- a/server/process.c +++ b/server/process.c @@ -660,7 +660,7 @@ void kill_process( struct process *proce { struct thread *thread = LIST_ENTRY( ptr, struct thread, proc_entry ); - thread->exit_code = exit_code; + if (exit_code) thread->exit_code = exit_code; if (thread != skip) kill_thread( thread, 1 ); } } diff --git a/server/request.c b/server/request.c index 7eb1f83..6f0ffb9 100644 --- a/server/request.c +++ b/server/request.c @@ -389,11 +389,14 @@ int receive_fd( struct process *process return 0; } - if (ret >= 0) + if (!ret) + { + kill_process( process, NULL, 0 ); + } + else if (ret > 0) { - if (ret > 0) - fprintf( stderr, "Protocol error: process %p: partial recvmsg %d for fd\n", - process, ret ); + fprintf( stderr, "Protocol error: process %p: partial recvmsg %d for fd\n", + process, ret ); kill_process( process, NULL, 1 ); } else

1 0

Petr Tesarik : winedbg: Fix stepping over an instruction.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 68f8d289459d98a89d93c615be0f02a1f07cbd0d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=68f8d289459d98a89d93c61… Author: Petr Tesarik <hat(a)tesarici.cz> Date: Fri Mar 24 12:46:10 2006 +0100 winedbg: Fix stepping over an instruction. --- programs/winedbg/break.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index cd36fb4..cafb4cd 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -731,9 +731,9 @@ BOOL break_should_continue(ADDRESS* addr if (code == EXCEPTION_BREAKPOINT) addr->Offset += be_cpu->adjust_pc_for_break(&dbg_context, TRUE); + dbg_curr_thread->stopped_xpoint = find_xpoint(addr, be_xpoint_break); dbg_curr_process->bp[0].enabled = FALSE; /* disable the step-over breakpoint */ - dbg_curr_thread->stopped_xpoint = find_xpoint(addr, be_xpoint_break); if (dbg_curr_thread->stopped_xpoint > 0) { if (!should_stop(dbg_curr_thread->stopped_xpoint)) return TRUE; @@ -744,7 +744,8 @@ BOOL break_should_continue(ADDRESS* addr return FALSE; } - dbg_curr_thread->stopped_xpoint = find_xpoint(addr, be_xpoint_watch_exec); + if(dbg_curr_thread->stopped_xpoint < 0) + dbg_curr_thread->stopped_xpoint = find_xpoint(addr, be_xpoint_watch_exec); if (dbg_curr_thread->stopped_xpoint > 0) { /* If not single-stepping, do not back up over the break instruction */ @@ -759,7 +760,8 @@ BOOL break_should_continue(ADDRESS* addr return FALSE; } - dbg_curr_thread->stopped_xpoint = find_triggered_watch(&oldval); + if(dbg_curr_thread->stopped_xpoint < 0) + dbg_curr_thread->stopped_xpoint = find_triggered_watch(&oldval); if (dbg_curr_thread->stopped_xpoint > 0) { /* If not single-stepping, do not back up over the break instruction */

1 0

Petr Tesarik : winedos: Clear TF bit before passing control to a VM86 interrupt handler.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 404eadc7751a4a232dc16d2eedbd17163e4dd654 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=404eadc7751a4a232dc16d2… Author: Petr Tesarik <hat(a)tesarici.cz> Date: Mon Mar 27 10:15:29 2006 +0200 winedos: Clear TF bit before passing control to a VM86 interrupt handler. --- dlls/winedos/dosexe.h | 1 + dlls/winedos/interrupts.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winedos/dosexe.h b/dlls/winedos/dosexe.h index 1aba889..ffb62d8 100644 --- a/dlls/winedos/dosexe.h +++ b/dlls/winedos/dosexe.h @@ -98,6 +98,7 @@ extern struct DPMI_segments *DOSVM_dpmi_ * IF_MASK is only pushed into real mode stack. */ #define V86_FLAG 0x00020000 +#define TF_MASK 0x00000100 #define IF_MASK 0x00000200 #define VIF_MASK 0x00080000 #define VIP_MASK 0x00100000 diff --git a/dlls/winedos/interrupts.c b/dlls/winedos/interrupts.c index 49c2dfc..83c215f 100644 --- a/dlls/winedos/interrupts.c +++ b/dlls/winedos/interrupts.c @@ -514,8 +514,8 @@ void DOSVM_HardwareInterruptRM( CONTEXT8 context->SegCs = SELECTOROF( handler ); context->Eip = OFFSETOF( handler ); - /* Clear virtual interrupt flag. */ - context->EFlags &= ~VIF_MASK; + /* Clear virtual interrupt flag and trap flag. */ + context->EFlags &= ~(VIF_MASK | TF_MASK); } }

1 0

f_sophia : winhelp: Added Esperanto language support.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: fa68994ab17feaa6269b911328b1c5095cab49f7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fa68994ab17feaa6269b911… Author: f_sophia <f_sophia(a)libero.it> Date: Sun Mar 26 15:58:21 2006 +0100 winhelp: Added Esperanto language support. --- programs/winhelp/Eo.rc | 71 ++++++++++++++++++++++++++++++++++++++++++++++ programs/winhelp/rsrc.rc | 1 + 2 files changed, 72 insertions(+), 0 deletions(-) create mode 100644 programs/winhelp/Eo.rc diff --git a/programs/winhelp/Eo.rc b/programs/winhelp/Eo.rc new file mode 100644 index 0000000..af5a77e --- /dev/null +++ b/programs/winhelp/Eo.rc @@ -0,0 +1,71 @@ +/* + * Help Viewer + * Esperanto Language Support + * + * Copyright 2006 Antonio Codazzi + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* Cxapelitaj literoj estas en Latin-3 iso8859-3 */ + +/* Menu */ + +MAIN_MENU MENU LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT +{ + POPUP "Dosiero" { + MENUITEM "Malfermu", MNID_FILE_OPEN + MENUITEM SEPARATOR + MENUITEM "&Presu", MNID_FILE_PRINT + MENUITEM "Impozu Printilon...", MNID_FILE_SETUP + MENUITEM SEPARATOR + MENUITEM "Finu", MNID_FILE_EXIT + } + POPUP "Redakto" { + MENUITEM "Kopiu...", MNID_EDIT_COPYDLG + MENUITEM SEPARATOR + MENUITEM "Notu...", MNID_EDIT_ANNOTATE + } + POPUP "Legosigno" { + MENUITEM "&Difinu...", MNID_BKMK_DEFINE + } + POPUP "&Helpo" { + MENUITEM "Helpu pri helpo", MNID_HELP_HELPON + MENUITEM "�iam supre", MNID_HELP_HELPTOP + MENUITEM SEPARATOR + MENUITEM "Pri...", MNID_HELP_ABOUT +#ifdef WINELIB + MENUITEM "Pri WINE", MNID_HELP_WINE +#endif + } +} + +/* Strings */ +STRINGTABLE DISCARDABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT +{ +STID_WINE_HELP, "WINE Helpanto" +STID_WHERROR, "ERARO" +STID_WARNING, "ATENTU" +STID_INFO, "Informo pri" +STID_NOT_IMPLEMENTED, "Ne-implementata" +STID_HLPFILE_ERROR_s, "Eraro dum la legado de helpdosiero `%s'" +STID_CONTENTS, "Enhavo" +STID_SEARCH, "&Ser�u" +STID_BACK, "Anta�a" +STID_HISTORY, "&Historio" +STID_TOPICS, "&Temoj" +STID_ALL_FILES, "Tutaj dosieroj (*.*)" +STID_HELP_FILES_HLP, "Helpaj dosieroj (*.hlp)" +} diff --git a/programs/winhelp/rsrc.rc b/programs/winhelp/rsrc.rc index 8342085..dca51ee 100644 --- a/programs/winhelp/rsrc.rc +++ b/programs/winhelp/rsrc.rc @@ -28,6 +28,7 @@ #include "Da.rc" #include "De.rc" #include "En.rc" +#include "Eo.rc" #include "Es.rc" #include "Fi.rc" #include "Fr.rc"

1 0

Antonio Codazzi : shell32: Updated Esperanto translation.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 77405a786db98464f7792a22dc751bf3696ea3d9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=77405a786db98464f7792a2… Author: Antonio Codazzi <f_sophia(a)libero.it> Date: Sun Mar 26 15:58:02 2006 +0100 shell32: Updated Esperanto translation. --- dlls/shell32/shell32_Eo.rc | 199 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 189 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shell32_Eo.rc b/dlls/shell32/shell32_Eo.rc index 9bf1655..e34d468 100644 --- a/dlls/shell32/shell32_Eo.rc +++ b/dlls/shell32/shell32_Eo.rc @@ -1,5 +1,6 @@ /* * Copyright 1998 Juergen Schmied + * Copyright 2006 Antonio Codazzi * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,17 +19,104 @@ LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT +/* Cxapelitaj literoj estas en Latin-3 iso8895-3 */ + +MENU_001 MENU DISCARDABLE +BEGIN + MENUITEM "&Grandaj Ikonoj", FCIDM_SHVIEW_BIGICON + MENUITEM "Malgrandaj Ikonoj", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Listo", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Detale", FCIDM_SHVIEW_REPORTVIEW +END + +/* + shellview background menu +*/ +MENU_002 MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&Vido" + BEGIN + MENUITEM "&Grandaj Ikonoj", FCIDM_SHVIEW_BIGICON + MENUITEM "Malgrandaj Ikonoj", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Listo", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Detale", FCIDM_SHVIEW_REPORTVIEW + END + MENUITEM SEPARATOR + POPUP "Aran�u &Ikonojn" + BEGIN + MENUITEM "La�� &Nomo", 0x30 /* column 0 */ + MENUITEM "La�� &Tipo", 0x32 /* column 2 */ + MENUITEM "La�� Grandeco", 0x31 /* ... */ + MENUITEM "La�� &Dato", 0x33 + MENUITEM SEPARATOR + MENUITEM "&Aran�u A�tomate", FCIDM_SHVIEW_AUTOARRANGE + END + MENUITEM "Vicigu Ikonojn", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM SEPARATOR + MENUITEM "Relegu", FCIDM_SHVIEW_REFRESH + MENUITEM SEPARATOR + MENUITEM "Enmetu", FCIDM_SHVIEW_INSERT + MENUITEM "Enmetu kiel Ligo", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + POPUP "Nova" + BEGIN + MENUITEM "Nova &Dosierujo", FCIDM_SHVIEW_NEWFOLDER + MENUITEM "Nova &Ligo", FCIDM_SHVIEW_NEWLINK + MENUITEM SEPARATOR + END + MENUITEM SEPARATOR + MENUITEM "Ecoj", FCIDM_SHVIEW_PROPERTIES + END +END + +/* + shellview item menu +*/ +MENU_SHV_FILE MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "E&sploru", FCIDM_SHVIEW_EXPLORE + MENUITEM "Malfermu", FCIDM_SHVIEW_OPEN + MENUITEM SEPARATOR + MENUITEM "Enmetu", FCIDM_SHVIEW_CUT + MENUITEM "Kopiu", FCIDM_SHVIEW_COPY + MENUITEM SEPARATOR + MENUITEM "Kreu Ligon", FCIDM_SHVIEW_CREATELINK + MENUITEM "Forigu", FCIDM_SHVIEW_DELETE + MENUITEM "Alinomu", FCIDM_SHVIEW_RENAME + MENUITEM SEPARATOR + MENUITEM "Ecoj", FCIDM_SHVIEW_PROPERTIES + END +END + +SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "Foliu Dosierujon" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "Bone", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Rezigni", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP + LTEXT "", IDD_TITLE, 4, 4, 180, 12 + LTEXT "", IDD_STATUS, 4, 25, 180, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + WS_BORDER | WS_TABSTOP, + 4, 40, 180, 120 +} + SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Pri %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "Enorde", IDOK, 153, 133, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "Bone", 1, 153, 130, 50, 12 LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10 + ICON "", 1088, 189, 10, 14, 16 + LTEXT "", 100, 8, 10, 137, 33 + LTEXT "Wine estas disponebla dank'al:", 98, 8, 55, 137, 10 } SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -37,10 +125,101 @@ CAPTION "" FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and Wine will open it for you.", 12289, 36, 11, 182, 18 - LTEXT "&Open:", 12305, 7, 39, 24, 10 + LTEXT "Skribu nomon de programo, de dosierujo, de documento a� de Interreta fonto, kaj Wine malfermos �in.", 12289, 36, 11, 182, 18 + LTEXT "Malfermu:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 - DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "&Browse...", 12288, 170, 63, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "Bone", IDOK, 62, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "Rezigni", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "Foliu...", 12288, 170, 63, 50, 14, WS_TABSTOP +} + +/* + special folders +*/ +STRINGTABLE DISCARDABLE +{ + IDS_DESKTOP "Desktop" + IDS_MYCOMPUTER "Mea Komputero" +} + +/* + context menus +*/ +STRINGTABLE DISCARDABLE +{ + IDS_VIEW_LARGE "&Grandaj Ikonoj" + IDS_VIEW_SMALL "Malgrandaj Ikonoj" + IDS_VIEW_LIST "&Listo" + IDS_VIEW_DETAILS "&Detale" + IDS_SELECT "Elektu" + IDS_OPEN "Malfermu" +} + +STRINGTABLE DISCARDABLE +{ + IDS_CREATEFOLDER_DENIED "Mi ne povas crei novan Dosierujon: Aliro rifuzita." + IDS_CREATEFOLDER_CAPTION "Eraro dum krei�o de dosierujo" + IDS_DELETEITEM_CAPTION "Konfirmu forigon de dosiero" + IDS_DELETEFOLDER_CAPTION "Konfirmu forigon de dosierujo" + IDS_DELETEITEM_TEXT "�u vi estas certa pri forigo de '%1'?" + IDS_DELETEMULTIPLE_TEXT "�u vi estas certa pri forigo de �i tiuj %1 komponantoj?" + IDS_OVERWRITEFILE_TEXT "�u vi supreskribas la dosieron %1?" + IDS_OVERWRITEFILE_CAPTION "Konfirmu supreskribiton de dosieron" } + +/* columns in the shellview */ +STRINGTABLE +BEGIN + IDS_SHV_COLUMN1 "Dosiero" + IDS_SHV_COLUMN2 "Gandeco" + IDS_SHV_COLUMN3 "Tipo" + IDS_SHV_COLUMN4 "Modifita" + IDS_SHV_COLUMN5 "Atributoj" + IDS_SHV_COLUMN6 "Spaco" + IDS_SHV_COLUMN7 "Disponebla Spaco" + IDS_SHV_COLUMN8 "Nomo" + IDS_SHV_COLUMN9 "Komentario" +END + + +/* message box strings */ +STRINGTABLE DISCARDABLE +{ + IDS_RESTART_TITLE "Restartigu" + IDS_RESTART_PROMPT "�u vi volas simuli Vindozan restartigon?" + IDS_SHUTDOWN_TITLE "Adia�u" + IDS_SHUTDOWN_PROMPT "�u vi volas adia�i Wine?" +} + +/* shell folder path default values */ +STRINGTABLE DISCARDABLE +{ + IDS_PROGRAMS "Start Menu\\Programs" + IDS_PERSONAL "Miaj Dokumentoj" + IDS_FAVORITES "Favorites" + IDS_STARTUP "Start Menu\\Programs\\StartUp" + IDS_RECENT "Recent" + IDS_SENDTO "SendTo" + IDS_STARTMENU "Start Menu" + IDS_MYMUSIC "Miaj Dokumentoj\\Muziko" + IDS_MYVIDEO "Miai Dokumentoj\\Video" + IDS_DESKTOPDIRECTORY "Desktop" + IDS_NETHOOD "NetHood" + IDS_TEMPLATES "Templates" + IDS_APPDATA "Application Data" + IDS_PRINTHOOD "PrintHood" + IDS_LOCAL_APPDATA "Local Settings\\Application Data" + IDS_INTERNET_CACHE "Temporary Internet Files" + IDS_COOKIES "Cookies" + IDS_HISTORY "History" + IDS_PROGRAM_FILES "Program Files" + IDS_MYPICTURES "Maj Documentoj\\Bildoj" + IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" + IDS_COMMON_DOCUMENTS "Documents" + IDS_ADMINTOOLS "Start Menu\\Programs\\Administrative Tools" + IDS_COMMON_MUSIC "Documents\\Musiko" + IDS_COMMON_PICTURES "Documents\\Bildoj" + IDS_COMMON_VIDEO "Documents\\Video" + IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" +} +

1 0

James Hawkins : kernel: Error out of CreateProcess if the specified current directory
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 61c3bb03a0daa16599db5afffd3a8f8fabaadccc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=61c3bb03a0daa16599db5af… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 26 21:53:09 2006 -0600 kernel: Error out of CreateProcess if the specified current directory doesn't exist. --- dlls/kernel/process.c | 6 +++++- dlls/kernel/tests/process.c | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index d1ff341..4263a22 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -1661,7 +1661,11 @@ BOOL WINAPI CreateProcessW( LPCWSTR app_ if (cur_dir) { - unixdir = wine_get_unix_file_name( cur_dir ); + if (!(unixdir = wine_get_unix_file_name( cur_dir ))) + { + SetLastError(ERROR_DIRECTORY); + goto done; + } } else { diff --git a/dlls/kernel/tests/process.c b/dlls/kernel/tests/process.c index b28f28d..245136f 100644 --- a/dlls/kernel/tests/process.c +++ b/dlls/kernel/tests/process.c @@ -811,6 +811,18 @@ static void test_Directory(void) okChildIString("Misc", "CurrDirA", windir); release_memory(); assert(DeleteFileA(resfile) != 0); + + /* search PATH for the exe if directory is NULL */ + ok(CreateProcessA(NULL, "winver.exe", NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); + ok(TerminateProcess(info.hProcess, 0), "Child process termination\n"); + + /* if any directory is provided, don't search PATH, error on bad directory */ + SetLastError(0xdeadbeef); + memset(&info, 0, sizeof(info)); + ok(!CreateProcessA(NULL, "winver.exe", NULL, NULL, FALSE, 0L, + NULL, "non\\existent\\directory", &startup, &info), "CreateProcess\n"); + ok(GetLastError() == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %ld\n", GetLastError()); + ok(!TerminateProcess(info.hProcess, 0), "Child process should not exist\n"); } static BOOL is_str_env_drive_dir(const char* str)

1 0

Vitaly Lipatov : wine.inf: Add some dll stub dll to the system directory.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 94dcabecd8b779e70b2ae4b7b8c55c4cd16da618 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=94dcabecd8b779e70b2ae4b… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sun Mar 26 15:30:58 2006 +0400 wine.inf: Add some dll stub dll to the system directory. --- tools/wine.inf | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index efc384c..7177761 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2111,15 +2111,31 @@ HKLM,%CurrentVersion%\Telephony\Country 10,,winhelp.exe 10,,winhlp32.exe,winhelp.exe 10,command,start.exe +11,,advapi32.dll +11,,comdlg32.dll 11,,control.exe +11,,crypt32.dll +11,,gdi32.dll 11,,help.exe,winhelp.exe +11,,kernel32.dll 11,,msiexec.exe +11,,msvcrt.dll 11,,notepad.exe -11,,shdocvw.dll +11,,ntdll.dll 11,,progman.exe 11,,regsvr32.exe +11,,rpcrt4.dll +11,,shdocvw.dll +11,,shell32.dll +11,,shfolder.dll +11,,shlwapi.dll +11,,user32.dll +11,,version.dll 11,,wcmd.exe +11,,winmm.dll 11,,winver.exe +11,,ws2_32.dll +11,,wsock32.dll [SystemIni] system.ini, mci,,"MPEGVideo=mciqtz.drv"

1 0

Paul Vriens : wine.inf: Add SystemRoot.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: a589eb27ac6caec1697c4307273b6f13dcf51075 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a589eb27ac6caec1697c430… Author: Paul Vriens <paul.vriens(a)xs4all.nl> Date: Fri Mar 24 10:01:00 2006 +0100 wine.inf: Add SystemRoot. --- tools/wine.inf | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 17d9144..efc384c 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -150,8 +150,9 @@ HKLM,%CurrentVersion%\Setup,"BootDir",," HKLM,%CurrentVersion%\Setup,"SharedDir",,"%25%" HKLM,%CurrentVersionNT%,"RegisteredOrganization",2,"Change preferred organization in ~/.wine/system.reg" HKLM,%CurrentVersionNT%,"RegisteredOwner",2,"Change preferred owner in ~/.wine/system.reg" -HKLM,Software\Microsoft\Windows NT\CurrentVersion\Fonts,,,"" -HKLM,Software\Microsoft\Windows NT\CurrentVersion\Hotfix\Q246009,"Installed",,"1" +HKLM,%CurrentVersionNT%,"SystemRoot",,"%10%" +HKLM,%CurrentVersionNT%\Fonts,,,"" +HKLM,%CurrentVersionNT%\Q246009,"Installed",,"1" [Debugger] HKLM,Software\Microsoft\Windows NT\CurrentVersion\AeDebug,"Debugger",2,"winedbg --auto %ld %ld"

1 0

Petr Tesarik : ntdll: Fix debug exceptions from VM86.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: e748a77e1ae75d828c4340733f2f1107ec6ac2d2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e748a77e1ae75d828c43407… Author: Petr Tesarik <hat(a)tesarici.cz> Date: Mon Mar 27 10:12:02 2006 +0200 ntdll: Fix debug exceptions from VM86. - Set ContextFlags accordingly in save_vm86_context(). - Raise debug exceptions correctly for debug exceptions. - Do not clear TF bit for VM86-generated debug exceptions. --- dlls/ntdll/signal_i386.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 727223d..a9f2589 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -531,6 +531,7 @@ static inline TEB *get_current_teb(void) */ static void save_vm86_context( CONTEXT *context, const struct vm86plus_struct *vm86 ) { + context->ContextFlags = CONTEXT_FULL; context->Eax = vm86->regs.eax; context->Ebx = vm86->regs.ebx; context->Ecx = vm86->regs.ecx; @@ -1528,7 +1529,7 @@ void __wine_enter_vm86( CONTEXT *context case VM86_TRAP: /* return due to DOS-debugger request */ switch(VM86_ARG(res)) { - case TRAP_x86_TRCTRAP: /* Single-step exception, single step flag is cleared by raise_trap_exception */ + case TRAP_x86_TRCTRAP: /* Single-step exception */ rec.ExceptionCode = EXCEPTION_SINGLE_STEP; break; case TRAP_x86_BPTFLT: /* Breakpoint exception */ @@ -1538,8 +1539,7 @@ void __wine_enter_vm86( CONTEXT *context rec.ExceptionCode = EXCEPTION_BREAKPOINT; break; } - raise_trap_exception( &rec, context ); - continue; + break; case VM86_INTx: /* int3/int x instruction (ARG = x) */ rec.ExceptionCode = EXCEPTION_VM86_INTx; rec.NumberParameters = 1;

1 0

James Hawkins : advpack: Set hexe to a non-NULL value to test that the handle is NULL on return.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 2fb1ac86119510764a8bf8ab92a4618c53a87be3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2fb1ac86119510764a8bf8a… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 26 21:38:40 2006 -0600 advpack: Set hexe to a non-NULL value to test that the handle is NULL on return. --- dlls/advpack/install.c | 7 +++++++ dlls/advpack/tests/install.c | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 55c7703..ecf8a18 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -231,5 +231,12 @@ HRESULT WINAPI RunSetupCommandW(HWND hWn hWnd, debugstr_w(szCmdName), debugstr_w(szInfSection), debugstr_w(szDir), debugstr_w(lpszTitle), phEXE, dwFlags, pvReserved); + + if (!szCmdName || !szDir) + return E_INVALIDARG; + + if (!(dwFlags & RSC_FLAG_INF)) + *phEXE = NULL; + return E_UNEXPECTED; } diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index b8a14eb..6d0daae 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -55,7 +55,7 @@ static void test_RunSetupCommand() ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %ld\n", hr); /* try to run a non-existent exe */ - hexe = NULL; + hexe = (HANDLE)0xdeadbeef; hr = pRunSetupCommand(NULL, "idontexist.exe", "Install", "c:\\windows\\system32", "Title", &hexe, 0, NULL); todo_wine { @@ -66,7 +66,7 @@ static void test_RunSetupCommand() ok(!TerminateProcess(hexe, 0), "Expected TerminateProcess to fail\n"); /* try a bad directory */ - hexe = NULL; + hexe = (HANDLE)0xdeadbeef; hr = pRunSetupCommand(NULL, "winver.exe", "Install", "windows\\system32", "Title", &hexe, 0, NULL); todo_wine { @@ -77,17 +77,17 @@ static void test_RunSetupCommand() ok(!TerminateProcess(hexe, 0), "Expected TerminateProcess to fail\n"); /* try to run an exe with the RSC_FLAG_INF flag */ - hexe = NULL; + hexe = (HANDLE)0xdeadbeef; hr = pRunSetupCommand(NULL, "winver.exe", "Install", "c:\\windows\\system32", "Title", &hexe, RSC_FLAG_INF, NULL); todo_wine { ok(hr == SPAPI_E_WRONG_INF_STYLE, "Expected SPAPI_E_WRONG_INF_STYLE, got %ld\n", hr); } - ok(hexe == NULL, "Expected hexe to be NULL\n"); + ok(hexe == (HANDLE)0xdeadbeef, "Expected hexe to be 0xdeadbeef\n"); ok(!TerminateProcess(hexe, 0), "Expected TerminateProcess to fail\n"); /* run winver.exe */ - hexe = NULL; + hexe = (HANDLE)0xdeadbeef; hr = pRunSetupCommand(NULL, "winver.exe", "Install", "c:\\windows\\system32", "Title", &hexe, 0, NULL); todo_wine {

1 0

Mike McCormack : commdlg: Malformed filters are still added to the filter combo box.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 05eaadc1f771cf861c3cbebc6b8fd0d6fdaa542b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=05eaadc1f771cf861c3cbeb… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Mar 26 11:35:52 2006 +0900 commdlg: Malformed filters are still added to the filter combo box. --- dlls/commdlg/filedlg.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/commdlg/filedlg.c b/dlls/commdlg/filedlg.c index a3a4c83..428841f 100644 --- a/dlls/commdlg/filedlg.c +++ b/dlls/commdlg/filedlg.c @@ -2367,16 +2367,19 @@ static HRESULT FILEDLG95_FILETYPE_Init(H lpstrDisplay = lpstrPos; lpstrPos += strlenW(lpstrPos) + 1; + CBAddStringW(fodInfos->DlgInfos.hwndFileTypeCB, lpstrDisplay); + + nFilters++; + /* malformed filters are added anyway... */ + if (!*lpstrPos) break; + /* Copy the extensions */ - if (! *lpstrPos) return E_FAIL; /* malformed filter */ if (!(lpstrExt = MemAlloc((strlenW(lpstrPos)+1)*sizeof(WCHAR)))) return E_FAIL; strcpyW(lpstrExt,lpstrPos); lpstrPos += strlenW(lpstrPos) + 1; /* Add the item at the end of the combo */ - CBAddStringW(fodInfos->DlgInfos.hwndFileTypeCB, lpstrDisplay); - CBSetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, nFilters, lpstrExt); - nFilters++; + CBSetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, nFilters-1, lpstrExt); } }

1 0

Mike McCormack : comctl32: Having an MRU list without a compare function works in Windows.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 316e5835a02cc761336983ac0c4a5aa4270cbcd9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=316e5835a02cc761336983a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Mar 26 11:35:29 2006 +0900 comctl32: Having an MRU list without a compare function works in Windows. --- dlls/comctl32/comctl32undoc.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c index aa79f88..2812e34 100644 --- a/dlls/comctl32/comctl32undoc.c +++ b/dlls/comctl32/comctl32undoc.c @@ -386,10 +386,8 @@ INT WINAPI FindMRUData (HANDLE hList, LP UINT i; LPSTR dataA = NULL; - if (!mp->extview.lpfnCompare) { - ERR("MRU list not properly created. No compare procedure.\n"); + if (!mp->extview.lpfnCompare) return -1; - } if(!(mp->extview.dwFlags & MRUF_BINARY_LIST) && !mp->isUnicode) { DWORD len = WideCharToMultiByte(CP_ACP, 0, lpData, -1,

1 0

H. Verbeet : msvcrt: Fix reading of signed numbers with unsigned read types in scanf.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 8c29b7dc8ba584fb72cc12d9f405a1920aea95e8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8c29b7dc8ba584fb72cc12d… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sun Mar 26 04:10:28 2006 +0200 msvcrt: Fix reading of signed numbers with unsigned read types in scanf. --- dlls/msvcrt/scanf.h | 35 +++++++++++------------------------ dlls/msvcrt/tests/scanf.c | 25 +++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 24 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 4c27c68..ad3245d 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -114,7 +114,7 @@ _FUNCTION_ { * the form %[*][width][{h | l | I64 | L}]type */ else if (*format == '%') { int st = 0; int suppress = 0; int width = 0; - int base, number_signed; + int base; int h_prefix = 0; int l_prefix = 0; int L_prefix = 0; @@ -157,19 +157,19 @@ _FUNCTION_ { switch(*format) { case 'x': case 'X': /* hexadecimal integer. */ - base = 16; number_signed = 0; + base = 16; goto number; case 'o': /* octal integer */ - base = 8; number_signed = 0; + base = 8; goto number; case 'u': /* unsigned decimal integer */ - base = 10; number_signed = 0; + base = 10; goto number; case 'd': /* signed decimal integer */ - base = 10; number_signed = 1; + base = 10; goto number; case 'i': /* generic integer */ - base = 10; number_signed = 1; + base = 10; number: { /* read an integer */ ULONGLONG cur = 0; @@ -179,8 +179,7 @@ _FUNCTION_ { while ((nch!=_EOF_) && _ISSPACE_(nch)) nch = _GETC_(file); /* get sign */ - if (number_signed && (nch == '-' || - nch == '+')) { + if (nch == '-' || nch == '+') { negative = (nch=='-'); nch = _GETC_(file); if (width>0) width--; @@ -225,22 +224,10 @@ _FUNCTION_ { st = 1; if (!suppress) { #define _SET_NUMBER_(type) *va_arg(ap, type*) = negative ? -cur : cur - if (number_signed) { - if (I64_prefix) _SET_NUMBER_(LONGLONG); - else if (l_prefix) _SET_NUMBER_(long int); - else if (h_prefix) _SET_NUMBER_(short int); - else _SET_NUMBER_(int); - } else { - if (negative) { - WARN("Dropping sign in reading a negative number into an unsigned value"); - negative = 0; - } - if (I64_prefix) _SET_NUMBER_(ULONGLONG); - else if (l_prefix) _SET_NUMBER_(unsigned long int); - else if (h_prefix) - _SET_NUMBER_(unsigned short int); - else _SET_NUMBER_(unsigned int); - } + if (I64_prefix) _SET_NUMBER_(LONGLONG); + else if (l_prefix) _SET_NUMBER_(long int); + else if (h_prefix) _SET_NUMBER_(short int); + else _SET_NUMBER_(int); } } break; diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 2482825..d90a3bd 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -52,6 +52,11 @@ static void test_sscanf( void ) ok( sscanf(buffer, "%x", &result) == 1, "sscanf failed\n" ); ok( result == 0x51, "sscanf reads %x instead of %x\n", result, 0x51 ); + result = 0; + ret = sscanf("-1", "%x", &result); + ok(ret == 1, "Wrong number of arguments read: %d (expected 1)\n", ret); + ok(result == -1, "Read %d, expected -1\n", result); + /* check % followed by any char */ strcpy(buffer,"\"%12@"); strcpy(format,"%\"%%%d%@"); /* work around gcc format check */ @@ -93,9 +98,29 @@ static void test_sscanf( void ) ret = sscanf(buffer, "%i", &result); ok(ret == 1, "Wrong number of arguments read: %d\n", ret); ok(result == 123, "Wrong number read\n"); + result = 0; + ret = sscanf("-1", "%i", &result); + ok(ret == 1, "Wrong number of arguments read: %d (expected 1)\n", ret); + ok(result == -1, "Read %d, expected -1\n", result); ret = sscanf(buffer, "%d", &result); ok(ret == 1, "Wrong number of arguments read: %d\n", ret); ok(result == 123, "Wrong number read\n"); + result = 0; + ret = sscanf("-1", "%d", &result); + ok(ret == 1, "Wrong number of arguments read: %d (expected 1)\n", ret); + ok(result == -1, "Read %d, expected -1\n", result); + + /* %o */ + result = 0; + ret = sscanf("-1", "%o", &result); + ok(ret == 1, "Wrong number of arguments read: %d (expected 1)\n", ret); + ok(result == -1, "Read %d, expected -1\n", result); + + /* %u */ + result = 0; + ret = sscanf("-1", "%u", &result); + ok(ret == 1, "Wrong number of arguments read: %d (expected 1)\n", ret); + ok(result == -1, "Read %d, expected -1\n", result); /* Check %c */ strcpy(buffer,"a");

1 0

Alexandre Julliard : msvcrt: Fix fflush() of files opened for read.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 19a088202a21bbc9d77103d3ee5f696d6a08defc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=19a088202a21bbc9d77103d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 24 16:53:12 2006 +0000 msvcrt: Fix fflush() of files opened for read. Some apps, for no particular reason, call fflush() on files opened for read. This keeps them from tripping over their shoelaces. --- dlls/msvcrt/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 9162ee7..0a99cce 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -588,11 +588,11 @@ int MSVCRT_fflush(MSVCRT_FILE* file) { if(!file) { _flushall(); - return 0; - } else { + } else if(file->_flag & MSVCRT__IOWRT) { int res=msvcrt_flush_buffer(file); return res; } + return 0; } /*********************************************************************

1 0

Tomas Carnecky : opengl: Put OpenGL setup functions into their own debug channel.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 56de92d795fa250c2a35d89189ce6543951333b7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=56de92d795fa250c2a35d89… Author: Tomas Carnecky <tom(a)dbservice.com> Date: Sat Mar 25 13:07:23 2006 +0100 opengl: Put OpenGL setup functions into their own debug channel. --- dlls/opengl32/wgl.c | 5 +++-- dlls/opengl32/wgl_ext.c | 2 +- dlls/x11drv/opengl.c | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 71f7511..c7d3147 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -44,7 +44,8 @@ #include "wine/library.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(opengl); +WINE_DEFAULT_DEBUG_CHANNEL(wgl); +WINE_DECLARE_DEBUG_CHANNEL(opengl); /** global glx object */ wine_glx_t wine_glx; @@ -698,7 +699,7 @@ BOOL WINAPI wglShareLists(HGLRC hglrc1, */ BOOL WINAPI wglSwapLayerBuffers(HDC hdc, UINT fuPlanes) { - TRACE("(%p, %08x)\n", hdc, fuPlanes); + TRACE_(opengl)("(%p, %08x)\n", hdc, fuPlanes); if (fuPlanes & WGL_SWAP_MAIN_PLANE) { if (!SwapBuffers(hdc)) return FALSE; diff --git a/dlls/opengl32/wgl_ext.c b/dlls/opengl32/wgl_ext.c index 24e990d..624a82c 100644 --- a/dlls/opengl32/wgl_ext.c +++ b/dlls/opengl32/wgl_ext.c @@ -37,7 +37,7 @@ #include "wine/library.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(opengl); +WINE_DEFAULT_DEBUG_CHANNEL(wgl); /* x11drv GDI escapes */ diff --git a/dlls/x11drv/opengl.c b/dlls/x11drv/opengl.c index 3fc0231..ba125b9 100644 --- a/dlls/x11drv/opengl.c +++ b/dlls/x11drv/opengl.c @@ -28,7 +28,8 @@ #include "wine/library.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(opengl); +WINE_DEFAULT_DEBUG_CHANNEL(wgl); +WINE_DECLARE_DEBUG_CHANNEL(opengl); #if defined(HAVE_GL_GL_H) && defined(HAVE_GL_GLX_H) @@ -533,7 +534,7 @@ BOOL X11DRV_SwapBuffers(X11DRV_PDEVICE * return 0; } - TRACE("(%p)\n", physDev); + TRACE_(opengl)("(%p)\n", physDev); wine_tsx11_lock(); pglXSwapBuffers(gdi_display, physDev->drawable);

1 0

Eric Pouech : winedbg: Fixes for identifiers.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: f661e7a924293a574c894ac7706324b2e49c6ceb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f661e7a924293a574c894ac… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Mar 25 10:12:45 2006 +0100 winedbg: Fixes for identifiers. - fixed lexical rules for a path name - fixed identifier rules so that we get the right precedence between ! and :: - modules (in mod!name forms) are now handled as tIDENTIFIER (tPATH was buggy anyhow) --- programs/winedbg/dbg.y | 12 ++++++++---- programs/winedbg/debug.l | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index ecbb3fa..987a315 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -86,7 +86,7 @@ int yyerror(const char*); %type <expression> expr lvalue %type <lvalue> expr_lvalue lvalue_addr %type <integer> expr_rvalue -%type <string> pathname identifier +%type <string> pathname identifier cpp_identifier %type <listing> list_arg %type <type> type_expr @@ -162,14 +162,18 @@ pathname: | tPATH { $$ = $1; } ; -identifier: +cpp_identifier: tIDENTIFIER { $$ = $1; } - | tPATH '!' tIDENTIFIER { $$ = lexeme_alloc_size(strlen($1) + 1 + strlen($3) + 1); - sprintf($$, "%s!%s", $1, $3); } | identifier OP_SCOPE tIDENTIFIER { $$ = lexeme_alloc_size(strlen($1) + 2 + strlen($3) + 1); sprintf($$, "%s::%s", $1, $3); } ; +identifier: + cpp_identifier { $$ = $1; } + | tIDENTIFIER '!' cpp_identifier { $$ = lexeme_alloc_size(strlen($1) + 1 + strlen($3) + 1); + sprintf($$, "%s!%s", $1, $3); } + ; + list_arg: tNUM { $$.FileName = NULL; $$.LineNumber = $1; } | pathname ':' tNUM { $$.FileName = $1; $$.LineNumber = $3; } diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index dd18a89..0a14e9a 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -77,7 +77,7 @@ DIGIT [0-9] HEXDIGIT [0-9a-fA-F] FORMAT [ubcdgiswx] IDENTIFIER [_a-zA-Z~?][_a-zA-Z0-9~?@]* -PATHNAME [-/_a-zA-Z\.~][-/_a-zA-Z0-9\.~@]* +PATHNAME [\\/-_a-zA-Z0-9\.~@]+ STRING \"[^\n"]+\" %s FORMAT_EXPECTED

1 0

Eric Pouech : dbghelp: Module should be case insensitive.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 983d8aea3ec335d9676ea2b7ac00f4885227b801 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=983d8aea3ec335d9676ea2b… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Mar 25 10:12:57 2006 +0100 dbghelp: Module should be case insensitive. When looking up a symbol name in the form module!name, the module lookup should be insensitive. --- dlls/dbghelp/symbol.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 6458a6e..091845d 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -797,8 +797,7 @@ BOOL WINAPI SymEnumSymbols(HANDLE hProce if (bang == Mask) return FALSE; - compile_regex(Mask, bang - Mask, &mod_regex, - dbghelp_options & SYMOPT_CASE_INSENSITIVE); + compile_regex(Mask, bang - Mask, &mod_regex, TRUE); compile_regex(bang + 1, -1, &sym_regex, dbghelp_options & SYMOPT_CASE_INSENSITIVE);

1 0

Stefan Dösinger : wined3d: Add WINED3DMULTISAMPLE_TYPE to wined3d_types.h.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: b4b295c2a57c9d0750015adba13df249f6f0a14d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b4b295c2a57c9d0750015ad… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Mar 24 17:34:26 2006 +0100 wined3d: Add WINED3DMULTISAMPLE_TYPE to wined3d_types.h. --- dlls/d3d8/cubetexture.c | 2 + dlls/d3d8/d3d8_private.h | 4 +- dlls/d3d8/device.c | 4 +- dlls/d3d8/directx.c | 8 ++-- dlls/d3d8/surface.c | 2 + dlls/d3d8/texture.c | 2 + dlls/d3d9/cubetexture.c | 2 + dlls/d3d9/d3d9_private.h | 4 +- dlls/d3d9/device.c | 2 + dlls/d3d9/directx.c | 6 ++- dlls/d3d9/surface.c | 2 + dlls/d3d9/swapchain.c | 4 +- dlls/d3d9/texture.c | 2 + dlls/wined3d/device.c | 2 + dlls/wined3d/directx.c | 4 +- dlls/wined3d/wined3d_private.h | 8 ++-- include/wine/wined3d_interface.h | 8 ++-- include/wine/wined3d_types.h | 70 +++++++++++++++++++++++++------------- 18 files changed, 79 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b4b295c2a57c9d07500…

1 0

Stefan Dösinger : wined3d: Add WINED3DTRIPATCH_INFO to wined3d_types.h.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 0f7eb52789a9265a2700c3f1f7cacc1056835f3f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0f7eb52789a9265a2700c3f… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Mar 24 16:06:28 2006 +0100 wined3d: Add WINED3DTRIPATCH_INFO to wined3d_types.h. --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/wined3d/device.c | 2 +- include/wine/wined3d_interface.h | 2 +- include/wine/wined3d_types.h | 8 ++++++++ 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 525ded9..0d668b9 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1325,7 +1325,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_Draw IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_DrawTriPatch(This->WineD3DDevice, Handle, pNumSegs, pTriPatchInfo); + return IWineD3DDevice_DrawTriPatch(This->WineD3DDevice, Handle, pNumSegs, (WINED3DTRIPATCH_INFO *)pTriPatchInfo); } HRESULT WINAPI IDirect3DDevice8Impl_DeletePatch(LPDIRECT3DDEVICE8 iface, UINT Handle) { diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index c61bf15..a134d59 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -802,7 +802,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_Dr HRESULT WINAPI IDirect3DDevice9Impl_DrawTriPatch(LPDIRECT3DDEVICE9 iface, UINT Handle, CONST float* pNumSegs, CONST D3DTRIPATCH_INFO* pTriPatchInfo) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_DrawTriPatch(This->WineD3DDevice, Handle, pNumSegs, pTriPatchInfo); + return IWineD3DDevice_DrawTriPatch(This->WineD3DDevice, Handle, pNumSegs, (WINED3DTRIPATCH_INFO *) pTriPatchInfo); } HRESULT WINAPI IDirect3DDevice9Impl_DeletePatch(LPDIRECT3DDEVICE9 iface, UINT Handle) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1a55b8e..b0ea82b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5819,7 +5819,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_DrawRe } /* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… */ -HRESULT WINAPI IWineD3DDeviceImpl_DrawTriPatch(IWineD3DDevice *iface, UINT Handle, CONST float* pNumSegs, CONST D3DTRIPATCH_INFO* pTriPatchInfo) { +HRESULT WINAPI IWineD3DDeviceImpl_DrawTriPatch(IWineD3DDevice *iface, UINT Handle, CONST float* pNumSegs, CONST WINED3DTRIPATCH_INFO* pTriPatchInfo) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("(%p) Handle(%d) noSegs(%p) tripatch(%p)\n", This, Handle, pNumSegs, pTriPatchInfo); FIXME("(%p) : Stub\n", This); diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 255ecea..c4494f6 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -416,7 +416,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD STDMETHOD(DrawPrimitiveUP)(THIS_ D3DPRIMITIVETYPE PrimitiveType,UINT PrimitiveCount,CONST void * pVertexStreamZeroData,UINT VertexStreamZeroStride) PURE; STDMETHOD(DrawIndexedPrimitiveUP)(THIS_ D3DPRIMITIVETYPE PrimitiveType,UINT MinVertexIndex,UINT NumVertexIndices,UINT PrimitiveCount,CONST void * pIndexData,WINED3DFORMAT IndexDataFormat,CONST void * pVertexStreamZeroData,UINT VertexStreamZeroStride) PURE; STDMETHOD(DrawRectPatch)(THIS_ UINT Handle, CONST float* pNumSegs, CONST WINED3DRECTPATCH_INFO* pRectPatchInfo) PURE; - STDMETHOD(DrawTriPatch)(THIS_ UINT Handle, CONST float* pNumSegs, CONST D3DTRIPATCH_INFO* pTriPatchInfo) PURE; + STDMETHOD(DrawTriPatch)(THIS_ UINT Handle, CONST float* pNumSegs, CONST WINED3DTRIPATCH_INFO* pTriPatchInfo) PURE; STDMETHOD(DeletePatch)(THIS_ UINT Handle) PURE; STDMETHOD(ColorFill)(THIS_ struct IWineD3DSurface* pSurface, CONST D3DRECT* pRect, D3DCOLOR color) PURE; STDMETHOD(UpdateTexture)(THIS_ struct IWineD3DBaseTexture *pSourceTexture, struct IWineD3DBaseTexture *pDestinationTexture) PURE; diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 3c76715..e26ac21 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -5,6 +5,7 @@ * Copyright 2002-2003 Jason Edmeades * Raphael Junqueira * Copyright 2005 Oliver Stieber + * Copyright 2006 Stefan D�singer * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -428,6 +429,13 @@ typedef struct _WINEDD3DRECTPATCH_INFO { WINED3DDEGREETYPE Degree; } WINED3DRECTPATCH_INFO; +typedef struct _WINED3DTRIPATCH_INFO { + UINT StartVertexOffset; + UINT NumVertices; + WINED3DBASISTYPE Basis; + WINED3DDEGREETYPE Degree; +} WINED3DTRIPATCH_INFO; + typedef struct _WINED3DADAPTER_IDENTIFIER { char *Driver;

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2006