Ros-diffs April 2014

ros-diffs@reactos.org

15 participants
492 discussions

[akhaldi] 62918: [MSI] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 23 14:48:52 2014 New Revision: 62918 URL: http://svn.reactos.org/svn/reactos?rev=62918&view=rev Log: [MSI] * Sync with Wine 1.7.17. CORE-8080 Added: trunk/reactos/dll/win32/msi/msiserver_r.rgs - copied, changed from r62887, trunk/reactos/dll/win32/msi/msi.rgs trunk/reactos/dll/win32/msi/msiserver_t.rgs (with props) Removed: trunk/reactos/dll/win32/msi/msi.rgs Modified: trunk/reactos/dll/win32/msi/action.c trunk/reactos/dll/win32/msi/classes.c trunk/reactos/dll/win32/msi/custom.c trunk/reactos/dll/win32/msi/dialog.c trunk/reactos/dll/win32/msi/format.c trunk/reactos/dll/win32/msi/media.c trunk/reactos/dll/win32/msi/msi.c trunk/reactos/dll/win32/msi/msi.rc trunk/reactos/dll/win32/msi/msipriv.h trunk/reactos/dll/win32/msi/msiserver.idl trunk/reactos/dll/win32/msi/msiserver.rgs trunk/reactos/dll/win32/msi/package.c trunk/reactos/dll/win32/msi/record.c trunk/reactos/dll/win32/msi/source.c trunk/reactos/dll/win32/msi/sql.y trunk/reactos/dll/win32/msi/table.c trunk/reactos/include/psdk/msi.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/action.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/action.c [iso-8859-1] Wed Apr 23 14:48:52 2014 @@ -195,19 +195,20 @@ enum parse_state state = state_quote; const WCHAR *p; WCHAR *out = value; - int ignore, in_quotes = 0, count = 0, len = 0; + BOOL ignore, in_quotes = FALSE; + int count = 0, len = 0; for (p = str; *p; p++) { - ignore = 0; + ignore = FALSE; switch (state) { case state_whitespace: switch (*p) { case ' ': - in_quotes = 1; - ignore = 1; + in_quotes = TRUE; + ignore = TRUE; len++; break; case '"': @@ -217,7 +218,7 @@ break; default: state = state_token; - in_quotes = 1; + in_quotes = TRUE; len++; break; } @@ -234,12 +235,12 @@ case ' ': state = state_whitespace; if (!count) goto done; - in_quotes = 1; + in_quotes = TRUE; len++; break; default: - if (!count) in_quotes = 0; - else in_quotes = 1; + if (!count) in_quotes = FALSE; + else in_quotes = TRUE; len++; break; } @@ -255,13 +256,13 @@ case ' ': state = state_whitespace; if (!count || (count > 1 && !len)) goto done; - in_quotes = 1; + in_quotes = TRUE; len++; break; default: state = state_token; - if (!count) in_quotes = 0; - else in_quotes = 1; + if (!count) in_quotes = FALSE; + else in_quotes = TRUE; len++; break; } @@ -407,41 +408,21 @@ UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace) { - LPWSTR source, check; - - if (msi_get_property_int( package->db, szInstalled, 0 )) - { - HKEY hkey; - - MSIREG_OpenInstallProps( package->ProductCode, package->Context, NULL, &hkey, FALSE ); - source = msi_reg_get_val_str( hkey, INSTALLPROPERTY_INSTALLSOURCEW ); - RegCloseKey( hkey ); - } - else - { - LPWSTR p, db; - DWORD len; - - db = msi_dup_property( package->db, szOriginalDatabase ); - if (!db) - return ERROR_OUTOFMEMORY; - - p = strrchrW( db, '\\' ); - if (!p) - { - p = strrchrW( db, '/' ); - if (!p) - { - msi_free(db); - return ERROR_SUCCESS; - } - } - - len = p - db + 2; - source = msi_alloc( len * sizeof(WCHAR) ); - lstrcpynW( source, db, len ); - msi_free( db ); - } + WCHAR *source, *check, *p, *db; + DWORD len; + + if (!(db = msi_dup_property( package->db, szOriginalDatabase ))) + return ERROR_OUTOFMEMORY; + + if (!(p = strrchrW( db, '\\' )) && !(p = strrchrW( db, '/' ))) + { + msi_free(db); + return ERROR_SUCCESS; + } + len = p - db + 2; + source = msi_alloc( len * sizeof(WCHAR) ); + lstrcpynW( source, db, len ); + msi_free( db ); check = msi_dup_property( package->db, szSourceDir ); if (!check || replace) @@ -1890,7 +1871,7 @@ component->anyAbsent = 1; break; case INSTALLSTATE_ADVERTISED: - component->hasAdvertiseFeature = 1; + component->hasAdvertisedFeature = 1; break; case INSTALLSTATE_SOURCE: component->hasSourceFeature = 1; @@ -1900,7 +1881,7 @@ break; case INSTALLSTATE_DEFAULT: if (feature->Attributes & msidbFeatureAttributesFavorAdvertise) - component->hasAdvertiseFeature = 1; + component->hasAdvertisedFeature = 1; else if (feature->Attributes & msidbFeatureAttributesFavorSource) component->hasSourceFeature = 1; else @@ -1945,7 +1926,7 @@ component->ActionRequest = INSTALLSTATE_SOURCE; continue; } - if (component->hasAdvertiseFeature) + if (component->hasAdvertisedFeature) { component->Action = INSTALLSTATE_ADVERTISED; component->ActionRequest = INSTALLSTATE_ADVERTISED; @@ -3181,8 +3162,6 @@ static UINT ACTION_InstallInitialize(MSIPACKAGE *package) { - package->script->CurrentlyScripting = TRUE; - return ERROR_SUCCESS; } @@ -3569,9 +3548,29 @@ if (comp->num_clients <= 0) { if (package->Context == MSIINSTALLCONTEXT_MACHINE) - MSIREG_DeleteUserDataComponentKey( comp->ComponentId, szLocalSid ); + rc = MSIREG_DeleteUserDataComponentKey( comp->ComponentId, szLocalSid ); else - MSIREG_DeleteUserDataComponentKey( comp->ComponentId, NULL ); + rc = MSIREG_DeleteUserDataComponentKey( comp->ComponentId, NULL ); + + if (rc != ERROR_SUCCESS) WARN( "failed to delete component key %u\n", rc ); + } + else + { + LONG res; + + if (package->Context == MSIINSTALLCONTEXT_MACHINE) + rc = MSIREG_OpenUserDataComponentKey( comp->ComponentId, szLocalSid, &hkey, FALSE ); + else + rc = MSIREG_OpenUserDataComponentKey( comp->ComponentId, NULL, &hkey, FALSE ); + + if (rc != ERROR_SUCCESS) + { + WARN( "failed to open component key %u\n", rc ); + continue; + } + res = RegDeleteValueW( hkey, squished_pc ); + RegCloseKey(hkey); + if (res) WARN( "failed to delete component value %d\n", res ); } } @@ -3823,7 +3822,7 @@ filename = msi_dup_record_field( row, 3 ); msi_reduce_to_long_filename( filename ); - extension = strchrW( filename, '.' ); + extension = strrchrW( filename, '.' ); if (!extension || strcmpiW( extension, szlnk )) { int len = strlenW( filename ); @@ -5294,9 +5293,6 @@ UINT rc; WCHAR *remove; - /* turn off scheduling */ - package->script->CurrentlyScripting= FALSE; - /* first do the same as an InstallExecute */ rc = ACTION_InstallExecute(package); if (rc != ERROR_SUCCESS) @@ -5801,7 +5797,11 @@ ERR("Query failed\n"); goto done; } - key = MSI_RecordGetString(row, 6); + if (!(key = MSI_RecordGetString(row, 6))) + { + msiobj_release(&row->hdr); + goto done; + } file = msi_get_loaded_file(package, key); msiobj_release(&row->hdr); if (!file) @@ -7823,8 +7823,6 @@ else rc = ACTION_ProcessExecSequence(package, FALSE); - package->script->CurrentlyScripting = FALSE; - /* process the ending type action */ if (rc == ERROR_SUCCESS) ACTION_PerformActionSequence(package, -1); Modified: trunk/reactos/dll/win32/msi/classes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/classes.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/classes.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/classes.c [iso-8859-1] Wed Apr 23 14:48:52 2014 @@ -287,7 +287,7 @@ cls->Feature = msi_get_loaded_feature(package, buffer); cls->Attributes = MSI_RecordGetInteger(row,13); - + cls->action = INSTALLSTATE_UNKNOWN; return cls; } @@ -416,7 +416,7 @@ buffer = MSI_RecordGetString(row,5); ext->Feature = msi_get_loaded_feature( package, buffer ); - + ext->action = INSTALLSTATE_UNKNOWN; return ext; } @@ -687,59 +687,6 @@ if (r != ERROR_SUCCESS) return r; return load_all_mimes( package ); -} - -static void mark_progid_for_install( MSIPACKAGE* package, MSIPROGID *progid ) -{ - MSIPROGID *child; - - if (!progid) - return; - - if (progid->InstallMe) - return; - - progid->InstallMe = TRUE; - - /* all children if this is a parent also install */ - LIST_FOR_EACH_ENTRY( child, &package->progids, MSIPROGID, entry ) - { - if (child->Parent == progid) - mark_progid_for_install( package, child ); - } -} - -static void mark_progid_for_uninstall( MSIPACKAGE *package, MSIPROGID *progid ) -{ - MSIPROGID *child; - - if (!progid) - return; - - if (!progid->InstallMe) - return; - - progid->InstallMe = FALSE; - - LIST_FOR_EACH_ENTRY( child, &package->progids, MSIPROGID, entry ) - { - if (child->Parent == progid) - mark_progid_for_uninstall( package, child ); - } -} - -static void mark_mime_for_install( MSIMIME *mime ) -{ - if (!mime) - return; - mime->InstallMe = TRUE; -} - -static void mark_mime_for_uninstall( MSIMIME *mime ) -{ - if (!mime) - return; - mime->InstallMe = FALSE; } static UINT register_appid(const MSIAPPID *appid, LPCWSTR app ) @@ -847,8 +794,7 @@ } TRACE("Registering class %s (%p)\n", debugstr_w(cls->clsid), cls); - cls->Installed = TRUE; - mark_progid_for_install( package, cls->ProgID ); + cls->action = INSTALLSTATE_LOCAL; RegCreateKeyW( hkey, cls->clsid, &hkey2 ); @@ -1005,8 +951,7 @@ } TRACE("Unregistering class %s (%p)\n", debugstr_w(cls->clsid), cls); - cls->Installed = FALSE; - mark_progid_for_uninstall( package, cls->ProgID ); + cls->action = INSTALLSTATE_ABSENT; res = RegDeleteTreeW( hkey, cls->clsid ); if (res != ERROR_SUCCESS) @@ -1094,6 +1039,35 @@ return rc; } +static const MSICLASS *get_progid_class( const MSIPROGID *progid ) +{ + while (progid) + { + if (progid->Parent) progid = progid->Parent; + if (progid->Class) return progid->Class; + if (!progid->Parent || progid->Parent == progid) break; + } + return NULL; +} + +static BOOL has_class_installed( const MSIPROGID *progid ) +{ + const MSICLASS *class = get_progid_class( progid ); + if (!class || !class->ProgID) return FALSE; + return (class->action == INSTALLSTATE_LOCAL); +} + +static BOOL has_one_extension_installed( const MSIPACKAGE *package, const MSIPROGID *progid ) +{ + const MSIEXTENSION *extension; + LIST_FOR_EACH_ENTRY( extension, &package->extensions, MSIEXTENSION, entry ) + { + if (extension->ProgID == progid && !list_empty( &extension->verbs ) && + extension->action == INSTALLSTATE_LOCAL) return TRUE; + } + return FALSE; +} + UINT ACTION_RegisterProgIdInfo(MSIPACKAGE *package) { MSIPROGID *progid; @@ -1106,17 +1080,11 @@ LIST_FOR_EACH_ENTRY( progid, &package->progids, MSIPROGID, entry ) { - /* check if this progid is to be installed */ - if (progid->Class && progid->Class->Installed) - progid->InstallMe = TRUE; - - if (!progid->InstallMe) - { - TRACE("progid %s not scheduled to be installed\n", - debugstr_w(progid->ProgID)); - continue; - } - + if (!has_class_installed( progid ) && !has_one_extension_installed( package, progid )) + { + TRACE("progid %s not scheduled to be installed\n", debugstr_w(progid->ProgID)); + continue; + } TRACE("Registering progid %s\n", debugstr_w(progid->ProgID)); register_progid( progid ); @@ -1129,6 +1097,36 @@ return ERROR_SUCCESS; } +static BOOL has_class_removed( const MSIPROGID *progid ) +{ + const MSICLASS *class = get_progid_class( progid ); + if (!class || !class->ProgID) return FALSE; + return (class->action == INSTALLSTATE_ABSENT); +} + +static BOOL has_extensions( const MSIPACKAGE *package, const MSIPROGID *progid ) +{ + const MSIEXTENSION *extension; + LIST_FOR_EACH_ENTRY( extension, &package->extensions, MSIEXTENSION, entry ) + { + if (extension->ProgID == progid && !list_empty( &extension->verbs )) return TRUE; + } + return FALSE; +} + +static BOOL has_all_extensions_removed( const MSIPACKAGE *package, const MSIPROGID *progid ) +{ + BOOL ret = FALSE; + const MSIEXTENSION *extension; + LIST_FOR_EACH_ENTRY( extension, &package->extensions, MSIEXTENSION, entry ) + { + if (extension->ProgID == progid && !list_empty( &extension->verbs ) && + extension->action == INSTALLSTATE_ABSENT) ret = TRUE; + else ret = FALSE; + } + return ret; +} + UINT ACTION_UnregisterProgIdInfo( MSIPACKAGE *package ) { MSIPROGID *progid; @@ -1142,16 +1140,12 @@ LIST_FOR_EACH_ENTRY( progid, &package->progids, MSIPROGID, entry ) { - /* check if this progid is to be removed */ - if (progid->Class && !progid->Class->Installed) - progid->InstallMe = FALSE; - - if (progid->InstallMe) + if (!has_class_removed( progid ) || + (has_extensions( package, progid ) && !has_all_extensions_removed( package, progid ))) { TRACE("progid %s not scheduled to be removed\n", debugstr_w(progid->ProgID)); continue; } - TRACE("Unregistering progid %s\n", debugstr_w(progid->ProgID)); res = RegDeleteTreeW( HKEY_CLASSES_ROOT, progid->ProgID ); @@ -1293,15 +1287,7 @@ } TRACE("Registering extension %s (%p)\n", debugstr_w(ext->Extension), ext); - ext->Installed = TRUE; - - /* this is only registered if the extension has at least 1 verb - * according to MSDN - */ - if (ext->ProgID && !list_empty( &ext->verbs ) ) - mark_progid_for_install( package, ext->ProgID ); - - mark_mime_for_install(ext->Mime); + ext->action = INSTALLSTATE_LOCAL; extension = msi_alloc( (strlenW( ext->Extension ) + 2) * sizeof(WCHAR) ); if (extension) @@ -1399,12 +1385,7 @@ } TRACE("Unregistering extension %s\n", debugstr_w(ext->Extension)); - ext->Installed = FALSE; - - if (ext->ProgID && !list_empty( &ext->verbs )) - mark_progid_for_uninstall( package, ext->ProgID ); - - mark_mime_for_uninstall( ext->Mime ); + ext->action = INSTALLSTATE_ABSENT; extension = msi_alloc( (strlenW( ext->Extension ) + 2) * sizeof(WCHAR) ); if (extension) @@ -1468,11 +1449,8 @@ * check if the MIME is to be installed. Either as requested by an * extension or Class */ - mt->InstallMe = (mt->InstallMe || - (mt->Class && mt->Class->Installed) || - (mt->Extension && mt->Extension->Installed)); - - if (!mt->InstallMe) + if ((!mt->Class || mt->Class->action != INSTALLSTATE_LOCAL) && + mt->Extension->action != INSTALLSTATE_LOCAL) { TRACE("MIME %s not scheduled to be installed\n", debugstr_w(mt->ContentType)); continue; @@ -1522,11 +1500,8 @@ LONG res; LPWSTR mime_key; - mime->InstallMe = (mime->InstallMe || - (mime->Class && mime->Class->Installed) || - (mime->Extension && mime->Extension->Installed)); - - if (mime->InstallMe) + if ((!mime->Class || mime->Class->action != INSTALLSTATE_ABSENT) && + mime->Extension->action != INSTALLSTATE_ABSENT) { TRACE("MIME %s not scheduled to be removed\n", debugstr_w(mime->ContentType)); continue; Modified: trunk/reactos/dll/win32/msi/custom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/custom.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/custom.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/custom.c [iso-8859-1] Wed Apr 23 14:48:52 2014 @@ -203,8 +203,8 @@ DWORD sz = MAX_PATH, write; UINT r; - if (msi_get_property(package->db, szTempFolder, fmt, &sz) != ERROR_SUCCESS) - GetTempPathW(MAX_PATH, fmt); + if (msi_get_property(package->db, szTempFolder, fmt, &sz) != ERROR_SUCCESS || + GetFileAttributesW(fmt) == INVALID_FILE_ATTRIBUTES) GetTempPathW(MAX_PATH, fmt); if (!GetTempFileNameW( fmt, szMsi, 0, tmpfile )) { @@ -991,7 +991,7 @@ 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', '`','B','i' ,'n','a','r','y','`',' ','W','H','E','R','E',' ', '`','N','a','m','e','`',' ','=',' ','\'','%','s','\'',0}; - MSIRECORD *row = 0; + MSIRECORD *row = NULL; msi_custom_action_info *info; CHAR *buffer = NULL; WCHAR *bufferw = NULL; @@ -1005,10 +1005,14 @@ return ERROR_FUNCTION_FAILED; r = MSI_RecordReadStream(row, 2, NULL, &sz); - if (r != ERROR_SUCCESS) return r; + if (r != ERROR_SUCCESS) goto done; buffer = msi_alloc( sz + 1 ); - if (!buffer) return ERROR_FUNCTION_FAILED; + if (!buffer) + { + r = ERROR_FUNCTION_FAILED; + goto done; + } r = MSI_RecordReadStream(row, 2, buffer, &sz); if (r != ERROR_SUCCESS) @@ -1028,6 +1032,7 @@ done: msi_free(bufferw); msi_free(buffer); + msiobj_release(&row->hdr); return r; } Modified: trunk/reactos/dll/win32/msi/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/dialog.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/dialog.c [iso-8859-1] Wed Apr 23 14:48:52 2014 @@ -763,12 +763,13 @@ MSIRECORD *rec, LPCWSTR szCls, DWORD style ) { DWORD attributes; - LPCWSTR text, name; + const WCHAR *text = NULL, *name, *control_type; DWORD exstyle = 0; name = MSI_RecordGetString( rec, 2 ); + control_type = MSI_RecordGetString( rec, 3 ); attributes = MSI_RecordGetInteger( rec, 8 ); - text = MSI_RecordGetString( rec, 10 ); + if (strcmpW( control_type, szScrollableText )) text = MSI_RecordGetString( rec, 10 ); TRACE("%s, %s, %08x, %s, %08x\n", debugstr_w(szCls), debugstr_w(name), attributes, debugstr_w(text), style); @@ -1802,24 +1803,33 @@ val = msi_alloc( (info->num_chars+1)*sizeof(WCHAR) ); for( i=0, n=0; i<info->num_groups; i++ ) { - if( (info->group[i].len + n) > info->num_chars ) + if (info->group[i].len == ~0u) { - ERR("can't fit control %d text into template\n",i); - break; - } - if (!msi_mask_editable(info->group[i].type)) - { - for(r=0; r<info->group[i].len; r++) - val[n+r] = info->group[i].type; - val[n+r] = 0; + UINT len = SendMessageW( info->group[i].hwnd, WM_GETTEXTLENGTH, 0, 0 ); + val = msi_realloc( val, (len + 1) * sizeof(WCHAR) ); + GetWindowTextW( info->group[i].hwnd, val, len + 1 ); } else { - r = GetWindowTextW( info->group[i].hwnd, &val[n], info->group[i].len+1 ); - if( r != info->group[i].len ) + if (info->group[i].len + n > info->num_chars) + { + ERR("can't fit control %d text into template\n",i); break; + } + if (!msi_mask_editable(info->group[i].type)) + { + for(r=0; r<info->group[i].len; r++) + val[n+r] = info->group[i].type; + val[n+r] = 0; + } + else + { + r = GetWindowTextW( info->group[i].hwnd, &val[n], info->group[i].len+1 ); + if( r != info->group[i].len ) + break; + } + n += r; } - n += r; } TRACE("%d/%d controls were good\n", i, info->num_groups); @@ -1914,14 +1924,14 @@ static struct msi_maskedit_info * msi_dialog_parse_groups( LPCWSTR mask ) { - struct msi_maskedit_info * info = NULL; + struct msi_maskedit_info *info; int i = 0, n = 0, total = 0; LPCWSTR p; TRACE("masked control, template %s\n", debugstr_w(mask)); if( !mask ) - return info; + return NULL; info = msi_alloc_zero( sizeof *info ); if( !info ) @@ -1937,7 +1947,16 @@ { /* stop at the end of the string */ if( p[0] == 0 || p[0] == '>' ) + { + if (!total) + { + /* create a group for the empty mask */ + info->group[0].type = '&'; + info->group[0].len = ~0u; + i = 1; + } break; + } /* count the number of the same identifier */ for( n=0; p[n] == p[0]; n++ ) @@ -1983,9 +2002,16 @@ { if (!msi_mask_editable( info->group[i].type )) continue; - wx = (info->group[i].ofs * width) / info->num_chars; - ww = (info->group[i].len * width) / info->num_chars; - + if (info->num_chars) + { + wx = (info->group[i].ofs * width) / info->num_chars; + ww = (info->group[i].len * width) / info->num_chars; + } + else + { + wx = 0; + ww = width; + } hwnd = CreateWindowW( szEdit, NULL, style, wx, 0, ww, height, info->hwnd, NULL, NULL, NULL ); if( !hwnd ) @@ -2969,7 +2995,7 @@ FindClose( file ); } -UINT msi_dialog_directorylist_up( msi_dialog *dialog ) +static UINT msi_dialog_directorylist_up( msi_dialog *dialog ) { msi_control *control; LPWSTR prop, path, ptr; @@ -3472,7 +3498,7 @@ return r; } -UINT msi_dialog_reset( msi_dialog *dialog ) +static UINT msi_dialog_reset( msi_dialog *dialog ) { /* FIXME: should restore the original values of any properties we changed */ return msi_dialog_evaluate_control_conditions( dialog ); @@ -3906,7 +3932,7 @@ return dialog; } -void msi_dialog_end_dialog( msi_dialog *dialog ) +static void msi_dialog_end_dialog( msi_dialog *dialog ) { TRACE("%p\n", dialog); dialog->finished = 1; @@ -3933,7 +3959,7 @@ return; } - /* there's two choices for the UI thread */ + /* there are two choices for the UI thread */ while (1) { process_pending_messages( NULL ); Modified: trunk/reactos/dll/win32/msi/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/format.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/format.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/format.c [iso-8859-1] Wed Apr 23 14:48:52 2014 @@ -354,7 +354,11 @@ { max_len = len; buf = msi_realloc(buf, (max_len + 1) * sizeof(WCHAR)); - if (!buf) return NULL; + if (!buf) + { + msi_free(rc); + return NULL; + } } if (str) @@ -715,10 +719,10 @@ format->n = n; beg = format_replace( format, propfound, nonprop, oldsize, type, replaced, len ); + msi_free(replaced); if (!beg) return ERROR_SUCCESS; - msi_free(replaced); format->n = beg->n + beg->len; top = stack_peek(stack); Modified: trunk/reactos/dll/win32/msi/media.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/media.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/media.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/media.c [iso-8859-1] Wed Apr 23 14:48:52 2014 @@ -126,7 +126,6 @@ static INT_PTR CDECL cabinet_open(char *pszFile, int oflag, int pmode) { - HANDLE handle; DWORD dwAccess = 0; DWORD dwShareMode = 0; DWORD dwCreateDisposition = OPEN_EXISTING; @@ -152,12 +151,8 @@ else if (oflag & _O_CREAT) dwCreateDisposition = CREATE_ALWAYS; - handle = CreateFileA(pszFile, dwAccess, dwShareMode, NULL, - dwCreateDisposition, 0, NULL); - if (handle == INVALID_HANDLE_VALUE) - return 0; - - return (INT_PTR)handle; + return (INT_PTR)CreateFileA(pszFile, dwAccess, dwShareMode, NULL, + dwCreateDisposition, 0, NULL); } static UINT CDECL cabinet_read(INT_PTR hf, void *pv, UINT cb) @@ -214,12 +209,12 @@ if (!cab) { WARN("failed to get cabinet stream\n"); - return 0; + return -1; } if (!cab->stream[0] || !(encoded = encode_streamname( FALSE, cab->stream + 1 ))) { WARN("failed to encode stream name\n"); - return 0; + return -1; } if (msi_clone_open_stream( package_disk.package->db, cab->storage, encoded, &stream ) != ERROR_SUCCESS) { @@ -228,7 +223,7 @@ { WARN("failed to open stream 0x%08x\n", hr); msi_free( encoded ); - return 0; + return -1; } } msi_free( encoded ); Modified: trunk/reactos/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=62… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] Wed Apr 23 14:48:52 2014 @@ -335,7 +335,7 @@ BOOL succeeded = FALSE; static const WCHAR fmt[] = {'%','s',' ','P','A','T','C','H','=','"','%','s','"',0}; - static WCHAR empty[] = {0}; + static const WCHAR empty[] = {0}; if (!szPatchPackage || !szPatchPackage[0]) return ERROR_INVALID_PARAMETER; @@ -1113,8 +1113,6 @@ { context = MSIINSTALLCONTEXT_MACHINE; } - - MSIREG_OpenInstallProps(szProduct, context, NULL, &userdata, FALSE); if (!strcmpW( szAttribute, INSTALLPROPERTY_HELPLINKW ) || !strcmpW( szAttribute, INSTALLPROPERTY_HELPTELEPHONEW ) || @@ -1138,9 +1136,11 @@ r = ERROR_UNKNOWN_PRODUCT; goto done; } - - if (!userdata) - return ERROR_UNKNOWN_PROPERTY; + if (MSIREG_OpenInstallProps(szProduct, context, NULL, &userdata, FALSE)) + { + r = ERROR_UNKNOWN_PROPERTY; + goto done; + } if (!strcmpW( szAttribute, INSTALLPROPERTY_INSTALLEDPRODUCTNAMEW )) szAttribute = display_name; @@ -1150,6 +1150,7 @@ val = msi_reg_get_value(userdata, szAttribute, &type); if (!val) val = empty; + RegCloseKey(userdata); } else if (!strcmpW( szAttribute, INSTALLPROPERTY_INSTANCETYPEW ) || !strcmpW( szAttribute, INSTALLPROPERTY_TRANSFORMSW ) || @@ -1242,7 +1243,6 @@ done: RegCloseKey(prodkey); - RegCloseKey(userdata); return r; } Modified: trunk/reactos/dll/win32/msi/msi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rc?rev=6… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.rc [iso-8859-1] Wed Apr 23 14:48:52 2014 @@ -69,7 +69,9 @@ /* @makedep: msiserver.rgs */ 2 WINE_REGISTRY msiserver.rgs -3 WINE_REGISTRY "msi.rgs" +3 WINE_REGISTRY msiserver_r.rgs + +4 WINE_REGISTRY msiserver_t.rgs /* @makedep: instadvert.bmp */ 0x1001 BITMAP instadvert.bmp Removed: trunk/reactos/dll/win32/msi/msi.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rgs?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.rgs (removed) @@ -1,184 +0,0 @@ -HKCR -{ - NoRemove Interface - { - '{7BDE2046-D03B-4FFC-B84C-A098F38CFF0B}' = s 'IWineMsiRemoteDatabase' - { - NumMethods = s 8 - ProxyStubClsid32 = s '{000C103E-0000-0000-C000-000000000046}' - } - '{902B3592-9D08-4DFD-A593-D07C52546421}' = s 'IWineMsiRemotePackage' - { - NumMethods = s 25 - ProxyStubClsid32 = s '{000C103E-0000-0000-C000-000000000046}' - } - '{56D58B64-8780-4C22-A8BC-8B0B29E4A9F8}' = s 'IWineMsiRemoteCustomAction' - { - NumMethods = s 4 - ProxyStubClsid32 = s '{000C103E-0000-0000-C000-000000000046}' - } - '{000C101C-0000-0000-C000-000000000046}' = s 'IMsiServer' - { - NumMethods = s 3 - ProxyStubClsid32 = s '{000C103E-0000-0000-C000-000000000046}' - } - '{000C101D-0000-0000-C000-000000000046}' = s 'IMsiMessage' - { - NumMethods = s 3 - ProxyStubClsid32 = s '{000C103E-0000-0000-C000-000000000046}' - } - '{000C1025-0000-0000-C000-000000000046}' = s 'IMsiCustomAction' - { - NumMethods = s 3 - ProxyStubClsid32 = s '{000C103E-0000-0000-C000-000000000046}' - } - '{000C1033-0000-0000-C000-000000000046}' = s 'IMsiRemoteAPI' - { - NumMethods = s 3 - ProxyStubClsid32 = s '{000C103E-0000-0000-C000-000000000046}' - } - } - NoRemove CLSID - { - '{000C101C-0000-0000-C000-000000000046}' = s 'Msi install server' - { - ProgId = s 'IMsiServer' - } - '{000C101D-0000-0000-C000-000000000046}' = s 'Microsoft Windows Installer Message RPC' - { - ProgId = s 'WindowsInstaller.Message' - } - '{000C103E-0000-0000-C000-000000000046}' = s 'PSFactoryBuffer' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } - } - '{000C1082-0000-0000-C000-000000000046}' = s 'MsiTransform' - { - } - '{000C1084-0000-0000-C000-000000000046}' = s 'MsiDatabase' - { - } - '{000C1086-0000-0000-C000-000000000046}' = s 'MsiPatch' - { - } - '{000C1094-0000-0000-C000-000000000046}' = s 'MsiServerX3' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } - } - '{BA26E6FA-4F27-4F56-953A-3F90272018AA}' = s 'WineMsiRemoteCustomAction' - { - } - '{902B3592-9D08-4DFD-A593-D07C52546421}' = s 'WineMsiRemotePackage' - { - } - } - 'IMsiServer' = s 'Msi install server' - { - CLSID = s '{000C101C-0000-0000-C000-000000000046}' - } - 'WindowsInstaller.Message' = s 'Microsoft Windows Installer Message RPC' - { - CLSID = s '{000C101D-0000-0000-C000-000000000046}' - } - - NoRemove Typelib - { - NoRemove '{000C1092-0000-0000-C000-000000000046}' - { - '1.0' = s 'WindowsInstaller' - { - '0' { win32 = s '%MODULE%' } - FLAGS = s '0' - } - } - } - NoRemove Interface - { - '{000C1090-0000-0000-C000-000000000046}' = s 'Installer' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } - } - '{000C1093-0000-0000-C000-000000000046}' = s 'Record' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } - } - '{000C1095-0000-0000-C000-000000000046}' = s 'StringList' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } - } - '{000C1096-0000-0000-C000-000000000046}' = s 'RecordList' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } - } - '{000C109A-0000-0000-C000-000000000046}' = s 'UIPreview' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } - } - '{000C109B-0000-0000-C000-000000000046}' = s 'SummaryInfo' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } - } - '{000C109C-0000-0000-C000-000000000046}' = s 'View' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } - } - '{000C109D-0000-0000-C000-000000000046}' = s 'Database' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } - } - '{000C109E-0000-0000-C000-000000000046}' = s 'Session' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } - } - '{000C109F-0000-0000-C000-000000000046}' = s 'FeatureInfo' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } - } - '{000C10A0-0000-0000-C000-000000000046}' = s 'Product' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } - } - '{000C10A1-0000-0000-C000-000000000046}' = s 'Patch' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } - } - } - NoRemove CLSID - { - '{000C1090-0000-0000-C000-000000000046}' = s 'Microsoft Windows Installer' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } - ProgId = s 'WindowsInstaller.Installer' - TypeLib = s '{000C1092-0000-0000-C000-000000000046}' - Version = s '1.0' - } - } - 'WindowsInstaller.Installer' = s 'Microsoft Windows Installer' - { - CLSID = s '{000C1090-0000-0000-C000-000000000046}' - } -} Modified: trunk/reactos/dll/win32/msi/msipriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msipriv.h?re… ============================================================================== --- trunk/reactos/dll/win32/msi/msipriv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msipriv.h [iso-8859-1] Wed Apr 23 14:48:52 2014 @@ -501,7 +501,7 @@ int num_clients; unsigned int anyAbsent:1; - unsigned int hasAdvertiseFeature:1; + unsigned int hasAdvertisedFeature:1; unsigned int hasLocalFeature:1; unsigned int hasSourceFeature:1; } MSICOMPONENT; @@ -628,7 +628,7 @@ MSIFEATURE *Feature; INT Attributes; /* not in the table, set during installation */ - BOOL Installed; + INSTALLSTATE action; } MSICLASS; typedef struct tagMSIMIME MSIMIME; @@ -643,7 +643,7 @@ MSIMIME *Mime; MSIFEATURE *Feature; /* not in the table, set during installation */ - BOOL Installed; + INSTALLSTATE action; struct list verbs; } MSIEXTENSION; @@ -656,7 +656,6 @@ LPWSTR Description; LPWSTR IconPath; /* not in the table, set during installation */ - BOOL InstallMe; MSIPROGID *CurVer; MSIPROGID *VersionInd; }; @@ -678,8 +677,6 @@ LPWSTR suffix; LPWSTR clsid; MSICLASS *Class; - /* not in the table, set during installation */ - BOOL InstallMe; }; enum SCRIPTS @@ -700,7 +697,6 @@ LPWSTR *Actions[SCRIPT_MAX]; UINT ActionCount[SCRIPT_MAX]; BOOL ExecuteSequenceRun; - BOOL CurrentlyScripting; UINT InWhatSequence; LPWSTR *UniqueActions; UINT UniqueActionsCount; Modified: trunk/reactos/dll/win32/msi/msiserver.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiserver.id… ============================================================================== --- trunk/reactos/dll/win32/msi/msiserver.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msiserver.idl [iso-8859-1] Wed Apr 23 14:48:52 2014 @@ -16,6 +16,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#pragma makedep ident +#pragma makedep register +#pragma makedep regtypelib #include "msiserver_dispids.h" import "unknwn.idl"; @@ -149,6 +153,14 @@ coclass PSFactoryBuffer { interface IPSFactoryBuffer; } [ + helpstring("Microsoft Windows Installer"), + threading(apartment), + progid("WindowsInstaller.Installer"), + uuid(000c1090-0000-0000-c000-000000000046) +] +coclass MsiInstaller { interface Installer; } + +[ uuid(000c1082-0000-0000-c000-000000000046) ] coclass MsiTransform { } @@ -179,7 +191,6 @@ uuid(902b3592-9d08-4dfd-a593-d07c52546421) ] coclass WineMsiRemotePackage { interface WineMsiRemotePackage; } - [ uuid(000C1092-0000-0000-C000-000000000046), version(1.0) ] library WindowsInstaller @@ -247,14 +258,14 @@ [id(DISPID_INSTALLER_OPENPACKAGE)] Session* OpenPackage( [in] VARIANT PackagePath, - [in, optional, defaultvalue(0)] long Options); + [in, defaultvalue(0)] long Options); [id(DISPID_INSTALLER_OPENPRODUCT)] Session* OpenProduct( [in] BSTR ProductCode); [id(DISPID_INSTALLER_SUMMARYINFORMATION)] SummaryInfo* SummaryInformation( [in] BSTR PackagePath, - [in, optional, defaultvalue(0)] long UpdateCount); + [in, defaultvalue(0)] long UpdateCount); [id(DISPID_INSTALLER_OPENDATABASE)] Database *OpenDatabase( [in] BSTR DatabasePath, @@ -266,7 +277,7 @@ [id(DISPID_INSTALLER_INSTALLPRODUCT)] void InstallProduct( [in] BSTR PackagePath, - [in, optional, defaultvalue("0")] BSTR PropertyValues); + [in, defaultvalue("0")] BSTR PropertyValues); [id(DISPID_INSTALLER_VERSION)] BSTR Version(); [id(DISPID_INSTALLER_LASTERRORRECORD)] @@ -389,7 +400,7 @@ properties: methods: [id(DISPID_VIEW_EXECUTE)] - void Execute([in, optional, defaultvalue(0)] Record *Params); + void Execute([in, defaultvalue(0)] Record *Params); [id(DISPID_VIEW_FETCH)] Record* Fetch(); [id(DISPID_VIEW_MODIFY)] @@ -408,7 +419,7 @@ [id(DISPID_DATABASE_OPENVIEW)] View* OpenView([in] BSTR Sql); [id(DISPID_DATABASE_SUMMARYINFORMATION), propget] - SummaryInfo *SummaryInformation([in, optional, defaultvalue(0)] long UpdateCount); + SummaryInfo *SummaryInformation([in, defaultvalue(0)] long UpdateCount); } typedef enum { @@ -547,12 +558,4 @@ properties: methods: } - - [ - helpstring("Microsoft Windows Installer"), - threading(apartment), - progid("WindowsInstaller.Installer"), - uuid(000c1090-0000-0000-c000-000000000046) - ] - coclass MsiInstaller { interface Installer; } -} +} Modified: trunk/reactos/dll/win32/msi/msiserver.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiserver.rg… ============================================================================== --- trunk/reactos/dll/win32/msi/msiserver.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msiserver.rgs [iso-8859-1] Wed Apr 23 14:48:52 2014 @@ -2,7 +2,12 @@ { NoRemove CLSID { - '{000C101D-0000-0000-C000-000000000046}' { DllVersion = s '3.1.4000' } - '{000C1090-0000-0000-C000-000000000046}' { InProcHandler32 = s 'ole32.dll' } + '{000C101D-0000-0000-C000-000000000046}' { DllVersion = s '4.5.6001' } + '{000C1090-0000-0000-C000-000000000046}' + { + TypeLib = s '{000C1092-0000-0000-C000-000000000046}' + Version = s '1.0' + InProcHandler32 = s 'ole32.dll' + } } } Copied: trunk/reactos/dll/win32/msi/msiserver_r.rgs (from r62887, trunk/reactos/dll/win32/msi/msi.rgs) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiserver_r.… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msiserver_r.rgs [iso-8859-1] Wed Apr 23 14:48:52 2014 @@ -52,6 +52,11 @@ { InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } } + '{000C1090-0000-0000-C000-000000000046}' = s 'Microsoft Windows Installer' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + ProgId = s 'WindowsInstaller.Installer' + } '{000C1082-0000-0000-C000-000000000046}' = s 'MsiTransform' { } @@ -80,103 +85,6 @@ { CLSID = s '{000C101D-0000-0000-C000-000000000046}' } - - NoRemove Typelib - { - NoRemove '{000C1092-0000-0000-C000-000000000046}' - { - '1.0' = s 'WindowsInstaller' - { - '0' { win32 = s '%MODULE%' } - FLAGS = s '0' - } - } - } - NoRemove Interface - { - '{000C1090-0000-0000-C000-000000000046}' = s 'Installer' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } - } - '{000C1093-0000-0000-C000-000000000046}' = s 'Record' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } - } - '{000C1095-0000-0000-C000-000000000046}' = s 'StringList' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } - } - '{000C1096-0000-0000-C000-000000000046}' = s 'RecordList' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } - } - '{000C109A-0000-0000-C000-000000000046}' = s 'UIPreview' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } - } - '{000C109B-0000-0000-C000-000000000046}' = s 'SummaryInfo' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } - } - '{000C109C-0000-0000-C000-000000000046}' = s 'View' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } - } - '{000C109D-0000-0000-C000-000000000046}' = s 'Database' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } - } - '{000C109E-0000-0000-C000-000000000046}' = s 'Session' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } - } - '{000C109F-0000-0000-C000-000000000046}' = s 'FeatureInfo' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } - } - '{000C10A0-0000-0000-C000-000000000046}' = s 'Product' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } - } - '{000C10A1-0000-0000-C000-000000000046}' = s 'Patch' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } - } - } - NoRemove CLSID - { - '{000C1090-0000-0000-C000-000000000046}' = s 'Microsoft Windows Installer' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } - ProgId = s 'WindowsInstaller.Installer' - TypeLib = s '{000C1092-0000-0000-C000-000000000046}' - Version = s '1.0' - } - } 'WindowsInstaller.Installer' = s 'Microsoft Windows Installer' { CLSID = s '{000C1090-0000-0000-C000-000000000046}' Added: trunk/reactos/dll/win32/msi/msiserver_t.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiserver_t.… ============================================================================== --- trunk/reactos/dll/win32/msi/msiserver_t.rgs (added) +++ trunk/reactos/dll/win32/msi/msiserver_t.rgs [iso-8859-1] Wed Apr 23 14:48:52 2014 @@ -0,0 +1,92 @@ +HKCR +{ + NoRemove Typelib + { + NoRemove '{000C1092-0000-0000-C000-000000000046}' + { + '1.0' = s 'WindowsInstaller' + { + '0' { win32 = s '%MODULE%' } + FLAGS = s '0' + } + } + } + NoRemove Interface + { + '{000C1090-0000-0000-C000-000000000046}' = s 'Installer' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } + } + '{000C1093-0000-0000-C000-000000000046}' = s 'Record' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } + } + '{000C1095-0000-0000-C000-000000000046}' = s 'StringList' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } + } + '{000C1096-0000-0000-C000-000000000046}' = s 'RecordList' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } + } + '{000C109A-0000-0000-C000-000000000046}' = s 'UIPreview' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } + } + '{000C109B-0000-0000-C000-000000000046}' = s 'SummaryInfo' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } + } + '{000C109C-0000-0000-C000-000000000046}' = s 'View' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } + } + '{000C109D-0000-0000-C000-000000000046}' = s 'Database' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } + } + '{000C109E-0000-0000-C000-000000000046}' = s 'Session' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } + } + '{000C109F-0000-0000-C000-000000000046}' = s 'FeatureInfo' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } + } + '{000C10A0-0000-0000-C000-000000000046}' = s 'Product' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } + } + '{000C10A1-0000-0000-C000-000000000046}' = s 'Patch' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{000C1092-0000-0000-C000-000000000046}' { val Version = s '1.0' } + } + } + NoRemove CLSID + { + } +} Propchange: trunk/reactos/dll/win32/msi/msiserver_t.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/package.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/package.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/package.c [iso-8859-1] Wed Apr 23 14:48:52 2014 @@ -1052,6 +1052,7 @@ if (rc != ERROR_SUCCESS) { WARN("Unable to query rev number: %d\n", rc); + msi_free( package_code ); goto done; } Modified: trunk/reactos/dll/win32/msi/record.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/record.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/record.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/record.c [iso-8859-1] Wed Apr 23 14:48:52 2014 @@ -358,7 +358,7 @@ rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD ); if( !rec ) - return 0; + return FALSE; msiobj_lock( &rec->hdr ); ret = MSI_RecordIsNull( rec, iField ); msiobj_unlock( &rec->hdr ); @@ -663,7 +663,7 @@ hGlob = GlobalAlloc(GMEM_FIXED, sz); if( hGlob ) { - BOOL r = ReadFile(handle, hGlob, sz, &read, NULL); + BOOL r = ReadFile(handle, hGlob, sz, &read, NULL) && read == sz; if( !r ) { GlobalFree(hGlob); Modified: trunk/reactos/dll/win32/msi/source.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/source.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/source.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/source.c [iso-8859-1] Wed Apr 23 14:48:52 2014 @@ -1135,7 +1135,7 @@ list_init(&sourcelist); rc = fill_source_list(&sourcelist, typekey, &count); if (rc != ERROR_NO_MORE_ITEMS) - return rc; + goto done; size = (lstrlenW(source) + 1) * sizeof(WCHAR); Modified: trunk/reactos/dll/win32/msi/sql.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/sql.y?rev=62… ============================================================================== --- trunk/reactos/dll/win32/msi/sql.y [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/sql.y [iso-8859-1] Wed Apr 23 14:48:52 2014 @@ -816,7 +816,7 @@ ( (p[0]=='\'') && (p[len-1]!='\'') ) ) return ERROR_FUNCTION_FAILED; - /* if there's quotes, remove them */ + /* if there are quotes, remove them */ if( ( (p[0]=='`') && (p[len-1]=='`') ) || ( (p[0]=='\'') && (p[len-1]=='\'') ) ) { Modified: trunk/reactos/dll/win32/msi/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/table.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/table.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/table.c [iso-8859-1] Wed Apr 23 14:48:52 2014 @@ -545,7 +545,7 @@ *pcount = column_count; - /* if there's no columns, there's no table */ + /* if there are no columns, there's no table */ if (!column_count) return ERROR_INVALID_PARAMETER; @@ -1509,7 +1509,7 @@ { UINT r, row, i; - /* check there's no null values where they're not allowed */ + /* check there are no null values where they're not allowed */ for( i = 0; i < tv->num_cols; i++ ) { if ( tv->columns[i].type & MSITYPE_NULLABLE ) @@ -1541,7 +1541,7 @@ } } - /* check there's no duplicate keys */ + /* check there are no duplicate keys */ r = msi_table_find_row( tv, rec, &row, column ); if (r == ERROR_SUCCESS) return ERROR_FUNCTION_FAILED; @@ -1951,7 +1951,10 @@ r = TABLE_CreateView(tv->db, szColumns, &columns); if (r != ERROR_SUCCESS) + { + msiobj_release(&rec->hdr); return r; + } r = msi_table_find_row((MSITABLEVIEW *)columns, rec, &row, NULL); if (r != ERROR_SUCCESS) @@ -2073,7 +2076,10 @@ r = TABLE_CreateView(tv->db, szTables, &tables); if (r != ERROR_SUCCESS) + { + msiobj_release(&rec->hdr); return r; + } r = msi_table_find_row((MSITABLEVIEW *)tables, rec, &row, NULL); if (r != ERROR_SUCCESS) Modified: trunk/reactos/include/psdk/msi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msi.h?rev=629… ============================================================================== --- trunk/reactos/include/psdk/msi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msi.h [iso-8859-1] Wed Apr 23 14:48:52 2014 @@ -657,7 +657,7 @@ UINT WINAPI MsiConfigureProductA(_In_ LPCSTR, _In_ int, _In_ INSTALLSTATE); UINT WINAPI MsiConfigureProductW(_In_ LPCWSTR, _In_ int, _In_ INSTALLSTATE); -#define MsiConfigureProduct WINELIB_NAME_AW(MsiConfigureProduct); +#define MsiConfigureProduct WINELIB_NAME_AW(MsiConfigureProduct) UINT WINAPI @@ -675,7 +675,7 @@ _In_ INSTALLSTATE, _In_opt_ LPCWSTR); -#define MsiConfigureProductEx WINELIB_NAME_AW(MsiConfigureProductEx); +#define MsiConfigureProductEx WINELIB_NAME_AW(MsiConfigureProductEx) UINT WINAPI @@ -691,7 +691,7 @@ _In_ LPCWSTR, _In_ INSTALLSTATE); -#define MsiConfigureFeature WINELIB_NAME_AW(MsiConfigureFeature); +#define MsiConfigureFeature WINELIB_NAME_AW(MsiConfigureFeature) UINT WINAPI Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Apr 23 14:48:52 2014 @@ -119,7 +119,7 @@ reactos/dll/win32/msgsm32.acm # Synced to Wine-1.7.17 reactos/dll/win32/mshtml # Synced to Wine-1.7.1 reactos/dll/win32/mshtml.tlb # Synced to Wine-1.7.1 -reactos/dll/win32/msi # Synced to Wine-1.7.1 +reactos/dll/win32/msi # Synced to Wine-1.7.17 reactos/dll/win32/msimg32 # Synced to Wine-1.7.1 reactos/dll/win32/msimtf # Synced to Wine-1.7.1 reactos/dll/win32/msisip # Synced to Wine-1.7.1

