wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

Austin English : msvcrt: Fix tests for Windows ME.
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: de83c5308575fb227ba3faabed7b3c00015ae55c URL: http://source.winehq.org/git/wine.git/?a=commit;h=de83c5308575fb227ba3faabe… Author: Austin English <austinenglish(a)gmail.com> Date: Mon May 3 18:36:16 2010 -0500 msvcrt: Fix tests for Windows ME. --- dlls/msvcrt/tests/locale.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 23ecbc5..df7d8e7 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -437,23 +437,27 @@ static void test_setlocale(void) if(ret) todo_wine ok((!strcmp( ret, "Norwegian-Nynorsk_Norway.1252")) || broken(!strcmp(ret, "Norwegian (Bokm�l)_Norway.1252")) + || broken(!strcmp(ret, "Norwegian_Norway.1252")) || broken(!strcmp(ret, "Norwegian (Nynorsk)_Norway.1252")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "nor"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - todo_wine ok(!strcmp(ret, "Norwegian (Bokm�l)_Norway.1252"), "ret = %s\n", ret); + todo_wine ok(!strcmp(ret, "Norwegian (Bokm�l)_Norway.1252") + || broken(!strcmp(ret, "Norwegian_Norway.1252")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "norwegian-bokmal"); todo_wine ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - ok(!strcmp(ret, "Norwegian (Bokm�l)_Norway.1252"), "ret = %s\n", ret); + ok(!strcmp(ret, "Norwegian (Bokm�l)_Norway.1252") + || broken(!strcmp(ret, "Norwegian_Norway.1252")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "norwegian-nynorsk"); todo_wine ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) ok(!strcmp(ret, "Norwegian-Nynorsk_Norway.1252") - || broken(!strcmp( ret, "Norwegian (Nynorsk)_Norway.1252")) + || broken(!strcmp(ret, "Norwegian_Norway.1252")) + || broken(!strcmp(ret, "Norwegian (Nynorsk)_Norway.1252")) || broken(!strcmp(ret, "Norwegian (Bokm�l)_Norway.1252")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "plk");

1 0

Stefan Dösinger : wined3d: Fall back to other depth stencil formats if D24S8 isn't supported.
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: ec3d2ba316994dec3d19337afab00062eef7d829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec3d2ba316994dec3d19337af… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 30 16:44:29 2010 +0200 wined3d: Fall back to other depth stencil formats if D24S8 isn't supported. --- dlls/wined3d/swapchain.c | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 25c04b1..b5d2d70 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -802,6 +802,15 @@ HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface if (surface_type == SURFACE_OPENGL) { + WINED3DFORMAT formats[] = + { + WINED3DFMT_D24_UNORM_S8_UINT, + WINED3DFMT_D32_UNORM, + WINED3DFMT_R24_UNORM_X8_TYPELESS, + WINED3DFMT_D16_UNORM, + WINED3DFMT_S1_UINT_D15_UNORM + }; + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; /* In WGL both color, depth and stencil are features of a pixel format. In case of D3D they are separate. @@ -815,19 +824,27 @@ HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface * Likely a lot of other new bugs will be exposed. For that reason request a depth stencil surface all the * time. It can cause a slight performance hit but fixes a lot of regressions. A fixme reminds of that this * issue needs to be fixed. */ - if (!present_parameters->EnableAutoDepthStencil - || swapchain->presentParms.AutoDepthStencilFormat != WINED3DFMT_D24_UNORM_S8_UINT) + for (i = 0; i < (sizeof(formats) / sizeof(*formats)); i++) { - FIXME("Add OpenGL context recreation support to context_validate_onscreen_formats\n"); + swapchain->ds_format = getFormatDescEntry(formats[i], gl_info); + swapchain->context[0] = context_create(swapchain, swapchain->front_buffer, swapchain->ds_format); + if (swapchain->context[0]) break; + TRACE("Depth stencil format %s is not supported, trying next format\n", + debug_d3dformat(formats[i])); } - swapchain->ds_format = getFormatDescEntry(WINED3DFMT_D24_UNORM_S8_UINT, gl_info); - swapchain->context[0] = context_create(swapchain, swapchain->front_buffer, swapchain->ds_format); + if (!swapchain->context[0]) { WARN("Failed to create context.\n"); hr = WINED3DERR_NOTAVAILABLE; goto err; } + + if (!present_parameters->EnableAutoDepthStencil + || swapchain->presentParms.AutoDepthStencilFormat != swapchain->ds_format->format) + { + FIXME("Add OpenGL context recreation support to context_validate_onscreen_formats\n"); + } context_release(swapchain->context[0]); } else

