November 2008 - Wine-Commits

Vincent Povirk : setupapi: Implement FLG_PROFITEM_GROUP.
by Alexandre Julliard Nov. 24, 2008

Nov. 24, 2008

Module: wine Branch: master Commit: b7fe5e0aa587f450e6d70f2994be92ecf85fc809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7fe5e0aa587f450e6d70f299… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 13 10:33:09 2008 -0600 setupapi: Implement FLG_PROFITEM_GROUP. --- dlls/setupapi/install.c | 106 ++++++++++++++++++++++------------------ dlls/setupapi/tests/install.c | 8 +++- include/setupapi.h | 5 ++ 3 files changed, 70 insertions(+), 49 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 133fb33..b68aa0b 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -787,9 +787,6 @@ static BOOL profile_items_callback( HINF hinf, PCWSTR field, void *arg ) LPWSTR cmdline=NULL, lnkpath_end; unsigned int name_size; INFCONTEXT name_context, context; - IShellLinkW* shelllink=NULL; - IPersistFile* persistfile=NULL; - HRESULT initresult=E_FAIL; int attrs=0; static const WCHAR dotlnk[] = {'.','l','n','k',0}; @@ -799,7 +796,7 @@ static BOOL profile_items_callback( HINF hinf, PCWSTR field, void *arg ) if (SetupFindFirstLineW( hinf, field, Name, &name_context )) { SetupGetIntField( &name_context, 2, &attrs ); - if (attrs) FIXME( "unhandled attributes: %x\n", attrs ); + if (attrs & ~FLG_PROFITEM_GROUP) FIXME( "unhandled attributes: %x\n", attrs ); } else return TRUE; @@ -808,7 +805,7 @@ static BOOL profile_items_callback( HINF hinf, PCWSTR field, void *arg ) lnkpath_end = lnkpath + strlenW(lnkpath); if (lnkpath_end[-1] != '\\') *lnkpath_end++ = '\\'; - if (SetupFindFirstLineW( hinf, field, SubDir, &context )) + if (!(attrs & FLG_PROFITEM_GROUP) && SetupFindFirstLineW( hinf, field, SubDir, &context )) { unsigned int subdir_size; @@ -823,67 +820,80 @@ static BOOL profile_items_callback( HINF hinf, PCWSTR field, void *arg ) return TRUE; lnkpath_end += name_size - 1; - if (lnkpath+MAX_PATH < lnkpath_end + 5) return TRUE; - strcpyW( lnkpath_end, dotlnk ); - TRACE( "link path: %s\n", debugstr_w(lnkpath) ); - - /* calculate command line */ - if (SetupFindFirstLineW( hinf, field, CmdLine, &context )) + if (attrs & FLG_PROFITEM_GROUP) { - unsigned int dir_len=0, subdir_size=0, filename_size=0; - int dirid=0; - LPCWSTR dir; - LPWSTR cmdline_end; - - SetupGetIntField( &context, 1, &dirid ); - dir = DIRID_get_string( dirid ); + SHPathPrepareForWriteW( NULL, NULL, lnkpath, SHPPFW_DIRCREATE ); + } + else + { + IShellLinkW* shelllink=NULL; + IPersistFile* persistfile=NULL; + HRESULT initresult=E_FAIL; - if (dir) dir_len = strlenW(dir); + if (lnkpath+MAX_PATH < lnkpath_end + 5) return TRUE; + strcpyW( lnkpath_end, dotlnk ); - SetupGetStringFieldW( &context, 2, NULL, 0, &subdir_size ); - SetupGetStringFieldW( &context, 3, NULL, 0, &filename_size ); + TRACE( "link path: %s\n", debugstr_w(lnkpath) ); - if (dir_len && filename_size) + /* calculate command line */ + if (SetupFindFirstLineW( hinf, field, CmdLine, &context )) { - cmdline = cmdline_end = HeapAlloc( GetProcessHeap(), 0, sizeof(WCHAR) * (dir_len+subdir_size+filename_size+1) ); + unsigned int dir_len=0, subdir_size=0, filename_size=0; + int dirid=0; + LPCWSTR dir; + LPWSTR cmdline_end; - strcpyW( cmdline_end, dir ); - cmdline_end += dir_len; - if (cmdline_end[-1] != '\\') *cmdline_end++ = '\\'; + SetupGetIntField( &context, 1, &dirid ); + dir = DIRID_get_string( dirid ); - if (subdir_size) + if (dir) dir_len = strlenW(dir); + + SetupGetStringFieldW( &context, 2, NULL, 0, &subdir_size ); + SetupGetStringFieldW( &context, 3, NULL, 0, &filename_size ); + + if (dir_len && filename_size) { - SetupGetStringFieldW( &context, 2, cmdline_end, subdir_size, NULL ); - cmdline_end += subdir_size-1; + cmdline = cmdline_end = HeapAlloc( GetProcessHeap(), 0, sizeof(WCHAR) * (dir_len+subdir_size+filename_size+1) ); + + strcpyW( cmdline_end, dir ); + cmdline_end += dir_len; if (cmdline_end[-1] != '\\') *cmdline_end++ = '\\'; + + if (subdir_size) + { + SetupGetStringFieldW( &context, 2, cmdline_end, subdir_size, NULL ); + cmdline_end += subdir_size-1; + if (cmdline_end[-1] != '\\') *cmdline_end++ = '\\'; + } + SetupGetStringFieldW( &context, 3, cmdline_end, filename_size, NULL ); + TRACE( "cmdline: %s\n", debugstr_w(cmdline)); } - SetupGetStringFieldW( &context, 3, cmdline_end, filename_size, NULL ); - TRACE( "cmdline: %s\n", debugstr_w(cmdline)); } - } - if (!cmdline) return TRUE; + if (!cmdline) return TRUE; - initresult = CoInitialize(NULL); + initresult = CoInitialize(NULL); - if (!SUCCEEDED(CoCreateInstance( &CLSID_ShellLink, NULL, - CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (LPVOID*)&shelllink))) - goto done; + if (!SUCCEEDED(CoCreateInstance( &CLSID_ShellLink, NULL, + CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (LPVOID*)&shelllink))) + goto done; - IShellLinkW_SetPath( shelllink, cmdline ); - SHPathPrepareForWriteW( NULL, NULL, lnkpath, SHPPFW_DIRCREATE|SHPPFW_IGNOREFILENAME ); - if (SUCCEEDED(IShellLinkW_QueryInterface( shelllink, &IID_IPersistFile, (LPVOID*)&persistfile))) - { - TRACE( "writing link: %s\n", debugstr_w(lnkpath) ); - IPersistFile_Save( persistfile, lnkpath, FALSE ); - IPersistFile_Release( persistfile ); + IShellLinkW_SetPath( shelllink, cmdline ); + SHPathPrepareForWriteW( NULL, NULL, lnkpath, SHPPFW_DIRCREATE|SHPPFW_IGNOREFILENAME ); + if (SUCCEEDED(IShellLinkW_QueryInterface( shelllink, &IID_IPersistFile, (LPVOID*)&persistfile))) + { + TRACE( "writing link: %s\n", debugstr_w(lnkpath) ); + IPersistFile_Save( persistfile, lnkpath, FALSE ); + IPersistFile_Release( persistfile ); + } + IShellLinkW_Release( shelllink ); + + done: + if (SUCCEEDED(initresult)) CoUninitialize(); + HeapFree( GetProcessHeap(), 0, cmdline ); } - IShellLinkW_Release( shelllink ); -done: - if (SUCCEEDED(initresult)) CoUninitialize(); - HeapFree( GetProcessHeap(), 0, cmdline ); return TRUE; } diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 9be46fe..981dce3 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -393,7 +393,7 @@ static void test_profile_items(void) "[Version]\n" "Signature=\"$Chicago$\"\n" "[DefaultInstall]\n" - "ProfileItems=TestItem,TestItem2\n" + "ProfileItems=TestItem,TestItem2,TestGroup\n" "[TestItem]\n" "Name=TestItem\n" "CmdLine=11,,notepad.exe\n" @@ -401,6 +401,8 @@ static void test_profile_items(void) "Name=TestItem2\n" "CmdLine=11,,notepad.exe\n" "SubDir=TestDir\n" + "[TestGroup]\n" + "Name=TestGroup,4\n" ; hShell32 = LoadLibraryA("shell32"); @@ -432,6 +434,8 @@ static void test_profile_items(void) ok(INVALID_FILE_ATTRIBUTES != GetFileAttributes(path), "directory not created\n"); snprintf(path, MAX_PATH, "%s\\TestDir\\TestItem2.lnk", commonprogs); ok(INVALID_FILE_ATTRIBUTES != GetFileAttributes(path), "link not created\n"); + snprintf(path, MAX_PATH, "%s\\TestGroup", commonprogs); + ok(INVALID_FILE_ATTRIBUTES != GetFileAttributes(path), "group not created\n"); } snprintf(path, MAX_PATH, "%s\\TestItem.lnk", commonprogs); @@ -442,6 +446,8 @@ static void test_profile_items(void) DeleteFile(path); snprintf(path, MAX_PATH, "%s\\TestDir", commonprogs); RemoveDirectory(path); + snprintf(path, MAX_PATH, "%s\\TestGroup", commonprogs); + RemoveDirectory(path); cleanup: if (hShell32) FreeLibrary(hShell32); diff --git a/include/setupapi.h b/include/setupapi.h index cb680d2..88c35eb 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1054,6 +1054,11 @@ DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_INF_SIGNER_INFO) #define FLG_REGSVR_DLLREGISTER 0x00000001 #define FLG_REGSVR_DLLINSTALL 0x00000002 +#define FLG_PROFITEM_CURRENTUSER 0x00000001 +#define FLG_PROFITEM_DELETE 0x00000002 +#define FLG_PROFITEM_GROUP 0x00000004 +#define FLG_PROFITEM_CSIDL 0x00000008 + #define DI_NOVCP 0x00000008 /* Class installer function codes */