10 years, 4 months

[akhaldi] 62917: [MSGSM32.ACM] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 23 14:34:13 2014 New Revision: 62917 URL: http://svn.reactos.org/svn/reactos?rev=62917&view=rev Log: [MSGSM32.ACM] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/msgsm32.acm/msgsm32.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msgsm32.acm/msgsm32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgsm32.acm/msgs… ============================================================================== --- trunk/reactos/dll/win32/msgsm32.acm/msgsm32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgsm32.acm/msgsm32.c [iso-8859-1] Wed Apr 23 14:34:13 2014 @@ -63,13 +63,13 @@ if((p##f = wine_dlsym(libgsm_handle, #f, NULL, 0)) == NULL) { \ wine_dlclose(libgsm_handle, NULL, 0); \ libgsm_handle = NULL; \ - return 0; \ + return FALSE; \ } /*********************************************************************** * GSM_drvLoad */ -static LRESULT GSM_drvLoad(void) +static BOOL GSM_drvLoad(void) { char error[128]; @@ -81,12 +81,12 @@ LOAD_FUNCPTR(gsm_option); LOAD_FUNCPTR(gsm_encode); LOAD_FUNCPTR(gsm_decode); - return 1; + return TRUE; } else { ERR("Couldn't load " SONAME_LIBGSM ": %s\n", error); - return 0; + return FALSE; } } @@ -139,10 +139,10 @@ } /* Validate a WAVEFORMATEX structure */ -static DWORD GSM_FormatValidate(const WAVEFORMATEX *wfx) +static BOOL GSM_FormatValidate(const WAVEFORMATEX *wfx) { if (wfx->nChannels != 1) - return 0; + return FALSE; switch (wfx->wFormatTag) { @@ -150,54 +150,54 @@ if (wfx->wBitsPerSample != 16) { WARN("PCM wBitsPerSample %u\n", wfx->wBitsPerSample); - return 0; + return FALSE; } if (wfx->nBlockAlign != 2) { WARN("PCM nBlockAlign %u\n", wfx->nBlockAlign); - return 0; + return FALSE; } if (wfx->nAvgBytesPerSec != wfx->nBlockAlign * wfx->nSamplesPerSec) { WARN("PCM nAvgBytesPerSec %u/%u\n", wfx->nAvgBytesPerSec, wfx->nBlockAlign * wfx->nSamplesPerSec); - return 0; - } - return 1; + return FALSE; + } + return TRUE; case WAVE_FORMAT_GSM610: if (wfx->cbSize < sizeof(WORD)) { WARN("GSM cbSize %u\n", wfx->cbSize); - return 0; + return FALSE; } if (wfx->wBitsPerSample != 0) { WARN("GSM wBitsPerSample %u\n", wfx->wBitsPerSample); - return 0; + return FALSE; } if (wfx->nBlockAlign != 65) { WARN("GSM nBlockAlign %u\n", wfx->nBlockAlign); - return 0; + return FALSE; } if (((const GSM610WAVEFORMAT*)wfx)->wSamplesPerBlock != 320) { WARN("GSM wSamplesPerBlock %u\n", ((const GSM610WAVEFORMAT*)wfx)->wSamplesPerBlock); - return 0; + return FALSE; } if (wfx->nAvgBytesPerSec != wfx->nSamplesPerSec * 65 / 320) { WARN("GSM nAvgBytesPerSec %d / %d\n", wfx->nAvgBytesPerSec, wfx->nSamplesPerSec * 65 / 320); - return 0; - } - return 1; + return FALSE; + } + return TRUE; default: - return 0; - } - return 0; + return FALSE; + } + return FALSE; } static const DWORD gsm_rates[] = { 8000, 11025, 22050, 44100, 48000, 96000 }; @@ -512,7 +512,7 @@ return ACMERR_NOTPOSSIBLE; } - /* The packing algorythm writes 32 bytes, then 33 bytes, + /* The packing algorithm writes 32 bytes, then 33 bytes, * and it seems to pad to align to 65 bytes always * adding extra data where necessary */ Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Apr 23 14:34:13 2014 @@ -116,7 +116,7 @@ reactos/dll/win32/msctf # Synced to Wine-1.7.17 reactos/dll/win32/msftedit # Synced to Wine-1.7.1 reactos/dll/win32/msg711.acm # Synced to Wine-1.7.1 -reactos/dll/win32/msgsm32.acm # Synced to Wine-1.7.1 +reactos/dll/win32/msgsm32.acm # Synced to Wine-1.7.17 reactos/dll/win32/mshtml # Synced to Wine-1.7.1 reactos/dll/win32/mshtml.tlb # Synced to Wine-1.7.1 reactos/dll/win32/msi # Synced to Wine-1.7.1

