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

Aric Stewart : twain: Add a property sheet UI for scanning.
by Alexandre Julliard March 28, 2006

March 28, 2006

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 March 28, 2006

March 28, 2006

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 March 28, 2006

March 28, 2006

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 March 28, 2006

March 28, 2006

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 March 28, 2006

March 28, 2006

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 March 28, 2006

March 28, 2006

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 March 28, 2006

March 28, 2006

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 March 28, 2006

March 28, 2006

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 March 28, 2006

March 28, 2006

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 March 28, 2006

March 28, 2006

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