April 2008 - Wine-Commits - list.winehq.org

James Hawkins : kernel32: Fix a test that fails in win2k and up.
by Alexandre Julliard April 17, 2008

April 17, 2008

Module: wine Branch: master Commit: c5ebc4acb0af3da2799e58fab6c7f73a3184c51b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5ebc4acb0af3da2799e58fab… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Apr 16 16:30:19 2008 -0500 kernel32: Fix a test that fails in win2k and up. --- dlls/kernel32/tests/volume.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index f238146..9a21db1 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -49,7 +49,7 @@ static void test_query_dos_deviceA(void) static void test_FindFirstVolume(void) { - char volume[50]; + char volume[51]; HANDLE handle; if (!pFindFirstVolumeA) { @@ -65,7 +65,7 @@ static void test_FindFirstVolume(void) handle = pFindFirstVolumeA( volume, 49 ); ok( handle == INVALID_HANDLE_VALUE, "succeeded with short buffer\n" ); ok( GetLastError() == ERROR_FILENAME_EXCED_RANGE, "wrong error %u\n", GetLastError() ); - handle = pFindFirstVolumeA( volume, 50 ); + handle = pFindFirstVolumeA( volume, 51 ); ok( handle != INVALID_HANDLE_VALUE, "failed err %u\n", GetLastError() ); if (handle != INVALID_HANDLE_VALUE) {

1 0

Alexandre Julliard : server: Keep a file descriptor open to the config directory to make sure we don' t write the registry in the wrong place.
by Alexandre Julliard April 17, 2008

April 17, 2008

Module: wine Branch: master Commit: 161160f05ae2340ab5bb35307ca02056cbca68e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=161160f05ae2340ab5bb35307… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 17 12:41:34 2008 +0200 server: Keep a file descriptor open to the config directory to make sure we don't write the registry in the wrong place. --- server/registry.c | 57 +++++++++++++++++++--------------------------------- server/request.c | 11 ++++++++- server/request.h | 1 + 3 files changed, 31 insertions(+), 38 deletions(-) diff --git a/server/registry.c b/server/registry.c index 5084892..d2c0b23 100644 --- a/server/registry.c +++ b/server/registry.c @@ -112,7 +112,7 @@ static void set_periodic_save_timer(void); struct save_branch_info { struct key *key; - char *path; + const char *path; }; #define MAX_SAVE_BRANCH_INFO 3 @@ -1396,11 +1396,9 @@ static void load_init_registry_from_file( const char *filename, struct key *key assert( save_branch_count < MAX_SAVE_BRANCH_INFO ); - if ((save_branch_info[save_branch_count].path = strdup( filename ))) - { - save_branch_info[save_branch_count++].key = (struct key *)grab_object( key ); - make_object_static( &key->obj ); - } + save_branch_info[save_branch_count].path = filename; + save_branch_info[save_branch_count++].key = (struct key *)grab_object( key ); + make_object_static( &key->obj ); } static WCHAR *format_user_registry_path( const SID *sid, struct unicode_str *path ) @@ -1438,27 +1436,24 @@ void init_registry(void) WCHAR *current_user_path; struct unicode_str current_user_str; - const char *config = wine_get_config_dir(); - char *p, *filename; struct key *key; int dummy; + /* switch to the config dir */ + + if (fchdir( config_dir_fd ) == -1) fatal_perror( "chdir to config dir" ); + /* create the root key */ root_key = alloc_key( &root_name, time(NULL) ); assert( root_key ); make_object_static( &root_key->obj ); - if (!(filename = malloc( strlen(config) + 16 ))) fatal_error( "out of memory\n" ); - strcpy( filename, config ); - p = filename + strlen(filename); - /* load system.reg into Registry\Machine */ if (!(key = create_key( root_key, &HKLM_name, NULL, 0, time(NULL), &dummy ))) fatal_error( "could not create Machine registry key\n" ); - strcpy( p, "/system.reg" ); - load_init_registry_from_file( filename, key ); + load_init_registry_from_file( "system.reg", key ); release_object( key ); /* load userdef.reg into Registry\User\.Default */ @@ -1466,8 +1461,7 @@ void init_registry(void) if (!(key = create_key( root_key, &HKU_name, NULL, 0, time(NULL), &dummy ))) fatal_error( "could not create User\\.Default registry key\n" ); - strcpy( p, "/userdef.reg" ); - load_init_registry_from_file( filename, key ); + load_init_registry_from_file( "userdef.reg", key ); release_object( key ); /* load user.reg into HKEY_CURRENT_USER */ @@ -1478,14 +1472,14 @@ void init_registry(void) !(key = create_key( root_key, &current_user_str, NULL, 0, time(NULL), &dummy ))) fatal_error( "could not create HKEY_CURRENT_USER registry key\n" ); free( current_user_path ); - strcpy( p, "/user.reg" ); - load_init_registry_from_file( filename, key ); + load_init_registry_from_file( "user.reg", key ); release_object( key ); - free( filename ); - /* start the periodic save timer */ set_periodic_save_timer(); + + /* go back to the server dir */ + if (fchdir( server_dir_fd ) == -1) fatal_perror( "chdir to server dir" ); } /* save a registry branch to a file */ @@ -1532,8 +1526,8 @@ static void save_registry( struct key *key, obj_handle_t handle ) static int save_branch( struct key *key, const char *path ) { struct stat st; - char *p, *real, *tmp = NULL; - int fd, count = 0, ret = 0, by_symlink; + char *p, *tmp = NULL; + int fd, count = 0, ret = 0; FILE *f; if (!(key->flags & KEY_DIRTY)) @@ -1542,25 +1536,13 @@ static int save_branch( struct key *key, const char *path ) return 1; } - /* get the real path */ - - by_symlink = (!lstat(path, &st) && S_ISLNK (st.st_mode)); - if (!(real = malloc( PATH_MAX ))) return 0; - if (!realpath( path, real )) - { - free( real ); - real = NULL; - } - else path = real; - /* test the file type */ if ((fd = open( path, O_WRONLY )) != -1) { /* if file is not a regular file or has multiple links or is accessed * via symbolic links, write directly into it; otherwise use a temp file */ - if (by_symlink || - (!fstat( fd, &st ) && (!S_ISREG(st.st_mode) || st.st_nlink > 1))) + if (!lstat( path, &st ) && (!S_ISREG(st.st_mode) || st.st_nlink > 1)) { ftruncate( fd, 0 ); goto save; @@ -1610,7 +1592,6 @@ static int save_branch( struct key *key, const char *path ) done: free( tmp ); - free( real ); if (ret) make_clean( key ); return ret; } @@ -1620,9 +1601,11 @@ static void periodic_save( void *arg ) { int i; + if (fchdir( config_dir_fd ) == -1) return; save_timeout_user = NULL; for (i = 0; i < save_branch_count; i++) save_branch( save_branch_info[i].key, save_branch_info[i].path ); + if (fchdir( server_dir_fd ) == -1) fatal_perror( "chdir to server dir" ); set_periodic_save_timer(); } @@ -1638,6 +1621,7 @@ void flush_registry(void) { int i; + if (fchdir( config_dir_fd ) == -1) return; for (i = 0; i < save_branch_count; i++) { if (!save_branch( save_branch_info[i].key, save_branch_info[i].path )) @@ -1647,6 +1631,7 @@ void flush_registry(void) perror( " " ); } } + if (fchdir( server_dir_fd ) == -1) fatal_perror( "chdir to server dir" ); } diff --git a/server/request.c b/server/request.c index 9a2c7b1..8726e1c 100644 --- a/server/request.c +++ b/server/request.c @@ -120,6 +120,8 @@ static const struct fd_ops master_socket_fd_ops = struct thread *current = NULL; /* thread handling the current request */ unsigned int global_error = 0; /* global error code for when no thread is current */ timeout_t server_start_time = 0; /* server startup time */ +int server_dir_fd = -1; /* file descriptor for the server dir */ +int config_dir_fd = -1; /* file descriptor for the config dir */ static struct master_socket *master_socket; /* the master socket object */ static struct timeout_user *master_timeout; @@ -553,7 +555,8 @@ static void create_server_dir( const char *dir ) create_dir( server_dir, &st ); if (chdir( server_dir ) == -1) fatal_perror( "chdir %s", server_dir ); - if (stat( ".", &st2 ) == -1) fatal_perror( "stat %s", server_dir ); + if ((server_dir_fd = open( ".", O_RDONLY )) == -1) fatal_perror( "open %s", server_dir ); + if (fstat( server_dir_fd, &st2 ) == -1) fatal_perror( "stat %s", server_dir ); if (st.st_dev != st2.st_dev || st.st_ino != st2.st_ino) fatal_error( "chdir did not end up in %s\n", server_dir ); @@ -733,6 +736,7 @@ static void acquire_lock(void) void open_master_socket(void) { const char *server_dir = wine_get_server_dir(); + const char *config_dir = wine_get_config_dir(); int fd, pid, status, sync_pipe[2]; char dummy; @@ -740,7 +744,10 @@ void open_master_socket(void) assert( sizeof(union generic_request) == sizeof(struct request_max_size) ); assert( sizeof(union generic_reply) == sizeof(struct request_max_size) ); - if (!server_dir) fatal_error( "directory %s cannot be accessed\n", wine_get_config_dir() ); + if (!server_dir) fatal_error( "directory %s cannot be accessed\n", config_dir ); + if (chdir( config_dir ) == -1) fatal_perror( "chdir to %s", config_dir ); + if ((config_dir_fd = open( ".", O_RDONLY )) == -1) fatal_perror( "open %s", config_dir ); + create_server_dir( server_dir ); if (!foreground) diff --git a/server/request.h b/server/request.h index 283ad97..496c5ff 100644 --- a/server/request.h +++ b/server/request.h @@ -61,6 +61,7 @@ extern void close_master_socket( timeout_t timeout ); extern void shutdown_master_socket(void); extern int wait_for_lock(void); extern int kill_lock_owner( int sig ); +extern int server_dir_fd, config_dir_fd; extern void trace_request(void); extern void trace_reply( enum request req, const union generic_reply *reply );

1 0

James Hawkins : ole32: Fix a few tests that fail in win2k.
by Alexandre Julliard April 17, 2008

April 17, 2008

Module: wine Branch: master Commit: 1edb56cec8fc1dde3e41f6ee991d43804598f5ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=1edb56cec8fc1dde3e41f6ee9… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Apr 16 16:39:45 2008 -0500 ole32: Fix a few tests that fail in win2k. --- dlls/ole32/tests/marshal.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index acea854..a1b9c15 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2550,8 +2550,9 @@ static void test_local_server(void) hr = CoGetClassObject(&CLSID_WineOOPTest, CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER, NULL, &IID_IClassFactory, (LPVOID*)&cf); ok(hr == CO_E_SERVER_STOPPING || /* NT */ + hr == REGDB_E_CLASSNOTREG || /* win2k */ hr == S_OK /* Win9x */, - "CoGetClassObject should have returned CO_E_SERVER_STOPPING instead of 0x%08x\n", hr); + "CoGetClassObject should have returned CO_E_SERVER_STOPPING or REGDB_E_CLASSNOTREG instead of 0x%08x\n", hr); hr = CoRevokeClassObject(cookie); ok_ole_success(hr, CoRevokeClassObject); @@ -2594,8 +2595,9 @@ static DWORD CALLBACK get_global_interface_proc(LPVOID pv) IClassFactory *cf; hr = IGlobalInterfaceTable_GetInterfaceFromGlobal(params->git, params->cookie, &IID_IClassFactory, (void **)&cf); - ok(hr == CO_E_NOTINITIALIZED, - "IGlobalInterfaceTable_GetInterfaceFromGlobal should have failed with error CO_E_NOTINITIALIZED instead of 0x%08x\n", + ok(hr == CO_E_NOTINITIALIZED || + hr == E_UNEXPECTED, /* win2k */ + "IGlobalInterfaceTable_GetInterfaceFromGlobal should have failed with error CO_E_NOTINITIALIZED or E_UNEXPECTED instead of 0x%08x\n", hr); CoInitialize(NULL);

1 0

James Hawkins : fusion: Explicitly check for -1 for a missing table.
by Alexandre Julliard April 17, 2008

April 17, 2008

Module: wine Branch: master Commit: e52e5e67159753cdc0c5abfa409f71c0710dab47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e52e5e67159753cdc0c5abfa4… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Apr 16 11:48:31 2008 -0500 fusion: Explicitly check for -1 for a missing table. --- dlls/fusion/assembly.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index 024e611..eee889a 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -416,7 +416,7 @@ HRESULT assembly_get_name(ASSEMBLY *assembly, LPSTR *name) ULONG offset; offset = assembly->tables[0x20].offset; /* FIXME: add constants */ - if (offset < 0) + if (offset == -1) return E_FAIL; asmtbl = (ASSEMBLYTABLE *)assembly_data_offset(assembly, offset); @@ -527,7 +527,7 @@ HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPSTR *token) *token = NULL; offset = assembly->tables[0x20].offset; /* FIXME: add constants */ - if (offset < 0) + if (offset == -1) return E_FAIL; asmtbl = (ASSEMBLYTABLE *)assembly_data_offset(assembly, offset);

1 0

Hin-Tak Leung : hhctrl.ocx: Look up in chm if url doesn't contain "://".
by Alexandre Julliard April 17, 2008

April 17, 2008

Module: wine Branch: master Commit: 8988ab8f8d165b511c38395676c9fde88218b3ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=8988ab8f8d165b511c3839567… Author: Hin-Tak Leung <hintak_leung(a)yahoo.co.uk> Date: Mon Apr 14 20:17:27 2008 +0000 hhctrl.ocx: Look up in chm if url doesn't contain "://". --- dlls/hhctrl.ocx/help.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 900cfd9..a2081ce 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -89,9 +89,15 @@ BOOL NavigateToUrl(HHInfo *info, LPCWSTR surl) BOOL ret; HRESULT hres; - hres = navigate_url(info, surl); - if(SUCCEEDED(hres)) - return TRUE; + static const WCHAR url_indicator[] = {':', '/', '/'}; + + TRACE("%s\n", debugstr_w(surl)); + + if (strstrW(surl, url_indicator)) { + hres = navigate_url(info, surl); + if(SUCCEEDED(hres)) + return TRUE; + } /* look up in chm if it doesn't look like a full url */ SetChmPath(&chm_path, info->pCHMInfo->szFile, surl); ret = NavigateToChm(info, chm_path.chm_file, chm_path.chm_index);

1 0

Dmitry Timoshkov : winedump: Print names for all known EMF records.
by Alexandre Julliard April 17, 2008

April 17, 2008

Module: wine Branch: master Commit: d43758b2744be43e509ae06288fd60cd6a9ecb8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d43758b2744be43e509ae0628… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Apr 17 19:15:43 2008 +0900 winedump: Print names for all known EMF records. --- tools/winedump/emf.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 98 insertions(+), 1 deletions(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index f5375d0..7975e21 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -62,32 +62,129 @@ static int dump_emfrecord(void) switch(type) { EMRCASE(EMR_HEADER); + EMRCASE(EMR_POLYBEZIER); EMRCASE(EMR_POLYGON); EMRCASE(EMR_POLYLINE); + EMRCASE(EMR_POLYBEZIERTO); + EMRCASE(EMR_POLYLINETO); + EMRCASE(EMR_POLYPOLYLINE); + EMRCASE(EMR_POLYPOLYGON); EMRCASE(EMR_SETWINDOWEXTEX); EMRCASE(EMR_SETWINDOWORGEX); EMRCASE(EMR_SETVIEWPORTEXTEX); + EMRCASE(EMR_SETVIEWPORTORGEX); + EMRCASE(EMR_SETBRUSHORGEX); EMRCASE(EMR_EOF); + EMRCASE(EMR_SETPIXELV); + EMRCASE(EMR_SETMAPPERFLAGS); EMRCASE(EMR_SETMAPMODE); + EMRCASE(EMR_SETBKMODE); EMRCASE(EMR_SETPOLYFILLMODE); EMRCASE(EMR_SETROP2); + EMRCASE(EMR_SETSTRETCHBLTMODE); + EMRCASE(EMR_SETTEXTALIGN); + EMRCASE(EMR_SETCOLORADJUSTMENT); + EMRCASE(EMR_SETTEXTCOLOR); + EMRCASE(EMR_SETBKCOLOR); + EMRCASE(EMR_OFFSETCLIPRGN); + EMRCASE(EMR_MOVETOEX); + EMRCASE(EMR_SETMETARGN); + EMRCASE(EMR_EXCLUDECLIPRECT); + EMRCASE(EMR_INTERSECTCLIPRECT); + EMRCASE(EMR_SCALEVIEWPORTEXTEX); EMRCASE(EMR_SCALEWINDOWEXTEX); EMRCASE(EMR_SAVEDC); + EMRCASE(EMR_RESTOREDC); + EMRCASE(EMR_SETWORLDTRANSFORM); + EMRCASE(EMR_MODIFYWORLDTRANSFORM); EMRCASE(EMR_SELECTOBJECT); EMRCASE(EMR_CREATEPEN); EMRCASE(EMR_CREATEBRUSHINDIRECT); EMRCASE(EMR_DELETEOBJECT); + EMRCASE(EMR_ANGLEARC); + EMRCASE(EMR_ELLIPSE); EMRCASE(EMR_RECTANGLE); + EMRCASE(EMR_ROUNDRECT); + EMRCASE(EMR_ARC); + EMRCASE(EMR_CHORD); + EMRCASE(EMR_PIE); EMRCASE(EMR_SELECTPALETTE); + EMRCASE(EMR_CREATEPALETTE); + EMRCASE(EMR_SETPALETTEENTRIES); + EMRCASE(EMR_RESIZEPALETTE); + EMRCASE(EMR_REALIZEPALETTE); + EMRCASE(EMR_EXTFLOODFILL); + EMRCASE(EMR_LINETO); + EMRCASE(EMR_ARCTO); + EMRCASE(EMR_POLYDRAW); + EMRCASE(EMR_SETARCDIRECTION); + EMRCASE(EMR_SETMITERLIMIT); + EMRCASE(EMR_BEGINPATH); + EMRCASE(EMR_ENDPATH); + EMRCASE(EMR_CLOSEFIGURE); + EMRCASE(EMR_FILLPATH); + EMRCASE(EMR_STROKEANDFILLPATH); + EMRCASE(EMR_STROKEPATH); + EMRCASE(EMR_FLATTENPATH); + EMRCASE(EMR_WIDENPATH); + EMRCASE(EMR_SELECTCLIPPATH); + EMRCASE(EMR_ABORTPATH); EMRCASE(EMR_GDICOMMENT); + EMRCASE(EMR_FILLRGN); + EMRCASE(EMR_FRAMERGN); + EMRCASE(EMR_INVERTRGN); + EMRCASE(EMR_PAINTRGN); EMRCASE(EMR_EXTSELECTCLIPRGN); + EMRCASE(EMR_BITBLT); + EMRCASE(EMR_STRETCHBLT); + EMRCASE(EMR_MASKBLT); + EMRCASE(EMR_PLGBLT); + EMRCASE(EMR_SETDIBITSTODEVICE); + EMRCASE(EMR_STRETCHDIBITS); EMRCASE(EMR_EXTCREATEFONTINDIRECTW); + EMRCASE(EMR_EXTTEXTOUTA); EMRCASE(EMR_EXTTEXTOUTW); + EMRCASE(EMR_POLYBEZIER16); EMRCASE(EMR_POLYGON16); EMRCASE(EMR_POLYLINE16); + EMRCASE(EMR_POLYBEZIERTO16); + EMRCASE(EMR_POLYLINETO16); + EMRCASE(EMR_POLYPOLYLINE16); + EMRCASE(EMR_POLYPOLYGON16); + EMRCASE(EMR_POLYDRAW16); + EMRCASE(EMR_CREATEMONOBRUSH); + EMRCASE(EMR_CREATEDIBPATTERNBRUSHPT); + EMRCASE(EMR_EXTCREATEPEN); + EMRCASE(EMR_POLYTEXTOUTA); + EMRCASE(EMR_POLYTEXTOUTW); + EMRCASE(EMR_SETICMMODE); + EMRCASE(EMR_CREATECOLORSPACE); + EMRCASE(EMR_SETCOLORSPACE); + EMRCASE(EMR_DELETECOLORSPACE); + EMRCASE(EMR_GLSRECORD); + EMRCASE(EMR_GLSBOUNDEDRECORD); + EMRCASE(EMR_PIXELFORMAT); + EMRCASE(EMR_DRAWESCAPE); + EMRCASE(EMR_EXTESCAPE); + EMRCASE(EMR_STARTDOC); + EMRCASE(EMR_SMALLTEXTOUT); + EMRCASE(EMR_FORCEUFIMAPPING); + EMRCASE(EMR_NAMEDESCAPE); + EMRCASE(EMR_COLORCORRECTPALETTE); + EMRCASE(EMR_SETICMPROFILEA); + EMRCASE(EMR_SETICMPROFILEW); + EMRCASE(EMR_ALPHABLEND); + EMRCASE(EMR_SETLAYOUT); + EMRCASE(EMR_TRANSPARENTBLT); + EMRCASE(EMR_RESERVED_117); + EMRCASE(EMR_GRADIENTFILL); + EMRCASE(EMR_SETLINKEDUFI); + EMRCASE(EMR_SETTEXTJUSTIFICATION); + EMRCASE(EMR_COLORMATCHTOTARGETW); + EMRCASE(EMR_CREATECOLORSPACEW); default: - printf("%08x %08x\n",type,length); + printf("%u %08x\n", type, length); break; }

1 0

Vincent Povirk : tools: Modify wine.desktop to use start.exe /unix.
by Alexandre Julliard April 17, 2008

April 17, 2008

Module: wine Branch: master Commit: 790715123a27ae215ad9474c4aaea7547c393da7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=790715123a27ae215ad9474c4… Author: Vincent Povirk <madewokherd+d41d(a)gmail.com> Date: Sat Apr 12 20:31:00 2008 -0400 tools: Modify wine.desktop to use start.exe /unix. --- tools/wine.desktop | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.desktop b/tools/wine.desktop index a499530..2be9b53 100644 --- a/tools/wine.desktop +++ b/tools/wine.desktop @@ -7,6 +7,6 @@ Name[nl]=Wine Windows-emulator Name[sv]=Windows-emulatorn Wine Name[ru]=Wine Эмулятор Windows Name[fr]=Émulateur Windows Wine -Exec=wine %f +Exec=wine start /unix %f MimeType=application/x-ms-dos-executable;application/x-msdos-program;application/x-msdownload;application/exe;application/x-exe;application/dos-exe;vms/exe;application/x-winexe;application/msdos-windows;application/x-zip-compressed;application/x-executable; NoDisplay=true

1 0

Dmitry Timoshkov : winex11.drv: Map zero-sized windows but don' t add WM decoration to them.
by Alexandre Julliard April 17, 2008

April 17, 2008

Module: wine Branch: master Commit: 15c0bcb3d8eff7c38def24b58633bb1d6116d8c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15c0bcb3d8eff7c38def24b58… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Apr 16 16:50:29 2008 +0900 winex11.drv: Map zero-sized windows but don't add WM decoration to them. --- dlls/winex11.drv/window.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ab63f3b..e0e8ea1 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -113,9 +113,6 @@ BOOL is_window_managed( HWND hwnd, UINT swp_flags, const RECT *window_rect ) */ BOOL X11DRV_is_window_rect_mapped( const RECT *rect ) { - /* don't map if rect is empty */ - if (IsRectEmpty( rect )) return FALSE; - /* don't map if rect is off-screen */ if (rect->left >= virtual_screen_rect.right || rect->top >= virtual_screen_rect.bottom || @@ -144,11 +141,14 @@ static inline BOOL is_window_resizable( struct x11drv_win_data *data, DWORD styl /*********************************************************************** * get_mwm_decorations */ -static unsigned long get_mwm_decorations( DWORD style, DWORD ex_style ) +static unsigned long get_mwm_decorations( struct x11drv_win_data *data, + DWORD style, DWORD ex_style ) { unsigned long ret = 0; - if (!decorated_mode) return ret; + if (!decorated_mode) return 0; + + if (IsRectEmpty( &data->window_rect )) return 0; if (ex_style & WS_EX_TOOLWINDOW) return 0; @@ -180,7 +180,7 @@ static void get_x11_rect_offset( struct x11drv_win_data *data, RECT *rect ) style = GetWindowLongW( data->hwnd, GWL_STYLE ); ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); - decor = get_mwm_decorations( style, ex_style ); + decor = get_mwm_decorations( data, style, ex_style ); if (decor & MWM_DECOR_TITLE) style_mask |= WS_CAPTION; if (decor & MWM_DECOR_BORDER) @@ -876,7 +876,7 @@ void X11DRV_set_wm_hints( Display *display, struct x11drv_win_data *data ) XA_ATOM, 32, PropModeReplace, (unsigned char*)&window_type, 1); mwm_hints.flags = MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS; - mwm_hints.decorations = get_mwm_decorations( style, ex_style ); + mwm_hints.decorations = get_mwm_decorations( data, style, ex_style ); mwm_hints.functions = MWM_FUNC_MOVE; if (is_window_resizable( data, style )) mwm_hints.functions |= MWM_FUNC_RESIZE; if (style & WS_MINIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MINIMIZE;

1 0

Hin-Tak Leung : hhctrl.ocx: Return help window handle to caller.
by Alexandre Julliard April 17, 2008

April 17, 2008

Module: wine Branch: master Commit: 76299b37ea61c23faa429c1489ba2952a5aa86ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=76299b37ea61c23faa429c148… Author: Hin-Tak Leung <htl10(a)users.sourceforge.net> Date: Wed Apr 16 01:03:49 2008 +0000 hhctrl.ocx: Return help window handle to caller. --- dlls/hhctrl.ocx/hhctrl.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 472b7cf..c0054de 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -132,8 +132,7 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat if(!res) ReleaseHelpViewer(info); } - - return NULL; /* FIXME */ + return info->WinType.hwndHelp; } case HH_HELP_CONTEXT: { HHInfo *info; @@ -149,8 +148,7 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat NavigateToUrl(info, url); heap_free(url); - - return NULL; /* FIXME */ + return info->WinType.hwndHelp; } case HH_PRETRANSLATEMESSAGE: { static BOOL warned = FALSE;

1 0

Alistair Leslie-Hughes : msxml3: Implement transformNode.
by Alexandre Julliard April 17, 2008

April 17, 2008

Module: wine Branch: master Commit: 880bacb5f10dcbb55cc1bd94b7bf5705510ea5f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=880bacb5f10dcbb55cc1bd94b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 26 19:52:36 2008 +1100 msxml3: Implement transformNode. --- dlls/msxml3/main.c | 10 ++++++ dlls/msxml3/node.c | 66 ++++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 75 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 150 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 7f03948..7296690 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -35,6 +35,10 @@ #include "msxml_private.h" +#ifdef HAVE_LIBXSLT +#include <libxslt/xslt.h> +#endif + WINE_DEFAULT_DEBUG_CHANNEL(msxml); static HINSTANCE hInstance; @@ -171,10 +175,16 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) #ifdef HAVE_LIBXML2 xmlInitParser(); #endif +#ifdef HAVE_LIBXSLT + xsltInit(); +#endif hInstance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); break; case DLL_PROCESS_DETACH: +#ifdef HAVE_LIBXSLT + xsltCleanupGlobals(); +#endif #ifdef HAVE_LIBXML2 xmlCleanupParser(); process_detach(); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index ee4e1b2..7506460 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -33,6 +33,17 @@ #include "msxml_private.h" +#ifdef HAVE_LIBXSLT +# ifdef HAVE_LIBXSLT_PATTERN_H +# include <libxslt/pattern.h> +# endif +# ifdef HAVE_LIBXSLT_TRANSFORM_H +# include <libxslt/transform.h> +# endif +# include <libxslt/xsltutils.h> +# include <libxslt/xsltInternals.h> +#endif + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msxml); @@ -1030,8 +1041,61 @@ static HRESULT WINAPI xmlnode_transformNode( IXMLDOMNode* styleSheet, BSTR* xmlString) { - FIXME("\n"); +#ifdef HAVE_LIBXSLT + xmlnode *This = impl_from_IXMLDOMNode( iface ); + xmlnode *pStyleSheet = NULL; + xsltStylesheetPtr xsltSS = NULL; + xmlDocPtr result = NULL; + IXMLDOMNode *ssNew; + + TRACE("%p %p %p\n", This, styleSheet, xmlString); + + if(!styleSheet || !xmlString) + return E_INVALIDARG; + + *xmlString = NULL; + + if(IXMLDOMNode_QueryInterface(styleSheet, &IID_IXMLDOMNode, (LPVOID)&ssNew) == S_OK) + { + pStyleSheet = impl_from_IXMLDOMNode( ssNew ); + + xsltSS = xsltParseStylesheetDoc( pStyleSheet->node->doc); + if(xsltSS) + { + result = xsltApplyStylesheet(xsltSS, This->node->doc, NULL); + if(result) + { + xmlBufferPtr pXmlBuf; + int nSize; + + pXmlBuf = xmlBufferCreate(); + if(pXmlBuf) + { + nSize = xmlNodeDump(pXmlBuf, NULL, (xmlNodePtr)result, 0, 0); + if(nSize > 0) + { + const xmlChar *pContent; + + pContent = xmlBufferContent(pXmlBuf); + *xmlString = bstr_from_xmlChar(pContent); + + xmlBufferFree(pXmlBuf); + } + } + } + } + + IXMLDOMNode_Release(ssNew); + } + + if(*xmlString == NULL) + *xmlString = SysAllocStringLen(NULL, 0); + + return S_OK; +#else + FIXME("libxslt headers were not found at compile time\n"); return E_NOTIMPL; +#endif } static HRESULT WINAPI xmlnode_selectNodes( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 9c6eb66..32d3b93 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -119,6 +119,35 @@ static const CHAR szExampleXML[] = " </elem>\n" "</root>\n"; +static const CHAR szTransformXML[] = +"<?xml version=\"1.0\"?>\n" +"<greeting>\n" +"Hello World\n" +"</greeting>"; + +static const CHAR szTransformSSXML[] = +"<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" version=\"1.0\">\n" +" <xsl:output method=\"html\"/>\n" +" <xsl:template match=\"/\">\n" +" <xsl:apply-templates select=\"greeting\"/>\n" +" </xsl:template>\n" +" <xsl:template match=\"greeting\">\n" +" <html>\n" +" <body>\n" +" <h1>\n" +" <xsl:value-of select=\".\"/>\n" +" </h1>\n" +" </body>\n" +" </html>\n" +" </xsl:template>\n" +"</xsl:stylesheet>"; + +static const CHAR szTransformOutput[] = +"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" +"<html><body><h1>\n" +"Hello World\n" +"</h1></body></html>\n"; + static const WCHAR szNonExistentFile[] = { 'c', ':', '\\', 'N', 'o', 'n', 'e', 'x', 'i', 's', 't', 'e', 'n', 't', '.', 'x', 'm', 'l', 0 }; @@ -3130,6 +3159,51 @@ static void test_DocumentSaveToDocument(void) IXMLDOMDocument_Release(doc); } +static void test_testTransforms(void) +{ + IXMLDOMDocument *doc = NULL; + IXMLDOMDocument *docSS = NULL; + IXMLDOMNode *pNode; + VARIANT_BOOL bSucc; + + HRESULT hr; + + hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc ); + if( hr != S_OK ) + return; + + hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&docSS ); + if( hr != S_OK ) + { + IXMLDOMDocument_Release(doc); + return; + } + + hr = IXMLDOMDocument_loadXML(doc, _bstr_(szTransformXML), &bSucc); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMDocument_loadXML(docSS, _bstr_(szTransformSSXML), &bSucc); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMDocument_QueryInterface(docSS, &IID_IXMLDOMNode, (LPVOID*)&pNode ); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + BSTR bOut; + + hr = IXMLDOMDocument_transformNode(doc, pNode, &bOut); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( bOut, _bstr_(szTransformOutput) ), "Stylesheet output not correct\n"); + + IXMLDOMNode_Release(pNode); + } + + IXMLDOMDocument_Release(docSS); + IXMLDOMDocument_Release(doc); + + free_bstrs(); +} + START_TEST(domdoc) { HRESULT r; @@ -3152,6 +3226,7 @@ START_TEST(domdoc) test_xmlTypes(); test_nodeTypeTests(); test_DocumentSaveToDocument(); + test_testTransforms(); CoUninitialize(); }

1 0