10 years, 4 months

[akhaldi] 62916: [MSCTF_WINETEST] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 23 14:32:47 2014 New Revision: 62916 URL: http://svn.reactos.org/svn/reactos?rev=62916&view=rev Log: [MSCTF_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/msctf/inputprocessor.c Modified: trunk/rostests/winetests/msctf/inputprocessor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msctf/inputproc… ============================================================================== --- trunk/rostests/winetests/msctf/inputprocessor.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msctf/inputprocessor.c [iso-8859-1] Wed Apr 23 14:32:47 2014 @@ -938,7 +938,8 @@ { found = TRUE; ok(profile.langid == gLangid, "LangId Incorrect\n"); - ok(IsEqualGUID(&profile.catid,&GUID_TFCAT_TIP_KEYBOARD), "CatId Incorrect\n"); + ok(IsEqualGUID(&profile.catid,&GUID_TFCAT_TIP_KEYBOARD) || + broken(IsEqualGUID(&profile.catid,&GUID_NULL) /* Win8 */), "CatId Incorrect\n"); ok(IsEqualGUID(&profile.guidProfile,&CLSID_FakeService), "guidProfile Incorrect\n"); } } @@ -2000,10 +2001,10 @@ { if (MsgWaitForMultipleObjects(0, NULL, FALSE, min_timeout, QS_ALLINPUT) == WAIT_TIMEOUT) break; - while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + while (PeekMessageW(&msg, 0, 0, 0, PM_REMOVE)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageW(&msg); } diff = time - GetTickCount(); } @@ -2032,11 +2033,11 @@ hr = ITfThreadMgr_CreateDocumentMgr(g_tm,&dm2); ok(SUCCEEDED(hr),"CreateDocumentMgr failed\n"); - wnd1 = CreateWindow("edit",NULL,WS_POPUP,0,0,200,60,NULL,NULL,NULL,NULL); + wnd1 = CreateWindowA("edit",NULL,WS_POPUP,0,0,200,60,NULL,NULL,NULL,NULL); ok(wnd1!=NULL,"Unable to create window 1\n"); - wnd2 = CreateWindow("edit",NULL,WS_POPUP,0,65,200,60,NULL,NULL,NULL,NULL); + wnd2 = CreateWindowA("edit",NULL,WS_POPUP,0,65,200,60,NULL,NULL,NULL,NULL); ok(wnd2!=NULL,"Unable to create window 2\n"); - wnd3 = CreateWindow("edit",NULL,WS_POPUP,0,130,200,60,NULL,NULL,NULL,NULL); + wnd3 = CreateWindowA("edit",NULL,WS_POPUP,0,130,200,60,NULL,NULL,NULL,NULL); ok(wnd3!=NULL,"Unable to create window 3\n"); processPendingMessages(); @@ -2075,20 +2076,15 @@ processPendingMessages(); ITfThreadMgr_GetFocus(g_tm, &dmcheck); - if (dmcheck != NULL) - { - ok(dmcheck == dm1, "Expected DocumentMgr not focused\n"); - ITfDocumentMgr_Release(dmcheck); - } - else - { - /* Sometimes we need to explicitly set focus on Win7 */ - test_CurrentFocus = dm1; - test_PrevFocus = FOCUS_IGNORE; - test_OnSetFocus = SINK_EXPECTED; - ITfThreadMgr_SetFocus(g_tm, dm1); - sink_check_ok(&test_OnSetFocus,"OnSetFocus"); - } + ok(dmcheck == dm1 || broken(dmcheck == dmorig /* Win7+ */), "Expected DocumentMgr not focused\n"); + ITfDocumentMgr_Release(dmcheck); + + /* We need to explicitly set focus on Win7+ */ + test_CurrentFocus = dm1; + test_PrevFocus = FOCUS_IGNORE; + test_OnSetFocus = SINK_OPTIONAL; /* Doesn't always fire on Win7+ */ + ITfThreadMgr_SetFocus(g_tm, dm1); + sink_check_ok(&test_OnSetFocus, "OnSetFocus"); hr = ITfThreadMgr_AssociateFocus(g_tm,wnd2,dm2,&olddm); ok(SUCCEEDED(hr),"AssociateFocus failed\n"); @@ -2133,7 +2129,7 @@ test_CurrentFocus = dmorig; test_PrevFocus = dm1; - test_OnSetFocus = SINK_EXPECTED; + test_OnSetFocus = SINK_OPTIONAL; /* Doesn't always fire on Win7+ */ test_ACP_GetStatus = SINK_IGNORE; ITfThreadMgr_SetFocus(g_tm,dmorig); sink_check_ok(&test_OnSetFocus,"OnSetFocus");