1 0

Roderick Colenbrander : wined3d: Add registry key for overriding the pci vendor id.
by Alexandre Julliard Nov. 24, 2008

Nov. 24, 2008

Module: wine Branch: master Commit: 273357264a97ac6d50f481d7206718f62126a80c URL: http://source.winehq.org/git/wine.git/?a=commit;h=273357264a97ac6d50f481d72… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Nov 23 22:51:03 2008 +0100 wined3d: Add registry key for overriding the pci vendor id. --- dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/wined3d_main.c | 16 ++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8b63173..9716398 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1675,6 +1675,12 @@ static HRESULT WINAPI IWineD3DImpl_GetAdapterIdentifier(IWineD3D *iface, UINT Ad *(pIdentifier->DeviceId) = wined3d_settings.pci_device_id; } + if(wined3d_settings.pci_vendor_id != PCI_VENDOR_NONE) + { + TRACE_(d3d_caps)("Overriding pci vendor id with: %x\n", wined3d_settings.pci_vendor_id); + *(pIdentifier->VendorId) = wined3d_settings.pci_vendor_id; + } + if (Flags & WINED3DENUM_NO_WHQL_LEVEL) { *(pIdentifier->WHQLLevel) = 0; } else { diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 3175c3d..ee8f07f 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -43,6 +43,7 @@ wined3d_settings_t wined3d_settings = TRUE, /* Use of GLSL enabled by default */ ORM_BACKBUFFER, /* Use the backbuffer to do offscreen rendering */ RTL_AUTO, /* Automatically determine best locking method */ + PCI_VENDOR_NONE,/* PCI Vendor ID */ PCI_DEVICE_NONE,/* PCI Device ID */ 0, /* The default of memory is set in FillGLCaps */ NULL, /* No wine logo by default */ @@ -263,6 +264,21 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) wined3d_settings.pci_device_id = pci_device_id; } } + if ( !get_config_key_dword( hkey, appkey, "VideoPciVendorID", &tmpvalue) ) + { + int pci_vendor_id = tmpvalue; + + /* A pci device id is 16-bit */ + if(pci_vendor_id > 0xffff) + { + ERR("Invalid value for VideoPciVendorID. The value should be smaller or equal to 65535 or 0xffff\n"); + } + else + { + TRACE("Using PCI Vendor ID %04x\n", pci_vendor_id); + wined3d_settings.pci_vendor_id = pci_vendor_id; + } + } if ( !get_config_key( hkey, appkey, "VideoMemorySize", buffer, size) ) { int TmpVideoMemorySize = atoi(buffer); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0e8fe52..e3d35f2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -185,6 +185,7 @@ static inline float float_16_to_32(const unsigned short *in) { #define RTL_TEXDRAW 3 #define RTL_TEXTEX 4 +#define PCI_VENDOR_NONE 0xffff /* e.g. 0x8086 for Intel and 0x10de for Nvidia */ #define PCI_DEVICE_NONE 0xffff /* e.g. 0x14f for a Geforce6200 */ /* NOTE: When adding fields to this structure, make sure to update the default @@ -200,6 +201,7 @@ typedef struct wined3d_settings_s { BOOL glslRequested; int offscreen_rendering_mode; int rendertargetlock_mode; + unsigned short pci_vendor_id; unsigned short pci_device_id; /* Memory tracking and object counting */ unsigned int emulated_textureram;

