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

Mike McCormack : shell32: Use case insensitive comparisons when comparing paths.
by Alexandre Julliard Aug. 8, 2006

Aug. 8, 2006

Module: wine Branch: refs/heads/master Commit: 5678ec4db6f96b86b423b10f44485caba6599d5b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5678ec4db6f96b86b423b10… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Aug 8 18:47:02 2006 +0900 shell32: Use case insensitive comparisons when comparing paths. --- dlls/shell32/shlfileop.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index dda59de..e05b2fa 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1042,7 +1042,7 @@ static HRESULT copy_files(LPSHFILEOPSTRU fileDest = &flTo->feFiles[i]; if (IsAttribDir(entryToCopy->attributes) && - !lstrcmpW(entryToCopy->szFullPath, fileDest->szDirectory)) + !lstrcmpiW(entryToCopy->szFullPath, fileDest->szDirectory)) { return ERROR_SUCCESS; } @@ -1052,7 +1052,7 @@ static HRESULT copy_files(LPSHFILEOPSTRU create_dest_dirs(fileDest->szDirectory); - if (!strcmpW(entryToCopy->szFullPath, fileDest->szFullPath)) + if (!lstrcmpiW(entryToCopy->szFullPath, fileDest->szFullPath)) { if (IsAttribFile(entryToCopy->attributes)) return ERROR_NO_MORE_SEARCH_HANDLES;

1 0

James Hawkins : msi: Fix the compressed files logic.
by Alexandre Julliard Aug. 8, 2006

Aug. 8, 2006

Module: wine Branch: refs/heads/master Commit: f84fa0ce6354827d6b2396ca3119c9a8bb7efcfb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f84fa0ce6354827d6b2396c… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Aug 7 11:37:49 2006 -0700 msi: Fix the compressed files logic. If the compressed file attribute is not set, use the Word Count property to determine if files are compressed. --- dlls/msi/action.c | 16 ++++++++++++++++ dlls/msi/action.h | 1 + dlls/msi/files.c | 6 +++--- dlls/msi/msipriv.h | 8 ++++++++ dlls/msi/package.c | 31 +++++++++++++++++++++++++++++++ 5 files changed, 59 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e2d78b1..a90096e 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1326,8 +1326,24 @@ static UINT load_file(MSIRECORD *row, LP file->state = msifs_invalid; + /* if the compressed bits are not set in the file attributes, + * then read the information from the package word count property + */ if (file->Attributes & msidbFileAttributesCompressed) { + file->IsCompressed = TRUE; + } + else if (file->Attributes & msidbFileAttributesNoncompressed) + { + file->IsCompressed = FALSE; + } + else + { + file->IsCompressed = package->WordCount & MSIWORDCOUNT_COMPRESSED; + } + + if (file->IsCompressed) + { file->Component->ForceLocalState = TRUE; file->Component->Action = INSTALLSTATE_LOCAL; file->Component->ActionRequest = INSTALLSTATE_LOCAL; diff --git a/dlls/msi/action.h b/dlls/msi/action.h index 93d28c6..22ad1be 100644 --- a/dlls/msi/action.h +++ b/dlls/msi/action.h @@ -120,6 +120,7 @@ typedef struct tagMSIFILE msi_file_state state; LPWSTR SourcePath; LPWSTR TargetPath; + BOOL IsCompressed; } MSIFILE; typedef struct tagMSITEMPFILE diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 36caba7..914b699 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -330,7 +330,7 @@ static BOOL extract_cabinet_file(MSIPACK static VOID set_file_source(MSIPACKAGE* package, MSIFILE* file, MSICOMPONENT* comp, LPCWSTR path) { - if (!(file->Attributes & msidbFileAttributesCompressed)) + if (!file->IsCompressed) { LPWSTR p, path; p = resolve_folder(package, comp->Directory, TRUE, FALSE, NULL); @@ -419,7 +419,7 @@ static UINT ready_media_for_file( MSIPAC msi_free(mi->last_path); mi->last_path = NULL; - if (!(file->Attributes & msidbFileAttributesCompressed)) + if (!file->IsCompressed) { mi->last_path = resolve_folder(package, comp->Directory, TRUE, FALSE, NULL); set_file_source(package,file,comp,mi->last_path); @@ -605,7 +605,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *pac continue; /* compressed files are extracted in ready_media_for_file */ - if (file->Attributes & msidbFileAttributesCompressed) + if (file->IsCompressed) { if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW(file->TargetPath)) ERR("compressed file wasn't extracted (%s)\n", diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 5d2c21e..c565b67 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -39,6 +39,12 @@ #define MSITYPE_STRING 0x0800 #define MSITYPE_NULLABLE 0x1000 #define MSITYPE_KEY 0x2000 +/* Word Count masks */ +#define MSIWORDCOUNT_SHORTFILENAMES 0x0001 +#define MSIWORDCOUNT_COMPRESSED 0x0002 +#define MSIWORDCOUNT_ADMINISTRATIVE 0x0004 +#define MSIWORDCOUNT_PRIVILEGES 0x0008 + #define MSITYPE_IS_BINARY(type) (((type) & ~MSITYPE_NULLABLE) == (MSITYPE_STRING|MSITYPE_VALID)) struct tagMSITABLE; @@ -223,6 +229,8 @@ typedef struct tagMSIPACKAGE UINT CurrentInstallState; msi_dialog *dialog; LPWSTR next_dialog; + + UINT WordCount; struct list subscriptions; } MSIPACKAGE; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 283b0a6..4065ffb 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -40,6 +40,7 @@ #include "urlmon.h" #include "shlobj.h" #include "wine/unicode.h" #include "objbase.h" +#include "msidefs.h" #include "msipriv.h" #include "action.h" @@ -376,6 +377,34 @@ static VOID set_installer_properties(MSI ReleaseDC(0, dc); } +static UINT msi_get_word_count( MSIPACKAGE *package ) +{ + UINT rc; + INT word_count; + MSIHANDLE suminfo; + MSIHANDLE hdb = alloc_msihandle( &package->db->hdr ); + + rc = MsiGetSummaryInformationW( hdb, NULL, 0, &suminfo ); + MsiCloseHandle(hdb); + if (rc != ERROR_SUCCESS) + { + ERR("Unable to open Summary Information\n"); + return 0; + } + + rc = MsiSummaryInfoGetPropertyW( suminfo, PID_WORDCOUNT, NULL, + &word_count, NULL, NULL, NULL ); + if (rc != ERROR_SUCCESS) + { + ERR("Unable to query word count\n"); + MsiCloseHandle(suminfo); + return 0; + } + + MsiCloseHandle(suminfo); + return word_count; +} + MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db ) { static const WCHAR szLevel[] = { 'U','I','L','e','v','e','l',0 }; @@ -411,6 +440,8 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABA list_init( &package->progids ); list_init( &package->RunningActions ); + package->WordCount = msi_get_word_count( package ); + /* OK, here is where we do a slew of things to the database to * prep for all that is to come as a package */

1 0

Jan Zerebecki : wined3d: Stub out remaining renderstates.
by Alexandre Julliard Aug. 8, 2006

Aug. 8, 2006

Module: wine Branch: refs/heads/master Commit: ccf0d11352e8931a12a3c65aa24a8915156885aa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ccf0d11352e8931a12a3c65… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Tue Aug 8 00:06:40 2006 +0200 wined3d: Stub out remaining renderstates. --- dlls/wined3d/device.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 114 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 10d8546..e508699 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4465,8 +4465,121 @@ static HRESULT WINAPI IWineD3DDeviceImpl ERR(" Antialias not supported yet.\n"); break; } + + case WINED3DRS_MULTISAMPLEMASK : + { + if(0xFFFFFFFF != Value) + ERR("(%p)->(%s,%ld) not yet implemented\n", This, debug_d3drenderstate(State), Value); + break; + } + + case WINED3DRS_PATCHEDGESTYLE : + { + if(D3DPATCHEDGE_DISCRETE != Value) + ERR("(%p)->(%s,%ld) not yet implemented\n", This, debug_d3drenderstate(State), Value); + break; + } + + case WINED3DRS_PATCHSEGMENTS : + { + /* available in d3d8 but in d3d9 it was replaced by IDirect3DDevice9::SetNPatchMode */ + tmpvalue.f = 1.0f; + if(tmpvalue.d != Value) + ERR("(%p)->(%s,%ld) not yet implemented\n", This, debug_d3drenderstate(State), Value); + break; + } + + case WINED3DRS_DEBUGMONITORTOKEN : + { + /* Only useful for "debug builds". */ + if(0xbaadcafe != Value) { + /* MSDN says the default is D3DDMT_ENABLE but our tests confirm 0xbaadcafe is the default. */ + /* MSDN says anything other than D3DDMT_ENABLE or DISABLE does not change the state, + * but our tests disagree. */ + ERR("(%p)->(%s,%ld) not yet implemented\n", This, debug_d3drenderstate(State), Value); + } + break; + } + + case WINED3DRS_POSITIONDEGREE : + { + if(D3DDEGREE_CUBIC != Value) + ERR("(%p)->(%s,%ld) not yet implemented\n", This, debug_d3drenderstate(State), Value); + break; + } + + case WINED3DRS_NORMALDEGREE : + { + if(D3DDEGREE_LINEAR != Value) + ERR("(%p)->(%s,%ld) not yet implemented\n", This, debug_d3drenderstate(State), Value); + break; + } + + case WINED3DRS_MINTESSELLATIONLEVEL : + case WINED3DRS_MAXTESSELLATIONLEVEL : + case WINED3DRS_ADAPTIVETESS_X : + case WINED3DRS_ADAPTIVETESS_Y : + case WINED3DRS_ADAPTIVETESS_Z : + case WINED3DRS_ADAPTIVETESS_W : + { + if(This->stateBlock->renderState[WINED3DRS_ENABLEADAPTIVETESSELLATION]) + FIXME("(%p)->(%s,%ld) not yet implemented\n", This, debug_d3drenderstate(State), Value); + else + TRACE("(%p)->(%s,%ld): recording state but WINED3DRS_ENABLEADAPTIVETESSELLATION is not enabled\n", This, debug_d3drenderstate(State), Value); + break; + } + + case WINED3DRS_ENABLEADAPTIVETESSELLATION: + { + if(Value) + ERR("(%p)->(%s,%ld) not yet implemented\n", This, debug_d3drenderstate(State), Value); + break; + } + + case WINED3DRS_COLORWRITEENABLE1 : + case WINED3DRS_COLORWRITEENABLE2 : + case WINED3DRS_COLORWRITEENABLE3 : + { + /* depends on WINED3DRS_COLORWRITEENABLE. */ + if(0x0000000F != Value) + ERR("(%p)->(%s,%ld) not yet implemented. Missing of cap D3DPMISCCAPS_INDEPENDENTWRITEMASKS wasn't honored?\n", This, debug_d3drenderstate(State), Value); + break; + } + + case WINED3DRS_BLENDFACTOR : + { + if(0xFFFFFFFF != Value) + ERR("(%p)->(%s,%ld) not yet implemented. Missing of cap D3DPBLENDCAPS_BLENDFACTOR wasn't honored?\n", This, debug_d3drenderstate(State), Value); + break; + } + + case WINED3DRS_SRGBWRITEENABLE : + { + if(Value) + ERR("(%p)->(%s,%ld) not yet implemented\n", This, debug_d3drenderstate(State), Value); + break; + } + + case WINED3DRS_SEPARATEALPHABLENDENABLE : + { + if(Value) + ERR("(%p)->(%s,%ld) not yet implemented. Missing of cap D3DPMISCCAPS_SEPARATEALPHABLEND wasn't honored?\n", This, debug_d3drenderstate(State), Value); + break; + } + + case WINED3DRS_SRCBLENDALPHA : + case WINED3DRS_DESTBLENDALPHA : + case WINED3DRS_BLENDOPALPHA : + { + if(This->stateBlock->renderState[WINED3DRS_SEPARATEALPHABLENDENABLE]) + FIXME("(%p)->(%s,%ld) not yet implemented\n", This, debug_d3drenderstate(State), Value); + else + TRACE("(%p)->(%s,%ld): recording state but WINED3DRS_SEPARATEALPHABLENDENABLE is not enabled\n", This, debug_d3drenderstate(State), Value); + break; + } + default: - FIXME("(%p)->(%s,%ld) not handled yet\n", This, debug_d3drenderstate(State), Value); + FIXME("(%p)->(%s,%ld) unknown state\n", This, debug_d3drenderstate(State), Value); } LEAVE_GL();

1 0

Hwang YunSong(황윤성) : shell32: Updated Korean resource.
by Alexandre Julliard Aug. 8, 2006

Aug. 8, 2006

Module: wine Branch: refs/heads/master Commit: 8f6de4af74963abadbd3bcb4eb38f4bfd2d86a48 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8f6de4af74963abadbd3bcb… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Tue Aug 8 08:53:05 2006 +0900 shell32: Updated Korean resource. --- dlls/shell32/shell32_Ko.rc | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_Ko.rc b/dlls/shell32/shell32_Ko.rc index c16e40c..9d69748 100644 --- a/dlls/shell32/shell32_Ko.rc +++ b/dlls/shell32/shell32_Ko.rc @@ -164,8 +164,12 @@ IDS_CREATEFOLDER_CAPTION "�� IDS_DELETEITEM_CAPTION "�� Ȯ��" IDS_DELETEFOLDER_CAPTION "�� Ȯ��" IDS_DELETEITEM_TEXT "�� '%1'�� ⸦ �ٶ��ϱ�?" -IDS_DELETEMULTIPLE_TEXT "�� %1 ��(�̰͵�)�� ⸦ �ٶ��ϱ�?" -IDS_DELETESELECTED_TEXT "�� õ� ��(��)�� ⸦ �ٶ��ϱ�?" +IDS_DELETEMULTIPLE_TEXT "�� %1 ��(��)�� ⸦ �ٶ��ϱ�?" +IDS_DELETESELECTED_TEXT "�� õ� ��(��)�� ⸦ �ٶ��ϱ�?" +IDS_TRASHITEM_TEXT "�� '%1' ��(��) �� ⸦ �ٶ��ϱ�?" +IDS_TRASHFOLDER_TEXT "�� '%1' �� ⸦ �ٶ��ϱ�?" +IDS_TRASHMULTIPLE_TEXT "�� '%1' ��(��) �� ⸦ �ٶ��ϱ�?" +IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "�� %1�� �ڽ��ϱ�?" IDS_OVERWRITEFILE_CAPTION "�� �� Ȯ��"

1 0

Jan Zerebecki : wined3d: Correct check for GL ext. support in MULTISAMPLEANTIALIAS.
by Alexandre Julliard Aug. 8, 2006

Aug. 8, 2006

Module: wine Branch: refs/heads/master Commit: f5d9b221cf251439d55559e01c7229f8f493586a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f5d9b221cf251439d55559e… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Tue Aug 8 00:06:09 2006 +0200 wined3d: Correct check for GL ext. support in MULTISAMPLEANTIALIAS. --- dlls/wined3d/device.c | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4bff183..10d8546 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4363,24 +4363,31 @@ static HRESULT WINAPI IWineD3DDeviceImpl so far as I can tell, wrapping and texture-coordinate generate go hand in hand, */ - TRACE("(%p)->(%s,%ld) Texture wraping not yet supported\n",This, debug_d3drenderstate(State), Value); - break; - case WINED3DRS_MULTISAMPLEANTIALIAS : { - if (!GL_SUPPORT(ARB_MULTISAMPLE)) { - TRACE("Multisample antialiasing not supported\n"); - break; + if(Value) { + ERR("(%p)->(%s,%ld) Texture wraping not yet supported\n",This, debug_d3drenderstate(State), Value); } + break; + } - if(Value) { - glEnable(GL_MULTISAMPLE_ARB); - checkGLcall("glEnable(GL_MULTISAMPLE_ARB)"); + case WINED3DRS_MULTISAMPLEANTIALIAS : + { + if( GL_SUPPORT(ARB_MULTISAMPLE) ) { + if(Value) { + glEnable(GL_MULTISAMPLE_ARB); + checkGLcall("glEnable(GL_MULTISAMPLE_ARB)"); + } else { + glDisable(GL_MULTISAMPLE_ARB); + checkGLcall("glDisable(GL_MULTISAMPLE_ARB)"); + } } else { - glDisable(GL_MULTISAMPLE_ARB); - checkGLcall("glDisable(GL_MULTISAMPLE_ARB)"); + if(Value) { + ERR("Multisample antialiasing not supported by gl\n"); + } } break; } + case WINED3DRS_SCISSORTESTENABLE : { if(Value) {

1 0

Jan Zerebecki : wined3d: Add missing newline at the end of traces.
by Alexandre Julliard Aug. 8, 2006

Aug. 8, 2006

Module: wine Branch: refs/heads/master Commit: f02af2403916d923477a128301a369ec5deecf07 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f02af2403916d923477a128… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Tue Aug 8 00:04:24 2006 +0200 wined3d: Add missing newline at the end of traces. --- dlls/wined3d/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7af7151..4bff183 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3886,9 +3886,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_RANGEFOGENABLE : { if (Value) { - TRACE("Enabled RANGEFOG"); + TRACE("Enabled RANGEFOG\n"); } else { - TRACE("Disabled RANGEFOG"); + TRACE("Disabled RANGEFOG\n"); } } break;

1 0

Jan Zerebecki : wined3d: Registry setting for the amount of simulated texture memory.
by Alexandre Julliard Aug. 8, 2006

Aug. 8, 2006

Module: wine Branch: refs/heads/master Commit: 4d6cfb63512ea7dd6c986856b6f5bfbfd06e71e5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4d6cfb63512ea7dd6c98685… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Tue Aug 8 00:03:06 2006 +0200 wined3d: Registry setting for the amount of simulated texture memory. Set VideoMemorySize under HKCU\Software\Wine\Direct3D to amount in MB as string. --- dlls/wined3d/device.c | 20 ++++++++++---------- dlls/wined3d/wined3d_main.c | 14 ++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7429512..7af7151 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -70,9 +70,6 @@ inline static Display *get_display( HDC return display; } -/* Memory tracking and object counting */ -static unsigned int emulated_textureram = 64*1024*1024; - /* TODO: setup some flags in the regestry to enable, disable pbuffer support */ /* enable pbuffer support for offscreen textures */ BOOL pbuffer_support = FALSE; @@ -2264,19 +2261,22 @@ static HRESULT WINAPI IWineD3DDeviceImpl static UINT WINAPI IWineD3DDeviceImpl_GetAvailableTextureMem(IWineD3DDevice *iface) { /** NOTE: There's a probably a hack-around for this one by putting as many pbuffers, VBO's (or whatever) * Into the video ram as possible and seeing how many fit - * you can also get the correct initial value from via X and ATI's driver + * you can also get the correct initial value from nvidia and ATI's driver via X + * texture memory is video memory + AGP memory *******************/ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; static BOOL showfixmes = TRUE; if (showfixmes) { - FIXME("(%p) : stub, emulating %dMB for now, returning %dMB\n", This, (emulated_textureram/(1024*1024)), - ((emulated_textureram - wineD3DGlobalStatistics->glsurfaceram) / (1024*1024))); + FIXME("(%p) : stub, simulating %dMB for now, returning %dMB left\n", This, + (wined3d_settings.emulated_textureram/(1024*1024)), + ((wined3d_settings.emulated_textureram - wineD3DGlobalStatistics->glsurfaceram) / (1024*1024))); showfixmes = FALSE; } - TRACE("(%p) : emulating %dMB for now, returning %dMB\n", This, (emulated_textureram/(1024*1024)), - ((emulated_textureram - wineD3DGlobalStatistics->glsurfaceram) / (1024*1024))); - /* videomemory is simulated videomemory + AGP memory left */ - return (emulated_textureram - wineD3DGlobalStatistics->glsurfaceram); + TRACE("(%p) : simulating %dMB, returning %dMB left\n", This, + (wined3d_settings.emulated_textureram/(1024*1024)), + ((wined3d_settings.emulated_textureram - wineD3DGlobalStatistics->glsurfaceram) / (1024*1024))); + /* return simulated texture memory left */ + return (wined3d_settings.emulated_textureram - wineD3DGlobalStatistics->glsurfaceram); } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 1021932..6b43995 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -100,6 +100,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, HKEY hkey = 0; HKEY appkey = 0; DWORD len; + wined3d_settings.emulated_textureram = 64*1024*1024; DisableThreadLibraryCalls(hInstDLL); @@ -225,6 +226,19 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, wined3d_settings.rendertargetlock_mode = RTL_TEXTEX; } } + if ( !get_config_key( hkey, appkey, "VideoMemorySize", buffer, size) ) + { + int TmpVideoMemorySize = atoi(buffer); + if(TmpVideoMemorySize > 0) + { + wined3d_settings.emulated_textureram = TmpVideoMemorySize *1024*1024; + TRACE("Use %iMB = %d byte for emulated_textureram\n", + TmpVideoMemorySize, + wined3d_settings.emulated_textureram); + } + else + ERR("VideoMemorySize is %i but must be >0\n", TmpVideoMemorySize); + } } if (wined3d_settings.vs_mode == VS_HW) TRACE("Allow HW vertex shaders\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a87439b..0010062 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -159,6 +159,8 @@ typedef struct wined3d_settings_s { /* nonpower 2 function */ int nonpower2_mode; int rendertargetlock_mode; +/* Memory tracking and object counting */ + unsigned int emulated_textureram; } wined3d_settings_t; extern wined3d_settings_t wined3d_settings;

1 0

Francois Gouget : wine.inf: lnkfile\shellex\ContextMenuHandlers\... is not supposed to have a default value.
by Alexandre Julliard Aug. 8, 2006

Aug. 8, 2006

Module: wine Branch: refs/heads/master Commit: f1adb69c2ea1e67711cf9651ccb70134b326bbbf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f1adb69c2ea1e67711cf965… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 7 21:18:41 2006 +0200 wine.inf: lnkfile\shellex\ContextMenuHandlers\... is not supposed to have a default value. --- tools/wine.inf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 8ec5945..fda13f0 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -112,7 +112,7 @@ HKCR,lnkfile,"NeverShowExt",2,"" HKCR,lnkfile,"IsShortcut",2,"yes" HKCR,lnkfile\CLSID,,2,"{00021401-0000-0000-C000-000000000046}" HKCR,lnkfile\shellex\IconHandler,,2,"{00021401-0000-0000-C000-000000000046}" -HKCR,lnkfile\shellex\ContextMenuHandlers\{00021401-0000-0000-C000-000000000046},,2,"" +HKCR,lnkfile\shellex\ContextMenuHandlers\{00021401-0000-0000-C000-000000000046},,0x10, HKCR,Msi.Package\DefaultIcon,,2,"msiexec.exe" HKCR,Msi.Package\shell\Open\command,,2,"msiexec /i %1" HKCR,Msi.Package\shell\Repair\command,,2,"msiexec /f %1"

1 0

Francois Gouget : wine.inf: Don' t create a fake exe and change the name at the same time.
by Alexandre Julliard Aug. 8, 2006

Aug. 8, 2006

Module: wine Branch: refs/heads/master Commit: efafe08fc6a6d843e52069095947c70abeab867e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=efafe08fc6a6d843e520690… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 7 21:38:14 2006 +0200 wine.inf: Don't create a fake exe and change the name at the same time. This confuses installers that think said exes can be run when this is not the case and cannot work. --- tools/wine.inf | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index b16a463..8ec5945 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2120,7 +2120,6 @@ HKLM,%CurrentVersion%\Telephony\Country 10,,rundll32.exe 10,,winebrowser.exe 10,,winhelp.exe -10,,winhlp32.exe,winhelp.exe 10,command,start.exe 11,,advapi32.dll 11,,advpack.dll @@ -2132,7 +2131,6 @@ HKLM,%CurrentVersion%\Telephony\Country 11,,dbghelp.dll 11,,ddraw.dll 11,,gdi32.dll -11,,help.exe,winhelp.exe 11,,hhctrl.ocx 11,,imaadp32.acm 11,,imagehlp.dll

1 0

Francois Gouget : wine.inf: Use %CurrentVersionNT% wherever applicable.
by Alexandre Julliard Aug. 8, 2006

Aug. 8, 2006

Module: wine Branch: refs/heads/master Commit: dec695f6c1a29b6189243c4c3c1f931b5585ce37 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dec695f6c1a29b6189243c4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 7 21:37:34 2006 +0200 wine.inf: Use %CurrentVersionNT% wherever applicable. --- tools/wine.inf | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index a39670d..b16a463 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -164,8 +164,8 @@ HKLM,%CurrentVersionNT%\Fonts,,,"" HKLM,%CurrentVersionNT%\Q246009,"Installed",,"1" [Debugger] -HKLM,Software\Microsoft\Windows NT\CurrentVersion\AeDebug,"Debugger",2,"winedbg --auto %ld %ld" -HKLM,Software\Microsoft\Windows NT\CurrentVersion\AeDebug,"Auto",2,"1" +HKLM,%CurrentVersionNT%\AeDebug,"Debugger",2,"winedbg --auto %ld %ld" +HKLM,%CurrentVersionNT%\AeDebug,"Auto",2,"1" HKCU,Software\Wine\Debug,"RelayExclude",2,"ntdll.RtlEnterCriticalSection;ntdll.RtlLeaveCriticalSection;kernel32.97;kernel32.98" [Desktop]

1 0