10 years, 4 months

[akhaldi] 62915: [MSCTF] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 23 14:32:35 2014 New Revision: 62915 URL: http://svn.reactos.org/svn/reactos?rev=62915&view=rev Log: [MSCTF] * Sync with Wine 1.7.17. CORE-8080 Added: trunk/reactos/dll/win32/msctf/msctf_classes.rgs - copied unchanged from r62887, trunk/reactos/dll/win32/msctf/msctf.rgs Removed: trunk/reactos/dll/win32/msctf/msctf.rgs Modified: trunk/reactos/dll/win32/msctf/categorymgr.c trunk/reactos/dll/win32/msctf/compartmentmgr.c trunk/reactos/dll/win32/msctf/context.c trunk/reactos/dll/win32/msctf/displayattributemgr.c trunk/reactos/dll/win32/msctf/documentmgr.c trunk/reactos/dll/win32/msctf/inputprocessor.c trunk/reactos/dll/win32/msctf/langbarmgr.c trunk/reactos/dll/win32/msctf/msctf_classes.idl trunk/reactos/dll/win32/msctf/range.c trunk/reactos/dll/win32/msctf/threadmgr.c trunk/reactos/dll/win32/msctf/version.rc trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/msctf/categorymgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/categorymg… Modified: trunk/reactos/dll/win32/msctf/compartmentmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/compartmen… Modified: trunk/reactos/dll/win32/msctf/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/context.c?… Modified: trunk/reactos/dll/win32/msctf/displayattributemgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/displayatt… Modified: trunk/reactos/dll/win32/msctf/documentmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/documentmg… Modified: trunk/reactos/dll/win32/msctf/inputprocessor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/inputproce… Modified: trunk/reactos/dll/win32/msctf/langbarmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/langbarmgr… Removed: trunk/reactos/dll/win32/msctf/msctf.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf.rgs?… Modified: trunk/reactos/dll/win32/msctf/msctf_classes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf_clas… Modified: trunk/reactos/dll/win32/msctf/range.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/range.c?re… Modified: trunk/reactos/dll/win32/msctf/threadmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/threadmgr.… Modified: trunk/reactos/dll/win32/msctf/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/version.rc… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