1 0

Stefan Dösinger : wined3d: Don' t grab the implicit depth stencil format in the wrong place.
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: e7066a90e186525adaaa3f3b77df71c826a91a25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7066a90e186525adaaa3f3b7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 30 16:39:02 2010 +0200 wined3d: Don't grab the implicit depth stencil format in the wrong place. This format is now explicitly passed to create_context. --- dlls/wined3d/context.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1d366a7..4db678d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1261,16 +1261,6 @@ struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, IWineD3 if (color_format_desc->format == WINED3DFMT_P8_UINT) color_format_desc = getFormatDescEntry(WINED3DFMT_B8G8R8A8_UNORM, gl_info); - /* Retrieve the depth stencil format from the present parameters. - * The choice of the proper format can give a nice performance boost - * in case of GPU limited programs. */ - if (swapchain->presentParms.EnableAutoDepthStencil) - { - TRACE("Auto depth stencil enabled, using format %s.\n", - debug_d3dformat(swapchain->presentParms.AutoDepthStencilFormat)); - ds_format_desc = getFormatDescEntry(swapchain->presentParms.AutoDepthStencilFormat, gl_info); - } - /* D3D only allows multisampling when SwapEffect is set to WINED3DSWAPEFFECT_DISCARD. */ if (swapchain->presentParms.MultiSampleType && (swapchain->presentParms.SwapEffect == WINED3DSWAPEFFECT_DISCARD)) {

1 0

Hans Leidekker : wtsapi32: Add a stub implementation of WTSQueryUserToken.
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: 11651f0d7d813082121f4711fb58e47a6cba9923 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11651f0d7d813082121f4711f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 4 09:07:54 2010 +0200 wtsapi32: Add a stub implementation of WTSQueryUserToken. --- dlls/wtsapi32/wtsapi32.c | 9 +++++++++ dlls/wtsapi32/wtsapi32.spec | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 9935d36..ab35de4 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -222,3 +222,12 @@ BOOL WINAPI WTSUnRegisterSessionNotification(HWND hWnd) FIXME("Stub %p\n", hWnd); return FALSE; } + +/************************************************************ + * WTSQueryUserToken (WTSAPI32.@) + */ +BOOL WINAPI WTSQueryUserToken(ULONG session_id, PHANDLE token) +{ + FIXME("%u %p\n", session_id, token); + return FALSE; +} diff --git a/dlls/wtsapi32/wtsapi32.spec b/dlls/wtsapi32/wtsapi32.spec index 059b6da..2be9df0 100644 --- a/dlls/wtsapi32/wtsapi32.spec +++ b/dlls/wtsapi32/wtsapi32.spec @@ -14,6 +14,7 @@ @ stdcall WTSQuerySessionInformationW(long long long ptr ptr) @ stub WTSQueryUserConfigA @ stub WTSQueryUserConfigW +@ stdcall WTSQueryUserToken(long ptr) @ stdcall WTSRegisterSessionNotification(long long) @ stub WTSSendMessageA @ stub WTSSendMessageW

1 0

Hans Leidekker : msi: Register more patch details.
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: 920fc345ba6d680b93c9d40a5cbfa33c47f3a1e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=920fc345ba6d680b93c9d40a5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 4 09:07:39 2010 +0200 msi: Register more patch details. --- dlls/msi/action.c | 55 +++++++++++++++++++++++++++++------ dlls/msi/msi.c | 4 -- dlls/msi/msipriv.h | 4 ++ dlls/msi/registry.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/patch.c | 14 +++++++-- 5 files changed, 133 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=920fc345ba6d680b93c9d…

1 0

