July 2012 - Wine-commits - list.winehq.org

Alexandre Julliard : gdi32: Compute the line parameters using the cropped coordinates to avoid overflows .
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: 747d1631d5da53755119632ab035a0c32009a557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=747d1631d5da53755119632ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 31 16:52:02 2012 +0200 gdi32: Compute the line parameters using the cropped coordinates to avoid overflows. --- dlls/gdi32/dibdrv/objects.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index f9736f6..4712dc1 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -616,7 +616,7 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end, DWORD struct line_params line_params; POINT p1 = crop_coords( *start ), p2 = crop_coords( *end ); - init_bres_params( start, end, &clip_params, &line_params, &rect ); + init_bres_params( &p1, &p2, &clip_params, &line_params, &rect ); if (!get_clipped_rects( &pdev->dib, &rect, pdev->clip, &clipped_rects )) return TRUE; for (i = 0; i < clipped_rects.count; i++) { @@ -762,7 +762,7 @@ static BOOL solid_pen_line_region( dibdrv_physdev *pdev, POINT *start, POINT *en struct line_params line_params; POINT p1 = crop_coords( *start ), p2 = crop_coords( *end ); - init_bres_params( start, end, &clip_params, &line_params, &rect ); + init_bres_params( &p1, &p2, &clip_params, &line_params, &rect ); if (clip_rect_to_dib( &pdev->dib, &rect )) { POINT clipped_start, clipped_end; @@ -1030,7 +1030,7 @@ static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) struct line_params line_params; POINT p1 = crop_coords( *start ), p2 = crop_coords( *end ); - init_bres_params( start, end, &clip_params, &line_params, &rect ); + init_bres_params( &p1, &p2, &clip_params, &line_params, &rect ); get_clipped_rects( &pdev->dib, &rect, pdev->clip, &clipped_rects ); for (i = 0; i < clipped_rects.count; i++) {

1 0

Dmitry Timoshkov : gdiplus: Improve precision of calculated pixel to units transformation.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: 3298a3021150526f9e1fd3e030c05bf18ba3c048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3298a3021150526f9e1fd3e03… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 31 18:48:46 2012 +0900 gdiplus: Improve precision of calculated pixel to units transformation. --- dlls/gdiplus/gdiplus.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 9b43cd6..2599c58 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); static const REAL mm_per_inch = 25.4; -static const REAL inch_per_point = 1.0/72.0; +static const REAL point_per_inch = 72.0; static Status WINAPI NotificationHook(ULONG_PTR *token) { @@ -353,7 +353,7 @@ REAL units_to_pixels(REAL units, GpUnit unit, REAL dpi) case UnitDisplay: return units; case UnitPoint: - return units * dpi * inch_per_point; + return units * dpi / point_per_inch; case UnitInch: return units * dpi; case UnitDocument: @@ -376,7 +376,7 @@ REAL pixels_to_units(REAL pixels, GpUnit unit, REAL dpi) case UnitDisplay: return pixels; case UnitPoint: - return pixels / dpi / inch_per_point; + return pixels * point_per_inch / dpi; case UnitInch: return pixels / dpi; break;

1 0

Hans Leidekker : msi: Implement the RemoveExistingProducts standard action.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: f180de40dd7820753479f823b6cb08a34b479c66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f180de40dd7820753479f823b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 31 12:25:42 2012 +0200 msi: Implement the RemoveExistingProducts standard action. --- dlls/msi/action.c | 42 ++++++++++++++--- dlls/msi/tests/action.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 155 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index d452c92..1ad3bc2 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7045,23 +7045,51 @@ static UINT ACTION_SetODBCFolders( MSIPACKAGE *package ) static UINT ITERATE_RemoveExistingProducts( MSIRECORD *rec, LPVOID param ) { + static const WCHAR fmtW[] = + {'m','s','i','e','x','e','c',' ','/','i',' ','%','s',' ','R','E','M','O','V','E','=','%','s',0}; MSIPACKAGE *package = param; - const WCHAR *property = MSI_RecordGetString( rec, 1 ); - WCHAR *value; + const WCHAR *property = MSI_RecordGetString( rec, 7 ); + UINT len = sizeof(fmtW)/sizeof(fmtW[0]); + WCHAR *product, *features, *cmd; + STARTUPINFOW si; + PROCESS_INFORMATION info; + BOOL ret; - if ((value = msi_dup_property( package->db, property ))) + if (!(product = msi_dup_property( package->db, property ))) return ERROR_SUCCESS; + + deformat_string( package, MSI_RecordGetString( rec, 6 ), &features ); + + len += strlenW( product ); + if (features) + len += strlenW( features ); + else + len += sizeof(szAll) / sizeof(szAll[0]); + + if (!(cmd = msi_alloc( len * sizeof(WCHAR) ))) { - FIXME("remove %s\n", debugstr_w(value)); - msi_free( value ); + msi_free( product ); + msi_free( features ); + return ERROR_OUTOFMEMORY; } + sprintfW( cmd, fmtW, product, features ? features : szAll ); + msi_free( product ); + msi_free( features ); + + memset( &si, 0, sizeof(STARTUPINFOW) ); + ret = CreateProcessW( NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &info ); + msi_free( cmd ); + if (!ret) return GetLastError(); + CloseHandle( info.hThread ); + + WaitForSingleObject( info.hProcess, INFINITE ); + CloseHandle( info.hProcess ); return ERROR_SUCCESS; } static UINT ACTION_RemoveExistingProducts( MSIPACKAGE *package ) { static const WCHAR query[] = { - 'S','E','L','E','C','T',' ','A','c','t','i','o','n','P','r','o','p','e','r','t','y',' ', - 'F','R','O','M',' ','U','p','g','r','a','d','e',0}; + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','U','p','g','r','a','d','e',0}; MSIQUERY *view; UINT r; diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 814b49c..1fcb82d 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -1461,6 +1461,76 @@ static const char pa_install_exec_seq_dat[] = "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const char rep_file_dat[] = + "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "rep.txt\trep\trep.txt\t1000\t\t\t8192\t1\n"; + +static const char rep_feature_dat[] = + "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "rep\t\t\trep feature\t1\t2\tMSITESTDIR\t0\n"; + +static const char rep_feature_comp_dat[] = + "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "rep\trep\n"; + +static const char rep_component_dat[] = + "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "rep\t{A24FAF2A-3B2E-41EF-AA78-331542E1A29D}\tMSITESTDIR\t0\t\trep.txt\n"; + +static const char rep_upgrade_dat[] = + "UpgradeCode\tVersionMin\tVersionMax\tLanguage\tAttributes\tRemove\tActionProperty\n" + "s38\tS20\tS20\tS255\ti4\tS255\ts72\n" + "Upgrade\tUpgradeCode\tVersionMin\tVersionMax\tLanguage\tAttributes\n" + "{2967C1CC-34D4-42EE-8D96-CD6836F192BF}\t\t\t\t256\t\tPRODUCT\n"; + +static const char rep_property_dat[] = + "Property\tValue\n" + "s72\tl0\n" + "Property\tProperty\n" + "HASUIRUN\t0\n" + "INSTALLLEVEL\t3\n" + "InstallMode\tTypical\n" + "Manufacturer\tWine\n" + "PIDTemplate\t###-#######\n" + "ProductCode\t{1699F0BB-0B61-4A89-AFE4-CFD60DFD76F3}\n" + "ProductLanguage\t1033\n" + "ProductName\tMSITEST\n" + "ProductVersion\t1.1.1\n" + "UpgradeCode\t{2967C1CC-34D4-42EE-8D96-CD6836F192BF}\n" + "PRODUCT\t2F41860D-7B4C-4DA7-BED9-B64F26594C56\n" + "MSIFASTINSTALL\t1\n"; + +static const char rep_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "FindRelatedProducts\t\t100\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" + "RemoveExistingProducts\t\t1499\n" + "InstallInitialize\t\t1500\n" + "ProcessComponents\t\t1600\n" + "RemoveFiles\t\t1700\n" + "InstallFiles\t\t2000\n" + "UnregisterExtensionInfo\t\t3000\n" + "UnregisterMIMEInfo\t\t3500\n" + "RegisterExtensionInfo\t\t4000\n" + "RegisterMIMEInfo\t\t4500\n" + "RegisterProduct\t\t5000\n" + "PublishFeatures\t\t5100\n" + "PublishProduct\t\t5200\n" + "InstallFinalize\t\t6000\n"; + typedef struct _msi_table { const char *filename; @@ -1818,6 +1888,19 @@ static const msi_table pa_tables[] = ADD_TABLE(property) }; +static const msi_table rep_tables[] = +{ + ADD_TABLE(directory), + ADD_TABLE(rep_component), + ADD_TABLE(rep_feature), + ADD_TABLE(rep_feature_comp), + ADD_TABLE(rep_file), + ADD_TABLE(rep_upgrade), + ADD_TABLE(rep_property), + ADD_TABLE(rep_install_exec_seq), + ADD_TABLE(media) +}; + /* based on RegDeleteTreeW from dlls/advapi32/registry.c */ static LSTATUS action_RegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey, REGSAM access) { @@ -6125,6 +6208,42 @@ done: DeleteFile(msifile); } +static void test_remove_existing_products(void) +{ + UINT r; + + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } + + create_test_files(); + create_file("msitest\\rep.txt", 1000); + create_database(msifile, rep_tables, sizeof(rep_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + goto error; + } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(!delete_pf("msitest\\rep.txt", TRUE), "file not removed\n"); + ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + +error: + DeleteFileA("msitest\\rep.txt"); + delete_test_files(); + DeleteFile(msifile); +} + START_TEST(action) { DWORD len; @@ -6202,6 +6321,7 @@ START_TEST(action) test_register_extension_info(); test_register_mime_info(); test_publish_assemblies(); + test_remove_existing_products(); DeleteFileA(log_file);

1 0

Alexandre Julliard : gdi32: Move DescribePixelFormat and SetPixelFormat to the WGL driver.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: 96e80c26230dd3ce27ee3d58fdbc871fd555511d URL: http://source.winehq.org/git/wine.git/?a=commit;h=96e80c26230dd3ce27ee3d58f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 30 21:53:37 2012 +0200 gdi32: Move DescribePixelFormat and SetPixelFormat to the WGL driver. --- dlls/gdi32/dibdrv/dc.c | 2 - dlls/gdi32/dibdrv/dibdrv.h | 2 - dlls/gdi32/dibdrv/opengl.c | 52 ++++++++++++++----------------------------- dlls/gdi32/driver.c | 12 ---------- dlls/gdi32/enhmfdrv/init.c | 2 - dlls/gdi32/freetype.c | 2 - dlls/gdi32/mfdrv/init.c | 2 - dlls/gdi32/painting.c | 40 ++++++++++---------------------- dlls/gdi32/path.c | 2 - dlls/opengl32/make_opengl | 9 +++++++ dlls/opengl32/opengl_ext.c | 1 + dlls/opengl32/opengl_norm.c | 5 ++++ dlls/opengl32/wgl.c | 40 ++++++++++++++++---------------- dlls/wineps.drv/init.c | 2 - dlls/winex11.drv/init.c | 27 ---------------------- dlls/winex11.drv/opengl.c | 31 ++++++++++++++----------- dlls/winex11.drv/xrender.c | 2 - include/wine/gdi_driver.h | 4 +-- include/wine/wgl_driver.h | 4 ++- 19 files changed, 86 insertions(+), 155 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96e80c26230dd3ce27ee3…

1 0

Wei-Lun Chao : po: Update Chinese (Taiwan) translation.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: 15f5ad3af39c70d7bde315b406a5ad3ae9565655 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15f5ad3af39c70d7bde315b40… Author: Wei-Lun Chao <bluebat(a)member.fsf.org> Date: Tue Jul 31 09:42:44 2012 +0800 po: Update Chinese (Taiwan) translation. --- po/zh_TW.po | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 48140e5..bc75d8c 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-07-07 00:06+0800\n" +"PO-Revision-Date: 2012-07-28 00:06+0800\n" "Last-Translator: Wei-Lun Chao <bluebat(a)member.fsf.org>\n" "Language-Team: Chinese (traditional) <zh-l10n(a)linux.org.tw>\n" "Language: Chinese (Taiwan)\n" @@ -3409,16 +3409,16 @@ msgid "Test Force Feedback" msgstr "測試應力回饋" #: joy.rc:63 -#, fuzzy -#| msgid "Available formats" msgid "Available Effects" -msgstr "可用格式" +msgstr "可用效果" #: joy.rc:65 msgid "" "Press any button in the controller to activate the chosen effect. The effect " "direction can be changed with the controller axis." msgstr "" +"請按下控制器中的任何按鈕以啟用所選的效果。效果的方向可以利用控制器的軸向來變" +"更。" #: joy.rc:28 msgid "Game Controllers" @@ -6894,7 +6894,7 @@ msgstr "表格" #: oleacc.rc:52 msgid "column header" -msgstr "欄首" +msgstr "行首" #: oleacc.rc:53 msgid "row header" @@ -6902,7 +6902,7 @@ msgstr "列首" #: oleacc.rc:54 msgid "column" -msgstr "欄" +msgstr "行" #: oleacc.rc:55 msgid "row" @@ -7231,27 +7231,27 @@ msgstr "正在掃描… 請稍候" #: sane.rc:31 msgctxt "unit: pixels" msgid "px" -msgstr "px" +msgstr "像素" #: sane.rc:32 msgctxt "unit: bits" msgid "b" -msgstr "b" +msgstr "位元" #: sane.rc:34 winecfg.rc:174 msgctxt "unit: dots/inch" msgid "dpi" -msgstr "dpi" +msgstr "點/英吋" #: sane.rc:35 msgctxt "unit: percent" msgid "%" -msgstr "%" +msgstr "百分比" #: sane.rc:36 msgctxt "unit: microseconds" msgid "us" -msgstr "µs" +msgstr "微秒" #: serialui.rc:25 msgid "Settings for %s" @@ -7446,7 +7446,7 @@ msgstr "列(&R)" #: shdoclc.rc:104 msgid "&Column" -msgstr "欄(&O)" +msgstr "行(&O)" #: shdoclc.rc:105 msgid "&Table" @@ -11439,7 +11439,7 @@ msgstr "暫停(&P)" #: taskmgr.rc:68 taskmgr.rc:256 msgid "&Select Columns..." -msgstr "選擇欄(&S)…" +msgstr "選擇行(&S)…" #: taskmgr.rc:69 taskmgr.rc:258 msgid "&CPU History" @@ -11753,12 +11753,12 @@ msgstr "CPU 31" #: taskmgr.rc:514 msgid "Select Columns" -msgstr "選擇顯示欄" +msgstr "選擇顯示行" #: taskmgr.rc:519 msgid "" "Select the columns that will appear on the Process page of the Task Manager." -msgstr "請選擇工作管理員中進程分頁的顯示欄。" +msgstr "請選擇工作管理員中進程分頁的顯示行。" #: taskmgr.rc:521 msgid "&Image Name" @@ -11954,7 +11954,7 @@ msgstr "顯示 16-位元工作及有關的ntvdm.exe" #: taskmgr.rc:216 msgid "Select which columns will be visible on the Process page" -msgstr "選擇在進程分頁的顯示欄" +msgstr "選擇在進程分頁的顯示行" #: taskmgr.rc:217 msgid "Displays kernel time in the performance graphs" @@ -13394,11 +13394,11 @@ msgstr "Copyright 2000 Joshua Thielen" #: winhlp32.rc:32 msgid "Printer &setup..." -msgstr "印表機設定(&S)..." +msgstr "印表機設定(&S)…" #: winhlp32.rc:39 msgid "&Annotate..." -msgstr "註釋(&A)..." +msgstr "註釋(&A)…" #: winhlp32.rc:41 msgid "&Bookmark" @@ -13406,7 +13406,7 @@ msgstr "書籤(&B)" #: winhlp32.rc:42 msgid "&Define..." -msgstr "定義(&D)..." +msgstr "定義(&D)…" #: winhlp32.rc:46 winhlp32.rc:67 msgid "Fonts" @@ -13438,7 +13438,7 @@ msgstr "關於 Wine 說明(&A)" #: winhlp32.rc:64 msgid "Annotation..." -msgstr "註釋..." +msgstr "註釋…" #: winhlp32.rc:65 msgid "Copy"

1 0

Detlef Riekenberg : wer: Return S_OK from the WerRepostSubmit stub.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: a7f9191af6f73e6e59aad10cc4d15d45ac2ff2ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7f9191af6f73e6e59aad10cc… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Jul 28 10:03:43 2012 +0200 wer: Return S_OK from the WerRepostSubmit stub. --- dlls/wer/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index a01479c..80880c3 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -366,7 +366,7 @@ HRESULT WINAPI WerReportSubmit(HREPORT hreport, WER_CONSENT consent, DWORD flags return E_INVALIDARG; *presult = WerDisabled; - return E_NOTIMPL; + return S_OK; } /***********************************************************************

1 0

Vincent Povirk : msi: Stub Migrate10CachedPackagesW.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: b8812afd333728c29561c5af7c9a7ebd39be6c05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8812afd333728c29561c5af7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 30 14:34:20 2012 -0500 msi: Stub Migrate10CachedPackagesW. --- dlls/msi/msi.c | 6 ++++++ dlls/msi/msi.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 973bebd..68e9f81 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -4207,3 +4207,9 @@ UINT WINAPI MsiEndTransaction( DWORD state ) FIXME("%u\n", state); return ERROR_SUCCESS; } + +UINT WINAPI Migrate10CachedPackagesW(void* a, void* b, void* c, DWORD d) +{ + FIXME("%p,%p,%p,%08x\n", a, b, c, d); + return ERROR_SUCCESS; +} diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 8dc884a..c1e6e7f 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -229,7 +229,7 @@ 233 stub MsiDeleteUserDataA 234 stub MsiDeleteUserDataW 235 stub Migrate10CachedPackagesA -236 stub Migrate10CachedPackagesW +236 stdcall Migrate10CachedPackagesW(ptr ptr ptr long) 237 stub MsiRemovePatchesA 238 stub MsiRemovePatchesW 239 stdcall MsiApplyMultiplePatchesA(str str str)

1 0

André Hentschel : winspool.drv: Update allowed driver version.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: 882977eed95b4204927a555ab81263a4de2d6762 URL: http://source.winehq.org/git/wine.git/?a=commit;h=882977eed95b4204927a555ab… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jul 29 16:34:46 2012 +0200 winspool.drv: Update allowed driver version. --- dlls/winspool.drv/tests/info.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index a86f6ef..6d051d6 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2581,8 +2581,8 @@ static void test_GetPrinterDriver(void) HANDLE hf; /* MSDN is wrong: The Drivers on the win9x-CD's have cVersion=0x0400 - NT351: 1, NT4.0+w2k(Kernelmode): 2, w2k and above(Usermode): 3 */ - ok( (di_2->cVersion <= 3) || + NT351: 1, NT4.0+w2k(Kernelmode): 2, w2k-win7(Usermode): 3, win8 and above(Usermode): 4 */ + ok( (di_2->cVersion <= 4) || (di_2->cVersion == 0x0400), "di_2->cVersion = %d\n", di_2->cVersion); ok(di_2->pName != NULL, "not expected NULL ptr\n"); ok(di_2->pEnvironment != NULL, "not expected NULL ptr\n");

1 0

Alex Henrie : wininet: Support ICU_ENCODE_PERCENT, ICU_ENCODE_SPACES_ONLY, and ICU_NO_META.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: 0b64d319c9190bbfaedd6ffd411bc9279f85e2b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b64d319c9190bbfaedd6ffd4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jul 29 23:42:36 2012 -0600 wininet: Support ICU_ENCODE_PERCENT, ICU_ENCODE_SPACES_ONLY, and ICU_NO_META. --- dlls/wininet/internet.c | 92 ++++++++++++++++------------------------------ dlls/wininet/tests/url.c | 42 +++++++++++++++++++++ include/wininet.h | 1 + 3 files changed, 75 insertions(+), 60 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 2b659da..9091ce8 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1963,6 +1963,32 @@ DWORD WINAPI InternetAttemptConnect(DWORD dwReserved) /*********************************************************************** + * convert_url_canonicalization_flags + * + * Helper for InternetCanonicalizeUrl + * + * PARAMS + * dwFlags [I] Flags suitable for InternetCanonicalizeUrl + * + * RETURNS + * Flags suitable for UrlCanonicalize + */ +static DWORD convert_url_canonicalization_flags(DWORD dwFlags) +{ + DWORD dwUrlFlags = URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE; + + if (dwFlags & ICU_BROWSER_MODE) dwUrlFlags |= URL_BROWSER_MODE; + if (dwFlags & ICU_DECODE) dwUrlFlags |= URL_UNESCAPE; + if (dwFlags & ICU_ENCODE_PERCENT) dwUrlFlags |= URL_ESCAPE_PERCENT; + if (dwFlags & ICU_ENCODE_SPACES_ONLY) dwUrlFlags |= URL_ESCAPE_SPACES_ONLY; + /* Flip this bit to correspond to URL_ESCAPE_UNSAFE */ + if (dwFlags & ICU_NO_ENCODE) dwUrlFlags ^= URL_ESCAPE_UNSAFE; + if (dwFlags & ICU_NO_META) dwUrlFlags |= URL_NO_META; + + return dwUrlFlags; +} + +/*********************************************************************** * InternetCanonicalizeUrlA (WININET.@) * * Escape unsafe characters and spaces @@ -1976,43 +2002,16 @@ BOOL WINAPI InternetCanonicalizeUrlA(LPCSTR lpszUrl, LPSTR lpszBuffer, LPDWORD lpdwBufferLength, DWORD dwFlags) { HRESULT hr; - DWORD dwURLFlags = URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE; TRACE("(%s, %p, %p, 0x%08x) bufferlength: %d\n", debugstr_a(lpszUrl), lpszBuffer, lpdwBufferLength, dwFlags, lpdwBufferLength ? *lpdwBufferLength : -1); - if(dwFlags & ICU_DECODE) - { - dwURLFlags |= URL_UNESCAPE; - dwFlags &= ~ICU_DECODE; - } - - if(dwFlags & ICU_ESCAPE) - { - dwURLFlags |= URL_UNESCAPE; - dwFlags &= ~ICU_ESCAPE; - } - - if(dwFlags & ICU_BROWSER_MODE) - { - dwURLFlags |= URL_BROWSER_MODE; - dwFlags &= ~ICU_BROWSER_MODE; - } - - if(dwFlags & ICU_NO_ENCODE) - { - /* Flip this bit to correspond to URL_ESCAPE_UNSAFE */ - dwURLFlags ^= URL_ESCAPE_UNSAFE; - dwFlags &= ~ICU_NO_ENCODE; - } - - if (dwFlags) FIXME("Unhandled flags 0x%08x\n", dwFlags); - - hr = UrlCanonicalizeA(lpszUrl, lpszBuffer, lpdwBufferLength, dwURLFlags); + dwFlags = convert_url_canonicalization_flags(dwFlags); + hr = UrlCanonicalizeA(lpszUrl, lpszBuffer, lpdwBufferLength, dwFlags); if (hr == E_POINTER) SetLastError(ERROR_INSUFFICIENT_BUFFER); if (hr == E_INVALIDARG) SetLastError(ERROR_INVALID_PARAMETER); - return (hr == S_OK) ? TRUE : FALSE; + return hr == S_OK; } /*********************************************************************** @@ -2029,43 +2028,16 @@ BOOL WINAPI InternetCanonicalizeUrlW(LPCWSTR lpszUrl, LPWSTR lpszBuffer, LPDWORD lpdwBufferLength, DWORD dwFlags) { HRESULT hr; - DWORD dwURLFlags = URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE; TRACE("(%s, %p, %p, 0x%08x) bufferlength: %d\n", debugstr_w(lpszUrl), lpszBuffer, lpdwBufferLength, dwFlags, lpdwBufferLength ? *lpdwBufferLength : -1); - if(dwFlags & ICU_DECODE) - { - dwURLFlags |= URL_UNESCAPE; - dwFlags &= ~ICU_DECODE; - } - - if(dwFlags & ICU_ESCAPE) - { - dwURLFlags |= URL_UNESCAPE; - dwFlags &= ~ICU_ESCAPE; - } - - if(dwFlags & ICU_BROWSER_MODE) - { - dwURLFlags |= URL_BROWSER_MODE; - dwFlags &= ~ICU_BROWSER_MODE; - } - - if(dwFlags & ICU_NO_ENCODE) - { - /* Flip this bit to correspond to URL_ESCAPE_UNSAFE */ - dwURLFlags ^= URL_ESCAPE_UNSAFE; - dwFlags &= ~ICU_NO_ENCODE; - } - - if (dwFlags) FIXME("Unhandled flags 0x%08x\n", dwFlags); - - hr = UrlCanonicalizeW(lpszUrl, lpszBuffer, lpdwBufferLength, dwURLFlags); + dwFlags = convert_url_canonicalization_flags(dwFlags); + hr = UrlCanonicalizeW(lpszUrl, lpszBuffer, lpdwBufferLength, dwFlags); if (hr == E_POINTER) SetLastError(ERROR_INSUFFICIENT_BUFFER); if (hr == E_INVALIDARG) SetLastError(ERROR_INVALID_PARAMETER); - return (hr == S_OK) ? TRUE : FALSE; + return hr == S_OK; } /* #################################################### */ diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index a391aa6..8559aae 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -1098,6 +1098,47 @@ static void InternetCreateUrlA_test(void) HeapFree(GetProcessHeap(), 0, szUrl); } +static void InternetCanonicalizeUrl_test(void) +{ + char src[] = "http://www.winehq.org/%27/ /./>/#> "; + char dst[64]; + DWORD dstlen; + + dstlen = sizeof(dst); + InternetCanonicalizeUrlA(src, dst, &dstlen, 0); + ok(strcmp(dst, "http://www.winehq.org/%27/%20/%3E/#>") == 0, "Got \"%s\"\n", dst); + + /* despite what MSDN says, ICU_BROWSER_MODE seems to be ignored */ + dstlen = sizeof(dst); + InternetCanonicalizeUrlA(src, dst, &dstlen, ICU_BROWSER_MODE); + ok(strcmp(dst, "http://www.winehq.org/%27/%20/%3E/#>") == 0, "Got \"%s\"\n", dst); + + /* ICU_ESCAPE is supposed to be ignored */ + dstlen = sizeof(dst); + InternetCanonicalizeUrlA(src, dst, &dstlen, ICU_ESCAPE); + ok(strcmp(dst, "http://www.winehq.org/%27/%20/%3E/#>") == 0, "Got \"%s\"\n", dst); + + dstlen = sizeof(dst); + InternetCanonicalizeUrlA(src, dst, &dstlen, ICU_DECODE); + ok(strcmp(dst, "http://www.winehq.org/'/%20/%3E/#>") == 0, "Got \"%s\"\n", dst); + + dstlen = sizeof(dst); + InternetCanonicalizeUrlA(src, dst, &dstlen, ICU_ENCODE_PERCENT); + ok(strcmp(dst, "http://www.winehq.org/%2527/%20/%3E/#>") == 0, "Got \"%s\"\n", dst); + + dstlen = sizeof(dst); + InternetCanonicalizeUrlA(src, dst, &dstlen, ICU_ENCODE_SPACES_ONLY); + ok(strcmp(dst, "http://www.winehq.org/%27/%20/>/#>") == 0, "Got \"%s\"\n", dst); + + dstlen = sizeof(dst); + InternetCanonicalizeUrlA(src, dst, &dstlen, ICU_NO_ENCODE); + ok(strcmp(dst, "http://www.winehq.org/%27/ />/#>") == 0, "Got \"%s\"\n", dst); + + dstlen = sizeof(dst); + InternetCanonicalizeUrlA(src, dst, &dstlen, ICU_NO_META); + ok(strcmp(dst, "http://www.winehq.org/%27/%20/./%3E/#>") == 0, "Got \"%s\"\n", dst); +} + START_TEST(url) { int i; @@ -1113,4 +1154,5 @@ START_TEST(url) InternetCrackUrl_test(); InternetCrackUrlW_test(); InternetCreateUrlA_test(); + InternetCanonicalizeUrl_test(); } diff --git a/include/wininet.h b/include/wininet.h index 530a693..4c47902 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -421,6 +421,7 @@ BOOLAPI InternetCombineUrlW(LPCWSTR ,LPCWSTR ,LPWSTR ,LPDWORD ,DWORD); #define ICU_NO_META 0x08000000 #define ICU_ENCODE_SPACES_ONLY 0x04000000 #define ICU_BROWSER_MODE 0x02000000 +#define ICU_ENCODE_PERCENT 0x00001000 INTERNETAPI HINTERNET WINAPI InternetOpenA(LPCSTR ,DWORD ,LPCSTR ,LPCSTR ,DWORD); INTERNETAPI HINTERNET WINAPI InternetOpenW(LPCWSTR ,DWORD ,LPCWSTR ,LPCWSTR ,DWORD);