10 years, 4 months

[akhaldi] 62914: [MSCMS_WINETEST] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 23 14:27:54 2014 New Revision: 62914 URL: http://svn.reactos.org/svn/reactos?rev=62914&view=rev Log: [MSCMS_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/mscms/profile.c Modified: trunk/rostests/winetests/mscms/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mscms/profile.c… ============================================================================== --- trunk/rostests/winetests/mscms/profile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mscms/profile.c [iso-8859-1] Wed Apr 23 14:27:54 2014 @@ -59,7 +59,7 @@ static BOOL (WINAPI *pUninstallColorProfileA)(PCSTR,PCSTR,BOOL); static BOOL (WINAPI *pUninstallColorProfileW)(PCWSTR,PCWSTR,BOOL); -static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,PDISPLAY_DEVICE,DWORD); +static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,PDISPLAY_DEVICEA,DWORD); #define GETFUNCPTR(func) p##func = (void *)GetProcAddress( hmscms, #func ); \ if (!p##func) return FALSE; @@ -122,6 +122,8 @@ 'c','o','l','o','r','\\','s','r','g','b',' ','c','o','l','o','r',' ', 's','p','a','c','e',' ','p','r','o','f','i','l','e','.','i','c','m',0 }; +static BOOL have_color_profile; + static const unsigned char rgbheader[] = { 0x48, 0x0c, 0x00, 0x00, 0x6f, 0x6e, 0x69, 0x4c, 0x00, 0x00, 0x10, 0x02, 0x72, 0x74, 0x6e, 0x6d, 0x20, 0x42, 0x47, 0x52, 0x20, 0x5a, 0x59, 0x58, @@ -669,7 +671,7 @@ ok( !ret, "EnumColorProfilesA() succeeded (%d)\n", GetLastError() ); ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); - if (standardprofile) + if (have_color_profile) ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); else todo_wine ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); @@ -683,7 +685,7 @@ size = total; ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); - if (standardprofile) + if (have_color_profile) ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); else todo_wine ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); @@ -723,7 +725,7 @@ ok( !ret, "EnumColorProfilesW() succeeded (%d)\n", GetLastError() ); ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); - if (standardprofileW) + if (have_color_profile) ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); else todo_wine ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); @@ -736,7 +738,7 @@ size = total; ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); - if (standardprofileW) + if (have_color_profile) ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); else todo_wine ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); @@ -1244,17 +1246,16 @@ BOOL ret; char profile[MAX_PATH], basename[MAX_PATH]; DWORD error, size = sizeof(profile); - DISPLAY_DEVICE display; + DISPLAY_DEVICEA display, monitor; BOOL res; - DISPLAY_DEVICE monitor; if (testprofile && pEnumDisplayDevicesA) { - display.cb = sizeof( DISPLAY_DEVICE ); + display.cb = sizeof( DISPLAY_DEVICEA ); res = pEnumDisplayDevicesA( NULL, 0, &display, 0 ); ok( res, "Can't get display info\n" ); - monitor.cb = sizeof( DISPLAY_DEVICE ); + monitor.cb = sizeof( DISPLAY_DEVICEA ); res = pEnumDisplayDevicesA( display.DeviceName, 0, &monitor, 0 ); if (res) { @@ -1316,6 +1317,21 @@ else skip("Unable to obtain monitor name\n"); } +} + +static BOOL have_profile(void) +{ + char glob[MAX_PATH + sizeof("\\*.icm")]; + DWORD size = MAX_PATH; + HANDLE handle; + WIN32_FIND_DATAA data; + + if (!pGetColorDirectoryA( NULL, glob, &size )) return FALSE; + lstrcatA( glob, "\\*.icm" ); + handle = FindFirstFileA( glob, &data ); + if (handle == INVALID_HANDLE_VALUE) return FALSE; + FindClose( handle ); + return TRUE; } START_TEST(profile) @@ -1379,9 +1395,9 @@ } /* If found, create a temporary copy for testing purposes */ - if (standardprofile && GetTempPath( sizeof(path), path )) - { - if (GetTempFileName( path, "rgb", 0, file )) + if (standardprofile && GetTempPathA( sizeof(path), path )) + { + if (GetTempFileNameA( path, "rgb", 0, file )) { if (CopyFileA( standardprofile, file, FALSE )) { @@ -1393,6 +1409,8 @@ } } + have_color_profile = have_profile(); + test_GetColorDirectoryA(); test_GetColorDirectoryW();

10 years, 4 months

[akhaldi] 62913: [MSCMS] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 23 14:27:40 2014 New Revision: 62913 URL: http://svn.reactos.org/svn/reactos?rev=62913&view=rev Log: [MSCMS] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/mscms/mscms_main.c trunk/reactos/dll/win32/mscms/transform.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mscms/mscms_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/mscms_main… ============================================================================== --- trunk/reactos/dll/win32/mscms/mscms_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscms/mscms_main.c [iso-8859-1] Wed Apr 23 14:27:40 2014 @@ -53,6 +53,8 @@ DisableThreadLibraryCalls( hinst ); #ifdef HAVE_LCMS2 cmsSetLogErrorHandler( lcms_error_handler ); +#else + ERR( "No support for liblcms2, expect problems\n" ); #endif break; case DLL_PROCESS_DETACH: Modified: trunk/reactos/dll/win32/mscms/transform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/transform.… ============================================================================== --- trunk/reactos/dll/win32/mscms/transform.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscms/transform.c [iso-8859-1] Wed Apr 23 14:27:40 2014 @@ -60,7 +60,7 @@ static DWORD from_bmformat( BMFORMAT format ) { - static int quietfixme = 0; + static BOOL quietfixme = FALSE; TRACE( "bitmap format: 0x%08x\n", format ); switch (format) @@ -71,10 +71,10 @@ case BM_xRGBQUADS: return TYPE_ARGB_8; case BM_xBGRQUADS: return TYPE_ABGR_8; default: - if (quietfixme == 0) + if (!quietfixme) { FIXME("unhandled bitmap format 0x%x\n", format); - quietfixme = 1; + quietfixme = TRUE; } return TYPE_RGB_8; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Apr 23 14:27:40 2014 @@ -111,7 +111,7 @@ reactos/dll/win32/msacm32/msacm32.drv # Synced to Wine-1.7.17 reactos/dll/win32/msadp32.acm # Synced to Wine-1.7.17 reactos/dll/win32/mscat32 # Synced to Wine-1.7.1 -reactos/dll/win32/mscms # Synced to Wine-1.7.1 +reactos/dll/win32/mscms # Synced to Wine-1.7.17 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/msctf # Synced to Wine-1.7.1 reactos/dll/win32/msftedit # Synced to Wine-1.7.1

10 years, 4 months

[akhaldi] 62912: [MSADP32.ACM] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 23 14:24:59 2014 New Revision: 62912 URL: http://svn.reactos.org/svn/reactos?rev=62912&view=rev Log: [MSADP32.ACM] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/msadp32.acm/msadp32.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msadp32.acm/msadp32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msadp32.acm/msad… ============================================================================== --- trunk/reactos/dll/win32/msadp32.acm/msadp32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msadp32.acm/msadp32.c [iso-8859-1] Wed Apr 23 14:24:59 2014 @@ -225,6 +225,11 @@ if (*idelta < 16) *idelta = 16; } +static inline unsigned char C168(short s) +{ + return HIBYTE(s) ^ (unsigned char)0x80; +} + static void cvtSSms16K(const ACMDRVSTREAMINSTANCE *adsi, const unsigned char* src, LPDWORD nsrc, unsigned char* dst, LPDWORD ndst) @@ -236,10 +241,10 @@ int nsamp; int nsamp_blk = ((ADPCMWAVEFORMAT*)adsi->pwfxSrc)->wSamplesPerBlock; DWORD nblock = min(*nsrc / adsi->pwfxSrc->nBlockAlign, - *ndst / (nsamp_blk * 2 * 2)); + *ndst / (nsamp_blk * adsi->pwfxDst->nBlockAlign)); *nsrc = nblock * adsi->pwfxSrc->nBlockAlign; - *ndst = nblock * nsamp_blk * 2 * 2; + *ndst = nblock * nsamp_blk * adsi->pwfxDst->nBlockAlign; nsamp_blk -= 2; /* see below for samples from block head */ for (; nblock > 0; nblock--) @@ -258,18 +263,34 @@ sample2L = R16(src); src += 2; sample2R = R16(src); src += 2; - /* store samples from block head */ - W16(dst, sample2L); dst += 2; - W16(dst, sample2R); dst += 2; - W16(dst, sample1L); dst += 2; - W16(dst, sample1R); dst += 2; - - for (nsamp = nsamp_blk; nsamp > 0; nsamp--) - { - process_nibble(*src >> 4, &ideltaL, &sample1L, &sample2L, &coeffL); - W16(dst, sample1L); dst += 2; - process_nibble(*src++ & 0x0F, &ideltaR, &sample1R, &sample2R, &coeffR); - W16(dst, sample1R); dst += 2; + if(adsi->pwfxDst->wBitsPerSample == 8){ + /* store samples from block head */ + *dst = C168(sample2L); ++dst; + *dst = C168(sample2R); ++dst; + *dst = C168(sample1L); ++dst; + *dst = C168(sample1R); ++dst; + + for (nsamp = nsamp_blk; nsamp > 0; nsamp--) + { + process_nibble(*src >> 4, &ideltaL, &sample1L, &sample2L, &coeffL); + *dst = C168(sample1L); ++dst; + process_nibble(*src++ & 0x0F, &ideltaR, &sample1R, &sample2R, &coeffR); + *dst = C168(sample1R); ++dst; + } + }else if(adsi->pwfxDst->wBitsPerSample == 16){ + /* store samples from block head */ + W16(dst, sample2L); dst += 2; + W16(dst, sample2R); dst += 2; + W16(dst, sample1L); dst += 2; + W16(dst, sample1R); dst += 2; + + for (nsamp = nsamp_blk; nsamp > 0; nsamp--) + { + process_nibble(*src >> 4, &ideltaL, &sample1L, &sample2L, &coeffL); + W16(dst, sample1L); dst += 2; + process_nibble(*src++ & 0x0F, &ideltaR, &sample1R, &sample2R, &coeffR); + W16(dst, sample1R); dst += 2; + } } src = in_src + adsi->pwfxSrc->nBlockAlign; } @@ -285,10 +306,10 @@ int nsamp; int nsamp_blk = ((ADPCMWAVEFORMAT*)adsi->pwfxSrc)->wSamplesPerBlock; DWORD nblock = min(*nsrc / adsi->pwfxSrc->nBlockAlign, - *ndst / (nsamp_blk * 2)); + *ndst / (nsamp_blk * adsi->pwfxDst->nBlockAlign)); *nsrc = nblock * adsi->pwfxSrc->nBlockAlign; - *ndst = nblock * nsamp_blk * 2; + *ndst = nblock * nsamp_blk * adsi->pwfxDst->nBlockAlign; nsamp_blk -= 2; /* see below for samples from block head */ for (; nblock > 0; nblock--) @@ -303,16 +324,30 @@ sample2 = R16(src); src += 2; /* store samples from block head */ - W16(dst, sample2); dst += 2; - W16(dst, sample1); dst += 2; - - for (nsamp = nsamp_blk; nsamp > 0; nsamp -= 2) - { - process_nibble(*src >> 4, &idelta, &sample1, &sample2, &coeff); - W16(dst, sample1); dst += 2; - process_nibble(*src++ & 0x0F, &idelta, &sample1, &sample2, &coeff); - W16(dst, sample1); dst += 2; + if(adsi->pwfxDst->wBitsPerSample == 8){ + *dst = C168(sample2); ++dst; + *dst = C168(sample1); ++dst; + + for (nsamp = nsamp_blk; nsamp > 0; nsamp -= 2) + { + process_nibble(*src >> 4, &idelta, &sample1, &sample2, &coeff); + *dst = C168(sample1); ++dst; + process_nibble(*src++ & 0x0F, &idelta, &sample1, &sample2, &coeff); + *dst = C168(sample1); ++dst; + } + }else if(adsi->pwfxDst->wBitsPerSample == 16){ + W16(dst, sample2); dst += 2; + W16(dst, sample1); dst += 2; + + for (nsamp = nsamp_blk; nsamp > 0; nsamp -= 2) + { + process_nibble(*src >> 4, &idelta, &sample1, &sample2, &coeff); + W16(dst, sample1); dst += 2; + process_nibble(*src++ & 0x0F, &idelta, &sample1, &sample2, &coeff); + W16(dst, sample1); dst += 2; + } } + src = in_src + adsi->pwfxSrc->nBlockAlign; } } @@ -555,12 +590,9 @@ else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_ADPCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { - /* resampling or mono <=> stereo not available - * ADPCM algo only define 16 bit per sample output - */ + /* resampling or mono <=> stereo not available */ if (adsi->pwfxSrc->nSamplesPerSec != adsi->pwfxDst->nSamplesPerSec || - adsi->pwfxSrc->nChannels != adsi->pwfxDst->nChannels || - adsi->pwfxDst->wBitsPerSample != 16) + adsi->pwfxSrc->nChannels != adsi->pwfxDst->nChannels) goto theEnd; #if 0 @@ -579,9 +611,9 @@ #endif /* adpcm decoding... */ - if (adsi->pwfxDst->wBitsPerSample == 16 && adsi->pwfxDst->nChannels == 2) + if (adsi->pwfxDst->nChannels == 2) aad->convert = cvtSSms16K; - if (adsi->pwfxDst->wBitsPerSample == 16 && adsi->pwfxDst->nChannels == 1) + else if (adsi->pwfxDst->nChannels == 1) aad->convert = cvtMMms16K; } else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Apr 23 14:24:59 2014 @@ -109,7 +109,7 @@ reactos/dll/win32/mprapi # Synced to Wine-1.7.1 reactos/dll/win32/msacm32 # Synced to Wine-1.7.17 reactos/dll/win32/msacm32/msacm32.drv # Synced to Wine-1.7.17 -reactos/dll/win32/msadp32.acm # Synced to Wine-1.7.1 +reactos/dll/win32/msadp32.acm # Synced to Wine-1.7.17 reactos/dll/win32/mscat32 # Synced to Wine-1.7.1 reactos/dll/win32/mscms # Synced to Wine-1.7.1 reactos/dll/win32/mscoree # Synced to Wine-1.5.4