Hans Leidekker : msi: Handle non-null product code in MSI_ApplyPatchW.
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: 74641ab8db312e2bfc44249e05b24f5367c702d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74641ab8db312e2bfc44249e0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 4 09:07:23 2010 +0200 msi: Handle non-null product code in MSI_ApplyPatchW. --- dlls/msi/msi.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 8d63972..e4ad682 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -359,21 +359,27 @@ static UINT MSI_ApplyPatchW(LPCWSTR szPatchPackage, LPCWSTR szProductCode, LPCWS lstrcatW(cmd, patcheq); lstrcatW(cmd, szPatchPackage); - beg = codes; - while ((end = strchrW(beg, '}'))) + if (szProductCode) + r = MsiConfigureProductExW(szProductCode, INSTALLLEVEL_DEFAULT, INSTALLSTATE_DEFAULT, cmd); + else { - *(end + 1) = '\0'; - r = MsiConfigureProductExW(beg, INSTALLLEVEL_DEFAULT, INSTALLSTATE_DEFAULT, cmd); - if (r == ERROR_SUCCESS) + beg = codes; + while ((end = strchrW(beg, '}'))) { - TRACE("patch applied\n"); - succeeded = TRUE; + *(end + 1) = '\0'; + r = MsiConfigureProductExW(beg, INSTALLLEVEL_DEFAULT, INSTALLSTATE_DEFAULT, cmd); + if (r == ERROR_SUCCESS) + { + TRACE("patch applied\n"); + succeeded = TRUE; + } + beg = end + 2; } - beg = end + 2; + + if (succeeded) + r = ERROR_SUCCESS; } - if (succeeded) - r = ERROR_SUCCESS; done: msi_free(cmd); msi_free(codes);

1 0

Hans Leidekker : msi: Add some tests for patch registration.
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: 25460075cc7b13507303daf9534e9f096c1aa509 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25460075cc7b13507303daf95… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 4 09:07:02 2010 +0200 msi: Add some tests for patch registration. --- dlls/msi/tests/patch.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index 369254c..048de2c 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -31,6 +31,8 @@ #include "wine/test.h" static UINT (WINAPI *pMsiApplyPatchA)( LPCSTR, LPCSTR, INSTALLTYPE, LPCSTR ); +static UINT (WINAPI *pMsiGetPatchInfoExA)( LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, + LPCSTR, LPSTR, DWORD * ); static const char *msifile = "winetest-patch.msi"; static const char *mspfile = "winetest-patch.msp"; @@ -140,6 +142,7 @@ static void init_function_pointers( void ) trace( "GetProcAddress(%s) failed\n", #func ); GET_PROC( hmsi, MsiApplyPatchA ); + GET_PROC( hmsi, MsiGetPatchInfoExA ); #undef GET_PROC } @@ -958,6 +961,72 @@ static void test_system_tables( void ) RemoveDirectoryA( "msitest" ); } +static void test_patch_registration( void ) +{ + UINT r, size; + char buffer[MAX_PATH]; + + if (!pMsiApplyPatchA || !pMsiGetPatchInfoExA) + { + win_skip("required functions not available\n"); + return; + } + + CreateDirectoryA( "msitest", NULL ); + create_file( "msitest\\patch.txt", 1000 ); + + create_database( msifile, tables, sizeof(tables) / sizeof(struct msi_table) ); + create_patch( mspfile ); + + MsiSetInternalUI( INSTALLUILEVEL_NONE, NULL ); + + r = MsiInstallProductA( msifile, NULL ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiApplyPatchA( mspfile, NULL, INSTALLTYPE_DEFAULT, NULL ); + ok( r == ERROR_SUCCESS || broken( r == ERROR_PATCH_PACKAGE_INVALID ), /* version 2.0 */ + "expected ERROR_SUCCESS, got %u\n", r ); + + if (r == ERROR_PATCH_PACKAGE_INVALID) + { + win_skip("Windows Installer < 3.0 detected\n"); + return; + } + + buffer[0] = 0; + size = sizeof(buffer); + r = pMsiGetPatchInfoExA( "{0F96CDC0-4CDF-4304-B283-7B9264889EF7}", + "{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}", + NULL, MSIINSTALLCONTEXT_USERUNMANAGED, + INSTALLPROPERTY_LOCALPACKAGE, buffer, &size ); + todo_wine ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + todo_wine ok( buffer[0], "buffer empty\n" ); + + buffer[0] = 0; + size = sizeof(buffer); + r = pMsiGetPatchInfoExA( "{0F96CDC0-4CDF-4304-B283-7B9264889EF7}", + "{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}", + NULL, MSIINSTALLCONTEXT_MACHINE, + INSTALLPROPERTY_LOCALPACKAGE, buffer, &size ); + ok( r == ERROR_UNKNOWN_PRODUCT, "expected ERROR_UNKNOWN_PRODUCT, got %u\n", r ); + + buffer[0] = 0; + size = sizeof(buffer); + r = pMsiGetPatchInfoExA( "{0F96CDC0-4CDF-4304-B283-7B9264889EF7}", + "{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}", + NULL, MSIINSTALLCONTEXT_USERMANAGED, + INSTALLPROPERTY_LOCALPACKAGE, buffer, &size ); + todo_wine ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + ok( !buffer[0], "got %s\n", buffer ); + + r = MsiInstallProductA( msifile, "REMOVE=ALL" ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + DeleteFileA( msifile ); + DeleteFileA( mspfile ); + RemoveDirectoryA( "msitest" ); +} + START_TEST(patch) { DWORD len; @@ -980,6 +1049,7 @@ START_TEST(patch) test_simple_patch(); test_MsiOpenDatabase(); test_system_tables(); + test_patch_registration(); SetCurrentDirectoryA( prev_path ); }

1 0

Hans Leidekker : msi: Make a local copy of patch packages.
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: 23eabb44c894ebccb01cb0d4457b809127ed93a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23eabb44c894ebccb01cb0d44… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 4 09:06:42 2010 +0200 msi: Make a local copy of patch packages. --- dlls/msi/action.c | 44 ++++++++++++++++++++++++++++++++++---------- dlls/msi/msipriv.h | 2 ++ dlls/msi/package.c | 13 ++++++++----- 3 files changed, 44 insertions(+), 15 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 5ca786d..e744973 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -497,7 +497,7 @@ static UINT msi_parse_patch_summary( MSISUMMARYINFO *si, MSIPATCHINFO **patch ) MSIPATCHINFO *pi; UINT r = ERROR_SUCCESS; - pi = msi_alloc( sizeof(MSIPATCHINFO) ); + pi = msi_alloc_zero( sizeof(MSIPATCHINFO) ); if (!pi) return ERROR_OUTOFMEMORY; @@ -522,11 +522,13 @@ static UINT msi_parse_patch_summary( MSISUMMARYINFO *si, MSIPATCHINFO **patch ) static UINT msi_apply_patch_package( MSIPACKAGE *package, LPCWSTR file ) { + static const WCHAR dotmsp[] = {'.','m','s','p',0}; MSIDATABASE *patch_db = NULL; + WCHAR localfile[MAX_PATH]; LPWSTR *substorage; MSISUMMARYINFO *si; - MSIPATCHINFO *patch; - UINT i, r; + MSIPATCHINFO *patch = NULL; + UINT i, r = ERROR_SUCCESS; TRACE("%p %s\n", package, debugstr_w( file ) ); @@ -548,18 +550,28 @@ static UINT msi_apply_patch_package( MSIPACKAGE *package, LPCWSTR file ) if (r != ERROR_SUCCESS) { TRACE("patch not applicable\n"); - msiobj_release( &si->hdr ); - msiobj_release( &patch_db->hdr ); - return ERROR_SUCCESS; + r = ERROR_SUCCESS; + goto done; } r = msi_parse_patch_summary( si, &patch ); if ( r != ERROR_SUCCESS ) + goto done; + + r = msi_get_local_package_name( localfile, dotmsp ); + if ( r != ERROR_SUCCESS ) + goto done; + + TRACE("copying to local package %s\n", debugstr_w(localfile)); + + if (!CopyFileW( file, localfile, FALSE )) { - msiobj_release( &si->hdr ); - msiobj_release( &patch_db->hdr ); - return r; + ERR("Unable to copy package (%s -> %s) (error %u)\n", + debugstr_w(file), debugstr_w(localfile), GetLastError()); + r = GetLastError(); + goto done; } + patch->localfile = strdupW( localfile ); /* apply substorage transforms */ substorage = msi_split_string( patch->transforms, ';' ); @@ -567,6 +579,8 @@ static UINT msi_apply_patch_package( MSIPACKAGE *package, LPCWSTR file ) r = msi_apply_substorage_transform( package, patch_db, substorage[i] ); msi_free( substorage ); + if (r != ERROR_SUCCESS) + goto done; msi_set_media_source_prop( package ); /* @@ -577,10 +591,20 @@ static UINT msi_apply_patch_package( MSIPACKAGE *package, LPCWSTR file ) list_add_tail( &package->patches, &patch->entry ); +done: msiobj_release( &si->hdr ); msiobj_release( &patch_db->hdr ); + if (patch && r != ERROR_SUCCESS) + { + if (patch->localfile) + DeleteFileW( patch->localfile ); - return ERROR_SUCCESS; + msi_free( patch->patchcode ); + msi_free( patch->transforms ); + msi_free( patch->localfile ); + msi_free( patch ); + } + return r; } /* get the PATCH property, and apply all the patches it specifies */ diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index c339ea9..a8594a8 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -151,6 +151,7 @@ typedef struct tagMSIPATCHINFO struct list entry; LPWSTR patchcode; LPWSTR transforms; + LPWSTR localfile; } MSIPATCHINFO; typedef struct _column_info @@ -996,6 +997,7 @@ extern WCHAR* generate_error_string(MSIPACKAGE *, UINT, DWORD, ... ); extern UINT msi_create_component_directories( MSIPACKAGE *package ); extern UINT msi_set_last_used_source(LPCWSTR product, LPCWSTR usersid, MSIINSTALLCONTEXT context, DWORD options, LPCWSTR value); +extern UINT msi_get_local_package_name(LPWSTR path, LPCWSTR suffix); /* media */ diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 45b4dc9..2ffd66e 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -271,6 +271,7 @@ static void free_package_structures( MSIPACKAGE *package ) list_remove( &patch->entry ); msi_free( patch->patchcode ); msi_free( patch->transforms ); + msi_free( patch->localfile ); msi_free( patch ); } @@ -1133,12 +1134,12 @@ UINT msi_download_file( LPCWSTR szUrl, LPWSTR filename ) return ERROR_SUCCESS; } -static UINT msi_get_local_package_name( LPWSTR path ) +UINT msi_get_local_package_name( LPWSTR path, LPCWSTR suffix ) { static const WCHAR szInstaller[] = { '\\','I','n','s','t','a','l','l','e','r','\\',0}; - static const WCHAR fmt[] = { '%','x','.','m','s','i',0}; - DWORD time, len, i; + static const WCHAR fmt[] = {'%','x',0}; + DWORD time, len, i, offset; HANDLE handle; time = GetTickCount(); @@ -1149,7 +1150,8 @@ static UINT msi_get_local_package_name( LPWSTR path ) len = strlenW(path); for (i = 0; i < 0x10000; i++) { - snprintfW( &path[len], MAX_PATH - len, fmt, (time + i)&0xffff ); + offset = snprintfW( path + len, MAX_PATH - len, fmt, (time + i) & 0xffff ); + memcpy( path + len + offset, suffix, (strlenW( suffix ) + 1) * sizeof(WCHAR) ); handle = CreateFileW( path, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, 0 ); if (handle != INVALID_HANDLE_VALUE) @@ -1170,6 +1172,7 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) static const WCHAR OriginalDatabase[] = {'O','r','i','g','i','n','a','l','D','a','t','a','b','a','s','e',0}; static const WCHAR Database[] = {'D','A','T','A','B','A','S','E',0}; + static const WCHAR dotmsi[] = {'.','m','s','i',0}; MSIDATABASE *db = NULL; MSIPACKAGE *package; MSIHANDLE handle; @@ -1228,7 +1231,7 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) file = temppath; } - r = msi_get_local_package_name( localfile ); + r = msi_get_local_package_name( localfile, dotmsi ); if (r != ERROR_SUCCESS) return r;