1 0

Detlef Riekenberg : include: Add TOKEN_MANDATORY_LEVEL definitions.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: d5e5b43cec784f92a26fbfb8e6370e7d78cb4d88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5e5b43cec784f92a26fbfb8e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jul 30 18:08:33 2012 +0200 include: Add TOKEN_MANDATORY_LEVEL definitions. --- include/winnt.h | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index b679017..c19eb47 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3748,13 +3748,16 @@ typedef struct _ACL_SIZE_INFORMATION #define SE_IMPERSONATE_NAME TEXT("SeImpersonatePrivilege") #define SE_CREATE_GLOBAL_NAME TEXT("SeCreateGlobalPrivilege") -#define SE_GROUP_MANDATORY 0x00000001 -#define SE_GROUP_ENABLED_BY_DEFAULT 0x00000002 -#define SE_GROUP_ENABLED 0x00000004 -#define SE_GROUP_OWNER 0x00000008 -#define SE_GROUP_USE_FOR_DENY_ONLY 0x00000010 -#define SE_GROUP_LOGON_ID 0xC0000000 -#define SE_GROUP_RESOURCE 0x20000000 +#define SE_GROUP_MANDATORY 0x00000001 +#define SE_GROUP_ENABLED_BY_DEFAULT 0x00000002 +#define SE_GROUP_ENABLED 0x00000004 +#define SE_GROUP_OWNER 0x00000008 +#define SE_GROUP_USE_FOR_DENY_ONLY 0x00000010 +#define SE_GROUP_INTEGRITY 0x00000020 +#define SE_GROUP_INTEGRITY_ENABLED 0x00000040 +#define SE_GROUP_LOGON_ID 0xC0000000 +#define SE_GROUP_RESOURCE 0x20000000 +#define SE_GROUP_VALID_ATTRIBUTES 0xE000007F #define SE_PRIVILEGE_ENABLED_BY_DEFAULT 0x00000001 #define SE_PRIVILEGE_ENABLED 0x00000002 @@ -4228,6 +4231,9 @@ typedef struct _TOKEN_ELEVATION { DWORD TokenIsElevated; } TOKEN_ELEVATION, * PTOKEN_ELEVATION; +typedef struct _TOKEN_MANDATORY_LABEL { + SID_AND_ATTRIBUTES Label; +} TOKEN_MANDATORY_LABEL, * PTOKEN_MANDATORY_LABEL; /* * ACLs of NT

1 0