10 years, 4 months

[akhaldi] 62911: [MSACM32.DRV] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 23 14:22:56 2014 New Revision: 62911 URL: http://svn.reactos.org/svn/reactos?rev=62911&view=rev Log: [MSACM32.DRV] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/msacm32/msacm32.drv/CMakeLists.txt trunk/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msacm32/msacm32.drv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm32.… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm32.drv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm32.drv/CMakeLists.txt [iso-8859-1] Wed Apr 23 14:22:56 2014 @@ -1,18 +1,14 @@ - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(msacm32.drv msacm32.drv.spec) -add_library(msacm32.drv SHARED wavemap.c wavemap.rc +add_library(msacm32.drv SHARED + wavemap.c + wavemap.rc ${CMAKE_CURRENT_BINARY_DIR}/msacm32.def) set_module_type(msacm32.drv win32dll UNICODE) - set_target_properties(msacm32.drv PROPERTIES SUFFIX "") - target_link_libraries(msacm32.drv wine) - -add_importlibs(msacm32.drv msvcrt msacm32 user32 winmm advapi32 kernel32 ntdll) -add_dependencies(msacm32.drv psdk) +add_importlibs(msacm32.drv msacm32 user32 winmm advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET msacm32.drv DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm32.… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c [iso-8859-1] Wed Apr 23 14:22:56 2014 @@ -337,7 +337,7 @@ if (ash->cbSrcLength > ash->cbSrcLengthUsed) FIXME("Not all src buffer has been written, expect bogus sound\n"); else if (ash->cbSrcLength < ash->cbSrcLengthUsed) - ERR("CoDec has read more data than it is allowed to\n"); + ERR("Codec has read more data than it is allowed to\n"); if (ash->cbDstLengthUsed == 0) { /* something went wrong in decoding */ @@ -675,7 +675,7 @@ return; } - if (hWave != wim->u.in.hInnerWave && uMsg != WIM_OPEN) + if (uMsg != WIM_OPEN && hWave != wim->u.in.hInnerWave) ERR("Shouldn't happen (%p %p)\n", hWave, wim->u.in.hInnerWave); switch (uMsg) { Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Apr 23 14:22:56 2014 @@ -48,181 +48,182 @@ reactos/dll/directx/wine/quartz # Synced to Wine-1.7.17 reactos/dll/directx/wine/wined3d # Synced to Wine-1.7.17 -reactos/dll/win32/activeds # Synced to Wine-1.7.1 -reactos/dll/win32/actxprxy # Synced to Wine-1.7.17 -reactos/dll/win32/advpack # Synced to Wine-1.7.1 -reactos/dll/win32/atl # Synced to Wine-1.7.1 -reactos/dll/win32/atl100 # Synced to Wine-1.7.1 -reactos/dll/win32/atl80 # Synced to Wine-1.7.1 -reactos/dll/win32/avifil32 # Synced to Wine-1.7.17 -reactos/dll/win32/bcrypt # Synced to Wine-1.7.17 -reactos/dll/win32/browseui # Out of sync -reactos/dll/win32/cabinet # Synced to Wine-1.7.17 -reactos/dll/win32/clusapi # Synced to Wine-1.7.1 -reactos/dll/win32/comcat # Synced to Wine-1.7.1 -reactos/dll/win32/comctl32 # Synced to Wine 1.7.17 -reactos/dll/win32/comdlg32 # Synced to Wine 1.7.17 -reactos/dll/win32/compstui # Synced to Wine-1.7.1 -reactos/dll/win32/credui # Synced to Wine-1.7.1 -reactos/dll/win32/crypt32 # Synced to Wine-1.7.17 -reactos/dll/win32/cryptdlg # Synced to Wine-1.7.1 -reactos/dll/win32/cryptdll # Synced to Wine-1.7.1 -reactos/dll/win32/cryptnet # Synced to Wine-1.7.17 -reactos/dll/win32/cryptui # Synced to Wine-1.7.1 -reactos/dll/win32/dbghelp # Synced to Wine-1.7.1 -reactos/dll/win32/dciman32 # Synced to Wine-1.7.1 -reactos/dll/win32/dwmapi # Synced to Wine-1.7.17 -reactos/dll/win32/faultrep # Synced to Wine-1.7.1 -reactos/dll/win32/fusion # Synced to Wine-1.7.1 -reactos/dll/win32/gdiplus # Synced to Wine-1.7.17 -reactos/dll/win32/hhctrl.ocx # Synced to Wine-1.7.17 -reactos/dll/win32/hlink # Synced to Wine-1.7.17 -reactos/dll/win32/hnetcfg # Synced to Wine-1.7.1 -reactos/dll/win32/httpapi # Synced to Wine-1.7.1 -reactos/dll/win32/iccvid # Synced to Wine-1.7.1 -reactos/dll/win32/icmp # Out of sync -reactos/dll/win32/ieframe # Synced to Wine-1.7.1 -reactos/dll/win32/imaadp32.acm # Synced to Wine-1.7.1 -reactos/dll/win32/imagehlp # Synced to Wine-1.7.17 -reactos/dll/win32/imm32 # Synced to Wine-1.7.1 -reactos/dll/win32/inetcomm # Synced to Wine-1.7.17 -reactos/dll/win32/inetmib1 # Synced to Wine-1.7.1 -reactos/dll/win32/initpki # Synced to Wine-1.7.1 -reactos/dll/win32/inseng # Synced to Wine-1.7.1 -reactos/dll/win32/iphlpapi # Out of sync -reactos/dll/win32/itircl # Synced to Wine-1.7.1 -reactos/dll/win32/itss # Synced to Wine-1.7.17 -reactos/dll/win32/jscript # Synced to Wine-1.7.17 -reactos/dll/win32/loadperf # Synced to Wine-1.7.1 -reactos/dll/win32/localspl # Synced to Wine-1.7.17 -reactos/dll/win32/localui # Synced to Wine-1.7.1 -reactos/dll/win32/lz32 # Synced to Wine-1.7.1 -reactos/dll/win32/mapi32 # Synced to Wine-1.7.17 -reactos/dll/win32/mciavi32 # Synced to Wine-1.7.1 -reactos/dll/win32/mcicda # Synced to Wine-1.7.1 -reactos/dll/win32/mciqtz32 # Synced to Wine-1.7.17 -reactos/dll/win32/mciseq # Synced to Wine-1.7.1 -reactos/dll/win32/mciwave # Synced to Wine-1.7.1 -reactos/dll/win32/mlang # Synced to Wine-1.7.17 -reactos/dll/win32/mmdevapi # Synced to Wine-1.7.1 -reactos/dll/win32/mpr # Synced to Wine-1.7.1 -reactos/dll/win32/mprapi # Synced to Wine-1.7.1 -reactos/dll/win32/msacm32 # Synced to Wine-1.7.17 -reactos/dll/win32/msadp32.acm # Synced to Wine-1.7.1 -reactos/dll/win32/mscat32 # Synced to Wine-1.7.1 -reactos/dll/win32/mscms # Synced to Wine-1.7.1 -reactos/dll/win32/mscoree # Synced to Wine-1.5.4 -reactos/dll/win32/msctf # Synced to Wine-1.7.1 -reactos/dll/win32/msftedit # Synced to Wine-1.7.1 -reactos/dll/win32/msg711.acm # Synced to Wine-1.7.1 -reactos/dll/win32/msgsm32.acm # Synced to Wine-1.7.1 -reactos/dll/win32/mshtml # Synced to Wine-1.7.1 -reactos/dll/win32/mshtml.tlb # Synced to Wine-1.7.1 -reactos/dll/win32/msi # Synced to Wine-1.7.1 -reactos/dll/win32/msimg32 # Synced to Wine-1.7.1 -reactos/dll/win32/msimtf # Synced to Wine-1.7.1 -reactos/dll/win32/msisip # Synced to Wine-1.7.1 -reactos/dll/win32/msisys.ocx # Synced to Wine-1.7.1 -reactos/dll/win32/msnet32 # Synced to Wine-1.7.1 -reactos/dll/win32/msrle32 # Synced to Wine-1.7.1 -reactos/dll/win32/mssign32 # Synced to Wine-1.7.1 -reactos/dll/win32/mssip32 # Synced to Wine-1.7.1 -reactos/dll/win32/mstask # Synced to Wine-1.7.1 -reactos/dll/win32/msvcrt20 # Out of sync -reactos/dll/win32/msvcrt40 # Out of sync -reactos/dll/win32/msvfw32 # Synced to Wine-1.7.1 -reactos/dll/win32/msvidc32 # Synced to Wine-1.7.1 -reactos/dll/win32/msxml # Synced to Wine-1.7.1 -reactos/dll/win32/msxml2 # Synced to Wine-1.7.1 -reactos/dll/win32/msxml3 # Synced to Wine-1.7.1 -reactos/dll/win32/msxml4 # Synced to Wine-1.7.1 -reactos/dll/win32/msxml6 # Synced to Wine-1.7.1 -reactos/dll/win32/nddeapi # Synced to Wine-1.7.1 -reactos/dll/win32/netapi32 # Forked at Wine-1.3.34 -reactos/dll/win32/ntdsapi # Synced to Wine-1.7.1 -reactos/dll/win32/ntprint # Synced to Wine-1.7.1 -reactos/dll/win32/objsel # Synced to Wine-1.7.1 -reactos/dll/win32/odbc32 # Synced to Wine-1.7.1. Depends on port of Linux ODBC. -reactos/dll/win32/odbccp32 # Synced to Wine-1.7.1 -reactos/dll/win32/ole32 # Synced to Wine-1.7.1 -reactos/dll/win32/oleacc # Synced to Wine-1.7.1 -reactos/dll/win32/oleaut32 # Synced to Wine-1.7.1 -reactos/dll/win32/olecli32 # Synced to Wine-1.7.1 -reactos/dll/win32/oledlg # Synced to Wine-1.7.1 -reactos/dll/win32/olepro32 # Synced to Wine-1.7.1 -reactos/dll/win32/olesvr32 # Synced to Wine-1.7.1 -reactos/dll/win32/olethk32 # Synced to Wine-1.7.1 -reactos/dll/win32/pdh # Synced to Wine-1.7.1 -reactos/dll/win32/pidgen # Synced to Wine-1.7.1 -reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 -reactos/dll/win32/printui # Synced to Wine-1.7.1 -reactos/dll/win32/propsys # Synced to Wine-1.7.1 -reactos/dll/win32/pstorec # Synced to Wine-1.7.1 -reactos/dll/win32/qmgr # Synced to Wine-1.7.1 -reactos/dll/win32/qmgrprxy # Synced to Wine-1.7.1 -reactos/dll/win32/query # Synced to Wine-1.7.1 -reactos/dll/win32/rasapi32 # Synced to Wine-1.7.1 -reactos/dll/win32/resutils # Synced to Wine-1.7.1 -reactos/dll/win32/riched20 # Synced to Wine-1.7.1 -reactos/dll/win32/riched32 # Synced to Wine-1.7.1 -reactos/dll/win32/rpcrt4 # Synced to Wine-1.7.1 -reactos/dll/win32/rsabase # Synced to Wine-1.7.1 -reactos/dll/win32/rsaenh # Synced to Wine-1.7.17 -reactos/dll/win32/sccbase # Synced to Wine-1.7.1 -reactos/dll/win32/schannel # Synced to Wine-1.7.1 -reactos/dll/win32/scrrun # Synced to Wine-1.7.1 -reactos/dll/win32/secur32 # Forked -reactos/dll/win32/security # Forked (different .spec) -reactos/dll/win32/sensapi # Synced to Wine-1.7.1 -reactos/dll/win32/setupapi # Forked at Wine-20050524 -reactos/dll/win32/shdoclc # Synced to Wine-1.7.1 -reactos/dll/win32/shdocvw # Synced to Wine-1.7.1 -reactos/dll/win32/shell32 # Forked at Wine-20071011 -reactos/dll/win32/shfolder # Synced to Wine-1.7.1 -reactos/dll/win32/shlwapi # Synced to Wine-1.7.1 -reactos/dll/win32/slbcsp # Synced to Wine-1.7.1 -reactos/dll/win32/snmpapi # Synced to Wine-1.7.1 -reactos/dll/win32/softpub # Synced to Wine-1.7.1 -reactos/dll/win32/spoolss # Synced to Wine-1.7.1 -reactos/dll/win32/stdole2.tlb # Synced to Wine-1.7.1 -reactos/dll/win32/stdole32.tlb # Synced to Wine-1.7.1 -reactos/dll/win32/sti # Synced to Wine-1.7.1 -reactos/dll/win32/sxs # Synced to Wine-1.7.1 -reactos/dll/win32/tapi32 # Synced to Wine-1.7.1 -reactos/dll/win32/traffic # Synced to Wine-1.7.1 -reactos/dll/win32/twain_32 # Synced to Wine-1.7.1 -reactos/dll/win32/unicows # Synced to Wine-1.3.32 (Win9x only, why do we need this?!) -reactos/dll/win32/updspapi # Synced to Wine-1.7.1 -reactos/dll/win32/url # Synced to Wine-1.7.1 -reactos/dll/win32/urlmon # Synced to Wine-1.7.1 -reactos/dll/win32/usp10 # Synced to Wine-1.7.14 -reactos/dll/win32/uxtheme # Forked -reactos/dll/win32/vbscript # Synced to Wine-1.7.1 -reactos/dll/win32/version # Synced to Wine-1.7.1 -reactos/dll/win32/wbemdisp # Synced to Wine-1.7.1 -reactos/dll/win32/wbemprox # Synced to Wine-1.7.2 -reactos/dll/win32/wer # Autosync -reactos/dll/win32/windowscodecs # Synced to Wine-1.7.1 -reactos/dll/win32/windowscodecsext # Synced to Wine-1.7.1 -reactos/dll/win32/winemp3.acm # Synced to Wine-1.7.1 -reactos/dll/win32/wing32 # Out of sync -reactos/dll/win32/winhttp # Synced to Wine-1.7.1 -reactos/dll/win32/wininet # Synced to Wine-1.7.1 -reactos/dll/win32/winmm # Forked at Wine-20050628 -reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 -reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 -reactos/dll/win32/wintrust # Synced to Wine-1.7.1 -reactos/dll/win32/wldap32 # Synced to Wine-1.7.1 -reactos/dll/win32/wmi # Synced to Wine-1.7.1 -reactos/dll/win32/wtsapi32 # Synced to Wine-1.7.1 -reactos/dll/win32/wuapi # Synced to Wine-1.7.1 -reactos/dll/win32/xinput1_1 # Synced to Wine-1.7.1 -reactos/dll/win32/xinput1_2 # Synced to Wine-1.7.1 -reactos/dll/win32/xinput1_3 # Synced to Wine-1.7.1 -reactos/dll/win32/xinput9_1_0 # Synced to Wine-1.7.1 -reactos/dll/win32/xmllite # Synced to Wine-1.7.17 - -reactos/dll/cpl/inetcpl # Synced to Wine-1.7.1 +reactos/dll/win32/activeds # Synced to Wine-1.7.1 +reactos/dll/win32/actxprxy # Synced to Wine-1.7.17 +reactos/dll/win32/advpack # Synced to Wine-1.7.1 +reactos/dll/win32/atl # Synced to Wine-1.7.1 +reactos/dll/win32/atl100 # Synced to Wine-1.7.1 +reactos/dll/win32/atl80 # Synced to Wine-1.7.1 +reactos/dll/win32/avifil32 # Synced to Wine-1.7.17 +reactos/dll/win32/bcrypt # Synced to Wine-1.7.17 +reactos/dll/win32/browseui # Out of sync +reactos/dll/win32/cabinet # Synced to Wine-1.7.17 +reactos/dll/win32/clusapi # Synced to Wine-1.7.1 +reactos/dll/win32/comcat # Synced to Wine-1.7.1 +reactos/dll/win32/comctl32 # Synced to Wine 1.7.17 +reactos/dll/win32/comdlg32 # Synced to Wine 1.7.17 +reactos/dll/win32/compstui # Synced to Wine-1.7.1 +reactos/dll/win32/credui # Synced to Wine-1.7.1 +reactos/dll/win32/crypt32 # Synced to Wine-1.7.17 +reactos/dll/win32/cryptdlg # Synced to Wine-1.7.1 +reactos/dll/win32/cryptdll # Synced to Wine-1.7.1 +reactos/dll/win32/cryptnet # Synced to Wine-1.7.17 +reactos/dll/win32/cryptui # Synced to Wine-1.7.1 +reactos/dll/win32/dbghelp # Synced to Wine-1.7.1 +reactos/dll/win32/dciman32 # Synced to Wine-1.7.1 +reactos/dll/win32/dwmapi # Synced to Wine-1.7.17 +reactos/dll/win32/faultrep # Synced to Wine-1.7.1 +reactos/dll/win32/fusion # Synced to Wine-1.7.1 +reactos/dll/win32/gdiplus # Synced to Wine-1.7.17 +reactos/dll/win32/hhctrl.ocx # Synced to Wine-1.7.17 +reactos/dll/win32/hlink # Synced to Wine-1.7.17 +reactos/dll/win32/hnetcfg # Synced to Wine-1.7.1 +reactos/dll/win32/httpapi # Synced to Wine-1.7.1 +reactos/dll/win32/iccvid # Synced to Wine-1.7.1 +reactos/dll/win32/icmp # Out of sync +reactos/dll/win32/ieframe # Synced to Wine-1.7.1 +reactos/dll/win32/imaadp32.acm # Synced to Wine-1.7.1 +reactos/dll/win32/imagehlp # Synced to Wine-1.7.17 +reactos/dll/win32/imm32 # Synced to Wine-1.7.1 +reactos/dll/win32/inetcomm # Synced to Wine-1.7.17 +reactos/dll/win32/inetmib1 # Synced to Wine-1.7.1 +reactos/dll/win32/initpki # Synced to Wine-1.7.1 +reactos/dll/win32/inseng # Synced to Wine-1.7.1 +reactos/dll/win32/iphlpapi # Out of sync +reactos/dll/win32/itircl # Synced to Wine-1.7.1 +reactos/dll/win32/itss # Synced to Wine-1.7.17 +reactos/dll/win32/jscript # Synced to Wine-1.7.17 +reactos/dll/win32/loadperf # Synced to Wine-1.7.1 +reactos/dll/win32/localspl # Synced to Wine-1.7.17 +reactos/dll/win32/localui # Synced to Wine-1.7.1 +reactos/dll/win32/lz32 # Synced to Wine-1.7.1 +reactos/dll/win32/mapi32 # Synced to Wine-1.7.17 +reactos/dll/win32/mciavi32 # Synced to Wine-1.7.1 +reactos/dll/win32/mcicda # Synced to Wine-1.7.1 +reactos/dll/win32/mciqtz32 # Synced to Wine-1.7.17 +reactos/dll/win32/mciseq # Synced to Wine-1.7.1 +reactos/dll/win32/mciwave # Synced to Wine-1.7.1 +reactos/dll/win32/mlang # Synced to Wine-1.7.17 +reactos/dll/win32/mmdevapi # Synced to Wine-1.7.1 +reactos/dll/win32/mpr # Synced to Wine-1.7.1 +reactos/dll/win32/mprapi # Synced to Wine-1.7.1 +reactos/dll/win32/msacm32 # Synced to Wine-1.7.17 +reactos/dll/win32/msacm32/msacm32.drv # Synced to Wine-1.7.17 +reactos/dll/win32/msadp32.acm # Synced to Wine-1.7.1 +reactos/dll/win32/mscat32 # Synced to Wine-1.7.1 +reactos/dll/win32/mscms # Synced to Wine-1.7.1 +reactos/dll/win32/mscoree # Synced to Wine-1.5.4 +reactos/dll/win32/msctf # Synced to Wine-1.7.1 +reactos/dll/win32/msftedit # Synced to Wine-1.7.1 +reactos/dll/win32/msg711.acm # Synced to Wine-1.7.1 +reactos/dll/win32/msgsm32.acm # Synced to Wine-1.7.1 +reactos/dll/win32/mshtml # Synced to Wine-1.7.1 +reactos/dll/win32/mshtml.tlb # Synced to Wine-1.7.1 +reactos/dll/win32/msi # Synced to Wine-1.7.1 +reactos/dll/win32/msimg32 # Synced to Wine-1.7.1 +reactos/dll/win32/msimtf # Synced to Wine-1.7.1 +reactos/dll/win32/msisip # Synced to Wine-1.7.1 +reactos/dll/win32/msisys.ocx # Synced to Wine-1.7.1 +reactos/dll/win32/msnet32 # Synced to Wine-1.7.1 +reactos/dll/win32/msrle32 # Synced to Wine-1.7.1 +reactos/dll/win32/mssign32 # Synced to Wine-1.7.1 +reactos/dll/win32/mssip32 # Synced to Wine-1.7.1 +reactos/dll/win32/mstask # Synced to Wine-1.7.1 +reactos/dll/win32/msvcrt20 # Out of sync +reactos/dll/win32/msvcrt40 # Out of sync +reactos/dll/win32/msvfw32 # Synced to Wine-1.7.1 +reactos/dll/win32/msvidc32 # Synced to Wine-1.7.1 +reactos/dll/win32/msxml # Synced to Wine-1.7.1 +reactos/dll/win32/msxml2 # Synced to Wine-1.7.1 +reactos/dll/win32/msxml3 # Synced to Wine-1.7.1 +reactos/dll/win32/msxml4 # Synced to Wine-1.7.1 +reactos/dll/win32/msxml6 # Synced to Wine-1.7.1 +reactos/dll/win32/nddeapi # Synced to Wine-1.7.1 +reactos/dll/win32/netapi32 # Forked at Wine-1.3.34 +reactos/dll/win32/ntdsapi # Synced to Wine-1.7.1 +reactos/dll/win32/ntprint # Synced to Wine-1.7.1 +reactos/dll/win32/objsel # Synced to Wine-1.7.1 +reactos/dll/win32/odbc32 # Synced to Wine-1.7.1. Depends on port of Linux ODBC. +reactos/dll/win32/odbccp32 # Synced to Wine-1.7.1 +reactos/dll/win32/ole32 # Synced to Wine-1.7.1 +reactos/dll/win32/oleacc # Synced to Wine-1.7.1 +reactos/dll/win32/oleaut32 # Synced to Wine-1.7.1 +reactos/dll/win32/olecli32 # Synced to Wine-1.7.1 +reactos/dll/win32/oledlg # Synced to Wine-1.7.1 +reactos/dll/win32/olepro32 # Synced to Wine-1.7.1 +reactos/dll/win32/olesvr32 # Synced to Wine-1.7.1 +reactos/dll/win32/olethk32 # Synced to Wine-1.7.1 +reactos/dll/win32/pdh # Synced to Wine-1.7.1 +reactos/dll/win32/pidgen # Synced to Wine-1.7.1 +reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 +reactos/dll/win32/printui # Synced to Wine-1.7.1 +reactos/dll/win32/propsys # Synced to Wine-1.7.1 +reactos/dll/win32/pstorec # Synced to Wine-1.7.1 +reactos/dll/win32/qmgr # Synced to Wine-1.7.1 +reactos/dll/win32/qmgrprxy # Synced to Wine-1.7.1 +reactos/dll/win32/query # Synced to Wine-1.7.1 +reactos/dll/win32/rasapi32 # Synced to Wine-1.7.1 +reactos/dll/win32/resutils # Synced to Wine-1.7.1 +reactos/dll/win32/riched20 # Synced to Wine-1.7.1 +reactos/dll/win32/riched32 # Synced to Wine-1.7.1 +reactos/dll/win32/rpcrt4 # Synced to Wine-1.7.1 +reactos/dll/win32/rsabase # Synced to Wine-1.7.1 +reactos/dll/win32/rsaenh # Synced to Wine-1.7.17 +reactos/dll/win32/sccbase # Synced to Wine-1.7.1 +reactos/dll/win32/schannel # Synced to Wine-1.7.1 +reactos/dll/win32/scrrun # Synced to Wine-1.7.1 +reactos/dll/win32/secur32 # Forked +reactos/dll/win32/security # Forked (different .spec) +reactos/dll/win32/sensapi # Synced to Wine-1.7.1 +reactos/dll/win32/setupapi # Forked at Wine-20050524 +reactos/dll/win32/shdoclc # Synced to Wine-1.7.1 +reactos/dll/win32/shdocvw # Synced to Wine-1.7.1 +reactos/dll/win32/shell32 # Forked at Wine-20071011 +reactos/dll/win32/shfolder # Synced to Wine-1.7.1 +reactos/dll/win32/shlwapi # Synced to Wine-1.7.1 +reactos/dll/win32/slbcsp # Synced to Wine-1.7.1 +reactos/dll/win32/snmpapi # Synced to Wine-1.7.1 +reactos/dll/win32/softpub # Synced to Wine-1.7.1 +reactos/dll/win32/spoolss # Synced to Wine-1.7.1 +reactos/dll/win32/stdole2.tlb # Synced to Wine-1.7.1 +reactos/dll/win32/stdole32.tlb # Synced to Wine-1.7.1 +reactos/dll/win32/sti # Synced to Wine-1.7.1 +reactos/dll/win32/sxs # Synced to Wine-1.7.1 +reactos/dll/win32/tapi32 # Synced to Wine-1.7.1 +reactos/dll/win32/traffic # Synced to Wine-1.7.1 +reactos/dll/win32/twain_32 # Synced to Wine-1.7.1 +reactos/dll/win32/unicows # Synced to Wine-1.3.32 (Win9x only, why do we need this?!) +reactos/dll/win32/updspapi # Synced to Wine-1.7.1 +reactos/dll/win32/url # Synced to Wine-1.7.1 +reactos/dll/win32/urlmon # Synced to Wine-1.7.1 +reactos/dll/win32/usp10 # Synced to Wine-1.7.14 +reactos/dll/win32/uxtheme # Forked +reactos/dll/win32/vbscript # Synced to Wine-1.7.1 +reactos/dll/win32/version # Synced to Wine-1.7.1 +reactos/dll/win32/wbemdisp # Synced to Wine-1.7.1 +reactos/dll/win32/wbemprox # Synced to Wine-1.7.2 +reactos/dll/win32/wer # Autosync +reactos/dll/win32/windowscodecs # Synced to Wine-1.7.1 +reactos/dll/win32/windowscodecsext # Synced to Wine-1.7.1 +reactos/dll/win32/winemp3.acm # Synced to Wine-1.7.1 +reactos/dll/win32/wing32 # Out of sync +reactos/dll/win32/winhttp # Synced to Wine-1.7.1 +reactos/dll/win32/wininet # Synced to Wine-1.7.1 +reactos/dll/win32/winmm # Forked at Wine-20050628 +reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 +reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 +reactos/dll/win32/wintrust # Synced to Wine-1.7.1 +reactos/dll/win32/wldap32 # Synced to Wine-1.7.1 +reactos/dll/win32/wmi # Synced to Wine-1.7.1 +reactos/dll/win32/wtsapi32 # Synced to Wine-1.7.1 +reactos/dll/win32/wuapi # Synced to Wine-1.7.1 +reactos/dll/win32/xinput1_1 # Synced to Wine-1.7.1 +reactos/dll/win32/xinput1_2 # Synced to Wine-1.7.1 +reactos/dll/win32/xinput1_3 # Synced to Wine-1.7.1 +reactos/dll/win32/xinput9_1_0 # Synced to Wine-1.7.1 +reactos/dll/win32/xmllite # Synced to Wine-1.7.17 + +reactos/dll/cpl/inetcpl # Synced to Wine-1.7.1 ReactOS shares the following programs with Winehq. @@ -246,7 +247,7 @@ from Winehq CVS. If you are looking to update something in these files check Wine current souces first as it may already be fixed. -reactos/lib/3rdparty/strmbase # Synced to Wine-1.7.17 +reactos/lib/3rdparty/strmbase # Synced to Wine-1.7.17 advapi32 - reactos/dll/win32/advapi32/crypt/*.c # Synced to Wine-1.7.1