1 0

Scott Ritchie : wine.desktop: Add Icon= wine to support systems with icon themes.
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: 28cc4012951cb7a6311ea452ff76ceb032314be5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28cc4012951cb7a6311ea452f… Author: Scott Ritchie <scott(a)open-vote.org> Date: Mon May 3 18:05:54 2010 -0700 wine.desktop: Add Icon=wine to support systems with icon themes. --- tools/wine.desktop | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.desktop b/tools/wine.desktop index 2048f9d..819560e 100644 --- a/tools/wine.desktop +++ b/tools/wine.desktop @@ -19,5 +19,6 @@ Name[nn]=Wine Programlaster for Windowsapplikasjoner Name[sr]=Wine - дизач Windows програма Exec=wine start /unix %f MimeType=application/x-ms-dos-executable;application/x-msi;application/x-win-lnk; +Icon=wine NoDisplay=true StartupNotify=true

1 0

Sven Baars : comdlg32: Update Dutch translation.
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: 99389954d5f299114e98695fc9321734db87a686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99389954d5f299114e98695fc… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue May 4 00:37:00 2010 +0200 comdlg32: Update Dutch translation. --- dlls/comdlg32/cdlg_Nl.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/cdlg_Nl.rc b/dlls/comdlg32/cdlg_Nl.rc index 340c2db..cd04bf8 100644 --- a/dlls/comdlg32/cdlg_Nl.rc +++ b/dlls/comdlg32/cdlg_Nl.rc @@ -337,7 +337,7 @@ BEGIN GROUPBOX "Orientatie", grp1, 8, 156, 64, 56, BS_GROUPBOX AUTORADIOBUTTON "&Portret", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "&Liggend", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON - GROUPBOX "Borders", grp4, 80, 156, 152, 56, BS_GROUPBOX + GROUPBOX "Randen", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "L&inks:", stc15, 88, 172, 21, 8 EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Rechts:", stc16, 159, 172, 27, 8

1 0

← Newer
1
...
83
84
85
86
87
88
89
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2010