1 0

Roderick Colenbrander : wined3d: Add registry key for overriding pci device id.
by Alexandre Julliard Nov. 24, 2008

Nov. 24, 2008

Module: wine Branch: master Commit: 52d59718c72049649d95518fe8a5b007c8cb6c94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52d59718c72049649d95518fe… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Nov 23 22:33:29 2008 +0100 wined3d: Add registry key for overriding pci device id. --- dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/wined3d_main.c | 27 ++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 3 +++ 3 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e096c86..8b63173 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1669,6 +1669,12 @@ static HRESULT WINAPI IWineD3DImpl_GetAdapterIdentifier(IWineD3D *iface, UINT Ad *(pIdentifier->Revision) = 0; *pIdentifier->DeviceIdentifier = IID_D3DDEVICE_D3DUID; + if(wined3d_settings.pci_device_id != PCI_DEVICE_NONE) + { + TRACE_(d3d_caps)("Overriding pci device id with: %x\n", wined3d_settings.pci_device_id); + *(pIdentifier->DeviceId) = wined3d_settings.pci_device_id; + } + if (Flags & WINED3DENUM_NO_WHQL_LEVEL) { *(pIdentifier->WHQLLevel) = 0; } else { diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index fa1d028..3175c3d 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -43,6 +43,7 @@ wined3d_settings_t wined3d_settings = TRUE, /* Use of GLSL enabled by default */ ORM_BACKBUFFER, /* Use the backbuffer to do offscreen rendering */ RTL_AUTO, /* Automatically determine best locking method */ + PCI_DEVICE_NONE,/* PCI Device ID */ 0, /* The default of memory is set in FillGLCaps */ NULL, /* No wine logo by default */ FALSE /* Disable multisampling for now due to Nvidia driver bugs which happens for some users */ @@ -77,6 +78,15 @@ static inline DWORD get_config_key(HKEY defkey, HKEY appkey, const char* name, c return ERROR_FILE_NOT_FOUND; } +static inline DWORD get_config_key_dword(HKEY defkey, HKEY appkey, const char* name, DWORD *data) +{ + DWORD type; + DWORD size = sizeof(DWORD); + if (0 != appkey && !RegQueryValueExA( appkey, name, 0, &type, (LPBYTE) data, &size ) && (type == REG_DWORD)) return 0; + if (0 != defkey && !RegQueryValueExA( defkey, name, 0, &type, (LPBYTE) data, &size ) && (type == REG_DWORD)) return 0; + return ERROR_FILE_NOT_FOUND; +} + static void wined3d_do_nothing(void) { } @@ -92,7 +102,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) DWORD size = sizeof(buffer); HKEY hkey = 0; HKEY appkey = 0; - DWORD len; + DWORD len, tmpvalue; WNDCLASSA wc; /* We need our own window class for a fake window which we use to retrieve GL capabilities */ @@ -238,6 +248,21 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) wined3d_settings.rendertargetlock_mode = RTL_TEXTEX; } } + if ( !get_config_key_dword( hkey, appkey, "VideoPciDeviceID", &tmpvalue) ) + { + int pci_device_id = tmpvalue; + + /* A pci device id is 16-bit */ + if(pci_device_id > 0xffff) + { + ERR("Invalid value for VideoPciDeviceID. The value should be smaller or equal to 65535 or 0xffff\n"); + } + else + { + TRACE("Using PCI Device ID %04x\n", pci_device_id); + wined3d_settings.pci_device_id = pci_device_id; + } + } if ( !get_config_key( hkey, appkey, "VideoMemorySize", buffer, size) ) { int TmpVideoMemorySize = atoi(buffer); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fb05ec0..0e8fe52 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -185,6 +185,8 @@ static inline float float_16_to_32(const unsigned short *in) { #define RTL_TEXDRAW 3 #define RTL_TEXTEX 4 +#define PCI_DEVICE_NONE 0xffff /* e.g. 0x14f for a Geforce6200 */ + /* NOTE: When adding fields to this structure, make sure to update the default * values in wined3d_main.c as well. */ typedef struct wined3d_settings_s { @@ -198,6 +200,7 @@ typedef struct wined3d_settings_s { BOOL glslRequested; int offscreen_rendering_mode; int rendertargetlock_mode; + unsigned short pci_device_id; /* Memory tracking and object counting */ unsigned int emulated_textureram; char *logo;

1 0

Hwang YunSong(황윤성) : appwiz.cpl: Updated Korean resource.
by Alexandre Julliard Nov. 24, 2008

Nov. 24, 2008

Module: wine Branch: master Commit: 04e139a1e6e6722d51c85f954a35e8e62535de6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=04e139a1e6e6722d51c85f954… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Nov 24 09:49:21 2008 +0900 appwiz.cpl: Updated Korean resource. --- dlls/appwiz.cpl/Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/appwiz.cpl/Ko.rc b/dlls/appwiz.cpl/Ko.rc index 9adc0c5..2c01136 100644 --- a/dlls/appwiz.cpl/Ko.rc +++ b/dlls/appwiz.cpl/Ko.rc @@ -29,7 +29,7 @@ STRINGTABLE IDS_TAB1_TITLE, "��α׷�" IDS_UNINSTALL_FAILED, "��ν��緯�� ϴ�, '%s'. �� α׷�� ν�� Ʈ�� ڽ��ϱ�?" - + IDS_NOT_SPECIFIED, "�� " IDS_COLUMN_NAME, "�̸�" IDS_COLUMN_PUBLISHER, "��ۻ�" IDS_COLUMN_VERSION, "��"

1 0

Vincent Pelletier : wined3d: Add detection for NVIDIA's GTX 280.
by Alexandre Julliard Nov. 24, 2008

Nov. 24, 2008

Module: wine Branch: master Commit: f442bafb8a84ce819b7498d165dd649c8fe78bbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f442bafb8a84ce819b7498d16… Author: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Sat Nov 22 00:54:46 2008 +0100 wined3d: Add detection for NVIDIA's GTX 280. --- dlls/wined3d/directx.c | 8 +++++++- dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index effc9eb..e096c86 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1074,8 +1074,13 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { * shader capabilities, so we use the shader capabilities to distinguish between FX and 6xxx/7xxx. */ if(WINE_D3D9_CAPABLE(gl_info) && (gl_info->vs_nv_version == VS_VERSION_30)) { + /* Geforce GTX - highend */ + if(strstr(gl_info->gl_renderer, "GTX 280")) { + gl_info->gl_card = CARD_NVIDIA_GEFORCE_GTX280; + vidmem = 1024; + } /* Geforce9 - highend */ - if(strstr(gl_info->gl_renderer, "9800")) { + else if(strstr(gl_info->gl_renderer, "9800")) { gl_info->gl_card = CARD_NVIDIA_GEFORCE_9800GT; vidmem = 512; } @@ -3847,6 +3852,7 @@ static const struct driver_version_information driver_version_table[] = { {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTS, 7, 15, 11, 7341 }, {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, 7, 15, 11, 7341 }, {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9800GT, 7, 15, 11, 7341 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, 7, 15, 11, 7341 }, /* ATI cards. The driver versions are somewhat similar, but not quite the same. Let's hardcode */ {VENDOR_ATI, CARD_ATI_RADEON_9500, 6, 14, 10, 6764 }, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 4dba7d2..0dababc 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3254,6 +3254,7 @@ typedef enum _GL_Cards { CARD_NVIDIA_GEFORCE_8800GTS = 0x0193, CARD_NVIDIA_GEFORCE_9600GT = 0x0622, CARD_NVIDIA_GEFORCE_9800GT = 0x0614, + CARD_NVIDIA_GEFORCE_GTX280 = 0x05e1, CARD_INTEL_845G = 0x2562, CARD_INTEL_I830G = 0x3577,

1 0

Hwang YunSong(황윤성) : wordpad: Updated Korean resource.
by Alexandre Julliard Nov. 24, 2008

Nov. 24, 2008

Module: wine Branch: master Commit: f927b89f3d582415b5c4eb96dd0e3ceadb149c72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f927b89f3d582415b5c4eb96d… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Nov 24 09:48:32 2008 +0900 wordpad: Updated Korean resource. --- programs/wordpad/Ko.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index c0a9ffb..86e6a42 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -166,13 +166,13 @@ Caption "" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "�� ѱ��", 0, 10, 10, 130, 85 - RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 + RADIOBUTTON "�ٳѱ�� ", IDC_PAGEFMT_WN, 18, 25, 117, 15 RADIOBUTTON "â ��ڸ�� ѱ��(&W)", IDC_PAGEFMT_WW, 18, 45, 117, 15 RADIOBUTTON "��ڸ�� ѱ��(&M)", IDC_PAGEFMT_WM, 18, 65, 117, 15 GROUPBOX " ��", 0, 150, 10, 120, 85 CHECKBOX "��(&T)", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "��Ĺ�(&F)", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "��̹�(&R)", IDC_PAGEFMT_RU, 160, 56, 80, 15 CHECKBOX "��¹�(&S)", IDC_PAGEFMT_SB, 160, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END @@ -233,9 +233,9 @@ BEGIN STRING_SEARCH_FINISHED, "�� ã�� ." STRING_LOAD_RICHED_FAILED, "��ġ�ؽ�Ʈ ��̺귯�� ҷ�� ." STRING_SAVE_LOSEFORMATTING, "�� ؽ�Ʈ �� ϱ⸦ ��߽��ϴ�, " \ - "�̰�� Ư�� ٹ�� Դϴ�. " \ + "�̰�� Դϴ�. " \ "�� ϱ⸦ ��մϱ�?" - STRING_INVALID_NUMBER, "�ùٸ�� " + STRING_INVALID_NUMBER, "�ùٸ�� " STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE �� ʽ��ϴ�" STRING_WRITE_FAILED, "�� ϴ�." STRING_WRITE_ACCESS_DENIED, "�� ϴ�."

1 0

Hwang YunSong(황윤성) : crypt32: Updated Korean resource.
by Alexandre Julliard Nov. 24, 2008

Nov. 24, 2008

Module: wine Branch: master Commit: ca790a6e65198c56a079e6ccd69527a3431be086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca790a6e65198c56a079e6ccd… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Nov 24 09:46:31 2008 +0900 crypt32: Updated Korean resource. --- dlls/crypt32/crypt32_Ko.rc | 73 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 68 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/crypt32_Ko.rc b/dlls/crypt32/crypt32_Ko.rc index cdb89fc..72c3ab2 100644 --- a/dlls/crypt32/crypt32_Ko.rc +++ b/dlls/crypt32/crypt32_Ko.rc @@ -118,7 +118,7 @@ STRINGTABLE DISCARDABLE IDS_KEY_RECOVERY_AGENT "Ű �� " IDS_CERTIFICATE_TEMPLATE "�� (Template) ��" IDS_ENTERPRISE_ROOT_OID "�� Ʈ OID" - IDS_RDN_DUMMY_SIGNER "��¥ ��(Dummy Signer)" + IDS_RDN_DUMMY_SIGNER "�� " IDS_ARCHIVED_KEY_ATTR "��ȣȭ�� Ű" IDS_CRL_SELF_CDP "�� CRL ��ġ" IDS_REQUIRE_CERT_CHAIN_POLICY "�� ü�� å(Enforce Certificate Chain Policy)" @@ -159,7 +159,7 @@ STRINGTABLE DISCARDABLE IDS_IPSEC_IKE_INTERMEDIATE "IP �� IKE ��(intermediate)" IDS_FILE_RECOVERY "�� " IDS_ROOT_LIST_SIGNER "��Ʈ �� " - IDS_ANY_APPLICATION_POLICIES "�� Ǯ�׸�� ħ" + IDS_ANY_APPLICATION_POLICIES "�� α׷�� ħ" IDS_DS_EMAIL_REPLICATION "��丮 �� ̸�� " IDS_ENROLLMENT_AGENT "�� 䱸 ��" IDS_LIFETIME_SIGNING "�� " @@ -168,8 +168,71 @@ STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE { - IDS_LOCALIZEDNAME_ROOT "��ȸ �� ִ� ��Ʈ �˻��" - IDS_LOCALIZEDNAME_MY "��" - IDS_LOCALIZEDNAME_CA "�߰� �� Intermediate Certification Authorities" + IDS_LOCALIZEDNAME_ROOT "��ȸ �� ִ� ��Ʈ ��" + IDS_LOCALIZEDNAME_MY "��" + IDS_LOCALIZEDNAME_CA "�߰� �� " IDS_LOCALIZEDNAME_ADDRESSBOOK "�ٸ� ��" } + +STRINGTABLE DISCARDABLE +{ +IDS_KEY_ID "KeyID=" +IDS_CERT_ISSUER "�� " +IDS_CERT_SERIAL_NUMBER "�� ø�� ȣ=" +IDS_ALT_NAME_OTHER_NAME "�ٸ� �̸�=" +IDS_ALT_NAME_RFC822_NAME "�̸�� ּ�=" +IDS_ALT_NAME_DNS_NAME "DNS �̸�=" +IDS_ALT_NAME_DIRECTORY_NAME "��丮 �ּ�" +IDS_ALT_NAME_URL "URL=" +IDS_ALT_NAME_IP_ADDRESS "IP �ּ�=" +IDS_ALT_NAME_MASK "��ũ=" +IDS_ALT_NAME_REGISTERED_ID "��ϵ� ID=" +IDS_USAGE_UNKNOWN "�˼� �� Ű ��" +IDS_SUBJECT_TYPE "�� =" +IDS_SUBJECT_TYPE_CA "CA" +IDS_SUBJECT_TYPE_END_CERT "��ƼƼ ��" +IDS_PATH_LENGTH "��ѵ� �� =" +IDS_PATH_LENGTH_NONE "��" +IDS_INFO_NOT_AVAILABLE "�� " +IDS_AIA "�� " +IDS_ACCESS_METHOD "�� =" +IDS_ACCESS_METHOD_OCSP "OCSP" +IDS_ACCESS_METHOD_CA_ISSUERS "CA ��" +IDS_ACCESS_METHOD_UNKNOWN "�� " +IDS_ACCESS_LOCATION "��ü �̸�" +IDS_CRL_DIST_POINT "CRL �й� ��Ʈ" +IDS_CRL_DIST_POINT_NAME "�й� ��Ʈ �̸�" +IDS_CRL_DIST_POINT_FULL_NAME "��ü �̸�" +IDS_CRL_DIST_POINT_RDN_NAME "RDN �̸�" +IDS_CRL_DIST_POINT_REASON "CRL ��=" +IDS_CRL_DIST_POINT_ISSUER "CRL ��" +IDS_REASON_KEY_COMPROMISE "Key ��" +IDS_REASON_CA_COMPROMISE "CA ��" +IDS_REASON_AFFILIATION_CHANGED "�� " +IDS_REASON_SUPERSEDED "��ü" +IDS_REASON_CESSATION_OF_OPERATION "�۾� ��" +IDS_REASON_CERTIFICATE_HOLD "�� " +IDS_FINANCIAL_CRITERIA "�繫 ��=" +IDS_FINANCIAL_CRITERIA_AVAILABLE "��" +IDS_FINANCIAL_CRITERIA_NOT_AVAILABLE "�Ұ��" +IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA "�´� �� =" +IDS_YES "��" +IDS_NO "�ƴϿ�" +IDS_DIGITAL_SIGNATURE " �� " +IDS_NON_REPUDIATION "�� " +IDS_KEY_ENCIPHERMENT "Ű ��ȣȭ" +IDS_DATA_ENCIPHERMENT "�� ȣȭ" +IDS_KEY_AGREEMENT "Ű ��t" +IDS_CERT_SIGN "�� " +IDS_OFFLINE_CRL_SIGN "�� CRL ��" +IDS_CRL_SIGN "CRL ��" +IDS_ENCIPHER_ONLY "�� ȣȭ�� " +IDS_DECIPHER_ONLY "�� ȣȭ��" +IDS_NETSCAPE_SSL_CLIENT "SSL Ŭ��̾�Ʈ ��" +IDS_NETSCAPE_SSL_SERVER "SSL �� " +IDS_NETSCAPE_SMIME "S/MIME" +IDS_NETSCAPE_SIGN "��" +IDS_NETSCAPE_SSL_CA "SSL CA" +IDS_NETSCAPE_SMIME_CA "S/MIME CA" +IDS_NETSCAPE_SIGN_CA " CA ��" +}

1 0

Lei Zhang : advapi32: Allow opening HKEY_CLASSES_ROOT subkeys with backslash prefix on NT.
by Alexandre Julliard Nov. 24, 2008

Nov. 24, 2008

Module: wine Branch: master Commit: aacb511da1540fa015c5e853c90fd054b9442701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aacb511da1540fa015c5e853c… Author: Lei Zhang <thestig(a)google.com> Date: Fri Nov 21 17:03:51 2008 -0800 advapi32: Allow opening HKEY_CLASSES_ROOT subkeys with backslash prefix on NT. --- dlls/advapi32/registry.c | 8 ++++++++ dlls/advapi32/tests/registry.c | 7 +++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index ff574b2..6615bc0 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -306,6 +306,9 @@ LSTATUS WINAPI RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, REGSAM ac OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; + /* NT+ allows beginning backslash for HKEY_CLASSES_ROOT */ + if (hkey == HKEY_CLASSES_ROOT && name && *name == '\\') name++; + if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; attr.Length = sizeof(attr); @@ -346,6 +349,11 @@ LSTATUS WINAPI RegOpenKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, REGSAM acc NTSTATUS status; if (!is_version_nt()) access = KEY_ALL_ACCESS; /* Win95 ignores the access mask */ + else + { + /* NT+ allows beginning backslash for HKEY_CLASSES_ROOT */ + if (hkey == HKEY_CLASSES_ROOT && name && *name == '\\') name++; + } if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index b3331b4..1ef78d2 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -961,6 +961,13 @@ static void test_reg_open_key(void) ret == ERROR_FILE_NOT_FOUND /* Win9x,ME */ , "expected ERROR_BAD_PATHNAME or ERROR_FILE_NOT_FOUND, got %d\n", ret); + hkResult = NULL; + ret = RegOpenKeyExA(HKEY_CLASSES_ROOT, "\\clsid", 0, KEY_QUERY_VALUE, &hkResult); + ok(ret == ERROR_SUCCESS || /* NT/2k/XP */ + ret == ERROR_FILE_NOT_FOUND /* Win9x,ME */ + , "expected ERROR_SUCCESS or ERROR_FILE_NOT_FOUND, got %d\n", ret); + RegCloseKey(hkResult); + /* WOW64 flags */ hkResult = NULL; ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software", 0, KEY_READ|KEY_WOW64_32KEY, &hkResult);

1 0

Ricardo Filipe : advapi32: Removed dead assignments (llvm/clang).
by Alexandre Julliard Nov. 24, 2008

Nov. 24, 2008

Module: wine Branch: master Commit: a76d38d38e63f4f20ef113616f6f140f55450f95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a76d38d38e63f4f20ef113616… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Wed Nov 19 23:59:05 2008 +0000 advapi32: Removed dead assignments (llvm/clang). --- dlls/advapi32/cred.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 6600912..1e51c41 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -168,10 +168,7 @@ static DWORD registry_read_credential(HKEY hkey, PCREDENTIALW credential, ret = RegQueryValueExW(hkey, wszUserNameValue, 0, &type, (LPVOID)credential->UserName, &count); if (ret == ERROR_FILE_NOT_FOUND) - { credential->UserName = NULL; - ret = ERROR_SUCCESS; - } else if (ret != ERROR_SUCCESS) return ret; else if (type != REG_SZ) @@ -189,10 +186,7 @@ static DWORD registry_read_credential(HKEY hkey, PCREDENTIALW credential, credential->CredentialBlob = (LPBYTE)buffer; ret = read_credential_blob(hkey, key_data, credential->CredentialBlob, &count); if (ret == ERROR_FILE_NOT_FOUND) - { credential->CredentialBlob = NULL; - ret = ERROR_SUCCESS; - } else if (ret != ERROR_SUCCESS) return ret; credential->CredentialBlobSize = count;

1 0

Vincent Povirk : gdiplus: Implement CachedBitmap based on Image.
by Alexandre Julliard Nov. 24, 2008

Nov. 24, 2008

Module: wine Branch: master Commit: f3cad17a9ba33725e83e1c4d5492b919b39ce3d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3cad17a9ba33725e83e1c4d5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Nov 21 16:57:48 2008 -0600 gdiplus: Implement CachedBitmap based on Image. --- dlls/gdiplus/gdiplus_private.h | 2 +- dlls/gdiplus/image.c | 22 ++++------------------ 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 2dde79b..e9cbfa5 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -197,7 +197,7 @@ struct GpBitmap{ }; struct GpCachedBitmap{ - GpBitmap *bmp; + GpImage *image; }; struct GpImageAttributes{ diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index e44315a..6e0c468 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -552,7 +552,6 @@ GpStatus WINGDIPAPI GdipCreateCachedBitmap(GpBitmap *bitmap, GpGraphics *graphic GpCachedBitmap **cachedbmp) { GpStatus stat; - GpImage *copy; TRACE("%p %p %p\n", bitmap, graphics, cachedbmp); @@ -562,26 +561,13 @@ GpStatus WINGDIPAPI GdipCreateCachedBitmap(GpBitmap *bitmap, GpGraphics *graphic *cachedbmp = GdipAlloc(sizeof(GpCachedBitmap)); if(!*cachedbmp) return OutOfMemory; - (*cachedbmp)->bmp = GdipAlloc(sizeof(GpBitmap)); - if(!(*cachedbmp)->bmp){ - GdipFree(*cachedbmp); - return OutOfMemory; - } - copy = &(*cachedbmp)->bmp->image; - stat = GdipCloneImage(&(bitmap->image), &copy); + stat = GdipCloneImage(&(bitmap->image), &(*cachedbmp)->image); if(stat != Ok){ GdipFree(*cachedbmp); return stat; } - (*cachedbmp)->bmp->width = bitmap->width; - (*cachedbmp)->bmp->height = bitmap->height; - (*cachedbmp)->bmp->format = bitmap->format; - (*cachedbmp)->bmp->lockmode = 0; - (*cachedbmp)->bmp->numlocks = 0; - (*cachedbmp)->bmp->bitmapbits = NULL; - return Ok; } @@ -592,8 +578,8 @@ GpStatus WINGDIPAPI GdipDeleteCachedBitmap(GpCachedBitmap *cachedbmp) if(!cachedbmp) return InvalidParameter; - GdipDisposeImage(&cachedbmp->bmp->image); - GdipFree(cachedbmp->bmp); + GdipDisposeImage(cachedbmp->image); + GdipFree(cachedbmp); return Ok; } @@ -606,7 +592,7 @@ GpStatus WINGDIPAPI GdipDrawCachedBitmap(GpGraphics *graphics, if(!graphics || !cachedbmp) return InvalidParameter; - return GdipDrawImage(graphics, &cachedbmp->bmp->image, (REAL)x, (REAL)y); + return GdipDrawImage(graphics, cachedbmp->image, (REAL)x, (REAL)y); } GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image)

1 0