10 years, 4 months

[akhaldi] 62910: [MSACM32_WINETEST] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 23 14:16:25 2014 New Revision: 62910 URL: http://svn.reactos.org/svn/reactos?rev=62910&view=rev Log: [MSACM32_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/msacm32/msacm.c Modified: trunk/rostests/winetests/msacm32/msacm.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msacm32/msacm.c… ============================================================================== --- trunk/rostests/winetests/msacm32/msacm.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msacm32/msacm.c [iso-8859-1] Wed Apr 23 14:16:25 2014 @@ -33,7 +33,7 @@ #include "msacm.h" static BOOL CALLBACK FormatTagEnumProc(HACMDRIVERID hadid, - PACMFORMATTAGDETAILS paftd, + PACMFORMATTAGDETAILSA paftd, DWORD_PTR dwInstance, DWORD fdwSupport) { @@ -44,7 +44,7 @@ } static BOOL CALLBACK FormatEnumProc(HACMDRIVERID hadid, - LPACMFORMATDETAILS pafd, + LPACMFORMATDETAILSA pafd, DWORD_PTR dwInstance, DWORD fd) { @@ -59,7 +59,7 @@ DWORD fdwSupport) { MMRESULT rc; - ACMDRIVERDETAILS dd; + ACMDRIVERDETAILSA dd; HACMDRIVER had; DWORD dwDriverPriority; @@ -79,48 +79,48 @@ } /* try an invalid pointer */ - rc = acmDriverDetails(hadid, 0, 0); - ok(rc == MMSYSERR_INVALPARAM, - "acmDriverDetails(): rc = %08x, should be %08x\n", + rc = acmDriverDetailsA(hadid, 0, 0); + ok(rc == MMSYSERR_INVALPARAM, + "acmDriverDetailsA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); /* try an invalid structure size */ ZeroMemory(&dd, sizeof(dd)); - rc = acmDriverDetails(hadid, &dd, 0); - ok(rc == MMSYSERR_INVALPARAM, - "acmDriverDetails(): rc = %08x, should be %08x\n", + rc = acmDriverDetailsA(hadid, &dd, 0); + ok(rc == MMSYSERR_INVALPARAM, + "acmDriverDetailsA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); /* MSDN says this should fail but it doesn't in practice */ dd.cbStruct = 4; - rc = acmDriverDetails(hadid, &dd, 0); + rc = acmDriverDetailsA(hadid, &dd, 0); ok(rc == MMSYSERR_NOERROR || rc == MMSYSERR_NOTSUPPORTED, - "acmDriverDetails(): rc = %08x, should be %08x\n", + "acmDriverDetailsA(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); /* try an invalid handle */ dd.cbStruct = sizeof(dd); - rc = acmDriverDetails((HACMDRIVERID)1, &dd, 0); - ok(rc == MMSYSERR_INVALHANDLE, - "acmDriverDetails(): rc = %08x, should be %08x\n", + rc = acmDriverDetailsA((HACMDRIVERID)1, &dd, 0); + ok(rc == MMSYSERR_INVALHANDLE, + "acmDriverDetailsA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALHANDLE); /* try an invalid handle and pointer */ - rc = acmDriverDetails((HACMDRIVERID)1, 0, 0); - ok(rc == MMSYSERR_INVALPARAM, - "acmDriverDetails(): rc = %08x, should be %08x\n", + rc = acmDriverDetailsA((HACMDRIVERID)1, 0, 0); + ok(rc == MMSYSERR_INVALPARAM, + "acmDriverDetailsA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); /* try invalid details */ - rc = acmDriverDetails(hadid, &dd, -1); + rc = acmDriverDetailsA(hadid, &dd, -1); ok(rc == MMSYSERR_INVALFLAG, - "acmDriverDetails(): rc = %08x, should be %08x\n", + "acmDriverDetailsA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALFLAG); /* try valid parameters */ - rc = acmDriverDetails(hadid, &dd, 0); + rc = acmDriverDetailsA(hadid, &dd, 0); ok(rc == MMSYSERR_NOERROR || rc == MMSYSERR_NOTSUPPORTED, - "acmDriverDetails(): rc = %08x, should be %08x\n", + "acmDriverDetailsA(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); /* cbStruct should contain size of returned data (at most sizeof(dd)) @@ -128,7 +128,7 @@ */ if (rc == MMSYSERR_NOERROR) { ok(dd.cbStruct == sizeof(dd), - "acmDriverDetails(): cbStruct = %08x\n", dd.cbStruct); + "acmDriverDetailsA(): cbStruct = %08x\n", dd.cbStruct); } if (rc == MMSYSERR_NOERROR && winetest_interactive) { @@ -274,27 +274,27 @@ "acmMetrics(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); if (rc == MMSYSERR_NOERROR) { - ACMFORMATDETAILS fd; + ACMFORMATDETAILSA fd; WAVEFORMATEX * pwfx; - ACMFORMATTAGDETAILS aftd; + ACMFORMATTAGDETAILSA aftd; /* try bad pointer */ - rc = acmFormatEnum(had, 0, FormatEnumProc, 0, 0); + rc = acmFormatEnumA(had, 0, FormatEnumProc, 0, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmFormatEnum(): rc = %08x, should be %08x\n", + "acmFormatEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); /* try bad structure size */ ZeroMemory(&fd, sizeof(fd)); - rc = acmFormatEnum(had, &fd, FormatEnumProc, 0, 0); + rc = acmFormatEnumA(had, &fd, FormatEnumProc, 0, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmFormatEnum(): rc = %08x, should be %08x\n", + "acmFormatEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); fd.cbStruct = sizeof(fd) - 1; - rc = acmFormatEnum(had, &fd, FormatEnumProc, 0, 0); + rc = acmFormatEnumA(had, &fd, FormatEnumProc, 0, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmFormatEnum(): rc = %08x, should be %08x\n", + "acmFormatEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); if (dwSize < sizeof(WAVEFORMATEX)) @@ -311,43 +311,43 @@ fd.dwFormatTag = WAVE_FORMAT_UNKNOWN; /* try valid parameters */ - rc = acmFormatEnum(had, &fd, FormatEnumProc, 0, 0); + rc = acmFormatEnumA(had, &fd, FormatEnumProc, 0, 0); ok(rc == MMSYSERR_NOERROR, - "acmFormatEnum(): rc = %08x, should be %08x\n", + "acmFormatEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); /* try bad pointer */ - rc = acmFormatTagEnum(had, 0, FormatTagEnumProc, 0, 0); + rc = acmFormatTagEnumA(had, 0, FormatTagEnumProc, 0, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmFormatTagEnum(): rc = %08x, should be %08x\n", + "acmFormatTagEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); /* try bad structure size */ ZeroMemory(&aftd, sizeof(aftd)); - rc = acmFormatTagEnum(had, &aftd, FormatTagEnumProc, 0, 0); + rc = acmFormatTagEnumA(had, &aftd, FormatTagEnumProc, 0, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmFormatTagEnum(): rc = %08x, should be %08x\n", + "acmFormatTagEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); aftd.cbStruct = sizeof(aftd) - 1; - rc = acmFormatTagEnum(had, &aftd, FormatTagEnumProc, 0, 0); + rc = acmFormatTagEnumA(had, &aftd, FormatTagEnumProc, 0, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmFormatTagEnum(): rc = %08x, should be %08x\n", + "acmFormatTagEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); aftd.cbStruct = sizeof(aftd); aftd.dwFormatTag = WAVE_FORMAT_UNKNOWN; /* try bad flag */ - rc = acmFormatTagEnum(had, &aftd, FormatTagEnumProc, 0, 1); + rc = acmFormatTagEnumA(had, &aftd, FormatTagEnumProc, 0, 1); ok(rc == MMSYSERR_INVALFLAG, - "acmFormatTagEnum(): rc = %08x, should be %08x\n", + "acmFormatTagEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALFLAG); /* try valid parameters */ - rc = acmFormatTagEnum(had, &aftd, FormatTagEnumProc, 0, 0); + rc = acmFormatTagEnumA(had, &aftd, FormatTagEnumProc, 0, 0); ok(rc == MMSYSERR_NOERROR, - "acmFormatTagEnum(): rc = %08x, should be %08x\n", + "acmFormatTagEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); HeapFree(GetProcessHeap(), 0, pwfx); @@ -454,7 +454,7 @@ trace("%s: %u\n", get_metric(uMetric), dwMetric); } -static void msacm_tests(void) +static void driver_tests(void) { MMRESULT rc; DWORD dwACMVersion = acmGetVersion(); @@ -488,7 +488,90 @@ rc, MMSYSERR_NOERROR); } +static void test_prepareheader(void) +{ + HACMSTREAM has; + ADPCMWAVEFORMAT *src; + WAVEFORMATEX dst; + MMRESULT mr; + ACMSTREAMHEADER hdr; + BYTE buf[sizeof(WAVEFORMATEX) + 32], pcm[512], input[512]; + ADPCMCOEFSET *coef; + + src = (ADPCMWAVEFORMAT*)buf; + coef = src->aCoef; + src->wfx.cbSize = 32; + src->wfx.wFormatTag = WAVE_FORMAT_ADPCM; + src->wfx.nSamplesPerSec = 22050; + src->wfx.wBitsPerSample = 4; + src->wfx.nChannels = 1; + src->wfx.nBlockAlign = 512; + src->wfx.nAvgBytesPerSec = 11025; + src->wSamplesPerBlock = 0x3f4; + src->wNumCoef = 7; + coef[0].iCoef1 = 0x0100; + coef[0].iCoef2 = 0x0000; + coef[1].iCoef1 = 0x0200; + coef[1].iCoef2 = 0xff00; + coef[2].iCoef1 = 0x0000; + coef[2].iCoef2 = 0x0000; + coef[3].iCoef1 = 0x00c0; + coef[3].iCoef2 = 0x0040; + coef[4].iCoef1 = 0x00f0; + coef[4].iCoef2 = 0x0000; + coef[5].iCoef1 = 0x01cc; + coef[5].iCoef2 = 0xff30; + coef[6].iCoef1 = 0x0188; + coef[6].iCoef2 = 0xff18; + + dst.cbSize = 0; + dst.wFormatTag = WAVE_FORMAT_PCM; + dst.nSamplesPerSec = 22050; + dst.wBitsPerSample = 8; + dst.nChannels = 1; + dst.nBlockAlign = dst.wBitsPerSample * dst.nChannels / 8; + dst.nAvgBytesPerSec = dst.nSamplesPerSec * dst.nBlockAlign; + + mr = acmStreamOpen(&has, NULL, (WAVEFORMATEX*)src, &dst, NULL, 0, 0, 0); + ok(mr == MMSYSERR_NOERROR, "open failed: 0x%x\n", mr); + + memset(&hdr, 0, sizeof(hdr)); + hdr.cbStruct = sizeof(hdr); + hdr.pbSrc = input; + hdr.cbSrcLength = sizeof(input); + hdr.pbDst = pcm; + hdr.cbDstLength = sizeof(pcm); + + mr = acmStreamPrepareHeader(has, &hdr, 0); + ok(mr == MMSYSERR_NOERROR, "prepare failed: 0x%x\n", mr); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_PREPARED, "header wasn't prepared: 0x%x\n", hdr.fdwStatus); + + mr = acmStreamUnprepareHeader(has, &hdr, 0); + ok(mr == MMSYSERR_NOERROR, "unprepare failed: 0x%x\n", mr); + ok(hdr.fdwStatus == 0, "header wasn't unprepared: 0x%x\n", hdr.fdwStatus); + + memset(&hdr, 0, sizeof(hdr)); + hdr.cbStruct = sizeof(hdr); + hdr.pbSrc = input; + hdr.cbSrcLength = sizeof(input); + hdr.pbDst = pcm; + hdr.cbDstLength = sizeof(pcm); + hdr.fdwStatus = ACMSTREAMHEADER_STATUSF_DONE; + + mr = acmStreamPrepareHeader(has, &hdr, 0); + ok(mr == MMSYSERR_NOERROR, "prepare failed: 0x%x\n", mr); + ok(hdr.fdwStatus == (ACMSTREAMHEADER_STATUSF_PREPARED | ACMSTREAMHEADER_STATUSF_DONE), "header wasn't prepared: 0x%x\n", hdr.fdwStatus); + + mr = acmStreamUnprepareHeader(has, &hdr, 0); + ok(mr == MMSYSERR_NOERROR, "unprepare failed: 0x%x\n", mr); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "header wasn't unprepared: 0x%x\n", hdr.fdwStatus); + + mr = acmStreamClose(has, 0); + ok(mr == MMSYSERR_NOERROR, "close failed: 0x%x\n", mr); +} + START_TEST(msacm) { - msacm_tests(); -} + driver_tests(); + test_prepareheader(); +}

10 years, 4 months

[akhaldi] 62909: [MSACM32] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 23 14:15:25 2014 New Revision: 62909 URL: http://svn.reactos.org/svn/reactos?rev=62909&view=rev Log: [MSACM32] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/msacm32/stream.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msacm32/stream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/stream.c… ============================================================================== --- trunk/reactos/dll/win32/msacm32/stream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/stream.c [iso-8859-1] Wed Apr 23 14:15:25 2014 @@ -298,9 +298,6 @@ if (fdwPrepare) ret = MMSYSERR_INVALFLAG; - if (pash->fdwStatus & ACMSTREAMHEADER_STATUSF_DONE) - return MMSYSERR_NOERROR; - /* Note: the ACMSTREAMHEADER and ACMDRVSTREAMHEADER structs are of same * size. some fields are private to msacm internals, and are exposed * in ACMSTREAMHEADER in the dwReservedDriver array @@ -321,7 +318,7 @@ ret = MSACM_Message((HACMDRIVER)was->pDrv, ACMDM_STREAM_PREPARE, (LPARAM)&was->drvInst, (LPARAM)padsh); if (ret == MMSYSERR_NOERROR || ret == MMSYSERR_NOTSUPPORTED) { ret = MMSYSERR_NOERROR; - padsh->fdwStatus &= ~(ACMSTREAMHEADER_STATUSF_DONE|ACMSTREAMHEADER_STATUSF_INQUEUE); + padsh->fdwStatus &= ~ACMSTREAMHEADER_STATUSF_INQUEUE; padsh->fdwStatus |= ACMSTREAMHEADER_STATUSF_PREPARED; padsh->fdwPrepared = padsh->fdwStatus; padsh->dwPrepared = 0; @@ -464,8 +461,8 @@ ret = MSACM_Message((HACMDRIVER)was->pDrv, ACMDM_STREAM_UNPREPARE, (LPARAM)&was->drvInst, (LPARAM)padsh); if (ret == MMSYSERR_NOERROR || ret == MMSYSERR_NOTSUPPORTED) { ret = MMSYSERR_NOERROR; - padsh->fdwStatus &= ~(ACMSTREAMHEADER_STATUSF_DONE|ACMSTREAMHEADER_STATUSF_INQUEUE|ACMSTREAMHEADER_STATUSF_PREPARED); - } - TRACE("=> (%d)\n", ret); - return ret; -} + padsh->fdwStatus &= ~(ACMSTREAMHEADER_STATUSF_INQUEUE|ACMSTREAMHEADER_STATUSF_PREPARED); + } + TRACE("=> (%d)\n", ret); + return ret; +} Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Apr 23 14:15:25 2014 @@ -107,7 +107,7 @@ reactos/dll/win32/mmdevapi # Synced to Wine-1.7.1 reactos/dll/win32/mpr # Synced to Wine-1.7.1 reactos/dll/win32/mprapi # Synced to Wine-1.7.1 -reactos/dll/win32/msacm32 # Synced to Wine-1.7.1 +reactos/dll/win32/msacm32 # Synced to Wine-1.7.17 reactos/dll/win32/msadp32.acm # Synced to Wine-1.7.1 reactos/dll/win32/mscat32 # Synced to Wine-1.7.1 reactos/dll/win32/mscms # Synced to Wine-1.7.1

10 years, 4 months

← Newer
1
...
15
16
17
18
19
20
21
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2014